From 15212c4f8d80b4e15b20d0594d890fe1e803bc0e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Thu, 21 Sep 2017 23:43:13 -0400
Subject: [PATCH 01/42] Font6Func

---
 asm/unk_text_util_2.s | 523 ------------------------------------------
 include/text.h        |  52 +++--
 ld_script.txt         |   1 +
 src/text.c            |  12 +-
 src/unk_text_util_2.c | 200 ++++++++++++++++
 5 files changed, 241 insertions(+), 547 deletions(-)
 create mode 100644 src/unk_text_util_2.c

diff --git a/asm/unk_text_util_2.s b/asm/unk_text_util_2.s
index 7f1a5ef70..c1ab25594 100755
--- a/asm/unk_text_util_2.s
+++ b/asm/unk_text_util_2.s
@@ -5,529 +5,6 @@
 
 	.text
 
-	thumb_func_start Font6Func
-@ int Font6Func(struct TextPrinter *x)
-Font6Func: @ 81BA250
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	adds r4, r6, 0
-	adds r4, 0x14
-	ldrb r0, [r6, 0x1C]
-	cmp r0, 0x6
-	bls _081BA260
-	b _081BA660
-_081BA260:
-	lsls r0, 2
-	ldr r1, =_081BA270
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_081BA270:
-	.4byte _081BA28C
-	.4byte _081BA554
-	.4byte _081BA566
-	.4byte _081BA590
-	.4byte _081BA5C8
-	.4byte _081BA63C
-	.4byte _081BA64E
-_081BA28C:
-	ldr r2, =gMain
-	ldrh r1, [r2, 0x2C]
-	movs r0, 0x3
-	ands r0, r1
-	cmp r0, 0
-	beq _081BA2A6
-	ldrb r1, [r4]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _081BA2A6
-	movs r0, 0
-	strb r0, [r6, 0x1E]
-_081BA2A6:
-	ldrb r1, [r6, 0x1E]
-	cmp r1, 0
-	beq _081BA2E8
-	ldrb r0, [r6, 0x1D]
-	cmp r0, 0
-	beq _081BA2E8
-	subs r0, r1, 0x1
-	strb r0, [r6, 0x1E]
-	ldr r0, =gTextFlags
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _081BA2C4
-	b _081BA50E
-_081BA2C4:
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x3
-	ands r0, r1
-	cmp r0, 0
-	bne _081BA2D0
-	b _081BA50E
-_081BA2D0:
-	ldrb r0, [r4]
-	movs r1, 0x10
-	orrs r0, r1
-	strb r0, [r4]
-	movs r0, 0
-	strb r0, [r6, 0x1E]
-	b _081BA50E
-	.pool
-_081BA2E8:
-	ldr r2, =gTextFlags
-	ldrb r1, [r2]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _081BA2FC
-	movs r0, 0x3
-	b _081BA2FE
-	.pool
-_081BA2FC:
-	ldrb r0, [r6, 0x1D]
-_081BA2FE:
-	strb r0, [r6, 0x1E]
-	ldr r0, [r6]
-	ldrb r3, [r0]
-	adds r0, 0x1
-	str r0, [r6]
-	adds r0, r3, 0
-	subs r0, 0xF8
-	cmp r0, 0x7
-	bls _081BA312
-	b _081BA52E
-_081BA312:
-	lsls r0, 2
-	ldr r1, =_081BA320
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_081BA320:
-	.4byte _081BA524
-	.4byte _081BA512
-	.4byte _081BA504
-	.4byte _081BA500
-	.4byte _081BA36E
-	.4byte _081BA368
-	.4byte _081BA340
-	.4byte _081BA660
-_081BA340:
-	ldrb r0, [r6, 0x6]
-	strb r0, [r6, 0x8]
-	ldrb r1, [r6, 0x5]
-	ldr r0, =gFonts
-	ldr r2, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r6, 0xB]
-	ldrb r0, [r0, 0x5]
-	adds r1, r0
-	ldrb r0, [r6, 0x9]
-	adds r0, r1
-	strb r0, [r6, 0x9]
-_081BA35E:
-	movs r0, 0x2
-	b _081BA662
-	.pool
-_081BA368:
-	ldr r0, [r6]
-	adds r0, 0x1
-	b _081BA4C4
-_081BA36E:
-	ldr r0, [r6]
-	ldrb r3, [r0]
-	adds r0, 0x1
-	str r0, [r6]
-	subs r0, r3, 0x1
-	cmp r0, 0xF
-	bls _081BA37E
-	b _081BA52E
-_081BA37E:
-	lsls r0, 2
-	ldr r1, =_081BA38C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_081BA38C:
-	.4byte _081BA3CC
-	.4byte _081BA3EE
-	.4byte _081BA412
-	.4byte _081BA42C
-	.4byte _081BA478
-	.4byte _081BA47E
-	.4byte _081BA35E
-	.4byte _081BA498
-	.4byte _081BA4A8
-	.4byte _081BA4BC
-	.4byte _081BA4C0
-	.4byte _081BA4C8
-	.4byte _081BA4D2
-	.4byte _081BA4DE
-	.4byte _081BA4EE
-	.4byte _081BA4C0
-_081BA3CC:
-	ldr r2, [r6]
-	ldrb r1, [r2]
-	lsls r1, 4
-	ldrb r3, [r6, 0xC]
-	movs r0, 0xF
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r6, 0xC]
-	adds r2, 0x1
-	str r2, [r6]
-	lsls r0, 24
-	lsrs r0, 28
-	ldrb r2, [r6, 0xD]
-	lsls r1, r2, 28
-	lsrs r1, 28
-	lsrs r2, 4
-	b _081BA472
-_081BA3EE:
-	ldr r1, [r6]
-	ldrb r2, [r1]
-	movs r0, 0xF
-	ands r0, r2
-	ldrb r3, [r6, 0xD]
-	movs r2, 0x10
-	negs r2, r2
-	ands r2, r3
-	orrs r2, r0
-	strb r2, [r6, 0xD]
-	adds r1, 0x1
-	str r1, [r6]
-	ldrb r0, [r6, 0xC]
-	lsrs r0, 4
-	lsls r1, r2, 28
-	lsrs r1, 28
-	lsrs r2, 4
-	b _081BA472
-_081BA412:
-	ldr r1, [r6]
-	ldrb r0, [r1]
-	lsls r0, 4
-	ldrb r3, [r6, 0xD]
-	movs r2, 0xF
-	ands r2, r3
-	orrs r2, r0
-	strb r2, [r6, 0xD]
-	adds r1, 0x1
-	str r1, [r6]
-	ldrb r0, [r6, 0xC]
-	lsrs r0, 4
-	b _081BA46A
-_081BA42C:
-	ldr r3, [r6]
-	ldrb r1, [r3]
-	lsls r1, 4
-	ldrb r4, [r6, 0xC]
-	movs r2, 0xF
-	adds r0, r2, 0
-	ands r0, r4
-	orrs r0, r1
-	strb r0, [r6, 0xC]
-	adds r5, r3, 0x1
-	str r5, [r6]
-	ldrb r3, [r3, 0x1]
-	adds r1, r2, 0
-	ands r1, r3
-	ldrb r4, [r6, 0xD]
-	movs r3, 0x10
-	negs r3, r3
-	ands r3, r4
-	orrs r3, r1
-	strb r3, [r6, 0xD]
-	adds r4, r5, 0x1
-	str r4, [r6]
-	ldrb r1, [r5, 0x1]
-	lsls r1, 4
-	ands r2, r3
-	orrs r2, r1
-	strb r2, [r6, 0xD]
-	adds r4, 0x1
-	str r4, [r6]
-	lsls r0, 24
-	lsrs r0, 28
-_081BA46A:
-	lsls r1, r2, 28
-	lsrs r1, 28
-	lsls r2, 24
-	lsrs r2, 28
-_081BA472:
-	bl GenerateFontHalfRowLookupTable
-	b _081BA35E
-_081BA478:
-	ldr r0, [r6]
-	adds r0, 0x1
-	b _081BA4C4
-_081BA47E:
-	ldr r0, [r6]
-	ldrb r0, [r0]
-	movs r1, 0xF
-	ands r1, r0
-	ldrb r2, [r4]
-	movs r0, 0x10
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4]
-	ldr r0, [r6]
-	adds r0, 0x1
-	b _081BA4C4
-_081BA498:
-	ldr r0, [r6]
-	ldrb r1, [r0]
-	strb r1, [r6, 0x1E]
-	adds r0, 0x1
-	str r0, [r6]
-	movs r0, 0x6
-	strb r0, [r6, 0x1C]
-	b _081BA35E
-_081BA4A8:
-	movs r0, 0x1
-	strb r0, [r6, 0x1C]
-	ldrb r1, [r2]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _081BA50E
-	movs r0, 0
-	strb r0, [r4, 0x2]
-	b _081BA50E
-_081BA4BC:
-	movs r0, 0x5
-	b _081BA64A
-_081BA4C0:
-	ldr r0, [r6]
-	adds r0, 0x2
-_081BA4C4:
-	str r0, [r6]
-	b _081BA35E
-_081BA4C8:
-	ldr r1, [r6]
-	adds r0, r1, 0x1
-	str r0, [r6]
-	ldrb r3, [r1, 0x1]
-	b _081BA52E
-_081BA4D2:
-	ldr r1, [r6]
-	ldrb r0, [r1]
-	ldrb r2, [r6, 0x6]
-	adds r0, r2
-	strb r0, [r6, 0x8]
-	b _081BA4E8
-_081BA4DE:
-	ldr r1, [r6]
-	ldrb r0, [r1]
-	ldrb r2, [r6, 0x7]
-	adds r0, r2
-	strb r0, [r6, 0x9]
-_081BA4E8:
-	adds r1, 0x1
-	str r1, [r6]
-	b _081BA35E
-_081BA4EE:
-	ldrb r0, [r6, 0x4]
-	ldrb r2, [r6, 0xD]
-	lsls r2, 28
-	lsrs r1, r2, 4
-	orrs r1, r2
-	lsrs r1, 24
-	bl FillWindowPixelBuffer
-	b _081BA35E
-_081BA500:
-	movs r0, 0x2
-	b _081BA506
-_081BA504:
-	movs r0, 0x3
-_081BA506:
-	strb r0, [r6, 0x1C]
-	adds r0, r6, 0
-	bl TextPrinterInitDownArrowCounters
-_081BA50E:
-	movs r0, 0x3
-	b _081BA662
-_081BA512:
-	ldr r0, [r6]
-	ldrb r3, [r0]
-	movs r2, 0x80
-	lsls r2, 1
-	adds r1, r2, 0
-	orrs r3, r1
-	adds r0, 0x1
-	str r0, [r6]
-	b _081BA52E
-_081BA524:
-	ldr r0, [r6]
-	adds r0, 0x1
-	str r0, [r6]
-	movs r0, 0
-	b _081BA662
-_081BA52E:
-	adds r0, r3, 0
-	bl DecompressGlyphFont6
-	adds r0, r6, 0
-	bl CopyGlyphToWindow
-	ldr r0, =gUnknown_03002F90
-	adds r0, 0x80
-	ldrb r1, [r6, 0xA]
-	ldrb r0, [r0]
-	adds r1, r0
-	ldrb r0, [r6, 0x8]
-	adds r0, r1
-	strb r0, [r6, 0x8]
-	movs r0, 0
-	b _081BA662
-	.pool
-_081BA554:
-	adds r0, r6, 0
-	bl TextPrinterWait
-	lsls r0, 16
-	cmp r0, 0
-	beq _081BA50E
-	movs r0, 0
-	strb r0, [r6, 0x1C]
-	b _081BA50E
-_081BA566:
-	adds r0, r6, 0
-	bl TextPrinterWaitWithDownArrow
-	lsls r0, 16
-	cmp r0, 0
-	beq _081BA50E
-	ldrb r0, [r6, 0x4]
-	ldrb r2, [r6, 0xD]
-	lsls r2, 28
-	lsrs r1, r2, 4
-	orrs r1, r2
-	lsrs r1, 24
-	bl FillWindowPixelBuffer
-	ldrb r0, [r6, 0x6]
-	movs r1, 0
-	strb r0, [r6, 0x8]
-	ldrb r0, [r6, 0x7]
-	strb r0, [r6, 0x9]
-	strb r1, [r6, 0x1C]
-	b _081BA50E
-_081BA590:
-	adds r0, r6, 0
-	bl TextPrinterWaitWithDownArrow
-	lsls r0, 16
-	cmp r0, 0
-	beq _081BA50E
-	adds r0, r6, 0
-	bl TextPrinterClearDownArrow
-	ldrb r1, [r6, 0x5]
-	ldr r0, =gFonts
-	ldr r2, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r6, 0xB]
-	ldrb r0, [r0, 0x5]
-	adds r1, r0
-	strb r1, [r6, 0x1F]
-	ldrb r0, [r6, 0x6]
-	strb r0, [r6, 0x8]
-	movs r0, 0x4
-	strb r0, [r6, 0x1C]
-	b _081BA50E
-	.pool
-_081BA5C8:
-	ldrb r2, [r6, 0x1F]
-	cmp r2, 0
-	beq _081BA638
-	ldr r4, =gUnknown_08616124
-	ldr r5, =gSaveBlock2Ptr
-	ldr r0, [r5]
-	ldrb r0, [r0, 0x14]
-	lsls r1, r0, 29
-	lsrs r0, r1, 29
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcs _081BA604
-	ldrb r0, [r6, 0x4]
-	ldrb r1, [r6, 0xD]
-	lsls r1, 28
-	lsrs r3, r1, 4
-	orrs r3, r1
-	lsrs r3, 24
-	movs r1, 0
-	bl ScrollWindow
-	movs r0, 0
-	strb r0, [r6, 0x1F]
-	b _081BA62E
-	.pool
-_081BA604:
-	ldrb r0, [r6, 0x4]
-	lsrs r1, 29
-	adds r1, r4
-	ldrb r2, [r1]
-	ldrb r1, [r6, 0xD]
-	lsls r1, 28
-	lsrs r3, r1, 4
-	orrs r3, r1
-	lsrs r3, 24
-	movs r1, 0
-	bl ScrollWindow
-	ldr r0, [r5]
-	ldrb r0, [r0, 0x14]
-	lsls r0, 29
-	lsrs r0, 29
-	adds r0, r4
-	ldrb r1, [r6, 0x1F]
-	ldrb r0, [r0]
-	subs r1, r0
-	strb r1, [r6, 0x1F]
-_081BA62E:
-	ldrb r0, [r6, 0x4]
-	movs r1, 0x2
-	bl CopyWindowToVram
-	b _081BA50E
-_081BA638:
-	strb r2, [r6, 0x1C]
-	b _081BA50E
-_081BA63C:
-	bl IsSEPlaying
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _081BA64A
-	b _081BA50E
-_081BA64A:
-	strb r0, [r6, 0x1C]
-	b _081BA50E
-_081BA64E:
-	ldrb r0, [r6, 0x1E]
-	adds r1, r0, 0
-	cmp r1, 0
-	beq _081BA65C
-	subs r0, 0x1
-	strb r0, [r6, 0x1E]
-	b _081BA50E
-_081BA65C:
-	strb r1, [r6, 0x1C]
-	b _081BA50E
-_081BA660:
-	movs r0, 0x1
-_081BA662:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end Font6Func
-
 	thumb_func_start DecompressGlyphFont6
 DecompressGlyphFont6: @ 81BA668
 	push {r4,r5,lr}
diff --git a/include/text.h b/include/text.h
index c61f6cc98..a7a79da7a 100644
--- a/include/text.h
+++ b/include/text.h
@@ -78,6 +78,22 @@
 
 #define NUM_TEXT_PRINTERS 32
 
+struct TextPrinterSubStruct
+{
+    u8 font_type:4;  // 0x14
+    u8 font_type_upper:1;
+    u8 font_type_5:3;
+    u8 field_1:5;
+    u8 field_1_upmid:2;
+    u8 field_1_top:1;
+    u8 frames_visible_counter;
+    u8 field_3;
+    u8 field_4; // 0x18
+    u8 field_5;
+    u8 field_6;
+    u8 active;
+};
+
 struct TextPrinter
 {
     struct TextSubPrinter {     // TODO: Better name
@@ -99,20 +115,7 @@ struct TextPrinter
     void (*callback)(struct TextSubPrinter *, u16); // 0x10
 
     union {
-        struct TextPrinterSubStruct
-        {
-            u8 font_type:4;  // 0x14
-            u8 font_type_upper:4;
-            u8 field_1:5;
-            u8 field_1_upmid:2;
-            u8 field_1_top:1;
-            u8 frames_visible_counter;
-            u8 field_3;
-            u8 field_4; // 0x18
-            u8 field_5;
-            u8 field_6;
-            u8 active;
-        } sub;
+        struct TextPrinterSubStruct sub;
 
         u8 sub_fields[8];
     } sub_union;
@@ -138,6 +141,8 @@ struct FontInfo
     u8 shadowColor:4;
 };
 
+extern const struct FontInfo *gFonts;
+
 struct GlyphWidthFunc{
     u32 font_id;
     u32 (*func)(u16 glyphId, bool32 isJapanese);
@@ -149,11 +154,26 @@ struct KeypadIcon {
     u8 height;
 };
 
+typedef struct {
+    u8 flag_0:1;
+    u8 flag_1:1;
+    u8 flag_2:1;
+} TextFlags;
+
+extern TextFlags gTextFlags;
+
 extern u8 gStringVar1[];
 extern u8 gStringVar2[];
 extern u8 gStringVar3[];
 extern u8 gStringVar4[];
 
+u8 gUnknown_03002F84;
+u8 gUnknown_03002F90[0x20];
+u8 gUnknown_03002FB0[0x20];
+u8 gUnknown_03002FD0[0x20];
+u8 gUnknown_03002FF0[0x20];
+u8 gGlyphDimensions[0x2];
+
 void SetFontsPointer(const struct FontInfo *fonts);
 void DeactivateAllTextPrinters (void);
 u16 PrintTextOnWindow(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
@@ -182,8 +202,8 @@ void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter);
 void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter);
 void TextPrinterClearDownArrow(struct TextPrinter *textPrinter);
 bool8 TextPrinterWaitAutoMode(struct TextPrinter *textPrinter);
-bool8 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter);
-bool8 TextPrinterWait(struct TextPrinter *textPrinter);
+bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter);
+bool16 TextPrinterWait(struct TextPrinter *textPrinter);
 void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex);
 u16 RenderText(struct TextPrinter *textPrinter);
 u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing);
diff --git a/ld_script.txt b/ld_script.txt
index 177f36888..bafc67285 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -253,6 +253,7 @@ SECTIONS {
         asm/item_icon.o(.text);
         asm/party_menu.o(.text);
         asm/battle_tent.o(.text);
+        src/unk_text_util_2.o(.text);
         asm/unk_text_util_2.o(.text);
         src/multiboot.o(.text);
         asm/unk_81BAD84.o(.text);
diff --git a/src/text.c b/src/text.c
index aa4e201c0..fe1c5df24 100644
--- a/src/text.c
+++ b/src/text.c
@@ -32,11 +32,7 @@ u8 gUnknown_03002FB0[0x20];
 u8 gUnknown_03002FD0[0x20];
 u8 gUnknown_03002FF0[0x20];
 u8 gGlyphDimensions[0x2];
-struct {
-    u8 flag_0:1;
-    u8 flag_1:1;
-    u8 flag_2:1;
-} gTextFlags;
+TextFlags gTextFlags;
 
 const u8 gFontHalfRowOffsets[] = {
 	0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x03, 0x06, 0x07, 0x08, 0x06, 0x00, 0x01, 0x02, 0x00,
@@ -1973,7 +1969,7 @@ bool8 TextPrinterWaitAutoMode(struct TextPrinter *textPrinter)
     }
 }
 
-bool8 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
+bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
 {
     bool8 result = FALSE;
     if (gTextFlags.flag_2 != 0)
@@ -1992,9 +1988,9 @@ bool8 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
     return result;
 }
 
-bool8 TextPrinterWait(struct TextPrinter *textPrinter)
+bool16 TextPrinterWait(struct TextPrinter *textPrinter)
 {
-    bool8 result = FALSE;
+    bool16 result = FALSE;
     if (gTextFlags.flag_2 != 0)
     {
         result = TextPrinterWaitAutoMode(textPrinter);
diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c
new file mode 100644
index 000000000..23f3ca1b6
--- /dev/null
+++ b/src/unk_text_util_2.c
@@ -0,0 +1,200 @@
+#include "global.h"
+#include "main.h"
+#include "window.h"
+#include "text.h"
+#include "sound.h"
+
+extern const u8 gUnknown_08616124[];
+
+void DecompressGlyphFont6(u16);
+
+u16 Font6Func(struct TextPrinter *textPrinter)
+{
+    u16 char_;
+    struct TextPrinterSubStruct *sub;
+    
+    sub = &textPrinter->sub_union.sub;
+    switch (textPrinter->state)
+    {
+        case 0:
+            if (gMain.heldKeys & (A_BUTTON | B_BUTTON) && sub->font_type_upper)
+            {
+                textPrinter->delayCounter = 0;
+            }
+            if (textPrinter->delayCounter && textPrinter->text_speed)
+            {
+                textPrinter->delayCounter --;
+                if (gTextFlags.flag_0 && gMain.newKeys & (A_BUTTON | B_BUTTON))
+                {
+                    sub->font_type_upper = TRUE;
+                    textPrinter->delayCounter = 0;
+                }
+                return 3;
+            }
+            if (gTextFlags.flag_2)
+            {
+                textPrinter->delayCounter = 3;
+            }
+            else
+            {
+                textPrinter->delayCounter = textPrinter->text_speed;
+            }
+            char_ = *textPrinter->subPrinter.current_text_offset ++;
+            switch (char_)
+            {
+                case EOS:
+                    return 1;
+                case CHAR_NEWLINE:
+                    textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
+                    textPrinter->subPrinter.currentY += gFonts[textPrinter->subPrinter.fontId].maxLetterHeight + textPrinter->subPrinter.lineSpacing;
+                    return 2;
+                case PLACEHOLDER_BEGIN:
+                    textPrinter->subPrinter.current_text_offset ++;
+                    return 2;
+                case EXT_CTRL_CODE_BEGIN:
+                    char_ = *textPrinter->subPrinter.current_text_offset ++;
+                    switch (char_)
+                    {
+                        case 1:
+                            textPrinter->subPrinter.fontColor_h = *textPrinter->subPrinter.current_text_offset ++;
+                            GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, 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);
+                            return 2;
+                        case 3:
+                            textPrinter->subPrinter.shadowColor = *textPrinter->subPrinter.current_text_offset ++;
+                            GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
+                            return 2;
+                        case 4:
+                            textPrinter->subPrinter.fontColor_h = *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);
+                            return 2;
+                        case 5:
+                            textPrinter->subPrinter.current_text_offset ++;
+                            return 2;
+                        case 6:
+                            sub->font_type = *textPrinter->subPrinter.current_text_offset;
+                            textPrinter->subPrinter.current_text_offset ++;
+                            return 2;
+                        case 7:
+                            return 2;
+                        case 8:
+                            textPrinter->delayCounter = *textPrinter->subPrinter.current_text_offset ++;
+                            textPrinter->state = 6;
+                            return 2;
+                        case 9:
+                            textPrinter->state = 1;
+                            if (gTextFlags.flag_2)
+                            {
+                                sub->frames_visible_counter = 0;
+                            }
+                            return 3;
+                        case 10:
+                            textPrinter->state = 5;
+                            return 3;
+                        case 11:
+                        case 16:
+                            textPrinter->subPrinter.current_text_offset += 2;
+                            return 2;
+                        case 12:
+                            char_ = *++textPrinter->subPrinter.current_text_offset;
+                            break;
+                        case 13:
+                            textPrinter->subPrinter.currentX = textPrinter->subPrinter.x + *textPrinter->subPrinter.current_text_offset ++;
+                            return 2;
+                        case 14:
+                            textPrinter->subPrinter.currentY = textPrinter->subPrinter.y + *textPrinter->subPrinter.current_text_offset ++;
+                            return 2;
+                        case 15:
+                            FillWindowPixelBuffer(textPrinter->subPrinter.windowId, textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4));
+                            return 2;
+                    }
+                    break;
+                case CHAR_PROMPT_CLEAR:
+                    textPrinter->state = 2;
+                    TextPrinterInitDownArrowCounters(textPrinter);
+                    return 3;
+                case CHAR_PROMPT_SCROLL:
+                    textPrinter->state = 3;
+                    TextPrinterInitDownArrowCounters(textPrinter);
+                    return 3;
+                case 0xF9:
+                    char_ = *textPrinter->subPrinter.current_text_offset ++ | 0x100;
+                    break;
+                case 0xF8:
+                    textPrinter->subPrinter.current_text_offset ++;
+                    return 0;
+            }
+            DecompressGlyphFont6(char_);
+            CopyGlyphToWindow(textPrinter);
+            textPrinter->subPrinter.currentX += gUnknown_03002F90[0x80] + textPrinter->subPrinter.letterSpacing;
+            return 0;
+        case 1:
+            if (TextPrinterWait(textPrinter))
+            {
+                textPrinter->state = 0;
+            }
+            return 3;
+        case 2:
+            if (TextPrinterWaitWithDownArrow(textPrinter))
+            {
+                FillWindowPixelBuffer(textPrinter->subPrinter.windowId, textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4));
+                textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
+                textPrinter->subPrinter.currentY = textPrinter->subPrinter.y;
+                textPrinter->state = 0;
+            }
+            return 3;
+        case 3:
+            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:
+            if (textPrinter->scrollDistance)
+            {
+                if (textPrinter->scrollDistance < gUnknown_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];
+                }
+                CopyWindowToVram(textPrinter->subPrinter.windowId, 2);
+            }
+            else
+            {
+                textPrinter->state = 0;
+            }
+            return 3;
+        case 5:
+            if (!IsSEPlaying())
+            {
+                textPrinter->state = 0;
+            }
+            return 3;
+        case 6:
+            if (textPrinter->delayCounter)
+            {
+                textPrinter->delayCounter --;
+            }
+            else
+            {
+                textPrinter->state = 0;
+            }
+            return 3;
+    }
+    return 1;
+}

From aa64f61b84d6b52f4073cf9acef1a927cd9010e6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Fri, 22 Sep 2017 00:01:07 -0400
Subject: [PATCH 02/42] Finish decomp of unk_text_util_2

---
 asm/unk_text_util_2.s | 60 -------------------------------------------
 ld_script.txt         |  1 -
 src/unk_text_util_2.c | 21 ++++++++++++++-
 3 files changed, 20 insertions(+), 62 deletions(-)
 delete mode 100755 asm/unk_text_util_2.s

diff --git a/asm/unk_text_util_2.s b/asm/unk_text_util_2.s
deleted file mode 100755
index c1ab25594..000000000
--- a/asm/unk_text_util_2.s
+++ /dev/null
@@ -1,60 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start DecompressGlyphFont6
-DecompressGlyphFont6: @ 81BA668
-	push {r4,r5,lr}
-	lsls r0, 16
-	lsrs r2, r0, 19
-	lsls r2, 9
-	movs r1, 0xE0
-	lsls r1, 11
-	ands r1, r0
-	lsrs r1, 11
-	ldr r0, =gFont6BrailleGlyphs
-	adds r1, r0
-	adds r5, r2, r1
-	ldr r4, =gUnknown_03002F90
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl DecompressGlyphTile
-	adds r0, r5, 0
-	adds r0, 0x10
-	adds r1, r4, 0
-	adds r1, 0x20
-	bl DecompressGlyphTile
-	movs r1, 0x80
-	lsls r1, 1
-	adds r0, r5, r1
-	adds r1, r4, 0
-	adds r1, 0x40
-	bl DecompressGlyphTile
-	movs r1, 0x88
-	lsls r1, 1
-	adds r0, r5, r1
-	adds r1, r4, 0
-	adds r1, 0x60
-	bl DecompressGlyphTile
-	adds r0, r4, 0
-	adds r0, 0x80
-	movs r1, 0x10
-	strb r1, [r0]
-	adds r0, 0x1
-	strb r1, [r0]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end DecompressGlyphFont6
-
-	thumb_func_start GetGlyphWidthFont6
-GetGlyphWidthFont6: @ 81BA6CC
-	movs r0, 0x10
-	bx lr
-	thumb_func_end GetGlyphWidthFont6
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/ld_script.txt b/ld_script.txt
index bafc67285..aee6ae59a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -254,7 +254,6 @@ SECTIONS {
         asm/party_menu.o(.text);
         asm/battle_tent.o(.text);
         src/unk_text_util_2.o(.text);
-        asm/unk_text_util_2.o(.text);
         src/multiboot.o(.text);
         asm/unk_81BAD84.o(.text);
         asm/battle_controller_player_partner.o(.text);
diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c
index 23f3ca1b6..d9bd9d98d 100644
--- a/src/unk_text_util_2.c
+++ b/src/unk_text_util_2.c
@@ -5,8 +5,9 @@
 #include "sound.h"
 
 extern const u8 gUnknown_08616124[];
+extern const u16 gFont6BrailleGlyphs[];
 
-void DecompressGlyphFont6(u16);
+static void DecompressGlyphFont6(u16);
 
 u16 Font6Func(struct TextPrinter *textPrinter)
 {
@@ -198,3 +199,21 @@ u16 Font6Func(struct TextPrinter *textPrinter)
     }
     return 1;
 }
+
+static void DecompressGlyphFont6(u16 glyph)
+{
+    const u16 *glyphs;
+
+    glyphs = gFont6BrailleGlyphs + 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));
+    DecompressGlyphTile(glyphs + 0x88, (u16 *)(gUnknown_03002F90 + 0x60));
+    gUnknown_03002F90[0x80] = 0x10;
+    gUnknown_03002F90[0x81] = 0x10;
+}
+
+u8 GetGlyphWidthFont6(void)
+{
+    return 0x10;
+}

From 561d60342f7ec39f03671ce37ab4f0ab8d0244c6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Fri, 22 Sep 2017 21:18:53 -0400
Subject: [PATCH 03/42] Decompile data

---
 data/unk_text_util_2.s | 11 -----------
 ld_script.txt          |  2 +-
 src/unk_text_util_2.c  |  4 ++--
 3 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 data/unk_text_util_2.s

diff --git a/data/unk_text_util_2.s b/data/unk_text_util_2.s
deleted file mode 100644
index 69f227ea2..000000000
--- a/data/unk_text_util_2.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_08616124:: @ 8616124
-	.incbin "baserom.gba", 0x616124, 0x4
-
-	.align 2
-gFont6BrailleGlyphs:: @ 8616128
-	.incbin "data/graphics/fonts/font6.fwjpnfont"
diff --git a/ld_script.txt b/ld_script.txt
index 136c198dc..1ad681e36 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -389,7 +389,7 @@ SECTIONS {
         data/item_icon.o(.rodata);
         data/party_menu.o(.rodata);
         data/battle_tent.o(.rodata);
-        data/unk_text_util_2.o(.rodata);
+        src/unk_text_util_2.o(.rodata);
         data/unk_81BAD84.o(.rodata);
         data/battle_controller_player_partner.o(.rodata);
         data/fossil_special_fldeff_groundshake.o(.rodata);
diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c
index d9bd9d98d..d88af611f 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"
 
-extern const u8 gUnknown_08616124[];
-extern const u16 gFont6BrailleGlyphs[];
+static const u8 gUnknown_08616124[] = {1, 2, 4};
+static const u16 gFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont");
 
 static void DecompressGlyphFont6(u16);
 

From 4cf115000289d10de3408e752b37128446dd261c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Fri, 22 Sep 2017 21:26:37 -0400
Subject: [PATCH 04/42] clion pls

---
 include/text.h | 32 +++++++++++++++++---------------
 src/text.c     |  2 +-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/include/text.h b/include/text.h
index a7a79da7a..fc8ffa82f 100644
--- a/include/text.h
+++ b/include/text.h
@@ -94,23 +94,25 @@ struct TextPrinterSubStruct
     u8 active;
 };
 
+struct TextSubPrinter {     // TODO: Better name
+    u8* current_text_offset;
+    u8 windowId;
+    u8 fontId;
+    u8 x;
+    u8 y;
+    u8 currentX;        // 0x8
+    u8 currentY;
+    u8 letterSpacing;
+    u8 lineSpacing;
+    u8 fontColor_l:4;   // 0xC
+    u8 fontColor_h:4;
+    u8 bgColor:4;
+    u8 shadowColor:4;
+};
+
 struct TextPrinter
 {
-    struct TextSubPrinter {     // TODO: Better name
-        u8* current_text_offset;
-        u8 windowId;
-        u8 fontId;
-        u8 x;
-        u8 y;
-        u8 currentX;        // 0x8
-        u8 currentY;
-        u8 letterSpacing;
-        u8 lineSpacing;
-        u8 fontColor_l:4;   // 0xC
-        u8 fontColor_h:4;
-        u8 bgColor:4;
-        u8 shadowColor:4;
-    } subPrinter;
+    struct TextSubPrinter subPrinter;
 
     void (*callback)(struct TextSubPrinter *, u16); // 0x10
 
diff --git a/src/text.c b/src/text.c
index fe1c5df24..90c069293 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,9 +1,9 @@
 #include "global.h"
-#include "text.h"
 #include "main.h"
 #include "palette.h"
 #include "string_util.h"
 #include "window.h"
+#include "text.h"
 
 extern void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue);
 extern void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height);

From ef0b022707bd6e4167f43fa0c9396dc507ef9042 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 30 Sep 2017 09:32:46 -0400
Subject: [PATCH 05/42] BSS: src/main.o, src/dma3_manager.o

---
 asm/librfu.s       |  4 ++--
 include/dma3.h     | 14 --------------
 src/dma3_manager.c | 18 ++++++++++++++----
 src/main.c         |  2 +-
 src/malloc.c       |  1 +
 sym_bss.txt        | 24 ++----------------------
 6 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/asm/librfu.s b/asm/librfu.s
index d8ca7538c..129e0f34a 100644
--- a/asm/librfu.s
+++ b/asm/librfu.s
@@ -2762,7 +2762,7 @@ sub_82E424C: @ 82E424C
 	b _082E4266
 	.align 2, 0
 _082E4254: .4byte gUnknown_089A324C
-_082E4258: .4byte gUnknown_030000F0
+_082E4258: .4byte gDma3Requests + 0xE0
 	thumb_func_end sub_82E424C
 
 	thumb_func_start sub_82E425C
@@ -2810,7 +2810,7 @@ _082E4274:
 	movs r0, 0
 	b _082E42BE
 	.align 2, 0
-_082E42B0: .4byte gUnknown_030000FA
+_082E42B0: .4byte gDma3Requests + 0xEA
 _082E42B4: .4byte gUnknown_03007890
 _082E42B8: .4byte gUnknown_03007894
 _082E42BC:
diff --git a/include/dma3.h b/include/dma3.h
index db75ea9e3..265b47824 100644
--- a/include/dma3.h
+++ b/include/dma3.h
@@ -1,20 +1,6 @@
 #ifndef GUARD_DMA3_H
 #define GUARD_DMA3_H
 
-extern u8 gDma3ManagerLocked;
-extern u8 gDma3RequestCursor;
-
-struct DmaRequestsStruct
-{
- /* 0x00 */ const u8 *src;
- /* 0x04 */ u8 *dest;
- /* 0x08 */ u16 size;
- /* 0x0A */ u16 mode;
- /* 0x0C */ u32 value;
-};
-
-extern struct DmaRequestsStruct gDma3Requests[128];
-
 void ClearDma3Requests(void);
 void ProcessDma3Requests(void);
 int RequestDma3Copy(const void *src, void *dest, u16 size, u8 mode);
diff --git a/src/dma3_manager.c b/src/dma3_manager.c
index 7cce06c15..bb015c5cf 100644
--- a/src/dma3_manager.c
+++ b/src/dma3_manager.c
@@ -1,12 +1,23 @@
 #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];
+
+static bool8 gDma3ManagerLocked;
+static u8 gDma3RequestCursor;
+
 void ClearDma3Requests(void)
 {
     int i;
 
     gDma3ManagerLocked = TRUE;
-    gDma3RequestCursor = FALSE;
+    gDma3RequestCursor = 0;
 
     for(i = 0; i < (u8)ARRAY_COUNT(gDma3Requests); i++)
     {
@@ -22,7 +33,6 @@ void ClearDma3Requests(void)
 void ProcessDma3Requests(void)
 {
     // NOTE: the fillerA member of the DMA struct is actually u32 value;
-    // NOTE: gUnknown_0300001C is just a pointer inside the gDma3Requests structure, not a true symbol; feel free to remove
     u16 total_size;
 
     if (gDma3ManagerLocked)
@@ -331,7 +341,7 @@ _08000DB2:\n\
     mov r5, r12\n\
     ldrb r0, [r5]\n\
     lsls r0, 4\n\
-    ldr r3, =gUnknown_0300001C\n\
+    ldr r3, =gDma3Requests + 0x0C\n\
     adds r0, r3\n\
     ldr r0, [r0]\n\
     strh r0, [r1]\n\
@@ -347,7 +357,7 @@ _08000DB2:\n\
     bhi _08000DB2\n\
     ldrb r0, [r5]\n\
     lsls r0, 4\n\
-    ldr r5, =gUnknown_0300001C\n\
+    ldr r5, =gDma3Requests + 0x0C\n\
     adds r0, r5\n\
     ldr r0, [r0]\n\
     strh r0, [r1]\n\
diff --git a/src/main.c b/src/main.c
index 5707e18af..665a4dd84 100644
--- a/src/main.c
+++ b/src/main.c
@@ -77,7 +77,7 @@ const IntrFunc gIntrTableTemplate[] =
 
 #define INTR_COUNT ((int)(sizeof(gIntrTableTemplate)/sizeof(IntrFunc)))
 
-extern u16 gUnknown_03000000;
+static u16 gUnknown_03000000;
 
 extern u16 gKeyRepeatStartDelay;
 extern u8 gUnknown_030022B4;
diff --git a/src/malloc.c b/src/malloc.c
index ccb2f7d20..1d64351c3 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -2,6 +2,7 @@
 
 static void *sHeapStart;
 static u32 sHeapSize;
+static u32 malloc_c_unused_0300000c; // needed to align dma3_manager.o(.bss)
 
 #define MALLOC_SYSTEM_ID 0xA3A3
 
diff --git a/sym_bss.txt b/sym_bss.txt
index aacfa59a0..2cc5279f3 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -1,27 +1,7 @@
 gUnknown_03000000: @ 3000000
-	.space 0x4
-
+	.include "src/main.o"
 	.include "src/malloc.o"
-
-	.align 4
-gDma3Requests: @ 3000010
-	.space 0xC
-
-gUnknown_0300001C: @ 300001C
-	.space 0xD4
-
-gUnknown_030000F0: @ 30000F0
-	.space 0xA
-
-gUnknown_030000FA: @ 30000FA
-	.space 0x716
-
-gDma3ManagerLocked: @ 3000810
-	.space 0x1
-
-gDma3RequestCursor: @ 3000811
-	.space 0x7
-
+	.include "src/dma3_manager.o"
 	.include "src/gpu_regs.o"
     .include "src/bg.o"
 	.include "src/text.o"

From f4827632f2c2e78cdc798176f61e7ff26539a957 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 30 Sep 2017 09:56:08 -0400
Subject: [PATCH 06/42] BSS: link.o

---
 src/link.c  | 56 ++++++++++++++++++++++++++++++++++++++++
 sym_bss.txt | 74 +----------------------------------------------------
 2 files changed, 57 insertions(+), 73 deletions(-)
 create mode 100644 src/link.c

diff --git a/src/link.c b/src/link.c
new file mode 100644
index 000000000..ae2cd1992
--- /dev/null
+++ b/src/link.c
@@ -0,0 +1,56 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+struct BlockTransfer
+{
+    u16 pos;
+    u16 size;
+    void *src;
+    bool8 active;
+    u8 multiplayerId;
+};
+
+struct LinkTestBGInfo
+{
+    u32 screenBaseBlock;
+    u32 paletteNum;
+    u32 dummy_8;
+    u32 dummy_C;
+};
+
+// Static RAM declarations
+
+IWRAM_DATA struct BlockTransfer gUnknown_03000D10;
+IWRAM_DATA u32 link_c_unused_03000d1c;
+IWRAM_DATA struct BlockTransfer gUnknown_03000D20[4];
+IWRAM_DATA u32 gUnknown_03000D50;
+IWRAM_DATA u32 gUnknown_03000D54;
+IWRAM_DATA u8 gUnknown_03000D58;
+IWRAM_DATA u32 gUnknown_03000D5C;
+IWRAM_DATA u32 gUnknown_03000D60;
+IWRAM_DATA u8 gUnknown_03000D64[4]; // not really, but won't match otherwise
+IWRAM_DATA u8 gUnknown_03000D68[4];
+IWRAM_DATA u8 gUnknown_03000D6C;
+IWRAM_DATA bool8 gUnknown_03000D6D;
+IWRAM_DATA u16 gUnknown_03000D6E;
+IWRAM_DATA u16 gUnknown_03000D70;
+IWRAM_DATA u8 gUnknown_03000D72;
+IWRAM_DATA u8 gUnknown_03000D73;
+IWRAM_DATA u8 gUnknown_03000D74[4]; // not really, but won't match otherwise
+IWRAM_DATA u8 gUnknown_03000D78[8]; // not really, but won't match otherwise
+IWRAM_DATA u8 gUnknown_03000D80[16];
+IWRAM_DATA u16 gUnknown_03000D90[8];
+IWRAM_DATA u32 gUnknown_03000DA0;
+IWRAM_DATA u32 gUnknown_03000DA4;
+IWRAM_DATA void *gUnknown_03000DA8;
+IWRAM_DATA void *gUnknown_03000DAC;
+IWRAM_DATA bool32 gUnknown_03000DB0;
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/sym_bss.txt b/sym_bss.txt
index 2cc5279f3..efd129fd7 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -6,79 +6,7 @@ gUnknown_03000000: @ 3000000
     .include "src/bg.o"
 	.include "src/text.o"
 	.include "src/sprite.o"
-
-gUnknown_03000D10: @ 3000D10
-	.space 0x10
-
-gUnknown_03000D20: @ 3000D20
-	.space 0x30
-
-gUnknown_03000D50: @ 3000D50
-	.space 0x4
-
-gUnknown_03000D54: @ 3000D54
-	.space 0x4
-
-gUnknown_03000D58: @ 3000D58
-	.space 0x4
-
-gUnknown_03000D5C: @ 3000D5C
-	.space 0x4
-
-gUnknown_03000D60: @ 3000D60
-	.space 0x4
-
-gUnknown_03000D64: @ 3000D64
-	.space 0x4
-
-gUnknown_03000D68: @ 3000D68
-	.space 0x4
-
-gUnknown_03000D6C: @ 3000D6C
-	.space 0x1
-
-gUnknown_03000D6D: @ 3000D6D
-	.space 0x1
-
-gUnknown_03000D6E: @ 3000D6E
-	.space 0x2
-
-gUnknown_03000D70: @ 3000D70
-	.space 0x2
-
-gUnknown_03000D72: @ 3000D72
-	.space 0x1
-
-gUnknown_03000D73: @ 3000D73
-	.space 0x1
-
-gUnknown_03000D74: @ 3000D74
-	.space 0x4
-
-gUnknown_03000D78: @ 3000D78
-	.space 0x8
-
-gUnknown_03000D80: @ 3000D80
-	.space 0x10
-
-gUnknown_03000D90: @ 3000D90
-	.space 0x10
-
-gUnknown_03000DA0: @ 3000DA0
-	.space 0x4
-
-gUnknown_03000DA4: @ 3000DA4
-	.space 0x4
-
-gUnknown_03000DA8: @ 3000DA8
-	.space 0x4
-
-gUnknown_03000DAC: @ 3000DAC
-	.space 0x4
-
-gUnknown_03000DB0: @ 3000DB0
-	.space 0x8
-
+    .include "src/link.o"
     .include "src/rtc.o"
 
 gUnknown_03000DD0: @ 3000DD0

From 24da6e48ffe63916d1ffeb8fec720c63fdfac172 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 30 Sep 2017 10:01:52 -0400
Subject: [PATCH 07/42] BSS: main_menu.o, battle_1.o

---
 src/battle_1.c  | 17 +++++++++++++++++
 src/main_menu.c | 15 +++++++++++++++
 sym_bss.txt     | 15 ++-------------
 3 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 src/battle_1.c
 create mode 100644 src/main_menu.c

diff --git a/src/battle_1.c b/src/battle_1.c
new file mode 100644
index 000000000..5e4ef5583
--- /dev/null
+++ b/src/battle_1.c
@@ -0,0 +1,17 @@
+
+// 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/main_menu.c b/src/main_menu.c
new file mode 100644
index 000000000..8608159c2
--- /dev/null
+++ b/src/main_menu.c
@@ -0,0 +1,15 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+IWRAM_DATA u8 gUnknown_03000DD0;
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/sym_bss.txt b/sym_bss.txt
index efd129fd7..f9ce07a4b 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -8,19 +8,8 @@ gUnknown_03000000: @ 3000000
 	.include "src/sprite.o"
     .include "src/link.o"
     .include "src/rtc.o"
-
-gUnknown_03000DD0: @ 3000DD0
-	.space 0x4
-
-gUnknown_03000DD4: @ 3000DD4
-	.space 0x4
-
-gUnknown_03000DD8: @ 3000DD8
-	.space 0x4
-
-gUnknown_03000DDC: @ 3000DDC
-	.space 0x4
-
+    .include "src/main_menu.o"
+    .include "src/battle_1.o"
     .include "src/egg_hatch.o"
     
 .space 0x4 @ why the gap?

From 8620b9203d876764404622d2d6d8711812928979 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 30 Sep 2017 10:12:35 -0400
Subject: [PATCH 08/42] BSS: berry_blender.o

---
 src/berry_blender.c | 18 ++++++++++++++++++
 sym_bss.txt         | 16 +---------------
 2 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 src/berry_blender.c

diff --git a/src/berry_blender.c b/src/berry_blender.c
new file mode 100644
index 000000000..d9cc86f7f
--- /dev/null
+++ b/src/berry_blender.c
@@ -0,0 +1,18 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+// Static RAM declarations
+IWRAM_DATA u32 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;
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/sym_bss.txt b/sym_bss.txt
index f9ce07a4b..b05a40e98 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -11,21 +11,7 @@ gUnknown_03000000: @ 3000000
     .include "src/main_menu.o"
     .include "src/battle_1.o"
     .include "src/egg_hatch.o"
-    
-.space 0x4 @ why the gap?
-
-gUnknown_03000DE8: @ 3000DE8
-	.space 0x10
-
-gUnknown_03000DF8: @ 3000DF8
-	.space 0xC
-
-gUnknown_03000E04: @ 3000E04
-	.space 0x2
-
-gUnknown_03000E06: @ 3000E06
-	.space 0x2
-
+    .include "src/berry_blender.o"
     .include "src/play_time.o"
 
 .align 2

From 64631bac9365cf8df3798d9d3be8746d4d641685 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 30 Sep 2017 13:08:28 -0400
Subject: [PATCH 09/42] BSS: rom4.o, field_camera.o

---
 src/berry_blender.c |  2 +-
 src/field_camera.c  | 28 ++++++++++++++++++++++++++++
 src/rom4.c          | 19 +++++++++++++++++++
 sym_bss.txt         | 37 +++----------------------------------
 4 files changed, 51 insertions(+), 35 deletions(-)
 create mode 100644 src/field_camera.c
 create mode 100644 src/rom4.c

diff --git a/src/berry_blender.c b/src/berry_blender.c
index d9cc86f7f..db50fe4c4 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -5,7 +5,7 @@
 // Static type declarations
 
 // Static RAM declarations
-IWRAM_DATA u32 berry_blender_c_unused_03000de4;
+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;
diff --git a/src/field_camera.c b/src/field_camera.c
new file mode 100644
index 000000000..17ced6aa5
--- /dev/null
+++ b/src/field_camera.c
@@ -0,0 +1,28 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+struct FieldCameraUnknownStruct
+{
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+    bool8 unk4;
+};
+
+// Static RAM declarations
+
+IWRAM_DATA struct FieldCameraUnknownStruct gUnknown_03000E20;
+IWRAM_DATA s16 gUnknown_03000E28;
+IWRAM_DATA s16 gUnknown_03000E2A;
+IWRAM_DATA u8 gUnknown_03000E2C;
+IWRAM_DATA void (*gUnknown_03000E30)(void);
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/src/rom4.c b/src/rom4.c
new file mode 100644
index 000000000..c538595f2
--- /dev/null
+++ b/src/rom4.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/sym_bss.txt b/sym_bss.txt
index b05a40e98..c81ce12be 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -13,40 +13,9 @@ gUnknown_03000000: @ 3000000
     .include "src/egg_hatch.o"
     .include "src/berry_blender.o"
     .include "src/play_time.o"
-
-.align 2
-
-gUnknown_03000E0C: @ 3000E0C
-	.space 0x4
-
-gUnknown_03000E10: @ 3000E10
-	.space 0x4
-
-gUnknown_03000E14: @ 3000E14
-	.space 0x4
-
-gUnknown_03000E18: @ 3000E18
-	.space 0x1
-
-gUnknown_03000E19: @ 3000E19
-	.space 0x7
-
-gUnknown_03000E20: @ 3000E20
-	.space 0x8
-
-gUnknown_03000E28: @ 3000E28
-	.space 0x2
-
-gUnknown_03000E2A: @ 3000E2A
-	.space 0x2
-
-gUnknown_03000E2C: @ 3000E2C
-	.space 0x4
-
-gUnknown_03000E30: @ 3000E30
-	.space 0x8
-
-.include "src/script.o"
+    .include "src/rom4.o"
+    .include "src/field_camera.o"
+    .include "src/script.o"
 
 .align 2
 gUnknown_03000F30: @ 3000F30

From 729f4e10ed8a53155d992b8904926a10181acafa Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 1 Oct 2017 01:12:42 +0200
Subject: [PATCH 10/42] start decompiling battle2

---
 asm/battle_1.s                            |   12 +-
 asm/battle_2.s                            | 3235 +--------------------
 asm/battle_5.s                            |    6 +-
 asm/battle_7.s                            |   56 +-
 asm/battle_anim.s                         |    8 +-
 asm/battle_anim_80FE840.s                 |  152 +-
 asm/battle_anim_815A0D4.s                 |   26 +-
 asm/battle_anim_8170478.s                 |    8 +-
 asm/battle_controller_linkopponent.s      |    4 +-
 asm/battle_controller_linkpartner.s       |    4 +-
 asm/battle_controller_opponent.s          |    6 +-
 asm/battle_controller_player.s            |   28 +-
 asm/battle_controller_player_partner.s    |    4 +-
 asm/battle_controller_recorded_opponent.s |    4 +-
 asm/battle_controller_recorded_player.s   |    4 +-
 asm/battle_controller_safari.s            |   10 +-
 asm/battle_controller_wally.s             |   12 +-
 asm/battle_frontier_1.s                   |   74 +-
 asm/battle_frontier_2.s                   |    4 +-
 asm/battle_interface.s                    |   16 +-
 asm/battle_setup.s                        |   10 +-
 asm/battle_tower.s                        |   22 +-
 asm/battle_transition.s                   |   12 +-
 asm/berry_blender.s                       |   48 +-
 asm/cable_club.s                          |   34 +-
 asm/contest.s                             |   48 +-
 asm/contest_link_80F57C4.s                |   60 +-
 asm/contest_link_80FC4F4.s                |   40 +-
 asm/contest_link_81D9DE4.s                |   10 +-
 asm/contest_painting.s                    |    6 +-
 asm/evolution_scene.s                     |   54 +-
 asm/field_screen.s                        |    2 +-
 asm/link.s                                |  298 +-
 asm/menu_helpers.s                        |    2 +-
 asm/mystery_event_menu.s                  |    8 +-
 asm/pokeblock_feed.s                      |    4 +-
 asm/pokemon_summary_screen.s              |   10 +-
 asm/pokenav.s                             |   10 +-
 asm/record_mixing.s                       |    8 +-
 asm/recorded_battle.s                     |   10 +-
 asm/reshow_battle_screen.s                |   10 +-
 asm/rom3.s                                |   26 +-
 asm/rom6.s                                |   14 +-
 asm/rom_80A5C6C.s                         |   12 +-
 asm/script_pokemon_util_80F87D8.s         |   10 +-
 asm/trade.s                               |   66 +-
 asm/trainer_card.s                        |   20 +-
 asm/unknown_task.s                        |    6 +-
 include/battle.h                          |   51 +-
 include/battle_setup.h                    |    6 +
 include/flags.h                           |    2 +
 include/global.berry.h                    |   13 +-
 include/global.h                          |    9 +-
 include/link.h                            |   18 +-
 include/load_save.h                       |    1 +
 include/pokemon.h                         |    1 +
 include/recorded_battle.h                 |    5 +
 include/unknown_task.h                    |   12 +-
 ld_script.txt                             |    1 +
 src/battle_2.c                            | 1343 +++++++++
 src/battle_script_commands.c              |    3 +-
 src/egg_hatch.c                           |    6 +-
 src/pokemon_2.c                           |   12 +-
 src/pokemon_3.c                           |    4 +-
 sym_common.txt                            |    4 +-
 sym_ewram.txt                             |   25 +-
 66 files changed, 2143 insertions(+), 3906 deletions(-)
 create mode 100644 include/battle_setup.h
 create mode 100644 src/battle_2.c

diff --git a/asm/battle_1.s b/asm/battle_1.s
index 636bafbea..168f16cca 100644
--- a/asm/battle_1.s
+++ b/asm/battle_1.s
@@ -1667,8 +1667,8 @@ _08035A8A:
 	.pool
 	thumb_func_end load_battle_oval_graphics
 
-	thumb_func_start sub_8035AA4
-sub_8035AA4: @ 8035AA4
+	thumb_func_start LoadBattleTextboxAndBackground
+LoadBattleTextboxAndBackground: @ 8035AA4
 	push {lr}
 	ldr r0, =gUnknown_08C00000
 	movs r1, 0xC0
@@ -1690,7 +1690,7 @@ sub_8035AA4: @ 8035AA4
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8035AA4
+	thumb_func_end LoadBattleTextboxAndBackground
 
 	thumb_func_start sub_8035AE4
 sub_8035AE4: @ 8035AE4
@@ -2457,8 +2457,8 @@ _08036138:
 	.pool
 	thumb_func_end task00_0800F6FC
 
-	thumb_func_start sub_8036154
-sub_8036154: @ 8036154
+	thumb_func_start LoadBattleEntryBackground
+LoadBattleEntryBackground: @ 8036154
 	push {r4,r5,lr}
 	ldr r0, =gBattleTypeFlags
 	ldr r1, [r0]
@@ -2668,7 +2668,7 @@ _080363AC:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8036154
+	thumb_func_end LoadBattleEntryBackground
 
 	thumb_func_start sub_80363C4
 sub_80363C4: @ 80363C4
diff --git a/asm/battle_2.s b/asm/battle_2.s
index 996579313..0f4ec2bea 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -4,3157 +4,6 @@
 	.syntax unified
 
 	.text
-    
-    
-	thumb_func_start sub_8036760
-sub_8036760: @ 8036760
-	push {lr}
-	bl MoveSaveBlocks_ResetHeap
-	bl sub_8056F28
-	bl dp11_init
-	bl init_uns_table_pokemon_copy
-	bl sub_8185F84
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _080367CC
-	movs r0, 0x80
-	lsls r0, 17
-	ands r0, r1
-	cmp r0, 0
-	beq _08036798
-	bl InitBattle
-	b _080367BA
-	.pool
-_08036798:
-	movs r0, 0x80
-	lsls r0, 15
-	ands r1, r0
-	cmp r1, 0
-	bne _080367B4
-	bl battle_wireless_setup_if_required_maybe
-	ldr r0, =sub_8037ADC
-	bl SetMainCallback2
-	b _080367BA
-	.pool
-_080367B4:
-	ldr r0, =intro_end
-	bl SetMainCallback2
-_080367BA:
-	ldr r1, =gBattleCommunication
-	movs r0, 0
-	strb r0, [r1]
-	b _080367D0
-	.pool
-_080367CC:
-	bl InitBattle
-_080367D0:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8036760
-
-	thumb_func_start InitBattle
-InitBattle: @ 80367D4
-	push {r4,r5,lr}
-	sub sp, 0x4
-	movs r0, 0
-	bl SetHBlankCallback
-	movs r0, 0
-	bl SetVBlankCallback
-	movs r0, 0
-	str r0, [sp]
-	movs r1, 0xC0
-	lsls r1, 19
-	ldr r2, =0x05006000
-	mov r0, sp
-	bl CpuSet
-	movs r0, 0x4C
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x40
-	movs r1, 0xF0
-	bl SetGpuReg
-	ldr r1, =0x00005051
-	movs r0, 0x44
-	bl SetGpuReg
-	movs r0, 0x48
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x4A
-	movs r1, 0
-	bl SetGpuReg
-	ldr r0, =gUnknown_02022E24
-	movs r2, 0xF0
-	strh r2, [r0]
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 15
-	ands r0, r1
-	cmp r0, 0
-	beq _08036870
-	ldr r0, =gPartnerTrainerId
-	ldrh r1, [r0]
-	ldr r0, =0x00000c03
-	cmp r1, r0
-	beq _08036870
-	ldr r1, =gUnknown_02022E26
-	movs r0, 0x9F
-	strh r0, [r1]
-	ldr r0, =gUnknown_02022E28
-	strh r2, [r0]
-	ldr r1, =gUnknown_02022E2A
-	movs r0, 0x20
-	strh r0, [r1]
-	b _080368BE
-	.pool
-_08036870:
-	ldr r0, =gUnknown_02022E26
-	ldr r2, =0x00005051
-	adds r1, r2, 0
-	strh r1, [r0]
-	bl dp12_8087EA4
-	ldr r0, =gUnknown_02038C28
-	movs r3, 0xF0
-	movs r5, 0xF0
-	lsls r5, 3
-	adds r2, r0, r5
-	movs r1, 0x4F
-_08036888:
-	strh r3, [r0]
-	strh r3, [r2]
-	adds r2, 0x2
-	adds r0, 0x2
-	subs r1, 0x1
-	cmp r1, 0
-	bge _08036888
-	movs r1, 0x50
-	ldr r4, =gUnknown_0831AC70
-	ldr r0, =gUnknown_02038C28
-	ldr r3, =0x0000ff10
-	movs r5, 0x82
-	lsls r5, 4
-	adds r2, r0, r5
-	adds r0, 0xA0
-_080368A6:
-	strh r3, [r0]
-	strh r3, [r2]
-	adds r2, 0x2
-	adds r0, 0x2
-	adds r1, 0x1
-	cmp r1, 0x9F
-	ble _080368A6
-	ldr r0, [r4]
-	ldr r1, [r4, 0x4]
-	ldr r2, [r4, 0x8]
-	bl sub_80BA038
-_080368BE:
-	bl ResetPaletteFade
-	ldr r0, =gUnknown_02022E14
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
-	strh r1, [r0]
-	ldr r0, =gBattle_BG1_X
-	strh r1, [r0]
-	ldr r0, =gBattle_BG1_Y
-	strh r1, [r0]
-	ldr r0, =gBattle_BG2_X
-	strh r1, [r0]
-	ldr r0, =gBattle_BG2_Y
-	strh r1, [r0]
-	ldr r0, =gBattle_BG3_X
-	strh r1, [r0]
-	ldr r0, =gUnknown_02022E22
-	strh r1, [r0]
-	bl sub_80B0BD0
-	ldr r2, =gBattleTerrain
-	strb r0, [r2]
-	ldr r4, =gBattleTypeFlags
-	ldr r0, [r4]
-	movs r1, 0x80
-	lsls r1, 17
-	ands r0, r1
-	cmp r0, 0
-	beq _080368FE
-	movs r0, 0x8
-	strb r0, [r2]
-_080368FE:
-	bl c2_berry_program_update_menu
-	bl sub_8035AA4
-	bl ResetSpriteData
-	bl ResetTasks
-	bl sub_8036154
-	bl FreeAllSpritePalettes
-	ldr r1, =gReservedSpritePaletteCount
-	movs r0, 0x4
-	strb r0, [r1]
-	ldr r0, =VBlankCB_Battle
-	bl SetVBlankCallback
-	bl sub_803269C
-	ldr r2, [r4]
-	movs r1, 0xA0
-	lsls r1, 1
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, r1
-	beq _0803693E
-	ldr r1, =0x00400040
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, r1
-	bne _08036994
-_0803693E:
-	ldr r0, =sub_8037458
-	bl SetMainCallback2
-	b _080369AE
-	.pool
-_08036994:
-	movs r0, 0x40
-	ands r2, r0
-	cmp r2, 0
-	beq _080369A8
-	ldr r0, =sub_8037DF4
-	bl SetMainCallback2
-	b _080369AE
-	.pool
-_080369A8:
-	ldr r0, =sub_8036FAC
-	bl SetMainCallback2
-_080369AE:
-	ldr r5, =gBattleTypeFlags
-	ldr r0, [r5]
-	ldr r1, =0x01000002
-	ands r0, r1
-	cmp r0, 0
-	bne _080369E8
-	ldr r4, =gEnemyParty
-	ldr r0, =gTrainerBattleOpponent_A
-	ldrh r1, [r0]
-	adds r0, r4, 0
-	movs r2, 0x1
-	bl CreateNPCTrainerParty
-	ldr r0, [r5]
-	movs r1, 0x80
-	lsls r1, 8
-	ands r0, r1
-	cmp r0, 0
-	beq _080369E4
-	movs r1, 0x96
-	lsls r1, 1
-	adds r0, r4, r1
-	ldr r1, =gTrainerBattleOpponent_B
-	ldrh r1, [r1]
-	movs r2, 0
-	bl CreateNPCTrainerParty
-_080369E4:
-	bl SetWildMonHeldItem
-_080369E8:
-	ldr r1, =gMain
-	ldr r2, =0x00000439
-	adds r1, r2
-	ldrb r0, [r1]
-	movs r2, 0x2
-	orrs r0, r2
-	strb r0, [r1]
-	ldr r0, =gSaveBlock2Ptr
-	ldr r1, [r0]
-	ldr r5, =0x00000ca9
-	adds r1, r5
-	ldrb r2, [r1]
-	movs r0, 0x9
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	ldr r4, =gPlayerParty
-	movs r0, 0xFA
-	lsls r0, 1
-	adds r5, r4, r0
-_08036A10:
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl AdjustFriendship
-	adds r4, 0x64
-	cmp r4, r5
-	ble _08036A10
-	movs r1, 0
-	ldr r0, =gBattleCommunication
-	strb r1, [r0]
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end InitBattle
-
-	thumb_func_start sub_8036A5C
-sub_8036A5C: @ 8036A5C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	movs r6, 0
-	mov r9, r6
-	movs r0, 0xCE
-	lsls r0, 1
-	mov r10, r0
-	mov r8, r6
-_08036A72:
-	movs r0, 0x64
-	mov r4, r9
-	muls r4, r0
-	ldr r0, =gPlayerParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	lsls r0, 16
-	lsrs r5, r0, 16
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	lsls r0, 16
-	lsrs r7, r0, 16
-	adds r0, r4, 0
-	movs r1, 0x37
-	bl GetMonData
-	adds r1, r0, 0
-	cmp r5, 0
-	beq _08036AEE
-	cmp r5, r10
-	beq _08036ABA
-	cmp r7, 0
-	beq _08036ABA
-	cmp r1, 0
-	bne _08036ABA
-	movs r0, 0x1
-	mov r2, r8
-	lsls r0, r2
-	orrs r6, r0
-	lsls r0, r6, 16
-	lsrs r6, r0, 16
-_08036ABA:
-	cmp r5, 0
-	beq _08036AEE
-	cmp r7, 0
-	beq _08036AD6
-	cmp r5, r10
-	beq _08036ACA
-	cmp r1, 0
-	beq _08036AD6
-_08036ACA:
-	movs r0, 0x2
-	mov r1, r8
-	lsls r0, r1
-	orrs r6, r0
-	lsls r0, r6, 16
-	lsrs r6, r0, 16
-_08036AD6:
-	cmp r5, 0
-	beq _08036AEE
-	cmp r5, r10
-	beq _08036AEE
-	cmp r7, 0
-	bne _08036AEE
-	movs r0, 0x3
-	mov r2, r8
-	lsls r0, r2
-	orrs r6, r0
-	lsls r0, r6, 16
-	lsrs r6, r0, 16
-_08036AEE:
-	movs r0, 0x2
-	add r8, r0
-	movs r1, 0x1
-	add r9, r1
-	mov r2, r9
-	cmp r2, 0x5
-	ble _08036A72
-	ldr r4, =gBattleStruct
-	ldr r0, [r4]
-	movs r1, 0xC1
-	lsls r1, 1
-	adds r0, r1
-	strb r6, [r0]
-	ldr r0, [r4]
-	ldr r5, =0x00000183
-	adds r0, r5
-	lsrs r1, r6, 8
-	strb r1, [r0]
-	ldr r0, =0x000008d2
-	bl FlagGet
-	ldr r1, [r4]
-	adds r1, r5
-	lsls r0, 7
-	ldrb r2, [r1]
-	orrs r0, r2
-	strb r0, [r1]
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8036A5C
-
-	thumb_func_start sub_8036B44
-sub_8036B44: @ 8036B44
-	push {r4-r7,lr}
-	ldr r0, =gBattleStruct
-	ldr r5, [r0]
-	movs r0, 0xC2
-	lsls r0, 1
-	adds r4, r5, r0
-	bl IsEnigmaBerryValid
-	cmp r0, 0x1
-	bne _08036BC0
-	movs r2, 0
-	ldr r7, =gSaveBlock1Ptr
-	movs r1, 0xC6
-	lsls r1, 1
-	adds r5, r1
-	adds r6, r7, 0
-	ldr r3, =0x000031f8
-_08036B66:
-	adds r0, r4, r2
-	ldr r1, [r6]
-	adds r1, r3
-	adds r1, r2
-	ldrb r1, [r1]
-	strb r1, [r0]
-	adds r2, 0x1
-	cmp r2, 0x5
-	ble _08036B66
-	adds r1, r4, r2
-	movs r0, 0xFF
-	strb r0, [r1]
-	movs r2, 0
-	adds r3, r5, 0
-	ldr r6, =gSaveBlock1Ptr
-	ldr r5, =0x00003214
-_08036B86:
-	adds r0, r3, r2
-	ldr r1, [r6]
-	adds r1, r5
-	adds r1, r2
-	ldrb r1, [r1]
-	strb r1, [r0]
-	adds r2, 0x1
-	cmp r2, 0x11
-	ble _08036B86
-	ldr r0, [r7]
-	ldr r1, =0x00003226
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r4, 0x7]
-	ldr r0, [r7]
-	adds r1, 0x1
-	adds r0, r1
-	ldrb r0, [r0]
-	b _08036C00
-	.pool
-_08036BC0:
-	movs r0, 0xAF
-	bl ItemIdToBerryType
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBerryInfo
-	adds r3, r0, 0
-	movs r2, 0
-	movs r0, 0xC6
-	lsls r0, 1
-	adds r5, r0
-_08036BD8:
-	adds r0, r4, r2
-	adds r1, r3, r2
-	ldrb r1, [r1]
-	strb r1, [r0]
-	adds r2, 0x1
-	cmp r2, 0x5
-	ble _08036BD8
-	adds r1, r4, r2
-	movs r0, 0xFF
-	strb r0, [r1]
-	adds r0, r5, 0
-	movs r2, 0
-	adds r1, r0, 0
-	adds r1, 0x11
-_08036BF4:
-	strb r2, [r1]
-	subs r1, 0x1
-	cmp r1, r0
-	bge _08036BF4
-	movs r0, 0
-	strb r0, [r4, 0x7]
-_08036C00:
-	strb r0, [r4, 0x1A]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8036B44
-
-	thumb_func_start berry_801017C
-berry_801017C: @ 8036C08
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08036C20
-	b _08036D4C
-_08036C20:
-	bl IsEnigmaBerryValid
-	cmp r0, 0x1
-	bne _08036CDC
-	movs r5, 0
-	ldr r3, =gEnigmaBerries
-	ldr r0, =gSaveBlock1Ptr
-	mov r8, r0
-	adds r6, r3, 0
-	mov r4, r8
-	ldr r2, =0x000031f8
-	adds r7, r3, 0
-	adds r7, 0x38
-_08036C3A:
-	adds r1, r5, r6
-	ldr r0, [r4]
-	adds r0, r2
-	adds r0, r5
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r1, r5, r7
-	ldr r0, [r4]
-	adds r0, r2
-	adds r0, r5
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r5, 0x1
-	cmp r5, 0x5
-	ble _08036C3A
-	adds r1, r5, r3
-	movs r0, 0xFF
-	strb r0, [r1]
-	adds r0, r3, 0
-	adds r0, 0x38
-	adds r0, r5, r0
-	movs r1, 0x1
-	negs r1, r1
-	strb r1, [r0]
-	movs r5, 0
-	adds r7, r3, 0
-	adds r7, 0x8
-	ldr r4, =gSaveBlock1Ptr
-	ldr r2, =0x00003214
-	adds r6, r3, 0
-	adds r6, 0x40
-_08036C78:
-	adds r1, r5, r7
-	ldr r0, [r4]
-	adds r0, r2
-	adds r0, r5
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r1, r5, r6
-	ldr r0, [r4]
-	adds r0, r2
-	adds r0, r5
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r5, 0x1
-	cmp r5, 0x11
-	ble _08036C78
-	mov r1, r8
-	ldr r0, [r1]
-	ldr r2, =0x00003226
-	adds r0, r2
-	ldrb r1, [r0]
-	strb r1, [r3, 0x7]
-	ldrb r0, [r0]
-	adds r1, r3, 0
-	adds r1, 0x3F
-	strb r0, [r1]
-	mov r4, r8
-	ldr r0, [r4]
-	ldr r1, =0x00003227
-	adds r0, r1
-	ldrb r1, [r0]
-	strb r1, [r3, 0x1A]
-	ldrb r1, [r0]
-	adds r0, r3, 0
-	adds r0, 0x52
-	strb r1, [r0]
-	b _08036EA0
-	.pool
-_08036CDC:
-	movs r0, 0xAF
-	bl ItemIdToBerryType
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBerryInfo
-	adds r6, r0, 0
-	movs r5, 0
-	ldr r4, =gEnigmaBerries
-	adds r7, r4, 0
-	adds r7, 0x38
-	adds r3, r4, 0
-_08036CF6:
-	adds r1, r5, r4
-	adds r2, r6, r5
-	ldrb r0, [r2]
-	strb r0, [r1]
-	adds r1, r5, r7
-	ldrb r0, [r2]
-	strb r0, [r1]
-	adds r5, 0x1
-	cmp r5, 0x5
-	ble _08036CF6
-	adds r1, r5, r3
-	movs r0, 0xFF
-	strb r0, [r1]
-	adds r0, r3, 0
-	adds r0, 0x38
-	adds r0, r5, r0
-	movs r1, 0x1
-	negs r1, r1
-	strb r1, [r0]
-	movs r5, 0
-	adds r4, r3, 0
-	adds r4, 0x8
-	movs r1, 0
-	adds r2, r3, 0
-	adds r2, 0x40
-_08036D28:
-	adds r0, r5, r4
-	strb r1, [r0]
-	adds r0, r5, r2
-	strb r1, [r0]
-	adds r5, 0x1
-	cmp r5, 0x11
-	ble _08036D28
-	movs r1, 0
-	strb r1, [r3, 0x7]
-	adds r0, r3, 0
-	adds r0, 0x3F
-	strb r1, [r0]
-	strb r1, [r3, 0x1A]
-	adds r0, 0x13
-	strb r1, [r0]
-	b _08036EA0
-	.pool
-_08036D4C:
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08036DF0
-	movs r0, 0x80
-	lsls r0, 1
-	ands r1, r0
-	movs r2, 0x4
-	mov r8, r2
-	cmp r1, 0
-	beq _08036D66
-	movs r4, 0x2
-	mov r8, r4
-_08036D66:
-	movs r5, 0
-	cmp r5, r8
-	blt _08036D6E
-	b _08036EA0
-_08036D6E:
-	ldr r0, =gLinkPlayers
-	mov r12, r0
-	ldr r3, =gEnigmaBerries
-	adds r6, r3, 0
-	movs r1, 0x8
-	adds r1, r6
-	mov r9, r1
-_08036D7C:
-	lsls r1, r5, 8
-	ldr r0, =gUnknown_020223C8
-	adds r7, r1, r0
-	lsls r0, r5, 3
-	subs r0, r5
-	lsls r0, 2
-	add r0, r12
-	ldrb r3, [r0, 0x18]
-	movs r4, 0
-	adds r5, 0x1
-	mov r10, r5
-	lsls r1, r3, 3
-	subs r0, r1, r3
-	adds r5, r1, 0
-	lsls r0, 2
-	adds r1, r0, r6
-_08036D9C:
-	adds r0, r7, r4
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r1, 0x1
-	adds r4, 0x1
-	cmp r4, 0x5
-	ble _08036D9C
-	subs r0, r5, r3
-	lsls r0, 2
-	adds r1, r4, r0
-	adds r1, r6
-	movs r2, 0xFF
-	strb r2, [r1]
-	movs r4, 0
-	mov r2, r9
-	adds r1, r0, r2
-	adds r2, r7, 0
-	adds r2, 0x8
-_08036DC0:
-	adds r0, r2, r4
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r1, 0x1
-	adds r4, 0x1
-	cmp r4, 0x11
-	ble _08036DC0
-	subs r0, r5, r3
-	lsls r0, 2
-	adds r0, r6
-	ldrb r1, [r7, 0x7]
-	strb r1, [r0, 0x7]
-	ldrb r1, [r7, 0x1A]
-	strb r1, [r0, 0x1A]
-	mov r5, r10
-	cmp r5, r8
-	blt _08036D7C
-	b _08036EA0
-	.pool
-_08036DF0:
-	movs r5, 0
-	ldr r4, =gEnigmaBerries
-	mov r9, r4
-_08036DF6:
-	lsls r0, r5, 8
-	ldr r1, =gUnknown_020223C8
-	adds r7, r0, r1
-	movs r4, 0
-	adds r2, r5, 0x1
-	mov r10, r2
-	lsls r0, r5, 3
-	mov r8, r0
-	adds r1, r5, 0x2
-	mov r12, r1
-	subs r1, r0, r5
-	mov r2, r12
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	mov r2, r9
-	adds r3, r0, r2
-	lsls r1, 2
-	adds r2, r1, r2
-_08036E1C:
-	adds r0, r7, r4
-	ldrb r1, [r0]
-	strb r1, [r2]
-	ldrb r0, [r0]
-	strb r0, [r3]
-	adds r3, 0x1
-	adds r2, 0x1
-	adds r4, 0x1
-	cmp r4, 0x5
-	ble _08036E1C
-	mov r0, r8
-	subs r3, r0, r5
-	lsls r3, 2
-	adds r1, r4, r3
-	add r1, r9
-	ldrb r0, [r1]
-	movs r2, 0xFF
-	orrs r0, r2
-	strb r0, [r1]
-	mov r0, r12
-	lsls r2, r0, 3
-	subs r2, r0
-	lsls r2, 2
-	adds r1, r4, r2
-	add r1, r9
-	ldrb r0, [r1]
-	movs r4, 0xFF
-	orrs r0, r4
-	strb r0, [r1]
-	movs r4, 0
-	ldr r0, =gEnigmaBerries
-	adds r0, 0x8
-	adds r2, r0
-	adds r3, r0
-	adds r6, r7, 0
-	adds r6, 0x8
-_08036E64:
-	adds r0, r6, r4
-	ldrb r1, [r0]
-	strb r1, [r3]
-	ldrb r0, [r0]
-	strb r0, [r2]
-	adds r2, 0x1
-	adds r3, 0x1
-	adds r4, 0x1
-	cmp r4, 0x11
-	ble _08036E64
-	mov r0, r8
-	subs r2, r0, r5
-	lsls r2, 2
-	add r2, r9
-	ldrb r0, [r7, 0x7]
-	strb r0, [r2, 0x7]
-	mov r1, r12
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	add r0, r9
-	ldrb r1, [r7, 0x7]
-	strb r1, [r0, 0x7]
-	ldrb r1, [r7, 0x1A]
-	strb r1, [r2, 0x1A]
-	ldrb r1, [r7, 0x1A]
-	strb r1, [r0, 0x1A]
-	mov r5, r10
-	cmp r5, 0x1
-	ble _08036DF6
-_08036EA0:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end berry_801017C
-
-	thumb_func_start sub_8036EB8
-sub_8036EB8: @ 8036EB8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r1, 24
-	lsrs r3, r1, 24
-	movs r6, 0
-	ldr r0, =gUnknown_020223C4
-	ldrh r2, [r0]
-	movs r1, 0x80
-	lsls r1, 1
-	mov r12, r0
-	cmp r2, r1
-	bne _08036EFC
-	cmp r3, 0
-	bne _08036EEC
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r2, 0xC
-	b _08036EF2
-	.pool
-_08036EEC:
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r2, 0x8
-_08036EF2:
-	orrs r1, r2
-	str r1, [r0]
-	adds r0, r6, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-_08036EFC:
-	cmp r6, 0
-	bne _08036FA0
-	movs r2, 0
-	cmp r2, r4
-	bge _08036F20
-	ldr r1, =gUnknown_020223C4
-	mov r8, r1
-	movs r5, 0x80
-	lsls r5, 1
-_08036F0E:
-	adds r1, r5
-	adds r2, 0x1
-	cmp r2, r4
-	bge _08036F20
-	mov r7, r8
-	ldrh r0, [r7]
-	ldrh r7, [r1]
-	cmp r0, r7
-	beq _08036F0E
-_08036F20:
-	cmp r2, r4
-	bne _08036F48
-	cmp r3, 0
-	bne _08036F38
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r2, 0xC
-	b _08036F3E
-	.pool
-_08036F38:
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r2, 0x8
-_08036F3E:
-	orrs r1, r2
-	str r1, [r0]
-	adds r0, r6, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-_08036F48:
-	cmp r6, 0
-	bne _08036FA0
-	movs r2, 0
-	ldr r5, =gBattleTypeFlags
-	cmp r2, r4
-	bge _08036F8A
-	mov r0, r12
-	ldrh r1, [r0]
-	movs r0, 0xC0
-	lsls r0, 2
-	cmp r1, r0
-	beq _08036F82
-_08036F60:
-	lsls r0, r2, 8
-	add r0, r12
-	ldrh r0, [r0]
-	movs r1, 0xC0
-	lsls r1, 2
-	cmp r0, r1
-	bls _08036F72
-	cmp r2, r3
-	bne _08036F8A
-_08036F72:
-	adds r2, 0x1
-	cmp r2, r4
-	bge _08036F8A
-	lsls r0, r2, 8
-	add r0, r12
-	ldrh r0, [r0]
-	cmp r0, r1
-	bne _08036F60
-_08036F82:
-	cmp r2, r3
-	beq _08036F60
-	cmp r2, r3
-	bge _08036F60
-_08036F8A:
-	cmp r2, r4
-	bne _08036F98
-	ldr r0, [r5]
-	movs r1, 0xC
-	b _08036F9C
-	.pool
-_08036F98:
-	ldr r0, [r5]
-	movs r1, 0x8
-_08036F9C:
-	orrs r0, r1
-	str r0, [r5]
-_08036FA0:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8036EB8
-
-	thumb_func_start sub_8036FAC
-sub_8036FAC: @ 8036FAC
-	push {r4-r6,lr}
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl GetMultiplayerId
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r0, =gBattleScripting
-	adds r0, 0x25
-	strb r6, [r0]
-	movs r0, 0x1
-	adds r5, r6, 0
-	eors r5, r0
-	ldr r0, =gBattleCommunication
-	ldrb r0, [r0]
-	cmp r0, 0x12
-	bls _08036FD8
-	b _0803744C
-_08036FD8:
-	lsls r0, 2
-	ldr r1, =_08036FF0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_08036FF0:
-	.4byte _0803703C
-	.4byte _08037080
-	.4byte _08037144
-	.4byte _080371D8
-	.4byte _08037200
-	.4byte _0803742C
-	.4byte _08037438
-	.4byte _08037230
-	.4byte _08037258
-	.4byte _0803742C
-	.4byte _08037438
-	.4byte _08037288
-	.4byte _080372B0
-	.4byte _0803742C
-	.4byte _08037438
-	.4byte _08037318
-	.4byte _08037378
-	.4byte _080373A0
-	.4byte _080373E0
-_0803703C:
-	bl IsDma3ManagerBusyWithBgCopy
-	lsls r0, 24
-	cmp r0, 0
-	bne _08037068
-	movs r0, 0
-	bl ShowBg
-	movs r0, 0x1
-	bl ShowBg
-	movs r0, 0x2
-	bl ShowBg
-	movs r0, 0x3
-	bl ShowBg
-	bl sub_805EF14
-	ldr r1, =gBattleCommunication
-	movs r0, 0x1
-	strb r0, [r1]
-_08037068:
-	ldr r0, =gLinkVSyncDisabled
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08037072
-	b _0803744C
-_08037072:
-	bl sub_800E0E8
-	b _0803744C
-	.pool
-_08037080:
-	ldr r2, =gBattleTypeFlags
-	ldr r1, [r2]
-	movs r6, 0x2
-	adds r0, r1, 0
-	ands r0, r6
-	cmp r0, 0
-	beq _08037124
-	ldr r0, =gUnknown_03003124
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08037098
-	b _0803744C
-_08037098:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	beq _080370EE
-	ldr r4, =gBattleStruct
-	ldr r0, [r4]
-	movs r5, 0xC0
-	lsls r5, 1
-	adds r0, r5
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r4]
-	ldr r2, =0x00000181
-	adds r1, r0, r2
-	movs r0, 0x3
-	strb r0, [r1]
-	bl sub_8036A5C
-	bl sub_8036B44
-	ldr r0, =gTrainerBattleOpponent_A
-	ldrh r1, [r0]
-	movs r0, 0xC0
-	lsls r0, 4
-	cmp r1, r0
-	bne _080370D8
-	ldr r0, =gLinkPlayers
-	movs r1, 0
-	strh r1, [r0, 0x18]
-	movs r1, 0x1
-	strh r1, [r0, 0x34]
-_080370D8:
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, [r4]
-	adds r1, r5
-	movs r2, 0x20
-	bl link_0800A448
-	ldr r0, =gBattleCommunication
-	strb r6, [r0]
-_080370EE:
-	ldr r0, =gLinkVSyncDisabled
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080370F8
-	b _0803744C
-_080370F8:
-	movs r0, 0
-	movs r1, 0
-	bl sub_800DFB4
-	b _0803744C
-	.pool
-_08037124:
-	movs r0, 0x80
-	lsls r0, 17
-	ands r0, r1
-	cmp r0, 0
-	bne _08037134
-	movs r0, 0x4
-	orrs r1, r0
-	str r1, [r2]
-_08037134:
-	ldr r1, =gBattleCommunication
-	movs r0, 0xF
-	strb r0, [r1]
-	bl berry_801017C
-	b _0803744C
-	.pool
-_08037144:
-	bl sub_800A550
-	movs r1, 0x3
-	ands r1, r0
-	cmp r1, 0x3
-	beq _08037152
-	b _0803744C
-_08037152:
-	bl sub_800A5B4
-	movs r0, 0x2
-	adds r1, r6, 0
-	bl sub_8036EB8
-	bl berry_801017C
-	ldr r0, =task00_0800F6FC
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gTasks
-	lsls r2, r0, 2
-	adds r2, r0
-	lsls r2, 3
-	adds r2, r1
-	movs r1, 0
-	movs r0, 0x87
-	lsls r0, 1
-	strh r0, [r2, 0xA]
-	movs r0, 0x5A
-	strh r0, [r2, 0xC]
-	strh r1, [r2, 0x12]
-	ldr r0, =gBattleStruct
-	ldr r3, [r0]
-	movs r4, 0xC1
-	lsls r4, 1
-	adds r0, r3, r4
-	ldrb r1, [r0]
-	adds r4, 0x1
-	adds r0, r3, r4
-	ldrb r0, [r0]
-	lsls r0, 8
-	orrs r1, r0
-	strh r1, [r2, 0xE]
-	ldr r1, =gUnknown_020223C4
-	lsls r4, r5, 8
-	adds r1, 0x2
-	adds r4, r1
-	ldrh r0, [r4]
-	strh r0, [r2, 0x10]
-	lsls r0, r6, 8
-	adds r0, r1
-	ldrh r0, [r0]
-	bl sub_8185F90
-	ldrh r0, [r4]
-	bl sub_8185F90
-	bl sub_8068AA4
-	ldr r1, =gBattleCommunication
-	b _08037446
-	.pool
-_080371D8:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	bne _080371E4
-	b _0803744C
-_080371E4:
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gPlayerParty
-	movs r2, 0xC8
-	bl link_0800A448
-	ldr r1, =gBattleCommunication
-	b _08037446
-	.pool
-_08037200:
-	bl sub_800A550
-	movs r1, 0x3
-	ands r1, r0
-	cmp r1, 0x3
-	beq _0803720E
-	b _0803744C
-_0803720E:
-	bl sub_800A5B4
-	ldr r0, =gEnemyParty
-	lsls r1, r5, 8
-	ldr r2, =gUnknown_020223C4
-	adds r1, r2
-	movs r2, 0xC8
-	bl memcpy
-	ldr r1, =gBattleCommunication
-	b _08037446
-	.pool
-_08037230:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803723C
-	b _0803744C
-_0803723C:
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gPlayerParty + 200
-	movs r2, 0xC8
-	bl link_0800A448
-	ldr r1, =gBattleCommunication
-	b _08037446
-	.pool
-_08037258:
-	bl sub_800A550
-	movs r1, 0x3
-	ands r1, r0
-	cmp r1, 0x3
-	beq _08037266
-	b _0803744C
-_08037266:
-	bl sub_800A5B4
-	ldr r0, =gEnemyParty + 200
-	lsls r1, r5, 8
-	ldr r2, =gUnknown_020223C4
-	adds r1, r2
-	movs r2, 0xC8
-	bl memcpy
-	ldr r1, =gBattleCommunication
-	b _08037446
-	.pool
-_08037288:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	bne _08037294
-	b _0803744C
-_08037294:
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gPlayerParty + 400
-	movs r2, 0xC8
-	bl link_0800A448
-	ldr r1, =gBattleCommunication
-	b _08037446
-	.pool
-_080372B0:
-	bl sub_800A550
-	movs r1, 0x3
-	ands r1, r0
-	cmp r1, 0x3
-	beq _080372BE
-	b _0803744C
-_080372BE:
-	bl sub_800A5B4
-	ldr r4, =gEnemyParty + 400
-	lsls r1, r5, 8
-	ldr r0, =gUnknown_020223C4
-	adds r1, r0
-	adds r0, r4, 0
-	movs r2, 0xC8
-	bl memcpy
-	ldr r1, =0xfffffe70
-	adds r0, r4, r1
-	bl shedinja_something
-	ldr r2, =0xfffffed4
-	adds r0, r4, r2
-	bl shedinja_something
-	adds r0, r4, 0
-	subs r0, 0xC8
-	bl shedinja_something
-	adds r0, r4, 0
-	subs r0, 0x64
-	bl shedinja_something
-	adds r0, r4, 0
-	bl shedinja_something
-	adds r0, r4, 0
-	adds r0, 0x64
-	bl shedinja_something
-	ldr r1, =gBattleCommunication
-	b _08037446
-	.pool
-_08037318:
-	bl sub_8032768
-	bl sub_8184E58
-	ldr r2, =gBattleCommunication
-	movs r0, 0
-	strb r0, [r2, 0x1]
-	strb r0, [r2, 0x2]
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08037372
-	movs r3, 0
-	ldr r1, =gLinkPlayers
-	ldrb r0, [r1]
-	adds r5, r2, 0
-	cmp r0, 0x3
-	bne _08037356
-	movs r4, 0xFF
-	adds r2, r1, 0
-_08037344:
-	adds r2, 0x1C
-	adds r3, 0x1
-	cmp r3, 0x1
-	bgt _08037356
-	ldrh r1, [r2]
-	adds r0, r4, 0
-	ands r0, r1
-	cmp r0, 0x3
-	beq _08037344
-_08037356:
-	cmp r3, 0x2
-	bne _0803736C
-	movs r0, 0x10
-	strb r0, [r5]
-	b _0803744C
-	.pool
-_0803736C:
-	movs r0, 0x12
-	strb r0, [r5]
-	b _0803744C
-_08037372:
-	movs r0, 0x12
-	strb r0, [r2]
-	b _0803744C
-_08037378:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803744C
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gUnknown_0203BD2C
-	movs r2, 0x4
-	bl link_0800A448
-	ldr r1, =gBattleCommunication
-	b _08037446
-	.pool
-_080373A0:
-	bl sub_800A550
-	movs r1, 0x3
-	ands r1, r0
-	cmp r1, 0x3
-	bne _0803744C
-	bl sub_800A5B4
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x4
-	ands r0, r1
-	cmp r0, 0
-	bne _080373CA
-	ldr r0, =gUnknown_0203BD2C
-	lsls r1, r5, 8
-	ldr r2, =gUnknown_020223C4
-	adds r1, r2
-	movs r2, 0x4
-	bl memcpy
-_080373CA:
-	ldr r1, =gBattleCommunication
-	b _08037446
-	.pool
-_080373E0:
-	ldr r0, =gUnknown_02024333
-	adds r1, r0, 0x1
-	bl battle_load_something
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803744C
-	ldr r2, =gUnknown_03005D00
-	ldr r1, =gMain
-	ldr r0, [r1]
-	str r0, [r2]
-	ldr r0, =sub_8039EF0
-	str r0, [r1]
-	ldr r0, =BattleMainCB2
-	bl SetMainCallback2
-	ldr r2, =gBattleTypeFlags
-	ldr r1, [r2]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0803744C
-	movs r0, 0x20
-	orrs r1, r0
-	str r1, [r2]
-	b _0803744C
-	.pool
-_0803742C:
-	ldr r0, =gBattleCommunication
-	ldrb r1, [r0]
-	adds r1, 0x1
-	strb r1, [r0]
-	movs r1, 0x1
-	strb r1, [r0, 0x1]
-_08037438:
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1, 0x1]
-	subs r0, 0x1
-	strb r0, [r1, 0x1]
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803744C
-_08037446:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-_0803744C:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8036FAC
-
-	thumb_func_start sub_8037458
-sub_8037458: @ 8037458
-	push {r4-r7,lr}
-	sub sp, 0x4
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl GetMultiplayerId
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r0, =gBattleScripting
-	adds r0, 0x25
-	strb r6, [r0]
-	movs r0, 0x1
-	adds r7, r6, 0
-	eors r7, r0
-	ldr r0, =gBattleCommunication
-	ldrb r0, [r0]
-	cmp r0, 0x10
-	bls _08037486
-	b _080379D6
-_08037486:
-	lsls r0, 2
-	ldr r1, =_0803749C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_0803749C:
-	.4byte _080374E0
-	.4byte _08037518
-	.4byte _0803761C
-	.4byte _08037670
-	.4byte _08037694
-	.4byte _08037710
-	.4byte _08037734
-	.4byte _080377B0
-	.4byte _080377CC
-	.4byte _080377FC
-	.4byte _08037818
-	.4byte _08037848
-	.4byte _08037864
-	.4byte _08037908
-	.4byte _0803793A
-	.4byte _0803795C
-	.4byte _080379A0
-_080374E0:
-	bl IsDma3ManagerBusyWithBgCopy
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803750C
-	movs r0, 0
-	bl ShowBg
-	movs r0, 0x1
-	bl ShowBg
-	movs r0, 0x2
-	bl ShowBg
-	movs r0, 0x3
-	bl ShowBg
-	bl sub_805EF14
-	ldr r1, =gBattleCommunication
-	movs r0, 0x1
-	strb r0, [r1]
-_0803750C:
-	ldr r0, =gLinkVSyncDisabled
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08037518
-	bl sub_800E0E8
-_08037518:
-	ldr r2, =gBattleTypeFlags
-	ldr r1, [r2]
-	movs r3, 0x2
-	adds r0, r1, 0
-	ands r0, r3
-	cmp r0, 0
-	beq _080375FC
-	ldr r0, =gUnknown_03003124
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08037530
-	b _080379D6
-_08037530:
-	ldr r6, =gLinkPlayers
-	movs r0, 0
-	strh r0, [r6, 0x18]
-	strh r3, [r6, 0x34]
-	adds r1, r6, 0
-	adds r1, 0x50
-	movs r0, 0x1
-	strh r0, [r1]
-	adds r1, 0x1C
-	movs r0, 0x3
-	strh r0, [r1]
-	adds r0, r6, 0
-	adds r0, 0x40
-	ldr r4, =gTrainerBattleOpponent_A
-	ldrh r1, [r4]
-	bl GetFrontierTrainerName
-	adds r0, r6, 0
-	adds r0, 0x5C
-	ldr r5, =gTrainerBattleOpponent_B
-	ldrh r1, [r5]
-	bl GetFrontierTrainerName
-	ldrh r1, [r4]
-	mov r0, sp
-	bl sub_8165B88
-	mov r0, sp
-	ldrb r0, [r0]
-	adds r1, r6, 0
-	adds r1, 0x52
-	strh r0, [r1]
-	ldrh r1, [r5]
-	mov r0, sp
-	bl sub_8165B88
-	mov r0, sp
-	ldrb r1, [r0]
-	adds r0, r6, 0
-	adds r0, 0x6E
-	strh r1, [r0]
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	beq _080375C4
-	ldr r4, =gBattleStruct
-	ldr r0, [r4]
-	movs r5, 0xC0
-	lsls r5, 1
-	adds r0, r5
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r4]
-	ldr r2, =0x00000181
-	adds r1, r0, r2
-	movs r0, 0x3
-	strb r0, [r1]
-	bl sub_8036A5C
-	bl sub_8036B44
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, [r4]
-	adds r1, r5
-	movs r2, 0x20
-	bl link_0800A448
-	ldr r1, =gBattleCommunication
-	movs r0, 0x2
-	strb r0, [r1]
-_080375C4:
-	ldr r0, =gLinkVSyncDisabled
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080375CE
-	b _080379D6
-_080375CE:
-	movs r0, 0
-	movs r1, 0
-	bl sub_800DFB4
-	b _080379D6
-	.pool
-_080375FC:
-	movs r0, 0x80
-	lsls r0, 17
-	ands r0, r1
-	cmp r0, 0
-	bne _0803760C
-	movs r0, 0x4
-	orrs r1, r0
-	str r1, [r2]
-_0803760C:
-	ldr r1, =gBattleCommunication
-	movs r0, 0xD
-	strb r0, [r1]
-	bl berry_801017C
-	b _080379D6
-	.pool
-_0803761C:
-	bl sub_800A550
-	movs r1, 0x3
-	ands r1, r0
-	cmp r1, 0x3
-	beq _0803762A
-	b _080379D6
-_0803762A:
-	bl sub_800A5B4
-	movs r0, 0x2
-	adds r1, r6, 0
-	bl sub_8036EB8
-	bl berry_801017C
-	ldr r0, =task00_0800F6FC
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r2, 0
-	movs r0, 0x87
-	lsls r0, 1
-	strh r0, [r1, 0xA]
-	movs r0, 0x5A
-	strh r0, [r1, 0xC]
-	strh r2, [r1, 0x12]
-	adds r0, 0xEB
-	strh r0, [r1, 0xE]
-	strh r0, [r1, 0x10]
-	b _08037986
-	.pool
-_08037670:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803767C
-	b _080379D6
-_0803767C:
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gPlayerParty
-_08037686:
-	movs r2, 0xC8
-	bl link_0800A448
-	b _08037986
-	.pool
-_08037694:
-	bl sub_800A550
-	movs r1, 0x3
-	ands r1, r0
-	cmp r1, 0x3
-	beq _080376A2
-	b _080379D6
-_080376A2:
-	bl sub_800A5B4
-	ldr r0, =gLinkPlayers
-	lsls r1, r6, 3
-	subs r1, r6
-	lsls r1, 2
-	adds r1, r0
-	ldrh r0, [r1, 0x18]
-	cmp r0, 0
-	beq _080376E8
-	ldr r4, =gPlayerParty
-	lsls r1, r7, 8
-	ldr r5, =gUnknown_020223C4
-	adds r1, r5
-	adds r0, r4, 0
-	movs r2, 0xC8
-	bl memcpy
-	movs r0, 0x96
-	lsls r0, 1
-	adds r4, r0
-	lsls r1, r6, 8
-	adds r1, r5
-	adds r0, r4, 0
-	movs r2, 0xC8
-	bl memcpy
-	b _08037986
-	.pool
-_080376E8:
-	ldr r4, =gPlayerParty
-	lsls r1, r6, 8
-	ldr r5, =gUnknown_020223C4
-	adds r1, r5
-	adds r0, r4, 0
-	movs r2, 0xC8
-	bl memcpy
-	movs r1, 0x96
-	lsls r1, 1
-	adds r4, r1
-	lsls r1, r7, 8
-	adds r1, r5
-	adds r0, r4, 0
-	movs r2, 0xC8
-	b _08037982
-	.pool
-_08037710:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803771C
-	b _080379D6
-_0803771C:
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gPlayerParty + 200
-	movs r2, 0x64
-	bl link_0800A448
-	b _08037986
-	.pool
-_08037734:
-	bl sub_800A550
-	movs r1, 0x3
-	ands r1, r0
-	cmp r1, 0x3
-	beq _08037742
-	b _080379D6
-_08037742:
-	bl sub_800A5B4
-	ldr r0, =gLinkPlayers
-	lsls r1, r6, 3
-	subs r1, r6
-	lsls r1, 2
-	adds r1, r0
-	ldrh r0, [r1, 0x18]
-	cmp r0, 0
-	beq _08037788
-	ldr r4, =gPlayerParty + 200
-	lsls r1, r7, 8
-	ldr r5, =gUnknown_020223C4
-	adds r1, r5
-	adds r0, r4, 0
-	movs r2, 0x64
-	bl memcpy
-	movs r2, 0x96
-	lsls r2, 1
-	adds r4, r2
-	lsls r1, r6, 8
-	adds r1, r5
-	adds r0, r4, 0
-	movs r2, 0x64
-	bl memcpy
-	b _08037986
-	.pool
-_08037788:
-	ldr r4, =gPlayerParty + 200
-	lsls r1, r6, 8
-	ldr r5, =gUnknown_020223C4
-	adds r1, r5
-	adds r0, r4, 0
-	movs r2, 0x64
-	bl memcpy
-	movs r0, 0x96
-	lsls r0, 1
-	adds r4, r0
-	lsls r1, r7, 8
-	adds r1, r5
-	adds r0, r4, 0
-	movs r2, 0x64
-	b _08037982
-	.pool
-_080377B0:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	bne _080377BC
-	b _080379D6
-_080377BC:
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gEnemyParty
-	b _08037686
-	.pool
-_080377CC:
-	bl sub_800A550
-	movs r1, 0x3
-	ands r1, r0
-	cmp r1, 0x3
-	beq _080377DA
-	b _080379D6
-_080377DA:
-	bl sub_800A5B4
-	bl GetMultiplayerId
-	lsls r0, 24
-	cmp r0, 0
-	bne _080377EA
-	b _08037986
-_080377EA:
-	ldr r0, =gEnemyParty
-	ldr r1, =gUnknown_020223C4
-	movs r2, 0xC8
-	b _08037982
-	.pool
-_080377FC:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	bne _08037808
-	b _080379D6
-_08037808:
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gEnemyParty + 200
-	b _08037686
-	.pool
-_08037818:
-	bl sub_800A550
-	movs r1, 0x3
-	ands r1, r0
-	cmp r1, 0x3
-	beq _08037826
-	b _080379D6
-_08037826:
-	bl sub_800A5B4
-	bl GetMultiplayerId
-	lsls r0, 24
-	cmp r0, 0
-	bne _08037836
-	b _08037986
-_08037836:
-	ldr r0, =gEnemyParty + 200
-	ldr r1, =gUnknown_020223C4
-	movs r2, 0xC8
-	b _08037982
-	.pool
-_08037848:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	bne _08037854
-	b _080379D6
-_08037854:
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gEnemyParty + 400
-	b _08037686
-	.pool
-_08037864:
-	bl sub_800A550
-	movs r1, 0x3
-	ands r1, r0
-	cmp r1, 0x3
-	beq _08037872
-	b _080379D6
-_08037872:
-	bl sub_800A5B4
-	bl GetMultiplayerId
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803788A
-	ldr r0, =gEnemyParty + 400
-	ldr r1, =gUnknown_020223C4
-	movs r2, 0xC8
-	bl memcpy
-_0803788A:
-	ldr r4, =gPlayerParty
-	adds r0, r4, 0
-	bl shedinja_something
-	adds r0, r4, 0
-	adds r0, 0x64
-	bl shedinja_something
-	adds r0, r4, 0
-	adds r0, 0xC8
-	bl shedinja_something
-	movs r1, 0x96
-	lsls r1, 1
-	adds r0, r4, r1
-	bl shedinja_something
-	movs r2, 0xC8
-	lsls r2, 1
-	adds r0, r4, r2
-	bl shedinja_something
-	movs r1, 0xFA
-	lsls r1, 1
-	adds r0, r4, r1
-	bl shedinja_something
-	ldr r4, =gEnemyParty
-	adds r0, r4, 0
-	bl shedinja_something
-	adds r0, r4, 0
-	adds r0, 0x64
-	bl shedinja_something
-	adds r0, r4, 0
-	adds r0, 0xC8
-	bl shedinja_something
-	movs r2, 0x96
-	lsls r2, 1
-	adds r0, r4, r2
-	bl shedinja_something
-	movs r1, 0xC8
-	lsls r1, 1
-	adds r0, r4, r1
-	bl shedinja_something
-	movs r2, 0xFA
-	lsls r2, 1
-	adds r0, r4, r2
-	bl shedinja_something
-	b _08037986
-	.pool
-_08037908:
-	bl sub_8032768
-	bl sub_8184E58
-	ldr r2, =gBattleCommunication
-	movs r0, 0
-	strb r0, [r2, 0x1]
-	strb r0, [r2, 0x2]
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08037934
-	movs r0, 0xE
-	strb r0, [r2]
-	b _080379D6
-	.pool
-_08037934:
-	movs r0, 0x10
-	strb r0, [r2]
-	b _080379D6
-_0803793A:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	beq _080379D6
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gUnknown_0203BD2C
-	movs r2, 0x4
-	bl link_0800A448
-	b _08037986
-	.pool
-_0803795C:
-	bl sub_800A550
-	movs r1, 0x3
-	ands r1, r0
-	cmp r1, 0x3
-	bne _080379D6
-	bl sub_800A5B4
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x4
-	ands r0, r1
-	cmp r0, 0
-	bne _08037986
-	ldr r0, =gUnknown_0203BD2C
-	lsls r1, r7, 8
-	ldr r2, =gUnknown_020223C4
-	adds r1, r2
-	movs r2, 0x4
-_08037982:
-	bl memcpy
-_08037986:
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _080379D6
-	.pool
-_080379A0:
-	ldr r0, =gUnknown_02024333
-	adds r1, r0, 0x1
-	bl battle_load_something
-	lsls r0, 24
-	cmp r0, 0
-	beq _080379D6
-	bl sub_8166188
-	ldr r2, =gUnknown_03005D00
-	ldr r1, =gMain
-	ldr r0, [r1]
-	str r0, [r2]
-	ldr r0, =sub_8039EF0
-	str r0, [r1]
-	ldr r0, =BattleMainCB2
-	bl SetMainCallback2
-	ldr r2, =gBattleTypeFlags
-	ldr r1, [r2]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _080379D6
-	movs r0, 0x20
-	orrs r1, r0
-	str r1, [r2]
-_080379D6:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8037458
-
-	thumb_func_start sub_80379F8
-sub_80379F8: @ 80379F8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp]
-	movs r0, 0
-	mov r8, r0
-	ldr r6, =gUnknown_02022FF8
-	mov r10, r6
-_08037A12:
-	ldr r1, [sp]
-	add r1, r8
-	movs r0, 0x64
-	adds r4, r1, 0
-	muls r4, r0
-	ldr r0, =gPlayerParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0xB
-	bl GetMonData
-	mov r1, r8
-	lsls r5, r1, 5
-	strh r0, [r6]
-	adds r0, r4, 0
-	movs r1, 0xC
-	bl GetMonData
-	strh r0, [r6, 0x2]
-	movs r0, 0x4
-	add r0, r10
-	mov r9, r0
-	adds r7, r5, r0
-	adds r0, r4, 0
-	movs r1, 0x2
-	adds r2, r7, 0
-	bl GetMonData
-	adds r0, r4, 0
-	movs r1, 0x38
-	bl GetMonData
-	strb r0, [r6, 0xF]
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	strh r0, [r6, 0x10]
-	adds r0, r4, 0
-	movs r1, 0x3A
-	bl GetMonData
-	strh r0, [r6, 0x12]
-	adds r0, r4, 0
-	movs r1, 0x37
-	bl GetMonData
-	mov r1, r10
-	adds r1, 0x14
-	adds r5, r1
-	str r0, [r5]
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetMonData
-	str r0, [r6, 0x18]
-	adds r0, r4, 0
-	bl GetMonGender
-	strb r0, [r6, 0x1C]
-	adds r0, r7, 0
-	bl StripExtCtrlCodes
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl GetMonData
-	cmp r0, 0x1
-	beq _08037AA4
-	adds r0, r7, 0
-	movs r1, 0
-	bl sub_81DB4DC
-_08037AA4:
-	adds r6, 0x20
-	movs r1, 0x1
-	add r8, r1
-	mov r0, r8
-	cmp r0, 0x2
-	ble _08037A12
-	ldr r0, =gUnknown_02023058
-	ldr r0, [r0]
-	mov r1, r9
-	subs r1, 0x4
-	movs r2, 0x60
-	bl memcpy
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80379F8
-
-	thumb_func_start sub_8037ADC
-sub_8037ADC: @ 8037ADC
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	movs r0, 0x4
-	mov r9, r0
-	movs r4, 0xF
-	ldr r6, =gBattleTypeFlags
-	ldr r0, [r6]
-	movs r1, 0x80
-	lsls r1, 1
-	ands r0, r1
-	cmp r0, 0
-	beq _08037B02
-	movs r1, 0x2
-	mov r9, r1
-	movs r4, 0x3
-_08037B02:
-	bl GetMultiplayerId
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r0, =gBattleScripting
-	adds r0, 0x25
-	movs r2, 0
-	mov r8, r2
-	strb r7, [r0]
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-	adds r1, r0, 0
-	adds r1, 0xB4
-	str r1, [sp]
-	adds r0, 0xAC
-	mov r10, r0
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	ldr r5, =gBattleCommunication
-	ldrb r0, [r5]
-	cmp r0, 0x1
-	beq _08037BA4
-	cmp r0, 0x1
-	bgt _08037B50
-	cmp r0, 0
-	beq _08037B5E
-	b _08037D0A
-	.pool
-_08037B50:
-	cmp r0, 0x2
-	bne _08037B56
-	b _08037C64
-_08037B56:
-	cmp r0, 0x3
-	bne _08037B5C
-	b _08037C9E
-_08037B5C:
-	b _08037D0A
-_08037B5E:
-	ldr r0, =gUnknown_03003124
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08037B68
-	b _08037D0A
-_08037B68:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	bne _08037B74
-	b _08037D0A
-_08037B74:
-	ldr r4, =gUnknown_02023058
-	movs r0, 0x60
-	bl Alloc
-	str r0, [r4]
-	movs r0, 0
-	bl sub_80379F8
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, [r4]
-	movs r2, 0x60
-	bl link_0800A448
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-	b _08037D0A
-	.pool
-_08037BA4:
-	bl sub_800A550
-	adds r1, r4, 0
-	ands r1, r0
-	cmp r1, r4
-	beq _08037BB2
-	b _08037D0A
-_08037BB2:
-	bl sub_800A5B4
-	movs r5, 0
-	cmp r8, r9
-	bge _08037C2E
-	lsls r0, r7, 3
-	subs r0, r7
-	lsls r6, r0, 2
-	mov r8, r5
-	ldr r4, =gUnknown_020223C4
-_08037BC6:
-	cmp r5, r7
-	beq _08037C1E
-	mov r2, r9
-	cmp r2, 0x4
-	bne _08037C14
-	ldr r2, =gLinkPlayers
-	mov r1, r8
-	adds r0, r1, r2
-	ldrh r1, [r0, 0x18]
-	movs r3, 0x1
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _08037BF8
-	adds r0, r6, r2
-	ldrh r1, [r0, 0x18]
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08037C04
-	b _08037C1E
-	.pool
-_08037BF8:
-	adds r0, r6, r2
-	ldrh r1, [r0, 0x18]
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08037C1E
-_08037C04:
-	ldr r0, =gUnknown_02022FF8
-	adds r1, r4, 0
-	movs r2, 0x60
-	bl memcpy
-	b _08037C1E
-	.pool
-_08037C14:
-	ldr r0, =gUnknown_02022FF8
-	adds r1, r4, 0
-	movs r2, 0x60
-	bl memcpy
-_08037C1E:
-	movs r2, 0x80
-	lsls r2, 1
-	adds r4, r2
-	movs r0, 0x1C
-	add r8, r0
-	adds r5, 0x1
-	cmp r5, r9
-	blt _08037BC6
-_08037C2E:
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r1, =gMain
-	ldr r0, [r1, 0x8]
-	ldr r2, [sp]
-	str r0, [r2]
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	mov r2, r10
-	str r0, [r2]
-	ldr r0, =sub_8037ADC
-	str r0, [r1, 0x8]
-	bl sub_81B9150
-	b _08037D0A
-	.pool
-_08037C64:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	beq _08037D0A
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08037D0A
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-	ldr r0, =gLinkVSyncDisabled
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08037C98
-	bl sub_800ADF8
-	b _08037D0A
-	.pool
-_08037C98:
-	bl sub_800AC34
-	b _08037D0A
-_08037C9E:
-	ldr r0, =gLinkVSyncDisabled
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08037CE4
-	bl sub_8010500
-	lsls r0, 24
-	cmp r0, 0
-	beq _08037D0A
-	mov r1, r10
-	ldr r0, [r1]
-	str r0, [r6]
-	ldr r1, =gMain
-	ldr r2, [sp]
-	ldr r0, [r2]
-	str r0, [r1, 0x8]
-	ldr r0, =InitBattle
-	bl SetMainCallback2
-	ldr r4, =gUnknown_02023058
-	ldr r0, [r4]
-	bl Free
-	mov r0, r8
-	str r0, [r4]
-	b _08037D0A
-	.pool
-_08037CE4:
-	ldr r0, =gUnknown_03003124
-	ldrb r5, [r0]
-	cmp r5, 0
-	bne _08037D0A
-	mov r1, r10
-	ldr r0, [r1]
-	str r0, [r6]
-	ldr r1, =gMain
-	ldr r2, [sp]
-	ldr r0, [r2]
-	str r0, [r1, 0x8]
-	ldr r0, =InitBattle
-	bl SetMainCallback2
-	ldr r4, =gUnknown_02023058
-	ldr r0, [r4]
-	bl Free
-	str r5, [r4]
-_08037D0A:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8037ADC
-
-	thumb_func_start intro_end
-intro_end: @ 8037D2C
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-	movs r1, 0xB4
-	adds r1, r0
-	mov r8, r1
-	adds r7, r0, 0
-	adds r7, 0xAC
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	ldr r5, =gBattleCommunication
-	ldrb r0, [r5]
-	cmp r0, 0
-	beq _08037D64
-	cmp r0, 0x1
-	beq _08037DA4
-	b _08037DD6
-	.pool
-_08037D64:
-	ldr r4, =gUnknown_02023058
-	movs r0, 0x60
-	bl Alloc
-	str r0, [r4]
-	movs r0, 0x3
-	bl sub_80379F8
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-	ldr r1, =gMain
-	ldr r0, [r1, 0x8]
-	mov r2, r8
-	str r0, [r2]
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	str r0, [r7]
-	ldr r0, =intro_end
-	str r0, [r1, 0x8]
-	bl sub_81B9150
-	b _08037DD6
-	.pool
-_08037DA4:
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0
-	bne _08037DD6
-	movs r0, 0x2
-	strb r0, [r5]
-	ldr r1, =gBattleTypeFlags
-	ldr r0, [r7]
-	str r0, [r1]
-	ldr r1, =gMain
-	mov r2, r8
-	ldr r0, [r2]
-	str r0, [r1, 0x8]
-	ldr r0, =InitBattle
-	bl SetMainCallback2
-	ldr r4, =gUnknown_02023058
-	ldr r0, [r4]
-	bl Free
-	str r6, [r4]
-_08037DD6:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end intro_end
-
-	thumb_func_start sub_8037DF4
-sub_8037DF4: @ 8037DF4
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	bl GetMultiplayerId
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r0, =gBattleScripting
-	adds r0, 0x25
-	strb r7, [r0]
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	ldr r0, =gBattleCommunication
-	ldrb r0, [r0]
-	cmp r0, 0xA
-	bls _08037E20
-	b _080383F8
-_08037E20:
-	lsls r0, 2
-	ldr r1, =_08037E38
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_08037E38:
-	.4byte _08037E64
-	.4byte _08037EA8
-	.4byte _08037F50
-	.4byte _08038026
-	.4byte _0803804C
-	.4byte _08038140
-	.4byte _08038164
-	.4byte _080382CC
-	.4byte _0803832C
-	.4byte _0803836C
-	.4byte _080383BC
-_08037E64:
-	bl IsDma3ManagerBusyWithBgCopy
-	lsls r0, 24
-	cmp r0, 0
-	bne _08037E90
-	movs r0, 0
-	bl ShowBg
-	movs r0, 0x1
-	bl ShowBg
-	movs r0, 0x2
-	bl ShowBg
-	movs r0, 0x3
-	bl ShowBg
-	bl sub_805EF14
-	ldr r1, =gBattleCommunication
-	movs r0, 0x1
-	strb r0, [r1]
-_08037E90:
-	ldr r0, =gLinkVSyncDisabled
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08037E9A
-	b _080383F8
-_08037E9A:
-	bl sub_800E0E8
-	b _080383F8
-	.pool
-_08037EA8:
-	ldr r2, =gBattleTypeFlags
-	ldr r1, [r2]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08037F30
-	ldr r0, =gUnknown_03003124
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08037EBE
-	b _080383F8
-_08037EBE:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	beq _08037F02
-	ldr r4, =gBattleStruct
-	ldr r0, [r4]
-	movs r5, 0xC0
-	lsls r5, 1
-	adds r0, r5
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r4]
-	ldr r2, =0x00000181
-	adds r1, r0, r2
-	movs r0, 0x3
-	strb r0, [r1]
-	bl sub_8036A5C
-	bl sub_8036B44
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, [r4]
-	adds r1, r5
-	movs r2, 0x20
-	bl link_0800A448
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-_08037F02:
-	ldr r0, =gLinkVSyncDisabled
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08037F0C
-	b _080383F8
-_08037F0C:
-	movs r0, 0
-	movs r1, 0
-	bl sub_800DFB4
-	b _080383F8
-	.pool
-_08037F30:
-	movs r0, 0x80
-	lsls r0, 17
-	ands r0, r1
-	cmp r0, 0
-	bne _08037F40
-	movs r0, 0x4
-	orrs r1, r0
-	str r1, [r2]
-_08037F40:
-	ldr r1, =gBattleCommunication
-	movs r0, 0x7
-	strb r0, [r1]
-	bl berry_801017C
-	b _080383F8
-	.pool
-_08037F50:
-	bl sub_800A550
-	movs r1, 0xF
-	ands r1, r0
-	cmp r1, 0xF
-	beq _08037F5E
-	b _080383F8
-_08037F5E:
-	bl sub_800A5B4
-	movs r0, 0x4
-	adds r1, r7, 0
-	bl sub_8036EB8
-	bl berry_801017C
-	bl sub_8068AA4
-	ldr r0, =task00_0800F6FC
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r1, =gTasks
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r1
-	movs r2, 0
-	movs r1, 0x87
-	lsls r1, 1
-	strh r1, [r0, 0xA]
-	movs r1, 0x5A
-	strh r1, [r0, 0xC]
-	strh r2, [r0, 0x12]
-	strh r2, [r0, 0xE]
-	strh r2, [r0, 0x10]
-	ldr r1, =gUnknown_020223C4
-	adds r4, r0, 0
-	adds r5, r1, 0x2
-	movs r7, 0x3F
-	movs r6, 0x3
-_08037FA4:
-	ldrh r0, [r5]
-	str r2, [sp]
-	bl sub_8185F90
-	ldr r0, =gLinkPlayers
-	ldr r2, [sp]
-	adds r0, r2, r0
-	ldrh r0, [r0, 0x18]
-	cmp r0, 0x1
-	beq _08037FE6
-	cmp r0, 0x1
-	bgt _08037FD4
-	cmp r0, 0
-	beq _08037FDE
-	b _0803800C
-	.pool
-_08037FD4:
-	cmp r0, 0x2
-	beq _08037FEE
-	cmp r0, 0x3
-	beq _08037FFE
-	b _0803800C
-_08037FDE:
-	ldrh r0, [r5]
-	adds r1, r7, 0
-	ands r1, r0
-	b _08037FF6
-_08037FE6:
-	ldrh r0, [r5]
-	adds r1, r7, 0
-	ands r1, r0
-	b _08038006
-_08037FEE:
-	ldrh r0, [r5]
-	adds r1, r7, 0
-	ands r1, r0
-	lsls r1, 6
-_08037FF6:
-	ldrh r0, [r4, 0xE]
-	orrs r1, r0
-	strh r1, [r4, 0xE]
-	b _0803800C
-_08037FFE:
-	ldrh r0, [r5]
-	adds r1, r7, 0
-	ands r1, r0
-	lsls r1, 6
-_08038006:
-	ldrh r0, [r4, 0x10]
-	orrs r1, r0
-	strh r1, [r4, 0x10]
-_0803800C:
-	movs r0, 0x80
-	lsls r0, 1
-	adds r5, r0
-	adds r2, 0x1C
-	subs r6, 0x1
-	cmp r6, 0
-	bge _08037FA4
-	bl ZeroEnemyPartyMons
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-_08038026:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	bne _08038032
-	b _080383F8
-_08038032:
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gPlayerParty
-	movs r2, 0xC8
-	bl link_0800A448
-	b _080383A6
-	.pool
-_0803804C:
-	bl sub_800A550
-	movs r1, 0xF
-	ands r1, r0
-	cmp r1, 0xF
-	beq _0803805A
-	b _080383F8
-_0803805A:
-	bl sub_800A5B4
-	movs r6, 0
-	lsls r0, r7, 3
-	subs r0, r7
-	lsls r0, 2
-	mov r8, r0
-	ldr r4, =gUnknown_020223C4
-	movs r5, 0
-_0803806C:
-	cmp r6, r7
-	bne _080380A0
-	ldr r0, =gLinkPlayers
-	adds r0, r5, r0
-	ldrh r0, [r0, 0x18]
-	cmp r0, 0x2
-	bgt _0803808C
-	cmp r0, 0x1
-	bge _08038098
-	cmp r0, 0
-	beq _08038090
-	b _0803812A
-	.pool
-_0803808C:
-	cmp r0, 0x3
-	bne _0803812A
-_08038090:
-	ldr r0, =gPlayerParty
-	b _08038110
-	.pool
-_08038098:
-	ldr r0, =gPlayerParty + 300
-	b _08038110
-	.pool
-_080380A0:
-	ldr r2, =gLinkPlayers
-	adds r0, r5, r2
-	ldrh r1, [r0, 0x18]
-	movs r3, 0x1
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _080380C4
-	mov r1, r8
-	adds r0, r1, r2
-	ldrh r1, [r0, 0x18]
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _080380D2
-	b _080380F8
-	.pool
-_080380C4:
-	mov r1, r8
-	adds r0, r1, r2
-	ldrh r1, [r0, 0x18]
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _080380F8
-_080380D2:
-	adds r0, r5, r2
-	ldrh r0, [r0, 0x18]
-	cmp r0, 0x2
-	bgt _080380E4
-	cmp r0, 0x1
-	bge _080380F0
-	cmp r0, 0
-	beq _080380E8
-	b _0803812A
-_080380E4:
-	cmp r0, 0x3
-	bne _0803812A
-_080380E8:
-	ldr r0, =gPlayerParty
-	b _08038110
-	.pool
-_080380F0:
-	ldr r0, =gPlayerParty + 300
-	b _08038110
-	.pool
-_080380F8:
-	adds r0, r5, r2
-	ldrh r0, [r0, 0x18]
-	cmp r0, 0x2
-	bgt _0803810A
-	cmp r0, 0x1
-	bge _08038120
-	cmp r0, 0
-	beq _0803810E
-	b _0803812A
-_0803810A:
-	cmp r0, 0x3
-	bne _0803812A
-_0803810E:
-	ldr r0, =gEnemyParty
-_08038110:
-	adds r1, r4, 0
-	movs r2, 0xC8
-	bl memcpy
-	b _0803812A
-	.pool
-_08038120:
-	ldr r0, =gEnemyParty + 300
-	adds r1, r4, 0
-	movs r2, 0xC8
-	bl memcpy
-_0803812A:
-	movs r2, 0x80
-	lsls r2, 1
-	adds r4, r2
-	adds r5, 0x1C
-	adds r6, 0x1
-	cmp r6, 0x3
-	ble _0803806C
-	b _080383A6
-	.pool
-_08038140:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803814C
-	b _080383F8
-_0803814C:
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gPlayerParty + 200
-	movs r2, 0x64
-	bl link_0800A448
-	b _080383A6
-	.pool
-_08038164:
-	bl sub_800A550
-	movs r1, 0xF
-	ands r1, r0
-	cmp r1, 0xF
-	beq _08038172
-	b _080383F8
-_08038172:
-	bl sub_800A5B4
-	movs r6, 0
-	lsls r0, r7, 3
-	subs r0, r7
-	lsls r0, 2
-	mov r8, r0
-	ldr r4, =gUnknown_020223C4
-	movs r5, 0
-_08038184:
-	cmp r6, r7
-	bne _080381B8
-	ldr r0, =gLinkPlayers
-	adds r0, r5, r0
-	ldrh r0, [r0, 0x18]
-	cmp r0, 0x2
-	bgt _080381A4
-	cmp r0, 0x1
-	bge _080381B0
-	cmp r0, 0
-	beq _080381A8
-	b _08038242
-	.pool
-_080381A4:
-	cmp r0, 0x3
-	bne _08038242
-_080381A8:
-	ldr r0, =gPlayerParty + 200
-	b _08038228
-	.pool
-_080381B0:
-	ldr r0, =gPlayerParty + 500
-	b _08038228
-	.pool
-_080381B8:
-	ldr r2, =gLinkPlayers
-	adds r0, r5, r2
-	ldrh r1, [r0, 0x18]
-	movs r3, 0x1
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _080381DC
-	mov r1, r8
-	adds r0, r1, r2
-	ldrh r1, [r0, 0x18]
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _080381EA
-	b _08038210
-	.pool
-_080381DC:
-	mov r1, r8
-	adds r0, r1, r2
-	ldrh r1, [r0, 0x18]
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08038210
-_080381EA:
-	adds r0, r5, r2
-	ldrh r0, [r0, 0x18]
-	cmp r0, 0x2
-	bgt _080381FC
-	cmp r0, 0x1
-	bge _08038208
-	cmp r0, 0
-	beq _08038200
-	b _08038242
-_080381FC:
-	cmp r0, 0x3
-	bne _08038242
-_08038200:
-	ldr r0, =gPlayerParty + 200
-	b _08038228
-	.pool
-_08038208:
-	ldr r0, =gPlayerParty + 500
-	b _08038228
-	.pool
-_08038210:
-	adds r0, r5, r2
-	ldrh r0, [r0, 0x18]
-	cmp r0, 0x2
-	bgt _08038222
-	cmp r0, 0x1
-	bge _08038238
-	cmp r0, 0
-	beq _08038226
-	b _08038242
-_08038222:
-	cmp r0, 0x3
-	bne _08038242
-_08038226:
-	ldr r0, =gEnemyParty + 200
-_08038228:
-	adds r1, r4, 0
-	movs r2, 0x64
-	bl memcpy
-	b _08038242
-	.pool
-_08038238:
-	ldr r0, =gEnemyParty + 500
-	adds r1, r4, 0
-	movs r2, 0x64
-	bl memcpy
-_08038242:
-	movs r2, 0x80
-	lsls r2, 1
-	adds r4, r2
-	adds r5, 0x1C
-	adds r6, 0x1
-	cmp r6, 0x3
-	ble _08038184
-	ldr r4, =gPlayerParty
-	adds r0, r4, 0
-	bl shedinja_something
-	adds r0, r4, 0
-	adds r0, 0x64
-	bl shedinja_something
-	adds r0, r4, 0
-	adds r0, 0xC8
-	bl shedinja_something
-	movs r1, 0x96
-	lsls r1, 1
-	adds r0, r4, r1
-	bl shedinja_something
-	movs r2, 0xC8
-	lsls r2, 1
-	adds r0, r4, r2
-	bl shedinja_something
-	movs r1, 0xFA
-	lsls r1, 1
-	adds r0, r4, r1
-	bl shedinja_something
-	ldr r4, =gEnemyParty
-	adds r0, r4, 0
-	bl shedinja_something
-	adds r0, r4, 0
-	adds r0, 0x64
-	bl shedinja_something
-	adds r0, r4, 0
-	adds r0, 0xC8
-	bl shedinja_something
-	movs r2, 0x96
-	lsls r2, 1
-	adds r0, r4, r2
-	bl shedinja_something
-	movs r1, 0xC8
-	lsls r1, 1
-	adds r0, r4, r1
-	bl shedinja_something
-	movs r2, 0xFA
-	lsls r2, 1
-	adds r0, r4, r2
-	bl shedinja_something
-	b _080383A6
-	.pool
-_080382CC:
-	bl sub_8032768
-	bl sub_8184E58
-	ldr r3, =gBattleCommunication
-	movs r0, 0
-	strb r0, [r3, 0x1]
-	strb r0, [r3, 0x2]
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08038326
-	movs r6, 0
-	ldr r0, =gLinkPlayers
-	ldrb r1, [r0]
-	adds r4, r3, 0
-	adds r2, r0, 0
-	cmp r1, 0x3
-	bne _0803830A
-	movs r3, 0xFF
-_080382F8:
-	adds r2, 0x1C
-	adds r6, 0x1
-	cmp r6, 0x3
-	bgt _0803830A
-	ldrh r1, [r2]
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0x3
-	beq _080382F8
-_0803830A:
-	cmp r6, 0x4
-	bne _08038320
-	movs r0, 0x8
-	strb r0, [r4]
-	b _080383F8
-	.pool
-_08038320:
-	movs r0, 0xA
-	strb r0, [r4]
-	b _080383F8
-_08038326:
-	movs r0, 0xA
-	strb r0, [r3]
-	b _080383F8
-_0803832C:
-	bl sub_800A520
-	lsls r0, 24
-	cmp r0, 0
-	beq _080383F8
-	ldr r0, =gBattleStruct
-	ldr r4, [r0]
-	movs r0, 0xC0
-	lsls r0, 1
-	adds r4, r0
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	str r0, [r4]
-	ldr r0, =gUnknown_0203BD2C
-	ldr r0, [r0]
-	str r0, [r4, 0x4]
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r4, 0
-	movs r2, 0x8
-	bl link_0800A448
-	b _080383A6
-	.pool
-_0803836C:
-	bl sub_800A550
-	movs r1, 0xF
-	ands r1, r0
-	cmp r1, 0xF
-	bne _080383F8
-	bl sub_800A5B4
-	movs r2, 0
-	b _08038386
-_08038380:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-_08038386:
-	cmp r2, 0x3
-	bhi _080383A6
-	ldr r4, =gUnknown_020223C4
-	lsls r3, r2, 8
-	adds r0, r3, r4
-	ldrh r0, [r0]
-	movs r1, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _08038380
-	adds r1, r4, 0x4
-	adds r1, r3, r1
-	ldr r0, =gUnknown_0203BD2C
-	movs r2, 0x4
-	bl memcpy
-_080383A6:
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _080383F8
-	.pool
-_080383BC:
-	ldr r0, =gUnknown_02024333
-	adds r1, r0, 0x1
-	bl battle_load_something
-	lsls r0, 24
-	cmp r0, 0
-	beq _080383F8
-	ldr r2, =gUnknown_03005D00
-	ldr r1, =gMain
-	ldr r0, [r1]
-	str r0, [r2]
-	ldr r0, =sub_8039EF0
-	str r0, [r1]
-	ldr r0, =BattleMainCB2
-	bl SetMainCallback2
-	ldr r3, =gBattleTypeFlags
-	ldr r2, [r3]
-	movs r0, 0x2
-	ands r0, r2
-	cmp r0, 0
-	beq _080383F8
-	ldr r0, =gTrainerBattleOpponent_A
-	movs r4, 0x80
-	lsls r4, 4
-	adds r1, r4, 0
-	strh r1, [r0]
-	movs r0, 0x20
-	orrs r2, r0
-	str r2, [r3]
-_080383F8:
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8037DF4
 
 	thumb_func_start BattleMainCB2
 BattleMainCB2: @ 8038420
@@ -3209,7 +58,7 @@ _08038482:
 sub_803849C: @ 803849C
 	push {lr}
 	ldr r1, =gMain
-	ldr r0, =gUnknown_03005D00
+	ldr r0, =gPreBattleCallback1
 	ldr r0, [r0]
 	str r0, [r1]
 	ldr r2, =gUnknown_02039B28
@@ -3351,7 +200,7 @@ _080385C8:
 	asrs r0, 16
 	cmp r0, 0x14
 	bne _080385DC
-	ldr r0, =sub_8036760
+	ldr r0, =CB2_InitBattle
 	bl SetMainCallback2
 _080385DC:
 	pop {r4,r5}
@@ -3917,11 +766,11 @@ VBlankCB_Battle: @ 8038A28
 	bne _08038A3A
 	bl Random
 _08038A3A:
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	ldrh r1, [r0]
 	movs r0, 0x10
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	ldrh r1, [r0]
 	movs r0, 0x12
 	bl SetGpuReg
@@ -3945,23 +794,23 @@ _08038A3A:
 	ldrh r1, [r0]
 	movs r0, 0x1C
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	ldrh r1, [r0]
 	movs r0, 0x1E
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	ldrh r1, [r0]
 	movs r0, 0x40
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	ldrh r1, [r0]
 	movs r0, 0x44
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E28
+	ldr r0, =gBattle_WIN1H
 	ldrh r1, [r0]
 	movs r0, 0x42
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E2A
+	ldr r0, =gBattle_WIN1V
 	ldrh r1, [r0]
 	movs r0, 0x46
 	bl SetGpuReg
@@ -4330,10 +1179,10 @@ _08038DAC:
 	movs r0, 0x4A
 	movs r1, 0
 	bl SetGpuReg
-	ldr r1, =gUnknown_02022E24
+	ldr r1, =gBattle_WIN0H
 	movs r0, 0xF0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r4, [r0]
 	bl dp12_8087EA4
 	ldr r0, =gUnknown_02038C28
@@ -4366,10 +1215,10 @@ _08038E1A:
 	cmp r1, 0x9F
 	ble _08038E1A
 	bl ResetPaletteFade
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r4, 0
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r4, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r4, [r0]
@@ -4381,7 +1230,7 @@ _08038E1A:
 	strh r4, [r0]
 	ldr r0, =gBattle_BG3_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r4, [r0]
 	bl c2_berry_program_update_menu
 	ldr r0, =gUnknown_08C004E0
@@ -4391,7 +1240,7 @@ _08038E1A:
 	bl sub_803570C
 	bl ResetSpriteData
 	bl ResetTasks
-	bl sub_8036154
+	bl LoadBattleEntryBackground
 	movs r0, 0x4A
 	movs r1, 0x37
 	bl SetGpuReg
@@ -4588,7 +1437,7 @@ _08039074:
 	b _080390B0
 	.pool
 _08039090:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08039172
@@ -4705,7 +1554,7 @@ _08039184:
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080391A6
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	beq _080391C6
@@ -4838,9 +1687,9 @@ sub_80392A8: @ 80392A8
 	add r0, sp, 0x4
 	bl CpuSet
 	bl ResetPaletteFade
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r4, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r4, [r0]
@@ -4852,7 +1701,7 @@ sub_80392A8: @ 80392A8
 	strh r4, [r0]
 	ldr r0, =gBattle_BG3_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r4, [r0]
 	bl c2_berry_program_update_menu
 	movs r1, 0x82
@@ -4960,7 +1809,7 @@ _08039414:
 	ands r0, r1
 	cmp r0, 0
 	beq _08039434
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08039434
@@ -5179,7 +2028,7 @@ _08039610:
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08039634
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _08039634
@@ -5708,7 +2557,7 @@ _08039A7C:
 	lsls r0, 24
 	lsrs r0, 24
 	bl GetBankIdentity
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	lsls r0, 24
 	lsrs r0, 22
@@ -6298,8 +3147,8 @@ sub_8039ECC: @ 8039ECC
 	.pool
 	thumb_func_end sub_8039ECC
 
-	thumb_func_start sub_8039EF0
-sub_8039EF0: @ 8039EF0
+	thumb_func_start BattleMainCB1
+BattleMainCB1: @ 8039EF0
 	push {r4,r5,lr}
 	ldr r0, =gBattleMainFunc
 	ldr r0, [r0]
@@ -6333,7 +3182,7 @@ _08039F2A:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8039EF0
+	thumb_func_end BattleMainCB1
 
 	thumb_func_start sub_8039F40
 sub_8039F40: @ 8039F40
@@ -13508,7 +10357,7 @@ _0803DF8C:
 	ands r0, r5
 	cmp r0, 0
 	beq _0803DF9E
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0803DFEC
@@ -13525,7 +10374,7 @@ _0803DF9E:
 	negs r0, r0
 	ands r0, r1
 	strb r0, [r2]
-	ldr r0, =gUnknown_03005D00
+	ldr r0, =gPreBattleCallback1
 	ldr r0, [r0]
 	str r0, [r3]
 	movs r0, 0x80
@@ -14455,10 +11304,10 @@ bs2_8016374: @ 803E868
 	adds r0, r1
 	ldrb r0, [r0]
 	strb r0, [r3]
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r2, 0
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r2, [r0]
 	ldr r1, =gUnknown_020244AC
 	ldrb r0, [r3]
@@ -14521,10 +11370,10 @@ sub_803E90C: @ 803E90C
 	ldrb r0, [r0]
 	strb r0, [r2]
 	strb r0, [r4]
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldrb r0, [r4]
 	bl sub_8045868
@@ -15219,10 +12068,10 @@ sub_803EFA8: @ 803EFA8
 	adds r0, r1
 	ldrb r0, [r0]
 	strb r0, [r2]
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r1, =gBattlescriptCurrInstr
 	ldr r0, =gUnknown_082DBD58
@@ -15244,10 +12093,10 @@ bs5_8016AC0: @ 803EFF0
 	adds r0, r1
 	ldrb r0, [r0]
 	strb r0, [r2]
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r1, =gNumSafariBalls
 	ldrb r0, [r1]
@@ -15277,10 +12126,10 @@ sub_803F050: @ 803F050
 	adds r0, r1
 	ldrb r0, [r0]
 	strb r0, [r3]
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r6, =gBattleCommunication
 	ldr r2, =gBattleBufferB
@@ -15364,10 +12213,10 @@ sub_803F120: @ 803F120
 	adds r0, r1
 	ldrb r0, [r0]
 	strb r0, [r2]
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r4, 0
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r4, [r0]
 	ldr r3, =gBattleStruct
 	ldr r0, [r3]
@@ -15473,10 +12322,10 @@ bs9_8016C9C: @ 803F22C
 	adds r0, r1
 	ldrb r2, [r0]
 	strb r2, [r3]
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r1, =gBattleTextBuff1
 	movs r0, 0xFD
diff --git a/asm/battle_5.s b/asm/battle_5.s
index bb5b406e5..3163631a9 100644
--- a/asm/battle_5.s
+++ b/asm/battle_5.s
@@ -6,8 +6,8 @@
 	.text
 
     
-	thumb_func_start sub_8056F28
-sub_8056F28: @ 8056F28
+	thumb_func_start AllocateBattleResrouces
+AllocateBattleResrouces: @ 8056F28
 	push {r4-r6,lr}
 	ldr r5, =gBattleResources
 	ldr r6, =gBattleTypeFlags
@@ -102,7 +102,7 @@ _08056FFA:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8056F28
+	thumb_func_end AllocateBattleResrouces
 
 	thumb_func_start sub_8057028
 sub_8057028: @ 8057028
diff --git a/asm/battle_7.s b/asm/battle_7.s
index 011559819..82298fbf4 100644
--- a/asm/battle_7.s
+++ b/asm/battle_7.s
@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start dp11_init
-dp11_init: @ 805D118
+	thumb_func_start AllocateBattleSpritesData
+AllocateBattleSpritesData: @ 805D118
 	push {r4,lr}
 	ldr r4, =gUnknown_020244D0
 	movs r0, 0x10
@@ -32,7 +32,7 @@ dp11_init: @ 805D118
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp11_init
+	thumb_func_end AllocateBattleSpritesData
 
 	thumb_func_start dp11_free
 dp11_free: @ 805D158
@@ -1371,7 +1371,7 @@ _0805DC58:
 	lsls r2, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r2, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	lsrs r0, 22
 	adds r1, 0x4
@@ -1543,7 +1543,7 @@ _0805DE00:
 	lsls r0, r5, 3
 	ldr r1, =gMonBackPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	lsls r2, r7, 2
 	adds r1, 0x4
@@ -1558,7 +1558,7 @@ _0805DE2C:
 	lsls r0, r5, 3
 	ldr r1, =gMonBackPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	lsls r2, r7, 2
 	adds r1, 0x4
@@ -1684,7 +1684,7 @@ sub_805DF38: @ 805DF38
 	lsls r4, 3
 	ldr r2, =gTrainerFrontPicTable
 	adds r2, r4, r2
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	lsrs r0, 22
 	adds r1, 0x4
@@ -1718,7 +1718,7 @@ sub_805DF84: @ 805DF84
 	lsls r5, 3
 	ldr r2, =gTrainerBackPicTable
 	adds r2, r5, r2
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	lsrs r0, 22
 	adds r1, 0x4
@@ -1959,7 +1959,7 @@ _0805E1AE:
 load_gfxc_health_bar: @ 805E1B8
 	push {lr}
 	ldr r0, =gUnknown_08C093F0
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	movs r2, 0xBA
 	lsls r2, 1
@@ -1971,8 +1971,8 @@ load_gfxc_health_bar: @ 805E1B8
 	.pool
 	thumb_func_end load_gfxc_health_bar
 
-	thumb_func_start battle_load_something
-battle_load_something: @ 805E1D8
+	thumb_func_start BattleInitAllSprites
+BattleInitAllSprites: @ 805E1D8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -2136,7 +2136,7 @@ _0805E346:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end battle_load_something
+	thumb_func_end BattleInitAllSprites
 
 	thumb_func_start sub_805E350
 sub_805E350: @ 805E350
@@ -2364,7 +2364,7 @@ _0805E51C:
 	lsls r0, r1, 3
 	ldr r1, =gMonBackPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x4]
 	ldr r3, [r2, 0x10]
@@ -2434,7 +2434,7 @@ _0805E59C:
 	lsls r0, r1, 3
 	ldr r1, =gMonBackPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	mov r3, r10
 	lsls r2, r3, 2
@@ -2472,7 +2472,7 @@ _0805E618:
 	lsls r0, r1, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	mov r3, r10
 	lsls r2, r3, 2
@@ -2486,7 +2486,7 @@ _0805E618:
 	mov r2, r8
 	bl HandleLoadSpecialPokePic_DontHandleDeoxys
 _0805E662:
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r0, [r0]
 	mov r2, r10
 	lsls r1, r2, 2
@@ -2666,7 +2666,7 @@ _0805E814:
 	beq _0805E83C
 	ldr r0, =gUnknown_08C2CEE0
 _0805E822:
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	lsls r4, 2
 	adds r1, 0x4
@@ -2677,7 +2677,7 @@ _0805E822:
 	.pool
 _0805E83C:
 	ldr r0, =gUnknown_08C2D120
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	lsls r4, 2
 	adds r1, 0x4
@@ -2688,7 +2688,7 @@ _0805E84E:
 	movs r3, 0x1
 	lsls r6, r5, 4
 	ldr r7, =gUnknown_08C2CEBC
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r0, [r0]
 	adds r0, 0x4
 	adds r4, r0, r4
@@ -3600,15 +3600,15 @@ _0805EFAC:
 	.pool
 	thumb_func_end sub_805EF84
 
-	thumb_func_start init_uns_table_pokemon_copy
-init_uns_table_pokemon_copy: @ 805EFBC
+	thumb_func_start AllocateMonSpritesGfx
+AllocateMonSpritesGfx: @ 805EFBC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
 	mov r5, r8
 	push {r5-r7}
 	movs r6, 0
-	ldr r4, =gBattleSpritesGfx
+	ldr r4, =gMonSpritesGfxPtr
 	str r6, [r4]
 	movs r0, 0xC0
 	lsls r0, 1
@@ -3620,7 +3620,7 @@ init_uns_table_pokemon_copy: @ 805EFBC
 	ldr r1, [r4]
 	str r0, [r1]
 _0805EFE2:
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r1, [r0]
 	lsls r4, r6, 2
 	adds r2, r1, 0x4
@@ -3649,7 +3649,7 @@ _0805EFE2:
 	mov r12, r8
 	adds r7, r4, 0
 _0805F01A:
-	ldr r2, =gBattleSpritesGfx
+	ldr r2, =gMonSpritesGfxPtr
 	ldr r1, [r2]
 	lsls r4, r5, 3
 	add r4, r12
@@ -3672,7 +3672,7 @@ _0805F01A:
 	lsrs r5, r0, 24
 	cmp r5, 0x3
 	bls _0805F01A
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r2, [r1]
 	mov r5, r9
 	adds r0, r5, r6
@@ -3692,7 +3692,7 @@ _0805F01A:
 	movs r0, 0x80
 	lsls r0, 5
 	bl AllocZeroed
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	movs r2, 0xBA
 	lsls r2, 1
@@ -3706,12 +3706,12 @@ _0805F01A:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end init_uns_table_pokemon_copy
+	thumb_func_end AllocateMonSpritesGfx
 
 	thumb_func_start sub_805F094
 sub_805F094: @ 805F094
 	push {r4-r6,lr}
-	ldr r6, =gBattleSpritesGfx
+	ldr r6, =gMonSpritesGfxPtr
 	ldr r0, [r6]
 	cmp r0, 0
 	beq _0805F106
diff --git a/asm/battle_anim.s b/asm/battle_anim.s
index 9c0190214..b9ab95165 100644
--- a/asm/battle_anim.s
+++ b/asm/battle_anim.s
@@ -264,14 +264,14 @@ _080A3BAA:
 	movs r2, 0x80
 	bl m4aMPlayVolumeControl
 _080A3BC2:
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E28
+	ldr r0, =gBattle_WIN1H
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E2A
+	ldr r0, =gBattle_WIN1V
 	strh r1, [r0]
 	add sp, 0x4
 	pop {r3-r5}
diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s
index 860f1a6cb..5cec1cbc5 100644
--- a/asm/battle_anim_80FE840.s
+++ b/asm/battle_anim_80FE840.s
@@ -14561,7 +14561,7 @@ _08105CCC:
 	lsls r0, 6
 	bl AllocZeroed
 	adds r1, r0, 0
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r0, [r0]
 	movs r2, 0xBE
 	lsls r2, 1
@@ -14571,7 +14571,7 @@ _08105CCC:
 	bl LZDecompressWram
 	movs r4, 0
 _08105D00:
-	ldr r5, =gBattleSpritesGfx
+	ldr r5, =gMonSpritesGfxPtr
 	ldr r0, [r5]
 	movs r1, 0xBE
 	lsls r1, 1
@@ -14785,9 +14785,9 @@ sub_8105EB0: @ 8105EB0
 	movs r6, 0x98
 _08105EC4:
 	movs r5, 0
-	ldr r1, =gUnknown_02022E24
+	ldr r1, =gBattle_WIN0H
 	strh r6, [r1]
-	ldr r4, =gUnknown_02022E26
+	ldr r4, =gBattle_WIN0V
 	movs r0, 0xA0
 	strh r0, [r4]
 	ldrh r1, [r1]
@@ -14845,7 +14845,7 @@ sub_8105F30: @ 8105F30
 	lsls r0, r2, 16
 	cmp r1, r0
 	blt _08105F70
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
 	ldr r0, =sub_8105F84
@@ -14853,7 +14853,7 @@ sub_8105F30: @ 8105F30
 	b _08105F78
 	.pool
 _08105F70:
-	ldr r1, =gUnknown_02022E24
+	ldr r1, =gBattle_WIN0H
 	lsls r0, r4, 8
 	orrs r2, r0
 	strh r2, [r1]
@@ -14905,9 +14905,9 @@ sub_8105F84: @ 8105F84
 _08105FD8:
 	cmp r0, 0x4
 	ble _0810600C
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r4, [r0]
 	ldr r4, =0x00003f3f
 	movs r0, 0x48
@@ -30154,7 +30154,7 @@ _0810DB50:
 	strh r0, [r2]
 	adds r7, r2, 0
 _0810DB60:
-	ldr r3, =gUnknown_02022E22
+	ldr r3, =gBattle_BG3_Y
 	ldrh r2, [r4, 0x1C]
 	lsls r0, r2, 16
 	asrs r0, 24
@@ -37347,7 +37347,7 @@ sub_811152C: @ 811152C
 	movs r0, 0xC8
 	strh r0, [r5, 0xA]
 _0811154E:
-	ldr r4, =gUnknown_02022E22
+	ldr r4, =gBattle_BG3_Y
 	movs r1, 0xA
 	ldrsh r0, [r5, r1]
 	movs r1, 0xA
@@ -37396,7 +37396,7 @@ sub_8111590: @ 8111590
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	ldrh r0, [r0]
 	strh r0, [r4, 0xC]
 _081115BC:
@@ -37405,7 +37405,7 @@ _081115BC:
 	movs r1, 0xFF
 	ands r0, r1
 	strh r0, [r4, 0xA]
-	ldr r6, =gUnknown_02022E22
+	ldr r6, =gBattle_BG3_Y
 	movs r2, 0xA
 	ldrsh r1, [r4, r2]
 	movs r0, 0x4
@@ -39577,10 +39577,10 @@ sub_8112758: @ 8112758
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
 	ldr r1, =0x00003f3f
 	movs r0, 0x48
@@ -39611,13 +39611,13 @@ _081127A0:
 _081127B8:
 	movs r6, 0xC8
 _081127BA:
-	ldr r1, =gUnknown_02022E24
+	ldr r1, =gBattle_WIN0H
 	lsls r3, r6, 16
 	asrs r2, r3, 16
 	lsls r0, r2, 8
 	orrs r0, r2
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E26
+	ldr r1, =gBattle_WIN0V
 	movs r5, 0x28
 	ldr r0, =0x00002828
 	strh r0, [r1]
@@ -39798,12 +39798,12 @@ _08112938:
 	ldr r0, _08112988 @=sub_8112994
 	str r0, [r4]
 _08112966:
-	ldr r1, _0811298C @=gUnknown_02022E24
+	ldr r1, _0811298C @=gBattle_WIN0H
 	mov r2, r9
 	lsls r0, r2, 8
 	orrs r7, r0
 	strh r7, [r1]
-	ldr r1, _08112990 @=gUnknown_02022E26
+	ldr r1, _08112990 @=gBattle_WIN0V
 	lsls r0, r6, 8
 	orrs r5, r0
 	strh r5, [r1]
@@ -39819,9 +39819,9 @@ _08112966:
 _08112988:
 	.4byte sub_8112994
 _0811298C:
-	.4byte gUnknown_02022E24
+	.4byte gBattle_WIN0H
 _08112990:
-	.4byte gUnknown_02022E26
+	.4byte gBattle_WIN0V
 	thumb_func_end sub_811280C
 
 	thumb_func_start sub_8112994
@@ -39837,9 +39837,9 @@ sub_8112994: @ 8112994
 	lsrs r1, r0, 24
 	cmp r1, 0
 	bne _081129DA
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
 	ldr r4, =0x00003f3f
 	movs r0, 0x48
@@ -40042,10 +40042,10 @@ sub_8112B44: @ 8112B44
 	movs r0, 0x52
 	movs r1, 0
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
 	adds r0, r4, 0
 	bl move_anim_8072740
@@ -42202,13 +42202,13 @@ _08113CDC:
 	ldr r1, =0x00003f3f
 	movs r0, 0x48
 	bl SetGpuReg
-	ldr r2, =gUnknown_02022E24
+	ldr r2, =gBattle_WIN0H
 	ldrh r0, [r5, 0x24]
 	lsls r0, 8
 	ldrh r1, [r5, 0x26]
 	orrs r0, r1
 	strh r0, [r2]
-	ldr r1, =gUnknown_02022E26
+	ldr r1, =gBattle_WIN0V
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r0, =sub_8113D60
@@ -42331,7 +42331,7 @@ _08113E1C:
 	blt _08113E3E
 	strh r2, [r4, 0x24]
 _08113E3E:
-	ldr r3, =gUnknown_02022E24
+	ldr r3, =gBattle_WIN0H
 	ldrh r2, [r4, 0x24]
 	lsls r0, r2, 8
 	ldrh r1, [r4, 0x26]
@@ -42398,10 +42398,10 @@ _08113EBC:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _08113EF8
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
 	ldr r4, =0x00003f3f
 	movs r0, 0x48
@@ -42588,13 +42588,13 @@ _08114078:
 	ldr r1, =0x00003f3f
 	movs r0, 0x48
 	bl SetGpuReg
-	ldr r2, =gUnknown_02022E24
+	ldr r2, =gBattle_WIN0H
 	ldrh r0, [r5, 0x24]
 	lsls r0, 8
 	ldrh r1, [r5, 0x26]
 	orrs r0, r1
 	strh r0, [r2]
-	ldr r1, =gUnknown_02022E26
+	ldr r1, =gBattle_WIN0V
 	movs r0, 0xA0
 	strh r0, [r1]
 	movs r0, 0
@@ -42686,7 +42686,7 @@ _08114150:
 	movs r0, 0x1
 	strh r0, [r4, 0xA]
 _08114154:
-	ldr r2, =gUnknown_02022E24
+	ldr r2, =gBattle_WIN0H
 	ldrh r0, [r4, 0x24]
 	lsls r0, 8
 	ldrh r1, [r4, 0x26]
@@ -42782,10 +42782,10 @@ _08114204:
 	b _08114232
 	.pool
 _08114210:
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
 	ldr r4, =0x00003f3f
 	movs r0, 0x48
@@ -43157,9 +43157,9 @@ sub_81144F8: @ 81144F8
 	lsls r0, 24
 	lsrs r7, r0, 24
 	movs r6, 0
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	strh r6, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r6, [r0]
 	ldr r1, =0x00003f3f
 	movs r0, 0x48
@@ -43485,9 +43485,9 @@ _081147B8:
 _08114824:
 	cmp r0, 0x3
 	bne _08114886
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	strh r5, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r5, [r0]
 	ldr r4, =0x00003f3f
 	movs r0, 0x48
@@ -45266,7 +45266,7 @@ _0811565A:
 	ldr r2, =gBattle_BG3_X
 	ldrh r0, [r4, 0xA]
 	strh r0, [r2]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r1, [r0]
 	ldrh r0, [r6, 0x4]
 	strh r0, [r4, 0xE]
@@ -45298,7 +45298,7 @@ sub_81156D0: @ 81156D0
 	ldr r0, =gBattle_BG3_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r1, [r0]
 	adds r0, r3, 0
 	bl DestroyTask
@@ -45308,7 +45308,7 @@ _08115710:
 	ldr r1, =gBattle_BG3_X
 	ldrh r0, [r2, 0xA]
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E22
+	ldr r1, =gBattle_BG3_Y
 	ldrh r0, [r2, 0xC]
 	strh r0, [r1]
 _0811571C:
@@ -46557,7 +46557,7 @@ _081160E2:
 	b _081160F6
 	.pool
 _081160EC:
-	ldr r1, =gUnknown_02022E22
+	ldr r1, =gBattle_BG3_Y
 	b _081160F6
 	.pool
 _081160F4:
@@ -46796,7 +46796,7 @@ sub_81162A4: @ 81162A4
 	ldr r4, =gBattle_BG3_X
 	ldrh r1, [r3]
 	strh r1, [r4]
-	ldr r4, =gUnknown_02022E22
+	ldr r4, =gBattle_BG3_Y
 	ldrh r1, [r3, 0x2]
 	strh r1, [r4]
 	ldr r1, =sub_81162F8
@@ -46839,7 +46839,7 @@ _08116330:
 	ldrh r0, [r3, 0x8]
 _08116332:
 	strh r0, [r6]
-	ldr r2, =gUnknown_02022E22
+	ldr r2, =gBattle_BG3_Y
 	ldrh r3, [r2]
 	lsls r1, r5, 2
 	adds r0, r1, r5
@@ -47805,9 +47805,9 @@ sub_8116B14: @ 8116B14
 	lsrs r0, 24
 	mov r9, r0
 	movs r7, 0
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	strh r7, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r7, [r0]
 	ldr r1, =0x00003f3f
 	movs r0, 0x48
@@ -48072,10 +48072,10 @@ sub_8116D64: @ 8116D64
 	bne _08116E86
 	movs r0, 0
 	bl sub_80A477C
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	mov r1, r8
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
 	ldr r4, =0x00003f3f
 	movs r0, 0x48
@@ -48256,10 +48256,10 @@ _08116F56:
 	movs r0, 0
 	strh r0, [r1, 0xA]
 _08116F5C:
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
 	ldr r1, =0x00003f3f
 	movs r0, 0x48
@@ -48746,10 +48746,10 @@ _081173AE:
 	strh r0, [r5, 0x26]
 	b _08117478
 _081173B6:
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
 	ldr r4, =0x00003f3f
 	movs r0, 0x48
@@ -49158,7 +49158,7 @@ sub_81176D8: @ 81176D8
 	ldrh r4, [r6]
 	adds r0, r4
 	strh r0, [r6]
-	ldr r4, =gUnknown_02022E22
+	ldr r4, =gBattle_BG3_Y
 	lsls r0, r2, 16
 	asrs r0, 24
 	ldrh r7, [r4]
@@ -49363,10 +49363,10 @@ _081178B6:
 	movs r2, 0
 	mov r8, r2
 _081178BA:
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
 	ldr r1, =0x00003f3f
 	movs r0, 0x48
@@ -49676,9 +49676,9 @@ _08117B34:
 	bne _08117C0C
 	movs r0, 0
 	bl sub_80A477C
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r4, [r0]
 	ldr r4, =0x00003f3f
 	movs r0, 0x48
@@ -49777,7 +49777,7 @@ sub_8117C44: @ 8117C44
 	movs r0, 0x80
 	lsls r0, 6
 	bl AllocZeroed
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	movs r2, 0xBE
 	lsls r2, 1
@@ -49797,7 +49797,7 @@ sub_8117C70: @ 8117C70
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	ldr r6, =gBattleSpritesGfx
+	ldr r6, =gMonSpritesGfxPtr
 	ldr r0, [r6]
 	movs r5, 0xBE
 	lsls r5, 1
@@ -49866,7 +49866,7 @@ _08117CF6:
 	adds r4, r0, 0
 	adds r4, 0x10
 _08117CFC:
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r1, [r0]
 	ldr r0, =gBattleAnimArgs
 	movs r2, 0x2
@@ -49944,7 +49944,7 @@ _08117D98:
 	lsls r0, r4, 5
 	ldr r1, =gPlttBufferUnfaded
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r2, [r1]
 	ldr r1, =gBattleAnimArgs
 	movs r3, 0x2
@@ -50646,7 +50646,7 @@ _0811838C:
 	bl SetGpuReg
 	b _0811852A
 _0811839C:
-	ldr r1, =gUnknown_02022E26
+	ldr r1, =gBattle_WIN0V
 	ldrh r0, [r1]
 	subs r0, 0xFF
 	strh r0, [r1]
@@ -50715,7 +50715,7 @@ _08118420:
 _0811842C:
 	strh r0, [r2]
 _0811842E:
-	ldr r2, =gUnknown_02022E26
+	ldr r2, =gBattle_WIN0V
 	ldrh r1, [r2]
 	movs r0, 0xFF
 	lsls r0, 8
@@ -50988,7 +50988,7 @@ _08118662:
 	b _0811881A
 	.pool
 _08118678:
-	ldr r1, =gUnknown_02022E26
+	ldr r1, =gBattle_WIN0V
 	ldrh r0, [r1]
 	subs r0, 0xFF
 	strh r0, [r1]
@@ -51065,7 +51065,7 @@ _08118708:
 	movs r0, 0x4
 	strh r0, [r1, 0x12]
 _08118728:
-	ldr r2, =gUnknown_02022E26
+	ldr r2, =gBattle_WIN0V
 	ldrh r1, [r2]
 	movs r0, 0xFF
 	lsls r0, 8
@@ -51288,7 +51288,7 @@ _08118908:
 	b _08118A96
 	.pool
 _0811891C:
-	ldr r1, =gUnknown_02022E26
+	ldr r1, =gBattle_WIN0V
 	ldrh r0, [r1]
 	subs r0, 0xFF
 	strh r0, [r1]
@@ -51354,7 +51354,7 @@ _08118986:
 	movs r0, 0x6
 	strh r0, [r2, 0x12]
 _081189A6:
-	ldr r2, =gUnknown_02022E26
+	ldr r2, =gBattle_WIN0V
 	ldrh r1, [r2]
 	movs r0, 0xFF
 	lsls r0, 8
@@ -51652,7 +51652,7 @@ _08118BA8:
 	b _08118D5A
 	.pool
 _08118C38:
-	ldr r1, =gUnknown_02022E26
+	ldr r1, =gBattle_WIN0V
 	ldrh r0, [r1]
 	subs r0, 0xFF
 	strh r0, [r1]
@@ -51683,7 +51683,7 @@ _08118C50:
 	b _08118D5A
 	.pool
 _08118C7C:
-	ldr r2, =gUnknown_02022E26
+	ldr r2, =gBattle_WIN0V
 	ldrh r1, [r2]
 	movs r0, 0xFF
 	lsls r0, 8
@@ -51874,7 +51874,7 @@ _08118DD4:
 	ldr r1, =0x00003f3f
 	movs r0, 0x4A
 	bl SetGpuReg
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	ldr r2, =0x0000ffd0
 	adds r0, r2, 0
 	strh r0, [r1]
@@ -51888,7 +51888,7 @@ _08118DD4:
 	b _08118FB2
 	.pool
 _08118E4C:
-	ldr r2, =gUnknown_02022E26
+	ldr r2, =gBattle_WIN0V
 	ldrh r3, [r2]
 	movs r1, 0x80
 	lsls r1, 1
@@ -51932,7 +51932,7 @@ _08118E7E:
 	b _08118FB2
 	.pool
 _08118EA8:
-	ldr r3, =gUnknown_02022E26
+	ldr r3, =gBattle_WIN0V
 	ldrh r2, [r3]
 	movs r0, 0xFF
 	lsls r0, 8
@@ -51973,7 +51973,7 @@ _08118ED8:
 	b _08118FB2
 	.pool
 _08118F00:
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	ldrh r0, [r1]
 	adds r3, r0, 0x2
 	strh r3, [r1]
@@ -51981,7 +51981,7 @@ _08118F00:
 	ldrh r0, [r1]
 	adds r0, 0x2
 	strh r0, [r1]
-	ldr r5, =gUnknown_02022E26
+	ldr r5, =gBattle_WIN0V
 	ldrh r2, [r5]
 	movs r0, 0xFF
 	lsls r0, 8
@@ -52081,7 +52081,7 @@ sub_8118FBC: @ 8118FBC
 	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r2, [r1]
 	lsls r4, 2
 	adds r2, 0x4
@@ -52189,7 +52189,7 @@ sub_8119094: @ 8119094
 	lsls r0, 24
 	mov r9, r0
 	ldr r4, =0x040000d4
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r0, [r0]
 	lsrs r2, 22
 	adds r0, 0x4
diff --git a/asm/battle_anim_815A0D4.s b/asm/battle_anim_815A0D4.s
index f219c6988..849655fe5 100755
--- a/asm/battle_anim_815A0D4.s
+++ b/asm/battle_anim_815A0D4.s
@@ -1077,10 +1077,10 @@ sub_815A934: @ 815A934
 	lsls r1, 8
 	movs r0, 0
 	bl SetGpuRegBits
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r4, =gUnknown_02022E26
+	ldr r4, =gBattle_WIN0V
 	strh r1, [r4]
 	movs r0, 0x40
 	movs r1, 0
@@ -1416,18 +1416,18 @@ sub_815ABEC: @ 815ABEC
 	ldr r1, =0x00001f3f
 	movs r0, 0x48
 	bl SetGpuReg
-	ldr r1, =gUnknown_02022E28
+	ldr r1, =gBattle_WIN1H
 	ldr r2, =0x000098f0
 	adds r0, r2, 0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E2A
+	ldr r1, =gBattle_WIN1V
 	movs r0, 0xA0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	ldrh r1, [r0]
 	movs r0, 0x42
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	ldrh r1, [r0]
 	movs r0, 0x46
 	bl SetGpuReg
@@ -1437,10 +1437,10 @@ _0815AC40:
 	ldr r1, =0x00001f3f
 	movs r0, 0x48
 	bl SetGpuReg
-	ldr r1, =gUnknown_02022E28
+	ldr r1, =gBattle_WIN1H
 	movs r0, 0xF0
 	strh r0, [r1]
-	ldr r4, =gUnknown_02022E2A
+	ldr r4, =gBattle_WIN1V
 	ldr r1, =0x000078a0
 	adds r0, r1, 0
 	strh r0, [r4]
@@ -1471,10 +1471,10 @@ sub_815AC8C: @ 815AC8C
 	ldr r1, =0x00003f3f
 	movs r0, 0x48
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E28
+	ldr r0, =gBattle_WIN1H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E2A
+	ldr r0, =gBattle_WIN1V
 	strh r1, [r0]
 	bl IsContest
 	lsls r0, 24
@@ -3024,7 +3024,7 @@ _0815B8E0:
 	lsls r0, 24
 	lsrs r1, r0, 24
 _0815B8EA:
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r2, [r0]
 	lsls r0, r1, 2
 	adds r2, 0x4
@@ -5397,10 +5397,10 @@ sub_815CC94: @ 815CC94
 	lsls r1, 8
 	movs r0, 0
 	bl SetGpuRegBits
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r4, =gUnknown_02022E26
+	ldr r4, =gBattle_WIN0V
 	strh r1, [r4]
 	movs r0, 0x40
 	movs r1, 0
diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s
index 85f94c20e..cb6391cee 100644
--- a/asm/battle_anim_8170478.s
+++ b/asm/battle_anim_8170478.s
@@ -18,10 +18,10 @@ sub_8170478: @ 8170478
 	str r0, [sp, 0x10]
 	ldr r0, =gAnimationBankAttacker
 	ldrb r4, [r0]
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
 	ldr r1, =0x00003f3f
 	movs r0, 0x48
@@ -317,9 +317,9 @@ _08170708:
 	bne _08170814
 	movs r0, 0
 	bl sub_80A477C
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r4, [r0]
 	ldr r4, =0x00003f3f
 	movs r0, 0x48
diff --git a/asm/battle_controller_linkopponent.s b/asm/battle_controller_linkopponent.s
index 5a762a174..a7168623c 100644
--- a/asm/battle_controller_linkopponent.s
+++ b/asm/battle_controller_linkopponent.s
@@ -5031,10 +5031,10 @@ _08066FE4:
 	thumb_func_start sub_8066FF4
 sub_8066FF4: @ 8066FF4
 	push {r4,r5,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r5, =gActiveBank
 	ldrb r4, [r5]
diff --git a/asm/battle_controller_linkpartner.s b/asm/battle_controller_linkpartner.s
index 3a1b21ed7..5b0ac0491 100644
--- a/asm/battle_controller_linkpartner.s
+++ b/asm/battle_controller_linkpartner.s
@@ -4340,10 +4340,10 @@ _0814D580:
 	thumb_func_start sub_814D590
 sub_814D590: @ 814D590
 	push {r4,r5,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r5, =gActiveBank
 	ldrb r4, [r5]
diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s
index 69d4776d4..f54896ca7 100644
--- a/asm/battle_controller_opponent.s
+++ b/asm/battle_controller_opponent.s
@@ -5171,10 +5171,10 @@ _08061F24:
 	thumb_func_start sub_8061F34
 sub_8061F34: @ 8061F34
 	push {r4,r5,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r5, =gActiveBank
 	ldrb r4, [r5]
@@ -6655,7 +6655,7 @@ sub_8062BB0: @ 8062BB0
 	negs r0, r0
 	ands r0, r1
 	strb r0, [r3]
-	ldr r0, =gUnknown_03005D00
+	ldr r0, =gPreBattleCallback1
 	ldr r0, [r0]
 	str r0, [r2]
 	ldr r0, [r2, 0x8]
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index 5f7e1b954..b829296d8 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -1287,10 +1287,10 @@ _08057FD6:
 	beq _08057FF8
 	movs r0, 0x5
 	bl PlaySE
-	ldr r1, =gUnknown_02022E14
+	ldr r1, =gBattle_BG0_X
 	movs r0, 0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	movs r2, 0xA0
 	lsls r2, 1
 	adds r0, r2, 0
@@ -2123,7 +2123,7 @@ sub_80586F8: @ 80586F8
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0805875C
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08058798
@@ -2137,7 +2137,7 @@ sub_80586F8: @ 80586F8
 	negs r0, r0
 	ands r0, r1
 	strb r0, [r2]
-	ldr r0, =gUnknown_03005D00
+	ldr r0, =gPreBattleCallback1
 	ldr r0, [r0]
 	str r0, [r3]
 	ldr r0, =sub_8038D64
@@ -2166,7 +2166,7 @@ _0805875C:
 	negs r0, r0
 	ands r0, r1
 	strb r0, [r2]
-	ldr r0, =gUnknown_03005D00
+	ldr r0, =gPreBattleCallback1
 	ldr r0, [r0]
 	str r0, [r3]
 	ldr r0, =sub_8038D64
@@ -2233,7 +2233,7 @@ _08058810:
 	negs r0, r0
 	ands r0, r1
 	strb r0, [r3]
-	ldr r0, =gUnknown_03005D00
+	ldr r0, =gPreBattleCallback1
 	ldr r0, [r0]
 	str r0, [r2]
 	ldr r0, [r2, 0x8]
@@ -4711,10 +4711,10 @@ b_link_standby_message: @ 8059DC0
 	ands r0, r1
 	cmp r0, 0
 	beq _08059DE0
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r0, =gText_LinkStandby
 	movs r1, 0
@@ -8444,10 +8444,10 @@ _0805BF70:
 	thumb_func_start sub_805BF80
 sub_805BF80: @ 805BF80
 	push {r4,r5,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r5, =gActiveBank
 	ldrb r4, [r5]
@@ -8503,9 +8503,9 @@ sub_805C004: @ 805C004
 	lsrs r1, r0, 24
 	cmp r1, 0
 	bne _0805C02A
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r1, [r0]
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r1, =gBattleBankFunc
@@ -8611,9 +8611,9 @@ sub_805C114: @ 805C114
 	lsrs r1, r0, 24
 	cmp r1, 0
 	bne _0805C13E
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r1, [r0]
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	movs r2, 0xA0
 	lsls r2, 1
 	adds r0, r2, 0
diff --git a/asm/battle_controller_player_partner.s b/asm/battle_controller_player_partner.s
index 784eacab1..185b8d5ca 100644
--- a/asm/battle_controller_player_partner.s
+++ b/asm/battle_controller_player_partner.s
@@ -4952,10 +4952,10 @@ _081BDA3C:
 	thumb_func_start sub_81BDA4C
 sub_81BDA4C: @ 81BDA4C
 	push {r4,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
diff --git a/asm/battle_controller_recorded_opponent.s b/asm/battle_controller_recorded_opponent.s
index 90928e7d4..5c420158a 100644
--- a/asm/battle_controller_recorded_opponent.s
+++ b/asm/battle_controller_recorded_opponent.s
@@ -4708,10 +4708,10 @@ _08188E80:
 	thumb_func_start sub_8188E90
 sub_8188E90: @ 8188E90
 	push {r4,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
diff --git a/asm/battle_controller_recorded_player.s b/asm/battle_controller_recorded_player.s
index 534f34068..6ab274da2 100644
--- a/asm/battle_controller_recorded_player.s
+++ b/asm/battle_controller_recorded_player.s
@@ -4808,10 +4808,10 @@ _0818C42C:
 	thumb_func_start sub_818C43C
 sub_818C43C: @ 818C43C
 	push {r4,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s
index cc149ea4f..dac3034a9 100644
--- a/asm/battle_controller_safari.s
+++ b/asm/battle_controller_safari.s
@@ -318,7 +318,7 @@ sub_81595E4: @ 81595E4
 	negs r0, r0
 	ands r0, r1
 	strb r0, [r3]
-	ldr r0, =gUnknown_03005D00
+	ldr r0, =gPreBattleCallback1
 	ldr r0, [r0]
 	str r0, [r2]
 	ldr r0, [r2, 0x8]
@@ -778,10 +778,10 @@ sub_81599D0: @ 81599D0
 	thumb_func_start dp01t_10_6_message
 dp01t_10_6_message: @ 81599DC
 	push {r4,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
@@ -832,9 +832,9 @@ sub_8159A54: @ 8159A54
 	lsrs r1, r0, 24
 	cmp r1, 0
 	bne _08159A7A
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r1, [r0]
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r1, =gBattleBankFunc
diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s
index eab717466..51193024f 100644
--- a/asm/battle_controller_wally.s
+++ b/asm/battle_controller_wally.s
@@ -3592,10 +3592,10 @@ _0816A3AC:
 	thumb_func_start sub_816A3B8
 sub_816A3B8: @ 816A3B8
 	push {r4,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
@@ -3646,9 +3646,9 @@ sub_816A430: @ 816A430
 	lsrs r1, r0, 24
 	cmp r1, 0
 	bne _0816A456
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r1, [r0]
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r1, =gBattleBankFunc
@@ -3749,9 +3749,9 @@ _0816A522:
 	lsrs r1, r0, 24
 	cmp r1, 0
 	bne _0816A574
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r1, [r0]
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	movs r2, 0xA0
 	lsls r2, 1
 	adds r0, r2, 0
diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s
index e870c8798..4c44855f9 100755
--- a/asm/battle_frontier_1.s
+++ b/asm/battle_frontier_1.s
@@ -3161,9 +3161,9 @@ _0819044E:
 	ldr r0, =gUnknown_0860CEB4
 	bl InitWindows
 	bl DeactivateAllTextPrinters
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r4, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r4, [r0]
@@ -3171,7 +3171,7 @@ _0819044E:
 	strh r4, [r0]
 	ldr r0, =gBattle_BG3_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r4, [r0]
 	mov r2, r9
 	cmp r2, 0x2
@@ -4366,10 +4366,10 @@ _08190E98:
 	ldrsh r2, [r0, r5]
 	cmp r2, 0
 	beq _08190ED4
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r1, [r0]
@@ -4379,9 +4379,9 @@ _08190E98:
 	b _08190EE6
 	.pool
 _08190ED4:
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r2, [r0]
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r0, =gBattle_BG1_X
@@ -4765,10 +4765,10 @@ _08191234:
 	ldrsh r2, [r0, r5]
 	cmp r2, 0
 	beq _08191278
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r1, [r0]
@@ -4779,9 +4779,9 @@ _08191234:
 	b _0819128C
 	.pool
 _08191278:
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r2, [r0]
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	ldr r3, =0x0000ff60
 	adds r0, r3, 0
 	strh r0, [r1]
@@ -5157,10 +5157,10 @@ _081915CC:
 	ldrsh r2, [r0, r5]
 	cmp r2, 0
 	beq _0819160C
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r2, =gBattle_BG1_X
 	movs r6, 0x80
@@ -5172,12 +5172,12 @@ _081915CC:
 	b _08191622
 	.pool
 _0819160C:
-	ldr r1, =gUnknown_02022E14
+	ldr r1, =gBattle_BG0_X
 	movs r3, 0x80
 	lsls r3, 1
 	adds r0, r3, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r2, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r2, [r0]
@@ -5457,10 +5457,10 @@ _0819187C:
 	ldrsh r2, [r0, r5]
 	cmp r2, 0
 	beq _081918BC
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r2, =gBattle_BG1_X
 	movs r6, 0x80
@@ -5472,12 +5472,12 @@ _0819187C:
 	b _081918D2
 	.pool
 _081918BC:
-	ldr r1, =gUnknown_02022E14
+	ldr r1, =gBattle_BG0_X
 	movs r3, 0x80
 	lsls r3, 1
 	adds r0, r3, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r2, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r2, [r0]
@@ -5744,10 +5744,10 @@ _08191B08:
 	ldrsh r2, [r0, r5]
 	cmp r2, 0
 	beq _08191B48
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r2, =gBattle_BG1_X
 	movs r6, 0xFF
@@ -5759,12 +5759,12 @@ _08191B08:
 	b _08191B5E
 	.pool
 _08191B48:
-	ldr r1, =gUnknown_02022E14
+	ldr r1, =gBattle_BG0_X
 	movs r3, 0xFF
 	lsls r3, 8
 	adds r0, r3, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r2, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r2, [r0]
@@ -6011,10 +6011,10 @@ _08191D68:
 	ldrsh r2, [r0, r5]
 	cmp r2, 0
 	beq _08191DA8
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r2, =gBattle_BG1_X
 	movs r6, 0xFF
@@ -6026,12 +6026,12 @@ _08191D68:
 	b _08191DBE
 	.pool
 _08191DA8:
-	ldr r1, =gUnknown_02022E14
+	ldr r1, =gBattle_BG0_X
 	movs r3, 0xFF
 	lsls r3, 8
 	adds r0, r3, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r2, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r2, [r0]
@@ -6306,7 +6306,7 @@ _08191FF8:
 	asrs r0, 16
 	cmp r0, 0x29
 	beq _08192100
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	ldrh r0, [r1]
 	subs r0, 0x4
 	strh r0, [r1]
@@ -6331,7 +6331,7 @@ _08192038:
 	asrs r0, 16
 	cmp r0, 0x29
 	beq _08192100
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	ldrh r0, [r1]
 	adds r0, 0x4
 	strh r0, [r1]
@@ -6356,7 +6356,7 @@ _08192078:
 	asrs r0, 16
 	cmp r0, 0x41
 	beq _08192100
-	ldr r1, =gUnknown_02022E14
+	ldr r1, =gBattle_BG0_X
 	ldrh r0, [r1]
 	subs r0, 0x4
 	strh r0, [r1]
@@ -6385,7 +6385,7 @@ _081920BC:
 	asrs r0, 16
 	cmp r0, 0x41
 	beq _08192100
-	ldr r1, =gUnknown_02022E14
+	ldr r1, =gBattle_BG0_X
 	ldrh r0, [r1]
 	adds r0, 0x4
 	strh r0, [r1]
@@ -10400,9 +10400,9 @@ _0819427C:
 	ldr r0, =gUnknown_0860CE94
 	bl InitWindows
 	bl DeactivateAllTextPrinters
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r4, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r4, [r0]
@@ -11358,11 +11358,11 @@ sub_8194B70: @ 8194B70
 	movs r1, 0x80
 	movs r2, 0x2
 	bl ChangeBgY
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	ldrh r1, [r0]
 	movs r0, 0x10
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	ldrh r1, [r0]
 	movs r0, 0x12
 	bl SetGpuReg
@@ -11486,11 +11486,11 @@ _08194CD4:
 	thumb_func_start sub_8194CE4
 sub_8194CE4: @ 8194CE4
 	push {lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	ldrh r1, [r0]
 	movs r0, 0x10
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	ldrh r1, [r0]
 	movs r0, 0x12
 	bl SetGpuReg
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index 36898e456..3d3fba02b 100755
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -20533,10 +20533,10 @@ _081A52A4:
 	lsls r1, 1
 	movs r2, 0x20
 	bl LoadCompressedPalette
-	ldr r1, =gUnknown_02022E24
+	ldr r1, =gBattle_WIN0H
 	movs r0, 0xFF
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E26
+	ldr r1, =gBattle_WIN0V
 	movs r0, 0x70
 	strh r0, [r1]
 	b _081A553E
diff --git a/asm/battle_interface.s b/asm/battle_interface.s
index 31ad9a330..8bc9553f7 100755
--- a/asm/battle_interface.s
+++ b/asm/battle_interface.s
@@ -1317,7 +1317,7 @@ _08072D86:
 	movs r2, 0x1
 	movs r3, 0x3
 	bl ConvertIntToDecimalStringN
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r0, [r0]
 	movs r1, 0xBA
 	lsls r1, 1
@@ -1333,7 +1333,7 @@ _08072D86:
 	lsls r0, 2
 	adds r5, r0, r1
 _08072DB8:
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r0, [r0]
 	movs r1, 0xBA
 	lsls r1, 1
@@ -1536,7 +1536,7 @@ _08072F52:
 	ldr r1, =gText_Slash
 	bl StringCopy
 _08072F82:
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r0, [r0]
 	movs r1, 0xBA
 	lsls r1, 1
@@ -1556,7 +1556,7 @@ _08072F82:
 _08072FA6:
 	cmp r4, 0x2
 	bhi _08072FF0
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r0, [r0]
 	movs r2, 0xBA
 	lsls r2, 1
@@ -1579,7 +1579,7 @@ _08072FA6:
 	b _0807301A
 	.pool
 _08072FF0:
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r0, [r0]
 	movs r1, 0xBA
 	lsls r1, 1
@@ -1609,7 +1609,7 @@ _08073024:
 	mov r3, r8
 	cmp r3, 0
 	bne _08073084
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r0, [r0]
 	movs r1, 0xBA
 	lsls r1, 1
@@ -1702,7 +1702,7 @@ sub_80730D4: @ 80730D4
 	lsls r0, 24
 	lsrs r0, 24
 	bl GetBankIdentity
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r2, [r1]
 	movs r3, 0xBA
 	lsls r3, 1
@@ -1877,7 +1877,7 @@ _08073236:
 	strb r0, [r1, 0x5]
 	movs r0, 0xBA
 	strb r0, [r1, 0x8]
-	ldr r5, =gBattleSpritesGfx
+	ldr r5, =gMonSpritesGfxPtr
 	ldr r0, [r5]
 	movs r2, 0xBA
 	lsls r2, 1
diff --git a/asm/battle_setup.s b/asm/battle_setup.s
index c2c762e96..fcc0de95b 100644
--- a/asm/battle_setup.s
+++ b/asm/battle_setup.s
@@ -41,7 +41,7 @@ _080B062E:
 	cmp r0, 0x1
 	bne _080B0652
 	bl overworld_free_bg_tilemaps
-	ldr r0, =sub_8036760
+	ldr r0, =CB2_InitBattle
 	bl SetMainCallback2
 	bl prev_quest_postbuffer_cursor_backup_reset
 	bl overworld_poison_timer_set
@@ -638,8 +638,8 @@ _080B0BC6:
 	.pool
 	thumb_func_end sub_80B0B6C
 
-	thumb_func_start sub_80B0BD0
-sub_80B0BD0: @ 80B0BD0
+	thumb_func_start BattleSetup_GetTerrainId
+BattleSetup_GetTerrainId: @ 80B0BD0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -798,7 +798,7 @@ _080B0D1A:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80B0BD0
+	thumb_func_end BattleSetup_GetTerrainId
 
 	thumb_func_start sub_80B0D24
 sub_80B0D24: @ 80B0D24
@@ -1387,7 +1387,7 @@ sub_80B11A8: @ 80B11A8
 	ldr r0, =sub_80B1204
 	str r0, [r1, 0x8]
 	bl FreeAllWindowBuffers
-	ldr r0, =sub_8036760
+	ldr r0, =CB2_InitBattle
 	bl SetMainCallback2
 	bl prev_quest_postbuffer_cursor_backup_reset
 	bl overworld_poison_timer_set
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 0782b8609..eb91121ae 100755
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -3194,7 +3194,7 @@ sub_8163A8C: @ 8163A8C
 	ldr r0, =gMain
 	ldr r1, =sub_81639AC
 	str r1, [r0, 0x8]
-	ldr r0, =sub_8036760
+	ldr r0, =CB2_InitBattle
 	bl SetMainCallback2
 	adds r0, r4, 0
 	bl DestroyTask
@@ -5125,21 +5125,21 @@ _08164C18:
 	lsrs r0, 24
 	mov r1, sp
 	movs r2, 0x4
-	bl link_0800A448
+	bl SendBlock
 	ldr r1, =gScriptResult
 	movs r0, 0x1
 	b _08164DB4
 	.pool
 _08164C3C:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	movs r1, 0x3
 	ands r1, r0
 	cmp r1, 0x3
 	beq _08164C4A
 	b _08164DB6
 _08164C4A:
-	bl sub_800A5B4
-	ldr r1, =gUnknown_020223C4
+	bl ResetBlockReceivedFlags
+	ldr r1, =gBlockRecvBuffer
 	movs r0, 0x80
 	lsls r0, 1
 	adds r2, r1, r0
@@ -5221,23 +5221,23 @@ _08164CE0:
 	ldr r3, =0x00000cb4
 	adds r1, r3
 	movs r2, 0x28
-	bl link_0800A448
+	bl SendBlock
 	ldr r1, =gScriptResult
 	movs r0, 0x3
 	b _08164DB4
 	.pool
 _08164D14:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	movs r1, 0x3
 	ands r1, r0
 	cmp r1, 0x3
 	bne _08164DB6
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	ldr r4, =gSaveBlock2Ptr
 	ldr r0, [r4]
 	ldr r5, =0x00000cb4
 	adds r0, r5
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	movs r2, 0x28
 	bl memcpy
 	ldr r2, =gTrainerBattleOpponent_A
@@ -5260,7 +5260,7 @@ _08164D14:
 	ldrh r0, [r4]
 	movs r1, 0x1
 	bl sub_8162614
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08164DB0
@@ -5279,7 +5279,7 @@ _08164D98:
 	b _08164DB4
 	.pool
 _08164DA8:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08164DB6
diff --git a/asm/battle_transition.s b/asm/battle_transition.s
index 6406a3f24..a6e44f087 100644
--- a/asm/battle_transition.s
+++ b/asm/battle_transition.s
@@ -9513,11 +9513,11 @@ sub_814ABE4: @ 814ABE4
 	strh r0, [r6, 0xC]
 	cmp r0, 0
 	bne _0814AC24
-	ldr r5, =gUnknown_02022E14
+	ldr r5, =gBattle_BG0_X
 	ldrh r1, [r5]
 	movs r0, 0x12
 	bl SetGpuReg
-	ldr r4, =gUnknown_02022E16
+	ldr r4, =gBattle_BG0_Y
 	ldrh r1, [r4]
 	movs r0, 0x10
 	bl SetGpuReg
@@ -9562,9 +9562,9 @@ sub_814AC38: @ 814AC38
 	movs r1, 0xF0
 	movs r2, 0x20
 	bl LoadPalette
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r5, [r0]
-	ldr r4, =gUnknown_02022E16
+	ldr r4, =gBattle_BG0_Y
 	strh r5, [r4]
 	movs r0, 0x12
 	movs r1, 0
@@ -9781,10 +9781,10 @@ sub_814AE40: @ 814AE40
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r4, =gUnknown_02022E16
+	ldr r4, =gBattle_BG0_Y
 	strh r1, [r4]
 	movs r0, 0x12
 	movs r1, 0
diff --git a/asm/berry_blender.s b/asm/berry_blender.s
index 0599fa153..277a49d2f 100644
--- a/asm/berry_blender.s
+++ b/asm/berry_blender.s
@@ -512,7 +512,7 @@ _0807FBBE:
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _0807FBBE
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0807FC14
@@ -1116,7 +1116,7 @@ _08080126:
 	adds r5, 0x1
 	cmp r5, 0x3
 	ble _08080126
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0808016A
@@ -1213,7 +1213,7 @@ _08080248:
 	bne _08080254
 	b _08080546
 _08080254:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	bl GetMultiplayerId
 	lsls r0, 24
 	cmp r0, 0
@@ -1239,7 +1239,7 @@ _08080282:
 	movs r0, 0x4
 	movs r1, 0x1
 	bl sub_8197DF8
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	adds r4, r0, 0
 	bl sub_800A9D8
 	lsls r4, 24
@@ -1260,7 +1260,7 @@ _080802AC:
 	adds r0, r4, r0
 	adds r0, r6
 	lsls r1, r5, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x10
 	bl memcpy
@@ -1280,7 +1280,7 @@ _080802D4:
 	lsrs r0, 24
 	cmp r5, r0
 	blt _080802AC
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	b _080804F8
 	.pool
 _080802EC:
@@ -1876,7 +1876,7 @@ sub_80807BC: @ 80807BC
 	sub sp, 0x1C
 	movs r0, 0
 	mov r10, r0
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080807DE
@@ -3330,7 +3330,7 @@ sub_80814B0: @ 80814B0
 	lsrs r1, 16
 	lsls r2, 16
 	lsrs r2, 16
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080814E4
@@ -3633,7 +3633,7 @@ sub_8081744: @ 8081744
 	push {r4-r6,lr}
 	movs r4, 0
 	movs r6, 0
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0808175A
@@ -4702,7 +4702,7 @@ _08081F7C:
 sub_8081F94: @ 8081F94
 	push {lr}
 	adds r1, r0, 0
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08081FB8
@@ -4810,7 +4810,7 @@ _08082078:
 	adds r1, 0x4C
 	movs r0, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080820B0
@@ -4848,7 +4848,7 @@ _080820E0:
 	bne _080820EC
 	b _0808249E
 _080820EC:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0808218C
@@ -4911,7 +4911,7 @@ _08082132:
 	adds r1, r4
 	movs r0, 0
 	movs r2, 0x20
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	bne _08082172
@@ -4941,7 +4941,7 @@ _0808218C:
 	strh r2, [r0]
 	movs r0, 0
 	movs r2, 0x28
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	bne _080821BE
@@ -4951,20 +4951,20 @@ _080821BE:
 	b _0808245C
 	.pool
 _080821C8:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	cmp r0, 0
 	bne _080821D4
 	b _0808249E
 _080821D4:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	ldr r5, =gUnknown_020322A4
 	ldr r1, [r5]
 	adds r1, 0x63
 	ldrb r0, [r1]
 	adds r0, 0x1
 	strb r0, [r1]
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08082254
@@ -4972,7 +4972,7 @@ _080821D4:
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08082254
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	ldr r3, [r5]
 	ldrh r0, [r2, 0x4]
 	adds r1, r3, 0
@@ -5016,7 +5016,7 @@ _08082220:
 	b _0808249E
 	.pool
 _08082254:
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	ldr r0, =gUnknown_020322A4
 	ldr r3, [r0]
 	ldrh r0, [r2, 0x4]
@@ -5748,7 +5748,7 @@ _080828BC:
 	strb r0, [r1]
 	b _080828DC
 _080828C6:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r4, [r0]
 	cmp r4, 0
 	bne _080828DC
@@ -5966,7 +5966,7 @@ _08082A92:
 	thumb_func_start sub_8082AD4
 sub_8082AD4: @ 8082AD4
 	push {r4-r7,lr}
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08082AE0
@@ -6242,7 +6242,7 @@ sub_8082D18: @ 8082D18
 sub_8082D28: @ 8082D28
 	push {r4,lr}
 	movs r1, 0
-	ldr r4, =gUnknown_03003124
+	ldr r4, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r4]
 	cmp r0, 0
 	beq _08082D3C
@@ -7909,7 +7909,7 @@ _08083A80:
 	cmp r5, r0
 	bcc _08083A80
 _08083A9E:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08083AB4
@@ -8514,7 +8514,7 @@ sub_8083F94: @ 8083F94
 	strb r0, [r7, 0xC]
 	movs r0, 0xFF
 	strb r0, [r7]
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080840C4
diff --git a/asm/cable_club.s b/asm/cable_club.s
index 80d9a0916..d5d3af151 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -1030,7 +1030,7 @@ sub_80B2C30: @ 80B2C30
 	bl sub_80B24F8
 	cmp r0, 0x1
 	beq _080B2C9C
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	adds r4, r0, 0
 	bl sub_800A9A8
 	lsls r4, 24
@@ -1047,7 +1047,7 @@ _080B2C5C:
 	ldr r1, =gUnknown_02039B58
 	adds r0, r1
 	lsls r1, r4, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	lsls r2, r4, 3
 	subs r2, r4
@@ -1066,7 +1066,7 @@ _080B2C7E:
 	bcc _080B2C5C
 	movs r0, 0
 	bl sub_800B330
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	ldr r0, =gScriptResult
 	adds r1, r5, 0
 	bl task_map_chg_seq_0807EC34
@@ -1082,7 +1082,7 @@ sub_80B2CB0: @ 80B2CB0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080B2CDE
@@ -1434,7 +1434,7 @@ _080B2FA8:
 	bl DestroyTask
 	b _080B2FC6
 _080B2FB4:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080B2FC6
@@ -1706,7 +1706,7 @@ sub_80B3220: @ 80B3220
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _080B3248
@@ -1836,7 +1836,7 @@ _080B3338:
 	bl sub_800AC34
 	b _080B3346
 _080B333E:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 _080B3342:
 	cmp r0, 0
@@ -1872,7 +1872,7 @@ _080B3378:
 	lsls r2, 4
 	adds r0, r2, 0
 	strh r0, [r1]
-	ldr r0, =sub_8036760
+	ldr r0, =CB2_InitBattle
 	bl SetMainCallback2
 	ldr r1, =gMain
 	ldr r0, =sub_80B360C
@@ -1948,13 +1948,13 @@ _080B3444:
 	ldr r1, =gUnknown_020229CC
 	movs r0, 0
 	movs r2, 0x1C
-	bl link_0800A448
+	bl SendBlock
 	movs r0, 0x3
 	strh r0, [r6]
 	b _080B3532
 	.pool
 _080B3458:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	adds r4, r0, 0
 	bl sub_800A9D8
 	lsls r4, 24
@@ -1967,7 +1967,7 @@ _080B3458:
 	.pool
 _080B3474:
 	lsls r1, r4, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r0, r5, 0
 	adds r1, r2
 	ldm r1!, {r2,r3,r7}
@@ -2045,7 +2045,7 @@ _080B3504:
 	lsls r3, 4
 	adds r0, r3, 0
 	strh r0, [r1]
-	ldr r0, =sub_8036760
+	ldr r0, =CB2_InitBattle
 	bl SetMainCallback2
 	ldr r1, =gMain
 	ldr r0, =sub_80B360C
@@ -2128,7 +2128,7 @@ _080B35C8:
 	b _080B35FE
 	.pool
 _080B35E0:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080B35FE
@@ -2425,7 +2425,7 @@ _080B3864:
 	b _080B3884
 	.pool
 _080B3870:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080B3884
@@ -2657,7 +2657,7 @@ task00_08081A90: @ 80B3A30
 	adds r0, r4, 0
 	bl DestroyTask
 _080B3A62:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080B3AA6
@@ -2691,7 +2691,7 @@ sub_80B3AAC: @ 80B3AAC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080B3AC4
@@ -2804,7 +2804,7 @@ _080B3B96:
 	strh r0, [r5]
 	b _080B3BB8
 _080B3B9E:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _080B3BB8
diff --git a/asm/contest.s b/asm/contest.s
index 023c6ebef..b469dd8eb 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -45,10 +45,10 @@ sub_80D7678: @ 80D7678
 	lsls r1, 7
 	movs r0, 0
 	bl SetGpuRegBits
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r1, [r0]
@@ -60,15 +60,15 @@ sub_80D7678: @ 80D7678
 	strh r1, [r0]
 	ldr r0, =gBattle_BG3_X
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E28
+	ldr r0, =gBattle_WIN1H
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E2A
+	ldr r0, =gBattle_WIN1V
 	strh r1, [r0]
 	pop {r4}
 	pop {r0}
@@ -546,8 +546,8 @@ _080D7B4E:
 	ldr r0, =gUnknown_02039F38
 	strb r5, [r0]
 	bl sub_80D7988
-	bl init_uns_table_pokemon_copy
-	ldr r4, =gBattleSpritesGfx
+	bl AllocateMonSpritesGfx
+	ldr r4, =gMonSpritesGfxPtr
 	ldr r0, [r4]
 	ldr r0, [r0]
 	bl Free
@@ -1316,11 +1316,11 @@ _080D8266:
 	thumb_func_start vblank_cb_battle
 vblank_cb_battle: @ 80D827C
 	push {lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	ldrh r1, [r0]
 	movs r0, 0x10
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	ldrh r1, [r0]
 	movs r0, 0x12
 	bl SetGpuReg
@@ -1344,23 +1344,23 @@ vblank_cb_battle: @ 80D827C
 	ldrh r1, [r0]
 	movs r0, 0x1C
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	ldrh r1, [r0]
 	movs r0, 0x1E
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	ldrh r1, [r0]
 	movs r0, 0x40
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	ldrh r1, [r0]
 	movs r0, 0x44
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E28
+	ldr r0, =gBattle_WIN1H
 	ldrh r1, [r0]
 	movs r0, 0x42
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E2A
+	ldr r0, =gBattle_WIN1V
 	ldrh r1, [r0]
 	movs r0, 0x46
 	bl SetGpuReg
@@ -1387,7 +1387,7 @@ sub_80D833C: @ 80D833C
 	ldrsh r1, [r4, r0]
 	cmp r1, 0
 	bne _080D840C
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r0, =gBattle_BG2_Y
 	strh r1, [r0]
@@ -1517,7 +1517,7 @@ sub_80D8490: @ 80D8490
 	lsls r0, 24
 	lsrs r0, 24
 	mov r9, r0
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	movs r1, 0xA0
 	strh r1, [r0]
 	ldr r0, =gBattle_BG2_Y
@@ -1770,7 +1770,7 @@ _080D86E4:
 	adds r0, r4, 0
 	movs r1, 0
 	bl sub_80DEC30
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	movs r1, 0
 	strh r1, [r0]
 	ldr r0, =gBattle_BG2_Y
@@ -2041,7 +2041,7 @@ sub_80D895C: @ 80D895C
 	lsls r0, 24
 	lsrs r7, r0, 24
 	bl sub_80DB89C
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	movs r1, 0
 	strh r1, [r0]
 	ldr r0, =gBattle_BG2_Y
@@ -5322,7 +5322,7 @@ sub_80DA5E8: @ 80DA5E8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	movs r1, 0
 	strh r1, [r0]
 	ldr r0, =gBattle_BG2_Y
@@ -6741,7 +6741,7 @@ sub_80DB174: @ 80DB174
 	lsls r0, r5, 3
 	ldr r1, =gMonBackPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x4]
 	adds r2, r5, 0
@@ -6753,7 +6753,7 @@ _080DB1B8:
 	lsls r0, r5, 3
 	ldr r1, =gMonBackPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x4]
 	adds r2, r5, 0
@@ -8516,7 +8516,7 @@ _080DBF62:
 	thumb_func_start sub_80DBF68
 sub_80DBF68: @ 80DBF68
 	push {lr}
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	movs r1, 0
 	strh r1, [r0]
 	ldr r0, =gBattle_BG2_Y
diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s
index 8e2e2c61c..8a1bf00f1 100644
--- a/asm/contest_link_80F57C4.s
+++ b/asm/contest_link_80F57C4.s
@@ -92,10 +92,10 @@ _080F57E0:
 	lsls r1, 8
 	movs r0, 0
 	bl SetGpuRegBits
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r1, [r0]
@@ -107,15 +107,15 @@ _080F57E0:
 	strh r1, [r0]
 	ldr r0, =gBattle_BG3_X
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E28
+	ldr r0, =gBattle_WIN1H
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E2A
+	ldr r0, =gBattle_WIN1V
 	strh r1, [r0]
 	pop {r4}
 	pop {r0}
@@ -387,10 +387,10 @@ sub_80F5B00: @ 80F5B00
 	strb r0, [r1, 0x2]
 	ldr r0, =sub_80F5C00
 	bl SetMainCallback2
-	ldr r1, =gUnknown_02022E28
+	ldr r1, =gBattle_WIN1H
 	movs r0, 0xF0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E2A
+	ldr r1, =gBattle_WIN1V
 	ldr r2, =0x000080a0
 	adds r0, r2, 0
 	strh r0, [r1]
@@ -441,11 +441,11 @@ sub_80F5C00: @ 80F5C00
 	thumb_func_start sub_80F5C24
 sub_80F5C24: @ 80F5C24
 	push {lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	ldrh r1, [r0]
 	movs r0, 0x10
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	ldrh r1, [r0]
 	movs r0, 0x12
 	bl SetGpuReg
@@ -469,23 +469,23 @@ sub_80F5C24: @ 80F5C24
 	ldrh r1, [r0]
 	movs r0, 0x1C
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	ldrh r1, [r0]
 	movs r0, 0x1E
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	ldrh r1, [r0]
 	movs r0, 0x40
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	ldrh r1, [r0]
 	movs r0, 0x44
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E28
+	ldr r0, =gBattle_WIN1H
 	ldrh r1, [r0]
 	movs r0, 0x42
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E2A
+	ldr r0, =gBattle_WIN1V
 	ldrh r1, [r0]
 	movs r0, 0x46
 	bl SetGpuReg
@@ -702,7 +702,7 @@ sub_80F5ED8: @ 80F5ED8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080F5EFC
@@ -1347,10 +1347,10 @@ _080F643C:
 	.4byte _080F6638
 	.4byte _080F667C
 _080F6454:
-	ldr r1, =gUnknown_02022E24
+	ldr r1, =gBattle_WIN0H
 	movs r0, 0xF0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E26
+	ldr r1, =gBattle_WIN0V
 	ldr r3, =0x00005050
 	adds r0, r3, 0
 	strh r0, [r1]
@@ -1364,7 +1364,7 @@ _080F6454:
 	mov r9, r4
 	ldr r4, =gMonFrontPicTable
 	mov r12, r4
-	ldr r4, =gBattleSpritesGfx
+	ldr r4, =gMonSpritesGfxPtr
 	mov r8, r4
 	cmp r0, 0
 	beq _080F648C
@@ -1494,7 +1494,7 @@ _080F65A4:
 	strh r0, [r4, 0xC]
 _080F65BA:
 	ldrb r2, [r4, 0xC]
-	ldr r3, =gUnknown_02022E26
+	ldr r3, =gBattle_WIN0V
 	movs r0, 0x50
 	subs r0, r2
 	lsls r0, 8
@@ -1556,7 +1556,7 @@ _080F6638:
 	ldrb r0, [r0, 0x6]
 	cmp r0, 0x2
 	bne _080F669C
-	ldr r3, =gUnknown_02022E26
+	ldr r3, =gBattle_WIN0V
 	ldrh r0, [r3]
 	lsrs r2, r0, 8
 	adds r0, r2, 0x2
@@ -1706,7 +1706,7 @@ sub_80F677C: @ 80F677C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080F67AC
@@ -1842,7 +1842,7 @@ sub_80F68B4: @ 80F68B4
 	ldrh r3, [r2]
 	adds r0, r3, 0x2
 	strh r0, [r2]
-	ldr r4, =gUnknown_02022E22
+	ldr r4, =gBattle_BG3_Y
 	ldrh r5, [r4]
 	adds r1, r5, 0x1
 	strh r1, [r4]
@@ -2870,10 +2870,10 @@ _080F70BE:
 	adds r5, 0x1
 	cmp r5, 0x2
 	ble _080F70BE
-	ldr r1, =gUnknown_02022E24
+	ldr r1, =gBattle_WIN0H
 	movs r0, 0xF0
 	strh r0, [r1]
-	ldr r2, =gUnknown_02022E26
+	ldr r2, =gBattle_WIN0V
 	ldrh r1, [r4, 0x22]
 	adds r0, r1, 0
 	subs r0, 0x10
@@ -2910,8 +2910,8 @@ sub_80F7144: @ 80F7144
 	orrs r0, r1
 	mov r1, r12
 	strb r0, [r1]
-	ldr r7, =gUnknown_02022E24
-	ldr r6, =gUnknown_02022E26
+	ldr r7, =gBattle_WIN0H
+	ldr r6, =gBattle_WIN0V
 	adds r5, r3, 0
 	movs r4, 0x4
 	adds r2, 0x2E
@@ -4522,7 +4522,7 @@ sub_80F7DF4: @ 80F7DF4
 	bl AllocZeroed
 	ldr r1, [r4]
 	str r0, [r1, 0x1C]
-	bl init_uns_table_pokemon_copy
+	bl AllocateMonSpritesGfx
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -5633,7 +5633,7 @@ sub_80F87B4: @ 80F87B4
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080F87D0
diff --git a/asm/contest_link_80FC4F4.s b/asm/contest_link_80FC4F4.s
index 0d6116766..ad22946c5 100644
--- a/asm/contest_link_80FC4F4.s
+++ b/asm/contest_link_80FC4F4.s
@@ -21,7 +21,7 @@ sub_80FC4F4: @ 80FC4F4
 	lsrs r0, 24
 	adds r1, r5, 0
 	adds r2, r4, 0
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	bne _080FC528
@@ -45,7 +45,7 @@ sub_80FC530: @ 80FC530
 	lsls r4, 17
 	lsls r4, r5
 	lsrs r4, 24
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	ands r4, r0
 	cmp r4, 0
 	beq _080FC552
@@ -64,7 +64,7 @@ _080FC554:
 	thumb_func_start sub_80FC55C
 sub_80FC55C: @ 80FC55C
 	push {r4,lr}
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	adds r4, r0, 0
 	bl sub_800A9D8
 	lsls r4, 24
@@ -74,7 +74,7 @@ sub_80FC55C: @ 80FC55C
 	movs r0, 0
 	b _080FC57A
 _080FC574:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	movs r0, 0x1
 _080FC57A:
 	pop {r4}
@@ -90,7 +90,7 @@ sub_80FC580: @ 80FC580
 	movs r1, 0
 	ldr r5, =gTasks
 	ldr r6, =sub_80FC5C0
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	movs r3, 0xFF
 _080FC590:
 	lsls r0, r1, 8
@@ -134,7 +134,7 @@ sub_80FC5DC: @ 80FC5DC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080FC650
@@ -324,7 +324,7 @@ _080FC770:
 	ldr r0, =gUnknown_02039E00
 	adds r4, r0
 	lsls r1, r5, 8
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	adds r1, r0
 	adds r0, r4, 0
 	movs r2, 0x40
@@ -430,7 +430,7 @@ _080FC858:
 	cmp r0, 0
 	beq _080FC880
 	ldr r0, =gRngValue
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	adds r1, r4, 0
 	movs r2, 0x4
 	bl memcpy
@@ -517,7 +517,7 @@ _080FC90C:
 	ldrb r0, [r1]
 	cmp r3, r0
 	bge _080FC93A
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	adds r0, r7, 0x2
 	adds r2, r5, r0
 	movs r5, 0x80
@@ -690,7 +690,7 @@ _080FCA68:
 	bge _080FCAA4
 	ldr r1, =gUnknown_02039F34
 	mov r8, r1
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	movs r3, 0
 	movs r7, 0x80
 	lsls r7, 1
@@ -784,7 +784,7 @@ _080FCB50:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x8
 	b _080FCC50
@@ -827,7 +827,7 @@ _080FCBA4:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x8
 	b _080FCC50
@@ -850,7 +850,7 @@ _080FCBE0:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x8
 	b _080FCC50
@@ -885,7 +885,7 @@ _080FCC38:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x4
 _080FCC50:
@@ -974,7 +974,7 @@ _080FCD10:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x70
 	b _080FCE10
@@ -1021,7 +1021,7 @@ _080FCD6C:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x14
 	b _080FCE10
@@ -1078,7 +1078,7 @@ _080FCE04:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x4
 _080FCE10:
@@ -1169,7 +1169,7 @@ _080FCEC0:
 	beq _080FCF2E
 	mov r1, r8
 	mov r8, r9
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	adds r0, r7, 0
 	adds r0, 0xA
 	adds r2, r5, r0
@@ -1278,7 +1278,7 @@ _080FCF9C:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x8
 	bl memcpy
@@ -1344,7 +1344,7 @@ _080FD02C:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x4
 	bl memcpy
diff --git a/asm/contest_link_81D9DE4.s b/asm/contest_link_81D9DE4.s
index cec1c6e5d..3fd8f56f1 100755
--- a/asm/contest_link_81D9DE4.s
+++ b/asm/contest_link_81D9DE4.s
@@ -469,7 +469,7 @@ _081DA1EC:
 	ldr r0, =gUnknown_02039E00
 	adds r4, r0
 	lsls r1, r5, 8
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	adds r1, r0
 	adds r0, r4, 0
 	movs r2, 0x40
@@ -554,7 +554,7 @@ _081DA2AC:
 	cmp r0, 0
 	beq _081DA2D4
 	ldr r0, =gRngValue
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	adds r1, r4, 0
 	movs r2, 0x4
 	bl memcpy
@@ -641,7 +641,7 @@ _081DA35A:
 	mov r0, r8
 	adds r0, 0xA
 	adds r3, r5, r0
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	mov r2, sp
 	movs r5, 0x80
 	lsls r5, 1
@@ -744,7 +744,7 @@ _081DA42A:
 	mov r0, r8
 	adds r0, 0x2
 	adds r3, r5, r0
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	mov r2, sp
 	movs r5, 0x80
 	lsls r5, 1
@@ -849,7 +849,7 @@ _081DA50C:
 	lsls r0, r3, 6
 	ldr r5, =gUnknown_02039E00
 	adds r0, r5
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	movs r2, 0x4
 	subs r2, r3
 	lsls r2, 6
diff --git a/asm/contest_painting.s b/asm/contest_painting.s
index 62359497c..03fa9b05a 100644
--- a/asm/contest_painting.s
+++ b/asm/contest_painting.s
@@ -110,7 +110,7 @@ _0812FE94:
 	bl remove_some_task
 	movs r0, 0
 	bl SetVBlankCallback
-	bl init_uns_table_pokemon_copy
+	bl AllocateMonSpritesGfx
 	ldr r1, =gUnknown_030061C0
 	ldr r0, =gUnknown_02039F3C
 	str r0, [r1]
@@ -581,7 +581,7 @@ sub_81302E8: @ 81302E8
 	lsls r0, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r4, =gBattleSpritesGfx
+	ldr r4, =gMonSpritesGfxPtr
 	ldr r1, [r4]
 	ldr r1, [r1, 0x8]
 	ldr r2, [r6]
@@ -600,7 +600,7 @@ _08130348:
 	lsls r0, r5, 3
 	ldr r1, =gMonBackPicTable
 	adds r0, r1
-	ldr r4, =gBattleSpritesGfx
+	ldr r4, =gMonSpritesGfxPtr
 	ldr r1, [r4]
 	ldr r1, [r1, 0x4]
 	ldr r2, [r6]
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index 5d0268173..0fa0c5eb3 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -165,10 +165,10 @@ evolution_cutscene: @ 813DA8C
 	movs r1, 0
 	bl SetGpuReg
 	bl ResetPaletteFade
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r2, 0
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r2, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r2, [r0]
@@ -183,14 +183,14 @@ evolution_cutscene: @ 813DA8C
 	lsls r2, 1
 	adds r0, r2, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	movs r1, 0
 	strh r1, [r0]
 	ldr r1, =gBattleTerrain
 	movs r0, 0x9
 	strb r0, [r1]
 	bl c2_berry_program_update_menu
-	bl sub_8035AA4
+	bl LoadBattleTextboxAndBackground
 	bl ResetSpriteData
 	bl remove_some_task
 	bl ResetTasks
@@ -202,7 +202,7 @@ evolution_cutscene: @ 813DA8C
 	bl AllocZeroed
 	ldr r1, =gUnknown_0203AB80
 	str r0, [r1]
-	bl init_uns_table_pokemon_copy
+	bl AllocateMonSpritesGfx
 	adds r0, r4, 0
 	movs r1, 0x2
 	mov r2, sp
@@ -235,7 +235,7 @@ evolution_cutscene: @ 813DA8C
 	lsls r0, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r2, =gBattleSpritesGfx
+	ldr r2, =gMonSpritesGfxPtr
 	ldr r1, [r2]
 	ldr r1, [r1, 0x8]
 	adds r2, r5, 0
@@ -291,7 +291,7 @@ evolution_cutscene: @ 813DA8C
 	lsls r0, r1, 3
 	ldr r2, =gMonFrontPicTable
 	adds r0, r2
-	ldr r2, =gBattleSpritesGfx
+	ldr r2, =gMonSpritesGfxPtr
 	ldr r1, [r2]
 	ldr r1, [r1, 0x10]
 	mov r2, r10
@@ -460,9 +460,9 @@ sub_813DD7C: @ 813DD7C
 	movs r1, 0
 	bl SetGpuReg
 	bl ResetPaletteFade
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r4, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r4, [r0]
@@ -477,13 +477,13 @@ sub_813DD7C: @ 813DD7C
 	lsls r2, 1
 	adds r0, r2, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r4, [r0]
 	ldr r1, =gBattleTerrain
 	movs r0, 0x9
 	strb r0, [r1]
 	bl c2_berry_program_update_menu
-	bl sub_8035AA4
+	bl LoadBattleTextboxAndBackground
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
 	ldr r1, =gReservedSpritePaletteCount
@@ -492,7 +492,7 @@ sub_813DD7C: @ 813DD7C
 	lsls r0, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x10]
 	adds r2, r5, 0
@@ -629,10 +629,10 @@ _0813DFE0:
 	ldr r1, =gReservedSpritePaletteCount
 	movs r0, 0x4
 	strb r0, [r1]
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r1, [r0]
@@ -647,7 +647,7 @@ _0813DFE0:
 	lsls r3, 1
 	adds r0, r3, 0
 	strh r0, [r2]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r1, [r0]
 	b _0813E180
 	.pool
@@ -697,7 +697,7 @@ _0813E0A8:
 	lsls r0, r6, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x10]
 	adds r2, r6, 0
@@ -867,7 +867,7 @@ sub_813E1D4: @ 813E1D4
 	lsls r0, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x8]
 	adds r2, r5, 0
@@ -941,9 +941,9 @@ sub_813E1D4: @ 813E1D4
 	mov r1, sp
 	ldrh r1, [r1, 0x14]
 	strh r1, [r0, 0x1C]
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r4, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r4, [r0]
@@ -958,7 +958,7 @@ sub_813E1D4: @ 813E1D4
 	lsls r2, 1
 	adds r0, r2, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r4, [r0]
 	ldr r2, =gTextFlags
 	ldrb r0, [r2]
@@ -3630,11 +3630,11 @@ nullsub_83: @ 813FCD8
 	thumb_func_start sub_813FCDC
 sub_813FCDC: @ 813FCDC
 	push {lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	ldrh r1, [r0]
 	movs r0, 0x10
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	ldrh r1, [r0]
 	movs r0, 0x12
 	bl SetGpuReg
@@ -3658,7 +3658,7 @@ sub_813FCDC: @ 813FCDC
 	ldrh r1, [r0]
 	movs r0, 0x1C
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	ldrh r1, [r0]
 	movs r0, 0x1E
 	bl SetGpuReg
@@ -3674,11 +3674,11 @@ sub_813FCDC: @ 813FCDC
 	thumb_func_start sub_813FD64
 sub_813FD64: @ 813FD64
 	push {lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	ldrh r1, [r0]
 	movs r0, 0x10
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	ldrh r1, [r0]
 	movs r0, 0x12
 	bl SetGpuReg
@@ -3702,7 +3702,7 @@ sub_813FD64: @ 813FD64
 	ldrh r1, [r0]
 	movs r0, 0x1C
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	ldrh r1, [r0]
 	movs r0, 0x1E
 	bl SetGpuReg
@@ -3871,7 +3871,7 @@ sub_813FEE8: @ 813FEE8
 	.pool
 _0813FF28:
 	ldr r7, =gBattle_BG3_X
-	ldr r6, =gUnknown_02022E22
+	ldr r6, =gBattle_BG3_Y
 _0813FF2C:
 	lsls r4, r5, 2
 	adds r4, r5
diff --git a/asm/field_screen.s b/asm/field_screen.s
index 0de68b86b..83fea2f44 100644
--- a/asm/field_screen.s
+++ b/asm/field_screen.s
@@ -9010,7 +9010,7 @@ _080AF9C8:
 	strh r0, [r4]
 	b _080AF9E8
 _080AF9D0:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080AF9E8
diff --git a/asm/link.s b/asm/link.s
index d1c8d0542..038633758 100644
--- a/asm/link.s
+++ b/asm/link.s
@@ -402,7 +402,7 @@ sub_8009734: @ 8009734
 	strb r4, [r0]
 	ldr r0, =gUnknown_030030F8
 	strb r4, [r0]
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	bl sub_800A2E0
 	ldr r0, =gUnknown_03000D54
 	str r4, [r0]
@@ -420,7 +420,7 @@ sub_8009734: @ 8009734
 _080097A8:
 	bl sub_800E700
 _080097AC:
-	ldr r1, =gUnknown_03003124
+	ldr r1, =gReceivedRemoteLinkPlayers
 	movs r0, 0
 	strb r0, [r1]
 	movs r1, 0
@@ -448,7 +448,7 @@ _080097BE:
 	thumb_func_start sub_80097E8
 sub_80097E8: @ 80097E8
 	push {r4,lr}
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	movs r4, 0
 	strb r4, [r0]
 	ldr r0, =gLinkVSyncDisabled
@@ -514,7 +514,7 @@ _08009868:
 	lsrs r5, r0, 24
 	cmp r5, 0x3
 	bls _08009840
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r7, r0, 24
 	cmp r7, 0xF
@@ -532,7 +532,7 @@ _08009888:
 	cmp r0, 0
 	beq _080098C4
 	lsls r0, r5, 8
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	adds r0, r1
 	lsls r4, r5, 1
 	adds r1, r4, r5
@@ -752,7 +752,7 @@ _08009A78:
 	blt _08009A70
 	cmp r5, 0
 	bne _08009A94
-	ldr r1, =gUnknown_03003124
+	ldr r1, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r1]
 	cmp r0, 0
 	bne _08009A94
@@ -952,7 +952,7 @@ _08009C14:
 	.pool
 _08009C40:
 	movs r2, 0
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	mov r9, r1
 	adds r7, r3, 0
 	ldr r3, =gUnknown_03003090
@@ -996,7 +996,7 @@ _08009C70:
 	cmp r0, 0x1
 	bne _08009D16
 	lsls r1, r6, 8
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	adds r1, r0
 	mov r8, r1
 	lsls r0, r6, 3
@@ -1080,7 +1080,7 @@ _08009D3E:
 	adds r2, r3
 	ldrh r2, [r2]
 	movs r0, 0
-	bl link_0800A448
+	bl SendBlock
 	b _08009D6E
 	.pool
 _08009D64:
@@ -1321,7 +1321,7 @@ _08009F6A:
 	thumb_func_start sub_8009F70
 sub_8009F70: @ 8009F70
 	push {lr}
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _08009F80
@@ -1526,7 +1526,7 @@ sub_800A0C8: @ 800A0C8
 	adds r5, r0, 0
 	adds r6, r1, 0
 	movs r7, 0
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r4, [r0]
 	cmp r4, 0x1
 	beq _0800A0DA
@@ -2008,8 +2008,8 @@ bitmask_all_link_players_but_self: @ 800A490
 	bx r1
 	thumb_func_end bitmask_all_link_players_but_self
 
-	thumb_func_start link_0800A448
-link_0800A448: @ 800A4AC
+	thumb_func_start SendBlock
+SendBlock: @ 800A4AC
 	push {lr}
 	adds r3, r1, 0
 	lsls r2, 16
@@ -2030,7 +2030,7 @@ _0800A4CE:
 	lsrs r0, 24
 	pop {r1}
 	bx r1
-	thumb_func_end link_0800A448
+	thumb_func_end SendBlock
 
 	thumb_func_start sub_800A4D8
 sub_800A4D8: @ 800A4D8
@@ -2095,8 +2095,8 @@ _0800A546:
 	.pool
 	thumb_func_end sub_800A520
 
-	thumb_func_start sub_800A550
-sub_800A550: @ 800A550
+	thumb_func_start GetBlockReceivedStatus
+GetBlockReceivedStatus: @ 800A550
 	push {lr}
 	ldr r0, =gLinkVSyncDisabled
 	ldrb r0, [r0]
@@ -2122,7 +2122,7 @@ _0800A580:
 	lsrs r0, 24
 	pop {r1}
 	bx r1
-	thumb_func_end sub_800A550
+	thumb_func_end GetBlockReceivedStatus
 
 	thumb_func_start sub_800A588
 sub_800A588: @ 800A588
@@ -2148,8 +2148,8 @@ _0800A5AC:
 	.pool
 	thumb_func_end sub_800A588
 
-	thumb_func_start sub_800A5B4
-sub_800A5B4: @ 800A5B4
+	thumb_func_start ResetBlockReceivedFlags
+ResetBlockReceivedFlags: @ 800A5B4
 	push {r4,lr}
 	ldr r0, =gLinkVSyncDisabled
 	ldrb r0, [r0]
@@ -2179,7 +2179,7 @@ _0800A5E2:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_800A5B4
+	thumb_func_end ResetBlockReceivedFlags
 
 	thumb_func_start sub_800A5EC
 sub_800A5EC: @ 800A5EC
@@ -2573,7 +2573,7 @@ task00_link_test: @ 800A850
 	movs r2, 0x2
 	movs r3, 0x2
 	bl sub_800A6E8
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0xF
@@ -3813,7 +3813,7 @@ sub_800B3A4: @ 800B3A4
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r2, r0, 8
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	adds r4, r2, r1
 	lsls r2, r0, 3
 	subs r2, r0
@@ -3907,7 +3907,7 @@ _0800B482:
 	thumb_func_start sub_800B488
 sub_800B488: @ 800B488
 	push {lr}
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0800B498
@@ -3923,7 +3923,7 @@ _0800B498:
 	thumb_func_start sub_800B4A4
 sub_800B4A4: @ 800B4A4
 	push {lr}
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r1, [r0]
 	cmp r1, 0
 	bne _0800B4B2
@@ -3938,7 +3938,7 @@ _0800B4B2:
 	thumb_func_start sub_800B4C0
 sub_800B4C0: @ 800B4C0
 	push {lr}
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r1, [r0]
 	cmp r1, 0
 	bne _0800B4CE
@@ -11500,7 +11500,7 @@ _0800F18C:
 	cmp r4, 0
 	bne _0800F1A8
 	bl sub_800EDD4
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	strb r4, [r0]
 	b _0800F1D2
 	.pool
@@ -11976,7 +11976,7 @@ _0800F514:
 	bl sub_8011A64
 _0800F58C:
 	bl rfu_clearAllSlot
-	ldr r1, =gUnknown_03003124
+	ldr r1, =gReceivedRemoteLinkPlayers
 	movs r0, 0
 	strb r0, [r1]
 	ldr r0, =gUnknown_03005000
@@ -12224,7 +12224,7 @@ _0800F786:
 	thumb_func_start rfu_func_080F97B8
 rfu_func_080F97B8: @ 800F794
 	push {lr}
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0800F7C6
@@ -12430,7 +12430,7 @@ _0800F90E:
 	ldrb r0, [r4, 0xC]
 	cmp r0, 0
 	bne _0800F920
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0800F920
@@ -12536,7 +12536,7 @@ _0800F9EA:
 	orrs r0, r3
 	str r0, [r1]
 	movs r4, 0
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	mov r9, r0
 	mov r12, r2
 	mov r1, r8
@@ -12599,7 +12599,7 @@ _0800FA5C:
 	beq _0800FA7E
 	b _0800FC08
 _0800FA7E:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0800FA88
@@ -12610,7 +12610,7 @@ _0800FA88:
 	beq _0800FA90
 	b _0800FC08
 _0800FA90:
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	bl sub_8010A70
 	b _0800FC08
 	.pool
@@ -12662,7 +12662,7 @@ _0800FB10:
 	ldrb r2, [r7, 0xC]
 	cmp r2, 0
 	bne _0800FB78
-	ldr r3, =gUnknown_03003124
+	ldr r3, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r3]
 	mov r6, r8
 	adds r6, 0x1
@@ -13410,7 +13410,7 @@ sub_801011C: @ 801011C
 	push {lr}
 	bl rfu_clearAllSlot
 	bl sub_800C048
-	ldr r1, =gUnknown_03003124
+	ldr r1, =gReceivedRemoteLinkPlayers
 	movs r0, 0
 	strb r0, [r1]
 	ldr r2, =gUnknown_03005000
@@ -14374,14 +14374,14 @@ _080108B6:
 	bne _080108C2
 	b _080109D2
 _080108C2:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	bl sub_800B348
 	b _08010948
 _080108CC:
 	ldrb r0, [r5, 0xC]
 	cmp r0, 0x1
 	bne _0801090C
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080108E8
@@ -14471,7 +14471,7 @@ _0801096E:
 _08010984:
 	adds r0, r6, 0
 	bl DestroyTask
-	ldr r1, =gUnknown_03003124
+	ldr r1, =gReceivedRemoteLinkPlayers
 	movs r0, 0x1
 	strb r0, [r1]
 	ldr r0, =0x00000ce8
@@ -14702,7 +14702,7 @@ _08010B6A:
 	b _08010C52
 	.pool
 _08010B78:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r0, 24
 	asrs r0, r4
@@ -14715,7 +14715,7 @@ _08010B8C:
 	adds r0, r4, 0
 	bl sub_800A5EC
 	lsls r2, r4, 8
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	adds r2, r0
 	ldr r1, =gLinkPlayers
 	lsls r0, r4, 3
@@ -14799,7 +14799,7 @@ _08010C20:
 	ldr r1, =gUnknown_020228C4
 	movs r0, 0
 	movs r2, 0xA0
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	beq _08010CF0
@@ -14833,7 +14833,7 @@ _08010C94:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08010CF0
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	movs r1, 0x1
 	ands r1, r0
 	cmp r1, 0
@@ -14841,7 +14841,7 @@ _08010C94:
 	mov r0, sp
 	movs r4, 0
 	strh r4, [r0]
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	ldr r2, =0x0100007e
 	bl CpuSet
 	movs r0, 0
@@ -14924,7 +14924,7 @@ _08010D56:
 	ldr r1, =gUnknown_020228C4
 	movs r0, 0
 	movs r2, 0x3C
-	bl link_0800A448
+	bl SendBlock
 	b _08010D7A
 	.pool
 _08010D70:
@@ -14938,17 +14938,17 @@ _08010D7A:
 	strh r0, [r4, 0x8]
 	b _08010DA6
 _08010D82:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	movs r4, 0x1
 	adds r1, r4, 0
 	ands r1, r0
 	cmp r1, 0
 	beq _08010DA6
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	bl sub_8010A14
 	movs r0, 0
 	bl sub_800A5EC
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	strb r4, [r0]
 	adds r0, r5, 0
 	bl DestroyTask
@@ -15701,7 +15701,7 @@ _0801136C:
 	bics r3, r2
 	adds r2, r3, 0
 	strb r2, [r1]
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _080113B0
@@ -15912,7 +15912,7 @@ _08011544:
 	movs r1, 0x5
 	movs r2, 0x5
 	bl nullsub_5
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _080115DE
@@ -16397,7 +16397,7 @@ _08011958:
 	ldrb r0, [r2, 0xC]
 	cmp r0, 0x1
 	bne _08011996
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _080119B4
@@ -16423,7 +16423,7 @@ _08011996:
 	ldrb r0, [r0]
 	cmp r0, 0x2
 	beq _080119B4
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _080119B4
@@ -17502,7 +17502,7 @@ sub_801229C: @ 801229C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1C
@@ -18913,7 +18913,7 @@ _08012F14:
 	strb r0, [r6, 0xC]
 	b _08012F50
 _08012F22:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08012F50
@@ -19861,7 +19861,7 @@ _080137A6:
 	b _08013A86
 	.pool
 _080137C4:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0801387A
@@ -20806,11 +20806,11 @@ _08013FDE:
 	adds r1, r0
 	movs r0, 0
 	movs r2, 0x64
-	bl link_0800A448
+	bl SendBlock
 	b _080140BC
 	.pool
 _08013FFC:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x3
@@ -20822,13 +20822,13 @@ _08013FFC:
 	eors r1, r2
 	lsls r1, 24
 	lsrs r1, 16
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x64
 	bl memcpy
 	movs r0, 0x32
 	bl IncrementGameStat
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	b _0801405A
 	.pool
 _08014038:
@@ -20843,7 +20843,7 @@ _08014038:
 	movs r0, 0
 	adds r1, r4, 0
 	movs r2, 0xDC
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	beq _080140BC
@@ -20854,7 +20854,7 @@ _0801405A:
 	b _080140BC
 	.pool
 _08014070:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x3
@@ -20866,12 +20866,12 @@ _08014070:
 	eors r1, r0
 	lsls r1, 24
 	lsrs r1, 16
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	adds r1, r0
 	adds r0, r4, 0
 	movs r2, 0xD8
 	bl memcpy
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	ldr r1, =gUnknown_02032298
 	strb r7, [r1]
 	movs r0, 0x6
@@ -20925,7 +20925,7 @@ _08014114:
 	strh r0, [r4, 0x8]
 	b _0801419E
 _0801411C:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	adds r4, r0, 0
 	bl sub_800A9D8
 	lsls r4, 24
@@ -20938,7 +20938,7 @@ _0801411C:
 	.pool
 _08014138:
 	lsls r1, r4, 8
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	adds r3, r1, r0
 	movs r0, 0x64
 	muls r0, r4
@@ -20965,7 +20965,7 @@ _08014152:
 	eors r0, r1
 	lsls r0, 24
 	lsrs r0, 16
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	adds r3, r0, r1
 	adds r0, r3, 0
 	adds r0, 0x60
@@ -20976,7 +20976,7 @@ _08014152:
 _08014190:
 	bl sub_801B940
 _08014194:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	adds r0, r6, 0
 	bl DestroyTask
 _0801419E:
@@ -21665,7 +21665,7 @@ _08014854:
 	movs r0, 0x4
 	strh r0, [r7]
 	bl sub_800E3A8
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	b _080149B2
 	.pool
 _080148B8:
@@ -21723,7 +21723,7 @@ _08014934:
 	movs r0, 0
 	adds r1, r2, 0
 	movs r2, 0xE
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	beq _080149B2
@@ -21731,13 +21731,13 @@ _08014934:
 	strh r0, [r7]
 	b _080149B2
 _0801494A:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x3
 	bne _080149B2
-	bl sub_800A5B4
-	ldr r0, =gUnknown_020223C4
+	bl ResetBlockReceivedFlags
+	ldr r0, =gBlockRecvBuffer
 	movs r2, 0x80
 	lsls r2, 1
 	adds r1, r0, r2
@@ -21766,7 +21766,7 @@ _08014992:
 	strh r0, [r7]
 	b _080149B2
 _0801499C:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080149B2
@@ -22316,7 +22316,7 @@ _08014E8C:
 	strb r0, [r5, 0xC]
 	b _08014EF2
 _08014E92:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08014EF2
@@ -22636,7 +22636,7 @@ _08015180:
 	b _080152A0
 	.pool
 _080151A4:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080151C2
@@ -23002,7 +23002,7 @@ _080154E0:
 	b _08015604
 	.pool
 _08015504:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08015522
@@ -23714,7 +23714,7 @@ _08015BB8:
 	movs r0, 0x40
 	strb r0, [r1]
 _08015BBE:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08015BCA
@@ -23750,7 +23750,7 @@ _08015C24:
 	movs r0, 0x5
 	bl _08016876
 _08015C2A:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08015C36
@@ -23785,7 +23785,7 @@ _08015C54:
 	bne _08015C78
 	bl _08016878
 _08015C78:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08015C94
@@ -23918,7 +23918,7 @@ _08015DA6:
 	bl _08016876
 	.pool
 _08015DD0:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08015DF4
@@ -24212,7 +24212,7 @@ _08016084:
 	movs r0, 0x1E
 	bl sub_8015664
 _08016092:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0801609E
@@ -24241,7 +24241,7 @@ _080160C6:
 	movs r0, 0x2
 	bl _08016876
 _080160DA:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080160E4
@@ -24452,7 +24452,7 @@ _080162D4:
 	movs r0, 0x24
 	b _08016876
 _080162DC:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r4, [r0]
 	cmp r4, 0
 	beq _080162E6
@@ -30478,7 +30478,7 @@ _08019406:
 	strb r0, [r5, 0x8]
 	b _08019922
 _0801940C:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0801942C
@@ -30646,7 +30646,7 @@ _0801956A:
 	strb r0, [r5, 0x8]
 	b _08019922
 _08019574:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0801957E
@@ -30981,7 +30981,7 @@ _080197EE:
 	strb r0, [r5, 0x8]
 	b _08019922
 _080197F8:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08019810
@@ -31050,7 +31050,7 @@ _08019884:
 	b _08019922
 	.pool
 _080198A0:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08019922
@@ -33417,7 +33417,7 @@ _0801AB1E:
 	lsls r2, 4
 	adds r1, r2, 0
 	strh r1, [r0]
-	ldr r0, =sub_8036760
+	ldr r0, =CB2_InitBattle
 	bl SetMainCallback2
 	pop {r4-r7}
 	pop {r0}
@@ -33741,7 +33741,7 @@ _0801AE7A:
 	ldr r1, =gUnknown_020228C4
 	movs r0, 0
 	movs r2, 0x20
-	bl link_0800A448
+	bl SendBlock
 	ldr r1, =gMain
 	movs r2, 0x87
 	lsls r2, 3
@@ -33749,14 +33749,14 @@ _0801AE7A:
 	b _0801AF8A
 	.pool
 _0801AE98:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x3
 	beq _0801AEA6
 	b _0801AFAE
 _0801AEA6:
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	ldrh r0, [r1]
 	cmp r0, 0x51
 	bne _0801AEE0
@@ -33782,7 +33782,7 @@ _0801AEA6:
 	.pool
 _0801AEE0:
 	bl sub_800AC34
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	bl GetMultiplayerId
 	lsls r0, 24
 	lsrs r0, 16
@@ -33805,7 +33805,7 @@ _0801AF0C:
 	movs r1, 0x8
 _0801AF16:
 	strb r1, [r0]
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	b _0801AFAE
 	.pool
 _0801AF24:
@@ -33842,7 +33842,7 @@ _0801AF58:
 	b _0801AFAE
 	.pool
 _0801AF7C:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0801AFAE
@@ -39072,7 +39072,7 @@ sub_801D938: @ 801D938
 	adds r3, r0, 0
 	adds r0, r1, 0
 	lsls r3, 8
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	adds r3, r1
 	adds r1, r3, 0
 	bl memcpy
@@ -39085,7 +39085,7 @@ sub_801D938: @ 801D938
 sub_801D954: @ 801D954
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r0, 24
 	asrs r0, r4
@@ -39273,7 +39273,7 @@ _0801DA7C:
 	movs r0, 0
 	mov r1, sp
 	movs r2, 0x8
-	bl link_0800A448
+	bl SendBlock
 	b _0801DB3E
 	.pool
 _0801DAC8:
@@ -39300,7 +39300,7 @@ _0801DAC8:
 	lsls r2, r0, 16
 	lsrs r2, 16
 	movs r0, 0
-	bl link_0800A448
+	bl SendBlock
 	ldrh r0, [r4, 0x10]
 	adds r0, 0x1
 	strh r0, [r4, 0x10]
@@ -39310,7 +39310,7 @@ _0801DB08:
 	adds r1, r3
 	movs r0, 0
 	movs r2, 0xFC
-	bl link_0800A448
+	bl SendBlock
 	ldrh r0, [r4, 0x10]
 	adds r0, 0x1
 	strh r0, [r4, 0x10]
@@ -39942,7 +39942,7 @@ _0801DFE0:
 	adds r1, r0
 	movs r0, 0
 	movs r2, 0x28
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	beq _0801E028
@@ -40416,7 +40416,7 @@ _0801E3D4:
 	adds r1, r0
 	movs r0, 0
 	movs r2, 0x28
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	beq _0801E414
@@ -40432,14 +40432,14 @@ _0801E410:
 _0801E412:
 	strh r0, [r1, 0x6]
 _0801E414:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0801E458
 	b _0801E42C
 	.pool
 _0801E424:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0801E438
@@ -40556,7 +40556,7 @@ _0801E50C:
 	adds r1, r0
 	movs r0, 0
 	movs r2, 0x28
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	beq _0801E5BC
@@ -40564,7 +40564,7 @@ _0801E50C:
 	b _0801E59A
 	.pool
 _0801E540:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	movs r1, 0x1
 	ands r1, r0
 	cmp r1, 0
@@ -40599,7 +40599,7 @@ _0801E584:
 	adds r0, 0x1
 	strh r0, [r1, 0xA]
 _0801E590:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0801E5BC
@@ -40683,7 +40683,7 @@ _0801E62E:
 	adds r0, 0x1
 	strh r0, [r1, 0xA]
 _0801E638:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0801E662
@@ -40798,7 +40798,7 @@ _0801E724:
 	adds r0, 0x1
 	strh r0, [r1, 0xA]
 _0801E730:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0801E75C
@@ -40849,7 +40849,7 @@ _0801E784:
 	.4byte _0801E802
 	.4byte _0801E820
 _0801E798:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0801E7AC
@@ -40883,7 +40883,7 @@ _0801E7C0:
 	adds r1, r0
 	movs r0, 0
 	movs r2, 0x28
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	beq _0801E830
@@ -42276,7 +42276,7 @@ _0801F2E0:
 	.4byte _0801F494
 	.4byte _0801F438
 _0801F300:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0801F30A
@@ -42304,7 +42304,7 @@ _0801F30E:
 	b _0801F4C4
 	.pool
 _0801F33C:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4, 0x6]
@@ -42365,7 +42365,7 @@ _0801F3A2:
 	movs r1, 0x2
 	ldrsh r0, [r4, r1]
 	lsls r0, 8
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	adds r0, r1
 	ldrb r0, [r0]
 	subs r0, 0x1
@@ -42406,7 +42406,7 @@ _0801F3F6:
 	movs r2, 0x2
 	ldrsh r1, [r4, r2]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	bl sub_801EFF8
 	cmp r0, 0
@@ -45486,7 +45486,7 @@ sub_8020C70: @ 8020C70
 	adds r4, r0, 0
 	movs r0, 0
 	mov r8, r0
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08020C8E
@@ -49731,7 +49731,7 @@ _08022F7A:
 	movs r0, 0
 	adds r1, r4, 0
 	movs r2, 0x2
-	bl link_0800A448
+	bl SendBlock
 	b _08023060
 _08022FAA:
 	bl sub_800A520
@@ -49742,7 +49742,7 @@ _08022FAA:
 	strh r0, [r5, 0x10]
 	b _08023060
 _08022FBA:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	ldr r2, =gUnknown_082F4448
 	ldrb r4, [r5, 0x9]
 	subs r1, r4, 0x2
@@ -49755,7 +49755,7 @@ _08022FBA:
 	movs r3, 0
 	cmp r3, r4
 	bcs _0802301E
-	ldr r7, =gUnknown_020223C4
+	ldr r7, =gBlockRecvBuffer
 	movs r6, 0
 	ldr r4, =gUnknown_0858AB24
 _08022FDC:
@@ -49796,7 +49796,7 @@ _08022FF6:
 _0802301E:
 	movs r0, 0
 	strh r0, [r5, 0x10]
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	movs r1, 0x18
 	ldrsh r0, [r5, r1]
 	lsls r0, 8
@@ -51445,7 +51445,7 @@ _08023D12:
 	movs r0, 0
 	adds r1, r4, 0
 	movs r2, 0x2
-	bl link_0800A448
+	bl SendBlock
 	b _0802402E
 _08023D2A:
 	bl sub_800A520
@@ -51456,7 +51456,7 @@ _08023D2A:
 _08023D36:
 	b _08024004
 _08023D38:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	ldr r2, =gUnknown_082F4448
 	ldrb r3, [r7, 0x9]
 	subs r1, r3, 0x2
@@ -51474,7 +51474,7 @@ _08023D50:
 	adds r4, 0x42
 	cmp r8, r3
 	bcs _08023D7E
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 _08023D5E:
 	mov r3, r8
 	lsls r1, r3, 5
@@ -51496,7 +51496,7 @@ _08023D7E:
 	movs r0, 0
 	strh r0, [r7, 0x10]
 	strh r0, [r4]
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	ldrb r0, [r7, 0x8]
 	cmp r0, 0
 	bne _08023D9C
@@ -51788,7 +51788,7 @@ _08023FC4:
 	movs r0, 0
 	ldr r1, [sp, 0xC]
 	movs r2, 0x30
-	bl link_0800A448
+	bl SendBlock
 	b _0802402E
 _08023FD0:
 	bl sub_800A520
@@ -51797,7 +51797,7 @@ _08023FD0:
 	beq _08024034
 	b _08024004
 _08023FDC:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -51808,11 +51808,11 @@ _08023FDC:
 	movs r1, 0
 	movs r2, 0x30
 	bl memset
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	adds r0, r4, 0
 	movs r2, 0x30
 	bl memcpy
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 _08024004:
 	movs r0, 0
 	strh r0, [r7, 0x10]
@@ -52207,7 +52207,7 @@ _08024306:
 	strh r5, [r0]
 	movs r0, 0
 	movs r2, 0x2
-	bl link_0800A448
+	bl SendBlock
 	b _080243AC
 _08024328:
 	bl sub_800A520
@@ -52217,7 +52217,7 @@ _08024328:
 	strh r5, [r4, 0x10]
 	b _080243AC
 _08024336:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	ldr r2, =gUnknown_082F4448
 	ldrb r3, [r4, 0x9]
 	subs r1, r3, 0x2
@@ -52234,7 +52234,7 @@ _08024336:
 	cmp r5, r3
 	bcs _08024374
 	adds r1, r6, 0
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 _0802435C:
 	lsls r0, r5, 8
 	adds r0, r2
@@ -52264,7 +52264,7 @@ _08024390:
 	movs r2, 0
 	bl sub_8022BEC
 _0802439A:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	movs r1, 0
 	movs r0, 0
 	strh r0, [r7]
@@ -52485,7 +52485,7 @@ _08024528:
 	bl sub_800AC34
 	b _08024558
 _08024538:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0802455E
@@ -53023,7 +53023,7 @@ sub_802493C: @ 802493C
 	ldr r1, =gUnknown_03000DB0
 	movs r0, 0
 	str r0, [r1]
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08024A10
@@ -53382,7 +53382,7 @@ _08024C5A:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08024D40
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08024D20
@@ -53989,7 +53989,7 @@ _0802516C:
 	thumb_func_start sub_8025170
 sub_8025170: @ 8025170
 	push {r4,lr}
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -54001,7 +54001,7 @@ sub_8025170: @ 8025170
 	movs r0, 0
 	b _08025192
 _0802518C:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	movs r0, 0x1
 _08025192:
 	pop {r4}
@@ -54031,7 +54031,7 @@ _080251BA:
 	adds r1, 0x4A
 	movs r0, 0
 	movs r2, 0x3C
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	beq _08025226
@@ -54115,7 +54115,7 @@ _08025252:
 	adds r1, r2, r1
 	movs r0, 0
 	movs r2, 0x3C
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	beq _08025316
@@ -54139,7 +54139,7 @@ _08025282:
 _0802528E:
 	ldr r0, [r5]
 	adds r0, 0x4A
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	movs r2, 0x3C
 	bl memcpy
 	ldr r1, [r5]
@@ -54265,7 +54265,7 @@ _0802539C:
 	strb r0, [r1]
 	movs r0, 0
 	movs r2, 0x1
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	beq _08025466
@@ -54302,7 +54302,7 @@ _080253DC:
 	adds r3, r1, 0
 	movs r5, 0x86
 	lsls r5, 1
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 _080253FA:
 	ldr r1, [r3]
 	adds r1, r2, r1
@@ -54452,7 +54452,7 @@ _0802553C:
 	strb r0, [r1]
 	movs r0, 0
 	movs r2, 0x1
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	beq _0802563C
@@ -54486,7 +54486,7 @@ _08025578:
 	adds r3, r1, 0
 	movs r5, 0x86
 	lsls r5, 1
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 _08025596:
 	ldr r1, [r3]
 	adds r1, r2, r1
@@ -54617,7 +54617,7 @@ _08025688:
 	strb r0, [r1, 0x10]
 	b _080256A0
 _08025692:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080256A0
@@ -54829,7 +54829,7 @@ _0802585C:
 	bl sub_802903C
 	ldr r0, [r4]
 	bl sub_8024A30
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08025882
@@ -54946,7 +54946,7 @@ _0802593E:
 	adds r1, r0
 	movs r0, 0
 	movs r2, 0x1
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	beq _080259E8
@@ -54976,7 +54976,7 @@ _0802597E:
 	cmp r2, r0
 	bcs _080259C4
 	adds r3, r1, 0
-	ldr r5, =gUnknown_020223C4
+	ldr r5, =gBlockRecvBuffer
 	ldr r4, =0x0000318c
 _0802599A:
 	ldr r0, [r3]
@@ -58643,7 +58643,7 @@ sub_8027660: @ 8027660
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0802768C
@@ -64818,7 +64818,7 @@ sub_802A9A8: @ 802A9A8
 	adds r6, r1, 0
 	lsls r0, 16
 	lsrs r7, r0, 16
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0802AA3C
@@ -67232,7 +67232,7 @@ _0802BD02:
 	b _0802BD24
 	.pool
 _0802BD14:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0802BD24
@@ -73081,7 +73081,7 @@ sub_802EAB0: @ 802EAB0
 	lsls r1, 3
 	ldr r0, =gTasks + 0x8
 	adds r4, r1, r0
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0802EB14
diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s
index acc3065ea..423f653d9 100644
--- a/asm/menu_helpers.s
+++ b/asm/menu_helpers.s
@@ -533,7 +533,7 @@ sub_81221AC: @ 81221AC
 	bl is_c1_link_related_active
 	cmp r0, 0x1
 	beq _081221BE
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _081221C8
diff --git a/asm/mystery_event_menu.s b/asm/mystery_event_menu.s
index 49de57848..df8e443a1 100644
--- a/asm/mystery_event_menu.s
+++ b/asm/mystery_event_menu.s
@@ -337,7 +337,7 @@ _08178C54:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08178D00
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08178C68
@@ -435,13 +435,13 @@ _08178D28:
 _08178D36:
 	b _08178E34
 _08178D38:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	cmp r0, 0
 	bne _08178D44
 	b _08178E58
 _08178D44:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	ldr r1, =gMain
 	movs r2, 0x87
 	lsls r2, 3
@@ -462,7 +462,7 @@ _08178D60:
 	b _08178E3C
 	.pool
 _08178D74:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r6, [r0]
 	cmp r6, 0
 	bne _08178E58
diff --git a/asm/pokeblock_feed.s b/asm/pokeblock_feed.s
index d82c5df07..bc402d91c 100644
--- a/asm/pokeblock_feed.s
+++ b/asm/pokeblock_feed.s
@@ -95,7 +95,7 @@ _08179C48:
 	bl FreeAllSpritePalettes
 	b _08179D32
 _08179C4E:
-	bl init_uns_table_pokemon_copy
+	bl AllocateMonSpritesGfx
 	ldr r1, =gMain
 	movs r2, 0x87
 	lsls r2, 3
@@ -322,7 +322,7 @@ _08179E48:
 	lsls r0, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x8]
 	adds r2, r5, 0
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index 2ad67ba5a..bcc52c172 100755
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -127,7 +127,7 @@ _081BF9EE:
 	strb r1, [r0]
 	movs r0, 0xFF
 	bl sub_81C488C
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r0, [r0]
 	cmp r0, 0
 	bne _081BFA12
@@ -1284,7 +1284,7 @@ sub_81C0484: @ 81C0484
 	movs r2, 0x80
 	lsls r2, 1
 	bl m4aMPlayVolumeControl
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r0, [r0]
 	cmp r0, 0
 	bne _081C04E2
@@ -8807,7 +8807,7 @@ _081C4620:
 	lsls r0, r2, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x8]
 	b _081C46D6
@@ -8817,12 +8817,12 @@ _081C4668:
 	lsls r0, r2, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	b _081C46B0
 	.pool
 _081C4680:
-	ldr r0, =gBattleSpritesGfx
+	ldr r0, =gMonSpritesGfxPtr
 	ldr r3, [r0]
 	adds r4, r0, 0
 	cmp r3, 0
diff --git a/asm/pokenav.s b/asm/pokenav.s
index fa0aaa9d0..0c7a80742 100755
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -28252,7 +28252,7 @@ _081D4FB6:
 	lsls r0, 24
 	cmp r0, 0
 	beq _081D500C
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _081D4FE6
@@ -28280,7 +28280,7 @@ _081D4FEC:
 	strb r0, [r4]
 	b _081D500C
 _081D4FF8:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _081D500C
@@ -28673,13 +28673,13 @@ _081D5374:
 	bl sub_80097E8
 	b _081D53C0
 _081D537A:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	cmp r0, 0
 	bne _081D5386
 	b _081D548A
 _081D5386:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	movs r0, 0xF
 	strb r0, [r4, 0x8]
 	b _081D548A
@@ -28694,7 +28694,7 @@ _081D5390:
 	b _081D548A
 	.pool
 _081D53A8:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _081D548A
diff --git a/asm/record_mixing.s b/asm/record_mixing.s
index a62022cc7..aacc5baa0 100644
--- a/asm/record_mixing.s
+++ b/asm/record_mixing.s
@@ -849,7 +849,7 @@ _080E745A:
 	strh r0, [r5, 0x20]
 	b _080E7566
 _080E7464:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080E746E
@@ -1066,7 +1066,7 @@ sub_80E7630: @ 80E7630
 	ldr r1, =gTasks
 	adds r0, r1
 	mov r10, r0
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [sp, 0x4]
@@ -1302,7 +1302,7 @@ sub_80E7810: @ 80E7810
 sub_80E7820: @ 80E7820
 	lsls r0, 24
 	lsrs r0, 16
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	adds r0, r1
 	bx lr
 	.pool
@@ -2368,7 +2368,7 @@ _080E807C:
 	bl sub_800AC34
 	b _080E80F2
 _080E8090:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080E810A
diff --git a/asm/recorded_battle.s b/asm/recorded_battle.s
index c84b518c3..48325cfed 100644
--- a/asm/recorded_battle.s
+++ b/asm/recorded_battle.s
@@ -95,7 +95,7 @@ sub_8184E58: @ 8184E58
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _08184EA0
-	ldr r1, =gUnknown_0203BD2C
+	ldr r1, =gRecordedBattleRngSeed
 	ldr r0, =gRngValue
 	ldr r0, [r0]
 	str r0, [r1]
@@ -112,7 +112,7 @@ _08184EA0:
 	cmp r0, 0x2
 	bne _08184EAC
 	ldr r0, =gRngValue
-	ldr r1, =gUnknown_0203BD2C
+	ldr r1, =gRecordedBattleRngSeed
 	ldr r1, [r1]
 	str r1, [r0]
 _08184EAC:
@@ -779,7 +779,7 @@ _081853BA:
 	movs r4, 0x9D
 	lsls r4, 3
 	adds r1, r7, r4
-	ldr r5, =gUnknown_0203BD2C
+	ldr r5, =gRecordedBattleRngSeed
 	ldr r0, [r5]
 	str r0, [r1]
 	ldr r0, =gUnknown_0203C7B8
@@ -1576,7 +1576,7 @@ sub_8185B1C: @ 8185B1C
 	ldr r0, =gMain
 	ldr r1, =sub_8185AB0
 	str r1, [r0, 0x8]
-	ldr r0, =sub_8036760
+	ldr r0, =CB2_InitBattle
 	bl SetMainCallback2
 	adds r0, r4, 0
 	bl DestroyTask
@@ -1701,7 +1701,7 @@ _08185C2A:
 	adds r6, 0x1
 	cmp r6, 0x3
 	ble _08185BBE
-	ldr r1, =gUnknown_0203BD2C
+	ldr r1, =gRecordedBattleRngSeed
 	movs r3, 0x9D
 	lsls r3, 3
 	adds r0, r7, r3
diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s
index 42ba43ec0..8bc97b45a 100644
--- a/asm/reshow_battle_screen.s
+++ b/asm/reshow_battle_screen.s
@@ -98,10 +98,10 @@ _080A93B0:
 	movs r0, 0x3
 	bl ShowBg
 	bl ResetPaletteFade
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r0, =gBattle_BG1_X
 	strh r1, [r0]
@@ -113,7 +113,7 @@ _080A93B0:
 	strh r1, [r0]
 	ldr r0, =gBattle_BG3_X
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r1, [r0]
 	b _080A95D2
 	.pool
@@ -128,7 +128,7 @@ _080A942C:
 	b _080A95D2
 	.pool
 _080A9444:
-	bl sub_8035AA4
+	bl LoadBattleTextboxAndBackground
 	b _080A95D2
 _080A944A:
 	bl ResetSpriteData
@@ -275,7 +275,7 @@ _080A955C:
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080A95D2
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080A95D2
diff --git a/asm/rom3.s b/asm/rom3.s
index 9bd95c252..23d320474 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start battle_wireless_setup_if_required_maybe
-battle_wireless_setup_if_required_maybe: @ 8032654
+	thumb_func_start HandleLinkBattleSetup
+HandleLinkBattleSetup: @ 8032654
 	push {lr}
 	ldr r0, =gBattleTypeFlags
 	ldr r0, [r0]
@@ -20,7 +20,7 @@ battle_wireless_setup_if_required_maybe: @ 8032654
 	beq _0803266E
 	bl sub_800B488
 _0803266E:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0803267A
@@ -34,10 +34,10 @@ _08032686:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end battle_wireless_setup_if_required_maybe
+	thumb_func_end HandleLinkBattleSetup
 
-	thumb_func_start sub_803269C
-sub_803269C: @ 803269C
+	thumb_func_start SetUpBattleVarsAndBirchZigzagoon
+SetUpBattleVarsAndBirchZigzagoon: @ 803269C
 	push {r4-r7,lr}
 	sub sp, 0x14
 	ldr r0, =gBattleMainFunc
@@ -71,7 +71,7 @@ _080326B8:
 	adds r1, r0, 0
 	cmp r1, 0x3
 	ble _080326B8
-	bl battle_wireless_setup_if_required_maybe
+	bl HandleLinkBattleSetup
 	ldr r0, =gBattleExecBuffer
 	movs r5, 0
 	str r5, [r0]
@@ -112,7 +112,7 @@ _08032728:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_803269C
+	thumb_func_end SetUpBattleVarsAndBirchZigzagoon
 
 	thumb_func_start sub_8032768
 sub_8032768: @ 8032768
@@ -1790,7 +1790,7 @@ _080335A0:
 	ldr r1, [r5]
 	adds r1, r2
 	adds r2, r6, 0
-	bl link_0800A448
+	bl SendBlock
 	ldrh r0, [r4, 0x1E]
 	adds r0, 0x1
 	strh r0, [r4, 0x1E]
@@ -1857,7 +1857,7 @@ sub_8033648: @ 8033648
 	mov r6, r9
 	mov r5, r8
 	push {r5-r7}
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08033738
@@ -1869,12 +1869,12 @@ sub_8033648: @ 8033648
 	beq _08033738
 	bl sub_8011BD0
 	movs r4, 0
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	mov r10, r0
 	b _0803372C
 	.pool
 _08033680:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =gBitTable
@@ -1891,7 +1891,7 @@ _08033680:
 	lsls r0, r4, 8
 	mov r4, r10
 	adds r3, r0, r4
-	ldr r1, =gUnknown_020223C8
+	ldr r1, =gBlockRecvBuffer + 4
 	adds r0, r1
 	ldrh r6, [r0]
 	ldr r7, =gTasks
diff --git a/asm/rom6.s b/asm/rom6.s
index cd1421b4f..44cdaea65 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -11564,7 +11564,7 @@ sub_813B534: @ 813B534
 	str r0, [r2]
 	movs r0, 0
 	str r0, [r1]
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0813B552
@@ -11651,11 +11651,11 @@ _0813B5FE:
 	lsrs r0, 24
 	ldr r1, =gSpecialVar_0x8004
 	movs r2, 0x2
-	bl link_0800A448
+	bl SendBlock
 	b _0813B708
 	.pool
 _0813B614:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	movs r1, 0x2
 	ands r1, r0
 	cmp r1, 0
@@ -11669,7 +11669,7 @@ _0813B622:
 	b _0813B790
 _0813B62E:
 	ldr r5, =gSpecialVar_0x8005
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	movs r1, 0x80
 	lsls r1, 1
 	adds r0, r1
@@ -11738,11 +11738,11 @@ _0813B6C2:
 	lsrs r0, 24
 	ldr r1, =gScriptResult
 	movs r2, 0x2
-	bl link_0800A448
+	bl SendBlock
 	b _0813B708
 	.pool
 _0813B6E4:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	movs r1, 0x1
 	ands r1, r0
 	cmp r1, 0
@@ -11752,7 +11752,7 @@ _0813B6E4:
 	cmp r0, 0
 	beq _0813B790
 	ldr r1, =gScriptResult
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	ldrh r0, [r0]
 	strh r0, [r1]
 	movs r0, 0
diff --git a/asm/rom_80A5C6C.s b/asm/rom_80A5C6C.s
index 267045179..6135f81e0 100644
--- a/asm/rom_80A5C6C.s
+++ b/asm/rom_80A5C6C.s
@@ -5155,7 +5155,7 @@ sub_80A8394: @ 80A8394
 	bl AllocSpritePalette
 	lsls r0, 24
 	lsrs r5, r0, 24
-	ldr r4, =gBattleSpritesGfx
+	ldr r4, =gMonSpritesGfxPtr
 	ldr r0, [r4]
 	cmp r0, 0
 	beq _080A8412
@@ -5213,7 +5213,7 @@ _080A845E:
 	lsls r0, r6, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	movs r3, 0xBE
 	lsls r3, 1
@@ -5226,7 +5226,7 @@ _080A8488:
 	lsls r0, r6, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	movs r2, 0xBE
 	lsls r2, 1
@@ -5276,7 +5276,7 @@ _080A84F6:
 	lsls r0, r6, 3
 	ldr r1, =gMonBackPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	movs r2, 0xBE
 	lsls r2, 1
@@ -5294,7 +5294,7 @@ _080A8524:
 	lsls r0, r6, 3
 	ldr r1, =gMonBackPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	movs r3, 0xBE
 	lsls r3, 1
@@ -5305,7 +5305,7 @@ _080A8524:
 	mov r3, r8
 	bl LoadSpecialPokePic_2
 _080A8540:
-	ldr r5, =gBattleSpritesGfx
+	ldr r5, =gMonSpritesGfxPtr
 	ldr r0, [r5]
 	movs r4, 0xBE
 	lsls r4, 1
diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s
index e26194298..e5f69eeac 100644
--- a/asm/script_pokemon_util_80F87D8.s
+++ b/asm/script_pokemon_util_80F87D8.s
@@ -670,7 +670,7 @@ sub_80F8D28: @ 80F8D28
 	beq _080F8D44
 	b _080F8E9C
 _080F8D44:
-	bl init_uns_table_pokemon_copy
+	bl AllocateMonSpritesGfx
 	movs r0, 0xA
 	mov r9, r0
 	movs r1, 0x3
@@ -710,7 +710,7 @@ _080F8D44:
 	lsls r0, r6, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x8]
 	adds r2, r6, 0
@@ -722,7 +722,7 @@ _080F8DC4:
 	lsls r0, r6, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x8]
 	adds r2, r6, 0
@@ -1093,7 +1093,7 @@ sub_80F90DC: @ 80F90DC
 	ands r0, r1
 	cmp r0, 0
 	beq _080F90FE
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080F90FE
@@ -1116,7 +1116,7 @@ sub_80F910C: @ 80F910C
 	ands r0, r1
 	cmp r0, 0
 	beq _080F9126
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080F9126
diff --git a/asm/trade.s b/asm/trade.s
index 8712567c7..42ed85948 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -18,7 +18,7 @@ sub_8077170: @ 8077170
 	lsrs r2, 16
 	movs r0, 0
 	adds r1, r4, 0
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	lsrs r0, 24
 	b _080771A2
@@ -83,7 +83,7 @@ _080771F8:
 	thumb_func_start sub_8077200
 sub_8077200: @ 8077200
 	push {lr}
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r1}
@@ -103,7 +103,7 @@ sub_8077210: @ 8077210
 	b _08077230
 	.pool
 _0807722C:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 _08077230:
 	pop {r0}
 	bx r0
@@ -397,7 +397,7 @@ _080774B2:
 	bl sub_807A19C
 	movs r0, 0
 	bl ShowBg
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r2, [r0]
 	cmp r2, 0
 	bne _0807754C
@@ -504,7 +504,7 @@ _080775D8:
 	b _08077B22
 	.pool
 _080775E8:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	beq _080775F2
@@ -1832,7 +1832,7 @@ sub_80781C8: @ 80781C8
 	b _08078244
 	.pool
 _08078220:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r4, [r0]
 	cmp r4, 0
 	bne _08078244
@@ -2198,7 +2198,7 @@ _08078552:
 	adds r1, r5, 0
 	eors r1, r2
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0xC8
 	bl sub_8078438
@@ -2237,7 +2237,7 @@ _080785B6:
 	adds r1, r5, 0
 	eors r1, r2
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0xC8
 	bl sub_8078438
@@ -2276,7 +2276,7 @@ _0807861A:
 	adds r1, r5, 0
 	eors r1, r2
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0xC8
 	bl sub_8078438
@@ -2318,7 +2318,7 @@ _0807868A:
 	adds r1, r5, 0
 	eors r1, r2
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0xD8
 	bl sub_8078438
@@ -2360,7 +2360,7 @@ _080786F0:
 	adds r1, r5, 0
 	eors r1, r2
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0xB
 	bl sub_8078438
@@ -2467,7 +2467,7 @@ sub_80787E0: @ 80787E0
 	ands r0, r2
 	cmp r0, 0
 	beq _08078864
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	ldrh r1, [r0]
 	ldr r0, =0x0000bbbb
 	cmp r1, r0
@@ -2521,7 +2521,7 @@ _08078864:
 	ands r0, r2
 	cmp r0, 0
 	beq _080788F6
-	ldr r3, =gUnknown_020223C4
+	ldr r3, =gBlockRecvBuffer
 	movs r1, 0x80
 	lsls r1, 1
 	adds r0, r3, r1
@@ -2597,7 +2597,7 @@ sub_8078900: @ 8078900
 	ands r0, r5
 	cmp r0, 0
 	beq _080789E2
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	ldrh r1, [r2]
 	ldr r0, =0x0000ddee
 	cmp r1, r0
@@ -4052,7 +4052,7 @@ sub_80794CC: @ 80794CC
 	b _0807953A
 	.pool
 _08079518:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0807953A
@@ -6279,7 +6279,7 @@ _0807A718:
 	thumb_func_start sub_807A728
 sub_807A728: @ 807A728
 	push {r4-r7,lr}
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0807A7B4
@@ -7054,7 +7054,7 @@ _0807ACC4:
 	thumb_func_start sub_807ACDC
 sub_807ACDC: @ 807ACDC
 	push {lr}
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0807ACF0
@@ -7128,7 +7128,7 @@ _0807AD58:
 	lsls r0, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x8]
 	adds r2, r5, 0
@@ -7141,7 +7141,7 @@ _0807AD94:
 	lsls r0, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r2, [r1]
 	lsls r4, r6, 1
 	adds r1, r4, 0x1
@@ -7254,7 +7254,7 @@ _0807AE78:
 	.4byte _0807B0D4
 	.4byte _0807B0F0
 _0807AEAC:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0807AEC0
@@ -7270,7 +7270,7 @@ _0807AEC0:
 	adds r0, r5, 0
 	bl AllocZeroed
 	str r0, [r4]
-	bl init_uns_table_pokemon_copy
+	bl AllocateMonSpritesGfx
 	bl ResetTasks
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
@@ -7321,7 +7321,7 @@ _0807AEC0:
 	b _0807B116
 	.pool
 _0807AF58:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r5, [r0]
 	cmp r5, 0
 	bne _0807AF90
@@ -7401,7 +7401,7 @@ _0807B000:
 	b _0807B116
 _0807B006:
 	bl sub_807AC64
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	beq _0807B014
@@ -7729,7 +7729,7 @@ _0807B2D0:
 	adds r0, r5, 0
 	bl AllocZeroed
 	str r0, [r4]
-	bl init_uns_table_pokemon_copy
+	bl AllocateMonSpritesGfx
 	bl ResetTasks
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
@@ -7989,7 +7989,7 @@ _0807B566:
 _0807B57C:
 	mov r0, r9
 	bl sub_807B464
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0807B58E
@@ -8029,7 +8029,7 @@ _0807B5D0:
 	ldr r1, [r4]
 	adds r1, 0x74
 	movs r2, 0x14
-	bl link_0800A448
+	bl SendBlock
 	ldr r1, [r4]
 	adds r1, 0x93
 	ldrb r0, [r1]
@@ -10369,7 +10369,7 @@ _0807CCEE:
 	lsls r0, r2, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x10]
 	ldr r3, [r3, 0x6C]
@@ -12474,7 +12474,7 @@ _0807E13A:
 	lsls r0, r2, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x10]
 	ldr r3, [r3, 0x6C]
@@ -12877,7 +12877,7 @@ _0807E4C2:
 sub_807E4DC: @ 807E4DC
 	push {r4-r6,lr}
 	bl sub_807ACDC
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	lsrs r5, r0, 24
 	movs r6, 0x1
@@ -12885,7 +12885,7 @@ sub_807E4DC: @ 807E4DC
 	ands r0, r6
 	cmp r0, 0
 	beq _0807E51A
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	ldrh r1, [r4]
 	ldr r0, =0x0000dcba
 	cmp r1, r0
@@ -12909,7 +12909,7 @@ _0807E51A:
 	ands r0, r5
 	cmp r0, 0
 	beq _0807E542
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	movs r1, 0x80
 	lsls r1, 1
 	adds r0, r1
@@ -13600,7 +13600,7 @@ _0807EAEC:
 	ldr r1, [r4]
 	adds r1, 0x74
 	movs r2, 0x14
-	bl link_0800A448
+	bl SendBlock
 	ldr r0, [r4]
 	adds r0, 0x72
 	movs r1, 0x2
@@ -14090,7 +14090,7 @@ _0807EFF0:
 	b _0807F03A
 	.pool
 _0807F028:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r1, [r0]
 	cmp r1, 0
 	bne _0807F03A
diff --git a/asm/trainer_card.s b/asm/trainer_card.s
index 7552d7ace..bee1f4f7f 100644
--- a/asm/trainer_card.s
+++ b/asm/trainer_card.s
@@ -191,7 +191,7 @@ _080C2836:
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _080C2852
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _080C2852
@@ -261,7 +261,7 @@ _080C28D8:
 	b _080C2ACA
 	.pool
 _080C28E4:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r5, [r0]
 	cmp r5, 0
 	bne _080C290A
@@ -301,7 +301,7 @@ _080C293C:
 	bne _080C2946
 	b _080C2ACA
 _080C2946:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080C2960
@@ -346,7 +346,7 @@ _080C299C:
 	ands r0, r1
 	cmp r0, 0
 	beq _080C29F4
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080C29DC
@@ -358,7 +358,7 @@ _080C299C:
 	cmp r0, 0x1
 	beq _080C2A14
 _080C29C0:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080C29DC
@@ -382,7 +382,7 @@ _080C29F4:
 	ands r0, r1
 	cmp r0, 0
 	beq _080C2ACA
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080C2A20
@@ -430,7 +430,7 @@ _080C2A2C:
 	b _080C2ACA
 	.pool
 _080C2A68:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080C2ACA
@@ -1403,7 +1403,7 @@ sub_80C3278: @ 80C3278
 	movs r0, 0x40
 	movs r1, 0xF0
 	bl SetGpuReg
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080C32E0
@@ -4267,7 +4267,7 @@ _080C4BF6:
 	ldrb r0, [r1, 0x4]
 	adds r0, 0x1
 	strb r0, [r1, 0x4]
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080C4B20
@@ -4745,7 +4745,7 @@ sub_80C4FF0: @ 80C4FF0
 	bl InUnionRoom
 	cmp r0, 0x1
 	bne _080C5060
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _080C5060
diff --git a/asm/unknown_task.s b/asm/unknown_task.s
index 99a614e37..f6b96287e 100644
--- a/asm/unknown_task.s
+++ b/asm/unknown_task.s
@@ -267,11 +267,11 @@ _080BA1D8:
 	.4byte _080BA250
 	.4byte _080BA24C
 _080BA214:
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	b _080BA24E
 	.pool
 _080BA21C:
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	b _080BA24E
 	.pool
 _080BA224:
@@ -295,7 +295,7 @@ _080BA244:
 	b _080BA24E
 	.pool
 _080BA24C:
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 _080BA24E:
 	ldrh r6, [r0]
 _080BA250:
diff --git a/include/battle.h b/include/battle.h
index 67d3d873d..72168aa60 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -55,6 +55,8 @@
 #define BATTLE_TYPE_KYORGE          0x20000000
 #define BATTLE_TYPE_RAYQUAZA        0x40000000
 
+#define TRAINER_OPPONENT_C00        0xC00
+#define TRAINER_OPPONENT_800        0x800
 #define STEVEN_PARTNER_ID           0xC03
 #define SECRET_BASE_OPPONENT        0x400
 
@@ -215,14 +217,17 @@
 #define BATTLE_TERRAIN_POND         5
 #define BATTLE_TERRAIN_ROCK         6
 #define BATTLE_TERRAIN_CAVE         7
+#define BATTLE_TERRAIN_INSIDE       8
 
 // array entries for battle communication
-#define MULTIUSE_STATE      0x0
-#define CURSOR_POSITION     0x1
-#define TASK_ID             0x1 // task Id and cursor position share the same field
-#define MOVE_EFFECT_BYTE    0x3
-#define MULTISTRING_CHOOSER 0x5
-#define MSG_DISPLAY         0x7
+#define MULTIUSE_STATE          0x0
+#define CURSOR_POSITION         0x1
+#define TASK_ID                 0x1 // task Id and cursor position share the same field
+#define SPRITES_INIT_STATE1     0x1 // shares the Id as well
+#define SPRITES_INIT_STATE2     0x2
+#define MOVE_EFFECT_BYTE        0x3
+#define MULTISTRING_CHOOSER     0x5
+#define MSG_DISPLAY             0x7
 
 #define MOVE_TARGET_SELECTED        0x0
 #define MOVE_TARGET_DEPENDS         0x1
@@ -633,15 +638,13 @@ struct BattleStruct
     u8 field_A5;
     u8 field_A6;
     u8 field_A7;
-    u16 hpOnSwitchout[4];
+    u16 hpOnSwitchout[2];
+    u32 savedBattleTypeFlags;
     u8 field_B0;
     u8 hpScale;
     u8 synchronizeMoveEffect;
     u8 field_B3;
-    u8 field_B4;
-    u8 field_B5;
-    u8 field_B6;
-    u8 field_B7;
+    void (*savedCallback)(void);
     u16 usedHeldItems[BATTLE_BANKS_COUNT];
     u8 field_C0[8];
     u16 choicedMove[BATTLE_BANKS_COUNT];
@@ -654,7 +657,11 @@ struct BattleStruct
     u8 field_DF;
     u8 mirrorMoveArrays[32];
     u16 castformPalette[4][16];
-    u8 field_180[32];
+    u8 field_180;
+    u8 field_181;
+    u8 field_182;
+    u8 field_183;
+    struct BattleEnigmaBerry battleEnigmaBerry;
     u8 field_1A0;
     u8 field_1A1;
     u8 filler1A2;
@@ -842,13 +849,24 @@ struct BattleScripting
     u8 atk6C_state;
     u8 learnMoveState;
     u8 field_20;
+    u8 field_21;
+    u8 field_22;
+    u8 field_23;
+    u8 field_24;
+    u8 multiplayerId;
 };
 
 extern struct BattleScripting gBattleScripting;
 
 // functions
 
+// battle_1
+void LoadBattleTextboxAndBackground(void);
+void LoadBattleEntryBackground(void);
+void task00_0800F6FC(u8 taskId);
+
 // battle_2
+void CB2_InitBattle(void);
 void CancelMultiTurnMoves(u8 bank);
 void PressurePPLose(u8 bankAtk, u8 bankDef, u16 move);
 void PrepareStringBattle(u16 stringId, u8 bank);
@@ -914,13 +932,18 @@ extern void (* const gBattleScriptingCommandsTable[])(void);
 extern const u8 gUnknown_0831C494[];
 
 // battle_5
+void AllocateBattleResrouces(void);
 void AdjustFriendshipOnBattleFaint(u8 bank);
 void sub_80571DC(u8 bank, u8 arg1);
 u32 sub_805725C(u8 bank);
 
 // battle 7
+void AllocateBattleSpritesData(void);
 void BattleMusicStop(void);
 void sub_805E990(struct Pokemon* mon, u8 bank);
+void AllocateMonSpritesGfx(void);
+void sub_805EF14(void);
+bool8 BattleInitAllSprites(u8 *state1, u8 *state2);
 
 // rom_80A5C6C
 u8 GetBankSide(u8 bank);
@@ -931,13 +954,13 @@ u8 GetBankByIdentity(u8 bank);
 
 #include "sprite.h"
 
-struct BattleSpritesGfx
+struct MonSpritesGfx
 {
     void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon
     void* sprites[4];
     struct SpriteTemplate templates[4];
 };
 
-extern struct BattleSpritesGfx* gBattleSpritesGfx;
+extern struct MonSpritesGfx* gMonSpritesGfxPtr;
 
 #endif // GUARD_BATTLE_H
diff --git a/include/battle_setup.h b/include/battle_setup.h
new file mode 100644
index 000000000..80fb55da2
--- /dev/null
+++ b/include/battle_setup.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_BATTLE_SETUP_H
+#define GUARD_BATTLE_SETUP_H
+
+u8 BattleSetup_GetTerrainId(void);
+
+#endif // GUARD_BATTLE_SETUP_H
diff --git a/include/flags.h b/include/flags.h
index 19ec01b56..020fc59cb 100644
--- a/include/flags.h
+++ b/include/flags.h
@@ -84,6 +84,8 @@
 #define SYS_CTRL_OBJ_DELETE  CODE_FLAGS + 0x61
 #define SYS_RESET_RTC_ENABLE CODE_FLAGS + 0x62
 
+#define SYS_FRONTIER_PASS   CODE_FLAGS + 0x72
+
 #define SYS_STORAGE_UNKNOWN_FLAG    CODE_FLAGS + 0x77
 
 #define SYS_MYSTERY_GIFT_ENABLE     CODE_FLAGS + 0x7B
diff --git a/include/global.berry.h b/include/global.berry.h
index a77da20ba..5c8a43a02 100644
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -1,9 +1,12 @@
 #ifndef GUARD_GLOBAL_BERRY_H
 #define GUARD_GLOBAL_BERRY_H
 
+#define BERRY_NAME_COUNT 7
+#define BERRY_ITEM_EFFECT_COUNT 18
+
 struct Berry
 {
-    const u8 name[7];
+    const u8 name[BERRY_NAME_COUNT];
     u8 firmness;
     u16 size;
     u8 maxYield;
@@ -23,7 +26,7 @@ struct Berry
 
 struct Berry2
 {
-    u8 name[7];
+    u8 name[BERRY_NAME_COUNT];
     u8 firmness;
     u16 size;
     u8 maxYield;
@@ -42,7 +45,7 @@ struct Berry2
 struct EnigmaBerry
 {
     struct Berry2 berry;
-    u8 itemEffect[18];
+    u8 itemEffect[BERRY_ITEM_EFFECT_COUNT];
     u8 holdEffect;
     u8 holdEffectParam;
     u32 checksum;
@@ -50,9 +53,9 @@ struct EnigmaBerry
 
 struct BattleEnigmaBerry
 {
-    /*0x00*/ u8 name[7];
+    /*0x00*/ u8 name[BERRY_NAME_COUNT];
     /*0x07*/ u8 holdEffect;
-    /*0x08*/ u8 itemEffect[18];
+    /*0x08*/ u8 itemEffect[BERRY_ITEM_EFFECT_COUNT];
     /*0x1A*/ u8 holdEffectParam;
 };
 
diff --git a/include/global.h b/include/global.h
index 4014c6dde..e0c09d29a 100644
--- a/include/global.h
+++ b/include/global.h
@@ -198,8 +198,13 @@ struct SaveBlock2
         // All below could be a one giant struct
 
     /*0x64C*/ u8 field_64C[1629];
-    /*0xCA9*/ u8 frontierChosenLvl : 2;
-    /*0xCA9*/ u8 field_CA9_a : 6;
+    /*0xCA9*/ u8 frontierChosenLvl : 2; // 0x1, 0x2 -> 0x3
+    /*0xCA9*/ u8 field_CA9_a : 1;   // 0x4
+    /*0xCA9*/ u8 field_CA9_b : 1;   // 0x8
+    /*0xCA9*/ u8 field_CA9_c : 1;   // 0x10
+    /*0xCA9*/ u8 field_CA9_d : 1;   // 0x20
+    /*0xCA9*/ u8 field_CA9_e : 1;   // 0x40
+    /*0xCA9*/ u8 field_CA9_f : 1;   // 0x80
     /*0xCAA*/ u8 field_CAA[368];
     /*0xE1A*/ u16 battlePyramidFloor; // possibly?
     /*0xE1C*/ u8 field_E1C[16];
diff --git a/include/link.h b/include/link.h
index 5db3ff3d2..b719371da 100644
--- a/include/link.h
+++ b/include/link.h
@@ -143,7 +143,6 @@ extern u16 word_3002910[];
 extern bool8 gReceivedRemoteLinkPlayers;
 
 void Task_DestroySelf(u8);
-void sub_8007270(u8);
 void OpenLink(void);
 void CloseLink(void);
 u16 LinkMain2(u16 *);
@@ -162,24 +161,12 @@ void sub_8007E4C(void);
 u8 GetMultiplayerId(void);
 u8 bitmask_all_link_players_but_self(void);
 bool8 SendBlock(u8, void *, u16);
-bool8 sub_8007E9C(u8);
-bool8 sub_8007ECC(void);
 u8 GetBlockReceivedStatus(void);
 void ResetBlockReceivedFlags(void);
 void ResetBlockReceivedFlag(u8);
-void sub_8007F4C(void);
 void SetLinkDebugValues(u32, u32);
-u8 sub_8008198(void);
-void sub_80081C8(u8);
-u8 sub_800820C(void);
-u8 sub_8008218(void);
-void sub_800826C(void);
-void sub_80082EC(void);
 u8 GetLinkPlayerCount_2(void);
 bool8 IsLinkMaster(void);
-void sub_800832C(void);
-void sub_8008480(void);
-void sub_80084A4(void);
 void CB2_LinkError(void);
 u8 GetSioMultiSI(void);
 bool8 IsLinkConnectionEstablished(void);
@@ -191,4 +178,9 @@ void LinkVSync(void);
 void Timer3Intr(void);
 void SerialCB(void);
 
+void sub_800E0E8(void);
+bool8 sub_800A520(void);
+bool8 sub_8010500(void);
+void sub_800DFB4(u8, u8);
+
 #endif // GUARD_LINK_H
diff --git a/include/load_save.h b/include/load_save.h
index 20848e1a7..1f406bbad 100644
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -19,5 +19,6 @@ void LoadSerializedGame(void);
 void LoadPlayerBag(void);
 void SavePlayerBag(void);
 void SetSaveBlocksPointers(u16);
+void MoveSaveBlocks_ResetHeap(void);
 
 #endif // GUARD_LOAD_SAVE_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 20e904f39..5ebb9afb1 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -632,6 +632,7 @@ void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality);
 s32 sub_806D864(u16 a1);
 bool16 sub_806D82C(u8 id);
 u16 MonTryLearningNewMove(struct Pokemon* mon, bool8);
+void sub_8068AA4(void); // sets stats for deoxys
 
 #include "sprite.h"
 
diff --git a/include/recorded_battle.h b/include/recorded_battle.h
index d19a2b713..407d0caf7 100644
--- a/include/recorded_battle.h
+++ b/include/recorded_battle.h
@@ -1,6 +1,11 @@
 #ifndef GUARD_RECORDED_BATTLE_H
 #define GUARD_RECORDED_BATTLE_H
 
+extern u32 gRecordedBattleRngSeed;
+
+void sub_8185F84(void);
+void sub_8184E58(void);
 void RecordedBattle_SetBankAction(u8 bank, u8 action);
+void sub_8185F90(u16 arg0);
 
 #endif // GUARD_RECORDED_BATTLE_H
diff --git a/include/unknown_task.h b/include/unknown_task.h
index f59ca9ac3..7457451a8 100644
--- a/include/unknown_task.h
+++ b/include/unknown_task.h
@@ -2,10 +2,20 @@
 #define GUARD_unknown_task_H
 
 // Exported type declarations
+struct UnknownTaskStruct
+{
+    volatile void *dest;
+    u32 control;
+    u8 unk8;
+    u8 unk9;
+};
+
+extern struct UnknownTaskStruct gUnknown_0831AC70;
 
 // Exported RAM declarations
 
 // Exported ROM declarations
 void remove_some_task(void);
+void sub_80BA038(struct UnknownTaskStruct arg0);
 
-#endif //GUARD_unknown_task_H
+#endif // GUARD_unknown_task_H
diff --git a/ld_script.txt b/ld_script.txt
index c2f8af595..ac335b17c 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -57,6 +57,7 @@ SECTIONS {
         asm/rom3.o(.text);
         src/decompress.o(.text);
         asm/battle_1.o(.text);
+        src/battle_2.o(.text);
         asm/battle_2.o(.text);
         src/battle_3.o(.text);
         src/battle_script_commands.o(.text);
diff --git a/src/battle_2.c b/src/battle_2.c
new file mode 100644
index 000000000..844827326
--- /dev/null
+++ b/src/battle_2.c
@@ -0,0 +1,1343 @@
+#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 "pokemon.h"
+#include "palette.h"
+#include "task.h"
+#include "event_data.h"
+#include "species.h"
+#include "berry.h"
+#include "text.h"
+#include "items.h"
+#include "hold_effects.h"
+#include "link.h"
+#include "bg.h"
+#include "dma3.h"
+#include "string_util.h"
+#include "malloc.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 u32 gBattleTypeFlags;
+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 struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for?
+extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for?
+
+extern struct UnknownStruct6 gUnknown_02038C28; // todo: identify & document
+
+extern void HandleLinkBattleSetup(void); // rom_3
+extern void SetUpBattleVarsAndBirchZigzagoon(void); // rom_3
+extern void sub_8032768(void); // rom_3
+extern void dp12_8087EA4(void);
+extern void c2_berry_program_update_menu(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 sub_81B9150(void);
+extern void sub_800ADF8(void);
+extern void sub_800AC34(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);
+void shedinja_something(struct Pokemon *mon);
+void CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 firstTrainer);
+void BattleMainCB1(void);
+
+void CB2_InitBattle(void)
+{
+    MoveSaveBlocks_ResetHeap();
+    AllocateBattleResrouces();
+    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_INSIDE;
+
+    c2_berry_program_update_menu();
+    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 < 6; 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(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(task00_0800F6FC, 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);
+            shedinja_something(&gEnemyParty[0]);
+            shedinja_something(&gEnemyParty[1]);
+            shedinja_something(&gEnemyParty[2]);
+            shedinja_something(&gEnemyParty[3]);
+            shedinja_something(&gEnemyParty[4]);
+            shedinja_something(&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) == 3; 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(task00_0800F6FC, 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);
+            shedinja_something(&gPlayerParty[0]);
+            shedinja_something(&gPlayerParty[1]);
+            shedinja_something(&gPlayerParty[2]);
+            shedinja_something(&gPlayerParty[3]);
+            shedinja_something(&gPlayerParty[4]);
+            shedinja_something(&gPlayerParty[5]);
+            shedinja_something(&gEnemyParty[0]);
+            shedinja_something(&gEnemyParty[1]);
+            shedinja_something(&gEnemyParty[2]);
+            shedinja_something(&gEnemyParty[3]);
+            shedinja_something(&gEnemyParty[4]);
+            shedinja_something(&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)
+            sub_81DB4DC(gUnknown_02022FF8[i].nickname, 0);
+    }
+    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(task00_0800F6FC, 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;
+                        }
+                    }
+                }
+            }
+            shedinja_something(&gPlayerParty[0]);
+            shedinja_something(&gPlayerParty[1]);
+            shedinja_something(&gPlayerParty[2]);
+            shedinja_something(&gPlayerParty[3]);
+            shedinja_something(&gPlayerParty[4]);
+            shedinja_something(&gPlayerParty[5]);
+
+            shedinja_something(&gEnemyParty[0]);
+            shedinja_something(&gEnemyParty[1]);
+            shedinja_something(&gEnemyParty[2]);
+            shedinja_something(&gEnemyParty[3]);
+            shedinja_something(&gEnemyParty[4]);
+            shedinja_something(&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;
+    }
+}
+
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index e0cb3e941..3b719b8ed 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -146,7 +146,6 @@ extern u8 sav1_map_get_light_level(void);
 extern u8 sub_813B21C(void);
 extern u16 get_unknown_box_id(void);
 extern void c2_berry_program_update_menu(void);
-extern void sub_8035AA4(void);
 
 // BattleScripts
 extern const u8 BattleScript_MoveEnd[];
@@ -11218,7 +11217,7 @@ static void atkF2_display_dex_info(void)
         break;
     case 3:
         c2_berry_program_update_menu();
-        sub_8035AA4();
+        LoadBattleTextboxAndBackground();
         gBattle_BG3_X = 0x100;
         gBattleCommunication[0]++;
         break;
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 6d14e92f0..c5cee6357 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -64,7 +64,7 @@ extern void sub_806A068(u16, u8);
 extern void fade_screen(u8, u8);
 extern void overworld_free_bg_tilemaps(void);
 extern void sub_80AF168(void);
-extern void init_uns_table_pokemon_copy(void);
+extern void AllocateMonSpritesGfx(void);
 extern void sub_805F094(void);
 extern void remove_some_task(void);
 extern void reset_temp_tile_data_buffers(void);
@@ -439,7 +439,7 @@ static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID, u16* speciesLoc
             u16 species = GetMonData(mon, MON_DATA_SPECIES);
             u32 pid = GetMonData(mon, MON_DATA_PERSONALITY);
             HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species],
-                                                      gBattleSpritesGfx->sprites[(a0 * 2) + 1],
+                                                      gMonSpritesGfxPtr->sprites[(a0 * 2) + 1],
                                                       species, pid);
             LoadCompressedObjectPalette(sub_806E794(mon));
             *speciesLoc = species;
@@ -488,7 +488,7 @@ static void CB2_EggHatch_0(void)
         SetGpuReg(REG_OFFSET_DISPCNT, 0);
 
         sEggHatchData = Alloc(sizeof(struct EggHatchData));
-        init_uns_table_pokemon_copy();
+        AllocateMonSpritesGfx();
         sEggHatchData->eggPartyID = gSpecialVar_0x8004;
         sEggHatchData->eggShardVelocityID = 0;
 
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index c5c36c793..8a16954a7 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -152,8 +152,8 @@ u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality)
 
 void sub_806A068(u16 species, u8 bankIdentity)
 {
-    if (gBattleSpritesGfx != NULL)
-        gUnknown_0202499C = gBattleSpritesGfx->templates[bankIdentity];
+    if (gMonSpritesGfxPtr != NULL)
+        gUnknown_0202499C = gMonSpritesGfxPtr->templates[bankIdentity];
     else if (gUnknown_020249B4[0])
         gUnknown_0202499C = gUnknown_020249B4[0]->templates[bankIdentity];
     else if (gUnknown_020249B4[1])
@@ -180,8 +180,8 @@ void sub_806A12C(u16 trainerSpriteId, u8 bankIdentity)
     }
     else
     {
-        if (gBattleSpritesGfx != NULL)
-            gUnknown_0202499C = gBattleSpritesGfx->templates[bankIdentity];
+        if (gMonSpritesGfxPtr != NULL)
+            gUnknown_0202499C = gMonSpritesGfxPtr->templates[bankIdentity];
         else
             gUnknown_0202499C = gUnknown_08329D98[bankIdentity];
         gUnknown_0202499C.anims = gUnknown_0830536C[trainerSpriteId];
@@ -190,8 +190,8 @@ void sub_806A12C(u16 trainerSpriteId, u8 bankIdentity)
 
 void sub_806A1C0(u16 arg0, u8 bankIdentity)
 {
-    if (gBattleSpritesGfx != NULL)
-        gUnknown_0202499C = gBattleSpritesGfx->templates[bankIdentity];
+    if (gMonSpritesGfxPtr != NULL)
+        gUnknown_0202499C = gMonSpritesGfxPtr->templates[bankIdentity];
     else
         gUnknown_0202499C = gUnknown_08329D98[bankIdentity];
     gUnknown_0202499C.paletteTag = arg0;
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index d44c0cb2f..e4934306c 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -486,8 +486,8 @@ u16 SpeciesToCryId(u16 species)
 void sub_806D544(u16 species, u32 personality, u8 *dest)
 {
     if (species == SPECIES_SPINDA
-        && dest != gBattleSpritesGfx->sprites[0]
-        && dest != gBattleSpritesGfx->sprites[2])
+        && dest != gMonSpritesGfxPtr->sprites[0]
+        && dest != gMonSpritesGfxPtr->sprites[2])
     {
         int i;
         for (i = 0; i < 4; i++)
diff --git a/sym_common.txt b/sym_common.txt
index 834f23918..7ba414cab 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -117,7 +117,7 @@ gUnknown_03003110: @ 3003110
 gUnknown_03003120: @ 3003120
 	.space 0x4
 
-gUnknown_03003124: @ 3003124
+gReceivedRemoteLinkPlayers: @ 3003124
 	.space 0xC
 
 gUnknown_03003130: @ 3003130
@@ -203,7 +203,7 @@ gUnknown_03005CDE: @ 3005CDE
 
     .include "rtc.o"
 
-gUnknown_03005D00: @ 3005D00
+gPreBattleCallback1: @ 3005D00
 	.space 0x4
 
 gBattleMainFunc: @ 3005D04
diff --git a/sym_ewram.txt b/sym_ewram.txt
index e49b94160..ce3b4f250 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -31,11 +31,8 @@ gUnknown_020223BD: @ 20223BD
 gUnknown_020223C0: @ 20223C0
 	.space 0x4
 
-gUnknown_020223C4: @ 20223C4
-	.space 0x4
-
-gUnknown_020223C8: @ 20223C8
-	.space 0x4FC
+gBlockRecvBuffer: @ 20223C4
+	.space 0x500
 
 gUnknown_020228C4: @ 20228C4 gBlockSendBuffer
 	.space 0x100
@@ -205,10 +202,10 @@ gUnknown_02022D10: @ 2022D10
 gUnknown_02022E10: @ 2022E10
 	.space 0x4
 
-gUnknown_02022E14: @ 2022E14
+gBattle_BG0_X: @ 2022E14
 	.space 0x2
 
-gUnknown_02022E16: @ 2022E16
+gBattle_BG0_Y: @ 2022E16
 	.space 0x2
 
 gBattle_BG1_X: @ 2022E18
@@ -226,19 +223,19 @@ gBattle_BG2_Y: @ 2022E1E
 gBattle_BG3_X: @ 2022E20
 	.space 0x2
 
-gUnknown_02022E22: @ 2022E22
+gBattle_BG3_Y: @ 2022E22
 	.space 0x2
 
-gUnknown_02022E24: @ 2022E24
+gBattle_WIN0H: @ 2022E24
 	.space 0x2
 
-gUnknown_02022E26: @ 2022E26
+gBattle_WIN0V: @ 2022E26
 	.space 0x2
 
-gUnknown_02022E28: @ 2022E28
+gBattle_WIN1H: @ 2022E28
 	.space 0x2
 
-gUnknown_02022E2A: @ 2022E2A
+gBattle_WIN1V: @ 2022E2A
 	.space 0x2
 
 gDisplayedStringBattle: @ 2022E2C
@@ -526,7 +523,7 @@ gUnknown_020244CC: @ 20244CC
 gUnknown_020244D0: @ 20244D0
 	.space 0x4
 
-gBattleSpritesGfx: @ 20244D4
+gMonSpritesGfxPtr: @ 20244D4
 	.space 0x4
 
 gUnknown_020244D8: @ 20244D8
@@ -1671,7 +1668,7 @@ gUnknown_0203BD26: @ 203BD26
 gUnknown_0203BD28: @ 203BD28
 	.space 0x4
 
-gUnknown_0203BD2C: @ 203BD2C
+gRecordedBattleRngSeed: @ 203BD2C
 	.space 0x4
 
 gUnknown_0203BD30: @ 203BD30

From 20ed9ad0ac92cddcbfe66ccc9c2ae3cb1000ed71 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 30 Sep 2017 21:19:29 -0400
Subject: [PATCH 11/42] Decompile asm/tileset.s into src/palette.c

---
 asm/tileset.s     | 1785 ---------------------------------------------
 data/graphics.s   |   14 +-
 data/palette.s    |   18 -
 data/start_menu.s |    2 +-
 data/tileset.s    |    3 +
 ld_script.txt     |    3 +-
 src/palette.c     |  880 +++++++++++++++++++++-
 src/scrcmd.c      |   15 +
 sym_bss.txt       |   28 +-
 sym_ewram.txt     |    3 -
 10 files changed, 891 insertions(+), 1860 deletions(-)
 delete mode 100644 data/palette.s
 create mode 100644 src/scrcmd.c

diff --git a/asm/tileset.s b/asm/tileset.s
index 0605c7621..2428f2984 100644
--- a/asm/tileset.s
+++ b/asm/tileset.s
@@ -5,1789 +5,4 @@
 
 	.text
 
-	thumb_func_start sub_80A0954
-@ void sub_80A0954()
-sub_80A0954: @ 80A0954
-	push {lr}
-	sub sp, 0x4
-	ldr r1, =gUnknown_03000F34
-	movs r0, 0
-	strb r0, [r1]
-	movs r0, 0
-	str r0, [sp]
-	ldr r1, =gUnknown_02037624
-	ldr r2, =0x0500003c
-	mov r0, sp
-	bl CpuSet
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A0954
-
-	thumb_func_start sub_80A0980
-sub_80A0980: @ 80A0980
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	lsls r2, 16
-	lsrs r6, r2, 16
-	ldr r3, =gUnknown_03000F34
-	ldrb r0, [r3]
-	cmp r0, 0x13
-	bhi _080A09C0
-	ldr r2, =gUnknown_02037624
-	adds r1, r0, 0
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	str r4, [r0]
-	ldrb r1, [r3]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r2, 0x4
-	adds r0, r1
-	str r5, [r0]
-	ldrb r1, [r3]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	strh r6, [r0, 0x8]
-	ldrb r0, [r3]
-	adds r0, 0x1
-	strb r0, [r3]
-_080A09C0:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A0980
-
-	thumb_func_start sub_80A09D0
-sub_80A09D0: @ 80A09D0
-	push {r4-r6,lr}
-	movs r3, 0
-	ldr r4, =gUnknown_03000F34
-	adds r6, r4, 0
-	ldrb r0, [r4]
-	cmp r3, r0
-	bge _080A0A02
-	ldr r2, =0x040000d4
-	ldr r1, =gUnknown_02037624
-	movs r5, 0x80
-	lsls r5, 24
-_080A09E6:
-	ldr r0, [r1]
-	str r0, [r2]
-	ldr r0, [r1, 0x4]
-	str r0, [r2, 0x4]
-	ldrh r0, [r1, 0x8]
-	lsrs r0, 1
-	orrs r0, r5
-	str r0, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	adds r1, 0xC
-	adds r3, 0x1
-	ldrb r0, [r4]
-	cmp r3, r0
-	blt _080A09E6
-_080A0A02:
-	movs r0, 0
-	strb r0, [r6]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A09D0
-
-	thumb_func_start cur_mapheader_run_tileset_funcs_after_some_cpuset
-cur_mapheader_run_tileset_funcs_after_some_cpuset: @ 80A0A18
-	push {lr}
-	bl sub_80A0954
-	bl cur_mapheader_run_tileset1_func
-	bl cur_mapheader_run_tileset2_func
-	pop {r0}
-	bx r0
-	thumb_func_end cur_mapheader_run_tileset_funcs_after_some_cpuset
-
-	thumb_func_start sub_80A0A2C
-sub_80A0A2C: @ 80A0A2C
-	push {lr}
-	bl cur_mapheader_run_tileset2_func
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A0A2C
-
-	thumb_func_start sub_80A0A38
-sub_80A0A38: @ 80A0A38
-	push {r4,lr}
-	bl sub_80A0954
-	ldr r2, =gUnknown_03000F36
-	ldrh r0, [r2]
-	adds r0, 0x1
-	strh r0, [r2]
-	ldr r1, =gUnknown_03000F38
-	lsls r0, 16
-	lsrs r0, 16
-	ldrh r1, [r1]
-	cmp r0, r1
-	bcc _080A0A56
-	movs r0, 0
-	strh r0, [r2]
-_080A0A56:
-	ldr r4, =gUnknown_03000F3A
-	ldrh r0, [r4]
-	adds r0, 0x1
-	strh r0, [r4]
-	ldr r1, =gUnknown_03000F3C
-	lsls r0, 16
-	lsrs r0, 16
-	ldrh r1, [r1]
-	cmp r0, r1
-	bcc _080A0A6E
-	movs r0, 0
-	strh r0, [r4]
-_080A0A6E:
-	ldr r0, =gUnknown_03000F40
-	ldr r1, [r0]
-	cmp r1, 0
-	beq _080A0A7C
-	ldrh r0, [r2]
-	bl _call_via_r1
-_080A0A7C:
-	ldr r0, =gUnknown_03000F44
-	ldr r1, [r0]
-	cmp r1, 0
-	beq _080A0A8A
-	ldrh r0, [r4]
-	bl _call_via_r1
-_080A0A8A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A0A38
-
-	thumb_func_start cur_mapheader_run_tileset1_func
-cur_mapheader_run_tileset1_func: @ 80A0AA8
-	push {lr}
-	ldr r0, =gUnknown_03000F36
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gUnknown_03000F38
-	strh r1, [r0]
-	ldr r1, =gUnknown_03000F40
-	movs r0, 0
-	str r0, [r1]
-	ldr r0, =gMapHeader
-	ldr r0, [r0]
-	ldr r0, [r0, 0x10]
-	cmp r0, 0
-	beq _080A0ACE
-	ldr r0, [r0, 0x14]
-	cmp r0, 0
-	beq _080A0ACE
-	bl _call_via_r0
-_080A0ACE:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end cur_mapheader_run_tileset1_func
-
-	thumb_func_start cur_mapheader_run_tileset2_func
-cur_mapheader_run_tileset2_func: @ 80A0AE4
-	push {lr}
-	ldr r0, =gUnknown_03000F3A
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gUnknown_03000F3C
-	strh r1, [r0]
-	ldr r1, =gUnknown_03000F44
-	movs r0, 0
-	str r0, [r1]
-	ldr r0, =gMapHeader
-	ldr r0, [r0]
-	ldr r0, [r0, 0x14]
-	cmp r0, 0
-	beq _080A0B0A
-	ldr r0, [r0, 0x14]
-	cmp r0, 0
-	beq _080A0B0A
-	bl _call_via_r0
-_080A0B0A:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end cur_mapheader_run_tileset2_func
-
-	thumb_func_start TilesetCb_General
-TilesetCb_General: @ 80A0B20
-	ldr r1, =gUnknown_03000F36
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F38
-	movs r2, 0x80
-	lsls r2, 1
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F40
-	ldr r0, =sub_80A0B70
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_General
-
-	thumb_func_start TilesetCb_InsideBuilding
-TilesetCb_InsideBuilding: @ 80A0B48
-	ldr r1, =gUnknown_03000F36
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F38
-	movs r2, 0x80
-	lsls r2, 1
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F40
-	ldr r0, =sub_80A0BB4
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_InsideBuilding
-
-	thumb_func_start sub_80A0B70
-sub_80A0B70: @ 80A0B70
-	push {r4,r5,lr}
-	lsls r5, r0, 16
-	movs r0, 0xF0
-	lsls r0, 12
-	ands r0, r5
-	lsrs r4, r0, 16
-	cmp r4, 0
-	bne _080A0B86
-	lsrs r0, r5, 20
-	bl sub_80A0BCC
-_080A0B86:
-	cmp r4, 0x1
-	bne _080A0B90
-	lsrs r0, r5, 20
-	bl sub_80A0BF4
-_080A0B90:
-	cmp r4, 0x2
-	bne _080A0B9A
-	lsrs r0, r5, 20
-	bl sub_80A0C1C
-_080A0B9A:
-	cmp r4, 0x3
-	bne _080A0BA4
-	lsrs r0, r5, 20
-	bl sub_80A0C44
-_080A0BA4:
-	cmp r4, 0x4
-	bne _080A0BAE
-	lsrs r0, r5, 20
-	bl sub_80A12AC
-_080A0BAE:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A0B70
-
-	thumb_func_start sub_80A0BB4
-sub_80A0BB4: @ 80A0BB4
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xE0
-	lsls r0, 11
-	ands r0, r1
-	cmp r0, 0
-	bne _080A0BC8
-	lsrs r0, r1, 19
-	bl sub_80A1688
-_080A0BC8:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A0BB4
-
-	thumb_func_start sub_80A0BCC
-sub_80A0BCC: @ 80A0BCC
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r0
-	ldr r0, =gUnknown_08510764
-	lsrs r1, 14
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06003f80
-	movs r2, 0x80
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A0BCC
-
-	thumb_func_start sub_80A0BF4
-sub_80A0BF4: @ 80A0BF4
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x7
-	ands r0, r1
-	ldr r1, =gUnknown_08512574
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, =0x06003600
-	movs r2, 0xF0
-	lsls r2, 2
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A0BF4
-
-	thumb_func_start sub_80A0C1C
-sub_80A0C1C: @ 80A0C1C
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xE0
-	lsls r1, 11
-	ands r1, r0
-	ldr r0, =gUnknown_08512E54
-	lsrs r1, 14
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06003a00
-	movs r2, 0xA0
-	lsls r2, 1
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A0C1C
-
-	thumb_func_start sub_80A0C44
-sub_80A0C44: @ 80A0C44
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r0
-	ldr r0, =gUnknown_08513174
-	lsrs r1, 14
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06003e00
-	movs r2, 0xC0
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A0C44
-
-	thumb_func_start TilesetCb_Petalburg
-TilesetCb_Petalburg: @ 80A0C6C
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	movs r0, 0
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Petalburg
-
-	thumb_func_start TilesetCb_Rustboro
-TilesetCb_Rustboro: @ 80A0C94
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A103C
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Rustboro
-
-	thumb_func_start TilesetCb_Dewford
-TilesetCb_Dewford: @ 80A0CC0
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A10B8
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Dewford
-
-	thumb_func_start TilesetCb_Slateport
-TilesetCb_Slateport: @ 80A0CEC
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A10D0
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Slateport
-
-	thumb_func_start TilesetCb_Mauville
-TilesetCb_Mauville: @ 80A0D18
-	ldr r1, =gUnknown_03000F3A
-	ldr r0, =gUnknown_03000F36
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A10E8
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Mauville
-
-	thumb_func_start TilesetCb_Lavaridge
-TilesetCb_Lavaridge: @ 80A0D48
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A115C
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Lavaridge
-
-	thumb_func_start TilesetCb_Fallarbor
-TilesetCb_Fallarbor: @ 80A0D74
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	movs r0, 0
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Fallarbor
-
-	thumb_func_start TilesetCb_Fortree
-TilesetCb_Fortree: @ 80A0D9C
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	movs r0, 0
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Fortree
-
-	thumb_func_start TilesetCb_Lilycove
-TilesetCb_Lilycove: @ 80A0DC4
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	movs r0, 0
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Lilycove
-
-	thumb_func_start TilesetCb_Mossdeep
-TilesetCb_Mossdeep: @ 80A0DEC
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	movs r0, 0
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Mossdeep
-
-	thumb_func_start TilesetCb_EverGrande
-TilesetCb_EverGrande: @ 80A0E14
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A1188
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_EverGrande
-
-	thumb_func_start TilesetCb_Pacifidlog
-TilesetCb_Pacifidlog: @ 80A0E40
-	ldr r1, =gUnknown_03000F3A
-	ldr r0, =gUnknown_03000F36
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A11FC
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Pacifidlog
-
-	thumb_func_start TilesetCb_Sootopolis
-TilesetCb_Sootopolis: @ 80A0E70
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A122C
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Sootopolis
-
-	thumb_func_start TilesetCb_BattleFrontierOutsideWest
-TilesetCb_BattleFrontierOutsideWest: @ 80A0E9C
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A127C
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_BattleFrontierOutsideWest
-
-	thumb_func_start TilesetCb_BattleFrontierOutsideEast
-TilesetCb_BattleFrontierOutsideEast: @ 80A0EC8
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A1294
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_BattleFrontierOutsideEast
-
-	thumb_func_start TilesetCb_Underwater
-TilesetCb_Underwater: @ 80A0EF4
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	movs r0, 0x80
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A1244
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Underwater
-
-	thumb_func_start TilesetCb_SootopolisGym
-TilesetCb_SootopolisGym: @ 80A0F18
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	movs r0, 0xF0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A15D8
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_SootopolisGym
-
-	thumb_func_start TilesetCb_Cave
-TilesetCb_Cave: @ 80A0F3C
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A1260
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_Cave
-
-	thumb_func_start TilesetCb_EliteFour
-TilesetCb_EliteFour: @ 80A0F68
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	movs r0, 0x80
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A15F0
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_EliteFour
-
-	thumb_func_start TilesetCb_MauvilleGym
-TilesetCb_MauvilleGym: @ 80A0F8C
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A15C0
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_MauvilleGym
-
-	thumb_func_start TilesetCb_BikeShop
-TilesetCb_BikeShop: @ 80A0FB8
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A161C
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_BikeShop
-
-	thumb_func_start TilesetCb_BattlePyramid
-TilesetCb_BattlePyramid: @ 80A0FE4
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A1634
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_BattlePyramid
-
-	thumb_func_start TilesetCb_BattleDome
-TilesetCb_BattleDome: @ 80A1010
-	ldr r1, =gUnknown_03000F3A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F3C
-	ldr r0, =gUnknown_03000F38
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gUnknown_03000F44
-	ldr r0, =sub_80A1658
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end TilesetCb_BattleDome
-
-	thumb_func_start sub_80A103C
-sub_80A103C: @ 80A103C
-	push {r4-r6,lr}
-	lsls r5, r0, 16
-	movs r0, 0xE0
-	lsls r0, 11
-	ands r0, r5
-	lsrs r6, r0, 16
-	cmp r6, 0
-	bne _080A105C
-	lsrs r4, r5, 19
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_80A1434
-	adds r0, r4, 0
-	bl sub_80A1470
-_080A105C:
-	cmp r6, 0x1
-	bne _080A1068
-	lsrs r0, r5, 19
-	movs r1, 0x1
-	bl sub_80A1434
-_080A1068:
-	cmp r6, 0x2
-	bne _080A1074
-	lsrs r0, r5, 19
-	movs r1, 0x2
-	bl sub_80A1434
-_080A1074:
-	cmp r6, 0x3
-	bne _080A1080
-	lsrs r0, r5, 19
-	movs r1, 0x3
-	bl sub_80A1434
-_080A1080:
-	cmp r6, 0x4
-	bne _080A108C
-	lsrs r0, r5, 19
-	movs r1, 0x4
-	bl sub_80A1434
-_080A108C:
-	cmp r6, 0x5
-	bne _080A1098
-	lsrs r0, r5, 19
-	movs r1, 0x5
-	bl sub_80A1434
-_080A1098:
-	cmp r6, 0x6
-	bne _080A10A4
-	lsrs r0, r5, 19
-	movs r1, 0x6
-	bl sub_80A1434
-_080A10A4:
-	cmp r6, 0x7
-	bne _080A10B0
-	lsrs r0, r5, 19
-	movs r1, 0x7
-	bl sub_80A1434
-_080A10B0:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A103C
-
-	thumb_func_start sub_80A10B8
-sub_80A10B8: @ 80A10B8
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xE0
-	lsls r0, 11
-	ands r0, r1
-	cmp r0, 0
-	bne _080A10CC
-	lsrs r0, r1, 19
-	bl sub_80A1520
-_080A10CC:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A10B8
-
-	thumb_func_start sub_80A10D0
-sub_80A10D0: @ 80A10D0
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xF0
-	lsls r0, 12
-	ands r0, r1
-	cmp r0, 0
-	bne _080A10E4
-	lsrs r0, r1, 20
-	bl sub_80A1598
-_080A10E4:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A10D0
-
-	thumb_func_start sub_80A10E8
-sub_80A10E8: @ 80A10E8
-	push {r4,r5,lr}
-	lsls r4, r0, 16
-	movs r0, 0xE0
-	lsls r0, 11
-	ands r0, r4
-	lsrs r5, r0, 16
-	cmp r5, 0
-	bne _080A1100
-	lsrs r0, r4, 19
-	movs r1, 0
-	bl sub_80A1394
-_080A1100:
-	cmp r5, 0x1
-	bne _080A110C
-	lsrs r0, r4, 19
-	movs r1, 0x1
-	bl sub_80A1394
-_080A110C:
-	cmp r5, 0x2
-	bne _080A1118
-	lsrs r0, r4, 19
-	movs r1, 0x2
-	bl sub_80A1394
-_080A1118:
-	cmp r5, 0x3
-	bne _080A1124
-	lsrs r0, r4, 19
-	movs r1, 0x3
-	bl sub_80A1394
-_080A1124:
-	cmp r5, 0x4
-	bne _080A1130
-	lsrs r0, r4, 19
-	movs r1, 0x4
-	bl sub_80A1394
-_080A1130:
-	cmp r5, 0x5
-	bne _080A113C
-	lsrs r0, r4, 19
-	movs r1, 0x5
-	bl sub_80A1394
-_080A113C:
-	cmp r5, 0x6
-	bne _080A1148
-	lsrs r0, r4, 19
-	movs r1, 0x6
-	bl sub_80A1394
-_080A1148:
-	cmp r5, 0x7
-	bne _080A1154
-	lsrs r0, r4, 19
-	movs r1, 0x7
-	bl sub_80A1394
-_080A1154:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A10E8
-
-	thumb_func_start sub_80A115C
-sub_80A115C: @ 80A115C
-	push {r4,r5,lr}
-	lsls r4, r0, 16
-	movs r0, 0xF0
-	lsls r0, 12
-	ands r0, r4
-	lsrs r5, r0, 16
-	cmp r5, 0
-	bne _080A1176
-	lsrs r0, r4, 20
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_80A12D4
-_080A1176:
-	cmp r5, 0x1
-	bne _080A1180
-	lsrs r0, r4, 20
-	bl sub_80A1498
-_080A1180:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A115C
-
-	thumb_func_start sub_80A1188
-sub_80A1188: @ 80A1188
-	push {r4,r5,lr}
-	lsls r4, r0, 16
-	movs r0, 0xE0
-	lsls r0, 11
-	ands r0, r4
-	lsrs r5, r0, 16
-	cmp r5, 0
-	bne _080A11A0
-	lsrs r0, r4, 19
-	movs r1, 0
-	bl sub_80A14C0
-_080A11A0:
-	cmp r5, 0x1
-	bne _080A11AC
-	lsrs r0, r4, 19
-	movs r1, 0x1
-	bl sub_80A14C0
-_080A11AC:
-	cmp r5, 0x2
-	bne _080A11B8
-	lsrs r0, r4, 19
-	movs r1, 0x2
-	bl sub_80A14C0
-_080A11B8:
-	cmp r5, 0x3
-	bne _080A11C4
-	lsrs r0, r4, 19
-	movs r1, 0x3
-	bl sub_80A14C0
-_080A11C4:
-	cmp r5, 0x4
-	bne _080A11D0
-	lsrs r0, r4, 19
-	movs r1, 0x4
-	bl sub_80A14C0
-_080A11D0:
-	cmp r5, 0x5
-	bne _080A11DC
-	lsrs r0, r4, 19
-	movs r1, 0x5
-	bl sub_80A14C0
-_080A11DC:
-	cmp r5, 0x6
-	bne _080A11E8
-	lsrs r0, r4, 19
-	movs r1, 0x6
-	bl sub_80A14C0
-_080A11E8:
-	cmp r5, 0x7
-	bne _080A11F4
-	lsrs r0, r4, 19
-	movs r1, 0x7
-	bl sub_80A14C0
-_080A11F4:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A1188
-
-	thumb_func_start sub_80A11FC
-sub_80A11FC: @ 80A11FC
-	push {r4,r5,lr}
-	lsls r4, r0, 16
-	movs r0, 0xF0
-	lsls r0, 12
-	ands r0, r4
-	lsrs r5, r0, 16
-	cmp r5, 0
-	bne _080A1216
-	lsrs r0, r4, 20
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_80A131C
-_080A1216:
-	cmp r5, 0x1
-	bne _080A1224
-	lsrs r0, r4, 20
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_80A136C
-_080A1224:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A11FC
-
-	thumb_func_start sub_80A122C
-sub_80A122C: @ 80A122C
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xF0
-	lsls r0, 12
-	ands r0, r1
-	cmp r0, 0
-	bne _080A1240
-	lsrs r0, r1, 20
-	bl sub_80A1798
-_080A1240:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A122C
-
-	thumb_func_start sub_80A1244
-sub_80A1244: @ 80A1244
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xF0
-	lsls r0, 12
-	ands r0, r1
-	cmp r0, 0
-	bne _080A125C
-	lsrs r0, r1, 20
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_80A1344
-_080A125C:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A1244
-
-	thumb_func_start sub_80A1260
-sub_80A1260: @ 80A1260
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xF0
-	lsls r0, 12
-	ands r0, r1
-	lsrs r0, 16
-	cmp r0, 0x1
-	bne _080A1276
-	lsrs r0, r1, 20
-	bl sub_80A14F8
-_080A1276:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A1260
-
-	thumb_func_start sub_80A127C
-sub_80A127C: @ 80A127C
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xE0
-	lsls r0, 11
-	ands r0, r1
-	cmp r0, 0
-	bne _080A1290
-	lsrs r0, r1, 19
-	bl sub_80A1548
-_080A1290:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A127C
-
-	thumb_func_start sub_80A1294
-sub_80A1294: @ 80A1294
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xE0
-	lsls r0, 11
-	ands r0, r1
-	cmp r0, 0
-	bne _080A12A8
-	lsrs r0, r1, 19
-	bl sub_80A1570
-_080A12A8:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A1294
-
-	thumb_func_start sub_80A12AC
-sub_80A12AC: @ 80A12AC
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r0
-	ldr r0, =gUnknown_08513684
-	lsrs r1, 14
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06003c00
-	movs r2, 0xA0
-	lsls r2, 1
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A12AC
-
-	thumb_func_start sub_80A12D4
-sub_80A12D4: @ 80A12D4
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	movs r0, 0x3
-	ands r0, r4
-	ldr r5, =gUnknown_08513894
-	lsls r0, 2
-	adds r0, r5
-	ldr r0, [r0]
-	ldr r1, =0x06006400
-	movs r2, 0x80
-	bl sub_80A0980
-	adds r1, r4, 0x2
-	adds r0, r1, 0
-	asrs r0, 2
-	lsls r0, 2
-	subs r0, r1, r0
-	lsls r0, 24
-	lsrs r0, 22
-	adds r0, r5
-	ldr r0, [r0]
-	ldr r1, =0x06006480
-	movs r2, 0x80
-	bl sub_80A0980
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A12D4
-
-	thumb_func_start sub_80A131C
-sub_80A131C: @ 80A131C
-	push {lr}
-	lsls r0, 24
-	movs r1, 0xC0
-	lsls r1, 18
-	ands r1, r0
-	ldr r0, =gUnknown_085143E4
-	lsrs r1, 22
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06007a00
-	movs r2, 0xF0
-	lsls r2, 2
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A131C
-
-	thumb_func_start sub_80A1344
-sub_80A1344: @ 80A1344
-	push {lr}
-	lsls r0, 24
-	movs r1, 0xC0
-	lsls r1, 18
-	ands r1, r0
-	ldr r0, =gUnknown_085145F4
-	lsrs r1, 22
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06007e00
-	movs r2, 0x80
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1344
-
-	thumb_func_start sub_80A136C
-sub_80A136C: @ 80A136C
-	push {lr}
-	lsls r0, 24
-	movs r1, 0xE0
-	lsls r1, 19
-	ands r1, r0
-	ldr r0, =gUnknown_08514E04
-	lsrs r1, 22
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06007e00
-	movs r2, 0x80
-	lsls r2, 1
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A136C
-
-	thumb_func_start sub_80A1394
-sub_80A1394: @ 80A1394
-	push {r4-r6,lr}
-	lsls r0, 16
-	lsrs r5, r0, 16
-	lsls r1, 24
-	lsrs r6, r1, 24
-	subs r0, r5, r6
-	lsls r0, 16
-	lsrs r5, r0, 16
-	cmp r5, 0xB
-	bhi _080A13F0
-	adds r0, r5, 0
-	movs r1, 0xC
-	bl __umodsi3
-	adds r4, r0, 0
-	lsls r4, 16
-	ldr r0, =gUnknown_08515384
-	lsrs r4, 14
-	adds r0, r4, r0
-	ldr r0, [r0]
-	ldr r1, =gUnknown_08515344
-	lsls r5, r6, 2
-	adds r1, r5, r1
-	ldr r1, [r1]
-	movs r2, 0x80
-	bl sub_80A0980
-	ldr r0, =gUnknown_085153B4
-	adds r4, r0
-	ldr r0, [r4]
-	ldr r1, =gUnknown_08515364
-	adds r5, r1
-	ldr r1, [r5]
-	movs r2, 0x80
-	bl sub_80A0980
-	b _080A141C
-	.pool
-_080A13F0:
-	movs r0, 0x3
-	ands r5, r0
-	ldr r0, =gUnknown_085153E4
-	lsls r5, 2
-	adds r0, r5, r0
-	ldr r0, [r0]
-	ldr r1, =gUnknown_08515344
-	lsls r4, r6, 2
-	adds r1, r4, r1
-	ldr r1, [r1]
-	movs r2, 0x80
-	bl sub_80A0980
-	ldr r0, =gUnknown_085153F4
-	adds r5, r0
-	ldr r0, [r5]
-	ldr r1, =gUnknown_08515364
-	adds r4, r1
-	ldr r1, [r4]
-	movs r2, 0x80
-	bl sub_80A0980
-_080A141C:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1394
-
-	thumb_func_start sub_80A1434
-sub_80A1434: @ 80A1434
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r1, 24
-	lsrs r3, r1, 24
-	subs r0, r3
-	lsls r0, 16
-	movs r1, 0xE0
-	lsls r1, 11
-	ands r1, r0
-	ldr r0, =gUnknown_08515824
-	lsrs r1, 14
-	adds r1, r0
-	ldr r2, [r1]
-	cmp r2, 0
-	beq _080A1464
-	ldr r0, =gUnknown_08515804
-	lsls r1, r3, 2
-	adds r1, r0
-	ldr r1, [r1]
-	adds r0, r2, 0
-	movs r2, 0x80
-	bl sub_80A0980
-_080A1464:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1434
-
-	thumb_func_start sub_80A1470
-sub_80A1470: @ 80A1470
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x1
-	ands r0, r1
-	ldr r1, =gUnknown_08515964
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, =0x06007800
-	movs r2, 0x80
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1470
-
-	thumb_func_start sub_80A1498
-sub_80A1498: @ 80A1498
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r0
-	ldr r0, =gUnknown_08515D8C
-	lsrs r1, 14
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06005400
-	movs r2, 0x80
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1498
-
-	thumb_func_start sub_80A14C0
-sub_80A14C0: @ 80A14C0
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r1, 24
-	lsrs r1, 24
-	subs r0, r1
-	lsls r0, 16
-	movs r2, 0xE0
-	lsls r2, 11
-	ands r2, r0
-	ldr r0, =gUnknown_085161DC
-	lsrs r2, 14
-	adds r2, r0
-	ldr r0, [r2]
-	ldr r2, =gUnknown_085161BC
-	lsls r1, 2
-	adds r1, r2
-	ldr r1, [r1]
-	movs r2, 0x80
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A14C0
-
-	thumb_func_start sub_80A14F8
-sub_80A14F8: @ 80A14F8
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r0
-	ldr r0, =gUnknown_08515D8C
-	lsrs r1, 14
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06007400
-	movs r2, 0x80
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A14F8
-
-	thumb_func_start sub_80A1520
-sub_80A1520: @ 80A1520
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r0
-	ldr r0, =gUnknown_085164FC
-	lsrs r1, 14
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06005540
-	movs r2, 0xC0
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1520
-
-	thumb_func_start sub_80A1548
-sub_80A1548: @ 80A1548
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r0
-	ldr r0, =gUnknown_0851680C
-	lsrs r1, 14
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06005b40
-	movs r2, 0xC0
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1548
-
-	thumb_func_start sub_80A1570
-sub_80A1570: @ 80A1570
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r0
-	ldr r0, =gUnknown_08516B1C
-	lsrs r1, 14
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06005b40
-	movs r2, 0xC0
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1570
-
-	thumb_func_start sub_80A1598
-sub_80A1598: @ 80A1598
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r0
-	ldr r0, =gUnknown_08516D2C
-	lsrs r1, 14
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06005c00
-	movs r2, 0x80
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1598
-
-	thumb_func_start sub_80A15C0
-sub_80A15C0: @ 80A15C0
-	push {lr}
-	lsls r2, r0, 16
-	lsrs r0, r2, 16
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _080A15D4
-	lsrs r0, r2, 17
-	bl sub_80A1748
-_080A15D4:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A15C0
-
-	thumb_func_start sub_80A15D8
-sub_80A15D8: @ 80A15D8
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xE0
-	lsls r0, 11
-	ands r0, r1
-	cmp r0, 0
-	bne _080A15EC
-	lsrs r0, r1, 19
-	bl sub_80A16B0
-_080A15EC:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A15D8
-
-	thumb_func_start sub_80A15F0
-sub_80A15F0: @ 80A15F0
-	push {r4,r5,lr}
-	lsls r4, r0, 16
-	lsrs r0, r4, 16
-	adds r5, r0, 0
-	movs r0, 0x3F
-	ands r0, r5
-	cmp r0, 0x1
-	bne _080A1606
-	lsrs r0, r4, 22
-	bl sub_80A1720
-_080A1606:
-	movs r0, 0x7
-	ands r0, r5
-	cmp r0, 0x1
-	bne _080A1614
-	lsrs r0, r4, 19
-	bl sub_80A16F8
-_080A1614:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A15F0
-
-	thumb_func_start sub_80A161C
-sub_80A161C: @ 80A161C
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xC0
-	lsls r0, 10
-	ands r0, r1
-	cmp r0, 0
-	bne _080A1630
-	lsrs r0, r1, 18
-	bl sub_80A1770
-_080A1630:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A161C
-
-	thumb_func_start sub_80A1634
-sub_80A1634: @ 80A1634
-	push {r4,lr}
-	lsls r4, r0, 16
-	movs r0, 0xE0
-	lsls r0, 11
-	ands r0, r4
-	cmp r0, 0
-	bne _080A1650
-	lsrs r4, 19
-	adds r0, r4, 0
-	bl sub_80A17C0
-	adds r0, r4, 0
-	bl sub_80A17EC
-_080A1650:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A1634
-
-	thumb_func_start sub_80A1658
-sub_80A1658: @ 80A1658
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xC0
-	lsls r0, 10
-	ands r0, r1
-	cmp r0, 0
-	bne _080A166C
-	lsrs r0, r1, 18
-	bl sub_80A1818
-_080A166C:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A1658
-
-	thumb_func_start sub_80A1670
-sub_80A1670: @ 80A1670
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xC0
-	lsls r0, 10
-	ands r0, r1
-	cmp r0, 0
-	bne _080A1684
-	lsrs r0, r1, 18
-	bl sub_80A1884
-_080A1684:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A1670
-
-	thumb_func_start sub_80A1688
-sub_80A1688: @ 80A1688
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x1
-	ands r0, r1
-	ldr r1, =gUnknown_08516E3C
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, =0x06003e00
-	movs r2, 0x80
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1688
-
-	thumb_func_start sub_80A16B0
-sub_80A16B0: @ 80A16B0
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x3
-	bl __umodsi3
-	adds r4, r0, 0
-	lsls r4, 16
-	ldr r0, =gUnknown_08517A44
-	lsrs r4, 14
-	adds r0, r4, r0
-	ldr r0, [r0]
-	ldr r1, =0x06007e00
-	movs r2, 0xC0
-	lsls r2, 1
-	bl sub_80A0980
-	ldr r0, =gUnknown_08517A50
-	adds r4, r0
-	ldr r0, [r4]
-	ldr r1, =0x06007a00
-	movs r2, 0xA0
-	lsls r2, 2
-	bl sub_80A0980
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A16B0
-
-	thumb_func_start sub_80A16F8
-sub_80A16F8: @ 80A16F8
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r0
-	ldr r0, =gUnknown_08517BFC
-	lsrs r1, 14
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06007f00
-	movs r2, 0x20
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A16F8
-
-	thumb_func_start sub_80A1720
-sub_80A1720: @ 80A1720
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x1
-	ands r0, r1
-	ldr r1, =gUnknown_08517C0C
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, =0x06007c00
-	movs r2, 0x80
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1720
-
-	thumb_func_start sub_80A1748
-sub_80A1748: @ 80A1748
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x1
-	ands r0, r1
-	ldr r1, =gUnknown_08518034
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, =0x06005200
-	movs r2, 0x80
-	lsls r2, 2
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1748
-
-	thumb_func_start sub_80A1770
-sub_80A1770: @ 80A1770
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x1
-	ands r0, r1
-	ldr r1, =gUnknown_0851829C
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, =0x06007e00
-	movs r2, 0x90
-	lsls r2, 1
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1770
-
-	thumb_func_start sub_80A1798
-sub_80A1798: @ 80A1798
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xE0
-	lsls r1, 11
-	ands r1, r0
-	ldr r0, =gUnknown_085202C4
-	lsrs r1, 14
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, =0x06005e00
-	movs r2, 0xC0
-	lsls r2, 4
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A1798
-
-	thumb_func_start sub_80A17C0
-sub_80A17C0: @ 80A17C0
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x3
-	bl __umodsi3
-	lsls r0, 16
-	ldr r1, =gUnknown_08524864
-	lsrs r0, 14
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, =0x060052e0
-	movs r2, 0x80
-	lsls r2, 1
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A17C0
-
-	thumb_func_start sub_80A17EC
-sub_80A17EC: @ 80A17EC
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x3
-	bl __umodsi3
-	lsls r0, 16
-	ldr r1, =gUnknown_08524870
-	lsrs r0, 14
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, =0x060050e0
-	movs r2, 0x80
-	lsls r2, 1
-	bl sub_80A0980
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80A17EC
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/data/graphics.s b/data/graphics.s
index 0fa256449..a64dc1332 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -354,7 +354,19 @@ gUnknown_08D85600:: @ 8D85600
 	.incbin "baserom.gba", 0xd85600, 0x20
 
 gUnknown_08D85620:: @ 8D85620
-	.incbin "baserom.gba", 0xd85620, 0xa8
+	.incbin "baserom.gba", 0xd85620, 0x20
+
+gUnknown_08D85640:: @ 8D85640
+	.incbin "baserom.gba", 0xd85640, 0x20
+
+gUnknown_08D85660:: @ 8D85660
+	.incbin "baserom.gba", 0xd85660, 0x20
+
+gUnknown_08D85680:: @ 8D85680
+	.incbin "baserom.gba", 0xd85680, 0x20
+
+gUnknown_08D856A0:: @ 8D856A0
+	.incbin "baserom.gba", 0xd856a0, 0x28
 
 gUnknown_08D856C8:: @ 8D856C8
 	.incbin "baserom.gba", 0xd856c8, 0xe0
diff --git a/data/palette.s b/data/palette.s
deleted file mode 100644
index 2dbfed8d2..000000000
--- a/data/palette.s
+++ /dev/null
@@ -1,18 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_0852487C:: @ 852487C
-	.incbin "baserom.gba", 0x52487c, 0x10
-
-gDummyPaletteStructTemplate:: @ 852488C
-	.2byte 0xFFFF
-	.space 9
-	.byte 0x20
-	.space 4
-
-	.align 2
-gUnknown_0852489C:: @ 852489C
-	.incbin "baserom.gba", 0x52489c, 0x20
diff --git a/data/start_menu.s b/data/start_menu.s
index eaba0b8e1..07e428d0d 100644
--- a/data/start_menu.s
+++ b/data/start_menu.s
@@ -26,4 +26,4 @@ gUnknown_085105AC:: @ 85105AC
 	.incbin "baserom.gba", 0x5105ac, 0x10
 
 gUnknown_085105BC:: @ 85105BC
-	.incbin "baserom.gba", 0x5105bc, 0x1a8
+	.incbin "baserom.gba", 0x5105bc, 0x8
diff --git a/data/tileset.s b/data/tileset.s
index 1221d8967..a69e53acf 100644
--- a/data/tileset.s
+++ b/data/tileset.s
@@ -4,6 +4,9 @@
     .section .rodata
     .align 2, 0
 
+Unknown_085105C4::
+    .incbin "baserom.gba", 0x5105C4, 0x1A0
+
 gUnknown_08510764:: @ 8510764
 	.incbin "baserom.gba", 0x510764, 0xb60
 
diff --git a/ld_script.txt b/ld_script.txt
index c2f8af595..78d27eb7f 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -110,7 +110,6 @@ SECTIONS {
         asm/reset_rtc_screen.o(.text);
         src/start_menu.o(.text);
         asm/start_menu.o(.text);
-        asm/tileset.o(.text);
         src/palette.o(.text);
         src/sound.o(.text);
         asm/battle_anim.o(.text);
@@ -357,7 +356,7 @@ SECTIONS {
         data/reset_rtc_screen.o(.rodata);
         data/start_menu.o(.rodata);
         data/tileset.o(.rodata);
-        data/palette.o(.rodata);
+        src/palette.o(.rodata);
         data/fanfares.o(.rodata);
         data/battle_anims.o(.rodata);
         data/title_screen.o(.rodata);
diff --git a/src/palette.c b/src/palette.c
index aa9a84e4c..4c09206ba 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -28,7 +28,7 @@ struct PaletteStructTemplate
 
 struct PaletteStruct
 {
-    struct PaletteStructTemplate *base;
+    const struct PaletteStructTemplate *base;
     u32 ps_field_4_0:1;
     u16 ps_field_4_1:1;
     u32 baseDestOffset:9;
@@ -48,6 +48,11 @@ extern void _call_via_r1(u32 a1, void *a2);
 
 extern void BlendPalette(u16, u16, u8, u16);
 
+static EWRAM_DATA struct {
+    const u16 *src;
+    u16 *dest;
+    u16 size;
+} sTilesetDMA3TransferBuffer[20] = {0};
 EWRAM_DATA u16 gPlttBufferUnfaded[0x200] = {0};
 EWRAM_DATA u16 gPlttBufferFaded[0x200] = {0};
 EWRAM_DATA struct PaletteStruct sPaletteStructs[0x10] = {0};
@@ -56,13 +61,72 @@ EWRAM_DATA u32 gFiller_2037FE0 = 0;
 EWRAM_DATA u32 sPlttBufferTransferPending = 0;
 EWRAM_DATA u8 gPaletteDecompressionBuffer[0x400] = {0};
 
-extern struct PaletteStructTemplate gDummyPaletteStructTemplate;
-extern void *gUnknown_0852487C;
-extern u8 gUnknown_0852489C[];
+extern const u16 *const gUnknown_08510764[];
+extern const u16 *const gUnknown_085112C4[];
+extern const u16 *const gUnknown_08511BCC[];
+extern const u16 *const gUnknown_08512574[];
+extern const u16 *const gUnknown_08512E54[];
+extern const u16 *const gUnknown_08513174[];
+extern const u16 *const gUnknown_08513684[];
+extern const u16 *const gUnknown_08513894[];
+extern const u16 *const gUnknown_085143E4[];
+extern const u16 *const gUnknown_085145F4[];
+extern const u16 *const gUnknown_08514E04[];
+extern u16 *const gUnknown_08515344[];
+extern u16 *const gUnknown_08515364[];
+extern const u16 *const gUnknown_08515384[];
+extern const u16 *const gUnknown_085153B4[];
+extern const u16 *const gUnknown_085153E4[];
+extern const u16 *const gUnknown_085153F4[];
+extern  u16 *const gUnknown_08515804[];
+extern const u16 *const gUnknown_08515824[];
+extern const u16 *const gUnknown_08515964[];
+extern const u16 *const gUnknown_08515D8C[];
+extern  u16 *const gUnknown_085161BC[];
+extern const u16 *const gUnknown_085161DC[];
+extern const u16 *const gUnknown_085164FC[];
+extern const u16 *const gUnknown_0851680C[];
+extern const u16 *const gUnknown_08516B1C[];
+extern const u16 *const gUnknown_08516D2C[];
+extern const u16 *const gUnknown_08516E3C[];
+extern const u16 *const gUnknown_08517A44[];
+extern const u16 *const gUnknown_08517A50[];
+extern const u16 *const gUnknown_08517BFC[];
+extern const u16 *const gUnknown_08517C0C[];
+extern const u16 *const gUnknown_08518034[];
+extern const u16 *const gUnknown_0851829C[];
+extern const u16 *const gUnknown_085202C4[];
+extern const u16 *const gUnknown_08524864[];
+extern const u16 *const gUnknown_08524870[];
 
-extern u16 gUnknown_03000F3C;
-extern void *gUnknown_03000F44;
+extern const u16 gUnknown_08D85640[];
+extern const u16 gUnknown_08D85660[];
+extern const u16 gUnknown_08D85680[];
+extern const u16 gUnknown_08D856A0[];
 
+static const u16 *const gUnknown_0852487C[] = {
+    gUnknown_08D85640,
+    gUnknown_08D85660,
+    gUnknown_08D85680,
+    gUnknown_08D856A0,
+};
+
+static const struct PaletteStructTemplate gDummyPaletteStructTemplate = {
+    .uid = 0xFFFF,
+    .pst_field_B_5 = 1
+};
+static const u8 gUnknown_0852489C[] = {
+     0,  0,  0,  0,  0,
+     5,  5,  5,  5,  5,
+    11, 11, 11, 11, 11,
+    16, 16, 16, 16, 16,
+    21, 21, 21, 21, 21,
+    27, 27, 27, 27, 27,
+    31, 31
+};
+
+void cur_mapheader_run_tileset1_func(void);
+void cur_mapheader_run_tileset2_func(void);
 static void unused_sub_80A1CDC(struct PaletteStruct *, u32 *);
 static void unused_sub_80A1E40(struct PaletteStruct *, u32 *);
 static void unused_sub_80A1F00(struct PaletteStruct *);
@@ -74,30 +138,798 @@ static u8 UpdateHardwarePaletteFade(void);
 static void UpdateBlendRegisters(void);
 static bool8 IsSoftwarePaletteFadeFinishing(void);
 
+// tileset
+
+IWRAM_DATA u8 sTilesetDMA3TransferBufferSize;
+IWRAM_DATA u16 sPrimaryTilesetCBCounter;
+IWRAM_DATA u16 sPrimaryTilesetCBBufferSize;
+IWRAM_DATA u16 sSecondaryTilesetCBCounter;
+IWRAM_DATA u16 sSecondaryTilesetCBBufferSize;
+IWRAM_DATA void (*sPrimaryTilesetCB)(u16);
+IWRAM_DATA void (*sSecondaryTilesetCB)(u16);
+
+void sub_80A0954(void)
+{
+    sTilesetDMA3TransferBufferSize = 0;
+    CpuFill32(0, sTilesetDMA3TransferBuffer, sizeof sTilesetDMA3TransferBuffer);
+}
+
+void sub_80A0980(const u16 *a0, u16 *a1, u16 a2)
+{
+    if (sTilesetDMA3TransferBufferSize < 20)
+    {
+        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].src = a0;
+        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].dest = a1;
+        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].size = a2;
+        sTilesetDMA3TransferBufferSize ++;
+    }
+}
+
+void sub_80A09D0(void)
+{
+    int i;
+
+    for (i = 0; i < sTilesetDMA3TransferBufferSize; i ++)
+    {
+        DmaCopy16(3, sTilesetDMA3TransferBuffer[i].src, sTilesetDMA3TransferBuffer[i].dest, sTilesetDMA3TransferBuffer[i].size);
+    }
+    sTilesetDMA3TransferBufferSize = 0;
+}
+
+void cur_mapheader_run_tileset_funcs_after_some_cpuset(void)
+{
+    sub_80A0954();
+    cur_mapheader_run_tileset1_func();
+    cur_mapheader_run_tileset2_func();
+}
+
+void sub_80A0A2C(void)
+{
+    cur_mapheader_run_tileset2_func();
+}
+
+void sub_80A0A38(void)
+{
+    sub_80A0954();
+    if (++sPrimaryTilesetCBCounter >= sPrimaryTilesetCBBufferSize)
+        sPrimaryTilesetCBCounter = 0;
+    if (++sSecondaryTilesetCBCounter >= sSecondaryTilesetCBBufferSize)
+        sSecondaryTilesetCBCounter = 0;
+    if (sPrimaryTilesetCB)
+        sPrimaryTilesetCB(sPrimaryTilesetCBCounter);
+    if (sSecondaryTilesetCB)
+        sSecondaryTilesetCB(sSecondaryTilesetCBCounter);
+}
+
+void cur_mapheader_run_tileset1_func(void)
+{
+    sPrimaryTilesetCBCounter = 0;
+    sPrimaryTilesetCBBufferSize = 0;
+    sPrimaryTilesetCB = NULL;
+    if (gMapHeader.mapData->primaryTileset && gMapHeader.mapData->primaryTileset->callback)
+        gMapHeader.mapData->primaryTileset->callback();
+}
+
+void cur_mapheader_run_tileset2_func(void)
+{
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = 0;
+    sSecondaryTilesetCB = NULL;
+    if (gMapHeader.mapData->secondaryTileset && gMapHeader.mapData->secondaryTileset->callback)
+        gMapHeader.mapData->secondaryTileset->callback();
+}
+
+void TilesetCb_General(void)
+{
+    void sub_80A0B70(u16);
+
+    sPrimaryTilesetCBCounter = 0;
+    sPrimaryTilesetCBBufferSize = 0x100;
+    sPrimaryTilesetCB = sub_80A0B70;
+}
+
+void TilesetCb_InsideBuilding(void)
+{
+    void sub_80A0BB4(u16);
+
+    sPrimaryTilesetCBCounter = 0;
+    sPrimaryTilesetCBBufferSize = 0x100;
+    sPrimaryTilesetCB = sub_80A0BB4;
+}
+
+void sub_80A0B70(u16 timer)
+{
+    void sub_80A0BCC(u16);
+    void sub_80A0BF4(u16);
+    void sub_80A0C1C(u16);
+    void sub_80A0C44(u16);
+    void sub_80A12AC(u16);
+
+    if ((timer & 0x0F) == 0)
+        sub_80A0BCC(timer >> 4);
+    if ((timer & 0x0F) == 1)
+        sub_80A0BF4(timer >> 4);
+    if ((timer & 0x0F) == 2)
+        sub_80A0C1C(timer >> 4);
+    if ((timer & 0x0F) == 3)
+        sub_80A0C44(timer >> 4);
+    if ((timer & 0x0F) == 4)
+        sub_80A12AC(timer >> 4);
+}
+
+void sub_80A0BB4(u16 timer)
+{
+    void sub_80A1688(u16);
+    if ((timer & 0x7) == 0)
+        sub_80A1688(timer >> 3);
+}
+
+void sub_80A0BCC(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08510764[idx], (u16 *)(VRAM + 0x3F80), 0x80);
+}
+
+void sub_80A0BF4(u16 timer)
+{
+    u8 idx;
+
+    idx = timer % 8;
+    sub_80A0980(gUnknown_08512574[idx], (u16 *)(VRAM + 0x3600), 0x3C0);
+}
+
+void sub_80A0C1C(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 8;
+    sub_80A0980(gUnknown_08512E54[idx], (u16 *)(VRAM + 0x3a00), 0x140);
+}
+
+void sub_80A0C44(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08513174[idx], (u16 *)(VRAM + 0x3e00), 0xc0);
+}
+
+void TilesetCb_Petalburg(void)
+{
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = NULL;
+}
+
+void TilesetCb_Rustboro(void)
+{
+    void sub_80A103C(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A103C;
+}
+
+void TilesetCb_Dewford(void)
+{
+    void sub_80A10B8(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A10B8;
+}
+
+void TilesetCb_Slateport(void)
+{
+    void sub_80A10D0(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A10D0;
+}
+
+void TilesetCb_Mauville(void)
+{
+    void sub_80A10E8(u16);
+
+    sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A10E8;
+}
+
+void TilesetCb_Lavaridge(void)
+{
+    void sub_80A115C(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A115C;
+}
+
+void TilesetCb_Fallarbor(void)
+{
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = NULL;
+}
+
+void TilesetCb_Fortree(void)
+{
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = NULL;
+}
+
+void TilesetCb_Lilycove(void)
+{
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = NULL;
+}
+
+void TilesetCb_Mossdeep(void)
+{
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = NULL;
+}
+
+void TilesetCb_EverGrande(void)
+{
+    void sub_80A1188(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A1188;
+}
+
+void TilesetCb_Pacifidlog(void)
+{
+    void sub_80A11FC(u16);
+
+    sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A11FC;
+}
+
+void TilesetCb_Sootopolis(void)
+{
+    void sub_80A122C(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A122C;
+}
+
+void TilesetCb_BattleFrontierOutsideWest(void)
+{
+    void sub_80A127C(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A127C;
+}
+
+void TilesetCb_BattleFrontierOutsideEast(void)
+{
+    void sub_80A1294(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A1294;
+}
+
+void TilesetCb_Underwater(void)
+{
+    void sub_80A1244(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = 128;
+    sSecondaryTilesetCB = sub_80A1244;
+}
+
+void TilesetCb_SootopolisGym(void)
+{
+    void sub_80A15D8(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = 240;
+    sSecondaryTilesetCB = sub_80A15D8;
+}
+
+void TilesetCb_Cave(void)
+{
+    void sub_80A1260(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A1260;
+}
+
+void TilesetCb_EliteFour(void)
+{
+    void sub_80A15F0(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = 128;
+    sSecondaryTilesetCB = sub_80A15F0;
+}
+
+void TilesetCb_MauvilleGym(void)
+{
+    void sub_80A15C0(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A15C0;
+}
+
+void TilesetCb_BikeShop(void)
+{
+    void sub_80A161C(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A161C;
+}
+
+void TilesetCb_BattlePyramid(void)
+{
+    void sub_80A1634(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A1634;
+}
+
+void TilesetCb_BattleDome(void)
+{
+    void sub_80A1658(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A1658;
+}
+
+void sub_80A103C(u16 timer)
+{
+    void sub_80A1434(u16, u8);
+    void sub_80A1470(u16);
+
+    if ((timer & 0x07) == 0)
+    {
+        sub_80A1434(timer >> 3, 0);
+        sub_80A1470(timer >> 3);
+    }
+    if ((timer & 0x07) == 1)
+        sub_80A1434(timer >> 3, 1);
+    if ((timer & 0x07) == 2)
+        sub_80A1434(timer >> 3, 2);
+    if ((timer & 0x07) == 3)
+        sub_80A1434(timer >> 3, 3);
+    if ((timer & 0x07) == 4)
+        sub_80A1434(timer >> 3, 4);
+    if ((timer & 0x07) == 5)
+        sub_80A1434(timer >> 3, 5);
+    if ((timer & 0x07) == 6)
+        sub_80A1434(timer >> 3, 6);
+    if ((timer & 0x07) == 7)
+        sub_80A1434(timer >> 3, 7);
+}
+
+void sub_80A10B8(u16 timer)
+{
+    void sub_80A1520(u16);
+
+    if ((timer & 7) == 0)
+        sub_80A1520(timer >> 3);
+}
+
+void sub_80A10D0(u16 timer)
+{
+    void sub_80A1598(u16);
+
+    if ((timer & 15) == 0)
+        sub_80A1598(timer >> 4);
+}
+
+void sub_80A10E8(u16 timer)
+{
+    void sub_80A1394(u16, u8);
+
+    if ((timer & 0x07) == 0)
+        sub_80A1394(timer >> 3, 0);
+    if ((timer & 0x07) == 1)
+        sub_80A1394(timer >> 3, 1);
+    if ((timer & 0x07) == 2)
+        sub_80A1394(timer >> 3, 2);
+    if ((timer & 0x07) == 3)
+        sub_80A1394(timer >> 3, 3);
+    if ((timer & 0x07) == 4)
+        sub_80A1394(timer >> 3, 4);
+    if ((timer & 0x07) == 5)
+        sub_80A1394(timer >> 3, 5);
+    if ((timer & 0x07) == 6)
+        sub_80A1394(timer >> 3, 6);
+    if ((timer & 0x07) == 7)
+        sub_80A1394(timer >> 3, 7);
+}
+
+void sub_80A115C(u16 timer)
+{
+    void sub_80A12D4(u8);
+    void sub_80A1498(u16);
+
+    if ((timer & 0x0F) == 0)
+        sub_80A12D4(timer >> 4);
+    if ((timer & 0x0F) == 1)
+        sub_80A1498(timer >> 4);
+}
+
+void sub_80A1188(u16 timer)
+{
+    void sub_80A14C0(u16, u8);
+
+    if ((timer & 0x07) == 0)
+        sub_80A14C0(timer >> 3, 0);
+    if ((timer & 0x07) == 1)
+        sub_80A14C0(timer >> 3, 1);
+    if ((timer & 0x07) == 2)
+        sub_80A14C0(timer >> 3, 2);
+    if ((timer & 0x07) == 3)
+        sub_80A14C0(timer >> 3, 3);
+    if ((timer & 0x07) == 4)
+        sub_80A14C0(timer >> 3, 4);
+    if ((timer & 0x07) == 5)
+        sub_80A14C0(timer >> 3, 5);
+    if ((timer & 0x07) == 6)
+        sub_80A14C0(timer >> 3, 6);
+    if ((timer & 0x07) == 7)
+        sub_80A14C0(timer >> 3, 7);
+}
+
+void sub_80A11FC(u16 timer)
+{
+    void sub_80A131C(u8);
+    void sub_80A136C(u8);
+
+    if ((timer & 0x0F) == 0)
+        sub_80A131C(timer >> 4);
+    if ((timer & 0x0F) == 1)
+        sub_80A136C(timer >> 4);
+}
+
+void sub_80A122C(u16 timer)
+{
+    void sub_80A1798(u16);
+
+    if ((timer & 0x0F) == 0)
+        sub_80A1798(timer >> 4);
+}
+
+void sub_80A1244(u16 timer)
+{
+    void sub_80A1344(u8);
+
+    if ((timer & 0x0F) == 0)
+        sub_80A1344(timer >> 4);
+}
+
+void sub_80A1260(u16 timer)
+{
+    void sub_80A14F8(u16);
+
+    if ((timer & 0x0F) == 1)
+        sub_80A14F8(timer >> 4);
+}
+
+void sub_80A127C(u16 timer)
+{
+    void sub_80A1548(u16);
+
+    if ((timer & 0x07) == 0)
+        sub_80A1548(timer >> 3);
+}
+
+void sub_80A1294(u16 timer)
+{
+    void sub_80A1570(u16);
+
+    if ((timer & 0x07) == 0)
+        sub_80A1570(timer >> 3);
+}
+
+void sub_80A12AC(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08513684[idx], (u16 *)(VRAM + 0x3c00), 0x140);
+}
+
+void sub_80A12D4(u8 timer)
+{
+    u8 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08513894[idx], (u16 *)(VRAM + 0x6400), 0x80);
+
+    idx = (timer + 2) % 4;
+    sub_80A0980(gUnknown_08513894[idx], (u16 *)(VRAM + 0x6480), 0x80);
+}
+
+void sub_80A131C(u8 timer)
+{
+    u8 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_085143E4[idx], (u16 *)(VRAM + 0x7a00), 0x3C0);
+}
+
+void sub_80A1344(u8 timer)
+{
+    u8 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_085145F4[idx], (u16 *)(VRAM + 0x7e00), 0x80);
+}
+
+void sub_80A136C(u8 timer)
+{
+    u8 idx;
+
+    idx = timer % 8;
+    sub_80A0980(gUnknown_08514E04[idx], (u16 *)(VRAM + 0x7e00), 0x100);
+}
+
+void sub_80A1394(u16 timer_div, u8 timer_mod)
+{
+    timer_div -= timer_mod;
+    if (timer_div < 12) // almost certainly a typo
+    {
+        timer_div %= 12;
+        sub_80A0980(gUnknown_08515384[timer_div], gUnknown_08515344[timer_mod], 0x80);
+        sub_80A0980(gUnknown_085153B4[timer_div], gUnknown_08515364[timer_mod], 0x80);
+    }
+    else
+    {
+        timer_div &= 3;
+        sub_80A0980(gUnknown_085153E4[timer_div], gUnknown_08515344[timer_mod], 0x80);
+        sub_80A0980(gUnknown_085153F4[timer_div], gUnknown_08515364[timer_mod], 0x80);
+    }
+}
+
+void sub_80A1434(u16 timer_div, u8 timer_mod)
+{
+    timer_div -= timer_mod;
+    timer_div &= 0x7;
+    if (gUnknown_08515824[timer_div])
+        sub_80A0980(gUnknown_08515824[timer_div], gUnknown_08515804[timer_mod], 0x80);
+}
+
+void sub_80A1470(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 2;
+    sub_80A0980(gUnknown_08515964[idx], (u16 *)(VRAM + 0x7800), 0x80);
+}
+
+void sub_80A1498(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08515D8C[idx], (u16 *)(VRAM + 0x5400), 0x80);
+}
+
+void sub_80A14C0(u16 timer_div, u8 timer_mod)
+{
+    timer_div -= timer_mod;
+    timer_div &= 7;
+
+    sub_80A0980(gUnknown_085161DC[timer_div], gUnknown_085161BC[timer_mod], 0x80);
+}
+
+void sub_80A14F8(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08515D8C[idx], (u16 *)(VRAM + 0x7400), 0x80);
+}
+
+void sub_80A1520(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_085164FC[idx], (u16 *)(VRAM + 0x5540), 0xC0);
+}
+
+void sub_80A1548(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_0851680C[idx], (u16 *)(VRAM + 0x5b40), 0xC0);
+}
+
+void sub_80A1570(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08516B1C[idx], (u16 *)(VRAM + 0x5b40), 0xC0);
+}
+
+void sub_80A1598(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08516D2C[idx], (u16 *)(VRAM + 0x5c00), 0x80);
+}
+
+void sub_80A15C0(u16 timer)
+{
+    void sub_80A1748(u16);
+
+    if ((timer & 1) == 0)
+        sub_80A1748(timer >> 1);
+}
+
+void sub_80A15D8(u16 timer)
+{
+    void sub_80A16B0(u16);
+
+    if ((timer & 7) == 0)
+        sub_80A16B0(timer >> 3);
+}
+
+void sub_80A15F0(u16 timer)
+{
+    void sub_80A1720(u16);
+    void sub_80A16F8(u16);
+
+    if ((timer & 0x3f) == 1)
+        sub_80A1720(timer >> 6);
+    if ((timer & 0x07) == 1)
+        sub_80A16F8(timer >> 3);
+}
+void sub_80A161C(u16 timer)
+{
+    void sub_80A1770(u16);
+
+    if ((timer & 3) == 0)
+        sub_80A1770(timer >> 2);
+}
+
+void sub_80A1634(u16 timer)
+{
+    void sub_80A17C0(u16);
+    void sub_80A17EC(u16);
+
+    if ((timer & 7) == 0)
+    {
+        sub_80A17C0(timer >> 3);
+        sub_80A17EC(timer >> 3);
+    }
+}
+
+void sub_80A1658(u16 timer)
+{
+    void sub_80A1818(u16);
+
+    if ((timer & 3) == 0)
+        sub_80A1818(timer >> 2);
+}
+
+void sub_80A1670(u16 timer)
+{
+    void sub_80A1884(u16);
+
+    if ((timer & 3) == 0)
+        sub_80A1884(timer >> 2);
+}
+
+void sub_80A1688(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 2;
+    sub_80A0980(gUnknown_08516E3C[idx], (u16 *)(VRAM + 0x3e00), 0x80);
+}
+
+void sub_80A16B0(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 3;
+    sub_80A0980(gUnknown_08517A44[idx], (u16 *)(VRAM + 0x7e00), 0x180);
+    sub_80A0980(gUnknown_08517A50[idx], (u16 *)(VRAM + 0x7a00), 0x280);
+}
+
+void sub_80A16F8(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08517BFC[idx], (u16 *)(VRAM + 0x7f00), 0x20);
+}
+
+void sub_80A1720(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 2;
+    sub_80A0980(gUnknown_08517C0C[idx], (u16 *)(VRAM + 0x7c00), 0x80);
+}
+
+void sub_80A1748(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 2;
+    sub_80A0980(gUnknown_08518034[idx], (u16 *)(VRAM + 0x5200), 0x200);
+}
+
+void sub_80A1770(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 2;
+    sub_80A0980(gUnknown_0851829C[idx], (u16 *)(VRAM + 0x7e00), 0x120);
+}
+
+void sub_80A1798(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 8;
+    sub_80A0980(gUnknown_085202C4[idx], (u16 *)(VRAM + 0x5e00), 0xc00);
+}
+
+void sub_80A17C0(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 3;
+    sub_80A0980(gUnknown_08524864[idx], (u16 *)(VRAM + 0x52e0), 0x100);
+}
+
+void sub_80A17EC(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 3;
+    sub_80A0980(gUnknown_08524870[idx], (u16 *)(VRAM + 0x50e0), 0x100);
+}
+
+// palette
+
 void sub_80A1818(u16 a1)
 {
-  void **v1 = &gUnknown_0852487C;
-  CpuSet(v1[a1 & 0x3], gPlttBufferUnfaded + 0x80, 0x10);
-  BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
-  if ((u8)FindTaskIdByFunc(sub_8149DFC) != 0xFF )
-  {
-    gUnknown_03000F44 = sub_80A1670;
-    gUnknown_03000F3C = 0x20;
-  }
-  return;
+    CpuCopy16(gUnknown_0852487C[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
+    BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
+    if ((u8)FindTaskIdByFunc(sub_8149DFC) != 0xFF )
+    {
+        sSecondaryTilesetCB = sub_80A1670;
+        sSecondaryTilesetCBBufferSize = 0x20;
+    }
 }
 
 void sub_80A1884(u16 a1)
 {
-  void **v1 = &gUnknown_0852487C;
-  CpuSet(v1[a1 & 0x3], gPlttBufferUnfaded + 0x80, 0x10);
-  if ((u8)FindTaskIdByFunc(sub_8149DFC) == 0xFF )
-  {
-    BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
-    if (!--gUnknown_03000F3C)
-        gUnknown_03000F44 = 0;
-  }
-  return;
+    CpuCopy16(gUnknown_0852487C[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
+    if ((u8)FindTaskIdByFunc(sub_8149DFC) == 0xFF )
+    {
+        BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
+        if (!--sSecondaryTilesetCBBufferSize)
+            sSecondaryTilesetCB = NULL;
+    }
 }
 
 void LoadCompressedPalette(const void *src, u16 offset, u16 size)
diff --git a/src/scrcmd.c b/src/scrcmd.c
new file mode 100644
index 000000000..b56a53caf
--- /dev/null
+++ b/src/scrcmd.c
@@ -0,0 +1,15 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+IWRAM_DATA u8 gUnknown_03000F30;
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/sym_bss.txt b/sym_bss.txt
index c81ce12be..16f14da51 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -16,32 +16,8 @@ gUnknown_03000000: @ 3000000
     .include "src/rom4.o"
     .include "src/field_camera.o"
     .include "src/script.o"
-
-.align 2
-gUnknown_03000F30: @ 3000F30
-	.space 0x4
-
-gUnknown_03000F34: @ 3000F34
-	.space 0x2
-
-gUnknown_03000F36: @ 3000F36
-	.space 0x2
-
-gUnknown_03000F38: @ 3000F38
-	.space 0x2
-
-gUnknown_03000F3A: @ 3000F3A
-	.space 0x2
-
-gUnknown_03000F3C: @ 3000F3C
-	.space 0x4
-
-gUnknown_03000F40: @ 3000F40
-	.space 0x4
-
-gUnknown_03000F44: @ 3000F44
-	.space 0x4
-
+    .include "src/scrcmd.o"
+    .include "src/palette.o"
     .include "src/sound.o"
 
 gUnknown_03000F50: @ 3000F50
diff --git a/sym_ewram.txt b/sym_ewram.txt
index e49b94160..8549f1679 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -747,9 +747,6 @@ gUnknown_02037621: @ 2037621
 gUnknown_02037622: @ 2037622
 	.space 0x2
 
-gUnknown_02037624: @ 2037624
-	.space 0xF0
-
 	.include "src/palette.o"
     .include "src/sound.o"
     

From a1ccd78218cf920bbf62278d02f143b903f1314e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 30 Sep 2017 22:16:51 -0400
Subject: [PATCH 12/42] Disassemble pointer tables in data/tileset.s

---
 asm/tileset.s  |   8 -
 data/tileset.s | 651 ++++++++++++++++++++++++++++++++++++++++++++++---
 src/palette.c  |   8 +-
 3 files changed, 616 insertions(+), 51 deletions(-)
 delete mode 100644 asm/tileset.s

diff --git a/asm/tileset.s b/asm/tileset.s
deleted file mode 100644
index 2428f2984..000000000
--- a/asm/tileset.s
+++ /dev/null
@@ -1,8 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/data/tileset.s b/data/tileset.s
index a69e53acf..3a1efb5fc 100644
--- a/data/tileset.s
+++ b/data/tileset.s
@@ -4,116 +4,691 @@
     .section .rodata
     .align 2, 0
 
-Unknown_085105C4::
-    .incbin "baserom.gba", 0x5105C4, 0x1A0
+gUnknown_085105C4::
+	.incbin "baserom.gba", 0x5105c4, 0x80
+
+gUnknown_08510644::
+	.incbin "baserom.gba", 0x510644, 0x80
+
+gUnknown_085106C4::
+	.incbin "baserom.gba", 0x5106c4, 0xa0
+
 
 gUnknown_08510764:: @ 8510764
-	.incbin "baserom.gba", 0x510764, 0xb60
+@ replacing .incbin "baserom.gba", 0x00510764, 0x10
+	.4byte gUnknown_08510644
+	.4byte gUnknown_085105C4
+	.4byte gUnknown_08510644
+	.4byte gUnknown_085106C4
+
+gUnknown_08510774::
+	.incbin "baserom.gba", 0x510774, 0x3c0
+
+gUnknown_08510B34::
+	.incbin "baserom.gba", 0x510b34, 0x3c0
+
+gUnknown_08510EF4::
+	.incbin "baserom.gba", 0x510ef4, 0x3c0
+
+gUnknown_085112B4::
+	.incbin "baserom.gba", 0x5112b4, 0x10
+
 
 gUnknown_085112C4:: @ 85112C4
-	.incbin "baserom.gba", 0x5112c4, 0x908
+	.incbin "baserom.gba", 0x5112c4, 0x3b0
+
+gUnknown_08511674::
+	.incbin "baserom.gba", 0x511674, 0x3c0
+
+gUnknown_08511A34::
+	.incbin "baserom.gba", 0x511a34, 0x198
+
 
 gUnknown_08511BCC:: @ 8511BCC
-	.incbin "baserom.gba", 0x511bcc, 0x9a8
+	.incbin "baserom.gba", 0x511bcc, 0x228
+
+gUnknown_08511DF4::
+	.incbin "baserom.gba", 0x511df4, 0x3c0
+
+gUnknown_085121B4::
+	.incbin "baserom.gba", 0x5121b4, 0x3c0
+
 
 gUnknown_08512574:: @ 8512574
-	.incbin "baserom.gba", 0x512574, 0x8e0
+@ replacing .incbin "baserom.gba", 0x00512574, 0x20
+	.4byte gUnknown_08510774
+	.4byte gUnknown_08510B34
+	.4byte gUnknown_08510EF4
+	.4byte gUnknown_085112B4
+	.4byte gUnknown_08511674
+	.4byte gUnknown_08511A34
+	.4byte gUnknown_08511DF4
+	.4byte gUnknown_085121B4
+
+gUnknown_08512594::
+	.incbin "baserom.gba", 0x512594, 0x140
+
+gUnknown_085126D4::
+	.incbin "baserom.gba", 0x5126d4, 0x140
+
+gUnknown_08512814::
+	.incbin "baserom.gba", 0x512814, 0x140
+
+gUnknown_08512954::
+	.incbin "baserom.gba", 0x512954, 0x140
+
+gUnknown_08512A94::
+	.incbin "baserom.gba", 0x512a94, 0x140
+
+gUnknown_08512BD4::
+	.incbin "baserom.gba", 0x512bd4, 0x140
+
+gUnknown_08512D14::
+	.incbin "baserom.gba", 0x512d14, 0x140
+
 
 gUnknown_08512E54:: @ 8512E54
-	.incbin "baserom.gba", 0x512e54, 0x320
+@ replacing .incbin "baserom.gba", 0x00512e54, 0x20
+	.4byte gUnknown_08512594
+	.4byte gUnknown_085126D4
+	.4byte gUnknown_08512814
+	.4byte gUnknown_08512954
+	.4byte gUnknown_08512A94
+	.4byte gUnknown_08512BD4
+	.4byte gUnknown_08512D14
+	.4byte gUnknown_08512594
+
+gUnknown_08512E74::
+	.incbin "baserom.gba", 0x512e74, 0xc0
+
+gUnknown_08512F34::
+	.incbin "baserom.gba", 0x512f34, 0xc0
+
+gUnknown_08512FF4::
+	.incbin "baserom.gba", 0x512ff4, 0xc0
+
+gUnknown_085130B4::
+	.incbin "baserom.gba", 0x5130b4, 0xc0
+
 
 gUnknown_08513174:: @ 8513174
-	.incbin "baserom.gba", 0x513174, 0x510
+@ replacing .incbin "baserom.gba", 0x00513174, 0x10
+	.4byte gUnknown_08512E74
+	.4byte gUnknown_08512F34
+	.4byte gUnknown_08512FF4
+	.4byte gUnknown_085130B4
+
+gUnknown_08513184::
+	.incbin "baserom.gba", 0x513184, 0x140
+
+gUnknown_085132C4::
+	.incbin "baserom.gba", 0x5132c4, 0x140
+
+gUnknown_08513404::
+	.incbin "baserom.gba", 0x513404, 0x140
+
+gUnknown_08513544::
+	.incbin "baserom.gba", 0x513544, 0x140
+
 
 gUnknown_08513684:: @ 8513684
-	.incbin "baserom.gba", 0x513684, 0x210
+@ replacing .incbin "baserom.gba", 0x00513684, 0x10
+	.4byte gUnknown_08513184
+	.4byte gUnknown_085132C4
+	.4byte gUnknown_08513404
+	.4byte gUnknown_08513544
+
+gUnknown_08513694::
+	.incbin "baserom.gba", 0x513694, 0x80
+
+gUnknown_08513714::
+	.incbin "baserom.gba", 0x513714, 0x80
+
+gUnknown_08513794::
+	.incbin "baserom.gba", 0x513794, 0x80
+
+gUnknown_08513814::
+	.incbin "baserom.gba", 0x513814, 0x80
+
 
 gUnknown_08513894:: @ 8513894
-	.incbin "baserom.gba", 0x513894, 0xb50
+@ replacing .incbin "baserom.gba", 0x00513894, 0x10
+	.4byte gUnknown_08513694
+	.4byte gUnknown_08513714
+	.4byte gUnknown_08513794
+	.4byte gUnknown_08513814
+
+gUnknown_085138A4::
+	.incbin "baserom.gba", 0x5138a4, 0x3c0
+
+gUnknown_08513C64::
+	.incbin "baserom.gba", 0x513c64, 0x3c0
+
+gUnknown_08514024::
+	.incbin "baserom.gba", 0x514024, 0x3c0
+
 
 gUnknown_085143E4:: @ 85143E4
-	.incbin "baserom.gba", 0x5143e4, 0x210
+@ replacing .incbin "baserom.gba", 0x005143e4, 0x10
+	.4byte gUnknown_085138A4
+	.4byte gUnknown_08513C64
+	.4byte gUnknown_08514024
+	.4byte gUnknown_08513C64
+
+gUnknown_085143F4::
+	.incbin "baserom.gba", 0x5143f4, 0x80
+
+gUnknown_08514474::
+	.incbin "baserom.gba", 0x514474, 0x80
+
+gUnknown_085144F4::
+	.incbin "baserom.gba", 0x5144f4, 0x80
+
+gUnknown_08514574::
+	.incbin "baserom.gba", 0x514574, 0x80
+
 
 gUnknown_085145F4:: @ 85145F4
-	.incbin "baserom.gba", 0x5145f4, 0x810
+@ replacing .incbin "baserom.gba", 0x005145f4, 0x10
+	.4byte gUnknown_085143F4
+	.4byte gUnknown_08514474
+	.4byte gUnknown_085144F4
+	.4byte gUnknown_08514574
+
+gUnknown_08514604::
+	.incbin "baserom.gba", 0x514604, 0x100
+
+gUnknown_08514704::
+	.incbin "baserom.gba", 0x514704, 0x100
+
+gUnknown_08514804::
+	.incbin "baserom.gba", 0x514804, 0x100
+
+gUnknown_08514904::
+	.incbin "baserom.gba", 0x514904, 0x100
+
+gUnknown_08514A04::
+	.incbin "baserom.gba", 0x514a04, 0x100
+
+gUnknown_08514B04::
+	.incbin "baserom.gba", 0x514b04, 0x100
+
+gUnknown_08514C04::
+	.incbin "baserom.gba", 0x514c04, 0x100
+
+gUnknown_08514D04::
+	.incbin "baserom.gba", 0x514d04, 0x100
+
 
 gUnknown_08514E04:: @ 8514E04
-	.incbin "baserom.gba", 0x514e04, 0x540
+@ replacing .incbin "baserom.gba", 0x00514e04, 0x20
+	.4byte gUnknown_08514604
+	.4byte gUnknown_08514704
+	.4byte gUnknown_08514804
+	.4byte gUnknown_08514904
+	.4byte gUnknown_08514A04
+	.4byte gUnknown_08514B04
+	.4byte gUnknown_08514C04
+	.4byte gUnknown_08514D04
+
+gUnknown_08514E24::
+	.incbin "baserom.gba", 0x514e24, 0x80
+
+gUnknown_08514EA4::
+	.incbin "baserom.gba", 0x514ea4, 0x80
+
+gUnknown_08514F24::
+	.incbin "baserom.gba", 0x514f24, 0x80
+
+gUnknown_08514FA4::
+	.incbin "baserom.gba", 0x514fa4, 0x80
+
+gUnknown_08515024::
+	.incbin "baserom.gba", 0x515024, 0x80
+
+gUnknown_085150A4::
+	.incbin "baserom.gba", 0x5150a4, 0x80
+
+gUnknown_08515124::
+	.incbin "baserom.gba", 0x515124, 0x80
+
+gUnknown_085151A4::
+	.incbin "baserom.gba", 0x5151a4, 0x80
+
+gUnknown_08515224::
+	.incbin "baserom.gba", 0x515224, 0x80
+
+gUnknown_085152A4::
+	.incbin "baserom.gba", 0x5152a4, 0xa0
+
 
 gUnknown_08515344:: @ 8515344
-	.incbin "baserom.gba", 0x515344, 0x20
+@ replacing .incbin "baserom.gba", 0x00515344, 0x20
+	.4byte VRAM + 0x4c00
+	.4byte VRAM + 0x4c80
+	.4byte VRAM + 0x4d00
+	.4byte VRAM + 0x4d80
+	.4byte VRAM + 0x4e00
+	.4byte VRAM + 0x4e80
+	.4byte VRAM + 0x4f00
+	.4byte VRAM + 0x4f80
 
 gUnknown_08515364:: @ 8515364
-	.incbin "baserom.gba", 0x515364, 0x20
+@ replacing .incbin "baserom.gba", 0x00515364, 0x20
+	.4byte VRAM + 0x5000
+	.4byte VRAM + 0x5080
+	.4byte VRAM + 0x5100
+	.4byte VRAM + 0x5180
+	.4byte VRAM + 0x5200
+	.4byte VRAM + 0x5280
+	.4byte VRAM + 0x5300
+	.4byte VRAM + 0x5380
 
 gUnknown_08515384:: @ 8515384
-	.incbin "baserom.gba", 0x515384, 0x30
+@ replacing .incbin "baserom.gba", 0x00515384, 0x30
+	.4byte gUnknown_08514E24
+	.4byte gUnknown_08514E24
+	.4byte gUnknown_08514EA4
+	.4byte gUnknown_08514F24
+	.4byte gUnknown_08514FA4
+	.4byte gUnknown_08514FA4
+	.4byte gUnknown_08514FA4
+	.4byte gUnknown_08514FA4
+	.4byte gUnknown_08514FA4
+	.4byte gUnknown_08514FA4
+	.4byte gUnknown_08514F24
+	.4byte gUnknown_08514EA4
 
 gUnknown_085153B4:: @ 85153B4
-	.incbin "baserom.gba", 0x5153b4, 0x30
+@ replacing .incbin "baserom.gba", 0x005153b4, 0x30
+	.4byte gUnknown_085150A4
+	.4byte gUnknown_085150A4
+	.4byte gUnknown_08515124
+	.4byte gUnknown_085151A4
+	.4byte gUnknown_08515224
+	.4byte gUnknown_08515224
+	.4byte gUnknown_08515224
+	.4byte gUnknown_08515224
+	.4byte gUnknown_08515224
+	.4byte gUnknown_08515224
+	.4byte gUnknown_085151A4
+	.4byte gUnknown_08515124
 
 gUnknown_085153E4:: @ 85153E4
-	.incbin "baserom.gba", 0x5153e4, 0x10
+@ replacing .incbin "baserom.gba", 0x005153e4, 0x10
+	.4byte gUnknown_08514E24
+	.4byte gUnknown_08514E24
+	.4byte gUnknown_08515024
+	.4byte gUnknown_08515024
 
 gUnknown_085153F4:: @ 85153F4
-	.incbin "baserom.gba", 0x5153f4, 0x410
+@ replacing .incbin "baserom.gba", 0x005153f4, 0x10
+	.4byte gUnknown_085150A4
+	.4byte gUnknown_085150A4
+	.4byte gUnknown_085152A4
+	.4byte gUnknown_085152A4
+
+gUnknown_08515404::
+	.incbin "baserom.gba", 0x515404, 0x80
+
+gUnknown_08515484::
+	.incbin "baserom.gba", 0x515484, 0x80
+
+gUnknown_08515504::
+	.incbin "baserom.gba", 0x515504, 0x80
+
+gUnknown_08515584::
+	.incbin "baserom.gba", 0x515584, 0x80
+
+gUnknown_08515604::
+	.incbin "baserom.gba", 0x515604, 0x80
+
+gUnknown_08515684::
+	.incbin "baserom.gba", 0x515684, 0x80
+
+gUnknown_08515704::
+	.incbin "baserom.gba", 0x515704, 0x80
+
+gUnknown_08515784::
+	.incbin "baserom.gba", 0x515784, 0x80
+
 
 gUnknown_08515804:: @ 8515804
 	.incbin "baserom.gba", 0x515804, 0x20
 
+
 gUnknown_08515824:: @ 8515824
-	.incbin "baserom.gba", 0x515824, 0x140
+@ replacing .incbin "baserom.gba", 0x00515824, 0x20
+	.4byte gUnknown_08515404
+	.4byte gUnknown_08515484
+	.4byte gUnknown_08515504
+	.4byte gUnknown_08515584
+	.4byte gUnknown_08515604
+	.4byte gUnknown_08515684
+	.4byte gUnknown_08515704
+	.4byte gUnknown_08515784
+
+gUnknown_08515844::
+	.incbin "baserom.gba", 0x515844, 0x80
+
+gUnknown_085158C4::
+	.incbin "baserom.gba", 0x5158c4, 0xa0
+
 
 gUnknown_08515964:: @ 8515964
-	.incbin "baserom.gba", 0x515964, 0x428
+@ replacing .incbin "baserom.gba", 0x00515964, 0x8
+	.4byte gUnknown_08515844
+	.4byte gUnknown_085158C4
+
+gUnknown_0851596C::
+	.incbin "baserom.gba", 0x51596c, 0x80
+
+gUnknown_085159EC::
+	.incbin "baserom.gba", 0x5159ec, 0x80
+
+gUnknown_08515A6C::
+	.incbin "baserom.gba", 0x515a6c, 0x80
+
+gUnknown_08515AEC::
+	.incbin "baserom.gba", 0x515aec, 0x2a0
+
 
 gUnknown_08515D8C:: @ 8515D8C
-	.incbin "baserom.gba", 0x515d8c, 0x430
+@ replacing .incbin "baserom.gba", 0x00515d8c, 0x10
+	.4byte gUnknown_0851596C
+	.4byte gUnknown_085159EC
+	.4byte gUnknown_08515A6C
+	.4byte gUnknown_08515AEC
+
+gUnknown_08515D9C::
+	.incbin "baserom.gba", 0x515d9c, 0x80
+
+gUnknown_08515E1C::
+	.incbin "baserom.gba", 0x515e1c, 0x80
+
+gUnknown_08515E9C::
+	.incbin "baserom.gba", 0x515e9c, 0x80
+
+gUnknown_08515F1C::
+	.incbin "baserom.gba", 0x515f1c, 0x80
+
+gUnknown_08515F9C::
+	.incbin "baserom.gba", 0x515f9c, 0x80
+
+gUnknown_0851601C::
+	.incbin "baserom.gba", 0x51601c, 0x80
+
+gUnknown_0851609C::
+	.incbin "baserom.gba", 0x51609c, 0x80
+
+gUnknown_0851611C::
+	.incbin "baserom.gba", 0x51611c, 0xa0
+
 
 gUnknown_085161BC:: @ 85161BC
-	.incbin "baserom.gba", 0x5161bc, 0x20
+@ replacing .incbin "baserom.gba", 0x005161bc, 0x20
+	.4byte VRAM + 0x5c00
+	.4byte VRAM + 0x5c80
+	.4byte VRAM + 0x5d00
+	.4byte VRAM + 0x5d80
+	.4byte VRAM + 0x5e00
+	.4byte VRAM + 0x5e80
+	.4byte VRAM + 0x5f00
+	.4byte VRAM + 0x5f80
 
 gUnknown_085161DC:: @ 85161DC
-	.incbin "baserom.gba", 0x5161dc, 0x320
+@ replacing .incbin "baserom.gba", 0x005161dc, 0x20
+	.4byte gUnknown_08515D9C
+	.4byte gUnknown_08515E1C
+	.4byte gUnknown_08515E9C
+	.4byte gUnknown_08515F1C
+	.4byte gUnknown_08515F9C
+	.4byte gUnknown_0851601C
+	.4byte gUnknown_0851609C
+	.4byte gUnknown_0851611C
+
+gUnknown_085161FC::
+	.incbin "baserom.gba", 0x5161fc, 0xc0
+
+gUnknown_085162BC::
+	.incbin "baserom.gba", 0x5162bc, 0xc0
+
+gUnknown_0851637C::
+	.incbin "baserom.gba", 0x51637c, 0xc0
+
+gUnknown_0851643C::
+	.incbin "baserom.gba", 0x51643c, 0xc0
+
 
 gUnknown_085164FC:: @ 85164FC
-	.incbin "baserom.gba", 0x5164fc, 0x310
+@ replacing .incbin "baserom.gba", 0x005164fc, 0x10
+	.4byte gUnknown_085161FC
+	.4byte gUnknown_085162BC
+	.4byte gUnknown_0851637C
+	.4byte gUnknown_0851643C
+
+gUnknown_0851650C::
+	.incbin "baserom.gba", 0x51650c, 0xc0
+
+gUnknown_085165CC::
+	.incbin "baserom.gba", 0x5165cc, 0xc0
+
+gUnknown_0851668C::
+	.incbin "baserom.gba", 0x51668c, 0xc0
+
+gUnknown_0851674C::
+	.incbin "baserom.gba", 0x51674c, 0xc0
+
 
 gUnknown_0851680C:: @ 851680C
-	.incbin "baserom.gba", 0x51680c, 0x310
+@ replacing .incbin "baserom.gba", 0x0051680c, 0x10
+	.4byte gUnknown_0851650C
+	.4byte gUnknown_085165CC
+	.4byte gUnknown_0851668C
+	.4byte gUnknown_0851674C
+
+gUnknown_0851681C:: @ 851680C
+	.incbin "baserom.gba", 0x51681c, 0xc0
+
+gUnknown_085168DC::
+	.incbin "baserom.gba", 0x5168dc, 0xc0
+
+gUnknown_0851699C::
+	.incbin "baserom.gba", 0x51699c, 0xc0
+
+gUnknown_08516A5C::
+	.incbin "baserom.gba", 0x516a5c, 0xc0
+
 
 gUnknown_08516B1C:: @ 8516B1C
-	.incbin "baserom.gba", 0x516b1c, 0x210
+@ replacing .incbin "baserom.gba", 0x00516b1c, 0x10
+	.4byte gUnknown_0851681C
+	.4byte gUnknown_085168DC
+	.4byte gUnknown_0851699C
+	.4byte gUnknown_08516A5C
+
+gUnknown_08516B2C::
+	.incbin "baserom.gba", 0x516b2c, 0x80
+
+gUnknown_08516BAC::
+	.incbin "baserom.gba", 0x516bac, 0x80
+
+gUnknown_08516C2C::
+	.incbin "baserom.gba", 0x516c2c, 0x80
+
+gUnknown_08516CAC::
+	.incbin "baserom.gba", 0x516cac, 0x80
+
 
 gUnknown_08516D2C:: @ 8516D2C
-	.incbin "baserom.gba", 0x516d2c, 0x110
+@ replacing .incbin "baserom.gba", 0x00516d2c, 0x10
+	.4byte gUnknown_08516B2C
+	.4byte gUnknown_08516BAC
+	.4byte gUnknown_08516C2C
+	.4byte gUnknown_08516CAC
+
+gUnknown_08516D3C::
+	.incbin "baserom.gba", 0x516d3c, 0x80
+
+gUnknown_08516DBC::
+	.incbin "baserom.gba", 0x516dbc, 0x80
+
 
 gUnknown_08516E3C:: @ 8516E3C
-	.incbin "baserom.gba", 0x516e3c, 0xc08
+@ replacing .incbin "baserom.gba", 0x00516e3c, 0x8
+	.4byte gUnknown_08516D3C
+	.4byte gUnknown_08516DBC
+
+gUnknown_08516E44::
+	.incbin "baserom.gba", 0x516e44, 0x180
+
+gUnknown_08516FC4::
+	.incbin "baserom.gba", 0x516fc4, 0x180
+
+gUnknown_08517144::
+	.incbin "baserom.gba", 0x517144, 0x180
+
+gUnknown_085172C4::
+	.incbin "baserom.gba", 0x5172c4, 0x280
+
+gUnknown_08517544::
+	.incbin "baserom.gba", 0x517544, 0x280
+
+gUnknown_085177C4::
+	.incbin "baserom.gba", 0x5177c4, 0x280
+
 
 gUnknown_08517A44:: @ 8517A44
-	.incbin "baserom.gba", 0x517a44, 0xc
+@ replacing .incbin "baserom.gba", 0x00517a44, 0xc
+	.4byte gUnknown_08516E44
+	.4byte gUnknown_08516FC4
+	.4byte gUnknown_08517144
 
 gUnknown_08517A50:: @ 8517A50
-	.incbin "baserom.gba", 0x517a50, 0x1ac
+@ replacing .incbin "baserom.gba", 0x00517a50, 0xc
+	.4byte gUnknown_085172C4
+	.4byte gUnknown_08517544
+	.4byte gUnknown_085177C4
+
+gUnknown_08517A5C::
+	.incbin "baserom.gba", 0x517a5c, 0x80
+
+gUnknown_08517ADC::
+	.incbin "baserom.gba", 0x517adc, 0x80
+
+gUnknown_08517B5C::
+	.incbin "baserom.gba", 0x517b5c, 0x20
+
+gUnknown_08517B7C::
+	.incbin "baserom.gba", 0x517b7c, 0x20
+
+gUnknown_08517B9C::
+	.incbin "baserom.gba", 0x517b9c, 0x20
+
+gUnknown_08517BBC::
+	.incbin "baserom.gba", 0x517bbc, 0x40
+
 
 gUnknown_08517BFC:: @ 8517BFC
-	.incbin "baserom.gba", 0x517bfc, 0x10
+@ replacing .incbin "baserom.gba", 0x00517bfc, 0x10
+	.4byte gUnknown_08517B5C
+	.4byte gUnknown_08517B7C
+	.4byte gUnknown_08517B9C
+	.4byte gUnknown_08517BBC
 
 gUnknown_08517C0C:: @ 8517C0C
-	.incbin "baserom.gba", 0x517c0c, 0x428
+@ replacing .incbin "baserom.gba", 0x00517c0c, 0x8
+	.4byte gUnknown_08517A5C
+	.4byte gUnknown_08517ADC
+
+gUnknown_08517C14::
+	.incbin "baserom.gba", 0x517c14, 0x200
+
+gUnknown_08517E14::
+	.incbin "baserom.gba", 0x517e14, 0x220
+
 
 gUnknown_08518034:: @ 8518034
-	.incbin "baserom.gba", 0x518034, 0x268
+@ replacing .incbin "baserom.gba", 0x00518034, 0x8
+	.4byte gUnknown_08517C14
+	.4byte gUnknown_08517E14
+
+gUnknown_0851803C::
+	.incbin "baserom.gba", 0x51803c, 0x120
+
+gUnknown_0851815C::
+	.incbin "baserom.gba", 0x51815c, 0x140
+
 
 gUnknown_0851829C:: @ 851829C
-	.incbin "baserom.gba", 0x51829c, 0x8028
+@ replacing .incbin "baserom.gba", 0x0051829c, 0x8
+	.4byte gUnknown_0851803C
+	.4byte gUnknown_0851815C
+
+gUnknown_085182A4::
+	.incbin "baserom.gba", 0x5182a4, 0xc00
+
+gUnknown_08518EA4::
+	.incbin "baserom.gba", 0x518ea4, 0xc00
+
+gUnknown_08519AA4::
+	.incbin "baserom.gba", 0x519aa4, 0xc00
+
+gUnknown_0851A6A4::
+	.incbin "baserom.gba", 0x51a6a4, 0xc00
+
+gUnknown_0851B2A4::
+	.incbin "baserom.gba", 0x51b2a4, 0xc00
+
+gUnknown_0851BEA4::
+	.incbin "baserom.gba", 0x51bea4, 0xc00
+
+gUnknown_0851CAA4::
+	.incbin "baserom.gba", 0x51caa4, 0xc00
+
+gUnknown_0851D6A4::
+	.incbin "baserom.gba", 0x51d6a4, 0x2c20
+
 
 gUnknown_085202C4:: @ 85202C4
-	.incbin "baserom.gba", 0x5202c4, 0x45a0
+@ replacing .incbin "baserom.gba", 0x005202c4, 0x20
+	.4byte gUnknown_085182A4
+	.4byte gUnknown_08518EA4
+	.4byte gUnknown_08519AA4
+	.4byte gUnknown_0851A6A4
+	.4byte gUnknown_0851B2A4
+	.4byte gUnknown_0851BEA4
+	.4byte gUnknown_0851CAA4
+	.4byte gUnknown_0851D6A4
+
+gUnknown_085202E4::
+	.incbin "baserom.gba", 0x5202e4, 0x100
+
+gUnknown_085203E4::
+	.incbin "baserom.gba", 0x5203e4, 0x100
+
+gUnknown_085204E4::
+	.incbin "baserom.gba", 0x5204e4, 0x120
+
+gUnknown_08520604::
+	.incbin "baserom.gba", 0x520604, 0x100
+
+gUnknown_08520704::
+	.incbin "baserom.gba", 0x520704, 0x100
+
+gUnknown_08520804::
+	.incbin "baserom.gba", 0x520804, 0x4060
+
 
 gUnknown_08524864:: @ 8524864
-	.incbin "baserom.gba", 0x524864, 0xc
+@ replacing .incbin "baserom.gba", 0x00524864, 0xc
+	.4byte gUnknown_085202E4
+	.4byte gUnknown_085203E4
+	.4byte gUnknown_085204E4
 
 gUnknown_08524870:: @ 8524870
-	.incbin "baserom.gba", 0x524870, 0xc
+@ replacing .incbin "baserom.gba", 0x00524870, 0xc
+	.4byte gUnknown_08520604
+	.4byte gUnknown_08520704
+	.4byte gUnknown_08520804
+
diff --git a/src/palette.c b/src/palette.c
index 4c09206ba..da03516d0 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -62,8 +62,6 @@ EWRAM_DATA u32 sPlttBufferTransferPending = 0;
 EWRAM_DATA u8 gPaletteDecompressionBuffer[0x400] = {0};
 
 extern const u16 *const gUnknown_08510764[];
-extern const u16 *const gUnknown_085112C4[];
-extern const u16 *const gUnknown_08511BCC[];
 extern const u16 *const gUnknown_08512574[];
 extern const u16 *const gUnknown_08512E54[];
 extern const u16 *const gUnknown_08513174[];
@@ -695,7 +693,7 @@ void sub_80A1394(u16 timer_div, u8 timer_mod)
     }
     else
     {
-        timer_div &= 3;
+        timer_div %= 4;
         sub_80A0980(gUnknown_085153E4[timer_div], gUnknown_08515344[timer_mod], 0x80);
         sub_80A0980(gUnknown_085153F4[timer_div], gUnknown_08515364[timer_mod], 0x80);
     }
@@ -704,7 +702,7 @@ void sub_80A1394(u16 timer_div, u8 timer_mod)
 void sub_80A1434(u16 timer_div, u8 timer_mod)
 {
     timer_div -= timer_mod;
-    timer_div &= 0x7;
+    timer_div %= 8;
     if (gUnknown_08515824[timer_div])
         sub_80A0980(gUnknown_08515824[timer_div], gUnknown_08515804[timer_mod], 0x80);
 }
@@ -728,7 +726,7 @@ void sub_80A1498(u16 timer)
 void sub_80A14C0(u16 timer_div, u8 timer_mod)
 {
     timer_div -= timer_mod;
-    timer_div &= 7;
+    timer_div %= 8;
 
     sub_80A0980(gUnknown_085161DC[timer_div], gUnknown_085161BC[timer_mod], 0x80);
 }

From 4d78e62fd90531a1469b7a1a3e279a5a734f62b2 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 30 Sep 2017 22:23:00 -0400
Subject: [PATCH 13/42] Sanitize data/tilesets.s

---
 asm/battle_anim.s |  4 ++--
 data/tileset.s    | 26 ++++++++++++--------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/asm/battle_anim.s b/asm/battle_anim.s
index 9c0190214..ee85f5565 100644
--- a/asm/battle_anim.s
+++ b/asm/battle_anim.s
@@ -449,10 +449,10 @@ ma00_load_graphics: @ 80A3D24
 	lsls r0, 8
 	orrs r4, r0
 	lsls r5, r4, 3
-	ldr r0, =gUnknown_085112C4
+	ldr r0, =gUnknown_085112B4 + 0x10
 	adds r0, r5, r0
 	bl LoadCompressedObjectPicUsingHeap
-	ldr r0, =gUnknown_08511BCC
+	ldr r0, =gUnknown_08511A34 + 0x198
 	adds r5, r0
 	adds r0, r5, 0
 	bl LoadCompressedObjectPaletteUsingHeap
diff --git a/data/tileset.s b/data/tileset.s
index 3a1efb5fc..c60d83d61 100644
--- a/data/tileset.s
+++ b/data/tileset.s
@@ -11,8 +11,9 @@ gUnknown_08510644::
 	.incbin "baserom.gba", 0x510644, 0x80
 
 gUnknown_085106C4::
-	.incbin "baserom.gba", 0x5106c4, 0xa0
+	.incbin "baserom.gba", 0x5106c4, 0x80
 
+    .space 0x20
 
 gUnknown_08510764:: @ 8510764
 @ replacing .incbin "baserom.gba", 0x00510764, 0x10
@@ -31,21 +32,13 @@ gUnknown_08510EF4::
 	.incbin "baserom.gba", 0x510ef4, 0x3c0
 
 gUnknown_085112B4::
-	.incbin "baserom.gba", 0x5112b4, 0x10
-
-
-gUnknown_085112C4:: @ 85112C4
-	.incbin "baserom.gba", 0x5112c4, 0x3b0
+	.incbin "baserom.gba", 0x5112b4, 0x3c0
 
 gUnknown_08511674::
 	.incbin "baserom.gba", 0x511674, 0x3c0
 
 gUnknown_08511A34::
-	.incbin "baserom.gba", 0x511a34, 0x198
-
-
-gUnknown_08511BCC:: @ 8511BCC
-	.incbin "baserom.gba", 0x511bcc, 0x228
+	.incbin "baserom.gba", 0x511a34, 0x3c0
 
 gUnknown_08511DF4::
 	.incbin "baserom.gba", 0x511df4, 0x3c0
@@ -259,8 +252,9 @@ gUnknown_08515224::
 	.incbin "baserom.gba", 0x515224, 0x80
 
 gUnknown_085152A4::
-	.incbin "baserom.gba", 0x5152a4, 0xa0
+	.incbin "baserom.gba", 0x5152a4, 0x80
 
+    .space 0x20
 
 gUnknown_08515344:: @ 8515344
 @ replacing .incbin "baserom.gba", 0x00515344, 0x20
@@ -372,7 +366,9 @@ gUnknown_08515844::
 	.incbin "baserom.gba", 0x515844, 0x80
 
 gUnknown_085158C4::
-	.incbin "baserom.gba", 0x5158c4, 0xa0
+	.incbin "baserom.gba", 0x5158c4, 0x80
+
+	.space 0x20
 
 
 gUnknown_08515964:: @ 8515964
@@ -422,7 +418,9 @@ gUnknown_0851609C::
 	.incbin "baserom.gba", 0x51609c, 0x80
 
 gUnknown_0851611C::
-	.incbin "baserom.gba", 0x51611c, 0xa0
+	.incbin "baserom.gba", 0x51611c, 0x80
+
+	.space 0x20
 
 
 gUnknown_085161BC:: @ 85161BC

From 1fcafaf35aaf92251e7802e1e3ea36e8d5a6067b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 1 Oct 2017 18:54:01 +0200
Subject: [PATCH 14/42] more of battle2 done

---
 asm/battle_1.s                            |   22 +-
 asm/battle_2.s                            | 2681 +--------------------
 asm/battle_5.s                            |    6 +-
 asm/battle_7.s                            |   84 +-
 asm/battle_anim.s                         |    6 +-
 asm/battle_anim_80A9C70.s                 |    4 +-
 asm/battle_anim_80FE840.s                 |    6 +-
 asm/battle_anim_815A0D4.s                 |   16 +-
 asm/battle_anim_8170478.s                 |   38 +-
 asm/battle_controller_linkopponent.s      |   60 +-
 asm/battle_controller_linkpartner.s       |   44 +-
 asm/battle_controller_opponent.s          |   58 +-
 asm/battle_controller_player.s            |   56 +-
 asm/battle_controller_player_partner.s    |   46 +-
 asm/battle_controller_recorded_opponent.s |   56 +-
 asm/battle_controller_recorded_player.s   |   52 +-
 asm/battle_controller_safari.s            |   10 +-
 asm/battle_controller_wally.s             |   26 +-
 asm/battle_frontier_2.s                   |    2 +-
 asm/battle_interface.s                    |   38 +-
 asm/contest.s                             |    2 +-
 asm/contest_link_80F57C4.s                |    2 +-
 asm/contest_painting.s                    |    2 +-
 asm/evolution_scene.s                     |    6 +-
 asm/link.s                                |    2 +-
 asm/pokeball.s                            |   20 +-
 asm/pokeblock_feed.s                      |    2 +-
 asm/recorded_battle.s                     |   14 +-
 asm/reshow_battle_screen.s                |   12 +-
 asm/rom_80A5C6C.s                         |   46 +-
 asm/script_pokemon_util_80F87D8.s         |    2 +-
 asm/trade.s                               |   14 +-
 data/battle_anims.s                       |    2 +-
 data/data2b.s                             |   11 +-
 data/event_scripts.s                      |    6 +-
 include/battle.h                          |   48 +-
 include/link.h                            |    1 +
 include/main.h                            |    1 +
 include/pokemon.h                         |    1 +
 include/recorded_battle.h                 |    3 +
 include/unknown_task.h                    |    1 +
 src/battle_2.c                            | 1105 ++++++++-
 src/battle_script_commands.c              |    4 +-
 src/egg_hatch.c                           |    6 +-
 sym_ewram.txt                             |    2 +-
 45 files changed, 1518 insertions(+), 3108 deletions(-)

diff --git a/asm/battle_1.s b/asm/battle_1.s
index 168f16cca..849736cb4 100644
--- a/asm/battle_1.s
+++ b/asm/battle_1.s
@@ -1358,8 +1358,8 @@ _080356AA:
 	.pool
 	thumb_func_end trs_config
 
-	thumb_func_start c2_berry_program_update_menu
-c2_berry_program_update_menu: @ 80356D0
+	thumb_func_start sub_80356D0
+sub_80356D0: @ 80356D0
 	push {lr}
 	movs r0, 0x2
 	bl DisableInterrupts
@@ -1381,10 +1381,10 @@ c2_berry_program_update_menu: @ 80356D0
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end c2_berry_program_update_menu
+	thumb_func_end sub_80356D0
 
-	thumb_func_start sub_803570C
-sub_803570C: @ 803570C
+	thumb_func_start ApplyPlayerChosenFrameToBattleMenu
+ApplyPlayerChosenFrameToBattleMenu: @ 803570C
 	push {lr}
 	movs r0, 0x2
 	movs r1, 0x12
@@ -1422,7 +1422,7 @@ _0803575A:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_803570C
+	thumb_func_end ApplyPlayerChosenFrameToBattleMenu
 
 	thumb_func_start load_battle_oval_graphics
 load_battle_oval_graphics: @ 8035770
@@ -1685,7 +1685,7 @@ LoadBattleTextboxAndBackground: @ 8035AA4
 	movs r1, 0
 	movs r2, 0x40
 	bl LoadCompressedPalette
-	bl sub_803570C
+	bl ApplyPlayerChosenFrameToBattleMenu
 	bl load_battle_oval_graphics
 	pop {r0}
 	bx r0
@@ -2670,8 +2670,8 @@ _080363AC:
 	.pool
 	thumb_func_end LoadBattleEntryBackground
 
-	thumb_func_start sub_80363C4
-sub_80363C4: @ 80363C4
+	thumb_func_start LoadChosenBattleElement
+LoadChosenBattleElement: @ 80363C4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3051,7 +3051,7 @@ _08036742:
 	b _08036758
 	.pool
 _08036750:
-	bl sub_803570C
+	bl ApplyPlayerChosenFrameToBattleMenu
 	b _08036758
 _08036756:
 	movs r4, 0x1
@@ -3060,6 +3060,6 @@ _08036758:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80363C4
+	thumb_func_end LoadChosenBattleElement
 
 	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/battle_2.s b/asm/battle_2.s
index 0f4ec2bea..a4fa43fa2 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -5,2670 +5,7 @@
 
 	.text
 
-	thumb_func_start BattleMainCB2
-BattleMainCB2: @ 8038420
-	push {lr}
-	sub sp, 0x4
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl RunTextPrinters
-	bl UpdatePaletteFade
-	bl RunTasks
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2C]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08038482
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 17
-	ands r0, r1
-	cmp r0, 0
-	beq _08038482
-	bl rfu_lacks_rfufunc
-	lsls r0, 24
-	cmp r0, 0
-	beq _08038482
-	ldr r2, =gScriptResult
-	ldr r1, =gBattleOutcome
-	movs r0, 0x5
-	strb r0, [r1]
-	movs r0, 0x5
-	strh r0, [r2]
-	bl ResetPaletteFadeControl
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r0, =sub_80384E4
-	bl SetMainCallback2
-_08038482:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BattleMainCB2
 
-	thumb_func_start sub_803849C
-sub_803849C: @ 803849C
-	push {lr}
-	ldr r1, =gMain
-	ldr r0, =gPreBattleCallback1
-	ldr r0, [r0]
-	str r0, [r1]
-	ldr r2, =gUnknown_02039B28
-	movs r0, 0x3
-	strb r0, [r2, 0x15]
-	ldr r0, =0x00000439
-	adds r1, r0
-	ldrb r2, [r1]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	bl ZeroEnemyPartyMons
-	movs r0, 0x5A
-	bl m4aSongNumStop
-	bl sub_805F094
-	bl dp11_free
-	bl sub_8057028
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803849C
-
-	thumb_func_start sub_80384E4
-sub_80384E4: @ 80384E4
-	push {lr}
-	bl UpdatePaletteFade
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08038512
-	ldr r0, =gMPlay_SE1
-	bl m4aMPlayStop
-	ldr r0, =gMPlay_SE2
-	bl m4aMPlayStop
-	bl sub_803849C
-	bl FreeAllWindowBuffers
-	ldr r0, =gMain
-	ldr r0, [r0, 0x8]
-	bl SetMainCallback2
-_08038512:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80384E4
-
-	thumb_func_start sub_8038528
-sub_8038528: @ 8038528
-	movs r1, 0
-	strh r1, [r0, 0x2E]
-	ldr r1, =sub_8038538
-	str r1, [r0, 0x1C]
-	bx lr
-	.pool
-	thumb_func_end sub_8038528
-
-	thumb_func_start sub_8038538
-sub_8038538: @ 8038538
-	push {r4,r5,lr}
-	adds r3, r0, 0
-	ldr r5, =0x0201c000
-	movs r0, 0x2E
-	ldrsh r1, [r3, r0]
-	cmp r1, 0x1
-	beq _0803856C
-	cmp r1, 0x1
-	bgt _08038554
-	cmp r1, 0
-	beq _0803855A
-	b _080385DC
-	.pool
-_08038554:
-	cmp r1, 0x2
-	beq _080385C8
-	b _080385DC
-_0803855A:
-	ldrh r0, [r3, 0x2E]
-	adds r0, 0x1
-	strh r0, [r3, 0x2E]
-	strh r1, [r3, 0x30]
-	ldr r0, =0x00000281
-	strh r0, [r3, 0x32]
-	strh r1, [r3, 0x34]
-	movs r0, 0x1
-	strh r0, [r3, 0x36]
-_0803856C:
-	ldrh r0, [r3, 0x36]
-	subs r0, 0x1
-	strh r0, [r3, 0x36]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080385DC
-	movs r0, 0x2
-	strh r0, [r3, 0x36]
-	movs r4, 0x30
-	ldrsh r2, [r3, r4]
-	movs r0, 0x34
-	ldrsh r1, [r3, r0]
-	lsls r1, 5
-	adds r2, r1
-	movs r4, 0x32
-	ldrsh r0, [r3, r4]
-	subs r0, r1
-	movs r4, 0x3D
-	lsls r0, 1
-	adds r0, r5
-	lsls r2, 1
-	adds r2, r5
-	movs r1, 0x1C
-_0803859A:
-	strh r4, [r2]
-	strh r4, [r0]
-	adds r0, 0x4
-	adds r2, 0x4
-	subs r1, 0x2
-	cmp r1, 0
-	bge _0803859A
-	ldrh r0, [r3, 0x34]
-	adds r0, 0x1
-	strh r0, [r3, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x15
-	bne _080385DC
-	ldrh r0, [r3, 0x2E]
-	adds r0, 0x1
-	strh r0, [r3, 0x2E]
-	movs r0, 0x20
-	strh r0, [r3, 0x30]
-	b _080385DC
-	.pool
-_080385C8:
-	ldrh r0, [r3, 0x30]
-	subs r0, 0x1
-	strh r0, [r3, 0x30]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x14
-	bne _080385DC
-	ldr r0, =CB2_InitBattle
-	bl SetMainCallback2
-_080385DC:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8038538
-
-	thumb_func_start CreateNPCTrainerParty
-CreateNPCTrainerParty: @ 80385E8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x28
-	str r0, [sp, 0x10]
-	lsls r1, 16
-	lsrs r1, 16
-	str r1, [sp, 0x14]
-	lsls r2, 24
-	lsrs r2, 24
-	movs r0, 0
-	mov r9, r0
-	movs r0, 0x80
-	lsls r0, 3
-	cmp r1, r0
-	bne _08038610
-	movs r0, 0
-	b _080389E2
-_08038610:
-	ldr r4, =gBattleTypeFlags
-	ldr r0, [r4]
-	ldr r1, =0x043f0908
-	ands r0, r1
-	ldr r1, [sp, 0x14]
-	lsls r1, 2
-	str r1, [sp, 0x20]
-	cmp r0, 0x8
-	beq _08038624
-	b _080389D2
-_08038624:
-	cmp r2, 0x1
-	bne _0803862C
-	bl ZeroEnemyPartyMons
-_0803862C:
-	ldr r0, [r4]
-	movs r1, 0x80
-	lsls r1, 8
-	ands r0, r1
-	cmp r0, 0
-	beq _08038668
-	ldr r0, =gTrainers
-	ldr r2, [sp, 0x20]
-	ldr r3, [sp, 0x14]
-	adds r1, r2, r3
-	lsls r1, 3
-	adds r1, r0
-	adds r2, r1, 0
-	adds r2, 0x20
-	ldrb r1, [r2]
-	movs r4, 0x3
-	str r4, [sp, 0x1C]
-	adds r4, r0, 0
-	cmp r1, 0x3
-	bhi _0803867C
-	adds r2, r1, 0
-	str r2, [sp, 0x1C]
-	b _0803867C
-	.pool
-_08038668:
-	ldr r1, =gTrainers
-	ldr r2, [sp, 0x20]
-	ldr r3, [sp, 0x14]
-	adds r0, r2, r3
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0x20
-	ldrb r0, [r0]
-	str r0, [sp, 0x1C]
-	adds r4, r1, 0
-_0803867C:
-	movs r0, 0
-	str r0, [sp, 0x18]
-	b _080389B4
-	.pool
-_08038688:
-	ldr r2, [sp, 0x20]
-	ldr r3, [sp, 0x14]
-	adds r0, r2, r3
-	lsls r0, 3
-	adds r1, r0, r4
-	ldrb r0, [r1, 0x18]
-	cmp r0, 0x1
-	bne _0803869E
-	movs r0, 0x80
-	mov r10, r0
-	b _080386B0
-_0803869E:
-	ldrb r1, [r1, 0x2]
-	movs r0, 0x80
-	ands r0, r1
-	movs r1, 0x88
-	mov r10, r1
-	cmp r0, 0
-	beq _080386B0
-	movs r2, 0x78
-	mov r10, r2
-_080386B0:
-	movs r6, 0
-	ldr r2, [sp, 0x20]
-	ldr r3, [sp, 0x14]
-	adds r0, r2, r3
-	lsls r0, 3
-	adds r1, r4, 0x4
-	adds r0, r1
-	ldrb r0, [r0]
-	ldr r3, [sp, 0x18]
-	adds r3, 0x1
-	str r3, [sp, 0x24]
-	cmp r0, 0xFF
-	beq _080386E6
-	adds r3, r1, 0
-_080386CC:
-	ldr r0, [sp, 0x14]
-	adds r1, r2, r0
-	lsls r1, 3
-	adds r0, r6, r1
-	adds r0, r3
-	ldrb r0, [r0]
-	add r9, r0
-	adds r6, 0x1
-	adds r1, r6, r1
-	adds r1, r3
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	bne _080386CC
-_080386E6:
-	ldr r1, [sp, 0x20]
-	ldr r2, [sp, 0x14]
-	adds r0, r1, r2
-	lsls r1, r0, 3
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _08038794
-	cmp r0, 0x1
-	bgt _08038700
-	cmp r0, 0
-	beq _0803870E
-	b _080389AC
-_08038700:
-	cmp r0, 0x2
-	bne _08038706
-	b _08038854
-_08038706:
-	cmp r0, 0x3
-	bne _0803870C
-	b _080388E8
-_0803870C:
-	b _080389AC
-_0803870E:
-	adds r0, r4, 0
-	adds r0, 0x24
-	adds r0, r1, r0
-	ldr r4, [r0]
-	movs r6, 0
-	ldr r3, [sp, 0x18]
-	lsls r2, r3, 3
-	adds r0, r2, r4
-	ldrh r1, [r0, 0x4]
-	movs r0, 0xB
-	muls r0, r1
-	ldr r1, =gSpeciesNames
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r5, r2, 0
-	cmp r0, 0xFF
-	beq _08038750
-	adds r3, r1, 0
-	movs r7, 0xB
-_08038734:
-	adds r0, r2, r4
-	ldrh r0, [r0, 0x4]
-	adds r1, r0, 0
-	muls r1, r7
-	adds r0, r6, r1
-	adds r0, r3
-	ldrb r0, [r0]
-	add r9, r0
-	adds r6, 0x1
-	adds r1, r6, r1
-	adds r1, r3
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	bne _08038734
-_08038750:
-	mov r2, r9
-	lsls r0, r2, 8
-	add r10, r0
-	adds r4, r5, r4
-	ldrh r1, [r4]
-	lsls r0, r1, 5
-	subs r0, r1
-	movs r1, 0xFF
-	bl __divsi3
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r3, [sp, 0x18]
-	movs r1, 0x64
-	adds r0, r3, 0
-	muls r0, r1
-	ldr r2, [sp, 0x10]
-	adds r0, r2, r0
-	ldrh r1, [r4, 0x4]
-	ldrb r2, [r4, 0x2]
-	movs r3, 0x1
-	str r3, [sp]
-	mov r3, r10
-	str r3, [sp, 0x4]
-	movs r3, 0x2
-	str r3, [sp, 0x8]
-	movs r3, 0
-	str r3, [sp, 0xC]
-	adds r3, r6, 0
-	bl CreateMon
-	b _080389AC
-	.pool
-_08038794:
-	adds r0, r4, 0
-	adds r0, 0x24
-	adds r0, r1, r0
-	ldr r7, [r0]
-	movs r6, 0
-	ldr r4, [sp, 0x18]
-	lsls r2, r4, 4
-	adds r0, r2, r7
-	ldrh r1, [r0, 0x4]
-	movs r0, 0xB
-	muls r0, r1
-	ldr r1, =gSpeciesNames
-	adds r0, r1
-	ldrb r0, [r0]
-	mov r8, r2
-	cmp r0, 0xFF
-	beq _080387D6
-	adds r3, r1, 0
-	movs r4, 0xB
-_080387BA:
-	adds r0, r2, r7
-	ldrh r0, [r0, 0x4]
-	adds r1, r0, 0
-	muls r1, r4
-	adds r0, r6, r1
-	adds r0, r3
-	ldrb r0, [r0]
-	add r9, r0
-	adds r6, 0x1
-	adds r1, r6, r1
-	adds r1, r3
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	bne _080387BA
-_080387D6:
-	mov r2, r9
-	lsls r0, r2, 8
-	add r10, r0
-	mov r3, r8
-	adds r4, r3, r7
-	ldrh r1, [r4]
-	lsls r0, r1, 5
-	subs r0, r1
-	movs r1, 0xFF
-	bl __divsi3
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r0, [sp, 0x18]
-	movs r1, 0x64
-	adds r5, r0, 0
-	muls r5, r1
-	ldr r2, [sp, 0x10]
-	adds r5, r2, r5
-	ldrh r1, [r4, 0x4]
-	ldrb r2, [r4, 0x2]
-	movs r0, 0x1
-	str r0, [sp]
-	mov r3, r10
-	str r3, [sp, 0x4]
-	movs r0, 0x2
-	str r0, [sp, 0x8]
-	movs r0, 0
-	str r0, [sp, 0xC]
-	adds r0, r5, 0
-	adds r3, r6, 0
-	bl CreateMon
-	movs r6, 0
-	mov r0, r8
-	adds r0, 0x6
-	adds r4, r7, r0
-_08038820:
-	adds r1, r6, 0
-	adds r1, 0xD
-	adds r0, r5, 0
-	adds r2, r4, 0
-	bl SetMonData
-	adds r1, r6, 0
-	adds r1, 0x11
-	ldrh r0, [r4]
-	lsls r2, r0, 1
-	adds r2, r0
-	lsls r2, 2
-	ldr r0, =gBattleMoves + 0x4 @ PP offset
-	adds r2, r0
-	adds r0, r5, 0
-	bl SetMonData
-	adds r4, 0x2
-	adds r6, 0x1
-	cmp r6, 0x3
-	ble _08038820
-	b _080389AC
-	.pool
-_08038854:
-	adds r0, r4, 0
-	adds r0, 0x24
-	adds r0, r1, r0
-	ldr r4, [r0]
-	movs r6, 0
-	ldr r0, [sp, 0x18]
-	lsls r2, r0, 3
-	adds r0, r2, r4
-	ldrh r1, [r0, 0x4]
-	movs r0, 0xB
-	muls r0, r1
-	ldr r1, =gSpeciesNames
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r5, r2, 0
-	cmp r0, 0xFF
-	beq _08038896
-	adds r3, r1, 0
-	movs r7, 0xB
-_0803887A:
-	adds r0, r2, r4
-	ldrh r0, [r0, 0x4]
-	adds r1, r0, 0
-	muls r1, r7
-	adds r0, r6, r1
-	adds r0, r3
-	ldrb r0, [r0]
-	add r9, r0
-	adds r6, 0x1
-	adds r1, r6, r1
-	adds r1, r3
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	bne _0803887A
-_08038896:
-	mov r2, r9
-	lsls r0, r2, 8
-	add r10, r0
-	adds r5, r4
-	ldrh r1, [r5]
-	lsls r0, r1, 5
-	subs r0, r1
-	movs r1, 0xFF
-	bl __divsi3
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r3, [sp, 0x18]
-	movs r0, 0x64
-	adds r4, r3, 0
-	muls r4, r0
-	ldr r1, [sp, 0x10]
-	adds r4, r1, r4
-	ldrh r1, [r5, 0x4]
-	ldrb r2, [r5, 0x2]
-	movs r0, 0x1
-	str r0, [sp]
-	mov r3, r10
-	str r3, [sp, 0x4]
-	movs r0, 0x2
-	str r0, [sp, 0x8]
-	movs r0, 0
-	str r0, [sp, 0xC]
-	adds r0, r4, 0
-	adds r3, r6, 0
-	bl CreateMon
-	adds r5, 0x6
-	adds r0, r4, 0
-	movs r1, 0xC
-	adds r2, r5, 0
-	bl SetMonData
-	b _080389AC
-	.pool
-_080388E8:
-	adds r0, r4, 0
-	adds r0, 0x24
-	adds r0, r1, r0
-	ldr r7, [r0]
-	movs r6, 0
-	ldr r4, [sp, 0x18]
-	lsls r2, r4, 4
-	adds r0, r2, r7
-	ldrh r1, [r0, 0x4]
-	movs r0, 0xB
-	muls r0, r1
-	ldr r1, =gSpeciesNames
-	adds r0, r1
-	ldrb r0, [r0]
-	mov r8, r2
-	cmp r0, 0xFF
-	beq _0803892A
-	adds r3, r1, 0
-	movs r4, 0xB
-_0803890E:
-	adds r0, r2, r7
-	ldrh r0, [r0, 0x4]
-	adds r1, r0, 0
-	muls r1, r4
-	adds r0, r6, r1
-	adds r0, r3
-	ldrb r0, [r0]
-	add r9, r0
-	adds r6, 0x1
-	adds r1, r6, r1
-	adds r1, r3
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	bne _0803890E
-_0803892A:
-	mov r2, r9
-	lsls r0, r2, 8
-	add r10, r0
-	mov r3, r8
-	adds r5, r3, r7
-	ldrh r1, [r5]
-	lsls r0, r1, 5
-	subs r0, r1
-	movs r1, 0xFF
-	bl __divsi3
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r0, [sp, 0x18]
-	movs r1, 0x64
-	adds r4, r0, 0
-	muls r4, r1
-	ldr r2, [sp, 0x10]
-	adds r4, r2, r4
-	ldrh r1, [r5, 0x4]
-	ldrb r2, [r5, 0x2]
-	movs r0, 0x1
-	str r0, [sp]
-	mov r3, r10
-	str r3, [sp, 0x4]
-	movs r0, 0x2
-	str r0, [sp, 0x8]
-	movs r0, 0
-	str r0, [sp, 0xC]
-	adds r0, r4, 0
-	adds r3, r6, 0
-	bl CreateMon
-	adds r5, 0x6
-	adds r0, r4, 0
-	movs r1, 0xC
-	adds r2, r5, 0
-	bl SetMonData
-	movs r6, 0
-	adds r5, r4, 0
-	mov r0, r8
-	adds r0, 0x8
-	adds r4, r7, r0
-_08038982:
-	adds r1, r6, 0
-	adds r1, 0xD
-	adds r0, r5, 0
-	adds r2, r4, 0
-	bl SetMonData
-	adds r1, r6, 0
-	adds r1, 0x11
-	ldrh r0, [r4]
-	lsls r2, r0, 1
-	adds r2, r0
-	lsls r2, 2
-	ldr r0, =gBattleMoves + 0x4 @ PP offset
-	adds r2, r0
-	adds r0, r5, 0
-	bl SetMonData
-	adds r4, 0x2
-	adds r6, 0x1
-	cmp r6, 0x3
-	ble _08038982
-_080389AC:
-	ldr r4, [sp, 0x24]
-	str r4, [sp, 0x18]
-	ldr r4, =gTrainers
-	ldr r0, [sp, 0x18]
-_080389B4:
-	ldr r1, [sp, 0x1C]
-	cmp r0, r1
-	bge _080389BC
-	b _08038688
-_080389BC:
-	ldr r2, =gBattleTypeFlags
-	ldr r1, =gTrainers
-	ldr r3, [sp, 0x20]
-	ldr r4, [sp, 0x14]
-	adds r0, r3, r4
-	lsls r0, 3
-	adds r0, r1
-	ldrb r1, [r0, 0x18]
-	ldr r0, [r2]
-	orrs r0, r1
-	str r0, [r2]
-_080389D2:
-	ldr r0, =gTrainers
-	ldr r2, [sp, 0x20]
-	ldr r3, [sp, 0x14]
-	adds r1, r2, r3
-	lsls r1, 3
-	adds r1, r0
-	adds r1, 0x20
-	ldrb r0, [r1]
-_080389E2:
-	add sp, 0x28
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end CreateNPCTrainerParty
-
-	thumb_func_start sub_8038A04
-sub_8038A04: @ 8038A04
-	push {lr}
-	ldr r0, =0x04000006
-	ldrh r0, [r0]
-	subs r0, 0x6F
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x30
-	bhi _08038A1E
-	movs r1, 0x98
-	lsls r1, 8
-	movs r0, 0x8
-	bl SetGpuReg
-_08038A1E:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8038A04
-
-	thumb_func_start VBlankCB_Battle
-VBlankCB_Battle: @ 8038A28
-	push {lr}
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	ldr r1, =0x013f0102
-	ands r0, r1
-	cmp r0, 0
-	bne _08038A3A
-	bl Random
-_08038A3A:
-	ldr r0, =gBattle_BG0_X
-	ldrh r1, [r0]
-	movs r0, 0x10
-	bl SetGpuReg
-	ldr r0, =gBattle_BG0_Y
-	ldrh r1, [r0]
-	movs r0, 0x12
-	bl SetGpuReg
-	ldr r0, =gBattle_BG1_X
-	ldrh r1, [r0]
-	movs r0, 0x14
-	bl SetGpuReg
-	ldr r0, =gBattle_BG1_Y
-	ldrh r1, [r0]
-	movs r0, 0x16
-	bl SetGpuReg
-	ldr r0, =gBattle_BG2_X
-	ldrh r1, [r0]
-	movs r0, 0x18
-	bl SetGpuReg
-	ldr r0, =gBattle_BG2_Y
-	ldrh r1, [r0]
-	movs r0, 0x1A
-	bl SetGpuReg
-	ldr r0, =gBattle_BG3_X
-	ldrh r1, [r0]
-	movs r0, 0x1C
-	bl SetGpuReg
-	ldr r0, =gBattle_BG3_Y
-	ldrh r1, [r0]
-	movs r0, 0x1E
-	bl SetGpuReg
-	ldr r0, =gBattle_WIN0H
-	ldrh r1, [r0]
-	movs r0, 0x40
-	bl SetGpuReg
-	ldr r0, =gBattle_WIN0V
-	ldrh r1, [r0]
-	movs r0, 0x44
-	bl SetGpuReg
-	ldr r0, =gBattle_WIN1H
-	ldrh r1, [r0]
-	movs r0, 0x42
-	bl SetGpuReg
-	ldr r0, =gBattle_WIN1V
-	ldrh r1, [r0]
-	movs r0, 0x46
-	bl SetGpuReg
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	bl sub_80BA0A8
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end VBlankCB_Battle
-
-	thumb_func_start nullsub_17
-nullsub_17: @ 8038B00
-	bx lr
-	thumb_func_end nullsub_17
-
-	thumb_func_start sub_8038B04
-sub_8038B04: @ 8038B04
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	beq _08038B24
-	movs r1, 0x32
-	ldrsh r0, [r5, r1]
-	movs r1, 0xFF
-	lsls r1, 8
-	ands r0, r1
-	lsrs r0, 8
-	ldrh r1, [r5, 0x30]
-	adds r0, r1
-	strh r0, [r5, 0x20]
-	b _08038B36
-_08038B24:
-	movs r1, 0x32
-	ldrsh r0, [r5, r1]
-	movs r1, 0xFF
-	lsls r1, 8
-	ands r0, r1
-	asrs r0, 8
-	ldrh r1, [r5, 0x30]
-	subs r1, r0
-	strh r1, [r5, 0x20]
-_08038B36:
-	movs r1, 0xC0
-	lsls r1, 1
-	adds r0, r1, 0
-	ldrh r1, [r5, 0x32]
-	adds r0, r1
-	strh r0, [r5, 0x32]
-	adds r0, r5, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _08038B6A
-	ldr r4, =0x00002710
-	adds r0, r4, 0
-	bl FreeSpriteTilesByTag
-	adds r0, r4, 0
-	bl FreeSpritePaletteByTag
-	adds r0, r5, 0
-	bl FreeSpriteOamMatrix
-	adds r0, r5, 0
-	bl DestroySprite
-_08038B6A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8038B04
-
-	thumb_func_start sub_8038B74
-sub_8038B74: @ 8038B74
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x1
-	bl StartSpriteAffineAnim
-	ldr r0, =sub_8038B04
-	str r0, [r4, 0x1C]
-	movs r0, 0x68
-	bl PlaySE
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8038B74
-
-	thumb_func_start sub_8038B94
-sub_8038B94: @ 8038B94
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x10
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp]
-	movs r0, 0
-	str r0, [sp, 0x4]
-	movs r1, 0
-	str r1, [sp, 0x8]
-	ldr r0, =gBattleScripting
-	adds r0, 0x25
-	ldrb r2, [r0]
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08038C04
-	ldr r1, =gLinkPlayers
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	adds r0, r1
-	ldrh r0, [r0, 0x18]
-	cmp r0, 0x1
-	beq _08038BF0
-	cmp r0, 0x1
-	bgt _08038BE8
-	cmp r0, 0
-	beq _08038C04
-	b _08038C0C
-	.pool
-_08038BE8:
-	cmp r0, 0x2
-	beq _08038C04
-	cmp r0, 0x3
-	bne _08038C0C
-_08038BF0:
-	ldr r0, =gEnemyParty
-	str r0, [sp, 0x4]
-	ldr r1, =gPlayerParty
-	str r1, [sp, 0x8]
-	b _08038C0C
-	.pool
-_08038C04:
-	ldr r2, =gPlayerParty
-	str r2, [sp, 0x4]
-	ldr r3, =gEnemyParty
-	str r3, [sp, 0x8]
-_08038C0C:
-	movs r7, 0
-	movs r0, 0
-	mov r8, r0
-	ldr r1, [sp]
-	lsls r1, 2
-	str r1, [sp, 0xC]
-	movs r2, 0xCE
-	lsls r2, 1
-	mov r10, r2
-	mov r9, r0
-_08038C20:
-	movs r0, 0x64
-	mov r4, r8
-	muls r4, r0
-	ldr r3, [sp, 0x4]
-	adds r4, r3, r4
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	lsls r0, 16
-	lsrs r5, r0, 16
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	lsls r0, 16
-	lsrs r6, r0, 16
-	adds r0, r4, 0
-	movs r1, 0x37
-	bl GetMonData
-	adds r1, r0, 0
-	cmp r5, 0
-	beq _08038C90
-	cmp r5, r10
-	beq _08038C64
-	cmp r6, 0
-	beq _08038C64
-	cmp r1, 0
-	bne _08038C64
-	movs r0, 0x1
-	mov r2, r9
-	lsls r0, r2
-	orrs r7, r0
-_08038C64:
-	cmp r5, 0
-	beq _08038C90
-	cmp r6, 0
-	beq _08038C7C
-	cmp r5, r10
-	beq _08038C74
-	cmp r1, 0
-	beq _08038C7C
-_08038C74:
-	movs r0, 0x2
-	mov r3, r9
-	lsls r0, r3
-	orrs r7, r0
-_08038C7C:
-	cmp r5, 0
-	beq _08038C90
-	cmp r5, r10
-	beq _08038C90
-	cmp r6, 0
-	bne _08038C90
-	movs r0, 0x3
-	mov r1, r9
-	lsls r0, r1
-	orrs r7, r0
-_08038C90:
-	movs r2, 0x2
-	add r9, r2
-	movs r3, 0x1
-	add r8, r3
-	mov r0, r8
-	cmp r0, 0x5
-	ble _08038C20
-	ldr r1, =gTasks
-	ldr r2, [sp, 0xC]
-	ldr r3, [sp]
-	adds r0, r2, r3
-	lsls r0, 3
-	adds r0, r1
-	strh r7, [r0, 0xE]
-	movs r7, 0
-	movs r0, 0
-	mov r8, r0
-	movs r1, 0xCE
-	lsls r1, 1
-	mov r10, r1
-	mov r9, r0
-_08038CBA:
-	movs r0, 0x64
-	mov r4, r8
-	muls r4, r0
-	ldr r2, [sp, 0x8]
-	adds r4, r2, r4
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	lsls r0, 16
-	lsrs r5, r0, 16
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	lsls r0, 16
-	lsrs r6, r0, 16
-	adds r0, r4, 0
-	movs r1, 0x37
-	bl GetMonData
-	adds r1, r0, 0
-	cmp r5, 0
-	beq _08038D2A
-	cmp r5, r10
-	beq _08038CFE
-	cmp r6, 0
-	beq _08038CFE
-	cmp r1, 0
-	bne _08038CFE
-	movs r0, 0x1
-	mov r3, r9
-	lsls r0, r3
-	orrs r7, r0
-_08038CFE:
-	cmp r5, 0
-	beq _08038D2A
-	cmp r6, 0
-	beq _08038D16
-	cmp r5, r10
-	beq _08038D0E
-	cmp r1, 0
-	beq _08038D16
-_08038D0E:
-	movs r0, 0x2
-	mov r1, r9
-	lsls r0, r1
-	orrs r7, r0
-_08038D16:
-	cmp r5, 0
-	beq _08038D2A
-	cmp r5, r10
-	beq _08038D2A
-	cmp r6, 0
-	bne _08038D2A
-	movs r0, 0x3
-	mov r2, r9
-	lsls r0, r2
-	orrs r7, r0
-_08038D2A:
-	movs r3, 0x2
-	add r9, r3
-	movs r0, 0x1
-	add r8, r0
-	mov r1, r8
-	cmp r1, 0x5
-	ble _08038CBA
-	ldr r1, =gTasks
-	ldr r2, [sp, 0xC]
-	ldr r3, [sp]
-	adds r0, r2, r3
-	lsls r0, 3
-	adds r0, r1
-	strh r7, [r0, 0x10]
-	add sp, 0x10
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8038B94
-
-	thumb_func_start sub_8038D64
-sub_8038D64: @ 8038D64
-	push {r4,lr}
-	sub sp, 0x4
-	movs r0, 0
-	bl SetHBlankCallback
-	movs r0, 0
-	bl SetVBlankCallback
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r2, 0x21
-	negs r2, r2
-	ands r1, r2
-	str r1, [r0]
-	ldr r0, =0x003f0100
-	ands r0, r1
-	cmp r0, 0
-	beq _08038DAC
-	ldr r0, =gMain
-	ldr r0, [r0, 0x8]
-	bl SetMainCallback2
-	bl sub_8057028
-	bl dp11_free
-	bl sub_805F094
-	b _08038EB6
-	.pool
-_08038DAC:
-	str r0, [sp]
-	movs r1, 0xC0
-	lsls r1, 19
-	ldr r2, =0x05006000
-	mov r0, sp
-	bl CpuSet
-	movs r0, 0x4C
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x40
-	movs r1, 0xF0
-	bl SetGpuReg
-	ldr r4, =0x00005051
-	movs r0, 0x44
-	adds r1, r4, 0
-	bl SetGpuReg
-	movs r0, 0x48
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x4A
-	movs r1, 0
-	bl SetGpuReg
-	ldr r1, =gBattle_WIN0H
-	movs r0, 0xF0
-	strh r0, [r1]
-	ldr r0, =gBattle_WIN0V
-	strh r4, [r0]
-	bl dp12_8087EA4
-	ldr r0, =gUnknown_02038C28
-	movs r3, 0xF0
-	movs r1, 0xF0
-	lsls r1, 3
-	adds r2, r0, r1
-	movs r1, 0x4F
-_08038DFE:
-	strh r3, [r0]
-	strh r3, [r2]
-	adds r2, 0x2
-	adds r0, 0x2
-	subs r1, 0x1
-	cmp r1, 0
-	bge _08038DFE
-	movs r1, 0x50
-	ldr r0, =gUnknown_02038C28
-	ldr r3, =0x0000ff10
-	movs r4, 0x82
-	lsls r4, 4
-	adds r2, r0, r4
-	adds r0, 0xA0
-_08038E1A:
-	strh r3, [r0]
-	strh r3, [r2]
-	adds r2, 0x2
-	adds r0, 0x2
-	adds r1, 0x1
-	cmp r1, 0x9F
-	ble _08038E1A
-	bl ResetPaletteFade
-	ldr r0, =gBattle_BG0_X
-	movs r4, 0
-	strh r4, [r0]
-	ldr r0, =gBattle_BG0_Y
-	strh r4, [r0]
-	ldr r0, =gBattle_BG1_X
-	strh r4, [r0]
-	ldr r0, =gBattle_BG1_Y
-	strh r4, [r0]
-	ldr r0, =gBattle_BG2_X
-	strh r4, [r0]
-	ldr r0, =gBattle_BG2_Y
-	strh r4, [r0]
-	ldr r0, =gBattle_BG3_X
-	strh r4, [r0]
-	ldr r0, =gBattle_BG3_Y
-	strh r4, [r0]
-	bl c2_berry_program_update_menu
-	ldr r0, =gUnknown_08C004E0
-	movs r1, 0
-	movs r2, 0x40
-	bl LoadCompressedPalette
-	bl sub_803570C
-	bl ResetSpriteData
-	bl ResetTasks
-	bl LoadBattleEntryBackground
-	movs r0, 0x4A
-	movs r1, 0x37
-	bl SetGpuReg
-	bl FreeAllSpritePalettes
-	ldr r1, =gReservedSpritePaletteCount
-	movs r0, 0x4
-	strb r0, [r1]
-	ldr r0, =VBlankCB_Battle
-	bl SetVBlankCallback
-	ldr r0, =task00_0800F6FC
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r2, 0x87
-	lsls r2, 1
-	strh r2, [r1, 0xA]
-	movs r2, 0x5A
-	strh r2, [r1, 0xC]
-	movs r2, 0x1
-	strh r2, [r1, 0x12]
-	bl sub_8038B94
-	ldr r0, =sub_8038F14
-	bl SetMainCallback2
-	ldr r0, =gBattleCommunication
-	strb r4, [r0]
-_08038EB6:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8038D64
-
-	thumb_func_start sub_8038F14
-sub_8038F14: @ 8038F14
-	push {lr}
-	bl sub_8038F34
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl RunTextPrinters
-	bl UpdatePaletteFade
-	bl RunTasks
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8038F14
-
-	thumb_func_start sub_8038F34
-sub_8038F34: @ 8038F34
-	push {r4-r6,lr}
-	sub sp, 0x8
-	ldr r0, =gBattleCommunication
-	ldrb r1, [r0]
-	adds r4, r0, 0
-	cmp r1, 0x9
-	bls _08038F44
-	b _080391C6
-_08038F44:
-	lsls r0, r1, 2
-	ldr r1, =_08038F58
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_08038F58:
-	.4byte _08038F80
-	.4byte _08038FA0
-	.4byte _08038FC2
-	.4byte _080390C8
-	.4byte _08039100
-	.4byte _08039118
-	.4byte _0803912C
-	.4byte _0803914C
-	.4byte _08039166
-	.4byte _08039184
-_08038F80:
-	movs r0, 0
-	bl ShowBg
-	movs r0, 0x1
-	bl ShowBg
-	movs r0, 0x2
-	bl ShowBg
-	ldr r1, =gBattleCommunication
-	movs r0, 0xFF
-	strb r0, [r1, 0x1]
-	b _08039174
-	.pool
-_08038FA0:
-	ldrb r0, [r4, 0x1]
-	subs r0, 0x1
-	strb r0, [r4, 0x1]
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	beq _08038FB0
-	b _080391C6
-_08038FB0:
-	movs r0, 0x1
-	negs r0, r0
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	b _0803910C
-_08038FC2:
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08038FD0
-	b _080391C6
-_08038FD0:
-	bl sub_8185FAC
-	ldr r2, =gMain
-	ldr r1, =0x00000439
-	adds r2, r1
-	movs r1, 0x1
-	ands r1, r0
-	lsls r1, 2
-	ldrb r3, [r2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x40
-	ands r0, r1
-	movs r3, 0x2
-	cmp r0, 0
-	beq _08038FFC
-	movs r3, 0x4
-_08038FFC:
-	movs r4, 0
-	ldr r6, =gSaveBlock2Ptr
-	cmp r4, r3
-	bge _08039022
-	ldr r1, =gLinkPlayers
-	ldrb r0, [r1]
-	cmp r0, 0x3
-	bne _08039022
-	movs r5, 0xFF
-	adds r2, r1, 0
-_08039010:
-	adds r2, 0x1C
-	adds r4, 0x1
-	cmp r4, r3
-	bge _08039022
-	ldrh r1, [r2]
-	adds r0, r5, 0
-	ands r0, r1
-	cmp r0, 0x3
-	beq _08039010
-_08039022:
-	ldr r0, [r6]
-	ldr r1, =0x00000ca9
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	bne _080390AC
-	cmp r4, r3
-	bne _080390AC
-	ldr r0, =0x000008d2
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _08039074
-	bl FreeAllWindowBuffers
-	ldr r0, =sub_80392A8
-	bl SetMainCallback2
-	b _080391C6
-	.pool
-_08039074:
-	ldr r2, =gMain
-	ldr r1, =0x00000439
-	adds r0, r2, r1
-	ldrb r1, [r0]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	bne _08039090
-	ldr r0, [r2, 0x8]
-	b _080390B0
-	.pool
-_08039090:
-	ldr r0, =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08039172
-	ldr r0, =sub_80B3AF8
-	movs r1, 0x5
-	bl CreateTask
-	b _08039172
-	.pool
-_080390AC:
-	ldr r0, =gMain
-	ldr r0, [r0, 0x8]
-_080390B0:
-	bl SetMainCallback2
-	bl sub_8057028
-	bl dp11_free
-	bl sub_805F094
-	b _080391C6
-	.pool
-_080390C8:
-	movs r0, 0
-	str r0, [sp, 0x4]
-	movs r1, 0xC0
-	lsls r1, 19
-	ldr r2, =0x05006000
-	add r0, sp, 0x4
-	bl CpuSet
-	movs r4, 0
-_080390DA:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl sub_80363C4
-	adds r4, 0x1
-	cmp r4, 0x1
-	ble _080390DA
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	b _08039172
-	.pool
-_08039100:
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _080391C6
-_0803910C:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	b _080391C6
-	.pool
-_08039118:
-	ldr r0, =sub_80B3AF8
-	bl FuncIsActiveTask
-	lsls r0, 24
-	cmp r0, 0
-	bne _080391C6
-	b _08039172
-	.pool
-_0803912C:
-	bl sub_800A520
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080391C6
-	bl sub_800ADF8
-	ldr r0, =gUnknown_0824978D
-	movs r1, 0
-	bl sub_814F9EC
-	b _08039172
-	.pool
-_0803914C:
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	cmp r0, 0
-	bne _080391C6
-	bl sub_800A520
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080391C6
-	b _08039172
-_08039166:
-	ldr r0, =gLinkVSyncDisabled
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08039172
-	bl sub_800AC34
-_08039172:
-	ldr r1, =gBattleCommunication
-_08039174:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _080391C6
-	.pool
-_08039184:
-	ldr r2, =gMain
-	ldr r1, =0x00000439
-	adds r0, r2, r1
-	ldrb r1, [r0]
-	movs r0, 0x4
-	ands r0, r1
-	adds r3, r2, 0
-	cmp r0, 0
-	beq _080391A6
-	ldr r0, =gLinkVSyncDisabled
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080391A6
-	ldr r0, =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _080391C6
-_080391A6:
-	ldr r0, =0x00000439
-	adds r2, r3, r0
-	ldrb r1, [r2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-	ldr r0, [r3, 0x8]
-	bl SetMainCallback2
-	bl sub_8057028
-	bl dp11_free
-	bl sub_805F094
-_080391C6:
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8038F34
-
-	thumb_func_start sub_80391E0
-sub_80391E0: @ 80391E0
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	movs r0, 0
-	cmp r1, 0x6
-	bhi _080392A0
-	lsls r0, r1, 2
-	ldr r1, =_08039200
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_08039200:
-	.4byte _0803921C
-	.4byte _08039230
-	.4byte _08039244
-	.4byte _08039258
-	.4byte _0803926C
-	.4byte _08039280
-	.4byte _08039294
-_0803921C:
-	ldr r0, =gUnknown_0831AA08
-	lsls r1, r2, 2
-	adds r1, r0
-	ldrb r0, [r1]
-	lsls r0, 30
-	lsrs r0, 30
-	b _080392A0
-	.pool
-_08039230:
-	ldr r0, =gUnknown_0831AA08
-	lsls r1, r2, 2
-	adds r1, r0
-	ldrb r0, [r1]
-	lsls r0, 28
-	lsrs r0, 30
-	b _080392A0
-	.pool
-_08039244:
-	ldr r0, =gUnknown_0831AA08
-	lsls r1, r2, 2
-	adds r1, r0
-	ldrh r0, [r1]
-	lsls r0, 23
-	lsrs r0, 27
-	b _080392A0
-	.pool
-_08039258:
-	ldr r0, =gUnknown_0831AA08
-	lsls r1, r2, 2
-	adds r1, r0
-	ldrb r0, [r1, 0x1]
-	lsls r0, 29
-	lsrs r0, 30
-	b _080392A0
-	.pool
-_0803926C:
-	ldr r0, =gUnknown_0831AA08
-	lsls r1, r2, 2
-	adds r1, r0
-	ldrb r0, [r1, 0x1]
-	lsls r0, 28
-	lsrs r0, 31
-	b _080392A0
-	.pool
-_08039280:
-	ldr r0, =gUnknown_0831AA08
-	lsls r1, r2, 2
-	adds r1, r0
-	ldrb r0, [r1, 0x1]
-	lsls r0, 26
-	lsrs r0, 30
-	b _080392A0
-	.pool
-_08039294:
-	ldr r0, =gUnknown_0831AA08
-	lsls r1, r2, 2
-	adds r1, r0
-	ldr r0, [r1]
-	lsls r0, 8
-	lsrs r0, 22
-_080392A0:
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80391E0
-
-	thumb_func_start sub_80392A8
-sub_80392A8: @ 80392A8
-	push {r4,lr}
-	sub sp, 0x8
-	movs r0, 0
-	bl SetHBlankCallback
-	movs r0, 0
-	bl SetVBlankCallback
-	movs r4, 0
-	str r4, [sp, 0x4]
-	movs r1, 0xC0
-	lsls r1, 19
-	ldr r2, =0x05006000
-	add r0, sp, 0x4
-	bl CpuSet
-	bl ResetPaletteFade
-	ldr r0, =gBattle_BG0_X
-	strh r4, [r0]
-	ldr r0, =gBattle_BG0_Y
-	strh r4, [r0]
-	ldr r0, =gBattle_BG1_X
-	strh r4, [r0]
-	ldr r0, =gBattle_BG1_Y
-	strh r4, [r0]
-	ldr r0, =gBattle_BG2_X
-	strh r4, [r0]
-	ldr r0, =gBattle_BG2_Y
-	strh r4, [r0]
-	ldr r0, =gBattle_BG3_X
-	strh r4, [r0]
-	ldr r0, =gBattle_BG3_Y
-	strh r4, [r0]
-	bl c2_berry_program_update_menu
-	movs r1, 0x82
-	lsls r1, 5
-	movs r0, 0
-	bl SetGpuReg
-	bl sub_803570C
-_080392FE:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl sub_80363C4
-	adds r4, 0x1
-	cmp r4, 0x1
-	ble _080392FE
-	bl ResetSpriteData
-	bl ResetTasks
-	bl FreeAllSpritePalettes
-	ldr r1, =gReservedSpritePaletteCount
-	movs r0, 0x4
-	strb r0, [r1]
-	ldr r0, =VBlankCB_Battle
-	bl SetVBlankCallback
-	ldr r0, =sub_803937C
-	bl SetMainCallback2
-	movs r0, 0x1
-	negs r0, r0
-	movs r4, 0
-	str r4, [sp]
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r0, =gBattleCommunication
-	strb r4, [r0]
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80392A8
-
-	thumb_func_start sub_803937C
-sub_803937C: @ 803937C
-	push {lr}
-	bl sub_803939C
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl RunTextPrinters
-	bl UpdatePaletteFade
-	bl RunTasks
-	pop {r0}
-	bx r0
-	thumb_func_end sub_803937C
-
-	thumb_func_start sub_803939C
-sub_803939C: @ 803939C
-	push {r4,r5,lr}
-	sub sp, 0x4
-	ldr r0, =gBattleCommunication
-	ldrb r1, [r0]
-	adds r4, r0, 0
-	cmp r1, 0xC
-	bls _080393AC
-	b _0803975E
-_080393AC:
-	lsls r0, r1, 2
-	ldr r1, =_080393C0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_080393C0:
-	.4byte _080393F4
-	.4byte _08039414
-	.4byte _08039450
-	.4byte _08039470
-	.4byte _0803949C
-	.4byte _080394D8
-	.4byte _0803957C
-	.4byte _08039704
-	.4byte _080395CC
-	.4byte _08039610
-	.4byte _08039678
-	.4byte _080396A8
-	.4byte _08039704
-_080393F4:
-	movs r0, 0
-	bl ShowBg
-	movs r0, 0x1
-	bl ShowBg
-	movs r0, 0x2
-	bl ShowBg
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0803975C
-	.pool
-_08039414:
-	ldr r0, =gMain
-	ldr r1, =0x00000439
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _08039434
-	ldr r0, =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08039434
-	ldr r0, =sub_80B3AF8
-	movs r1, 0x5
-	bl CreateTask
-_08039434:
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0803975C
-	.pool
-_08039450:
-	ldr r0, =sub_80B3AF8
-	bl FuncIsActiveTask
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803945E
-	b _0803975E
-_0803945E:
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0803975C
-	.pool
-_08039470:
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0803947E
-	b _0803975E
-_0803947E:
-	ldr r0, =gText_RecordBattleToPass
-	movs r1, 0
-	bl sub_814F9EC
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0803975C
-	.pool
-_0803949C:
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0
-	beq _080394AC
-	b _0803975E
-_080394AC:
-	str r0, [sp]
-	movs r0, 0x18
-	movs r1, 0x8
-	movs r2, 0x1D
-	movs r3, 0xD
-	bl sub_8056A3C
-	ldr r0, =gText_BattleYesNoChoice
-	movs r1, 0xC
-	bl sub_814F9EC
-	ldr r4, =gBattleCommunication
-	movs r0, 0x1
-	strb r0, [r4, 0x1]
-	bl BattleCreateCursorAt
-	b _080396EA
-	.pool
-_080394D8:
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08039500
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0
-	bne _080394EC
-	b _0803975E
-_080394EC:
-	movs r0, 0x5
-	bl PlaySE
-	ldrb r0, [r4, 0x1]
-	bl BattleDestroyCursorAt
-	movs r0, 0
-	b _0803951E
-	.pool
-_08039500:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08039526
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0
-	beq _08039510
-	b _0803975E
-_08039510:
-	movs r0, 0x5
-	bl PlaySE
-	ldrb r0, [r4, 0x1]
-	bl BattleDestroyCursorAt
-	movs r0, 0x1
-_0803951E:
-	strb r0, [r4, 0x1]
-	bl BattleCreateCursorAt
-	b _0803975E
-_08039526:
-	movs r5, 0x1
-	adds r0, r5, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08039560
-	movs r0, 0x5
-	bl PlaySE
-	ldr r4, =gBattleCommunication
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0
-	beq _08039540
-	b _080396EA
-_08039540:
-	str r5, [sp]
-	movs r0, 0x18
-	movs r1, 0x8
-	movs r2, 0x1D
-	movs r3, 0xD
-	bl sub_8056A3C
-	bl sub_8185338
-	strb r0, [r4, 0x1]
-	movs r0, 0xA
-	strb r0, [r4]
-	b _0803975E
-	.pool
-_08039560:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	bne _0803956A
-	b _0803975E
-_0803956A:
-	movs r0, 0x5
-	bl PlaySE
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0803975C
-	.pool
-_0803957C:
-	bl sub_800A520
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0803958A
-	b _0803975E
-_0803958A:
-	str r0, [sp]
-	movs r0, 0x18
-	movs r1, 0x8
-	movs r2, 0x1D
-	movs r3, 0xD
-	bl sub_8056A3C
-	ldr r0, =gMain
-	ldr r1, =0x00000439
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _080395B4
-	bl sub_800ADF8
-	ldr r0, =gUnknown_0824978D
-	movs r1, 0
-	bl sub_814F9EC
-_080395B4:
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0803975C
-	.pool
-_080395CC:
-	ldrb r0, [r4, 0x1]
-	subs r0, 0x1
-	strb r0, [r4, 0x1]
-	lsls r0, 24
-	cmp r0, 0
-	beq _080395DA
-	b _0803975E
-_080395DA:
-	ldr r0, =gMain
-	ldr r1, =0x00000439
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _080395F6
-	ldr r0, =gLinkVSyncDisabled
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080395F6
-	bl sub_800AC34
-_080395F6:
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1]
-	adds r0, 0x1
-	b _0803975C
-	.pool
-_08039610:
-	ldr r2, =gMain
-	ldr r1, =0x00000439
-	adds r0, r2, r1
-	ldrb r1, [r0]
-	movs r0, 0x4
-	ands r0, r1
-	adds r3, r2, 0
-	cmp r0, 0
-	beq _08039634
-	ldr r0, =gLinkVSyncDisabled
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08039634
-	ldr r0, =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _08039634
-	b _0803975E
-_08039634:
-	ldr r0, =0x00000439
-	adds r2, r3, r0
-	ldrb r1, [r2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08039650
-	b _0803975E
-_08039650:
-	ldr r0, [r3, 0x8]
-	bl SetMainCallback2
-	bl sub_8057028
-	bl dp11_free
-	bl sub_805F094
-	b _0803975E
-	.pool
-_08039678:
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0x1
-	bne _080396A0
-	movs r0, 0x37
-	bl PlaySE
-	ldr r0, =gText_BattleRecordedOnPass
-_08039686:
-	bl BattleStringExpandPlaceholdersToDisplayedString
-	ldr r0, =gDisplayedStringBattle
-	movs r1, 0
-	bl sub_814F9EC
-	movs r0, 0x80
-	strb r0, [r4, 0x1]
-	b _080396EA
-	.pool
-_080396A0:
-	ldr r0, =gUnknown_08242481
-	b _08039686
-	.pool
-_080396A8:
-	bl sub_800A520
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0803975E
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	cmp r0, 0
-	bne _0803975E
-	ldr r4, =gBattleCommunication
-	ldrb r0, [r4, 0x1]
-	subs r0, 0x1
-	strb r0, [r4, 0x1]
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803975E
-	ldr r0, =gMain
-	ldr r1, =0x00000439
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _080396EA
-	bl sub_800ADF8
-	ldr r0, =gUnknown_0824978D
-	movs r1, 0
-	bl sub_814F9EC
-_080396EA:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	b _0803975E
-	.pool
-_08039704:
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0
-	bne _0803975E
-	ldr r0, =gMain
-	ldr r1, =0x00000439
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x4
-	ands r0, r1
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	beq _08039744
-	bl sub_800A520
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0803975E
-	movs r0, 0x1
-	negs r0, r0
-	str r4, [sp]
-	b _0803974A
-	.pool
-_08039744:
-	movs r0, 0x1
-	negs r0, r0
-	str r1, [sp]
-_0803974A:
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, =gBattleCommunication
-	movs r0, 0x20
-	strb r0, [r1, 0x1]
-	movs r0, 0x8
-_0803975C:
-	strb r0, [r1]
-_0803975E:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803939C
-
-	thumb_func_start shedinja_something
-shedinja_something: @ 803976C
-	push {r4,r5,lr}
-	sub sp, 0x10
-	adds r4, r0, 0
-	add r5, sp, 0xC
-	movs r0, 0x1
-	strb r0, [r5]
-	adds r0, r4, 0
-	movs r1, 0xB
-	bl GetMonData
-	ldr r1, =0x0000012f
-	cmp r0, r1
-	bne _080397B4
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl GetMonData
-	ldrb r1, [r5]
-	cmp r0, r1
-	beq _080397B4
-	adds r0, r4, 0
-	movs r1, 0x2
-	mov r2, sp
-	bl GetMonData
-	ldr r1, =gUnknown_0831ACA0
-	mov r0, sp
-	bl StringCompareWithoutExtCtrlCodes
-	cmp r0, 0
-	bne _080397B4
-	adds r0, r4, 0
-	movs r1, 0x3
-	adds r2, r5, 0
-	bl SetMonData
-_080397B4:
-	add sp, 0x10
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end shedinja_something
-
-	thumb_func_start sub_80397C4
-sub_80397C4: @ 80397C4
-	ldr r2, =gUnknown_0831ABA0
-	lsls r0, 2
-	adds r0, r2
-	ldr r0, [r0]
-	lsls r1, 3
-	adds r1, r0
-	ldrb r0, [r1, 0x3]
-	lsls r0, 3
-	bx lr
-	.pool
-	thumb_func_end sub_80397C4
-
-	thumb_func_start oac_poke_opponent
-oac_poke_opponent: @ 80397DC
-	push {lr}
-	sub sp, 0x4
-	ldr r1, =sub_803980C
-	str r1, [r0, 0x1C]
-	movs r1, 0
-	bl StartSpriteAnimIfDifferent
-	movs r0, 0x80
-	lsls r0, 10
-	ldr r1, =0x00002108
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0xA
-	movs r3, 0xA
-	bl BeginNormalPaletteFade
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end oac_poke_opponent
-
-	thumb_func_start sub_803980C
-sub_803980C: @ 803980C
-	push {lr}
-	adds r2, r0, 0
-	ldr r0, =gUnknown_020243FC
-	ldrh r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _0803982C
-	ldrh r0, [r2, 0x24]
-	adds r0, 0x2
-	strh r0, [r2, 0x24]
-	lsls r0, 16
-	cmp r0, 0
-	bne _0803982C
-	ldr r0, =sub_8039838
-	str r0, [r2, 0x1C]
-_0803982C:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803980C
-
-	thumb_func_start sub_8039838
-sub_8039838: @ 8039838
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _08039880
-	ldrh r0, [r4, 0x2E]
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_8076918
-	ldr r1, =gHealthBoxesIds
-	movs r2, 0x2E
-	ldrsh r0, [r4, r2]
-	adds r0, r1
-	ldrb r0, [r0]
-	bl sub_80729D0
-	ldr r0, =sub_8039894
-	str r0, [r4, 0x1C]
-	adds r0, r4, 0
-	movs r1, 0
-	bl StartSpriteAnimIfDifferent
-	movs r0, 0x80
-	lsls r0, 10
-	ldr r1, =0x00002108
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0xA
-	movs r3, 0
-	bl BeginNormalPaletteFade
-_08039880:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8039838
-
-	thumb_func_start sub_8039894
-sub_8039894: @ 8039894
-	push {lr}
-	adds r2, r0, 0
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _080398B0
-	ldrh r1, [r2, 0x32]
-	adds r0, r2, 0
-	movs r2, 0
-	movs r3, 0x1
-	bl BattleAnimateFrontSprite
-_080398B0:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8039894
-
-	thumb_func_start SpriteCallbackDummy_2
-SpriteCallbackDummy_2: @ 80398B8
-	bx lr
-	thumb_func_end SpriteCallbackDummy_2
-
-	thumb_func_start sub_80398BC
-sub_80398BC: @ 80398BC
-	movs r1, 0x6
-	strh r1, [r0, 0x34]
-	movs r1, 0x1
-	strh r1, [r0, 0x36]
-	ldr r1, =sub_80398D0
-	str r1, [r0, 0x1C]
-	bx lr
-	.pool
-	thumb_func_end sub_80398BC
-
-	thumb_func_start sub_80398D0
-sub_80398D0: @ 80398D0
-	push {r4,lr}
-	adds r3, r0, 0
-	ldrh r0, [r3, 0x36]
-	subs r0, 0x1
-	strh r0, [r3, 0x36]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08039924
-	movs r0, 0x8
-	strh r0, [r3, 0x36]
-	movs r0, 0x3E
-	adds r0, r3
-	mov r12, r0
-	ldrb r2, [r0]
-	lsls r0, r2, 29
-	lsrs r0, 31
-	movs r1, 0x1
-	eors r1, r0
-	lsls r1, 2
-	movs r4, 0x5
-	negs r4, r4
-	adds r0, r4, 0
-	ands r0, r2
-	orrs r0, r1
-	mov r1, r12
-	strb r0, [r1]
-	ldrh r0, [r3, 0x34]
-	subs r0, 0x1
-	strh r0, [r3, 0x34]
-	lsls r0, 16
-	asrs r2, r0, 16
-	cmp r2, 0
-	bne _08039924
-	ldrb r1, [r1]
-	adds r0, r4, 0
-	ands r0, r1
-	mov r1, r12
-	strb r0, [r1]
-	ldr r0, =SpriteCallbackDummy_2
-	str r0, [r3, 0x1C]
-	ldr r0, =gUnknown_02022F88
-	str r2, [r0]
-_08039924:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80398D0
-
-	thumb_func_start sub_8039934
-sub_8039934: @ 8039934
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	mov r9, r0
-	ldrh r0, [r0, 0x2E]
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r0, =gUnknown_020244D0
-	ldr r0, [r0]
-	ldr r1, [r0]
-	lsls r0, r6, 2
-	adds r1, r0, r1
-	ldrh r0, [r1, 0x2]
-	cmp r0, 0
-	beq _0803995C
-	adds r4, r0, 0
-	b _08039960
-	.pool
-_0803995C:
-	mov r0, r9
-	ldrh r4, [r0, 0x32]
-_08039960:
-	ldr r1, =gBattlePartyID
-	lsls r0, r6, 1
-	adds r5, r0, r1
-	ldrh r0, [r5]
-	movs r1, 0x64
-	mov r8, r1
-	mov r1, r8
-	muls r1, r0
-	adds r0, r1, 0
-	ldr r7, =gEnemyParty
-	adds r0, r7
-	movs r1, 0
-	bl GetMonData
-	cmp r4, 0xC9
-	bne _080399E4
-	ldrh r0, [r5]
-	mov r1, r8
-	muls r1, r0
-	adds r0, r1, 0
-	adds r0, r7
-	movs r1, 0
-	bl GetMonData
-	adds r2, r0, 0
-	movs r0, 0xC0
-	lsls r0, 18
-	ands r0, r2
-	lsrs r0, 18
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r2
-	lsrs r1, 12
-	orrs r0, r1
-	movs r1, 0xC0
-	lsls r1, 2
-	ands r1, r2
-	lsrs r1, 6
-	orrs r0, r1
-	movs r1, 0x3
-	ands r1, r2
-	orrs r0, r1
-	movs r1, 0x1C
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0
-	bne _080399D0
-	movs r0, 0xC9
-	b _080399DA
-	.pool
-_080399D0:
-	movs r1, 0xCE
-	lsls r1, 1
-	adds r0, r1
-	lsls r0, 16
-	lsrs r0, 16
-_080399DA:
-	ldr r1, =gUnknown_08300D38
-	lsls r0, 2
-	b _08039A1C
-	.pool
-_080399E4:
-	ldr r0, =0x00000181
-	cmp r4, r0
-	bne _08039A08
-	ldr r0, =gUnknown_08525F78
-	ldr r1, =gBattleMonForms
-	adds r1, r6, r1
-	ldrb r1, [r1]
-	lsls r1, 2
-	adds r1, r0
-	ldrb r0, [r1, 0x1]
-	b _08039A20
-	.pool
-_08039A08:
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r4, r0
-	bls _08039A18
-	ldr r0, =gUnknown_08300D38
-	b _08039A1E
-	.pool
-_08039A18:
-	ldr r1, =gUnknown_08300D38
-	lsls r0, r4, 2
-_08039A1C:
-	adds r0, r1
-_08039A1E:
-	ldrb r0, [r0, 0x1]
-_08039A20:
-	lsrs r1, r0, 3
-	movs r0, 0x8
-	subs r0, r1
-	mov r1, r9
-	strh r0, [r1, 0x34]
-	movs r0, 0x1
-	strh r0, [r1, 0x36]
-	ldr r0, =sub_8039A48
-	str r0, [r1, 0x1C]
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8039934
-
-	thumb_func_start sub_8039A48
-sub_8039A48: @ 8039A48
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x36]
-	subs r0, 0x1
-	strh r0, [r4, 0x36]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08039AC8
-	movs r0, 0x2
-	strh r0, [r4, 0x36]
-	ldrh r0, [r4, 0x26]
-	adds r0, 0x8
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x34]
-	subs r0, 0x1
-	strh r0, [r4, 0x34]
-	lsls r0, 16
-	cmp r0, 0
-	bge _08039A7C
-	adds r0, r4, 0
-	bl FreeSpriteOamMatrix
-	adds r0, r4, 0
-	bl DestroySprite
-	b _08039AC8
-_08039A7C:
-	ldrh r0, [r4, 0x2E]
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankIdentity
-	ldr r1, =gMonSpritesGfxPtr
-	ldr r1, [r1]
-	lsls r0, 24
-	lsrs r0, 22
-	adds r1, 0x4
-	adds r1, r0
-	ldr r2, =gBattleMonForms
-	movs r3, 0x2E
-	ldrsh r0, [r4, r3]
-	adds r0, r2
-	ldrb r0, [r0]
-	lsls r0, 11
-	ldr r1, [r1]
-	adds r1, r0
-	movs r2, 0x34
-	ldrsh r0, [r4, r2]
-	lsls r0, 8
-	adds r1, r0
-	movs r2, 0
-	movs r0, 0xFF
-_08039AAE:
-	strb r2, [r1]
-	adds r1, 0x1
-	subs r0, 0x1
-	cmp r0, 0
-	bge _08039AAE
-	ldr r0, =gBattleMonForms
-	movs r3, 0x2E
-	ldrsh r1, [r4, r3]
-	adds r1, r0
-	ldrb r1, [r1]
-	adds r0, r4, 0
-	bl StartSpriteAnim
-_08039AC8:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8039A48
-
-	thumb_func_start sub_8039AD8
-sub_8039AD8: @ 8039AD8
-	movs r1, 0x8
-	strh r1, [r0, 0x34]
-	adds r1, r0, 0
-	adds r1, 0x3E
-	ldrb r1, [r1]
-	lsls r1, 29
-	lsrs r1, 31
-	strh r1, [r0, 0x36]
-	ldr r1, =sub_8039AF4
-	str r1, [r0, 0x1C]
-	bx lr
-	.pool
-	thumb_func_end sub_8039AD8
-
-	thumb_func_start sub_8039AF4
-sub_8039AF4: @ 8039AF4
-	push {lr}
-	adds r3, r0, 0
-	ldrh r0, [r3, 0x34]
-	subs r0, 0x1
-	strh r0, [r3, 0x34]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08039B26
-	movs r0, 0x3E
-	adds r0, r3
-	mov r12, r0
-	ldrb r2, [r0]
-	lsls r0, r2, 29
-	lsrs r0, 31
-	movs r1, 0x1
-	eors r1, r0
-	lsls r1, 2
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	mov r1, r12
-	strb r0, [r1]
-	movs r0, 0x8
-	strh r0, [r3, 0x34]
-_08039B26:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8039AF4
-
-	thumb_func_start sub_8039B2C
-sub_8039B2C: @ 8039B2C
-	movs r1, 0x3E
-	adds r1, r0
-	mov r12, r1
-	movs r1, 0x1
-	ldrh r2, [r0, 0x36]
-	ands r2, r1
-	lsls r2, 2
-	mov r1, r12
-	ldrb r3, [r1]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r3
-	orrs r1, r2
-	mov r2, r12
-	strb r1, [r2]
-	movs r1, 0
-	strh r1, [r0, 0x36]
-	ldr r1, =SpriteCallbackDummy_2
-	str r1, [r0, 0x1C]
-	bx lr
-	.pool
-	thumb_func_end sub_8039B2C
 
 	thumb_func_start sub_8039B58
 sub_8039B58: @ 8039B58
@@ -2805,7 +142,7 @@ dp11b_obj_instanciate: @ 8039C28
 	mov r10, r3
 	cmp r1, 0
 	beq _08039C64
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r2, r4, 1
@@ -2817,7 +154,7 @@ dp11b_obj_instanciate: @ 8039C28
 	b _08039C76
 	.pool
 _08039C64:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r2, r4, 1
@@ -2841,7 +178,7 @@ _08039C76:
 	ldr r0, =gHealthBoxesIds
 	adds r0, r4, r0
 	ldrb r7, [r0]
-	ldr r2, =gUnknown_020244D0
+	ldr r2, =gBattleSpritesDataPtr
 	ldr r0, [r2]
 	ldr r0, [r0, 0x4]
 	adds r1, r6, r4
@@ -2867,7 +204,7 @@ _08039CD0:
 	ldr r0, =gBankSpriteIds
 	adds r0, r4, r0
 	ldrb r7, [r0]
-	ldr r2, =gUnknown_020244D0
+	ldr r2, =gBattleSpritesDataPtr
 	ldr r0, [r2]
 	ldr r0, [r0, 0x4]
 	adds r1, r6, r4
@@ -2931,7 +268,7 @@ dp11b_obj_free: @ 8039D48
 	lsrs r1, 24
 	cmp r1, 0x1
 	bne _08039D9C
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -2962,7 +299,7 @@ dp11b_obj_free: @ 8039D48
 	b _08039DD6
 	.pool
 _08039D9C:
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -10246,9 +7583,9 @@ _0803DE86:
 	ands r0, r1
 	cmp r0, 0
 	bne _0803DEA2
-	bl sub_805F094
-	bl sub_8057028
-	bl dp11_free
+	bl FreeMonSpritesGfx
+	bl FreeBattleResources
+	bl FreeBattleSpritesData
 _0803DEA2:
 	pop {r0}
 	bx r0
diff --git a/asm/battle_5.s b/asm/battle_5.s
index 3163631a9..4d02a5942 100644
--- a/asm/battle_5.s
+++ b/asm/battle_5.s
@@ -104,8 +104,8 @@ _08056FFA:
 	.pool
 	thumb_func_end AllocateBattleResrouces
 
-	thumb_func_start sub_8057028
-sub_8057028: @ 8057028
+	thumb_func_start FreeBattleResources
+FreeBattleResources: @ 8057028
 	push {r4-r6,lr}
 	ldr r0, =gBattleTypeFlags
 	ldr r0, [r0]
@@ -181,7 +181,7 @@ _080570D0:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8057028
+	thumb_func_end FreeBattleResources
 
 	thumb_func_start AdjustFriendshipOnBattleFaint
 AdjustFriendshipOnBattleFaint: @ 80570F4
diff --git a/asm/battle_7.s b/asm/battle_7.s
index 82298fbf4..7f82e790a 100644
--- a/asm/battle_7.s
+++ b/asm/battle_7.s
@@ -8,7 +8,7 @@
 	thumb_func_start AllocateBattleSpritesData
 AllocateBattleSpritesData: @ 805D118
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	movs r0, 0x10
 	bl AllocZeroed
 	str r0, [r4]
@@ -34,10 +34,10 @@ AllocateBattleSpritesData: @ 805D118
 	.pool
 	thumb_func_end AllocateBattleSpritesData
 
-	thumb_func_start dp11_free
-dp11_free: @ 805D158
+	thumb_func_start FreeBattleSpritesData
+FreeBattleSpritesData: @ 805D158
 	push {r4,r5,lr}
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	cmp r0, 0
 	beq _0805D192
@@ -65,7 +65,7 @@ _0805D192:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp11_free
+	thumb_func_end FreeBattleSpritesData
 
 	thumb_func_start sub_805D19C
 sub_805D19C: @ 805D19C
@@ -839,7 +839,7 @@ move_anim_start_t2_for_situation: @ 805D808
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	lsls r0, 24
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r1, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1001,7 +1001,7 @@ move_anim_start_t3: @ 805D908
 	b _0805DA1E
 	.pool
 _0805D950:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	mov r9, r0
 	ldr r0, [r0]
 	ldr r0, [r0]
@@ -1063,7 +1063,7 @@ _0805D9CC:
 	mov r1, sp
 	ldrb r1, [r1]
 	strb r1, [r0]
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r0, [r0, 0x8]
 	strh r7, [r0]
@@ -1119,7 +1119,7 @@ task0A_0803415C: @ 805DA48
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0805DA8A
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r1, =gTasks
 	lsls r0, r4, 2
@@ -1199,7 +1199,7 @@ move_anim_start_t4: @ 805DAC4
 	lsls r1, 3
 	adds r1, r2
 	strh r4, [r1, 0x8]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	movs r2, 0x8
 	ldrsh r1, [r1, r2]
@@ -1230,7 +1230,7 @@ task0A_08034248: @ 805DB34
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0805DB76
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r1, =gTasks
 	lsls r0, r4, 2
@@ -1274,7 +1274,7 @@ mplay_80342A4: @ 805DB90
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805DBD8
-	ldr r2, =gUnknown_020244D0
+	ldr r2, =gBattleSpritesDataPtr
 	ldr r0, [r2]
 	ldr r1, [r0, 0x4]
 	lsls r0, r4, 1
@@ -1307,7 +1307,7 @@ _0805DBDC:
 	b _0805DC02
 	.pool
 _0805DBF0:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r4, 1
@@ -1338,7 +1338,7 @@ sub_805DC0C: @ 805DC0C
 	movs r1, 0
 	bl GetMonData
 	str r0, [sp]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	mov r2, r8
@@ -1386,7 +1386,7 @@ _0805DC58:
 	movs r0, 0x80
 	lsls r0, 1
 	adds r7, r2, r0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	lsls r1, r3, 2
@@ -1444,7 +1444,7 @@ _0805DCC6:
 	movs r2, 0x20
 	bl LoadPalette
 _0805DD1A:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	ldr r1, [sp, 0x4]
@@ -1491,7 +1491,7 @@ sub_805DD7C: @ 805DD7C
 	movs r1, 0
 	bl GetMonData
 	str r0, [sp]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	mov r2, r8
@@ -1532,7 +1532,7 @@ _0805DDC8:
 	mov r10, r1
 	cmp r0, 0x1
 	beq _0805DE00
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	add r0, r10
@@ -1573,7 +1573,7 @@ _0805DE46:
 	movs r0, 0x80
 	lsls r0, 1
 	adds r7, r1, r0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	add r0, r10
@@ -1629,7 +1629,7 @@ _0805DE7E:
 	movs r2, 0x20
 	bl LoadPalette
 _0805DED2:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	add r0, r10
@@ -2141,7 +2141,7 @@ _0805E346:
 	thumb_func_start sub_805E350
 sub_805E350: @ 805E350
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r0, [r0, 0x4]
 	movs r1, 0
@@ -2162,7 +2162,7 @@ sub_805E350: @ 805E350
 sub_805E378: @ 805E378
 	push {lr}
 	bl sub_805E350
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	movs r1, 0
@@ -2191,7 +2191,7 @@ sub_805E394: @ 805E394
 	movs r0, 0x2
 	negs r0, r0
 	mov r8, r0
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r6, =gBankSpriteIds
 _0805E3B8:
 	ldr r0, [r7]
@@ -2233,7 +2233,7 @@ _0805E3EA:
 sub_805E408: @ 805E408
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r1, [r1]
 	ldr r1, [r1]
 	lsls r3, r0, 2
@@ -2285,7 +2285,7 @@ sub_805E448: @ 805E448
 	ldr r1, =gSprites
 	mov r8, r1
 	add r0, r8
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r1, [r1, 0x8]
 	ldrb r1, [r1]
@@ -2582,7 +2582,7 @@ _0805E70A:
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805E74A
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r7, 2
@@ -2804,7 +2804,7 @@ sub_805E94C: @ 805E94C
 	lsrs r1, 16
 	cmp r1, 0xA4
 	bne _0805E96C
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	lsls r1, r2, 2
@@ -2822,7 +2822,7 @@ _0805E96C:
 	thumb_func_start sub_805E974
 sub_805E974: @ 805E974
 	lsls r0, 24
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r1, [r1]
 	ldr r1, [r1]
 	lsrs r0, 22
@@ -2862,7 +2862,7 @@ sub_805E990: @ 805E990
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0805EA08
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r0, [r7]
 	ldr r2, [r0]
 	lsls r4, r6, 2
@@ -2895,7 +2895,7 @@ _0805E9F6:
 	b _0805EA5A
 	.pool
 _0805EA08:
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r0, [r0]
 	lsls r1, r6, 2
@@ -2944,7 +2944,7 @@ BattleMusicStop: @ 805EA60
 	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	ldr r0, [r0]
 	lsls r1, r4, 2
@@ -3134,7 +3134,7 @@ _0805EBC8:
 	mov r7, r8
 	cmp r7, 0
 	bne _0805EC3C
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0, 0x4]
 	adds r2, r6, r2
@@ -3164,7 +3164,7 @@ _0805EC3C:
 	adds r2, r0
 	lsls r2, 2
 	adds r2, r4
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	adds r0, r6, r0
@@ -3229,7 +3229,7 @@ sub_805EC84: @ 805EC84
 	adds r1, r4, 0
 	movs r3, 0xC8
 	bl CreateSprite
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r1, [r6]
 	ldr r2, [r1, 0x4]
 	lsls r1, r5, 1
@@ -3351,12 +3351,12 @@ _0805EDC0:
 _0805EDD2:
 	movs r0, 0x1
 	mov r8, r0
-	ldr r2, =gUnknown_020244D0
+	ldr r2, =gBattleSpritesDataPtr
 	lsls r4, 2
 	b _0805EE06
 	.pool
 _0805EDE4:
-	ldr r2, =gUnknown_020244D0
+	ldr r2, =gBattleSpritesDataPtr
 	ldr r0, [r2]
 	ldr r0, [r0]
 	lsls r1, r4, 2
@@ -3431,7 +3431,7 @@ sub_805EE54: @ 805EE54
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805EED0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r3, [r0]
 	ldr r1, [r3]
 	lsls r0, r4, 2
@@ -3489,7 +3489,7 @@ sub_805EEE0: @ 805EEE0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =gSprites
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r1, [r1]
 	ldr r3, [r1, 0x4]
 	lsls r1, r0, 1
@@ -3578,7 +3578,7 @@ sub_805EF84: @ 805EF84
 	lsls r0, 24
 	lsrs r4, r0, 24
 	lsls r1, 24
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0]
 	lsls r0, r4, 2
@@ -3708,8 +3708,8 @@ _0805F01A:
 	.pool
 	thumb_func_end AllocateMonSpritesGfx
 
-	thumb_func_start sub_805F094
-sub_805F094: @ 805F094
+	thumb_func_start FreeMonSpritesGfx
+FreeMonSpritesGfx: @ 805F094
 	push {r4-r6,lr}
 	ldr r6, =gMonSpritesGfxPtr
 	ldr r0, [r6]
@@ -3769,7 +3769,7 @@ _0805F106:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_805F094
+	thumb_func_end FreeMonSpritesGfx
 
 	thumb_func_start sub_805F110
 sub_805F110: @ 805F110
diff --git a/asm/battle_anim.s b/asm/battle_anim.s
index b9ab95165..975a7a401 100644
--- a/asm/battle_anim.s
+++ b/asm/battle_anim.s
@@ -1150,7 +1150,7 @@ _080A4330:
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A4374
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r5, 2
@@ -2864,7 +2864,7 @@ BattleAnimGetPanControl: @ 80A5178
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A51C0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gAnimationBankAttacker
 	ldrb r2, [r0]
@@ -2986,7 +2986,7 @@ sub_80A5278: @ 80A5278
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A52C0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gAnimationBankAttacker
 	ldrb r2, [r0]
diff --git a/asm/battle_anim_80A9C70.s b/asm/battle_anim_80A9C70.s
index 16366988e..ca6572e1a 100644
--- a/asm/battle_anim_80A9C70.s
+++ b/asm/battle_anim_80A9C70.s
@@ -629,7 +629,7 @@ sub_80AA18C: @ 80AA18C
 	lsls r0, 24
 	lsrs r4, r0, 24
 	movs r3, 0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrh r0, [r0]
@@ -899,7 +899,7 @@ task0A_80788BC: @ 80AA3B4
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080AA3F6
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r1, =gTasks
 	lsls r0, r4, 2
diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s
index 5cec1cbc5..58eb2ebf0 100644
--- a/asm/battle_anim_80FE840.s
+++ b/asm/battle_anim_80FE840.s
@@ -38602,7 +38602,7 @@ _08111F0C:
 	adds r2, r0
 	lsls r2, 2
 	adds r2, r4
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gAnimationBankTarget
 	ldrb r0, [r0]
@@ -50163,7 +50163,7 @@ _08117F78:
 	adds r3, r4
 	lsls r3, 3
 	adds r3, r0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r4, [r0]
 	ldr r2, =gAnimationBankAttacker
 	ldrb r0, [r2]
@@ -50207,7 +50207,7 @@ sub_8117FD0: @ 8117FD0
 	lsls r0, 5
 	cmp r1, r0
 	bne _08118014
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gAnimationBankAttacker
 	ldrb r3, [r0]
diff --git a/asm/battle_anim_815A0D4.s b/asm/battle_anim_815A0D4.s
index 849655fe5..81e4f9163 100755
--- a/asm/battle_anim_815A0D4.s
+++ b/asm/battle_anim_815A0D4.s
@@ -3250,7 +3250,7 @@ _0815BAB6:
 	cmp r0, 0
 	bne _0815BAF6
 	ldrb r0, [r4]
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r1, [r1]
 	ldr r2, [r1]
 	lsls r1, r0, 2
@@ -5723,7 +5723,7 @@ _0815CF18:
 	movs r1, 0x1
 	bl GetMonData
 	mov r8, r0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r2, [r4]
 	ldr r1, [r0]
@@ -5791,7 +5791,7 @@ _0815CFC4:
 	movs r1, 0x1
 	bl GetMonData
 	mov r8, r0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r2, [r4]
 	ldr r1, [r0]
@@ -10637,7 +10637,7 @@ _0815F67C:
 	adds r0, r2
 	movs r1, 0x2
 	strh r1, [r0, 0x8]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gAnimationBankTarget
 	ldrb r0, [r0]
@@ -10762,7 +10762,7 @@ sub_815F7C4: @ 815F7C4
 	ble _0815F80E
 	movs r0, 0
 	strh r0, [r4, 0x30]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gAnimationBankTarget
 	ldrb r0, [r0]
@@ -11072,7 +11072,7 @@ _0815FA28:
 	movs r1, 0x1
 	bl GetMonData
 	mov r9, r0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r2, [r4]
 	ldr r1, [r0]
@@ -11136,7 +11136,7 @@ _0815FAC8:
 	movs r1, 0x1
 	bl GetMonData
 	mov r9, r0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r2, [r4]
 	ldr r1, [r0]
@@ -11202,7 +11202,7 @@ _0815FB50:
 	bl sub_80A8394
 	lsls r0, 24
 	lsrs r5, r0, 24
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldrb r0, [r4]
 	ldr r1, [r1]
diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s
index cb6391cee..dd992a8cd 100644
--- a/asm/battle_anim_8170478.s
+++ b/asm/battle_anim_8170478.s
@@ -1035,7 +1035,7 @@ sub_8170D4C: @ 8170D4C
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x8]
@@ -1183,7 +1183,7 @@ sub_8170E04: @ 8170E04
 	adds r4, r0
 	ldr r0, =sub_8171104
 	str r0, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r3, [r0, 0x8]
 	ldr r1, =gBankSpriteIds
@@ -1491,7 +1491,7 @@ sub_8171134: @ 8171134
 	lsls r0, 24
 	cmp r0, 0
 	beq _081711D2
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x8]
@@ -1894,7 +1894,7 @@ _08171486:
 	adds r0, r1
 	strh r0, [r4, 0x22]
 	strh r5, [r4, 0x26]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x8]
@@ -1940,7 +1940,7 @@ sub_81714D4: @ 81714D4
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl StartSpriteAffineAnim
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	strh r5, [r0, 0xC]
@@ -1982,7 +1982,7 @@ _08171540:
 	.4byte _08171708
 	.4byte _08171768
 _0817155C:
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r5, [r1]
 	ldr r2, [r5, 0x8]
 	ldrh r3, [r2, 0xC]
@@ -2060,7 +2060,7 @@ _081715EA:
 	bl ChangeSpriteAffineAnim
 	b _081717AE
 _081715F4:
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r5, [r1]
 	ldr r2, [r5, 0x8]
 	ldrh r3, [r2, 0xC]
@@ -2152,7 +2152,7 @@ _0817169C:
 	movs r1, 0x1
 	bl ChangeSpriteAffineAnim
 _081716A4:
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r5, [r1]
 	ldr r2, [r5, 0x8]
 	ldrh r3, [r2, 0xC]
@@ -2211,7 +2211,7 @@ _08171708:
 	strh r0, [r4, 0x34]
 	lsls r0, 16
 	asrs r1, r0, 24
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x8]
@@ -2859,7 +2859,7 @@ _08171C24:
 	adds r2, r0
 	lsls r2, 2
 	adds r2, r4
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r1, [r0, 0x9]
@@ -3083,7 +3083,7 @@ sub_8171E20: @ 8171E20
 	ands r0, r1
 	cmp r0, 0
 	beq _08171E3E
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x8]
 	ldrb r0, [r1, 0xA]
@@ -4419,7 +4419,7 @@ sub_8172944: @ 8172944
 	b _081729E2
 	.pool
 _08172970:
-	ldr r2, =gUnknown_020244D0
+	ldr r2, =gBattleSpritesDataPtr
 	ldr r0, [r2]
 	ldr r1, [r0, 0x8]
 	ldrb r0, [r1, 0xA]
@@ -5046,7 +5046,7 @@ sub_8172E9C: @ 8172E9C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =gBattleAnimArgs
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r2, [r1]
 	ldr r1, =gAnimationBankAttacker
 	ldrb r1, [r1]
@@ -5088,7 +5088,7 @@ sub_8172EF0: @ 8172EF0
 	lsrs r6, r0, 24
 	movs r0, 0
 	mov r8, r0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r6, 1
@@ -5169,7 +5169,7 @@ _08172F6E:
 	b _08172FDE
 	.pool
 _08172FC8:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r6, 1
@@ -5212,7 +5212,7 @@ sub_8172FEC: @ 8172FEC
 	b _08173190
 	.pool
 _08173018:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0xA]
@@ -5414,7 +5414,7 @@ sub_81731B0: @ 81731B0
 	cmp r0, 0x1
 	bne _081731EA
 	ldrb r1, [r1, 0x8]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0, 0x4]
 	lsls r0, r1, 1
@@ -5762,7 +5762,7 @@ sub_81734B4: @ 81734B4
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrh r1, [r0]
@@ -5813,7 +5813,7 @@ sub_817351C: @ 817351C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =gAnimationBankAttacker
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r2, [r1]
 	ldr r1, [r2, 0x8]
 	ldrh r1, [r1]
diff --git a/asm/battle_controller_linkopponent.s b/asm/battle_controller_linkopponent.s
index a7168623c..58f3b95b7 100644
--- a/asm/battle_controller_linkopponent.s
+++ b/asm/battle_controller_linkopponent.s
@@ -158,7 +158,7 @@ _080644C2:
 	thumb_func_start sub_80644D8
 sub_80644D8: @ 80644D8
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
@@ -281,7 +281,7 @@ _080645CA:
 	cmp r0, 0
 	bne _0806469C
 _080645DE:
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	mov r12, r1
 	ldr r0, [r1]
 	ldr r7, =gActiveBank
@@ -364,7 +364,7 @@ _08064600:
 	b _080646F2
 	.pool
 _0806469C:
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r1, [r7]
 	ldr r2, [r0, 0x4]
@@ -405,7 +405,7 @@ _0806469C:
 	adds r0, r4, 0
 	bl FreeSpritePaletteByTag
 _080646F2:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -440,7 +440,7 @@ sub_8064734: @ 8064734
 	push {r5-r7}
 	movs r0, 0
 	mov r10, r0
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	ldr r4, =gActiveBank
 	ldrb r2, [r4]
@@ -497,7 +497,7 @@ _08064776:
 	adds r0, r3, 0
 	bl sub_8172EF0
 _080647B4:
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, =gActiveBank
 	ldrb r5, [r2]
@@ -591,7 +591,7 @@ _0806484A:
 	ldrb r0, [r0]
 	bl sub_80729D0
 _0806487A:
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -673,7 +673,7 @@ _08064930:
 	lsls r2, 1
 	bl m4aMPlayVolumeControl
 _0806493C:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -735,7 +735,7 @@ _08064998:
 	lsrs r0, 24
 	cmp r0, 0x3
 	bne _080649E2
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r5]
 	ldr r0, [r0, 0x4]
@@ -828,7 +828,7 @@ _08064A3A:
 	lsrs r1, 16
 	adds r0, r5, 0
 	bl sub_805EE54
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -900,7 +900,7 @@ sub_8064B04: @ 8064B04
 	ldrsh r0, [r0, r1]
 	cmp r0, 0
 	bne _08064BB6
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r1, [r0, 0x4]
 	lsls r4, r3, 1
@@ -1028,7 +1028,7 @@ _08064C42:
 	thumb_func_start sub_8064C58
 sub_8064C58: @ 8064C58
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -1166,7 +1166,7 @@ sub_8064D60: @ 8064D60
 	ldr r0, =SpriteCallbackDummy
 	cmp r1, r0
 	bne _08064DAC
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r3, 2
@@ -1198,7 +1198,7 @@ _08064DAC:
 	thumb_func_start sub_8064DD0
 sub_8064DD0: @ 8064DD0
 	push {r4,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r4, =gActiveBank
 	ldrb r1, [r4]
@@ -1250,7 +1250,7 @@ _08064E2A:
 	thumb_func_start sub_8064E50
 sub_8064E50: @ 8064E50
 	push {r4-r7,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1346,7 +1346,7 @@ _08064F0C:
 	thumb_func_start sub_8064F40
 sub_8064F40: @ 8064F40
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1430,7 +1430,7 @@ _08064FDC:
 	thumb_func_start sub_8065008
 sub_8065008: @ 8065008
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1454,7 +1454,7 @@ _0806502A:
 	thumb_func_start sub_8065038
 sub_8065038: @ 8065038
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -3907,7 +3907,7 @@ sub_8066624: @ 8066624
 	ldrb r3, [r0]
 	cmp r3, 0
 	bne _0806666C
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -3959,7 +3959,7 @@ _080666A8:
 	thumb_func_start sub_80666BC
 sub_80666BC: @ 80666BC
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4589,7 +4589,7 @@ sub_8066B94: @ 8066B94
 	thumb_func_start sub_8066C40
 sub_8066C40: @ 8066C40
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4816,7 +4816,7 @@ _08066D32:
 	b _08066E58
 	.pool
 _08066E30:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r5]
 	ldr r2, [r0, 0x4]
@@ -4869,7 +4869,7 @@ sub_8066E70: @ 8066E70
 	adds r1, r2
 	ldrb r1, [r1]
 	mov r8, r1
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -4977,7 +4977,7 @@ _08066F32:
 	ands r0, r2
 	strb r0, [r1]
 _08066F80:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -5244,7 +5244,7 @@ sub_806719C: @ 806719C
 	movs r2, 0x9
 	bl healthbar_draw_field_maybe
 	ldrb r2, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -5718,7 +5718,7 @@ sub_8067508: @ 8067508
 	adds r1, r4
 	ldrb r0, [r6]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r6]
 	ldr r1, [r0, 0x4]
@@ -5893,7 +5893,7 @@ sub_8067718: @ 8067718
 	b _08067812
 	.pool
 _08067748:
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -5960,7 +5960,7 @@ _080677B4:
 	adds r1, r2
 	movs r3, 0
 	strb r0, [r1]
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldrb r1, [r5]
 	ldr r2, [r0, 0x4]
@@ -6000,7 +6000,7 @@ _08067812:
 	thumb_func_start sub_806782C
 sub_806782C: @ 806782C
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -6036,7 +6036,7 @@ _08067864:
 	thumb_func_start sub_8067874
 sub_8067874: @ 8067874
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
diff --git a/asm/battle_controller_linkpartner.s b/asm/battle_controller_linkpartner.s
index 5b0ac0491..562b236d0 100644
--- a/asm/battle_controller_linkpartner.s
+++ b/asm/battle_controller_linkpartner.s
@@ -131,7 +131,7 @@ _0814AFA4:
 	thumb_func_start sub_814AFBC
 sub_814AFBC: @ 814AFBC
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
@@ -239,7 +239,7 @@ _0814B094:
 _0814B0A0:
 	cmp r6, 0
 	beq _0814B0C6
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -270,7 +270,7 @@ sub_814B0E8: @ 814B0E8
 	mov r6, r9
 	mov r5, r8
 	push {r5-r7}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	mov r12, r0
 	ldr r0, [r0]
 	ldr r7, =gActiveBank
@@ -426,7 +426,7 @@ _0814B1F0:
 	adds r0, r5
 	ldrb r0, [r0]
 	bl sub_80729D0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -599,7 +599,7 @@ _0814B3BC:
 	thumb_func_start sub_814B3DC
 sub_814B3DC: @ 814B3DC
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -737,7 +737,7 @@ sub_814B4E0: @ 814B4E0
 	bne _0814B532
 	adds r0, r3, 0
 	bl sub_805E408
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r2, [r4]
 	ldr r1, [r0]
@@ -769,7 +769,7 @@ _0814B532:
 	thumb_func_start sub_814B554
 sub_814B554: @ 814B554
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
@@ -808,7 +808,7 @@ sub_814B5A8: @ 814B5A8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r7, =gActiveBank
 	ldrb r1, [r7]
@@ -903,7 +903,7 @@ _0814B664:
 	thumb_func_start sub_814B69C
 sub_814B69C: @ 814B69C
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r4, =gActiveBank
 	ldrb r2, [r4]
@@ -1021,7 +1021,7 @@ _0814B7A6:
 	thumb_func_start sub_814B7B8
 sub_814B7B8: @ 814B7B8
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1045,7 +1045,7 @@ _0814B7DA:
 	thumb_func_start sub_814B7E8
 sub_814B7E8: @ 814B7E8
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -3476,7 +3476,7 @@ sub_814CE14: @ 814CE14
 	ldrb r3, [r0]
 	cmp r3, 0
 	bne _0814CE5C
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -3526,7 +3526,7 @@ _0814CE92:
 	thumb_func_start sub_814CEA4
 sub_814CEA4: @ 814CEA4
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -3870,7 +3870,7 @@ sub_814D0F0: @ 814D0F0
 	thumb_func_start sub_814D19C
 sub_814D19C: @ 814D19C
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4125,7 +4125,7 @@ _0814D2CE:
 	b _0814D3F4
 	.pool
 _0814D3CC:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r5]
 	ldr r2, [r0, 0x4]
@@ -4178,7 +4178,7 @@ bx_move_anim_4: @ 814D40C
 	adds r1, r2
 	ldrb r1, [r1]
 	mov r8, r1
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -4286,7 +4286,7 @@ _0814D4CE:
 	ands r0, r2
 	strb r0, [r1]
 _0814D51C:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -4553,7 +4553,7 @@ sub_814D738: @ 814D738
 	movs r2, 0x9
 	bl healthbar_draw_field_maybe
 	ldrb r2, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -5147,7 +5147,7 @@ _0814DC06:
 	adds r1, r4
 	ldrb r0, [r5]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r5]
 	ldr r1, [r0, 0x4]
@@ -5326,7 +5326,7 @@ sub_814DDD8: @ 814DDD8
 	b _0814DE7C
 	.pool
 _0814DE08:
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
@@ -5394,7 +5394,7 @@ _0814DE7C:
 	thumb_func_start sub_814DE9C
 sub_814DE9C: @ 814DE9C
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -5430,7 +5430,7 @@ _0814DED4:
 	thumb_func_start sub_814DEE4
 sub_814DEE4: @ 814DEE4
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s
index f54896ca7..066a0ceab 100644
--- a/asm/battle_controller_opponent.s
+++ b/asm/battle_controller_opponent.s
@@ -158,7 +158,7 @@ _0805F292:
 	thumb_func_start sub_805F2A8
 sub_805F2A8: @ 805F2A8
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
@@ -277,7 +277,7 @@ _0805F3A0:
 	movs r6, 0x1
 _0805F3A2:
 	ldr r3, =gUnknown_020244D8
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	mov r8, r1
 	ldr r2, [r1]
 	ldr r7, =gActiveBank
@@ -449,7 +449,7 @@ _0805F4E4:
 	ands r0, r2
 	strb r0, [r1, 0x1]
 _0805F51A:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -488,7 +488,7 @@ sub_805F560: @ 805F560
 	movs r0, 0
 	str r0, [sp]
 	mov r10, r0
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	ldr r4, =gActiveBank
 	ldrb r2, [r4]
@@ -549,7 +549,7 @@ _0805F5A6:
 	adds r0, r3, 0
 	bl sub_8172EF0
 _0805F5EE:
-	ldr r2, =gUnknown_020244D0
+	ldr r2, =gBattleSpritesDataPtr
 	ldr r0, [r2]
 	ldr r1, =gActiveBank
 	mov r8, r1
@@ -643,7 +643,7 @@ _0805F684:
 	ldrb r0, [r0]
 	bl sub_80729D0
 _0805F6B4:
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r2, [r3]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -723,7 +723,7 @@ _0805F768:
 	lsls r2, 1
 	bl m4aMPlayVolumeControl
 _0805F774:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -906,7 +906,7 @@ _0805F8D2:
 	lsrs r1, 16
 	adds r0, r5, 0
 	bl sub_805EE54
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -972,7 +972,7 @@ sub_805F994: @ 805F994
 	ldrsh r0, [r0, r1]
 	cmp r0, 0
 	bne _0805F9E0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r2, r3, 1
@@ -1010,7 +1010,7 @@ _0805F9E0:
 	ldr r0, =SpriteCallbackDummy
 	cmp r1, r0
 	bne _0805FA48
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r1, [r0, 0x4]
 	lsls r0, r3, 1
@@ -1122,7 +1122,7 @@ _0805FAF2:
 	thumb_func_start sub_805FB08
 sub_805FB08: @ 805FB08
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -1260,7 +1260,7 @@ sub_805FC10: @ 805FC10
 	ldr r0, =SpriteCallbackDummy
 	cmp r1, r0
 	bne _0805FC5C
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r3, 2
@@ -1292,7 +1292,7 @@ _0805FC5C:
 	thumb_func_start bx_803AEDC
 bx_803AEDC: @ 805FC80
 	push {r4,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r4, =gActiveBank
 	ldrb r1, [r4]
@@ -1344,7 +1344,7 @@ _0805FCDA:
 	thumb_func_start sub_805FD00
 sub_805FD00: @ 805FD00
 	push {r4-r7,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1440,7 +1440,7 @@ _0805FDBC:
 	thumb_func_start sub_805FDF0
 sub_805FDF0: @ 805FDF0
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1524,7 +1524,7 @@ _0805FE8C:
 	thumb_func_start sub_805FEB8
 sub_805FEB8: @ 805FEB8
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1548,7 +1548,7 @@ _0805FEDA:
 	thumb_func_start bx_803B0F4
 bx_803B0F4: @ 805FEE8
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -4069,7 +4069,7 @@ sub_806156C: @ 806156C
 	ldrb r3, [r0]
 	cmp r3, 0
 	bne _080615B4
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -4121,7 +4121,7 @@ _080615F0:
 	thumb_func_start sub_8061604
 sub_8061604: @ 8061604
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4741,7 +4741,7 @@ sub_8061AF0: @ 8061AF0
 	thumb_func_start sub_8061B9C
 sub_8061B9C: @ 8061B9C
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4962,7 +4962,7 @@ _08061C8A:
 	b _08061D9E
 	.pool
 _08061D80:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -5009,7 +5009,7 @@ bx_move_anim_7: @ 8061DB0
 	adds r1, r2
 	ldrb r1, [r1]
 	mov r8, r1
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -5117,7 +5117,7 @@ _08061E72:
 	ands r0, r2
 	strb r0, [r1]
 _08061EC0:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -5694,7 +5694,7 @@ sub_8062390: @ 8062390
 	movs r2, 0x9
 	bl healthbar_draw_field_maybe
 	ldrb r2, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -6168,7 +6168,7 @@ sub_80626FC: @ 80626FC
 	adds r1, r4
 	ldrb r0, [r6]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r6]
 	ldr r1, [r0, 0x4]
@@ -6348,7 +6348,7 @@ dp01t_30_7_0803D67C: @ 8062918
 	b _08062A12
 	.pool
 _08062948:
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -6415,7 +6415,7 @@ _080629B4:
 	adds r1, r2
 	movs r3, 0
 	strb r0, [r1]
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldrb r1, [r5]
 	ldr r2, [r0, 0x4]
@@ -6455,7 +6455,7 @@ _08062A12:
 	thumb_func_start bx_0803D790_t7
 bx_0803D790_t7: @ 8062A2C
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -6491,7 +6491,7 @@ _08062A64:
 	thumb_func_start sub_8062A74
 sub_8062A74: @ 8062A74
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index b829296d8..b47a8ecdf 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -2344,7 +2344,7 @@ _08058908:
 	thumb_func_start sub_8058924
 sub_8058924: @ 8058924
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
@@ -2452,7 +2452,7 @@ _08058A0A:
 	cmp r7, 0
 	beq _08058B08
 _08058A0E:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	mov r9, r0
 	ldr r0, [r0]
 	mov r6, r10
@@ -2593,7 +2593,7 @@ sub_8058B40: @ 8058B40
 	movs r0, 0
 	mov r9, r0
 	mov r8, r0
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r7, =gActiveBank
 	ldrb r2, [r7]
@@ -2729,7 +2729,7 @@ _08058C38:
 	ldrb r0, [r0]
 	bl sub_80729D0
 _08058C68:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -2743,7 +2743,7 @@ _08058C68:
 	orrs r1, r2
 	strb r1, [r0, 0x1]
 _08058C82:
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	ldr r4, =gActiveBank
 	ldrb r2, [r4]
@@ -2801,7 +2801,7 @@ _08058D08:
 	lsls r2, 1
 	bl m4aMPlayVolumeControl
 _08058D14:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -2950,7 +2950,7 @@ _08058E48:
 	ldr r1, =gSprites
 	adds r0, r1
 	bl DestroySprite
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -3015,7 +3015,7 @@ sub_8058EDC: @ 8058EDC
 	ldr r0, =SpriteCallbackDummy
 	cmp r4, r0
 	bne _08058F94
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	ldr r1, [r0, 0x4]
 	lsls r0, r3, 1
@@ -3098,7 +3098,7 @@ _08058F94:
 	thumb_func_start sub_8058FC0
 sub_8058FC0: @ 8058FC0
 	push {r4,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r4, =gActiveBank
 	ldrb r1, [r4]
@@ -3142,7 +3142,7 @@ _0805900E:
 	thumb_func_start sub_805902C
 sub_805902C: @ 805902C
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -3774,7 +3774,7 @@ sub_80595A4: @ 80595A4
 	lsls r0, 3
 	adds r2, r0, r1
 	ldrb r5, [r2, 0xC]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r5, 1
@@ -3942,7 +3942,7 @@ _08059724:
 	thumb_func_start sub_8059744
 sub_8059744: @ 8059744
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -4145,7 +4145,7 @@ bx_wait_t1: @ 805991C
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08059942
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -4657,7 +4657,7 @@ sub_8059D50: @ 8059D50
 	thumb_func_start sub_8059D60
 sub_8059D60: @ 8059D60
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -4681,7 +4681,7 @@ _08059D82:
 	thumb_func_start bx_8030B2C
 bx_8030B2C: @ 8059D90
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -7124,7 +7124,7 @@ sub_805B3D4: @ 805B3D4
 	ldrb r3, [r0]
 	cmp r3, 0
 	bne _0805B41C
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -7174,7 +7174,7 @@ _0805B452:
 	thumb_func_start sub_805B464
 sub_805B464: @ 805B464
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -7890,7 +7890,7 @@ sub_805B9F8: @ 805B9F8
 	thumb_func_start sub_805BAB8
 sub_805BAB8: @ 805BAB8
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -8013,7 +8013,7 @@ sub_805BBA4: @ 805BBA4
 	thumb_func_start sub_805BBC4
 sub_805BBC4: @ 805BBC4
 	push {r4,r5,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x8]
 	movs r0, 0x4
@@ -8054,7 +8054,7 @@ sub_805BC18: @ 805BC18
 	adds r1, 0x1
 	adds r0, r1
 	ldrb r1, [r0]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	strb r1, [r0, 0x8]
@@ -8229,7 +8229,7 @@ _0805BCBE:
 	b _0805BDE4
 	.pool
 _0805BDBC:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r5]
 	ldr r2, [r0, 0x4]
@@ -8282,7 +8282,7 @@ bx_move_anim_1: @ 805BDFC
 	adds r1, r2
 	ldrb r1, [r1]
 	mov r8, r1
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -8390,7 +8390,7 @@ _0805BEBE:
 	ands r0, r2
 	strb r0, [r1]
 _0805BF0C:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -9132,7 +9132,7 @@ sub_805C5C4: @ 805C5C4
 	movs r2, 0x9
 	bl healthbar_draw_field_maybe
 	ldrb r2, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -9794,7 +9794,7 @@ dp01t_2F_1_pokemon_enter: @ 805CA80
 	adds r1, r4
 	ldrb r0, [r7]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r7]
 	ldr r1, [r0, 0x4]
@@ -10015,7 +10015,7 @@ sub_805CD74: @ 805CD74
 	b _0805CE18
 	.pool
 _0805CDA4:
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
@@ -10083,7 +10083,7 @@ _0805CE18:
 	thumb_func_start sub_805CE38
 sub_805CE38: @ 805CE38
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -10119,7 +10119,7 @@ _0805CE70:
 	thumb_func_start sub_805CE80
 sub_805CE80: @ 805CE80
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
diff --git a/asm/battle_controller_player_partner.s b/asm/battle_controller_player_partner.s
index 185b8d5ca..c0ea9b87f 100644
--- a/asm/battle_controller_player_partner.s
+++ b/asm/battle_controller_player_partner.s
@@ -132,7 +132,7 @@ _081BAEE8:
 	thumb_func_start sub_81BAF00
 sub_81BAF00: @ 81BAF00
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
@@ -240,7 +240,7 @@ _081BAFD8:
 _081BAFE4:
 	cmp r6, 0
 	beq _081BB00A
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -271,7 +271,7 @@ sub_81BB02C: @ 81BB02C
 	mov r6, r9
 	mov r5, r8
 	push {r5-r7}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	mov r12, r0
 	ldr r0, [r0]
 	ldr r7, =gActiveBank
@@ -427,7 +427,7 @@ _081BB134:
 	adds r0, r5
 	ldrb r0, [r0]
 	bl sub_80729D0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -1006,7 +1006,7 @@ sub_81BB688: @ 81BB688
 	lsls r0, 3
 	adds r2, r0, r1
 	ldrb r5, [r2, 0xC]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r5, 1
@@ -1174,7 +1174,7 @@ _081BB808:
 	thumb_func_start sub_81BB828
 sub_81BB828: @ 81BB828
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -1312,7 +1312,7 @@ sub_81BB92C: @ 81BB92C
 	bne _081BB97E
 	adds r0, r3, 0
 	bl sub_805E408
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r2, [r4]
 	ldr r1, [r0]
@@ -1344,7 +1344,7 @@ _081BB97E:
 	thumb_func_start dp01t_35_3_free_vram
 dp01t_35_3_free_vram: @ 81BB9A0
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
@@ -1383,7 +1383,7 @@ sub_81BB9F4: @ 81BB9F4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r7, =gActiveBank
 	ldrb r1, [r7]
@@ -1478,7 +1478,7 @@ _081BBAB0:
 	thumb_func_start sub_81BBAE8
 sub_81BBAE8: @ 81BBAE8
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r4, =gActiveBank
 	ldrb r2, [r4]
@@ -1596,7 +1596,7 @@ _081BBBF2:
 	thumb_func_start sub_81BBC04
 sub_81BBC04: @ 81BBC04
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1620,7 +1620,7 @@ _081BBC26:
 	thumb_func_start bx_80E8A6C
 bx_80E8A6C: @ 81BBC34
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -4051,7 +4051,7 @@ sub_81BD260: @ 81BD260
 	ldrb r3, [r0]
 	cmp r3, 0
 	bne _081BD2A8
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -4101,7 +4101,7 @@ _081BD2DE:
 	thumb_func_start sub_81BD2F0
 sub_81BD2F0: @ 81BD2F0
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4494,7 +4494,7 @@ sub_81BD5C8: @ 81BD5C8
 	thumb_func_start sub_81BD674
 sub_81BD674: @ 81BD674
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4743,7 +4743,7 @@ _081BD7A2:
 	b _081BD8B6
 	.pool
 _081BD898:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -4790,7 +4790,7 @@ bx_move_anim_3: @ 81BD8C8
 	adds r1, r2
 	ldrb r1, [r1]
 	mov r8, r1
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -4898,7 +4898,7 @@ _081BD98A:
 	ands r0, r2
 	strb r0, [r1]
 _081BD9D8:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -5340,7 +5340,7 @@ sub_81BDD9C: @ 81BDD9C
 	movs r2, 0x9
 	bl healthbar_draw_field_maybe
 	ldrb r2, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -5880,7 +5880,7 @@ _081BE21A:
 	adds r1, r4
 	ldrb r0, [r5]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r5]
 	ldr r1, [r0, 0x4]
@@ -6059,7 +6059,7 @@ dp01t_30_3_80EB11C: @ 81BE3D4
 	b _081BE478
 	.pool
 _081BE404:
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
@@ -6127,7 +6127,7 @@ _081BE478:
 	thumb_func_start sub_81BE498
 sub_81BE498: @ 81BE498
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -6163,7 +6163,7 @@ _081BE4D0:
 	thumb_func_start sub_81BE4E0
 sub_81BE4E0: @ 81BE4E0
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
diff --git a/asm/battle_controller_recorded_opponent.s b/asm/battle_controller_recorded_opponent.s
index 5c420158a..0d9bb2331 100644
--- a/asm/battle_controller_recorded_opponent.s
+++ b/asm/battle_controller_recorded_opponent.s
@@ -157,7 +157,7 @@ _0818661A:
 	thumb_func_start sub_8186630
 sub_8186630: @ 8186630
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
@@ -311,7 +311,7 @@ _0818676A:
 	lsrs r3, r0, 24
 	cmp r3, 0x1
 	bne _08186816
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	mov r12, r0
 	ldr r0, [r0]
 	ldrb r2, [r6]
@@ -388,7 +388,7 @@ _0818676A:
 	adds r0, r4, 0
 	bl FreeSpritePaletteByTag
 _08186816:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	mov r2, r8
 	ldrb r1, [r2]
@@ -425,7 +425,7 @@ sub_818686C: @ 818686C
 	movs r0, 0
 	mov r9, r0
 	mov r8, r0
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r7, =gActiveBank
 	ldrb r2, [r7]
@@ -561,7 +561,7 @@ _08186964:
 	ldrb r0, [r0]
 	bl sub_80729D0
 _08186994:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -575,7 +575,7 @@ _08186994:
 	orrs r1, r2
 	strb r1, [r0, 0x1]
 _081869AE:
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	ldr r4, =gActiveBank
 	ldrb r2, [r4]
@@ -639,7 +639,7 @@ _08186A40:
 	lsls r2, 1
 	bl m4aMPlayVolumeControl
 _08186A4C:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -810,7 +810,7 @@ _08186B8A:
 	lsrs r1, 16
 	adds r0, r5, 0
 	bl sub_805EE54
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -881,7 +881,7 @@ sub_8186C48: @ 8186C48
 	ldrsh r0, [r0, r1]
 	cmp r0, 0
 	bne _08186CFA
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r1, [r0, 0x4]
 	lsls r4, r3, 1
@@ -1009,7 +1009,7 @@ _08186D86:
 	thumb_func_start sub_8186D9C
 sub_8186D9C: @ 8186D9C
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -1147,7 +1147,7 @@ sub_8186EA4: @ 8186EA4
 	ldr r0, =SpriteCallbackDummy
 	cmp r1, r0
 	bne _08186EF0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r3, 2
@@ -1179,7 +1179,7 @@ _08186EF0:
 	thumb_func_start sub_8186F14
 sub_8186F14: @ 8186F14
 	push {r4,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r4, =gActiveBank
 	ldrb r1, [r4]
@@ -1231,7 +1231,7 @@ _08186F6E:
 	thumb_func_start sub_8186F94
 sub_8186F94: @ 8186F94
 	push {r4-r7,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1327,7 +1327,7 @@ _08187050:
 	thumb_func_start sub_8187084
 sub_8187084: @ 8187084
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1411,7 +1411,7 @@ _08187120:
 	thumb_func_start sub_818714C
 sub_818714C: @ 818714C
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1435,7 +1435,7 @@ _0818716E:
 	thumb_func_start sub_818717C
 sub_818717C: @ 818717C
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -3888,7 +3888,7 @@ sub_8188768: @ 8188768
 	ldrb r3, [r0]
 	cmp r3, 0
 	bne _081887B0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -3940,7 +3940,7 @@ _081887EC:
 	thumb_func_start sub_8188800
 sub_8188800: @ 8188800
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4278,7 +4278,7 @@ sub_8188A4C: @ 8188A4C
 	thumb_func_start sub_8188AF8
 sub_8188AF8: @ 8188AF8
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4499,7 +4499,7 @@ _08188BE6:
 	b _08188CFA
 	.pool
 _08188CDC:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -4546,7 +4546,7 @@ sub_8188D0C: @ 8188D0C
 	adds r1, r2
 	ldrb r1, [r1]
 	mov r8, r1
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -4654,7 +4654,7 @@ _08188DCE:
 	ands r0, r2
 	strb r0, [r1]
 _08188E1C:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -4983,7 +4983,7 @@ sub_81890CC: @ 81890CC
 	movs r2, 0x9
 	bl healthbar_draw_field_maybe
 	ldrb r2, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -5457,7 +5457,7 @@ sub_8189438: @ 8189438
 	adds r1, r4
 	ldrb r0, [r6]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r6]
 	ldr r1, [r0, 0x4]
@@ -5632,7 +5632,7 @@ sub_8189648: @ 8189648
 	b _08189742
 	.pool
 _08189678:
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -5699,7 +5699,7 @@ _081896E4:
 	adds r1, r2
 	movs r3, 0
 	strb r0, [r1]
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldrb r1, [r5]
 	ldr r2, [r0, 0x4]
@@ -5739,7 +5739,7 @@ _08189742:
 	thumb_func_start sub_818975C
 sub_818975C: @ 818975C
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -5775,7 +5775,7 @@ _08189794:
 	thumb_func_start sub_81897A4
 sub_81897A4: @ 81897A4
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
diff --git a/asm/battle_controller_recorded_player.s b/asm/battle_controller_recorded_player.s
index 6ab274da2..1b0cd52e3 100644
--- a/asm/battle_controller_recorded_player.s
+++ b/asm/battle_controller_recorded_player.s
@@ -132,7 +132,7 @@ _08189A40:
 	thumb_func_start sub_8189A58
 sub_8189A58: @ 8189A58
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
@@ -244,7 +244,7 @@ _08189B42:
 	bne _08189B48
 	b _08189D18
 _08189B48:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	mov r9, r0
 	ldr r0, [r0]
 	ldr r5, =gActiveBank
@@ -435,7 +435,7 @@ _08189CE6:
 _08189CF2:
 	cmp r6, 0
 	beq _08189D18
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -478,7 +478,7 @@ sub_8189D40: @ 8189D40
 	lsls r0, 24
 	cmp r0, 0
 	bne _08189DBE
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	ldrb r2, [r4]
 	ldr r1, [r0, 0x4]
@@ -527,7 +527,7 @@ _08189D8C:
 	adds r0, r3, 0
 	bl sub_8172EF0
 _08189DBE:
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, =gActiveBank
 	ldrb r5, [r2]
@@ -621,7 +621,7 @@ _08189E54:
 	ldrb r0, [r0]
 	bl sub_80729D0
 _08189E84:
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -702,7 +702,7 @@ _08189F38:
 	lsls r2, 1
 	bl m4aMPlayVolumeControl
 _08189F44:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -779,7 +779,7 @@ _08189FC8:
 	ldr r1, =gSprites
 	adds r0, r1
 	bl DestroySprite
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -975,7 +975,7 @@ _0818A190:
 	thumb_func_start sub_818A1B0
 sub_818A1B0: @ 818A1B0
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -1113,7 +1113,7 @@ sub_818A2B4: @ 818A2B4
 	bne _0818A306
 	adds r0, r3, 0
 	bl sub_805E408
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r2, [r4]
 	ldr r1, [r0]
@@ -1145,7 +1145,7 @@ _0818A306:
 	thumb_func_start sub_818A328
 sub_818A328: @ 818A328
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
@@ -1184,7 +1184,7 @@ sub_818A37C: @ 818A37C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r7, =gActiveBank
 	ldrb r1, [r7]
@@ -1279,7 +1279,7 @@ _0818A438:
 	thumb_func_start sub_818A470
 sub_818A470: @ 818A470
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r4, =gActiveBank
 	ldrb r2, [r4]
@@ -1397,7 +1397,7 @@ _0818A57A:
 	thumb_func_start sub_818A58C
 sub_818A58C: @ 818A58C
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1421,7 +1421,7 @@ _0818A5AE:
 	thumb_func_start sub_818A5BC
 sub_818A5BC: @ 818A5BC
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -3852,7 +3852,7 @@ sub_818BBE8: @ 818BBE8
 	ldrb r3, [r0]
 	cmp r3, 0
 	bne _0818BC30
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -3902,7 +3902,7 @@ _0818BC66:
 	thumb_func_start sub_818BC78
 sub_818BC78: @ 818BC78
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4350,7 +4350,7 @@ sub_818BFB8: @ 818BFB8
 	thumb_func_start sub_818C064
 sub_818C064: @ 818C064
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4599,7 +4599,7 @@ _0818C192:
 	b _0818C2A6
 	.pool
 _0818C288:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -4646,7 +4646,7 @@ bx_move_anim_2: @ 818C2B8
 	adds r1, r2
 	ldrb r1, [r1]
 	mov r8, r1
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -4754,7 +4754,7 @@ _0818C37A:
 	ands r0, r2
 	strb r0, [r1]
 _0818C3C8:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -5134,7 +5134,7 @@ sub_818C6F4: @ 818C6F4
 	movs r2, 0x9
 	bl healthbar_draw_field_maybe
 	ldrb r2, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -5676,7 +5676,7 @@ _0818CB5A:
 	adds r1, r4
 	ldrb r0, [r5]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r5]
 	ldr r1, [r0, 0x4]
@@ -5855,7 +5855,7 @@ sub_818CD30: @ 818CD30
 	b _0818CDD4
 	.pool
 _0818CD60:
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
@@ -5923,7 +5923,7 @@ _0818CDD4:
 	thumb_func_start bx_increment_dp11b_field_5_till_x60_then_resume
 bx_increment_dp11b_field_5_till_x60_then_resume: @ 818CDF4
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -5959,7 +5959,7 @@ _0818CE2C:
 	thumb_func_start sub_818CE3C
 sub_818CE3C: @ 818CE3C
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s
index dac3034a9..acd716776 100644
--- a/asm/battle_controller_safari.s
+++ b/asm/battle_controller_safari.s
@@ -336,7 +336,7 @@ bx_wait_t6: @ 8159624
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0815964A
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -410,7 +410,7 @@ _081596BE:
 	thumb_func_start sub_81596D4
 sub_81596D4: @ 81596D4
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -484,7 +484,7 @@ _0815976A:
 	thumb_func_start bx_80364D0
 bx_80364D0: @ 815977C
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -689,7 +689,7 @@ sub_8159904: @ 8159904
 	thumb_func_start sub_8159910
 sub_8159910: @ 8159910
 	push {r4,r5,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x8]
 	movs r0, 0x4
@@ -730,7 +730,7 @@ sub_8159964: @ 8159964
 	adds r1, 0x1
 	adds r0, r1
 	ldrb r1, [r0]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	strb r1, [r0, 0x8]
diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s
index 51193024f..8291b05fa 100644
--- a/asm/battle_controller_wally.s
+++ b/asm/battle_controller_wally.s
@@ -324,7 +324,7 @@ sub_816864C: @ 816864C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -500,7 +500,7 @@ _0816877A:
 	adds r0, r5
 	ldrb r0, [r0]
 	bl sub_80729D0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -549,7 +549,7 @@ sub_8168818: @ 8168818
 _08168842:
 	cmp r4, 0
 	beq _08168904
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r0, [r7]
 	ldr r4, [r0, 0x4]
 	lsls r0, r3, 1
@@ -761,7 +761,7 @@ _08168A1A:
 	thumb_func_start sub_8168A20
 sub_8168A20: @ 8168A20
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -833,7 +833,7 @@ _08168AB4:
 	thumb_func_start sub_8168AC8
 sub_8168AC8: @ 8168AC8
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -907,7 +907,7 @@ _08168B5E:
 	thumb_func_start sub_8168B70
 sub_8168B70: @ 8168B70
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -3221,7 +3221,7 @@ sub_816A078: @ 816A078
 	thumb_func_start sub_816A084
 sub_816A084: @ 816A084
 	push {r4,r5,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x8]
 	movs r0, 0x4
@@ -3262,7 +3262,7 @@ sub_816A0D8: @ 816A0D8
 	adds r1, 0x1
 	adds r0, r1
 	ldrb r1, [r0]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	strb r1, [r0, 0x8]
@@ -3407,7 +3407,7 @@ sub_816A144: @ 816A144
 	b _0816A25A
 	.pool
 _0816A23C:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -3449,7 +3449,7 @@ bx_move_anim_5: @ 816A26C
 	ldrb r0, [r1]
 	lsls r0, 8
 	orrs r4, r0
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -4342,7 +4342,7 @@ sub_816A90C: @ 816A90C
 	adds r1, r4
 	ldrb r0, [r7]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r7]
 	ldr r1, [r0, 0x4]
@@ -4393,7 +4393,7 @@ sub_816AA80: @ 816AA80
 	adds r6, r0, 0
 	lsls r6, 24
 	lsrs r6, 24
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r6, 2
@@ -4622,7 +4622,7 @@ sub_816AC78: @ 816AC78
 	b _0816ACE6
 	.pool
 _0816ACA8:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index 3d3fba02b..de5617167 100755
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -18768,7 +18768,7 @@ _081A43EE:
 sub_81A4410: @ 81A4410
 	push {r4,lr}
 	ldr r4, =gScriptResult
-	bl sub_8185338
+	bl MoveRecordedBattleToSaveData
 	strh r0, [r4]
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
diff --git a/asm/battle_interface.s b/asm/battle_interface.s
index 8bc9553f7..d9bb3d8cc 100755
--- a/asm/battle_interface.s
+++ b/asm/battle_interface.s
@@ -780,7 +780,7 @@ sub_807294C: @ 807294C
 	ldr r7, [sp, 0x14]
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, [r4, 0xC]
 	lsls r4, r0, 2
@@ -1398,7 +1398,7 @@ sub_8072E0C: @ 8072E0C
 	lsls r0, 24
 	cmp r0, 0
 	bne _08072F28
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	movs r2, 0x3A
 	ldrsh r0, [r7, r2]
@@ -1500,7 +1500,7 @@ _08072F28:
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [sp, 0x2C]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	ldr r2, [sp, 0x2C]
@@ -2004,7 +2004,7 @@ _0807336A:
 	bne _08073382
 	b _080735A8
 _08073382:
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	ldr r3, [r0]
 	mov r0, r9
@@ -2988,7 +2988,7 @@ _08073BC6:
 	ldr r2, [sp, 0x10]
 	cmp r2, 0
 	beq _08073C0A
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r3, [r0, 0x8]
 	ldrb r2, [r3, 0x9]
@@ -3311,7 +3311,7 @@ sub_8073E64: @ 8073E64
 	bne _08073F54
 	ldrb r5, [r4, 0xA]
 	movs r4, 0
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	adds r0, r7, 0
 	adds r0, 0xE
 	adds r2, r3, r0
@@ -3406,7 +3406,7 @@ _08073F54:
 	negs r0, r0
 	cmp r1, r0
 	bne _08073F8A
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -3516,7 +3516,7 @@ _08074034:
 	negs r0, r0
 	cmp r2, r0
 	bne _0807406A
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r5, 1
@@ -4140,7 +4140,7 @@ _08074542:
 	adds r4, 0x1
 	cmp r4, 0x2
 	ble _08074542
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	adds r0, r7, r0
@@ -4222,7 +4222,7 @@ _080745B8:
 	cmp r0, 0x1
 	bne _08074672
 _08074626:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r7, 2
@@ -4760,7 +4760,7 @@ sub_8074AA0: @ 8074AA0
 	mov r9, r2
 	cmp r2, 0
 	bne _08074AEC
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0xC]
 	mov r1, r8
@@ -4782,7 +4782,7 @@ sub_8074AA0: @ 8074AA0
 	b _08074B48
 	.pool
 _08074AEC:
-	ldr r2, =gUnknown_020244D0
+	ldr r2, =gBattleSpritesDataPtr
 	mov r10, r2
 	ldr r0, [r2]
 	ldr r2, [r0, 0xC]
@@ -4833,7 +4833,7 @@ _08074B48:
 	beq _08074B64
 	cmp r2, 0
 	bne _08074B6C
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	adds r0, r7, r0
@@ -4851,7 +4851,7 @@ _08074B6C:
 	negs r0, r0
 	cmp r4, r0
 	bne _08074B86
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0xC]
 	mov r2, r8
@@ -4890,7 +4890,7 @@ sub_8074B9C: @ 8074B9C
 	beq _08074CA0
 	b _08074D9E
 _08074BB8:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0xC]
 	lsls r5, r6, 2
@@ -4924,7 +4924,7 @@ _08074BF4:
 	ldr r0, =gSprites
 	mov r8, r0
 _08074BFA:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0xC]
 	adds r0, r7, r6
@@ -4995,7 +4995,7 @@ _08074C8A:
 	b _08074D9E
 	.pool
 _08074CA0:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0xC]
 	lsls r5, r6, 2
@@ -5055,7 +5055,7 @@ _08074D02:
 	ldrb r1, [r1]
 	lsls r1, 5
 	adds r0, r1
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0xC]
 	adds r1, r4, r1
@@ -5086,7 +5086,7 @@ _08074D5C:
 	ldrb r1, [r1]
 	lsls r1, 5
 	adds r0, r1
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0xC]
 	adds r1, r4, r1
diff --git a/asm/contest.s b/asm/contest.s
index b469dd8eb..561c79857 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -5587,7 +5587,7 @@ sub_80DA830: @ 80DA830
 	str r1, [r0]
 	bl FreeAllWindowBuffers
 	bl sub_80D7A5C
-	bl sub_805F094
+	bl FreeMonSpritesGfx
 	ldr r0, =c2_exit_to_overworld_2_switch
 	bl SetMainCallback2
 _080DA860:
diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s
index 8a1bf00f1..03e1aaf2b 100644
--- a/asm/contest_link_80F57C4.s
+++ b/asm/contest_link_80F57C4.s
@@ -4569,7 +4569,7 @@ sub_80F7E64: @ 80F7E64
 	str r4, [r0, 0x1C]
 	bl Free
 	str r4, [r5]
-	bl sub_805F094
+	bl FreeMonSpritesGfx
 	pop {r4,r5}
 	pop {r0}
 	bx r0
diff --git a/asm/contest_painting.s b/asm/contest_painting.s
index 03fa9b05a..2caf15194 100644
--- a/asm/contest_painting.s
+++ b/asm/contest_painting.s
@@ -72,7 +72,7 @@ sub_812FE0C: @ 812FE0C
 	movs r0, 0x1
 	bl GetBgTilemapBuffer
 	bl Free
-	bl sub_805F094
+	bl FreeMonSpritesGfx
 	pop {r4,r5}
 	pop {r0}
 	bx r0
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index 0fa0c5eb3..889403787 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -189,7 +189,7 @@ evolution_cutscene: @ 813DA8C
 	ldr r1, =gBattleTerrain
 	movs r0, 0x9
 	strb r0, [r1]
-	bl c2_berry_program_update_menu
+	bl sub_80356D0
 	bl LoadBattleTextboxAndBackground
 	bl ResetSpriteData
 	bl remove_some_task
@@ -482,7 +482,7 @@ sub_813DD7C: @ 813DD7C
 	ldr r1, =gBattleTerrain
 	movs r0, 0x9
 	strb r0, [r1]
-	bl c2_berry_program_update_menu
+	bl sub_80356D0
 	bl LoadBattleTextboxAndBackground
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
@@ -1775,7 +1775,7 @@ _0813EAF6:
 _0813EB06:
 	adds r0, r7, 0
 	bl DestroyTask
-	bl sub_805F094
+	bl FreeMonSpritesGfx
 	ldr r4, =gUnknown_0203AB80
 	ldr r0, [r4]
 	bl Free
diff --git a/asm/link.s b/asm/link.s
index 038633758..fb20b1fb2 100644
--- a/asm/link.s
+++ b/asm/link.s
@@ -71211,7 +71211,7 @@ sub_802DBF8: @ 802DBF8
 	movs r6, 0
 	cmp r6, r10
 	bge _0802DC62
-	ldr r0, =gUnknown_08300D38
+	ldr r0, =gMonFrontPicCoords
 	mov r9, r0
 	ldr r1, =gUnknown_02022D00
 	mov r8, r1
diff --git a/asm/pokeball.s b/asm/pokeball.s
index 557813c19..4e637fb9d 100755
--- a/asm/pokeball.s
+++ b/asm/pokeball.s
@@ -17,7 +17,7 @@ sub_80753E8: @ 80753E8
 	ldr r1, =gDoingBattleAnim
 	movs r0, 0x1
 	strb r0, [r1]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r1, [r6]
@@ -992,7 +992,7 @@ _08075C22:
 	movs r2, 0xC
 	bl PlayCry4
 _08075C2E:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	mov r2, r8
@@ -1082,7 +1082,7 @@ _08075CD8:
 	movs r2, 0xB
 	bl PlayCry4
 _08075CE4:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	mov r2, r8
@@ -1215,7 +1215,7 @@ _08075E00:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08075E56
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r1, [r0, 0x9]
@@ -1247,7 +1247,7 @@ _08075E56:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08075E70
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r1, [r0, 0x9]
@@ -1278,7 +1278,7 @@ _08075E9C:
 _08075EA0:
 	movs r4, 0x2
 _08075EA2:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	mov r2, r8
@@ -1508,7 +1508,7 @@ _0807605C:
 	strh r1, [r0, 0x26]
 	ldr r0, =gDoingBattleAnim
 	strb r2, [r0]
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r0, [r0, 0x4]
 	lsls r1, r6, 1
@@ -1619,7 +1619,7 @@ _08076130:
 	ands r0, r1
 	cmp r0, 0
 	beq _08076196
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r7, 1
@@ -1819,7 +1819,7 @@ _080762F8:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08076358
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r1, [r0, 0x9]
@@ -1892,7 +1892,7 @@ sub_8076398: @ 8076398
 	lsls r0, 24
 	cmp r0, 0
 	beq _080763E8
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r1, [r0, 0x9]
diff --git a/asm/pokeblock_feed.s b/asm/pokeblock_feed.s
index bc402d91c..1f8e45f0a 100644
--- a/asm/pokeblock_feed.s
+++ b/asm/pokeblock_feed.s
@@ -797,7 +797,7 @@ sub_817A2C0: @ 817A2C0
 	ldr r0, =gUnknown_0203BD18
 	ldr r0, [r0]
 	bl Free
-	bl sub_805F094
+	bl FreeMonSpritesGfx
 _0817A304:
 	pop {r4}
 	pop {r0}
diff --git a/asm/recorded_battle.s b/asm/recorded_battle.s
index 48325cfed..f733033ff 100644
--- a/asm/recorded_battle.s
+++ b/asm/recorded_battle.s
@@ -348,7 +348,7 @@ _0818507A:
 	movs r2, 0
 	movs r3, 0x10
 	bl BeginNormalPaletteFade
-	ldr r0, =sub_80384E4
+	ldr r0, =CB2_QuitRecordedBattle
 	bl SetMainCallback2
 	movs r0, 0xFF
 	b _081850C6
@@ -681,8 +681,8 @@ _08185332:
 	bx r1
 	thumb_func_end sub_81852F0
 
-	thumb_func_start sub_8185338
-sub_8185338: @ 8185338
+	thumb_func_start MoveRecordedBattleToSaveData
+MoveRecordedBattleToSaveData: @ 8185338
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1469,7 +1469,7 @@ _08185A14:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_8185338
+	thumb_func_end MoveRecordedBattleToSaveData
 
 	thumb_func_start sub_8185A54
 sub_8185A54: @ 8185A54
@@ -2655,8 +2655,8 @@ sub_8186444: @ 8186444
 	.pool
 	thumb_func_end sub_8186444
 
-	thumb_func_start rfu_lacks_rfufunc
-rfu_lacks_rfufunc: @ 8186450
+	thumb_func_start sub_8186450
+sub_8186450: @ 8186450
 	push {lr}
 	movs r1, 0
 	ldr r0, =gUnknown_0203CCD0
@@ -2669,7 +2669,7 @@ _0818645E:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end rfu_lacks_rfufunc
+	thumb_func_end sub_8186450
 
 	thumb_func_start sub_8186468
 sub_8186468: @ 8186468
diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s
index 8bc97b45a..c7e384a10 100644
--- a/asm/reshow_battle_screen.s
+++ b/asm/reshow_battle_screen.s
@@ -348,7 +348,7 @@ sub_80A9614: @ 80A9614
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A9676
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r4, 2
@@ -404,7 +404,7 @@ _080A96AA:
 	bl sub_805DF84
 	b _080A96F4
 _080A96B2:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r4, 2
@@ -459,7 +459,7 @@ sub_80A9708: @ 80A9708
 	bcc _080A9722
 	b _080A9AA0
 _080A9722:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	lsls r2, r7, 2
@@ -591,7 +591,7 @@ _080A9786:
 	adds r1, r7, r1
 	ldrb r1, [r1]
 	bl StartSpriteAnim
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	ldr r2, [sp]
@@ -808,7 +808,7 @@ _080A998C:
 	adds r1, r7, r1
 	ldrb r1, [r1]
 	bl StartSpriteAnim
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	ldr r1, [sp]
@@ -839,7 +839,7 @@ _080A9A70:
 	adds r2, r0
 	lsls r2, 2
 	adds r2, r1
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	ldr r1, [sp]
diff --git a/asm/rom_80A5C6C.s b/asm/rom_80A5C6C.s
index 6135f81e0..bb74b3713 100644
--- a/asm/rom_80A5C6C.s
+++ b/asm/rom_80A5C6C.s
@@ -94,7 +94,7 @@ _080A5D28:
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A5D60
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r5, 2
@@ -112,7 +112,7 @@ _080A5D28:
 	b _080A5D7E
 	.pool
 _080A5D60:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r5, 2
@@ -195,7 +195,7 @@ _080A5E00:
 	ldr r2, [r2, 0x8]
 	b _080A5E42
 _080A5E04:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	lsls r1, r4, 2
@@ -285,7 +285,7 @@ _080A5EC0:
 _080A5EC8:
 	cmp r5, 0xC9
 	bne _080A5F58
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	lsls r1, r4, 2
@@ -344,7 +344,7 @@ _080A5F44:
 	lsls r0, 16
 	lsrs r0, 16
 _080A5F4E:
-	ldr r1, =gUnknown_08300D38
+	ldr r1, =gMonFrontPicCoords
 	lsls r0, 2
 	b _080A5F90
 	.pool
@@ -352,7 +352,7 @@ _080A5F58:
 	ldr r0, =0x00000181
 	cmp r5, r0
 	bne _080A5F7C
-	ldr r0, =gUnknown_08525F78
+	ldr r0, =gCastformFrontSpriteCoords
 	ldr r1, =gBattleMonForms
 	adds r1, r4, r1
 	ldrb r1, [r1]
@@ -366,11 +366,11 @@ _080A5F7C:
 	lsls r0, 1
 	cmp r5, r0
 	bls _080A5F8C
-	ldr r0, =gUnknown_08300D38
+	ldr r0, =gMonFrontPicCoords
 	b _080A5F92
 	.pool
 _080A5F8C:
-	ldr r1, =gUnknown_08300D38
+	ldr r1, =gMonFrontPicCoords
 _080A5F8E:
 	lsls r0, r5, 2
 _080A5F90:
@@ -546,7 +546,7 @@ _080A60E4:
 	ldrh r1, [r2]
 	b _080A610E
 _080A60E8:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r4, 2
@@ -654,7 +654,7 @@ sub_80A6190: @ 80A6190
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A61E4
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r5, 2
@@ -672,7 +672,7 @@ sub_80A6190: @ 80A6190
 	b _080A6202
 	.pool
 _080A61E4:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r5, 2
@@ -2976,7 +2976,7 @@ _080A72B4:
 	lsls r0, 30
 	cmp r0, 0
 	bne _080A7312
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r7, 1
@@ -4571,7 +4571,7 @@ _080A7F78:
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A7FD8
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r5, 2
@@ -4606,7 +4606,7 @@ _080A7FD0:
 	b _080A8026
 	.pool
 _080A7FD8:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r5, 2
@@ -4641,7 +4641,7 @@ _080A8018:
 	b _080A8042
 	.pool
 _080A8024:
-	ldr r0, =gUnknown_08300D38
+	ldr r0, =gMonFrontPicCoords
 _080A8026:
 	lsls r1, r2, 2
 	adds r1, r0
@@ -5200,7 +5200,7 @@ _080A8412:
 	lsrs r0, 24
 	cmp r0, 0x1
 	beq _080A845E
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	ldr r2, [sp, 0x40]
@@ -5263,7 +5263,7 @@ _080A84B0:
 	lsrs r0, 24
 	cmp r0, 0x1
 	beq _080A84F6
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	ldr r3, [sp, 0x40]
@@ -5338,7 +5338,7 @@ _080A8540:
 	mov r2, r10
 	lsls r1, r2, 16
 	asrs r1, 16
-	ldr r3, =gUnknown_08300D38
+	ldr r3, =gMonFrontPicCoords
 	b _080A85B2
 	.pool
 _080A85A0:
@@ -5490,7 +5490,7 @@ _080A86C4:
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A8790
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	mov r1, r8
@@ -5580,7 +5580,7 @@ _080A8784:
 	b _080A8864
 	.pool
 _080A8790:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	mov r1, r8
@@ -5662,7 +5662,7 @@ _080A8834:
 	add r0, r8
 	ldrb r0, [r0]
 	lsls r0, 2
-	ldr r1, =gUnknown_08525F78
+	ldr r1, =gCastformFrontSpriteCoords
 	adds r4, r0, r1
 	b _080A8866
 	.pool
@@ -5671,13 +5671,13 @@ _080A8850:
 	lsls r0, 1
 	cmp r7, r0
 	bls _080A8860
-	ldr r4, =gUnknown_08300D38
+	ldr r4, =gMonFrontPicCoords
 	b _080A8866
 	.pool
 _080A8860:
 	lsls r1, r7, 2
 _080A8862:
-	ldr r0, =gUnknown_08300D38
+	ldr r0, =gMonFrontPicCoords
 _080A8864:
 	adds r4, r1, r0
 _080A8866:
diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s
index e5f69eeac..231879f02 100644
--- a/asm/script_pokemon_util_80F87D8.s
+++ b/asm/script_pokemon_util_80F87D8.s
@@ -842,7 +842,7 @@ sub_80F8EB8: @ 80F8EB8
 	ldrh r0, [r1, 0x8]
 	adds r0, 0x1
 	strh r0, [r1, 0x8]
-	bl sub_805F094
+	bl FreeMonSpritesGfx
 _080F8EDC:
 	pop {r0}
 	bx r0
diff --git a/asm/trade.s b/asm/trade.s
index 42ed85948..d4c54cef6 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -8939,7 +8939,7 @@ _0807C04C:
 	adds r1, r0
 	lsls r1, 2
 	adds r1, r3
-	ldr r2, =gUnknown_08300D38
+	ldr r2, =gMonFrontPicCoords
 	adds r0, r4, 0
 	adds r0, 0xF0
 	ldrh r0, [r0]
@@ -10395,7 +10395,7 @@ _0807CD1C:
 	adds r1, r0
 	lsls r1, 2
 	adds r1, r4
-	ldr r3, =gUnknown_08300D38
+	ldr r3, =gMonFrontPicCoords
 	adds r2, 0xF2
 	ldrh r0, [r2]
 	lsls r0, 2
@@ -10663,7 +10663,7 @@ _0807CF5C:
 	movs r0, 0
 	bl GetBgTilemapBuffer
 	bl Free
-	bl sub_805F094
+	bl FreeMonSpritesGfx
 	ldr r0, [r7]
 	bl Free
 	str r4, [r7]
@@ -11001,7 +11001,7 @@ _0807D428:
 	adds r1, r0
 	lsls r1, 2
 	adds r1, r3
-	ldr r2, =gUnknown_08300D38
+	ldr r2, =gMonFrontPicCoords
 	adds r0, r4, 0
 	adds r0, 0xF0
 	ldrh r0, [r0]
@@ -12500,7 +12500,7 @@ _0807E168:
 	adds r1, r0
 	lsls r1, 2
 	adds r1, r4
-	ldr r3, =gUnknown_08300D38
+	ldr r3, =gMonFrontPicCoords
 	adds r2, 0xF2
 	ldrh r0, [r2]
 	lsls r0, 2
@@ -12768,7 +12768,7 @@ _0807E3A8:
 	movs r0, 0
 	bl GetBgTilemapBuffer
 	bl Free
-	bl sub_805F094
+	bl FreeMonSpritesGfx
 	ldr r0, [r7]
 	bl Free
 	str r4, [r7]
@@ -14136,7 +14136,7 @@ c2_080543C4: @ 807F068
 	movs r0, 0
 	bl GetBgTilemapBuffer
 	bl Free
-	bl sub_805F094
+	bl FreeMonSpritesGfx
 	ldr r4, =gUnknown_020322A0
 	ldr r0, [r4]
 	bl Free
diff --git a/data/battle_anims.s b/data/battle_anims.s
index 6b48bcd2a..8b285f7be 100644
--- a/data/battle_anims.s
+++ b/data/battle_anims.s
@@ -327,7 +327,7 @@ gUnknown_08525E98:: @ 8525E98
 gUnknown_08525F58:: @ 8525F58
 	.incbin "baserom.gba", 0x525f58, 0x20
 
-gUnknown_08525F78:: @ 8525F78
+gCastformFrontSpriteCoords:: @ 8525F78
 	.incbin "baserom.gba", 0x525f78, 0x10
 
 gUnknown_08525F88:: @ 8525F88
diff --git a/data/data2b.s b/data/data2b.s
index fd72e835e..96d56c820 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -95,7 +95,7 @@ gUnknown_082FF6C0:: @ 82FF6C0
 gUnknown_082FF70C:: @ 82FF70C
 	.incbin "baserom.gba", 0x2ff70c, 0x162c
 
-gUnknown_08300D38:: @ 8300D38
+gMonFrontPicCoords:: @ 8300D38
 	.incbin "baserom.gba", 0x300d38, 0x6e0
 
 @ 8301418
@@ -196,8 +196,13 @@ gUnknown_0831AC70:: @ 831AC70
 gUnknown_0831AC88:: @ 831AC88
 	.incbin "baserom.gba", 0x31ac88, 0x18
 
-gUnknown_0831ACA0:: @ 831ACA0
-	.incbin "baserom.gba", 0x31aca0, 0x40
+gText_ShedinjaJapaneseName:: @ 831ACA0
+	.string "ヌケニン$" @Nukenin
+    
+.align 2   
+ 
+gUnknown_0831ACA8:: @ 831ACA8
+	.incbin "baserom.gba", 0x31aca8, 0x38
 
 gUnknown_0831ACE0:: @ 831ACE0
 	.incbin "baserom.gba", 0x31ace0, 0x8
diff --git a/data/event_scripts.s b/data/event_scripts.s
index e4293570d..4dd5761e5 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -84,14 +84,14 @@ gUnknown_0823B68C:: @ 823B68C
 gUnknown_0823C050:: @ 823C050
 	.incbin "baserom.gba", 0x23c050, 0x6431
 
-gUnknown_08242481:: @ 8242481
+gText_BattleRecordCouldntBeSaved:: @ 8242481
 	.incbin "baserom.gba", 0x242481, 0x87b
 
 gUnknown_08242CFC:: @ 8242CFC
 	.incbin "baserom.gba", 0x242cfc, 0x6a91
 
-gUnknown_0824978D:: @ 824978D
-	.incbin "baserom.gba", 0x24978d, 0xe
+gText_LinkStandby3:: @ 824978D
+	.string "Link standby…$"
 
 gUnknown_0824979B:: @ 824979B
 	.incbin "baserom.gba", 0x24979b, 0x944d
diff --git a/include/battle.h b/include/battle.h
index 72168aa60..afb3c8d6e 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -264,32 +264,32 @@
 
 struct TrainerMonNoItemDefaultMoves
 {
-    u16 species;
+    u16 iv;
     u8 lvl;
-    u16 evsValue;
+    u16 species;
 };
 
 struct TrainerMonItemDefaultMoves
 {
-    u16 species;
+    u16 iv;
     u8 lvl;
-    u16 evsValue;
+    u16 species;
     u16 heldItem;
 };
 
 struct TrainerMonNoItemCustomMoves
 {
-    u16 species;
+    u16 iv;
     u8 lvl;
-    u16 evsValue;
+    u16 species;
     u16 moves[4];
 };
 
 struct TrainerMonItemCustomMoves
 {
-    u16 species;
+    u16 iv;
     u8 lvl;
-    u16 evsValue;
+    u16 species;
     u16 heldItem;
     u16 moves[4];
 };
@@ -863,10 +863,13 @@ extern struct BattleScripting gBattleScripting;
 // battle_1
 void LoadBattleTextboxAndBackground(void);
 void LoadBattleEntryBackground(void);
+void ApplyPlayerChosenFrameToBattleMenu(void);
+bool8 LoadChosenBattleElement(u8 caseId);
 void task00_0800F6FC(u8 taskId);
 
 // battle_2
 void CB2_InitBattle(void);
+void CB2_QuitRecordedBattle(void);
 void CancelMultiTurnMoves(u8 bank);
 void PressurePPLose(u8 bankAtk, u8 bankDef, u16 move);
 void PrepareStringBattle(u16 stringId, u8 bank);
@@ -933,15 +936,18 @@ extern const u8 gUnknown_0831C494[];
 
 // battle_5
 void AllocateBattleResrouces(void);
+void FreeBattleResources(void);
 void AdjustFriendshipOnBattleFaint(u8 bank);
 void sub_80571DC(u8 bank, u8 arg1);
 u32 sub_805725C(u8 bank);
 
 // battle 7
 void AllocateBattleSpritesData(void);
+void FreeBattleSpritesData(void);
+void AllocateMonSpritesGfx(void);
+void FreeMonSpritesGfx(void);
 void BattleMusicStop(void);
 void sub_805E990(struct Pokemon* mon, u8 bank);
-void AllocateMonSpritesGfx(void);
 void sub_805EF14(void);
 bool8 BattleInitAllSprites(u8 *state1, u8 *state2);
 
@@ -950,6 +956,30 @@ u8 GetBankSide(u8 bank);
 u8 GetBankIdentity(u8 bank);
 u8 GetBankByIdentity(u8 bank);
 
+struct BattleSpriteInfo
+{
+    u16 invisible : 1; // 0x1
+    u16 flag_x2 : 1; // 0x2
+    u16 behindSubstitute : 1; // 0x4
+    u16 flag_x8 : 1; // 0x8
+    u16 hpNumbersNoBars : 1; // 0x10
+    u16 transformSpecies;
+};
+
+struct BattleAnimationInfo
+{
+    u16 field; // to fill up later
+};
+
+struct BattleSpriteData
+{
+    struct BattleSpriteInfo *bankData;
+    void* field_4;
+    struct BattleAnimationInfo *animationData;
+};
+
+extern struct BattleSpriteData *gBattleSpritesDataPtr;
+
 // Move this somewhere else
 
 #include "sprite.h"
diff --git a/include/link.h b/include/link.h
index b719371da..9d581a6c1 100644
--- a/include/link.h
+++ b/include/link.h
@@ -182,5 +182,6 @@ void sub_800E0E8(void);
 bool8 sub_800A520(void);
 bool8 sub_8010500(void);
 void sub_800DFB4(u8, u8);
+void sub_800ADF8(void);
 
 #endif // GUARD_LINK_H
diff --git a/include/main.h b/include/main.h
index e5460b3bf..e283d1754 100644
--- a/include/main.h
+++ b/include/main.h
@@ -39,6 +39,7 @@ struct Main
 
     /*0x439*/ u8 oamLoadDisabled:1;
     /*0x439*/ u8 inBattle:1;
+    /*0x439*/ u8 field_439_x4:1;
 };
 
 extern u8 gUnknown_3001764;
diff --git a/include/pokemon.h b/include/pokemon.h
index 5ebb9afb1..4b678d679 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -637,5 +637,6 @@ void sub_8068AA4(void); // sets stats for deoxys
 #include "sprite.h"
 
 void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3);
+void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3);
 
 #endif // GUARD_POKEMON_H
diff --git a/include/recorded_battle.h b/include/recorded_battle.h
index 407d0caf7..5f3099d83 100644
--- a/include/recorded_battle.h
+++ b/include/recorded_battle.h
@@ -7,5 +7,8 @@ void sub_8185F84(void);
 void sub_8184E58(void);
 void RecordedBattle_SetBankAction(u8 bank, u8 action);
 void sub_8185F90(u16 arg0);
+bool8 sub_8186450(void);
+u8 sub_8185FAC(void);
+u8 MoveRecordedBattleToSaveData(void);
 
 #endif // GUARD_RECORDED_BATTLE_H
diff --git a/include/unknown_task.h b/include/unknown_task.h
index 7457451a8..9c6968c30 100644
--- a/include/unknown_task.h
+++ b/include/unknown_task.h
@@ -17,5 +17,6 @@ extern struct UnknownTaskStruct gUnknown_0831AC70;
 // Exported ROM declarations
 void remove_some_task(void);
 void sub_80BA038(struct UnknownTaskStruct arg0);
+void sub_80BA0A8(void);
 
 #endif // GUARD_unknown_task_H
diff --git a/src/battle_2.c b/src/battle_2.c
index 844827326..8d1f6a7a1 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -20,6 +20,14 @@
 #include "dma3.h"
 #include "string_util.h"
 #include "malloc.h"
+#include "event_data.h"
+#include "m4a.h"
+#include "window.h"
+#include "rng.h"
+#include "songs.h"
+#include "sound.h"
+#include "battle_message.h"
+#include "sprite.h"
 
 struct UnknownStruct6
 {
@@ -64,21 +72,43 @@ extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
 extern void (*gPreBattleCallback1)(void);
 extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for?
 extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for?
-
+extern u8 gBattleOutcome;
+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 u8 gDecompressionBuffer[];
+extern u16 gUnknown_020243FC;
+extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+
+extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
+extern const struct BattleMove gBattleMoves[];
+extern const u16 gUnknown_08C004E0[]; // battle textbox palette
+extern const struct BgTemplate gUnknown_0831AA08[];
+extern const struct WindowTemplate * const gUnknown_0831ABA0[];
+
+// 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 void HandleLinkBattleSetup(void); // rom_3
 extern void SetUpBattleVarsAndBirchZigzagoon(void); // rom_3
 extern void sub_8032768(void); // rom_3
 extern void dp12_8087EA4(void);
-extern void c2_berry_program_update_menu(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 sub_81DB4DC(u8* dst, u8 arg2); //
 extern void sub_81B9150(void);
-extern void sub_800ADF8(void);
 extern void sub_800AC34(void);
+extern void sub_80B3AF8(u8 taskId); // cable club
+extern void sub_8076918(u8 bank);
+extern void sub_80729D0(u8 healthoxSpriteId);
 
 // this file's functions
 static void CB2_InitBattleInternal(void);
@@ -87,9 +117,22 @@ static void CB2_PreInitIngamePlayerPartnerBattle(void);
 static void CB2_HandleStartMultiPartnerBattle(void);
 static void CB2_HandleStartMultiBattle(void);
 static void CB2_HandleStartBattle(void);
-void shedinja_something(struct Pokemon *mon);
-void CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 firstTrainer);
+static void TryCorrectShedinjaLanguage(struct Pokemon *mon);
+static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 firstTrainer);
 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 oac_poke_opponent(struct Sprite *sprite);
+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);
+void sub_8039AF4(struct Sprite *sprite);
 
 void CB2_InitBattle(void)
 {
@@ -129,7 +172,7 @@ static void CB2_InitBattleInternal(void)
     SetHBlankCallback(NULL);
     SetVBlankCallback(NULL);
 
-    CpuFill32(0, (void *)VRAM, VRAM_SIZE);
+    CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
 
     SetGpuReg(REG_OFFSET_MOSAIC, 0);
     SetGpuReg(REG_OFFSET_WIN0H, 240);
@@ -182,7 +225,7 @@ static void CB2_InitBattleInternal(void)
     if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
         gBattleTerrain = BATTLE_TERRAIN_INSIDE;
 
-    c2_berry_program_update_menu();
+    sub_80356D0();
     LoadBattleTextboxAndBackground();
     ResetSpriteData();
     ResetTasks();
@@ -573,12 +616,12 @@ static void CB2_HandleStartBattle(void)
         {
             ResetBlockReceivedFlags();
             memcpy(gEnemyParty + 4, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
-            shedinja_something(&gEnemyParty[0]);
-            shedinja_something(&gEnemyParty[1]);
-            shedinja_something(&gEnemyParty[2]);
-            shedinja_something(&gEnemyParty[3]);
-            shedinja_something(&gEnemyParty[4]);
-            shedinja_something(&gEnemyParty[5]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[0]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[1]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[2]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[3]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[4]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[5]);
             gBattleCommunication[MULTIUSE_STATE]++;
         }
         break;
@@ -827,18 +870,18 @@ static void CB2_HandleStartMultiPartnerBattle(void)
             ResetBlockReceivedFlags();
             if (GetMultiplayerId() != 0)
                 memcpy(gEnemyParty + 4, gBlockRecvBuffer[0], sizeof(struct Pokemon) * 2);
-            shedinja_something(&gPlayerParty[0]);
-            shedinja_something(&gPlayerParty[1]);
-            shedinja_something(&gPlayerParty[2]);
-            shedinja_something(&gPlayerParty[3]);
-            shedinja_something(&gPlayerParty[4]);
-            shedinja_something(&gPlayerParty[5]);
-            shedinja_something(&gEnemyParty[0]);
-            shedinja_something(&gEnemyParty[1]);
-            shedinja_something(&gEnemyParty[2]);
-            shedinja_something(&gEnemyParty[3]);
-            shedinja_something(&gEnemyParty[4]);
-            shedinja_something(&gEnemyParty[5]);
+            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;
@@ -1262,19 +1305,19 @@ static void CB2_HandleStartMultiBattle(void)
                     }
                 }
             }
-            shedinja_something(&gPlayerParty[0]);
-            shedinja_something(&gPlayerParty[1]);
-            shedinja_something(&gPlayerParty[2]);
-            shedinja_something(&gPlayerParty[3]);
-            shedinja_something(&gPlayerParty[4]);
-            shedinja_something(&gPlayerParty[5]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[0]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[1]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[2]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[3]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[4]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[5]);
 
-            shedinja_something(&gEnemyParty[0]);
-            shedinja_something(&gEnemyParty[1]);
-            shedinja_something(&gEnemyParty[2]);
-            shedinja_something(&gEnemyParty[3]);
-            shedinja_something(&gEnemyParty[4]);
-            shedinja_something(&gEnemyParty[5]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[0]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[1]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[2]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[3]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[4]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[5]);
 
             gBattleCommunication[MULTIUSE_STATE]++;
         }
@@ -1341,3 +1384,991 @@ static void CB2_HandleStartMultiBattle(void)
     }
 }
 
+void BattleMainCB2(void)
+{
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+    RunTasks();
+
+    if (gMain.heldKeys & B_BUTTON && gBattleTypeFlags & BATTLE_TYPE_RECORDED && sub_8186450())
+    {
+        gScriptResult = gBattleOutcome = BATTLE_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(&gMPlay_SE1);
+        m4aMPlayStop(&gMPlay_SE2);
+        FreeRestoreBattleData();
+        FreeAllWindowBuffers();
+        SetMainCallback2(gMain.savedCallback);
+    }
+}
+
+static void sub_8038528(struct Sprite* sprite)
+{
+    sprite->data0 = 0;
+    sprite->callback = sub_8038538;
+}
+
+static void sub_8038538(struct Sprite *sprite)
+{
+    u16 *arr = (u16*)(gDecompressionBuffer);
+
+    switch (sprite->data0)
+    {
+    case 0:
+        sprite->data0++;
+        sprite->data1 = 0;
+        sprite->data2 = 0x281;
+        sprite->data3 = 0;
+        sprite->data4 = 1;
+        // fall through
+    case 1:
+        sprite->data4--;
+        if (sprite->data4 == 0)
+        {
+            s32 i;
+            s32 r2;
+            s32 r0;
+
+            sprite->data4 = 2;
+            r2 = sprite->data1 + sprite->data3 * 32;
+            r0 = sprite->data2 - sprite->data3 * 32;
+            for (i = 0; i < 29; i += 2)
+            {
+                arr[r2 + i] = 0x3D;
+                arr[r0 + i] = 0x3D;
+            }
+            sprite->data3++;
+            if (sprite->data3 == 21)
+            {
+                sprite->data0++;
+                sprite->data1 = 32;
+            }
+        }
+        break;
+    case 2:
+        sprite->data1--;
+        if (sprite->data1 == 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] != 0xFF; 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 PARTY_FLAG_CUSTOM_MOVES:
+            {
+                const struct TrainerMonNoItemCustomMoves *partyData = gTrainers[trainerNum].party.NoItemCustomMoves;
+
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; 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 PARTY_FLAG_HAS_ITEM:
+            {
+                const struct TrainerMonItemDefaultMoves *partyData = gTrainers[trainerNum].party.ItemDefaultMoves;
+
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; 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 PARTY_FLAG_CUSTOM_MOVES | PARTY_FLAG_HAS_ITEM:
+            {
+                const struct TrainerMonItemCustomMoves *partyData = gTrainers[trainerNum].party.ItemCustomMoves;
+
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; 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->data0 != 0)
+        sprite->pos1.x = sprite->data1 + ((sprite->data2 & 0xFF00) >> 8);
+    else
+        sprite->pos1.x = sprite->data1 - ((sprite->data2 & 0xFF00) >> 8);
+
+    sprite->data2 += 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 < 6; 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 < 6; 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(gUnknown_08C004E0, 0, 64);
+        ApplyPlayerChosenFrameToBattleMenu();
+        ResetSpriteData();
+        ResetTasks();
+        LoadBattleEntryBackground();
+        SetGpuReg(REG_OFFSET_WINOUT, 0x37);
+        FreeAllSpritePalettes();
+        gReservedSpritePaletteCount = 4;
+        SetVBlankCallback(VBlankCB_Battle);
+
+        taskId = CreateTask(task00_0800F6FC, 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) == 3; i++);
+
+            if (!gSaveBlock2Ptr->field_CA9_b && i == monsCount)
+            {
+                if (FlagGet(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();
+            sub_814F9EC(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)
+        {
+            sub_814F9EC(gText_RecordBattleToPass, 0);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 4:
+        if (!IsTextPrinterActive(0))
+        {
+            sub_8056A3C(0x18, 8, 0x1D, 0xD, 0);
+            sub_814F9EC(gText_BattleYesNoChoice, 0xC);
+            gBattleCommunication[CURSOR_POSITION] = 1;
+            BattleCreateCursorAt(1);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 5:
+        if (gMain.newKeys & DPAD_UP)
+        {
+            if (gBattleCommunication[CURSOR_POSITION] != 0)
+            {
+                PlaySE(SE_SELECT);
+                BattleDestroyCursorAt(gBattleCommunication[CURSOR_POSITION]);
+                gBattleCommunication[CURSOR_POSITION] = 0;
+                BattleCreateCursorAt(0);
+            }
+        }
+        else if (gMain.newKeys & DPAD_DOWN)
+        {
+            if (gBattleCommunication[CURSOR_POSITION] == 0)
+            {
+                PlaySE(SE_SELECT);
+                BattleDestroyCursorAt(gBattleCommunication[CURSOR_POSITION]);
+                gBattleCommunication[CURSOR_POSITION] = 1;
+                BattleCreateCursorAt(1);
+            }
+        }
+        else if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            if (gBattleCommunication[CURSOR_POSITION] == 0)
+            {
+                sub_8056A3C(0x18, 8, 0x1D, 0xD, 1);
+                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)
+        {
+            sub_8056A3C(0x18, 8, 0x1D, 0xD, 1);
+            if (gMain.field_439_x4)
+            {
+                sub_800ADF8();
+                sub_814F9EC(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);
+            sub_814F9EC(gDisplayedStringBattle, 0);
+            gBattleCommunication[1] = 0x80;
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        else
+        {
+            BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordCouldntBeSaved);
+            sub_814F9EC(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();
+                sub_814F9EC(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               data0
+#define tSpeciesId          data2
+
+static 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);
+        sub_80729D0(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->data3 = 6;
+    sprite->data4 = 1;
+    sprite->callback = sub_80398D0;
+}
+
+extern u32 gUnknown_02022F88;
+extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
+extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
+
+static void sub_80398D0(struct Sprite *sprite)
+{
+    sprite->data4--;
+    if (sprite->data4 == 0)
+    {
+        sprite->data4 = 8;
+        sprite->invisible ^= 1;
+        sprite->data3--;
+        if (sprite->data3 == 0)
+        {
+            sprite->invisible = FALSE;
+            sprite->callback = SpriteCallbackDummy_2;
+            gUnknown_02022F88 = 0;
+        }
+    }
+}
+
+// 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[];
+
+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->data3 = 8 - yOffset / 8;
+    sprite->data4 = 1;
+    sprite->callback = sub_8039A48;
+}
+
+static void sub_8039A48(struct Sprite *sprite)
+{
+    s32 i;
+
+    sprite->data4--;
+    if (sprite->data4 == 0)
+    {
+        sprite->data4 = 2;
+        sprite->pos2.y += 8;
+        sprite->data3--;
+        if (sprite->data3 < 0)
+        {
+            FreeSpriteOamMatrix(sprite);
+            DestroySprite(sprite);
+        }
+        else
+        {
+            u8 *dst = (u8 *)gMonSpritesGfxPtr->sprites[GetBankIdentity(sprite->tBank)] + (gBattleMonForms[sprite->tBank] << 11) + (sprite->data3 << 8);
+
+            for (i = 0; i < 0x100; i++)
+                *(dst++) = 0;
+
+            StartSpriteAnim(sprite, gBattleMonForms[sprite->tBank]);
+        }
+    }
+}
+
+void sub_8039AD8(struct Sprite *sprite)
+{
+    sprite->data3 = 8;
+    sprite->data4 = sprite->invisible;
+    sprite->callback = sub_8039AF4;
+}
+
+void sub_8039AF4(struct Sprite *sprite)
+{
+    sprite->data3--;
+    if (sprite->data3 == 0)
+    {
+        sprite->invisible ^= 1;
+        sprite->data3 = 8;
+    }
+}
+
+void sub_8039B2C(struct Sprite *sprite)
+{
+    sprite->invisible = sprite->data4;
+    sprite->data4 = FALSE;
+    sprite->callback = SpriteCallbackDummy_2;
+}
+
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 3b719b8ed..03e1b6a4a 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -145,7 +145,7 @@ 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 c2_berry_program_update_menu(void);
+extern void sub_80356D0(void);
 
 // BattleScripts
 extern const u8 BattleScript_MoveEnd[];
@@ -11216,7 +11216,7 @@ static void atkF2_display_dex_info(void)
         }
         break;
     case 3:
-        c2_berry_program_update_menu();
+        sub_80356D0();
         LoadBattleTextboxAndBackground();
         gBattle_BG3_X = 0x100;
         gBattleCommunication[0]++;
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index c5cee6357..4e4c10090 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -65,7 +65,7 @@ extern void fade_screen(u8, u8);
 extern void overworld_free_bg_tilemaps(void);
 extern void sub_80AF168(void);
 extern void AllocateMonSpritesGfx(void);
-extern void sub_805F094(void);
+extern void FreeMonSpritesGfx(void);
 extern void remove_some_task(void);
 extern void reset_temp_tile_data_buffers(void);
 extern void c2_exit_to_overworld_2_switch(void);
@@ -570,7 +570,7 @@ static void CB2_EggHatch_0(void)
 static void EggHatchSetMonNickname(void)
 {
     SetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar3);
-    sub_805F094();
+    FreeMonSpritesGfx();
     Free(sEggHatchData);
     SetMainCallback2(c2_exit_to_overworld_2_switch);
 }
@@ -691,7 +691,7 @@ static void CB2_EggHatch_1(void)
     case 12:
         if (!gPaletteFade.active)
         {
-            sub_805F094();
+            FreeMonSpritesGfx();
             RemoveWindow(sEggHatchData->windowId);
             UnsetBgTilemapBuffer(0);
             UnsetBgTilemapBuffer(1);
diff --git a/sym_ewram.txt b/sym_ewram.txt
index ce3b4f250..aecb28dac 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -520,7 +520,7 @@ gUnknown_020244BC: @ 20244BC
 gUnknown_020244CC: @ 20244CC
 	.space 0x4
 
-gUnknown_020244D0: @ 20244D0
+gBattleSpritesDataPtr: @ 20244D0
 	.space 0x4
 
 gMonSpritesGfxPtr: @ 20244D4

From 0fe97e838eab14723a4a38a773e2bc4d1494241e Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 1 Oct 2017 15:05:00 -0500
Subject: [PATCH 15/42] add asmdiff.sh comparison script

---
 asmdiff.sh | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 asmdiff.sh

diff --git a/asmdiff.sh b/asmdiff.sh
new file mode 100644
index 000000000..1d2141c32
--- /dev/null
+++ b/asmdiff.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
+OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
+$OBJDUMP $OPTIONS baserom.gba > baserom.dump
+$OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
+diff baserom.dump pokeemerald.dump

From 84e5819ca3944df99a1817ad8ab828993035f18b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 1 Oct 2017 19:01:37 -0400
Subject: [PATCH 16/42] Sanitize data/tilesets.s, 2

---
 data/tileset.s | 56 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/data/tileset.s b/data/tileset.s
index c60d83d61..6a49cbd08 100644
--- a/data/tileset.s
+++ b/data/tileset.s
@@ -1,8 +1,8 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 
-    .section .rodata
-    .align 2, 0
+	.section .rodata
+	.align 2, 0
 
 gUnknown_085105C4::
 	.incbin "baserom.gba", 0x5105c4, 0x80
@@ -13,7 +13,7 @@ gUnknown_08510644::
 gUnknown_085106C4::
 	.incbin "baserom.gba", 0x5106c4, 0x80
 
-    .space 0x20
+	.space 0x20
 
 gUnknown_08510764:: @ 8510764
 @ replacing .incbin "baserom.gba", 0x00510764, 0x10
@@ -254,7 +254,7 @@ gUnknown_08515224::
 gUnknown_085152A4::
 	.incbin "baserom.gba", 0x5152a4, 0x80
 
-    .space 0x20
+	.space 0x20
 
 gUnknown_08515344:: @ 8515344
 @ replacing .incbin "baserom.gba", 0x00515344, 0x20
@@ -386,7 +386,13 @@ gUnknown_08515A6C::
 	.incbin "baserom.gba", 0x515a6c, 0x80
 
 gUnknown_08515AEC::
-	.incbin "baserom.gba", 0x515aec, 0x2a0
+	.incbin "baserom.gba", 0x515aec, 0x80
+
+gUnknown_08515B6C::
+	.incbin "baserom.gba", 0x515b6c, 0x20
+
+gUnknown_08515B8C::
+	.incbin "baserom.gba", 0x515b8c, 0x200
 
 
 gUnknown_08515D8C:: @ 8515D8C
@@ -584,7 +590,9 @@ gUnknown_08517B9C::
 	.incbin "baserom.gba", 0x517b9c, 0x20
 
 gUnknown_08517BBC::
-	.incbin "baserom.gba", 0x517bbc, 0x40
+	.incbin "baserom.gba", 0x517bbc, 0x20
+
+	.space 0x20
 
 
 gUnknown_08517BFC:: @ 8517BFC
@@ -603,7 +611,9 @@ gUnknown_08517C14::
 	.incbin "baserom.gba", 0x517c14, 0x200
 
 gUnknown_08517E14::
-	.incbin "baserom.gba", 0x517e14, 0x220
+	.incbin "baserom.gba", 0x517e14, 0x200
+
+	.space 0x20
 
 
 gUnknown_08518034:: @ 8518034
@@ -615,8 +625,9 @@ gUnknown_0851803C::
 	.incbin "baserom.gba", 0x51803c, 0x120
 
 gUnknown_0851815C::
-	.incbin "baserom.gba", 0x51815c, 0x140
+	.incbin "baserom.gba", 0x51815c, 0x120
 
+	.space 0x20
 
 gUnknown_0851829C:: @ 851829C
 @ replacing .incbin "baserom.gba", 0x0051829c, 0x8
@@ -645,8 +656,21 @@ gUnknown_0851CAA4::
 	.incbin "baserom.gba", 0x51caa4, 0xc00
 
 gUnknown_0851D6A4::
-	.incbin "baserom.gba", 0x51d6a4, 0x2c20
+	.incbin "baserom.gba", 0x51d6a4, 0xc00
 
+	.space 0x20
+
+gUnknown_0851E2C4::
+	.incbin "baserom.gba", 0x51e2c4, 0x800
+
+gUnknown_0851EAC4::
+	.incbin "baserom.gba", 0x51eac4, 0x800
+
+gUnknown_0851F2C4::
+	.incbin "baserom.gba", 0x51f2c4, 0x800
+
+gUnknown_0851FAC4::
+	.incbin "baserom.gba", 0x51fac4, 0x800
 
 gUnknown_085202C4:: @ 85202C4
 @ replacing .incbin "baserom.gba", 0x005202c4, 0x20
@@ -666,7 +690,10 @@ gUnknown_085203E4::
 	.incbin "baserom.gba", 0x5203e4, 0x100
 
 gUnknown_085204E4::
-	.incbin "baserom.gba", 0x5204e4, 0x120
+	.incbin "baserom.gba", 0x5204e4, 0x100
+
+gUnknown_085205E4::
+	.incbin "baserom.gba", 0x5205e4, 0x20
 
 gUnknown_08520604::
 	.incbin "baserom.gba", 0x520604, 0x100
@@ -675,7 +702,10 @@ gUnknown_08520704::
 	.incbin "baserom.gba", 0x520704, 0x100
 
 gUnknown_08520804::
-	.incbin "baserom.gba", 0x520804, 0x4060
+	.incbin "baserom.gba", 0x520804, 0x100
+
+gUnknown_08520904::
+	.incbin "baserom.gba", 0x520904, 0x3F60
 
 
 gUnknown_08524864:: @ 8524864

From 5a51a49642e81575ebe41a00ec69a3abb489376b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 1 Oct 2017 19:39:55 -0400
Subject: [PATCH 17/42] Sanitize data/tilesets.s, 3

---
 data/tileset.s | 86 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 53 insertions(+), 33 deletions(-)

diff --git a/data/tileset.s b/data/tileset.s
index 6a49cbd08..0acb50e91 100644
--- a/data/tileset.s
+++ b/data/tileset.s
@@ -258,25 +258,25 @@ gUnknown_085152A4::
 
 gUnknown_08515344:: @ 8515344
 @ replacing .incbin "baserom.gba", 0x00515344, 0x20
-	.4byte VRAM + 0x4c00
-	.4byte VRAM + 0x4c80
-	.4byte VRAM + 0x4d00
-	.4byte VRAM + 0x4d80
-	.4byte VRAM + 0x4e00
-	.4byte VRAM + 0x4e80
-	.4byte VRAM + 0x4f00
-	.4byte VRAM + 0x4f80
+	.4byte BG_VRAM + 0x4c00
+	.4byte BG_VRAM + 0x4c80
+	.4byte BG_VRAM + 0x4d00
+	.4byte BG_VRAM + 0x4d80
+	.4byte BG_VRAM + 0x4e00
+	.4byte BG_VRAM + 0x4e80
+	.4byte BG_VRAM + 0x4f00
+	.4byte BG_VRAM + 0x4f80
 
 gUnknown_08515364:: @ 8515364
 @ replacing .incbin "baserom.gba", 0x00515364, 0x20
-	.4byte VRAM + 0x5000
-	.4byte VRAM + 0x5080
-	.4byte VRAM + 0x5100
-	.4byte VRAM + 0x5180
-	.4byte VRAM + 0x5200
-	.4byte VRAM + 0x5280
-	.4byte VRAM + 0x5300
-	.4byte VRAM + 0x5380
+	.4byte BG_VRAM + 0x5000
+	.4byte BG_VRAM + 0x5080
+	.4byte BG_VRAM + 0x5100
+	.4byte BG_VRAM + 0x5180
+	.4byte BG_VRAM + 0x5200
+	.4byte BG_VRAM + 0x5280
+	.4byte BG_VRAM + 0x5300
+	.4byte BG_VRAM + 0x5380
 
 gUnknown_08515384:: @ 8515384
 @ replacing .incbin "baserom.gba", 0x00515384, 0x30
@@ -348,8 +348,14 @@ gUnknown_08515784::
 
 
 gUnknown_08515804:: @ 8515804
-	.incbin "baserom.gba", 0x515804, 0x20
-
+    .4byte BG_VRAM + 0x5000
+	.4byte BG_VRAM + 0x5080
+	.4byte BG_VRAM + 0x5100
+	.4byte BG_VRAM + 0x5180
+	.4byte BG_VRAM + 0x5200
+	.4byte BG_VRAM + 0x5280
+	.4byte BG_VRAM + 0x5300
+	.4byte BG_VRAM + 0x5380
 
 gUnknown_08515824:: @ 8515824
 @ replacing .incbin "baserom.gba", 0x00515824, 0x20
@@ -389,10 +395,18 @@ gUnknown_08515AEC::
 	.incbin "baserom.gba", 0x515aec, 0x80
 
 gUnknown_08515B6C::
-	.incbin "baserom.gba", 0x515b6c, 0x20
+	.incbin "baserom.gba", 0x515b6c, 0x80
 
-gUnknown_08515B8C::
-	.incbin "baserom.gba", 0x515b8c, 0x200
+gUnknown_08515BEC::
+	.incbin "baserom.gba", 0x515bec, 0x80
+
+gUnknown_08515C6C::
+	.incbin "baserom.gba", 0x515c6c, 0x80
+
+gUnknown_08515CEC::
+	.incbin "baserom.gba", 0x515cec, 0x80
+
+    .space 0x20
 
 
 gUnknown_08515D8C:: @ 8515D8C
@@ -431,14 +445,14 @@ gUnknown_0851611C::
 
 gUnknown_085161BC:: @ 85161BC
 @ replacing .incbin "baserom.gba", 0x005161bc, 0x20
-	.4byte VRAM + 0x5c00
-	.4byte VRAM + 0x5c80
-	.4byte VRAM + 0x5d00
-	.4byte VRAM + 0x5d80
-	.4byte VRAM + 0x5e00
-	.4byte VRAM + 0x5e80
-	.4byte VRAM + 0x5f00
-	.4byte VRAM + 0x5f80
+	.4byte BG_VRAM + 0x5c00
+	.4byte BG_VRAM + 0x5c80
+	.4byte BG_VRAM + 0x5d00
+	.4byte BG_VRAM + 0x5d80
+	.4byte BG_VRAM + 0x5e00
+	.4byte BG_VRAM + 0x5e80
+	.4byte BG_VRAM + 0x5f00
+	.4byte BG_VRAM + 0x5f80
 
 gUnknown_085161DC:: @ 85161DC
 @ replacing .incbin "baserom.gba", 0x005161dc, 0x20
@@ -692,8 +706,7 @@ gUnknown_085203E4::
 gUnknown_085204E4::
 	.incbin "baserom.gba", 0x5204e4, 0x100
 
-gUnknown_085205E4::
-	.incbin "baserom.gba", 0x5205e4, 0x20
+    .space 0x20
 
 gUnknown_08520604::
 	.incbin "baserom.gba", 0x520604, 0x100
@@ -704,8 +717,15 @@ gUnknown_08520704::
 gUnknown_08520804::
 	.incbin "baserom.gba", 0x520804, 0x100
 
-gUnknown_08520904::
-	.incbin "baserom.gba", 0x520904, 0x3F60
+	.space 0x3d00
+
+gUnknown_08524604::
+	.incbin "baserom.gba", 0x524604, 0x40
+
+	.space 0x1c0
+
+gUnknown_08524804::
+	.incbin "baserom.gba", 0x524804, 0x60
 
 
 gUnknown_08524864:: @ 8524864

From 993d5e2a6afb8f765ddd98ac32f01253a1476696 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 1 Oct 2017 21:50:58 -0400
Subject: [PATCH 18/42] clean up declarations in src/palette.c

---
 include/battle.h        |   3 +
 include/blend_palette.h |  12 ++
 src/palette.c           | 308 ++++++++++++++++++++--------------------
 3 files changed, 167 insertions(+), 156 deletions(-)
 create mode 100644 include/blend_palette.h

diff --git a/include/battle.h b/include/battle.h
index 67d3d873d..bc70b86ea 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -927,6 +927,9 @@ u8 GetBankSide(u8 bank);
 u8 GetBankIdentity(u8 bank);
 u8 GetBankByIdentity(u8 bank);
 
+// battle_transition
+void sub_8149DFC(u8 a1);
+
 // Move this somewhere else
 
 #include "sprite.h"
diff --git a/include/blend_palette.h b/include/blend_palette.h
new file mode 100644
index 000000000..1db3f4eb0
--- /dev/null
+++ b/include/blend_palette.h
@@ -0,0 +1,12 @@
+#ifndef GUARD_BLEND_PALETTE_H
+#define GUARD_BLEND_PALETTE_H
+
+// Exported type declarations
+
+// Exported RAM declarations
+
+// Exported ROM declarations
+
+void BlendPalette(u16, u16, u8, u16);
+
+#endif //GUARD_BLEND_PALETTE_H
diff --git a/src/palette.c b/src/palette.c
index da03516d0..ed7eb99b3 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -1,5 +1,9 @@
 #include "global.h"
+#include "blend_palette.h"
 #include "palette.h"
+#include "decompress.h"
+#include "gpu_regs.h"
+#include "battle.h"
 #include "task.h"
 
 enum
@@ -38,15 +42,19 @@ struct PaletteStruct
     u8 ps_field_9;
 };
 
-extern void LZDecompressWram(const void *src, void *dest);
-extern void SetGpuReg(u8 regOffset, u16 value);
-extern void sub_8149DFC(u8 a1);
-extern void sub_80A1670(u16 a1);
-extern void sub_80A2D54(u8 a1);
-extern void SetWordTaskArg(u8 taskId, u8 dataElem, u32 value);
-extern void _call_via_r1(u32 a1, void *a2);
-
-extern void BlendPalette(u16, u16, u8, u16);
+static void cur_mapheader_run_tileset1_func(void);
+static void cur_mapheader_run_tileset2_func(void);
+static void unused_sub_80A1CDC(struct PaletteStruct *, u32 *);
+static void unused_sub_80A1E40(struct PaletteStruct *, u32 *);
+static void unused_sub_80A1F00(struct PaletteStruct *);
+static u8 GetPaletteNumByUid(u16);
+static u8 UpdateNormalPaletteFade(void);
+static void BeginFastPaletteFadeInternal(u8);
+static u8 UpdateFastPaletteFade(void);
+static u8 UpdateHardwarePaletteFade(void);
+static void UpdateBlendRegisters(void);
+static bool8 IsSoftwarePaletteFadeFinishing(void);
+static void sub_80A2D54(u8 taskId);
 
 static EWRAM_DATA struct {
     const u16 *src;
@@ -57,8 +65,8 @@ EWRAM_DATA u16 gPlttBufferUnfaded[0x200] = {0};
 EWRAM_DATA u16 gPlttBufferFaded[0x200] = {0};
 EWRAM_DATA struct PaletteStruct sPaletteStructs[0x10] = {0};
 EWRAM_DATA struct PaletteFadeControl gPaletteFade = {0};
-EWRAM_DATA u32 gFiller_2037FE0 = 0;
-EWRAM_DATA u32 sPlttBufferTransferPending = 0;
+static EWRAM_DATA u32 gFiller_2037FE0 = 0;
+static EWRAM_DATA u32 sPlttBufferTransferPending = 0;
 EWRAM_DATA u8 gPaletteDecompressionBuffer[0x400] = {0};
 
 extern const u16 *const gUnknown_08510764[];
@@ -123,19 +131,6 @@ static const u8 gUnknown_0852489C[] = {
     31, 31
 };
 
-void cur_mapheader_run_tileset1_func(void);
-void cur_mapheader_run_tileset2_func(void);
-static void unused_sub_80A1CDC(struct PaletteStruct *, u32 *);
-static void unused_sub_80A1E40(struct PaletteStruct *, u32 *);
-static void unused_sub_80A1F00(struct PaletteStruct *);
-static u8 GetPaletteNumByUid(u16);
-static u8 UpdateNormalPaletteFade(void);
-static void BeginFastPaletteFadeInternal(u8);
-static u8 UpdateFastPaletteFade(void);
-static u8 UpdateHardwarePaletteFade(void);
-static void UpdateBlendRegisters(void);
-static bool8 IsSoftwarePaletteFadeFinishing(void);
-
 // tileset
 
 IWRAM_DATA u8 sTilesetDMA3TransferBufferSize;
@@ -146,13 +141,13 @@ IWRAM_DATA u16 sSecondaryTilesetCBBufferSize;
 IWRAM_DATA void (*sPrimaryTilesetCB)(u16);
 IWRAM_DATA void (*sSecondaryTilesetCB)(u16);
 
-void sub_80A0954(void)
+static void sub_80A0954(void)
 {
     sTilesetDMA3TransferBufferSize = 0;
     CpuFill32(0, sTilesetDMA3TransferBuffer, sizeof sTilesetDMA3TransferBuffer);
 }
 
-void sub_80A0980(const u16 *a0, u16 *a1, u16 a2)
+static void sub_80A0980(const u16 *a0, u16 *a1, u16 a2)
 {
     if (sTilesetDMA3TransferBufferSize < 20)
     {
@@ -199,7 +194,7 @@ void sub_80A0A38(void)
         sSecondaryTilesetCB(sSecondaryTilesetCBCounter);
 }
 
-void cur_mapheader_run_tileset1_func(void)
+static void cur_mapheader_run_tileset1_func(void)
 {
     sPrimaryTilesetCBCounter = 0;
     sPrimaryTilesetCBBufferSize = 0;
@@ -208,7 +203,7 @@ void cur_mapheader_run_tileset1_func(void)
         gMapHeader.mapData->primaryTileset->callback();
 }
 
-void cur_mapheader_run_tileset2_func(void)
+static void cur_mapheader_run_tileset2_func(void)
 {
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = 0;
@@ -219,7 +214,7 @@ void cur_mapheader_run_tileset2_func(void)
 
 void TilesetCb_General(void)
 {
-    void sub_80A0B70(u16);
+    static void sub_80A0B70(u16);
 
     sPrimaryTilesetCBCounter = 0;
     sPrimaryTilesetCBBufferSize = 0x100;
@@ -228,20 +223,20 @@ void TilesetCb_General(void)
 
 void TilesetCb_InsideBuilding(void)
 {
-    void sub_80A0BB4(u16);
+    static void sub_80A0BB4(u16);
 
     sPrimaryTilesetCBCounter = 0;
     sPrimaryTilesetCBBufferSize = 0x100;
     sPrimaryTilesetCB = sub_80A0BB4;
 }
 
-void sub_80A0B70(u16 timer)
+static void sub_80A0B70(u16 timer)
 {
-    void sub_80A0BCC(u16);
-    void sub_80A0BF4(u16);
-    void sub_80A0C1C(u16);
-    void sub_80A0C44(u16);
-    void sub_80A12AC(u16);
+    static void sub_80A0BCC(u16);
+    static void sub_80A0BF4(u16);
+    static void sub_80A0C1C(u16);
+    static void sub_80A0C44(u16);
+    static void sub_80A12AC(u16);
 
     if ((timer & 0x0F) == 0)
         sub_80A0BCC(timer >> 4);
@@ -255,43 +250,44 @@ void sub_80A0B70(u16 timer)
         sub_80A12AC(timer >> 4);
 }
 
-void sub_80A0BB4(u16 timer)
+static void sub_80A0BB4(u16 timer)
 {
-    void sub_80A1688(u16);
+    static void sub_80A1688(u16);
+
     if ((timer & 0x7) == 0)
         sub_80A1688(timer >> 3);
 }
 
-void sub_80A0BCC(u16 timer)
+static void sub_80A0BCC(u16 timer)
 {
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08510764[idx], (u16 *)(VRAM + 0x3F80), 0x80);
+    sub_80A0980(gUnknown_08510764[idx], (u16 *)(BG_VRAM + 0x3F80), 0x80);
 }
 
-void sub_80A0BF4(u16 timer)
+static void sub_80A0BF4(u16 timer)
 {
     u8 idx;
 
     idx = timer % 8;
-    sub_80A0980(gUnknown_08512574[idx], (u16 *)(VRAM + 0x3600), 0x3C0);
+    sub_80A0980(gUnknown_08512574[idx], (u16 *)(BG_VRAM + 0x3600), 0x3C0);
 }
 
-void sub_80A0C1C(u16 timer)
+static void sub_80A0C1C(u16 timer)
 {
     u16 idx;
 
     idx = timer % 8;
-    sub_80A0980(gUnknown_08512E54[idx], (u16 *)(VRAM + 0x3a00), 0x140);
+    sub_80A0980(gUnknown_08512E54[idx], (u16 *)(BG_VRAM + 0x3a00), 0x140);
 }
 
-void sub_80A0C44(u16 timer)
+static void sub_80A0C44(u16 timer)
 {
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08513174[idx], (u16 *)(VRAM + 0x3e00), 0xc0);
+    sub_80A0980(gUnknown_08513174[idx], (u16 *)(BG_VRAM + 0x3e00), 0xc0);
 }
 
 void TilesetCb_Petalburg(void)
@@ -303,7 +299,7 @@ void TilesetCb_Petalburg(void)
 
 void TilesetCb_Rustboro(void)
 {
-    void sub_80A103C(u16);
+    static void sub_80A103C(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -312,7 +308,7 @@ void TilesetCb_Rustboro(void)
 
 void TilesetCb_Dewford(void)
 {
-    void sub_80A10B8(u16);
+    static void sub_80A10B8(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -321,7 +317,7 @@ void TilesetCb_Dewford(void)
 
 void TilesetCb_Slateport(void)
 {
-    void sub_80A10D0(u16);
+    static void sub_80A10D0(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -330,7 +326,7 @@ void TilesetCb_Slateport(void)
 
 void TilesetCb_Mauville(void)
 {
-    void sub_80A10E8(u16);
+    static void sub_80A10E8(u16);
 
     sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -339,7 +335,7 @@ void TilesetCb_Mauville(void)
 
 void TilesetCb_Lavaridge(void)
 {
-    void sub_80A115C(u16);
+    static void sub_80A115C(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -376,7 +372,7 @@ void TilesetCb_Mossdeep(void)
 
 void TilesetCb_EverGrande(void)
 {
-    void sub_80A1188(u16);
+    static void sub_80A1188(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -385,7 +381,7 @@ void TilesetCb_EverGrande(void)
 
 void TilesetCb_Pacifidlog(void)
 {
-    void sub_80A11FC(u16);
+    static void sub_80A11FC(u16);
 
     sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -394,7 +390,7 @@ void TilesetCb_Pacifidlog(void)
 
 void TilesetCb_Sootopolis(void)
 {
-    void sub_80A122C(u16);
+    static void sub_80A122C(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -403,7 +399,7 @@ void TilesetCb_Sootopolis(void)
 
 void TilesetCb_BattleFrontierOutsideWest(void)
 {
-    void sub_80A127C(u16);
+    static void sub_80A127C(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -412,7 +408,7 @@ void TilesetCb_BattleFrontierOutsideWest(void)
 
 void TilesetCb_BattleFrontierOutsideEast(void)
 {
-    void sub_80A1294(u16);
+    static void sub_80A1294(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -421,7 +417,7 @@ void TilesetCb_BattleFrontierOutsideEast(void)
 
 void TilesetCb_Underwater(void)
 {
-    void sub_80A1244(u16);
+    static void sub_80A1244(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = 128;
@@ -430,7 +426,7 @@ void TilesetCb_Underwater(void)
 
 void TilesetCb_SootopolisGym(void)
 {
-    void sub_80A15D8(u16);
+    static void sub_80A15D8(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = 240;
@@ -439,7 +435,7 @@ void TilesetCb_SootopolisGym(void)
 
 void TilesetCb_Cave(void)
 {
-    void sub_80A1260(u16);
+    static void sub_80A1260(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -448,7 +444,7 @@ void TilesetCb_Cave(void)
 
 void TilesetCb_EliteFour(void)
 {
-    void sub_80A15F0(u16);
+    static void sub_80A15F0(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = 128;
@@ -457,7 +453,7 @@ void TilesetCb_EliteFour(void)
 
 void TilesetCb_MauvilleGym(void)
 {
-    void sub_80A15C0(u16);
+    static void sub_80A15C0(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -466,7 +462,7 @@ void TilesetCb_MauvilleGym(void)
 
 void TilesetCb_BikeShop(void)
 {
-    void sub_80A161C(u16);
+    static void sub_80A161C(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -475,7 +471,7 @@ void TilesetCb_BikeShop(void)
 
 void TilesetCb_BattlePyramid(void)
 {
-    void sub_80A1634(u16);
+    static void sub_80A1634(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
@@ -484,17 +480,17 @@ void TilesetCb_BattlePyramid(void)
 
 void TilesetCb_BattleDome(void)
 {
-    void sub_80A1658(u16);
+    static void sub_80A1658(u16);
 
     sSecondaryTilesetCBCounter = 0;
     sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
     sSecondaryTilesetCB = sub_80A1658;
 }
 
-void sub_80A103C(u16 timer)
+static void sub_80A103C(u16 timer)
 {
-    void sub_80A1434(u16, u8);
-    void sub_80A1470(u16);
+    static void sub_80A1434(u16, u8);
+    static void sub_80A1470(u16);
 
     if ((timer & 0x07) == 0)
     {
@@ -517,25 +513,25 @@ void sub_80A103C(u16 timer)
         sub_80A1434(timer >> 3, 7);
 }
 
-void sub_80A10B8(u16 timer)
+static void sub_80A10B8(u16 timer)
 {
-    void sub_80A1520(u16);
+    static void sub_80A1520(u16);
 
     if ((timer & 7) == 0)
         sub_80A1520(timer >> 3);
 }
 
-void sub_80A10D0(u16 timer)
+static void sub_80A10D0(u16 timer)
 {
-    void sub_80A1598(u16);
+    static void sub_80A1598(u16);
 
     if ((timer & 15) == 0)
         sub_80A1598(timer >> 4);
 }
 
-void sub_80A10E8(u16 timer)
+static void sub_80A10E8(u16 timer)
 {
-    void sub_80A1394(u16, u8);
+    static void sub_80A1394(u16, u8);
 
     if ((timer & 0x07) == 0)
         sub_80A1394(timer >> 3, 0);
@@ -555,10 +551,10 @@ void sub_80A10E8(u16 timer)
         sub_80A1394(timer >> 3, 7);
 }
 
-void sub_80A115C(u16 timer)
+static void sub_80A115C(u16 timer)
 {
-    void sub_80A12D4(u8);
-    void sub_80A1498(u16);
+    static void sub_80A12D4(u8);
+    static void sub_80A1498(u16);
 
     if ((timer & 0x0F) == 0)
         sub_80A12D4(timer >> 4);
@@ -566,9 +562,9 @@ void sub_80A115C(u16 timer)
         sub_80A1498(timer >> 4);
 }
 
-void sub_80A1188(u16 timer)
+static void sub_80A1188(u16 timer)
 {
-    void sub_80A14C0(u16, u8);
+    static void sub_80A14C0(u16, u8);
 
     if ((timer & 0x07) == 0)
         sub_80A14C0(timer >> 3, 0);
@@ -588,10 +584,10 @@ void sub_80A1188(u16 timer)
         sub_80A14C0(timer >> 3, 7);
 }
 
-void sub_80A11FC(u16 timer)
+static void sub_80A11FC(u16 timer)
 {
-    void sub_80A131C(u8);
-    void sub_80A136C(u8);
+    static void sub_80A131C(u8);
+    static void sub_80A136C(u8);
 
     if ((timer & 0x0F) == 0)
         sub_80A131C(timer >> 4);
@@ -599,90 +595,90 @@ void sub_80A11FC(u16 timer)
         sub_80A136C(timer >> 4);
 }
 
-void sub_80A122C(u16 timer)
+static void sub_80A122C(u16 timer)
 {
-    void sub_80A1798(u16);
+    static void sub_80A1798(u16);
 
     if ((timer & 0x0F) == 0)
         sub_80A1798(timer >> 4);
 }
 
-void sub_80A1244(u16 timer)
+static void sub_80A1244(u16 timer)
 {
-    void sub_80A1344(u8);
+    static void sub_80A1344(u8);
 
     if ((timer & 0x0F) == 0)
         sub_80A1344(timer >> 4);
 }
 
-void sub_80A1260(u16 timer)
+static void sub_80A1260(u16 timer)
 {
-    void sub_80A14F8(u16);
+    static void sub_80A14F8(u16);
 
     if ((timer & 0x0F) == 1)
         sub_80A14F8(timer >> 4);
 }
 
-void sub_80A127C(u16 timer)
+static void sub_80A127C(u16 timer)
 {
-    void sub_80A1548(u16);
+    static void sub_80A1548(u16);
 
     if ((timer & 0x07) == 0)
         sub_80A1548(timer >> 3);
 }
 
-void sub_80A1294(u16 timer)
+static void sub_80A1294(u16 timer)
 {
-    void sub_80A1570(u16);
+    static void sub_80A1570(u16);
 
     if ((timer & 0x07) == 0)
         sub_80A1570(timer >> 3);
 }
 
-void sub_80A12AC(u16 timer)
+static void sub_80A12AC(u16 timer)
 {
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08513684[idx], (u16 *)(VRAM + 0x3c00), 0x140);
+    sub_80A0980(gUnknown_08513684[idx], (u16 *)(BG_VRAM + 0x3c00), 0x140);
 }
 
-void sub_80A12D4(u8 timer)
+static void sub_80A12D4(u8 timer)
 {
     u8 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08513894[idx], (u16 *)(VRAM + 0x6400), 0x80);
+    sub_80A0980(gUnknown_08513894[idx], (u16 *)(BG_VRAM + 0x6400), 0x80);
 
     idx = (timer + 2) % 4;
-    sub_80A0980(gUnknown_08513894[idx], (u16 *)(VRAM + 0x6480), 0x80);
+    sub_80A0980(gUnknown_08513894[idx], (u16 *)(BG_VRAM + 0x6480), 0x80);
 }
 
-void sub_80A131C(u8 timer)
+static void sub_80A131C(u8 timer)
 {
     u8 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_085143E4[idx], (u16 *)(VRAM + 0x7a00), 0x3C0);
+    sub_80A0980(gUnknown_085143E4[idx], (u16 *)(BG_VRAM + 0x7a00), 0x3C0);
 }
 
-void sub_80A1344(u8 timer)
+static void sub_80A1344(u8 timer)
 {
     u8 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_085145F4[idx], (u16 *)(VRAM + 0x7e00), 0x80);
+    sub_80A0980(gUnknown_085145F4[idx], (u16 *)(BG_VRAM + 0x7e00), 0x80);
 }
 
-void sub_80A136C(u8 timer)
+static void sub_80A136C(u8 timer)
 {
     u8 idx;
 
     idx = timer % 8;
-    sub_80A0980(gUnknown_08514E04[idx], (u16 *)(VRAM + 0x7e00), 0x100);
+    sub_80A0980(gUnknown_08514E04[idx], (u16 *)(BG_VRAM + 0x7e00), 0x100);
 }
 
-void sub_80A1394(u16 timer_div, u8 timer_mod)
+static void sub_80A1394(u16 timer_div, u8 timer_mod)
 {
     timer_div -= timer_mod;
     if (timer_div < 12) // almost certainly a typo
@@ -699,7 +695,7 @@ void sub_80A1394(u16 timer_div, u8 timer_mod)
     }
 }
 
-void sub_80A1434(u16 timer_div, u8 timer_mod)
+static void sub_80A1434(u16 timer_div, u8 timer_mod)
 {
     timer_div -= timer_mod;
     timer_div %= 8;
@@ -707,23 +703,23 @@ void sub_80A1434(u16 timer_div, u8 timer_mod)
         sub_80A0980(gUnknown_08515824[timer_div], gUnknown_08515804[timer_mod], 0x80);
 }
 
-void sub_80A1470(u16 timer)
+static void sub_80A1470(u16 timer)
 {
     u16 idx;
 
     idx = timer % 2;
-    sub_80A0980(gUnknown_08515964[idx], (u16 *)(VRAM + 0x7800), 0x80);
+    sub_80A0980(gUnknown_08515964[idx], (u16 *)(BG_VRAM + 0x7800), 0x80);
 }
 
-void sub_80A1498(u16 timer)
+static void sub_80A1498(u16 timer)
 {
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08515D8C[idx], (u16 *)(VRAM + 0x5400), 0x80);
+    sub_80A0980(gUnknown_08515D8C[idx], (u16 *)(BG_VRAM + 0x5400), 0x80);
 }
 
-void sub_80A14C0(u16 timer_div, u8 timer_mod)
+static void sub_80A14C0(u16 timer_div, u8 timer_mod)
 {
     timer_div -= timer_mod;
     timer_div %= 8;
@@ -731,84 +727,84 @@ void sub_80A14C0(u16 timer_div, u8 timer_mod)
     sub_80A0980(gUnknown_085161DC[timer_div], gUnknown_085161BC[timer_mod], 0x80);
 }
 
-void sub_80A14F8(u16 timer)
+static void sub_80A14F8(u16 timer)
 {
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08515D8C[idx], (u16 *)(VRAM + 0x7400), 0x80);
+    sub_80A0980(gUnknown_08515D8C[idx], (u16 *)(BG_VRAM + 0x7400), 0x80);
 }
 
-void sub_80A1520(u16 timer)
+static void sub_80A1520(u16 timer)
 {
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_085164FC[idx], (u16 *)(VRAM + 0x5540), 0xC0);
+    sub_80A0980(gUnknown_085164FC[idx], (u16 *)(BG_VRAM + 0x5540), 0xC0);
 }
 
-void sub_80A1548(u16 timer)
+static void sub_80A1548(u16 timer)
 {
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_0851680C[idx], (u16 *)(VRAM + 0x5b40), 0xC0);
+    sub_80A0980(gUnknown_0851680C[idx], (u16 *)(BG_VRAM + 0x5b40), 0xC0);
 }
 
-void sub_80A1570(u16 timer)
+static void sub_80A1570(u16 timer)
 {
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08516B1C[idx], (u16 *)(VRAM + 0x5b40), 0xC0);
+    sub_80A0980(gUnknown_08516B1C[idx], (u16 *)(BG_VRAM + 0x5b40), 0xC0);
 }
 
-void sub_80A1598(u16 timer)
+static void sub_80A1598(u16 timer)
 {
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08516D2C[idx], (u16 *)(VRAM + 0x5c00), 0x80);
+    sub_80A0980(gUnknown_08516D2C[idx], (u16 *)(BG_VRAM + 0x5c00), 0x80);
 }
 
-void sub_80A15C0(u16 timer)
+static void sub_80A15C0(u16 timer)
 {
-    void sub_80A1748(u16);
+    static void sub_80A1748(u16);
 
     if ((timer & 1) == 0)
         sub_80A1748(timer >> 1);
 }
 
-void sub_80A15D8(u16 timer)
+static void sub_80A15D8(u16 timer)
 {
-    void sub_80A16B0(u16);
+    static void sub_80A16B0(u16);
 
     if ((timer & 7) == 0)
         sub_80A16B0(timer >> 3);
 }
 
-void sub_80A15F0(u16 timer)
+static void sub_80A15F0(u16 timer)
 {
-    void sub_80A1720(u16);
-    void sub_80A16F8(u16);
+    static void sub_80A1720(u16);
+    static void sub_80A16F8(u16);
 
     if ((timer & 0x3f) == 1)
         sub_80A1720(timer >> 6);
     if ((timer & 0x07) == 1)
         sub_80A16F8(timer >> 3);
 }
-void sub_80A161C(u16 timer)
+static void sub_80A161C(u16 timer)
 {
-    void sub_80A1770(u16);
+    static void sub_80A1770(u16);
 
     if ((timer & 3) == 0)
         sub_80A1770(timer >> 2);
 }
 
-void sub_80A1634(u16 timer)
+static void sub_80A1634(u16 timer)
 {
-    void sub_80A17C0(u16);
-    void sub_80A17EC(u16);
+    static void sub_80A17C0(u16);
+    static void sub_80A17EC(u16);
 
     if ((timer & 7) == 0)
     {
@@ -817,98 +813,98 @@ void sub_80A1634(u16 timer)
     }
 }
 
-void sub_80A1658(u16 timer)
+static void sub_80A1658(u16 timer)
 {
-    void sub_80A1818(u16);
+    static void sub_80A1818(u16);
 
     if ((timer & 3) == 0)
         sub_80A1818(timer >> 2);
 }
 
-void sub_80A1670(u16 timer)
+static void sub_80A1670(u16 timer)
 {
-    void sub_80A1884(u16);
+    static void sub_80A1884(u16);
 
     if ((timer & 3) == 0)
         sub_80A1884(timer >> 2);
 }
 
-void sub_80A1688(u16 timer)
+static void sub_80A1688(u16 timer)
 {
     u16 idx;
 
     idx = timer % 2;
-    sub_80A0980(gUnknown_08516E3C[idx], (u16 *)(VRAM + 0x3e00), 0x80);
+    sub_80A0980(gUnknown_08516E3C[idx], (u16 *)(BG_VRAM + 0x3e00), 0x80);
 }
 
-void sub_80A16B0(u16 timer)
+static void sub_80A16B0(u16 timer)
 {
     u16 idx;
 
     idx = timer % 3;
-    sub_80A0980(gUnknown_08517A44[idx], (u16 *)(VRAM + 0x7e00), 0x180);
-    sub_80A0980(gUnknown_08517A50[idx], (u16 *)(VRAM + 0x7a00), 0x280);
+    sub_80A0980(gUnknown_08517A44[idx], (u16 *)(BG_VRAM + 0x7e00), 0x180);
+    sub_80A0980(gUnknown_08517A50[idx], (u16 *)(BG_VRAM + 0x7a00), 0x280);
 }
 
-void sub_80A16F8(u16 timer)
+static void sub_80A16F8(u16 timer)
 {
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08517BFC[idx], (u16 *)(VRAM + 0x7f00), 0x20);
+    sub_80A0980(gUnknown_08517BFC[idx], (u16 *)(BG_VRAM + 0x7f00), 0x20);
 }
 
-void sub_80A1720(u16 timer)
+static void sub_80A1720(u16 timer)
 {
     u16 idx;
 
     idx = timer % 2;
-    sub_80A0980(gUnknown_08517C0C[idx], (u16 *)(VRAM + 0x7c00), 0x80);
+    sub_80A0980(gUnknown_08517C0C[idx], (u16 *)(BG_VRAM + 0x7c00), 0x80);
 }
 
-void sub_80A1748(u16 timer)
+static void sub_80A1748(u16 timer)
 {
     u16 idx;
 
     idx = timer % 2;
-    sub_80A0980(gUnknown_08518034[idx], (u16 *)(VRAM + 0x5200), 0x200);
+    sub_80A0980(gUnknown_08518034[idx], (u16 *)(BG_VRAM + 0x5200), 0x200);
 }
 
-void sub_80A1770(u16 timer)
+static void sub_80A1770(u16 timer)
 {
     u16 idx;
 
     idx = timer % 2;
-    sub_80A0980(gUnknown_0851829C[idx], (u16 *)(VRAM + 0x7e00), 0x120);
+    sub_80A0980(gUnknown_0851829C[idx], (u16 *)(BG_VRAM + 0x7e00), 0x120);
 }
 
-void sub_80A1798(u16 timer)
+static void sub_80A1798(u16 timer)
 {
     u16 idx;
 
     idx = timer % 8;
-    sub_80A0980(gUnknown_085202C4[idx], (u16 *)(VRAM + 0x5e00), 0xc00);
+    sub_80A0980(gUnknown_085202C4[idx], (u16 *)(BG_VRAM + 0x5e00), 0xc00);
 }
 
-void sub_80A17C0(u16 timer)
+static void sub_80A17C0(u16 timer)
 {
     u16 idx;
 
     idx = timer % 3;
-    sub_80A0980(gUnknown_08524864[idx], (u16 *)(VRAM + 0x52e0), 0x100);
+    sub_80A0980(gUnknown_08524864[idx], (u16 *)(BG_VRAM + 0x52e0), 0x100);
 }
 
-void sub_80A17EC(u16 timer)
+static void sub_80A17EC(u16 timer)
 {
     u16 idx;
 
     idx = timer % 3;
-    sub_80A0980(gUnknown_08524870[idx], (u16 *)(VRAM + 0x50e0), 0x100);
+    sub_80A0980(gUnknown_08524870[idx], (u16 *)(BG_VRAM + 0x50e0), 0x100);
 }
 
 // palette
 
-void sub_80A1818(u16 a1)
+static void sub_80A1818(u16 a1)
 {
     CpuCopy16(gUnknown_0852487C[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
     BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
@@ -919,7 +915,7 @@ void sub_80A1818(u16 a1)
     }
 }
 
-void sub_80A1884(u16 a1)
+static void sub_80A1884(u16 a1)
 {
     CpuCopy16(gUnknown_0852487C[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
     if ((u8)FindTaskIdByFunc(sub_8149DFC) == 0xFF )

From 3ec4d98de95a2aeb12f3c738b3496d0b3a830793 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 1 Oct 2017 21:58:47 -0400
Subject: [PATCH 19/42] Split palette and tileset_anims

---
 ld_script.txt       |   2 +
 src/palette.c       | 851 -------------------------------------------
 src/tileset_anims.c | 865 ++++++++++++++++++++++++++++++++++++++++++++
 sym_bss.txt         |   1 +
 sym_ewram.txt       |   1 +
 5 files changed, 869 insertions(+), 851 deletions(-)
 create mode 100644 src/tileset_anims.c

diff --git a/ld_script.txt b/ld_script.txt
index 78d27eb7f..2ab0f780b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -110,6 +110,7 @@ SECTIONS {
         asm/reset_rtc_screen.o(.text);
         src/start_menu.o(.text);
         asm/start_menu.o(.text);
+        src/tileset_anims.o(.text);
         src/palette.o(.text);
         src/sound.o(.text);
         asm/battle_anim.o(.text);
@@ -356,6 +357,7 @@ SECTIONS {
         data/reset_rtc_screen.o(.rodata);
         data/start_menu.o(.rodata);
         data/tileset.o(.rodata);
+        src/tileset_anims.o(.rodata);
         src/palette.o(.rodata);
         data/fanfares.o(.rodata);
         data/battle_anims.o(.rodata);
diff --git a/src/palette.c b/src/palette.c
index ed7eb99b3..d60efdbc5 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -3,7 +3,6 @@
 #include "palette.h"
 #include "decompress.h"
 #include "gpu_regs.h"
-#include "battle.h"
 #include "task.h"
 
 enum
@@ -42,8 +41,6 @@ struct PaletteStruct
     u8 ps_field_9;
 };
 
-static void cur_mapheader_run_tileset1_func(void);
-static void cur_mapheader_run_tileset2_func(void);
 static void unused_sub_80A1CDC(struct PaletteStruct *, u32 *);
 static void unused_sub_80A1E40(struct PaletteStruct *, u32 *);
 static void unused_sub_80A1F00(struct PaletteStruct *);
@@ -56,11 +53,6 @@ static void UpdateBlendRegisters(void);
 static bool8 IsSoftwarePaletteFadeFinishing(void);
 static void sub_80A2D54(u8 taskId);
 
-static EWRAM_DATA struct {
-    const u16 *src;
-    u16 *dest;
-    u16 size;
-} sTilesetDMA3TransferBuffer[20] = {0};
 EWRAM_DATA u16 gPlttBufferUnfaded[0x200] = {0};
 EWRAM_DATA u16 gPlttBufferFaded[0x200] = {0};
 EWRAM_DATA struct PaletteStruct sPaletteStructs[0x10] = {0};
@@ -69,54 +61,6 @@ static EWRAM_DATA u32 gFiller_2037FE0 = 0;
 static EWRAM_DATA u32 sPlttBufferTransferPending = 0;
 EWRAM_DATA u8 gPaletteDecompressionBuffer[0x400] = {0};
 
-extern const u16 *const gUnknown_08510764[];
-extern const u16 *const gUnknown_08512574[];
-extern const u16 *const gUnknown_08512E54[];
-extern const u16 *const gUnknown_08513174[];
-extern const u16 *const gUnknown_08513684[];
-extern const u16 *const gUnknown_08513894[];
-extern const u16 *const gUnknown_085143E4[];
-extern const u16 *const gUnknown_085145F4[];
-extern const u16 *const gUnknown_08514E04[];
-extern u16 *const gUnknown_08515344[];
-extern u16 *const gUnknown_08515364[];
-extern const u16 *const gUnknown_08515384[];
-extern const u16 *const gUnknown_085153B4[];
-extern const u16 *const gUnknown_085153E4[];
-extern const u16 *const gUnknown_085153F4[];
-extern  u16 *const gUnknown_08515804[];
-extern const u16 *const gUnknown_08515824[];
-extern const u16 *const gUnknown_08515964[];
-extern const u16 *const gUnknown_08515D8C[];
-extern  u16 *const gUnknown_085161BC[];
-extern const u16 *const gUnknown_085161DC[];
-extern const u16 *const gUnknown_085164FC[];
-extern const u16 *const gUnknown_0851680C[];
-extern const u16 *const gUnknown_08516B1C[];
-extern const u16 *const gUnknown_08516D2C[];
-extern const u16 *const gUnknown_08516E3C[];
-extern const u16 *const gUnknown_08517A44[];
-extern const u16 *const gUnknown_08517A50[];
-extern const u16 *const gUnknown_08517BFC[];
-extern const u16 *const gUnknown_08517C0C[];
-extern const u16 *const gUnknown_08518034[];
-extern const u16 *const gUnknown_0851829C[];
-extern const u16 *const gUnknown_085202C4[];
-extern const u16 *const gUnknown_08524864[];
-extern const u16 *const gUnknown_08524870[];
-
-extern const u16 gUnknown_08D85640[];
-extern const u16 gUnknown_08D85660[];
-extern const u16 gUnknown_08D85680[];
-extern const u16 gUnknown_08D856A0[];
-
-static const u16 *const gUnknown_0852487C[] = {
-    gUnknown_08D85640,
-    gUnknown_08D85660,
-    gUnknown_08D85680,
-    gUnknown_08D856A0,
-};
-
 static const struct PaletteStructTemplate gDummyPaletteStructTemplate = {
     .uid = 0xFFFF,
     .pst_field_B_5 = 1
@@ -131,801 +75,6 @@ static const u8 gUnknown_0852489C[] = {
     31, 31
 };
 
-// tileset
-
-IWRAM_DATA u8 sTilesetDMA3TransferBufferSize;
-IWRAM_DATA u16 sPrimaryTilesetCBCounter;
-IWRAM_DATA u16 sPrimaryTilesetCBBufferSize;
-IWRAM_DATA u16 sSecondaryTilesetCBCounter;
-IWRAM_DATA u16 sSecondaryTilesetCBBufferSize;
-IWRAM_DATA void (*sPrimaryTilesetCB)(u16);
-IWRAM_DATA void (*sSecondaryTilesetCB)(u16);
-
-static void sub_80A0954(void)
-{
-    sTilesetDMA3TransferBufferSize = 0;
-    CpuFill32(0, sTilesetDMA3TransferBuffer, sizeof sTilesetDMA3TransferBuffer);
-}
-
-static void sub_80A0980(const u16 *a0, u16 *a1, u16 a2)
-{
-    if (sTilesetDMA3TransferBufferSize < 20)
-    {
-        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].src = a0;
-        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].dest = a1;
-        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].size = a2;
-        sTilesetDMA3TransferBufferSize ++;
-    }
-}
-
-void sub_80A09D0(void)
-{
-    int i;
-
-    for (i = 0; i < sTilesetDMA3TransferBufferSize; i ++)
-    {
-        DmaCopy16(3, sTilesetDMA3TransferBuffer[i].src, sTilesetDMA3TransferBuffer[i].dest, sTilesetDMA3TransferBuffer[i].size);
-    }
-    sTilesetDMA3TransferBufferSize = 0;
-}
-
-void cur_mapheader_run_tileset_funcs_after_some_cpuset(void)
-{
-    sub_80A0954();
-    cur_mapheader_run_tileset1_func();
-    cur_mapheader_run_tileset2_func();
-}
-
-void sub_80A0A2C(void)
-{
-    cur_mapheader_run_tileset2_func();
-}
-
-void sub_80A0A38(void)
-{
-    sub_80A0954();
-    if (++sPrimaryTilesetCBCounter >= sPrimaryTilesetCBBufferSize)
-        sPrimaryTilesetCBCounter = 0;
-    if (++sSecondaryTilesetCBCounter >= sSecondaryTilesetCBBufferSize)
-        sSecondaryTilesetCBCounter = 0;
-    if (sPrimaryTilesetCB)
-        sPrimaryTilesetCB(sPrimaryTilesetCBCounter);
-    if (sSecondaryTilesetCB)
-        sSecondaryTilesetCB(sSecondaryTilesetCBCounter);
-}
-
-static void cur_mapheader_run_tileset1_func(void)
-{
-    sPrimaryTilesetCBCounter = 0;
-    sPrimaryTilesetCBBufferSize = 0;
-    sPrimaryTilesetCB = NULL;
-    if (gMapHeader.mapData->primaryTileset && gMapHeader.mapData->primaryTileset->callback)
-        gMapHeader.mapData->primaryTileset->callback();
-}
-
-static void cur_mapheader_run_tileset2_func(void)
-{
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = 0;
-    sSecondaryTilesetCB = NULL;
-    if (gMapHeader.mapData->secondaryTileset && gMapHeader.mapData->secondaryTileset->callback)
-        gMapHeader.mapData->secondaryTileset->callback();
-}
-
-void TilesetCb_General(void)
-{
-    static void sub_80A0B70(u16);
-
-    sPrimaryTilesetCBCounter = 0;
-    sPrimaryTilesetCBBufferSize = 0x100;
-    sPrimaryTilesetCB = sub_80A0B70;
-}
-
-void TilesetCb_InsideBuilding(void)
-{
-    static void sub_80A0BB4(u16);
-
-    sPrimaryTilesetCBCounter = 0;
-    sPrimaryTilesetCBBufferSize = 0x100;
-    sPrimaryTilesetCB = sub_80A0BB4;
-}
-
-static void sub_80A0B70(u16 timer)
-{
-    static void sub_80A0BCC(u16);
-    static void sub_80A0BF4(u16);
-    static void sub_80A0C1C(u16);
-    static void sub_80A0C44(u16);
-    static void sub_80A12AC(u16);
-
-    if ((timer & 0x0F) == 0)
-        sub_80A0BCC(timer >> 4);
-    if ((timer & 0x0F) == 1)
-        sub_80A0BF4(timer >> 4);
-    if ((timer & 0x0F) == 2)
-        sub_80A0C1C(timer >> 4);
-    if ((timer & 0x0F) == 3)
-        sub_80A0C44(timer >> 4);
-    if ((timer & 0x0F) == 4)
-        sub_80A12AC(timer >> 4);
-}
-
-static void sub_80A0BB4(u16 timer)
-{
-    static void sub_80A1688(u16);
-
-    if ((timer & 0x7) == 0)
-        sub_80A1688(timer >> 3);
-}
-
-static void sub_80A0BCC(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 4;
-    sub_80A0980(gUnknown_08510764[idx], (u16 *)(BG_VRAM + 0x3F80), 0x80);
-}
-
-static void sub_80A0BF4(u16 timer)
-{
-    u8 idx;
-
-    idx = timer % 8;
-    sub_80A0980(gUnknown_08512574[idx], (u16 *)(BG_VRAM + 0x3600), 0x3C0);
-}
-
-static void sub_80A0C1C(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 8;
-    sub_80A0980(gUnknown_08512E54[idx], (u16 *)(BG_VRAM + 0x3a00), 0x140);
-}
-
-static void sub_80A0C44(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 4;
-    sub_80A0980(gUnknown_08513174[idx], (u16 *)(BG_VRAM + 0x3e00), 0xc0);
-}
-
-void TilesetCb_Petalburg(void)
-{
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = NULL;
-}
-
-void TilesetCb_Rustboro(void)
-{
-    static void sub_80A103C(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A103C;
-}
-
-void TilesetCb_Dewford(void)
-{
-    static void sub_80A10B8(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A10B8;
-}
-
-void TilesetCb_Slateport(void)
-{
-    static void sub_80A10D0(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A10D0;
-}
-
-void TilesetCb_Mauville(void)
-{
-    static void sub_80A10E8(u16);
-
-    sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A10E8;
-}
-
-void TilesetCb_Lavaridge(void)
-{
-    static void sub_80A115C(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A115C;
-}
-
-void TilesetCb_Fallarbor(void)
-{
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = NULL;
-}
-
-void TilesetCb_Fortree(void)
-{
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = NULL;
-}
-
-void TilesetCb_Lilycove(void)
-{
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = NULL;
-}
-
-void TilesetCb_Mossdeep(void)
-{
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = NULL;
-}
-
-void TilesetCb_EverGrande(void)
-{
-    static void sub_80A1188(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A1188;
-}
-
-void TilesetCb_Pacifidlog(void)
-{
-    static void sub_80A11FC(u16);
-
-    sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A11FC;
-}
-
-void TilesetCb_Sootopolis(void)
-{
-    static void sub_80A122C(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A122C;
-}
-
-void TilesetCb_BattleFrontierOutsideWest(void)
-{
-    static void sub_80A127C(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A127C;
-}
-
-void TilesetCb_BattleFrontierOutsideEast(void)
-{
-    static void sub_80A1294(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A1294;
-}
-
-void TilesetCb_Underwater(void)
-{
-    static void sub_80A1244(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = 128;
-    sSecondaryTilesetCB = sub_80A1244;
-}
-
-void TilesetCb_SootopolisGym(void)
-{
-    static void sub_80A15D8(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = 240;
-    sSecondaryTilesetCB = sub_80A15D8;
-}
-
-void TilesetCb_Cave(void)
-{
-    static void sub_80A1260(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A1260;
-}
-
-void TilesetCb_EliteFour(void)
-{
-    static void sub_80A15F0(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = 128;
-    sSecondaryTilesetCB = sub_80A15F0;
-}
-
-void TilesetCb_MauvilleGym(void)
-{
-    static void sub_80A15C0(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A15C0;
-}
-
-void TilesetCb_BikeShop(void)
-{
-    static void sub_80A161C(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A161C;
-}
-
-void TilesetCb_BattlePyramid(void)
-{
-    static void sub_80A1634(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A1634;
-}
-
-void TilesetCb_BattleDome(void)
-{
-    static void sub_80A1658(u16);
-
-    sSecondaryTilesetCBCounter = 0;
-    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
-    sSecondaryTilesetCB = sub_80A1658;
-}
-
-static void sub_80A103C(u16 timer)
-{
-    static void sub_80A1434(u16, u8);
-    static void sub_80A1470(u16);
-
-    if ((timer & 0x07) == 0)
-    {
-        sub_80A1434(timer >> 3, 0);
-        sub_80A1470(timer >> 3);
-    }
-    if ((timer & 0x07) == 1)
-        sub_80A1434(timer >> 3, 1);
-    if ((timer & 0x07) == 2)
-        sub_80A1434(timer >> 3, 2);
-    if ((timer & 0x07) == 3)
-        sub_80A1434(timer >> 3, 3);
-    if ((timer & 0x07) == 4)
-        sub_80A1434(timer >> 3, 4);
-    if ((timer & 0x07) == 5)
-        sub_80A1434(timer >> 3, 5);
-    if ((timer & 0x07) == 6)
-        sub_80A1434(timer >> 3, 6);
-    if ((timer & 0x07) == 7)
-        sub_80A1434(timer >> 3, 7);
-}
-
-static void sub_80A10B8(u16 timer)
-{
-    static void sub_80A1520(u16);
-
-    if ((timer & 7) == 0)
-        sub_80A1520(timer >> 3);
-}
-
-static void sub_80A10D0(u16 timer)
-{
-    static void sub_80A1598(u16);
-
-    if ((timer & 15) == 0)
-        sub_80A1598(timer >> 4);
-}
-
-static void sub_80A10E8(u16 timer)
-{
-    static void sub_80A1394(u16, u8);
-
-    if ((timer & 0x07) == 0)
-        sub_80A1394(timer >> 3, 0);
-    if ((timer & 0x07) == 1)
-        sub_80A1394(timer >> 3, 1);
-    if ((timer & 0x07) == 2)
-        sub_80A1394(timer >> 3, 2);
-    if ((timer & 0x07) == 3)
-        sub_80A1394(timer >> 3, 3);
-    if ((timer & 0x07) == 4)
-        sub_80A1394(timer >> 3, 4);
-    if ((timer & 0x07) == 5)
-        sub_80A1394(timer >> 3, 5);
-    if ((timer & 0x07) == 6)
-        sub_80A1394(timer >> 3, 6);
-    if ((timer & 0x07) == 7)
-        sub_80A1394(timer >> 3, 7);
-}
-
-static void sub_80A115C(u16 timer)
-{
-    static void sub_80A12D4(u8);
-    static void sub_80A1498(u16);
-
-    if ((timer & 0x0F) == 0)
-        sub_80A12D4(timer >> 4);
-    if ((timer & 0x0F) == 1)
-        sub_80A1498(timer >> 4);
-}
-
-static void sub_80A1188(u16 timer)
-{
-    static void sub_80A14C0(u16, u8);
-
-    if ((timer & 0x07) == 0)
-        sub_80A14C0(timer >> 3, 0);
-    if ((timer & 0x07) == 1)
-        sub_80A14C0(timer >> 3, 1);
-    if ((timer & 0x07) == 2)
-        sub_80A14C0(timer >> 3, 2);
-    if ((timer & 0x07) == 3)
-        sub_80A14C0(timer >> 3, 3);
-    if ((timer & 0x07) == 4)
-        sub_80A14C0(timer >> 3, 4);
-    if ((timer & 0x07) == 5)
-        sub_80A14C0(timer >> 3, 5);
-    if ((timer & 0x07) == 6)
-        sub_80A14C0(timer >> 3, 6);
-    if ((timer & 0x07) == 7)
-        sub_80A14C0(timer >> 3, 7);
-}
-
-static void sub_80A11FC(u16 timer)
-{
-    static void sub_80A131C(u8);
-    static void sub_80A136C(u8);
-
-    if ((timer & 0x0F) == 0)
-        sub_80A131C(timer >> 4);
-    if ((timer & 0x0F) == 1)
-        sub_80A136C(timer >> 4);
-}
-
-static void sub_80A122C(u16 timer)
-{
-    static void sub_80A1798(u16);
-
-    if ((timer & 0x0F) == 0)
-        sub_80A1798(timer >> 4);
-}
-
-static void sub_80A1244(u16 timer)
-{
-    static void sub_80A1344(u8);
-
-    if ((timer & 0x0F) == 0)
-        sub_80A1344(timer >> 4);
-}
-
-static void sub_80A1260(u16 timer)
-{
-    static void sub_80A14F8(u16);
-
-    if ((timer & 0x0F) == 1)
-        sub_80A14F8(timer >> 4);
-}
-
-static void sub_80A127C(u16 timer)
-{
-    static void sub_80A1548(u16);
-
-    if ((timer & 0x07) == 0)
-        sub_80A1548(timer >> 3);
-}
-
-static void sub_80A1294(u16 timer)
-{
-    static void sub_80A1570(u16);
-
-    if ((timer & 0x07) == 0)
-        sub_80A1570(timer >> 3);
-}
-
-static void sub_80A12AC(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 4;
-    sub_80A0980(gUnknown_08513684[idx], (u16 *)(BG_VRAM + 0x3c00), 0x140);
-}
-
-static void sub_80A12D4(u8 timer)
-{
-    u8 idx;
-
-    idx = timer % 4;
-    sub_80A0980(gUnknown_08513894[idx], (u16 *)(BG_VRAM + 0x6400), 0x80);
-
-    idx = (timer + 2) % 4;
-    sub_80A0980(gUnknown_08513894[idx], (u16 *)(BG_VRAM + 0x6480), 0x80);
-}
-
-static void sub_80A131C(u8 timer)
-{
-    u8 idx;
-
-    idx = timer % 4;
-    sub_80A0980(gUnknown_085143E4[idx], (u16 *)(BG_VRAM + 0x7a00), 0x3C0);
-}
-
-static void sub_80A1344(u8 timer)
-{
-    u8 idx;
-
-    idx = timer % 4;
-    sub_80A0980(gUnknown_085145F4[idx], (u16 *)(BG_VRAM + 0x7e00), 0x80);
-}
-
-static void sub_80A136C(u8 timer)
-{
-    u8 idx;
-
-    idx = timer % 8;
-    sub_80A0980(gUnknown_08514E04[idx], (u16 *)(BG_VRAM + 0x7e00), 0x100);
-}
-
-static void sub_80A1394(u16 timer_div, u8 timer_mod)
-{
-    timer_div -= timer_mod;
-    if (timer_div < 12) // almost certainly a typo
-    {
-        timer_div %= 12;
-        sub_80A0980(gUnknown_08515384[timer_div], gUnknown_08515344[timer_mod], 0x80);
-        sub_80A0980(gUnknown_085153B4[timer_div], gUnknown_08515364[timer_mod], 0x80);
-    }
-    else
-    {
-        timer_div %= 4;
-        sub_80A0980(gUnknown_085153E4[timer_div], gUnknown_08515344[timer_mod], 0x80);
-        sub_80A0980(gUnknown_085153F4[timer_div], gUnknown_08515364[timer_mod], 0x80);
-    }
-}
-
-static void sub_80A1434(u16 timer_div, u8 timer_mod)
-{
-    timer_div -= timer_mod;
-    timer_div %= 8;
-    if (gUnknown_08515824[timer_div])
-        sub_80A0980(gUnknown_08515824[timer_div], gUnknown_08515804[timer_mod], 0x80);
-}
-
-static void sub_80A1470(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 2;
-    sub_80A0980(gUnknown_08515964[idx], (u16 *)(BG_VRAM + 0x7800), 0x80);
-}
-
-static void sub_80A1498(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 4;
-    sub_80A0980(gUnknown_08515D8C[idx], (u16 *)(BG_VRAM + 0x5400), 0x80);
-}
-
-static void sub_80A14C0(u16 timer_div, u8 timer_mod)
-{
-    timer_div -= timer_mod;
-    timer_div %= 8;
-
-    sub_80A0980(gUnknown_085161DC[timer_div], gUnknown_085161BC[timer_mod], 0x80);
-}
-
-static void sub_80A14F8(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 4;
-    sub_80A0980(gUnknown_08515D8C[idx], (u16 *)(BG_VRAM + 0x7400), 0x80);
-}
-
-static void sub_80A1520(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 4;
-    sub_80A0980(gUnknown_085164FC[idx], (u16 *)(BG_VRAM + 0x5540), 0xC0);
-}
-
-static void sub_80A1548(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 4;
-    sub_80A0980(gUnknown_0851680C[idx], (u16 *)(BG_VRAM + 0x5b40), 0xC0);
-}
-
-static void sub_80A1570(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 4;
-    sub_80A0980(gUnknown_08516B1C[idx], (u16 *)(BG_VRAM + 0x5b40), 0xC0);
-}
-
-static void sub_80A1598(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 4;
-    sub_80A0980(gUnknown_08516D2C[idx], (u16 *)(BG_VRAM + 0x5c00), 0x80);
-}
-
-static void sub_80A15C0(u16 timer)
-{
-    static void sub_80A1748(u16);
-
-    if ((timer & 1) == 0)
-        sub_80A1748(timer >> 1);
-}
-
-static void sub_80A15D8(u16 timer)
-{
-    static void sub_80A16B0(u16);
-
-    if ((timer & 7) == 0)
-        sub_80A16B0(timer >> 3);
-}
-
-static void sub_80A15F0(u16 timer)
-{
-    static void sub_80A1720(u16);
-    static void sub_80A16F8(u16);
-
-    if ((timer & 0x3f) == 1)
-        sub_80A1720(timer >> 6);
-    if ((timer & 0x07) == 1)
-        sub_80A16F8(timer >> 3);
-}
-static void sub_80A161C(u16 timer)
-{
-    static void sub_80A1770(u16);
-
-    if ((timer & 3) == 0)
-        sub_80A1770(timer >> 2);
-}
-
-static void sub_80A1634(u16 timer)
-{
-    static void sub_80A17C0(u16);
-    static void sub_80A17EC(u16);
-
-    if ((timer & 7) == 0)
-    {
-        sub_80A17C0(timer >> 3);
-        sub_80A17EC(timer >> 3);
-    }
-}
-
-static void sub_80A1658(u16 timer)
-{
-    static void sub_80A1818(u16);
-
-    if ((timer & 3) == 0)
-        sub_80A1818(timer >> 2);
-}
-
-static void sub_80A1670(u16 timer)
-{
-    static void sub_80A1884(u16);
-
-    if ((timer & 3) == 0)
-        sub_80A1884(timer >> 2);
-}
-
-static void sub_80A1688(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 2;
-    sub_80A0980(gUnknown_08516E3C[idx], (u16 *)(BG_VRAM + 0x3e00), 0x80);
-}
-
-static void sub_80A16B0(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 3;
-    sub_80A0980(gUnknown_08517A44[idx], (u16 *)(BG_VRAM + 0x7e00), 0x180);
-    sub_80A0980(gUnknown_08517A50[idx], (u16 *)(BG_VRAM + 0x7a00), 0x280);
-}
-
-static void sub_80A16F8(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 4;
-    sub_80A0980(gUnknown_08517BFC[idx], (u16 *)(BG_VRAM + 0x7f00), 0x20);
-}
-
-static void sub_80A1720(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 2;
-    sub_80A0980(gUnknown_08517C0C[idx], (u16 *)(BG_VRAM + 0x7c00), 0x80);
-}
-
-static void sub_80A1748(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 2;
-    sub_80A0980(gUnknown_08518034[idx], (u16 *)(BG_VRAM + 0x5200), 0x200);
-}
-
-static void sub_80A1770(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 2;
-    sub_80A0980(gUnknown_0851829C[idx], (u16 *)(BG_VRAM + 0x7e00), 0x120);
-}
-
-static void sub_80A1798(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 8;
-    sub_80A0980(gUnknown_085202C4[idx], (u16 *)(BG_VRAM + 0x5e00), 0xc00);
-}
-
-static void sub_80A17C0(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 3;
-    sub_80A0980(gUnknown_08524864[idx], (u16 *)(BG_VRAM + 0x52e0), 0x100);
-}
-
-static void sub_80A17EC(u16 timer)
-{
-    u16 idx;
-
-    idx = timer % 3;
-    sub_80A0980(gUnknown_08524870[idx], (u16 *)(BG_VRAM + 0x50e0), 0x100);
-}
-
-// palette
-
-static void sub_80A1818(u16 a1)
-{
-    CpuCopy16(gUnknown_0852487C[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
-    BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
-    if ((u8)FindTaskIdByFunc(sub_8149DFC) != 0xFF )
-    {
-        sSecondaryTilesetCB = sub_80A1670;
-        sSecondaryTilesetCBBufferSize = 0x20;
-    }
-}
-
-static void sub_80A1884(u16 a1)
-{
-    CpuCopy16(gUnknown_0852487C[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
-    if ((u8)FindTaskIdByFunc(sub_8149DFC) == 0xFF )
-    {
-        BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
-        if (!--sSecondaryTilesetCBBufferSize)
-            sSecondaryTilesetCB = NULL;
-    }
-}
-
 void LoadCompressedPalette(const void *src, u16 offset, u16 size)
 {
     LZDecompressWram(src, gPaletteDecompressionBuffer);
diff --git a/src/tileset_anims.c b/src/tileset_anims.c
new file mode 100644
index 000000000..5eb470a07
--- /dev/null
+++ b/src/tileset_anims.c
@@ -0,0 +1,865 @@
+
+// Includes
+#include "global.h"
+#include "palette.h"
+#include "blend_palette.h"
+#include "battle.h"
+#include "task.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+static EWRAM_DATA struct {
+    const u16 *src;
+    u16 *dest;
+    u16 size;
+} sTilesetDMA3TransferBuffer[20] = {0};
+
+static u8 sTilesetDMA3TransferBufferSize;
+static u16 sPrimaryTilesetCBCounter;
+static u16 sPrimaryTilesetCBBufferSize;
+static u16 sSecondaryTilesetCBCounter;
+static u16 sSecondaryTilesetCBBufferSize;
+static void (*sPrimaryTilesetCB)(u16);
+static void (*sSecondaryTilesetCB)(u16);
+
+// Static ROM declarations
+
+static void cur_mapheader_run_tileset1_func(void);
+static void cur_mapheader_run_tileset2_func(void);
+
+// .rodata
+
+extern const u16 *const gUnknown_08510764[];
+extern const u16 *const gUnknown_08512574[];
+extern const u16 *const gUnknown_08512E54[];
+extern const u16 *const gUnknown_08513174[];
+extern const u16 *const gUnknown_08513684[];
+extern const u16 *const gUnknown_08513894[];
+extern const u16 *const gUnknown_085143E4[];
+extern const u16 *const gUnknown_085145F4[];
+extern const u16 *const gUnknown_08514E04[];
+extern u16 *const gUnknown_08515344[];
+extern u16 *const gUnknown_08515364[];
+extern const u16 *const gUnknown_08515384[];
+extern const u16 *const gUnknown_085153B4[];
+extern const u16 *const gUnknown_085153E4[];
+extern const u16 *const gUnknown_085153F4[];
+extern  u16 *const gUnknown_08515804[];
+extern const u16 *const gUnknown_08515824[];
+extern const u16 *const gUnknown_08515964[];
+extern const u16 *const gUnknown_08515D8C[];
+extern  u16 *const gUnknown_085161BC[];
+extern const u16 *const gUnknown_085161DC[];
+extern const u16 *const gUnknown_085164FC[];
+extern const u16 *const gUnknown_0851680C[];
+extern const u16 *const gUnknown_08516B1C[];
+extern const u16 *const gUnknown_08516D2C[];
+extern const u16 *const gUnknown_08516E3C[];
+extern const u16 *const gUnknown_08517A44[];
+extern const u16 *const gUnknown_08517A50[];
+extern const u16 *const gUnknown_08517BFC[];
+extern const u16 *const gUnknown_08517C0C[];
+extern const u16 *const gUnknown_08518034[];
+extern const u16 *const gUnknown_0851829C[];
+extern const u16 *const gUnknown_085202C4[];
+extern const u16 *const gUnknown_08524864[];
+extern const u16 *const gUnknown_08524870[];
+
+extern const u16 gUnknown_08D85640[];
+extern const u16 gUnknown_08D85660[];
+extern const u16 gUnknown_08D85680[];
+extern const u16 gUnknown_08D856A0[];
+
+static const u16 *const gUnknown_0852487C[] = {
+    gUnknown_08D85640,
+    gUnknown_08D85660,
+    gUnknown_08D85680,
+    gUnknown_08D856A0,
+};
+
+// .text
+
+static void sub_80A0954(void)
+{
+    sTilesetDMA3TransferBufferSize = 0;
+    CpuFill32(0, sTilesetDMA3TransferBuffer, sizeof sTilesetDMA3TransferBuffer);
+}
+
+static void sub_80A0980(const u16 *a0, u16 *a1, u16 a2)
+{
+    if (sTilesetDMA3TransferBufferSize < 20)
+    {
+        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].src = a0;
+        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].dest = a1;
+        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].size = a2;
+        sTilesetDMA3TransferBufferSize ++;
+    }
+}
+
+void sub_80A09D0(void)
+{
+    int i;
+
+    for (i = 0; i < sTilesetDMA3TransferBufferSize; i ++)
+    {
+        DmaCopy16(3, sTilesetDMA3TransferBuffer[i].src, sTilesetDMA3TransferBuffer[i].dest, sTilesetDMA3TransferBuffer[i].size);
+    }
+    sTilesetDMA3TransferBufferSize = 0;
+}
+
+void cur_mapheader_run_tileset_funcs_after_some_cpuset(void)
+{
+    sub_80A0954();
+    cur_mapheader_run_tileset1_func();
+    cur_mapheader_run_tileset2_func();
+}
+
+void sub_80A0A2C(void)
+{
+    cur_mapheader_run_tileset2_func();
+}
+
+void sub_80A0A38(void)
+{
+    sub_80A0954();
+    if (++sPrimaryTilesetCBCounter >= sPrimaryTilesetCBBufferSize)
+        sPrimaryTilesetCBCounter = 0;
+    if (++sSecondaryTilesetCBCounter >= sSecondaryTilesetCBBufferSize)
+        sSecondaryTilesetCBCounter = 0;
+    if (sPrimaryTilesetCB)
+        sPrimaryTilesetCB(sPrimaryTilesetCBCounter);
+    if (sSecondaryTilesetCB)
+        sSecondaryTilesetCB(sSecondaryTilesetCBCounter);
+}
+
+static void cur_mapheader_run_tileset1_func(void)
+{
+    sPrimaryTilesetCBCounter = 0;
+    sPrimaryTilesetCBBufferSize = 0;
+    sPrimaryTilesetCB = NULL;
+    if (gMapHeader.mapData->primaryTileset && gMapHeader.mapData->primaryTileset->callback)
+        gMapHeader.mapData->primaryTileset->callback();
+}
+
+static void cur_mapheader_run_tileset2_func(void)
+{
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = 0;
+    sSecondaryTilesetCB = NULL;
+    if (gMapHeader.mapData->secondaryTileset && gMapHeader.mapData->secondaryTileset->callback)
+        gMapHeader.mapData->secondaryTileset->callback();
+}
+
+void TilesetCb_General(void)
+{
+    static void sub_80A0B70(u16);
+
+    sPrimaryTilesetCBCounter = 0;
+    sPrimaryTilesetCBBufferSize = 0x100;
+    sPrimaryTilesetCB = sub_80A0B70;
+}
+
+void TilesetCb_InsideBuilding(void)
+{
+    static void sub_80A0BB4(u16);
+
+    sPrimaryTilesetCBCounter = 0;
+    sPrimaryTilesetCBBufferSize = 0x100;
+    sPrimaryTilesetCB = sub_80A0BB4;
+}
+
+static void sub_80A0B70(u16 timer)
+{
+    static void sub_80A0BCC(u16);
+    static void sub_80A0BF4(u16);
+    static void sub_80A0C1C(u16);
+    static void sub_80A0C44(u16);
+    static void sub_80A12AC(u16);
+
+    if ((timer & 0x0F) == 0)
+        sub_80A0BCC(timer >> 4);
+    if ((timer & 0x0F) == 1)
+        sub_80A0BF4(timer >> 4);
+    if ((timer & 0x0F) == 2)
+        sub_80A0C1C(timer >> 4);
+    if ((timer & 0x0F) == 3)
+        sub_80A0C44(timer >> 4);
+    if ((timer & 0x0F) == 4)
+        sub_80A12AC(timer >> 4);
+}
+
+static void sub_80A0BB4(u16 timer)
+{
+    static void sub_80A1688(u16);
+
+    if ((timer & 0x7) == 0)
+        sub_80A1688(timer >> 3);
+}
+
+static void sub_80A0BCC(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08510764[idx], (u16 *)(BG_VRAM + 0x3F80), 0x80);
+}
+
+static void sub_80A0BF4(u16 timer)
+{
+    u8 idx;
+
+    idx = timer % 8;
+    sub_80A0980(gUnknown_08512574[idx], (u16 *)(BG_VRAM + 0x3600), 0x3C0);
+}
+
+static void sub_80A0C1C(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 8;
+    sub_80A0980(gUnknown_08512E54[idx], (u16 *)(BG_VRAM + 0x3a00), 0x140);
+}
+
+static void sub_80A0C44(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08513174[idx], (u16 *)(BG_VRAM + 0x3e00), 0xc0);
+}
+
+void TilesetCb_Petalburg(void)
+{
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = NULL;
+}
+
+void TilesetCb_Rustboro(void)
+{
+    static void sub_80A103C(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A103C;
+}
+
+void TilesetCb_Dewford(void)
+{
+    static void sub_80A10B8(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A10B8;
+}
+
+void TilesetCb_Slateport(void)
+{
+    static void sub_80A10D0(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A10D0;
+}
+
+void TilesetCb_Mauville(void)
+{
+    static void sub_80A10E8(u16);
+
+    sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A10E8;
+}
+
+void TilesetCb_Lavaridge(void)
+{
+    static void sub_80A115C(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A115C;
+}
+
+void TilesetCb_Fallarbor(void)
+{
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = NULL;
+}
+
+void TilesetCb_Fortree(void)
+{
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = NULL;
+}
+
+void TilesetCb_Lilycove(void)
+{
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = NULL;
+}
+
+void TilesetCb_Mossdeep(void)
+{
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = NULL;
+}
+
+void TilesetCb_EverGrande(void)
+{
+    static void sub_80A1188(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A1188;
+}
+
+void TilesetCb_Pacifidlog(void)
+{
+    static void sub_80A11FC(u16);
+
+    sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A11FC;
+}
+
+void TilesetCb_Sootopolis(void)
+{
+    static void sub_80A122C(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A122C;
+}
+
+void TilesetCb_BattleFrontierOutsideWest(void)
+{
+    static void sub_80A127C(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A127C;
+}
+
+void TilesetCb_BattleFrontierOutsideEast(void)
+{
+    static void sub_80A1294(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A1294;
+}
+
+void TilesetCb_Underwater(void)
+{
+    static void sub_80A1244(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = 128;
+    sSecondaryTilesetCB = sub_80A1244;
+}
+
+void TilesetCb_SootopolisGym(void)
+{
+    static void sub_80A15D8(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = 240;
+    sSecondaryTilesetCB = sub_80A15D8;
+}
+
+void TilesetCb_Cave(void)
+{
+    static void sub_80A1260(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A1260;
+}
+
+void TilesetCb_EliteFour(void)
+{
+    static void sub_80A15F0(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = 128;
+    sSecondaryTilesetCB = sub_80A15F0;
+}
+
+void TilesetCb_MauvilleGym(void)
+{
+    static void sub_80A15C0(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A15C0;
+}
+
+void TilesetCb_BikeShop(void)
+{
+    static void sub_80A161C(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A161C;
+}
+
+void TilesetCb_BattlePyramid(void)
+{
+    static void sub_80A1634(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A1634;
+}
+
+void TilesetCb_BattleDome(void)
+{
+    static void sub_80A1658(u16);
+
+    sSecondaryTilesetCBCounter = 0;
+    sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize;
+    sSecondaryTilesetCB = sub_80A1658;
+}
+
+static void sub_80A103C(u16 timer)
+{
+    static void sub_80A1434(u16, u8);
+    static void sub_80A1470(u16);
+
+    if ((timer & 0x07) == 0)
+    {
+        sub_80A1434(timer >> 3, 0);
+        sub_80A1470(timer >> 3);
+    }
+    if ((timer & 0x07) == 1)
+        sub_80A1434(timer >> 3, 1);
+    if ((timer & 0x07) == 2)
+        sub_80A1434(timer >> 3, 2);
+    if ((timer & 0x07) == 3)
+        sub_80A1434(timer >> 3, 3);
+    if ((timer & 0x07) == 4)
+        sub_80A1434(timer >> 3, 4);
+    if ((timer & 0x07) == 5)
+        sub_80A1434(timer >> 3, 5);
+    if ((timer & 0x07) == 6)
+        sub_80A1434(timer >> 3, 6);
+    if ((timer & 0x07) == 7)
+        sub_80A1434(timer >> 3, 7);
+}
+
+static void sub_80A10B8(u16 timer)
+{
+    static void sub_80A1520(u16);
+
+    if ((timer & 7) == 0)
+        sub_80A1520(timer >> 3);
+}
+
+static void sub_80A10D0(u16 timer)
+{
+    static void sub_80A1598(u16);
+
+    if ((timer & 15) == 0)
+        sub_80A1598(timer >> 4);
+}
+
+static void sub_80A10E8(u16 timer)
+{
+    static void sub_80A1394(u16, u8);
+
+    if ((timer & 0x07) == 0)
+        sub_80A1394(timer >> 3, 0);
+    if ((timer & 0x07) == 1)
+        sub_80A1394(timer >> 3, 1);
+    if ((timer & 0x07) == 2)
+        sub_80A1394(timer >> 3, 2);
+    if ((timer & 0x07) == 3)
+        sub_80A1394(timer >> 3, 3);
+    if ((timer & 0x07) == 4)
+        sub_80A1394(timer >> 3, 4);
+    if ((timer & 0x07) == 5)
+        sub_80A1394(timer >> 3, 5);
+    if ((timer & 0x07) == 6)
+        sub_80A1394(timer >> 3, 6);
+    if ((timer & 0x07) == 7)
+        sub_80A1394(timer >> 3, 7);
+}
+
+static void sub_80A115C(u16 timer)
+{
+    static void sub_80A12D4(u8);
+    static void sub_80A1498(u16);
+
+    if ((timer & 0x0F) == 0)
+        sub_80A12D4(timer >> 4);
+    if ((timer & 0x0F) == 1)
+        sub_80A1498(timer >> 4);
+}
+
+static void sub_80A1188(u16 timer)
+{
+    static void sub_80A14C0(u16, u8);
+
+    if ((timer & 0x07) == 0)
+        sub_80A14C0(timer >> 3, 0);
+    if ((timer & 0x07) == 1)
+        sub_80A14C0(timer >> 3, 1);
+    if ((timer & 0x07) == 2)
+        sub_80A14C0(timer >> 3, 2);
+    if ((timer & 0x07) == 3)
+        sub_80A14C0(timer >> 3, 3);
+    if ((timer & 0x07) == 4)
+        sub_80A14C0(timer >> 3, 4);
+    if ((timer & 0x07) == 5)
+        sub_80A14C0(timer >> 3, 5);
+    if ((timer & 0x07) == 6)
+        sub_80A14C0(timer >> 3, 6);
+    if ((timer & 0x07) == 7)
+        sub_80A14C0(timer >> 3, 7);
+}
+
+static void sub_80A11FC(u16 timer)
+{
+    static void sub_80A131C(u8);
+    static void sub_80A136C(u8);
+
+    if ((timer & 0x0F) == 0)
+        sub_80A131C(timer >> 4);
+    if ((timer & 0x0F) == 1)
+        sub_80A136C(timer >> 4);
+}
+
+static void sub_80A122C(u16 timer)
+{
+    static void sub_80A1798(u16);
+
+    if ((timer & 0x0F) == 0)
+        sub_80A1798(timer >> 4);
+}
+
+static void sub_80A1244(u16 timer)
+{
+    static void sub_80A1344(u8);
+
+    if ((timer & 0x0F) == 0)
+        sub_80A1344(timer >> 4);
+}
+
+static void sub_80A1260(u16 timer)
+{
+    static void sub_80A14F8(u16);
+
+    if ((timer & 0x0F) == 1)
+        sub_80A14F8(timer >> 4);
+}
+
+static void sub_80A127C(u16 timer)
+{
+    static void sub_80A1548(u16);
+
+    if ((timer & 0x07) == 0)
+        sub_80A1548(timer >> 3);
+}
+
+static void sub_80A1294(u16 timer)
+{
+    static void sub_80A1570(u16);
+
+    if ((timer & 0x07) == 0)
+        sub_80A1570(timer >> 3);
+}
+
+static void sub_80A12AC(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08513684[idx], (u16 *)(BG_VRAM + 0x3c00), 0x140);
+}
+
+static void sub_80A12D4(u8 timer)
+{
+    u8 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08513894[idx], (u16 *)(BG_VRAM + 0x6400), 0x80);
+
+    idx = (timer + 2) % 4;
+    sub_80A0980(gUnknown_08513894[idx], (u16 *)(BG_VRAM + 0x6480), 0x80);
+}
+
+static void sub_80A131C(u8 timer)
+{
+    u8 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_085143E4[idx], (u16 *)(BG_VRAM + 0x7a00), 0x3C0);
+}
+
+static void sub_80A1344(u8 timer)
+{
+    u8 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_085145F4[idx], (u16 *)(BG_VRAM + 0x7e00), 0x80);
+}
+
+static void sub_80A136C(u8 timer)
+{
+    u8 idx;
+
+    idx = timer % 8;
+    sub_80A0980(gUnknown_08514E04[idx], (u16 *)(BG_VRAM + 0x7e00), 0x100);
+}
+
+static void sub_80A1394(u16 timer_div, u8 timer_mod)
+{
+    timer_div -= timer_mod;
+    if (timer_div < 12) // almost certainly a typo
+    {
+        timer_div %= 12;
+        sub_80A0980(gUnknown_08515384[timer_div], gUnknown_08515344[timer_mod], 0x80);
+        sub_80A0980(gUnknown_085153B4[timer_div], gUnknown_08515364[timer_mod], 0x80);
+    }
+    else
+    {
+        timer_div %= 4;
+        sub_80A0980(gUnknown_085153E4[timer_div], gUnknown_08515344[timer_mod], 0x80);
+        sub_80A0980(gUnknown_085153F4[timer_div], gUnknown_08515364[timer_mod], 0x80);
+    }
+}
+
+static void sub_80A1434(u16 timer_div, u8 timer_mod)
+{
+    timer_div -= timer_mod;
+    timer_div %= 8;
+    if (gUnknown_08515824[timer_div])
+        sub_80A0980(gUnknown_08515824[timer_div], gUnknown_08515804[timer_mod], 0x80);
+}
+
+static void sub_80A1470(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 2;
+    sub_80A0980(gUnknown_08515964[idx], (u16 *)(BG_VRAM + 0x7800), 0x80);
+}
+
+static void sub_80A1498(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08515D8C[idx], (u16 *)(BG_VRAM + 0x5400), 0x80);
+}
+
+static void sub_80A14C0(u16 timer_div, u8 timer_mod)
+{
+    timer_div -= timer_mod;
+    timer_div %= 8;
+
+    sub_80A0980(gUnknown_085161DC[timer_div], gUnknown_085161BC[timer_mod], 0x80);
+}
+
+static void sub_80A14F8(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08515D8C[idx], (u16 *)(BG_VRAM + 0x7400), 0x80);
+}
+
+static void sub_80A1520(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_085164FC[idx], (u16 *)(BG_VRAM + 0x5540), 0xC0);
+}
+
+static void sub_80A1548(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_0851680C[idx], (u16 *)(BG_VRAM + 0x5b40), 0xC0);
+}
+
+static void sub_80A1570(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08516B1C[idx], (u16 *)(BG_VRAM + 0x5b40), 0xC0);
+}
+
+static void sub_80A1598(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08516D2C[idx], (u16 *)(BG_VRAM + 0x5c00), 0x80);
+}
+
+static void sub_80A15C0(u16 timer)
+{
+    static void sub_80A1748(u16);
+
+    if ((timer & 1) == 0)
+        sub_80A1748(timer >> 1);
+}
+
+static void sub_80A15D8(u16 timer)
+{
+    static void sub_80A16B0(u16);
+
+    if ((timer & 7) == 0)
+        sub_80A16B0(timer >> 3);
+}
+
+static void sub_80A15F0(u16 timer)
+{
+    static void sub_80A1720(u16);
+    static void sub_80A16F8(u16);
+
+    if ((timer & 0x3f) == 1)
+        sub_80A1720(timer >> 6);
+    if ((timer & 0x07) == 1)
+        sub_80A16F8(timer >> 3);
+}
+static void sub_80A161C(u16 timer)
+{
+    static void sub_80A1770(u16);
+
+    if ((timer & 3) == 0)
+        sub_80A1770(timer >> 2);
+}
+
+static void sub_80A1634(u16 timer)
+{
+    static void sub_80A17C0(u16);
+    static void sub_80A17EC(u16);
+
+    if ((timer & 7) == 0)
+    {
+        sub_80A17C0(timer >> 3);
+        sub_80A17EC(timer >> 3);
+    }
+}
+
+static void sub_80A1658(u16 timer)
+{
+    static void sub_80A1818(u16);
+
+    if ((timer & 3) == 0)
+        sub_80A1818(timer >> 2);
+}
+
+static void sub_80A1670(u16 timer)
+{
+    static void sub_80A1884(u16);
+
+    if ((timer & 3) == 0)
+        sub_80A1884(timer >> 2);
+}
+
+static void sub_80A1688(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 2;
+    sub_80A0980(gUnknown_08516E3C[idx], (u16 *)(BG_VRAM + 0x3e00), 0x80);
+}
+
+static void sub_80A16B0(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 3;
+    sub_80A0980(gUnknown_08517A44[idx], (u16 *)(BG_VRAM + 0x7e00), 0x180);
+    sub_80A0980(gUnknown_08517A50[idx], (u16 *)(BG_VRAM + 0x7a00), 0x280);
+}
+
+static void sub_80A16F8(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 4;
+    sub_80A0980(gUnknown_08517BFC[idx], (u16 *)(BG_VRAM + 0x7f00), 0x20);
+}
+
+static void sub_80A1720(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 2;
+    sub_80A0980(gUnknown_08517C0C[idx], (u16 *)(BG_VRAM + 0x7c00), 0x80);
+}
+
+static void sub_80A1748(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 2;
+    sub_80A0980(gUnknown_08518034[idx], (u16 *)(BG_VRAM + 0x5200), 0x200);
+}
+
+static void sub_80A1770(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 2;
+    sub_80A0980(gUnknown_0851829C[idx], (u16 *)(BG_VRAM + 0x7e00), 0x120);
+}
+
+static void sub_80A1798(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 8;
+    sub_80A0980(gUnknown_085202C4[idx], (u16 *)(BG_VRAM + 0x5e00), 0xc00);
+}
+
+static void sub_80A17C0(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 3;
+    sub_80A0980(gUnknown_08524864[idx], (u16 *)(BG_VRAM + 0x52e0), 0x100);
+}
+
+static void sub_80A17EC(u16 timer)
+{
+    u16 idx;
+
+    idx = timer % 3;
+    sub_80A0980(gUnknown_08524870[idx], (u16 *)(BG_VRAM + 0x50e0), 0x100);
+}
+
+static void sub_80A1818(u16 a1)
+{
+    CpuCopy16(gUnknown_0852487C[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
+    BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
+    if ((u8)FindTaskIdByFunc(sub_8149DFC) != 0xFF )
+    {
+        sSecondaryTilesetCB = sub_80A1670;
+        sSecondaryTilesetCBBufferSize = 0x20;
+    }
+}
+
+static void sub_80A1884(u16 a1)
+{
+    CpuCopy16(gUnknown_0852487C[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
+    if ((u8)FindTaskIdByFunc(sub_8149DFC) == 0xFF )
+    {
+        BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
+        if (!--sSecondaryTilesetCBBufferSize)
+            sSecondaryTilesetCB = NULL;
+    }
+}
diff --git a/sym_bss.txt b/sym_bss.txt
index 16f14da51..3416b67df 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -17,6 +17,7 @@ gUnknown_03000000: @ 3000000
     .include "src/field_camera.o"
     .include "src/script.o"
     .include "src/scrcmd.o"
+    .include "src/tileset_anims.o"
     .include "src/palette.o"
     .include "src/sound.o"
 
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 8549f1679..7848dcc7c 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -747,6 +747,7 @@ gUnknown_02037621: @ 2037621
 gUnknown_02037622: @ 2037622
 	.space 0x2
 
+	.include "src/tileset_anims.o"
 	.include "src/palette.o"
     .include "src/sound.o"
     

From 74951e4312b782b81324999a580bdf25fe4d31ce Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 2 Oct 2017 08:43:52 -0400
Subject: [PATCH 20/42] Name pointer tables

---
 asm/rom4.s          |   2 +-
 data/tileset.s      |  71 ++++++++++----------
 src/tileset_anims.c | 160 ++++++++++++++++++++++----------------------
 3 files changed, 116 insertions(+), 117 deletions(-)

diff --git a/asm/rom4.s b/asm/rom4.s
index 5250659e7..8423d0d9a 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -3640,7 +3640,7 @@ VBlankCB_Field: @ 8086390
 	bl sub_80BA0A8
 	bl FieldUpdateBgTilemapScroll
 	bl TransferPlttBuffer
-	bl sub_80A09D0
+	bl TransferTilesetAnimsBuffer
 	pop {r0}
 	bx r0
 	thumb_func_end VBlankCB_Field
diff --git a/data/tileset.s b/data/tileset.s
index 0acb50e91..b8a0ca77f 100644
--- a/data/tileset.s
+++ b/data/tileset.s
@@ -15,7 +15,7 @@ gUnknown_085106C4::
 
 	.space 0x20
 
-gUnknown_08510764:: @ 8510764
+gTilesetAnims_General0:: @ 8510764
 @ replacing .incbin "baserom.gba", 0x00510764, 0x10
 	.4byte gUnknown_08510644
 	.4byte gUnknown_085105C4
@@ -47,7 +47,7 @@ gUnknown_085121B4::
 	.incbin "baserom.gba", 0x5121b4, 0x3c0
 
 
-gUnknown_08512574:: @ 8512574
+gTilesetAnims_General1:: @ 8512574
 @ replacing .incbin "baserom.gba", 0x00512574, 0x20
 	.4byte gUnknown_08510774
 	.4byte gUnknown_08510B34
@@ -80,7 +80,7 @@ gUnknown_08512D14::
 	.incbin "baserom.gba", 0x512d14, 0x140
 
 
-gUnknown_08512E54:: @ 8512E54
+gTilesetAnims_General2:: @ 8512E54
 @ replacing .incbin "baserom.gba", 0x00512e54, 0x20
 	.4byte gUnknown_08512594
 	.4byte gUnknown_085126D4
@@ -104,7 +104,7 @@ gUnknown_085130B4::
 	.incbin "baserom.gba", 0x5130b4, 0xc0
 
 
-gUnknown_08513174:: @ 8513174
+gTilesetAnims_General3:: @ 8513174
 @ replacing .incbin "baserom.gba", 0x00513174, 0x10
 	.4byte gUnknown_08512E74
 	.4byte gUnknown_08512F34
@@ -124,7 +124,7 @@ gUnknown_08513544::
 	.incbin "baserom.gba", 0x513544, 0x140
 
 
-gUnknown_08513684:: @ 8513684
+gTilesetAnims_General4:: @ 8513684
 @ replacing .incbin "baserom.gba", 0x00513684, 0x10
 	.4byte gUnknown_08513184
 	.4byte gUnknown_085132C4
@@ -144,7 +144,7 @@ gUnknown_08513814::
 	.incbin "baserom.gba", 0x513814, 0x80
 
 
-gUnknown_08513894:: @ 8513894
+gTilesetAnims_Lavaridge0:: @ 8513894
 @ replacing .incbin "baserom.gba", 0x00513894, 0x10
 	.4byte gUnknown_08513694
 	.4byte gUnknown_08513714
@@ -161,7 +161,7 @@ gUnknown_08514024::
 	.incbin "baserom.gba", 0x514024, 0x3c0
 
 
-gUnknown_085143E4:: @ 85143E4
+gTilesetAnims_Pacifidlog0:: @ 85143E4
 @ replacing .incbin "baserom.gba", 0x005143e4, 0x10
 	.4byte gUnknown_085138A4
 	.4byte gUnknown_08513C64
@@ -181,7 +181,7 @@ gUnknown_08514574::
 	.incbin "baserom.gba", 0x514574, 0x80
 
 
-gUnknown_085145F4:: @ 85145F4
+gTilesetAnims_Underwater0:: @ 85145F4
 @ replacing .incbin "baserom.gba", 0x005145f4, 0x10
 	.4byte gUnknown_085143F4
 	.4byte gUnknown_08514474
@@ -213,7 +213,7 @@ gUnknown_08514D04::
 	.incbin "baserom.gba", 0x514d04, 0x100
 
 
-gUnknown_08514E04:: @ 8514E04
+gTilesetAnims_Pacifidlog1:: @ 8514E04
 @ replacing .incbin "baserom.gba", 0x00514e04, 0x20
 	.4byte gUnknown_08514604
 	.4byte gUnknown_08514704
@@ -256,7 +256,7 @@ gUnknown_085152A4::
 
 	.space 0x20
 
-gUnknown_08515344:: @ 8515344
+gTilesetAnims_MauvilleVDests0:: @ 8515344
 @ replacing .incbin "baserom.gba", 0x00515344, 0x20
 	.4byte BG_VRAM + 0x4c00
 	.4byte BG_VRAM + 0x4c80
@@ -267,7 +267,7 @@ gUnknown_08515344:: @ 8515344
 	.4byte BG_VRAM + 0x4f00
 	.4byte BG_VRAM + 0x4f80
 
-gUnknown_08515364:: @ 8515364
+gTilesetAnims_MauvilleVDests1:: @ 8515364
 @ replacing .incbin "baserom.gba", 0x00515364, 0x20
 	.4byte BG_VRAM + 0x5000
 	.4byte BG_VRAM + 0x5080
@@ -278,7 +278,7 @@ gUnknown_08515364:: @ 8515364
 	.4byte BG_VRAM + 0x5300
 	.4byte BG_VRAM + 0x5380
 
-gUnknown_08515384:: @ 8515384
+gTilesetAnims_Mauville0a:: @ 8515384
 @ replacing .incbin "baserom.gba", 0x00515384, 0x30
 	.4byte gUnknown_08514E24
 	.4byte gUnknown_08514E24
@@ -293,7 +293,7 @@ gUnknown_08515384:: @ 8515384
 	.4byte gUnknown_08514F24
 	.4byte gUnknown_08514EA4
 
-gUnknown_085153B4:: @ 85153B4
+gTilesetAnims_Mauville0b:: @ 85153B4
 @ replacing .incbin "baserom.gba", 0x005153b4, 0x30
 	.4byte gUnknown_085150A4
 	.4byte gUnknown_085150A4
@@ -308,14 +308,14 @@ gUnknown_085153B4:: @ 85153B4
 	.4byte gUnknown_085151A4
 	.4byte gUnknown_08515124
 
-gUnknown_085153E4:: @ 85153E4
+gTilesetAnims_Mauville1a:: @ 85153E4
 @ replacing .incbin "baserom.gba", 0x005153e4, 0x10
 	.4byte gUnknown_08514E24
 	.4byte gUnknown_08514E24
 	.4byte gUnknown_08515024
 	.4byte gUnknown_08515024
 
-gUnknown_085153F4:: @ 85153F4
+gTilesetAnims_Mauville1b:: @ 85153F4
 @ replacing .incbin "baserom.gba", 0x005153f4, 0x10
 	.4byte gUnknown_085150A4
 	.4byte gUnknown_085150A4
@@ -347,7 +347,7 @@ gUnknown_08515784::
 	.incbin "baserom.gba", 0x515784, 0x80
 
 
-gUnknown_08515804:: @ 8515804
+gTilesetAnims_RustboroVDests0:: @ 8515804
     .4byte BG_VRAM + 0x5000
 	.4byte BG_VRAM + 0x5080
 	.4byte BG_VRAM + 0x5100
@@ -357,7 +357,7 @@ gUnknown_08515804:: @ 8515804
 	.4byte BG_VRAM + 0x5300
 	.4byte BG_VRAM + 0x5380
 
-gUnknown_08515824:: @ 8515824
+gTilesetAnims_Rustboro0:: @ 8515824
 @ replacing .incbin "baserom.gba", 0x00515824, 0x20
 	.4byte gUnknown_08515404
 	.4byte gUnknown_08515484
@@ -377,7 +377,7 @@ gUnknown_085158C4::
 	.space 0x20
 
 
-gUnknown_08515964:: @ 8515964
+gTilesetAnims_Rustboro1:: @ 8515964
 @ replacing .incbin "baserom.gba", 0x00515964, 0x8
 	.4byte gUnknown_08515844
 	.4byte gUnknown_085158C4
@@ -409,7 +409,7 @@ gUnknown_08515CEC::
     .space 0x20
 
 
-gUnknown_08515D8C:: @ 8515D8C
+gTilesetAnims_Lavaridge1_Cave0:: @ 8515D8C
 @ replacing .incbin "baserom.gba", 0x00515d8c, 0x10
 	.4byte gUnknown_0851596C
 	.4byte gUnknown_085159EC
@@ -443,7 +443,7 @@ gUnknown_0851611C::
 	.space 0x20
 
 
-gUnknown_085161BC:: @ 85161BC
+gTilesetAnims_EverGrandeVDests0:: @ 85161BC
 @ replacing .incbin "baserom.gba", 0x005161bc, 0x20
 	.4byte BG_VRAM + 0x5c00
 	.4byte BG_VRAM + 0x5c80
@@ -454,7 +454,7 @@ gUnknown_085161BC:: @ 85161BC
 	.4byte BG_VRAM + 0x5f00
 	.4byte BG_VRAM + 0x5f80
 
-gUnknown_085161DC:: @ 85161DC
+gTilesetAnims_EverGrande0:: @ 85161DC
 @ replacing .incbin "baserom.gba", 0x005161dc, 0x20
 	.4byte gUnknown_08515D9C
 	.4byte gUnknown_08515E1C
@@ -478,7 +478,7 @@ gUnknown_0851643C::
 	.incbin "baserom.gba", 0x51643c, 0xc0
 
 
-gUnknown_085164FC:: @ 85164FC
+gTilesetAnims_Dewford0:: @ 85164FC
 @ replacing .incbin "baserom.gba", 0x005164fc, 0x10
 	.4byte gUnknown_085161FC
 	.4byte gUnknown_085162BC
@@ -498,7 +498,7 @@ gUnknown_0851674C::
 	.incbin "baserom.gba", 0x51674c, 0xc0
 
 
-gUnknown_0851680C:: @ 851680C
+gTilesetAnims_BattleFrontierOutsideWest0:: @ 851680C
 @ replacing .incbin "baserom.gba", 0x0051680c, 0x10
 	.4byte gUnknown_0851650C
 	.4byte gUnknown_085165CC
@@ -518,7 +518,7 @@ gUnknown_08516A5C::
 	.incbin "baserom.gba", 0x516a5c, 0xc0
 
 
-gUnknown_08516B1C:: @ 8516B1C
+gTilesetAnims_BattleFrontierOutsideEast0:: @ 8516B1C
 @ replacing .incbin "baserom.gba", 0x00516b1c, 0x10
 	.4byte gUnknown_0851681C
 	.4byte gUnknown_085168DC
@@ -538,7 +538,7 @@ gUnknown_08516CAC::
 	.incbin "baserom.gba", 0x516cac, 0x80
 
 
-gUnknown_08516D2C:: @ 8516D2C
+gTilesetAnims_Slateport0:: @ 8516D2C
 @ replacing .incbin "baserom.gba", 0x00516d2c, 0x10
 	.4byte gUnknown_08516B2C
 	.4byte gUnknown_08516BAC
@@ -552,7 +552,7 @@ gUnknown_08516DBC::
 	.incbin "baserom.gba", 0x516dbc, 0x80
 
 
-gUnknown_08516E3C:: @ 8516E3C
+gTilesetAnims_InsideBuilding0:: @ 8516E3C
 @ replacing .incbin "baserom.gba", 0x00516e3c, 0x8
 	.4byte gUnknown_08516D3C
 	.4byte gUnknown_08516DBC
@@ -576,13 +576,13 @@ gUnknown_085177C4::
 	.incbin "baserom.gba", 0x5177c4, 0x280
 
 
-gUnknown_08517A44:: @ 8517A44
+gTilesetAnims_SootopolisGym0:: @ 8517A44
 @ replacing .incbin "baserom.gba", 0x00517a44, 0xc
 	.4byte gUnknown_08516E44
 	.4byte gUnknown_08516FC4
 	.4byte gUnknown_08517144
 
-gUnknown_08517A50:: @ 8517A50
+gTilesetAnims_SootopolisGym1:: @ 8517A50
 @ replacing .incbin "baserom.gba", 0x00517a50, 0xc
 	.4byte gUnknown_085172C4
 	.4byte gUnknown_08517544
@@ -609,14 +609,14 @@ gUnknown_08517BBC::
 	.space 0x20
 
 
-gUnknown_08517BFC:: @ 8517BFC
+gTilesetAnims_EliteFour1:: @ 8517BFC
 @ replacing .incbin "baserom.gba", 0x00517bfc, 0x10
 	.4byte gUnknown_08517B5C
 	.4byte gUnknown_08517B7C
 	.4byte gUnknown_08517B9C
 	.4byte gUnknown_08517BBC
 
-gUnknown_08517C0C:: @ 8517C0C
+gTilesetAnims_EliteFour0:: @ 8517C0C
 @ replacing .incbin "baserom.gba", 0x00517c0c, 0x8
 	.4byte gUnknown_08517A5C
 	.4byte gUnknown_08517ADC
@@ -630,7 +630,7 @@ gUnknown_08517E14::
 	.space 0x20
 
 
-gUnknown_08518034:: @ 8518034
+gTilesetAnims_MauvilleGym0:: @ 8518034
 @ replacing .incbin "baserom.gba", 0x00518034, 0x8
 	.4byte gUnknown_08517C14
 	.4byte gUnknown_08517E14
@@ -643,7 +643,7 @@ gUnknown_0851815C::
 
 	.space 0x20
 
-gUnknown_0851829C:: @ 851829C
+gTilesetAnims_BikeShop0:: @ 851829C
 @ replacing .incbin "baserom.gba", 0x0051829c, 0x8
 	.4byte gUnknown_0851803C
 	.4byte gUnknown_0851815C
@@ -686,7 +686,7 @@ gUnknown_0851F2C4::
 gUnknown_0851FAC4::
 	.incbin "baserom.gba", 0x51fac4, 0x800
 
-gUnknown_085202C4:: @ 85202C4
+gTilesetAnims_Sootopolis0:: @ 85202C4
 @ replacing .incbin "baserom.gba", 0x005202c4, 0x20
 	.4byte gUnknown_085182A4
 	.4byte gUnknown_08518EA4
@@ -727,14 +727,13 @@ gUnknown_08524604::
 gUnknown_08524804::
 	.incbin "baserom.gba", 0x524804, 0x60
 
-
-gUnknown_08524864:: @ 8524864
+gTilesetAnims_BattlePyramid0:: @ 8524864
 @ replacing .incbin "baserom.gba", 0x00524864, 0xc
 	.4byte gUnknown_085202E4
 	.4byte gUnknown_085203E4
 	.4byte gUnknown_085204E4
 
-gUnknown_08524870:: @ 8524870
+gTilesetAnims_BattlePyramid1:: @ 8524870
 @ replacing .incbin "baserom.gba", 0x00524870, 0xc
 	.4byte gUnknown_08520604
 	.4byte gUnknown_08520704
diff --git a/src/tileset_anims.c b/src/tileset_anims.c
index 5eb470a07..b7f18d869 100644
--- a/src/tileset_anims.c
+++ b/src/tileset_anims.c
@@ -31,48 +31,48 @@ static void cur_mapheader_run_tileset2_func(void);
 
 // .rodata
 
-extern const u16 *const gUnknown_08510764[];
-extern const u16 *const gUnknown_08512574[];
-extern const u16 *const gUnknown_08512E54[];
-extern const u16 *const gUnknown_08513174[];
-extern const u16 *const gUnknown_08513684[];
-extern const u16 *const gUnknown_08513894[];
-extern const u16 *const gUnknown_085143E4[];
-extern const u16 *const gUnknown_085145F4[];
-extern const u16 *const gUnknown_08514E04[];
-extern u16 *const gUnknown_08515344[];
-extern u16 *const gUnknown_08515364[];
-extern const u16 *const gUnknown_08515384[];
-extern const u16 *const gUnknown_085153B4[];
-extern const u16 *const gUnknown_085153E4[];
-extern const u16 *const gUnknown_085153F4[];
-extern  u16 *const gUnknown_08515804[];
-extern const u16 *const gUnknown_08515824[];
-extern const u16 *const gUnknown_08515964[];
-extern const u16 *const gUnknown_08515D8C[];
-extern  u16 *const gUnknown_085161BC[];
-extern const u16 *const gUnknown_085161DC[];
-extern const u16 *const gUnknown_085164FC[];
-extern const u16 *const gUnknown_0851680C[];
-extern const u16 *const gUnknown_08516B1C[];
-extern const u16 *const gUnknown_08516D2C[];
-extern const u16 *const gUnknown_08516E3C[];
-extern const u16 *const gUnknown_08517A44[];
-extern const u16 *const gUnknown_08517A50[];
-extern const u16 *const gUnknown_08517BFC[];
-extern const u16 *const gUnknown_08517C0C[];
-extern const u16 *const gUnknown_08518034[];
-extern const u16 *const gUnknown_0851829C[];
-extern const u16 *const gUnknown_085202C4[];
-extern const u16 *const gUnknown_08524864[];
-extern const u16 *const gUnknown_08524870[];
+extern const u16 *const gTilesetAnims_General0[];
+extern const u16 *const gTilesetAnims_General1[];
+extern const u16 *const gTilesetAnims_General2[];
+extern const u16 *const gTilesetAnims_General3[];
+extern const u16 *const gTilesetAnims_General4[];
+extern const u16 *const gTilesetAnims_Lavaridge0[];
+extern const u16 *const gTilesetAnims_Pacifidlog0[];
+extern const u16 *const gTilesetAnims_Underwater0[];
+extern const u16 *const gTilesetAnims_Pacifidlog1[];
+extern u16 *const gTilesetAnims_MauvilleVDests0[];
+extern u16 *const gTilesetAnims_MauvilleVDests1[];
+extern const u16 *const gTilesetAnims_Mauville0a[];
+extern const u16 *const gTilesetAnims_Mauville0b[];
+extern const u16 *const gTilesetAnims_Mauville1a[];
+extern const u16 *const gTilesetAnims_Mauville1b[];
+extern  u16 *const gTilesetAnims_RustboroVDests0[];
+extern const u16 *const gTilesetAnims_Rustboro0[];
+extern const u16 *const gTilesetAnims_Rustboro1[];
+extern const u16 *const gTilesetAnims_Lavaridge1_Cave0[];
+extern  u16 *const gTilesetAnims_EverGrandeVDests0[];
+extern const u16 *const gTilesetAnims_EverGrande0[];
+extern const u16 *const gTilesetAnims_Dewford0[];
+extern const u16 *const gTilesetAnims_BattleFrontierOutsideWest0[];
+extern const u16 *const gTilesetAnims_BattleFrontierOutsideEast0[];
+extern const u16 *const gTilesetAnims_Slateport0[];
+extern const u16 *const gTilesetAnims_InsideBuilding0[];
+extern const u16 *const gTilesetAnims_SootopolisGym0[];
+extern const u16 *const gTilesetAnims_SootopolisGym1[];
+extern const u16 *const gTilesetAnims_EliteFour1[];
+extern const u16 *const gTilesetAnims_EliteFour0[];
+extern const u16 *const gTilesetAnims_MauvilleGym0[];
+extern const u16 *const gTilesetAnims_BikeShop0[];
+extern const u16 *const gTilesetAnims_Sootopolis0[];
+extern const u16 *const gTilesetAnims_BattlePyramid0[];
+extern const u16 *const gTilesetAnims_BattlePyramid1[];
 
 extern const u16 gUnknown_08D85640[];
 extern const u16 gUnknown_08D85660[];
 extern const u16 gUnknown_08D85680[];
 extern const u16 gUnknown_08D856A0[];
 
-static const u16 *const gUnknown_0852487C[] = {
+static const u16 *const gTilesetAnims_BattleDomePals0[] = {
     gUnknown_08D85640,
     gUnknown_08D85660,
     gUnknown_08D85680,
@@ -81,24 +81,24 @@ static const u16 *const gUnknown_0852487C[] = {
 
 // .text
 
-static void sub_80A0954(void)
+static void ResetTilesetAnimBuffer(void)
 {
     sTilesetDMA3TransferBufferSize = 0;
     CpuFill32(0, sTilesetDMA3TransferBuffer, sizeof sTilesetDMA3TransferBuffer);
 }
 
-static void sub_80A0980(const u16 *a0, u16 *a1, u16 a2)
+static void AppendTilesetAnimToBuffer(const u16 *src, u16 *dest, u16 size)
 {
     if (sTilesetDMA3TransferBufferSize < 20)
     {
-        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].src = a0;
-        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].dest = a1;
-        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].size = a2;
+        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].src = src;
+        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].dest = dest;
+        sTilesetDMA3TransferBuffer[sTilesetDMA3TransferBufferSize].size = size;
         sTilesetDMA3TransferBufferSize ++;
     }
 }
 
-void sub_80A09D0(void)
+void TransferTilesetAnimsBuffer(void)
 {
     int i;
 
@@ -111,7 +111,7 @@ void sub_80A09D0(void)
 
 void cur_mapheader_run_tileset_funcs_after_some_cpuset(void)
 {
-    sub_80A0954();
+    ResetTilesetAnimBuffer();
     cur_mapheader_run_tileset1_func();
     cur_mapheader_run_tileset2_func();
 }
@@ -123,7 +123,7 @@ void sub_80A0A2C(void)
 
 void sub_80A0A38(void)
 {
-    sub_80A0954();
+    ResetTilesetAnimBuffer();
     if (++sPrimaryTilesetCBCounter >= sPrimaryTilesetCBBufferSize)
         sPrimaryTilesetCBCounter = 0;
     if (++sSecondaryTilesetCBCounter >= sSecondaryTilesetCBBufferSize)
@@ -203,7 +203,7 @@ static void sub_80A0BCC(u16 timer)
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08510764[idx], (u16 *)(BG_VRAM + 0x3F80), 0x80);
+    AppendTilesetAnimToBuffer(gTilesetAnims_General0[idx], (u16 *)(BG_VRAM + 0x3F80), 0x80);
 }
 
 static void sub_80A0BF4(u16 timer)
@@ -211,7 +211,7 @@ static void sub_80A0BF4(u16 timer)
     u8 idx;
 
     idx = timer % 8;
-    sub_80A0980(gUnknown_08512574[idx], (u16 *)(BG_VRAM + 0x3600), 0x3C0);
+    AppendTilesetAnimToBuffer(gTilesetAnims_General1[idx], (u16 *)(BG_VRAM + 0x3600), 0x3C0);
 }
 
 static void sub_80A0C1C(u16 timer)
@@ -219,7 +219,7 @@ static void sub_80A0C1C(u16 timer)
     u16 idx;
 
     idx = timer % 8;
-    sub_80A0980(gUnknown_08512E54[idx], (u16 *)(BG_VRAM + 0x3a00), 0x140);
+    AppendTilesetAnimToBuffer(gTilesetAnims_General2[idx], (u16 *)(BG_VRAM + 0x3a00), 0x140);
 }
 
 static void sub_80A0C44(u16 timer)
@@ -227,7 +227,7 @@ static void sub_80A0C44(u16 timer)
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08513174[idx], (u16 *)(BG_VRAM + 0x3e00), 0xc0);
+    AppendTilesetAnimToBuffer(gTilesetAnims_General3[idx], (u16 *)(BG_VRAM + 0x3e00), 0xc0);
 }
 
 void TilesetCb_Petalburg(void)
@@ -580,7 +580,7 @@ static void sub_80A12AC(u16 timer)
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08513684[idx], (u16 *)(BG_VRAM + 0x3c00), 0x140);
+    AppendTilesetAnimToBuffer(gTilesetAnims_General4[idx], (u16 *)(BG_VRAM + 0x3c00), 0x140);
 }
 
 static void sub_80A12D4(u8 timer)
@@ -588,10 +588,10 @@ static void sub_80A12D4(u8 timer)
     u8 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08513894[idx], (u16 *)(BG_VRAM + 0x6400), 0x80);
+    AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + 0x6400), 0x80);
 
     idx = (timer + 2) % 4;
-    sub_80A0980(gUnknown_08513894[idx], (u16 *)(BG_VRAM + 0x6480), 0x80);
+    AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + 0x6480), 0x80);
 }
 
 static void sub_80A131C(u8 timer)
@@ -599,7 +599,7 @@ static void sub_80A131C(u8 timer)
     u8 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_085143E4[idx], (u16 *)(BG_VRAM + 0x7a00), 0x3C0);
+    AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog0[idx], (u16 *)(BG_VRAM + 0x7a00), 0x3C0);
 }
 
 static void sub_80A1344(u8 timer)
@@ -607,7 +607,7 @@ static void sub_80A1344(u8 timer)
     u8 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_085145F4[idx], (u16 *)(BG_VRAM + 0x7e00), 0x80);
+    AppendTilesetAnimToBuffer(gTilesetAnims_Underwater0[idx], (u16 *)(BG_VRAM + 0x7e00), 0x80);
 }
 
 static void sub_80A136C(u8 timer)
@@ -615,7 +615,7 @@ static void sub_80A136C(u8 timer)
     u8 idx;
 
     idx = timer % 8;
-    sub_80A0980(gUnknown_08514E04[idx], (u16 *)(BG_VRAM + 0x7e00), 0x100);
+    AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog1[idx], (u16 *)(BG_VRAM + 0x7e00), 0x100);
 }
 
 static void sub_80A1394(u16 timer_div, u8 timer_mod)
@@ -624,14 +624,14 @@ static void sub_80A1394(u16 timer_div, u8 timer_mod)
     if (timer_div < 12) // almost certainly a typo
     {
         timer_div %= 12;
-        sub_80A0980(gUnknown_08515384[timer_div], gUnknown_08515344[timer_mod], 0x80);
-        sub_80A0980(gUnknown_085153B4[timer_div], gUnknown_08515364[timer_mod], 0x80);
+        AppendTilesetAnimToBuffer(gTilesetAnims_Mauville0a[timer_div], gTilesetAnims_MauvilleVDests0[timer_mod], 0x80);
+        AppendTilesetAnimToBuffer(gTilesetAnims_Mauville0b[timer_div], gTilesetAnims_MauvilleVDests1[timer_mod], 0x80);
     }
     else
     {
         timer_div %= 4;
-        sub_80A0980(gUnknown_085153E4[timer_div], gUnknown_08515344[timer_mod], 0x80);
-        sub_80A0980(gUnknown_085153F4[timer_div], gUnknown_08515364[timer_mod], 0x80);
+        AppendTilesetAnimToBuffer(gTilesetAnims_Mauville1a[timer_div], gTilesetAnims_MauvilleVDests0[timer_mod], 0x80);
+        AppendTilesetAnimToBuffer(gTilesetAnims_Mauville1b[timer_div], gTilesetAnims_MauvilleVDests1[timer_mod], 0x80);
     }
 }
 
@@ -639,8 +639,8 @@ static void sub_80A1434(u16 timer_div, u8 timer_mod)
 {
     timer_div -= timer_mod;
     timer_div %= 8;
-    if (gUnknown_08515824[timer_div])
-        sub_80A0980(gUnknown_08515824[timer_div], gUnknown_08515804[timer_mod], 0x80);
+    if (gTilesetAnims_Rustboro0[timer_div])
+        AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro0[timer_div], gTilesetAnims_RustboroVDests0[timer_mod], 0x80);
 }
 
 static void sub_80A1470(u16 timer)
@@ -648,7 +648,7 @@ static void sub_80A1470(u16 timer)
     u16 idx;
 
     idx = timer % 2;
-    sub_80A0980(gUnknown_08515964[idx], (u16 *)(BG_VRAM + 0x7800), 0x80);
+    AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro1[idx], (u16 *)(BG_VRAM + 0x7800), 0x80);
 }
 
 static void sub_80A1498(u16 timer)
@@ -656,7 +656,7 @@ static void sub_80A1498(u16 timer)
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08515D8C[idx], (u16 *)(BG_VRAM + 0x5400), 0x80);
+    AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + 0x5400), 0x80);
 }
 
 static void sub_80A14C0(u16 timer_div, u8 timer_mod)
@@ -664,7 +664,7 @@ static void sub_80A14C0(u16 timer_div, u8 timer_mod)
     timer_div -= timer_mod;
     timer_div %= 8;
 
-    sub_80A0980(gUnknown_085161DC[timer_div], gUnknown_085161BC[timer_mod], 0x80);
+    AppendTilesetAnimToBuffer(gTilesetAnims_EverGrande0[timer_div], gTilesetAnims_EverGrandeVDests0[timer_mod], 0x80);
 }
 
 static void sub_80A14F8(u16 timer)
@@ -672,7 +672,7 @@ static void sub_80A14F8(u16 timer)
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08515D8C[idx], (u16 *)(BG_VRAM + 0x7400), 0x80);
+    AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + 0x7400), 0x80);
 }
 
 static void sub_80A1520(u16 timer)
@@ -680,7 +680,7 @@ static void sub_80A1520(u16 timer)
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_085164FC[idx], (u16 *)(BG_VRAM + 0x5540), 0xC0);
+    AppendTilesetAnimToBuffer(gTilesetAnims_Dewford0[idx], (u16 *)(BG_VRAM + 0x5540), 0xC0);
 }
 
 static void sub_80A1548(u16 timer)
@@ -688,7 +688,7 @@ static void sub_80A1548(u16 timer)
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_0851680C[idx], (u16 *)(BG_VRAM + 0x5b40), 0xC0);
+    AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideWest0[idx], (u16 *)(BG_VRAM + 0x5b40), 0xC0);
 }
 
 static void sub_80A1570(u16 timer)
@@ -696,7 +696,7 @@ static void sub_80A1570(u16 timer)
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08516B1C[idx], (u16 *)(BG_VRAM + 0x5b40), 0xC0);
+    AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideEast0[idx], (u16 *)(BG_VRAM + 0x5b40), 0xC0);
 }
 
 static void sub_80A1598(u16 timer)
@@ -704,7 +704,7 @@ static void sub_80A1598(u16 timer)
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08516D2C[idx], (u16 *)(BG_VRAM + 0x5c00), 0x80);
+    AppendTilesetAnimToBuffer(gTilesetAnims_Slateport0[idx], (u16 *)(BG_VRAM + 0x5c00), 0x80);
 }
 
 static void sub_80A15C0(u16 timer)
@@ -774,7 +774,7 @@ static void sub_80A1688(u16 timer)
     u16 idx;
 
     idx = timer % 2;
-    sub_80A0980(gUnknown_08516E3C[idx], (u16 *)(BG_VRAM + 0x3e00), 0x80);
+    AppendTilesetAnimToBuffer(gTilesetAnims_InsideBuilding0[idx], (u16 *)(BG_VRAM + 0x3e00), 0x80);
 }
 
 static void sub_80A16B0(u16 timer)
@@ -782,8 +782,8 @@ static void sub_80A16B0(u16 timer)
     u16 idx;
 
     idx = timer % 3;
-    sub_80A0980(gUnknown_08517A44[idx], (u16 *)(BG_VRAM + 0x7e00), 0x180);
-    sub_80A0980(gUnknown_08517A50[idx], (u16 *)(BG_VRAM + 0x7a00), 0x280);
+    AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym0[idx], (u16 *)(BG_VRAM + 0x7e00), 0x180);
+    AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym1[idx], (u16 *)(BG_VRAM + 0x7a00), 0x280);
 }
 
 static void sub_80A16F8(u16 timer)
@@ -791,7 +791,7 @@ static void sub_80A16F8(u16 timer)
     u16 idx;
 
     idx = timer % 4;
-    sub_80A0980(gUnknown_08517BFC[idx], (u16 *)(BG_VRAM + 0x7f00), 0x20);
+    AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour1[idx], (u16 *)(BG_VRAM + 0x7f00), 0x20);
 }
 
 static void sub_80A1720(u16 timer)
@@ -799,7 +799,7 @@ static void sub_80A1720(u16 timer)
     u16 idx;
 
     idx = timer % 2;
-    sub_80A0980(gUnknown_08517C0C[idx], (u16 *)(BG_VRAM + 0x7c00), 0x80);
+    AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour0[idx], (u16 *)(BG_VRAM + 0x7c00), 0x80);
 }
 
 static void sub_80A1748(u16 timer)
@@ -807,7 +807,7 @@ static void sub_80A1748(u16 timer)
     u16 idx;
 
     idx = timer % 2;
-    sub_80A0980(gUnknown_08518034[idx], (u16 *)(BG_VRAM + 0x5200), 0x200);
+    AppendTilesetAnimToBuffer(gTilesetAnims_MauvilleGym0[idx], (u16 *)(BG_VRAM + 0x5200), 0x200);
 }
 
 static void sub_80A1770(u16 timer)
@@ -815,7 +815,7 @@ static void sub_80A1770(u16 timer)
     u16 idx;
 
     idx = timer % 2;
-    sub_80A0980(gUnknown_0851829C[idx], (u16 *)(BG_VRAM + 0x7e00), 0x120);
+    AppendTilesetAnimToBuffer(gTilesetAnims_BikeShop0[idx], (u16 *)(BG_VRAM + 0x7e00), 0x120);
 }
 
 static void sub_80A1798(u16 timer)
@@ -823,7 +823,7 @@ static void sub_80A1798(u16 timer)
     u16 idx;
 
     idx = timer % 8;
-    sub_80A0980(gUnknown_085202C4[idx], (u16 *)(BG_VRAM + 0x5e00), 0xc00);
+    AppendTilesetAnimToBuffer(gTilesetAnims_Sootopolis0[idx], (u16 *)(BG_VRAM + 0x5e00), 0xc00);
 }
 
 static void sub_80A17C0(u16 timer)
@@ -831,7 +831,7 @@ static void sub_80A17C0(u16 timer)
     u16 idx;
 
     idx = timer % 3;
-    sub_80A0980(gUnknown_08524864[idx], (u16 *)(BG_VRAM + 0x52e0), 0x100);
+    AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid0[idx], (u16 *)(BG_VRAM + 0x52e0), 0x100);
 }
 
 static void sub_80A17EC(u16 timer)
@@ -839,12 +839,12 @@ static void sub_80A17EC(u16 timer)
     u16 idx;
 
     idx = timer % 3;
-    sub_80A0980(gUnknown_08524870[idx], (u16 *)(BG_VRAM + 0x50e0), 0x100);
+    AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid1[idx], (u16 *)(BG_VRAM + 0x50e0), 0x100);
 }
 
 static void sub_80A1818(u16 a1)
 {
-    CpuCopy16(gUnknown_0852487C[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
+    CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
     BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
     if ((u8)FindTaskIdByFunc(sub_8149DFC) != 0xFF )
     {
@@ -855,7 +855,7 @@ static void sub_80A1818(u16 a1)
 
 static void sub_80A1884(u16 a1)
 {
-    CpuCopy16(gUnknown_0852487C[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
+    CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
     if ((u8)FindTaskIdByFunc(sub_8149DFC) == 0xFF )
     {
         BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);

From db58d5e24a89d9c411231a74ce01daed7a303d67 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 2 Oct 2017 23:32:39 +0200
Subject: [PATCH 21/42] battle2 3500 C lines

---
 asm/battle_2.s                  | 4082 +------------------------------
 asm/battle_controller_player.s  |   82 +-
 asm/battle_controller_safari.s  |   12 +-
 asm/battle_controller_wally.s   |    2 +-
 asm/battle_link_817C95C.s       |    6 +-
 asm/battle_message.s            |    2 +-
 asm/reshow_battle_screen.s      |    2 +-
 asm/rom3.s                      |   50 +-
 include/battle.h                |   42 +-
 include/battle_controllers.h    |    6 +-
 include/pokemon.h               |    2 +
 include/recorded_battle.h       |    1 +
 include/sprite.h                |   16 +-
 src/battle_2.c                  | 1372 ++++++++++-
 src/battle_3.c                  |    7 +-
 src/battle_ai_script_commands.c |    6 +-
 src/battle_script_commands.c    |   12 +-
 src/pokemon_3.c                 |    2 -
 sym_ewram.txt                   |    6 +-
 19 files changed, 1545 insertions(+), 4165 deletions(-)

diff --git a/asm/battle_2.s b/asm/battle_2.s
index a4fa43fa2..2ff446dd0 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -4,4019 +4,7 @@
 	.syntax unified
 
 	.text
-
-
-
-	thumb_func_start sub_8039B58
-sub_8039B58: @ 8039B58
-	push {r4,lr}
-	adds r4, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _08039BA0
-	ldr r0, =gHitMarker
-	ldr r0, [r0]
-	movs r1, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08039B80
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	ldr r1, =0x02000002
-	ands r0, r1
-	cmp r0, 0
-	beq _08039B94
-_08039B80:
-	ldrh r0, [r4, 0x32]
-	bl HasTwoFramesAnimation
-	lsls r0, 24
-	cmp r0, 0
-	beq _08039B94
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl StartSpriteAnim
-_08039B94:
-	ldrh r1, [r4, 0x32]
-	adds r0, r4, 0
-	movs r2, 0x1
-	movs r3, 0x1
-	bl BattleAnimateFrontSprite
-_08039BA0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8039B58
-
-	thumb_func_start sub_8039BB4
-sub_8039BB4: @ 8039BB4
-	ldr r1, =oac_poke_ally_
-	str r1, [r0, 0x1C]
-	bx lr
-	.pool
-	thumb_func_end sub_8039BB4
-
-	thumb_func_start oac_poke_ally_
-oac_poke_ally_: @ 8039BC0
-	push {lr}
-	adds r2, r0, 0
-	ldr r0, =gUnknown_020243FC
-	ldrh r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _08039BE4
-	ldrh r0, [r2, 0x24]
-	subs r0, 0x2
-	strh r0, [r2, 0x24]
-	lsls r0, 16
-	asrs r1, r0, 16
-	cmp r1, 0
-	bne _08039BE4
-	ldr r0, =nullsub_19
-	str r0, [r2, 0x1C]
-	strh r1, [r2, 0x30]
-_08039BE4:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end oac_poke_ally_
-
-	thumb_func_start sub_8039BF0
-sub_8039BF0: @ 8039BF0
-	ldr r1, =nullsub_19
-	str r1, [r0, 0x1C]
-	bx lr
-	.pool
-	thumb_func_end sub_8039BF0
-
-	thumb_func_start nullsub_19
-nullsub_19: @ 8039BFC
-	bx lr
-	thumb_func_end nullsub_19
-
-	thumb_func_start sub_8039C00
-sub_8039C00: @ 8039C00
-	push {lr}
-	adds r2, r0, 0
-	ldr r0, =gUnknown_020243FC
-	ldrh r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _08039C20
-	ldrh r0, [r2, 0x30]
-	ldrh r1, [r2, 0x24]
-	adds r0, r1
-	strh r0, [r2, 0x24]
-	ldrh r0, [r2, 0x32]
-	ldrh r1, [r2, 0x26]
-	adds r0, r1
-	strh r0, [r2, 0x26]
-_08039C20:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8039C00
-
-	thumb_func_start dp11b_obj_instanciate
-dp11b_obj_instanciate: @ 8039C28
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	mov r8, r1
-	lsls r2, 24
-	lsrs r2, 24
-	mov r9, r2
-	lsls r3, 24
-	lsrs r3, 24
-	mov r10, r3
-	cmp r1, 0
-	beq _08039C64
-	ldr r0, =gBattleSpritesDataPtr
-	ldr r0, [r0]
-	ldr r1, [r0, 0x4]
-	lsls r2, r4, 1
-	adds r0, r2, r4
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x2
-	b _08039C76
-	.pool
-_08039C64:
-	ldr r0, =gBattleSpritesDataPtr
-	ldr r0, [r0]
-	ldr r1, [r0, 0x4]
-	lsls r2, r4, 1
-	adds r0, r2, r4
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x4
-_08039C76:
-	ands r0, r1
-	adds r6, r2, 0
-	cmp r0, 0
-	bne _08039D2C
-	ldr r0, =objc_dp11b_pingpong
-	bl CreateInvisibleSpriteWithCallback
-	lsls r0, 24
-	lsrs r5, r0, 24
-	mov r0, r8
-	cmp r0, 0x1
-	bne _08039CD0
-	ldr r0, =gHealthBoxesIds
-	adds r0, r4, r0
-	ldrb r7, [r0]
-	ldr r2, =gBattleSpritesDataPtr
-	ldr r0, [r2]
-	ldr r0, [r0, 0x4]
-	adds r1, r6, r4
-	lsls r1, 2
-	adds r0, r1, r0
-	strb r5, [r0, 0x2]
-	ldr r0, [r2]
-	ldr r0, [r0, 0x4]
-	adds r1, r0
-	ldrb r0, [r1]
-	movs r2, 0x2
-	orrs r0, r2
-	strb r0, [r1]
-	ldr r2, =gSprites
-	lsls r3, r5, 4
-	adds r0, r3, r5
-	lsls r0, 2
-	adds r0, r2
-	movs r1, 0x80
-	b _08039CFE
-	.pool
-_08039CD0:
-	ldr r0, =gBankSpriteIds
-	adds r0, r4, r0
-	ldrb r7, [r0]
-	ldr r2, =gBattleSpritesDataPtr
-	ldr r0, [r2]
-	ldr r0, [r0, 0x4]
-	adds r1, r6, r4
-	lsls r1, 2
-	adds r0, r1, r0
-	strb r5, [r0, 0x3]
-	ldr r0, [r2]
-	ldr r0, [r0, 0x4]
-	adds r1, r0
-	ldrb r0, [r1]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r1]
-	ldr r2, =gSprites
-	lsls r3, r5, 4
-	adds r0, r3, r5
-	lsls r0, 2
-	adds r0, r2
-	movs r1, 0xC0
-_08039CFE:
-	strh r1, [r0, 0x2E]
-	adds r4, r2, 0
-	adds r1, r3, r5
-	lsls r1, 2
-	adds r1, r4
-	mov r2, r9
-	lsls r0, r2, 24
-	asrs r0, 24
-	movs r2, 0
-	strh r0, [r1, 0x30]
-	mov r3, r10
-	lsls r0, r3, 24
-	asrs r0, 24
-	strh r0, [r1, 0x32]
-	strh r7, [r1, 0x34]
-	mov r0, r8
-	strh r0, [r1, 0x36]
-	lsls r0, r7, 4
-	adds r0, r7
-	lsls r0, 2
-	adds r0, r4
-	strh r2, [r0, 0x24]
-	strh r2, [r0, 0x26]
-_08039D2C:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end dp11b_obj_instanciate
-
-	thumb_func_start dp11b_obj_free
-dp11b_obj_free: @ 8039D48
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	cmp r1, 0x1
-	bne _08039D9C
-	ldr r6, =gBattleSpritesDataPtr
-	ldr r0, [r6]
-	ldr r1, [r0, 0x4]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r5, r0, 2
-	adds r3, r5, r1
-	ldrb r1, [r3]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08039DEA
-	ldr r2, =gSprites
-	ldrb r1, [r3, 0x2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r1, [r0, 0x34]
-	lsls r1, 24
-	lsrs r4, r1, 24
-	bl DestroySprite
-	ldr r0, [r6]
-	ldr r1, [r0, 0x4]
-	adds r1, r5, r1
-	ldrb r2, [r1]
-	movs r0, 0x3
-	negs r0, r0
-	b _08039DD6
-	.pool
-_08039D9C:
-	ldr r6, =gBattleSpritesDataPtr
-	ldr r0, [r6]
-	ldr r1, [r0, 0x4]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r5, r0, 2
-	adds r3, r5, r1
-	ldrb r1, [r3]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _08039DEA
-	ldr r2, =gSprites
-	ldrb r1, [r3, 0x3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r1, [r0, 0x34]
-	lsls r1, 24
-	lsrs r4, r1, 24
-	bl DestroySprite
-	ldr r0, [r6]
-	ldr r1, [r0, 0x4]
-	adds r1, r5, r1
-	ldrb r2, [r1]
-	movs r0, 0x5
-	negs r0, r0
-_08039DD6:
-	ands r0, r2
-	strb r0, [r1]
-	ldr r0, =gSprites
-	lsls r1, r4, 4
-	adds r1, r4
-	lsls r1, 2
-	adds r1, r0
-	movs r0, 0
-	strh r0, [r1, 0x24]
-	strh r0, [r1, 0x26]
-_08039DEA:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end dp11b_obj_free
-
-	thumb_func_start objc_dp11b_pingpong
-objc_dp11b_pingpong: @ 8039DF8
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x34]
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r1, 0x36
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x1
-	bne _08039E10
-	movs r2, 0x2E
-	ldrsh r0, [r4, r2]
-	b _08039E14
-_08039E10:
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-_08039E14:
-	movs r2, 0x32
-	ldrsh r1, [r4, r2]
-	bl Sin
-	ldr r2, =gSprites
-	lsls r1, r5, 4
-	adds r1, r5
-	lsls r1, 2
-	adds r1, r2
-	ldrh r2, [r4, 0x32]
-	adds r0, r2
-	strh r0, [r1, 0x26]
-	ldrh r0, [r4, 0x30]
-	ldrh r1, [r4, 0x2E]
-	adds r0, r1
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r4, 0x2E]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end objc_dp11b_pingpong
-
-	thumb_func_start sub_8039E44
-sub_8039E44: @ 8039E44
-	push {lr}
-	adds r2, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _08039E5C
-	ldrh r1, [r2, 0x32]
-	adds r0, r2, 0
-	bl BattleAnimateBackSprite
-_08039E5C:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8039E44
-
-	thumb_func_start sub_8039E60
-sub_8039E60: @ 8039E60
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8039E9C
-	adds r0, r4, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _08039E7A
-	ldr r0, =nullsub_19
-	str r0, [r4, 0x1C]
-_08039E7A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8039E60
-
-	thumb_func_start sub_8039E84
-sub_8039E84: @ 8039E84
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x1
-	bl StartSpriteAnim
-	ldr r0, =sub_8039E60
-	str r0, [r4, 0x1C]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8039E84
-
-	thumb_func_start sub_8039E9C
-sub_8039E9C: @ 8039E9C
-	push {lr}
-	adds r2, r0, 0
-	adds r0, 0x2C
-	ldrb r1, [r0]
-	movs r0, 0x3F
-	ands r0, r1
-	cmp r0, 0
-	bne _08039EBE
-	ldr r1, =gUnknown_0831ACE0
-	adds r0, r2, 0
-	adds r0, 0x2B
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r1, [r0]
-	adds r0, r2, 0
-	adds r0, 0x28
-	strb r1, [r0]
-_08039EBE:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8039E9C
-
-	thumb_func_start nullsub_20
-nullsub_20: @ 8039EC8
-	bx lr
-	thumb_func_end nullsub_20
-
-	thumb_func_start sub_8039ECC
-sub_8039ECC: @ 8039ECC
-	push {lr}
-	bl sub_8039F40
-	ldr r1, =gBattleCommunication
-	movs r0, 0
-	strb r0, [r1, 0x1]
-	ldr r1, =gBattleMainFunc
-	ldr r0, =bc_8012FAC
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8039ECC
-
-	thumb_func_start BattleMainCB1
-BattleMainCB1: @ 8039EF0
-	push {r4,r5,lr}
-	ldr r0, =gBattleMainFunc
-	ldr r0, [r0]
-	bl _call_via_r0
-	ldr r1, =gActiveBank
-	movs r0, 0
-	strb r0, [r1]
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08039F2A
-	ldr r5, =gBattleBankFunc
-	adds r4, r1, 0
-_08039F0C:
-	ldrb r0, [r4]
-	lsls r0, 2
-	adds r0, r5
-	ldr r0, [r0]
-	bl _call_via_r0
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldr r1, =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _08039F0C
-_08039F2A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BattleMainCB1
-
-	thumb_func_start sub_8039F40
-sub_8039F40: @ 8039F40
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	movs r0, 0
-	bl sub_803D580
-	bl sub_803D6A0
-	movs r2, 0
-	movs r3, 0
-	ldr r0, =gUnknown_02024260
-	mov r10, r0
-	ldr r1, =gUnknown_02024258
-	mov r9, r1
-	ldr r0, =gUnknown_02024250
-	mov r8, r0
-	ldr r1, =gLastUsedMovesByBanks
-	mov r12, r1
-	ldr r5, =gDisableStructs
-	movs r4, 0
-	ldr r7, =gUnknownMovesUsedByBanks
-	ldr r6, =gLockedMoves
-_08039F70:
-	ldr r0, =gStatuses3
-	adds r0, r4, r0
-	str r3, [r0]
-	movs r1, 0
-_08039F78:
-	adds r0, r5, r1
-	strb r3, [r0]
-	adds r1, 0x1
-	cmp r1, 0x1B
-	bls _08039F78
-	movs r0, 0x2
-	strb r0, [r5, 0x16]
-	ldr r1, =gUnknown_02024284
-	adds r0, r2, r1
-	strb r3, [r0]
-	mov r0, r12
-	strh r3, [r0]
-	mov r1, r8
-	strh r3, [r1]
-	mov r0, r9
-	strh r3, [r0]
-	mov r1, r10
-	strh r3, [r1]
-	ldr r0, =gUnknown_02024270
-	adds r1, r2, r0
-	movs r0, 0xFF
-	strb r0, [r1]
-	strh r3, [r6]
-	strh r3, [r7]
-	ldr r1, =gBattleResources
-	ldr r0, [r1]
-	ldr r0, [r0, 0x4]
-	adds r0, r4
-	str r3, [r0]
-	ldr r1, =gUnknown_02024230
-	adds r0, r4, r1
-	str r3, [r0]
-	movs r0, 0x2
-	add r10, r0
-	add r9, r0
-	add r8, r0
-	add r12, r0
-	adds r5, 0x1C
-	adds r4, 0x4
-	adds r7, 0x2
-	adds r6, 0x2
-	adds r2, 0x1
-	cmp r2, 0x3
-	ble _08039F70
-	movs r5, 0
-	ldr r3, =gSideTimers
-	ldr r4, =gSideAffecting
-	movs r2, 0x1
-_08039FD8:
-	strh r5, [r4]
-	movs r1, 0
-_08039FDC:
-	adds r0, r3, r1
-	strb r5, [r0]
-	adds r1, 0x1
-	cmp r1, 0xB
-	bls _08039FDC
-	adds r3, 0xC
-	adds r4, 0x2
-	subs r2, 0x1
-	cmp r2, 0
-	bge _08039FD8
-	movs r1, 0
-	ldr r2, =gBankAttacker
-	strb r1, [r2]
-	ldr r0, =gBankTarget
-	strb r1, [r0]
-	ldr r2, =gBattleWeather
-	strh r1, [r2]
-	ldr r1, =gWishFutureKnock
-	movs r2, 0
-	movs r3, 0
-_0803A004:
-	adds r0, r1, r2
-	strb r3, [r0]
-	adds r2, 0x1
-	cmp r2, 0x2B
-	bls _0803A004
-	ldr r2, =gHitMarker
-	movs r0, 0
-	str r0, [r2]
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r0, 0x80
-	lsls r0, 17
-	ands r0, r1
-	cmp r0, 0
-	bne _0803A090
-	movs r0, 0x2
-	ands r1, r0
-	cmp r1, 0
-	bne _0803A0AE
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldrb r1, [r0, 0x15]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _0803A0AE
-	movs r0, 0x80
-	b _0803A0AC
-	.pool
-_0803A090:
-	ldr r0, =0x02000002
-	ands r1, r0
-	cmp r1, 0
-	bne _0803A0AE
-	bl sub_8185FB8
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803A0AE
-	ldr r1, =gHitMarker
-	ldr r0, [r1]
-	movs r1, 0x80
-	orrs r0, r1
-	ldr r2, =gHitMarker
-_0803A0AC:
-	str r0, [r2]
-_0803A0AE:
-	ldr r3, =gBattleScripting
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x15]
-	lsls r0, 30
-	lsrs r0, 31
-	movs r1, 0
-	strb r0, [r3, 0x1D]
-	ldr r0, =gMultiHitCounter
-	strb r1, [r0]
-	ldr r0, =gBattleOutcome
-	strb r1, [r0]
-	ldr r0, =gBattleExecBuffer
-	str r1, [r0]
-	ldr r0, =gPaydayMoney
-	movs r2, 0
-	strh r1, [r0]
-	ldr r1, =gBattleResources
-	ldr r0, [r1]
-	ldr r0, [r0, 0x8]
-	adds r0, 0x20
-	strb r2, [r0]
-	ldr r0, [r1]
-	ldr r0, [r0, 0xC]
-	adds r0, 0x20
-	strb r2, [r0]
-	ldr r5, =gPauseCounterBattle
-	ldr r6, =gBattleMoveDamage
-	ldr r7, =gUnknown_020243FC
-	ldr r0, =gLeveledUpInBattle
-	mov r8, r0
-	ldr r1, =gAbsentBankFlags
-	mov r9, r1
-	ldr r2, =gEnemyParty
-	mov r10, r2
-	ldr r1, =gBattleCommunication
-	movs r2, 0
-	adds r0, r1, 0x7
-_0803A0FA:
-	strb r2, [r0]
-	subs r0, 0x1
-	cmp r0, r1
-	bge _0803A0FA
-	movs r4, 0
-	strh r4, [r5]
-	movs r0, 0
-	str r0, [r6]
-	strh r0, [r7]
-	strb r4, [r3, 0x18]
-	strb r4, [r3, 0x19]
-	mov r0, r8
-	strb r4, [r0]
-	mov r1, r9
-	strb r4, [r1]
-	ldr r5, =gBattleStruct
-	ldr r0, [r5]
-	adds r0, 0x6C
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x79
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x7A
-	strb r4, [r0]
-	mov r0, r10
-	movs r1, 0xB
-	bl GetMonData
-	ldr r6, [r5]
-	adds r6, 0x7C
-	ldr r2, =gBaseStats
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrb r1, [r1, 0x8]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, =0x000004fb
-	bl __divsi3
-	strb r0, [r6]
-	ldr r0, [r5]
-	adds r0, 0x7B
-	movs r1, 0x3
-	strb r1, [r0]
-	ldr r0, [r5]
-	strb r4, [r0, 0x12]
-	ldr r0, [r5]
-	adds r0, 0x4A
-	movs r1, 0x1
-	strb r1, [r0]
-	movs r2, 0
-	movs r1, 0
-	adds r6, r5, 0
-_0803A16A:
-	ldr r0, [r5]
-	adds r0, r2, r0
-	adds r0, 0x98
-	strb r1, [r0]
-	ldr r0, [r5]
-	adds r0, r2, r0
-	adds r0, 0xB8
-	strb r1, [r0]
-	ldr r0, [r5]
-	adds r0, r2, r0
-	adds r0, 0xC8
-	strb r1, [r0]
-	ldr r0, [r5]
-	adds r0, r2, r0
-	adds r0, 0xD0
-	strb r1, [r0]
-	ldr r0, [r5]
-	adds r0, r2, r0
-	adds r0, 0xE0
-	strb r1, [r0]
-	ldr r0, [r5]
-	adds r0, r2, r0
-	adds r0, 0xE8
-	strb r1, [r0]
-	ldr r0, [r5]
-	adds r0, r2, r0
-	adds r0, 0xF0
-	strb r1, [r0]
-	ldr r0, [r5]
-	adds r0, r2, r0
-	adds r0, 0xF8
-	strb r1, [r0]
-	adds r2, 0x1
-	cmp r2, 0x7
-	ble _0803A16A
-	movs r2, 0
-	ldr r4, =gBattleStruct
-	movs r3, 0xA5
-	lsls r3, 2
-	movs r1, 0x6
-_0803A1BA:
-	ldr r0, [r4]
-	adds r0, r2, r0
-	adds r0, r3
-	strb r1, [r0]
-	adds r2, 0x1
-	cmp r2, 0x3
-	ble _0803A1BA
-	ldr r0, [r6]
-	adds r0, 0xDF
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r6]
-	adds r0, 0x92
-	strb r1, [r0]
-	bl Random
-	ldr r1, =gUnknown_02024330
-	strh r0, [r1]
-	ldr r1, =gBattleResults
-	movs r2, 0
-	movs r3, 0
-_0803A1E4:
-	adds r0, r1, r2
-	strb r3, [r0]
-	adds r2, 0x1
-	cmp r2, 0x43
-	bls _0803A1E4
-	ldr r0, =gEnemyParty
-	bl IsMonShiny
-	ldr r3, =gBattleResults
-	movs r1, 0x1
-	ands r1, r0
-	lsls r1, 6
-	ldrb r2, [r3, 0x5]
-	movs r0, 0x41
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3, 0x5]
-	ldr r2, =gBattleStruct
-	ldr r0, [r2]
-	movs r1, 0xA8
-	lsls r1, 2
-	adds r0, r1
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r2]
-	ldr r2, =0x000002a1
-	adds r0, r2
-	strb r1, [r0]
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8039F40
-
-	thumb_func_start SwitchInClearStructs
-SwitchInClearStructs: @ 803A284
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x20
-	ldr r4, =gDisableStructs
-	ldr r5, =gActiveBank
-	ldrb r1, [r5]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	mov r1, sp
-	adds r0, r4
-	ldm r0!, {r2,r3,r6}
-	stm r1!, {r2,r3,r6}
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldr r0, [r0]
-	str r0, [r1]
-	ldr r2, =gBattleMoves
-	ldr r3, =gCurrentMove
-	ldrh r1, [r3]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0]
-	mov r12, r4
-	mov r9, r5
-	ldr r6, =gStatuses3
-	mov r10, r6
-	cmp r0, 0x7F
-	beq _0803A35C
-	movs r5, 0
-	mov r6, r9
-	movs r4, 0x58
-	ldr r2, =gBattleMons
-	adds r2, 0x18
-	movs r1, 0x6
-_0803A2D4:
-	ldrb r0, [r6]
-	muls r0, r4
-	adds r0, r5, r0
-	adds r0, r2
-	strb r1, [r0]
-	adds r5, 0x1
-	cmp r5, 0x7
-	ble _0803A2D4
-	movs r5, 0
-	ldr r7, =gNoOfAllBanks
-	ldrb r7, [r7]
-	cmp r5, r7
-	bge _0803A348
-	ldr r0, =gBattleMons + 0x50
-	mov r8, r0
-	ldr r4, =gDisableStructs
-	ldr r3, =gStatuses3
-_0803A2F6:
-	movs r0, 0x58
-	muls r0, r5
-	mov r1, r8
-	adds r2, r0, r1
-	ldr r1, [r2]
-	movs r0, 0x80
-	lsls r0, 19
-	ands r0, r1
-	cmp r0, 0
-	beq _0803A31A
-	ldrb r0, [r4, 0x14]
-	ldr r6, =gActiveBank
-	ldrb r6, [r6]
-	cmp r0, r6
-	bne _0803A31A
-	ldr r0, =0xfbffffff
-	ands r1, r0
-	str r1, [r2]
-_0803A31A:
-	ldr r1, [r3]
-	movs r0, 0x18
-	ands r0, r1
-	cmp r0, 0
-	beq _0803A33A
-	ldrb r0, [r4, 0x15]
-	ldr r7, =gActiveBank
-	ldrb r7, [r7]
-	cmp r0, r7
-	bne _0803A33A
-	movs r0, 0x19
-	negs r0, r0
-	ands r1, r0
-	str r1, [r3]
-	movs r0, 0
-	strb r0, [r4, 0x15]
-_0803A33A:
-	adds r4, 0x1C
-	adds r3, 0x4
-	adds r5, 0x1
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r5, r0
-	blt _0803A2F6
-_0803A348:
-	ldr r1, =gCurrentMove
-	ldrh r0, [r1]
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 2
-	ldr r2, =gBattleMoves
-	adds r1, r2
-	ldrb r0, [r1]
-	cmp r0, 0x7F
-	bne _0803A414
-_0803A35C:
-	mov r3, r9
-	ldrb r1, [r3]
-	movs r0, 0x58
-	adds r2, r1, 0
-	muls r2, r0
-	ldr r0, =gBattleMons
-	adds r0, 0x50
-	adds r2, r0
-	ldr r0, [r2]
-	ldr r1, =0x15100007
-	ands r0, r1
-	str r0, [r2]
-	ldrb r1, [r3]
-	lsls r1, 2
-	add r1, r10
-	ldr r0, [r1]
-	ldr r2, =0x0003043f
-	ands r0, r2
-	str r0, [r1]
-	movs r5, 0
-	ldr r6, =gNoOfAllBanks
-	ldrb r6, [r6]
-	cmp r5, r6
-	bge _0803A430
-	mov r7, r9
-	movs r6, 0
-_0803A390:
-	ldrb r0, [r7]
-	bl GetBankSide
-	adds r4, r0, 0
-	lsls r0, r5, 24
-	lsrs r0, 24
-	bl GetBankSide
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	beq _0803A3D0
-	ldr r1, =gStatuses3
-	lsls r0, r5, 2
-	adds r2, r0, r1
-	ldr r1, [r2]
-	movs r0, 0x18
-	ands r0, r1
-	cmp r0, 0
-	beq _0803A3D0
-	ldr r0, =gDisableStructs
-	adds r0, r6, r0
-	ldrb r0, [r0, 0x15]
-	ldrb r3, [r7]
-	cmp r0, r3
-	bne _0803A3D0
-	movs r0, 0x19
-	negs r0, r0
-	ands r1, r0
-	movs r0, 0x10
-	orrs r1, r0
-	str r1, [r2]
-_0803A3D0:
-	adds r6, 0x1C
-	adds r5, 0x1
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r5, r0
-	blt _0803A390
-	ldr r6, =gDisableStructs
-	mov r12, r6
-	ldr r7, =gActiveBank
-	mov r9, r7
-	b _0803A430
-	.pool
-_0803A414:
-	mov r0, r9
-	ldrb r1, [r0]
-	movs r0, 0x58
-	muls r0, r1
-	ldr r1, =gBattleMons
-	adds r1, 0x50
-	adds r0, r1
-	movs r1, 0
-	str r1, [r0]
-	mov r2, r9
-	ldrb r0, [r2]
-	lsls r0, 2
-	add r0, r10
-	str r1, [r0]
-_0803A430:
-	movs r5, 0
-	ldr r3, =gBattleStruct
-	mov r8, r3
-	ldr r6, =gUnknown_020244AC
-	mov r10, r6
-	ldr r7, =gNoOfAllBanks
-	ldrb r7, [r7]
-	cmp r5, r7
-	bge _0803A490
-	ldr r3, =gBattleMons + 0x50
-	ldr r7, =gBitTable
-	ldr r6, =gActiveBank
-_0803A448:
-	movs r0, 0x58
-	muls r0, r5
-	adds r4, r0, r3
-	ldrb r0, [r6]
-	lsls r0, 2
-	adds r0, r7
-	ldr r0, [r0]
-	lsls r2, r0, 16
-	ldr r1, [r4]
-	adds r0, r1, 0
-	ands r0, r2
-	cmp r0, 0
-	beq _0803A466
-	bics r1, r2
-	str r1, [r4]
-_0803A466:
-	ldr r1, [r4]
-	movs r0, 0xE0
-	lsls r0, 8
-	ands r0, r1
-	cmp r0, 0
-	beq _0803A486
-	mov r2, r8
-	ldr r0, [r2]
-	adds r0, r5, r0
-	ldrb r0, [r0, 0x14]
-	ldrb r2, [r6]
-	cmp r0, r2
-	bne _0803A486
-	ldr r0, =0xffff1fff
-	ands r1, r0
-	str r1, [r4]
-_0803A486:
-	adds r5, 0x1
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r5, r0
-	blt _0803A448
-_0803A490:
-	mov r1, r9
-	ldrb r0, [r1]
-	add r0, r10
-	movs r1, 0
-	strb r1, [r0]
-	mov r2, r9
-	ldrb r0, [r2]
-	ldr r3, =gUnknown_020244B0
-	adds r0, r3
-	strb r1, [r0]
-	ldrb r1, [r2]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	mov r6, r12
-	adds r1, r0, r6
-	movs r5, 0
-	movs r2, 0
-_0803A4B4:
-	adds r0, r1, r5
-	strb r2, [r0]
-	adds r5, 0x1
-	cmp r5, 0x1B
-	bls _0803A4B4
-	ldr r7, =gCurrentMove
-	ldrh r0, [r7]
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, =gBattleMoves
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0x7F
-	bne _0803A540
-	mov r2, r9
-	ldrb r1, [r2]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	add r0, r12
-	mov r1, sp
-	ldrb r1, [r1, 0xA]
-	strb r1, [r0, 0xA]
-	ldrb r1, [r2]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	add r0, r12
-	mov r1, sp
-	ldrb r1, [r1, 0x15]
-	strb r1, [r0, 0x15]
-	ldrb r0, [r2]
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	add r1, r12
-	mov r0, sp
-	ldrb r2, [r0, 0xF]
-	lsls r2, 28
-	movs r4, 0xF
-	lsrs r2, 28
-	ldrb r3, [r1, 0xF]
-	movs r0, 0x10
-	negs r0, r0
-	ands r0, r3
-	orrs r0, r2
-	strb r0, [r1, 0xF]
-	mov r3, r9
-	ldrb r1, [r3]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	add r0, r12
-	mov r1, sp
-	ldrb r1, [r1, 0xF]
-	lsrs r1, 4
-	lsls r1, 4
-	ldrb r2, [r0, 0xF]
-	ands r4, r2
-	orrs r4, r1
-	strb r4, [r0, 0xF]
-	ldrb r1, [r3]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	add r0, r12
-	mov r1, sp
-	ldrb r1, [r1, 0x14]
-	strb r1, [r0, 0x14]
-_0803A540:
-	movs r0, 0
-	ldr r6, =gBattleMoveFlags
-	strb r0, [r6]
-	mov r7, r9
-	ldrb r1, [r7]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	add r0, r12
-	movs r4, 0
-	movs r1, 0x2
-	strb r1, [r0, 0x16]
-	ldrb r0, [r7]
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	add r1, r12
-	mov r0, sp
-	ldrb r0, [r0, 0x18]
-	movs r2, 0x2
-	ands r2, r0
-	ldrb r3, [r1, 0x18]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r3
-	orrs r0, r2
-	strb r0, [r1, 0x18]
-	ldrb r0, [r7]
-	lsls r0, 1
-	ldr r1, =gLastUsedMovesByBanks
-	adds r0, r1
-	movs r2, 0
-	strh r4, [r0]
-	ldrb r0, [r7]
-	lsls r0, 1
-	ldr r3, =gUnknown_02024250
-	adds r0, r3
-	strh r4, [r0]
-	ldrb r0, [r7]
-	lsls r0, 1
-	ldr r6, =gUnknown_02024258
-	adds r0, r6
-	strh r4, [r0]
-	ldrb r0, [r7]
-	lsls r0, 1
-	ldr r7, =gUnknown_02024260
-	adds r0, r7
-	strh r4, [r0]
-	mov r1, r9
-	ldrb r0, [r1]
-	lsls r0, 1
-	ldr r3, =gUnknownMovesUsedByBanks
-	adds r0, r3
-	strh r4, [r0]
-	ldrb r0, [r1]
-	ldr r6, =gUnknown_02024270
-	adds r0, r6
-	movs r1, 0xFF
-	strb r1, [r0]
-	mov r7, r9
-	ldrb r0, [r7]
-	mov r3, r8
-	ldr r1, [r3]
-	lsls r0, 1
-	adds r0, r1
-	adds r0, 0x98
-	strb r2, [r0]
-	ldrb r0, [r7]
-	ldr r1, [r3]
-	lsls r0, 1
-	adds r0, r1
-	adds r0, 0x99
-	strb r2, [r0]
-	ldrb r0, [r7]
-	ldr r1, [r3]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE0
-	strb r2, [r0]
-	ldrb r0, [r7]
-	ldr r1, [r3]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE1
-	strb r2, [r0]
-	ldrb r0, [r7]
-	ldr r1, [r3]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE2
-	strb r2, [r0]
-	ldrb r0, [r7]
-	ldr r1, [r3]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE3
-	strb r2, [r0]
-	ldrb r0, [r7]
-	ldr r1, [r3]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE4
-	strb r2, [r0]
-	ldrb r0, [r7]
-	ldr r1, [r3]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE5
-	strb r2, [r0]
-	ldrb r0, [r7]
-	ldr r1, [r3]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE6
-	strb r2, [r0]
-	ldrb r0, [r7]
-	ldr r1, [r3]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE7
-	strb r2, [r0]
-	ldr r1, [r3]
-	adds r1, 0x92
-	ldrb r0, [r7]
-	lsls r0, 2
-	ldr r6, =gBitTable
-	adds r0, r6
-	ldr r2, [r0]
-	ldrb r0, [r1]
-	bics r0, r2
-	strb r0, [r1]
-	movs r5, 0
-	ldr r7, =gNoOfAllBanks
-	ldrb r7, [r7]
-	cmp r5, r7
-	bge _0803A6B4
-	mov r3, r9
-	mov r7, r8
-	movs r6, 0
-_0803A656:
-	ldrb r0, [r3]
-	cmp r5, r0
-	beq _0803A68C
-	lsls r0, r5, 24
-	lsrs r0, 24
-	str r3, [sp, 0x1C]
-	bl GetBankSide
-	adds r4, r0, 0
-	ldr r3, [sp, 0x1C]
-	ldrb r0, [r3]
-	bl GetBankSide
-	lsls r4, 24
-	lsls r0, 24
-	ldr r3, [sp, 0x1C]
-	cmp r4, r0
-	beq _0803A68C
-	ldr r0, [r7]
-	lsls r1, r5, 1
-	adds r0, r1, r0
-	adds r0, 0x98
-	strb r6, [r0]
-	ldr r0, [r7]
-	adds r1, r0
-	adds r1, 0x99
-	strb r6, [r1]
-_0803A68C:
-	ldrb r0, [r3]
-	ldr r1, [r7]
-	lsls r0, 1
-	lsls r2, r5, 3
-	adds r0, r2
-	adds r0, r1
-	adds r0, 0xE0
-	strb r6, [r0]
-	ldrb r0, [r3]
-	ldr r1, [r7]
-	lsls r0, 1
-	adds r0, r2
-	adds r0, r1
-	adds r0, 0xE1
-	strb r6, [r0]
-	adds r5, 0x1
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r5, r0
-	blt _0803A656
-_0803A6B4:
-	mov r1, r9
-	ldrb r0, [r1]
-	mov r2, r8
-	ldr r1, [r2]
-	lsls r0, 1
-	adds r0, r1
-	adds r0, 0xC8
-	movs r2, 0
-	strb r2, [r0]
-	mov r3, r9
-	ldrb r0, [r3]
-	mov r6, r8
-	ldr r1, [r6]
-	lsls r0, 1
-	adds r0, r1
-	adds r0, 0xC9
-	strb r2, [r0]
-	ldr r0, =gBattleResources
-	ldr r0, [r0]
-	ldr r1, [r0, 0x4]
-	ldrb r0, [r3]
-	lsls r0, 2
-	adds r1, r0
-	movs r2, 0
-	str r2, [r1]
-	ldr r0, =gCurrentMove
-	strh r2, [r0]
-	ldr r0, [r6]
-	adds r0, 0xDA
-	movs r1, 0xFF
-	strb r1, [r0]
-	ldrb r0, [r3]
-	bl ClearBankMoveHistory
-	mov r7, r9
-	ldrb r0, [r7]
-	bl ClearBankAbilityHistory
-	add sp, 0x20
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end SwitchInClearStructs
-
-	thumb_func_start UndoEffectsAfterFainting
-UndoEffectsAfterFainting: @ 803A75C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	movs r5, 0
-	ldr r6, =gBattleMons
-	ldr r0, =gStatuses3
-	mov r8, r0
-	ldr r1, =gBattleStruct
-	mov r12, r1
-	ldr r2, =gUnknown_020244AC
-	mov r9, r2
-	ldr r3, =gUnknown_020244B0
-	mov r10, r3
-	ldr r7, =gProtectStructs
-	ldr r4, =gActiveBank
-	movs r3, 0x58
-	adds r2, r6, 0
-	adds r2, 0x18
-	movs r1, 0x6
-_0803A788:
-	ldrb r0, [r4]
-	muls r0, r3
-	adds r0, r5, r0
-	adds r0, r2
-	strb r1, [r0]
-	adds r5, 0x1
-	cmp r5, 0x7
-	ble _0803A788
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	movs r0, 0x58
-	muls r0, r1
-	adds r2, r6, 0
-	adds r2, 0x50
-	adds r0, r2
-	movs r1, 0
-	str r1, [r0]
-	ldr r3, =gActiveBank
-	ldrb r0, [r3]
-	lsls r0, 2
-	add r0, r8
-	str r1, [r0]
-	movs r5, 0
-	ldr r6, =gNoOfAllBanks
-	ldrb r6, [r6]
-	cmp r5, r6
-	bge _0803A830
-	adds r3, r2, 0
-	movs r4, 0
-	ldr r0, =gBitTable
-	mov r8, r0
-_0803A7C6:
-	ldr r1, [r3]
-	movs r0, 0x80
-	lsls r0, 19
-	ands r0, r1
-	cmp r0, 0
-	beq _0803A7E6
-	ldr r2, =gDisableStructs
-	adds r0, r4, r2
-	ldrb r0, [r0, 0x14]
-	ldr r6, =gActiveBank
-	ldrb r6, [r6]
-	cmp r0, r6
-	bne _0803A7E6
-	ldr r0, =0xfbffffff
-	ands r1, r0
-	str r1, [r3]
-_0803A7E6:
-	ldr r1, =gActiveBank
-	ldrb r0, [r1]
-	lsls r0, 2
-	add r0, r8
-	ldr r0, [r0]
-	lsls r2, r0, 16
-	ldr r1, [r3]
-	adds r0, r1, 0
-	ands r0, r2
-	cmp r0, 0
-	beq _0803A800
-	bics r1, r2
-	str r1, [r3]
-_0803A800:
-	ldr r1, [r3]
-	movs r0, 0xE0
-	lsls r0, 8
-	ands r0, r1
-	cmp r0, 0
-	beq _0803A822
-	mov r2, r12
-	ldr r0, [r2]
-	adds r0, r5, r0
-	ldrb r0, [r0, 0x14]
-	ldr r6, =gActiveBank
-	ldrb r6, [r6]
-	cmp r0, r6
-	bne _0803A822
-	ldr r0, =0xffff1fff
-	ands r1, r0
-	str r1, [r3]
-_0803A822:
-	adds r3, 0x58
-	adds r4, 0x1C
-	adds r5, 0x1
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r5, r0
-	blt _0803A7C6
-_0803A830:
-	ldr r1, =gActiveBank
-	ldrb r0, [r1]
-	add r0, r9
-	movs r1, 0
-	strb r1, [r0]
-	ldr r2, =gActiveBank
-	ldrb r0, [r2]
-	add r0, r10
-	strb r1, [r0]
-	ldrb r1, [r2]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	ldr r3, =gDisableStructs
-	adds r1, r0, r3
-	movs r5, 0
-	movs r2, 0
-_0803A852:
-	adds r0, r1, r5
-	strb r2, [r0]
-	adds r5, 0x1
-	cmp r5, 0x1B
-	bls _0803A852
-	ldr r6, =gActiveBank
-	ldrb r1, [r6]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1]
-	movs r0, 0x2
-	negs r0, r0
-	mov r9, r0
-	ands r0, r2
-	strb r0, [r1]
-	ldrb r1, [r6]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1]
-	movs r3, 0x3
-	negs r3, r3
-	mov r8, r3
-	mov r0, r8
-	ands r0, r2
-	strb r0, [r1]
-	ldrb r1, [r6]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1]
-	movs r6, 0x5
-	negs r6, r6
-	adds r0, r6, 0
-	ands r0, r2
-	strb r0, [r1]
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1]
-	subs r3, 0x6
-	mov r10, r3
-	mov r0, r10
-	ands r0, r2
-	strb r0, [r1]
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	ldr r2, =gActiveBank
-	ldrb r1, [r2]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1]
-	movs r5, 0x21
-	negs r5, r5
-	adds r0, r5, 0
-	ands r0, r2
-	strb r0, [r1]
-	ldr r3, =gActiveBank
-	ldrb r1, [r3]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1]
-	movs r4, 0x41
-	negs r4, r4
-	adds r0, r4, 0
-	ands r0, r2
-	strb r0, [r1]
-	ldrb r1, [r3]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1]
-	movs r3, 0x7F
-	adds r0, r3, 0
-	ands r0, r2
-	strb r0, [r1]
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1, 0x1]
-	mov r0, r9
-	ands r0, r2
-	strb r0, [r1, 0x1]
-	ldr r2, =gActiveBank
-	ldrb r1, [r2]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1, 0x1]
-	mov r0, r8
-	ands r0, r2
-	strb r0, [r1, 0x1]
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1, 0x1]
-	adds r0, r6, 0
-	ands r0, r2
-	strb r0, [r1, 0x1]
-	ldr r2, =gActiveBank
-	ldrb r1, [r2]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1, 0x1]
-	movs r0, 0x19
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x1]
-	ldr r1, =gActiveBank
-	ldrb r0, [r1]
-	lsls r0, 4
-	adds r0, r7
-	ldrb r1, [r0, 0x1]
-	ands r5, r1
-	strb r5, [r0, 0x1]
-	ldr r2, =gActiveBank
-	ldrb r0, [r2]
-	lsls r0, 4
-	adds r0, r7
-	ldrb r1, [r0, 0x1]
-	ands r4, r1
-	strb r4, [r0, 0x1]
-	ldrb r0, [r2]
-	lsls r0, 4
-	adds r0, r7
-	ldrb r1, [r0, 0x1]
-	ands r3, r1
-	strb r3, [r0, 0x1]
-	ldrb r0, [r2]
-	lsls r0, 4
-	adds r0, r7
-	ldrb r1, [r0, 0x2]
-	mov r3, r9
-	ands r3, r1
-	strb r3, [r0, 0x2]
-	ldrb r0, [r2]
-	lsls r0, 4
-	adds r0, r7
-	ldrb r1, [r0, 0x2]
-	mov r2, r8
-	ands r2, r1
-	strb r2, [r0, 0x2]
-	ldr r3, =gActiveBank
-	ldrb r0, [r3]
-	lsls r0, 4
-	adds r0, r7
-	ldrb r1, [r0, 0x2]
-	ands r6, r1
-	strb r6, [r0, 0x2]
-	ldrb r0, [r3]
-	lsls r0, 4
-	adds r0, r7
-	ldrb r1, [r0, 0x2]
-	mov r6, r10
-	ands r6, r1
-	strb r6, [r0, 0x2]
-	ldrb r1, [r3]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	ldr r1, =gDisableStructs
-	adds r0, r1
-	movs r2, 0
-	movs r1, 0x2
-	strb r1, [r0, 0x16]
-	ldrb r0, [r3]
-	lsls r0, 1
-	ldr r3, =gLastUsedMovesByBanks
-	adds r0, r3
-	movs r3, 0
-	strh r2, [r0]
-	ldr r6, =gActiveBank
-	ldrb r0, [r6]
-	lsls r0, 1
-	ldr r1, =gUnknown_02024250
-	adds r0, r1
-	strh r2, [r0]
-	ldrb r0, [r6]
-	lsls r0, 1
-	ldr r6, =gUnknown_02024258
-	adds r0, r6
-	strh r2, [r0]
-	ldr r1, =gActiveBank
-	ldrb r0, [r1]
-	lsls r0, 1
-	ldr r6, =gUnknown_02024260
-	adds r0, r6
-	strh r2, [r0]
-	ldrb r0, [r1]
-	lsls r0, 1
-	ldr r1, =gUnknownMovesUsedByBanks
-	adds r0, r1
-	strh r2, [r0]
-	ldr r2, =gActiveBank
-	ldrb r0, [r2]
-	ldr r6, =gUnknown_02024270
-	adds r0, r6
-	movs r1, 0xFF
-	strb r1, [r0]
-	ldrb r0, [r2]
-	mov r2, r12
-	ldr r1, [r2]
-	lsls r0, 1
-	adds r0, r1
-	adds r0, 0xC8
-	strb r3, [r0]
-	ldr r6, =gActiveBank
-	ldrb r0, [r6]
-	ldr r1, [r2]
-	lsls r0, 1
-	adds r0, r1
-	adds r0, 0xC9
-	strb r3, [r0]
-	ldrb r0, [r6]
-	ldr r1, [r2]
-	lsls r0, 1
-	adds r0, r1
-	adds r0, 0x98
-	strb r3, [r0]
-	ldrb r0, [r6]
-	ldr r1, [r2]
-	lsls r0, 1
-	adds r0, r1
-	adds r0, 0x99
-	strb r3, [r0]
-	ldrb r0, [r6]
-	ldr r1, [r2]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE0
-	strb r3, [r0]
-	ldrb r0, [r6]
-	ldr r1, [r2]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE1
-	strb r3, [r0]
-	ldrb r0, [r6]
-	ldr r1, [r2]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE2
-	strb r3, [r0]
-	ldrb r0, [r6]
-	ldr r1, [r2]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE3
-	strb r3, [r0]
-	ldrb r0, [r6]
-	ldr r1, [r2]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE4
-	strb r3, [r0]
-	ldrb r0, [r6]
-	ldr r1, [r2]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE5
-	strb r3, [r0]
-	ldrb r0, [r6]
-	ldr r1, [r2]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE6
-	strb r3, [r0]
-	ldrb r0, [r6]
-	ldr r1, [r2]
-	lsls r0, 3
-	adds r0, r1
-	adds r0, 0xE7
-	strb r3, [r0]
-	ldr r1, [r2]
-	adds r1, 0x92
-	ldrb r0, [r6]
-	lsls r0, 2
-	ldr r2, =gBitTable
-	adds r0, r2
-	ldr r2, [r0]
-	ldrb r0, [r1]
-	bics r0, r2
-	strb r0, [r1]
-	movs r5, 0
-	ldr r3, =gNoOfAllBanks
-	ldrb r3, [r3]
-	cmp r5, r3
-	bge _0803AB02
-	adds r3, r6, 0
-	mov r7, r12
-	movs r6, 0
-_0803AAA4:
-	ldrb r0, [r3]
-	cmp r5, r0
-	beq _0803AADA
-	lsls r0, r5, 24
-	lsrs r0, 24
-	str r3, [sp]
-	bl GetBankSide
-	adds r4, r0, 0
-	ldr r3, [sp]
-	ldrb r0, [r3]
-	bl GetBankSide
-	lsls r4, 24
-	lsls r0, 24
-	ldr r3, [sp]
-	cmp r4, r0
-	beq _0803AADA
-	ldr r0, [r7]
-	lsls r1, r5, 1
-	adds r0, r1, r0
-	adds r0, 0x98
-	strb r6, [r0]
-	ldr r0, [r7]
-	adds r1, r0
-	adds r1, 0x99
-	strb r6, [r1]
-_0803AADA:
-	ldrb r0, [r3]
-	ldr r1, [r7]
-	lsls r0, 1
-	lsls r2, r5, 3
-	adds r0, r2
-	adds r0, r1
-	adds r0, 0xE0
-	strb r6, [r0]
-	ldrb r0, [r3]
-	ldr r1, [r7]
-	lsls r0, 1
-	adds r0, r2
-	adds r0, r1
-	adds r0, 0xE1
-	strb r6, [r0]
-	adds r5, 0x1
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r5, r0
-	blt _0803AAA4
-_0803AB02:
-	ldr r0, =gBattleResources
-	ldr r0, [r0]
-	ldr r1, [r0, 0x4]
-	ldr r2, =gActiveBank
-	ldrb r0, [r2]
-	lsls r0, 2
-	adds r1, r0
-	movs r0, 0
-	str r0, [r1]
-	ldr r4, =gBattleMons
-	ldrb r0, [r2]
-	movs r3, 0x58
-	adds r2, r0, 0
-	muls r2, r3
-	b _0803AB6C
-	.pool
-_0803AB6C:
-	adds r2, r4
-	ldr r5, =gBaseStats
-	ldrh r1, [r2]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r0, r5
-	ldrb r0, [r0, 0x6]
-	adds r2, 0x21
-	strb r0, [r2]
-	ldr r6, =gActiveBank
-	ldrb r0, [r6]
-	adds r1, r0, 0
-	muls r1, r3
-	adds r1, r4
-	ldrh r2, [r1]
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	adds r0, r5
-	ldrb r0, [r0, 0x7]
-	adds r1, 0x22
-	strb r0, [r1]
-	ldrb r0, [r6]
-	bl ClearBankMoveHistory
-	ldrb r0, [r6]
-	bl ClearBankAbilityHistory
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end UndoEffectsAfterFainting
-
-	thumb_func_start bc_8012FAC
-bc_8012FAC: @ 803ABC0
-	push {r4,r5,lr}
-	ldr r5, =gBattleCommunication
-	ldrb r0, [r5]
-	cmp r0, 0
-	beq _0803ABD4
-	cmp r0, 0x1
-	beq _0803ABF8
-	b _0803AC2E
-	.pool
-_0803ABD4:
-	ldr r4, =gActiveBank
-	ldrb r0, [r5, 0x1]
-	strb r0, [r4]
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0
-	bl EmitGetMonData
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-	b _0803AC2E
-	.pool
-_0803ABF8:
-	ldr r0, =gBattleExecBuffer
-	ldr r2, [r0]
-	cmp r2, 0
-	bne _0803AC2E
-	ldrb r0, [r5, 0x1]
-	adds r0, 0x1
-	strb r0, [r5, 0x1]
-	ldr r1, =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bne _0803AC2C
-	ldr r1, =gBattleMainFunc
-	ldr r0, =bc_load_battlefield
-	str r0, [r1]
-	b _0803AC2E
-	.pool
-_0803AC2C:
-	strb r2, [r5]
-_0803AC2E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end bc_8012FAC
-
-	thumb_func_start bc_load_battlefield
-bc_load_battlefield: @ 803AC34
-	push {r4,r5,lr}
-	ldr r0, =gBattleExecBuffer
-	ldr r5, [r0]
-	cmp r5, 0
-	bne _0803AC64
-	movs r0, 0
-	bl GetBankByIdentity
-	ldr r4, =gActiveBank
-	strb r0, [r4]
-	ldr r0, =gBattleTerrain
-	ldrb r1, [r0]
-	movs r0, 0
-	bl dp01_build_cmdbuf_x2E_a
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803AC84
-	str r0, [r1]
-	ldr r0, =gBattleCommunication
-	strb r5, [r0]
-	strb r5, [r0, 0x1]
-_0803AC64:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bc_load_battlefield
-
-	thumb_func_start sub_803AC84
-sub_803AC84: @ 803AC84
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	ldr r0, =gBattleExecBuffer
-	ldr r1, [r0]
-	cmp r1, 0
-	beq _0803AC98
-	b _0803AF4E
-_0803AC98:
-	ldr r2, =gActiveBank
-	strb r1, [r2]
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r1, r0
-	bcc _0803ACA6
-	b _0803AF48
-_0803ACA6:
-	movs r7, 0x58
-	ldr r0, =gBattleMons
-	mov r8, r0
-	mov r9, r2
-	movs r1, 0x48
-	add r1, r8
-	mov r10, r1
-_0803ACB4:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0803ACFC
-	ldr r4, =gActiveBank
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803ACFC
-	ldrb r0, [r4]
-	muls r0, r7
-	mov r2, r8
-	adds r3, r0, r2
-	movs r2, 0
-	movs r1, 0
-_0803ACDA:
-	adds r0, r3, r2
-	strb r1, [r0]
-	adds r2, 0x1
-	cmp r2, 0x57
-	bls _0803ACDA
-	b _0803ADCA
-	.pool
-_0803ACFC:
-	mov r1, r9
-	ldrb r0, [r1]
-	muls r0, r7
-	mov r2, r8
-	adds r3, r0, r2
-	movs r2, 0
-	ldr r6, =gBaseStats
-	ldr r5, =gBattleBufferB
-	ldr r4, =gActiveBank
-_0803AD0E:
-	adds r0, r3, r2
-	ldrb r1, [r4]
-	lsls r1, 9
-	adds r1, 0x4
-	adds r1, r2, r1
-	adds r1, r5
-	ldrb r1, [r1]
-	strb r1, [r0]
-	adds r2, 0x1
-	cmp r2, 0x57
-	bls _0803AD0E
-	mov r1, r9
-	ldrb r0, [r1]
-	adds r2, r0, 0
-	muls r2, r7
-	add r2, r8
-	ldrh r1, [r2]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r0, r6
-	ldrb r0, [r0, 0x6]
-	adds r2, 0x21
-	strb r0, [r2]
-	mov r2, r9
-	ldrb r0, [r2]
-	adds r2, r0, 0
-	muls r2, r7
-	add r2, r8
-	ldrh r1, [r2]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r0, r6
-	ldrb r0, [r0, 0x7]
-	adds r2, 0x22
-	strb r0, [r2]
-	mov r1, r9
-	ldrb r0, [r1]
-	adds r1, r0, 0
-	muls r1, r7
-	add r1, r8
-	ldrh r0, [r1]
-	ldrb r1, [r1, 0x17]
-	lsrs r1, 7
-	bl GetAbilityBySpecies
-	mov r2, r9
-	ldrb r1, [r2]
-	muls r1, r7
-	add r1, r8
-	adds r1, 0x20
-	strb r0, [r1]
-	ldrb r0, [r2]
-	bl GetBankSide
-	ldr r1, =gBattleStruct
-	lsls r0, 24
-	lsrs r0, 23
-	adds r0, 0xA8
-	ldr r1, [r1]
-	adds r1, r0
-	mov r2, r9
-	ldrb r0, [r2]
-	muls r0, r7
-	add r0, r8
-	ldrh r0, [r0, 0x28]
-	strh r0, [r1]
-	movs r2, 0
-	ldr r4, =gActiveBank
-	movs r5, 0x58
-	ldr r1, =gBattleMons + 0x18
-	adds r6, r4, 0
-	movs r0, 0x18
-	negs r0, r0
-	adds r0, r1
-	mov r12, r0
-	movs r3, 0x6
-_0803ADAA:
-	ldrb r0, [r4]
-	muls r0, r5
-	adds r0, r2, r0
-	adds r0, r1
-	strb r3, [r0]
-	adds r2, 0x1
-	cmp r2, 0x7
-	ble _0803ADAA
-	ldrb r0, [r6]
-	adds r1, r0, 0
-	muls r1, r7
-	mov r0, r12
-	adds r0, 0x50
-	adds r1, r0
-	movs r0, 0
-	str r0, [r1]
-_0803ADCA:
-	ldr r4, =gActiveBank
-	ldrb r0, [r4]
-	bl GetBankIdentity
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803ADE4
-	movs r0, 0
-	bl dp01_build_cmdbuf_x07_7_7_7
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_0803ADE4:
-	ldr r5, =gBattleTypeFlags
-	ldr r0, [r5]
-	movs r1, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _0803AE60
-	ldrb r0, [r4]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0803AE0A
-	movs r0, 0
-	bl dp01_build_cmdbuf_x07_7_7_7
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_0803AE0A:
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0803AEC0
-	ldr r0, [r5]
-	ldr r1, =0x063f0902
-	ands r0, r1
-	cmp r0, 0
-	bne _0803AEC0
-	ldrb r0, [r4]
-	muls r0, r7
-	add r0, r8
-	ldrh r0, [r0]
-	bl SpeciesToNationalPokedexNum
-	lsls r0, 16
-	lsrs r0, 16
-	ldrb r1, [r4]
-	muls r1, r7
-	add r1, r10
-	ldr r2, [r1]
-	movs r1, 0x2
-	bl HandleSetPokedexFlag
-	b _0803AEC0
-	.pool
-_0803AE60:
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0803AEC0
-	ldr r0, [r5]
-	ldr r1, =0x063f0902
-	ands r0, r1
-	cmp r0, 0
-	bne _0803AE96
-	ldrb r0, [r4]
-	muls r0, r7
-	add r0, r8
-	ldrh r0, [r0]
-	bl SpeciesToNationalPokedexNum
-	lsls r0, 16
-	lsrs r0, 16
-	ldrb r1, [r4]
-	muls r1, r7
-	add r1, r10
-	ldr r2, [r1]
-	movs r1, 0x2
-	bl HandleSetPokedexFlag
-_0803AE96:
-	movs r0, 0
-	bl dp01_build_cmdbuf_x04_4_4_4
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-	ldr r1, =gBattlePartyID
-	ldrb r0, [r4]
-	lsls r0, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, =gEnemyParty
-	adds r0, r1
-	movs r1, 0xB
-	movs r2, 0
-	bl GetMonData
-	ldr r1, =gBattleResults
-	strh r0, [r1, 0x20]
-_0803AEC0:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _0803AEF6
-	ldr r4, =gActiveBank
-	ldrb r0, [r4]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x2
-	beq _0803AEEA
-	ldrb r0, [r4]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	bne _0803AEF6
-_0803AEEA:
-	movs r0, 0
-	bl dp01_build_cmdbuf_x07_7_7_7
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_0803AEF6:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 8
-	ands r0, r1
-	cmp r0, 0
-	beq _0803AF20
-	ldr r4, =gActiveBank
-	ldrb r0, [r4]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	bne _0803AF20
-	movs r0, 0
-	bl dp01_build_cmdbuf_x07_7_7_7
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_0803AF20:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 11
-	ands r0, r1
-	cmp r0, 0
-	beq _0803AF32
-	bl sub_81A56B4
-_0803AF32:
-	mov r1, r9
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r1, =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcs _0803AF48
-	b _0803ACB4
-_0803AF48:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =bc_801333C
-	str r0, [r1]
-_0803AF4E:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803AC84
-
-	thumb_func_start bc_801333C
-bc_801333C: @ 803AF80
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x30
-	ldr r0, =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	beq _0803AF92
-	b _0803B10C
-_0803AF92:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x8
-	ands r0, r1
-	cmp r0, 0
-	bne _0803AFA0
-	b _0803B0AC
-_0803AFA0:
-	movs r7, 0
-	add r0, sp, 0x4
-	mov r8, r0
-	mov r6, r8
-	mov r5, sp
-_0803AFAA:
-	movs r0, 0x64
-	adds r1, r7, 0
-	muls r1, r0
-	ldr r0, =gEnemyParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	cmp r0, 0
-	beq _0803AFD0
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	movs r1, 0xCE
-	lsls r1, 1
-	cmp r0, r1
-	bne _0803AFE8
-_0803AFD0:
-	ldr r0, =0x0000ffff
-	strh r0, [r5]
-	movs r0, 0
-	b _0803AFFA
-	.pool
-_0803AFE8:
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	strh r0, [r5]
-	adds r0, r4, 0
-	movs r1, 0x37
-	bl GetMonData
-_0803AFFA:
-	str r0, [r6]
-	adds r6, 0x8
-	adds r5, 0x8
-	adds r7, 0x1
-	cmp r7, 0x5
-	ble _0803AFAA
-	movs r0, 0x1
-	bl GetBankByIdentity
-	ldr r4, =gActiveBank
-	strb r0, [r4]
-	movs r0, 0
-	mov r1, sp
-	movs r2, 0x80
-	bl EmitCmd48
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-	movs r7, 0
-	mov r6, r8
-	mov r5, sp
-_0803B026:
-	movs r0, 0x64
-	adds r1, r7, 0
-	muls r1, r0
-	ldr r0, =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	cmp r0, 0
-	beq _0803B04C
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	movs r1, 0xCE
-	lsls r1, 1
-	cmp r0, r1
-	bne _0803B060
-_0803B04C:
-	ldr r0, =0x0000ffff
-	strh r0, [r5]
-	movs r0, 0
-	b _0803B072
-	.pool
-_0803B060:
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	strh r0, [r5]
-	adds r0, r4, 0
-	movs r1, 0x37
-	bl GetMonData
-_0803B072:
-	str r0, [r6]
-	adds r6, 0x8
-	adds r5, 0x8
-	adds r7, 0x1
-	cmp r7, 0x5
-	ble _0803B026
-	movs r0, 0
-	bl GetBankByIdentity
-	ldr r4, =gActiveBank
-	strb r0, [r4]
-	movs r0, 0
-	mov r1, sp
-	movs r2, 0x80
-	bl EmitCmd48
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-	ldr r1, =gBattleMainFunc
-	ldr r0, =bc_battle_begin_message
-	b _0803B10A
-	.pool
-_0803B0AC:
-	movs r7, 0
-	add r6, sp, 0x4
-	mov r5, sp
-_0803B0B2:
-	movs r0, 0x64
-	adds r1, r7, 0
-	muls r1, r0
-	ldr r0, =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	cmp r0, 0
-	beq _0803B0D8
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	movs r1, 0xCE
-	lsls r1, 1
-	cmp r0, r1
-	bne _0803B0E8
-_0803B0D8:
-	ldr r0, =0x0000ffff
-	strh r0, [r5]
-	movs r0, 0
-	b _0803B0FA
-	.pool
-_0803B0E8:
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	strh r0, [r5]
-	adds r0, r4, 0
-	movs r1, 0x37
-	bl GetMonData
-_0803B0FA:
-	str r0, [r6]
-	adds r6, 0x8
-	adds r5, 0x8
-	adds r7, 0x1
-	cmp r7, 0x5
-	ble _0803B0B2
-	ldr r1, =gBattleMainFunc
-	ldr r0, =bc_8013568
-_0803B10A:
-	str r0, [r1]
-_0803B10C:
-	add sp, 0x30
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bc_801333C
-
-	thumb_func_start bc_battle_begin_message
-bc_battle_begin_message: @ 803B120
-	push {lr}
-	ldr r0, =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _0803B142
-	movs r0, 0x1
-	bl GetBankByIdentity
-	ldr r1, =gActiveBank
-	strb r0, [r1]
-	ldrb r1, [r1]
-	movs r0, 0
-	bl PrepareStringBattle
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803B180
-	str r0, [r1]
-_0803B142:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bc_battle_begin_message
-
-	thumb_func_start bc_8013568
-bc_8013568: @ 803B158
-	push {lr}
-	ldr r0, =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _0803B170
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803B3CC
-	str r0, [r1]
-	movs r0, 0
-	movs r1, 0
-	bl PrepareStringBattle
-_0803B170:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bc_8013568
-
-	thumb_func_start sub_803B180
-sub_803B180: @ 803B180
-	push {lr}
-	ldr r0, =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _0803B1D0
-	ldr r0, =gBattleTypeFlags
-	ldr r2, [r0]
-	movs r0, 0x80
-	lsls r0, 17
-	ands r0, r2
-	cmp r0, 0
-	beq _0803B1B8
-	movs r0, 0x80
-	lsls r0, 18
-	ands r0, r2
-	cmp r0, 0
-	beq _0803B1B8
-	movs r1, 0x80
-	lsls r1, 24
-	ands r1, r2
-	negs r0, r1
-	orrs r0, r1
-	lsrs r0, 31
-	b _0803B1BA
-	.pool
-_0803B1B8:
-	movs r0, 0x1
-_0803B1BA:
-	bl GetBankByIdentity
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	movs r0, 0x1
-	bl PrepareStringBattle
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803B25C
-	str r0, [r1]
-_0803B1D0:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803B180
-
-	thumb_func_start sub_803B1DC
-sub_803B1DC: @ 803B1DC
-	push {r4,r5,lr}
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r0, 0x80
-	lsls r0, 17
-	ands r0, r1
-	cmp r0, 0
-	beq _0803B1FC
-	movs r0, 0x80
-	lsls r0, 18
-	ands r0, r1
-	cmp r0, 0
-	beq _0803B1FC
-	movs r5, 0x2
-	cmp r1, 0
-	bge _0803B1FE
-_0803B1FC:
-	movs r5, 0x3
-_0803B1FE:
-	ldr r1, =gActiveBank
-	movs r0, 0
-	strb r0, [r1]
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0803B23A
-	adds r4, r1, 0
-_0803B20E:
-	ldrb r0, [r4]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, r5
-	bne _0803B228
-	movs r0, 0
-	bl dp01_build_cmdbuf_x2F_2F_2F_2F
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_0803B228:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldr r1, =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803B20E
-_0803B23A:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =bc_801362C
-	str r0, [r1]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803B1DC
-
-	thumb_func_start sub_803B25C
-sub_803B25C: @ 803B25C
-	push {r4-r6,lr}
-	ldr r0, =gBattleTypeFlags
-	ldr r2, [r0]
-	movs r0, 0x80
-	lsls r0, 17
-	ands r0, r2
-	cmp r0, 0
-	beq _0803B298
-	movs r0, 0x80
-	lsls r0, 18
-	ands r0, r2
-	cmp r0, 0
-	beq _0803B298
-	movs r1, 0x80
-	lsls r1, 24
-	ands r1, r2
-	negs r0, r1
-	orrs r0, r1
-	lsrs r5, r0, 31
-	b _0803B29A
-	.pool
-_0803B288:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803B1DC
-	b _0803B2F0
-	.pool
-_0803B298:
-	movs r5, 0x1
-_0803B29A:
-	ldr r0, =gBattleExecBuffer
-	ldr r2, [r0]
-	cmp r2, 0
-	bne _0803B2F2
-	ldr r0, =gActiveBank
-	strb r2, [r0]
-	ldr r1, =gNoOfAllBanks
-	adds r4, r0, 0
-	ldrb r1, [r1]
-	cmp r2, r1
-	bcs _0803B2EC
-	adds r6, r4, 0
-_0803B2B2:
-	ldrb r0, [r4]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, r5
-	bne _0803B2D8
-	movs r0, 0
-	bl dp01_build_cmdbuf_x2F_2F_2F_2F
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	ldr r1, =0x00008040
-	ands r0, r1
-	cmp r0, 0
-	bne _0803B288
-_0803B2D8:
-	ldrb r0, [r6]
-	adds r0, 0x1
-	strb r0, [r6]
-	ldr r1, =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r4, =gActiveBank
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803B2B2
-_0803B2EC:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =bc_801362C
-_0803B2F0:
-	str r0, [r1]
-_0803B2F2:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803B25C
-
-	thumb_func_start bc_801362C
-bc_801362C: @ 803B314
-	push {r4-r7,lr}
-	ldr r0, =gBattleExecBuffer
-	ldr r1, [r0]
-	cmp r1, 0
-	bne _0803B384
-	ldr r2, =gActiveBank
-	strb r1, [r2]
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r1, r0
-	bcs _0803B37E
-	adds r4, r2, 0
-	ldr r6, =gBattleMons
-	movs r5, 0x58
-	adds r7, r6, 0
-	adds r7, 0x48
-_0803B334:
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0803B36C
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	ldr r1, =0x063f0902
-	ands r0, r1
-	cmp r0, 0
-	bne _0803B36C
-	ldrb r0, [r4]
-	muls r0, r5
-	adds r0, r6
-	ldrh r0, [r0]
-	bl SpeciesToNationalPokedexNum
-	lsls r0, 16
-	lsrs r0, 16
-	ldrb r1, [r4]
-	muls r1, r5
-	adds r1, r7
-	ldr r2, [r1]
-	movs r1, 0x2
-	bl HandleSetPokedexFlag
-_0803B36C:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldr r1, =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803B334
-_0803B37E:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803B3CC
-	str r0, [r1]
-_0803B384:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bc_801362C
-
-	thumb_func_start sub_803B3AC
-sub_803B3AC: @ 803B3AC
-	push {lr}
-	ldr r0, =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _0803B3BC
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803B3CC
-	str r0, [r1]
-_0803B3BC:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803B3AC
-
-	thumb_func_start sub_803B3CC
-sub_803B3CC: @ 803B3CC
-	push {lr}
-	ldr r0, =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _0803B418
-	ldr r1, =gBattleTypeFlags
-	ldr r2, [r1]
-	movs r0, 0x80
-	lsls r0, 17
-	ands r0, r2
-	cmp r0, 0
-	beq _0803B3F4
-	movs r0, 0x80
-	lsls r0, 18
-	ands r0, r2
-	cmp r0, 0
-	beq _0803B3F4
-	movs r3, 0x1
-	cmp r2, 0
-	bge _0803B3F6
-_0803B3F4:
-	movs r3, 0
-_0803B3F6:
-	ldr r0, [r1]
-	movs r1, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0803B412
-	adds r0, r3, 0
-	bl GetBankByIdentity
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	movs r0, 0x1
-	bl PrepareStringBattle
-_0803B412:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803B4C8
-	str r0, [r1]
-_0803B418:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803B3CC
-
-	thumb_func_start sub_803B42C
-sub_803B42C: @ 803B42C
-	push {r4,r5,lr}
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r0, 0x80
-	lsls r0, 17
-	ands r0, r1
-	cmp r0, 0
-	beq _0803B44C
-	movs r0, 0x80
-	lsls r0, 18
-	ands r0, r1
-	cmp r0, 0
-	beq _0803B44C
-	movs r5, 0x3
-	cmp r1, 0
-	bge _0803B44E
-_0803B44C:
-	movs r5, 0x2
-_0803B44E:
-	ldr r1, =gActiveBank
-	movs r0, 0
-	strb r0, [r1]
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0803B48A
-	adds r4, r1, 0
-_0803B45E:
-	ldrb r0, [r4]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, r5
-	bne _0803B478
-	movs r0, 0
-	bl dp01_build_cmdbuf_x2F_2F_2F_2F
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_0803B478:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldr r1, =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803B45E
-_0803B48A:
-	ldr r2, =gBattleStruct
-	ldr r0, [r2]
-	adds r0, 0x4C
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r2]
-	adds r0, 0xD9
-	strb r1, [r0]
-	ldr r0, [r2]
-	movs r2, 0xD1
-	lsls r2, 1
-	adds r0, r2
-	strb r1, [r0]
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803B628
-	str r0, [r1]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803B42C
-
-	thumb_func_start sub_803B4C8
-sub_803B4C8: @ 803B4C8
-	push {r4-r6,lr}
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r0, 0x80
-	lsls r0, 17
-	ands r0, r1
-	cmp r0, 0
-	beq _0803B500
-	movs r0, 0x80
-	lsls r0, 18
-	ands r0, r1
-	cmp r0, 0
-	beq _0803B500
-	movs r6, 0x1
-	cmp r1, 0
-	bge _0803B502
-	b _0803B500
-	.pool
-_0803B4F0:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803B42C
-	b _0803B572
-	.pool
-_0803B500:
-	movs r6, 0
-_0803B502:
-	ldr r0, =gBattleExecBuffer
-	ldr r2, [r0]
-	cmp r2, 0
-	bne _0803B574
-	ldr r0, =gActiveBank
-	strb r2, [r0]
-	ldr r1, =gNoOfAllBanks
-	adds r4, r0, 0
-	ldrb r1, [r1]
-	cmp r2, r1
-	bcs _0803B554
-	adds r5, r4, 0
-_0803B51A:
-	ldrb r0, [r4]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, r6
-	bne _0803B540
-	movs r0, 0
-	bl dp01_build_cmdbuf_x2F_2F_2F_2F
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x40
-	ands r0, r1
-	cmp r0, 0
-	bne _0803B4F0
-_0803B540:
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-	ldr r1, =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r4, =gActiveBank
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803B51A
-_0803B554:
-	ldr r2, =gBattleStruct
-	ldr r0, [r2]
-	adds r0, 0x4C
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r2]
-	adds r0, 0xD9
-	strb r1, [r0]
-	ldr r0, [r2]
-	movs r2, 0xD1
-	lsls r2, 1
-	adds r0, r2
-	strb r1, [r0]
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803B628
-_0803B572:
-	str r0, [r1]
-_0803B574:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803B4C8
-
-	thumb_func_start sub_803B598
-sub_803B598: @ 803B598
-	push {r4,r5,lr}
-	ldr r0, =gBattleExecBuffer
-	ldr r1, [r0]
-	cmp r1, 0
-	bne _0803B606
-	ldr r2, =gActiveBank
-	strb r1, [r2]
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r1, r0
-	bcs _0803B5E6
-	adds r4, r2, 0
-	ldr r5, =gBattlePartyID
-_0803B5B2:
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803B5D4
-	ldrb r0, [r4]
-	lsls r0, 1
-	adds r0, r5
-	ldrb r1, [r0]
-	movs r0, 0
-	movs r2, 0
-	bl EmitSwitchInAnim
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_0803B5D4:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldr r1, =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803B5B2
-_0803B5E6:
-	ldr r2, =gBattleStruct
-	ldr r0, [r2]
-	adds r0, 0x4C
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r2]
-	adds r0, 0xD9
-	strb r1, [r0]
-	ldr r0, [r2]
-	movs r2, 0xD1
-	lsls r2, 1
-	adds r0, r2
-	strb r1, [r0]
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803B628
-	str r0, [r1]
-_0803B606:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803B598
-
-	thumb_func_start sub_803B628
-sub_803B628: @ 803B628
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	movs r0, 0
-	mov r9, r0
-	ldr r0, =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	beq _0803B642
-	b _0803B8B2
-_0803B642:
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-	adds r0, 0x4C
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0803B6C2
-	movs r5, 0
-	ldr r1, =gNoOfAllBanks
-	mov r10, r1
-	ldrb r3, [r1]
-	cmp r5, r3
-	bge _0803B668
-	ldr r2, =gTurnOrder
-_0803B65C:
-	adds r0, r5, r2
-	strb r5, [r0]
-	adds r5, 0x1
-	ldrb r0, [r1]
-	cmp r5, r0
-	blt _0803B65C
-_0803B668:
-	movs r5, 0
-	b _0803B6B8
-	.pool
-_0803B67C:
-	adds r4, r5, 0x1
-	mov r8, r4
-	ldrb r1, [r1]
-	cmp r8, r1
-	bge _0803B6B6
-	ldr r6, =gTurnOrder
-	ldr r1, =gNoOfAllBanks
-	mov r10, r1
-	lsls r7, r5, 24
-_0803B68E:
-	adds r0, r5, r6
-	ldrb r0, [r0]
-	adds r1, r4, r6
-	ldrb r1, [r1]
-	movs r2, 0x1
-	bl b_first_side
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803B6AC
-	lsls r1, r4, 24
-	lsrs r1, 24
-	lsrs r0, r7, 24
-	bl sub_803CEDC
-_0803B6AC:
-	adds r4, 0x1
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r4, r0
-	blt _0803B68E
-_0803B6B6:
-	mov r5, r8
-_0803B6B8:
-	mov r1, r10
-	ldrb r0, [r1]
-	subs r0, 0x1
-	cmp r5, r0
-	blt _0803B67C
-_0803B6C2:
-	ldr r5, =gBattleStruct
-	ldr r0, [r5]
-	movs r4, 0xD1
-	lsls r4, 1
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0803B6FC
-	str r0, [sp]
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0xFF
-	bl AbilityBattleEffects
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803B6FC
-	ldr r0, [r5]
-	adds r0, r4
-	movs r1, 0x1
-	strb r1, [r0]
-	b _0803B8B2
-	.pool
-_0803B6FC:
-	ldr r2, =gBattleStruct
-	ldr r0, [r2]
-	adds r0, 0x4C
-	ldr r1, =gNoOfAllBanks
-	ldrb r0, [r0]
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcs _0803B756
-	ldr r5, =gTurnOrder
-	adds r4, r2, 0
-_0803B710:
-	ldr r0, [r4]
-	adds r0, 0x4C
-	ldrb r0, [r0]
-	adds r0, r5
-	ldrb r1, [r0]
-	movs r0, 0
-	str r0, [sp]
-	movs r2, 0
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803B736
-	mov r0, r9
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-_0803B736:
-	ldr r1, [r4]
-	adds r1, 0x4C
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	mov r3, r9
-	cmp r3, 0
-	beq _0803B748
-	b _0803B8B2
-_0803B748:
-	ldr r0, [r4]
-	adds r0, 0x4C
-	ldr r1, =gNoOfAllBanks
-	ldrb r0, [r0]
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803B710
-_0803B756:
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0x9
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _0803B770
-	b _0803B8B2
-_0803B770:
-	str r0, [sp]
-	movs r0, 0xB
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803B786
-	b _0803B8B2
-_0803B786:
-	ldr r2, =gBattleStruct
-	ldr r0, [r2]
-	adds r0, 0xD9
-	ldr r1, =gNoOfAllBanks
-	ldrb r0, [r0]
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcs _0803B7DA
-	ldr r5, =gTurnOrder
-	adds r4, r2, 0
-_0803B79A:
-	ldr r0, [r4]
-	adds r0, 0xD9
-	ldrb r0, [r0]
-	adds r0, r5
-	ldrb r1, [r0]
-	movs r0, 0
-	movs r2, 0
-	bl ItemBattleEffects
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803B7BC
-	mov r0, r9
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-_0803B7BC:
-	ldr r1, [r4]
-	adds r1, 0xD9
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	mov r0, r9
-	cmp r0, 0
-	bne _0803B8B2
-	ldr r0, [r4]
-	adds r0, 0xD9
-	ldr r1, =gNoOfAllBanks
-	ldrb r0, [r0]
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803B79A
-_0803B7DA:
-	movs r5, 0
-	ldr r1, =gBattleStruct
-	mov r8, r1
-	movs r7, 0x6
-	ldr r6, =gActionForBanks
-	ldr r2, =gChosenMovesByBanks
-	movs r4, 0xFF
-	movs r3, 0
-_0803B7EA:
-	mov r1, r8
-	ldr r0, [r1]
-	adds r0, r5, r0
-	adds r0, 0x5C
-	strb r7, [r0]
-	adds r1, r5, r6
-	ldrb r0, [r1]
-	orrs r0, r4
-	strb r0, [r1]
-	strh r3, [r2]
-	adds r2, 0x2
-	adds r5, 0x1
-	cmp r5, 0x3
-	ble _0803B7EA
-	movs r0, 0
-	bl sub_803D580
-	bl sub_803D6A0
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-	adds r0, 0x91
-	ldr r1, =gAbsentBankFlags
-	ldrb r1, [r1]
-	strb r1, [r0]
-	ldr r0, =gText_EmptyString3
-	movs r1, 0
-	bl sub_814F9EC
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803BE74
-	str r0, [r1]
-	bl ResetSentPokesToOpponentValue
-	ldr r1, =gBattleCommunication
-	movs r2, 0
-	adds r0, r1, 0x7
-_0803B834:
-	strb r2, [r0]
-	subs r0, 0x1
-	cmp r0, r1
-	bge _0803B834
-	movs r5, 0
-	ldr r3, =gNoOfAllBanks
-	ldr r2, =gBattleStruct
-	ldr r6, =gBattleScripting
-	ldr r7, =gBattleMoveFlags
-	ldrb r0, [r3]
-	cmp r5, r0
-	bge _0803B866
-	ldr r0, =gBattleMons
-	movs r4, 0x9
-	negs r4, r4
-	adds r1, r0, 0
-	adds r1, 0x50
-_0803B856:
-	ldr r0, [r1]
-	ands r0, r4
-	str r0, [r1]
-	adds r1, 0x58
-	adds r5, 0x1
-	ldrb r0, [r3]
-	cmp r5, r0
-	blt _0803B856
-_0803B866:
-	ldr r0, [r2]
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r2]
-	strb r1, [r0, 0x1]
-	ldr r0, [r2]
-	movs r3, 0xD0
-	lsls r3, 1
-	adds r0, r3
-	strb r1, [r0]
-	ldr r0, [r2]
-	adds r3, 0x1
-	adds r0, r3
-	strb r1, [r0]
-	movs r1, 0
-	strb r1, [r6, 0x14]
-	ldr r0, [r2]
-	adds r0, 0x4D
-	strb r1, [r0]
-	ldr r0, [r2]
-	strb r1, [r0, 0x3]
-	strb r1, [r7]
-	bl Random
-	ldr r1, =gUnknown_02024330
-	strh r0, [r1]
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 11
-	ands r0, r1
-	cmp r0, 0
-	beq _0803B8B2
-	bl StopCryAndClearCrySongs
-	ldr r0, =gUnknown_082DB8BE
-	bl BattleScriptExecute
-_0803B8B2:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803B628
-
-	thumb_func_start bc_8013B1C
-bc_8013B1C: @ 803B904
-	push {r4-r6,lr}
-	ldr r0, =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _0803B994
-	ldr r1, =gBattleMainFunc
-	ldr r0, =BattleTurnPassed
-	str r0, [r1]
-	ldr r3, =gNoOfAllBanks
-	ldr r1, =gBattleCommunication
-	movs r2, 0
-	adds r0, r1, 0x7
-_0803B91C:
-	strb r2, [r0]
-	subs r0, 0x1
-	cmp r0, r1
-	bge _0803B91C
-	movs r4, 0
-	ldrb r3, [r3]
-	cmp r4, r3
-	bge _0803B96E
-	ldr r5, =gBattleMons
-	adds r6, r5, 0
-	adds r6, 0x4C
-_0803B932:
-	movs r0, 0x58
-	adds r2, r4, 0
-	muls r2, r0
-	adds r1, r5, 0
-	adds r1, 0x50
-	adds r1, r2, r1
-	ldr r3, [r1]
-	subs r0, 0x61
-	ands r3, r0
-	str r3, [r1]
-	adds r2, r6
-	ldr r0, [r2]
-	movs r1, 0x7
-	ands r0, r1
-	cmp r0, 0
-	beq _0803B964
-	movs r0, 0x80
-	lsls r0, 5
-	ands r3, r0
-	cmp r3, 0
-	beq _0803B964
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl CancelMultiTurnMoves
-_0803B964:
-	adds r4, 0x1
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r4, r0
-	blt _0803B932
-_0803B96E:
-	ldr r2, =gBattleStruct
-	ldr r0, [r2]
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r2]
-	strb r1, [r0, 0x1]
-	ldr r0, [r2]
-	movs r3, 0xD0
-	lsls r3, 1
-	adds r0, r3
-	strb r1, [r0]
-	ldr r0, [r2]
-	adds r3, 0x1
-	adds r0, r3
-	strb r1, [r0]
-	ldr r0, [r2]
-	strb r1, [r0, 0x3]
-	ldr r0, =gBattleMoveFlags
-	strb r1, [r0]
-_0803B994:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bc_8013B1C
-
-	thumb_func_start BattleTurnPassed
-BattleTurnPassed: @ 803B9BC
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	movs r0, 0x1
-	bl sub_803D580
-	ldr r0, =gBattleOutcome
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0803B9EA
-	bl UpdateTurnCounters
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803B9DE
-	b _0803BB78
-_0803B9DE:
-	bl TurnBasedEffects
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803B9EA
-	b _0803BB78
-_0803B9EA:
-	bl sub_8041728
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	beq _0803B9F8
-	b _0803BB78
-_0803B9F8:
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-	adds r0, 0x4D
-	strb r1, [r0]
-	bl sub_8041364
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	beq _0803BA0E
-	b _0803BB78
-_0803BA0E:
-	movs r0, 0
-	bl sub_803D580
-	ldr r2, =gHitMarker
-	ldr r0, [r2]
-	ldr r1, =0xfffffdff
-	ands r0, r1
-	ldr r1, =0xfff7ffff
-	ands r0, r1
-	ldr r1, =0xffbfffff
-	ands r0, r1
-	ldr r1, =0xffefffff
-	ands r0, r1
-	str r0, [r2]
-	ldr r0, =gBattleScripting
-	strb r4, [r0, 0x18]
-	strb r4, [r0, 0x19]
-	strb r4, [r0, 0x14]
-	ldr r0, =gBattleMoveDamage
-	str r4, [r0]
-	ldr r0, =gBattleMoveFlags
-	strb r4, [r0]
-	ldr r1, =gBattleCommunication
-	movs r2, 0
-	adds r0, r1, 0x4
-_0803BA40:
-	strb r2, [r0]
-	subs r0, 0x1
-	cmp r0, r1
-	bge _0803BA40
-	ldr r0, =gBattleOutcome
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0803BA98
-	ldr r1, =gFightStateTracker
-	movs r0, 0xC
-	strb r0, [r1]
-	ldr r1, =gBattleMainFunc
-	ldr r0, =bc_bs_exec
-	str r0, [r1]
-	b _0803BB78
-	.pool
-_0803BA98:
-	ldr r1, =gBattleResults
-	ldrb r0, [r1, 0x13]
-	ldr r2, =gBattleStruct
-	mov r8, r2
-	cmp r0, 0xFE
-	bhi _0803BAB2
-	adds r0, 0x1
-	strb r0, [r1, 0x13]
-	ldr r1, [r2]
-	adds r1, 0xDA
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-_0803BAB2:
-	movs r2, 0
-	ldr r4, =gNoOfAllBanks
-	ldr r0, =gAbsentBankFlags
-	mov r12, r0
-	ldr r1, =gText_EmptyString3
-	mov r9, r1
-	ldrb r0, [r4]
-	cmp r2, r0
-	bge _0803BAE0
-	ldr r7, =gActionForBanks
-	movs r6, 0xFF
-	movs r5, 0
-	ldr r3, =gChosenMovesByBanks
-_0803BACC:
-	adds r1, r2, r7
-	ldrb r0, [r1]
-	orrs r0, r6
-	strb r0, [r1]
-	strh r5, [r3]
-	adds r3, 0x2
-	adds r2, 0x1
-	ldrb r1, [r4]
-	cmp r2, r1
-	blt _0803BACC
-_0803BAE0:
-	movs r2, 0
-	ldr r3, =gBattleStruct
-	movs r1, 0x6
-_0803BAE6:
-	ldr r0, [r3]
-	adds r0, r2, r0
-	adds r0, 0x5C
-	strb r1, [r0]
-	adds r2, 0x1
-	cmp r2, 0x3
-	ble _0803BAE6
-	mov r2, r8
-	ldr r0, [r2]
-	adds r0, 0x91
-	mov r2, r12
-	ldrb r1, [r2]
-	strb r1, [r0]
-	mov r0, r9
-	movs r1, 0
-	bl sub_814F9EC
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803BE74
-	str r0, [r1]
-	bl Random
-	ldr r1, =gUnknown_02024330
-	strh r0, [r1]
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r0, 0x80
-	lsls r0, 10
-	ands r0, r1
-	cmp r0, 0
-	beq _0803BB5C
-	ldr r0, =gUnknown_082DB881
-	bl BattleScriptExecute
-	b _0803BB78
-	.pool
-_0803BB5C:
-	movs r0, 0x80
-	lsls r0, 11
-	ands r1, r0
-	cmp r1, 0
-	beq _0803BB78
-	mov r1, r8
-	ldr r0, [r1]
-	adds r0, 0xDA
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0803BB78
-	ldr r0, =gUnknown_082DB8BE
-	bl BattleScriptExecute
-_0803BB78:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BattleTurnPassed
-
-	thumb_func_start IsRunningFromBattleImpossible
-IsRunningFromBattleImpossible: @ 803BB88
-	push {r4-r7,lr}
-	sub sp, 0x4
-	ldr r1, =gBattleMons
-	ldr r0, =gActiveBank
-	ldrb r2, [r0]
-	movs r0, 0x58
-	muls r0, r2
-	adds r1, r0, r1
-	ldrh r0, [r1, 0x2E]
-	cmp r0, 0xAF
-	bne _0803BBB8
-	ldr r1, =gEnigmaBerries
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	adds r0, r1
-	ldrb r2, [r0, 0x7]
-	b _0803BBC2
-	.pool
-_0803BBB8:
-	ldrh r0, [r1, 0x2E]
-	bl ItemId_GetHoldEffect
-	lsls r0, 24
-	lsrs r2, r0, 24
-_0803BBC2:
-	ldr r1, =gStringBank
-	ldr r3, =gActiveBank
-	ldrb r0, [r3]
-	strb r0, [r1]
-	cmp r2, 0x25
-	bne _0803BBD0
-	b _0803BD4C
-_0803BBD0:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0803BBDE
-	b _0803BD4C
-_0803BBDE:
-	ldr r1, =gBattleMons
-	ldrb r2, [r3]
-	movs r0, 0x58
-	muls r0, r2
-	adds r0, r1
-	adds r0, 0x20
-	ldrb r0, [r0]
-	cmp r0, 0x32
-	bne _0803BBF2
-	b _0803BD4C
-_0803BBF2:
-	adds r0, r2, 0
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r5, 0
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r5, r0
-	bge _0803BC86
-	movs r7, 0
-_0803BC08:
-	lsrs r4, r7, 24
-	adds r0, r4, 0
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r6, r0
-	beq _0803BC2C
-	ldr r1, =gBattleMons
-	movs r0, 0x58
-	muls r0, r5
-	adds r0, r1
-	adds r2, r0, 0
-	adds r2, 0x20
-	ldrb r0, [r2]
-	cmp r0, 0x17
-	bne _0803BC2C
-	b _0803BD54
-_0803BC2C:
-	adds r0, r4, 0
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r6, r0
-	beq _0803BC76
-	ldr r3, =gBattleMons
-	ldr r0, =gActiveBank
-	ldrb r0, [r0]
-	movs r2, 0x58
-	muls r0, r2
-	adds r1, r0, r3
-	adds r0, r1, 0
-	adds r0, 0x20
-	ldrb r0, [r0]
-	cmp r0, 0x1A
-	beq _0803BC76
-	adds r0, r1, 0
-	adds r0, 0x21
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	beq _0803BC76
-	adds r0, r1, 0
-	adds r0, 0x22
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	beq _0803BC76
-	adds r0, r5, 0
-	muls r0, r2
-	adds r0, r3
-	adds r2, r0, 0
-	adds r2, 0x20
-	ldrb r0, [r2]
-	cmp r0, 0x47
-	bne _0803BC76
-	b _0803BD70
-_0803BC76:
-	movs r0, 0x80
-	lsls r0, 17
-	adds r7, r0
-	adds r5, 0x1
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r5, r0
-	blt _0803BC08
-_0803BC86:
-	ldr r4, =gActiveBank
-	ldrb r1, [r4]
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0xF
-	movs r2, 0x2A
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0
-	beq _0803BCF8
-	ldr r6, =gBattleMons
-	ldrb r0, [r4]
-	movs r3, 0x58
-	muls r0, r3
-	adds r1, r0, r6
-	adds r0, r1, 0
-	adds r0, 0x21
-	ldrb r0, [r0]
-	cmp r0, 0x8
-	beq _0803BCBE
-	adds r0, r1, 0
-	adds r0, 0x22
-	ldrb r0, [r0]
-	cmp r0, 0x8
-	bne _0803BCF8
-_0803BCBE:
-	ldr r0, =gBattleScripting
-	subs r1, r5, 0x1
-	strb r1, [r0, 0x17]
-	ldr r2, =gLastUsedAbility
-	adds r0, r1, 0
-	muls r0, r3
-	adds r0, r6
-	adds r0, 0x20
-	ldrb r0, [r0]
-	strb r0, [r2]
-	ldr r1, =gBattleCommunication
-	movs r0, 0x2
-	b _0803BD90
-	.pool
-_0803BCF8:
-	ldr r1, =gBattleMons
-	ldr r0, =gActiveBank
-	ldrb r2, [r0]
-	movs r0, 0x58
-	muls r0, r2
-	adds r1, 0x50
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, =0x0400e000
-	ands r0, r1
-	cmp r0, 0
-	bne _0803BD22
-	ldr r1, =gStatuses3
-	lsls r0, r2, 2
-	adds r0, r1
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 3
-	ands r0, r1
-	cmp r0, 0
-	beq _0803BD40
-_0803BD22:
-	ldr r1, =gBattleCommunication
-	movs r0, 0
-	strb r0, [r1, 0x5]
-	movs r0, 0x1
-	b _0803BD92
-	.pool
-_0803BD40:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x10
-	ands r0, r1
-	cmp r0, 0
-	bne _0803BD8C
-_0803BD4C:
-	movs r0, 0
-	b _0803BD92
-	.pool
-_0803BD54:
-	ldr r0, =gBattleScripting
-	strb r5, [r0, 0x17]
-	ldr r1, =gLastUsedAbility
-	ldrb r0, [r2]
-	strb r0, [r1]
-	ldr r1, =gBattleCommunication
-	movs r0, 0x2
-	b _0803BD90
-	.pool
-_0803BD70:
-	ldr r0, =gBattleScripting
-	strb r5, [r0, 0x17]
-	ldr r1, =gLastUsedAbility
-	ldrb r0, [r2]
-	strb r0, [r1]
-	ldr r1, =gBattleCommunication
-	movs r0, 0x2
-	b _0803BD90
-	.pool
-_0803BD8C:
-	ldr r1, =gBattleCommunication
-	movs r0, 0x1
-_0803BD90:
-	strb r0, [r1, 0x5]
-_0803BD92:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end IsRunningFromBattleImpossible
+    
 
 	thumb_func_start sub_803BDA0
 sub_803BDA0: @ 803BDA0
@@ -5907,8 +1895,8 @@ sub_803CEDC: @ 803CEDC
 	.pool
 	thumb_func_end sub_803CEDC
 
-	thumb_func_start b_first_side
-b_first_side: @ 803CF10
+	thumb_func_start GetWhoStrikesFirst
+GetWhoStrikesFirst: @ 803CF10
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -6102,7 +2090,7 @@ _0803D07E:
 _0803D09C:
 	cmp r6, 0x1A
 	bne _0803D0B8
-	ldr r0, =gUnknown_02024330
+	ldr r0, =gRandomTurnNumber
 	ldrh r4, [r0]
 	lsls r0, r5, 16
 	subs r0, r5
@@ -6201,7 +2189,7 @@ _0803D162:
 _0803D17E:
 	cmp r6, 0x1A
 	bne _0803D198
-	ldr r0, =gUnknown_02024330
+	ldr r0, =gRandomTurnNumber
 	ldrh r4, [r0]
 	lsls r0, r5, 16
 	subs r0, r5
@@ -6369,7 +2357,7 @@ _0803D2D6:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end b_first_side
+	thumb_func_end GetWhoStrikesFirst
 
 	thumb_func_start sub_803D2E8
 sub_803D2E8: @ 803D2E8
@@ -6635,7 +2623,7 @@ _0803D4F8:
 	beq _0803D534
 	adds r0, r3, 0
 	movs r2, 0
-	bl b_first_side
+	bl GetWhoStrikesFirst
 	lsls r0, 24
 	cmp r0, 0
 	beq _0803D534
@@ -6678,8 +2666,8 @@ _0803D554:
 	.pool
 	thumb_func_end sub_803D2E8
 
-	thumb_func_start sub_803D580
-sub_803D580: @ 803D580
+	thumb_func_start TurnValuesCleanUp
+TurnValuesCleanUp: @ 803D580
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -6813,10 +2801,10 @@ _0803D678:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_803D580
+	thumb_func_end TurnValuesCleanUp
 
-	thumb_func_start sub_803D6A0
-sub_803D6A0: @ 803D6A0
+	thumb_func_start SpecialStatusesClear
+SpecialStatusesClear: @ 803D6A0
 	push {r4-r6,lr}
 	ldr r2, =gActiveBank
 	movs r0, 0
@@ -6855,7 +2843,7 @@ _0803D6DE:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_803D6A0
+	thumb_func_end SpecialStatusesClear
 
 	thumb_func_start bc_80154A0
 bc_80154A0: @ 803D6F0
@@ -7036,8 +3024,8 @@ _0803D8AC:
 	.pool
 	thumb_func_end bc_bs_exec
 
-	thumb_func_start sub_803D8C0
-sub_803D8C0: @ 803D8C0
+	thumb_func_start HandleEndTurn_BattleWon
+HandleEndTurn_BattleWon: @ 803D8C0
 	push {r4,lr}
 	ldr r1, =gFightStateTracker
 	movs r0, 0
@@ -7200,16 +3188,16 @@ _0803DA9E:
 	str r0, [r1]
 _0803DAA4:
 	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803DCD8
+	ldr r0, =HandleEndTurn_FinishBattle
 	str r0, [r1]
 	pop {r4}
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_803D8C0
+	thumb_func_end HandleEndTurn_BattleWon
 
-	thumb_func_start sub_803DAC0
-sub_803DAC0: @ 803DAC0
+	thumb_func_start HandleEndTurn_BattleLost
+HandleEndTurn_BattleLost: @ 803DAC0
 	push {r4,lr}
 	ldr r1, =gFightStateTracker
 	movs r0, 0
@@ -7279,16 +3267,16 @@ _0803DB7C:
 	str r0, [r1]
 _0803DB82:
 	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803DCD8
+	ldr r0, =HandleEndTurn_FinishBattle
 	str r0, [r1]
 	pop {r4}
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_803DAC0
+	thumb_func_end HandleEndTurn_BattleLost
 
-	thumb_func_start sub_803DBA0
-sub_803DBA0: @ 803DBA0
+	thumb_func_start HandleEndTurn_RanFromBattle
+HandleEndTurn_RanFromBattle: @ 803DBA0
 	push {lr}
 	ldr r1, =gFightStateTracker
 	movs r0, 0
@@ -7363,15 +3351,15 @@ _0803DC68:
 	str r0, [r1]
 _0803DC6A:
 	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803DCD8
+	ldr r0, =HandleEndTurn_FinishBattle
 	str r0, [r1]
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_803DBA0
+	thumb_func_end HandleEndTurn_RanFromBattle
 
-	thumb_func_start bc_80158BC
-bc_80158BC: @ 803DC84
+	thumb_func_start HandleEndTurn_MonFled
+HandleEndTurn_MonFled: @ 803DC84
 	ldr r1, =gFightStateTracker
 	movs r0, 0
 	strb r0, [r1]
@@ -7395,14 +3383,14 @@ bc_80158BC: @ 803DC84
 	ldr r0, =gUnknown_082DAAF7
 	str r0, [r1]
 	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803DCD8
+	ldr r0, =HandleEndTurn_FinishBattle
 	str r0, [r1]
 	bx lr
 	.pool
-	thumb_func_end bc_80158BC
+	thumb_func_end HandleEndTurn_MonFled
 
-	thumb_func_start sub_803DCD8
-sub_803DCD8: @ 803DCD8
+	thumb_func_start HandleEndTurn_FinishBattle
+HandleEndTurn_FinishBattle: @ 803DCD8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -7545,7 +3533,7 @@ _0803DE2A:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_803DCD8
+	thumb_func_end HandleEndTurn_FinishBattle
 
 	thumb_func_start sub_803DE40
 sub_803DE40: @ 803DE40
@@ -8646,11 +4634,11 @@ bs2_8016374: @ 803E868
 	strh r2, [r0]
 	ldr r0, =gBattle_BG0_Y
 	strh r2, [r0]
-	ldr r1, =gUnknown_020244AC
+	ldr r1, =gActionSelectionCursor
 	ldrb r0, [r3]
 	adds r0, r1
 	strb r2, [r0]
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	ldrb r0, [r3]
 	adds r0, r1
 	strb r2, [r0]
@@ -9757,7 +5745,7 @@ bsC_8016D70: @ 803F300
 	adds r0, r1
 	ldrb r0, [r0]
 	strb r0, [r3]
-	bl sub_803D6A0
+	bl SpecialStatusesClear
 	ldr r2, =gHitMarker
 	ldr r0, [r2]
 	ldr r1, =0xf1e892af
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index b47a8ecdf..78236f1d7 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -191,7 +191,7 @@ _080575F0:
 	beq _08057658
 	movs r0, 0x5
 	bl PlaySE
-	ldr r1, =gUnknown_020244AC
+	ldr r1, =gActionSelectionCursor
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	adds r0, r1
@@ -233,7 +233,7 @@ _08057658:
 	ands r0, r2
 	cmp r0, 0
 	beq _08057698
-	ldr r5, =gUnknown_020244AC
+	ldr r5, =gActionSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r0, r5
@@ -261,7 +261,7 @@ _08057698:
 	ands r0, r2
 	cmp r0, 0
 	beq _080576D8
-	ldr r5, =gUnknown_020244AC
+	ldr r5, =gActionSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r0, r5
@@ -290,7 +290,7 @@ _080576D8:
 	ands r0, r2
 	cmp r0, 0
 	beq _08057700
-	ldr r5, =gUnknown_020244AC
+	ldr r5, =gActionSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r0, r5
@@ -306,7 +306,7 @@ _08057700:
 	ands r0, r2
 	cmp r0, 0
 	beq _0805774C
-	ldr r5, =gUnknown_020244AC
+	ldr r5, =gActionSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r0, r5
@@ -508,7 +508,7 @@ _080578A0:
 	adds r0, r2
 	ldr r1, =sub_8039B2C
 	str r1, [r0]
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	adds r0, r1
@@ -664,7 +664,7 @@ _08057A32:
 	muls r0, r1
 	ldr r1, =gPlayerParty
 	adds r0, r1
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	adds r2, r1
 	ldrb r1, [r2]
 	adds r1, 0xD
@@ -792,7 +792,7 @@ _08057B56:
 	muls r0, r1
 	ldr r1, =gPlayerParty
 	adds r0, r1
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	adds r2, r1
 	ldrb r1, [r2]
 	adds r1, 0xD
@@ -890,7 +890,7 @@ _08057C48:
 _08057C58:
 	movs r0, 0x5
 	bl PlaySE
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	adds r0, r1
@@ -977,7 +977,7 @@ _08057D18:
 	movs r0, 0x1
 	add r8, r0
 _08057D24:
-	ldr r0, =gUnknown_020244B0
+	ldr r0, =gMoveSelectionCursor
 	adds r0, r3, r0
 	adds r1, r6, 0
 	adds r1, 0x8
@@ -1008,7 +1008,7 @@ _08057D5A:
 	cmp r0, 0
 	bne _08057D80
 _08057D62:
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	ldrb r0, [r7]
 	adds r0, r1
 	ldrb r2, [r0]
@@ -1095,7 +1095,7 @@ _08057E30:
 	ands r0, r2
 	cmp r0, 0
 	beq _08057E60
-	ldr r4, =gUnknown_020244B0
+	ldr r4, =gMoveSelectionCursor
 	ldrb r0, [r7]
 	adds r2, r0, r4
 	ldrb r1, [r2]
@@ -1119,7 +1119,7 @@ _08057E60:
 	ands r0, r2
 	cmp r0, 0
 	beq _08057EA4
-	ldr r4, =gUnknown_020244B0
+	ldr r4, =gMoveSelectionCursor
 	ldrb r0, [r7]
 	adds r3, r0, r4
 	ldrb r2, [r3]
@@ -1151,7 +1151,7 @@ _08057EA4:
 	ands r0, r2
 	cmp r0, 0
 	beq _08057ED4
-	ldr r4, =gUnknown_020244B0
+	ldr r4, =gMoveSelectionCursor
 	ldrb r0, [r7]
 	adds r2, r0, r4
 	ldrb r1, [r2]
@@ -1173,7 +1173,7 @@ _08057ED4:
 	ands r0, r2
 	cmp r0, 0
 	beq _08057F30
-	ldr r4, =gUnknown_020244B0
+	ldr r4, =gMoveSelectionCursor
 	ldrb r0, [r7]
 	adds r3, r0, r4
 	ldrb r2, [r3]
@@ -1221,7 +1221,7 @@ _08057F30:
 	ands r5, r6
 	cmp r5, 0
 	bne _08057F9E
-	ldr r4, =gUnknown_020244B0
+	ldr r4, =gMoveSelectionCursor
 	ldrb r0, [r7]
 	adds r0, r4
 	ldrb r0, [r0]
@@ -1302,7 +1302,7 @@ _08057FF8:
 	ands r0, r1
 	cmp r0, 0
 	beq _08058038
-	ldr r5, =gUnknown_020244B0
+	ldr r5, =gMoveSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r2, r0, r5
@@ -1333,7 +1333,7 @@ _08058038:
 	ands r0, r1
 	cmp r0, 0
 	beq _08058086
-	ldr r5, =gUnknown_020244B0
+	ldr r5, =gMoveSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r3, r0, r5
@@ -1370,7 +1370,7 @@ _08058086:
 	ands r0, r1
 	cmp r0, 0
 	beq _080580C8
-	ldr r5, =gUnknown_020244B0
+	ldr r5, =gMoveSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r2, r0, r5
@@ -1401,7 +1401,7 @@ _080580C8:
 	ands r0, r1
 	cmp r0, 0
 	beq _08058116
-	ldr r5, =gUnknown_020244B0
+	ldr r5, =gMoveSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r3, r0, r5
@@ -1457,7 +1457,7 @@ sub_8058138: @ 8058138
 _08058152:
 	movs r0, 0x5
 	bl PlaySE
-	ldr r0, =gUnknown_020244B0
+	ldr r0, =gMoveSelectionCursor
 	mov r10, r0
 	ldr r1, =gActiveBank
 	mov r8, r1
@@ -1594,7 +1594,7 @@ _0805824E:
 	adds r6, 0x1
 	cmp r6, 0x3
 	ble _0805824E
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	ldrb r0, [r7]
 	adds r0, r1
 	ldrb r0, [r0]
@@ -1758,7 +1758,7 @@ _08058392:
 	adds r6, 0x1
 	cmp r6, 0x3
 	ble _08058392
-	ldr r4, =gUnknown_020244B0
+	ldr r4, =gMoveSelectionCursor
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
 	adds r0, r4
@@ -1892,7 +1892,7 @@ _080584A8:
 	adds r0, r1
 	ldr r1, =sub_8057BFC
 	str r1, [r0]
-	ldr r3, =gUnknown_020244B0
+	ldr r3, =gMoveSelectionCursor
 	ldrb r0, [r2]
 	adds r0, r3
 	ldr r1, =gUnknown_03005D74
@@ -1915,7 +1915,7 @@ _08058500:
 	ldr r0, =gUnknown_03005D74
 	ldrb r0, [r0]
 	bl battle_menu_cursor_related
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r0, r1
@@ -1947,7 +1947,7 @@ _08058554:
 	bne _0805856A
 	b _080586E8
 _0805856A:
-	ldr r0, =gUnknown_020244B0
+	ldr r0, =gMoveSelectionCursor
 	ldr r1, =gActiveBank
 	ldrb r1, [r1]
 	adds r1, r0
@@ -1990,7 +1990,7 @@ _080585BA:
 	bcc _080585C8
 	b _080586E8
 _080585C8:
-	ldr r0, =gUnknown_020244B0
+	ldr r0, =gMoveSelectionCursor
 	ldr r1, =gActiveBank
 	ldrb r1, [r1]
 	adds r1, r0
@@ -2010,7 +2010,7 @@ _080585E8:
 	ands r0, r2
 	cmp r0, 0
 	beq _080586E8
-	ldr r0, =gUnknown_020244B0
+	ldr r0, =gMoveSelectionCursor
 	ldr r1, =gActiveBank
 	ldrb r1, [r1]
 	adds r1, r0
@@ -2034,7 +2034,7 @@ _0805862C:
 	strb r0, [r4]
 	movs r0, 0x5
 	bl PlaySE
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	adds r0, r1
@@ -2064,7 +2064,7 @@ _0805865C:
 	ldrb r1, [r1]
 	cmp r0, r1
 	bcs _080586E8
-	ldr r0, =gUnknown_020244B0
+	ldr r0, =gMoveSelectionCursor
 	ldr r1, =gActiveBank
 	ldrb r1, [r1]
 	adds r1, r0
@@ -2087,7 +2087,7 @@ _080586AA:
 	strb r0, [r4]
 	movs r0, 0x5
 	bl PlaySE
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	adds r0, r1
@@ -4407,7 +4407,7 @@ sub_8059B3C: @ 8059B3C
 	adds r0, r5, 0x4
 	adds r4, r0
 	ldr r6, =gDisplayedStringBattle
-	ldr r5, =gUnknown_020244B0
+	ldr r5, =gMoveSelectionCursor
 	adds r1, r5
 	adds r0, r4, 0
 	adds r0, 0x8
@@ -4462,7 +4462,7 @@ sub_8059BB0: @ 8059BB0
 	strb r1, [r0]
 	adds r0, 0x1
 	ldr r3, =gBattleMoves
-	ldr r2, =gUnknown_020244B0
+	ldr r2, =gMoveSelectionCursor
 	ldrb r1, [r5]
 	adds r1, r2
 	ldrb r1, [r1]
@@ -6924,11 +6924,11 @@ sub_805B1CC: @ 805B1CC
 	ldr r2, =gPlayerParty
 	adds r0, r2
 	bl sub_805DD7C
-	ldr r1, =gUnknown_020244AC
+	ldr r1, =gActionSelectionCursor
 	ldrb r0, [r5]
 	adds r0, r1
 	strb r4, [r0]
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	ldrb r0, [r5]
 	adds r0, r1
 	strb r4, [r0]
@@ -8543,7 +8543,7 @@ _0805C062:
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _0805C062
-	ldr r1, =gUnknown_020244AC
+	ldr r1, =gActionSelectionCursor
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	adds r0, r1
@@ -8715,7 +8715,7 @@ sub_805C210: @ 805C210
 	ldr r1, =gUnknown_03005D74
 	movs r0, 0xFF
 	strb r0, [r1]
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	adds r0, r1
@@ -10333,21 +10333,21 @@ _0805D054:
 	beq _0805D07C
 	b _0805D084
 _0805D05A:
-	ldr r0, =gUnknown_020244AC
+	ldr r0, =gActionSelectionCursor
 	adds r0, r3, r0
 	strb r2, [r0]
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	ldrb r0, [r4]
 	adds r0, r1
 	strb r2, [r0]
 	b _0805D084
 	.pool
 _0805D074:
-	ldr r0, =gUnknown_020244AC
+	ldr r0, =gActionSelectionCursor
 	b _0805D07E
 	.pool
 _0805D07C:
-	ldr r0, =gUnknown_020244B0
+	ldr r0, =gMoveSelectionCursor
 _0805D07E:
 	adds r0, r3, r0
 	movs r1, 0
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s
index acd716776..26f7ad8f7 100644
--- a/asm/battle_controller_safari.s
+++ b/asm/battle_controller_safari.s
@@ -71,7 +71,7 @@ bx_battle_menu_t6_2: @ 81593D8
 	beq _08159446
 	movs r0, 0x5
 	bl PlaySE
-	ldr r1, =gUnknown_020244AC
+	ldr r1, =gActionSelectionCursor
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	adds r0, r1
@@ -118,7 +118,7 @@ _08159446:
 	ands r0, r1
 	cmp r0, 0
 	beq _08159484
-	ldr r5, =gUnknown_020244AC
+	ldr r5, =gActionSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r0, r5
@@ -144,7 +144,7 @@ _08159484:
 	ands r0, r1
 	cmp r0, 0
 	beq _081594C0
-	ldr r5, =gUnknown_020244AC
+	ldr r5, =gActionSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r0, r5
@@ -170,7 +170,7 @@ _081594C0:
 	ands r0, r1
 	cmp r0, 0
 	beq _0815950C
-	ldr r5, =gUnknown_020244AC
+	ldr r5, =gActionSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r0, r5
@@ -204,7 +204,7 @@ _0815950C:
 	ands r0, r1
 	cmp r0, 0
 	beq _0815954E
-	ldr r5, =gUnknown_020244AC
+	ldr r5, =gActionSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r0, r5
@@ -871,7 +871,7 @@ _08159AAE:
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _08159AAE
-	ldr r1, =gUnknown_020244AC
+	ldr r1, =gActionSelectionCursor
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	adds r0, r1
diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s
index 8291b05fa..629fa308d 100644
--- a/asm/battle_controller_wally.s
+++ b/asm/battle_controller_wally.s
@@ -3685,7 +3685,7 @@ _0816A48A:
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _0816A48A
-	ldr r1, =gUnknown_020244AC
+	ldr r1, =gActionSelectionCursor
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	adds r0, r1
diff --git a/asm/battle_link_817C95C.s b/asm/battle_link_817C95C.s
index 94ae7ad7f..39ae59d8b 100644
--- a/asm/battle_link_817C95C.s
+++ b/asm/battle_link_817C95C.s
@@ -4322,7 +4322,7 @@ _0817EF36:
 	b _0817F1FA
 _0817EF44:
 	ldr r3, =gBattleMoves
-	ldr r2, =gUnknown_020244B0
+	ldr r2, =gMoveSelectionCursor
 	adds r0, r4, r2
 	ldrb r0, [r0]
 	lsls r0, 1
@@ -4514,7 +4514,7 @@ _0817F0B4:
 	ble _0817EFC2
 	movs r5, 0
 	ldr r3, =gBankAttacker
-	ldr r6, =gUnknown_020244B0
+	ldr r6, =gMoveSelectionCursor
 	ldr r4, =gBattlePartyID
 	mov r8, r4
 	movs r7, 0x64
@@ -4624,7 +4624,7 @@ _0817F1D4:
 	b _0817F0CC
 _0817F1DC:
 	ldr r2, =gBattleMoveDamage
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	ldr r0, =gBankAttacker
 	ldrb r0, [r0]
 	adds r0, r1
diff --git a/asm/battle_message.s b/asm/battle_message.s
index 96869a350..c39903dcc 100644
--- a/asm/battle_message.s
+++ b/asm/battle_message.s
@@ -2998,7 +2998,7 @@ sub_814FBAC: @ 814FBAC
 	ldr r0, =gBattleBufferA + 4
 	adds r1, r0
 	ldr r4, =gUnknown_08D85620
-	ldr r0, =gUnknown_020244B0
+	ldr r0, =gMoveSelectionCursor
 	adds r2, r0
 	ldrb r2, [r2]
 	adds r0, r1, 0
diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s
index c7e384a10..d9b679750 100644
--- a/asm/reshow_battle_screen.s
+++ b/asm/reshow_battle_screen.s
@@ -264,7 +264,7 @@ _080A94F8:
 	adds r0, r4, 0
 	bl sub_805EE54
 _080A955C:
-	ldr r1, =gUnknown_020244AC
+	ldr r1, =gActionSelectionCursor
 	ldr r0, =gBankInMenu
 	ldrb r0, [r0]
 	adds r0, r1
diff --git a/asm/rom3.s b/asm/rom3.s
index 23d320474..2e040ff0f 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -47,9 +47,9 @@ SetUpBattleVarsAndBirchZigzagoon: @ 803269C
 	str r0, [sp, 0x10]
 	movs r1, 0
 	ldr r7, =gBattleBankFunc
-	ldr r6, =gUnknown_020244AC
+	ldr r6, =gActionSelectionCursor
 	movs r2, 0
-	ldr r5, =gUnknown_020244B0
+	ldr r5, =gMoveSelectionCursor
 	ldr r4, =nullsub_21
 	ldr r3, =gBanksBySide
 _080326B8:
@@ -222,7 +222,7 @@ b_setup_bx: @ 8032824
 	cmp r5, 0
 	beq _080328E4
 	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_8039ECC
+	ldr r0, =BeginBattleIntro
 	str r0, [r1]
 	movs r4, 0x80
 	lsls r4, 17
@@ -286,7 +286,7 @@ _080328E4:
 	b _080329E0
 _080328F0:
 	ldr r0, =gBattleMainFunc
-	ldr r2, =sub_8039ECC
+	ldr r2, =BeginBattleIntro
 	str r2, [r0]
 	movs r1, 0x80
 	ands r1, r3
@@ -380,7 +380,7 @@ _080329CC:
 	b _08032CB2
 	.pool
 _080329E0:
-	ldr r1, =sub_8039ECC
+	ldr r1, =BeginBattleIntro
 	ldr r2, =gBattleMainFunc
 	str r1, [r2]
 	ldr r2, =gBattleBankFunc
@@ -419,7 +419,7 @@ _08032A20:
 	ands r0, r1
 	cmp r0, r1
 	bne _08032AA0
-	ldr r0, =sub_8039ECC
+	ldr r0, =BeginBattleIntro
 	ldr r1, =gBattleMainFunc
 	str r0, [r1]
 	ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
@@ -751,7 +751,7 @@ b_setup_bx_link: @ 8032CC0
 	cmp r4, 0
 	beq _08032D1C
 	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_8039ECC
+	ldr r0, =BeginBattleIntro
 	str r0, [r1]
 	ldr r2, =gBattleBankFunc
 	ldr r0, =SetBankFuncToPlayerBufferRunCommand
@@ -789,7 +789,7 @@ _08032D48:
 	cmp r3, 0
 	beq _08032D98
 	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_8039ECC
+	ldr r0, =BeginBattleIntro
 	str r0, [r1]
 	ldr r2, =gBattleBankFunc
 	ldr r4, =SetBankFuncToPlayerBufferRunCommand
@@ -840,7 +840,7 @@ _08032DD0:
 	cmp r3, 0
 	beq _08032E1C
 	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_8039ECC
+	ldr r0, =BeginBattleIntro
 	str r0, [r1]
 	ldr r2, =gBattleBankFunc
 	ldr r0, =SetBankFuncToPlayerBufferRunCommand
@@ -904,7 +904,7 @@ _08032E8C:
 	cmp r0, 0
 	beq _08032EA4
 	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_8039ECC
+	ldr r0, =BeginBattleIntro
 	str r0, [r1]
 _08032EA4:
 	movs r0, 0
@@ -2247,8 +2247,8 @@ _0803396C:
 	.pool
 	thumb_func_end sub_8033940
 
-	thumb_func_start dp01_build_cmdbuf_x04_4_4_4
-dp01_build_cmdbuf_x04_4_4_4: @ 8033980
+	thumb_func_start EmitLoadMonSprite
+EmitLoadMonSprite: @ 8033980
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2262,7 +2262,7 @@ dp01_build_cmdbuf_x04_4_4_4: @ 8033980
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp01_build_cmdbuf_x04_4_4_4
+	thumb_func_end EmitLoadMonSprite
 
 	thumb_func_start EmitSwitchInAnim
 EmitSwitchInAnim: @ 80339A0
@@ -2301,8 +2301,8 @@ EmitReturnPokeToBall: @ 80339C4
 	.pool
 	thumb_func_end EmitReturnPokeToBall
 
-	thumb_func_start dp01_build_cmdbuf_x07_7_7_7
-dp01_build_cmdbuf_x07_7_7_7: @ 80339E4
+	thumb_func_start EmitDrawTrainerPic
+EmitDrawTrainerPic: @ 80339E4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2317,7 +2317,7 @@ dp01_build_cmdbuf_x07_7_7_7: @ 80339E4
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp01_build_cmdbuf_x07_7_7_7
+	thumb_func_end EmitDrawTrainerPic
 
 	thumb_func_start EmitTrainerSlide
 EmitTrainerSlide: @ 8033A04
@@ -3532,8 +3532,8 @@ EmitFaintingCry: @ 803432C
 	.pool
 	thumb_func_end EmitFaintingCry
 
-	thumb_func_start dp01_build_cmdbuf_x2E_a
-dp01_build_cmdbuf_x2E_a: @ 803434C
+	thumb_func_start EmitIntroSlide
+EmitIntroSlide: @ 803434C
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -3547,10 +3547,10 @@ dp01_build_cmdbuf_x2E_a: @ 803434C
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp01_build_cmdbuf_x2E_a
+	thumb_func_end EmitIntroSlide
 
-	thumb_func_start dp01_build_cmdbuf_x2F_2F_2F_2F
-dp01_build_cmdbuf_x2F_2F_2F_2F: @ 803436C
+	thumb_func_start EmitIntroTrainerBallThrow
+EmitIntroTrainerBallThrow: @ 803436C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3565,10 +3565,10 @@ dp01_build_cmdbuf_x2F_2F_2F_2F: @ 803436C
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp01_build_cmdbuf_x2F_2F_2F_2F
+	thumb_func_end EmitIntroTrainerBallThrow
 
-	thumb_func_start EmitCmd48
-EmitCmd48: @ 803438C
+	thumb_func_start EmitDrawPartyStatusSummary
+EmitDrawPartyStatusSummary: @ 803438C
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -3604,7 +3604,7 @@ _080343B4:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end EmitCmd48
+	thumb_func_end EmitDrawPartyStatusSummary
 
 	thumb_func_start EmitCmd49
 EmitCmd49: @ 80343D4
diff --git a/include/battle.h b/include/battle.h
index afb3c8d6e..e5e5a94d1 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -54,6 +54,7 @@
 #define BATTLE_TYPE_GROUDON         0x10000000
 #define BATTLE_TYPE_KYORGE          0x20000000
 #define BATTLE_TYPE_RAYQUAZA        0x40000000
+#define BATTLE_TYPE_x80000000       0x80000000
 
 #define TRAINER_OPPONENT_C00        0xC00
 #define TRAINER_OPPONENT_800        0x800
@@ -178,6 +179,9 @@
 #define ABILITYEFFECT_COUNT_BANK_SIDE           0x11
 #define ABILITYEFFECT_COUNT_ON_FIELD            0x12
 #define ABILITYEFFECT_CHECK_ON_FIELD            0x13
+#define ABILITYEFFECT_SWITCH_IN_WEATHER         0xFF
+
+#define ITEMEFFECT_ON_SWITCH_IN                 0x0
 
 #define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0)))
 
@@ -228,6 +232,7 @@
 #define MOVE_EFFECT_BYTE        0x3
 #define MULTISTRING_CHOOSER     0x5
 #define MSG_DISPLAY             0x7
+#define BATTLE_COMMUNICATION_ENTRIES_COUNT  0x8
 
 #define MOVE_TARGET_SELECTED        0x0
 #define MOVE_TARGET_DEPENDS         0x1
@@ -556,7 +561,7 @@ struct BattleResults
     u16 caughtMonSpecies;     // 0x28
     u8 caughtMonNick[10];     // 0x2A
     u8 filler34[2];
-    u8 catchAttempts[10];     // 0x36
+    u8 catchAttempts[12];     // 0x36
 };
 
 extern struct BattleResults gBattleResults;
@@ -587,7 +592,7 @@ struct BattleStruct
     u8 field_49;
     u8 moneyMultiplier;
     u8 field_4B;
-    u8 field_4C;
+    u8 switchInAbilitiesCounter;
     u8 field_4D;
     u8 field_4E;
     u8 field_4F;
@@ -650,7 +655,7 @@ struct BattleStruct
     u16 choicedMove[BATTLE_BANKS_COUNT];
     u16 changedItems[BATTLE_BANKS_COUNT];
     u8 intimidateBank;
-    u8 fillerD9[0xDA-0xD9];
+    u8 switchInItemsCounter;
     u8 field_DA;
     u8 turnSideTracker;
     u8 fillerDC[0xDF-0xDC];
@@ -664,7 +669,7 @@ struct BattleStruct
     struct BattleEnigmaBerry battleEnigmaBerry;
     u8 field_1A0;
     u8 field_1A1;
-    u8 filler1A2;
+    bool8 overworldWeatherDone;
     u8 atkCancellerTracker;
     u8 field_1A4[240];
     u8 field_294[4];
@@ -845,7 +850,7 @@ struct BattleScripting
     u8 statChanger;
     u8 field_1B;
     u8 atk23_state;
-    u8 field_1D;
+    u8 battleStyle;
     u8 atk6C_state;
     u8 learnMoveState;
     u8 field_20;
@@ -874,9 +879,9 @@ void CancelMultiTurnMoves(u8 bank);
 void PressurePPLose(u8 bankAtk, u8 bankDef, u16 move);
 void PrepareStringBattle(u16 stringId, u8 bank);
 u8 GetBattleBank(u8 caseId);
-void UndoEffectsAfterFainting(void);
+void FaintClearSetData(void);
 bool8 HasMoveFailed(u8 bank);
-void SwitchInClearStructs(void);
+void SwitchInClearSetData(void);
 void sub_803BDA0(u8 bank);
 void sub_803FA70(u8 bank);
 void BattleMainCB2(void);
@@ -886,6 +891,9 @@ bool8 CanRunFromBattle(u8 bank);
 bool8 IsRunningFromBattleImpossible(void);
 void PressurePPLoseOnUsingPerishSong(u8 bankAtk);
 void PressurePPLoseOnUsingImprision(u8 bankAtk);
+u8 GetWhoStrikesFirst(u8 bankAtk, u8 bankDef, bool8 ignoreChosenMoves);
+void sub_803CEDC(u8, u8);
+void BattleTurnPassed(void);
 
 // battle_3
 #define MOVE_LIMITATION_ZEROMOVE    (1 << 0)
@@ -971,10 +979,28 @@ struct BattleAnimationInfo
     u16 field; // to fill up later
 };
 
+struct BattleHealthboxInfo
+{
+    u8 flag_x1 : 1;
+    u8 flag_x2 : 1;
+    u8 flag_x4 : 1;
+    u8 field_1;
+    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;
+};
+
 struct BattleSpriteData
 {
     struct BattleSpriteInfo *bankData;
-    void* field_4;
+    struct BattleHealthboxInfo *healthBoxesData;
     struct BattleAnimationInfo *animationData;
 };
 
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index b2846d7cf..61e8bec29 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -47,11 +47,15 @@ void EmitTrainerSlideBack(u8 bufferId);
 void EmitFaintingCry(u8 bufferId);
 void Emit_x37(u8 bufferId, u8 arg1);
 void EmitHitAnimation(u8 bufferId);
-void EmitCmd48(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2);
+void EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2);
 void EmitCmd49(u8 bufferId);
 void EmitStatusAnimation(u8 bufferId, bool8 status2, u32 status);
 void EmitCmd13(u8 bufferId);
 void EmitStatusIconUpdate(u8 bufferId, u32 status1, u32 status2);
+void EmitIntroSlide(u8 bufferId, u8 terrainId);
+void EmitDrawTrainerPic(u8 bufferId);
+void EmitLoadMonSprite(u8 bufferId);
+void EmitIntroTrainerBallThrow(u8 bufferId);
 
 #define RESET_ACTION_MOVE_SELECTION     0
 #define RESET_ACTION_SELECTION          1
diff --git a/include/pokemon.h b/include/pokemon.h
index 4b678d679..b3155881e 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -633,10 +633,12 @@ s32 sub_806D864(u16 a1);
 bool16 sub_806D82C(u8 id);
 u16 MonTryLearningNewMove(struct Pokemon* mon, bool8);
 void sub_8068AA4(void); // sets stats for deoxys
+bool8 HasTwoFramesAnimation(u16 species);
 
 #include "sprite.h"
 
 void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3);
 void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3);
+void BattleAnimateBackSprite(struct Sprite* sprite, u16 species);
 
 #endif // GUARD_POKEMON_H
diff --git a/include/recorded_battle.h b/include/recorded_battle.h
index 5f3099d83..2040f2b8a 100644
--- a/include/recorded_battle.h
+++ b/include/recorded_battle.h
@@ -9,6 +9,7 @@ void RecordedBattle_SetBankAction(u8 bank, u8 action);
 void sub_8185F90(u16 arg0);
 bool8 sub_8186450(void);
 u8 sub_8185FAC(void);
+u8 sub_8185FB8(void);
 u8 MoveRecordedBattleToSaveData(void);
 
 #endif // GUARD_RECORDED_BATTLE_H
diff --git a/include/sprite.h b/include/sprite.h
index 838b0d7c0..a9377165e 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -212,14 +212,14 @@ struct Sprite
              u16 flags_5:1;             //0x20
              u16 flags_6:1;             //0x40
              u16 flags_7:1;             //0x80
-    /*0x3F*/ u16 hFlip:1;
-             u16 vFlip:1;
-             u16 animBeginning:1;
-             u16 affineAnimBeginning:1;
-             u16 animEnded:1;
-             u16 affineAnimEnded:1;
-             u16 usingSheet:1;
-             u16 flags_f:1;
+    /*0x3F*/ u16 hFlip:1;               //1
+             u16 vFlip:1;               //2
+             u16 animBeginning:1;       //4
+             u16 affineAnimBeginning:1; //8
+             u16 animEnded:1;           //0x10
+             u16 affineAnimEnded:1;     //0x20
+             u16 usingSheet:1;          //0x40
+             u16 flags_f:1;             //0x80
 
     /*0x40*/ u16 sheetTileStart;
 
diff --git a/src/battle_2.c b/src/battle_2.c
index 8d1f6a7a1..769723c24 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -13,6 +13,7 @@
 #include "species.h"
 #include "berry.h"
 #include "text.h"
+#include "item.h"
 #include "items.h"
 #include "hold_effects.h"
 #include "link.h"
@@ -28,6 +29,13 @@
 #include "sound.h"
 #include "battle_message.h"
 #include "sprite.h"
+#include "util.h"
+#include "trig.h"
+#include "battle_ai_script_commands.h"
+#include "battle_move_effects.h"
+#include "battle_controllers.h"
+#include "pokedex.h"
+#include "abilities.h"
 
 struct UnknownStruct6
 {
@@ -70,6 +78,7 @@ extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
 extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
 extern void (*gPreBattleCallback1)(void);
+extern void (*gBattleMainFunc)(void);
 extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for?
 extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for?
 extern u8 gBattleOutcome;
@@ -80,12 +89,56 @@ extern struct MusicPlayerInfo gMPlay_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 gNoOfAllBanks;
+extern u8 gBankAttacker;
+extern u8 gBankTarget;
+extern u8 gLeveledUpInBattle;
+extern u8 gAbsentBankFlags;
+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 gUnknown_02024250[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 gUnknown_02024284[BATTLE_BANKS_COUNT];
+extern u32 gStatuses3[BATTLE_BANKS_COUNT];
+extern u16 gSideAffecting[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 gTurnOrder[BATTLE_BANKS_COUNT];
+extern u8 gActionForBanks[BATTLE_BANKS_COUNT];
+extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
+extern u8 gFightStateTracker;
+extern u8 gLastUsedAbility;
 
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 extern const struct BattleMove gBattleMoves[];
 extern const u16 gUnknown_08C004E0[]; // battle textbox palette
 extern const struct BgTemplate gUnknown_0831AA08[];
 extern const struct WindowTemplate * const gUnknown_0831ABA0[];
+extern const u8 gUnknown_0831ACE0[];
 
 // strings
 extern const u8 gText_LinkStandby3[];
@@ -94,6 +147,11 @@ 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[];
+
+// battlescripts
+extern const u8 gUnknown_082DB8BE[];
+extern const u8 gUnknown_082DB881[];
 
 extern void HandleLinkBattleSetup(void); // rom_3
 extern void SetUpBattleVarsAndBirchZigzagoon(void); // rom_3
@@ -109,6 +167,7 @@ extern void sub_800AC34(void);
 extern void sub_80B3AF8(u8 taskId); // cable club
 extern void sub_8076918(u8 bank);
 extern void sub_80729D0(u8 healthoxSpriteId);
+extern void sub_81A56B4(void); // battle frontier 2
 
 // this file's functions
 static void CB2_InitBattleInternal(void);
@@ -133,6 +192,28 @@ static void sub_8039894(struct Sprite *sprite);
 static void sub_80398D0(struct Sprite *sprite);
 static void sub_8039A48(struct Sprite *sprite);
 void sub_8039AF4(struct Sprite *sprite);
+void sub_8039E9C(struct Sprite *sprite);
+void SpriteCallbackDummy_3(struct Sprite *sprite);
+void oac_poke_ally_(struct Sprite *sprite);
+void SpecialStatusesClear(void);
+void TurnValuesCleanUp(u8);
+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);
+void sub_803BE74(void);
+void bc_bs_exec(void);
 
 void CB2_InitBattle(void)
 {
@@ -2244,10 +2325,6 @@ static void sub_80398BC(struct Sprite *sprite) // unused?
     sprite->callback = sub_80398D0;
 }
 
-extern u32 gUnknown_02022F88;
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
-
 static void sub_80398D0(struct Sprite *sprite)
 {
     sprite->data4--;
@@ -2372,3 +2449,1290 @@ void sub_8039B2C(struct Sprite *sprite)
     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_;
+}
+
+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->data1 = 0;
+        }
+    }
+}
+
+void sub_80105DC(struct Sprite *sprite)
+{
+    sprite->callback = SpriteCallbackDummy_3;
+}
+
+void SpriteCallbackDummy_3(struct Sprite *sprite)
+{
+}
+
+void sub_8039C00(struct Sprite *sprite)
+{
+    if (!(gUnknown_020243FC & 1))
+    {
+        sprite->pos2.x += sprite->data1;
+        sprite->pos2.y += sprite->data2;
+    }
+}
+
+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].data0 = 0x80;
+    }
+    else
+    {
+        spriteId2 = gBankSpriteIds[bank];
+        gBattleSpritesDataPtr->healthBoxesData[bank].field_3 = bounceHealthBoxSpriteId;
+        gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4 = 1;
+        gSprites[bounceHealthBoxSpriteId].data0 = 0xC0;
+    }
+    gSprites[bounceHealthBoxSpriteId].data1 = c;
+    gSprites[bounceHealthBoxSpriteId].data2 = d;
+    gSprites[bounceHealthBoxSpriteId].data3 = spriteId2;
+    gSprites[bounceHealthBoxSpriteId].data4 = 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].data3;
+        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].data3;
+        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->data3;
+    s32 var;
+
+    if (sprite->data4 == 1)
+        var = sprite->data0;
+    else
+        var = sprite->data0;
+
+    gSprites[spriteId].pos2.y = Sin(var, sprite->data2) + sprite->data2;
+    sprite->data0 = (sprite->data0 + sprite->data1) & 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;
+}
+
+void BattleMainCB1(void)
+{
+    gBattleMainFunc();
+
+    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        gBattleBankFunc[gActiveBank]();
+}
+
+static void BattleStartClearSetData(void)
+{
+    s32 i;
+    u32 j;
+    u8 *dataPtr;
+
+    TurnValuesCleanUp(0);
+    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;
+        gLastUsedMovesByBanks[i] = 0;
+        gUnknown_02024250[i] = 0;
+        gUnknown_02024258[i] = 0;
+        gUnknown_02024260[i] = 0;
+        gUnknown_02024270[i] = 0xFF;
+        gLockedMoves[i] = 0;
+        gUnknownMovesUsedByBanks[i] = 0;
+        gBattleResources->flags->flags[i] = 0;
+        gUnknown_02024230[i] = 0;
+    }
+
+    for (i = 0; i < 2; i++)
+    {
+        gSideAffecting[i] = 0;
+
+        dataPtr = (u8 *)&gSideTimers[i];
+        for (j = 0; j < sizeof(struct SideTimer); j++)
+            dataPtr[j] = 0;
+    }
+
+    gBankAttacker = 0;
+    gBankTarget = 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)) && sub_8185FB8())
+        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->field_6C = 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 < 4; i++)
+    {
+        *(gBattleStruct->field_294 + 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 < gNoOfAllBanks; 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 < gNoOfAllBanks; 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 < gNoOfAllBanks; 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].perishSong1 = disableStructCopy.perishSong1;
+        gDisableStructs[gActiveBank].perishSong2 = disableStructCopy.perishSong2;
+        gDisableStructs[gActiveBank].bankPreventingEscape = disableStructCopy.bankPreventingEscape;
+    }
+
+    gBattleMoveFlags = 0;
+    gDisableStructs[gActiveBank].isFirstTurn= 2;
+    gDisableStructs[gActiveBank].truantUnknownBit = disableStructCopy.truantUnknownBit;
+    gLastUsedMovesByBanks[gActiveBank] = 0;
+    gUnknown_02024250[gActiveBank] = 0;
+    gUnknown_02024258[gActiveBank] = 0;
+    gUnknown_02024260[gActiveBank] = 0;
+    gUnknownMovesUsedByBanks[gActiveBank] = 0;
+    gUnknown_02024270[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 < gNoOfAllBanks; 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 < gNoOfAllBanks; 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].notEffective = 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;
+
+    gLastUsedMovesByBanks[gActiveBank] = 0;
+    gUnknown_02024250[gActiveBank] = 0;
+    gUnknown_02024258[gActiveBank] = 0;
+    gUnknown_02024260[gActiveBank] = 0;
+    gUnknownMovesUsedByBanks[gActiveBank] = 0;
+    gUnknown_02024270[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 < gNoOfAllBanks; 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] == gNoOfAllBanks)
+                gBattleMainFunc = BattleIntroPrepareBackgroundSlide;
+            else
+                gBattleCommunication[MULTIUSE_STATE] = 0;
+        }
+        break;
+    }
+}
+
+static void BattleIntroPrepareBackgroundSlide(void)
+{
+    if (gBattleExecBuffer == 0)
+    {
+        gActiveBank = GetBankByIdentity(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 < gNoOfAllBanks; 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 (GetBankIdentity(gActiveBank) == IDENTITY_PLAYER_MON1)
+        {
+            EmitDrawTrainerPic(0);
+            MarkBufferBankForExecution(gActiveBank);
+        }
+
+        if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+        {
+            if (GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON1)
+            {
+                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 (GetBankIdentity(gActiveBank) == IDENTITY_PLAYER_MON2
+             || GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON2)
+            {
+                EmitDrawTrainerPic(0);
+                MarkBufferBankForExecution(gActiveBank);
+            }
+        }
+
+        if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS && GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON2)
+        {
+            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 < 6; 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 = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+        EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
+        MarkBufferBankForExecution(gActiveBank);
+
+        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);
+            }
+        }
+        gActiveBank = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+        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 = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+        PrepareStringBattle(0, gActiveBank);
+        gBattleMainFunc = BattleIntroPrintOpponentSendsOut;
+    }
+}
+
+static void BattleIntroPrintWildMonAttacked(void)
+{
+    if (gBattleExecBuffer == 0)
+    {
+        gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
+        PrepareStringBattle(0, 0);
+    }
+}
+
+static void BattleIntroPrintOpponentSendsOut(void)
+{
+    u32 identity;
+
+    if (gBattleExecBuffer)
+        return;
+
+    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+        identity = IDENTITY_OPPONENT_MON1;
+    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
+            identity = IDENTITY_OPPONENT_MON1;
+        else
+            identity = IDENTITY_PLAYER_MON1;
+    }
+    else
+        identity = IDENTITY_OPPONENT_MON1;
+
+    PrepareStringBattle(1, GetBankByIdentity(identity));
+    gBattleMainFunc = BattleIntroOpponent1SendsOutMonAnimation;
+}
+
+static void BattleIntroOpponent2SendsOutMonAnimation(void)
+{
+    u32 identity;
+
+    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+        identity = IDENTITY_OPPONENT_MON2;
+    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
+            identity = IDENTITY_OPPONENT_MON2;
+        else
+            identity = IDENTITY_PLAYER_MON2;
+    }
+    else
+        identity = IDENTITY_OPPONENT_MON2;
+
+    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    {
+        if (GetBankIdentity(gActiveBank) == identity)
+        {
+            EmitIntroTrainerBallThrow(0);
+            MarkBufferBankForExecution(gActiveBank);
+        }
+    }
+
+    gBattleMainFunc = BattleIntroRecordMonsToDex;
+}
+
+#ifdef NONMATCHING
+static void BattleIntroOpponent1SendsOutMonAnimation(void)
+{
+    u32 identity;
+
+    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+        identity = IDENTITY_OPPONENT_MON1;
+    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
+            identity = IDENTITY_OPPONENT_MON1;
+        else
+            identity = IDENTITY_PLAYER_MON1;
+    }
+    else
+        identity = IDENTITY_OPPONENT_MON1;
+
+    if (gBattleExecBuffer)
+        return;
+
+    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    {
+        if (GetBankIdentity(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, =gNoOfAllBanks\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 GetBankIdentity\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, =gNoOfAllBanks\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 < gNoOfAllBanks; 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 = IDENTITY_PLAYER_MON1;
+        else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
+        {
+            if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
+                identity = IDENTITY_PLAYER_MON1;
+            else
+                identity = IDENTITY_OPPONENT_MON1;
+        }
+        else
+            identity = IDENTITY_PLAYER_MON1;
+
+        if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
+            PrepareStringBattle(1, GetBankByIdentity(identity));
+
+        gBattleMainFunc = BattleIntroPlayer1SendsOutMonAnimation;
+    }
+}
+
+static void BattleIntroPlayer2SendsOutMonAnimation(void)
+{
+    u32 identity;
+
+    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+        identity = IDENTITY_PLAYER_MON2;
+    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
+            identity = IDENTITY_PLAYER_MON2;
+        else
+            identity = IDENTITY_OPPONENT_MON2;
+    }
+    else
+        identity = IDENTITY_PLAYER_MON2;
+
+    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    {
+        if (GetBankIdentity(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 = IDENTITY_PLAYER_MON1;
+    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
+            identity = IDENTITY_PLAYER_MON1;
+        else
+            identity = IDENTITY_OPPONENT_MON1;
+    }
+    else
+        identity = IDENTITY_PLAYER_MON1;
+
+    if (gBattleExecBuffer)
+        return;
+
+    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    {
+        if (GetBankIdentity(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 < gNoOfAllBanks; 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 < gNoOfAllBanks; i++)
+            gTurnOrder[i] = i;
+        for (i = 0; i < gNoOfAllBanks - 1; i++)
+        {
+            for (j = i + 1; j < gNoOfAllBanks; j++)
+            {
+                if (GetWhoStrikesFirst(gTurnOrder[i], gTurnOrder[j], TRUE) != 0)
+                    sub_803CEDC(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 < gNoOfAllBanks)
+    {
+        if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gTurnOrder[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 < gNoOfAllBanks)
+    {
+        if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gTurnOrder[gBattleStruct->switchInItemsCounter], 0) != 0)
+            effect++;
+
+        gBattleStruct->switchInItemsCounter++;
+
+        if (effect)
+            return;
+    }
+    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    {
+        *(gBattleStruct->field_5C + i) = 6;
+        gActionForBanks[i] = 0xFF;
+        gChosenMovesByBanks[i] = 0;
+    }
+    TurnValuesCleanUp(0);
+    SpecialStatusesClear();
+    *(&gBattleStruct->field_91) = gAbsentBankFlags;
+    sub_814F9EC(gText_EmptyString3, 0);
+    gBattleMainFunc = sub_803BE74;
+    ResetSentPokesToOpponentValue();
+
+    for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; i++)
+        gBattleCommunication[i] = 0;
+
+    for (i = 0; i < gNoOfAllBanks; i++)
+        gBattleMons[i].status2 &= ~(STATUS2_FLINCHED);
+
+    *(&gBattleStruct->turnEffectsTracker) = 0;
+    *(&gBattleStruct->turnEffectsBank) = 0;
+    *(&gBattleStruct->field_1A0) = 0;
+    *(&gBattleStruct->field_1A1) = 0;
+    gBattleScripting.atk49_state = 0;
+    gBattleStruct->field_4D = 0;
+    gBattleStruct->turncountersTracker = 0;
+    gBattleMoveFlags = 0;
+
+    gRandomTurnNumber = Random();
+
+    if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
+    {
+        StopCryAndClearCrySongs();
+        BattleScriptExecute(gUnknown_082DB8BE);
+    }
+}
+
+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 < gNoOfAllBanks; i++)
+        {
+            gBattleMons[i].status2 &= ~(STATUS2_FLINCHED);
+            if ((gBattleMons[i].status1 & STATUS_SLEEP) && (gBattleMons[i].status2 & STATUS2_MULTIPLETURNS))
+                CancelMultiTurnMoves(i);
+        }
+        gBattleStruct->turnEffectsTracker = 0;
+        gBattleStruct->turnEffectsBank = 0;
+        gBattleStruct->field_1A0 = 0;
+        gBattleStruct->field_1A1 = 0;
+        gBattleStruct->turncountersTracker = 0;
+        gBattleMoveFlags = 0;
+    }
+}
+
+void BattleTurnPassed(void)
+{
+    s32 i;
+
+    TurnValuesCleanUp(1);
+    if (gBattleOutcome == 0)
+    {
+        if (UpdateTurnCounters() != 0)
+            return;
+        if (TurnBasedEffects() != 0)
+            return;
+    }
+    if (sub_8041728() != 0)
+        return;
+    gBattleStruct->field_4D = 0;
+    if (sub_8041364() != 0)
+        return;
+
+    TurnValuesCleanUp(0);
+    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;
+    gBattleMoveFlags = 0;
+
+    for (i = 0; i < 5; i++)
+        gBattleCommunication[i] = 0;
+
+    if (gBattleOutcome != 0)
+    {
+        gFightStateTracker = 12;
+        gBattleMainFunc = bc_bs_exec;
+        return;
+    }
+
+    if (gBattleResults.battleTurnCounter < 0xFF)
+    {
+        gBattleResults.battleTurnCounter++;
+        gBattleStruct->field_DA++;
+    }
+
+    for (i = 0; i < gNoOfAllBanks; i++)
+    {
+        gActionForBanks[i] = 0xFF;
+        gChosenMovesByBanks[i] = 0;
+    }
+
+    for (i = 0; i < 4; i++)
+        *(gBattleStruct->field_5C + i) = 6;
+
+    *(&gBattleStruct->field_91) = gAbsentBankFlags;
+    sub_814F9EC(gText_EmptyString3, 0);
+    gBattleMainFunc = sub_803BE74;
+    gRandomTurnNumber = Random();
+
+    if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
+        BattleScriptExecute(gUnknown_082DB881);
+    else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->field_DA == 0)
+        BattleScriptExecute(gUnknown_082DB8BE);
+}
+
+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 < gNoOfAllBanks; 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;
+}
diff --git a/src/battle_3.c b/src/battle_3.c
index e42d9317d..071e4d59d 100644
--- a/src/battle_3.c
+++ b/src/battle_3.c
@@ -178,9 +178,6 @@ extern const u8 gStatusConditionString_ConfusionJpn[];
 extern const u8 gStatusConditionString_LoveJpn[];
 extern const u16 gSoundMovesTable[];
 
-extern u8 b_first_side(u8, u8, u8);
-extern void sub_803CEDC(u8, u8);
-extern void BattleTurnPassed(void);
 extern void sub_803F9EC();
 extern bool8 sub_80423F4(u8 bank, u8, u8);
 extern u8 weather_get_current(void);
@@ -414,7 +411,7 @@ u8 UpdateTurnCounters(void)
                 s32 j;
                 for (j = i + 1; j < gNoOfAllBanks; j++)
                 {
-                    if (b_first_side(gTurnOrder[i], gTurnOrder[j], 0))
+                    if (GetWhoStrikesFirst(gTurnOrder[i], gTurnOrder[j], 0))
                         sub_803CEDC(i, j);
                 }
             }
@@ -1667,7 +1664,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 gBankAttacker = bank;
             switch (gLastUsedAbility)
             {
-            case 0xFF: //weather from overworld
+            case ABILITYEFFECT_SWITCH_IN_WEATHER:
             //_08042A86
                 switch (weather_get_current())
                 {
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index dae43f13c..92126e40c 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -73,7 +73,7 @@ extern const struct BaseStats gBaseStats[];
 extern const u32 gBitTable[];
 extern u8 * const gBattleAI_ScriptsTable[];
 
-extern u8 b_first_side(u8, u8, u8);
+extern u8 GetWhoStrikesFirst(u8, u8, u8);
 extern void AI_CalcDmg(u8, u8);
 
 extern u8 CheckMoveLimitations();
@@ -1756,7 +1756,7 @@ static void BattleAICmd_if_arg_not_equal(void)
 
 static void BattleAICmd_if_would_go_first(void)
 {
-    if (b_first_side(sBank_AI, gBankTarget, 1) == gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(sBank_AI, gBankTarget, 1) == gAIScriptPtr[1])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
@@ -1764,7 +1764,7 @@ static void BattleAICmd_if_would_go_first(void)
 
 static void BattleAICmd_if_would_not_go_first(void)
 {
-    if (b_first_side(sBank_AI, gBankTarget, 1) != gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(sBank_AI, gBankTarget, 1) != gAIScriptPtr[1])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 03e1b6a4a..88c62841d 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -360,7 +360,7 @@ static void atk5D_getmoneyreward(void);
 static void atk5E_8025A70(void);
 static void atk5F_8025B24(void);
 static void atk60_increment_gamestat(void);
-static void atk61_8025BA4(void);
+static void atk61_draw_party_status_summary(void);
 static void atk62_08025C6C(void);
 static void atk63_jumptorandomattack(void);
 static void atk64_statusanimation(void);
@@ -612,7 +612,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atk5E_8025A70,
     atk5F_8025B24,
     atk60_increment_gamestat,
-    atk61_8025BA4,
+    atk61_draw_party_status_summary,
     atk62_08025C6C,
     atk63_jumptorandomattack,
     atk64_statusanimation,
@@ -3251,7 +3251,7 @@ static void atk1B_faint_effects_clear(void)
             MarkBufferBankForExecution(gActiveBank);
         }
 
-        UndoEffectsAfterFainting(); // Effects like attractions, trapping, etc.
+        FaintClearSetData(); // Effects like attractions, trapping, etc.
         gBattlescriptCurrInstr += 2;
     }
 }
@@ -5366,7 +5366,7 @@ static void atk4D_switch_data_update(void)
         gBattleMons[gActiveBank].status2 = oldData.status2;
     }
 
-    SwitchInClearStructs();
+    SwitchInClearSetData();
 
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE && gBattleMons[gActiveBank].maxHP / 2 >= gBattleMons[gActiveBank].hp
         && gBattleMons[gActiveBank].hp != 0 && !(gBattleMons[gActiveBank].status1 & STATUS_SLEEP))
@@ -6411,7 +6411,7 @@ static void atk60_increment_gamestat(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk61_8025BA4(void)
+static void atk61_draw_party_status_summary(void)
 {
     s32 i;
     struct Pokemon* party;
@@ -6442,7 +6442,7 @@ static void atk61_8025BA4(void)
         }
     }
 
-    EmitCmd48(0, hpStatuses, 1);
+    EmitDrawPartyStatusSummary(0, hpStatuses, 1);
     MarkBufferBankForExecution(gActiveBank);
 
     gBattlescriptCurrInstr += 2;
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index e4934306c..5ff99aee2 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1519,8 +1519,6 @@ void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u
         DoMonFrontSpriteAnimation(sprite, species, noCry, arg3);
 }
 
-bool8 HasTwoFramesAnimation(u16 species);
-
 extern void SpriteCallbackDummy_2(struct Sprite*);
 extern void sub_817F60C(struct Sprite*);
 
diff --git a/sym_ewram.txt b/sym_ewram.txt
index aecb28dac..287bc4a5d 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -445,7 +445,7 @@ gPauseCounterBattle: @ 202432C
 gPaydayMoney: @ 202432E
 	.space 0x2
 
-gUnknown_02024330: @ 2024330
+gRandomTurnNumber: @ 2024330
 	.space 0x2
 
 gBattleCommunication: @ 2024332
@@ -499,10 +499,10 @@ gUnknown_020244A4: @ 20244A4
 gBattleResources: @ 20244A8
 	.space 0x4
 
-gUnknown_020244AC: @ 20244AC
+gActionSelectionCursor: @ 20244AC
 	.space 0x4
 
-gUnknown_020244B0: @ 20244B0
+gMoveSelectionCursor: @ 20244B0
 	.space 0x4
 
 gUnknown_020244B4: @ 20244B4

From d43b6227bb5a81a4479ad0ecc33d661910c85d74 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 2 Oct 2017 20:53:58 -0400
Subject: [PATCH 22/42] Rip tileset anims

---
 data/tileset.s                                | 304 ++++++++----------
 data/tilesets/primary/building/anim/0.png     | Bin 0 -> 141 bytes
 data/tilesets/primary/building/anim/1.png     | Bin 0 -> 144 bytes
 data/tilesets/primary/general/anim/0/0.png    | Bin 0 -> 183 bytes
 data/tilesets/primary/general/anim/0/1.png    | Bin 0 -> 182 bytes
 data/tilesets/primary/general/anim/0/2.png    | Bin 0 -> 183 bytes
 data/tilesets/primary/general/anim/1/0.png    | Bin 0 -> 518 bytes
 data/tilesets/primary/general/anim/1/1.png    | Bin 0 -> 581 bytes
 data/tilesets/primary/general/anim/1/2.png    | Bin 0 -> 534 bytes
 data/tilesets/primary/general/anim/1/3.png    | Bin 0 -> 527 bytes
 data/tilesets/primary/general/anim/1/4.png    | Bin 0 -> 461 bytes
 data/tilesets/primary/general/anim/1/5.png    | Bin 0 -> 460 bytes
 data/tilesets/primary/general/anim/1/6.png    | Bin 0 -> 480 bytes
 data/tilesets/primary/general/anim/1/7.png    | Bin 0 -> 521 bytes
 data/tilesets/primary/general/anim/2/0.png    | Bin 0 -> 194 bytes
 data/tilesets/primary/general/anim/2/1.png    | Bin 0 -> 243 bytes
 data/tilesets/primary/general/anim/2/2.png    | Bin 0 -> 262 bytes
 data/tilesets/primary/general/anim/2/3.png    | Bin 0 -> 280 bytes
 data/tilesets/primary/general/anim/2/4.png    | Bin 0 -> 232 bytes
 data/tilesets/primary/general/anim/2/5.png    | Bin 0 -> 220 bytes
 data/tilesets/primary/general/anim/2/6.png    | Bin 0 -> 203 bytes
 data/tilesets/primary/general/anim/3/0.png    | Bin 0 -> 136 bytes
 data/tilesets/primary/general/anim/3/1.png    | Bin 0 -> 154 bytes
 data/tilesets/primary/general/anim/3/2.png    | Bin 0 -> 133 bytes
 data/tilesets/primary/general/anim/3/3.png    | Bin 0 -> 130 bytes
 data/tilesets/primary/general/anim/4/0.png    | Bin 0 -> 304 bytes
 data/tilesets/primary/general/anim/4/1.png    | Bin 0 -> 311 bytes
 data/tilesets/primary/general/anim/4/2.png    | Bin 0 -> 314 bytes
 data/tilesets/primary/general/anim/4/3.png    | Bin 0 -> 328 bytes
 data/tilesets/primary/general/tiles.png       | Bin 7587 -> 7786 bytes
 .../primary/inside_building/tiles.png         | Bin 1556 -> 1813 bytes
 data/tilesets/primary/secret_base/tiles.png   | Bin 7136 -> 7869 bytes
 .../primary/secret_base/unknown_tiles.png     | Bin 1212 -> 1316 bytes
 .../tilesets/secondary/battle_arena/tiles.png | Bin 2067 -> 2340 bytes
 data/tilesets/secondary/battle_dome/tiles.png | Bin 3193 -> 3626 bytes
 .../secondary/battle_factory/tiles.png        | Bin 3313 -> 3694 bytes
 .../secondary/battle_frontier/tiles.png       | Bin 2368 -> 2647 bytes
 .../battle_frontier_outside_east/anim/0.png   | Bin 0 -> 191 bytes
 .../battle_frontier_outside_east/anim/1.png   | Bin 0 -> 188 bytes
 .../battle_frontier_outside_east/anim/2.png   | Bin 0 -> 185 bytes
 .../battle_frontier_outside_east/anim/3.png   | Bin 0 -> 183 bytes
 .../battle_frontier_outside_east/tiles.png    | Bin 3750 -> 3834 bytes
 .../battle_frontier_outside_west/anim/0.png   | Bin 0 -> 191 bytes
 .../battle_frontier_outside_west/anim/1.png   | Bin 0 -> 188 bytes
 .../battle_frontier_outside_west/anim/2.png   | Bin 0 -> 185 bytes
 .../battle_frontier_outside_west/anim/3.png   | Bin 0 -> 183 bytes
 .../battle_frontier_outside_west/tiles.png    | Bin 5505 -> 5892 bytes
 .../battle_frontier_ranking_hall/tiles.png    | Bin 1451 -> 1700 bytes
 .../secondary/battle_palace/tiles.png         | Bin 1513 -> 1633 bytes
 data/tilesets/secondary/battle_pike/tiles.png | Bin 3922 -> 4013 bytes
 .../secondary/battle_pyramid/anim/0/0.png     | Bin 0 -> 228 bytes
 .../secondary/battle_pyramid/anim/0/1.png     | Bin 0 -> 220 bytes
 .../secondary/battle_pyramid/anim/0/2.png     | Bin 0 -> 219 bytes
 .../secondary/battle_pyramid/anim/1/0.png     | Bin 0 -> 261 bytes
 .../secondary/battle_pyramid/anim/1/1.png     | Bin 0 -> 267 bytes
 .../secondary/battle_pyramid/anim/1/2.png     | Bin 0 -> 261 bytes
 .../secondary/battle_pyramid/anim/1/3.png     | Bin 0 -> 105 bytes
 .../secondary/battle_pyramid/anim/1/4.png     | Bin 0 -> 86 bytes
 .../secondary/battle_pyramid/anim/1/5.png     | Bin 0 -> 86 bytes
 .../secondary/battle_pyramid/anim/1/6.png     | Bin 0 -> 106 bytes
 .../secondary/battle_pyramid/anim/1/7.png     | Bin 0 -> 393 bytes
 .../secondary/battle_pyramid/anim/1/8.png     | Bin 0 -> 105 bytes
 .../secondary/battle_pyramid/anim/1/9.png     | Bin 0 -> 111 bytes
 .../secondary/battle_pyramid/tiles.png        | Bin 3208 -> 3504 bytes
 data/tilesets/secondary/battle_tent/tiles.png | Bin 1696 -> 2084 bytes
 data/tilesets/secondary/bike_shop/anim/0.png  | Bin 0 -> 250 bytes
 data/tilesets/secondary/bike_shop/anim/1.png  | Bin 0 -> 249 bytes
 data/tilesets/secondary/bike_shop/anim/2.png  | Bin 0 -> 219 bytes
 data/tilesets/secondary/bike_shop/tiles.png   | Bin 3270 -> 3505 bytes
 .../secondary/brendans_mays_house/tiles.png   | Bin 2616 -> 3074 bytes
 data/tilesets/secondary/cable_club/tiles.png  | Bin 2445 -> 2590 bytes
 .../secondary/cable_club/unknown_tiles.png    | Bin 287 -> 311 bytes
 data/tilesets/secondary/cave/anim/0.png       | Bin 0 -> 100 bytes
 data/tilesets/secondary/cave/anim/1.png       | Bin 0 -> 126 bytes
 data/tilesets/secondary/cave/anim/2.png       | Bin 0 -> 108 bytes
 data/tilesets/secondary/cave/anim/3.png       | Bin 0 -> 109 bytes
 .../tilesets/secondary/cave/anim/unused/0.png | Bin 0 -> 100 bytes
 .../tilesets/secondary/cave/anim/unused/1.png | Bin 0 -> 121 bytes
 .../tilesets/secondary/cave/anim/unused/2.png | Bin 0 -> 108 bytes
 .../tilesets/secondary/cave/anim/unused/3.png | Bin 0 -> 105 bytes
 data/tilesets/secondary/cave/tiles.png        | Bin 5767 -> 5884 bytes
 data/tilesets/secondary/contest/tiles.png     | Bin 1638 -> 1650 bytes
 data/tilesets/secondary/dewford/anim/0.png    | Bin 0 -> 185 bytes
 data/tilesets/secondary/dewford/anim/1.png    | Bin 0 -> 185 bytes
 data/tilesets/secondary/dewford/anim/2.png    | Bin 0 -> 185 bytes
 data/tilesets/secondary/dewford/anim/3.png    | Bin 0 -> 192 bytes
 data/tilesets/secondary/dewford/tiles.png     | Bin 3756 -> 3985 bytes
 data/tilesets/secondary/dewford_gym/tiles.png | Bin 598 -> 640 bytes
 .../secondary/elite_four/anim/0/0.png         | Bin 0 -> 91 bytes
 .../secondary/elite_four/anim/0/1.png         | Bin 0 -> 91 bytes
 .../secondary/elite_four/anim/0/2.png         | Bin 0 -> 91 bytes
 .../secondary/elite_four/anim/0/3.png         | Bin 0 -> 91 bytes
 .../secondary/elite_four/anim/1/0.png         | Bin 0 -> 135 bytes
 .../secondary/elite_four/anim/1/1.png         | Bin 0 -> 72 bytes
 .../secondary/elite_four/anim/1/2.png         | Bin 0 -> 1260 bytes
 .../secondary/elite_four/anim/1/3.png         | Bin 0 -> 1184 bytes
 .../secondary/elite_four/anim/1/4.png         | Bin 0 -> 1190 bytes
 .../secondary/elite_four/anim/1/5.png         | Bin 0 -> 1248 bytes
 .../secondary/elite_four/anim/1/6.png         | Bin 0 -> 1161 bytes
 .../secondary/elite_four/anim/1/7.png         | Bin 0 -> 1153 bytes
 data/tilesets/secondary/elite_four/tiles.png  | Bin 2826 -> 2876 bytes
 .../tilesets/secondary/ever_grande/anim/0.png | Bin 0 -> 204 bytes
 .../tilesets/secondary/ever_grande/anim/1.png | Bin 0 -> 204 bytes
 .../tilesets/secondary/ever_grande/anim/2.png | Bin 0 -> 197 bytes
 .../tilesets/secondary/ever_grande/anim/3.png | Bin 0 -> 200 bytes
 .../tilesets/secondary/ever_grande/anim/4.png | Bin 0 -> 204 bytes
 .../tilesets/secondary/ever_grande/anim/5.png | Bin 0 -> 204 bytes
 .../tilesets/secondary/ever_grande/anim/6.png | Bin 0 -> 201 bytes
 .../tilesets/secondary/ever_grande/anim/7.png | Bin 0 -> 201 bytes
 data/tilesets/secondary/ever_grande/tiles.png | Bin 2088 -> 2208 bytes
 data/tilesets/secondary/facility/tiles.png    | Bin 5753 -> 6352 bytes
 data/tilesets/secondary/fallarbor/tiles.png   | Bin 4602 -> 4781 bytes
 data/tilesets/secondary/fortree/tiles.png     | Bin 4364 -> 4342 bytes
 data/tilesets/secondary/fortree_gym/tiles.png | Bin 771 -> 770 bytes
 .../secondary/generic_building/tiles.png      | Bin 4949 -> 5607 bytes
 .../secondary/inside_of_truck/tiles.png       | Bin 514 -> 545 bytes
 data/tilesets/secondary/inside_ship/tiles.png | Bin 2016 -> 2149 bytes
 .../secondary/island_harbor/tiles.png         | Bin 5093 -> 5639 bytes
 data/tilesets/secondary/lab/tiles.png         | Bin 2592 -> 2844 bytes
 data/tilesets/secondary/lavaridge/anim/0.png  | Bin 0 -> 83 bytes
 data/tilesets/secondary/lavaridge/anim/1.png  | Bin 0 -> 92 bytes
 data/tilesets/secondary/lavaridge/anim/2.png  | Bin 0 -> 88 bytes
 data/tilesets/secondary/lavaridge/anim/3.png  | Bin 0 -> 100 bytes
 data/tilesets/secondary/lavaridge/tiles.png   | Bin 4087 -> 4215 bytes
 .../secondary/lavaridge_gym/tiles.png         | Bin 631 -> 713 bytes
 data/tilesets/secondary/lilycove/tiles.png    | Bin 3597 -> 3912 bytes
 .../secondary/lilycove_museum/tiles.png       | Bin 3345 -> 3938 bytes
 .../secondary/mauville/anim/0/a/0.png         | Bin 0 -> 177 bytes
 .../secondary/mauville/anim/0/a/1.png         | Bin 0 -> 175 bytes
 .../secondary/mauville/anim/0/a/2.png         | Bin 0 -> 171 bytes
 .../secondary/mauville/anim/0/a/3.png         | Bin 0 -> 160 bytes
 .../secondary/mauville/anim/0/a/4.png         | Bin 0 -> 178 bytes
 .../secondary/mauville/anim/0/a/5.png         | Bin 0 -> 177 bytes
 .../secondary/mauville/anim/0/a/6.png         | Bin 0 -> 175 bytes
 .../secondary/mauville/anim/0/a/7.png         | Bin 0 -> 171 bytes
 .../secondary/mauville/anim/0/a/8.png         | Bin 0 -> 160 bytes
 .../secondary/mauville/anim/0/a/9.png         | Bin 0 -> 178 bytes
 .../secondary/mauville/anim/0/b/0.png         | Bin 0 -> 177 bytes
 .../secondary/mauville/anim/0/b/1.png         | Bin 0 -> 175 bytes
 .../secondary/mauville/anim/0/b/2.png         | Bin 0 -> 171 bytes
 .../secondary/mauville/anim/0/b/3.png         | Bin 0 -> 160 bytes
 .../secondary/mauville/anim/0/b/4.png         | Bin 0 -> 72 bytes
 .../secondary/mauville/anim/0/b/5.png         | Bin 0 -> 72 bytes
 .../secondary/mauville/anim/0/b/6.png         | Bin 0 -> 72 bytes
 .../secondary/mauville/anim/0/b/7.png         | Bin 0 -> 72 bytes
 .../secondary/mauville/anim/1/a/0.png         | Bin 0 -> 177 bytes
 .../secondary/mauville/anim/1/a/1.png         | Bin 0 -> 178 bytes
 .../secondary/mauville/anim/1/a/2.png         | Bin 0 -> 171 bytes
 .../secondary/mauville/anim/1/a/3.png         | Bin 0 -> 160 bytes
 .../secondary/mauville/anim/1/b/0.png         | Bin 0 -> 177 bytes
 .../secondary/mauville/anim/1/b/1.png         | Bin 0 -> 178 bytes
 .../secondary/mauville/anim/1/b/2.png         | Bin 0 -> 171 bytes
 .../secondary/mauville/anim/1/b/3.png         | Bin 0 -> 160 bytes
 .../secondary/mauville/anim/1/b/4.png         | Bin 0 -> 100 bytes
 .../secondary/mauville/anim/1/b/5.png         | Bin 0 -> 121 bytes
 .../secondary/mauville/anim/1/b/6.png         | Bin 0 -> 108 bytes
 .../secondary/mauville/anim/1/b/7.png         | Bin 0 -> 105 bytes
 data/tilesets/secondary/mauville/tiles.png    | Bin 6019 -> 6372 bytes
 .../secondary/mauville_game_corner/tiles.png  | Bin 1567 -> 1788 bytes
 .../secondary/mauville_gym/anim/0.png         | Bin 0 -> 215 bytes
 .../secondary/mauville_gym/anim/1.png         | Bin 0 -> 218 bytes
 .../secondary/mauville_gym/anim/2.png         | Bin 0 -> 106 bytes
 .../secondary/mauville_gym/anim/3.png         | Bin 0 -> 393 bytes
 .../tilesets/secondary/mauville_gym/tiles.png | Bin 1454 -> 1534 bytes
 .../tilesets/secondary/meteor_falls/tiles.png | Bin 5968 -> 6078 bytes
 .../tilesets/secondary/mirage_tower/tiles.png | Bin 5561 -> 5645 bytes
 data/tilesets/secondary/mossdeep/tiles.png    | Bin 4060 -> 4269 bytes
 .../secondary/mossdeep_game_corner/tiles.png  | Bin 838 -> 893 bytes
 .../tilesets/secondary/mossdeep_gym/tiles.png | Bin 927 -> 969 bytes
 .../secondary/mystery_events_house/tiles.png  | Bin 4799 -> 5383 bytes
 data/tilesets/secondary/navel_rock/tiles.png  | Bin 5966 -> 6073 bytes
 .../secondary/oceanic_museum/tiles.png        | Bin 2662 -> 3219 bytes
 .../secondary/pacifidlog/anim/0/0.png         | Bin 0 -> 596 bytes
 .../secondary/pacifidlog/anim/0/1.png         | Bin 0 -> 603 bytes
 .../secondary/pacifidlog/anim/0/2.png         | Bin 0 -> 625 bytes
 .../secondary/pacifidlog/anim/1/0.png         | Bin 0 -> 198 bytes
 .../secondary/pacifidlog/anim/1/1.png         | Bin 0 -> 219 bytes
 .../secondary/pacifidlog/anim/1/2.png         | Bin 0 -> 241 bytes
 .../secondary/pacifidlog/anim/1/3.png         | Bin 0 -> 213 bytes
 .../secondary/pacifidlog/anim/1/4.png         | Bin 0 -> 138 bytes
 .../secondary/pacifidlog/anim/1/5.png         | Bin 0 -> 140 bytes
 .../secondary/pacifidlog/anim/1/6.png         | Bin 0 -> 138 bytes
 .../secondary/pacifidlog/anim/1/7.png         | Bin 0 -> 200 bytes
 data/tilesets/secondary/pacifidlog/tiles.png  | Bin 4688 -> 4812 bytes
 data/tilesets/secondary/petalburg/tiles.png   | Bin 1689 -> 1910 bytes
 .../secondary/petalburg_gym/tiles.png         | Bin 1222 -> 1429 bytes
 .../secondary/pokemon_center/tiles.png        | Bin 3461 -> 3645 bytes
 .../secondary/pokemon_day_care/tiles.png      | Bin 1451 -> 1528 bytes
 .../secondary/pokemon_fan_club/tiles.png      | Bin 1242 -> 1373 bytes
 .../secondary/pokemon_school/tiles.png        | Bin 980 -> 1027 bytes
 .../pretty_petal_flower_shop/tiles.png        | Bin 1839 -> 1951 bytes
 data/tilesets/secondary/rustboro/anim/0/0.png | Bin 0 -> 119 bytes
 data/tilesets/secondary/rustboro/anim/0/1.png | Bin 0 -> 113 bytes
 data/tilesets/secondary/rustboro/anim/0/2.png | Bin 0 -> 72 bytes
 data/tilesets/secondary/rustboro/anim/0/3.png | Bin 0 -> 72 bytes
 data/tilesets/secondary/rustboro/anim/0/4.png | Bin 0 -> 72 bytes
 data/tilesets/secondary/rustboro/anim/0/5.png | Bin 0 -> 72 bytes
 data/tilesets/secondary/rustboro/anim/0/6.png | Bin 0 -> 72 bytes
 data/tilesets/secondary/rustboro/anim/0/7.png | Bin 0 -> 72 bytes
 data/tilesets/secondary/rustboro/anim/1/0.png | Bin 0 -> 201 bytes
 data/tilesets/secondary/rustboro/anim/1/1.png | Bin 0 -> 198 bytes
 data/tilesets/secondary/rustboro/anim/1/2.png | Bin 0 -> 185 bytes
 data/tilesets/secondary/rustboro/anim/1/3.png | Bin 0 -> 192 bytes
 data/tilesets/secondary/rustboro/tiles.png    | Bin 3903 -> 4108 bytes
 .../tilesets/secondary/rustboro_gym/tiles.png | Bin 759 -> 768 bytes
 .../secondary/rusturf_tunnel/tiles.png        | Bin 2127 -> 2228 bytes
 .../secondary/seashore_house/tiles.png        | Bin 1105 -> 1280 bytes
 .../secondary/secret_base/blue_cave/tiles.png | Bin 904 -> 905 bytes
 .../secret_base/blue_cave/unused_tiles.png    | Bin 0 -> 903 bytes
 .../secret_base/brown_cave/tiles.png          | Bin 1070 -> 1166 bytes
 .../secret_base/brown_cave/unused_tiles.png   | Bin 0 -> 1163 bytes
 .../secondary/secret_base/red_cave/tiles.png  | Bin 941 -> 941 bytes
 .../secret_base/red_cave/unused_tiles.png     | Bin 0 -> 938 bytes
 .../secondary/secret_base/shrub/tiles.png     | Bin 1090 -> 1177 bytes
 .../secret_base/shrub/unused_tiles.png        | Bin 0 -> 1173 bytes
 .../secondary/secret_base/tree/tiles.png      | Bin 1056 -> 1098 bytes
 .../secret_base/tree/unused_tiles.png         | Bin 0 -> 1095 bytes
 .../secret_base/yellow_cave/tiles.png         | Bin 1127 -> 1127 bytes
 .../secret_base/yellow_cave/unused_tiles.png  | Bin 0 -> 1125 bytes
 data/tilesets/secondary/shop/tiles.png        | Bin 3872 -> 4416 bytes
 data/tilesets/secondary/slateport/anim/0.png  | Bin 0 -> 179 bytes
 data/tilesets/secondary/slateport/anim/1.png  | Bin 0 -> 181 bytes
 data/tilesets/secondary/slateport/anim/2.png  | Bin 0 -> 179 bytes
 data/tilesets/secondary/slateport/anim/3.png  | Bin 0 -> 181 bytes
 data/tilesets/secondary/slateport/tiles.png   | Bin 6528 -> 6985 bytes
 data/tilesets/secondary/sootopolis/anim/0.png | Bin 0 -> 1201 bytes
 data/tilesets/secondary/sootopolis/anim/1.png | Bin 0 -> 1262 bytes
 data/tilesets/secondary/sootopolis/anim/2.png | Bin 0 -> 1260 bytes
 data/tilesets/secondary/sootopolis/anim/3.png | Bin 0 -> 1184 bytes
 data/tilesets/secondary/sootopolis/anim/4.png | Bin 0 -> 1190 bytes
 data/tilesets/secondary/sootopolis/anim/5.png | Bin 0 -> 1248 bytes
 data/tilesets/secondary/sootopolis/anim/6.png | Bin 0 -> 1161 bytes
 data/tilesets/secondary/sootopolis/anim/7.png | Bin 0 -> 1153 bytes
 data/tilesets/secondary/sootopolis/tiles.png  | Bin 2674 -> 2950 bytes
 .../secondary/sootopolis_gym/anim/0/0.png     | Bin 0 -> 286 bytes
 .../secondary/sootopolis_gym/anim/0/1.png     | Bin 0 -> 283 bytes
 .../secondary/sootopolis_gym/anim/0/2.png     | Bin 0 -> 294 bytes
 .../secondary/sootopolis_gym/anim/0/3.png     | Bin 0 -> 91 bytes
 .../secondary/sootopolis_gym/anim/1/0.png     | Bin 0 -> 389 bytes
 .../secondary/sootopolis_gym/anim/1/1.png     | Bin 0 -> 408 bytes
 .../secondary/sootopolis_gym/anim/1/2.png     | Bin 0 -> 399 bytes
 .../secondary/sootopolis_gym/tiles.png        | Bin 2780 -> 2954 bytes
 .../tilesets/secondary/trainer_hill/tiles.png | Bin 3311 -> 3594 bytes
 .../secondary/trick_house_puzzle/tiles.png    | Bin 2567 -> 2797 bytes
 data/tilesets/secondary/underwater/anim/0.png | Bin 0 -> 180 bytes
 data/tilesets/secondary/underwater/anim/1.png | Bin 0 -> 183 bytes
 data/tilesets/secondary/underwater/anim/2.png | Bin 0 -> 185 bytes
 data/tilesets/secondary/underwater/anim/3.png | Bin 0 -> 184 bytes
 data/tilesets/secondary/underwater/tiles.png  | Bin 2988 -> 2846 bytes
 data/tilesets/secondary/union_room/tiles.png  | Bin 1710 -> 1817 bytes
 data/tilesets/secondary/unused_1/0.png        | Bin 0 -> 86 bytes
 data/tilesets/secondary/unused_1/1.png        | Bin 0 -> 86 bytes
 data/tilesets/secondary/unused_1/2.png        | Bin 0 -> 106 bytes
 data/tilesets/secondary/unused_1/3.png        | Bin 0 -> 393 bytes
 data/tilesets/secondary/unused_1/tiles.png    | Bin 80 -> 77 bytes
 data/tilesets/secondary/unused_2/0.png        | Bin 0 -> 105 bytes
 data/tilesets/secondary/unused_2/1.png        | Bin 0 -> 111 bytes
 data/tilesets/secondary/unused_2/2.png        | Bin 0 -> 108 bytes
 data/tilesets/secondary/unused_2/3.png        | Bin 0 -> 105 bytes
 data/tilesets/secondary/unused_2/tiles.png    | Bin 864 -> 979 bytes
 260 files changed, 135 insertions(+), 169 deletions(-)
 create mode 100644 data/tilesets/primary/building/anim/0.png
 create mode 100644 data/tilesets/primary/building/anim/1.png
 create mode 100644 data/tilesets/primary/general/anim/0/0.png
 create mode 100644 data/tilesets/primary/general/anim/0/1.png
 create mode 100644 data/tilesets/primary/general/anim/0/2.png
 create mode 100644 data/tilesets/primary/general/anim/1/0.png
 create mode 100644 data/tilesets/primary/general/anim/1/1.png
 create mode 100644 data/tilesets/primary/general/anim/1/2.png
 create mode 100644 data/tilesets/primary/general/anim/1/3.png
 create mode 100644 data/tilesets/primary/general/anim/1/4.png
 create mode 100644 data/tilesets/primary/general/anim/1/5.png
 create mode 100644 data/tilesets/primary/general/anim/1/6.png
 create mode 100644 data/tilesets/primary/general/anim/1/7.png
 create mode 100644 data/tilesets/primary/general/anim/2/0.png
 create mode 100644 data/tilesets/primary/general/anim/2/1.png
 create mode 100644 data/tilesets/primary/general/anim/2/2.png
 create mode 100644 data/tilesets/primary/general/anim/2/3.png
 create mode 100644 data/tilesets/primary/general/anim/2/4.png
 create mode 100644 data/tilesets/primary/general/anim/2/5.png
 create mode 100644 data/tilesets/primary/general/anim/2/6.png
 create mode 100644 data/tilesets/primary/general/anim/3/0.png
 create mode 100644 data/tilesets/primary/general/anim/3/1.png
 create mode 100644 data/tilesets/primary/general/anim/3/2.png
 create mode 100644 data/tilesets/primary/general/anim/3/3.png
 create mode 100644 data/tilesets/primary/general/anim/4/0.png
 create mode 100644 data/tilesets/primary/general/anim/4/1.png
 create mode 100644 data/tilesets/primary/general/anim/4/2.png
 create mode 100644 data/tilesets/primary/general/anim/4/3.png
 create mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/0.png
 create mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/1.png
 create mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/2.png
 create mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/3.png
 create mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/0.png
 create mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/1.png
 create mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/2.png
 create mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/3.png
 create mode 100644 data/tilesets/secondary/battle_pyramid/anim/0/0.png
 create mode 100644 data/tilesets/secondary/battle_pyramid/anim/0/1.png
 create mode 100644 data/tilesets/secondary/battle_pyramid/anim/0/2.png
 create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/0.png
 create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/1.png
 create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/2.png
 create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/3.png
 create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/4.png
 create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/5.png
 create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/6.png
 create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/7.png
 create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/8.png
 create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/9.png
 create mode 100644 data/tilesets/secondary/bike_shop/anim/0.png
 create mode 100644 data/tilesets/secondary/bike_shop/anim/1.png
 create mode 100644 data/tilesets/secondary/bike_shop/anim/2.png
 create mode 100644 data/tilesets/secondary/cave/anim/0.png
 create mode 100644 data/tilesets/secondary/cave/anim/1.png
 create mode 100644 data/tilesets/secondary/cave/anim/2.png
 create mode 100644 data/tilesets/secondary/cave/anim/3.png
 create mode 100644 data/tilesets/secondary/cave/anim/unused/0.png
 create mode 100644 data/tilesets/secondary/cave/anim/unused/1.png
 create mode 100644 data/tilesets/secondary/cave/anim/unused/2.png
 create mode 100644 data/tilesets/secondary/cave/anim/unused/3.png
 create mode 100644 data/tilesets/secondary/dewford/anim/0.png
 create mode 100644 data/tilesets/secondary/dewford/anim/1.png
 create mode 100644 data/tilesets/secondary/dewford/anim/2.png
 create mode 100644 data/tilesets/secondary/dewford/anim/3.png
 create mode 100644 data/tilesets/secondary/elite_four/anim/0/0.png
 create mode 100644 data/tilesets/secondary/elite_four/anim/0/1.png
 create mode 100644 data/tilesets/secondary/elite_four/anim/0/2.png
 create mode 100644 data/tilesets/secondary/elite_four/anim/0/3.png
 create mode 100644 data/tilesets/secondary/elite_four/anim/1/0.png
 create mode 100644 data/tilesets/secondary/elite_four/anim/1/1.png
 create mode 100644 data/tilesets/secondary/elite_four/anim/1/2.png
 create mode 100644 data/tilesets/secondary/elite_four/anim/1/3.png
 create mode 100644 data/tilesets/secondary/elite_four/anim/1/4.png
 create mode 100644 data/tilesets/secondary/elite_four/anim/1/5.png
 create mode 100644 data/tilesets/secondary/elite_four/anim/1/6.png
 create mode 100644 data/tilesets/secondary/elite_four/anim/1/7.png
 create mode 100644 data/tilesets/secondary/ever_grande/anim/0.png
 create mode 100644 data/tilesets/secondary/ever_grande/anim/1.png
 create mode 100644 data/tilesets/secondary/ever_grande/anim/2.png
 create mode 100644 data/tilesets/secondary/ever_grande/anim/3.png
 create mode 100644 data/tilesets/secondary/ever_grande/anim/4.png
 create mode 100644 data/tilesets/secondary/ever_grande/anim/5.png
 create mode 100644 data/tilesets/secondary/ever_grande/anim/6.png
 create mode 100644 data/tilesets/secondary/ever_grande/anim/7.png
 create mode 100644 data/tilesets/secondary/lavaridge/anim/0.png
 create mode 100644 data/tilesets/secondary/lavaridge/anim/1.png
 create mode 100644 data/tilesets/secondary/lavaridge/anim/2.png
 create mode 100644 data/tilesets/secondary/lavaridge/anim/3.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/a/0.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/a/1.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/a/2.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/a/3.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/a/4.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/a/5.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/a/6.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/a/7.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/a/8.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/a/9.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/b/0.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/b/1.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/b/2.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/b/3.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/b/4.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/b/5.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/b/6.png
 create mode 100644 data/tilesets/secondary/mauville/anim/0/b/7.png
 create mode 100644 data/tilesets/secondary/mauville/anim/1/a/0.png
 create mode 100644 data/tilesets/secondary/mauville/anim/1/a/1.png
 create mode 100644 data/tilesets/secondary/mauville/anim/1/a/2.png
 create mode 100644 data/tilesets/secondary/mauville/anim/1/a/3.png
 create mode 100644 data/tilesets/secondary/mauville/anim/1/b/0.png
 create mode 100644 data/tilesets/secondary/mauville/anim/1/b/1.png
 create mode 100644 data/tilesets/secondary/mauville/anim/1/b/2.png
 create mode 100644 data/tilesets/secondary/mauville/anim/1/b/3.png
 create mode 100644 data/tilesets/secondary/mauville/anim/1/b/4.png
 create mode 100644 data/tilesets/secondary/mauville/anim/1/b/5.png
 create mode 100644 data/tilesets/secondary/mauville/anim/1/b/6.png
 create mode 100644 data/tilesets/secondary/mauville/anim/1/b/7.png
 create mode 100644 data/tilesets/secondary/mauville_gym/anim/0.png
 create mode 100644 data/tilesets/secondary/mauville_gym/anim/1.png
 create mode 100644 data/tilesets/secondary/mauville_gym/anim/2.png
 create mode 100644 data/tilesets/secondary/mauville_gym/anim/3.png
 create mode 100644 data/tilesets/secondary/pacifidlog/anim/0/0.png
 create mode 100644 data/tilesets/secondary/pacifidlog/anim/0/1.png
 create mode 100644 data/tilesets/secondary/pacifidlog/anim/0/2.png
 create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/0.png
 create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/1.png
 create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/2.png
 create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/3.png
 create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/4.png
 create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/5.png
 create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/6.png
 create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/7.png
 create mode 100644 data/tilesets/secondary/rustboro/anim/0/0.png
 create mode 100644 data/tilesets/secondary/rustboro/anim/0/1.png
 create mode 100644 data/tilesets/secondary/rustboro/anim/0/2.png
 create mode 100644 data/tilesets/secondary/rustboro/anim/0/3.png
 create mode 100644 data/tilesets/secondary/rustboro/anim/0/4.png
 create mode 100644 data/tilesets/secondary/rustboro/anim/0/5.png
 create mode 100644 data/tilesets/secondary/rustboro/anim/0/6.png
 create mode 100644 data/tilesets/secondary/rustboro/anim/0/7.png
 create mode 100644 data/tilesets/secondary/rustboro/anim/1/0.png
 create mode 100644 data/tilesets/secondary/rustboro/anim/1/1.png
 create mode 100644 data/tilesets/secondary/rustboro/anim/1/2.png
 create mode 100644 data/tilesets/secondary/rustboro/anim/1/3.png
 create mode 100644 data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png
 create mode 100644 data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png
 create mode 100644 data/tilesets/secondary/secret_base/red_cave/unused_tiles.png
 create mode 100644 data/tilesets/secondary/secret_base/shrub/unused_tiles.png
 create mode 100644 data/tilesets/secondary/secret_base/tree/unused_tiles.png
 create mode 100644 data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png
 create mode 100644 data/tilesets/secondary/slateport/anim/0.png
 create mode 100644 data/tilesets/secondary/slateport/anim/1.png
 create mode 100644 data/tilesets/secondary/slateport/anim/2.png
 create mode 100644 data/tilesets/secondary/slateport/anim/3.png
 create mode 100644 data/tilesets/secondary/sootopolis/anim/0.png
 create mode 100644 data/tilesets/secondary/sootopolis/anim/1.png
 create mode 100644 data/tilesets/secondary/sootopolis/anim/2.png
 create mode 100644 data/tilesets/secondary/sootopolis/anim/3.png
 create mode 100644 data/tilesets/secondary/sootopolis/anim/4.png
 create mode 100644 data/tilesets/secondary/sootopolis/anim/5.png
 create mode 100644 data/tilesets/secondary/sootopolis/anim/6.png
 create mode 100644 data/tilesets/secondary/sootopolis/anim/7.png
 create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/0/0.png
 create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/0/1.png
 create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/0/2.png
 create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/0/3.png
 create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/1/0.png
 create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/1/1.png
 create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/1/2.png
 create mode 100644 data/tilesets/secondary/underwater/anim/0.png
 create mode 100644 data/tilesets/secondary/underwater/anim/1.png
 create mode 100644 data/tilesets/secondary/underwater/anim/2.png
 create mode 100644 data/tilesets/secondary/underwater/anim/3.png
 create mode 100644 data/tilesets/secondary/unused_1/0.png
 create mode 100644 data/tilesets/secondary/unused_1/1.png
 create mode 100644 data/tilesets/secondary/unused_1/2.png
 create mode 100644 data/tilesets/secondary/unused_1/3.png
 create mode 100644 data/tilesets/secondary/unused_2/0.png
 create mode 100644 data/tilesets/secondary/unused_2/1.png
 create mode 100644 data/tilesets/secondary/unused_2/2.png
 create mode 100644 data/tilesets/secondary/unused_2/3.png

diff --git a/data/tileset.s b/data/tileset.s
index b8a0ca77f..0ca02d41c 100644
--- a/data/tileset.s
+++ b/data/tileset.s
@@ -5,50 +5,48 @@
 	.align 2, 0
 
 gUnknown_085105C4::
-	.incbin "baserom.gba", 0x5105c4, 0x80
+	.incbin "data/tilesets/primary/general/anim/0/1.4bpp"
 
 gUnknown_08510644::
-	.incbin "baserom.gba", 0x510644, 0x80
+	.incbin "data/tilesets/primary/general/anim/0/0.4bpp"
 
 gUnknown_085106C4::
-	.incbin "baserom.gba", 0x5106c4, 0x80
+	.incbin "data/tilesets/primary/general/anim/0/2.4bpp"
 
 	.space 0x20
 
 gTilesetAnims_General0:: @ 8510764
-@ replacing .incbin "baserom.gba", 0x00510764, 0x10
 	.4byte gUnknown_08510644
 	.4byte gUnknown_085105C4
 	.4byte gUnknown_08510644
 	.4byte gUnknown_085106C4
 
 gUnknown_08510774::
-	.incbin "baserom.gba", 0x510774, 0x3c0
+	.incbin "data/tilesets/primary/general/anim/1/0.4bpp"
 
 gUnknown_08510B34::
-	.incbin "baserom.gba", 0x510b34, 0x3c0
+	.incbin "data/tilesets/primary/general/anim/1/1.4bpp"
 
 gUnknown_08510EF4::
-	.incbin "baserom.gba", 0x510ef4, 0x3c0
+	.incbin "data/tilesets/primary/general/anim/1/2.4bpp"
 
 gUnknown_085112B4::
-	.incbin "baserom.gba", 0x5112b4, 0x3c0
+	.incbin "data/tilesets/primary/general/anim/1/3.4bpp"
 
 gUnknown_08511674::
-	.incbin "baserom.gba", 0x511674, 0x3c0
+	.incbin "data/tilesets/primary/general/anim/1/4.4bpp"
 
 gUnknown_08511A34::
-	.incbin "baserom.gba", 0x511a34, 0x3c0
+	.incbin "data/tilesets/primary/general/anim/1/5.4bpp"
 
 gUnknown_08511DF4::
-	.incbin "baserom.gba", 0x511df4, 0x3c0
+	.incbin "data/tilesets/primary/general/anim/1/6.4bpp"
 
 gUnknown_085121B4::
-	.incbin "baserom.gba", 0x5121b4, 0x3c0
+	.incbin "data/tilesets/primary/general/anim/1/7.4bpp"
 
 
 gTilesetAnims_General1:: @ 8512574
-@ replacing .incbin "baserom.gba", 0x00512574, 0x20
 	.4byte gUnknown_08510774
 	.4byte gUnknown_08510B34
 	.4byte gUnknown_08510EF4
@@ -59,29 +57,28 @@ gTilesetAnims_General1:: @ 8512574
 	.4byte gUnknown_085121B4
 
 gUnknown_08512594::
-	.incbin "baserom.gba", 0x512594, 0x140
+	.incbin "data/tilesets/primary/general/anim/2/0.4bpp"
 
 gUnknown_085126D4::
-	.incbin "baserom.gba", 0x5126d4, 0x140
+	.incbin "data/tilesets/primary/general/anim/2/1.4bpp"
 
 gUnknown_08512814::
-	.incbin "baserom.gba", 0x512814, 0x140
+	.incbin "data/tilesets/primary/general/anim/2/2.4bpp"
 
 gUnknown_08512954::
-	.incbin "baserom.gba", 0x512954, 0x140
+	.incbin "data/tilesets/primary/general/anim/2/3.4bpp"
 
 gUnknown_08512A94::
-	.incbin "baserom.gba", 0x512a94, 0x140
+	.incbin "data/tilesets/primary/general/anim/2/4.4bpp"
 
 gUnknown_08512BD4::
-	.incbin "baserom.gba", 0x512bd4, 0x140
+	.incbin "data/tilesets/primary/general/anim/2/5.4bpp"
 
 gUnknown_08512D14::
-	.incbin "baserom.gba", 0x512d14, 0x140
+	.incbin "data/tilesets/primary/general/anim/2/6.4bpp"
 
 
 gTilesetAnims_General2:: @ 8512E54
-@ replacing .incbin "baserom.gba", 0x00512e54, 0x20
 	.4byte gUnknown_08512594
 	.4byte gUnknown_085126D4
 	.4byte gUnknown_08512814
@@ -92,129 +89,123 @@ gTilesetAnims_General2:: @ 8512E54
 	.4byte gUnknown_08512594
 
 gUnknown_08512E74::
-	.incbin "baserom.gba", 0x512e74, 0xc0
+	.incbin "data/tilesets/primary/general/anim/3/0.4bpp"
 
 gUnknown_08512F34::
-	.incbin "baserom.gba", 0x512f34, 0xc0
+	.incbin "data/tilesets/primary/general/anim/3/1.4bpp"
 
 gUnknown_08512FF4::
-	.incbin "baserom.gba", 0x512ff4, 0xc0
+	.incbin "data/tilesets/primary/general/anim/3/2.4bpp"
 
 gUnknown_085130B4::
-	.incbin "baserom.gba", 0x5130b4, 0xc0
+	.incbin "data/tilesets/primary/general/anim/3/3.4bpp"
 
 
 gTilesetAnims_General3:: @ 8513174
-@ replacing .incbin "baserom.gba", 0x00513174, 0x10
 	.4byte gUnknown_08512E74
 	.4byte gUnknown_08512F34
 	.4byte gUnknown_08512FF4
 	.4byte gUnknown_085130B4
 
 gUnknown_08513184::
-	.incbin "baserom.gba", 0x513184, 0x140
+	.incbin "data/tilesets/primary/general/anim/4/0.4bpp"
 
 gUnknown_085132C4::
-	.incbin "baserom.gba", 0x5132c4, 0x140
+	.incbin "data/tilesets/primary/general/anim/4/1.4bpp"
 
 gUnknown_08513404::
-	.incbin "baserom.gba", 0x513404, 0x140
+	.incbin "data/tilesets/primary/general/anim/4/2.4bpp"
 
 gUnknown_08513544::
-	.incbin "baserom.gba", 0x513544, 0x140
+	.incbin "data/tilesets/primary/general/anim/4/3.4bpp"
 
 
 gTilesetAnims_General4:: @ 8513684
-@ replacing .incbin "baserom.gba", 0x00513684, 0x10
 	.4byte gUnknown_08513184
 	.4byte gUnknown_085132C4
 	.4byte gUnknown_08513404
 	.4byte gUnknown_08513544
 
 gUnknown_08513694::
-	.incbin "baserom.gba", 0x513694, 0x80
+	.incbin "data/tilesets/secondary/lavaridge/anim/0.4bpp"
 
 gUnknown_08513714::
-	.incbin "baserom.gba", 0x513714, 0x80
+	.incbin "data/tilesets/secondary/lavaridge/anim/1.4bpp"
 
 gUnknown_08513794::
-	.incbin "baserom.gba", 0x513794, 0x80
+	.incbin "data/tilesets/secondary/lavaridge/anim/2.4bpp"
 
 gUnknown_08513814::
-	.incbin "baserom.gba", 0x513814, 0x80
+	.incbin "data/tilesets/secondary/lavaridge/anim/3.4bpp"
 
 
 gTilesetAnims_Lavaridge0:: @ 8513894
-@ replacing .incbin "baserom.gba", 0x00513894, 0x10
 	.4byte gUnknown_08513694
 	.4byte gUnknown_08513714
 	.4byte gUnknown_08513794
 	.4byte gUnknown_08513814
 
 gUnknown_085138A4::
-	.incbin "baserom.gba", 0x5138a4, 0x3c0
+	.incbin "data/tilesets/secondary/pacifidlog/anim/0/0.4bpp"
 
 gUnknown_08513C64::
-	.incbin "baserom.gba", 0x513c64, 0x3c0
+	.incbin "data/tilesets/secondary/pacifidlog/anim/0/1.4bpp"
 
 gUnknown_08514024::
-	.incbin "baserom.gba", 0x514024, 0x3c0
+	.incbin "data/tilesets/secondary/pacifidlog/anim/0/2.4bpp"
 
 
 gTilesetAnims_Pacifidlog0:: @ 85143E4
-@ replacing .incbin "baserom.gba", 0x005143e4, 0x10
 	.4byte gUnknown_085138A4
 	.4byte gUnknown_08513C64
 	.4byte gUnknown_08514024
 	.4byte gUnknown_08513C64
 
 gUnknown_085143F4::
-	.incbin "baserom.gba", 0x5143f4, 0x80
+	.incbin "data/tilesets/secondary/underwater/anim/0.4bpp"
 
 gUnknown_08514474::
-	.incbin "baserom.gba", 0x514474, 0x80
+	.incbin "data/tilesets/secondary/underwater/anim/1.4bpp"
 
 gUnknown_085144F4::
-	.incbin "baserom.gba", 0x5144f4, 0x80
+	.incbin "data/tilesets/secondary/underwater/anim/2.4bpp"
 
 gUnknown_08514574::
-	.incbin "baserom.gba", 0x514574, 0x80
+	.incbin "data/tilesets/secondary/underwater/anim/3.4bpp"
 
 
 gTilesetAnims_Underwater0:: @ 85145F4
-@ replacing .incbin "baserom.gba", 0x005145f4, 0x10
 	.4byte gUnknown_085143F4
 	.4byte gUnknown_08514474
 	.4byte gUnknown_085144F4
 	.4byte gUnknown_08514574
 
 gUnknown_08514604::
-	.incbin "baserom.gba", 0x514604, 0x100
+	.incbin "data/tilesets/secondary/pacifidlog/anim/1/0.4bpp"
 
 gUnknown_08514704::
-	.incbin "baserom.gba", 0x514704, 0x100
+	.incbin "data/tilesets/secondary/pacifidlog/anim/1/1.4bpp"
 
 gUnknown_08514804::
-	.incbin "baserom.gba", 0x514804, 0x100
+	.incbin "data/tilesets/secondary/pacifidlog/anim/1/2.4bpp"
 
 gUnknown_08514904::
-	.incbin "baserom.gba", 0x514904, 0x100
+	.incbin "data/tilesets/secondary/pacifidlog/anim/1/3.4bpp"
 
 gUnknown_08514A04::
-	.incbin "baserom.gba", 0x514a04, 0x100
+	.incbin "data/tilesets/secondary/pacifidlog/anim/1/4.4bpp"
 
 gUnknown_08514B04::
-	.incbin "baserom.gba", 0x514b04, 0x100
+	.incbin "data/tilesets/secondary/pacifidlog/anim/1/5.4bpp"
 
 gUnknown_08514C04::
-	.incbin "baserom.gba", 0x514c04, 0x100
+	.incbin "data/tilesets/secondary/pacifidlog/anim/1/6.4bpp"
 
 gUnknown_08514D04::
-	.incbin "baserom.gba", 0x514d04, 0x100
+	.incbin "data/tilesets/secondary/pacifidlog/anim/1/7.4bpp"
 
 
 gTilesetAnims_Pacifidlog1:: @ 8514E04
-@ replacing .incbin "baserom.gba", 0x00514e04, 0x20
 	.4byte gUnknown_08514604
 	.4byte gUnknown_08514704
 	.4byte gUnknown_08514804
@@ -225,39 +216,38 @@ gTilesetAnims_Pacifidlog1:: @ 8514E04
 	.4byte gUnknown_08514D04
 
 gUnknown_08514E24::
-	.incbin "baserom.gba", 0x514e24, 0x80
+	.incbin "data/tilesets/secondary/mauville/anim/0/a/0.4bpp"
 
 gUnknown_08514EA4::
-	.incbin "baserom.gba", 0x514ea4, 0x80
+	.incbin "data/tilesets/secondary/mauville/anim/0/a/1.4bpp"
 
 gUnknown_08514F24::
-	.incbin "baserom.gba", 0x514f24, 0x80
+	.incbin "data/tilesets/secondary/mauville/anim/0/a/2.4bpp"
 
 gUnknown_08514FA4::
-	.incbin "baserom.gba", 0x514fa4, 0x80
+	.incbin "data/tilesets/secondary/mauville/anim/0/a/3.4bpp"
 
 gUnknown_08515024::
-	.incbin "baserom.gba", 0x515024, 0x80
+	.incbin "data/tilesets/secondary/mauville/anim/1/a/1.4bpp"
 
 gUnknown_085150A4::
-	.incbin "baserom.gba", 0x5150a4, 0x80
+	.incbin "data/tilesets/secondary/mauville/anim/0/b/0.4bpp"
 
 gUnknown_08515124::
-	.incbin "baserom.gba", 0x515124, 0x80
+	.incbin "data/tilesets/secondary/mauville/anim/0/b/1.4bpp"
 
 gUnknown_085151A4::
-	.incbin "baserom.gba", 0x5151a4, 0x80
+	.incbin "data/tilesets/secondary/mauville/anim/0/b/2.4bpp"
 
 gUnknown_08515224::
-	.incbin "baserom.gba", 0x515224, 0x80
+	.incbin "data/tilesets/secondary/mauville/anim/0/b/3.4bpp"
 
 gUnknown_085152A4::
-	.incbin "baserom.gba", 0x5152a4, 0x80
+	.incbin "data/tilesets/secondary/mauville/anim/1/b/1.4bpp"
 
 	.space 0x20
 
 gTilesetAnims_MauvilleVDests0:: @ 8515344
-@ replacing .incbin "baserom.gba", 0x00515344, 0x20
 	.4byte BG_VRAM + 0x4c00
 	.4byte BG_VRAM + 0x4c80
 	.4byte BG_VRAM + 0x4d00
@@ -268,7 +258,6 @@ gTilesetAnims_MauvilleVDests0:: @ 8515344
 	.4byte BG_VRAM + 0x4f80
 
 gTilesetAnims_MauvilleVDests1:: @ 8515364
-@ replacing .incbin "baserom.gba", 0x00515364, 0x20
 	.4byte BG_VRAM + 0x5000
 	.4byte BG_VRAM + 0x5080
 	.4byte BG_VRAM + 0x5100
@@ -279,7 +268,6 @@ gTilesetAnims_MauvilleVDests1:: @ 8515364
 	.4byte BG_VRAM + 0x5380
 
 gTilesetAnims_Mauville0a:: @ 8515384
-@ replacing .incbin "baserom.gba", 0x00515384, 0x30
 	.4byte gUnknown_08514E24
 	.4byte gUnknown_08514E24
 	.4byte gUnknown_08514EA4
@@ -294,7 +282,6 @@ gTilesetAnims_Mauville0a:: @ 8515384
 	.4byte gUnknown_08514EA4
 
 gTilesetAnims_Mauville0b:: @ 85153B4
-@ replacing .incbin "baserom.gba", 0x005153b4, 0x30
 	.4byte gUnknown_085150A4
 	.4byte gUnknown_085150A4
 	.4byte gUnknown_08515124
@@ -309,42 +296,40 @@ gTilesetAnims_Mauville0b:: @ 85153B4
 	.4byte gUnknown_08515124
 
 gTilesetAnims_Mauville1a:: @ 85153E4
-@ replacing .incbin "baserom.gba", 0x005153e4, 0x10
 	.4byte gUnknown_08514E24
 	.4byte gUnknown_08514E24
 	.4byte gUnknown_08515024
 	.4byte gUnknown_08515024
 
 gTilesetAnims_Mauville1b:: @ 85153F4
-@ replacing .incbin "baserom.gba", 0x005153f4, 0x10
 	.4byte gUnknown_085150A4
 	.4byte gUnknown_085150A4
 	.4byte gUnknown_085152A4
 	.4byte gUnknown_085152A4
 
 gUnknown_08515404::
-	.incbin "baserom.gba", 0x515404, 0x80
+	.incbin "data/tilesets/secondary/rustboro/anim/0/0.4bpp"
 
 gUnknown_08515484::
-	.incbin "baserom.gba", 0x515484, 0x80
+	.incbin "data/tilesets/secondary/rustboro/anim/0/1.4bpp"
 
 gUnknown_08515504::
-	.incbin "baserom.gba", 0x515504, 0x80
+	.incbin "data/tilesets/secondary/rustboro/anim/0/2.4bpp"
 
 gUnknown_08515584::
-	.incbin "baserom.gba", 0x515584, 0x80
+	.incbin "data/tilesets/secondary/rustboro/anim/0/3.4bpp"
 
 gUnknown_08515604::
-	.incbin "baserom.gba", 0x515604, 0x80
+	.incbin "data/tilesets/secondary/rustboro/anim/0/4.4bpp"
 
 gUnknown_08515684::
-	.incbin "baserom.gba", 0x515684, 0x80
+	.incbin "data/tilesets/secondary/rustboro/anim/0/5.4bpp"
 
 gUnknown_08515704::
-	.incbin "baserom.gba", 0x515704, 0x80
+	.incbin "data/tilesets/secondary/rustboro/anim/0/6.4bpp"
 
 gUnknown_08515784::
-	.incbin "baserom.gba", 0x515784, 0x80
+	.incbin "data/tilesets/secondary/rustboro/anim/0/7.4bpp"
 
 
 gTilesetAnims_RustboroVDests0:: @ 8515804
@@ -358,7 +343,6 @@ gTilesetAnims_RustboroVDests0:: @ 8515804
 	.4byte BG_VRAM + 0x5380
 
 gTilesetAnims_Rustboro0:: @ 8515824
-@ replacing .incbin "baserom.gba", 0x00515824, 0x20
 	.4byte gUnknown_08515404
 	.4byte gUnknown_08515484
 	.4byte gUnknown_08515504
@@ -369,82 +353,79 @@ gTilesetAnims_Rustboro0:: @ 8515824
 	.4byte gUnknown_08515784
 
 gUnknown_08515844::
-	.incbin "baserom.gba", 0x515844, 0x80
+	.incbin "data/tilesets/secondary/rustboro/anim/1/0.4bpp"
 
 gUnknown_085158C4::
-	.incbin "baserom.gba", 0x5158c4, 0x80
+	.incbin "data/tilesets/secondary/rustboro/anim/1/1.4bpp"
 
 	.space 0x20
 
 
 gTilesetAnims_Rustboro1:: @ 8515964
-@ replacing .incbin "baserom.gba", 0x00515964, 0x8
 	.4byte gUnknown_08515844
 	.4byte gUnknown_085158C4
 
 gUnknown_0851596C::
-	.incbin "baserom.gba", 0x51596c, 0x80
+	.incbin "data/tilesets/secondary/cave/anim/0.4bpp"
 
 gUnknown_085159EC::
-	.incbin "baserom.gba", 0x5159ec, 0x80
+	.incbin "data/tilesets/secondary/cave/anim/1.4bpp"
 
 gUnknown_08515A6C::
-	.incbin "baserom.gba", 0x515a6c, 0x80
+	.incbin "data/tilesets/secondary/cave/anim/2.4bpp"
 
 gUnknown_08515AEC::
-	.incbin "baserom.gba", 0x515aec, 0x80
+	.incbin "data/tilesets/secondary/cave/anim/3.4bpp"
 
 gUnknown_08515B6C::
-	.incbin "baserom.gba", 0x515b6c, 0x80
+	.incbin "data/tilesets/secondary/cave/anim/unused/0.4bpp"
 
 gUnknown_08515BEC::
-	.incbin "baserom.gba", 0x515bec, 0x80
+	.incbin "data/tilesets/secondary/cave/anim/unused/1.4bpp"
 
 gUnknown_08515C6C::
-	.incbin "baserom.gba", 0x515c6c, 0x80
+	.incbin "data/tilesets/secondary/cave/anim/unused/2.4bpp"
 
 gUnknown_08515CEC::
-	.incbin "baserom.gba", 0x515cec, 0x80
+	.incbin "data/tilesets/secondary/cave/anim/unused/3.4bpp"
 
     .space 0x20
 
 
 gTilesetAnims_Lavaridge1_Cave0:: @ 8515D8C
-@ replacing .incbin "baserom.gba", 0x00515d8c, 0x10
 	.4byte gUnknown_0851596C
 	.4byte gUnknown_085159EC
 	.4byte gUnknown_08515A6C
 	.4byte gUnknown_08515AEC
 
 gUnknown_08515D9C::
-	.incbin "baserom.gba", 0x515d9c, 0x80
+	.incbin "data/tilesets/secondary/ever_grande/anim/0.4bpp"
 
 gUnknown_08515E1C::
-	.incbin "baserom.gba", 0x515e1c, 0x80
+	.incbin "data/tilesets/secondary/ever_grande/anim/1.4bpp"
 
 gUnknown_08515E9C::
-	.incbin "baserom.gba", 0x515e9c, 0x80
+	.incbin "data/tilesets/secondary/ever_grande/anim/2.4bpp"
 
 gUnknown_08515F1C::
-	.incbin "baserom.gba", 0x515f1c, 0x80
+	.incbin "data/tilesets/secondary/ever_grande/anim/3.4bpp"
 
 gUnknown_08515F9C::
-	.incbin "baserom.gba", 0x515f9c, 0x80
+	.incbin "data/tilesets/secondary/ever_grande/anim/4.4bpp"
 
 gUnknown_0851601C::
-	.incbin "baserom.gba", 0x51601c, 0x80
+	.incbin "data/tilesets/secondary/ever_grande/anim/5.4bpp"
 
 gUnknown_0851609C::
-	.incbin "baserom.gba", 0x51609c, 0x80
+	.incbin "data/tilesets/secondary/ever_grande/anim/6.4bpp"
 
 gUnknown_0851611C::
-	.incbin "baserom.gba", 0x51611c, 0x80
+	.incbin "data/tilesets/secondary/ever_grande/anim/7.4bpp"
 
 	.space 0x20
 
 
 gTilesetAnims_EverGrandeVDests0:: @ 85161BC
-@ replacing .incbin "baserom.gba", 0x005161bc, 0x20
 	.4byte BG_VRAM + 0x5c00
 	.4byte BG_VRAM + 0x5c80
 	.4byte BG_VRAM + 0x5d00
@@ -455,7 +436,6 @@ gTilesetAnims_EverGrandeVDests0:: @ 85161BC
 	.4byte BG_VRAM + 0x5f80
 
 gTilesetAnims_EverGrande0:: @ 85161DC
-@ replacing .incbin "baserom.gba", 0x005161dc, 0x20
 	.4byte gUnknown_08515D9C
 	.4byte gUnknown_08515E1C
 	.4byte gUnknown_08515E9C
@@ -466,228 +446,216 @@ gTilesetAnims_EverGrande0:: @ 85161DC
 	.4byte gUnknown_0851611C
 
 gUnknown_085161FC::
-	.incbin "baserom.gba", 0x5161fc, 0xc0
+	.incbin "data/tilesets/secondary/dewford/anim/0.4bpp"
 
 gUnknown_085162BC::
-	.incbin "baserom.gba", 0x5162bc, 0xc0
+	.incbin "data/tilesets/secondary/dewford/anim/1.4bpp"
 
 gUnknown_0851637C::
-	.incbin "baserom.gba", 0x51637c, 0xc0
+	.incbin "data/tilesets/secondary/dewford/anim/2.4bpp"
 
 gUnknown_0851643C::
-	.incbin "baserom.gba", 0x51643c, 0xc0
+	.incbin "data/tilesets/secondary/dewford/anim/3.4bpp"
 
 
 gTilesetAnims_Dewford0:: @ 85164FC
-@ replacing .incbin "baserom.gba", 0x005164fc, 0x10
 	.4byte gUnknown_085161FC
 	.4byte gUnknown_085162BC
 	.4byte gUnknown_0851637C
 	.4byte gUnknown_0851643C
 
 gUnknown_0851650C::
-	.incbin "baserom.gba", 0x51650c, 0xc0
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/0.4bpp"
 
 gUnknown_085165CC::
-	.incbin "baserom.gba", 0x5165cc, 0xc0
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/1.4bpp"
 
 gUnknown_0851668C::
-	.incbin "baserom.gba", 0x51668c, 0xc0
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/2.4bpp"
 
 gUnknown_0851674C::
-	.incbin "baserom.gba", 0x51674c, 0xc0
+	.incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/3.4bpp"
 
 
 gTilesetAnims_BattleFrontierOutsideWest0:: @ 851680C
-@ replacing .incbin "baserom.gba", 0x0051680c, 0x10
 	.4byte gUnknown_0851650C
 	.4byte gUnknown_085165CC
 	.4byte gUnknown_0851668C
 	.4byte gUnknown_0851674C
 
 gUnknown_0851681C:: @ 851680C
-	.incbin "baserom.gba", 0x51681c, 0xc0
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/0.4bpp"
 
 gUnknown_085168DC::
-	.incbin "baserom.gba", 0x5168dc, 0xc0
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/1.4bpp"
 
 gUnknown_0851699C::
-	.incbin "baserom.gba", 0x51699c, 0xc0
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/2.4bpp"
 
 gUnknown_08516A5C::
-	.incbin "baserom.gba", 0x516a5c, 0xc0
+	.incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/3.4bpp"
 
 
 gTilesetAnims_BattleFrontierOutsideEast0:: @ 8516B1C
-@ replacing .incbin "baserom.gba", 0x00516b1c, 0x10
 	.4byte gUnknown_0851681C
 	.4byte gUnknown_085168DC
 	.4byte gUnknown_0851699C
 	.4byte gUnknown_08516A5C
 
 gUnknown_08516B2C::
-	.incbin "baserom.gba", 0x516b2c, 0x80
+	.incbin "data/tilesets/secondary/slateport/anim/0.4bpp"
 
 gUnknown_08516BAC::
-	.incbin "baserom.gba", 0x516bac, 0x80
+	.incbin "data/tilesets/secondary/slateport/anim/1.4bpp"
 
 gUnknown_08516C2C::
-	.incbin "baserom.gba", 0x516c2c, 0x80
+	.incbin "data/tilesets/secondary/slateport/anim/2.4bpp"
 
 gUnknown_08516CAC::
-	.incbin "baserom.gba", 0x516cac, 0x80
+	.incbin "data/tilesets/secondary/slateport/anim/3.4bpp"
 
 
 gTilesetAnims_Slateport0:: @ 8516D2C
-@ replacing .incbin "baserom.gba", 0x00516d2c, 0x10
 	.4byte gUnknown_08516B2C
 	.4byte gUnknown_08516BAC
 	.4byte gUnknown_08516C2C
 	.4byte gUnknown_08516CAC
 
 gUnknown_08516D3C::
-	.incbin "baserom.gba", 0x516d3c, 0x80
+	.incbin "data/tilesets/primary/building/anim/0.4bpp"
 
 gUnknown_08516DBC::
-	.incbin "baserom.gba", 0x516dbc, 0x80
+	.incbin "data/tilesets/primary/building/anim/1.4bpp"
 
 
 gTilesetAnims_InsideBuilding0:: @ 8516E3C
-@ replacing .incbin "baserom.gba", 0x00516e3c, 0x8
 	.4byte gUnknown_08516D3C
 	.4byte gUnknown_08516DBC
 
 gUnknown_08516E44::
-	.incbin "baserom.gba", 0x516e44, 0x180
+	.incbin "data/tilesets/secondary/sootopolis_gym/anim/0/0.4bpp"
 
 gUnknown_08516FC4::
-	.incbin "baserom.gba", 0x516fc4, 0x180
+	.incbin "data/tilesets/secondary/sootopolis_gym/anim/0/1.4bpp"
 
 gUnknown_08517144::
-	.incbin "baserom.gba", 0x517144, 0x180
+	.incbin "data/tilesets/secondary/sootopolis_gym/anim/0/2.4bpp"
 
 gUnknown_085172C4::
-	.incbin "baserom.gba", 0x5172c4, 0x280
+	.incbin "data/tilesets/secondary/sootopolis_gym/anim/1/0.4bpp"
 
 gUnknown_08517544::
-	.incbin "baserom.gba", 0x517544, 0x280
+	.incbin "data/tilesets/secondary/sootopolis_gym/anim/1/1.4bpp"
 
 gUnknown_085177C4::
-	.incbin "baserom.gba", 0x5177c4, 0x280
+	.incbin "data/tilesets/secondary/sootopolis_gym/anim/1/2.4bpp"
 
 
 gTilesetAnims_SootopolisGym0:: @ 8517A44
-@ replacing .incbin "baserom.gba", 0x00517a44, 0xc
 	.4byte gUnknown_08516E44
 	.4byte gUnknown_08516FC4
 	.4byte gUnknown_08517144
 
 gTilesetAnims_SootopolisGym1:: @ 8517A50
-@ replacing .incbin "baserom.gba", 0x00517a50, 0xc
 	.4byte gUnknown_085172C4
 	.4byte gUnknown_08517544
 	.4byte gUnknown_085177C4
 
 gUnknown_08517A5C::
-	.incbin "baserom.gba", 0x517a5c, 0x80
+	.incbin "data/tilesets/secondary/elite_four/anim/1/0.4bpp"
 
 gUnknown_08517ADC::
-	.incbin "baserom.gba", 0x517adc, 0x80
+	.incbin "data/tilesets/secondary/elite_four/anim/1/1.4bpp"
 
 gUnknown_08517B5C::
-	.incbin "baserom.gba", 0x517b5c, 0x20
+	.incbin "data/tilesets/secondary/elite_four/anim/0/0.4bpp"
 
 gUnknown_08517B7C::
-	.incbin "baserom.gba", 0x517b7c, 0x20
+	.incbin "data/tilesets/secondary/elite_four/anim/0/1.4bpp"
 
 gUnknown_08517B9C::
-	.incbin "baserom.gba", 0x517b9c, 0x20
+	.incbin "data/tilesets/secondary/elite_four/anim/0/2.4bpp"
 
 gUnknown_08517BBC::
-	.incbin "baserom.gba", 0x517bbc, 0x20
+	.incbin "data/tilesets/secondary/elite_four/anim/0/3.4bpp"
 
 	.space 0x20
 
 
 gTilesetAnims_EliteFour1:: @ 8517BFC
-@ replacing .incbin "baserom.gba", 0x00517bfc, 0x10
 	.4byte gUnknown_08517B5C
 	.4byte gUnknown_08517B7C
 	.4byte gUnknown_08517B9C
 	.4byte gUnknown_08517BBC
 
 gTilesetAnims_EliteFour0:: @ 8517C0C
-@ replacing .incbin "baserom.gba", 0x00517c0c, 0x8
 	.4byte gUnknown_08517A5C
 	.4byte gUnknown_08517ADC
 
 gUnknown_08517C14::
-	.incbin "baserom.gba", 0x517c14, 0x200
+	.incbin "data/tilesets/secondary/mauville_gym/anim/0.4bpp"
 
 gUnknown_08517E14::
-	.incbin "baserom.gba", 0x517e14, 0x200
+	.incbin "data/tilesets/secondary/mauville_gym/anim/1.4bpp"
 
 	.space 0x20
 
 
 gTilesetAnims_MauvilleGym0:: @ 8518034
-@ replacing .incbin "baserom.gba", 0x00518034, 0x8
 	.4byte gUnknown_08517C14
 	.4byte gUnknown_08517E14
 
 gUnknown_0851803C::
-	.incbin "baserom.gba", 0x51803c, 0x120
+	.incbin "data/tilesets/secondary/bike_shop/anim/0.4bpp"
 
 gUnknown_0851815C::
-	.incbin "baserom.gba", 0x51815c, 0x120
+	.incbin "data/tilesets/secondary/bike_shop/anim/1.4bpp"
 
 	.space 0x20
 
 gTilesetAnims_BikeShop0:: @ 851829C
-@ replacing .incbin "baserom.gba", 0x0051829c, 0x8
 	.4byte gUnknown_0851803C
 	.4byte gUnknown_0851815C
 
 gUnknown_085182A4::
-	.incbin "baserom.gba", 0x5182a4, 0xc00
+	.incbin "data/tilesets/secondary/sootopolis/anim/0.4bpp"
 
 gUnknown_08518EA4::
-	.incbin "baserom.gba", 0x518ea4, 0xc00
+	.incbin "data/tilesets/secondary/sootopolis/anim/1.4bpp"
 
 gUnknown_08519AA4::
-	.incbin "baserom.gba", 0x519aa4, 0xc00
+	.incbin "data/tilesets/secondary/sootopolis/anim/2.4bpp"
 
 gUnknown_0851A6A4::
-	.incbin "baserom.gba", 0x51a6a4, 0xc00
+	.incbin "data/tilesets/secondary/sootopolis/anim/3.4bpp"
 
 gUnknown_0851B2A4::
-	.incbin "baserom.gba", 0x51b2a4, 0xc00
+	.incbin "data/tilesets/secondary/sootopolis/anim/4.4bpp"
 
 gUnknown_0851BEA4::
-	.incbin "baserom.gba", 0x51bea4, 0xc00
+	.incbin "data/tilesets/secondary/sootopolis/anim/5.4bpp"
 
 gUnknown_0851CAA4::
-	.incbin "baserom.gba", 0x51caa4, 0xc00
+	.incbin "data/tilesets/secondary/sootopolis/anim/6.4bpp"
 
 gUnknown_0851D6A4::
-	.incbin "baserom.gba", 0x51d6a4, 0xc00
+	.incbin "data/tilesets/secondary/sootopolis/anim/7.4bpp"
 
 	.space 0x20
 
 gUnknown_0851E2C4::
-	.incbin "baserom.gba", 0x51e2c4, 0x800
+	.incbin "data/tilesets/secondary/unused_1/0.4bpp"
 
 gUnknown_0851EAC4::
-	.incbin "baserom.gba", 0x51eac4, 0x800
+	.incbin "data/tilesets/secondary/unused_1/1.4bpp"
 
 gUnknown_0851F2C4::
-	.incbin "baserom.gba", 0x51f2c4, 0x800
+	.incbin "data/tilesets/secondary/unused_1/2.4bpp"
 
 gUnknown_0851FAC4::
-	.incbin "baserom.gba", 0x51fac4, 0x800
+	.incbin "data/tilesets/secondary/unused_1/3.4bpp"
 
 gTilesetAnims_Sootopolis0:: @ 85202C4
-@ replacing .incbin "baserom.gba", 0x005202c4, 0x20
 	.4byte gUnknown_085182A4
 	.4byte gUnknown_08518EA4
 	.4byte gUnknown_08519AA4
@@ -698,43 +666,41 @@ gTilesetAnims_Sootopolis0:: @ 85202C4
 	.4byte gUnknown_0851D6A4
 
 gUnknown_085202E4::
-	.incbin "baserom.gba", 0x5202e4, 0x100
+	.incbin "data/tilesets/secondary/battle_pyramid/anim/0/0.4bpp"
 
 gUnknown_085203E4::
-	.incbin "baserom.gba", 0x5203e4, 0x100
+	.incbin "data/tilesets/secondary/battle_pyramid/anim/0/1.4bpp"
 
 gUnknown_085204E4::
-	.incbin "baserom.gba", 0x5204e4, 0x100
+	.incbin "data/tilesets/secondary/battle_pyramid/anim/0/2.4bpp"
 
     .space 0x20
 
 gUnknown_08520604::
-	.incbin "baserom.gba", 0x520604, 0x100
+	.incbin "data/tilesets/secondary/battle_pyramid/anim/1/0.4bpp"
 
 gUnknown_08520704::
-	.incbin "baserom.gba", 0x520704, 0x100
+	.incbin "data/tilesets/secondary/battle_pyramid/anim/1/1.4bpp"
 
 gUnknown_08520804::
-	.incbin "baserom.gba", 0x520804, 0x100
+	.incbin "data/tilesets/secondary/battle_pyramid/anim/1/2.4bpp"
 
 	.space 0x3d00
 
 gUnknown_08524604::
-	.incbin "baserom.gba", 0x524604, 0x40
+	.incbin "data/tilesets/secondary/unused_2/0.4bpp"
 
 	.space 0x1c0
 
 gUnknown_08524804::
-	.incbin "baserom.gba", 0x524804, 0x60
+	.incbin "data/tilesets/secondary/unused_2/1.4bpp"
 
 gTilesetAnims_BattlePyramid0:: @ 8524864
-@ replacing .incbin "baserom.gba", 0x00524864, 0xc
 	.4byte gUnknown_085202E4
 	.4byte gUnknown_085203E4
 	.4byte gUnknown_085204E4
 
 gTilesetAnims_BattlePyramid1:: @ 8524870
-@ replacing .incbin "baserom.gba", 0x00524870, 0xc
 	.4byte gUnknown_08520604
 	.4byte gUnknown_08520704
 	.4byte gUnknown_08520804
diff --git a/data/tilesets/primary/building/anim/0.png b/data/tilesets/primary/building/anim/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..004eccc67d6a563c9fa50b1bc53a6c046479c9b6
GIT binary patch
literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsSr;W#}JO0p=USpHW=`*9GGtw
zdZa?Ku`S%Jz)S0g<OX4tp6<yye{Wl8clO^tqagp{Q>Z()mSd5MjagXV8^-u8?!EQT
oR#t}GQmCIKHFMom?Z*8Vm|ri>I<C?GMHOU^r>mdKI;Vst08QI4m;e9(

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/building/anim/1.png b/data/tilesets/primary/building/anim/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e28281dea9caf084d219b71fad644e7ffc177bdb
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsc=sh#}JO0p=S^BHW=_QJNS23
zC>(Q`Ho=N7IHmPl=Z^=H9#JYza^E+}&gqu4dl#ksggsVei~K>K8Ij%<YkFlOnf7IL
rOa1?{(oSpb1bfe3pNl7a8~0yeetIfi{^DypJ&;wNu6{1-oD!M<(Hk+b

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/0/0.png b/data/tilesets/primary/general/anim/0/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..d535d920ec06f1d44ec6d2aa4430020ef8c185b6
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsX9*=#}JO0rl$<~4lD4qK3vWh
zd!vf!Nnh$K$yIY$Hd?ehOGbQ{(#TrGbSO4!%C%{Bk=OVy9pn$6^62BblZSifO$l>s
zy=`A9bgfeNb<1tOX@yRQE(+QyK6)p<Z$l^RI<F(yA<V^Y2huLY?0O{giC0Z~udMZ=
h9$u-u4HxEz_3O778XNQMv{(#sk*BMl%Q~loCID@7MMnSt

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/0/1.png b/data/tilesets/primary/general/anim/0/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..74f93ecce1e6ccd38b07eeba2ab96023f43d7d38
GIT binary patch
literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsaj7L#}JO0ragvShYbW+#J9it
z#Psyiu2a%JaYE}1|IIFV`0R<Bt5j@U!b|-~;XUk!H}Y^N798vh{J3VB#P7rw>qXi7
zrnEb7@9$J8YK+R?aQ@PUz46A2{JMT~a%N4qD-@pPkiprJb8hnfoZE8*R`FW=iJnjt
g?^x){VjZ<zej2y&gX24W^Fa>sboFyt=akR{0N&w5WdHyG

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/0/2.png b/data/tilesets/primary/general/anim/0/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb0bfe89f681b6f4641c7dd0b98e8c03ca5d4877
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsX9*=#}JO0rl&UYHX8`IJyee>
zpUGgU8ZwhHb<ztdiFZ$$p2h53u+f;YV)_lCos;eU9zDGM@iLCOX|3UTXRa;@G;)3P
z(SP2&E7O<wX>gwY`sl`~lh5~RZaQ(#aLx?Frz?C+t?w)~klMFD|KqARtNAQWGpGMl
jGr8u#&8%$p<<&=KhsCDLOBO!N2D!-7)z4*}Q$iB}pD0UK

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/1/0.png b/data/tilesets/primary/general/anim/1/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7bb2e631d50dce2e68bd1beaa17a202ee544ba8
GIT binary patch
literal 518
zcmV+h0{Q)kP)<h;3K|Lk000e1NJLTq000O8008g=00000-Bp(&0005aNkl<ZIE|%~
zu};G<5Qgs+3<F}!RY{eR7RrvibYLmEWG~8fZc*@aP_lU7tyma%7ye6H8k!;@v3yFT
z^Y`0lA2BD6S~zAV=g#`zi;8KI6-=YVozaLLiYI`(9XqNXxgymmQ>HwHB~v=~g$+|x
zEg5wHtC~-TzALO)pR=RV!Iu`T4;iDhSfZ|gd7?`74KnJ7B_LKOhul5Xa@({6dbydJ
zPj^0@*@{Q_2It7uK)T-h7Jaaa`G7-iZFRLQ`(Ux$wD>KTPv!pY9I0&JlM+5aXK87^
z@`n$*-}O%{SA^Uw1<p5s^*M2EU3+Cea>dd_7CW%W>Hf(q6OxAo(7%t+g||(V)@R+2
z5|3dO>|HqrAJWPDdF&9cy{8zPZ@hZ)F?xER1NZaT&^`XizXS2ZR=jy2etJU1XJ=u~
zfd*ff4Scz&@>9M$92!1nz8CXt&9^=FAvgANbIZ-&8tAPqvAQ;Lc#gY0UJa2cZWA8N
z$I-lf_vO@lIGc~7dsD5XgQ(qy6n&`R;-4#ERY^fB{F6QdQrn7B?cRbCDne($(1i}c
z_7`k^58x26zcDZx2YY`3#S<Xh+KMLz0``ZB>0b4pxg5;L7X!}>)kQ3degFUf07*qo
IM6N<$g6a_QH~;_u

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/1/1.png b/data/tilesets/primary/general/anim/1/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c215f16836328257a36728dc0ad6b5ffb46250d4
GIT binary patch
literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq000O8008g=00000-Bp(&0006ENkl<ZIE{^y
zJ&xNj6olsr6cD7=i+<oTg4RJ=uNoC@1W?-x5aTuiZ0!k>-cZAPxy@ZNqhL3?wu@~(
z@MkzfK9Z;_m%y@$uq;JlR>38Lvq!kkRwF%i8H|I3BT}wN%GqJGaYPu3fMT!$yD%8;
z`Hce+0{w^@MHp`VQs?lKeLS&=yt5QLu7iyo;d>$vgAj1+h};)~a?O;h*=#!~cfg=r
z?q_?Gt4$jFutF;eT7`iqg3b~C`}Gt39wzy9uYTX&`LQn4DYsg43rx}-JHb=;$xG+E
zo7`c|wKe>ze&Ma(OYUv`*17~QKhOOY{)v9VkUz;!^;=6PjMC-QQS5oYM~~E%C&J3R
z_3M<&r4R5rhu1mE`}OnG(KPqDVEK!mSN*nY{gPL|ulO<3Z+3cDF3Irc5*IZ43sLV|
zEKPGkT!i>2u+_$8kA{OpB))US(#D9`2+J;_U78jbN$P5|z~q-T^vmS8dG8ljzcV+<
z^(Mcw{Lb<_U;AC<X3E_xLZmK@)K!*ow$VA7R_ACIS~WYJL#TJkt<awB%iaI+=D)qx
z<=+2r`X5gJBTaO_l02V$k8n5<;V_~P;RN3cKKvG*G5Y?1z(K+j?4uufWj+XOV(i0+
zUy{_-tb420dn^CF=Xny=dz<wR=85~`ATbl{V=Ctvvk7dXob;|F`S5%G*#Gzo!bS|h
TaWoEO00000NkvXXu0mjfDQ6=?

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/1/2.png b/data/tilesets/primary/general/anim/1/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8e0ee273b05c91bf8331d030dd45a57317512aa
GIT binary patch
literal 534
zcmV+x0_pvUP)<h;3K|Lk000e1NJLTq000O8008g=00000-Bp(&0005qNkl<ZIE}58
zy>c2c6ov0AToZdICBneaio8I^YA9SJSZwNGL{0GSeT2B)p;5t0WoYv*IR}XCS#Jt^
zqT(CP?A1B<M_O^JDh?Fy`YKaw<-)r{bl`@fJwFnC@J{r@6zJV}Q4Ld3+Xh)-Ny2)8
zF1_#GA#UJCl9td*_Z@oL3$o$al2|P^DrvP=Dee(>HAh?(5m&`!0ATctOTrz^LHLdm
zeG`3C+c!}!EuohZ^iqOetAtY>NCA3r1HEBMy^?w*^~Tg2pY&W@yz>1)--^DMbNF7}
zy~X#vb<C+3%O`w6|B!ughq!`qTCvYH;<TtDI&L+fMrem`l&>C$ya#dahhiPRk#$6@
z7qFBJ{fq41g8dtx?*a5w)&tiU>-j#e0Q5r6SwbK_&9eN)R(1y<-`>n5@52${jC=ql
z`vZ1)ParNg`R@*J7ZZSb*VMbE-gTGW&N=Ei>iy!`9nrM)PL@x;6Z%g0;UnXeJEi5T
zI%W;)Xz2TymN05y`H%Oed~bcew{u^*-p6rJEhKgv<Bn2e-t2vpMGeGtT1hNx;9H#l
z1InK@X7p%4`PiP@5zY+5135Qie#ZN3V!ZdZ#l1KF59|T?*%tYkAwT2)z<9QW|NJih
Y0F`zrZ7N3LmH+?%07*qoM6N<$g6=H=c>n+a

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/1/3.png b/data/tilesets/primary/general/anim/1/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c6ce36112378d99917b0093ab596a7e88e424c8
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq000O8008g=00000-Bp(&0005jNkl<ZIE}57
zF^(ER5Jl?>1@fW|rxpg0!k%C~3Bd+7Y9=?DB4!cvIgB=$fJ?17kpHj2YiS^`B_~g<
z>7MtytGcC7Rk47@$O2QDn@wbBW}@@*2T-W!0<-$WZ~KKw(>%?^-8Y1H==(B#4OH-z
zvZ2rK`G)ZA6uw$@D9w7O;>}iNG%sBq7Upu`y2A?V4hicH3AupF7oudi1uRAuDEqli
zpVQ~``364s+jErI0ydriOEp!2sLS-XZ}MHrv_??+%uN=!=0^P<{wepb&oSB2SKs>5
ziui{5VfRtL5p)0aO-ER#n)iTaLhs}zo@3J8gB5f0ynO4QBQZCzA1NUhNRr(%>c`S0
z7SU>@3aG81uaJFruZn>z+qRV|@EoHmu#`*nbt&hns-(Rv--#B$Z2QV@=L^ujUVzgX
zz`ucFFl)s)8q+tXZ+y@9f%^xa()U8&3w<AbUoUsY+!=EpxlXx68QDL_`|<=-C*(f=
zWUeuCaPvN{@9kQb;b&d$y${vs8{S8>EYPsx9`G1>ppl~kH5;0a&6-G(GG^13-|7sc
z?U603yS@dcIcL0D!eV5B>%HH1_h9-)WXTK6X6`TZUgeDa;nzKpJN)N&`3vx`8C4us
R%5wk!002ovPDHLkV1o4j1+oAD

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/1/4.png b/data/tilesets/primary/general/anim/1/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc1f9576c72f3accaa5b94237538e5f26e7d7721
GIT binary patch
literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq000O8008g=00000-Bp(&0004$Nkl<ZIE{^y
zy>7!W421Ox%GNPN9m9K`z|oSi1!(UE%+3xF=s5~x(cAV;sekIYfR_(Jj=mEq%8B>h
ziDZa(M=wXBB!vHoJ4j;yN-|JEK<GQbEW^Z|K)3db@GE*LppJf>*tXwr09xku%>cjt
z%a7r}T}}kl`zN6p$So9p9mBITDvW8T3Cr9WMn9uq8+~**0_t?&w=G@D36r0GIMIfY
zV{V~{9I>3=-dxGp(}(8swXiDMS3l+aQ1UxJHH^5>=bSy~?0tq8+%#@sHNOI`Y@t~6
zaTAN{K9qv;K2$T1TN>;7e7<IQ?g3n|2Q5&>c`nEeDJ2&IaSq8{Q@D<}1PCFx2h|zr
zd<7_^2f;d+1bhKi4i&(<cluSds<!-UY#n}i`hC-{reD4AOX)SYqCv&nH`aO9c}6~_
z;<1l<#HD7gJR|>kZ^u9HZG0N5_px<vhLQ8S2~*dr^%IQ$nQN%dfJi{V>H?a91?g!e
zF-9CCLn3dhoG|SH)EN*72=PY5jEFtRR=f9k*ZcSZj28dEICzZm00000NkvXXu0mjf
Dtz_2$

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/1/5.png b/data/tilesets/primary/general/anim/1/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c0c57a86bd76987481efe65890d92d5d9bef2b8
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq000O8008g=00000-Bp(&0004#Nkl<ZIE|Il
zO>V+45C!15f-TXi%UJmlN9Y#3$u^S1-jdxlkx<T2#3r}xdyZ*<2DQ!N6N-m7_9PL7
zOA2BN0!3-_N=~H4JyIxrgEpfUj}?gtPoVtBYm@|U0!t!!mInq#9Z2YyhyRJGdQT#V
z5hc;jb*BXDHqNs-R%>Ev0>4|{^{o*wmk`gqwR6PKAEgfNh&p$`f2#vm7aHaj^5U?y
z%Ei3D)EB$TY`Vw3ndg1~dXCBs+*&u|P2xTeQ@qa4aevNX&ZyHYQ3*}pN?#|gGYb{_
zHjneeAv=H+m*Ddl=lNlDwZjlGx%?hrRmsNyMvc*>`AxW_CH9@zc9Q90$v*vRagVgq
zCG!qYL9CU@?k(#8#EG_(6wE7`S2AzAmbWW3^EC6$%p-R9n0M`)_gAuS$-Zx_Q>;_E
zv@7R0GllFw`Kv%nocGE1wvgwt_I<29H-}3C!NdU+ypjunk2Y|%zX6K`PtYZL!dH33
zB@HnRfiezep~>$-GY&UkahSi$F)<MM@9*-L@8b*RPz3=&7efI60000<MNUMnLSTX*
COx2_S

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/1/6.png b/data/tilesets/primary/general/anim/1/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..be5ecacaa10e7216288bc09f2deb74e367c51cfc
GIT binary patch
literal 480
zcmV<60U!Q}P)<h;3K|Lk000e1NJLTq000O8008g=00000-Bp(&0004}Nkl<ZIE|f@
z%}&EG5QO&?T=650Sv86J7!+S}1Zl$^$>vO?;OC&~#c#`u;}(eqgt&Z4z0;Yjy^c7i
zD$cph0xeK?D^8mkXh%RJ*3_}u5GtAy&<16plNTZq-~CdeUkIpn@q`t>g2olUhJFoo
z4SzyxV+X{SiZ<5ViMTG|Py?tIXaTsA8(HnDq@arzeZ)Y&U=#f82|7aU8P)a-eUux6
zZsuFfU+>4<nUUAT%|)(OtmXc_k2k(mPiRGF#jn5EzhKCn*}^-~&oy^Lu`A+>+|sX!
zX<Lz0)5`uq*DkrOJQ0be%l_FoiP<woz+O2AZ%$ru%8&q#BapNAKt4*|0iI7Dl<fD!
zK=_O`A|D6wyX>h02EsoKa`b+nZV<QGdU15Qqu-WK+cm#E!m-}a@19S4`t85_)!bZi
zPkzk3qR!RGfi2{UT`vDPu#W?CKbVVF8TrF~<8Cx(@M`>eKQ=@;H#5wJnT-o#LFBn%
zcu$DNQ#Dot5i0@_V~~+B0{2>hG%e5q5J%RZvCKhYwXdIof<D#xn}}r&{&O#Xz8{|#
Wt^g&Qe)|~!0000<MNUMnLSTZ<y5Vd9

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/1/7.png b/data/tilesets/primary/general/anim/1/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..85bc7561a265ebfe3063abbc8469ed5dbd6a4537
GIT binary patch
literal 521
zcmV+k0`~ohP)<h;3K|Lk000e1NJLTq000O8008g=00000-Bp(&0005dNkl<ZIE|f?
zv2L6|5QgU!c3q`ptp!o~ET4NsL*c?i13f3k^<iE1IbzXlac||uh2JIrU@l4)E3(pj
z5}IHC&&=$Qb<U6h$r!UDQ@G4bWZl@(&UHdp_@-+`c4LA2DI<Rvpp#p`xm$%$>KB3|
zKaP;(GSJ|Fos+HKjm;>#ve217{0wxtKnM7{K_NN$?*a+`l{+W|BoSGWE0Wy9Z@+v$
zDBzbLWYY(nju$^(kt<xzEvl?@;YaOP=+r`YVp-u8&Lh%(<aVFr4w}22-`D%_NBH?3
zR_%fUer@7+yv)xFWp^!8wr7typEh$&a#@x>v|o=_+mC)Fq<#3kc<h6deS~#>Iv3_%
z@dUsA2uWcqO%B*OV`#4HND-u1Mj!%>qHbPhRO3vqb&Pbbn@A6e=51ckP;;K4i|;^P
zzbhgpUPdzN_f7rEctPq{;pxH8sMSwJrG8cFm*kdjv7z$3m_p}N=QMKLN2PsKn){-;
zmR>dTU-xEFz0BpS_tD{H5`!2quNW0Fa)&DLLzt<@H$5rFQ@3EGvB$#{4x&2`3dUxz
zyZ}<r(_K&~ToEQzft?G1p7D+U1B&};K|#gy1YJnq!T;Um=lAgo0BQvwlLFG}00000
LNkvXXu0mjf0dV+i

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/2/0.png b/data/tilesets/primary/general/anim/2/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f9f0c30930c243896b6e540a0ccb0a9f9fe3ca6
GIT binary patch
literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^96%hv0wfrYc($DZQk|YIjv*3Lr%t%b%dE)Ly!lXJ
zEQ66l=p5d>|A`5WF+RUOhs2&ftgh1Y*5%IL&g#}54hj4|ENlyp_~n$BA6y)Eu+V|w
z@M|{Z2@#LnL|!KfsIPId37wwlU;U@!&7%0It>1O)1Jcj17H?K5K6uC9eraBS`Qykx
sY1x1N#ju1Ig{~F3$rb+TyutOqe&_Co{5!&NO#$RMPgg&ebxsLQ0M~p?e*gdg

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/2/1.png b/data/tilesets/primary/general/anim/2/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..bef1f3023c9d9b6a48a309ae02a182243313995a
GIT binary patch
literal 243
zcmV<P01W?$P)<h;3K|Lk000e1NJLTq000O8002+~00000#7TzC0002GNkl<Z7?q8X
zF%E+;3`PH0l8&9?+<;>TT8S0t;F)&l0k}Xwu5DB%Ds{+{qkP*xA0kqqXN1&=AuUJL
zM<mpq2rV0;qTEF=4y7Pmml2dg05uJPh_ZopbS8c|F3GM@=W!;iy$;=&61MkO{0FLu
ztJ!cv4&Tup@ax`TRnEyO-K);L^4GLWZb!$;$>ym}x<LB<XRsh9cqHeB^wS|sGnQF{
tC`BVV(?tUxY5epT%^#aTl_V5x`2dA@c~MLj!bJc8002ovPDHLkV1kLsWC8#H

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/2/2.png b/data/tilesets/primary/general/anim/2/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5d7a9ee90d5830a9c130ca91ada45f3159dcdbd
GIT binary patch
literal 262
zcmV+h0r~!kP)<h;3K|Lk000e1NJLTq000O8002+~00000#7TzC0002ZNkl<Z7?pjH
zF%H5o3`KpGcx6g@a#pt>Rg5%4=OjZ}NiL8f_@{t?fk=Id)Nkk6)LIkLPf^E(n)pn0
z$}`o|$|PxaB%T%L)=2bFjEYo3q(dw#S!0--o*fc3JS9|Qpj?=0Tpd-vDVEJ@`^|k+
z{6|eFOK30wU8vxV`}>WBUlptv28$cRYUsEA*Y1(2598-o(=oFSo$eSvJ{N(Nd}v@m
z<HM0+DS^T@$i4^>UCEEG0SYwK+tC8QF@O0v_!;;W9+2anvzoiP2WxbmPG7-P8UO$Q
M07*qoM6N<$f<s+xDgXcg

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/2/3.png b/data/tilesets/primary/general/anim/2/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..42a953a83d3d07ac0899888d4fa4365b870ba825
GIT binary patch
literal 280
zcmV+z0q6dSP)<h;3K|Lk000e1NJLTq000O8002+~00000#7TzC0002rNkl<Z7?q8X
z&2hva4254W?!dT%q-%*y0W5p*-WKT)?=3+Ma3BI_Cdn<#@QntZexA^KC-`-=0g4Ya
zDjAIngOUg+UKRA#JID`M3L&Q`5HW$88LZv|_7DOn)6)?TPt)C_+ktjf$K&>N#EKTP
zAq??9&{z#EtEXkVdja#xr5@n?;fTe%vHzYKi(}i?5iN_qZ8Mss)>A?x=C&^4m3dfA
z8J&6B=kG;~l}t1CYA?8`Rfws&^HjW>q;nBOzLK9wtvbZ^04)}fKWzusF|O9%^I2V|
eZuzTwpSmwm!_VX|uNmF|0000<MNUMnLSTa9_IZ{7

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/2/4.png b/data/tilesets/primary/general/anim/2/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..112b2007709692d0df589326d9526879e6d6188c
GIT binary patch
literal 232
zcmV<E02lv>P)<h;3K|Lk000e1NJLTq000O8002+~00000#7TzC00025Nkl<Z7?q8X
zI}*bn3`BJoZeV<S!DJ?sk}J1x5(=^l&bLazn*|o3m5eb|uz*e|&|kpHL>0Y_L4`9j
zUZkfwnoD($Qeup>IB$z+%77gOrJ%YQ6-rG+n*YFhVJO;Jbe7TuY?EqP{jC=P*!PVp
z1f1<t%~IR4tT2XHJtd|zlR<^}=^6w_GQ&7yrB?k){tJxc-6_0LnxFV1J3p%DH3-ee
iM}O|y^o4KVefl1ni^FLQm=b~j0000<MNUMnLSTZd@m;w9

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/2/5.png b/data/tilesets/primary/general/anim/2/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f58c0b945e5c2c10c0147ccbd384139e51681a6
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^96%hv0wfrYc($DZQj0xZ9780g_D*o*JEFkhYT12<
zVXv*)<Qu6wCvrb$mVH~~@hfST`lp3krwQ35WG!EMH)B<-$?s5)-wZwt=cATrY?AI;
zxMD%vgDCAMhonsnnPX*|g|9xfFUb4zz<24pZ|AcsnUw>wAE|$<*Y&&T71a1<<AjVV
zGnc76y+6L`910iuq&@q2?}akwPS+Jls_B=4m@3Y)xow`qZ~Xe?>4hE@du;9QiO=nx
U($(wXeHr9zPgg&ebxsLQ04%*)L;wH)

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/2/6.png b/data/tilesets/primary/general/anim/2/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..784a543b4eaf8f0c9ba1fdf61399fe7fa2d668bb
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^96%hv0wfrYc($DZQj<Jg9780g)=seIV>aY)u{<5H
z%-GJcZ;!4k-!@js4STaSS1bJFJXw=Ap`+lTvR``(bCH~ZldsIS51j((9C4g&H>?w{
z37c&wW#A0$dsQrV(XFif&+)9=8{bDr$a;ObXY@EuYxSDC+n1ILUsf%dA@}XIK;<NP
zT^-HK4BoE<-r1a-oF)=<y6~Z=d=L<NM_sLD)ax&p7x5@X5adcvS3j3^P6<r_JEKX$

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/3/0.png b/data/tilesets/primary/general/anim/3/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f8bb49b69ad22a0bec3ba10016aa2cb5d0e6fe3
GIT binary patch
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQer2IWy978x}CI>Jvv9Tobutac*
zD>Mj{H!?UW91(aW!rD6FEVHm%!sNhS_H6CK!ooBS^FqCJ4R$6D#ke?)6ABzG0!}Ac
hj(Qn!stOA*vM^jN3aGl2D*pgvg{P~Z%Q~loCIIFCAxZ!M

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/3/1.png b/data/tilesets/primary/general/anim/3/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a2744a665d931bdf17bcd8e2ec1fc5cb8128e30
GIT binary patch
literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq!K+{978x}E<L-Ex50sj*<t+$
zlPfmT0%jf2ZH`W-7H!$jJ>Mn3p|e|C>8RUVN26|sC#;;GPJ5bdk<01(p=-B>eeqk?
zrRp<J735o-Zf5zn%+ExA$)T{VYc54ym-*$q<;M@!CD#JV^Z#6}2U+Ur>gTe~DWM4f
Dzau%{

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/3/2.png b/data/tilesets/primary/general/anim/3/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ddf1cda70a7b04241702d3a45c81dd3a638bbd9
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq<lPG978x}CI>Jvv9Tobuz0j^
z3kW#>i2Jy=`-pB~VPTqvd7)mq20IgnVqBcY2?Y)o0jIzKj+=1?i7aJ|tBf1eG!5^t
eGI4RHcgQj<+3F`9zE1l!$b3&%KbLh*2~7azMj`nC

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/3/3.png b/data/tilesets/primary/general/anim/3/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3fee847008a2125cdcafe2bb25349c59453a353
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq&z)c978x}CI>Jvv9Tobu)JvD
z7BINO%EZB~&KSmH$a+;{Lr!ORx3Tli&SFbvO92OtkDr_z*&G!b1iG4>PUJBPbDY*x
bb9lzcpeP%lGIO(sB*<`2S3j3^P6<r_Y2+a6

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/4/0.png b/data/tilesets/primary/general/anim/4/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..90dc0bc0266cdec32412d0d4b306341b6544962c
GIT binary patch
literal 304
zcmV-00nh%4P)<h;3K|Lk000e1NJLTq000O8002+~00000#7TzC0002@Nkl<Z7?mZE
zF^<I`3`FM&px<qUNvf>^xj=$*fmOKZZ&Ad-qAzxwpW-P7dl(Pu>338o9)HdYHbZbu
zusG*gx*z*%m{b$879xotX7)*9pGXk2c3l|bZiuQoQ5<9~3nVVq;sU%-ukl0cV_<Se
z<yok_mD%tjVj}W}chnVa<&)xl|2o(o1cN*X4aqPC-|*2y8%1_pY2vIrh)Nv9Tr=)k
zH%z9NH;!qdibkSDmL&<xop=SdeCnBSY0MOuS6p(OXwjrrB`l3wxgfLZ5VID|RW?IR
zs3WG|Zu<`0T$uhi(X<Ff&1q(cw<USMiD9{n(fU77182Bgwe!>f0000<MNUMnLSTYH
CpMY5a

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/4/1.png b/data/tilesets/primary/general/anim/4/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4459a94e54ebd09eeb29f73ae09ca0be4c6b80b9
GIT binary patch
literal 311
zcmV-70m%M|P)<h;3K|Lk000e1NJLTq000O8002+~00000#7TzC0002~Nkl<Z7?m}U
zJ#ND=425|G8QDCEa;8p}asgZP1q$n;=|~v9ggXTp3OH*o;K6;g)8&JH9v>e`WvqHC
zjw||f6;o&M&MCF7R$S}%sS$~kBm<F|LV`~9$1wc@s<iK$QV{8Z?1*o<B@QhUvp(rz
zl0&ESzEk6dLKXXhU%nbH^xzOl@2MmGk{juYmR!{{5}>R<;0^qb$RCL2A=%c5EED(W
z(cIpcf{;E3;8hZBuhLOteyKyPL_+{_fJ=^m^uWa{{JuwI(U5?v`3)od%xV!iqiqWY
z^bTUSXo0b&WPwt|8zw!l(}sZ|Mun~!A(t~L<Ku3y)t&p(`48ZDja&J<QfmMJ002ov
JPDHLkV1hBui68&~

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/4/2.png b/data/tilesets/primary/general/anim/4/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..389875c31c4109f32c8a5197659497ec080ffed7
GIT binary patch
literal 314
zcmV-A0mc4_P)<h;3K|Lk000e1NJLTq000O8002+~00000#7TzC00032Nkl<Z7?nNH
zF>ZrE5CzbG1&}-Bf`L?43cy_|U{ghDA~>m)YP4_%oK!2PiBd(JfP(zNj+>`lG4po@
z^j+Mbk0i!hv=`J-qDYNmugYuS$;h26QMtB6DCH44#}}x6&4hIu>$)g1=Ni&RkmI?4
zWa{DXC0E9EMIJr(h$ZbIlRO}Z?4VOtvgEsl4j)ItCne~JB4JyzaWKOFsT7i@VZ`E}
zCicz^v0nW(&W?PN;itkfTx#So^Qsqa<SfNmN}Cy_T^Ws?J-G}WXYr?s0p6nCyIYiZ
z?mF5sv<1?H#bTpn7FFH09Pg}HxG?8?wcSoaCc_{2fyEo^_5bPk2M~*_Zq!BtNdN!<
M07*qoM6N<$f=Jbj6951J

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/anim/4/3.png b/data/tilesets/primary/general/anim/4/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac8936cce5f2e595992637dc2adf180f4be61b92
GIT binary patch
literal 328
zcmV-O0k{5%P)<h;3K|Lk000e1NJLTq000O8002+~00000#7TzC0003GNkl<Z7?mZE
zF>Zx05Jcw+M(I!r7Jl_bf&IIP0x%bd;Gp^K3UP)2sn9Q?kTSUd1sRj(N%qc+W*2=I
z)#%MV!mEj{s7xeC-i)F!vGPfj0h#v}&Nn68B!bydr^Dw8)!~;=#c}M4)ccy44dm7o
zkhu_u=mTqzoH`wk1DR=iM0wJ4Di<*G39IB5!`)TTdAUJ1KXDq5C}P@b6OaT<0YX^0
zvRXpPzS&S{s)>wV&50rP&__#r_g~n5`U+V@aaqypZ9qyiDN`Ct_?mc5lzAVWWlHLZ
z%R;mr^Fq|(eW+%!FU>m=L$QQvsqjp0Vt}*!<EAGL>|B^)I&^DTa(M|&@4~@}aJv8d
a>G%hUe3<4)K*U@C0000<MNUMnLSTZp#E~-q

literal 0
HcmV?d00001

diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png
index 3d1e905107e51dfc6026fac9fd77a66589b332e4..121e835a2528f4663bf880c29d6f3d3c1aff4f34 100644
GIT binary patch
literal 7786
zcmV-w9+lyVP)<h;3K|Lk000e1NJLTq000O801yBK00000uNe~c0015_Nkl<Zc%03A
zZERfEdFD&1EwB&`@ZOQDk6Iw_y>uOl+S)UB)S#OUwB%eW@Q>7MX-3&D0xW8q(?uNw
zm0E`gQeacZ1xS4~6>GpA*-9e$N2yUZ;%b4|)}5g#6-i{z9j1(bB=*c@0lPmMiyT0-
z0o$aEyU%m(d~rAwM^1|D0DN%nIq!Y%dCz&yd%h_Fe)4Ms(=aVDZPOHkV4CZ|GWFV{
z5yly{1odd+H9{jHUvLYOFS|J@<Y#Zne%GzY(BiT$h2?x%a_-`?xW&q1JqI4Z^Ch_L
zS0pG_0C|Xf;`_cJs#25lehQesDS=n0$ZhJoO??6N-LC7q?Ez+&0F|5<h`+e}Qz@1f
ze=3X1ZXnAQ|1~i!b3b#czys{}C1w^YV#e}|Vh-KRi<$Rbsd#=tDoe$AnO`c+i&w0a
zWO=@llcmZs9(}JOzK7JMWrWJ*c|d-CN%EDlCxyz=B8BInrQpd@x#-Jv7S45iUA%6D
z{Oc&#N*ST$Qokvs{1sDNzod6qZ)<gM39}O9+<5>>(sS{(oQD$f{ff`}m}PyqGL+Bd
zWXLb%CGUHA87k)rGUOJE;uZX2=X_BWFEfB`u`4JrbG!6!pAp#>+rC}I?8k>-iYO^l
z>~86|A2Q{Ng*Rrl&vc8-*q@W_rhP@WcOzl{_5J&0|I&Vx>9PlyFQdfgmx@v>E+cDY
z1t?R)yk3;+*S#e{oh-q?#iEp#Dn(R}@5#L9c_?hJECnC6HB`vK=u#1;=F0`dK_p*V
zL}}!gXF<%;tgIEu9KQ$-70WO`$Iu#zB)DB*ncnt7d)KIMjrwM*`dq}V)3-)_tv}>3
z1TULK*0R}I$!4=B#LS`Wb&yi_`*>~0$0tn}6);rt%TVgG%JRNciZHq|d$TAvD>oO#
zt;|+XwIDw%ot0A2Lo4&kxsL0t<Q2fReA$$ndH=fP3jP(a*aaQ^{1s3oUlPBRE7jk)
zO~|8xxjuP?B5{!`@D1j>DD2$qBJxr|TPV+>7D|;uQGD0WLzQ0wm0<_UIgjkV{MX1h
zpz!k7$EDzYJp*|8>+}pSi|M(fisyA~2lyqj-F3mWD>5TPvHlt9x7=<}+3go|`waD&
zLr6m0478Jr<Qn4oK|mBX;)ck?88*bCH}A>*QgKQ4mvc+VZVqP6d#Ik`k}s}TK}{C`
z{(SMelq-Z~wCUL;2+uFU!xhW(1@X(v*WnM~GCnf_V+Q}RQkKCVfMJ7|ig-NX-H->q
z4)Y&)?z!ire|&sgPI;LrnP0v!1-EqLxa7T8{sM8+e<4V0fS{t-epyUwc~tjWz5TA0
zb464I)CY*{xcr9T5a8jENs~>(9Ll-ye=Z(lLuC}*P>w#)#W!H3>!Vg(HwUj$z<0e|
z0gcInaL&simC)&T-CPNT^Gc@ViU79&hv&JhfGhBSctYHDQ<ou-9CewaYbFfAX?+e^
zU>p;e@%;cdkF0robUm+{7niT)yh08iLQXv<bfgbOqV&0n**StsD`%H;lB<+*d@O_s
zutfvhIsniez>XBaBG_@p4FDpeGMYrUm`cPQiPIhY7s7v4p5dEKUgGaj_J$^ojqVc<
z2}b=^RpOifp;_)h7NQ0eLkEl)fT%`?Oc-Iph!y(hgjk2tX&FtAjY)d!=ut`G*9vj^
z@pSr$n2e>4KG9Z0LBRHVyG{GO&Gs9RnCP85=YeUWu=V|H_B{lKVvI9m`wR7s*<@W7
z0N+5(yo^t}t^$15<#)Y;diO5A>*kcwe<ED30poJlRmZG`GX?;Z5ZwfQ%x>n2S&Okj
zn6ZAZJ~GnL49F7iC#2r1f6e?ohn!|qCZA*eUJmnT4&^J<x7bEsA#_zrU!LSz&Ou*3
z2Yq?!%Tr&4`g|Jg-o6WaYw$kceG(H)4Bod6Nw9JV@cZectfa?Mp`4uvY)PhVM?jpo
zq*JLUKnv8qf>DA^xpe#yThfmwo{;oW@aj-KHRQ`^s;cjxQc7?TltT{SK<Z$?R&h{9
zM-z6(COD%hWX-W{G$u5#R5Ct_uQ|y&MMs%~B;*otu_-s|KyEY%dy_|CZ)ybgCTZ^o
z?N$2hguSJ`)R&GYwz600i}SlS^XJ5oze5i4cOZ2jMSBl~_SW)ufcay>XiAbvYH<Kb
zs1e6ecBB$`bYQPT50Z=#41%UhY8a3-G)?pa_?l_iv2YZQfn|N%u2-pS>AEg)=FejO
zOxun^E~+6_tAcLSppiewr67k4L30f(2M~u@wVJs_FzE>mdOZ$YbvVXb$R9wHxT+cF
z{!vMq_ormUq`m<H%#;Dg8HK%sMsczrQb$HxTo9`}m8=6Eo#X+O#sQ`(;bemcAV?gp
zG<8@*fgLtbU`OCyQ%6id0+1X=s$=Me^eKO;JQ6|gqi3Zn)if3AV+c^o-=oYQlpYy|
z`V{O1K<T5blt(q~ZrU5k|Nbaa<4;I1U>}l|#34sk4y7NL0g4Qy$v-q78BL(gq>>3X
zoa8|{aAY)rP%I`RqX|O}$BlJ%uwT&8MbvVyv#-z)GR!`?m*uCim`s+Rz60fFXed8T
zOEPrtC_?vkUVfSe5lw@Lro((Z5mW->G!>_vNB4vh(oKysNCPuXT?Z2l3$)d(D6$4l
zYC2eK#c6aLRI$mInBt2fVcb!qIRF;ZZ=46)gO_5KtVUuHfDxBfT_;3rS=FF<RYN8R
z9Ec1g%u$KO22zqR2dLD7`R1r2_(W37RIUBqg@4(q{T|lQ29umDr$+Qz(@l{jXuCCt
zv2gZWCS+M^SyX^l1yg|z&<!LwQP}HPFvg+14()YluS0ts+UwBX9S$4?>>Z)K2Wjs?
z+WQFYeMBzY4=XR=>vBIcIWPdTG!q4jZ#Z&ZNB&k>Z^7z$Mdd8r4SB%Yw*Vtiu-%Fp
z`%rm$A3$U7FOzks^C-!%!kS*8FIh1a7!i(c_Q-&t@1d1e2#`=<(o_O_T@pk$5E9Wx
zM268L{<enl`z^v@v`HBzsZ|S2a_kecVpTT>HfkZ;+m1KlBO3V!PI9CbXu8%`Zb0Lw
zIShjn?I-j~V4`$`6?+&W4%;;R)vBhmtdLz4n8incVSsvu2I`%U#6pS=sJ_Ahm7Dxu
z8$SQ0{2%%TG7L0B%LS;AR%4xJl9)Qcp}k4ko20!-+MA@k4()ZKkyuF4m(WwmOOA!k
z(7d128~q=&_YvCr2<?s0-l$v%0z)qJq2A69qXx4BXep}^!g)ZD)!3(GQDs4}2i&-|
zk84nS;1rCk*fHa>STQslWEp-f%X-uGePR!Tm><Nnh<spydhe65@5f;82P06r!vKe1
zFBwLsMXqToq$$?vj3el<Evh&A06>EMf*B>@Og@^mvG-_d*p?CU^oWLUjF6`Wc^a+r
zG<=P94qnmmaHWl7J@CqI<yCbe5#f{~#yJEE8(r#w8bm1fzH`_9&xAh!BsesP5)56f
z=GE5qwiq8Y;C_xb%=&o4Y%|_~FOXOikEkdGx>z>s#S749p|?`sRXNz)^=YVS(^O0}
zI`@AAWY~a{Fljk}i<#$X`FUn?RSU_baUK<eA5Q?7YT3+vOskFltG*;Fm`kmYvB-El
zp~^*hDWl1kWYN1a<9gW1Su7@-3DCR;JOw~At=xCHWB=C}gM<^iHuF5gZ1P;3eywp0
z;QO9@atZJj=elpZSKp8q+^d%`9f6$Z!BcyMi-0%Ka4?VmuDs!S=P-eJV-gdX=}Bn$
zAVCtwYy30sConF;0gJ^1%K^<`APA??>lw0of&P>Q8?0WSXU$#+`;U+Utav-7ZJ^Y7
zjv2D&)uX}j0s4xt0_qbilO<^?Kcr>vtWR&&$C?IM)fH<+^pNcum#FosK229%4-8YD
zP%~5=WdZw8Li@5PF#KWsM|+dBH%WVwCPU1DLx1X!YZ%9xTi9zbf2Praz4Svgp<{hp
z*;~~Id+GIzswdRA?62`PB%<xpBjL{usi*bT29<rA&CA|)Cr-!<*@+2xdpZNiV5<5_
z=J^xy$uA~PNZ@Axf&Z4cS0_%(rRj-`WTz+3$=T`5Imu=w|3xlNpCkBzob#1Zom|t%
zwOe|9hS6sI06Dc{oNq<Z3)$NExM<@w*jWc8YH+@4c!@$BAJ+)u4LBCUY8GU8hPChv
zCxy?9grO)yMm=P5@irUQR>Wp8al-??Bf?rhMMdmL7zeS-l-mWl=q}duE{QT^)I%x`
z_KsjQf{I^Z*Kw=bf0!Ig=@{$)qME96QzdA!YXXJ6%lCg#1@-88H$v!iKAmAjDRA)%
z*T|G@f6MX4NyeRG+@^96`)`bUg>g5+)Y(d<(h8TDpg_Hbz*Rx~22cqKYI5!M)e;n3
z-9n!dQDDa6oLtyu)2iDy+pNPu4xJ%KWOxXp+OEUxTu-wWXfUzCu#HeB;W49`bq}Mk
zpPAa>$kQRf?>@~6czQQLu}&u$RHZo1fD?jkqd_!ktHHWV=FBc}h6fcqkLCh^L=^_u
z&LO8(3?C%)v2CgDeVFt8xae_osUgD@*I4IGz&N8$(N6iNmRQ}K?~7Xm<hW5V&-zuh
z-vC88pQ#O~w3S0b3;4czcO6`%aDx`V3aIZ&mq|)lW;N8S^O2#hem<%YTK9OB3|m2q
zS(}2slMEv?LLuvpp(=LnsmYCxA2$HHRs-e#j=@W5J0lP|e=L;y7Q9RqI3D`eAAv)7
z++Bs3IT*&BVNENTqHo%5XoI3nnP)^B%wSM-Mw^mB4R4&$c0V7&lnKJ^Cf9cJF$Bg9
zGOkm;oMk2(pg2B3>irG#@-(UUG!(WLQ$r47yGYT`Aa3e2Tll{QR9A6A;P5=)peRtG
zcrAp~hN=dr@1DqJFH+T?gs^eE@jZ?=zQ^%~V7&1?5&msb5ZwO0T`9|LZ+=-kzqs61
zPHle|D?bfnehF{Pmi^j#@yEzy@Ex?Ck8i@>kMsVk@?r6<jC|;4UX%|@nYZelL%>${
zU2dTKQZkgwWc;5<Idkskl6mWepSPJWaOeX5ndWhfEzINNRcJF`7(d1lN(3!sJYo<q
zUufkY>r#2Wk64JoBr`s_o_}>G*r?>jV+;Qp4i91{5PJS{2sZs`%#4{~$h0sNYK;rY
z1u{H6m`<+)W|FCsXD}xG&g*J95addy*MTCOq8^5hpJB!CYNgqx0CI8K_r7A?flc@q
z>}X=xrf`xyVyEqGfRkX%r!n8+eA?lBI>GsLg7ayoKA*NZ-?yvt{W$0QNzV5j&i9?B
z`TmD*y-1q*nQDk!3t8tY{*j3b+Ja<W%z$C%{GV4tuY+qL>oSbX0~Qt*e%{0|(>%t$
zCt|mqFH{-ERmlkFW%efXkKh^mKLN~rTZEo9&E1{AOZN0-xnKhB98wIcEt75lMQY`i
zUVI&olOTTR@LHfDr`+78(2!Fjyv8t3!D)7`N~9rIW8DXYmD<X7YiK1TmjbAIBLwJs
zyGhk*Ro`9hTQxwPM40C^SDgmpk%zU#jum`(?Vqm6N7poX!tbl?vyUg~4o^yuA$+X5
zqK`A8UDJLd_g#zLV3z<NF^P8zlNklym1#Og{I!{X>}>9YH=lnT3;W*<^N$+C1_9_k
z+rl(Tvca%_U^hF}2BzuZUb3Gj!vN>CO#ot-(bJS?gtkf#kInQHi$y8pCmut&G8l0W
z2WZ><;!M~}mMK?MavtRTVzJybHp8zMe_e(Mk5yni9RpYvo)GG?P-^Tkq`RxP7oLzy
zFZfB!j@jW5RyBwQpiOrJ`u`adtT*u(VceSlgQ@*?{jtBhTO!>LeO_$q^LY17>s@(Q
zX?gc&N);D+Y-_{$9O>!;M3^vutaafHJlVC>UXJLZQ86qtR?U@V)%5WZzis@}`1hbl
z^ua*5XerzJ09{<CiIRVCLq_LppI@p$HrpN)&GcjS@t<)FpjNF~$A5}uI}JH@4AYFA
zJ241^+=lVrr)rWJwwWke&p!Y%;P}Vf$C)Cip+@FeOknKzouG%L$&+CqoliCuL8LH*
z1O(-t^`rkgLl>K5gew?banz9tMPl&;sE6T4gw*R=&#*g#V%WBK8B(gqD>Vl*-UVYL
z<N=sy)!v9TziWkjY0~$mFdrf+e=!J?P9PjZ+n5l6K54v>sE6Vz6yK1)zM!@`(}06@
zXvA&W#k2s(^=(p5!2};$phm*#!psh?)2Q<=2?=iPuqD`mp7@pn*pY}-XQa-sGrR?;
zOsbY*v*FlL1$~4l!R{kOMK?NwJF~6<id^~4*rXDg__rBPeeyK)e__?yc2h_ZE_|$q
zn(EgAeXOQhb!@uBDy5Wj>nE>FMaR19vzq<in^nTS+aMg+)Ykve!*x+aR9<wIp@edM
ziP~d5FAT-VQ=3jYr1yIN*I-x|VH=^l4iDB-)A)4)A^)l{Q6(Xv<^1HgY>=x1=zw|(
zI`w+%XqEx|5r&e3X8;+rp51Ihit;um%b7EGYHCXEo;LpP9`foQ@`@Bg@8ZvN;`+Ax
zkZbtA?s&Z~)7c4k>FngXdc%&bov(|rR#kVbbMn*G-QQdFe`MW%v_H@O7yi%OM%ML5
zIH&8^!}-yj{ol3-`p|wu@2>W+@N@MLbG0p68#vT{E&eY?W1<$c^y&}wHpwc6#p?Vc
z*@Q=qpz~lrdk<1-%dR)d^ARE&_k`;`@kai|2$-sJ>nMa+24D_OaZ;F(zcDeI>%iqI
z9(2mTjS6<x;Y<incP2~)9gCO*gGkz55JW4M@rHlx^Kzdb@lnZp{jl@@J1(eI=K;ve
zsn<Czc;WwQa_U74m`|U&@4iqDV*eH{_hvF`&G*F{qJ8dFjFq+55xREc7j4&7PA@|J
z2`cy{6V&ouJGn|_`4{}qG!woP%3)ZF`YZnPob=pN?vc5<IbXb<9-mQjf~X#0B;;HK
z3TOd6uAh^F@6Mq?xH*|~^Cju&0nE)6W;$=@cI*MsQ%4?<drjlBqB*ghq9+)4;P3+y
zah%UeG!p$w3AopL%Zc@IQPvPGb!4YtqKP+bzTxl<1zYR86^Z_@kX$Wey$O0kHIE7=
zCcYi!Z<0gji8Fu`2+GOnGp3xrI;qRwm8Q?giRG)4a`FeI>9C0JOubNZhviZuR|6XS
z)7CAw-RH@DUc?j4yY`;}9zJ;=D*24YT?I||Lb=nYNRU%nGz^_ON$N4-6bKW-^Jmri
zF31&)0943zU%5dAH&9^Hb+|Yw|7s3Y<efh-tFWN$U66&n{zBDHY75m+WyJhrshEFU
z0f1(EwJ-XzcUb#kn7VhbR&}cHyz{RE@{ak=I|u<578W$Z27T`gykkP7@&_R-?C|$O
z4$z{n({het9FN{5YRZn`N1YHN(MN4L{=jF=5Y+s#iD7qyTU+b<P%R(VSMnYFLTIdl
zh0Ax8JNe%7t8%jPgA(Aqn}EtC!h3|9O|a=Ys|q!s({c%c`aWiHp8FXxR0YFm3f0J(
z35&gvdxP7zjZjT4fZWf%i-djCAsEKGP`IjlHFHVav+hNC^@Yr<;bRzLT$tKe0><D`
zUf`ORyYS`$Lw*>iQiEWHn<e%bM$LzgV$?i_&_EiYfujiNi4<JRzyUEigG?PEr1}U^
z!bl)V6-pQg#kJ0huH9aODkc?bETZ0BeRKeujq3vTs{#Afpz8WI9sf<R|5YXgtu#A5
zODGZi*_(38F9C|a+e))dp;J5Bajjjb9oO22Hgauq{t*<P;epVflTv#ZqE*+@vipE2
zH@t<TAp7>)r7$k!-v!=KP{(wG^X-qqDX?REc>3gW^)SG%%!5r=In{nLW&r;)gntMA
zb=0qB+pM*;lbiNfrl*P}S)KMukULe7V0D@oaIz->tJ9RLwx|}awd@ex)%r`wFrN6B
z;%jPD^^sDb@^|7Qn(oQ$#gJjDbXyvGqls6KGJsqVo95%LaP+0dAP|FRI6KV^w^yo1
z9<+sxY(LG=>3XQj?0xJ+_FZJ?Vm;K%XLW-t2xco=fO{22SGI;u%P;--AA(_z+mF@Y
z4;A6wlk``=T8AIM_o@9_15|x{RO3r4G_UZj^M9Mkd1PY4|Cxq4FNSILAS50pI2aN?
zB*lvKOMX#$x8KZ5FYm7|@#N2(X6fQ}X{Pvd*L10rrAwAeJzY}D&vfy=>6~c2VQcIS
zNuz7E!`!{$iSAlLaPsQK_K+o<Qv7@4VyiRS6wY1(x!MDJrn5H?`aT{*hLQJA*Lgpo
zHZoYwlgk$o`p(;DH{-KvzpqI4?Bers@qhpFl}@OqDB1z_+`Ho6SC>GzuVA2*PR|q4
ze@@r;-$Vb`<PSdjc5nyyH2$w6zoy#0@L)p&8gjteaT(rU?OlI=HR}2v@2~PwY`J=W
zwd56q_f3WOP3P+OP4()1(_-zuDfq|Zl&Ifcb7K#oYhCsA$#pafA5W@BhNiE=wX9B@
z2n(@Yx7cukD%3)=>SK+BCoY}H%Jf9`a`<kJZZmhT{3C#ulH7|wN`-Omdbf_Kf~3Cu
zCx9QlUXU+;8GyJFkEIl9<3Hu}8xVZ78GM@R-t_oX3z0fKw)N{^VpKlhY+{(zILy86
z;neTmE5ncez9GX$(`gw#64?<h7CMftMhbms6-WBSdi?P|`O`lIq|<=mVSu{7+ROW^
zy}ZBLyFKT^|K)Ph|Il{CiGm)N_f7u~@0)h<zA1cNVWwL=S9B@Ph$)2`gxoo}L+O!1
z_(p#Zz+foWi#RjZ3m@Cv-5YK%yRN71BNkfkBNliyuSeZu?p0R;@s$@}CK;Zq!E@gL
ze1n%xp=A!a>e3}Ab8}%1+_|}Kh8WicpUvY$UHEYItoWzn!JXjO#We-3e7Per-Mg3j
zRrwbs!=jwX-coKP2zahu9j3?vR<lOf5Ea90JK9J7U2a<5-osPCdwA7Aod>pt>6WYn
zchd%jd7?W(h>Ny!%o6QuM=jYocJ#4kN5-AFu`yo8UBBdgh|r|(IP{H;J(fV~V{wXD
zb$G1RF&-m)i7<8)6a4hppJ{RkLHXU((X>33O1Fo535O`6t_VM7C6JfL1`hF)?Z4Z>
z(tT*hXzCdCeTn+MfP}-;cbNK8Ru#rl$03K0ALn<UI*ji=mBM!capuor{w$hs7vJsF
zjxpp9+4$0C@F>a;B0E_)JI7LK(Vl{<(!NI6`4sQTjem`0KOQ==mhYzc-Bb$p!ogV~
zjHlDbTl0+a-*CnH3+eQDz5I?z>M(eaV!5QgbUZG9Hm*Sx?+j=>c=znXYJc@%z~HkF
zvv*POEDsw!+qCM^1cNPcQ`OMJ1l`aFMWa3)T6tdYVII(XHdH!D5e4RyTIQS5!j(Y4
zR9)#*U0*dcSpS*|?XH71s8%ISWye(2j!bCBNX?E=%Ncw!9D(X>Cy(vGsDs`Z%yR6g
zRqu81?q;g}h4^;RxD$M|4yiH1(J_h~9TV#d<KyJ>xQrhM@5jfFCkSz_mRSU~Zg#wr
zBcNX(Y{_Ty?%HKzHLn3lLJAn#mL9ABQ-D;Wc^@ZX$2YtigtvYTTY_5<33x7JMY-4d
z&X3wASO2QOj$&qLCla+S>@Z}<o4%oh)fT57kJ;fa)GZ3HaKG^uccxbEX5T){i?vCv
z%zCJ?&l!(5_BrDl_BoZXMY&s)Tj9Qaup_R_k5vnTMY2`abY7HYk=%_j9ptY{etknT
z2zlSyNGR9UBG=n2Qac^fd{m~l32VRVs>WRN`bLim^{iX-P)tN0JXUKn8@Z-v7IIQS
zz0tLOH>r<EiXP-JuS^VYxHs{847uTbuuboIxo$p>dRueFa-5OP?|Frzk=Fv=4-N0}
z@j|?LKVe7HdHE|mFYofays7K2g*g~eU=U0N2LJN|V8GB_`GhxzT;A8s#|H4Oslajo
zqX6F5UE_V-0qV1d@tPBZ7RLf4EIcM+rpxn~F3)4WCZF&;W}fFUU7p9x^E{@@^O!Er
zW4bJjHJ-;rS-r-KXD;unxxBCDvV>j}D>n2R?G0oN1|xrX!{vRtyvix>)2*>2*Z8km
zf^aJ1zV`1iKK=h1TK+-WrcJluF&i88Ejud;3{5v%mBy6j_3B&V67_HVmE)kti6^R^
zh&q1T>7l7j!Hn1TPJZ(x{+p}c{XYi$_z8&>e)t5JJAMejEYSS%llA`uW0~?5h7Ns&
z@T7NLp3M1W$)$@WNjvEo`JE>YJsCp(51-7*{z7hs|AcM3Z0GsQepmgMH2y0d3cG2y
woB!OZTS{K>y3FMKD+0kQ($D{9#fyIb4|VU53&eUs1^@s607*qoM6N<$f*a3mI{*Lx

literal 7587
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
FV1mI!4R8Pe

diff --git a/data/tilesets/primary/inside_building/tiles.png b/data/tilesets/primary/inside_building/tiles.png
index 7d267dfb7988a5a96e65dbd0fa94f90cc70c7cb7..506bb74004065f61938e31cffdff5404f1861746 100644
GIT binary patch
literal 1813
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
D*=|)L

literal 1556
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

diff --git a/data/tilesets/primary/secret_base/tiles.png b/data/tilesets/primary/secret_base/tiles.png
index 9adc0e13f50a201c01e127b88079828ac6bda39c..9dee014ea4e6fc3e93c00e0080ac40b61957759d 100644
GIT binary patch
literal 7869
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
bpMrk{SgkyhhKxl^00000NkvXXu0mjfPak^F

literal 7136
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
S-Jt&e>rPWuPo-7~8~r~(;O+hZ

diff --git a/data/tilesets/primary/secret_base/unknown_tiles.png b/data/tilesets/primary/secret_base/unknown_tiles.png
index dd5c4e16a160f19936f19eac208086949e6cbaf3..3ca4d9e87975b45c0a3670b30d9ed6c0d08151e2 100644
GIT binary patch
literal 1316
zcmV+<1>5?GP)<h;3K|Lk000e1NJLTq000O801yBK00000uNe~c000E*Nkl<Zc%1Fr
zzi-<{6bJC<bnsxbfgqqmJT$OT1ZZTb_Q6ODOW~5gAb|b_51oQ!FgmmyivA6S#}w$&
zC2l;@1_5jI(P}LO9n2#OFI`N+AU8|I_4`Q5KV>H!iXgz#@Bt}4J(73dyHRBEp-If)
zL(L>fN^Y-1#Zk%Ry1A5W8qR?@Cff|dYh79(K5AJClU+-R0kOY3`IckyGj6Y|h~BgA
zzrnAc5`9H!x7(%k8J|8g<|5r+f8t@X^b3(gD06W7r9&osJI1`NF5Gyd6hnlm;7Kvf
zTjryh6oBbC|8B^*WOD-ozX0Evh_8B8oo8|C@{yYx5a@_J2E{1JqZ@8%qD{(!J)&G6
z{*Ke3JFyP^EltgWnwv-DdVx<11|!tgT30Bg07}{pqsE}@fKbsZL0OM%RtHvHqQPNp
zgof;bkFh^6KBWVm1+!$R=?4nqXF@W;K?_Y6m<|}2f*uVzpyLPCjf#ZjHX4B(?-7ka
z-*TSknwb4E&k2|C)jnd@Kc6zNkZ`DD&U1WlHX8Y*qiBQ__xn7=#ohAJ#i5Ieqw&~B
z5g+xVqBx>#X<kvr(aXBa%aqmYb;_m|7bzoraN#jo9#ge6UnOjLdD)?Qz2?y3;@1vW
zIrJl6KpCEyN6mIH6}A(Atb<dVsjG8o{{E~*ev-6En~+nC-zqgB8$-7MFBo|Nzi%*k
z)gpFu=pu=GjL$^wm9Z*uX-HpK+MGh?q3h*X*l3yuIUd*8s=b$MA0wpuI5oWXXFc-&
zq*>C3HJ5zrdgXpl#_V#|N>-eUU<`U=is*fEJ$ih#X^u55aFpk@R@6}K;?$I>1K3Yv
z<VEw<o<hRff!`zFAa#iedx#2-44;O_02^jP={`c8HujIH$(@^RW}raK{S5jgTDRy}
z`&d1`srsESm!xRVoo#fM;yi63Yv~b<(x%T_vrkc)7>XK6T;@4P(y=x7BMMu#Pv)qV
zQ=oT86a>g~FnNE*E^kvz1=b&$qMvQV=Gq2TWQf;Cps_w~>sP?}TSY&+4YF-Lu}(3;
z7T7!FGzHF0{jeZxrnktpHMZQgzje!g%Gt=c>FUmn{VqT0$hIfk5-8*FvU12#F5vIl
zEA`9N6m@t{?3`_kiq~%$y$mtSR<P?WZq$pE3`)j(B5!VC4180@qG@6Vt(qLd%wRh#
z_Jbl3aUA#P*o*^LbP0>oz*PG|m9YKf9sTeN&Td@A?8bh!VTzwsJn>CTPfQ$w<YK>o
z^K43v87z{(FIURo|Lm8w2f*!c;5cT=9p~@Tgsy6YVX(*BLy-+N&fnFEZyzFDt6Lm6
zZk4&*PwA^oS4|Hw+W~47O}DwTp4>F6jxs!Mzs-?SoZ=#3XLZhb>M{h*W_#n3BF{Z6
z=i=y{c@_jg5ClOG1VIo4K@bE%5ClOG1VIo4K@bE%5ClOG1VIo4K@bE%5ClOG1VIo4
zL3l4te*>>RCwp3}kv)0&=;GDa;Pf7Nb?>#MwY6_7)z)zI^3mN7{@}vL#`L#y%mxkr
zND>+zCf}3Y_P--L<UbrbnbBnLtP{=s{M^z8lO&&d^iQ(m(O<zH|KE*gNpB*0w0{3X
zzl`v)G3-vipyAUu>tt!>0Rl%Z*d*}qK1%3rS@+<1*Q51^Pk*2no6{CW9Jm>9=M6Za
as^7mzirLl*7h8b<0000<MNUMnLSTZZ_I&vO

literal 1212
zcmeAS@N?(olHy`uVBq!ia0vp^4Gav73@ktf!|bFpRSXO)&7LlfAr*7p-nP${aTj6u
zFfn+AK&K^(<{G7EE(S-+t2a)2&~f{+**_MxT2|4OJ+U1ko?R2p3xrrrQ0o<qw-jQ(
z^(n2SlW+2)XK&d|GxNkZ-hR2o=iZrje+BJa`^;nSHB>6R{qyZ?b-w%5nfr3DzTNfl
z`kQTkHIwK6Ju+kehsB=$?*Ex?Y|R#Y@Mjs%tF@{Jf{UB{pF8l)dA@;X#qy6oZ#(@G
zVK`)7?BIEBYKMtS`<ix#y)jn2uM>-s?r-GrSpHJe@}=U0)ppT09S(TDvAUiqqh7$w
zkYA&&Ih%2!V~L*I{%aL-XBpLbk~14yrDiMr`_rtsh`F!UC;N=`arJ~lmHwXBSazQ)
zQTBA0JJaTKP2-7eX0hejm;Gl8JviSVRn=sxaqB?!&IxCP%UE{_F1noa@R_zOZ<_ka
zWw~!S6ek~H_}TIOOG|B2f5$-?gZu_Qrpk@`ZM?VrZjI#7P*nI*dL_7)g)iJkYQfCs
zw?vnuD<pF0PIkCipq=tM?P|^3(hbt<ep;Fd86RMFsao9LaI)CeqkYB!0VdlEnOUo3
zV{aO#X!jS?_7zWfSj}bmsLky~`L=^L)=D!Na}I83c8DsURS{w<@j~Me&y3j5j#`^f
zhw2?!ajct1pkPUnbr9<=x#Nj7N%Jo@pAh+Y`u+NP?xRe`ynD>qKeTL{;Wy*R$C)?l
zQ(vv@mfE{DUi|Wc)5<9vJ-+5K#uGXPB7AQ5r%JD1D|x|WeYxv|d1@ykJg%28pZ~z;
zP}$;JvwL~U1T(+m^Nu7v%Upd=>dq{uo5%Q@+Fo<YEIn}0$LCCGmE5)*uKxuKcYfyi
zz%ju=!s2KKTlh-lhcfKJ%bB<q>O6IFjr}ll``g!<;)f)RC3YRnSiUjj5zFySofm78
zb64(Ci@tcZj<e*7sRCnhi^PY`Eec*AABR}*UtZClQr~h=xbB+nz4yCoxDuov8*m=y
zaG0So!}E$qQtG>QHy*Pz_oO8sBK^y5AD38fVs_z5LiJt-g`UYq%mFuA*&2*K8}!aJ
z&*5h7*_Hce>&+*(^&}LG-6sefH#~M(<;aYg*=**1i_cZ0-#D)OcHL}QcJ5dQh1+r4
zSN12?wIn^>VcNSRxMEv}Uis~Poj=ZtZG2{DW#AAava!c{h5(0U_Ybps+l&wY6ihSv
z!0^6f-+8N}b1h18mMP6RCfnhx`cy~n4CA>qy!&hq@fe7Q8FrezOVBM;YQMb0qE2<m
zS(`KOTx?b!dG*`;XlnDEhkuXWDLT9F_v}ZTp6)*!|NOQXBa46o1KGqM{)TYT#?#eP
z8&1c^-K!2|t@!!z-o0?qhSO1Nw}q=VcZ>JO+w6;GjQG1N?*GR~)dvq2a2fnO`-lHN
zfAxF*o=N%tz54FUUvU34+dgE!6R(<+*2UGAj+rX*t={tSoL%zo@7g7a<zIg`r|%Zs
z_2J3afBz1v-{1RR@W!p?=k2RQyG~f7hjvvIp12XE`rzST>-DP{X5HPJ@c-c2Kjv>N
WZ(jQ-)z=9smONekT-G@yGywpw;VJq6

diff --git a/data/tilesets/secondary/battle_arena/tiles.png b/data/tilesets/secondary/battle_arena/tiles.png
index 43297aa7bae64f487185711814eeee3581b42a61..7414666df9d98fe97653ad91593933a04039b725 100644
GIT binary patch
literal 2340
zcmV+<3ETFGP)<h;3K|Lk000e1NJLTq000O800@8t00000<(Slj000Q<Nkl<ZXo2OK
zzi-<}7RTpbaFKr?!2ShBifgut+5owDWFK^ESESEYE$M&-uJeMD45tWUh|0p-86tJ?
zRnlq2D0Koc>b7$1<|3SJ$#Rv0lR~`r-VA?=qN$BGxgP}l#pC1Sn-S;3H#0QjaIg{_
zQBmO#LLq76)>XB@3aYv;MahC}7uT7xUCc5?$z~Z>vYdT`!QZT|t_J1d!-r8HC0#|!
zmxmY^@j=+{(FzKL&G<yS_wU~i3bhvYQM>oi@`W0T_^4elf<g^Nd=$I_M?m6yS<V%v
zaGniHR)MFMRd`@1Nc?9XH(DfTXXj^8nZN<o+1VW;<3jh^_FFqD6l}wBhse0lz1+&R
zq)?yz)6#lD`qZq#axIGsA)kM`UMNXlR#7E?DI|`yIA0uVbA0Lei(xI!7suKhUn>6Y
z{2g4}M*O7^pOO?~o`S2ioTlX}EvH|t{w4G0RiET><H5KD{@f}R&sxCe<xA#|2jdd>
z^V@acNF!<aOHpq8@%4p}n&5@&u*Ais&9^`t$$41h9Tpt(C2d^V`nO&x6j)YOq(C3z
zeQ}I`j&B_rVe61z$~<4}xW$MFdGY|{@jcFl_a1Mu;mS%#INw|nf7IFo&Yz@4FM`=z
zNz3yBa-K$#X<A(VSNJ2iE-H<RkgG<eA;kCj5Q6_e2>4Hg_&y3r%ippk${J3A5jl^k
zVRNVL1>%C3fqzCI>^conG;V3*lBwgWD&OC9{Cys4zmmVm(q7liV`iHA;T%gf!BTbC
zIz;Pu7p)!F(&MsVoM}d_9kg~mOGQgX>v$LA)Ln=>hF+!RZ-gV0Lg4RJ8X>q+<fFK>
z`GnxFoZ#<`wY<2vr{-IM-B|efMXliYCgfXoJxFd%vT-<%I_T~(b$lmqRZYW{9>dk)
z4qjF9>ftU?OvI{5w7b^l^EdHi5&o9I^TZS6FPS>ex^vuI{*tNltS`xxKW@mC3Ki*i
z2WyF2Rn#yWK@yWWI80xMLR{VT2B^CbcZi?^lkxAuLi~+MY!bWAMmTehUV>0Tq3v88
zDs~^m?!OAe#RK<J<{R5?Qa8&0#Fkk^KD^NPOW#teo*%cIs^`Zoz@HkL^Mn<i8`b2u
zCq&pGj=s7htCascd`@?NqxUF*`^BHjf4b1-Y<s&{2#W%;tuVDDq%a$|T?mF0ODM(J
zIMtJFSpTUdSDfh!7`!Qt;1pgVDKE+Dd%h9Vf4;#%0kJHUK1k1U<$472>hwnbj(=j4
zkrj$~_t7_o)wb8azr?Ii2Iw2$x359!=ND?N%dSiSb7XZ<ENNX?_&Q^pX%gr{ERbdg
z<%Mfm)o7fBQtg8L+%=oR>UjB@*m0A@Y|fM~xK$RJtA=Sv(JDH-FdL?nie48NBJI|(
ze+Kr-!2an8{WGvvb?jdqEj`e`x(ORG61}0FFtcJF2r+cnm(c}+E5J+971a~EAWlm~
zNu3n$4v$H-IO_}E0i2c)R%hB9Az?j~b5D@Ewuhspu~FYe?-XT176R9|+zXlpGQPIo
zg7n|I7O*B{fKvj^IP$aWAXaR9jACEoqw6g)zjbH$>k@>nC5EhNHJI7yz%X{YRX8mp
zf0h{-ONy%?vDIo7Fl&NXH8?dbb0!Y*x#%?oYbR3B*YxH$L7iUL*`;ZiLM|#A?&!^i
zkQDth()X_(Ku<Sx=uq7}64KD{3jtmrp*TrN$tz@THS?LI{oqWkbMNrsqPQZW=Sz^p
zP(Ek+jOyR-K!6e<-vK4gcXaB0ve2IaT+gunot?R2+rOao3s#>Smjm4SkKQ3>?+}J}
zr>6mHjMnu#@xh>nU*mhgF39Ow53F9#wXEJ-yn4P^{d=ET%dp{EhD(d{wWyEc*3jbU
zgFlO9c&-gr?t6G7WLf!WoCV7AEy(xxmasT$TY-F!Fm6*=8LaIQpAX?h!wA*CM#K0r
z^{-wz2-LrNr4p=v*{q_ltddpOP*peCguZ<}zPExx)&zZ%XdE#_|FDdFo}G=GuocY0
zDV3M+>#sbPBXO)neDqv0IqL_;+wC?;C(n3p8~L+{L@rpPxIbB~HI~ok0kbNIRczru
zMIj&OE|Vf(3~Lde_=HK+`Ss5T)jxnRq5jp=*FR&X{t<P7`d1ItKZMZzE^2^$L@Afq
z?WeNNZVl{iqXzxcHfn6Fl{du0uHS;xY9QtMPYyFG8pxhDVb67K!2X~eB&?gLHQFDI
z6Tip0UoYii%yFK=h1*)0Ic4oByVc4+F(<3lnDbF9vyZin4K~&GcrZ&@hyK-I?*7*g
zaEG!5zK!z14f~^3dn!XdZGB)4-@>0|VEPYR?8BbJ*>rf)U{jmRe4jpSIgD@p&0)`<
z!YSYQ1gV@ohi!7m_x!K?Ms#<W$z+7Q=WASu?;EZGJ_4Fd=8+I^Z3^*ya98^OlcW_{
z|8x_9s{?vwO;{nH+(9-pn7|uig4Cc&p=F@YFzdLG(~m^lWlaM>YI>Pnlyyy55g)~Y
z>xhBth=J=sSP|d&9~uXFzy%xE-UsX{S|ET5%yMjR_1gjCPre-pHrx-`^#5rX1r(Sw
zVI6h>11}^opN6oKB<GtBCV<5NIyuFBl*J){ad8JS!O0pq7;BJke1rLJWEM;SiD48_
zrZ`zcz9Ht@yCdJ`1X69>osZxeVhtN+axFlwooDZJd5aBmf6hZCY<EB`RlpTs4bf|%
zSQdZ8^53@}v39$)eEw)bdWmvnHgSF0sj{nP)dHzk@f3ZQCI~ZhZxxBsMS*S939G*7
zp0G{_<Wh$%;|0p4{^J{v*Zb`9$9)?_+sD(_Ahs4@4PvFdL9uO+{rxvb?DcDqW&hs)
zHzBwLW(XXiM-UQ@0!&1d;3CWjI6{wqf%->q3CsvMLXRLs93_~zsYbX6GXkz_hDanZ
z2~mPeU`D_ZdITZjD8U3FxCk=>?u{NI(Jz8ue+2)#Mb^Kh`IpLir2fUtzmvpu$*&Ze
zTxTcT;3O=!3P6M?f?~pTCt;e7X<`=Z$$1m5@1wZ66Rz*WxPJqyfAWB_K#bl10000<
KMNUMnLSTaCvy>YE

literal 2067
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

diff --git a/data/tilesets/secondary/battle_dome/tiles.png b/data/tilesets/secondary/battle_dome/tiles.png
index e0fce31960390a2fbe674af486626eb49affa83c..be3708bfd630be84a3d052286756487e6beefe31 100644
GIT binary patch
literal 3626
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

literal 3193
zcmWlcX*^W@!^VH-%wmken8p$lBg>GQCQGT9j-5h8lC6<$3}PrtAty^wVIs*=MoAR@
z(qhn^Q9{{M5m}PGEO!Z|^z^*AuIttJ_4jk7IM`cB5*3L607)Bb^8<eu{hKN5-vZ6B
zmnr}x#Kzpj+5ha@T;m|6m$J>Lwr5zPGEH1HLw%kFmcYJ8yhJ0T0Z}_ulU#7u_2R)z
zNrrdrtxef7gOyoVMlT@x{6`vus`*^m!=49RTXFF*RL#iaFCUlrN1h)HA8L>Oc7OM(
z1yg(2bM8H*W~?Lq&$91CdtM>2mi3%v*W4{$t@+^lcl;v*_lvH*e$_vc7BsMZxg+JF
zrU~w}k^9Zwnw)&N4k^#W8Xas<)}RWbq<uc=>3~Kb!M!&WV*b<O4b;*N0dCC%P|T8m
zDt=tSO*(p<?dka*#}cK7$Fg8i#b0d7cV1|I{0wJ?g2o;taG2^;z7~oF6a|<d!)%ll
zroE4@L1v$y<rd*&oXJ-5O!d<Z8#8LO!7hBbr;zW!aWkm=DZX~@B3ZQR88_ov@t<|)
zmn1DZ>E=|Vrv-Y~Z^^W?RtHFXlqw~S-61V#-IJ#c3Rh8Rj?G(?K`(hBh<kT5#<MgH
ze{AuYBX@0X$!<I|PG|3ULnwFqI(p>QrjRht9;|4-de7;v|JA=5e>H3c7wxQ*$He^T
z&XfXYc2YRsTr$FqCC*(7`0%^xSJ5gFNROD7*us=q8BPwNkC~kf98AD|mNxMKV6TXv
z3Ika*nXU_(MBYH{4qW~`S{1vXoxc_T+y4AA+=MQ{MN+v*VbF)Pt8i5RJ~8#$(Bi;A
zE>U@|2=g#8d=_b#toG9Jq4L#Hp=pC1R;yc~@!MHDissRgU$YbP-!l)6_gZ4ft=19E
zmk!sr%09F|vy7Wa_^Az(f+iIX*qfsj17fG!q>|!&FVfNc?GVzJS8?T?3}USaq8s8P
z+BJ`?xHpbhL=c58KR7Sc6x^GFWS}YxVPT|0^@CdK<%;&9IV!Kz1es2zwP(Diz+;4s
zqVwosUiureMrA?m4XohvJ0o1zoAxq$NI6E%nt!?^P@10!p-<%^F2ce@7Mq-HQa`+7
zw+*m?lhY|TBx5Ns;b4~yB(PnNI=!<Jp9yZmRiIbh6zF)m*T&>s5$LjQtl^?5&g^`X
zpyw7251U^f`NsS-5&Crg?p>|fDZkn>`7(HZV10i}W}ehG+1!qgg%c9u3xsKY0O9p%
zEGKf9?bklcuI4fgj!SVUTBsEE>JDFlsmwjGp)m#fbO?XWXNBL9QhowtlYzNQ8Za82
zaen4L2+JF_zDty_g;imZm4>!qmGt9}l5z_ZNkd(DT=1TgkVZ-DmSkwY!%!4=_}Q+z
zi>mBMvGcwo@ZP@IWU%X^>(CTNlo7+@JYkMRxe7Wr{H|1~1(c46H-INPcaqBaBrwB$
z*{Oe3b|tZfjJcK}O%+MrNci)6gWKCuCOd!DpCGW&S3&mZ??f%Xlob&9G09LDj!5r}
zxC3+KbwMT{BE&8P>0BeN&@jU1jKefh*mKnsK-<1t`tgL7)<{yAdh*dz&8A0IM!w?<
z;V5MxM;B#4QNaq9fL*X!)|0Z;gLkTm4>dfNHoLSVB|f7!yM0UW?m{ryeO7%^=WPo{
z0P{bZQ8(Pu%E^>K8oktH9X6>7oL}Kfg2<(WzHWlH4L)hY6<6^RkO{-PcOV9gNRvfX
z47r&vJ9Yu`enF~O&zH%cs?t*i(JuvW7JlnVZr3^Bm??(jn>kV)5ZCD*s<9l<eWXDD
zu%;?-HAn7W!|_s|ccY<14<B->35^v@6P{C|ddw3miAiF?f39T3FwG$c-Z`LUm_R44
z^J&{}fY-`y6~=9LLLJD}A5a@v4(V0U>LIVo%_bj4?Tp*9y@06w&@TEuNSi7c?bGmq
zOxDZk<-y7q6j-1Mxs)Kh4VX4S4uhR4{!YrUWO+RBKv1jKz!=-|$#{_WJMa2!l&7VJ
z^pFKMdQ2sjw9F{F=NAKek}y4q{Z-^@OZvy(C)dp$G-^W0A@{?;&27o^loR0D(;HMY
z`T`bYlQP#7r7NdQKPRp!Hf{+TY<_sZ=Fy99*2i(z-OJzhUA-fRW8h1U^c_o?T+_sS
zIP%ZHzgY+It|{QjC<_vHg1n7c<t)+NzHo~PJg_D?l56&Z#xy5j`z^QFlO&s;gu2;_
z#Pp)G?J{K#%80IevqgL27KS?QdJ?=net8pC?oJdu{?)H?0<<OJoZu%OoFV;}*TY}a
zCLjk1urzc6?^@quh(rCg<m9?5+w2TCL!0{<cTxvZ2e!m1ijcu1Br3J(PU^=iKo;Ej
zoZ8g?@UO+TxhBM|Yeb9P0L^m(H8A?NL2hMwwiaxzT58Q9dOfj%Lf9{StLJ6kt>@U~
zt8CR1ZDedt17+oE0vnAo36)%8R^{dx2MTaCBO^olbH7SM)2WS;x2K*p%E@sHi6G4$
zTFYzV-V5!NhUCX)Mu@m5?<!?oL>n6wGW4Nt2MOBB>^h#_WdGoQ9?yEmGVfslp^J^B
z9Vy&heIO-Rz-(gxTSa?KDGs+7Nk2?)r}eBZsSIDcwVwhCiajZ5=AA3^ep14bkGk$&
zin=1NQvFQaNS!joYbp3c9B7Mg{&^j<6k^ojjMV-0;8;-hN$-K?6AWD2m-){2+1nVQ
z4Pb%30-x19PhynOgFV%eYAT}7l%r;(v@?m@R$gp|nH}xi{<XD7mjOE`Mmiu~3cl*_
zN{4tYr>=r~XnENZUhxq4UD5<zHNuv|`>4Fw`JZod?wx{a?V$vWU2pWhlXPPy*KOKz
z1|fnN-5((zGs`EzRF6}Q#;z-V9C}ZPONQBDkk8RF3l5KU76EQ1SAV3O%g%<hdrs-2
zhXGo0rS*PRBo$@PN&SP)H?^MsL}nF$u2>%`%HYamE~%<RqP@)kZEu3C7inq}rf&aj
za72F~m&}Lb#ufHCqVjSf&#|HnU23;D%$2pzw+~g1veobXAq(`tskhV1tNVD(ffgwk
z51pS1IER1+X?BC!fAA*5Lwg;Ol|kG^xqrj6U1S;G-MrR`;w?I(JWh{T+t0lGcmFvY
z@cNW-+=aU7)D|qysefU{CRR}t_)`P<CkMLvcKcdMz`^5(8V_0=ygRVhqV%=A&ZZ~o
zkU;2(!)+3KcyHl38#i~m{$pI7rzaM8J*(qoVnx>|uPe?0p~~D{b+A}&h};pQq<NJy
z!w`48^S}y**@7lZK%D5^&JK230yLlmu@MR$4_u^y5IvLvu9iw1)Bw&fk_rXTt5Shx
zy`*>ZN`gyNQEH{Uv!-npG=_~Xw5K;+bV|jnVz++wlwI{#6sclpS~H_p(B4X8x0-O|
z$aP<)0)tiXIh?VqZ`)=W{AIsw--Owd8uA0_3_pVx@vrOx3UJneM@SL#QO%u}@PPq&
zHRdIJ(c`U03#XI+=lj?adOhHT4z@$qk!TGkvPMEp_L!>)&Cgbn5c2fQ+w}J?9HrDU
zC~IApe}3t-CL|}P3n>M*KUmZb)l(647op?h96d(aMySHG4Gv<7Mvp!@<%J}`87eB6
zW3`nHK)Ybidb%BoP2O?r2$81n21B$CERggc9qvbVC^-Z8fEi!BFX$^KR0r4=BY1sb
zyf|b++ODWZb$%0sCO0$@a9=%IP8MDkFDV%~b(AkITG|Gbb`;$1SXD>t@RuJ|8ypY8
zFQuPYbo|}AKeT^d6J*VjfNzU@Heu%tX%%rB_|28z#EHD}-^*$mTUwQ>BSwKH9qJ33
zz?F<UBM-O*=KbGpb?+Yq%n=$Iwuz%Bu@Fk58#(AfQO2;ytRxMmH4T*EuFKMu`BI``
z8$?x}PH5}}E#vWu=3kA_SG{5jjLJV&$h5my%<8r%c{IxOM;g>Jw5*mm4eDd-T~;Nd
zozHy#_a$HmAHHl=G_uE+Sp9L!UYqVxM_tNq)L6CQ{J(mU4JiAxb#nOXf)|9FmboOP
zo)zf${$}I)NlPM{0~T6c?2&~Reh!QapYu^Z{U}Qtb+2+^i*a=J(6Kg;bccDiQiLT5
zCs<wnaff7|p&x0g=|mW!fZ_A(<$1|*Jt)Uz(684d*V=WW$%)+_#X#Q)*If!lH?J0h
zyh&WL4_aggTWb`-uQz`(`ttP{+ITttWJcCHvWa=xvoK7eTDFfLcO7^w{po2P`Uk4!
WCi^=kOK<!CPhn$WZ(d=_iT^)R%WMPy

diff --git a/data/tilesets/secondary/battle_factory/tiles.png b/data/tilesets/secondary/battle_factory/tiles.png
index 7857f0813af0705fdbd79750f6acf6352ee675e0..4d9463b201df6450b99a85d98901d68af3c749fe 100644
GIT binary patch
literal 3694
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
M07*qoM6N<$f?mZ3;s5{u

literal 3313
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

diff --git a/data/tilesets/secondary/battle_frontier/tiles.png b/data/tilesets/secondary/battle_frontier/tiles.png
index 70ec420e9d72078ecbc86d00be58d8eebdde8738..1b14ce5552d60b4d8ee8f755a735689e1e8699d1 100644
GIT binary patch
literal 2647
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
FV1kga0Nwxq

literal 2368
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

diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a9905198e98746671448b35fbd58bbcbea470d0
GIT binary patch
literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq}n`P978x}ruG?fF*|a&{#U)L
zmt$Hs>9WdOITstZWs)|>%rbk<r6~w>w>SN=dvu5SV_ndrgWSizwd=fLUA8CTqIks)
z)hi0GxC~{l-#g;@{lKxUcOG@eJwEcQMtf;UljeE}_df?>Wz*~yq)K1)OlK5)?kW&#
pwto3y^)1^Qmg>2#eU!%-wbJgEcArL^S%@#lWuC5nF6*2UngA)vN`(Lb

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..836986b1281bfb14ce636f381db107667b99cbed
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq?$cl978x}rk*q8Vo~H_y-<Jh
zhHluh$+l;Gtl1~V9Cj<}$=r5Qt?$sGC>xO{|M_=sK4_O-)+e-~c&YuL2WmztX-uC5
z+}U<)W0QMjp8M<1?0^GPc;=pVvd}O4lx<w?-?jYj0zs`uAC=-PU8J*~bA6IEi2t%B
mvn8wCZNBXL(8wgmd#m?Vi1p|$QB&Rka+as7pUXO@geCyIT1TY-

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..660d3080fcc3dfb3de9b538f544579027dd6f001
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq#8V3978x}rk>l#%WTNu5IF5i
zshH@yH9p0e#vDn!<{gH2Vw?|%yH9-dsFSId$L`|6_3CWus=5`reesW2H#3~O)u6?n
zktMXj;rWbR8}3!lxFGn{?O%K1GP|d{EUW91@9K8mpRuvg<4I(w<57tmk!C-;g=<3M
jgzxm|>uUDzowSG1bLONSR~CGE4RVvGtDnm{r-UW|9*{<Z

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fe571b4ac021670fbf81beb852e3dd920f73051
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQer0P6f978x}hMwEVd)R=7<v{$T
zywJ|M6Ef#qYZj1E&f@4>sK)CYS@>YXj;<f|M>HBM>@{!x>`&f3dHVth7Pa(($$Vzl
zU08f$uAN@sp77Y`*<`8sU;Wj8?&+PAbib3K#aC{)B5mRfX`gE5(sd^^Q$v4gZ|w9b
h`Sxv=@rszk>hd~!C%J$AzvC##MV_vHF6*2UngEnuN3Q??

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_frontier_outside_east/tiles.png b/data/tilesets/secondary/battle_frontier_outside_east/tiles.png
index 20cb7d67e88159ee9587b0225edc237b998adf42..da34656d18d2f6abfb8aa874e845c43f2a15452c 100644
GIT binary patch
literal 3834
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

literal 3750
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
QEC2ui07*qoM6N<$g3)HOU;qFB

diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a9905198e98746671448b35fbd58bbcbea470d0
GIT binary patch
literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq}n`P978x}ruG?fF*|a&{#U)L
zmt$Hs>9WdOITstZWs)|>%rbk<r6~w>w>SN=dvu5SV_ndrgWSizwd=fLUA8CTqIks)
z)hi0GxC~{l-#g;@{lKxUcOG@eJwEcQMtf;UljeE}_df?>Wz*~yq)K1)OlK5)?kW&#
pwto3y^)1^Qmg>2#eU!%-wbJgEcArL^S%@#lWuC5nF6*2UngA)vN`(Lb

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..836986b1281bfb14ce636f381db107667b99cbed
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq?$cl978x}rk*q8Vo~H_y-<Jh
zhHluh$+l;Gtl1~V9Cj<}$=r5Qt?$sGC>xO{|M_=sK4_O-)+e-~c&YuL2WmztX-uC5
z+}U<)W0QMjp8M<1?0^GPc;=pVvd}O4lx<w?-?jYj0zs`uAC=-PU8J*~bA6IEi2t%B
mvn8wCZNBXL(8wgmd#m?Vi1p|$QB&Rka+as7pUXO@geCyIT1TY-

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..660d3080fcc3dfb3de9b538f544579027dd6f001
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq#8V3978x}rk>l#%WTNu5IF5i
zshH@yH9p0e#vDn!<{gH2Vw?|%yH9-dsFSId$L`|6_3CWus=5`reesW2H#3~O)u6?n
zktMXj;rWbR8}3!lxFGn{?O%K1GP|d{EUW91@9K8mpRuvg<4I(w<57tmk!C-;g=<3M
jgzxm|>uUDzowSG1bLONSR~CGE4RVvGtDnm{r-UW|9*{<Z

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fe571b4ac021670fbf81beb852e3dd920f73051
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQer0P6f978x}hMwEVd)R=7<v{$T
zywJ|M6Ef#qYZj1E&f@4>sK)CYS@>YXj;<f|M>HBM>@{!x>`&f3dHVth7Pa(($$Vzl
zU08f$uAN@sp77Y`*<`8sU;Wj8?&+PAbib3K#aC{)B5mRfX`gE5(sd^^Q$v4gZ|w9b
h`Sxv=@rszk>hd~!C%J$AzvC##MV_vHF6*2UngEnuN3Q??

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_frontier_outside_west/tiles.png b/data/tilesets/secondary/battle_frontier_outside_west/tiles.png
index 3d5ea94f93e6d5598bb9c485b3b975768171a59f..03704bfd0f49d17c19946ce58759ddae1a803bd2 100644
GIT binary patch
literal 5892
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
a>i+?l(QkUCf-P(S0000<MNUMnLSTYHBZ9C1

literal 5505
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
NmZmm`pO`SO{tw5~n9cwI

diff --git a/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png b/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png
index cf54e1d77defdf41786e7137e63321d4d733920e..1c1f700c09e77e702b13b90f2888404310265ccf 100644
GIT binary patch
literal 1700
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

literal 1451
zcmV;c1yuTpP)<h;3K|Lk000e1NJLTq004jh002k?00000-X2fS000GYNkl<ZScS!w
zF>l*O6vzFYj>?ds9Y|)#Dp6lRR@ROJlEO0~nA|-yOAACG<zx)NBj*(2oz}489hVN4
z1KlkJI%IL*BPE-p=!o{xH~1{W_q+eS_kZtnMq43ULGBtser|sL=PU{u5en7_-UhsA
zex95~JdMIQ4Z;Ips{}6;<BtKHMgTzOQ4mJ~h22pE0M`?&5KO{uA^HHgpg|HXS9pFD
zf&yQ%Ossc!zTigyqX{rk0S%TZ-;@A~3M5;r?PUp&ocvPX|1WuAH3F|dX%NPtC{wTm
zfRv0E+%HqGJ_a0JAx+aDEz<x23Y1bzm1%$g1+U)J;=Bux&=3+3A|Qk$s!Vc707n3a
zB-)NaY{QxuxQ;piQ5+?3`z0m;s~`%I!R^<W1gwH>8ip|d0IpqtkWvAsFY~Glf=lVc
z>1(el1F?sLp*<v1f@>FGnI|dA2L&twz}m|c$_E8nAb=2OU>WBG*G>RqAtphh7D(b+
zYmP~9QHw;t$QhEsgy7l*plAW8LA;_gPeUQm0#JiuC#9!2Xg6$QFaiazjynKgLjdH#
zGKTZP4`4$8cx+w3`2_;ZAsh_~VC@2+f>oX{kw%+{RSI@qrhO$Yh3?^lI1!8{vE+F!
z8C;>rd@ZxW-Flv@;R@h^sYxuj0j#60UJy|fQL#yQB4rL%_Jt7Azs$Co>w1_(^V~5<
zhJov-s~6HJPHD0VMGnma03`|~vmN(6?YrniGI2(ZX_PA&ylKP`0IQTj{qvB?gbM)d
zl!W?wT)WxU2f)ZUx2*wjaP7Q89!D^aC}l~WB-qY{fN><H&b%xujWiuPhUwr6faVp-
z9Hg6wM&XL4GDiizx)f6Iom8#|3Z|Alah#Dwa2<C5SUHS?rHE<FAP2e}#%%2uvd}L2
zU^p=cLo&p*696@c7|Q`9Qt$yZfD~GL0P@wb4~_vb><k%)!I;vRgAZUQ*IO8jN)}sg
zn4}ia(?@_*LKCC{?Hp0Kf^wk=l#g~6(&aDC>;M01(xD)wEKU=69AugR08F3@mBHiS
zstf?*`W2=ffIQ_Q&Dko55{XIl)Yey?-Z7E6kVIoTGOWE1EPLE>1)0W@l`R=c!O)3?
ztIL+;uCD<=U?^2Su!mg$E})VDO>rh8VCzFAnN&EFO8}g|_krn*p{*K0PCl-nU^v?Q
zz%<9^-=q;got=8#jj8R}aMZ}MY}*=}x)o=KH>V9cgfXq&1ya5XWAm;R_kg52Fi)BS
za${P)3#M7V3(o>n@4}#b7oG*E-UXw47oG<w-vwgg`U5~%<t%Cg+EzXWRQ11GR&`$;
z0b0#;1o&Qh)BN-pfHa3FIRgA%0bU-g*ao=!Xm5M~j1XYIj6cjE-llE9yy7lS0+PiQ
z#QdlVb9X)u7H%KFd#$?w7(p+<BMKng#i9>D-y$Gv_EK~@2m30Zg5TskUpD8#3IVTw
z2&e`_33#u&0aiZ+w;BOKE9Su;mi4-484(bFtR~IPtnx((u=)T#XnmpI=1|VtD~$=Q
zs`3N{E=+MK<3eAdBOU;!a_~?_T>?JV1ndDnu0l<L>mr~gU=Qf&gFRqT6VMBA@Ilp$
zdDRnWD*4yd)wdq)ya!xgWAQc{%*7Tqcv8aGyl?qq8;<~iyt%p2GDyG&sO24{pJ%ft
z0Inq}kQ)G~uTp;fm9a0giynaQ72shee$?_Fp!)!-EY|?41mHC;dI9LCyF2)?EWhp{
zU{(eD@<oHSdniCaUBNxzLf`ZN9DcbU>jwZ_K=-*q`w!RG^^v&QoSlj`AZQNN;K_h%
z`KNmym-6WfmhAKFKHjm_{{g5!3(o>H$NG~2?XiAp|9?VYu5ID6Lw^7O002ovPDHLk
FV1h^MeKi08

diff --git a/data/tilesets/secondary/battle_palace/tiles.png b/data/tilesets/secondary/battle_palace/tiles.png
index a848a9eefcdfbbea8c38bcee95f029d415a8f7f2..4e11e3596c2abc3d645324003a7a1eafa6c01f5f 100644
GIT binary patch
literal 1633
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

literal 1513
zcmV<F1s3{=P)<h;3K|Lk000e1NJLTq004jh002k?00000-X2fS000HBNkl<ZScR>Z
zzi-<{6vv+iv4a;=9Re>wb!xm<0<x!&y=38X3JecrZR?f*X)^?rP@^kJAWMe8<dVNZ
z9qbOLwQvAa+3KZa;Vvx##Oao;Ro}bgFOjk>0eyf)+2(!teeZqm2f^`FI9{m2iz6M6
zfpdn@$CzV$-8N0SG8F<q=x;D`RJgtd1s@WOS(4la*cPyV3gSQkTqVI71xkYFUq|t5
z7SC=3Y#%W3R5s6^TJlV=?E?h3jx!=a;Ca61f572M5-kPLcUuTKfx&PvgbgW#0j@_G
zc%vXBC82*!Da3L7=q3d?+y;KS&%r<hDsTxf8U+CXe63&>%^sNwz;Qe;18mC>`277-
z)FAApQ3G5@SVFA9Ba@!b=l#AV7gHDl7+eT$0}MnR@cTy{j|uQ#KJV|y1pqaW7&Mx`
z*8t>!SouH+n4<v6F{}+KsZT@BkNRosaz3a55-b4~QgtB((0|<HD55J0F94WK4S*h+
zUB|Hoe1m}f0>B4DZVUSmwRO7q@z7Y(Myy|Soy=x^1Ux{%4oat|Q4Pd!AZ%_Oc6z-|
zx7X`FY;vP!q$rLfQqUI#AX6YP6o7R)-7d=ji&jP>Co~`W6Cr8<+o%JolL>1;MV$2~
z&0Im&1u$%|<>atqe%|SRWp*EKNCT?VnLI#V=>OEN)qp_Qg`$Ymg>smt$;dSH9Rb}c
zfc}R*D2hlvSOm201dxKf21<ds7<3a}Hg5!=4{`wcpa8T?Rs~o91W@v%o)fAISrMrV
zK$8Zgvo`+Vhg!DE0E=di5KlJ>0N!XDRKx<n=;1hC7qOiIpa9rq1-+haWKIOLh4-^8
z4YrU1wrvM03djenV;fWh@<FADtuo+CEZz>+VZlVM)P*z@pu8q#p?r`PQTf2k5@_d%
z+y<ySF)N|T+KjCLARlB-R6d~6>qb)C4XDmWXsNMgN=V0RE3XD%r7ot|O}GQF;6$>I
zDq)d7G;T=&eUKNi<bzhKzD45+vU5updTEq>z}k5d_<RKXf`BlKlVd5PacCR-yZKz`
zu%RieK{Exk7(H8EHybLAUlHK@uIG(#J&Z0cF64BCfTQ^*y>_te;lQwHJ!!EliL?P`
z4)AEjb-j^$F`Z6j^i~0^6u`D^7&dL1OlkVMiCO>x8mPb-X@Eop7g|9ofHuAiV5)V1
zwe&Tu$>yc;Z5Q_pk5s&rQ8blO0c<r~2n8@K{FSK+YBRRYFB%!3IS|fx<k7bCayrEt
z$hSE_b)Rj+KmnNUqROL{0}`BeE^ap?XN(HuqJk7aZ76(DE+Kj$z8vykjQfQ@4qRM~
zP(l^J@StG8Jkf#o$f5@TadIg_7q@NfqyK}%HvAk^0a!%?{*guGJwPwvE}fu$*TXz~
z^wEVpUk><f34lK1C`pu!aPRj{u!M5#q5oC`P#*7af6T2M9!KZrVMwQwQX7{7@=DS%
z2RCaEcYHc{L{aGbbUw;<(;EPgWsm~=(D#CX5O@FyNWsKf0}up37$5@2q7+{pu%uA{
zhWrjdScy+U9LR~D&AAT<ke)3+mKP2J&{ZGk=t!x*WeT$U6yORL|48vJ1*-F)em_v>
z!-=hTszpG$7%o$=d(<!95Bj@DMsrO-_5Hx!I8!yK0%$73GQjTQ`@xaDak^9i)^u|z
zp!$Ab(^0>!0B19U#_|*v-w$X)m6v+>kk){XHOsnCeLtuHuG9C#`HB&~`B;kg;o5-L
zd(^Lcj`N(ZulL|tx+1L%;IB>`=LP3a9A~`6_h6XrRI38s^H(qE!~|%lCtLgtT=8eM
zd2n0&5x)9for>|}v#szxTs8k*b*u)M_i$)KA0nQc_u<cV0VhfTPI;0rz7PM3XKMle
z(koJ9Q(c-r!repuXFx55wE@*4t_`TRaa};oNb3S>R$d!WolNTjs?+&DLeb|&0v(g|
P00000NkvXXu0mjf3CX9^

diff --git a/data/tilesets/secondary/battle_pike/tiles.png b/data/tilesets/secondary/battle_pike/tiles.png
index cba2f5794c3b16c52fd35101900894009fe84448..fc11f1d1aad5ea141001e340bd7ff2fd5ff79a2f 100644
GIT binary patch
literal 4013
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
Tv&lO700000NkvXXu0mjfc@5=B

literal 3922
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

diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/0.png b/data/tilesets/secondary/battle_pyramid/anim/0/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0fb59c0e021d2e655840d435dd119e414d741a4
GIT binary patch
literal 228
zcmV<A02}{_P)<h;3K|Lk000e1NJLTq000O8002M)00000$Df2(00021Nkl<Z7?p*~
zu?oU46oujQ3V{sO=MeW`S|oGx1nSb&AzcN*b`+N;n-B`gQ+jU-1qX5Y;J@61hjR}7
zFbuz_m>cM=2c5=0lxO1pja<<f{mU)S)yi?Dq++h#PneC;OoJ4j4R%J>h(=y0rRB7o
z7D~nry0A$BXB7`<RWz`Q(sEisNwb<}Z%MN(D09ZX(-AY1f=>&rpqbjzOk|qnOlkCd
eVmi=AD0~3+z;#HmFuY;_0000<MNUMnLSTZ*abAD`

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/1.png b/data/tilesets/secondary/battle_pyramid/anim/0/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..29c01920962389a765d112193d585d6656592cbf
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^96;>A0wfrY&u<9_Qj0xZ9780gww~F@b;v-Z_2FkO
z@ump*C66RJ_-YyA7nnMSwU?D{lHENsr&Y*f-X-DPT(NfV8c+9^-~TRgtnf}_K68bS
z^_yjJGxpg3=a=ae@tJwP`@e!&m|4&a(N}Ifi>66mTBDP-R&I{Vn^y^Zty-)Sd$+wX
zc^(_yxMJIbh`{hLv7;G!7v}_8Z&tFBwyeGNqD8be$<;{Pve-;*+k@H6_J{iQd2-4;
TUu{-+339fltDnm{r-UW|w$)V3

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/2.png b/data/tilesets/secondary/battle_pyramid/anim/0/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c463d9c3b0e572d421cf5488377285c277e4f76
GIT binary patch
literal 219
zcmV<103`p3P)<h;3K|Lk000e1NJLTq000O8002M)00000$Df2(0001@Nkl<Z7?p+0
zF$%&k7{&2-g+MHlYY5#7!J(Ujy+E}?R)=)$WP1afEl>jaPU(w+i$j+m`NQ{ur}rM?
zJkLAuYy=<64*%QfhbEK4viir)FUP_utS_WiS#r?Gp|Yr3U6SOW&dhjc#sO;B98^VY
zlLOiMg2PQQJHxyhW)88;L~|yQDT3PB4ap6Ox#lky!&xJo8R1NX+1k{DXAZmwAKnv$
VdF6~(0mT3S002ovPDHLkV1l|=U2OmW

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/0.png b/data/tilesets/secondary/battle_pyramid/anim/1/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a0921dea85aa33119550b0bf11f8f72807f145e
GIT binary patch
literal 261
zcmV+g0s8)lP)<h;3K|Lk000e1NJLTq000O8002M)00000$Df2(0002YNkl<Z7?owt
zv2Fq}494;AWvU_`ppO8Eu>(@)g2UZdp*Ui!(8akOlw?E*?s&@D(2eCMTXOyih#Y~4
zy}=;&ilkCN-V+=v%$;$1p_VK<*)!f7<4ps(f|{5>Ee9ovuJ81`;~Nw9RT-0(bI?lU
zD?x%nKf028@Uc<GnR4IRWM9il>m8&gJ!v$s`c~FOncwZF)v&U6)}ujCYMh~*;|}@U
zwg3Ef4RZhXg)EC+xh${_W5GO33$EK~dUD!M5{{ok!f=p;!&1^8Jpgy~X>hlz00000
LNkvXXu0mjf(cE<`

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/1.png b/data/tilesets/secondary/battle_pyramid/anim/1/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3474d081f891088b8ff0d8d1f91ec8a8796a2c20
GIT binary patch
literal 267
zcmV+m0rdWfP)<h;3K|Lk000e1NJLTq000O8002M)00000$Df2(0002eNkl<Z7?oAe
zJx;_h5C!0O83ft`MBHEzB?S_7#CVeut!yhLpx92oE8FD?<!4XH8)(4Arx|%{y@BvR
z#3;@x4r2ZhQz^W#9I?bW;@qg5|58hitn`^1lx-ooLb{kBeeg<TduxB^+~Nd7C0imn
z@|WOeK~&5eTQNU0uVib;^{ACb%cQpkancn!rh0BkTgd*ZA*+&zHM1_bMwA*FluI}w
zU&27f9{GLjkf)m$Cb*x-*8^I=73}@4VDY<z`9RKxyM)uzny`LwqtC~fz5(}?cfz@4
RqACCY002ovPDHLkV1nhebVmRH

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/2.png b/data/tilesets/secondary/battle_pyramid/anim/1/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9f1c44234e65202d8052d6599ff66dc0ab095d3
GIT binary patch
literal 261
zcmV+g0s8)lP)<h;3K|Lk000e1NJLTq000O8002M)00000$Df2(0002YNkl<Z7?m~7
zK~BR!3<c1C83gJ9dW9mEERa}NI3!C{#Y2_|b;j9K#<Q$YlIbb2OYq|9Yc#e#$ObEo
z!@a|x=AR_0_SVx%Z!~N$ADz=msX1BlH6ENg8(Ki`SwLM3P6D;J{P&M%CJe=>YGnB)
z#4r((!*6z!nk(BEqk6g=JbATjblz|DR;}^0_oT+|;{A#v*QS&2E(u!V7J7~c<Z~RH
z4*BEQB9AxE$Y~jkpL^^>RqVn>F^7#{a!#*zg0II#u#8FY`H<un77cixa%00r00000
LNkvXXu0mjfK(KLG

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/3.png b/data/tilesets/secondary/battle_pyramid/anim/1/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ad81b1e1e9daf31260a661bd436367997d4f31c
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDFaUz#}JO0$sDXqY$}IzMLm`*
zUDTl{n7Kp6p+#G-)5OQ{dcX|Xl?q{5S`#=9hp;nbt=1OT^vItMGQ-o=&t;ucLK6Uu
C+!_4<

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/4.png b/data/tilesets/secondary/battle_pyramid/anim/1/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..bea921d90e42ea862d1fed110fd4913482f3d34a
GIT binary patch
literal 86
zcmeAS@N?(olHy`uVBq!ia0vp^91ILh3@ktfLwv-1As{8|>EamT(fRg>AtM6=50k?0
l>DRtW$ShHxq~iJO5<~p4A6c#%^TI(IJYD@<);T3K0RRNb7Iy#u

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/5.png b/data/tilesets/secondary/battle_pyramid/anim/1/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..bea921d90e42ea862d1fed110fd4913482f3d34a
GIT binary patch
literal 86
zcmeAS@N?(olHy`uVBq!ia0vp^91ILh3@ktfLwv-1As{8|>EamT(fRg>AtM6=50k?0
l>DRtW$ShHxq~iJO5<~p4A6c#%^TI(IJYD@<);T3K0RRNb7Iy#u

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/6.png b/data/tilesets/secondary/battle_pyramid/anim/1/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..16652df19896a91d715ed5047610e1350fa210b1
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^91ILh3@ktfLwv-1As}Vw>EamT(fRg>BQJx30L#YB
z8!UEAY^cw7IK<Aaa@jpwHZ=_h?z7L0ZtyxL&1q_#qbhLwcHM%N`XEC*UHx3vIVCg!
E043%f#sB~S

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/7.png b/data/tilesets/secondary/battle_pyramid/anim/1/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ea7a49e6bc169a443d376168a5dc43547b366f8
GIT binary patch
literal 393
zcmV;40e1e0P)<h;3K|Lk000e1NJLTq000O800IC600000Us#_K0003{Nkl<ZNQv!K
z+ik=!4ATlyZUNI-AhIX8WS@@E(OXKvy^uQ~Es7Qe;twKmXpxZ#NiAwpp(=2KPK7Xl
zpbb(KO#tpa=h=pL0|mgZb`Lxcak8a*)a!17+KU*f3mF8(9MD<RMxMAFLpZP!;$cJi
zD8*3Zyiy)`NS+aj22X<*hEf-ON?q1N3*9<xbfZB2hlAai1A1eXaVFHoDa3ct6=qf$
zmPY6cs|<Y7aG>dcV0}gaKh%Xnmb}_7&7rF#-*j8*I$;UjmbyK49cxh}<fX7D0VV7f
z8M60YEPyszTxgBGA?#{2n=bE6>iLm(O5V8P?bY3zgD>T8e44-c+xf#7`NJ6b!*Awq
zoKn}Wy4(C+TkO{`n6KAU_~%YI`Q@U9$e%|3n8N#8y}?f2Ufmzh-%j42=I@w)$NW3y
n-!cFG!TkH+l6Nk7<9Z37meuh-l$2BE00000NkvXXu0mjfNMW|J

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/8.png b/data/tilesets/secondary/battle_pyramid/anim/1/8.png
new file mode 100644
index 0000000000000000000000000000000000000000..2895d3319a5c35f73a524731a21caa8f30647a0b
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^96&6<0wfqt3-&AkQU;zbjv*W~Q;#?bGAMAk9-RN}
zBEvDZ8xB6NA567fb3mY_Trp?bZZDP-yCUr6?^^w2NRXB}w|H{pe~=lTu6{1-oD!M<
Dhh!kZ

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/9.png b/data/tilesets/secondary/battle_pyramid/anim/1/9.png
new file mode 100644
index 0000000000000000000000000000000000000000..63c22acf2b98595cf3a22b7d9dfdf18fc3847c02
GIT binary patch
literal 111
zcmeAS@N?(olHy`uVBq!ia0vp^96&6=0wfsJo%qfIDKk$O#}JO0y+<|*GAM8`AMlYj
zQ;@FM(V(ukI_UO~qs=BwQ^J|v>Q<?}@SBkrwEEcPQ<68XyR&ypvQ6F@;s-K;!PC{x
JWt~$(69DUxA{77t

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/battle_pyramid/tiles.png b/data/tilesets/secondary/battle_pyramid/tiles.png
index cd45ea0454268948300d5255f820a2ebab3d6315..d9609f3dd48c091947cc013ab18a7a38aadf1dbf 100644
GIT binary patch
literal 3504
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

literal 3208
zcmXAs`9G9<1BSoPte6>wFoQ5;YdAG3OE?<FPPXh>24yLGNRl2)A<HOA_GyTSnuvxL
zgHX1k>`UU!$&yg1B&Xi<e%>GM>$?7hJHy`AoFF7E1OOmdT9`QgYxv(Sq5cKvL3k?w
zfVZ<WF>(q@`dD-{Wcs~SPt)`jC5A*CLkABj`cDiYkO5LJTN#jQKQ>_k9_(M0!{9B|
zdiZ+Gy(WjT$Z5q7*M%*yI+`^MZd1;lhV0{;x;>`x*(Yx;>N=L5$do<K31=K*zb{+-
zhizf?(6aUox1M$Ms$$pMpBD{hMS5)~m<@kvgb|ugPs#>N>Zj$sTxeg2O-3kLMundi
z3^<-SVz|P)sM_)o%F413+v(lYgH@gxyVl<veM$j{Ax@k-vB66%M#k-mF(8RWBqK19
zNPhds{0YAgN5wa0%y0CCYzx8SMI=gg<#6x}0HpG>Kv9yHaYJ9?#U53&9ORrXLb&Q$
z&2ydIfQ1fg2Y3z&WKb=tuDx881uRon`qat9a?zZ?=jTv$pZ&2L)*IRbI-lCjN+)OG
zkyyV4H>ws5$k0lJvQSK&PRzcIpmky9CuXn-y$HFj58c6pd&MA4Vmvl?36P0!k_vJJ
z#k^V!C<)G+B65MCQi@W#7T%DjHH!=W;7o(y&Z!h?Q&H#x?+h4{OmS+R?1+_Vk|lw^
z1b}ylW+dU&A7ZvxcUPTzcaFt2#)P94oWlf+$Df}^sCahfh4Kftw?{^_!R*s)@JWi=
zCBb3>;#{J65*EC7;Iq*5`A+dayhX7`VAZOeR~yLgM>X)&u*^UxmMbl}Vb?Xw^HXnY
zEOwdXo{DV@NY*-i+z_5NfMxx%Ng55I;qJva$r0@1u~Ube)Wk#dbGE^y$e0ua-_TFL
z&%>{bd#HhO0IYoJW-<ou6si-EWK1*M>G?POSg_Ag+y#s0Ga`LXDEY46IpuOGQ=izZ
z42C?s-2FZx<}x@;6dKlf_8Jo+?xd9_M9c#CH$rM~ttr~hO$h-JQ+Dr!AlV+b;nC62
z?bnWt9_KwSB{wJbf!ZlSem;U?ZUF(Ghqa^K)i&*~U%#$u*~q^fv7a9=dFez|$YY~w
zhg$%ua<6Y%X$J-@*fR<7?9TX+OO92VZXUkij1e%wZ^hZ41!JvxhV{1Y9P1`GNoj=r
zcgW=?Xq`^|AZR4^w0?F=w??h^1D-hp`(LtL+&6@gtD{e8;B1xcX=SIs8|u*8B5kkP
z#$pX@t9?X4AC50w2^c;RKqLW{B@Yfy<0IP8Uq1pq0c#&CUN`d%lIx@;>_`-M&l#HZ
zz4<K*2RB11jl$rgRD|zc8Gb$cML<5C-lruKlbHn44^6RNU&}XKz@#sy5_}YKirMO^
zg=$LE$t@eIv<Gv9-RwuwU#oRi{?H|A(!$^djB#yD_}*!joN`{8a8t^X{C5*&ZC`2q
z{e6KuZzg9gWs{pE5p`5o?!DR-@e4^h7Yh>CkX*_attDtWUaN3Nn+F~}O9M;4L&1|D
zX*(Z!XeWR12+a4OS;KADIFacHEW96)`9;Y(iE!@#RM$?P3fTgwo|6<MC8qq7C=hL(
zwH==W3GJq*>;=Cl)29Vjzv5w450_3P|CpPI0RPa~g#aB<E=63U?vc%YFjgjZk3)oe
zGCyi{90-xO?^Vqe7Y<V7%cl6(_;Y6sOH4prBK9f#*g8bCsm%(?{i4#!m4P4iLw(}h
z`08Fj<W?QQoCm@brcV=r8=IL#g70Y@6ETc{%C;aQp&O)KLmP%qez(h_9-=6o_!}gV
z5!Z8KF5maS<EDK+8DXHc^FojQQ;@*x5aFpiILUae0wBWsO@87$b-(!R-O=;7byb@E
z7B{1b0z`fsJC20|S%|T<dj`DmAf%j%h}OC@(LR1%VO^7xud|FmqDQ>of4**qlIBFC
zpPZ+`^d1B_2A5y1o(ON!g$0RVs?Y$a3q%wnZvtU{aLmbJWSrko3Ul@|as|&vNAMR<
z&y@sc9`X>d_wK1swIa^JGE4^RZ9@3~F2PvzjP)A=@k?r7iYaDmcNDU*v0bI)K>2pR
zyYuLRrgN9S=}R>$?YrsoHZMJ0^KtH``$@KCeNuXUVuPh}u;M|uXyA_fgqP#!aq31+
z$&oXXAe=O-d;R<?9E~^7+ZKi7SNR6cv^tr=k)KP-oF6`_R(;>&qY)2IhBbb6lgXWj
zvs|>Vu$BCuMfT#s(hOkdab(~`(iM+2J*xfa0q{%r!u<9YD;7x{Mc%YOgN~8Aeut{|
z%IXOD@wZc5xS?n-MzQn0B@Zl{ZXpbIP1<N5ydSg>T@zIp2X%40O^QoLns(fh5CR(1
z-d3}G+!3ezw?3{Gf`REmuU^b7_jMYAq~V}OD#C3R7gCTC_6y5%Dv|${eQ2|^MX+M#
zte;YFJ`&^s`z4a&;byhH9lt)~@DYv({?+-mZ-fisYjs$AiU&lXC4q{a#k|*Nvp?@}
z1uF(-Qn9&x!G{l_UU-3O--{=B>(5(mwKQU$zFbVM9dt~Cfcp~IEUntNSt>7uAgNTg
z_y+%4-3K~2iwGKN`@}f`&zts3_er_Kt&sN|2u^PSAlj(9O`H;cYgXF>yPH1jIubaN
z8IdRlS=v<K*pY>s!Y@!yY>N_{ni+1%_nCclmW1uP13wDdG*2nfC6AU4ID)fkViZPw
z?kzaHJ0gkt!uA+?y+{+-Bo$>4_&K!^=m(zmWTWMy?FHzq`?0>;eUS<-dxw7>L@P%H
z{s(!*Xv!sPq_k^7qyl?HF^?Od_RdjqjQm!l)nU(Vs~Y1gf|_fQKbE?cvT_QxUVnQ>
zfd|)yr-39LuY~x#k?;V2oHF-^q<#V7hOvz@8U~&+San_FzcG7Xy!^U-z(5>@oaLkh
zKOoEV#Zk~_pFf%3$qNf|{zMG-F7C%~Jlo4cx{mOTTInT0VgBW~26%eIM{Aki2N%E=
z%xURCCZOQ4_0_S`QoT4ctIAXs?y|Q-Am$=8UUpsJxWQ_Gt?WdR3}x~b)PW{@P*LNd
zW-YYBDscR+31n~vx`TZH^y(To&}Kz681-GaM2X<{vt^|z4L!gV6=ZO^IW!fdmmH)E
zLK0YD$8-Qh6y~N4Lm;a`FXif7W3eEM)M}U~w>D8g*g6+Dfh0#m)R69u7RLB+Tt&D~
zYX8%`HO$S*TXnQcx9RAFa<&l(Orx2*yts&GXQ41OFjgB9KnRf@LpEdAmft>>NO183
z(gt7$51stR0+*BQ@(%{IbbRX^oV^Xs%NrQr=#!PVd*%1w<Jkr3sPAfCtJ6Yy_@;N`
z7uU`dD4(j{DJKx(3cF6IXwRw1XzouWY*9h^E9Jcku9L*bulRpvq|j~pI5a=(s6f7U
zh<&81gs?z8d+8s!D<+uyB}bV+2GWPRF?U}rB#N+T{PHe4xxS(+#%LG3VYDhSw45w9
zfJUY3gu(Xw9w=i!?DXqfbP&JqKYbR@fa8UC#w1t=V}AYKdtUNsr9in<<DvX7(X>Aq
zzjMTd=A79XR`_~24!ZpUwgQxgxHph!a!|Z_&F0i0Z}~Q<muL|fp{~PtOfNbANrA^P
z#iXZ&=Up(r_teZTXx>Xruf9>#@;P0Nc)S0nap2ycAP1L&7#)^+{+Ny~)ttc1$%~la
zQFC@XK7%N@?avhu2RTT@t=>oazQKs^e6dpHFLtyEvOjEEI}2@$8d;z<aBF0f=yr5E
zDWwbwkeR!i@+XvFN@XpNM^8v}b<yAgzS#Iyp1HT&bzdDxG+iP~jP-W~Fhp6uP%4*~
zRX!k)YyPESw|hHTA>JX4w7uhncNz+<vG%8U4t<MiAJ5kJBVy?i^p($1a#7%1u4M#%
zi??y?`(f$lnwy><`i;qF{Onh+b<@lwP@_iVir)o_!_s`?ewLqti3_dUqnpaN@XV}Z
zj^uTbjh=MJUrTSFn0@p^oY<<UxBu5WgOP$)9YJ``%#d^YIQ-k1?>FtuxxHIvL!og3
zguE$~@dw;bP9k7z2e@f~)6d%4<S#F~fms9D#djd?=kgMmZyPo=pqpVIPFLHpUqLo7
z?}#2>l+uM_13WBF0tnBKJq~mvjV!}QJzQtunTW~>P=t5{>k1hl{M44#<yRp(V+aSo
zr>|Hh+0jkFWwt8aT$rQ2kw$4iTom9yt*QSH>XLxbA)w;RHAg>%T9p(y$%9HJ&O=vI
hmxSUGJ1puJDf1orV=isq{QoY7rKzpSJ!59_e*q+xboBrL

diff --git a/data/tilesets/secondary/battle_tent/tiles.png b/data/tilesets/secondary/battle_tent/tiles.png
index 919e3878f879545efd434c988f3e05726cf84895..35e5c4b6545c856665e575db886451fe4d56b1a1 100644
GIT binary patch
literal 2084
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
O0000<MNUMnLSTZta0PDw

literal 1696
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

diff --git a/data/tilesets/secondary/bike_shop/anim/0.png b/data/tilesets/secondary/bike_shop/anim/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..069509b27a824bc4a2dfeec837cebcee7719c833
GIT binary patch
literal 250
zcmV<W00sYvP)<h;3K|Lk000e1NJLTq000O8002k?00000E6fHu0002NNkl<Z7?oYm
zF%H5o3<c0Hb>$GKWn!xM=@NB|S=hUBxVlrW(XHYH2qrFqol=m<@RUS}{f$W^VuMhT
z^hKayWA26*T3$P7br_)34v|VwjTChUq4pST{d0C0oKsx`j?ycy1c!o=3=T0iF=4DH
zfuu-SvTP*ZSv2uzh2YTh@wCTUK92@twjW;V_qebeSqQl0o_OST#$#!L=R)Jo-e_zh
zPh}m0_3$Y##+<c6^}+6(U*$E1w=7hJ+K-uh0}hg0OBtHBXaE2J07*qoM6N<$f({92
AYXATM

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/bike_shop/anim/1.png b/data/tilesets/secondary/bike_shop/anim/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4123bb0bf31eb4946c4e9e366b6ae20e25ba515c
GIT binary patch
literal 249
zcmV<V00#ewP)<h;3K|Lk000e1NJLTq000O8002k?00000E6fHu0002MNkl<Z7?oYm
zJ+i_u3<TgkOH2iw*J+&6dJTPA4i{0mBxP=p;RFm+?;=PJKQp-a#`f6K3TKgwH-w6m
z4+2eZLO=dv;HihsyAew5k*NgLC|NHMYQ$*kmp_NeiCu@qQF`T#<WMk?$swkY3#RTY
zkdg^YR*m92izXheksNwH#>29euam)C?T458K5ndgHWIEi68Aa;+}B~jW2JFpG=fd!
zsjOqN9zNyK2vujyFYM0wR^DQG%f{U3{8-5+$HQXVW-XBh00000NkvXXu0mjf{>Nzn

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/bike_shop/anim/2.png b/data/tilesets/secondary/bike_shop/anim/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c463d9c3b0e572d421cf5488377285c277e4f76
GIT binary patch
literal 219
zcmV<103`p3P)<h;3K|Lk000e1NJLTq000O8002M)00000$Df2(0001@Nkl<Z7?p+0
zF$%&k7{&2-g+MHlYY5#7!J(Ujy+E}?R)=)$WP1afEl>jaPU(w+i$j+m`NQ{ur}rM?
zJkLAuYy=<64*%QfhbEK4viir)FUP_utS_WiS#r?Gp|Yr3U6SOW&dhjc#sO;B98^VY
zlLOiMg2PQQJHxyhW)88;L~|yQDT3PB4ap6Ox#lky!&xJo8R1NX+1k{DXAZmwAKnv$
VdF6~(0mT3S002ovPDHLkV1l|=U2OmW

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/bike_shop/tiles.png b/data/tilesets/secondary/bike_shop/tiles.png
index ec109c3be0ee04ad6b9b6b5a13405a06d92fc084..e068538f570eb58e37ca64999687ea87dcb410bb 100644
GIT binary patch
literal 3505
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

literal 3270
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

diff --git a/data/tilesets/secondary/brendans_mays_house/tiles.png b/data/tilesets/secondary/brendans_mays_house/tiles.png
index 10163e9f1cfb4dd7e406129255d1621501f44091..6d6a5f04776151a993d17d39c1e8d3a045731abc 100644
GIT binary patch
literal 3074
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
QaR2}S07*qoM6N<$f-*(o4*&oF

literal 2616
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
a7VsZPPK~wzN(}1&0000<MNUMnLSTX^9Cxz-

diff --git a/data/tilesets/secondary/cable_club/tiles.png b/data/tilesets/secondary/cable_club/tiles.png
index 2b153c1f41f2381cfaa47707e4fa3a5b3e5417fb..c5ad4cfacd8f5b934b63aa2ec2362c47d5d0e3c8 100644
GIT binary patch
literal 2590
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
A6951J

literal 2445
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
LNkvXXu0mjfl~Pgi

diff --git a/data/tilesets/secondary/cable_club/unknown_tiles.png b/data/tilesets/secondary/cable_club/unknown_tiles.png
index da68cdff2cf7a26f4e7f0534d0b59237dfdf7779..84e79f7201055ac6ab4a8057891d66e452741c55 100644
GIT binary patch
literal 311
zcmV-70m%M|P)<h;3K|Lk000e1NJLTq000O800Y1T00000=*Nl@0002~Nkl<ZScUD=
zF$%&k6vpxA(A}fC#L=ye9xPybfEF*%>H)-#Iz-X2(82h<WT~Y=5Jl1Vh950FXi5Ji
zhoKizmw8V0uBw<7DEDBam`R5mLluV37*ZJWGse&e6Ru=0wpY~HTi0}CW(80uklgd?
z@B8iaGK-LQPBMDsNA`yIl7ZHGO#iVz=QL=o23y0odvI0E1Q^hQR_ly3=D~j+-Rpf6
zJl2smnIpRdGrm<9ka(;o`}pAq?}p<FnT6o4DMxtVCJi^KL!v|f^c)j1^TGM_dO1e-
zd|V+j4sOaUI6})!YHrde`UNK>2!bF8!t*pAe*@uXX=2>(-2hUL$e$(P20Z`(002ov
JPDHLkV1f^0i)a7<

literal 287
zcmV+)0pR|LP)<h;3K|Lk000e1NJLTq004jh002M)00000GEL2*0002yNkl<ZScUDD
zF%E)25Jj=D_h>dtNvEX;+eA2k#0#Jvz(}dZYP2+=aKsJnqQ%bUYeO<GA)(>r!_421
zP)A*@A}DM6B5{JlCW38Hu)Z>!!-DFl7_u@b*r|j;UBZItgkj7HMhvV#5=eqpFymG^
z4GD-eHCh+1tG$iJ3mT&xd4UM_`MdXKi3mu$^B{v>fgbKWP&Z6q_rQ(|6XbRe?7|pC
z(BwXWfu_(;08OEvAo}^wkLVJBQ*d2KF@ZkKI~HIU{3?T8@MQwK@ME1pL?8kYh(H8`
l5#0YF;C?<uzzAp%f+w%p$e)SreSZJ|002ovPDHLkV1lfrcenrm

diff --git a/data/tilesets/secondary/cave/anim/0.png b/data/tilesets/secondary/cave/anim/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..67f294ffedd05c33f82f4db11d749606d3a5072a
GIT binary patch
literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDQ!;|#}JO0$sWv1Y#fO>(~eEZ
xdBmg=)8I0zTiQoSSGSeXQ&#U#?*^esoD3!whI6uXu5SQo_jL7hS?83{1OOZS80!E4

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/cave/anim/1.png b/data/tilesets/secondary/cave/anim/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c92be8079c0150fb23dbc44adfcb71e0258d328
GIT binary patch
literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDOXPy#}JO0$sXQ*-pL+*-kv}f
z>!u(l=LQ#!2_D6T%tD!&nhJ+lT^e@iWg3WaJ!DggS#U>$M^(?FL}ABCHHFiLR~Z??
Wj11kXtQf;V279{txvX<aXaWESSRfn#

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/cave/anim/2.png b/data/tilesets/secondary/cave/anim/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..78ea00e048f82fb32d834175ca62b4c618f3e488
GIT binary patch
literal 108
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDPvC;#}JO0$sWv1Y)vj)6ABnN
z1;yN1priBZ&W4wzj6x2v0b*vkCyzNCl2~$t#bwEY70e8USq41~pM<+X#(28=xvX<a
GXaWFh^&a~G

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/cave/anim/3.png b/data/tilesets/secondary/cave/anim/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..7edd52eaa036c55e74c10a1c5d292c62db521340
GIT binary patch
literal 109
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDHBf@#}JO0$sWv1Y$}J2@Otdn
zv9Lo?P;ZBdLyM#yr?`*dW|IlBi4N1UH6}cL#ibHtaFvlE{H4Lc?bGUAK<0S5`njxg
HN@xNAIMf|`

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/cave/anim/unused/0.png b/data/tilesets/secondary/cave/anim/unused/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..44564e67a599b80664b2480d99c8c5a00c33d328
GIT binary patch
literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDQ!;|#}JO0$sDXqY#a|CNu3gS
xG>uK=QiDrIl$MW@iAfKmr>vgR)D1$DI2q!Tw6@%kaL@;7_jL7hS?83{1OO1j7$5)u

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/cave/anim/unused/1.png b/data/tilesets/secondary/cave/anim/unused/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..47e7e17ee95fdaf34d342d8970c538f9829e4750
GIT binary patch
literal 121
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDF;s%#}JO0$sD|#yr~?VyxgfA
ztW0eN0@^w}M|{0myIUJOOgeNX2y!Ja6j-UC#CwYOaKNNCXZ9xPM{Jv9f@K-%B(?dz
SoYr3tGSk!5&t;ucLK6VDI~^YY

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/cave/anim/unused/2.png b/data/tilesets/secondary/cave/anim/unused/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1447cde23dccd65bcdaf90921fe1212241d5db6
GIT binary patch
literal 108
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDPvC;#}JO0$sDXqY)vi_6FitV
z9l8{>P)Fxg(8ia(%t8*a0b*vkih2%*SeG2(b!l0+f|;SVN85&t)#oF~7*AI}mvv4F
FO#lvr8~XqN

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/cave/anim/unused/3.png b/data/tilesets/secondary/cave/anim/unused/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ad81b1e1e9daf31260a661bd436367997d4f31c
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDFaUz#}JO0$sDXqY$}IzMLm`*
zUDTl{n7Kp6p+#G-)5OQ{dcX|Xl?q{5S`#=9hp;nbt=1OT^vItMGQ-o=&t;ucLK6Uu
C+!_4<

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/cave/tiles.png b/data/tilesets/secondary/cave/tiles.png
index f905c6b21a2eea0257ab6ac7d833c128d69ebffd..e8c98dd71fed4b99cb85594fc7cac435646039ab 100644
GIT binary patch
literal 5884
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
S^9U6H0000<MNUMnLSTZ$k77Om

literal 5767
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
FV1mzF=jH$a

diff --git a/data/tilesets/secondary/contest/tiles.png b/data/tilesets/secondary/contest/tiles.png
index 09ddee472798b4e59cc8ed56c618ff8d95d62fb6..710654f5fae1c9a6a1ad24ecd31088a230f5bfcf 100644
GIT binary patch
literal 1650
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

literal 1638
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

diff --git a/data/tilesets/secondary/dewford/anim/0.png b/data/tilesets/secondary/dewford/anim/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..adf42975fa65c184e93702c4e1cbe83c549257cf
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq#8V3978x}hMu$KYc}9veNe8R
zzt??J+NyRPTc4|5C5aABOr6YuoyjRLlitjl|KQ>5oc-*Yo(lWJ4Jww~c1l}$u(9t=
zkS&m#+Lw32rR9$4lj{1e_nyA>0kvf|ce1twO?>{5GtSPqB5I$M<sL!ZJuNH5gPN9q
i{d41icKPaw-@>$iFtpAIuaCP1a+9a4pUXO@geCwWeMSrb

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/dewford/anim/1.png b/data/tilesets/secondary/dewford/anim/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e7c23a18caae63f0652d852a2c53885fa3234dc
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq#8V3978x}=AJX;I+Vb}`k;Jy
z&OPPW|0m7=bhm4YmK17mh}i^i+q%idBz@W*;(hjm<AaIfH>U7>%L{UN9`^S*`!cyO
zInghS#m~1CIfw~9`KIKp=fN1Nd#LUAv{-k|{8L%>Pxh@o`0-Zr`N9vUj#uh!58tqD
j>f$Gvs=7azzn!gRP*iR4yR9v53UZUDtDnm{r-UW|1ItIe

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/dewford/anim/2.png b/data/tilesets/secondary/dewford/anim/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..86075ffb0b7955064e20f4ad12b7b449678e4981
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq#8V3978x}rk>l#)odWr`tY+K
z<HCLJo6=56vdniAxwX_;G2kHks|U#`g*)#>Ynsk@I9u;I{}PwRoMe+pj!z}^UIcfw
zPjUF+&{V8u_1q}#+}0WS&eeBZo8zX>T%z=EhsnOX!Fwc{o_@@`P(O|H?yfZ7dt1G`
kZ|||M3)NL$`D4C>b@%$tr06`&43L{VUHx3vIVCg!0Q}xcXaE2J

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/dewford/anim/3.png b/data/tilesets/secondary/dewford/anim/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e3c576214a9cb83b23595a3a12a392e79349546
GIT binary patch
literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq}n}Q978x}rk*q8I&8qhdZAw3
z_p9xjtCRmHXxRFAD#lu|FquAakS*fTj}5U@%T;8u72v3K%no@`-O+nx!AB1EHCBPE
z-9I%Z=p9qxi*%W=Jn)y-*D{k2ixj@jw|pyOwCzr!bhfkg(~{DNcmD04vv(@4f6X&(
qV%fYc3h%2`E{h+Vn-cN*{cnDwrWX56UysfQInC46&t;ucLK6UJW=Q}5

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/dewford/tiles.png b/data/tilesets/secondary/dewford/tiles.png
index f7997219729f6cf6f8b6f38818a3e4f7c7081868..1cf4c165c4716f45df69ae3c125c82dae56d45bc 100644
GIT binary patch
literal 3985
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

literal 3756
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
WXT0<?kwf(W0000<MNUMnLSTYci>W^V

diff --git a/data/tilesets/secondary/dewford_gym/tiles.png b/data/tilesets/secondary/dewford_gym/tiles.png
index 1dad6f205487b07654f468a7c128417f79f5403d..7d923b505c596b99dd239a53d2ddaae7ae151784 100644
GIT binary patch
literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq000O800HO(00000l&2hE0006<Nkl<ZNQupr
zF>c#H5Jl$%Miwp%1g_-XfX&ouvTjniGT|FAsnoJ#lZJ4SJ}lfCS_C|Y3&J;8$%qq6
z5TNA=Lgvqq5^aK%SqMm`c=%clmz>e(ER_fv0EeJBj#CQ5FrqBW9x7#iK$$xzbqu8t
z<SXTq@_j{tQUT|Md`DI(>=KhY!X3WcaSat5Z}w|;mZyD3>=T3PE!>d2oKZLj1QTF_
z4iyvMry{!2FX4bzCw&BIL>s+%pNui2xdc(Yd4{h_siI2faw?yL9C^<<@&J9YcnwY&
z=!1Qu%P;B+Tmm;`>=IG;oqkcDx2`+dDCve&-lZCB*3u63?KR9kQ5MUX%H<8z5<iO@
zMv}rg#s&0ewGf1K3wM#ZWu*9fj9KNhVmL;`Yf)<FRL<C3Z==g=T@Z8iqVeDEDjWal
zi}id6{+a)3U){5>LiSZw`|my8UcF<mMK|*=ZcnqOXvve5E_iY5k%u7dd79TAI^o4%
zPdV=tc^}5r&WZF?kVtn0iS${J&{R4um`d*jQ~4JJ)7pPC7gA|wJmIX}G4I#&lGYZ=
z?r!2v*U9LUnK;0Dy)&_etASRo@P_qVJrn<{`4<GLy3k<gexBB~!<rtnCZWL7A8Usp
zLvXpxbKATXpKp#H&+rD1=c7@-a(vF5slx+0ADtZZtDhs>@$`hxpcgZKB+~dZ7?1mb
zv~_*z1`|s~7-fu>a$JI~Dzb>`(`~8d>Mw4X;5XY*(6!dGt>3pMr>^DmH(P{Ij7B+8
aXx(2)6!Q3v?xS1)0000<MNUMnLSTXr+As0|

literal 598
zcmV-c0;&CpP)<h;3K|Lk000e1NJLTq004jh001Ba00000I=RC50006VNkl<ZNQsS=
zzi!(w5QqH)MTrgpicIcqAW>&8RhJH(YV-}%OkTNZ=|W`a?hILr3Wc7d1K~H25;SdW
z7%=k$m2yYk=?^Ja`VE3DlOI0v$n&g*7>K}}$#g@hDU~sGFUCA|zs~TXl*(5^tXAiG
z8vv4ZAMluj04Ze((}nmvV6Zk`9z%fEdYcH5Btr)4m6rhk8c3JWApI2g@_rWrvY&dZ
zT|xr_e8^me0pBMW(ECAvfVC@^yaiOYUX}3;yfSkAd5>vaR#$s<i$hBvaJ=gQxc>Be
z-T?O3S#~=C!1WId_J{-BF#y-!H>j@hc^C(XD=Ed7(4e}>&0!MYTx-!9d}{!iNz5d`
z85lqne89iME=fCk(4K?P;Mb4=0A!jMcT)`P`spB9&<{LFrI7~5mi}Gv&jA>yHrpE{
zAfPDCv8cxZa0YA`upx!IE()AK3V<_U(*Q`J88K>b<r$E|biix3yOB~+q`odTq%a-u
zk^n9Ma0)ztuX76+y3UX|isCqWyWEgM1E8MBn4l-(Wc+~BqxjvTa#!N%_uOW|UHK0I
zuq)5H!G3@MHn_hK;zGQ7@$i5vS}x&#p};Vpfd7Ra0Q-RjxGe84=kv??n-(BbTjsyi
z)b&pG0oV^ZfRBNJOsxR}3LgON#2RovIAy>~2n=`=>9Uzq2F)Iv0{q9ozUL*F5x{{B
kO85N;W$o_)l(;+p8FQNQ`1|fr6#xJL07*qoM6N<$f{sKCxc~qF

diff --git a/data/tilesets/secondary/elite_four/anim/0/0.png b/data/tilesets/secondary/elite_four/anim/0/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..806d26e570e348ec3620c361106211e3c4e24254
GIT binary patch
literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^93adBBp6ht@Pq*=B~KT}5RRG270(|%I&|Urqwg$E
nHf4ooi4|Nz)l83^IMan03?K2Qrfu(10_pN}^>bP0l+XkKy!IHw

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/elite_four/anim/0/1.png b/data/tilesets/secondary/elite_four/anim/0/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a8e6a31c92bdc7b8b674b1697a7499be500d051
GIT binary patch
literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^93adBBp6ht@Pq*=B~KT}5RRG270(|%I%IJE=zGqV
oiZ_pP4t)?&`NndjRp^`=gXtyy*8Pm%j)8P}y85}Sb4q9e02d=1X8-^I

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/elite_four/anim/0/2.png b/data/tilesets/secondary/elite_four/anim/0/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4e6161a6460547b89689c41e39ea885e5ccd309
GIT binary patch
literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^93adBBp6ht@Pq*=B~KT}5RRG270(|%I<(>3(f6D!
o6>lEp9Qq)l@{Q$4tI#<$2FpYIOI0sUIuFw2>FVdQ&MBb@04m2E)c^nh

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/elite_four/anim/0/3.png b/data/tilesets/secondary/elite_four/anim/0/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a8e6a31c92bdc7b8b674b1697a7499be500d051
GIT binary patch
literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^93adBBp6ht@Pq*=B~KT}5RRG270(|%I%IJE=zGqV
oiZ_pP4t)?&`NndjRp^`=gXtyy*8Pm%j)8P}y85}Sb4q9e02d=1X8-^I

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/elite_four/anim/1/0.png b/data/tilesets/secondary/elite_four/anim/1/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..7822d18961b5f398c42697c1279043b8da3ba999
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDL+pa#}JO0$v^m6cr;uzCUCF{
z#Xmgqe~Ss5N$J7_B@v$^&YfFKHt0lrWM@<O_?*Y%W1c{vl*=DCBZf6I8s$CaSn{is
iH6Qub(D7G8jFI8prEG_Nx8BVI+2HBw=d#Wzp$PzUg)18X

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/elite_four/anim/1/1.png b/data/tilesets/secondary/elite_four/anim/1/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..66d60e90bca79defbe5d47d2dd6752eca42c0c62
GIT binary patch
literal 72
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDSl5E#}JO0$v^m6c$%j(Fx+}s
U-zZ!5=_yEwr>mdKI;Vst0PrpmVE_OC

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/elite_four/anim/1/2.png b/data/tilesets/secondary/elite_four/anim/1/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..09fb59fbf70ad81c170971b11f6bb97d1cfefb76
GIT binary patch
literal 1260
zcmV<I1QYv-P)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000EDNkl<ZNQv#0
zO>QGM5QXas@|<8aIf3mP*jLcb$$46UW-odcT3ZgFz1gBy0tATcYz?T%b%1ViFU<g*
z_t>)h6VD_Ff<Xp|79S+B`W36{kuAgbgMkb|IUNoMazUJ*4d2U87r=+h)1eIUTLwKY
zPG#`!@(eh?l)>N~zTwm3J#lh=F(k0?;qpQTCpqo|<4%T*JL!X;@}A|qr@$rip5?sf
zIWO@a-(QE%8`u#yz<v(s`Eg+{-Dj(1_o=j^)F%xn)#HZ9ar60&lDqj_$%ZKP{6>D=
z0JrvTF7xtHPnDZHQJ<ivzN_AXxSKCJ>dn5c_X@L|BLiQd$AvGOIiaPywHxWKk+)N~
z=#aXe1L~Skf(le$ht74}0hW1n&RgcZz;(IFz{aVku5%r?tOI(Adg{l}n{jSvG4wj>
zb=2#qx1ipFdJEYz@1A-0%=?-6!n|LY_cQ0Q=R8!8znt$=9pCoL51_Z8-aYk*@;B<;
zQ)<@ZhS+l+d(LC`(tjQ2(ZPkpkKmVoU2jIc8TDo_{ntV79_}Q%E?)|}d^4!y)%T~f
z|JHnWoNw;#(_?>QzF*aQ<(KcNw}9T_a4{bAi2KJ2Z}#?U;+x1l&3V=I<?3Mpn<_+2
z3oFIM2ASCCpS^${H$Ii(qqS0PwU(%XT5EII<gvEG*H&ywT0(`8W(k96z0|Mc+{46*
z@tY*Ng^Jk#I_Y?bn>_{>#TfqcMIo_TTk+9r@d2BB^KEc^qP4)*ug72Si+Yxb|LxEN
zG-&dO!ogP=Q#x!~A#M^_o0s52BXJb8T-i2BrHz$_Ey>VCV)?plw3vwC<ee91y_MFX
zL#76FjDRlrL<B<JNC<Th7u!l)@D(ceTcSaT@xAgZ7>^uVgS|A!DZ#8NEVMs!wI%qo
z+yc$ZXZ;%6HBmx?<S}ful(vduR_Ly7N63b+C>rmNf_Olmq#Xlw0r)izwtX1S<d-#|
zrXM5VYC+R*9~9Q`XOP_#mG7pLLldznBsXRwiAATNIZz*@cF5aW>%?2wO#4)`wj{=(
zwpiCrQjG$muaeY0Msc*63xH2ATCycVL!YL`Na-EQipTN|!Bta-gOvlZ=>?YT^ENRK
zo?H^TiG0>P%Mr94No?9$>ZWXfWg}H%49YS&F7~L{oU|^K7$OpNkMRMXAv-mxh=g8M
zIDYITz?Vqhy6nUW28Eu6h-tZmvtT_u1V?#vZG^q7t~O$?FvgI_&F<m|A{e8FPy1cf
z*rZ-bLi5q*s~S#RT}iZ~4F#gCMx#nb7XMjYuCSU)*+xtYV}mz*_EijUT?@xHFl%L&
z2yWt4-`Hi}Ap`ks#OXE~J#Cr*!{KUac!bbRwm2jVw8lVPT}jRJ5pBT!=tO7T@8Ta|
zvy7NQ>#d1`P8_QYxO1oS`6c=nfqHtAJU{l<d51f~5);o`&-eG=PQ7>xd$c`5!dVRw
z_~`8#kKr<Uy2!lui5qtU*9KWnY{ifXR;NXOZ7PbEbvu$29oimgW!{sRo9*?AL$H!6
zpgAyg#Apc@*HB&;{k>N7d0B^b4@_AI7ROjs$JLBkcf4}D{%3wHUwHrICGtPMi9Y~7
Wo~LxP@{BeB0000<MNUMnLSTZV8++sc

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/elite_four/anim/1/3.png b/data/tilesets/secondary/elite_four/anim/1/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c7c05034ea82b816b028eb39b9287fddf0ea9d2
GIT binary patch
literal 1184
zcmV;R1Yi4!P)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000DMNkl<ZNQv#0
z!EWO=5QgU!-1G(F?Gt3*pzzV{bIE{mH=6}?wz7clrp>+hAk?JJ0Zj5-KqBwT9^8K@
z#kHNJ8x+MN1?s~G$sEpb{uz$wdNdl*IANTg#tGMSGX}24<1vkHu76;RX!H@QqYwPw
z)kk3T;RYC8F-8M^KDYZZ+5Pm)?yYg(`}q#|y?~Cf03J(V@!RRb*RrJUPL?FZ{R$9w
z4ACRmmHbqe3{fU5XjKAtCH9KdlRqJ`D(?Be@9J-voR$T9E{oUwU7$!Y5(<Xkg~x?p
zNq`;p9zG%NL3~~Th}&_<ghfi>+j)rJ;qN4mPbrVj&+>Tx{*t<kQY4)Rz~7SnE!khu
zi}RRJrl&Gtfmh%w$L&(w)p^|4>igzA-oL+s{T1wQ$^Mq??+be=PS9~ZI*!}jKkvUo
z$1UIeC;H`I_s18TQKqMp{yV_m68Cqt<cpn#LYF3kIF7z&cmJjOc3fX<y*t_VhCE*N
zchN83)87*QmcxV_{4u^f4ZPw7Nxp@oX^Jc6=c~g4PLYwAXPUBHd&+fiC*PT;TFxoE
z)tc(PloTXjrBuTqkLAvs)udyT<ZGBTo1G*nH}cZXJmi{`+eMNsyr>-@qYQ&x@noE3
zGeO#A8HKvi<bsprJP!Hd*WkFL)xh3Wv)6UG{C;%M00QMt$PD@_VXhf9>~hb!Ir7do
z6eeEMRJW08sWde#NrGfVPG7c-Bo$yBopEHe)6^O$q%0sq0OXo?1i;&dytkfAXlpXw
z)yUlK84XO7>pfpUImFm2oTWib@@iXSq5XwdTL!<b_ds*L*Ht*K3gjCE4}LFct?NK)
z3w32XK{PxfX?!{|#shSsb_UoCa22kzewY>XYXyk;Z2*iVh_(Z?;#W`I9GQ3Xd=L?b
zLU5&a6glbWB^T6rvIcQmtqnPiHj^$|&MlHM$SqiFC|V>KTph`}5Xf+w84tL4Cdr=R
z8}8HCC|Wy%w8Alc#o$$C{m{yuvFjadSm%9YJM`p+A)CN^)kzF5^@KvxTC&Z$0X7ZQ
zjZ#QUCA-k0W^rPb2~v!}usvo29Gi3^uNe_q)wq7FB%slWy>zJ)a})}i`haSgh`XR2
zdI%lmpxOjy*-m$)rzoRO<z{tp1!0U*qfh%&SsYSsDMEbcJhkY=?UaI^?ASq|?POBZ
zMB_g#*ITT{HSGhcg|eYHT<WXf(RD34wn4MjY6IgYOnYHBy+R7^_W`$CNod+M9u0@l
z((o06nk=!8D5yn2jjhS@{RrCQeB6mfn?J}spv@9O0=Hhp$hZ?{A_3jmiFAJ%oj4A>
zgSfo*+Bkz5p&7a3sptCn*NL-jIHT_2BkrmXz^&62wqY3kHOQQEkq>SNUF)gJb<HL@
zR_9qiHU&Ff+jc@R7|0&Dm3dC0Zo2oE4aS0M4{^}c0i|V_P{DJR^>Z!j<8mI_JaEX2
yusFl2IIboXhvUdS^si}K8hHQYBl17~7JmX@e0q$t!&WT-0000<MNUMnLSTZStWNg;

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/elite_four/anim/1/4.png b/data/tilesets/secondary/elite_four/anim/1/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..317db1714c5a40a1f0d017a40baf0e7a0a951e78
GIT binary patch
literal 1190
zcmV;X1X=ruP)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000DSNkl<ZNQv#0
zv2G(b5QgU!ba?{n@&Y-vN}9af3Rw4|uh`mq0aWKGF@>51L~d<BB<ldXWWTxqn}0}I
zmK58#1i`@p;^KoP4*%f{e~xH6y_rzLWICPFWb*DD)5&B?A8vs6H<Net9-nFY0hs*2
zJHDF&li8FIG0Q3`?)&SwcO3WgdED3Lee35N@%Ic4j2ajiqCPDQG#-SY;n#aX;$sa6
zS<}6!CDk>)OL6HxQP(wA@6J&RNPWJ4)cb_bRDTA<H`QA)M7<hWW%aV&6{@t2abKlV
z@xmbPa!W?eJ96If;~hFAb~S*!2hLlc@OmAe?xFX~bscwH$L_q2x39MvGoY9H{Dc+j
ztypiBo0Bkb-hs0{;lOzhr@UWrzkjQax2;#PUd4J9>s72*vEGXHeq)u2zHr_@IPc-o
ze<R-qp09*E{}X=s*Y&Cl=&dgO2V;tAgkHrDI}L?FJPy1(`u_6vpS$0I?{^$z+V<sa
zRJ~rui+Wdn`IdUzq3Spok9v$1?>LRV7k(>VLh7kVSYECk7laT6iDjXwD7B|j2Y2>6
zgVhwWq~ca<YWGr7kbsp^<+#TXL4~uLbc~XGi;!-!lO*LvUdNe-Qj>DKNV12D+5s}k
zaEz-SgNtGzNV}q-&^DS}aFU$IA)os-c-qlxVDFm6%Y6}NiSqA9fw#IWA5j>LzJ#S_
zw1_J`X&)VV=Q|2BFKMp(NUc<wI&MjVWJE4s_MIdZ5FDLxWVF-N8+1rnK!yOwHSY+3
zw;g$JJ(<wAWV~xpx!W^3geaGlub>=q>=n+^At!mYZL!e*$g4erKd$#cce&R!IIarh
zJ0uT&FKMmYKx&Kb%6^7y_&3|JU_78t)Gq*A0ItC})DMe_erf=*ybXY{gr@BPt@xv-
zVTsCzWqE8O4u#}O?I?25(M!Hi=gAu6?X@=KG;Ahav|L*xWl&qN)=;!4Ft|37bs>;p
zn;8$dc+rwQ!*}e{*eO~&gR;V@e8u2ZW&P30p0UdU8}9QyavVIlVaP7<UUinkOFg5|
z^_Fb6?to24ZKo8<QYkKEwA`H76oM2ZFl@%+2*)9VC|gEEuUb4m?j)e$#N4{%#1a>U
zp89~>G7)b<J9r3=a_HI&XW7nor02LspRSv`izkR+Ts3@}Pi1jPxuuBaqt9~-CvN8y
z^lZlhfwr?*OEZn{v|Mko8rQTBxGh{8yy23sf`{vRIJSdXTeU%O7v{OKo7^D<`F+6a
zRuVn!IuFBPv~)3Yixs!nM_j1Ig&NzE<@XV^$NAWaMw{QsJ-}uOA%U&eFba0!LL|VQ
zgGld}F^JQ^8^!gr*Txyl2+b%RPd%6C-yklw;fy-NN4!-ZfLo^<Y{M{m8f4D7$OktB
z*LrG7-Ev5Y)n$>#reM*v?PnB&LE8gcndc<#O=rF07%Zse`2tf1TrI<d2Fgv5=US2T
zavj<{aLR(PxWKA7ttM3CY2=RiW7?Jm-aq*f`5&+1Paf%fLwCY3l>h($07*qoM6N<$
Ef?!!oZU6uP

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/elite_four/anim/1/5.png b/data/tilesets/secondary/elite_four/anim/1/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0cbfeb57cff3c941397618c313b781c0c15b3f2
GIT binary patch
literal 1248
zcmV<61Rwi}P)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000E1Nkl<ZNQv#0
z!EWO=5QgU!>^F#!7uaB*p!G5BbIE{nH+|9BLI9t4X)_lej5VcR16bs_fJELU6j1+P
za-29#+M*~H4bU7uSmEd&&Obv+KHrSSGP%A1Cf8Roo=k3JG$uxqABoR$H5y;b1pfp^
z0G?%hH5$oiLg1%djVD*~!w_;2H|gWXz}1LxBgRc86FKGm)aM<a^L~1r_rJcs4u5Z;
zB@RHl0haeK7aFyccBPc4j99Letd`kIzNuw4#AWwimy%`oD_LgQSA-BMI}jULsV6<W
zpGk&iS$<c&bswCqJL)~WulEWmp@<cJLXQg#MH}Spn73ozZV5DMMIdjRWtnWgVl}(}
z($}#(*YV|b-i(`kt|RN~px%mlE9!mw7<wuD_CTNSd!IY%b(H#rc%a@|eq-L2{cYLb
zmU$cYqha2Ld7C%#zT4kZ9e+75A3$$Sy*2ex>ZR06sh3i3O}(|W6m6Ney_~;}{pcFx
z?b;79FaNq;O1+eN>G_=Z^GD$9!%`k>y4JNsw>n>ae>nSZ^|xVvyOut8T{Fb}jsCu?
z_iA3gr{2S0N&2E*g4bMjzWUzzR=kIXzNj9H%hl6@QYsO(NUS7t>t$|(JBKt}?L!ul
z+*vEdQELerD77|2+*62>#FbWTj9PqwkZOC-qV-n4j>{kCR*XAD(KS@e0nky0Q(XEK
zoFp?P)+LFAVsFI-r^R_}@~yAI^Bc7Vj&47D-xu{FQUCpb2QX;<ge1p>*JELc0&#QC
z+MIajD+yDt<<{0w3T>=Zw4{e7BFooxrNsmUN0&Rvt+P_+aLAN^4gt^`z7YUlR^ol>
zB@cBWxpxIBcSoW^h;f7RD;S3yM}xgo$SL0J3M|w=akVD+xH$sV<-2Z=?V2FILh|5`
zS~j)_Vs>y>*HdJ}PZW*AnGlcgN$MF;CV<=HVB5!8DnIW5wYUpFUJ6XZfk>?3qnBoZ
z%A3XfWFj_&<i;E%vgqhF8|u82Ir7%l=He{IOuJaJwkRe?ZJ{i4i6sgQu82~)5G3cA
z<sNYH!jdE5E6!=GjBH$vvckE1LvYoU{xr&-I1B<?`h1Lx!%S`oT?M{tUgYrFP9;=z
zDP^^(fNdp3WemzPeOwq&(44qWlo%oq<$&1<jv<Yj7es_t1&$w`1S}?Tu&$rPIT{5|
zeL%PJh_hfFW(X7I;Mx>>+1(z*-lC1ZZ#Uh=5kxRrjX525RbrERClThu=i3sKxVx2L
zrw0lI*-fW~OfCLr^=60FxRGN(x6n4shU@1lcuZZ5iLEfKh1nvw3b%u?+rc3N`D4K8
zHX5E*mB+y0YN>dH;3h5h5e+TT(7Y_9<oO8JV}G2)+~&WEd&HRa2t7D@dm`Z^&QuRf
zXQTS_OEl_y;q^D%#j&@!%W+3oV(xhBx#9k6)WvJqqaENQ&Z-Z<owIwqhRf*rB6H3~
zZaf!Et(X1W77UqVb&(9$rlRPktfvw~4%-7qnfE06W(U3G6s)B1Fb6{&&{`r7dnoUd
z;a*FIysX3Kk4%{e7H3#h=hYr*cfNAF;jw?MzwrLaN92F}DSij#0)>a;x#2AU0000<
KMNUMnLSTY5*JyPB

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/elite_four/anim/1/6.png b/data/tilesets/secondary/elite_four/anim/1/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b35ededdb4fc28243cd2354e553dbc952523d08
GIT binary patch
literal 1161
zcmV;41a|w0P)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000C~Nkl<ZNQv#0
zziuNp5XR>f6z2ubc?0_qa<8CH$@8p$buY#SwzjTNFG_SJU;&Yv)__RX0k~wpz5vQM
zTzPFNc22nBa5%)p4=Zyxe?AU}bU7N0=n|x>%MT;E#wY!B1&n^V{6M3NE8yp=OW+!~
z`1OiLqmS3X#YX_!PI0E)xpBYu{Py^J10CZYcw#K)!@?8oJ1wabx0(e0PLb{Ab9^o5
z_ktuo>5nBKKF#k*+%AE;XMf^$yTms56W`R|g0Y-0_Ux~E-`@$U93!J*2wwPG!uT`d
z?m6zB<L)_7cZ_+)m+KIB@OMTX-@m_#&#hve@3YQ(_P1w$3--5Qe+znI<EMEB;(q41
zPaL=7xE;ssek@(i_Qx`9AJ`w`_D^<DoucEo9mnmC`>#j$j2}psbNyB9uVR1IasTn4
zcmVDm_+saw(B;V>hSB%0yZ=_)?nUBZ+ZlDd>+j9c_ig;4n?5ZL6Yk(|7<0qud*`iq
z4_VV3SImxA4+}`8ATcX66{Yr6>gZlQK+lQKsJPLZnw^vsC19mgha`vE3THLxlqC5E
zCSkpmB;{J3+L^~vlXBZcvV|A51!R)(U{^gG7sXVNc11z4sWrLiBsq^H-+T>*9jyj-
zuAaWH%jx^kK?4X>KBF+`tBe_U*sOtF>A5yX-uXar>?KWfo2ZdWQ(#FlBqMS8vJH|{
zgmH4lk<m_5YoL&_fQ%84E8Y<SZv%O6J(<`xWV~xox!W-UOqA<ApFlap*eT=^5R<&x
zG+1bV<JFeIKUX^-9Pf2C(p8asK=9~yl2*Ejq&84jwqr!YCyK_?Q7|5%6SY&o7J#d9
zr}g8sqTg#k%x)rJEJ3s_pcVi0)Xh+NH!BY!A}It{YD<ZWPG0hXI#1RhZmYE+r_pB8
zCCjxXQU<j}YYiof0;6jZSr;Q2ZZqQnmyRUaF?`@YO+nGh8I%==@)d(umGy^K_Ka=s
zV9h%365F9C*9;jV?^Um2c&Wz}Lu<)~RRGq3nxGWQQrRx{Xjq(77lITcGHj3O0gg>N
zQ8tVOtr}cERubSxq?aytVu^!-rat1dOu}8z4n2g9a!_rITsD&}=?RX}=i_E|aRp(F
zqeh?hSy?10H<Tbgbe>pr;$}iokGJd~(q=qvXsq!+Ems??rWNfXP7B9|-f+3EqDR-Y
z=-7Z}ZPXgZAx?T>*S$gt?spNlTS;gdf=9z)v;@9FP?IJ02?uI%pvE?2`F=$0kso)W
z(dI95k7%=un8B@AGYam+smMTgb|T+jM*k3qmzU)Awb#ZO%m~dW9Zx;i&%gc=8MYxu
z-NPr`RUd&Hr)zA(FnSqe&bh>i8$#E5s!QFlNr}~2(T`2RPFJ=aQ;G(%M{Z@FlQ=is
z`zsE{f*KET(9{t}%P_Hq=ep?UTG7YlI<$G@kOg6Jid8YJW>ouO<nH^Qd0QTMU-O9k
bkN?C!2gZS74S&js00000NkvXXu0mjfh66Ol

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/elite_four/anim/1/7.png b/data/tilesets/secondary/elite_four/anim/1/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfe698edbaaeee5d72a8ca7ca1c6b5bc5754b491
GIT binary patch
literal 1153
zcmV-{1b+L8P)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000C?Nkl<ZNQv#0
zv2Noy5QgU!e0hR+-yr)=uDtggGNAP4rBH2c;Xbsvogu)aY6B)&FF=vKvW4#-O7SJ$
z<kq-iu~?jo50W{Y;ryH#(d}e1p=ri6KTR`k>23<#Os7+t+}-}cn9$@SRwp0$znhQ1
z<ii~>xnWF3TxoZ0++Y2CC;Z+(&sYIZHL&{Y<-)hRrv5?JB*f=OKs+$SfNWRuQ(ZGe
zow1_F8hEI&S3ExZ6B4W9GynHf{jIapx?<0D^}fFgR5?aQ#Spykv=S@{z;RC;_r!5~
zj@xs{j8#tI$9Vwanmm4ee_35dEwaud;BU?T*6gYp#Cgi7^HZI%!YlBN<MzLoE?4`j
z*k8r|*6eT1{=Tr6>IHg^+jHFhb^V<<?y2XJ?|&~{uJy-_&8YL!i~2jk-x~e<xaP*r
zL!r-;L7Ye5cfJ2s+&=5vv(D#jSLE@ozl%J6roT1(t;Y#B`eS@~9(dIolKco+(;QbU
zU$2e}I7LBXS!gOs?Wxq!z4*>N-{q2ud#$NGN=Z=yR!TJ<@_gNevzl~Dl6(u3u-!|N
zaw{+G%%Rkz+&+=);6?2LnPeR8s%PV(SP0UtC@8j#CKsI~=W)n4zXs<Wod%AsS-h{y
z<@ck91`w!xMqyA_8B5J*VOM(2&5?ILP@H*5bKNCsrP35wk_^d6oWAUWBo$$toN;8d
z)6^L#q%0s~1muQyM8MlX-dj&5b}bq2T4e5yi~tkm2G18z4l#}jX9<W&UhP^ebf0*&
zWAN+d2!z*rU4!GQNIoEV^hZe>-9}P7s4Ke}qTvxq<I_<v4$z6Z1z-!nHE3sjSXA_9
z1Bm5)1dJt!wg<H0S5N&CnfJ?b6cL9)aHaN?IO*giU#RnB4dQlM8*&<DCS9_eTOwtU
zTeQ|tvPdwxHj#BPlHoEl9&qWEBu9o1T&F20+Bk!>;yHcA;8kV)SjwKU9~^91=VM|!
z)Z~^SL*%{cMGP<XjAH04*{}(~Hc%UsLRu=@#Q`mglbS-1Vnl`=uo&Ukq!(q&NYJW9
z`>~RMMkNl?<w`7ZQP9*!+?Gk`1?^Bns3-^3W;n}kz9&7$HTrzrtS(v*#<*(K>2NBG
zL&_Z`h!36T7L~Z0Q`ECPJBYNK&03mi{HNt+ht;&9W5jLY+E5!V*H!eWx(*c^P^_)m
z!Z^hFAnbNfNWuLvqPvxZrXhF~97apv7J`~Au}`>AiwiZjCCmL0wa59m5{))r$sJH;
z88L%PuVEBii3^c|>g+}CUq&y^1Meg*+g=-IFe5ahbUgLkF#me-Y8%d|2l#|u^%1yt
zy1_OKqkjgOb1w104WVj1HKlIZq{Qm77{;bxryJYNC`AL=BbPGIN!*(r{1v0Ipw>ei
z6m`VaGE8jXxhaOZRt#}D4{Z({vLGxjuqw{08P(}La!<o+-j)a6fBA^~kAKDAMTdN9
TxZ-MX00000NkvXXu0mjfG<-W6

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/elite_four/tiles.png b/data/tilesets/secondary/elite_four/tiles.png
index 834be370164bf9c5e183cd86e32f5ec65875099e..d16b2db03c568c78ad0f22ee437f07b8fe331fa4 100644
GIT binary patch
literal 2876
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
a_<sNn_>&>loYRZ|0000<MNUMnLSTXdc$(e-

literal 2826
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
YKWTYKwVw4c=HHTg=)hr{Qfnmke|y5|;Q#;t

diff --git a/data/tilesets/secondary/ever_grande/anim/0.png b/data/tilesets/secondary/ever_grande/anim/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..7536d08ad1a80452afd07dbccaa324892b81f8d7
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsmY!$jv*W~MbB;IJ!Bxla$$C(
z*eY+8t|g~9PAptl8kW#t(#LY;BwL56k_uP7x!~N`ORhIt-)ql%XCBX<<si27(DtCe
z7dCVy1b5FXW$54Atm*G^J?c@7sqvbP+PB^beKhsl@XJ@>r2Yc~zZ<)+3nvyZKQZp@
zIC)plTt49UlKH~?FGBA`2=qsad#LH1nl*8c*Xeis9?d2%%_R@M1Ub{w)z4*}Q$iB}
D2AfXN

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/ever_grande/anim/1.png b/data/tilesets/secondary/ever_grande/anim/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7536d08ad1a80452afd07dbccaa324892b81f8d7
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsmY!$jv*W~MbB;IJ!Bxla$$C(
z*eY+8t|g~9PAptl8kW#t(#LY;BwL56k_uP7x!~N`ORhIt-)ql%XCBX<<si27(DtCe
z7dCVy1b5FXW$54Atm*G^J?c@7sqvbP+PB^beKhsl@XJ@>r2Yc~zZ<)+3nvyZKQZp@
zIC)plTt49UlKH~?FGBA`2=qsad#LH1nl*8c*Xeis9?d2%%_R@M1Ub{w)z4*}Q$iB}
D2AfXN

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/ever_grande/anim/2.png b/data/tilesets/secondary/ever_grande/anim/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0835aa3b83e07cbfab26d3eb1be60282fcf4100
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsUA-k#}JO0qUSd99&+Gey<pGG
z%NoMgsT7{ta$<?+Yy(E?A4_-+<TgY!Uz@J>cIT4rP26_k{`Y(TI@&4h3h|ixtbN)n
zrYz@graFBxg{f+Hj<004pEq}T9fSX4hGesxUFm0*X}_4J<R@ewp~AW8SWA+U#%?{1
vth$>odZu%)tiK<huQ0W;beq?@wKg*U^v)R0+a-Id8RR}sS3j3^P6<r_j0Q+x

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/ever_grande/anim/3.png b/data/tilesets/secondary/ever_grande/anim/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..c07cbbd17cc8fbb1fca167e388a66d9fd9b98f32
GIT binary patch
literal 200
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gseVrv#}JO0qUSd99&+Gey<pGG
z%NoMgsT7{t^1@@XSt3)}2T#d{+YB4ooEGiat@d{3lI~61+q##(KlV>SR$wlVm)B=!
zZ(r7}daqw~9jczQS3TzV%I5udt$qJCoHyYUc+Z-B%P7s0`-KoQpG=&FjO0&grBw!t
y^Hv^Ey?ENm-6mwi-`ag!8KpljTI04YOscFtQo)FeSD9lU$cdh=elF{r5}E*x$VdAC

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/ever_grande/anim/4.png b/data/tilesets/secondary/ever_grande/anim/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..7536d08ad1a80452afd07dbccaa324892b81f8d7
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsmY!$jv*W~MbB;IJ!Bxla$$C(
z*eY+8t|g~9PAptl8kW#t(#LY;BwL56k_uP7x!~N`ORhIt-)ql%XCBX<<si27(DtCe
z7dCVy1b5FXW$54Atm*G^J?c@7sqvbP+PB^beKhsl@XJ@>r2Yc~zZ<)+3nvyZKQZp@
zIC)plTt49UlKH~?FGBA`2=qsad#LH1nl*8c*Xeis9?d2%%_R@M1Ub{w)z4*}Q$iB}
D2AfXN

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/ever_grande/anim/5.png b/data/tilesets/secondary/ever_grande/anim/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..7536d08ad1a80452afd07dbccaa324892b81f8d7
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsmY!$jv*W~MbB;IJ!Bxla$$C(
z*eY+8t|g~9PAptl8kW#t(#LY;BwL56k_uP7x!~N`ORhIt-)ql%XCBX<<si27(DtCe
z7dCVy1b5FXW$54Atm*G^J?c@7sqvbP+PB^beKhsl@XJ@>r2Yc~zZ<)+3nvyZKQZp@
zIC)plTt49UlKH~?FGBA`2=qsad#LH1nl*8c*Xeis9?d2%%_R@M1Ub{w)z4*}Q$iB}
D2AfXN

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/ever_grande/anim/6.png b/data/tilesets/secondary/ever_grande/anim/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b5030306330e8e9c2cce6fa7ff0c50eb91da06d
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsR^Dgjv*W~Mb8=XH8}{dUZ`i2
zmR{Y@$r=)K@M4$Hx(A|S&DV;UZP|H`>YP26_nl4p-J=V8{&?2av8kL_=w9t;xJp_o
zY}%|>>FIl$*2yS3EqbkgWbb6jOWtnxGh4QJPAvWW!ISw^X2s(lKdf}*y-yqTcAT>n
zG>;9;?n-#XdGN@Iri!!M-jpX9eCpetzUI(j`KngqfQuKq)j@9bboFyt=akR{0INz*
A00000

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/ever_grande/anim/7.png b/data/tilesets/secondary/ever_grande/anim/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b5030306330e8e9c2cce6fa7ff0c50eb91da06d
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsR^Dgjv*W~Mb8=XH8}{dUZ`i2
zmR{Y@$r=)K@M4$Hx(A|S&DV;UZP|H`>YP26_nl4p-J=V8{&?2av8kL_=w9t;xJp_o
zY}%|>>FIl$*2yS3EqbkgWbb6jOWtnxGh4QJPAvWW!ISw^X2s(lKdf}*y-yqTcAT>n
zG>;9;?n-#XdGN@Iri!!M-jpX9eCpetzUI(j`KngqfQuKq)j@9bboFyt=akR{0INz*
A00000

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/ever_grande/tiles.png b/data/tilesets/secondary/ever_grande/tiles.png
index 0f3689c243ae13a7a05cc1b049d17bc98b173dd0..943a3f8f421e748fed59606e6051eba6e858244d 100644
GIT binary patch
literal 2208
zcmV;R2w(S!P)<h;3K|Lk000e1NJLTq000O8015yE00000Y`4*M000PQNkl<ZXo2mT
zPiz~<6~-TQ%PqS!5K=9Q?9hN!*%xtpa0E0!?6oh>Q4G?a3nIPdLKSKcB;k6NYD6#&
z;2jwXAnQV{TL%aN*u_#8BL@Xs=V0_uK%#)cx4_bQp^N&xSyH>9s6PROh)F0wKRoU}
z&c2!XX5K7k=m39oF^CwS0MRb61Vnql5)kbHOAIOD-0eyUw7bVc7b>Op>vo4C#NQ9_
zgNu~AxVC)~8eHCg8QTrUCL?SxHW^`qu}KeuARw2azoD_s4;pxQz%Cj|TZKdXF0kLu
z7qSsiRG6w#tsn$dE!(2VEC`AWVNtbU7*w?_L9!taNKA<a*&?5%f@M#UVZbsA*#>0_
zMuRM)(4dIB_7iTQ1d`iNBe}N2;@a8$7T5;5AwF(@%g{FtakA<XoS}bpH=dz?<Bun*
zE&-nLg0{bDGadq=+5o;;;TtQxyNt+HilTQIv%a4OH+y8Doe$VWDX#(CZ;<b=r6EMV
zffhITu6NO*IX^@qV^h^I3sjvE#_{^g%!oRf!l;vN4eGDX`g2)-?x6I}roY#$zYg^G
zI)MH<0qwkoKz2GnqOdS*^YqY8YbXewNnr8FY&M`ZJ>e}%_?@*~(lSF)VVFFU%Uc8%
zC6MSZWc{^Se*x<cfdT>UBIcg{Y8rK@ZYXkz{=6(y*BTC`n%NOh&iSAsOxD_}L6KTl
z&|g(hWy-Y3^^6?3u8RTN%t|sXk)=msHA_uHEmJmY)hSoCJo1``M^fbgSJmks-0_Rt
zM;ejh5x>5^j)@i$&_i4!48GT)iv8BvPfJA)aSaG;lLEdr%rB{j+=QPz-S4cBn~Peu
z!{htm<<({|l54hYQ-$X`4VMemhz<+I^(?{ddTeRH!;1m8#t4Y!9N|`!3z?}3MIPF~
zRj$WS)MEJ3leF(+a2lS>QqIHtr`%kf8v@ePP2wu(#goezoc<T|QXrjlMILy`Ru|ZX
zN!{Hpf9$@DCn&*wCi{sASb~Q^fv<_e+akV;f3t7plWT{5BJFq9`ueMrKB;94HRbi8
zudOQ#t97oC#=*h958!SB-4FwQzK=rH@)v;Dhi-@?<y~}7k0z4*YjXZIIsaOme=W|x
zCg)$Xmw#KFe+B2?NzT91oPQ_bGHG-EUE}=g$Kra?-9g^k(8=&c7y4sscPmMdFGir|
zV~heKiFY+aAj1llUQd5eoiHuTK9Cq0wuS7>@1YqR&Ut$Z&H|b=glUs)7&hc+;u}W3
zFak9i<EI2eWC}<?$bRCt$S%V86uQb`{ik^Sr+ED*dHrV?aG5rt#8olvQ#Pjz%2kXC
zum7@G|21_cc1NH_WBinm<Mp57^`G?g!XN8Dg@qkfc&>gMlf0bK>pz3ne-$|M3x`y^
z{^Q@sdh0(G`(1pE#`q<}EFdvk0`CxSAHFZ-MZW(cVHQk&;jl&^(lLIH&@ZE=1+7i+
zE3KHAC_sNKy}ZTx6B7h+iV=u(j4{R-V~jDz7~_|T{{F&cw!Q+c{)Y<UYKKJOS{om)
zZIHO~ahaUUHv|=L%?Y|)a=xTFXKssb74LNDYbR{eR?uxzI}Dzan7=3KS7r5pHs;Io
z)P5@OQ70__l{(#EgRTW3N)E-Z>0^)<cwgghUm}7wqw^ftVzfD`=jr{AQIAi*Y6ZjN
z6Xmz)vf~K4HCMbr&If<G0qgc1a*A_zD0G}Kj&DK7cSX)4zIjC(Wm%?nFfTd2@?d=T
zIKDDJ_W_4iW-Od@d|#a*zNhCD->CQR2*<~v<!`a&aD2BpK3IjTU-#lGUs)h@ub{c&
zO+lqO#OD;9Eh^3h9dh0egH(Lz-h1@cU%WCseE<vHyFi`t(fFSKOyaAp?CdbQRJ*V7
zF2mONJ=H$9ZQzwnpWS>Io&~l0dp4KyiVN6dyqhYew!(K;c3!2QJAlu%wWmMs#s^tC
zd<3Awd-R>V#bO_&QVRV8FClMDZ&R`OVGpI!M``r^+VpSU_`lC50yI8lG&S--;-~SL
zG0U(YGiDzH_Uu0|EN?Xp^k9NbMp)q;_h%YahD`68p8|{byiR}}!{CDx$HQh9JNA2%
zp@>Ks^yVAJ9vN@^259bS{14zG83Q_4))IKa)_2<a7hB)4xVqm*qPp~rVdtQRou3@&
z-(%6?!!jwY)u4?|l?M~cF+40vDK9NE+rGYyhMn4u<p{T)^qS`H9CTTpA@YOWn80zI
z8w@8#o+0uKA?$R&aiMzhNSqVE*NJ;jKm01!=vZgOlh(a1ewd%lgCu+=T|OKnkHTZD
zs~EbJDnr&a<Rg-Ii!E|_5HBC1uduZ0WSt@PLEJw2;yNNd?OgmLT#6qCcOfq4JqYfS
z!_sqN5o$SVVd|oa#o`|*T6*$?4q8yy!Tu5~n85xLkFpkHKOS$N-Skvna7QigCMq4t
zx*s1@>M7!=rJsAD`y^H0Ra9MTNnqBe>a?Aq*7S@`EwPrN{YU-`?N_JQ$a`c7s*6h|
zt<9h%Gnq>nnz7+`DPv~Hc~4leRadGN!{uWxbt#8i7H^oFCdv~Q$}^8E@2vF*4;6MY
zdJ6lXbP9COxO}Q9snIZKag{y_{tkpEK#QwXD*gEs^v)TbT3;zKqx-%-rgqXdgn+oD
z#8C5FCpl{o>cROVYqBNqAV`dd8vhKwUmYB38a8Xgx1kc>hh9)C8`B7aY=N{7q7($)
zQmRg~Qm(N}PgnZ8ll~fGm1}AFvDWn60sZOO%=a^l$<zFL&Im(Eh)au5NgmzLFrpGm
zvelBXVue*uykgWVn57iAcx-VdscW35x&&HW_Vut9!^nmeJT1h;n3K&^UeMw~wC}{g
ite5LepgdU~`u!g`Edc+sM2biN0000<MNUMnLSTYL7(9^x

literal 2088
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
SN>7jg0000<MNUMnLSTaOa;t*?

diff --git a/data/tilesets/secondary/facility/tiles.png b/data/tilesets/secondary/facility/tiles.png
index 5585dee3bb7ef66c6c9faa765215f6527c9ae6e5..f99c2415028ddccd5ca7d4567754172bd94639ee 100644
GIT binary patch
literal 6352
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
Sv~PL<0000<MNUMnLSTZm@13Rq

literal 5753
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
VqE{Q!^8cT*fsTpxn+uLn{{s<qI!XWl

diff --git a/data/tilesets/secondary/fallarbor/tiles.png b/data/tilesets/secondary/fallarbor/tiles.png
index 4c5d722771a93ed25a94d6611cc6241cc771cd40..21ab321efd26aea4909e554d93f2bc527035bbfd 100644
GIT binary patch
literal 4781
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
Hu0mjf$ogN0

literal 4602
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
MKWuGWNu@{s4<!KwcmMzZ

diff --git a/data/tilesets/secondary/fortree/tiles.png b/data/tilesets/secondary/fortree/tiles.png
index 0875d1d473d3b63a1902e7fb49f786e6fc4c7adf..78cb1c1aee22044a5abf7565cb4990a457c0445f 100644
GIT binary patch
literal 4342
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

literal 4364
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
GLSTZ!7RhG-

diff --git a/data/tilesets/secondary/fortree_gym/tiles.png b/data/tilesets/secondary/fortree_gym/tiles.png
index bb16dd0ca5cc7d56d740cfdb7b19ddf78b59a73f..932b5c06ac6e2d1eda226e28b48beb4fca0ffc6a 100644
GIT binary patch
literal 770
zcmV+d1O5DoP)<h;3K|Lk000e1NJLTq000O800HO(00000l&2hE0008XNkl<ZNQsq|
zzi!%46vj{e1i%x7yaLUVj0tZLBXwcps+B6nBpuo{FoYQ+mCRUbIz;MXl`#|Q+CP%X
zP!c6+eVK^_?sv|`*a<e!Bk_~J>(3Y8<L}xOqG$uOo9!l@o}8W-h-^1K4>AJe*HoW}
zN??FubDuApLnKZn0oyl{vbMG@vT{W$TT0<zi!h$cmhp=881VXIK-EL~qSTm<l&Tvz
z?MBN$-vM6#uEo9<`*gw=%{K#PBVe>o;q0J9;Ru*Ah6gO=FHuxNQR(G=1d)4}z~$bu
zkFo2zF70+4XAT!g^SSJEPzi`{%&78ucj`c?GG^2T*MJHVv#dsTN+$eo6a5#sRcq4Z
zFy5ZC)H<Y@hu;5bH0pG_z`asky6^PnNXtvwn1o9p%{hMm{WyWf*^h>SgiE0H0KN}{
zAc00J!s^t;a&_urdCZ|PI8rU(HE<GT?f)U++5i$R6SI~1OT=uEwWLJC<ceo8dj@ym
zGvQi~Jc<g%?E)3@#RALRLR!R%3f%E<f|*UiCRZwwS2j?y=OKK=n0ke9)fl#Y9-+ce
zfWvSd;K5TD+0lFG^e$+o^>{8<ng!0spN@f#GKf<rFqSUDCGdw4;?xP`>~deyr5xd)
zNEpv&%P2WR;7o3}OZwjFlG}TNCpm>YdIP*$_N|THKBJuazDmP3iWDjvGK=^mW--!y
z*{M^&4x_@@^gFmI9^KCy`Q*u1`~)q2p!9;}7Rww<qP%(2$m>IPKp`g^f@P7V*&k-R
zSSDQVr(dpt^uR_Lh!i+oz`d}m23iAf%n|v5HK~i`>eR*ZS$u#1==!*g;F@&chuAad
z%d#&W2-hL`qjDMF+C!VB!!q6i{tYl4-k`<)ko)W>dXNTLuk6*|974ejpAe*t#fgn)
zNgJz4!YXy#K@HzpyMk5PRjjfaT!$3!Qt=D_0ZFX;Q^^RF8UO$Q07*qoM6N<$f;d=s
AO#lD@

literal 771
zcmV+e1N{7nP)<h;3K|Lk000e1NJLTq004jh001Ba00000I=RC50008YNkl<ZNQs5i
zF>l&H6bEpZPeAwtg|9%fBxB$k)RwxiacZT?BTj~PtviI7Ly9wFsdR|c#VTVa)U{0|
z!%%{fw6<p=!S%hf-*E?4^01}Iv43~}duLk$YVetU(ZnhWuk(T57bVq%qQB*hpHAr)
zO)4)N^3Z@ys#W$ZP_4@Y?@aFy*ese_b+QtmEJ8HNL^QbrU~$rXb)tYnw-kt|RD_7R
z0?xkJw3-MUg?TldtSo{C6cN5Lmcf~dMN5u+G~}|Hj++B3&PxG`&|}QSbB)09l@82v
zApOU+2;Zl9{h$a0%vu0k9YX{HSds%v_WlxqG(}*dfFgni4`Uk@Fx&zMP+}E^><s{$
zh-KJ50w{t37!g=ft2b&mgDwJpecweO-zL+PB6vO4SAemI036f-xMsF}DXb*`7{UAS
z)AK$~6BVKNb_>Wh8WE}(p%hRNPJI*Di*Rk*4gmLz1sFlipooAEKM|oKR$bd>2n<IO
z@Xvqwet#Rm0B{l2PQ(aR3pWxc03#4U5exv@s0wEQQxuP&aR447Hb#VB+;ARDWskA&
zVXxRoxY-&-AwciJWB4_1BO(Og0^tF`i~wvfgQ5uf$3=Dlkr-<>l|9CT56%PF3jr<S
zlfY5~RD_Eg0Ny<hU>gyjMWhJnJrBGyZU9*O04yLP3Me9kBOc(n2e2LBVK|aqAb=uh
zz=;kV?gH@1&Ga@>1Py2-Kwo8N7r@b~xN#(qrX>+x+faXsebfcO(yIc);m!)b{0_sh
z-Pw&0FWPM#a2z)_0T`|Zo1cK)2<wHMfPHHh)ph3vV7<WcEGth4z&1i6fmz!GoWum+
z-L1ipmEzx8gdj#h#QCEX!S2Mu1ga1L-fsd_gmE&Lz<PG81D#}U0#LFM)Fz6MCb5u!
zh-Y}6BEaRH89)axLh-!XNHN@)146zg1jNDw{sR@!`%?*T_Qn7J002ovPDHLkV1h|i
BMM?kw

diff --git a/data/tilesets/secondary/generic_building/tiles.png b/data/tilesets/secondary/generic_building/tiles.png
index d94085b062e569894f331d3bfc653b9af2cca056..6f681f837361022eda54d16d03eff46a24871ec0 100644
GIT binary patch
literal 5607
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
B<Y)i@

literal 4949
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

diff --git a/data/tilesets/secondary/inside_of_truck/tiles.png b/data/tilesets/secondary/inside_of_truck/tiles.png
index 44f923a5a2d0b3e7785b4f4d0412ec167df3ad8a..65a82e88834c8cc249b3b42c6f0951c9cfe38174 100644
GIT binary patch
literal 545
zcmV++0^a?JP)<h;3K|Lk000e1NJLTq000O800Hm>00000dm@~c0005#Nkl<ZNQupr
zAydOJ6oB&=GBw0ZW<b{z-*Ffmo59a-h)pn2)l49U8vg^gA23rycigRlPVElYzX0#O
zv`Yw0ue*aC5#PPMyr${vcP;yb!5X0Hn80AO$1GErN-5cWzdu0q*_a@NP<0s$1&MXT
z;m}tYAcW`nm30JKP*c27gSsqBC3}X!7I=bsP@TZ29>>*r-X#-VgdlVg!bGFz(9fH0
z6{L(J1;`iCd%TWVz7GPH_n__jyVZ*A@dfl&5NS{@2!b01!7YQ-ixFv1uBk6gL4u5e
z;0n<zz<CSNDI&}{1?jXlDYnyx^9_79N|HnwHrB!&FoVZrGwffo`F0sB63!K%>>B%=
zs{2+6Y~9FtKI=x7W=p(m!8upa6Gk+(^r7uJE|gJQp}sD}C@l6fHG{=D)}0-qi^EhJ
z5;~{aHPY<IR7R?<%C)Lom20Q)&#(^R{9ajtIA1r(MWC&;aMl9Jr47@<Sqn~qt^J$=
zTl;ClG_-n49!=DH1Gm~GO4qbpR6+<tG%PGN3r$7MI&GMSR&O%pbF7=P9EJh1t|}MD
z@!9~Swz&FXfO7xdzhC}dK{sLp&i*ycIr~Sy6Z)}aZ*a)^{?U|vF-_0+2X#BZYYx~Q
j*@FkT&PJ7MC-CnJg4Ad#aVq3M00000NkvXXu0mjf>uLIc

literal 514
zcmV+d0{#7oP)<h;3K|Lk000e1NJLTq004jh001Ba00000I=RC50005WNkl<ZNQsq|
zuX4gb7{v1mhXR2KCTL9Xp;J@W!_?!U0z?t0P*D+7`yO>X045b>IzvQ3F;kaUpm(|3
zz}@BJ&zhUL3BTKK+2p)~kS8>@^kE76`96|*IB0nQOy9PK68}V<PFL+_o4m)R9&ZD*
zj)48sQtHzIOy;HxfZyq=-8kNJ!of4={lQ=mRs&ikptmF(2mqG=gk=K!uHL2rBVJe_
z9Qc<Vj8xj;ya+RM0CM*?UAY+`yy3UddY#?uU>HSra`ur*J4BdQXCMH*0#G>XhX|7z
zp%Tz90X#&Q?`ADt$sP<DtI6;*AV8Q2Gt{6*V654!tup`+rtN?pK{^oOO^cT-x<{A`
zb#i^C*0u&!XCT9y>bC`9CMEzQjNJ?h0Ji{KJE+%ZiqOu5(llKW4tQVzg2V(gE&|X<
z6L1`X1mK4V5vvW*-<ge*0ji4;u-boPuJq?PKy_`v!Yopo1faT(0~Q}Y(Gx~HKy{G?
zR_iN2Au~XAMZ&2(0w<)VcD4f#LUqprzH%C%t9u@>y9D4NE)>kTtyY<V4G3@qPRK32
zs5wXnB>-2~)c{ntd{SSY*8_BM$|--;^=%I?0aY3N1CnTHDlAcIbpQYW07*qoM6N<$
Ef>1Zrvj6}9

diff --git a/data/tilesets/secondary/inside_ship/tiles.png b/data/tilesets/secondary/inside_ship/tiles.png
index d4b0471b200e1115a5899d96b81a36fb57be0f99..77142a7553ef7cc3ca7cc07c8d85e35cf59b395b 100644
GIT binary patch
literal 2149
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
brgi@XRutqT-6OW900000NkvXXu0mjfN)ZyX

literal 2016
zcmV<62Os!}P)<h;3K|Lk000e1NJLTq004jh006KA00000C*Rb&000N4Nkl<ZXo2mT
zJ#5=X6vsJw2m-ikks(?-rHe9Wv4H|9>Z!?Kpxqk4ONOF=g8&Y^g{l$FmRoVjQVEcN
z23-m^LI6)i7y?d<%5i&iP^Sqgi>I|q$i8=9;>S^><N!qrKiLXNlRy3c@9rLXrx-DW
z0TE}yw{1JQ54(1ckfSyso}CCo0vr)30OcV8M}&0XH_!s)fg~XE*`cNckRAx=dF@Jo
z(T;7?9S%ShxJiyWU?L!R&=jEn@_+(-XPSQElVI268E6wcuPZ_US|Stx{+I;dKF`1r
z=_X<>0M7vFRRV+>0M7t9N&)Z<FKA`LKjHw{0wZxA25k043sd9z`ue&S@PH5m;7JGw
z2_X^yo1SWgx*%H|*pg(wv9Xb~5NvF0NC0f!HVqc0v2vX&un30NA|lEF+e`TQ+e=2h
z&J}n}xJ6pzVEGaO3uOTAV98hk33xEz*25O5)oRrMgdm^}5)w(Y+6Mr*^r8ab!SgGJ
zOu@?a1fbo14uC6_0JYj7S5PkkU|>JN3lOkH$Pj9RhvzE*C|F4W5*9G9MI>NI$X)my
z2>`c{Rj|vF*iZlw3_!L(z?Rozt#&Aqm{pK$#vEXH7fg&;k3987GiDXEpbL}3A^>Kf
z#{gqr^@EIp-3R2b!N-E|k9qKLEbt5r(}0|U)~?yW!F0-tECS%40q*h)kgeGY<Y;X2
zL4^Q0z<378P$ZE9Wap3ox$l47AHk?+y|mjO!46gRfHz|qKqOK2ykt+T1PICiayVxI
zmICbYn#U|a2}_nV3{_C%0Z}9Sl>x~ciw@wG08~-U90=t;N!(azVq5)Pgpoa<+t2<j
z1&}i1zs+3Wr*<+ooNO5D;=T~?*ts~ly1Lda11JSWfX*2ez&)(8g2&4I&J;i$mjNP8
zOT_V8np7}=^Y&12N61Ei>$t2xoYZ-w0TD?m&;mTi1s5{_WeVui0YwpieNJysc*_CQ
zb{fD=WJ!EFaP2{#zP=sZn!sBs0bwy9NB}$=L}&mJ@n|IgwFhniz;&ts`u4yBfOji|
zw=}@33ZM?ub&AD3l>m=c1@xUb6D$E<bS8jX3ZRM50HBY7g;j_mK+FfgBzv(+fa{h4
z*qF)#WCC2T4De&4(fCFSU<qIrR<16jz$0+A3td?O95(PXfX5KO7g&G<xG|ktz{k`a
z;MpJKnWF_n1QOsvMVbv@j|fEoS^-edjNC$m4}8;(#2?`syYQv}MZsDD5-`aC<Se8L
z09t`<E)1Y&1w{ObcX2>0a+?BdijYNhCO||ApvG>e6>2Xm1IT+mNjzxiW7;>2TM)@V
z$p_8U=@4wT*~_CU0!))nSC7j9x)MfT8m9230eo>Y1<*YYQGa_W^9)uDfSD(oaAYh9
zKz>~1b3n+KmvaEWI-ot=8eSnU3IO!D9B}Xf8E$0((n4NBZv6<RedG~L`}X+rU7KGw
z7vR0&Wd?xS)Rll47P1F+$@24Mm^Z@30O_`ADl|#V9)Nixfo5a|@&HXg$N|{AaZdm`
z8GxoI<^XKoC{ieLK#0mg1%Q}0$~hG3hI+lEzg!DQMcZcr1VB?Ia)2p_-DBF@&5!|#
z&YK13GJr`J1Hk74fcCbRno#Vv=LgUc&LW``8y5j!m__Fm11MiHGfkZM`wIYYqDXl!
zz=}UNfXy32Rp?34dBuQC%mh44MA3;e0qcoa2#{FeJXi3qDG(|iF03G_;w%al&%wEZ
zcceh5SX_ZrajxJ$uV9fl2b=@W0sm_Nf2xeqa~#KU+%ddG6aJb3AhwN!Q~L+C%7p;V
z8~aWEDh9m86~JR$30%bm8M&%Y{ap;|H+I>p7;x~u<9vS!1$=}GeEHuBIABr=c)M&k
zj<I}vYOj8k0t6k5azOONpwzf9IpqT82aKJIljx=6o^k<;09^L=iVLU;n6|kBZ~?1t
z#PV1nfM5FOqgt)@A!}%1p)%mj{X3iY?{ENY+>=SH4DdIRaI#N+A=hBzUWETC#xSY_
z-k^ZZlYM93xdt1}_~ix1d2%t9fIu#di6x8z3n%;adi@$&;7h@iJYdv^PSP#1!0~7S
zTEuanJtRPV!xdNnXcbxDpTaC)o5l%1H)vV#6SEOaW2Go<LH*prFAs3BX9^gnzTFu0
zj@T<>LHz(Av~3Rnq9;bJ5&&9Ae9775UkOZNIToT;dg&w&P#IuhK|xwwg_0ykBjhcf
z2|x>QVIMQi0H;vNJ|4uf9+U#mLd&99FQM!)0HqATC6oiuLg0+S_)p`X0|gk%npnkx
z^{oInmKDFUDYe()@l#QiGiw)G3!Ypt3oQ=-5Nk1greAo_TJXY8d82<u0r0DBf3g-w
zVMPF1czsI%Zrr2*AOrzT{py?6LIN;R0J9rbwom}bFJD%$Fo`1sOo{=0{wlT*Q@(`m
z>jAmDbIyXO2XK2o)&a7iv7r6nVnEKq^wwVykhKt4<yR#EISX?u$XW<2?Fx2v3x2cF
zXjE5`w-8wK0W_^JrvfO&It516z&p)50NfCPfISFnPJsHF?zhDNsjo0ZAzB=OLmhtS
y0z^dgyb$iHI2M9AEHJ&YbmCC<LiStr`hNh{Z{#DXA;y;g0000<MNUMnLSTZJa%<fH

diff --git a/data/tilesets/secondary/island_harbor/tiles.png b/data/tilesets/secondary/island_harbor/tiles.png
index e70a72977cba3137795e80f15ae173ad8a08c500..82e419e72f3657589428dfe6880e2d7961e767a7 100644
GIT binary patch
literal 5639
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

literal 5093
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

diff --git a/data/tilesets/secondary/lab/tiles.png b/data/tilesets/secondary/lab/tiles.png
index c2a86a73da5d8c8b1638a61aedcc97e7177c2979..6a213d9609dbc272e77aedb46057c42a828ada8b 100644
GIT binary patch
literal 2844
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

literal 2592
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
CkeiMG

diff --git a/data/tilesets/secondary/lavaridge/anim/0.png b/data/tilesets/secondary/lavaridge/anim/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..303855f715b590b2e9479b21052a237c87b53f51
GIT binary patch
literal 83
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDJf4E#}JO0$v^m6c$mHa?B!Q^
gx3^U=LC;5w;p~RG>kZOZbU>;-UHx3vIVCg!0LG^j{Qv*}

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/lavaridge/anim/1.png b/data/tilesets/secondary/lavaridge/anim/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cdee79e24685e0915a7b2fce39f8f02a6f5c66c
GIT binary patch
literal 92
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDP>O=#}JO0$v^m6c$gjj?5+N9
pfB0^B`G4a()!)TVF?BCo#multua5i5Nw0X2HcwYSmvv4FO#laP8(RPX

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/lavaridge/anim/2.png b/data/tilesets/secondary/lavaridge/anim/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5810b80631a560dbcdd31d4f7b8161665292b61
GIT binary patch
literal 88
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDS1y9#}JO0$v^m6c%BHo|F<{&
l$M<)4tvMK<39X*)k;~AlROdZgwzCtY#naW#Wt~$(69Anz8DIba

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/lavaridge/anim/3.png b/data/tilesets/secondary/lavaridge/anim/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..caf7b569835b7e3edd654797f57b762a68dee3c2
GIT binary patch
literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDQ!;|#}JO0$v^m6c$NtN|M&m*
y`44g&4r}Ta3<bJbnD6apfBA#`5_i(WAa;fg40YEZtEz1PY4>#Xb6Mw<&;$VRMjj6U

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/lavaridge/tiles.png b/data/tilesets/secondary/lavaridge/tiles.png
index 4886aa28e3736581ac3319ede0f666d73a455bd8..896c43194b1349e149d234b25a6df5fabb801378 100644
GIT binary patch
literal 4215
zcmV--5Qy)IP)<h;3K|Lk000e1NJLTq000O801glY00000n=beL000m^Nkl<Zc%1E<
ze{37)dB>kR0=5(=;FH=~^Iy`PTx%MJOgt)f7!=T?qk-80hFUz&nT-xbX2DpoqI0`a
zvIlsU7xPHTR$|v6kFg^}3Sjc&#6@e*ijFD<GzJulGKLH&981)&0qvS(A`k<CDY?V#
z`@F}WvLsWf6WN6b=!56(9=><S_xnE2``o=E2OoO0$T7|Uxh!x7$Yp^u0E{f1VHo((
zbS9H|2nM;)Nk)2*G0A`lOfu4gj7b_ur>DqZ^bfE##^@gaj4?)kKTX1X#J9Ru@J;8w
zhueR7Uw1dXtm`K5VmBH3{%$^c$n}GpL)q-F2dTUJ(0(#?eLr=dXS}Q%r1Q~gPpNyF
zbn4pol9vMC*teJT4!w)InznV4|4@fQ&jwm$@^tO$qP_b90ou0B(?(sMeIAm#^(Jc7
zJN%^h8{0_n>{6&s@$aQfdMZV;)ILqKPkHuGrb(`$f3ImLddgE%LnJq7WXq(XQ{XjC
z>R0F|>Yt5Mhq60O?KSORA!=8>R3oc<sAdxm1o8RZVdCT7@0p^)R!0@m6G*e9s)1qL
zhB_H(fk{T%aMfAzTR;8f4i#~p@nYq^Jaisq0xvSo7dMxn+Vk#}4mDDnviEEBt=2k)
zy0*Qvmpb-!HIgcOH0tnr+er7fb&{;AZPY0#It9ME*Gp~Qz&2|0Y?Gn7y()FIb!rsw
z?)B48G$N|eG-$1Z+UcsNp`HFs(KgXlO>3a3nin*h%}iXyA?+<{*R%|@D6`h&CTeJ}
z*-f&h+0=A(Pm1=W?o5-+%8}xhMe=!FcOePutSpoKV@-3#C16=rl5|~vu?(^-|1oKr
z_7|>8h0Nv|w}E*BxDCu35ju0*uqqXncEe!_IFaR|q@0upZX(R3L~sKVMrw*Iqklbh
zRV_?b*eM>Srw*+Q-GsBbpJlcxsy(lUPU4PAldetKq^Io^9klIRbilT=G-YEGm}8d!
zrFGp;b}G<@eQBNk*S2p^*0!&?e)9}f^{RwFg*p`#ma2A=+R2s&aZTZ)UhIS-{2Jj8
zan}nCK_CIr0&I0^e)95BKX$Tw<fRZoLRjl9gE*jRZc}*_{K_NYX(KWW4OtSwkSQ0z
z*PIiQM9xXJ1j6{5XivhY?7T}hMe{8Q!zKw5BN-+RSO)yICfLPdw77nSF!wO5pZ+Sf
zwisrx92XP354Ytwi`D~Li(O$k0(t~6EbOzctl_*65)_uo*bv;r&mq0c4C(gNG%%52
zB~H`S#7u^!SeSMO$@SwI2yP++>CL8Woia1PEGscHF_S{0h!&1>3?u$tFAt{P3&6df
z^Vx0zw}4wfI*pU3uJd4u9%sOU;n4BQ>sunT6(P%K)oS4Ui&_;_wL17%e=6%wg^7I@
z!<XQr7Q^TIl@yj@^fM4ACpk_|a-5vxIJutsbGWw_bl^PW$A3xALckATUI+XN==wI9
z?EE*JVL#2W#UlLlQ_OewV<-LUW#HR~2iKs#S=OJ8Tybz>7V*!v)2zBQ$3MFm|6rx3
zQ~2pvgwr!OC~ZS^X;z(GjDI%cQU5NhtFADwTZFh?m6nAh#W*a*ICDlUa{5H9TLzq0
zodjbMc~!)^<*+0PS9>2@6DTeaClMWCqN&6nP=AG+VnnWRd+V2fb7B2i>U*y1?*aXn
z)MxJdF7<`Kc8dCp|N0j7?VK~IPyMDrzy75$NZ&ntu9^Pz6ma-EW;31odaRkg^F5=P
z%=weeWc-KPT=jVi`4`X_UH*f-c?&p@Wh=$j+#|nVk<V{%KEI|RpChO1l)d5CY3}0y
zGW#_gn48hPD6mk7Re|;Dw=Wpa0CyX|BtO*ou0!(X+Gnb6xsQW%UkgT5Bw51KPZul<
zoP=SCh~A8m;(^x8mIS@>bODwH7)G2eOronjujWVm3%r2*t8YU7)ems~Jy6KM`T^u$
zKj+`i{;U0#!KwE?KkjfiMBbmHbm|vg`gmftjj|Iz(~;R{bef);LO#!MQlA2*XEIkw
zJtF@Jb?uPHNmq~jDFr%PXUHFrzDaF*>lRq868Zgqj#$@X*)%#cGeZ*-C>rMQp?NMd
zvWy=v)F38pHV3U4_RC}nep#+WvU%tKCV6}C2+2SFDV)dU?KCmE{f9L3{tq>p->&SU
z|2eX27ajRVcYx&XL;53E*j-7%r1vSWMvZlt!Zs+&qLVsh=^4^I4Vd(HG}dC)EN?1<
zR|PuRdeqnVsIiChug>{b7y0)9QZE7?L$?d@PhU&@hW4D_LeCEC*|`rrJNKbyhxP2-
zhn^kQb1IddA)NLa>Y2<nO0(cnQ;2`|HN?L($3Oc9;@|rJLSHNz6qa5sf|0yQQ6Wc+
znY#_Om><Yr0`4{t{IE|bO!Yu|s@%W@5#%T}ZUQ#T4$-D(5dY+2%REh4;PH0xeS9~M
z#>O&B_=)L^7?-6gs}Y|vYps3`{N5kJftG}e#>NUu^B=S+AWGj(Mu4HeVCQRMPLO_1
zm6#Hy0n`=tb<`EMEpWY;XMNXMJ~nADz~w&c*<n39tY-+0%aQvG$1cP_2d$(!z4-1g
z+89tB#D;yC0i@mq-qoN)O~ZNN%*mz^Wx*$08`J@JIahqbP#AR#i8GVhiaS?3JJoy{
z?pmn3OZ9?qmKn8P4;sJ+O~LuDqKHO4Zu8aZ#l03~g{zW_R<-R3XNBAQgs<<eitBT}
z>J_)|$^Q`ilRT_6s;wod7VRykwdJhkH1xY!4{B{WYbsx6*lxjbkfF1h5cKjQEa-1)
zW&PRwH4XI$S9dmDxDIDC`cF21ebHmUF?O+Cq~3Lll>)9YxRgodMVKz?uWXv9KHE(%
zc{M--y0u-U`QP7GGez80<y3M_SpSH*I$VV{qHsFPGmi)(CkiJ~Z$*-*-}<d&*#oB1
zvrPd}Y89TYT5IrwxZuXqL93o2EK$0RkrkhdQSz-1*ZY0X20nLK<4JM`gv@Rx^PBx*
zldZ&f0`)%X1-JfCSfazwP-OU(rwjN@^+$XZ&SrelqWI-8tFS37ATk=UxV<Zn!!Pt%
ze^}hnBF{nI%4A~Lw}9Vt;dRtF7qgh`%zbFlg}L7tG%)uYi^6Or*)oUl-Ry@$n4Dxk
zaL9Uneu#`S^Y4*$W`2^b7+dl3_Fm6gw2)<d^mdjmmcaXPDU3x8coSIkGE@fgxw9y9
zz8sdx;%nCU$*i`U(Rl?>0oB8h0l8(}f71;t#l_4Aw}Fd!oc`c6aIuI;0bv%`dvhNd
z6utv(y!SS$*@4W52Bl*IX?ibm8H3YGL|9xgGTxrQK-rJpilN}WbAgQ4Gn15_G{tMS
z3zWW@FzDhO#1+rXWhp)ljmOhz0qjfPGyn|jNP3cA3Rp5NTB=3EK2@d>A5=HuljS_r
zVTKR+NW2+PG2&%)qy?%Q@gYYQ(W3gug5zWGi*KMDrxOt<%tE+6eJ25AFoigsxx*G@
zAuzx%Xd}r85W5TwMO-8(5lIZt?FbIsHh{@k<R;DD#6%>IB$Q~FF`DIsF>57GvvnH#
z!UGg$g(U`{u*9T+*$t~M5r+P5hhqlX3!A)N#eleww}u6HW;Fb!b(WC8j?i#0c*NZ|
za`NQK;+v2b_nll*Q_}<1j^}r5=<jhuq%><5i-QD8o8tWkTM07~qr`$SK!y{$4CF3T
z!f`O)b)3@_<5gE;snpFxI06g-1|J;+CI_7eub~poVLopTlM@q-<_wdY5(gY^&vC67
zL$oLKCloeP5@998e0;|ai0k<s&-+{@3c)SGn%<{uVErH@V1s0V$g8&T7+lo`elG!a
z!7@Z-SVd;bYVzUV6;BQ9QG1lExD|IdAA_6Tzy^x=zyAd0<_i#;>wi^G&h<Un;KkfI
z+d5AD_E?BU?XfT-T$ERz1ba|*1bZoF1YdKVb4Ca=Mtdv>zeE@iexV);Tfs1<bU|}z
z^T8nS+W2u`^b*I;>&Jmh(W<XcJcK@M7~O^Qjy-tZP>)63>~h$)ezeMcgo5!^&nEtH
zpdZNDlz8nOlm5!K^SE>joBdJDhV8LllSaovCXJ)GqF67!YcN8L;1FAt5H6of=iTEK
zm-ke42i=q9?aNw^fx=dWWyZy87%RU>htaL;54?vkdQGIy(qf*K{H$=)MCT=YDQu5l
zf*1s1L5jQ+3eqKLg_1#t<~W~RAm~)|R<sC{`_1ezEs92xC{ds!)ZGb#dJH2-(IC{m
zz%M|>eZ+b&4G3}V++(7$F-$X*_cM%MS_lS*_$@8;Y=msq=}|gb)amGWg-$V!;`9y=
zCNpZ{K91R!C}i7c-X1q86iI|Ab`+P9><Jpn>Td~p_<&yd)2)cArMIH$Bx#E)Oy^$k
zaZuRmsP;XWzOM*<85EBu#-m{f4*C;u2v&$9;}*maPeOl@OFi`0tiNP$G)_?){oBia
z$6Q2%bku@QL&;Dt>(nfakG~rS_H|eE)`KTs?)v_bah(s?KU%~4yeJE}*ED;eXM-hg
zMyaO<`=Y!q61pF9{e<+wMd^v<qeCk-DprUe@pwFC`2Ob2oAY`JR`}uIjxxY)3m-TR
z7on?rZ2e$I0spWCI8wy-|DfQq-U@pN#A^;-OFW`l{AiaScZ>j*s>*-|n+);rLOkj9
z$V&b#ye!MYDt}uq{9H@y<EB)fI6A^B2LyboyBJha)hi5NC3fN*ax=HGlic?t&N-Ew
z1zu)wPE}|@^(b^sl^NJ~wzydT!KDHoh5~r_auuKJr?{&aS|tYi0X}h6e1jvcxX4m_
zxE5upRk;0!uM^zB>Nv;CQp&&`6?Xw$y~@jBUX{deuau*rljWikan$1z@VS=InxekJ
zM;WaWAl0#`A+8eCm2i?9tpfSw_`Z?iRY`zU5dVk^i6KL49$q%1RKg=3bj$A3?rQ%(
zVEudW$;LSeeRQr>lF*H<47IhgYdtQ6>gw2~uvEUTqAPH;#X{VWSgcZAVOiADF7t?R
z=!VF0naLdR6j|Qs#=ioZtC3zG$02nDSEateC`RCNK$sXK7FoRXYIqnUz-oc>)<!tD
z4zo_TT0B0s3g@b%w-NuoK)k`K6L8l6xygFOhwetNhIyZOivo|WE|&Adu9&-4sM_<M
zki^gsT0{2h<J8-yAf@)nLVAkO9}ftHUwzbyY$~#3Eu*zeFJj<e3c=F~9|u7nhe#hM
zVPxHWPA;x@WariMuW(uao_Vr?{;gk%FssBxEF2@_M7@z;Kg5#idxfYB5i4oZ$=$nm
z(@9@E?yes?%hBxYm%rT1i{kQ|W*n+}^UaZ+luVB7tor);h9R!L7RK=KgO<z|>+e+-
zLy}R?&$#QKd+xbBc(e4MO)&n5A)bYwAo}M&%tLHe_|=nCf1-XBi?RMa_++D?x-DgZ
z^rCsN{&I#fNa1*44WtNjp`(|M=Ft=C`5doLh^vGg!|7w>7)~F9UmzQjK_}{^6E4Cr
zDeUfZa^@g_TUgV1MUWN>E6K4;n8nTY@4?>}Xev5%MU?z3(+IAJ{|5sgih>#n#U%g$
N002ovPDHLkV1nfXKN0`{

literal 4087
zcmV<T4+!vyP)<h;3K|Lk000e1NJLTq004jh008I&00000#{ym<000lZNkl<ZXo2mT
ze{37)dB?AgfGq_E<fL}?{Fil<n@q!yibur`g94g$G%!2BP>JU{bI_v5Bp54JbZS>h
z_JGXN623giR$|u>kG5k(3Lx^8lN4<{D|)G5Kw>~KPsWe|g<|P6Y(TpvsR-CWU`pw5
zd!G01sN?UWv|+=rM<Va#k?-fe@AEwOzVE$vg0*c00yYVS3B$-)HB1e5sC_4*QPap}
z4MSKHJl|bdHcfL03ZxuBxbb5Di5Ef#4+gu}gr4PPLH<1tppZv^0TRY1N&$uM=fQr3
z;;iV`PW1H$PXyN<2_FBc{PhJ7;DQYR31q$$@Y0Dvuz{1j2}jg^X;AGjJEWE)fn&xt
zppdr#Ac2felmb*$*Hx7R`a2HxcBw}q|J2eW^tAMNnsC7dEJ2g!%K*;}4qmnak%1$D
zK%~9<kzh-U&?AS601)5+j7dVq$4h*uo*W!}N#$OAD%vFlf=2^_bU<m5<l{xag>Asn
z5=bbE!hq^TA=rPkzbz2yW0Ih>>;Wgn9P<Ej1|cgY0IM*dPTHkDaiCq2<?f#<g3u!<
zZ&n8^)dqA2`o7vL2GkZsY3WfEvpT@209<~~0erKoEfD=mUr0D2^eBRKyar&Y9Pr#_
z2he};g}&}k^x!+e13fK!q>dT@gVbumkrVyx-NA#>KL(UNfH+nQuv7~mOF^YA&?mp6
zC<i1(VH}`?l>u@!6@)_FN4k5JT+6dc$2-Tf98i`AbpdLmyEhu@i>#T8Q2pMrAnCSw
z0ak_S1FCM96qQ?4mP4|lL=-_xQM62bz{|RR(ovwQhM}qvs2_m(Awjy#iO&IG11cNY
z>VN^&1t>YjveE9|fGkHtisA*VV7D{g2w<>mjv1;f%e{)CL<O-3*swdUY<<A<jNSbW
zW4GmASyrN`;G%@~hZk%CD4{Ok6l3{3V>jiX98!9fh#>t$LHpAS8$?5Irb)Ig06l=O
z0C+KkQPABmt`Hs$O2!)j);9nU0w+WiY=UFwi8hVf&NN|_sq6(9*&I01vM^?r#R1p`
zLa4}%Vj$`OvL<6@4ghC!*;`(KEr3g?2ROwR-}`Kp-LxK#==#))+kk@RHilLLwh{ws
z@@*%K=IWx!Zd=yKRecH+xK6ariH_}0R{}7VZGg&h%WGMtTGqq&K!Am3;|M<^$E2c!
zN<ex*)m*@$X|5u`x(oHI0y-;wK*7hB(*(A>#;^%@?^-2*gkH2tz!s%%J5g9%HO<A<
zEY#lyNYX{w`g@sMxN06)y3-w4xi!p#<*fTf1wgKv2b=15oE`}h31$|o4ge%%D*%_(
z&kK$Z7Qq9{tG8<dYzbw6pZwW(-2Q+;3mK0>EdZBL3fPQBKL32ujRFGdDc};y0P4w;
zjuW6iK)YEFfD+09zx?G(la3SZ{-7QJC6odBzy0mgMF3hk;8oEYwa*0Hxj$Vx!6+ou
zr+)PdK857tg1aBbhi$;vHURpBlEHQK>Hfd^-swwEIF*Wk+b}*<2Y`f9fclGnc-a9c
z+kl%&w7WV$Oiz{o^b_AZ{axJ#^hcg|_rv(2)&T5#y9AK<>dP<xe$s8iU3Y)}cEkpV
zVv;!XVJ;mur2z7;-~8_Pi32#5clWP<7FBtVBuM~BdjVQ0;PASxZ;ZJLiXr^XO>iP?
zx1a*WQyvY!a5mcj`5T1%v+OEZFDh77Ljq2ttp+w~=NAVk5u>QU$iD9r(23fD91wlh
zWbXdY7T3Cc0kjOIy55=QP1v*ep1VK4_;b}a;FU)mz$tUp+5KA>BK!g#eRLa;TXuHe
zUC!nFE1=W?z_?)V{UUFgtPbEwe0$&kFhf#~0_G~nnz=fF2kl>yq{mu0Ce5b~M8k3f
z#sx>g`tqvzjvx<7e<XEM#^5K?&weHq0b)SumBc5@!N=F!JTS7^tg$NeACea4R&8So
z(&O$ArAJ^67d#-9161bBp?(YV1S5A-Q01XNUWD-yZE^1LAGtqlZ-X)aNPBAq0LBGg
zfP7$C^QI8(?OI)TZ1tlbDeeys1OU)0?Wq8qVutMkbJaj6Mxx?3HuBsyHXaWgZ3s|L
zIe^@9HV6Gdx7xKg@7TW&9rXcF?Iu7zu$xg-&?WxRuK#aCUmJ{i0U^06z>dNfY}vs6
zAQJf#QI5g1;_=v!G&rDo0KL7{71&XLd|<cLkWl`EZ9u510wn^YBMgsUKt8Z+Z*4$(
zD|8`22%}zNRurfE>}<}0Bw+0Q?wSB;4_pvP2c%8YYad-#d!gQ~5#7Rh0()Pr33wpl
zd`o=t+DDSdI@4+t6#(E1hNFBPz=2j#Y~ND}P@iQe0m1+i9kn*VlD;I0k4e_GkJ>$k
z0JvrW0{ntyKd1+Ia6l0DJZV)bP$TF*_(k>uB~k}qVFjx~K?H_$<yoBQTRBC6;T?a8
zXMGz)jUU+AwmFlHas~DTgD)cSi3R}LWx1;z7ZrHL`vH3!2)KY!1vcPp?&>XU2m<co
z1zfM(8VZ&uxDTJJDd3Z=TX?PTw|ufC*jnK-6pU9aHpSLZuHbpD00F#kTfiftg8KmB
z(j9>Hl~7d$YR;B0b(Xt874F+j4LyJZy3Vs~DZy$AREOZyR|Uscpg<1t;JE;FuH4#M
zB@Ybdn1OlVhRYj1Hxb0v8hKzx@B^L)gJo8pPUQ;9zi$j^7rj;mAU{<XaFLeSz6!t#
zA*C)rD+N?4ctNQTD3k(71z=D)S{LBXA03;o1T=6WOb&`YDow2?s{#JvXg$C<&A9qA
zZ+=p#prS&#(S?jVPfX2~%|LwtCNlbHz@8`SsihqN#_wdbY4kv6I(1`y2LNb-HvI~p
z=IyKr;~Cur=&7A37)J&6JTW!56F_<)?amXmIc*1kEuy*eMA*Jv{<Q<x)b;E3*23$J
zhSYMv=4<)<C)fEF4yh;=$7uw(me=+C$CmY49uEG7q8w`yu(|#TrLS#V-^>GG3udUj
z{v~k0)%9N!a$)1c%}?LTTU)ZC$jt!2zZ2`fru4$b(lri%jy~7~U<+nG30pzZ2EfQ5
zH34|jG?N)yLFyX%z?z2M+jo6SxMqI5lCS~EYwHN0lGH>Z0N~onhwGmb^47-Hl)0YY
zqB4bl-)-Q4#J#uj`A^?Wrj|`}IxI_)Jmb3&!ugNSuYC9x&b9AdO&Nwc6UHdag#81q
zonM(SKOy8ba|r-+CX8cXlK>+*VHiugkuvU(<^dWsLA!yg2hfBiIwNBk<>ml{rZwYE
znrOxnnUTX3C`|y;+KQIZjI}#7o!|=W)hz!2s!=U@g9FkNOJv#xG!e#oY3QsFkV&SO
z2z6JN{R2!&2zR2MBoKw^H|WKVj*eyk_rQhei8bsr69$DrXsAgArn#bl6KVSVN+L<7
zW3izo6##%BfIvJGdec6bz$M(Ic88Dz#DI{Qv9Ym3&m8g}Mw~>YbuD=(oq&NuCzuC^
z4mAtdBolYi*R^zk=&0bCL(ljJ@Y~&1^2Qxpj<X7+=}fc%g&Snj;wy1YJF#HT9?8<A
zrKNWSu-5?3;|=efDS+8e67T$5RwB6*faN?g09L@QJ16uH*rokn090H6Gz(z6BnWhu
z1cB_50Ex6a0z_eV1PtS@2s{svP<+&7Cjca{IX1U*01#-3rgj0acG-ko*#9=bfBcJ8
z_j5zQ`i52a^M5~J*G<@g{TBer5|FP#5W*KC(pTQqlOqiP1x8;ika%&&X{daf(H~>^
zTa4+%19<2>HB$l@XY+B5%@@DGGVXH$aW4QSFBO0}HlLVd>4eL+KhGzyJbU(CJ$Bs#
zkhbrD6akb?kvVu>S$NR_OcC6N<?$(9k9z^t6i^x)rZhf$Wp0-5z%uTGVu8(%lme<L
z&@!=+1dSyqyTv778TX-px%qfw1xXUSk|r^ove_xzkp=<Dcr1ki7H|UXbz)T?=qW}<
z^b}1@=_o-T)@gE>&_NPs?*bSB?ycgg3gA0R;4OV6GlGCAEkoikXNFujqfhB0#0#jV
zKy@s^7G^P$1U;zh<P79O;w+nu`%u7b902GrTqz+CJ<NqTV-)kCu7W{T9mLl-OU4i|
zOh^o0a|=`8g$2C?P)&imil@CBk4?dkr(!XEijWa(NnA_EO8}y{w<cf~;)j4uUAH!4
zvFn%%$ukgOFQD4V<N`9WSVDJW4iKoC$_&TIu*Zo&D6ek=)Dwe)>4m98W@IXbd4Zqt
zOFR`wNq_M0#hQR|2GyB9qN;zn-~vW;eK-LC_xU}``eAh^Vj!>&7=f1xwed54Ijj@z
zgP|a|Lk$3#_*o7>a{vT#(eeWRx_T6_g0?^bFcm8S4BIE;HejeWU^tbDouTm<mjA{9
zKu&NM{@^igdus#0X|vkwa6A(qLBK7?iS8QTL)(WCfgk)%O~9W+9zZVWSY|&iTVIa3
zZ&kuryuv76XKa?<A8cU4mMr6f1;uN<fQ+kfmt?2Rts!7WrgBgU$keVBwl-x4&?N>X
zDbN@Yb`CY;04~`F2Y^onP!X=upsEenl!FKe$^h`C0HoucAqgcw&BK>u2?2qy9QLPx
z+V`WN@(dpF3EPE1@QLl%#!V;!_z@4=4@?HaGhH*XeaEo@;8GyKqYw;+(T|76oM)Qg
zgXBwr2N2!{gdsRVe?F+8KyGtVsWG6;2M$2=4M-IMuX_NZe+8*x9(Vv@Y=Tc8yxQhu
zVwboL0B20gKBMreC>LAp0f^In&&Erl$fF?IAO|3dG~gG|CBm`!+cw~JQJkJ`^9LBi
z%A#A}0q}b=wk96{PT=*ynNPThw7;GDJDJ=HJQpOXn2BA}qTeQX0G?Eq_fy}1Ag>zq
z0^q#r+V3CGiHpHuijjL_l=lbN$A<m&2l)27^N=o<?MHT@Ly^Oh`>bA50J{mT*roYP
zWqk9FLSwvB?ZQsg-?)HpRJQ-HJZg9At>6QHiG*)6Vf&8*0=y&Wf)0lIR^SNWD|n+)
zF(>?m5#O9AjgvMY&^$o%+*gM@D4txt!U%ES=Y9TgbXpQ$wZr-c@T$1mUmXDYVMMY4
zosyWb0V#3cIiG-61mWVBzw9WO7WdgV>d*OCfB;I13idty^wYxM{q8wm3LpYW4se@*
z3S5961qje+Mu*F;bWwrZ1YZi0iR9R^W5?cjW9BdiNYmbjHW~xSxqW0ToJwUfE<h69
z#~pk-F_GF{h_(SDzjm(n&_*@DUhgs(0?zFd&tciGg1s6oRp0{rtgmrE{LJhbcSivL
ziKLkDtpLI}<pqF*q7Qs2;DF)yaB)vT60L$h>0d!IQTA-fC;*6mK%sbhp(vp!+gB5c
pg`L{20g5b%R41|j2mB8L{uA$_ih`xSH{}2T002ovPDHLkV1jc0cqIS;

diff --git a/data/tilesets/secondary/lavaridge_gym/tiles.png b/data/tilesets/secondary/lavaridge_gym/tiles.png
index 0865ea20766790f98204fe33b9c3802f9a4e38d6..8734cc3bf2d63cde6c5ba99eff17225e8ff99492 100644
GIT binary patch
literal 713
zcmV;)0yh1LP)<h;3K|Lk000e1NJLTq000O800FQB00000bb6Nh0007zNkl<ZNQteL
zu~OSW5QY~@s>mf3c12v!V4eWc(j-ce!d+Cja4UwAhD%<+$Q5`dU|+!-$u5W~n6dN(
z$oc=hk*zTj@l4nme{<UX=d`~2btg-NY=IOZK0=NW)##wQg-)x5?wq-5Xf?Vq2KZ$q
z9*$ZPjhdcZHb046;wN`fzzm{D>;uqhPh#;J?SaTn;{l}|LiQcZB#s@d#eC)p^BK-}
z#rc|2ARgnridNfN%=dZB`No{@kb;Iod71JQcn)NlhrlzChrpEBSjhlUiF(~>$Cs~!
zj%szfx@(kl84x@Yql`G30j-6@wm$f19CuFpTO!;>7a}Sb)*{^K_qQM4sq6Exy9vl1
z-3Yp_+;W>0LlIa{JWrxq;_}XuI38MOQN*5uCo-Yx0oWUew?7_;RoBs?2NWqrobQTC
zb3o9E&XW`)b{#NZo2o-#ckG;~o>X^ER}On0wT9com%?FduT|wXY*vf4!`{bRZ{+xn
zQsAkRNq!QXOTPL(kk90)^Cy#&;4G7~pgWU!uz;z%Gr-Tb_n+FLg{X&qU~#NR2E=Pr
z>1-HUxevphbE4{W<f?oubm!D{Syk8d-Kfx|9K96h9}gpT5Jk~V2`<N~noFTMW6Yog
zmt%F#MN~YqD@9dq?Fj8YtjkTq9&vAF+Uo)L_=D3IAW4DODgMkdNs`iPR6+lALfuFA
z7t&l-(bmxjut!9i;Ju3(-wR94gB0y{L$sS(S-vJb%wLl?_h0~XEmGKQk>D|5ZuTGN
zpMLBYM9hVVF3bd5tGJkO-}HR>Dc8EmggZ+NcHfw5!rX8XA!ecKO!WN%xK}yySJi*s
v)8+dT{o!qs5?oHZU)`6QL*wHTTn^R0WKWdkkc1lV00000NkvXXu0mjfhW%RO

literal 631
zcmV--0*L*IP)<h;3K|Lk000e1NJLTq004jh001Ba00000I=RC50006$Nkl<ZNQs@4
zzjoR%6vowznQF#NfhlFk68Z#jR+iQsI(VxF23BzxS)%p@Kun3xX#fp*Bby<GA?H{;
z0amXp$&MTo{(R@i7x{31{&aOEBthbh$b?clCWI~+V{=O79wGJcOLfWQ59hNZ0XL<(
zY#Oy%?FHjpMb4$ngrm(K0EwEO*JzLFNX0L6Dc6Cc=RJU7^D{!98Z)ZnTxQq>M4LST
z$b-z;NXIL=Hh|ksUZfzpUVaF8M7b`SIyN$_0pANiD}4{>l)F#`B)ICJ0=Vhi_F-V7
z{)0|Dztr)p0DSux&^ILtcLFL7GLda+0aJuL51~b*V>{VVgO|>~dcY9!Aagd-@oI;I
z>}zmW4<HXJ@qA1#RXm&5)&Tt91>w>GaII%DeDu7FdC`fr4qiH&Rgl&fk+CV~aFFa-
zsH*|^?-~Oo;O~!LKVgK`<6P$;Q*&RpG*Z6duZ&~NVRS8EWh^DQmp6!=V+B|RLIeiT
z0x8H7#yuF}d%#m(96N`VrQ0OLsaU!I(}^K7TALS1ua^VtoVTHfvEXSeU4T)a5bdD=
zXagl6ic-0aMJ(R{l&k{_D3<Wb-6imA*uQPOtOANlwE_UQ6+rQE7hskksx{aq8f@o6
zr0#{{-k9Rm?t)E_v6h{~Pxnew4Ra4kwxMhTp+hx*1X=)m|7ZYHD~F^U0J8geFn|o`
zf>JWE0H{Fj;cx&^fcuH>p9~lPfSwLe2T@f4a!;(mg#KpmO*ra(b>5HNh5sWel;wa(
R2de-8002ovPDHLkV1oCw7EAyD

diff --git a/data/tilesets/secondary/lilycove/tiles.png b/data/tilesets/secondary/lilycove/tiles.png
index 88c5c7a28b4a1411ab6e855b6ac0db34eaa9e1e3..b77f3d37925546942fddb5138e917338b3e9bc19 100644
GIT binary patch
literal 3912
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
W7*gWTvcjJL0000<MNUMnLSTZ4^SnO*

literal 3597
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
G%KrdQ4IB*s

diff --git a/data/tilesets/secondary/lilycove_museum/tiles.png b/data/tilesets/secondary/lilycove_museum/tiles.png
index 4951873010ff10bb85bea3e91df0abf763f7f4cb..5bcc0ecfeb7396d3622435c781c53192f7866605 100644
GIT binary patch
literal 3938
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

literal 3345
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
bhV%ae;8k*hm?-k~00000NkvXXu0mjfP9@Ip

diff --git a/data/tilesets/secondary/mauville/anim/0/a/0.png b/data/tilesets/secondary/mauville/anim/0/a/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..88b028b5210358b4a3d4920ef092c67818b6941b
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsR~aQ#}JO0x~DesG8qcETwIyD
zr29=roLK{t2Iom3QGrSG^f$UR>{-XKP5hV<-@HAG`Cm28w%m65u-MHvJp0x(-DJHi
zyn6N?Z{@t}m&BId`5(Qi$xf@t<v7Rvhq3lmH4b+zdhLWufBz8r+p+A(?4(@NEl-^d
cd~f_<zOmH)YrR_CZ;)F&UHx3vIVCg!0D0F%UH||9

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/a/1.png b/data/tilesets/secondary/mauville/anim/0/a/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce4010db2848ddb04a56ef56b6a3da58dbca2492
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsWML&#}JO0zFmfV%?>;)-*xkL
zcJ1HM;dFNL1V69YYO1*lHo7$C#7+32e^Xeq!0=Na+o8jpvOK@4_;}58R#|u5V;0KW
zQNmkode9`yI`H-5_bNqhCre}`^IJYI{_U{iqWnFfvb&!|f6O|j(qnjcQc0@nl5By=
Y@(NN8T(WO{W`kVf>FVdQ&MBb@02Avz+5i9m

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/a/2.png b/data/tilesets/secondary/mauville/anim/0/a/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ea20f6dbd281511a1d59fb92e5880a22d29915e
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsUlAo#}JO0vE3Va4+ZeJ<cn?p
zqqTd7gJ<uQiTkEZYZIMhGEGCtTDYP7p-!MejLpsG<pO+l3nn|te_vT}H2AB-<&OvU
zhri%1oIPE?%G~Y{v+m`>v^5;h)h6n5<nt__o^-XAyT*U9klW0g)6U%TJF!$jO@8)Y
VtHQnOLu^5=@O1TaS?83{1OS&)KOq1B

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/a/3.png b/data/tilesets/secondary/mauville/anim/0/a/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdf4d30bfd6e83785234df195b201723b273d2ec
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsdP^l#}JO0si!w`HaPIKJ~a1^
zT3<9hBx?8MgzU#$S;8A8oc3LC^Qd}L>#`pT5BXb~^>0a)NZoGty;^_LJAcVye$Uym
zCqMTI*&QxU={U~#uy0q&KFi&87M`5RkB-gQu3F)(J@J*Bk6wI%dHHk;u0J5FJzf1=
J);T3K0RV|*JEZ^s

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/a/4.png b/data/tilesets/secondary/mauville/anim/0/a/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8097808c7a2e419c3b8aa4f9f4da594953d845c
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsY*{5#}JO0x?LN2nG6M3womhY
z+Yu+DVCS|-#e4oFfl2%9Ejt;0#xTa{uQ?iTa7&tZ1@q}7jsD+8g~wJ;>59?Izp%U6
z$N$gn&RtyBZ&xh{vyRD%`f_oCvX$Epw)atAel+|ll&V#Gwe6$oFS%t$d^g5$@7%-f
cBW&`I;ZL}I0Ph~JFCfQwy85}Sb4q9e0OwXh!T<mO

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/a/5.png b/data/tilesets/secondary/mauville/anim/0/a/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..88b028b5210358b4a3d4920ef092c67818b6941b
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsR~aQ#}JO0x~DesG8qcETwIyD
zr29=roLK{t2Iom3QGrSG^f$UR>{-XKP5hV<-@HAG`Cm28w%m65u-MHvJp0x(-DJHi
zyn6N?Z{@t}m&BId`5(Qi$xf@t<v7Rvhq3lmH4b+zdhLWufBz8r+p+A(?4(@NEl-^d
cd~f_<zOmH)YrR_CZ;)F&UHx3vIVCg!0D0F%UH||9

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/a/6.png b/data/tilesets/secondary/mauville/anim/0/a/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce4010db2848ddb04a56ef56b6a3da58dbca2492
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsWML&#}JO0zFmfV%?>;)-*xkL
zcJ1HM;dFNL1V69YYO1*lHo7$C#7+32e^Xeq!0=Na+o8jpvOK@4_;}58R#|u5V;0KW
zQNmkode9`yI`H-5_bNqhCre}`^IJYI{_U{iqWnFfvb&!|f6O|j(qnjcQc0@nl5By=
Y@(NN8T(WO{W`kVf>FVdQ&MBb@02Avz+5i9m

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/a/7.png b/data/tilesets/secondary/mauville/anim/0/a/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ea20f6dbd281511a1d59fb92e5880a22d29915e
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsUlAo#}JO0vE3Va4+ZeJ<cn?p
zqqTd7gJ<uQiTkEZYZIMhGEGCtTDYP7p-!MejLpsG<pO+l3nn|te_vT}H2AB-<&OvU
zhri%1oIPE?%G~Y{v+m`>v^5;h)h6n5<nt__o^-XAyT*U9klW0g)6U%TJF!$jO@8)Y
VtHQnOLu^5=@O1TaS?83{1OS&)KOq1B

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/a/8.png b/data/tilesets/secondary/mauville/anim/0/a/8.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdf4d30bfd6e83785234df195b201723b273d2ec
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsdP^l#}JO0si!w`HaPIKJ~a1^
zT3<9hBx?8MgzU#$S;8A8oc3LC^Qd}L>#`pT5BXb~^>0a)NZoGty;^_LJAcVye$Uym
zCqMTI*&QxU={U~#uy0q&KFi&87M`5RkB-gQu3F)(J@J*Bk6wI%dHHk;u0J5FJzf1=
J);T3K0RV|*JEZ^s

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/a/9.png b/data/tilesets/secondary/mauville/anim/0/a/9.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8097808c7a2e419c3b8aa4f9f4da594953d845c
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsY*{5#}JO0x?LN2nG6M3womhY
z+Yu+DVCS|-#e4oFfl2%9Ejt;0#xTa{uQ?iTa7&tZ1@q}7jsD+8g~wJ;>59?Izp%U6
z$N$gn&RtyBZ&xh{vyRD%`f_oCvX$Epw)atAel+|ll&V#Gwe6$oFS%t$d^g5$@7%-f
cBW&`I;ZL}I0Ph~JFCfQwy85}Sb4q9e0OwXh!T<mO

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/b/0.png b/data/tilesets/secondary/mauville/anim/0/b/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..88b028b5210358b4a3d4920ef092c67818b6941b
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsR~aQ#}JO0x~DesG8qcETwIyD
zr29=roLK{t2Iom3QGrSG^f$UR>{-XKP5hV<-@HAG`Cm28w%m65u-MHvJp0x(-DJHi
zyn6N?Z{@t}m&BId`5(Qi$xf@t<v7Rvhq3lmH4b+zdhLWufBz8r+p+A(?4(@NEl-^d
cd~f_<zOmH)YrR_CZ;)F&UHx3vIVCg!0D0F%UH||9

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/b/1.png b/data/tilesets/secondary/mauville/anim/0/b/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce4010db2848ddb04a56ef56b6a3da58dbca2492
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsWML&#}JO0zFmfV%?>;)-*xkL
zcJ1HM;dFNL1V69YYO1*lHo7$C#7+32e^Xeq!0=Na+o8jpvOK@4_;}58R#|u5V;0KW
zQNmkode9`yI`H-5_bNqhCre}`^IJYI{_U{iqWnFfvb&!|f6O|j(qnjcQc0@nl5By=
Y@(NN8T(WO{W`kVf>FVdQ&MBb@02Avz+5i9m

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/b/2.png b/data/tilesets/secondary/mauville/anim/0/b/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ea20f6dbd281511a1d59fb92e5880a22d29915e
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsUlAo#}JO0vE3Va4+ZeJ<cn?p
zqqTd7gJ<uQiTkEZYZIMhGEGCtTDYP7p-!MejLpsG<pO+l3nn|te_vT}H2AB-<&OvU
zhri%1oIPE?%G~Y{v+m`>v^5;h)h6n5<nt__o^-XAyT*U9klW0g)6U%TJF!$jO@8)Y
VtHQnOLu^5=@O1TaS?83{1OS&)KOq1B

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/b/3.png b/data/tilesets/secondary/mauville/anim/0/b/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdf4d30bfd6e83785234df195b201723b273d2ec
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsdP^l#}JO0si!w`HaPIKJ~a1^
zT3<9hBx?8MgzU#$S;8A8oc3LC^Qd}L>#`pT5BXb~^>0a)NZoGty;^_LJAcVye$Uym
zCqMTI*&QxU={U~#uy0q&KFi&87M`5RkB-gQu3F)(J@J*Bk6wI%dHHk;u0J5FJzf1=
J);T3K0RV|*JEZ^s

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/b/4.png b/data/tilesets/secondary/mauville/anim/0/b/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..91f368cf84b162d4ea6f5705545fa13e2c22acc9
GIT binary patch
literal 72
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDSl5E#}JO0$sWv1Z3n#>7(O-{
UGfM4`s|P9ZboFyt=akR{0Lf_&J^%m!

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/b/5.png b/data/tilesets/secondary/mauville/anim/0/b/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..91f368cf84b162d4ea6f5705545fa13e2c22acc9
GIT binary patch
literal 72
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDSl5E#}JO0$sWv1Z3n#>7(O-{
UGfM4`s|P9ZboFyt=akR{0Lf_&J^%m!

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/b/6.png b/data/tilesets/secondary/mauville/anim/0/b/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..91f368cf84b162d4ea6f5705545fa13e2c22acc9
GIT binary patch
literal 72
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDSl5E#}JO0$sWv1Z3n#>7(O-{
UGfM4`s|P9ZboFyt=akR{0Lf_&J^%m!

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/0/b/7.png b/data/tilesets/secondary/mauville/anim/0/b/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..91f368cf84b162d4ea6f5705545fa13e2c22acc9
GIT binary patch
literal 72
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDSl5E#}JO0$sWv1Z3n#>7(O-{
UGfM4`s|P9ZboFyt=akR{0Lf_&J^%m!

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/1/a/0.png b/data/tilesets/secondary/mauville/anim/1/a/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..88b028b5210358b4a3d4920ef092c67818b6941b
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsR~aQ#}JO0x~DesG8qcETwIyD
zr29=roLK{t2Iom3QGrSG^f$UR>{-XKP5hV<-@HAG`Cm28w%m65u-MHvJp0x(-DJHi
zyn6N?Z{@t}m&BId`5(Qi$xf@t<v7Rvhq3lmH4b+zdhLWufBz8r+p+A(?4(@NEl-^d
cd~f_<zOmH)YrR_CZ;)F&UHx3vIVCg!0D0F%UH||9

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/1/a/1.png b/data/tilesets/secondary/mauville/anim/1/a/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8097808c7a2e419c3b8aa4f9f4da594953d845c
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsY*{5#}JO0x?LN2nG6M3womhY
z+Yu+DVCS|-#e4oFfl2%9Ejt;0#xTa{uQ?iTa7&tZ1@q}7jsD+8g~wJ;>59?Izp%U6
z$N$gn&RtyBZ&xh{vyRD%`f_oCvX$Epw)atAel+|ll&V#Gwe6$oFS%t$d^g5$@7%-f
cBW&`I;ZL}I0Ph~JFCfQwy85}Sb4q9e0OwXh!T<mO

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/1/a/2.png b/data/tilesets/secondary/mauville/anim/1/a/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ea20f6dbd281511a1d59fb92e5880a22d29915e
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsUlAo#}JO0vE3Va4+ZeJ<cn?p
zqqTd7gJ<uQiTkEZYZIMhGEGCtTDYP7p-!MejLpsG<pO+l3nn|te_vT}H2AB-<&OvU
zhri%1oIPE?%G~Y{v+m`>v^5;h)h6n5<nt__o^-XAyT*U9klW0g)6U%TJF!$jO@8)Y
VtHQnOLu^5=@O1TaS?83{1OS&)KOq1B

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/1/a/3.png b/data/tilesets/secondary/mauville/anim/1/a/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdf4d30bfd6e83785234df195b201723b273d2ec
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsdP^l#}JO0si!w`HaPIKJ~a1^
zT3<9hBx?8MgzU#$S;8A8oc3LC^Qd}L>#`pT5BXb~^>0a)NZoGty;^_LJAcVye$Uym
zCqMTI*&QxU={U~#uy0q&KFi&87M`5RkB-gQu3F)(J@J*Bk6wI%dHHk;u0J5FJzf1=
J);T3K0RV|*JEZ^s

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/1/b/0.png b/data/tilesets/secondary/mauville/anim/1/b/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..88b028b5210358b4a3d4920ef092c67818b6941b
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsR~aQ#}JO0x~DesG8qcETwIyD
zr29=roLK{t2Iom3QGrSG^f$UR>{-XKP5hV<-@HAG`Cm28w%m65u-MHvJp0x(-DJHi
zyn6N?Z{@t}m&BId`5(Qi$xf@t<v7Rvhq3lmH4b+zdhLWufBz8r+p+A(?4(@NEl-^d
cd~f_<zOmH)YrR_CZ;)F&UHx3vIVCg!0D0F%UH||9

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/1/b/1.png b/data/tilesets/secondary/mauville/anim/1/b/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8097808c7a2e419c3b8aa4f9f4da594953d845c
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsY*{5#}JO0x?LN2nG6M3womhY
z+Yu+DVCS|-#e4oFfl2%9Ejt;0#xTa{uQ?iTa7&tZ1@q}7jsD+8g~wJ;>59?Izp%U6
z$N$gn&RtyBZ&xh{vyRD%`f_oCvX$Epw)atAel+|ll&V#Gwe6$oFS%t$d^g5$@7%-f
cBW&`I;ZL}I0Ph~JFCfQwy85}Sb4q9e0OwXh!T<mO

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/1/b/2.png b/data/tilesets/secondary/mauville/anim/1/b/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ea20f6dbd281511a1d59fb92e5880a22d29915e
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsUlAo#}JO0vE3Va4+ZeJ<cn?p
zqqTd7gJ<uQiTkEZYZIMhGEGCtTDYP7p-!MejLpsG<pO+l3nn|te_vT}H2AB-<&OvU
zhri%1oIPE?%G~Y{v+m`>v^5;h)h6n5<nt__o^-XAyT*U9klW0g)6U%TJF!$jO@8)Y
VtHQnOLu^5=@O1TaS?83{1OS&)KOq1B

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/1/b/3.png b/data/tilesets/secondary/mauville/anim/1/b/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdf4d30bfd6e83785234df195b201723b273d2ec
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsdP^l#}JO0si!w`HaPIKJ~a1^
zT3<9hBx?8MgzU#$S;8A8oc3LC^Qd}L>#`pT5BXb~^>0a)NZoGty;^_LJAcVye$Uym
zCqMTI*&QxU={U~#uy0q&KFi&87M`5RkB-gQu3F)(J@J*Bk6wI%dHHk;u0J5FJzf1=
J);T3K0RV|*JEZ^s

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/1/b/4.png b/data/tilesets/secondary/mauville/anim/1/b/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..44564e67a599b80664b2480d99c8c5a00c33d328
GIT binary patch
literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDQ!;|#}JO0$sDXqY#a|CNu3gS
xG>uK=QiDrIl$MW@iAfKmr>vgR)D1$DI2q!Tw6@%kaL@;7_jL7hS?83{1OO1j7$5)u

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/1/b/5.png b/data/tilesets/secondary/mauville/anim/1/b/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..47e7e17ee95fdaf34d342d8970c538f9829e4750
GIT binary patch
literal 121
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDF;s%#}JO0$sD|#yr~?VyxgfA
ztW0eN0@^w}M|{0myIUJOOgeNX2y!Ja6j-UC#CwYOaKNNCXZ9xPM{Jv9f@K-%B(?dz
SoYr3tGSk!5&t;ucLK6VDI~^YY

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/1/b/6.png b/data/tilesets/secondary/mauville/anim/1/b/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1447cde23dccd65bcdaf90921fe1212241d5db6
GIT binary patch
literal 108
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDPvC;#}JO0$sDXqY)vi_6FitV
z9l8{>P)Fxg(8ia(%t8*a0b*vkih2%*SeG2(b!l0+f|;SVN85&t)#oF~7*AI}mvv4F
FO#lvr8~XqN

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/anim/1/b/7.png b/data/tilesets/secondary/mauville/anim/1/b/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ad81b1e1e9daf31260a661bd436367997d4f31c
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDFaUz#}JO0$sDXqY$}IzMLm`*
zUDTl{n7Kp6p+#G-)5OQ{dcX|Xl?q{5S`#=9hp;nbt=1OT^vItMGQ-o=&t;ucLK6Uu
C+!_4<

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville/tiles.png b/data/tilesets/secondary/mauville/tiles.png
index a015fe5b4f7f987c5cd1592b3e20c7cbf9bb4fbf..e4ce0d4f85e3532d1a9ea37b02ba4a7ae50b2554 100644
GIT binary patch
literal 6372
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

literal 6019
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

diff --git a/data/tilesets/secondary/mauville_game_corner/tiles.png b/data/tilesets/secondary/mauville_game_corner/tiles.png
index c8f0dd1eee95cc66c7cbdb49c1b95bb43532c228..3f7f565c9c6a6fc6b8d4bf6d879964987d69619a 100644
GIT binary patch
literal 1788
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

literal 1567
zcmV+)2H^RLP)<h;3K|Lk000e1NJLTq004jh008g=00000D2LwH000H%Nkl<ZXo2n9
z&rTah7yxifIq($pB~0@I&_kuFmuSr?ZY9U#LsW}P7%C)7l~MtR^w_Qs<Xl+_w<HHQ
z9COJUDTi1<Jd2{lHsJO6)FZo{*_qjy^{!oJ2Pv2NFko!v=WqUfUc9Ch@c<+?cr<Y;
zM$wWei7WL=y|TWxzE&fj&3!cv^nf}Ao^B}d{p|qJ1@MS;;b~h5T>umWk}gzgYlc9*
z7$Ca<9%%txCH(6SiKA(8fK9v};PH4z0oFnfKs<uG1vFM-2H4w~HruJt16&BFTDwvF
zmH_@D0GNxVK!=A4ENhSf#I9$63te46j1&X*;GP)(X&3+pMS;B?2Ec*<8Mp%@fK1)5
zfwCKm1AH%N0`c7M!~k1Ux<EYlFd#LdAizhCY^Xv2JTL{|9Ri5$Y@`K<-RP5+zwqLs
z1&F;s%eqd(1P}$q0tSF6>xBXF#8Mb2(#Qf9uz&?DU;ztQzycPqfCVgI0Sj2b0v51<
z1uS3zB|?nxEORS=1$-GG?hV(=<sZZJY13KA&xB+E{)^-haktBa&~cn9PM^5N3xR;0
zw?2u&uIF{*%s*{xY*eq>ZFm150iK8a3c24|0Q}>5?_vO#%Vh$%5J4)?m+lF`Pa}}~
zH)pxPgnm1wJy>PH-U`~<ApiiNE`fiYXxxgNpCrJ}+fx7`23#^=s{~6c68M{qK?w2Y
zHiok-fZt&Jk&fc0(-?5!3fv-nIOKpUfbC5%&IP)dTp}N1mjMVuhz{C+rh#Y-DxlKJ
z8H0dMBl*@v%Yl&m2;?x9rtA!fA5A@sJwKY@GdI<RetHa|@iqVrC4(tjNCfD4-hcr9
znM)T^GKe5O3uFu$<U@|ZbPO8+w)`mU^#+4kG(l%BUCLq_4+U^7fChxyDlmHd_!VeM
zU~u-FWxy6vp95kujq3E|Vx_5M@VeW8$39try#bj;0{q5+cqzvT#6aN34G7TKP6NBI
z;BJfF8}CK}U=ENt>?c6Tvc@B@`2;kv1jHcnm<&$8p*O?;>X&QxIUr&L#x0N}piCow
zgvr3iY!Jz<pa$;O=74ZCYBtq%fc>dYzC@!Y2j2Uv3pD#2fCx%^C4*5Tt}7%1UJv@U
zavbwOy08)89FYqJ$V0XWfOtLV*J|KF1!TH#a(xsiUATUMPzRk$0O3^$)bP*u=70cq
zI%Lnx0WyQ2>t7~7UKb|#`UoGZT_DZRU-;1&#=y|w^?+qiYJScDBou%z@go5w^?(5&
zI|j!XPt-B!P%#Ebv}8S4Gz;O!Zud<d5K>?!>j44o<z_%<Jq1kZY5yZOzcZyC#6Wfy
zLgaaAVBmQ@3Isl8+nLvc1zotAdY*rgGl<cohdi|&^lP8<W`Pc~@(zXMymLgKnoiVu
z5ChpUh;9(NPyqSl8pU5_Jy^6C(vepWRt1o|4l;n)jS1in6(Bnc*$j9+NPzbrOfzs4
zAZHdbz$qdZ1wfA0AYML0Xdj(Q01Y`%cVzr8ATtQM9~@cM<sr_JE|BJ@&k|tB9<q9!
z296eIz@BvfNPq|N8}h2SlZwpop#so#qyXQt46f40iA%;{9{5hX3$z|c08^k^)#(DQ
z2NDpQYyMDo36LH{2`FvCC4j64q7VGXRMHE3kg5kt3JV`F3w$|SvdnG+49x*$1TF9t
zf&JUBn+1SD3Z>yg`j<p{>uCX(&e{HaXaQHhKXlCiH=BYU(9Wiy1>klz1uY<?DWG&{
z0TE4MF7z_MbI*e8PyE{hUw**t&Rl2$Cs&4mhs}UZ*uvOgFAxA41My+Hd>Ke9RKVAI
zlWq=hb72S+3JX}^P5~?mYSG;Y#Xkhm>t6@hW$j-V2B1u!Ah4SxP!OO3Yp)5sgqhF+
zg8HT*@YXQ|yle_uK<H&t&;xQ(&;xw$?MtHrjKjdw`5&$<(DprKa*PzV4+BG>?VAFJ
zM#l#sKZ~M9NhfZ|QQrJ9k`@s8rT|I73?L~O0ymihO-+El!k7+S;KpPc{{tXiC9!lz
RA#DHv002ovPDHLkV1nKOs$>8F

diff --git a/data/tilesets/secondary/mauville_gym/anim/0.png b/data/tilesets/secondary/mauville_gym/anim/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..090fe6a1a814dc6488c72a954de5e33d1a26d7f6
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^96;Q_0wfr&mCt$%q~>|LIEH9U><#o5JEFkzX-iIV
z^|qNcK3i_hG?$JGR$}4{eQI!_P2!;fTS<e8Hs1^VTGmCZ7I{Bqr^Pj$ZRXv<^Dt5O
z=1>29TBjdMu5ih@@Za`-(@T*@vJAOGzvG_9R=Y(!DEn}w+p2f#)|;mv=67@5{c5D|
zvWGcu(W6Bo_no5`e`S(?yvSnq_QI`cv5M#1%&suc_#>(o;wAUIdP4`lUG~=CWJTeP
PAQyYO`njxgN@xNA5QJ7Q

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville_gym/anim/1.png b/data/tilesets/secondary/mauville_gym/anim/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..48f325890e0ce2c83252bb5d82375ed61b971664
GIT binary patch
literal 218
zcmeAS@N?(olHy`uVBq!ia0vp^96;Q_0wfr&mCt$%q!xO*IEH9UEDbs+c-Vj=*>msB
zdWOBR2il~jKU>(XD<IUVQ?1hYsk)`PEUD9K!9A(hvN|`IWS*q&<t-C?75&|`<$9Ee
zf7_PsdwV$w7{ye6tKVjMdg>F?ir9k;tL&yvJ?nMlJ5&1EFE3RWZGV09;u9U|B7qvV
z+GC>H5egwj?{~gdt8}RpW?$r-J-OSODN8@HCuWi5>_d0{AKYB6<hA3~?vKoU{p&?$
SXq?dlIoi|J&t;ucLK6UC^jK*C

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville_gym/anim/2.png b/data/tilesets/secondary/mauville_gym/anim/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..16652df19896a91d715ed5047610e1350fa210b1
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^91ILh3@ktfLwv-1As}Vw>EamT(fRg>BQJx30L#YB
z8!UEAY^cw7IK<Aaa@jpwHZ=_h?z7L0ZtyxL&1q_#qbhLwcHM%N`XEC*UHx3vIVCg!
E043%f#sB~S

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville_gym/anim/3.png b/data/tilesets/secondary/mauville_gym/anim/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ea7a49e6bc169a443d376168a5dc43547b366f8
GIT binary patch
literal 393
zcmV;40e1e0P)<h;3K|Lk000e1NJLTq000O800IC600000Us#_K0003{Nkl<ZNQv!K
z+ik=!4ATlyZUNI-AhIX8WS@@E(OXKvy^uQ~Es7Qe;twKmXpxZ#NiAwpp(=2KPK7Xl
zpbb(KO#tpa=h=pL0|mgZb`Lxcak8a*)a!17+KU*f3mF8(9MD<RMxMAFLpZP!;$cJi
zD8*3Zyiy)`NS+aj22X<*hEf-ON?q1N3*9<xbfZB2hlAai1A1eXaVFHoDa3ct6=qf$
zmPY6cs|<Y7aG>dcV0}gaKh%Xnmb}_7&7rF#-*j8*I$;UjmbyK49cxh}<fX7D0VV7f
z8M60YEPyszTxgBGA?#{2n=bE6>iLm(O5V8P?bY3zgD>T8e44-c+xf#7`NJ6b!*Awq
zoKn}Wy4(C+TkO{`n6KAU_~%YI`Q@U9$e%|3n8N#8y}?f2Ufmzh-%j42=I@w)$NW3y
n-!cFG!TkH+l6Nk7<9Z37meuh-l$2BE00000NkvXXu0mjfNMW|J

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/mauville_gym/tiles.png b/data/tilesets/secondary/mauville_gym/tiles.png
index d710d2e4014675de83c1d02588bacd7600afa9d9..5606bb101b487ccf9dc87fa1e0e1fd3155fedbb4 100644
GIT binary patch
literal 1534
zcmV<a1p)erP)<h;3K|Lk000e1NJLTq000O800jU900000n*X7k000HWNkl<ZScUDF
zF;5&v6vy8e2vWX)3yOS!Ew+Lpx)?q{#&=SrAX&+XCZagVZVJwgfopuET~5B<7nv$9
z$cn3+4mZJaY?HZ@493RfmdY15u=)RI@7U#Tv5}RCC}N7A-o1JIcJ|GG-wsHOAs0Xu
zV-%hT{16aAe3BdIVMu@>c6^G#;IS-L0M84?5clI4qpmUTnmDfGh~tzA*9Dw;T16>4
z3rbv9DS-iN3UTuV#1#rtM4?Q}O?*Ypsxp9QsRHkcz><>q9j=7|Jhh<jX|>3OuOh*8
z2MMYjDNX~*zY|Nb*okF9-HJu2;z*f}h?a!`8k-0X4_oiAZUmf!z+v^AkSLZYDjkV>
zS;JP;y7Zm!vb{efK6$t$@g8vUa1;@SY+-x=Y22?0g-~CGp{VcytWaf<#wo^yA>-^7
zXAz+i@+bnfV9M5h)FHaS{uz9DX%@qJIS);Y4D7X5dKRe<#yZhW09T747FnNFnAMt9
z9rU*_P$D&H)k$3yi@*XTMp?M5L77(H=N1QX@o{wl`}X@3Fkg`PuL3YnJjI)mz!<{>
zw}=iB+~~-Z(j6&${~dOJ8Ir2rL19e?2!4XNf-pSdRuCIR1HLtsy}6E%W*t_1Qi5Ji
zYF)w%tk>|ptW^b*ksL=|BheCq+phuhdSFF0-m(isW^ms;t>xjO`#U7FJ|6UyXf>It
zE)S^^lcYm3I}cXRc36SfR+ZPo5O&0<C}~i(RoSLBq`y3^r9RvGEb_EA@QpFVq9LA-
z1$o{I;rm?QGObxz@s_ptzSaT*)-2+dHR80MCG-j{Kk?0S7KWG8Uu-)pjkLp&_HWx^
zEVm1*v6QCaQ>y^<2CdzvEb2oRHB>jS)`Jd2-MP?r=AwYO9uW$7WB|M~$1kz)<2J0=
zU{~W~Sf>9nsl*!kX?NdRe{!QNy8PKa&zCAT&6nph6qmXIm^NYfQ?)tU?clzsi(yIZ
z{<_>>hx_Ze*k8xN{+1o=FS?KB_w9z1*=aoX9IuS-<9YZFLI*|aKv4(ZCOXK|T8i{}
z5z#oSwG<KKxMtHy6lS$%RX5O|-`Av7Cv`QO)t`T=zrN3^)5awVvsz137cbG825zGX
zzGElk`&KGplb0YdRINm))x@&CY0g%uzvy0YSDN?mFbSIWjcORQKGwNw>pZH{16nOw
zEpx>0w6Wjm4*Tg{_S1+Bh1lq_pQ2!E$k$vqgMRwYN%>MS+Fxq44zcHV4#i*G*%xo8
zRe%zqzjF2*R-ttW-{PUT6FUdu?6kt+bJ!lwVJ)7+T94stY;HTK^CrHCll2hSJ`cp1
z+%QP>yg>{3CJpi#<eOl=aAViOzTsL^f8}7`n6Lf{`OGf!8JlnWKTydld<^`Z&$ZNk
zE@-LX%r2F00B;{ysqm}jzZe&<c70sjonHc}gkd0){Ln)^p*ROXc@n+Ob>B3_scbay
z{z6=Me|P!*zT*2!s{vmCy)@UM&So9fGv<q!FJitn^BLxwXd|CvGWpKw2SIn6{h*)k
z@+*0TkAVlpq2c|8?_1@%$yh5DSiXU^Sa_jx`c>a5Pr`Bytcl=FFx;;K_AA4F72MyY
z4|>6QXdCzVlJ|Y0U`_MBPrior1^RBqWc%*rSLh1=CLUkE8Off$IWGG|TaS<9><BEj
z+4@X7!nq0OwP(RvBnQD-GeJAR9~b5Tm}s+AG0rLTMEjoe&^FIQ5TQX6d{5u~EZcW4
zzd~2I!WI6<=;i#>#2nBg^jtDKN9a>4KVMIuCg|m)&mzs20KcVo3O%wQeP(INY~MF`
zZsxh6HETV1qTVUui?8{EmDIQ;YoPV%B2_kS@VsdpCh)+VRipWAIWdc{eqAu}Hvds|
zoXt05L)6TSsF}<aJzRmLy*b9&U_0?P`9~iA)E^{G?$%4IhFU2E3SwuFd9VQ}@yNs2
kEU{Ak#~Rv?UjM%OZ$S1PuNGR8GXMYp07*qoM6N<$f?$UEnE(I)

literal 1454
zcmV;f1yTBmP)<h;3K|Lk000e1NJLTq004jh002+~00000F`Lgh000GbNkl<ZScUDD
zJ#X7a7{~PmYM@^rgNA;A8#q}*!P@=+y~sd;8VK4$mO=yVQW?xFv8BaIS6YbnD6pq?
za0zpAH)pAX)`@x|VA*mMmDCi~i+z0_9*-hry3L_mkpraD3-8DO{ht?JNx*2P<Iw^!
z2r-rkNq&ARa^oh-jfoJYTL5B_b<+aCRn;_Cf;`~-kK@dE85IHy!!(xxutnF+W*%^J
z6fgXR%5e-5@_+^cK!9ml;)>GhN;8<`1V{k=%8SSGFbWcYoeUQhfb?Yp1W;Pv5q`Ql
z0s#rY`$;MoMqvVY<jV2Gf<-oH?7=B0s0PC4a&;7~PG*2)3&UXwC?(^bVZcI+!s!;>
zppQl85N){e=tWEX6X26i<+uj|D76sKtO81SW8B2J*=&Wy0Q>>n@5-?sE2skCx{0XA
z?h63itVYq+<bwbqdayw;4}M>UYXaBvU}Y=pzx_Y}MgcS!Ladt`^nTz;0O$V(NRrEk
zJcwNoe?c%Q1Hi$DDM;ezV<v(EA~2o4|4w*b2RwKiMXjJ94{ifOtcBQvQ^?HiK)Ab*
zix;hCGt2<eOf2#MtFcNXU`L4Vz6?UdMG8o3q0j@!0elG#19GU_o`~xxj6W+tIuM{L
zTX|sDZM*)^wp9h7hk^%5F&@1{?w`qej(}uD$^+YO*xRg;0^Gf9H6O*&6@cCcfGQ&8
z0o=dN*uxaS+mj3+7QjQEj6MKV87mLq%Qj=Ip;}sA0nY<C08}GMJpczlK^<D!Dzvnm
zg6j*K-vaIPl4@lMU;!PF9&FJk=2P$>1L({9rY7<*NC8PXFT@UD6riQ8uAm2ewg)al
zrnZ2|F%RfS2LOOA4Vt>U@6H<Q^}GjxC}G?!$i8F?ot%PI=w;8{XP67n7oLfNQ8FOz
zHl$vW2U{Sa``qndB%m)ug#ZF^2MLDqAR7hH5Cbq0-kku$-UbQlGeDXLu?yX<8;(E$
z^o6h(Krr*`)r^896R%cc1>Fw!V+9>v2(Sq5c$+4GXjThP%-DndFz`8;xEltA0O&sq
z?)hy}m0?<qSCEGog^<Iufdi;e0Biv|C+=DW7K4H>^>F8~4xSA`w>>Ea;2n+ROkh;n
z;MIT>UU|nT;q9#COkj~WuDfUH0_t^jCLomq&fAx|0J{ZU&^d=Q0U>WXqdhnqXet<k
zg0T;00#Gpa+n0tGpkeQfEwVZGUx5b|KK8k$iS^Ci&{*t^I)^93;5c(l4|={ydcNn4
z56PmOPxKV@K4(VnXV-mkNM6giu<q{!w0<<1<9ROB`yi5YVcFgZaNr?ak<ZG@NY0vo
zZvfE7bq9mKoD1vzPJlf$O)|oT9m3^YTy}Q>8V+Mt1>50(EcWBaqh=K9XJx~92j??L
zXpXaP9<-Lq#5w48+XJFzJpj0<`he|xY3eMN0Q*;_`hac!M)d*C5?6h|c2=|^kSZXt
z0@DHoU;h^chV6VY)&?{j@SuVU2BhI|eL$Traf71*POvv<12)Yww&=cd;T&*+y+IrB
zYUx4r+TD%t9Duz+8*t7Zlt=Dv7a!x;8?*t#3;=tBHlWYS<-Ut&OgF^dpbg-|a+!}1
z(Baq{v;mv_v+`me%Q!q~IG^czVDo-N;05OZg1tc>(BPa{cr+jcdxJJWcfm)%{}wQn
zAEzpfr?q%u#c55~*2H@_hRZjpKrRqW&H1nM>(k|H0_IX?g_5AYD!_F92fVY8k04sg
z{4venI=vqE!tn1oP<&l!cE@yOEvtmpU||i}H6+0$Q-%aqlO~mB7R;d)n8{1ytKn^m
z_^ATNfayFSl`1lS#Q(*&PDluYS1IfEoc#%as<-!Rw}^uM4Ho(xukjA{=Kufz07*qo
IM6N<$f=u0<egFUf

diff --git a/data/tilesets/secondary/meteor_falls/tiles.png b/data/tilesets/secondary/meteor_falls/tiles.png
index 5b0342f9bad8ff181a3844277c8529b0dbf275be..9c75328050f0532a15d3a100891f905e2d1c7934 100644
GIT binary patch
literal 6078
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
Eg0)%o*#H0l

literal 5968
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
TUQb{DYn5x=)l;iRqF($T9d!cI

diff --git a/data/tilesets/secondary/mirage_tower/tiles.png b/data/tilesets/secondary/mirage_tower/tiles.png
index 8eab57f93e1786e283ff95b6d1edef51d40c3617..fd2904ca1c2e059dbe41875d8af997e31a7cef13 100644
GIT binary patch
literal 5645
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

literal 5561
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
Hu0mjf49Z}e

diff --git a/data/tilesets/secondary/mossdeep/tiles.png b/data/tilesets/secondary/mossdeep/tiles.png
index 1933b89838bc7a141d1b55e4a733ca979ed666a8..818406b232532bddfaa3cfd1bd79271d9c045d31 100644
GIT binary patch
literal 4269
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
P00000NkvXXu0mjfQ+8OM

literal 4060
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
O0000<MNUMnLSTXhl0PK?

diff --git a/data/tilesets/secondary/mossdeep_game_corner/tiles.png b/data/tilesets/secondary/mossdeep_game_corner/tiles.png
index 379c4f42fc43cae77e9195fd8b41b8a0dbc4c6fd..f09edf436dd3b0a852dd95571110f269429b146b 100644
GIT binary patch
literal 893
zcmV-@1A_dCP)<h;3K|Lk000e1NJLTq000O800Q^~00000rkMn00009-Nkl<ZNQv#1
z!EVz)5QZm0>IErE&XFSFdn<^~^yC{75{FcRLvHmk*C6o%eTBdq<WQ*y6(K8qg3tpJ
zr?AE$kkV3bo}dl$&nC7p_F_~CE?p&`#@^qv_UylF(~28afXnR<XmX=m)A)H>d*pE=
z?RlCsx58^3ZW+kA^1BK-%hjB(4c(eWmyTx7SBGwfapw@<SSRDkbGTOBwd8~3OQ+MZ
z=363Fn^?BH?!dJx)L=Ekv&~vTg6TRcsKJ{cIHCZUs_{B1(zSx%5fD&IjmIY1=-`Om
z73<n73XV1yCy|-j2guhR45)ebA|U7N?I6K(KF3i7zx1_URMGib`xW!)yw{}3L#L27
zzt0anzYDYip7Yl08zON|X*9F;=5(pU?2(wO0>oSuka3t;Pn@Wf%G-82-FQuEDh^Wx
zx)uwK!|XcaHMmZ!Cr)J9@B0<Z<-&FDcla+nI3NdGh7)=*Ion#9f%=}eFz69|qh1Z5
z#s)a-Q)59sH-oP4cd5%Q55L>>kxCo%U_DNNsIdVK`-pa;dQ1;B--fHy2WmFhYmOtE
z;62$1#e@x;n_x#VCM=rsa}EItD~Mofft2{G_gEQ(I#!vAr@Bz4f;DTfFr&*XwPeb2
z5M7bi#K5_IvdC+Eeh0b;x;74XP5rh}KL_<IUBB6VXgH+i`75r~`MY6)mwb*R*MNK7
z3+TepsL(H~YZ(3V(}b?^Y?qVCgnpo~DJ}uttyeU8e=6==63b380VluWbZxlAW{1?c
zpu-wnm`F!;O<_HXX>V_T-#~0O;+8>Ldt<o7W`_bCaug$9Z1PFPJ5qLe*OvJ&!pk+f
zgNYI|z!GZhh!{~!R~T1{BgM8mBF4E`qKTRqXo=7vHI==D{~@jji91uI9ZR$J?Y>VT
z_p-qHU0|&)o{ffCJROb<L}%7Hbi)z%rWg%bBCx%uV_f^hpj0Qz>LbPwl<Jni32?l$
zeW2+?*DI5hex_7F)qJ=3H%J|3N9r&;j{BT+&tC$4z+V<Z%w<RYZ=NG(Gx<sr<l6tQ
z_${)KmxD}MT{iQw_kJz=H5Zv3y-2qOb45V7#ZVCtZZVVwKCj2EmqGSFwYk5a1Vrcp
T`P~-_00000NkvXXu0mjfEt;(8

literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq004jh001xq00000Id8yY0009GNkl<ZNQv#0
z&u-H|5XQGc>IEr^&ygbGdn>5V^yC{75{FcRLvQsl*CO!(eFeiC_)w_`fvQ#d1fd5c
zPGOBhprxgrJV9&b+dqlpx(!LLe2P6u-Tm#iGqY<^umYA~Ar=crk6Q>pGb(~7M2i7N
zK}p+1(B9vl07wY(SoZ>kUP<l3JAWf5fRHHkS@#24@`IE|Eh(SLqjuq+f0{Z7SsIX<
z1vcyj-Iy>2KpKF&1)wk_0Iuyihx{EEG&Fx|Ghi@Ky`z@u^?C;IS_7~mOo5mNYkGy?
zxSaji(%P;%@Zg{<%r<%~<*4=EAK|-oPy!4F0|xL7fS?xe&;sT;@BrW{+yb<uf476#
zG6ui74^V%10ip-r<)G4uUV3mKP=9yn<T*f{12v<<=aP%Cq!~b+gNpn#%*Ay6kmfq5
z0yapAF40*;6mgu%0h(tx#{ni3-7q|hSR83HYvdRVWem$~bsPZCHSyv&E^bVB&j6kh
zsrvvM{2XUMaPdwSSKs>m&!>gh72;PXiaH!AQ0j{VfN%E|Ie^d4gLWJTmvMY!Dlrzj
zYYbp<B(G_50R0S~E2VErIRM;vJiC`B$yHzLlpQn;Ks0$bnkrNQHkq49n$PP;{r^a<
zlM3LGhgODC%9YYLrR++wDIm<JfYK6poQKT>m0QlXL)!x0qW%*=S2WL}PAB4sMrvX^
zL*;tAQ`F?(I0op-{M)H^u(PwbXC3&NJy3FEJ9QP&yQfAofGq$XnCWukUITQauxbJ2
zB?OqwHc#GHef}6g$EX%?D4LfE>kv8MK1j0~z^f#VlO(POtO*0qIq*DJGco|0512a0
z(Ffc-dimufIspI9Q@w@wHR%A9+1Cf}H1q*G&;Zx#8t@Xs<Al@j;w#@yc;JZxq>W4u
zKtvy0yYtFct`6{#E$mJl+)>{;O#s~$0XxxnRX}%DKs5djh{la&0BAIv7V8$EcikcY
zx6iU=0S(jTS-M^V;H~_x0C!5MY)Qc6m`>NH0BB)=qA{%o_+F@G099e^UydN?0;Dif
QKmY&$07*qoM6N<$f?<w!2><{9

diff --git a/data/tilesets/secondary/mossdeep_gym/tiles.png b/data/tilesets/secondary/mossdeep_gym/tiles.png
index 919d0334e12cb8cdbe5bc7ffda4761fc36481bcd..36a0873a4f8715e2f42bd1bcb01c08bd052d6d3e 100644
GIT binary patch
literal 969
zcmV;)12+7LP)<h;3K|Lk000e1NJLTq000O800NK%00000LOzL6000A!Nkl<ZNQv#1
zF>l*e6os$hK>@s&?$E(N0dt8n#AraZOGYVEfGmwPW(lOfz+}*(r4j^W)*GrH;Gwpf
z09HXDUQ<9o=L}ZhAZ@Gydfcs=>^YaTB~xUpp=0jw;gLGHe0=ZlJV}g_{}Dba7iXws
z)Inj?dYKEzIPzao*G-!K9Rz{Q6*An-h3cUAoj8>}!rdkI2zQs*J6)cxwN~PD#{q(4
z;8?C9vZRA77RUJ}#@$t<x(KbF%{+-`k6+8xC(JZ@95}#GB&r<yX{!+MCLvIs0N#@i
z;&|my<SW461R~BV;xa`oELhai(JJsn&VC#19n9ps2$uay{)Qu^62XzyhEwv1QZiDV
zR*Bnlr)!MdF&y=8VWHD)G^k{hfyKMxAy$_uBy27UeXxQ8U*T8!s->eB(stc_X?HsN
z;<oo)>9qH6CWMI_not4VJ?idJcb~d$VmQ^EoxL9<Sn?mNkwPzra83eVF6mA%s|0#E
z!ow4&PR+Fh`tPIbrgpq>UB+hWKi54-?YPiIm2csQiU%Kj@;tekVHn$4H8n^)Nt^mx
zv{~>b#P{(el!tF7AEY|5?Dq#SyXn`uv7VZcOBc1VrdMvqO)ojqLc?W{Sn9w1m$BIr
z%(Wd$IX25+VaGzlW#FNtT&-55T&t~uKd7XNl8Wb*i=mRvcsyPQ<MF#!>tOy1yfGgV
z!45Gbf*oR*7*6+X{wv;mJ|coHF(QI4F<R1P^X~#{6<-7=z=?ki-_Pb>r}K*0zKVkU
z)6_!<R<?-EAUFRU=HF{ZU+{n!0zYuE>s<DF0~=6pDjGyn@my-C_58QJzW>&(b<e?d
z{I_vn6Vp7Z)t(kZCHm4&tJO!vP)SEKaq(5qYi0rNx&5=*#OA$V;Qg2$v#H^J8ziuH
zI*?}bI+2#nUw_ogMdtkN6Q)P>3DYC`r>VJ?K>tl)+f4ptY^MG*W{{JAn-75p9`nyB
z&cEQ84%<ThZ8QJ8qWsfE{Jz<2NLf)QYKnS;dC*`Ud<SzOxX&GYlIIRSPP+p{IXUi7
z=c2N(w{>6BTz5rntDS+*y!?Fo-lDX#Q*;kAvwYCOZG_qNOAy(RDKL?!Yu-v^%wNFZ
zP%fuG;RkCb>0<LxpY`6xa$$O*{A~K698L}XwY(o3$;{+*{(>*~S6o?q`|;rvxFllr
r+GSQ}>`^R(LyQJTz>N2fR{Q+}1wVbx;kfo(00000NkvXXu0mjf-gx8j

literal 927
zcmV;Q17Q4#P)<h;3K|Lk000e1NJLTq004jh001xq00000Id8yY000AKNkl<ZNQu?e
zKX21O6aesxI;2vUIt&bzD%A_=Kt*N4(lO~&sS9;R78HL4m!V4*97XD!8^{OfKpR?#
zpp)7aBqZhzah0k-g5>kw5FhXE>~ox$0LjFYE<^15<^H_)f>;!eh@)5RHxW`w#YZXv
zh9-fZM8ucW)Brx=DeJAGypz*V9634-3?*>I<WDg6!Z!>rVBt}>8^Y9lKBwhf83?Th
z(*SC(ZE&EcL98?8@0}Z_2Y}=BH~=eHu454Z&`dyI;{Z8>7ue{I5X0ENi2)wVSgjxd
zx-ulN!2y^LK)6RV%`k%)fDJgy%?v=Uz>$EyHU_j2dXNJ0nLu<dbqQ<$fFw{lbDX6a
zE8zR)KV8%HB8*LSdkT2sI4cPt&L9(T-6D)lo(Fs+fPoOX2>3OsTgU?RT2Y7bcnDh`
zzUN630e6N$$bP^RsTbuzCg9eJE{u8t$UGSNC1dBpy9r^!%oV6Zgyr+WZgq$)#;9K|
zdr$^7y*T3xj=FJq4BMJE?6|H<Wl=z1*+_SFbqjbJaInau>y`pkc$E6!L|YJfFrLa0
zaHxQI3mN4cuVAd0C^8_*5bkFlACHIcbba^%<4NE-yw^(#StOtU%yPL@G7M7zZ2&ss
zfb0hqcrU(%G+<e2fE4s0spH9hP^ns_I1l~+v;pW~*5|uCR{fx2TYtL(Qh-rseFEup
z%=-b-pdVE1YAO2+rhzt$4(r2w0H7MlIh1q7woCCX%sfO@ObS>bWLp3)<2*<Klh>#Y
zzwboA60FG#EQp@AnqEO}iy}UmKXgSyI;>{^JLD_|WIT+{K`ZDK?ON8sLAksutLb&}
zzo39^gREQx&uqKegBd&?MF6ih1&mjt_+N;DJ40KAeqahf%-7?Uq=EProKB-D0GS88
z9~jUNOt?o{m;qn`d}?t3Hvky$dTXhEU|M!Hyp_QBWD7wy&>Z_~i~50SRjSc<GzR$d
z1Q3q~62OhC$$kL&QdJE*+Jd;s_!{Xq8v;6#0GeZf3`m!!nZV?W{~8GP7=*mw=LY)3
z^Bb4*17RIs_HkqGC7=-FA8&DU5ukN)GQjf#_k%Y<c-=ak8(<WBKBn`|2Vg`orl$<e
z8;qR{S|@A~;C{eQU;%)6K3fd9KV1-zr}^IkzW@PJea`h-igN$}002ovPDHLkV1h~G
Bl%N0r

diff --git a/data/tilesets/secondary/mystery_events_house/tiles.png b/data/tilesets/secondary/mystery_events_house/tiles.png
index 1f5f8639ba2b1732a2c24f8d00b71e2e1ef0e1a9..5afa07fcfb735240a38e32eabd0cb7ccdfaea5ce 100644
GIT binary patch
literal 5383
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

literal 4799
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

diff --git a/data/tilesets/secondary/navel_rock/tiles.png b/data/tilesets/secondary/navel_rock/tiles.png
index 06d8065f14377ebadb4a471e9e7dc31d7178ed55..ffbc04584c639b4ed8bf1c1751c9974c48ef4a31 100644
GIT binary patch
literal 6073
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

literal 5966
zcmX9?byO7G)4m(zlF|}ONr(s{NXt^vA&oS$q;&U6h$tNrN(m^^Af>{xga}9pNP{RT
z-5{{=<NdyS&YgSCGk4~>Gk?sSxv{$1D&(ZsNdW-lYN|?lS10CbPr$DP=m;>41Au`}
zO-bIs@#)t`gNZX;>C2wwZ@2}MCW2EAh;D7%84E{s#V&kYP^>KLUct%xu)-`0ySGaG
zA&(z^eI>XucI#-WyQ1eUV0CzA5E5VLB%reCCW`TX8|T~f>$tS^^}b?HQ0PR8{e*>L
zSjb^mt8qG6m}9h6rH}8Xd3<6^c2C`T!)J+}(!OWGL@_qY13TF#9|9db1=wzDoPXON
z;ktiXZbpuJwDl`6sYDbBDcKtGafS(Re-64sc4KaCvA$#9LM7$&(edo>YV~(&DI0w;
zHuS*Ad)#-+;~F@n0AJ&}(dm&;ned`rqT+)(>1@H24fz!FTE$ClpeaS<l|umr;V7E?
zN<lt=LfeD;1{My6DVlOxDLR+luxe+i@rcJkwZ-|uz;OlrFwHH~rviejD?_0Qj#B>?
z%khK<*}#OIK0o7jtcOU5TnE0EE0RURPB$Nq3cG5JnJSW|=m_CG9ah76HBBUq)7`ez
z3wfYPV%#Y5BytkIm{=N&TCu(haguD44+^u@GZeWpKvxNE-O+7N{>1foiwza$>$d)x
z0(?}1OwvKCHR&mV$Ih3@oXMn5?HHIg(_{Gj<V~@WEe|6pm+!-`2GuEdG?9XF>JDdW
zet+8%fMy;QZjBcDy`B_w9I)p!{EQP>-J3bOVQHgB;QOd#%X&h`FJ);UavPF=$qK2{
zLtCV$tIMK(8B#sZl5C#EAn-GE+2DKOS6Zo4wc7oj;z%N<EC~V>X{~uIK_nc4n?8hl
zb?jNVdXEpT1KpC1ZdCHM^jk-FMQVsJKb-U%(d1xIsoCNfU^tqt*{-gT0xCs&1EWl)
zfR;!!qs<?md*yoLf-d4jxEUdcxV)>ACU-k|>BH+j?L0ATr1pnl&<6_Xa(VYTP|Kei
z%FSJ&0J+Q#5q(%PU!Y!}7bW(nFqIWuE}RU;#Kc^YF4W3zU0=Sqtrq#QI$ptMBBY>x
zpaP+o$)~Zp7+hSy6%sRX?>=n+OP|G2wX%$yzz7~6TA!!CDLBWc2?t^f%ZpOwG@zw%
zGb@1GrL6tXqJURGto(rD8-gmUU*nWyu(R(GW9<*u0%9sxX0Sgs)m|@4Rs#8Bi|m{J
z_3J~rph%he4<!g+-B(#$+qF~2X%D_Y%aT~%(aXwgc^G;_B2__P`L@U%m@y2Ld%8?V
zmU*>QkI5gIBKX}vK3(;9avBDH;8o~V&i%KsLDu_TKguOm9M#wW#Nt#|UIyB|wctbR
zWnYsSwzHeAoVOhb{H)7VaR*wimvd89R)o5}R$Yso|D?0V)%aaEDel(07?Zj=pybci
zZ#o(;r&6r3m+abcf_i3gq*W#aA3|t(yWL!)59{p^VVZ6z(|5=ZaME{rKM0f2M=0~K
zU7vs+lx$LD^h`ATrfHiQhVT&JJaVDFiJCr7f$<_bCE>}J2+rjsRV(=&XFs-irV|OR
zw$1@Dy3K+}#>R$FN*`Kf%QO#3(dB)>&8dI4c_!lU)p*gbsUun8SE*v>C>=~RQTG5;
z;?nD%+G&OBV8qX{HgYohxMIUZ2;tWoN<1c!H+;}_o4@;1Ij)_1K0QaNg$;T8-K%pe
zBAWDanLgiFBboqWo?4BT{$)$79*<Y#_8?NYlZm~}*=wg}v{w%wgq8>!=|friV)!8x
zgxD(O4X4*!uj5?L0>MlEaHL&iD}~m9r?NIC-gR&QTGT~Mc|R-n&6{(Qr_tl7kv5;`
z6bX3To&-w_MrsFC3%Q5wC=^-uFs>?Fa&vmuY)+bTJb9HwOi5)9qs;azBr^QtuCyb`
z+j$40TTR2i+7)E2N%1I({d<1G_GsYUVHmeldt^>`B)xm00m%1Q;$kv+n7kkjRZ4ab
z^a!aAPk;_v>F-+%w=vALwk|hWaYfCaIasa8=X6YDi0-Ct#~+}$)k0OPbN>|zp=D0r
znny?lZ!=Xs#^{J#O6%^JYP=L+e%KAiE*2hUm`{)RKJ>qV{k0&rDz7bTVh)Ym;GG=L
zB|4reQ5}Uf%GC1OEDF1Xt)zpjiT2&61FKB*JkEA2XzTBlqiT1zUyRCC3GRu9t@t)a
zWg@}+M+aasTwvlnqV7pDBtwO;sMQ?b%^BAR9C9a*9R4t52p3DzM{8>G5+Z$gvgcor
zWJEXryDeh3^P!u{YyPH}P@NPv>DVnZ&yCDGYT0H12nl_u8z4<<oIZe{`HNV!D3%w-
zTP8VLexSp#BK+r!w6kjzm!J<!qK4uU2xEgMIndELL;wp%(%Zf^!4l0|@xU?Dh0WF@
z&vDJsWVKnBVT523)=dw}tv*^}#3Hpm%qX(oPIt@-8I;8&%b!P3$buq%K5bfX%Zne@
zJ44C_7w}H6cRJT*PZ))bDk%^`rP2sn;Gq8GV=<W?6ov4Do@~P>p32UDgJE*}V0KV&
zX9W3&z<LOp`yqcZE@j(1sNgvCIVtG25fjDj$V28u)jA^>ZT2ObWyZH#X;9Hr46iW$
zyLsceoqwp4GZZ+DF+ngb3=jW5Z3h>h=gG0aIzdx@3@r<y@|PM$X&)R=H2T7;Y3Ty#
zA!Osmj&qfZ;wP!ZiTrl~`%*<WD!9>wjvoQk;5ZLu(kG(|))2|$=ht_H3?c&2ok9^w
zwEylRyYjdo22xzKi<W_LAb{g~w5|MHbreT`anliT@A-Ged>#UW+`fwE$*8i-BYuJQ
z$UmZdoQPX_gmBt9Mu_SMy0;~v0UQ?heJ0ka$;tD6M@7L;MO4zE1B9q<ZT+uagpIWm
zcGf=@G8N3&?VCT}0Y0hDO8ZqklGS%(TO#j(uQXLBy2`h=Bp|q;<g}L7ZwKhy&N+FO
zmwuj6;mVV*RM0IFGL!&%UkS2%u_;dWvT{Ot0<iS7Du!Dai9RC-q<Z*^Im_Jz@wR`I
zbE>8x->!@`1TJre*K+{_wjm|_g>>Vw+poHM{5-h_hlcGodjj3ucj0yC@OV%jng*If
z&oZ`W$}M&arp{uClIGgzt(_P)*Z3^|_7?5f;FlnC5DeNj@Qer8Zd-qWyD%3e?2^JB
zm9WY=#-HNz=1!NUp*!wu><1KGno8;(Cbht4D+%oREy>0hRkhY1AL$V9v{f|b6V>>8
zsFQB430uMlssjb@-)Tf%oMZ$WbQsJAaeaI}*Je+`9`-kz)6&LLz;oKE^e-h<K=}E<
zYxqQ=^0d}AJ5(2+AFbTX8S@zbk^}p6_d-Q39C01ngr^xj@*BCz38S;SX{SI7(kf8}
zhC2Mc?#_t~*(rNn*Ylq-<L`7hESxSz-{aOQr5ATPvc1o_nkqZfJ&1@ILqcQX@`vsM
zSNsWi4f@h6d0!}Ko4hN{P9l}P@=X9ILzU*i6Bc6RO_iC5ZxoguY*SA=#-meAlEdkF
z-WV*-bLI%W;-Yv~K=fuw{3P=D_9bqSE#FwbiNnQ)L4fX2*prg-(I^Vbo^z#MGEg!1
z<@}oN+}Xt@l21oIFHmQ!=6W4M-dYHqZrWpVE>je*23E@&!+)2bUTpfqK%RdDyApHH
z+4tJC6@r5Fud5^_3U*c&ft$0fjjdO5UFh9#-1pTkaadbo0|~v|J!C)E!jH^8MB`_#
z1$5_ZS(SOA9Do=|28yO}sB1{u`PyTR*xQzp+FR!Ws2eS?dyxj9{iV7M^IaA-e2%oV
zmByz$NPbh?gkfY%h7c@&5Fv1^redP1j2CYDIT;v0rD_Yoe9tIgX${?+{r;tu3gcSH
zSNRjxeJ&W6&yblXk#smc?q}t-wYGIw_C-jMGV^PiW~iB!=JJM3seCPSzAJFf@~^Hf
zYy5QsCotaj-~`rnuL)@c;;DMeQRKdvi9pyRvySs3eO+iltMyZu>+z`u*a=kFoEoc-
zuTH87T9!z(W`QITww3&Z|C|jTuOh*{G_FLK&n-RBV>cv5Tbn$0xL+L)GSf9hW;~W|
z@I+?(Tw)LdQJ6Qk9D6o`<S)^q>K@*W7SI(E>w{n+jwW@>Qtww-ug43$B`SM2OCH`K
z+}ZDCApDf?vP-1Puvoifl=?v^fNq(5MV!`Sj+gjgVC)Rm*;Q`6w*kSaOeBRH8qta%
zS>yBMta5oaWZsWvj)}$lC?QgCGG@yQ@xFp{yD})D$uA}H)4hbzI+eyLY3`8TB%eH(
z^|xo&M;>&PeWf0B&N?P2(Vb`Y@ng$($mJPZ?te8LBbbJeL%Mf{^e(PK!Cu;+SMUvh
z;}{i?lY?SzI&48PNiPGT*CD79KI5=3O-NKQ1b0_JEl2!ogR+*r-A7L40Q0^^Jt{N3
zr9dzhA!hk9``uAj+JI5tHT{neR1y&ZgD^E)a+h#b3%ka<mgnz3%Am9Cm$`s%!Bs#c
zD}Qv0R(HFKqA?@juX0e5nrXD|6g;tHl!qB2&ifen%D=zS6JjHB3?D77%F|1ms$*y=
z#$`JqcoTIXs^}~|!UGjDlmZm-aKOD-7j7mI`1!*8-Nl{+U?<7?!mhIYldgZVI|T0W
zgZ{#+_Wu1>D|u|;w}Arg9x$zu$_a!Hz%ZB?RyB!#drgQjVxfsq4(Jc75`#e_p1$Bw
zJ?uNF1@CX<Y5}Kpp{f{y+T_^RXV-{MvrTOp^r!zx^?ejMUFPR=G%E)Jo{0sq&I3Nr
z)aq$XOL#v;JvDm~W_d5Cn#IQUUxv`G^-JE?z|(5qJpFVHH|8;(lTQY*(u`|An&<i)
zwwP;iVjVjtcWx*4z-CMc!K0^p(|61M)2(dPP<fD%gzf+8S9C{gB-2u(h84f&ypgb?
zb-qhUiZzuBnUIx1Yd(8R3v`z0QOn+i_x5*)5|LL+jtwS!76)FWOV%?18#eyZslN9s
zc=_$%(y7LqJ6Zi&f*|bvF>Uv`GDWe&eM{PuUJd5g0z9ZU8RvKV<cLr<SzcV*eWCo?
znEvL3{cg$uh{t|4vHLYwF|52<;&N!kV0C!1K6-$SpBRWv1zk;pO$=UFbqO}fGYh9@
zxc`uKe)`E92bOO#X3h)&=me_9EQjL);`Gkj0}kENWCyk7LM93<9xH5p4(r8@wmn%z
ztg5st1F&i<y5LwNHxNPeDeNEe+3&SVWH`n6iEKiYZ0Cf=qOY#@v0L;?)#es9WOM4!
zW5HN_2O%f!7MI(#^8YvL{eRBo3fOlTH~o&0n`zlw6JRE_{JK)remuJ)`(rrnphd}&
zcdNrc?1JY7MZuwA^N-ejfxv}$=5V$V%yz8%gHub+s?@bZEBtvykLDN|DHf`lZv<jm
zgMI6s8T->T+Ws?fBvd$})!#qW`GqwV!jk%*OE&M6hA-TH)nEa`@|KW3yhke>y5&Hd
zI=9hsG4k3-Sqj2U3Ae{`_RY3<-8lb82X0NcP48A1ZW10|th={-7~SvW{nH{s#(ak}
zUZ)=`nuSwk{B9SWl2%V5Q|nEMW-j<V9iPt2Q~XwyPlKVrqOqf|)?XXHKWNnacj403
zeb~_Ac$eny(Xlg`wJc_~A<%E4T&d^HMVtzW`QcIz!_2pn6Su<y1j+u0n_q4OHL6_;
zt48i%PCZ}v-o>9mg4Zgf&OVP%8BzvA^<&V3kPRwKB^et5yc}7>e7viFwk`+q<uctM
zxr%KRTif~{VD?*uhmWQLk(X`4<`EZ8<3R#t-$%gfS1X7&i&?OyBIlMc?yNzUxv-jC
zV$>4E_BJ(mL5>Tt+Xh#&qB)U}@80@h1gMw<`EMIsAl;h{f3p+M<?EkGH+zdz<-YUJ
zy_oYNN$q_eCY%%0<hET^VKzq68!d?IMoM_6tfjtBO+@}p^-ccku%!#mPhTI_bcDxo
zBkMyW<%Wi$v%Yxmok{Do4j~PL@I;00@y&W>fFr-6fG76V$9vQ$zs<k^8$vePR!gqI
zRI0KsbL9r+?ax7m@LJ5uaf_Vr^$-2GA}aJC9y?>sPvK*(Bs;*3?)sp#wDcU3F>T^d
z0mpKIBu0(Ae$plZDP30uW$4V0r1)NZ=#2}EtV0>ry21JYKTuJtpfe>ewh2{#K>i%g
z^5tEz+{7_n-Dy&iL`1hm>{Z#Q-E2+9-Oa82G=rz-@pdZEgijW$&Vu9`_r*OAhz>uT
zdi*{v9mf8BM5v~e!9%sP!#KeG;pL|}61+k~)+(i5EFw%3S(*6LrzO`1D*QN<iP%K$
zCPbH!c<vbS)UxP+$ZeEuaqiD&mmI+Eo=*jXtaGV94fNY!;MCDBl#^J;0$mjh3g<a%
z@G97~_{ysznhq}ycPv8utTzSuTqN+i8M%dq7;=1jgc<h_WE@|TmQ;OaHRn>w8VaMd
z9u-VlW7WMTbQ<XmMqvC-yPizMO@pDIqTb)Tw-9l%EvakvlT{7-BKSg<s`{P9S9s*x
z<vWQ7mYJ*iRzguy@`tR6nSsOQ2k*=MOMeFjWGXVsk3S$^RcxVJi<*pzIe_A>QF<TS
zAcmxWQE-3bI#Xb!UW>|lv*$vQW<`Ittm1}9iq3INNaFe`)jm#=8$r^%_DqQCk}#h#
zRMAPbt0JOr9D&u=?I@BI85!HQ!<-R6@l%BCP4qAHc`pjqB<%P?0ag4v8-XJ4VqY^h
z48#fU2)Cw(a9`Tz<lEzwQUZk@t?T1Jl9<JkBKbdESD?@`zaGO>U-oM;>F}ONAP}xU
zG%yI{sD0t9R6=8a$4a8iu{+&$BwEl((lF_)RB(*CKs%o|TY3?}05izFNRW4EE7G8>
zNg%#r_R#-Pw_CnOkCCoYPJ@JTO}3Xhn3gao<W#4qx^90C(DNa~S&-!l|KWH~7@=4&
z4>7sQnazzaJAPqTExhff?ZK1s-xMdKcKSl9In~x|=2m35cUcSt&#4C;kILUv{pYE)
z$Wzk)ii8kz*7CQBz_R+mC^lnIOVNs#3L_=~5^_%-D^p`AY2)j3&##l-yzEnXX!h))
z?X9g7g*>P6X_|v!qsGvU8Q<}Sc*HmT5-Dd@#b4|Pl=KOkw#GE<!6Jl=wP**g?I4Tq
ztk6kfrr{xRVtgc15i!!7D*y6;1+y7JMvNkQTdc?<me)FPQ!><U+0NFFp8cc6bhW^&
zaDWD69Wo4(vL}1@Od_(9V)6WJ6H5j4wNVf1YN*7ezAOC4W{+h>0b$P|()_+i!Fz37
z5C7SRt};hmv~3)7STUXse&l@*F}b;$WH8drk90<MPJF}4H+6-`X9ir)r?L@ae%#w8
zDv>xO{v03KPh<DT2`t39M-yl*#wx>8{tp$zC9`~-QRm2MEN8MI-VkV%5!KRKQ~b$R
zb}Wcv;-PRF8P5Ey3IUEu4#1uZb62x3qoSwf`U^RBj8VZxE7iOxjs7}BhNwsBSNq%%
z`T5}|&7y&CTUgZyUS3B;*D<-mrS)sy9JH<TB!+cUDAWA3_vXQWAl&0wEHPH*8at(T
z<WM8^$o{v*E=`u{_Pa$L0)_*4dYZSWflW1h2xu94-_La0-B3#MH#dljT8oGbve_wL
z<L42HtKy!~P^_4Ls*<#0%(vrUr~|<eXPouFZC6=DXrH>OUP0nOl*cW4u~vVBDm^NG
zkcjd8;fOwX?j}=hh@R1>B{(qxU8>&KLr}Nh3VL%^<PO3pe4R<+aBQf7_qUQJio+wL
ze(d0t*6%(E#}P<smA2AhQZCNv+3OkJWQX3yvB%UxG45x(-J^|wkx(*bi~mFpsv3D;
z7w38pocr>>A()rcpFBTCp1HSmxXL}$+iPp2IlDYOgLtg>sbV)zw!oLmlUZ=__h-vC
sarH4P#BCG5digrG(QWqphd($$HnK4$r$4I6`tPG$O<7y1Qo%ane{0wz5&!@I

diff --git a/data/tilesets/secondary/oceanic_museum/tiles.png b/data/tilesets/secondary/oceanic_museum/tiles.png
index 25a20d586268dc2e1990a56b0dbd572fb0594820..a074d4a053d80297213ccb4a160e7c8307c5f11c 100644
GIT binary patch
literal 3219
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
FV1hC1KxzO0

literal 2662
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
U8j1*H;s5{u07*qoM6N<$f)+EkH~;_u

diff --git a/data/tilesets/secondary/pacifidlog/anim/0/0.png b/data/tilesets/secondary/pacifidlog/anim/0/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7bcfd743163d70c54eb0f5d70d07b605cfa6e7f
GIT binary patch
literal 596
zcmV-a0;~OrP)<h;3K|Lk000e1NJLTq000O8008g=00000-Bp(&0006TNkl<ZIE{^z
zL2BDT6o!B3#!$KtB^Qu%fl31JBMGt%m9F3mc;S`7i!MSflXY)kib}f7BBogm&Io&F
zBWut#Oe!&bPjZ!DLt=q`e$D&lpZ8`V=zTbV{uak1g8}v-xqTP}*s|M(v?kbz&h^;c
zv%6<bbX>2i9_?+omuj!8o}9twdgSUMbya`x$ZgyZwHkV;e{Wop#SnV;uz{}C8d__`
zqA`eWHRAY++~A5`bc-M$AvdEn5^@Q<q;nH?Q|6}KTEk7c>g&D#xtHpst9IO1;zFO#
z@M$gTmxz6m$Q_sP`>KRH{#c^FBN;y}G?Xeyc!YKidT1}*LBQe$bR{l57_qEJqY*Nt
z<SUNefLaUOmZNtB!W1Q|f<m*y4ZSU@co#Y9uWhpHuWge1Q&Oq3IHfYIrF=Z+T*${y
z=Ws`2nqN%Vm)9OF=h}xXex&&OkQJw#X(I4_53c9=D8%;+^E6A}<K{_*rCe4g+-Kta
z3;Pn@h2`L9ev?BjiaY2^KBF>Cfu-#T2$Lm@1aiYzLRgOELV`QF(nw5mg@iv7lOzqJ
z6w)vj%q5s}A+wzfmF48vHF>r($I>GA#8TPLjFALe+bOWMoIe~t!!KT&aY|x2DN>sX
zl949wne*~4PjHkt<W1YWyvq}B<`vCEO+Xxz@RZbnL~S`MR7$O&rPN4yThau?F^y^%
iX&XSZmGlERaQ^@{4Hg=FH)Biy0000<MNUMnLSTX!A{I>m

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/pacifidlog/anim/0/1.png b/data/tilesets/secondary/pacifidlog/anim/0/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..dde024f6ee9c1f875aceb5689025cac8e97dabbc
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq000O8008g=00000-Bp(&0006aNkl<ZIE{^v
z!D`z;5Qcy7CE(;BN?t(H1Eeb*dX6N>HB@>9Jx8ED*%En;Kx68oYpv*2SZnN~u)O#+
zOzp6pv0J5W($)j|`L*-S%<jN!qZH<2l8~e+wh_5)6o#0vYa%*p*j4PR&YiKFblme<
z)m1cI#Tj$2Wnblda{Ui<tBanWpd5P<%ChI9tj8X9<FW_S$|X!$Xc(gl5~GmD_XbIF
zW00md?BaWbAqlx5oy9r3oL$B)>)ai4!;brL_S5BEZN}W)-?E*1Ph1o*N0P?xmPi7U
z*y}G5T(vE{zHD*T_P^qyE)8_i8Wh?XD0&EWp=~4-2wA+4R^m~B6%rJh;uns-kggVb
zNAAE<6h}_glGj9?|1G+f>J;v`xe3n=ySc}~&}~tk$Y~Tx;gq@O3g@SAe~4|rwc%dh
z`f$W;0QqI0v9IOkC1=|RgTRO9`vKN7;&xL1kJD4;3cY*5y&*2Rbg$uGIs&U=AR%?V
zfKlojq-{T-az%y8CTXI$#>%oXOdXM7<dS?=${@4t88ZIOY?dgVLt54x6GuFvamAY9
z5uO}!EAH2@P_{zth&kr2$nnGtDA96a!xeMnoXC0Fqa$i4SF9M>Fq~uU2+jRwUB3s+
z4ozL5j!4CD#WNbd!E?WXBR(-VJ@y+pRI%pTNs`ceEvw?%!`TA+xu%uu>8TYzA>+AO
pk_?gYHl$0hRD8d^Ui0b}<~tO&1~ITZqtXBX002ovPDHLkV1l64CqV!J

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/pacifidlog/anim/0/2.png b/data/tilesets/secondary/pacifidlog/anim/0/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a4cea24d830d5e4bb129e8ca5747afb074a6c8a
GIT binary patch
literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq000O8008g=00000-Bp(&0006wNkl<ZIE{@_
z&1$1i7(L5bOcyfr1=JUqt5E2&Ds)>$U%}@X=qy5v^dY+GI0@ZK_0ld&qR^$Nm%PF(
zL)vireMy>WJAV=G;rM;$JKymNy$E9HZ&5@L$5;f!7J={M1G7A!TC-!nYWK|US(m@B
zy-YN(W=Z$g?)`3dt;=0vKhG)E?A(n|O`QO;zI3s|)WPabUPAY(g;oy|`tbqKS}Mfh
zg+>&eYQ*s=v+x4GA12Has%==hV_$b{#JbU2-H6#}H<51Gi{GES+u9fM3p~~l#Np8#
zk#|%gbjB6D<GzD4#vI4p$2lgd*60qD1`cjDRHr#T-9|(Yd<Ms-D{<&S%TTphhN4#L
zm5z>2(R^p4qmv=a>IzEr1*$@JbVKC)Z;)M4?W23MH{!kiZm&aoDWAG4)!w>NslD={
zoM9i`J21`9ChU_l7nV5lP=6oRSk?Xfcb#d%_dFMl>w1_?hYF9C>i?rt<zNC`(f@d_
z`$RhL&_02CXbH5{s6@$oS1MbgH_a<dZPB1HMS(5|hnN}05V<816t<AKF4Qd&)09YT
zks&oj3K@hF(l81%mKdS2MG46+$`U!hZeePXL1Bp@R<;;yfEpbpmQYA-vf6+}&aEYG
zaAS)(a)z24<kz9KsnPH(r5do`08d<dVhM>`Zq%%sV6yc~Fl4_Uwz%cS9FnbSi$b<h
zMBi%|4aS_Avh-Lgbq$@|X#S!WSDbGgMH8fku@1SO?XZ+<U9O)2-Ut+xPmk_600000
LNkvXXu0mjfaSJHl

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/pacifidlog/anim/1/0.png b/data/tilesets/secondary/pacifidlog/anim/1/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..beb8ee82d6e4564e5f72d85b4b1c9f60d8a21677
GIT binary patch
literal 198
zcmeAS@N?(olHy`uVBq!ia0vp^96;>A0wfrY&u<9_QoWuojv*3LW6v7$9Z}$M35-`<
zvVd>mi-SSm>|7SPYwq}$R(I*mE{T)ZHs}7;Q;y2Jc`0^VtL}}W=|=_IYoE<2>k@c7
zVRe!Axx&2QzJy-pIgd1+SC(k#?Gz1vvg%G>@f`ad+jXP-PuDbmD=%AN%b7M+z_PIK
xb9!#eom{<_ytnp8238B6>57>eUD#KAZJ&^{<KCvS*<v6Edb;|#taD0e0sx7#Q5OIJ

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/pacifidlog/anim/1/1.png b/data/tilesets/secondary/pacifidlog/anim/1/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..594655120d16e41a95b9b95c1719962ec4a8c8ab
GIT binary patch
literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^96;>A0wfrY&u<9_Qj0uY9780g#`ZaKwHWZY7PpEl
z%=Uh{Pspm8m0xMnUWF&WCd=PFQ}Xe_^8Na%lJ1LxraKj{>YTANcwdpa@okS#R*RPz
zFMfW!Cu8gO-syZm;4MZ;KHK(RM|1nNmi)_Uc380Le76IKljx-j#}|oeFHK)+R4Y@X
zEn6(d&-MGiOj8BZiW}V>^_xWltFo4q>n}00TxSv|k>8*Ywm@;3xL|$y?&JDbq#Q#2
S==i<>x!Tj!&t;ucLK6T%j#JYB

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/pacifidlog/anim/1/2.png b/data/tilesets/secondary/pacifidlog/anim/1/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..747306d5cc598f70a9d260e255d5e417ab563c64
GIT binary patch
literal 241
zcmV<N01p3&P)<h;3K|Lk000e1NJLTq000O8002M)00000$Df2(0002ENkl<Z7?nkj
zF%HBa5CiuMBqvcrPV@u`9+12QqU{j{-#?oxvV|otW-#J5w~4_>>9$LnbBbnF(FUo<
z8N`22FYc3&+pj3L-$~{ix2Q5lsi7i=`OC7I2Z=HZpmqRn_Go~L8=wif<H`Vlr`m2n
znPZJrXjOAotC*=?A|=tf!rg#1BePnr?8n`8A`G6h;JtU3EE}}rah*m^N}>&!y9Vo9
rF%lm13s2$>|Mlz_6#sqiE}{JaL6SgBbZiH700000NkvXXu0mjfeym}d

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/pacifidlog/anim/1/3.png b/data/tilesets/secondary/pacifidlog/anim/1/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..20e0a7cdd532da7f539a317a410249eb51f9f8dd
GIT binary patch
literal 213
zcmeAS@N?(olHy`uVBq!ia0vp^96;>A0wfrY&u<9_Qgb|A9780g`t}*}u_*E|e`YP?
z&T?4vT&eKCqR`*2ruX?dUAsl5<@nC=sClG(+kM&jiGl7@{m(_7nySaC%hJg^r^&cr
z*@HFR$*w|{^Od(qvaU(WY}b)V67`<kr2U|)>9gJOH#SGEKa%nMcIF|6?o;mFGfGn?
ztbM>UQ_~_lV)y^D^;Ul?=Kbc-U3&1|87m`?fCARYz=C_vvtMuj%@oJ&u;-l7e}9mB
NJzf1=);T3K0RYq=R3!ia

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/pacifidlog/anim/1/4.png b/data/tilesets/secondary/pacifidlog/anim/1/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b74ee349a6ab1b50e849cf4632767187bb3c111
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^96;>A0wfrY&u<9_Qh}Z>jv*3Lm-ZTRIT&&{7qiCB
zDSdHJ=FZ%zzxoS5Tz9%J;L+11<#2K;x8Z@SqDBX9NmU=n?RPrOsI61{c7M_B)g{iY
mZ<M$2N4}o*T*y5`eiQ%c=}sSycJ&H^Eb(;pb6Mw<&;$T?nlY3B

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/pacifidlog/anim/1/5.png b/data/tilesets/secondary/pacifidlog/anim/1/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..b135bdfbe09d9739fc2c5431be63bd858b7e7896
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^96;>A0wfrY&u<9_Qo)`sjv*3Lm-ZU+9WdZv{>vIM
z<M4!b!<6(#zg_c|tO=}cR_!tDkQBa`@FKv2+1op$`Rbmc+17_xm3cn*u&&v4_UH!I
o>9-Dj?B5>ryRtL?;g7r345#ItJ|2_pUjeel)78&qol`;+0P}V<HUIzs

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/pacifidlog/anim/1/6.png b/data/tilesets/secondary/pacifidlog/anim/1/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eae151e695100fa1c212305e85ebc0d9101d481
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^96;>A0wfrY&u<9_Qh}Z>jv*3Lm-Z_1IT&&{SF@&F
z@OhKKVbk@xKIq7H?{6-XoisP3a$j-?7QU)5OVGY<gY=ze8e9HPOPsf{A#}Ut<pPhR
matmu`&OK2lr>eY#e>4AKb*GR0hhEo$Eb(;pb6Mw<&;$S(iZG!7

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/pacifidlog/anim/1/7.png b/data/tilesets/secondary/pacifidlog/anim/1/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1863fdd56cfa672bfee892261d5f00f563b8b49
GIT binary patch
literal 200
zcmeAS@N?(olHy`uVBq!ia0vp^96;>A0wfrY&u<9_QvIGTjv*3LW6v3Ku`2SgT!>MO
ziddcSpLfUi!h><!KKy#!bF|&paKZ<nsRoCqZ1q02PI&JZrOfFr;&cCmgxcJ3zWzYK
z_Oj&M&O?SfjxpPO-G8QCZ_cNJnd=Uj?wEb<h0l+z231o`C(TRvJu^1L_R+&N2f^ZR
w*6cJ|mLc_;<@WhCi@x%l(~4<6UE-D=Q_a|v=M=m!<sjIJp00i_>zopr03>NvN&o-=

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/pacifidlog/tiles.png b/data/tilesets/secondary/pacifidlog/tiles.png
index 496232735b038ecffb16ca07858c601cea479dae..94fe6d96b0786fa5ac932e717a827cd855d23370 100644
GIT binary patch
literal 4812
zcmV;-5;N_IP)<h;3K|Lk000e1NJLTq000O801v<f00000FK6Ip000t`Nkl<Zc%1E=
zPiz}ke#d`6F9wPpWFtu8n<*oZeY0pJ#$qpxrG<f@hXtfyckNTs6}G@$f*kBU1aSNZ
znIY+@39#tQu!Ui_3vgx_xEG_;Jj&f7@s<|HNe&A{wM6+^z$;x#t2Ws0_cy~KMNzVx
zD3Oa50e|pj-j8qIZ{|C{_ulW(k`6xdXM`9ZS;J>2TKLEx@DU52ZwuRX-K69NL6DT<
zbLY-U{qEhnQbbW|D2hQ*Orw5RN{#wC;_j~d>$;u+d?Rr*7fNh`vV@WOCo$E9K<ee#
z=V2h|sF84KX-VeiaSxVOR#v37(!DP>;aavUh91Gp@LtUe%$8uX+RARCBd%k?ZVvar
z_`WBRXCnEpu-X(qibL_jIU_;Y01?pbsRdXo(rK?e09FI(Tx%^$J483yVchzzH=<2^
z%xkQn`9G~?mwY5RwI=N^fscu`FV|LO?atbg{K>4&@A~ujH9i6v{6T(AMGPyc{?4W6
znk>~&Y8Fwd8M)gm89CQ1HCSp$jpDjS*%}28YeO{IQ`q(;6XK!N=OBiAu8HxuacE48
zr)8iL6nKc*9osF0G`<%~Grm`aBD`>j9i(EkWGtXo28w93RtJhe&6qiXW_)qW#+CS<
zi;5Vn7;4BgO(=B~B{XFm&Y3W2&m!&>Y2qk~gatd-D#{#$DxCtF?-bxdryWv`1xT;`
zGgP#%=AjLgtTmQ)`j9_fftuF7d<5LNBkg6gCZ)AU5ZBt;9bz6>U6MPG%$Imwmgfa8
z5725Y$ts_qhM<)e#J@`Hw*Ged=_zdc(l(J$gCO9#-5@v&uB#?Mz|hj<BWqGQkVcHB
zio+`PQZ-Q|byPEkJ-7aRUz&9UJm@c=-5l+F+RY{UD;OUL99s&GhH%S9AhYXIv(bEw
z0;vV2o?O?M&_mcnJT(ZO5;em}s*x#6lff;5jac-^q5E?Tn-ODT#Fl}wM6Lo?OP<X7
zE#T&H;9q{k67joV0RM3q`20t=zV$Qrg6opYoyf`2H-CCkIzgp`3f$)byT?J$fn6>q
z6Q@s~l!g^IWIedGKBT=(cEJ$4bsxwb${mr@FCG1Bv4Z%P1f3uqf4eXHCiD~$Q(VSu
z0m~}ZU`Jz*;<BkVLJwUENe5wtc2~tUptXT>YS)ZaVX^A3F3mvYsOMCP5LY#Bnna1l
zL}{dn!g@0)ss8)`V_uof_mrr5?&@?-!Z>s!3Tl@4uIoT%xFlkc4-p0q;1j5**g#OR
z7#O1<xkf!{lof$%rSJgPcKBKq9hq}*7(0+&)3@laLp!I4DT%`gL6J9`<L?)zZl(B~
zp#Ijc{1~{b;NchFL4V&Bs)&)1kyrV&ZW2E63E&?FZUza|?gk9|9_?}B=0<c|x%rIt
zdaZ2V9yD`oBgTkJz*r7AmLazZpAyG5;y8QdYuDVuO*s}+w0|G=_3!2}%S-xlNvD^`
zE1!yW>BA8jvks${Z$N^AzUR)YbRNew3}}&q0nKux9pA%*Af78psp%G^IG4pCYqrDM
z4r&)>@va8Y(1H)B!tlb;4y|;`7%$6sliPfqAIIGiu#l+OVtc_X5LF0&mT)>yJK#DB
ztMg3#5nufHJL=DMuj3wIF1o$lW6YD~ddI*1OuNpG?7ZuGalilE28A8Z^mlU*DlVV+
zgg87zjzOZoK81an>F?MeR9s`kr6Ee}0oP`r2r^VEK%pWxUC)Q=Ja+f^O{w_kq-FU>
z<dcz4*grq@$jdq&K%-LhF_1oX7An#%5mklHi5Jz>wz~JqXZW)0S;3G({ROj9Sa1O!
zXj3$*&VpHR<#7#hty5~)5Zs&t6$3?v!#0hfafs_5wUv9btes^o;A&G{lVqTxxYj?X
z!v2|I?svZcZX8aPh;tmBgFOj--wT4^Rg4BVh!G44H(musI1zr8aQo057PnvPp2w#T
z9}%w*H&B$|72?KbyJ67wpcxF?0R&>XPI`@3G`14~;iq<4{PP+AoL;X!Bn|@~>UcTF
z*y(NyM?8+J1y1g453gi`p8E%Yix)93jzWy=b7eG&Sw<xV2XKqy^hMg?V{saQVV3Q=
zK}fK@AsBo{kFRgQdWJn$&hEe+l$pZ1fYIO|KEnJ3C5NS9TDx%Jf+Zi}!_oz44W-@g
zpOalpRaeOlFS)8ZokorET!E7gTW1~{UlKj%aaO89+Sgf{lc+?2Yh2{o;P1sMm>Q)w
zCn}qZ8HRnj6$f^*e(NdBrIg)lHk^n$RW`=`$6R`Jda4_8_;{~Hvx~6pkIqA3fNde>
zIE+$O7P)p1r3PShxtYw&ai39Ojto&H;w_F`uKipGp|skZ6URgCCcxM&5DtTpt|0;i
z<wLyyHbCj6uZxvj2ooxU2^Hq@4)Ys!0dN>@3PeC?{6ie-LKV@E3I$T>liqM3_*n-I
zY$ZL^9$@Xoi`|mNtjhtDA;fC?0F`KENa9~lTwCk!*52u5oRgybLEvQm2uh;|4@y3t
zXK6IY(g`BJ^@M6D*xu;q5th(iE;p(rtv!;MB-d4p6M4mWF1<L4$#o-YBjV)A_>KeE
zX(?g}dST45nag1G(E!DHo#k<a^*C->85|Dzj#FS54j?JOwyYot6dI~5O3GrYIOqdp
z>-S9;AbGuzuVVGO3UggF;5sa6UziNBs92AUs&b$(E4iA358hRD+;V*m$DWtG5J`+p
zYY|GdDc5tv_x*}^nccAX*9(H0D?lu_Hx0ABp;tw?=kaPYG?iTd+Fadfy3*5m#5$+b
zC21D|1^|<0*?rDIyfia`L#Cv#unVNFnV5QCIwoRvE0mC#HatPxNt(n=cf=d>G-#8F
zkI2X^_NvC2xd|$>2upY#028`CQx<`f<ktrLm?azq*NB*o6KsWznh=VJnA#1)u*M{B
z0q1IrvGCW_;BV61npKoq&tGqtzi>5<88MU0(-!^)s_~w`%`N=(*gP(a3T9IbLU1>M
z9chY&hfyz|jjzEGDbgc{4LHRxO}$ubWv|urOtkSvb!-<h!<-lkC*0096ANv=Wd$z#
z3c4uNJ05Z;DU3ovOo%vcg@^*W0Y%thc29AOO<hy>NvX~xepBiu+>jI0B(G+K>)E+z
zAZ^Hd&w(^@gY=yaG|#FjGoPghamb;#TwNJ5?SL_KmXps}gb`N*3ScvK*5I$9zY+a4
z^w-eeTA=Wmp!2%pw8{K+;jd4B-2s2OUWkm!jDkyqgi^DNQdH)vRt|ldL@)_Mse4e#
zoQF~rpyWf)h-;|z!$gE`cksu%6>xbSsF(hLzYrJv<<tOxYekldNy&1$)72M1VcVkM
zb3Mp8Qk#=#C=oHc?Ld=lTSFi47*EE*i-~yO9ZoR!i8zhIli^KFCsdiZnh+cm)l5>m
zh5^9v-s`(+D8gpCrxej7efN8sG|Ua-`%MHWgt-VKE*_rGC*!B{zaFB%;jpL+R6D)x
zxc|_fYSJOx*)%Cu@O}D=09wQN2@%5IumXRh8vG4w)THfi^f#F?ZuYlQ=4M3Xp=;Fz
zbgdq6C&cYWR;H~J)$wZ)TrGz|C|<;CKz8UjR2=%<Se!&c^_NjTOnghcv<W9E!Cz-^
z=>~rbK!MYW0y>U?pXb6CKw-~766+Y|xOG(EURJ@=&=+W~p1VexL~sqGUYVhw%urBd
zd?_Oe*l^V?^BwHo#0U{@Ll8`cn0hxnP;2#i#OT=FUogGxhM+(GX~3&wOI1yfr11cP
zGtAqXWc6v!q8ohy&q)Fvgz03$bP(a-rDy9K)tyGU^wJA-gABsNS_S^v@V7!&ZNlBk
z-`##5L4^U2vAqxUGD`KAzI1jXIKWP3j9cWdUI2w{3ypg13T}4C!aeO2@HVysg~r4r
zFzQZgU1~*BPWH+jzSs`Oo&r~1Dp7rc5eJbpFBO<%t85rFD9pJVrp~UN!RoFiTyA38
z1uQABX27JJ6}HZ$k~|3BcvsgDHl*ip{IwFyGS|Wf%96roMU4wyW5HijWB8)KwLpR1
zr+6NJH|60nFMTQ-Lpc^0oKGV3Mf6vfGL9nKR!kR3R+_L%{I&h<{Vnhtx?%}g!GMQ&
z8nC3m(EZ}azeIn20*m8s7g_3Fp(!rhQimInx*BsZYvEnv1MOt5nmc4kHn1-1Fr@V<
zOyTsvMrX6@a${X*L0$mZ`gl_G?;9kuzI5uB4!FAN81T17KXmA=(cj4K!c_1qqjWJ~
zp5brAJ{uLB=edKf4qJ!z6y^+q6$L2UOXK}Uf0G|8sJ{gSWCtpyxLm3(0q1|NTi}8t
zOh^0VXA9;T@tKdTJqcWy9BQK7ot&PYmbYhSW@MVB-PYfHYjsJM?z9%<!BSL}&swcm
zTC2;kth9iT%ejER%ZRIRW`S#n6c}L_ILtPKYLsoAM=!t|^~2&?+$`+`TmB?t0DJGz
z4-1Q9#bt)|%j07fkxOu8d~8atyg4>WOeJ~XBtw;@sV-&Pt(V4lIF`Sh{Hmn8eVfif
zx|_CRIJ`6_r}Dtwd%jEeuMTllN*lp*#bNsUH)hn&Z^VBR_xamK{xEf~{FuoiT(2~N
z&)~VC_ka(12X@2IQ`q(;71tn60hR?^Jp)`JR9rj2PW!jA_TQGQtu4iJXSLpxNAtka
zQrtw~#$siq6-R<-y?1eU>!`Q91l;eIcKf=UVy6n2vw}tFd7j%&i<I|H+bgcMmZi9g
zR@$Gf;57(Wfx>4Gr1L+)JSSsJhU9mDJ+qzaa$>!yTcNrEI-tL9{Oc{XM)>Qj0hwvQ
zOGDoVyPfv0wcL!P6?ai57Geza3jrqdRn7_&yM14Fife!K78LeJYHi}JepoG>!|Jsp
z>p`%^_<I((ecRlYv-rsE$;sQSm?swdaP}+!JC@Ea(r$6P?M(eO2IigTFSwiX@>`>Q
zIS-stTqd{#IK$G<6jz9=l0Susb^bDNim<eFWdqI-Gk=GRPyZa~l_n-wLXmNjrRkp!
zojUIfza=Js-%bOFyD04b{Pe}gdTA>#TC7)S7swPoGC7F>O-HpJ^!MocUh1p`W{b32
zWNklSw%BKP{x?(@mpAA6JT4Hw$<{r+-{9_Ce-PIuSj4Z0w~6UrCE^+c7l3E35>vp{
ziP=4WDEs)HvCa4k%ya*3vG_dszxMRo#B_?zRido{<toum?4~HLi5|}2+yt`~XIMM?
z+<x>XnhM?X*SG94OIKN|*wPM#Q>;y~_fO`}16B<RD;CX^)XdZbFmYCDw<nEEPP~;u
z5BI*O&+tRFcItA!)&^7P?XF$^)a8DyZA!K8$K4+ciQp)`Mw24sK2w96?P(VKxyRpq
z>|-C_D|R*CuKxjNiZhR?GcSN|`*=an#_SLRgL1C?WJcN(&`@mxYFcDzaT2A*<a4Z(
zr#Z`=hQwrM`V6P56SFe&OJI6>>KfMZ07|=`U)#q%_OXwB{69w<qfjy)UB%eb=GfC_
z24j(>#h-M?qefObz*22e$1T`3GP?s=?Z9`{u2*{?t4-{(F|VQ5J&DrO_a|rM>0g{g
z>6`qdJZ-&yQl9?nH+f+Ged#RKzmd+<*4K0)-IAR7TaJSq0%v}y<KWb+OiWB|8V6A-
zWu=QO6=_$@&Z*tSthWEVUAtcG#jG~7I}N+Z)4WC==ce9xDAT8bsr&~I<@6h^hm!x`
zFCWSqOTY)s`Hr+&4}t7?^zCjE`7D`qp7@$O2=|#0?%Cm=CY|z$9scP~gZ?EG{{52s
zJKD5uE$>V(8?HOum+VS9$^NxA^=})yujBalJGrjJzyGUmA@AOw-WVPK>1m0V-KzX=
z{r;xE>(cv^8u^naPs?(na9=9b`_*UJRZ90|Azpa0$?g#BPQP^YO*#3}=(q$AtOwGX
zU%n-sC-J&G$>kcdaCE#OjT|vK)sP1xBMZ_P9gkU2l3Vdt9Vz8<UrC9Fr5sS5oT^GZ
zGBQuQl2ll6|LFLAc``cwK$f(<qvI7>7)7Z`JUKdkjV2{oJUYHCi=*TJ&gQSlXFPX}
zt&~Q`t5Q9RikK$a-a6ZRkhRxfQ;oE}V$$A&ti8sz?JcWE+Q9TQKrhjQSe}lKe<e>^
zt*@jL#~rEiYb9-9dK#{dj8u~b;M+q4fUezc$3NAn;+@ytc`bRqM-Co2nCybS{NBs&
z$r}{wyEIX}^E&PLpTdqDQoFp`<@@&d^lRFHHl>Yf^LnAziT7!DNbOG0Zk%?bYL{2L
zeA=~lj=U^0xsmfJ^l;<3*LnD^LeGsWX!5Sw<<%~qeC@r1ug%E$kz5Kr95{D^hwm%&
m+zHx^)9#Sk<<%~)U;96$9PUQpqayzR0000<MNUMnLSTZ?9(6hZ

literal 4688
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
S)Nbtn0000<MNUMnLSTYO4UU%p

diff --git a/data/tilesets/secondary/petalburg/tiles.png b/data/tilesets/secondary/petalburg/tiles.png
index 97e8bf187f37c1ef191ebeb63c4c49552c336161..dd0e23ca407c738fb5b099a3f8259b25adf3d4df 100644
GIT binary patch
literal 1910
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

literal 1689
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

diff --git a/data/tilesets/secondary/petalburg_gym/tiles.png b/data/tilesets/secondary/petalburg_gym/tiles.png
index 8c996f701c6678c7880540d5aabd51a02f71394a..cb7c40e5ace444f17d59e73adbd07b65e70d0c88 100644
GIT binary patch
literal 1429
zcmV;G1#0?<P)<h;3K|Lk000e1NJLTq000O800f`}00000C6v3y000GCNkl<ZScUDF
z!E4)A9LIm|Er&szTMOMmQ0Q3WZB&22MtokOke!m=wx*O_Tc36)BYkmUYcIueX-0dB
z4b#D}(xRyckDcQB5a?kza+zo#R%{u@4&5R4e!ur5JxO^|JV>`4D(Hu=p1%26e((E!
zvI<i?U<Ta$W_=A9^L+$k0ypu9opOAIhZ6j16Ayt*UzK1+$h;wLUd97fI-SlezRt<}
zehn^6a9*YZ{DPBO3`<a|F`cj^e7>KUKMs9KUjqE63zhHtv{)>{Cxm=oku1fSZ#>1T
zCBm(-fKFIqw_H*#RGLN;Dn`>#D!I}IjWuaZr4qghja8HiZI$c{W#)=skWh`ugmLg0
zYMNeCz^HB+P^)fjfJsG7vT*p3;@G4=s|^eTRxHaR^kBv2uy^s)w#9`nqA=K&WrNk*
zbzpaU*9P0}p|W~7Mm`xDi+sDb<-oS(ya31Uy}&W0?<XvP;Hqc+f~t2hI7Qo+!Y31!
zuVljV)n`${GS$aXxMqM%SiYL24^8|j7X5tzS9M{5%Ez%#497G)p!hz1_(BnvG2fS&
z7Y7e`bmq|+fn$AV1z5eoV57QK6EPE~^+qigJwC<;*iSbIHG(`fl4Gfi-?)0?DqMeZ
z{fST#{Az_lePTPA?@;yrl`1cFEI=KRnYz?I-;dzYJaeeV<X^}|QH^D$j>Yg8^LNl5
z!=&YwVDjAW!ldnX;c(b-;jmA=-EsO9LMIl-anxB$KVxS-C~0Fj@P}g<mM)CbS<B4d
zz0>zj!`->Na{>>ZJ$MH9uid`}^+vq`1|A||=sQc6_XN;qlkaQt{Ybut!j~UC9$Vqd
zjh^ozoI%4-W=)RCVCJVzs{GU?R8Hz*`NQv@hUOvuDABsn6!X<;&;=FvlxUHUugoc0
zBOnC@0w4--iWCHkH;<Q47Yb0EM}^IXFkhhcEr`~~i#F;Qt|Krt{9IQf%STb94rghC
z{Z984IR5Ar96C;p59t01bbnk)$T5DCs=hX&fQ%@5?y9ql&=!?Ghjs<p`mpT$)(1!X
zpr2LG1ALfzu;;uS!rqQHRQgP+XBx&PbXOh3j<%Um5Bu)G@C+Ee99rON!wVVxneNZT
zdRBL}53TM_NnH;+3Jg5_zI#J_2)n}%GwL->`o1RCv$|KH)#|G2i7rL+=iR}2-kr>P
zO_S!&#ClIntcSRW2k7N;8FbnUI_(9O;=VHZ^7j$ibn@vmrqh^O@wT~651Vzas(6#@
z-{DOLz_4=2A7ir7@-HLz5l85wmj<?mzAfx3{(b;WJ0AeUrOg73!ZibUxDalnB)k~9
z8iq>+GYJeACCqJwYPcOLkHug;*GiZ$ghgmaikS(xB4O=TsJ6EQ<>7=$V8XCo8^Kk(
z6)MKeID&*>y+C0-q4@K%8bTzj{WQp0yA>+5#gU&nss2G9&q<wBGGS_H0c66C!}+yY
za5QV!@ObN6#3mRIbs}cV1m6016O_JG%=UK91+C9@ocJb5#mu}+pw{On>!o7mo<m^k
zW7q@}n=TbIW?m*xJwI758M8gYfG|pK;#ABKR|r(kkJl3kV@Khq>#-wQ<4E~Vtm{c%
zPU^z$Sf1(q<846oT=4t&eB&4`hEP5~9`9&r9P^QH*k3SZmBukX;|KZ)G56n0$vgau
zkO_-}eiSY4vlxPeVNYy64quy9|NS(bG9E6DDuKqP6M_$amOpm{c(@FMcEHy6h}#U`
zsBTyAjp_~IHM@lP_R{}ghTh@r<}VR5{B_7g2z@_HqVJEKbj(t3`SQIM!$mPGbL6!3
j{_8R(tc)lVvV4C7o5&nfxgU@400000NkvXXu0mjfD+IdI

literal 1222
zcmV;%1UdVOP)<h;3K|Lk000e1NJLTq004jh002+~00000F`Lgh000DyNkl<ZScT1(
z&x_ke6vyS<awx2PYau-d0xjKDTjD>UB|bM0a8B9WnrsQZW_{`*l#SMb{<sv&p)SqI
zHdF^gLyGDgTzc|GhlL!9Jqi_BSZlRoC_SWywL0&OMn7yhmSs}<ofWg|)qM1wH}5^$
zlFzjJ#oo@%Kz;^QJGvNE30}}NN*4mAbVd`u8m{jMfTk@3jI|l5X$}?xruA9C-N~GT
zU8a=)X%0ZOoAY9T%cb~8a{!AwOa@y}nUPx8aNS2T*JbUlvm0q1aQz^m-_^juhXH^&
zaN--1#QqV$Ubt?WW)FYx`dK*mIOYHzD$9Qs<+o*70t!G7z%B+Dn!^zp^-MD2fH?;M
zptM*l%9PFndTjY%)Ek)O>8l;cMYuu$CK&>Hqh4=FNN@ObX#Td)K?n$AV7S2+7{MH}
z{j+O$DZ7IRkkCR0MHymHi~xGAr8n6wt|jy6)65R)wbp)ptm`R>gbqH4JD5^m2_$s_
zX^pm~jd@>)XPR(u93&1pIO$J>ix9A1Yt{D|09QqcRuv8e031xajw<310{9jJK&;w?
z12?!2988~3Ya$$oJ|nhp=hmHD@oEze1OOfM9Sb@W-vT>6xb_=u+`{cgw;!cBh{xc}
zJ8;xrRSqD5;28CE2dLvPEDT^%dZH>5jKPm@;kY1TfPka}l-L3Qd_wFK>P^sr04$6_
zV;1lb5{Y=~<^=QL+c$As5XU$dgGL(%JZ(dg3hf30&g=v0xy1gKzB!NMjl>ob4mjW(
z<i1o80H4s)=LPn62uN%p#eoF5zY#j{&j|6+!Gm9L^u#ePav&9;cp?A@0pERw<8yJ0
zvoTQI03ZQig8>XB0SF%O)1nysrSeQINavvb3zRw`0ArwYeUEp!^R*!AmOTyXUuM6)
zpKw6p8n<->#2kp5;TQoFf7=6KSdGhcDN-r%#*!6KDu*iVMJ;b9J0OZnX)iLcBhid1
zMR6(Z)daS+Bc1Z_*=%+VoLSizY{u#_Y?t3@BpiGtu*VF*kI`lg*)?>%Io4fWH`wgL
z%SO}X|2Gm2;s9rxR4U{T`-nXAtZmXfedd{_wQV1H@V;W*aPPzXc*cPfWXC%IP_~Hj
zu6=Z<c-EoPbQEv1YaObN_ugi=YpL#im><tLNCKDwfPw(ie4;P_I#9DX5CDe*9QI%U
z^t;_Y0AOC#ftAmJ01WyF7!3Lt1DO9K2d;qtSJMmza3NC-)#WLh$w4}x761|slpKJB
zgFJwkgLqTP6@z?$S2(Ct5OC2ot}?(y09;j%IN-)|2lM63ZijNlb<O1tws=Ev2%!`k
z3e-89dBNLh9Vr3G+S1}(IRQ{IsvJ`SAljp!Q~v{i2vU9kbpD5j%JN%Z7vOX&0KC-x
z(SKM6pjF$_`E>xkwhn-OX7l~FuIC2eN0(Zs^>t1FPb95#Ps;-c6KOiRS6#Xw1;D=v
z`0#c3<r;v$%byVXLc6ji;LEiD)P7OEBCV<jP^PrJ9ssmDfPK;ur@;5Lx&t@Sk#aa#
k6A;V9ybkz>-MoN*0b)QLQ@n)sfdBvi07*qoM6N<$g4ezx<p2Nx

diff --git a/data/tilesets/secondary/pokemon_center/tiles.png b/data/tilesets/secondary/pokemon_center/tiles.png
index 826da07bf7bc361ba35d35d676c256a0912df1a9..673746c5ae89425532d558419788cf133c7d4dcb 100644
GIT binary patch
literal 3645
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
P00000NkvXXu0mjf>jxr3

literal 3461
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

diff --git a/data/tilesets/secondary/pokemon_day_care/tiles.png b/data/tilesets/secondary/pokemon_day_care/tiles.png
index eab49af325a1ff196f6c434e05bb28319bcc60bb..76cd9ab96ecbcf6b2919358c21c3301fd95326bb 100644
GIT binary patch
literal 1528
zcmV<U1qb?xP)<h;3K|Lk000e1NJLTq000O801Frd00000B}G~{000HQNkl<ZXo2mT
zJ#5=X6vto27>E%P8R8Byq)b`5WNUzUF*<gmJs8j?X5;2+6WZ<ML2x$HgOF@ChYSHS
zsqmoH9<tjCtSBV?0h1^)bR+wJM@iHd6*_fex3~xBhj*tZ-q-(*C)^R`v>28L({?Wl
zqvpWKhD}0<Mm>RTH!~rU;QO|{oxpY+n|6uzX`ASN0s+h2j=YfN2C(GuLKFhzxd!0<
zz<4<D#^R)Bz-Yl)w8(k=7Fbw3$d2<aUM~RT(B<jE>#4XdV3d*f#scnH18=f^?AfR2
zar^W^2k1N?`-;7(as`4GZR&ggK6Iq_(WWC9wM*?1wcFAIlDu)qyb>(&GI7)60Uf>J
z#=K%QX98_IpB^_MX6g?=s4`5(8p9ZR5@l9rnW``{VF~1rrAb+k2IIIg=k<ZG(PSEz
zUw_^bB%k0hCm#=`Cp|OK<o5RBN6Y~z?6-wRK+awRf)jvXpl~ZG{OZ)cPnQ?F=$x~?
zEeK9H<ehEp0q7xb*qB#+nQgPow&{0HrZ5>&llD~yTDy{hd$>gQ`4W4yO7`bRj8#fB
zNgarb2w1uYt&!cd=@EOYtG^)0kebZfFYR{wkPZ(Ij~FMw5#t0nVw?bfu>OvZk2{3a
zF=MuekQ3^3Iw!2y!)y<6$6T%~vOO$(%9B--KWnvG@3K9_wa1zj1wc>*JP+`#F%075
z@T78-$rRV0Q9%e)1HiHXkKqq-)AM&1mS7*2U{+qeUKa^=U<qdB<t;bw`{<_I3*~f%
z8k+4v5v`#d=K$h5OcvFFhBCd@P>yr(4mK^b3{1!@6M6f^xANhp$K$q;_kDExHT~Ym
zp}!!^7Tl*I-lpj*H8W1r^dCp!a!4-<ZohMs{uKTf$h&{O{hBH$C@3f>C@3f>C@3f>
zC@3f>C@3f>C@B0FAW!D~YL#NoH2dB}lH(A@CpER0Ow;OnW69-_herHRpO1AuzXYV`
z@?nnj(zx`#N(y=CQ~l<+kn?K5&$Yypm#d^Vt1csXeC#AKtBe%#c*?k5+;m;iJb4XF
zVtRNY#yJpO5IzpY7tZcvT*zoL-tu)F2c&)HZA@oE*c3I+1jS***Qb1pbhL?r{EY(!
zyvxn^WDC(C(Kri9gb_NihNrmec*^B_jIYbsSU;Gfp{UsHl2_7-<mq}TJFZabhNSDd
zMY>k9`r<;D_eJQI;dxfT&?qi+fj{NFIfx4#w9MlR&t=cEmPwN+beH*jF#g*34)f-Z
z+qdM+8{affsyH&x$^<5w8u9E&5eH#Ba`96l^X|;`;#?z45O`+DvwI8?W_NtPzXfjx
z3Of@HMM7-R`Hm2DZi_laJFF&Aw`p&;35C^BQ%5vn+7klG5%ne^q6szCL$Y^}7hk@_
z_(m0s>I;{_L;Hoj_yyPW%d@0@)n6elV*}4K$~{!q>#?^2uZM4+t^8X{pI0pEkgcw>
zY;{f+`;d9vPdd5|%GQfTE0Jx9Wn1KAv7}j~=^7`y78MHf`d;3JP4Q_4N;8nR9f&Oe
zMTUmbiiH=bY43oFh35yP^;!p1cn-+AbonHGJ_aZ5g|FbB^!-S`Jhg2q?K;j~co}|I
zxCXx^H+g}o@Y+<tB=##~$^IQBgIADsUQ5<3Om+ZCYb1HC`*pLlHUW9xLK})fUK^aa
zy)D0Z2BTi9)guUO1#y_VZ~&gVaAN9lkt>W@y3d#kg*?dH-lu$_Q{oAu^b_L=Dn8NP
z+gHT*h3^LzU=2|Qydm5H;=iyo$G$ayR~~~4L~c3c;CKqWZS;Ac=o;nzF7ozUu5cIN
zyR5&Uibc>jYEWIJ445h01j#QVDMAP-+FTDQTB~3uW10b3CPK>QSK>mB3pp;l11(p$
z3-Em@v$ek9+?rR$&b$U81qT1C40xv+<NaG%<9$1}&JuxP1XME&m#U`ua%As~xNt^X
eF!Dc-<NgN7Q9;PX+3o-U0000<MNUMnLSTY~JmDz-

literal 1451
zcmV;c1yuTpP)<h;3K|Lk000e1NJLTq004jh006iI00000%Zygm000GYNkl<ZXo2n8
zKTO+L7yxiHg4C#vI=~I7;!a&|$##`sK{wuJ7?8Y?Zr-?TQM)+|5#8bp2sZG*P^nW+
z3|?XA4nc&}Hh;vkP91Ku@B5zZ_&wW6jJXqwKgmsH$G`V|pI;u9Y(aqVA%rkAt=rKd
z{4n$>aUO<{1uW|NUIdUSVM?Zikpgsmp98chVVda-77PdkbohvYT0HCs&J6yinNkK2
zRJY&h3&L^S152KS0*9~hj7nw?CcvH`EXIKS%aT!1?fZkJLluEn!{PUeZax8cZ5*5c
zAQ%f27{2;GoDI+>u^AXkmD7jor30G5BW7?F1JM_ue}^H^3PTBjmA$>n)#J6k_=N&P
zK^R`qCYz>tCd4D@U$DIZG{d04A^?j5WN_ctp@cpC5pxcJv$L~v7NEJq$3_BJ{<PF3
z<o0Oy5P|F0D=Q0?2)N7wCKoL%Vc9t9LK8LPGnR0-0<&#D1kQON>;abnZK4Li?d}l;
zu7&kClMF6%0m~W%G>rm3-mI^${}BM^*?<zw+z>!a4gN)7T@WJRk^$iRcX&FCrifw8
z`YqtGzi=L0TwDwxF3sTQb>>frK18R}(ZWeL8CZZUF7QMMb1)cuEdtOCa8d*rc$4~x
z8w1A>J%}6`5IT?XV2fk}xNgkIz@`nygQ}Wc0=s5rWZ<Y#33g5(kwFYN48WGa0dN^F
zVY|SeCT!-D0Xlq82G%hZV1onjJOr@*yg+oka0cv>S11Dxc#$6bw^sp19^f>@&#w?q
z2GWNE0ONlHxOq?n;4b5f0CRhAQ^z&A`fFhzTGk5!@lxuM^wAu^{D>Ca!a%g>z8ruz
z4=<a+vw=B3ruh-wI}`@kD1j0vff6Wz5-5QZD1j0vff6Wz5-5QZD1j0vffD%fvBkvi
z?P&ikKG)T>ZVbdvN4aoXTucD33q<$UjR7Y(?(y#@xK@)3Wg@$trnw$dLhv*;HDX2v
zUNEdf$Rr;ogJjJaJ-FMaHS8$Xrke)lXW-qR;Cas0>BBcDxjq`zq>(!*Az3r?-b3&h
z-Mcpo6r3%^0>GBUdbL_rqYU0AM@#|tM*rA2@%@LLZ(EzEzFn<KRZ)t8WX&WI{@wBJ
zQ6IYS0AKv`l<5H-N=aql$x1xFCA+@Y>mPTZ1aDiGx7a2I1H4W4AO+lNhJh1s6-HFX
zYzFW}D<gxZ8s~2}ar*2Y!4&dWVZY4+HttYUJpdq{Edbp0@bOe<-~WjjtZ{%S0+5jb
z59nH_r|HneRYKwf0H}>bu{KKgAOUzi{1svse>NIxEbw>mszGYzu}|(j;(J<0*LxbX
zGX(59OsIOD4tFC-5`MzR<gJC|328v8VkCe%7KTxq55U<HOi3OPNq(SCg9qxh)u#cH
zNN0@{0pj?S1!nbv_CTzPsuTw9tk*tpK(s#_7~Q}{7;%6&9`L~X`0-#0AOu#HT9AGO
z)IKDDe*Dfw3b16XFnDnX0X%Cw7>sWMj{@(F8Gy5c6K}H}0mwlDYx#j~ocfz;1Po}5
zeHM5(8^9GK2Jj(1B)|dEZ!-Z}0uPLR9(dPi<SqdLNPq`s&4XkK*hE|}as%wo7B69=
z5v&(1z&>A0XW$Uk|Ht(mOPThanE`;R;;RlX2`H*>E6)Jz5SYLG%>i2N`QOe2EC3*V
zOD<Xh0G_3|Iacs#0GaZhLtcQi2)+OEQh#)E0*(xKSkOSHXcO&i#oO6*aVrSGU*e5z
z7q`LyX*LOLg#k-#(ych4H0f3laG-?k4Fa1h6bZ-PfLl7*#jPOFd>&x6ZH372_YJl}
zfG4-DHr#5qivm88TdigjZ!_D)01%>E`hr0GVtA4B{{_99LC6k5#I^tc002ovPDHLk
FV1lt3g~<Q_

diff --git a/data/tilesets/secondary/pokemon_fan_club/tiles.png b/data/tilesets/secondary/pokemon_fan_club/tiles.png
index 2714292f0bc09e0bddd646984f180b7a89a8a566..62dd0f03f2a511c8eb898da8ff015bab5a0ef684 100644
GIT binary patch
literal 1373
zcmV-j1)}<iP)<h;3K|Lk000e1NJLTq000O8015a600000q@GZm000FfNkl<ZXo2n8
zy>Ht_7zXg`o&<G~HAC|UWKqY$i#2DHrhuENEu*z{wmNt=g+#NZK<<<!LbMc~$_fdJ
z4pvIJs6y9@rPE#@WS{4~lPJklB(wnxv`4@{9DT2jUk}d)bSlNBZh;my6<}LHe)r<l
zi&qQ$oAJ)cXwC<g<kjKlIcXSBajJH(sr$uZaRX9UWb4zQ>^@t28z^Ag4k_M92^;Z&
z56Z-!QMT-xI$!XGeNqPdW$D;gW#aP__^E;_sF3Q6isiu6RfVc>Kq}y%A{_^+LT)R6
zS;8W0D(r+EL#NegEwJr)*BmO335V};WC4fl=7O>T&*0jyMfC1(PTdllqL<}wj}(PH
zQWW+`v0&=9y)P23vJD)P$Xu1ml1YCaOzcXy_DKodGg$1;f+=+pu8IvDlE_^770G0E
z9!%^?xDJSq?innu&Vng*x0Sz@n5|{o@wzPD0t|Y+4O>Ldq-1mS3bt;`sqdTOHr&>8
z`>$YTJ#4vXY^G$}@v?;VR^TX_gAT}2%*G3#Y|MjeGTCsngy)wiY@e<}*_2h&oL&ud
zL8VFIH}Gw!(&0F`F~AfQcBiQdf7t~g2%Zh|#&g^zgL%S)j|@m&orEg`Wf%DgyZc6g
zw*ddUfiK9;TkzG6$)D7zyKj)N2LM&zOYlHiUjxaX8FZ+hk${XyXj7LILYqWp@>v7n
z3Iq+p9=OBQ-T86XCQ&kZ`*+;oa5x+ehr{7;I2;a#!{Kl^91e%W;c)!lNcctRpVjIO
zmg{7}L6ysTR`|zt(-a-w-5`y5Lh+>!;u3jjTk@4|?D3qZ_CT^iNR}O){d)G&wDh`f
zmgPI)OP)&}OP4U^IX}%M<|uKD<C@lJxNG_F{xRV1*nuAp=l9eztwv+la(eohXxm|r
z%X8K^jl`c3^V(uwk+AmeX7`{puiJvl>Orh7eIJy{F^_Qr+^|F?ole(~X5W?P&}y}s
zs!jStc4hHqwp7KeSIH6<m*!7Z-y@F}$SyE@s)gZoR~3ijo(f4(gS@&U_4_^5c=*R7
z)rf$8D0gj^uu{pBJDIA2Myp7|dFyk(U|GWA`T51e-Ja$B<AKRbmN1lgrY;=!JVP`Y
z0OrL+kGC$4&(3U12IZ=QZ0UhS4<mW%$rI1EY~T{Xz9d<~4E}y>v$0H;uoY$t{w$w;
zg36GoY7)Iu$<K2-o!6$dG6iLU6FS%oC?4b><3$VOHMtHM^g)|Mpxz2pcX{}w)zQsG
zqJC511A&VA@-Ec5u9+R}$o94)?AqSh0BF<=*j*y(*EwFDpQz{GAz5|B6~A$1HiO`<
zrF`F}?C=blc*`VZPCRRwkL=}q)+_rK&Fp&Q=K0B5$rJTgE4@<5p*{h%licf=lB2Zs
zgR1GnsS2(@Its3EF{2T)JF+uo(wnGstTC%x>j}ZTA2d=-wD=3rkQYLO!5F)d?xCf-
z{2f?{ZC<h^NNe(PgJ!_IJU>5I&8Us%+sE_mxA8#F`FxvvzD+*gh3tmmPYcuQ3fcNU
ziEXy(FN?D5uFqd<DOWAKxV{hCBsy0C^St`HFl#t*1dcIlbGOMjuGFo}8=5K6ImyY*
zOAc9LS7)R-5<+jDu(g;)T~|R90m0>`SG9myI|j#xYE(ZIj+Gt-Cn{(jrK%nvAi*(O
zwd2}U9oEQUv!QC_`=G(Bb;-L9;GeN13RU`X!lhvYPNg61QcQh~p*pV_xQMF~g~0_n
fCg_bWY{vfv@R~YDNU!mK00000NkvXXu0mjfx|+AM

literal 1242
zcmV<01SR{4P)<h;3K|Lk000e1NJLTq004jh005u_00000Bnj3a000D`Nkl<ZXo2n8
zy>Ht_6aa8`Pl7tgnxXjvyr^TLMVh@yQ@~B~mQma~OC3C$g2UOQA$7`PB3cShWrYMq
z2PvgoM4@9v(s2)9vhTgS<A+4avYMg8JsYMz$ltwtcccs*wKx+Fgxq2rr17joQLWTO
zG(~7xz=V)njAzv(DjA^J<bYx92VlGS*Dz3cI8aBRQEMI}(8>d{1|xp_>q3BfUawIC
z#&I6FxV*T;?TiD~MxY^p)*e8em!NUXOVBC=zVK1(Zvdcu0-*g3!2A*)T?|$Md~a`{
zk^(RWybG;Wz=zlbR0Y7N5fu@rl_Gks=WYZl5@-mZ^+2F1fI6NDIFWETRwk0`xHOTL
zKE)&tR5(y;^53RGzlFfS#az639;gan%gJ;PP!Yi9(>VbgeB{pa^Wev7To4NQ-vi<z
zAYunVo{bVHI$$f{L3|Tn$brST1Q-kd6TnKPa<Nbh@asVeM5VvIKg;(641%^E1&bI(
z7)L+B(;Wagj1vwlBaI@Arwh|On-=y#D|#^j9>3GH$L|1OXJ^)4z<W)5P5^w+?E`4|
z&k1&c%}n+H;EosXI?}#7IQX6b&l^4fkO3LIe~uZzC_LI_6xM;K2M0eOQ1TxAwhtiZ
z!LBoLOYC+o>=O!5fC3bt00k&O0SZun0u-PC1t>rP3Q&Lo6rcbFPz3yI?Uko`c9$EY
z6>I@+Xhk!58sM{6I$ucPFzm4n2xw_ke!re%z-ZauAfQ&y0AkPN`}iPubM@ENn;X9W
zt6(-QTUJ?*nkfKHWPr~`CVoyb*dGwNB*2$XNB#bh9*EW69Wu~Gr6s^vzt8kQEF0es
zL}4BfMa%+Fwn&Ryci=dVy#^#>EdVi$Spb88-cA4>rmq9I_%TL6zC)2tIPtO`1Xout
zUlsu|-9BQ+EEfqNUq~`&Hi9*PZeR)6lhSlPIMM!jQp!yEU|Jq}i=i%yi1U99pe6%$
zSe-70){Bpa)gpifB_aTC;K%{AObCF7fdBE(%L1Q{CjN4w^JSulZ3U`qF=Q_o%VhxB
z`I*zW5Fq;xe_}&5`Aslg+;;gJERO1ip&uKmIx}xiOe;oc6&Q2Cu@m645v~EzY-U-Z
z0K{p`f!-L0)am({3;_`wxCVd##|vQTf4~}Wz~_KJ-UK-5?BMrfXmFqeKG@K81bV*1
z0o+dl^(F%6d@zQ~$s$|>`~mEbtwSD|MHgD9mL>4jiEmG0=ht|_e4h;k;JR;J2;3sn
zO~;`dNB}c|c^tLbd55*bc+Qp+Hb^rdKx9I#LpNaC#WR=ygb3)Io3{i&45)`16%TqY
z0UAUIA8LS;9)Umr@vUi__6gJgIy(<zTGl4u^=O0ut`!SlJnm%x%mjf5x@JNdBS`vf
z7Vvv^<axhiS7;b<K8!N}ZYhI~X`W&Rm}>@r_H4W|VFn!VM{t$uGBN%VfEt{_PY8hL
zWdTT+04xduI0P`43xLyhy92=8((@+QDKHvyKz2c1g`yQ;)@?)BRvb?lTgI6hK;a~S
zMf61!0H+-S?tK3`3pn{MtOD`_md(ubUrZ~xVB+!r0&#yjM{IkL7XSbN07*qoM6N<$
Eg58A?_5c6?

diff --git a/data/tilesets/secondary/pokemon_school/tiles.png b/data/tilesets/secondary/pokemon_school/tiles.png
index 3c8c4dffe6f69f1033da8ace9c9eaa4940235a22..20e3f32c8c3373b94e9828637ce50e761953f45c 100644
GIT binary patch
literal 1027
zcmV+e1pNDnP)<h;3K|Lk000e1NJLTq000O800^)I00000;o{RN000BZNkl<ZXo2mT
zF>BjE6vrP;iH3qhrw)Y-`2+!X?$XOt2!S>oOFGns5KKB9g`!!7;5F9b(StCdOBXw2
zY=RKkI~ZbYM>aU;d;+`gJ=vD5$cfULCc_>0$2;qP@BX@z?gkx<us{l=EjcW(jU@nA
zxrEga5gh?OBR(!83R`%!uzfQh{;2wa^6gyW)#WCNJ~dIioJ)h;&hus(j9X+BqVtZh
zL|8|(1fng1tGNP-)deEEiFid&1Th6)O*_tM!TwHuBFwksR6MJL`QDIVZV&|irvyfL
zGkwHM!m$taAE!RZ{V#+UKK>^uk_rymD7MZC2TFm3B@uGpJVW#?Q0gpM!bp1`JimD<
zCFB+Mo9}F8X8{P24Rn%pigekfY&HTe**6$1dYtp^xS<=?SQ0aoWR0tf_IFHPyw>^}
z$kw`mJVCZzE5ua;q-r!kT_L#hwI^$9Af5^lfJd@{C4xo!bFhq2uh%Ew>I_onOK2O(
zJnb!QzB)Av;CbEzT%AGcd<ktMnWw$|WxjvDU!L=xZQIZ-V$>~TmTtM`#KAh7bR5-Z
zdkZnql`-lTQP(R%)t$g`CQ(u!QIHKXl+;HEw!vM-E*#N+N1k^MM?!4E34wK?4QCqF
zb_o=*U8Tq$En302P~_7}6N@+>FK#?8!E#7fV^R28vCgB3FVcUpKEjAw@czc)$Q(^|
z);wM4g(F@k3v{8djfM(a@)QbE8c^7$>NkqWDeF*nNydFJP7T}$42(`C?huBYR9PGW
zWzJ0#gfI+)n$dPbK$#y5NleEklfZWrPH1d9nX6m$dX*NjW%CyNwkBxAP>NvgM(WM3
z8#SkjuK}Y*s56co(((IIyWjfq*m1`?RCPIW=j&Y89b;y_nv-vD*G;3V{6gd^yASvL
zY5X7HY*(WXh*x#TNZ5}&Z#OFTD%IqDYwzy;&2`-I6UNV)<5b*4-NTQNhK7cQhK7cQ
zhK7cQhK7cQhK7cQhK7cQ#-qcKPbb*ccknH{lo+MXH&g={_PulH_Pq`836ZF?jnRF+
zTLlj2Ai)JSYerz(2tE*oC|P!q4jh>DSu8_X4PciLQU*|v$)I>N3_)IotD^}N;`$=}
z(B0yXA$ySN*?zLWUU?OIhvq6AN|XGV7m)E$JW^i~O`o6;nH3(e<`fwc4+tZWCVDm%
zx*yOj49NX}tgR$Wa$5)iZ90e%L#X4=ih^{pqZ_$d-C~gBr9&rN80=+eb*)4%;jz&0
xXwJf44eESockP?NF0a+fSQk5`5@Pl%?H^B(SvsE-XKnxh002ovPDHLkV1i1|*9-sv

literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq004jh0058#00000Aal`;000A<Nkl<ZXo2n7
zJ!{)Q7yw|=mS`wAWa?1J;9n3>=Pp&ILJ73)Skj>mm>|;WC=|~s1h26cj~Rq1UAkBy
zV;zLZ-XRcSJ7<A&&M&a4`;>H+5`T0ly*J>?NxJ9W`>+i@Elxs9qMiw>wo$L|Z-u0^
zw!)YNyFNJ{>Hr)yFGyPs)H0C*6@;!+;QS}P{(NFzVqjt~0F2%mZ&IN78eczy_AyH0
zA`g(<Y5U9&Mvq@)0Ly&pc|ZElW|0F(e8TPDYZ+h%Wixn(Q~z8H;HDoo@az6f3Jgp$
z3+!UxSusFne-FQIgefr0117!>?g47}zmH+rDj*YQ08kF#YtJ7#815OyW5eL}vr)e8
zCP7M%mf8WJApogCFxaV9A62X60HRR_fWeMwJ~2%Jc%GLBqy}^KbpbGVnahwj<WLbn
z_EZYoUg5Y8$Tc_^nTGKylL5La23#?Od;@tI(d`3($5Qcve2FqK?(|$9T|a7#*+#-}
zDG)g#I$6MVqgLjgqj^CP6anLw=)aW%G8rUIgE@eYaoq7(L<0Dpa5w|Vb}#NjOM9je
zUmo6wjF|&LaM^358Q^j`AbE55G8sg44j90<sLO}Y6O+b=bDjWXNQD`c03?G}c2Ofy
zBN=c_d?zHS>ADW_67dfW9&}6nCeQcWF5O66vuJTc0015YJPxGa1!P{JMd#-p;EDo0
z1_UguJ<!+tI%JtZzSBwpPaXo!TnDhumgr&Ni~@XLTSox&K_BwT<e3!!ZFY+Sd=;#(
z$>alF0DS8g0c?-=@)-a!{mTIK6DgJgNg>~tV-9enSQ=P615b*j0auEZ0N?l50J=T}
z4jcaIuhlXT-PcbWD*;{c0i67;0=PlY=pL?-fr!=SAn5uT!e0ppPQ^5=H-wddwYT!x
zZ>D8K0SZun0u-PC1t>rP3Q&Lo6rcbFC_n)UP{4l(%+M4UW5@p1ww+d`LXVO~9Xb$z
z=5!92v0p7`li(7U>>RBb&nO`3=nDqsGr&ENo+iOAF0bh?p%o5@dI%wCqIf3#RH{MS
zX_KB95YqeG_{m&7M6j6@Lz6~n1}U%|i+a@Ajw_pJnp_)7XY~acIF8fK1JOwnSHkJt
z^*kUl7}Xen=Zp-20U$a73`kzeGhh>gD1hRmHyo9SEFZ2^Hj4oH!px>;U)rKE2RLJT
zp8W3sBX;8X7XiAH76#;FfIGBFmuJ!7%N9$qX!}3&!C5-|_y2hS0000<MNUMnLSTZX
CsiZIf

diff --git a/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png
index 7a9e44935ceee55113a977cc81f6fd68f23f36ce..f10306e7ad67a14f4def30487c2eea320ec595c0 100644
GIT binary patch
literal 1951
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

literal 1839
zcmV+~2hjM5P)<h;3K|Lk000e1NJLTq004jh006KA00000C*Rb&000K|Nkl<ZXo2mT
zPi)&%9LL`#wTy0*1++t@$z#27VA8}1kSY%84OKy^ix89P1$Ss7+J!h$N8q$rVygHf
zkV@C8r=bK<?Sf#$ZJ7ibU?;0MfS|Uio2B-e_yrErG_~0Lp8cMav}rquBmSvY{C@WP
z`1||)-p@VwAs=jzS|X8Hr@w*u)Yy2K4=o7?^C5D>v(y*>Q)2)&hIuJEpJ%?VfRlHU
zd~$f?CIfJa2Bun|07VKmM6h(Hg2BPl6fiuR92HsswFIVE$>cDfq?WKJBuUCefU{v1
zD4>S;RI0xPSWUeAa-wX30F<P8NZ6eUhDbsf;F+}^p@xKC7~st6i4%zv<#j%VMp+&Q
zoi|?nWGweYcR-k*c0do00DxKw2A%PbpX;6417HN!1~?862LR8HvK#>5qo=z7tR3~Q
zPz5~d2>?U{8ioS^kABb&AesT-l1DQDoH9TPr2;?_=8mEO@D}>+R|){tXQ+Y(sW=0`
zDFdLMFa*@5Kr@&En9ET>om89w;B<-R0Hq)V5<AI5kVJd@80rGpL&5PL!~=j2pB{t|
zti(0|T}XQX2tHT`%ti+tS(Y=q0Ub>g0d#@|1*lCyxK=^{oLCIdUPj^%0A*4eeVw&4
z$ph{A5b$3t2E>3E5CdXB42S_SAO^&M7!U(uKn#chF(3xSfEW-1Vn7Ut0Wly3#DEy^
zzXk-KILQ}Kuw3|?PqQ1SKVQ`vx-FH4xXmJ-qaQN8aQgt3WxNxR*$tSUQM2;oP<0*^
z-h93|M6RtN)Q@~mmL$2^3CN3Sk8V(4fV;)QV)i@%j2AzfM++QWO9cQ&l4WVC6Oa*?
z*u)5Mt)No{pX>AE3*fJX3Y;ul?gZq;3%dcuLiv_dSg3wmlqW%fGlhk<y%c1`QiV+n
zzE6wdM1A^d{)+zTTvf@Qf9L1okhAt81z?f`906=elEe$jE<klr%}lDGpp=#0kuJU9
z+(}Y^O{$QK0KtTk76Di?t60fjDXB}<#aq%XIUgwCd0qeo5{5qj<RvK^0xl@w7w^bC
zvAH1<jF{dmD*D%#0YG+&B$FdhMl4B~l<{qze?`s(pZ_(j*}2{}(#~Zf=={_?`a=CJ
zR4_^bX^b~I0XqeN1j)`oa-@me{P>sCSEb1zrxxre0e~$wJu$ZfutR|F+Yta2prFMC
z2mz*#5J1i+M+ac10FYp3f@0);F8*|_@Ga_V0X%q`w<CmI0^k``fuh_f7XIk%bK3Xf
zgiX@|EOlvH2B?;l>8nIRZWkadBXM>S5bX%6F4fCw19FfjKq(gi+=hPW==E}$jT`#R
zje&B-WMixQ79*|&FqIWRxNK~~^jXzy0jzGDoVa$tOJ#NC`xfBjtfJq1D1hfe%-A(*
z=QK?)OzJSIC$*bHhRK~`03tXFp$Ts_;sC%uZn^TOsRLj%IV>2u8#n-PHt{3?)|w39
zpnh(gD)#y}9cu#|0NB#?#pT7aYnT9V4Rtke_=X7paIVvAF#sK&X#qS%Uv1U_pxsH1
zXhwM{aQKF1B{<D6t@Uu<3ASu0$I;C=Ftch~HD2Ig9eD4nKQ<i&02SQO3}q^C_;hHp
z<S`{Ic}xlN@Ok+%-jH2`Y<DReayoD{>Cm*o1;ANPQ6(&SfgR?MYi7g=*A|0KIACHf
zaF}#hv8+whpI+dsC&Ill<0wc5+j>I)wwQBqhP}EbaNscMu*m?pI{+is*yzozm>G|D
z&;*{f-^>|w0o9w>x;s553~_8J^L&s^)*7I|SUZ0G&|}!6?*M#vVCKU)252;+GB!JU
z;0#?4B!r_!525QW1DG?@12=BC5r8F+0a)@PKx6H=vQj>Di~;Tr=(FmFb1eXkodH<#
zA^>(DyI$5-OrPH1&T9J1?<NI!K1-hGcL1WEh`O<+tg70gD%6CjQpu?a4RgEOdu5jq
zz;^KDRaI4$MbkC280THnGa3&G*t)%Sdwbch@rqJXd7;MJ@DGj`u-*Wfe?5MWKTv_P
zbz3Dbl=qd=H?9fmLKM@6iB$sV>l^ER{Q!WnrE1Hn&tk8gb3}3K2Vo6r{nz7#LJIM3
z91sGDec5NRySgJuQ)LsQ!?>^S!Q5EySns|7&nB_sCX2mxt|Cc|AB1&i*+RiH@A3Ec
zSKyj;rL@$F9o`EV!+T&Io#r0Qc@@ue_nYsdAa>k}on0URfBSZL(|*<#`y~>4JD|R$
z9}I|Mf2}fktMOHb0@q)JGwI#^6-2Qs^@?hAC}=d5<@?fm`TZ5p*jX=h0APt`k7OR%
zUjdDs^#TKM=(OdTTk6H}iw7tmv0wR0V7<Tqe`9>g)3(&?5vh4V4#L=3FSOU#)9UJd
dsZrT){=XO*^eoT%ZA1V7002ovPDHLkV1oPFNPYkS

diff --git a/data/tilesets/secondary/rustboro/anim/0/0.png b/data/tilesets/secondary/rustboro/anim/0/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..358745e4b2bcd731f9377bd807afe6e56cd25363
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDLYRW#}JO0$tV20y^}3?m5R18
zcE%`7R(yNzWiC%<re%5qOGo$g8*Nz(f>sJgGDDbFNP02MWe6!sH}|+}$RLzp<(SrR
QcLK;nPgg&ebxsLQ0Msxcp8x;=

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/rustboro/anim/0/1.png b/data/tilesets/secondary/rustboro/anim/0/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5a095b158f4e21ce69952950e416ed01481c4d7
GIT binary patch
literal 113
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDGN^*#}JO0y{8O?7z|ik0+(Mc
zu=B0z^*%X$<`t3rX{uH3OhPhS9M-1XVr9?y`G@1g{AXzoHmg;b@OGLlRGVa~0y4|f
L)z4*}Q$iB}O^PAg

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/rustboro/anim/0/2.png b/data/tilesets/secondary/rustboro/anim/0/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..91f368cf84b162d4ea6f5705545fa13e2c22acc9
GIT binary patch
literal 72
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDSl5E#}JO0$sWv1Z3n#>7(O-{
UGfM4`s|P9ZboFyt=akR{0Lf_&J^%m!

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/rustboro/anim/0/3.png b/data/tilesets/secondary/rustboro/anim/0/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..91f368cf84b162d4ea6f5705545fa13e2c22acc9
GIT binary patch
literal 72
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDSl5E#}JO0$sWv1Z3n#>7(O-{
UGfM4`s|P9ZboFyt=akR{0Lf_&J^%m!

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/rustboro/anim/0/4.png b/data/tilesets/secondary/rustboro/anim/0/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..91f368cf84b162d4ea6f5705545fa13e2c22acc9
GIT binary patch
literal 72
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDSl5E#}JO0$sWv1Z3n#>7(O-{
UGfM4`s|P9ZboFyt=akR{0Lf_&J^%m!

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/rustboro/anim/0/5.png b/data/tilesets/secondary/rustboro/anim/0/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..91f368cf84b162d4ea6f5705545fa13e2c22acc9
GIT binary patch
literal 72
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDSl5E#}JO0$sWv1Z3n#>7(O-{
UGfM4`s|P9ZboFyt=akR{0Lf_&J^%m!

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/rustboro/anim/0/6.png b/data/tilesets/secondary/rustboro/anim/0/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..91f368cf84b162d4ea6f5705545fa13e2c22acc9
GIT binary patch
literal 72
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDSl5E#}JO0$sWv1Z3n#>7(O-{
UGfM4`s|P9ZboFyt=akR{0Lf_&J^%m!

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/rustboro/anim/0/7.png b/data/tilesets/secondary/rustboro/anim/0/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..91f368cf84b162d4ea6f5705545fa13e2c22acc9
GIT binary patch
literal 72
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDSl5E#}JO0$sWv1Z3n#>7(O-{
UGfM4`s|P9ZboFyt=akR{0Lf_&J^%m!

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/rustboro/anim/1/0.png b/data/tilesets/secondary/rustboro/anim/1/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..75bd2f8a458401dee20016931d523f53682b58c8
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsR^Dgjv*W~Mf(i7m<&Z+o(F6T
z`<EtM#FU?KpgCi9+SIpA84jyWckonkUS9J}jLWjQe)dDdGd#^xE-@-SV={cs^)kox
z^SA7hY5XkDdL*ZYNgXloTCi`Cmpzx=Pq`1t_J^v?ykZtikW8wa%hs`=V_QaUhwA~~
zInCQ+o782ey}3G@O+;$%!>A79YMZkYJ(lbKFV6PTi+d_^ALK?)S3j3^P6<r_RLDz?

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/rustboro/anim/1/1.png b/data/tilesets/secondary/rustboro/anim/1/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f8b3a02ff84265f848c78bfe44de9b79a241267
GIT binary patch
literal 198
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsa{VP#}JO0vVDepO%4LC_ZQ}@
zoztdTz}TN~$Z^Y3N9XOWdA)9*m8VZ=yCEedeD1*mk;&8N+v_`jI;iu5YvYkydz7kI
zFF9)(>@BMO^4R|AizMd@^sbbi`(@3{tGzx!$NX*?c-T&Ry^F);t%vcCo63A`-wJ!*
y9X}GTbz{}%96^hee{L5OTrECwrBBpj|I2W?-81mP=1*%u4)k>Ob6Mw<&;$T+pHR~P

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/rustboro/anim/1/2.png b/data/tilesets/secondary/rustboro/anim/1/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..86075ffb0b7955064e20f4ad12b7b449678e4981
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq#8V3978x}rk>l#)odWr`tY+K
z<HCLJo6=56vdniAxwX_;G2kHks|U#`g*)#>Ynsk@I9u;I{}PwRoMe+pj!z}^UIcfw
zPjUF+&{V8u_1q}#+}0WS&eeBZo8zX>T%z=EhsnOX!Fwc{o_@@`P(O|H?yfZ7dt1G`
kZ|||M3)NL$`D4C>b@%$tr06`&43L{VUHx3vIVCg!0Q}xcXaE2J

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/rustboro/anim/1/3.png b/data/tilesets/secondary/rustboro/anim/1/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e3c576214a9cb83b23595a3a12a392e79349546
GIT binary patch
literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq0wfsD?CqQeq}n}Q978x}rk*q8I&8qhdZAw3
z_p9xjtCRmHXxRFAD#lu|FquAakS*fTj}5U@%T;8u72v3K%no@`-O+nx!AB1EHCBPE
z-9I%Z=p9qxi*%W=Jn)y-*D{k2ixj@jw|pyOwCzr!bhfkg(~{DNcmD04vv(@4f6X&(
qV%fYc3h%2`E{h+Vn-cN*{cnDwrWX56UysfQInC46&t;ucLK6UJW=Q}5

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/rustboro/tiles.png b/data/tilesets/secondary/rustboro/tiles.png
index 8cea2a4d9aa815e1f541f283879140ffaad19f11..fbfc72d466555a3b5ed8d52d06942a86648cebb5 100644
GIT binary patch
literal 4108
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
KMNUMnLSTY>1sy&B

literal 3903
zcmXw+c{J32`^Mj&SuumLQ;a1c>-bu-l*SUHByH9(i9)uqg;Jj^HTXs;YiP1XlnG_m
zheQ%7vL;K>Bzv}yo}S<NJ?B2>bzkSY&i(g&t~eWO3tpZbJOBV*OPbm7zZ(Vs0+_!7
z+;e*y0RTVF(#-f|Sk~;lBR)IZMBu#~S!-qV?#SDBOpP~^g_TH$aTDYyIST)?Y)KLE
zxj{1lr-QJht(6<)nA?S4dHFp5#;e>8JXS5xkerR7xxX=$*e9&+F(+!`tylQ0=j?lh
zr+f`eYrf&NbF1e=YYxYMkfn|*&P&(Kf4SuUxqc+W`EaUQ(n&k@ipY+o)mQIkBQ1^w
zh8leeENEXnC1T5ePdfj!e&!|GcT~X?N@sWk#%HQkuF7W7s-Dw5`b<D8N@wl{P)fst
zb$)TnJ*B$Qz(%(d+vBqe!LpAG9(n<BDJdy^-9V!5yGe2;{hF7mxVaL1@O%^G>Bxmp
z2}<^)>1Ii9=kxG|yCxJ)G#E3iL|6nIFP<aAhxE$ET#ORcdrSgU`W_T<{lhc()h=PW
z8OmzlDYU*BL1J+U^02O3UUHx-4p*_ahVk7i9@&sp^y<IY(%uvV5HM6vq7^X+Yu9;2
zJ*JhVLFIC*#$r6kcF!6+2NZGMo^mUlXdx+zQ%Wj%NNi)uxJ!E_{!FFvN`xNEmHgET
zt=8QX<)}oRv3j6MDR$6QdTy!&e{(>h+VfRDp<Zg|0TbiJ+Mn)kQv_RpD&^lp6n;Hw
zQQYVlj^s#URoN3wpk5J|lNrGd01(}2D#A<^9bC@}32qV`OvC5py=YaT*<!5DKG*oj
zkOIB3u-Xg4E)8in@YG&dpyK3tHek7U$+C8X97~tasTHZ^n1^XLE9bOfVcG-R=#b6}
zt+(@exg3#xou|y0RBcf7C*`W2NQj;H4Drt|=LxhucZV{M@yUAE&XD@wNd`IF7G#+m
z_eiJwv|P~KNYKloxwK|~xVW(q^`y)sCMZ#(%Q8>tXUv`lp(&*M*tDk-0s$jfs@LEQ
z#JU%SwS0#XqqAKmQTDrrU<r~mT|R?@TS#QjWVIMn@G_$@V9^iEr>;=MYN0q1;ZZ(L
zUu;KowgU+;HP<EO0T;I%+NusV(j0@m>Kh>7;~lZmaYC%MFocqYZk*<&XE1eu8q&zJ
z)0BR=;=V*O{GNuBF@w|N_`oI#ML!XuN>fN26a{VyQ&5hG*5V`?c9k51?YBzOxtRM^
zK+boF?M#0xgSy=Co^Qe$l8#<KO>1!@cE_+IUnf|8=FSZ|(Y3LDNwZ8VPE@aIF1;~~
zJjHITY~`uDcp@n-m%VF??6-L!1d@4#QW-y)QyXwZYQ?=Jp46M>7QY;`KF;+bT_NBe
zZQ(Z!IhwO0GUD9&h*%4MQp>S#lNi4*t5+(qS82b!73`L30@mLZEnA_g=v2wIOHjT&
zkg25`3h;(apZ_4Fc`9=64kU{MF)h1W@R2~rOb*&Scl~3=Kmh61i1}^{4M%B!51M{!
z{DKh8tkkeQ9;k)C$X{fFIr}vF*9iI?>*1bD;B=={3?+3clsBvvQ$;HHbU&2$mUi{+
z*IpXS2Xs&Y_RZwE`7SinRfzQ}=!qsDevIJ%@|*3JG%-T;W&&+JwEOHH-{-b1{J8z8
z^v8AgDO>cm<k@&N1&L+*K-G%LRaRTl&oKshOjAYPfuQI%=Q&hvJ*Jyf%JcJje~(kw
z=#Q``kBY<XwY_N4J9fyG3Lc5%jS+RgU4K#q#=F#XSI&_rspO8A$$sKHZ<;4u!NFY<
z6RN;(IzCq;2-aGPb^5G?bYBr7vO>UDt%A7H0*$?Gt??JTqieNDFZ$5kp4y%X$=BUO
zDi1njppe-94`qhHkE#L8;O)D~1}GN$sKevQgzwAW4Ox8Z`#dX(U%3FHadfF~6d}IQ
z+5@_U&#Qy(j}30kR}S!qM?H|mh1KN?Q*dIft=4%20|@X@{bQj8bK!Z#0^A{j)40G$
z%meKN2rN9z0|GtQhVOo&!^;wWP;G$F*5Dq*;AlBlb-KCO!b1pNdn*|*w3&eN=@3O{
zaicH)DPC*S4%%m7hV-gdAbwcfx}w68DTXO_9GCtB72KFACIA<I0rgfyln?r{=<9@m
z3?GmqzZxq;SI2ZWiC3<F^XWAlL9=2Z(Z!A<xvo7cA)M|*@AV0wJ-#u1Z#_G%q~KBf
ztvIU6I;8ho4wxGYrO<-_^v~;lb}-s1I|g!NaqDjw4z!#*^f6;*Rkt^3CRAIdC6?fY
zW47HWSu9<#Exg+v8Y+nnh730L1j`y-*3Ow+`EpDizLgp{dc=ON`PH%nro{*JC6VCb
zIxx)<t0r_GPAA;&PrQ;dOZ{!re3}h$Pz^7-zBMv=^?nZRA*0#!ozoWJR{tl4lGw||
zCfq=$Cz^HT(*pXgcOO4xZ~KQMCaLkdz&nKw^(6r+H}E8U^iQ^dci&em7XkGmV4uC*
z*QsPeHRo#+-a=v0fo86ghXMCjG1P*hK&rRkiE!QYH}U;7Ce8s->zbgvPq&ZXRoQ72
z4-`g%ql<)Pqp5EqjvRaF`o`nrDVMiJ6-IEuFK46;gVTBI1w2pfP8yNW9b@J~Ecp@?
zur|7pv=VSz-ixWR(-b%J`k#hH-GaScFVhlHE@1%-Xx-{sxrb!%>du?E(?Rm>l!BYQ
z8B6|s7~rza_`ftUTHuR9tn|aFZP}idcRNf4x68dUOKT6Jt%iX;0uC{Bmn6*}JZ0oK
z(8YV_qx@@6MrpMc>+|6NbpmD-o~6~7Z>V`LU3!=c5TymIb2Z-SPFrwvAYlW{y&vX7
zMTKoj+8IA?&Gc<{^e1o%8A%6GnT%-PMJ;<HLw{Ft*BXk+jS&T7<SFd+r{hWntZn%B
zW>bnbr<_K+fU|Sd3gtm6YdeXs5=U?fTv4Agxzqnc3Cv^ZAc5=ujiX~0K$j91{Mpbm
zT1PYK8of#UjuJtJe@Ef%>*vmZ^)on9;Dh!KUt#J$U9<j3<a+g)C_?wP!WH%5@61g#
z^1BE<y61t=^Q1_wy8NDht*hn;obC&=CzV6C)Xj?X>^M?G=Z?-kCJXY=vds_!owE0b
z4bcPqM<uCPVEbO{!2x>a=;$zfCk?@L=sxH-%OY@WI`KC16J`Gh4Y}DRVqnM)D|WoZ
zZVm-!u<L~YXR)n-5B^$K@6HgqTorr_P*{;z5of9|UkVa~FSP$72j0R$xmZQZoA0WA
z1O?;ODQF~0NL>aS_xB>g`bHqw3zo|S#BNQ1lIkaG7iG&BXqijErp8@ppekDmP%TZ-
ziT;91%&x(~d3RSo3(y8Wco`1P1B1r#Bl3Vqb8aScLXezaqrOmB00wfwf6_-T_AZ*c
z-(3jQ^_bSFZ%XfT5^6Wy)vhdAQZTUDnUOVwwOOino7kSJsU^_lCm6V}#UnT-@2;^1
zar_qYLz`^nsy92eJvA%x68rZ{1<+D0NDE{<F$hsJa%h4wf0#JCIs`d06_ann($CG1
zkIh?K)5`cyr{{4>Be0XxD7ShTyp<hT+kxGUVY5FjLAKl(ZNI%Mt{959nC9i30TYEP
zAim2;?e4U5Cvz>K$<}`0QC%b%>S{Fj(}wc%ut5&10r%HsXSr<d4g?2X$KQjFFMI=5
z*^1rv59*r((ZVcM2~SA8-%YfIL?TonP*KgVVRdTHK2V^;H5hzil3|KCYs+$?a;NN7
z?`Anh<un!+6>t-EjoLOZOz$n@yy{iif7ZrHEk%O*O;f3vZsq?yLS*hvLd1#wge{%;
zC*otnJFAcK9OA25Uxu6%+Hj1RF#<34__fV2qjLVI2(Gs}>D#z?&%MlzQ3|d{_zc%r
z*{OrA@bhq;uCNo)6$9_PQ4G1(^U$G%LtpEeKNAa`V|x}H!(aX?Rl$}1o{boz&2-aL
z8DjyGbGAdbmP^>G24%4^j->iqbOFoy^>bTNPb6`kHJbEJ(V}L1bb!EF0p_*->|<GT
zGp`{Bqklujq;x6gJ90xsmcsPP20<Ci3=*^$U8@0$Cl7~{eTpT4-U>Asimq0wTe6kQ
zNtZ}eoRD0&ct9ph|2!z7Wy*9%J(|$Y`^m%m^^$~zVu11aNca@zMV8}1cy~SO3vopx
z#lJwX%roDIf5hsP$E)B>=UtDUnJ%?3b;buZj#_CR3~$C2b^S2X^L_-*HN188q-%Ut
zdWJ3!9C(AYXP55&;yp}WsRf$_($9R7q?@>L^d6bmp=;bbZ8F(~sv)^M=}9+`7#``E
zCsq0^=c1+qs*}Wk@Zro?r${!zkcZKFUZL+b$D(3m#9{=_`Yo93c&vYrT7M**bR?D(
z`{@A1;EgjF*`qSd8?XZ}XRAAO`R!})iM`3VJUxptQAP4?X7gE>U!U?Dt{LOWIh_oF
zlG!~6WJIsJ98(Y~y<j^dOL-R5goj15+&aZE@=vAi5Lw3!Z_SnuVF%2S(7iIh_L<X@
zYgo23j9t$BfVIP22CpUIkUa@LVi(LNK#rA&V#YrB)|)_?l>6UqQrf|f(gRP)?<Y~p
z<I0@oAQX%Eof!_8R8qL{9S7rk$7=`~9g@iD*P2KKw&%8=n-P&n`gW(3#j26GY-04I
zhMur2>Ef5Nm9KYSm?xc$7RUaLn<0lMlH8=JJE8dhf_veA%In(R`;{uxwBzC}wyB58
zwXr25=+y=Yj`W`)FUX^EDxs~wDm2wR<btue`Was~6y{N1frf1eKI5=QsISypY!>^O
zE9Q>y6~>%?weaaN=fSxlB8x$NXL&sbZj6uosyX(*`9lC=eMenxd~`Ok?Gjv?M&Ogv
zEi3*{*n=F6tA`s07Oe{LdJNwSKbk~z_Z)sLHoL8COr8AN*C#eBY;*#k6ZwgHjp3_n
ze;gg^V%`ZKFSfg69eo3ZEIW-xeP6edU73#iwXF;xyUWW1S5@^B-wAIsau02kV1Nae
zBQ<ec3p?w5CV;viJA=Ts*?)eA!TamF=N~UL!r?|6uCrIYh2h_851U<p*{Sv%@U!IS
zvj&vy8pejZeU_Ic6ygsD&bHw=j~iO)NpRp}u5g)I+c%v{$})Xxz;m*<?=zStLo>ec
qeh_9nv>z#^)#3DlUe$g4BRwH6er&khwBx_c*z%yY*%K3b)PDfh9qudu

diff --git a/data/tilesets/secondary/rustboro_gym/tiles.png b/data/tilesets/secondary/rustboro_gym/tiles.png
index bfdc07c07951b7c35d7f121c7454aeb3458b44c7..d4ebc14a1cb56abdc1f1a5d98f00d588ac3ba0d4 100644
GIT binary patch
literal 768
zcmV+b1ONPqP)<h;3K|Lk000e1NJLTq000O800H0x00000c=VnP0008VNkl<ZNQuRi
zF;Ck-6vrP!C6-F{(yf)65731@(-kqXxl1J`YIP~AgSs#vI4`Wp4av7at;F}JimG=W
z8X_X(mrr23|7XVp+z=vx)Kl`4eSYU$-uvC75`)&j1;*1s`VI7hyO$4x6o`96xkyT4
zjL_H^L*oxoMC0v$v4}Go7hx<#^N$L}HBg)a)0oO)08D|xT>>&I>DrzNoyI*&F~*Zn
z{q9V0rs(04;*lbmDMrB1&DJT!x+wHFTL0suN`z);-{5M0yFrOS5(JV(V4bUFnS93m
zHD0ao;2u`XrOsSz&{hy^wIM+u<V7;t!k8lnx@|OZq9NTHm0Yp}E&m=At_44YT%I8u
z3tY>^0@r{aB!C_E$tT>W-zv?GV(Of$akFG@VVKif_u$;{GJ|joB*KbxjuG;5$Q69n
zRHhJMJb@MlbK||ARD@YXMU*k+lLOrDAx=Wb^>uPk68mUIkq?2Z-ITn^Qaae>@{VC`
zn8w7D$FsID@wxp&mcHGEniQXhAwW<{fg7Svn$8**-($=H^r8i<4KP-q(`gU{Z&#r6
zZjRcps_SVEu8aw35{6L?2}2=Kvs<|eH7?SS=r*o80qgm9NpVjd>fu4}cn2`Xk~QX(
z;^Q3vO#%s1EaHwf0V2c^A>?TDUfkpU4b{KgW2Yrw!MeQCk$Gv|Buil(Kd%h`0XUn3
zyRg=h!-)Xki&aDs@I?=C4VyU30m17Qu(pHI2D7#_?Q30yFmj6d_iaeV9ya~ys#0An
z^Y^^^xT^mx9+;Kw&=2_+tm6TSoLLlks_=<cT6<1jl{=??eCQ}~BZe06h3Am^N`zBf
zK>>$AVgwRf>>j{V1;X$uT~WO>W2l!^YdzMAPv;H^HzM(EJq{Idg&)Xie2$IB=Np0c
ygFySi2KI+;;VSeM7H8j`d=9m4q;-2$)$K2bp2_^nFt6zV0000<MNUMnLSTX(cWGb%

literal 759
zcmV<T0to$yP)<h;3K|Lk000e1NJLTq004jh001Ba00000I=RC50008MNkl<ZNQsS=
zv2NQi5QgcYK$Zg4(yamN2k7G66BA_0#x4air9_u{rGhRQf{0qO+8Ug<2wEWT5i}?$
z4NZ&~0qG}@)&C^R6f6n#58oM}kDrd@Pni|az1Q2^xr~Cw*KSoPsA!1Bs#J;X0vzX#
zf@)v%jU&LS0iZF5)C+jxm8dpSp(emh13+UMsUL78OQC^CZ4@?IxR&+reSqV-V5zpc
z^#JKR{10F~^MKg5aL#)=VEC{mVA%xt7S4}*00CnG;zJEsCyyR5Ps$e7s}2CQO@L7l
zj1c1*kj@{~pDp0gmVmQ80Imj@rFz|NqOs&2Csz9djGL)tQc1<m6vflx`(m;`Aa}Y6
z$ci<$CY7sRfC~awMh$q;ehCD4I(v|*=m(_ES%lke;w*0LfwOC2rF=fkT0YnS*r<{}
z1wEhEOSmuqNUVU{tmVWFV9)}@rU6K8zL-2rPEGqRpurzskb+8wO&_RGRRJI5slXz$
zVpnazk@rD)n<>Z#=Ghw4n!f?u|MY;(8p#LY)rkr(4^-)cJhkoV1i%Ie;Q`N_3xOaX
zgq-V;F<l;G(e-=++zG+nc)&skDG}rY&3U95iz-030AQ>OKt51cCy}~5h{y-MfcqLS
z90tMg<DnDSZ3Ov1;pIm`KIjEt0RZ5APy;GQTKE9xNUz06%}w_PmH_x<_6=!R=@T6x
z-G_8;eoxg!k|5#yEY(eMVr*A^fZUl`oZK3NWQ{XG&5~Y#j<*2*SxOE-VXU5GqR}RG
zsmT-prd<H7wUi!EU*{rUYEuD>OS3}#(mK)f=G_J0b_DO^1ZCJdJZ%fWHqsaYa0k?#
zl*#p1(E-5e12A%=zhnQ$LXWRM1Q-OUZOvzT0~nV8*8t>rK4wyeiQ$(3weMO0EC2wl
pQ3a*e13)lY^@R+-45)T@{y!Fe$^02by7B-3002ovPDHLkV1f$@RILC2

diff --git a/data/tilesets/secondary/rusturf_tunnel/tiles.png b/data/tilesets/secondary/rusturf_tunnel/tiles.png
index dc947bcc58c7c5dc7ac3ef1d10884ff61511377b..913935f77c6dfcc16f0d866fce7c9fd4fff51e11 100644
GIT binary patch
literal 2228
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
C5K#00

literal 2127
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
FV1hwg;)4JH

diff --git a/data/tilesets/secondary/seashore_house/tiles.png b/data/tilesets/secondary/seashore_house/tiles.png
index 695f830374a8770e0e16141e79756a1ea6e34f26..ea48f50061284bdee455b0c21f724926fd010657 100644
GIT binary patch
literal 1280
zcmV+b1^@bqP)<h;3K|Lk000e1NJLTq000O8013bZ00000Ot;ls000EXNkl<ZXo2n8
z&uiOe7zglYr6g?Nf_zzEG-N()hnRqK+)N>c?Xujm+aMP!r-l|rluO47fp~$H;FAs8
z*tLZYcIggsd>^S_)&{bbT5?>Q%)`>Fe_)aJeO}qI<2WXPZtLNFp&uT-d8!|;zLGDZ
z2!k$xWtrv>5`(&qQzg%F1bMbCsB7C*GEK`GLiJTDRiCLaT~Lu@_vd<*3hgshMxv2w
z^{T=?twxYcm1-EYhe1y<;>`g*1{oNaxzsCRVbERP^IcV0)@F~*ZL0@wsy=lFs@mo`
zg~crjwRxrEniy1iSb9kKR~lQPZG-zZcy5E|##d@r`IVIw%9plEl;0|CjjdGQ3ioaC
zT#4t#RcOm|U!LdkJU70&?DeW}DTHlzsV3$4L{vC5BaDRMYSe#5xa#k@xOsanIgZoA
z=5tXXy3LEyd5+hezyFKLsXJ3mNZp{CoVr0ZIdx~M38}k!{xlkmMx)VaG#ZUYqtR$I
z8jVJy(P%UpjYgx<Xf&EP68`WmOd7@nW@jaT<P?!%ydPYQY&HWraU6$U5XN5@;qeE0
z4);wS>O;QQeZ8J2KL<FtC(PS@%HQ|r%Dd#dSdyDdzk4{zgh$h>?|Nh<rahw7w>(Oa
z<I(QhWiS3_QIvmkNbtpol`j@Z+_{(OReXKCyST5s>j~lm&;mnK49_JJV7CmU^j!+M
z+2{Q!!b-h<X0u|)mD;IV#BtPWaaBLpSKqIVHdpHL{(_;e+XmF@mEk}1S2ASUr`6ve
z?1J`36oyOLxG!LqPpbwaP|`sbw3mVi*9)Sq2$00CKqY<Pqw;w!4Ei?@jTHJKB3~eh
zLRKT{3J`WhG}Pw_T(2kY-v{3m`G%JJb9eYoPx0M1pU3M`FlJ_`SS)`?WsG?4&@nyS
z{lgw=Zl*9(pj0tc9O@IRi9-^^cYn(9F^4;76hQF<P>ydXFwHX@ak5{fQYmWZa=DmR
zCX<PAdCw=Ok4B37a@?ZGaLeF^HvWzG!60jju5H`#AtMiq9r^vmR%cMJ^fP1+`p)ie
zBx{rUT*P)i82Y+$+;LkHYtUwnVp_bJmH5La7NYklp|A5b-MWtE1>}wvxmsKXvIVR!
z0c|l4c#i+C-;#Nf%g0mTXqAq9N#IXOZNIuna_=SHe=VHL=Q8Wk>Uvw!)D1w=y+QIT
zu-$c+<G$!bHYjQ)=P5Miu7MQ40FrZ5e%ef-0<R1ZxjwS{#A?vXU+5kkuGtBiKeneS
zE!Heb%Qc(Q>j1lpsI&7pqQawh8h{$)?)><eyw0PaNHQG;Yse30m;tTD7%XH9N&HUq
zRx-?F$;Sy&uF*`=t<P|7w-O+C-A&SBuG0jPX*T0<%`?|f5^vMoJnmpBjVB<L#{N?2
z3o@kc^x#Q3-+~7_l6W1u!lM^L{(!z;xlaaf!Y|@~%HRPDtEfVLRfPh77(#-<17X|U
zfL|@VRwH2jRJeLPOObQaNFs#%E3UqNZyK|4L=i5;Y~2R8!R(>ALC2=KPRCE|bp+E6
z;)r%m6V~|yIE9^WsZb~cF`dGLD2`~PUiv*g#xV{KIE0x#Dwv3<3Rj<Jlv(l(%4Cf`
qLDPsMs=_rO=>Q|>GaL1OPW}Pwu^>W{LWw2-0000<MNUMnLSTZ0UU9Yn

literal 1105
zcmV-X1g`suP)<h;3K|Lk000e1NJLTq004jh005u_00000Bnj3a000CSNkl<ZXo2n7
z!E4)A90%~XQXE!rK)x(68aki0LqotmZl++vc4=<iZQzTYQ$h#B>ZN0aLbSk&@hOIF
z?AkyFyJQC`x{t(<b^&jtmSV>y^U%{z|G+Bk_w+1BPA%J6k9%L^=<(wB(eJ&d=Zi^z
zQPnC&Rr$5mF^v``7)2c=)~;1AQXx|S{SXrYUn(NJJsMQ2+#6>qU>sw{K&*njr{Sws
z*?Szl1OTyIo&o|7cJR&HV*JxuWjuaQ0FGsuhGDukGmKe4Vg<~yC<4aOG$0(lqt2{=
z={g4-Qvl#%rU8i+IJ%BgFaV4YFr!spd<_H;mfq_8V)AJOQ!=lD5%9j91SD2Kb=`>o
zMLA3a5-Vr{=n-I9*3~PBwr(DfTtN)baXsFuf?2>q72t8`UAcm{i3B7d0SQPz0uqpb
z1SB8<2}nQ!5|DrdBp?9^NI(J-kbndvAc6leAbztCURxs3KNxNPezW)oUY=XcI-@>J
z#2W*ChX2m}f%lS#TmYO)iwj}YwI*WYM|>|1{QU+{-C8QY$LPH;*4L*4gN=EBnqFe`
z{=*ze;S`KcCmh;2YAskn^9NFXC#-<fr&jRK>1+U3fLQ!O(&<T{(=qVozC*p)71ZnR
zHu;6rn|um}9{w&qu3+%-Nr3~as{p;8$BsoJz_sJM=GvnQI)+#Y+xLrwLD55iZz=v^
zG(LdQ?xl(@uR$MjxjWYp2yiC8OR?lfk2GavWkp-j6phidtVkT_7-Dp*b>s~YSSK6+
zhq@FH__on#G(XBVvW>=vj1Ed7NfmSv$cqX9$D4f7VtEsA^of{V=;!hqA>dMna$s@|
z`Z<vZfJ+%b0ie$T7uUeyYjA(7ZB-d9r`y%40K!u?-d8h-xBKv^s(!@*{y^fJ(G;G(
zHlyUZ#R0yH@zaSn3gT_w|BR5wUJ!rw1(32_4)EiB8pPszlWl+a4S9k9gmd9v2yhzM
zZg|05wC04keW-j61v}_vZu<x7>2UWMzeTQeiXDppuyLL$Zx6s%Ze4rzD|x8x-@qI9
z^LOql*=rXicr$=*Ikn7zENO4*X>FefAdMYk0B9o6b%7ADmjN=jZlCK*_U=#5_@iFB
zZevIE+)*|I_zU1`d%1bs%dXK)l@0fQZZ^NC`O*+O#B=$Q!jFl-z%?K2IQ9mf>FgS8
z>VN=$fbylVW0c<@5rD&2z~5&IetvsXA0mL8P{@~h*fCy%<V74E5_1Ho0w|6FGA~h)
z0?@Ax_$DvF@y?VN*|jYM{tSUn5O}c|5FTUZSvQr;YP(vqwB7H5*C!{rqN`-Ag#f-3
z%=7WP`Mg@))-(+l3=eYwJG`p`2l{^pf}XPKAL!mtdlK-&l=HA7SOkF4J|`UKdE@^D
XKt&)zflMZT00000NkvXXu0mjfKV<s9

diff --git a/data/tilesets/secondary/secret_base/blue_cave/tiles.png b/data/tilesets/secondary/secret_base/blue_cave/tiles.png
index 207e8d8459384306beb0eb61bf2ec627a49e4a2f..9d820463bc01cd85caeec97f110a318bcc7cff08 100644
GIT binary patch
literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq000O800Ni<00000u5AlE0009}Nkl<ZNQv!M
zOK#*g6ns~(_p`9KfmeNmnN!UXa*+-m1ukY2fTX+~KzcF|Z(GU%)D2!CQ$>B;w!32`
zm{kxh3Qtst<l`$ADSzRS4Y2i5JfdGUA#$zgJ_SL5wiHwls8j(E31(<hXOU!^|3$b)
z{L0@zl+>nH@PC><gq1f%TY2gthct;C+`=*>f;fNG7^gp4LQhKK#A6@!5^E$A5d!K)
ztTl|5+9<WvCVlMVwYCOrjiC)o(np8Eo5LPs956LkW0_(+h_<HEshYU14^vv0#a{H+
z{k$amvMw{Pd&kpPyoz(N3UhG{=Ax;JECni)oMSz(U;*iG$fIK0QeO`A8=}2lncvLQ
z^IBe*-_L#$JAHwoHP@5{(^-U?;+t8$fG3Oq&uGl^hjARmdygn*6`%7cxq!tir`SJU
z=lM50M{&gk+yy8fBE@hHsiEMgIut%8h{kn*Sy#|xZNZ^#P_aEh#qEe*9@$l%drs`C
zUZG`wzXQIX_xA<Qzk%IuH^Ju>c7(Epnia}xDn)sz2kjwHYmPeAK%F}3RH;+dBjLoN
z<juO;s?!&ZTQ>~S4G$0Ue1Cs0f85>O$+z3vTd8kuZq9ha(3?Cz550i)AYgnFaDNfd
z4%}9Oxw%PtY0bA{zRni?jU$rrJ|89IoW%Le%ro+JJ}&uc{wMyjscm#2$dh94*CQ;l
z&oF5l6ZCRy&-IdeiYs<O+DUrpumWH4!BI4MYkw`YYqOq<5-H`V3k1Tedc4mgP~#Qa
zD!a~8YRKqy7Ebg!I9zP#aF=)d4A{A>hySP^I6C0AUsJmtS?;p`l_RF;iZzenicVe4
zL(|p6hdznL9u8rlT=m^I`U{uz*KW`EXX|gXUW&Q(MSpf#f5o(pBsYYb&f15_ap`}l
zDdW-;%VE7-IwqJe1j_W`)K-s^KU))R_D<df{?wzxbg@mJJa{$DypM=XJ#w?hD3v`y
zYlf9f4S11z8uoAEkL!7P30{x8oIUh9PhC;Fo_aoET|C$C#P#cpheK_&$Zl9JEbn!I
z1;Qi`%l#!>(^X~Ys?{@!uD7N0SI`<p>D>kG_3LhR{=bK<_s;*}zYW*-M{#8WZd&;R
fUfDf`w{hGbx9EhCeRr1600000NkvXXu0mjf;6J%E

literal 904
zcmV;319$w1P)<h;3K|Lk000e1NJLTq004jh001xq00000Id8yY0009|Nkl<ZNQv!L
zOK#jS4D}V7eHZDr$ZC$zo+?M^MN&|P7u^&P<!lRB@&L_tJUxIN=nCm0DcO@rvKbU8
zP?R2yKA@gS>XB}qAPs~d?D6NkDLIzC6!jS>CK7FJ9jQpO0^Cwa$&<sMD-*GbA#w~u
z8i55JQ!DGpu)l+z0Fa9~#39<lz?k4jpX3SNjg#qMJ49d4Jh%(uySz1s;=E2Kmd9<O
zg;sa){xbl#hE>J!<nJs42QfDdzUDyJ8-O^ly+@R}kCp>E5Pc~a!8y%AS+4-EIlyp1
z;`Ofg>uw}(IXDZUEhg0iaR4q18ZYx20~~ddg}QF4gx4IvLCFB7;d2pj)SvR;1;9Md
zs%!v=SEhXh7zDdj9*}V11whwzsue&oa1J0@Fzc_I2Q>$jv#Lc92F(C-)YH4&PJKrf
z)b{Qq1UD21a-KyEp!aF74t%cwcH4gAK^3yJ%=sBWqBzU=gXH`t0F>)q^gOt*0Vp&a
zNSs9#AROqvj1`~|?(xMfP+)c7k*9l6iQJ6`%4IAO?2PhVUU`seeFx`fIA7PZ^FB-f
zkTD_`s~y2^MwYGQ8>{!oQp^Zosp~yC6!++DR6giF4`SCXbc+RkO&X7oDakeZoP$+6
zo|(jAkWsQw_k{prC#5farx}koHxCcTNr>dS%u{``i;_JX+1Gt4c1m`<w0ZcTa-+%h
zIo4RytS>&;$dpcdA?#Kj{Jg%tzPh@4-$sSz8f#plGSNnszTin}z+Bk+!8e=+#z#r2
z+;5Fl?;lCD(W5u|HVtbZ*m%&tQ#lw9DA!o^{)6!V4xl%-$k`*;idlK!dZE#Qj0f||
z1HFF`Xej_`VBA1g`#?7)b&$|Z`{VK8$#~E`=fO1k!6ML_hzP6zEQ}jXcyCi<d7TG{
z+8Mw-ZmmuGl7lXh8;|ncXlh;SSK&1tc#VL5(E{dxftEuqG*AG|$D2HeX1J%kgds1*
zfsF^XuHWQA7#N|^zRSd@742A$C*OsdgSU8qx$BUT9!&;^lgzu*??Sy#{Scn<KpF|=
zUit%es9Pp3{bKtrfF2@)G>fMTq$$h@7Xy@T?k)zX$@qH!|3C;8Ko^(De}F##FqbBG
eF+eVIDZp>n351c-$jplX0000<MNUMnLSTYVwVnU~

diff --git a/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e42fed54187c5c229c51b755bfb039a943219ff
GIT binary patch
literal 903
zcmV;219<$2P)<h;3K|Lk000e1NJLTq000O800NK%00000LOzL60009{Nkl<ZNQv!M
zOK#*g6ns~(_p`9KfmeNmnN!UXa*+-m1ukY2fTX+~KzcF|Z(GU%)D2!CQ$>B;w!32`
zm{kxh3Qtst<l`$ADSzRS4Y2i5JfdGUA#$zgJ_SL5wiHwls8j(E31(<hXOU!^|3$b)
z{L0@zl+>nH@PC><gq1f%TY2gthct;C+`=*>f;fNG7^gp4LQhKK#A6@!5^E$A5d!K)
ztTl|5+9<WvCVlMVwYCOrjiC)o(np8Eo5LPs956LkW0_(+h_<HEshYU14^vv0#a{H+
z{k$amvMw{Pd&kpPyoz(N3UhG{=Ax;JECni)oMSz(U;*iG$fIK0QeO`A8=}2lncvLQ
z^IBe*-_L#$JAHwoHP@5{(^-U?;+t8$fG3Oq&uGl^hjARmdygn*6`%7cxq!tir`SJU
z=lM50M{&gk+yy8fBE@hHsiEMgIut%8h{kn*Sy#|xZNZ^#P_aEh#qEe*9@$l%drs`C
zUZG`wzXQIX_xA<Qzk%IuH^Ju>c7(Epnia}xDn)sz2kjwHYmPeAK%F}3RH;+dBjLoN
z<juO;s?!&ZTQ>~S4G$0Ue1Cs0f85>O$+z3vTd8kuZq9ha(3?Cz550i)AYgnFaDNfd
z4%}9Oxw%PtY0bA{zRni?jU$rrJ|89IoW%Le%ro+JJ}&uc{wMyjscm#2$dh94*CQ;l
z&oF5l6ZCRy&-IdeiYs<O+DUrpumWH4!BI4MYkw`YYqOq<5-H`V3k1Tedc4mgP~#Qa
zD!a~8YRKqy7Ebg!I9zP#aF=)d4A{A>hySP^I6C0AUsJmtS?;p`l_RF;iZzenicVe4
zL(|p6hdznL9u8rlT=m^I`U{uz*KW`EXX|gXUW&Q(MSpf#f5o(pBsYYb&f15_ap`}l
zDdW-;%VE7-IwqJe1j_W`)K-s^KU))R_D<df{?wzxbg@mJJa{$DypM=XJ#w?hD3v`y
zYlf9f4S11z8uoAEkL!7P30{x8oIUh9PhC;Fo_aoET|C$C#P#cpheK_&$Zl9JEbn!I
z1;Qi`%l#!>(^X~Ys?{@!uD7N0SI`<p>D>kG_3LhR{=bK<_s;*}zYW*-M{#8WZd&;R
dUfDh5{Q!NkWU<@~n-u^6002ovPDHLkV1gdRw<-Vt

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/secret_base/brown_cave/tiles.png b/data/tilesets/secondary/secret_base/brown_cave/tiles.png
index 7888f8cc2852ecadf1877f76fedc2150e56bfe42..a1c8bfe72cedc05d8809660e05d398ae7df03d47 100644
GIT binary patch
literal 1166
zcmV;91abR`P)<h;3K|Lk000e1NJLTq000O800Ni<00000u5AlE000D4Nkl<ZNQv#1
zL2~0Z5JfvTh`r9nUOOutAvtY>g9D%;RgISfs700*p#y+6u8{l>${IQ4(Wp{crJ^dm
zqC^nrZv6hB{E3g;fLlMWrYcE+aDo$jBVdUzQD>h2Wn2X(E^3pUe3KLa>rg<osbtO<
zGq6}zX=Yj4f>~O#00jKks$#HWKFwGoC&Od78=T=r#k1Z6mE-b=s|;e&dBhV_0fq^P
zm;j52cMOuzzr)K&%p;PSvM!jwM{zlg2;2$~XGvx|v2tv(ovRniSS=Y~JLECj9$7L1
zd<SV*j#p89V<FT{;+#!Lzp)yKAm>tKDn$if;4&a44H#$1nG;N9#*M;clt6siY-Ftp
z)@ZX};&uVUpOQM%BR4}KvLTOUdq9cbGE1C#oeL0&C4aKN`mt7@!Jk1fpnl)t`?o*p
zxDYj@p*C^M%|S^Ls#au<yF1iwt=|d#CklaYU4gQAUM;J*PFSDd4dr0!l*rZ$PjHAf
zW{D*$^KD$WRo`betV``0726Rwq@IT;;`8bqBE?;2kSO{F2*85hg60_|m_d3LBBTN#
zL0nY|F*AkOx3&UDE`DSfN5%|wzo69swRbcZ0VQgj@Duv`9iM-K&1SRWw=*`x06`NT
z&~^g1XQ0qiSoOyWE%uIfAktbj;Ozpp>graVqSdx+-2y+zS>n^vlRQ5@KFZgJhX?uN
z{{CKGe!9Cuf509x-3P;xJU>4t!LTR6h+hO_f0ettpTAu6)(R%5G&hYXgboRCiP}J<
z&=3;zkXco~yz7OspkMW?)d~n0%|UECCqWe5;TZU~;AclJQVs}m&ImH{iGHIPoMBG*
zuVl`$z!TGg>37uuP?A)GAurr0Gl!mmrdXV~nzZ+BFSW)!1Tr~kaYne)5h9%6e|rYG
zXU_l*8pmV1<`87%YBdBj3HOMe?GYAi6HCHk;mS1W<{TCe5Xj<wkZ-_$0g|^Ne?MP!
z$TyGNr~ozflO#CgR@Hh-_U1&LJylmL+u8fG!d}_?uiVB(9Crp|3({}&zefLq%clXW
z1)ezH)m1kXJUbv}ggfNakEia>1M#}*bW)g>%WJdeYd)zk_#p=rCtUMgmk10|c7S4_
zxDK3wNUK)t$Le*Bsh*%GEGPIDSIn$)ruY-j1%rshxQ&H9Gbfx2g&Qzmo`W2BFr0%J
zhrPShDKe_8ixZe$2aK_!RqQ!Dh=6D&l*HnTa;J&dF^V|{6AWFQfbCGQa>Rztdu(V-
zY&xSScBEZJ!|vL;=lvki3-}W}ji<*q2P%i!-Qzt)cDg{+ijo{XPjL!8C%%`cFOu?Z
z#@6m>3h3WBVjS9@TiYh_3r+P@Y=6GGMA`GS&t@O|?~VR9)BpM*jQX_&p>-HiM+A=N
zex3yH2rujV!T3=J5YxE6=ge1qGSl_!lhFQ#KJML+uZ-KAo&P#+eee7q|7~1XQwQ4l
gM?+3PAKkd_UjioUt`>g87ytkO07*qoM6N<$g6`iTL;wH)

literal 1070
zcmV+}1kwA6P)<h;3K|Lk000e1NJLTq004jh001xq00000Id8yY000B^Nkl<ZNQv#0
zKX&6b5XPAsB(BpqwYTySlG6^jH~<FXdvQq&S){Z89RQSZh23ukq$MY*Ty3#<&z1lI
zKg{0`!#9ip<I05LMC_A9X6j!Om&|M9&@hPFrt_ur{Y1k7NOnHBDE-($kQB4DsvyRh
z=v&LeF(>*LAn5t17l>UOB`d+>+=TO^NGT#t)R66Tme9}pdw`P!J~P~4OqT+J=W<cY
z<5G$)W%J}s_&)%>KLr3boObHqxWEQ?%GJYysOO1FF+fXu1jyY1II#i{E~@%lltl<0
zRr1YA=?4nymd5*(wtE1Aq`wC8UVnls;$vc^xn;LFCIiHB%x?h4IM%4a-ikl(m=Tm2
zAtdLx0~*f>c=##Dd^iR<y`Bu9POB%5XR;hbdHri2qZPzvG0<AL0nGmnfE``|n%4q=
z`v~v{Kx^R+P_5JyLTV;LK_ODsMZO1+?mO$Ia1U_in=w4XW?pRYA>IR?pPzR?`X7M(
zP<JEn&Ep`?tcJOG1B9MOO%2@xf(G9J-VOs&19QA6j5^>?1DKg_n&^*!W<Gds{RWRj
zIt~heJ8?Mx=^fzX2f$>uBf;E|IhIfZAra%HX(95md+?mB*Z@Ec7yylT%ILk`?mk-E
zvXs;_6<3r6s*;a&-T_zbQj7uX1>GmT#=UJUXK=PIFsnuc1%0dsXIEX*sPfRpA&QM;
z0N*wU&>4y$Q`N+}6#(bZy~lbb)>vJGsm3Tne0q9%d3i}%p|Ey?Ln*3?AcD2V6|E4_
z7IdsP%|BwLH84WBhL=BVJW=Ycpx!W_N@dvO7B@AQJS5_M9eW%s-4(M8e?LAxK0G}9
zPO+OHx(m9wsYwwZAi)W5D&<OUZ~%-$560mioCf0yjR`S8gW!BldYx-^xx`dM*g}9d
zhEZmQzE)rBJK#FJ{_-2fuU`q4ss(C*ro|ykZh;;kx0};-=xW%wHS3w19xPT%lmW12
z$jCJ;zzx3gqIzJ>)pCGBkuSaBR5;;LlzDKf|07h|1uGF~zUW(^vEukj<$^Dm2x5_B
z%9d;u|AgZ>J19mHlEP$w1kFdbq-p`<jmWD8joJ!*8fBGk!P^<Nvt*U^qpwN-ncj+)
z90P!~MT*HJrcJcr-Sb-q<b-$Tm3DyZubKfij@lfFrw*8rMAMfE`V!~11BClKfp_8P
zYo}TcK*9Y;;t5iSRJgh9fQ#yjZ`Tgs(|o)OM_&gd82j*Q#-g>55CQ}mlL_8zoK0=p
zQdWB$Z|}m<*KFO47em;J5rAONlRzCXm!t&|7kxP20a^#L4;71VpBMx0PJJ5C_VE+&
oBLHmjneh|wBLLXik@>TL?}HZWu1gYMe*gdg07*qoM6N<$f{IV?H2?qr

diff --git a/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfd187d51a78804eeabeaf5a6c036bc29919483b
GIT binary patch
literal 1163
zcmV;61a$j}P)<h;3K|Lk000e1NJLTq000O800NK%00000LOzL6000D1Nkl<ZNQv#1
zL2~0Z5JfvTh`r9nUOOutAvtY>g9D%;RgISfs700*p#y+6u8{l>N*X!k(YR7srJ^dm
zqC^nrZv6hB{E3fz0-yc7nyMrP!U<0BjesS>M4fs5mvI%GxTsBX@=a0ztV03Srjj{d
z%)nw<rI}@E3ubA}0ub<DtBS#j`7~pVoD7fQZg7Sh70-GPRF2Cdt}=*8=Mhg#1sEnE
zVgf88-Z4l<e}<Qlm`5ZtWnD0VkK%F~5x5l~&XUY_V&&LmJ6A83v05^~cF1G4J+fp3
z_zu#r9IvAI#zLr@#5tRgeq%KdLC&SfREi3|z;!@O8Zge1GbfnJj2nf?D1rF2*~nTI
ztkGt{#O(@(KP7djM{b5fWJ4ay_J9(<WtKSgIu{@kOa5Sg^?j{Ag1>-bK>fbO_iumH
zaUp6*Lv7-in}d=hRISJycXz1WTE7$ePZR>*x&meKyjoUqov=Q^8_L1dDUq!ip5PE|
z%o0mh=G(Y#tG>@{SeM#0Dz+nVNWBbE#OKvJM2fr4AW`%U5P${01<f-`FoX0gL`Vff
zg1D*_VrB}lZ*2vRT>Qu|j*J=VenG1NYG*VT0VQgj@Duv`9iM-K&1SRWw+lAJ06`NT
z&~^g1XQ0qiSoOyWEp|pb5NWL%@OFjI>guyPMXPPux&?lav&5&TCwYE+e3Y*b4-fLk
z{r$bX{B(DR{(wDXx(|jWd47IQf?-dB5x)q={wjBOKYzLEtrbjAX>J-(2ptmO619Oy
zp&=ybA+xG}IqQY8pkMW?)d~n0%|UECCqWe5;TZU~;AclJQVs}m&ImH{iGHIPoMBG*
zuVl`$z!TGg>37uuP?A)GAurr0Gl!mmrdXV~nzZ+BFSW)!1Tr~kaYne)5h9%6e|rYG
zXU_l*8pmV1<`87%YBdBj3HOMe?GYAi6HCHk;mS1W<{TCe5Xj<wkZ-_$0g|^Ne?MP!
z$TyGNr~ozflO#CgR@Hh-_U1&LJylmL+u8ez!d}_?uiVB(9Crp|3({}&zefLq%clXW
z1)ezH)m1kXJUbv}ggfNakEia>1M#}*bW)g>%WJdeTRy2U_#p=rC*1N~mk10|c7S4_
zxDK3wNUK)t$Le*Bsh*%GEGPIDSIn$)ruY-j1%rshxQ&H9Gbfx2g&QzmpMxBCFr0%J
zhrPSjDKe_8ixZe$2aK_!RqQ!Dh=6D&l*HnTa;J&dF^V|{6AWFQfbCGQa>Rztdu(V-
zY&xSScBEZJ!|vL;=lvkiEBF&Uji<*q2P%i!-Qzt)cDg{+ijo{XPjL!8C%%`cFOu?Z
z#@6m>3h3WBVjS9@TiYh_3r+P@Y=61BM%nYU&t~uZ?~VR9)BpM*jQX_&p>-HiM+A=N
zex3yH2rujV!T4SW5YxE6=gc>KGSl_!gV6qlKJIMDH^yx)&VL)9eee7q|83k>QwQ4l
dM?+39`wOaR%g$>wtQr6S002ovPDHLkV1knyB1HfI

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/secret_base/red_cave/tiles.png b/data/tilesets/secondary/secret_base/red_cave/tiles.png
index 5c21865e2ef239a5b70a7861a57600fedb8613df..2652f6bbfa0f4ed34669f48de37c6606cf013855 100644
GIT binary patch
literal 941
zcmV;e15*5nP)<h;3K|Lk000e1NJLTq000O800Ni<00000u5AlE000AYNkl<ZNQv#1
zy>1jS5XXl%An7TRKGi(}Jj;;+UCAK|N;pyQ8i&TGEraCorleSVBa!y@D2cRp@+-i9
zydU|x4GT(zaPgPdJ8OGpejYFVM57ThwlNy<TXyIfPrP)N(7~9qOz1GJEJRd7z!;k#
zY8={c(d~QsRzHIwIqy8-d)K_My<O8AYsW@($v~ou2iq-)j<j!Cr1`?DRBGaM<5Jlr
zNe*WOT}WO~@ByniFO-KoP$iWNjTIOx0>%)MN(>e+)=R9h#@0-ZFo~>*ePAk?1DUe2
zja%5olKA7Y4aqXarL`;X+3_vAmF^|1uoqKcFYH#LsX%6&F`5qq%)<Q<eynt?%dal<
z8NDSB?60-so4MSxzsGJ)C%u-$nkiDixP_3N+}YK&WGXcz(_S6h7j<1zmSyP0$dtuc
zQ%n*h(oU-LVY}>(ol&@?6SGIs3sD$uiYpX2r4ES~2WU(QX}JQEd9Vg~1I6J26#E*p
zoa<Dvo!RMBc`sh)`vUPd=X-(nH!_(_8hPH!L?s=eqL=jOQc|w-q2<9UYeqR`tDG9;
zl$BHFt;$Z55=V12mea&|K%-D@HdJm-PU!OZ_?W&O9Ual-;o%|WPYw=xJE6^{3Uqn7
zsR(8#1dC?`+Y>rCc)HeOWz{#+pyzsjSL&|`9e;HVXR<7A$;Rl&WKlhj@YiJ0`OEQ7
z>dUCH+E_~$jI*EDD3Mh}kq)&3FI#_;7gs4<Qd;s2dT!l|KH`N@XyVxUJlG8_&xu4u
zS-2Cc(&b~ok28#&onq{CF>E(|g|WqZj4fX8wAP`*Nud>P|A}t}Cs*^4{VpH4I#6xj
zI^SPeW`F%lSB&m2U2<XvI5iu+G!4*e@1DUrxv@a6pK7q~-r>*g<Ij)x_p$jK%}Xk7
zRpKw~=Pwnltr{09xmMQ7imt2m&lPE1t%>Qf?tVHNX@3Y<-AAPkdEM0K@O8c*|6@L<
z^XbbueV<;vq>E|1qKjFaQXb<E%!l4$I`i~l@lNP;@d>OgW?Opm9>;k;gG^%#G}~4(
z3>@EHx4V0^)@90-vYR1(yhB_vjo(h=R|dTt@}MQMyoTl;2M7@2x9<L5>=0LyN?-BN
z(MXa?AM+~w#%|JA{)c7kf9HSsw`I5>tKf_P(eoG|q)rbGOk&*1*mZvaf+%}VZR(@Z
P00000NkvXXu0mjfS)s|l

literal 941
zcmV;e15*5nP)<h;3K|Lk000e1NJLTq004jh001xq00000Id8yY000AYNkl<ZNQv!M
zy>8nu5LVxy&E6s1J^2yZXK^wV9_u1Q$5iOh*GO<QG^PNL_SiwB0yL}TjtL+Ie1-IW
zNXc=M#Z!kIbKwt;pYDzyk1ifa3KAeeOaF{j1%td6ytEp80M@0>JtQdxfHQC*STOX@
zqybxb=h3@5G=xRkgeA{ClKlng4geTWo6vb}NEj_SvI^XsHBGBp>k7c-o(C6>edn(_
zR@yIv7P*-*G`Ex$`u-k(8N$k9u(cPOfeo9hI-7GK^AUg@7{9}cxbm6<*Z}-U7|s~U
zL7EQ$&pCkP0>^93$_}d@tma@Zgk>_x9<T%CLM`zk4l$6UhO?08MHcs*1GJGdKtuN_
z2|H?cdGG|F>pD?X0E(A~s|-*x_ELBN%!MZaRaJ>*0M5WZ0B1q1FGmk@4j@KRjlk8C
z0Yopmr_-tUPFWD!i=7Zmog9d<V^x5a4cFqpuMD84ZATtt0ZmI69{~jLoj3rz|04mU
z<L+fYabW}yXmTK6WEB9nfpzLLKqB1zlT!eP;=nz&YgUfjG#iMiPZ3O&@>Lvo5c2(Y
z#&+a<o_EGt*Af8to^mnR0oiqwWxeu6P(i-T6hN={-{UnHy4;P`UicvEShHQ#!x>HJ
zuL#YSqz!zGHb$qnomvNMQFG5($m>i1w&SbMb*E^ylgZ7^wq+ujDq@>kG@i4kJ=(ku
z$xg^lA1!V^h)g88Hu@ZE=;Xs2?GeImEhM{v2Y-%_kB^Ry-Y>mCV~*ALUYMvoa$UHZ
zefG*gvK#8b4ech32`81$H^(aHPf66?Qf<6CEzgHKF!Esa<{in~jq(6uj#bXzDG$g2
zs*R^*`Q;w-jTv}gwoId~RUUK$59IubKz#xTzZYdWo98-EH9;H%DyDpl7L*6oV;;1P
ztu+Ghw~NL1@>}+xM>^3!rLvIHLk7?DAk-_P0PESw;<Wska!>^@&6eMdBHwFy6`tdP
zl?dSP?Czv2=Y7f{CK?EU<l{vics0D9#k;TPu}=<+JjnO@MIN{sDKxmA$Jt^|09>)|
zcix43o-gr$#-^f-tYW;KQKjH<wfipQ^OT2hj|W^xXl%JY(8_Gyx0ve1_%2|&&Ri@W
z4v->9F<pj(0dg#_0RIDkOb(G(fTHM9jXD^B>jVF$IT!%f^qVC1cqqU>q(ys9_cO(4
P00000NkvXXu0mjfQdqM3

diff --git a/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cfebd309c902ba89e8dc986d8d504c1a8ae4aea
GIT binary patch
literal 938
zcmV;b16BNqP)<h;3K|Lk000e1NJLTq000O800NK%00000LOzL6000AVNkl<ZNQv#1
zy>1jS5XXl%An7TRKGi(}Jj;;+UCAK|N;pyQ8i&TGEraCorleSVBa!y@D2cRp@+-i9
zydU|x4GT(zaPgPdJ8OGpejYFVM57ThwlNy<TXyIfPrP)N(7~9qOz1GJEJRd7z!;k#
zY8={c(d~QsRzHIwIqy8-d)K_My<O8AYsW@($v~ou2iq-)j<j!Cr1`?DRBGaM<5Jlr
zNe*WOT}WO~@ByniFO-KoP$iWNjTIOx0>%)MN(>e+)=R9h#@0-ZFo~>*ePAk?1DUe2
zja%5olKA7Y4aqXarL`;X+3_vAmF^|1uoqKcFYH#LsX%6&F`5qq%)<Q<eynt?%dal<
z8NDSB?60-so4MSxzsGJ)C%u-$nkiDixP_3N+}YK&WGXcz(_S6h7j<1zmSyP0$dtuc
zQ%n*h(oU-LVY}>(ol&@?6SGIs3sD$uiYpX2r4ES~2WU(QX}JQEd9Vg~1I6J26#E*p
zoa<Dvo!RMBc`sh)`vUPd=X-(nH!_(_8hPH!L?s=eqL=jOQc|w-q2<9UYeqR`tDG9;
zl$BHFt;$Z55=V12mea&|K%-D@HdJm-PU!OZ_?W&O9Ual-;o%|WPYw=xJE6^{3Uqn7
zsR(8#1dC?`+Y>rCc)HeOWz{#+pyzsjSL&|`9e;HVXR<7A$;Rl&WKlhj@YiJ0`OEQ7
z>dUCH+E_~$jI*EDD3Mh}kq)&3FI#_;7gs4<Qd;s2dT!l|KH`N@XyVxUJlG8_&xu4u
zS-2Cc(&b~ok28#&onq{CF>E(|g|WqZj4fX8wAP`*Nud>P|A}t}Cs*^4{VpH4I#6xj
zI^SPeW`F%lSB&m2U2<XvI5iu+G!4*e@1DUrxv@a6pK7q~-r>*g<Ij)x_p$jK%}Xk7
zRpKw~=Pwnltr{09xmMQ7imt2m&lPE1t%>Qf?tVHNX@3Y<-AAPkdEM0K@O8c*|6@L<
z^XbbueV<;vq>E|1qKjFaQXb<E%!l4$I`i~l@lNP;@d>OgW?Opm9>;k;gG^%#G}~4(
z3>@EHx4V0^)@90-vYR1(yhB_vjo(h=R|dTt@}MQMyoTl;2M7@2x9<L5>=0LyN?-BN
z(MXa?AM+~w#%|JA{)c7kf9HSsw`I5>tKf_P(eoG|q)rbGOk&*1FS>bKZrj26G5`Po
M07*qoM6N<$g183AlK=n!

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/secret_base/shrub/tiles.png b/data/tilesets/secondary/secret_base/shrub/tiles.png
index 2e0a6d028c0554213b145973469639ecc0a0f948..692141b046c614ed2328202e0c7088ff8a331a94 100644
GIT binary patch
literal 1177
zcmV;K1ZMk*P)<h;3K|Lk000e1NJLTq000O800Ni<00000u5AlE000DFNkl<ZNQv!M
zJ8~m85N+SUQs_*|c2gd~J`1g)s~B1;1rEj0gd2&WHz21PQ#=3~)BynS0wO16Kpnz<
z4<mB7EUn0LZR9e8SHQ5R(Vy23BY)v1C%~z{+-2**vgIDIT@$?Ed4X2&d`<AOR&0G%
zLe8Q&;EiNSa<(9$3ntE-ljwbv+`=T#&O!ntxW~ID!O~is^Ip7f9lRtsNU(#GVh59m
z(*i?tglHNhYIZn?kg~!HjFYYSTJC!25P1*5_-+AiqX8=X2=_0mhkmPox&t7siH2@(
zS2t4C&P%P!BpMxR<&a<u^ruVu(+2;dOwLe)ef_!~I&KRzs+D*%m38i{k1sQ{0>*8D
za&FyJ6LG$&PzboszE#O<pZivH2|@1jAWU9XN=OaBV~Gmk$Zz!bReW#N@2&X0_b;20
zTrG|Sose6b`fcXcd`mL;B&pDhB?cvp&m4HQ7)gr5k(e#EFxD+HAN?lw2=I@?XVHZ!
zV6=xnu$@n?8);n|(GPerM}MO&NI2WVM2CPmSJm|`X|@EBYy~@jXZL5joMbj^gN%3J
z=~zLFsQ6<O16%7ry@;Bwo&wA1I$1?N0~Mums|_dx9#k4l>g<DnU{0#maZ9cx#$3w&
zt-dX}E$|C|{{{wwK@UG4U_i*EXzBTD9(aVY1SAKO>_IqdCSomUW-d3Ppe*_pD`_LQ
z8k&=Nbt+H4;{E+}D)-Y5ALR4p<)!?2ad9D^&(F`r|8REpmECmuP|2rH(+7dsM}fsp
z0^5&rcJ?D=r1Rk4TFEtZ)yTR;(L!TLM>M4)36U?74vBy)%?z->Grv&qZ!sE4ejHsL
zRAqwIJyw%G3~V3vV><bg!p)Z<KG+>*y4b1PKx4zY1546MY8;GbJCIO!PG&Q#?q<&&
z#ErG0as~3Q+W=M_7?zoW`DIC_@b8KI3*aC9W!u0roPvKDTTDgIKNr^WgxQcMjV;EH
z(`cxWOXyJ>83yI>b-rMBt&XI|84hpMK7@bft4!4^6fTi8fow|2HL^^oDJHU&*ispC
z#+?FEf)N4KGsI_<!?wI(aF7FK&N7?w2LDdvl_D511^GLBPoI;gXfeoRI_Uz7n2+hM
zFLxeP5BF{Eq1Qj8iPzQ~y3QlZ?G;v#rIa48kon?Q0UN1$!!1>Gfgbt!d%Svsf5&-x
zHwH^|jNI;?!%}|VfjMIhNybBTe+QY8TZbOuO6HAC{ljf78$!l4DNw!+wP1+}<*MxU
zuU6i=T2?iWyhRw0Ttso*e;Pn?q0eXyq#0ADK<M}w622JS%FX1a!mW$X3T+WV%@vr#
zvg7kZ>0qK@Vx@CVEzV6jmQ{oLIevMNYmP&#dLw!ZBK4mnykgWTr;NA8hy$_R;oRAd
zLEhkYHt<EsKh*-LRm0VsRhwTUv}<+&qd+m&?{)v?GKk86-i2a^g&naQ9F+fkIQ6^p
rfB0|1`)n$JFNk9%F92CT@!Y=wY$Z`$LWx*h00000NkvXXu0mjff)XuY

literal 1090
zcmV-I1ikx-P)<h;3K|Lk000e1NJLTq004jh001xq00000Id8yY000CDNkl<ZNQv#0
zKX%(V5XO}o?7G~}+a;}!uzMD59`l~cwVsNUCd4w8T_%OZH{jy|Fpv)bj4oh_EerV&
z*>6BXl-H?TrO3#(1X}oE{(Li-eTU6p(h1{r@SSJR5$|c;nX^${6P;J%_q*Bu0M4?7
zIcF!p+L)@Yh@E4msy5{h0qJ<+COC(m#s(%h(MdY4vH-&^>Dam&4@#4E<MjgIgc@l?
zNMZ~mHUaLjpLQ{C;7Ce%4Z!Dv6A_PJiTX#Z$G0?i3U=JBr!*-Od3_0RgzfCHo4rEF
zCP39CR0iOfSpNWk75>Bef}4y=c(Ex5)C8Y*r}xIeg}lB5G<r1hz&?nJyqCb8l*nbE
z-2{lpQ=|!yO_-X95F8bs8ruYfunXkb*!_|4-M>c@lv2c*?9K&19f0$X#V5xOQS<&7
z0H~PY$OQmLab3OwbXo$&*2noXip^|!kL-z|!0K!U3|Y_+h9D+DY>+@_sU_l~x9Wor
zER{Ha2Hf1-q>WbUR{#ycOIr|rXw%c?Bys=bI~Acin*k{V$T8=10w9DK<^zD{w3#<3
zp6yICh)DPUH2|ErU|s>(HOOJx(`W48_Ov)5i@_oU>vm%Z3Sike)TqwNng9`{chqmo
z+nUVnY5^U399~7D47gE1v^c>}fT_RXg1B?TlRZL6XlJ{BBI^(N`7Syr$)$ECNA(0a
zKp!3wyGO4s0q}=TphD=tKcTMqIVy~D)d>JW(9EnKVE0BlLA*BmdK>|9?~@Kt3<^zt
z9vV2{X=rEec(#6c|NhIDhkF2k<Z<2rfJJxIB=S+a8_%_k%hd6#NgU_Fw?C78h^pi^
z<v<Z7*%PD~xWXuc6eFgJMaahMF$^8#cK&*OeSLLx^#=qeuBF1<4=!xzWF=aL4#Y+Q
z$oU8XG2%=*$bfIy4aSEKU*@(bh5$;l*+2+TKqXCR&<+MT9ATJstx_J_*}eN6_M1&r
zd@MeeV+?nj=MK=M1089V^FBsfvyL?A;0%aPWn{gif!Ke{WxZR(J;oyII8S4qkxHLG
z6UMxyG}Z;efKZS@lvjGvT5HW|f$@~*0WJ$IUX(y+c%26Z5*Y4<Y1%;u@p1HEZSJ1^
zuEStQ_DLmI4Ib1um<iQ5m+=LF+keI!ntxC1k2Vcev^Nz{ppQ@_K9UOJ47eD!s^mWF
zU_t7!N|`DpP`dCCF80?{Pi33{u3<Ot(|%}SF}I9v*1K^<?E(O&2_))Iw7tAoUfdW=
zZLY!zInw*Yl((yGTdYb&5G}Wx(`tLWoW}YD=v)-H%{o|Fw2T5kSeDwJTcVYA!x9fJ
zE*2S0hsF0d*bFsM<2M6nv|oUq0gx7Nv0s3n0l=vpncoWd4~0@uT}s{!WB>pF07*qo
IM6N<$f`rZccmMzZ

diff --git a/data/tilesets/secondary/secret_base/shrub/unused_tiles.png b/data/tilesets/secondary/secret_base/shrub/unused_tiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..461d620ae6b2bde40a91e55fcafb0590780fe52d
GIT binary patch
literal 1173
zcmV;G1Zw+<P)<h;3K|Lk000e1NJLTq000O800NK%00000LOzL6000DBNkl<ZNQv!M
zJ8~m85N+SUQs_*|c2gd~J`1g)s~B1;1rEj0gd2&WHz21PQ#=3~)BynS0wO16Kpnz<
z4<mB7EUn0LZR9e8SHQ5R(Vy23BY)v1C%~z{+-2**vgIDIT@$?Ed4X2&d`<AOR&0G%
zLe8Q&;EiNSa<(9$3ntE-ljwbv+`=T#&O!ntxW~ID!O~is^Ip7f9lRtsNU(#GVh59m
z(*i?tglHNhYIZn?kg~!HjFYYSTJC!25P1*5_-+AiqX8=X2=_0mhkmPox&t7siH2@(
zS2t4C&P%P!BpMxR<&a<u^ruVu(+2;dOwLe)ef_!~I&KRzs+D*%m38i{k1sQ{0>*8D
za&FyJ6LG$&PzboszE#O<pZivH2|@1jAWU9XN=OaBV~Gmk$Zz!bReW#N@2&X0_b;20
zTrG|Sose6b`fcXcd`mL;B&pDhB?cvp&m4HQ7)gr5k(e#EFxD+HAN?lw2=I@?XVHZ!
zV6=xnu$@n?8);n|(GPerM}MO&NI2WVM2CPmSJm|`X|@EBYy~@jXZL5joMbj^gN%3J
z=~zLFsQ6<O16%7ry@;Bwo&wA1I$1?N0~Mums|_dx9#k4l>g<DnU{0#maZ9cx#$3w&
zt-dX}E$|C|{{{wwK@UG4U_i*EXzBTD9(aVY1SAKO>_IqdCSomUW-d3Ppe*_pD`_LQ
z8k&=Nbt+H4;{E+}D)-Y5ALR4p<)!?2ad9D^&(F`r|8REpmECmuP|2rH(+7dsM}fsp
z0^5&rcJ?D=r1Rk4TFEtZ)yTR;(L!TLM>M4)36U?74vBy)%?z->Grv&qZ!sE4ejHsL
zRAqwIJyw%G3~V3vV><bg!p)Z<KG+>*y4b1PKx4zY1546MY8;GbJCIO!PG&Q#?q<&&
z#ErG0as~3Q+W=M_7?zoW`DIC_@b8KI3*aC9W!u0roPvKDTTDgIKNr^WgxQcMjV;EH
z(`cxWOXyJ>83yI>b-rMBt&XI|84hpMK7@bft4!4^6fTi8fow|2HL^^oDJHU&*ispC
z#+?FEf)N4KGsI_<!?wI(aF7FK&N7?w2LDdvl_D511^GLBPoI;gXfeoRI_Uz7n2+hM
zFLxeP5BF{Eq1Qj8iPzQ~y3QlZ?G;v#rIa48kon?Q0UN1$!!1>Gfgbt!d%Svsf5&-x
zHwH^|jNI;?!%}|VfjMIhNybBTe+QY8TZbOuO6HAC{ljf78$!l4DNw!+wP1+}<*MxU
zuU6i=T2?iWyhRw0Ttso*e;Pn?q0eXyq#0ADK<M}w622JS%FX1a!mW$X3T+WV%@vr#
zvg7kZ>0qK@Vx@CVEzV6jmQ{oLIevMNYmP&#dLw!ZBK4mnykgWTr;NA8hy$_R;oRAd
zLEhkYHt<EsKh*-LRm0VsRhwTUv}<+&qd+m&?{)v?GKk86-i2a^g&naQ9F+fkIQ6^p
nfB0|1`)n$JFNk9%FJSgJGKVpJanZoL00000NkvXXu0mjff!i$_

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/secret_base/tree/tiles.png b/data/tilesets/secondary/secret_base/tree/tiles.png
index 83ddd614432dca528ca815d7ef60514e434127e5..94887cc1fd54bcf0956712376c475683222bfd0f 100644
GIT binary patch
literal 1098
zcmV-Q1hxB#P)<h;3K|Lk000e1NJLTq000O800Ni<00000u5AlE000CLNkl<ZNQv#1
zKXU6v491Zg#4gj>os&{WNY3Iy2MA|$fP}-+9o;2`{s8-$l#A5`7T^VJ@+`>*O3!(5
zBt1>?s!Vo97-<D!7r<}7CH;;;SD0(Z@H)IwnaV^u=s=1=`*A<gWK*S4#~gF==J!I%
znkYMmDNY>5O^w{OP_d#UDnd2qN}k-QIE)s9G4*&>;fE(ga;BV<Ac`S?!4E-ZKe$xS
zhjmlzuPPU+?1F{Dm@}1dHXZzA9_q*=*<_S-RLU{eV^G_-J>k<*i$QJEGBxdLqNYJw
zkBlfszivl;Cz(3Nvs^!n<brrL;_)FK@9=M_B#zwvQa_9O>0xfi+(*F}h0uE5Z(jF#
zhy6+3wV2~A?W-{Sa)BROfjK^z2RCg)wryI<+%zaLKVIzbr|Vwp_oc^vM8zjdPGb&A
zG#L%?6Wzy8@PoN*WHV+Om}%AkM8K6YnZdvXFl5vv^IRc4wwombE{vmD!EAnRwv;4Q
zxZq!vh{r4>fBJ30w9P6o+XJ&GiNIt5-V9n{Qh|vzSQKEQR%6{8O`d|?sOd|2jh_<@
zRR$^&{gq*)_8EKbxhi#zu6D7>HX+K&!P?TW_=hWd^aI8}F^k3GV7`Adi!kW<%Qfq&
z=N>0u+mj{+r{dcv_J%aq7VP>4bt&tA#o8&qnfrI}_YV&b^xOUYJ^gZbcSpb8-rk<{
zdwP2632xsJJia0Lehb!eqB1fttLUl*g!>S!sg~G_6wCoacM#@*8NO^Wm$!f+_{)bm
z7~}OheQBUCIF}6uJz`w#$AZ0Z@d=dJKwZ?J6A9}0h~AoY4@E+)Jd~?ASep!g44y-p
zaiVaTl*X9*$X@|}5zlo*JOl-Q4*qZ|X8t(lrZ^fCCuBKGxS~R02$kwAhjL0!nc5W&
z(@H>gBY0w&OL_0dk#FWrOBT=+&rmLt^+DWlB#|_<KBT_HIS=4UTt(O)`oYnU9?B2?
zps6i71OA`_8?*xarTUS-YguD#CayL<;(g99e|2+1P;o+GE1&1|=H_dG6I*o9E^r?*
zH${&|uoo%BT^9N`0ZjPK_irXk0bD?62L2#=s9KF$&FDqd%#r?==I<x5DN;~;D|`Bp
zLC%tKG?qL=h&yj7=#hIGv7rI_7tUkg;}!YVgnXfz!{NSsW+ZdazYco_E;BEyShtIH
zSBG`yR|7~c^ck)BRKmkRp5eD#!%y*A!3jI);v0a4DhpmeI07^w>yNxfg-R6B>-;V1
zC-LTi$XF<D4Q_~+d|Wrj6~i(gu(Rvp-k<f48TT{;Xxj3&p-t3p^H#qOVc^I58Lo<5
z$Eo2k#CHEyl6S@}-pwNY%YKVD<-csMeee9={I|_znr4&Vy>ngkyK>z>0Ipd|a@lm6
QfB*mh07*qoM6N<$f=+-EdH?_b

literal 1056
zcmV+*1mF9KP)<h;3K|Lk000e1NJLTq004jh001xq00000Id8yY000B$Nkl<ZNQv!L
zF>>TK5M2MjR_IL5WQTf!{T2oLfMeA@;LO@k8I{?=lA3`NhZyh!!0-bS@s@KBNMQHM
znW77BAaMbZXaYUm!^0QE0kOPqEu<hJNvh+a1--r!wNbr)r~o0C_Qt{p@7*@e{b23<
zdZrM)26}njX7=ZE1CRxc#6|D%=Qs)lo7>j2XBCwok^P2Ho=3X^AiR=Or%IYqBxRfH
z5oeN{pvmUyr~%CDykd)Jh-4Q4=)Cq_PZa-I=h`9@b$wUI4IrnCmj-MTt0fo+xs+4a
zpRzLUw&p{cy1tGYz$(}P*hf?R<G4YctkQMlB7Uz;*i+Zl(JcpTuLchiqWUC@dQ3i1
z$X`()L?O{r<Dka8V#hdwCt=4f;s|r3c^!CJje$S*z`5T<{m?k5krU__+dQ%%o`cA;
z#yRybLUz^)V11HlXdKi40|3BMLttE4mJAjK+8C$+g#|}_<Ddp+jX)-72FGOELx>`0
z^}#U9>c_{&a&Xq^e;h100+L7;T&|jyxA1NvG|g84>jQplUZ?@)p}!4a3m0&N+&dQ2
zysiHo0M-{D`{spq1ZWua5uLDhGyt#|c{wQvf#xfK_1Wv#yl~~fr-1e2pWQ@#2N=8=
zZa5~Q%E9B#0hDlQ95jC?k39Njc!I2=pdLU6z>+#|%kf;P2jppN0AVFdBW-T)2MU@M
zDufO~#wqGNQVhjUr5?ckbZ9qBd!D9!*q=EqL3tS{EtwqEd4lCoSGIakj<DZAF~A0V
z@p`ENxS10}2eO*GF-3$6y2$p84u*$^hv(<#VKxRJA^5+vGqc%A&!wzr>QBf%jXhSI
z*vICDe}5_QTaF<m?`dD(TOKvJ1RW?Rl@p^5KtQ4}EOgMk@YntQ{oUQ&&#SOm5l-Kt
zq%mTlx`=`x9c#h^9VCyjj?D{yV>K{-70Y6x%hMhgl6eIOrUQ!j^#NPt3!bB|bl`vZ
z3GpM(CS~WRn%2*pvZ`BO2;N4SX91O=_6cR4QCQ%GK&C^&X<WkLt~x*+4{<5=0M=&I
zYgEffW_YUykU;UsK~cc*a9WYal&(7X%wf&|8O~r6k~?oZnDAm~@pUWf=7npmGld~f
zdwjwRR<`fL=1qtZUp!>8#Lai1`g(cC9<iCKgCp6Fmv`j<v?18(xAhZE*Y860b;#bC
zo2w3vNMl4vFiq`SFak?=>~Fpc)z@g=3er^vqNr*Mx+j!}lL^D{tv_}*--Vlk@8PDg
z>fp$*jC~i%0P>&<(UG=3qH&PS8n{@o`0{}`?6mTS0cr{T4)84il)*>hJHWR9;CX8w
a1^5q_TS{`tR!Euv0000<MNUMnLSTX$f%lpK

diff --git a/data/tilesets/secondary/secret_base/tree/unused_tiles.png b/data/tilesets/secondary/secret_base/tree/unused_tiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..567cf78000d3aff4c55c91f719637fcb7e104d63
GIT binary patch
literal 1095
zcmV-N1i1T&P)<h;3K|Lk000e1NJLTq000O800NK%00000LOzL6000CINkl<ZNQv#1
zKXU6v491Zg#4gj>os&{WNY3Iy2MA|$fP}-+9o;2`{s8-$l#A5`7T^VJ@+`>*O3!(5
zBt1>?s!Vo97-<D!7r<}7CH;;;SD0(Z@H)IwnaV^u=s=1=`*A<gWK*S4#~gF==J!I%
znkYMmDNY>5O^w{OP_d#UDnd2qN}k-QIE)s9G4*&>;fE(ga;BV<Ac`S?!4E-ZKe$xS
zhjmlzuPPU+?1F{Dm@}1dHXZzA9_q*=*<_S-RLU{eV^G_-J>k<*i$QJEGBxdLqNYJw
zkBlfszivl;Cz(3Nvs^!n<brrL;_)FK@9=M_B#zwvQa_9O>0xfi+(*F}h0uE5Z(jF#
zhy6+3wV2~A?W-{Sa)BROfjK^z2RCg)wryI<+%zaLKVIzbr|Vwp_oc^vM8zjdPGb&A
zG#L%?6Wzy8@PoN*WHV+Om}%AkM8K6YnZdvXFl5vv^IRc4wwombE{vmD!EAnRwv;4Q
zxZq!vh{r4>fBJ30w9P6o+XJ&GiNIt5-V9n{Qh|vzSQKEQR%6{8O`d|?sOd|2jh_<@
zRR$^&{gq*)_8EKbxhi#zu6D7>HX+K&!P?TW_=hWd^aI8}F^k3GV7`Adi!kW<%Qfq&
z=N>0u+mj{+r{dcv_J%aq7VP>4bt&tA#o8&qnfrI}_YV&b^xOUYJ^gZbcSpb8-rk<{
zdwP2632xsJJia0Lehb!eqB1fttLUl*g!>S!sg~G_6wCoacM#@*8NO^Wm$!f+_{)bm
z7~}OheQBUCIF}6uJz`w#$AZ0Z@d=dJKwZ?J6A9}0h~AoY4@E+)Jd~?ASep!g44y-p
zaiVaTl*X9*$X@|}5zlo*JOl-Q4*qZ|X8t(lrZ^fCCuBKGxS~R02$kwAhjL0!nc5W&
z(@H>gBY0w&OL_0dk#FWrOBT=+&rmLt^+DWlB#|_<KBT_HIS=4UTt(O)`oYnU9?B2?
zps6i71OA`_8?*xarTUS-YguD#CayL<;(g99e|2+1P;o+GE1&1|=H_dG6I*o9E^r?*
zH${&|uoo%BT^9N`0ZjPK_irXk0bD?62L2#=s9KF$&FDqd%#r?==I<x5DN;~;D|`Bp
zLC%tKG?qL=h&yj7=#hIGv7rI_7tUkg;}!YVgnXfz!{NSsW+ZdazYco_E;BEyShtIH
zSBG`yR|7~c^ck)BRKmkRp5eD#!%y*A!3jI);v0a4DhpmeI07^w>yNxfg-R6B>-;V1
zC-LTi$XF<D4Q_~+d|Wrj6~i(gu(Rvp-k<f48TT{;Xxj3&p-t3p^H#qOVc^I58Lo<5
z$Eo2k#CHEyl6S@}-pwNY%YKVD<-csMeee9={I|_znr4&Vy>ngi`vZxBDw21}V)Fn1
N002ovPDHLkV1mQ}5ljF8

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/secret_base/yellow_cave/tiles.png b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png
index e8386a804a80b81ed57f0bd1555b81abf32691f4..b171b5ec62d82bb2bc72638205700f636a19cf98 100644
GIT binary patch
literal 1127
zcmV-t1ep7YP)<h;3K|Lk000e1NJLTq000O800Ni<00000u5AlE000CoNkl<ZNQv#1
zOK#&v5QZx^h<yWlF{|162+2i~MHPqEx~dt>nq7itZJ8IK0BY8OA!;>?B!GCQ<S&Y{
z<rzPSK{f$GKtH<4R<j;oRg?b4MKfgXmDHTFxRWQ(<k@R-kI{YHb5E2!Mmgn}8Wo-y
z_aHedlPgbR48cxHn((v|t*NR%gjC<i+;u4@CkqQW!88sdSyCcq@uRR!Hh((U43FGz
z4u%(S<Zy3vVHoy3;kTus?>gFVkAm5$bf?0QRv?_HYeP5*wNf)=vxWsp$y5{GAwJpS
zPvXb2VXQ;IG7HSrG#cp->!!br_APqY$6=qAkj$f$m|{p=Xi3{{(^Iz@2I_VY3<mlf
zvYTWVTkYrPcV_(N@;6s(iWS7NlGlNhhZy4?B1^TZAbx-go<jl}AfO~{nF>WX5f`N#
zPb;nTM3SaS3N4h{vMs5{HEUgDe@q$6of21guVh_OvJV;Q#yu%AOv^e3(GCHVWRdOy
zqX>KANC2~wiWE<|YD0pn7D#oH0T;OH+Tcp7TWrt>X;mkZJ8+doxD+AD!JkIJe#Z4Z
za&>ieke?ppDg+Ldq^=Q8_~sY}tU0jth;xc82;kcF6RdlP4v1+kH(LZTu+3#~3b6^U
z8zeMFHMqZV|Ldea{1Jh1YPkSwMLfk~zsW~V?_KCqyz*nz?;`5sdU*eye!aZBq+c#B
zE=bPL&q;qcJB#|bkNWsC>f;ak@&$rr?+7d25!M==o&8vlm@xX#oBk$4T*P=oY$!h!
zU?ChM#l0+C9-83X{_<x1PDR{?En9(AZL*O+G#&%(Ti`@313i{#f?x6C&+rocsuOi=
zP%N>ttuU<&)77{=_RCsfQ(3}QOs%*@lU}ZviU$5-pwvWttaynB1^)J$ziY_4f>h1R
z{@O=KvkJ+JT?7_MDb%9QqwGEE95Ij@&d3tZNV-L$M0?O=i^$A^Pzs-;@)l7Q3*;j$
z!t?7m9QYs>z2wFIEIGPLO6boLeO%@F{%i#fO@oc#G`dvq{A9_*Gg0mM710X(3D2G%
z-z%^3mx4b#@Mq}%a8QFk3;rxl67ZK4M}isuMwYM+q2HVcP}_wd><E4&U{8G{U_2Zi
zi+G44-VaFQuJ4h-{>bUXUq13@2ma8n6#Z(Ah{2ZpEq~Fks^|D?v0vZ9%f3ZY`Z!lN
z7*f}dJrNe*wK)B%c-snbNe1AuM)QrL<ES#}(4WUHx?Ot{_2KlprIG9u_7yN3q3iI0
zfOlZjnC|JW0W?)}+f&o%b?`h^Z5eD#XD!=uI$anfVJcBzFatZGE0>)f&X0s<hbk+3
zJb>W87?q>-h~MTReh3hD$?(^>e(n3fj-2L^)0g-|_Ho?Bx{CGrPo_~U=;XK8T|IRE
t*X7?n_y3pwro8yw^wr1H+;ubG`wv9fMC)j~6*&L^002ovPDHLkV1f}GA+Z1e

literal 1127
zcmV-t1ep7YP)<h;3K|Lk000e1NJLTq004jh001xq00000Id8yY000CoNkl<ZNQv!M
zv5wnD5M}-#zCXAWuH4-xBtMcAGc-^2%rbDzUEy3y#~+{o%C&Les&Zi)5dX<}v&*Gq
zmr7v-$Pm0Exx>ddGjC>9eS=jnCmMoxo<k5jop%A|=lL8**ucjF@saF)8jmsgW4$T>
z_9jg6CfS*m--nR=VMI=dgf`LMpXcO{^%Wqv;OpS2W$ElB7dpe3)AvVGF<4fz`_nv|
zzpY;YeCV73bZ<L50pQ{Bbe?hmAqD4xG@}ui&EM890EowX0YE;8owF=t0CH*F{?Isn
zFaXQgcMM)|hbUJ7;!xvZ&R_ya=Bcp=X7ji8YX<H|0JE40a9X!-fC2zc<$eXQJEdy?
z6ar<9DFa=h;Hj1dr99^%yIe*yQvopmBp+5XIBAMN+T9<E)t&)xin;)<01NsBfS<*_
zVgSrN7XS$&CMGOBSr``pMF~*p6`%znry&#QTmkT)usH+3D5$S503BGflX9?^J#ifp
zfoBfs?T3elkSN4xsxj$Zg#gy1eudDtp4mbeoOQ?rz<J*sC-DDjg}4fVd@ZcC<U<8H
zAPa##uu}-X0|0>qC*zn>_~fqutXt4WLz53itez-<0RB5J0PuldGcG!~B(W2OjVeSl
z(~h@9a6Jwk2@<?S@PJA&)d|46m%!Eg+}|&(Oir!Fx!;G>*X?d(39QQHxv<oMB|>P#
z-c$81J)ghed&mGCv)?>VjKPBX4_a@v-bs1RNKfc=V*unFRh!)3pRK-V`et7GeQ-)v
z|3P#w+dY-%&<f<i8^|74;;P5_&6`i3=Fh3VEM)C#{SF<ViX296weBy^Q3OlLhp-I4
z>aX9Dy|(%?Nn?)I?}OT8<1l0bQl4|BuqpGQ`t$z&{_gJXwbfUIjtkRyG6JYSLg5~|
z!1IH?13;H3Y|4D77;ghZt-hep6o4U(R>y;vc28RX9NK;lfNi3%S?7WL@(T8AZS}Q*
zvH+aO2w)Bj#9OKN0BHN(Z%*uX=J#0UL#4HilP;JJ6!R+Q>U>^xFj$K!O^49;DrZuo
z&>T@h%zmOu1qfXok`A04Gr%cMsSG{G0Yvs9&_#IeAs{$$Xd+pMz$$DdX?|uMXkieG
z4&s1<qs2a|3vIuPrfWi~lsZr#SCzibI#5a}z`$UYGzTIkqDO|INZ0rBND2zg7*`$S
zT)4CwB4}(I<9wdu1Rb~*PUs5cQvg6U^w1Ea*iD>P9W2STiR!TXjTXVl`cd*67;%aD
zN`qiH;8ny6r#P-UD18l<s!D(3{j=@Ihm>Z=aGrP^8tkqJknBoKZL1EJEs9MCiUdc9
zz_gGEKnJ)?n_IN~6#<rcvFgCStEhwxi*Gkrm5K?w8K5Qn9>94!z_J(q5AbgQmfbkr
t++sf;pls*=VSw_3;%0#IgW^_ze*ls8MC)X@VC(<@002ovPDHLkV1lS449x%l

diff --git a/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..f825201ccacde428abdad0080b80533bffe1f1cb
GIT binary patch
literal 1125
zcmV-r1e*JaP)<h;3K|Lk000e1NJLTq000O800NK%00000LOzL6000CmNkl<ZNQv#1
zOK#&v5QZx^h<yWlF{|162+2i~MHPqEx~dt>THS(YZJ8IK0czHPA!;>?B!G0M<o_wk
zj~PFNK{f$GKtH<4R<j;oRa5@PB}d4ySMn&5trRJ#WGT7Kr4)|tc(0Tssc@82<}{=#
zS#b}Nv#S)>NkSpm$;A_%Hs*6_<{v1{H*)N{lv9zQ1)5-*(nz(GMAgbcG$xxr?QMof
zrCjX|ui(i3-sr+^w;cq(wd{tzm+kr>m_3&Mu_&Z7h$iVfiYAlJ<_cNe!h+-y?g{U(
zGTBm|#7}LdSciaRHJIyZG_u^UoBlT1HydD|(mt;tSx2cc#Za{JTGst)kbbq>Nxy+$
zu#?Y}%_JLcwLLz+N5=11{*INHVg-rpQszXeP(pDJk(If-A%1`ho<j%?5O6V#ER`di
zh>J_+)5aTrB+1hxl~*oZ-PJPSI%*xWKc-CW#zh;v*Rn4q#fOY^<DOL+rez<482f-(
z3Z}clh+$941gI8qv+5~V9fe$VK&rP4xWHB4kt=Vmu|aF%%{+<SfU7jZ<p@b8f6jpY
zjO%;k;^Ja2Ki$g(1rF8X#TiccRxl*2nb;P_IWY?cxHiKC>lWfW#5C8dHG)WNb4^Ym
zF~N0(gmN?o_gAI-^{76|0|MhTas}2ZKE>j4l@FZW6_ZbV<ww@<jP-H3d;ea3JwHE}
zU(U|X#7<97#eX<CVSU`OKK^8V{2^byK(OqcV8uJZ+K`izA1kpiMIU<8-xP?8g|0*c
z<>v-0OgVDg%ck|d2_D;D-mKrLh&$S{HdxiA82Llv3DCX<PSPpRQ)3hSikI>XFYH&n
zdBFzN0z1bN(<U%oj@x6u><u=x1zg26s%tdq#Zske;V%X*E$d^c3p}Xsx7Yl=h1@of
zrhVDp_y}p2lswxout-Yf!8&Kz7uGpqU~@QQ3piux8i_I=KvT?^nVFyzKC|*>tcn@(
zk!JM#l81xtCD=<|?9Z0jRZ>EKHuiD1=lgS1I5Yz`f>U-W^894U#Iwk};8(E~lqWow
z{P13TmA^#(V$WZo|HDBie?k6&CkgmVjw2yLf0Ia9htRJc2~gWm5OxHg3E0ZO1dNBn
zLlN&-#M>RxxETgya5!)}@s|($#hyR(D@VV&MZ{oB{+2)XtL8cWI_x)e@N(#ol!52!
z3Pb6Ku_wX;ycVZl!?!IFmlOalJDV?yPFZEvqd$*bbbVV|)<==wBaLJy+E>AFgs#U2
z0^Wg98@`pB7SJ^9^&oBQm*jb@+L~-kXRXF!I$abbVQMTen1P+pmFwR3=SM=bLzUG7
z9zgJ4jOx*P#BX&UKLiN7WcV98f9?Aq4xHwZ)0g-|_Ho>CU8DZ|C(|fFI`!>!7x$h2
rb@{i?{r}~^DKCCEef9Bl<hp+V{Td|;RdyLM00000NkvXXu0mjf&Ics1

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/shop/tiles.png b/data/tilesets/secondary/shop/tiles.png
index 31e3c53191bd7302f718dc4b27b7e036237678fa..f253a2e53538ab452de0184e377747f0ec8ea10f 100644
GIT binary patch
literal 4416
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
GLSTZ@KZ)W1

literal 3872
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
Iv0^6u4{PJXIsgCw

diff --git a/data/tilesets/secondary/slateport/anim/0.png b/data/tilesets/secondary/slateport/anim/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef62c41431483083afeb712f971a5e1b94705f51
GIT binary patch
literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsVYww#}JO0u4gxL9ySnRxe$FY
z_f!dIg^YRIo8*{f!4nTLnc8!_e{_yXcY<JDv880s?CXE(%N6cAJmZSu`H=W#;x~V{
zs+kh+{g?cxc-?v=OFPg?d0K(++zqaOZYhR84CIXa5f)W@`@_qYHeHcL-+HTxM9wT*
d_)^>F4`b`Hn3hwkP3MDL<LT<>vd$@?2>?)cMri;5

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/slateport/anim/1.png b/data/tilesets/secondary/slateport/anim/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b926bdfc1f0b0450638aa5faa4575fd8cee9a65
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsTxlg#}JO0re_uTm<&Z&F6=zy
zHKBCEo5E`*5AC)-2vfMh^4arcY=Oy7@t<ika+@lj{h!I`$t=m&w)R2s%8vK8%6c~i
zPEQl~S>k+Ixk}<;f3mZE%uy3g;rz=F-^^XGbjhlN?i<ck|GlA6Z?bdky@2Pk@*3Iq
fI+CQc^b;Sk=S0Rls5))00&<V1tDnm{r-UW|H3UYR

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/slateport/anim/2.png b/data/tilesets/secondary/slateport/anim/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5974f10582e15956a2b41e0070eab0dcffba529
GIT binary patch
literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsVYww#}JO0re`;D9ySnRxe$GD
zt#|n~i$;@q9@;Ak7CLan3*0*T!0m(h2ac>dzebbwJL|tcd?&kzL+-=BI}cQ2KYVxH
zsQYN5!`%Z~+TY9sr(N!uq<+vw`3~2#q)=vk(?9N#Uy2Vn{(0;Y@x85Jmcd1zSSi`S
d`2zM$kGNS@#&+Gfbo&U%HJ+}1F6*2UngGyTMrHs2

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/slateport/anim/3.png b/data/tilesets/secondary/slateport/anim/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b926bdfc1f0b0450638aa5faa4575fd8cee9a65
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsTxlg#}JO0re_uTm<&Z&F6=zy
zHKBCEo5E`*5AC)-2vfMh^4arcY=Oy7@t<ika+@lj{h!I`$t=m&w)R2s%8vK8%6c~i
zPEQl~S>k+Ixk}<;f3mZE%uy3g;rz=F-^^XGbjhlN?i<ck|GlA6Z?bdky@2Pk@*3Iq
fI+CQc^b;Sk=S0Rls5))00&<V1tDnm{r-UW|H3UYR

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/slateport/tiles.png b/data/tilesets/secondary/slateport/tiles.png
index f89ca2b0ca7e966eca8f5387d896456271a156c7..d8661b99a7fc2790cca36c5dba1f4d6e662e5260 100644
GIT binary patch
literal 6985
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
btm*#(5vZlyjtNSq00000NkvXXu0mjfV)=j<

literal 6528
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

diff --git a/data/tilesets/secondary/sootopolis/anim/0.png b/data/tilesets/secondary/sootopolis/anim/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..63f97ad47716c3c28ee8dc79b2eff50da218dba5
GIT binary patch
literal 1201
zcmV;i1Wx;jP)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000DdNkl<ZNQv#0
zv2G(b5QgU!ba?{no*<{fMb3ID7iyf;D?si=U$M3K3e|U%n8Jkxh}_1F0g<c&?2`S;
z#pWNbEK9a!1W9mkfL!sxIu8Hg41dm2zkkxBgkHbjr(W;FKKi|0pFW)cA5VH8=p%kp
z{}a&rnRoou2YQ1(A!5*}ydL-AMciM_``*vj;@>OSFbbeyh+?<UP`eR=ns3*F#FqjP
zvY=~GNGb~aUy4hAiJ~a5dbN*2K<fMTquy8irs6vweyHAzA&ObcDzoEy&yc5WjO#p|
ziWeGj)wQJMye;Q#zg(e1oVVe;8_rwo@OB+vuc7y%j;j}Synnq}+W~s1&rg`K-i-BT
zU2_r|&f9RdCu}(H=6K$h_xsQ4cvpHk>*cJMvtG`6IqS_>?{`+o>4Eb;aNf<K|60zA
z=PTjP|Ab%ub-la;^k#?tgE2+kLNDisorXdq9tU1G`d+;K*YY-ezilJawuik@^>!Uc
z^`80VN9u8h^6g;U>M>@#V>kMad@GJ2^;9HG4_CJfLWqpSG}Dw#w5N#<ZtpvT)f6(N
z>{4qg*HTiDfR$2pagQN_GG{gE7$x}<A=P3fNy>$M9%t?+nv`2bk~LJ+3XoBTZCw5s
zoMmG{+GQDqa;eD$C&~GNfAwqdw4>I*+AYV&`y%!db>EK+Z*@9(L}oDh5~i9_B5vZj
zHb*!>MT3!-bgt`2rBs?KZb^b<L@r;}l_V7q9G!7ww9`}@bVyl1h5*Pp?+Adm6?tzx
znNXKxyem<;TQe$zDAy@JgL25RRya$AoaEK*5DWFMyjn9#&anon!@X{a<ElWuLh|6(
zlIDY9Aa#rG%6fE05`T7f%oz9R6V+qDW`J8_9DcqZ=k(hW5Yx*57)xl{3ebvwdTOSq
zyqQk6O~j#)T&WdBE;@S27wSA&1MAgV8*&;plP+4WEs`>*Em&(PS`-*u8Ogd3$gs_f
z2V6X8$(rFS_GzpX&D|Nw3cK<ZgIAUHTPu6UsuNgnpVyJ&;K>C;R)P1by&PWZ5rwL@
zWUF}vEGjB1rBIeiaiK%W&56rQkYWUe?J(ZLaY!R3B_pC&C7vI563}pB*Sh4y2`&mf
z^#QkKBHn^_@Q|?sNA6~Xvz%V6=;ortt)}bd?&1j|7*`FScBi_-A>}PaG@s<%`DZxs
z^n$|8=oh*>Jr8s`8VzZrZ_i1~`7KuCoYn!ig=>R1T=G@$a9s_@R`rmEYJuP?oOg{~
zbRANVUkAKyCDGHW@-Q4mOT|wJ-Q*Vghzqs2P-9E7{62#AmZC-pMw>s#-NR-HA%U&8
zWMu5bu}FYB8<E~GqY=A-*NW%QUK?jHBQ#^;c<Q-s{x#xY8_uXZ_=vaa190i|65BA0
zo(7q7F7m+*!L^>26J2u11gq1m8=Hbf=e8bE3<hlvY-I-+myQ9wY#S_S=+T@r9|Nuy
zuqG@azs$P1mUVf#4sGr^Wky&WV^!={6Y_R9a@+1_+Li|1-}#9Ak2morCnR$(udzI(
P00000NkvXXu0mjfDm+cG

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis/anim/1.png b/data/tilesets/secondary/sootopolis/anim/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa14ec04a1b80471384f14081d6956e8ea5bfe00
GIT binary patch
literal 1262
zcmV<K1QGj*P)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000EFNkl<ZNQv#0
z!EWO=5QgU!>^F$g7uao{pnVsg(msa_c<-h!I$J5=bC)u6GmJH<a{!Ax7m%pC+yd(V
zONlp5lVVX6i!RU{K3L)CAI?8RN^agyrgDArek#fJ&6P}(>-RF5Ccq^5k+_ko$@Du(
z@K0a@;8~_ulZi|c0zc(ynq0{bW5`8ZGQ>@Rs|n*Kj7yS4hP=tmyCE<1lJA-K`rXUC
z|MmU#_<IE>;sBfqVD-!Mg-)&Hv{p(~POR2S)~kFipVTTJ<L-)&E6MMQwXE{Hj|j;D
zl^=*g*6K+Q@8^=^Syo?FZ!-kn-S^bHe_QVbGC~n+{DdACI*NA4+biVlnYUj7omvyf
zd&=`%ijP>$i(iL2u)kchj=Nu9=FPdu&voQO9n@P>Z%w^V--ccWi;H{uT+nCTQ?IAg
z{Rq6jkw2LCclP(h{+`(1j{WGEw`1P!mAr5Ecc|kF=H(mE+fZ*qy^MMp^)l*Z)Z0*R
zBPWWUnD?~4n7^L==sV=?Pv6A6{Ofud^)l*Zm-9z#aEMjLgH6}^6Vb2FSKnXG{%ig1
z*x&v{pZmTW<G!H3Z|c36m#?XJKU$JKtC!$4m!Ge`H@+2bp`$Nq!18kSaX~4Sidv>t
z(uEDOu+g7GI<5{OOG!UiE9FsZi5jT1He=jVh?3M-R&3j92_-`6?LmvyTm3T5JuIvk
ze`rNFP%#HUw>mz?WlzCrI#*(Sno2D9R($kYe847O`x<<Hqp`rz@8@s(qMjuhz8~-a
z1}&bDI$U@ImX;_Hw+O7wOYor<KMPuJZPQArjg^{~4A4Z&@^w>dF%iM7cV3+JRvHI~
zOa<r|0bTHo2!yJZ5UL<9Hl?`WOH}TUM2!&RN97kV9yyK%d#RCAg4vZ=Xnx{qL-4UU
z0`=v)evj>%D4|C37>-&BTShTExT~8Pvf(F+#^Fqf2lyn-9H>&j?{Tp0!#tCp_kdb{
zh=8jErr|)O*6=Y%w?yULa`9*)HihKI9HeE@ZP09}4^lbgZLD?TEyhgywqk9q7>C+o
zRXJ%Z6c~NkO66k|$1!sO@a=^qM<Udm)3!EJc!#p$xqL%#)l}helml@X1-A70*fI_?
zxg~TR`L21EBWOF5ST~habx{M`TFTlOlx2pvIHIIE?LJjvh)7f;=8y0U>C~bmT6k6B
z_|ZwgViHH|hDltYQSdZGbj!6k3)W+XFi{?^&9Il<?Lq7<+8Bm*(_I`v1f$iM({Wc7
zHmP^g!hHCATVWD+w-W8_K!GT`*{qbA#s91>c35o-IYx8~ZNqH%VXk7p)HRsc8pB$e
zErRQKI~uzk9WszVMx1V=;b~n53>>bOnnwt3(&Esfp%ohHs!}SRk7xt-$4PY7{U-ha
zV>TcT;OOm%l#@7D12CPP8qP1#sq=+5+;A7i-a7AaM_6LvdF%P{{_E7mYuKY55n7zp
z5P=Wg?(rHfqt6$a_rB%EonUH%>=(9V$O5a&bi6hdMT@GLNgEw(j~r#*ljxfr_0q>+
zC1rp)80v`D5-#qcyidn_Egkc+4(lG6G8HV&v8v9i1G4^n<@V#_@Y-<U{gaQ#|M*+{
Y34h~@&{V&Q$^ZZW07*qoM6N<$g7GweVgLXD

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis/anim/2.png b/data/tilesets/secondary/sootopolis/anim/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..09fb59fbf70ad81c170971b11f6bb97d1cfefb76
GIT binary patch
literal 1260
zcmV<I1QYv-P)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000EDNkl<ZNQv#0
zO>QGM5QXas@|<8aIf3mP*jLcb$$46UW-odcT3ZgFz1gBy0tATcYz?T%b%1ViFU<g*
z_t>)h6VD_Ff<Xp|79S+B`W36{kuAgbgMkb|IUNoMazUJ*4d2U87r=+h)1eIUTLwKY
zPG#`!@(eh?l)>N~zTwm3J#lh=F(k0?;qpQTCpqo|<4%T*JL!X;@}A|qr@$rip5?sf
zIWO@a-(QE%8`u#yz<v(s`Eg+{-Dj(1_o=j^)F%xn)#HZ9ar60&lDqj_$%ZKP{6>D=
z0JrvTF7xtHPnDZHQJ<ivzN_AXxSKCJ>dn5c_X@L|BLiQd$AvGOIiaPywHxWKk+)N~
z=#aXe1L~Skf(le$ht74}0hW1n&RgcZz;(IFz{aVku5%r?tOI(Adg{l}n{jSvG4wj>
zb=2#qx1ipFdJEYz@1A-0%=?-6!n|LY_cQ0Q=R8!8znt$=9pCoL51_Z8-aYk*@;B<;
zQ)<@ZhS+l+d(LC`(tjQ2(ZPkpkKmVoU2jIc8TDo_{ntV79_}Q%E?)|}d^4!y)%T~f
z|JHnWoNw;#(_?>QzF*aQ<(KcNw}9T_a4{bAi2KJ2Z}#?U;+x1l&3V=I<?3Mpn<_+2
z3oFIM2ASCCpS^${H$Ii(qqS0PwU(%XT5EII<gvEG*H&ywT0(`8W(k96z0|Mc+{46*
z@tY*Ng^Jk#I_Y?bn>_{>#TfqcMIo_TTk+9r@d2BB^KEc^qP4)*ug72Si+Yxb|LxEN
zG-&dO!ogP=Q#x!~A#M^_o0s52BXJb8T-i2BrHz$_Ey>VCV)?plw3vwC<ee91y_MFX
zL#76FjDRlrL<B<JNC<Th7u!l)@D(ceTcSaT@xAgZ7>^uVgS|A!DZ#8NEVMs!wI%qo
z+yc$ZXZ;%6HBmx?<S}ful(vduR_Ly7N63b+C>rmNf_Olmq#Xlw0r)izwtX1S<d-#|
zrXM5VYC+R*9~9Q`XOP_#mG7pLLldznBsXRwiAATNIZz*@cF5aW>%?2wO#4)`wj{=(
zwpiCrQjG$muaeY0Msc*63xH2ATCycVL!YL`Na-EQipTN|!Bta-gOvlZ=>?YT^ENRK
zo?H^TiG0>P%Mr94No?9$>ZWXfWg}H%49YS&F7~L{oU|^K7$OpNkMRMXAv-mxh=g8M
zIDYITz?Vqhy6nUW28Eu6h-tZmvtT_u1V?#vZG^q7t~O$?FvgI_&F<m|A{e8FPy1cf
z*rZ-bLi5q*s~S#RT}iZ~4F#gCMx#nb7XMjYuCSU)*+xtYV}mz*_EijUT?@xHFl%L&
z2yWt4-`Hi}Ap`ks#OXE~J#Cr*!{KUac!bbRwm2jVw8lVPT}jRJ5pBT!=tO7T@8Ta|
zvy7NQ>#d1`P8_QYxO1oS`6c=nfqHtAJU{l<d51f~5);o`&-eG=PQ7>xd$c`5!dVRw
z_~`8#kKr<Uy2!lui5qtU*9KWnY{ifXR;NXOZ7PbEbvu$29oimgW!{sRo9*?AL$H!6
zpgAyg#Apc@*HB&;{k>N7d0B^b4@_AI7ROjs$JLBkcf4}D{%3wHUwHrICGtPMi9Y~7
Wo~LxP@{BeB0000<MNUMnLSTZV8++sc

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis/anim/3.png b/data/tilesets/secondary/sootopolis/anim/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c7c05034ea82b816b028eb39b9287fddf0ea9d2
GIT binary patch
literal 1184
zcmV;R1Yi4!P)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000DMNkl<ZNQv#0
z!EWO=5QgU!-1G(F?Gt3*pzzV{bIE{mH=6}?wz7clrp>+hAk?JJ0Zj5-KqBwT9^8K@
z#kHNJ8x+MN1?s~G$sEpb{uz$wdNdl*IANTg#tGMSGX}24<1vkHu76;RX!H@QqYwPw
z)kk3T;RYC8F-8M^KDYZZ+5Pm)?yYg(`}q#|y?~Cf03J(V@!RRb*RrJUPL?FZ{R$9w
z4ACRmmHbqe3{fU5XjKAtCH9KdlRqJ`D(?Be@9J-voR$T9E{oUwU7$!Y5(<Xkg~x?p
zNq`;p9zG%NL3~~Th}&_<ghfi>+j)rJ;qN4mPbrVj&+>Tx{*t<kQY4)Rz~7SnE!khu
zi}RRJrl&Gtfmh%w$L&(w)p^|4>igzA-oL+s{T1wQ$^Mq??+be=PS9~ZI*!}jKkvUo
z$1UIeC;H`I_s18TQKqMp{yV_m68Cqt<cpn#LYF3kIF7z&cmJjOc3fX<y*t_VhCE*N
zchN83)87*QmcxV_{4u^f4ZPw7Nxp@oX^Jc6=c~g4PLYwAXPUBHd&+fiC*PT;TFxoE
z)tc(PloTXjrBuTqkLAvs)udyT<ZGBTo1G*nH}cZXJmi{`+eMNsyr>-@qYQ&x@noE3
zGeO#A8HKvi<bsprJP!Hd*WkFL)xh3Wv)6UG{C;%M00QMt$PD@_VXhf9>~hb!Ir7do
z6eeEMRJW08sWde#NrGfVPG7c-Bo$yBopEHe)6^O$q%0sq0OXo?1i;&dytkfAXlpXw
z)yUlK84XO7>pfpUImFm2oTWib@@iXSq5XwdTL!<b_ds*L*Ht*K3gjCE4}LFct?NK)
z3w32XK{PxfX?!{|#shSsb_UoCa22kzewY>XYXyk;Z2*iVh_(Z?;#W`I9GQ3Xd=L?b
zLU5&a6glbWB^T6rvIcQmtqnPiHj^$|&MlHM$SqiFC|V>KTph`}5Xf+w84tL4Cdr=R
z8}8HCC|Wy%w8Alc#o$$C{m{yuvFjadSm%9YJM`p+A)CN^)kzF5^@KvxTC&Z$0X7ZQ
zjZ#QUCA-k0W^rPb2~v!}usvo29Gi3^uNe_q)wq7FB%slWy>zJ)a})}i`haSgh`XR2
zdI%lmpxOjy*-m$)rzoRO<z{tp1!0U*qfh%&SsYSsDMEbcJhkY=?UaI^?ASq|?POBZ
zMB_g#*ITT{HSGhcg|eYHT<WXf(RD34wn4MjY6IgYOnYHBy+R7^_W`$CNod+M9u0@l
z((o06nk=!8D5yn2jjhS@{RrCQeB6mfn?J}spv@9O0=Hhp$hZ?{A_3jmiFAJ%oj4A>
zgSfo*+Bkz5p&7a3sptCn*NL-jIHT_2BkrmXz^&62wqY3kHOQQEkq>SNUF)gJb<HL@
zR_9qiHU&Ff+jc@R7|0&Dm3dC0Zo2oE4aS0M4{^}c0i|V_P{DJR^>Z!j<8mI_JaEX2
yusFl2IIboXhvUdS^si}K8hHQYBl17~7JmX@e0q$t!&WT-0000<MNUMnLSTZStWNg;

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis/anim/4.png b/data/tilesets/secondary/sootopolis/anim/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..317db1714c5a40a1f0d017a40baf0e7a0a951e78
GIT binary patch
literal 1190
zcmV;X1X=ruP)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000DSNkl<ZNQv#0
zv2G(b5QgU!ba?{n@&Y-vN}9af3Rw4|uh`mq0aWKGF@>51L~d<BB<ldXWWTxqn}0}I
zmK58#1i`@p;^KoP4*%f{e~xH6y_rzLWICPFWb*DD)5&B?A8vs6H<Net9-nFY0hs*2
zJHDF&li8FIG0Q3`?)&SwcO3WgdED3Lee35N@%Ic4j2ajiqCPDQG#-SY;n#aX;$sa6
zS<}6!CDk>)OL6HxQP(wA@6J&RNPWJ4)cb_bRDTA<H`QA)M7<hWW%aV&6{@t2abKlV
z@xmbPa!W?eJ96If;~hFAb~S*!2hLlc@OmAe?xFX~bscwH$L_q2x39MvGoY9H{Dc+j
ztypiBo0Bkb-hs0{;lOzhr@UWrzkjQax2;#PUd4J9>s72*vEGXHeq)u2zHr_@IPc-o
ze<R-qp09*E{}X=s*Y&Cl=&dgO2V;tAgkHrDI}L?FJPy1(`u_6vpS$0I?{^$z+V<sa
zRJ~rui+Wdn`IdUzq3Spok9v$1?>LRV7k(>VLh7kVSYECk7laT6iDjXwD7B|j2Y2>6
zgVhwWq~ca<YWGr7kbsp^<+#TXL4~uLbc~XGi;!-!lO*LvUdNe-Qj>DKNV12D+5s}k
zaEz-SgNtGzNV}q-&^DS}aFU$IA)os-c-qlxVDFm6%Y6}NiSqA9fw#IWA5j>LzJ#S_
zw1_J`X&)VV=Q|2BFKMp(NUc<wI&MjVWJE4s_MIdZ5FDLxWVF-N8+1rnK!yOwHSY+3
zw;g$JJ(<wAWV~xpx!W^3geaGlub>=q>=n+^At!mYZL!e*$g4erKd$#cce&R!IIarh
zJ0uT&FKMmYKx&Kb%6^7y_&3|JU_78t)Gq*A0ItC})DMe_erf=*ybXY{gr@BPt@xv-
zVTsCzWqE8O4u#}O?I?25(M!Hi=gAu6?X@=KG;Ahav|L*xWl&qN)=;!4Ft|37bs>;p
zn;8$dc+rwQ!*}e{*eO~&gR;V@e8u2ZW&P30p0UdU8}9QyavVIlVaP7<UUinkOFg5|
z^_Fb6?to24ZKo8<QYkKEwA`H76oM2ZFl@%+2*)9VC|gEEuUb4m?j)e$#N4{%#1a>U
zp89~>G7)b<J9r3=a_HI&XW7nor02LspRSv`izkR+Ts3@}Pi1jPxuuBaqt9~-CvN8y
z^lZlhfwr?*OEZn{v|Mko8rQTBxGh{8yy23sf`{vRIJSdXTeU%O7v{OKo7^D<`F+6a
zRuVn!IuFBPv~)3Yixs!nM_j1Ig&NzE<@XV^$NAWaMw{QsJ-}uOA%U&eFba0!LL|VQ
zgGld}F^JQ^8^!gr*Txyl2+b%RPd%6C-yklw;fy-NN4!-ZfLo^<Y{M{m8f4D7$OktB
z*LrG7-Ev5Y)n$>#reM*v?PnB&LE8gcndc<#O=rF07%Zse`2tf1TrI<d2Fgv5=US2T
zavj<{aLR(PxWKA7ttM3CY2=RiW7?Jm-aq*f`5&+1Paf%fLwCY3l>h($07*qoM6N<$
Ef?!!oZU6uP

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis/anim/5.png b/data/tilesets/secondary/sootopolis/anim/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0cbfeb57cff3c941397618c313b781c0c15b3f2
GIT binary patch
literal 1248
zcmV<61Rwi}P)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000E1Nkl<ZNQv#0
z!EWO=5QgU!>^F#!7uaB*p!G5BbIE{nH+|9BLI9t4X)_lej5VcR16bs_fJELU6j1+P
za-29#+M*~H4bU7uSmEd&&Obv+KHrSSGP%A1Cf8Roo=k3JG$uxqABoR$H5y;b1pfp^
z0G?%hH5$oiLg1%djVD*~!w_;2H|gWXz}1LxBgRc86FKGm)aM<a^L~1r_rJcs4u5Z;
zB@RHl0haeK7aFyccBPc4j99Letd`kIzNuw4#AWwimy%`oD_LgQSA-BMI}jULsV6<W
zpGk&iS$<c&bswCqJL)~WulEWmp@<cJLXQg#MH}Spn73ozZV5DMMIdjRWtnWgVl}(}
z($}#(*YV|b-i(`kt|RN~px%mlE9!mw7<wuD_CTNSd!IY%b(H#rc%a@|eq-L2{cYLb
zmU$cYqha2Ld7C%#zT4kZ9e+75A3$$Sy*2ex>ZR06sh3i3O}(|W6m6Ney_~;}{pcFx
z?b;79FaNq;O1+eN>G_=Z^GD$9!%`k>y4JNsw>n>ae>nSZ^|xVvyOut8T{Fb}jsCu?
z_iA3gr{2S0N&2E*g4bMjzWUzzR=kIXzNj9H%hl6@QYsO(NUS7t>t$|(JBKt}?L!ul
z+*vEdQELerD77|2+*62>#FbWTj9PqwkZOC-qV-n4j>{kCR*XAD(KS@e0nky0Q(XEK
zoFp?P)+LFAVsFI-r^R_}@~yAI^Bc7Vj&47D-xu{FQUCpb2QX;<ge1p>*JELc0&#QC
z+MIajD+yDt<<{0w3T>=Zw4{e7BFooxrNsmUN0&Rvt+P_+aLAN^4gt^`z7YUlR^ol>
zB@cBWxpxIBcSoW^h;f7RD;S3yM}xgo$SL0J3M|w=akVD+xH$sV<-2Z=?V2FILh|5`
zS~j)_Vs>y>*HdJ}PZW*AnGlcgN$MF;CV<=HVB5!8DnIW5wYUpFUJ6XZfk>?3qnBoZ
z%A3XfWFj_&<i;E%vgqhF8|u82Ir7%l=He{IOuJaJwkRe?ZJ{i4i6sgQu82~)5G3cA
z<sNYH!jdE5E6!=GjBH$vvckE1LvYoU{xr&-I1B<?`h1Lx!%S`oT?M{tUgYrFP9;=z
zDP^^(fNdp3WemzPeOwq&(44qWlo%oq<$&1<jv<Yj7es_t1&$w`1S}?Tu&$rPIT{5|
zeL%PJh_hfFW(X7I;Mx>>+1(z*-lC1ZZ#Uh=5kxRrjX525RbrERClThu=i3sKxVx2L
zrw0lI*-fW~OfCLr^=60FxRGN(x6n4shU@1lcuZZ5iLEfKh1nvw3b%u?+rc3N`D4K8
zHX5E*mB+y0YN>dH;3h5h5e+TT(7Y_9<oO8JV}G2)+~&WEd&HRa2t7D@dm`Z^&QuRf
zXQTS_OEl_y;q^D%#j&@!%W+3oV(xhBx#9k6)WvJqqaENQ&Z-Z<owIwqhRf*rB6H3~
zZaf!Et(X1W77UqVb&(9$rlRPktfvw~4%-7qnfE06W(U3G6s)B1Fb6{&&{`r7dnoUd
z;a*FIysX3Kk4%{e7H3#h=hYr*cfNAF;jw?MzwrLaN92F}DSij#0)>a;x#2AU0000<
KMNUMnLSTY5*JyPB

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis/anim/6.png b/data/tilesets/secondary/sootopolis/anim/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b35ededdb4fc28243cd2354e553dbc952523d08
GIT binary patch
literal 1161
zcmV;41a|w0P)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000C~Nkl<ZNQv#0
zziuNp5XR>f6z2ubc?0_qa<8CH$@8p$buY#SwzjTNFG_SJU;&Yv)__RX0k~wpz5vQM
zTzPFNc22nBa5%)p4=Zyxe?AU}bU7N0=n|x>%MT;E#wY!B1&n^V{6M3NE8yp=OW+!~
z`1OiLqmS3X#YX_!PI0E)xpBYu{Py^J10CZYcw#K)!@?8oJ1wabx0(e0PLb{Ab9^o5
z_ktuo>5nBKKF#k*+%AE;XMf^$yTms56W`R|g0Y-0_Ux~E-`@$U93!J*2wwPG!uT`d
z?m6zB<L)_7cZ_+)m+KIB@OMTX-@m_#&#hve@3YQ(_P1w$3--5Qe+znI<EMEB;(q41
zPaL=7xE;ssek@(i_Qx`9AJ`w`_D^<DoucEo9mnmC`>#j$j2}psbNyB9uVR1IasTn4
zcmVDm_+saw(B;V>hSB%0yZ=_)?nUBZ+ZlDd>+j9c_ig;4n?5ZL6Yk(|7<0qud*`iq
z4_VV3SImxA4+}`8ATcX66{Yr6>gZlQK+lQKsJPLZnw^vsC19mgha`vE3THLxlqC5E
zCSkpmB;{J3+L^~vlXBZcvV|A51!R)(U{^gG7sXVNc11z4sWrLiBsq^H-+T>*9jyj-
zuAaWH%jx^kK?4X>KBF+`tBe_U*sOtF>A5yX-uXar>?KWfo2ZdWQ(#FlBqMS8vJH|{
zgmH4lk<m_5YoL&_fQ%84E8Y<SZv%O6J(<`xWV~xox!W-UOqA<ApFlap*eT=^5R<&x
zG+1bV<JFeIKUX^-9Pf2C(p8asK=9~yl2*Ejq&84jwqr!YCyK_?Q7|5%6SY&o7J#d9
zr}g8sqTg#k%x)rJEJ3s_pcVi0)Xh+NH!BY!A}It{YD<ZWPG0hXI#1RhZmYE+r_pB8
zCCjxXQU<j}YYiof0;6jZSr;Q2ZZqQnmyRUaF?`@YO+nGh8I%==@)d(umGy^K_Ka=s
zV9h%365F9C*9;jV?^Um2c&Wz}Lu<)~RRGq3nxGWQQrRx{Xjq(77lITcGHj3O0gg>N
zQ8tVOtr}cERubSxq?aytVu^!-rat1dOu}8z4n2g9a!_rITsD&}=?RX}=i_E|aRp(F
zqeh?hSy?10H<Tbgbe>pr;$}iokGJd~(q=qvXsq!+Ems??rWNfXP7B9|-f+3EqDR-Y
z=-7Z}ZPXgZAx?T>*S$gt?spNlTS;gdf=9z)v;@9FP?IJ02?uI%pvE?2`F=$0kso)W
z(dI95k7%=un8B@AGYam+smMTgb|T+jM*k3qmzU)Awb#ZO%m~dW9Zx;i&%gc=8MYxu
z-NPr`RUd&Hr)zA(FnSqe&bh>i8$#E5s!QFlNr}~2(T`2RPFJ=aQ;G(%M{Z@FlQ=is
z`zsE{f*KET(9{t}%P_Hq=ep?UTG7YlI<$G@kOg6Jid8YJW>ouO<nH^Qd0QTMU-O9k
bkN?C!2gZS74S&js00000NkvXXu0mjfh66Ol

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis/anim/7.png b/data/tilesets/secondary/sootopolis/anim/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfe698edbaaeee5d72a8ca7ca1c6b5bc5754b491
GIT binary patch
literal 1153
zcmV-{1b+L8P)<h;3K|Lk000e1NJLTq000O800RI700000`7e~F000C?Nkl<ZNQv#0
zv2Noy5QgU!e0hR+-yr)=uDtggGNAP4rBH2c;Xbsvogu)aY6B)&FF=vKvW4#-O7SJ$
z<kq-iu~?jo50W{Y;ryH#(d}e1p=ri6KTR`k>23<#Os7+t+}-}cn9$@SRwp0$znhQ1
z<ii~>xnWF3TxoZ0++Y2CC;Z+(&sYIZHL&{Y<-)hRrv5?JB*f=OKs+$SfNWRuQ(ZGe
zow1_F8hEI&S3ExZ6B4W9GynHf{jIapx?<0D^}fFgR5?aQ#Spykv=S@{z;RC;_r!5~
zj@xs{j8#tI$9Vwanmm4ee_35dEwaud;BU?T*6gYp#Cgi7^HZI%!YlBN<MzLoE?4`j
z*k8r|*6eT1{=Tr6>IHg^+jHFhb^V<<?y2XJ?|&~{uJy-_&8YL!i~2jk-x~e<xaP*r
zL!r-;L7Ye5cfJ2s+&=5vv(D#jSLE@ozl%J6roT1(t;Y#B`eS@~9(dIolKco+(;QbU
zU$2e}I7LBXS!gOs?Wxq!z4*>N-{q2ud#$NGN=Z=yR!TJ<@_gNevzl~Dl6(u3u-!|N
zaw{+G%%Rkz+&+=);6?2LnPeR8s%PV(SP0UtC@8j#CKsI~=W)n4zXs<Wod%AsS-h{y
z<@ck91`w!xMqyA_8B5J*VOM(2&5?ILP@H*5bKNCsrP35wk_^d6oWAUWBo$$toN;8d
z)6^L#q%0s~1muQyM8MlX-dj&5b}bq2T4e5yi~tkm2G18z4l#}jX9<W&UhP^ebf0*&
zWAN+d2!z*rU4!GQNIoEV^hZe>-9}P7s4Ke}qTvxq<I_<v4$z6Z1z-!nHE3sjSXA_9
z1Bm5)1dJt!wg<H0S5N&CnfJ?b6cL9)aHaN?IO*giU#RnB4dQlM8*&<DCS9_eTOwtU
zTeQ|tvPdwxHj#BPlHoEl9&qWEBu9o1T&F20+Bk!>;yHcA;8kV)SjwKU9~^91=VM|!
z)Z~^SL*%{cMGP<XjAH04*{}(~Hc%UsLRu=@#Q`mglbS-1Vnl`=uo&Ukq!(q&NYJW9
z`>~RMMkNl?<w`7ZQP9*!+?Gk`1?^Bns3-^3W;n}kz9&7$HTrzrtS(v*#<*(K>2NBG
zL&_Z`h!36T7L~Z0Q`ECPJBYNK&03mi{HNt+ht;&9W5jLY+E5!V*H!eWx(*c^P^_)m
z!Z^hFAnbNfNWuLvqPvxZrXhF~97apv7J`~Au}`>AiwiZjCCmL0wa59m5{))r$sJH;
z88L%PuVEBii3^c|>g+}CUq&y^1Meg*+g=-IFe5ahbUgLkF#me-Y8%d|2l#|u^%1yt
zy1_OKqkjgOb1w104WVj1HKlIZq{Qm77{;bxryJYNC`AL=BbPGIN!*(r{1v0Ipw>ei
z6m`VaGE8jXxhaOZRt#}D4{Z({vLGxjuqw{08P(}La!<o+-j)a6fBA^~kAKDAMTdN9
TxZ-MX00000NkvXXu0mjfG<-W6

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis/tiles.png b/data/tilesets/secondary/sootopolis/tiles.png
index 5e98668211e36fe26d5b57f34c3a2393d8db2a91..92df774ae79d69808e4541bac883f208ab5e8eb6 100644
GIT binary patch
literal 2950
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

literal 2674
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

diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0ec1ac00ef61a80de155c40c5c84c5dbc9b32ed
GIT binary patch
literal 286
zcmV+(0pb3MP)<h;3K|Lk000e1NJLTq000O8003YF00000z%zki0002xNkl<Z7?q9B
zzixvt5C-sjNrpT?88T!nTk{ymmO59p3V8tYXJjxaqm?$WS{037fqZu;ZKf(W{DjQi
zcQ!33>W|>ZwF{k@$yEzQSGPE;E%mPYBI)~|gG9M%26n)#ZIEY2&YL;U-sMTN5wZ-#
zxF?gp1TsbLfd{qk9?mn<TSunM8UC7nX*jR(f&Yfb^9r8$48SmBKuRfew;jAq>5rL|
z(gRQ>qZviX9~-b<Z4h|2@C@g1vYrI2l;-69bfR=yjFh72a_)P|P%Cn#Bbr|?cv1WY
kX}ZJPhEZCcSJ3u!1s3}s{_?ycD*ylh07*qoM6N<$f?5xJsQ>@~

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fefe45989b4c9176eb9654c866ac22143c18a05
GIT binary patch
literal 283
zcmV+$0p$LPP)<h;3K|Lk000e1NJLTq000O8003YF00000z%zki0002uNkl<Z7?q8W
zJqp4=5QXQG79PM97M5D6$B+%gRt!WBurZbv(O3o}**1{BE9iT>iWU}5@iEN4`Iwal
zN-Wwd(53nzCe=r|G&+`ZqcftBPwp3v#Gc6Rx|2552@%t$B_rTVzI-+u67_rr^xaa5
z^`eq+R{;@GuByL%pN+aa0S9zNw4v(6hn(2_;Y(h=gWaW%W{bkmVlWF6b~|(`j5|?E
zWrR;ChaoW-I@}P>UuW3UYIpAYtG)&GgNPg3AP{dHmExhKN68H3U}wI;eL;`EnHE0J
hn^er%$kYL`(GvxfCXv<{oy7nE002ovPDHLkV1lW2cp(4)

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f603b3046ce797d9f621bcfe57cf6b31b7eeb91e
GIT binary patch
literal 294
zcmV+>0oneEP)<h;3K|Lk000e1NJLTq000O8003YF00000z%zki0002(Nkl<Z7?q8V
zy>7xV6ov0gGIU^sN(_u->|-D!F(Vwu570=>ShY^fh=P)=mI&|$C_TsYhox2T@aft*
z_tTL9BN63}a0O8IfX@pe=QEd|+^;C2#hq~BUcQ0bvZBR1qW|<gUlBeI*Fo$i8ARL5
zljyS#z#j0MAl730!<XOtQjf50c$O`LWEL<Tp1PyYe&N6U(sOJORoIN7po!I%_dccJ
zQ%XBPX<|hvc_2n=4b<37_ZsA#g?z_ql<EqCRf|m>u+_w9%(LvRlIhH}GR4RRBMIh)
s_!rOCEmY0+G2m|=n2V9c4Tw!X0KF+A<o196LI3~&07*qoM6N<$f=e`pr2qf`

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/3.png b/data/tilesets/secondary/sootopolis_gym/anim/0/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a8e6a31c92bdc7b8b674b1697a7499be500d051
GIT binary patch
literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^93adBBp6ht@Pq*=B~KT}5RRG270(|%I%IJE=zGqV
oiZ_pP4t)?&`NndjRp^`=gXtyy*8Pm%j)8P}y85}Sb4q9e02d=1X8-^I

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0f807ef4c97fbddf4116bc074583172e0601eb4
GIT binary patch
literal 389
zcmV;00eb$4P)<h;3K|Lk000e1NJLTq000O8005u_00000(c7QZ0003@Nkl<ZD3P7g
zF>Zq}06<Y+k~L$c4rL6Tvi1m-j}Sw=x2CL>5O4rgx|K>``wH~ih(t;|MD_4wCqLK$
z#KI6uk|bi;c@J?GkrI>wV?^wd(0Rr>i%5o03}MVax`pm5%r>M1rN9_ic1;7e<B*-@
zXJL5_*Ru^X-_f;>t_jO4;=VU`9h>_=YdK`oEWa=&+`1+HnYo0vf;R`{ynV4Thl{$B
zuBzxNOUG(nce`+NSF*XQpo&;1=j~J%(ns!inw{Ctg-8#rhLeM0hQ3&z%xho@xSURF
zI&JBSiB8q3UORQ}?Amp7AKHn$4_#mPBu}GIIZOrE)AK0w@C`lWfk8of7(O`_&m-MG
zcsNS9hb+rP8s4Eh25*V3g>6}CZwqk@Z&Q4wve5ZUH`I=Y=PjR2n(p{_H&{0B>UYl9
ja5VW6kU%zuZj9Xz(zV;LZMe8~00000NkvXXu0mjfR+Fzb

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..08413b63c2a7d011e907886e7a2a2659752ea785
GIT binary patch
literal 408
zcmV;J0cZY+P)<h;3K|Lk000e1NJLTq000O8005u_00000(c7QZ0004BNkl<ZD3P6#
zO>ToQ5Ju;cY_qJC4a-oeQnx)qg{X1>i+G=yvQLD4fE2nbm5l8xxZjv2s6U%_7Egob
zVSm_AL{ZGLjN&Q;Aax1V9uNXhijtSH7f^GTP$_r<MN0j{i}2pKyP(<wLI6quan*I7
z$ehM&-T<#2&<@~1#CjcShSPvIkc}A(8L$03Nc(>Cf^kq#1ox|l%@dsFkQ#B#0O&sQ
zAaXuFx|lv@LC^3F=WBsyPTEZKq6;SVqR2P!+7@2x;5E~qyi0<FsR4Wov<VJqCLq5R
z2g(Z^`-~0a{!{~Y2Y5+24uQl0Ub>zIXNIi-FKtayYWb^ox_Uuc2~V>3Fk-skaimkd
z9pSx?6n20d%!mZ|OY%+VfHimPlJdKCg}6n5Xqeuhs0)6e;7lNStSyygd1RDSuotdg
z=%vRaZgp#eofWu0y!y;BI*t(#tt=T&0JM?4F?k;p`Px<Xajmcb0000<MNUMnLSTaU
C7_#*M

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..6681b5e96426fa1b409afe6581ea9479ee298380
GIT binary patch
literal 399
zcmV;A0dW3_P)<h;3K|Lk000e1NJLTq000O8005u_00000(c7QZ00042Nkl<ZD3O)Y
zF;2rU6vpv)$*hc(kWfa#0IVDVxfejSQePmcS48UO048N4NQwQfV7}*qs9J=?8-8+>
zzZ549B@CsaC@5VpgS^Tp1-e>pSjt@?9b*owjKWZ-wI;Un|GR|lT~^;H1-crr1?i#>
zz&UJENGF6H*jefWI)^!B5TZk8?Y}xa+__94q%Q^`_P|>CbZHYoJA<Y<XWN2#LpGpm
zXLJqblviPH!Qb8XsKdkC88po~+ZN11c@qtl6<)fm%tYn2?gUNct#F@LIOJ%invB^Q
zGGQI5p6ZEohgi#zWqdw7Ga<o{84NmK2hv{qqptJPtsh1*dr<q#<A}SNXW?VSA!AkE
z`8{}J?250zVg)W0wp&$H%0INgPz-BNuE!-a&ZyUWfB2;;>G-D`bdO8N<e4Lqu%hKJ
t9S_)n>#+k4Pb0l3Y)vfzvQfG*cb_7=+|1>N^$Gw0002ovPDHLkV1fjwuw?)M

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/sootopolis_gym/tiles.png b/data/tilesets/secondary/sootopolis_gym/tiles.png
index b2533b24309c2f8041fbfa136f141079b98760a6..4f6b257695dd1fa85cd4c851468d5c1e7459d258 100644
GIT binary patch
literal 2954
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
AYXATM

literal 2780
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
NL~}c{22*n4e*kF21ONa4

diff --git a/data/tilesets/secondary/trainer_hill/tiles.png b/data/tilesets/secondary/trainer_hill/tiles.png
index f5330af84a26dde0cf4ff675f6f588caef4943c5..78d292513fd24cce0e55d3fcf528e1c6646f3229 100644
GIT binary patch
literal 3594
zcmV+l4)yVgP)<h;3K|Lk000e1NJLTq000O801L1L00000&<e@4000fqNkl<ZXo2mU
zPi!339mgLzf{o(PTWCZ!w@9^wH(XNHsPQ@nsC<c+14y|<G4#T%ET~ehnN-5L(fANo
zqD6v9;uNU}l(8LJaUslF22RADaqKvW?cEt)qoCdG_xqcFJF{=rlR{f6b*262&70qQ
z^WMDg`@P?LYpV`EssM)YDT3Sz9Kv!4Ypws&9Kf*@zE-~78nLj(`WE`v=b*k8t6J$-
zpA$FDvKHcIw5%-JzGtZ&^BV9~-9j;E4JB?k#BKGrmw`$pf?UcC3m;|Uqw1^m)c`&|
z>Orkm3$V`j*Pva~wpY_|Y5YLBwHh!q^nmp(s=942b-^RfvC?z3ny1bU4SB&cLU;}^
zU`LmCn0nGw$alKz&?6^ksa#6R#3#7XUEhxZ-B7f6!+joa<L*!dogK{9pt=Jdr8gWv
z1`lt1H-ZV6fJxZq+?uk#aCcRU@41n{6qo{2xi0|?zhXx9Sy6pA>|J%k2J8S6YwC-M
zrl;ChP(c=^09CcktF~(G0NqVXH4<i?vTq6I9JMpQ5GrhEe$hl~$!5y#PT5O#BrX6I
zG})>Q@Sg3aABd{}L|g&RJpg|HX#}~9^F&+);CG3J(z}DVA$eYWLv)phD<e23ZI_Xc
z=Pax6E{m-aIy-!x?yBC7?GlCcN20L)sQ5d(%5P#AonS1NFqxLTHO{io$%u9v*Zc~!
zb`3%|&1=f>(ccybSLJY4w4A_h!m~Y2Y*b|jRXGaZHS`>=%2|u*Yx}>kReNr;0<EE!
zqP3O_bR5pImJ`-zf8l$oGO<I?5NXZ6#rFBA6mKM~&vRV9x*f~~&JUL_EQ|2%?gXQi
zc(@GYwP$3Oc)g4Sy0n%kQM_KQhNsc5;kh}2<K4i7#$qR(LGwClU+L&|wePuo*Of_>
z-Y;EO?;i!sqw0FjD%8Hxi{4f3#%>HRf^<e+Ne17h(MNU9+Q3&<fLy`Zf2Y@*kC6LZ
z86#PuarJR*w~)mO(TFi#tya~mEc<GyRLVz=fA)*S2VHj0LNDm9mEVs{kNVkNBj#u~
z7e5Vi!Sxqad%nJ?n)CG~)vWtmTyev5JE7l5YO$SF2z}~JN8SJJlovp^Zb_c3Bs*+X
zle%x_*~!{1t+KgdBWp>kwU*;v!RR0AMyRm0G%$5<Y#bi$LPln}NEFrwP-3F6Tm(v_
zxXR`7^LwC?mRT;2RVo$rGF$pG1(J&bp=pUa6>()Ds!Q9|=$jH9OyLs%qxBZY@&VDN
z-8q_sfJG19B0SfnavIahYg+GOO$LHgc=;K;JmE&3bvnkZCT?o3udhR4Lx%#HHMa}{
zDPuak6l_jZ)YkNLsIaZAI2Gp!HY*cLS()V`BePrt;`$}9Q6`=#14GZ00leY_{a4-f
z!wgAe-1b;{4-9kMynMmI?f_FGK`K(1mBmi%Cl6Zv_6u3i4@pqj7SI7?!G2`?m2SNh
z{bgR07PPxhaTS0UD(qc7nz-vX=R^NjM1O(85N`yjc%kn!7VE0BV<FW<IGrd=Qjx>M
zlHXW_JGAByU7Jgtw9HI`tKT69Ly<zFFq5zeC&W+}ioCzWdjxzL<mxYDcR&jn)g;()
zF?z~f;>*6uOB4G%X9uXefX$%IuH!~mF+^zE&`Rn{WY&q7og}JCbebufYbW9o9k|!n
zzN=_e0*5#1ERiVe0X<=oN)U(!T|!XFklpnui-x7jzBNzSU8}C|fAy)d7A<1_OT@ch
z&Hy%3cDG%pX(M26*3s~09kIMuuPeuOYzEN|XQLnN{7oC;a#okH?OR3syt?Y*B{~SA
z9mc!969wf%Jz8T(azGqUscQr?GV_U2DFe>m5sL7cky7aO0!PMTKJK>SpgbF29cAh$
z^Nv<4z~nenlRfL;L8cBe?_i}2j2&ZYEPwyuaQ~5<zx3OGbf3TE?mryvKa%s8KKqZ<
z`AhEpBRoiP!t<93`#U~4J{dqRb$RVTT>n70RVsa>yyt!a3=S?UPXV&iY==&3H`orB
zz9}uKec$YJ)$;PPtJJb``S8#r*)NpK$FHlgV`JCVDdOy@@^$qAVV=e13_jWe4Vg#c
z3edb?$9CIU%%+ivJ9FdRes;14yF|NL29Qu#d&^LrEyGl817)}VK$s~&VUw}UDv|VJ
zInqQV3WbfuGAl>Yi{;1`h(uB9@E$;c{Y4-j!!XY80fb<06@i3rhycp!7=|@~T<Y=)
zulxTch`0*G*|Qq0>5wQaNo62X#?9G4VM!_jn9YU?qu{nFz3sOl!tL7I27tgifqVuB
zJ|9pD>ykp^mKsp-?P}oGRpgmA6Q2imNDRWGD@P##zk$i7kZ=@dof=G5Fm~blz7RVk
z1UI?sy{R0*3gIx%dFp0ZA3O8tLxk9m4C4YZ16&~RN*<XX&2-!S8S;5lX6pD~DnNy)
zmp&j~O%J22zjtEzT)S~&{ZM=+jUIi?2`2cK!jy%1gI-``duFD~4i-NT0JC3lstway
z3}ZZIhYQuW+vyakuhVgd198c8)}<0e3iGqL9Q(<i(Qk;ja)Ehn1i;mFK41|dBePr#
zKu+pO>gq}AYJj>LpsrL}SB@Toz%n8aXJ9bM``&U^)b|TaC9nikT`awog_WBTsI{j6
zQDTH}C`4S3j1MV2N-9ZFjv~0gj^cWB+=R@^$4%;w(xaV8Zx-A2>Tf+pq`x~)BmUb)
zn>QLOmL3e>Hr5aFoCe~u78duy2G1=5?8flYXsmStafN8d;ALxZxa+RSLN@8i);zUI
z4_9JwMzTpq{+n4Oc8S7zaCZoRU6ePi#n7lPM?>CT`uihre}<_GGqoRmy~J8Qxd$-a
z#)?4JK?vugJ%CqysR-o#711C4pNOklbs|TeB=Fa&jd)j-k(uK#Wl72%j-8eth%1B>
zW1*9+FDtzkE?X<T_4Uz93Pt=q=UY$$J5Ob#t4G#o`jOLW)K6(m;HUGp-@x*;J@tm6
zTuuo0J;2$14{*0<c(NGoKV-VRPGM%js4oN_E_O2CGN{r-AdP&zy4z8;G=4`^1*dm;
z2HNR_#pn)S`xx4N4IKye6Y2>f%uCq~F^|~)L}<64c1Q$vFsouN9Q=e6;uE$12|x*W
ziO(lLfynJYjJBM~@NmFFs=de!(bB2{Rz4^G8bAgwbEcsCV2{K@ge4B6vkN<K8>=KS
zm_pI^iCzjo#GhzQ2i>`RE+Va|SZfg|M-iM<`V$zz|7nC;TP7R<^e3ku^t*vNX_xuv
ze)SFP5}8qT*tduKX?V0hA+`OO?JKr!oiDOK56-VxsYMTGfy~nv)3rrcHaV|LT&^xJ
zr-OWJKAz^YY2kBw^0fUZ*x!2$-V2~o5OR1{45LL*W~BvyZ?y<~i4^t*zU3n5@6r;8
z|I6K)Cop7W4BCOnvkczoDW)4sUD={K$N}4ooj<+^UCf{hJ$Ytc@FcbL-x-Ry?hC4d
zs-T)huHdSIs-W6me;hJ|#3jbXk-{dJH^ICK2F$(aBRHTcsP@rcRZy)&i(DVol>s!(
z58Iau_Oe`In=6IKGTKb_848g~@T0sO7ddif<jBEMPg$KNb!Cg{AXh{9GIaK_#q+!N
zdEI%wW^Z30$QKix)^hci(VA|a>$FzZBS&y)ROI1%1K+742*kfP$`n@t6kQi`-a!w1
zilO7n$(TPAEqB^=zekh0vWc?$>p-U=`Beemj&l5HdDrFX+E;XcnY$2JftL?leV+wG
zcgXt#!CF{V-a4a$uFX0--7|{zO@~hTMZEFRyDtL%U0{2b!03-Yc!#Kkh)3o{;x4FW
zK{W%acR*DG_lP!=vc@Jv9l+lNrrk}zbJasobwHGOXlUocCgHNI2P%}>EIf}YW0)ib
zP%e*@ir_KgH63`QGVCdQU4`!!FO3kxzJa_g1HA<By{PcTtGkHzH+2?Hs{pFi$x0Cz
z_o}a8JjSaWl=1H2Nkh&-ULmTW8V6Mc#M>PgFFzi<XWgl!u56dWMz_urMuf&^gcYC$
zburR^CkXe?6UKQ0RG)E+Vu4ys>dHch4~y)Nbehza)oD^!c9Y_A?*g97zc1k~(3nQ*
zp`4aIjE>A8F8;_c$}=sGKhQ!OzP}}2?;>z9e6CJII=$%fE^7L#%hMrOaIc(=mh$oH
z9{L*tPH_uxY9wE985Ex98cphu(c}x%<XuoT&b&}njj1y)08?j*=vm6<+7(5nzJ9&r
zIrW(MtI^``<uU8)&coMN<<ZU4YIL)5nvy?FzfmoM==l942cEIiNnny)Jqb**(<g}|
z3}Q|Yl_SIn0!iQmQ8_}K;M6dRpjdxLw0UFV<wxMDM`E8nCN+=1KaV7yT7#nNWrLkA
zfHTzO6g4?TO-?<ICUs?V>g)N12>spUm{&OF;nJ%^j$V4o>hf}i=X4Q3T$98}0J<{n
zL085mdT!j0aqltaWzp$!ggQ7O3Ohoa5UmXp6A{Lcr_<06LqFB&^w&QQ)0@bDU$icz
z&}--LM@%D)nVHLsPcNVEg%iRsnA)DXq-r|&39zW+Ik(gJI+bcMb^ErOWrGqtok_82
zvvdE}livU1Uqp*oiE&$tH5xC*nCqm5J3%Bf?p$wkljQpGUiWg>dA2Cb_rJTOt}K2R
zrW_|iVkhDPt^pqZhQO7n;l~XR`yt}mAxxK3gFoo|@-IsK6U&zTUlA_<3H;;EdQSO)
Qg8%>k07*qoM6N<$g1<@fcmMzZ

literal 3311
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

diff --git a/data/tilesets/secondary/trick_house_puzzle/tiles.png b/data/tilesets/secondary/trick_house_puzzle/tiles.png
index eb81554cc019c9298136bca56517d7da96b2e64a..5ef1bf9ca5741ced07c87f57e4146ab79e6c01b7 100644
GIT binary patch
literal 2797
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

literal 2567
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

diff --git a/data/tilesets/secondary/underwater/anim/0.png b/data/tilesets/secondary/underwater/anim/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..7609cc82a2b5c979f6ab161ed683fc7dfe0cf104
GIT binary patch
literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gscKIb#}JO0vb`I5nGJcEcTVO>
zVPup$!4|P+>DGNezT{1c@~sNp?>xnXy=jWa3NzQ`8WM{S&g8XiT44B4kg;fP>&g#D
zJO6#;T(|awx^&L<<Bu0TNLYBkFhrj7?f3Y-r=oSf{;P}&;ES2oRC?{MnK#e1lo|X>
e!oBz!J6?z%)v&i*w{S~4$T^;_elF{r5}E+i;Y5}I

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/underwater/anim/1.png b/data/tilesets/secondary/underwater/anim/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..64cddd371ad5e1c3f144f282b22abd6036fd9195
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsX9*=#}JO0qP>P(hYbW+zWb{e
z$n$+s5Rdj)p1-oAaP=XTwX-IKP5nQ?xA5>GzUl&RzUS{w9OSJueI)3Za;~xFc+jfY
zE^CVyJC1ujFciAw$ZWqnQQNDvX?vu~<PUpR2~2m(&iMCLUY2`Zc}1OSd~965`Nr$6
h8&=K`DPc4IEdOAFZOMK!rcWRjdAj<!taD0e0sw}5L>d49

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/underwater/anim/2.png b/data/tilesets/secondary/underwater/anim/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff6ff843784390b5219a4aab5c1cefe04694f9ad
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsRmCM#}JO0yk`vg4jb?=JN)xx
z{KLR~qJC9lvu^Ea=gsLFm#%tWxaxe-KIAl`3Ww9{WfzjVPDKVZb6=giB6XhR`j*;+
z`W1_UMPBDh|9QYBr`YjZM1;>Vd&-_)TU$CWO`Z|(sp**Qg6jV%*E^q^A7Ag7v_pTw
j<QZ~oY`kv59UcD|KXqBNbV;Tj0lCT3)z4*}Q$iB}p@K$>

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/underwater/anim/3.png b/data/tilesets/secondary/underwater/anim/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..2863c2261fafa876a2cc28ea98abdb59a690f5aa
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gsd`Tr#}JO0qP^OD%!UHawaYuF
za7UbKWa9a>^IFq7FXly$CTv@xkn#RPWRj$feX|&cmhehVrMGeiueB^Oov?1(-m8ZN
zg`||$ZDcO#Yp6T5;QM8P?(Ita-$G@kIoz*|`7CA<zBljXjRp4~ek`r<d)~Lp?!>C5
jEp<0^(@*Fe==sBZBEWXz`OHPKASZdc`njxgN@xNA3js(w

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/underwater/tiles.png b/data/tilesets/secondary/underwater/tiles.png
index e0569d970d2c9b1239d0501e1c5c8bfe8b79e3bf..5af21f35392d59b3d4c8046756f016966eb593ac 100644
GIT binary patch
literal 2846
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

literal 2988
zcmV;d3sdxoP)<h;3K|Lk000e1NJLTq004jh0096500000n_|p*000YfNkl<Zc%1E-
zO=uiP7RTop?<G{p#-NL->QM|{mM~o{0)a(X(<2>4tgf)qC5ObiOE&Z&w(w<PBm(P;
zL9L6e7=hF|Eab8fZ_c@73G79O?CxPNIytN*1*B!6_y6i+W;7q_8Bb1ON@!}Ty6V@j
z-dFcjRf?{nR2WKA0#y@=`C4tr-^x4rt5<oR%dfwdete||5Cnnbm=*$sxxQZhKz{Sp
zkG8z}M&2F>2q8eVDx|qBm(15%ZT#-rZ~tk^w_n|Uc!dOzo=dLS%`{CJN^0t)Ui<N1
zuKf7-hw&8>(E6*=%xf3cNZ9XR|76PR*SCX(fdCRfa^3@&)wP>HxpKU*Fc?4rK##%A
z%YgMpQezM7{C{t}x0YNf0W2Bz02+6hN^$Xax*^x@>nkOo(hcYyH&_BbCLn?jj4J^j
z3jjYHPXc8H=mxM6B#;tT47(j^Xh2{bNd=by>!K9k%r8j-YV%8L*ccLk<tqnZmjJwc
z2_^>N1N|i!5`ZY=L0<{jkO26Am!M0DQ$qr{Y)P=rI?Byq0aADgZcgVNWv|>5y&1g~
z@~%<}@Wo3oZ0Va1#sY+q7!QEw0v}I;FdA0^J|-XxYvTcw3dRDAS|)%AU;_Ac0kZ6Q
zVe2e=8^Fck{tA8H)hLH=16a}extl*S!2wpE7Z>{$p#L;7;QTPpvuwxBCt*efH1qtK
z-gXkK9*|H&E7L3?+a^Gs)BHRqz%xB80f39${pOa|yZ%i8TD-6;xfsH%0A%}mdqw}D
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

diff --git a/data/tilesets/secondary/union_room/tiles.png b/data/tilesets/secondary/union_room/tiles.png
index 50d44bf93fd9396fb1f5274e288cc7545054da0f..b38ffe9e524300e54e534307ab2255b6375dc63c 100644
GIT binary patch
literal 1817
zcmV+!2j=*RP)<h;3K|Lk000e1NJLTq000O800w{r00000wWqJy000KyNkl<ZXo2mS
zO^6&t6vtm~$|}p;yclG>coEU|A`5%TBsqA^B$#vPNf6?}I6dnjN`!2W7ziQBPA|(6
zJm_Q~vIt(bqXaz2W;zmc3g|3LHY5a-7F^JqoBw-N{WaY^Q~RO0SfPGfA8)FwtN!(>
zszaLyw0&5B<rAV$h<;(2pN0ik7Fh_{3XK{<3jf;`+c^jsoDP9?i=5L|m7EXXLTa6n
zwF@5t)-+JH9wN1GTEkhRAdM%CleYo;$pAQs=55=i;MS^>#{-83t2UZ{0Km*K)==&}
zN>HRB--?8U7y@BfQ05Y%ONcIYG^%P4Lj>{=hEYdQ_*d;-8wM;i61%J1Kq=DgU8*Zw
z;s*(mvczsQOzo7o?paV`_$sIFRUp0UUS!W8^*e^$S^FVW;;LDDA+t9_hbnuK3M-Ia
z<t1d@@MmNnLqj4ig=P#VLDN<`5OLXdBMT=&Bhrhh{%n4v0idCfH58JYLKUb2)fgS*
zse>e4&~O2$?m{d*F-a6rDwQGZnw?e{D!YvNLc2s^ZHCL}B1uPGHb#=_N8R@dwN?ZJ
zNo@(v+5~A=^;mF&J=cv}zzc(vBcm4+FZB&@6Zq{WvV&_GAI54RCNZfr6ltjFx06Z5
zWKuhsm`o}=t!LKmNdE^NL181MCnlq$Ct!(U{EDO^aM@1KLwJUE-Oo{RA%`KmoYuU0
zVS9@#n)$c~NjDO^^IR+9>SgUN^0sr)|9-&m6^iU+dm126|9Za<1i?7Fe*ZcJ0Z?N1
z4h?<<{C)(OJz~47<?rG3dgpiK|CAe6e%H}{w>s?l&|O3i9fAi5J#T^?#RPS9na5>%
zYUiH^CYAu7u>`lGUUj~Ag&4kq$5~HiH9HlAKlp6~$x1~pwnMKTr12bMDGyVBubaQZ
z&qCKC(C~9j`zPWW4Y7l`f|Sg3R`kc<-T6KPqR|Qytpx~5S8sD|f_@(rqA;zs$PShJ
zQV9APnW?NF0VaZJC9csZJq0B|F9a*bI>oMYp4_$wUC{PoIi@Eb+Tw?YHX+&+8cz3)
zfwhMoe3}(u0k+U+BZeG%nlYSIZL@)sk-%XzVmNVy!1TEyuKSfrC50#Ks!sB(CUzpO
zU$|Bv-b^OmZZsPyh`3<!vO;3l%=S;j1(VejV7to3TN*VD&szvsYb<_m0a$_b76R5E
zRF~9x-dxQDN7xA}eEfBUq%5w0@gW9#<+-mI@5b4~K&Q!=Rp;#bA@1&}W5>upg;f0`
zICGm%zIJ>D7CYPCU#9~H4)VJl^x^c6)cNFV$8c!>3|7Tq#`}!#;;hYR@WN@e)$;3%
zS)36TOt7+mfi*zsL^bWq!QXhjwL9$`JXfRLiO>OafK7yUN5NcIJ06!n5YUPjX#EAj
zPZ~q2ODakQmsA{NV0zuLz?-`~*b1}wS#o+90>q`^IIUt61#!)z5g$|JEc)N-&-6RP
zs9oqU#xdaU+L!~CtlIs2HZ!n;*`ac~4;Tj+wNHTj7!;4+ifprbuMHH;mi;bbk-^*X
zV(vhY97Gc61ASy7Wu|rxml@12%yy!K00?|SMA!89&RiKHPJ({VB}CjmT(?)^P>!D^
z`?!0S5N$eswzRC|jE=~gLk+ubEgTTyCLwOpAntQfSrL-qOkE^)P-c3rGgXtiQap<8
z6_4~b7P~a}93e5#*_3a3eL!dU&@sqD8Xcp9SY`&2l1Y)<*ifxh$caauYid`dAw;}U
z&&BP;WydZ1U_sdy4oV^)JiLZ`Ud<^fE7F?j{O-06OtJIlE;3kkiwp=1qG2^bWf34O
zLV1k4ZdPWT#pDg{x?ccoiw5pz7N+b+Yy2ySsNLc+T!Hj8C{^Z}!EpSN>uVldi>7*B
z^l@dVtgwIEoXg860NairSzUXXVaK?<6&-9arhpAUhDDnjQ$8X3H03X2`7Pt!mU~^i
zRu{A1J9lU3`(FtBQ(;gZk)5pR3SW{WNOpbQvQpm<qVWT^GaqRf4=m4-=Spg{Xi{@I
zvc28aUuvwZ^=YJlTne>xk3X!AN4j|tl6^u$vLpJ^0_M2mtu`TnvQC>TTJb(J<I$`#
zc2L%m11`!CS$|W@8XHqR!0$4yW$`6-p)EScFMWsh_;ee-pI+Gm&_o8sTFXO^AK@Q{
zi+H#=t5fTo3OTjge*D=Zx8Bx>rmboH{{|^LM&*wZy(n?TBCPTk^`fVxeo+OgZ)|IS
zgInV(vRX$t*v#_Xv^_V=_tiGFW?C~?el1>uuE14-n@P1Y7dhHkqVkOls{5ApCrEsq
zANfD!2{*OEL~ta42$%Tv{Us>@r~D!P{VBs)JT4-=@#FUtX$rPwj;bOC00000NkvXX
Hu0mjf-9uE*

literal 1710
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
Ef<e&*AOHXW

diff --git a/data/tilesets/secondary/unused_1/0.png b/data/tilesets/secondary/unused_1/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..bea921d90e42ea862d1fed110fd4913482f3d34a
GIT binary patch
literal 86
zcmeAS@N?(olHy`uVBq!ia0vp^91ILh3@ktfLwv-1As{8|>EamT(fRg>AtM6=50k?0
l>DRtW$ShHxq~iJO5<~p4A6c#%^TI(IJYD@<);T3K0RRNb7Iy#u

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/unused_1/1.png b/data/tilesets/secondary/unused_1/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..bea921d90e42ea862d1fed110fd4913482f3d34a
GIT binary patch
literal 86
zcmeAS@N?(olHy`uVBq!ia0vp^91ILh3@ktfLwv-1As{8|>EamT(fRg>AtM6=50k?0
l>DRtW$ShHxq~iJO5<~p4A6c#%^TI(IJYD@<);T3K0RRNb7Iy#u

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/unused_1/2.png b/data/tilesets/secondary/unused_1/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..16652df19896a91d715ed5047610e1350fa210b1
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^91ILh3@ktfLwv-1As}Vw>EamT(fRg>BQJx30L#YB
z8!UEAY^cw7IK<Aaa@jpwHZ=_h?z7L0ZtyxL&1q_#qbhLwcHM%N`XEC*UHx3vIVCg!
E043%f#sB~S

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/unused_1/3.png b/data/tilesets/secondary/unused_1/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ea7a49e6bc169a443d376168a5dc43547b366f8
GIT binary patch
literal 393
zcmV;40e1e0P)<h;3K|Lk000e1NJLTq000O800IC600000Us#_K0003{Nkl<ZNQv!K
z+ik=!4ATlyZUNI-AhIX8WS@@E(OXKvy^uQ~Es7Qe;twKmXpxZ#NiAwpp(=2KPK7Xl
zpbb(KO#tpa=h=pL0|mgZb`Lxcak8a*)a!17+KU*f3mF8(9MD<RMxMAFLpZP!;$cJi
zD8*3Zyiy)`NS+aj22X<*hEf-ON?q1N3*9<xbfZB2hlAai1A1eXaVFHoDa3ct6=qf$
zmPY6cs|<Y7aG>dcV0}gaKh%Xnmb}_7&7rF#-*j8*I$;UjmbyK49cxh}<fX7D0VV7f
z8M60YEPyszTxgBGA?#{2n=bE6>iLm(O5V8P?bY3zgD>T8e44-c+xf#7`NJ6b!*Awq
zoKn}Wy4(C+TkO{`n6KAU_~%YI`Q@U9$e%|3n8N#8y}?f2Ufmzh-%j42=I@w)$NW3y
n-!cFG!TkH+l6Nk7<9Z37meuh-l$2BE00000NkvXXu0mjfNMW|J

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/unused_1/tiles.png b/data/tilesets/secondary/unused_1/tiles.png
index 0a35187c84f385747b4fb6ec1abfcaf48f7b92e4..3ae8bce428c75a3cdbffacdbabd4dfb686fff395 100644
GIT binary patch
literal 77
zcmeAS@N?(olHy`uVBq!ia0vp^96;Q`0wfr$R3!R<l!&K`V~EDY<RAPjJd2NL7&@>_
ZWMGI{{ZHWgBApo^b)K$%F6*2UngA<}5!e6#

literal 80
zcmeAS@N?(olHy`uVBq!ia0vp^4L~fw0wfsh4j&B#QsSO2jv*Gk$v^xR6C_L%A|wpB
c+!zHI7~JLl3AE~-WCbbpboFyt=akR{0B0EyNdN!<

diff --git a/data/tilesets/secondary/unused_2/0.png b/data/tilesets/secondary/unused_2/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..2895d3319a5c35f73a524731a21caa8f30647a0b
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^96&6<0wfqt3-&AkQU;zbjv*W~Q;#?bGAMAk9-RN}
zBEvDZ8xB6NA567fb3mY_Trp?bZZDP-yCUr6?^^w2NRXB}w|H{pe~=lTu6{1-oD!M<
Dhh!kZ

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/unused_2/1.png b/data/tilesets/secondary/unused_2/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..63c22acf2b98595cf3a22b7d9dfdf18fc3847c02
GIT binary patch
literal 111
zcmeAS@N?(olHy`uVBq!ia0vp^96&6=0wfsJo%qfIDKk$O#}JO0y+<|*GAM8`AMlYj
zQ;@FM(V(ukI_UO~qs=BwQ^J|v>Q<?}@SBkrwEEcPQ<68XyR&ypvQ6F@;s-K;!PC{x
JWt~$(69DUxA{77t

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/unused_2/2.png b/data/tilesets/secondary/unused_2/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1447cde23dccd65bcdaf90921fe1212241d5db6
GIT binary patch
literal 108
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDPvC;#}JO0$sDXqY)vi_6FitV
z9l8{>P)Fxg(8ia(%t8*a0b*vkih2%*SeG2(b!l0+f|;SVN85&t)#oF~7*AI}mvv4F
FO#lvr8~XqN

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/unused_2/3.png b/data/tilesets/secondary/unused_2/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ad81b1e1e9daf31260a661bd436367997d4f31c
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDFaUz#}JO0$sDXqY$}IzMLm`*
zUDTl{n7Kp6p+#G-)5OQ{dcX|Xl?q{5S`#=9hp;nbt=1OT^vItMGQ-o=&t;ucLK6Uu
C+!_4<

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/unused_2/tiles.png b/data/tilesets/secondary/unused_2/tiles.png
index b9c594303003c71800bd7a8b4768812e6ef80832..2ab3b63d6b5e07e348c729d633361b9024575f14 100644
GIT binary patch
literal 979
zcmV;^11$WBP)<h;3K|Lk000e1NJLTq000O800giE00000CPKMg000A;Nkl<ZScUDF
z&rcIU9L48fSUebxE(hWfdoY;vM&e&EAb)@)9tF)ryFCztS-h!<vc(HGTj;SV()3(I
zdZC1DQZj#wzBet~{V^p&Bvzx7^pm%pZ{P0DzJ7OG@dHCRpn)NpTI(^+%7j-YycA3w
zDu#KK39n3e<zdl}2Iqt}SR&56RNY7od|xyUObJ!PsDVG4%@iL{4X9Y6S#sbN_IuGK
zWS5XBOg)b-A-ja^7SF>NToT%#MO;XiCH^PjI&OQvO?_@+VX#D;5$CCEIgZpp5}#3!
z21&SdCUt`(j!8sKShE4X{qwkF!n8q)xF9a`=P~;${bxdRg&fewa6#^43PU{i5QYiN
zd%2I9_b_=k1@oTG@1;a*nP93PCf8CJ`^8>@+-4eH02c$5C>u~L6R7NF8j{5_@srb_
z^+`$S;YVNS`U77;jPdOQP^YTD0ZNA`_Lq-<g$Ce1Is%r7`}<V25#WbDK8zyxMH^xm
zeUiXaDZYKe($x)i*zf5VMey6G!B0MG90|Ev`+}u=wolZ6_1dlH?^T3DOXIU5ydtc1
zGLKCki<82_9B^;W&rjgBn8v~!aBprgKT+v)I%%{jK)ce(PvF%~qg4Ugm3Drj-|u-Y
z@Ty3=15hkoAX)5yukVq%`t}`P9B+FiaU9|cdm6sSQGMM7PWM9iorGAhc_eHJD0%by
z_`*g_;mwD@-a9SAun8Q}&m`<EaJ+-meGgY9{B}0r7s{01IAO%<Is*4}w<$KBz)$XG
z{BA#gwyarE$lCP$O-tQm_WIOKX0K1(WcK>hO=hoJDO;6-in&?kW;NC#h9u%~7d8D<
znWh?Wvj-Iry?!79!uZAPtg%rsRcusD6&n>NT{)l%paLoY0*VNT+20X=FC3zWRddQ8
z>ZCPwwi~1^b+#L>Ep;|OTk33n$V`v83R2KlOcPy{u^Kxgja8<zItr$OgaOit)N(WN
z!yx*E0{T?gZ;vj$<VdR+umY4(no1d^sZ@33H~U2ViTShNYm50SKCcmXvrzWuNpqo|
zXJPkS%i=n}mszOH1F2CjR<4w{MX1z6YU){(csP101y&wkso7t_zZ+(qU-K8*RG1Q1
zzeQes2Ou+>E@-pZ0VuAxU=psaQmJIcjn4N!ehr1+6;t5qx5#GX0Ayy<1#K2P0L2v-
z%znlH<A(YB<^HGa|I^qSUg3so>vdE7Yz;5(_Y*hpUXg-neklL|002ovPDHLkV1k-B
B&G7&L

literal 864
zcmV-m1E2hfP)<h;3K|Lk000e1NJLTq004jh002+~00000F`Lgh0009gNkl<ZScUD@
z&r2IY6bEqsg|P?8(e)rb+8l}nZ$kfq(fS7%@Mx?IZ8irfmerdrSd;YP&8*pDh*~_S
z$X*f&3(Ed2_WNdBT_-<wW`!Qa2kRq~eIMV<?2k;{A^eQEn-Ej<Cx~U-P^N>5(qmRY
zQfvqGmek2T#)7`%z&H*DmuhUlxdFhI<jL2J`Nu%wxR1h1Id*FXkbrinSa!hZKVQl*
zLjVF!USO!D4jcj?V61HjuqB+_LvbG+9Lo+MU~DiMph!Lh@imjhKpw|#ZGc#|Pt!<^
zSpf@j0kM#&v9=A+qb;PZOpOg}fNOaX^`CTbYXdyo3+XW{Ah{QE0i$l=%-fmnm=H0X
zBgR~rIhXmOSUi>4_mS;^o1c!e*g~!$T1J2nZYnq5InJDqTq~98{xBf4&^w?89Opyp
zrgq5rhTj?jHkpi>Z7ySVG_VL@o%5CYZ)@QE2LW#z=ZEz5M#CCtst)Q+1=OwAp!w|{
z*d<`?5%_{lp`+}`n6Lbi(FwyYV^zYtoFktc&@L3}Cwd2_Ky&Af<17^F&F?vZvmI6}
zvO?o*mv&*Tkpg}RI?8j?XmNVJ(gxA43<DmmaV_}kt#H1+7o-7(gO_Ik%mU~D=nMl_
z-T`9;FSzn{OQlcV2q0q$;mICjNBhVg=X?9HJ#cm8d0z04?Sb&Z^G+XgCZOM)V;?9F
zfVK;$69R>ix-i{rK-&e>$03ABbzlJKQ;4Y04I|ltn**rQ6uJN;ln037&?SH#X*qxh
zEuaAx03Z`U+XVoTtANNg0<>K~Z5Oksb`e#C^%MYvu>!(44?qh@3kg7od;lJkF#&Wr
z8vy!4HB^N$H9#$70>iI25#nl&yXtcufTjRIH8dW;mkh@!;7QKxKrc$xVq9S+ki6=i
z0bp)6fJiMI<xTc^S=azGs&I2v<!$QV{qq2}g-JXM5X&D8fYc8HZ4DSR>LA(cd9?%O
zj>;7RvWg|}_5PQr4wzg-6M?N_vG@uY0^_#Pco*mwngrAZRPLx;F)4lpULc@dNK>Zq
qf&ifkMUt%n{cZgJfaJc<3;Y9-xn7ZJ)LXp(0000<MNUMnLSTXw+ky`O


From df0b715207ad6d025995dd5612190d8d51fc049f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 2 Oct 2017 21:08:54 -0400
Subject: [PATCH 23/42] Decompile data/tileset.s

---
 data/tileset.s      | 707 --------------------------------------------
 ld_script.txt       |   1 -
 src/tileset_anims.c | 616 +++++++++++++++++++++++++++++++++++---
 3 files changed, 581 insertions(+), 743 deletions(-)
 delete mode 100644 data/tileset.s

diff --git a/data/tileset.s b/data/tileset.s
deleted file mode 100644
index 0ca02d41c..000000000
--- a/data/tileset.s
+++ /dev/null
@@ -1,707 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2, 0
-
-gUnknown_085105C4::
-	.incbin "data/tilesets/primary/general/anim/0/1.4bpp"
-
-gUnknown_08510644::
-	.incbin "data/tilesets/primary/general/anim/0/0.4bpp"
-
-gUnknown_085106C4::
-	.incbin "data/tilesets/primary/general/anim/0/2.4bpp"
-
-	.space 0x20
-
-gTilesetAnims_General0:: @ 8510764
-	.4byte gUnknown_08510644
-	.4byte gUnknown_085105C4
-	.4byte gUnknown_08510644
-	.4byte gUnknown_085106C4
-
-gUnknown_08510774::
-	.incbin "data/tilesets/primary/general/anim/1/0.4bpp"
-
-gUnknown_08510B34::
-	.incbin "data/tilesets/primary/general/anim/1/1.4bpp"
-
-gUnknown_08510EF4::
-	.incbin "data/tilesets/primary/general/anim/1/2.4bpp"
-
-gUnknown_085112B4::
-	.incbin "data/tilesets/primary/general/anim/1/3.4bpp"
-
-gUnknown_08511674::
-	.incbin "data/tilesets/primary/general/anim/1/4.4bpp"
-
-gUnknown_08511A34::
-	.incbin "data/tilesets/primary/general/anim/1/5.4bpp"
-
-gUnknown_08511DF4::
-	.incbin "data/tilesets/primary/general/anim/1/6.4bpp"
-
-gUnknown_085121B4::
-	.incbin "data/tilesets/primary/general/anim/1/7.4bpp"
-
-
-gTilesetAnims_General1:: @ 8512574
-	.4byte gUnknown_08510774
-	.4byte gUnknown_08510B34
-	.4byte gUnknown_08510EF4
-	.4byte gUnknown_085112B4
-	.4byte gUnknown_08511674
-	.4byte gUnknown_08511A34
-	.4byte gUnknown_08511DF4
-	.4byte gUnknown_085121B4
-
-gUnknown_08512594::
-	.incbin "data/tilesets/primary/general/anim/2/0.4bpp"
-
-gUnknown_085126D4::
-	.incbin "data/tilesets/primary/general/anim/2/1.4bpp"
-
-gUnknown_08512814::
-	.incbin "data/tilesets/primary/general/anim/2/2.4bpp"
-
-gUnknown_08512954::
-	.incbin "data/tilesets/primary/general/anim/2/3.4bpp"
-
-gUnknown_08512A94::
-	.incbin "data/tilesets/primary/general/anim/2/4.4bpp"
-
-gUnknown_08512BD4::
-	.incbin "data/tilesets/primary/general/anim/2/5.4bpp"
-
-gUnknown_08512D14::
-	.incbin "data/tilesets/primary/general/anim/2/6.4bpp"
-
-
-gTilesetAnims_General2:: @ 8512E54
-	.4byte gUnknown_08512594
-	.4byte gUnknown_085126D4
-	.4byte gUnknown_08512814
-	.4byte gUnknown_08512954
-	.4byte gUnknown_08512A94
-	.4byte gUnknown_08512BD4
-	.4byte gUnknown_08512D14
-	.4byte gUnknown_08512594
-
-gUnknown_08512E74::
-	.incbin "data/tilesets/primary/general/anim/3/0.4bpp"
-
-gUnknown_08512F34::
-	.incbin "data/tilesets/primary/general/anim/3/1.4bpp"
-
-gUnknown_08512FF4::
-	.incbin "data/tilesets/primary/general/anim/3/2.4bpp"
-
-gUnknown_085130B4::
-	.incbin "data/tilesets/primary/general/anim/3/3.4bpp"
-
-
-gTilesetAnims_General3:: @ 8513174
-	.4byte gUnknown_08512E74
-	.4byte gUnknown_08512F34
-	.4byte gUnknown_08512FF4
-	.4byte gUnknown_085130B4
-
-gUnknown_08513184::
-	.incbin "data/tilesets/primary/general/anim/4/0.4bpp"
-
-gUnknown_085132C4::
-	.incbin "data/tilesets/primary/general/anim/4/1.4bpp"
-
-gUnknown_08513404::
-	.incbin "data/tilesets/primary/general/anim/4/2.4bpp"
-
-gUnknown_08513544::
-	.incbin "data/tilesets/primary/general/anim/4/3.4bpp"
-
-
-gTilesetAnims_General4:: @ 8513684
-	.4byte gUnknown_08513184
-	.4byte gUnknown_085132C4
-	.4byte gUnknown_08513404
-	.4byte gUnknown_08513544
-
-gUnknown_08513694::
-	.incbin "data/tilesets/secondary/lavaridge/anim/0.4bpp"
-
-gUnknown_08513714::
-	.incbin "data/tilesets/secondary/lavaridge/anim/1.4bpp"
-
-gUnknown_08513794::
-	.incbin "data/tilesets/secondary/lavaridge/anim/2.4bpp"
-
-gUnknown_08513814::
-	.incbin "data/tilesets/secondary/lavaridge/anim/3.4bpp"
-
-
-gTilesetAnims_Lavaridge0:: @ 8513894
-	.4byte gUnknown_08513694
-	.4byte gUnknown_08513714
-	.4byte gUnknown_08513794
-	.4byte gUnknown_08513814
-
-gUnknown_085138A4::
-	.incbin "data/tilesets/secondary/pacifidlog/anim/0/0.4bpp"
-
-gUnknown_08513C64::
-	.incbin "data/tilesets/secondary/pacifidlog/anim/0/1.4bpp"
-
-gUnknown_08514024::
-	.incbin "data/tilesets/secondary/pacifidlog/anim/0/2.4bpp"
-
-
-gTilesetAnims_Pacifidlog0:: @ 85143E4
-	.4byte gUnknown_085138A4
-	.4byte gUnknown_08513C64
-	.4byte gUnknown_08514024
-	.4byte gUnknown_08513C64
-
-gUnknown_085143F4::
-	.incbin "data/tilesets/secondary/underwater/anim/0.4bpp"
-
-gUnknown_08514474::
-	.incbin "data/tilesets/secondary/underwater/anim/1.4bpp"
-
-gUnknown_085144F4::
-	.incbin "data/tilesets/secondary/underwater/anim/2.4bpp"
-
-gUnknown_08514574::
-	.incbin "data/tilesets/secondary/underwater/anim/3.4bpp"
-
-
-gTilesetAnims_Underwater0:: @ 85145F4
-	.4byte gUnknown_085143F4
-	.4byte gUnknown_08514474
-	.4byte gUnknown_085144F4
-	.4byte gUnknown_08514574
-
-gUnknown_08514604::
-	.incbin "data/tilesets/secondary/pacifidlog/anim/1/0.4bpp"
-
-gUnknown_08514704::
-	.incbin "data/tilesets/secondary/pacifidlog/anim/1/1.4bpp"
-
-gUnknown_08514804::
-	.incbin "data/tilesets/secondary/pacifidlog/anim/1/2.4bpp"
-
-gUnknown_08514904::
-	.incbin "data/tilesets/secondary/pacifidlog/anim/1/3.4bpp"
-
-gUnknown_08514A04::
-	.incbin "data/tilesets/secondary/pacifidlog/anim/1/4.4bpp"
-
-gUnknown_08514B04::
-	.incbin "data/tilesets/secondary/pacifidlog/anim/1/5.4bpp"
-
-gUnknown_08514C04::
-	.incbin "data/tilesets/secondary/pacifidlog/anim/1/6.4bpp"
-
-gUnknown_08514D04::
-	.incbin "data/tilesets/secondary/pacifidlog/anim/1/7.4bpp"
-
-
-gTilesetAnims_Pacifidlog1:: @ 8514E04
-	.4byte gUnknown_08514604
-	.4byte gUnknown_08514704
-	.4byte gUnknown_08514804
-	.4byte gUnknown_08514904
-	.4byte gUnknown_08514A04
-	.4byte gUnknown_08514B04
-	.4byte gUnknown_08514C04
-	.4byte gUnknown_08514D04
-
-gUnknown_08514E24::
-	.incbin "data/tilesets/secondary/mauville/anim/0/a/0.4bpp"
-
-gUnknown_08514EA4::
-	.incbin "data/tilesets/secondary/mauville/anim/0/a/1.4bpp"
-
-gUnknown_08514F24::
-	.incbin "data/tilesets/secondary/mauville/anim/0/a/2.4bpp"
-
-gUnknown_08514FA4::
-	.incbin "data/tilesets/secondary/mauville/anim/0/a/3.4bpp"
-
-gUnknown_08515024::
-	.incbin "data/tilesets/secondary/mauville/anim/1/a/1.4bpp"
-
-gUnknown_085150A4::
-	.incbin "data/tilesets/secondary/mauville/anim/0/b/0.4bpp"
-
-gUnknown_08515124::
-	.incbin "data/tilesets/secondary/mauville/anim/0/b/1.4bpp"
-
-gUnknown_085151A4::
-	.incbin "data/tilesets/secondary/mauville/anim/0/b/2.4bpp"
-
-gUnknown_08515224::
-	.incbin "data/tilesets/secondary/mauville/anim/0/b/3.4bpp"
-
-gUnknown_085152A4::
-	.incbin "data/tilesets/secondary/mauville/anim/1/b/1.4bpp"
-
-	.space 0x20
-
-gTilesetAnims_MauvilleVDests0:: @ 8515344
-	.4byte BG_VRAM + 0x4c00
-	.4byte BG_VRAM + 0x4c80
-	.4byte BG_VRAM + 0x4d00
-	.4byte BG_VRAM + 0x4d80
-	.4byte BG_VRAM + 0x4e00
-	.4byte BG_VRAM + 0x4e80
-	.4byte BG_VRAM + 0x4f00
-	.4byte BG_VRAM + 0x4f80
-
-gTilesetAnims_MauvilleVDests1:: @ 8515364
-	.4byte BG_VRAM + 0x5000
-	.4byte BG_VRAM + 0x5080
-	.4byte BG_VRAM + 0x5100
-	.4byte BG_VRAM + 0x5180
-	.4byte BG_VRAM + 0x5200
-	.4byte BG_VRAM + 0x5280
-	.4byte BG_VRAM + 0x5300
-	.4byte BG_VRAM + 0x5380
-
-gTilesetAnims_Mauville0a:: @ 8515384
-	.4byte gUnknown_08514E24
-	.4byte gUnknown_08514E24
-	.4byte gUnknown_08514EA4
-	.4byte gUnknown_08514F24
-	.4byte gUnknown_08514FA4
-	.4byte gUnknown_08514FA4
-	.4byte gUnknown_08514FA4
-	.4byte gUnknown_08514FA4
-	.4byte gUnknown_08514FA4
-	.4byte gUnknown_08514FA4
-	.4byte gUnknown_08514F24
-	.4byte gUnknown_08514EA4
-
-gTilesetAnims_Mauville0b:: @ 85153B4
-	.4byte gUnknown_085150A4
-	.4byte gUnknown_085150A4
-	.4byte gUnknown_08515124
-	.4byte gUnknown_085151A4
-	.4byte gUnknown_08515224
-	.4byte gUnknown_08515224
-	.4byte gUnknown_08515224
-	.4byte gUnknown_08515224
-	.4byte gUnknown_08515224
-	.4byte gUnknown_08515224
-	.4byte gUnknown_085151A4
-	.4byte gUnknown_08515124
-
-gTilesetAnims_Mauville1a:: @ 85153E4
-	.4byte gUnknown_08514E24
-	.4byte gUnknown_08514E24
-	.4byte gUnknown_08515024
-	.4byte gUnknown_08515024
-
-gTilesetAnims_Mauville1b:: @ 85153F4
-	.4byte gUnknown_085150A4
-	.4byte gUnknown_085150A4
-	.4byte gUnknown_085152A4
-	.4byte gUnknown_085152A4
-
-gUnknown_08515404::
-	.incbin "data/tilesets/secondary/rustboro/anim/0/0.4bpp"
-
-gUnknown_08515484::
-	.incbin "data/tilesets/secondary/rustboro/anim/0/1.4bpp"
-
-gUnknown_08515504::
-	.incbin "data/tilesets/secondary/rustboro/anim/0/2.4bpp"
-
-gUnknown_08515584::
-	.incbin "data/tilesets/secondary/rustboro/anim/0/3.4bpp"
-
-gUnknown_08515604::
-	.incbin "data/tilesets/secondary/rustboro/anim/0/4.4bpp"
-
-gUnknown_08515684::
-	.incbin "data/tilesets/secondary/rustboro/anim/0/5.4bpp"
-
-gUnknown_08515704::
-	.incbin "data/tilesets/secondary/rustboro/anim/0/6.4bpp"
-
-gUnknown_08515784::
-	.incbin "data/tilesets/secondary/rustboro/anim/0/7.4bpp"
-
-
-gTilesetAnims_RustboroVDests0:: @ 8515804
-    .4byte BG_VRAM + 0x5000
-	.4byte BG_VRAM + 0x5080
-	.4byte BG_VRAM + 0x5100
-	.4byte BG_VRAM + 0x5180
-	.4byte BG_VRAM + 0x5200
-	.4byte BG_VRAM + 0x5280
-	.4byte BG_VRAM + 0x5300
-	.4byte BG_VRAM + 0x5380
-
-gTilesetAnims_Rustboro0:: @ 8515824
-	.4byte gUnknown_08515404
-	.4byte gUnknown_08515484
-	.4byte gUnknown_08515504
-	.4byte gUnknown_08515584
-	.4byte gUnknown_08515604
-	.4byte gUnknown_08515684
-	.4byte gUnknown_08515704
-	.4byte gUnknown_08515784
-
-gUnknown_08515844::
-	.incbin "data/tilesets/secondary/rustboro/anim/1/0.4bpp"
-
-gUnknown_085158C4::
-	.incbin "data/tilesets/secondary/rustboro/anim/1/1.4bpp"
-
-	.space 0x20
-
-
-gTilesetAnims_Rustboro1:: @ 8515964
-	.4byte gUnknown_08515844
-	.4byte gUnknown_085158C4
-
-gUnknown_0851596C::
-	.incbin "data/tilesets/secondary/cave/anim/0.4bpp"
-
-gUnknown_085159EC::
-	.incbin "data/tilesets/secondary/cave/anim/1.4bpp"
-
-gUnknown_08515A6C::
-	.incbin "data/tilesets/secondary/cave/anim/2.4bpp"
-
-gUnknown_08515AEC::
-	.incbin "data/tilesets/secondary/cave/anim/3.4bpp"
-
-gUnknown_08515B6C::
-	.incbin "data/tilesets/secondary/cave/anim/unused/0.4bpp"
-
-gUnknown_08515BEC::
-	.incbin "data/tilesets/secondary/cave/anim/unused/1.4bpp"
-
-gUnknown_08515C6C::
-	.incbin "data/tilesets/secondary/cave/anim/unused/2.4bpp"
-
-gUnknown_08515CEC::
-	.incbin "data/tilesets/secondary/cave/anim/unused/3.4bpp"
-
-    .space 0x20
-
-
-gTilesetAnims_Lavaridge1_Cave0:: @ 8515D8C
-	.4byte gUnknown_0851596C
-	.4byte gUnknown_085159EC
-	.4byte gUnknown_08515A6C
-	.4byte gUnknown_08515AEC
-
-gUnknown_08515D9C::
-	.incbin "data/tilesets/secondary/ever_grande/anim/0.4bpp"
-
-gUnknown_08515E1C::
-	.incbin "data/tilesets/secondary/ever_grande/anim/1.4bpp"
-
-gUnknown_08515E9C::
-	.incbin "data/tilesets/secondary/ever_grande/anim/2.4bpp"
-
-gUnknown_08515F1C::
-	.incbin "data/tilesets/secondary/ever_grande/anim/3.4bpp"
-
-gUnknown_08515F9C::
-	.incbin "data/tilesets/secondary/ever_grande/anim/4.4bpp"
-
-gUnknown_0851601C::
-	.incbin "data/tilesets/secondary/ever_grande/anim/5.4bpp"
-
-gUnknown_0851609C::
-	.incbin "data/tilesets/secondary/ever_grande/anim/6.4bpp"
-
-gUnknown_0851611C::
-	.incbin "data/tilesets/secondary/ever_grande/anim/7.4bpp"
-
-	.space 0x20
-
-
-gTilesetAnims_EverGrandeVDests0:: @ 85161BC
-	.4byte BG_VRAM + 0x5c00
-	.4byte BG_VRAM + 0x5c80
-	.4byte BG_VRAM + 0x5d00
-	.4byte BG_VRAM + 0x5d80
-	.4byte BG_VRAM + 0x5e00
-	.4byte BG_VRAM + 0x5e80
-	.4byte BG_VRAM + 0x5f00
-	.4byte BG_VRAM + 0x5f80
-
-gTilesetAnims_EverGrande0:: @ 85161DC
-	.4byte gUnknown_08515D9C
-	.4byte gUnknown_08515E1C
-	.4byte gUnknown_08515E9C
-	.4byte gUnknown_08515F1C
-	.4byte gUnknown_08515F9C
-	.4byte gUnknown_0851601C
-	.4byte gUnknown_0851609C
-	.4byte gUnknown_0851611C
-
-gUnknown_085161FC::
-	.incbin "data/tilesets/secondary/dewford/anim/0.4bpp"
-
-gUnknown_085162BC::
-	.incbin "data/tilesets/secondary/dewford/anim/1.4bpp"
-
-gUnknown_0851637C::
-	.incbin "data/tilesets/secondary/dewford/anim/2.4bpp"
-
-gUnknown_0851643C::
-	.incbin "data/tilesets/secondary/dewford/anim/3.4bpp"
-
-
-gTilesetAnims_Dewford0:: @ 85164FC
-	.4byte gUnknown_085161FC
-	.4byte gUnknown_085162BC
-	.4byte gUnknown_0851637C
-	.4byte gUnknown_0851643C
-
-gUnknown_0851650C::
-	.incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/0.4bpp"
-
-gUnknown_085165CC::
-	.incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/1.4bpp"
-
-gUnknown_0851668C::
-	.incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/2.4bpp"
-
-gUnknown_0851674C::
-	.incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/3.4bpp"
-
-
-gTilesetAnims_BattleFrontierOutsideWest0:: @ 851680C
-	.4byte gUnknown_0851650C
-	.4byte gUnknown_085165CC
-	.4byte gUnknown_0851668C
-	.4byte gUnknown_0851674C
-
-gUnknown_0851681C:: @ 851680C
-	.incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/0.4bpp"
-
-gUnknown_085168DC::
-	.incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/1.4bpp"
-
-gUnknown_0851699C::
-	.incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/2.4bpp"
-
-gUnknown_08516A5C::
-	.incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/3.4bpp"
-
-
-gTilesetAnims_BattleFrontierOutsideEast0:: @ 8516B1C
-	.4byte gUnknown_0851681C
-	.4byte gUnknown_085168DC
-	.4byte gUnknown_0851699C
-	.4byte gUnknown_08516A5C
-
-gUnknown_08516B2C::
-	.incbin "data/tilesets/secondary/slateport/anim/0.4bpp"
-
-gUnknown_08516BAC::
-	.incbin "data/tilesets/secondary/slateport/anim/1.4bpp"
-
-gUnknown_08516C2C::
-	.incbin "data/tilesets/secondary/slateport/anim/2.4bpp"
-
-gUnknown_08516CAC::
-	.incbin "data/tilesets/secondary/slateport/anim/3.4bpp"
-
-
-gTilesetAnims_Slateport0:: @ 8516D2C
-	.4byte gUnknown_08516B2C
-	.4byte gUnknown_08516BAC
-	.4byte gUnknown_08516C2C
-	.4byte gUnknown_08516CAC
-
-gUnknown_08516D3C::
-	.incbin "data/tilesets/primary/building/anim/0.4bpp"
-
-gUnknown_08516DBC::
-	.incbin "data/tilesets/primary/building/anim/1.4bpp"
-
-
-gTilesetAnims_InsideBuilding0:: @ 8516E3C
-	.4byte gUnknown_08516D3C
-	.4byte gUnknown_08516DBC
-
-gUnknown_08516E44::
-	.incbin "data/tilesets/secondary/sootopolis_gym/anim/0/0.4bpp"
-
-gUnknown_08516FC4::
-	.incbin "data/tilesets/secondary/sootopolis_gym/anim/0/1.4bpp"
-
-gUnknown_08517144::
-	.incbin "data/tilesets/secondary/sootopolis_gym/anim/0/2.4bpp"
-
-gUnknown_085172C4::
-	.incbin "data/tilesets/secondary/sootopolis_gym/anim/1/0.4bpp"
-
-gUnknown_08517544::
-	.incbin "data/tilesets/secondary/sootopolis_gym/anim/1/1.4bpp"
-
-gUnknown_085177C4::
-	.incbin "data/tilesets/secondary/sootopolis_gym/anim/1/2.4bpp"
-
-
-gTilesetAnims_SootopolisGym0:: @ 8517A44
-	.4byte gUnknown_08516E44
-	.4byte gUnknown_08516FC4
-	.4byte gUnknown_08517144
-
-gTilesetAnims_SootopolisGym1:: @ 8517A50
-	.4byte gUnknown_085172C4
-	.4byte gUnknown_08517544
-	.4byte gUnknown_085177C4
-
-gUnknown_08517A5C::
-	.incbin "data/tilesets/secondary/elite_four/anim/1/0.4bpp"
-
-gUnknown_08517ADC::
-	.incbin "data/tilesets/secondary/elite_four/anim/1/1.4bpp"
-
-gUnknown_08517B5C::
-	.incbin "data/tilesets/secondary/elite_four/anim/0/0.4bpp"
-
-gUnknown_08517B7C::
-	.incbin "data/tilesets/secondary/elite_four/anim/0/1.4bpp"
-
-gUnknown_08517B9C::
-	.incbin "data/tilesets/secondary/elite_four/anim/0/2.4bpp"
-
-gUnknown_08517BBC::
-	.incbin "data/tilesets/secondary/elite_four/anim/0/3.4bpp"
-
-	.space 0x20
-
-
-gTilesetAnims_EliteFour1:: @ 8517BFC
-	.4byte gUnknown_08517B5C
-	.4byte gUnknown_08517B7C
-	.4byte gUnknown_08517B9C
-	.4byte gUnknown_08517BBC
-
-gTilesetAnims_EliteFour0:: @ 8517C0C
-	.4byte gUnknown_08517A5C
-	.4byte gUnknown_08517ADC
-
-gUnknown_08517C14::
-	.incbin "data/tilesets/secondary/mauville_gym/anim/0.4bpp"
-
-gUnknown_08517E14::
-	.incbin "data/tilesets/secondary/mauville_gym/anim/1.4bpp"
-
-	.space 0x20
-
-
-gTilesetAnims_MauvilleGym0:: @ 8518034
-	.4byte gUnknown_08517C14
-	.4byte gUnknown_08517E14
-
-gUnknown_0851803C::
-	.incbin "data/tilesets/secondary/bike_shop/anim/0.4bpp"
-
-gUnknown_0851815C::
-	.incbin "data/tilesets/secondary/bike_shop/anim/1.4bpp"
-
-	.space 0x20
-
-gTilesetAnims_BikeShop0:: @ 851829C
-	.4byte gUnknown_0851803C
-	.4byte gUnknown_0851815C
-
-gUnknown_085182A4::
-	.incbin "data/tilesets/secondary/sootopolis/anim/0.4bpp"
-
-gUnknown_08518EA4::
-	.incbin "data/tilesets/secondary/sootopolis/anim/1.4bpp"
-
-gUnknown_08519AA4::
-	.incbin "data/tilesets/secondary/sootopolis/anim/2.4bpp"
-
-gUnknown_0851A6A4::
-	.incbin "data/tilesets/secondary/sootopolis/anim/3.4bpp"
-
-gUnknown_0851B2A4::
-	.incbin "data/tilesets/secondary/sootopolis/anim/4.4bpp"
-
-gUnknown_0851BEA4::
-	.incbin "data/tilesets/secondary/sootopolis/anim/5.4bpp"
-
-gUnknown_0851CAA4::
-	.incbin "data/tilesets/secondary/sootopolis/anim/6.4bpp"
-
-gUnknown_0851D6A4::
-	.incbin "data/tilesets/secondary/sootopolis/anim/7.4bpp"
-
-	.space 0x20
-
-gUnknown_0851E2C4::
-	.incbin "data/tilesets/secondary/unused_1/0.4bpp"
-
-gUnknown_0851EAC4::
-	.incbin "data/tilesets/secondary/unused_1/1.4bpp"
-
-gUnknown_0851F2C4::
-	.incbin "data/tilesets/secondary/unused_1/2.4bpp"
-
-gUnknown_0851FAC4::
-	.incbin "data/tilesets/secondary/unused_1/3.4bpp"
-
-gTilesetAnims_Sootopolis0:: @ 85202C4
-	.4byte gUnknown_085182A4
-	.4byte gUnknown_08518EA4
-	.4byte gUnknown_08519AA4
-	.4byte gUnknown_0851A6A4
-	.4byte gUnknown_0851B2A4
-	.4byte gUnknown_0851BEA4
-	.4byte gUnknown_0851CAA4
-	.4byte gUnknown_0851D6A4
-
-gUnknown_085202E4::
-	.incbin "data/tilesets/secondary/battle_pyramid/anim/0/0.4bpp"
-
-gUnknown_085203E4::
-	.incbin "data/tilesets/secondary/battle_pyramid/anim/0/1.4bpp"
-
-gUnknown_085204E4::
-	.incbin "data/tilesets/secondary/battle_pyramid/anim/0/2.4bpp"
-
-    .space 0x20
-
-gUnknown_08520604::
-	.incbin "data/tilesets/secondary/battle_pyramid/anim/1/0.4bpp"
-
-gUnknown_08520704::
-	.incbin "data/tilesets/secondary/battle_pyramid/anim/1/1.4bpp"
-
-gUnknown_08520804::
-	.incbin "data/tilesets/secondary/battle_pyramid/anim/1/2.4bpp"
-
-	.space 0x3d00
-
-gUnknown_08524604::
-	.incbin "data/tilesets/secondary/unused_2/0.4bpp"
-
-	.space 0x1c0
-
-gUnknown_08524804::
-	.incbin "data/tilesets/secondary/unused_2/1.4bpp"
-
-gTilesetAnims_BattlePyramid0:: @ 8524864
-	.4byte gUnknown_085202E4
-	.4byte gUnknown_085203E4
-	.4byte gUnknown_085204E4
-
-gTilesetAnims_BattlePyramid1:: @ 8524870
-	.4byte gUnknown_08520604
-	.4byte gUnknown_08520704
-	.4byte gUnknown_08520804
-
diff --git a/ld_script.txt b/ld_script.txt
index 2ab0f780b..fcd3af3d4 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -356,7 +356,6 @@ SECTIONS {
         data/field_tasks.o(.rodata);
         data/reset_rtc_screen.o(.rodata);
         data/start_menu.o(.rodata);
-        data/tileset.o(.rodata);
         src/tileset_anims.o(.rodata);
         src/palette.o(.rodata);
         data/fanfares.o(.rodata);
diff --git a/src/tileset_anims.c b/src/tileset_anims.c
index b7f18d869..e53461e02 100644
--- a/src/tileset_anims.c
+++ b/src/tileset_anims.c
@@ -31,41 +31,587 @@ static void cur_mapheader_run_tileset2_func(void);
 
 // .rodata
 
-extern const u16 *const gTilesetAnims_General0[];
-extern const u16 *const gTilesetAnims_General1[];
-extern const u16 *const gTilesetAnims_General2[];
-extern const u16 *const gTilesetAnims_General3[];
-extern const u16 *const gTilesetAnims_General4[];
-extern const u16 *const gTilesetAnims_Lavaridge0[];
-extern const u16 *const gTilesetAnims_Pacifidlog0[];
-extern const u16 *const gTilesetAnims_Underwater0[];
-extern const u16 *const gTilesetAnims_Pacifidlog1[];
-extern u16 *const gTilesetAnims_MauvilleVDests0[];
-extern u16 *const gTilesetAnims_MauvilleVDests1[];
-extern const u16 *const gTilesetAnims_Mauville0a[];
-extern const u16 *const gTilesetAnims_Mauville0b[];
-extern const u16 *const gTilesetAnims_Mauville1a[];
-extern const u16 *const gTilesetAnims_Mauville1b[];
-extern  u16 *const gTilesetAnims_RustboroVDests0[];
-extern const u16 *const gTilesetAnims_Rustboro0[];
-extern const u16 *const gTilesetAnims_Rustboro1[];
-extern const u16 *const gTilesetAnims_Lavaridge1_Cave0[];
-extern  u16 *const gTilesetAnims_EverGrandeVDests0[];
-extern const u16 *const gTilesetAnims_EverGrande0[];
-extern const u16 *const gTilesetAnims_Dewford0[];
-extern const u16 *const gTilesetAnims_BattleFrontierOutsideWest0[];
-extern const u16 *const gTilesetAnims_BattleFrontierOutsideEast0[];
-extern const u16 *const gTilesetAnims_Slateport0[];
-extern const u16 *const gTilesetAnims_InsideBuilding0[];
-extern const u16 *const gTilesetAnims_SootopolisGym0[];
-extern const u16 *const gTilesetAnims_SootopolisGym1[];
-extern const u16 *const gTilesetAnims_EliteFour1[];
-extern const u16 *const gTilesetAnims_EliteFour0[];
-extern const u16 *const gTilesetAnims_MauvilleGym0[];
-extern const u16 *const gTilesetAnims_BikeShop0[];
-extern const u16 *const gTilesetAnims_Sootopolis0[];
-extern const u16 *const gTilesetAnims_BattlePyramid0[];
-extern const u16 *const gTilesetAnims_BattlePyramid1[];
+
+const u16 gUnknown_085105C4[] = INCBIN_U16("data/tilesets/primary/general/anim/0/1.4bpp");
+
+const u16 gUnknown_08510644[] = INCBIN_U16("data/tilesets/primary/general/anim/0/0.4bpp");
+
+const u16 gUnknown_085106C4[] = INCBIN_U16("data/tilesets/primary/general/anim/0/2.4bpp");
+
+const u16 tileset_anims_space_0[16] = {};
+
+const u16 *const gTilesetAnims_General0[] = {
+    gUnknown_08510644,
+    gUnknown_085105C4,
+    gUnknown_08510644,
+    gUnknown_085106C4
+};
+
+const u16 gUnknown_08510774[] = INCBIN_U16("data/tilesets/primary/general/anim/1/0.4bpp");
+
+const u16 gUnknown_08510B34[] = INCBIN_U16("data/tilesets/primary/general/anim/1/1.4bpp");
+
+const u16 gUnknown_08510EF4[] = INCBIN_U16("data/tilesets/primary/general/anim/1/2.4bpp");
+
+const u16 gUnknown_085112B4[] = INCBIN_U16("data/tilesets/primary/general/anim/1/3.4bpp");
+
+const u16 gUnknown_08511674[] = INCBIN_U16("data/tilesets/primary/general/anim/1/4.4bpp");
+
+const u16 gUnknown_08511A34[] = INCBIN_U16("data/tilesets/primary/general/anim/1/5.4bpp");
+
+const u16 gUnknown_08511DF4[] = INCBIN_U16("data/tilesets/primary/general/anim/1/6.4bpp");
+
+const u16 gUnknown_085121B4[] = INCBIN_U16("data/tilesets/primary/general/anim/1/7.4bpp");
+
+const u16 *const gTilesetAnims_General1[] = {
+    gUnknown_08510774,
+    gUnknown_08510B34,
+    gUnknown_08510EF4,
+    gUnknown_085112B4,
+    gUnknown_08511674,
+    gUnknown_08511A34,
+    gUnknown_08511DF4,
+    gUnknown_085121B4
+};
+
+const u16 gUnknown_08512594[] = INCBIN_U16("data/tilesets/primary/general/anim/2/0.4bpp");
+
+const u16 gUnknown_085126D4[] = INCBIN_U16("data/tilesets/primary/general/anim/2/1.4bpp");
+
+const u16 gUnknown_08512814[] = INCBIN_U16("data/tilesets/primary/general/anim/2/2.4bpp");
+
+const u16 gUnknown_08512954[] = INCBIN_U16("data/tilesets/primary/general/anim/2/3.4bpp");
+
+const u16 gUnknown_08512A94[] = INCBIN_U16("data/tilesets/primary/general/anim/2/4.4bpp");
+
+const u16 gUnknown_08512BD4[] = INCBIN_U16("data/tilesets/primary/general/anim/2/5.4bpp");
+
+const u16 gUnknown_08512D14[] = INCBIN_U16("data/tilesets/primary/general/anim/2/6.4bpp");
+
+const u16 *const gTilesetAnims_General2[] = {
+    gUnknown_08512594,
+    gUnknown_085126D4,
+    gUnknown_08512814,
+    gUnknown_08512954,
+    gUnknown_08512A94,
+    gUnknown_08512BD4,
+    gUnknown_08512D14,
+    gUnknown_08512594
+};
+
+const u16 gUnknown_08512E74[] = INCBIN_U16("data/tilesets/primary/general/anim/3/0.4bpp");
+
+const u16 gUnknown_08512F34[] = INCBIN_U16("data/tilesets/primary/general/anim/3/1.4bpp");
+
+const u16 gUnknown_08512FF4[] = INCBIN_U16("data/tilesets/primary/general/anim/3/2.4bpp");
+
+const u16 gUnknown_085130B4[] = INCBIN_U16("data/tilesets/primary/general/anim/3/3.4bpp");
+
+const u16 *const gTilesetAnims_General3[] = {
+    gUnknown_08512E74,
+    gUnknown_08512F34,
+    gUnknown_08512FF4,
+    gUnknown_085130B4
+};
+
+const u16 gUnknown_08513184[] = INCBIN_U16("data/tilesets/primary/general/anim/4/0.4bpp");
+
+const u16 gUnknown_085132C4[] = INCBIN_U16("data/tilesets/primary/general/anim/4/1.4bpp");
+
+const u16 gUnknown_08513404[] = INCBIN_U16("data/tilesets/primary/general/anim/4/2.4bpp");
+
+const u16 gUnknown_08513544[] = INCBIN_U16("data/tilesets/primary/general/anim/4/3.4bpp");
+
+const u16 *const gTilesetAnims_General4[] = {
+    gUnknown_08513184,
+    gUnknown_085132C4,
+    gUnknown_08513404,
+    gUnknown_08513544
+};
+
+const u16 gUnknown_08513694[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/0.4bpp");
+
+const u16 gUnknown_08513714[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/1.4bpp");
+
+const u16 gUnknown_08513794[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/2.4bpp");
+
+const u16 gUnknown_08513814[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/3.4bpp");
+
+const u16 *const gTilesetAnims_Lavaridge0[] = {
+    gUnknown_08513694,
+    gUnknown_08513714,
+    gUnknown_08513794,
+    gUnknown_08513814
+};
+
+const u16 gUnknown_085138A4[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/0.4bpp");
+
+const u16 gUnknown_08513C64[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/1.4bpp");
+
+const u16 gUnknown_08514024[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/2.4bpp");
+
+const u16 *const gTilesetAnims_Pacifidlog0[] = {
+    gUnknown_085138A4,
+    gUnknown_08513C64,
+    gUnknown_08514024,
+    gUnknown_08513C64
+};
+
+const u16 gUnknown_085143F4[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/0.4bpp");
+
+const u16 gUnknown_08514474[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/1.4bpp");
+
+const u16 gUnknown_085144F4[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/2.4bpp");
+
+const u16 gUnknown_08514574[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/3.4bpp");
+
+const u16 *const gTilesetAnims_Underwater0[] = {
+    gUnknown_085143F4,
+    gUnknown_08514474,
+    gUnknown_085144F4,
+    gUnknown_08514574
+};
+
+const u16 gUnknown_08514604[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/0.4bpp");
+
+const u16 gUnknown_08514704[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/1.4bpp");
+
+const u16 gUnknown_08514804[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/2.4bpp");
+
+const u16 gUnknown_08514904[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/3.4bpp");
+
+const u16 gUnknown_08514A04[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/4.4bpp");
+
+const u16 gUnknown_08514B04[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/5.4bpp");
+
+const u16 gUnknown_08514C04[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/6.4bpp");
+
+const u16 gUnknown_08514D04[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/7.4bpp");
+
+const u16 *const gTilesetAnims_Pacifidlog1[] = {
+    gUnknown_08514604,
+    gUnknown_08514704,
+    gUnknown_08514804,
+    gUnknown_08514904,
+    gUnknown_08514A04,
+    gUnknown_08514B04,
+    gUnknown_08514C04,
+    gUnknown_08514D04
+};
+
+const u16 gUnknown_08514E24[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/0.4bpp");
+
+const u16 gUnknown_08514EA4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/1.4bpp");
+
+const u16 gUnknown_08514F24[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/2.4bpp");
+
+const u16 gUnknown_08514FA4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/3.4bpp");
+
+const u16 gUnknown_08515024[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/1/a/1.4bpp");
+
+const u16 gUnknown_085150A4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/0.4bpp");
+
+const u16 gUnknown_08515124[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/1.4bpp");
+
+const u16 gUnknown_085151A4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/2.4bpp");
+
+const u16 gUnknown_08515224[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/3.4bpp");
+
+const u16 gUnknown_085152A4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/1/b/1.4bpp");
+
+const u16 tileset_anims_space_1[16] = {};
+
+u16 *const gTilesetAnims_MauvilleVDests0[] = {
+    (u16 *)(BG_VRAM + 0x4c00),
+    (u16 *)(BG_VRAM + 0x4c80),
+    (u16 *)(BG_VRAM + 0x4d00),
+    (u16 *)(BG_VRAM + 0x4d80),
+    (u16 *)(BG_VRAM + 0x4e00),
+    (u16 *)(BG_VRAM + 0x4e80),
+    (u16 *)(BG_VRAM + 0x4f00),
+    (u16 *)(BG_VRAM + 0x4f80)
+};
+
+u16 *const gTilesetAnims_MauvilleVDests1[] = {
+    (u16 *)(BG_VRAM + 0x5000),
+    (u16 *)(BG_VRAM + 0x5080),
+    (u16 *)(BG_VRAM + 0x5100),
+    (u16 *)(BG_VRAM + 0x5180),
+    (u16 *)(BG_VRAM + 0x5200),
+    (u16 *)(BG_VRAM + 0x5280),
+    (u16 *)(BG_VRAM + 0x5300),
+    (u16 *)(BG_VRAM + 0x5380)
+};
+
+const u16 *const gTilesetAnims_Mauville0a[] = {
+    gUnknown_08514E24,
+    gUnknown_08514E24,
+    gUnknown_08514EA4,
+    gUnknown_08514F24,
+    gUnknown_08514FA4,
+    gUnknown_08514FA4,
+    gUnknown_08514FA4,
+    gUnknown_08514FA4,
+    gUnknown_08514FA4,
+    gUnknown_08514FA4,
+    gUnknown_08514F24,
+    gUnknown_08514EA4
+};
+
+const u16 *const gTilesetAnims_Mauville0b[] = {
+    gUnknown_085150A4,
+    gUnknown_085150A4,
+    gUnknown_08515124,
+    gUnknown_085151A4,
+    gUnknown_08515224,
+    gUnknown_08515224,
+    gUnknown_08515224,
+    gUnknown_08515224,
+    gUnknown_08515224,
+    gUnknown_08515224,
+    gUnknown_085151A4,
+    gUnknown_08515124
+};
+
+const u16 *const gTilesetAnims_Mauville1a[] = {
+    gUnknown_08514E24,
+    gUnknown_08514E24,
+    gUnknown_08515024,
+    gUnknown_08515024
+};
+
+const u16 *const gTilesetAnims_Mauville1b[] = {
+    gUnknown_085150A4,
+    gUnknown_085150A4,
+    gUnknown_085152A4,
+    gUnknown_085152A4
+};
+
+const u16 gUnknown_08515404[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/0.4bpp");
+
+const u16 gUnknown_08515484[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/1.4bpp");
+
+const u16 gUnknown_08515504[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/2.4bpp");
+
+const u16 gUnknown_08515584[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/3.4bpp");
+
+const u16 gUnknown_08515604[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/4.4bpp");
+
+const u16 gUnknown_08515684[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/5.4bpp");
+
+const u16 gUnknown_08515704[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/6.4bpp");
+
+const u16 gUnknown_08515784[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/7.4bpp");
+
+u16 *const gTilesetAnims_RustboroVDests0[] = {
+    (u16 *)(BG_VRAM + 0x5000),
+    (u16 *)(BG_VRAM + 0x5080),
+    (u16 *)(BG_VRAM + 0x5100),
+    (u16 *)(BG_VRAM + 0x5180),
+    (u16 *)(BG_VRAM + 0x5200),
+    (u16 *)(BG_VRAM + 0x5280),
+    (u16 *)(BG_VRAM + 0x5300),
+    (u16 *)(BG_VRAM + 0x5380)
+};
+
+const u16 *const gTilesetAnims_Rustboro0[] = {
+    gUnknown_08515404,
+    gUnknown_08515484,
+    gUnknown_08515504,
+    gUnknown_08515584,
+    gUnknown_08515604,
+    gUnknown_08515684,
+    gUnknown_08515704,
+    gUnknown_08515784
+};
+
+const u16 gUnknown_08515844[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/1/0.4bpp");
+
+const u16 gUnknown_085158C4[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/1/1.4bpp");
+
+const u16 tileset_anims_space_2[16] = {};
+
+const u16 *const gTilesetAnims_Rustboro1[] = {
+    gUnknown_08515844,
+    gUnknown_085158C4
+};
+
+const u16 gUnknown_0851596C[] = INCBIN_U16("data/tilesets/secondary/cave/anim/0.4bpp");
+
+const u16 gUnknown_085159EC[] = INCBIN_U16("data/tilesets/secondary/cave/anim/1.4bpp");
+
+const u16 gUnknown_08515A6C[] = INCBIN_U16("data/tilesets/secondary/cave/anim/2.4bpp");
+
+const u16 gUnknown_08515AEC[] = INCBIN_U16("data/tilesets/secondary/cave/anim/3.4bpp");
+
+const u16 gUnknown_08515B6C[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/0.4bpp");
+
+const u16 gUnknown_08515BEC[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/1.4bpp");
+
+const u16 gUnknown_08515C6C[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/2.4bpp");
+
+const u16 gUnknown_08515CEC[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/3.4bpp");
+
+const u16 tileset_anims_space_3[16] = {};
+
+const u16 *const gTilesetAnims_Lavaridge1_Cave0[] = {
+    gUnknown_0851596C,
+    gUnknown_085159EC,
+    gUnknown_08515A6C,
+    gUnknown_08515AEC
+};
+
+const u16 gUnknown_08515D9C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/0.4bpp");
+
+const u16 gUnknown_08515E1C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/1.4bpp");
+
+const u16 gUnknown_08515E9C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/2.4bpp");
+
+const u16 gUnknown_08515F1C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/3.4bpp");
+
+const u16 gUnknown_08515F9C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/4.4bpp");
+
+const u16 gUnknown_0851601C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/5.4bpp");
+
+const u16 gUnknown_0851609C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/6.4bpp");
+
+const u16 gUnknown_0851611C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/7.4bpp");
+
+const u16 tileset_anims_space_4[16] = {};
+
+u16 *const gTilesetAnims_EverGrandeVDests0[] = {
+    (u16 *)(BG_VRAM + 0x5c00),
+    (u16 *)(BG_VRAM + 0x5c80),
+    (u16 *)(BG_VRAM + 0x5d00),
+    (u16 *)(BG_VRAM + 0x5d80),
+    (u16 *)(BG_VRAM + 0x5e00),
+    (u16 *)(BG_VRAM + 0x5e80),
+    (u16 *)(BG_VRAM + 0x5f00),
+    (u16 *)(BG_VRAM + 0x5f80)
+};
+
+const u16 *const gTilesetAnims_EverGrande0[] = {
+    gUnknown_08515D9C,
+    gUnknown_08515E1C,
+    gUnknown_08515E9C,
+    gUnknown_08515F1C,
+    gUnknown_08515F9C,
+    gUnknown_0851601C,
+    gUnknown_0851609C,
+    gUnknown_0851611C
+};
+
+const u16 gUnknown_085161FC[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/0.4bpp");
+
+const u16 gUnknown_085162BC[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/1.4bpp");
+
+const u16 gUnknown_0851637C[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/2.4bpp");
+
+const u16 gUnknown_0851643C[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/3.4bpp");
+
+const u16 *const gTilesetAnims_Dewford0[] = {
+    gUnknown_085161FC,
+    gUnknown_085162BC,
+    gUnknown_0851637C,
+    gUnknown_0851643C
+};
+
+const u16 gUnknown_0851650C[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/0.4bpp");
+
+const u16 gUnknown_085165CC[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/1.4bpp");
+
+const u16 gUnknown_0851668C[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/2.4bpp");
+
+const u16 gUnknown_0851674C[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/3.4bpp");
+
+const u16 *const gTilesetAnims_BattleFrontierOutsideWest0[] = {
+    gUnknown_0851650C,
+    gUnknown_085165CC,
+    gUnknown_0851668C,
+    gUnknown_0851674C
+};
+
+const u16 gUnknown_0851681C[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/0.4bpp");
+
+const u16 gUnknown_085168DC[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/1.4bpp");
+
+const u16 gUnknown_0851699C[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/2.4bpp");
+
+const u16 gUnknown_08516A5C[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/3.4bpp");
+
+const u16 *const gTilesetAnims_BattleFrontierOutsideEast0[] = {
+    gUnknown_0851681C,
+    gUnknown_085168DC,
+    gUnknown_0851699C,
+    gUnknown_08516A5C
+};
+
+const u16 gUnknown_08516B2C[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/0.4bpp");
+
+const u16 gUnknown_08516BAC[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/1.4bpp");
+
+const u16 gUnknown_08516C2C[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/2.4bpp");
+
+const u16 gUnknown_08516CAC[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/3.4bpp");
+
+const u16 *const gTilesetAnims_Slateport0[] = {
+    gUnknown_08516B2C,
+    gUnknown_08516BAC,
+    gUnknown_08516C2C,
+    gUnknown_08516CAC
+};
+
+const u16 gUnknown_08516D3C[] = INCBIN_U16("data/tilesets/primary/building/anim/0.4bpp");
+
+const u16 gUnknown_08516DBC[] = INCBIN_U16("data/tilesets/primary/building/anim/1.4bpp");
+
+const u16 *const gTilesetAnims_InsideBuilding0[] = {
+    gUnknown_08516D3C,
+    gUnknown_08516DBC
+};
+
+const u16 gUnknown_08516E44[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/0.4bpp");
+
+const u16 gUnknown_08516FC4[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/1.4bpp");
+
+const u16 gUnknown_08517144[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/2.4bpp");
+
+const u16 gUnknown_085172C4[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/0.4bpp");
+
+const u16 gUnknown_08517544[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/1.4bpp");
+
+const u16 gUnknown_085177C4[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/2.4bpp");
+
+const u16 *const gTilesetAnims_SootopolisGym0[] = {
+    gUnknown_08516E44,
+    gUnknown_08516FC4,
+    gUnknown_08517144
+};
+
+const u16 *const gTilesetAnims_SootopolisGym1[] = {
+    gUnknown_085172C4,
+    gUnknown_08517544,
+    gUnknown_085177C4
+};
+
+const u16 gUnknown_08517A5C[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/1/0.4bpp");
+
+const u16 gUnknown_08517ADC[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/1/1.4bpp");
+
+const u16 gUnknown_08517B5C[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/0.4bpp");
+
+const u16 gUnknown_08517B7C[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/1.4bpp");
+
+const u16 gUnknown_08517B9C[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/2.4bpp");
+
+const u16 gUnknown_08517BBC[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/3.4bpp");
+
+const u16 tileset_anims_space_5[16] = {};
+
+const u16 *const gTilesetAnims_EliteFour1[] = {
+    gUnknown_08517B5C,
+    gUnknown_08517B7C,
+    gUnknown_08517B9C,
+    gUnknown_08517BBC
+};
+
+const u16 *const gTilesetAnims_EliteFour0[] = {
+    gUnknown_08517A5C,
+    gUnknown_08517ADC
+};
+
+const u16 gUnknown_08517C14[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/0.4bpp");
+
+const u16 gUnknown_08517E14[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/1.4bpp");
+
+const u16 tileset_anims_space_6[16] = {};
+
+const u16 *const gTilesetAnims_MauvilleGym0[] = {
+    gUnknown_08517C14,
+    gUnknown_08517E14
+};
+
+const u16 gUnknown_0851803C[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/0.4bpp");
+
+const u16 gUnknown_0851815C[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/1.4bpp");
+
+const u16 tileset_anims_space_7[16] = {};
+
+const u16 *const gTilesetAnims_BikeShop0[] = {
+    gUnknown_0851803C,
+    gUnknown_0851815C
+};
+
+const u16 gUnknown_085182A4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/0.4bpp");
+
+const u16 gUnknown_08518EA4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/1.4bpp");
+
+const u16 gUnknown_08519AA4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/2.4bpp");
+
+const u16 gUnknown_0851A6A4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/3.4bpp");
+
+const u16 gUnknown_0851B2A4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/4.4bpp");
+
+const u16 gUnknown_0851BEA4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/5.4bpp");
+
+const u16 gUnknown_0851CAA4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/6.4bpp");
+
+const u16 gUnknown_0851D6A4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/7.4bpp");
+
+const u16 tileset_anims_space_8[16] = {};
+
+const u16 gUnknown_0851E2C4[] = INCBIN_U16("data/tilesets/secondary/unused_1/0.4bpp");
+
+const u16 gUnknown_0851EAC4[] = INCBIN_U16("data/tilesets/secondary/unused_1/1.4bpp");
+
+const u16 gUnknown_0851F2C4[] = INCBIN_U16("data/tilesets/secondary/unused_1/2.4bpp");
+
+const u16 gUnknown_0851FAC4[] = INCBIN_U16("data/tilesets/secondary/unused_1/3.4bpp");
+
+const u16 *const gTilesetAnims_Sootopolis0[] = {
+    gUnknown_085182A4,
+    gUnknown_08518EA4,
+    gUnknown_08519AA4,
+    gUnknown_0851A6A4,
+    gUnknown_0851B2A4,
+    gUnknown_0851BEA4,
+    gUnknown_0851CAA4,
+    gUnknown_0851D6A4
+};
+
+const u16 gUnknown_085202E4[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/0.4bpp");
+
+const u16 gUnknown_085203E4[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/1.4bpp");
+
+const u16 gUnknown_085204E4[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/2.4bpp");
+
+const u16 tileset_anims_space_9[16] = {};
+
+const u16 gUnknown_08520604[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/0.4bpp");
+
+const u16 gUnknown_08520704[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/1.4bpp");
+
+const u16 gUnknown_08520804[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/2.4bpp");
+
+const u16 tileset_anims_space_10[7808] = {};
+
+const u16 gUnknown_08524604[] = INCBIN_U16("data/tilesets/secondary/unused_2/0.4bpp");
+
+const u16 tileset_anims_space_11[224] = {};
+
+const u16 gUnknown_08524804[] = INCBIN_U16("data/tilesets/secondary/unused_2/1.4bpp");
+
+const u16 *const gTilesetAnims_BattlePyramid0[] = {
+    gUnknown_085202E4,
+    gUnknown_085203E4,
+    gUnknown_085204E4
+};
+
+const u16 *const gTilesetAnims_BattlePyramid1[] = {
+    gUnknown_08520604,
+    gUnknown_08520704,
+    gUnknown_08520804
+};
 
 extern const u16 gUnknown_08D85640[];
 extern const u16 gUnknown_08D85660[];

From 572648ba2d82dbdc8a05ba3d38908e1a1c326e0e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 2 Oct 2017 21:51:22 -0400
Subject: [PATCH 24/42] BSS: field_screen, field_effect,
 pokemon_storage_system, fldeff_cut, script_menu

---
 src/field_effect.c           | 15 +++++++++++++++
 src/field_screen.c           | 15 +++++++++++++++
 src/fldeff_cut.c             | 19 +++++++++++++++++++
 src/pokemon_storage_system.c | 15 +++++++++++++++
 src/script_menu.c            | 16 ++++++++++++++++
 sym_bss.txt                  | 30 +++++-------------------------
 6 files changed, 85 insertions(+), 25 deletions(-)
 create mode 100644 src/field_effect.c
 create mode 100644 src/field_screen.c
 create mode 100644 src/fldeff_cut.c
 create mode 100644 src/pokemon_storage_system.c
 create mode 100644 src/script_menu.c

diff --git a/src/field_effect.c b/src/field_effect.c
new file mode 100644
index 000000000..628dc776a
--- /dev/null
+++ b/src/field_effect.c
@@ -0,0 +1,15 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+IWRAM_DATA u8 gUnknown_03000F58[32];
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/src/field_screen.c b/src/field_screen.c
new file mode 100644
index 000000000..2d33d237f
--- /dev/null
+++ b/src/field_screen.c
@@ -0,0 +1,15 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+// Static RAM declarations
+IWRAM_DATA u8 *gUnknown_03000F50;
+IWRAM_DATA u32 filler_03000f54;
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
new file mode 100644
index 000000000..9929dd6f9
--- /dev/null
+++ b/src/fldeff_cut.c
@@ -0,0 +1,19 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+IWRAM_DATA u8 gUnknown_03001100;
+IWRAM_DATA u8 gUnknown_03001101;
+IWRAM_DATA u8 gUnknown_03001102;
+IWRAM_DATA u32 fldeff_cut_unused_03001104;
+IWRAM_DATA u8 gUnknown_03001108[25];
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
new file mode 100644
index 000000000..3e409244c
--- /dev/null
+++ b/src/pokemon_storage_system.c
@@ -0,0 +1,15 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+IWRAM_DATA u8 gUnknown_03000F78[0x188];
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/src/script_menu.c b/src/script_menu.c
new file mode 100644
index 000000000..04f1e82b7
--- /dev/null
+++ b/src/script_menu.c
@@ -0,0 +1,16 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+IWRAM_DATA u8 gUnknown_03001124[6];
+IWRAM_DATA u32 filler_0300112c;
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/sym_bss.txt b/sym_bss.txt
index 3416b67df..a90378a4f 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -1,4 +1,3 @@
-gUnknown_03000000: @ 3000000
 	.include "src/main.o"
 	.include "src/malloc.o"
 	.include "src/dma3_manager.o"
@@ -20,30 +19,11 @@ gUnknown_03000000: @ 3000000
     .include "src/tileset_anims.o"
     .include "src/palette.o"
     .include "src/sound.o"
-
-gUnknown_03000F50: @ 3000F50
-	.space 0x8
-
-gUnknown_03000F58: @ 3000F58
-	.space 0x20
-
-gUnknown_03000F78: @ 3000F78
-	.space 0x188
-
-gUnknown_03001100: @ 3001100
-	.space 0x1
-
-gUnknown_03001101: @ 3001101
-	.space 0x1
-
-gUnknown_03001102: @ 3001102
-	.space 0x6
-
-gUnknown_03001108: @ 3001108
-	.space 0x1C
-
-gUnknown_03001124: @ 3001124
-	.space 0xC
+    .include "src/field_screen.o"
+    .include "src/field_effect.o"
+    .include "src/pokemon_storage_system.o"
+    .include "src/fldeff_cut.o"
+    .include "src/script_menu.o"
 
 gUnknown_03001130: @ 3001130
 	.space 0x4

From ce5ac9d782c100a5e9ed58ed7ba611565d7d7a50 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 2 Oct 2017 22:02:22 -0400
Subject: [PATCH 25/42] BSS: record_mixing

---
 src/record_mixing.c | 28 ++++++++++++++++++++++++++++
 sym_bss.txt         | 43 +------------------------------------------
 2 files changed, 29 insertions(+), 42 deletions(-)
 create mode 100644 src/record_mixing.c

diff --git a/src/record_mixing.c b/src/record_mixing.c
new file mode 100644
index 000000000..151835e5e
--- /dev/null
+++ b/src/record_mixing.c
@@ -0,0 +1,28 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+IWRAM_DATA bool8 gUnknown_03001130;
+IWRAM_DATA struct SecretBaseRecord *gUnknown_03001134;
+IWRAM_DATA TVShow *gUnknown_03001138;
+IWRAM_DATA struct UnknownSaveStruct2ABC *gUnknown_0300113C;
+IWRAM_DATA OldMan *gUnknown_03001140;
+IWRAM_DATA struct EasyChatPair *gUnknown_03001144;
+IWRAM_DATA struct DaycareData *gUnknown_03001148;
+IWRAM_DATA void *gUnknown_0300114C; // gSaveBlock2Ptr->field_64C
+IWRAM_DATA LilycoveLady *gUnknown_03001150;
+IWRAM_DATA void *gUnknown_03001154; // gSaveBlock2Ptr->field_0DC;
+IWRAM_DATA void *gUnknown_03001158; // gSaveBlock2Ptr->field_64C
+IWRAM_DATA u32 gUnknown_0300115C;
+IWRAM_DATA u8 gUnknown_03001160[8];
+IWRAM_DATA u32 gUnknown_03001168[3];
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/sym_bss.txt b/sym_bss.txt
index a90378a4f..f32300b15 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -24,48 +24,7 @@
     .include "src/pokemon_storage_system.o"
     .include "src/fldeff_cut.o"
     .include "src/script_menu.o"
-
-gUnknown_03001130: @ 3001130
-	.space 0x4
-
-gUnknown_03001134: @ 3001134
-	.space 0x4
-
-gUnknown_03001138: @ 3001138
-	.space 0x4
-
-gUnknown_0300113C: @ 300113C
-	.space 0x4
-
-gUnknown_03001140: @ 3001140
-	.space 0x4
-
-gUnknown_03001144: @ 3001144
-	.space 0x4
-
-gUnknown_03001148: @ 3001148
-	.space 0x4
-
-gUnknown_0300114C: @ 300114C
-	.space 0x4
-
-gUnknown_03001150: @ 3001150
-	.space 0x4
-
-gUnknown_03001154: @ 3001154
-	.space 0x4
-
-gUnknown_03001158: @ 3001158
-	.space 0x4
-
-gUnknown_0300115C: @ 300115C
-	.space 0x4
-
-gUnknown_03001160: @ 3001160
-	.space 0x8
-
-gUnknown_03001168: @ 3001168
-	.space 0xC
+    .include "src/record_mixing.o"
 
 gUnknown_03001174: @ 3001174
 	.space 0x1

From c8114eb3a5c9ca2b63fbed90e0e6715b4957b2b7 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 3 Oct 2017 12:11:13 +0200
Subject: [PATCH 26/42] create battle_transition.h

---
 include/battle.h            | 3 ---
 include/battle_transition.h | 6 ++++++
 src/tileset_anims.c         | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 include/battle_transition.h

diff --git a/include/battle.h b/include/battle.h
index bc70b86ea..67d3d873d 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -927,9 +927,6 @@ u8 GetBankSide(u8 bank);
 u8 GetBankIdentity(u8 bank);
 u8 GetBankByIdentity(u8 bank);
 
-// battle_transition
-void sub_8149DFC(u8 a1);
-
 // Move this somewhere else
 
 #include "sprite.h"
diff --git a/include/battle_transition.h b/include/battle_transition.h
new file mode 100644
index 000000000..1603f5c93
--- /dev/null
+++ b/include/battle_transition.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_BATTLE_TRANSITION_H
+#define GUARD_BATTLE_TRANSITION_H
+
+void sub_8149DFC(u8 a1);
+
+#endif // GUARD_BATTLE_TRANSITION_H
diff --git a/src/tileset_anims.c b/src/tileset_anims.c
index e53461e02..4ad787e1c 100644
--- a/src/tileset_anims.c
+++ b/src/tileset_anims.c
@@ -3,7 +3,7 @@
 #include "global.h"
 #include "palette.h"
 #include "blend_palette.h"
-#include "battle.h"
+#include "battle_transition.h"
 #include "task.h"
 
 // Static type declarations

From 46fe1f441f1f40633b538c9db7d24aa4439629cf Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 3 Oct 2017 21:35:27 +0200
Subject: [PATCH 27/42] giant battle handler is done wohohohhohoho

---
 asm/battle_2.s                 | 1715 --------------------------------
 asm/battle_controller_player.s |    2 +-
 asm/recorded_battle.s          |    6 +-
 asm/rom3.s                     |   24 +-
 data/battle_scripts_1.s        |    2 +-
 include/battle.h               |   11 +-
 include/battle_controllers.h   |   18 +-
 include/recorded_battle.h      |    3 +
 src/battle_2.c                 |  478 +++++++++
 src/battle_3.c                 |   18 +-
 sym_ewram.txt                  |    4 +-
 11 files changed, 530 insertions(+), 1751 deletions(-)

diff --git a/asm/battle_2.s b/asm/battle_2.s
index 2ff446dd0..5f970d766 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -4,1721 +4,6 @@
 	.syntax unified
 
 	.text
-    
-
-	thumb_func_start sub_803BDA0
-sub_803BDA0: @ 803BDA0
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r3, 0
-	ldr r0, =gBattlePartyID
-	mov r8, r0
-	ldr r1, =gUnknown_0203CF00
-	mov r12, r1
-	ldr r7, =gBattleStruct
-	lsls r0, r5, 1
-	adds r4, r0, r5
-	adds r6, r0, 0
-_0803BDBC:
-	mov r0, r12
-	adds r2, r3, r0
-	ldr r1, [r7]
-	adds r0, r4, r3
-	adds r0, r1
-	adds r0, 0x60
-	ldrb r0, [r0]
-	strb r0, [r2]
-	adds r3, 0x1
-	cmp r3, 0x2
-	ble _0803BDBC
-	mov r1, r8
-	adds r0, r6, r1
-	ldrb r0, [r0]
-	bl pokemon_order_func
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r7, =gBattleStruct
-	ldr r0, [r7]
-	adds r0, r5, r0
-	adds r0, 0x5C
-	ldrb r0, [r0]
-	bl pokemon_order_func
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl sub_81B8FB0
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0803BE4C
-	movs r3, 0
-	adds r4, r7, 0
-	adds r6, r5
-	movs r0, 0x2
-	adds r1, r5, 0
-	eors r1, r0
-	ldr r7, =gUnknown_0203CF00
-	lsls r0, r1, 1
-	adds r5, r0, r1
-_0803BE1A:
-	ldr r0, [r4]
-	adds r1, r6, r3
-	adds r1, r0
-	adds r1, 0x60
-	adds r2, r3, r7
-	ldrb r0, [r2]
-	strb r0, [r1]
-	ldr r1, [r4]
-	adds r0, r5, r3
-	adds r0, r1
-	adds r0, 0x60
-	ldrb r1, [r2]
-	strb r1, [r0]
-	adds r3, 0x1
-	cmp r3, 0x2
-	ble _0803BE1A
-	b _0803BE66
-	.pool
-_0803BE4C:
-	movs r3, 0
-	adds r2, r6, r5
-	ldr r4, =gUnknown_0203CF00
-_0803BE52:
-	ldr r0, [r7]
-	adds r1, r2, r3
-	adds r1, r0
-	adds r1, 0x60
-	adds r0, r3, r4
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r3, 0x1
-	cmp r3, 0x2
-	ble _0803BE52
-_0803BE66:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803BDA0
-
-	thumb_func_start sub_803BE74
-sub_803BE74: @ 803BE74
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x1C
-	ldr r0, =gBattleCommunication
-	movs r1, 0
-	strb r1, [r0, 0x4]
-	ldr r0, =gActiveBank
-	strb r1, [r0]
-	ldr r0, =gNoOfAllBanks
-	bl _0803CD12
-	.pool
-_0803BE9C:
-	ldr r4, =gActiveBank
-	ldrb r0, [r4]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r4]
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0x8
-	bls _0803BEB8
-	bl _0803CD04
-_0803BEB8:
-	lsls r0, 2
-	ldr r1, =_0803BED0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_0803BED0:
-	.4byte _0803BEF4
-	.4byte _0803BF0C
-	.4byte _0803C02C
-	.4byte _0803C7D8
-	.4byte _0803CAD0
-	.4byte _0803CB84
-	.4byte _0803CBC8
-	.4byte _0803CBF4
-	.4byte _0803CC38
-_0803BEF4:
-	bl sub_8185FD0
-	ldr r1, =gBattleCommunication
-	ldr r0, =gActiveBank
-	ldrb r0, [r0]
-	adds r0, r1
-	bl _0803CC20
-	.pool
-_0803BF0C:
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	ldr r4, =gBattleStruct
-	ldr r0, [r4]
-	adds r1, r0
-	adds r1, 0x5C
-	movs r0, 0x6
-	strb r0, [r1]
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x40
-	ands r0, r1
-	cmp r0, 0
-	bne _0803BF68
-	movs r1, 0x2
-	movs r0, 0x2
-	ands r0, r5
-	cmp r0, 0
-	beq _0803BF68
-	eors r5, r1
-	adds r0, r5, 0
-	bl GetBankByIdentity
-	ldr r1, [r4]
-	adds r1, 0x91
-	ldrb r1, [r1]
-	ldr r2, =gBitTable
-	lsls r0, 24
-	lsrs r0, 22
-	adds r0, r2
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	bne _0803BF68
-	ldr r4, =gBattleCommunication
-	adds r0, r5, 0
-	bl GetBankByIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0x5
-	beq _0803BF68
-	bl _0803CD04
-_0803BF68:
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-	adds r0, 0x91
-	ldrb r3, [r0]
-	ldr r1, =gBitTable
-	ldr r4, =gActiveBank
-	ldrb r2, [r4]
-	lsls r0, r2, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ands r3, r0
-	cmp r3, 0
-	beq _0803BFD0
-	ldr r0, =gActionForBanks
-	adds r0, r2, r0
-	movs r1, 0xD
-	strb r1, [r0]
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x40
-	ands r0, r1
-	cmp r0, 0
-	bne _0803BFBC
-	ldr r0, =gBattleCommunication
-	ldrb r1, [r4]
-	adds r1, r0
-	movs r0, 0x5
-	strb r0, [r1]
-	bl _0803CD04
-	.pool
-_0803BFBC:
-	ldr r0, =gBattleCommunication
-	ldrb r1, [r4]
-	adds r1, r0
-	movs r0, 0x4
-	strb r0, [r1]
-	bl _0803CD04
-	.pool
-_0803BFD0:
-	ldr r1, =gBattleMons
-	movs r0, 0x58
-	muls r0, r2
-	adds r1, 0x50
-	adds r0, r1
-	ldr r1, [r0]
-	movs r0, 0x80
-	lsls r0, 5
-	ands r0, r1
-	cmp r0, 0
-	bne _0803BFF0
-	movs r0, 0x80
-	lsls r0, 15
-	ands r1, r0
-	cmp r1, 0
-	beq _0803C00C
-_0803BFF0:
-	ldr r0, =gActionForBanks
-	adds r0, r2, r0
-	strb r3, [r0]
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r4]
-	bl _0803CC72
-	.pool
-_0803C00C:
-	ldr r0, =gActionForBanks
-	ldrb r1, [r0]
-	ldr r0, =gBattleBufferB
-	ldrb r2, [r0, 0x1]
-	ldrb r0, [r0, 0x2]
-	lsls r0, 8
-	orrs r2, r0
-	movs r0, 0
-	bl dp01_build_cmdbuf_x12_a_bb
-	bl _0803CB68
-	.pool
-_0803C02C:
-	ldr r3, =gBattleExecBuffer
-	ldr r1, =gBitTable
-	ldr r6, =gActiveBank
-	ldrb r5, [r6]
-	lsls r0, r5, 2
-	adds r0, r1
-	ldr r2, [r0]
-	lsls r1, r2, 4
-	movs r0, 0xF0
-	lsls r0, 24
-	orrs r1, r0
-	orrs r1, r2
-	lsls r0, r2, 8
-	orrs r1, r0
-	lsls r2, 12
-	orrs r1, r2
-	ldr r0, [r3]
-	ands r0, r1
-	cmp r0, 0
-	beq _0803C058
-	bl _0803CD04
-_0803C058:
-	ldr r4, =gBattleBufferB
-	lsls r0, r5, 9
-	adds r4, 0x1
-	adds r0, r4
-	ldrb r1, [r0]
-	adds r0, r5, 0
-	bl RecordedBattle_SetBankAction
-	ldr r1, =gActionForBanks
-	ldrb r0, [r6]
-	adds r1, r0, r1
-	lsls r0, 9
-	adds r0, r4
-	ldrb r0, [r0]
-	strb r0, [r1]
-	ldrb r0, [r6]
-	lsls r0, 9
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0xC
-	bls _0803C084
-	b _0803C6C4
-_0803C084:
-	lsls r0, 2
-	ldr r1, =_0803C0A8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_0803C0A8:
-	.4byte _0803C0DC
-	.4byte _0803C230
-	.4byte _0803C268
-	.4byte _0803C6C4
-	.4byte _0803C6C4
-	.4byte _0803C440
-	.4byte _0803C48C
-	.4byte _0803C6C4
-	.4byte _0803C6C4
-	.4byte _0803C6C4
-	.4byte _0803C6C4
-	.4byte _0803C6C4
-	.4byte _0803C4B4
-_0803C0DC:
-	bl AreAllMovesUnusable
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803C134
-	ldr r0, =gBattleCommunication
-	ldr r3, =gActiveBank
-	ldrb r1, [r3]
-	adds r1, r0
-	movs r4, 0
-	movs r0, 0x6
-	strb r0, [r1]
-	ldrb r1, [r3]
-	ldr r2, =gBattleStruct
-	ldr r0, [r2]
-	adds r1, r0
-	adds r1, 0x54
-	strb r4, [r1]
-	ldrb r1, [r3]
-	ldr r0, [r2]
-	adds r1, r0
-	adds r1, 0x84
-	movs r0, 0x4
-	strb r0, [r1]
-	ldrb r1, [r3]
-	ldr r2, [r2]
-	adds r2, r1, r2
-	ldr r0, =gBattleBufferB
-	lsls r1, 9
-	adds r0, 0x3
-	adds r1, r0
-	ldrb r0, [r1]
-	strb r0, [r2, 0xC]
-	bl _0803CD70
-	.pool
-_0803C134:
-	ldr r3, =gDisableStructs
-	ldr r5, =gActiveBank
-	ldrb r4, [r5]
-	lsls r0, r4, 3
-	subs r0, r4
-	lsls r0, 2
-	adds r0, r3
-	ldrh r2, [r0, 0x6]
-	cmp r2, 0
-	beq _0803C188
-	ldr r1, =gChosenMovesByBanks
-	lsls r0, r4, 1
-	adds r0, r1
-	strh r2, [r0]
-	ldrb r2, [r5]
-	ldr r0, =gBattleStruct
-	ldr r1, [r0]
-	adds r1, r2, r1
-	adds r1, 0x80
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	adds r0, r3
-	ldrb r0, [r0, 0xC]
-	strb r0, [r1]
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r5]
-	adds r0, r1
-	movs r1, 0x4
-	strb r1, [r0]
-	bl _0803CD70
-	.pool
-_0803C188:
-	add r2, sp, 0x4
-	ldr r3, =gBattleMons
-	movs r1, 0x58
-	adds r0, r4, 0
-	muls r0, r1
-	adds r0, r3
-	ldrh r0, [r0]
-	strh r0, [r2, 0x10]
-	ldrb r0, [r5]
-	muls r0, r1
-	adds r0, r3
-	adds r0, 0x21
-	ldrb r0, [r0]
-	strb r0, [r2, 0x12]
-	ldrb r0, [r5]
-	muls r0, r1
-	adds r0, r3
-	adds r0, 0x22
-	ldrb r0, [r0]
-	strb r0, [r2, 0x13]
-	movs r4, 0
-	mov r1, sp
-	adds r1, 0xC
-	str r1, [sp, 0x18]
-	add r2, sp, 0x10
-	mov r10, r2
-	mov r8, r3
-	adds r7, r5, 0
-	movs r6, 0x58
-	movs r0, 0xC
-	add r0, r8
-	mov r9, r0
-	add r5, sp, 0x4
-_0803C1CA:
-	lsls r2, r4, 1
-	ldrb r0, [r7]
-	muls r0, r6
-	adds r0, r2, r0
-	add r0, r9
-	ldrh r0, [r0]
-	strh r0, [r5]
-	ldr r1, [sp, 0x18]
-	adds r3, r1, r4
-	ldrb r0, [r7]
-	muls r0, r6
-	adds r0, r4, r0
-	mov r1, r8
-	adds r1, 0x24
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r3]
-	ldrb r0, [r7]
-	adds r1, r0, 0
-	muls r1, r6
-	adds r2, r1
-	add r2, r9
-	ldrh r0, [r2]
-	add r1, r8
-	adds r1, 0x3B
-	ldrb r1, [r1]
-	lsls r2, r4, 24
-	lsrs r2, 24
-	bl CalculatePPWithBonus
-	mov r2, r10
-	adds r1, r2, r4
-	strb r0, [r1]
-	adds r5, 0x2
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _0803C1CA
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r0, 0x1
-	ands r1, r0
-	movs r0, 0
-	movs r2, 0
-	add r3, sp, 0x4
-	bl sub_8033E30
-	b _0803C42E
-	.pool
-_0803C230:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	ldr r1, =0x021f0902
-	ands r0, r1
-	cmp r0, 0
-	bne _0803C23E
-	b _0803C48C
-_0803C23E:
-	ldr r4, =gActiveBank
-	ldrb r0, [r4]
-	movs r1, 0x1
-	bl sub_8185008
-	ldr r1, =gUnknown_02024220
-	ldrb r0, [r4]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, =gUnknown_082DB879
-	b _0803C784
-	.pool
-_0803C268:
-	ldr r5, =gActiveBank
-	ldrb r0, [r5]
-	ldr r3, =gBattleStruct
-	ldr r1, [r3]
-	adds r1, r0, r1
-	adds r1, 0x58
-	ldr r2, =gBattlePartyID
-	lsls r0, 1
-	adds r0, r2
-	ldrh r0, [r0]
-	strb r0, [r1]
-	ldr r7, =gBattleMons
-	ldrb r2, [r5]
-	movs r6, 0x58
-	adds r0, r2, 0
-	muls r0, r6
-	adds r1, r7, 0
-	adds r1, 0x50
-	adds r0, r1
-	ldr r1, [r0]
-	ldr r0, =0x0400e000
-	ands r1, r0
-	cmp r1, 0
-	bne _0803C2B8
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 11
-	ands r0, r1
-	cmp r0, 0
-	bne _0803C2B8
-	ldr r0, =gStatuses3
-	lsls r1, r2, 2
-	adds r1, r0
-	ldr r1, [r1]
-	movs r0, 0x80
-	lsls r0, 3
-	ands r1, r0
-	cmp r1, 0
-	beq _0803C2EC
-_0803C2B8:
-	ldr r0, =gActiveBank
-	ldrb r0, [r0]
-	lsls r1, r0, 1
-	adds r1, r0
-	adds r1, 0x60
-	ldr r0, [r3]
-	adds r0, r1
-	str r0, [sp]
-	movs r0, 0
-	movs r1, 0x2
-	movs r2, 0x6
-	b _0803C400
-	.pool
-_0803C2EC:
-	str r1, [sp]
-	movs r0, 0xC
-	adds r1, r2, 0
-	movs r2, 0x17
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _0803C374
-	ldrb r1, [r5]
-	str r4, [sp]
-	movs r0, 0xC
-	movs r2, 0x47
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	beq _0803C33C
-	ldrb r0, [r5]
-	muls r0, r6
-	adds r1, r0, r7
-	adds r0, r1, 0
-	adds r0, 0x21
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	beq _0803C33C
-	adds r0, r1, 0
-	adds r0, 0x22
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	beq _0803C33C
-	adds r0, r1, 0
-	adds r0, 0x20
-	ldrb r0, [r0]
-	cmp r0, 0x1A
-	bne _0803C374
-_0803C33C:
-	ldr r5, =gActiveBank
-	ldrb r1, [r5]
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0xF
-	movs r2, 0x2A
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	beq _0803C3B0
-	ldr r2, =gBattleMons
-	ldrb r1, [r5]
-	movs r0, 0x58
-	muls r0, r1
-	adds r1, r0, r2
-	adds r0, r1, 0
-	adds r0, 0x21
-	ldrb r0, [r0]
-	cmp r0, 0x8
-	beq _0803C374
-	adds r0, r1, 0
-	adds r0, 0x22
-	ldrb r0, [r0]
-	cmp r0, 0x8
-	bne _0803C3B0
-_0803C374:
-	subs r1, r4, 0x1
-	lsls r1, 4
-	movs r0, 0x4
-	orrs r1, r0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r0, =gLastUsedAbility
-	ldrb r3, [r0]
-	ldr r4, =gBattleStruct
-	ldr r0, =gActiveBank
-	ldrb r0, [r0]
-	lsls r2, r0, 1
-	adds r2, r0
-	adds r2, 0x60
-	ldr r0, [r4]
-	adds r0, r2
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0x6
-	bl EmitChoosePokemon
-	b _0803C42E
-	.pool
-_0803C3B0:
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	adds r4, r0, 0
-	cmp r1, 0x2
-	bne _0803C3D8
-	ldr r0, =gActionForBanks
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _0803C3D8
-	ldr r0, =gBattleStruct
-	ldr r3, [r0]
-	adds r0, r3, 0
-	adds r0, 0x5C
-	b _0803C3EE
-	.pool
-_0803C3D8:
-	ldrb r0, [r4]
-	cmp r0, 0x3
-	bne _0803C410
-	ldr r0, =gActionForBanks
-	ldrb r0, [r0, 0x1]
-	cmp r0, 0x2
-	bne _0803C410
-	ldr r0, =gBattleStruct
-	ldr r3, [r0]
-	adds r0, r3, 0
-	adds r0, 0x5D
-_0803C3EE:
-	ldrb r2, [r0]
-	ldrb r1, [r4]
-	lsls r0, r1, 1
-	adds r0, r1
-	adds r0, 0x60
-	adds r3, r0
-	str r3, [sp]
-	movs r0, 0
-	movs r1, 0
-_0803C400:
-	movs r3, 0
-	bl EmitChoosePokemon
-	b _0803C42E
-	.pool
-_0803C410:
-	ldr r2, =gBattleStruct
-	ldr r0, =gActiveBank
-	ldrb r0, [r0]
-	lsls r1, r0, 1
-	adds r1, r0
-	adds r1, 0x60
-	ldr r0, [r2]
-	adds r0, r1
-	str r0, [sp]
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0x6
-	movs r3, 0
-	bl EmitChoosePokemon
-_0803C42E:
-	ldr r0, =gActiveBank
-	ldrb r0, [r0]
-	bl MarkBufferBankForExecution
-	b _0803C6C4
-	.pool
-_0803C440:
-	bl IsPlayerPartyAndPokemonStorageFull
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803C44C
-	b _0803C6C4
-_0803C44C:
-	ldr r1, =gUnknown_02024220
-	ldr r3, =gActiveBank
-	ldrb r0, [r3]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, =gUnknown_082DAB11
-	str r1, [r0]
-	ldr r0, =gBattleCommunication
-	ldrb r1, [r3]
-	adds r1, r0
-	movs r4, 0
-	movs r0, 0x6
-	strb r0, [r1]
-	ldrb r1, [r3]
-	ldr r2, =gBattleStruct
-	ldr r0, [r2]
-	adds r1, r0
-	adds r1, 0x54
-	strb r4, [r1]
-	ldrb r1, [r3]
-	b _0803C7A0
-	.pool
-_0803C48C:
-	ldr r2, =gBattleStruct
-	ldr r4, =gActiveBank
-	ldrb r1, [r4]
-	lsls r0, r1, 1
-	adds r0, r1
-	adds r0, 0x60
-	ldr r1, [r2]
-	adds r1, r0
-	movs r0, 0
-	bl sub_8033E6C
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-	b _0803C6C4
-	.pool
-_0803C4B4:
-	ldr r4, =gBattleCommunication
-	ldr r5, =gActiveBank
-	ldrb r0, [r5]
-	adds r0, r4
-	movs r1, 0x7
-	strb r1, [r0]
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	movs r6, 0x2
-	eors r0, r6
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, r4
-	movs r1, 0x1
-	strb r1, [r0]
-	ldrb r0, [r5]
-	bl sub_8185008
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	eors r0, r6
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	ldr r1, =gBattleMons
-	lsls r0, 24
-	lsrs r0, 24
-	movs r7, 0x58
-	muls r0, r7
-	adds r4, r1, 0
-	adds r4, 0x50
-	adds r0, r4
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 5
-	ands r0, r1
-	cmp r0, 0
-	bne _0803C532
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	eors r0, r6
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	muls r0, r7
-	adds r0, r4
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 15
-	ands r0, r1
-	cmp r0, 0
-	beq _0803C550
-_0803C532:
-	movs r0, 0
-	bl dp01_build_cmdbuf_x32_32_32_32
-	ldrb r0, [r5]
-	bl MarkBufferBankForExecution
-	bl _0803CD70
-	.pool
-_0803C550:
-	ldr r4, =gActionForBanks
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	eors r0, r6
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _0803C590
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	eors r0, r6
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl sub_8185008
-	b _0803C6AE
-	.pool
-_0803C590:
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	eors r0, r6
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	bne _0803C5B6
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	eors r0, r6
-	b _0803C668
-_0803C5B6:
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	eors r0, r6
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0803C628
-	ldr r4, =gProtectStructs
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	eors r0, r6
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	lsls r0, 24
-	lsrs r0, 20
-	adds r0, r4
-	ldrb r0, [r0]
-	lsls r0, 29
-	cmp r0, 0
-	blt _0803C616
-	ldr r4, =gDisableStructs
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	eors r0, r6
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrh r0, [r1, 0x6]
-	cmp r0, 0
-	beq _0803C628
-_0803C616:
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	eors r0, r6
-	b _0803C668
-	.pool
-_0803C628:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 10
-	ands r0, r1
-	cmp r0, 0
-	beq _0803C690
-	ldr r4, =gActionForBanks
-	ldr r6, =gActiveBank
-	ldrb r0, [r6]
-	bl GetBankIdentity
-	movs r5, 0x2
-	eors r0, r5
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0803C690
-	ldr r1, =gRngValue
-	ldr r0, =gUnknown_0203BD30
-	ldr r0, [r0]
-	str r0, [r1]
-	ldrb r0, [r6]
-	bl GetBankIdentity
-	eors r0, r5
-_0803C668:
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x1
-	bl sub_8185008
-	b _0803C6AE
-	.pool
-_0803C690:
-	ldr r0, =gActiveBank
-	ldrb r0, [r0]
-	bl GetBankIdentity
-	movs r1, 0x2
-	eors r0, r1
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x3
-	bl sub_8185008
-_0803C6AE:
-	movs r0, 0
-	bl dp01_build_cmdbuf_x32_32_32_32
-	ldr r0, =gActiveBank
-	ldrb r0, [r0]
-	bl MarkBufferBankForExecution
-	b _0803CD70
-	.pool
-_0803C6C4:
-	ldr r1, =gBattleTypeFlags
-	ldr r2, [r1]
-	movs r5, 0x8
-	adds r0, r2, 0
-	ands r0, r5
-	adds r3, r1, 0
-	cmp r0, 0
-	beq _0803C720
-	ldr r0, =0x043f0100
-	ands r2, r0
-	cmp r2, 0
-	beq _0803C720
-	ldr r0, =gBattleBufferB
-	ldr r4, =gActiveBank
-	ldrb r2, [r4]
-	lsls r1, r2, 9
-	adds r0, 0x1
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0x3
-	bne _0803C720
-	ldr r1, =gUnknown_02024220
-	lsls r0, r2, 2
-	adds r0, r1
-	ldr r1, =gUnknown_082DB9BA
-	str r1, [r0]
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r4]
-	adds r0, r1
-	movs r3, 0
-	strb r5, [r0]
-	b _0803C792
-	.pool
-_0803C720:
-	ldr r0, [r3]
-	ldr r1, =0x0200000a
-	ands r0, r1
-	cmp r0, 0x8
-	bne _0803C760
-	ldr r0, =gBattleBufferB
-	ldr r4, =gActiveBank
-	ldrb r1, [r4]
-	lsls r1, 9
-	adds r0, 0x1
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0x3
-	bne _0803C760
-	ldr r0, =gUnknown_082DAAFE
-	bl BattleScriptExecute
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r4]
-	adds r0, r1
-	b _0803CC20
-	.pool
-_0803C760:
-	bl IsRunningFromBattleImpossible
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803C7C4
-	ldr r0, =gBattleBufferB
-	ldr r4, =gActiveBank
-	ldrb r2, [r4]
-	lsls r1, r2, 9
-	adds r0, 0x1
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0x3
-	bne _0803C7C4
-	ldr r1, =gUnknown_02024220
-	lsls r0, r2, 2
-	adds r0, r1
-	ldr r1, =gUnknown_082DAB0B
-_0803C784:
-	str r1, [r0]
-	ldr r0, =gBattleCommunication
-	ldrb r1, [r4]
-	adds r1, r0
-	movs r3, 0
-	movs r0, 0x6
-	strb r0, [r1]
-_0803C792:
-	ldrb r1, [r4]
-	ldr r2, =gBattleStruct
-	ldr r0, [r2]
-	adds r1, r0
-	adds r1, 0x54
-	strb r3, [r1]
-	ldrb r1, [r4]
-_0803C7A0:
-	ldr r0, [r2]
-	adds r1, r0
-	adds r1, 0x84
-	movs r0, 0x1
-	strb r0, [r1]
-	b _0803CD70
-	.pool
-_0803C7C4:
-	ldr r2, =gBattleCommunication
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _0803CB74
-	.pool
-_0803C7D8:
-	ldr r4, =gBattleExecBuffer
-	ldr r1, =gBitTable
-	ldr r3, =gActiveBank
-	ldrb r5, [r3]
-	lsls r0, r5, 2
-	adds r0, r1
-	ldr r2, [r0]
-	lsls r0, r2, 4
-	movs r1, 0xF0
-	lsls r1, 24
-	orrs r0, r1
-	orrs r0, r2
-	lsls r1, r2, 8
-	orrs r0, r1
-	lsls r2, 12
-	orrs r0, r2
-	ldr r1, [r4]
-	ands r1, r0
-	adds r4, r3, 0
-	cmp r1, 0
-	beq _0803C804
-	b _0803CD04
-_0803C804:
-	ldr r1, =gActionForBanks
-	adds r0, r5, r1
-	ldrb r0, [r0]
-	adds r2, r1, 0
-	cmp r0, 0x9
-	bls _0803C812
-	b _0803CD04
-_0803C812:
-	lsls r0, 2
-	ldr r1, =_0803C830
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_0803C830:
-	.4byte _0803C858
-	.4byte _0803C99C
-	.4byte _0803C9D4
-	.4byte _0803CA0A
-	.4byte _0803CA2C
-	.4byte _0803CA40
-	.4byte _0803CA54
-	.4byte _0803CA84
-	.4byte _0803CA98
-	.4byte _0803CABC
-_0803C858:
-	ldr r1, =gBattleBufferB
-	ldrb r3, [r4]
-	lsls r0, r3, 9
-	adds r1, 0x1
-	adds r0, r1
-	ldrb r1, [r0]
-	cmp r1, 0x3
-	blt _0803C88A
-	cmp r1, 0x9
-	ble _0803C878
-	cmp r1, 0xF
-	beq _0803C87E
-	b _0803C88A
-	.pool
-_0803C878:
-	adds r0, r3, r2
-	strb r1, [r0]
-	b _0803CD70
-_0803C87E:
-	adds r1, r3, r2
-	movs r0, 0x2
-	strb r0, [r1]
-	bl sub_803CDF8
-	b _0803CD70
-_0803C88A:
-	movs r0, 0x2
-	bl sub_818603C
-	ldr r4, =gBattleBufferB
-	ldr r6, =gActiveBank
-	ldrb r3, [r6]
-	lsls r1, r3, 9
-	adds r5, r4, 0x2
-	adds r0, r1, r5
-	ldrb r2, [r0]
-	adds r7, r4, 0x3
-	adds r1, r7
-	ldrb r0, [r1]
-	lsls r0, 8
-	orrs r2, r0
-	ldr r0, =0x0000ffff
-	cmp r2, r0
-	bne _0803C8D0
-	ldr r0, =gBattleCommunication
-	adds r0, r3, r0
-	movs r1, 0x1
-	strb r1, [r0]
-	ldrb r0, [r6]
-	bl sub_8185008
-	b _0803CD04
-	.pool
-_0803C8D0:
-	bl sub_803FB4C
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803C91C
-	ldrb r0, [r6]
-	movs r1, 0x1
-	bl sub_8185008
-	ldr r0, =gBattleCommunication
-	ldrb r1, [r6]
-	adds r1, r0
-	movs r3, 0
-	movs r0, 0x6
-	strb r0, [r1]
-	ldrb r1, [r6]
-	ldr r2, =gBattleStruct
-	ldr r0, [r2]
-	adds r1, r0
-	adds r1, 0x54
-	strb r3, [r1]
-	ldrb r0, [r6]
-	lsls r0, 9
-	adds r1, r4, 0x1
-	adds r0, r1
-	strb r3, [r0]
-	ldrb r1, [r6]
-	ldr r0, [r2]
-	adds r1, r0
-	adds r1, 0x84
-	movs r0, 0x2
-	strb r0, [r1]
-	b _0803CD70
-	.pool
-_0803C91C:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 10
-	ands r0, r1
-	cmp r0, 0
-	bne _0803C942
-	ldrb r0, [r6]
-	lsls r1, r0, 9
-	adds r1, r5
-	ldrb r1, [r1]
-	bl RecordedBattle_SetBankAction
-	ldrb r0, [r6]
-	lsls r1, r0, 9
-	adds r1, r7
-	ldrb r1, [r1]
-	bl RecordedBattle_SetBankAction
-_0803C942:
-	ldrb r0, [r6]
-	ldr r4, =gBattleStruct
-	ldr r1, [r4]
-	adds r1, r0, r1
-	adds r1, 0x80
-	lsls r0, 9
-	adds r0, r5
-	ldrb r0, [r0]
-	strb r0, [r1]
-	ldr r0, =gChosenMovesByBanks
-	ldrb r2, [r6]
-	lsls r5, r2, 1
-	adds r5, r0
-	ldr r3, =gBattleMons
-	ldr r4, [r4]
-	adds r0, r2, r4
-	adds r0, 0x80
-	ldrb r0, [r0]
-	lsls r0, 1
-	movs r1, 0x58
-	muls r1, r2
-	adds r0, r1
-	adds r3, 0xC
-	adds r0, r3
-	ldrh r0, [r0]
-	strh r0, [r5]
-	ldrb r0, [r6]
-	adds r4, r0, r4
-	lsls r0, 9
-	adds r0, r7
-	ldrb r0, [r0]
-	strb r0, [r4, 0xC]
-	ldr r0, =gBattleCommunication
-	ldrb r1, [r6]
-	b _0803CB72
-	.pool
-_0803C99C:
-	ldr r2, =gBattleBufferB
-	ldr r5, =gActiveBank
-	ldrb r4, [r5]
-	lsls r1, r4, 9
-	adds r0, r2, 0x1
-	adds r0, r1, r0
-	ldrb r3, [r0]
-	adds r2, 0x2
-	adds r1, r2
-	ldrb r0, [r1]
-	lsls r0, 8
-	orrs r3, r0
-	cmp r3, 0
-	bne _0803C9BA
-	b _0803CC1C
-_0803C9BA:
-	ldr r0, =gLastUsedItem
-	strh r3, [r0]
-	ldr r0, =gBattleCommunication
-	ldrb r1, [r5]
-	b _0803CB72
-	.pool
-_0803C9D4:
-	ldr r0, =gBattleBufferB
-	ldr r4, =gActiveBank
-	ldrb r2, [r4]
-	lsls r1, r2, 9
-	adds r0, 0x1
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0x6
-	bne _0803CA04
-	ldr r0, =gBattleCommunication
-	adds r0, r2, r0
-	movs r1, 0x1
-	strb r1, [r0]
-	ldrb r0, [r4]
-	bl sub_8185008
-	b _0803CD04
-	.pool
-_0803CA04:
-	bl sub_803CDF8
-	b _0803CB6E
-_0803CA0A:
-	ldr r2, =gHitMarker
-	ldr r0, [r2]
-	movs r1, 0x80
-	lsls r1, 8
-	orrs r0, r1
-	str r0, [r2]
-	ldr r2, =gBattleCommunication
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _0803CB74
-	.pool
-_0803CA2C:
-	ldr r2, =gBattleCommunication
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _0803CB74
-	.pool
-_0803CA40:
-	ldr r2, =gBattleCommunication
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _0803CB74
-	.pool
-_0803CA54:
-	ldr r3, =gBattleBufferB
-	ldr r0, =gActiveBank
-	ldrb r4, [r0]
-	lsls r1, r4, 9
-	adds r0, r3, 0x1
-	adds r0, r1, r0
-	ldrb r2, [r0]
-	adds r3, 0x2
-	adds r1, r3
-	ldrb r0, [r1]
-	lsls r0, 8
-	orrs r2, r0
-	cmp r2, 0
-	bne _0803CA72
-	b _0803CC1C
-_0803CA72:
-	ldr r1, =gBattleCommunication
-	adds r1, r4, r1
-	b _0803CB74
-	.pool
-_0803CA84:
-	ldr r2, =gBattleCommunication
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _0803CB74
-	.pool
-_0803CA98:
-	ldr r2, =gHitMarker
-	ldr r0, [r2]
-	movs r1, 0x80
-	lsls r1, 8
-	orrs r0, r1
-	str r0, [r2]
-	ldr r2, =gBattleCommunication
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _0803CB74
-	.pool
-_0803CABC:
-	ldr r2, =gBattleCommunication
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	adds r1, r2
-	b _0803CB74
-	.pool
-_0803CAD0:
-	ldr r3, =gBattleExecBuffer
-	ldr r6, =gBitTable
-	ldr r0, =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r6
-	ldr r2, [r0]
-	lsls r1, r2, 4
-	movs r0, 0xF0
-	lsls r0, 24
-	orrs r1, r0
-	orrs r1, r2
-	lsls r0, r2, 8
-	orrs r1, r0
-	lsls r2, 12
-	orrs r1, r2
-	ldr r0, [r3]
-	ands r0, r1
-	cmp r0, 0
-	beq _0803CAFA
-	b _0803CD04
-_0803CAFA:
-	bl sub_803CDB8
-	lsls r0, 24
-	lsrs r0, 24
-	negs r1, r0
-	orrs r1, r0
-	lsrs r4, r1, 31
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x41
-	ands r0, r1
-	cmp r0, 0x1
-	bne _0803CB3C
-	movs r1, 0x2
-	movs r0, 0x2
-	ands r0, r5
-	cmp r0, 0
-	bne _0803CB3C
-	adds r0, r5, 0
-	eors r0, r1
-	bl GetBankByIdentity
-	ldr r1, =gBattleStruct
-	ldr r1, [r1]
-	adds r1, 0x91
-	ldrb r1, [r1]
-	lsls r0, 24
-	lsrs r0, 22
-	adds r0, r6
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	beq _0803CB5C
-_0803CB3C:
-	movs r0, 0
-	movs r1, 0
-	adds r2, r4, 0
-	bl EmitLinkStandbyMsg
-	b _0803CB66
-	.pool
-_0803CB5C:
-	movs r0, 0
-	movs r1, 0x1
-	adds r2, r4, 0
-	bl EmitLinkStandbyMsg
-_0803CB66:
-	ldr r4, =gActiveBank
-_0803CB68:
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_0803CB6E:
-	ldr r0, =gBattleCommunication
-	ldrb r1, [r4]
-_0803CB72:
-	adds r1, r0
-_0803CB74:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _0803CD04
-	.pool
-_0803CB84:
-	ldr r3, =gBattleExecBuffer
-	ldr r1, =gBitTable
-	ldr r0, =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r2, [r0]
-	lsls r1, r2, 4
-	movs r0, 0xF0
-	lsls r0, 24
-	orrs r1, r0
-	orrs r1, r2
-	lsls r0, r2, 8
-	orrs r1, r0
-	lsls r2, 12
-	orrs r1, r2
-	ldr r0, [r3]
-	ands r0, r1
-	cmp r0, 0
-	beq _0803CBAE
-	b _0803CD04
-_0803CBAE:
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r1, 0x4]
-	adds r0, 0x1
-	strb r0, [r1, 0x4]
-	b _0803CD04
-	.pool
-_0803CBC8:
-	ldr r5, =gActiveBank
-	ldrb r2, [r5]
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-	adds r1, r2, r0
-	adds r0, r1, 0
-	adds r0, 0x54
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0803CCB4
-	ldr r0, =gBattleCommunication
-	adds r0, r2, r0
-	adds r1, 0x84
-	ldrb r1, [r1]
-	strb r1, [r0]
-	b _0803CD04
-	.pool
-_0803CBF4:
-	ldr r3, =gBattleExecBuffer
-	ldr r1, =gBitTable
-	ldr r0, =gActiveBank
-	ldrb r4, [r0]
-	lsls r0, r4, 2
-	adds r0, r1
-	ldr r2, [r0]
-	lsls r1, r2, 4
-	movs r0, 0xF0
-	lsls r0, 24
-	orrs r1, r0
-	orrs r1, r2
-	lsls r0, r2, 8
-	orrs r1, r0
-	lsls r2, 12
-	orrs r1, r2
-	ldr r0, [r3]
-	ands r0, r1
-	cmp r0, 0
-	bne _0803CD04
-_0803CC1C:
-	ldr r0, =gBattleCommunication
-	adds r0, r4, r0
-_0803CC20:
-	movs r1, 0x1
-	strb r1, [r0]
-	b _0803CD04
-	.pool
-_0803CC38:
-	ldr r5, =gActiveBank
-	ldrb r2, [r5]
-	ldr r4, =gBattleStruct
-	ldr r0, [r4]
-	adds r0, r2, r0
-	adds r0, 0x54
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0803CCB4
-	ldr r0, =gBattleBufferB
-	lsls r1, r2, 9
-	adds r0, 0x1
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0xD
-	bne _0803CC94
-	ldr r2, =gHitMarker
-	ldr r0, [r2]
-	movs r1, 0x80
-	lsls r1, 8
-	orrs r0, r1
-	str r0, [r2]
-	ldr r1, =gActionForBanks
-	ldrb r0, [r5]
-	adds r0, r1
-	movs r1, 0x3
-	strb r1, [r0]
-	ldr r1, =gBattleCommunication
-	ldrb r0, [r5]
-_0803CC72:
-	adds r0, r1
-	movs r1, 0x4
-	strb r1, [r0]
-	b _0803CD04
-	.pool
-_0803CC94:
-	adds r0, r2, 0
-	movs r1, 0x1
-	bl sub_8185008
-	ldr r2, =gBattleCommunication
-	ldrb r0, [r5]
-	adds r2, r0, r2
-	ldr r1, [r4]
-	adds r0, r1
-	adds r0, 0x84
-	ldrb r0, [r0]
-	strb r0, [r2]
-	b _0803CD04
-	.pool
-_0803CCB4:
-	ldr r0, =gBankAttacker
-	strb r2, [r0]
-	ldr r7, =gBattlescriptCurrInstr
-	ldr r6, =gUnknown_02024220
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r6
-	ldr r4, [r0]
-	str r4, [r7]
-	ldr r3, =gBattleExecBuffer
-	ldr r1, =gBitTable
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r1
-	ldr r2, [r0]
-	lsls r1, r2, 4
-	movs r0, 0xF0
-	lsls r0, 24
-	orrs r1, r0
-	orrs r1, r2
-	lsls r0, r2, 8
-	orrs r1, r0
-	lsls r2, 12
-	orrs r1, r2
-	ldr r0, [r3]
-	ands r0, r1
-	cmp r0, 0
-	bne _0803CCFA
-	ldr r0, =gBattleScriptingCommandsTable
-	ldrb r1, [r4]
-	lsls r1, 2
-	adds r1, r0
-	ldr r0, [r1]
-	bl _call_via_r0
-_0803CCFA:
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r6
-	ldr r1, [r7]
-	str r1, [r0]
-_0803CD04:
-	ldr r0, =gActiveBank
-	ldrb r1, [r0]
-	adds r1, 0x1
-	strb r1, [r0]
-	ldr r0, =gNoOfAllBanks
-	lsls r1, 24
-	lsrs r1, 24
-_0803CD12:
-	adds r5, r0, 0
-	ldrb r0, [r5]
-	cmp r1, r0
-	bcs _0803CD1E
-	bl _0803BE9C
-_0803CD1E:
-	ldr r0, =gBattleCommunication
-	ldrb r0, [r0, 0x4]
-	ldrb r1, [r5]
-	cmp r0, r1
-	bne _0803CD70
-	movs r0, 0x1
-	bl sub_818603C
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803D2E8
-	str r0, [r1]
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 15
-	ands r0, r1
-	cmp r0, 0
-	beq _0803CD70
-	movs r4, 0
-	ldrb r5, [r5]
-	cmp r4, r5
-	bge _0803CD70
-_0803CD4A:
-	ldr r0, =gActionForBanks
-	adds r0, r4, r0
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _0803CD66
-	lsls r0, r4, 24
-	lsrs r0, 24
-	ldr r1, =gBattleStruct
-	ldr r1, [r1]
-	adds r1, r4, r1
-	adds r1, 0x5C
-	ldrb r1, [r1]
-	bl sub_80571DC
-_0803CD66:
-	adds r4, 0x1
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r4, r0
-	blt _0803CD4A
-_0803CD70:
-	add sp, 0x1C
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803BE74
 
 	thumb_func_start sub_803CDB8
 sub_803CDB8: @ 803CDB8
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index 78236f1d7..1ea1bb5f2 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -8648,7 +8648,7 @@ sub_805C158: @ 805C158
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805C194
-	ldr r1, =gUnknown_0203BD30
+	ldr r1, =gBattlePalaceMoveSelectionRngValue
 	ldr r0, =gRngValue
 	ldr r0, [r0]
 	str r0, [r1]
diff --git a/asm/recorded_battle.s b/asm/recorded_battle.s
index f733033ff..e742cbe7d 100644
--- a/asm/recorded_battle.s
+++ b/asm/recorded_battle.s
@@ -271,8 +271,8 @@ _08184FF0:
 	.pool
 	thumb_func_end RecordedBattle_SetBankAction
 
-	thumb_func_start sub_8185008
-sub_8185008: @ 8185008
+	thumb_func_start RecordedBattle_ClearBankAction
+RecordedBattle_ClearBankAction: @ 8185008
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -310,7 +310,7 @@ _08185046:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8185008
+	thumb_func_end RecordedBattle_ClearBankAction
 
 	thumb_func_start sub_8185054
 sub_8185054: @ 8185054
diff --git a/asm/rom3.s b/asm/rom3.s
index 2e040ff0f..6a3e7e299 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -2786,8 +2786,8 @@ _08033D7C:
 	.pool
 	thumb_func_end EmitPrintStringPlayerOnly
 
-	thumb_func_start dp01_build_cmdbuf_x12_a_bb
-dp01_build_cmdbuf_x12_a_bb: @ 8033DE4
+	thumb_func_start EmitChooseAction
+EmitChooseAction: @ 8033DE4
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -2807,7 +2807,7 @@ dp01_build_cmdbuf_x12_a_bb: @ 8033DE4
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp01_build_cmdbuf_x12_a_bb
+	thumb_func_end EmitChooseAction
 
 	thumb_func_start EmitCmd13
 EmitCmd13: @ 8033E10
@@ -2827,8 +2827,8 @@ EmitCmd13: @ 8033E10
 	.pool
 	thumb_func_end EmitCmd13
 
-	thumb_func_start sub_8033E30
-sub_8033E30: @ 8033E30
+	thumb_func_start EmitChooseMove
+EmitChooseMove: @ 8033E30
 	push {r4-r6,lr}
 	adds r5, r3, 0
 	lsls r0, 24
@@ -2858,10 +2858,10 @@ _08033E4C:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8033E30
+	thumb_func_end EmitChooseMove
 
-	thumb_func_start sub_8033E6C
-sub_8033E6C: @ 8033E6C
+	thumb_func_start EmitOpenBag
+EmitOpenBag: @ 8033E6C
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -2886,7 +2886,7 @@ _08033E7E:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8033E6C
+	thumb_func_end EmitOpenBag
 
 	thumb_func_start EmitChoosePokemon
 EmitChoosePokemon: @ 8033EA0
@@ -3624,8 +3624,8 @@ EmitCmd49: @ 80343D4
 	.pool
 	thumb_func_end EmitCmd49
 
-	thumb_func_start dp01_build_cmdbuf_x32_32_32_32
-dp01_build_cmdbuf_x32_32_32_32: @ 80343F4
+	thumb_func_start Emit_x32
+Emit_x32: @ 80343F4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3640,7 +3640,7 @@ dp01_build_cmdbuf_x32_32_32_32: @ 80343F4
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp01_build_cmdbuf_x32_32_32_32
+	thumb_func_end Emit_x32
 
 	thumb_func_start EmitSpriteInvisibility
 EmitSpriteInvisibility: @ 8034414
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 206519f40..0b797feef 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -561,7 +561,7 @@ BattleScript_BerryStatRaiseEnd2:: @ 82DB84E
 BattleScript_BerryFocusEnergyEnd2:: @ 82DB869
 	.incbin "baserom.gba", 0x2db869, 0x10
 
-gUnknown_082DB879:: @ 82DB879
+BattleScript_ActionSelectionItemsCantBeUsed:: @ 82DB879
 	.incbin "baserom.gba", 0x2db879, 0x4
 
 gUnknown_082DB87D:: @ 82DB87D
diff --git a/include/battle.h b/include/battle.h
index e5e5a94d1..50d2389ac 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -61,7 +61,8 @@
 #define STEVEN_PARTNER_ID           0xC03
 #define SECRET_BASE_OPPONENT        0x400
 
-#define BATTLE_TYPE_FRONTIER        (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID)
+#define BATTLE_TYPE_FRONTIER                (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID)
+#define BATTLE_TYPE_FRONTIER_NO_PYRAMID     (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000)
 
 #define BATTLE_WON                  0x1
 #define BATTLE_LOST                 0x2
@@ -136,6 +137,7 @@
 #define HITMARKER_PURSUIT_TRAP          0x00001000
 #define HITMARKER_IGNORE_SAFEGUARD      0x00002000
 #define HITMARKER_SYNCHRONISE_EFFECT    0x00004000
+#define HITMARKER_x8000                 0x00008000
 #define HITMARKER_IGNORE_ON_AIR         0x00010000
 #define HITMARKER_IGNORE_UNDERGROUND    0x00020000
 #define HITMARKER_IGNORE_UNDERWATER     0x00040000
@@ -614,10 +616,7 @@ struct BattleStruct
     u8 field_7E;
     u8 formToChangeInto;
     u8 chosenMovesIds[4];
-    u8 field_84;
-    u8 field_85;
-    u8 field_86;
-    u8 field_87;
+    u8 field_84[4];
     u8 field_88;
     u8 field_89;
     u8 field_8A;
@@ -906,7 +905,7 @@ void BattleTurnPassed(void);
 void BattleScriptPush(const u8* bsPtr);
 void BattleScriptPushCursor(void);
 void BattleScriptPop(void);
-u8 sub_803FB4C(void);  // msg, can't select a move
+u8 TrySetCantSelectMoveBattleScript(void);
 u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check);
 bool8 AreAllMovesUnusable(void);
 u8 GetImprisonedMovesCount(u8 bank, u16 move);
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index 61e8bec29..9a7f947fa 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -14,6 +14,16 @@ struct MovePpInfo
     u8 ppBonuses;
 };
 
+struct ChooseMoveStruct
+{
+    u16 moves[4];
+    u8 ppNumbers[4];
+    u8 ppWithBonusNumbers[4];
+    u16 species;
+    u8 monType1;
+    u8 monType2;
+};
+
 #define REQUEST_ALL_BATTLE      0x0
 #define REQUEST_SPECIES_BATTLE  0x1
 #define REQUEST_HELDITEM_BATTLE 0x2
@@ -40,8 +50,8 @@ void EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible);
 void EmitReturnPokeToBall(u8 bufferId, u8 arg1);
 void EmitGetMonData(u8 bufferId, u8 arg1, u8 arg2);
 void EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit);
-void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, const u8* arg4);
-void EmitLinkStandbyMsg(u8 bufferId, u8 arg1, u8 arg2);
+void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4);
+void EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2);
 void EmitTrainerSlide(u8 bufferId);
 void EmitTrainerSlideBack(u8 bufferId);
 void EmitFaintingCry(u8 bufferId);
@@ -56,6 +66,10 @@ void EmitIntroSlide(u8 bufferId, u8 terrainId);
 void EmitDrawTrainerPic(u8 bufferId);
 void EmitLoadMonSprite(u8 bufferId);
 void EmitIntroTrainerBallThrow(u8 bufferId);
+void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2);
+void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct* movePpData);
+void EmitOpenBag(u8 bufferId, u8* arg1);
+void Emit_x32(u8 bufferId);
 
 #define RESET_ACTION_MOVE_SELECTION     0
 #define RESET_ACTION_SELECTION          1
diff --git a/include/recorded_battle.h b/include/recorded_battle.h
index 2040f2b8a..2df1620e4 100644
--- a/include/recorded_battle.h
+++ b/include/recorded_battle.h
@@ -6,10 +6,13 @@ extern u32 gRecordedBattleRngSeed;
 void sub_8185F84(void);
 void sub_8184E58(void);
 void RecordedBattle_SetBankAction(u8 bank, u8 action);
+void RecordedBattle_ClearBankAction(u8 bank, u8 bytesToClear);
 void sub_8185F90(u16 arg0);
 bool8 sub_8186450(void);
 u8 sub_8185FAC(void);
 u8 sub_8185FB8(void);
 u8 MoveRecordedBattleToSaveData(void);
+void sub_818603C(u8);
+void sub_8185FD0(void);
 
 #endif // GUARD_RECORDED_BATTLE_H
diff --git a/src/battle_2.c b/src/battle_2.c
index 769723c24..a18e1c698 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -132,6 +132,7 @@ extern u8 gActionForBanks[BATTLE_BANKS_COUNT];
 extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
 extern u8 gFightStateTracker;
 extern u8 gLastUsedAbility;
+extern u16 gLastUsedItem;
 
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 extern const struct BattleMove gBattleMoves[];
@@ -168,6 +169,8 @@ extern void sub_80B3AF8(u8 taskId); // cable club
 extern void sub_8076918(u8 bank);
 extern void sub_80729D0(u8 healthoxSpriteId);
 extern void sub_81A56B4(void); // battle frontier 2
+extern void sub_81B8FB0(u8, u8); // party menu
+extern u8 pokemon_order_func(u8); // party menu
 
 // this file's functions
 static void CB2_InitBattleInternal(void);
@@ -214,6 +217,9 @@ static void BattleIntroPlayer1SendsOutMonAnimation(void);
 static void TryDoEventsBeforeFirstTurn(void);
 void sub_803BE74(void);
 void bc_bs_exec(void);
+void sub_803D2E8(void);
+void sub_803CDF8(void);
+bool8 sub_803CDB8(void);
 
 void CB2_InitBattle(void)
 {
@@ -3736,3 +3742,475 @@ u8 IsRunningFromBattleImpossible(void)
     }
     return 0;
 }
+
+extern u8 gUnknown_0203CF00[];
+
+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->field_5C + 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];
+        }
+    }
+}
+
+extern const u8* gBattlescriptPtrsForSelection[BATTLE_BANKS_COUNT];
+extern const u8* gBattlescriptCurrInstr;
+
+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 u32 gBattlePalaceMoveSelectionRngValue;
+
+void sub_803BE74(void)
+{
+    s32 i;
+
+    gBattleCommunication[4] = 0;
+    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    {
+        u8 identity = GetBankIdentity(gActiveBank);
+        switch (gBattleCommunication[gActiveBank])
+        {
+        case 0:
+            sub_8185FD0();
+            gBattleCommunication[gActiveBank] = 1;
+            break;
+        case 1:
+            *(gBattleStruct->field_5C + gActiveBank) = 6;
+            if (gBattleTypeFlags & BATTLE_TYPE_MULTI
+                || !(identity & BIT_MON)
+                || gBattleStruct->field_91 & gBitTable[GetBankByIdentity(identity ^ BIT_MON)]
+                || gBattleCommunication[GetBankByIdentity(identity ^ BIT_MON)] == 5)
+            {
+                if (gBattleStruct->field_91 & gBitTable[gActiveBank])
+                {
+                    gActionForBanks[gActiveBank] = 13;
+                    if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
+                        gBattleCommunication[gActiveBank] = 5;
+                    else
+                        gBattleCommunication[gActiveBank] = 4;
+                }
+                else
+                {
+                    if (gBattleMons[gActiveBank].status2 & STATUS2_MULTIPLETURNS
+                        || gBattleMons[gActiveBank].status2 & STATUS2_RECHARGE)
+                    {
+                        gActionForBanks[gActiveBank] = 0;
+                        gBattleCommunication[gActiveBank] = 4;
+                    }
+                    else
+                    {
+                        EmitChooseAction(0, gActionForBanks[0], gBattleBufferB[0][1] | (gBattleBufferB[0][2] << 8));
+                        MarkBufferBankForExecution(gActiveBank);
+                        gBattleCommunication[gActiveBank]++;
+                    }
+                }
+            }
+            break;
+        case 2:
+            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 0:
+                    if (AreAllMovesUnusable())
+                    {
+                        gBattleCommunication[gActiveBank] = 6;
+                        *(gBattleStruct->field_54 + gActiveBank) = 0;
+                        *(gBattleStruct->field_84 + gActiveBank) = 4;
+                        *(gBattleStruct->moveTarget + gActiveBank) = gBattleBufferB[gActiveBank][3];
+                        return;
+                    }
+                    else if (gDisableStructs[gActiveBank].encoredMove != 0)
+                    {
+                        gChosenMovesByBanks[gActiveBank] = gDisableStructs[gActiveBank].encoredMove;
+                        *(gBattleStruct->chosenMovesIds + gActiveBank) = gDisableStructs[gActiveBank].encoredMovePos;
+                        gBattleCommunication[gActiveBank] = 4;
+                        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.ppNumbers[i] = gBattleMons[gActiveBank].pp[i];
+                            moveInfo.ppWithBonusNumbers[i] = CalculatePPWithBonus(
+                                                            gBattleMons[gActiveBank].moves[i],
+                                                            gBattleMons[gActiveBank].ppBonuses,
+                                                            i);
+                        }
+
+                        EmitChooseMove(0, (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) != 0, FALSE, &moveInfo);
+                        MarkBufferBankForExecution(gActiveBank);
+                    }
+                    break;
+                case 1:
+                    if (gBattleTypeFlags & (BATTLE_TYPE_LINK
+                                            | BATTLE_TYPE_FRONTIER_NO_PYRAMID
+                                            | BATTLE_TYPE_EREADER_TRAINER
+                                            | BATTLE_TYPE_x2000000))
+                    {
+                        RecordedBattle_ClearBankAction(gActiveBank, 1);
+                        gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_ActionSelectionItemsCantBeUsed;
+                        gBattleCommunication[gActiveBank] = 6;
+                        *(gBattleStruct->field_54 + gActiveBank) = 0;
+                        *(gBattleStruct->field_84 + gActiveBank) = 1;
+                        return;
+                    }
+                    else
+                    {
+                        EmitOpenBag(0, gBattleStruct->field_60[gActiveBank]);
+                        MarkBufferBankForExecution(gActiveBank);
+                    }
+                    break;
+                case 2:
+                    *(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] == 2)
+                            EmitChoosePokemon(0, 0, *(gBattleStruct->field_5C + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
+                        else if (gActiveBank == 3 && gActionForBanks[1] == 2)
+                            EmitChoosePokemon(0, 0, *(gBattleStruct->field_5C + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
+                        else
+                            EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
+                    }
+                    MarkBufferBankForExecution(gActiveBank);
+                    break;
+                case 5:
+                    if (IsPlayerPartyAndPokemonStorageFull())
+                    {
+                        gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DAB11;
+                        gBattleCommunication[gActiveBank] = 6;
+                        *(gBattleStruct->field_54 + gActiveBank) = 0;
+                        *(gBattleStruct->field_84 + gActiveBank) = 1;
+                        return;
+                    }
+                    break;
+                case 6:
+                    EmitOpenBag(0, gBattleStruct->field_60[gActiveBank]);
+                    MarkBufferBankForExecution(gActiveBank);
+                    break;
+                case 12:
+                    gBattleCommunication[gActiveBank] = 7;
+                    gBattleCommunication[GetBankByIdentity(GetBankIdentity(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)
+                    {
+                        Emit_x32(0);
+                        MarkBufferBankForExecution(gActiveBank);
+                        return;
+                    }
+                    else if (gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == 2)
+                    {
+                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 2);
+                    }
+                    else if (gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == 3)
+                    {
+                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 1);
+                    }
+                    else if (gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == 0
+                             && (gProtectStructs[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)].onlyStruggle
+                                || gDisableStructs[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)].encoredMove))
+                    {
+                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 1);
+                    }
+                    else if (gBattleTypeFlags & BATTLE_TYPE_PALACE
+                             && gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == 0)
+                    {
+                        gRngValue = gBattlePalaceMoveSelectionRngValue;
+                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 1);
+                    }
+                    else
+                    {
+                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 3);
+                    }
+                    Emit_x32(0);
+                    MarkBufferBankForExecution(gActiveBank);
+                    return;
+                }
+
+                if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
+                    && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000)
+                    && gBattleBufferB[gActiveBank][1] == 3)
+                {
+                    gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB9BA;
+                    gBattleCommunication[gActiveBank] = 8;
+                    *(gBattleStruct->field_54 + gActiveBank) = 0;
+                    *(gBattleStruct->field_84 + gActiveBank) = 1;
+                    return;
+                }
+                else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
+                         && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
+                         && gBattleBufferB[gActiveBank][1] == 3)
+                {
+                    BattleScriptExecute(gUnknown_082DAAFE);
+                    gBattleCommunication[gActiveBank] = 1;
+                }
+                else if (IsRunningFromBattleImpossible() != 0
+                         && gBattleBufferB[gActiveBank][1] == 3)
+                {
+                    gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DAB0B;
+                    gBattleCommunication[gActiveBank] = 6;
+                    *(gBattleStruct->field_54 + gActiveBank) = 0;
+                    *(gBattleStruct->field_84 + gActiveBank) = 1;
+                    return;
+                }
+                else
+                {
+                    gBattleCommunication[gActiveBank]++;
+                }
+            }
+            break;
+        case 3:
+            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+            {
+                switch (gActionForBanks[gActiveBank])
+                {
+                case 0:
+                    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] = 2;
+                        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] = 6;
+                            *(gBattleStruct->field_54 + gActiveBank) = 0;
+                            gBattleBufferB[gActiveBank][1] = 0;
+                            *(gBattleStruct->field_84 + gActiveBank) = 2;
+                            return;
+                        }
+                        else
+                        {
+                            if (!(gBattleTypeFlags & BATTLE_TYPE_PALACE))
+                            {
+                                RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][2]);
+                                RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][3]);
+                            }
+                            *(gBattleStruct->chosenMovesIds + gActiveBank) = gBattleBufferB[gActiveBank][2];
+                            gChosenMovesByBanks[gActiveBank] = gBattleMons[gActiveBank].moves[*(gBattleStruct->chosenMovesIds + gActiveBank)];
+                            *(gBattleStruct->moveTarget + gActiveBank) = gBattleBufferB[gActiveBank][3];
+                            gBattleCommunication[gActiveBank]++;
+                        }
+                        break;
+                    }
+                    break;
+                case 1:
+                    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 2:
+                    if (gBattleBufferB[gActiveBank][1] == 6)
+                    {
+                        gBattleCommunication[gActiveBank] = 1;
+                        RecordedBattle_ClearBankAction(gActiveBank, 1);
+                    }
+                    else
+                    {
+                        sub_803CDF8();
+                        gBattleCommunication[gActiveBank]++;
+                    }
+                    break;
+                case 3:
+                    gHitMarker |= HITMARKER_x8000;
+                    gBattleCommunication[gActiveBank]++;
+                    break;
+                case 4:
+                    gBattleCommunication[gActiveBank]++;
+                    break;
+                case 5:
+                    gBattleCommunication[gActiveBank]++;
+                    break;
+                case 6:
+                    if ((gBattleBufferB[gActiveBank][1] | (gBattleBufferB[gActiveBank][2] << 8)) != 0)
+                    {
+                        gBattleCommunication[gActiveBank]++;
+                    }
+                    else
+                    {
+                        gBattleCommunication[gActiveBank] = 1;
+                    }
+                    break;
+                case 7:
+                    gBattleCommunication[gActiveBank]++;
+                    break;
+                case 8:
+                    gHitMarker |= HITMARKER_x8000;
+                    gBattleCommunication[gActiveBank]++;
+                    break;
+                case 9:
+                    gBattleCommunication[gActiveBank]++;
+                    break;
+                }
+            }
+            break;
+        case 4:
+            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[GetBankByIdentity(identity ^ BIT_MON)]))
+                {
+                    EmitLinkStandbyMsg(0, 0, i);
+                }
+                else
+                {
+                    EmitLinkStandbyMsg(0, 1, i);
+                }
+                MarkBufferBankForExecution(gActiveBank);
+                gBattleCommunication[gActiveBank]++;
+            }
+            break;
+        case 5:
+            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+            {
+                gBattleCommunication[4]++;
+            }
+            break;
+        case 6:
+            if (*(gBattleStruct->field_54 + gActiveBank) != 0)
+            {
+                gBattleCommunication[gActiveBank] = *(gBattleStruct->field_84 + gActiveBank);
+            }
+            else
+            {
+                gBankAttacker = gActiveBank;
+                gBattlescriptCurrInstr = gBattlescriptPtrsForSelection[gActiveBank];
+                if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+                {
+                    gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
+                }
+                gBattlescriptPtrsForSelection[gActiveBank] = gBattlescriptCurrInstr;
+            }
+            break;
+        case 7:
+            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+            {
+                gBattleCommunication[gActiveBank] = 1;
+            }
+            break;
+        case 8:
+            if (*(gBattleStruct->field_54 + gActiveBank) != 0)
+            {
+                if (gBattleBufferB[gActiveBank][1] == 13)
+                {
+                    gHitMarker |= HITMARKER_x8000;
+                    gActionForBanks[gActiveBank] = 3;
+                    gBattleCommunication[gActiveBank] = 4;
+                }
+                else
+                {
+                    RecordedBattle_ClearBankAction(gActiveBank, 1);
+                    gBattleCommunication[gActiveBank] = *(gBattleStruct->field_84 + gActiveBank);
+                }
+            }
+            else
+            {
+                gBankAttacker = gActiveBank;
+                gBattlescriptCurrInstr = gBattlescriptPtrsForSelection[gActiveBank];
+                if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+                {
+                    gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
+                }
+                gBattlescriptPtrsForSelection[gActiveBank] = gBattlescriptCurrInstr;
+            }
+            break;
+        }
+    }
+
+    if (gBattleCommunication[4] == gNoOfAllBanks)
+    {
+        sub_818603C(1);
+        gBattleMainFunc = sub_803D2E8;
+
+        if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
+        {
+            for (i = 0; i < gNoOfAllBanks; i++)
+            {
+                if (gActionForBanks[i] == 2)
+                    sub_80571DC(i, *(gBattleStruct->field_5C + i));
+            }
+        }
+    }
+}
diff --git a/src/battle_3.c b/src/battle_3.c
index 071e4d59d..59028410d 100644
--- a/src/battle_3.c
+++ b/src/battle_3.c
@@ -19,7 +19,7 @@
 #include "calculate_base_damage.h"
 
 extern const u8* gBattlescriptCurrInstr;
-extern const u8* gUnknown_02024220[BATTLE_BANKS_COUNT];
+extern const u8* gBattlescriptPtrsForSelection[BATTLE_BANKS_COUNT];
 extern const u8* gUnknown_02024230[BATTLE_BANKS_COUNT];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u8 gActiveBank;
@@ -200,7 +200,7 @@ void BattleScriptPop(void)
     gBattlescriptCurrInstr = BATTLESCRIPTS_STACK->ptr[--BATTLESCRIPTS_STACK->size];
 }
 
-u8 sub_803FB4C(void)  // msg, can't select a move
+u8 TrySetCantSelectMoveBattleScript(void)
 {
     u8 limitations = 0;
     u16 move = gBattleMons[gActiveBank].moves[gBattleBufferB[gActiveBank][2]];
@@ -218,7 +218,7 @@ u8 sub_803FB4C(void)  // msg, can't select a move
         }
         else
         {
-            gUnknown_02024220[gActiveBank] = gUnknown_082DAE1F;
+            gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DAE1F;
             limitations = 1;
         }
     }
@@ -233,7 +233,7 @@ u8 sub_803FB4C(void)  // msg, can't select a move
         }
         else
         {
-            gUnknown_02024220[gActiveBank] = gUnknown_082DB089;
+            gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB089;
             limitations++;
         }
     }
@@ -248,7 +248,7 @@ u8 sub_803FB4C(void)  // msg, can't select a move
         }
         else
         {
-            gUnknown_02024220[gActiveBank] = gUnknown_082DB0A0;
+            gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB0A0;
             limitations++;
         }
     }
@@ -263,7 +263,7 @@ u8 sub_803FB4C(void)  // msg, can't select a move
         }
         else
         {
-            gUnknown_02024220[gActiveBank] = gUnknown_082DB181;
+            gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB181;
             limitations++;
         }
     }
@@ -285,7 +285,7 @@ u8 sub_803FB4C(void)  // msg, can't select a move
         }
         else
         {
-            gUnknown_02024220[gActiveBank] = gUnknown_082DB812;
+            gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB812;
             limitations++;
         }
     }
@@ -298,7 +298,7 @@ u8 sub_803FB4C(void)  // msg, can't select a move
         }
         else
         {
-            gUnknown_02024220[gActiveBank] = gUnknown_082DB076;
+            gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB076;
             limitations++;
         }
     }
@@ -349,7 +349,7 @@ bool8 AreAllMovesUnusable(void)
     if (unusable == 0xF) // all moves are unusable
     {
         gProtectStructs[gActiveBank].onlyStruggle = 1;
-        gUnknown_02024220[gActiveBank] = BattleScript_NoMovesLeft;
+        gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_NoMovesLeft;
     }
     else
     {
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 287bc4a5d..aa069b325 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -382,7 +382,7 @@ gBattlescriptCurrInstr: @ 2024214
 gActionForBanks: @ 202421C
 	.space 0x4
 
-gUnknown_02024220: @ 2024220
+gBattlescriptPtrsForSelection: @ 2024220
 	.space 0x10
 
 gUnknown_02024230: @ 2024230
@@ -1671,7 +1671,7 @@ gUnknown_0203BD28: @ 203BD28
 gRecordedBattleRngSeed: @ 203BD2C
 	.space 0x4
 
-gUnknown_0203BD30: @ 203BD30
+gBattlePalaceMoveSelectionRngValue: @ 203BD30
 	.space 0x4
 
 gUnknown_0203BD34: @ 203BD34

From d87d19cfe5903f5fabb0de37d2c46ef84a83c168 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 4 Oct 2017 19:25:14 +0200
Subject: [PATCH 28/42] more battle2 done

---
 asm/battle_2.s               | 977 +----------------------------------
 include/battle.h             |  25 +-
 include/pokemon.h            |   2 +-
 src/battle_2.c               | 509 ++++++++++++++----
 src/battle_3.c               |  14 +-
 src/battle_script_commands.c |  42 +-
 sym_ewram.txt                |   4 +-
 7 files changed, 478 insertions(+), 1095 deletions(-)

diff --git a/asm/battle_2.s b/asm/battle_2.s
index 5f970d766..673a0a833 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -5,951 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_803CDB8
-sub_803CDB8: @ 803CDB8
-	push {r4,r5,lr}
-	movs r3, 0
-	movs r1, 0
-	ldr r0, =gNoOfAllBanks
-	ldrb r2, [r0]
-	adds r5, r0, 0
-	cmp r3, r2
-	bge _0803CDDA
-	ldr r4, =gBattleCommunication
-_0803CDCA:
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	cmp r0, 0x5
-	bne _0803CDD4
-	adds r3, 0x1
-_0803CDD4:
-	adds r1, 0x1
-	cmp r1, r2
-	blt _0803CDCA
-_0803CDDA:
-	adds r0, r3, 0x1
-	ldrb r5, [r5]
-	cmp r0, r5
-	beq _0803CDF0
-	movs r0, 0
-	b _0803CDF2
-	.pool
-_0803CDF0:
-	movs r0, 0x1
-_0803CDF2:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_803CDB8
-
-	thumb_func_start sub_803CDF8
-sub_803CDF8: @ 803CDF8
-	push {r4-r7,lr}
-	ldr r7, =gActiveBank
-	ldrb r0, [r7]
-	ldr r6, =gBattleStruct
-	ldr r1, [r6]
-	adds r1, r0, r1
-	adds r1, 0x5C
-	ldr r4, =gBattleBufferB
-	lsls r0, 9
-	adds r2, r4, 0x1
-	adds r0, r2
-	ldrb r0, [r0]
-	strb r0, [r1]
-	ldrb r0, [r7]
-	lsls r1, r0, 9
-	adds r1, r2
-	ldrb r1, [r1]
-	bl RecordedBattle_SetBankAction
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x42
-	ands r0, r1
-	cmp r0, 0x42
-	bne _0803CEC6
-	ldrb r0, [r7]
-	ldr r2, [r6]
-	lsls r1, r0, 1
-	adds r1, r0
-	adds r1, r2
-	adds r1, 0x60
-	ldrb r2, [r1]
-	movs r0, 0xF
-	ands r0, r2
-	strb r0, [r1]
-	ldrb r0, [r7]
-	ldr r2, [r6]
-	lsls r1, r0, 1
-	adds r1, r0
-	adds r1, r2
-	adds r1, 0x60
-	lsls r0, 9
-	adds r5, r4, 0x2
-	adds r0, r5
-	ldrb r2, [r0]
-	movs r3, 0xF0
-	adds r0, r3, 0
-	ands r0, r2
-	ldrb r2, [r1]
-	orrs r0, r2
-	strb r0, [r1]
-	ldrb r1, [r7]
-	ldr r2, [r6]
-	lsls r0, r1, 1
-	adds r0, r1
-	adds r0, r2
-	adds r0, 0x61
-	lsls r1, 9
-	adds r4, 0x3
-	mov r12, r4
-	add r1, r12
-	ldrb r1, [r1]
-	strb r1, [r0]
-	ldrb r0, [r7]
-	movs r4, 0x2
-	eors r0, r4
-	ldr r2, [r6]
-	lsls r1, r0, 1
-	adds r1, r0
-	adds r1, r2
-	adds r1, 0x60
-	ldrb r2, [r1]
-	adds r0, r3, 0
-	ands r0, r2
-	strb r0, [r1]
-	ldrb r0, [r7]
-	eors r0, r4
-	ldr r2, [r6]
-	lsls r1, r0, 1
-	adds r1, r0
-	adds r1, r2
-	adds r1, 0x60
-	ldrb r0, [r7]
-	lsls r0, 9
-	adds r0, r5
-	ldrb r0, [r0]
-	ands r3, r0
-	lsrs r3, 4
-	ldrb r0, [r1]
-	orrs r3, r0
-	strb r3, [r1]
-	ldrb r0, [r7]
-	eors r4, r0
-	ldr r0, [r6]
-	lsls r1, r4, 1
-	adds r1, r4
-	adds r1, r0
-	adds r1, 0x62
-	ldrb r0, [r7]
-	lsls r0, 9
-	add r0, r12
-	ldrb r0, [r0]
-	strb r0, [r1]
-_0803CEC6:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803CDF8
-
-	thumb_func_start sub_803CEDC
-sub_803CEDC: @ 803CEDC
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, =gUnknown_0202407A
-	adds r4, r0, r2
-	ldrb r5, [r4]
-	adds r2, r1, r2
-	ldrb r3, [r2]
-	strb r3, [r4]
-	strb r5, [r2]
-	ldr r2, =gTurnOrder
-	adds r0, r2
-	ldrb r5, [r0]
-	adds r1, r2
-	ldrb r2, [r1]
-	strb r2, [r0]
-	strb r5, [r1]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803CEDC
-
-	thumb_func_start GetWhoStrikesFirst
-GetWhoStrikesFirst: @ 803CF10
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0xC
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	lsls r1, 24
-	lsrs r1, 24
-	mov r10, r1
-	lsls r2, 24
-	lsrs r2, 24
-	str r2, [sp, 0x4]
-	movs r0, 0
-	str r0, [sp, 0x8]
-	str r0, [sp]
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0xD
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803CFD8
-	ldr r1, [sp, 0x8]
-	str r1, [sp]
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0x4D
-	movs r3, 0
-	bl AbilityBattleEffects
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803CFD8
-	ldr r1, =gBattleMons
-	movs r0, 0x58
-	mov r2, r9
-	muls r2, r0
-	adds r0, r2, 0
-	adds r0, r1
-	adds r0, 0x20
-	ldrb r3, [r0]
-	cmp r3, 0x21
-	bne _0803CF7C
-	ldr r0, =gBattleWeather
-	ldrh r1, [r0]
-	movs r0, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _0803CF8C
-_0803CF7C:
-	cmp r3, 0x22
-	bne _0803CF98
-	ldr r0, =gBattleWeather
-	ldrh r1, [r0]
-	movs r0, 0x60
-	ands r0, r1
-	cmp r0, 0
-	beq _0803CF98
-_0803CF8C:
-	movs r3, 0x2
-	b _0803CF9A
-	.pool
-_0803CF98:
-	movs r3, 0x1
-_0803CF9A:
-	movs r0, 0x58
-	mov r1, r10
-	muls r1, r0
-	adds r0, r1, 0
-	ldr r2, =gBattleMons
-	adds r0, r2
-	adds r0, 0x20
-	ldrb r2, [r0]
-	cmp r2, 0x21
-	bne _0803CFBA
-	ldr r0, =gBattleWeather
-	ldrh r1, [r0]
-	movs r0, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _0803CFCA
-_0803CFBA:
-	cmp r2, 0x22
-	bne _0803CFDA
-	ldr r0, =gBattleWeather
-	ldrh r1, [r0]
-	movs r0, 0x60
-	ands r0, r1
-	cmp r0, 0
-	beq _0803CFDA
-_0803CFCA:
-	movs r7, 0x2
-	b _0803CFDC
-	.pool
-_0803CFD8:
-	movs r3, 0x1
-_0803CFDA:
-	movs r7, 0x1
-_0803CFDC:
-	ldr r1, =gBattleMons
-	movs r0, 0x58
-	mov r2, r9
-	muls r2, r0
-	adds r0, r2, 0
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x6]
-	muls r3, r0
-	ldr r2, =gStatStageRatios
-	movs r1, 0x1B
-	ldrsb r1, [r4, r1]
-	lsls r1, 1
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	muls r0, r3
-	adds r2, 0x1
-	adds r1, r2
-	ldrb r1, [r1]
-	bl __divsi3
-	mov r8, r0
-	ldrh r0, [r4, 0x2E]
-	cmp r0, 0xAF
-	bne _0803D02C
-	ldr r1, =gEnigmaBerries
-	mov r3, r9
-	lsls r0, r3, 3
-	subs r0, r3
-	lsls r0, 2
-	adds r0, r1
-	ldrb r6, [r0, 0x7]
-	ldrb r5, [r0, 0x1A]
-	b _0803D040
-	.pool
-_0803D02C:
-	ldrh r0, [r4, 0x2E]
-	bl ItemId_GetHoldEffect
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldrh r0, [r4, 0x2E]
-	bl ItemId_GetHoldEffectParam
-	lsls r0, 24
-	lsrs r5, r0, 24
-_0803D040:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	ldr r1, =0x023f0102
-	ands r0, r1
-	cmp r0, 0
-	bne _0803D074
-	ldr r0, =0x00000869
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803D074
-	mov r0, r9
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803D074
-	movs r0, 0x6E
-	mov r1, r8
-	muls r1, r0
-	adds r0, r1, 0
-	movs r1, 0x64
-	bl __udivsi3
-	mov r8, r0
-_0803D074:
-	cmp r6, 0x18
-	bne _0803D07E
-	mov r2, r8
-	lsrs r2, 1
-	mov r8, r2
-_0803D07E:
-	ldr r1, =gBattleMons
-	movs r0, 0x58
-	mov r3, r9
-	muls r3, r0
-	adds r0, r3, 0
-	adds r1, 0x4C
-	adds r0, r1
-	ldr r0, [r0]
-	movs r1, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _0803D09C
-	mov r0, r8
-	lsrs r0, 2
-	mov r8, r0
-_0803D09C:
-	cmp r6, 0x1A
-	bne _0803D0B8
-	ldr r0, =gRandomTurnNumber
-	ldrh r4, [r0]
-	lsls r0, r5, 16
-	subs r0, r5
-	movs r1, 0x64
-	bl __divsi3
-	cmp r4, r0
-	bge _0803D0B8
-	movs r1, 0x1
-	negs r1, r1
-	mov r8, r1
-_0803D0B8:
-	ldr r1, =gBattleMons
-	movs r0, 0x58
-	mov r2, r10
-	muls r2, r0
-	adds r0, r2, 0
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x6]
-	adds r3, r0, 0
-	muls r3, r7
-	ldr r2, =gStatStageRatios
-	movs r1, 0x1B
-	ldrsb r1, [r4, r1]
-	lsls r1, 1
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	muls r0, r3
-	adds r2, 0x1
-	adds r1, r2
-	ldrb r1, [r1]
-	bl __divsi3
-	adds r7, r0, 0
-	ldrh r0, [r4, 0x2E]
-	cmp r0, 0xAF
-	bne _0803D118
-	ldr r1, =gEnigmaBerries
-	mov r3, r10
-	lsls r0, r3, 3
-	subs r0, r3
-	lsls r0, 2
-	adds r0, r1
-	ldrb r6, [r0, 0x7]
-	ldrb r5, [r0, 0x1A]
-	b _0803D12C
-	.pool
-_0803D118:
-	ldrh r0, [r4, 0x2E]
-	bl ItemId_GetHoldEffect
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldrh r0, [r4, 0x2E]
-	bl ItemId_GetHoldEffectParam
-	lsls r0, 24
-	lsrs r5, r0, 24
-_0803D12C:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	ldr r1, =0x023f0102
-	ands r0, r1
-	cmp r0, 0
-	bne _0803D15C
-	ldr r0, =0x00000869
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803D15C
-	mov r0, r10
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803D15C
-	movs r0, 0x6E
-	muls r0, r7
-	movs r1, 0x64
-	bl __udivsi3
-	adds r7, r0, 0
-_0803D15C:
-	cmp r6, 0x18
-	bne _0803D162
-	lsrs r7, 1
-_0803D162:
-	ldr r2, =gBattleMons
-	movs r0, 0x58
-	mov r1, r10
-	muls r1, r0
-	adds r0, r1, 0
-	adds r1, r2, 0
-	adds r1, 0x4C
-	adds r0, r1
-	ldr r0, [r0]
-	movs r1, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _0803D17E
-	lsrs r7, 2
-_0803D17E:
-	cmp r6, 0x1A
-	bne _0803D198
-	ldr r0, =gRandomTurnNumber
-	ldrh r4, [r0]
-	lsls r0, r5, 16
-	subs r0, r5
-	movs r1, 0x64
-	bl __divsi3
-	cmp r4, r0
-	bge _0803D198
-	movs r7, 0x1
-	negs r7, r7
-_0803D198:
-	ldr r2, [sp, 0x4]
-	cmp r2, 0
-	beq _0803D1B8
-	movs r3, 0
-	b _0803D254
-	.pool
-_0803D1B8:
-	ldr r0, =gActionForBanks
-	mov r3, r9
-	adds r1, r3, r0
-	ldrb r1, [r1]
-	adds r2, r0, 0
-	cmp r1, 0
-	bne _0803D208
-	ldr r0, =gProtectStructs
-	lsls r1, r3, 4
-	adds r1, r0
-	ldrb r0, [r1]
-	lsls r0, 29
-	cmp r0, 0
-	bge _0803D1E0
-	movs r3, 0xA5
-	b _0803D20A
-	.pool
-_0803D1E0:
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-	add r0, r9
-	adds r0, 0x80
-	ldrb r0, [r0]
-	lsls r0, 1
-	movs r1, 0x58
-	mov r3, r9
-	muls r3, r1
-	adds r1, r3, 0
-	adds r0, r1
-	ldr r1, =gBattleMons
-	adds r1, 0xC
-	adds r0, r1
-	ldrh r3, [r0]
-	b _0803D20A
-	.pool
-_0803D208:
-	movs r3, 0
-_0803D20A:
-	mov r1, r10
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0803D254
-	ldr r0, =gProtectStructs
-	lsls r1, 4
-	adds r1, r0
-	ldrb r0, [r1]
-	lsls r0, 29
-	cmp r0, 0
-	bge _0803D22C
-	movs r2, 0xA5
-	b _0803D256
-	.pool
-_0803D22C:
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-	add r0, r10
-	adds r0, 0x80
-	ldrb r0, [r0]
-	lsls r0, 1
-	movs r1, 0x58
-	mov r2, r10
-	muls r2, r1
-	adds r1, r2, 0
-	adds r0, r1
-	ldr r1, =gBattleMons
-	adds r1, 0xC
-	adds r0, r1
-	ldrh r2, [r0]
-	b _0803D256
-	.pool
-_0803D254:
-	movs r2, 0
-_0803D256:
-	ldr r4, =gBattleMoves
-	lsls r0, r3, 1
-	adds r0, r3
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0x7
-	ldrsb r1, [r0, r1]
-	lsls r3, r2, 1
-	cmp r1, 0
-	bne _0803D27A
-	adds r0, r3, r2
-	lsls r0, 2
-	adds r0, r4
-	ldrb r0, [r0, 0x7]
-	lsls r0, 24
-	asrs r0, 24
-	cmp r0, 0
-	beq _0803D2B8
-_0803D27A:
-	adds r0, r3, r2
-	lsls r0, 2
-	adds r0, r4
-	ldrb r0, [r0, 0x7]
-	lsls r0, 24
-	asrs r0, 24
-	cmp r1, r0
-	bne _0803D2AE
-	cmp r8, r7
-	bne _0803D2A4
-	bl Random
-	movs r1, 0x1
-	ands r1, r0
-	cmp r1, 0
-	beq _0803D2A4
-	movs r3, 0x2
-	b _0803D2D4
-	.pool
-_0803D2A4:
-	cmp r8, r7
-	bcs _0803D2D6
-	movs r0, 0x1
-	str r0, [sp, 0x8]
-	b _0803D2D6
-_0803D2AE:
-	cmp r1, r0
-	bge _0803D2D6
-	movs r1, 0x1
-	str r1, [sp, 0x8]
-	b _0803D2D6
-_0803D2B8:
-	cmp r8, r7
-	bne _0803D2CE
-	bl Random
-	movs r1, 0x1
-	ands r1, r0
-	cmp r1, 0
-	beq _0803D2CE
-	movs r2, 0x2
-	str r2, [sp, 0x8]
-	b _0803D2D6
-_0803D2CE:
-	cmp r8, r7
-	bcs _0803D2D6
-	movs r3, 0x1
-_0803D2D4:
-	str r3, [sp, 0x8]
-_0803D2D6:
-	ldr r0, [sp, 0x8]
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end GetWhoStrikesFirst
-
-	thumb_func_start sub_803D2E8
-sub_803D2E8: @ 803D2E8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	movs r3, 0
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0803D354
-	ldr r0, =gActiveBank
-	strb r3, [r0]
-	ldr r4, =gNoOfAllBanks
-	mov r8, r0
-	ldrb r0, [r4]
-	cmp r3, r0
-	bcc _0803D310
-	b _0803D54A
-_0803D310:
-	ldr r7, =gUnknown_0202407A
-	ldr r6, =gActionForBanks
-	mov r2, r8
-	ldr r5, =gTurnOrder
-_0803D318:
-	adds r1, r3, r7
-	ldrb r0, [r2]
-	adds r0, r6
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r1, r3, r5
-	ldrb r0, [r2]
-	strb r0, [r1]
-	adds r3, 0x1
-	ldrb r0, [r2]
-	adds r0, 0x1
-	strb r0, [r2]
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r4]
-	cmp r0, r1
-	bcc _0803D318
-	b _0803D54A
-	.pool
-_0803D354:
-	movs r2, 0x2
-	ands r1, r2
-	cmp r1, 0
-	beq _0803D3A4
-	ldr r0, =gActiveBank
-	strb r3, [r0]
-	ldr r1, =gNoOfAllBanks
-	mov r8, r0
-	adds r2, r1, 0
-	ldrb r2, [r2]
-	cmp r3, r2
-	bcs _0803D3C0
-	ldr r0, =gActionForBanks
-	ldrb r1, [r0]
-	adds r4, r0, 0
-	cmp r1, 0x3
-	beq _0803D3BE
-_0803D376:
-	mov r7, r8
-	ldrb r0, [r7]
-	adds r0, 0x1
-	strb r0, [r7]
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gNoOfAllBanks
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcs _0803D3C0
-	ldrb r0, [r7]
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	bne _0803D376
-	b _0803D3BE
-	.pool
-_0803D3A4:
-	ldr r1, =gActionForBanks
-	ldrb r0, [r1]
-	ldr r4, =gActiveBank
-	mov r8, r4
-	cmp r0, 0x3
-	bne _0803D3B4
-	strb r3, [r4]
-	movs r3, 0x5
-_0803D3B4:
-	ldrb r0, [r1, 0x2]
-	cmp r0, 0x3
-	bne _0803D3C0
-	mov r7, r8
-	strb r2, [r7]
-_0803D3BE:
-	movs r3, 0x5
-_0803D3C0:
-	cmp r3, 0x5
-	bne _0803D448
-	ldr r6, =gUnknown_0202407A
-	ldr r1, =gActionForBanks
-	mov r2, r8
-	ldrb r0, [r2]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r6]
-	ldr r2, =gTurnOrder
-	mov r3, r8
-	ldrb r0, [r3]
-	strb r0, [r2]
-	movs r3, 0x1
-	movs r5, 0
-	adds r4, r1, 0
-	ldr r7, =gBattleMainFunc
-	mov r10, r7
-	ldr r0, =bc_80154A0
-	mov r12, r0
-	ldr r1, =gBattleStruct
-	mov r9, r1
-	ldr r7, =gNoOfAllBanks
-	ldrb r7, [r7]
-	cmp r5, r7
-	bge _0803D41A
-	adds r7, r6, 0
-	adds r6, r4, 0
-	adds r4, r2, 0
-	ldr r2, =gNoOfAllBanks
-_0803D3FC:
-	mov r0, r8
-	ldrb r0, [r0]
-	cmp r5, r0
-	beq _0803D412
-	adds r1, r3, r7
-	adds r0, r5, r6
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r0, r3, r4
-	strb r5, [r0]
-	adds r3, 0x1
-_0803D412:
-	adds r5, 0x1
-	ldrb r1, [r2]
-	cmp r5, r1
-	blt _0803D3FC
-_0803D41A:
-	mov r2, r12
-	mov r3, r10
-	str r2, [r3]
-	mov r4, r9
-	ldr r0, [r4]
-	b _0803D554
-	.pool
-_0803D448:
-	movs r0, 0
-	mov r7, r8
-	strb r0, [r7]
-	ldr r1, =gNoOfAllBanks
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _0803D48E
-	ldr r6, =gActionForBanks
-	mov r2, r8
-	ldr r5, =gUnknown_0202407A
-	ldr r4, =gTurnOrder
-_0803D45E:
-	ldrb r0, [r2]
-	adds r0, r6
-	ldrb r1, [r0]
-	subs r0, r1, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bhi _0803D47C
-	adds r0, r3, r5
-	strb r1, [r0]
-	adds r1, r3, r4
-	mov r7, r8
-	ldrb r0, [r7]
-	strb r0, [r1]
-	adds r3, 0x1
-_0803D47C:
-	ldrb r0, [r2]
-	adds r0, 0x1
-	strb r0, [r2]
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gNoOfAllBanks
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803D45E
-_0803D48E:
-	movs r0, 0
-	mov r2, r8
-	strb r0, [r2]
-	ldr r4, =gNoOfAllBanks
-	ldrb r0, [r4]
-	cmp r0, 0
-	beq _0803D4D2
-	ldr r6, =gActionForBanks
-	ldr r5, =gUnknown_0202407A
-	ldr r4, =gTurnOrder
-_0803D4A2:
-	ldrb r0, [r2]
-	adds r0, r6
-	ldrb r1, [r0]
-	subs r0, r1, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bls _0803D4C0
-	adds r0, r3, r5
-	strb r1, [r0]
-	adds r1, r3, r4
-	mov r7, r8
-	ldrb r0, [r7]
-	strb r0, [r1]
-	adds r3, 0x1
-_0803D4C0:
-	ldrb r0, [r2]
-	adds r0, 0x1
-	strb r0, [r2]
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gNoOfAllBanks
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803D4A2
-_0803D4D2:
-	movs r5, 0
-	b _0803D540
-	.pool
-_0803D4E8:
-	adds r4, r5, 0x1
-	adds r7, r4, 0
-	ldrb r1, [r1]
-	cmp r7, r1
-	bge _0803D53E
-	ldr r6, =gUnknown_0202407A
-	lsls r2, r5, 24
-	mov r8, r2
-_0803D4F8:
-	ldr r0, =gTurnOrder
-	adds r1, r5, r0
-	ldrb r3, [r1]
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	adds r0, r5, r6
-	ldrb r2, [r0]
-	cmp r2, 0x1
-	beq _0803D534
-	adds r0, r4, r6
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0803D534
-	cmp r2, 0x2
-	beq _0803D534
-	cmp r0, 0x2
-	beq _0803D534
-	adds r0, r3, 0
-	movs r2, 0
-	bl GetWhoStrikesFirst
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803D534
-	lsls r1, r4, 24
-	lsrs r1, 24
-	mov r3, r8
-	lsrs r0, r3, 24
-	bl sub_803CEDC
-_0803D534:
-	adds r4, 0x1
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r4, r0
-	blt _0803D4F8
-_0803D53E:
-	adds r5, r7, 0
-_0803D540:
-	ldr r1, =gNoOfAllBanks
-	ldrb r0, [r1]
-	subs r0, 0x1
-	cmp r5, r0
-	blt _0803D4E8
-_0803D54A:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =bc_80154A0
-	str r0, [r1]
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-_0803D554:
-	adds r0, 0x48
-	movs r1, 0
-	strb r1, [r0]
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803D2E8
 
 	thumb_func_start TurnValuesCleanUp
 TurnValuesCleanUp: @ 803D580
@@ -1215,7 +270,7 @@ _0803D7AE:
 	movs r0, 0
 	strb r0, [r1]
 	ldr r1, =gFightStateTracker
-	ldr r0, =gUnknown_0202407A
+	ldr r0, =gActionsByTurnOrder
 	movs r3, 0
 	ldrb r0, [r0]
 	strb r0, [r1]
@@ -2100,7 +1155,7 @@ sub_803E0B8: @ 803E0B8
 	movs r0, 0x4
 	str r0, [sp]
 	ldr r6, =gBankAttacker
-	ldr r1, =gTurnOrder
+	ldr r1, =gBanksByTurnOrder
 	ldr r0, =gCurrentMoveTurn
 	ldrb r0, [r0]
 	adds r0, r1
@@ -2641,7 +1696,7 @@ _0803E5C4:
 	b _0803E74E
 _0803E5E2:
 	ldr r4, =gActiveBank
-	ldr r0, =gTurnOrder
+	ldr r0, =gBanksByTurnOrder
 	ldr r3, [sp]
 	adds r0, r3, r0
 	ldrb r0, [r0]
@@ -2908,7 +1963,7 @@ _0803E83C:
 bs2_8016374: @ 803E868
 	push {r4,lr}
 	ldr r3, =gBankAttacker
-	ldr r1, =gTurnOrder
+	ldr r1, =gBanksByTurnOrder
 	ldr r0, =gCurrentMoveTurn
 	ldrb r0, [r0]
 	adds r0, r1
@@ -2973,7 +2028,7 @@ sub_803E90C: @ 803E90C
 	push {r5-r7}
 	ldr r4, =gBankAttacker
 	ldr r2, =gBankTarget
-	ldr r1, =gTurnOrder
+	ldr r1, =gBanksByTurnOrder
 	ldr r0, =gCurrentMoveTurn
 	ldrb r0, [r0]
 	adds r0, r1
@@ -3534,7 +2589,7 @@ _0803EE24:
 sub_803EE48: @ 803EE48
 	push {r4-r6,lr}
 	ldr r4, =gBankAttacker
-	ldr r1, =gTurnOrder
+	ldr r1, =gBanksByTurnOrder
 	ldr r5, =gCurrentMoveTurn
 	ldrb r0, [r5]
 	adds r0, r1
@@ -3672,7 +2727,7 @@ _0803EF98:
 	thumb_func_start sub_803EFA8
 sub_803EFA8: @ 803EFA8
 	ldr r2, =gBankAttacker
-	ldr r1, =gTurnOrder
+	ldr r1, =gBanksByTurnOrder
 	ldr r0, =gCurrentMoveTurn
 	ldrb r0, [r0]
 	adds r0, r1
@@ -3697,7 +2752,7 @@ sub_803EFA8: @ 803EFA8
 	thumb_func_start bs5_8016AC0
 bs5_8016AC0: @ 803EFF0
 	ldr r2, =gBankAttacker
-	ldr r1, =gTurnOrder
+	ldr r1, =gBanksByTurnOrder
 	ldr r0, =gCurrentMoveTurn
 	ldrb r0, [r0]
 	adds r0, r1
@@ -3730,7 +2785,7 @@ bs5_8016AC0: @ 803EFF0
 sub_803F050: @ 803F050
 	push {r4-r6,lr}
 	ldr r3, =gBankAttacker
-	ldr r1, =gTurnOrder
+	ldr r1, =gBanksByTurnOrder
 	ldr r0, =gCurrentMoveTurn
 	ldrb r0, [r0]
 	adds r0, r1
@@ -3817,7 +2872,7 @@ _0803F100:
 sub_803F120: @ 803F120
 	push {r4,lr}
 	ldr r2, =gBankAttacker
-	ldr r1, =gTurnOrder
+	ldr r1, =gBanksByTurnOrder
 	ldr r0, =gCurrentMoveTurn
 	ldrb r0, [r0]
 	adds r0, r1
@@ -3903,7 +2958,7 @@ _0803F1CA:
 bs8_exit_by_flight: @ 803F1F0
 	push {r4,lr}
 	ldr r2, =gBankAttacker
-	ldr r1, =gTurnOrder
+	ldr r1, =gBanksByTurnOrder
 	ldr r4, =gCurrentMoveTurn
 	ldrb r0, [r4]
 	adds r0, r1
@@ -3926,7 +2981,7 @@ bs8_exit_by_flight: @ 803F1F0
 	thumb_func_start bs9_8016C9C
 bs9_8016C9C: @ 803F22C
 	ldr r3, =gBankAttacker
-	ldr r1, =gTurnOrder
+	ldr r1, =gBanksByTurnOrder
 	ldr r0, =gCurrentMoveTurn
 	ldrb r0, [r0]
 	adds r0, r1
@@ -3958,7 +3013,7 @@ bs9_8016C9C: @ 803F22C
 	ldr r1, =gFightStateTracker
 	movs r0, 0xA
 	strb r0, [r1]
-	ldr r1, =gUnknown_0202407A
+	ldr r1, =gActionsByTurnOrder
 	movs r0, 0xC
 	strb r0, [r1, 0x1]
 	bx lr
@@ -3993,7 +3048,7 @@ bsD_proceed: @ 803F2CC
 	adds r0, 0x1
 	strb r0, [r1]
 	ldr r3, =gFightStateTracker
-	ldr r2, =gUnknown_0202407A
+	ldr r2, =gActionsByTurnOrder
 	ldrb r0, [r1]
 	adds r0, r2
 	ldrb r0, [r0]
@@ -4010,7 +3065,7 @@ bsD_proceed: @ 803F2CC
 	thumb_func_start bsC_8016D70
 bsC_8016D70: @ 803F300
 	push {r4-r6,lr}
-	ldr r1, =gTurnOrder
+	ldr r1, =gBanksByTurnOrder
 	ldr r2, =gCurrentMoveTurn
 	ldrb r0, [r2]
 	adds r0, r1
@@ -4025,7 +3080,7 @@ bsC_8016D70: @ 803F300
 	adds r0, 0x1
 	strb r0, [r2]
 	ldr r3, =gFightStateTracker
-	ldr r1, =gUnknown_0202407A
+	ldr r1, =gActionsByTurnOrder
 	ldrb r0, [r2]
 	adds r0, r1
 	ldrb r0, [r0]
diff --git a/include/battle.h b/include/battle.h
index 50d2389ac..7c8d89e57 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -161,6 +161,20 @@
 #define SIDE_STATUS_MIST             (1 << 8)
 #define SIDE_STATUS_SPIKES_DAMAGED   (1 << 9)
 
+#define ACTION_USE_MOVE             0
+#define ACTION_USE_ITEM             1
+#define ACTION_SWITCH               2
+#define ACTION_RUN                  3
+#define ACTION_WATCHES_CAREFULLY    4
+#define ACTION_SAFARI_ZONE_BALL     5
+#define ACTION_POKEBLOCK_CASE       6
+#define ACTION_GO_NEAR              7
+#define ACTION_SAFARI_ZONE_RUN      8
+#define ACTION_9                    9
+#define ACTION_CANCEL_PARTNER       12
+#define ACTION_NOTHING_FAINTED      13
+#define ACTION_INIT_VALUE           0xFF
+
 #define ABILITYEFFECT_ON_SWITCHIN               0x0
 #define ABILITYEFFECT_ENDTURN                   0x1
 #define ABILITYEFFECT_MOVES_BLOCK               0x2
@@ -232,6 +246,7 @@
 #define SPRITES_INIT_STATE1     0x1 // shares the Id as well
 #define SPRITES_INIT_STATE2     0x2
 #define MOVE_EFFECT_BYTE        0x3
+#define ACTIONS_CONFIRMED_COUNT 0x4
 #define MULTISTRING_CHOOSER     0x5
 #define MSG_DISPLAY             0x7
 #define BATTLE_COMMUNICATION_ENTRIES_COUNT  0x8
@@ -601,7 +616,7 @@ struct BattleStruct
     u16 expValue;
     u8 field_52;
     u8 sentInPokes;
-    u8 field_54[4];
+    bool8 selectionScriptFinished[BATTLE_BANKS_COUNT];
     u8 field_58[4];
     u8 field_5C[4];
     u8 field_60[4][3];
@@ -615,8 +630,8 @@ struct BattleStruct
     u8 field_7D;
     u8 field_7E;
     u8 formToChangeInto;
-    u8 chosenMovesIds[4];
-    u8 field_84[4];
+    u8 chosenMovesIds[BATTLE_BANKS_COUNT];
+    u8 stateIdAfterSelScript[BATTLE_BANKS_COUNT];
     u8 field_88;
     u8 field_89;
     u8 field_8A;
@@ -890,8 +905,8 @@ bool8 CanRunFromBattle(u8 bank);
 bool8 IsRunningFromBattleImpossible(void);
 void PressurePPLoseOnUsingPerishSong(u8 bankAtk);
 void PressurePPLoseOnUsingImprision(u8 bankAtk);
-u8 GetWhoStrikesFirst(u8 bankAtk, u8 bankDef, bool8 ignoreChosenMoves);
-void sub_803CEDC(u8, u8);
+u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves);
+void SwapTurnOrder(u8, u8);
 void BattleTurnPassed(void);
 
 // battle_3
diff --git a/include/pokemon.h b/include/pokemon.h
index b3155881e..5d97c1666 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -439,7 +439,7 @@ struct BattleMove
     u8 pp;
     u8 secondaryEffectChance;
     u8 target;
-    u8 priority;
+    s8 priority;
     u8 flags;
 };
 
diff --git a/src/battle_2.c b/src/battle_2.c
index a18e1c698..04907d0c0 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -36,6 +36,7 @@
 #include "battle_controllers.h"
 #include "pokedex.h"
 #include "abilities.h"
+#include "moves.h"
 
 struct UnknownStruct6
 {
@@ -127,12 +128,16 @@ extern u16 gCurrentMove;
 extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
 extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-extern u8 gTurnOrder[BATTLE_BANKS_COUNT];
+extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT];
 extern u8 gActionForBanks[BATTLE_BANKS_COUNT];
 extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
 extern u8 gFightStateTracker;
 extern u8 gLastUsedAbility;
 extern u16 gLastUsedItem;
+extern u8 gUnknown_0203CF00[];
+extern const u8* gBattlescriptPtrsForSelection[BATTLE_BANKS_COUNT];
+extern const u8* gBattlescriptCurrInstr;
+extern u32 gBattlePalaceMoveSelectionRngValue;
 
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 extern const struct BattleMove gBattleMoves[];
@@ -153,6 +158,11 @@ extern const u8 gText_EmptyString3[];
 // 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 void HandleLinkBattleSetup(void); // rom_3
 extern void SetUpBattleVarsAndBirchZigzagoon(void); // rom_3
@@ -215,11 +225,12 @@ static void BattleIntroOpponent2SendsOutMonAnimation(void);
 static void BattleIntroRecordMonsToDex(void);
 static void BattleIntroPlayer1SendsOutMonAnimation(void);
 static void TryDoEventsBeforeFirstTurn(void);
-void sub_803BE74(void);
+void HandleTurnActionSelectionState(void);
 void bc_bs_exec(void);
-void sub_803D2E8(void);
+static void SetActionsAndBanksTurnOrder(void);
 void sub_803CDF8(void);
 bool8 sub_803CDB8(void);
+void bc_80154A0(void);
 
 void CB2_InitBattle(void)
 {
@@ -3509,13 +3520,13 @@ static void TryDoEventsBeforeFirstTurn(void)
     if (gBattleStruct->switchInAbilitiesCounter == 0)
     {
         for (i = 0; i < gNoOfAllBanks; i++)
-            gTurnOrder[i] = i;
+            gBanksByTurnOrder[i] = i;
         for (i = 0; i < gNoOfAllBanks - 1; i++)
         {
             for (j = i + 1; j < gNoOfAllBanks; j++)
             {
-                if (GetWhoStrikesFirst(gTurnOrder[i], gTurnOrder[j], TRUE) != 0)
-                    sub_803CEDC(i, j);
+                if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], TRUE) != 0)
+                    SwapTurnOrder(i, j);
             }
         }
     }
@@ -3528,7 +3539,7 @@ static void TryDoEventsBeforeFirstTurn(void)
     // check all switch in abilities happening from the fastest mon to slowest
     while (gBattleStruct->switchInAbilitiesCounter < gNoOfAllBanks)
     {
-        if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gTurnOrder[gBattleStruct->switchInAbilitiesCounter], 0, 0, 0) != 0)
+        if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gBanksByTurnOrder[gBattleStruct->switchInAbilitiesCounter], 0, 0, 0) != 0)
             effect++;
 
         gBattleStruct->switchInAbilitiesCounter++;
@@ -3543,7 +3554,7 @@ static void TryDoEventsBeforeFirstTurn(void)
     // check all switch in items having effect from the fastest mon to slowest
     while (gBattleStruct->switchInItemsCounter < gNoOfAllBanks)
     {
-        if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gTurnOrder[gBattleStruct->switchInItemsCounter], 0) != 0)
+        if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gBanksByTurnOrder[gBattleStruct->switchInItemsCounter], 0) != 0)
             effect++;
 
         gBattleStruct->switchInItemsCounter++;
@@ -3554,14 +3565,14 @@ static void TryDoEventsBeforeFirstTurn(void)
     for (i = 0; i < BATTLE_BANKS_COUNT; i++)
     {
         *(gBattleStruct->field_5C + i) = 6;
-        gActionForBanks[i] = 0xFF;
-        gChosenMovesByBanks[i] = 0;
+        gActionForBanks[i] = ACTION_INIT_VALUE;
+        gChosenMovesByBanks[i] = MOVE_NONE;
     }
     TurnValuesCleanUp(0);
     SpecialStatusesClear();
     *(&gBattleStruct->field_91) = gAbsentBankFlags;
     sub_814F9EC(gText_EmptyString3, 0);
-    gBattleMainFunc = sub_803BE74;
+    gBattleMainFunc = HandleTurnActionSelectionState;
     ResetSentPokesToOpponentValue();
 
     for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; i++)
@@ -3659,8 +3670,8 @@ void BattleTurnPassed(void)
 
     for (i = 0; i < gNoOfAllBanks; i++)
     {
-        gActionForBanks[i] = 0xFF;
-        gChosenMovesByBanks[i] = 0;
+        gActionForBanks[i] = ACTION_INIT_VALUE;
+        gChosenMovesByBanks[i] = MOVE_NONE;
     }
 
     for (i = 0; i < 4; i++)
@@ -3668,7 +3679,7 @@ void BattleTurnPassed(void)
 
     *(&gBattleStruct->field_91) = gAbsentBankFlags;
     sub_814F9EC(gText_EmptyString3, 0);
-    gBattleMainFunc = sub_803BE74;
+    gBattleMainFunc = HandleTurnActionSelectionState;
     gRandomTurnNumber = Random();
 
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
@@ -3743,8 +3754,6 @@ u8 IsRunningFromBattleImpossible(void)
     return 0;
 }
 
-extern u8 gUnknown_0203CF00[];
-
 void sub_803BDA0(u8 bank)
 {
     s32 i;
@@ -3777,32 +3786,31 @@ void sub_803BDA0(u8 bank)
     }
 }
 
-extern const u8* gBattlescriptPtrsForSelection[BATTLE_BANKS_COUNT];
-extern const u8* gBattlescriptCurrInstr;
+#define STATE_TURN_START_RECORD                     0
+#define STATE_BEFORE_ACTION_CHOSEN                  1
+#define STATE_WAIT_ACTION_CHOSEN                    2
+#define STATE_WAIT_ACTION_CASE_CHOSEN               3
+#define STATE_WAIT_ACTION_CONFIRMED_STANDBY         4
+#define STATE_WAIT_ACTION_CONFIRMED                 5
+#define STATE_SELECTION_SCRIPT                      6
+#define STATE_WAIT_SET_BEFORE_ACTION                7
+#define STATE_SELECTION_SCRIPT_MAY_RUN              8
 
-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 u32 gBattlePalaceMoveSelectionRngValue;
-
-void sub_803BE74(void)
+void HandleTurnActionSelectionState(void)
 {
     s32 i;
 
-    gBattleCommunication[4] = 0;
+    gBattleCommunication[ACTIONS_CONFIRMED_COUNT] = 0;
     for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
     {
         u8 identity = GetBankIdentity(gActiveBank);
         switch (gBattleCommunication[gActiveBank])
         {
-        case 0:
+        case STATE_TURN_START_RECORD: // recorded battle related on start of every turn
             sub_8185FD0();
-            gBattleCommunication[gActiveBank] = 1;
+            gBattleCommunication[gActiveBank] = STATE_BEFORE_ACTION_CHOSEN;
             break;
-        case 1:
+        case STATE_BEFORE_ACTION_CHOSEN: // choose an action
             *(gBattleStruct->field_5C + gActiveBank) = 6;
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI
                 || !(identity & BIT_MON)
@@ -3811,19 +3819,19 @@ void sub_803BE74(void)
             {
                 if (gBattleStruct->field_91 & gBitTable[gActiveBank])
                 {
-                    gActionForBanks[gActiveBank] = 13;
+                    gActionForBanks[gActiveBank] = ACTION_NOTHING_FAINTED;
                     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
-                        gBattleCommunication[gActiveBank] = 5;
+                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED;
                     else
-                        gBattleCommunication[gActiveBank] = 4;
+                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                 }
                 else
                 {
                     if (gBattleMons[gActiveBank].status2 & STATUS2_MULTIPLETURNS
                         || gBattleMons[gActiveBank].status2 & STATUS2_RECHARGE)
                     {
-                        gActionForBanks[gActiveBank] = 0;
-                        gBattleCommunication[gActiveBank] = 4;
+                        gActionForBanks[gActiveBank] = ACTION_USE_MOVE;
+                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                     }
                     else
                     {
@@ -3834,7 +3842,7 @@ void sub_803BE74(void)
                 }
             }
             break;
-        case 2:
+        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]);
@@ -3842,12 +3850,12 @@ void sub_803BE74(void)
 
                 switch (gBattleBufferB[gActiveBank][1])
                 {
-                case 0:
+                case ACTION_USE_MOVE:
                     if (AreAllMovesUnusable())
                     {
-                        gBattleCommunication[gActiveBank] = 6;
-                        *(gBattleStruct->field_54 + gActiveBank) = 0;
-                        *(gBattleStruct->field_84 + gActiveBank) = 4;
+                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
+                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
+                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                         *(gBattleStruct->moveTarget + gActiveBank) = gBattleBufferB[gActiveBank][3];
                         return;
                     }
@@ -3855,7 +3863,7 @@ void sub_803BE74(void)
                     {
                         gChosenMovesByBanks[gActiveBank] = gDisableStructs[gActiveBank].encoredMove;
                         *(gBattleStruct->chosenMovesIds + gActiveBank) = gDisableStructs[gActiveBank].encoredMovePos;
-                        gBattleCommunication[gActiveBank] = 4;
+                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                         return;
                     }
                     else
@@ -3880,7 +3888,7 @@ void sub_803BE74(void)
                         MarkBufferBankForExecution(gActiveBank);
                     }
                     break;
-                case 1:
+                case ACTION_USE_ITEM:
                     if (gBattleTypeFlags & (BATTLE_TYPE_LINK
                                             | BATTLE_TYPE_FRONTIER_NO_PYRAMID
                                             | BATTLE_TYPE_EREADER_TRAINER
@@ -3888,9 +3896,9 @@ void sub_803BE74(void)
                     {
                         RecordedBattle_ClearBankAction(gActiveBank, 1);
                         gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_ActionSelectionItemsCantBeUsed;
-                        gBattleCommunication[gActiveBank] = 6;
-                        *(gBattleStruct->field_54 + gActiveBank) = 0;
-                        *(gBattleStruct->field_84 + gActiveBank) = 1;
+                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
+                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
+                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
                         return;
                     }
                     else
@@ -3899,7 +3907,7 @@ void sub_803BE74(void)
                         MarkBufferBankForExecution(gActiveBank);
                     }
                     break;
-                case 2:
+                case ACTION_SWITCH:
                     *(gBattleStruct->field_58 + gActiveBank) = gBattlePartyID[gActiveBank];
                     if (gBattleMons[gActiveBank].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)
                         || gBattleTypeFlags & BATTLE_TYPE_ARENA
@@ -3920,30 +3928,30 @@ void sub_803BE74(void)
                     }
                     else
                     {
-                        if (gActiveBank == 2 && gActionForBanks[0] == 2)
+                        if (gActiveBank == 2 && gActionForBanks[0] == ACTION_SWITCH)
                             EmitChoosePokemon(0, 0, *(gBattleStruct->field_5C + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
-                        else if (gActiveBank == 3 && gActionForBanks[1] == 2)
+                        else if (gActiveBank == 3 && gActionForBanks[1] == ACTION_SWITCH)
                             EmitChoosePokemon(0, 0, *(gBattleStruct->field_5C + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
                         else
                             EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
                     }
                     MarkBufferBankForExecution(gActiveBank);
                     break;
-                case 5:
+                case ACTION_SAFARI_ZONE_BALL:
                     if (IsPlayerPartyAndPokemonStorageFull())
                     {
                         gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DAB11;
-                        gBattleCommunication[gActiveBank] = 6;
-                        *(gBattleStruct->field_54 + gActiveBank) = 0;
-                        *(gBattleStruct->field_84 + gActiveBank) = 1;
+                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
+                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
+                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
                         return;
                     }
                     break;
-                case 6:
+                case ACTION_POKEBLOCK_CASE:
                     EmitOpenBag(0, gBattleStruct->field_60[gActiveBank]);
                     MarkBufferBankForExecution(gActiveBank);
                     break;
-                case 12:
+                case ACTION_CANCEL_PARTNER:
                     gBattleCommunication[gActiveBank] = 7;
                     gBattleCommunication[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] = 1;
                     RecordedBattle_ClearBankAction(gActiveBank, 1);
@@ -3954,22 +3962,22 @@ void sub_803BE74(void)
                         MarkBufferBankForExecution(gActiveBank);
                         return;
                     }
-                    else if (gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == 2)
+                    else if (gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == ACTION_SWITCH)
                     {
                         RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 2);
                     }
-                    else if (gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == 3)
+                    else if (gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == ACTION_RUN)
                     {
                         RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 1);
                     }
-                    else if (gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == 0
+                    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))
                     {
                         RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 1);
                     }
                     else if (gBattleTypeFlags & BATTLE_TYPE_PALACE
-                             && gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == 0)
+                             && gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE)
                     {
                         gRngValue = gBattlePalaceMoveSelectionRngValue;
                         RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 1);
@@ -3985,28 +3993,28 @@ void sub_803BE74(void)
 
                 if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
                     && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000)
-                    && gBattleBufferB[gActiveBank][1] == 3)
+                    && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                 {
                     gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB9BA;
                     gBattleCommunication[gActiveBank] = 8;
-                    *(gBattleStruct->field_54 + gActiveBank) = 0;
-                    *(gBattleStruct->field_84 + gActiveBank) = 1;
+                    *(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] == 3)
+                         && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                 {
                     BattleScriptExecute(gUnknown_082DAAFE);
                     gBattleCommunication[gActiveBank] = 1;
                 }
                 else if (IsRunningFromBattleImpossible() != 0
-                         && gBattleBufferB[gActiveBank][1] == 3)
+                         && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                 {
                     gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DAB0B;
-                    gBattleCommunication[gActiveBank] = 6;
-                    *(gBattleStruct->field_54 + gActiveBank) = 0;
-                    *(gBattleStruct->field_84 + gActiveBank) = 1;
+                    gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
+                    *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
+                    *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
                     return;
                 }
                 else
@@ -4015,12 +4023,12 @@ void sub_803BE74(void)
                 }
             }
             break;
-        case 3:
+        case STATE_WAIT_ACTION_CASE_CHOSEN:
             if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
             {
                 switch (gActionForBanks[gActiveBank])
                 {
-                case 0:
+                case ACTION_USE_MOVE:
                     switch (gBattleBufferB[gActiveBank][1])
                     {
                     case 3:
@@ -4033,7 +4041,7 @@ void sub_803BE74(void)
                         gActionForBanks[gActiveBank] = gBattleBufferB[gActiveBank][1];
                         return;
                     case 15:
-                        gActionForBanks[gActiveBank] = 2;
+                        gActionForBanks[gActiveBank] = ACTION_SWITCH;
                         sub_803CDF8();
                         return;
                     default:
@@ -4046,10 +4054,10 @@ void sub_803BE74(void)
                         else if (TrySetCantSelectMoveBattleScript())
                         {
                             RecordedBattle_ClearBankAction(gActiveBank, 1);
-                            gBattleCommunication[gActiveBank] = 6;
-                            *(gBattleStruct->field_54 + gActiveBank) = 0;
+                            gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
+                            *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                             gBattleBufferB[gActiveBank][1] = 0;
-                            *(gBattleStruct->field_84 + gActiveBank) = 2;
+                            *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_WAIT_ACTION_CHOSEN;
                             return;
                         }
                         else
@@ -4067,7 +4075,7 @@ void sub_803BE74(void)
                         break;
                     }
                     break;
-                case 1:
+                case ACTION_USE_ITEM:
                     if ((gBattleBufferB[gActiveBank][1] | (gBattleBufferB[gActiveBank][2] << 8)) == 0)
                     {
                         gBattleCommunication[gActiveBank] = 1;
@@ -4078,7 +4086,7 @@ void sub_803BE74(void)
                         gBattleCommunication[gActiveBank]++;
                     }
                     break;
-                case 2:
+                case ACTION_SWITCH:
                     if (gBattleBufferB[gActiveBank][1] == 6)
                     {
                         gBattleCommunication[gActiveBank] = 1;
@@ -4090,40 +4098,40 @@ void sub_803BE74(void)
                         gBattleCommunication[gActiveBank]++;
                     }
                     break;
-                case 3:
+                case ACTION_RUN:
                     gHitMarker |= HITMARKER_x8000;
                     gBattleCommunication[gActiveBank]++;
                     break;
-                case 4:
+                case ACTION_WATCHES_CAREFULLY:
                     gBattleCommunication[gActiveBank]++;
                     break;
-                case 5:
+                case ACTION_SAFARI_ZONE_BALL:
                     gBattleCommunication[gActiveBank]++;
                     break;
-                case 6:
+                case ACTION_POKEBLOCK_CASE:
                     if ((gBattleBufferB[gActiveBank][1] | (gBattleBufferB[gActiveBank][2] << 8)) != 0)
                     {
                         gBattleCommunication[gActiveBank]++;
                     }
                     else
                     {
-                        gBattleCommunication[gActiveBank] = 1;
+                        gBattleCommunication[gActiveBank] = STATE_BEFORE_ACTION_CHOSEN;
                     }
                     break;
-                case 7:
+                case ACTION_GO_NEAR:
                     gBattleCommunication[gActiveBank]++;
                     break;
-                case 8:
+                case ACTION_SAFARI_ZONE_RUN:
                     gHitMarker |= HITMARKER_x8000;
                     gBattleCommunication[gActiveBank]++;
                     break;
-                case 9:
+                case ACTION_9:
                     gBattleCommunication[gActiveBank]++;
                     break;
                 }
             }
             break;
-        case 4:
+        case STATE_WAIT_ACTION_CONFIRMED_STANDBY:
             if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
             {
                 i = (sub_803CDB8() != 0);
@@ -4142,16 +4150,16 @@ void sub_803BE74(void)
                 gBattleCommunication[gActiveBank]++;
             }
             break;
-        case 5:
+        case STATE_WAIT_ACTION_CONFIRMED:
             if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
             {
-                gBattleCommunication[4]++;
+                gBattleCommunication[ACTIONS_CONFIRMED_COUNT]++;
             }
             break;
-        case 6:
-            if (*(gBattleStruct->field_54 + gActiveBank) != 0)
+        case STATE_SELECTION_SCRIPT:
+            if (*(gBattleStruct->selectionScriptFinished + gActiveBank))
             {
-                gBattleCommunication[gActiveBank] = *(gBattleStruct->field_84 + gActiveBank);
+                gBattleCommunication[gActiveBank] = *(gBattleStruct->stateIdAfterSelScript + gActiveBank);
             }
             else
             {
@@ -4164,25 +4172,25 @@ void sub_803BE74(void)
                 gBattlescriptPtrsForSelection[gActiveBank] = gBattlescriptCurrInstr;
             }
             break;
-        case 7:
+        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 8:
-            if (*(gBattleStruct->field_54 + gActiveBank) != 0)
+        case STATE_SELECTION_SCRIPT_MAY_RUN:
+            if (*(gBattleStruct->selectionScriptFinished + gActiveBank))
             {
                 if (gBattleBufferB[gActiveBank][1] == 13)
                 {
                     gHitMarker |= HITMARKER_x8000;
-                    gActionForBanks[gActiveBank] = 3;
-                    gBattleCommunication[gActiveBank] = 4;
+                    gActionForBanks[gActiveBank] = ACTION_RUN;
+                    gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                 }
                 else
                 {
                     RecordedBattle_ClearBankAction(gActiveBank, 1);
-                    gBattleCommunication[gActiveBank] = *(gBattleStruct->field_84 + gActiveBank);
+                    gBattleCommunication[gActiveBank] = *(gBattleStruct->stateIdAfterSelScript + gActiveBank);
                 }
             }
             else
@@ -4199,18 +4207,323 @@ void sub_803BE74(void)
         }
     }
 
-    if (gBattleCommunication[4] == gNoOfAllBanks)
+    // check if everyone chose actions
+    if (gBattleCommunication[ACTIONS_CONFIRMED_COUNT] == gNoOfAllBanks)
     {
         sub_818603C(1);
-        gBattleMainFunc = sub_803D2E8;
+        gBattleMainFunc = SetActionsAndBanksTurnOrder;
 
         if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
         {
             for (i = 0; i < gNoOfAllBanks; i++)
             {
-                if (gActionForBanks[i] == 2)
+                if (gActionForBanks[i] == ACTION_SWITCH)
                     sub_80571DC(i, *(gBattleStruct->field_5C + i));
             }
         }
     }
 }
+
+bool8 sub_803CDB8(void)
+{
+    s32 i, var;
+
+    for (var = 0, i = 0; i < gNoOfAllBanks; i++)
+    {
+        if (gBattleCommunication[i] == 5)
+            var++;
+    }
+
+    if (var + 1 == gNoOfAllBanks)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void sub_803CDF8(void)
+{
+    *(gBattleStruct->field_5C + 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];
+    }
+}
+
+extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT];
+
+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;
+}
+
+extern const u8 gStatStageRatios[][2];
+
+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(BADGE03_GET)
+        && GetBankSide(bank1) == SIDE_PLAYER)
+    {
+        speedBank1 = (speedBank1 * 110) / 100;
+    }
+
+    if (holdEffect == HOLD_EFFECT_MACHO_BRACE)
+        speedBank1 /= 2;
+
+    if (gBattleMons[bank1].status1 & STATUS_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(BADGE03_GET)
+        && GetBankSide(bank2) == SIDE_PLAYER)
+    {
+        speedBank2 = (speedBank2 * 110) / 100;
+    }
+
+    if (holdEffect == HOLD_EFFECT_MACHO_BRACE)
+        speedBank2 /= 2;
+
+    if (gBattleMons[bank2].status1 & STATUS_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->chosenMovesIds + bank1)];
+        }
+        else
+            moveBank1 = MOVE_NONE;
+
+        if (gActionForBanks[bank2] == ACTION_USE_MOVE)
+        {
+            if (gProtectStructs[bank2].onlyStruggle)
+                moveBank2 = MOVE_STRUGGLE;
+            else
+                moveBank2 = gBattleMons[bank2].moves[*(gBattleStruct->chosenMovesIds + 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 < gNoOfAllBanks; gActiveBank++)
+        {
+            gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
+            gBanksByTurnOrder[var] = gActiveBank;
+            var++;
+        }
+    }
+    else
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; 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 < gNoOfAllBanks; i++)
+            {
+                if (i != gActiveBank)
+                {
+                    gActionsByTurnOrder[var] = gActionForBanks[i];
+                    gBanksByTurnOrder[var] = i;
+                    var++;
+                }
+            }
+            gBattleMainFunc = bc_80154A0;
+            gBattleStruct->field_48 = 0;
+            return;
+        }
+        else
+        {
+            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            {
+                if (gActionForBanks[gActiveBank] == ACTION_USE_ITEM || gActionForBanks[gActiveBank] == ACTION_SWITCH)
+                {
+                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
+                    gBanksByTurnOrder[var] = gActiveBank;
+                    var++;
+                }
+            }
+            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            {
+                if (gActionForBanks[gActiveBank] != ACTION_USE_ITEM && gActionForBanks[gActiveBank] != ACTION_SWITCH)
+                {
+                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
+                    gBanksByTurnOrder[var] = gActiveBank;
+                    var++;
+                }
+            }
+            for (i = 0; i < gNoOfAllBanks - 1; i++)
+            {
+                for (j = i + 1; j < gNoOfAllBanks; 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 = bc_80154A0;
+    gBattleStruct->field_48 = 0;
+}
diff --git a/src/battle_3.c b/src/battle_3.c
index 59028410d..c20d361a4 100644
--- a/src/battle_3.c
+++ b/src/battle_3.c
@@ -32,7 +32,7 @@ extern u8 gBankAttacker;
 extern u8 gBankTarget;
 extern u8 gAbsentBankFlags;
 extern u16 gBattleWeather;
-extern u8 gTurnOrder[BATTLE_BANKS_COUNT];
+extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT];
 extern u16 gSideAffecting[];
 extern u8 gBattleCommunication[];
 extern void (*gBattleMainFunc)(void);
@@ -404,15 +404,15 @@ u8 UpdateTurnCounters(void)
         case 0:
             for (i = 0; i < gNoOfAllBanks; i++)
             {
-                gTurnOrder[i] = i;
+                gBanksByTurnOrder[i] = i;
             }
             for (i = 0; i < gNoOfAllBanks - 1; i++)
             {
                 s32 j;
                 for (j = i + 1; j < gNoOfAllBanks; j++)
                 {
-                    if (GetWhoStrikesFirst(gTurnOrder[i], gTurnOrder[j], 0))
-                        sub_803CEDC(i, j);
+                    if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 0))
+                        SwapTurnOrder(i, j);
                 }
             }
 
@@ -537,7 +537,7 @@ u8 UpdateTurnCounters(void)
         case 5:
             while (gBattleStruct->turnSideTracker < gNoOfAllBanks)
             {
-                gActiveBank = gTurnOrder[gBattleStruct->turnSideTracker];
+                gActiveBank = gBanksByTurnOrder[gBattleStruct->turnSideTracker];
                 if (gWishFutureKnock.wishCounter[gActiveBank] != 0
                  && --gWishFutureKnock.wishCounter[gActiveBank] == 0
                  && gBattleMons[gActiveBank].hp != 0)
@@ -649,7 +649,7 @@ u8 TurnBasedEffects(void)
     gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20);
     while (gBattleStruct->turnEffectsBank < gNoOfAllBanks && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE)
     {
-        gActiveBank = gBankAttacker = gTurnOrder[gBattleStruct->turnEffectsBank];
+        gActiveBank = gBankAttacker = gBanksByTurnOrder[gBattleStruct->turnEffectsBank];
         if (gAbsentBankFlags & gBitTable[gActiveBank])
         {
             gBattleStruct->turnEffectsBank++;
@@ -1018,7 +1018,7 @@ bool8 sub_8041364(void)
     case 1:
         while (gBattleStruct->field_1A1 < gNoOfAllBanks)
         {
-            gActiveBank = gBankAttacker = gTurnOrder[gBattleStruct->field_1A1];
+            gActiveBank = gBankAttacker = gBanksByTurnOrder[gBattleStruct->field_1A1];
             if (gAbsentBankFlags & gBitTable[gActiveBank])
             {
                 gBattleStruct->field_1A1++;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 88c62841d..380f9ec40 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -47,8 +47,8 @@ extern u8 gActiveBank;
 extern u32 gBattleExecBuffer;
 extern u8 gNoOfAllBanks;
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gTurnOrder[BATTLE_BANKS_COUNT];
-extern u8 gUnknown_0202407A[BATTLE_BANKS_COUNT];
+extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT];
+extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT];
 extern u16 gCurrentMove;
 extern u8 gLastUsedAbility;
 extern u16 gBattleWeather;
@@ -331,7 +331,7 @@ static void atk40_jump_if_move_affected_by_protect(void);
 static void atk41_call(void);
 static void atk42_jumpiftype2(void);
 static void atk43_jumpifabilitypresent(void);
-static void atk44(void);
+static void atk44_end_selection_script(void);
 static void atk45_playanimation(void);
 static void atk46_playanimation2(void);
 static void atk47_setgraphicalstatchangevalues(void);
@@ -583,7 +583,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atk41_call,
     atk42_jumpiftype2,
     atk43_jumpifabilitypresent,
-    atk44,
+    atk44_end_selection_script,
     atk45_playanimation,
     atk46_playanimation2,
     atk47_setgraphicalstatchangevalues,
@@ -1151,11 +1151,11 @@ static void atk00_attackcanceler(void)
 
     for (i = 0; i < gNoOfAllBanks; i++)
     {
-        if ((gProtectStructs[gTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED)
+        if ((gProtectStructs[gBanksByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED)
         {
-            PressurePPLose(gBankAttacker, gTurnOrder[i], MOVE_SNATCH);
-            gProtectStructs[gTurnOrder[i]].stealMove = 0;
-            gBattleScripting.bank = gTurnOrder[i];
+            PressurePPLose(gBankAttacker, gBanksByTurnOrder[i], MOVE_SNATCH);
+            gProtectStructs[gBanksByTurnOrder[i]].stealMove = 0;
+            gBattleScripting.bank = gBanksByTurnOrder[i];
             BattleScriptPushCursor();
             gBattlescriptCurrInstr = BattleScript_SnatchedMove;
             return;
@@ -2378,7 +2378,7 @@ u8 BankGetTurnOrder(u8 bank)
     s32 i;
     for (i = 0; i < gNoOfAllBanks; i++)
     {
-        if (gTurnOrder[i] == bank)
+        if (gBanksByTurnOrder[i] == bank)
             break;
     }
     return i;
@@ -4462,9 +4462,9 @@ static void atk43_jumpifabilitypresent(void)
         gBattlescriptCurrInstr += 6;
 }
 
-static void atk44(void)
+static void atk44_end_selection_script(void)
 {
-    *(gBankAttacker + gBattleStruct->field_54) = 1;
+    *(gBankAttacker + gBattleStruct->selectionScriptFinished) = TRUE;
 }
 
 static void atk45_playanimation(void)
@@ -5903,15 +5903,15 @@ static void atk51_switch_handle_order(void)
         gBattleCommunication[0] = gBattleBufferB[gActiveBank][1];
         *(gBattleStruct->field_5C + gActiveBank) = gBattleBufferB[gActiveBank][1];
 
-        if ((gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_LINK)) == (BATTLE_TYPE_MULTI | BATTLE_TYPE_LINK))
+        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 ^ 2) * 3 + (u8*)(gBattleStruct->field_60) + 0) &= (0xF0);
-            *((gActiveBank ^ 2) * 3 + (u8*)(gBattleStruct->field_60) + 0) |= (gBattleBufferB[gActiveBank][2] & 0xF0) >> 4;
-            *((gActiveBank ^ 2) * 3 + (u8*)(gBattleStruct->field_60) + 2) = 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];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
         {
@@ -5983,8 +5983,8 @@ static void atk52_switch_in_effects(void)
 
             for (i = 0; i < gNoOfAllBanks; i++)
             {
-                if (gTurnOrder[i] == gActiveBank)
-                    gUnknown_0202407A[i] = 0xC;
+                if (gBanksByTurnOrder[i] == gActiveBank)
+                    gActionsByTurnOrder[i] = ACTION_CANCEL_PARTNER;
             }
 
             for (i = 0; i < gNoOfAllBanks; i++)
@@ -6569,7 +6569,7 @@ static void atk68_80246A0(void)
     s32 i;
 
     for (i = 0; i < gNoOfAllBanks; i++)
-        gUnknown_0202407A[i] = 0xC;
+        gActionsByTurnOrder[i] = ACTION_CANCEL_PARTNER;
 
     gBattlescriptCurrInstr++;
 }
@@ -9710,8 +9710,8 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
 
         for (i = 0; i < gNoOfAllBanks; i++)
         {
-            if (gTurnOrder[i] == gBankTarget)
-                gUnknown_0202407A[i] = 11;
+            if (gBanksByTurnOrder[i] == gBankTarget)
+                gActionsByTurnOrder[i] = 11;
         }
 
         gCurrentMove = MOVE_PURSUIT;
@@ -10942,7 +10942,7 @@ static void atkEC_pursuit_sth(void)
         && gActionForBanks[gActiveBank] == 0
         && gChosenMovesByBanks[gActiveBank] == MOVE_PURSUIT)
     {
-        gUnknown_0202407A[gActiveBank] = 11;
+        gActionsByTurnOrder[gActiveBank] = 11;
         gCurrentMove = MOVE_PURSUIT;
         gBattlescriptCurrInstr += 5;
         gBattleScripting.animTurn = 1;
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 7de63abce..c50d8f030 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -304,10 +304,10 @@ gBattlePartyID: @ 202406E
 gBanksBySide: @ 2024076
 	.space 0x4
 
-gUnknown_0202407A: @ 202407A
+gActionsByTurnOrder: @ 202407A
 	.space 0x4
 
-gTurnOrder: @ 202407E
+gBanksByTurnOrder: @ 202407E
 	.space 0x4
 
 gCurrentMoveTurn: @ 2024082

From e7175999f55da53392d269a2f03f498a03c9826c Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Thu, 5 Oct 2017 13:02:39 -0400
Subject: [PATCH 29/42] decompile braille_puzzles.c

---
 asm/braille_puzzles.s       | 627 ------------------------------------
 asm/field_control_avatar.s  |   2 +-
 asm/rom6.s                  |  10 +-
 data/field_effect_scripts.s |   2 +-
 ld_script.txt               |   2 +-
 src/braille_puzzles.c       | 583 +++++++++++++++++++++++++++++++++
 sym_ewram.txt               |   2 +-
 7 files changed, 592 insertions(+), 636 deletions(-)
 delete mode 100644 asm/braille_puzzles.s
 create mode 100755 src/braille_puzzles.c

diff --git a/asm/braille_puzzles.s b/asm/braille_puzzles.s
deleted file mode 100644
index 095b1b793..000000000
--- a/asm/braille_puzzles.s
+++ /dev/null
@@ -1,627 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_81795E8
-sub_81795E8: @ 81795E8
-	push {lr}
-	ldr r0, =0x000008af
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	bne _08179634
-	ldr r0, =gSaveBlock1Ptr
-	ldr r2, [r0]
-	ldrh r1, [r2, 0x4]
-	ldr r0, =0x00004718
-	cmp r1, r0
-	bne _08179634
-	ldr r1, [r2]
-	ldr r0, =0x0003000a
-	cmp r1, r0
-	beq _08179616
-	ldr r0, =0x00030009
-	cmp r1, r0
-	beq _08179616
-	ldr r0, =0x0003000b
-	cmp r1, r0
-	bne _08179634
-_08179616:
-	movs r0, 0x1
-	b _08179636
-	.pool
-_08179634:
-	movs r0, 0
-_08179636:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81795E8
-
-	thumb_func_start sub_817963C
-sub_817963C: @ 817963C
-	push {lr}
-	ldr r2, =0x0000022a
-	movs r0, 0x10
-	movs r1, 0x8
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x0000022b
-	movs r0, 0x11
-	movs r1, 0x8
-	bl MapGridSetMetatileIdAt
-	movs r2, 0x8B
-	lsls r2, 2
-	movs r0, 0x12
-	movs r1, 0x8
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000e32
-	movs r0, 0x10
-	movs r1, 0x9
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000233
-	movs r0, 0x11
-	movs r1, 0x9
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000e34
-	movs r0, 0x12
-	movs r1, 0x9
-	bl MapGridSetMetatileIdAt
-	bl DrawWholeMapView
-	movs r0, 0x14
-	bl PlaySE
-	ldr r0, =0x000008af
-	bl FlagSet
-	bl ScriptContext2_Disable
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_817963C
-
-	thumb_func_start sub_81796AC
-sub_81796AC: @ 81796AC
-	push {r4,lr}
-	ldr r4, =gPlayerParty
-	adds r0, r4, 0
-	movs r1, 0x41
-	movs r2, 0
-	bl GetMonData
-	movs r1, 0x9D
-	lsls r1, 1
-	cmp r0, r1
-	bne _081796F4
-	bl CalculatePlayerPartyCount
-	ldr r0, =gPlayerPartyCount
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	adds r1, r4, 0
-	subs r1, 0x64
-	adds r0, r1
-	movs r1, 0x41
-	movs r2, 0
-	bl GetMonData
-	ldr r1, =0x0000017d
-	cmp r0, r1
-	bne _081796F4
-	movs r0, 0x1
-	b _081796F6
-	.pool
-_081796F4:
-	movs r0, 0
-_081796F6:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81796AC
-
-	thumb_func_start nullsub_84
-nullsub_84: @ 81796FC
-	bx lr
-	thumb_func_end nullsub_84
-
-	thumb_func_start sub_8179700
-sub_8179700: @ 8179700
-	push {lr}
-	ldr r0, =sub_8179778
-	movs r1, 0x9
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r0, 0
-	strh r0, [r1, 0xA]
-	strh r0, [r1, 0xC]
-	movs r0, 0x2
-	strh r0, [r1, 0x10]
-	movs r0, 0x5
-	strh r0, [r1, 0x12]
-	movs r0, 0x32
-	strh r0, [r1, 0x14]
-	movs r0, 0
-	bl SetCameraPanningCallback
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179700
-
-	thumb_func_start sub_817973C
-sub_817973C: @ 817973C
-	push {lr}
-	ldr r0, =sub_8179778
-	movs r1, 0x9
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r0, 0
-	strh r0, [r1, 0xA]
-	strh r0, [r1, 0xC]
-	movs r0, 0x3
-	strh r0, [r1, 0x10]
-	movs r0, 0x5
-	strh r0, [r1, 0x12]
-	movs r0, 0x2
-	strh r0, [r1, 0x14]
-	movs r0, 0
-	bl SetCameraPanningCallback
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_817973C
-
-	thumb_func_start sub_8179778
-sub_8179778: @ 8179778
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, =gTasks
-	adds r4, r0, r1
-	ldrh r0, [r4, 0xA]
-	adds r0, 0x1
-	strh r0, [r4, 0xA]
-	movs r1, 0xA
-	ldrsh r0, [r4, r1]
-	movs r2, 0x12
-	ldrsh r1, [r4, r2]
-	bl __modsi3
-	cmp r0, 0
-	bne _081797D0
-	strh r0, [r4, 0xA]
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x1
-	strh r0, [r4, 0xC]
-	ldrh r0, [r4, 0x10]
-	negs r0, r0
-	strh r0, [r4, 0x10]
-	movs r0, 0x10
-	ldrsh r1, [r4, r0]
-	movs r0, 0
-	bl SetCameraPanning
-	movs r2, 0xC
-	ldrsh r1, [r4, r2]
-	movs r2, 0x14
-	ldrsh r0, [r4, r2]
-	cmp r1, r0
-	bne _081797D0
-	adds r0, r5, 0
-	bl DestroyTask
-	bl EnableBothScriptContexts
-	bl InstallCameraPanAheadCallback
-_081797D0:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179778
-
-	thumb_func_start sub_81797DC
-sub_81797DC: @ 81797DC
-	push {lr}
-	movs r0, 0x8B
-	lsls r0, 4
-	bl FlagGet
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0
-	bne _0817982C
-	ldr r0, =gSaveBlock1Ptr
-	ldr r3, [r0]
-	ldrh r1, [r3, 0x4]
-	movs r0, 0xC3
-	lsls r0, 3
-	cmp r1, r0
-	bne _0817982C
-	ldr r1, [r3]
-	ldr r0, =0x00170006
-	cmp r1, r0
-	beq _08179810
-	ldr r0, =0x00170005
-	cmp r1, r0
-	beq _08179810
-	ldr r0, =0x00170007
-	cmp r1, r0
-	bne _0817982C
-_08179810:
-	ldr r0, =gUnknown_0203BD14
-	strb r2, [r0]
-	movs r0, 0x1
-	b _0817982E
-	.pool
-_0817982C:
-	movs r0, 0
-_0817982E:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81797DC
-
-	thumb_func_start sub_8179834
-sub_8179834: @ 8179834
-	push {lr}
-	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [r1]
-	movs r0, 0x3C
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179834
-
-	thumb_func_start sub_8179850
-sub_8179850: @ 8179850
-	push {lr}
-	movs r0, 0x3C
-	bl FieldEffectActiveListRemove
-	bl sub_8179860
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8179850
-
-	thumb_func_start sub_8179860
-sub_8179860: @ 8179860
-	push {lr}
-	ldr r2, =0x0000022a
-	movs r0, 0xE
-	movs r1, 0x1A
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x0000022b
-	movs r0, 0xF
-	movs r1, 0x1A
-	bl MapGridSetMetatileIdAt
-	movs r2, 0x8B
-	lsls r2, 2
-	movs r0, 0x10
-	movs r1, 0x1A
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000e32
-	movs r0, 0xE
-	movs r1, 0x1B
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000233
-	movs r0, 0xF
-	movs r1, 0x1B
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000e34
-	movs r0, 0x10
-	movs r1, 0x1B
-	bl MapGridSetMetatileIdAt
-	bl DrawWholeMapView
-	movs r0, 0x14
-	bl PlaySE
-	movs r0, 0x8B
-	lsls r0, 4
-	bl FlagSet
-	bl ScriptContext2_Disable
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179860
-
-	thumb_func_start sub_81798D0
-sub_81798D0: @ 81798D0
-	push {lr}
-	ldr r0, =0x000008b2
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	bne _08179910
-	ldr r0, =gSaveBlock1Ptr
-	ldr r2, [r0]
-	ldrh r1, [r2, 0x4]
-	ldr r0, =0x00004418
-	cmp r1, r0
-	bne _08179910
-	ldr r1, [r2]
-	ldr r0, =0x00190008
-	cmp r1, r0
-	bne _08179910
-	ldr r1, =gUnknown_0203BD14
-	movs r0, 0x1
-	strb r0, [r1]
-	movs r0, 0x1
-	b _08179912
-	.pool
-_08179910:
-	movs r0, 0
-_08179912:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81798D0
-
-	thumb_func_start sub_8179918
-sub_8179918: @ 8179918
-	push {lr}
-	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [r1]
-	movs r0, 0x3C
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179918
-
-	thumb_func_start sub_8179934
-sub_8179934: @ 8179934
-	push {lr}
-	movs r0, 0x3C
-	bl FieldEffectActiveListRemove
-	bl sub_8179944
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8179934
-
-	thumb_func_start sub_8179944
-sub_8179944: @ 8179944
-	push {lr}
-	ldr r2, =0x0000022a
-	movs r0, 0xE
-	movs r1, 0x1A
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x0000022b
-	movs r0, 0xF
-	movs r1, 0x1A
-	bl MapGridSetMetatileIdAt
-	movs r2, 0x8B
-	lsls r2, 2
-	movs r0, 0x10
-	movs r1, 0x1A
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000e32
-	movs r0, 0xE
-	movs r1, 0x1B
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000233
-	movs r0, 0xF
-	movs r1, 0x1B
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000e34
-	movs r0, 0x10
-	movs r1, 0x1B
-	bl MapGridSetMetatileIdAt
-	bl DrawWholeMapView
-	movs r0, 0x14
-	bl PlaySE
-	ldr r0, =0x000008b2
-	bl FlagSet
-	bl ScriptContext2_Disable
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179944
-
-	thumb_func_start nullsub_64
-nullsub_64: @ 81799B4
-	bx lr
-	thumb_func_end nullsub_64
-
-	thumb_func_start sub_81799B8
-sub_81799B8: @ 81799B8
-	push {lr}
-	bl oei_task_add
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r0, =gUnknown_0203BD14
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _081799E4
-	ldr r1, =gTasks
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r1
-	ldr r2, =sub_8179934
-	b _081799F0
-	.pool
-_081799E4:
-	ldr r1, =gTasks
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r1
-	ldr r2, =sub_8179850
-_081799F0:
-	lsrs r1, r2, 16
-	strh r1, [r0, 0x18]
-	strh r2, [r0, 0x1A]
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81799B8
-
-	thumb_func_start sub_8179A04
-sub_8179A04: @ 8179A04
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	ldr r4, =gSaveBlock1Ptr
-	ldr r0, [r4]
-	ldrh r1, [r0, 0x4]
-	ldr r0, =0x00004318
-	cmp r1, r0
-	beq _08179A1A
-	b _08179B5A
-_08179A1A:
-	ldr r0, =0x000008b1
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _08179A28
-	b _08179B5A
-_08179A28:
-	movs r0, 0x2
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	bne _08179A36
-	b _08179B5A
-_08179A36:
-	movs r0, 0x3
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08179A58
-	b _08179B5A
-	.pool
-_08179A54:
-	movs r0, 0x1
-	b _08179B5C
-_08179A58:
-	movs r5, 0
-	mov r8, r4
-	ldr r4, =gUnknown_085EFE74
-	adds r0, r4, 0x1
-	mov r12, r0
-	ldr r6, =0x0000403b
-	ldr r1, =0x0000403c
-	mov r9, r1
-_08179A68:
-	lsls r0, r5, 1
-	adds r1, r0, r4
-	add r0, r12
-	ldrb r3, [r0]
-	mov r7, r8
-	ldr r2, [r7]
-	movs r7, 0
-	ldrsh r0, [r2, r7]
-	ldrb r1, [r1]
-	cmp r0, r1
-	bne _08179B44
-	movs r1, 0x2
-	ldrsh r0, [r2, r1]
-	cmp r0, r3
-	bne _08179B44
-	cmp r5, 0xF
-	bhi _08179AB0
-	adds r0, r6, 0
-	bl VarGet
-	lsls r0, 16
-	movs r1, 0x80
-	lsls r1, 9
-	lsls r1, r5
-	orrs r1, r0
-	lsrs r1, 16
-	adds r0, r6, 0
-	bl VarSet
-	b _08179AF0
-	.pool
-_08179AB0:
-	cmp r5, 0x1F
-	bhi _08179AD2
-	mov r0, r9
-	bl VarGet
-	lsls r0, 16
-	adds r2, r5, 0
-	subs r2, 0x10
-	movs r1, 0x80
-	lsls r1, 9
-	lsls r1, r2
-	orrs r1, r0
-	lsrs r1, 16
-	mov r0, r9
-	bl VarSet
-	b _08179AF0
-_08179AD2:
-	ldr r4, =0x0000403d
-	adds r0, r4, 0
-	bl VarGet
-	lsls r0, 16
-	adds r2, r5, 0
-	subs r2, 0x20
-	movs r1, 0x80
-	lsls r1, 9
-	lsls r1, r2
-	orrs r1, r0
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl VarSet
-_08179AF0:
-	ldr r0, =0x0000403b
-	bl VarGet
-	lsls r0, 16
-	lsrs r4, r0, 16
-	ldr r0, =0x0000ffff
-	cmp r4, r0
-	bne _08179B5A
-	ldr r0, =0x0000403c
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, r4
-	bne _08179B5A
-	ldr r0, =0x0000403d
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0xF
-	bne _08179B5A
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, [r0]
-	ldr r0, =0x00150008
-	cmp r1, r0
-	beq _08179A54
-	b _08179B5A
-	.pool
-_08179B44:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x23
-	bls _08179A68
-	movs r0, 0x3
-	bl FlagSet
-	movs r0, 0x2
-	bl FlagReset
-_08179B5A:
-	movs r0, 0
-_08179B5C:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8179A04
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index 1f2d638c3..fa923d94b 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -1411,7 +1411,7 @@ _0809CA64:
 	b _0809CB28
 	.pool
 _0809CA7C:
-	bl sub_8179A04
+	bl ShouldDoBrailleRegicePuzzle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
diff --git a/asm/rom6.s b/asm/rom6.s
index cd1421b4f..6d2fb532b 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -258,7 +258,7 @@ sub_813561C: @ 813561C
 	thumb_func_start sub_8135654
 sub_8135654: @ 8135654
 	push {r4,lr}
-	bl sub_81797DC
+	bl ShouldDoBrailleStrengthEffect
 	lsls r0, 24
 	cmp r0, 0
 	beq _0813568C
@@ -404,7 +404,7 @@ sub_8135780: @ 8135780
 	lsrs r0, r2, 16
 	strh r0, [r1, 0x18]
 	strh r2, [r1, 0x1A]
-	bl sub_81795E8
+	bl ShouldDoBrailleDigEffect
 	lsls r0, 24
 	cmp r0, 0
 	bne _081357AC
@@ -422,12 +422,12 @@ sub_81357BC: @ 81357BC
 	push {r4,lr}
 	movs r0, 0x26
 	bl FieldEffectActiveListRemove
-	bl sub_81795E8
+	bl ShouldDoBrailleDigEffect
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0
 	beq _081357D6
-	bl sub_817963C
+	bl DoBrailleDigEffect
 	b _081357EE
 _081357D6:
 	ldr r0, =task08_080A1C44
@@ -3329,7 +3329,7 @@ _081370E2:
 	thumb_func_start sub_81370FC
 sub_81370FC: @ 81370FC
 	push {r4,lr}
-	bl sub_81798D0
+	bl ShouldDoBrailleFlyEffect
 	lsls r0, 24
 	cmp r0, 0
 	beq _08137134
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 89ed27301..ceb327084 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -316,7 +316,7 @@ gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
 	field_eff_end
 
 gFieldEffectScript_Unknown60:: @ 82DBCD2
-	field_eff_callnative sub_81799B8
+	field_eff_callnative FldEff_UsePuzzleEffect
 	field_eff_end
 
 gFieldEffectScript_Unknown61:: @ 82DBCD8
diff --git a/ld_script.txt b/ld_script.txt
index 3170e1919..0dc9d7bc9 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -222,7 +222,7 @@ SECTIONS {
         asm/berry_tag_screen.o(.text);
         asm/mystery_event_menu.o(.text);
         asm/save_failed_screen.o(.text);
-        asm/braille_puzzles.o(.text);
+        src/braille_puzzles.o(.text);
         asm/pokeblock_feed.o(.text);
         asm/clear_save_data_screen.o(.text);
         asm/intro_credits_graphics.o(.text);
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
new file mode 100755
index 000000000..4d28daff4
--- /dev/null
+++ b/src/braille_puzzles.c
@@ -0,0 +1,583 @@
+#include "global.h"
+#include "event_data.h"
+#include "songs.h"
+#include "sound.h"
+#include "script.h"
+#include "species.h"
+#include "task.h"
+#include "field_effect.h"
+#include "flags.h"
+
+extern void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId); // fieldmap
+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 void FieldEffectActiveListRemove(u8 id); // field_effect
+extern u8 oei_task_add(void);
+
+// why do this, GF?
+enum
+{
+    STRENGTH_PUZZLE,
+    FLY_PUZZLE
+};
+
+extern u8 gBraillePuzzleCallbackFlag;
+extern u8 gUnknown_085EFE74[][2];
+
+void SealedChamberShakingEffect(u8);
+void sub_8179860(void);
+void sub_8179944(void);
+
+bool8 ShouldDoBrailleDigEffect(void)
+{
+    if (!FlagGet(SYS_BRAILLE_DIG)
+     && (gSaveBlock1Ptr->location.mapGroup == 0x18
+     && gSaveBlock1Ptr->location.mapNum == 0x47))
+    {
+        if (gSaveBlock1Ptr->pos.x == 10 && gSaveBlock1Ptr->pos.y == 3)
+            return TRUE;
+        if (gSaveBlock1Ptr->pos.x == 9 && gSaveBlock1Ptr->pos.y == 3)
+            return TRUE;
+        if (gSaveBlock1Ptr->pos.x == 11 && gSaveBlock1Ptr->pos.y == 3)
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+void DoBrailleDigEffect(void)
+{
+    MapGridSetMetatileIdAt(16, 8, 554);
+    MapGridSetMetatileIdAt(17, 8, 555);
+    MapGridSetMetatileIdAt(18, 8, 556);
+    MapGridSetMetatileIdAt(16, 9, 3634);
+    MapGridSetMetatileIdAt(17, 9, 563);
+    MapGridSetMetatileIdAt(18, 9, 3636);
+    DrawWholeMapView();
+    PlaySE(SE_BAN);
+    FlagSet(SYS_BRAILLE_DIG);
+    ScriptContext2_Disable();
+}
+
+bool8 CheckRelicanthWailord(void)
+{
+    // Emerald change: why did they flip it?
+    // First comes Wailord
+    if (GetMonData(&gPlayerParty[0], MON_DATA_SPECIES2, 0) == SPECIES_WAILORD)
+    {
+        CalculatePlayerPartyCount();
+        // Last comes Relicanth
+        if (GetMonData(&gPlayerParty[gPlayerPartyCount - 1], MON_DATA_SPECIES2, 0) == SPECIES_RELICANTH)
+            return TRUE;
+    }
+    return FALSE;
+}
+
+// THEORY: this was caused by block commenting out all of the older R/S braille functions but leaving the call to it itself, which creates the nullsub.
+// the code is shown below to show what this might look like.
+void ShouldDoBrailleStrengthEffectOld(void)
+{
+    /*
+        if (!FlagGet(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;
+        else if (gSaveBlock1.pos.x == 9 && gSaveBlock1.pos.y == 23)
+            return TRUE;
+        else if (gSaveBlock1.pos.x == 11 && gSaveBlock1.pos.y == 23)
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+void DoBrailleStrengthEffect(void)
+{
+    FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH);
+    MapGridSetMetatileIdAt(14, 26, 554);
+    MapGridSetMetatileIdAt(15, 26, 555);
+    MapGridSetMetatileIdAt(16, 26, 556);
+    MapGridSetMetatileIdAt(14, 27, 3634);
+    MapGridSetMetatileIdAt(15, 27, 563);
+    MapGridSetMetatileIdAt(16, 27, 3636);
+    DrawWholeMapView();
+    PlaySE(SE_BAN);
+    FlagSet(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 (gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25)
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+void DoBrailleFlyEffect(void)
+{
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_FLY_ANCIENT_TOMB);
+}
+
+bool8 FldEff_UseFlyAncientTomb(void)
+{
+    u8 taskId = oei_task_add();
+
+    gTasks[taskId].data[8] = (u32)UseFlyAncientTomb_Callback >> 16;
+    gTasks[taskId].data[9] = (u32)UseFlyAncientTomb_Callback;
+    return FALSE;
+}
+
+void UseFlyAncientTomb_Callback(void)
+{
+    FieldEffectActiveListRemove(FLDEFF_USE_FLY_ANCIENT_TOMB);
+    UseFlyAncientTomb_Finish();
+}
+
+void UseFlyAncientTomb_Finish(void)
+{
+    MapGridSetMetatileIdAt(14, 26, 554);
+    MapGridSetMetatileIdAt(15, 26, 555);
+    MapGridSetMetatileIdAt(16, 26, 556);
+    MapGridSetMetatileIdAt(14, 27, 3634);
+    MapGridSetMetatileIdAt(15, 27, 563);
+    MapGridSetMetatileIdAt(16, 27, 3636);
+    DrawWholeMapView();
+    PlaySE(SE_BAN);
+    FlagSet(SYS_BRAILLE_FLY);
+    ScriptContext2_Disable();
+}
+    */
+}
+
+void DoSealedChamberShakingEffect1(void)
+{
+    u8 taskId = CreateTask(SealedChamberShakingEffect, 9);
+
+    gTasks[taskId].data[1] = 0;
+    gTasks[taskId].data[2] = 0;
+    gTasks[taskId].data[4] = 2;
+    gTasks[taskId].data[5] = 5;
+    gTasks[taskId].data[6] = 50;
+    SetCameraPanningCallback(0);
+}
+
+void DoSealedChamberShakingEffect2(void)
+{
+    u8 taskId = CreateTask(SealedChamberShakingEffect, 9);
+
+    gTasks[taskId].data[1] = 0;
+    gTasks[taskId].data[2] = 0;
+    gTasks[taskId].data[4] = 3;
+    gTasks[taskId].data[5] = 5;
+    gTasks[taskId].data[6] = 2;
+    SetCameraPanningCallback(0);
+}
+
+void SealedChamberShakingEffect(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    task->data[1]++;
+
+    if (!(task->data[1] % task->data[5]))
+    {
+        task->data[1] = 0;
+        task->data[2]++;
+        task->data[4] = -task->data[4];
+        SetCameraPanning(0, task->data[4]);
+        if (task->data[2] == task->data[6])
+        {
+            DestroyTask(taskId);
+            EnableBothScriptContexts();
+            InstallCameraPanAheadCallback();
+        }
+    }
+}
+
+// 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 (gSaveBlock1Ptr->pos.x == 6 && gSaveBlock1Ptr->pos.y == 23)
+            { gBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; }
+        else if (gSaveBlock1Ptr->pos.x == 5 && gSaveBlock1Ptr->pos.y == 23)
+            { gBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; }
+        else if (gSaveBlock1Ptr->pos.x == 7 && gSaveBlock1Ptr->pos.y == 23)
+            { gBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; }
+    }
+
+    return FALSE;
+}
+
+void sub_8179834(void)
+{
+    gFieldEffectSpawnParams[0] = brm_get_pokemon_selection();
+    FieldEffectStart(FLDEFF_USE_FLY_ANCIENT_TOMB);
+}
+
+void UseStrengthDesertRuins_Callback(void)
+{
+    FieldEffectActiveListRemove(FLDEFF_USE_FLY_ANCIENT_TOMB);
+    sub_8179860();
+}
+
+void sub_8179860(void)
+{
+    MapGridSetMetatileIdAt(14, 26, 554);
+    MapGridSetMetatileIdAt(15, 26, 555);
+    MapGridSetMetatileIdAt(16, 26, 556);
+    MapGridSetMetatileIdAt(14, 27, 3634);
+    MapGridSetMetatileIdAt(15, 27, 563);
+    MapGridSetMetatileIdAt(16, 27, 3636);
+    DrawWholeMapView();
+    PlaySE(SE_BAN);
+    FlagSet(SYS_BRAILLE_STRENGTH);
+    ScriptContext2_Disable();
+}
+
+bool8 ShouldDoBrailleFlyEffect(void)
+{
+    if(!FlagGet(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; }
+    }
+    return FALSE;
+}
+
+void sub_8179918(void)
+{
+    gFieldEffectSpawnParams[0] = brm_get_pokemon_selection();
+    FieldEffectStart(FLDEFF_USE_FLY_ANCIENT_TOMB);
+}
+
+void UseFlyAncientTomb_Callback(void)
+{
+    FieldEffectActiveListRemove(FLDEFF_USE_FLY_ANCIENT_TOMB);
+    sub_8179944();
+}
+
+void sub_8179944(void)
+{
+    MapGridSetMetatileIdAt(14, 26, 554);
+    MapGridSetMetatileIdAt(15, 26, 555);
+    MapGridSetMetatileIdAt(16, 26, 556);
+    MapGridSetMetatileIdAt(14, 27, 3634);
+    MapGridSetMetatileIdAt(15, 27, 563);
+    MapGridSetMetatileIdAt(16, 27, 3636);
+    DrawWholeMapView();
+    PlaySE(SE_BAN);
+    FlagSet(SYS_BRAILLE_FLY);
+    ScriptContext2_Disable();
+}
+
+// theory: another commented out DoBrailleWait and Task_BrailleWait.
+void DoBrailleWait(void)
+{
+    /*
+    if (!FlagGet(SYS_BRAILLE_WAIT))
+        CreateTask(Task_BrailleWait, 0x50);
+}
+
+void Task_BrailleWait(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    switch (data[0])
+    {
+    case 0:
+        data[1] = 7200;
+        data[0] = 1;
+        break;
+    case 1:
+        if (BrailleWait_CheckButtonPress() != FALSE)
+        {
+            MenuZeroFillScreen();
+            PlaySE(SE_SELECT);
+            data[0] = 2;
+        }
+        else
+        {
+            data[1] = data[1] - 1;
+            if (data[1] == 0)
+            {
+                MenuZeroFillScreen();
+                data[0] = 3;
+                data[1] = 30;
+            }
+        }
+        break;
+    case 2:
+        if (BrailleWait_CheckButtonPress() == FALSE)
+        {
+            data[1] = data[1] - 1;
+            if (data[1] == 0)
+                data[0] = 4;
+            break;
+        }
+        sub_8064E2C();
+        DestroyTask(taskId);
+        ScriptContext2_Disable();
+        break;
+    case 3:
+        data[1] = data[1] - 1;
+        if (data[1] == 0)
+            data[0] = 4;
+        break;
+    case 4:
+        sub_8064E2C();
+        ScriptContext1_SetupScript(S_OpenRegiceChamber);
+        DestroyTask(taskId);
+        break;
+    }
+}
+
+bool32 BrailleWait_CheckButtonPress(void)
+{
+    u16 keyMask = A_BUTTON | B_BUTTON | START_BUTTON | SELECT_BUTTON | DPAD_ANY;
+
+    if (gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)
+        keyMask |= L_BUTTON | R_BUTTON;
+    if (gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A)
+        keyMask |= L_BUTTON;
+
+    if (gMain.newKeys & keyMask)
+        return TRUE;
+    else
+        return FALSE;
+    */
+}
+
+// this used to be FldEff_UseFlyAncientTomb . why did GF merge the 2 functions?
+bool8 FldEff_UsePuzzleEffect(void)
+{
+    u8 taskId = oei_task_add();
+
+    if(gBraillePuzzleCallbackFlag == FLY_PUZZLE)
+    {
+        gTasks[taskId].data[8] = (u32)UseFlyAncientTomb_Callback >> 16;
+        gTasks[taskId].data[9] = (u32)UseFlyAncientTomb_Callback;
+    }
+    else
+    {
+        gTasks[taskId].data[8] = (u32)UseStrengthDesertRuins_Callback >> 16;
+        gTasks[taskId].data[9] = (u32)UseStrengthDesertRuins_Callback;
+    }
+    return FALSE;
+}
+
+// can't get this one to match due to the weird macro-like varsets with strange bitshifting.
+// to note: 0x10000 is loaded in, and its obviously supposed to be 1, but i cant get 0x80 << 9 to be loaded in without using it directly.
+// maybe there's some way of writing it that works?
+#ifdef NONMATCHING
+// ShouldDoBrailleRegicePuzzle
+bool8 ShouldDoBrailleRegicePuzzle(void)
+{
+    u8 i;
+
+    if (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x43)
+    {
+        // _08179A1A
+        if (FlagGet(SYS_BRAILLE_WAIT) != FALSE)
+            return FALSE;
+        if (FlagGet(2) == FALSE)
+            return FALSE;
+        if (FlagGet(3) == TRUE)
+            return FALSE;
+
+        for(i = 0; i < 36; i++)
+        {
+            if(gSaveBlock1Ptr->pos.x == gUnknown_085EFE74[i][0] && gSaveBlock1Ptr->pos.y == gUnknown_085EFE74[i][1])
+            {
+                if(i < 16)
+                    VarSet(0x403B, (0x10000 << i | VarGet(0x403B) << 16) >> 16); // correct
+                else if(i < 32)
+                    VarSet(0x403C, (0x10000 << (i - 16) | VarGet(0x403C) << 16) >> 16); // hmm?
+                else
+                    VarSet(0x403D, (0x10000 << (i - 32) | VarGet(0x403D) << 16) >> 16); // hmm?
+
+                if(VarGet(0x403B) != 0xFFFF || VarGet(0x403C) != 0xFF || VarGet(0x403D) != 0xF)
+                    return FALSE;
+
+                if(gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 21)
+                    return TRUE;
+                else
+                    return FALSE;
+            }
+        }
+    }
+    // TODO: Find what flags 2 and 3 are.
+    FlagSet(3);
+    FlagReset(2);
+    return FALSE;
+}
+#else
+__attribute__((naked))
+bool8 ShouldDoBrailleRegicePuzzle(void)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r9\n\
+    mov r6, r8\n\
+    push {r6,r7}\n\
+    ldr r4, =gSaveBlock1Ptr\n\
+    ldr r0, [r4]\n\
+    ldrh r1, [r0, 0x4]\n\
+    ldr r0, =0x00004318\n\
+    cmp r1, r0\n\
+    beq _08179A1A\n\
+    b _08179B5A\n\
+_08179A1A:\n\
+    ldr r0, =0x000008b1\n\
+    bl FlagGet\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _08179A28\n\
+    b _08179B5A\n\
+_08179A28:\n\
+    movs r0, 0x2\n\
+    bl FlagGet\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _08179A36\n\
+    b _08179B5A\n\
+_08179A36:\n\
+    movs r0, 0x3\n\
+    bl FlagGet\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    cmp r0, 0x1\n\
+    bne _08179A58\n\
+    b _08179B5A\n\
+    .pool\n\
+_08179A54:\n\
+    movs r0, 0x1\n\
+    b _08179B5C\n\
+_08179A58:\n\
+    movs r5, 0\n\
+    mov r8, r4\n\
+    ldr r4, =gUnknown_085EFE74\n\
+    adds r0, r4, 0x1\n\
+    mov r12, r0\n\
+    ldr r6, =0x0000403b\n\
+    ldr r1, =0x0000403c\n\
+    mov r9, r1\n\
+_08179A68:\n\
+    lsls r0, r5, 1\n\
+    adds r1, r0, r4\n\
+    add r0, r12\n\
+    ldrb r3, [r0]\n\
+    mov r7, r8\n\
+    ldr r2, [r7]\n\
+    movs r7, 0\n\
+    ldrsh r0, [r2, r7]\n\
+    ldrb r1, [r1]\n\
+    cmp r0, r1\n\
+    bne _08179B44\n\
+    movs r1, 0x2\n\
+    ldrsh r0, [r2, r1]\n\
+    cmp r0, r3\n\
+    bne _08179B44\n\
+    cmp r5, 0xF\n\
+    bhi _08179AB0\n\
+    adds r0, r6, 0\n\
+    bl VarGet\n\
+    lsls r0, 16\n\
+    movs r1, 0x80\n\
+    lsls r1, 9\n\
+    lsls r1, r5\n\
+    orrs r1, r0\n\
+    lsrs r1, 16\n\
+    adds r0, r6, 0\n\
+    bl VarSet\n\
+    b _08179AF0\n\
+    .pool\n\
+_08179AB0:\n\
+    cmp r5, 0x1F\n\
+    bhi _08179AD2\n\
+    mov r0, r9\n\
+    bl VarGet\n\
+    lsls r0, 16\n\
+    adds r2, r5, 0\n\
+    subs r2, 0x10\n\
+    movs r1, 0x80\n\
+    lsls r1, 9\n\
+    lsls r1, r2\n\
+    orrs r1, r0\n\
+    lsrs r1, 16\n\
+    mov r0, r9\n\
+    bl VarSet\n\
+    b _08179AF0\n\
+_08179AD2:\n\
+    ldr r4, =0x0000403d\n\
+    adds r0, r4, 0\n\
+    bl VarGet\n\
+    lsls r0, 16\n\
+    adds r2, r5, 0\n\
+    subs r2, 0x20\n\
+    movs r1, 0x80\n\
+    lsls r1, 9\n\
+    lsls r1, r2\n\
+    orrs r1, r0\n\
+    lsrs r1, 16\n\
+    adds r0, r4, 0\n\
+    bl VarSet\n\
+_08179AF0:\n\
+    ldr r0, =0x0000403b\n\
+    bl VarGet\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    ldr r0, =0x0000ffff\n\
+    cmp r4, r0\n\
+    bne _08179B5A\n\
+    ldr r0, =0x0000403c\n\
+    bl VarGet\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    cmp r0, r4\n\
+    bne _08179B5A\n\
+    ldr r0, =0x0000403d\n\
+    bl VarGet\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    cmp r0, 0xF\n\
+    bne _08179B5A\n\
+    ldr r0, =gSaveBlock1Ptr\n\
+    ldr r0, [r0]\n\
+    ldr r1, [r0]\n\
+    ldr r0, =0x00150008\n\
+    cmp r1, r0\n\
+    beq _08179A54\n\
+    b _08179B5A\n\
+    .pool\n\
+_08179B44:\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r5, r0, 24\n\
+    cmp r5, 0x23\n\
+    bls _08179A68\n\
+    movs r0, 0x3\n\
+    bl FlagSet\n\
+    movs r0, 0x2\n\
+    bl FlagReset\n\
+_08179B5A:\n\
+    movs r0, 0\n\
+_08179B5C:\n\
+    pop {r3,r4}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .syntax divided");
+}
+#endif
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 7848dcc7c..cb42f9e76 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -1651,7 +1651,7 @@ gUnknown_0203BCFE: @ 203BCFE
 gUnknown_0203BD0E: @ 203BD0E
 	.space 0x6
 
-gUnknown_0203BD14: @ 203BD14
+gBraillePuzzleCallbackFlag: @ 203BD14
 	.space 0x4
 
 gUnknown_0203BD18: @ 203BD18

From c88a39b5d5e2fbe5548c77a194fb030fb59231f3 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Thu, 5 Oct 2017 13:05:25 -0400
Subject: [PATCH 30/42] formatting

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

diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 4d28daff4..83d32b56c 100755
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -246,9 +246,9 @@ void sub_8179860(void)
 
 bool8 ShouldDoBrailleFlyEffect(void)
 {
-    if(!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x44))
+    if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x44))
     {
-        if(gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 25)
+        if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 25)
             { gBraillePuzzleCallbackFlag = FLY_PUZZLE; return TRUE; }
     }
     return FALSE;
@@ -362,7 +362,7 @@ bool8 FldEff_UsePuzzleEffect(void)
 {
     u8 taskId = oei_task_add();
 
-    if(gBraillePuzzleCallbackFlag == FLY_PUZZLE)
+    if (gBraillePuzzleCallbackFlag == FLY_PUZZLE)
     {
         gTasks[taskId].data[8] = (u32)UseFlyAncientTomb_Callback >> 16;
         gTasks[taskId].data[9] = (u32)UseFlyAncientTomb_Callback;
@@ -394,21 +394,21 @@ bool8 ShouldDoBrailleRegicePuzzle(void)
         if (FlagGet(3) == TRUE)
             return FALSE;
 
-        for(i = 0; i < 36; i++)
+        for (i = 0; i < 36; i++)
         {
-            if(gSaveBlock1Ptr->pos.x == gUnknown_085EFE74[i][0] && gSaveBlock1Ptr->pos.y == gUnknown_085EFE74[i][1])
+            if (gSaveBlock1Ptr->pos.x == gUnknown_085EFE74[i][0] && gSaveBlock1Ptr->pos.y == gUnknown_085EFE74[i][1])
             {
-                if(i < 16)
+                if (i < 16)
                     VarSet(0x403B, (0x10000 << i | VarGet(0x403B) << 16) >> 16); // correct
-                else if(i < 32)
+                else if (i < 32)
                     VarSet(0x403C, (0x10000 << (i - 16) | VarGet(0x403C) << 16) >> 16); // hmm?
                 else
                     VarSet(0x403D, (0x10000 << (i - 32) | VarGet(0x403D) << 16) >> 16); // hmm?
 
-                if(VarGet(0x403B) != 0xFFFF || VarGet(0x403C) != 0xFF || VarGet(0x403D) != 0xF)
+                if (VarGet(0x403B) != 0xFFFF || VarGet(0x403C) != 0xFF || VarGet(0x403D) != 0xF)
                     return FALSE;
 
-                if(gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 21)
+                if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 21)
                     return TRUE;
                 else
                     return FALSE;

From 342e616d4b49d1772628947782a931964d36e167 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 6 Oct 2017 00:12:01 +0200
Subject: [PATCH 31/42] battle2 more and more and more

---
 asm/battle_2.s               | 2623 +---------------------------------
 asm/evolution_scene.s        |   14 +-
 asm/party_menu.s             |    2 +-
 asm/pokemon_item_effect.s    |    2 +-
 data/battle_scripts_1.s      |   22 +-
 data/battle_scripts_2.s      |    8 +-
 data/data2b.s                |    4 +-
 include/battle.h             |   54 +-
 include/evolution_scene.h    |   10 +
 include/pokemon.h            |    6 +
 include/recorded_battle.h    |    1 +
 include/songs.h              |   84 +-
 src/battle_2.c               |  896 +++++++++++-
 src/battle_3.c               |   16 +-
 src/battle_script_commands.c |   54 +-
 sym_ewram.txt                |    4 +-
 16 files changed, 1046 insertions(+), 2754 deletions(-)
 create mode 100644 include/evolution_scene.h

diff --git a/asm/battle_2.s b/asm/battle_2.s
index 673a0a833..c0d8fd72a 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -6,2591 +6,12 @@
 	.text
 
 
-	thumb_func_start TurnValuesCleanUp
-TurnValuesCleanUp: @ 803D580
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	ldr r1, =gActiveBank
-	movs r0, 0
-	strb r0, [r1]
-	ldr r0, =gNoOfAllBanks
-	ldrb r2, [r0]
-	adds r5, r1, 0
-	cmp r2, 0
-	beq _0803D678
-	ldr r7, =gProtectStructs
-	adds r6, r5, 0
-	ldr r0, =gBattleMons + 0x50
-	mov r12, r0
-	ldr r1, =gDisableStructs
-	mov r8, r1
-	mov r10, r8
-_0803D5AE:
-	mov r2, r9
-	cmp r2, 0
-	beq _0803D5EC
-	ldrb r1, [r6]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	ldrb r1, [r6]
-	lsls r1, 4
-	adds r1, r7
-	ldrb r2, [r1]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	b _0803D648
-	.pool
-_0803D5EC:
-	ldrb r0, [r6]
-	lsls r0, 4
-	adds r2, r0, r7
-	movs r1, 0
-	mov r4, r10
-	movs r3, 0
-_0803D5F8:
-	adds r0, r2, r1
-	strb r3, [r0]
-	adds r1, 0x1
-	cmp r1, 0xF
-	bls _0803D5F8
-	ldrb r1, [r5]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r1, r0, r4
-	ldrb r0, [r1, 0x16]
-	cmp r0, 0
-	beq _0803D616
-	subs r0, 0x1
-	strb r0, [r1, 0x16]
-_0803D616:
-	ldrb r1, [r5]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r1, r0, r4
-	ldrb r0, [r1, 0x19]
-	cmp r0, 0
-	beq _0803D648
-	subs r0, 0x1
-	strb r0, [r1, 0x19]
-	ldrb r2, [r5]
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	adds r0, r4
-	ldrb r0, [r0, 0x19]
-	cmp r0, 0
-	bne _0803D648
-	movs r0, 0x58
-	muls r2, r0
-	add r2, r12
-	ldr r0, [r2]
-	ldr r1, =0xffbfffff
-	ands r0, r1
-	str r0, [r2]
-_0803D648:
-	ldrb r2, [r5]
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	add r0, r8
-	ldrb r0, [r0, 0xA]
-	cmp r0, 0
-	bne _0803D666
-	movs r0, 0x58
-	muls r2, r0
-	add r2, r12
-	ldr r0, [r2]
-	ldr r1, =0xfeffffff
-	ands r0, r1
-	str r0, [r2]
-_0803D666:
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gNoOfAllBanks
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803D5AE
-_0803D678:
-	movs r0, 0
-	ldr r2, =gSideTimers
-	strb r0, [r2, 0x8]
-	strb r0, [r2, 0x14]
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end TurnValuesCleanUp
-
-	thumb_func_start SpecialStatusesClear
-SpecialStatusesClear: @ 803D6A0
-	push {r4-r6,lr}
-	ldr r2, =gActiveBank
-	movs r0, 0
-	strb r0, [r2]
-	ldr r0, =gNoOfAllBanks
-	ldrb r1, [r0]
-	adds r6, r0, 0
-	cmp r1, 0
-	beq _0803D6DE
-	adds r3, r2, 0
-	movs r4, 0
-	ldr r5, =gSpecialStatuses
-_0803D6B8:
-	ldrb r1, [r3]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 2
-	adds r2, r0, r5
-	movs r1, 0
-_0803D6C4:
-	adds r0, r2, r1
-	strb r4, [r0]
-	adds r1, 0x1
-	cmp r1, 0x13
-	bls _0803D6C4
-	ldrb r0, [r3]
-	adds r0, 0x1
-	strb r0, [r3]
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r6]
-	cmp r0, r1
-	bcc _0803D6B8
-_0803D6DE:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end SpecialStatusesClear
-
-	thumb_func_start bc_80154A0
-bc_80154A0: @ 803D6F0
-	push {r4-r7,lr}
-	ldr r0, =gHitMarker
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 8
-	ands r0, r1
-	cmp r0, 0
-	bne _0803D7AE
-	ldr r2, =gBattleStruct
-	ldr r0, [r2]
-	adds r0, 0x48
-	ldr r1, =gNoOfAllBanks
-	ldrb r0, [r0]
-	mov r12, r2
-	adds r6, r1, 0
-	ldrb r1, [r6]
-	cmp r0, r1
-	bcs _0803D7AE
-	ldr r5, =gActiveBank
-	ldr r4, =gBankAttacker
-	movs r7, 0x84
-	lsls r7, 1
-_0803D71C:
-	ldr r1, [r2]
-	adds r1, 0x48
-	ldrb r0, [r1]
-	strb r0, [r4]
-	strb r0, [r5]
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r1, =gChosenMovesByBanks
-	ldrb r3, [r5]
-	lsls r0, r3, 1
-	adds r0, r1
-	ldrh r0, [r0]
-	cmp r0, r7
-	bne _0803D7A0
-	ldr r1, =gBattleMons
-	movs r0, 0x58
-	muls r0, r3
-	adds r1, 0x4C
-	adds r0, r1
-	ldr r0, [r0]
-	movs r1, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _0803D7A0
-	ldr r2, =gDisableStructs
-	ldrb r1, [r4]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x18]
-	lsls r0, 31
-	cmp r0, 0
-	bne _0803D7A0
-	ldr r0, =gProtectStructs
-	lsls r1, r3, 4
-	adds r1, r0
-	ldrb r0, [r1]
-	lsls r0, 29
-	cmp r0, 0
-	blt _0803D7A0
-	ldr r0, =gUnknown_082DB1FF
-	bl BattleScriptExecute
-	b _0803D7E8
-	.pool
-_0803D7A0:
-	mov r2, r12
-	ldr r0, [r2]
-	adds r0, 0x48
-	ldrb r0, [r0]
-	ldrb r1, [r6]
-	cmp r0, r1
-	bcc _0803D71C
-_0803D7AE:
-	bl b_clear_atk_up_if_hit_flag_unless_enraged
-	ldr r1, =gCurrentMoveTurn
-	movs r0, 0
-	strb r0, [r1]
-	ldr r1, =gFightStateTracker
-	ldr r0, =gActionsByTurnOrder
-	movs r3, 0
-	ldrb r0, [r0]
-	strb r0, [r1]
-	ldr r0, =gDynamicBasePower
-	movs r2, 0
-	strh r3, [r0]
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-	strb r2, [r0, 0x13]
-	ldr r1, =gBattleMainFunc
-	ldr r0, =bc_bs_exec
-	str r0, [r1]
-	ldr r0, =gBattleCommunication
-	strb r2, [r0, 0x3]
-	strb r2, [r0, 0x4]
-	ldr r0, =gBattleScripting
-	strb r2, [r0, 0x16]
-	ldr r0, =gBattleResources
-	ldr r0, [r0]
-	ldr r0, [r0, 0x8]
-	adds r0, 0x20
-	strb r2, [r0]
-_0803D7E8:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bc_80154A0
-
-	thumb_func_start bc_bs_exec
-bc_bs_exec: @ 803D818
-	push {r4-r6,lr}
-	ldr r6, =gBattleOutcome
-	ldrb r0, [r6]
-	ldr r2, =gFightStateTracker
-	cmp r0, 0
-	beq _0803D828
-	movs r0, 0xC
-	strb r0, [r2]
-_0803D828:
-	ldr r5, =gBattleStruct
-	ldr r0, [r5]
-	adds r0, 0x4B
-	ldr r4, =gCurrentMoveTurn
-	ldrb r1, [r4]
-	strb r1, [r0]
-	ldr r1, =gUnknown_0831BC0C
-	ldrb r0, [r2]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-	ldr r0, =gNoOfAllBanks
-	ldrb r1, [r4]
-	ldrb r0, [r0]
-	cmp r1, r0
-	bcc _0803D894
-	ldr r2, =gHitMarker
-	ldr r0, [r2]
-	ldr r1, =0xffefffff
-	ands r0, r1
-	str r0, [r2]
-	ldr r3, =gBattleMainFunc
-	ldr r2, =gUnknown_0831BC44
-	ldrb r1, [r6]
-	movs r0, 0x7F
-	ands r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldr r0, [r0]
-	str r0, [r3]
-	b _0803D8AC
-	.pool
-_0803D894:
-	ldr r0, [r5]
-	adds r0, 0x4B
-	ldrb r0, [r0]
-	cmp r0, r1
-	beq _0803D8AC
-	ldr r2, =gHitMarker
-	ldr r0, [r2]
-	ldr r1, =0xfffffdff
-	ands r0, r1
-	ldr r1, =0xfff7ffff
-	ands r0, r1
-	str r0, [r2]
-_0803D8AC:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bc_bs_exec
-
-	thumb_func_start HandleEndTurn_BattleWon
-HandleEndTurn_BattleWon: @ 803D8C0
-	push {r4,lr}
-	ldr r1, =gFightStateTracker
-	movs r0, 0
-	strb r0, [r1]
-	ldr r1, =gBattleTypeFlags
-	ldr r2, [r1]
-	ldr r0, =0x02000002
-	ands r0, r2
-	cmp r0, 0
-	beq _0803D920
-	ldr r1, =gScriptResult
-	ldr r4, =gBattleOutcome
-	ldrb r0, [r4]
-	strh r0, [r1]
-	ldr r1, =gBattleTextBuff1
-	ldrb r0, [r4]
-	strb r0, [r1]
-	movs r0, 0
-	bl GetBankByIdentity
-	ldr r1, =gBankAttacker
-	strb r0, [r1]
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DAA35
-	str r0, [r1]
-	ldrb r1, [r4]
-	movs r0, 0x7F
-	ands r0, r1
-	strb r0, [r4]
-	b _0803DAA4
-	.pool
-_0803D920:
-	movs r0, 0x8
-	ands r0, r2
-	cmp r0, 0
-	beq _0803D95C
-	ldr r0, =0x043f0900
-	ands r2, r0
-	cmp r2, 0
-	beq _0803D95C
-	bl BattleMusicStop
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DAA87
-	str r0, [r1]
-	ldr r0, =gTrainerBattleOpponent_A
-	ldrh r1, [r0]
-	ldr r0, =0x000003fe
-	cmp r1, r0
-	bne _0803D946
-	b _0803DA8A
-_0803D946:
-	b _0803DA94
-	.pool
-_0803D95C:
-	ldr r0, [r1]
-	movs r1, 0xA
-	ands r0, r1
-	cmp r0, 0x8
-	beq _0803D968
-	b _0803DA9E
-_0803D968:
-	bl BattleMusicStop
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DA92D
-	str r0, [r1]
-	ldr r2, =gTrainers
-	ldr r0, =gTrainerBattleOpponent_A
-	ldrh r1, [r0]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	ldrb r0, [r0, 0x1]
-	subs r0, 0x3
-	cmp r0, 0x32
-	bls _0803D98A
-	b _0803DA94
-_0803D98A:
-	lsls r0, 2
-	ldr r1, =_0803D9A8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_0803D9A8:
-	.4byte _0803DA80
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA80
-	.4byte _0803DA94
-	.4byte _0803DA80
-	.4byte _0803DA94
-	.4byte _0803DA80
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA74
-	.4byte _0803DA8A
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA74
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA80
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA94
-	.4byte _0803DA80
-_0803DA74:
-	ldr r0, =0x00000163
-	bl PlayBGM
-	b _0803DAA4
-	.pool
-_0803DA80:
-	movs r0, 0xD4
-	lsls r0, 1
-	bl PlayBGM
-	b _0803DAA4
-_0803DA8A:
-	movs r0, 0xB1
-	lsls r0, 1
-	bl PlayBGM
-	b _0803DAA4
-_0803DA94:
-	movs r0, 0xCE
-	lsls r0, 1
-	bl PlayBGM
-	b _0803DAA4
-_0803DA9E:
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DA96A
-	str r0, [r1]
-_0803DAA4:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =HandleEndTurn_FinishBattle
-	str r0, [r1]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end HandleEndTurn_BattleWon
-
-	thumb_func_start HandleEndTurn_BattleLost
-HandleEndTurn_BattleLost: @ 803DAC0
-	push {r4,lr}
-	ldr r1, =gFightStateTracker
-	movs r0, 0
-	strb r0, [r1]
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	ldr r0, =0x02000002
-	ands r0, r1
-	cmp r0, 0
-	beq _0803DB7C
-	ldr r0, =0x003f0100
-	ands r1, r0
-	cmp r1, 0
-	beq _0803DB44
-	ldr r3, =gBattleOutcome
-	ldrb r2, [r3]
-	movs r0, 0x80
-	ands r0, r2
-	cmp r0, 0
-	beq _0803DB2C
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DB9C8
-	str r0, [r1]
-	movs r0, 0x7F
-	ands r0, r2
-	strb r0, [r3]
-	ldr r0, =gSaveBlock2Ptr
-	ldr r1, [r0]
-	ldr r0, =0x00000ca9
-	adds r1, r0
-	ldrb r0, [r1]
-	movs r2, 0x8
-	orrs r0, r2
-	strb r0, [r1]
-	b _0803DB82
-	.pool
-_0803DB2C:
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DAA0B
-	str r0, [r1]
-	movs r0, 0x7F
-	ands r0, r2
-	strb r0, [r3]
-	b _0803DB82
-	.pool
-_0803DB44:
-	ldr r1, =gBattleTextBuff1
-	ldr r4, =gBattleOutcome
-	ldrb r0, [r4]
-	strb r0, [r1]
-	movs r0, 0
-	bl GetBankByIdentity
-	ldr r1, =gBankAttacker
-	strb r0, [r1]
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DAA35
-	str r0, [r1]
-	ldrb r1, [r4]
-	movs r0, 0x7F
-	ands r0, r1
-	strb r0, [r4]
-	b _0803DB82
-	.pool
-_0803DB7C:
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DA96D
-	str r0, [r1]
-_0803DB82:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =HandleEndTurn_FinishBattle
-	str r0, [r1]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end HandleEndTurn_BattleLost
-
-	thumb_func_start HandleEndTurn_RanFromBattle
-HandleEndTurn_RanFromBattle: @ 803DBA0
-	push {lr}
-	ldr r1, =gFightStateTracker
-	movs r0, 0
-	strb r0, [r1]
-	ldr r1, =gBattleTypeFlags
-	ldr r2, [r1]
-	ldr r0, =0x003f0100
-	ands r0, r2
-	cmp r0, 0
-	beq _0803DBFC
-	movs r0, 0x8
-	ands r2, r0
-	cmp r2, 0
-	beq _0803DBFC
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DB9C1
-	str r0, [r1]
-	ldr r1, =gBattleOutcome
-	movs r0, 0x9
-	strb r0, [r1]
-	ldr r0, =gSaveBlock2Ptr
-	ldr r1, [r0]
-	ldr r0, =0x00000ca9
-	adds r1, r0
-	ldrb r0, [r1]
-	movs r2, 0x8
-	orrs r0, r2
-	strb r0, [r1]
-	b _0803DC6A
-	.pool
-_0803DBFC:
-	ldr r0, [r1]
-	movs r1, 0x80
-	lsls r1, 19
-	ands r0, r1
-	cmp r0, 0
-	beq _0803DC24
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DB9C1
-	str r0, [r1]
-	ldr r1, =gBattleOutcome
-	movs r0, 0x9
-	strb r0, [r1]
-	b _0803DC6A
-	.pool
-_0803DC24:
-	ldr r1, =gProtectStructs
-	ldr r0, =gBankAttacker
-	ldrb r0, [r0]
-	lsls r0, 4
-	adds r0, r1
-	ldrb r0, [r0, 0x1]
-	lsls r0, 27
-	lsrs r0, 30
-	cmp r0, 0x1
-	beq _0803DC54
-	cmp r0, 0x2
-	beq _0803DC64
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DAAF0
-	b _0803DC68
-	.pool
-_0803DC54:
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DAADB
-	b _0803DC68
-	.pool
-_0803DC64:
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DAAE9
-_0803DC68:
-	str r0, [r1]
-_0803DC6A:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =HandleEndTurn_FinishBattle
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end HandleEndTurn_RanFromBattle
-
-	thumb_func_start HandleEndTurn_MonFled
-HandleEndTurn_MonFled: @ 803DC84
-	ldr r1, =gFightStateTracker
-	movs r0, 0
-	strb r0, [r1]
-	ldr r1, =gBattleTextBuff1
-	movs r0, 0xFD
-	strb r0, [r1]
-	movs r0, 0x7
-	strb r0, [r1, 0x1]
-	ldr r2, =gBankAttacker
-	ldrb r0, [r2]
-	strb r0, [r1, 0x2]
-	ldr r3, =gBattlePartyID
-	ldrb r0, [r2]
-	lsls r0, 1
-	adds r0, r3
-	ldrh r0, [r0]
-	strb r0, [r1, 0x3]
-	movs r0, 0xFF
-	strb r0, [r1, 0x4]
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DAAF7
-	str r0, [r1]
-	ldr r1, =gBattleMainFunc
-	ldr r0, =HandleEndTurn_FinishBattle
-	str r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end HandleEndTurn_MonFled
-
-	thumb_func_start HandleEndTurn_FinishBattle
-HandleEndTurn_FinishBattle: @ 803DCD8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	ldr r0, =gFightStateTracker
-	ldrb r0, [r0]
-	subs r0, 0xB
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bls _0803DCEE
-	b _0803DE10
-_0803DCEE:
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	ldr r0, =0x023f0b92
-	ands r1, r0
-	cmp r1, 0
-	bne _0803DDB6
-	ldr r2, =gActiveBank
-	strb r1, [r2]
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r1, r0
-	bcs _0803DDB2
-	adds r5, r2, 0
-	ldr r0, =gBattlePartyID
-	mov r8, r0
-	movs r7, 0x64
-	ldr r6, =gPlayerParty
-_0803DD10:
-	ldrb r0, [r5]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803DDA0
-	ldr r4, =gBattleResults
-	ldrh r0, [r4, 0x6]
-	cmp r0, 0
-	bne _0803DD74
-	ldrb r0, [r5]
-	lsls r0, 1
-	add r0, r8
-	ldrh r0, [r0]
-	muls r0, r7
-	adds r0, r6
-	movs r1, 0xB
-	movs r2, 0
-	bl GetMonData
-	strh r0, [r4, 0x6]
-	ldrb r0, [r5]
-	lsls r0, 1
-	add r0, r8
-	ldrh r0, [r0]
-	muls r0, r7
-	adds r0, r6
-	movs r1, 0x2
-	adds r2, r4, 0
-	adds r2, 0x8
-	bl GetMonData
-	b _0803DDA0
-	.pool
-_0803DD74:
-	ldrb r0, [r5]
-	lsls r0, 1
-	add r0, r8
-	ldrh r0, [r0]
-	muls r0, r7
-	adds r0, r6
-	movs r1, 0xB
-	movs r2, 0
-	bl GetMonData
-	strh r0, [r4, 0x26]
-	ldrb r0, [r5]
-	lsls r0, 1
-	add r0, r8
-	ldrh r0, [r0]
-	muls r0, r7
-	adds r0, r6
-	movs r1, 0x2
-	adds r2, r4, 0
-	adds r2, 0x14
-	bl GetMonData
-_0803DDA0:
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-	ldr r1, =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803DD10
-_0803DDB2:
-	bl sub_80EC728
-_0803DDB6:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	ldr r1, =0x023f0b9a
-	ands r0, r1
-	cmp r0, 0
-	bne _0803DDD2
-	ldr r0, =gBattleResults
-	ldrb r1, [r0, 0x5]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _0803DDD2
-	bl sub_80EE184
-_0803DDD2:
-	bl sub_8186444
-	movs r0, 0x3
-	bl BeginFastPaletteFade
-	movs r0, 0x5
-	bl FadeOutMapMusic
-	ldr r1, =gBattleMainFunc
-	ldr r0, =sub_803DE40
-	str r0, [r1]
-	ldr r1, =gUnknown_030061E8
-	ldr r0, =BattleMainCB2
-	str r0, [r1]
-	b _0803DE2A
-	.pool
-_0803DE10:
-	ldr r0, =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _0803DE2A
-	ldr r1, =gBattleScriptingCommandsTable
-	ldr r0, =gBattlescriptCurrInstr
-	ldr r0, [r0]
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-_0803DE2A:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end HandleEndTurn_FinishBattle
-
-	thumb_func_start sub_803DE40
-sub_803DE40: @ 803DE40
-	push {lr}
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0803DE86
-	bl ResetSpriteData
-	ldr r0, =gLeveledUpInBattle
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0803DE62
-	ldr r0, =gBattleOutcome
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0803DE80
-_0803DE62:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =c4_overworld
-	str r0, [r1]
-	b _0803DEA2
-	.pool
-_0803DE80:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =bc_evolution_cutscene
-	str r0, [r1]
-_0803DE86:
-	bl FreeAllWindowBuffers
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x2
-	ands r0, r1
-	cmp r0, 0
-	bne _0803DEA2
-	bl FreeMonSpritesGfx
-	bl FreeBattleResources
-	bl FreeBattleSpritesData
-_0803DEA2:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803DE40
-
-	thumb_func_start bc_evolution_cutscene
-bc_evolution_cutscene: @ 803DEB4
-	push {r4-r6,lr}
-	ldr r0, =gLeveledUpInBattle
-	ldrb r1, [r0]
-	adds r3, r0, 0
-	cmp r1, 0
-	beq _0803DF2E
-_0803DEC0:
-	movs r6, 0
-_0803DEC2:
-	ldrb r2, [r3]
-	ldr r0, =gBitTable
-	lsls r1, r6, 2
-	adds r1, r0
-	ldr r1, [r1]
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _0803DF20
-	bics r2, r1
-	strb r2, [r3]
-	movs r0, 0x64
-	adds r1, r6, 0
-	muls r1, r0
-	ldr r0, =gPlayerParty
-	adds r5, r1, r0
-	adds r0, r5, 0
-	movs r1, 0
-	bl GetEvolutionTargetSpecies
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0
-	beq _0803DF20
-	bl FreeAllWindowBuffers
-	ldr r0, =gBattleMainFunc
-	ldr r1, =sub_803DF48
-	str r1, [r0]
-	lsls r3, r6, 24
-	lsrs r3, 24
-	adds r0, r5, 0
-	adds r1, r4, 0
-	movs r2, 0x1
-	bl evolution_cutscene
-	b _0803DF34
-	.pool
-_0803DF20:
-	adds r6, 0x1
-	ldr r3, =gLeveledUpInBattle
-	cmp r6, 0x5
-	ble _0803DEC2
-	ldrb r0, [r3]
-	cmp r0, 0
-	bne _0803DEC0
-_0803DF2E:
-	ldr r1, =gBattleMainFunc
-	ldr r0, =c4_overworld
-	str r0, [r1]
-_0803DF34:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bc_evolution_cutscene
-
-	thumb_func_start sub_803DF48
-sub_803DF48: @ 803DF48
-	push {lr}
-	ldr r0, =gMain
-	ldr r1, [r0, 0x4]
-	ldr r0, =BattleMainCB2
-	cmp r1, r0
-	bne _0803DF5A
-	ldr r1, =gBattleMainFunc
-	ldr r0, =bc_evolution_cutscene
-	str r0, [r1]
-_0803DF5A:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803DF48
-
-	thumb_func_start c4_overworld
-c4_overworld: @ 803DF70
-	push {r4-r6,lr}
-	ldr r6, =gBattleTypeFlags
-	ldr r0, [r6]
-	movs r5, 0x2
-	ands r0, r5
-	cmp r0, 0
-	bne _0803DF8C
-	ldr r4, =gPlayerParty
-	adds r0, r4, 0
-	bl RandomlyGivePartyPokerus
-	adds r0, r4, 0
-	bl PartySpreadPokerus
-_0803DF8C:
-	ldr r4, [r6]
-	adds r0, r4, 0
-	ands r0, r5
-	cmp r0, 0
-	beq _0803DF9E
-	ldr r0, =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0803DFEC
-_0803DF9E:
-	ldr r1, =gScriptResult
-	ldr r5, =gBattleOutcome
-	ldrb r0, [r5]
-	strh r0, [r1]
-	ldr r3, =gMain
-	ldr r0, =0x00000439
-	adds r2, r3, r0
-	ldrb r1, [r2]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-	ldr r0, =gPreBattleCallback1
-	ldr r0, [r0]
-	str r0, [r3]
-	movs r0, 0x80
-	lsls r0, 3
-	ands r4, r0
-	cmp r4, 0
-	beq _0803DFDE
-	ldr r0, =gEnemyParty
-	bl UpdateRoamerHPStatus
-	ldrb r1, [r5]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _0803DFDA
-	cmp r1, 0x7
-	bne _0803DFDE
-_0803DFDA:
-	bl SetRoamerInactive
-_0803DFDE:
-	movs r0, 0x5A
-	bl m4aSongNumStop
-	ldr r0, =gMain
-	ldr r0, [r0, 0x8]
-	bl SetMainCallback2
-_0803DFEC:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end c4_overworld
-
-	thumb_func_start bc_move_exec_returning
-bc_move_exec_returning: @ 803E018
-	push {lr}
-	ldr r0, =gFightStateTracker
-	ldrb r0, [r0]
-	subs r0, 0xB
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bhi _0803E060
-	ldr r3, =gBattleResources
-	ldr r0, [r3]
-	ldr r0, [r0, 0xC]
-	adds r1, r0, 0
-	adds r1, 0x20
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _0803E03C
-	subs r0, 0x1
-	strb r0, [r1]
-_0803E03C:
-	ldr r2, =gBattleMainFunc
-	ldr r0, [r3]
-	ldr r1, [r0, 0xC]
-	adds r0, r1, 0
-	adds r0, 0x20
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r1, r0
-	ldr r0, [r1]
-	str r0, [r2]
-	b _0803E07A
-	.pool
-_0803E060:
-	ldr r0, =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _0803E07A
-	ldr r1, =gBattleScriptingCommandsTable
-	ldr r0, =gBattlescriptCurrInstr
-	ldr r0, [r0]
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-_0803E07A:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bc_move_exec_returning
-
-	thumb_func_start sub_803E08C
-sub_803E08C: @ 803E08C
-	push {lr}
-	ldr r0, =gBattleExecBuffer
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _0803E0A8
-	ldr r1, =gBattleScriptingCommandsTable
-	ldr r0, =gBattlescriptCurrInstr
-	ldr r0, [r0]
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-_0803E0A8:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803E08C
-
-	thumb_func_start sub_803E0B8
-sub_803E0B8: @ 803E0B8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	movs r0, 0x4
-	str r0, [sp]
-	ldr r6, =gBankAttacker
-	ldr r1, =gBanksByTurnOrder
-	ldr r0, =gCurrentMoveTurn
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r6]
-	ldr r1, =gBattleStruct
-	ldr r3, [r1]
-	adds r0, r3, 0
-	adds r0, 0x91
-	ldrb r2, [r0]
-	ldr r1, =gBitTable
-	ldrb r0, [r6]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ands r2, r0
-	cmp r2, 0
-	beq _0803E110
-	ldr r1, =gFightStateTracker
-	movs r0, 0xC
-	b _0803E83C
-	.pool
-_0803E110:
-	ldr r1, =gCritMultiplier
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r1, =gBattleScripting
-	movs r0, 0x1
-	strb r0, [r1, 0xE]
-	ldr r5, =0x000001a3
-	adds r0, r3, r5
-	strb r2, [r0]
-	ldr r0, =gBattleMoveFlags
-	strb r2, [r0]
-	ldr r0, =gMultiHitCounter
-	strb r2, [r0]
-	ldr r0, =gBattleCommunication
-	strb r2, [r0, 0x6]
-	ldr r2, =gCurrMovePos
-	ldr r0, =gUnknown_020241E9
-	mov r9, r0
-	ldrb r0, [r6]
-	ldr r3, =gBattleStruct
-	ldr r1, [r3]
-	adds r0, r1
-	adds r0, 0x80
-	ldrb r0, [r0]
-	mov r5, r9
-	strb r0, [r5]
-	strb r0, [r2]
-	ldr r1, =gProtectStructs
-	ldrb r4, [r6]
-	lsls r0, r4, 4
-	adds r3, r0, r1
-	ldrb r1, [r3]
-	lsls r0, r1, 29
-	mov r8, r2
-	cmp r0, 0
-	bge _0803E1BC
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r3]
-	ldr r2, =gCurrentMove
-	ldr r1, =gLastUsedMove
-	movs r0, 0xA5
-	strh r0, [r1]
-	strh r0, [r2]
-	ldr r2, =gHitMarker
-	ldr r0, [r2]
-	movs r1, 0x80
-	lsls r1, 4
-	orrs r0, r1
-	str r0, [r2]
-	movs r0, 0xA5
-	movs r1, 0
-	bl GetMoveTarget
-	ldrb r1, [r6]
-	ldr r3, =gBattleStruct
-	ldr r2, [r3]
-	b _0803E316
-	.pool
-_0803E1BC:
-	ldr r5, =gBattleMons
-	mov r10, r5
-	movs r0, 0x58
-	adds r5, r4, 0
-	muls r5, r0
-	mov r0, r10
-	adds r0, 0x50
-	adds r0, r5, r0
-	ldr r1, [r0]
-	movs r0, 0x80
-	lsls r0, 5
-	ands r0, r1
-	cmp r0, 0
-	bne _0803E1E2
-	movs r7, 0x80
-	lsls r7, 15
-	ands r7, r1
-	cmp r7, 0
-	beq _0803E204
-_0803E1E2:
-	ldr r3, =gCurrentMove
-	ldr r2, =gLastUsedMove
-	ldr r1, =gLockedMoves
-	lsls r0, r4, 1
-	adds r0, r1
-	ldrh r0, [r0]
-	strh r0, [r2]
-	strh r0, [r3]
-	b _0803E33C
-	.pool
-_0803E204:
-	ldr r1, =gDisableStructs
-	mov r12, r1
-	lsls r0, r4, 3
-	subs r0, r4
-	lsls r0, 2
-	add r0, r12
-	ldrh r3, [r0, 0x6]
-	adds r1, r3, 0
-	cmp r1, 0
-	beq _0803E2DC
-	ldrb r2, [r0, 0xC]
-	lsls r0, r2, 1
-	adds r0, r5
-	mov r4, r10
-	adds r4, 0xC
-	adds r0, r4
-	ldrh r0, [r0]
-	cmp r1, r0
-	bne _0803E268
-	ldr r2, =gCurrentMove
-	ldr r0, =gLastUsedMove
-	strh r3, [r0]
-	strh r3, [r2]
-	ldrb r1, [r6]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	add r0, r12
-	ldrb r0, [r0, 0xC]
-	mov r3, r9
-	strb r0, [r3]
-	mov r5, r8
-	strb r0, [r5]
-	ldrh r0, [r2]
-	movs r1, 0
-	bl GetMoveTarget
-	ldrb r1, [r6]
-	ldr r3, =gBattleStruct
-	ldr r2, [r3]
-	b _0803E316
-	.pool
-_0803E268:
-	cmp r1, 0
-	beq _0803E2DC
-	cmp r1, r0
-	beq _0803E2DC
-	mov r5, r9
-	strb r2, [r5]
-	mov r0, r8
-	strb r2, [r0]
-	ldr r3, =gCurrentMove
-	ldr r2, =gLastUsedMove
-	ldrb r0, [r0]
-	lsls r0, 1
-	ldrb r1, [r6]
-	movs r5, 0x58
-	muls r1, r5
-	adds r0, r1
-	adds r0, r4
-	ldrh r0, [r0]
-	strh r0, [r2]
-	strh r0, [r3]
-	ldrb r1, [r6]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	add r0, r12
-	movs r2, 0
-	strh r7, [r0, 0x6]
-	ldrb r1, [r6]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	add r0, r12
-	strb r2, [r0, 0xC]
-	ldrb r0, [r6]
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	add r1, r12
-	ldrb r2, [r1, 0xE]
-	movs r0, 0x10
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0xE]
-	ldrh r0, [r3]
-	movs r1, 0
-	bl GetMoveTarget
-	ldrb r1, [r6]
-	ldr r3, =gBattleStruct
-	ldr r2, [r3]
-	b _0803E316
-	.pool
-_0803E2DC:
-	ldr r3, =gBattleMons
-	mov r5, r8
-	ldrb r0, [r5]
-	lsls r0, 1
-	ldr r4, =gBankAttacker
-	ldrb r2, [r4]
-	movs r1, 0x58
-	muls r1, r2
-	adds r0, r1
-	adds r3, 0xC
-	adds r0, r3
-	ldr r1, =gChosenMovesByBanks
-	lsls r2, 1
-	adds r2, r1
-	ldrh r3, [r0]
-	ldrh r2, [r2]
-	cmp r3, r2
-	beq _0803E334
-	ldr r1, =gCurrentMove
-	ldr r0, =gLastUsedMove
-	strh r3, [r0]
-	strh r3, [r1]
-	ldrh r0, [r1]
-	movs r1, 0
-	bl GetMoveTarget
-	ldrb r1, [r4]
-	ldr r2, =gBattleStruct
-	ldr r2, [r2]
-_0803E316:
-	adds r1, r2
-	strb r0, [r1, 0xC]
-	b _0803E33C
-	.pool
-_0803E334:
-	ldr r1, =gCurrentMove
-	ldr r0, =gLastUsedMove
-	strh r3, [r0]
-	strh r3, [r1]
-_0803E33C:
-	ldr r2, =gBattleMons
-	ldr r1, =gBankAttacker
-	ldrb r3, [r1]
-	movs r0, 0x58
-	muls r0, r3
-	adds r0, r2
-	ldrh r0, [r0, 0x28]
-	mov r8, r1
-	cmp r0, 0
-	beq _0803E384
-	adds r0, r3, 0
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803E37C
-	ldr r0, =gBattleResults
-	ldr r1, =gCurrentMove
-	ldrh r1, [r1]
-	strh r1, [r0, 0x22]
-	b _0803E384
-	.pool
-_0803E37C:
-	ldr r0, =gBattleResults
-	ldr r1, =gCurrentMove
-	ldrh r1, [r1]
-	strh r1, [r0, 0x24]
-_0803E384:
-	mov r1, r8
-	ldrb r0, [r1]
-	bl GetBankSide
-	movs r1, 0x1
-	eors r0, r1
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r1, =gSideTimers
-	lsls r0, r6, 1
-	adds r0, r6
-	lsls r0, 2
-	adds r5, r0, r1
-	ldrb r0, [r5, 0x8]
-	cmp r0, 0
-	beq _0803E400
-	ldr r2, =gBattleMoves
-	ldr r0, =gCurrentMove
-	ldrh r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x6]
-	cmp r0, 0
-	bne _0803E400
-	mov r3, r8
-	ldrb r0, [r3]
-	bl GetBankSide
-	adds r4, r0, 0
-	ldrb r0, [r5, 0x9]
-	bl GetBankSide
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	beq _0803E400
-	ldr r1, =gBattleMons
-	ldrb r2, [r5, 0x9]
-	movs r0, 0x58
-	muls r0, r2
-	adds r0, r1
-	ldrh r0, [r0, 0x28]
-	cmp r0, 0
-	beq _0803E400
-	ldr r0, =gBankTarget
-	strb r2, [r0]
-	b _0803E76A
-	.pool
-_0803E400:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x1
-	ands r0, r1
-	ldr r5, =gBankAttacker
-	mov r8, r5
-	cmp r0, 0
-	bne _0803E412
-	b _0803E6E0
-_0803E412:
-	ldr r1, =gSideTimers
-	lsls r0, r6, 1
-	adds r0, r6
-	lsls r0, 2
-	adds r0, r1
-	ldrb r5, [r0, 0x8]
-	cmp r5, 0
-	beq _0803E424
-	b _0803E630
-_0803E424:
-	ldr r2, =gBattleMoves
-	ldr r0, =gCurrentMove
-	ldrh r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r4, r0, r2
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0
-	bne _0803E440
-	ldrb r0, [r4, 0x6]
-	cmp r0, 0x10
-	bne _0803E440
-	b _0803E630
-_0803E440:
-	ldr r3, =gBattleMons
-	ldr r2, =gBankAttacker
-	ldrb r6, [r2]
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-	adds r0, r6, r0
-	ldrb r1, [r0, 0xC]
-	movs r0, 0x58
-	muls r0, r1
-	adds r0, r3
-	adds r0, 0x20
-	ldrb r0, [r0]
-	mov r8, r2
-	cmp r0, 0x1F
-	bne _0803E460
-	b _0803E630
-_0803E460:
-	ldrb r0, [r4, 0x2]
-	cmp r0, 0xD
-	beq _0803E468
-	b _0803E630
-_0803E468:
-	adds r0, r6, 0
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r1, =gActiveBank
-	strb r5, [r1]
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r5, r0
-	bcs _0803E4E0
-	adds r4, r1, 0
-_0803E480:
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r6, r0
-	beq _0803E4CE
-	ldr r0, =gBankAttacker
-	ldrb r1, [r0]
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-	adds r1, r0
-	ldrb r0, [r1, 0xC]
-	ldrb r1, [r4]
-	cmp r0, r1
-	beq _0803E4CE
-	ldr r1, =gBattleMons
-	ldrb r2, [r4]
-	movs r0, 0x58
-	muls r0, r2
-	adds r0, r1
-	adds r0, 0x20
-	ldrb r0, [r0]
-	cmp r0, 0x1F
-	bne _0803E4CE
-	adds r0, r2, 0
-	bl BankGetTurnOrder
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r3, [sp]
-	cmp r0, r3
-	bcs _0803E4CE
-	ldrb r0, [r4]
-	bl BankGetTurnOrder
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp]
-_0803E4CE:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldr r1, =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803E480
-_0803E4E0:
-	ldr r5, [sp]
-	cmp r5, 0x4
-	beq _0803E4E8
-	b _0803E5E2
-_0803E4E8:
-	ldr r2, =gBattleMoves
-	ldr r0, =gLastUsedMove
-	ldrh r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x6]
-	ands r5, r0
-	cmp r5, 0
-	beq _0803E568
-	ldr r0, =gBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803E548
-	bl Random
-	movs r1, 0x1
-	ands r1, r0
-	cmp r1, 0
-	beq _0803E544
-	movs r0, 0x1
-	b _0803E55A
-	.pool
-_0803E544:
-	movs r0, 0x3
-	b _0803E55A
-_0803E548:
-	bl Random
-	movs r1, 0x1
-	ands r1, r0
-	cmp r1, 0
-	beq _0803E558
-	movs r0, 0
-	b _0803E55A
-_0803E558:
-	movs r0, 0x2
-_0803E55A:
-	bl GetBankByIdentity
-	ldr r1, =gBankTarget
-	strb r0, [r1]
-	b _0803E578
-	.pool
-_0803E568:
-	ldr r2, =gBankTarget
-	ldr r0, =gBankAttacker
-	ldrb r0, [r0]
-	ldr r1, =gBattleStruct
-	ldr r1, [r1]
-	adds r0, r1
-	ldrb r0, [r0, 0xC]
-	strb r0, [r2]
-_0803E578:
-	ldr r7, =gAbsentBankFlags
-	ldrb r0, [r7]
-	ldr r1, =gBitTable
-	mov r8, r1
-	ldr r5, =gBankTarget
-	ldrb r1, [r5]
-	lsls r1, 2
-	add r1, r8
-	ldr r1, [r1]
-	ands r0, r1
-	cmp r0, 0
-	bne _0803E592
-	b _0803E76A
-_0803E592:
-	ldr r6, =gBankAttacker
-	ldrb r0, [r6]
-	bl GetBankSide
-	adds r4, r0, 0
-	ldrb r0, [r5]
-	bl GetBankSide
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	beq _0803E5C4
-	ldrb r0, [r5]
-	b _0803E758
-	.pool
-_0803E5C4:
-	ldrb r0, [r6]
-	bl GetBankIdentity
-	movs r1, 0x1
-	eors r0, r1
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	strb r0, [r5]
-	ldrb r1, [r7]
-	ldrb r2, [r5]
-	lsls r0, r2, 2
-	add r0, r8
-	b _0803E74E
-_0803E5E2:
-	ldr r4, =gActiveBank
-	ldr r0, =gBanksByTurnOrder
-	ldr r3, [sp]
-	adds r0, r3, r0
-	ldrb r0, [r0]
-	strb r0, [r4]
-	ldrb r0, [r4]
-	ldr r2, =gBattleMons
-	movs r1, 0x58
-	muls r1, r0
-	adds r1, r2
-	adds r1, 0x20
-	ldrb r1, [r1]
-	bl RecordAbilityBattle
-	ldr r2, =gSpecialStatuses
-	ldrb r1, [r4]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0]
-	movs r2, 0x2
-	orrs r1, r2
-	strb r1, [r0]
-	ldr r1, =gBankTarget
-	ldrb r0, [r4]
-	strb r0, [r1]
-	b _0803E76A
-	.pool
-_0803E630:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r4, 0x1
-	ands r0, r4
-	cmp r0, 0
-	beq _0803E6E0
-	ldr r2, =gBattleMoves
-	ldr r0, =gLastUsedMove
-	ldrh r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0, 0x6]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _0803E6E0
-	mov r5, r8
-	ldrb r0, [r5]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803E684
-	bl Random
-	adds r1, r4, 0
-	ands r1, r0
-	cmp r1, 0
-	beq _0803E680
-	movs r0, 0x1
-	b _0803E696
-	.pool
-_0803E680:
-	movs r0, 0x3
-	b _0803E696
-_0803E684:
-	bl Random
-	adds r1, r4, 0
-	ands r1, r0
-	cmp r1, 0
-	beq _0803E694
-	movs r0, 0
-	b _0803E696
-_0803E694:
-	movs r0, 0x2
-_0803E696:
-	bl GetBankByIdentity
-	ldr r1, =gBankTarget
-	strb r0, [r1]
-	ldr r0, =gAbsentBankFlags
-	ldrb r1, [r0]
-	ldr r2, =gBitTable
-	ldr r5, =gBankTarget
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r2
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	beq _0803E76A
-	ldr r0, =gBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	adds r4, r0, 0
-	ldrb r0, [r5]
-	bl GetBankSide
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	beq _0803E76A
-	ldrb r0, [r5]
-	b _0803E758
-	.pool
-_0803E6E0:
-	ldr r5, =gBankTarget
-	mov r2, r8
-	ldrb r0, [r2]
-	ldr r1, =gBattleStruct
-	ldr r1, [r1]
-	adds r0, r1
-	ldrb r0, [r0, 0xC]
-	strb r0, [r5]
-	ldr r6, =gAbsentBankFlags
-	ldrb r1, [r6]
-	ldr r7, =gBitTable
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r7
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	beq _0803E76A
-	ldrb r0, [r2]
-	bl GetBankSide
-	adds r4, r0, 0
-	ldrb r0, [r5]
-	bl GetBankSide
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	beq _0803E730
-	ldrb r0, [r5]
-	b _0803E758
-	.pool
-_0803E730:
-	mov r1, r8
-	ldrb r0, [r1]
-	bl GetBankIdentity
-	movs r1, 0x1
-	eors r0, r1
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	strb r0, [r5]
-	ldrb r1, [r6]
-	ldrb r2, [r5]
-	lsls r0, r2, 2
-	adds r0, r7
-_0803E74E:
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	beq _0803E76A
-	adds r0, r2, 0
-_0803E758:
-	bl GetBankIdentity
-	movs r1, 0x2
-	eors r0, r1
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBankByIdentity
-	strb r0, [r5]
-_0803E76A:
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r2, 0x80
-	lsls r2, 10
-	ands r1, r2
-	adds r5, r0, 0
-	cmp r1, 0
-	beq _0803E808
-	ldr r0, =gProtectStructs
-	ldr r4, =gBankAttacker
-	ldrb r2, [r4]
-	lsls r1, r2, 4
-	adds r1, r0
-	ldrb r0, [r1, 0x2]
-	lsls r0, 27
-	cmp r0, 0
-	bge _0803E808
-	ldr r1, =gBattleMons
-	movs r0, 0x58
-	muls r0, r2
-	adds r0, r1
-	ldrh r0, [r0, 0x28]
-	cmp r0, 0
-	bne _0803E7B4
-	ldr r1, =gFightStateTracker
-	movs r0, 0xC
-	b _0803E83C
-	.pool
-_0803E7B4:
-	ldr r3, =gUnknown_02024230
-	lsls r0, r2, 2
-	adds r0, r3
-	ldr r0, [r0]
-	cmp r0, 0
-	beq _0803E7EC
-	ldr r1, =gBattleCommunication
-	movs r2, 0
-	movs r0, 0x4
-	strb r0, [r1, 0x5]
-	ldr r1, =gBattlescriptCurrInstr
-	ldrb r0, [r4]
-	lsls r0, 2
-	adds r0, r3
-	ldr r0, [r0]
-	str r0, [r1]
-	ldrb r0, [r4]
-	lsls r0, 2
-	adds r0, r3
-	str r2, [r0]
-	b _0803E824
-	.pool
-_0803E7EC:
-	ldr r1, =gBattleCommunication
-	movs r0, 0x4
-	strb r0, [r1, 0x5]
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =BattleScript_MoveUsedLoafingAround
-	str r0, [r1]
-	b _0803E824
-	.pool
-_0803E808:
-	ldr r4, =gBattlescriptCurrInstr
-	ldr r3, =gBattleScriptsForMoveEffects
-	ldr r2, =gBattleMoves
-	ldr r0, =gCurrentMove
-	ldrh r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r3
-	ldr r0, [r0]
-	str r0, [r4]
-_0803E824:
-	ldr r0, [r5]
-	movs r1, 0x80
-	lsls r1, 11
-	ands r0, r1
-	cmp r0, 0
-	beq _0803E838
-	ldr r0, =gBankAttacker
-	ldrb r0, [r0]
-	bl sub_81A56E8
-_0803E838:
-	ldr r1, =gFightStateTracker
-	movs r0, 0xA
-_0803E83C:
-	strb r0, [r1]
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803E0B8
-
-	thumb_func_start bs2_8016374
-bs2_8016374: @ 803E868
-	push {r4,lr}
-	ldr r3, =gBankAttacker
-	ldr r1, =gBanksByTurnOrder
-	ldr r0, =gCurrentMoveTurn
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r3]
-	ldr r0, =gBattle_BG0_X
-	movs r2, 0
-	strh r2, [r0]
-	ldr r0, =gBattle_BG0_Y
-	strh r2, [r0]
-	ldr r1, =gActionSelectionCursor
-	ldrb r0, [r3]
-	adds r0, r1
-	strb r2, [r0]
-	ldr r1, =gMoveSelectionCursor
-	ldrb r0, [r3]
-	adds r0, r1
-	strb r2, [r0]
-	ldr r2, =gBattleTextBuff1
-	movs r0, 0xFD
-	strb r0, [r2]
-	movs r0, 0x7
-	strb r0, [r2, 0x1]
-	ldrb r4, [r3]
-	strb r4, [r2, 0x2]
-	ldrb r0, [r3]
-	ldr r1, =gBattleStruct
-	ldr r1, [r1]
-	adds r0, r1
-	adds r0, 0x58
-	ldrb r0, [r0]
-	strb r0, [r2, 0x3]
-	movs r0, 0xFF
-	strb r0, [r2, 0x4]
-	ldr r0, =gBattleScripting
-	strb r4, [r0, 0x17]
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DAB15
-	str r0, [r1]
-	ldr r1, =gFightStateTracker
-	movs r0, 0xA
-	strb r0, [r1]
-	ldr r1, =gBattleResults
-	ldrb r0, [r1, 0x2]
-	cmp r0, 0xFE
-	bhi _0803E8CE
-	adds r0, 0x1
-	strb r0, [r1, 0x2]
-_0803E8CE:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bs2_8016374
-
-	thumb_func_start sub_803E90C
-sub_803E90C: @ 803E90C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	ldr r4, =gBankAttacker
-	ldr r2, =gBankTarget
-	ldr r1, =gBanksByTurnOrder
-	ldr r0, =gCurrentMoveTurn
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2]
-	strb r0, [r4]
-	ldr r0, =gBattle_BG0_X
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gBattle_BG0_Y
-	strh r1, [r0]
-	ldrb r0, [r4]
-	bl sub_8045868
-	ldr r5, =gLastUsedItem
-	ldr r2, =gBattleBufferB
-	ldrb r1, [r4]
-	lsls r1, 9
-	adds r0, r2, 0x1
-	adds r0, r1, r0
-	ldrb r3, [r0]
-	adds r2, 0x2
-	adds r1, r2
-	ldrb r0, [r1]
-	lsls r0, 8
-	orrs r3, r0
-	strh r3, [r5]
-	cmp r3, 0xC
-	bhi _0803E998
-	ldr r2, =gBattlescriptCurrInstr
-	ldr r1, =gUnknown_082DBD08
-	ldrh r0, [r5]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	str r0, [r2]
-	ldr r0, =gFightStateTracker
-	mov r10, r0
-	b _0803EBF6
-	.pool
-_0803E998:
-	adds r0, r3, 0
-	subs r0, 0x50
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bhi _0803E9C0
-	ldr r0, =gBattlescriptCurrInstr
-	ldr r1, =gUnknown_082DBD54
-	ldr r1, [r1]
-	str r1, [r0]
-	ldr r1, =gFightStateTracker
-	mov r10, r1
-	b _0803EBF6
-	.pool
-_0803E9C0:
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803E9E8
-	ldr r0, =gBattlescriptCurrInstr
-	ldr r1, =gUnknown_082DBD3C
-	ldr r1, [r1]
-	str r1, [r0]
-	ldr r2, =gFightStateTracker
-	mov r10, r2
-	b _0803EBF6
-	.pool
-_0803E9E8:
-	ldr r3, =gBattleScripting
-	ldrb r0, [r4]
-	strb r0, [r3, 0x17]
-	lsls r0, 24
-	lsrs r0, 25
-	ldr r2, =gBattleStruct
-	ldr r1, [r2]
-	adds r0, r1
-	adds r0, 0xC4
-	ldrb r0, [r0]
-	subs r0, 0x1
-	mov r8, r4
-	ldr r1, =gBattlescriptCurrInstr
-	mov r9, r1
-	ldr r6, =gUnknown_082DBD3C
-	mov r12, r3
-	adds r7, r2, 0
-	ldr r2, =gFightStateTracker
-	mov r10, r2
-	cmp r0, 0x4
-	bls _0803EA14
-	b _0803EBDE
-_0803EA14:
-	lsls r0, 2
-	ldr r1, =_0803EA38
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_0803EA38:
-	.4byte _0803EBDE
-	.4byte _0803EBDE
-	.4byte _0803EA4C
-	.4byte _0803EAE0
-	.4byte _0803EBB0
-_0803EA4C:
-	ldr r5, =gBattleCommunication
-	movs r0, 0
-	strb r0, [r5, 0x5]
-	ldr r2, =gBankAttacker
-	ldrb r0, [r2]
-	lsrs r0, 1
-	ldr r1, [r7]
-	adds r0, r1
-	adds r0, 0xC6
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	mov r8, r2
-	cmp r0, 0
-	beq _0803EA98
-	movs r0, 0x3E
-	ands r0, r1
-	ldr r1, =gBattlescriptCurrInstr
-	mov r9, r1
-	ldr r6, =gUnknown_082DBD3C
-	ldr r2, =gFightStateTracker
-	mov r10, r2
-	cmp r0, 0
-	bne _0803EA7E
-	b _0803EBDE
-_0803EA7E:
-	movs r0, 0x5
-	strb r0, [r5, 0x5]
-	b _0803EBDE
-	.pool
-_0803EA98:
-	ldr r0, =gBattlescriptCurrInstr
-	mov r9, r0
-	ldr r6, =gUnknown_082DBD3C
-	ldr r1, =gFightStateTracker
-	mov r10, r1
-	mov r4, r8
-	adds r3, r7, 0
-	adds r2, r5, 0
-_0803EAA8:
-	ldrb r1, [r4]
-	lsrs r1, 1
-	ldr r0, [r3]
-	adds r1, r0
-	adds r1, 0xC6
-	ldrb r0, [r1]
-	lsrs r0, 1
-	strb r0, [r1]
-	ldrb r0, [r2, 0x5]
-	adds r0, 0x1
-	strb r0, [r2, 0x5]
-	ldrb r0, [r4]
-	lsrs r0, 1
-	ldr r1, [r3]
-	adds r0, r1
-	adds r0, 0xC6
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0803EAA8
-	b _0803EBDE
-	.pool
-_0803EAE0:
-	ldr r3, =gBattleCommunication
-	movs r0, 0x4
-	strb r0, [r3, 0x5]
-	ldr r2, =gBankAttacker
-	ldrb r0, [r2]
-	lsrs r0, 1
-	ldr r1, [r7]
-	adds r0, r1
-	adds r6, r0, 0
-	adds r6, 0xC6
-	ldrb r1, [r6]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	mov r8, r2
-	cmp r5, 0
-	beq _0803EB28
-	movs r0, 0x5
-	strb r0, [r3, 0x5]
-	ldr r2, =gBattlescriptCurrInstr
-	mov r9, r2
-	ldr r6, =gUnknown_082DBD3C
-	ldr r0, =gFightStateTracker
-	mov r10, r0
-	b _0803EBDE
-	.pool
-_0803EB28:
-	ldr r3, =gBattleTextBuff1
-	movs r4, 0xFD
-	strb r4, [r3]
-	movs r0, 0x5
-	strb r0, [r3, 0x1]
-	movs r2, 0x1
-	strb r2, [r3, 0x2]
-	movs r0, 0xFF
-	strb r0, [r3, 0x3]
-	ldr r1, =gBattleTextBuff2
-	strb r4, [r1]
-	strb r5, [r1, 0x1]
-	movs r0, 0xD2
-	strb r0, [r1, 0x2]
-	strb r5, [r1, 0x3]
-	subs r0, 0xD3
-	strb r0, [r1, 0x4]
-	ldrb r0, [r6]
-	ands r2, r0
-	ldr r1, =gBattlescriptCurrInstr
-	mov r9, r1
-	ldr r6, =gUnknown_082DBD3C
-	ldr r0, =gFightStateTracker
-	mov r10, r0
-	cmp r2, 0
-	bne _0803EB8C
-	mov r5, r8
-	adds r4, r7, 0
-	adds r2, r3, 0
-_0803EB62:
-	ldrb r1, [r5]
-	lsrs r1, 1
-	ldr r0, [r4]
-	adds r1, r0
-	adds r1, 0xC6
-	ldrb r0, [r1]
-	lsrs r0, 1
-	strb r0, [r1]
-	ldrb r0, [r2, 0x2]
-	adds r0, 0x1
-	strb r0, [r2, 0x2]
-	ldrb r0, [r5]
-	lsrs r0, 1
-	ldr r1, [r4]
-	adds r0, r1
-	adds r0, 0xC6
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0803EB62
-_0803EB8C:
-	ldrb r0, [r3, 0x2]
-	adds r0, 0xE
-	movs r1, 0
-	mov r2, r12
-	strb r0, [r2, 0x10]
-	strb r1, [r2, 0x11]
-	b _0803EBDE
-	.pool
-_0803EBB0:
-	ldr r0, =gBattleTypeFlags
-	ldr r1, [r0]
-	movs r0, 0x1
-	ands r1, r0
-	cmp r1, 0
-	beq _0803EBCC
-	ldr r1, =gBattleCommunication
-	movs r0, 0x2
-	strb r0, [r1, 0x5]
-	b _0803EBD0
-	.pool
-_0803EBCC:
-	ldr r0, =gBattleCommunication
-	strb r1, [r0, 0x5]
-_0803EBD0:
-	ldr r0, =gBankAttacker
-	mov r8, r0
-	ldr r1, =gBattlescriptCurrInstr
-	mov r9, r1
-	ldr r6, =gUnknown_082DBD3C
-	ldr r2, =gFightStateTracker
-	mov r10, r2
-_0803EBDE:
-	mov r1, r8
-	ldrb r0, [r1]
-	lsrs r0, 1
-	ldr r1, [r7]
-	adds r0, r1
-	adds r0, 0xC4
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r6
-	ldr r0, [r0]
-	mov r2, r9
-	str r0, [r2]
-_0803EBF6:
-	movs r0, 0xA
-	mov r1, r10
-	strb r0, [r1]
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803E90C
-
-	thumb_func_start CanRunFromBattle
-CanRunFromBattle: @ 803EC20
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r7, 0
-	ldr r1, =gBattleMons
-	movs r0, 0x58
-	muls r0, r5
-	adds r1, r0, r1
-	ldrh r0, [r1, 0x2E]
-	cmp r0, 0xAF
-	bne _0803EC54
-	ldr r1, =gEnigmaBerries
-	lsls r0, r5, 3
-	subs r0, r5
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0, 0x7]
-	b _0803EC5E
-	.pool
-_0803EC54:
-	ldrh r0, [r1, 0x2E]
-	bl ItemId_GetHoldEffect
-	lsls r0, 24
-	lsrs r1, r0, 24
-_0803EC5E:
-	ldr r0, =gStringBank
-	strb r5, [r0]
-	cmp r1, 0x25
-	bne _0803EC9C
-	ldr r2, =gLastUsedItem
-	ldr r1, =gBattleMons
-	movs r0, 0x58
-	muls r0, r5
-	adds r0, r1
-	ldrh r0, [r0, 0x2E]
-	strh r0, [r2]
-	ldr r0, =gProtectStructs
-	lsls r2, r5, 4
-	adds r2, r0
-	ldrb r1, [r2, 0x1]
-	movs r0, 0x19
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x8
-	orrs r0, r1
-	strb r0, [r2, 0x1]
-	b _0803ED70
-	.pool
-_0803EC9C:
-	ldr r0, =gBattleMons
-	mov r10, r0
-	movs r2, 0x58
-	mov r9, r2
-	mov r0, r9
-	muls r0, r5
-	add r0, r10
-	mov r8, r0
-	adds r0, 0x20
-	ldrb r6, [r0]
-	cmp r6, 0x32
-	bne _0803ED5C
-	bl InBattlePyramid
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803ED38
-	ldr r4, =gBattleStruct
-	ldr r1, [r4]
-	adds r1, 0x6C
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	bl sub_81A9E28
-	lsls r0, 24
-	lsrs r1, r0, 24
-	mov r2, r8
-	ldrh r0, [r2, 0x6]
-	muls r0, r1
-	movs r2, 0x1
-	adds r1, r5, 0
-	eors r1, r2
-	mov r2, r9
-	muls r2, r1
-	adds r1, r2, 0
-	add r1, r10
-	ldrh r1, [r1, 0x6]
-	bl __divsi3
-	ldr r1, [r4]
-	adds r1, 0x6C
-	ldrb r2, [r1]
-	lsls r1, r2, 4
-	subs r1, r2
-	lsls r1, 1
-	adds r0, r1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl Random
-	movs r1, 0xFF
-	ands r1, r0
-	cmp r4, r1
-	bhi _0803ED0C
-	b _0803EE12
-_0803ED0C:
-	ldr r0, =gLastUsedAbility
-	strb r6, [r0]
-	ldr r0, =gProtectStructs
-	lsls r2, r5, 4
-	adds r2, r0
-	ldrb r1, [r2, 0x1]
-	movs r0, 0x19
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x10
-	orrs r0, r1
-	strb r0, [r2, 0x1]
-	b _0803ED70
-	.pool
-_0803ED38:
-	ldr r0, =gLastUsedAbility
-	strb r6, [r0]
-	ldr r0, =gProtectStructs
-	lsls r2, r5, 4
-	adds r2, r0
-	ldrb r1, [r2, 0x1]
-	movs r0, 0x19
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x10
-	orrs r0, r1
-	strb r0, [r2, 0x1]
-	b _0803ED70
-	.pool
-_0803ED5C:
-	ldr r1, =gBattleTypeFlags
-	ldr r2, [r1]
-	ldr r0, =0x043f0100
-	ands r0, r2
-	cmp r0, 0
-	beq _0803ED80
-	movs r0, 0x8
-	ands r2, r0
-	cmp r2, 0
-	beq _0803ED80
-_0803ED70:
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	b _0803EE12
-	.pool
-_0803ED80:
-	ldr r0, [r1]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _0803EE06
-	bl InBattlePyramid
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803EDBC
-	bl sub_81A9E28
-	lsls r0, 24
-	lsrs r1, r0, 24
-	ldr r4, =gBattleMons
-	movs r3, 0x58
-	adds r0, r5, 0
-	muls r0, r3
-	adds r0, r4
-	ldrh r0, [r0, 0x6]
-	muls r0, r1
-	movs r2, 0x1
-	adds r1, r5, 0
-	eors r1, r2
-	muls r1, r3
-	adds r1, r4
-	b _0803EDDA
-	.pool
-_0803EDBC:
-	ldr r3, =gBattleMons
-	movs r2, 0x58
-	adds r0, r5, 0
-	muls r0, r2
-	adds r4, r0, r3
-	movs r1, 0x1
-	adds r0, r5, 0
-	eors r0, r1
-	muls r0, r2
-	adds r1, r0, r3
-	ldrh r0, [r4, 0x6]
-	ldrh r2, [r1, 0x6]
-	cmp r0, r2
-	bcs _0803EE00
-	lsls r0, 7
-_0803EDDA:
-	ldrh r1, [r1, 0x6]
-	bl __divsi3
-	ldr r1, =gBattleStruct
-	ldr r1, [r1]
-	adds r1, 0x6C
-	ldrb r2, [r1]
-	lsls r1, r2, 4
-	subs r1, r2
-	lsls r1, 1
-	adds r0, r1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl Random
-	movs r1, 0xFF
-	ands r1, r0
-	cmp r4, r1
-	bls _0803EE06
-_0803EE00:
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-_0803EE06:
-	ldr r0, =gBattleStruct
-	ldr r1, [r0]
-	adds r1, 0x6C
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-_0803EE12:
-	cmp r7, 0
-	beq _0803EE24
-	ldr r1, =gCurrentMoveTurn
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	strb r0, [r1]
-	ldr r1, =gBattleOutcome
-	movs r0, 0x4
-	strb r0, [r1]
-_0803EE24:
-	adds r0, r7, 0
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end CanRunFromBattle
-
 	thumb_func_start sub_803EE48
 sub_803EE48: @ 803EE48
 	push {r4-r6,lr}
 	ldr r4, =gBankAttacker
 	ldr r1, =gBanksByTurnOrder
-	ldr r5, =gCurrentMoveTurn
+	ldr r5, =gCurrentTurnActionNumber
 	ldrb r0, [r5]
 	adds r0, r1
 	ldrb r0, [r0]
@@ -2671,19 +92,19 @@ _0803EF0C:
 	cmp r0, 0
 	bne _0803EF4C
 	ldrb r0, [r4]
-	bl CanRunFromBattle
+	bl TryRunFromBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _0803EF98
 	ldrb r0, [r4]
-	bl sub_8045868
+	bl ClearFuryCutterDestinyBondGrudge
 	ldr r1, =gBattleCommunication
 	movs r0, 0x3
 	strb r0, [r1, 0x5]
 	ldr r1, =gBattlescriptCurrInstr
 	ldr r0, =gUnknown_082DAB02
 	str r0, [r1]
-	ldr r1, =gFightStateTracker
+	ldr r1, =gCurrentActionFuncId
 	movs r0, 0xA
 	b _0803EF96
 	.pool
@@ -2705,7 +126,7 @@ _0803EF4C:
 	ldr r1, =gBattlescriptCurrInstr
 	ldr r0, =gUnknown_082DAB02
 	str r0, [r1]
-	ldr r1, =gFightStateTracker
+	ldr r1, =gCurrentActionFuncId
 	movs r0, 0xA
 	b _0803EF96
 	.pool
@@ -2728,7 +149,7 @@ _0803EF98:
 sub_803EFA8: @ 803EFA8
 	ldr r2, =gBankAttacker
 	ldr r1, =gBanksByTurnOrder
-	ldr r0, =gCurrentMoveTurn
+	ldr r0, =gCurrentTurnActionNumber
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r0, [r0]
@@ -2742,7 +163,7 @@ sub_803EFA8: @ 803EFA8
 	ldr r0, =gUnknown_082DBD58
 	ldr r0, [r0]
 	str r0, [r1]
-	ldr r1, =gFightStateTracker
+	ldr r1, =gCurrentActionFuncId
 	movs r0, 0xA
 	strb r0, [r1]
 	bx lr
@@ -2753,7 +174,7 @@ sub_803EFA8: @ 803EFA8
 bs5_8016AC0: @ 803EFF0
 	ldr r2, =gBankAttacker
 	ldr r1, =gBanksByTurnOrder
-	ldr r0, =gCurrentMoveTurn
+	ldr r0, =gCurrentTurnActionNumber
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r0, [r0]
@@ -2771,10 +192,10 @@ bs5_8016AC0: @ 803EFF0
 	movs r0, 0x5
 	strh r0, [r1]
 	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DBD08
+	ldr r0, =gBattlescriptsForBallThrow
 	ldr r0, [r0, 0x14]
 	str r0, [r1]
-	ldr r1, =gFightStateTracker
+	ldr r1, =gCurrentActionFuncId
 	movs r0, 0xA
 	strb r0, [r1]
 	bx lr
@@ -2786,7 +207,7 @@ sub_803F050: @ 803F050
 	push {r4-r6,lr}
 	ldr r3, =gBankAttacker
 	ldr r1, =gBanksByTurnOrder
-	ldr r0, =gCurrentMoveTurn
+	ldr r0, =gCurrentTurnActionNumber
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r0, [r0]
@@ -2859,7 +280,7 @@ _0803F100:
 	ldr r0, =gUnknown_082DBD58
 	ldr r0, [r0, 0x8]
 	str r0, [r1]
-	ldr r1, =gFightStateTracker
+	ldr r1, =gCurrentActionFuncId
 	movs r0, 0xA
 	strb r0, [r1]
 	pop {r4-r6}
@@ -2873,7 +294,7 @@ sub_803F120: @ 803F120
 	push {r4,lr}
 	ldr r2, =gBankAttacker
 	ldr r1, =gBanksByTurnOrder
-	ldr r0, =gCurrentMoveTurn
+	ldr r0, =gCurrentTurnActionNumber
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r0, [r0]
@@ -2945,7 +366,7 @@ _0803F1CA:
 	ldr r0, =gUnknown_082DBD58
 	ldr r0, [r0, 0x4]
 	str r0, [r1]
-	ldr r1, =gFightStateTracker
+	ldr r1, =gCurrentActionFuncId
 	movs r0, 0xA
 	strb r0, [r1]
 	pop {r4}
@@ -2959,7 +380,7 @@ bs8_exit_by_flight: @ 803F1F0
 	push {r4,lr}
 	ldr r2, =gBankAttacker
 	ldr r1, =gBanksByTurnOrder
-	ldr r4, =gCurrentMoveTurn
+	ldr r4, =gCurrentTurnActionNumber
 	ldrb r0, [r4]
 	adds r0, r1
 	ldrb r0, [r0]
@@ -2982,7 +403,7 @@ bs8_exit_by_flight: @ 803F1F0
 bs9_8016C9C: @ 803F22C
 	ldr r3, =gBankAttacker
 	ldr r1, =gBanksByTurnOrder
-	ldr r0, =gCurrentMoveTurn
+	ldr r0, =gCurrentTurnActionNumber
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r2, [r0]
@@ -3010,7 +431,7 @@ bs9_8016C9C: @ 803F22C
 	ldr r0, =gUnknown_082DBD58
 	ldr r0, [r0, 0xC]
 	str r0, [r1]
-	ldr r1, =gFightStateTracker
+	ldr r1, =gCurrentActionFuncId
 	movs r0, 0xA
 	strb r0, [r1]
 	ldr r1, =gActionsByTurnOrder
@@ -3032,7 +453,7 @@ bsB_exit_by_move: @ 803F2A4
 	ldr r0, [r0]
 	adds r0, 0x4D
 	strb r1, [r0]
-	ldr r1, =gFightStateTracker
+	ldr r1, =gCurrentActionFuncId
 	movs r0, 0xC
 	strb r0, [r1]
 _0803F2C0:
@@ -3043,11 +464,11 @@ _0803F2C0:
 
 	thumb_func_start bsD_proceed
 bsD_proceed: @ 803F2CC
-	ldr r1, =gCurrentMoveTurn
+	ldr r1, =gCurrentTurnActionNumber
 	ldrb r0, [r1]
 	adds r0, 0x1
 	strb r0, [r1]
-	ldr r3, =gFightStateTracker
+	ldr r3, =gCurrentActionFuncId
 	ldr r2, =gActionsByTurnOrder
 	ldrb r0, [r1]
 	adds r0, r2
@@ -3066,7 +487,7 @@ bsD_proceed: @ 803F2CC
 bsC_8016D70: @ 803F300
 	push {r4-r6,lr}
 	ldr r1, =gBanksByTurnOrder
-	ldr r2, =gCurrentMoveTurn
+	ldr r2, =gCurrentTurnActionNumber
 	ldrb r0, [r2]
 	adds r0, r1
 	ldrb r0, [r0]
@@ -3079,7 +500,7 @@ bsC_8016D70: @ 803F300
 	ldrb r0, [r2]
 	adds r0, 0x1
 	strb r0, [r2]
-	ldr r3, =gFightStateTracker
+	ldr r3, =gCurrentActionFuncId
 	ldr r1, =gActionsByTurnOrder
 	ldrb r0, [r2]
 	adds r0, r1
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index 889403787..e5e9aaab9 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -68,7 +68,7 @@ _0813DA00:
 	adds r1, r4, 0
 	adds r2, r5, 0
 	adds r3, r6, 0
-	bl evolution_cutscene
+	bl EvolutionScene
 _0813DA30:
 	add sp, 0x4
 	pop {r4-r7}
@@ -77,8 +77,8 @@ _0813DA30:
 	.pool
 	thumb_func_end sub_813D9C0
 
-	thumb_func_start sub_813DA40
-sub_813DA40: @ 813DA40
+	thumb_func_start BeginEvolutionScene
+BeginEvolutionScene: @ 813DA40
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -110,10 +110,10 @@ sub_813DA40: @ 813DA40
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_813DA40
+	thumb_func_end BeginEvolutionScene
 
-	thumb_func_start evolution_cutscene
-evolution_cutscene: @ 813DA8C
+	thumb_func_start EvolutionScene
+EvolutionScene: @ 813DA8C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -393,7 +393,7 @@ evolution_cutscene: @ 813DA8C
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end evolution_cutscene
+	thumb_func_end EvolutionScene
 
 	thumb_func_start sub_813DD7C
 sub_813DD7C: @ 813DD7C
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 4eb080b13..a881d4589 100755
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -13868,7 +13868,7 @@ sub_81B7810: @ 81B7810
 	adds r0, r7, 0
 	adds r1, r4, 0
 	movs r2, 0x1
-	bl sub_813DA40
+	bl BeginEvolutionScene
 	adds r0, r5, 0
 	bl DestroyTask
 	b _081B786E
diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s
index 5dc6452e9..49b205967 100644
--- a/asm/pokemon_item_effect.s
+++ b/asm/pokemon_item_effect.s
@@ -221,7 +221,7 @@ _0806BEE0:
 	mov r0, r8
 	movs r2, 0
 	ldr r3, [sp, 0x10]
-	bl sub_813DA40
+	bl BeginEvolutionScene
 	movs r0, 0
 	bl _0806CD5C
 _0806BEF0:
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 0b797feef..faa945bdd 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -45,34 +45,34 @@ gUnknown_082DA7C4:: @ 82DA7C4
 gUnknown_082DA7CD:: @ 82DA7CD
 	.incbin "baserom.gba", 0x2da7cd, 0x160
 
-gUnknown_082DA92D:: @ 82DA92D
+BattleScript_LocalTrainerBattleWon:: @ 82DA92D
 	.incbin "baserom.gba", 0x2da92d, 0x3d
 
-gUnknown_082DA96A:: @ 82DA96A
+BattleScript_PayDayMoneyAndPickUpItems:: @ 82DA96A
 	.incbin "baserom.gba", 0x2da96a, 0x3
 
-gUnknown_082DA96D:: @ 82DA96D
+BattleScript_LocalBattleLost:: @ 82DA96D
 	.incbin "baserom.gba", 0x2da96d, 0x9e
 
 gUnknown_082DAA0B:: @ 82DAA0B
 	.incbin "baserom.gba", 0x2daa0b, 0x2a
 
-gUnknown_082DAA35:: @ 82DAA35
+BattleScript_LinkBattleWonOrLost:: @ 82DAA35
 	.incbin "baserom.gba", 0x2daa35, 0x52
 
-gUnknown_082DAA87:: @ 82DAA87
+BattleScript_FrontierTrainerBattleWon:: @ 82DAA87
 	.incbin "baserom.gba", 0x2daa87, 0x54
 
-gUnknown_082DAADB:: @ 82DAADB
+BattleScript_SmokeBallEscape:: @ 82DAADB
 	.incbin "baserom.gba", 0x2daadb, 0xe
 
-gUnknown_082DAAE9:: @ 82DAAE9
+BattleScript_RanAwayUsingMonAbility:: @ 82DAAE9
 	.incbin "baserom.gba", 0x2daae9, 0x7
 
-gUnknown_082DAAF0:: @ 82DAAF0
+BattleScript_GotAwaySafely:: @ 82DAAF0
 	.incbin "baserom.gba", 0x2daaf0, 0x7
 
-gUnknown_082DAAF7:: @ 82DAAF7
+BattleScript_WildMonFled:: @ 82DAAF7
 	.incbin "baserom.gba", 0x2daaf7, 0x7
 
 gUnknown_082DAAFE:: @ 82DAAFE
@@ -87,7 +87,7 @@ gUnknown_082DAB0B:: @ 82DAB0B
 gUnknown_082DAB11:: @ 82DAB11
 	.incbin "baserom.gba", 0x2dab11, 0x4
 
-gUnknown_082DAB15:: @ 82DAB15
+BattleScript_ActionSwitch:: @ 82DAB15
 	.incbin "baserom.gba", 0x2dab15, 0xa4
 
 BattleScript_Pausex20:: @ 82DABB9
@@ -255,7 +255,7 @@ BattleScript_OneHitKOMsg:: @ 82DB1CE
 BattleScript_SAtkDown2:: @ 82DB1D5
 	.incbin "baserom.gba", 0x2db1d5, 0x2a
 
-gUnknown_082DB1FF:: @ 82DB1FF
+BattleScript_FocusPunchSetUp:: @ 82DB1FF
 	.incbin "baserom.gba", 0x2db1ff, 0x14
 
 BattleScript_MoveUsedIsAsleep:: @ 82DB213
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index adabccb88..985c09b23 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -4,7 +4,7 @@
 	.section script_data, "aw", %progbits
 
 	.align 2
-gUnknown_082DBD08:: @ 82DBD08
+gBattlescriptsForBallThrow:: @ 82DBD08
 	.4byte gUnknown_082DBD68
 	.4byte gUnknown_082DBD68
 	.4byte gUnknown_082DBD68
@@ -29,8 +29,8 @@ gUnknown_082DBD3C:: @ 82DBD3C
 	.4byte gUnknown_082DBE91
 
 	.align 2
-gUnknown_082DBD54:: @ 82DBD54
-	.4byte gUnknown_082DBEB3
+gBattlescriptsForRunningByItem:: @ 82DBD54
+	.4byte BattleScript_RunByUsingItem
 
 	.align 2
 gUnknown_082DBD58:: @ 82DBD58
@@ -72,7 +72,7 @@ gUnknown_082DBE6F:: @ 82DBE6F
 gUnknown_082DBE91:: @ 82DBE91
 	.incbin "baserom.gba", 0x2dbe91, 0x22
 
-gUnknown_082DBEB3:: @ 82DBEB3
+BattleScript_RunByUsingItem:: @ 82DBEB3
 	.incbin "baserom.gba", 0x2dbeb3, 0xA
 
 gUnknown_082DBEBD:: @ 82DBEBD
diff --git a/data/data2b.s b/data/data2b.s
index 96d56c820..717b70d4d 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -226,10 +226,10 @@ gTrainerMoneyTable:: @ 831AEB8
 @ 831BAD4
 	.include "data/text/ability_description_pointers.inc"
 
-gUnknown_0831BC0C:: @ 831BC0C
+gTurnActionsFuncsTable:: @ 831BC0C
 	.incbin "baserom.gba", 0x31bc0c, 0x38
 
-gUnknown_0831BC44:: @ 831BC44
+gEndTurnFuncsTable:: @ 831BC44
 	.incbin "baserom.gba", 0x31bc44, 0x2c
 
 gStatusConditionString_PoisonJpn:: @ 831BC70
diff --git a/include/battle.h b/include/battle.h
index 7c8d89e57..639558e60 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -56,6 +56,7 @@
 #define BATTLE_TYPE_RAYQUAZA        0x40000000
 #define BATTLE_TYPE_x80000000       0x80000000
 
+#define TRAINER_OPPONENT_3FE        0x3FE
 #define TRAINER_OPPONENT_C00        0xC00
 #define TRAINER_OPPONENT_800        0x800
 #define STEVEN_PARTNER_ID           0xC03
@@ -71,8 +72,11 @@
 #define BATTLE_PLAYER_TELEPORTED    0x5
 #define BATTLE_POKE_FLED            0x6
 #define BATTLE_CAUGHT               0x7
+#define BATTLE_FORFEITED            0x9
 #define BATTLE_OPPONENT_TELEPORTED  0xA
 
+#define BATTLE_OUTCOME_BIT_x80      0x80
+
 #define STATUS_SLEEP            0x7
 #define STATUS_POISON           0x8
 #define STATUS_BURN             0x10
@@ -171,8 +175,10 @@
 #define ACTION_GO_NEAR              7
 #define ACTION_SAFARI_ZONE_RUN      8
 #define ACTION_9                    9
-#define ACTION_CANCEL_PARTNER       12
-#define ACTION_NOTHING_FAINTED      13
+#define ACTION_RUN_BATTLESCRIPT     10 // when executing an action
+#define ACTION_CANCEL_PARTNER       12 // when choosing an action
+#define ACTION_FINISHED             12 // when executing an action
+#define ACTION_NOTHING_FAINTED      13 // when choosing an action
 #define ACTION_INIT_VALUE           0xFF
 
 #define ABILITYEFFECT_ON_SWITCHIN               0x0
@@ -559,22 +565,19 @@ struct BattleResults
     u8 playerSwitchesCounter; // 0x2
     u8 unk3;                  // 0x3
     u8 unk4;                  // 0x4
-    u8 unk5_0:1;              // 0x5
-    u8 unk5_1:1;              // 0x5
-    u8 caughtMonBall:4;       // 0x5
-    u8 unk5_6:1;              // 0x5
-    u8 unk5_7:1;              // 0x5
-    u16 poke1Species;         // 0x6
-    u8 pokeString1[10];       // 0x8
-    u8 unk12;
+    u8 unk5_0:1;              // 0x5 , 0x1
+    u8 unk5_1:1;              // 0x5 , 0x2
+    u8 caughtMonBall:4;       // 0x5 , 0x4/0x8/0x10/0x20
+    u8 unk5_6:1;              // 0x5 , 0x40
+    u8 unk5_7:1;              // 0x5 , 0x80
+    u16 playerMon1Species;    // 0x6
+    u8 playerMon1Name[11];    // 0x8
     u8 battleTurnCounter;     // 0x13
-    u8 pokeString2[10];       // 0x14
-    u8 field_1E;              // 0x1E
-    u8 field_1F;              // 0x1F
+    u8 playerMon2Name[11];    // 0x14
     u16 lastOpponentSpecies;  // 0x20
-    u16 lastUsedMove;         // 0x22
-    u16 opponentMove;         // 0x24
-    u16 opponentSpecies;      // 0x26
+    u16 lastUsedMovePlayer;   // 0x22
+    u16 lastUsedMoveOpponent; // 0x24
+    u16 playerMon2Species;    // 0x26
     u16 caughtMonSpecies;     // 0x28
     u8 caughtMonNick[10];     // 0x2A
     u8 filler34[2];
@@ -605,7 +608,7 @@ struct BattleStruct
     u8 field_45;
     u8 field_46;
     u8 field_47;
-    u8 field_48;
+    u8 focusPunchBank;
     u8 field_49;
     u8 moneyMultiplier;
     u8 field_4B;
@@ -620,7 +623,7 @@ struct BattleStruct
     u8 field_58[4];
     u8 field_5C[4];
     u8 field_60[4][3];
-    u8 field_6C;
+    u8 runTries;
     u8 caughtMonNick[11];
     u8 field_78;
     u8 field_79;
@@ -630,7 +633,7 @@ struct BattleStruct
     u8 field_7D;
     u8 field_7E;
     u8 formToChangeInto;
-    u8 chosenMovesIds[BATTLE_BANKS_COUNT];
+    u8 chosenMovePositions[BATTLE_BANKS_COUNT];
     u8 stateIdAfterSelScript[BATTLE_BANKS_COUNT];
     u8 field_88;
     u8 field_89;
@@ -665,7 +668,9 @@ struct BattleStruct
     u8 field_B3;
     void (*savedCallback)(void);
     u16 usedHeldItems[BATTLE_BANKS_COUNT];
-    u8 field_C0[8];
+    u8 field_C0[4];
+    u8 field_C4[2];
+    u8 field_C6[2];
     u16 choicedMove[BATTLE_BANKS_COUNT];
     u16 changedItems[BATTLE_BANKS_COUNT];
     u8 intimidateBank;
@@ -818,6 +823,7 @@ extern struct BattleStruct* gBattleStruct;
 
 #define VARIOUS_CANCEL_MULTI_TURN_MOVES         0
 #define VARIOUS_SET_MAGIC_COAT_TARGET           1
+#define VARIOUS_CAN_RUN_FROM_BATTLE             2
 #define VARIOUS_GET_MOVE_TARGET                 3
 #define VARIOUS_RESET_INTIMIDATE_TRACE_BITS     5
 #define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP    6
@@ -901,13 +907,15 @@ void sub_803FA70(u8 bank);
 void BattleMainCB2(void);
 void VBlankCB_Battle(void);
 void ResetSentPokesToOpponentValue(void);
-bool8 CanRunFromBattle(u8 bank);
+bool8 TryRunFromBattle(u8 bank);
 bool8 IsRunningFromBattleImpossible(void);
 void PressurePPLoseOnUsingPerishSong(u8 bankAtk);
 void PressurePPLoseOnUsingImprision(u8 bankAtk);
 u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves);
 void SwapTurnOrder(u8, u8);
 void BattleTurnPassed(void);
+void RunBattleScriptCommands_PopCallbacksStack(void);
+void RunBattleScriptCommands(void);
 
 // battle_3
 #define MOVE_LIMITATION_ZEROMOVE    (1 << 0)
@@ -928,7 +936,7 @@ u8 UpdateTurnCounters(void);
 u8 TurnBasedEffects(void);
 bool8 sub_8041364(void);
 bool8 sub_8041728(void);
-void b_clear_atk_up_if_hit_flag_unless_enraged(void);
+void TryClearRageStatuses(void);
 u8 AtkCanceller_UnableToUseMove(void);
 bool8 sub_80423F4(u8 bank, u8 r1, u8 r2);
 u8 CastformDataTypeChange(u8 bank);
@@ -936,7 +944,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
 void BattleScriptExecute(const u8* BS_ptr);
 void BattleScriptPushCursorAndCallback(const u8* BS_ptr);
 u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn);
-void sub_8045868(u8 bank);
+void ClearFuryCutterDestinyBondGrudge(u8 bank);
 void sub_80458B4(void);
 u8 GetMoveTarget(u16 move, u8 useMoveTarget);
 u8 IsPokeDisobedient(void);
diff --git a/include/evolution_scene.h b/include/evolution_scene.h
new file mode 100644
index 000000000..48bd6ebe1
--- /dev/null
+++ b/include/evolution_scene.h
@@ -0,0 +1,10 @@
+#ifndef GUARD_EVOLUTION_SCENE_H
+#define GUARD_EVOLUTION_SCENE_H
+
+void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID);
+void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID);
+void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID);
+
+extern void (*gCB2_AfterEvolution)(void);
+
+#endif // GUARD_EVOLUTION_SCENE_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 5d97c1666..c41099b09 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -634,6 +634,12 @@ bool16 sub_806D82C(u8 id);
 u16 MonTryLearningNewMove(struct Pokemon* mon, bool8);
 void sub_8068AA4(void); // sets stats for deoxys
 bool8 HasTwoFramesAnimation(u16 species);
+u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem);
+void RandomlyGivePartyPokerus(struct Pokemon *party);
+u8 CheckPartyPokerus(struct Pokemon *party, u8 selection);
+u8 CheckPartyHasHadPokerus(struct Pokemon *party, u8 selection);
+void UpdatePartyPokerusTime(u16 days);
+void PartySpreadPokerus(struct Pokemon *party);
 
 #include "sprite.h"
 
diff --git a/include/recorded_battle.h b/include/recorded_battle.h
index 2df1620e4..65ad998e6 100644
--- a/include/recorded_battle.h
+++ b/include/recorded_battle.h
@@ -14,5 +14,6 @@ u8 sub_8185FB8(void);
 u8 MoveRecordedBattleToSaveData(void);
 void sub_818603C(u8);
 void sub_8185FD0(void);
+void sub_8186444(void);
 
 #endif // GUARD_RECORDED_BATTLE_H
diff --git a/include/songs.h b/include/songs.h
index d828e4068..5a1fff00c 100644
--- a/include/songs.h
+++ b/include/songs.h
@@ -252,23 +252,23 @@ enum
     SE_W114,
     SE_W063B,
     BGM_STOP = 349,
-    BGM_TETSUJI,
-    BGM_FIELD13,
-    BGM_KACHI22,
-    BGM_KACHI2,
-    BGM_KACHI3,
-    BGM_KACHI5,
-    BGM_PCC,
-    BGM_NIBI,
-    BGM_SUIKUN,
-    BGM_DOORO1,
-    BGM_DOORO_X1,
-    BGM_DOORO_X3,
-    BGM_MACHI_S2,
-    BGM_MACHI_S4,
-    BGM_GIM,
-    BGM_NAMINORI,
-    BGM_DAN01,
+    /*0x15E*/ BGM_TETSUJI,
+    /*0x15F*/ BGM_FIELD13,
+    /*0x160*/ BGM_KACHI22,
+    /*0x161*/ BGM_KACHI2,
+    /*0x162*/ BGM_KACHI3,
+    /*0x163*/ BGM_KACHI5,
+    /*0x164*/ BGM_PCC,
+    /*0x165*/ BGM_NIBI,
+    /*0x166*/ BGM_SUIKUN,
+    /*0x167*/ BGM_DOORO1,
+    /*0x168*/ BGM_DOORO_X1,
+    /*0x169*/ BGM_DOORO_X3,
+    /*0x16A*/ BGM_MACHI_S2,
+    /*0x16B*/ BGM_MACHI_S4,
+    /*0x16C*/ BGM_GIM,
+    /*0x16D*/ BGM_NAMINORI,
+    /*0x16E*/ BGM_DAN01,
     /*0x16F*/ BGM_FANFA1,
     /*0x170*/ BGM_ME_ASA,
     /*0x171*/ BGM_ME_BACHI,
@@ -306,31 +306,31 @@ enum
     /*0x191*/ BGM_NEXTROAD,
     /*0x192*/ BGM_GRANROAD,
     /*0x193*/ BGM_CYCLING,
-    BGM_FRIENDLY,
-    BGM_MISHIRO,
-    BGM_TOZAN,
-    BGM_GIRLEYE,
-    BGM_MINAMO,
-    BGM_ASHROAD,
-    BGM_EVENT0,
-    BGM_DEEPDEEP,
-    BGM_KACHI1,
-    BGM_TITLE3,
-    BGM_DEMO1,
-    BGM_GIRL_SUP,
-    BGM_HAGESHII,
-    BGM_KAKKOII,
-    BGM_KAZANBAI,
-    BGM_AQA_0,
-    BGM_TSURETEK,
-    BGM_BOY_SUP,
-    BGM_RAINBOW,
-    BGM_AYASII,
-    BGM_KACHI4,
-    BGM_ROPEWAY,
-    BGM_CASINO,
-    BGM_HIGHTOWN,
-    BGM_SAFARI,
+    /*0x194*/ BGM_FRIENDLY,
+    /*0x195*/ BGM_MISHIRO,
+    /*0x196*/ BGM_TOZAN,
+    /*0x197*/ BGM_GIRLEYE,
+    /*0x198*/ BGM_MINAMO,
+    /*0x199*/ BGM_ASHROAD,
+    /*0x19A*/ BGM_EVENT0,
+    /*0x19B*/ BGM_DEEPDEEP,
+    /*0x19C*/ BGM_KACHI1,
+    /*0x19D*/ BGM_TITLE3,
+    /*0x19E*/ BGM_DEMO1,
+    /*0x19F*/ BGM_GIRL_SUP,
+    /*0x1A0*/ BGM_HAGESHII,
+    /*0x1A1*/ BGM_KAKKOII,
+    /*0x1A2*/ BGM_KAZANBAI,
+    /*0x1A3*/ BGM_AQA_0,
+    /*0x1A4*/ BGM_TSURETEK,
+    /*0x1A5*/ BGM_BOY_SUP,
+    /*0x1A6*/ BGM_RAINBOW,
+    /*0x1A7*/ BGM_AYASII,
+    /*0x1A8*/ BGM_KACHI4,
+    /*0x1A9*/ BGM_ROPEWAY,
+    /*0x1AA*/ BGM_CASINO,
+    /*0x1AB*/ BGM_HIGHTOWN,
+    /*0x1AC*/ BGM_SAFARI,
     BGM_C_ROAD,
     BGM_AJITO,
     BGM_M_BOAT,
diff --git a/src/battle_2.c b/src/battle_2.c
index 04907d0c0..ab1aae747 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -37,6 +37,9 @@
 #include "pokedex.h"
 #include "abilities.h"
 #include "moves.h"
+#include "trainer_classes.h"
+#include "evolution_scene.h"
+#include "roamer.h"
 
 struct UnknownStruct6
 {
@@ -80,6 +83,7 @@ extern u16 gTrainerBattleOpponent_B;
 extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
 extern void (*gPreBattleCallback1)(void);
 extern void (*gBattleMainFunc)(void);
+extern void (*gUnknown_030061E8)(void);
 extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for?
 extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for?
 extern u8 gBattleOutcome;
@@ -131,13 +135,20 @@ 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 gFightStateTracker;
+extern u8 gCurrentActionFuncId;
 extern u8 gLastUsedAbility;
 extern u16 gLastUsedItem;
 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;
+extern u8 gCritMultiplier;
+extern u8 gCurrMovePos;
+extern u8 gUnknown_020241E9;
+extern u16 gLastUsedMove;
 
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 extern const struct BattleMove gBattleMoves[];
@@ -145,6 +156,7 @@ extern const u16 gUnknown_08C004E0[]; // 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];
 
 // strings
 extern const u8 gText_LinkStandby3[];
@@ -163,7 +175,23 @@ 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[];
 
+// functions
 extern void HandleLinkBattleSetup(void); // rom_3
 extern void SetUpBattleVarsAndBirchZigzagoon(void); // rom_3
 extern void sub_8032768(void); // rom_3
@@ -179,8 +207,13 @@ extern void sub_80B3AF8(u8 taskId); // cable club
 extern void sub_8076918(u8 bank);
 extern void sub_80729D0(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 void sub_80EC728(void); // tv
+extern void sub_80EE184(void); // tv
+extern bool8 InBattlePyramid(void);
 
 // this file's functions
 static void CB2_InitBattleInternal(void);
@@ -209,7 +242,7 @@ void sub_8039E9C(struct Sprite *sprite);
 void SpriteCallbackDummy_3(struct Sprite *sprite);
 void oac_poke_ally_(struct Sprite *sprite);
 void SpecialStatusesClear(void);
-void TurnValuesCleanUp(u8);
+void TurnValuesCleanUp(bool8 var0);
 static void SpriteCB_HealthBoxBounce(struct Sprite *sprite);
 static void BattleStartClearSetData(void);
 static void BattleIntroGetMonsData(void);
@@ -226,11 +259,16 @@ static void BattleIntroRecordMonsToDex(void);
 static void BattleIntroPlayer1SendsOutMonAnimation(void);
 static void TryDoEventsBeforeFirstTurn(void);
 void HandleTurnActionSelectionState(void);
-void bc_bs_exec(void);
+static void RunTurnActionsFunctions(void);
 static void SetActionsAndBanksTurnOrder(void);
 void sub_803CDF8(void);
 bool8 sub_803CDB8(void);
-void bc_80154A0(void);
+static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void);
+void HandleEndTurn_FinishBattle(void);
+static void FreeResetData_ReturnToOvOrDoEvolutions(void);
+static void ReturnFromBattleToOverworld(void);
+static void TryEvolvePokemon(void);
+static void WaitForEvoSceneToFinish(void);
 
 void CB2_InitBattle(void)
 {
@@ -2645,7 +2683,7 @@ static void BattleStartClearSetData(void)
     u32 j;
     u8 *dataPtr;
 
-    TurnValuesCleanUp(0);
+    TurnValuesCleanUp(FALSE);
     SpecialStatusesClear();
 
     for (i = 0; i < BATTLE_BANKS_COUNT; i++)
@@ -2715,7 +2753,7 @@ static void BattleStartClearSetData(void)
     gBattleScripting.animTargetsHit = 0;
     gLeveledUpInBattle = 0;
     gAbsentBankFlags = 0;
-    gBattleStruct->field_6C = 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;
@@ -3568,7 +3606,7 @@ static void TryDoEventsBeforeFirstTurn(void)
         gActionForBanks[i] = ACTION_INIT_VALUE;
         gChosenMovesByBanks[i] = MOVE_NONE;
     }
-    TurnValuesCleanUp(0);
+    TurnValuesCleanUp(FALSE);
     SpecialStatusesClear();
     *(&gBattleStruct->field_91) = gAbsentBankFlags;
     sub_814F9EC(gText_EmptyString3, 0);
@@ -3627,7 +3665,7 @@ void BattleTurnPassed(void)
 {
     s32 i;
 
-    TurnValuesCleanUp(1);
+    TurnValuesCleanUp(TRUE);
     if (gBattleOutcome == 0)
     {
         if (UpdateTurnCounters() != 0)
@@ -3641,7 +3679,7 @@ void BattleTurnPassed(void)
     if (sub_8041364() != 0)
         return;
 
-    TurnValuesCleanUp(0);
+    TurnValuesCleanUp(FALSE);
     gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING);
     gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE);
     gHitMarker &= ~(HITMARKER_x400000);
@@ -3657,8 +3695,8 @@ void BattleTurnPassed(void)
 
     if (gBattleOutcome != 0)
     {
-        gFightStateTracker = 12;
-        gBattleMainFunc = bc_bs_exec;
+        gCurrentActionFuncId = 12;
+        gBattleMainFunc = RunTurnActionsFunctions;
         return;
     }
 
@@ -3862,7 +3900,7 @@ void HandleTurnActionSelectionState(void)
                     else if (gDisableStructs[gActiveBank].encoredMove != 0)
                     {
                         gChosenMovesByBanks[gActiveBank] = gDisableStructs[gActiveBank].encoredMove;
-                        *(gBattleStruct->chosenMovesIds + gActiveBank) = gDisableStructs[gActiveBank].encoredMovePos;
+                        *(gBattleStruct->chosenMovePositions + gActiveBank) = gDisableStructs[gActiveBank].encoredMovePos;
                         gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                         return;
                     }
@@ -4067,8 +4105,8 @@ void HandleTurnActionSelectionState(void)
                                 RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][2]);
                                 RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][3]);
                             }
-                            *(gBattleStruct->chosenMovesIds + gActiveBank) = gBattleBufferB[gActiveBank][2];
-                            gChosenMovesByBanks[gActiveBank] = gBattleMons[gActiveBank].moves[*(gBattleStruct->chosenMovesIds + gActiveBank)];
+                            *(gBattleStruct->chosenMovePositions + gActiveBank) = gBattleBufferB[gActiveBank][2];
+                            gChosenMovesByBanks[gActiveBank] = gBattleMons[gActiveBank].moves[*(gBattleStruct->chosenMovePositions + gActiveBank)];
                             *(gBattleStruct->moveTarget + gActiveBank) = gBattleBufferB[gActiveBank][3];
                             gBattleCommunication[gActiveBank]++;
                         }
@@ -4257,8 +4295,6 @@ void sub_803CDF8(void)
     }
 }
 
-extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT];
-
 void SwapTurnOrder(u8 id1, u8 id2)
 {
     u32 temp = gActionsByTurnOrder[id1];
@@ -4270,8 +4306,6 @@ void SwapTurnOrder(u8 id1, u8 id2)
     gBanksByTurnOrder[id2] = temp;
 }
 
-extern const u8 gStatStageRatios[][2];
-
 u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
 {
     u8 strikesFirst = 0;
@@ -4379,7 +4413,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
             if (gProtectStructs[bank1].onlyStruggle)
                 moveBank1 = MOVE_STRUGGLE;
             else
-                moveBank1 = gBattleMons[bank1].moves[*(gBattleStruct->chosenMovesIds + bank1)];
+                moveBank1 = gBattleMons[bank1].moves[*(gBattleStruct->chosenMovePositions + bank1)];
         }
         else
             moveBank1 = MOVE_NONE;
@@ -4389,7 +4423,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
             if (gProtectStructs[bank2].onlyStruggle)
                 moveBank2 = MOVE_STRUGGLE;
             else
-                moveBank2 = gBattleMons[bank2].moves[*(gBattleStruct->chosenMovesIds + bank2)];
+                moveBank2 = gBattleMons[bank2].moves[*(gBattleStruct->chosenMovePositions + bank2)];
         }
         else
             moveBank2 = MOVE_NONE;
@@ -4482,8 +4516,8 @@ static void SetActionsAndBanksTurnOrder(void)
                     var++;
                 }
             }
-            gBattleMainFunc = bc_80154A0;
-            gBattleStruct->field_48 = 0;
+            gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
+            gBattleStruct->focusPunchBank = 0;
             return;
         }
         else
@@ -4524,6 +4558,820 @@ static void SetActionsAndBanksTurnOrder(void)
             }
         }
     }
-    gBattleMainFunc = bc_80154A0;
-    gBattleStruct->field_48 = 0;
+    gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
+    gBattleStruct->focusPunchBank = 0;
+}
+
+void TurnValuesCleanUp(bool8 var0)
+{
+    s32 i;
+    u8 *dataPtr;
+
+    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; 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;
+}
+
+void SpecialStatusesClear(void)
+{
+    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; 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_x8000))
+    {
+        while (gBattleStruct->focusPunchBank < gNoOfAllBanks)
+        {
+            gActiveBank = gBankAttacker = gBattleStruct->focusPunchBank;
+            gBattleStruct->focusPunchBank++;
+            if (gChosenMovesByBanks[gActiveBank] == MOVE_FOCUS_PUNCH
+                && !(gBattleMons[gActiveBank].status1 & STATUS_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.field_16 = 0;
+    gBattleResources->battleScriptsStack->size = 0;
+}
+
+extern void (* const gTurnActionsFuncsTable[])(void);
+extern void (* const gEndTurnFuncsTable[])(void);
+
+static void RunTurnActionsFunctions(void)
+{
+    if (gBattleOutcome != 0)
+        gCurrentActionFuncId = 12;
+
+    *(&gBattleStruct->field_4B) = gCurrentTurnActionNumber;
+    gTurnActionsFuncsTable[gCurrentActionFuncId]();
+
+    if (gCurrentTurnActionNumber >= gNoOfAllBanks) // everyone did their actions, turn finished
+    {
+        gHitMarker &= ~(HITMARKER_x100000);
+        gBattleMainFunc = gEndTurnFuncsTable[gBattleOutcome & 0x7F];
+    }
+    else
+    {
+        if (gBattleStruct->field_4B != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another bank
+        {
+            gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING);
+            gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE);
+        }
+    }
+}
+
+void HandleEndTurn_BattleWon(void)
+{
+    gCurrentActionFuncId = 0;
+
+    if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
+    {
+        gScriptResult = gBattleOutcome;
+        gBattleTextBuff1[0] = gBattleOutcome;
+        gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+        gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
+        gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
+            && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000 | BATTLE_TYPE_EREADER_TRAINER))
+    {
+        BattleMusicStop();
+        gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon;
+
+        if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE)
+            PlayBGM(BGM_KACHI3);
+        else
+            PlayBGM(BGM_KACHI1);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
+    {
+        BattleMusicStop();
+        gBattlescriptCurrInstr = BattleScript_LocalTrainerBattleWon;
+
+        switch (gTrainers[gTrainerBattleOpponent_A].trainerClass)
+        {
+        case CLASS_ELITE_FOUR:
+        case 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:
+            PlayBGM(BGM_KACHI4);
+            break;
+        case CLASS_LEADER:
+            PlayBGM(BGM_KACHI3);
+            break;
+        default:
+            PlayBGM(BGM_KACHI1);
+            break;
+        }
+    }
+    else
+    {
+        gBattlescriptCurrInstr = BattleScript_PayDayMoneyAndPickUpItems;
+    }
+
+    gBattleMainFunc = HandleEndTurn_FinishBattle;
+}
+
+void HandleEndTurn_BattleLost(void)
+{
+    gCurrentActionFuncId = 0;
+
+    if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
+        {
+            if (gBattleOutcome & BATTLE_OUTCOME_BIT_x80)
+            {
+                gBattlescriptCurrInstr = gUnknown_082DB9C8;
+                gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
+                gSaveBlock2Ptr->field_CA9_b = 1;
+            }
+            else
+            {
+                gBattlescriptCurrInstr = gUnknown_082DAA0B;
+                gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
+            }
+        }
+        else
+        {
+            gBattleTextBuff1[0] = gBattleOutcome;
+            gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+            gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
+            gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
+        }
+    }
+    else
+    {
+        gBattlescriptCurrInstr = BattleScript_LocalBattleLost;
+    }
+
+    gBattleMainFunc = HandleEndTurn_FinishBattle;
+}
+
+void HandleEndTurn_RanFromBattle(void)
+{
+    gCurrentActionFuncId = 0;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER && gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+    {
+        gBattlescriptCurrInstr = gUnknown_082DB9C1;
+        gBattleOutcome = BATTLE_FORFEITED;
+        gSaveBlock2Ptr->field_CA9_b = 1;
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_x4000000)
+    {
+        gBattlescriptCurrInstr = gUnknown_082DB9C1;
+        gBattleOutcome = BATTLE_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;
+}
+
+void HandleEndTurn_MonFled(void)
+{
+    gCurrentActionFuncId = 0;
+
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, gBattlePartyID[gBankAttacker]);
+    gBattlescriptCurrInstr = BattleScript_WildMonFled;
+
+    gBattleMainFunc = HandleEndTurn_FinishBattle;
+}
+
+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 < gNoOfAllBanks; 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);
+                    }
+                }
+            }
+            sub_80EC728();
+        }
+
+        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;
+        gUnknown_030061E8 = BattleMainCB2;
+    }
+    else
+    {
+        if (gBattleExecBuffer == 0)
+            gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
+    }
+}
+
+static void FreeResetData_ReturnToOvOrDoEvolutions(void)
+{
+    if (!gPaletteFade.active)
+    {
+        ResetSpriteData();
+        if (gLeveledUpInBattle == 0 || gBattleOutcome != BATTLE_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;
+
+    gScriptResult = gBattleOutcome;
+    gMain.inBattle = 0;
+    gMain.callback1 = gPreBattleCallback1;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_ROAMER)
+    {
+        UpdateRoamerHPStatus(&gEnemyParty[0]);
+        if ((gBattleOutcome & BATTLE_WON) || gBattleOutcome == BATTLE_CAUGHT)
+            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]]();
+}
+
+extern const u8 * const gBattleScriptsForMoveEffects[];
+
+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;
+    gBattleMoveFlags = 0;
+    gMultiHitCounter = 0;
+    gBattleCommunication[6] = 0;
+    gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBankAttacker);
+
+    // choose move
+    if (gProtectStructs[gBankAttacker].onlyStruggle)
+    {
+        gProtectStructs[gBankAttacker].onlyStruggle = 0;
+        gCurrentMove = gLastUsedMove = 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];
+    }
+    // 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;
+        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 = gLastUsedMove = 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 = gLastUsedMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
+    }
+    else
+    {
+        gCurrentMove = gLastUsedMove = 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)
+    {
+        gBankTarget = 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 < gNoOfAllBanks; 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[gLastUsedMove].target & MOVE_TARGET_RANDOM)
+            {
+                if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+                {
+                    if (Random() & 1)
+                        gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+                    else
+                        gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+                }
+                else
+                {
+                    if (Random() & 1)
+                        gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+                    else
+                        gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+                }
+            }
+            else
+            {
+                gBankTarget = *(gBattleStruct->moveTarget + gBankAttacker);
+            }
+
+            if (gAbsentBankFlags & gBitTable[gBankTarget])
+            {
+                if (GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
+                {
+                    gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+                }
+                else
+                {
+                    gBankTarget = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_SIDE);
+                    if (gAbsentBankFlags & gBitTable[gBankTarget])
+                        gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+                }
+            }
+        }
+        else
+        {
+            gActiveBank = gBanksByTurnOrder[var];
+            RecordAbilityBattle(gActiveBank, gBattleMons[gActiveBank].ability);
+            gSpecialStatuses[gActiveBank].lightningRodRedirected = 1;
+            gBankTarget = gActiveBank;
+        }
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
+             && gBattleMoves[gLastUsedMove].target & MOVE_TARGET_RANDOM)
+    {
+        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+        {
+            if (Random() & 1)
+                gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+            else
+                gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+        }
+        else
+        {
+            if (Random() & 1)
+                gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+            else
+                gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+        }
+
+        if (gAbsentBankFlags & gBitTable[gBankTarget]
+            && GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
+        {
+            gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+        }
+    }
+    else
+    {
+        gBankTarget = *(gBattleStruct->moveTarget + gBankAttacker);
+        if (gAbsentBankFlags & gBitTable[gBankTarget])
+        {
+            if (GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
+            {
+                gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+            }
+            else
+            {
+                gBankTarget = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_SIDE);
+                if (gAbsentBankFlags & gBitTable[gBankTarget])
+                    gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+            }
+        }
+    }
+
+    // choose battlescript
+    if (gBattleTypeFlags & BATTLE_TYPE_PALACE
+        && gProtectStructs[gBankAttacker].flag_x10)
+    {
+        if (gBattleMons[gBankAttacker].hp == 0)
+        {
+            gCurrentActionFuncId = 12;
+            return;
+        }
+        else if (gUnknown_02024230[gBankAttacker] != NULL)
+        {
+            gBattleCommunication[MULTISTRING_CHOOSER] = 4;
+            gBattlescriptCurrInstr = gUnknown_02024230[gBankAttacker];
+            gUnknown_02024230[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;
+}
+
+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++;
+}
+
+extern const u8 * const gBattlescriptsForBallThrow[];
+extern const u8 * const gBattlescriptsForRunningByItem[];
+extern const u8 * const gUnknown_082DBD3C[];
+
+void HandleAction_UseItem(void)
+{
+    gBankAttacker = gBankTarget = 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 = gUnknown_082DBD3C[0];
+    }
+    else
+    {
+        gBattleScripting.bank = gBankAttacker;
+
+        switch (*(gBattleStruct->field_C4 + (gBankAttacker >> 1)))
+        {
+        case 1:
+        case 2:
+            break;
+        case 3:
+            gBattleCommunication[MULTISTRING_CHOOSER] = 0;
+            if (*(gBattleStruct->field_C6 + gBankAttacker / 2) & 1)
+            {
+                if (*(gBattleStruct->field_C6 + gBankAttacker / 2) & 0x3E)
+                    gBattleCommunication[MULTISTRING_CHOOSER] = 5;
+            }
+            else
+            {
+                while (!(*(gBattleStruct->field_C6 + gBankAttacker / 2) & 1))
+                {
+                    *(gBattleStruct->field_C6 + gBankAttacker / 2) >>= 1;
+                    gBattleCommunication[MULTISTRING_CHOOSER]++;
+                }
+            }
+            break;
+        case 4:
+            gBattleCommunication[MULTISTRING_CHOOSER] = 4;
+            if (*(gBattleStruct->field_C6 + (gBankAttacker >> 1)) & 0x80)
+            {
+                gBattleCommunication[MULTISTRING_CHOOSER] = 5;
+            }
+            else
+            {
+                PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK)
+                PREPARE_STRING_BUFFER(gBattleTextBuff2, 0xD2)
+
+                while (!((*(gBattleStruct->field_C6 + (gBankAttacker >> 1))) & 1))
+                {
+                    *(gBattleStruct->field_C6 + gBankAttacker / 2) >>= 1;
+                    gBattleTextBuff1[2]++;
+                }
+
+                gBattleScripting.animArg1 = gBattleTextBuff1[2] + 14;
+                gBattleScripting.animArg2 = 0;
+            }
+            break;
+        case 5:
+            if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
+                gBattleCommunication[MULTISTRING_CHOOSER] = 2;
+            else
+                gBattleCommunication[MULTISTRING_CHOOSER] = 0;
+            break;
+        }
+
+        gBattlescriptCurrInstr = gUnknown_082DBD3C[*(gBattleStruct->field_C4 + 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 = gNoOfAllBanks;
+        gBattleOutcome = BATTLE_RAN;
+    }
+
+    return effect;
 }
diff --git a/src/battle_3.c b/src/battle_3.c
index c20d361a4..58e0a05c7 100644
--- a/src/battle_3.c
+++ b/src/battle_3.c
@@ -50,7 +50,7 @@ extern u8 gBattleMoveFlags;
 extern s32 gTakenDmg[BATTLE_BANKS_COUNT];
 extern u8 gTakenDmgBanks[BATTLE_BANKS_COUNT];
 extern u8 gLastUsedAbility;
-extern u8 gFightStateTracker;
+extern u8 gCurrentActionFuncId;
 extern u32 gBattleExecBuffer;
 extern u16 gRandomMove;
 extern u8 gCurrMovePos;
@@ -181,8 +181,6 @@ extern const u16 gSoundMovesTable[];
 extern void sub_803F9EC();
 extern bool8 sub_80423F4(u8 bank, u8, u8);
 extern u8 weather_get_current(void);
-extern void sub_803E08C(void);
-extern void bc_move_exec_returning(void);
 extern s8 GetFlavourRelationByPersonality(u32 personality, u8 flavor);
 
 void BattleScriptPush(const u8* bsPtr)
@@ -1156,7 +1154,7 @@ bool8 sub_8041728(void)
     return FALSE;
 }
 
-void b_clear_atk_up_if_hit_flag_unless_enraged(void)
+void TryClearRageStatuses(void)
 {
     int i;
     for (i = 0; i < gNoOfAllBanks; i++)
@@ -5441,8 +5439,8 @@ void BattleScriptExecute(const u8* BS_ptr)
 {
     gBattlescriptCurrInstr = BS_ptr;
     BATTLE_CALLBACKS_STACK->function[BATTLE_CALLBACKS_STACK->size++] = gBattleMainFunc;
-    gBattleMainFunc = bc_move_exec_returning;
-    gFightStateTracker = 0;
+    gBattleMainFunc = RunBattleScriptCommands_PopCallbacksStack;
+    gCurrentActionFuncId = 0;
 }
 
 void BattleScriptPushCursorAndCallback(const u8* BS_ptr)
@@ -5450,7 +5448,7 @@ void BattleScriptPushCursorAndCallback(const u8* BS_ptr)
     BattleScriptPushCursor();
     gBattlescriptCurrInstr = BS_ptr;
     BATTLE_CALLBACKS_STACK->function[BATTLE_CALLBACKS_STACK->size++] = gBattleMainFunc;
-    gBattleMainFunc = sub_803E08C;
+    gBattleMainFunc = RunBattleScriptCommands;
 }
 
 enum
@@ -5520,7 +5518,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
 
     switch (caseID)
     {
-    case 0:
+    case ITEMEFFECT_ON_SWITCH_IN:
         switch (bankHoldEffect)
         {
         case HOLD_EFFECT_DOUBLE_PRIZE:
@@ -6185,7 +6183,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
     return effect;
 }
 
-void sub_8045868(u8 bank)
+void ClearFuryCutterDestinyBondGrudge(u8 bank)
 {
     gDisableStructs[bank].furyCutterCounter = 0;
     gBattleMons[bank].status2 &= ~(STATUS2_DESTINY_BOND);
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 380f9ec40..e68137c47 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -67,7 +67,7 @@ extern u8 gBankAttacker;
 extern u8 gBankTarget;
 extern const u8* gBattlescriptCurrInstr;
 extern u8 gCurrMovePos;
-extern u8 gFightStateTracker;
+extern u8 gCurrentActionFuncId;
 extern u32 gHitMarker;
 extern u8 gBattleMoveFlags;
 extern u8 gBattleCommunication[];
@@ -92,7 +92,7 @@ extern u16 gMoveToLearn;
 extern u16 gRandomMove;
 extern u8 gBankInMenu;
 extern u8 gActionForBanks[BATTLE_BANKS_COUNT];
-extern u8 gCurrentMoveTurn;
+extern u8 gCurrentTurnActionNumber;
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern u16 gLockedMoves[BATTLE_BANKS_COUNT];
 extern u16 gPartnerTrainerId;
@@ -377,7 +377,7 @@ 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_can_run_frombattle(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);
@@ -509,8 +509,8 @@ static void atkF2_display_dex_info(void);
 static void atkF3_nickname_caught_poke(void);
 static void atkF4_subattackerhpbydmg(void);
 static void atkF5_removeattackerstatus1(void);
-static void atkF6_802BF48(void);
-static void atkF7_802BF54(void);
+static void atkF6_action_finished(void);
+static void atkF7_turn_finished(void);
 static void atkF8_trainer_slide_back(void);
 
 void (* const gBattleScriptingCommandsTable[])(void) =
@@ -629,7 +629,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atk6F_set_visible,
     atk70_record_last_used_ability,
     atk71_buffer_move_to_learn,
-    atk72_jump_if_can_run_frombattle,
+    atk72_jump_if_run_attempt_success,
     atk73_hp_thresholds,
     atk74_hp_thresholds2,
     atk75_item_effect_on_opponent,
@@ -761,8 +761,8 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atkF3_nickname_caught_poke,
     atkF4_subattackerhpbydmg,
     atkF5_removeattackerstatus1,
-    atkF6_802BF48,
-    atkF7_802BF54,
+    atkF6_action_finished,
+    atkF7_turn_finished,
     atkF8_trainer_slide_back
 };
 
@@ -1097,9 +1097,9 @@ static void atk00_attackcanceler(void)
 {
     s32 i;
 
-    if (gBattleOutcome)
+    if (gBattleOutcome != 0)
     {
-        gFightStateTracker = 0xC;
+        gCurrentActionFuncId = ACTION_FINISHED;
         return;
     }
     if (gBattleMons[gBankAttacker].hp == 0 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
@@ -2736,7 +2736,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 else
                 {
-                    if (BankGetTurnOrder(gEffectBank) > gCurrentMoveTurn)
+                    if (BankGetTurnOrder(gEffectBank) > gCurrentTurnActionNumber)
                         gBattleMons[gEffectBank].status2 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]];
                     gBattlescriptCurrInstr++;
                 }
@@ -3208,7 +3208,7 @@ static void atk19_faint_pokemon(void)
              && gBattleMons[gBankAttacker].hp != 0
              && gCurrentMove != MOVE_STRUGGLE)
             {
-                u8 moveIndex = *(gBattleStruct->chosenMovesIds + gBankAttacker);
+                u8 moveIndex = *(gBattleStruct->chosenMovePositions + gBankAttacker);
 
                 gBattleMons[gBankAttacker].pp[moveIndex] = 0;
                 BattleScriptPush(gBattlescriptCurrInstr);
@@ -4421,13 +4421,13 @@ static void atk3D_end(void)
 
     gBattleMoveFlags = 0;
     gActiveBank = 0;
-    gFightStateTracker = 0xB;
+    gCurrentActionFuncId = 0xB;
 }
 
 static void atk3E_end2(void)
 {
     gActiveBank = 0;
-    gFightStateTracker = 0xB;
+    gCurrentActionFuncId = 0xB;
 }
 
 static void atk3F_end3(void) // pops the main function stack
@@ -6956,9 +6956,9 @@ static void atk71_buffer_move_to_learn(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk72_jump_if_can_run_frombattle(void)
+static void atk72_jump_if_run_attempt_success(void)
 {
-    if (CanRunFromBattle(gBank1))
+    if (TryRunFromBattle(gBank1))
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     else
         gBattlescriptCurrInstr += 5;
@@ -7045,7 +7045,7 @@ static void atk76_various(void)
         else
             gBankTarget = gActiveBank;
         break;
-    case 2:
+    case VARIOUS_CAN_RUN_FROM_BATTLE:
         gBattleCommunication[0] = IsRunningFromBattleImpossible();
         break;
     case VARIOUS_GET_MOVE_TARGET:
@@ -7196,7 +7196,7 @@ static void atk76_various(void)
             gBattleOutcome = BATTLE_OPPONENT_TELEPORTED;
         break;
     case VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC:
-        EmitPlaySound(0, 0x19C, 1);
+        EmitPlaySound(0, BGM_KACHI1, 1);
         MarkBufferBankForExecution(gActiveBank);
         break;
     }
@@ -7212,7 +7212,7 @@ static void atk77_set_protect_like(void) // protect and endure
     if (lastMove != MOVE_PROTECT && lastMove != MOVE_DETECT && lastMove != MOVE_ENDURE)
         gDisableStructs[gBankAttacker].protectUses = 0;
 
-    if (gCurrentMoveTurn == (gNoOfAllBanks - 1))
+    if (gCurrentTurnActionNumber == (gNoOfAllBanks - 1))
         notLastTurn = FALSE;
 
     if (sProtectSuccessRates[gDisableStructs[gBankAttacker].protectUses] >= Random() && notLastTurn)
@@ -9715,7 +9715,7 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
         }
 
         gCurrentMove = MOVE_PURSUIT;
-        gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovesIds + gBankTarget);
+        gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBankTarget);
         gBattlescriptCurrInstr += 5;
         gBattleScripting.animTurn = 1;
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
@@ -10631,7 +10631,7 @@ static void atkDF_setmagiccoat(void)
 {
     gBankTarget = gBankAttacker;
     gSpecialStatuses[gBankAttacker].flag20 = 1;
-    if (gCurrentMoveTurn == gNoOfAllBanks - 1) // moves last turn
+    if (gCurrentTurnActionNumber == gNoOfAllBanks - 1) // moves last turn
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -10645,7 +10645,7 @@ static void atkDF_setmagiccoat(void)
 static void atkE0_setstealstatchange(void) // snatch
 {
     gSpecialStatuses[gBankAttacker].flag20 = 1;
-    if (gCurrentMoveTurn == gNoOfAllBanks - 1) // moves last turn
+    if (gCurrentTurnActionNumber == gNoOfAllBanks - 1) // moves last turn
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -11393,15 +11393,15 @@ static void atkF5_removeattackerstatus1(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkF6_802BF48(void)
+static void atkF6_action_finished(void)
 {
-    gFightStateTracker = 0xC;
+    gCurrentActionFuncId = ACTION_FINISHED;
 }
 
-static void atkF7_802BF54(void)
+static void atkF7_turn_finished(void)
 {
-    gFightStateTracker = 0xC;
-    gCurrentMoveTurn = gNoOfAllBanks;
+    gCurrentActionFuncId = ACTION_FINISHED;
+    gCurrentTurnActionNumber = gNoOfAllBanks;
 }
 
 static void atkF8_trainer_slide_back(void)
diff --git a/sym_ewram.txt b/sym_ewram.txt
index c50d8f030..c00f5e1d6 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -310,10 +310,10 @@ gActionsByTurnOrder: @ 202407A
 gBanksByTurnOrder: @ 202407E
 	.space 0x4
 
-gCurrentMoveTurn: @ 2024082
+gCurrentTurnActionNumber: @ 2024082
 	.space 0x1
 
-gFightStateTracker: @ 2024083
+gCurrentActionFuncId: @ 2024083
 	.space 0x1
 
 gBattleMons: @ 2024084

From 3cc20c7c3f9c3b6a3c0fc8b47c0128c067f34a4a Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 6 Oct 2017 17:06:45 +0200
Subject: [PATCH 32/42] battle 2 is done

---
 asm/battle_2.s                    | 1422 -----------------------------
 asm/rom3.s                        |    6 +-
 data/battle_scripts_1.s           |    2 +-
 data/battle_scripts_2.s           |    2 +-
 include/battle.h                  |  166 +---
 include/battle_2.h                |   19 +
 include/battle_controllers.h      |   49 +-
 include/battle_script_commands.h  |   58 ++
 include/battle_util.h             |   83 ++
 include/link.h                    |    1 +
 include/pokemon.h                 |    2 +
 ld_script.txt                     |    3 +-
 src/battle_2.c                    |  235 ++++-
 src/battle_script_commands.c      |   18 +-
 src/{battle_3.c => battle_util.c} |  284 +++++-
 15 files changed, 708 insertions(+), 1642 deletions(-)
 delete mode 100644 asm/battle_2.s
 create mode 100644 include/battle_2.h
 create mode 100644 include/battle_script_commands.h
 create mode 100644 include/battle_util.h
 rename src/{battle_3.c => battle_util.c} (96%)

diff --git a/asm/battle_2.s b/asm/battle_2.s
deleted file mode 100644
index c0d8fd72a..000000000
--- a/asm/battle_2.s
+++ /dev/null
@@ -1,1422 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start sub_803EE48
-sub_803EE48: @ 803EE48
-	push {r4-r6,lr}
-	ldr r4, =gBankAttacker
-	ldr r1, =gBanksByTurnOrder
-	ldr r5, =gCurrentTurnActionNumber
-	ldrb r0, [r5]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r4]
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	ldr r1, =0x02000002
-	ands r0, r1
-	cmp r0, 0
-	beq _0803EF0C
-	ldr r0, =gNoOfAllBanks
-	ldrb r1, [r0]
-	strb r1, [r5]
-	ldr r2, =gActiveBank
-	movs r0, 0
-	strb r0, [r2]
-	lsls r1, 24
-	cmp r1, 0
-	beq _0803EEE0
-	adds r4, r2, 0
-	ldr r6, =gActionForBanks
-	ldr r5, =gBattleOutcome
-_0803EE7C:
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803EEBC
-	ldrb r0, [r4]
-	adds r0, r6
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	bne _0803EECE
-	ldrb r0, [r5]
-	movs r1, 0x2
-	b _0803EECA
-	.pool
-_0803EEBC:
-	ldrb r0, [r4]
-	adds r0, r6
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	bne _0803EECE
-	ldrb r0, [r5]
-	movs r1, 0x1
-_0803EECA:
-	orrs r0, r1
-	strb r0, [r5]
-_0803EECE:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldr r1, =gNoOfAllBanks
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _0803EE7C
-_0803EEE0:
-	ldr r2, =gBattleOutcome
-	ldrb r0, [r2]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r0, =gSaveBlock2Ptr
-	ldr r1, [r0]
-	ldr r0, =0x00000ca9
-	adds r1, r0
-	ldrb r0, [r1]
-	movs r2, 0x8
-	orrs r0, r2
-	b _0803EF96
-	.pool
-_0803EF0C:
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803EF4C
-	ldrb r0, [r4]
-	bl TryRunFromBattle
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803EF98
-	ldrb r0, [r4]
-	bl ClearFuryCutterDestinyBondGrudge
-	ldr r1, =gBattleCommunication
-	movs r0, 0x3
-	strb r0, [r1, 0x5]
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DAB02
-	str r0, [r1]
-	ldr r1, =gCurrentActionFuncId
-	movs r0, 0xA
-	b _0803EF96
-	.pool
-_0803EF4C:
-	ldr r1, =gBattleMons
-	ldrb r2, [r4]
-	movs r0, 0x58
-	muls r0, r2
-	adds r1, 0x50
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, =0x0400e000
-	ands r0, r1
-	cmp r0, 0
-	beq _0803EF8C
-	ldr r1, =gBattleCommunication
-	movs r0, 0x4
-	strb r0, [r1, 0x5]
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DAB02
-	str r0, [r1]
-	ldr r1, =gCurrentActionFuncId
-	movs r0, 0xA
-	b _0803EF96
-	.pool
-_0803EF8C:
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	strb r0, [r5]
-	ldr r1, =gBattleOutcome
-	movs r0, 0x6
-_0803EF96:
-	strb r0, [r1]
-_0803EF98:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803EE48
-
-	thumb_func_start sub_803EFA8
-sub_803EFA8: @ 803EFA8
-	ldr r2, =gBankAttacker
-	ldr r1, =gBanksByTurnOrder
-	ldr r0, =gCurrentTurnActionNumber
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2]
-	ldr r0, =gBattle_BG0_X
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gBattle_BG0_Y
-	strh r1, [r0]
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DBD58
-	ldr r0, [r0]
-	str r0, [r1]
-	ldr r1, =gCurrentActionFuncId
-	movs r0, 0xA
-	strb r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end sub_803EFA8
-
-	thumb_func_start bs5_8016AC0
-bs5_8016AC0: @ 803EFF0
-	ldr r2, =gBankAttacker
-	ldr r1, =gBanksByTurnOrder
-	ldr r0, =gCurrentTurnActionNumber
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2]
-	ldr r0, =gBattle_BG0_X
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gBattle_BG0_Y
-	strh r1, [r0]
-	ldr r1, =gNumSafariBalls
-	ldrb r0, [r1]
-	subs r0, 0x1
-	strb r0, [r1]
-	ldr r1, =gLastUsedItem
-	movs r0, 0x5
-	strh r0, [r1]
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gBattlescriptsForBallThrow
-	ldr r0, [r0, 0x14]
-	str r0, [r1]
-	ldr r1, =gCurrentActionFuncId
-	movs r0, 0xA
-	strb r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end bs5_8016AC0
-
-	thumb_func_start sub_803F050
-sub_803F050: @ 803F050
-	push {r4-r6,lr}
-	ldr r3, =gBankAttacker
-	ldr r1, =gBanksByTurnOrder
-	ldr r0, =gCurrentTurnActionNumber
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r3]
-	ldr r0, =gBattle_BG0_X
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gBattle_BG0_Y
-	strh r1, [r0]
-	ldr r6, =gBattleCommunication
-	ldr r2, =gBattleBufferB
-	ldrb r0, [r3]
-	lsls r0, 9
-	adds r1, r2, 0x1
-	adds r0, r1
-	ldrb r0, [r0]
-	subs r0, 0x1
-	strb r0, [r6, 0x5]
-	ldr r1, =gLastUsedItem
-	ldrb r0, [r3]
-	lsls r0, 9
-	adds r2, 0x2
-	adds r0, r2
-	ldrb r0, [r0]
-	strh r0, [r1]
-	ldr r1, =gBattleResults
-	ldrb r0, [r1, 0x1F]
-	cmp r0, 0xFE
-	bhi _0803F096
-	adds r0, 0x1
-	strb r0, [r1, 0x1F]
-_0803F096:
-	ldr r2, =gBattleStruct
-	ldr r0, [r2]
-	adds r1, r0, 0
-	adds r1, 0x7A
-	ldrb r0, [r1]
-	cmp r0, 0x2
-	bhi _0803F0A8
-	adds r0, 0x1
-	strb r0, [r1]
-_0803F0A8:
-	ldr r0, [r2]
-	adds r3, r0, 0
-	adds r3, 0x7B
-	ldrb r5, [r3]
-	adds r4, r5, 0
-	cmp r4, 0x1
-	bls _0803F100
-	ldr r2, =gUnknown_0831BCE0
-	adds r0, 0x7A
-	ldrb r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	ldrb r6, [r6, 0x5]
-	adds r0, r6
-	adds r0, r2
-	ldrb r0, [r0]
-	cmp r4, r0
-	bcs _0803F0FC
-	movs r0, 0x1
-	b _0803F0FE
-	.pool
-_0803F0FC:
-	subs r0, r5, r0
-_0803F0FE:
-	strb r0, [r3]
-_0803F100:
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DBD58
-	ldr r0, [r0, 0x8]
-	str r0, [r1]
-	ldr r1, =gCurrentActionFuncId
-	movs r0, 0xA
-	strb r0, [r1]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803F050
-
-	thumb_func_start sub_803F120
-sub_803F120: @ 803F120
-	push {r4,lr}
-	ldr r2, =gBankAttacker
-	ldr r1, =gBanksByTurnOrder
-	ldr r0, =gCurrentTurnActionNumber
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2]
-	ldr r0, =gBattle_BG0_X
-	movs r4, 0
-	strh r4, [r0]
-	ldr r0, =gBattle_BG0_Y
-	strh r4, [r0]
-	ldr r3, =gBattleStruct
-	ldr r0, [r3]
-	adds r2, r0, 0
-	adds r2, 0x7C
-	ldr r1, =gUnknown_0831BCEF
-	adds r0, 0x79
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	ldrb r1, [r2]
-	adds r0, r1
-	strb r0, [r2]
-	ldr r0, [r3]
-	adds r1, r0, 0
-	adds r1, 0x7C
-	ldrb r0, [r1]
-	cmp r0, 0x14
-	bls _0803F162
-	movs r0, 0x14
-	strb r0, [r1]
-_0803F162:
-	ldr r0, [r3]
-	adds r2, r0, 0
-	adds r2, 0x7B
-	ldr r1, =gUnknown_0831BCF3
-	adds r0, 0x79
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	ldrb r1, [r2]
-	adds r0, r1
-	strb r0, [r2]
-	ldr r0, [r3]
-	adds r1, r0, 0
-	adds r1, 0x7B
-	ldrb r0, [r1]
-	cmp r0, 0x14
-	bls _0803F188
-	movs r0, 0x14
-	strb r0, [r1]
-_0803F188:
-	ldr r0, [r3]
-	adds r1, r0, 0
-	adds r1, 0x79
-	ldrb r0, [r1]
-	cmp r0, 0x2
-	bhi _0803F1C4
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r0, =gBattleCommunication
-	strb r4, [r0, 0x5]
-	b _0803F1CA
-	.pool
-_0803F1C4:
-	ldr r1, =gBattleCommunication
-	movs r0, 0x1
-	strb r0, [r1, 0x5]
-_0803F1CA:
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DBD58
-	ldr r0, [r0, 0x4]
-	str r0, [r1]
-	ldr r1, =gCurrentActionFuncId
-	movs r0, 0xA
-	strb r0, [r1]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803F120
-
-	thumb_func_start bs8_exit_by_flight
-bs8_exit_by_flight: @ 803F1F0
-	push {r4,lr}
-	ldr r2, =gBankAttacker
-	ldr r1, =gBanksByTurnOrder
-	ldr r4, =gCurrentTurnActionNumber
-	ldrb r0, [r4]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2]
-	movs r0, 0x11
-	bl PlaySE
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	strb r0, [r4]
-	ldr r1, =gBattleOutcome
-	movs r0, 0x4
-	strb r0, [r1]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bs8_exit_by_flight
-
-	thumb_func_start bs9_8016C9C
-bs9_8016C9C: @ 803F22C
-	ldr r3, =gBankAttacker
-	ldr r1, =gBanksByTurnOrder
-	ldr r0, =gCurrentTurnActionNumber
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r2, [r0]
-	strb r2, [r3]
-	ldr r0, =gBattle_BG0_X
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gBattle_BG0_Y
-	strh r1, [r0]
-	ldr r1, =gBattleTextBuff1
-	movs r0, 0xFD
-	strb r0, [r1]
-	movs r0, 0x7
-	strb r0, [r1, 0x1]
-	strb r2, [r1, 0x2]
-	ldr r2, =gBattlePartyID
-	ldrb r0, [r3]
-	lsls r0, 1
-	adds r0, r2
-	ldrh r0, [r0]
-	strb r0, [r1, 0x3]
-	movs r0, 0xFF
-	strb r0, [r1, 0x4]
-	ldr r1, =gBattlescriptCurrInstr
-	ldr r0, =gUnknown_082DBD58
-	ldr r0, [r0, 0xC]
-	str r0, [r1]
-	ldr r1, =gCurrentActionFuncId
-	movs r0, 0xA
-	strb r0, [r1]
-	ldr r1, =gActionsByTurnOrder
-	movs r0, 0xC
-	strb r0, [r1, 0x1]
-	bx lr
-	.pool
-	thumb_func_end bs9_8016C9C
-
-	thumb_func_start bsB_exit_by_move
-bsB_exit_by_move: @ 803F2A4
-	push {lr}
-	bl sub_8041728
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	bne _0803F2C0
-	ldr r0, =gBattleStruct
-	ldr r0, [r0]
-	adds r0, 0x4D
-	strb r1, [r0]
-	ldr r1, =gCurrentActionFuncId
-	movs r0, 0xC
-	strb r0, [r1]
-_0803F2C0:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bsB_exit_by_move
-
-	thumb_func_start bsD_proceed
-bsD_proceed: @ 803F2CC
-	ldr r1, =gCurrentTurnActionNumber
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r3, =gCurrentActionFuncId
-	ldr r2, =gActionsByTurnOrder
-	ldrb r0, [r1]
-	adds r0, r2
-	ldrb r0, [r0]
-	strb r0, [r3]
-	ldr r2, =gHitMarker
-	ldr r0, [r2]
-	ldr r1, =0xf1e892af
-	ands r0, r1
-	str r0, [r2]
-	bx lr
-	.pool
-	thumb_func_end bsD_proceed
-
-	thumb_func_start bsC_8016D70
-bsC_8016D70: @ 803F300
-	push {r4-r6,lr}
-	ldr r1, =gBanksByTurnOrder
-	ldr r2, =gCurrentTurnActionNumber
-	ldrb r0, [r2]
-	adds r0, r1
-	ldrb r0, [r0]
-	ldr r6, =gBattleStruct
-	ldr r1, [r6]
-	adds r0, r1
-	adds r0, 0x5C
-	movs r1, 0x6
-	strb r1, [r0]
-	ldrb r0, [r2]
-	adds r0, 0x1
-	strb r0, [r2]
-	ldr r3, =gCurrentActionFuncId
-	ldr r1, =gActionsByTurnOrder
-	ldrb r0, [r2]
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r3]
-	bl SpecialStatusesClear
-	ldr r2, =gHitMarker
-	ldr r0, [r2]
-	ldr r1, =0xf1e892af
-	ands r0, r1
-	str r0, [r2]
-	ldr r0, =gCurrentMove
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gBattleMoveDamage
-	movs r4, 0
-	str r4, [r0]
-	ldr r0, =gBattleMoveFlags
-	strb r1, [r0]
-	ldr r5, =gBattleScripting
-	strb r1, [r5, 0x18]
-	strb r1, [r5, 0x19]
-	ldr r2, =gUnknown_02024250
-	ldr r3, =gBankAttacker
-	ldrb r0, [r3]
-	lsls r0, 1
-	adds r0, r2
-	strh r4, [r0]
-	ldr r2, =gUnknown_02024258
-	ldrb r0, [r3]
-	lsls r0, 1
-	adds r0, r2
-	strh r4, [r0]
-	ldr r0, [r6]
-	strb r1, [r0, 0x13]
-	ldr r0, =gDynamicBasePower
-	strh r4, [r0]
-	strb r1, [r5, 0x14]
-	ldr r0, =gBattleCommunication
-	strb r1, [r0, 0x3]
-	strb r1, [r0, 0x4]
-	strb r1, [r5, 0x16]
-	ldr r0, =gBattleResources
-	ldr r0, [r0]
-	ldr r0, [r0, 0x8]
-	adds r0, 0x20
-	strb r1, [r0]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bsC_8016D70
-
-	thumb_func_start GetBattleBank
-GetBattleBank: @ 803F3CC
-	push {lr}
-	lsls r0, 24
-	lsrs r1, r0, 24
-	movs r0, 0
-	cmp r1, 0xE
-	bhi _0803F47A
-	lsls r0, r1, 2
-	ldr r1, =_0803F3E8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_0803F3E8:
-	.4byte _0803F424
-	.4byte _0803F430
-	.4byte _0803F43C
-	.4byte _0803F458
-	.4byte _0803F464
-	.4byte _0803F458
-	.4byte _0803F464
-	.4byte _0803F448
-	.4byte _0803F464
-	.4byte _0803F464
-	.4byte _0803F44C
-	.4byte _0803F464
-	.4byte _0803F468
-	.4byte _0803F46C
-	.4byte _0803F470
-_0803F424:
-	ldr r0, =gBankTarget
-	ldrb r0, [r0]
-	b _0803F47A
-	.pool
-_0803F430:
-	ldr r0, =gBankAttacker
-	ldrb r0, [r0]
-	b _0803F47A
-	.pool
-_0803F43C:
-	ldr r0, =gEffectBank
-	ldrb r0, [r0]
-	b _0803F47A
-	.pool
-_0803F448:
-	movs r0, 0
-	b _0803F47A
-_0803F44C:
-	ldr r0, =gBattleScripting
-	ldrb r0, [r0, 0x17]
-	b _0803F47A
-	.pool
-_0803F458:
-	ldr r0, =gBank1
-	ldrb r0, [r0]
-	b _0803F47A
-	.pool
-_0803F464:
-	movs r0, 0
-	b _0803F472
-_0803F468:
-	movs r0, 0x1
-	b _0803F472
-_0803F46C:
-	movs r0, 0x2
-	b _0803F472
-_0803F470:
-	movs r0, 0x3
-_0803F472:
-	bl GetBankByIdentity
-	lsls r0, 24
-	lsrs r0, 24
-_0803F47A:
-	pop {r1}
-	bx r1
-	thumb_func_end GetBattleBank
-
-	thumb_func_start PressurePPLose
-PressurePPLose: @ 803F480
-	push {r4-r7,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	lsls r2, 16
-	lsrs r2, 16
-	ldr r1, =gBattleMons
-	movs r4, 0x58
-	muls r0, r4
-	adds r0, r1
-	adds r0, 0x20
-	ldrb r0, [r0]
-	mov r12, r1
-	cmp r0, 0x2E
-	bne _0803F532
-	movs r3, 0
-	adds r0, r5, 0
-	muls r0, r4
-	adds r1, 0xC
-	adds r1, r0, r1
-	b _0803F4BC
-	.pool
-_0803F4B4:
-	adds r1, 0x2
-	adds r3, 0x1
-	cmp r3, 0x3
-	bgt _0803F4C2
-_0803F4BC:
-	ldrh r0, [r1]
-	cmp r0, r2
-	bne _0803F4B4
-_0803F4C2:
-	cmp r3, 0x4
-	beq _0803F532
-	movs r7, 0x58
-	adds r2, r5, 0
-	muls r2, r7
-	adds r0, r3, r2
-	mov r6, r12
-	adds r6, 0x24
-	adds r1, r0, r6
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _0803F4DE
-	subs r0, 0x1
-	strb r0, [r1]
-_0803F4DE:
-	mov r0, r12
-	adds r0, 0x50
-	adds r0, r2, r0
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 14
-	ands r0, r1
-	cmp r0, 0
-	bne _0803F532
-	ldr r1, =gDisableStructs
-	lsls r0, r5, 3
-	subs r0, r5
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0, 0x18]
-	lsrs r1, 4
-	ldr r2, =gBitTable
-	lsls r0, r3, 2
-	adds r0, r2
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	bne _0803F532
-	ldr r4, =gActiveBank
-	strb r5, [r4]
-	adds r1, r3, 0
-	adds r1, 0x9
-	lsls r1, 24
-	lsrs r1, 24
-	ldrb r0, [r4]
-	muls r0, r7
-	adds r0, r6
-	adds r0, r3
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0
-	movs r3, 0x1
-	bl EmitSetMonData
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_0803F532:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end PressurePPLose
-
-	thumb_func_start PressurePPLoseOnUsingImprision
-PressurePPLoseOnUsingImprision: @ 803F548
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r0, 0x4
-	mov r8, r0
-	adds r0, r5, 0
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	movs r4, 0
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r4, r0
-	bge _0803F5F0
-	ldr r1, =gBattleMons
-	movs r0, 0x58
-	adds r7, r5, 0
-	muls r7, r0
-	adds r1, 0xC
-	mov r10, r1
-_0803F57E:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	adds r6, r4, 0x1
-	cmp r9, r0
-	beq _0803F5E6
-	ldr r0, =gBattleMons
-	movs r3, 0x58
-	adds r1, r4, 0
-	muls r1, r3
-	adds r1, r0
-	adds r1, 0x20
-	ldrb r1, [r1]
-	adds r4, r0, 0
-	cmp r1, 0x2E
-	bne _0803F5E6
-	movs r2, 0
-	adds r0, r5, 0
-	muls r0, r3
-	adds r1, r4, 0
-	adds r1, 0xC
-	adds r0, r1
-	ldrh r0, [r0]
-	movs r1, 0x8F
-	lsls r1, 1
-	cmp r0, r1
-	beq _0803F5CE
-	adds r3, r1, 0
-	mov r0, r10
-	adds r1, r7, r0
-_0803F5C0:
-	adds r1, 0x2
-	adds r2, 0x1
-	cmp r2, 0x3
-	bgt _0803F5CE
-	ldrh r0, [r1]
-	cmp r0, r3
-	bne _0803F5C0
-_0803F5CE:
-	cmp r2, 0x4
-	beq _0803F5E6
-	mov r8, r2
-	adds r1, r2, r7
-	adds r0, r4, 0
-	adds r0, 0x24
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _0803F5E6
-	subs r0, 0x1
-	strb r0, [r1]
-_0803F5E6:
-	adds r4, r6, 0
-	ldr r0, =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r4, r0
-	blt _0803F57E
-_0803F5F0:
-	mov r1, r8
-	cmp r1, 0x4
-	beq _0803F658
-	ldr r6, =gBattleMons
-	movs r3, 0x58
-	adds r0, r5, 0
-	muls r0, r3
-	adds r1, r6, 0
-	adds r1, 0x50
-	adds r0, r1
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 14
-	ands r0, r1
-	cmp r0, 0
-	bne _0803F658
-	ldr r1, =gDisableStructs
-	lsls r0, r5, 3
-	subs r0, r5
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0, 0x18]
-	lsrs r1, 4
-	ldr r2, =gBitTable
-	mov r4, r8
-	lsls r0, r4, 2
-	adds r0, r2
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	bne _0803F658
-	ldr r4, =gActiveBank
-	strb r5, [r4]
-	mov r1, r8
-	adds r1, 0x9
-	lsls r1, 24
-	lsrs r1, 24
-	ldrb r0, [r4]
-	muls r0, r3
-	adds r2, r6, 0
-	adds r2, 0x24
-	adds r0, r2
-	add r0, r8
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0
-	movs r3, 0x1
-	bl EmitSetMonData
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_0803F658:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end PressurePPLoseOnUsingImprision
-
-	thumb_func_start PressurePPLoseOnUsingPerishSong
-PressurePPLoseOnUsingPerishSong: @ 803F67C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r3, r0, 24
-	movs r6, 0x4
-	movs r1, 0
-	ldr r0, =gNoOfAllBanks
-	mov r8, r0
-	ldrb r0, [r0]
-	cmp r1, r0
-	bge _0803F6FE
-	ldr r7, =gBattleMons
-	movs r2, 0x58
-	mov r12, r2
-	mov r5, r12
-	muls r5, r3
-	adds r0, r7, 0
-	adds r0, 0xC
-	adds r2, r5, r0
-	mov r10, r2
-	mov r9, r5
-_0803F6AE:
-	mov r0, r12
-	muls r0, r1
-	adds r0, r7
-	adds r0, 0x20
-	ldrb r0, [r0]
-	adds r4, r1, 0x1
-	cmp r0, 0x2E
-	bne _0803F6F4
-	cmp r1, r3
-	beq _0803F6F4
-	movs r2, 0
-	mov r1, r10
-	ldrh r0, [r1]
-	cmp r0, 0xC3
-	beq _0803F6DE
-	ldr r1, =gBattleMons + 0xC
-	add r1, r9
-_0803F6D0:
-	adds r1, 0x2
-	adds r2, 0x1
-	cmp r2, 0x3
-	bgt _0803F6DE
-	ldrh r0, [r1]
-	cmp r0, 0xC3
-	bne _0803F6D0
-_0803F6DE:
-	cmp r2, 0x4
-	beq _0803F6F4
-	adds r6, r2, 0
-	adds r0, r6, r5
-	ldr r2, =gBattleMons + 0x24
-	adds r1, r0, r2
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _0803F6F4
-	subs r0, 0x1
-	strb r0, [r1]
-_0803F6F4:
-	adds r1, r4, 0
-	mov r0, r8
-	ldrb r0, [r0]
-	cmp r1, r0
-	blt _0803F6AE
-_0803F6FE:
-	cmp r6, 0x4
-	beq _0803F762
-	ldr r7, =gBattleMons
-	movs r5, 0x58
-	adds r0, r3, 0
-	muls r0, r5
-	adds r1, r7, 0
-	adds r1, 0x50
-	adds r0, r1
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 14
-	ands r0, r1
-	cmp r0, 0
-	bne _0803F762
-	ldr r1, =gDisableStructs
-	lsls r0, r3, 3
-	subs r0, r3
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0, 0x18]
-	lsrs r1, 4
-	ldr r2, =gBitTable
-	lsls r0, r6, 2
-	adds r0, r2
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	bne _0803F762
-	ldr r4, =gActiveBank
-	strb r3, [r4]
-	adds r1, r6, 0
-	adds r1, 0x9
-	lsls r1, 24
-	lsrs r1, 24
-	ldrb r0, [r4]
-	muls r0, r5
-	adds r2, r7, 0
-	adds r2, 0x24
-	adds r0, r2
-	adds r0, r6
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0
-	movs r3, 0x1
-	bl EmitSetMonData
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-_0803F762:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end PressurePPLoseOnUsingPerishSong
-
-	thumb_func_start sub_803F790
-sub_803F790: @ 803F790
-	push {r4,r5,lr}
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0803F7D0
-	movs r2, 0
-	ldr r4, =gNoOfAllBanks
-	ldrb r0, [r4]
-	cmp r2, r0
-	bge _0803F7EE
-	ldr r3, =gBattleExecBuffer
-	ldr r5, =gBitTable
-_0803F7AC:
-	ldm r5!, {r1}
-	lsls r1, 28
-	ldr r0, [r3]
-	orrs r0, r1
-	str r0, [r3]
-	adds r2, 0x1
-	ldrb r0, [r4]
-	cmp r2, r0
-	blt _0803F7AC
-	b _0803F7EE
-	.pool
-_0803F7D0:
-	movs r2, 0
-	ldr r4, =gNoOfAllBanks
-	ldrb r0, [r4]
-	cmp r2, r0
-	bge _0803F7EE
-	ldr r3, =gBattleExecBuffer
-	ldr r5, =gBitTable
-_0803F7DE:
-	ldr r0, [r3]
-	ldm r5!, {r1}
-	orrs r0, r1
-	str r0, [r3]
-	adds r2, 0x1
-	ldrb r0, [r4]
-	cmp r2, r0
-	blt _0803F7DE
-_0803F7EE:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803F790
-
-	thumb_func_start MarkBufferBankForExecution
-MarkBufferBankForExecution: @ 803F800
-	push {lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0803F834
-	ldr r2, =gBattleExecBuffer
-	ldr r1, =gBitTable
-	lsls r0, r3, 2
-	adds r0, r1
-	ldr r1, [r0]
-	lsls r1, 28
-	ldr r0, [r2]
-	orrs r0, r1
-	str r0, [r2]
-	b _0803F844
-	.pool
-_0803F834:
-	ldr r2, =gBattleExecBuffer
-	ldr r1, =gBitTable
-	lsls r0, r3, 2
-	adds r0, r1
-	ldr r1, [r2]
-	ldr r0, [r0]
-	orrs r1, r0
-	str r1, [r2]
-_0803F844:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end MarkBufferBankForExecution
-
-	thumb_func_start sub_803F850
-sub_803F850: @ 803F850
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r7, r0, 24
-	movs r4, 0
-	ldr r5, =gBattleExecBuffer
-	ldr r1, =gBitTable
-	lsls r0, r7, 2
-	adds r6, r0, r1
-	b _0803F87A
-	.pool
-_0803F86C:
-	lsls r0, r4, 2
-	ldr r1, [r6]
-	lsls r1, r0
-	ldr r0, [r5]
-	orrs r0, r1
-	str r0, [r5]
-	adds r4, 0x1
-_0803F87A:
-	bl sub_8009FCC
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r4, r0
-	blt _0803F86C
-	ldr r2, =gBattleExecBuffer
-	movs r1, 0x80
-	lsls r1, 21
-	lsls r1, r7
-	ldr r0, [r2]
-	bics r0, r1
-	str r0, [r2]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803F850
-
-	thumb_func_start CancelMultiTurnMoves
-CancelMultiTurnMoves: @ 803F8A0
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gBattleMons
-	movs r2, 0x58
-	adds r3, r0, 0
-	muls r3, r2
-	adds r1, 0x50
-	adds r3, r1
-	ldr r1, [r3]
-	ldr r2, =0xffffefff
-	ands r1, r2
-	ldr r2, =0xfffff3ff
-	ands r1, r2
-	movs r2, 0x71
-	negs r2, r2
-	ands r1, r2
-	ldr r2, =0xfffffcff
-	ands r1, r2
-	str r1, [r3]
-	ldr r1, =gStatuses3
-	lsls r2, r0, 2
-	adds r2, r1
-	ldr r1, [r2]
-	ldr r3, =0xfffbff3f
-	ands r1, r3
-	str r1, [r2]
-	ldr r2, =gDisableStructs
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrb r2, [r1, 0x11]
-	movs r0, 0x10
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x11]
-	movs r0, 0
-	strb r0, [r1, 0x10]
-	bx lr
-	.pool
-	thumb_func_end CancelMultiTurnMoves
-
-	thumb_func_start HasMoveFailed
-HasMoveFailed: @ 803F90C
-	push {lr}
-	lsls r0, 24
-	ldr r1, =gProtectStructs
-	lsrs r0, 20
-	adds r1, r0, r1
-	ldrb r0, [r1]
-	lsrs r0, 7
-	cmp r0, 0
-	bne _0803F952
-	ldrb r2, [r1, 0x1]
-	lsls r0, r2, 30
-	cmp r0, 0
-	blt _0803F952
-	lsls r0, r2, 26
-	cmp r0, 0
-	blt _0803F952
-	lsls r0, r2, 25
-	cmp r0, 0
-	blt _0803F952
-	lsrs r0, r2, 7
-	cmp r0, 0
-	bne _0803F952
-	ldrb r1, [r1, 0x2]
-	lsls r0, r1, 31
-	cmp r0, 0
-	bne _0803F952
-	lsls r0, r1, 30
-	cmp r0, 0
-	blt _0803F952
-	lsls r0, r1, 29
-	cmp r0, 0
-	blt _0803F952
-	lsls r0, r2, 31
-	cmp r0, 0
-	beq _0803F95C
-_0803F952:
-	movs r0, 0x1
-	b _0803F95E
-	.pool
-_0803F95C:
-	movs r0, 0
-_0803F95E:
-	pop {r1}
-	bx r1
-	thumb_func_end HasMoveFailed
-
-	thumb_func_start PrepareStringBattle
-PrepareStringBattle: @ 803F964
-	push {r4,lr}
-	adds r2, r0, 0
-	lsls r2, 16
-	lsrs r2, 16
-	ldr r4, =gActiveBank
-	strb r1, [r4]
-	movs r0, 0
-	adds r1, r2, 0
-	bl dp01_build_cmdbuf_x10_TODO
-	ldrb r0, [r4]
-	bl MarkBufferBankForExecution
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end PrepareStringBattle
-
-	thumb_func_start ResetSentPokesToOpponentValue
-ResetSentPokesToOpponentValue: @ 803F988
-	push {r4-r6,lr}
-	movs r3, 0
-	ldr r0, =gSentPokesToOpponent
-	strb r3, [r0]
-	strb r3, [r0, 0x1]
-	movs r1, 0
-	ldr r0, =gNoOfAllBanks
-	ldrb r2, [r0]
-	adds r6, r0, 0
-	cmp r1, r2
-	bge _0803F9B6
-	ldr r5, =gBitTable
-	adds r4, r2, 0
-	ldr r2, =gBattlePartyID
-_0803F9A4:
-	ldrh r0, [r2]
-	lsls r0, 2
-	adds r0, r5
-	ldr r0, [r0]
-	orrs r3, r0
-	adds r2, 0x4
-	adds r1, 0x2
-	cmp r1, r4
-	blt _0803F9A4
-_0803F9B6:
-	movs r1, 0x1
-	adds r2, r6, 0
-	ldrb r0, [r2]
-	cmp r1, r0
-	bge _0803F9D6
-	ldr r5, =gSentPokesToOpponent
-	movs r4, 0x2
-_0803F9C4:
-	adds r0, r1, 0
-	ands r0, r4
-	asrs r0, 1
-	adds r0, r5
-	strb r3, [r0]
-	adds r1, 0x2
-	ldrb r0, [r2]
-	cmp r1, r0
-	blt _0803F9C4
-_0803F9D6:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ResetSentPokesToOpponentValue
-
-	thumb_func_start sub_803F9EC
-sub_803F9EC: @ 803F9EC
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r4, 0
-	adds r0, r5, 0
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0803FA50
-	movs r0, 0x2
-	ands r0, r5
-	lsls r0, 24
-	lsrs r0, 25
-	mov r12, r0
-	ldr r1, =gSentPokesToOpponent
-	adds r0, r1
-	strb r4, [r0]
-	adds r5, r4, 0
-	ldr r0, =gNoOfAllBanks
-	ldrb r2, [r0]
-	mov r8, r1
-	cmp r4, r2
-	bge _0803FA4A
-	ldr r0, =gAbsentBankFlags
-	ldrb r7, [r0]
-	ldr r1, =gBitTable
-	adds r6, r2, 0
-	ldr r3, =gBattlePartyID
-	adds r2, r1, 0
-_0803FA2E:
-	ldr r0, [r2]
-	ands r0, r7
-	cmp r0, 0
-	bne _0803FA40
-	ldrh r0, [r3]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	orrs r4, r0
-_0803FA40:
-	adds r3, 0x4
-	adds r2, 0x8
-	adds r5, 0x2
-	cmp r5, r6
-	blt _0803FA2E
-_0803FA4A:
-	mov r0, r12
-	add r0, r8
-	strb r4, [r0]
-_0803FA50:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803F9EC
-
-	thumb_func_start sub_803FA70
-sub_803FA70: @ 803FA70
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl GetBankSide
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0803FA8C
-	adds r0, r4, 0
-	bl sub_803F9EC
-	b _0803FAC2
-_0803FA8C:
-	movs r3, 0x1
-	ldr r5, =gNoOfAllBanks
-	ldrb r0, [r5]
-	cmp r3, r0
-	bge _0803FAC2
-	ldr r0, =gSentPokesToOpponent
-	mov r12, r0
-	movs r7, 0x2
-	ldr r6, =gBitTable
-	ldr r1, =gBattlePartyID
-	lsls r0, r4, 1
-	adds r4, r0, r1
-_0803FAA4:
-	adds r2, r3, 0
-	ands r2, r7
-	asrs r2, 1
-	add r2, r12
-	ldrh r0, [r4]
-	lsls r0, 2
-	adds r0, r6
-	ldr r0, [r0]
-	ldrb r1, [r2]
-	orrs r0, r1
-	strb r0, [r2]
-	adds r3, 0x1
-	ldrb r0, [r5]
-	cmp r3, r0
-	blt _0803FAA4
-_0803FAC2:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_803FA70
-    
-    .align 2, 0 @ Don't pad with nop.
-    
\ No newline at end of file
diff --git a/asm/rom3.s b/asm/rom3.s
index 6a3e7e299..bde493568 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -2570,8 +2570,8 @@ _08033BB6:
 	.pool
 	thumb_func_end EmitMoveAnimation
 
-	thumb_func_start dp01_build_cmdbuf_x10_TODO
-dp01_build_cmdbuf_x10_TODO: @ 8033BE4
+	thumb_func_start EmitPrintString
+EmitPrintString: @ 8033BE4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2685,7 +2685,7 @@ _08033C88:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp01_build_cmdbuf_x10_TODO
+	thumb_func_end EmitPrintString
 
 	thumb_func_start EmitPrintStringPlayerOnly
 EmitPrintStringPlayerOnly: @ 8033CFC
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index faa945bdd..b2dfec5d8 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -78,7 +78,7 @@ BattleScript_WildMonFled:: @ 82DAAF7
 gUnknown_082DAAFE:: @ 82DAAFE
 	.incbin "baserom.gba", 0x2daafe, 0x4
 
-gUnknown_082DAB02:: @ 82DAB02
+BattleScript_PrintFailedToRunString:: @ 82DAB02
 	.incbin "baserom.gba", 0x2dab02, 0x9
 
 gUnknown_082DAB0B:: @ 82DAB0B
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index 985c09b23..4a4dc4665 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -33,7 +33,7 @@ gBattlescriptsForRunningByItem:: @ 82DBD54
 	.4byte BattleScript_RunByUsingItem
 
 	.align 2
-gUnknown_082DBD58:: @ 82DBD58
+gBattlescriptsForSafariActions:: @ 82DBD58
 	.4byte gUnknown_082DBEBD
 	.4byte gUnknown_082DBEC4
 	.4byte gUnknown_082DBECD
diff --git a/include/battle.h b/include/battle.h
index 639558e60..d41702396 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -1,6 +1,11 @@
 #ifndef GUARD_BATTLE_H
 #define GUARD_BATTLE_H
 
+// should they be included here or included individually by every file?
+#include "battle_util.h"
+#include "battle_script_commands.h"
+#include "battle_2.h"
+
 /*
     Banks are a name given to what could be called a 'battlerId' or 'monControllerId'.
     Each bank has a value consisting of two bits.
@@ -119,8 +124,8 @@
 #define STATUS3_MINIMIZED               0x100
 #define STATUS3_ROOTED                  0x400
 #define STATUS3_CHARGED_UP              0x200
-#define STATUS3_YAWN                    0x1800  //two bits
-#define STATUS3_IMPRISONED_OTHERS      0x2000
+#define STATUS3_YAWN                    0x1800  // two bits
+#define STATUS3_IMPRISONED_OTHERS       0x2000
 #define STATUS3_GRUDGE                  0x4000
 #define STATUS3_CANT_SCORE_A_CRIT       0x8000
 #define STATUS3_MUDSPORT                0x10000
@@ -131,6 +136,7 @@
 
 #define STATUS3_SEMI_INVULNERABLE       ((STATUS3_UNDERGROUND | STATUS3_ON_AIR | STATUS3_UNDERWATER))
 
+#define HITMARKER_x10                   0x00000010
 #define HITMARKER_x20                   0x00000020
 #define HITMARKER_DESTINYBOND           0x00000040
 #define HITMARKER_NO_ANIMATIONS         0x00000080
@@ -141,7 +147,7 @@
 #define HITMARKER_PURSUIT_TRAP          0x00001000
 #define HITMARKER_IGNORE_SAFEGUARD      0x00002000
 #define HITMARKER_SYNCHRONISE_EFFECT    0x00004000
-#define HITMARKER_x8000                 0x00008000
+#define HITMARKER_RUN                   0x00008000
 #define HITMARKER_IGNORE_ON_AIR         0x00010000
 #define HITMARKER_IGNORE_UNDERGROUND    0x00020000
 #define HITMARKER_IGNORE_UNDERWATER     0x00040000
@@ -152,6 +158,7 @@
 #define HITMARKER_x800000               0x00800000
 #define HITMARKER_GRUDGE                0x01000000
 #define HITMARKER_OBEYS                 0x02000000
+#define HITMARKER_x4000000              0x04000000
 #define HITMARKER_x8000000              0x08000000
 #define HITMARKER_FAINTED(bank)         ((gBitTable[bank] << 0x1C))
 #define HITMARKER_UNK(bank)             ((0x10000000 << bank))
@@ -181,32 +188,6 @@
 #define ACTION_NOTHING_FAINTED      13 // when choosing an action
 #define ACTION_INIT_VALUE           0xFF
 
-#define ABILITYEFFECT_ON_SWITCHIN               0x0
-#define ABILITYEFFECT_ENDTURN                   0x1
-#define ABILITYEFFECT_MOVES_BLOCK               0x2
-#define ABILITYEFFECT_ABSORBING                 0x3
-#define ABILITYEFFECT_CONTACT                   0x4
-#define ABILITYEFFECT_IMMUNITY                  0x5
-#define ABILITYEFFECT_FORECAST                  0x6
-#define ABILITYEFFECT_SYNCHRONIZE               0x7
-#define ABILITYEFFECT_ATK_SYNCHRONIZE           0x8
-#define ABILITYEFFECT_INTIMIDATE1               0x9
-#define ABILITYEFFECT_INTIMIDATE2               0xA
-#define ABILITYEFFECT_TRACE                     0xB
-#define ABILITYEFFECT_CHECK_OTHER_SIDE          0xC
-#define ABILITYEFFECT_CHECK_BANK_SIDE           0xD
-#define ABILITYEFFECT_FIELD_SPORT               0xE
-#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK   0xF
-#define ABILITYEFFECT_COUNT_OTHER_SIDE          0x10
-#define ABILITYEFFECT_COUNT_BANK_SIDE           0x11
-#define ABILITYEFFECT_COUNT_ON_FIELD            0x12
-#define ABILITYEFFECT_CHECK_ON_FIELD            0x13
-#define ABILITYEFFECT_SWITCH_IN_WEATHER         0xFF
-
-#define ITEMEFFECT_ON_SWITCH_IN                 0x0
-
-#define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0)))
-
 #define MOVESTATUS_MISSED             (1 << 0)
 #define MOVESTATUS_SUPEREFFECTIVE     (1 << 1)
 #define MOVESTATUS_NOTVERYEFFECTIVE   (1 << 2)
@@ -271,25 +252,6 @@
 #define TYPE_MUL_NORMAL             10
 #define TYPE_MUL_SUPER_EFFECTIVE    20
 
-#define BS_GET_TARGET                   0
-#define BS_GET_ATTACKER                 1
-#define BS_GET_EFFECT_BANK              2
-#define BS_ATTACKER_WITH_PARTNER        4 // for atk98_status_icon_update
-#define BS_GET_ATTACKER_SIDE            8 // for atk1E_jumpifability
-#define BS_GET_NOT_ATTACKER_SIDE        9 // for atk1E_jumpifability
-#define BS_GET_SCRIPTING_BANK           10
-#define BS_GET_OPPONENT1                12
-#define BS_GET_PLAYER2                  13
-#define BS_GET_OPPONENT2                14
-
-// for battle script commands
-#define CMP_EQUAL               0x0
-#define CMP_NOT_EQUAL           0x1
-#define CMP_GREATER_THAN        0x2
-#define CMP_LESS_THAN           0x3
-#define CMP_COMMON_BITS         0x4
-#define CMP_NO_COMMON_BITS      0x5
-
 struct TrainerMonNoItemDefaultMoves
 {
     u16 iv;
@@ -375,8 +337,8 @@ struct DisableStruct
     /*0x0F*/ u8 perishSong1 : 4;
     /*0x0F*/ u8 perishSong2 : 4;
     /*0x10*/ u8 furyCutterCounter;
-    /*0x11*/ u8 rolloutTimer1 : 4;
-    /*0x11*/ u8 rolloutTimer2 : 4;
+    /*0x11*/ u8 rolloutCounter1 : 4;
+    /*0x11*/ u8 rolloutCounter2 : 4;
     /*0x12*/ u8 chargeTimer1 : 4;
     /*0x12*/ u8 chargeTimer2 : 4;
     /*0x13*/ u8 tauntTimer1:4;
@@ -408,7 +370,7 @@ struct ProtectStruct
     u32 prlzImmobility:1;
     /* field_1 */
     u32 confusionSelfDmg:1;
-    u32 notEffective:1;
+    u32 targetNotAffected:1;
     u32 chargingTurn:1;
     u32 fleeFlag:2; // for RunAway and Smoke Ball
     u32 usedImprisionedMove:1;
@@ -574,6 +536,7 @@ struct BattleResults
     u8 playerMon1Name[11];    // 0x8
     u8 battleTurnCounter;     // 0x13
     u8 playerMon2Name[11];    // 0x14
+    u8 field_1F;              // 0x1F
     u16 lastOpponentSpecies;  // 0x20
     u16 lastUsedMovePlayer;   // 0x22
     u16 lastUsedMoveOpponent; // 0x24
@@ -814,39 +777,10 @@ extern struct BattleStruct* gBattleStruct;
 #define B_ANIM_x1C                  0x1C
 #define B_ANIM_x1D                  0x1D
 
-#define ATK48_STAT_NEGATIVE         0x1
-#define ATK48_STAT_BY_TWO           0x2
-#define ATK48_BIT_x4                0x4
-#define ATK48_LOWER_FAIL_CHECK      0x8
-
-#define ATK4F_DONT_CHECK_STATUSES   0x80
-
-#define VARIOUS_CANCEL_MULTI_TURN_MOVES         0
-#define VARIOUS_SET_MAGIC_COAT_TARGET           1
-#define VARIOUS_CAN_RUN_FROM_BATTLE             2
-#define VARIOUS_GET_MOVE_TARGET                 3
-#define VARIOUS_RESET_INTIMIDATE_TRACE_BITS     5
-#define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP    6
-#define VARIOUS_WAIT_CRY                        18
-#define VARIOUS_RETURN_OPPONENT_MON1            19
-#define VARIOUS_RETURN_OPPONENT_MON2            20
-#define VARIOUS_SET_TELEPORT_OUTCOME            25
-#define VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC     26
-
-#define ATK80_DMG_CHANGE_SIGN                               0
-#define ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP     1
-#define ATK80_DMG_DOUBLED                                   2
-
 #define GET_STAT_BUFF_ID(n)((n & 0xF))              // first four bits 0x1, 0x2, 0x4, 0x8
 #define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7))      // 0x10, 0x20, 0x40
 #define STAT_BUFF_NEGATIVE 0x80                     // 0x80, the sign bit
 
-#define STAT_CHANGE_BS_PTR                  0x1
-#define STAT_CHANGE_NOT_PROTECT_AFFECTED    0x20
-
-#define STAT_CHANGE_WORKED      0
-#define STAT_CHANGE_DIDNT_WORK  1
-
 #define SET_STAT_BUFF_ID(n)((n & 0xF))
 #define SET_STAT_BUFF_VALUE(n)(((s8)(((s8)(n) << 4)) & 0xF0))
 
@@ -892,78 +826,6 @@ void ApplyPlayerChosenFrameToBattleMenu(void);
 bool8 LoadChosenBattleElement(u8 caseId);
 void task00_0800F6FC(u8 taskId);
 
-// battle_2
-void CB2_InitBattle(void);
-void CB2_QuitRecordedBattle(void);
-void CancelMultiTurnMoves(u8 bank);
-void PressurePPLose(u8 bankAtk, u8 bankDef, u16 move);
-void PrepareStringBattle(u16 stringId, u8 bank);
-u8 GetBattleBank(u8 caseId);
-void FaintClearSetData(void);
-bool8 HasMoveFailed(u8 bank);
-void SwitchInClearSetData(void);
-void sub_803BDA0(u8 bank);
-void sub_803FA70(u8 bank);
-void BattleMainCB2(void);
-void VBlankCB_Battle(void);
-void ResetSentPokesToOpponentValue(void);
-bool8 TryRunFromBattle(u8 bank);
-bool8 IsRunningFromBattleImpossible(void);
-void PressurePPLoseOnUsingPerishSong(u8 bankAtk);
-void PressurePPLoseOnUsingImprision(u8 bankAtk);
-u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves);
-void SwapTurnOrder(u8, u8);
-void BattleTurnPassed(void);
-void RunBattleScriptCommands_PopCallbacksStack(void);
-void RunBattleScriptCommands(void);
-
-// battle_3
-#define MOVE_LIMITATION_ZEROMOVE    (1 << 0)
-#define MOVE_LIMITATION_PP          (1 << 1)
-#define MOVE_LIMITATION_DISABLED    (1 << 2)
-#define MOVE_LIMITATION_TORMENTED   (1 << 3)
-#define MOVE_LIMITATION_TAUNT       (1 << 4)
-#define MOVE_LIMITATION_IMPRISION   (1 << 5)
-
-void BattleScriptPush(const u8* bsPtr);
-void BattleScriptPushCursor(void);
-void BattleScriptPop(void);
-u8 TrySetCantSelectMoveBattleScript(void);
-u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check);
-bool8 AreAllMovesUnusable(void);
-u8 GetImprisonedMovesCount(u8 bank, u16 move);
-u8 UpdateTurnCounters(void);
-u8 TurnBasedEffects(void);
-bool8 sub_8041364(void);
-bool8 sub_8041728(void);
-void TryClearRageStatuses(void);
-u8 AtkCanceller_UnableToUseMove(void);
-bool8 sub_80423F4(u8 bank, u8 r1, u8 r2);
-u8 CastformDataTypeChange(u8 bank);
-u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg);
-void BattleScriptExecute(const u8* BS_ptr);
-void BattleScriptPushCursorAndCallback(const u8* BS_ptr);
-u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn);
-void ClearFuryCutterDestinyBondGrudge(u8 bank);
-void sub_80458B4(void);
-u8 GetMoveTarget(u16 move, u8 useMoveTarget);
-u8 IsPokeDisobedient(void);
-
-// battle_script_commands
-void AI_CalcDmg(u8 bankAtk, u8 bankDef);
-u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef);
-u8 AI_TypeCalc(u16 move, u16 species, u8 ability);
-u8 BankGetTurnOrder(u8 bank);
-void SetMoveEffect(bool8 primary, u8 certain);
-void BattleDestroyCursorAt(u8 cursorPosition);
-void BattleCreateCursorAt(u8 cursorPosition);
-void BufferMoveToLearnIntoBattleTextBuff2(void);
-void sub_8056A3C(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
-bool8 UproarWakeUpCheck(u8 bank);
-
-extern void (* const gBattleScriptingCommandsTable[])(void);
-extern const u8 gUnknown_0831C494[];
-
 // battle_5
 void AllocateBattleResrouces(void);
 void FreeBattleResources(void);
diff --git a/include/battle_2.h b/include/battle_2.h
new file mode 100644
index 000000000..e4385db04
--- /dev/null
+++ b/include/battle_2.h
@@ -0,0 +1,19 @@
+#ifndef GUARD_BATTLE_2_H
+#define GUARD_BATTLE_2_H
+
+void CB2_InitBattle(void);
+void CB2_QuitRecordedBattle(void);
+void FaintClearSetData(void);
+void SwitchInClearSetData(void);
+void sub_803BDA0(u8 bank);
+void BattleMainCB2(void);
+void VBlankCB_Battle(void);
+bool8 TryRunFromBattle(u8 bank);
+u8 IsRunningFromBattleImpossible(void);
+u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves);
+void SwapTurnOrder(u8 id1, u8 id2);
+void BattleTurnPassed(void);
+void RunBattleScriptCommands_PopCallbacksStack(void);
+void RunBattleScriptCommands(void);
+
+#endif // GUARD_BATTLE_2_H
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index 9a7f947fa..2281fdaff 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -1,6 +1,28 @@
 #ifndef GUARD_BATTLE_CONTROLLERS_H
 #define GUARD_BATTLE_CONTROLLERS_H
 
+#define REQUEST_ALL_BATTLE      0x0
+#define REQUEST_SPECIES_BATTLE  0x1
+#define REQUEST_HELDITEM_BATTLE 0x2
+#define REQUEST_MOVES_PP_BATTLE 0x3
+#define REQUEST_PPMOVE1_BATTLE  0x9
+#define REQUEST_PPMOVE2_BATTLE  0xA
+#define REQUEST_PPMOVE3_BATTLE  0xB
+#define REQUEST_PPMOVE4_BATTLE  0xC
+#define REQUEST_STATUS_BATTLE   0x28
+#define REQUEST_HP_BATTLE       0x2A
+
+#define RESET_ACTION_MOVE_SELECTION     0
+#define RESET_ACTION_SELECTION          1
+#define RESET_MOVE_SELECTION            2
+
+#define BALL_NO_SHAKES          0
+#define BALL_1_SHAKE            1
+#define BALL_2_SHAKES           2
+#define BALL_3_SHAKES_FAIL      3
+#define BALL_3_SHAKES_SUCCESS   4
+#define BALL_TRAINER_BLOCK      5
+
 struct HpAndStatus
 {
     u16 hp;
@@ -24,17 +46,6 @@ struct ChooseMoveStruct
     u8 monType2;
 };
 
-#define REQUEST_ALL_BATTLE      0x0
-#define REQUEST_SPECIES_BATTLE  0x1
-#define REQUEST_HELDITEM_BATTLE 0x2
-#define REQUEST_MOVES_PP_BATTLE 0x3
-#define REQUEST_PPMOVE1_BATTLE  0x9
-#define REQUEST_PPMOVE2_BATTLE  0xA
-#define REQUEST_PPMOVE3_BATTLE  0xB
-#define REQUEST_PPMOVE4_BATTLE  0xC
-#define REQUEST_STATUS_BATTLE   0x28
-#define REQUEST_HP_BATTLE       0x2A
-
 // rom3.s, emitters
 void EmitSetMonData(u8 bufferId, u8 request, u8 c, u8 bytes, void *data);
 void EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct* disableStructPtr, u8 multihit);
@@ -70,22 +81,8 @@ void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2);
 void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct* movePpData);
 void EmitOpenBag(u8 bufferId, u8* arg1);
 void Emit_x32(u8 bufferId);
-
-#define RESET_ACTION_MOVE_SELECTION     0
-#define RESET_ACTION_SELECTION          1
-#define RESET_MOVE_SELECTION            2
-
+void EmitPrintString(u8 bufferId, u16 stringId);
 void EmitResetActionMoveSelection(u8 bufferId, u8 caseId);
-
-#define BALL_NO_SHAKES          0
-#define BALL_1_SHAKE            1
-#define BALL_2_SHAKES           2
-#define BALL_3_SHAKES_FAIL      3
-#define BALL_3_SHAKES_SUCCESS   4
-#define BALL_TRAINER_BLOCK      5
-
 void EmitBallThrow(u8 bufferId, u8 caseId);
 
-void MarkBufferBankForExecution(u8 bank);
-
 #endif // GUARD_BATTLE_CONTROLLERS_H
diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h
new file mode 100644
index 000000000..ae0d20f28
--- /dev/null
+++ b/include/battle_script_commands.h
@@ -0,0 +1,58 @@
+#ifndef GUARD_BATTLE_SCRIPT_COMMANDS_H
+#define GUARD_BATTLE_SCRIPT_COMMANDS_H
+
+#define CMP_EQUAL               0x0
+#define CMP_NOT_EQUAL           0x1
+#define CMP_GREATER_THAN        0x2
+#define CMP_LESS_THAN           0x3
+#define CMP_COMMON_BITS         0x4
+#define CMP_NO_COMMON_BITS      0x5
+
+#define BS_ATTACKER_WITH_PARTNER        4 // for atk98_status_icon_update
+#define BS_GET_ATTACKER_SIDE            8 // for atk1E_jumpifability
+#define BS_GET_NOT_ATTACKER_SIDE        9 // for atk1E_jumpifability
+
+#define ATK48_STAT_NEGATIVE         0x1
+#define ATK48_STAT_BY_TWO           0x2
+#define ATK48_BIT_x4                0x4
+#define ATK48_LOWER_FAIL_CHECK      0x8
+
+#define ATK4F_DONT_CHECK_STATUSES   0x80
+
+#define VARIOUS_CANCEL_MULTI_TURN_MOVES         0
+#define VARIOUS_SET_MAGIC_COAT_TARGET           1
+#define VARIOUS_CAN_RUN_FROM_BATTLE             2
+#define VARIOUS_GET_MOVE_TARGET                 3
+#define VARIOUS_RESET_INTIMIDATE_TRACE_BITS     5
+#define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP    6
+#define VARIOUS_WAIT_CRY                        18
+#define VARIOUS_RETURN_OPPONENT_MON1            19
+#define VARIOUS_RETURN_OPPONENT_MON2            20
+#define VARIOUS_SET_TELEPORT_OUTCOME            25
+#define VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC     26
+
+#define ATK80_DMG_CHANGE_SIGN                               0
+#define ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP     1
+#define ATK80_DMG_DOUBLED                                   2
+
+#define STAT_CHANGE_BS_PTR                  0x1
+#define STAT_CHANGE_NOT_PROTECT_AFFECTED    0x20
+
+#define STAT_CHANGE_WORKED      0
+#define STAT_CHANGE_DIDNT_WORK  1
+
+void AI_CalcDmg(u8 bankAtk, u8 bankDef);
+u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef);
+u8 AI_TypeCalc(u16 move, u16 species, u8 ability);
+u8 BankGetTurnOrder(u8 bank);
+void SetMoveEffect(bool8 primary, u8 certain);
+void BattleDestroyCursorAt(u8 cursorPosition);
+void BattleCreateCursorAt(u8 cursorPosition);
+void BufferMoveToLearnIntoBattleTextBuff2(void);
+void sub_8056A3C(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
+bool8 UproarWakeUpCheck(u8 bank);
+
+extern void (* const gBattleScriptingCommandsTable[])(void);
+extern const u8 gUnknown_0831C494[];
+
+#endif // GUARD_BATTLE_SCRIPT_COMMANDS_H
diff --git a/include/battle_util.h b/include/battle_util.h
new file mode 100644
index 000000000..c1ff7d8ab
--- /dev/null
+++ b/include/battle_util.h
@@ -0,0 +1,83 @@
+#ifndef GUARD_BATTLE_UTIL_H
+#define GUARD_BATTLE_UTIL_H
+
+#define MOVE_LIMITATION_ZEROMOVE                (1 << 0)
+#define MOVE_LIMITATION_PP                      (1 << 1)
+#define MOVE_LIMITATION_DISABLED                (1 << 2)
+#define MOVE_LIMITATION_TORMENTED               (1 << 3)
+#define MOVE_LIMITATION_TAUNT                   (1 << 4)
+#define MOVE_LIMITATION_IMPRISION               (1 << 5)
+
+#define ABILITYEFFECT_ON_SWITCHIN               0x0
+#define ABILITYEFFECT_ENDTURN                   0x1
+#define ABILITYEFFECT_MOVES_BLOCK               0x2
+#define ABILITYEFFECT_ABSORBING                 0x3
+#define ABILITYEFFECT_CONTACT                   0x4
+#define ABILITYEFFECT_IMMUNITY                  0x5
+#define ABILITYEFFECT_FORECAST                  0x6
+#define ABILITYEFFECT_SYNCHRONIZE               0x7
+#define ABILITYEFFECT_ATK_SYNCHRONIZE           0x8
+#define ABILITYEFFECT_INTIMIDATE1               0x9
+#define ABILITYEFFECT_INTIMIDATE2               0xA
+#define ABILITYEFFECT_TRACE                     0xB
+#define ABILITYEFFECT_CHECK_OTHER_SIDE          0xC
+#define ABILITYEFFECT_CHECK_BANK_SIDE           0xD
+#define ABILITYEFFECT_FIELD_SPORT               0xE
+#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK   0xF
+#define ABILITYEFFECT_COUNT_OTHER_SIDE          0x10
+#define ABILITYEFFECT_COUNT_BANK_SIDE           0x11
+#define ABILITYEFFECT_COUNT_ON_FIELD            0x12
+#define ABILITYEFFECT_CHECK_ON_FIELD            0x13
+#define ABILITYEFFECT_SWITCH_IN_WEATHER         0xFF
+
+#define ITEMEFFECT_ON_SWITCH_IN                 0x0
+
+#define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0)))
+
+#define BS_GET_TARGET                   0
+#define BS_GET_ATTACKER                 1
+#define BS_GET_EFFECT_BANK              2
+#define BS_GET_SCRIPTING_BANK           10
+#define BS_GET_PLAYER1                  11
+#define BS_GET_OPPONENT1                12
+#define BS_GET_PLAYER2                  13
+#define BS_GET_OPPONENT2                14
+
+u8 GetBattleBank(u8 caseId);
+void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move);
+void PressurePPLoseOnUsingPerishSong(u8 bankAtk);
+void PressurePPLoseOnUsingImprision(u8 bankAtk);
+void MarkAllBufferBanksForExecution(void); // unused
+void MarkBufferBankForExecution(u8 bank);
+void sub_803F850(u8 arg0);
+void CancelMultiTurnMoves(u8 bank);
+bool8 WasUnableToUseMove(u8 bank);
+void PrepareStringBattle(u16 stringId, u8 bank);
+void ResetSentPokesToOpponentValue(void);
+void sub_803F9EC(u8 bank);
+void sub_803FA70(u8 bank);
+void BattleScriptPush(const u8* bsPtr);
+void BattleScriptPushCursor(void);
+void BattleScriptPop(void);
+u8 TrySetCantSelectMoveBattleScript(void);
+u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check);
+bool8 AreAllMovesUnusable(void);
+u8 GetImprisonedMovesCount(u8 bank, u16 move);
+u8 UpdateTurnCounters(void);
+u8 TurnBasedEffects(void);
+bool8 sub_8041364(void);
+bool8 sub_8041728(void);
+void TryClearRageStatuses(void);
+u8 AtkCanceller_UnableToUseMove(void);
+bool8 sub_80423F4(u8 bank, u8 r1, u8 r2);
+u8 CastformDataTypeChange(u8 bank);
+u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg);
+void BattleScriptExecute(const u8* BS_ptr);
+void BattleScriptPushCursorAndCallback(const u8* BS_ptr);
+u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn);
+void ClearFuryCutterDestinyBondGrudge(u8 bank);
+void HandleAction_RunBattleScript(void);
+u8 GetMoveTarget(u16 move, u8 useMoveTarget);
+u8 IsPokeDisobedient(void);
+
+#endif // GUARD_BATTLE_UTIL_H
diff --git a/include/link.h b/include/link.h
index 9d581a6c1..012c90480 100644
--- a/include/link.h
+++ b/include/link.h
@@ -183,5 +183,6 @@ bool8 sub_800A520(void);
 bool8 sub_8010500(void);
 void sub_800DFB4(u8, u8);
 void sub_800ADF8(void);
+u8 sub_8009FCC(void);
 
 #endif // GUARD_LINK_H
diff --git a/include/pokemon.h b/include/pokemon.h
index c41099b09..263a37426 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -640,6 +640,8 @@ u8 CheckPartyPokerus(struct Pokemon *party, u8 selection);
 u8 CheckPartyHasHadPokerus(struct Pokemon *party, u8 selection);
 void UpdatePartyPokerusTime(u16 days);
 void PartySpreadPokerus(struct Pokemon *party);
+s8 GetMonFlavourRelation(struct Pokemon *mon, u8 a2);
+s8 GetFlavourRelationByPersonality(u32 personality, u8 a2);
 
 #include "sprite.h"
 
diff --git a/ld_script.txt b/ld_script.txt
index f5361e8e4..0e8454ef8 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -58,8 +58,7 @@ SECTIONS {
         src/decompress.o(.text);
         asm/battle_1.o(.text);
         src/battle_2.o(.text);
-        asm/battle_2.o(.text);
-        src/battle_3.o(.text);
+        src/battle_util.o(.text);
         src/battle_script_commands.o(.text);
         asm/battle_5.o(.text);
         asm/battle_controller_player.o(.text);
diff --git a/src/battle_2.c b/src/battle_2.c
index ab1aae747..37ab7ab1f 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -40,6 +40,7 @@
 #include "trainer_classes.h"
 #include "evolution_scene.h"
 #include "roamer.h"
+#include "safari_zone.h"
 
 struct UnknownStruct6
 {
@@ -157,6 +158,10 @@ 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 gUnknown_0831BCE0[];
+extern const u8 gUnknown_0831BCEF[];
+extern const u8 gUnknown_0831BCF3[];
+extern const u8 * const gBattleScriptsForMoveEffects[];
 
 // strings
 extern const u8 gText_LinkStandby3[];
@@ -190,6 +195,7 @@ 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 HandleLinkBattleSetup(void); // rom_3
@@ -2942,7 +2948,7 @@ void FaintClearSetData(void)
     gProtectStructs[gActiveBank].flag0Unknown = 0;
     gProtectStructs[gActiveBank].prlzImmobility = 0;
     gProtectStructs[gActiveBank].confusionSelfDmg = 0;
-    gProtectStructs[gActiveBank].notEffective = 0;
+    gProtectStructs[gActiveBank].targetNotAffected = 0;
     gProtectStructs[gActiveBank].chargingTurn = 0;
     gProtectStructs[gActiveBank].fleeFlag = 0;
     gProtectStructs[gActiveBank].usedImprisionedMove = 0;
@@ -3824,15 +3830,18 @@ void sub_803BDA0(u8 bank)
     }
 }
 
-#define STATE_TURN_START_RECORD                     0
-#define STATE_BEFORE_ACTION_CHOSEN                  1
-#define STATE_WAIT_ACTION_CHOSEN                    2
-#define STATE_WAIT_ACTION_CASE_CHOSEN               3
-#define STATE_WAIT_ACTION_CONFIRMED_STANDBY         4
-#define STATE_WAIT_ACTION_CONFIRMED                 5
-#define STATE_SELECTION_SCRIPT                      6
-#define STATE_WAIT_SET_BEFORE_ACTION                7
-#define STATE_SELECTION_SCRIPT_MAY_RUN              8
+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
+};
 
 void HandleTurnActionSelectionState(void)
 {
@@ -4137,7 +4146,7 @@ void HandleTurnActionSelectionState(void)
                     }
                     break;
                 case ACTION_RUN:
-                    gHitMarker |= HITMARKER_x8000;
+                    gHitMarker |= HITMARKER_RUN;
                     gBattleCommunication[gActiveBank]++;
                     break;
                 case ACTION_WATCHES_CAREFULLY:
@@ -4160,7 +4169,7 @@ void HandleTurnActionSelectionState(void)
                     gBattleCommunication[gActiveBank]++;
                     break;
                 case ACTION_SAFARI_ZONE_RUN:
-                    gHitMarker |= HITMARKER_x8000;
+                    gHitMarker |= HITMARKER_RUN;
                     gBattleCommunication[gActiveBank]++;
                     break;
                 case ACTION_9:
@@ -4221,7 +4230,7 @@ void HandleTurnActionSelectionState(void)
             {
                 if (gBattleBufferB[gActiveBank][1] == 13)
                 {
-                    gHitMarker |= HITMARKER_x8000;
+                    gHitMarker |= HITMARKER_RUN;
                     gActionForBanks[gActiveBank] = ACTION_RUN;
                     gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                 }
@@ -4613,7 +4622,7 @@ void SpecialStatusesClear(void)
 
 static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
 {
-    if (!(gHitMarker & HITMARKER_x8000))
+    if (!(gHitMarker & HITMARKER_RUN))
     {
         while (gBattleStruct->focusPunchBank < gNoOfAllBanks)
         {
@@ -4976,8 +4985,6 @@ void RunBattleScriptCommands(void)
         gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
 }
 
-extern const u8 * const gBattleScriptsForMoveEffects[];
-
 void HandleAction_UseMove(void)
 {
     u8 side;
@@ -5216,6 +5223,7 @@ void HandleAction_Switch(void)
 extern const u8 * const gBattlescriptsForBallThrow[];
 extern const u8 * const gBattlescriptsForRunningByItem[];
 extern const u8 * const gUnknown_082DBD3C[];
+extern const u8 * const gBattlescriptsForSafariActions[];
 
 void HandleAction_UseItem(void)
 {
@@ -5375,3 +5383,198 @@ bool8 TryRunFromBattle(u8 bank)
 
     return effect;
 }
+
+void HandleAction_Run(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+
+    if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
+    {
+        gCurrentTurnActionNumber = gNoOfAllBanks;
+
+        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        {
+            if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+            {
+                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                    gBattleOutcome |= BATTLE_LOST;
+            }
+            else
+            {
+                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                    gBattleOutcome |= BATTLE_WON;
+            }
+        }
+
+        gBattleOutcome |= BATTLE_OUTCOME_BIT_x80;
+        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 = gNoOfAllBanks;
+                gBattleOutcome = BATTLE_POKE_FLED;
+            }
+        }
+    }
+}
+
+void HandleAction_WatchesCarefully(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[0];
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+
+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;
+}
+
+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 < gUnknown_0831BCE0[3 * gBattleStruct->field_7A + gBattleCommunication[MULTISTRING_CHOOSER]])
+            gBattleStruct->field_7B = 1;
+        else
+            gBattleStruct->field_7B -= gUnknown_0831BCE0[3 * gBattleStruct->field_7A + gBattleCommunication[MULTISTRING_CHOOSER]];
+    }
+
+    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[2];
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+
+void HandleAction_GoNear(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+
+    gBattleStruct->field_7C += gUnknown_0831BCEF[gBattleStruct->field_79];
+    if (gBattleStruct->field_7C > 20)
+        gBattleStruct->field_7C = 20;
+
+    gBattleStruct->field_7B +=gUnknown_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;
+}
+
+void HandleAction_SafriZoneRun(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    PlaySE(SE_NIGERU);
+    gCurrentTurnActionNumber = gNoOfAllBanks;
+    gBattleOutcome = BATTLE_RAN;
+}
+
+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;
+}
+
+void HandleAction_Action11(void)
+{
+    if (!sub_8041728())
+    {
+        gBattleStruct->field_4D = 0;
+        gCurrentActionFuncId = ACTION_FINISHED;
+    }
+}
+
+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);
+}
+
+void HandleAction_ActionFinished(void)
+{
+    *(gBattleStruct->field_5C + 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;
+    gBattleMoveFlags = 0;
+    gBattleScripting.animTurn = 0;
+    gBattleScripting.animTargetsHit = 0;
+    gUnknown_02024250[gBankAttacker] = 0;
+    gUnknown_02024258[gBankAttacker] = 0;
+    gBattleStruct->dynamicMoveType = 0;
+    gDynamicBasePower = 0;
+    gBattleScripting.atk49_state = 0;
+    gBattleCommunication[3] = 0;
+    gBattleCommunication[4] = 0;
+    gBattleScripting.field_16 = 0;
+    gBattleResources->battleScriptsStack->size = 0;
+}
+
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index e68137c47..e53292442 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -1600,7 +1600,7 @@ static void atk06_typecalc(void)
         RecordAbilityBattle(gBankTarget, gLastUsedAbility);
     }
     if (gBattleMoveFlags & MOVESTATUS_NOTAFFECTED)
-        gProtectStructs[gBankAttacker].notEffective = 1;
+        gProtectStructs[gBankAttacker].targetNotAffected = 1;
 
     gBattlescriptCurrInstr++;
 }
@@ -1639,14 +1639,14 @@ static void CheckWonderGuardAndLevitate(void)
             if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type1 && gTypeEffectiveness[i + 2] == 0)
             {
                 gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
-                gProtectStructs[gBankAttacker].notEffective = 1;
+                gProtectStructs[gBankAttacker].targetNotAffected = 1;
             }
             if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type2 &&
                 gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2 &&
                 gTypeEffectiveness[i + 2] == TYPE_MUL_NO_EFFECT)
             {
                 gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
-                gProtectStructs[gBankAttacker].notEffective = 1;
+                gProtectStructs[gBankAttacker].targetNotAffected = 1;
             }
 
             // check super effective
@@ -5066,7 +5066,7 @@ static void atk49_moveend(void)
         case 9: // make attacker sprite visible
             if (gBattleMoveFlags & MOVESTATUS_NOEFFECT
                 || !(gStatuses3[gBankAttacker] & (STATUS3_SEMI_INVULNERABLE))
-                || HasMoveFailed(gBankAttacker))
+                || WasUnableToUseMove(gBankAttacker))
             {
                 gActiveBank = gBankAttacker;
                 EmitSpriteInvisibility(0, FALSE);
@@ -5297,7 +5297,7 @@ static void atk4A_typecalc2(void)
         RecordAbilityBattle(gBankTarget, gLastUsedAbility);
     }
     if (gBattleMoveFlags & MOVESTATUS_NOTAFFECTED)
-        gProtectStructs[gBankAttacker].notEffective = 1;
+        gProtectStructs[gBankAttacker].targetNotAffected = 1;
 
     gBattlescriptCurrInstr++;
 }
@@ -9518,19 +9518,19 @@ static void atkB3_rolloutdamagecalculation(void)
 
         if (!(gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS)) // first hit
         {
-            gDisableStructs[gBankAttacker].rolloutTimer1 = 5;
-            gDisableStructs[gBankAttacker].rolloutTimer2 = 5;
+            gDisableStructs[gBankAttacker].rolloutCounter1 = 5;
+            gDisableStructs[gBankAttacker].rolloutCounter2 = 5;
             gBattleMons[gBankAttacker].status2 |= STATUS2_MULTIPLETURNS;
             gLockedMoves[gBankAttacker] = gCurrentMove;
         }
-        if (--gDisableStructs[gBankAttacker].rolloutTimer1 == 0) // last hit
+        if (--gDisableStructs[gBankAttacker].rolloutCounter1 == 0) // last hit
         {
             gBattleMons[gBankAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
         }
 
         gDynamicBasePower = gBattleMoves[gCurrentMove].power;
 
-        for (i = 1; i < (5 - gDisableStructs[gBankAttacker].rolloutTimer1); i++)
+        for (i = 1; i < (5 - gDisableStructs[gBankAttacker].rolloutCounter1); i++)
             gDynamicBasePower *= 2;
 
         if (gBattleMons[gBankAttacker].status2 & STATUS2_DEFENSE_CURL)
diff --git a/src/battle_3.c b/src/battle_util.c
similarity index 96%
rename from src/battle_3.c
rename to src/battle_util.c
index 58e0a05c7..c5a85dd2b 100644
--- a/src/battle_3.c
+++ b/src/battle_util.c
@@ -17,6 +17,7 @@
 #include "battle_controllers.h"
 #include "event_data.h"
 #include "calculate_base_damage.h"
+#include "link.h"
 
 extern const u8* gBattlescriptCurrInstr;
 extern const u8* gBattlescriptPtrsForSelection[BATTLE_BANKS_COUNT];
@@ -33,7 +34,7 @@ extern u8 gBankTarget;
 extern u8 gAbsentBankFlags;
 extern u16 gBattleWeather;
 extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT];
-extern u16 gSideAffecting[];
+extern u16 gSideAffecting[2];
 extern u8 gBattleCommunication[];
 extern void (*gBattleMainFunc)(void);
 extern s32 gBattleMoveDamage;
@@ -45,7 +46,7 @@ extern u32 gHitMarker;
 extern u8 gEffectBank;
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
 extern u8 gBank1;
-extern u16 gChosenMovesByBanks[];
+extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
 extern u8 gBattleMoveFlags;
 extern s32 gTakenDmg[BATTLE_BANKS_COUNT];
 extern u8 gTakenDmgBanks[BATTLE_BANKS_COUNT];
@@ -55,8 +56,10 @@ extern u32 gBattleExecBuffer;
 extern u16 gRandomMove;
 extern u8 gCurrMovePos;
 extern u8 gUnknown_020241E9;
+extern u8 gSentPokesToOpponent[2];
 
 extern const struct BattleMove gBattleMoves[];
+extern const u16 gSoundMovesTable[];
 
 // scripts
 extern const u8 gUnknown_082DAE2A[];
@@ -169,6 +172,7 @@ 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
 
+// strings
 extern const u8 gStatusConditionString_PoisonJpn[];
 extern const u8 gStatusConditionString_SleepJpn[];
 extern const u8 gStatusConditionString_ParalysisJpn[];
@@ -176,12 +180,272 @@ extern const u8 gStatusConditionString_BurnJpn[];
 extern const u8 gStatusConditionString_IceJpn[];
 extern const u8 gStatusConditionString_ConfusionJpn[];
 extern const u8 gStatusConditionString_LoveJpn[];
-extern const u16 gSoundMovesTable[];
 
-extern void sub_803F9EC();
-extern bool8 sub_80423F4(u8 bank, u8, u8);
 extern u8 weather_get_current(void);
-extern s8 GetFlavourRelationByPersonality(u32 personality, u8 flavor);
+
+u8 GetBattleBank(u8 caseId)
+{
+    u8 ret = 0;
+    switch (caseId)
+    {
+    case BS_GET_TARGET:
+        ret = gBankTarget;
+        break;
+    case BS_GET_ATTACKER:
+        ret = gBankAttacker;
+        break;
+    case BS_GET_EFFECT_BANK:
+        ret = gEffectBank;
+        break;
+    case 7:
+        ret = 0;
+        break;
+    case BS_GET_SCRIPTING_BANK:
+        ret = gBattleScripting.bank;
+        break;
+    case 3:
+        ret = gBank1;
+        break;
+    case 5:
+        ret = gBank1;
+        break;
+    case 4:
+    case 6:
+    case 8:
+    case 9:
+    case BS_GET_PLAYER1:
+        ret = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+        break;
+    case BS_GET_OPPONENT1:
+        ret = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+        break;
+    case BS_GET_PLAYER2:
+        ret = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+        break;
+    case BS_GET_OPPONENT2:
+        ret = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+        break;
+    }
+    return ret;
+}
+
+void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move)
+{
+    s32 i;
+
+    if (gBattleMons[bankDef].ability != ABILITY_PRESSURE)
+        return;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (gBattleMons[bankAtk].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[bankAtk].status2 & STATUS2_TRANSFORMED)
+        && !(gDisableStructs[bankAtk].unk18_b & gBitTable[i]))
+    {
+        gActiveBank = bankAtk;
+        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBank].pp[i]);
+        MarkBufferBankForExecution(gActiveBank);
+    }
+}
+
+void PressurePPLoseOnUsingImprision(u8 bankAtk)
+{
+    s32 i, j;
+    s32 imprisionPos = 4;
+    u8 atkSide = GetBankSide(bankAtk);
+
+    for (i = 0; i < gNoOfAllBanks; i++)
+    {
+        if (atkSide != GetBankSide(i) && gBattleMons[i].ability == ABILITY_PRESSURE)
+        {
+            for (j = 0; j < 4; j++)
+            {
+                if (gBattleMons[bankAtk].moves[j] == MOVE_IMPRISON)
+                    break;
+            }
+            if (j != 4)
+            {
+                imprisionPos = j;
+                if (gBattleMons[bankAtk].pp[j] != 0)
+                    gBattleMons[bankAtk].pp[j]--;
+            }
+        }
+    }
+
+    if (imprisionPos != 4
+        && !(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED)
+        && !(gDisableStructs[bankAtk].unk18_b & gBitTable[imprisionPos]))
+    {
+        gActiveBank = bankAtk;
+        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBank].pp[imprisionPos]);
+        MarkBufferBankForExecution(gActiveBank);
+    }
+}
+
+void PressurePPLoseOnUsingPerishSong(u8 bankAtk)
+{
+    s32 i, j;
+    s32 perishSongPos = 4;
+
+    for (i = 0; i < gNoOfAllBanks; i++)
+    {
+        if (gBattleMons[i].ability == ABILITY_PRESSURE && i != bankAtk)
+        {
+            for (j = 0; j < 4; j++)
+            {
+                if (gBattleMons[bankAtk].moves[j] == MOVE_PERISH_SONG)
+                    break;
+            }
+            if (j != 4)
+            {
+                perishSongPos = j;
+                if (gBattleMons[bankAtk].pp[j] != 0)
+                    gBattleMons[bankAtk].pp[j]--;
+            }
+        }
+    }
+
+    if (perishSongPos != 4
+        && !(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED)
+        && !(gDisableStructs[bankAtk].unk18_b & gBitTable[perishSongPos]))
+    {
+        gActiveBank = bankAtk;
+        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + perishSongPos, 0, 1, &gBattleMons[gActiveBank].pp[perishSongPos]);
+        MarkBufferBankForExecution(gActiveBank);
+    }
+}
+
+void MarkAllBufferBanksForExecution(void) // unused
+{
+    s32 i;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        for (i = 0; i < gNoOfAllBanks; i++)
+            gBattleExecBuffer |= gBitTable[i] << 0x1C;
+    }
+    else
+    {
+        for (i = 0; i < gNoOfAllBanks; i++)
+            gBattleExecBuffer |= gBitTable[i];
+    }
+}
+
+void MarkBufferBankForExecution(u8 bank)
+{
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        gBattleExecBuffer |= gBitTable[bank] << 0x1C;
+    }
+    else
+    {
+        gBattleExecBuffer |= gBitTable[bank];
+    }
+}
+
+void sub_803F850(u8 arg0)
+{
+    s32 i;
+
+    for (i = 0; i < sub_8009FCC(); i++)
+        gBattleExecBuffer |= gBitTable[arg0] << (i << 2);
+
+    gBattleExecBuffer &= ~(0x10000000 << arg0);
+}
+
+void CancelMultiTurnMoves(u8 bank)
+{
+    gBattleMons[bank].status2 &= ~(STATUS2_MULTIPLETURNS);
+    gBattleMons[bank].status2 &= ~(STATUS2_LOCK_CONFUSE);
+    gBattleMons[bank].status2 &= ~(STATUS2_UPROAR);
+    gBattleMons[bank].status2 &= ~(STATUS2_BIDE);
+
+    gStatuses3[bank] &= ~(STATUS3_SEMI_INVULNERABLE);
+
+    gDisableStructs[bank].rolloutCounter1 = 0;
+    gDisableStructs[bank].furyCutterCounter = 0;
+}
+
+bool8 WasUnableToUseMove(u8 bank)
+{
+    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)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void PrepareStringBattle(u16 stringId, u8 bank)
+{
+    gActiveBank = bank;
+    EmitPrintString(0, stringId);
+    MarkBufferBankForExecution(gActiveBank);
+}
+
+void ResetSentPokesToOpponentValue(void)
+{
+    s32 i;
+    u32 bits = 0;
+
+    gSentPokesToOpponent[0] = 0;
+    gSentPokesToOpponent[1] = 0;
+
+    for (i = 0; i < gNoOfAllBanks; i += 2)
+        bits |= gBitTable[gBattlePartyID[i]];
+
+    for (i = 1; i < gNoOfAllBanks; i += 2)
+        gSentPokesToOpponent[(i & BIT_MON) >> 1] = bits;
+}
+
+void sub_803F9EC(u8 bank)
+{
+    s32 i = 0;
+    u32 bits = 0;
+
+    if (GetBankSide(bank) == SIDE_OPPONENT)
+    {
+        u8 id = ((bank & BIT_MON) >> 1);
+        gSentPokesToOpponent[id] = 0;
+
+        for (i = 0; i < gNoOfAllBanks; i += 2)
+        {
+            if (!(gAbsentBankFlags & gBitTable[i]))
+                bits |= gBitTable[gBattlePartyID[i]];
+        }
+
+        gSentPokesToOpponent[id] = bits;
+    }
+}
+
+void sub_803FA70(u8 bank)
+{
+    if (GetBankSide(bank) == SIDE_OPPONENT)
+    {
+        sub_803F9EC(bank);
+    }
+    else
+    {
+        s32 i;
+        for (i = 1; i < gNoOfAllBanks; i++)
+            gSentPokesToOpponent[(i & BIT_MON) >> 1] |= gBitTable[gBattlePartyID[bank]];
+    }
+}
 
 void BattleScriptPush(const u8* bsPtr)
 {
@@ -828,7 +1092,7 @@ u8 TurnBasedEffects(void)
                     {
                         gBankAttacker = gActiveBank;
                         gBattleMons[gActiveBank].status2 -= 0x10;  // uproar timer goes down
-                        if (HasMoveFailed(gActiveBank))
+                        if (WasUnableToUseMove(gActiveBank))
                         {
                             CancelMultiTurnMoves(gActiveBank);
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -854,7 +1118,7 @@ u8 TurnBasedEffects(void)
                 if (gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE)
                 {
                     gBattleMons[gActiveBank].status2 -= 0x400;
-                    if (HasMoveFailed(gActiveBank))
+                    if (WasUnableToUseMove(gActiveBank))
                         CancelMultiTurnMoves(gActiveBank);
                     else if (!(gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE)
                      && (gBattleMons[gActiveBank].status2 & STATUS2_MULTIPLETURNS))
@@ -1125,7 +1389,7 @@ bool8 sub_8041728(void)
         case 4:
             do
             {
-                gBank1 = gBankTarget = gBattleStruct->field_4E; //or should banks be switched?
+                gBank1 = gBankTarget = gBattleStruct->field_4E;
                 if (gBattleMons[gBattleStruct->field_4E].hp == 0
                  && !(gAbsentBankFlags & gBitTable[gBattleStruct->field_4E]))
                 {
@@ -6190,7 +6454,7 @@ void ClearFuryCutterDestinyBondGrudge(u8 bank)
     gStatuses3[bank] &= ~(STATUS3_GRUDGE);
 }
 
-void sub_80458B4(void)
+void HandleAction_RunBattleScript(void) // identical to RunBattleScriptCommands
 {
     if (gBattleExecBuffer == 0)
         gBattleScriptingCommandsTable[*gBattlescriptCurrInstr]();

From 7b88c7f2f0bceb6adc0ea3081c18e175dd4cb21c Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 6 Oct 2017 19:09:37 +0200
Subject: [PATCH 33/42] move const data to battle files

---
 asm/battle_message.s  |   2 +-
 data/battle_message.s |   7 ++
 data/data2b.s         |  43 ----------
 include/battle_2.h    |  11 +++
 ld_script.txt         |   2 +
 src/battle_2.c        | 187 +++++++++++++++++++++++++++++-------------
 src/battle_util.c     |  25 +++---
 7 files changed, 162 insertions(+), 115 deletions(-)

diff --git a/asm/battle_message.s b/asm/battle_message.s
index c39903dcc..b114a36f8 100644
--- a/asm/battle_message.s
+++ b/asm/battle_message.s
@@ -738,7 +738,7 @@ _0814E730:
 	ldr r5, [sp]
 	ldr r4, [sp, 0x4]
 	movs r3, 0
-	ldr r2, =gUnknown_0831BCA8
+	ldr r2, =gStatusConditionStringsTable
 _0814E738:
 	ldr r1, [r2]
 	ldr r0, [r1]
diff --git a/data/battle_message.s b/data/battle_message.s
index 05847eed0..4c72557d8 100644
--- a/data/battle_message.s
+++ b/data/battle_message.s
@@ -1768,12 +1768,19 @@ gText_SafariBalls:: @ 85CCB2C
 gText_SafariBallLeft:: @ 85CCB3C
 	.string "{HIGHLIGHT DARK_GREY}Left: $"
 	.string "{HIGHLIGHT DARK_GREY}$"
+gText_Sleep::
 	.string "sleep$"
+gText_Poison::    
 	.string "poison$"
+gText_Burn::
 	.string "burn$"
+gText_Paralysis::
 	.string "paralysis$"
+gText_Ice::
 	.string "ice$"
+gText_Confusion::
 	.string "confusion$"
+gText_Love::
 	.string "love$"
 
 gText_SpaceAndSpace:: @ 85CCB79
diff --git a/data/data2b.s b/data/data2b.s
index 717b70d4d..802399fca 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -225,46 +225,3 @@ gTrainerMoneyTable:: @ 831AEB8
 
 @ 831BAD4
 	.include "data/text/ability_description_pointers.inc"
-
-gTurnActionsFuncsTable:: @ 831BC0C
-	.incbin "baserom.gba", 0x31bc0c, 0x38
-
-gEndTurnFuncsTable:: @ 831BC44
-	.incbin "baserom.gba", 0x31bc44, 0x2c
-
-gStatusConditionString_PoisonJpn:: @ 831BC70
-	.incbin "baserom.gba", 0x31bc70, 0x8
-
-gStatusConditionString_SleepJpn:: @ 831BC78
-	.incbin "baserom.gba", 0x31bc78, 0x8
-
-gStatusConditionString_ParalysisJpn:: @ 831BC80
-	.incbin "baserom.gba", 0x31bc80, 0x8
-
-gStatusConditionString_BurnJpn:: @ 831BC88
-	.incbin "baserom.gba", 0x31bc88, 0x8
-
-gStatusConditionString_IceJpn:: @ 831BC90
-	.incbin "baserom.gba", 0x31bc90, 0x8
-
-gStatusConditionString_ConfusionJpn:: @ 831BC98
-	.incbin "baserom.gba", 0x31bc98, 0x8
-
-gStatusConditionString_LoveJpn:: @ 831BCA0
-	.incbin "baserom.gba", 0x31bca0, 0x8
-
-gUnknown_0831BCA8:: @ 831BCA8
-	.incbin "baserom.gba", 0x31bca8, 0x38
-
-gUnknown_0831BCE0:: @ 831BCE0
-	.incbin "baserom.gba", 0x31bce0, 0xf
-
-gUnknown_0831BCEF:: @ 831BCEF
-	.incbin "baserom.gba", 0x31bcef, 0x4
-
-gUnknown_0831BCF3:: @ 831BCF3
-	.incbin "baserom.gba", 0x31bcf3, 0x5
-
-gSoundMovesTable:: @ 831BCF8
-	.incbin "baserom.gba", 0x31bcf8, 0x18
-
diff --git a/include/battle_2.h b/include/battle_2.h
index e4385db04..edd6b6ef3 100644
--- a/include/battle_2.h
+++ b/include/battle_2.h
@@ -15,5 +15,16 @@ void SwapTurnOrder(u8 id1, u8 id2);
 void BattleTurnPassed(void);
 void RunBattleScriptCommands_PopCallbacksStack(void);
 void RunBattleScriptCommands(void);
+void sub_8039E9C(struct Sprite *sprite);
+
+extern const u8 gStatusConditionString_PoisonJpn[8];
+extern const u8 gStatusConditionString_SleepJpn[8];
+extern const u8 gStatusConditionString_ParalysisJpn[8];
+extern const u8 gStatusConditionString_BurnJpn[8];
+extern const u8 gStatusConditionString_IceJpn[8];
+extern const u8 gStatusConditionString_ConfusionJpn[8];
+extern const u8 gStatusConditionString_LoveJpn[8];
+
+extern const u8 * const gStatusConditionStringsTable[][2];
 
 #endif // GUARD_BATTLE_2_H
diff --git a/ld_script.txt b/ld_script.txt
index 4d66ea561..cf8591194 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -325,6 +325,8 @@ SECTIONS {
         data/link.o(.rodata);
         src/rtc.o(.rodata);
         data/data2b.o(.rodata);
+        src/battle_2.o(.rodata);
+        src/battle_util.o(.rodata);
         src/battle_script_commands.o(.rodata);
         data/battle_controller_player.o(.rodata);
         data/smokescreen.o(.rodata);
diff --git a/src/battle_2.c b/src/battle_2.c
index 37ab7ab1f..fd7cf6863 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -158,10 +158,11 @@ 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 gUnknown_0831BCE0[];
-extern const u8 gUnknown_0831BCEF[];
-extern const u8 gUnknown_0831BCF3[];
 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 gBattlescriptsForSafariActions[];
 
 // strings
 extern const u8 gText_LinkStandby3[];
@@ -171,6 +172,13 @@ 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[];
 
 // battlescripts
 extern const u8 gUnknown_082DB8BE[];
@@ -230,7 +238,7 @@ 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);
-void BattleMainCB1(void);
+static void BattleMainCB1(void);
 static void sub_8038538(struct Sprite *sprite);
 static void sub_8038F14(void);
 static void sub_8038F34(void);
@@ -243,12 +251,11 @@ 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);
-void sub_8039AF4(struct Sprite *sprite);
-void sub_8039E9C(struct Sprite *sprite);
-void SpriteCallbackDummy_3(struct Sprite *sprite);
-void oac_poke_ally_(struct Sprite *sprite);
-void SpecialStatusesClear(void);
-void TurnValuesCleanUp(bool8 var0);
+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);
@@ -264,17 +271,92 @@ static void BattleIntroOpponent2SendsOutMonAnimation(void);
 static void BattleIntroRecordMonsToDex(void);
 static void BattleIntroPlayer1SendsOutMonAnimation(void);
 static void TryDoEventsBeforeFirstTurn(void);
-void HandleTurnActionSelectionState(void);
+static void HandleTurnActionSelectionState(void);
 static void RunTurnActionsFunctions(void);
 static void SetActionsAndBanksTurnOrder(void);
-void sub_803CDF8(void);
-bool8 sub_803CDB8(void);
+static void sub_803CDF8(void);
+static bool8 sub_803CDB8(void);
 static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void);
-void HandleEndTurn_FinishBattle(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,            // 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_FinishBattle,         // battle outcome 8
+    HandleEndTurn_FinishBattle,         // BATTLE_FORFEITED
+    HandleEndTurn_FinishBattle,         // BATTLE_OPPONENT_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[][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)
 {
@@ -2493,7 +2575,7 @@ void sub_8039AD8(struct Sprite *sprite)
     sprite->callback = sub_8039AF4;
 }
 
-void sub_8039AF4(struct Sprite *sprite)
+static void sub_8039AF4(struct Sprite *sprite)
 {
     sprite->data3--;
     if (sprite->data3 == 0)
@@ -2528,7 +2610,7 @@ void sub_8039BB4(struct Sprite *sprite)
     sprite->callback = oac_poke_ally_;
 }
 
-void oac_poke_ally_(struct Sprite *sprite)
+static void oac_poke_ally_(struct Sprite *sprite)
 {
     if ((gUnknown_020243FC & 1) == 0)
     {
@@ -2546,7 +2628,7 @@ void sub_80105DC(struct Sprite *sprite)
     sprite->callback = SpriteCallbackDummy_3;
 }
 
-void SpriteCallbackDummy_3(struct Sprite *sprite)
+static void SpriteCallbackDummy_3(struct Sprite *sprite)
 {
 }
 
@@ -2675,7 +2757,7 @@ void BeginBattleIntro(void)
     gBattleMainFunc = BattleIntroGetMonsData;
 }
 
-void BattleMainCB1(void)
+static void BattleMainCB1(void)
 {
     gBattleMainFunc();
 
@@ -3643,7 +3725,7 @@ static void TryDoEventsBeforeFirstTurn(void)
     }
 }
 
-void HandleEndTurn_ContinueBattle(void)
+static void HandleEndTurn_ContinueBattle(void)
 {
     s32 i;
 
@@ -3843,7 +3925,7 @@ enum
     STATE_SELECTION_SCRIPT_MAY_RUN
 };
 
-void HandleTurnActionSelectionState(void)
+static void HandleTurnActionSelectionState(void)
 {
     s32 i;
 
@@ -4271,7 +4353,7 @@ void HandleTurnActionSelectionState(void)
     }
 }
 
-bool8 sub_803CDB8(void)
+static bool8 sub_803CDB8(void)
 {
     s32 i, var;
 
@@ -4287,7 +4369,7 @@ bool8 sub_803CDB8(void)
         return FALSE;
 }
 
-void sub_803CDF8(void)
+static void sub_803CDF8(void)
 {
     *(gBattleStruct->field_5C + gActiveBank) = gBattleBufferB[gActiveBank][1];
     RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][1]);
@@ -4571,7 +4653,7 @@ static void SetActionsAndBanksTurnOrder(void)
     gBattleStruct->focusPunchBank = 0;
 }
 
-void TurnValuesCleanUp(bool8 var0)
+static void TurnValuesCleanUp(bool8 var0)
 {
     s32 i;
     u8 *dataPtr;
@@ -4608,7 +4690,7 @@ void TurnValuesCleanUp(bool8 var0)
     gSideTimers[1].followmeTimer = 0;
 }
 
-void SpecialStatusesClear(void)
+static void SpecialStatusesClear(void)
 {
     for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
     {
@@ -4655,21 +4737,18 @@ static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
     gBattleResources->battleScriptsStack->size = 0;
 }
 
-extern void (* const gTurnActionsFuncsTable[])(void);
-extern void (* const gEndTurnFuncsTable[])(void);
-
 static void RunTurnActionsFunctions(void)
 {
     if (gBattleOutcome != 0)
         gCurrentActionFuncId = 12;
 
     *(&gBattleStruct->field_4B) = gCurrentTurnActionNumber;
-    gTurnActionsFuncsTable[gCurrentActionFuncId]();
+    sTurnActionsFuncsTable[gCurrentActionFuncId]();
 
     if (gCurrentTurnActionNumber >= gNoOfAllBanks) // everyone did their actions, turn finished
     {
         gHitMarker &= ~(HITMARKER_x100000);
-        gBattleMainFunc = gEndTurnFuncsTable[gBattleOutcome & 0x7F];
+        gBattleMainFunc = sEndTurnFuncsTable[gBattleOutcome & 0x7F];
     }
     else
     {
@@ -4681,7 +4760,7 @@ static void RunTurnActionsFunctions(void)
     }
 }
 
-void HandleEndTurn_BattleWon(void)
+static void HandleEndTurn_BattleWon(void)
 {
     gCurrentActionFuncId = 0;
 
@@ -4739,7 +4818,7 @@ void HandleEndTurn_BattleWon(void)
     gBattleMainFunc = HandleEndTurn_FinishBattle;
 }
 
-void HandleEndTurn_BattleLost(void)
+static void HandleEndTurn_BattleLost(void)
 {
     gCurrentActionFuncId = 0;
 
@@ -4775,7 +4854,7 @@ void HandleEndTurn_BattleLost(void)
     gBattleMainFunc = HandleEndTurn_FinishBattle;
 }
 
-void HandleEndTurn_RanFromBattle(void)
+static void HandleEndTurn_RanFromBattle(void)
 {
     gCurrentActionFuncId = 0;
 
@@ -4809,7 +4888,7 @@ void HandleEndTurn_RanFromBattle(void)
     gBattleMainFunc = HandleEndTurn_FinishBattle;
 }
 
-void HandleEndTurn_MonFled(void)
+static void HandleEndTurn_MonFled(void)
 {
     gCurrentActionFuncId = 0;
 
@@ -4819,7 +4898,7 @@ void HandleEndTurn_MonFled(void)
     gBattleMainFunc = HandleEndTurn_FinishBattle;
 }
 
-void HandleEndTurn_FinishBattle(void)
+static void HandleEndTurn_FinishBattle(void)
 {
     if (gCurrentActionFuncId == 0xB || gCurrentActionFuncId == 0xC)
     {
@@ -4985,7 +5064,7 @@ void RunBattleScriptCommands(void)
         gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
 }
 
-void HandleAction_UseMove(void)
+static void HandleAction_UseMove(void)
 {
     u8 side;
     u8 var = 4;
@@ -5202,7 +5281,7 @@ void HandleAction_UseMove(void)
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 }
 
-void HandleAction_Switch(void)
+static void HandleAction_Switch(void)
 {
     gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
@@ -5220,12 +5299,7 @@ void HandleAction_Switch(void)
         gBattleResults.playerSwitchesCounter++;
 }
 
-extern const u8 * const gBattlescriptsForBallThrow[];
-extern const u8 * const gBattlescriptsForRunningByItem[];
-extern const u8 * const gUnknown_082DBD3C[];
-extern const u8 * const gBattlescriptsForSafariActions[];
-
-void HandleAction_UseItem(void)
+static void HandleAction_UseItem(void)
 {
     gBankAttacker = gBankTarget = gBanksByTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
@@ -5384,7 +5458,7 @@ bool8 TryRunFromBattle(u8 bank)
     return effect;
 }
 
-void HandleAction_Run(void)
+static void HandleAction_Run(void)
 {
     gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
 
@@ -5438,7 +5512,7 @@ void HandleAction_Run(void)
     }
 }
 
-void HandleAction_WatchesCarefully(void)
+static void HandleAction_WatchesCarefully(void)
 {
     gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
@@ -5447,7 +5521,7 @@ void HandleAction_WatchesCarefully(void)
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 }
 
-void HandleAction_SafariZoneBallThrow(void)
+static void HandleAction_SafariZoneBallThrow(void)
 {
     gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
@@ -5458,7 +5532,7 @@ void HandleAction_SafariZoneBallThrow(void)
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 }
 
-void HandleAction_ThrowPokeblock(void)
+static void HandleAction_ThrowPokeblock(void)
 {
     gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
@@ -5472,27 +5546,27 @@ void HandleAction_ThrowPokeblock(void)
         gBattleStruct->field_7A++;
     if (gBattleStruct->field_7B > 1)
     {
-        if (gBattleStruct->field_7B < gUnknown_0831BCE0[3 * gBattleStruct->field_7A + gBattleCommunication[MULTISTRING_CHOOSER]])
+        if (gBattleStruct->field_7B < sUnknown_0831BCE0[gBattleStruct->field_7A][gBattleCommunication[MULTISTRING_CHOOSER]])
             gBattleStruct->field_7B = 1;
         else
-            gBattleStruct->field_7B -= gUnknown_0831BCE0[3 * gBattleStruct->field_7A + gBattleCommunication[MULTISTRING_CHOOSER]];
+            gBattleStruct->field_7B -= sUnknown_0831BCE0[gBattleStruct->field_7A][gBattleCommunication[MULTISTRING_CHOOSER]];
     }
 
     gBattlescriptCurrInstr = gBattlescriptsForSafariActions[2];
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 }
 
-void HandleAction_GoNear(void)
+static void HandleAction_GoNear(void)
 {
     gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
 
-    gBattleStruct->field_7C += gUnknown_0831BCEF[gBattleStruct->field_79];
+    gBattleStruct->field_7C += sUnknown_0831BCEF[gBattleStruct->field_79];
     if (gBattleStruct->field_7C > 20)
         gBattleStruct->field_7C = 20;
 
-    gBattleStruct->field_7B +=gUnknown_0831BCF3[gBattleStruct->field_79];
+    gBattleStruct->field_7B +=sUnknown_0831BCF3[gBattleStruct->field_79];
     if (gBattleStruct->field_7B > 20)
         gBattleStruct->field_7B = 20;
 
@@ -5509,7 +5583,7 @@ void HandleAction_GoNear(void)
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 }
 
-void HandleAction_SafriZoneRun(void)
+static void HandleAction_SafriZoneRun(void)
 {
     gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
     PlaySE(SE_NIGERU);
@@ -5517,7 +5591,7 @@ void HandleAction_SafriZoneRun(void)
     gBattleOutcome = BATTLE_RAN;
 }
 
-void HandleAction_Action9(void)
+static void HandleAction_Action9(void)
 {
     gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
@@ -5530,7 +5604,7 @@ void HandleAction_Action9(void)
     gActionsByTurnOrder[1] = ACTION_FINISHED;
 }
 
-void HandleAction_Action11(void)
+static void HandleAction_Action11(void)
 {
     if (!sub_8041728())
     {
@@ -5539,7 +5613,7 @@ void HandleAction_Action11(void)
     }
 }
 
-void HandleAction_NothingIsFainted(void)
+static void HandleAction_NothingIsFainted(void)
 {
     gCurrentTurnActionNumber++;
     gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber];
@@ -5550,7 +5624,7 @@ void HandleAction_NothingIsFainted(void)
                     | HITMARKER_x8000000 | HITMARKER_x4000000);
 }
 
-void HandleAction_ActionFinished(void)
+static void HandleAction_ActionFinished(void)
 {
     *(gBattleStruct->field_5C + gBanksByTurnOrder[gCurrentTurnActionNumber]) = 6;
     gCurrentTurnActionNumber++;
@@ -5577,4 +5651,3 @@ void HandleAction_ActionFinished(void)
     gBattleScripting.field_16 = 0;
     gBattleResources->battleScriptsStack->size = 0;
 }
-
diff --git a/src/battle_util.c b/src/battle_util.c
index c5a85dd2b..c6762dd99 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -59,7 +59,6 @@ extern u8 gUnknown_020241E9;
 extern u8 gSentPokesToOpponent[2];
 
 extern const struct BattleMove gBattleMoves[];
-extern const u16 gSoundMovesTable[];
 
 // scripts
 extern const u8 gUnknown_082DAE2A[];
@@ -172,17 +171,15 @@ 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
 
-// strings
-extern const u8 gStatusConditionString_PoisonJpn[];
-extern const u8 gStatusConditionString_SleepJpn[];
-extern const u8 gStatusConditionString_ParalysisJpn[];
-extern const u8 gStatusConditionString_BurnJpn[];
-extern const u8 gStatusConditionString_IceJpn[];
-extern const u8 gStatusConditionString_ConfusionJpn[];
-extern const u8 gStatusConditionString_LoveJpn[];
-
 extern u8 weather_get_current(void);
 
+// rom const data
+static const u16 sSoundMovesTable[] =
+{
+    MOVE_GROWL, MOVE_ROAR, MOVE_SING, MOVE_SUPERSONIC, MOVE_SCREECH, MOVE_SNORE,
+    MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, 0xFFFF
+};
+
 u8 GetBattleBank(u8 caseId)
 {
     u8 ret = 0;
@@ -2109,12 +2106,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
         //_08042EF8
             if (gLastUsedAbility == ABILITY_SOUNDPROOF)
             {
-                for (i = 0; gSoundMovesTable[i] != 0xFFFF; i++)
+                for (i = 0; sSoundMovesTable[i] != 0xFFFF; i++)
                 {
-                    if (gSoundMovesTable[i] == move)
+                    if (sSoundMovesTable[i] == move)
                         break;
                 }
-                if (gSoundMovesTable[i] != 0xFFFF)
+                if (sSoundMovesTable[i] != 0xFFFF)
                 {
                     if (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS)
                         gHitMarker |= HITMARKER_NO_PPDEDUCT;
@@ -3415,7 +3412,7 @@ _08042EF8:\n\
 	bl _0804441E\n\
 _08042F02:\n\
 	movs r4, 0\n\
-	ldr r0, =gSoundMovesTable\n\
+	ldr r0, =sSoundMovesTable\n\
 	ldrh r2, [r0]\n\
 	ldr r3, =0x0000ffff\n\
 	adds r1, r0, 0\n\

From d0dfc758fc6684e765736c7aad7190328d3e145c Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Fri, 6 Oct 2017 18:33:35 -0400
Subject: [PATCH 34/42] decompile save_failed_screen.c

---
 asm/save_failed_screen.s     | 707 -----------------------------------
 include/gba/flash_internal.h |   1 +
 include/save.h               |   2 +-
 ld_script.txt                |   2 +-
 src/save_failed_screen.c     | 332 ++++++++++++++++
 5 files changed, 335 insertions(+), 709 deletions(-)
 delete mode 100644 asm/save_failed_screen.s
 create mode 100755 src/save_failed_screen.c

diff --git a/asm/save_failed_screen.s b/asm/save_failed_screen.s
deleted file mode 100644
index 182ff8954..000000000
--- a/asm/save_failed_screen.s
+++ /dev/null
@@ -1,707 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8178F44
-sub_8178F44: @ 8178F44
-	push {r4,r5,lr}
-	sub sp, 0x18
-	adds r5, r0, 0
-	adds r4, r1, 0
-	adds r3, r2, 0
-	lsls r3, 24
-	add r0, sp, 0x14
-	movs r2, 0
-	strb r2, [r0]
-	adds r1, r0, 0
-	movs r0, 0xF
-	strb r0, [r1, 0x1]
-	movs r0, 0x3
-	strb r0, [r1, 0x2]
-	ldr r0, =gUnknown_0203BD0E
-	ldrb r0, [r0]
-	lsls r4, 27
-	lsrs r4, 24
-	lsrs r3, 21
-	adds r3, 0x1
-	lsls r3, 24
-	lsrs r3, 24
-	str r2, [sp]
-	str r2, [sp, 0x4]
-	str r1, [sp, 0x8]
-	str r2, [sp, 0xC]
-	str r5, [sp, 0x10]
-	movs r1, 0x1
-	adds r2, r4, 0
-	bl AddTextPrinterParametrized2
-	add sp, 0x18
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8178F44
-
-	thumb_func_start DoSaveFailedScreen
-DoSaveFailedScreen: @ 8178F90
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r0, =sub_8178FDC
-	bl SetMainCallback2
-	ldr r0, =gUnknown_0203BCFC
-	strh r4, [r0]
-	ldr r1, =gUnknown_0203BCFE
-	movs r2, 0
-	movs r0, 0
-	strh r0, [r1]
-	strh r0, [r1, 0x2]
-	ldr r0, =gUnknown_0203BD0E
-	strb r2, [r0]
-	strb r2, [r0, 0x1]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end DoSaveFailedScreen
-
-	thumb_func_start sub_8178FC8
-sub_8178FC8: @ 8178FC8
-	push {lr}
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8178FC8
-
-	thumb_func_start sub_8178FDC
-sub_8178FDC: @ 8178FDC
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0xC
-	ldr r0, =gMain
-	movs r1, 0x87
-	lsls r1, 3
-	adds r7, r0, r1
-	ldrb r0, [r7]
-	cmp r0, 0
-	beq _08178FF8
-	cmp r0, 0x1
-	bne _08178FF8
-	b _0817925C
-_08178FF8:
-	movs r0, 0
-	bl SetVBlankCallback
-	movs r0, 0
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0xE
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0xC
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0xA
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x8
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x1C
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x1E
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x18
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x1A
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x14
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x16
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x10
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x12
-	movs r1, 0
-	bl SetGpuReg
-	add r1, sp, 0x4
-	movs r0, 0
-	strh r0, [r1]
-	ldr r2, =0x040000d4
-	str r1, [r2]
-	movs r1, 0xC0
-	lsls r1, 19
-	str r1, [r2, 0x4]
-	ldr r0, =0x8100c000
-	str r0, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	movs r3, 0
-	mov r8, r3
-	str r3, [sp, 0x8]
-	add r4, sp, 0x8
-	str r4, [r2]
-	movs r0, 0xE0
-	lsls r0, 19
-	str r0, [r2, 0x4]
-	ldr r0, =0x85000100
-	str r0, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	add r0, sp, 0x4
-	mov r3, r8
-	strh r3, [r0]
-	str r0, [r2]
-	movs r0, 0xA0
-	lsls r0, 19
-	str r0, [r2, 0x4]
-	ldr r0, =0x81000200
-	str r0, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	ldr r0, =gUnknown_085B0E04
-	bl LZ77UnCompVram
-	ldr r0, =gUnknown_085B0A80
-	ldr r1, =0x06007000
-	bl LZ77UnCompVram
-	ldr r0, =gUnknown_085B0C0C
-	ldr r1, =0x06007800
-	bl LZ77UnCompVram
-	ldr r0, =gUnknown_085EFDE4
-	ldr r1, =0x06010020
-	bl LZ77UnCompVram
-	movs r0, 0
-	bl ResetBgsAndClearDma3BusyFlags
-	ldr r1, =gUnknown_085EFD88
-	movs r0, 0
-	movs r2, 0x3
-	bl InitBgsFromTemplates
-	ldr r5, =0x0201e000
-	movs r0, 0
-	adds r1, r5, 0
-	bl SetBgTilemapBuffer
-	mov r0, r8
-	str r0, [sp, 0x8]
-	ldr r2, =0x05000200
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl CpuSet
-	ldr r1, =gUnknown_0850E87C
-	movs r2, 0x90
-	lsls r2, 1
-	movs r6, 0x85
-	lsls r6, 2
-	movs r0, 0
-	adds r3, r6, 0
-	bl LoadBgTiles
-	ldr r0, =gUnknown_085EFD94
-	bl InitWindows
-	ldr r0, =gUnknown_085EFD9C
-	bl AddWindowWithoutTileMap
-	ldr r4, =gUnknown_0203BD0E
-	strb r0, [r4]
-	ldrb r0, [r4]
-	movs r1, 0x80
-	lsls r1, 4
-	adds r2, r5, r1
-	movs r1, 0x7
-	bl SetWindowAttribute
-	ldr r0, =gUnknown_085EFDA4
-	bl AddWindowWithoutTileMap
-	strb r0, [r4, 0x1]
-	ldrb r0, [r4, 0x1]
-	movs r3, 0xE8
-	lsls r3, 5
-	adds r5, r3
-	movs r1, 0x7
-	adds r2, r5, 0
-	bl SetWindowAttribute
-	bl DeactivateAllTextPrinters
-	bl ResetSpriteData
-	bl ResetTasks
-	bl ResetPaletteFade
-	ldr r0, =gUnknown_085B0A00
-	movs r1, 0
-	movs r2, 0x40
-	bl LoadPalette
-	ldr r0, =gUnknown_085EFDC4
-	movs r1, 0x80
-	lsls r1, 1
-	movs r2, 0x20
-	bl LoadPalette
-	ldr r0, =gUnknown_0850FEFC
-	movs r1, 0xE0
-	movs r2, 0x20
-	bl LoadPalette
-	ldr r0, =gUnknown_0860F074
-	movs r1, 0xF0
-	movs r2, 0x20
-	bl LoadPalette
-	ldrb r0, [r4]
-	movs r1, 0
-	adds r2, r6, 0
-	movs r3, 0xE
-	bl SetWindowBorderStyle
-	ldrb r0, [r4, 0x1]
-	movs r1, 0
-	adds r2, r6, 0
-	movs r3, 0xE
-	bl SetWindowBorderStyle
-	ldrb r0, [r4, 0x1]
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldrb r0, [r4]
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldrb r0, [r4, 0x1]
-	movs r1, 0x2
-	bl CopyWindowToVram
-	ldrb r0, [r4]
-	movs r1, 0x1
-	bl CopyWindowToVram
-	ldr r0, =gText_SaveFailedCheckingBackup
-	movs r1, 0x1
-	movs r2, 0
-	bl sub_8178F44
-	movs r0, 0x1
-	negs r0, r0
-	mov r1, r8
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	movs r0, 0x1
-	bl EnableInterrupts
-	ldr r0, =sub_8178FC8
-	bl SetVBlankCallback
-	movs r1, 0x82
-	lsls r1, 5
-	movs r0, 0
-	bl SetGpuReg
-	movs r0, 0
-	bl ShowBg
-	movs r0, 0x2
-	bl ShowBg
-	movs r0, 0x3
-	bl ShowBg
-	ldrb r0, [r7]
-	adds r0, 0x1
-	strb r0, [r7]
-	b _08179272
-	.pool
-_0817925C:
-	bl UpdatePaletteFade
-	lsls r0, 24
-	cmp r0, 0
-	bne _08179272
-	ldr r0, =sub_8179288
-	bl SetMainCallback2
-	ldr r0, =sub_8179454
-	bl SetVBlankCallback
-_08179272:
-	add sp, 0xC
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8178FDC
-
-	thumb_func_start sub_8179288
-sub_8179288: @ 8179288
-	push {r4-r6,lr}
-	movs r5, 0
-	ldr r0, =gUnknown_0203BCFE
-	movs r1, 0x1
-	strh r1, [r0]
-	ldr r1, =gDamagedSaveSectors
-	ldr r0, [r1]
-	cmp r0, 0
-	beq _081792EC
-	adds r6, r1, 0
-_0817929C:
-	ldr r0, [r6]
-	bl sub_81795AC
-	lsls r0, 24
-	cmp r0, 0
-	bne _08179348
-	ldr r4, =gUnknown_0203BD0E
-	ldrb r0, [r4]
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r0, =gText_CheckCompleted
-	movs r1, 0x1
-	movs r2, 0
-	bl sub_8178F44
-	ldr r0, =gUnknown_0203BCFC
-	ldrb r0, [r0]
-	bl HandleSavingData
-	ldr r0, [r6]
-	cmp r0, 0
-	beq _081792DC
-	ldrb r0, [r4]
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r0, =gText_SaveFailedCheckingBackup
-	movs r1, 0x1
-	movs r2, 0
-	bl sub_8178F44
-_081792DC:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, [r6]
-	cmp r0, 0
-	beq _081792EC
-	cmp r5, 0x2
-	bls _0817929C
-_081792EC:
-	cmp r5, 0x3
-	bne _0817931C
-	ldr r0, =gUnknown_0203BD0E
-	ldrb r0, [r0]
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r0, =gText_BackupMemoryDamaged
-	b _08179330
-	.pool
-_0817931C:
-	ldr r0, =gUnknown_0203BD0E
-	ldrb r0, [r0]
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r0, =gGameContinueCallback
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _08179370
-	ldr r0, =gText_SaveCompleteGameCannotContinue
-_08179330:
-	movs r1, 0x1
-	movs r2, 0
-	bl sub_8178F44
-	b _0817937A
-	.pool
-_08179348:
-	ldr r0, =gUnknown_0203BD0E
-	ldrb r0, [r0]
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r0, =gText_BackupMemoryDamaged
-	movs r1, 0x1
-	movs r2, 0
-	bl sub_8178F44
-	ldr r0, =sub_8179390
-	bl SetMainCallback2
-	b _08179380
-	.pool
-_08179370:
-	ldr r0, =gText_SaveCompletePressA
-	movs r1, 0x1
-	movs r2, 0
-	bl sub_8178F44
-_0817937A:
-	ldr r0, =sub_81793E0
-	bl SetMainCallback2
-_08179380:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179288
-
-	thumb_func_start sub_8179390
-sub_8179390: @ 8179390
-	push {lr}
-	ldr r1, =gUnknown_0203BCFE
-	movs r0, 0
-	strh r0, [r1]
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _081793C4
-	ldr r0, =gUnknown_0203BD0E
-	ldrb r0, [r0]
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r0, =gText_GamePlayCannotBeContinued
-	movs r1, 0x1
-	movs r2, 0
-	bl sub_8178F44
-	ldr r0, =sub_8178FC8
-	bl SetVBlankCallback
-	ldr r0, =sub_81793E0
-	bl SetMainCallback2
-_081793C4:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179390
-
-	thumb_func_start sub_81793E0
-sub_81793E0: @ 81793E0
-	push {lr}
-	sub sp, 0x4
-	ldr r0, =gUnknown_0203BCFE
-	movs r2, 0
-	strh r2, [r0]
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08179410
-	movs r0, 0x1
-	negs r0, r0
-	str r2, [sp]
-	movs r1, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r0, =sub_8178FC8
-	bl SetVBlankCallback
-	ldr r0, =sub_8179428
-	bl SetMainCallback2
-_08179410:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81793E0
-
-	thumb_func_start sub_8179428
-sub_8179428: @ 8179428
-	push {r4,r5,lr}
-	bl UpdatePaletteFade
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _0817944E
-	ldr r5, =gGameContinueCallback
-	ldr r0, [r5]
-	cmp r0, 0
-	bne _08179448
-	bl DoSoftReset
-	b _0817944E
-	.pool
-_08179448:
-	bl SetMainCallback2
-	str r4, [r5]
-_0817944E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8179428
-
-	thumb_func_start sub_8179454
-sub_8179454: @ 8179454
-	push {r4,r5,lr}
-	ldr r5, =gMain
-	ldr r0, [r5, 0x24]
-	lsrs r4, r0, 3
-	movs r0, 0x7
-	ands r4, r0
-	ldr r0, =gUnknown_085EFD80
-	ldr r1, [r0, 0x4]
-	ldr r0, [r0]
-	str r0, [r5, 0x38]
-	str r1, [r5, 0x3C]
-	ldrh r1, [r5, 0x3A]
-	ldr r0, =0xfffffe00
-	ands r0, r1
-	movs r1, 0x70
-	orrs r0, r1
-	strh r0, [r5, 0x3A]
-	adds r1, r5, 0
-	adds r1, 0x38
-	movs r0, 0x48
-	strb r0, [r1]
-	ldr r0, =gUnknown_0203BCFE
-	ldrh r0, [r0]
-	cmp r0, 0
-	beq _081794DC
-	ldr r3, =gUnknown_085EFDAC
-	lsls r2, r4, 1
-	adds r2, r4
-	adds r0, r2, r3
-	ldrb r4, [r0]
-	ldrh r1, [r5, 0x3C]
-	ldr r0, =0xfffffc00
-	ands r0, r1
-	orrs r0, r4
-	strh r0, [r5, 0x3C]
-	adds r0, r3, 0x2
-	adds r0, r2, r0
-	ldrb r1, [r0]
-	lsls r1, 4
-	adds r3, 0x1
-	adds r2, r3
-	ldrb r0, [r2]
-	lsls r0, 3
-	orrs r1, r0
-	adds r3, r5, 0
-	adds r3, 0x3B
-	movs r0, 0x1F
-	ands r1, r0
-	lsls r1, 1
-	ldrb r2, [r3]
-	movs r0, 0x3F
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	b _081794E8
-	.pool
-_081794DC:
-	ldrh r0, [r5, 0x3C]
-	ldr r1, =0xfffffc00
-	ands r1, r0
-	movs r0, 0x1
-	orrs r1, r0
-	strh r1, [r5, 0x3C]
-_081794E8:
-	ldr r0, =gUnknown_030022F8
-	movs r1, 0xE0
-	lsls r1, 19
-	movs r2, 0x1
-	bl CpuFastSet
-	ldr r1, =gUnknown_0203BCFE
-	ldrh r0, [r1, 0x2]
-	cmp r0, 0
-	beq _08179500
-	subs r0, 0x1
-	strh r0, [r1, 0x2]
-_08179500:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179454
-
-	thumb_func_start sub_8179514
-sub_8179514: @ 8179514
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r4, =gSaveDataBuffer
-	movs r3, 0x80
-	lsls r3, 5
-	movs r1, 0
-	adds r2, r4, 0
-	bl ReadFlash
-	movs r1, 0
-	ldr r2, =0x000003ff
-_0817952C:
-	ldr r0, [r4]
-	cmp r0, 0
-	beq _08179540
-	movs r0, 0x1
-	b _0817954E
-	.pool
-_08179540:
-	adds r0, r1, 0x1
-	lsls r0, 16
-	lsrs r1, r0, 16
-	adds r4, 0x4
-	cmp r1, r2
-	bls _0817952C
-	movs r0, 0
-_0817954E:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8179514
-
-	thumb_func_start sub_8179554
-sub_8179554: @ 8179554
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 16
-	lsrs r6, r0, 16
-	movs r0, 0
-	ldr r1, =0x00000fff
-	mov r8, r1
-	ldr r7, =ProgramFlashByte
-_08179566:
-	movs r4, 0
-	adds r5, r0, 0x1
-_0817956A:
-	ldr r3, [r7]
-	adds r0, r6, 0
-	adds r1, r4, 0
-	movs r2, 0
-	bl _call_via_r3
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, r8
-	bls _0817956A
-	adds r0, r6, 0
-	bl sub_8179514
-	lsls r0, 24
-	lsrs r1, r0, 24
-	lsls r0, r5, 16
-	lsrs r0, 16
-	cmp r1, 0
-	beq _08179596
-	cmp r0, 0x81
-	bls _08179566
-_08179596:
-	adds r0, r1, 0
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8179554
-
-	thumb_func_start sub_81795AC
-sub_81795AC: @ 81795AC
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	movs r6, 0
-_081795B2:
-	movs r4, 0x1
-	lsls r4, r6
-	adds r0, r5, 0
-	ands r0, r4
-	cmp r0, 0
-	beq _081795CC
-	adds r0, r6, 0
-	bl sub_8179554
-	lsls r0, 24
-	cmp r0, 0
-	bne _081795CC
-	bics r5, r4
-_081795CC:
-	adds r0, r6, 0x1
-	lsls r0, 16
-	lsrs r6, r0, 16
-	cmp r6, 0x1F
-	bls _081795B2
-	cmp r5, 0
-	beq _081795DE
-	movs r0, 0x1
-	b _081795E0
-_081795DE:
-	movs r0, 0
-_081795E0:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81795AC
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/include/gba/flash_internal.h b/include/gba/flash_internal.h
index 6156b6c14..ba84546aa 100644
--- a/include/gba/flash_internal.h
+++ b/include/gba/flash_internal.h
@@ -65,6 +65,7 @@ u16 ReadFlashId(void);
 void StartFlashTimer(u8 phase);
 void SetReadFlash1(u16 *dest);
 void StopFlashTimer(void);
+void ReadFlash(u16 sectorNum, u32 offset, u8 *dest, u32 size);
 
 u16 WaitForFlashWrite_Common(u8 phase, u8 *addr, u8 lastData);
 
diff --git a/include/save.h b/include/save.h
index e98233c67..6c1238cd2 100644
--- a/include/save.h
+++ b/include/save.h
@@ -76,7 +76,7 @@ u8 GetSaveValidStatus(const struct SaveSectionLocation *location);
 //u8 sub_8125B88(u8 a1, u8 *data, u16 size);
 u8 DoReadFlashWholeSection(u8, struct SaveSection *);
 u16 CalculateChecksum(void *, u16);
-//u8 HandleSavingData(u8 saveType);
+u8 HandleSavingData(u8 saveType);
 //u8 TrySavingData(u8 saveType);
 //u8 sub_8125D80(void);
 //bool8 sub_8125DA8(void);
diff --git a/ld_script.txt b/ld_script.txt
index 3170e1919..890e58a9e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -221,7 +221,7 @@ SECTIONS {
         asm/diploma.o(.text);
         asm/berry_tag_screen.o(.text);
         asm/mystery_event_menu.o(.text);
-        asm/save_failed_screen.o(.text);
+        src/save_failed_screen.o(.text);
         asm/braille_puzzles.o(.text);
         asm/pokeblock_feed.o(.text);
         asm/clear_save_data_screen.o(.text);
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
new file mode 100755
index 000000000..546342b9d
--- /dev/null
+++ b/src/save_failed_screen.c
@@ -0,0 +1,332 @@
+#include "global.h"
+#include "text.h"
+#include "main.h"
+#include "palette.h"
+#include "gpu_regs.h"
+#include "bg.h"
+#include "task.h"
+#include "window.h"
+#include "menu.h"
+#include "save.h"
+#include "gba/flash_internal.h"
+
+#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, u8 speed, u8 *str);
+
+extern void (*gGameContinueCallback)(void);
+
+extern u32 gDamagedSaveSectors;
+
+extern u16 gUnknown_0203BCFC;
+extern const u8 gUnknown_085B0E04[];
+extern const u8 gUnknown_085B0A80[];
+extern const u8 gUnknown_085B0C0C[];
+extern const u8 gUnknown_085EFDE4[];
+
+extern const struct OamData gUnknown_085EFD80; // sClockOamData
+extern const u8 gUnknown_085EFDAC[8][3]; // sClockFrames
+
+extern const struct BgTemplate gUnknown_085EFD88[];
+extern const struct WindowTemplate gUnknown_085EFD94[];
+extern struct WindowTemplate gUnknown_085EFD9C;
+extern struct WindowTemplate gUnknown_085EFDA4;
+extern struct SaveSection gSaveDataBuffer;
+extern const u32 gUnknown_0850E87C[];
+
+extern const u16 gUnknown_085B0A00[];
+extern const u16 gUnknown_085EFDC4[];
+extern const u16 gUnknown_0850FEFC[];
+extern const u16 gUnknown_0860F074[];
+
+extern u8 gText_SaveFailedCheckingBackup[];
+extern u8 gText_BackupMemoryDamaged[];
+extern u8 gText_CheckCompleted[];
+extern u8 gText_SaveCompleteGameCannotContinue[];
+extern u8 gText_SaveCompletePressA[];
+extern u8 gText_GamePlayCannotBeContinued[];
+
+extern void sub_8179454(void);
+
+extern u8 gDecompressionBuffer[];
+
+struct Unk203BCFC
+{
+    u16 unk0;
+    u16 unk2;
+};
+
+extern struct Unk203BCFC gUnknown_0203BCFE;
+
+struct Unk203BD0E
+{
+    u8 unk0;
+    u8 unk1;
+};
+
+extern struct Unk203BD0E gUnknown_0203BD0E;
+
+void sub_8178FDC(void);
+void sub_8179288(void);
+void sub_8179390(void);
+void sub_81793E0(void);
+bool8 sub_81795AC(u32);
+void sub_8179428(void);
+bool8 sub_8179514(u16 sector);
+
+void sub_8178F44(u8 *text, u8 var1, u8 var2)
+{
+    struct TextColor color;
+
+    color.fgColor = 0;
+    color.bgColor = 15;
+    color.shadowColor = 3;
+    AddTextPrinterParametrized2(gUnknown_0203BD0E.unk0, 1, var1 * 8, var2 * 8 + 1, 0, 0, &color, 0, text);
+}
+
+void DoSaveFailedScreen(u8 saveType)
+{
+    SetMainCallback2(sub_8178FDC);
+    gUnknown_0203BCFC = saveType;
+    gUnknown_0203BCFE.unk0 = 0;
+    gUnknown_0203BCFE.unk2 = 0;
+    gUnknown_0203BD0E.unk0 = 0;
+    gUnknown_0203BD0E.unk1 = 0;
+}
+
+void sub_8178FC8(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void sub_8178FDC(void)
+{
+    switch(gMain.state)
+    {
+        case 0:
+        default:
+            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);
+            SetGpuReg(REG_OFFSET_BG3HOFS, 0);
+            SetGpuReg(REG_OFFSET_BG3VOFS, 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);
+            // how come this doesnt use the Dma manager?
+            DmaFill16(3, 0, VRAM, VRAM_SIZE);
+            DmaFill32(3, 0, OAM, OAM_SIZE);
+            DmaFill16(3, 0, PLTT, PLTT_SIZE);
+            LZ77UnCompVram(gUnknown_085B0E04, (void *)VRAM);
+            LZ77UnCompVram(gUnknown_085B0A80, (void *)(VRAM + 0x7000));
+            LZ77UnCompVram(gUnknown_085B0C0C, (void *)(VRAM + 0x7800));
+            LZ77UnCompVram(gUnknown_085EFDE4, (void *)(VRAM + 0x10020));
+            ResetBgsAndClearDma3BusyFlags(0);
+            InitBgsFromTemplates(0, gUnknown_085EFD88, 3);
+            SetBgTilemapBuffer(0, (void *)&gDecompressionBuffer[0x2000]);
+            CpuFill32(0, &gDecompressionBuffer[0x2000], 0x800);
+            LoadBgTiles(0, gUnknown_0850E87C, 0x120, 0x214);
+            InitWindows(gUnknown_085EFD94);
+            // AddWindowWithoutTileMap returns a u16/integer, but the info is clobbered into a u8 here resulting in lost info. Bug?
+            gUnknown_0203BD0E.unk0 = AddWindowWithoutTileMap(&gUnknown_085EFD9C);
+            SetWindowAttribute(gUnknown_0203BD0E.unk0, 7, (u32)&gDecompressionBuffer[0x2800]);
+            gUnknown_0203BD0E.unk1 = AddWindowWithoutTileMap(&gUnknown_085EFDA4);
+            SetWindowAttribute(gUnknown_0203BD0E.unk1, 7, (u32)&gDecompressionBuffer[0x3D00]);
+            DeactivateAllTextPrinters();
+            ResetSpriteData();
+            ResetTasks();
+            ResetPaletteFade();
+            LoadPalette(gUnknown_085B0A00, 0, 0x40);
+            LoadPalette(gUnknown_085EFDC4, 0x100, 0x20);
+            LoadPalette(gUnknown_0850FEFC, 0xE0, 0x20);
+            LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
+            SetWindowBorderStyle(gUnknown_0203BD0E.unk0, FALSE, 0x214, 0xE);
+            SetWindowBorderStyle(gUnknown_0203BD0E.unk1, FALSE, 0x214, 0xE);
+            FillWindowPixelBuffer(gUnknown_0203BD0E.unk1, 0x11); // backwards?
+            FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
+            CopyWindowToVram(gUnknown_0203BD0E.unk1, 2); // again?
+            CopyWindowToVram(gUnknown_0203BD0E.unk0, 1);
+            sub_8178F44(gText_SaveFailedCheckingBackup, 1, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+            EnableInterrupts(1);
+            SetVBlankCallback(sub_8178FC8);
+            SetGpuReg(0, 0x1040);
+            ShowBg(0);
+            ShowBg(2);
+            ShowBg(3);
+            gMain.state++;
+            break;
+        case 1:
+            if(!UpdatePaletteFade())
+            {
+                SetMainCallback2(sub_8179288);
+                SetVBlankCallback(sub_8179454);
+            }
+            break;
+    }
+}
+
+void sub_8179288(void)
+{
+    u8 wipeTries = 0;
+
+    gUnknown_0203BCFE.unk0 = TRUE;
+
+    while (gDamagedSaveSectors != 0 && wipeTries < 3)
+    {
+        if (sub_81795AC(gDamagedSaveSectors) != FALSE)
+        {
+            FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
+            sub_8178F44(gText_BackupMemoryDamaged, 1, 0);
+            SetMainCallback2(sub_8179390);
+            return;
+        }
+
+        FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
+        sub_8178F44(gText_CheckCompleted, 1, 0);
+        HandleSavingData(gUnknown_0203BCFC);
+
+        if(gDamagedSaveSectors != 0)
+        {
+            FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
+            sub_8178F44(gText_SaveFailedCheckingBackup, 1, 0);
+        }
+
+        wipeTries++;
+    }
+
+    if(wipeTries == 3)
+    {
+        FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
+        sub_8178F44(gText_BackupMemoryDamaged, 1, 0);
+    }
+    else
+    {
+        FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
+
+        if(gGameContinueCallback == NULL)
+            sub_8178F44(gText_SaveCompleteGameCannotContinue, 1, 0);
+        else
+            sub_8178F44(gText_SaveCompletePressA, 1, 0);
+    }
+
+    SetMainCallback2(sub_81793E0);
+}
+
+void sub_8179390(void)
+{
+    gUnknown_0203BCFE.unk0 = FALSE;
+
+    if(gMain.newKeys & A_BUTTON)
+    {
+        FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
+        sub_8178F44(gText_GamePlayCannotBeContinued, 1, 0);
+        SetVBlankCallback(sub_8178FC8);
+        SetMainCallback2(sub_81793E0);
+    }
+}
+
+void sub_81793E0(void)
+{
+    gUnknown_0203BCFE.unk0 = FALSE;
+
+    if(gMain.newKeys & A_BUTTON)
+    {
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+        SetVBlankCallback(sub_8178FC8);
+        SetMainCallback2(sub_8179428);
+    }
+}
+
+void sub_8179428(void)
+{
+    if(!UpdatePaletteFade())
+    {
+        if(gGameContinueCallback == NULL) // no callback exists, so do a soft reset.
+        {
+            DoSoftReset();
+        }
+        else
+        {
+            SetMainCallback2((MainCallback)gGameContinueCallback);
+            gGameContinueCallback = NULL;
+        }
+    }
+}
+
+void sub_8179454(void)
+{
+    unsigned int n = (gMain.vblankCounter2 >> 3) & 7;
+
+    gMain.oamBuffer[0] = gUnknown_085EFD80;
+    gMain.oamBuffer[0].x = 112;
+    gMain.oamBuffer[0].y = (CLOCK_WIN_TOP + 1) * 8;;
+
+    if(gUnknown_0203BCFE.unk0 != FALSE)
+    {
+        gMain.oamBuffer[0].tileNum = gUnknown_085EFDAC[n][0];
+        gMain.oamBuffer[0].matrixNum = (gUnknown_085EFDAC[n][2] << 4) | (gUnknown_085EFDAC[n][1] << 3);
+    }
+    else
+    {
+        gMain.oamBuffer[0].tileNum = 1;
+    }
+
+    CpuFastCopy(gMain.oamBuffer, (void *)OAM, 4);
+
+    if(gUnknown_0203BCFE.unk2)
+        gUnknown_0203BCFE.unk2--;
+}
+
+bool8 sub_8179514(u16 sector)
+{
+    u32 *ptr = (u32 *)&gSaveDataBuffer;
+    u16 i;
+
+    ReadFlash(sector, 0, (u8 *)ptr, 4096);
+
+    for (i = 0; i < 0x400; i++, ptr++)
+        if (*ptr)
+            return TRUE;
+
+    return FALSE;
+}
+
+bool8 sub_8179554(u16 sector)
+{
+    u16 i, j;
+    bool8 failed = TRUE;
+
+    for (i = 0; failed && i < 130; i++)
+    {
+        for (j = 0; j < 0x1000; j++)
+            ProgramFlashByte(sector, j, 0);
+
+        failed = sub_8179514(sector);
+    }
+
+    return failed;
+}
+
+bool8 sub_81795AC(u32 sectorBits)
+{
+    u16 i;
+
+    for (i = 0; i < 0x20; i++)
+        if ((sectorBits & (1 << i)) && !sub_8179554(i))
+            sectorBits &= ~(1 << i);
+
+    if (sectorBits == 0)
+        return FALSE;
+    else
+        return TRUE;
+}

From f383cb8354223de3d8a630800ebeffc470737960 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Fri, 6 Oct 2017 19:48:18 -0400
Subject: [PATCH 35/42] update labels

---
 asm/credits.s             |   6 +-
 asm/starter_choose.s      |   8 +-
 data/data4.s              |  13 +--
 data/save_failed_screen.s |   8 +-
 src/save_failed_screen.c  | 210 +++++++++++++++++++-------------------
 sym_ewram.txt             |   6 +-
 6 files changed, 124 insertions(+), 127 deletions(-)

diff --git a/asm/credits.s b/asm/credits.s
index 0a568a3ae..0b2da16b8 100644
--- a/asm/credits.s
+++ b/asm/credits.s
@@ -491,14 +491,14 @@ _08175906:
 	ldr r1, =gReservedSpritePaletteCount
 	movs r0, 0x8
 	strb r0, [r1]
-	ldr r0, =gUnknown_085B0E04
+	ldr r0, =gBirchHelpGfx
 	movs r1, 0xC0
 	lsls r1, 19
 	bl LZ77UnCompVram
-	ldr r0, =gUnknown_085B0C0C
+	ldr r0, =gBirchGrassTilemap
 	ldr r1, =0x06003800
 	bl LZ77UnCompVram
-	ldr r0, =gUnknown_085B0A02
+	ldr r0, =gBirchBagGrassPal + 0x2
 	movs r1, 0x1
 	movs r2, 0x3E
 	bl LoadPalette
diff --git a/asm/starter_choose.s b/asm/starter_choose.s
index 7e998c45f..da42959ea 100644
--- a/asm/starter_choose.s
+++ b/asm/starter_choose.s
@@ -122,12 +122,12 @@ set_256color_bg_bg0: @ 8133F0C
 	ldr r0, =0x81000200
 	str r0, [r2, 0x8]
 	ldr r0, [r2, 0x8]
-	ldr r0, =gUnknown_085B0E04
+	ldr r0, =gBirchHelpGfx
 	bl LZ77UnCompVram
-	ldr r0, =gUnknown_085B0A80
+	ldr r0, =gBirchBagTilemap
 	ldr r1, =0x06003000
 	bl LZ77UnCompVram
-	ldr r0, =gUnknown_085B0C0C
+	ldr r0, =gBirchGrassTilemap
 	ldr r1, =0x06003800
 	bl LZ77UnCompVram
 	movs r0, 0
@@ -155,7 +155,7 @@ set_256color_bg_bg0: @ 8133F0C
 	movs r1, 0xE0
 	movs r2, 0x20
 	bl LoadPalette
-	ldr r0, =gUnknown_085B0A00
+	ldr r0, =gBirchBagGrassPal
 	movs r1, 0
 	movs r2, 0x40
 	bl LoadPalette
diff --git a/data/data4.s b/data/data4.s
index 202b1ffe7..d99336e87 100644
--- a/data/data4.s
+++ b/data/data4.s
@@ -14,19 +14,16 @@ gUnknown_085B09F4:: @ 85B09F4
 gUnknown_085B09F8:: @ 85B09F8
 	.incbin "baserom.gba", 0x5b09f8, 0x8
 
-gUnknown_085B0A00:: @ 85B0A00
-	.incbin "baserom.gba", 0x5b0a00, 0x2
+gBirchBagGrassPal:: @ 85B0A00
+	.incbin "baserom.gba", 0x5b0a00, 0x80
 
-gUnknown_085B0A02:: @ 85B0A02
-	.incbin "baserom.gba", 0x5b0a02, 0x7e
-
-gUnknown_085B0A80:: @ 85B0A80
+gBirchBagTilemap:: @ 85B0A80
 	.incbin "baserom.gba", 0x5b0a80, 0x18c
 
-gUnknown_085B0C0C:: @ 85B0C0C
+gBirchGrassTilemap:: @ 85B0C0C
 	.incbin "baserom.gba", 0x5b0c0c, 0x1f8
 
-gUnknown_085B0E04:: @ 85B0E04
+gBirchHelpGfx:: @ 85B0E04
 	.incbin "baserom.gba", 0x5b0e04, 0xfc8
 
 gUnknown_085B1DCC:: @ 85B1DCC
diff --git a/data/save_failed_screen.s b/data/save_failed_screen.s
index 446eee2d2..1b9fb7ed1 100644
--- a/data/save_failed_screen.s
+++ b/data/save_failed_screen.s
@@ -3,7 +3,7 @@
 
 	.section .rodata
 
-gUnknown_085EFD80:: @ 85EFD80
+gClockOamData:: @ 85EFD80
 	.incbin "baserom.gba", 0x5efd80, 0x8
 
 gUnknown_085EFD88:: @ 85EFD88
@@ -18,11 +18,11 @@ gUnknown_085EFD9C:: @ 85EFD9C
 gUnknown_085EFDA4:: @ 85EFDA4
 	.incbin "baserom.gba", 0x5efda4, 0x8
 
-gUnknown_085EFDAC:: @ 85EFDAC
+gClockFrames:: @ 85EFDAC
 	.incbin "baserom.gba", 0x5efdac, 0x18
 
-gUnknown_085EFDC4:: @ 85EFDC4
+gSaveFailedClockPal:: @ 85EFDC4
 	.incbin "baserom.gba", 0x5efdc4, 0x20
 
-gUnknown_085EFDE4:: @ 85EFDE4
+gSaveFailedClockGfx:: @ 85EFDE4
 	.incbin "baserom.gba", 0x5efde4, 0x90
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 546342b9d..666de5c95 100755
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -19,14 +19,14 @@ extern void (*gGameContinueCallback)(void);
 
 extern u32 gDamagedSaveSectors;
 
-extern u16 gUnknown_0203BCFC;
-extern const u8 gUnknown_085B0E04[];
-extern const u8 gUnknown_085B0A80[];
-extern const u8 gUnknown_085B0C0C[];
-extern const u8 gUnknown_085EFDE4[];
+extern u16 gSaveFailedType;
+extern const u8 gBirchHelpGfx[];
+extern const u8 gBirchBagTilemap[];
+extern const u8 gBirchGrassTilemap[];
+extern const u8 gSaveFailedClockGfx[];
 
-extern const struct OamData gUnknown_085EFD80; // sClockOamData
-extern const u8 gUnknown_085EFDAC[8][3]; // sClockFrames
+extern const struct OamData gClockOamData; // sClockOamData
+extern const u8 gClockFrames[8][3]; // sClockFrames
 
 extern const struct BgTemplate gUnknown_085EFD88[];
 extern const struct WindowTemplate gUnknown_085EFD94[];
@@ -35,8 +35,8 @@ extern struct WindowTemplate gUnknown_085EFDA4;
 extern struct SaveSection gSaveDataBuffer;
 extern const u32 gUnknown_0850E87C[];
 
-extern const u16 gUnknown_085B0A00[];
-extern const u16 gUnknown_085EFDC4[];
+extern const u16 gBirchBagGrassPal[];
+extern const u16 gSaveFailedClockPal[];
 extern const u16 gUnknown_0850FEFC[];
 extern const u16 gUnknown_0860F074[];
 
@@ -47,64 +47,64 @@ extern u8 gText_SaveCompleteGameCannotContinue[];
 extern u8 gText_SaveCompletePressA[];
 extern u8 gText_GamePlayCannotBeContinued[];
 
-extern void sub_8179454(void);
-
 extern u8 gDecompressionBuffer[];
 
-struct Unk203BCFC
+struct ClockInfo
 {
-    u16 unk0;
-    u16 unk2;
+    bool16 clockRunning;
+    u16 debugTimer; // appears to be unused; it's only set to 0 and never used within the game. perhaps it was a volatile-like timer expected to be modified by an external tool?
 };
 
-extern struct Unk203BCFC gUnknown_0203BCFE;
+extern struct ClockInfo gSaveFailedClockInfo;
 
-struct Unk203BD0E
+struct WindowIds
 {
-    u8 unk0;
-    u8 unk1;
+    u8 textWindowId;
+    u8 clockWindowId;
 };
 
-extern struct Unk203BD0E gUnknown_0203BD0E;
+extern struct WindowIds gSaveFailedWindowIds;
 
-void sub_8178FDC(void);
-void sub_8179288(void);
-void sub_8179390(void);
-void sub_81793E0(void);
-bool8 sub_81795AC(u32);
-void sub_8179428(void);
-bool8 sub_8179514(u16 sector);
+static void CB2_SaveFailedScreen(void);
+static void CB2_WipeSave(void);
+static void CB2_GameplayCannotBeContinued(void);
+static void CB2_FadeAndReturnToTitleScreen(void);
+static void CB2_ReturnToTitleScreen(void);
+static void VBlankCB_UpdateClockGraphics(void);
+static bool8 VerifySectorWipe(u16 sector);
+static bool8 WipeSectors(u32);
 
-void sub_8178F44(u8 *text, u8 var1, u8 var2)
+// 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;
 
     color.fgColor = 0;
     color.bgColor = 15;
     color.shadowColor = 3;
-    AddTextPrinterParametrized2(gUnknown_0203BD0E.unk0, 1, var1 * 8, var2 * 8 + 1, 0, 0, &color, 0, text);
+    AddTextPrinterParametrized2(gSaveFailedWindowIds.textWindowId, 1, var1 * 8, var2 * 8 + 1, 0, 0, &color, 0, text);
 }
 
 void DoSaveFailedScreen(u8 saveType)
 {
-    SetMainCallback2(sub_8178FDC);
-    gUnknown_0203BCFC = saveType;
-    gUnknown_0203BCFE.unk0 = 0;
-    gUnknown_0203BCFE.unk2 = 0;
-    gUnknown_0203BD0E.unk0 = 0;
-    gUnknown_0203BD0E.unk1 = 0;
+    SetMainCallback2(CB2_SaveFailedScreen);
+    gSaveFailedType = saveType;
+    gSaveFailedClockInfo.clockRunning = FALSE;
+    gSaveFailedClockInfo.debugTimer = 0;
+    gSaveFailedWindowIds.textWindowId = 0;
+    gSaveFailedWindowIds.clockWindowId = 0;
 }
 
-void sub_8178FC8(void)
+static void VBlankCB(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-void sub_8178FDC(void)
+static void CB2_SaveFailedScreen(void)
 {
-    switch(gMain.state)
+    switch (gMain.state)
     {
         case 0:
         default:
@@ -126,10 +126,10 @@ void sub_8178FDC(void)
             DmaFill16(3, 0, VRAM, VRAM_SIZE);
             DmaFill32(3, 0, OAM, OAM_SIZE);
             DmaFill16(3, 0, PLTT, PLTT_SIZE);
-            LZ77UnCompVram(gUnknown_085B0E04, (void *)VRAM);
-            LZ77UnCompVram(gUnknown_085B0A80, (void *)(VRAM + 0x7000));
-            LZ77UnCompVram(gUnknown_085B0C0C, (void *)(VRAM + 0x7800));
-            LZ77UnCompVram(gUnknown_085EFDE4, (void *)(VRAM + 0x10020));
+            LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM);
+            LZ77UnCompVram(gBirchBagTilemap, (void *)(VRAM + 0x7000));
+            LZ77UnCompVram(gBirchGrassTilemap, (void *)(VRAM + 0x7800));
+            LZ77UnCompVram(gSaveFailedClockGfx, (void *)(VRAM + 0x10020));
             ResetBgsAndClearDma3BusyFlags(0);
             InitBgsFromTemplates(0, gUnknown_085EFD88, 3);
             SetBgTilemapBuffer(0, (void *)&gDecompressionBuffer[0x2000]);
@@ -137,28 +137,28 @@ void sub_8178FDC(void)
             LoadBgTiles(0, gUnknown_0850E87C, 0x120, 0x214);
             InitWindows(gUnknown_085EFD94);
             // AddWindowWithoutTileMap returns a u16/integer, but the info is clobbered into a u8 here resulting in lost info. Bug?
-            gUnknown_0203BD0E.unk0 = AddWindowWithoutTileMap(&gUnknown_085EFD9C);
-            SetWindowAttribute(gUnknown_0203BD0E.unk0, 7, (u32)&gDecompressionBuffer[0x2800]);
-            gUnknown_0203BD0E.unk1 = AddWindowWithoutTileMap(&gUnknown_085EFDA4);
-            SetWindowAttribute(gUnknown_0203BD0E.unk1, 7, (u32)&gDecompressionBuffer[0x3D00]);
+            gSaveFailedWindowIds.textWindowId = AddWindowWithoutTileMap(&gUnknown_085EFD9C);
+            SetWindowAttribute(gSaveFailedWindowIds.textWindowId, 7, (u32)&gDecompressionBuffer[0x2800]);
+            gSaveFailedWindowIds.clockWindowId = AddWindowWithoutTileMap(&gUnknown_085EFDA4);
+            SetWindowAttribute(gSaveFailedWindowIds.clockWindowId, 7, (u32)&gDecompressionBuffer[0x3D00]);
             DeactivateAllTextPrinters();
             ResetSpriteData();
             ResetTasks();
             ResetPaletteFade();
-            LoadPalette(gUnknown_085B0A00, 0, 0x40);
-            LoadPalette(gUnknown_085EFDC4, 0x100, 0x20);
+            LoadPalette(gBirchBagGrassPal, 0, 0x40);
+            LoadPalette(gSaveFailedClockPal, 0x100, 0x20);
             LoadPalette(gUnknown_0850FEFC, 0xE0, 0x20);
             LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
-            SetWindowBorderStyle(gUnknown_0203BD0E.unk0, FALSE, 0x214, 0xE);
-            SetWindowBorderStyle(gUnknown_0203BD0E.unk1, FALSE, 0x214, 0xE);
-            FillWindowPixelBuffer(gUnknown_0203BD0E.unk1, 0x11); // backwards?
-            FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
-            CopyWindowToVram(gUnknown_0203BD0E.unk1, 2); // again?
-            CopyWindowToVram(gUnknown_0203BD0E.unk0, 1);
-            sub_8178F44(gText_SaveFailedCheckingBackup, 1, 0);
+            SetWindowBorderStyle(gSaveFailedWindowIds.textWindowId, FALSE, 0x214, 0xE);
+            SetWindowBorderStyle(gSaveFailedWindowIds.clockWindowId, FALSE, 0x214, 0xE);
+            FillWindowPixelBuffer(gSaveFailedWindowIds.clockWindowId, 0x11); // backwards?
+            FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
+            CopyWindowToVram(gSaveFailedWindowIds.clockWindowId, 2); // again?
+            CopyWindowToVram(gSaveFailedWindowIds.textWindowId, 1);
+            SaveFailedScreenTextPrint(gText_SaveFailedCheckingBackup, 1, 0);
             BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
             EnableInterrupts(1);
-            SetVBlankCallback(sub_8178FC8);
+            SetVBlankCallback(VBlankCB);
             SetGpuReg(0, 0x1040);
             ShowBg(0);
             ShowBg(2);
@@ -166,92 +166,92 @@ void sub_8178FDC(void)
             gMain.state++;
             break;
         case 1:
-            if(!UpdatePaletteFade())
+            if (!UpdatePaletteFade())
             {
-                SetMainCallback2(sub_8179288);
-                SetVBlankCallback(sub_8179454);
+                SetMainCallback2(CB2_WipeSave);
+                SetVBlankCallback(VBlankCB_UpdateClockGraphics);
             }
             break;
     }
 }
 
-void sub_8179288(void)
+static void CB2_WipeSave(void)
 {
     u8 wipeTries = 0;
 
-    gUnknown_0203BCFE.unk0 = TRUE;
+    gSaveFailedClockInfo.clockRunning = TRUE;
 
     while (gDamagedSaveSectors != 0 && wipeTries < 3)
     {
-        if (sub_81795AC(gDamagedSaveSectors) != FALSE)
+        if (WipeSectors(gDamagedSaveSectors) != FALSE)
         {
-            FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
-            sub_8178F44(gText_BackupMemoryDamaged, 1, 0);
-            SetMainCallback2(sub_8179390);
+            FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
+            SaveFailedScreenTextPrint(gText_BackupMemoryDamaged, 1, 0);
+            SetMainCallback2(CB2_GameplayCannotBeContinued);
             return;
         }
 
-        FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
-        sub_8178F44(gText_CheckCompleted, 1, 0);
-        HandleSavingData(gUnknown_0203BCFC);
+        FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
+        SaveFailedScreenTextPrint(gText_CheckCompleted, 1, 0);
+        HandleSavingData(gSaveFailedType);
 
-        if(gDamagedSaveSectors != 0)
+        if (gDamagedSaveSectors != 0)
         {
-            FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
-            sub_8178F44(gText_SaveFailedCheckingBackup, 1, 0);
+            FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
+            SaveFailedScreenTextPrint(gText_SaveFailedCheckingBackup, 1, 0);
         }
 
         wipeTries++;
     }
 
-    if(wipeTries == 3)
+    if (wipeTries == 3)
     {
-        FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
-        sub_8178F44(gText_BackupMemoryDamaged, 1, 0);
+        FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
+        SaveFailedScreenTextPrint(gText_BackupMemoryDamaged, 1, 0);
     }
     else
     {
-        FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
+        FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
 
-        if(gGameContinueCallback == NULL)
-            sub_8178F44(gText_SaveCompleteGameCannotContinue, 1, 0);
+        if (gGameContinueCallback == NULL)
+            SaveFailedScreenTextPrint(gText_SaveCompleteGameCannotContinue, 1, 0);
         else
-            sub_8178F44(gText_SaveCompletePressA, 1, 0);
+            SaveFailedScreenTextPrint(gText_SaveCompletePressA, 1, 0);
     }
 
-    SetMainCallback2(sub_81793E0);
+    SetMainCallback2(CB2_FadeAndReturnToTitleScreen);
 }
 
-void sub_8179390(void)
+static void CB2_GameplayCannotBeContinued(void)
 {
-    gUnknown_0203BCFE.unk0 = FALSE;
+    gSaveFailedClockInfo.clockRunning = FALSE;
 
-    if(gMain.newKeys & A_BUTTON)
+    if (gMain.newKeys & A_BUTTON)
     {
-        FillWindowPixelBuffer(gUnknown_0203BD0E.unk0, 0x11);
-        sub_8178F44(gText_GamePlayCannotBeContinued, 1, 0);
-        SetVBlankCallback(sub_8178FC8);
-        SetMainCallback2(sub_81793E0);
+        FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
+        SaveFailedScreenTextPrint(gText_GamePlayCannotBeContinued, 1, 0);
+        SetVBlankCallback(VBlankCB);
+        SetMainCallback2(CB2_FadeAndReturnToTitleScreen);
     }
 }
 
-void sub_81793E0(void)
+static void CB2_FadeAndReturnToTitleScreen(void)
 {
-    gUnknown_0203BCFE.unk0 = FALSE;
+    gSaveFailedClockInfo.clockRunning = FALSE;
 
-    if(gMain.newKeys & A_BUTTON)
+    if (gMain.newKeys & A_BUTTON)
     {
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-        SetVBlankCallback(sub_8178FC8);
-        SetMainCallback2(sub_8179428);
+        SetVBlankCallback(VBlankCB);
+        SetMainCallback2(CB2_ReturnToTitleScreen);
     }
 }
 
-void sub_8179428(void)
+void CB2_ReturnToTitleScreen(void)
 {
-    if(!UpdatePaletteFade())
+    if (!UpdatePaletteFade())
     {
-        if(gGameContinueCallback == NULL) // no callback exists, so do a soft reset.
+        if (gGameContinueCallback == NULL) // no callback exists, so do a soft reset.
         {
             DoSoftReset();
         }
@@ -263,18 +263,18 @@ void sub_8179428(void)
     }
 }
 
-void sub_8179454(void)
+static void VBlankCB_UpdateClockGraphics(void)
 {
     unsigned int n = (gMain.vblankCounter2 >> 3) & 7;
 
-    gMain.oamBuffer[0] = gUnknown_085EFD80;
+    gMain.oamBuffer[0] = gClockOamData;
     gMain.oamBuffer[0].x = 112;
     gMain.oamBuffer[0].y = (CLOCK_WIN_TOP + 1) * 8;;
 
-    if(gUnknown_0203BCFE.unk0 != FALSE)
+    if (gSaveFailedClockInfo.clockRunning != FALSE)
     {
-        gMain.oamBuffer[0].tileNum = gUnknown_085EFDAC[n][0];
-        gMain.oamBuffer[0].matrixNum = (gUnknown_085EFDAC[n][2] << 4) | (gUnknown_085EFDAC[n][1] << 3);
+        gMain.oamBuffer[0].tileNum = gClockFrames[n][0];
+        gMain.oamBuffer[0].matrixNum = (gClockFrames[n][2] << 4) | (gClockFrames[n][1] << 3);
     }
     else
     {
@@ -283,11 +283,11 @@ void sub_8179454(void)
 
     CpuFastCopy(gMain.oamBuffer, (void *)OAM, 4);
 
-    if(gUnknown_0203BCFE.unk2)
-        gUnknown_0203BCFE.unk2--;
+    if (gSaveFailedClockInfo.debugTimer)
+        gSaveFailedClockInfo.debugTimer--;
 }
 
-bool8 sub_8179514(u16 sector)
+static bool8 VerifySectorWipe(u16 sector)
 {
     u32 *ptr = (u32 *)&gSaveDataBuffer;
     u16 i;
@@ -301,7 +301,7 @@ bool8 sub_8179514(u16 sector)
     return FALSE;
 }
 
-bool8 sub_8179554(u16 sector)
+static bool8 WipeSector(u16 sector)
 {
     u16 i, j;
     bool8 failed = TRUE;
@@ -311,18 +311,18 @@ bool8 sub_8179554(u16 sector)
         for (j = 0; j < 0x1000; j++)
             ProgramFlashByte(sector, j, 0);
 
-        failed = sub_8179514(sector);
+        failed = VerifySectorWipe(sector);
     }
 
     return failed;
 }
 
-bool8 sub_81795AC(u32 sectorBits)
+static bool8 WipeSectors(u32 sectorBits)
 {
     u16 i;
 
     for (i = 0; i < 0x20; i++)
-        if ((sectorBits & (1 << i)) && !sub_8179554(i))
+        if ((sectorBits & (1 << i)) && !WipeSector(i))
             sectorBits &= ~(1 << i);
 
     if (sectorBits == 0)
diff --git a/sym_ewram.txt b/sym_ewram.txt
index b7807e8a3..6331eb565 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -1639,13 +1639,13 @@ gUnknown_0203BCF4: @ 203BCF4
 gUnknown_0203BCF8: @ 203BCF8
 	.space 0x4
 
-gUnknown_0203BCFC: @ 203BCFC
+gSaveFailedType: @ 203BCFC
 	.space 0x2
 
-gUnknown_0203BCFE: @ 203BCFE
+gSaveFailedClockInfo: @ 203BCFE
 	.space 0x10
 
-gUnknown_0203BD0E: @ 203BD0E
+gSaveFailedWindowIds: @ 203BD0E
 	.space 0x6
 
 gBraillePuzzleCallbackFlag: @ 203BD14

From 35bb9b02e3089693e7c0424a9a1620ae5f7a1380 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Fri, 6 Oct 2017 20:26:53 -0400
Subject: [PATCH 36/42] ewram defines

---
 src/save_failed_screen.c | 77 +++++++++++++++++++++-------------------
 sym_ewram.txt            |  9 +----
 2 files changed, 41 insertions(+), 45 deletions(-)

diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 666de5c95..8536e541a 100755
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -19,7 +19,6 @@ extern void (*gGameContinueCallback)(void);
 
 extern u32 gDamagedSaveSectors;
 
-extern u16 gSaveFailedType;
 extern const u8 gBirchHelpGfx[];
 extern const u8 gBirchBagTilemap[];
 extern const u8 gBirchGrassTilemap[];
@@ -49,21 +48,25 @@ extern u8 gText_GamePlayCannotBeContinued[];
 
 extern u8 gDecompressionBuffer[];
 
-struct ClockInfo
+// gSaveFailedClockInfo enum
+enum
 {
-    bool16 clockRunning;
-    u16 debugTimer; // appears to be unused; it's only set to 0 and never used within the game. perhaps it was a volatile-like timer expected to be modified by an external tool?
+    CLOCK_RUNNING,
+    DEBUG_TIMER
 };
 
-extern struct ClockInfo gSaveFailedClockInfo;
-
-struct WindowIds
+// gSaveFailedWindowIds enum
+enum
 {
-    u8 textWindowId;
-    u8 clockWindowId;
+    TEXT_WIN_ID,
+    CLOCK_WIN_ID
 };
 
-extern struct WindowIds gSaveFailedWindowIds;
+EWRAM_DATA u16 gSaveFailedType = {0};
+EWRAM_DATA u16 gSaveFailedClockInfo[2] = {0};
+EWRAM_DATA u8 gSaveFailedUnused1[12] = {0};
+EWRAM_DATA u8 gSaveFailedWindowIds[2] = {0};
+EWRAM_DATA u8 gSaveFailedUnused2[4] = {0};
 
 static void CB2_SaveFailedScreen(void);
 static void CB2_WipeSave(void);
@@ -82,17 +85,17 @@ static void SaveFailedScreenTextPrint(u8 *text, u8 var1, u8 var2)
     color.fgColor = 0;
     color.bgColor = 15;
     color.shadowColor = 3;
-    AddTextPrinterParametrized2(gSaveFailedWindowIds.textWindowId, 1, var1 * 8, var2 * 8 + 1, 0, 0, &color, 0, text);
+    AddTextPrinterParametrized2(gSaveFailedWindowIds[TEXT_WIN_ID], 1, var1 * 8, var2 * 8 + 1, 0, 0, &color, 0, text);
 }
 
 void DoSaveFailedScreen(u8 saveType)
 {
     SetMainCallback2(CB2_SaveFailedScreen);
     gSaveFailedType = saveType;
-    gSaveFailedClockInfo.clockRunning = FALSE;
-    gSaveFailedClockInfo.debugTimer = 0;
-    gSaveFailedWindowIds.textWindowId = 0;
-    gSaveFailedWindowIds.clockWindowId = 0;
+    gSaveFailedClockInfo[CLOCK_RUNNING] = FALSE;
+    gSaveFailedClockInfo[DEBUG_TIMER] = 0;
+    gSaveFailedWindowIds[TEXT_WIN_ID] = 0;
+    gSaveFailedWindowIds[CLOCK_WIN_ID] = 0;
 }
 
 static void VBlankCB(void)
@@ -137,10 +140,10 @@ static void CB2_SaveFailedScreen(void)
             LoadBgTiles(0, gUnknown_0850E87C, 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.textWindowId = AddWindowWithoutTileMap(&gUnknown_085EFD9C);
-            SetWindowAttribute(gSaveFailedWindowIds.textWindowId, 7, (u32)&gDecompressionBuffer[0x2800]);
-            gSaveFailedWindowIds.clockWindowId = AddWindowWithoutTileMap(&gUnknown_085EFDA4);
-            SetWindowAttribute(gSaveFailedWindowIds.clockWindowId, 7, (u32)&gDecompressionBuffer[0x3D00]);
+            gSaveFailedWindowIds[TEXT_WIN_ID] = AddWindowWithoutTileMap(&gUnknown_085EFD9C);
+            SetWindowAttribute(gSaveFailedWindowIds[TEXT_WIN_ID], 7, (u32)&gDecompressionBuffer[0x2800]);
+            gSaveFailedWindowIds[CLOCK_WIN_ID] = AddWindowWithoutTileMap(&gUnknown_085EFDA4);
+            SetWindowAttribute(gSaveFailedWindowIds[CLOCK_WIN_ID], 7, (u32)&gDecompressionBuffer[0x3D00]);
             DeactivateAllTextPrinters();
             ResetSpriteData();
             ResetTasks();
@@ -149,12 +152,12 @@ static void CB2_SaveFailedScreen(void)
             LoadPalette(gSaveFailedClockPal, 0x100, 0x20);
             LoadPalette(gUnknown_0850FEFC, 0xE0, 0x20);
             LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
-            SetWindowBorderStyle(gSaveFailedWindowIds.textWindowId, FALSE, 0x214, 0xE);
-            SetWindowBorderStyle(gSaveFailedWindowIds.clockWindowId, FALSE, 0x214, 0xE);
-            FillWindowPixelBuffer(gSaveFailedWindowIds.clockWindowId, 0x11); // backwards?
-            FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
-            CopyWindowToVram(gSaveFailedWindowIds.clockWindowId, 2); // again?
-            CopyWindowToVram(gSaveFailedWindowIds.textWindowId, 1);
+            SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE);
+            SetWindowBorderStyle(gSaveFailedWindowIds[CLOCK_WIN_ID], FALSE, 0x214, 0xE);
+            FillWindowPixelBuffer(gSaveFailedWindowIds[CLOCK_WIN_ID], 0x11); // backwards?
+            FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11);
+            CopyWindowToVram(gSaveFailedWindowIds[CLOCK_WIN_ID], 2); // again?
+            CopyWindowToVram(gSaveFailedWindowIds[TEXT_WIN_ID], 1);
             SaveFailedScreenTextPrint(gText_SaveFailedCheckingBackup, 1, 0);
             BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
             EnableInterrupts(1);
@@ -179,25 +182,25 @@ static void CB2_WipeSave(void)
 {
     u8 wipeTries = 0;
 
-    gSaveFailedClockInfo.clockRunning = TRUE;
+    gSaveFailedClockInfo[CLOCK_RUNNING] = TRUE;
 
     while (gDamagedSaveSectors != 0 && wipeTries < 3)
     {
         if (WipeSectors(gDamagedSaveSectors) != FALSE)
         {
-            FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
+            FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11);
             SaveFailedScreenTextPrint(gText_BackupMemoryDamaged, 1, 0);
             SetMainCallback2(CB2_GameplayCannotBeContinued);
             return;
         }
 
-        FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
+        FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11);
         SaveFailedScreenTextPrint(gText_CheckCompleted, 1, 0);
         HandleSavingData(gSaveFailedType);
 
         if (gDamagedSaveSectors != 0)
         {
-            FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
+            FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11);
             SaveFailedScreenTextPrint(gText_SaveFailedCheckingBackup, 1, 0);
         }
 
@@ -206,12 +209,12 @@ static void CB2_WipeSave(void)
 
     if (wipeTries == 3)
     {
-        FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
+        FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11);
         SaveFailedScreenTextPrint(gText_BackupMemoryDamaged, 1, 0);
     }
     else
     {
-        FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
+        FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11);
 
         if (gGameContinueCallback == NULL)
             SaveFailedScreenTextPrint(gText_SaveCompleteGameCannotContinue, 1, 0);
@@ -224,11 +227,11 @@ static void CB2_WipeSave(void)
 
 static void CB2_GameplayCannotBeContinued(void)
 {
-    gSaveFailedClockInfo.clockRunning = FALSE;
+    gSaveFailedClockInfo[CLOCK_RUNNING] = FALSE;
 
     if (gMain.newKeys & A_BUTTON)
     {
-        FillWindowPixelBuffer(gSaveFailedWindowIds.textWindowId, 0x11);
+        FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11);
         SaveFailedScreenTextPrint(gText_GamePlayCannotBeContinued, 1, 0);
         SetVBlankCallback(VBlankCB);
         SetMainCallback2(CB2_FadeAndReturnToTitleScreen);
@@ -237,7 +240,7 @@ static void CB2_GameplayCannotBeContinued(void)
 
 static void CB2_FadeAndReturnToTitleScreen(void)
 {
-    gSaveFailedClockInfo.clockRunning = FALSE;
+    gSaveFailedClockInfo[CLOCK_RUNNING] = FALSE;
 
     if (gMain.newKeys & A_BUTTON)
     {
@@ -271,7 +274,7 @@ static void VBlankCB_UpdateClockGraphics(void)
     gMain.oamBuffer[0].x = 112;
     gMain.oamBuffer[0].y = (CLOCK_WIN_TOP + 1) * 8;;
 
-    if (gSaveFailedClockInfo.clockRunning != FALSE)
+    if (gSaveFailedClockInfo[CLOCK_RUNNING] != FALSE)
     {
         gMain.oamBuffer[0].tileNum = gClockFrames[n][0];
         gMain.oamBuffer[0].matrixNum = (gClockFrames[n][2] << 4) | (gClockFrames[n][1] << 3);
@@ -283,8 +286,8 @@ static void VBlankCB_UpdateClockGraphics(void)
 
     CpuFastCopy(gMain.oamBuffer, (void *)OAM, 4);
 
-    if (gSaveFailedClockInfo.debugTimer)
-        gSaveFailedClockInfo.debugTimer--;
+    if (gSaveFailedClockInfo[DEBUG_TIMER])
+        gSaveFailedClockInfo[DEBUG_TIMER]--;
 }
 
 static bool8 VerifySectorWipe(u16 sector)
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 6331eb565..b1572bf25 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -1639,14 +1639,7 @@ gUnknown_0203BCF4: @ 203BCF4
 gUnknown_0203BCF8: @ 203BCF8
 	.space 0x4
 
-gSaveFailedType: @ 203BCFC
-	.space 0x2
-
-gSaveFailedClockInfo: @ 203BCFE
-	.space 0x10
-
-gSaveFailedWindowIds: @ 203BD0E
-	.space 0x6
+    .include "src/save_failed_screen.o"
 
 gBraillePuzzleCallbackFlag: @ 203BD14
 	.space 0x4

From 058fed1fd89d74182ec8bf6cca97a090496441e9 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Fri, 6 Oct 2017 20:35:29 -0400
Subject: [PATCH 37/42] oops

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

diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 8536e541a..3f9219574 100755
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -250,7 +250,7 @@ static void CB2_FadeAndReturnToTitleScreen(void)
     }
 }
 
-void CB2_ReturnToTitleScreen(void)
+static void CB2_ReturnToTitleScreen(void)
 {
     if (!UpdatePaletteFade())
     {

From e38fd8347d2519551648c351d528cc3fee3924d4 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Fri, 6 Oct 2017 21:59:47 -0400
Subject: [PATCH 38/42] use rodata for save_failed_screen

---
 data/save_failed_screen.s     |  28 --------
 graphics/misc/clock_small.pal |  19 +++++
 graphics/misc/clock_small.png | Bin 0 -> 221 bytes
 include/window.h              |   2 +-
 ld_script.txt                 |   2 +-
 src/save_failed_screen.c      | 127 +++++++++++++++++++++++++++++-----
 src/window.c                  |   2 +-
 7 files changed, 131 insertions(+), 49 deletions(-)
 delete mode 100644 data/save_failed_screen.s
 create mode 100755 graphics/misc/clock_small.pal
 create mode 100755 graphics/misc/clock_small.png

diff --git a/data/save_failed_screen.s b/data/save_failed_screen.s
deleted file mode 100644
index 1b9fb7ed1..000000000
--- a/data/save_failed_screen.s
+++ /dev/null
@@ -1,28 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gClockOamData:: @ 85EFD80
-	.incbin "baserom.gba", 0x5efd80, 0x8
-
-gUnknown_085EFD88:: @ 85EFD88
-	.incbin "baserom.gba", 0x5efd88, 0xc
-
-gUnknown_085EFD94:: @ 85EFD94
-	.incbin "baserom.gba", 0x5efd94, 0x8
-
-gUnknown_085EFD9C:: @ 85EFD9C
-	.incbin "baserom.gba", 0x5efd9c, 0x8
-
-gUnknown_085EFDA4:: @ 85EFDA4
-	.incbin "baserom.gba", 0x5efda4, 0x8
-
-gClockFrames:: @ 85EFDAC
-	.incbin "baserom.gba", 0x5efdac, 0x18
-
-gSaveFailedClockPal:: @ 85EFDC4
-	.incbin "baserom.gba", 0x5efdc4, 0x20
-
-gSaveFailedClockGfx:: @ 85EFDE4
-	.incbin "baserom.gba", 0x5efde4, 0x90
diff --git a/graphics/misc/clock_small.pal b/graphics/misc/clock_small.pal
new file mode 100755
index 000000000..3398fcbe3
--- /dev/null
+++ b/graphics/misc/clock_small.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+98 139 90
+0 0 0
+57 57 57
+123 123 123
+189 189 189
+255 255 255
+255 65 41
+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 0 0
diff --git a/graphics/misc/clock_small.png b/graphics/misc/clock_small.png
new file mode 100755
index 0000000000000000000000000000000000000000..6b9f6c1f7730f24185477b95df18914f96c69791
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!VDx|6+TY^aRPioT$8$^fJ{qE%j)Xty?gim
z2LeY;pa?FoQ?Nl1D3{^s;us<^H8~+6As{G;fmu~tT$MvsiYskpOWV>mD?<Z=olO#o
zTpVp)8Xb&N4xeIRRG*Nf(D0(kK%vO*MA!jcR}1F()e5%`vMqD;<@0Xdp>Cop`l@FO
oV<CUn$pY_#?>xO-Qv)8zF-%tokl<C}7Y4b<)78&qol`;+0NVaLs{jB1

literal 0
HcmV?d00001

diff --git a/include/window.h b/include/window.h
index 4e814ebc6..b630cd316 100644
--- a/include/window.h
+++ b/include/window.h
@@ -43,7 +43,7 @@ struct Window
 
 bool16 InitWindows(const struct WindowTemplate *templates);
 u16 AddWindow(const struct WindowTemplate *template);
-int AddWindowWithoutTileMap(struct WindowTemplate *template);
+int AddWindowWithoutTileMap(const struct WindowTemplate *template);
 void RemoveWindow(u8 windowId);
 void FreeAllWindowBuffers(void);
 void CopyWindowToVram(u8 windowId, u8 mode);
diff --git a/ld_script.txt b/ld_script.txt
index f65e26e73..de6ba62f1 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -434,7 +434,7 @@ SECTIONS {
         data/strings.o(.rodata);
         data/berry_tag_screen.o(.rodata);
         data/mystery_event_menu.o(.rodata);
-        data/save_failed_screen.o(.rodata);
+        src/save_failed_screen.o(.rodata);
         data/braille_puzzles.o(.rodata);
         data/pokeblock_feed.o(.rodata);
         data/clear_save_data_screen.o(.rodata);
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 3f9219574..7a7c30388 100755
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -22,22 +22,11 @@ extern u32 gDamagedSaveSectors;
 extern const u8 gBirchHelpGfx[];
 extern const u8 gBirchBagTilemap[];
 extern const u8 gBirchGrassTilemap[];
-extern const u8 gSaveFailedClockGfx[];
-
-extern const struct OamData gClockOamData; // sClockOamData
-extern const u8 gClockFrames[8][3]; // sClockFrames
-
-extern const struct BgTemplate gUnknown_085EFD88[];
-extern const struct WindowTemplate gUnknown_085EFD94[];
-extern struct WindowTemplate gUnknown_085EFD9C;
-extern struct WindowTemplate gUnknown_085EFDA4;
-extern struct SaveSection gSaveDataBuffer;
-extern const u32 gUnknown_0850E87C[];
-
 extern const u16 gBirchBagGrassPal[];
-extern const u16 gSaveFailedClockPal[];
 extern const u16 gUnknown_0850FEFC[];
 extern const u16 gUnknown_0860F074[];
+extern const u32 gUnknown_0850E87C[];
+extern struct SaveSection gSaveDataBuffer;
 
 extern u8 gText_SaveFailedCheckingBackup[];
 extern u8 gText_BackupMemoryDamaged[];
@@ -68,6 +57,108 @@ EWRAM_DATA u8 gSaveFailedUnused1[12] = {0};
 EWRAM_DATA u8 gSaveFailedWindowIds[2] = {0};
 EWRAM_DATA u8 gSaveFailedUnused2[4] = {0};
 
+static const struct OamData sClockOamData =
+{
+    160, // Y
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    1,
+    0,
+    0,
+    0,
+    0
+};
+
+static const struct BgTemplate gUnknown_085EFD88[3] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0,
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 14,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0,
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 15,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0,
+    },
+};
+
+static const struct WindowTemplate gUnknown_085EFD94[] =
+{
+    {
+        .priority = 255,
+        .tilemapLeft = 0,
+        .tilemapTop = 0,
+        .width = 0,
+        .height = 0,
+        .paletteNum = 0,
+        .baseBlock = 0,
+    }
+};
+
+static const struct WindowTemplate gUnknown_085EFD9C[] =
+{
+    {
+        .priority = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 13,
+        .width = 28,
+        .height = 6,
+        .paletteNum = 15,
+        .baseBlock = 1,
+    }
+};
+
+static const struct WindowTemplate gUnknown_085EFDA4[] =
+{
+    {
+        .priority = 0,
+        .tilemapLeft = 14,
+        .tilemapTop = 9,
+        .width = 2,
+        .height = 2,
+        .paletteNum = 15,
+        .baseBlock = 169,
+    }
+};
+
+static const u8 sClockFrames[8][3] =
+{
+    { 1, 0, 0 },
+    { 5, 0, 0 },
+    { 9, 0, 0 },
+    { 5, 0, 1 },
+    { 1, 0, 1 },
+    { 5, 1, 1 },
+    { 9, 1, 0 },
+    { 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 void CB2_SaveFailedScreen(void);
 static void CB2_WipeSave(void);
 static void CB2_GameplayCannotBeContinued(void);
@@ -140,9 +231,9 @@ static void CB2_SaveFailedScreen(void)
             LoadBgTiles(0, gUnknown_0850E87C, 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);
+            gSaveFailedWindowIds[TEXT_WIN_ID] = AddWindowWithoutTileMap(gUnknown_085EFD9C);
             SetWindowAttribute(gSaveFailedWindowIds[TEXT_WIN_ID], 7, (u32)&gDecompressionBuffer[0x2800]);
-            gSaveFailedWindowIds[CLOCK_WIN_ID] = AddWindowWithoutTileMap(&gUnknown_085EFDA4);
+            gSaveFailedWindowIds[CLOCK_WIN_ID] = AddWindowWithoutTileMap(gUnknown_085EFDA4);
             SetWindowAttribute(gSaveFailedWindowIds[CLOCK_WIN_ID], 7, (u32)&gDecompressionBuffer[0x3D00]);
             DeactivateAllTextPrinters();
             ResetSpriteData();
@@ -270,14 +361,14 @@ static void VBlankCB_UpdateClockGraphics(void)
 {
     unsigned int n = (gMain.vblankCounter2 >> 3) & 7;
 
-    gMain.oamBuffer[0] = gClockOamData;
+    gMain.oamBuffer[0] = sClockOamData;
     gMain.oamBuffer[0].x = 112;
     gMain.oamBuffer[0].y = (CLOCK_WIN_TOP + 1) * 8;;
 
     if (gSaveFailedClockInfo[CLOCK_RUNNING] != FALSE)
     {
-        gMain.oamBuffer[0].tileNum = gClockFrames[n][0];
-        gMain.oamBuffer[0].matrixNum = (gClockFrames[n][2] << 4) | (gClockFrames[n][1] << 3);
+        gMain.oamBuffer[0].tileNum = sClockFrames[n][0];
+        gMain.oamBuffer[0].matrixNum = (sClockFrames[n][2] << 4) | (sClockFrames[n][1] << 3);
     }
     else
     {
diff --git a/src/window.c b/src/window.c
index 704060b9d..f4cb48ec0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -190,7 +190,7 @@ u16 AddWindow(const struct WindowTemplate *template)
     return win;
 }
 
-int AddWindowWithoutTileMap(struct WindowTemplate *template)
+int AddWindowWithoutTileMap(const struct WindowTemplate *template)
 {
     u16 win;
     u8 bgLayer;

From 2ecb9fcd130af975dd85a86e8e0fb23520aa7869 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Fri, 6 Oct 2017 23:30:35 -0400
Subject: [PATCH 39/42] oops

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

diff --git a/src/save.c b/src/save.c
index aee20d451..2c1b26ca9 100644
--- a/src/save.c
+++ b/src/save.c
@@ -15,7 +15,6 @@ extern const struct SaveSectionOffsets gSaveSectionOffsets[0xE];
 extern void DoSaveFailedScreen(u8); // save_failed_screen
 extern void LoadSerializedGame(void); // load_save
 extern bool32 ProgramFlashSectorAndVerify(u8 sector, u8 *data);
-extern void ReadFlash(u8 sector, u32 arg1, void* data, u32 size);
 
 // iwram common
 u16 gLastWrittenSector;
@@ -806,7 +805,7 @@ u32 sub_81535DC(u8 sector, u8* dst)
 
     if (sector != 30 && sector != 31)
         return 0xFF;
-    ReadFlash(sector, 0, &gSaveDataBuffer, sizeof(struct SaveSection));
+    ReadFlash(sector, 0, (u8 *)&gSaveDataBuffer, sizeof(struct SaveSection));
     if (*(u32*)(&gSaveDataBuffer.data[0]) != 0xB39D)
         return 0xFF;
     // copies whole save section except u32 counter

From f0775000a1cd87174e9b3a5a6a365e189309385e Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sat, 7 Oct 2017 22:54:32 -0400
Subject: [PATCH 40/42] decompile diploma.c

---
 asm/diploma.s                      | 387 -----------------------------
 asm/rom6.s                         |   2 +-
 data/diploma.s                     |  22 --
 graphics/misc/diploma.png          | Bin 0 -> 2064 bytes
 graphics/misc/diploma_hoenn.pal    |  19 ++
 graphics/misc/diploma_map.bin      | Bin 0 -> 4096 bytes
 graphics/misc/diploma_national.pal |  19 ++
 ld_script.txt                      |   4 +-
 src/diploma.c                      | 220 ++++++++++++++++
 src/save_failed_screen.c           |   2 +-
 sym_ewram.txt                      |   4 +-
 11 files changed, 263 insertions(+), 416 deletions(-)
 delete mode 100644 asm/diploma.s
 delete mode 100644 data/diploma.s
 create mode 100755 graphics/misc/diploma.png
 create mode 100755 graphics/misc/diploma_hoenn.pal
 create mode 100755 graphics/misc/diploma_map.bin
 create mode 100755 graphics/misc/diploma_national.pal
 create mode 100755 src/diploma.c

diff --git a/asm/diploma.s b/asm/diploma.s
deleted file mode 100644
index 4f21fe39d..000000000
--- a/asm/diploma.s
+++ /dev/null
@@ -1,387 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8177874
-sub_8177874: @ 8177874
-	push {lr}
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8177874
-
-	thumb_func_start sub_8177888
-sub_8177888: @ 8177888
-	push {r4,r5,lr}
-	sub sp, 0xC
-	movs r0, 0
-	bl SetVBlankCallback
-	movs r0, 0
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0xE
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0xC
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0xA
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x8
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x1C
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x1E
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x18
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x1A
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x14
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x16
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x10
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x12
-	movs r1, 0
-	bl SetGpuReg
-	add r1, sp, 0x4
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =0x040000d4
-	add r0, sp, 0x4
-	str r0, [r1]
-	movs r0, 0xC0
-	lsls r0, 19
-	str r0, [r1, 0x4]
-	ldr r0, =0x8100c000
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	movs r5, 0
-	str r5, [sp, 0x8]
-	add r0, sp, 0x8
-	str r0, [r1]
-	movs r0, 0xE0
-	lsls r0, 19
-	str r0, [r1, 0x4]
-	ldr r0, =0x85000100
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	add r0, sp, 0x4
-	strh r5, [r0]
-	str r0, [r1]
-	movs r0, 0xA0
-	lsls r0, 19
-	str r0, [r1, 0x4]
-	ldr r0, =0x81000200
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	bl remove_some_task
-	bl ResetTasks
-	bl ResetSpriteData
-	bl ResetPaletteFade
-	bl FreeAllSpritePalettes
-	ldr r0, =gUnknown_085E7088
-	movs r1, 0
-	movs r2, 0x40
-	bl LoadPalette
-	ldr r4, =gUnknown_0203BCF0
-	movs r0, 0x80
-	lsls r0, 5
-	bl Alloc
-	str r0, [r4]
-	bl sub_8177B44
-	bl sub_8177B9C
-	bl reset_temp_tile_data_buffers
-	ldr r1, =gUnknown_085E7804
-	str r5, [sp]
-	movs r0, 0x1
-	movs r2, 0
-	movs r3, 0
-	bl decompress_and_copy_tile_data_to_vram
-_0817797C:
-	bl free_temp_tile_data_buffers_if_possible
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0
-	bne _0817797C
-	ldr r0, =gUnknown_085E70C8
-	ldr r1, =gUnknown_0203BCF0
-	ldr r1, [r1]
-	bl LZDecompressWram
-	movs r0, 0x1
-	bl CopyBgTilemapBufferToVram
-	bl pokedex_diploma_something
-	movs r4, 0x1
-	negs r4, r4
-	adds r0, r4, 0
-	movs r1, 0x10
-	movs r2, 0
-	bl BlendPalettes
-	str r5, [sp]
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	movs r0, 0x1
-	bl EnableInterrupts
-	ldr r0, =sub_8177874
-	bl SetVBlankCallback
-	ldr r0, =sub_8177A08
-	bl SetMainCallback2
-	ldr r0, =sub_8177A20
-	movs r1, 0
-	bl CreateTask
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177888
-
-	thumb_func_start sub_8177A08
-sub_8177A08: @ 8177A08
-	push {lr}
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8177A08
-
-	thumb_func_start sub_8177A20
-sub_8177A20: @ 8177A20
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08177A40
-	ldr r0, =gTasks
-	lsls r1, r2, 2
-	adds r1, r2
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, =sub_8177A50
-	str r0, [r1]
-_08177A40:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177A20
-
-	thumb_func_start sub_8177A50
-sub_8177A50: @ 8177A50
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x3
-	ands r0, r1
-	cmp r0, 0
-	beq _08177A82
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, =sub_8177A98
-	str r1, [r0]
-_08177A82:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177A50
-
-	thumb_func_start sub_8177A98
-sub_8177A98: @ 8177A98
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08177AC2
-	ldr r0, =gUnknown_0203BCF0
-	ldr r0, [r0]
-	bl Free
-	bl FreeAllWindowBuffers
-	adds r0, r4, 0
-	bl DestroyTask
-	ldr r0, =sub_80861E8
-	bl SetMainCallback2
-_08177AC2:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177A98
-
-	thumb_func_start pokedex_diploma_something
-pokedex_diploma_something: @ 8177AD4
-	push {r4,lr}
-	bl sub_80C0944
-	lsls r0, 16
-	cmp r0, 0
-	beq _08177AFC
-	movs r1, 0x80
-	lsls r1, 1
-	movs r0, 0x14
-	bl SetGpuReg
-	ldr r0, =gStringVar1
-	ldr r1, =gText_DexNational
-	bl StringCopy
-	b _08177B0C
-	.pool
-_08177AFC:
-	movs r0, 0x14
-	movs r1, 0
-	bl SetGpuReg
-	ldr r0, =gStringVar1
-	ldr r1, =gText_DexHoenn
-	bl StringCopy
-_08177B0C:
-	ldr r4, =gStringVar4
-	ldr r1, =gText_PokedexDiploma
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0x1
-	bl sub_8177BCC
-	movs r0, 0
-	bl PutWindowTilemap
-	movs r0, 0
-	movs r1, 0x3
-	bl CopyWindowToVram
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end pokedex_diploma_something
-
-	thumb_func_start sub_8177B44
-sub_8177B44: @ 8177B44
-	push {lr}
-	movs r0, 0
-	bl ResetBgsAndClearDma3BusyFlags
-	ldr r1, =gUnknown_085E81FC
-	movs r0, 0
-	movs r2, 0x2
-	bl InitBgsFromTemplates
-	ldr r0, =gUnknown_0203BCF0
-	ldr r1, [r0]
-	movs r0, 0x1
-	bl SetBgTilemapBuffer
-	movs r1, 0x82
-	lsls r1, 5
-	movs r0, 0
-	bl SetGpuReg
-	movs r0, 0
-	bl ShowBg
-	movs r0, 0x1
-	bl ShowBg
-	movs r0, 0x50
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x52
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x54
-	movs r1, 0
-	bl SetGpuReg
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177B44
-
-	thumb_func_start sub_8177B9C
-sub_8177B9C: @ 8177B9C
-	push {lr}
-	ldr r0, =gUnknown_085E8204
-	bl InitWindows
-	bl DeactivateAllTextPrinters
-	ldr r0, =gUnknown_0860F074
-	movs r1, 0xF0
-	movs r2, 0x20
-	bl LoadPalette
-	movs r0, 0
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	movs r0, 0
-	bl PutWindowTilemap
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177B9C
-
-	thumb_func_start sub_8177BCC
-sub_8177BCC: @ 8177BCC
-	push {r4-r6,lr}
-	sub sp, 0x18
-	adds r6, r0, 0
-	adds r4, r1, 0
-	adds r5, r2, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r1, =gUnknown_085E8214
-	add r0, sp, 0x14
-	movs r2, 0x3
-	bl memcpy
-	movs r0, 0
-	str r0, [sp]
-	str r0, [sp, 0x4]
-	add r0, sp, 0x14
-	str r0, [sp, 0x8]
-	movs r0, 0x1
-	negs r0, r0
-	str r0, [sp, 0xC]
-	str r6, [sp, 0x10]
-	movs r0, 0
-	movs r1, 0x1
-	adds r2, r4, 0
-	adds r3, r5, 0
-	bl AddTextPrinterParametrized2
-	add sp, 0x18
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177BCC
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/rom6.s b/asm/rom6.s
index c53e6fe6e..0a8960811 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -4705,7 +4705,7 @@ _08137CAC:
 	thumb_func_start sub_8137CB4
 sub_8137CB4: @ 8137CB4
 	push {lr}
-	ldr r0, =sub_8177888
+	ldr r0, =CB2_ShowDiploma
 	bl SetMainCallback2
 	bl ScriptContext2_Enable
 	pop {r0}
diff --git a/data/diploma.s b/data/diploma.s
deleted file mode 100644
index 43a3d9c70..000000000
--- a/data/diploma.s
+++ /dev/null
@@ -1,22 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_085E7088:: @ 85E7088
-	.incbin "baserom.gba", 0x5e7088, 0x40
-
-gUnknown_085E70C8:: @ 85E70C8
-	.incbin "baserom.gba", 0x5e70c8, 0x73c
-
-gUnknown_085E7804:: @ 85E7804
-	.incbin "baserom.gba", 0x5e7804, 0x9f8
-
-gUnknown_085E81FC:: @ 85E81FC
-	.incbin "baserom.gba", 0x5e81fc, 0x8
-
-gUnknown_085E8204:: @ 85E8204
-	.incbin "baserom.gba", 0x5e8204, 0x10
-
-gUnknown_085E8214:: @ 85E8214
-	.incbin "baserom.gba", 0x5e8214, 0x4
diff --git a/graphics/misc/diploma.png b/graphics/misc/diploma.png
new file mode 100755
index 0000000000000000000000000000000000000000..d9607dce6f2f5a8d97bf9629fcd1ea0622099fa7
GIT binary patch
literal 2064
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

literal 0
HcmV?d00001

diff --git a/graphics/misc/diploma_hoenn.pal b/graphics/misc/diploma_hoenn.pal
new file mode 100755
index 000000000..2890eb24a
--- /dev/null
+++ b/graphics/misc/diploma_hoenn.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 222
+246 238 230
+205 230 139
+172 222 49
+238 238 222
+222 230 230
+255 222 197
+222 222 189
+246 246 180
+238 230 180
+213 213 156
+230 230 139
+255 255 123
+238 238 106
+255 205 172
diff --git a/graphics/misc/diploma_map.bin b/graphics/misc/diploma_map.bin
new file mode 100755
index 0000000000000000000000000000000000000000..e9a47fa44f8980182d2c27f6583a0b55736f038b
GIT binary patch
literal 4096
zcmeH{^>bcD6o%g~Ie~?4+c(JxEU-Wnmnbe#T%x$7hD*ITNgHp{CTXPZ?(Xj1e~IQB
zrjvWiSK6QWf$q*bbMKw|oM-p!+}prLHnEv?tPiA?BRG;Hb%fSxz19WNtWDae4T{U7
zhrR4$KRekK$XJf!c#hX`I##>1Gmw7m(_Za~@-1v-8>cgJ19Q5zX{)wG`F3`224{xo
zIL1?$zyuYI*Eo&n;QBLlhIVLsl%L9JA(l*J5|gP+VT!6IYmz1^0~I2irc<MQH)n<T
zRHiYV8O&rBvoupPG+om)HN?--?il`T<}jCe%x3`$G+*;HS93Hw#K-m*vWUejVJXX4
zrlne<#ag6=AwIUhoE5BO6{}gp8m-nUt<(xF5Am`6<*ve2x++)gYFv%4_Eo;pSNL*2
z_yi)1?JsmiuGp2hQdj26e5o(-#lFZFM)@JM9LixF9_arfU8oCm{@*Lib~!HB<+*%U
z;0k=c&-1xH$Is>*&gDGL=K?O|qHFk5U7AaG87|Xhxh$XQGkm&F^Q*arYq^f=xq%zG
zDc}$8EW$*W<dU7b6qn-FC;KFy=y!7u_i`Wi^8gR>&^7#*tGPHA@5Cjz1TQ|`$N7jq
z%`-g9b3D%ryvR$}^oQ3oaKD&KxRlGdoGZAJtFHLlU5ERp_ruRNa|^d}8@F=@cXAgy
ze7hg`{##tDYx|c9lR1Tld4xxKjK_I`CwYpkz9q`{xL()i`dz2%3S<;Va}3AmXdR_p
zzS9p*zwh(Cz9-5zxJK9Hnq8f%4`c!-auO%$M4h1ZzRnL$vv2Z^z9GsF?BU8VxW0J>
z2whwsZ9>$|+nXKu&pOb6Ml_)rb*K-d79%hcBV~ltO1;zt(kxBVC=D{O=pOW<5B=yw
zS0H0C4&yOi#>rUelFmT-rB8aLC(5^=6>XS~$PLWt(k89a66M>`ff<+?qT>(`K>`v)
zBwpeqB7^JClo`???NNRzriEA{5lKjfA_Xa;k}OG*C=67HV46&g^4*vf;!}}^bYvhC
zS;&%1$&hqOlhhDDOS)tDvyp>b<RKpgD3E-~lU&J>><}N@Ux*?UqXeZWLz$FHi4;qb
z6o&ZN{&G~H5>=>14QixXs-#jXq&&pO_LrLqQ)#M9wW%>Rw%S(NN?T#e?cfuLAhy5I
z6q#aEVoFV!DYK=v#NL8iFaMZt!|fOXi=h~X;eq}yl7+HB=F2>pD|2MF<d|HOXYx&f
zDX{rA&)$JM;cyr3#y#-37x&@*fPa&0lnt_8*2!8~BdaCNq?-(rX|ha~&9oWz0X&F@
z@Gu_1qj(ID;|V+&@E?+cazOUWKG`dKWVa-mB$I5^q?i<|HrYOfr|}G)#dCNbFW^PI
zgqH*UOL9>z$ay&@XXT8XmWYWn@kUI7Nw8w$?JIZ{ui<sPfj99M-o`t4H{f3-D`kZ&
zmu0e4mdN7JNk#A;-p2>{5Fg=Ve1cE$89u+_Z#Nxgm+X`svR$^xR@ow(uj0SJm-q@_
z;~RX7@9;f-z>ny#?RMb%Z!xXrl$?|ka$JtdQ8^-qui__T3Vy=R_yxb>H~fx2@F!Yr
zOO)?1y{6Cfn@-ae$S91)7>tq8GD^B^ryZPr+h==iPn2&kji$*on>te;$OKHpButWt
dGC}HXogJKJ+hiMULzExb!_9HC1OL|!`~`@zlY9UG

literal 0
HcmV?d00001

diff --git a/graphics/misc/diploma_national.pal b/graphics/misc/diploma_national.pal
new file mode 100755
index 000000000..03c37bf22
--- /dev/null
+++ b/graphics/misc/diploma_national.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 222
+255 255 189
+230 238 90
+213 222 0
+238 238 222
+222 230 230
+255 222 197
+222 222 189
+246 246 180
+238 230 180
+213 213 156
+230 230 139
+255 255 123
+238 238 106
+255 205 172
diff --git a/ld_script.txt b/ld_script.txt
index de6ba62f1..39e5c5bc1 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -218,7 +218,7 @@ SECTIONS {
         asm/hall_of_fame.o(.text);
         asm/credits.o(.text);
         src/lottery_corner.o(.text);
-        asm/diploma.o(.text);
+        src/diploma.o(.text);
         asm/berry_tag_screen.o(.text);
         asm/mystery_event_menu.o(.text);
         src/save_failed_screen.o(.text);
@@ -430,7 +430,7 @@ SECTIONS {
         data/hall_of_fame.o(.rodata);
         data/credits.o(.rodata);
         src/lottery_corner.o(.rodata);
-        data/diploma.o(.rodata);
+        src/diploma.o(.rodata);
         data/strings.o(.rodata);
         data/berry_tag_screen.o(.rodata);
         data/mystery_event_menu.o(.rodata);
diff --git a/src/diploma.c b/src/diploma.c
new file mode 100755
index 000000000..765b018bc
--- /dev/null
+++ b/src/diploma.c
@@ -0,0 +1,220 @@
+#include "global.h"
+#include "palette.h"
+#include "main.h"
+#include "gpu_regs.h"
+#include "unknown_task.h"
+#include "task.h"
+#include "malloc.h"
+#include "decompress.h"
+#include "bg.h"
+#include "window.h"
+#include "string_util.h"
+#include "text.h"
+
+extern void reset_temp_tile_data_buffers(void);
+extern int decompress_and_copy_tile_data_to_vram(u8 bg_id, void *src, int size, u16 offset, u8 mode);
+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 u16 gUnknown_0860F074[];
+
+extern u8 gText_DexNational[];
+extern u8 gText_DexHoenn[];
+extern u8 gText_PokedexDiploma[];
+
+static void MainCB2(void);
+static void Task_DiplomaFadeIn(u8);
+static void Task_DiplomaWaitForKeyPress(u8);
+static void Task_DiplomaFadeOut(u8);
+static void DisplayDiplomaText(void);
+static void InitDiplomaBg(void);
+static void InitDiplomaWindow(void);
+static void PrintDiplomaText(u8 *, u8, u8);
+
+EWRAM_DATA void **gDiplomaTilemapPtr = {NULL};
+
+static void VBlankCB(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+static const u16 gDiplomaPalettes[][16] =
+{
+    INCBIN_U16("graphics/misc/diploma_national.gbapal"),
+    INCBIN_U16("graphics/misc/diploma_hoenn.gbapal"),
+};
+
+static const u8 gDiplomaTilemap[] = INCBIN_U8("graphics/misc/diploma_map.bin.lz");
+static const u8 gDiplomaTiles[] = INCBIN_U8("graphics/misc/diploma.4bpp.lz");
+
+void CB2_ShowDiploma(void)
+{
+    void **mallocPtr;
+
+    SetVBlankCallback(NULL);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BG3CNT, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BG2CNT, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BG1CNT, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BG0CNT, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BG3HOFS, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BG3VOFS, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BG2HOFS, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BG2VOFS, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BG1HOFS, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BG1VOFS, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BG0HOFS, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BG0VOFS, DISPCNT_MODE_0);
+    // why doesn't this one use the dma manager either?
+    DmaFill16(3, 0, VRAM, VRAM_SIZE);
+    DmaFill32(3, 0, OAM, OAM_SIZE);
+    DmaFill16(3, 0, PLTT, PLTT_SIZE);
+    remove_some_task();
+    ResetTasks();
+    ResetSpriteData();
+    ResetPaletteFade();
+    FreeAllSpritePalettes();
+    LoadPalette(gDiplomaPalettes, 0, 64);
+    gDiplomaTilemapPtr = malloc(0x1000);
+    InitDiplomaBg();
+    InitDiplomaWindow();
+    reset_temp_tile_data_buffers();
+    decompress_and_copy_tile_data_to_vram(1, &gDiplomaTiles, 0, 0, 0);
+    while (free_temp_tile_data_buffers_if_possible())
+        ;
+    LZDecompressWram(&gDiplomaTilemap, gDiplomaTilemapPtr);
+    CopyBgTilemapBufferToVram(1);
+    DisplayDiplomaText();
+    BlendPalettes(-1, 16, 0);
+    BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+    EnableInterrupts(1);
+    SetVBlankCallback(VBlankCB);
+    SetMainCallback2(MainCB2);
+    CreateTask(Task_DiplomaFadeIn, 0);
+}
+
+static void MainCB2(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+static void Task_DiplomaFadeIn(u8 taskId)
+{
+    if (!gPaletteFade.active)
+        gTasks[taskId].func = Task_DiplomaWaitForKeyPress;
+}
+
+static void Task_DiplomaWaitForKeyPress(u8 taskId)
+{
+    if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+    {
+        BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+        gTasks[taskId].func = Task_DiplomaFadeOut;
+    }
+}
+
+static void Task_DiplomaFadeOut(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        Free(gDiplomaTilemapPtr);
+        FreeAllWindowBuffers();
+        DestroyTask(taskId);
+        SetMainCallback2(sub_80861E8);
+    }
+}
+
+static void DisplayDiplomaText(void)
+{
+    if (sub_80C0944())
+    {
+        SetGpuReg(REG_OFFSET_BG1HOFS, DISPCNT_BG0_ON);
+        StringCopy(gStringVar1, gText_DexNational);
+    }
+    else
+    {
+        SetGpuReg(REG_OFFSET_BG1HOFS, DISPCNT_MODE_0);
+        StringCopy(gStringVar1, gText_DexHoenn);
+    }
+    StringExpandPlaceholders(gStringVar4, gText_PokedexDiploma);
+    PrintDiplomaText(gStringVar4, 0, 1);
+    PutWindowTilemap(0);
+    CopyWindowToVram(0, 3);
+}
+
+static const struct BgTemplate gDiplomaBgTemplates[2] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0,
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 6,
+        .screenSize = 1,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0,
+    },
+};
+
+static void InitDiplomaBg(void)
+{
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gDiplomaBgTemplates, 2);
+    SetBgTilemapBuffer(1, gDiplomaTilemapPtr);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+    ShowBg(0);
+    ShowBg(1);
+    SetGpuReg(REG_OFFSET_BLDCNT, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BLDALPHA, DISPCNT_MODE_0);
+    SetGpuReg(REG_OFFSET_BLDY, DISPCNT_MODE_0);
+}
+
+static const struct WindowTemplate gDiplomaWinTemplates[2] =
+{
+    {
+        .priority = 0,
+        .tilemapLeft = 5,
+        .tilemapTop = 2,
+        .width = 20,
+        .height = 16,
+        .paletteNum = 15,
+        .baseBlock = 1,
+    },
+    DUMMY_WIN_TEMPLATE,
+};
+
+static void InitDiplomaWindow(void)
+{
+    InitWindows(gDiplomaWinTemplates);
+    DeactivateAllTextPrinters();
+    LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
+    FillWindowPixelBuffer(0, 0);
+    PutWindowTilemap(0);
+}
+
+static void PrintDiplomaText(u8 *text, u8 var1, u8 var2)
+{
+    struct TextColor color =
+    {
+        .fgColor = 0,
+        .bgColor = 2,
+        .shadowColor = 3,
+    };
+
+    AddTextPrinterParametrized2(0, 1, var1, var2, 0, 0, &color, -1, text);
+}
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 7a7c30388..3f49b89e6 100755
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -13,7 +13,7 @@
 #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, u8 speed, u8 *str);
+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);
 
diff --git a/sym_ewram.txt b/sym_ewram.txt
index b1572bf25..166ea64d0 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -1629,9 +1629,7 @@ gUnknown_0203BCE8: @ 203BCE8
 	.space 0x4
 
     .include "src/lottery_corner.o"
-
-gUnknown_0203BCF0: @ 203BCF0
-	.space 0x4
+    .include "src/diploma.o"
 
 gUnknown_0203BCF4: @ 203BCF4
 	.space 0x4

From f775ccd571f82df745f608c23758185741867eab Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sat, 7 Oct 2017 22:58:21 -0400
Subject: [PATCH 41/42] forgot to remove unnecessary local ptr

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

diff --git a/src/diploma.c b/src/diploma.c
index 765b018bc..f2cbcabb7 100755
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -53,8 +53,6 @@ static const u8 gDiplomaTiles[] = INCBIN_U8("graphics/misc/diploma.4bpp.lz");
 
 void CB2_ShowDiploma(void)
 {
-    void **mallocPtr;
-
     SetVBlankCallback(NULL);
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0);
     SetGpuReg(REG_OFFSET_BG3CNT, DISPCNT_MODE_0);

From a9d94cc5d62540f6f20b17280cb8f45adc5683b1 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sun, 8 Oct 2017 22:21:34 -0400
Subject: [PATCH 42/42] decompile save_location.c

---
 asm/rom4.s           |   4 +-
 asm/save_location.s  | 205 -------------------------------------------
 data/save_location.s |  13 ---
 ld_script.txt        |   4 +-
 src/save_location.c  | 145 ++++++++++++++++++++++++++++++
 5 files changed, 149 insertions(+), 222 deletions(-)
 delete mode 100755 asm/save_location.s
 delete mode 100644 data/save_location.s
 create mode 100755 src/save_location.c

diff --git a/asm/rom4.s b/asm/rom4.s
index 8423d0d9a..0a624620d 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -1375,7 +1375,7 @@ _080850C8:
 	bl warp_shift
 	bl set_current_map_header_from_sav1_save_old_name
 	bl CopyFieldObjectTemplatesToSav1
-	bl sav2_set_x9_depending_on_sav1_map
+	bl TrySetMapSaveWarpStatus
 	bl ClearTempFieldEventData
 	bl wild_pokemon_reroll
 	bl prev_quest_postbuffer_cursor_backup_reset
@@ -1463,7 +1463,7 @@ _080851A2:
 	lsls r0, 24
 	lsrs r6, r0, 24
 	bl sub_80EB218
-	bl sav2_set_x9_depending_on_sav1_map
+	bl TrySetMapSaveWarpStatus
 	bl ClearTempFieldEventData
 	bl wild_pokemon_reroll
 	bl prev_quest_postbuffer_cursor_backup_reset
diff --git a/asm/save_location.s b/asm/save_location.s
deleted file mode 100755
index 1a5b3c6da..000000000
--- a/asm/save_location.s
+++ /dev/null
@@ -1,205 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sav1_are_mapnumbers_in_given_list
-sav1_are_mapnumbers_in_given_list: @ 81AFC84
-	push {r4,lr}
-	adds r2, r0, 0
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	movs r1, 0x4
-	ldrsb r1, [r0, r1]
-	lsls r1, 8
-	ldrb r0, [r0, 0x5]
-	lsls r0, 24
-	asrs r0, 24
-	adds r0, r1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	ldrh r0, [r2]
-	ldr r1, =0x0000ffff
-	cmp r0, r1
-	beq _081AFCC4
-	adds r4, r1, 0
-	adds r1, r2, 0
-_081AFCAA:
-	ldrh r0, [r1]
-	cmp r0, r3
-	bne _081AFCBC
-	movs r0, 0x1
-	b _081AFCC6
-	.pool
-_081AFCBC:
-	adds r1, 0x2
-	ldrh r0, [r1]
-	cmp r0, r4
-	bne _081AFCAA
-_081AFCC4:
-	movs r0, 0
-_081AFCC6:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sav1_are_mapnumbers_in_given_list
-
-	thumb_func_start sav1_is_in_pokecenter
-sav1_is_in_pokecenter: @ 81AFCCC
-	push {lr}
-	ldr r0, =gUnknown_086143BC
-	bl sav1_are_mapnumbers_in_given_list
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sav1_is_in_pokecenter
-
-	thumb_func_start sub_81AFCDC
-sub_81AFCDC: @ 81AFCDC
-	push {lr}
-	ldr r0, =gUnknown_0861440A
-	bl sav1_are_mapnumbers_in_given_list
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81AFCDC
-
-	thumb_func_start sub_81AFCEC
-sub_81AFCEC: @ 81AFCEC
-	push {lr}
-	ldr r0, =gUnknown_0861440E
-	bl sav1_are_mapnumbers_in_given_list
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81AFCEC
-
-	thumb_func_start sav2_set_x9_bit3_when_sav1_in_pokecenter
-sav2_set_x9_bit3_when_sav1_in_pokecenter: @ 81AFCFC
-	push {lr}
-	bl sav1_is_in_pokecenter
-	cmp r0, 0
-	bne _081AFD18
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0xFD
-	ands r0, r1
-	b _081AFD22
-	.pool
-_081AFD18:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0x2
-	orrs r0, r1
-_081AFD22:
-	strb r0, [r2, 0x9]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sav2_set_x9_bit3_when_sav1_in_pokecenter
-
-	thumb_func_start sub_81AFD2C
-sub_81AFD2C: @ 81AFD2C
-	push {lr}
-	bl sub_81AFCDC
-	cmp r0, 0
-	bne _081AFD48
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0xFB
-	ands r0, r1
-	b _081AFD52
-	.pool
-_081AFD48:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0x4
-	orrs r0, r1
-_081AFD52:
-	strb r0, [r2, 0x9]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81AFD2C
-
-	thumb_func_start sub_81AFD5C
-sub_81AFD5C: @ 81AFD5C
-	push {lr}
-	bl sub_81AFCEC
-	cmp r0, 0
-	bne _081AFD78
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0xF7
-	ands r0, r1
-	b _081AFD82
-	.pool
-_081AFD78:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0x8
-	orrs r0, r1
-_081AFD82:
-	strb r0, [r2, 0x9]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81AFD5C
-
-	thumb_func_start sav2_set_x9_depending_on_sav1_map
-sav2_set_x9_depending_on_sav1_map: @ 81AFD8C
-	push {lr}
-	bl sav2_set_x9_bit3_when_sav1_in_pokecenter
-	bl sub_81AFD2C
-	bl sub_81AFD5C
-	pop {r0}
-	bx r0
-	thumb_func_end sav2_set_x9_depending_on_sav1_map
-
-	thumb_func_start sub_81AFDA0
-sub_81AFDA0: @ 81AFDA0
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	adds r2, 0xA8
-	ldr r0, [r2]
-	movs r1, 0x80
-	lsls r1, 8
-	orrs r0, r1
-	movs r1, 0x1
-	orrs r0, r1
-	movs r1, 0x2
-	orrs r0, r1
-	movs r1, 0x4
-	orrs r0, r1
-	movs r1, 0x10
-	orrs r0, r1
-	movs r1, 0x20
-	orrs r0, r1
-	movs r1, 0x8
-	orrs r0, r1
-	str r0, [r2]
-	bx lr
-	.pool
-	thumb_func_end sub_81AFDA0
-
-	thumb_func_start sub_81AFDD0
-sub_81AFDD0: @ 81AFDD0
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0x9]
-	bx lr
-	.pool
-	thumb_func_end sub_81AFDD0
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/data/save_location.s b/data/save_location.s
deleted file mode 100644
index eabed7d86..000000000
--- a/data/save_location.s
+++ /dev/null
@@ -1,13 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_086143BC:: @ 86143BC
-	.incbin "baserom.gba", 0x6143bc, 0x4e
-
-gUnknown_0861440A:: @ 861440A
-	.incbin "baserom.gba", 0x61440a, 0x4
-
-gUnknown_0861440E:: @ 861440E
-	.incbin "baserom.gba", 0x61440e, 0x2
diff --git a/ld_script.txt b/ld_script.txt
index 39e5c5bc1..82588be3a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -244,7 +244,7 @@ SECTIONS {
         asm/list_menu.o(.text);
         asm/menu_indicators.o(.text);
         asm/unk_text_util.o(.text);
-        asm/save_location.o(.text);
+        src/save_location.o(.text);
         asm/item_icon.o(.text);
         asm/party_menu.o(.text);
         asm/battle_tent.o(.text);
@@ -451,7 +451,7 @@ SECTIONS {
         data/battle_frontier_2.o(.rodata);
         data/item_menu.o(.rodata);
         data/menu_indicators.o(.rodata);
-        data/save_location.o(.rodata);
+        src/save_location.o(.rodata);
         data/item_icon.o(.rodata);
         data/party_menu.o(.rodata);
         data/battle_tent.o(.rodata);
diff --git a/src/save_location.c b/src/save_location.c
new file mode 100755
index 000000000..87067e14d
--- /dev/null
+++ b/src/save_location.c
@@ -0,0 +1,145 @@
+#include "global.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))
+
+// specialSaveWarp flags
+#define POKECENTER_SAVEWARP (1 << 1)
+#define LOBBY_SAVEWARP (1 << 2)
+#define UNK_SPECIAL_SAVE_WARP_FLAG_3 (1 << 3)
+
+static bool32 IsCurMapInLocationList(const u16 *list)
+{
+    u16 locSum = (gSaveBlock1Ptr->location.mapGroup << 8) + (gSaveBlock1Ptr->location.mapNum);
+
+    // im sure it was written a different way, but for the love of christ I cant figure out how to write it different where it still matches.
+    if (*list != 0xFFFF)
+    {
+        u16 termValue = 0xFFFF;
+        const u16 *localList;
+        for (localList = list; *localList != termValue; localList++)
+            if (*localList == locSum)
+                return TRUE;
+    }
+    return FALSE;
+}
+
+// TODO: Not require a packed u16 array for these lists
+static const u16 gSaveLocationPokeCenterList[] =
+{
+    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,
+};
+
+static bool32 IsCurMapPokeCenter(void)
+{
+    return IsCurMapInLocationList(gSaveLocationPokeCenterList);
+}
+
+static const u16 gSaveLocationReloadLocList[] = // there's only 1 location, and it's presumed its for the save reload feature for battle tower
+{
+    MAP(BATTLE_TOWER_LOBBY),
+    0xFFFF,
+};
+
+static bool32 IsCurMapReloadLocation(void)
+{
+    return IsCurMapInLocationList(gSaveLocationReloadLocList);
+}
+
+// nulled out list. unknown what this would have been
+static const u16 gUnknown_0861440E[] =
+{
+    0xFFFF,
+};
+
+bool32 sub_81AFCEC(void)
+{
+    return IsCurMapInLocationList(gUnknown_0861440E);
+}
+
+static void TrySetPokeCenterWarpStatus(void)
+{
+    if (IsCurMapPokeCenter() == FALSE)
+        gSaveBlock2Ptr->specialSaveWarp &= ~(POKECENTER_SAVEWARP);
+    else
+        gSaveBlock2Ptr->specialSaveWarp |= POKECENTER_SAVEWARP;
+}
+
+static void TrySetReloadWarpStatus(void)
+{
+    if (!IsCurMapReloadLocation())
+        gSaveBlock2Ptr->specialSaveWarp &= ~(LOBBY_SAVEWARP);
+    else
+        gSaveBlock2Ptr->specialSaveWarp |= LOBBY_SAVEWARP;
+}
+
+// this function definitely sets a warp status, but because the list is empty, it's unknown what this does yet.
+static void sub_81AFD5C(void)
+{
+    if (!sub_81AFCEC())
+        gSaveBlock2Ptr->specialSaveWarp &= ~(UNK_SPECIAL_SAVE_WARP_FLAG_3);
+    else
+        gSaveBlock2Ptr->specialSaveWarp |= UNK_SPECIAL_SAVE_WARP_FLAG_3;
+}
+
+void TrySetMapSaveWarpStatus(void)
+{
+    TrySetPokeCenterWarpStatus();
+    TrySetReloadWarpStatus();
+    sub_81AFD5C();
+}
+
+void sub_81AFDA0(void)
+{
+    gSaveBlock2Ptr->field_A8 |= 0x8000;
+    gSaveBlock2Ptr->field_A8 |= 0x1;
+    gSaveBlock2Ptr->field_A8 |= 0x2;
+    gSaveBlock2Ptr->field_A8 |= 0x4;
+    gSaveBlock2Ptr->field_A8 |= 0x10;
+    gSaveBlock2Ptr->field_A8 |= 0x20;
+    gSaveBlock2Ptr->field_A8 |= 0x8;
+}
+
+void sub_81AFDD0(void)
+{
+    gSaveBlock2Ptr->specialSaveWarp |= 0x80;
+}