main/etc: match functions

- GlobalInit
- GlobalTimeInit
- GlobalSetTempo
- GlobalTimeJobChange
- GlobalTimeGet
- GlobalSndTimeGet
- GlobalSndSampleGet
- GetHatRound
- GlobalMendererUseCheck
- GetPcode2PadType
- TimeCallback
- TimeCallbackSet
- TimeCallbackTimeGetChan
- TimeCallbackTimeSetChan
- TimeCallbackTimeSetChanTempo
- TimeCallbackTimeGet
- TimeCallbackTimeSet
- GetKeyCode2Index
- GetKeyCode2PressId
- ChangeTapLevel
- SpuBankSet
- SpuBankSetAll
- inCmnInit

config/symbol_addrs.txt

@@ -868,6 +868,20 @@ inCmnHookSet                        = 0x0011cc48; // type:func
 inCmnHook2GameCheck                 = 0x0011ccd0; // type:func
 inCmnHook2GameSave                  = 0x0011cd30; // type:func
 
+usrSceneHandle                      = 0x00399590; // size:0x4
+
+scr_snd_area                        = 0x00186f50; // size:0x30
+hkl_pknum_01                        = 0x00186f80; // size:0x8
+hkl_pknum_02                        = 0x00186f88; // size:0x8
+hkl_pknum_03                        = 0x00186f90; // size:0x8
+hkl_pknum_04                        = 0x00186f98; // size:0x8
+hkl_pknum_05                        = 0x00186fa0; // size:0x8
+hkl_pknum_06                        = 0x00186fa8; // size:0x8
+hkl_pknum_07                        = 0x00186fb0; // size:0x8
+hkl_pkstr                           = 0x00186fb8; // size:0x48
+
+vsync_time                          = 0x01c73018; // size:0xcc
+
 // main/wipe.c
 wipeSndReq                          = 0x0011cd58; // type:func
 wipeSndStop                         = 0x0011cde8; // type:func
@@ -1850,6 +1864,7 @@ sceGsSyncPath                       = 0x001551d0; // type:func
 sceGsSetDefStoreImage               = 0x001556d0; // type:func
 sceGsExecLoadImage                  = 0x00155810; // type:func
 sceGsExecStoreImage                 = 0x00155990; // type:func
+sceGsSyncVCallback                  = 0x00156020; // type:func
 sceGsSetHalfOffset                  = 0x001560c0; // type:func
 sceGsSetHalfOffset2                 = 0x00156148; // type:func
 sceGsSetDefDBuffDc                  = 0x001561d0; // type:func

include/main/etc.h

@@ -3,10 +3,6 @@
 
 #include <eetypes.h>
 
-// Typedef structs that I'm too lazy to define here
-// -----------------------------------------------
-// -----------------------------------------------
-
 typedef struct { // 0x18
     /* 0x00 */ u_char per[17];
     /* 0x14 */ int pls_point;
@@ -295,16 +291,15 @@ typedef enum
     RLVL_HK_MAX = 17
 } RANK_LEVEL;
 
-typedef enum
-{
-    PAD_1CON,
-    PAD_2CON,
-    PAD_NOPLAYER,
-    PAD_COM,
-    PAD_DEMO,
-    PAD_REPLAY,
-    PAD_UNUSE,
-    PAD_TYPE_MAX
+typedef enum {
+    PAD_1CON = 0,
+    PAD_2CON = 1,
+    PAD_NOPLAYER = 2,
+    PAD_COM = 2,
+    PAD_DEMO = 3,
+    PAD_REPLAY = 4,
+    PAD_UNUSE = 5,
+    PAD_TYPE_MAX = 6
 } PAD_TYPE;
 
 typedef enum {
@@ -508,13 +503,26 @@ typedef enum {
     TCBK_CHANNEL_MAX = 51
 } TCBK_CHANNEL_ENUM;
 
+// TODO(poly): ^ everything above should NOT be here!
+
+typedef struct { // 0xc
+    /* 0x0 */ int spu_size;
+    /* 0x4 */ int spu_adrs;
+    /* 0x8 */ int iop_size;
+} SCR_SND_AREA;
+
+typedef struct { // 0x8
+    /* 0x0 */ int cnt;
+    /* 0x4 */ u_char *hknum_pp;
+} HKL_PKSTR;
+
 void GlobalTimeInit(GLOBAL_DATA *gl_pp);
 void GlobalSetTempo(GLOBAL_DATA *gl_pp, float tempo);
 void GlobalPlySet(GLOBAL_DATA *gl_pp, PLAY_STEP stp, int stage_num);
 
 TAP_ROUND_ENUM GetHatRound(void);
 int GlobalSndSampleGet(void);
-void TimeCallbackTimeSetChan(int chan, u_int time);
+void TimeCallbackTimeSetChan(TCBK_CHANNEL_ENUM chan, u_int time);
 u_int TimeCallbackTimeGetChan(int chan);
 void GlobalTimeJobChange(TIME_GET_FLAG tfg);
 void TimeCallbackTimeSetChanTempo(int chan, u_int time, float tempo);

include/os/system.h

@@ -35,7 +35,7 @@ extern GAME_STATUS game_status;
 extern MC_REP_STR  mc_rep_str;
 
 /* .sdata */
-// extern HAT_CHANGE_ENUM hat_change_enum;
+extern HAT_CHANGE_ENUM hat_change_enum;
 
 extern INGAME_COMMON_STR ingame_common_str;
 

progress/main_progress.json

@@ -1 +1 @@
-{"schemaVersion": 1, "label": "main", "message": "37.6535%", "color": "darkorange"}
+{"schemaVersion": 1, "label": "main", "message": "38.5742%", "color": "darkorange"}

progress/total_progress.json

@@ -1 +1 @@
-{"schemaVersion": 1, "label": "Total percentage", "message": "46.1755%", "color": "darkorange"}
+{"schemaVersion": 1, "label": "Total percentage", "message": "46.4099%", "color": "darkorange"}