From d2538cffa03a21aca4e116971a7eb8b760f98ce0 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 6 Jan 2019 07:54:57 -0500
Subject: through ScrCmd_copyvar

---
 include/script.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/script.h b/include/script.h
index ebb4caa86..acd88adf3 100644
--- a/include/script.h
+++ b/include/script.h
@@ -66,4 +66,6 @@ bool32 sub_8069DFC(void);
 void sub_8069EA4(u8 * script, u16 scriptSize);
 u8 * sub_8069E48(void);
 
+extern const u8 *gRAMScriptPtr;
+
 #endif // GUARD_SCRIPT_H
-- 
cgit v1.2.3


From 1cb1fd2bf8416821a897fbc6b5a60c60595b4a7b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 6 Jan 2019 10:09:03 -0500
Subject: through ScrCmd_checkdecor

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

(limited to 'include')

diff --git a/include/item.h b/include/item.h
index 75c56c94d..2d6bb9370 100644
--- a/include/item.h
+++ b/include/item.h
@@ -63,5 +63,6 @@ u16 itemid_get_market_price(u16 itemId);
 void sub_809A2DC(void);
 void sub_809A2A4(void);
 void sub_8099E90(u16, u8 *);
+void sub_809A824(u16 itemId);
 
 #endif // ITEM_H
-- 
cgit v1.2.3


From 257bde9b08e907b59aed05d662a1d8daed8d79fa Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 6 Jan 2019 10:22:04 -0500
Subject: through ScrCmd_fadescreenspeed

---
 include/field_screen_effect.h | 2 +-
 include/map_preview_screen.h  | 6 ++++++
 include/quest_log.h           | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 include/map_preview_screen.h

(limited to 'include')

diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index add61d57c..14d7e5d81 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -4,7 +4,7 @@
 #include "global.h"
 
 void sub_80AF79C(void);
-void sub_80B009C(u8);
+void sub_807F028(u8);
 void sub_80B0244(void);
 
 #endif // GUARD_FIELD_SCREEN_EFFECT_H
diff --git a/include/map_preview_screen.h b/include/map_preview_screen.h
new file mode 100644
index 000000000..8d9114b82
--- /dev/null
+++ b/include/map_preview_screen.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_MAP_PREVIEW_SCREEN_H
+#define GUARD_MAP_PREVIEW_SCREEN_H
+
+void sub_80F85BC(u16 a0);
+
+#endif //GUARD_MAP_PREVIEW_SCREEN_H
diff --git a/include/quest_log.h b/include/quest_log.h
index 9f8a0ea21..00a8b8df3 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -21,5 +21,6 @@ extern struct UnkStruct_203AE98 * gUnknown_3005E94;
 
 void sub_8112720(u8);
 void sub_8113550(u16, const u16 *);
+void sub_8115748(u16);
 
 #endif //GUARD_QUEST_LOG_H
-- 
cgit v1.2.3


From b16831e97bb8b94c29854a81e11647e8a5db68c6 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 6 Jan 2019 11:57:00 -0500
Subject: through ScrCmd_fadeinbgm

---
 include/field_fadetransition.h | 14 +++++++-------
 include/field_player_avatar.h  |  1 +
 include/field_weather.h        |  1 +
 include/overworld.h            | 10 ++++++++--
 include/quest_log.h            |  2 ++
 5 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h
index 051865210..a2a4d3eac 100644
--- a/include/field_fadetransition.h
+++ b/include/field_fadetransition.h
@@ -3,14 +3,14 @@
 
 #include "global.h"
 
-void sub_80AF734(void);
-void sp13E_warp_to_last_warp(void);
-void sub_80AF7D0(void);
-void sp13F_fall_to_last_warp(void);
+void sub_807DF7C(void);
+void DoWarp(void);
+void DoDiveWarp(void);
+void DoDoorWarp(void);
 
-void sub_80AF848(void);
-void sub_80AF87C(void);
+void DoFallWarp(void);
+void sub_807E59C(void);
+void sub_807E500(void);
 void sub_807DF64(void);
-void sub_807DF7C(void);
 
 #endif // GUARD_FIELD_FADETRANSITION_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 297d66441..bb78bd0f3 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -20,5 +20,6 @@ u8 sub_805C808(u8);
 void SetPlayerAvatarStateMask(u8 mask);
 void sub_805D9C4(struct Sprite *sprite);
 void sub_805D154(u8 direction);
+void sub_805DAE4(u8 direction);
 
 #endif //GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/field_weather.h b/include/field_weather.h
index b896259e9..eb80c455a 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -10,6 +10,7 @@ u8 GetSav1Weather(void);
 void sub_80AEDBC(void);
 
 void DoCurrentWeather(void);
+void SetSav1WeatherFromCurrMapHeader(void);
 void sub_807B0C4(u16 *, u16 *, u32);
 
 #endif // GUARD_WEATHER_H
diff --git a/include/overworld.h b/include/overworld.h
index 50ac09d9e..6aa58baa9 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -35,7 +35,10 @@ void Overworld_SetMapObjTemplateMovementType(u8, u8);
 void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 
 void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId);
-void saved_warp2_set_2(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
+void SetDynamicWarpWithCoords(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
+void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
+void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
+void SetEscapeWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void Overworld_SetHealLocationWarp(u8);
 void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void sub_8084E2C(s8, s8, s8, s8, s8);
@@ -81,7 +84,10 @@ void sub_8055DC4(void);
 
 u8 sav1_map_get_name(void);
 
-void sub_8055D40(u16 mapDataId);
+void SetCurrentMapLayout(u16 mapDataId);
+void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y);
+
+void ResetInitialPlayerAvatarState(void);
 
 extern u8 gUnknown_2031DD8;
 extern u8 gUnknown_2036E28;
diff --git a/include/quest_log.h b/include/quest_log.h
index 00a8b8df3..73c0b5dac 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -23,4 +23,6 @@ void sub_8112720(u8);
 void sub_8113550(u16, const u16 *);
 void sub_8115748(u16);
 
+extern u8 gUnknown_203ADFA;
+
 #endif //GUARD_QUEST_LOG_H
-- 
cgit v1.2.3


From 96e1b19dc1ea9dbf686fd26743d79c68d12e0f24 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 6 Jan 2019 13:06:56 -0500
Subject: through ScrCmd_release; propose names for remaining funcs

---
 include/field_map_obj.h         | 8 ++++----
 include/field_map_obj_helpers.h | 2 +-
 include/map_obj_lock.h          | 4 ++--
 include/script_movement.h       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index d2ec58979..69e3419de 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -35,7 +35,7 @@ u8 sub_808D4F4(void);
 void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
 void npc_load_two_palettes__no_record(u16, u8);
 void npc_load_two_palettes__and_record(u16, u8);
-void sub_808EBA8(u8, u8, u8, s16, s16);
+void sub_805F7C4(u8, u8, u8, s16, s16);
 void pal_patch_for_npc(u16, u8);
 void sub_808E16C(s16, s16);
 void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
@@ -59,13 +59,13 @@ const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
 void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
 void gpu_pal_allocator_reset__manage_upper_four(void);
 void sub_808E82C(u8, u8, u8, s16, s16);
-void sub_808E7E4(u8, u8, u8);
-void sub_808E78C(u8, u8, u8, u8);
+void sub_805F400(u8, u8, u8);
+void sub_805F3A8(u8, u8, u8, u8);
 void sub_808E75C(s16, s16);
 void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *);
 void npc_coords_shift(struct MapObject *, s16, s16);
 void sub_808EB08(struct MapObject *, s16, s16);
-void sub_808F254(u8, u8, u8);
+void sub_805FE94(u8, u8, u8);
 void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *));
 u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
 u8 GetOppositeDirection(u8);
diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h
index 2d3f69d95..cd1b19eaf 100644
--- a/include/field_map_obj_helpers.h
+++ b/include/field_map_obj_helpers.h
@@ -4,6 +4,6 @@
 #include "global.h"
 
 void UnfreezeMapObjects(void);
-void sub_8097B78(u8, u8);
+void sub_8069058(u8, u8);
 
 #endif
diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h
index c8e075658..2927ca26d 100644
--- a/include/map_obj_lock.h
+++ b/include/map_obj_lock.h
@@ -3,9 +3,9 @@
 
 #include "global.h"
 
-bool8 sub_80983C4(void);
+bool8 sub_8069590(void);
 void ScriptFreezeMapObjects(void);
-bool8 sub_809847C(void);
+bool8 sub_8069648(void);
 void LockSelectedMapObject(void);
 void sub_8098630(void);
 bool8 sub_8098734(void);
diff --git a/include/script_movement.h b/include/script_movement.h
index ae446812e..2a6dbd2a7 100644
--- a/include/script_movement.h
+++ b/include/script_movement.h
@@ -5,6 +5,6 @@
 
 bool8 ScriptMovement_StartObjectMovementScript(u8, u8, u8, const u8 *);
 bool8 ScriptMovement_IsObjectMovementFinished(u8, u8, u8);
-void sub_80D338C(void);
+void sub_80974D8(void);
 
 #endif // GUARD_SCRIPT_MOVEMENT_H
-- 
cgit v1.2.3


From 607d6e13d4378ea6530f03d2c290ddd30506aa14 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 6 Jan 2019 14:52:00 -0500
Subject: ScrCmd_waitbuttonpress

---
 include/new_menu_helpers.h | 3 +++
 include/quest_log.h        | 1 +
 include/script.h           | 5 +++++
 3 files changed, 9 insertions(+)

(limited to 'include')

diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index 2a68a35e6..ce8e8d697 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -19,5 +19,8 @@ void sub_80F6F54(u8, u8);
 u8 sub_80F78A8(void);
 void sub_80F6E9C(void);
 void sub_80F6EE4(u8 windowId, bool8 transfer);
+void sub_80F7974(const u8 *);
+u8 GetStartMenuWindowId(void);
+void sub_80F7998(void);
 
 #endif // GUARD_NEW_MENU_HELPERS_H
diff --git a/include/quest_log.h b/include/quest_log.h
index 73c0b5dac..faa47a809 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -22,6 +22,7 @@ extern struct UnkStruct_203AE98 * gUnknown_3005E94;
 void sub_8112720(u8);
 void sub_8113550(u16, const u16 *);
 void sub_8115748(u16);
+u8 sub_8112CAC(void);
 
 extern u8 gUnknown_203ADFA;
 
diff --git a/include/script.h b/include/script.h
index acd88adf3..88e729526 100644
--- a/include/script.h
+++ b/include/script.h
@@ -65,6 +65,11 @@ void sub_80992A0(u8 *script, u16 scriptSize);
 bool32 sub_8069DFC(void);
 void sub_8069EA4(u8 * script, u16 scriptSize);
 u8 * sub_8069E48(void);
+void sub_8069998(u8 var);
+void sub_80699F8(void);
+void sub_8069964(void);
+void sub_80699A4(void);
+void sub_8069970(void);
 
 extern const u8 *gRAMScriptPtr;
 
-- 
cgit v1.2.3


From 6a064a4fa4bedaa1e46470645e175ba7d11a2e41 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 6 Jan 2019 15:08:17 -0500
Subject: Through ScrCmd_getbraillestringwidth

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

(limited to 'include')

diff --git a/include/sound.h b/include/sound.h
index 34fdfc839..e720fc1a2 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -31,6 +31,7 @@ void PlayCry3(u16 species, s8 pan, u8 mode);
 void PlayCry4(u16 species, s8 pan, u8 mode);
 void PlayCry5(u16 species, u8 mode);
 void PlayCry6(u16 species, s8 pan, u8 mode);
+void PlayCry7(u16 species, u8 mode);
 void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode);
 bool8 IsCryFinished(void);
 void StopCryAndClearCrySongs(void);
-- 
cgit v1.2.3


From 2822d29c0bd7e579388f9d0772a7b5d1af430b31 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 6 Jan 2019 15:28:10 -0500
Subject: through ScrCmd_bufferstring

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

(limited to 'include')

diff --git a/include/field_specials.h b/include/field_specials.h
index 2b7991b55..2d495fdd5 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -4,6 +4,7 @@
 #include "global.h"
 
 u8 GetLeadMonIndex(void);
+u8 CountDigits(u16 number);
 void TV_PrintIntToStringVar(u8, int);
 
 #endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/item.h b/include/item.h
index 581693735..25177cb6e 100644
--- a/include/item.h
+++ b/include/item.h
@@ -62,7 +62,7 @@ u8 ItemId_GetSecondaryId(u16 itemId);
 u16 itemid_get_market_price(u16 itemId);
 void sub_809A2DC(void);
 void sub_809A2A4(void);
-void sub_8099E90(u16, u8 *);
+void CopyItemName(u16, u8 *);
 void sub_809A824(u16 itemId);
 bool8 AddBagItem(u16 itemId, u16 amount);
 
diff --git a/include/script_menu.h b/include/script_menu.h
index 1e95570b3..01402d565 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-extern const u8 *const gUnknown_0858BAF0[9];
+extern const u8 *const gStdStringPtrs[9];
 
 bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4);
 bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5);
-- 
cgit v1.2.3


From fdd7b1033cb32f02eb861ca87fa92b9886bdfe37 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 6 Jan 2019 16:00:27 -0500
Subject: Through ScrCmd_pokemart

---
 include/battle_setup.h                | 4 ++--
 include/party_menu.h                  | 2 +-
 include/pokemon_storage_system.h      | 1 +
 include/quest_log.h                   | 1 +
 include/script_menu.h                 | 1 +
 include/script_pokemon_util_80A0058.h | 8 ++++++++
 6 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 include/script_pokemon_util_80A0058.h

(limited to 'include')

diff --git a/include/battle_setup.h b/include/battle_setup.h
index 86a84f471..61395811b 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -11,8 +11,8 @@ void BattleSetup_StartWildBattle(void);
 void BattleSetup_StartRoamerBattle(void);
 
 u8 HasTrainerAlreadyBeenFought(u16);
-void trainer_flag_set(u16);
-void trainer_flag_clear(u16);
+void SetTrainerFlag(u16);
+void ClearTrainerFlag(u16);
 void BattleSetup_StartTrainerBattle(void);
 u8 *BattleSetup_GetScriptAddrAfterBattle(void);
 u8 *BattleSetup_GetTrainerPostBattleScript(void);
diff --git a/include/party_menu.h b/include/party_menu.h
index 19e1f7d4e..2e83c1496 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -12,7 +12,7 @@ enum {
     AILMENT_BRN
 };
 
-bool8 pokemon_has_move(struct Pokemon *, u16);
+bool8 MonKnowsMove(struct Pokemon *, u16);
 void sub_81B58A8(void);
 void DoWallyTutorialBagMenu(void);
 u8 pokemon_ailments_get_primary(u32 status);
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index 5b2d2052b..897c5a42e 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -12,5 +12,6 @@ void SetBoxMonNickFromAnyBox(u8 boxId, u8 monPosition, u8 * newNick);
 void CompactPartySlots(void);
 u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
 void sub_808BCB4(u8 boxId, u8 monPosition);
+u8 * GetBoxNamePtr(u8 boxId);
 
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H
diff --git a/include/quest_log.h b/include/quest_log.h
index faa47a809..31220b86c 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -23,6 +23,7 @@ void sub_8112720(u8);
 void sub_8113550(u16, const u16 *);
 void sub_8115748(u16);
 u8 sub_8112CAC(void);
+bool8 sub_81119D4(void (*func)(void));
 
 extern u8 gUnknown_203ADFA;
 
diff --git a/include/script_menu.h b/include/script_menu.h
index 01402d565..f82b061a5 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -11,5 +11,6 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
 bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
 bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
 bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
+void sub_809D6D4(void);
 
 #endif //GUARD_SCRIPT_MENU_H
diff --git a/include/script_pokemon_util_80A0058.h b/include/script_pokemon_util_80A0058.h
new file mode 100644
index 000000000..e1d228589
--- /dev/null
+++ b/include/script_pokemon_util_80A0058.h
@@ -0,0 +1,8 @@
+#ifndef GUARD_SCRIPT_POKEMON_UTIL_80A0058_H
+#define GUARD_SCRIPT_POKEMON_UTIL_80A0058_H
+
+bool8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unk1, u32 unk2, u8 unk3);
+bool8 ScriptGiveEgg(u16 species);
+void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot);
+
+#endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H
-- 
cgit v1.2.3


From abac6f3ec853f451a7d456cfd336d8c51c0541c1 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 6 Jan 2019 16:14:59 -0500
Subject: Through ScrCmd_takecoins

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

(limited to 'include')

diff --git a/include/overworld.h b/include/overworld.h
index 53914b627..fbea3a4d9 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -95,5 +95,6 @@ extern u8 gUnknown_2031DD8;
 extern u8 gUnknown_2036E28;
 
 extern bool8 (* gUnknown_3005024)(void);
+void SetLastHealLocationWarp(u8 healLocaionId);
 
 #endif //GUARD_ROM4_H
-- 
cgit v1.2.3


From 1581631e6286e0ec8178630433e8c15cd7076ead Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 6 Jan 2019 16:17:40 -0500
Subject: Finish decompiling scrcmd

---
 include/script.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/script.h b/include/script.h
index 88e729526..8ffbe1563 100644
--- a/include/script.h
+++ b/include/script.h
@@ -70,6 +70,8 @@ void sub_80699F8(void);
 void sub_8069964(void);
 void sub_80699A4(void);
 void sub_8069970(void);
+void sub_8069A20(void);
+void sub_8069A2C(void);
 
 extern const u8 *gRAMScriptPtr;
 
-- 
cgit v1.2.3


From 08ffdce1b642dfc00080f99578049b8c3ddfd7e9 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 6 Jan 2019 20:13:06 -0500
Subject: Nuke SCRCMD_DEF macro

---
 include/scrcmd.h | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 include/scrcmd.h

(limited to 'include')

diff --git a/include/scrcmd.h b/include/scrcmd.h
new file mode 100644
index 000000000..0ef357ece
--- /dev/null
+++ b/include/scrcmd.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_SCRCMD_H
+#define GUARD_SCRCMD_H
+
+extern struct ScriptContext * gUnknown_3005070;
+
+#endif //GUARD_SCRCMD_H
-- 
cgit v1.2.3


From bc79312d48781a35597705bf6663ac2a39598873 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 7 Jan 2019 08:54:56 -0500
Subject: Start decomping fieldmap

---
 include/fieldmap.h        |  2 ++
 include/global.fieldmap.h | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/fieldmap.h b/include/fieldmap.h
index c5abdb2e1..fe2b5a928 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -3,6 +3,8 @@
 
 #include "global.h"
 
+#define VIRTUAL_MAP_SIZE 0x2800
+
 extern struct MapCoords {
     int width;
     int height;
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index ed5054b7d..3b3648121 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -67,8 +67,8 @@ struct MapData
 
 struct BackupMapData
 {
-    s32 width;
-    s32 height;
+    s32 Xsize;
+    s32 Ysize;
     u16 *map;
 };
 
@@ -149,9 +149,9 @@ struct MapEvents
 struct MapConnection
 {
  /*0x00*/ u8 direction;
- /*0x01*/ u32 offset;
- /*0x05*/ u8 mapGroup;
- /*0x06*/ u8 mapNum;
+ /*0x04*/ u32 offset;
+ /*0x08*/ u8 mapGroup;
+ /*0x09*/ u8 mapNum;
 };
 
 struct MapConnections
-- 
cgit v1.2.3


From 9aab26afa5315c32f83ae7f40e19c9053d602089 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 7 Jan 2019 14:39:28 -0500
Subject: through MapGridGetMetatileIdAt

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

(limited to 'include')

diff --git a/include/fieldmap.h b/include/fieldmap.h
index fe2b5a928..e6a1e944a 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -15,7 +15,7 @@ u32 MapGridGetMetatileBehaviorAt(int, int);
 void MapGridSetMetatileIdAt(int, int, u16);
 void MapGridSetMetatileEntryAt(int, int, u16);
 void GetCameraCoords(u16*, u16*);
-bool8 MapGridIsImpassableAt(s16, s16);
+bool8 MapGridIsImpassableAt(s32, s32);
 s32 GetMapBorderIdAt(s16, s16);
 bool32 CanCameraMoveInDirection(u8);
 u16 GetBehaviorByMetatileId(u16 metatileId);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 3b3648121..c7a55fd02 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -63,6 +63,8 @@ struct MapData
     /*0x0c*/ u16 *map;
     /*0x10*/ struct Tileset *primaryTileset;
     /*0x14*/ struct Tileset *secondaryTileset;
+    /*0x18*/ u8 unk18;
+    /*0x19*/ u8 unk19;
 };
 
 struct BackupMapData
-- 
cgit v1.2.3


From e1bd043bf3049b8a91b718ca1e4416711f0b8646 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 7 Jan 2019 15:32:11 -0500
Subject: through sub_8059250

---
 include/fieldmap.h        | 8 +++++++-
 include/global.fieldmap.h | 2 +-
 include/global.h          | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/fieldmap.h b/include/fieldmap.h
index e6a1e944a..38f1d30d0 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -3,6 +3,12 @@
 
 #include "global.h"
 
+#define NUM_TILES_IN_PRIMARY 512
+#define NUM_TILES_TOTAL 1024
+#define NUM_METATILES_IN_PRIMARY 512
+#define NUM_METATILES_TOTAL 1024
+#define NUM_PALS_IN_PRIMARY 6
+#define NUM_PALS_TOTAL 13
 #define VIRTUAL_MAP_SIZE 0x2800
 
 extern struct MapCoords {
@@ -18,6 +24,6 @@ void GetCameraCoords(u16*, u16*);
 bool8 MapGridIsImpassableAt(s32, s32);
 s32 GetMapBorderIdAt(s16, s16);
 bool32 CanCameraMoveInDirection(u8);
-u16 GetBehaviorByMetatileId(u16 metatileId);
+u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8 attr);
 
 #endif //GUARD_FIELDMAP_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index c7a55fd02..b602741a6 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -51,8 +51,8 @@ struct Tileset
     /*0x04*/ void *tiles;
     /*0x08*/ void *palettes;
     /*0x0c*/ void *metatiles;
-    /*0x10*/ void *metatileAttributes;
     /*0x14*/ TilesetCB callback;
+    /*0x10*/ void *metatileAttributes;
 };
 
 struct MapData
diff --git a/include/global.h b/include/global.h
index f418ff757..26ce4a8cc 100644
--- a/include/global.h
+++ b/include/global.h
@@ -328,7 +328,8 @@ struct SaveBlock2
     /*0x0AC*/ u8 filler_AC[0x3F4];
     /*0x4A0*/ u32 unk_4A0[0x2F];
     /*0x55c*/ struct UnkSaveBlock2Substruct_55C unk_55C;
-    /*0x574*/ u8 filler_574[0x524];
+    /*0x574*/ u8 filler_574[0x324];
+    /*0x898*/ u16 mapView[0x100];
     /*0xA98*/ struct LinkBattleRecords linkBattleRecords;
     /*0xAF0*/ struct BerryCrush berryCrush;
     /*0xB00*/ u8 filler_B00[0x420];
-- 
cgit v1.2.3


From 34cf3662fc0343d77fe36b1a3083605110764c9a Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 7 Jan 2019 15:48:36 -0500
Subject: GetMapBorderIdAt

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

(limited to 'include')

diff --git a/include/fieldmap.h b/include/fieldmap.h
index 38f1d30d0..016baf153 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -22,7 +22,7 @@ void MapGridSetMetatileIdAt(int, int, u16);
 void MapGridSetMetatileEntryAt(int, int, u16);
 void GetCameraCoords(u16*, u16*);
 bool8 MapGridIsImpassableAt(s32, s32);
-s32 GetMapBorderIdAt(s16, s16);
+s32 GetMapBorderIdAt(s32, s32);
 bool32 CanCameraMoveInDirection(u8);
 u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8 attr);
 
-- 
cgit v1.2.3


From 38abcf9774612094d8552904fbeed3d1b2c4bba1 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 7 Jan 2019 16:39:32 -0500
Subject: through sub_80598CC

---
 include/fieldmap.h         | 2 +-
 include/menu.h             | 1 +
 include/new_menu_helpers.h | 1 +
 include/overworld.h        | 3 +++
 include/palette.h          | 2 ++
 include/quest_log.h        | 1 +
 6 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/fieldmap.h b/include/fieldmap.h
index 016baf153..1ce83ee38 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -23,7 +23,7 @@ void MapGridSetMetatileEntryAt(int, int, u16);
 void GetCameraCoords(u16*, u16*);
 bool8 MapGridIsImpassableAt(s32, s32);
 s32 GetMapBorderIdAt(s32, s32);
-bool32 CanCameraMoveInDirection(u8);
+bool32 CanCameraMoveInDirection(s32);
 u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8 attr);
 
 #endif //GUARD_FIELDMAP_H
diff --git a/include/menu.h b/include/menu.h
index b932693f7..b5078df5e 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -37,5 +37,6 @@ void clear_scheduled_bg_copies_to_vram(void);
 void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str);
 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);
 
 #endif // GUARD_MENU_H
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index ce8e8d697..32b46b552 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -22,5 +22,6 @@ void sub_80F6EE4(u8 windowId, bool8 transfer);
 void sub_80F7974(const u8 *);
 u8 GetStartMenuWindowId(void);
 void sub_80F7998(void);
+void sub_80F69E8(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
 
 #endif // GUARD_NEW_MENU_HELPERS_H
diff --git a/include/overworld.h b/include/overworld.h
index fbea3a4d9..b32d9cf48 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -24,6 +24,8 @@ struct UCoords32
     u32 x, y;
 };
 
+extern struct UCoords32 gDirectionToVectors[];
+
 extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
 extern MainCallback gFieldCallback;
 
@@ -96,5 +98,6 @@ extern u8 gUnknown_2036E28;
 
 extern bool8 (* gUnknown_3005024)(void);
 void SetLastHealLocationWarp(u8 healLocaionId);
+void sub_8055864(u8 mapGroup, u8 mapNum);
 
 #endif //GUARD_ROM4_H
diff --git a/include/palette.h b/include/palette.h
index 3af0d5d7b..31c8ffefe 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -70,6 +70,8 @@ void BeginHardwarePaletteFade(u8, u8, u8, u8, u8);
 void BlendPalettes(u32, u8, u16);
 void BlendPalettesUnfaded(u32, u8, u16);
 void sub_80716F8(const u16 *, u16 *, u16, u8);
+void TintPalette_GrayScale(u16 *, u16);
+void TintPalette_SepiaTone(u16 *, u16);
 
 extern struct PaletteFadeControl gPaletteFade;
 
diff --git a/include/quest_log.h b/include/quest_log.h
index 31220b86c..7f4bafada 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -24,6 +24,7 @@ void sub_8113550(u16, const u16 *);
 void sub_8115748(u16);
 u8 sub_8112CAC(void);
 bool8 sub_81119D4(void (*func)(void));
+void sub_8111F38(u16, u16);
 
 extern u8 gUnknown_203ADFA;
 
-- 
cgit v1.2.3


From 316975ebeae7ca15f9a55bcfc3c493a9f35c6242 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 7 Jan 2019 16:47:21 -0500
Subject: Complete code decomp of fieldmap.s

---
 include/fieldmap.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/fieldmap.h b/include/fieldmap.h
index 1ce83ee38..24e85aace 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -3,11 +3,11 @@
 
 #include "global.h"
 
-#define NUM_TILES_IN_PRIMARY 512
+#define NUM_TILES_IN_PRIMARY 640
 #define NUM_TILES_TOTAL 1024
-#define NUM_METATILES_IN_PRIMARY 512
+#define NUM_METATILES_IN_PRIMARY 640
 #define NUM_METATILES_TOTAL 1024
-#define NUM_PALS_IN_PRIMARY 6
+#define NUM_PALS_IN_PRIMARY 7
 #define NUM_PALS_TOTAL 13
 #define VIRTUAL_MAP_SIZE 0x2800
 
-- 
cgit v1.2.3


From 6da60e9b36303ac9d67a59db9092adb1dae6b43f Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 7 Jan 2019 16:53:28 -0500
Subject: fieldmap: Common and EWRAM syms

---
 include/fieldmap.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/fieldmap.h b/include/fieldmap.h
index 24e85aace..537626edc 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -11,10 +11,7 @@
 #define NUM_PALS_TOTAL 13
 #define VIRTUAL_MAP_SIZE 0x2800
 
-extern struct MapCoords {
-    int width;
-    int height;
-} gUnknown_03005DC0;
+extern struct BackupMapData VMap;
 
 u32 MapGridGetMetatileIdAt(int, int);
 u32 MapGridGetMetatileBehaviorAt(int, int);
-- 
cgit v1.2.3