Apply various constants (GameCtrl labels, unit states/attrs) and document WirelessSettings

config/YFEE01/arm9/overlays/ov000/symbols.txt

@@ -43,9 +43,9 @@ func_ov000_021a46cc kind:function(arm,size=0x4c) addr:0x021a46cc
 func_ov000_021a4718 kind:function(arm,size=0x4) addr:0x021a4718
 func_ov000_021a471c kind:function(arm,size=0x40) addr:0x021a471c
 func_ov000_021a475c kind:function(arm,size=0x30) addr:0x021a475c
-func_ov000_021a478c kind:function(arm,size=0x20) addr:0x021a478c
+IsWirelessBattle kind:function(arm,size=0x20) addr:0x021a478c
 func_ov000_021a47ac kind:function(arm,size=0x38) addr:0x021a47ac
-func_ov000_021a47e4 kind:function(arm,size=0x20) addr:0x021a47e4
+IsLinkArena kind:function(arm,size=0x20) addr:0x021a47e4
 func_ov000_021a4804 kind:function(arm,size=0x50) addr:0x021a4804
 func_ov000_021a4854 kind:function(arm,size=0x5c) addr:0x021a4854
 func_ov000_021a48b0 kind:function(arm,size=0x28) addr:0x021a48b0
@@ -260,7 +260,7 @@ func_ov000_021ade88 kind:function(arm,size=0x64) addr:0x021ade88
 func_ov000_021adeec kind:function(arm,size=0x34) addr:0x021adeec
 func_ov000_021adf20 kind:function(arm,size=0x38) addr:0x021adf20
 func_ov000_021adf58 kind:function(arm,size=0xc0) addr:0x021adf58
-func_ov000_021ae018 kind:function(arm,size=0x90) addr:0x021ae018
+PlayerPhase_Surrender kind:function(arm,size=0x90) addr:0x021ae018
 func_ov000_021ae0a8 kind:function(arm,size=0x5c) addr:0x021ae0a8
 func_ov000_021ae104 kind:function(arm,size=0x2c) addr:0x021ae104
 StartPlayerPhase kind:function(arm,size=0x50) addr:0x021ae130

config/YFEE01/arm9/overlays/ov006/symbols.txt

@@ -1,6 +1,6 @@
 func_ov006_022176e0 kind:function(arm,size=0x40) addr:0x022176e0
 func_ov006_02217720 kind:function(arm,size=0x4c) addr:0x02217720
-func_ov006_0221776c kind:function(arm,size=0x338) addr:0x0221776c
+StartGameOver kind:function(arm,size=0x338) addr:0x0221776c
 func_ov006_02217aa4 kind:function(arm,size=0x44) addr:0x02217aa4
 func_ov006_02217ae8 kind:function(arm,size=0x3c) addr:0x02217ae8
 func_ov006_02217b24 kind:function(arm,size=0x40) addr:0x02217b24
@@ -486,7 +486,7 @@ __typestr__8GameOver kind:data(any) addr:0x022231f0
 data_ov006_022231fc kind:data(any) addr:0x022231fc
 __typeinfo__8GameOver kind:data(any) addr:0x02223208
 data_ov006_02223214 kind:data(any) addr:0x02223214
-data_ov006_02223220 kind:data(any) addr:0x02223220
+ProcScr_GameOver kind:data(any) addr:0x02223220
 __vt__8GameOver kind:data(any) addr:0x02223260
 __typeinfo__N8mainmenu13MainMenuConstE kind:data(any) addr:0x02223270
 data_ov006_02223278 kind:data(any) addr:0x02223278

config/YFEE01/arm9/symbols.txt

@@ -1200,7 +1200,7 @@ func_02021e6c kind:function(arm,size=0x9c) addr:0x02021e6c
 func_02021f08 kind:function(arm,size=0x24) addr:0x02021f08
 func_02021f2c kind:function(arm,size=0x30) addr:0x02021f2c
 func_02021f5c kind:function(arm,size=0x1f0) addr:0x02021f5c
-func_0202214c kind:function(arm,size=0x70) addr:0x0202214c
+GameCtrl_BeginMap kind:function(arm,size=0x70) addr:0x0202214c
 func_020221bc kind:function(arm,size=0x28) addr:0x020221bc
 func_020221e4 kind:function(arm,size=0x78) addr:0x020221e4
 func_0202225c kind:function(arm,size=0xc8) addr:0x0202225c
@@ -1214,7 +1214,7 @@ func_02022480 kind:function(arm,size=0x28) addr:0x02022480
 func_020224a8 kind:function(arm,size=0x2c) addr:0x020224a8
 func_020224d4 kind:function(arm,size=0x28) addr:0x020224d4
 func_020224fc kind:function(arm,size=0x50) addr:0x020224fc
-func_0202254c kind:function(arm,size=0x18) addr:0x0202254c
+GameCtrl_StartMapEndEvent kind:function(arm,size=0x18) addr:0x0202254c
 func_02022564 kind:function(arm,size=0x24) addr:0x02022564
 func_02022588 kind:function(arm,size=0x1a4) addr:0x02022588
 func_0202272c kind:function(arm,size=0xe8) addr:0x0202272c
@@ -1226,7 +1226,7 @@ func_02022988 kind:function(arm,size=0x20) addr:0x02022988
 func_020229a8 kind:function(arm,size=0x48) addr:0x020229a8
 func_020229f0 kind:function(arm,size=0x120) addr:0x020229f0
 func_02022b10 kind:function(arm,size=0x20) addr:0x02022b10
-func_02022b30 kind:function(arm,size=0x20) addr:0x02022b30
+GameCtrl_IsWirelessPracticeMode kind:function(arm,size=0x20) addr:0x02022b30
 func_02022b50 kind:function(arm,size=0x20) addr:0x02022b50
 func_02022b70 kind:function(arm,size=0x40) addr:0x02022b70
 func_02022bb0 kind:function(arm,size=0xa4) addr:0x02022bb0
@@ -1241,7 +1241,7 @@ func_02022dd8 kind:function(arm,size=0x24) addr:0x02022dd8
 func_02022dfc kind:function(arm,size=0x18) addr:0x02022dfc
 func_02022e14 kind:function(arm,size=0x20) addr:0x02022e14
 func_02022e34 kind:function(arm,size=0x20) addr:0x02022e34
-func_02022e54 kind:function(arm,size=0x64) addr:0x02022e54
+GameCtrl_InitWirelessSettings kind:function(arm,size=0x64) addr:0x02022e54
 func_02022eb8 kind:function(arm,size=0x1c) addr:0x02022eb8
 func_02022ed4 kind:function(arm,size=0x20) addr:0x02022ed4
 func_02022ef4 kind:function(arm,size=0x1c) addr:0x02022ef4
@@ -6421,7 +6421,7 @@ ProcScr_FadeIn kind:data(any) addr:0x020ce94c
 __typeinfo__10ThreadProc kind:data(any) addr:0x020ce974
 __typestr__10ThreadProc kind:data(any) addr:0x020ce980
 __vt__10ThreadProc kind:data(any) addr:0x020ce998
-data_020ce9a8 kind:data(any) addr:0x020ce9a8
+ProcScr_ThreadProc kind:data(any) addr:0x020ce9a8
 __typeinfo__15ProcBackupBreak kind:data(any) addr:0x020ce9c0
 __typestr__15ProcBackupBreak kind:data(any) addr:0x020ce9cc
 data_020ce9e0 kind:data(any) addr:0x020ce9e0
@@ -6447,11 +6447,11 @@ data_020ceb50 kind:data(any) addr:0x020ceb50
 data_020ceb60 kind:data(any) addr:0x020ceb60
 data_020ceb6c kind:data(any) addr:0x020ceb6c
 data_020ceb78 kind:data(any) addr:0x020ceb78
-data_020ceb84 kind:data(any) addr:0x020ceb84
-data_020ceba4 kind:data(any) addr:0x020ceba4
-data_020cebc4 kind:data(any) addr:0x020cebc4
-data_020cebec kind:data(any) addr:0x020cebec
-data_020cec14 kind:data(any) addr:0x020cec14
+ProcScr_020ceb84 kind:data(any) addr:0x020ceb84
+ProcScr_020ceba4 kind:data(any) addr:0x020ceba4
+ProcScr_020cebc4 kind:data(any) addr:0x020cebc4
+ProcScr_020cebec kind:data(any) addr:0x020cebec
+ProcScr_020cec14 kind:data(any) addr:0x020cec14
 ProcScr_GameCtrl kind:data(any) addr:0x020cec44
 data_020cf48c kind:data(any) addr:0x020cf48c
 data_020cf494 kind:data(any) addr:0x020cf494
@@ -8562,7 +8562,7 @@ data_02196b2c kind:bss addr:0x02196b2c
 gRandomSt kind:bss addr:0x02196e04
 data_02196e0c kind:bss addr:0x02196e0c
 data_02196f0c kind:bss addr:0x02196f0c
-data_02196f10 kind:bss addr:0x02196f10
+gWirelessSettings kind:bss addr:0x02196f10
 data_02196f14 kind:bss addr:0x02196f14
 data_02196f18 kind:bss addr:0x02196f18
 data_02196f1c kind:bss addr:0x02196f1c

include/constants/terrains.h

@@ -0,0 +1,9 @@
+#ifndef TERRAINS_H
+#define TERRAINS_H
+
+enum
+{
+    TERRAIN_ARENA = 0x17,
+};
+
+#endif // TERRAINS_H

include/gamectrl.hpp

@@ -0,0 +1,50 @@
+#ifndef GAMECTRL_HPP
+#define GAMECTRL_HPP
+
+enum
+{
+    L_GAMECTRL_1 = 1,
+    L_GAMECTRL_2 = 2,
+    L_GAMECTRL_3 = 3,
+    L_GAMECTRL_MAIN_MENU = 4,
+    L_GAMECTRL_5 = 5,
+    L_GAMECTRL_WORLD_MAP = 6,
+    L_GAMECTRL_7 = 7,
+    L_GAMECTRL_8 = 8,
+    L_GAMECTRL_9 = 9,
+    L_GAMECTRL_10 = 10,
+    L_GAMECTRL_11 = 11,
+    L_GAMECTRL_GAME_OVER = 12,
+    L_GAMECTRL_13 = 13,
+    L_GAMECTRL_14 = 14,
+    L_GAMECTRL_15 = 15,
+    L_GAMECTRL_16 = 16,
+    L_GAMECTRL_17 = 17,
+    L_GAMECTRL_18 = 18,
+    L_GAMECTRL_19 = 19,
+    L_GAMECTRL_20 = 20,
+    L_GAMECTRL_21 = 21,
+    L_GAMECTRL_22 = 22,
+    L_GAMECTRL_23 = 23,
+    L_GAMECTRL_24 = 24,
+    L_GAMECTRL_25 = 25,
+    L_GAMECTRL_26 = 26,
+    L_GAMECTRL_27 = 27,
+    L_GAMECTRL_28 = 28,
+    L_GAMECTRL_29 = 29,
+    L_GAMECTRL_30 = 30,
+    L_GAMECTRL_31 = 31,
+    L_GAMECTRL_32 = 32,
+    L_GAMECTRL_33 = 33,
+    L_GAMECTRL_34 = 34,
+    L_GAMECTRL_MULTIPLAYER_PRACTICE = 35,
+    L_GAMECTRL_36 = 36,
+    L_GAMECTRL_37 = 37,
+    L_GAMECTRL_38 = 38,
+    L_GAMECTRL_39 = 39,
+    L_GAMECTRL_40 = 40,
+
+    L_GAMECTRL_54 = 54,
+};
+
+#endif // GAMECTRL_HPP

include/hardware.hpp

@@ -5,18 +5,18 @@
 
 enum
 {
-    OVERLAY_ID_0,
+    OVERLAY_ID_0, // Battle Map
     OVERLAY_ID_1,
     OVERLAY_ID_2,
     OVERLAY_ID_3,
-    OVERLAY_ID_4,
-    OVERLAY_ID_5,
-    OVERLAY_ID_6,
+    OVERLAY_ID_4, // World Map
+    OVERLAY_ID_5, // Battle Preparations
+    OVERLAY_ID_6, // Main Menu
     OVERLAY_ID_7,
-    OVERLAY_ID_8,
+    OVERLAY_ID_8, // Title Screen
     OVERLAY_ID_9,
-    OVERLAY_ID_A,
-    OVERLAY_ID_B,
+    OVERLAY_ID_A, // Local Wireless
+    OVERLAY_ID_B, // Nintendo WFC
 };
 
 enum

include/map.hpp

@@ -22,12 +22,12 @@ class UnkStruct_021E3324
 public:
     /* 00 */ u8 phase;
     /* 01 */ u8 unk_01;
-    /* 02 */ u8 unk_02; // "is invisible"
+    /* 02 */ u8 fogActive; // Referenced by event func "IsInvisible"
     /* 03 */ u8 unk_03;
     /* 04 */ u16 turn;
-    /* 06 */ u16 unk_06; // turn limit
+    /* 06 */ u16 turnLimit;
     /* 08 */ u32 unk_08;
-    /* 0C */ u32 unk_0c; // time limit
+    /* 0C */ u32 timeLimit;
     /* 10 */ u32 unk_10;
     /* 14 */ u8 unk_14;
     /* 15 */ u8 unk_15;
@@ -43,10 +43,10 @@ class UnkStruct_021E3324
         this->phase = 0;
         this->unk_01 = 0;
         this->turn = 1;
-        this->unk_06 = 0;
+        this->turnLimit = 0;
         this->unk_08 = 0;
-        this->unk_0c = 0;
-        this->unk_02 = 0;
+        this->timeLimit = 0;
+        this->fogActive = 0;
         this->unk_03 = 0;
         this->unk_14 = 0x1f;
         this->unk_15 = 0x1f;

include/unit.hpp

@@ -25,7 +25,7 @@ enum
 enum
 {
     CA_FEMALE = (1 << 0),
-    CA_UNK_1 = (1 << 1),
+    CA_UNK_1 = (1 << 1), // Supply unit
     CA_LORD = (1 << 2),
     CA_PRINCESS = (1 << 3), // Caeda, Maria, Minerva, Elise
     CA_UNK_4 = (1 << 4), // Medius?
@@ -57,19 +57,29 @@ enum
 
 enum
 {
+    US_NONE = 0,
     US_ACTED = (1 << 0),
-
+    US_UNK_1 = (1 << 1),
+    US_UNK_2 = (1 << 2),
     US_DEAD = (1 << 3),
-
+    US_UNK_4 = (1 << 4),
+    US_UNK_5 = (1 << 5),
+    US_UNK_6 = (1 << 6), // Escaped?
     US_ITEMS_TO_CONVOY = (1 << 7),
-
+    US_UNK_8 = (1 << 8),
+    US_UNK_9 = (1 << 9),
+    US_UNK_10 = (1 << 10),
+    US_UNK_11 = (1 << 11),
     US_NOT_PRESENT = (1 << 12),
     US_DANGER_ZONE_ACTIVE = (1 << 13),
-
-    US_HOVERED = (1 << 17),
+    US_UNK_14 = (1 << 14),
+    US_UNK_15 = (1 << 15), // disguised?
+    US_UNK_16 = (1 << 16),
+    US_HOVERED = (1 << 17), // this might be "active"
+    US_UNK_18 = (1 << 18), // disguised, but different?
+    US_UNK_19 = (1 << 19), // Clear (move to faction 4) after death?
 
     US_EVENT_DEAD = (1 << 29), // Died as a "decoy" for Marth
-
     US_UNK_30 = (1 << 30),
     US_UNK_31 = (1 << 31),
 };
@@ -241,8 +251,8 @@ class Unit
     s16 unk_10[0x10];
     /* 30 */ struct Unit_unk_30 unk_30;
     STRUCT_PAD(0x36, 0x38);
-    /* 38 */ struct Unit * unk_38;
-    /* 3C */ struct Unit * unk_3c;
+    /* 38 */ struct Unit * prev;
+    /* 3C */ struct Unit * next;
     /* 40 */ struct PersonData * pPersonData;
     /* 44 */ struct JobData * pJobData;
     STRUCT_PAD(0x48, 0x4C);

include/unknown_data.h

@@ -767,7 +767,7 @@ extern struct ProcCmd ProcScr_020ce750[];
 // extern ??? __typeinfo__10ThreadProc
 // extern ??? __typestr__10ThreadProc
 // extern ??? __vt__10ThreadProc
-// extern ??? data_020ce9a8
+// extern ??? ProcScr_ThreadProc
 // extern ??? __typeinfo__15ProcBackupBreak
 // extern ??? __typestr__15ProcBackupBreak
 // extern ??? data_020ce9e0
@@ -793,11 +793,11 @@ extern struct ProcCmd ProcScr_020ce750[];
 // extern ??? data_020ceb60
 // extern ??? data_020ceb6c
 // extern ??? data_020ceb78
-extern struct ProcCmd data_020ceb84[];
-extern struct ProcCmd data_020ceba4[];
-extern struct ProcCmd data_020cebc4[];
-extern struct ProcCmd data_020cebec[];
-extern struct ProcCmd data_020cec14[];
+extern struct ProcCmd ProcScr_020ceb84[];
+extern struct ProcCmd ProcScr_020ceba4[];
+extern struct ProcCmd ProcScr_020cebc4[];
+extern struct ProcCmd ProcScr_020cebec[];
+extern struct ProcCmd ProcScr_020cec14[];
 // extern ??? ProcScr_GameCtrl
 // extern ??? data_020cf48c
 // extern ??? data_020cf494
@@ -2905,7 +2905,7 @@ extern struct ProcCmd data_020cec14[];
 // extern ??? gRandomSt
 // extern ??? data_02196e0c
 // extern ??? data_02196f0c
-// extern ??? data_02196f10
+// extern ??? gWirelessSettings
 // extern ??? data_02196f14
 // extern ??? data_02196f18
 // extern ??? data_02196f1c
@@ -6713,7 +6713,7 @@ extern struct UnkStruct_021faf8c data_ov002_021faf8c;
 // extern ??? data_ov006_022231fc
 // extern ??? __typeinfo__8GameOver
 // extern ??? data_ov006_02223214
-// extern ??? data_ov006_02223220
+// extern ??? ProcScr_GameOver
 // extern ??? __vt__8GameOver
 // extern ??? __typeinfo__N8mainmenu13MainMenuConstE
 // extern ??? data_ov006_02223278