Decompile prep_job_select

config/YFEE01/arm9/overlays/ov005/delinks.txt

@@ -10,4 +10,8 @@ src/ov005/prep_proc_02212d60.cpp:
 src/ov005/prep_main_menu.cpp:
     .text       start:0x02205518 end:0x02206830
     .data       start:0x02213150 end:0x02214350
-    .bss        start:0x02217564 end:0x022175c4
+    .bss        start:0x02217564 end:0x022175c4
+
+src/ov005/prep_job_select.cpp:
+    .text       start:0x0220fa58 end:0x022118c4
+    .data       start:0x022170d8 end:0x02217238

config/YFEE01/arm9/overlays/ov005/relocs.txt

@@ -2015,7 +2015,7 @@ from:0x02211778 kind:arm_call to:0x020295ec module:main
 from:0x022117c8 kind:arm_call to:0x02029a1c module:main
 from:0x022117e8 kind:load to:0x022171f0 module:overlay(5)
 from:0x022117ec kind:load to:0x02217560 module:overlay(5)
-from:0x022117f0 kind:load to:0x022171c0 module:overlay(5)
+from:0x022117f0 kind:load to:0x022171b8 module:overlay(5) add:8
 from:0x022117f4 kind:load to:0x027e1b9c module:dtcm
 from:0x022117f8 kind:load to:0x02197254 module:main
 from:0x022117fc kind:load to:0x02217190 module:overlay(5)
@@ -2041,11 +2041,11 @@ from:0x02211848 kind:load to:0x022170dc module:overlay(5)
 from:0x02211864 kind:arm_call to:0x01ffbb90 module:itcm
 from:0x02211870 kind:arm_call to:0x01ffbb90 module:itcm
 from:0x02211878 kind:arm_call to:0x020115a4 module:main
-from:0x02211884 kind:load to:0x022171c0 module:overlay(5)
+from:0x02211884 kind:load to:0x022171b8 module:overlay(5) add:8
 from:0x02211888 kind:load to:0x027e1b9c module:dtcm
 from:0x022118a4 kind:arm_call to:0x01ffbb90 module:itcm
 from:0x022118b0 kind:arm_call to:0x01ffbb90 module:itcm
-from:0x022118bc kind:load to:0x022171c0 module:overlay(5)
+from:0x022118bc kind:load to:0x022171b8 module:overlay(5) add:8
 from:0x022118c0 kind:load to:0x027e1b9c module:dtcm
 from:0x022118e4 kind:load to:0x02197254 module:main
 from:0x022118e8 kind:load to:0x021ef52c module:overlay(2)

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

@@ -386,17 +386,17 @@ func_ov005_0220f9a8 kind:function(arm,size=0x14) addr:0x0220f9a8
 func_ov005_0220f9bc kind:function(arm,size=0x1c) addr:0x0220f9bc
 func_ov005_0220f9d8 kind:function(arm,size=0x3c) addr:0x0220f9d8
 func_ov005_0220fa14 kind:function(arm,size=0x44) addr:0x0220fa14
-func_ov005_0220fa58 kind:function(arm,size=0x2c) addr:0x0220fa58
-func_ov005_0220fa84 kind:function(arm,size=0x2c) addr:0x0220fa84
-func_ov005_0220fab0 kind:function(arm,size=0x68) addr:0x0220fab0
-func_ov005_0220fb18 kind:function(arm,size=0x14) addr:0x0220fb18
-func_ov005_0220fb2c kind:function(arm,size=0xd6c) addr:0x0220fb2c
-func_ov005_02210898 kind:function(arm,size=0x2c) addr:0x02210898
-func_ov005_022108c4 kind:function(arm,size=0x14) addr:0x022108c4
-func_ov005_022108d8 kind:function(arm,size=0x500) addr:0x022108d8
+SallyJobS_FadeIn kind:function(arm,size=0x2c) addr:0x0220fa58
+SallyJobS_FadeOut kind:function(arm,size=0x2c) addr:0x0220fa84
+SallyJobS_End kind:function(arm,size=0x68) addr:0x0220fab0
+SallyJobS_ov005_0220fb18 kind:function(arm,size=0x14) addr:0x0220fb18
+_ZN5sally4JobS4InitEv kind:function(arm,size=0xd6c) addr:0x0220fb2c
+SallyJobS_ov005_02210898 kind:function(arm,size=0x2c) addr:0x02210898
+SallyJobS_ov005_022108c4 kind:function(arm,size=0x14) addr:0x022108c4
+_ZN5sally4JobS4LoopEv kind:function(arm,size=0x500) addr:0x022108d8
 StartSally_JobS kind:function(arm,size=0xa74) addr:0x02210dd8
-func_ov005_0221184c kind:function(arm,size=0x40) addr:0x0221184c
-func_ov005_0221188c kind:function(arm,size=0x38) addr:0x0221188c
+_ZN5sally4JobSD0Ev kind:function(arm,size=0x40) addr:0x0221184c
+_ZN5sally4JobSD1Ev kind:function(arm,size=0x38) addr:0x0221188c
 func_ov005_022118c4 kind:function(arm,size=0x28) addr:0x022118c4
 func_ov005_022118ec kind:function(arm,size=0x1cc) addr:0x022118ec
 func_ov005_02211ab8 kind:function(arm,size=0x18) addr:0x02211ab8
@@ -733,7 +733,7 @@ data_ov005_022170cc kind:data(any) addr:0x022170cc
 data_ov005_022170d8 kind:data(any) addr:0x022170d8
 data_ov005_022170dc kind:data(any) addr:0x022170dc
 data_ov005_022170e0 kind:data(any) addr:0x022170e0
-__typeinfo__N5sally9JobSConstE kind:data(any) addr:0x022170e4
+_ZTIN5sally9JobSConstE kind:data(any) addr:0x022170e4
 data_ov005_022170ec kind:data(any) addr:0x022170ec
 data_ov005_022170f4 kind:data(any) addr:0x022170f4
 data_ov005_02217100 kind:data(any) addr:0x02217100
@@ -742,15 +742,15 @@ data_ov005_02217118 kind:data(any) addr:0x02217118
 data_ov005_02217124 kind:data(any) addr:0x02217124
 data_ov005_02217130 kind:data(any) addr:0x02217130
 data_ov005_0221713c kind:data(any) addr:0x0221713c
-__typestr__N5sally4JobSE kind:data(any) addr:0x02217148
+_ZTSN5sally4JobSE kind:data(any) addr:0x02217148
 data_ov005_02217158 kind:data(any) addr:0x02217158
 data_ov005_02217168 kind:data(any) addr:0x02217168
 data_ov005_0221717c kind:data(any) addr:0x0221717c
 data_ov005_02217190 kind:data(any) addr:0x02217190
-__typestr__N5sally9JobSConstE kind:data(any) addr:0x022171a4
-__vt__N5sally4JobSE kind:data(any) addr:0x022171c0
-__typeinfo__N5sally4JobSE kind:data(any) addr:0x022171d0
-data_ov005_022171f0 kind:data(any) addr:0x022171f0
+_ZTSN5sally9JobSConstE kind:data(any) addr:0x022171a4
+_ZTVN5sally4JobSE kind:data(any) addr:0x022171b8
+_ZTIN5sally4JobSE kind:data(any) addr:0x022171d0
+ProcScr_Sally_JobS kind:data(any) addr:0x022171f0
 data_ov005_02217238 kind:data(any) addr:0x02217238
 data_ov005_0221723c kind:data(any) addr:0x0221723c
 data_ov005_02217240 kind:data(any) addr:0x02217240

config/YFEE01/arm9/symbols.txt

@@ -493,12 +493,12 @@ _Znam kind:function(arm,size=0x18) addr:0x0201158c
 _ZdlPv kind:function(arm,size=0x18) addr:0x020115a4
 _ZdaPv kind:function(arm,size=0x18) addr:0x020115bc
 func_020115d4 kind:function(arm,size=0x38) addr:0x020115d4
-func_0201160c kind:function(arm,size=0x44) addr:0x0201160c
-func_02011650 kind:function(arm,size=0x50) addr:0x02011650
-func_020116a0 kind:function(arm,size=0xdc) addr:0x020116a0
+FileExists kind:function(arm,size=0x44) addr:0x0201160c
+GetFileSize kind:function(arm,size=0x50) addr:0x02011650
+LoadFileWithOffset kind:function(arm,size=0xdc) addr:0x020116a0
 func_0201177c kind:function(arm,size=0xd8) addr:0x0201177c
-func_02011854 kind:function(arm,size=0xcc) addr:0x02011854
-func_02011920 kind:function(arm,size=0x110) addr:0x02011920
+LoadUncompressedFile kind:function(arm,size=0xcc) addr:0x02011854
+LoadCompressedFile kind:function(arm,size=0x110) addr:0x02011920
 func_02011a30 kind:function(arm,size=0x40) addr:0x02011a30
 func_02011a70 kind:function(arm,size=0x44) addr:0x02011a70
 func_02011ab4 kind:function(arm,size=0xf8) addr:0x02011ab4
@@ -1170,7 +1170,7 @@ func_02020994 kind:function(arm,size=0x68) addr:0x02020994
 IntSys_Sqrt kind:function(arm,size=0x30) addr:0x020209fc
 Interpolate kind:function(arm,size=0x124) addr:0x02020a2c
 func_02020b50 kind:function(arm,size=0x70) addr:0x02020b50
-func_02020bc0 kind:function(arm,size=0x4c) addr:0x02020bc0
+Decompress kind:function(arm,size=0x4c) addr:0x02020bc0
 func_02020c0c kind:function(arm,size=0xc) addr:0x02020c0c
 func_02020c18 kind:function(arm,size=0x34) addr:0x02020c18
 func_02020c4c kind:function(arm,size=0x8c) addr:0x02020c4c
@@ -1876,7 +1876,7 @@ _ZN9HashTableD1Ev kind:function(arm,size=0x40) addr:0x02037850
 func_02037890 kind:function(arm,size=0xac) addr:0x02037890
 func_0203793c kind:function(arm,size=0x84) addr:0x0203793c
 func_020379c0 kind:function(arm,size=0x20) addr:0x020379c0
-func_020379e0 kind:function(arm,size=0x24) addr:0x020379e0
+LoadFileAndCache kind:function(arm,size=0x24) addr:0x020379e0
 _ZN12FE11Database4InitEv kind:function(arm,size=0x24c) addr:0x02037a04
 GetPersonByPidStr kind:function(arm,size=0xc) addr:0x02037c50
 GetJobByJidStr kind:function(arm,size=0xc) addr:0x02037c5c
@@ -6333,7 +6333,7 @@ __typeinfo__12ProcMemVsync kind:data(any) addr:0x020ceab4
 __typestr__12ProcMemVsync kind:data(any) addr:0x020ceac0
 data_020cead0 kind:data(any) addr:0x020cead0
 __vt__12ProcMemVsync kind:data(any) addr:0x020ceae8
-data_020ceaf8 kind:data(any) addr:0x020ceaf8
+gDecompressFuncLut kind:data(any) addr:0x020ceaf8
 data_020ceb28 kind:data(any) addr:0x020ceb28
 data_020ceb30 kind:data(any) addr:0x020ceb30
 data_020ceb38 kind:data(any) addr:0x020ceb38

include/database.hpp

@@ -8,9 +8,10 @@ struct MapData
     char * unk_00; // pointer to "bmap_###" or "arena_###" identifier
     char * unk_04; // pointer to MCT_### string id
     STRUCT_PAD(0x08, 0x0A);
-    s8 unk_0a;
-    STRUCT_PAD(0x0B, 0x18);
-    u8 unk_18[2];
+    s8 unk_0a; // max allowed units?
+    STRUCT_PAD(0x0B, 0x0C);
+    u8 unk_0c[12]; // max allowed per class
+    u8 unk_18[2]; // bgm indexes
 };
 
 struct UnkData

include/menu.hpp

@@ -5,6 +5,26 @@
 
 #include "proc_ex.hpp"
 
+enum
+{
+    MENU_COLOR_WHITE = 1,
+    MENU_COLOR_GRAY = 2,
+    MENU_COLOR_BLUE = 3,
+    MENU_COLOR_GOLD = 4,
+    MENU_COLOR_GREEN = 5,
+};
+
+enum
+{
+    // Menu availability identifiers
+
+    MENU_ENABLED  = 0,
+    MENU_DISABLED = 1,
+    MENU_NOTSHOWN = 2,
+
+    MENU_ACTIVE   = 8,
+};
+
 class MenuItemState;
 
 class Menu

include/unit.hpp

@@ -25,26 +25,27 @@ struct PersonData
 struct JobData
 {
     char * unk_00; // jid string
-    char * unk_04;
+    char * unk_04; // mjid string
     /* 08 */ s8 bases[8];
-    s8 unk_10[8];
-    u8 unk_18[8];
+    s8 unk_10[8]; // growths
+    u8 unk_18[8]; // enemy growths
     /* 20 */ s8 caps[8];
     u8 unk_28;
     /* 29 */ u8 mov;
     u8 unk_2a;
     u8 unk_2b;
-    u8 weaponLevels[5];
-    STRUCT_PAD(0x31, 0x36);
+    u8 weaponLevels[8];
+    u8 unk_34; // reclass set
+    s8 unk_35; // reclass line
     /* 36 */ u16 unitType;
     u32 attributes;
-    STRUCT_PAD(0x3C, 0x40);
-    /* 40 */ struct JobData * pPromoteJob;
-    STRUCT_PAD(0x44, 0x48);
-    char * unk_48;
-    u8 unk_4c;
+    STRUCT_PAD(0x3C, 0x40); // promoted from job
+    /* 40 */ struct JobData * pPromoteJob; // promoted to job
+    STRUCT_PAD(0x44, 0x48); // "MSJI" -> used for job intro
+    char * unk_48; // "FID_P" -> generic portrait?
+    u8 unk_4c; // moving map sprite speed?
     STRUCT_PAD(0x4D, 0x54);
-    s8 unk_54;
+    s8 unk_54; // moving map sprite base Y position?
     STRUCT_PAD(0x55, 0x5C);
 };
 
@@ -194,6 +195,12 @@ class Unit
         this->xPos = x;
         this->yPos = y;
     }
+
+    inline void SetJob(struct JobData * job)
+    {
+        this->pJobData = job;
+        this->state2 &= ~0x40000000;
+    }
 };
 
 inline BOOL func_0203b714(struct Unit * unit, s32 state)

include/unknown_data.h

@@ -782,7 +782,7 @@ extern struct ProcCmd ProcScr_020ce750[];
 // extern ??? __typestr__12ProcMemVsync
 // extern ??? data_020cead0
 // extern ??? __vt__12ProcMemVsync
-// extern ??? data_020ceaf8
+// extern ??? gDecompressFuncLut
 // extern ??? data_020ceb28
 // extern ??? data_020ceb30
 // extern ??? data_020ceb38
@@ -2965,7 +2965,7 @@ extern struct UnkStruct_02196f24 * data_02196f24;
 // extern ??? data_021970ac
 // extern ??? data_021970bc
 // extern ??? data_021970c0
-extern u16 data_021970c4[];
+// extern u16 data_021970c4[];
 // extern ??? data_021970cc
 // extern ??? data_021970d0
 // extern ??? data_021970d4
@@ -6600,7 +6600,7 @@ extern struct UnkStruct_021faf8c data_ov002_021faf8c;
 // extern ??? data_ov005_022170d8
 // extern ??? data_ov005_022170dc
 // extern ??? data_ov005_022170e0
-// extern ??? __typeinfo__N5sally9JobSConstE
+// extern ??? _ZTIN5sally9JobSConstE
 // extern ??? data_ov005_022170ec
 // extern ??? data_ov005_022170f4
 // extern ??? data_ov005_02217100
@@ -6609,15 +6609,15 @@ extern struct UnkStruct_021faf8c data_ov002_021faf8c;
 // extern ??? data_ov005_02217124
 // extern ??? data_ov005_02217130
 // extern ??? data_ov005_0221713c
-// extern ??? __typestr__N5sally4JobSE
+// extern ??? _ZTSN5sally4JobSE
 // extern ??? data_ov005_02217158
 // extern ??? data_ov005_02217168
 // extern ??? data_ov005_0221717c
 // extern ??? data_ov005_02217190
-// extern ??? __typestr__N5sally9JobSConstE
-// extern ??? __vt__N5sally4JobSE
-// extern ??? __typeinfo__N5sally4JobSE
-// extern ??? data_ov005_022171f0
+// extern ??? _ZTSN5sally9JobSConstE
+// extern ??? _ZTVN5sally4JobSE
+// extern ??? _ZTIN5sally4JobSE
+// extern ??? ProcScr_Sally_JobS
 // extern ??? data_ov005_02217238
 // extern ??? data_ov005_0221723c
 // extern ??? data_ov005_02217240

include/unknown_funcs.h

@@ -514,12 +514,12 @@ EC void func_02010f98(u16 *, s32, s32);
 /* <new> */
 
 EC void func_020115d4(void);
-EC BOOL func_0201160c(char *);
-// EC ??? func_02011650
-EC void func_020116a0(char *, u16 *, s32, s32);
+EC BOOL FileExists(char *);
+// EC ??? GetFileSize
+EC void LoadFileWithOffset(char *, u16 *, s32, s32);
 EC void func_0201177c(char *, u32);
-EC void * func_02011854(char *, s32);
-EC void * func_02011920(char *, BOOL);
+EC void * LoadUncompressedFile(char *, s32);
+EC void * LoadCompressedFile(char *, BOOL);
 // EC ??? func_02011a30
 EC void func_02011a70(char *, u32, u32, u32);
 // EC ??? func_02011ab4
@@ -1191,7 +1191,7 @@ EC s32 IntSys_Mod(s32, s32); // IntSys_Mod
 EC u16 IntSys_Sqrt(u32);
 EC s32 Interpolate(s32, s32, s32, s32, s32);
 // EC ??? func_02020b50
-// EC ??? func_02020bc0
+// EC ??? Decompress
 // EC ??? func_02020c0c
 // EC ??? func_02020c18
 // EC ??? func_02020c4c
@@ -1503,10 +1503,10 @@ EC void func_02028c68(void);
 // EC ??? func_02029418
 // EC ??? func_02029480
 // EC ??? func_0202957c
-EC s32 func_020295ec(u16 *, char *, void *, u16 *, u32, u32, u32, u32, u32, u32);
-EC void func_0202972c(u16 *, char *, void *, u16 *, u32, u32, u32, u32, u32, u32, u32);
-EC void func_02029850(u16 *, s32, void *, u16 *, u32, u32, u32, u32, u32);
-// EC ??? func_02029a1c
+EC s32 func_020295ec(struct UnkStruct_021970c4 *, char *, void *, void *, u32, u32, u32, u32, u32, u32);
+EC void func_0202972c(struct UnkStruct_021970c4 *, char *, void *, u16 *, u32, u32, u32, u32, u32, u32, u32);
+EC void func_02029850(struct UnkStruct_021970c4 *, s32, void *, u16 *, u32, u32, u32, u32, u32);
+EC void func_02029a1c(struct UnkStruct_021970c4 *, u32, void *, void *, u32, u32, u32, u32);
 // EC ??? func_02029ae8
 // EC ??? func_02029ee0
 // EC ??? func_0202a1e0
@@ -1897,7 +1897,7 @@ EC void func_02035f20(void *);
 // EC ??? func_02037890
 // EC ??? func_0203793c
 EC void func_020379c0(void);
-EC struct MapFile * func_020379e0(char *, u32);
+EC struct MapFile * LoadFileAndCache(char *, u32);
 // EC ??? _ZN12FE11Database4InitEv
 EC struct PersonData * GetPersonByPidStr(char *);
 EC struct JobData * GetJobByJidStr(char *);
@@ -10342,17 +10342,17 @@ EC void StartSally_IMenu(ProcPtr); // Starts "sally::IMenu" proc
 // EC ??? func_ov005_0220f9bc
 // EC ??? func_ov005_0220f9d8
 // EC ??? func_ov005_0220fa14
-// EC ??? func_ov005_0220fa58
-// EC ??? func_ov005_0220fa84
-// EC ??? func_ov005_0220fab0
-// EC ??? func_ov005_0220fb18
-// EC ??? func_ov005_0220fb2c
-// EC ??? func_ov005_02210898
-// EC ??? func_ov005_022108c4
-// EC ??? func_ov005_022108d8
+// EC ??? SallyJobS_FadeIn
+// EC ??? SallyJobS_FadeOut
+// EC ??? SallyJobS_End
+// EC ??? SallyJobS_ov005_0220fb18
+// EC ??? _ZN5sally4JobS4InitEv
+// EC ??? SallyJobS_ov005_02210898
+// EC ??? SallyJobS_ov005_022108c4
+// EC ??? _ZN5sally4JobS4LoopEv
 EC void StartSally_JobS(ProcPtr); // Starts "sally::JobS" proc
-// EC ??? func_ov005_0221184c
-// EC ??? func_ov005_0221188c
+// EC ??? _ZN5sally4JobSD0Ev
+// EC ??? _ZN5sally4JobSD1Ev
 // EC ??? func_ov005_022118c4
 // EC ??? func_ov005_022118ec
 // EC ??? func_ov005_02211ab8

src/anime.cpp

@@ -35,7 +35,7 @@ EC void func_ov000_021d39a4(s32, s32, s32);
 EC void func_ov000_021d3a2c(void);
 EC s32 func_ov000_021d6f7c(s32);
 
-EC void * func_02011920(char *, BOOL);
+EC void * LoadCompressedFile(char *, BOOL);
 
 EC void func_0206ce8c(s32);
 EC void func_0206d2e8(s32, s32, s32, s32, s32, s32, s32);
@@ -1008,7 +1008,7 @@ EC Anime * StartAnimFromFile(void * file, u16 arg2, u16 arg3, u16 arg4, u16 arg5
 
 EC Anime * StartAnimByName(char * animName, u16 arg2, u16 arg3, u16 arg4, u16 arg5, s32 arg6, ProcEx * parent)
 {
-    void * file = func_02011920(animName, 0);
+    void * file = LoadCompressedFile(animName, 0);
     return StartAnimFromFile(file, arg2, arg3, arg4, arg5, arg6, 1, parent);
 }
 

src/database.cpp

@@ -9,7 +9,7 @@
 extern s32 data_020eea90;
 
 EC void func_020a8f40(char *);
-EC void * func_020379e0(char *, u32);
+EC void * LoadFileAndCache(char *, u32);
 
 EC BOOL CheckUnitAttribute(struct Unit *, s32);
 EC Unit * func_0203fd84(struct PersonData *);
@@ -33,8 +33,8 @@ EC void FE11Database::Init(void)
 
     func_020a8f40("/data");
 
-    this->unk_00 = func_020379e0("database", 1);
-    this->unk_04 = func_020379e0("tut", 1);
+    this->unk_00 = LoadFileAndCache("database", 1);
+    this->unk_04 = LoadFileAndCache("tut", 1);
 
     this->pPerson = static_cast<struct PersonData *>(HashTable::Get2("Person"));
     this->pJob = static_cast<struct JobData *>(HashTable::Get2("Job"));