Skip to content

Commit 9d3a680

Browse files
raphaelthegreatkaras84
raphaelthegreat
and
karas84
authored
main/mbar: match functions (#19)
* main: Match examCharSet * main/mbar: match more functions * main/mbar: match ExamDispReq * main/mbar: Partial match for ExamDispOn/hex2decPlMi/hex2decPlMi Also fix build by moving static variable as extern * main/mbar: match MbarCharSet and MbarCharSet2 * main/mbar: match more functions - MbarWindowSet - MbarGetDispPosX - MbarGetTimeArea - MbarGetTimeArea2 - MbarSclRotMake - MbarFlashMake - MbarBackSet * main/mbar: match MbarCurSet * main/mbar: match MbarTapSubt * main/mbar: match MbarPosOffsetSet and mbar_othon_frame_set * main/mbar: match some disp functions - mbar_othon_frame_set - MbarDisp - MbarDispScene (needs B_01C70114) - MbarDispSceneDraw - MbarDispSceneVsDraw * main/mbar: match MbarDemoCharDisp * main/mbar: match examScoreSet/examLevelDisp/ExamDispSet * main/mbar: address review comments * main/mbar: fix guidisp_init_pr * update report * main/mbar: complete hex2decPlMi match * main/mbar: match MbarGetDispPosY * main/mbar: guidisp_init_pr hotfix * main/mbar: match MbarDispScene/MbarDispSceneDraw * main/mbar: remove tabs * main/mbar: fixup functions with no args * main/mbar: moar review --------- Co-authored-by: karas84 <karas84@users.noreply.github.com>
1 parent 12798c3 commit 9d3a680

File tree

4 files changed

+1074
-71
lines changed

4 files changed

+1074
-71
lines changed

‎config/p3.jul12.symbol_addrs.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -871,6 +871,7 @@ guime_camera_hdl = 0x00399a94;
871871

872872
exam_global_ply = 0x01c70030; // size:0x10
873873
exam_global_ply_current_ply = 0x01c70040; // size:0x10
874+
tp_tmp_72 = 0x01c6ffc0; // size:0x60
874875
metFrameCnt = 0x01c70050; // size:0xc
875876
metFrameCntLight = 0x01c70060; // size:0xc
876877
scr_tenmetu_col_dat = 0x01c70070; // size:0xc
@@ -2400,6 +2401,8 @@ __divdi3 = 0x001680d0; // type:func
24002401
exit = 0x00169730; // type:func
24012402
__fixsfdi = 0x00169760; // type:func
24022403
__floatdisf = 0x00169a20; // type:func
2404+
__muldi3 = 0x0016a168; // type:func
2405+
__moddi3 = 0x00169b00; // type:func
24032406
__udivdi3 = 0x0016a1c8; // type:func
24042407
__umoddi3 = 0x0016a798; // type:func
24052408

‎include/main/mbar.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,17 @@ typedef enum {
185185
EXAMTYPE_MAX = 3
186186
} EXAM_TYPE;
187187

188+
typedef struct { // 0x20
189+
/* 0x00 */ int spmmap;
190+
/* 0x04 */ int spamap;
191+
/* 0x08 */ int spamapP;
192+
/* 0x0c */ PR_MODELHANDLE spmHdl;
193+
/* 0x10 */ PR_ANIMATIONHANDLE spaHdl;
194+
/* 0x14 */ PR_ANIMATIONHANDLE spaHdlP;
195+
/* 0x18 */ int *frame_pp;
196+
/* 0x1c */ int *frame_ppP;
197+
} GUIMAP;
198+
188199
void examCharSet(EX_CHAR_DISP *ecd_pp, sceGifPacket *gifpk_pp);
189200

190201
void MbarMemberClear(int stg);

‎progress/report.json‎

Lines changed: 59 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"measures": {
3-
"fuzzy_match_percent": 47.096855,
3+
"fuzzy_match_percent": 48.732925,
44
"total_code": "342284",
5-
"matched_code": "158016",
6-
"matched_code_percent": 46.165173,
7-
"total_data": "26064868",
8-
"matched_data": "26015216",
9-
"matched_data_percent": 99.8095,
5+
"matched_code": "163616",
6+
"matched_code_percent": 47.801243,
7+
"total_data": "26082796",
8+
"matched_data": "26033144",
9+
"matched_data_percent": 99.80963,
1010
"total_functions": 1429,
11-
"matched_functions": 973,
12-
"matched_functions_percent": 68.08958,
11+
"matched_functions": 1005,
12+
"matched_functions_percent": 70.3289,
1313
"total_units": 70
1414
},
1515
"units": [
@@ -3966,14 +3966,14 @@
39663966
{
39673967
"name": "main/mbar",
39683968
"measures": {
3969-
"fuzzy_match_percent": 19.346266,
3969+
"fuzzy_match_percent": 56.550625,
39703970
"total_code": "15052",
3971-
"matched_code": "2912",
3972-
"matched_code_percent": 19.346268,
3971+
"matched_code": "8512",
3972+
"matched_code_percent": 56.55062,
39733973
"total_data": "224",
39743974
"total_functions": 82,
3975-
"matched_functions": 34,
3976-
"matched_functions_percent": 41.463413,
3975+
"matched_functions": 66,
3976+
"matched_functions_percent": 80.48781,
39773977
"total_units": 1
39783978
},
39793979
"sections": [
@@ -3995,20 +3995,22 @@
39953995
{
39963996
"name": ".text",
39973997
"size": "15208",
3998-
"fuzzy_match_percent": 19.346266,
3998+
"fuzzy_match_percent": 56.550625,
39993999
"metadata": {}
40004000
}
40014001
],
40024002
"functions": [
40034003
{
40044004
"name": "examCharSet",
40054005
"size": "684",
4006+
"fuzzy_match_percent": 100.0,
40064007
"metadata": {},
40074008
"address": "0"
40084009
},
40094010
{
40104011
"name": "clrColorBuffer",
40114012
"size": "160",
4013+
"fuzzy_match_percent": 100.0,
40124014
"metadata": {},
40134015
"address": "688"
40144016
},
@@ -4127,18 +4129,21 @@
41274129
{
41284130
"name": "MbarHookUseOK",
41294131
"size": "16",
4132+
"fuzzy_match_percent": 100.0,
41304133
"metadata": {},
41314134
"address": "2512"
41324135
},
41334136
{
41344137
"name": "MbarHookUseNG",
41354138
"size": "16",
4139+
"fuzzy_match_percent": 100.0,
41364140
"metadata": {},
41374141
"address": "2528"
41384142
},
41394143
{
41404144
"name": "MbarHookPoll",
41414145
"size": "188",
4146+
"fuzzy_match_percent": 100.0,
41424147
"metadata": {},
41434148
"address": "2544"
41444149
},
@@ -4152,24 +4157,28 @@
41524157
{
41534158
"name": "vsAnimationReq",
41544159
"size": "44",
4160+
"fuzzy_match_percent": 100.0,
41554161
"metadata": {},
41564162
"address": "2808"
41574163
},
41584164
{
41594165
"name": "vsAnimationReset",
41604166
"size": "40",
4167+
"fuzzy_match_percent": 100.0,
41614168
"metadata": {},
41624169
"address": "2856"
41634170
},
41644171
{
41654172
"name": "vsScr2Move",
41664173
"size": "28",
4174+
"fuzzy_match_percent": 100.0,
41674175
"metadata": {},
41684176
"address": "2896"
41694177
},
41704178
{
41714179
"name": "vsAnimationPoll",
41724180
"size": "296",
4181+
"fuzzy_match_percent": 100.0,
41734182
"metadata": {},
41744183
"address": "2928"
41754184
},
@@ -4183,6 +4192,7 @@
41834192
{
41844193
"name": "metColorSet",
41854194
"size": "468",
4195+
"fuzzy_match_percent": 100.0,
41864196
"metadata": {},
41874197
"address": "3304"
41884198
},
@@ -4210,12 +4220,14 @@
42104220
{
42114221
"name": "ExamDispPlySet",
42124222
"size": "24",
4223+
"fuzzy_match_percent": 100.0,
42134224
"metadata": {},
42144225
"address": "4080"
42154226
},
42164227
{
42174228
"name": "ExamDispReq",
42184229
"size": "76",
4230+
"fuzzy_match_percent": 100.0,
42194231
"metadata": {},
42204232
"address": "4104"
42214233
},
@@ -4248,12 +4260,14 @@
42484260
{
42494261
"name": "hex2decPlMi",
42504262
"size": "204",
4263+
"fuzzy_match_percent": 100.0,
42514264
"metadata": {},
42524265
"address": "5368"
42534266
},
42544267
{
42554268
"name": "examNumDisp",
42564269
"size": "356",
4270+
"fuzzy_match_percent": 100.0,
42574271
"metadata": {},
42584272
"address": "5576"
42594273
},
@@ -4266,12 +4280,14 @@
42664280
{
42674281
"name": "examLevelDisp",
42684282
"size": "252",
4283+
"fuzzy_match_percent": 100.0,
42694284
"metadata": {},
42704285
"address": "6216"
42714286
},
42724287
{
42734288
"name": "ExamDispSet",
42744289
"size": "72",
4290+
"fuzzy_match_percent": 100.0,
42754291
"metadata": {},
42764292
"address": "6472"
42774293
},
@@ -4326,54 +4342,63 @@
43264342
{
43274343
"name": "MbarGifInit",
43284344
"size": "136",
4345+
"fuzzy_match_percent": 100.0,
43294346
"metadata": {},
43304347
"address": "7096"
43314348
},
43324349
{
43334350
"name": "MbarGifTrans",
43344351
"size": "16",
4352+
"fuzzy_match_percent": 100.0,
43354353
"metadata": {},
43364354
"address": "7232"
43374355
},
43384356
{
43394357
"name": "MbarCharSet",
43404358
"size": "580",
4359+
"fuzzy_match_percent": 100.0,
43414360
"metadata": {},
43424361
"address": "7248"
43434362
},
43444363
{
43454364
"name": "MbarCharSet2",
43464365
"size": "428",
4366+
"fuzzy_match_percent": 100.0,
43474367
"metadata": {},
43484368
"address": "7832"
43494369
},
43504370
{
43514371
"name": "MbarWindowSet",
43524372
"size": "128",
4373+
"fuzzy_match_percent": 100.0,
43534374
"metadata": {},
43544375
"address": "8264"
43554376
},
43564377
{
43574378
"name": "MbarGetDispPosX",
43584379
"size": "104",
4380+
"fuzzy_match_percent": 100.0,
43594381
"metadata": {},
43604382
"address": "8392"
43614383
},
43624384
{
43634385
"name": "MbarGetDispPosY",
43644386
"size": "52",
4387+
"fuzzy_match_percent": 100.0,
43654388
"metadata": {},
43664389
"address": "8496"
43674390
},
43684391
{
43694392
"name": "MbarGetTimeArea",
43704393
"size": "104",
4394+
"fuzzy_match_percent": 100.0,
43714395
"metadata": {},
43724396
"address": "8552"
43734397
},
43744398
{
43754399
"name": "MbarGetTimeArea2",
43764400
"size": "96",
4401+
"fuzzy_match_percent": 100.0,
43774402
"metadata": {},
43784403
"address": "8656"
43794404
},
@@ -4394,6 +4419,7 @@
43944419
{
43954420
"name": "MbarGetStartTap",
43964421
"size": "60",
4422+
"fuzzy_match_percent": 100.0,
43974423
"metadata": {},
43984424
"address": "8824"
43994425
},
@@ -4413,6 +4439,7 @@
44134439
{
44144440
"name": "MbarFlashMake",
44154441
"size": "252",
4442+
"fuzzy_match_percent": 100.0,
44164443
"metadata": {},
44174444
"address": "9152"
44184445
},
@@ -4437,24 +4464,28 @@
44374464
{
44384465
"name": "MbarTapSubt",
44394466
"size": "124",
4467+
"fuzzy_match_percent": 100.0,
44404468
"metadata": {},
44414469
"address": "11520"
44424470
},
44434471
{
44444472
"name": "MbarPosOffsetSet",
44454473
"size": "96",
4474+
"fuzzy_match_percent": 100.0,
44464475
"metadata": {},
44474476
"address": "11648"
44484477
},
44494478
{
44504479
"name": "mbar_othon_frame_set",
44514480
"size": "140",
4481+
"fuzzy_match_percent": 100.0,
44524482
"metadata": {},
44534483
"address": "11744"
44544484
},
44554485
{
44564486
"name": "MbarDisp",
44574487
"size": "320",
4488+
"fuzzy_match_percent": 100.0,
44584489
"metadata": {},
44594490
"address": "11888"
44604491
},
@@ -4473,6 +4504,7 @@
44734504
{
44744505
"name": "MbarDispSceneVsDraw",
44754506
"size": "40",
4507+
"fuzzy_match_percent": 100.0,
44764508
"metadata": {},
44774509
"address": "13248"
44784510
},
@@ -5238,9 +5270,9 @@
52385270
"total_code": "2580",
52395271
"matched_code": "2580",
52405272
"matched_code_percent": 100.0,
5241-
"total_data": "212",
5242-
"matched_data": "12",
5243-
"matched_data_percent": 5.6603775,
5273+
"total_data": "18140",
5274+
"matched_data": "17940",
5275+
"matched_data_percent": 98.89746,
52445276
"total_functions": 18,
52455277
"matched_functions": 18,
52465278
"matched_functions_percent": 100.0,
@@ -5249,11 +5281,13 @@
52495281
"sections": [
52505282
{
52515283
"name": ".bss",
5284+
"size": "17736",
52525285
"fuzzy_match_percent": 100.0,
52535286
"metadata": {}
52545287
},
52555288
{
52565289
"name": ".data",
5290+
"size": "192",
52575291
"fuzzy_match_percent": 100.0,
52585292
"metadata": {}
52595293
},
@@ -13179,16 +13213,16 @@
1317913213
{
1318013214
"id": "main",
1318113215
"measures": {
13182-
"fuzzy_match_percent": 62.223064,
13216+
"fuzzy_match_percent": 66.737885,
1318313217
"total_code": "124036",
13184-
"matched_code": "76336",
13185-
"matched_code_percent": 61.543423,
13186-
"total_data": "48216",
13187-
"matched_data": "38372",
13188-
"matched_data_percent": 79.58354,
13218+
"matched_code": "81936",
13219+
"matched_code_percent": 66.05824,
13220+
"total_data": "66144",
13221+
"matched_data": "56300",
13222+
"matched_data_percent": 85.117325,
1318913223
"total_functions": 570,
13190-
"matched_functions": 465,
13191-
"matched_functions_percent": 81.57895,
13224+
"matched_functions": 497,
13225+
"matched_functions_percent": 87.192986,
1319213226
"total_units": 17
1319313227
}
1319413228
},

0 commit comments

Comments
 (0)