From 2aa77fc3c65ab13d74f1dd205dbb42fda2d6104f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 19 Jun 2017 21:54:12 -0400
Subject: GetLinkPartnerNames

---
 include/gba/defines.h | 0
 include/global.h      | 0
 include/player_pc.h   | 0
 include/tv.h          | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 include/gba/defines.h
 mode change 100755 => 100644 include/global.h
 mode change 100755 => 100644 include/player_pc.h

(limited to 'include')

diff --git a/include/gba/defines.h b/include/gba/defines.h
old mode 100755
new mode 100644
diff --git a/include/global.h b/include/global.h
old mode 100755
new mode 100644
diff --git a/include/player_pc.h b/include/player_pc.h
old mode 100755
new mode 100644
diff --git a/include/tv.h b/include/tv.h
index 277d29750..b4847848b 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -18,7 +18,7 @@ enum
     TVSHOW_MASS_OUTBREAK = 41,
 };
 
-extern u8 *gUnknown_083D1464[3];
+extern u8 *const gUnknown_083D1464[3];
 
 void ClearTVShowData(void);
 u8 sub_80BDEAC(u8 *);
-- 
cgit v1.2.3


From 9e681335d610dfece9936047e293bfe45841a3f3 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 19 Jun 2017 22:17:50 -0400
Subject: SpawnBerryBlenderLinkPlayerSprites

---
 include/field_map_obj.h | 1 +
 1 file changed, 1 insertion(+)
 mode change 100644 => 100755 include/field_map_obj.h

(limited to 'include')

diff --git a/include/field_map_obj.h b/include/field_map_obj.h
old mode 100644
new mode 100755
index e4999dee6..999c77401
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -197,5 +197,6 @@ u8 sub_8060B38(u8);
 u8 sub_8060B64(u8);
 u8 GetOppositeDirection(u8);
 void sub_80634D0(struct MapObject *, struct Sprite *);
+u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
 
 #endif // GUARD_FIELD_MAP_OBJ_H
-- 
cgit v1.2.3


From 9e5917e65692dd9f9db99f97966d8dfb3245ab6f Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 20 Jun 2017 09:47:54 -0400
Subject: Petalburg Gym field specials

---
 include/field_specials.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'include')

diff --git a/include/field_specials.h b/include/field_specials.h
index d0eb12065..dcade37a7 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -1,6 +1,16 @@
 #ifndef GUARD_FIELD_SPECIALS_H
 #define GUARD_FIELD_SPECIALS_H
 
+
+extern struct WarpData gUnknown_020297F0;
+extern u16 gScriptResult;
+extern u8 gUnknown_02039250;
+extern u8 gUnknown_02039251;
+extern u32 gUnknown_02039254;
+extern u16 gSpecialVar_0x8004;
+extern u8 gUnknown_02039258;
+extern u8 gUnknown_02039259;
+
 void ResetCyclingRoadChallengeData(void);
 bool32 CountSSTidalStep(u16);
 u8 GetSSTidalLocation(s8 *, s8 *, s16 *, s16 *);
-- 
cgit v1.2.3


From 6c419f362a02a95d9b54638c222b093b22787f71 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 20 Jun 2017 09:55:43 -0400
Subject: Three more small functions in field_specials.s

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

(limited to 'include')

diff --git a/include/field_specials.h b/include/field_specials.h
index dcade37a7..a71207656 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -8,6 +8,7 @@ extern u8 gUnknown_02039250;
 extern u8 gUnknown_02039251;
 extern u32 gUnknown_02039254;
 extern u16 gSpecialVar_0x8004;
+extern u16 gSpecialVar_0x8005;
 extern u8 gUnknown_02039258;
 extern u8 gUnknown_02039259;
 
-- 
cgit v1.2.3


From 5aeef909084e6dd8ea75cfc34cdd2601cab1de39 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 20 Jun 2017 09:58:05 -0400
Subject: Another three small functions in field_specials.s

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

(limited to 'include')

diff --git a/include/field_specials.h b/include/field_specials.h
index a71207656..0521c094f 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -11,6 +11,7 @@ extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
 extern u8 gUnknown_02039258;
 extern u8 gUnknown_02039259;
+extern u8 gUnknown_02024D26;
 
 void ResetCyclingRoadChallengeData(void);
 bool32 CountSSTidalStep(u16);
-- 
cgit v1.2.3


From 36b2378f1536dd2c7055ad31f62720a32b5d66bc Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 20 Jun 2017 11:44:54 -0400
Subject: PCTurnOnEffect

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

(limited to 'include')

diff --git a/include/field_region_map.h b/include/field_region_map.h
index 93b8c6d68..a7e81b418 100644
--- a/include/field_region_map.h
+++ b/include/field_region_map.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_FIELD_REGION_MAP_H
 #define GUARD_FIELD_REGION_MAP_H
 
+void FieldInitRegionMap(void(void));
 void CB2_FieldInitRegionMap(void);
 void VBlankCB_FieldRegionMap(void);
 void CB2_FieldRegionMap(void);
-- 
cgit v1.2.3


From 3e5267b6a13794f4f2b2178c9fa719a26e654cfe Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 20 Jun 2017 12:44:26 -0400
Subject: SetDepartmentStoreFloorVar

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

(limited to 'include')

diff --git a/include/vars.h b/include/vars.h
index cb5bb3296..6bbe1325a 100644
--- a/include/vars.h
+++ b/include/vars.h
@@ -17,6 +17,7 @@
 
 #define VAR_DAYS                   0x4040
 
+#define VAR_DEPT_STORE_FLOOR       0x4043
 #define VAR_POKELOT_PRIZE          0x4045
 #define VAR_NATIONAL_DEX           0x4046
 #define VAR_SHROOMISH_SIZE_RECORD  0x4047
-- 
cgit v1.2.3


From c8993068c9a9b25b9ea573737646872098829d24 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 20 Jun 2017 13:41:30 -0400
Subject: Some elevator menu related functions

---
 include/field_specials.h | 18 +++++++++++++++---
 include/menu_helpers.h   |  1 +
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/field_specials.h b/include/field_specials.h
index 0521c094f..ee7b80e1a 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -1,17 +1,29 @@
 #ifndef GUARD_FIELD_SPECIALS_H
 #define GUARD_FIELD_SPECIALS_H
 
+struct ElevatorMenu {
+    u8 var0;
+    u8 var1;
+    u8 var2;
+    u8 var3;
+};
 
+extern struct ElevatorMenu gUnknown_03000760[20];
 extern struct WarpData gUnknown_020297F0;
+extern u8 gUnknown_02024D26;
+
 extern u16 gScriptResult;
 extern u8 gUnknown_02039250;
 extern u8 gUnknown_02039251;
 extern u32 gUnknown_02039254;
-extern u16 gSpecialVar_0x8004;
-extern u16 gSpecialVar_0x8005;
 extern u8 gUnknown_02039258;
 extern u8 gUnknown_02039259;
-extern u8 gUnknown_02024D26;
+extern u8 gUnknown_0203925A;
+extern u8 gUnknown_0203925B;
+extern u8 gUnknown_0203925C;
+
+extern u16 gSpecialVar_0x8004;
+extern u16 gSpecialVar_0x8005;
 
 void ResetCyclingRoadChallengeData(void);
 bool32 CountSSTidalStep(u16);
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 0aa9f79f7..0e39a3732 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -23,5 +23,6 @@ void DestroyVerticalScrollIndicator(u8);
 void BuyMenuFreeMemory(void);
 void sub_80F98DC(int);
 void sub_80F996C(u8);
+void LoadScrollIndicatorPalette(void);
 
 #endif // GUARD_MENU_HELPERS_H
-- 
cgit v1.2.3


From 27ce8721331d5970c2d15d1a0459e37d094e0aa1 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 20 Jun 2017 14:14:54 -0400
Subject: Elevator menu main task

---
 include/field_specials.h | 4 ++--
 include/script.h         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/field_specials.h b/include/field_specials.h
index ee7b80e1a..02b70f99b 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -3,8 +3,8 @@
 
 struct ElevatorMenu {
     u8 var0;
-    u8 var1;
-    u8 var2;
+    s8 var1;
+    s8 var2;
     u8 var3;
 };
 
diff --git a/include/script.h b/include/script.h
index 4070a838f..5577fcb01 100644
--- a/include/script.h
+++ b/include/script.h
@@ -56,5 +56,6 @@ void ClearRamScript(void);
 bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId);
 u8 *GetRamScript(u8 objectId, u8 *script);
 u16 gScriptResult;
+extern u16 gScriptLastTalked;
 
 #endif // GUARD_SCRIPT_H
-- 
cgit v1.2.3


From 70300abee81a5b859533eff5537ebb7c926b4395 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 20 Jun 2017 22:19:40 -0400
Subject: camera dummy

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

(limited to 'include')

diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 999c77401..5eaa15149 100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -198,5 +198,6 @@ u8 sub_8060B64(u8);
 u8 GetOppositeDirection(u8);
 void sub_80634D0(struct MapObject *, struct Sprite *);
 u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
+void CameraObjectSetFollowedObjectId(u8);
 
 #endif // GUARD_FIELD_MAP_OBJ_H
-- 
cgit v1.2.3


From dac14d217da8e5249b0dcd7459090307b99d1418 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 20 Jun 2017 22:57:58 -0400
Subject: Up through sub_810F424

---
 include/battle_tower.h | 1 +
 include/pokeblock.h    | 1 +
 include/region_map.h   | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 include/battle_tower.h
 mode change 100644 => 100755 include/pokeblock.h
 mode change 100644 => 100755 include/region_map.h

(limited to 'include')

diff --git a/include/battle_tower.h b/include/battle_tower.h
old mode 100644
new mode 100755
index 193905b93..75ea405ab
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -3,5 +3,6 @@
 
 void sub_8134AC0(void *);
 u16 sub_8135D3C(u8);
+void sub_8135FF4(u8*);
 
 #endif // GUARD_BATTLE_TOWER_H
diff --git a/include/pokeblock.h b/include/pokeblock.h
old mode 100644
new mode 100755
index 257c83f1c..b925894db
--- a/include/pokeblock.h
+++ b/include/pokeblock.h
@@ -5,6 +5,7 @@ void sub_810B96C(void);
 void sub_810BA7C(u8);
 void ClearPokeblocks(void);
 void sub_810CA6C(s32);
+u8 sub_810CB68(u8, u8*);
 s16 sub_810CAE4(u8, struct Pokeblock *);
 
 #endif // GUARD_POKEBLOCK_H
diff --git a/include/region_map.h b/include/region_map.h
old mode 100644
new mode 100755
index 0cef566f6..6dfa4dcf0
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -6,7 +6,7 @@ void sub_80FAB10(void);
 u8 sub_80FAB60(void);
 void sub_80FBB3C(u16, u16);
 void sub_80FBCF0(u32, u8);
-void sub_80FBFB4(u8 *str, u8 region, u8);
+void sub_80FBFB4(u8 *str, u16 region, u8);
 void CopyMapName();
 u8 *CopyLocationName(u8 *dest, u8 location);
 
-- 
cgit v1.2.3


From ea76336a11a7f683b99cccbbc5d7fe72ee394d8d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 20 Jun 2017 23:08:52 -0400
Subject: Effort Ribbon: Well, you tried.

---
 include/pokemon.h | 1 +
 1 file changed, 1 insertion(+)
 mode change 100644 => 100755 include/pokemon.h

(limited to 'include')

diff --git a/include/pokemon.h b/include/pokemon.h
old mode 100644
new mode 100755
index 273e7d26e..c09f3870e
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -510,5 +510,6 @@ void sub_8040B8C(void);
 void SetWildMonHeldItem(void);
 u8 *sub_8040D08();
 bool32 sub_8040D3C(u16 species, u8 *name, u8 language);
+u16 GetMonEVCount(struct Pokemon *);
 
 #endif // GUARD_POKEMON_H
-- 
cgit v1.2.3


From 9722c4b632699db373516d3a54a8c8b606e0e4ad Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 21 Jun 2017 08:45:37 -0400
Subject: IsStarterInParty

---
 include/vars.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 include/vars.h

(limited to 'include')

diff --git a/include/vars.h b/include/vars.h
old mode 100644
new mode 100755
index 6bbe1325a..fcc3311a6
--- a/include/vars.h
+++ b/include/vars.h
@@ -33,7 +33,7 @@
 
 #define VAR_0x4089                 0x4089
 #define VAR_0x4097                 0x4097
-
+#define VAR_0x409a                 0x409a
 #define VAR_PORTHOLE               0x40B4
 
 #define VAR_0x40BC                 0x40BC
-- 
cgit v1.2.3


From 5463563b32f78ccdd9fe686e90d065d3bf462ca4 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 21 Jun 2017 09:24:37 -0400
Subject: Ensure include/battle_tower.h sync

---
 include/battle_tower.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 include/battle_tower.h

(limited to 'include')

diff --git a/include/battle_tower.h b/include/battle_tower.h
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 4a1f57f17afcc8005863571119d5f5dc14183183 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 21 Jun 2017 09:55:06 -0400
Subject: Through sub_810F96C

---
 include/field_map_obj.h          | 1 +
 include/pokemon.h                | 1 +
 include/pokemon_summary_screen.h | 1 +
 include/vars.h                   | 1 +
 4 files changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 5eaa15149..2d62af202 100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -199,5 +199,6 @@ u8 GetOppositeDirection(u8);
 void sub_80634D0(struct MapObject *, struct Sprite *);
 u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
 void CameraObjectSetFollowedObjectId(u8);
+void sub_805ADDC(u8);
 
 #endif // GUARD_FIELD_MAP_OBJ_H
diff --git a/include/pokemon.h b/include/pokemon.h
index c09f3870e..101ae94ce 100755
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -409,6 +409,7 @@ extern u8 gStatStageRatios[][2];
 
 extern struct Pokemon gPlayerParty[PARTY_SIZE];
 extern struct Pokemon gEnemyParty[PARTY_SIZE];
+extern struct PokemonStorage gPokemonStorage;
 
 void ZeroBoxMonData(struct BoxPokemon *boxMon);
 void ZeroMonData(struct Pokemon *mon);
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 3f7ed8fad..1d53a131c 100644
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -12,5 +12,6 @@ u8 GetMonStatusAndPokerus();
 u8 *sub_80A1E9C(u8 *dest, const u8 *src, u8);
 u8 *PokemonSummaryScreen_CopyPokemonLevel(u8 *dest, u8 level);
 u8 PokemonSummaryScreen_CheckOT(struct Pokemon *pokemon);
+bool8 CheckPartyPokerus(struct Pokemon *, u8);
 
 #endif // GUARD_POKEMON_SUMMARY_SCREEN_H
diff --git a/include/vars.h b/include/vars.h
index fcc3311a6..50ca97818 100755
--- a/include/vars.h
+++ b/include/vars.h
@@ -37,5 +37,6 @@
 #define VAR_PORTHOLE               0x40B4
 
 #define VAR_0x40BC                 0x40BC
+#define VAR_0x40C2                 0x40C2
 
 #endif // GUARD_VARS_H
-- 
cgit v1.2.3


From 6343bdcf312b785215f618358d84f46205018228 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 21 Jun 2017 09:56:37 -0400
Subject: Fix conflicting type declaration

---
 include/field_map_obj.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 2d62af202..28be5a640 100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -199,6 +199,6 @@ u8 GetOppositeDirection(u8);
 void sub_80634D0(struct MapObject *, struct Sprite *);
 u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
 void CameraObjectSetFollowedObjectId(u8);
-void sub_805ADDC(u8);
+u8 sub_805ADDC(u8);
 
 #endif // GUARD_FIELD_MAP_OBJ_H
-- 
cgit v1.2.3


From d008cc7d60d4cfd34c27a0abcb3cef991b8096a6 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 21 Jun 2017 10:18:04 -0400
Subject: Up through sub_810FAA0

---
 include/tv.h   | 1 +
 include/vars.h | 1 +
 2 files changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/tv.h b/include/tv.h
index b4847848b..e2001c7f3 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -106,5 +106,6 @@ void DoTVShowTodaysSmartShopper(void);
 void sub_80BE3BC(void);
 void UpdateTVShowsPerDay(u16);
 void sub_80C045C();
+void sub_80BF088(u8, u32);
 
 #endif // GUARD_TV_H
diff --git a/include/vars.h b/include/vars.h
index 50ca97818..f31ebde84 100755
--- a/include/vars.h
+++ b/include/vars.h
@@ -32,6 +32,7 @@
 #define VAR_0x4054                 0x4054
 
 #define VAR_0x4089                 0x4089
+#define VAR_0x4095                 0x4095
 #define VAR_0x4097                 0x4097
 #define VAR_0x409a                 0x409a
 #define VAR_PORTHOLE               0x40B4
-- 
cgit v1.2.3


From 294cbd8beb08b14a24385a78f1a8435f5fbe2f8c Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 21 Jun 2017 12:38:31 -0400
Subject: Ensure building from tidy wd

---
 include/tv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/tv.h b/include/tv.h
index e2001c7f3..3243fff2c 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -106,6 +106,6 @@ void DoTVShowTodaysSmartShopper(void);
 void sub_80BE3BC(void);
 void UpdateTVShowsPerDay(u16);
 void sub_80C045C();
-void sub_80BF088(u8, u32);
+void sub_80BF088(u8, s32);
 
 #endif // GUARD_TV_H
-- 
cgit v1.2.3