main/scrctrl: match functions

- tapReqGroupPoll - subjobEvent
parappadev · Jan 19, 2025 · 28aea98 · 28aea98
1 parent aecffb7
commit 28aea98
Show file tree

Hide file tree

Showing 5 changed files with 201 additions and 155 deletions.
diff --git a/config/symbol_addrs.txt b/config/symbol_addrs.txt
@@ -1392,6 +1392,12 @@ TsCELBackDraw                       = 0x00137790; // type:func
 _TsCELBackObjDraw                   = 0x00137930; // type:func
 TsHosiPut                           = 0x00137df0; // type:func
 
+tblTex                              = 0x003997bc;
+HOSIObj                             = 0x00399824;
+
+menuPadState                        = 0x01c77ac0; // size:0x20
+TsBGMState                          = 0x01c77c10; // size:0xa0
+
 // menu/p3mc.c
 P3MC_GetIconSize                    = 0x00137f70; // type:func
 P3MC_GetIconPtr                     = 0x00137f98; // type:func
@@ -1439,11 +1445,6 @@ _P3MC_dataCheckFunc                 = 0x0013ac78; // type:func
 _P3MC_CheckUserData                 = 0x0013ac80; // type:func
 _P3MC_CheckUserDataHead             = 0x0013acc0; // type:func
 
-tblTex                              = 0x003997bc;
-HOSIObj                             = 0x00399824;
-
-menuPadState                        = 0x01c77ac0; // size:0x20
-
 HedderID                            = 0x00399830; // size:0x4
 FooterID                            = 0x00399834; // size:0x4
 pUChkWork                           = 0x00399838; // size:0x4
@@ -1802,6 +1803,7 @@ poolIndex                           = 0x00399944;
 randomPool                          = 0x01c833e0; // size:0x184
 
 // prlib/menderer.cpp
+PrDecelerateMenderer                = 0x0014ec30; // type:func
 PrSetMendererRatio                  = 0x0014f278; // type:func
 PrGetMendererRatio                  = 0x0014f280; // type:func
 PrInitializeMenderer                = 0x0014f2a8; // type:func

diff --git a/include/common.h b/include/common.h
@@ -44,6 +44,9 @@ typedef float f32;
 #define PR_CONCAT(x, y) ((x << 16) | (y))
 #define PR_BIT(x) (1 << x)
 
+#define PR_SCOPE    {
+#define PR_SCOPEEND }
+
 #define PR_ALIGNU(size, align) ((u_int)(size + (align - 1)) & ~(align - 1))
 #define PR_ALIGN(size, align) ((size + (align - 1)) & ~(align - 1))
 

diff --git a/include/main/drawctrl.h b/include/main/drawctrl.h
@@ -231,4 +231,7 @@ void DrawCtrlInit(EVENTREC *ev_pp, int ctrlTbl, void *dat_top);
 void DrawCtrlQuit(void);
 void DrawCtrlTimeSet(int time);
 
+void MendererCtrlTitle();
+void MendererCtrlTitleDera();
+
 #endif
diff --git a/include/prlib/prlib.h b/include/prlib/prlib.h
@@ -136,7 +136,7 @@ int PrGetDebugParam(int param);
 float PrGetDebugParamFloat(int param);
 
 /* menderer.cpp */
-void  PrDecelerateMenderer(u_int speed);
+void  PrDecelerateMenderer(int speed);
 void  PrRestartMenderer();
 
 void  PrSetMendererRatio(float ratio);