Document Scotts House and begin frontier macros

4 files changed, 47 insertions, 14 deletions

diff --git a/include/battle_tower.h b/include/battle_tower.h
index 8bc6e6554..2366cac12 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -48,7 +48,7 @@ extern u16 gUnknown_03006298[];
 extern const struct BattleFrontierTrainer *gFacilityTrainers;
 extern const struct FacilityMon *gFacilityTrainerMons;
 
-void sub_8161F74(void);
+void CallBattleTowerFunc(void);
 u16 sub_8162548(u8 challengeNum, u8 battleNum);
 void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId);
 void SetEReaderTrainerGfxId(void);
diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h
index 5473f04c6..54d50c18a 100644
--- a/include/constants/battle_frontier.h
+++ b/include/constants/battle_frontier.h
@@ -46,18 +46,30 @@
 
 #define MAX_BATTLE_FRONTIER_POINTS 9999
 
-// Frontier Maniac
-#define FRONTIER_MANIAC_BATTLE_TOWER_SINGLES       0
-#define FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES       1
-#define FRONTIER_MANIAC_BATTLE_TOWER_MULTIS        2
-#define FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS   3
-#define FRONTIER_MANIAC_BATTLE_DOME                4
-#define FRONTIER_MANIAC_BATTLE_FACTORY             5
-#define FRONTIER_MANIAC_BATTLE_PALACE              6
-#define FRONTIER_MANIAC_BATTLE_ARENA               7
-#define FRONTIER_MANIAC_BATTLE_PIKE                8
-#define FRONTIER_MANIAC_BATTLE_PYRAMID             9
-#define FRONTIER_MANIAC_FACILITY_COUNT            10
+// These sets of facility ids would be redunant if the order was consistent
+// The order is important for this set so that all the non-link records can be continuous
+#define RANKING_HALL_BATTLE_TOWER_SINGLES   0
+#define RANKING_HALL_BATTLE_TOWER_DOUBLES   1
+#define RANKING_HALL_BATTLE_TOWER_MULTIS    2
+#define RANKING_HALL_BATTLE_DOME            3
+#define RANKING_HALL_BATTLE_PALACE          4
+#define RANKING_HALL_BATTLE_ARENA           5
+#define RANKING_HALL_BATTLE_FACTORY         6
+#define RANKING_HALL_BATTLE_PIKE            7
+#define RANKING_HALL_BATTLE_PYRAMID         8
+#define RANKING_HALL_BATTLE_TOWER_LINK      9
+
+#define FRONTIER_MANIAC_BATTLE_TOWER_SINGLES   0
+#define FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES   1
+#define FRONTIER_MANIAC_BATTLE_TOWER_MULTIS    2
+#define FRONTIER_MANIAC_BATTLE_TOWER_LINK      3
+#define FRONTIER_MANIAC_BATTLE_DOME            4
+#define FRONTIER_MANIAC_BATTLE_FACTORY         5
+#define FRONTIER_MANIAC_BATTLE_PALACE          6
+#define FRONTIER_MANIAC_BATTLE_ARENA           7
+#define FRONTIER_MANIAC_BATTLE_PIKE            8
+#define FRONTIER_MANIAC_BATTLE_PYRAMID         9
+#define FRONTIER_MANIAC_FACILITY_COUNT        10
 
 #define FRONTIER_MANIAC_MESSAGE_COUNT 3
 
diff --git a/include/constants/battle_tower.h b/include/constants/battle_tower.h
new file mode 100644
index 000000000..fa5dd109d
--- /dev/null
+++ b/include/constants/battle_tower.h
@@ -0,0 +1,21 @@
+#ifndef GUARD_CONSTANTS_BATTLE_TOWER_H
+#define GUARD_CONSTANTS_BATTLE_TOWER_H
+
+#define BATTLE_TOWER_FUNC_0 0
+#define BATTLE_TOWER_FUNC_1 1
+#define BATTLE_TOWER_FUNC_2 2
+#define BATTLE_TOWER_FUNC_CHOOSE_TRAINER 3
+#define BATTLE_TOWER_FUNC_4 4
+#define BATTLE_TOWER_FUNC_GIVE_RIBBONS 5
+#define BATTLE_TOWER_FUNC_SAVE 6
+#define BATTLE_TOWER_FUNC_7 7
+#define BATTLE_TOWER_FUNC_NOP 8
+#define BATTLE_TOWER_FUNC_NOP_SPRITE 9
+#define BATTLE_TOWER_FUNC_10 10
+#define BATTLE_TOWER_FUNC_11 11
+#define BATTLE_TOWER_FUNC_12 12
+#define BATTLE_TOWER_FUNC_13 13
+#define BATTLE_TOWER_FUNC_14 14
+#define BATTLE_TOWER_FUNC_15 15
+
+#endif //GUARD_CONSTANTS_BATTLE_TOWER_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index f72adf50a..1eb8a0673 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -491,7 +491,7 @@
 #define FLAG_MET_SCOTT_IN_EVERGRANDE         0x1CF
 #define FLAG_MET_SCOTT_ON_SS_TIDAL           0x1D0
 #define FLAG_SCOTT_GIVES_BATTLE_POINTS       0x1D1
-#define FLAG_RECEIVED_STARF_BERRY_FROM_SCOTT 0x1D2
+#define FLAG_COLLECTED_ALL_GOLD_SYMBOLS      0x1D2
 #define FLAG_ENABLE_ROXANNE_MATCH_CALL       0x1D3
 #define FLAG_ENABLE_BRAWLY_MATCH_CALL        0x1D4
 #define FLAG_ENABLE_WATTSON_MATCH_CALL       0x1D5