From d54a9b56da080285db359610fb76aa402e1de249 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 9 Apr 2019 11:23:33 -0400
Subject: through sub_812EB2C

---
 include/constants/species.h | 3 +++
 include/wild_encounter.h    | 1 +
 2 files changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/constants/species.h b/include/constants/species.h
index f698ada14..9cb239799 100644
--- a/include/constants/species.h
+++ b/include/constants/species.h
@@ -445,6 +445,9 @@
 #define SPECIES_UNOWN_EMARK 438
 #define SPECIES_UNOWN_QMARK 439
 
+#define SPECIES_OLD_UNOWN_EMARK 412
+#define SPECIES_OLD_UNOWN_QMARK 413
+
 #define NUM_SPECIES SPECIES_EGG
 
 #endif  // GUARD_CONSTANTS_SPECIES_H
diff --git a/include/wild_encounter.h b/include/wild_encounter.h
index 2186e0b4f..b4c42116a 100644
--- a/include/wild_encounter.h
+++ b/include/wild_encounter.h
@@ -43,5 +43,6 @@ u16 GetLocalWildMon(bool8 *isWaterMon);
 u16 GetLocalWaterMon(void);
 bool8 UpdateRepelCounter(void);
 void sub_8082740(u8);
+u8 GetUnownLetterByPersonality(u32 personality);
 
 #endif // GUARD_WILD_ENCOUNTER_H
-- 
cgit v1.2.3


From fb423f957dc8944edf0b822a7aaa1949434ac65e Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 9 Apr 2019 14:30:54 -0400
Subject: sub_812EB58; port scanline_effect

---
 include/help_system.h      |  1 +
 include/menu.h             |  1 +
 include/new_menu_helpers.h |  3 +++
 include/pokemon_3.h        |  1 +
 include/scanline_effect.h  | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 include/text.h             |  1 +
 include/unknown_task.h     | 24 ------------------------
 7 files changed, 51 insertions(+), 26 deletions(-)
 delete mode 100644 include/unknown_task.h

(limited to 'include')

diff --git a/include/help_system.h b/include/help_system.h
index 632788148..0192809fc 100644
--- a/include/help_system.h
+++ b/include/help_system.h
@@ -6,5 +6,6 @@
 extern bool8 gUnknown_3005ECC;
 
 void sub_812B484(void);
+void sub_812B1F0(u8);
 
 #endif //GUARD_HELP_SYSTEM_H
diff --git a/include/menu.h b/include/menu.h
index b5078df5e..2c68b29b4 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -38,5 +38,6 @@ void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSp
 void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
 void sub_810F4D8(u8 windowId, bool32 someBool);
 void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
+void sub_810F558(u8, u8, u8, u8, u16);
 
 #endif // GUARD_MENU_H
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index e22f89f44..0d51eb5fb 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -24,5 +24,8 @@ u8 GetStartMenuWindowId(void);
 void sub_80F7998(void);
 void sub_80F69E8(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
 void sub_80F6F1C(u8 windowId, bool8 copyNow);
+void sub_80F6C6C(void);
+void sub_80F6C98(void);
+void sub_80F77CC(u16);
 
 #endif // GUARD_NEW_MENU_HELPERS_H
diff --git a/include/pokemon_3.h b/include/pokemon_3.h
index cffc9780b..a7f83a7de 100644
--- a/include/pokemon_3.h
+++ b/include/pokemon_3.h
@@ -5,5 +5,6 @@
 
 const u8* GetTrainerClassNameFromId(u16 trainerId);
 const u8* GetTrainerNameFromId(u16 trainerId);
+void sub_8044AF0(u8, u8);
 
 #endif // GUARD_POKEMON_3_H
diff --git a/include/scanline_effect.h b/include/scanline_effect.h
index d49f5b4d6..711ed7da8 100644
--- a/include/scanline_effect.h
+++ b/include/scanline_effect.h
@@ -1,6 +1,48 @@
 #ifndef GUARD_SCANLINE_EFFECT_H
 #define GUARD_SCANLINE_EFFECT_H
 
-void remove_some_task(void);
+// DMA control value to transfer a single 16-bit value at HBlank
+#define SCANLINE_EFFECT_DMACNT_16BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_16BIT | DMA_DEST_RELOAD) << 16) | 1)
+#define SCANLINE_EFFECT_DMACNT_32BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_32BIT | DMA_DEST_RELOAD) << 16) | 1)
 
-#endif //GUARD_SCANLINE_EFFECT_H
+#define SCANLINE_EFFECT_REG_BG0HOFS (REG_ADDR_BG0HOFS - REG_ADDR_BG0HOFS)
+#define SCANLINE_EFFECT_REG_BG0VOFS (REG_ADDR_BG0VOFS - REG_ADDR_BG0HOFS)
+#define SCANLINE_EFFECT_REG_BG1HOFS (REG_ADDR_BG1HOFS - REG_ADDR_BG0HOFS)
+#define SCANLINE_EFFECT_REG_BG1VOFS (REG_ADDR_BG1VOFS - REG_ADDR_BG0HOFS)
+#define SCANLINE_EFFECT_REG_BG2HOFS (REG_ADDR_BG2HOFS - REG_ADDR_BG0HOFS)
+#define SCANLINE_EFFECT_REG_BG2VOFS (REG_ADDR_BG2VOFS - REG_ADDR_BG0HOFS)
+#define SCANLINE_EFFECT_REG_BG3HOFS (REG_ADDR_BG3HOFS - REG_ADDR_BG0HOFS)
+#define SCANLINE_EFFECT_REG_BG3VOFS (REG_ADDR_BG3VOFS - REG_ADDR_BG0HOFS)
+
+struct ScanlineEffectParams
+{
+    volatile void *dmaDest;
+    u32 dmaControl;
+    u8 initState;
+    u8 unused9;
+};
+
+struct ScanlineEffect
+{
+    void *dmaSrcBuffers[2];
+    volatile void *dmaDest;
+    u32 dmaControl;
+    void (*setFirstScanlineReg)(void);
+    u8 srcBuffer;
+    u8 state;
+    u8 unused16;
+    u8 unused17;
+    u8 waveTaskId;
+};
+
+extern struct ScanlineEffect gScanlineEffect;
+
+extern u16 gScanlineEffectRegBuffers[2][0x3C0];
+
+void ScanlineEffect_Stop(void);
+void ScanlineEffect_Clear(void);
+void ScanlineEffect_SetParams(struct ScanlineEffectParams);
+void ScanlineEffect_InitHBlankDmaTransfer(void);
+u8 ScanlineEffect_InitWave(u8 startLine, u8 endLine, u8 frequency, u8 amplitude, u8 delayInterval, u8 regOffset, bool8 a7);
+
+#endif // GUARD_SCANLINE_EFFECT_H
\ No newline at end of file
diff --git a/include/text.h b/include/text.h
index e127f103a..1956de52b 100644
--- a/include/text.h
+++ b/include/text.h
@@ -250,5 +250,6 @@ s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese);
 s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese);
 s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese);
 void sub_80062B0(struct Sprite *sprite);
+u8 sub_8006300(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority);
 
 #endif // GUARD_TEXT_H
diff --git a/include/unknown_task.h b/include/unknown_task.h
deleted file mode 100644
index 429e58aad..000000000
--- a/include/unknown_task.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef GUARD_unknown_task_H
-#define GUARD_unknown_task_H
-
-#include "global.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);
-void sub_80BA0A8(void);
-
-#endif // GUARD_unknown_task_H
-- 
cgit v1.2.3


From 789e598c920a4061828c9be27498228b0be568dc Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 9 Apr 2019 18:23:34 -0400
Subject: sub_812EEB0

---
 include/event_scripts.h | 2 ++
 include/menu.h          | 1 +
 2 files changed, 3 insertions(+)

(limited to 'include')

diff --git a/include/event_scripts.h b/include/event_scripts.h
index b909566d0..6c26ef892 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -705,4 +705,6 @@ extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni3[];
 extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni4[];
 extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[];
 
+extern const u8 gUnknown_81C582D[];
+
 #endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/menu.h b/include/menu.h
index 2c68b29b4..937e2e59c 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -39,5 +39,6 @@ void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
 void sub_810F4D8(u8 windowId, bool32 someBool);
 void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
 void sub_810F558(u8, u8, u8, u8, u16);
+void sub_810F650(const u8 *, const u8 *, u8, u32, u8);
 
 #endif // GUARD_MENU_H
-- 
cgit v1.2.3


From dbd48510879a39de0ed7af143d4284ede7ae5829 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 10 Apr 2019 08:47:54 -0400
Subject: sub_812EF50

---
 include/menu.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/menu.h b/include/menu.h
index 937e2e59c..f9fa63f98 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -40,5 +40,6 @@ void sub_810F4D8(u8 windowId, bool32 someBool);
 void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
 void sub_810F558(u8, u8, u8, u8, u16);
 void sub_810F650(const u8 *, const u8 *, u8, u32, u8);
+void sub_810F5E8(const u8 *, u32, u8);
 
 #endif // GUARD_MENU_H
-- 
cgit v1.2.3


From bf7084cb60f0375973d8caf1005fb8b02653ade2 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 10 Apr 2019 10:16:20 -0400
Subject: through sub_812F33C

---
 include/menu.h             | 1 +
 include/new_menu_helpers.h | 1 +
 include/text.h             | 1 +
 3 files changed, 3 insertions(+)

(limited to 'include')

diff --git a/include/menu.h b/include/menu.h
index f9fa63f98..b134ef7f5 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -41,5 +41,6 @@ void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
 void sub_810F558(u8, u8, u8, u8, u16);
 void sub_810F650(const u8 *, const u8 *, u8, u32, u8);
 void sub_810F5E8(const u8 *, u32, u8);
+void sub_810F71C(void);
 
 #endif // GUARD_MENU_H
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index 0d51eb5fb..8903f5d56 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -27,5 +27,6 @@ void sub_80F6F1C(u8 windowId, bool8 copyNow);
 void sub_80F6C6C(void);
 void sub_80F6C98(void);
 void sub_80F77CC(u16);
+void * malloc_and_decompress(const void * src, u32 * size);
 
 #endif // GUARD_NEW_MENU_HELPERS_H
diff --git a/include/text.h b/include/text.h
index 1956de52b..c8835fbde 100644
--- a/include/text.h
+++ b/include/text.h
@@ -251,5 +251,6 @@ s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese);
 s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese);
 void sub_80062B0(struct Sprite *sprite);
 u8 sub_8006300(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority);
+void sub_8006398(u8 spriteId);
 
 #endif // GUARD_TEXT_H
-- 
cgit v1.2.3


From 2f337edf36ded496efd8ec6cc0c35dda10e1bc98 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 10 Apr 2019 12:11:36 -0400
Subject: through sub_812FD78

---
 include/menu.h     | 1 +
 include/pokeball.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/menu.h b/include/menu.h
index b134ef7f5..cdc872a6d 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -42,5 +42,6 @@ void sub_810F558(u8, u8, u8, u8, u16);
 void sub_810F650(const u8 *, const u8 *, u8, u32, u8);
 void sub_810F5E8(const u8 *, u32, u8);
 void sub_810F71C(void);
+void sub_810F740(void);
 
 #endif // GUARD_MENU_H
diff --git a/include/pokeball.h b/include/pokeball.h
index 10a9529b9..5545f8870 100644
--- a/include/pokeball.h
+++ b/include/pokeball.h
@@ -24,7 +24,8 @@ enum
 #define POKEBALL_OPPONENT_SENDOUT   0xFE
 
 u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow);
-void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h, u16 species);
+void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
+u8 sub_804BB98(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
 u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h);
 void sub_8076918(u8 bank);
 void DoHitAnimHealthboxEffect(u8 bank);
-- 
cgit v1.2.3


From 6982393439b300deef09bef2e29f8f6c1180eee9 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 10 Apr 2019 16:43:44 -0400
Subject: through sub_8130324 nonmatching

---
 include/event_scripts.h    | 8 ++++++++
 include/menu.h             | 1 +
 include/new_menu_helpers.h | 1 +
 3 files changed, 10 insertions(+)

(limited to 'include')

diff --git a/include/event_scripts.h b/include/event_scripts.h
index 6c26ef892..9b31a084f 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -706,5 +706,13 @@ extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni4[];
 extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[];
 
 extern const u8 gUnknown_81C582D[];
+extern const u8 gUnknown_81C59D5[];
+extern const u8 gUnknown_81C5C78[];
+extern const u8 gUnknown_81C5D06[];
+extern const u8 gUnknown_81C5D12[];
+extern const u8 gUnknown_81C5D4B[];
+extern const u8 gUnknown_81C5DBD[];
+extern const u8 gUnknown_81C5DEA[];
+extern const u8 gUnknown_81C5E91[];
 
 #endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/menu.h b/include/menu.h
index cdc872a6d..41119db4f 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -43,5 +43,6 @@ void sub_810F650(const u8 *, const u8 *, u8, u32, u8);
 void sub_810F5E8(const u8 *, u32, u8);
 void sub_810F71C(void);
 void sub_810F740(void);
+void sub_810F7D8(u8, u8, u8, u8, u8, u8, u8);
 
 #endif // GUARD_MENU_H
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index 8903f5d56..0157896cb 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -28,5 +28,6 @@ void sub_80F6C6C(void);
 void sub_80F6C98(void);
 void sub_80F77CC(u16);
 void * malloc_and_decompress(const void * src, u32 * size);
+u16 sub_80F796C(void);
 
 #endif // GUARD_NEW_MENU_HELPERS_H
-- 
cgit v1.2.3


From 716639a6287ac32b389085930dca612eba5818f2 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 10 Apr 2019 19:43:47 -0400
Subject: through sub_81306D4

---
 include/event_scripts.h | 3 +++
 include/menu.h          | 1 +
 2 files changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/event_scripts.h b/include/event_scripts.h
index 9b31a084f..c55076322 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -713,6 +713,9 @@ extern const u8 gUnknown_81C5D12[];
 extern const u8 gUnknown_81C5D4B[];
 extern const u8 gUnknown_81C5DBD[];
 extern const u8 gUnknown_81C5DEA[];
+extern const u8 gUnknown_81C5E13[];
 extern const u8 gUnknown_81C5E91[];
+extern const u8 gUnknown_81C5EB5[];
+extern const u8 gUnknown_81C5EC5[];
 
 #endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/menu.h b/include/menu.h
index 41119db4f..3394603c8 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -44,5 +44,6 @@ void sub_810F5E8(const u8 *, u32, u8);
 void sub_810F71C(void);
 void sub_810F740(void);
 void sub_810F7D8(u8, u8, u8, u8, u8, u8, u8);
+void sub_810FF60(const struct WindowTemplate *, u8, u8, u8, u16, u8, u8);
 
 #endif // GUARD_MENU_H
-- 
cgit v1.2.3


From 35892e6b5381190269a61f3a87743086a6a44c12 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 10 Apr 2019 20:26:51 -0400
Subject: through sub_8130C20

---
 include/event_scripts.h | 2 ++
 include/math_util.h     | 6 ++++++
 include/overworld.h     | 1 +
 include/pokemon_3.h     | 1 +
 4 files changed, 10 insertions(+)
 create mode 100644 include/math_util.h

(limited to 'include')

diff --git a/include/event_scripts.h b/include/event_scripts.h
index c55076322..4b0930e9f 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -714,8 +714,10 @@ extern const u8 gUnknown_81C5D4B[];
 extern const u8 gUnknown_81C5DBD[];
 extern const u8 gUnknown_81C5DEA[];
 extern const u8 gUnknown_81C5E13[];
+extern const u8 gUnknown_81C5E2E[];
 extern const u8 gUnknown_81C5E91[];
 extern const u8 gUnknown_81C5EB5[];
 extern const u8 gUnknown_81C5EC5[];
+extern const u8 gUnknown_81C5EF4[];
 
 #endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/math_util.h b/include/math_util.h
new file mode 100644
index 000000000..74dbbe98e
--- /dev/null
+++ b/include/math_util.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_MATH_UTIL_H
+#define GUARD_MATH_UTIL_H
+
+s16 sub_80D8B90(s16 y);
+
+#endif //GUARD_MATH_UTIL_H
diff --git a/include/overworld.h b/include/overworld.h
index b32d9cf48..8c32d3e06 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -99,5 +99,6 @@ extern u8 gUnknown_2036E28;
 extern bool8 (* gUnknown_3005024)(void);
 void SetLastHealLocationWarp(u8 healLocaionId);
 void sub_8055864(u8 mapGroup, u8 mapNum);
+void CB2_NewGame(void);
 
 #endif //GUARD_ROM4_H
diff --git a/include/pokemon_3.h b/include/pokemon_3.h
index a7f83a7de..d18be1403 100644
--- a/include/pokemon_3.h
+++ b/include/pokemon_3.h
@@ -6,5 +6,6 @@
 const u8* GetTrainerClassNameFromId(u16 trainerId);
 const u8* GetTrainerNameFromId(u16 trainerId);
 void sub_8044AF0(u8, u8);
+void sub_8044D80(void);
 
 #endif // GUARD_POKEMON_3_H
-- 
cgit v1.2.3


From 6eb7cc6cfae14b93feee880b23e903c336c58dcd Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 11 Apr 2019 08:46:30 -0400
Subject: through CreateNidoranFSprite

---
 include/decompress.h | 2 ++
 include/pokemon.h    | 1 +
 include/pokemon_3.h  | 1 +
 3 files changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/decompress.h b/include/decompress.h
index 36672dcfd..c2c4f0e1c 100644
--- a/include/decompress.h
+++ b/include/decompress.h
@@ -18,6 +18,8 @@ void LoadCompressedObjectPalette(const struct CompressedSpritePalette *src);
 void LoadCompressedObjectPaletteOverrideBuffer(const struct CompressedSpritePalette *a, void *buffer);
 bool8 LoadCompressedObjectPaletteUsingHeap(const struct CompressedSpritePalette *src);
 
+bool8 sub_800F078(const struct CompressedSpritePalette *src);
+
 void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void* buffer, s32 species);
 void DecompressPicFromTable_2(const struct CompressedSpriteSheet *src, void* buffer, s32 species);
 void DecompressPicFromTable_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void* buffer, s32 species);
diff --git a/include/pokemon.h b/include/pokemon.h
index f1f04c9eb..c08f37b5f 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -673,5 +673,6 @@ void BattleAnimateBackSprite(struct Sprite* sprite, u16 species);
 void PlayMapChosenOrBattleBGM(u16 songId);
 u8 GetMonsStateToDoubles(void);
 void sub_803E0A4(struct Pokemon *mon, struct BattleTowerPokemon *src);
+void sub_803F7D4(u16 trainerSpriteId, u8 battlerPosition);
 
 #endif // GUARD_POKEMON_H
diff --git a/include/pokemon_3.h b/include/pokemon_3.h
index d18be1403..f6226f40d 100644
--- a/include/pokemon_3.h
+++ b/include/pokemon_3.h
@@ -7,5 +7,6 @@ const u8* GetTrainerClassNameFromId(u16 trainerId);
 const u8* GetTrainerNameFromId(u16 trainerId);
 void sub_8044AF0(u8, u8);
 void sub_8044D80(void);
+void * sub_8044E00(u8 buffId);
 
 #endif // GUARD_POKEMON_3_H
-- 
cgit v1.2.3


From fb7ba2161078a822da9698ef801472baf1ee0ed1 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Thu, 11 Apr 2019 12:55:13 -0400
Subject: finish oak_speech code decomp

---
 include/event_scripts.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/event_scripts.h b/include/event_scripts.h
index 4b0930e9f..101148d60 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -705,6 +705,7 @@ extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni3[];
 extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni4[];
 extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[];
 
+extern const u8 gUnknown_81C574F[];
 extern const u8 gUnknown_81C582D[];
 extern const u8 gUnknown_81C59D5[];
 extern const u8 gUnknown_81C5C78[];
-- 
cgit v1.2.3


From 18b20721d91e811595491d70e9512ace654e4f5a Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Thu, 11 Apr 2019 13:20:51 -0400
Subject: Remaining oak_speech data

---
 include/event_scripts.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

(limited to 'include')

diff --git a/include/event_scripts.h b/include/event_scripts.h
index 101148d60..d925f4b52 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -706,8 +706,59 @@ extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni4[];
 extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[];
 
 extern const u8 gUnknown_81C574F[];
+extern const u8 gUnknown_81C5758[];
+extern const u8 gUnknown_81C575E[];
+extern const u8 gUnknown_81C575E[];
+extern const u8 gUnknown_81C5767[];
+extern const u8 gUnknown_81C5767[];
+extern const u8 gUnknown_81C576C[];
+extern const u8 gUnknown_81C5771[];
+extern const u8 gUnknown_81C5775[];
+extern const u8 gUnknown_81C577A[];
+extern const u8 gUnknown_81C577E[];
+extern const u8 gUnknown_81C5783[];
+extern const u8 gUnknown_81C5788[];
+extern const u8 gUnknown_81C578C[];
+extern const u8 gUnknown_81C5792[];
+extern const u8 gUnknown_81C5797[];
+extern const u8 gUnknown_81C579D[];
+extern const u8 gUnknown_81C57A2[];
+extern const u8 gUnknown_81C57A9[];
+extern const u8 gUnknown_81C57AF[];
+extern const u8 gUnknown_81C57B4[];
+extern const u8 gUnknown_81C57B8[];
+extern const u8 gUnknown_81C57BC[];
+extern const u8 gUnknown_81C57C2[];
+extern const u8 gUnknown_81C57C6[];
+extern const u8 gUnknown_81C57CB[];
+extern const u8 gUnknown_81C57D0[];
+extern const u8 gUnknown_81C57D4[];
+extern const u8 gUnknown_81C57D9[];
+extern const u8 gUnknown_81C57E0[];
+extern const u8 gUnknown_81C57E8[];
+extern const u8 gUnknown_81C57EE[];
+extern const u8 gUnknown_81C57F4[];
+extern const u8 gUnknown_81C57FA[];
+extern const u8 gUnknown_81C57FF[];
+extern const u8 gUnknown_81C5806[];
+extern const u8 gUnknown_81C580A[];
+extern const u8 gUnknown_81C580F[];
+extern const u8 gUnknown_81C5814[];
+extern const u8 gUnknown_81C5819[];
+extern const u8 gUnknown_81C581F[];
+extern const u8 gUnknown_81C5823[];
+extern const u8 gUnknown_81C5828[];
 extern const u8 gUnknown_81C582D[];
+extern const u8 gUnknown_81C5875[];
+extern const u8 gUnknown_81C58BA[];
+extern const u8 gUnknown_81C58F9[];
+extern const u8 gUnknown_81C592B[];
+extern const u8 gUnknown_81C594F[];
+extern const u8 gUnknown_81C5981[];
 extern const u8 gUnknown_81C59D5[];
+extern const u8 gUnknown_81C5A04[];
+extern const u8 gUnknown_81C5AEB[];
+extern const u8 gUnknown_81C5BB9[];
 extern const u8 gUnknown_81C5C78[];
 extern const u8 gUnknown_81C5D06[];
 extern const u8 gUnknown_81C5D12[];
-- 
cgit v1.2.3