diff --git a/Progress.md b/Progress.md index 257584b7081..63d46eba576 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 86.402027% | 8184 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 11.684217% | 420228 | 3596544 +.text | 12.024877% | 432480 | 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 | 20.968336% | 843068 | 4020672 +Total | 21.273061% | 855320 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 20.968336% | 843068 | 4020672 +main.dol | 21.273061% | 855320 | 4020672 RELs | 33.172039% | 3814892 | 11500324 -Total | 30.010703% | 4657960 | 15520996 +Total | 30.089641% | 4670212 | 15520996 ## RELs @@ -30,759 +30,759 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- f_pc_profile_lst | 99.872141% | 28120 | 28156 d_a_hozelda | 28.805621% | 4920 | 17080 -d_a_dmidna | 50.000000% | 944 | 1888 +d_a_ni | 27.299309% | 8216 | 30096 +d_a_mg_fshop | 36.363636% | 9360 | 25740 d_a_movie_player | 23.696790% | 8328 | 35144 -d_a_suspend | 68.303571% | 612 | 896 -d_a_swLBall | 33.651805% | 1268 | 3768 -d_a_boomerang | 26.528647% | 6612 | 24924 -d_a_L7low_dr | 38.905775% | 1536 | 3948 -d_a_bd | 31.115418% | 5780 | 18576 -d_a_set_bgobj | 65.342960% | 724 | 1108 -d_a_mant | 86.020312% | 40316 | 46868 +d_a_vrbox | 48.327138% | 1040 | 2152 +d_a_sq | 35.488722% | 3776 | 10640 +d_a_ppolamp | 42.341463% | 1736 | 4100 +d_a_demo_item | 33.863165% | 3920 | 11576 +d_a_cstaf | 100.000000% | 11860 | 11860 d_a_bg | 35.526882% | 3304 | 9300 d_a_tboxSw | 66.141732% | 672 | 1016 -d_a_demo_item | 33.863165% | 3920 | 11576 -d_a_kago | 24.588671% | 15124 | 61508 -d_a_guard_mng | 53.457447% | 804 | 1504 -d_a_mg_fshop | 36.363636% | 9360 | 25740 -d_a_vrbox | 48.327138% | 1040 | 2152 -d_a_do | 25.780847% | 10004 | 38804 +d_a_title | 39.558574% | 2796 | 7068 +d_a_L7low_dr | 38.905775% | 1536 | 3948 +d_a_andsw2 | 29.472774% | 1364 | 4628 d_a_nbomb | 28.739233% | 8808 | 30648 -d_a_ni | 27.299309% | 8216 | 30096 -d_a_coach_fire | 44.050104% | 1688 | 3832 -d_a_disappear | 45.091514% | 1084 | 2404 +d_a_talk | 45.434783% | 836 | 1840 +d_a_coach_2D | 38.344915% | 2428 | 6332 +d_a_ykgr | 44.400631% | 2252 | 5072 +d_a_scene_exit | 46.019417% | 948 | 2060 +d_a_tbox2 | 42.486445% | 4388 | 10328 +d_a_shop_item | 43.088737% | 2020 | 4688 +d_a_midna | 22.953368% | 12404 | 54040 +d_a_passer_mng | 31.038027% | 2416 | 7784 +d_a_boomerang | 26.528647% | 6612 | 24924 +d_a_demo00 | 29.136000% | 7284 | 25000 +d_a_startAndGoal | 41.918528% | 1276 | 3044 +d_a_horse | 22.301298% | 15668 | 70256 +d_a_kago | 24.588671% | 15124 | 61508 +d_a_path_line | 100.000000% | 508 | 508 +d_a_do | 25.780847% | 10004 | 38804 d_a_formation_mng | 27.806286% | 3468 | 12472 -d_a_mirror | 32.707993% | 3208 | 9808 -d_a_swhit0 | 35.577421% | 2748 | 7724 -d_a_spinner | 27.874187% | 5140 | 18440 -d_a_fr | 34.866377% | 4488 | 12872 -d_a_balloon_2D | 29.886212% | 3572 | 11952 -d_a_cow | 22.936702% | 12784 | 55736 -d_a_ep | 30.950696% | 5248 | 16956 -d_a_arrow | 28.104690% | 6400 | 22772 d_a_andsw | 60.526316% | 644 | 1064 -d_a_cstatue | 29.155833% | 6728 | 23076 +d_a_dmidna | 50.000000% | 944 | 1888 +d_a_L7op_demo_dr | 26.198715% | 4240 | 16184 +d_a_guard_mng | 53.457447% | 804 | 1504 +d_a_econt | 59.836066% | 876 | 1464 +d_a_myna | 30.876570% | 9736 | 31532 +d_a_izumi_gate | 57.729941% | 1180 | 2044 +d_a_mirror | 32.707993% | 3208 | 9808 +d_a_cow | 22.936702% | 12784 | 55736 +d_a_disappear | 45.091514% | 1084 | 2404 +d_a_swc00 | 42.329545% | 1788 | 4224 +d_a_spinner | 27.874187% | 5140 | 18440 +d_a_swLBall | 33.651805% | 1268 | 3768 +d_a_suspend | 68.303571% | 612 | 896 +d_a_coach_fire | 44.050104% | 1688 | 3832 +d_a_bg_obj | 32.434657% | 6304 | 19436 +d_a_warp_bug | 54.940711% | 1112 | 2024 +d_a_vrbox2 | 34.977578% | 2184 | 6244 +d_a_alldie | 39.885496% | 836 | 2096 +d_a_bd | 31.115418% | 5780 | 18576 +d_a_scene_exit2 | 44.782034% | 1356 | 3028 +d_a_swhit0 | 35.577421% | 2748 | 7724 +d_a_swBall | 33.297414% | 1236 | 3712 +d_a_crod | 33.887043% | 2448 | 7224 +d_a_balloon_2D | 29.886212% | 3572 | 11952 +d_a_fr | 34.866377% | 4488 | 12872 +d_a_hitobj | 62.682927% | 1028 | 1640 d_a_mg_rod | 24.484345% | 23836 | 97352 d_a_skip_2D | 56.456456% | 752 | 1332 -d_a_crod | 33.887043% | 2448 | 7224 -d_a_cstaf | 100.000000% | 11860 | 11860 -d_a_mg_fish | 26.024167% | 17660 | 67860 -d_a_econt | 59.836066% | 876 | 1464 -d_a_sq | 35.488722% | 3776 | 10640 -d_a_canoe | 28.479263% | 4944 | 17360 -d_a_shop_item | 43.088737% | 2020 | 4688 -d_a_ppolamp | 42.341463% | 1736 | 4100 -d_a_tbox | 30.165503% | 9332 | 30936 -d_a_path_line | 100.000000% | 508 | 508 -d_a_horse | 22.301298% | 15668 | 70256 -d_a_coach_2D | 38.344915% | 2428 | 6332 -d_a_passer_mng | 31.038027% | 2416 | 7784 -d_a_bg_obj | 32.434657% | 6304 | 19436 -d_a_scene_exit | 46.019417% | 948 | 2060 -d_a_andsw2 | 29.472774% | 1364 | 4628 -d_a_myna | 30.876570% | 9736 | 31532 -d_a_talk | 45.434783% | 836 | 1840 -d_a_midna | 22.953368% | 12404 | 54040 -d_a_dshutter | 46.003263% | 2256 | 4904 -d_a_demo00 | 29.136000% | 7284 | 25000 +d_a_ep | 30.950696% | 5248 | 16956 d_a_grass | 49.074395% | 28312 | 57692 -d_a_bullet | 42.660550% | 2604 | 6104 -d_a_swBall | 33.297414% | 1236 | 3712 -d_a_scene_exit2 | 44.782034% | 1356 | 3028 +d_a_dshutter | 46.003263% | 2256 | 4904 +d_a_tbox | 30.165503% | 9332 | 30936 d_a_peru | 33.139234% | 10244 | 30912 -d_a_warp_bug | 54.940711% | 1112 | 2024 -d_a_izumi_gate | 57.729941% | 1180 | 2044 -d_a_vrbox2 | 34.977578% | 2184 | 6244 -d_a_startAndGoal | 41.918528% | 1276 | 3044 -d_a_alldie | 39.885496% | 836 | 2096 -d_a_swc00 | 42.329545% | 1788 | 4224 -d_a_L7op_demo_dr | 26.198715% | 4240 | 16184 -d_a_ykgr | 44.400631% | 2252 | 5072 -d_a_tbox2 | 42.486445% | 4388 | 10328 -d_a_L7demo_dr | 30.796884% | 2056 | 6676 -d_a_title | 39.558574% | 2796 | 7068 -d_a_hitobj | 62.682927% | 1028 | 1640 +d_a_set_bgobj | 65.342960% | 724 | 1108 +d_a_mant | 86.020312% | 40316 | 46868 +d_a_cstatue | 29.155833% | 6728 | 23076 d_a_swTime | 63.076923% | 656 | 1040 -d_a_tag_kmsg | 32.037997% | 1484 | 4632 -d_a_tag_mhint | 35.576923% | 1332 | 3744 -d_a_tag_Lv6Gate | 39.281576% | 2712 | 6904 -d_a_tag_telop | 100.000000% | 1040 | 1040 -d_a_tag_lv5soup | 100.000000% | 1908 | 1908 -d_a_tag_setrestart | 49.130435% | 904 | 1840 -d_a_tag_attention | 50.000000% | 1012 | 2024 -d_a_tag_mmsg | 46.938776% | 920 | 1960 -d_a_tag_howl | 46.934461% | 888 | 1892 -d_a_tag_guard | 54.421769% | 640 | 1176 -d_a_tag_rmbit_sw | 46.642468% | 1028 | 2204 -d_a_tag_chgrestart | 48.868778% | 864 | 1768 -d_a_tag_lightball | 46.212121% | 976 | 2112 -d_a_tag_TWgate | 35.434031% | 6972 | 19676 -d_a_tag_escape | 100.000000% | 712 | 712 -d_a_tag_chkpoint | 39.852399% | 864 | 2168 -d_a_tag_push | 41.000000% | 1148 | 2800 -d_a_tag_arena | 82.022472% | 584 | 712 -d_a_tag_myna_light | 36.747759% | 1148 | 3124 -d_a_tag_magne | 66.810345% | 620 | 928 -d_a_tag_setBall | 100.000000% | 880 | 880 -d_a_tag_ret_room | 49.168646% | 828 | 1684 -d_a_tag_statue_evt | 38.427948% | 2816 | 7328 -d_a_tag_Lv8Gate | 43.347193% | 1668 | 3848 -d_a_tag_firewall | 35.325132% | 1608 | 4552 -d_a_tag_shop_camera | 62.541806% | 748 | 1196 -d_a_tag_spinner | 45.850622% | 884 | 1928 -d_a_tag_mwait | 35.082873% | 1016 | 2896 -d_a_tag_river_back | 45.725916% | 1348 | 2948 -d_a_tag_csw | 35.869565% | 3696 | 10304 -d_a_tag_sppath | 33.333333% | 2040 | 6120 +d_a_arrow | 28.104690% | 6400 | 22772 +d_a_mg_fish | 26.024167% | 17660 | 67860 +d_a_L7demo_dr | 30.796884% | 2056 | 6676 +d_a_canoe | 28.479263% | 4944 | 17360 +d_a_bullet | 42.660550% | 2604 | 6104 d_a_tag_watchge | 61.290323% | 760 | 1240 -d_a_tag_wljump | 30.777538% | 1140 | 3704 -d_a_tag_qs | 34.804270% | 1956 | 5620 -d_a_tag_ss_drink | 36.483740% | 1436 | 3936 -d_a_tag_kago_fall | 34.469328% | 1416 | 4108 -d_a_tag_lv6CstaSw | 51.406250% | 1316 | 2560 -d_a_tag_hjump | 40.841584% | 1320 | 3232 -d_a_tag_evtmsg | 39.491150% | 1428 | 3616 -d_a_tag_wara_howl | 51.549296% | 732 | 1420 -d_a_tag_Lv7Gate | 34.752224% | 2188 | 6296 -d_a_tag_bottle_item | 38.554217% | 1024 | 2656 -d_a_tag_instruction | 82.022472% | 584 | 712 -d_a_tag_msg | 37.563971% | 1468 | 3908 -d_a_tag_myna2 | 47.260274% | 828 | 1752 -d_a_tag_mist | 43.436293% | 900 | 2072 -d_a_tag_gstart | 57.615894% | 696 | 1208 -d_a_tag_evt | 37.815126% | 1620 | 4284 -d_a_tag_lantern | 52.013423% | 1240 | 2384 -d_a_tag_smk_emt | 50.127226% | 788 | 1572 -d_a_tag_poFire | 63.270142% | 1068 | 1688 -d_a_tag_mstop | 36.151961% | 1180 | 3264 -d_a_tag_yami | 42.650334% | 1532 | 3592 -d_a_tag_lv2prchk | 35.734870% | 992 | 2776 -d_a_tag_shop_item | 41.944848% | 1156 | 2756 -d_a_tag_event | 31.075697% | 1248 | 4016 +d_a_tag_mhint | 35.576923% | 1332 | 3744 d_a_tag_attack_item | 43.212237% | 1808 | 4184 -d_a_tag_stream | 49.729730% | 736 | 1480 -d_a_tag_theB_hint | 67.253521% | 764 | 1136 -d_a_tag_camera | 37.023593% | 1632 | 4408 -d_a_tag_schedule | 82.022472% | 584 | 712 -d_a_tag_ajnot | 56.493506% | 696 | 1232 -d_a_tag_waterfall | 46.361502% | 1580 | 3408 -d_a_tag_allmato | 30.234070% | 3720 | 12304 -d_a_tag_hstop | 46.962617% | 1608 | 3424 -d_a_tag_cstasw | 100.000000% | 2560 | 2560 -d_a_tag_gra | 76.000000% | 608 | 800 -d_a_tag_assistance | 76.699029% | 632 | 824 -d_a_tag_evtarea | 37.091319% | 1316 | 3548 +d_a_tag_attention | 50.000000% | 1012 | 2024 +d_a_tag_myna2 | 47.260274% | 828 | 1752 +d_a_tag_Lv6Gate | 39.281576% | 2712 | 6904 d_a_tag_hinit | 55.555556% | 800 | 1440 +d_a_tag_camera | 37.023593% | 1632 | 4408 +d_a_tag_statue_evt | 38.427948% | 2816 | 7328 +d_a_tag_rmbit_sw | 46.642468% | 1028 | 2204 +d_a_tag_TWgate | 35.434031% | 6972 | 19676 +d_a_tag_smk_emt | 50.127226% | 788 | 1572 +d_a_tag_csw | 35.869565% | 3696 | 10304 +d_a_tag_evt | 37.815126% | 1620 | 4284 +d_a_tag_evtmsg | 39.491150% | 1428 | 3616 d_a_tag_spring | 45.780591% | 868 | 1896 +d_a_tag_poFire | 63.270142% | 1068 | 1688 +d_a_tag_shop_camera | 62.541806% | 748 | 1196 +d_a_tag_wljump | 30.777538% | 1140 | 3704 +d_a_tag_telop | 100.000000% | 1040 | 1040 +d_a_tag_kago_fall | 34.469328% | 1416 | 4108 +d_a_tag_yami | 42.650334% | 1532 | 3592 +d_a_tag_Lv7Gate | 34.752224% | 2188 | 6296 +d_a_tag_arena | 82.022472% | 584 | 712 +d_a_tag_sppath | 33.333333% | 2040 | 6120 +d_a_tag_shop_item | 41.944848% | 1156 | 2756 +d_a_tag_theB_hint | 67.253521% | 764 | 1136 +d_a_tag_lv2prchk | 35.734870% | 992 | 2776 +d_a_tag_mmsg | 46.938776% | 920 | 1960 +d_a_tag_lightball | 46.212121% | 976 | 2112 +d_a_tag_msg | 37.563971% | 1468 | 3908 d_a_tag_pachi | 51.107595% | 1292 | 2528 -d_a_e_zh | 27.029865% | 9268 | 34288 -d_a_e_oc | 22.586920% | 11148 | 49356 -d_a_e_dk | 29.244060% | 5416 | 18520 -d_a_e_fb | 31.127328% | 4948 | 15896 -d_a_e_hp | 28.231798% | 6840 | 24228 -d_a_e_fs | 31.823996% | 4976 | 15636 -d_a_e_kr | 27.652396% | 9508 | 34384 -d_a_e_arrow | 35.306882% | 4556 | 12904 -d_a_e_df | 28.031364% | 4004 | 14284 -d_a_e_mk_bo | 29.776477% | 4476 | 15032 -d_a_e_tt | 27.836991% | 7104 | 25520 -d_a_e_hm | 27.299426% | 8180 | 29964 -d_a_e_rdy | 25.649401% | 19788 | 77148 -d_a_e_sm | 24.418880% | 8236 | 33728 -d_a_e_vt | 24.313702% | 16332 | 67172 -d_a_e_tk2 | 33.419577% | 3100 | 9276 -d_a_e_dt | 27.760631% | 12952 | 46656 -d_a_e_ot | 32.497589% | 5392 | 16592 -d_a_e_kk | 27.161029% | 7516 | 27672 -d_a_e_tk | 32.077326% | 3916 | 12208 -d_a_e_rd | 24.121965% | 25632 | 106260 -d_a_e_mb | 29.067542% | 4252 | 14628 -d_a_e_gs | 44.729606% | 1952 | 4364 -d_a_e_ms | 28.208138% | 5768 | 20448 -d_a_e_bi_leaf | 50.446429% | 904 | 1792 -d_a_e_is | 31.728595% | 3928 | 12380 -d_a_e_db_leaf | 57.582938% | 972 | 1688 -d_a_e_gm | 28.274812% | 10404 | 36796 -d_a_e_yk | 29.001484% | 5472 | 18868 -d_a_e_ym | 20.062370% | 13896 | 69264 -d_a_e_tk_ball | 33.349562% | 2740 | 8216 -d_a_e_dd | 26.687870% | 7384 | 27668 -d_a_e_yr | 27.591936% | 9964 | 36112 -d_a_e_mm | 27.438612% | 4872 | 17756 -d_a_e_dn | 25.842869% | 13460 | 52084 -d_a_e_ai | 28.308171% | 5100 | 18016 -d_a_e_yd | 27.879315% | 7688 | 27576 -d_a_e_db | 26.006517% | 9896 | 38052 -d_a_e_ge | 24.669967% | 7176 | 29088 -d_a_e_bi | 30.767563% | 5676 | 18448 -d_a_e_bee | 30.316629% | 4864 | 16044 -d_a_e_ww | 23.418134% | 10052 | 42924 -d_a_e_yh | 26.277603% | 9996 | 38040 -d_a_e_mm_mt | 28.672856% | 4200 | 14648 -d_a_e_bug | 29.207138% | 5172 | 17708 -d_a_e_yc | 30.733107% | 4712 | 15332 -d_a_e_sg | 29.168221% | 6256 | 21448 -d_a_e_ws | 29.700483% | 6148 | 20700 -d_a_e_ph | 23.274129% | 5556 | 23872 -d_a_e_yg | 28.386013% | 7436 | 26196 -d_a_e_th | 29.463680% | 6944 | 23568 -d_a_e_rdb | 27.331887% | 9576 | 35036 -d_a_e_gb | 26.939571% | 8292 | 30780 -d_a_e_sb | 28.045789% | 5488 | 19568 -d_a_e_po | 23.824220% | 14204 | 59620 -d_a_e_mf | 25.211695% | 12624 | 50072 -d_a_e_ymb | 23.798093% | 14672 | 61652 -d_a_e_ga | 43.014395% | 2032 | 4724 -d_a_e_cr | 34.481521% | 3844 | 11148 -d_a_e_cr_egg | 43.296089% | 1860 | 4296 -d_a_e_fk | 32.965394% | 4420 | 13408 -d_a_e_fm | 24.588144% | 15164 | 61672 -d_a_e_sf | 29.821481% | 8152 | 27336 -d_a_e_hzelda | 30.097531% | 7900 | 26248 -d_a_e_bu | 30.436573% | 5912 | 19424 -d_a_e_nz | 32.041969% | 4764 | 14868 -d_a_e_yd_leaf | 54.022989% | 1128 | 2088 -d_a_e_zm | 28.267015% | 5200 | 18396 -d_a_e_kg | 31.431080% | 4296 | 13668 -d_a_e_ym_tag | 61.764706% | 672 | 1088 -d_a_e_ba | 28.140394% | 5484 | 19488 -d_a_e_st | 26.260013% | 12588 | 47936 -d_a_e_fz | 30.508860% | 5372 | 17608 -d_a_e_gob | 26.683396% | 10208 | 38256 -d_a_e_nest | 29.119005% | 5804 | 19932 -d_a_e_rb | 30.197628% | 4584 | 15180 -d_a_e_gi | 30.183330% | 6388 | 21164 -d_a_e_s1 | 28.078818% | 9804 | 34916 -d_a_e_bg | 27.665091% | 7256 | 26228 -d_a_e_sh | 30.953709% | 6660 | 21516 -d_a_e_hb_leaf | 55.309735% | 1000 | 1808 -d_a_e_bs | 32.320835% | 5448 | 16856 -d_a_e_hz | 23.990326% | 7936 | 33080 -d_a_e_wb | 23.058129% | 20008 | 86772 -d_a_e_warpappear | 28.864569% | 4220 | 14620 -d_a_e_st_line | 60.459770% | 1052 | 1740 -d_a_e_sw | 21.949266% | 9864 | 44940 -d_a_e_oct_bg | 30.217151% | 6568 | 21736 -d_a_e_hb | 27.624471% | 7568 | 27396 -d_a_e_mk | 25.747187% | 11716 | 45504 -d_a_e_pz | 27.469575% | 13904 | 50616 -d_a_e_sm2 | 30.097087% | 8184 | 27192 -d_a_e_md | 34.917814% | 3144 | 9004 -d_a_e_th_ball | 29.462631% | 5724 | 19428 -d_a_e_zs | 31.358336% | 3980 | 12692 -d_a_e_pm | 21.505129% | 11236 | 52248 -d_a_obj_lv7PropellerY | 41.738506% | 2324 | 5568 -d_a_obj_swspinner | 39.141631% | 1824 | 4660 -d_a_obj_lv2candle | 100.000000% | 6960 | 6960 -d_a_obj_boumato | 40.192484% | 3508 | 8728 -d_a_obj_kbox | 35.736196% | 3728 | 10432 -d_a_obj_zcloth | 52.373418% | 1324 | 2528 -d_a_obj_lv5IceWall | 39.937435% | 3064 | 7672 -d_a_obj_gra_rock | 37.947123% | 2928 | 7716 -d_a_obj_fireWood2 | 41.290323% | 2304 | 5580 -d_a_obj_crope | 26.014689% | 2692 | 10348 -d_a_obj_wdStick | 32.908234% | 4748 | 14428 -d_a_obj_lv6FurikoTrap | 45.967742% | 2736 | 5952 -d_a_obj_lbox | 47.423510% | 2356 | 4968 -d_a_obj_lv1Candle01 | 44.344569% | 2368 | 5340 -d_a_obj_riverrock | 37.311178% | 2964 | 7944 -d_a_obj_volcbom | 32.897713% | 5236 | 15916 -d_a_obj_lv6SwGate | 40.186916% | 3784 | 9416 -d_a_obj_kwheel00 | 40.352811% | 2928 | 7256 -d_a_obj_lv4RailWall | 41.496973% | 3016 | 7268 -d_a_obj_hbombkoya | 47.549020% | 3104 | 6528 -d_a_obj_oiltubo | 40.168244% | 3056 | 7608 -d_a_obj_tombo | 33.688640% | 4804 | 14260 -d_a_obj_goGate | 48.046181% | 2164 | 4504 -d_a_obj_kag | 32.055503% | 5452 | 17008 -d_a_obj_treesh | 48.098664% | 1872 | 3892 -d_a_obj_warp_kbrg | 34.066524% | 5080 | 14912 -d_a_obj_kago | 31.956798% | 4024 | 12592 -d_a_obj_mato | 37.093023% | 2552 | 6880 -d_a_obj_groundwater | 40.823478% | 3728 | 9132 -d_a_obj_lv4CandleTag | 50.114416% | 1752 | 3496 -d_a_obj_keyhole | 33.394883% | 5064 | 15164 -d_a_obj_digsnow | 44.813278% | 2160 | 4820 -d_a_obj_lv4gear | 42.242704% | 1100 | 2604 -d_a_obj_ganonwall | 38.930481% | 1456 | 3740 -d_a_obj_tmoon | 48.478702% | 956 | 1972 -d_a_obj_cho | 33.555219% | 4436 | 13220 -d_a_obj_rcircle | 43.989432% | 1332 | 3028 -d_a_obj_ihasi | 43.372216% | 1636 | 3772 -d_a_obj_kbacket | 33.053127% | 3932 | 11896 -d_a_obj_kage | 50.520833% | 1164 | 2304 -d_a_obj_brakeeff | 45.417515% | 1784 | 3928 -d_a_obj_lv4HsTarget | 58.333333% | 1428 | 2448 -d_a_obj_nagaisu | 37.130271% | 2360 | 6356 -d_a_obj_bsGate | 48.010850% | 2124 | 4424 -d_a_obj_lv4EdShutter | 45.846154% | 2384 | 5200 -d_a_obj_stick | 43.708609% | 2376 | 5436 -d_a_obj_iceleaf | 37.604212% | 3428 | 9116 -d_a_obj_web1 | 42.480942% | 2452 | 5772 -d_a_obj_bubblePilar | 44.760583% | 2580 | 5764 -d_a_obj_swhang | 38.446450% | 3920 | 10196 -d_a_obj_lv3Water2 | 41.786571% | 2788 | 6672 -d_a_obj_ten | 30.064631% | 5396 | 17948 -d_a_obj_gptaru | 100.000000% | 14020 | 14020 -d_a_obj_shield | 34.160959% | 3192 | 9344 -d_a_obj_twGate | 57.395498% | 2856 | 4976 -d_a_obj_togeTrap | 41.746183% | 3500 | 8384 -d_a_obj_magne_arm | 34.395028% | 7084 | 20596 -d_a_obj_lv3saka00 | 50.576369% | 1404 | 2776 -d_a_obj_poCandle | 44.244604% | 2460 | 5560 -d_a_obj_zdoor | 45.037688% | 2868 | 6368 -d_a_obj_pdwall | 40.192308% | 1672 | 4160 -d_a_obj_tgake | 49.302326% | 1272 | 2580 -d_a_obj_lv5FloorBoard | 47.577093% | 2592 | 5448 -d_a_obj_automata | 40.573951% | 3676 | 9060 -d_a_obj_lv4bridge | 47.146866% | 2016 | 4276 -d_a_obj_bombf | 46.875000% | 1020 | 2176 -d_a_obj_usaku | 55.081301% | 1084 | 1968 -d_a_obj_zra_freeze | 37.662338% | 1624 | 4312 -d_a_obj_rw | 41.210834% | 3104 | 7532 -d_a_obj_smoke | 51.322751% | 776 | 1512 -d_a_obj_kaisou | 41.645729% | 2652 | 6368 -d_a_obj_cwall | 30.455195% | 5968 | 19596 -d_a_obj_lv6bemos2 | 32.122093% | 7072 | 22016 -d_a_obj_tornado | 36.577869% | 1428 | 3904 -d_a_obj_ktonfire | 100.000000% | 4404 | 4404 -d_a_obj_gb | 41.063644% | 1884 | 4588 -d_a_obj_nameplate | 39.726962% | 2328 | 5860 -d_a_obj_octhashi | 35.325420% | 3452 | 9772 -d_a_obj_crvgate | 27.603513% | 4400 | 15940 -d_a_obj_fallobj | 31.929604% | 2032 | 6364 -d_a_obj_waterPillar | 37.877429% | 5068 | 13380 -d_a_obj_lv3WaterB | 46.278317% | 1716 | 3708 -d_a_obj_lv3Candle | 45.638126% | 2260 | 4952 -d_a_obj_snowEffTag | 46.419098% | 1400 | 3016 -d_a_obj_window | 42.655602% | 2056 | 4820 -d_a_obj_klift00 | 37.650457% | 3128 | 8308 -d_a_obj_swLight | 40.346767% | 3444 | 8536 -d_a_obj_burnbox | 45.251397% | 1620 | 3580 -d_a_obj_smallkey | 31.464798% | 3772 | 11988 -d_a_obj_lv5ychndlr | 40.267765% | 3128 | 7768 -d_a_obj_testcube | 100.000000% | 504 | 504 -d_a_obj_takaraDai | 46.376812% | 2304 | 4968 -d_a_obj_drop | 30.227416% | 3828 | 12664 -d_a_obj_rotBridge | 43.430152% | 2512 | 5784 -d_a_obj_picture | 35.041841% | 4020 | 11472 -d_a_obj_pleaf | 44.689221% | 2272 | 5084 -d_a_obj_stone | 26.135237% | 5272 | 20172 -d_a_obj_sekizo | 53.625171% | 1568 | 2924 -d_a_obj_bbox | 48.606466% | 1744 | 3588 -d_a_obj_lv4PoGate | 44.906743% | 2504 | 5576 -d_a_obj_sm_door | 39.302885% | 2616 | 6656 -d_a_obj_gra2 | 24.809250% | 21200 | 85452 -d_a_obj_lv4floor | 49.786020% | 1396 | 2804 -d_a_obj_TvCdlst | 43.547170% | 2308 | 5300 -d_a_obj_ladder | 42.348485% | 2236 | 5280 -d_a_obj_mie | 34.891676% | 3672 | 10524 -d_a_obj_chandelier | 36.773256% | 2024 | 5504 -d_a_obj_lv4digsand | 43.888433% | 2140 | 4876 -d_a_obj_swturn | 31.295716% | 2396 | 7656 -d_a_obj_mgate | 47.398844% | 1968 | 4152 -d_a_obj_wflag | 41.214286% | 2308 | 5600 -d_a_obj_lv7BsGate | 48.080279% | 2204 | 4584 -d_a_obj_crvfence | 37.146893% | 3156 | 8496 -d_a_obj_batta | 31.886560% | 5172 | 16220 -d_a_obj_poTbox | 44.731739% | 2768 | 6188 -d_a_obj_hata | 39.059081% | 1428 | 3656 -d_a_obj_ystone | 42.824944% | 2280 | 5324 -d_a_obj_rotTrap | 45.877144% | 3316 | 7228 -d_a_obj_Lv5Key | 37.172105% | 2324 | 6252 -d_a_obj_swBallC | 41.458222% | 3116 | 7516 -d_a_obj_wind_stone | 37.702265% | 1864 | 4944 -d_a_obj_sekizoa | 32.789446% | 15112 | 46088 -d_a_obj_carry | 29.827071% | 18352 | 61528 -d_a_obj_lv4chandelier | 26.284971% | 4848 | 18444 -d_a_obj_chest | 39.833795% | 2876 | 7220 -d_a_obj_lv6SzGate | 45.147151% | 2884 | 6388 -d_a_obj_laundry_rope | 34.459867% | 2284 | 6628 -d_a_obj_avalanche | 41.881443% | 2600 | 6208 -d_a_obj_brg | 22.881356% | 6696 | 29264 -d_a_obj_tp | 35.262726% | 3436 | 9744 -d_a_obj_master_sword | 43.575419% | 2808 | 6444 -d_a_obj_knBullet | 43.076923% | 1568 | 3640 -d_a_obj_pdoor | 37.254902% | 1900 | 5100 -d_a_obj_graWall | 55.725191% | 1168 | 2096 -d_a_obj_swallshutter | 100.000000% | 5864 | 5864 -d_a_obj_rope_bridge | 36.903633% | 4672 | 12660 -d_a_obj_szbridge | 43.280632% | 1752 | 4048 -d_a_obj_swBallB | 34.276891% | 2664 | 7772 -d_a_obj_tobyhouse | 34.586466% | 3864 | 11172 -d_a_obj_poFire | 36.999540% | 3216 | 8692 -d_a_obj_swpush5 | 39.210384% | 2900 | 7396 -d_a_obj_kamakiri | 30.171107% | 5572 | 18468 -d_a_obj_waterfall | 34.033613% | 2268 | 6664 -d_a_obj_iceblock | 32.744340% | 4744 | 14488 -d_a_obj_maki | 45.531587% | 2364 | 5192 -d_a_obj_timer | 46.691176% | 1016 | 2176 -d_a_obj_heavySw | 41.214623% | 2796 | 6784 -d_a_obj_amiShutter | 42.478422% | 2756 | 6488 -d_a_obj_crystal | 44.482173% | 1048 | 2356 -d_a_obj_catdoor | 46.041413% | 1512 | 3284 -d_a_obj_ita | 42.717855% | 2804 | 6564 -d_a_obj_enemy_create | 36.916549% | 1044 | 2828 -d_a_obj_lv6Tenbin | 40.000000% | 2848 | 7120 -d_a_obj_flag3 | 33.292929% | 3296 | 9900 -d_a_obj_toaru_maki | 46.596067% | 1232 | 2644 -d_a_obj_kantera | 37.623762% | 2432 | 6464 -d_a_obj_lv6egate | 42.456719% | 2060 | 4852 -d_a_obj_metalbox | 50.268097% | 1500 | 2984 -d_a_obj_kwheel01 | 41.610233% | 2212 | 5316 -d_a_obj_bk_leaf | 41.935484% | 1144 | 2728 -d_a_obj_dust | 40.406977% | 2224 | 5504 -d_a_obj_hb | 29.310936% | 3420 | 11668 -d_a_obj_lv9SwShutter | 48.128342% | 2160 | 4488 -d_a_obj_stopper | 31.675996% | 3848 | 12148 -d_a_obj_kita | 40.112090% | 2004 | 4996 -d_a_obj_kjgjs | 52.250804% | 1300 | 2488 -d_a_obj_lv4Gate | 48.863636% | 2064 | 4224 -d_a_obj_hfuta | 39.073970% | 2768 | 7084 -d_a_obj_movebox | 36.691330% | 7736 | 21084 -d_a_obj_flag | 37.518248% | 2056 | 5480 -d_a_obj_ganonwall2 | 41.938675% | 1696 | 4044 -d_a_obj_lv8KekkaiTrap | 49.367089% | 2028 | 4108 -d_a_obj_crvlh_down | 42.363776% | 2208 | 5212 -d_a_obj_crvhahen | 37.120623% | 1908 | 5140 -d_a_obj_pumpkin | 29.152971% | 4612 | 15820 -d_a_obj_magLiftRot | 40.697674% | 3080 | 7568 -d_a_obj_lv5SwIce | 46.408046% | 2584 | 5568 -d_a_obj_eff | 73.504274% | 688 | 936 -d_a_obj_cowdoor | 56.672761% | 1240 | 2188 -d_a_obj_lv4SlideWall | 48.954373% | 2060 | 4208 -d_a_obj_tks | 34.669261% | 7128 | 20560 -d_a_obj_bkdoor | 45.847554% | 1612 | 3516 -d_a_obj_lv6TogeRoll | 35.933806% | 4256 | 11844 -d_a_obj_tornado2 | 30.997110% | 1716 | 5536 -d_a_obj_lv3Water | 44.263566% | 4568 | 10320 -d_a_obj_well_cover | 45.704467% | 1596 | 3492 -d_a_obj_ice_s | 35.446009% | 2416 | 6816 -d_a_obj_gomikabe | 37.032799% | 3884 | 10488 -d_a_obj_dan | 35.198921% | 4176 | 11864 -d_a_obj_food | 36.994728% | 3368 | 9104 -d_a_obj_wood_statue | 36.601579% | 3524 | 9628 -d_a_obj_kanban2 | 30.775877% | 7124 | 23148 -d_a_obj_barDesk | 49.477072% | 2460 | 4972 -d_a_obj_gadget | 34.371565% | 3752 | 10916 -d_a_obj_wood_pendulum | 44.455748% | 1748 | 3932 -d_a_obj_flag2 | 46.370840% | 5852 | 12620 -d_a_obj_inobone | 42.361111% | 1952 | 4608 -d_a_obj_lv8OptiLift | 35.768374% | 3212 | 8980 -d_a_obj_nougu | 42.325581% | 2548 | 6020 -d_a_obj_mhole | 35.548173% | 2140 | 6020 -d_a_obj_dmelevator | 35.600390% | 4376 | 12292 -d_a_obj_udoor | 49.156627% | 1632 | 3320 -d_a_obj_swpropeller | 39.765679% | 2308 | 5804 -d_a_obj_bhbridge | 39.936609% | 2016 | 5048 -d_a_obj_kiPot | 53.782895% | 1308 | 2432 -d_a_obj_sekidoor | 43.834383% | 1948 | 4444 -d_a_obj_spinLift | 41.107692% | 2672 | 6500 -d_a_obj_lv1Candle00 | 41.348158% | 2380 | 5756 -d_a_obj_magLift | 41.319181% | 2180 | 5276 -d_a_obj_lv6bemos | 42.081031% | 3656 | 8688 -d_a_obj_ss_item | 38.313378% | 2944 | 7684 -d_a_obj_swBallA | 35.803945% | 2396 | 6692 -d_a_obj_digholl | 42.781690% | 972 | 2272 -d_a_obj_hakai_brl | 40.491284% | 2044 | 5048 -d_a_obj_swpush2 | 34.150019% | 3624 | 10612 -d_a_obj_stonemark | 100.000000% | 2040 | 2040 -d_a_obj_wsword | 48.936170% | 1380 | 2820 -d_a_obj_grave_stone | 42.700730% | 2340 | 5480 -d_a_obj_onsenTaru | 38.567616% | 3468 | 8992 -d_a_obj_fchain | 30.649490% | 2284 | 7452 -d_a_obj_hhashi | 33.138856% | 3408 | 10284 -d_a_obj_h_saku | 37.610063% | 2392 | 6360 -d_a_obj_lv4CandleDemoTag | 46.972860% | 1800 | 3832 -d_a_obj_lv6swturn | 36.266259% | 1896 | 5228 -d_a_obj_tatigi | 40.549020% | 2068 | 5100 -d_a_obj_nan | 33.293811% | 5616 | 16868 -d_a_obj_myogan | 51.677852% | 1848 | 3576 -d_a_obj_rgate | 36.466069% | 5696 | 15620 -d_a_obj_pillar | 38.500852% | 3616 | 9392 -d_a_obj_lv6Lblock | 46.958175% | 1976 | 4208 -d_a_obj_toby | 32.460733% | 3720 | 11460 -d_a_obj_bed | 42.310889% | 2036 | 4812 -d_a_obj_timeFire | 43.483146% | 1548 | 3560 -d_a_obj_suisya | 49.914821% | 1172 | 2348 -d_a_obj_lv3waterEff | 48.122066% | 820 | 1704 -d_a_obj_cblock | 42.294713% | 3008 | 7112 -d_a_obj_glowSphere | 38.917749% | 3596 | 9240 -d_a_obj_lv6TogeTrap | 34.484536% | 5352 | 15520 -d_a_obj_sw | 27.590884% | 4068 | 14744 -d_a_obj_web0 | 44.054441% | 2460 | 5584 -d_a_obj_kazeneko | 45.277127% | 2320 | 5124 -d_a_obj_ornament_cloth | 38.734568% | 2008 | 5184 -d_a_obj_snow_soup | 37.025948% | 1484 | 4008 -d_a_obj_Y_taihou | 37.379068% | 3400 | 9096 -d_a_obj_scannon | 35.209799% | 5404 | 15348 -d_a_obj_ari | 31.622322% | 5372 | 16988 -d_a_obj_scannon_ten | 37.738049% | 3884 | 10292 -d_a_obj_onsen | 49.239281% | 1424 | 2892 -d_a_obj_bemos | 32.943081% | 10580 | 32116 -d_a_obj_hakai_ftr | 42.324888% | 2272 | 5368 -d_a_obj_hsTarget | 57.317073% | 1504 | 2624 -d_a_obj_table | 45.544554% | 1656 | 3636 -d_a_obj_balloon | 42.722710% | 2724 | 6376 -d_a_obj_taFence | 41.279360% | 3304 | 8004 -d_a_obj_ki | 41.573034% | 2220 | 5340 -d_a_obj_damCps | 100.000000% | 504 | 504 -d_a_obj_ndoor | 51.957831% | 1380 | 2656 -d_a_obj_ice_l | 34.815373% | 1848 | 5308 -d_a_obj_rstair | 37.354086% | 2688 | 7196 -d_a_obj_kshutter | 35.690936% | 4804 | 13460 -d_a_obj_zra_rock | 45.394112% | 1912 | 4212 -d_a_obj_scannon_crs | 35.204678% | 3612 | 10260 -d_a_obj_sakuita | 43.573382% | 1912 | 4388 -d_a_obj_stairBlock | 45.129643% | 2576 | 5708 -d_a_obj_lv4prelvtr | 48.664688% | 1312 | 2696 -d_a_obj_swchain | 24.473297% | 3996 | 16328 -d_a_obj_warp_obrg | 34.784076% | 4124 | 11856 -d_a_obj_stopper2 | 38.987342% | 1848 | 4740 -d_a_obj_cdoor | 40.255786% | 2644 | 6568 -d_a_obj_fireWood | 44.125561% | 1968 | 4460 -d_a_obj_geyser | 29.678068% | 3540 | 11928 -d_a_obj_sakuita_rope | 30.817009% | 2580 | 8372 -d_a_obj_saidan | 50.210970% | 1904 | 3792 -d_a_obj_lv6ChangeGate | 41.732283% | 3816 | 9144 -d_a_obj_yobikusa | 39.095993% | 3356 | 8584 -d_a_obj_crvsteel | 48.717949% | 1520 | 3120 -d_a_obj_ito | 30.588925% | 4176 | 13652 -d_a_obj_firepillar | 43.032015% | 1828 | 4248 -d_a_obj_bhashi | 31.443815% | 3772 | 11996 -d_a_obj_katatsumuri | 31.170697% | 5208 | 16708 -d_a_obj_mvstair | 35.209479% | 3328 | 9452 -d_a_obj_smw_stone | 40.435606% | 1708 | 4224 -d_a_obj_key | 33.145009% | 3520 | 10620 -d_a_obj_roten | 41.613588% | 1568 | 3768 -d_a_obj_msima | 35.108959% | 3480 | 9912 -d_a_obj_ikada | 40.697674% | 1960 | 4816 -d_a_obj_Turara | 38.494412% | 4684 | 12168 -d_a_obj_lv7bridge | 39.684569% | 3724 | 9384 -d_a_obj_kgate | 35.192216% | 5932 | 16856 -d_a_obj_digplace | 35.129068% | 1252 | 3564 -d_a_obj_crvlh_up | 42.485784% | 2092 | 4924 -d_a_obj_rfHole | 43.621701% | 2380 | 5456 -d_a_obj_sword | 45.479963% | 1952 | 4292 -d_a_obj_pdtile | 31.467607% | 2856 | 9076 -d_a_obj_smgdoor | 41.383095% | 3016 | 7288 -d_a_obj_syRock | 38.458961% | 4592 | 11940 -d_a_obj_ss_drink | 36.026542% | 3692 | 10248 -d_a_obj_lv5yiblltray | 33.403583% | 3804 | 11388 -d_a_obj_kabuto | 30.226537% | 5604 | 18540 -d_a_obj_zrTuraraRock | 46.299094% | 2452 | 5296 -d_a_obj_thdoor | 39.419319% | 2824 | 7164 -d_a_obj_cb | 43.008475% | 2436 | 5664 -d_a_obj_prop | 47.868217% | 988 | 2064 -d_a_obj_bmWindow | 38.757933% | 3420 | 8824 -d_a_obj_fmobj | 55.200000% | 1104 | 2000 -d_a_obj_zraMark | 34.016942% | 3052 | 8972 -d_a_obj_itamato | 38.072602% | 3524 | 9256 -d_a_obj_yel_bag | 33.773087% | 3584 | 10612 -d_a_obj_kkanban | 47.103514% | 1984 | 4212 -d_a_obj_fw | 43.368592% | 2132 | 4916 -d_a_obj_bosswarp | 39.728243% | 4912 | 12364 -d_a_obj_hasu2 | 41.190476% | 1384 | 3360 -d_a_obj_wchain | 31.823745% | 3120 | 9804 -d_a_obj_lv4prwall | 38.593750% | 1976 | 5120 -d_a_obj_waterGate | 47.279550% | 2016 | 4264 -d_a_obj_bmshutter | 41.338854% | 2396 | 5796 -d_a_obj_lv8Lift | 35.532359% | 3404 | 9580 -d_a_obj_lv6elevta | 39.452780% | 1788 | 4532 -d_a_obj_life_container | 34.456243% | 3764 | 10924 -d_a_obj_smtile | 35.912938% | 2376 | 6616 -d_a_obj_so | 31.698636% | 6412 | 20228 -d_a_obj_swpush | 31.657104% | 3752 | 11852 -d_a_obj_bky_rock | 35.592460% | 3172 | 8912 -d_a_obj_lp | 29.557762% | 2620 | 8864 -d_a_obj_vground | 44.817927% | 1280 | 2856 -d_a_obj_onsenFire | 61.419753% | 796 | 1296 -d_a_obj_thashi | 49.534161% | 3828 | 7728 -d_a_obj_kznkarm | 35.088583% | 2852 | 8128 -d_a_obj_gm | 35.212957% | 4696 | 13336 -d_a_obj_laundry | 39.077103% | 2676 | 6848 -d_a_obj_kuwagata | 30.226537% | 5604 | 18540 -d_a_obj_grz_rock | 45.558087% | 1600 | 3512 -d_a_obj_fan | 39.173554% | 2844 | 7260 -d_a_obj_zrTurara | 43.437672% | 3164 | 7284 -d_a_obj_lv4sand | 46.461825% | 1996 | 4296 -d_a_obj_rock | 40.423729% | 1908 | 4720 -d_a_obj_cboard | 57.703927% | 1528 | 2648 -d_a_obj_volcball | 34.010759% | 4552 | 13384 -d_a_obj_lv8UdFloor | 39.681529% | 2492 | 6280 -d_a_obj_yousei | 27.926623% | 4628 | 16572 -d_a_obj_firepillar2 | 32.320564% | 2936 | 9084 -d_a_obj_mirror_sand | 46.972860% | 1800 | 3832 -d_a_obj_mirror_6pole | 49.656751% | 1736 | 3496 -d_a_obj_mirror_screw | 40.374532% | 2156 | 5340 -d_a_obj_mirror_table | 38.664122% | 4052 | 10480 -d_a_obj_mirror_chain | 34.916201% | 3500 | 10024 -d_a_npc_midp | 37.189356% | 6764 | 18188 -d_a_npc_hoz | 40.521518% | 14048 | 34668 -d_a_npc_tkc | 32.075472% | 7820 | 24380 -d_a_npc_ykw | 33.875000% | 18428 | 54400 -d_a_npc_myna2 | 33.448276% | 8924 | 26680 -d_a_npc_kdk | 100.000000% | 504 | 504 -d_a_npc_sq | 39.651108% | 3364 | 8484 -d_a_npc_doorboy | 35.898009% | 6420 | 17884 -d_a_npc_tr | 42.322991% | 2128 | 5028 -d_a_npc_yelia | 40.634175% | 13840 | 34060 -d_a_npc_blue_ns | 31.763122% | 7552 | 23776 -d_a_npc_seira | 38.908741% | 11324 | 29104 -d_a_npc_zant | 38.262795% | 6220 | 16256 -d_a_npc_kolinb | 41.382827% | 8116 | 19612 -d_a_npc_soldierB | 35.587267% | 6484 | 18220 -d_a_npc_doc | 38.160961% | 8516 | 22316 -d_a_npc_shop0 | 38.731379% | 3224 | 8324 -d_a_npc_pouya | 40.447529% | 11424 | 28244 -d_a_npc_tkj | 37.419769% | 6996 | 18696 -d_a_npc_coach | 28.195770% | 12052 | 42744 -d_a_npc_passer | 35.701424% | 8724 | 24436 -d_a_npc_p2 | 100.000000% | 632 | 632 -d_a_npc_theB | 34.129794% | 9256 | 27120 -d_a_npc_uri | 34.281392% | 13596 | 39660 -d_a_npc_the | 34.936999% | 9760 | 27936 -d_a_npc_pachi_taro | 42.126544% | 15420 | 36604 -d_a_npc_bouS | 32.586831% | 9720 | 29828 -d_a_npc_kkri | 38.042823% | 10092 | 26528 -d_a_npc_grc | 32.984636% | 8072 | 24472 -d_a_npc_besu | 38.726854% | 19492 | 50332 -d_a_npc_bou | 36.186814% | 12800 | 35372 -d_a_npc_yamis | 36.878425% | 7268 | 19708 -d_a_npc_zrc | 32.120762% | 10384 | 32328 -d_a_npc_bans | 34.954955% | 11640 | 33300 -d_a_npc_zrz | 31.977232% | 13708 | 42868 -d_a_npc_worm | 33.717579% | 2340 | 6940 -d_a_npc_shad | 27.050485% | 14960 | 55304 -d_a_npc_grd | 33.161068% | 7700 | 23220 -d_a_npc_shaman | 40.368229% | 10612 | 26288 -d_a_npc_grs | 33.634658% | 7888 | 23452 -d_a_npc_taro | 38.152632% | 28996 | 76000 -d_a_npc_grz | 31.010419% | 12620 | 40696 -d_a_npc_jagar | 33.736985% | 11924 | 35344 -d_a_npc_kasi_hana | 29.810206% | 10492 | 35196 -d_a_npc_ks | 24.232793% | 27448 | 113268 -d_a_npc_pachi_maro | 38.260301% | 9360 | 24464 -d_a_npc_fairy | 39.344262% | 19776 | 50264 -d_a_npc_kyury | 39.351296% | 9172 | 23308 -d_a_npc_fish | 79.939819% | 3188 | 3988 -d_a_npc_henna0 | 100.000000% | 504 | 504 -d_a_npc_passer2 | 37.528815% | 3256 | 8676 -d_a_npc_sola | 39.560155% | 6116 | 15460 -d_a_npc_yamid | 36.895778% | 7236 | 19612 -d_a_npc_mk | 100.000000% | 632 | 632 -d_a_npc_tk | 22.166176% | 12656 | 57096 -d_a_npc_inko | 32.502352% | 2764 | 8504 -d_a_npc_chat | 56.591640% | 32384 | 57224 -d_a_npc_zelda | 37.603569% | 7080 | 18828 -d_a_npc_grmc | 40.486016% | 7064 | 17448 -d_a_npc_len | 37.465709% | 11472 | 30620 -d_a_npc_kn | 34.989558% | 48252 | 137904 -d_a_npc_prayer | 36.469470% | 6140 | 16836 -d_a_npc_seic | 42.554557% | 5304 | 12464 -d_a_npc_moir | 28.712188% | 11656 | 40596 -d_a_npc_seid | 42.554557% | 5304 | 12464 -d_a_npc_maro | 36.380572% | 21872 | 60120 -d_a_npc_clerkb | 36.128920% | 8340 | 23084 -d_a_npc_kasi_mich | 33.749584% | 8108 | 24024 -d_a_npc_fguard | 42.375887% | 2868 | 6768 -d_a_npc_hanjo | 32.618297% | 14476 | 44380 -d_a_npc_yamit | 36.693548% | 7280 | 19840 -d_a_npc_seira2 | 39.278557% | 10192 | 25948 -d_a_npc_ykm | 32.908526% | 20348 | 61832 -d_a_npc_raca | 38.792102% | 8016 | 20664 -d_a_npc_post | 37.414676% | 10524 | 28128 -d_a_npc_saru | 39.289415% | 10616 | 27020 -d_a_npc_chin | 33.958357% | 11808 | 34772 -d_a_npc_fairy_seirei | 42.302956% | 5496 | 12992 -d_a_npc_lf | 39.566396% | 2336 | 5904 -d_a_npc_wrestler | 27.819607% | 28820 | 103596 -d_a_npc_gro | 33.290996% | 9436 | 28344 -d_a_npc_zelR | 37.762547% | 6832 | 18092 -d_a_npc_kasi_kyu | 33.587533% | 8104 | 24128 -d_a_npc_pachi_besu | 42.797557% | 11492 | 26852 -d_a_npc_shop_maro | 53.691275% | 2880 | 5364 -d_a_npc_soldierA | 34.996894% | 6760 | 19316 -d_a_npc_tks | 27.123246% | 14384 | 53032 -d_a_npc_kolin | 35.754689% | 14412 | 40308 -d_a_npc_moi | 34.114704% | 14728 | 43172 -d_a_npc_tkj2 | 28.985507% | 5520 | 19044 -d_a_npc_ne | 24.204919% | 12360 | 51064 -d_a_npc_gnd | 36.965399% | 6880 | 18612 -d_a_npc_impal | 32.590326% | 8948 | 27456 -d_a_npc_shoe | 36.629002% | 6224 | 16992 -d_a_npc_rafrel | 29.654182% | 10736 | 36204 -d_a_npc_ashB | 32.906995% | 8336 | 25332 -d_a_npc_knj | 41.627219% | 5628 | 13520 -d_a_npc_du | 35.940410% | 3860 | 10740 -d_a_npc_clerka | 36.659479% | 7480 | 20404 -d_a_npc_henna | 27.446434% | 11836 | 43124 -d_a_npc_ash | 31.737680% | 9892 | 31168 -d_a_npc_ins | 30.852199% | 10412 | 33748 -d_a_npc_aru | 34.812103% | 12932 | 37148 -d_a_npc_grm | 38.118162% | 6968 | 18280 -d_a_npc_df | 35.418672% | 2944 | 8312 -d_a_npc_toby | 35.857461% | 14168 | 39512 -d_a_npc_clerkt | 36.386139% | 7056 | 19392 -d_a_npc_drainSol | 38.587732% | 4328 | 11216 -d_a_npc_cdn3 | 34.686491% | 14184 | 40892 -d_a_npc_grr | 33.284338% | 8152 | 24492 -d_a_npc_zanb | 37.827310% | 6992 | 18484 -d_a_npc_seib | 42.233442% | 5688 | 13468 -d_a_npc_seirei | 39.691517% | 6176 | 15560 -d_a_npc_lud | 38.010021% | 12744 | 33528 -d_a_npc_zelRo | 37.784656% | 6836 | 18092 -d_a_npc_kakashi | 39.139523% | 8988 | 22964 -d_a_npc_zra | 24.569698% | 26608 | 108296 -d_a_npc_gwolf | 35.693780% | 11936 | 33440 -d_a_npc_gra | 30.387241% | 20120 | 66212 -d_a_npc_guard | 35.071398% | 6484 | 18488 -d_a_kytag17 | 86.170213% | 648 | 752 +d_a_tag_evtarea | 37.091319% | 1316 | 3548 +d_a_tag_Lv8Gate | 43.347193% | 1668 | 3848 +d_a_tag_ret_room | 49.168646% | 828 | 1684 +d_a_tag_waterfall | 46.361502% | 1580 | 3408 +d_a_tag_gstart | 57.615894% | 696 | 1208 +d_a_tag_mstop | 36.151961% | 1180 | 3264 +d_a_tag_escape | 100.000000% | 712 | 712 +d_a_tag_setrestart | 49.130435% | 904 | 1840 +d_a_tag_river_back | 45.725916% | 1348 | 2948 +d_a_tag_qs | 34.804270% | 1956 | 5620 +d_a_tag_event | 31.075697% | 1248 | 4016 +d_a_tag_gra | 76.000000% | 608 | 800 +d_a_tag_ss_drink | 36.483740% | 1436 | 3936 +d_a_tag_allmato | 30.234070% | 3720 | 12304 +d_a_tag_bottle_item | 38.554217% | 1024 | 2656 +d_a_tag_push | 41.000000% | 1148 | 2800 +d_a_tag_stream | 49.729730% | 736 | 1480 +d_a_tag_magne | 66.810345% | 620 | 928 +d_a_tag_spinner | 45.850622% | 884 | 1928 +d_a_tag_schedule | 82.022472% | 584 | 712 +d_a_tag_setBall | 100.000000% | 880 | 880 +d_a_tag_kmsg | 32.037997% | 1484 | 4632 +d_a_tag_myna_light | 36.747759% | 1148 | 3124 +d_a_tag_howl | 46.934461% | 888 | 1892 +d_a_tag_chkpoint | 39.852399% | 864 | 2168 +d_a_tag_firewall | 35.325132% | 1608 | 4552 +d_a_tag_lv6CstaSw | 51.406250% | 1316 | 2560 +d_a_tag_instruction | 82.022472% | 584 | 712 +d_a_tag_mwait | 35.082873% | 1016 | 2896 +d_a_tag_ajnot | 56.493506% | 696 | 1232 +d_a_tag_hstop | 46.962617% | 1608 | 3424 +d_a_tag_chgrestart | 48.868778% | 864 | 1768 +d_a_tag_cstasw | 100.000000% | 2560 | 2560 +d_a_tag_lv5soup | 100.000000% | 1908 | 1908 +d_a_tag_lantern | 52.013423% | 1240 | 2384 +d_a_tag_guard | 54.421769% | 640 | 1176 +d_a_tag_assistance | 76.699029% | 632 | 824 +d_a_tag_mist | 43.436293% | 900 | 2072 +d_a_tag_wara_howl | 51.549296% | 732 | 1420 +d_a_tag_hjump | 40.841584% | 1320 | 3232 +d_a_door_dbdoor00 | 40.734908% | 3104 | 7620 +d_a_door_spiral | 100.000000% | 504 | 504 +d_a_door_push | 37.997725% | 2672 | 7032 +d_a_door_shutter | 37.465797% | 14240 | 38008 +d_a_door_bossL5 | 39.221790% | 4032 | 10280 +d_a_door_mbossL1 | 34.467633% | 10372 | 30092 +d_a_door_bossl1 | 100.000000% | 18732 | 18732 +d_a_door_knob00 | 37.500000% | 4608 | 12288 +d_a_door_boss | 40.856890% | 3700 | 9056 +d_a_kytag10 | 31.720430% | 944 | 2976 d_a_kytag12 | 20.217129% | 3352 | 16580 -d_a_kytag14 | 60.227273% | 848 | 1408 -d_a_kytag01 | 35.156250% | 1260 | 3584 -d_a_kytag05 | 100.000000% | 816 | 816 -d_a_kytag06 | 31.287129% | 4424 | 14140 +d_a_kytag16 | 47.212544% | 1084 | 2296 +d_a_kytag17 | 86.170213% | 648 | 752 +d_a_kytag09 | 49.936948% | 1584 | 3172 +d_a_kytag07 | 60.062893% | 764 | 1272 d_a_kytag04 | 36.357481% | 2148 | 5908 +d_a_kytag01 | 35.156250% | 1260 | 3584 +d_a_kytag08 | 31.379026% | 1520 | 4844 d_a_kytag00 | 33.522084% | 2368 | 7064 d_a_kytag02 | 54.888889% | 988 | 1800 -d_a_kytag07 | 60.062893% | 764 | 1272 -d_a_kytag16 | 47.212544% | 1084 | 2296 +d_a_kytag14 | 60.227273% | 848 | 1408 d_a_kytag11 | 52.643172% | 956 | 1816 -d_a_kytag09 | 49.936948% | 1584 | 3172 +d_a_kytag05 | 100.000000% | 816 | 816 d_a_kytag13 | 30.696576% | 2080 | 6776 -d_a_kytag15 | 49.443561% | 1244 | 2516 -d_a_kytag10 | 31.720430% | 944 | 2976 d_a_kytag03 | 23.399898% | 1828 | 7812 -d_a_kytag08 | 31.379026% | 1520 | 4844 -d_a_b_dr | 27.536664% | 18476 | 67096 +d_a_kytag15 | 49.443561% | 1244 | 2516 +d_a_kytag06 | 31.287129% | 4424 | 14140 +d_a_obj_lv4floor | 49.786020% | 1396 | 2804 +d_a_obj_scannon_ten | 37.738049% | 3884 | 10292 +d_a_obj_crvhahen | 37.120623% | 1908 | 5140 +d_a_obj_lv4HsTarget | 58.333333% | 1428 | 2448 +d_a_obj_kiPot | 53.782895% | 1308 | 2432 +d_a_obj_fireWood2 | 41.290323% | 2304 | 5580 +d_a_obj_lv4bridge | 47.146866% | 2016 | 4276 +d_a_obj_suisya | 49.914821% | 1172 | 2348 +d_a_obj_tatigi | 40.549020% | 2068 | 5100 +d_a_obj_volcbom | 32.897713% | 5236 | 15916 +d_a_obj_gra2 | 24.809250% | 21200 | 85452 +d_a_obj_yousei | 27.926623% | 4628 | 16572 +d_a_obj_laundry_rope | 34.459867% | 2284 | 6628 +d_a_obj_oiltubo | 40.168244% | 3056 | 7608 +d_a_obj_scannon | 35.209799% | 5404 | 15348 +d_a_obj_barDesk | 49.477072% | 2460 | 4972 +d_a_obj_yobikusa | 39.095993% | 3356 | 8584 +d_a_obj_Y_taihou | 37.379068% | 3400 | 9096 +d_a_obj_hbombkoya | 47.549020% | 3104 | 6528 +d_a_obj_keyhole | 33.394883% | 5064 | 15164 +d_a_obj_ki | 41.573034% | 2220 | 5340 +d_a_obj_lv6swturn | 36.266259% | 1896 | 5228 +d_a_obj_twGate | 57.395498% | 2856 | 4976 +d_a_obj_bsGate | 48.010850% | 2124 | 4424 +d_a_obj_zra_freeze | 37.662338% | 1624 | 4312 +d_a_obj_waterfall | 34.033613% | 2268 | 6664 +d_a_obj_kita | 40.112090% | 2004 | 4996 +d_a_obj_nan | 33.293811% | 5616 | 16868 +d_a_obj_testcube | 100.000000% | 504 | 504 +d_a_obj_batta | 31.886560% | 5172 | 16220 +d_a_obj_udoor | 49.156627% | 1632 | 3320 +d_a_obj_damCps | 100.000000% | 504 | 504 +d_a_obj_tobyhouse | 34.586466% | 3864 | 11172 +d_a_obj_enemy_create | 36.916549% | 1044 | 2828 +d_a_obj_magne_arm | 34.395028% | 7084 | 20596 +d_a_obj_TvCdlst | 43.547170% | 2308 | 5300 +d_a_obj_lv8OptiLift | 35.768374% | 3212 | 8980 +d_a_obj_avalanche | 41.881443% | 2600 | 6208 +d_a_obj_glowSphere | 38.917749% | 3596 | 9240 +d_a_obj_lv4CandleDemoTag | 46.972860% | 1800 | 3832 +d_a_obj_pillar | 38.500852% | 3616 | 9392 +d_a_obj_fchain | 30.649490% | 2284 | 7452 +d_a_obj_Turara | 38.494412% | 4684 | 12168 +d_a_obj_tgake | 49.302326% | 1272 | 2580 +d_a_obj_crvlh_up | 42.485784% | 2092 | 4924 +d_a_obj_lv7PropellerY | 41.738506% | 2324 | 5568 +d_a_obj_digholl | 42.781690% | 972 | 2272 +d_a_obj_swpush2 | 34.150019% | 3624 | 10612 +d_a_obj_warp_obrg | 34.784076% | 4124 | 11856 +d_a_obj_zrTuraraRock | 46.299094% | 2452 | 5296 +d_a_obj_scannon_crs | 35.204678% | 3612 | 10260 +d_a_obj_boumato | 40.192484% | 3508 | 8728 +d_a_obj_lv6FurikoTrap | 45.967742% | 2736 | 5952 +d_a_obj_fireWood | 44.125561% | 1968 | 4460 +d_a_obj_wdStick | 32.908234% | 4748 | 14428 +d_a_obj_lv4PoGate | 44.906743% | 2504 | 5576 +d_a_obj_rotBridge | 43.430152% | 2512 | 5784 +d_a_obj_bmWindow | 38.757933% | 3420 | 8824 +d_a_obj_smtile | 35.912938% | 2376 | 6616 +d_a_obj_sm_door | 39.302885% | 2616 | 6656 +d_a_obj_lv6bemos | 42.081031% | 3656 | 8688 +d_a_obj_lv3WaterB | 46.278317% | 1716 | 3708 +d_a_obj_swhang | 38.446450% | 3920 | 10196 +d_a_obj_kjgjs | 52.250804% | 1300 | 2488 +d_a_obj_drop | 30.227416% | 3828 | 12664 +d_a_obj_chandelier | 36.773256% | 2024 | 5504 +d_a_obj_lv7BsGate | 48.080279% | 2204 | 4584 +d_a_obj_volcball | 34.010759% | 4552 | 13384 +d_a_obj_heavySw | 41.214623% | 2796 | 6784 +d_a_obj_ikada | 40.697674% | 1960 | 4816 +d_a_obj_cho | 33.555219% | 4436 | 13220 +d_a_obj_hakai_ftr | 42.324888% | 2272 | 5368 +d_a_obj_stairBlock | 45.129643% | 2576 | 5708 +d_a_obj_brg | 22.881356% | 6696 | 29264 +d_a_obj_lv8UdFloor | 39.681529% | 2492 | 6280 +d_a_obj_zra_rock | 45.394112% | 1912 | 4212 +d_a_obj_kago | 31.956798% | 4024 | 12592 +d_a_obj_ice_s | 35.446009% | 2416 | 6816 +d_a_obj_klift00 | 37.650457% | 3128 | 8308 +d_a_obj_sakuita | 43.573382% | 1912 | 4388 +d_a_obj_ystone | 42.824944% | 2280 | 5324 +d_a_obj_bk_leaf | 41.935484% | 1144 | 2728 +d_a_obj_flag2 | 46.370840% | 5852 | 12620 +d_a_obj_flag3 | 33.292929% | 3296 | 9900 +d_a_obj_waterGate | 47.279550% | 2016 | 4264 +d_a_obj_lv1Candle01 | 44.344569% | 2368 | 5340 +d_a_obj_bosswarp | 39.728243% | 4912 | 12364 +d_a_obj_poCandle | 44.244604% | 2460 | 5560 +d_a_obj_vground | 44.817927% | 1280 | 2856 +d_a_obj_grave_stone | 42.700730% | 2340 | 5480 +d_a_obj_lv6elevta | 39.452780% | 1788 | 4532 +d_a_obj_bky_rock | 35.592460% | 3172 | 8912 +d_a_obj_burnbox | 45.251397% | 1620 | 3580 +d_a_obj_table | 45.544554% | 1656 | 3636 +d_a_obj_gm | 35.212957% | 4696 | 13336 +d_a_obj_szbridge | 43.280632% | 1752 | 4048 +d_a_obj_lv3Water | 44.263566% | 4568 | 10320 +d_a_obj_lv1Candle00 | 41.348158% | 2380 | 5756 +d_a_obj_ktonfire | 100.000000% | 4404 | 4404 +d_a_obj_sw | 27.590884% | 4068 | 14744 +d_a_obj_lv6bemos2 | 32.122093% | 7072 | 22016 +d_a_obj_kazeneko | 45.277127% | 2320 | 5124 +d_a_obj_fw | 43.368592% | 2132 | 4916 +d_a_obj_kamakiri | 30.171107% | 5572 | 18468 +d_a_obj_lv5SwIce | 46.408046% | 2584 | 5568 +d_a_obj_lv4digsand | 43.888433% | 2140 | 4876 +d_a_obj_kuwagata | 30.226537% | 5604 | 18540 +d_a_obj_food | 36.994728% | 3368 | 9104 +d_a_obj_hata | 39.059081% | 1428 | 3656 +d_a_obj_pleaf | 44.689221% | 2272 | 5084 +d_a_obj_dust | 40.406977% | 2224 | 5504 +d_a_obj_firepillar | 43.032015% | 1828 | 4248 +d_a_obj_brakeeff | 45.417515% | 1784 | 3928 +d_a_obj_lv9SwShutter | 48.128342% | 2160 | 4488 +d_a_obj_lv6SwGate | 40.186916% | 3784 | 9416 +d_a_obj_kwheel00 | 40.352811% | 2928 | 7256 +d_a_obj_crystal | 44.482173% | 1048 | 2356 +d_a_obj_hb | 29.310936% | 3420 | 11668 +d_a_obj_swchain | 24.473297% | 3996 | 16328 +d_a_obj_sword | 45.479963% | 1952 | 4292 +d_a_obj_shield | 34.160959% | 3192 | 9344 +d_a_obj_tmoon | 48.478702% | 956 | 1972 +d_a_obj_lv7bridge | 39.684569% | 3724 | 9384 +d_a_obj_lbox | 47.423510% | 2356 | 4968 +d_a_obj_lv6ChangeGate | 41.732283% | 3816 | 9144 +d_a_obj_sekidoor | 43.834383% | 1948 | 4444 +d_a_obj_pumpkin | 29.152971% | 4612 | 15820 +d_a_obj_bhashi | 31.443815% | 3772 | 11996 +d_a_obj_hhashi | 33.138856% | 3408 | 10284 +d_a_obj_riverrock | 37.311178% | 2964 | 7944 +d_a_obj_prop | 47.868217% | 988 | 2064 +d_a_obj_lv6Lblock | 46.958175% | 1976 | 4208 +d_a_obj_swBallC | 41.458222% | 3116 | 7516 +d_a_obj_digplace | 35.129068% | 1252 | 3564 +d_a_obj_lv4CandleTag | 50.114416% | 1752 | 3496 +d_a_obj_rw | 41.210834% | 3104 | 7532 +d_a_obj_syRock | 38.458961% | 4592 | 11940 +d_a_obj_bed | 42.310889% | 2036 | 4812 +d_a_obj_thdoor | 39.419319% | 2824 | 7164 +d_a_obj_kag | 32.055503% | 5452 | 17008 +d_a_obj_movebox | 36.691330% | 7736 | 21084 +d_a_obj_dan | 35.198921% | 4176 | 11864 +d_a_obj_magLiftRot | 40.697674% | 3080 | 7568 +d_a_obj_lv4SlideWall | 48.954373% | 2060 | 4208 +d_a_obj_toaru_maki | 46.596067% | 1232 | 2644 +d_a_obj_yel_bag | 33.773087% | 3584 | 10612 +d_a_obj_hsTarget | 57.317073% | 1504 | 2624 +d_a_obj_digsnow | 44.813278% | 2160 | 4820 +d_a_obj_bubblePilar | 44.760583% | 2580 | 5764 +d_a_obj_well_cover | 45.704467% | 1596 | 3492 +d_a_obj_mato | 37.093023% | 2552 | 6880 +d_a_obj_lv4RailWall | 41.496973% | 3016 | 7268 +d_a_obj_stonemark | 100.000000% | 2040 | 2040 +d_a_obj_gomikabe | 37.032799% | 3884 | 10488 +d_a_obj_lv5IceWall | 39.937435% | 3064 | 7672 +d_a_obj_life_container | 34.456243% | 3764 | 10924 +d_a_obj_lv3waterEff | 48.122066% | 820 | 1704 +d_a_obj_kwheel01 | 41.610233% | 2212 | 5316 +d_a_obj_firepillar2 | 32.320564% | 2936 | 9084 +d_a_obj_h_saku | 37.610063% | 2392 | 6360 +d_a_obj_warp_kbrg | 34.066524% | 5080 | 14912 +d_a_obj_so | 31.698636% | 6412 | 20228 +d_a_obj_kshutter | 35.690936% | 4804 | 13460 +d_a_obj_lv4prwall | 38.593750% | 1976 | 5120 +d_a_obj_ari | 31.622322% | 5372 | 16988 +d_a_obj_swpush5 | 39.210384% | 2900 | 7396 +d_a_obj_crvfence | 37.146893% | 3156 | 8496 +d_a_obj_crvlh_down | 42.363776% | 2208 | 5212 +d_a_obj_rock | 40.423729% | 1908 | 4720 +d_a_obj_poFire | 36.999540% | 3216 | 8692 +d_a_obj_stone | 26.135237% | 5272 | 20172 +d_a_obj_lv4gear | 42.242704% | 1100 | 2604 +d_a_obj_wchain | 31.823745% | 3120 | 9804 +d_a_obj_spinLift | 41.107692% | 2672 | 6500 +d_a_obj_lv3Candle | 45.638126% | 2260 | 4952 +d_a_obj_smw_stone | 40.435606% | 1708 | 4224 +d_a_obj_stick | 43.708609% | 2376 | 5436 +d_a_obj_groundwater | 40.823478% | 3728 | 9132 +d_a_obj_stopper | 31.675996% | 3848 | 12148 +d_a_obj_ten | 30.064631% | 5396 | 17948 +d_a_obj_mhole | 35.548173% | 2140 | 6020 +d_a_obj_fmobj | 55.200000% | 1104 | 2000 +d_a_obj_swallshutter | 100.000000% | 5864 | 5864 +d_a_obj_takaraDai | 46.376812% | 2304 | 4968 +d_a_obj_ice_l | 34.815373% | 1848 | 5308 +d_a_obj_fallobj | 31.929604% | 2032 | 6364 +d_a_obj_crvsteel | 48.717949% | 1520 | 3120 +d_a_obj_lv3Water2 | 41.786571% | 2788 | 6672 +d_a_obj_cboard | 57.703927% | 1528 | 2648 +d_a_obj_crope | 26.014689% | 2692 | 10348 +d_a_obj_sakuita_rope | 30.817009% | 2580 | 8372 +d_a_obj_eff | 73.504274% | 688 | 936 +d_a_obj_thashi | 49.534161% | 3828 | 7728 +d_a_obj_itamato | 38.072602% | 3524 | 9256 +d_a_obj_knBullet | 43.076923% | 1568 | 3640 +d_a_obj_wsword | 48.936170% | 1380 | 2820 +d_a_obj_smoke | 51.322751% | 776 | 1512 +d_a_obj_swBallA | 35.803945% | 2396 | 6692 +d_a_obj_cwall | 30.455195% | 5968 | 19596 +d_a_obj_picture | 35.041841% | 4020 | 11472 +d_a_obj_ladder | 42.348485% | 2236 | 5280 +d_a_obj_gptaru | 100.000000% | 14020 | 14020 +d_a_obj_rotTrap | 45.877144% | 3316 | 7228 +d_a_obj_swspinner | 39.141631% | 1824 | 4660 +d_a_obj_lv3saka00 | 50.576369% | 1404 | 2776 +d_a_obj_metalbox | 50.268097% | 1500 | 2984 +d_a_obj_bmshutter | 41.338854% | 2396 | 5796 +d_a_obj_kkanban | 47.103514% | 1984 | 4212 +d_a_obj_goGate | 48.046181% | 2164 | 4504 +d_a_obj_lv8KekkaiTrap | 49.367089% | 2028 | 4108 +d_a_obj_lv6Tenbin | 40.000000% | 2848 | 7120 +d_a_obj_kbox | 35.736196% | 3728 | 10432 +d_a_obj_bbox | 48.606466% | 1744 | 3588 +d_a_obj_bombf | 46.875000% | 1020 | 2176 +d_a_obj_key | 33.145009% | 3520 | 10620 +d_a_obj_crvgate | 27.603513% | 4400 | 15940 +d_a_obj_iceleaf | 37.604212% | 3428 | 9116 +d_a_obj_tombo | 33.688640% | 4804 | 14260 +d_a_obj_lv5ychndlr | 40.267765% | 3128 | 7768 +d_a_obj_usaku | 55.081301% | 1084 | 1968 +d_a_obj_gb | 41.063644% | 1884 | 4588 +d_a_obj_nougu | 42.325581% | 2548 | 6020 +d_a_obj_roten | 41.613588% | 1568 | 3768 +d_a_obj_timer | 46.691176% | 1016 | 2176 +d_a_obj_bhbridge | 39.936609% | 2016 | 5048 +d_a_obj_sekizo | 53.625171% | 1568 | 2924 +d_a_obj_saidan | 50.210970% | 1904 | 3792 +d_a_obj_grz_rock | 45.558087% | 1600 | 3512 +d_a_obj_kaisou | 41.645729% | 2652 | 6368 +d_a_obj_mvstair | 35.209479% | 3328 | 9452 +d_a_obj_pdoor | 37.254902% | 1900 | 5100 +d_a_obj_pdtile | 31.467607% | 2856 | 9076 +d_a_obj_inobone | 42.361111% | 1952 | 4608 +d_a_obj_msima | 35.108959% | 3480 | 9912 +d_a_obj_smgdoor | 41.383095% | 3016 | 7288 +d_a_obj_bemos | 32.943081% | 10580 | 32116 +d_a_obj_sekizoa | 32.789446% | 15112 | 46088 +d_a_obj_chest | 39.833795% | 2876 | 7220 +d_a_obj_snowEffTag | 46.419098% | 1400 | 3016 +d_a_obj_lv4sand | 46.461825% | 1996 | 4296 +d_a_obj_flag | 37.518248% | 2056 | 5480 +d_a_obj_maki | 45.531587% | 2364 | 5192 +d_a_obj_ss_drink | 36.026542% | 3692 | 10248 +d_a_obj_automata | 40.573951% | 3676 | 9060 +d_a_obj_geyser | 29.678068% | 3540 | 11928 +d_a_obj_cblock | 42.294713% | 3008 | 7112 +d_a_obj_taFence | 41.279360% | 3304 | 8004 +d_a_obj_window | 42.655602% | 2056 | 4820 +d_a_obj_swturn | 31.295716% | 2396 | 7656 +d_a_obj_rcircle | 43.989432% | 1332 | 3028 +d_a_obj_kanban2 | 30.775877% | 7124 | 23148 +d_a_obj_iceblock | 32.744340% | 4744 | 14488 +d_a_obj_lv6TogeTrap | 34.484536% | 5352 | 15520 +d_a_obj_wflag | 41.214286% | 2308 | 5600 +d_a_obj_cdoor | 40.255786% | 2644 | 6568 +d_a_obj_lv8Lift | 35.532359% | 3404 | 9580 +d_a_obj_zcloth | 52.373418% | 1324 | 2528 +d_a_obj_katatsumuri | 31.170697% | 5208 | 16708 +d_a_obj_togeTrap | 41.746183% | 3500 | 8384 +d_a_obj_web0 | 44.054441% | 2460 | 5584 +d_a_obj_ganonwall | 38.930481% | 1456 | 3740 +d_a_obj_kantera | 37.623762% | 2432 | 6464 +d_a_obj_gra_rock | 37.947123% | 2928 | 7716 +d_a_obj_lv5yiblltray | 33.403583% | 3804 | 11388 +d_a_obj_swLight | 40.346767% | 3444 | 8536 +d_a_obj_tks | 34.669261% | 7128 | 20560 +d_a_obj_nameplate | 39.726962% | 2328 | 5860 +d_a_obj_nagaisu | 37.130271% | 2360 | 6356 +d_a_obj_stopper2 | 38.987342% | 1848 | 4740 +d_a_obj_graWall | 55.725191% | 1168 | 2096 +d_a_obj_balloon | 42.722710% | 2724 | 6376 +d_a_obj_rgate | 36.466069% | 5696 | 15620 +d_a_obj_waterPillar | 37.877429% | 5068 | 13380 +d_a_obj_swBallB | 34.276891% | 2664 | 7772 +d_a_obj_fan | 39.173554% | 2844 | 7260 +d_a_obj_lv4EdShutter | 45.846154% | 2384 | 5200 +d_a_obj_swpropeller | 39.765679% | 2308 | 5804 +d_a_obj_dmelevator | 35.600390% | 4376 | 12292 +d_a_obj_onsenTaru | 38.567616% | 3468 | 8992 +d_a_obj_wind_stone | 37.702265% | 1864 | 4944 +d_a_obj_kgate | 35.192216% | 5932 | 16856 +d_a_obj_lv6TogeRoll | 35.933806% | 4256 | 11844 +d_a_obj_ornament_cloth | 38.734568% | 2008 | 5184 +d_a_obj_ita | 42.717855% | 2804 | 6564 +d_a_obj_ndoor | 51.957831% | 1380 | 2656 +d_a_obj_kznkarm | 35.088583% | 2852 | 8128 +d_a_obj_zrTurara | 43.437672% | 3164 | 7284 +d_a_obj_wood_statue | 36.601579% | 3524 | 9628 +d_a_obj_rstair | 37.354086% | 2688 | 7196 +d_a_obj_lv6SzGate | 45.147151% | 2884 | 6388 +d_a_obj_tp | 35.262726% | 3436 | 9744 +d_a_obj_swpush | 31.657104% | 3752 | 11852 +d_a_obj_lv4Gate | 48.863636% | 2064 | 4224 +d_a_obj_ito | 30.588925% | 4176 | 13652 +d_a_obj_master_sword | 43.575419% | 2808 | 6444 +d_a_obj_carry | 29.827071% | 18352 | 61528 +d_a_obj_myogan | 51.677852% | 1848 | 3576 +d_a_obj_toby | 32.460733% | 3720 | 11460 +d_a_obj_lv5FloorBoard | 47.577093% | 2592 | 5448 +d_a_obj_smallkey | 31.464798% | 3772 | 11988 +d_a_obj_rfHole | 43.621701% | 2380 | 5456 +d_a_obj_tornado | 36.577869% | 1428 | 3904 +d_a_obj_rope_bridge | 36.903633% | 4672 | 12660 +d_a_obj_zraMark | 34.016942% | 3052 | 8972 +d_a_obj_ss_item | 38.313378% | 2944 | 7684 +d_a_obj_laundry | 39.077103% | 2676 | 6848 +d_a_obj_lv4chandelier | 26.284971% | 4848 | 18444 +d_a_obj_Lv5Key | 37.172105% | 2324 | 6252 +d_a_obj_zdoor | 45.037688% | 2868 | 6368 +d_a_obj_kage | 50.520833% | 1164 | 2304 +d_a_obj_magLift | 41.319181% | 2180 | 5276 +d_a_obj_timeFire | 43.483146% | 1548 | 3560 +d_a_obj_mie | 34.891676% | 3672 | 10524 +d_a_obj_octhashi | 35.325420% | 3452 | 9772 +d_a_obj_onsenFire | 61.419753% | 796 | 1296 +d_a_obj_cb | 43.008475% | 2436 | 5664 +d_a_obj_poTbox | 44.731739% | 2768 | 6188 +d_a_obj_kbacket | 33.053127% | 3932 | 11896 +d_a_obj_lv4prelvtr | 48.664688% | 1312 | 2696 +d_a_obj_ihasi | 43.372216% | 1636 | 3772 +d_a_obj_pdwall | 40.192308% | 1672 | 4160 +d_a_obj_web1 | 42.480942% | 2452 | 5772 +d_a_obj_hfuta | 39.073970% | 2768 | 7084 +d_a_obj_lv2candle | 100.000000% | 6960 | 6960 +d_a_obj_wood_pendulum | 44.455748% | 1748 | 3932 +d_a_obj_onsen | 49.239281% | 1424 | 2892 +d_a_obj_hasu2 | 41.190476% | 1384 | 3360 +d_a_obj_catdoor | 46.041413% | 1512 | 3284 +d_a_obj_bkdoor | 45.847554% | 1612 | 3516 +d_a_obj_mgate | 47.398844% | 1968 | 4152 +d_a_obj_ganonwall2 | 41.938675% | 1696 | 4044 +d_a_obj_hakai_brl | 40.491284% | 2044 | 5048 +d_a_obj_lp | 29.557762% | 2620 | 8864 +d_a_obj_gadget | 34.371565% | 3752 | 10916 +d_a_obj_tornado2 | 30.997110% | 1716 | 5536 +d_a_obj_amiShutter | 42.478422% | 2756 | 6488 +d_a_obj_lv6egate | 42.456719% | 2060 | 4852 +d_a_obj_snow_soup | 37.025948% | 1484 | 4008 +d_a_obj_kabuto | 30.226537% | 5604 | 18540 +d_a_obj_treesh | 48.098664% | 1872 | 3892 +d_a_obj_cowdoor | 56.672761% | 1240 | 2188 +d_a_obj_mirror_sand | 46.972860% | 1800 | 3832 +d_a_obj_mirror_chain | 34.916201% | 3500 | 10024 +d_a_obj_mirror_screw | 40.374532% | 2156 | 5340 +d_a_obj_mirror_6pole | 49.656751% | 1736 | 3496 +d_a_obj_mirror_table | 38.664122% | 4052 | 10480 +d_a_npc_doc | 38.160961% | 8516 | 22316 +d_a_npc_tkc | 32.075472% | 7820 | 24380 +d_a_npc_aru | 34.812103% | 12932 | 37148 +d_a_npc_kolinb | 41.382827% | 8116 | 19612 +d_a_npc_knj | 41.627219% | 5628 | 13520 +d_a_npc_fish | 79.939819% | 3188 | 3988 +d_a_npc_raca | 38.792102% | 8016 | 20664 +d_a_npc_pachi_taro | 42.126544% | 15420 | 36604 +d_a_npc_rafrel | 29.654182% | 10736 | 36204 +d_a_npc_seirei | 39.691517% | 6176 | 15560 +d_a_npc_doorboy | 35.898009% | 6420 | 17884 +d_a_npc_zra | 24.569698% | 26608 | 108296 +d_a_npc_chin | 33.958357% | 11808 | 34772 +d_a_npc_zant | 38.262795% | 6220 | 16256 +d_a_npc_kkri | 38.042823% | 10092 | 26528 +d_a_npc_zelRo | 37.784656% | 6836 | 18092 +d_a_npc_zelR | 37.762547% | 6832 | 18092 +d_a_npc_ne | 24.204919% | 12360 | 51064 +d_a_npc_kasi_kyu | 33.587533% | 8104 | 24128 +d_a_npc_shop_maro | 53.691275% | 2880 | 5364 +d_a_npc_grs | 33.634658% | 7888 | 23452 +d_a_npc_lf | 39.566396% | 2336 | 5904 +d_a_npc_wrestler | 27.819607% | 28820 | 103596 +d_a_npc_grm | 38.118162% | 6968 | 18280 +d_a_npc_besu | 38.726854% | 19492 | 50332 +d_a_npc_yelia | 40.634175% | 13840 | 34060 +d_a_npc_bouS | 32.586831% | 9720 | 29828 +d_a_npc_kakashi | 39.139523% | 8988 | 22964 +d_a_npc_p2 | 100.000000% | 632 | 632 +d_a_npc_jagar | 33.736985% | 11924 | 35344 +d_a_npc_inko | 32.502352% | 2764 | 8504 +d_a_npc_len | 37.465709% | 11472 | 30620 +d_a_npc_moir | 28.712188% | 11656 | 40596 +d_a_npc_tkj2 | 28.985507% | 5520 | 19044 +d_a_npc_gro | 33.290996% | 9436 | 28344 +d_a_npc_kasi_mich | 33.749584% | 8108 | 24024 +d_a_npc_the | 34.936999% | 9760 | 27936 +d_a_npc_df | 35.418672% | 2944 | 8312 +d_a_npc_uri | 34.281392% | 13596 | 39660 +d_a_npc_grz | 31.010419% | 12620 | 40696 +d_a_npc_prayer | 36.469470% | 6140 | 16836 +d_a_npc_shop0 | 38.731379% | 3224 | 8324 +d_a_npc_bans | 34.954955% | 11640 | 33300 +d_a_npc_midp | 37.189356% | 6764 | 18188 +d_a_npc_bou | 36.186814% | 12800 | 35372 +d_a_npc_hanjo | 32.618297% | 14476 | 44380 +d_a_npc_fairy_seirei | 42.302956% | 5496 | 12992 +d_a_npc_du | 35.940410% | 3860 | 10740 +d_a_npc_sq | 39.651108% | 3364 | 8484 +d_a_npc_zrc | 32.120762% | 10384 | 32328 +d_a_npc_kdk | 100.000000% | 504 | 504 +d_a_npc_grc | 32.984636% | 8072 | 24472 +d_a_npc_fguard | 42.375887% | 2868 | 6768 +d_a_npc_ashB | 32.906995% | 8336 | 25332 +d_a_npc_kn | 34.989558% | 48252 | 137904 +d_a_npc_chat | 56.591640% | 32384 | 57224 +d_a_npc_ash | 31.737680% | 9892 | 31168 +d_a_npc_tr | 42.322991% | 2128 | 5028 +d_a_npc_blue_ns | 31.763122% | 7552 | 23776 +d_a_npc_yamid | 36.895778% | 7236 | 19612 +d_a_npc_zanb | 37.827310% | 6992 | 18484 +d_a_npc_tkj | 37.419769% | 6996 | 18696 +d_a_npc_shoe | 36.629002% | 6224 | 16992 +d_a_npc_hoz | 40.521518% | 14048 | 34668 +d_a_npc_pachi_maro | 38.260301% | 9360 | 24464 +d_a_npc_seid | 42.554557% | 5304 | 12464 +d_a_npc_pachi_besu | 42.797557% | 11492 | 26852 +d_a_npc_gwolf | 35.693780% | 11936 | 33440 +d_a_npc_grmc | 40.486016% | 7064 | 17448 +d_a_npc_fairy | 39.344262% | 19776 | 50264 +d_a_npc_gra | 30.387241% | 20120 | 66212 +d_a_npc_tks | 27.123246% | 14384 | 53032 +d_a_npc_ykm | 32.908526% | 20348 | 61832 +d_a_npc_clerka | 36.659479% | 7480 | 20404 +d_a_npc_coach | 28.195770% | 12052 | 42744 +d_a_npc_worm | 33.717579% | 2340 | 6940 +d_a_npc_grr | 33.284338% | 8152 | 24492 +d_a_npc_kolin | 35.754689% | 14412 | 40308 +d_a_npc_clerkt | 36.386139% | 7056 | 19392 +d_a_npc_grd | 33.161068% | 7700 | 23220 +d_a_npc_theB | 34.129794% | 9256 | 27120 +d_a_npc_toby | 35.857461% | 14168 | 39512 +d_a_npc_yamit | 36.693548% | 7280 | 19840 +d_a_npc_maro | 36.380572% | 21872 | 60120 +d_a_npc_ins | 30.852199% | 10412 | 33748 +d_a_npc_seira | 38.908741% | 11324 | 29104 +d_a_npc_post | 37.414676% | 10524 | 28128 +d_a_npc_passer2 | 37.528815% | 3256 | 8676 +d_a_npc_seib | 42.233442% | 5688 | 13468 +d_a_npc_mk | 100.000000% | 632 | 632 +d_a_npc_lud | 38.010021% | 12744 | 33528 +d_a_npc_drainSol | 38.587732% | 4328 | 11216 +d_a_npc_ykw | 33.875000% | 18428 | 54400 +d_a_npc_shad | 27.050485% | 14960 | 55304 +d_a_npc_soldierA | 34.996894% | 6760 | 19316 +d_a_npc_zrz | 31.977232% | 13708 | 42868 +d_a_npc_tk | 22.166176% | 12656 | 57096 +d_a_npc_soldierB | 35.587267% | 6484 | 18220 +d_a_npc_pouya | 40.447529% | 11424 | 28244 +d_a_npc_guard | 35.071398% | 6484 | 18488 +d_a_npc_yamis | 36.878425% | 7268 | 19708 +d_a_npc_sola | 39.560155% | 6116 | 15460 +d_a_npc_ks | 24.232793% | 27448 | 113268 +d_a_npc_taro | 38.152632% | 28996 | 76000 +d_a_npc_seira2 | 39.278557% | 10192 | 25948 +d_a_npc_henna0 | 100.000000% | 504 | 504 +d_a_npc_passer | 35.701424% | 8724 | 24436 +d_a_npc_moi | 34.114704% | 14728 | 43172 +d_a_npc_impal | 32.590326% | 8948 | 27456 +d_a_npc_kyury | 39.351296% | 9172 | 23308 +d_a_npc_saru | 39.289415% | 10616 | 27020 +d_a_npc_shaman | 40.368229% | 10612 | 26288 +d_a_npc_cdn3 | 34.686491% | 14184 | 40892 +d_a_npc_gnd | 36.965399% | 6880 | 18612 +d_a_npc_myna2 | 33.448276% | 8924 | 26680 +d_a_npc_kasi_hana | 29.810206% | 10492 | 35196 +d_a_npc_clerkb | 36.128920% | 8340 | 23084 +d_a_npc_zelda | 37.603569% | 7080 | 18828 +d_a_npc_henna | 27.446434% | 11836 | 43124 +d_a_npc_seic | 42.554557% | 5304 | 12464 +d_a_e_ws | 29.700483% | 6148 | 20700 +d_a_e_ym | 20.062370% | 13896 | 69264 +d_a_e_po | 23.824220% | 14204 | 59620 +d_a_e_dt | 27.760631% | 12952 | 46656 +d_a_e_bi | 30.767563% | 5676 | 18448 +d_a_e_tk | 32.077326% | 3916 | 12208 +d_a_e_ai | 28.308171% | 5100 | 18016 +d_a_e_md | 34.917814% | 3144 | 9004 +d_a_e_tk2 | 33.419577% | 3100 | 9276 +d_a_e_fk | 32.965394% | 4420 | 13408 +d_a_e_db_leaf | 57.582938% | 972 | 1688 +d_a_e_ms | 28.208138% | 5768 | 20448 +d_a_e_cr_egg | 43.296089% | 1860 | 4296 +d_a_e_mb | 29.067542% | 4252 | 14628 +d_a_e_yc | 30.733107% | 4712 | 15332 +d_a_e_pz | 27.469575% | 13904 | 50616 +d_a_e_mm | 27.438612% | 4872 | 17756 +d_a_e_db | 26.006517% | 9896 | 38052 +d_a_e_rb | 30.197628% | 4584 | 15180 +d_a_e_s1 | 28.078818% | 9804 | 34916 +d_a_e_gm | 28.274812% | 10404 | 36796 +d_a_e_sh | 30.953709% | 6660 | 21516 +d_a_e_sw | 21.949266% | 9864 | 44940 +d_a_e_ph | 23.274129% | 5556 | 23872 +d_a_e_df | 28.031364% | 4004 | 14284 +d_a_e_hzelda | 30.097531% | 7900 | 26248 +d_a_e_hb | 27.624471% | 7568 | 27396 +d_a_e_sg | 29.168221% | 6256 | 21448 +d_a_e_kk | 27.161029% | 7516 | 27672 +d_a_e_yr | 27.591936% | 9964 | 36112 +d_a_e_bi_leaf | 50.446429% | 904 | 1792 +d_a_e_vt | 24.313702% | 16332 | 67172 +d_a_e_th_ball | 29.462631% | 5724 | 19428 +d_a_e_mm_mt | 28.672856% | 4200 | 14648 +d_a_e_bug | 29.207138% | 5172 | 17708 +d_a_e_sm2 | 30.097087% | 8184 | 27192 +d_a_e_ww | 23.418134% | 10052 | 42924 +d_a_e_dk | 29.244060% | 5416 | 18520 +d_a_e_dd | 26.687870% | 7384 | 27668 +d_a_e_ba | 28.140394% | 5484 | 19488 +d_a_e_yd | 27.879315% | 7688 | 27576 +d_a_e_kr | 27.652396% | 9508 | 34384 +d_a_e_hm | 27.299426% | 8180 | 29964 +d_a_e_zs | 31.358336% | 3980 | 12692 +d_a_e_rd | 24.121965% | 25632 | 106260 +d_a_e_fm | 24.588144% | 15164 | 61672 +d_a_e_hz | 23.990326% | 7936 | 33080 +d_a_e_is | 31.728595% | 3928 | 12380 +d_a_e_st_line | 60.459770% | 1052 | 1740 +d_a_e_pm | 21.505129% | 11236 | 52248 +d_a_e_oc | 22.586920% | 11148 | 49356 +d_a_e_rdy | 25.649401% | 19788 | 77148 +d_a_e_zh | 27.029865% | 9268 | 34288 +d_a_e_hp | 28.231798% | 6840 | 24228 +d_a_e_sb | 28.045789% | 5488 | 19568 +d_a_e_mf | 25.211695% | 12624 | 50072 +d_a_e_gi | 30.183330% | 6388 | 21164 +d_a_e_bs | 32.320835% | 5448 | 16856 +d_a_e_nest | 29.119005% | 5804 | 19932 +d_a_e_rdb | 27.331887% | 9576 | 35036 +d_a_e_yh | 26.277603% | 9996 | 38040 +d_a_e_kg | 31.431080% | 4296 | 13668 +d_a_e_gs | 44.729606% | 1952 | 4364 +d_a_e_fs | 31.823996% | 4976 | 15636 +d_a_e_wb | 23.058129% | 20008 | 86772 +d_a_e_fz | 30.508860% | 5372 | 17608 +d_a_e_mk_bo | 29.776477% | 4476 | 15032 +d_a_e_th | 29.463680% | 6944 | 23568 +d_a_e_ga | 43.014395% | 2032 | 4724 +d_a_e_st | 26.260013% | 12588 | 47936 +d_a_e_hb_leaf | 55.309735% | 1000 | 1808 +d_a_e_sf | 29.821481% | 8152 | 27336 +d_a_e_tt | 27.836991% | 7104 | 25520 +d_a_e_ge | 24.669967% | 7176 | 29088 +d_a_e_arrow | 35.306882% | 4556 | 12904 +d_a_e_yk | 29.001484% | 5472 | 18868 +d_a_e_nz | 32.041969% | 4764 | 14868 +d_a_e_fb | 31.127328% | 4948 | 15896 +d_a_e_warpappear | 28.864569% | 4220 | 14620 +d_a_e_ot | 32.497589% | 5392 | 16592 +d_a_e_zm | 28.267015% | 5200 | 18396 +d_a_e_sm | 24.418880% | 8236 | 33728 +d_a_e_ymb | 23.798093% | 14672 | 61652 +d_a_e_gob | 26.683396% | 10208 | 38256 +d_a_e_oct_bg | 30.217151% | 6568 | 21736 +d_a_e_yg | 28.386013% | 7436 | 26196 +d_a_e_tk_ball | 33.349562% | 2740 | 8216 +d_a_e_bee | 30.316629% | 4864 | 16044 +d_a_e_ym_tag | 61.764706% | 672 | 1088 +d_a_e_gb | 26.939571% | 8292 | 30780 +d_a_e_mk | 25.747187% | 11716 | 45504 +d_a_e_dn | 25.842869% | 13460 | 52084 +d_a_e_cr | 34.481521% | 3844 | 11148 +d_a_e_yd_leaf | 54.022989% | 1128 | 2088 +d_a_e_bu | 30.436573% | 5912 | 19424 +d_a_e_bg | 27.665091% | 7256 | 26228 +d_a_b_bh | 24.452445% | 6520 | 26664 +d_a_b_yo_ice | 28.297953% | 5972 | 21104 d_a_b_dre | 27.912731% | 4964 | 17784 -d_a_b_ob | 26.856326% | 15784 | 58772 -d_a_b_mgn | 26.103833% | 15064 | 57708 -d_a_b_gg | 22.324410% | 17380 | 77852 -d_a_b_zant | 22.203940% | 19432 | 87516 -d_a_b_go | 40.906190% | 2564 | 6268 -d_a_b_zant_mobile | 36.326402% | 4612 | 12696 -d_a_b_gos | 43.551689% | 3404 | 7816 -d_a_b_gm | 30.376176% | 11628 | 38280 d_a_b_yo | 25.613486% | 14404 | 56236 +d_a_b_gnd | 25.489573% | 19264 | 75576 d_a_b_oh | 32.611348% | 4276 | 13112 +d_a_b_go | 40.906190% | 2564 | 6268 +d_a_b_zant_magic | 42.453480% | 2464 | 5804 +d_a_b_tn | 24.850960% | 21176 | 85212 +d_a_b_mgn | 26.103833% | 15064 | 57708 +d_a_b_ob | 26.856326% | 15784 | 58772 +d_a_b_gg | 22.324410% | 17380 | 77852 +d_a_b_ds | 26.627364% | 26016 | 97704 +d_a_b_zant | 22.203940% | 19432 | 87516 +d_a_b_gos | 43.551689% | 3404 | 7816 +d_a_b_dr | 27.536664% | 18476 | 67096 +d_a_b_zant_mobile | 36.326402% | 4612 | 12696 +d_a_b_oh2 | 37.960954% | 2100 | 5532 d_a_b_bq | 28.033347% | 11164 | 39824 d_a_b_zant_sima | 40.995025% | 1648 | 4020 -d_a_b_tn | 24.850960% | 21176 | 85212 -d_a_b_gnd | 25.489573% | 19264 | 75576 -d_a_b_yo_ice | 28.297953% | 5972 | 21104 -d_a_b_ds | 26.627364% | 26016 | 97704 -d_a_b_bh | 24.452445% | 6520 | 26664 -d_a_b_zant_magic | 42.453480% | 2464 | 5804 -d_a_b_oh2 | 37.960954% | 2100 | 5532 -d_a_door_bossl1 | 100.000000% | 18732 | 18732 -d_a_door_bossL5 | 39.221790% | 4032 | 10280 -d_a_door_push | 37.997725% | 2672 | 7032 -d_a_door_spiral | 100.000000% | 504 | 504 -d_a_door_mbossL1 | 34.467633% | 10372 | 30092 -d_a_door_shutter | 37.465797% | 14240 | 38008 -d_a_door_boss | 40.856890% | 3700 | 9056 -d_a_door_dbdoor00 | 40.734908% | 3104 | 7620 -d_a_door_knob00 | 37.500000% | 4608 | 12288 +d_a_b_gm | 30.376176% | 11628 | 38280 Total | 33.172039% | 3814892 | 11500324 diff --git a/asm/JSystem/J2DGraph/J2DMaterial/__ct__Q211J2DMaterial21J2DMaterialAnmPointerFv.s b/asm/JSystem/J2DGraph/J2DMaterial/__ct__Q211J2DMaterial21J2DMaterialAnmPointerFv.s deleted file mode 100644 index f7e9edc01e7..00000000000 --- a/asm/JSystem/J2DGraph/J2DMaterial/__ct__Q211J2DMaterial21J2DMaterialAnmPointerFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_802EA79C: -/* 802EA79C 38 A0 00 00 */ li r5, 0 -/* 802EA7A0 90 A3 00 00 */ stw r5, 0(r3) -/* 802EA7A4 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 802EA7A8 38 84 FF FF */ addi r4, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 802EA7AC B0 83 00 10 */ sth r4, 0x10(r3) -/* 802EA7B0 90 A3 00 04 */ stw r5, 4(r3) -/* 802EA7B4 38 00 00 08 */ li r0, 8 -/* 802EA7B8 7C 09 03 A6 */ mtctr r0 -lbl_802EA7BC: -/* 802EA7BC 38 05 00 12 */ addi r0, r5, 0x12 -/* 802EA7C0 7C 83 03 2E */ sthx r4, r3, r0 -/* 802EA7C4 38 A5 00 02 */ addi r5, r5, 2 -/* 802EA7C8 42 00 FF F4 */ bdnz lbl_802EA7BC -/* 802EA7CC 38 00 00 00 */ li r0, 0 -/* 802EA7D0 90 03 00 08 */ stw r0, 8(r3) -/* 802EA7D4 38 80 00 00 */ li r4, 0 -/* 802EA7D8 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 802EA7DC 38 A5 FF FF */ addi r5, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 802EA7E0 38 00 00 08 */ li r0, 8 -/* 802EA7E4 7C 09 03 A6 */ mtctr r0 -lbl_802EA7E8: -/* 802EA7E8 38 04 00 22 */ addi r0, r4, 0x22 -/* 802EA7EC 7C A3 03 2E */ sthx r5, r3, r0 -/* 802EA7F0 38 84 00 02 */ addi r4, r4, 2 -/* 802EA7F4 42 00 FF F4 */ bdnz lbl_802EA7E8 -/* 802EA7F8 38 00 00 00 */ li r0, 0 -/* 802EA7FC 90 03 00 0C */ stw r0, 0xc(r3) -/* 802EA800 38 80 00 00 */ li r4, 0 -/* 802EA804 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 802EA808 38 A5 FF FF */ addi r5, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 802EA80C 38 00 00 04 */ li r0, 4 -/* 802EA810 7C 09 03 A6 */ mtctr r0 -lbl_802EA814: -/* 802EA814 38 04 00 32 */ addi r0, r4, 0x32 -/* 802EA818 7C A3 03 2E */ sthx r5, r3, r0 -/* 802EA81C 38 84 00 02 */ addi r4, r4, 2 -/* 802EA820 42 00 FF F4 */ bdnz lbl_802EA814 -/* 802EA824 38 80 00 00 */ li r4, 0 -/* 802EA828 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 802EA82C 38 A5 FF FF */ addi r5, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 802EA830 38 00 00 04 */ li r0, 4 -/* 802EA834 7C 09 03 A6 */ mtctr r0 -lbl_802EA838: -/* 802EA838 38 04 00 3A */ addi r0, r4, 0x3a -/* 802EA83C 7C A3 03 2E */ sthx r5, r3, r0 -/* 802EA840 38 84 00 02 */ addi r4, r4, 2 -/* 802EA844 42 00 FF F4 */ bdnz lbl_802EA838 -/* 802EA848 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMaterial/createIndBlock__11J2DMaterialFib.s b/asm/JSystem/J2DGraph/J2DMaterial/createIndBlock__11J2DMaterialFib.s deleted file mode 100644 index be0213cf0e4..00000000000 --- a/asm/JSystem/J2DGraph/J2DMaterial/createIndBlock__11J2DMaterialFib.s +++ /dev/null @@ -1,125 +0,0 @@ -lbl_802EA5C4: -/* 802EA5C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EA5C8 7C 08 02 A6 */ mflr r0 -/* 802EA5CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EA5D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EA5D4 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 802EA5D8 41 82 00 D8 */ beq lbl_802EA6B0 -/* 802EA5DC 2C 03 00 00 */ cmpwi r3, 0 -/* 802EA5E0 41 82 00 A4 */ beq lbl_802EA684 -/* 802EA5E4 38 60 00 6C */ li r3, 0x6c -/* 802EA5E8 4B FE 46 65 */ bl __nw__FUl -/* 802EA5EC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802EA5F0 41 82 00 8C */ beq lbl_802EA67C -/* 802EA5F4 3C 60 80 3D */ lis r3, __vt__11J2DIndBlock@ha /* 0x803CCA40@ha */ -/* 802EA5F8 38 03 CA 40 */ addi r0, r3, __vt__11J2DIndBlock@l /* 0x803CCA40@l */ -/* 802EA5FC 90 1F 00 00 */ stw r0, 0(r31) -/* 802EA600 3C 60 80 3D */ lis r3, __vt__15J2DIndBlockFull@ha /* 0x803CCA90@ha */ -/* 802EA604 38 03 CA 90 */ addi r0, r3, __vt__15J2DIndBlockFull@l /* 0x803CCA90@l */ -/* 802EA608 90 1F 00 00 */ stw r0, 0(r31) -/* 802EA60C 38 7F 00 05 */ addi r3, r31, 5 -/* 802EA610 3C 80 80 2F */ lis r4, __ct__14J2DIndTexOrderFv@ha /* 0x802EB378@ha */ -/* 802EA614 38 84 B3 78 */ addi r4, r4, __ct__14J2DIndTexOrderFv@l /* 0x802EB378@l */ -/* 802EA618 38 A0 00 00 */ li r5, 0 -/* 802EA61C 38 C0 00 02 */ li r6, 2 -/* 802EA620 38 E0 00 04 */ li r7, 4 -/* 802EA624 48 07 77 3D */ bl __construct_array -/* 802EA628 38 7F 00 10 */ addi r3, r31, 0x10 -/* 802EA62C 3C 80 80 2F */ lis r4, __ct__12J2DIndTexMtxFv@ha /* 0x802EB320@ha */ -/* 802EA630 38 84 B3 20 */ addi r4, r4, __ct__12J2DIndTexMtxFv@l /* 0x802EB320@l */ -/* 802EA634 3C A0 80 2F */ lis r5, __dt__12J2DIndTexMtxFv@ha /* 0x802EB2E4@ha */ -/* 802EA638 38 A5 B2 E4 */ addi r5, r5, __dt__12J2DIndTexMtxFv@l /* 0x802EB2E4@l */ -/* 802EA63C 38 C0 00 1C */ li r6, 0x1c -/* 802EA640 38 E0 00 03 */ li r7, 3 -/* 802EA644 48 07 77 1D */ bl __construct_array -/* 802EA648 38 7F 00 64 */ addi r3, r31, 0x64 -/* 802EA64C 3C 80 80 2F */ lis r4, __ct__19J2DIndTexCoordScaleFv@ha /* 0x802EB2CC@ha */ -/* 802EA650 38 84 B2 CC */ addi r4, r4, __ct__19J2DIndTexCoordScaleFv@l /* 0x802EB2CC@l */ -/* 802EA654 3C A0 80 2F */ lis r5, __dt__19J2DIndTexCoordScaleFv@ha /* 0x802EB290@ha */ -/* 802EA658 38 A5 B2 90 */ addi r5, r5, __dt__19J2DIndTexCoordScaleFv@l /* 0x802EB290@l */ -/* 802EA65C 38 C0 00 02 */ li r6, 2 -/* 802EA660 38 E0 00 04 */ li r7, 4 -/* 802EA664 48 07 76 FD */ bl __construct_array -/* 802EA668 7F E3 FB 78 */ mr r3, r31 -/* 802EA66C 81 9F 00 00 */ lwz r12, 0(r31) -/* 802EA670 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EA674 7D 89 03 A6 */ mtctr r12 -/* 802EA678 4E 80 04 21 */ bctrl -lbl_802EA67C: -/* 802EA67C 7F E3 FB 78 */ mr r3, r31 -/* 802EA680 48 00 01 08 */ b lbl_802EA788 -lbl_802EA684: -/* 802EA684 38 60 00 04 */ li r3, 4 -/* 802EA688 4B FE 45 C5 */ bl __nw__FUl -/* 802EA68C 28 03 00 00 */ cmplwi r3, 0 -/* 802EA690 41 82 00 F8 */ beq lbl_802EA788 -/* 802EA694 3C 80 80 3D */ lis r4, __vt__11J2DIndBlock@ha /* 0x803CCA40@ha */ -/* 802EA698 38 04 CA 40 */ addi r0, r4, __vt__11J2DIndBlock@l /* 0x803CCA40@l */ -/* 802EA69C 90 03 00 00 */ stw r0, 0(r3) -/* 802EA6A0 3C 80 80 3D */ lis r4, __vt__15J2DIndBlockNull@ha /* 0x803CCA08@ha */ -/* 802EA6A4 38 04 CA 08 */ addi r0, r4, __vt__15J2DIndBlockNull@l /* 0x803CCA08@l */ -/* 802EA6A8 90 03 00 00 */ stw r0, 0(r3) -/* 802EA6AC 48 00 00 DC */ b lbl_802EA788 -lbl_802EA6B0: -/* 802EA6B0 2C 03 00 00 */ cmpwi r3, 0 -/* 802EA6B4 41 82 00 A8 */ beq lbl_802EA75C -/* 802EA6B8 38 60 00 6C */ li r3, 0x6c -/* 802EA6BC 38 80 FF FC */ li r4, -4 -/* 802EA6C0 4B FE 45 B5 */ bl __nw__FUli -/* 802EA6C4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802EA6C8 41 82 00 8C */ beq lbl_802EA754 -/* 802EA6CC 3C 60 80 3D */ lis r3, __vt__11J2DIndBlock@ha /* 0x803CCA40@ha */ -/* 802EA6D0 38 03 CA 40 */ addi r0, r3, __vt__11J2DIndBlock@l /* 0x803CCA40@l */ -/* 802EA6D4 90 1F 00 00 */ stw r0, 0(r31) -/* 802EA6D8 3C 60 80 3D */ lis r3, __vt__15J2DIndBlockFull@ha /* 0x803CCA90@ha */ -/* 802EA6DC 38 03 CA 90 */ addi r0, r3, __vt__15J2DIndBlockFull@l /* 0x803CCA90@l */ -/* 802EA6E0 90 1F 00 00 */ stw r0, 0(r31) -/* 802EA6E4 38 7F 00 05 */ addi r3, r31, 5 -/* 802EA6E8 3C 80 80 2F */ lis r4, __ct__14J2DIndTexOrderFv@ha /* 0x802EB378@ha */ -/* 802EA6EC 38 84 B3 78 */ addi r4, r4, __ct__14J2DIndTexOrderFv@l /* 0x802EB378@l */ -/* 802EA6F0 38 A0 00 00 */ li r5, 0 -/* 802EA6F4 38 C0 00 02 */ li r6, 2 -/* 802EA6F8 38 E0 00 04 */ li r7, 4 -/* 802EA6FC 48 07 76 65 */ bl __construct_array -/* 802EA700 38 7F 00 10 */ addi r3, r31, 0x10 -/* 802EA704 3C 80 80 2F */ lis r4, __ct__12J2DIndTexMtxFv@ha /* 0x802EB320@ha */ -/* 802EA708 38 84 B3 20 */ addi r4, r4, __ct__12J2DIndTexMtxFv@l /* 0x802EB320@l */ -/* 802EA70C 3C A0 80 2F */ lis r5, __dt__12J2DIndTexMtxFv@ha /* 0x802EB2E4@ha */ -/* 802EA710 38 A5 B2 E4 */ addi r5, r5, __dt__12J2DIndTexMtxFv@l /* 0x802EB2E4@l */ -/* 802EA714 38 C0 00 1C */ li r6, 0x1c -/* 802EA718 38 E0 00 03 */ li r7, 3 -/* 802EA71C 48 07 76 45 */ bl __construct_array -/* 802EA720 38 7F 00 64 */ addi r3, r31, 0x64 -/* 802EA724 3C 80 80 2F */ lis r4, __ct__19J2DIndTexCoordScaleFv@ha /* 0x802EB2CC@ha */ -/* 802EA728 38 84 B2 CC */ addi r4, r4, __ct__19J2DIndTexCoordScaleFv@l /* 0x802EB2CC@l */ -/* 802EA72C 3C A0 80 2F */ lis r5, __dt__19J2DIndTexCoordScaleFv@ha /* 0x802EB290@ha */ -/* 802EA730 38 A5 B2 90 */ addi r5, r5, __dt__19J2DIndTexCoordScaleFv@l /* 0x802EB290@l */ -/* 802EA734 38 C0 00 02 */ li r6, 2 -/* 802EA738 38 E0 00 04 */ li r7, 4 -/* 802EA73C 48 07 76 25 */ bl __construct_array -/* 802EA740 7F E3 FB 78 */ mr r3, r31 -/* 802EA744 81 9F 00 00 */ lwz r12, 0(r31) -/* 802EA748 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EA74C 7D 89 03 A6 */ mtctr r12 -/* 802EA750 4E 80 04 21 */ bctrl -lbl_802EA754: -/* 802EA754 7F E3 FB 78 */ mr r3, r31 -/* 802EA758 48 00 00 30 */ b lbl_802EA788 -lbl_802EA75C: -/* 802EA75C 38 60 00 04 */ li r3, 4 -/* 802EA760 38 80 FF FC */ li r4, -4 -/* 802EA764 4B FE 45 11 */ bl __nw__FUli -/* 802EA768 28 03 00 00 */ cmplwi r3, 0 -/* 802EA76C 41 82 00 1C */ beq lbl_802EA788 -/* 802EA770 3C 80 80 3D */ lis r4, __vt__11J2DIndBlock@ha /* 0x803CCA40@ha */ -/* 802EA774 38 04 CA 40 */ addi r0, r4, __vt__11J2DIndBlock@l /* 0x803CCA40@l */ -/* 802EA778 90 03 00 00 */ stw r0, 0(r3) -/* 802EA77C 3C 80 80 3D */ lis r4, __vt__15J2DIndBlockNull@ha /* 0x803CCA08@ha */ -/* 802EA780 38 04 CA 08 */ addi r0, r4, __vt__15J2DIndBlockNull@l /* 0x803CCA08@l */ -/* 802EA784 90 03 00 00 */ stw r0, 0(r3) -lbl_802EA788: -/* 802EA788 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EA78C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EA790 7C 08 03 A6 */ mtlr r0 -/* 802EA794 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EA798 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMaterial/makeAnmPointer__11J2DMaterialFv.s b/asm/JSystem/J2DGraph/J2DMaterial/makeAnmPointer__11J2DMaterialFv.s deleted file mode 100644 index 5723176e8f0..00000000000 --- a/asm/JSystem/J2DGraph/J2DMaterial/makeAnmPointer__11J2DMaterialFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_802EA84C: -/* 802EA84C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EA850 7C 08 02 A6 */ mflr r0 -/* 802EA854 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EA858 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EA85C 7C 7F 1B 78 */ mr r31, r3 -/* 802EA860 80 03 00 84 */ lwz r0, 0x84(r3) -/* 802EA864 28 00 00 00 */ cmplwi r0, 0 -/* 802EA868 40 82 00 20 */ bne lbl_802EA888 -/* 802EA86C 38 60 00 44 */ li r3, 0x44 -/* 802EA870 4B FE 43 DD */ bl __nw__FUl -/* 802EA874 7C 60 1B 79 */ or. r0, r3, r3 -/* 802EA878 41 82 00 0C */ beq lbl_802EA884 -/* 802EA87C 4B FF FF 21 */ bl __ct__Q211J2DMaterial21J2DMaterialAnmPointerFv -/* 802EA880 7C 60 1B 78 */ mr r0, r3 -lbl_802EA884: -/* 802EA884 90 1F 00 84 */ stw r0, 0x84(r31) -lbl_802EA888: -/* 802EA888 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EA88C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EA890 7C 08 03 A6 */ mtlr r0 -/* 802EA894 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EA898 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP11J2DAnmColor.s b/asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP11J2DAnmColor.s deleted file mode 100644 index 70c92511a0b..00000000000 --- a/asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP11J2DAnmColor.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_802EA89C: -/* 802EA89C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EA8A0 7C 08 02 A6 */ mflr r0 -/* 802EA8A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EA8A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EA8AC 93 C1 00 08 */ stw r30, 8(r1) -/* 802EA8B0 7C 7E 1B 78 */ mr r30, r3 -/* 802EA8B4 7C 9F 23 79 */ or. r31, r4, r4 -/* 802EA8B8 40 82 00 10 */ bne lbl_802EA8C8 -/* 802EA8BC 80 1E 00 84 */ lwz r0, 0x84(r30) -/* 802EA8C0 28 00 00 00 */ cmplwi r0, 0 -/* 802EA8C4 41 82 00 70 */ beq lbl_802EA934 -lbl_802EA8C8: -/* 802EA8C8 7F C3 F3 78 */ mr r3, r30 -/* 802EA8CC 4B FF FF 81 */ bl makeAnmPointer__11J2DMaterialFv -/* 802EA8D0 80 7E 00 84 */ lwz r3, 0x84(r30) -/* 802EA8D4 93 E3 00 00 */ stw r31, 0(r3) -/* 802EA8D8 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802EA8DC 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802EA8E0 80 7E 00 84 */ lwz r3, 0x84(r30) -/* 802EA8E4 B0 03 00 10 */ sth r0, 0x10(r3) -/* 802EA8E8 28 1F 00 00 */ cmplwi r31, 0 -/* 802EA8EC 41 82 00 48 */ beq lbl_802EA934 -/* 802EA8F0 A0 7F 00 18 */ lhz r3, 0x18(r31) -/* 802EA8F4 A0 9E 00 0C */ lhz r4, 0xc(r30) -/* 802EA8F8 38 C0 00 00 */ li r6, 0 -/* 802EA8FC 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 802EA900 48 00 00 28 */ b lbl_802EA928 -lbl_802EA904: -/* 802EA904 80 BF 00 1C */ lwz r5, 0x1c(r31) -/* 802EA908 54 C3 0B FC */ rlwinm r3, r6, 1, 0xf, 0x1e -/* 802EA90C 7C 65 1A 2E */ lhzx r3, r5, r3 -/* 802EA910 7C 04 18 40 */ cmplw r4, r3 -/* 802EA914 40 82 00 10 */ bne lbl_802EA924 -/* 802EA918 80 7E 00 84 */ lwz r3, 0x84(r30) -/* 802EA91C B0 C3 00 10 */ sth r6, 0x10(r3) -/* 802EA920 48 00 00 14 */ b lbl_802EA934 -lbl_802EA924: -/* 802EA924 38 C6 00 01 */ addi r6, r6, 1 -lbl_802EA928: -/* 802EA928 54 C3 04 3E */ clrlwi r3, r6, 0x10 -/* 802EA92C 7C 03 00 40 */ cmplw r3, r0 -/* 802EA930 41 80 FF D4 */ blt lbl_802EA904 -lbl_802EA934: -/* 802EA934 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EA938 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EA93C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EA940 7C 08 03 A6 */ mtlr r0 -/* 802EA944 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EA948 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP15J2DAnmTevRegKey.s b/asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP15J2DAnmTevRegKey.s deleted file mode 100644 index 13dd8890bdd..00000000000 --- a/asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP15J2DAnmTevRegKey.s +++ /dev/null @@ -1,103 +0,0 @@ -lbl_802EAB0C: -/* 802EAB0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EAB10 7C 08 02 A6 */ mflr r0 -/* 802EAB14 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EAB18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EAB1C 93 C1 00 08 */ stw r30, 8(r1) -/* 802EAB20 7C 7E 1B 78 */ mr r30, r3 -/* 802EAB24 7C 9F 23 79 */ or. r31, r4, r4 -/* 802EAB28 40 82 00 10 */ bne lbl_802EAB38 -/* 802EAB2C 80 1E 00 84 */ lwz r0, 0x84(r30) -/* 802EAB30 28 00 00 00 */ cmplwi r0, 0 -/* 802EAB34 41 82 01 2C */ beq lbl_802EAC60 -lbl_802EAB38: -/* 802EAB38 7F C3 F3 78 */ mr r3, r30 -/* 802EAB3C 4B FF FD 11 */ bl makeAnmPointer__11J2DMaterialFv -/* 802EAB40 80 7E 00 84 */ lwz r3, 0x84(r30) -/* 802EAB44 93 E3 00 0C */ stw r31, 0xc(r3) -/* 802EAB48 38 60 00 00 */ li r3, 0 -/* 802EAB4C 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 802EAB50 38 A4 FF FF */ addi r5, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 802EAB54 38 00 00 04 */ li r0, 4 -/* 802EAB58 7C 09 03 A6 */ mtctr r0 -lbl_802EAB5C: -/* 802EAB5C 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 802EAB60 38 03 00 32 */ addi r0, r3, 0x32 -/* 802EAB64 7C A4 03 2E */ sthx r5, r4, r0 -/* 802EAB68 38 63 00 02 */ addi r3, r3, 2 -/* 802EAB6C 42 00 FF F0 */ bdnz lbl_802EAB5C -/* 802EAB70 28 1F 00 00 */ cmplwi r31, 0 -/* 802EAB74 41 82 00 60 */ beq lbl_802EABD4 -/* 802EAB78 A0 7F 00 10 */ lhz r3, 0x10(r31) -/* 802EAB7C A0 BE 00 0C */ lhz r5, 0xc(r30) -/* 802EAB80 39 00 00 00 */ li r8, 0 -/* 802EAB84 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 802EAB88 48 00 00 40 */ b lbl_802EABC8 -lbl_802EAB8C: -/* 802EAB8C 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 802EAB90 55 07 04 3E */ clrlwi r7, r8, 0x10 -/* 802EAB94 55 03 0B FC */ rlwinm r3, r8, 1, 0xf, 0x1e -/* 802EAB98 7C 64 1A 2E */ lhzx r3, r4, r3 -/* 802EAB9C 7C 05 18 40 */ cmplw r5, r3 -/* 802EABA0 40 82 00 24 */ bne lbl_802EABC4 -/* 802EABA4 80 DF 00 4C */ lwz r6, 0x4c(r31) -/* 802EABA8 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 802EABAC 1C 67 00 1C */ mulli r3, r7, 0x1c -/* 802EABB0 38 63 00 18 */ addi r3, r3, 0x18 -/* 802EABB4 7C 66 18 AE */ lbzx r3, r6, r3 -/* 802EABB8 54 63 08 3C */ slwi r3, r3, 1 -/* 802EABBC 38 63 00 32 */ addi r3, r3, 0x32 -/* 802EABC0 7D 04 1B 2E */ sthx r8, r4, r3 -lbl_802EABC4: -/* 802EABC4 39 08 00 01 */ addi r8, r8, 1 -lbl_802EABC8: -/* 802EABC8 55 03 04 3E */ clrlwi r3, r8, 0x10 -/* 802EABCC 7C 03 00 40 */ cmplw r3, r0 -/* 802EABD0 41 80 FF BC */ blt lbl_802EAB8C -lbl_802EABD4: -/* 802EABD4 38 60 00 00 */ li r3, 0 -/* 802EABD8 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 802EABDC 38 A4 FF FF */ addi r5, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 802EABE0 38 00 00 04 */ li r0, 4 -/* 802EABE4 7C 09 03 A6 */ mtctr r0 -lbl_802EABE8: -/* 802EABE8 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 802EABEC 38 03 00 3A */ addi r0, r3, 0x3a -/* 802EABF0 7C A4 03 2E */ sthx r5, r4, r0 -/* 802EABF4 38 63 00 02 */ addi r3, r3, 2 -/* 802EABF8 42 00 FF F0 */ bdnz lbl_802EABE8 -/* 802EABFC 28 1F 00 00 */ cmplwi r31, 0 -/* 802EAC00 41 82 00 60 */ beq lbl_802EAC60 -/* 802EAC04 A0 7F 00 12 */ lhz r3, 0x12(r31) -/* 802EAC08 A0 BE 00 0C */ lhz r5, 0xc(r30) -/* 802EAC0C 39 00 00 00 */ li r8, 0 -/* 802EAC10 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 802EAC14 48 00 00 40 */ b lbl_802EAC54 -lbl_802EAC18: -/* 802EAC18 80 9F 00 38 */ lwz r4, 0x38(r31) -/* 802EAC1C 55 07 04 3E */ clrlwi r7, r8, 0x10 -/* 802EAC20 55 03 0B FC */ rlwinm r3, r8, 1, 0xf, 0x1e -/* 802EAC24 7C 64 1A 2E */ lhzx r3, r4, r3 -/* 802EAC28 7C 05 18 40 */ cmplw r5, r3 -/* 802EAC2C 40 82 00 24 */ bne lbl_802EAC50 -/* 802EAC30 80 DF 00 50 */ lwz r6, 0x50(r31) -/* 802EAC34 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 802EAC38 1C 67 00 1C */ mulli r3, r7, 0x1c -/* 802EAC3C 38 63 00 18 */ addi r3, r3, 0x18 -/* 802EAC40 7C 66 18 AE */ lbzx r3, r6, r3 -/* 802EAC44 54 63 08 3C */ slwi r3, r3, 1 -/* 802EAC48 38 63 00 3A */ addi r3, r3, 0x3a -/* 802EAC4C 7D 04 1B 2E */ sthx r8, r4, r3 -lbl_802EAC50: -/* 802EAC50 39 08 00 01 */ addi r8, r8, 1 -lbl_802EAC54: -/* 802EAC54 55 03 04 3E */ clrlwi r3, r8, 0x10 -/* 802EAC58 7C 03 00 40 */ cmplw r3, r0 -/* 802EAC5C 41 80 FF BC */ blt lbl_802EAC18 -lbl_802EAC60: -/* 802EAC60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EAC64 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EAC68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EAC6C 7C 08 03 A6 */ mtlr r0 -/* 802EAC70 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EAC74 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP16J2DAnmTexPattern.s b/asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP16J2DAnmTexPattern.s deleted file mode 100644 index 8009bfb39b5..00000000000 --- a/asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP16J2DAnmTexPattern.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_802EAA2C: -/* 802EAA2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EAA30 7C 08 02 A6 */ mflr r0 -/* 802EAA34 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EAA38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EAA3C 93 C1 00 08 */ stw r30, 8(r1) -/* 802EAA40 7C 7E 1B 78 */ mr r30, r3 -/* 802EAA44 7C 9F 23 79 */ or. r31, r4, r4 -/* 802EAA48 40 82 00 10 */ bne lbl_802EAA58 -/* 802EAA4C 80 1E 00 84 */ lwz r0, 0x84(r30) -/* 802EAA50 28 00 00 00 */ cmplwi r0, 0 -/* 802EAA54 41 82 00 A0 */ beq lbl_802EAAF4 -lbl_802EAA58: -/* 802EAA58 7F C3 F3 78 */ mr r3, r30 -/* 802EAA5C 4B FF FD F1 */ bl makeAnmPointer__11J2DMaterialFv -/* 802EAA60 80 7E 00 84 */ lwz r3, 0x84(r30) -/* 802EAA64 93 E3 00 08 */ stw r31, 8(r3) -/* 802EAA68 38 60 00 00 */ li r3, 0 -/* 802EAA6C 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 802EAA70 38 A4 FF FF */ addi r5, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 802EAA74 38 00 00 08 */ li r0, 8 -/* 802EAA78 7C 09 03 A6 */ mtctr r0 -lbl_802EAA7C: -/* 802EAA7C 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 802EAA80 38 03 00 22 */ addi r0, r3, 0x22 -/* 802EAA84 7C A4 03 2E */ sthx r5, r4, r0 -/* 802EAA88 38 63 00 02 */ addi r3, r3, 2 -/* 802EAA8C 42 00 FF F0 */ bdnz lbl_802EAA7C -/* 802EAA90 28 1F 00 00 */ cmplwi r31, 0 -/* 802EAA94 41 82 00 60 */ beq lbl_802EAAF4 -/* 802EAA98 A0 7F 00 1A */ lhz r3, 0x1a(r31) -/* 802EAA9C A0 BE 00 0C */ lhz r5, 0xc(r30) -/* 802EAAA0 80 DF 00 14 */ lwz r6, 0x14(r31) -/* 802EAAA4 39 00 00 00 */ li r8, 0 -/* 802EAAA8 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 802EAAAC 48 00 00 3C */ b lbl_802EAAE8 -lbl_802EAAB0: -/* 802EAAB0 80 9F 00 1C */ lwz r4, 0x1c(r31) -/* 802EAAB4 55 07 04 3E */ clrlwi r7, r8, 0x10 -/* 802EAAB8 55 03 0B FC */ rlwinm r3, r8, 1, 0xf, 0x1e -/* 802EAABC 7C 64 1A 2E */ lhzx r3, r4, r3 -/* 802EAAC0 7C 05 18 40 */ cmplw r5, r3 -/* 802EAAC4 40 82 00 20 */ bne lbl_802EAAE4 -/* 802EAAC8 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 802EAACC 54 E3 18 38 */ slwi r3, r7, 3 -/* 802EAAD0 38 63 00 04 */ addi r3, r3, 4 -/* 802EAAD4 7C 66 18 AE */ lbzx r3, r6, r3 -/* 802EAAD8 54 63 08 3C */ slwi r3, r3, 1 -/* 802EAADC 38 63 00 22 */ addi r3, r3, 0x22 -/* 802EAAE0 7D 04 1B 2E */ sthx r8, r4, r3 -lbl_802EAAE4: -/* 802EAAE4 39 08 00 01 */ addi r8, r8, 1 -lbl_802EAAE8: -/* 802EAAE8 55 03 04 3E */ clrlwi r3, r8, 0x10 -/* 802EAAEC 7C 03 00 40 */ cmplw r3, r0 -/* 802EAAF0 41 80 FF C0 */ blt lbl_802EAAB0 -lbl_802EAAF4: -/* 802EAAF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EAAF8 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EAAFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EAB00 7C 08 03 A6 */ mtlr r0 -/* 802EAB04 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EAB08 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey.s b/asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey.s deleted file mode 100644 index 18f8c88d397..00000000000 --- a/asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_802EA94C: -/* 802EA94C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EA950 7C 08 02 A6 */ mflr r0 -/* 802EA954 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EA958 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EA95C 93 C1 00 08 */ stw r30, 8(r1) -/* 802EA960 7C 7E 1B 78 */ mr r30, r3 -/* 802EA964 7C 9F 23 79 */ or. r31, r4, r4 -/* 802EA968 40 82 00 10 */ bne lbl_802EA978 -/* 802EA96C 80 1E 00 84 */ lwz r0, 0x84(r30) -/* 802EA970 28 00 00 00 */ cmplwi r0, 0 -/* 802EA974 41 82 00 A0 */ beq lbl_802EAA14 -lbl_802EA978: -/* 802EA978 7F C3 F3 78 */ mr r3, r30 -/* 802EA97C 4B FF FE D1 */ bl makeAnmPointer__11J2DMaterialFv -/* 802EA980 80 7E 00 84 */ lwz r3, 0x84(r30) -/* 802EA984 93 E3 00 04 */ stw r31, 4(r3) -/* 802EA988 38 60 00 00 */ li r3, 0 -/* 802EA98C 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 802EA990 38 A4 FF FF */ addi r5, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 802EA994 38 00 00 08 */ li r0, 8 -/* 802EA998 7C 09 03 A6 */ mtctr r0 -lbl_802EA99C: -/* 802EA99C 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 802EA9A0 38 03 00 12 */ addi r0, r3, 0x12 -/* 802EA9A4 7C A4 03 2E */ sthx r5, r4, r0 -/* 802EA9A8 38 63 00 02 */ addi r3, r3, 2 -/* 802EA9AC 42 00 FF F0 */ bdnz lbl_802EA99C -/* 802EA9B0 28 1F 00 00 */ cmplwi r31, 0 -/* 802EA9B4 41 82 00 60 */ beq lbl_802EAA14 -/* 802EA9B8 A0 7F 00 18 */ lhz r3, 0x18(r31) -/* 802EA9BC 38 00 00 03 */ li r0, 3 -/* 802EA9C0 7C 03 03 D6 */ divw r0, r3, r0 -/* 802EA9C4 54 06 04 3E */ clrlwi r6, r0, 0x10 -/* 802EA9C8 A0 BE 00 0C */ lhz r5, 0xc(r30) -/* 802EA9CC 38 E0 00 00 */ li r7, 0 -/* 802EA9D0 48 00 00 38 */ b lbl_802EAA08 -lbl_802EA9D4: -/* 802EA9D4 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 802EA9D8 54 E4 04 3E */ clrlwi r4, r7, 0x10 -/* 802EA9DC 54 E0 0B FC */ rlwinm r0, r7, 1, 0xf, 0x1e -/* 802EA9E0 7C 03 02 2E */ lhzx r0, r3, r0 -/* 802EA9E4 7C 05 00 40 */ cmplw r5, r0 -/* 802EA9E8 40 82 00 1C */ bne lbl_802EAA04 -/* 802EA9EC 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 802EA9F0 7C 03 20 AE */ lbzx r0, r3, r4 -/* 802EA9F4 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 802EA9F8 54 03 0D FC */ rlwinm r3, r0, 1, 0x17, 0x1e -/* 802EA9FC 38 03 00 12 */ addi r0, r3, 0x12 -/* 802EAA00 7C E4 03 2E */ sthx r7, r4, r0 -lbl_802EAA04: -/* 802EAA04 38 E7 00 01 */ addi r7, r7, 1 -lbl_802EAA08: -/* 802EAA08 54 E0 04 3E */ clrlwi r0, r7, 0x10 -/* 802EAA0C 7C 00 30 40 */ cmplw r0, r6 -/* 802EAA10 41 80 FF C4 */ blt lbl_802EA9D4 -lbl_802EAA14: -/* 802EAA14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EAA18 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EAA1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EAA20 7C 08 03 A6 */ mtlr r0 -/* 802EAA24 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EAA28 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMaterial/setGX__11J2DMaterialFv.s b/asm/JSystem/J2DGraph/J2DMaterial/setGX__11J2DMaterialFv.s deleted file mode 100644 index e3d0353ddf5..00000000000 --- a/asm/JSystem/J2DGraph/J2DMaterial/setGX__11J2DMaterialFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_802EA38C: -/* 802EA38C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EA390 7C 08 02 A6 */ mflr r0 -/* 802EA394 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EA398 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EA39C 7C 7F 1B 78 */ mr r31, r3 -/* 802EA3A0 88 03 00 0E */ lbz r0, 0xe(r3) -/* 802EA3A4 28 00 00 00 */ cmplwi r0, 0 -/* 802EA3A8 41 82 00 54 */ beq lbl_802EA3FC -/* 802EA3AC 38 7F 00 10 */ addi r3, r31, 0x10 -/* 802EA3B0 48 00 10 75 */ bl setGX__13J2DColorBlockFv -/* 802EA3B4 38 7F 00 28 */ addi r3, r31, 0x28 -/* 802EA3B8 48 00 11 B9 */ bl setGX__14J2DTexGenBlockFv -/* 802EA3BC 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 802EA3C0 28 03 00 00 */ cmplwi r3, 0 -/* 802EA3C4 41 82 00 14 */ beq lbl_802EA3D8 -/* 802EA3C8 81 83 00 00 */ lwz r12, 0(r3) -/* 802EA3CC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802EA3D0 7D 89 03 A6 */ mtctr r12 -/* 802EA3D4 4E 80 04 21 */ bctrl -lbl_802EA3D8: -/* 802EA3D8 80 7F 00 74 */ lwz r3, 0x74(r31) -/* 802EA3DC 28 03 00 00 */ cmplwi r3, 0 -/* 802EA3E0 41 82 00 14 */ beq lbl_802EA3F4 -/* 802EA3E4 81 83 00 00 */ lwz r12, 0(r3) -/* 802EA3E8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802EA3EC 7D 89 03 A6 */ mtctr r12 -/* 802EA3F0 4E 80 04 21 */ bctrl -lbl_802EA3F4: -/* 802EA3F4 38 7F 00 78 */ addi r3, r31, 0x78 -/* 802EA3F8 48 00 74 49 */ bl setGX__10J2DPEBlockFv -lbl_802EA3FC: -/* 802EA3FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EA400 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EA404 7C 08 03 A6 */ mtlr r0 -/* 802EA408 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EA40C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/__dt__9J2DScreenFv.s b/asm/JSystem/J2DGraph/J2DScreen/__dt__9J2DScreenFv.s deleted file mode 100644 index b1aba5876fd..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/__dt__9J2DScreenFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_802F8540: -/* 802F8540 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F8544 7C 08 02 A6 */ mflr r0 -/* 802F8548 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F854C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F8550 93 C1 00 08 */ stw r30, 8(r1) -/* 802F8554 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802F8558 7C 9F 23 78 */ mr r31, r4 -/* 802F855C 41 82 00 30 */ beq lbl_802F858C -/* 802F8560 3C 80 80 3D */ lis r4, __vt__9J2DScreen@ha /* 0x803CD068@ha */ -/* 802F8564 38 04 D0 68 */ addi r0, r4, __vt__9J2DScreen@l /* 0x803CD068@l */ -/* 802F8568 90 1E 00 00 */ stw r0, 0(r30) -/* 802F856C 48 00 00 3D */ bl clean__9J2DScreenFv -/* 802F8570 7F C3 F3 78 */ mr r3, r30 -/* 802F8574 38 80 00 00 */ li r4, 0 -/* 802F8578 4B FF E0 15 */ bl __dt__7J2DPaneFv -/* 802F857C 7F E0 07 35 */ extsh. r0, r31 -/* 802F8580 40 81 00 0C */ ble lbl_802F858C -/* 802F8584 7F C3 F3 78 */ mr r3, r30 -/* 802F8588 4B FD 67 B5 */ bl __dl__FPv -lbl_802F858C: -/* 802F858C 7F C3 F3 78 */ mr r3, r30 -/* 802F8590 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F8594 83 C1 00 08 */ lwz r30, 8(r1) -/* 802F8598 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F859C 7C 08 03 A6 */ mtlr r0 -/* 802F85A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F85A4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/animation__9J2DScreenFv.s b/asm/JSystem/J2DGraph/J2DScreen/animation__9J2DScreenFv.s deleted file mode 100644 index a9cd56b4a4e..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/animation__9J2DScreenFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_802F9690: -/* 802F9690 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F9694 7C 08 02 A6 */ mflr r0 -/* 802F9698 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F969C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F96A0 93 C1 00 08 */ stw r30, 8(r1) -/* 802F96A4 7C 7E 1B 78 */ mr r30, r3 -/* 802F96A8 80 83 00 F8 */ lwz r4, 0xf8(r3) -/* 802F96AC 81 83 00 00 */ lwz r12, 0(r3) -/* 802F96B0 81 8C 00 90 */ lwz r12, 0x90(r12) -/* 802F96B4 7D 89 03 A6 */ mtctr r12 -/* 802F96B8 4E 80 04 21 */ bctrl -/* 802F96BC 3B E0 00 00 */ li r31, 0 -/* 802F96C0 48 00 00 1C */ b lbl_802F96DC -lbl_802F96C4: -/* 802F96C4 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 802F96C8 57 E0 04 3E */ clrlwi r0, r31, 0x10 -/* 802F96CC 1C 00 00 88 */ mulli r0, r0, 0x88 -/* 802F96D0 7C 63 02 14 */ add r3, r3, r0 -/* 802F96D4 4B FF 15 A5 */ bl animation__11J2DMaterialFv -/* 802F96D8 3B FF 00 01 */ addi r31, r31, 1 -lbl_802F96DC: -/* 802F96DC 57 E3 04 3E */ clrlwi r3, r31, 0x10 -/* 802F96E0 A0 1E 01 02 */ lhz r0, 0x102(r30) -/* 802F96E4 7C 03 00 40 */ cmplw r3, r0 -/* 802F96E8 41 80 FF DC */ blt lbl_802F96C4 -/* 802F96EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F96F0 83 C1 00 08 */ lwz r30, 8(r1) -/* 802F96F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F96F8 7C 08 03 A6 */ mtlr r0 -/* 802F96FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F9700 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/checkSignature__9J2DScreenFP20JSURandomInputStream.s b/asm/JSystem/J2DGraph/J2DScreen/checkSignature__9J2DScreenFP20JSURandomInputStream.s deleted file mode 100644 index 7ef5976f8d7..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/checkSignature__9J2DScreenFP20JSURandomInputStream.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_802F8834: -/* 802F8834 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802F8838 7C 08 02 A6 */ mflr r0 -/* 802F883C 90 01 00 34 */ stw r0, 0x34(r1) -/* 802F8840 7C 83 23 78 */ mr r3, r4 -/* 802F8844 38 81 00 08 */ addi r4, r1, 8 -/* 802F8848 38 A0 00 20 */ li r5, 0x20 -/* 802F884C 4B FE 3A 4D */ bl read__14JSUInputStreamFPvl -/* 802F8850 80 61 00 08 */ lwz r3, 8(r1) -/* 802F8854 3C 03 AC BD */ addis r0, r3, 0xacbd -/* 802F8858 28 00 52 4E */ cmplwi r0, 0x524e -/* 802F885C 40 82 00 1C */ bne lbl_802F8878 -/* 802F8860 80 61 00 0C */ lwz r3, 0xc(r1) -/* 802F8864 3C 03 9D 94 */ addis r0, r3, 0x9d94 -/* 802F8868 28 00 6F 31 */ cmplwi r0, 0x6f31 -/* 802F886C 41 82 00 14 */ beq lbl_802F8880 -/* 802F8870 28 00 6F 32 */ cmplwi r0, 0x6f32 -/* 802F8874 41 82 00 0C */ beq lbl_802F8880 -lbl_802F8878: -/* 802F8878 38 60 00 00 */ li r3, 0 -/* 802F887C 48 00 00 08 */ b lbl_802F8884 -lbl_802F8880: -/* 802F8880 38 60 00 01 */ li r3, 1 -lbl_802F8884: -/* 802F8884 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802F8888 7C 08 03 A6 */ mtlr r0 -/* 802F888C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F8890 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/func_802F8B98.s b/asm/JSystem/J2DGraph/J2DScreen/func_802F8B98.s deleted file mode 100644 index 59490923f4c..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/func_802F8B98.s +++ /dev/null @@ -1,236 +0,0 @@ -lbl_802F8B98: -/* 802F8B98 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F8B9C 7C 08 02 A6 */ mflr r0 -/* 802F8BA0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F8BA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F8BA8 48 06 96 29 */ bl _savegpr_26 -/* 802F8BAC 7C 7A 1B 78 */ mr r26, r3 -/* 802F8BB0 7C 9B 23 78 */ mr r27, r4 -/* 802F8BB4 7C BC 2B 78 */ mr r28, r5 -/* 802F8BB8 7C DD 33 78 */ mr r29, r6 -/* 802F8BBC 7C FE 3B 78 */ mr r30, r7 -/* 802F8BC0 7D 1F 43 78 */ mr r31, r8 -/* 802F8BC4 80 A4 00 00 */ lwz r5, 0(r4) -/* 802F8BC8 3C 80 54 42 */ lis r4, 0x5442 /* 0x54425831@ha */ -/* 802F8BCC 38 04 58 31 */ addi r0, r4, 0x5831 /* 0x54425831@l */ -/* 802F8BD0 7C 05 00 00 */ cmpw r5, r0 -/* 802F8BD4 41 82 01 08 */ beq lbl_802F8CDC -/* 802F8BD8 40 80 00 4C */ bge lbl_802F8C24 -/* 802F8BDC 3C 60 50 49 */ lis r3, 0x5049 /* 0x50494331@ha */ -/* 802F8BE0 38 03 43 31 */ addi r0, r3, 0x4331 /* 0x50494331@l */ -/* 802F8BE4 7C 05 00 00 */ cmpw r5, r0 -/* 802F8BE8 41 82 00 C8 */ beq lbl_802F8CB0 -/* 802F8BEC 40 80 00 28 */ bge lbl_802F8C14 -/* 802F8BF0 3C 60 50 41 */ lis r3, 0x5041 /* 0x50414E32@ha */ -/* 802F8BF4 38 03 4E 32 */ addi r0, r3, 0x4E32 /* 0x50414E32@l */ -/* 802F8BF8 7C 05 00 00 */ cmpw r5, r0 -/* 802F8BFC 41 82 01 0C */ beq lbl_802F8D08 -/* 802F8C00 40 80 02 64 */ bge lbl_802F8E64 -/* 802F8C04 38 03 4E 31 */ addi r0, r3, 0x4e31 -/* 802F8C08 7C 05 00 00 */ cmpw r5, r0 -/* 802F8C0C 40 80 00 4C */ bge lbl_802F8C58 -/* 802F8C10 48 00 02 54 */ b lbl_802F8E64 -lbl_802F8C14: -/* 802F8C14 38 03 43 33 */ addi r0, r3, 0x4333 -/* 802F8C18 7C 05 00 00 */ cmpw r5, r0 -/* 802F8C1C 40 80 02 48 */ bge lbl_802F8E64 -/* 802F8C20 48 00 01 78 */ b lbl_802F8D98 -lbl_802F8C24: -/* 802F8C24 3C 60 57 49 */ lis r3, 0x5749 /* 0x57494E31@ha */ -/* 802F8C28 38 03 4E 31 */ addi r0, r3, 0x4E31 /* 0x57494E31@l */ -/* 802F8C2C 7C 05 00 00 */ cmpw r5, r0 -/* 802F8C30 41 82 00 54 */ beq lbl_802F8C84 -/* 802F8C34 40 80 00 14 */ bge lbl_802F8C48 -/* 802F8C38 38 04 58 33 */ addi r0, r4, 0x5833 -/* 802F8C3C 7C 05 00 00 */ cmpw r5, r0 -/* 802F8C40 40 80 02 24 */ bge lbl_802F8E64 -/* 802F8C44 48 00 01 B8 */ b lbl_802F8DFC -lbl_802F8C48: -/* 802F8C48 38 03 4E 33 */ addi r0, r3, 0x4e33 -/* 802F8C4C 7C 05 00 00 */ cmpw r5, r0 -/* 802F8C50 40 80 02 14 */ bge lbl_802F8E64 -/* 802F8C54 48 00 00 E0 */ b lbl_802F8D34 -lbl_802F8C58: -/* 802F8C58 38 60 01 00 */ li r3, 0x100 -/* 802F8C5C 4B FD 5F F1 */ bl __nw__FUl -/* 802F8C60 7C 60 1B 79 */ or. r0, r3, r3 -/* 802F8C64 41 82 00 18 */ beq lbl_802F8C7C -/* 802F8C68 7F A4 EB 78 */ mr r4, r29 -/* 802F8C6C 7F 85 E3 78 */ mr r5, r28 -/* 802F8C70 38 C0 00 00 */ li r6, 0 -/* 802F8C74 4B FF D3 29 */ bl __ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc -/* 802F8C78 7C 60 1B 78 */ mr r0, r3 -lbl_802F8C7C: -/* 802F8C7C 7C 1A 03 78 */ mr r26, r0 -/* 802F8C80 48 00 02 38 */ b lbl_802F8EB8 -lbl_802F8C84: -/* 802F8C84 38 60 01 48 */ li r3, 0x148 -/* 802F8C88 4B FD 5F C5 */ bl __nw__FUl -/* 802F8C8C 7C 60 1B 79 */ or. r0, r3, r3 -/* 802F8C90 41 82 00 18 */ beq lbl_802F8CA8 -/* 802F8C94 7F A4 EB 78 */ mr r4, r29 -/* 802F8C98 7F 85 E3 78 */ mr r5, r28 -/* 802F8C9C 7F E6 FB 78 */ mr r6, r31 -/* 802F8CA0 48 00 0E D5 */ bl __ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive -/* 802F8CA4 7C 60 1B 78 */ mr r0, r3 -lbl_802F8CA8: -/* 802F8CA8 7C 1A 03 78 */ mr r26, r0 -/* 802F8CAC 48 00 02 0C */ b lbl_802F8EB8 -lbl_802F8CB0: -/* 802F8CB0 38 60 01 50 */ li r3, 0x150 -/* 802F8CB4 4B FD 5F 99 */ bl __nw__FUl -/* 802F8CB8 7C 60 1B 79 */ or. r0, r3, r3 -/* 802F8CBC 41 82 00 18 */ beq lbl_802F8CD4 -/* 802F8CC0 7F A4 EB 78 */ mr r4, r29 -/* 802F8CC4 7F 85 E3 78 */ mr r5, r28 -/* 802F8CC8 7F E6 FB 78 */ mr r6, r31 -/* 802F8CCC 48 00 34 4D */ bl __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive -/* 802F8CD0 7C 60 1B 78 */ mr r0, r3 -lbl_802F8CD4: -/* 802F8CD4 7C 1A 03 78 */ mr r26, r0 -/* 802F8CD8 48 00 01 E0 */ b lbl_802F8EB8 -lbl_802F8CDC: -/* 802F8CDC 38 60 01 38 */ li r3, 0x138 -/* 802F8CE0 4B FD 5F 6D */ bl __nw__FUl -/* 802F8CE4 7C 60 1B 79 */ or. r0, r3, r3 -/* 802F8CE8 41 82 00 18 */ beq lbl_802F8D00 -/* 802F8CEC 7F A4 EB 78 */ mr r4, r29 -/* 802F8CF0 7F 85 E3 78 */ mr r5, r28 -/* 802F8CF4 7F E6 FB 78 */ mr r6, r31 -/* 802F8CF8 48 00 69 E1 */ bl __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive -/* 802F8CFC 7C 60 1B 78 */ mr r0, r3 -lbl_802F8D00: -/* 802F8D00 7C 1A 03 78 */ mr r26, r0 -/* 802F8D04 48 00 01 B4 */ b lbl_802F8EB8 -lbl_802F8D08: -/* 802F8D08 38 60 01 00 */ li r3, 0x100 -/* 802F8D0C 4B FD 5F 41 */ bl __nw__FUl -/* 802F8D10 7C 60 1B 79 */ or. r0, r3, r3 -/* 802F8D14 41 82 00 18 */ beq lbl_802F8D2C -/* 802F8D18 7F A4 EB 78 */ mr r4, r29 -/* 802F8D1C 7F 85 E3 78 */ mr r5, r28 -/* 802F8D20 38 C0 00 01 */ li r6, 1 -/* 802F8D24 4B FF D2 79 */ bl __ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc -/* 802F8D28 7C 60 1B 78 */ mr r0, r3 -lbl_802F8D2C: -/* 802F8D2C 7C 1A 03 78 */ mr r26, r0 -/* 802F8D30 48 00 01 88 */ b lbl_802F8EB8 -lbl_802F8D34: -/* 802F8D34 57 C0 02 DF */ rlwinm. r0, r30, 0, 0xb, 0xf -/* 802F8D38 41 82 00 34 */ beq lbl_802F8D6C -/* 802F8D3C 38 60 01 80 */ li r3, 0x180 -/* 802F8D40 4B FD 5F 0D */ bl __nw__FUl -/* 802F8D44 7C 60 1B 79 */ or. r0, r3, r3 -/* 802F8D48 41 82 00 1C */ beq lbl_802F8D64 -/* 802F8D4C 7F A4 EB 78 */ mr r4, r29 -/* 802F8D50 7F 85 E3 78 */ mr r5, r28 -/* 802F8D54 7F C6 F3 78 */ mr r6, r30 -/* 802F8D58 80 FA 01 04 */ lwz r7, 0x104(r26) -/* 802F8D5C 48 00 7F 39 */ bl __ct__11J2DWindowExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial -/* 802F8D60 7C 60 1B 78 */ mr r0, r3 -lbl_802F8D64: -/* 802F8D64 7C 1A 03 78 */ mr r26, r0 -/* 802F8D68 48 00 01 50 */ b lbl_802F8EB8 -lbl_802F8D6C: -/* 802F8D6C 38 60 01 48 */ li r3, 0x148 -/* 802F8D70 4B FD 5E DD */ bl __nw__FUl -/* 802F8D74 7C 60 1B 79 */ or. r0, r3, r3 -/* 802F8D78 41 82 00 18 */ beq lbl_802F8D90 -/* 802F8D7C 7F A4 EB 78 */ mr r4, r29 -/* 802F8D80 7F 85 E3 78 */ mr r5, r28 -/* 802F8D84 80 DA 01 04 */ lwz r6, 0x104(r26) -/* 802F8D88 48 00 0E 89 */ bl __ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial -/* 802F8D8C 7C 60 1B 78 */ mr r0, r3 -lbl_802F8D90: -/* 802F8D90 7C 1A 03 78 */ mr r26, r0 -/* 802F8D94 48 00 01 24 */ b lbl_802F8EB8 -lbl_802F8D98: -/* 802F8D98 57 C0 02 DF */ rlwinm. r0, r30, 0, 0xb, 0xf -/* 802F8D9C 41 82 00 34 */ beq lbl_802F8DD0 -/* 802F8DA0 38 60 01 A0 */ li r3, 0x1a0 -/* 802F8DA4 4B FD 5E A9 */ bl __nw__FUl -/* 802F8DA8 7C 60 1B 79 */ or. r0, r3, r3 -/* 802F8DAC 41 82 00 1C */ beq lbl_802F8DC8 -/* 802F8DB0 7F A4 EB 78 */ mr r4, r29 -/* 802F8DB4 7F 85 E3 78 */ mr r5, r28 -/* 802F8DB8 7F C6 F3 78 */ mr r6, r30 -/* 802F8DBC 80 FA 01 04 */ lwz r7, 0x104(r26) -/* 802F8DC0 48 00 A9 2D */ bl __ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial -/* 802F8DC4 7C 60 1B 78 */ mr r0, r3 -lbl_802F8DC8: -/* 802F8DC8 7C 1A 03 78 */ mr r26, r0 -/* 802F8DCC 48 00 00 EC */ b lbl_802F8EB8 -lbl_802F8DD0: -/* 802F8DD0 38 60 01 50 */ li r3, 0x150 -/* 802F8DD4 4B FD 5E 79 */ bl __nw__FUl -/* 802F8DD8 7C 60 1B 79 */ or. r0, r3, r3 -/* 802F8DDC 41 82 00 18 */ beq lbl_802F8DF4 -/* 802F8DE0 7F A4 EB 78 */ mr r4, r29 -/* 802F8DE4 7F 85 E3 78 */ mr r5, r28 -/* 802F8DE8 80 DA 01 04 */ lwz r6, 0x104(r26) -/* 802F8DEC 48 00 33 E9 */ bl __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial -/* 802F8DF0 7C 60 1B 78 */ mr r0, r3 -lbl_802F8DF4: -/* 802F8DF4 7C 1A 03 78 */ mr r26, r0 -/* 802F8DF8 48 00 00 C0 */ b lbl_802F8EB8 -lbl_802F8DFC: -/* 802F8DFC 57 C0 02 DF */ rlwinm. r0, r30, 0, 0xb, 0xf -/* 802F8E00 41 82 00 34 */ beq lbl_802F8E34 -/* 802F8E04 38 60 01 48 */ li r3, 0x148 -/* 802F8E08 4B FD 5E 45 */ bl __nw__FUl -/* 802F8E0C 7C 60 1B 79 */ or. r0, r3, r3 -/* 802F8E10 41 82 00 1C */ beq lbl_802F8E2C -/* 802F8E14 7F A4 EB 78 */ mr r4, r29 -/* 802F8E18 7F 85 E3 78 */ mr r5, r28 -/* 802F8E1C 7F C6 F3 78 */ mr r6, r30 -/* 802F8E20 80 FA 01 04 */ lwz r7, 0x104(r26) -/* 802F8E24 48 00 E3 C1 */ bl __ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial -/* 802F8E28 7C 60 1B 78 */ mr r0, r3 -lbl_802F8E2C: -/* 802F8E2C 7C 1A 03 78 */ mr r26, r0 -/* 802F8E30 48 00 00 88 */ b lbl_802F8EB8 -lbl_802F8E34: -/* 802F8E34 38 60 01 38 */ li r3, 0x138 -/* 802F8E38 4B FD 5E 15 */ bl __nw__FUl -/* 802F8E3C 7C 60 1B 79 */ or. r0, r3, r3 -/* 802F8E40 41 82 00 1C */ beq lbl_802F8E5C -/* 802F8E44 7F A4 EB 78 */ mr r4, r29 -/* 802F8E48 7F 85 E3 78 */ mr r5, r28 -/* 802F8E4C 7F C6 F3 78 */ mr r6, r30 -/* 802F8E50 80 FA 01 04 */ lwz r7, 0x104(r26) -/* 802F8E54 48 00 69 09 */ bl __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial -/* 802F8E58 7C 60 1B 78 */ mr r0, r3 -lbl_802F8E5C: -/* 802F8E5C 7C 1A 03 78 */ mr r26, r0 -/* 802F8E60 48 00 00 58 */ b lbl_802F8EB8 -lbl_802F8E64: -/* 802F8E64 7F 83 E3 78 */ mr r3, r28 -/* 802F8E68 81 9C 00 00 */ lwz r12, 0(r28) -/* 802F8E6C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802F8E70 7D 89 03 A6 */ mtctr r12 -/* 802F8E74 4E 80 04 21 */ bctrl -/* 802F8E78 80 1B 00 04 */ lwz r0, 4(r27) -/* 802F8E7C 7F 60 1A 14 */ add r27, r0, r3 -/* 802F8E80 38 60 01 00 */ li r3, 0x100 -/* 802F8E84 4B FD 5D C9 */ bl __nw__FUl -/* 802F8E88 7C 60 1B 79 */ or. r0, r3, r3 -/* 802F8E8C 41 82 00 18 */ beq lbl_802F8EA4 -/* 802F8E90 7F A4 EB 78 */ mr r4, r29 -/* 802F8E94 7F 85 E3 78 */ mr r5, r28 -/* 802F8E98 38 C0 00 00 */ li r6, 0 -/* 802F8E9C 4B FF D1 01 */ bl __ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc -/* 802F8EA0 7C 60 1B 78 */ mr r0, r3 -lbl_802F8EA4: -/* 802F8EA4 7C 1A 03 78 */ mr r26, r0 -/* 802F8EA8 7F 83 E3 78 */ mr r3, r28 -/* 802F8EAC 7F 64 DB 78 */ mr r4, r27 -/* 802F8EB0 38 A0 00 00 */ li r5, 0 -/* 802F8EB4 4B FE 36 29 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -lbl_802F8EB8: -/* 802F8EB8 7F 43 D3 78 */ mr r3, r26 -/* 802F8EBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F8EC0 48 06 93 5D */ bl _restgpr_26 -/* 802F8EC4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F8EC8 7C 08 03 A6 */ mtlr r0 -/* 802F8ECC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F8ED0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/getNameResource__9J2DScreenFPCc.s b/asm/JSystem/J2DGraph/J2DScreen/getNameResource__9J2DScreenFPCc.s deleted file mode 100644 index 230efd8290a..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/getNameResource__9J2DScreenFPCc.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_802F9640: -/* 802F9640 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F9644 7C 08 02 A6 */ mflr r0 -/* 802F9648 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F964C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F9650 7C 7F 1B 78 */ mr r31, r3 -/* 802F9654 38 80 00 00 */ li r4, 0 -/* 802F9658 4B FD AC 19 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 802F965C 28 03 00 00 */ cmplwi r3, 0 -/* 802F9660 40 82 00 1C */ bne lbl_802F967C -/* 802F9664 80 0D 90 10 */ lwz r0, mDataManage__9J2DScreen(r13) -/* 802F9668 28 00 00 00 */ cmplwi r0, 0 -/* 802F966C 41 82 00 10 */ beq lbl_802F967C -/* 802F9670 7C 03 03 78 */ mr r3, r0 -/* 802F9674 7F E4 FB 78 */ mr r4, r31 -/* 802F9678 48 01 37 A1 */ bl get__13J2DDataManageFPCc -lbl_802F967C: -/* 802F967C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F9680 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F9684 7C 08 03 A6 */ mtlr r0 -/* 802F9688 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F968C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/getScreenInformation__9J2DScreenFP20JSURandomInputStream.s b/asm/JSystem/J2DGraph/J2DScreen/getScreenInformation__9J2DScreenFP20JSURandomInputStream.s deleted file mode 100644 index c932aac1689..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/getScreenInformation__9J2DScreenFP20JSURandomInputStream.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_802F8894: -/* 802F8894 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802F8898 7C 08 02 A6 */ mflr r0 -/* 802F889C 90 01 00 54 */ stw r0, 0x54(r1) -/* 802F88A0 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 802F88A4 93 C1 00 48 */ stw r30, 0x48(r1) -/* 802F88A8 7C 7E 1B 78 */ mr r30, r3 -/* 802F88AC 7C 9F 23 78 */ mr r31, r4 -/* 802F88B0 7F E3 FB 78 */ mr r3, r31 -/* 802F88B4 38 81 00 1C */ addi r4, r1, 0x1c -/* 802F88B8 38 A0 00 10 */ li r5, 0x10 -/* 802F88BC 4B FE 39 DD */ bl read__14JSUInputStreamFPvl -/* 802F88C0 80 61 00 1C */ lwz r3, 0x1c(r1) -/* 802F88C4 3C 03 B6 B2 */ addis r0, r3, 0xb6b2 -/* 802F88C8 28 00 46 31 */ cmplwi r0, 0x4631 -/* 802F88CC 41 82 00 0C */ beq lbl_802F88D8 -/* 802F88D0 38 60 00 00 */ li r3, 0 -/* 802F88D4 48 00 00 A4 */ b lbl_802F8978 -lbl_802F88D8: -/* 802F88D8 C0 02 C8 20 */ lfs f0, lit_1561(r2) -/* 802F88DC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802F88E0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802F88E4 A0 01 00 24 */ lhz r0, 0x24(r1) -/* 802F88E8 C8 22 C8 30 */ lfd f1, lit_1705(r2) -/* 802F88EC 90 01 00 34 */ stw r0, 0x34(r1) -/* 802F88F0 3C 60 43 30 */ lis r3, 0x4330 -/* 802F88F4 90 61 00 30 */ stw r3, 0x30(r1) -/* 802F88F8 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 802F88FC EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F8900 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802F8904 A0 01 00 26 */ lhz r0, 0x26(r1) -/* 802F8908 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802F890C 90 61 00 38 */ stw r3, 0x38(r1) -/* 802F8910 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 802F8914 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F8918 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 802F891C 7F C3 F3 78 */ mr r3, r30 -/* 802F8920 38 81 00 0C */ addi r4, r1, 0xc -/* 802F8924 4B FF E3 F5 */ bl func_802F6D18 -/* 802F8928 80 01 00 28 */ lwz r0, 0x28(r1) -/* 802F892C 90 01 00 08 */ stw r0, 8(r1) -/* 802F8930 88 01 00 08 */ lbz r0, 8(r1) -/* 802F8934 98 1E 01 14 */ stb r0, 0x114(r30) -/* 802F8938 88 01 00 09 */ lbz r0, 9(r1) -/* 802F893C 98 1E 01 15 */ stb r0, 0x115(r30) -/* 802F8940 88 01 00 0A */ lbz r0, 0xa(r1) -/* 802F8944 98 1E 01 16 */ stb r0, 0x116(r30) -/* 802F8948 88 01 00 0B */ lbz r0, 0xb(r1) -/* 802F894C 98 1E 01 17 */ stb r0, 0x117(r30) -/* 802F8950 80 81 00 20 */ lwz r4, 0x20(r1) -/* 802F8954 28 04 00 10 */ cmplwi r4, 0x10 -/* 802F8958 40 81 00 1C */ ble lbl_802F8974 -/* 802F895C 7F E3 FB 78 */ mr r3, r31 -/* 802F8960 38 84 FF F0 */ addi r4, r4, -16 -/* 802F8964 81 9F 00 00 */ lwz r12, 0(r31) -/* 802F8968 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802F896C 7D 89 03 A6 */ mtctr r12 -/* 802F8970 4E 80 04 21 */ bctrl -lbl_802F8974: -/* 802F8974 38 60 00 01 */ li r3, 1 -lbl_802F8978: -/* 802F8978 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 802F897C 83 C1 00 48 */ lwz r30, 0x48(r1) -/* 802F8980 80 01 00 54 */ lwz r0, 0x54(r1) -/* 802F8984 7C 08 03 A6 */ mtlr r0 -/* 802F8988 38 21 00 50 */ addi r1, r1, 0x50 -/* 802F898C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive.s b/asm/JSystem/J2DGraph/J2DScreen/makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive.s deleted file mode 100644 index d58425813b2..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive.s +++ /dev/null @@ -1,144 +0,0 @@ -lbl_802F8990: -/* 802F8990 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802F8994 7C 08 02 A6 */ mflr r0 -/* 802F8998 90 01 00 34 */ stw r0, 0x34(r1) -/* 802F899C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F89A0 48 06 98 2D */ bl _savegpr_25 -/* 802F89A4 7C 79 1B 78 */ mr r25, r3 -/* 802F89A8 7C 9A 23 78 */ mr r26, r4 -/* 802F89AC 7C BB 2B 78 */ mr r27, r5 -/* 802F89B0 7C DC 33 78 */ mr r28, r6 -/* 802F89B4 7C FD 3B 78 */ mr r29, r7 -/* 802F89B8 7F 5E D3 78 */ mr r30, r26 -/* 802F89BC 3C 60 46 4E */ lis r3, 0x464E /* 0x464E5431@ha */ -/* 802F89C0 3B E3 54 31 */ addi r31, r3, 0x5431 /* 0x464E5431@l */ -lbl_802F89C4: -/* 802F89C4 7F 63 DB 78 */ mr r3, r27 -/* 802F89C8 38 81 00 08 */ addi r4, r1, 8 -/* 802F89CC 38 A0 00 08 */ li r5, 8 -/* 802F89D0 4B FE 3A 89 */ bl peek__20JSURandomInputStreamFPvl -/* 802F89D4 80 81 00 08 */ lwz r4, 8(r1) -/* 802F89D8 7C 04 F8 00 */ cmpw r4, r31 -/* 802F89DC 41 82 00 F4 */ beq lbl_802F8AD0 -/* 802F89E0 40 80 00 40 */ bge lbl_802F8A20 -/* 802F89E4 3C 60 45 4E */ lis r3, 0x454E /* 0x454E4431@ha */ -/* 802F89E8 38 03 44 31 */ addi r0, r3, 0x4431 /* 0x454E4431@l */ -/* 802F89EC 7C 04 00 00 */ cmpw r4, r0 -/* 802F89F0 41 82 00 A4 */ beq lbl_802F8A94 -/* 802F89F4 40 80 00 18 */ bge lbl_802F8A0C -/* 802F89F8 3C 60 42 47 */ lis r3, 0x4247 /* 0x42474E31@ha */ -/* 802F89FC 38 03 4E 31 */ addi r0, r3, 0x4E31 /* 0x42474E31@l */ -/* 802F8A00 7C 04 00 00 */ cmpw r4, r0 -/* 802F8A04 41 82 00 5C */ beq lbl_802F8A60 -/* 802F8A08 48 00 01 10 */ b lbl_802F8B18 -lbl_802F8A0C: -/* 802F8A0C 3C 60 45 58 */ lis r3, 0x4558 /* 0x45585431@ha */ -/* 802F8A10 38 03 54 31 */ addi r0, r3, 0x5431 /* 0x45585431@l */ -/* 802F8A14 7C 04 00 00 */ cmpw r4, r0 -/* 802F8A18 41 82 00 30 */ beq lbl_802F8A48 -/* 802F8A1C 48 00 00 FC */ b lbl_802F8B18 -lbl_802F8A20: -/* 802F8A20 3C 60 54 45 */ lis r3, 0x5445 /* 0x54455831@ha */ -/* 802F8A24 38 03 58 31 */ addi r0, r3, 0x5831 /* 0x54455831@l */ -/* 802F8A28 7C 04 00 00 */ cmpw r4, r0 -/* 802F8A2C 41 82 00 80 */ beq lbl_802F8AAC -/* 802F8A30 40 80 00 E8 */ bge lbl_802F8B18 -/* 802F8A34 3C 60 4D 41 */ lis r3, 0x4D41 /* 0x4D415431@ha */ -/* 802F8A38 38 03 54 31 */ addi r0, r3, 0x5431 /* 0x4D415431@l */ -/* 802F8A3C 7C 04 00 00 */ cmpw r4, r0 -/* 802F8A40 41 82 00 B4 */ beq lbl_802F8AF4 -/* 802F8A44 48 00 00 D4 */ b lbl_802F8B18 -lbl_802F8A48: -/* 802F8A48 7F 63 DB 78 */ mr r3, r27 -/* 802F8A4C 80 81 00 0C */ lwz r4, 0xc(r1) -/* 802F8A50 38 A0 00 01 */ li r5, 1 -/* 802F8A54 4B FE 3A 89 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 802F8A58 38 60 00 01 */ li r3, 1 -/* 802F8A5C 48 00 01 24 */ b lbl_802F8B80 -lbl_802F8A60: -/* 802F8A60 7F 63 DB 78 */ mr r3, r27 -/* 802F8A64 80 81 00 0C */ lwz r4, 0xc(r1) -/* 802F8A68 38 A0 00 01 */ li r5, 1 -/* 802F8A6C 4B FE 3A 71 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 802F8A70 7F 23 CB 78 */ mr r3, r25 -/* 802F8A74 7F C4 F3 78 */ mr r4, r30 -/* 802F8A78 7F 65 DB 78 */ mr r5, r27 -/* 802F8A7C 7F 86 E3 78 */ mr r6, r28 -/* 802F8A80 7F A7 EB 78 */ mr r7, r29 -/* 802F8A84 4B FF FF 0D */ bl makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive -/* 802F8A88 2C 03 00 00 */ cmpwi r3, 0 -/* 802F8A8C 41 82 FF 38 */ beq lbl_802F89C4 -/* 802F8A90 48 00 00 F0 */ b lbl_802F8B80 -lbl_802F8A94: -/* 802F8A94 7F 63 DB 78 */ mr r3, r27 -/* 802F8A98 80 81 00 0C */ lwz r4, 0xc(r1) -/* 802F8A9C 38 A0 00 01 */ li r5, 1 -/* 802F8AA0 4B FE 3A 3D */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 802F8AA4 38 60 00 00 */ li r3, 0 -/* 802F8AA8 48 00 00 D8 */ b lbl_802F8B80 -lbl_802F8AAC: -/* 802F8AAC 7F 23 CB 78 */ mr r3, r25 -/* 802F8AB0 7F 64 DB 78 */ mr r4, r27 -/* 802F8AB4 7F 85 E3 78 */ mr r5, r28 -/* 802F8AB8 48 00 07 C9 */ bl getResReference__9J2DScreenFP20JSURandomInputStreamUl -/* 802F8ABC 90 79 01 08 */ stw r3, 0x108(r25) -/* 802F8AC0 28 03 00 00 */ cmplwi r3, 0 -/* 802F8AC4 40 82 FF 00 */ bne lbl_802F89C4 -/* 802F8AC8 38 60 00 02 */ li r3, 2 -/* 802F8ACC 48 00 00 B4 */ b lbl_802F8B80 -lbl_802F8AD0: -/* 802F8AD0 7F 23 CB 78 */ mr r3, r25 -/* 802F8AD4 7F 64 DB 78 */ mr r4, r27 -/* 802F8AD8 7F 85 E3 78 */ mr r5, r28 -/* 802F8ADC 48 00 07 A5 */ bl getResReference__9J2DScreenFP20JSURandomInputStreamUl -/* 802F8AE0 90 79 01 0C */ stw r3, 0x10c(r25) -/* 802F8AE4 28 03 00 00 */ cmplwi r3, 0 -/* 802F8AE8 40 82 FE DC */ bne lbl_802F89C4 -/* 802F8AEC 38 60 00 02 */ li r3, 2 -/* 802F8AF0 48 00 00 90 */ b lbl_802F8B80 -lbl_802F8AF4: -/* 802F8AF4 7F 23 CB 78 */ mr r3, r25 -/* 802F8AF8 7F 64 DB 78 */ mr r4, r27 -/* 802F8AFC 7F 85 E3 78 */ mr r5, r28 -/* 802F8B00 7F A6 EB 78 */ mr r6, r29 -/* 802F8B04 48 00 08 79 */ bl createMaterial__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive -/* 802F8B08 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802F8B0C 40 82 FE B8 */ bne lbl_802F89C4 -/* 802F8B10 38 60 00 02 */ li r3, 2 -/* 802F8B14 48 00 00 6C */ b lbl_802F8B80 -lbl_802F8B18: -/* 802F8B18 28 1D 00 00 */ cmplwi r29, 0 -/* 802F8B1C 40 82 00 2C */ bne lbl_802F8B48 -/* 802F8B20 7F 23 CB 78 */ mr r3, r25 -/* 802F8B24 38 81 00 08 */ addi r4, r1, 8 -/* 802F8B28 7F 65 DB 78 */ mr r5, r27 -/* 802F8B2C 7F 46 D3 78 */ mr r6, r26 -/* 802F8B30 7F 87 E3 78 */ mr r7, r28 -/* 802F8B34 81 99 00 00 */ lwz r12, 0(r25) -/* 802F8B38 81 8C 00 94 */ lwz r12, 0x94(r12) -/* 802F8B3C 7D 89 03 A6 */ mtctr r12 -/* 802F8B40 4E 80 04 21 */ bctrl -/* 802F8B44 48 00 00 2C */ b lbl_802F8B70 -lbl_802F8B48: -/* 802F8B48 7F 23 CB 78 */ mr r3, r25 -/* 802F8B4C 38 81 00 08 */ addi r4, r1, 8 -/* 802F8B50 7F 65 DB 78 */ mr r5, r27 -/* 802F8B54 7F 46 D3 78 */ mr r6, r26 -/* 802F8B58 7F 87 E3 78 */ mr r7, r28 -/* 802F8B5C 7F A8 EB 78 */ mr r8, r29 -/* 802F8B60 81 99 00 00 */ lwz r12, 0(r25) -/* 802F8B64 81 8C 00 98 */ lwz r12, 0x98(r12) -/* 802F8B68 7D 89 03 A6 */ mtctr r12 -/* 802F8B6C 4E 80 04 21 */ bctrl -lbl_802F8B70: -/* 802F8B70 7C 7E 1B 78 */ mr r30, r3 -/* 802F8B74 28 03 00 00 */ cmplwi r3, 0 -/* 802F8B78 40 82 FE 4C */ bne lbl_802F89C4 -/* 802F8B7C 38 60 00 02 */ li r3, 2 -lbl_802F8B80: -/* 802F8B80 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F8B84 48 06 96 95 */ bl _restgpr_25 -/* 802F8B88 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802F8B8C 7C 08 03 A6 */ mtlr r0 -/* 802F8B90 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F8B94 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s b/asm/JSystem/J2DGraph/J2DScreen/private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s deleted file mode 100644 index b9f21a85e4b..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_802F8778: -/* 802F8778 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F877C 7C 08 02 A6 */ mflr r0 -/* 802F8780 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F8784 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F8788 48 06 9A 51 */ bl _savegpr_28 -/* 802F878C 7C 7C 1B 78 */ mr r28, r3 -/* 802F8790 7C 9D 23 78 */ mr r29, r4 -/* 802F8794 7C BE 2B 78 */ mr r30, r5 -/* 802F8798 7C DF 33 78 */ mr r31, r6 -/* 802F879C 48 00 00 99 */ bl checkSignature__9J2DScreenFP20JSURandomInputStream -/* 802F87A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802F87A4 40 82 00 0C */ bne lbl_802F87B0 -/* 802F87A8 38 60 00 00 */ li r3, 0 -/* 802F87AC 48 00 00 70 */ b lbl_802F881C -lbl_802F87B0: -/* 802F87B0 7F 83 E3 78 */ mr r3, r28 -/* 802F87B4 7F A4 EB 78 */ mr r4, r29 -/* 802F87B8 48 00 00 DD */ bl getScreenInformation__9J2DScreenFP20JSURandomInputStream -/* 802F87BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802F87C0 40 82 00 0C */ bne lbl_802F87CC -/* 802F87C4 38 60 00 00 */ li r3, 0 -/* 802F87C8 48 00 00 54 */ b lbl_802F881C -lbl_802F87CC: -/* 802F87CC 7F 83 E3 78 */ mr r3, r28 -/* 802F87D0 7F 84 E3 78 */ mr r4, r28 -/* 802F87D4 7F A5 EB 78 */ mr r5, r29 -/* 802F87D8 7F C6 F3 78 */ mr r6, r30 -/* 802F87DC 7F E7 FB 78 */ mr r7, r31 -/* 802F87E0 48 00 01 B1 */ bl makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive -/* 802F87E4 20 63 00 02 */ subfic r3, r3, 2 -/* 802F87E8 30 03 FF FF */ addic r0, r3, -1 -/* 802F87EC 7F E0 19 10 */ subfe r31, r0, r3 -/* 802F87F0 57 C0 02 DF */ rlwinm. r0, r30, 0, 0xb, 0xf -/* 802F87F4 40 82 00 0C */ bne lbl_802F8800 -/* 802F87F8 7F 83 E3 78 */ mr r3, r28 -/* 802F87FC 4B FF FD AD */ bl clean__9J2DScreenFv -lbl_802F8800: -/* 802F8800 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802F8804 41 82 00 14 */ beq lbl_802F8818 -/* 802F8808 88 1D 00 04 */ lbz r0, 4(r29) -/* 802F880C 7C 00 00 34 */ cntlzw r0, r0 -/* 802F8810 54 03 D9 7E */ srwi r3, r0, 5 -/* 802F8814 48 00 00 08 */ b lbl_802F881C -lbl_802F8818: -/* 802F8818 38 60 00 00 */ li r3, 0 -lbl_802F881C: -/* 802F881C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F8820 48 06 9A 05 */ bl _restgpr_28 -/* 802F8824 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F8828 7C 08 03 A6 */ mtlr r0 -/* 802F882C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F8830 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/searchUserInfo__9J2DScreenFUx.s b/asm/JSystem/J2DGraph/J2DScreen/searchUserInfo__9J2DScreenFUx.s deleted file mode 100644 index 5c82f977f89..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/searchUserInfo__9J2DScreenFUx.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_802F90E0: -/* 802F90E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F90E4 7C 08 02 A6 */ mflr r0 -/* 802F90E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F90EC 38 E0 00 00 */ li r7, 0 -/* 802F90F0 7C C4 3A 78 */ xor r4, r6, r7 -/* 802F90F4 7C A0 3A 78 */ xor r0, r5, r7 -/* 802F90F8 7C 80 03 79 */ or. r0, r4, r0 -/* 802F90FC 40 82 00 08 */ bne lbl_802F9104 -/* 802F9100 48 00 00 0C */ b lbl_802F910C -lbl_802F9104: -/* 802F9104 4B FF E2 85 */ bl searchUserInfo__7J2DPaneFUx -/* 802F9108 7C 67 1B 78 */ mr r7, r3 -lbl_802F910C: -/* 802F910C 7C E3 3B 78 */ mr r3, r7 -/* 802F9110 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F9114 7C 08 03 A6 */ mtlr r0 -/* 802F9118 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F911C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/search__9J2DScreenFUx.s b/asm/JSystem/J2DGraph/J2DScreen/search__9J2DScreenFUx.s deleted file mode 100644 index 7df9f303e7f..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/search__9J2DScreenFUx.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_802F90A0: -/* 802F90A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F90A4 7C 08 02 A6 */ mflr r0 -/* 802F90A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F90AC 38 E0 00 00 */ li r7, 0 -/* 802F90B0 7C C4 3A 78 */ xor r4, r6, r7 -/* 802F90B4 7C A0 3A 78 */ xor r0, r5, r7 -/* 802F90B8 7C 80 03 79 */ or. r0, r4, r0 -/* 802F90BC 40 82 00 08 */ bne lbl_802F90C4 -/* 802F90C0 48 00 00 0C */ b lbl_802F90CC -lbl_802F90C4: -/* 802F90C4 4B FF E2 1D */ bl search__7J2DPaneFUx -/* 802F90C8 7C 67 1B 78 */ mr r7, r3 -lbl_802F90CC: -/* 802F90CC 7C E3 3B 78 */ mr r3, r7 -/* 802F90D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F90D4 7C 08 03 A6 */ mtlr r0 -/* 802F90D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F90DC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP11J2DAnmColor.s b/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP11J2DAnmColor.s deleted file mode 100644 index 556b6f7e449..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP11J2DAnmColor.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_802F9704: -/* 802F9704 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F9708 7C 08 02 A6 */ mflr r0 -/* 802F970C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F9710 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F9714 48 06 8A C5 */ bl _savegpr_28 -/* 802F9718 7C 7C 1B 78 */ mr r28, r3 -/* 802F971C 7C 9D 23 78 */ mr r29, r4 -/* 802F9720 7F A3 EB 78 */ mr r3, r29 -/* 802F9724 7F 84 E3 78 */ mr r4, r28 -/* 802F9728 81 9D 00 00 */ lwz r12, 0(r29) -/* 802F972C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802F9730 7D 89 03 A6 */ mtctr r12 -/* 802F9734 4E 80 04 21 */ bctrl -/* 802F9738 A3 FD 00 18 */ lhz r31, 0x18(r29) -/* 802F973C 3B C0 00 00 */ li r30, 0 -/* 802F9740 48 00 00 34 */ b lbl_802F9774 -lbl_802F9744: -/* 802F9744 80 7D 00 1C */ lwz r3, 0x1c(r29) -/* 802F9748 57 C0 0B FC */ rlwinm r0, r30, 1, 0xf, 0x1e -/* 802F974C 7C 83 02 2E */ lhzx r4, r3, r0 -/* 802F9750 A0 1C 01 02 */ lhz r0, 0x102(r28) -/* 802F9754 7C 04 00 40 */ cmplw r4, r0 -/* 802F9758 40 80 00 18 */ bge lbl_802F9770 -/* 802F975C 80 7C 01 04 */ lwz r3, 0x104(r28) -/* 802F9760 1C 04 00 88 */ mulli r0, r4, 0x88 -/* 802F9764 7C 63 02 14 */ add r3, r3, r0 -/* 802F9768 7F A4 EB 78 */ mr r4, r29 -/* 802F976C 4B FF 11 31 */ bl setAnimation__11J2DMaterialFP11J2DAnmColor -lbl_802F9770: -/* 802F9770 3B DE 00 01 */ addi r30, r30, 1 -lbl_802F9774: -/* 802F9774 57 C0 04 3E */ clrlwi r0, r30, 0x10 -/* 802F9778 7C 00 F8 40 */ cmplw r0, r31 -/* 802F977C 41 80 FF C8 */ blt lbl_802F9744 -/* 802F9780 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F9784 48 06 8A A1 */ bl _restgpr_28 -/* 802F9788 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F978C 7C 08 03 A6 */ mtlr r0 -/* 802F9790 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F9794 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP15J2DAnmTevRegKey.s b/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP15J2DAnmTevRegKey.s deleted file mode 100644 index 33e05c339a6..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP15J2DAnmTevRegKey.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_802F98CC: -/* 802F98CC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F98D0 7C 08 02 A6 */ mflr r0 -/* 802F98D4 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F98D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F98DC 48 06 88 FD */ bl _savegpr_28 -/* 802F98E0 7C 7E 1B 78 */ mr r30, r3 -/* 802F98E4 7C 9F 23 78 */ mr r31, r4 -/* 802F98E8 7F E3 FB 78 */ mr r3, r31 -/* 802F98EC 7F C4 F3 78 */ mr r4, r30 -/* 802F98F0 81 9F 00 00 */ lwz r12, 0(r31) -/* 802F98F4 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802F98F8 7D 89 03 A6 */ mtctr r12 -/* 802F98FC 4E 80 04 21 */ bctrl -/* 802F9900 A3 BF 00 10 */ lhz r29, 0x10(r31) -/* 802F9904 3B 80 00 00 */ li r28, 0 -/* 802F9908 48 00 00 34 */ b lbl_802F993C -lbl_802F990C: -/* 802F990C 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 802F9910 57 80 0B FC */ rlwinm r0, r28, 1, 0xf, 0x1e -/* 802F9914 7C 83 02 2E */ lhzx r4, r3, r0 -/* 802F9918 A0 1E 01 02 */ lhz r0, 0x102(r30) -/* 802F991C 7C 04 00 40 */ cmplw r4, r0 -/* 802F9920 40 80 00 18 */ bge lbl_802F9938 -/* 802F9924 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 802F9928 1C 04 00 88 */ mulli r0, r4, 0x88 -/* 802F992C 7C 63 02 14 */ add r3, r3, r0 -/* 802F9930 7F E4 FB 78 */ mr r4, r31 -/* 802F9934 4B FF 11 D9 */ bl setAnimation__11J2DMaterialFP15J2DAnmTevRegKey -lbl_802F9938: -/* 802F9938 3B 9C 00 01 */ addi r28, r28, 1 -lbl_802F993C: -/* 802F993C 57 80 04 3E */ clrlwi r0, r28, 0x10 -/* 802F9940 7C 00 E8 40 */ cmplw r0, r29 -/* 802F9944 41 80 FF C8 */ blt lbl_802F990C -/* 802F9948 A3 BF 00 12 */ lhz r29, 0x12(r31) -/* 802F994C 3B 80 00 00 */ li r28, 0 -/* 802F9950 48 00 00 34 */ b lbl_802F9984 -lbl_802F9954: -/* 802F9954 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 802F9958 57 80 0B FC */ rlwinm r0, r28, 1, 0xf, 0x1e -/* 802F995C 7C 83 02 2E */ lhzx r4, r3, r0 -/* 802F9960 A0 1E 01 02 */ lhz r0, 0x102(r30) -/* 802F9964 7C 04 00 40 */ cmplw r4, r0 -/* 802F9968 40 80 00 18 */ bge lbl_802F9980 -/* 802F996C 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 802F9970 1C 04 00 88 */ mulli r0, r4, 0x88 -/* 802F9974 7C 63 02 14 */ add r3, r3, r0 -/* 802F9978 7F E4 FB 78 */ mr r4, r31 -/* 802F997C 4B FF 11 91 */ bl setAnimation__11J2DMaterialFP15J2DAnmTevRegKey -lbl_802F9980: -/* 802F9980 3B 9C 00 01 */ addi r28, r28, 1 -lbl_802F9984: -/* 802F9984 57 80 04 3E */ clrlwi r0, r28, 0x10 -/* 802F9988 7C 00 E8 40 */ cmplw r0, r29 -/* 802F998C 41 80 FF C8 */ blt lbl_802F9954 -/* 802F9990 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F9994 48 06 88 91 */ bl _restgpr_28 -/* 802F9998 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F999C 7C 08 03 A6 */ mtlr r0 -/* 802F99A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F99A4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP16J2DAnmTexPattern.s b/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP16J2DAnmTexPattern.s deleted file mode 100644 index b14f641a47a..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP16J2DAnmTexPattern.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_802F9838: -/* 802F9838 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F983C 7C 08 02 A6 */ mflr r0 -/* 802F9840 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F9844 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F9848 48 06 89 91 */ bl _savegpr_28 -/* 802F984C 7C 7C 1B 78 */ mr r28, r3 -/* 802F9850 7C 9D 23 78 */ mr r29, r4 -/* 802F9854 7F A3 EB 78 */ mr r3, r29 -/* 802F9858 7F 84 E3 78 */ mr r4, r28 -/* 802F985C 81 9D 00 00 */ lwz r12, 0(r29) -/* 802F9860 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802F9864 7D 89 03 A6 */ mtctr r12 -/* 802F9868 4E 80 04 21 */ bctrl -/* 802F986C A3 FD 00 1A */ lhz r31, 0x1a(r29) -/* 802F9870 3B C0 00 00 */ li r30, 0 -/* 802F9874 48 00 00 34 */ b lbl_802F98A8 -lbl_802F9878: -/* 802F9878 80 7D 00 1C */ lwz r3, 0x1c(r29) -/* 802F987C 57 C0 0B FC */ rlwinm r0, r30, 1, 0xf, 0x1e -/* 802F9880 7C 83 02 2E */ lhzx r4, r3, r0 -/* 802F9884 A0 1C 01 02 */ lhz r0, 0x102(r28) -/* 802F9888 7C 04 00 40 */ cmplw r4, r0 -/* 802F988C 40 80 00 18 */ bge lbl_802F98A4 -/* 802F9890 80 7C 01 04 */ lwz r3, 0x104(r28) -/* 802F9894 1C 04 00 88 */ mulli r0, r4, 0x88 -/* 802F9898 7C 63 02 14 */ add r3, r3, r0 -/* 802F989C 7F A4 EB 78 */ mr r4, r29 -/* 802F98A0 4B FF 11 8D */ bl setAnimation__11J2DMaterialFP16J2DAnmTexPattern -lbl_802F98A4: -/* 802F98A4 3B DE 00 01 */ addi r30, r30, 1 -lbl_802F98A8: -/* 802F98A8 57 C0 04 3E */ clrlwi r0, r30, 0x10 -/* 802F98AC 7C 00 F8 40 */ cmplw r0, r31 -/* 802F98B0 41 80 FF C8 */ blt lbl_802F9878 -/* 802F98B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F98B8 48 06 89 6D */ bl _restgpr_28 -/* 802F98BC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F98C0 7C 08 03 A6 */ mtlr r0 -/* 802F98C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F98C8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP19J2DAnmTextureSRTKey.s b/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP19J2DAnmTextureSRTKey.s deleted file mode 100644 index 6df8c228353..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP19J2DAnmTextureSRTKey.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_802F9798: -/* 802F9798 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F979C 7C 08 02 A6 */ mflr r0 -/* 802F97A0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F97A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F97A8 48 06 8A 31 */ bl _savegpr_28 -/* 802F97AC 7C 7C 1B 78 */ mr r28, r3 -/* 802F97B0 7C 9D 23 78 */ mr r29, r4 -/* 802F97B4 7F A3 EB 78 */ mr r3, r29 -/* 802F97B8 7F 84 E3 78 */ mr r4, r28 -/* 802F97BC 81 9D 00 00 */ lwz r12, 0(r29) -/* 802F97C0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802F97C4 7D 89 03 A6 */ mtctr r12 -/* 802F97C8 4E 80 04 21 */ bctrl -/* 802F97CC A0 7D 00 18 */ lhz r3, 0x18(r29) -/* 802F97D0 38 00 00 03 */ li r0, 3 -/* 802F97D4 7C 03 03 D6 */ divw r0, r3, r0 -/* 802F97D8 54 1F 04 3E */ clrlwi r31, r0, 0x10 -/* 802F97DC 3B C0 00 00 */ li r30, 0 -/* 802F97E0 48 00 00 34 */ b lbl_802F9814 -lbl_802F97E4: -/* 802F97E4 80 7D 00 30 */ lwz r3, 0x30(r29) -/* 802F97E8 57 C0 0B FC */ rlwinm r0, r30, 1, 0xf, 0x1e -/* 802F97EC 7C 83 02 2E */ lhzx r4, r3, r0 -/* 802F97F0 A0 1C 01 02 */ lhz r0, 0x102(r28) -/* 802F97F4 7C 04 00 40 */ cmplw r4, r0 -/* 802F97F8 40 80 00 18 */ bge lbl_802F9810 -/* 802F97FC 80 7C 01 04 */ lwz r3, 0x104(r28) -/* 802F9800 1C 04 00 88 */ mulli r0, r4, 0x88 -/* 802F9804 7C 63 02 14 */ add r3, r3, r0 -/* 802F9808 7F A4 EB 78 */ mr r4, r29 -/* 802F980C 4B FF 11 41 */ bl setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey -lbl_802F9810: -/* 802F9810 3B DE 00 01 */ addi r30, r30, 1 -lbl_802F9814: -/* 802F9814 57 C0 04 3E */ clrlwi r0, r30, 0x10 -/* 802F9818 7C 00 F8 40 */ cmplw r0, r31 -/* 802F981C 41 80 FF C8 */ blt lbl_802F97E4 -/* 802F9820 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F9824 48 06 8A 01 */ bl _restgpr_28 -/* 802F9828 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F982C 7C 08 03 A6 */ mtlr r0 -/* 802F9830 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F9834 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h index bc4d9a94bc5..3a994228198 100644 --- a/include/JSystem/J2DGraph/J2DAnimation.h +++ b/include/JSystem/J2DGraph/J2DAnimation.h @@ -189,6 +189,8 @@ public: /* 80184274 */ virtual ~J2DAnmTextureSRTKey() {} /* 8030BC60 */ virtual void searchUpdateMaterialID(J2DScreen*); u16 getUpdateMaterialNum() const { return mUpdateMaterialNum / 3; } + u16 getUpdateMaterialID(u16 i) const { return mUpdateMaterialID[i]; } + u8 getUpdateTexMtxID(u16 i) const { return mUpdateTexMtxID[i]; } /* 0x10 */ int field_0x10; /* 0x14 */ J3DAnmTransformKeyTable* mInfoTable; @@ -233,7 +235,7 @@ public: mAnmTable = NULL; mKind = KIND_TEX_PATTERN; mUpdateMaterialNum = 0; - mUpdaterMaterialID = NULL; + mUpdateMaterialID = NULL; mTIMGPtrArray = NULL; } @@ -244,12 +246,14 @@ public: /* 8030CB90 */ virtual ~J2DAnmTexPattern() { delete[] mTIMGPtrArray; } /* 8030BD10 */ virtual void searchUpdateMaterialID(J2DScreen*); u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; } + u16 getUpdateMaterialID(u16 i) const { return mUpdateMaterialID[i]; } + J3DAnmTexPatternFullTable* getAnmTable() const { return mAnmTable; } /* 0x10 */ u16* mValues; /* 0x14 */ J3DAnmTexPatternFullTable* mAnmTable; /* 0x18 */ u16 field_0x18; /* 0x1A */ u16 mUpdateMaterialNum; - /* 0x1C */ u16* mUpdaterMaterialID; + /* 0x1C */ u16* mUpdateMaterialID; /* 0x20 */ JUTNameTab field_0x20; /* 0x30 */ J2DAnmTexPatternTIMGPointer* mTIMGPtrArray; }; @@ -285,6 +289,15 @@ public: /* 801841EC */ virtual ~J2DAnmTevRegKey() {} /* 8030C678 */ virtual void searchUpdateMaterialID(J2DScreen* pScreen); + u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; } + u16 getCRegUpdateMaterialID(u16 i) const { return mCRegUpdateMaterialID[i]; } + + u16 getKRegUpdateMaterialNum() const { return mKRegUpdateMaterialNum; } + u16 getKRegUpdateMaterialID(u16 i) const { return mKRegUpdateMaterialID[i]; } + + J3DAnmCRegKeyTable* getAnmCRegKeyTable() const { return mAnmCRegKeyTable; } + J3DAnmKRegKeyTable* getAnmKRegKeyTable() const { return mAnmKRegKeyTable; } + /* 0x10 */ u16 mCRegUpdateMaterialNum; /* 0x12 */ u16 mKRegUpdateMaterialNum; /* 0x14 */ u16 field_0x14; @@ -326,6 +339,7 @@ public: /* 8030AF24 */ virtual void searchUpdateMaterialID(J2DScreen*); /* 802EB390 */ virtual void getColor(u16, _GXColor*) const; u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; } + u16 getUpdateMaterialID(u16 i) const { return mUpdateMaterialID[i]; } /* 0x10 */ u16 field_0x10; /* 0x12 */ u16 field_0x12; diff --git a/include/JSystem/J2DGraph/J2DMatBlock.h b/include/JSystem/J2DGraph/J2DMatBlock.h index 810fccc0919..5b80a90f18c 100644 --- a/include/JSystem/J2DGraph/J2DMatBlock.h +++ b/include/JSystem/J2DGraph/J2DMatBlock.h @@ -21,9 +21,9 @@ public: virtual void getType() = 0; virtual s32 getMaxStage() = 0; /* 802EB1DC */ virtual void setTexNo(u32, u16); - /* 802EA170 */ virtual void getTexNo(u32) const; + /* 802EA170 */ virtual u32 getTexNo(u32) const; /* 802F2A48 */ virtual void setFontNo(u16); - /* 802EA164 */ virtual void getFontNo() const; + /* 802EA164 */ virtual u32 getFontNo() const; /* 802F2A4C */ virtual void setTevOrder(u32, J2DTevOrder); /* 802EA144 */ virtual bool getTevOrder(u32); /* 802EB1D8 */ virtual void setTevColor(u32, J2DGXColorS10); @@ -72,41 +72,41 @@ public: /* 802F27A0 */ virtual void getType(); /* 802F27AC */ virtual s32 getMaxStage(); /* 802F27B4 */ virtual void setTexNo(u32, u16); - /* 802F27C4 */ virtual void getTexNo(u32) const; + /* 802F27C4 */ virtual u32 getTexNo(u32) const; /* 802F27D4 */ virtual void setFontNo(u16); - /* 802F27DC */ virtual void getFontNo() const; + /* 802F27DC */ virtual u32 getFontNo() const; /* 802F27E4 */ virtual void setTevOrder(u32, J2DTevOrder); - /* 802F2808 */ virtual void getTevOrder(u32); + /* 802F2808 */ virtual bool getTevOrder(u32); /* 802F281C */ virtual void setTevColor(u32, J2DGXColorS10); - /* 802F2848 */ virtual void getTevColor(u32); + /* 802F2848 */ virtual bool getTevColor(u32); /* 802F285C */ virtual void setTevKColor(u32, JUtility::TColor); - /* 802F2888 */ virtual void getTevKColor(u32); + /* 802F2888 */ virtual bool getTevKColor(u32); /* 802F289C */ virtual void setTevKColorSel(u32, u8); - /* 802F28A8 */ virtual void getTevKColorSel(u32); + /* 802F28A8 */ virtual bool getTevKColorSel(u32); /* 802F28B4 */ virtual void setTevKAlphaSel(u32, u8); - /* 802F28C0 */ virtual void getTevKAlphaSel(u32); + /* 802F28C0 */ virtual bool getTevKAlphaSel(u32); /* 802F28CC */ virtual void setTevStageNum(u8); /* 802F28D0 */ virtual bool getTevStageNum() const; /* 802F28D8 */ virtual void setTevStage(u32, J2DTevStage); - /* 802F2914 */ virtual void getTevStage(u32); + /* 802F2914 */ virtual bool getTevStage(u32); /* 802F2928 */ virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo); /* 802F2960 */ virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable); - /* 802F2970 */ virtual void getTevSwapModeTable(u32); + /* 802F2970 */ virtual bool getTevSwapModeTable(u32); /* 802F2980 */ virtual void setIndTevStage(u32, J2DIndTevStage); - /* 802F2994 */ virtual void getIndTevStage(u32); - /* 802F29A8 */ virtual void insertTexture(u32, ResTIMG const*); - /* 802EBCC0 */ virtual void insertTexture(u32, ResTIMG const*, JUTPalette*); - /* 802EBDE4 */ virtual void insertTexture(u32, JUTTexture*); - /* 802EBE8C */ virtual void setTexture(u32, ResTIMG const*); - /* 802EC01C */ virtual void setTexture(u32, JUTTexture*); - /* 802EC0A8 */ virtual void removeTexture(u32); - /* 802EC124 */ virtual void setFont(ResFONT*); - /* 802EC1D8 */ virtual void setFont(JUTFont*); - /* 802EC258 */ virtual void setPalette(u32, ResTLUT const*); - /* 802EBC0C */ virtual void prepareTexture(u8); - /* 802F29D8 */ virtual void getTexture(u32); - /* 802F29F8 */ virtual void getPalette(u32); - /* 802F2A18 */ virtual void getFont(); + /* 802F2994 */ virtual bool getIndTevStage(u32); + /* 802F29A8 */ virtual bool insertTexture(u32, ResTIMG const*); + /* 802EBCC0 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*); + /* 802EBDE4 */ virtual bool insertTexture(u32, JUTTexture*); + /* 802EBE8C */ virtual bool setTexture(u32, ResTIMG const*); + /* 802EC01C */ virtual bool setTexture(u32, JUTTexture*); + /* 802EC0A8 */ virtual bool removeTexture(u32); + /* 802EC124 */ virtual bool setFont(ResFONT*); + /* 802EC1D8 */ virtual bool setFont(JUTFont*); + /* 802EC258 */ virtual bool setPalette(u32, ResTLUT const*); + /* 802EBC0C */ virtual bool prepareTexture(u8); + /* 802F29D8 */ virtual bool getTexture(u32); + /* 802F29F8 */ virtual bool getPalette(u32); + /* 802F2A18 */ virtual bool getFont(); /* 802EC318 */ virtual void shiftDeleteFlag(u8, bool); /* 802F2A20 */ virtual void setUndeleteFlag(u8); /* 802F2A30 */ virtual void setFontUndeleteFlag(); @@ -139,41 +139,41 @@ public: /* 802F24FC */ virtual void getType(); /* 802F2508 */ virtual s32 getMaxStage(); /* 802F2510 */ virtual void setTexNo(u32, u16); - /* 802F2520 */ virtual void getTexNo(u32) const; + /* 802F2520 */ virtual u32 getTexNo(u32) const; /* 802F2530 */ virtual void setFontNo(u16); - /* 802F2538 */ virtual void getFontNo() const; + /* 802F2538 */ virtual u32 getFontNo() const; /* 802F2540 */ virtual void setTevOrder(u32, J2DTevOrder); - /* 802F2564 */ virtual void getTevOrder(u32); + /* 802F2564 */ virtual bool getTevOrder(u32); /* 802F2578 */ virtual void setTevColor(u32, J2DGXColorS10); - /* 802F25A4 */ virtual void getTevColor(u32); + /* 802F25A4 */ virtual bool getTevColor(u32); /* 802F25B8 */ virtual void setTevKColor(u32, JUtility::TColor); - /* 802F25E4 */ virtual void getTevKColor(u32); + /* 802F25E4 */ virtual bool getTevKColor(u32); /* 802F25F8 */ virtual void setTevKColorSel(u32, u8); - /* 802F2604 */ virtual void getTevKColorSel(u32); + /* 802F2604 */ virtual bool getTevKColorSel(u32); /* 802F2610 */ virtual void setTevKAlphaSel(u32, u8); - /* 802F261C */ virtual void getTevKAlphaSel(u32); + /* 802F261C */ virtual bool getTevKAlphaSel(u32); /* 802F2628 */ virtual void setTevStageNum(u8); - /* 802F2630 */ virtual void getTevStageNum() const; + /* 802F2630 */ virtual bool getTevStageNum() const; /* 802F2638 */ virtual void setTevStage(u32, J2DTevStage); - /* 802F2674 */ virtual void getTevStage(u32); + /* 802F2674 */ virtual bool getTevStage(u32); /* 802F2688 */ virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo); /* 802F26C0 */ virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable); - /* 802F26D0 */ virtual void getTevSwapModeTable(u32); + /* 802F26D0 */ virtual bool getTevSwapModeTable(u32); /* 802F26E0 */ virtual void setIndTevStage(u32, J2DIndTevStage); - /* 802F26F4 */ virtual void getIndTevStage(u32); - /* 802F2708 */ virtual void insertTexture(u32, ResTIMG const*); - /* 802ECAE8 */ virtual void insertTexture(u32, ResTIMG const*, JUTPalette*); - /* 802ECDE8 */ virtual void insertTexture(u32, JUTTexture*); - /* 802ECF48 */ virtual void setTexture(u32, ResTIMG const*); - /* 802ED16C */ virtual void setTexture(u32, JUTTexture*); - /* 802ED21C */ virtual void removeTexture(u32); - /* 802ED2F0 */ virtual void setFont(ResFONT*); - /* 802ED3A4 */ virtual void setFont(JUTFont*); - /* 802ED424 */ virtual void setPalette(u32, ResTLUT const*); - /* 802ECA18 */ virtual void prepareTexture(u8); - /* 802F2738 */ virtual void getTexture(u32); - /* 802F2758 */ virtual void getPalette(u32); - /* 802F2778 */ virtual void getFont(); + /* 802F26F4 */ virtual bool getIndTevStage(u32); + /* 802F2708 */ virtual bool insertTexture(u32, ResTIMG const*); + /* 802ECAE8 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*); + /* 802ECDE8 */ virtual bool insertTexture(u32, JUTTexture*); + /* 802ECF48 */ virtual bool setTexture(u32, ResTIMG const*); + /* 802ED16C */ virtual bool setTexture(u32, JUTTexture*); + /* 802ED21C */ virtual bool removeTexture(u32); + /* 802ED2F0 */ virtual bool setFont(ResFONT*); + /* 802ED3A4 */ virtual bool setFont(JUTFont*); + /* 802ED424 */ virtual bool setPalette(u32, ResTLUT const*); + /* 802ECA18 */ virtual bool prepareTexture(u8); + /* 802F2738 */ virtual bool getTexture(u32); + /* 802F2758 */ virtual bool getPalette(u32); + /* 802F2778 */ virtual bool getFont(); /* 802ED4FC */ virtual void shiftDeleteFlag(u8, bool); /* 802F2780 */ virtual void setUndeleteFlag(u8); /* 802F2790 */ virtual void setFontUndeleteFlag(); @@ -207,41 +207,41 @@ public: /* 802F2258 */ virtual void getType(); /* 802F2264 */ virtual s32 getMaxStage(); /* 802F226C */ virtual void setTexNo(u32, u16); - /* 802F227C */ virtual void getTexNo(u32) const; + /* 802F227C */ virtual u32 getTexNo(u32) const; /* 802F228C */ virtual void setFontNo(u16); - /* 802F2294 */ virtual void getFontNo() const; + /* 802F2294 */ virtual u32 getFontNo() const; /* 802F229C */ virtual void setTevOrder(u32, J2DTevOrder); - /* 802F22C0 */ virtual void getTevOrder(u32); + /* 802F22C0 */ virtual bool getTevOrder(u32); /* 802F22D4 */ virtual void setTevColor(u32, J2DGXColorS10); - /* 802F2300 */ virtual void getTevColor(u32); + /* 802F2300 */ virtual bool getTevColor(u32); /* 802F2314 */ virtual void setTevKColor(u32, JUtility::TColor); - /* 802F2340 */ virtual void getTevKColor(u32); + /* 802F2340 */ virtual bool getTevKColor(u32); /* 802F2354 */ virtual void setTevKColorSel(u32, u8); - /* 802F2360 */ virtual void getTevKColorSel(u32); + /* 802F2360 */ virtual bool getTevKColorSel(u32); /* 802F236C */ virtual void setTevKAlphaSel(u32, u8); - /* 802F2378 */ virtual void getTevKAlphaSel(u32); + /* 802F2378 */ virtual bool getTevKAlphaSel(u32); /* 802F2384 */ virtual void setTevStageNum(u8); - /* 802F238C */ virtual void getTevStageNum() const; + /* 802F238C */ virtual bool getTevStageNum() const; /* 802F2394 */ virtual void setTevStage(u32, J2DTevStage); - /* 802F23D0 */ virtual void getTevStage(u32); + /* 802F23D0 */ virtual bool getTevStage(u32); /* 802F23E4 */ virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo); /* 802F241C */ virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable); - /* 802F242C */ virtual void getTevSwapModeTable(u32); + /* 802F242C */ virtual bool getTevSwapModeTable(u32); /* 802F243C */ virtual void setIndTevStage(u32, J2DIndTevStage); - /* 802F2450 */ virtual void getIndTevStage(u32); - /* 802F2464 */ virtual void insertTexture(u32, ResTIMG const*); - /* 802EDE04 */ virtual void insertTexture(u32, ResTIMG const*, JUTPalette*); - /* 802EE1D4 */ virtual void insertTexture(u32, JUTTexture*); - /* 802EE364 */ virtual void setTexture(u32, ResTIMG const*); - /* 802EE5F0 */ virtual void setTexture(u32, JUTTexture*); - /* 802EE6A0 */ virtual void removeTexture(u32); - /* 802EE798 */ virtual void setFont(ResFONT*); - /* 802EE84C */ virtual void setFont(JUTFont*); - /* 802EE8CC */ virtual void setPalette(u32, ResTLUT const*); - /* 802EDD34 */ virtual void prepareTexture(u8); - /* 802F2494 */ virtual void getTexture(u32); - /* 802F24B4 */ virtual void getPalette(u32); - /* 802F24D4 */ virtual void getFont(); + /* 802F2450 */ virtual bool getIndTevStage(u32); + /* 802F2464 */ virtual bool insertTexture(u32, ResTIMG const*); + /* 802EDE04 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*); + /* 802EE1D4 */ virtual bool insertTexture(u32, JUTTexture*); + /* 802EE364 */ virtual bool setTexture(u32, ResTIMG const*); + /* 802EE5F0 */ virtual bool setTexture(u32, JUTTexture*); + /* 802EE6A0 */ virtual bool removeTexture(u32); + /* 802EE798 */ virtual bool setFont(ResFONT*); + /* 802EE84C */ virtual bool setFont(JUTFont*); + /* 802EE8CC */ virtual bool setPalette(u32, ResTLUT const*); + /* 802EDD34 */ virtual bool prepareTexture(u8); + /* 802F2494 */ virtual bool getTexture(u32); + /* 802F24B4 */ virtual bool getPalette(u32); + /* 802F24D4 */ virtual bool getFont(); /* 802EE9A4 */ virtual void shiftDeleteFlag(u8, bool); /* 802F24DC */ virtual void setUndeleteFlag(u8); /* 802F24EC */ virtual void setFontUndeleteFlag(); @@ -275,41 +275,41 @@ public: /* 802F1FB8 */ virtual void getType(); /* 802F1FC4 */ virtual s32 getMaxStage(); /* 802F1FCC */ virtual void setTexNo(u32, u16); - /* 802F1FDC */ virtual void getTexNo(u32) const; + /* 802F1FDC */ virtual u32 getTexNo(u32) const; /* 802F1FEC */ virtual void setFontNo(u16); - /* 802F1FF4 */ virtual void getFontNo() const; + /* 802F1FF4 */ virtual u32 getFontNo() const; /* 802F1FFC */ virtual void setTevOrder(u32, J2DTevOrder); - /* 802F2020 */ virtual void getTevOrder(u32); + /* 802F2020 */ virtual bool getTevOrder(u32); /* 802F2034 */ virtual void setTevColor(u32, J2DGXColorS10); - /* 802F2060 */ virtual void getTevColor(u32); + /* 802F2060 */ virtual bool getTevColor(u32); /* 802F2074 */ virtual void setTevKColor(u32, JUtility::TColor); - /* 802F20A0 */ virtual void getTevKColor(u32); + /* 802F20A0 */ virtual bool getTevKColor(u32); /* 802F20B4 */ virtual void setTevKColorSel(u32, u8); - /* 802F20C0 */ virtual void getTevKColorSel(u32); + /* 802F20C0 */ virtual bool getTevKColorSel(u32); /* 802F20CC */ virtual void setTevKAlphaSel(u32, u8); - /* 802F20D8 */ virtual void getTevKAlphaSel(u32); + /* 802F20D8 */ virtual bool getTevKAlphaSel(u32); /* 802F20E4 */ virtual void setTevStageNum(u8); - /* 802F20EC */ virtual void getTevStageNum() const; + /* 802F20EC */ virtual bool getTevStageNum() const; /* 802F20F4 */ virtual void setTevStage(u32, J2DTevStage); - /* 802F2130 */ virtual void getTevStage(u32); + /* 802F2130 */ virtual bool getTevStage(u32); /* 802F2144 */ virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo); /* 802F217C */ virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable); - /* 802F218C */ virtual void getTevSwapModeTable(u32); + /* 802F218C */ virtual bool getTevSwapModeTable(u32); /* 802F219C */ virtual void setIndTevStage(u32, J2DIndTevStage); - /* 802F21B0 */ virtual void getIndTevStage(u32); - /* 802F21C4 */ virtual void insertTexture(u32, ResTIMG const*); - /* 802EF2B0 */ virtual void insertTexture(u32, ResTIMG const*, JUTPalette*); - /* 802EF67C */ virtual void insertTexture(u32, JUTTexture*); - /* 802EF80C */ virtual void setTexture(u32, ResTIMG const*); - /* 802EFA98 */ virtual void setTexture(u32, JUTTexture*); - /* 802EFB48 */ virtual void removeTexture(u32); - /* 802EFC40 */ virtual void setFont(ResFONT*); - /* 802EFCEC */ virtual void setFont(JUTFont*); - /* 802EFD68 */ virtual void setPalette(u32, ResTLUT const*); - /* 802EF1E0 */ virtual void prepareTexture(u8); - /* 802F21F4 */ virtual void getTexture(u32); - /* 802F2214 */ virtual void getPalette(u32); - /* 802F2234 */ virtual void getFont(); + /* 802F21B0 */ virtual bool getIndTevStage(u32); + /* 802F21C4 */ virtual bool insertTexture(u32, ResTIMG const*); + /* 802EF2B0 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*); + /* 802EF67C */ virtual bool insertTexture(u32, JUTTexture*); + /* 802EF80C */ virtual bool setTexture(u32, ResTIMG const*); + /* 802EFA98 */ virtual bool setTexture(u32, JUTTexture*); + /* 802EFB48 */ virtual bool removeTexture(u32); + /* 802EFC40 */ virtual bool setFont(ResFONT*); + /* 802EFCEC */ virtual bool setFont(JUTFont*); + /* 802EFD68 */ virtual bool setPalette(u32, ResTLUT const*); + /* 802EF1E0 */ virtual bool prepareTexture(u8); + /* 802F21F4 */ virtual bool getTexture(u32); + /* 802F2214 */ virtual bool getPalette(u32); + /* 802F2234 */ virtual bool getFont(); /* 802EFE40 */ virtual void shiftDeleteFlag(u8, bool); /* 802F223C */ virtual void setUndeleteFlag(u8); /* 802F224C */ virtual void setFontUndeleteFlag(); @@ -344,47 +344,47 @@ public: /* 802F1D18 */ virtual void getType(); /* 802F1D24 */ virtual s32 getMaxStage(); /* 802F1D2C */ virtual void setTexNo(u32, u16); - /* 802F1D3C */ virtual void getTexNo(u32) const; + /* 802F1D3C */ virtual u32 getTexNo(u32) const; /* 802F1D4C */ virtual void setFontNo(u16); - /* 802F1D54 */ virtual void getFontNo() const; + /* 802F1D54 */ virtual u32 getFontNo() const; /* 802F1D5C */ virtual void setTevOrder(u32, J2DTevOrder); - /* 802F1D80 */ virtual void getTevOrder(u32); + /* 802F1D80 */ virtual bool getTevOrder(u32); /* 802F1D94 */ virtual void setTevColor(u32, J2DGXColorS10); - /* 802F1DC0 */ virtual void getTevColor(u32); + /* 802F1DC0 */ virtual bool getTevColor(u32); /* 802F1DD4 */ virtual void setTevKColor(u32, JUtility::TColor); - /* 802F1E00 */ virtual void getTevKColor(u32); + /* 802F1E00 */ virtual bool getTevKColor(u32); /* 802F1E14 */ virtual void setTevKColorSel(u32, u8); - /* 802F1E20 */ virtual void getTevKColorSel(u32); + /* 802F1E20 */ virtual bool getTevKColorSel(u32); /* 802F1E2C */ virtual void setTevKAlphaSel(u32, u8); - /* 802F1E38 */ virtual void getTevKAlphaSel(u32); + /* 802F1E38 */ virtual bool getTevKAlphaSel(u32); /* 802F1E44 */ virtual void setTevStageNum(u8); - /* 802F1E4C */ virtual void getTevStageNum() const; + /* 802F1E4C */ virtual bool getTevStageNum() const; /* 802F1E54 */ virtual void setTevStage(u32, J2DTevStage); - /* 802F1E90 */ virtual void getTevStage(u32); + /* 802F1E90 */ virtual bool getTevStage(u32); /* 802F1EA4 */ virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo); /* 802F1EDC */ virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable); - /* 802F1EEC */ virtual void getTevSwapModeTable(u32); + /* 802F1EEC */ virtual bool getTevSwapModeTable(u32); /* 802F1EFC */ virtual void setIndTevStage(u32, J2DIndTevStage); - /* 802F1F10 */ virtual void getIndTevStage(u32); - /* 802F1F24 */ virtual void insertTexture(u32, ResTIMG const*); - /* 802F0730 */ virtual void insertTexture(u32, ResTIMG const*, JUTPalette*); - /* 802F0AFC */ virtual void insertTexture(u32, JUTTexture*); - /* 802F0C8C */ virtual void setTexture(u32, ResTIMG const*); - /* 802F0F18 */ virtual void setTexture(u32, JUTTexture*); - /* 802F0FC8 */ virtual void removeTexture(u32); - /* 802F10C0 */ virtual void setFont(ResFONT*); - /* 802F116C */ virtual void setFont(JUTFont*); - /* 802F11E8 */ virtual void setPalette(u32, ResTLUT const*); - /* 802F0660 */ virtual void prepareTexture(u8); - /* 802F1F54 */ virtual void getTexture(u32); - /* 802F1F74 */ virtual void getPalette(u32); - /* 802F1F94 */ virtual void getFont(); + /* 802F1F10 */ virtual bool getIndTevStage(u32); + /* 802F1F24 */ virtual bool insertTexture(u32, ResTIMG const*); + /* 802F0730 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*); + /* 802F0AFC */ virtual bool insertTexture(u32, JUTTexture*); + /* 802F0C8C */ virtual bool setTexture(u32, ResTIMG const*); + /* 802F0F18 */ virtual bool setTexture(u32, JUTTexture*); + /* 802F0FC8 */ virtual bool removeTexture(u32); + /* 802F10C0 */ virtual bool setFont(ResFONT*); + /* 802F116C */ virtual bool setFont(JUTFont*); + /* 802F11E8 */ virtual bool setPalette(u32, ResTLUT const*); + /* 802F0660 */ virtual bool prepareTexture(u8); + /* 802F1F54 */ virtual bool getTexture(u32); + /* 802F1F74 */ virtual bool getPalette(u32); + /* 802F1F94 */ virtual bool getFont(); /* 802F12C0 */ virtual void shiftDeleteFlag(u8, bool); /* 802F1F9C */ virtual void setUndeleteFlag(u8); /* 802F1FAC */ virtual void setFontUndeleteFlag(); /* 802F030C */ virtual ~J2DTevBlock16(); -private: +public: /* 0x004 */ u16 mTexNo[8]; /* 0x014 */ u16 mFontNo; /* 0x016 */ J2DTevOrder mTevOrder[16]; @@ -396,33 +396,58 @@ private: /* 0x118 */ u8 mTevKAlphaSel[16]; /* 0x128 */ J2DTevSwapModeTable mTevSwapModeTable[4]; /* 0x12C */ J2DIndTevStage mIndTevStage[16]; - /* 0x16C */ JUTTexture* mTexture[16]; - /* 0x18C */ JUTPalette* mPalette[16]; + /* 0x16C */ JUTTexture* mTexture[8]; + /* 0x18C */ JUTPalette* mPalette[8]; /* 0x1AC */ JUTFont* mFont; /* 0x1B0 */ u8 mUndeleteFlag; /* 0x1B1 */ bool mFontUndeleteFlag; }; // Size: 0x1B4 +extern u16 j2dDefaultAlphaCmp; + struct J2DAlphaComp { - /* 0x0 */ u8 field_0x0; - /* 0x1 */ u8 field_0x1; + J2DAlphaComp() { + mAlphaCmp = j2dDefaultAlphaCmp; + mRef0 = 0; + mRef1 = 0; + } + + /* 0x0 */ u16 mAlphaCmp; /* 0x2 */ u8 mRef0; /* 0x3 */ u8 mRef1; }; struct J2DBlendInfo { + void operator=(J2DBlendInfo const& other) { + mType = other.mType; + mSrcFactor = other.mSrcFactor; + mDstFactor = other.mDstFactor; + //mOp = other.mOp; + } + /* 0x0 */ u8 mType; /* 0x1 */ u8 mSrcFactor; /* 0x2 */ u8 mDstFactor; + }; +extern J2DBlendInfo j2dDefaultBlendInfo; + struct J2DBlend { + J2DBlend() { + mBlendInfo = j2dDefaultBlendInfo; + } + /* 0x0 */ J2DBlendInfo mBlendInfo; /* 0x3 */ u8 mOp; }; class J2DPEBlock { public: + J2DPEBlock() { + initialize(); + } + /* 802F17FC */ void initialize(); /* 802F1840 */ void setGX(); @@ -450,17 +475,21 @@ public: class J2DIndBlockFull : public J2DIndBlock { public: + J2DIndBlockFull() { + initialize(); + } + /* 802F1664 */ virtual void initialize(); /* 802F1730 */ virtual void setGX(); /* 802F1B94 */ virtual void getType(); /* 802F1BA0 */ virtual void setIndTexStageNum(u8); - /* 802F1BA8 */ virtual void getIndTexStageNum() const; + /* 802F1BA8 */ virtual bool getIndTexStageNum() const; /* 802F1BB0 */ virtual void setIndTexOrder(u32, J2DIndTexOrder); - /* 802F1BCC */ virtual void getIndTexOrder(u32); + /* 802F1BCC */ virtual bool getIndTexOrder(u32); /* 802F1BE0 */ virtual void setIndTexMtx(u32, J2DIndTexMtx); - /* 802F1C38 */ virtual void getIndTexMtx(u32); + /* 802F1C38 */ virtual bool getIndTexMtx(u32); /* 802F1C4C */ virtual void setIndTexCoordScale(u32, J2DIndTexCoordScale); - /* 802F1C68 */ virtual void getIndTexCoordScale(u32); + /* 802F1C68 */ virtual bool getIndTexCoordScale(u32); /* 802F1C7C */ virtual ~J2DIndBlockFull(); private: @@ -471,6 +500,9 @@ private: }; class J2DIndBlockNull : public J2DIndBlock { +public: + J2DIndBlockNull() {} + /* 802EB1E0 */ virtual void setGX(); /* 802EB1E4 */ virtual void getType(); /* 802EB1F0 */ virtual ~J2DIndBlockNull(); @@ -483,6 +515,10 @@ private: /* 0x24 */ J2DTexMtx* mTexMtx[8]; public: + J2DTexGenBlock() { + initialize(); + } + /* 802EB510 */ void initialize(); /* 802EB570 */ void setGX(); /* 802EB6A4 */ void setTexMtx(u32, J2DTexMtx&); @@ -511,6 +547,10 @@ private: /* 0x12 */ u8 mCullMode; public: + J2DColorBlock() { + initialize(); + } + /* 802EB394 */ void initialize(); /* 802EB424 */ void setGX(); diff --git a/include/JSystem/J2DGraph/J2DMaterial.h b/include/JSystem/J2DGraph/J2DMaterial.h index baaee0fd61b..fbf30353d04 100644 --- a/include/JSystem/J2DGraph/J2DMaterial.h +++ b/include/JSystem/J2DGraph/J2DMaterial.h @@ -11,10 +11,10 @@ public: struct J2DMaterialAnmPointer { /* 802EA79C */ J2DMaterialAnmPointer(); - /* 0x00 */ int field_0x0; - /* 0x04 */ int field_0x4; - /* 0x08 */ int field_0x8; - /* 0x0C */ int field_0xc; + /* 0x00 */ J2DAnmBase* field_0x0; + /* 0x04 */ J2DAnmBase* field_0x4; + /* 0x08 */ J2DAnmBase* field_0x8; + /* 0x0C */ J2DAnmBase* field_0xc; /* 0x10 */ u16 field_0x10; /* 0x12 */ u16 field_0x12[8]; /* 0x22 */ u16 field_0x22[8]; @@ -24,8 +24,8 @@ public: /* 802EA1AC */ J2DMaterial(); /* 802EA38C */ void setGX(); - /* 802EA410 */ void createTevBlock(int, bool); - /* 802EA5C4 */ void createIndBlock(int, bool); + /* 802EA410 */ static J2DTevBlock* createTevBlock(int, bool); + /* 802EA5C4 */ static J2DIndBlock* createIndBlock(int, bool); /* 802EA84C */ void makeAnmPointer(); /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); @@ -35,6 +35,14 @@ public: /* 802EA2CC */ virtual ~J2DMaterial(); + u16 getIndex() const { return mIndex; } + J2DColorBlock* getColorBlock() { return &mColorBlock; } + J2DTexGenBlock* getTexGenBlock() { return &mTexGenBlock; } + J2DPEBlock* getPEBlock() { return &mPEBlock; } + J2DTevBlock* getTevBlock() { return mTevBlock; } + J2DIndBlock* getIndBlock() { return mIndBlock; } + + private: /* 0x04 */ int field_0x4; /* 0x08 */ int field_0x8; diff --git a/include/JSystem/J2DGraph/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen.h index 486f1164c27..3ba1f4499cb 100644 --- a/include/JSystem/J2DGraph/J2DScreen.h +++ b/include/JSystem/J2DGraph/J2DScreen.h @@ -7,7 +7,26 @@ #include "JSystem/JUtility/JUTNameTab.h" #include "dolphin/types.h" -struct J2DScrnBlockHeader {}; +struct J2DScrnHeader { + /* 0x00 */ u32 mTag; + /* 0x04 */ u32 mType; + /* 0x08 */ u32 mFileSize; + /* 0x0C */ u32 mBlockNum; + /* 0x10 */ u8 padding[0x10]; +}; + +struct J2DScrnInfoHeader { + /* 0x0 */ u32 mTag; + /* 0x4 */ u32 mSize; + /* 0x8 */ u16 mWidth; + /* 0xA */ u16 mHeight; + /* 0xC */ u32 mColor; +}; + +struct J2DScrnBlockHeader { + /* 0x00 */ u32 mTag; + /* 0x04 */ s32 mSize; +}; class J2DScreen : public J2DPane { public: @@ -30,22 +49,22 @@ public: /* 802F9A54 */ virtual void setAnimation(J2DAnmBase*); /* 802F9A74 */ virtual void setAnimationVF(J2DAnmVisibilityFull*); /* 802F9A78 */ virtual void setAnimationVC(J2DAnmVtxColor*); - /* 802F99E8 */ virtual void createPane(J2DScrnBlockHeader const&, JSURandomInputStream*, + /* 802F99E8 */ virtual J2DPane* createPane(J2DScrnBlockHeader const&, JSURandomInputStream*, J2DPane*, u32); - /* 802F8B98 */ virtual void createPane(J2DScrnBlockHeader const&, JSURandomInputStream*, + /* 802F8B98 */ virtual J2DPane* createPane(J2DScrnBlockHeader const&, JSURandomInputStream*, J2DPane*, u32, JKRArchive*); /* 802F8498 */ J2DScreen(); /* 802F85A8 */ void clean(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); + /* 802F8648 */ bool setPriority(char const*, u32, JKRArchive*); /* 802F8748 */ bool setPriority(JSURandomInputStream*, u32, JKRArchive*); /* 802F8778 */ bool private_set(JSURandomInputStream*, u32, JKRArchive*); /* 802F8834 */ bool checkSignature(JSURandomInputStream*); - /* 802F8894 */ void getScreenInformation(JSURandomInputStream*); - /* 802F8990 */ void makeHierarchyPanes(J2DPane*, JSURandomInputStream*, u32, JKRArchive*); + /* 802F8894 */ bool getScreenInformation(JSURandomInputStream*); + /* 802F8990 */ s32 makeHierarchyPanes(J2DPane*, JSURandomInputStream*, u32, JKRArchive*); /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9280 */ void getResReference(JSURandomInputStream*, u32); - /* 802F937C */ void createMaterial(JSURandomInputStream*, u32, JKRArchive*); + /* 802F9280 */ J2DResReference* getResReference(JSURandomInputStream*, u32); + /* 802F937C */ bool createMaterial(JSURandomInputStream*, u32, JKRArchive*); /* 802F9640 */ static void* getNameResource(char const*); /* 802F9690 */ void animation(); @@ -53,14 +72,13 @@ public: static J2DDataManage* mDataManage; - // private: /* 0x100 */ bool mScissor; /* 0x102 */ u16 mMaterialNum; /* 0x104 */ J2DMaterial* mMaterials; - /* 0x108 */ J2DResReference* field_0x108; - /* 0x10C */ J2DResReference* field_0x10c; + /* 0x108 */ J2DResReference* mTexRes; + /* 0x10C */ J2DResReference* mFontRes; /* 0x110 */ JUTNameTab* mNameTable; - /* 0x114 */ u32 field_0x114; + /* 0x114 */ JUtility::TColor mColor; }; #endif /* J2DSCREEN_H */ diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 77d82db311a..d36523f54a2 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -55,7 +55,7 @@ struct J3DAnmTransformFullTable { struct J3DAnmTexPatternFullTable { /* 0x00 */ u16 mMaxFrame; /* 0x02 */ u16 mOffset; - /* 0x04 */ u16 _4; + /* 0x04 */ u8 _4; /* 0x06 */ u16 _6; }; // Size = 0x8 @@ -64,7 +64,8 @@ struct J3DAnmCRegKeyTable { /* 0x06 */ J3DAnmKeyTableBase mGTable; /* 0x0C */ J3DAnmKeyTableBase mBTable; /* 0x12 */ J3DAnmKeyTableBase mATable; - /* 0x18 */ u8 _18[4]; + /* 0x18 */ u8 _18; + u8 padding[3]; }; // Size = 0x1C struct J3DAnmKRegKeyTable { @@ -72,7 +73,8 @@ struct J3DAnmKRegKeyTable { /* 0x06 */ J3DAnmKeyTableBase mGTable; /* 0x0C */ J3DAnmKeyTableBase mBTable; /* 0x12 */ J3DAnmKeyTableBase mATable; - /* 0x18 */ u8 _18[4]; + /* 0x18 */ u8 _18; + u8 padding[3]; }; // Size = 0x1C struct J3DAnmDataBlockHeader { // actual name unknown @@ -217,7 +219,7 @@ struct J3DAnmTexPatternFullData { /* 0x0E */ u16 field_0xe; /* 0x10 */ s32 mTableOffset; /* 0x14 */ s32 mValuesOffset; - /* 0x18 */ s32 mUpdaterMaterialIDOffset; + /* 0x18 */ s32 mUpdateMaterialIDOffset; /* 0x1C */ s32 mNameTabOffset; }; // Size = 0x20 diff --git a/include/JSystem/JSupport/JSUMemoryStream.h b/include/JSystem/JSupport/JSUMemoryStream.h index 5ce4fcb1706..ca69f914726 100644 --- a/include/JSystem/JSupport/JSUMemoryStream.h +++ b/include/JSystem/JSupport/JSUMemoryStream.h @@ -6,6 +6,10 @@ class JSUMemoryInputStream : JSURandomInputStream { public: + JSUMemoryInputStream(const void* res, u32 size) { + setBuffer(res, size); + } + /* 802552B8 */ ~JSUMemoryInputStream() {} /* 802DC520 */ void setBuffer(void const*, s32); /* 802DC534 */ u32 readData(void*, s32); diff --git a/libs/JSystem/J2DGraph/J2DAnimation.cpp b/libs/JSystem/J2DGraph/J2DAnimation.cpp index 5235e7813ed..4df28cd357c 100644 --- a/libs/JSystem/J2DGraph/J2DAnimation.cpp +++ b/libs/JSystem/J2DGraph/J2DAnimation.cpp @@ -544,27 +544,27 @@ void J2DAnmTextureSRTKey::searchUpdateMaterialID(J2DScreen* pScreen) { /* 8030BD10-8030BEE8 306650 01D8+00 1/0 0/0 0/0 .text * searchUpdateMaterialID__16J2DAnmTexPatternFP9J2DScreen */ void J2DAnmTexPattern::searchUpdateMaterialID(J2DScreen* pScreen) { - if (pScreen != NULL && pScreen->mNameTable != NULL && pScreen->field_0x108 != NULL) { + if (pScreen != NULL && pScreen->mNameTable != NULL && pScreen->mTexRes != NULL) { for (u16 entry = 0; entry < this->getUpdateMaterialNum(); entry++) { s32 idx = pScreen->mNameTable->getIndex(field_0x20.getName(entry)); if (idx != -1) { - mUpdaterMaterialID[entry] = idx; + mUpdateMaterialID[entry] = idx; } else { - mUpdaterMaterialID[entry] = 0xFFFF; + mUpdateMaterialID[entry] = 0xFFFF; } } delete[] mTIMGPtrArray; - mTIMGPtrArray = new J2DAnmTexPatternTIMGPointer[pScreen->field_0x108->mCount]; + mTIMGPtrArray = new J2DAnmTexPatternTIMGPointer[pScreen->mTexRes->mCount]; if (mTIMGPtrArray != NULL) { JUTResReference resRef; - for (u16 i = 0; i < pScreen->field_0x108->mCount; i++) { - s8* var1 = pScreen->field_0x108->getResReference(i); + for (u16 i = 0; i < pScreen->mTexRes->mCount; i++) { + s8* var1 = pScreen->mTexRes->getResReference(i); ResTIMG* var2 = NULL; if (var1 != NULL) { var2 = (ResTIMG*)resRef.getResource(var1, 'TIMG', NULL); if (var2 == NULL && J2DScreen::getDataManage() != NULL) { var2 = (ResTIMG*)J2DScreen::getDataManage()->get( - pScreen->field_0x108->getName(i)); + pScreen->mTexRes->getName(i)); } } mTIMGPtrArray[i].mRes = var2; diff --git a/libs/JSystem/J2DGraph/J2DAnmLoader_nonmatching.cpp b/libs/JSystem/J2DGraph/J2DAnmLoader_nonmatching.cpp index 51d22877c84..e79ac87c46f 100644 --- a/libs/JSystem/J2DGraph/J2DAnmLoader_nonmatching.cpp +++ b/libs/JSystem/J2DGraph/J2DAnmLoader_nonmatching.cpp @@ -438,8 +438,8 @@ void J2DAnmFullLoader_v15::setAnmTexPattern(J2DAnmTexPattern* pAnm, pAnm->mAnmTable = JSUConvertOffsetToPtr(pData, (void*)pData->mTableOffset); pAnm->mValues = JSUConvertOffsetToPtr(pData, (void*)pData->mValuesOffset); - pAnm->mUpdaterMaterialID = - JSUConvertOffsetToPtr(pData, (void*)pData->mUpdaterMaterialIDOffset); + pAnm->mUpdateMaterialID = + JSUConvertOffsetToPtr(pData, (void*)pData->mUpdateMaterialIDOffset); pAnm->field_0x20.setResource( JSUConvertOffsetToPtr(pData, (void*)pData->mNameTabOffset)); } diff --git a/libs/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp index 8626f2f6566..03d2a228b50 100644 --- a/libs/JSystem/J2DGraph/J2DMatBlock.cpp +++ b/libs/JSystem/J2DGraph/J2DMatBlock.cpp @@ -359,7 +359,6 @@ extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */]; extern "C" extern u32 j2dDefaultTevKColor; extern "C" extern u8 j2dDefaultTevSwapMode[4]; extern "C" extern u32 j2dDefaultTevSwapModeTable; -extern "C" extern u32 j2dDefaultBlendInfo; extern "C" extern u8 data_804561A4[4]; extern "C" extern u32 j2dDefaultColorChanInfo; extern "C" extern u16 data_804561AC; @@ -826,7 +825,7 @@ extern "C" asm void initialize__12J2DTevBlock1Fv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::prepareTexture(u8 param_0) { +asm bool J2DTevBlock1::prepareTexture(u8 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock1FUc.s" } @@ -837,7 +836,7 @@ asm void J2DTevBlock1::prepareTexture(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) { +asm bool J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMGP10JUTPalette.s" } @@ -848,7 +847,7 @@ asm void J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPal #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* param_1) { +asm bool J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlP10JUTTexture.s" } @@ -858,7 +857,7 @@ asm void J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* param_1) { +asm bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlPC7ResTIMG.s" } @@ -869,7 +868,7 @@ asm void J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::setTexture(u32 param_0, JUTTexture* param_1) { +asm bool J2DTevBlock1::setTexture(u32 param_0, JUTTexture* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlP10JUTTexture.s" } @@ -879,7 +878,7 @@ asm void J2DTevBlock1::setTexture(u32 param_0, JUTTexture* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::removeTexture(u32 param_0) { +asm bool J2DTevBlock1::removeTexture(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock1FUl.s" } @@ -890,7 +889,7 @@ asm void J2DTevBlock1::removeTexture(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::setFont(ResFONT* param_0) { +asm bool J2DTevBlock1::setFont(ResFONT* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7ResFONT.s" } @@ -901,7 +900,7 @@ asm void J2DTevBlock1::setFont(ResFONT* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::setFont(JUTFont* param_0) { +asm bool J2DTevBlock1::setFont(JUTFont* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7JUTFont.s" } @@ -911,7 +910,7 @@ asm void J2DTevBlock1::setFont(JUTFont* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* param_1) { +asm bool J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock1FUlPC7ResTLUT.s" } @@ -985,7 +984,7 @@ extern "C" asm void initialize__12J2DTevBlock2Fv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::prepareTexture(u8 param_0) { +asm bool J2DTevBlock2::prepareTexture(u8 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock2FUc.s" } @@ -996,7 +995,7 @@ asm void J2DTevBlock2::prepareTexture(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) { +asm bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlPC7ResTIMGP10JUTPalette.s" } @@ -1007,7 +1006,7 @@ asm void J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPal #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* param_1) { +asm bool J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlP10JUTTexture.s" } @@ -1017,7 +1016,7 @@ asm void J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* param_1) { +asm bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock2FUlPC7ResTIMG.s" } @@ -1028,7 +1027,7 @@ asm void J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::setTexture(u32 param_0, JUTTexture* param_1) { +asm bool J2DTevBlock2::setTexture(u32 param_0, JUTTexture* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock2FUlP10JUTTexture.s" } @@ -1038,7 +1037,7 @@ asm void J2DTevBlock2::setTexture(u32 param_0, JUTTexture* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::removeTexture(u32 param_0) { +asm bool J2DTevBlock2::removeTexture(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock2FUl.s" } @@ -1049,7 +1048,7 @@ asm void J2DTevBlock2::removeTexture(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::setFont(ResFONT* param_0) { +asm bool J2DTevBlock2::setFont(ResFONT* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7ResFONT.s" } @@ -1060,7 +1059,7 @@ asm void J2DTevBlock2::setFont(ResFONT* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::setFont(JUTFont* param_0) { +asm bool J2DTevBlock2::setFont(JUTFont* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7JUTFont.s" } @@ -1070,7 +1069,7 @@ asm void J2DTevBlock2::setFont(JUTFont* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* param_1) { +asm bool J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock2FUlPC7ResTLUT.s" } @@ -1144,7 +1143,7 @@ extern "C" asm void initialize__12J2DTevBlock4Fv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::prepareTexture(u8 param_0) { +asm bool J2DTevBlock4::prepareTexture(u8 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock4FUc.s" } @@ -1155,7 +1154,7 @@ asm void J2DTevBlock4::prepareTexture(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) { +asm bool J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlPC7ResTIMGP10JUTPalette.s" } @@ -1166,7 +1165,7 @@ asm void J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPal #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* param_1) { +asm bool J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlP10JUTTexture.s" } @@ -1176,7 +1175,7 @@ asm void J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* param_1) { +asm bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock4FUlPC7ResTIMG.s" } @@ -1187,7 +1186,7 @@ asm void J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::setTexture(u32 param_0, JUTTexture* param_1) { +asm bool J2DTevBlock4::setTexture(u32 param_0, JUTTexture* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock4FUlP10JUTTexture.s" } @@ -1197,7 +1196,7 @@ asm void J2DTevBlock4::setTexture(u32 param_0, JUTTexture* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::removeTexture(u32 param_0) { +asm bool J2DTevBlock4::removeTexture(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock4FUl.s" } @@ -1208,7 +1207,7 @@ asm void J2DTevBlock4::removeTexture(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::setFont(ResFONT* param_0) { +asm bool J2DTevBlock4::setFont(ResFONT* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7ResFONT.s" } @@ -1219,7 +1218,7 @@ asm void J2DTevBlock4::setFont(ResFONT* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::setFont(JUTFont* param_0) { +asm bool J2DTevBlock4::setFont(JUTFont* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7JUTFont.s" } @@ -1229,7 +1228,7 @@ asm void J2DTevBlock4::setFont(JUTFont* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* param_1) { +asm bool J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock4FUlPC7ResTLUT.s" } @@ -1303,7 +1302,7 @@ extern "C" asm void initialize__12J2DTevBlock8Fv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::prepareTexture(u8 param_0) { +asm bool J2DTevBlock8::prepareTexture(u8 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock8FUc.s" } @@ -1314,7 +1313,7 @@ asm void J2DTevBlock8::prepareTexture(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) { +asm bool J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlPC7ResTIMGP10JUTPalette.s" } @@ -1325,7 +1324,7 @@ asm void J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPal #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* param_1) { +asm bool J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlP10JUTTexture.s" } @@ -1335,7 +1334,7 @@ asm void J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* param_1) { +asm bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock8FUlPC7ResTIMG.s" } @@ -1346,7 +1345,7 @@ asm void J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::setTexture(u32 param_0, JUTTexture* param_1) { +asm bool J2DTevBlock8::setTexture(u32 param_0, JUTTexture* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock8FUlP10JUTTexture.s" } @@ -1356,7 +1355,7 @@ asm void J2DTevBlock8::setTexture(u32 param_0, JUTTexture* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::removeTexture(u32 param_0) { +asm bool J2DTevBlock8::removeTexture(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock8FUl.s" } @@ -1367,7 +1366,7 @@ asm void J2DTevBlock8::removeTexture(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::setFont(ResFONT* param_0) { +asm bool J2DTevBlock8::setFont(ResFONT* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7ResFONT.s" } @@ -1378,7 +1377,7 @@ asm void J2DTevBlock8::setFont(ResFONT* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::setFont(JUTFont* param_0) { +asm bool J2DTevBlock8::setFont(JUTFont* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7JUTFont.s" } @@ -1388,7 +1387,7 @@ asm void J2DTevBlock8::setFont(JUTFont* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* param_1) { +asm bool J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock8FUlPC7ResTLUT.s" } @@ -1462,7 +1461,7 @@ extern "C" asm void initialize__13J2DTevBlock16Fv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::prepareTexture(u8 param_0) { +asm bool J2DTevBlock16::prepareTexture(u8 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__13J2DTevBlock16FUc.s" } @@ -1473,7 +1472,7 @@ asm void J2DTevBlock16::prepareTexture(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) { +asm bool J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlPC7ResTIMGP10JUTPalette.s" } @@ -1484,7 +1483,7 @@ asm void J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPa #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* param_1) { +asm bool J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlP10JUTTexture.s" } @@ -1494,7 +1493,7 @@ asm void J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* param_1) { +asm bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__13J2DTevBlock16FUlPC7ResTIMG.s" } @@ -1505,7 +1504,7 @@ asm void J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::setTexture(u32 param_0, JUTTexture* param_1) { +asm bool J2DTevBlock16::setTexture(u32 param_0, JUTTexture* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__13J2DTevBlock16FUlP10JUTTexture.s" } @@ -1516,7 +1515,7 @@ asm void J2DTevBlock16::setTexture(u32 param_0, JUTTexture* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::removeTexture(u32 param_0) { +asm bool J2DTevBlock16::removeTexture(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__13J2DTevBlock16FUl.s" } @@ -1527,7 +1526,7 @@ asm void J2DTevBlock16::removeTexture(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::setFont(ResFONT* param_0) { +asm bool J2DTevBlock16::setFont(ResFONT* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7ResFONT.s" } @@ -1538,7 +1537,7 @@ asm void J2DTevBlock16::setFont(ResFONT* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::setFont(JUTFont* param_0) { +asm bool J2DTevBlock16::setFont(JUTFont* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7JUTFont.s" } @@ -1548,7 +1547,7 @@ asm void J2DTevBlock16::setFont(JUTFont* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* param_1) { +asm bool J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__13J2DTevBlock16FUlPC7ResTLUT.s" } @@ -1701,7 +1700,7 @@ void J2DIndBlockFull::setIndTexStageNum(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DIndBlockFull::getIndTexStageNum() const { +asm bool J2DIndBlockFull::getIndTexStageNum() const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTexStageNum__15J2DIndBlockFullCFv.s" } @@ -1722,7 +1721,7 @@ asm void J2DIndBlockFull::setIndTexOrder(u32 param_0, J2DIndTexOrder param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DIndBlockFull::getIndTexOrder(u32 param_0) { +asm bool J2DIndBlockFull::getIndTexOrder(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTexOrder__15J2DIndBlockFullFUl.s" } @@ -1744,7 +1743,7 @@ asm void J2DIndBlockFull::setIndTexMtx(u32 param_0, J2DIndTexMtx param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DIndBlockFull::getIndTexMtx(u32 param_0) { +asm bool J2DIndBlockFull::getIndTexMtx(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTexMtx__15J2DIndBlockFullFUl.s" } @@ -1765,7 +1764,7 @@ asm void J2DIndBlockFull::setIndTexCoordScale(u32 param_0, J2DIndTexCoordScale p #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DIndBlockFull::getIndTexCoordScale(u32 param_0) { +asm bool J2DIndBlockFull::getIndTexCoordScale(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTexCoordScale__15J2DIndBlockFullFUl.s" } @@ -1810,7 +1809,7 @@ asm void J2DTevBlock16::setTexNo(u32 param_0, u16 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getTexNo(u32 param_0) const { +asm u32 J2DTevBlock16::getTexNo(u32 param_0) const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__13J2DTevBlock16CFUl.s" } @@ -1825,7 +1824,7 @@ void J2DTevBlock16::setFontNo(u16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getFontNo() const { +asm u32 J2DTevBlock16::getFontNo() const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__13J2DTevBlock16CFv.s" } @@ -1846,7 +1845,7 @@ asm void J2DTevBlock16::setTevOrder(u32 param_0, J2DTevOrder param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getTevOrder(u32 param_0) { +asm bool J2DTevBlock16::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__13J2DTevBlock16FUl.s" } @@ -1867,7 +1866,7 @@ asm void J2DTevBlock16::setTevColor(u32 param_0, J2DGXColorS10 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getTevColor(u32 param_0) { +asm bool J2DTevBlock16::getTevColor(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__13J2DTevBlock16FUl.s" } @@ -1888,7 +1887,7 @@ asm void J2DTevBlock16::setTevKColor(u32 param_0, JUtility::TColor param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getTevKColor(u32 param_0) { +asm bool J2DTevBlock16::getTevKColor(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__13J2DTevBlock16FUl.s" } @@ -1909,7 +1908,7 @@ asm void J2DTevBlock16::setTevKColorSel(u32 param_0, u8 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getTevKColorSel(u32 param_0) { +asm bool J2DTevBlock16::getTevKColorSel(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__13J2DTevBlock16FUl.s" } @@ -1930,7 +1929,7 @@ asm void J2DTevBlock16::setTevKAlphaSel(u32 param_0, u8 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getTevKAlphaSel(u32 param_0) { +asm bool J2DTevBlock16::getTevKAlphaSel(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__13J2DTevBlock16FUl.s" } @@ -1947,7 +1946,7 @@ void J2DTevBlock16::setTevStageNum(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getTevStageNum() const { +asm bool J2DTevBlock16::getTevStageNum() const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__13J2DTevBlock16CFv.s" } @@ -1968,7 +1967,7 @@ asm void J2DTevBlock16::setTevStage(u32 param_0, J2DTevStage param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getTevStage(u32 param_0) { +asm bool J2DTevBlock16::getTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__13J2DTevBlock16FUl.s" } @@ -2000,7 +1999,7 @@ asm void J2DTevBlock16::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable par #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getTevSwapModeTable(u32 param_0) { +asm bool J2DTevBlock16::getTevSwapModeTable(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__13J2DTevBlock16FUl.s" } @@ -2022,7 +2021,7 @@ asm void J2DTevBlock16::setIndTevStage(u32 param_0, J2DIndTevStage param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getIndTevStage(u32 param_0) { +asm bool J2DTevBlock16::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__13J2DTevBlock16FUl.s" } @@ -2033,7 +2032,7 @@ asm void J2DTevBlock16::getIndTevStage(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1) { +asm bool J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlPC7ResTIMG.s" } @@ -2043,7 +2042,7 @@ asm void J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getTexture(u32 param_0) { +asm bool J2DTevBlock16::getTexture(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__13J2DTevBlock16FUl.s" } @@ -2053,7 +2052,7 @@ asm void J2DTevBlock16::getTexture(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getPalette(u32 param_0) { +asm bool J2DTevBlock16::getPalette(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__13J2DTevBlock16FUl.s" } @@ -2063,7 +2062,7 @@ asm void J2DTevBlock16::getPalette(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock16::getFont() { +asm bool J2DTevBlock16::getFont() { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__13J2DTevBlock16Fv.s" } @@ -2119,7 +2118,7 @@ asm void J2DTevBlock8::setTexNo(u32 param_0, u16 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getTexNo(u32 param_0) const { +asm u32 J2DTevBlock8::getTexNo(u32 param_0) const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock8CFUl.s" } @@ -2134,7 +2133,7 @@ void J2DTevBlock8::setFontNo(u16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getFontNo() const { +asm u32 J2DTevBlock8::getFontNo() const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock8CFv.s" } @@ -2155,7 +2154,7 @@ asm void J2DTevBlock8::setTevOrder(u32 param_0, J2DTevOrder param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getTevOrder(u32 param_0) { +asm bool J2DTevBlock8::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock8FUl.s" } @@ -2176,7 +2175,7 @@ asm void J2DTevBlock8::setTevColor(u32 param_0, J2DGXColorS10 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getTevColor(u32 param_0) { +asm bool J2DTevBlock8::getTevColor(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock8FUl.s" } @@ -2197,7 +2196,7 @@ asm void J2DTevBlock8::setTevKColor(u32 param_0, JUtility::TColor param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getTevKColor(u32 param_0) { +asm bool J2DTevBlock8::getTevKColor(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock8FUl.s" } @@ -2218,7 +2217,7 @@ asm void J2DTevBlock8::setTevKColorSel(u32 param_0, u8 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getTevKColorSel(u32 param_0) { +asm bool J2DTevBlock8::getTevKColorSel(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock8FUl.s" } @@ -2239,7 +2238,7 @@ asm void J2DTevBlock8::setTevKAlphaSel(u32 param_0, u8 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getTevKAlphaSel(u32 param_0) { +asm bool J2DTevBlock8::getTevKAlphaSel(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock8FUl.s" } @@ -2256,7 +2255,7 @@ void J2DTevBlock8::setTevStageNum(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getTevStageNum() const { +asm bool J2DTevBlock8::getTevStageNum() const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock8CFv.s" } @@ -2277,7 +2276,7 @@ asm void J2DTevBlock8::setTevStage(u32 param_0, J2DTevStage param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getTevStage(u32 param_0) { +asm bool J2DTevBlock8::getTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock8FUl.s" } @@ -2309,7 +2308,7 @@ asm void J2DTevBlock8::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getTevSwapModeTable(u32 param_0) { +asm bool J2DTevBlock8::getTevSwapModeTable(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock8FUl.s" } @@ -2331,7 +2330,7 @@ asm void J2DTevBlock8::setIndTevStage(u32 param_0, J2DIndTevStage param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getIndTevStage(u32 param_0) { +asm bool J2DTevBlock8::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock8FUl.s" } @@ -2342,7 +2341,7 @@ asm void J2DTevBlock8::getIndTevStage(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1) { +asm bool J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlPC7ResTIMG.s" } @@ -2352,7 +2351,7 @@ asm void J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getTexture(u32 param_0) { +asm bool J2DTevBlock8::getTexture(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock8FUl.s" } @@ -2362,7 +2361,7 @@ asm void J2DTevBlock8::getTexture(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getPalette(u32 param_0) { +asm bool J2DTevBlock8::getPalette(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock8FUl.s" } @@ -2372,7 +2371,7 @@ asm void J2DTevBlock8::getPalette(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock8::getFont() { +asm bool J2DTevBlock8::getFont() { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock8Fv.s" } @@ -2428,7 +2427,7 @@ asm void J2DTevBlock4::setTexNo(u32 param_0, u16 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getTexNo(u32 param_0) const { +asm u32 J2DTevBlock4::getTexNo(u32 param_0) const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock4CFUl.s" } @@ -2443,7 +2442,7 @@ void J2DTevBlock4::setFontNo(u16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getFontNo() const { +asm u32 J2DTevBlock4::getFontNo() const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock4CFv.s" } @@ -2464,7 +2463,7 @@ asm void J2DTevBlock4::setTevOrder(u32 param_0, J2DTevOrder param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getTevOrder(u32 param_0) { +asm bool J2DTevBlock4::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock4FUl.s" } @@ -2485,7 +2484,7 @@ asm void J2DTevBlock4::setTevColor(u32 param_0, J2DGXColorS10 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getTevColor(u32 param_0) { +asm bool J2DTevBlock4::getTevColor(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock4FUl.s" } @@ -2506,7 +2505,7 @@ asm void J2DTevBlock4::setTevKColor(u32 param_0, JUtility::TColor param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getTevKColor(u32 param_0) { +asm bool J2DTevBlock4::getTevKColor(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock4FUl.s" } @@ -2527,7 +2526,7 @@ asm void J2DTevBlock4::setTevKColorSel(u32 param_0, u8 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getTevKColorSel(u32 param_0) { +asm bool J2DTevBlock4::getTevKColorSel(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock4FUl.s" } @@ -2548,7 +2547,7 @@ asm void J2DTevBlock4::setTevKAlphaSel(u32 param_0, u8 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getTevKAlphaSel(u32 param_0) { +asm bool J2DTevBlock4::getTevKAlphaSel(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock4FUl.s" } @@ -2565,7 +2564,7 @@ void J2DTevBlock4::setTevStageNum(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getTevStageNum() const { +asm bool J2DTevBlock4::getTevStageNum() const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock4CFv.s" } @@ -2586,7 +2585,7 @@ asm void J2DTevBlock4::setTevStage(u32 param_0, J2DTevStage param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getTevStage(u32 param_0) { +asm bool J2DTevBlock4::getTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock4FUl.s" } @@ -2618,7 +2617,7 @@ asm void J2DTevBlock4::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getTevSwapModeTable(u32 param_0) { +asm bool J2DTevBlock4::getTevSwapModeTable(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock4FUl.s" } @@ -2640,7 +2639,7 @@ asm void J2DTevBlock4::setIndTevStage(u32 param_0, J2DIndTevStage param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getIndTevStage(u32 param_0) { +asm bool J2DTevBlock4::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock4FUl.s" } @@ -2651,7 +2650,7 @@ asm void J2DTevBlock4::getIndTevStage(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1) { +asm bool J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlPC7ResTIMG.s" } @@ -2661,7 +2660,7 @@ asm void J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getTexture(u32 param_0) { +asm bool J2DTevBlock4::getTexture(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock4FUl.s" } @@ -2671,7 +2670,7 @@ asm void J2DTevBlock4::getTexture(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getPalette(u32 param_0) { +asm bool J2DTevBlock4::getPalette(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock4FUl.s" } @@ -2681,7 +2680,7 @@ asm void J2DTevBlock4::getPalette(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock4::getFont() { +asm bool J2DTevBlock4::getFont() { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock4Fv.s" } @@ -2737,7 +2736,7 @@ asm void J2DTevBlock2::setTexNo(u32 param_0, u16 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getTexNo(u32 param_0) const { +asm u32 J2DTevBlock2::getTexNo(u32 param_0) const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock2CFUl.s" } @@ -2752,7 +2751,7 @@ void J2DTevBlock2::setFontNo(u16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getFontNo() const { +asm u32 J2DTevBlock2::getFontNo() const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock2CFv.s" } @@ -2773,7 +2772,7 @@ asm void J2DTevBlock2::setTevOrder(u32 param_0, J2DTevOrder param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getTevOrder(u32 param_0) { +asm bool J2DTevBlock2::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock2FUl.s" } @@ -2794,7 +2793,7 @@ asm void J2DTevBlock2::setTevColor(u32 param_0, J2DGXColorS10 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getTevColor(u32 param_0) { +asm bool J2DTevBlock2::getTevColor(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock2FUl.s" } @@ -2815,7 +2814,7 @@ asm void J2DTevBlock2::setTevKColor(u32 param_0, JUtility::TColor param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getTevKColor(u32 param_0) { +asm bool J2DTevBlock2::getTevKColor(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock2FUl.s" } @@ -2836,7 +2835,7 @@ asm void J2DTevBlock2::setTevKColorSel(u32 param_0, u8 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getTevKColorSel(u32 param_0) { +asm bool J2DTevBlock2::getTevKColorSel(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock2FUl.s" } @@ -2857,7 +2856,7 @@ asm void J2DTevBlock2::setTevKAlphaSel(u32 param_0, u8 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getTevKAlphaSel(u32 param_0) { +asm bool J2DTevBlock2::getTevKAlphaSel(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock2FUl.s" } @@ -2874,7 +2873,7 @@ void J2DTevBlock2::setTevStageNum(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getTevStageNum() const { +asm bool J2DTevBlock2::getTevStageNum() const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock2CFv.s" } @@ -2895,7 +2894,7 @@ asm void J2DTevBlock2::setTevStage(u32 param_0, J2DTevStage param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getTevStage(u32 param_0) { +asm bool J2DTevBlock2::getTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock2FUl.s" } @@ -2927,7 +2926,7 @@ asm void J2DTevBlock2::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getTevSwapModeTable(u32 param_0) { +asm bool J2DTevBlock2::getTevSwapModeTable(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock2FUl.s" } @@ -2949,7 +2948,7 @@ asm void J2DTevBlock2::setIndTevStage(u32 param_0, J2DIndTevStage param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getIndTevStage(u32 param_0) { +asm bool J2DTevBlock2::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock2FUl.s" } @@ -2960,7 +2959,7 @@ asm void J2DTevBlock2::getIndTevStage(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1) { +asm bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlPC7ResTIMG.s" } @@ -2970,7 +2969,7 @@ asm void J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getTexture(u32 param_0) { +asm bool J2DTevBlock2::getTexture(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock2FUl.s" } @@ -2980,7 +2979,7 @@ asm void J2DTevBlock2::getTexture(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getPalette(u32 param_0) { +asm bool J2DTevBlock2::getPalette(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock2FUl.s" } @@ -2990,7 +2989,7 @@ asm void J2DTevBlock2::getPalette(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock2::getFont() { +asm bool J2DTevBlock2::getFont() { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock2Fv.s" } @@ -3046,7 +3045,7 @@ asm void J2DTevBlock1::setTexNo(u32 param_0, u16 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::getTexNo(u32 param_0) const { +asm u32 J2DTevBlock1::getTexNo(u32 param_0) const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock1CFUl.s" } @@ -3061,7 +3060,7 @@ void J2DTevBlock1::setFontNo(u16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::getFontNo() const { +asm u32 J2DTevBlock1::getFontNo() const { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock1CFv.s" } @@ -3082,7 +3081,7 @@ asm void J2DTevBlock1::setTevOrder(u32 param_0, J2DTevOrder param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::getTevOrder(u32 param_0) { +asm bool J2DTevBlock1::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock1FUl.s" } @@ -3103,7 +3102,7 @@ asm void J2DTevBlock1::setTevColor(u32 param_0, J2DGXColorS10 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::getTevColor(u32 param_0) { +asm bool J2DTevBlock1::getTevColor(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock1FUl.s" } @@ -3124,7 +3123,7 @@ asm void J2DTevBlock1::setTevKColor(u32 param_0, JUtility::TColor param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::getTevKColor(u32 param_0) { +asm bool J2DTevBlock1::getTevKColor(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock1FUl.s" } @@ -3145,7 +3144,7 @@ asm void J2DTevBlock1::setTevKColorSel(u32 param_0, u8 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::getTevKColorSel(u32 param_0) { +asm bool J2DTevBlock1::getTevKColorSel(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock1FUl.s" } @@ -3166,7 +3165,7 @@ asm void J2DTevBlock1::setTevKAlphaSel(u32 param_0, u8 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::getTevKAlphaSel(u32 param_0) { +asm bool J2DTevBlock1::getTevKAlphaSel(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock1FUl.s" } @@ -3199,7 +3198,7 @@ asm void J2DTevBlock1::setTevStage(u32 param_0, J2DTevStage param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::getTevStage(u32 param_0) { +asm bool J2DTevBlock1::getTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock1FUl.s" } @@ -3231,7 +3230,7 @@ asm void J2DTevBlock1::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::getTevSwapModeTable(u32 param_0) { +asm bool J2DTevBlock1::getTevSwapModeTable(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock1FUl.s" } @@ -3253,7 +3252,7 @@ asm void J2DTevBlock1::setIndTevStage(u32 param_0, J2DIndTevStage param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::getIndTevStage(u32 param_0) { +asm bool J2DTevBlock1::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock1FUl.s" } @@ -3264,7 +3263,7 @@ asm void J2DTevBlock1::getIndTevStage(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1) { +asm bool J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMG.s" } @@ -3274,7 +3273,7 @@ asm void J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::getTexture(u32 param_0) { +asm bool J2DTevBlock1::getTexture(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock1FUl.s" } @@ -3284,7 +3283,7 @@ asm void J2DTevBlock1::getTexture(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::getPalette(u32 param_0) { +asm bool J2DTevBlock1::getPalette(u32 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock1FUl.s" } @@ -3294,7 +3293,7 @@ asm void J2DTevBlock1::getPalette(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTevBlock1::getFont() { +asm bool J2DTevBlock1::getFont() { nofralloc #include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock1Fv.s" } diff --git a/libs/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/J2DGraph/J2DMaterial.cpp index 528b355a907..5a220d7cc2e 100644 --- a/libs/JSystem/J2DGraph/J2DMaterial.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterial.cpp @@ -92,7 +92,6 @@ extern "C" extern void* __vt__11J2DTevBlock[47]; extern "C" extern void* __vt__14J2DTexGenBlock[3 + 1 /* padding */]; extern "C" extern u16 j2dDefaultIndTexOrderNull[1 + 1 /* padding */]; extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */]; -extern "C" extern u32 j2dDefaultBlendInfo; extern "C" extern u32 j2dDefaultColorChanInfo; extern "C" extern u16 j2dDefaultAlphaCmp; @@ -152,6 +151,17 @@ SECTION_DATA extern void* __vt__13J2DColorBlock[3] = { }; /* 802EA1AC-802EA2CC 2E4AEC 0120+00 0/0 1/1 0/0 .text __ct__11J2DMaterialFv */ +#ifdef NONMATCHING +J2DMaterial::J2DMaterial() { + field_0x4 = 0; + mIndex = -1; + mTevBlock = NULL; + mIndBlock = NULL; + mAnmPointer = NULL; + field_0x8 = 1; + mVisible = true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -160,6 +170,7 @@ asm J2DMaterial::J2DMaterial() { #include "asm/JSystem/J2DGraph/J2DMaterial/__ct__11J2DMaterialFv.s" } #pragma pop +#endif /* 802EA2CC-802EA38C 2E4C0C 00C0+00 1/0 2/2 0/0 .text __dt__11J2DMaterialFv */ #pragma push @@ -173,99 +184,243 @@ extern "C" asm void __dt__11J2DMaterialFv() { #pragma pop /* 802EA38C-802EA410 2E4CCC 0084+00 0/0 8/8 0/0 .text setGX__11J2DMaterialFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DMaterial::setGX() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMaterial/setGX__11J2DMaterialFv.s" +void J2DMaterial::setGX() { + if (mVisible) { + getColorBlock()->setGX(); + getTexGenBlock()->setGX(); + + if (getTevBlock() != NULL) { + getTevBlock()->setGX(); + } + + if (getIndBlock() != NULL) { + getIndBlock()->setGX(); + } + + getPEBlock()->setGX(); + } } -#pragma pop /* 802EA410-802EA5C4 2E4D50 01B4+00 0/0 1/1 0/0 .text createTevBlock__11J2DMaterialFib */ +#ifdef NONMATCHING +J2DTevBlock* J2DMaterial::createTevBlock(int block_type, bool noAlign) { + J2DTevBlock* block; + + if (noAlign) { + if (block_type <= 1) { + block = new J2DTevBlock1(); + } else if (block_type == 2) { + block = new J2DTevBlock2(); + } else if (block_type <= 4) { + block = new J2DTevBlock4(); + } else if (block_type <= 8) { + block = new J2DTevBlock8(); + } else { + block = new J2DTevBlock16(); + } + } else { + if (block_type <= 1) { + block = new (-4) J2DTevBlock1(); + } else if (block_type == 2) { + block = new (-4) J2DTevBlock2(); + } else if (block_type <= 4) { + block = new (-4) J2DTevBlock4(); + } else if (block_type <= 8) { + block = new (-4) J2DTevBlock8(); + } else { + block = new (-4) J2DTevBlock16(); + } + } + + return block; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DMaterial::createTevBlock(int param_0, bool param_1) { +asm J2DTevBlock* J2DMaterial::createTevBlock(int param_0, bool param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterial/createTevBlock__11J2DMaterialFib.s" } #pragma pop +#endif /* 802EA5C4-802EA79C 2E4F04 01D8+00 0/0 1/1 0/0 .text createIndBlock__11J2DMaterialFib */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DMaterial::createIndBlock(int param_0, bool param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMaterial/createIndBlock__11J2DMaterialFib.s" +J2DIndBlock* J2DMaterial::createIndBlock(int block_type, bool noAlign) { + J2DIndBlock* block; + + if (noAlign) { + if (block_type != 0) { + block = new J2DIndBlockFull(); + } else { + block = new J2DIndBlockNull(); + } + } else { + if (block_type != 0) { + block = new (-4) J2DIndBlockFull(); + } else { + block = new (-4) J2DIndBlockNull(); + } + } + + return block; } -#pragma pop /* 802EA79C-802EA84C 2E50DC 00B0+00 1/1 0/0 0/0 .text * __ct__Q211J2DMaterial21J2DMaterialAnmPointerFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DMaterial::J2DMaterialAnmPointer::J2DMaterialAnmPointer() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMaterial/__ct__Q211J2DMaterial21J2DMaterialAnmPointerFv.s" +J2DMaterial::J2DMaterialAnmPointer::J2DMaterialAnmPointer() { + field_0x0 = NULL; + field_0x10 = -1; + field_0x4 = 0; + + for (int i = 0; i < 8; i++) { + field_0x12[i] = -1; + } + field_0x8 = 0; + + for (int i = 0; i < 8; i++) { + field_0x22[i] = -1; + } + field_0xc = 0; + + for (int i = 0; i < 4; i++) { + field_0x32[i] = -1; + } + + for (int i = 0; i < 4; i++) { + field_0x3a[i] = -1; + } } -#pragma pop /* 802EA84C-802EA89C 2E518C 0050+00 4/4 0/0 0/0 .text makeAnmPointer__11J2DMaterialFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DMaterial::makeAnmPointer() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMaterial/makeAnmPointer__11J2DMaterialFv.s" +void J2DMaterial::makeAnmPointer() { + if (mAnmPointer == NULL) { + mAnmPointer = new J2DMaterialAnmPointer(); + } } -#pragma pop /* 802EA89C-802EA94C 2E51DC 00B0+00 0/0 4/4 0/0 .text setAnimation__11J2DMaterialFP11J2DAnmColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DMaterial::setAnimation(J2DAnmColor* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP11J2DAnmColor.s" +void J2DMaterial::setAnimation(J2DAnmColor* anm) { + if (anm != NULL || mAnmPointer != NULL) { + makeAnmPointer(); + mAnmPointer->field_0x0 = anm; + mAnmPointer->field_0x10 = -1; + + if (anm != NULL) { + u16 matNum = anm->getUpdateMaterialNum(); + u16 index = getIndex(); + + for (u16 i = 0; i < matNum; i++) { + u16 matID = anm->getUpdateMaterialID(i); + + if (index == matID) { + mAnmPointer->field_0x10 = i; + return; + } + } + } + } } -#pragma pop /* 802EA94C-802EAA2C 2E528C 00E0+00 0/0 4/4 0/0 .text * setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DMaterial::setAnimation(J2DAnmTextureSRTKey* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey.s" +void J2DMaterial::setAnimation(J2DAnmTextureSRTKey* anm) { + if (anm != NULL || mAnmPointer != NULL) { + makeAnmPointer(); + mAnmPointer->field_0x4 = anm; + + for (int i = 0; i < 8; i++) { + mAnmPointer->field_0x12[i] = -1; + } + + if (anm != NULL) { + u16 matNum = anm->getUpdateMaterialNum(); + u16 index = getIndex(); + + for (u16 i = 0; i < matNum; i++) { + u16 matID = anm->getUpdateMaterialID(i); + + if (index == matID) { + u8 mtxID = anm->getUpdateTexMtxID(i); + mAnmPointer->field_0x12[mtxID] = i; + } + } + } + } } -#pragma pop /* 802EAA2C-802EAB0C 2E536C 00E0+00 0/0 4/4 0/0 .text * setAnimation__11J2DMaterialFP16J2DAnmTexPattern */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DMaterial::setAnimation(J2DAnmTexPattern* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP16J2DAnmTexPattern.s" +void J2DMaterial::setAnimation(J2DAnmTexPattern* anm) { + if (anm != NULL || mAnmPointer != NULL) { + makeAnmPointer(); + mAnmPointer->field_0x8 = anm; + + for (int i = 0; i < 8; i++) { + mAnmPointer->field_0x22[i] = -1; + } + + if (anm != NULL) { + u16 matNum = anm->getUpdateMaterialNum(); + u16 index = getIndex(); + J3DAnmTexPatternFullTable* anmTbl = anm->getAnmTable(); + + for (u16 i = 0; i < matNum; i++) { + u16 matID = anm->getUpdateMaterialID(i); + + if (index == matID) { + mAnmPointer->field_0x22[anmTbl[i]._4] = i; + } + } + } + } } -#pragma pop /* 802EAB0C-802EAC78 2E544C 016C+00 0/0 4/4 0/0 .text * setAnimation__11J2DMaterialFP15J2DAnmTevRegKey */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DMaterial::setAnimation(J2DAnmTevRegKey* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP15J2DAnmTevRegKey.s" +void J2DMaterial::setAnimation(J2DAnmTevRegKey* anm) { + if (anm != NULL || mAnmPointer != NULL) { + makeAnmPointer(); + mAnmPointer->field_0xc = anm; + + for (int i = 0; i < 4; i++) { + mAnmPointer->field_0x32[i] = -1; + } + + if (anm != NULL) { + u16 matNum = anm->getCRegUpdateMaterialNum(); + u16 index = getIndex(); + + for (u16 i = 0; i < matNum; i++) { + u16 matID = anm->getCRegUpdateMaterialID(i); + + if (index == matID) { + J3DAnmCRegKeyTable* anmTbl = anm->getAnmCRegKeyTable(); + mAnmPointer->field_0x32[anmTbl[i]._18] = i; + } + } + } + + for (int i = 0; i < 4; i++) { + mAnmPointer->field_0x3a[i] = -1; + } + + if (anm != NULL) { + u16 matNum = anm->getKRegUpdateMaterialNum(); + u16 index = getIndex(); + + for (u16 i = 0; i < matNum; i++) { + u16 matID = anm->getKRegUpdateMaterialID(i); + + if (index == matID) { + J3DAnmKRegKeyTable* anmTbl = anm->getAnmKRegKeyTable(); + mAnmPointer->field_0x3a[anmTbl[i]._18] = i; + } + } + } + } } -#pragma pop /* ############################################################################################## */ /* 804561B0-804561B4 0047B0 0004+00 1/1 0/0 0/0 .sdata2 @1943 */ diff --git a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp index 4c44330343e..ae5007d1cb0 100644 --- a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -95,7 +95,6 @@ extern "C" extern u16 j2dDefaultIndTexOrderNull[1 + 1 /* padding */]; extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */]; extern "C" extern u8 j2dDefaultTevSwapMode[4]; extern "C" extern u32 j2dDefaultTevSwapModeTable; -extern "C" extern u32 j2dDefaultBlendInfo; extern "C" extern u32 j2dDefaultColorChanInfo; extern "C" extern u16 j2dDefaultAlphaCmp; diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp index 11318c75e98..d34ece206ff 100644 --- a/libs/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/J2DGraph/J2DScreen.cpp @@ -7,54 +7,12 @@ #include "JSystem/JGeometry.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct JSUMemoryInputStream { - /* 802DC520 */ void setBuffer(void const*, s32); -}; - -struct J2DWindowEx { - /* 80300C94 */ J2DWindowEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); -}; - -struct J2DWindow { - /* 802F9C10 */ J2DWindow(J2DPane*, JSURandomInputStream*, J2DMaterial*); - /* 802F9B74 */ J2DWindow(J2DPane*, JSURandomInputStream*, JKRArchive*); -}; - -struct J2DTextBoxEx { - /* 803071E4 */ J2DTextBoxEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); -}; - -struct J2DTextBox { - /* 802FF6D8 */ J2DTextBox(J2DPane*, JSURandomInputStream*, JKRArchive*); - /* 802FF75C */ J2DTextBox(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); -}; - -struct J2DPictureEx { - /* 803036EC */ J2DPictureEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); -}; - -struct J2DPicture { - /* 802FC118 */ J2DPicture(J2DPane*, JSURandomInputStream*, JKRArchive*); - /* 802FC1D4 */ J2DPicture(J2DPane*, JSURandomInputStream*, J2DMaterial*); -}; - -struct J2DOrthoGraph { - /* 802E96D0 */ J2DOrthoGraph(f32, f32, f32, f32, f32, f32); - /* 802E97B4 */ void setPort(); -}; - -struct J2DMaterialBlock {}; - -struct J2DMaterialFactory { - /* 802F2AD0 */ J2DMaterialFactory(J2DMaterialBlock const&); - /* 802F2D1C */ void create(J2DMaterial*, int, u32, J2DResReference*, J2DResReference*, - JKRArchive*) const; -}; +#include "JSystem/JSupport/JSUMemoryStream.h" +#include "JSystem/J2DGraph/J2DTextBoxEx.h" +#include "JSystem/J2DGraph/J2DWindowEx.h" +#include "JSystem/J2DGraph/J2DPictureEx.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "JSystem/J2DGraph/J2DMaterialFactory.h" // // Forward References: @@ -248,16 +206,16 @@ SECTION_SDATA2 static f32 lit_1563[1 + 1 /* padding */] = { }; /* 802F8498-802F8540 2F2DD8 00A8+00 0/0 59/59 4/4 .text __ct__9J2DScreenFv */ +// almost #ifdef NONMATCHING J2DScreen::J2DScreen() - : J2DPane(NULL, true, 'root', JGeometry::TBox2(0.0f, 0.0f, 640.0f, 480.0f)) { - field_0x114 = -1; + : J2DPane(NULL, true, 'root', JGeometry::TBox2(0.0f, 0.0f, 0.0f, 0.0f)), mColor() { _4 = -1; mScissor = false; mMaterialNum = 0; mMaterials = NULL; - field_0x108 = NULL; - field_0x10c = NULL; + mTexRes = NULL; + mFontRes = NULL; mNameTable = NULL; } #else @@ -272,15 +230,9 @@ asm J2DScreen::J2DScreen() { #endif /* 802F8540-802F85A8 2F2E80 0068+00 1/0 0/0 0/0 .text __dt__9J2DScreenFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm J2DScreen::~J2DScreen() { -extern "C" asm void __dt__9J2DScreenFv() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/__dt__9J2DScreenFv.s" +J2DScreen::~J2DScreen() { + clean(); } -#pragma pop /* 802F85A8-802F8648 2F2EE8 00A0+00 3/3 0/0 0/0 .text clean__9J2DScreenFv */ void J2DScreen::clean() { @@ -288,11 +240,11 @@ void J2DScreen::clean() { mMaterialNum = 0; mMaterials = NULL; - delete[] field_0x108; - field_0x108 = NULL; + delete[] mTexRes; + mTexRes = NULL; - delete[] field_0x10c; - field_0x10c = NULL; + delete[] mFontRes; + mFontRes = NULL; if (mNameTable != NULL) { delete[] mNameTable->getResNameTable(); @@ -303,98 +255,219 @@ void J2DScreen::clean() { /* 802F8648-802F8748 2F2F88 0100+00 0/0 58/58 4/4 .text setPriority__9J2DScreenFPCcUlP10JKRArchive */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::setPriority(char const* param_0, u32 param_1, JKRArchive* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFPCcUlP10JKRArchive.s" -} -#pragma pop - -/* 802F8748-802F8778 2F3088 0030+00 1/1 1/1 0/0 .text - * setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ -bool J2DScreen::setPriority(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) { - if (param_2 == NULL) { - return false; - } else { - return private_set(param_0, param_1, param_2); - } -} - -/* 802F8778-802F8834 2F30B8 00BC+00 1/1 0/0 0/0 .text - * private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DScreen::private_set(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s" -} -#pragma pop - -/* 802F8834-802F8894 2F3174 0060+00 1/1 0/0 0/0 .text - * checkSignature__9J2DScreenFP20JSURandomInputStream */ #ifdef NONMATCHING -bool J2DScreen::checkSignature(JSURandomInputStream* param_0) { - int tag; - param_0->read(&tag, 32); - - if (tag == 'SCRN' && (tag2 == 'blo1' || tag2 == 'blo2')) { - return true; - } else { +bool J2DScreen::setPriority(char const* resName, u32 param_1, JKRArchive* archive) { + if (archive == NULL) { return false; } + + void* res = JKRFileLoader::getGlbResource(resName, archive); + if (res != NULL) { + u32 size = archive->getExpandedResSize(res); + JSUMemoryInputStream stream(res, size); + return setPriority(&stream, param_1, archive); + } + + return false; } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J2DScreen::checkSignature(JSURandomInputStream* param_0) { +asm bool J2DScreen::setPriority(char const* param_0, u32 param_1, JKRArchive* param_2) { nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/checkSignature__9J2DScreenFP20JSURandomInputStream.s" +#include "asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFPCcUlP10JKRArchive.s" } #pragma pop #endif -/* ############################################################################################## */ -/* 80456230-80456238 004830 0008+00 1/1 0/0 0/0 .sdata2 @1705 */ -SECTION_SDATA2 static f64 lit_1705 = 4503599627370496.0 /* cast u32 to float */; +/* 802F8748-802F8778 2F3088 0030+00 1/1 1/1 0/0 .text + * setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ +bool J2DScreen::setPriority(JSURandomInputStream* stream, u32 param_1, JKRArchive* archive) { + if (archive == NULL) { + return false; + } else { + return private_set(stream, param_1, archive); + } +} + +/* 802F8778-802F8834 2F30B8 00BC+00 1/1 0/0 0/0 .text + * private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ +bool J2DScreen::private_set(JSURandomInputStream* stream, u32 param_1, JKRArchive* archive) { + if (!checkSignature(stream)) { + return false; + } + + if (!getScreenInformation(stream)) { + return false; + } + + bool make_end = makeHierarchyPanes(this, stream, param_1, archive) != 2; + + if (!(param_1 & 0x1F0000)) { + clean(); + } + + if (make_end) { + return stream->isGood(); + } + + return false; +} + +/* 802F8834-802F8894 2F3174 0060+00 1/1 0/0 0/0 .text + * checkSignature__9J2DScreenFP20JSURandomInputStream */ +bool J2DScreen::checkSignature(JSURandomInputStream* stream) { + J2DScrnHeader header; + stream->read(&header, 32); + + if (header.mTag != 'SCRN' || (header.mType != 'blo1' && header.mType != 'blo2')) { + return false; + } else { + return true; + } +} /* 802F8894-802F8990 2F31D4 00FC+00 1/1 0/0 0/0 .text * getScreenInformation__9J2DScreenFP20JSURandomInputStream */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::getScreenInformation(JSURandomInputStream* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/getScreenInformation__9J2DScreenFP20JSURandomInputStream.s" +bool J2DScreen::getScreenInformation(JSURandomInputStream* stream) { + J2DScrnInfoHeader info; + stream->read(&info, sizeof(J2DScrnInfoHeader)); + + if (info.mTag != 'INF1') { + return false; + } + + f32 tmp_0 = FLOAT_LABEL(lit_1561); + JGeometry::TBox2 dimensions(tmp_0, tmp_0, info.mWidth, info.mHeight); + place(dimensions); + + JUtility::TColor color(info.mColor); + mColor = color; + + if (info.mSize > 0x10) { + stream->skip(info.mSize - 0x10); + } + + return true; } -#pragma pop /* 802F8990-802F8B98 2F32D0 0208+00 1/1 0/0 0/0 .text * makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::makeHierarchyPanes(J2DPane* param_0, JSURandomInputStream* param_1, u32 param_2, - JKRArchive* param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive.s" +// goto can probably be replaced +s32 J2DScreen::makeHierarchyPanes(J2DPane* basePane, JSURandomInputStream* stream, u32 param_2, + JKRArchive* archive) { + J2DScrnBlockHeader header; + J2DPane* next_pane = basePane; + + do { + loop: + stream->peek(&header, sizeof(J2DScrnBlockHeader)); + + switch (header.mTag) { + case 'EXT1': + stream->seek(header.mSize, JSUStreamSeekFrom_CUR); + return 1; + case 'BGN1': + stream->seek(header.mSize, JSUStreamSeekFrom_CUR); + + int ret = makeHierarchyPanes(next_pane, stream, param_2, archive); + if (ret == 0) { + goto loop; + } + return ret; + case 'END1': + stream->seek(header.mSize, JSUStreamSeekFrom_CUR); + return 0; + case 'TEX1': + J2DResReference* texRes = getResReference(stream, param_2); + mTexRes = texRes; + + if (texRes != NULL) { + goto loop; + } + return 2; + case 'FNT1': + J2DResReference* fntRes = getResReference(stream, param_2); + mFontRes = fntRes; + + if (fntRes != NULL) { + goto loop; + } + return 2; + case 'MAT1': + if (createMaterial(stream, param_2, archive)) { + goto loop; + } + return 2; + } + + if (archive == NULL) { + next_pane = createPane(header, stream, basePane, param_2); + } else { + next_pane = createPane(header, stream, basePane, param_2, archive); + } + } + while (next_pane != NULL); + + return 2; } -#pragma pop /* 802F8B98-802F8ED4 2F34D8 033C+00 1/0 0/0 0/0 .text * createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUlP10JKRArchive */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::createPane(J2DScrnBlockHeader const& param_0, JSURandomInputStream* param_1, - J2DPane* param_2, u32 param_3, JKRArchive* param_4) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/func_802F8B98.s" +J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputStream* stream, + J2DPane* basePane, u32 param_3, JKRArchive* archive) { + J2DPane* newPane; + + switch (header.mTag) { + case 'PAN1': + newPane = new J2DPane(basePane, stream, 0); + break; + case 'WIN1': + newPane = new J2DWindow(basePane, stream, archive); + break; + case 'PIC1': + newPane = new J2DPicture(basePane, stream, archive); + break; + case 'TBX1': + newPane = new J2DTextBox(basePane, stream, archive); + break; + case 'PAN2': + newPane = new J2DPane(basePane, stream, 1); + break; + case 'WIN2': + if (param_3 & 0x1F0000) { + newPane = new J2DWindowEx(basePane, stream, param_3, mMaterials); + break; + } + newPane = new J2DWindow(basePane, stream, mMaterials); + break; + case 'PIC2': + if (param_3 & 0x1F0000) { + newPane = new J2DPictureEx(basePane, stream, param_3, mMaterials); + break; + } + newPane = new J2DPicture(basePane, stream, mMaterials); + break; + case 'TBX2': + if (param_3 & 0x1F0000) { + newPane = new J2DTextBoxEx(basePane, stream, param_3, mMaterials); + break; + } + newPane = new J2DTextBox(basePane, stream, param_3, mMaterials); + break; + default: + s32 position = stream->getPosition(); + s32 size = header.mSize; + s32 start = size + position; + + newPane = new J2DPane(basePane, stream, 0); + stream->seek(start, JSUStreamSeekFrom_SET); + break; + } + + return newPane; } -#pragma pop /* ############################################################################################## */ /* 80456238-8045623C 004838 0004+00 1/1 0/0 0/0 .sdata2 @1829 */ @@ -404,6 +477,43 @@ SECTION_SDATA2 static f32 lit_1829 = -1.0f; SECTION_SDATA2 static f32 lit_1830 = 1.0f; /* 802F8ED4-802F90A0 2F3814 01CC+00 0/0 51/51 4/4 .text draw__9J2DScreenFffPC14J2DGrafContext */ +// matches with literals +#ifdef NONMATCHING +void J2DScreen::draw(f32 param_0, f32 param_1, J2DGrafContext const* grafCtx) { + u32 x, y, width, height; + + if (mScissor) { + GXGetScissor(&x, &y, &width, &height); + } + + if (grafCtx != NULL) { + J2DPane::draw(param_0, param_1, grafCtx, mScissor, true); + } else { + J2DOrthoGraph ortho(0.0f, 0.0f, 640.0f, 480.0f, -1.0f, 1.0f); + ortho.setPort(); + J2DPane::draw(param_0, param_1, &ortho, mScissor, true); + } + + if (mScissor) { + GXSetScissor(x, y, width, height); + } + + GXSetNumIndStages(0); + for (int i = 0; i < 0x10; i++) { + GXSetTevDirect((GXTevStageID)i); + } + GXSetNumTevStages(1); + GXSetTevOp(GX_TEVSTAGE0, GX_PASSCLR); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); + GXSetVtxDesc(GX_VA_TEX0, GX_NONE); + GXSetCullMode(GX_CULL_NONE); + GXSetNumTexGens(0); + GXSetChanCtrl(GX_COLOR0A0, GX_DISABLE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT_NULL, GX_DF_NONE, GX_AF_NONE); + for (int i = 0; i < 4; i++) { + GXSetTevSwapModeTable((GXTevSwapSel)i, GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -412,68 +522,190 @@ asm void J2DScreen::draw(f32 param_0, f32 param_1, J2DGrafContext const* param_2 #include "asm/JSystem/J2DGraph/J2DScreen/draw__9J2DScreenFffPC14J2DGrafContext.s" } #pragma pop +#endif /* 802F90A0-802F90E0 2F39E0 0040+00 1/0 0/0 0/0 .text search__9J2DScreenFUx */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DPane* J2DScreen::search(u64 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/search__9J2DScreenFUx.s" +J2DPane* J2DScreen::search(u64 tag) { + if (tag == 0) { + return NULL; + } + + return J2DPane::search(tag); } -#pragma pop /* 802F90E0-802F9120 2F3A20 0040+00 1/0 0/0 0/0 .text searchUserInfo__9J2DScreenFUx */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DPane* J2DScreen::searchUserInfo(u64 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/searchUserInfo__9J2DScreenFUx.s" +J2DPane* J2DScreen::searchUserInfo(u64 tag) { + if (tag == 0) { + return NULL; + } + + return J2DPane::searchUserInfo(tag); } -#pragma pop /* 802F9120-802F9280 2F3A60 0160+00 1/0 0/0 0/0 .text drawSelf__9J2DScreenFffPA3_A4_f */ +// close. issues with color +#ifdef NONMATCHING +void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { + JUtility::TColor color(mColor); + u8 alpha = (color.a * mAlpha) / 255; + + if (alpha != 0) { + JUtility::TColor color2((u32)alpha); + color = color2; + + GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_SET); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + + GXPosition3f32(0.0f, 0.0f, 0.0f); + GXColor1u32(color); + + GXPosition3f32(getWidth(), 0.0f, 0.0f); + GXColor1u32(color); + + GXPosition3f32(getWidth(), getHeight(), 0.0f); + GXColor1u32(color); + + GXPosition3f32(0.0f, getHeight(), 0.0f); + GXColor1u32(color); + + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0); + GXEnd(); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DScreen::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) { +asm void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { nofralloc #include "asm/JSystem/J2DGraph/J2DScreen/drawSelf__9J2DScreenFffPA3_A4_f.s" } #pragma pop +#endif /* 802F9280-802F937C 2F3BC0 00FC+00 1/1 0/0 0/0 .text * getResReference__9J2DScreenFP20JSURandomInputStreamUl */ +// small regalloc +#ifdef NONMATCHING +J2DResReference* J2DScreen::getResReference(JSURandomInputStream* stream, u32 param_1) { + s32 position = stream->getPosition(); + stream->skip(4); + + s32 start, end; + start = stream->readS32(); + stream->skip(4); + end = stream->readS32(); + stream->seek(position + end, JSUStreamSeekFrom_SET); + + s32 size = end - start; + + char* buffer; + if (param_1 & 0x1F0000) { + buffer = new char[size]; + } else { + buffer = new (-4) char[size]; + } + + if (buffer != NULL) { + stream->read(buffer, size); + } + + return (J2DResReference*)buffer; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DScreen::getResReference(JSURandomInputStream* param_0, u32 param_1) { +asm J2DResReference* J2DScreen::getResReference(JSURandomInputStream* param_0, u32 param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DScreen/getResReference__9J2DScreenFP20JSURandomInputStreamUl.s" } #pragma pop +#endif /* 802F937C-802F9600 2F3CBC 0284+00 1/1 0/0 0/0 .text * createMaterial__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ +// nametab section has issues +#ifdef NONMATCHING +bool J2DScreen::createMaterial(JSURandomInputStream* stream, u32 param_1, + JKRArchive* archive) { + s32 position = stream->getPosition(); + + J2DScrnBlockHeader header; + stream->read(&header, 8); + mMaterialNum = stream->readU16(); + + stream->skip(2); + + if (param_1 & 0x1F0000) { + mMaterials = new J2DMaterial[mMaterialNum]; + } else { + mMaterials = new (-4) J2DMaterial[mMaterialNum]; + } + + u8* buffer = new (-4) u8[header.mSize]; + if (mMaterials != NULL && buffer != NULL) { + stream->seek(position, JSUStreamSeekFrom_SET); + stream->read(buffer, header.mSize); + J2DMaterialFactory factory(*(J2DMaterialBlock*)buffer); + + for (u16 i = 0; i < mMaterialNum; i++) { + factory.create(&mMaterials[i], i, param_1, mTexRes, mFontRes, archive); + } + + if (param_1 & 0x1F0000) { + u32 offset = buffer[0x14] << 0x18 | buffer[0x15] << 0x10 | buffer[0x16] << 8 | buffer[0x17]; + char* sec = (char*)buffer + offset; + u16* sec_s = (u16*)sec + *(u16*)sec; + + u16 num = sec_s[1]; + while (sec[num] != 0) { + num++; + } + num++; + + ResNTAB* nametab = new ResNTAB[num]; + if (nametab != NULL) { + for (u16 i = 0; i < num; i++) { + nametab->mEntries[i].mKeyCode = sec[i]; + } + + mNameTable = new JUTNameTab(nametab); + if (mNameTable == NULL) { + delete[] nametab; + } else { + delete[] buffer; + return true; + } + } + } + } + + delete[] buffer; + clean(); + return false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DScreen::createMaterial(JSURandomInputStream* param_0, u32 param_1, +asm bool J2DScreen::createMaterial(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) { nofralloc #include "asm/JSystem/J2DGraph/J2DScreen/createMaterial__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s" } #pragma pop +#endif /* 802F9600-802F9620 2F3F40 0020+00 1/0 0/0 0/0 .text isUsed__9J2DScreenFPC7ResTIMG */ -bool J2DScreen::isUsed(ResTIMG const* param_0) { - return J2DPane::isUsed(param_0); +bool J2DScreen::isUsed(ResTIMG const* img) { + return J2DPane::isUsed(img); } /* 802F9620-802F9640 2F3F60 0020+00 1/0 0/0 0/0 .text isUsed__9J2DScreenFPC7ResFONT */ -bool J2DScreen::isUsed(ResFONT const* param_0) { - return J2DPane::isUsed(param_0); +bool J2DScreen::isUsed(ResFONT const* font) { + return J2DPane::isUsed(font); } /* ############################################################################################## */ @@ -481,85 +713,105 @@ bool J2DScreen::isUsed(ResFONT const* param_0) { J2DDataManage* J2DScreen::mDataManage; /* 802F9640-802F9690 2F3F80 0050+00 0/0 6/6 0/0 .text getNameResource__9J2DScreenFPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void* J2DScreen::getNameResource(char const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/getNameResource__9J2DScreenFPCc.s" +void* J2DScreen::getNameResource(char const* resName) { + void* res = JKRFileLoader::getGlbResource(resName, NULL); + + if (res == NULL && mDataManage != NULL) { + res = mDataManage->get(resName); + } + + return res; } -#pragma pop /* 802F9690-802F9704 2F3FD0 0074+00 0/0 30/30 3/3 .text animation__9J2DScreenFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::animation() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/animation__9J2DScreenFv.s" +void J2DScreen::animation() { + animationPane(mTransform); + + for (u16 i = 0; i < mMaterialNum; i++) { + mMaterials[i].animation(); + } } -#pragma pop /* 802F9704-802F9798 2F4044 0094+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP11J2DAnmColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::setAnimation(J2DAnmColor* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP11J2DAnmColor.s" +void J2DScreen::setAnimation(J2DAnmColor* anmColor) { + anmColor->searchUpdateMaterialID(this); + u16 matNum = anmColor->getUpdateMaterialNum(); + + for (u16 i = 0; i < matNum; i++) { + u16 matID = anmColor->getUpdateMaterialID(i); + if (matID < mMaterialNum) { + mMaterials[matID].setAnimation(anmColor); + } + } } -#pragma pop /* 802F9798-802F9838 2F40D8 00A0+00 1/0 0/0 0/0 .text * setAnimation__9J2DScreenFP19J2DAnmTextureSRTKey */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::setAnimation(J2DAnmTextureSRTKey* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP19J2DAnmTextureSRTKey.s" +void J2DScreen::setAnimation(J2DAnmTextureSRTKey* anmSRTKey) { + anmSRTKey->searchUpdateMaterialID(this); + u16 matNum = anmSRTKey->getUpdateMaterialNum(); + + for (u16 i = 0; i < matNum; i++) { + u16 matID = anmSRTKey->getUpdateMaterialID(i); + if (matID < mMaterialNum) { + mMaterials[matID].setAnimation(anmSRTKey); + } + } } -#pragma pop /* 802F9838-802F98CC 2F4178 0094+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP16J2DAnmTexPattern */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::setAnimation(J2DAnmTexPattern* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP16J2DAnmTexPattern.s" +void J2DScreen::setAnimation(J2DAnmTexPattern* anmPattern) { + anmPattern->searchUpdateMaterialID(this); + u16 matNum = anmPattern->getUpdateMaterialNum(); + + for (u16 i = 0; i < matNum; i++) { + u16 matID = anmPattern->getUpdateMaterialID(i); + if (matID < mMaterialNum) { + mMaterials[matID].setAnimation(anmPattern); + } + } } -#pragma pop /* 802F98CC-802F99A8 2F420C 00DC+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP15J2DAnmTevRegKey */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::setAnimation(J2DAnmTevRegKey* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP15J2DAnmTevRegKey.s" +void J2DScreen::setAnimation(J2DAnmTevRegKey* anmRegKey) { + anmRegKey->searchUpdateMaterialID(this); + + u16 cMatNum = anmRegKey->getCRegUpdateMaterialNum(); + for (u16 i = 0; i < cMatNum; i++) { + u16 matID = anmRegKey->getCRegUpdateMaterialID(i); + if (matID < mMaterialNum) { + mMaterials[matID].setAnimation(anmRegKey); + } + } + + u16 kMatNum = anmRegKey->getKRegUpdateMaterialNum(); + for (u16 i = 0; i < kMatNum; i++) { + u16 matID = anmRegKey->getKRegUpdateMaterialID(i); + if (matID < mMaterialNum) { + mMaterials[matID].setAnimation(anmRegKey); + } + } } -#pragma pop /* 802F99A8-802F99C8 2F42E8 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP14J2DAnmVtxColor */ -void J2DScreen::setAnimation(J2DAnmVtxColor* param_0) { - J2DPane::setVtxColorAnimation(param_0); +void J2DScreen::setAnimation(J2DAnmVtxColor* anmVtxColor) { + J2DPane::setVtxColorAnimation(anmVtxColor); } /* 802F99C8-802F99E8 2F4308 0020+00 1/0 0/0 0/0 .text * setAnimation__9J2DScreenFP20J2DAnmVisibilityFull */ -void J2DScreen::setAnimation(J2DAnmVisibilityFull* param_0) { - J2DPane::setVisibileAnimation(param_0); +void J2DScreen::setAnimation(J2DAnmVisibilityFull* anmVisibility) { + J2DPane::setVisibileAnimation(anmVisibility); } /* 802F99E8-802F9A18 2F4328 0030+00 1/0 0/0 0/0 .text * createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUl */ -void J2DScreen::createPane(J2DScrnBlockHeader const& param_0, JSURandomInputStream* param_1, - J2DPane* param_2, u32 param_3) { - createPane(param_0, param_1, param_2, param_3, NULL); +J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputStream* stream, + J2DPane* basePane, u32 param_3) { + return createPane(header, stream, basePane, param_3, NULL); } /* 802F9A18-802F9A20 2F4358 0008+00 1/0 0/0 0/0 .text getTypeID__9J2DScreenCFv */ @@ -573,8 +825,8 @@ void J2DScreen::calcMtx() { } /* 802F9A54-802F9A74 2F4394 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP10J2DAnmBase */ -void J2DScreen::setAnimation(J2DAnmBase* param_0) { - J2DPane::setAnimation(param_0); +void J2DScreen::setAnimation(J2DAnmBase* anm) { + J2DPane::setAnimation(anm); } /* 802F9A74-802F9A78 2F43B4 0004+00 1/0 0/0 0/0 .text