fix conflict

This commit is contained in:
TakaRikka 2023-01-31 20:08:30 -08:00
parent 7745b0432e
commit c515b3298f
1 changed files with 7 additions and 7 deletions

View File

@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes)
.init | 97.972973% | 9280 | 9472
.extab | 100.000000% | 96 | 96
.extabindex | 100.000000% | 96 | 96
.text | 23.835549% | 857256 | 3596544
.text | 23.857459% | 858044 | 3596544
.ctors | 100.000000% | 448 | 448
.dtors | 100.000000% | 32 | 32
.rodata | 100.000000% | 193856 | 193856
.data | 100.000000% | 197632 | 197632
.sdata | 100.000000% | 1408 | 1408
.sdata2 | 100.000000% | 20832 | 20832
Total | 31.865121% | 1281192 | 4020672
Total | 31.884720% | 1281980 | 4020672
## Total
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 31.709426% | 1274932 | 4020672
RELs | 33.043626% | 3800124 | 11500324
Total | 32.698005% | 5075056 | 15520996
main.dol | 31.884720% | 1281980 | 4020672
RELs | 33.048286% | 3800660 | 11500324
Total | 32.746868% | 5082640 | 15520996
## RELs
@ -727,7 +727,7 @@ d_a_tag_evtmsg | 39.491150% | 1428 | 3616
d_a_tag_firewall | 35.325132% | 1608 | 4552
d_a_tag_gra | 76.000000% | 608 | 800
d_a_tag_gstart | 100.000000% | 1208 | 1208
d_a_tag_guard | 54.421769% | 640 | 1176
d_a_tag_guard | 100.000000% | 1176 | 1176
d_a_tag_hinit | 100.000000% | 1440 | 1440
d_a_tag_hjump | 40.841584% | 1320 | 3232
d_a_tag_howl | 46.934461% | 888 | 1892
@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244
d_a_warp_bug | 54.940711% | 1112 | 2024
d_a_ykgr | 44.400631% | 2252 | 5072
f_pc_profile_lst | 100.000000% | 28156 | 28156
Total | 33.043626% | 3800124 | 11500324
Total | 33.048286% | 3800660 | 11500324