From 555f0ea15b9c8a581f63bf3731300ad33ac5e76b Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 27 Sep 2021 08:19:58 +0900 Subject: [PATCH] Effects (#442) * effect shim names * fx_1_main and data migration * fx_1_renderWorld * header reorg * remove stale comment * effect_1 * cleanup * fx_6 stuff * most of effect_6, misc changes * cleanup * PR stuff * warningz --- include/common_structs.h | 143 +- include/effects.h | 146 +- include/effects_internal.h | 22 + include/enums.h | 3 + include/functions.h | 5 +- src/1AF120.c | 2 +- src/325AD0.c | 13 +- src/effects.c | 3 +- src/effects/effect_1.c | 189 ++- src/effects/effect_6.c | 267 +++- src/evt/demo_api.c | 6 + src/evt/evt.c | 8 - src/npc.c | 23 +- src/world/common/reflection.inc.c | 7 +- tools/sortsymz.py | 30 +- tools/symz.txt | 1276 ----------------- ver/us/asm/data/effects/328050.data.s | 18 - ver/us/asm/data/effects/328D20.data.s | 33 - .../effects/effect_1/func_E00021BC.s | 73 - .../effects/effect_1/func_E00022BC.s | 21 - .../effects/effect_1/func_E0002300.s | 281 ---- .../nonmatchings/effects/effect_1/fx_1_main.s | 117 -- .../effects/effect_10/func_E0014260.s | 8 +- .../effects/effect_10/func_E001449C.s | 2 +- .../effects/effect_10/func_E00144E0.s | 8 +- .../effects/effect_10/fx_10_main.s | 16 +- .../effects/effect_100/func_E00C8220.s | 2 +- .../effects/effect_100/func_E00C8404.s | 2 +- .../effects/effect_100/func_E00C8454.s | 12 +- .../effects/effect_100/fx_100_main.s | 8 +- .../effects/effect_101/func_E00CA248.s | 8 +- .../effects/effect_101/func_E00CA484.s | 2 +- .../effects/effect_101/func_E00CA4CC.s | 18 +- .../effects/effect_101/fx_101_main.s | 6 +- .../effects/effect_102/func_E00CC258.s | 16 +- .../effects/effect_102/func_E00CC980.s | 2 +- .../effects/effect_102/func_E00CC9D0.s | 28 +- .../effects/effect_102/fx_102_main.s | 10 +- .../effects/effect_103/func_E00CE224.s | 2 +- .../effects/effect_103/func_E00CE428.s | 2 +- .../effects/effect_103/func_E00CE478.s | 56 +- .../effects/effect_103/fx_103_main.s | 10 +- .../effects/effect_104/func_E00D0194.s | 6 +- .../effects/effect_104/func_E00D0448.s | 2 +- .../effects/effect_104/func_E00D048C.s | 20 +- .../effects/effect_104/fx_104_main.s | 4 +- .../effects/effect_105/func_E00D2120.s | 2 +- .../effects/effect_105/func_E00D2234.s | 2 +- .../effects/effect_105/func_E00D2284.s | 8 +- .../effects/effect_105/fx_105_main.s | 4 +- .../effects/effect_107/func_E00D6720.s | 6 +- .../effects/effect_107/func_E00D693C.s | 2 +- .../effects/effect_107/func_E00D6980.s | 16 +- .../effects/effect_107/fx_107_main.s | 26 +- .../effects/effect_108/func_E00D8128.s | 2 +- .../effects/effect_108/func_E00D8630.s | 2 +- .../effects/effect_108/fx_108_main.s | 4 +- .../effects/effect_109/func_E00DA104.s | 2 +- .../effects/effect_109/func_E00DA1E0.s | 2 +- .../effects/effect_109/func_E00DA230.s | 8 +- .../effects/effect_109/fx_109_main.s | 4 +- .../effects/effect_11/func_E0016228.s | 8 +- .../effects/effect_11/func_E0016410.s | 2 +- .../effects/effect_11/func_E0016454.s | 12 +- .../effects/effect_11/fx_11_main.s | 10 +- .../effects/effect_110/func_E00DC198.s | 2 +- .../effects/effect_110/func_E00DC2C0.s | 2 +- .../effects/effect_110/func_E00DC304.s | 12 +- .../effects/effect_110/fx_110_main.s | 8 +- .../effects/effect_111/func_E00DE124.s | 2 +- .../effects/effect_111/func_E00DE260.s | 2 +- .../effects/effect_111/func_E00DE2A8.s | 12 +- .../effects/effect_111/fx_111_main.s | 4 +- .../effects/effect_112/func_E00E01D8.s | 18 +- .../effects/effect_112/func_E00E05B0.s | 2 +- .../effects/effect_112/func_E00E0600.s | 12 +- .../effects/effect_112/fx_112_main.s | 4 +- .../effects/effect_113/func_E00E2134.s | 2 +- .../effects/effect_113/func_E00E21C8.s | 2 +- .../effects/effect_113/func_E00E2218.s | 28 +- .../effects/effect_113/fx_113_main.s | 4 +- .../effects/effect_114/func_E00E4290.s | 28 +- .../effects/effect_114/func_E00E490C.s | 2 +- .../effects/effect_114/func_E00E495C.s | 4 +- .../effects/effect_114/fx_114_main.s | 10 +- .../effects/effect_115/func_E00E6184.s | 6 +- .../effects/effect_115/func_E00E64D4.s | 2 +- .../effects/effect_115/func_E00E6524.s | 12 +- .../effects/effect_115/fx_115_main.s | 4 +- .../effects/effect_116/func_E00E8264.s | 2 +- .../effects/effect_116/func_E00E8374.s | 2 +- .../effects/effect_116/func_E00E83BC.s | 8 +- .../effects/effect_116/fx_116_main.s | 6 +- .../effects/effect_117/func_E00EA198.s | 4 +- .../effects/effect_117/func_E00EA520.s | 4 +- .../effects/effect_117/func_E00EA66C.s | 12 +- .../effects/effect_117/fx_117_main.s | 4 +- .../effects/effect_119/func_E010A18C.s | 10 +- .../effects/effect_119/func_E010A4A0.s | 2 +- .../effects/effect_119/func_E010A4E8.s | 8 +- .../effects/effect_119/fx_119_main.s | 4 +- .../effects/effect_12/func_E0018000.s | 8 +- .../effects/effect_12/func_E00182B4.s | 2 +- .../effects/effect_12/func_E0018378.s | 2 +- .../effects/effect_12/func_E00183BC.s | 2 +- .../effects/effect_12/fx_12_main.s | 16 +- .../effects/effect_120/func_E010C198.s | 6 +- .../effects/effect_120/func_E010C354.s | 2 +- .../effects/effect_120/func_E010C39C.s | 16 +- .../effects/effect_120/fx_120_main.s | 4 +- .../effects/effect_121/func_E010E4A8.s | 2 +- .../effects/effect_121/func_E010E510.s | 2 +- .../effects/effect_121/func_E010E558.s | 2 +- .../effects/effect_121/fx_121_main.s | 6 +- .../effects/effect_122/func_E011022C.s | 2 +- .../effects/effect_122/func_E01103A4.s | 2 +- .../effects/effect_122/func_E01103EC.s | 8 +- .../effects/effect_122/fx_122_main.s | 18 +- .../effects/effect_123/func_E01121C0.s | 2 +- .../effects/effect_123/func_E01122E8.s | 2 +- .../effects/effect_123/func_E0112330.s | 12 +- .../effects/effect_123/fx_123_main.s | 8 +- .../effects/effect_124/func_E01140DC.s | 8 +- .../effects/effect_124/func_E0114340.s | 2 +- .../effects/effect_124/func_E0114388.s | 6 +- .../effects/effect_124/fx_124_main.s | 4 +- .../effects/effect_125/func_E011618C.s | 12 +- .../effects/effect_125/func_E01166A0.s | 2 +- .../effects/effect_125/func_E01166E8.s | 12 +- .../effects/effect_125/fx_125_main.s | 4 +- .../effects/effect_126/func_E01182F4.s | 2 +- .../effects/effect_126/func_E0118454.s | 2 +- .../effects/effect_126/func_E011849C.s | 8 +- .../effects/effect_126/fx_126_main.s | 16 +- .../effects/effect_127/func_E011A104.s | 4 +- .../effects/effect_127/fx_127_main.s | 4 +- .../effects/effect_128/func_E011C0FC.s | 2 +- .../effects/effect_128/func_E011C17C.s | 2 +- .../effects/effect_128/func_E011C1C4.s | 16 +- .../effects/effect_128/fx_128_main.s | 4 +- .../effects/effect_129/func_E011E194.s | 28 +- .../effects/effect_129/func_E011E530.s | 2 +- .../effects/effect_129/func_E011E578.s | 8 +- .../effects/effect_129/fx_129_main.s | 8 +- .../effects/effect_13/func_E001A224.s | 2 +- .../effects/effect_13/func_E001A3FC.s | 2 +- .../effects/effect_13/func_E001A440.s | 6 +- .../effects/effect_13/fx_13_main.s | 16 +- .../effects/effect_130/func_E012013C.s | 6 +- .../effects/effect_130/func_E012039C.s | 2 +- .../effects/effect_130/func_E01203E4.s | 8 +- .../effects/effect_130/fx_130_main.s | 4 +- .../effects/effect_131/func_E012217C.s | 8 +- .../effects/effect_131/func_E01226C4.s | 2 +- .../effects/effect_131/func_E012270C.s | 8 +- .../effects/effect_131/fx_131_main.s | 4 +- .../effects/effect_132/func_E0124304.s | 2 +- .../effects/effect_132/func_E012448C.s | 2 +- .../effects/effect_132/func_E01244C4.s | 12 +- .../effects/effect_132/fx_132_main.s | 16 +- .../effects/effect_133/func_E0126134.s | 18 +- .../effects/effect_133/func_E01264A4.s | 2 +- .../effects/effect_133/func_E01264EC.s | 16 +- .../effects/effect_133/fx_133_main.s | 4 +- .../effects/effect_134/func_E0128130.s | 2 +- .../effects/effect_134/func_E0128198.s | 2 +- .../effects/effect_134/func_E01281E0.s | 8 +- .../effects/effect_134/fx_134_main.s | 4 +- .../effects/effect_14/func_E001C128.s | 2 +- .../effects/effect_14/func_E001C200.s | 2 +- .../effects/effect_14/func_E001C30C.s | 16 +- .../effects/effect_14/fx_14_main.s | 4 +- .../effects/effect_15/func_E001E378.s | 12 +- .../effects/effect_15/func_E001E6E8.s | 2 +- .../effects/effect_15/func_E001E730.s | 16 +- .../effects/effect_15/fx_15_main.s | 20 +- .../effects/effect_16/func_E0020000.s | 6 +- .../effects/effect_16/func_E0020468.s | 2 +- .../effects/effect_16/func_E002058C.s | 2 +- .../effects/effect_16/func_E00205D0.s | 34 +- .../effects/effect_16/fx_16_main.s | 4 +- .../effects/effect_17/func_E002254C.s | 6 +- .../effects/effect_17/func_E0022960.s | 2 +- .../effects/effect_17/func_E0022998.s | 12 +- .../effects/effect_17/fx_17_main.s | 32 +- .../effects/effect_18/func_E0024188.s | 2 +- .../effects/effect_18/func_E00242E0.s | 2 +- .../effects/effect_18/func_E0024324.s | 2 +- .../effects/effect_18/func_E00243BC.s | 2 +- .../effects/effect_18/func_E0024454.s | 36 +- .../effects/effect_18/fx_18_main.s | 4 +- .../effects/effect_19/func_E002618C.s | 8 +- .../effects/effect_19/func_E00264B0.s | 2 +- .../effects/effect_19/func_E00264F4.s | 16 +- .../effects/effect_19/fx_19_main.s | 4 +- .../effects/effect_20/func_E0028248.s | 10 +- .../effects/effect_20/func_E00284E8.s | 2 +- .../effects/effect_20/func_E002852C.s | 20 +- .../effects/effect_20/fx_20_main.s | 4 +- .../effects/effect_21/func_E002A28C.s | 2 +- .../effects/effect_21/func_E002A380.s | 2 +- .../effects/effect_21/func_E002A3C4.s | 16 +- .../effects/effect_21/fx_21_main.s | 14 +- .../effects/effect_22/func_E002C23C.s | 2 +- .../effects/effect_22/func_E002C3D0.s | 2 +- .../effects/effect_22/func_E002C414.s | 48 +- .../effects/effect_22/fx_22_main.s | 10 +- .../effects/effect_23/func_E002E250.s | 2 +- .../effects/effect_23/func_E002E330.s | 2 +- .../effects/effect_23/func_E002E368.s | 12 +- .../effects/effect_23/fx_23_main.s | 14 +- .../effects/effect_24/func_E0030730.s | 4 +- .../effects/effect_24/func_E0030A24.s | 2 +- .../effects/effect_24/func_E0030A68.s | 12 +- .../effects/effect_24/fx_24_main.s | 20 +- .../effects/effect_25/func_E00321D8.s | 6 +- .../effects/effect_25/func_E0032420.s | 2 +- .../effects/effect_25/func_E003245C.s | 20 +- .../effects/effect_25/fx_25_main.s | 4 +- .../effects/effect_26/func_E0034110.s | 6 +- .../effects/effect_26/func_E00342C8.s | 2 +- .../effects/effect_26/func_E0034310.s | 22 +- .../effects/effect_26/fx_26_main.s | 4 +- .../effects/effect_27/func_E00360E4.s | 2 +- .../effects/effect_27/func_E00361D8.s | 2 +- .../effects/effect_27/func_E0036224.s | 16 +- .../effects/effect_27/fx_27_main.s | 4 +- .../effects/effect_28/func_E0038424.s | 10 +- .../effects/effect_28/func_E0038704.s | 2 +- .../effects/effect_28/func_E0038748.s | 16 +- .../effects/effect_28/fx_28_main.s | 14 +- .../effects/effect_29/func_E003A1DC.s | 2 +- .../effects/effect_29/func_E003A310.s | 2 +- .../effects/effect_29/func_E003A354.s | 12 +- .../effects/effect_29/fx_29_main.s | 10 +- .../effects/effect_30/func_E003C244.s | 2 +- .../effects/effect_30/func_E003C498.s | 24 +- .../effects/effect_30/fx_30_main.s | 8 +- .../effects/effect_31/func_E003E400.s | 2 +- .../effects/effect_31/func_E003E5F4.s | 2 +- .../effects/effect_31/func_E003E638.s | 10 +- .../effects/effect_31/fx_31_main.s | 10 +- .../effects/effect_32/func_E0040210.s | 4 +- .../effects/effect_32/func_E0040348.s | 12 +- .../effects/effect_32/fx_32_main.s | 4 +- .../effects/effect_33/func_E0042234.s | 2 +- .../effects/effect_33/func_E0042374.s | 2 +- .../effects/effect_33/func_E00423B8.s | 12 +- .../effects/effect_33/fx_33_main.s | 16 +- .../effects/effect_34/func_E0044424.s | 10 +- .../effects/effect_34/func_E00448E4.s | 2 +- .../effects/effect_34/func_E004491C.s | 12 +- .../effects/effect_34/fx_34_main.s | 20 +- .../effects/effect_35/func_E0046160.s | 2 +- .../effects/effect_35/func_E004627C.s | 2 +- .../effects/effect_35/func_E00462C0.s | 10 +- .../effects/effect_35/fx_35_main.s | 8 +- .../effects/effect_36/func_E0048130.s | 2 +- .../effects/effect_36/func_E00481D4.s | 2 +- .../effects/effect_36/func_E0048218.s | 8 +- .../effects/effect_36/fx_36_main.s | 6 +- .../effects/effect_37/func_E004A330.s | 6 +- .../effects/effect_37/func_E004A748.s | 2 +- .../effects/effect_37/func_E004A78C.s | 20 +- .../effects/effect_37/fx_37_main.s | 6 +- .../effects/effect_38/func_E004C20C.s | 2 +- .../effects/effect_38/func_E004C364.s | 2 +- .../effects/effect_38/func_E004C3A8.s | 12 +- .../effects/effect_38/fx_38_main.s | 14 +- .../effects/effect_39/func_E004E164.s | 2 +- .../effects/effect_39/func_E004E1D0.s | 2 +- .../effects/effect_39/func_E004E214.s | 8 +- .../effects/effect_39/fx_39_main.s | 6 +- .../effects/effect_40/func_E00501D8.s | 2 +- .../effects/effect_40/func_E00502C4.s | 2 +- .../effects/effect_40/func_E0050308.s | 12 +- .../effects/effect_40/fx_40_main.s | 10 +- .../effects/effect_41/func_E00520F0.s | 16 +- .../effects/effect_41/func_E005241C.s | 2 +- .../effects/effect_41/func_E0052460.s | 20 +- .../effects/effect_41/fx_41_main.s | 4 +- .../effects/effect_43/func_E005630C.s | 20 +- .../effects/effect_43/func_E0056B8C.s | 2 +- .../effects/effect_43/func_E0056BD0.s | 20 +- .../effects/effect_43/fx_43_main.s | 8 +- .../effects/effect_44/func_E00581B4.s | 12 +- .../effects/effect_44/func_E0058490.s | 2 +- .../effects/effect_44/func_E00584D4.s | 20 +- .../effects/effect_44/fx_44_main.s | 14 +- .../effects/effect_45/func_E005A1FC.s | 2 +- .../effects/effect_45/func_E005A3B0.s | 2 +- .../effects/effect_45/func_E005A3F4.s | 20 +- .../effects/effect_45/fx_45_main.s | 10 +- .../effects/effect_46/func_E005C180.s | 2 +- .../effects/effect_46/func_E005C2B4.s | 2 +- .../effects/effect_46/func_E005C2F8.s | 12 +- .../effects/effect_46/fx_46_main.s | 10 +- .../effects/effect_47/func_E005E1B8.s | 10 +- .../effects/effect_47/func_E005E334.s | 16 +- .../effects/effect_47/fx_47_main.s | 6 +- .../effects/effect_48/func_E00601E0.s | 8 +- .../effects/effect_48/func_E006040C.s | 2 +- .../effects/effect_48/func_E0060450.s | 20 +- .../effects/effect_48/fx_48_main.s | 6 +- .../effects/effect_49/func_E0062220.s | 6 +- .../effects/effect_49/func_E00624A8.s | 2 +- .../effects/effect_49/func_E00624EC.s | 20 +- .../effects/effect_49/fx_49_main.s | 10 +- .../effects/effect_50/func_E00641A4.s | 6 +- .../effects/effect_50/func_E00643DC.s | 2 +- .../effects/effect_50/func_E0064414.s | 20 +- .../effects/effect_50/fx_50_main.s | 6 +- .../effects/effect_51/func_E0066498.s | 4 +- .../effects/effect_51/func_E006672C.s | 2 +- .../effects/effect_51/func_E0066770.s | 16 +- .../effects/effect_51/fx_51_main.s | 4 +- .../effects/effect_52/func_E0068148.s | 2 +- .../effects/effect_52/func_E00681D8.s | 2 +- .../effects/effect_52/func_E0068234.s | 4 +- .../effects/effect_52/fx_52_main.s | 4 +- .../effects/effect_53/func_E006A580.s | 2 +- .../effects/effect_53/func_E006A814.s | 2 +- .../effects/effect_53/func_E006A94C.s | 36 +- .../effects/effect_53/fx_53_main.s | 4 +- .../effects/effect_54/func_E006C2A0.s | 8 +- .../effects/effect_54/func_E006C5A0.s | 2 +- .../effects/effect_54/func_E006C5E8.s | 20 +- .../effects/effect_54/fx_54_main.s | 12 +- .../effects/effect_55/func_E006E35C.s | 4 +- .../effects/effect_55/func_E006E6E4.s | 2 +- .../effects/effect_55/func_E006E764.s | 20 +- .../effects/effect_55/fx_55_main.s | 4 +- .../effects/effect_56/func_E00701F4.s | 26 +- .../effects/effect_56/func_E00706F0.s | 2 +- .../effects/effect_56/func_E0070740.s | 20 +- .../effects/effect_56/fx_56_main.s | 4 +- .../effects/effect_57/func_E0072150.s | 8 +- .../effects/effect_57/func_E007238C.s | 2 +- .../effects/effect_57/func_E00723D4.s | 8 +- .../effects/effect_57/fx_57_main.s | 4 +- .../effects/effect_58/func_E00741E8.s | 20 +- .../effects/effect_58/func_E0074598.s | 2 +- .../effects/effect_58/func_E00745E0.s | 20 +- .../effects/effect_58/fx_58_main.s | 4 +- .../effects/effect_59/func_E0076378.s | 2 +- .../effects/effect_59/func_E0076808.s | 2 +- .../effects/effect_59/func_E007685C.s | 32 +- .../effects/effect_59/fx_59_main.s | 4 +- .../effects/effect_6/func_E000C094.s | 17 - .../effects/effect_6/func_E000C0C8.s | 42 - .../effects/effect_6/func_E000C654.s | 72 - .../effects/effect_6/func_E000C754.s | 21 - .../{func_E000C798.s => fx_6_appendGfx.s} | 14 +- .../nonmatchings/effects/effect_6/fx_6_main.s | 346 ----- .../effects/effect_60/func_E007812C.s | 2 +- .../effects/effect_60/func_E0078210.s | 2 +- .../effects/effect_60/func_E007827C.s | 2 +- .../effects/effect_60/fx_60_main.s | 6 +- .../effects/effect_61/func_E007A50C.s | 2 +- .../effects/effect_61/func_E007A840.s | 2 +- .../effects/effect_61/func_E007A88C.s | 20 +- .../effects/effect_61/fx_61_main.s | 10 +- .../effects/effect_62/func_E007C130.s | 2 +- .../effects/effect_62/func_E007C1B0.s | 2 +- .../effects/effect_62/func_E007C1F4.s | 16 +- .../effects/effect_62/fx_62_main.s | 6 +- .../effects/effect_63/func_E007E204.s | 4 +- .../effects/effect_63/func_E007E508.s | 2 +- .../effects/effect_63/func_E007E54C.s | 32 +- .../effects/effect_63/fx_63_main.s | 4 +- .../effects/effect_64/func_E00801D0.s | 6 +- .../effects/effect_64/func_E0080448.s | 20 +- .../effects/effect_64/fx_64_main.s | 4 +- .../effects/effect_65/func_E00821B8.s | 8 +- .../effects/effect_65/func_E0082580.s | 10 +- .../effects/effect_65/func_E00826C4.s | 16 +- .../effects/effect_65/fx_65_main.s | 4 +- .../effects/effect_66/func_E0084660.s | 2 +- .../effects/effect_66/func_E00848E4.s | 2 +- .../effects/effect_66/func_E0084928.s | 14 +- .../effects/effect_66/fx_66_main.s | 4 +- .../effects/effect_67/func_E0086278.s | 2 +- .../effects/effect_67/func_E00863B4.s | 20 +- .../effects/effect_67/fx_67_main.s | 6 +- .../effects/effect_68/func_E0088000.s | 10 +- .../effects/effect_68/func_E00885A8.s | 2 +- .../effects/effect_68/func_E00887A8.s | 2 +- .../effects/effect_68/func_E00887E0.s | 12 +- .../effects/effect_68/fx_68_main.s | 14 +- .../effects/effect_69/func_E008A53C.s | 2 +- .../effects/effect_69/func_E008A6E4.s | 2 +- .../effects/effect_69/func_E008A728.s | 10 +- .../effects/effect_69/fx_69_main.s | 4 +- .../effects/effect_7/func_E000E174.s | 2 +- .../effects/effect_7/func_E000E244.s | 2 +- .../effects/effect_7/func_E000E288.s | 8 +- .../nonmatchings/effects/effect_7/fx_7_main.s | 6 +- .../effects/effect_70/func_E008C3FC.s | 2 +- .../effects/effect_70/func_E008C6B8.s | 2 +- .../effects/effect_70/func_E008C6FC.s | 20 +- .../effects/effect_70/fx_70_main.s | 4 +- .../effects/effect_71/func_E008E204.s | 10 +- .../effects/effect_71/func_E008E498.s | 2 +- .../effects/effect_71/func_E008E4E0.s | 16 +- .../effects/effect_71/fx_71_main.s | 4 +- .../effects/effect_72/func_E00901C8.s | 2 +- .../effects/effect_72/func_E0090444.s | 12 +- .../effects/effect_72/fx_72_main.s | 8 +- .../effects/effect_73/func_E00921B4.s | 2 +- .../effects/effect_73/func_E0092258.s | 2 +- .../effects/effect_73/func_E00922A0.s | 16 +- .../effects/effect_73/fx_73_main.s | 4 +- .../effects/effect_74/func_E0094198.s | 2 +- .../effects/effect_74/func_E00942C0.s | 2 +- .../effects/effect_74/func_E00942FC.s | 20 +- .../effects/effect_74/fx_74_main.s | 4 +- .../effects/effect_75/func_E00960F4.s | 2 +- .../effects/effect_75/func_E0096178.s | 2 +- .../effects/effect_75/func_E00961BC.s | 12 +- .../effects/effect_75/fx_75_main.s | 4 +- .../effects/effect_76/func_E0098170.s | 4 +- .../effects/effect_76/func_E009829C.s | 2 +- .../effects/effect_76/func_E00982EC.s | 4 +- .../effects/effect_76/fx_76_main.s | 8 +- .../effects/effect_77/func_E009A140.s | 4 +- .../effects/effect_77/func_E009A398.s | 2 +- .../effects/effect_77/func_E009A3E0.s | 16 +- .../effects/effect_77/fx_77_main.s | 6 +- .../effects/effect_78/func_E009C108.s | 2 +- .../effects/effect_78/func_E009C1DC.s | 2 +- .../effects/effect_78/func_E009C220.s | 24 +- .../effects/effect_78/fx_78_main.s | 4 +- .../effects/effect_79/func_E009E1E4.s | 10 +- .../effects/effect_79/func_E009E3DC.s | 2 +- .../effects/effect_79/func_E009E424.s | 64 +- .../effects/effect_79/fx_79_main.s | 10 +- .../effects/effect_8/func_E0010000.s | 20 +- .../effects/effect_8/func_E00103F4.s | 2 +- .../effects/effect_8/func_E00104B0.s | 2 +- .../effects/effect_8/func_E00104F4.s | 2 +- .../nonmatchings/effects/effect_8/fx_8_main.s | 12 +- .../effects/effect_80/fx_80_main.s | 4 +- .../effects/effect_81/func_E00A2120.s | 2 +- .../effects/effect_81/func_E00A21EC.s | 2 +- .../effects/effect_81/func_E00A223C.s | 2 +- .../effects/effect_81/fx_81_main.s | 4 +- .../effects/effect_82/func_E00A41AC.s | 8 +- .../effects/effect_82/func_E00A45DC.s | 4 +- .../effects/effect_82/func_E00A4650.s | 16 +- .../effects/effect_82/fx_82_main.s | 4 +- .../effects/effect_83/func_E00A6124.s | 2 +- .../effects/effect_83/func_E00A6358.s | 2 +- .../effects/effect_83/func_E00A63A4.s | 8 +- .../effects/effect_83/fx_83_main.s | 4 +- .../effects/effect_84/func_E00A8104.s | 8 +- .../effects/effect_84/func_E00A82D4.s | 2 +- .../effects/effect_84/func_E00A8320.s | 12 +- .../effects/effect_84/fx_84_main.s | 4 +- .../effects/effect_85/func_E00AA10C.s | 16 +- .../effects/effect_85/func_E00AA3C0.s | 2 +- .../effects/effect_85/func_E00AA404.s | 12 +- .../effects/effect_85/fx_85_main.s | 4 +- .../effects/effect_86/func_E00AC124.s | 2 +- .../effects/effect_86/func_E00AC2A4.s | 16 +- .../effects/effect_86/fx_86_main.s | 4 +- .../effects/effect_87/func_E00AE1B4.s | 20 +- .../effects/effect_87/func_E00AE4FC.s | 2 +- .../effects/effect_87/func_E00AE54C.s | 20 +- .../effects/effect_87/fx_87_main.s | 4 +- .../effects/effect_88/func_E00B0124.s | 2 +- .../effects/effect_88/func_E00B01F8.s | 2 +- .../effects/effect_88/func_E00B0234.s | 22 +- .../effects/effect_88/fx_88_main.s | 4 +- .../effects/effect_89/func_E00B21E4.s | 4 +- .../effects/effect_89/func_E00B2460.s | 2 +- .../effects/effect_89/func_E00B24B0.s | 14 +- .../effects/effect_89/fx_89_main.s | 4 +- .../effects/effect_9/func_E0012000.s | 20 +- .../effects/effect_9/func_E0012448.s | 2 +- .../effects/effect_9/func_E0012504.s | 2 +- .../effects/effect_9/func_E0012548.s | 2 +- .../nonmatchings/effects/effect_9/fx_9_main.s | 14 +- .../effects/effect_90/func_E00B413C.s | 22 +- .../effects/effect_90/func_E00B452C.s | 2 +- .../effects/effect_90/func_E00B457C.s | 18 +- .../effects/effect_90/fx_90_main.s | 4 +- .../effects/effect_91/func_E00B6180.s | 2 +- .../effects/effect_91/func_E00B629C.s | 2 +- .../effects/effect_91/func_E00B62E0.s | 8 +- .../effects/effect_91/fx_91_main.s | 6 +- .../effects/effect_92/func_E00B8134.s | 2 +- .../effects/effect_92/func_E00B81B8.s | 2 +- .../effects/effect_92/func_E00B8208.s | 28 +- .../effects/effect_92/fx_92_main.s | 4 +- .../effects/effect_93/func_E00BA174.s | 4 +- .../effects/effect_93/func_E00BA5DC.s | 2 +- .../effects/effect_93/func_E00BA620.s | 4 +- .../effects/effect_93/fx_93_main.s | 4 +- .../effects/effect_94/func_E00BC1D8.s | 2 +- .../effects/effect_94/func_E00BC238.s | 2 +- .../effects/effect_94/func_E00BC2E8.s | 2 +- .../effects/effect_94/func_E00BC374.s | 18 +- .../effects/effect_94/fx_94_main.s | 8 +- .../effects/effect_95/func_E00BE3A4.s | 2 +- .../effects/effect_95/func_E00BE578.s | 2 +- .../effects/effect_95/func_E00BE5BC.s | 16 +- .../effects/effect_95/fx_95_main.s | 28 +- .../effects/effect_96/func_E00C0160.s | 10 +- .../effects/effect_96/func_E00C0710.s | 2 +- .../effects/effect_96/func_E00C0760.s | 20 +- .../effects/effect_96/fx_96_main.s | 4 +- .../effects/effect_97/func_E00C212C.s | 2 +- .../effects/effect_97/func_E00C21CC.s | 2 +- .../effects/effect_97/func_E00C221C.s | 8 +- .../effects/effect_97/fx_97_main.s | 4 +- .../effects/effect_98/func_E00C4178.s | 2 +- .../effects/effect_98/func_E00C42C4.s | 2 +- .../effects/effect_98/func_E00C4308.s | 20 +- .../effects/effect_98/fx_98_main.s | 4 +- .../effects/effect_99/func_E00C639C.s | 6 +- .../effects/effect_99/func_E00C6768.s | 2 +- .../effects/effect_99/func_E00C67B0.s | 22 +- .../effects/effect_99/fx_99_main.s | 18 +- ver/us/effect_shims.yaml | 80 +- ver/us/splat.yaml | 64 +- ver/us/symbol_addrs.txt | 98 +- 526 files changed, 2728 insertions(+), 4606 deletions(-) create mode 100644 include/effects_internal.h delete mode 100644 tools/symz.txt delete mode 100644 ver/us/asm/data/effects/328050.data.s delete mode 100644 ver/us/asm/data/effects/328D20.data.s delete mode 100644 ver/us/asm/nonmatchings/effects/effect_1/func_E00021BC.s delete mode 100644 ver/us/asm/nonmatchings/effects/effect_1/func_E00022BC.s delete mode 100644 ver/us/asm/nonmatchings/effects/effect_1/func_E0002300.s delete mode 100644 ver/us/asm/nonmatchings/effects/effect_1/fx_1_main.s delete mode 100644 ver/us/asm/nonmatchings/effects/effect_6/func_E000C094.s delete mode 100644 ver/us/asm/nonmatchings/effects/effect_6/func_E000C0C8.s delete mode 100644 ver/us/asm/nonmatchings/effects/effect_6/func_E000C654.s delete mode 100644 ver/us/asm/nonmatchings/effects/effect_6/func_E000C754.s rename ver/us/asm/nonmatchings/effects/effect_6/{func_E000C798.s => fx_6_appendGfx.s} (97%) delete mode 100644 ver/us/asm/nonmatchings/effects/effect_6/fx_6_main.s diff --git a/include/common_structs.h b/include/common_structs.h index 72e9308c7f..9aa8244389 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -850,19 +850,6 @@ typedef struct AnimatedMesh { typedef AnimatedMesh* AnimatedMeshList[MAX_ANIMATED_MESHES]; -typedef struct EffectInstanceData { - /* 0x00 */ struct EffectInstanceDataThing* unk_00; - /* 0x04 */ Vec3f pos; - /* 0x10 */ Vec3f rotation; - /* 0x1C */ Vec3f scale; - /* 0x28 */ f32 unk_28; - /* 0x2C */ s32 unk_2C; - /* 0x30 */ f32 unk_30; - /* 0x34 */ char unk_34[0x30]; - /* 0x64 */ f32 unk_64; - /* 0x68 */ char unk_68[0x18]; -} EffectInstanceData; // size = 0x80 - typedef struct PrintHandle { /* 0x000 */ char unk_00[16]; /* 0x010 */ s8* printbuf; @@ -902,78 +889,6 @@ typedef struct StaticItem { /* 0x1D */ char unk_1D[3]; } StaticItem; // size = 0x20 -typedef struct EffectInstance { - /* 0x00 */ s32 flags; - /* 0x04 */ s32 effectIndex; - /* 0x08 */ s32 totalMatricies; - /* 0x0C */ struct EffectInstanceData* data; - /* 0x10 */ struct EffectGraphics* effect; -} EffectInstance; - -typedef struct EffectBlueprint { - /* 0x00 */ s32 unk_00; - /* 0x04 */ s32 effectIndex; - /* 0x08 */ void (*init)(EffectInstance* effectInst); - /* 0x0C */ void (*update)(EffectInstance* effectInst); - /* 0x10 */ void (*renderWorld)(EffectInstance* effectInst); - /* 0x14 */ void (*unk_14)(EffectInstance* effectInst); -} EffectBlueprint; // size = 0x18 - -typedef struct { - char unk_00[0x38]; - f32 unk_38[4]; -} EffectUnkStruct1; -// TODO figure out what this actually is -// playFX_4E invokes gEffectTable[78]'s entryPoint function -// playFX_6F invokes gEffectTable[111]'s entryPoint function -// playFX_83 invokes gEffectTable[131]'s entryPoint function -// These functions are currently typed to return void -// Assume they return an Effect*, and this struct is accessed at unk_0C, -// but this struct differs from EffectInstanceData -// Search for "struct N(temp)" for examples -typedef struct EffectInstanceDataThing { - char unk_00[0x4]; - f32 unk_04; - f32 unk_08; - f32 unk_0C; - f32 unk_10; - char unk_14[0x4]; - s32 unk_18; - s32 unk_1C; - s32 unk_20; - X32 unk_24; - s32 unk_28; - s32 unk_2C; - s32 unk_30; - s32 unk_34; - s32 unk_38; - char unk_3C[0xC]; - EffectUnkStruct1* unk_48; - char unk_4C[0x24]; - s32 unk_70; - s32 unk_74; -} EffectInstanceDataThing; - -typedef struct EffectGraphics { - /* 0x00 */ s32 flags; - /* 0x04 */ s32 effectIndex; - /* 0x08 */ s32 instanceCounter; - /* 0x0C */ s32 freeDelay; - /* 0x10 */ void (*update)(EffectInstance* effectInst); - /* 0x14 */ void (*renderWorld)(EffectInstance* effectInst); - /* 0x18 */ void (*renderUI)(EffectInstance* effectInst); - /* 0x1C */ s32* data; -} EffectGraphics; // size = 0x20 - -typedef struct EffectTableEntry { - /* 0x00 */ void (*entryPoint)(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 x, f32 y, f32 z); - /* 0x04 */ void* dmaStart; - /* 0x08 */ void* dmaEnd; - /* 0x0C */ void* dmaDest; - /* 0x10 */ void* graphicsDmaStart; - /* 0x14 */ void* graphicsDmaEnd; -} EffectTableEntry; // size = 0x18 - typedef struct ItemEntity { /* 0x00 */ s32 flags; /* 0x04 */ s16 boundVar; /* see make_item_entity */ @@ -1756,7 +1671,7 @@ typedef struct Actor { /* 0x223 */ s8 chillOutAmount; /* attack reduction */ /* 0x224 */ s8 chillOutTurns; /* 0x225 */ char unk_225[3]; - /* 0x228 */ EffectInstance* unk_228; + /* 0x228 */ struct EffectInstance* unk_228; /* 0x22C */ struct SelectableTarget targetData[24]; /* 0x40C */ s8 targetListLength; /* 0x40D */ s8 targetIndexList[24]; /* into targetData */ @@ -2318,62 +2233,6 @@ typedef struct unkPartnerStruct { /* 0x018 */ f32 unk_18; } unkPartnerStruct; // size = 0x1C -typedef struct EffectStruct { - char unk_00[0x4]; - f32 unk_04; - f32 unk_08; - f32 unk_0C; - f32 unk_10; - char unk_14[0x4]; - s32 unk_18; - s32 unk_1C; - s32 unk_20; - X32 unk_24; - s32 unk_28; - s32 unk_2C; - s32 unk_30; - u8 unk_34; - s32 unk_38; - char unk_3C[0xC]; - EffectUnkStruct1* unk_48; - char unk_4C[0x24]; - s32 unk_70; - s32 unk_74; -} EffectStruct; - -typedef struct StarSpiritEffectUnkStruct { - char unk_00[0xC]; - EffectStruct* unk_0C; -} StarSpiritEffectUnkStruct; - -typedef struct StarSpiritEffect { - /* 0x00 */ f32 unk_00; - /* 0x04 */ f32 unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ f32 unk_20; - /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ f32 unk_30; - /* 0x34 */ f32 unk_34; - /* 0x38 */ s32 unk_38; - /* 0x3C */ s32 unk_3C; - /* 0x40 */ Shadow* unk_40; - /* 0x44 */ s16 unk_44; - /* 0x46 */ s16 unk_46; - /* 0x48 */ s16 unk_48; - /* 0x4A */ s16 unk_4A; - /* 0x4C */ s16 unk_4C; - /* 0x4E */ s16 unk_4E; - /* 0x50 */ struct StarSpiritEffectUnkStruct* unk_50; - /* 0x54 */ struct StarSpiritEffectUnkStruct* unk_54; -} StarSpiritEffect; // size = 0x58 - typedef struct struct8015A578 { /* 0x00 */ u8 unk_00; /* 0x01 */ u8 unk_01; diff --git a/include/effects.h b/include/effects.h index a86e4a4dee..c7e51a6ece 100644 --- a/include/effects.h +++ b/include/effects.h @@ -4,7 +4,151 @@ #include "types.h" #include "common_structs.h" -extern EffectTableEntry gEffectTable[135]; +typedef struct { + char unk_00[0x38]; + f32 unk_38[4]; +} EffectUnkStruct1; + +typedef struct EffectStruct { + char unk_00[0x4]; + f32 unk_04; + f32 unk_08; + f32 unk_0C; + f32 unk_10; + char unk_14[0x4]; + s32 unk_18; + s32 unk_1C; + s32 unk_20; + X32 unk_24; + s32 unk_28; + s32 unk_2C; + s32 unk_30; + u8 unk_34; + s32 unk_38; + char unk_3C[0xC]; + EffectUnkStruct1* unk_48; + char unk_4C[0x24]; + s32 unk_70; + s32 unk_74; +} EffectStruct; + +typedef struct StarSpiritEffectUnkStruct { + char unk_00[0xC]; + EffectStruct* unk_0C; +} StarSpiritEffectUnkStruct; + +typedef struct StarSpiritEffect { + /* 0x00 */ f32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ f32 unk_2C; + /* 0x30 */ f32 unk_30; + /* 0x34 */ f32 unk_34; + /* 0x38 */ s32 unk_38; + /* 0x3C */ s32 unk_3C; + /* 0x40 */ Shadow* unk_40; + /* 0x44 */ s16 unk_44; + /* 0x46 */ s16 unk_46; + /* 0x48 */ s16 unk_48; + /* 0x4A */ s16 unk_4A; + /* 0x4C */ s16 unk_4C; + /* 0x4E */ s16 unk_4E; + /* 0x50 */ struct StarSpiritEffectUnkStruct* unk_50; + /* 0x54 */ struct StarSpiritEffectUnkStruct* unk_54; +} StarSpiritEffect; // size = 0x58 + +// TODO figure out what this actually is +// playFX_4E invokes gEffectTable[78]'s entryPoint function +// playFX_6F invokes gEffectTable[111]'s entryPoint function +// playFX_83 invokes gEffectTable[131]'s entryPoint function +// These functions are currently typed to return void +// Assume they return an Effect*, and this struct is accessed at unk_0C, +// but this struct differs from EffectInstanceData +// Search for "struct N(temp)" for examples +typedef struct EffectInstanceDataThing { + char unk_00[0x4]; + f32 unk_04; + f32 unk_08; + f32 unk_0C; + f32 unk_10; + char unk_14[0x4]; + s32 unk_18; + s32 unk_1C; + s32 unk_20; + X32 unk_24; + s32 unk_28; + s32 unk_2C; + s32 unk_30; + s32 unk_34; + s32 unk_38; + char unk_3C[0xC]; + EffectUnkStruct1* unk_48; + char unk_4C[0x24]; + s32 unk_70; + s32 unk_74; +} EffectInstanceDataThing; + +typedef struct EffectInstanceData { + /* 0x00 */ EffectInstanceDataThing* unk_00; + /* 0x04 */ Vec3f pos; + /* 0x10 */ Vec3f rotation; + /* 0x1C */ Vec3f scale; + /* 0x28 */ f32 unk_28; + /* 0x2C */ s32 unk_2C; + /* 0x30 */ f32 unk_30; + /* 0x34 */ char unk_34[0x30]; + /* 0x64 */ f32 unk_64; + /* 0x68 */ char unk_68[0x18]; +} EffectInstanceData; // size = 0x80 + +typedef struct EffectInstance { + /* 0x00 */ s32 flags; + /* 0x04 */ s32 effectIndex; + /* 0x08 */ s32 numParts; + /* 0x0C */ EffectInstanceData* data; + /* 0x10 */ struct EffectGraphics* effect; +} EffectInstance; + +typedef struct EffectBlueprint { + /* 0x00 */ s32 unk_00; + /* 0x04 */ s32 effectIndex; + /* 0x08 */ void (*init)(EffectInstance* effectInst); + /* 0x0C */ void (*update)(EffectInstance* effectInst); + /* 0x10 */ void (*renderWorld)(EffectInstance* effectInst); + /* 0x14 */ void (*unk_14)(EffectInstance* effectInst); +} EffectBlueprint; // size = 0x18 + +typedef struct EffectGraphics { + /* 0x00 */ s32 flags; + /* 0x04 */ s32 effectIndex; + /* 0x08 */ s32 instanceCounter; + /* 0x0C */ s32 freeDelay; + /* 0x10 */ void (*update)(EffectInstance* effectInst); + /* 0x14 */ void (*renderWorld)(EffectInstance* effectInst); + /* 0x18 */ void (*renderUI)(EffectInstance* effectInst); + /* 0x1C */ s32* data; +} EffectGraphics; // size = 0x20 + +typedef struct EffectTableEntry { + /* 0x00 */ void (*entryPoint)(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 x, f32 y, f32 z); + /* 0x04 */ void* dmaStart; + /* 0x08 */ void* dmaEnd; + /* 0x0C */ void* dmaDest; + /* 0x10 */ void* graphicsDmaStart; + /* 0x14 */ void* graphicsDmaEnd; +} EffectTableEntry; // size = 0x18 + +EffectInstance* create_effect_instance(EffectBlueprint* effectBp); +void remove_effect(EffectInstance*); +s32 load_effect(s32 effectIndex); void playFX_00(s32, f32, f32, f32, s32); void playFX_01(f32, f32, f32); diff --git a/include/effects_internal.h b/include/effects_internal.h new file mode 100644 index 0000000000..3f90f19f89 --- /dev/null +++ b/include/effects_internal.h @@ -0,0 +1,22 @@ +#ifndef _EFFECTS_INTERNAL_H_ +#define _EFFECTS_INTERNAL_H_ + +#include "effects.h" + +u32 func_E0200000(s32); + +EffectInstance* shim_create_effect_instance(EffectBlueprint* effectBp); +void shim_remove_effect(EffectInstance*); +void* shim_general_heap_malloc(s32 size); +RenderTask* shim_queue_render_task(RenderTask* task); +f32 shim_sin_deg(f32 x); +f32 shim_cos_deg(f32 x); +f32 shim_clamp_angle(f32 theta); +void shim_guMtxF2L(float mf[4][4], Mtx *m); +void shim_guMtxCatF(float m[4][4], float n[4][4], float r[4][4]); +void shim_guRotateF(float mf[4][4], float a, float x, float y, float z); +void shim_guTranslateF(float mf[4][4], float x, float y, float z); +void shim_guPositionF(float mf[4][4], float r, float p, float h, float s, float x, float y, float z); +void shim_mem_clear(s8* data, s32 numBytes); + +#endif diff --git a/include/enums.h b/include/enums.h index f12ef2fe0c..6b3f808884 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1628,6 +1628,7 @@ enum PlayerAnimFlags { enum RenderMode { RENDER_MODE_SURF_SOLID_AA_ZB_LAYER0 = 0x00, RENDER_MODE_SURFACE_OPA = 0x01, + RENDER_MODE_2 = 0x02, RENDER_MODE_SURFACE_OPA_NO_AA = 0x03, RENDER_MODE_SURFACE_OPA_NO_ZB = 0x04, RENDER_MODE_DECAL_OPA = 0x05, @@ -1646,7 +1647,9 @@ enum RenderMode { RENDER_MODE_SHADOW = 0x20, RENDER_MODE_SURFACE_XLU_LAYER3 = 0x22, RENDER_MODE_INTERSECTING_XLU = 0x26, + RENDER_MODE_28 = 0x28, RENDER_MODE_SURF_XLU_AA_ZB_ZUPD = 0x29, + RENDER_MODE_2D = 0x2D, RENDER_MODE_CLOUD = 0x2E, RENDER_MODE_CLOUD_NO_ZB = 0x2F, }; diff --git a/include/functions.h b/include/functions.h index 6324f2fd2d..a417e3f281 100644 --- a/include/functions.h +++ b/include/functions.h @@ -468,7 +468,7 @@ void base_UnkNpcAIFunc1(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryTh void DeadUnkNpcAIFunc1(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); s32* spr_get_npc_palettes(u16 arg0); -void spr_draw_player_sprite(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4); +void spr_draw_player_sprite(s32 arg0, s32 arg1, s32 arg2, s32 arg3, Matrix4f arg4); void spr_draw_npc_sprite(s32 arg0, s32 arg1, s32 arg2, s32 arg3, Matrix4f* arg4); s32 spr_update_sprite(s32 arg0, s32 arg1, f32 arg2); void sin_cos_rad(f32 rad, f32* outSinTheta, f32* outCosTheta); @@ -476,9 +476,6 @@ void sin_cos_rad(f32 rad, f32* outSinTheta, f32* outCosTheta); void* load_asset_by_name(const char* assetName, u32* decompressedSize); -EffectInstance* func_8005A2BC(EffectBlueprint* effectBp); -void remove_effect(EffectInstance* arg0); -s32 load_effect(s32 effectIndex); void mdl_draw_hidden_panel_surface(Gfx** arg0, u16 treeIndex); s32 func_8011CFBC(void); s32 set_screen_overlay_center_worldpos(void); diff --git a/src/1AF120.c b/src/1AF120.c index 0a8a62fb7a..e67d032811 100644 --- a/src/1AF120.c +++ b/src/1AF120.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" ApiStatus GetDamageIntensity(Evt* script, s32 isInitialCall) { if (gBattleStatus.lastAttackDamage < 4) { @@ -13,7 +14,6 @@ ApiStatus GetDamageIntensity(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// TODO: Rename to AddEffectOffset ApiStatus AddEffectOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = evt_get_variable(script, *args++); diff --git a/src/325AD0.c b/src/325AD0.c index 24b651d0f5..5fcd3465e4 100644 --- a/src/325AD0.c +++ b/src/325AD0.c @@ -1,14 +1,15 @@ #include "common.h" +#include "effects.h" u32 D_E0200690 = 0x1E6D3457; void* effectFuncs[] = { - guRotateF, guTranslateF, guTranslate, guScaleF, guMtxCatF, guMtxF2L, guMtxL2F, queue_render_task, func_8005A2BC, - remove_effect, general_heap_malloc, mem_clear, NULL, rand_int, clamp_angle, sin_deg, cos_deg, atan2, - npc_raycast_down_sides, load_effect, sqrtf, mdl_draw_hidden_panel_surface, func_8011CFBC, guPerspectiveF, - guMtxIdentF, transform_point, guLookAtHiliteF, set_screen_overlay_params_back, set_screen_overlay_center, - set_screen_overlay_center_worldpos, mdl_get_next_texture_address, guPositionF, guOrthoF, guFrustumF, func_80138D88, - draw_box, draw_msg, get_msg_width, get_background_color_blend, sfx_play_sound_at_position + guRotateF, guTranslateF, guTranslate, guScaleF, guMtxCatF, guMtxF2L, guMtxL2F, queue_render_task, + create_effect_instance, remove_effect, general_heap_malloc, mem_clear, NULL, rand_int, clamp_angle, sin_deg, + cos_deg, atan2, npc_raycast_down_sides, load_effect, sqrtf, mdl_draw_hidden_panel_surface, func_8011CFBC, + guPerspectiveF, guMtxIdentF, transform_point, guLookAtHiliteF, set_screen_overlay_params_back, + set_screen_overlay_center, set_screen_overlay_center_worldpos, mdl_get_next_texture_address, guPositionF, guOrthoF, + guFrustumF, func_80138D88, draw_box, draw_msg, get_msg_width, get_background_color_blend, sfx_play_sound_at_position }; s32 D_E0200734[128] = { diff --git a/src/effects.c b/src/effects.c index 9e83b24361..e55c13e488 100644 --- a/src/effects.c +++ b/src/effects.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" #include "ld_addrs.h" typedef s32 TlbEntry[0x1000 / 4]; @@ -455,7 +456,7 @@ void render_effects_UI(void) { } } -EffectInstance* func_8005A2BC(EffectBlueprint* effectBp) { +EffectInstance* create_effect_instance(EffectBlueprint* effectBp) { EffectInstance* newEffectInst; EffectGraphics* curEffect; s32 i; diff --git a/src/effects/effect_1.c b/src/effects/effect_1.c index 1ff6a68b36..a9ac180ab0 100644 --- a/src/effects/effect_1.c +++ b/src/effects/effect_1.c @@ -1,16 +1,185 @@ #include "common.h" +#include "effects_internal.h" -INCLUDE_ASM(s32, "effects/effect_1", fx_1_main); +typedef struct Effect1 { + /* 0x00 */ s16 unk_00; + /* 0x02 */ s16 unk_02; + /* 0x04 */ s16 unk_04; + /* 0x06 */ s16 unk_06; + /* 0x08 */ s32 unk_08; + /* 0x0C */ f32 x; + /* 0x10 */ f32 y; + /* 0x14 */ f32 z; + /* 0x18 */ f32 partX; + /* 0x1C */ f32 partY; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ char unk_28[0x4]; +} Effect1; // size = 0x2C -void func_E00021B4(void) { +void fx_1_init(EffectInstance* effect); +void fx_1_update(EffectInstance* effect); +void fx_1_render(EffectInstance* effect); +void fx_1_appendGfx(EffectInstance* effect); + +static f32 D_E0002760[10] = { 10.0f, 40.0f, 80.0f, 170.0f, 140.0f, 100.0f, 25.0f, 155.0f, 60.0f, 120.0f }; +static f32 D_E0002788[10] = { 2.2f, 2.7f, 3.0f, 2.2f, 2.7f, 3.0f, 1.9f, 1.9f, 1.5f, 1.5f }; +static f32 sPartScales[10] = { 1.4f, 1.3f, 1.2f, 1.3f, 1.4f, 1.3f, 1.6f, 1.6f, 1.6f, 1.6f }; +static f32 sPartYaws[10] = { 0.0f, 234.0f, 468.0f, 702.0f, 936.0f, 1260.0f, 1404.0f, 1638.0f, 1902.0f, 1976.0f }; + +static s32 sDlists[7] = { 0x09000FA0, 0x09001060, 0x09001120, 0x090011E0, 0x090012A0, 0x09001360, 0x09001420 }; + +void fx_1_main(f32 x, f32 y, f32 z) { + EffectBlueprint bp; + EffectInstance* effect; + Effect1* effectData; + f32 theta; + f32 temp_f20; + f32 cosTheta; + f32 sinTheta; + s32 numParts = 10; + s32 i; + + bp.unk_00 = 0; + bp.init = fx_1_init; + bp.update = fx_1_update; + bp.renderWorld = fx_1_render; + bp.unk_14 = NULL; + bp.effectIndex = 1; + + effect = shim_create_effect_instance(&bp); + effect->numParts = numParts; + + effectData = shim_general_heap_malloc(effect->numParts * sizeof(Effect1)); + effect->data = effectData; + + ASSERT(effectData != NULL); + + for (i = 0; i < effect->numParts; i++, effectData++) { + effectData->unk_00 = 0; + effectData->unk_02 = effectData->unk_04 = func_E0200000(6) + 0x10; + effectData->unk_06 = 4; + effectData->unk_08 = 0; + effectData->x = x; + effectData->y = y; + effectData->z = z; + effectData->partX = 0; + effectData->partY = 0; + + theta = D_E0002760[i] + 90.0f; + temp_f20 = 2.0 * D_E0002788[i]; + sinTheta = shim_sin_deg(theta); + cosTheta = shim_cos_deg(theta); + + effectData->unk_20 = temp_f20 * sinTheta; + effectData->unk_24 = -temp_f20 * cosTheta; + } } -INCLUDE_ASM(s32, "effects/effect_1", func_E00021BC); - -INCLUDE_ASM(s32, "effects/effect_1", func_E00022BC); - -INCLUDE_ASM(s32, "effects/effect_1", func_E0002300); - -void func_E0002738(void) { - func_E02004A0(); +void fx_1_init(EffectInstance* effect) { +} + +void fx_1_update(EffectInstance* effect) { + Effect1* effectData = effect->data; + s32 cond = FALSE; + s32 i; + + for (i = 0; i < effect->numParts; i++, effectData++) { + if (effectData->unk_02 >= 0) { + effectData->unk_08--; + + if (effectData->unk_08 < 0) { + effectData->partX += effectData->unk_20; + effectData->partY += effectData->unk_24; + effectData->unk_00++; + effectData->unk_02--; + cond = TRUE; + + if (effectData->unk_02 >= 0) { + effectData->unk_06--; + if (effectData->unk_06 < 0) { + effectData->unk_20 /= 1.25; + effectData->unk_24 /= 1.25; + } + } + } + } + } + + if (!cond) { + shim_remove_effect(effect); + } +} + +void fx_1_render(EffectInstance* effect) { + RenderTask renderTask; + RenderTask* retTask; + + renderTask.appendGfx = fx_1_appendGfx; + renderTask.appendGfxArg = effect; + renderTask.distance = 0; + renderTask.renderMode = RENDER_MODE_2D; + + retTask = shim_queue_render_task(&renderTask); + retTask->renderMode |= RENDER_MODE_2; +} + +void fx_1_appendGfx(EffectInstance* effect) { + Effect1* effectData = effect->data; + Matrix4f mtx; + s32 i; + + gDPPipeSync(gMasterGfxPos++); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->effect->data)); + + shim_guPositionF(&mtx, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, effectData->x, effectData->y, + effectData->z); + shim_guMtxF2L(&mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, + &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + + for (i = 0; i < effect->numParts; i++, effectData++) { + if (effectData->unk_02 >= 0 && effectData->unk_08 < 0) { + s32 primAlpha = effectData->unk_02; + f32 temp_f12; + s32 envAlpha; + s32 dlist; + + if (primAlpha > 16) { + primAlpha = 16; + } + + shim_guPositionF(&mtx, 0.0f, 0.0f, sPartYaws[i], sPartScales[i], effectData->partX, + effectData->partY, 0.0f); + shim_guMtxF2L(&mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, + &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + + temp_f12 = effectData->unk_00 - 1; + + if (effectData->unk_04 <= temp_f12) { + envAlpha = 255; + dlist = sDlists[ARRAY_COUNT(sDlists) - 1]; + } else { + f32 temp = shim_sin_deg((((temp_f12 * 7.0f) / effectData->unk_04) * 90.0f) / 7.0f) * 7.0f; + + envAlpha = (s32)(temp * 255.0f) % 256; + dlist = sDlists[(s32)temp]; + } + + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, (u32)(primAlpha * 105) / 8); + gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, envAlpha); + gSPDisplayList(gMasterGfxPos++, dlist); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + } + } + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMasterGfxPos++); +} + +void func_E0002738(EffectInstance* effect) { + shim_remove_effect(effect); } diff --git a/src/effects/effect_6.c b/src/effects/effect_6.c index c1e53aa015..ca06606ac4 100644 --- a/src/effects/effect_6.c +++ b/src/effects/effect_6.c @@ -1,18 +1,265 @@ #include "common.h" +#include "effects_internal.h" +typedef struct Effect6 { + /* 0x00 */ u16 type; + /* 0x02 */ char unk_02[0x2]; + /* 0x04 */ f32 x; + /* 0x08 */ f32 y; + /* 0x0C */ f32 z; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ f32 unk_2C; + /* 0x30 */ f32 unk_30; + /* 0x34 */ f32 unk_34; + /* 0x38 */ s32 unk_38; + /* 0x3C */ s32 unk_3C; + /* 0x40 */ s32 unk_40; +} Effect6; // size = 0x44 + +void fx_6_init(EffectInstance* effect); +void fx_6_update(EffectInstance* effect); +void fx_6_render(EffectInstance* effect); +void fx_6_appendGfx(EffectInstance* effect); + +static s32 D_E000CC10[] = { 0x09002B20, 0x09002B40, 0x09002B60, 0x09002B60, 0x09002B60 }; + +static s32 D_E000CC24[] = { 0x09002780, 0x09002868, 0x09002950, 0x09002A38, 0x09002A38 }; + +static s8 D_E000CC38[] = { 0x00, 0x01, 0x02, 0x1A, 0x03, 0x1B, 0x04, 0x1C, 0x05, 0x15, 0x35, 0x46, 0x46, 0x46, 0xFF, + 0x00 }; + +static s8 D_E000CC48[] = { 0x00, 0x01, 0x02, 0x1A, 0x03, 0x1B, 0x04, 0x1C, 0x05, 0x1D, 0x06, 0x16, 0x26, 0x47, 0x57, + 0x67, 0xFF, 0x00, 0x00, 0x00 }; + +static s8 D_E000CC5C[] = { 0x00, 0x08, 0x10, 0x18, 0x20, 0x28, 0x30, 0x38, 0x01, 0x09, 0x11, 0x19, 0x21, 0x29, 0x31, + 0x39, 0x02, 0x02, 0x0A, 0x0A, 0x12, 0x12, 0x1A, 0x1A, 0x22, 0x22, 0x2A, 0x2A, 0x32, 0x32, 0x3A, + 0x3A, 0x03, 0x03, 0x0B, 0x0B, 0x13, 0x13, 0x1B, 0x1B, 0x23, 0x23, 0x2B, 0x2B, 0x33, 0x33, 0x3B, + 0x3B, 0x04, 0x04, 0x0C, 0x0C, 0x14, 0x14, 0x1C, 0x1C, 0x24, 0x24, 0x2C, 0x2C, 0x34, 0x34, 0x3C, + 0x3C, 0x05, 0x05, 0x0D, 0x0D, 0x15, 0x15, 0x1D, 0x1D, 0x25, 0x25, 0x2D, 0x2D, 0x35, 0x35, 0x3D, + 0x3D, 0x06, 0x06, 0x06, 0x0E, 0x0E, 0x0E, 0x16, 0x16, 0x16, 0x1E, 0x1E, 0x1E, 0x26, 0x26, 0x26, + 0x2E, 0x2E, 0x2E, 0x36, 0x36, 0x36, 0x3E, 0x3E, 0x3E, 0x47, 0x47, 0x47, 0x4F, 0x4F, 0x4F, 0x57, + 0x57, 0x57, 0x5F, 0x5F, 0x5F, 0x67, 0x67, 0x67, 0x6F, 0x6F, 0x6F, 0x77, 0x77, 0x77, 0x7F, 0x7F, + 0x7F, 0xFF, 0x00, 0x00, 0x00 }; + +static s8 D_E000CCE0[] = { 0x00, 0x10, 0x20, 0x30, 0x01, 0x11, 0x21, 0x31, 0x02, 0x0A, 0x12, 0x1A, 0x22, 0x2A, 0x32, + 0x3A, 0x03, 0x0B, 0x13, 0x1B, 0x23, 0x2B, 0x33, 0x3B, 0x04, 0x0C, 0x14, 0x1C, 0x24, 0x2C, + 0x34, 0x3C, 0x05, 0x0D, 0x15, 0x1D, 0x25, 0x2D, 0x35, 0x3D, 0x06, 0x06, 0x0E, 0x16, 0x16, + 0x1E, 0x26, 0x26, 0x2E, 0x36, 0x36, 0x3E, 0x47, 0x47, 0x4F, 0x57, 0x57, 0x5F, 0x67, 0x67, + 0x6F, 0x77, 0x77, 0x7F, 0xFF, 0x00, 0x00, 0x00 }; + +static s8* D_E000CD24[4] = { &D_E000CC38, &D_E000CC48, &D_E000CC5C, &D_E000CCE0 }; + +void func_E000C000(Effect6* part); INCLUDE_ASM(s32, "effects/effect_6", func_E000C000); -INCLUDE_ASM(s32, "effects/effect_6", func_E000C094); - -INCLUDE_ASM(s32, "effects/effect_6", func_E000C0C8); - -INCLUDE_ASM(s32, "effects/effect_6", fx_6_main); - -void func_E000C64C(void) { +void func_E000C094(Effect6* part) { + part->y += part->unk_20; + part->unk_20 += part->unk_24; + part->unk_24 *= part->unk_28; } -INCLUDE_ASM(s32, "effects/effect_6", func_E000C654); +void func_E000C0C8(Effect6* part) { + part->x += part->unk_10 * part->unk_30; + part->y += part->unk_20; + part->z += part->unk_10 * part->unk_34; + part->unk_20 += part->unk_24; + part->unk_10 *= part->unk_14; + part->unk_24 *= part->unk_28; + part->unk_20 *= part->unk_2C; +} -INCLUDE_ASM(s32, "effects/effect_6", func_E000C754); +void fx_6_main(s32 type, f32 x, f32 y, f32 z, f32 arg4) { + EffectBlueprint bp; + EffectBlueprint* bpPtr = &bp; + EffectInstance* effect; + Effect6* effectPart; + f32 theta; + f32 temp_f20_2; + s32 numParts; + s32 i; -INCLUDE_ASM(s32, "effects/effect_6", func_E000C798); + switch (type) { + case 2: + numParts = 1; + break; + case 3: + numParts = 4; + break; + case 4: + numParts = 9; + break; + default: + numParts = 3; + break; + } + + bpPtr->init = fx_6_init; + bpPtr->update = fx_6_update; + bpPtr->renderWorld = fx_6_render; + bpPtr->unk_00 = 0; + bpPtr->unk_14 = NULL; + bpPtr->effectIndex = 6; + + effect = shim_create_effect_instance(bpPtr); + effect->numParts = numParts; + + effectPart = shim_general_heap_malloc(numParts * sizeof(Effect6)); + effect->data = effectPart; + ASSERT(effect->data != NULL); + + shim_mem_clear(effectPart, numParts * sizeof(Effect6)); + + switch (type) { + case 0: + case 1: + effectPart->unk_38 = 0; + break; + case 3: + effectPart->unk_38 = 2; + break; + case 2: + case 4: + effectPart->unk_38 = 3; + break; + } + + effectPart->unk_3C = 0; + effectPart->type = type; + effectPart->x = x; + effectPart->y = y; + effectPart->z = z; + + effectPart++; + + switch (type) { + case 0: + case 1: + for (i = 1; i < numParts; i++, effectPart++) { + effectPart->unk_10 = -3.0f; + effectPart->unk_14 = 0.29999998f; + effectPart->unk_18 = 0; + effectPart->unk_1C = 0; + effectPart->unk_20 = 1.75f; + effectPart->unk_24 = -0.16f; + effectPart->unk_28 = 0.0f; + effectPart->unk_2C = 0.0f; + effectPart->x = 0.0f; + effectPart->y = 0.0f; + effectPart->z = 4.0f; + theta = shim_clamp_angle(90 + (180 * (i - 1))); + effectPart->unk_30 = shim_sin_deg(theta); + effectPart->unk_34 = shim_cos_deg(theta); + } + break; + case 2: + break; + case 3: + for (i = 1; i < numParts; i++, effectPart++) { + switch (i - 1) { + case 0: + theta = 135.0f; + effectPart->x = -shim_sin_deg(theta) * 25.0f; + effectPart->y = 0.0f; + effectPart->z = -shim_cos_deg(theta) * 25.0f; + effectPart->unk_24 = -0.04f; + effectPart->unk_28 = 0.94f; + effectPart->unk_20 = 0.95f; + break; + case 1: + theta = -135.0f; + effectPart->x = -shim_sin_deg(theta) * 25.0f; + effectPart->y = 4.0f; + effectPart->z = -shim_cos_deg(theta) * 25.0f; + effectPart->unk_24 = -0.04f; + effectPart->unk_28 = 0.94f; + effectPart->unk_20 = 0.84999996f; + break; + case 2: + theta = 20.0f; + effectPart->x = -shim_sin_deg(theta) * 25.0f; + effectPart->y = 10.0f; + effectPart->z = -shim_cos_deg(theta) * 25.0f; + effectPart->unk_24 = -0.04f; + effectPart->unk_28 = 0.94f; + effectPart->unk_20 = 0.75f; + break; + + } + effectPart->unk_30 = 0.0f; + effectPart->unk_34 = 0.0f; + } + break; + case 4: + for (i = 1; i < numParts; i++, effectPart++) { + effectPart->unk_10 = -3.0f; + effectPart->unk_14 = 0.93f; + effectPart->unk_20 = 0.0f; + effectPart->unk_24 = 0.099999994f; + effectPart->unk_28 = 0.94f; + effectPart->unk_2C = 0.94f; + theta = arg4 + ((i - 1) * 360 / (numParts - 1)); + effectPart->x = -shim_sin_deg(theta) * 10.0f; + effectPart->y = 0.0f; + effectPart->z = -shim_cos_deg(theta) * 10.0f; + effectPart->unk_30 = shim_sin_deg(theta); + effectPart->unk_34 = shim_cos_deg(theta); + } + break; + } +} + +void fx_6_init(EffectInstance* effect) { +} + +void fx_6_update(EffectInstance* effect) { + Effect6* effectPart = effect->data; + + effectPart->unk_40 = D_E000CD24[effectPart->unk_38][effectPart->unk_3C++]; + + if (effectPart->unk_40 < 0) { + shim_remove_effect(effect); + } else { + s32 type = effectPart->type; + s32 i; + + effectPart++; + + for (i = 1; i < effect->numParts; i++, effectPart++) { + switch (type) { + case 0: + case 1: + func_E000C000(effectPart); + break; + case 2: + break; + case 3: + func_E000C094(effectPart); + break; + case 4: + func_E000C0C8(effectPart); + break; + } + } + } +} + +void fx_6_render(EffectInstance* effect) { + RenderTask renderTask; + RenderTask* retTask; + + renderTask.appendGfx = fx_6_appendGfx; + renderTask.appendGfxArg = effect; + renderTask.distance = 0; + renderTask.renderMode = RENDER_MODE_28; + + retTask = shim_queue_render_task(&renderTask); + retTask->renderMode |= RENDER_MODE_2; +} + +INCLUDE_ASM(s32, "effects/effect_6", fx_6_appendGfx); diff --git a/src/evt/demo_api.c b/src/evt/demo_api.c index ec3573e8fe..277a671ef2 100644 --- a/src/evt/demo_api.c +++ b/src/evt/demo_api.c @@ -1,5 +1,11 @@ #include "common.h" +// TODO: not sure where these go +u8 D_802D9D70 = 0xFE; +u8 D_802D9D71 = 0xFE; +u8 D_802D9D72 = 0x00; +u8 D_802D9D73 = 0xFF; + INCLUDE_ASM(ApiStatus, "evt/demo_api", SetSpriteShading, Evt* script, s32 isInitialCall); ApiStatus EnableSpriteShading(Evt* script, s32 isInitialCall) { diff --git a/src/evt/evt.c b/src/evt/evt.c index 46318d8815..c8081beb51 100644 --- a/src/evt/evt.c +++ b/src/evt/evt.c @@ -8,11 +8,6 @@ Bytecode* evt_goto_next_case(Evt* script); Bytecode* evt_goto_end_loop(Evt* script); s32 evt_get_variable_index(Evt* script, s32 var); -u8 D_802D9D70 = 0xFE; -u8 D_802D9D71 = 0xFE; -u8 D_802D9D72 = 0x00; -u8 D_802D9D73 = 0xFF; - // BSS extern s8 evtDebugPrintBuffer[]; @@ -1675,7 +1670,6 @@ s32 evt_execute_next_command(Evt *script) { } } -// TODO: consider renaming to evt_get_variable #ifdef NON_MATCHING s32 evt_get_variable(Evt* script, Bytecode var) { s32 wordIdx; @@ -1952,8 +1946,6 @@ Bytecode* evt_skip_else(Evt* script) { return pos; } break; - // If this isn't copy-pasted at least once, the function breaks, so - // might as well be consistent case EVT_OP_IF_EQ: nestedIfDepth++; break; diff --git a/src/npc.c b/src/npc.c index 402120358b..0524bc1c4b 100644 --- a/src/npc.c +++ b/src/npc.c @@ -564,7 +564,7 @@ void render_npcs(void) { f32 phi_f20; s32 i; RenderTask renderTask; - RenderTask* task = &renderTask; // WTF? + RenderTask* renderTaskPtr = &renderTask; f32 x; f32 y; f32 z; @@ -585,10 +585,11 @@ void render_npcs(void) { phi_f20 = 10000.0f; } - task->distance = -phi_f20; - task->appendGfxArg = npc; - task->appendGfx = &appendGfx_npc; - task->renderMode = npc->renderMode; + renderTaskPtr->distance = -phi_f20; + renderTaskPtr->appendGfxArg = npc; + renderTaskPtr->appendGfx = appendGfx_npc; + renderTaskPtr->renderMode = npc->renderMode; + if (npc->flags & NPC_FLAG_NO_DROPS) { u8 r, g, b, a; get_background_color_blend(&r, &g, &b, &a); @@ -598,15 +599,15 @@ void render_npcs(void) { } if (npc->alpha2 != 0) { - queue_render_task(task); + queue_render_task(renderTaskPtr); } if ((npc->flags & NPC_FLAG_MOTION_BLUR) != 0) { - task->distance = -phi_f20; - task->appendGfx = &appendGfx_npc_blur; - task->appendGfxArg = npc; - task->renderMode = 0x11; - queue_render_task(task); + renderTaskPtr->distance = -phi_f20; + renderTaskPtr->appendGfx = appendGfx_npc_blur; + renderTaskPtr->appendGfxArg = npc; + renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; + queue_render_task(renderTaskPtr); } } } diff --git a/src/world/common/reflection.inc.c b/src/world/common/reflection.inc.c index 664444f156..83b0c574a2 100644 --- a/src/world/common/reflection.inc.c +++ b/src/world/common/reflection.inc.c @@ -111,7 +111,7 @@ void N(reflection_setup_wall)(void) { renderTaskPtr->renderMode = renderMode; renderTaskPtr->appendGfxArg = playerStatus; - renderTaskPtr->appendGfx = (void (*)(void*)) N(reflection_render_wall); + renderTaskPtr->appendGfx = (void(*))N(reflection_render_wall); renderTaskPtr->distance = -screenZ; queue_render_task(renderTaskPtr); } @@ -189,8 +189,9 @@ void N(reflection_setup_floor)(void) { renderTaskPtr->renderMode = renderMode; renderTaskPtr->appendGfxArg = playerStatus; renderTaskPtr->distance = -screenZ; - renderTaskPtr->appendGfx = (void (*)(void*))(!(playerStatus->flags & 0x20000) ? N(reflection_render_floor) : N( - reflection_render_floor_fancy)); + renderTaskPtr->appendGfx = (!(playerStatus->flags & 0x20000) ? + N(reflection_render_floor) : + N(reflection_render_floor_fancy)); queue_render_task(renderTaskPtr); } } diff --git a/tools/sortsymz.py b/tools/sortsymz.py index 0b7c7af035..f7d4faaac3 100644 --- a/tools/sortsymz.py +++ b/tools/sortsymz.py @@ -1,5 +1,5 @@ import os - +import re syms = [] groups = {} @@ -7,7 +7,7 @@ groups = {} with open("tools/symz.txt") as f: for line in f.readlines(): name, addr = line.strip().strip(";").split(" = ") - syms.append((name, int(addr, 0), set())) + syms.append({"name": name, "address": int(addr, 0), "found_in": set(), "dead": False}) # Search src for syms for root, dirs, files in os.walk("src"): @@ -16,8 +16,8 @@ for root, dirs, files in os.walk("src"): with open(os.path.join(root, file)) as f: text = f.read() for sym in syms: - if sym[0] in text: - sym[2].add(os.path.join(root, file).replace("src/", "")[:-2]) + if sym["name"] in text: + sym["found_in"].add(os.path.join(root, file).replace("src/", "")[:-2]) # Search asm for syms for root, dirs, files in os.walk("ver/us/asm"): @@ -26,16 +26,22 @@ for root, dirs, files in os.walk("ver/us/asm"): with open(os.path.join(root, file)) as f: text = f.read() for sym in syms: - if sym[0] in text: - sym[2].add(root.replace("ver/us/asm/nonmatchings/", "")) + if sym["name"] in text: + sym["found_in"].add(os.path.join(root, file).replace("ver/us/asm/nonmatchings/", "")) + if re.match(r"E[0-9A-F]{5}", root.split("/")[-1]): + sym["dead"] = True + else: + sym["dead"] = False for sym in syms: - if len(sym[2]) == 0: + if len(sym["found_in"]) == 0: group = "" - elif len(sym[2]) > 1: + elif sym["dead"]: + group = "dead" + elif len(sym["found_in"]) > 1: group = "multig" else: - group = next(iter(sym[2])) + group = next(iter(sym["found_in"])) if group not in groups: groups[group] = [] @@ -46,11 +52,13 @@ for group in groups: print("The following symbols can be simply removed from undefined_syms:") elif group == "multig": print("The following symbols are found in multiple locations:") + elif group == "dead": + print("The following symbols are dead:") else: print(group + ":") - sorted_syms = sorted(groups[group], key=lambda tup: tup[1]) + sorted_syms = sorted(groups[group], key=lambda tup: tup["address"]) for sym in sorted_syms: - print(f"{sym[0]} = 0x{sym[1]:X}") + print(f"{sym['name']} = 0x{sym['address']:X}") print() diff --git a/tools/symz.txt b/tools/symz.txt deleted file mode 100644 index e479220363..0000000000 --- a/tools/symz.txt +++ /dev/null @@ -1,1276 +0,0 @@ -D_00000094 = 0x94; -D_00000094_2 = 0x94; -D_000001E4 = 0x1E4; -D_0A000808 = 0x0A000808; -D_0A000328 = 0x0A000328; -D_0A000380 = 0x0A000380; -D_0A000740 = 0x0A000740; -D_0A000750 = 0x0A000750; -D_0A000800 = 0x0A000800; -D_0A000EE8 = 0x0A000EE8; -D_0A000EF8 = 0x0A000EF8; -D_0A004350 = 0x0A004350; -D_0A0026F0 = 0x0A0026F0; -D_0A0031E0 = 0x0A0031E0; -D_0A001508 = 0x0A001508; -D_0A0031B0 = 0x0A0031B0; -D_0A0014D8 = 0x0A0014D8; -D_0A002F78 = 0x0A002F78; -D_0A001218 = 0x0A001218; -D_0A003F70 = 0x0A003F70; -D_0A002318 = 0x0A002318; -D_0A003508 = 0x0A003508; -D_00E32420 = 0x00E32420; -D_00E35670 = 0x00E35670; -D_00E38890 = 0x00E38890; -D_00E3B870 = 0x00E3B870; -D_00E3E260 = 0x00E3E260; -D_00E42240 = 0x00E42240; -D_00E4B2E0 = 0x00E4B2E0; -D_00E4E7F0 = 0x00E4E7F0; -D_00E62370 = 0x00E62370; -D_00E62AC0 = 0x00E62AC0; -D_00E639C0 = 0x00E639C0; -D_00E648D0 = 0x00E648D0; -gBackgroundImage = 0x80200000; -func_80242040_8B20B0 = 0x80242040; -spiked_goomba = 0x8021B0AC; -paragoomba = 0x8021CD00; -D_802C05CC = 0x802C05CC; -gPauseMenuStrings = 0x8026F778; -D_802442D0 = 0x802442D0; -D_802AB513 = 0x802AB513; -D_802E9904 = 0x802E9904; -D_802E98E0 = 0x802E98E0; -D_802E99DC = 0x802E99DC; -D_80093DB0 = 0x80093DB0; -D_80247AF0_CCB300 = 0x80247AF0; -D_802491C0_CA70E0 = 0x802491C0; -D_80246568_C8C018 = 0x80246568; -D_8024B9A8_B8FB28 = 0x8024B9A8; -D_8038F800 = 0x8038F800; -D_803B5000 = 0x803B5000; -D_802EF0D0 = 0x802EF0D0; -D_800FBB60 = 0x800FBB60; -D_800FBBE0 = 0x800FBBE0; -D_7012BC11 = 0x7012BC11; -D_7012ACA1 = 0x7012ACA1; -D_80200000 = 0x80200000; -D_80000000 = 0x80000000; -osTvType = 0x80000300; -D_80000308 = 0x80000308; -D_8000030C = 0x8000030C; -D_80000318 = 0x80000318; -D_8000031C = 0x8000031C; -D_80026AC7 = 0x80026AC7; -D_8004AA85 = 0x8004AA85; -D_80117160 = 0x80117160; -dead_gPartnerActionStatus = 0x80117163; -D_80117578 = 0x80117578; -D_80117604 = 0x80117604; -D_8011762C = 0x8011762C; -D_80117840 = 0x80117840; -D_80117848 = 0x80117848; -D_80117852 = 0x80117852; -D_801512B0 = 0x801512B0; -D_801512B4 = 0x801512B4; -D_800A08C0 = 0x800A08C0; -gCurrentCustomModelGfxBuildersPtr = 0x801512B8; -D_801512BC = 0x801512BC; -D_801512C0 = 0x801512C0; -gEntityHeapBase = 0x801512C4; -D_801512C8 = 0x801512C8; -gCurrentModels = 0x801512CC; -D_801512D0 = 0x801512D0; -D_801512D4 = 0x801512D4; -gMsgBGScrollAmtX = 0x801512D8; -D_801512DA = 0x801512DA; -gCurrentTransformGroups = 0x801512E0; -gMsgGlobalWaveCounter = 0x801512E4; -gCurrentCustomModelGfxPtr = 0x801512E8; -gLastCreatedEntityIndex = 0x801512EC; -D_801512F0 = 0x801512F0; -gMsgVarImages = 0x801512F4; -D_801512F8 = 0x801512F8; -gCurrentModelTreeRoot = 0x801512FC; -D_80151300 = 0x80151300; -D_80151304 = 0x80151304; -D_80151308 = 0x80151308; -gMsgBGScrollAmtY = 0x8015130C; -D_8015130E = 0x8015130E; -D_80151310 = 0x80151310; -D_80151314 = 0x80151314; -gEntityModelCount = 0x80151318; -D_8015131C = 0x8015131C; -D_80151324 = 0x80151324; -D_80151328 = 0x80151328; -D_8015132C = 0x8015132C; -D_80151330 = 0x80151330; -gTriggerCount = 0x80151334; -D_80151338 = 0x80151338; -D_8015133C = 0x8015133C; -gCurrentDoorSoundsSet = 0x80151340; -D_80151344 = 0x80151344; -gWorldEntityList = 0x80151380; -gBattleEntityList = 0x801513F8; -gCurrentEntityListPtr = 0x80151470; -gWorldShadowList = 0x80151478; -gBattleShadowList = 0x80151568; -gCurrentShadowListPtr = 0x80151658; -wStaticEntityDataSize = 0x8015165C; -bStaticEntityDataSize = 0x80151660; -wStaticEntityData = 0x80151668; -D_801516DC = 0x801516DC; -bStaticEntityData = 0x801516E8; -D_801516F4 = 0x801516F4; -D_801516FC = 0x801516FC; -gMainGameState = 0x80151700; -gCurrentTileDescriptor = 0x80151740; -wModelList = 0x80151770; -bModelList = 0x80151B70; -wTransformGroups = 0x80151F70; -bTransformGroups = 0x80151F80; -wModelSpecialDls = 0x80151F90; -bModelSpecialDls = 0x80152010; -wCustomModelGfxBuilders = 0x80152090; -bCustomModelGfxBuilders = 0x80152110; -D_80152190 = 0x80152190; -D_801521D0 = 0x801521D0; -gCurrentModelLocalVtxBuffers = 0x80152210; -D_80152214 = 0x80152214; -D_80152218 = 0x80152218; -D_80152220 = 0x80152220; -D_80152A20 = 0x80152A20; -wBgRenderType = 0x80153220; -bBgRenderType = 0x80153221; -mdl_treeIterPos = 0x80153224; -D_80153226 = 0x80153226; -wFogSettings = 0x80153228; -bFogSettings = 0x80153248; -gCurrentFogSettings = 0x80153264; -texPannerMainU = 0x80153268; -texPannerMainV = 0x801532A8; -texPannerAuxU = 0x801532E8; -texPannerAuxV = 0x80153328; -mdl_nextTextureAddress = 0x80153368; -mdl_currentTransformGroupChildIndex = 0x8015336C; -D_8015336E = 0x8015336E; -D_80153370 = 0x80153370; -D_80153374 = 0x80153374; -D_80153376 = 0x80153376; -D_80153380 = 0x80153380; -mdl_renderTaskLists = 0x801533A0; -mdl_renderTaskMode = 0x801533AC; -mdl_renderTaskCount = 0x801533B0; -D_801533C0 = 0x801533C0; -D_801536B8 = 0x801536B8; -D_801536C0 = 0x801536C0; -D_801539B8 = 0x801539B8; -D_801539C0 = 0x801539C0; -D_80153A00 = 0x80153A00; -gCurrentAnimMeshListPtr = 0x80153A40; -D_80153A44 = 0x80153A44; -D_80153A48 = 0x80153A48; -D_80153A4B = 0x80153A4B; -D_80153A4C = 0x80153A4C; -D_80153A4F = 0x80153A4F; -D_80153A50 = 0x80153A50; -D_80153A53 = 0x80153A53; -D_80153A54 = 0x80153A54; -D_80153A57 = 0x80153A57; -D_80153A58 = 0x80153A58; -D_80153A5C = 0x80153A5C; -D_80153A60 = 0x80153A60; -D_80153A68 = 0x80153A68; -D_80153AA8 = 0x80153AA8; -D_80153AE8 = 0x80153AE8; -D_80153B28 = 0x80153B28; -D_80153B68 = 0x80153B68; -gWorldEntityModelList = 0x80153B70; -gBattleEntityModelList = 0x80153F70; -gCurrentEntityModelList = 0x80154370; -D_80154374 = 0x80154374; -entity_fog_enabled = 0x80154378; -entity_fog_red = 0x8015437C; -D_8015437F = 0x8015437F; -entity_fog_green = 0x80154380; -D_80154383 = 0x80154383; -entity_fog_blue = 0x80154384; -D_80154387 = 0x80154387; -entity_fog_alpha = 0x80154388; -D_8015438B = 0x8015438B; -entity_fog_dist_min = 0x8015438C; -entity_fog_dist_max = 0x80154390; -gWorldDynamicEntityList = 0x801543A0; -gBattleDynamicEntityList = 0x801543E0; -gCurrentDynamicEntityListPtr = 0x80154420; -gMessageBuffers = 0x80154430; -gMessagePrinters = 0x80154C30; -gMessageStringVars = 0x80155C38; -D_80155C98 = 0x80155C98; -gMessageWindowProjMatrix = 0x80155CA0; -D_80155D20 = 0x80155D20; -gMessageDrawStatePtr = 0x80155D74; -D_80155D80 = 0x80155D80; -D_80155D84 = 0x80155D84; -D_80155D88 = 0x80155D88; -D_80155D8C = 0x80155D8C; -D_80155D8E = 0x80155D8E; -D_80155D90 = 0x80155D90; -D_80155DA0 = 0x80155DA0; -D_801561A0 = 0x801561A0; -D_801565A0 = 0x801565A0; -D_801565A4 = 0x801565A4; -D_801565A6 = 0x801565A6; -D_801565A8 = 0x801565A8; -D_801565B0 = 0x801565B0; -D_801568E0 = 0x801568E0; -D_801568E4 = 0x801568E4; -D_801568E8 = 0x801568E8; -D_801568EC = 0x801568EC; -D_801568F0 = 0x801568F0; -D_801568F4 = 0x801568F4; -D_801568F8 = 0x801568F8; -D_80156900 = 0x80156900; -D_80156903 = 0x80156903; -D_80156904 = 0x80156904; -D_80156908 = 0x80156908; -D_8015690B = 0x8015690B; -D_8015690C = 0x8015690C; -D_80156948 = 0x80156948; -D_80156950 = 0x80156950; -D_80156954 = 0x80156954; -D_80156958 = 0x80156958; -D_80156960 = 0x80156960; -D_80156968 = 0x80156968; -D_80156970 = 0x80156970; -D_80156980 = 0x80156980; -D_80156F20 = 0x80156F20; -D_80156F60 = 0x80156F60; -D_80157460 = 0x80157460; -hudElements = 0x80157960; -D_80157964 = 0x80157964; -D_80157968 = 0x80157968; -D_80157970 = 0x80157970; -D_80157F70 = 0x80157F70; -D_80158570 = 0x80158570; -D_80158574 = 0x80158574; -D_80158580 = 0x80158580; -D_80158B80 = 0x80158B80; -D_80159180 = 0x80159180; -wTriggerList = 0x80159190; -bTriggerList = 0x80159290; -gCurrentTriggerListPtr = 0x80159390; -D_801593A0 = 0x801593A0; -D_8015959E = 0x8015959E; -D_801595A0 = 0x801595A0; -D_801595C0 = 0x801595C0; -D_80159670 = 0x80159670; -D_80159720 = 0x80159720; -D_801597D0 = 0x801597D0; -D_80159880 = 0x80159880; -D_801598A0 = 0x801598A0; -D_801599B8 = 0x801599B8; -D_80159AD0 = 0x80159AD0; -D_80159AD4 = 0x80159AD4; -gMusicUnkVolume = 0x80159AE0; -gMusicTargetVolume = 0x80159AE2; -gMusicUnkVolume2 = 0x80159AE4; -gMusicCurrentVolume = 0x80159AE6; -gMusicSettings = 0x80159AF0; -D_80159B08 = 0x80159B08; -D_80159B50 = 0x80159B50; -gWindows = 0x80159D50; -D_80159D54 = 0x80159D54; -D_80159E7E = 0x80159E7E; -D_8015A010 = 0x8015A010; -D_8015A070 = 0x8015A070; -D_8015A07C = 0x8015A07C; -D_8015A1E2 = 0x8015A1E2; -D_8015A2BC = 0x8015A2BC; -D_8015A2BE = 0x8015A2BE; -D_8015A2D0 = 0x8015A2D0; -D_8015A370 = 0x8015A370; -gCollisionStatus = 0x8015A550; -D_8015A578 = 0x8015A578; -D_8015A57A = 0x8015A57A; -mdl_textureHandles = 0x8015A590; -D_8015C74C = 0x8015C74C; -D_8015C790 = 0x8015C790; -D_8015C7A4 = 0x8015C7A4; -D_8015C7A8 = 0x8015C7A8; -D_8015C7C0 = 0x8015C7C0; -D_8015C7D0 = 0x8015C7D0; -D_8015C7D2 = 0x8015C7D2; -D_8015C7D8 = 0x8015C7D8; -D_8015C7E0 = 0x8015C7E0; -D_80164000 = 0x80164000; -D_80169B12 = 0x80169B12; -D_80169B16 = 0x80169B16; -D_80197000 = 0x80197000; -D_801A6000 = 0x801A6000; -D_801A7000 = 0x801A7000; -D_801AA000 = 0x801AA000; -D_80210000 = 0x80210000; -D_80219040 = 0x80219040; -D_80220740 = 0x80220740; -D_80220744 = 0x80220744; -D_80220750 = 0x80220750; -D_80220754 = 0x80220754; -D_80220760 = 0x80220760; -D_80220770 = 0x80220770; -D_80220780 = 0x80220780; -D_80224D60 = 0x80224D60; -D_80224D64 = 0x80224D64; -D_80224D70 = 0x80224D70; -D_80224D74 = 0x80224D74; -D_80224D80 = 0x80224D80; -D_80224D90 = 0x80224D90; -D_80224DA0 = 0x80224DA0; -D_80224DB0 = 0x80224DB0; -D_8022ADD0 = 0x8022ADD0; -D_8022B550 = 0x8022B550; -D_802310D0 = 0x802310D0; -D_80232C20 = 0x80232C20; -D_80232C4C = 0x80232C4C; -D_80232C50 = 0x80232C50; -D_80235E00 = 0x80235E00; -D_802367F0 = 0x802367F0; -D_8023BD70 = 0x8023BD70; -D_8023BD78 = 0x8023BD78; -D_8023BD98 = 0x8023BD98; -D_8023BDB4 = 0x8023BDB4; -D_8023BDB8 = 0x8023BDB8; -D_8023BDBC = 0x8023BDBC; -D_8023BDC0 = 0x8023BDC0; -D_8023BDC4 = 0x8023BDC4; -D_8023BDC8 = 0x8023BDC8; -D_8023C070 = 0x8023C070; -D_8023C1B0 = 0x8023C1B0; -D_8023C1B4 = 0x8023C1B4; -D_8023C1B8 = 0x8023C1B8; -D_8023C1BC = 0x8023C1BC; -D_8023C1C0 = 0x8023C1C0; -D_8023C1C4 = 0x8023C1C4; -D_8023C1C8 = 0x8023C1C8; -D_8023C1CC = 0x8023C1CC; -D_8023C1D0 = 0x8023C1D0; -D_8023CDA0 = 0x8023CDA0; -D_8023CDA4 = 0x8023CDA4; -D_8023D1E0 = 0x8023D1E0; -D_8023D1E4 = 0x8023D1E4; -D_8023D26C = 0x8023D26C; -D_8023D270 = 0x8023D270; -D_8023D274 = 0x8023D274; -D_8023D278 = 0x8023D278; -D_8023D27C = 0x8023D27C; -D_8023D280 = 0x8023D280; -D_8023D284 = 0x8023D284; -D_8023D288 = 0x8023D288; -D_8023D28C = 0x8023D28C; -D_8023D290 = 0x8023D290; -D_8023D294 = 0x8023D294; -D_8023D298 = 0x8023D298; -D_8023D29C = 0x8023D29C; -D_8023D2A0 = 0x8023D2A0; -D_8023D2A4 = 0x8023D2A4; -D_8023D2A8 = 0x8023D2A8; -D_8023D2AC = 0x8023D2AC; -D_8023D2B0 = 0x8023D2B0; -D_8023D2B4 = 0x8023D2B4; -D_8023D2B8 = 0x8023D2B8; -D_8023D2BC = 0x8023D2BC; -D_8023D2C0 = 0x8023D2C0; -D_8023D2C4 = 0x8023D2C4; -D_8023D2C8 = 0x8023D2C8; -D_8023D2D0 = 0x8023D2D0; -D_8023D330 = 0x8023D330; -D_8023D334 = 0x8023D334; -D_8023D338 = 0x8023D338; -D_80241ECC = 0x80241ECC; -D_80242208 = 0x80242208; -D_80242344 = 0x80242344; -D_802429BC = 0x802429BC; -D_802429E0 = 0x802429E0; -D_80242FB0 = 0x80242FB0; -D_80243190 = 0x80243190; -D_80243374 = 0x80243374; -D_80243720 = 0x80243720; -D_80243BE0 = 0x80243BE0; -D_802440E0 = 0x802440E0; -D_802440E1 = 0x802440E1; -D_802440E2 = 0x802440E2; -D_802440E3 = 0x802440E3; -D_802440E5 = 0x802440E5; -D_802440EB = 0x802440EB; -D_802440EF = 0x802440EF; -D_802440F3 = 0x802440F3; -D_802440F7 = 0x802440F7; -D_802440F8 = 0x802440F8; -D_802440FB = 0x802440FB; -D_802440FF = 0x802440FF; -D_80244104 = 0x80244104; -D_802442D0 = 0x802442D0; -D_80244494 = 0x80244494; -D_802447C0 = 0x802447C0; -D_80244A20 = 0x80244A20; -D_80244C18 = 0x80244C18; -D_80244D88 = 0x80244D88; -D_802451F0 = 0x802451F0; -D_80245230 = 0x80245230; -D_802453D8 = 0x802453D8; -D_80245430 = 0x80245430; -D_80245601 = 0x80245601; -D_80245602 = 0x80245602; -D_80245603 = 0x80245603; -D_80245604 = 0x80245604; -D_80245605 = 0x80245605; -D_80245608 = 0x80245608; -D_8024560B = 0x8024560B; -D_8024560C = 0x8024560C; -D_8024560F = 0x8024560F; -D_80245610 = 0x80245610; -D_80245613 = 0x80245613; -D_80245614 = 0x80245614; -D_80245617 = 0x80245617; -D_80245618 = 0x80245618; -D_8024561B = 0x8024561B; -D_8024561C = 0x8024561C; -D_8024561F = 0x8024561F; -D_80245620 = 0x80245620; -D_80245650 = 0x80245650; -D_80245928 = 0x80245928; -D_8024592C = 0x8024592C; -D_802459C0 = 0x802459C0; -D_80245AB4 = 0x80245AB4; -D_802461F0 = 0x802461F0; -D_80246260 = 0x80246260; -D_802462F0 = 0x802462F0; -D_80246300 = 0x80246300; -D_80246424 = 0x80246424; -D_8024652C = 0x8024652C; -D_80246530 = 0x80246530; -D_80246534 = 0x80246534; -D_80246554 = 0x80246554; -D_8024655C = 0x8024655C; -D_80246578 = 0x80246578; -D_80246598 = 0x80246598; -D_8024659C = 0x8024659C; -D_802465A0 = 0x802465A0; -D_802465CC = 0x802465CC; -D_802465F0 = 0x802465F0; -D_802466D0 = 0x802466D0; -D_80246794 = 0x80246794; -D_802467B4 = 0x802467B4; -D_80246894 = 0x80246894; -D_80246990 = 0x80246990; -D_80246BE8 = 0x80246BE8; -D_80247050 = 0x80247050; -D_80247120 = 0x80247120; -D_802474A0 = 0x802474A0; -D_80247548 = 0x80247548; -D_80247664 = 0x80247664; -D_80247750 = 0x80247750; -D_802479F0 = 0x802479F0; -D_80247BF0 = 0x80247BF0; -D_80247CA0 = 0x80247CA0; -D_80247CB4 = 0x80247CB4; -D_80247D00 = 0x80247D00; -D_80247DF0 = 0x80247DF0; -D_80247E68 = 0x80247E68; -D_80248380 = 0x80248380; -D_80248388 = 0x80248388; -D_802483C0 = 0x802483C0; -D_802483C4 = 0x802483C4; -D_802483D0 = 0x802483D0; -D_80248480 = 0x80248480; -D_8024854C = 0x8024854C; -D_80248600 = 0x80248600; -D_80248624 = 0x80248624; -D_80248650 = 0x80248650; -D_80248850 = 0x80248850; -D_80248924 = 0x80248924; -D_80248938 = 0x80248938; -D_80248940 = 0x80248940; -D_80248944 = 0x80248944; -D_80248948 = 0x80248948; -D_80248F90 = 0x80248F90; -D_80249158 = 0x80249158; -D_80249440 = 0x80249440; -D_8024A290 = 0x8024A290; -D_8024A2A0 = 0x8024A2A0; -D_8024A2C4 = 0x8024A2C4; -D_8024A2D0 = 0x8024A2D0; -D_8024B990 = 0x8024B990; -D_8024B9B4 = 0x8024B9B4; -D_8024B9B8 = 0x8024B9B8; -D_8024BA90 = 0x8024BA90; -D_8024BB80 = 0x8024BB80; -D_8024BDD0 = 0x8024BDD0; -D_8024BDE8 = 0x8024BDE8; -D_8024BDF0 = 0x8024BDF0; -D_8024BDF4 = 0x8024BDF4; -D_8024BDF8 = 0x8024BDF8; -D_8024BEA0 = 0x8024BEA0; -D_8024C068 = 0x8024C068; -D_8024C088 = 0x8024C088; -D_8024C090 = 0x8024C090; -D_8024C108 = 0x8024C108; -D_8024C110 = 0x8024C110; -D_8024C117 = 0x8024C117; -D_8024C1D8 = 0x8024C1D8; -D_8024C5E0 = 0x8024C5E0; -D_8024DBC0 = 0x8024DBC0; -D_8024DD88 = 0x8024DD88; -D_8024DF10 = 0x8024DF10; -D_8024DF18 = 0x8024DF18; -D_8024DF1C = 0x8024DF1C; -D_8024DF20 = 0x8024DF20; -D_8024DF24 = 0x8024DF24; -D_8024DFC0 = 0x8024DFC0; -D_8024DFD8 = 0x8024DFD8; -D_8024DFE0 = 0x8024DFE0; -D_8024DFE4 = 0x8024DFE4; -D_8024DFE8 = 0x8024DFE8; -D_8024DFF0 = 0x8024DFF0; -D_8024E1B4 = 0x8024E1B4; -D_8024E540 = 0x8024E540; -D_8024E558 = 0x8024E558; -D_8024E560 = 0x8024E560; -D_8024E564 = 0x8024E564; -D_8024E568 = 0x8024E568; -D_8024E570 = 0x8024E570; -D_8024E738 = 0x8024E738; -D_8024E960 = 0x8024E960; -D_8024EA10 = 0x8024EA10; -D_8024EA14 = 0x8024EA14; -D_8024EA18 = 0x8024EA18; -gPauseMenuPanels = 0x8024EF80; -D_8024EF84 = 0x8024EF84; -D_8024EF88 = 0x8024EF88; -D_8024EF90 = 0x8024EF90; -gPauseMenuCursorPosY = 0x8024EFA0; -D_8024EFB8 = 0x8024EFB8; -D_8024EFC0 = 0x8024EFC0; -D_8024EFC8 = 0x8024EFC8; -D_8024F010 = 0x8024F010; -D_8024F080 = 0x8024F080; -D_8024F248 = 0x8024F248; -D_8024F2A0 = 0x8024F2A0; -D_8024F2A1 = 0x8024F2A1; -D_8024F2A2 = 0x8024F2A2; -D_8024F2A3 = 0x8024F2A3; -D_8024F2A4 = 0x8024F2A4; -D_8024F2A5 = 0x8024F2A5; -D_8024F2A8 = 0x8024F2A8; -D_8024F2AB = 0x8024F2AB; -D_8024F2AC = 0x8024F2AC; -D_8024F2AF = 0x8024F2AF; -D_8024F2B0 = 0x8024F2B0; -D_8024F2B3 = 0x8024F2B3; -D_8024F2B4 = 0x8024F2B4; -D_8024F2B7 = 0x8024F2B7; -D_8024F2B8 = 0x8024F2B8; -D_8024F2BB = 0x8024F2BB; -D_8024F2BC = 0x8024F2BC; -D_8024F2BF = 0x8024F2BF; -D_8024F2C4 = 0x8024F2C4; -D_8024F2C8 = 0x8024F2C8; -D_8024F2CC = 0x8024F2CC; -D_8024F2D8 = 0x8024F2D8; -D_8024F2DC = 0x8024F2DC; -D_8024F2E0 = 0x8024F2E0; -D_8024F2EC = 0x8024F2EC; -D_8024F2F4 = 0x8024F2F4; -D_8024F2F8 = 0x8024F2F8; -D_8024F2FC = 0x8024F2FC; -D_8024F304 = 0x8024F304; -D_8024F308 = 0x8024F308; -D_8024F30C = 0x8024F30C; -D_8024F318 = 0x8024F318; -D_8024F338 = 0x8024F338; -D_8024F358 = 0x8024F358; -D_8024F374 = 0x8024F374; -D_8024F378 = 0x8024F378; -D_8024F3F8 = 0x8024F3F8; -D_8024F448 = 0x8024F448; -D_8024F498 = 0x8024F498; -D_8024F4E8 = 0x8024F4E8; -D_8024F581 = 0x8024F581; -D_8024F582 = 0x8024F582; -D_8024F583 = 0x8024F583; -D_8024F584 = 0x8024F584; -D_8024F585 = 0x8024F585; -D_8024F588 = 0x8024F588; -D_8024F58B = 0x8024F58B; -D_8024F58C = 0x8024F58C; -D_8024F58F = 0x8024F58F; -D_8024F590 = 0x8024F590; -D_8024F593 = 0x8024F593; -D_8024F594 = 0x8024F594; -D_8024F597 = 0x8024F597; -D_8024F598 = 0x8024F598; -D_8024F59B = 0x8024F59B; -D_8024F59C = 0x8024F59C; -D_8024F59F = 0x8024F59F; -D_8024F5A0 = 0x8024F5A0; -D_8024F5A4 = 0x8024F5A4; -D_8024F5C4 = 0x8024F5C4; -D_8024F5C8 = 0x8024F5C8; -D_8024F5D0 = 0x8024F5D0; -D_8024F7E4 = 0x8024F7E4; -D_8024F7F0 = 0x8024F7F0; -D_8024FBA0 = 0x8024FBA0; -D_8024FD68 = 0x8024FD68; -D_8024FED8 = 0x8024FED8; -D_8024FEF0 = 0x8024FEF0; -D_8024FEF8 = 0x8024FEF8; -D_8024FEFC = 0x8024FEFC; -D_8024FF00 = 0x8024FF00; -D_8024FF04 = 0x8024FF04; -D_80250EF0 = 0x80250EF0; -D_802513D0 = 0x802513D0; -D_802513E8 = 0x802513E8; -D_802513F4 = 0x802513F4; -D_802513F8 = 0x802513F8; -D_80251400 = 0x80251400; -D_80251450 = 0x80251450; -D_80251468 = 0x80251468; -D_80251470 = 0x80251470; -D_80251478 = 0x80251478; -D_802515C4 = 0x802515C4; -D_80251C40 = 0x80251C40; -D_80251C58 = 0x80251C58; -D_80251C60 = 0x80251C60; -D_80251C68 = 0x80251C68; -D_80251C70 = 0x80251C70; -D_80251E34 = 0x80251E34; -D_802529D0 = 0x802529D0; -D_802529E8 = 0x802529E8; -D_802529F0 = 0x802529F0; -D_802529F4 = 0x802529F4; -D_80252A00 = 0x80252A00; -D_80252BC8 = 0x80252BC8; -D_80252D38 = 0x80252D38; -D_80253060 = 0x80253060; -D_80253378 = 0x80253378; -D_80253384 = 0x80253384; -D_8025338C = 0x8025338C; -D_80253390 = 0x80253390; -D_802547D0 = 0x802547D0; -D_802549B8 = 0x802549B8; -D_802549C4 = 0x802549C4; -D_802549C8 = 0x802549C8; -D_802549D0 = 0x802549D0; -D_80254B94 = 0x80254B94; -D_80254BA0 = 0x80254BA0; -D_80254D68 = 0x80254D68; -D_80255B70 = 0x80255B70; -D_80255B88 = 0x80255B88; -D_80255B90 = 0x80255B90; -D_80255B94 = 0x80255B94; -D_80255B98 = 0x80255B98; -D_80255BA0 = 0x80255BA0; -D_80255D68 = 0x80255D68; -D_80255ED8 = 0x80255ED8; -D_80255EE0 = 0x80255EE0; -D_802560A4 = 0x802560A4; -D_80257118 = 0x80257118; -D_80257320 = 0x80257320; -D_80257F20 = 0x80257F20; -D_80257F21 = 0x80257F21; -D_80257F22 = 0x80257F22; -D_80257F23 = 0x80257F23; -D_80257F24 = 0x80257F24; -D_80257F25 = 0x80257F25; -D_80257F26 = 0x80257F26; -D_80257F27 = 0x80257F27; -D_80257F28 = 0x80257F28; -D_80257F29 = 0x80257F29; -D_80257F2C = 0x80257F2C; -D_80257F40 = 0x80257F40; -D_80257F48 = 0x80257F48; -D_80257F4C = 0x80257F4C; -D_80257F50 = 0x80257F50; -D_80257F58 = 0x80257F58; -D_8025811C = 0x8025811C; -D_80258120 = 0x80258120; -D_80258140 = 0x80258140; -D_80258340 = 0x80258340; -D_8025B0A8 = 0x8025B0A8; -D_8025B2A8 = 0x8025B2A8; -D_8025B2AC = 0x8025B2AC; -D_8025B2B0 = 0x8025B2B0; -D_8025C0D0 = 0x8025C0D0; -D_80262A40 = 0x80262A40; -D_80262A58 = 0x80262A58; -D_80262A60 = 0x80262A60; -D_80262A64 = 0x80262A64; -D_80262A68 = 0x80262A68; -D_80262A70 = 0x80262A70; -D_80262C34 = 0x80262C34; -D_80262C38 = 0x80262C38; -D_80262F68 = 0x80262F68; -D_80268000 = 0x80268000; -gPauseMenuCommonIconIDs = 0x802700E8; -D_80270108 = 0x80270108; -D_8027010C = 0x8027010C; -D_80270110 = 0x80270110; -D_80270114 = 0x80270114; -D_80270118 = 0x80270118; -D_8027011C = 0x8027011C; -gPauseMenuTabIconIDs = 0x80270130; -D_80270148 = 0x80270148; -D_8027014C = 0x8027014C; -gStatsMenuIconIDs = 0x80270150; -gBadgeMenuItemIDs = 0x80270180; -gBadgeMenuCurrentPage = 0x80270280; -gBadgeMenuPages = 0x80270288; -D_80270289 = 0x80270289; -D_8027028A = 0x8027028A; -gBadgeMenuSelectedIndex = 0x80270378; -D_8027037C = 0x8027037C; -gBadgeMenuSelectedItemID = 0x80270380; -gBadgeMenuNumItems = 0x80270384; -D_80270388 = 0x80270388; -gBadgeMenuCurrentScrollPos = 0x8027038C; -gBadgeMenuTargetScrollPos = 0x80270390; -D_80270394 = 0x80270394; -gBadgeMenuLevel = 0x80270398; -gBadgeMenuCurrentTab = 0x8027039C; -gBadgeMenuBShowNotEnoughBP = 0x802703A0; -D_802703A8 = 0x802703A8; -D_802703FC = 0x802703FC; -gItemMenuItemIDs = 0x80270400; -gItemMenuCurrentPage = 0x802704C8; -gItemMenuPages = 0x802704D0; -D_802704D1 = 0x802704D1; -D_802704D2 = 0x802704D2; -gItemMenuSelectedIndex = 0x802705C0; -D_802705C4 = 0x802705C4; -gItemMenuSelectedItemID = 0x802705C8; -gItemMenuNumItems = 0x802705CC; -D_802705D0 = 0x802705D0; -gItemMenuCurrentScrollPos = 0x802705D4; -gItemMenuTargetScrollPos = 0x802705D8; -D_802705DC = 0x802705DC; -gItemMenuLevel = 0x802705E0; -gItemMenuCurrentTab = 0x802705E4; -gItemIcons = 0x802705E8; -D_80270634 = 0x80270634; -D_80270640 = 0x80270640; -D_80270660 = 0x80270660; -D_80270680 = 0x80270680; -D_802706A0 = 0x802706A0; -D_802706A4 = 0x802706A4; -D_802706A8 = 0x802706A8; -D_802706AC = 0x802706AC; -D_802706B0 = 0x802706B0; -D_802706C0 = 0x802706C0; -D_802706E0 = 0x802706E0; -D_802706FC = 0x802706FC; -D_80270700 = 0x80270700; -pause_map_cameraX = 0x80270704; -pause_map_cameraY = 0x80270708; -pause_map_marioX = 0x8027070C; -pause_map_marioY = 0x80270710; -pause_map_targetX = 0x80270714; -pause_map_targetY = 0x80270718; -pause_map_cursorCurrentOption = 0x8027071C; -pause_map_cursorCurrentOptionCopy = 0x80270720; -pause_map_spacesInSnapRange = 0x80270724; -D_80282EE9 = 0x80282EE9; -D_80282EEA = 0x80282EEA; -bMarioHideAnims = 0x80283370; -D_8029DA30 = 0x8029DA30; -D_8029DA33 = 0x8029DA33; -D_8029DA34 = 0x8029DA34; -D_8029DA40 = 0x8029DA40; -D_8029DA44 = 0x8029DA44; -D_8029DA48 = 0x8029DA48; -D_8029DA4C = 0x8029DA4C; -D_8029DA50 = 0x8029DA50; -D_8029EFB0 = 0x8029EFB0; -D_8029EFB4 = 0x8029EFB4; -D_8029EFB8 = 0x8029EFB8; -D_8029EFBC = 0x8029EFBC; -D_8029EFC0 = 0x8029EFC0; -D_8029EFE8 = 0x8029EFE8; -D_8029F010 = 0x8029F010; -D_8029F038 = 0x8029F038; -D_8029F236 = 0x8029F236; -D_8029F240 = 0x8029F240; -D_8029F244 = 0x8029F244; -D_8029F248 = 0x8029F248; -D_8029F24C = 0x8029F24C; -D_8029F250 = 0x8029F250; -D_8029F254 = 0x8029F254; -D_8029F258 = 0x8029F258; -D_8029F25C = 0x8029F25C; -D_8029F260 = 0x8029F260; -D_8029F264 = 0x8029F264; -D_8029F270 = 0x8029F270; -D_8029F274 = 0x8029F274; -D_8029F278 = 0x8029F278; -D_8029F27C = 0x8029F27C; -D_8029F27E = 0x8029F27E; -D_8029F280 = 0x8029F280; -D_8029F282 = 0x8029F282; -D_8029F284 = 0x8029F284; -D_8029F286 = 0x8029F286; -D_8029F288 = 0x8029F288; -D_8029F28C = 0x8029F28C; -D_8029F290 = 0x8029F290; -D_8029F294 = 0x8029F294; -D_8029F298 = 0x8029F298; -D_8029F29C = 0x8029F29C; -D_8029F29E = 0x8029F29E; -D_8029F2A0 = 0x8029F2A0; -D_8029F2A2 = 0x8029F2A2; -D_8029F2A3 = 0x8029F2A3; -D_8029F2A4 = 0x8029F2A4; -D_8029F2A5 = 0x8029F2A5; -D_8029F2A6 = 0x8029F2A6; -D_8029F2A7 = 0x8029F2A7; -D_8029F2A8 = 0x8029F2A8; -D_8029F2AC = 0x8029F2AC; -D_8029F2B0 = 0x8029F2B0; -D_8029F2B4 = 0x8029F2B4; -popupMessages = 0x8029F2C0; -D_8029F640 = 0x8029F640; -D_8029F642 = 0x8029F642; -D_8029F644 = 0x8029F644; -D_8029F646 = 0x8029F646; -D_8029F648 = 0x8029F648; -D_8029F64A = 0x8029F64A; -D_8029F64C = 0x8029F64C; -D_8029F64E = 0x8029F64E; -D_8029F650 = 0x8029F650; -gSpeakingActorPrintCtx = 0x8029FA60; -D_8029FA64 = 0x8029FA64; -gSpeakingActorPrintIsDone = 0x8029FA68; -gSpeakingActorTalkAnim = 0x8029FA6C; -gSpeakingActorIdleAnim = 0x8029FA70; -gSpeakingActor = 0x8029FA74; -gSpeakingActorPart = 0x8029FA78; -D_8029FA80 = 0x8029FA80; -D_8029FA88 = 0x8029FA88; -D_8029FA90 = 0x8029FA90; -D_8029FAA8 = 0x8029FAA8; -D_8029FAC4 = 0x8029FAC4; -D_8029FAE8 = 0x8029FAE8; -D_8029FB48 = 0x8029FB48; -D_8029FB4C = 0x8029FB4C; -D_8029FB50 = 0x8029FB50; -D_8029FB54 = 0x8029FB54; -D_8029FB60 = 0x8029FB60; -D_8029FB64 = 0x8029FB64; -D_8029FB68 = 0x8029FB68; -D_8029FB6C = 0x8029FB6C; -D_8029FB70 = 0x8029FB70; -D_8029FB74 = 0x8029FB74; -D_8029FB78 = 0x8029FB78; -D_8029FB7C = 0x8029FB7C; -D_8029FB80 = 0x8029FB80; -D_8029FB84 = 0x8029FB84; -D_8029FB88 = 0x8029FB88; -D_8029FB8C = 0x8029FB8C; -D_8029FB90 = 0x8029FB90; -D_8029FB94 = 0x8029FB94; -D_8029FB98 = 0x8029FB98; -D_8029FB9C = 0x8029FB9C; -D_8029FBA0 = 0x8029FBA0; -D_8029FBA4 = 0x8029FBA4; -D_8029FBA8 = 0x8029FBA8; -D_8029FBAC = 0x8029FBAC; -D_8029FBB0 = 0x8029FBB0; -D_8029FBC0 = 0x8029FBC0; -D_8029FBD0 = 0x8029FBD0; -D_8029FBD4 = 0x8029FBD4; -gActionCommandStatus = 0x8029FBE0; -D_8029FC2A = 0x8029FC2A; -D_8029FC3E = 0x8029FC3E; -D_8029FC4C = 0x8029FC4C; -D_802A19B0 = 0x802A19B0; -D_802A19C0 = 0x802A19C0; -D_802A1A90 = 0x802A1A90; -D_802A1AC0 = 0x802A1AC0; -D_802A1B40 = 0x802A1B40; -D_802A1CD0 = 0x802A1CD0; -D_802A1CD4 = 0x802A1CD4; -D_802A1D60 = 0x802A1D60; -D_802A21F0 = 0x802A21F0; -D_802A25C8 = 0x802A25C8; -D_802A25E4 = 0x802A25E4; -D_802A25E8 = 0x802A25E8; -D_802A25EC = 0x802A25EC; -D_802A25F0 = 0x802A25F0; -D_802A25F4 = 0x802A25F4; -D_802A25F8 = 0x802A25F8; -D_802A25FC = 0x802A25FC; -D_802A2C20 = 0x802A2C20; -D_802A2C50 = 0x802A2C50; -D_802A2CC0 = 0x802A2CC0; -D_802A2DD8 = 0x802A2DD8; -D_802A2DEC = 0x802A2DEC; -D_802A2DF0 = 0x802A2DF0; -D_802A2DF4 = 0x802A2DF4; -D_802A2DF8 = 0x802A2DF8; -D_802A2DFC = 0x802A2DFC; -D_802A2E00 = 0x802A2E00; -D_802A37F0 = 0x802A37F0; -D_802A37F8 = 0x802A37F8; -D_802A3818 = 0x802A3818; -D_802A3834 = 0x802A3834; -D_802A3838 = 0x802A3838; -D_802A3F58 = 0x802A3F58; -D_802A3F88 = 0x802A3F88; -D_802A4020 = 0x802A4020; -D_802A4350 = 0x802A4350; -D_802A43D0 = 0x802A43D0; -D_802A9620 = 0x802A9620; -D_802A98C0 = 0x802A98C0; -D_802A9920 = 0x802A9920; -D_802A9B00 = 0x802A9B00; -D_802A9F0C = 0x802A9F0C; -D_802A9F34 = 0x802A9F34; -D_802A9F5C = 0x802A9F5C; -D_802A9F84 = 0x802A9F84; -D_802A9FAC = 0x802A9FAC; -D_802AA320 = 0x802AA320; -D_802AA694 = 0x802AA694; -D_802AAA08 = 0x802AAA08; -D_802AAA30 = 0x802AAA30; -D_802ACC60 = 0x802ACC60; -D_802ACC64 = 0x802ACC64; -D_802ACC68 = 0x802ACC68; -D_802ACC6C = 0x802ACC6C; -D_802ACC70 = 0x802ACC70; -D_802ACCD0 = 0x802ACCD0; -D_802ACFE8 = 0x802ACFE8; -D_802ACFEC = 0x802ACFEC; -D_802ACFF0 = 0x802ACFF0; -D_802ACFF4 = 0x802ACFF4; -D_802ACFFC = 0x802ACFFC; -D_802ACFFD = 0x802ACFFD; -D_802AD000 = 0x802AD000; -D_802AD001 = 0x802AD001; -D_802AD002 = 0x802AD002; -D_802AD003 = 0x802AD003; -D_802AD004 = 0x802AD004; -D_802AD006 = 0x802AD006; -D_802AD008 = 0x802AD008; -D_802AD00A = 0x802AD00A; -D_802AD010 = 0x802AD010; -D_802AD028 = 0x802AD028; -D_802AD040 = 0x802AD040; -D_802AD044 = 0x802AD044; -D_802AD048 = 0x802AD048; -D_802AD04C = 0x802AD04C; -D_802AD050 = 0x802AD050; -D_802AD054 = 0x802AD054; -D_802AD058 = 0x802AD058; -D_802AD05C = 0x802AD05C; -D_802AD060 = 0x802AD060; -D_802AD064 = 0x802AD064; -D_802AD068 = 0x802AD068; -D_802AD069 = 0x802AD069; -D_802AD06A = 0x802AD06A; -D_802AD06B = 0x802AD06B; -D_802AD06C = 0x802AD06C; -D_802AD070 = 0x802AD070; -main_battle_menu_iconScripts = 0x802AD078; -battle_menu_messageIDs = 0x802AD090; -D_802AD0A8 = 0x802AD0A8; -main_menu_numOptions = 0x802AD0AC; -D_802AD0B0 = 0x802AD0B0; -D_802AD0B3 = 0x802AD0B3; -battle_menu_submenuIDs = 0x802AD0B8; -D_802AD0BB = 0x802AD0BB; -D_802AD0BC = 0x802AD0BC; -D_802AD0C0 = 0x802AD0C0; -battle_menu_isEnabled = 0x802AD0D0; -battle_menu_isMessageDisabled = 0x802AD0E8; -D_802AD0EB = 0x802AD0EB; -D_802AD100 = 0x802AD100; -D_802AD104 = 0x802AD104; -battle_menu_moveState = 0x802AD108; -battle_menu_moveCursorPos = 0x802AD109; -D_802AD10A = 0x802AD10A; -D_802AD10B = 0x802AD10B; -battle_menu_moveScrollLine = 0x802AD10C; -D_802AD10D = 0x802AD10D; -D_802AD10E = 0x802AD10E; -D_802AD10F = 0x802AD10F; -battle_menu_moveScrollOffset = 0x802AD110; -D_802AD112 = 0x802AD112; -battle_menu_moveTextColor = 0x802AD114; -battle_menu_moveTextOpacity = 0x802AD116; -battle_menu_moveCursorIcon = 0x802AD118; -battle_menu_moveUpArrowIcon = 0x802AD11C; -battle_menu_moveDownArrowIcon = 0x802AD120; -battle_menu_moveOptionIconIDs = 0x802AD128; -battle_menu_moveTitleIcon = 0x802AD188; -battle_menu_moveOptionCostUnitIconIDs = 0x802AD190; -battle_menu_moveX = 0x802AD1F0; -battle_menu_moveY = 0x802AD1F2; -battle_menu_moveOptionIndexMap = 0x802AD1F8; -D_802AD258 = 0x802AD258; -battle_menu_moveOptionIconScripts = 0x802AD260; -battle_menu_moveOptionNames = 0x802AD2C0; -battle_menu_moveOptionDisplayCosts = 0x802AD320; -battle_menu_moveOptionDisplayCostReductions = 0x802AD380; -battle_menu_moveOptionDisplayCostReductionColors = 0x802AD3E0; -battle_menu_moveOptionBPCosts = 0x802AD440; -battle_menu_hasSpiritsMenu = 0x802AD4A0; -battle_menu_moveOptionCount = 0x802AD4A4; -D_802AD4A7 = 0x802AD4A7; -D_802AD4A8 = 0x802AD4A8; -battle_menu_moveIndices = 0x802AD4B0; -D_802AD4B2 = 0x802AD4B2; -D_802AD4B3 = 0x802AD4B3; -battle_menu_moveOptionsEnabled = 0x802AD510; -battle_menu_moveOptionDescriptions = 0x802AD570; -battle_menu_moveOptionSortPriorities = 0x802AD5D0; -battle_menu_moveOptionCantUseTypes = 0x802AD5E8; -battle_menu_moveOptionActive = 0x802AD600; -D_802AD603 = 0x802AD603; -D_802AD604 = 0x802AD604; -D_802AD605 = 0x802AD605; -D_802AD606 = 0x802AD606; -D_802AD607 = 0x802AD607; -D_802AD608 = 0x802AD608; -D_802AD609 = 0x802AD609; -D_802AD60A = 0x802AD60A; -D_802AD60B = 0x802AD60B; -D_802AD60C = 0x802AD60C; -D_802AD60E = 0x802AD60E; -D_802AD610 = 0x802AD610; -D_802AD612 = 0x802AD612; -D_802AD614 = 0x802AD614; -D_802AD618 = 0x802AD618; -D_802AD61C = 0x802AD61C; -D_802AD620 = 0x802AD620; -D_802AD624 = 0x802AD624; -D_802AD628 = 0x802AD628; -D_802AD63C = 0x802AD63C; -D_802AD63E = 0x802AD63E; -D_802AD640 = 0x802AD640; -D_802AD658 = 0x802AD658; -D_802AD66C = 0x802AD66C; -D_802AD66F = 0x802AD66F; -D_802AD670 = 0x802AD670; -D_802AD673 = 0x802AD673; -D_802AD678 = 0x802AD678; -D_802AD67B = 0x802AD67B; -D_802AD690 = 0x802AD690; -D_802AD6A8 = 0x802AD6A8; -D_802AD6AA = 0x802AD6AA; -D_802AD6C0 = 0x802AD6C0; -D_802AD6D4 = 0x802AD6D4; -D_802B6240 = 0x802B6240; -D_802B62B0 = 0x802B62B0; -D_802B62D0 = 0x802B62D0; -D_802B62D4 = 0x802B62D4; -D_802B62D8 = 0x802B62D8; -D_802B62DC = 0x802B62DC; -D_802B62E0 = 0x802B62E0; -D_802B6730 = 0x802B6730; -D_802B6780 = 0x802B6780; -D_802B6784 = 0x802B6784; -D_802B6788 = 0x802B6788; -D_802B678C = 0x802B678C; -D_802B6790 = 0x802B6790; -D_802B6794 = 0x802B6794; -D_802B6798 = 0x802B6798; -D_802B679C = 0x802B679C; -D_802B68B0 = 0x802B68B0; -D_802B68B4 = 0x802B68B4; -D_802B68B8 = 0x802B68B8; -D_802B68BC = 0x802B68BC; -D_802B6E80 = 0x802B6E80; -D_802B6ED0 = 0x802B6ED0; -D_802B6ED4 = 0x802B6ED4; -D_802B6ED8 = 0x802B6ED8; -D_802B6EDC = 0x802B6EDC; -D_802B6EE0 = 0x802B6EE0; -D_802B6EE4 = 0x802B6EE4; -D_802B6EE8 = 0x802B6EE8; -D_802B6EEC = 0x802B6EEC; -D_802B6EF0 = 0x802B6EF0; -D_802B6EF4 = 0x802B6EF4; -mdl_clearRenderTasks = 0x802B7E00; -D_802BDF30 = 0x802BDF30; -D_802BDF34 = 0x802BDF34; -D_802BDF38 = 0x802BDF38; -D_802BDF60 = 0x802BDF60; -D_802BE0C0 = 0x802BE0C0; -D_802BE0C4 = 0x802BE0C4; -D_802BE0E4 = 0x802BE0E4; -D_802BE0E8 = 0x802BE0E8; -D_802BE0EC = 0x802BE0EC; -D_802BE300 = 0x802BE300; -D_802BE304 = 0x802BE304; -D_802BE308 = 0x802BE308; -D_802BE30C = 0x802BE30C; -D_802BE310 = 0x802BE310; -D_802BE920 = 0x802BE920; -D_802BE924 = 0x802BE924; -D_802BE928 = 0x802BE928; -D_802BE92C = 0x802BE92C; -D_802BE930 = 0x802BE930; -D_802BE934 = 0x802BE934; -D_802BE938 = 0x802BE938; -D_802BEBB0 = 0x802BEBB0; -D_802BEBB4 = 0x802BEBB4; -D_802BEBB8 = 0x802BEBB8; -D_802BEBBC = 0x802BEBBC; -D_802BEBC4 = 0x802BEBC4; -D_802BEC50 = 0x802BEC50; -D_802BEC54 = 0x802BEC54; -D_802BEC58 = 0x802BEC58; -D_802BEC5C = 0x802BEC5C; -D_802BEC60 = 0x802BEC60; -D_802BEC64 = 0x802BEC64; -D_802BEC68 = 0x802BEC68; -D_802BEC6C = 0x802BEC6C; -D_802BEC70 = 0x802BEC70; -D_802BEC74 = 0x802BEC74; -D_802BEC78 = 0x802BEC78; -D_802BFF00 = 0x802BFF00; -D_802BFF04 = 0x802BFF04; -D_802BFF08 = 0x802BFF08; -D_802BFF0C = 0x802BFF0C; -D_802BFF10 = 0x802BFF10; -D_802BFF14 = 0x802BFF14; -D_802BFF18 = 0x802BFF18; -D_802BFF1C = 0x802BFF1C; -D_802BFF20 = 0x802BFF20; -D_802BFF24 = 0x802BFF24; -D_802BFF28 = 0x802BFF28; -D_802C0000 = 0x802C0000; -D_802C05CC = 0x802C05CC; -gMapFlags = 0x802DA480; -gMapVars = 0x802DA484; -gNumScripts = 0x802DA488; -gWorldScriptList = 0x802DA490; -gBattleScriptList = 0x802DA690; -gCurrentScriptListPtr = 0x802DA890; -gScriptIndexList = 0x802DA898; -gScriptIdList = 0x802DAA98; -gScriptListCount = 0x802DAC98; -evtDebugPrintBuffer = 0x802DACA0; -gLavaResetList = 0x802DADA0; -D_802DADA4 = 0x802DADA4; -gBattleMeshAnimationList = 0x802DADB0; -gWorldMeshAnimationList = 0x802DADF0; -gCurrentMeshAnimationListPtr = 0x802DAE30; -D_802DAE40 = 0x802DAE40; -D_802DAE44 = 0x802DAE44; -D_802DAE50 = 0x802DAE50; -D_802DAE54 = 0x802DAE54; -gCurrentPrintContext = 0x802DB260; -D_802DB264 = 0x802DB264; -D_802DB268 = 0x802DB268; -D_802DB5B0 = 0x802DB5B0; -D_802DB5C0 = 0x802DB5C0; -D_802DB6C0 = 0x802DB6C0; -D_802DB7C0 = 0x802DB7C0; -D_802DB7D0 = 0x802DB7D0; -D_802DB7D8 = 0x802DB7D8; -D_802DB800 = 0x802DB800; -D_802DB830 = 0x802DB830; -D_802DBB60 = 0x802DBB60; -D_802DBB68 = 0x802DBB68; -gWorldMapFlags = 0x802DBC70; -D_802DBC7C = 0x802DBC7C; -D_802DBC88 = 0x802DBC88; -gWorldMapVars = 0x802DBCA8; -gBattleMapVars = 0x802DBCE8; -D_802DBD28 = 0x802DBD28; -gBattleMapFlags = 0x802DBD34; -spr_allocateBtlComponentsOnWorldHeap = 0x802DF524; -D_802DF530 = 0x802DF530; -D_802DF540 = 0x802DF540; -spr_playerSprites = 0x802DF548; -D_802DF57C = 0x802DF57C; -spr_playerMaxComponents = 0x802DF580; -spr_playerCurrentAnimInfo = 0x802DF588; -D_802DF58C = 0x802DF58C; -D_802DF590 = 0x802DF590; -spr_npcSprites = 0x802DF5B0; -spr_npcSpriteInstanceCount = 0x802DF958; -D_802DFA48 = 0x802DFA48; -D_802DFA4C = 0x802DFA4C; -D_802DFA58 = 0x802DFA58; -D_802DFE44 = 0x802DFE44; -D_802DFE48 = 0x802DFE48; -D_802DFE9C = 0x802DFE9C; -D_802DFEA0 = 0x802DFEA0; -D_802DFEAC = 0x802DFEAC; -D_802DFEB0 = 0x802DFEB0; -D_802DFEB8 = 0x802DFEB8; -D_802E004C = 0x802E004C; -D_802E0050 = 0x802E0050; -D_802E0080 = 0x802E0080; -D_802E0090 = 0x802E0090; -D_802E0C10 = 0x802E0C10; -D_802E0C14 = 0x802E0C14; -D_802E0C20 = 0x802E0C20; -D_802E0C58 = 0x802E0C58; -D_802E0C5C = 0x802E0C5C; -D_802E0C60 = 0x802E0C60; -D_802E0C64 = 0x802E0C64; -D_802E0C68 = 0x802E0C68; -D_802E0C70 = 0x802E0C70; -D_802EB390 = 0x802EB390; -D_802EB394 = 0x802EB394; -D_802EB398 = 0x802EB398; -D_802EB39C = 0x802EB39C; -D_802EB3A0 = 0x802EB3A0; -D_802EB3B0 = 0x802EB3B0; -D_802EB3C0 = 0x802EB3C0; -D_802ED970 = 0x802ED970; -D_802EE8D0 = 0x802EE8D0; -D_802F39D0 = 0x802F39D0; -D_802F4560 = 0x802F4560; -D_802FB800 = 0x802FB800; -gSpriteHeapPtr = 0x8034F800; -D_803DA800 = 0x803DA800; -D_8887FFFB = 0x8887FFFB; -D_A0000000 = 0xA0000000; -D_A4000000 = 0xA4000000; -D_A4000768 = 0xA4000768; -D_A4001000 = 0xA4001000; -D_A4040010 = 0xA4040010; -D_A4300000 = 0xA4300000; -D_A4300004 = 0xA4300004; -D_A4300008 = 0xA4300008; -D_A430000C = 0xA430000C; -D_A4400010 = 0xA4400010; -D_A450000C = 0xA450000C; -D_A4600004 = 0xA4600004; -D_A460000C = 0xA460000C; -D_A4600010 = 0xA4600010; -D_A4700000 = 0xA4700000; -D_A4700010 = 0xA4700010; -D_A4800018 = 0xA4800018; -D_A6000000 = 0xA6000000; -D_B0000000 = 0xB0000000; -D_B0000008 = 0xB0000008; -D_B0000010 = 0xB0000010; -D_D9FCFFFF = 0xD9FCFFFF; -D_E001C5E0 = 0xE001C5E0; -D_E007EC2F = 0xE007EC2F; -D_E00963E0 = 0xE00963E0; -D_E1000010 = 0xE1000010; -D_E7000008 = 0xE7000008; -D_E8000008 = 0xE8000008; -D_F0000008 = 0xF0000008; -D_F1FFFFFF = 0xF1FFFFFF; -D_F5000007 = 0xF5000007; -D_F79DDD0F = 0xF79DDD0F; -D_FA000028 = 0xFA000028; -D_FD100008 = 0xFD100008; -D_802510B0 = 0x802510B0; -D_8026A2B0 = 0x8026A2B0; diff --git a/ver/us/asm/data/effects/328050.data.s b/ver/us/asm/data/effects/328050.data.s deleted file mode 100644 index da9f32e5f5..0000000000 --- a/ver/us/asm/data/effects/328050.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_E0002760 -.word 0x41200000, 0x42200000, 0x42A00000, 0x432A0000, 0x430C0000, 0x42C80000, 0x41C80000, 0x431B0000, 0x42700000, 0x42F00000 - -glabel D_E0002788 -.word 0x400CCCCD, 0x402CCCCD, 0x40400000, 0x400CCCCD, 0x402CCCCD, 0x40400000, 0x3FF33333, 0x3FF33333, 0x3FC00000, 0x3FC00000 - -glabel D_E00027B0 -.float 1.4, 1.3, 1.2, 1.3, 1.4, 1.3, 1.6, 1.6, 1.6, 1.6 - -glabel D_E00027D8 -.word 0x00000000, 0x436A0000, 0x43EA0000, 0x442F8000, 0x446A0000, 0x449D8000, 0x44AF8000, 0x44CCC000, 0x44EDC000, 0x44F70000 - -glabel D_E0002800 -.word 0x09000FA0, 0x09001060, 0x09001120, 0x090011E0, 0x090012A0, 0x09001360, 0x09001420, 0x00000000 diff --git a/ver/us/asm/data/effects/328D20.data.s b/ver/us/asm/data/effects/328D20.data.s deleted file mode 100644 index 2886354a24..0000000000 --- a/ver/us/asm/data/effects/328D20.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_E000CC10 -.word 0x09002B20, 0x09002B40, 0x09002B60, 0x09002B60, 0x09002B60 - -glabel D_E000CC24 -.word 0x09002780, 0x09002868, 0x09002950, 0x09002A38, 0x09002A38 - -glabel D_E000CC38 -.word 0x0001021A, 0x031B041C, 0x05153546, 0x4646FF00 - -glabel D_E000CC48 -.word 0x0001021A, 0x031B041C, 0x051D0616, 0x26475767, 0xFF000000 - -glabel D_E000CC5C -.word 0x00081018, 0x20283038, 0x01091119, 0x21293139, 0x02020A0A, 0x12121A1A, 0x22222A2A, 0x32323A3A, 0x03030B0B, 0x13131B1B, 0x23232B2B, 0x33333B3B, 0x04040C0C, 0x14141C1C, 0x24242C2C, 0x34343C3C, 0x05050D0D, 0x15151D1D, 0x25252D2D, 0x35353D3D, 0x0606060E, 0x0E0E1616, 0x161E1E1E, 0x2626262E, 0x2E2E3636, 0x363E3E3E, 0x4747474F, 0x4F4F5757, 0x575F5F5F, 0x6767676F, 0x6F6F7777, 0x777F7F7F, 0xFF000000 - -glabel D_E000CCE0 -.word 0x00102030, 0x01112131, 0x020A121A, 0x222A323A, 0x030B131B, 0x232B333B, 0x040C141C, 0x242C343C, 0x050D151D, 0x252D353D, 0x06060E16, 0x161E2626, 0x2E36363E, 0x47474F57, 0x575F6767, 0x6F77777F, 0xFF000000 - -glabel D_E000CD24 -.word D_E000CC38, D_E000CC48, D_E000CC5C, D_E000CCE0, 0x00000000, 0x00000000, 0x00000000 - -glabel jtbl_E000CD40 -.word LE000C28C_32839C, LE000C28C_32839C, LE000C29C_3283AC, LE000C294_3283A4, LE000C29C_3283AC, 0 - -glabel jtbl_E000CD58 -.word LE000C2DC_3283EC, LE000C2DC_3283EC, LE000C614_328724, LE000C394_3284A4, LE000C514_328624, 0 - -glabel D_E000CD70 -.word 0xE000C6F8, 0xE000C6F8, 0xE000C720, 0xE000C708, 0xE000C718, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/effects/effect_1/func_E00021BC.s b/ver/us/asm/nonmatchings/effects/effect_1/func_E00021BC.s deleted file mode 100644 index 9b6d6915d5..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_1/func_E00021BC.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E00021BC -/* 327AAC E00021BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 327AB0 E00021C0 0000302D */ daddu $a2, $zero, $zero -/* 327AB4 E00021C4 AFBF0010 */ sw $ra, 0x10($sp) -/* 327AB8 E00021C8 8C820008 */ lw $v0, 8($a0) -/* 327ABC E00021CC 8C85000C */ lw $a1, 0xc($a0) -/* 327AC0 E00021D0 18400033 */ blez $v0, .LE00022A0 -/* 327AC4 E00021D4 00C0382D */ daddu $a3, $a2, $zero -/* 327AC8 E00021D8 3C013FF4 */ lui $at, 0x3ff4 -/* 327ACC E00021DC 44813800 */ mtc1 $at, $f7 -/* 327AD0 E00021E0 44803000 */ mtc1 $zero, $f6 -/* 327AD4 E00021E4 24A30024 */ addiu $v1, $a1, 0x24 -.LE00021E8: -/* 327AD8 E00021E8 8462FFDE */ lh $v0, -0x22($v1) -/* 327ADC E00021EC 04420027 */ bltzl $v0, .LE000228C -/* 327AE0 E00021F0 24C60001 */ addiu $a2, $a2, 1 -/* 327AE4 E00021F4 8C62FFE4 */ lw $v0, -0x1c($v1) -/* 327AE8 E00021F8 2442FFFF */ addiu $v0, $v0, -1 -/* 327AEC E00021FC 04410022 */ bgez $v0, .LE0002288 -/* 327AF0 E0002200 AC62FFE4 */ sw $v0, -0x1c($v1) -/* 327AF4 E0002204 C464FFF4 */ lwc1 $f4, -0xc($v1) -/* 327AF8 E0002208 C460FFFC */ lwc1 $f0, -4($v1) -/* 327AFC E000220C C462FFF8 */ lwc1 $f2, -8($v1) -/* 327B00 E0002210 46002100 */ add.s $f4, $f4, $f0 -/* 327B04 E0002214 C4600000 */ lwc1 $f0, ($v1) -/* 327B08 E0002218 46001080 */ add.s $f2, $f2, $f0 -/* 327B0C E000221C E464FFF4 */ swc1 $f4, -0xc($v1) -/* 327B10 E0002220 E462FFF8 */ swc1 $f2, -8($v1) -/* 327B14 E0002224 94A20000 */ lhu $v0, ($a1) -/* 327B18 E0002228 24420001 */ addiu $v0, $v0, 1 -/* 327B1C E000222C A4A20000 */ sh $v0, ($a1) -/* 327B20 E0002230 9462FFDE */ lhu $v0, -0x22($v1) -/* 327B24 E0002234 2442FFFF */ addiu $v0, $v0, -1 -/* 327B28 E0002238 A462FFDE */ sh $v0, -0x22($v1) -/* 327B2C E000223C 00021400 */ sll $v0, $v0, 0x10 -/* 327B30 E0002240 04400011 */ bltz $v0, .LE0002288 -/* 327B34 E0002244 24070001 */ addiu $a3, $zero, 1 -/* 327B38 E0002248 9462FFE2 */ lhu $v0, -0x1e($v1) -/* 327B3C E000224C 2442FFFF */ addiu $v0, $v0, -1 -/* 327B40 E0002250 A462FFE2 */ sh $v0, -0x1e($v1) -/* 327B44 E0002254 00021400 */ sll $v0, $v0, 0x10 -/* 327B48 E0002258 0443000C */ bgezl $v0, .LE000228C -/* 327B4C E000225C 24C60001 */ addiu $a2, $a2, 1 -/* 327B50 E0002260 C460FFFC */ lwc1 $f0, -4($v1) -/* 327B54 E0002264 C4620000 */ lwc1 $f2, ($v1) -/* 327B58 E0002268 46000021 */ cvt.d.s $f0, $f0 -/* 327B5C E000226C 46260003 */ div.d $f0, $f0, $f6 -/* 327B60 E0002270 46200020 */ cvt.s.d $f0, $f0 -/* 327B64 E0002274 460010A1 */ cvt.d.s $f2, $f2 -/* 327B68 E0002278 46261083 */ div.d $f2, $f2, $f6 -/* 327B6C E000227C 462010A0 */ cvt.s.d $f2, $f2 -/* 327B70 E0002280 E460FFFC */ swc1 $f0, -4($v1) -/* 327B74 E0002284 E4620000 */ swc1 $f2, ($v1) -.LE0002288: -/* 327B78 E0002288 24C60001 */ addiu $a2, $a2, 1 -.LE000228C: -/* 327B7C E000228C 2463002C */ addiu $v1, $v1, 0x2c -/* 327B80 E0002290 8C820008 */ lw $v0, 8($a0) -/* 327B84 E0002294 00C2102A */ slt $v0, $a2, $v0 -/* 327B88 E0002298 1440FFD3 */ bnez $v0, .LE00021E8 -/* 327B8C E000229C 24A5002C */ addiu $a1, $a1, 0x2c -.LE00022A0: -/* 327B90 E00022A0 14E00003 */ bnez $a3, .LE00022B0 -/* 327B94 E00022A4 00000000 */ nop -/* 327B98 E00022A8 0C080128 */ jal func_E02004A0 -/* 327B9C E00022AC 00000000 */ nop -.LE00022B0: -/* 327BA0 E00022B0 8FBF0010 */ lw $ra, 0x10($sp) -/* 327BA4 E00022B4 03E00008 */ jr $ra -/* 327BA8 E00022B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/effects/effect_1/func_E00022BC.s b/ver/us/asm/nonmatchings/effects/effect_1/func_E00022BC.s deleted file mode 100644 index cfaadd4b5d..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_1/func_E00022BC.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E00022BC -/* 327BAC E00022BC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 327BB0 E00022C0 3C02E000 */ lui $v0, %hi(func_E0002300) -/* 327BB4 E00022C4 24422300 */ addiu $v0, $v0, %lo(func_E0002300) -/* 327BB8 E00022C8 AFA2001C */ sw $v0, 0x1c($sp) -/* 327BBC E00022CC 2402002D */ addiu $v0, $zero, 0x2d -/* 327BC0 E00022D0 AFA40018 */ sw $a0, 0x18($sp) -/* 327BC4 E00022D4 27A40010 */ addiu $a0, $sp, 0x10 -/* 327BC8 E00022D8 AFBF0020 */ sw $ra, 0x20($sp) -/* 327BCC E00022DC AFA00014 */ sw $zero, 0x14($sp) -/* 327BD0 E00022E0 0C080120 */ jal func_E0200480 -/* 327BD4 E00022E4 AFA20010 */ sw $v0, 0x10($sp) -/* 327BD8 E00022E8 8C430000 */ lw $v1, ($v0) -/* 327BDC E00022EC 34630002 */ ori $v1, $v1, 2 -/* 327BE0 E00022F0 AC430000 */ sw $v1, ($v0) -/* 327BE4 E00022F4 8FBF0020 */ lw $ra, 0x20($sp) -/* 327BE8 E00022F8 03E00008 */ jr $ra -/* 327BEC E00022FC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/effects/effect_1/func_E0002300.s b/ver/us/asm/nonmatchings/effects/effect_1/func_E0002300.s deleted file mode 100644 index d266e95ffc..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_1/func_E0002300.s +++ /dev/null @@ -1,281 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0002300 -/* 327BF0 E0002300 27BDFF68 */ addiu $sp, $sp, -0x98 -/* 327BF4 E0002304 3C08DB06 */ lui $t0, 0xdb06 -/* 327BF8 E0002308 35080024 */ ori $t0, $t0, 0x24 -/* 327BFC E000230C AFB50074 */ sw $s5, 0x74($sp) -/* 327C00 E0002310 3C15800A */ lui $s5, %hi(gMasterGfxPos) -/* 327C04 E0002314 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) -/* 327C08 E0002318 3C02E700 */ lui $v0, 0xe700 -/* 327C0C E000231C AFBF0084 */ sw $ra, 0x84($sp) -/* 327C10 E0002320 AFBE0080 */ sw $fp, 0x80($sp) -/* 327C14 E0002324 AFB7007C */ sw $s7, 0x7c($sp) -/* 327C18 E0002328 AFB60078 */ sw $s6, 0x78($sp) -/* 327C1C E000232C AFB40070 */ sw $s4, 0x70($sp) -/* 327C20 E0002330 AFB3006C */ sw $s3, 0x6c($sp) -/* 327C24 E0002334 AFB20068 */ sw $s2, 0x68($sp) -/* 327C28 E0002338 AFB10064 */ sw $s1, 0x64($sp) -/* 327C2C E000233C AFB00060 */ sw $s0, 0x60($sp) -/* 327C30 E0002340 F7B60090 */ sdc1 $f22, 0x90($sp) -/* 327C34 E0002344 F7B40088 */ sdc1 $f20, 0x88($sp) -/* 327C38 E0002348 AFA40098 */ sw $a0, 0x98($sp) -/* 327C3C E000234C 8EA60000 */ lw $a2, ($s5) -/* 327C40 E0002350 8FA90098 */ lw $t1, 0x98($sp) -/* 327C44 E0002354 4480A000 */ mtc1 $zero, $f20 -/* 327C48 E0002358 3C013F80 */ lui $at, 0x3f80 -/* 327C4C E000235C 44810000 */ mtc1 $at, $f0 -/* 327C50 E0002360 00C0182D */ daddu $v1, $a2, $zero -/* 327C54 E0002364 8D34000C */ lw $s4, 0xc($t1) -/* 327C58 E0002368 24C60008 */ addiu $a2, $a2, 8 -/* 327C5C E000236C AC620000 */ sw $v0, ($v1) -/* 327C60 E0002370 AC600004 */ sw $zero, 4($v1) -/* 327C64 E0002374 ACC80000 */ sw $t0, ($a2) -/* 327C68 E0002378 3C088000 */ lui $t0, 0x8000 -/* 327C6C E000237C 4405A000 */ mfc1 $a1, $f20 -/* 327C70 E0002380 8D220010 */ lw $v0, 0x10($t1) -/* 327C74 E0002384 4407A000 */ mfc1 $a3, $f20 -/* 327C78 E0002388 8C42001C */ lw $v0, 0x1c($v0) -/* 327C7C E000238C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 327C80 E0002390 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 327C84 E0002394 00481021 */ addu $v0, $v0, $t0 -/* 327C88 E0002398 ACC20004 */ sw $v0, 4($a2) -/* 327C8C E000239C 00031080 */ sll $v0, $v1, 2 -/* 327C90 E00023A0 00431021 */ addu $v0, $v0, $v1 -/* 327C94 E00023A4 00021080 */ sll $v0, $v0, 2 -/* 327C98 E00023A8 00431023 */ subu $v0, $v0, $v1 -/* 327C9C E00023AC 000218C0 */ sll $v1, $v0, 3 -/* 327CA0 E00023B0 00431021 */ addu $v0, $v0, $v1 -/* 327CA4 E00023B4 000210C0 */ sll $v0, $v0, 3 -/* 327CA8 E00023B8 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 327CAC E00023BC 00220821 */ addu $at, $at, $v0 -/* 327CB0 E00023C0 C4221DEC */ lwc1 $f2, %lo(gCameras+0x6C)($at) -/* 327CB4 E00023C4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 327CB8 E00023C8 C680000C */ lwc1 $f0, 0xc($s4) -/* 327CBC E00023CC 27A40020 */ addiu $a0, $sp, 0x20 -/* 327CC0 E00023D0 AEA60000 */ sw $a2, ($s5) -/* 327CC4 E00023D4 24C60008 */ addiu $a2, $a2, 8 -/* 327CC8 E00023D8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 327CCC E00023DC C6800010 */ lwc1 $f0, 0x10($s4) -/* 327CD0 E00023E0 46001087 */ neg.s $f2, $f2 -/* 327CD4 E00023E4 AEA60000 */ sw $a2, ($s5) -/* 327CD8 E00023E8 44061000 */ mfc1 $a2, $f2 -/* 327CDC E00023EC 3C100001 */ lui $s0, 1 -/* 327CE0 E00023F0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 327CE4 E00023F4 C6800014 */ lwc1 $f0, 0x14($s4) -/* 327CE8 E00023F8 36101630 */ ori $s0, $s0, 0x1630 -/* 327CEC E00023FC 0C080180 */ jal func_E0200600 -/* 327CF0 E0002400 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 327CF4 E0002404 27A40020 */ addiu $a0, $sp, 0x20 -/* 327CF8 E0002408 3C118007 */ lui $s1, %hi(gMatrixListPos) -/* 327CFC E000240C 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) -/* 327D00 E0002410 3C13800A */ lui $s3, %hi(gDisplayContext) -/* 327D04 E0002414 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) -/* 327D08 E0002418 96250000 */ lhu $a1, ($s1) -/* 327D0C E000241C 8E620000 */ lw $v0, ($s3) -/* 327D10 E0002420 00052980 */ sll $a1, $a1, 6 -/* 327D14 E0002424 00B02821 */ addu $a1, $a1, $s0 -/* 327D18 E0002428 0C080118 */ jal func_E0200460 -/* 327D1C E000242C 00452821 */ addu $a1, $v0, $a1 -/* 327D20 E0002430 8EA20000 */ lw $v0, ($s5) -/* 327D24 E0002434 0040282D */ daddu $a1, $v0, $zero -/* 327D28 E0002438 24420008 */ addiu $v0, $v0, 8 -/* 327D2C E000243C AEA20000 */ sw $v0, ($s5) -/* 327D30 E0002440 96240000 */ lhu $a0, ($s1) -/* 327D34 E0002444 3C02DA38 */ lui $v0, 0xda38 -/* 327D38 E0002448 ACA20000 */ sw $v0, ($a1) -/* 327D3C E000244C 8E630000 */ lw $v1, ($s3) -/* 327D40 E0002450 3082FFFF */ andi $v0, $a0, 0xffff -/* 327D44 E0002454 00021180 */ sll $v0, $v0, 6 -/* 327D48 E0002458 00501021 */ addu $v0, $v0, $s0 -/* 327D4C E000245C 00621821 */ addu $v1, $v1, $v0 -/* 327D50 E0002460 ACA30004 */ sw $v1, 4($a1) -/* 327D54 E0002464 8FA90098 */ lw $t1, 0x98($sp) -/* 327D58 E0002468 0000902D */ daddu $s2, $zero, $zero -/* 327D5C E000246C 8D220008 */ lw $v0, 8($t1) -/* 327D60 E0002470 24840001 */ addiu $a0, $a0, 1 -/* 327D64 E0002474 18400092 */ blez $v0, .LE00026C0 -/* 327D68 E0002478 A6240000 */ sh $a0, ($s1) -/* 327D6C E000247C 4600A586 */ mov.s $f22, $f20 -/* 327D70 E0002480 0260F02D */ daddu $fp, $s3, $zero -/* 327D74 E0002484 0220B82D */ daddu $s7, $s1, $zero -/* 327D78 E0002488 3C160001 */ lui $s6, 1 -/* 327D7C E000248C 36D61630 */ ori $s6, $s6, 0x1630 -/* 327D80 E0002490 02A0982D */ daddu $s3, $s5, $zero -/* 327D84 E0002494 3C15E000 */ lui $s5, %hi(D_E0002800) -/* 327D88 E0002498 26B52800 */ addiu $s5, $s5, %lo(D_E0002800) -/* 327D8C E000249C 3C0140E0 */ lui $at, 0x40e0 -/* 327D90 E00024A0 4481A000 */ mtc1 $at, $f20 -/* 327D94 E00024A4 26900004 */ addiu $s0, $s4, 4 -.LE00024A8: -/* 327D98 E00024A8 8603FFFE */ lh $v1, -2($s0) -/* 327D9C E00024AC 0462007E */ bltzl $v1, .LE00026A8 -/* 327DA0 E00024B0 26520001 */ addiu $s2, $s2, 1 -/* 327DA4 E00024B4 8E020004 */ lw $v0, 4($s0) -/* 327DA8 E00024B8 0443007B */ bgezl $v0, .LE00026A8 -/* 327DAC E00024BC 26520001 */ addiu $s2, $s2, 1 -/* 327DB0 E00024C0 0060882D */ daddu $s1, $v1, $zero -/* 327DB4 E00024C4 2A220011 */ slti $v0, $s1, 0x11 -/* 327DB8 E00024C8 50400001 */ beql $v0, $zero, .LE00024D0 -/* 327DBC E00024CC 24110010 */ addiu $s1, $zero, 0x10 -.LE00024D0: -/* 327DC0 E00024D0 00121080 */ sll $v0, $s2, 2 -/* 327DC4 E00024D4 3C01E000 */ lui $at, %hi(D_E00027B0) -/* 327DC8 E00024D8 00220821 */ addu $at, $at, $v0 -/* 327DCC E00024DC C42027B0 */ lwc1 $f0, %lo(D_E00027B0)($at) -/* 327DD0 E00024E0 4405B000 */ mfc1 $a1, $f22 -/* 327DD4 E00024E4 4406B000 */ mfc1 $a2, $f22 -/* 327DD8 E00024E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 327DDC E00024EC C6000014 */ lwc1 $f0, 0x14($s0) -/* 327DE0 E00024F0 E7A00014 */ swc1 $f0, 0x14($sp) -/* 327DE4 E00024F4 C6000018 */ lwc1 $f0, 0x18($s0) -/* 327DE8 E00024F8 E7B6001C */ swc1 $f22, 0x1c($sp) -/* 327DEC E00024FC E7A00018 */ swc1 $f0, 0x18($sp) -/* 327DF0 E0002500 3C07E000 */ lui $a3, %hi(D_E00027D8) -/* 327DF4 E0002504 00E23821 */ addu $a3, $a3, $v0 -/* 327DF8 E0002508 8CE727D8 */ lw $a3, %lo(D_E00027D8)($a3) -/* 327DFC E000250C 0C080180 */ jal func_E0200600 -/* 327E00 E0002510 27A40020 */ addiu $a0, $sp, 0x20 -/* 327E04 E0002514 27A40020 */ addiu $a0, $sp, 0x20 -/* 327E08 E0002518 96E50000 */ lhu $a1, ($s7) -/* 327E0C E000251C 8FC20000 */ lw $v0, ($fp) -/* 327E10 E0002520 00052980 */ sll $a1, $a1, 6 -/* 327E14 E0002524 00B62821 */ addu $a1, $a1, $s6 -/* 327E18 E0002528 0C080118 */ jal func_E0200460 -/* 327E1C E000252C 00452821 */ addu $a1, $v0, $a1 -/* 327E20 E0002530 8E620000 */ lw $v0, ($s3) -/* 327E24 E0002534 0040282D */ daddu $a1, $v0, $zero -/* 327E28 E0002538 24420008 */ addiu $v0, $v0, 8 -/* 327E2C E000253C AE620000 */ sw $v0, ($s3) -/* 327E30 E0002540 96E40000 */ lhu $a0, ($s7) -/* 327E34 E0002544 3C02DA38 */ lui $v0, 0xda38 -/* 327E38 E0002548 ACA20000 */ sw $v0, ($a1) -/* 327E3C E000254C 8FC30000 */ lw $v1, ($fp) -/* 327E40 E0002550 3082FFFF */ andi $v0, $a0, 0xffff -/* 327E44 E0002554 00021180 */ sll $v0, $v0, 6 -/* 327E48 E0002558 00561021 */ addu $v0, $v0, $s6 -/* 327E4C E000255C 00621821 */ addu $v1, $v1, $v0 -/* 327E50 E0002560 ACA30004 */ sw $v1, 4($a1) -/* 327E54 E0002564 86820000 */ lh $v0, ($s4) -/* 327E58 E0002568 24840001 */ addiu $a0, $a0, 1 -/* 327E5C E000256C A6E40000 */ sh $a0, ($s7) -/* 327E60 E0002570 86030000 */ lh $v1, ($s0) -/* 327E64 E0002574 2442FFFF */ addiu $v0, $v0, -1 -/* 327E68 E0002578 44826000 */ mtc1 $v0, $f12 -/* 327E6C E000257C 00000000 */ nop -/* 327E70 E0002580 46806320 */ cvt.s.w $f12, $f12 -/* 327E74 E0002584 44831000 */ mtc1 $v1, $f2 -/* 327E78 E0002588 00000000 */ nop -/* 327E7C E000258C 468010A0 */ cvt.s.w $f2, $f2 -/* 327E80 E0002590 460C103E */ c.le.s $f2, $f12 -/* 327E84 E0002594 00000000 */ nop -/* 327E88 E0002598 45000004 */ bc1f .LE00025AC -/* 327E8C E000259C 240700FF */ addiu $a3, $zero, 0xff -/* 327E90 E00025A0 8EA80018 */ lw $t0, 0x18($s5) -/* 327E94 E00025A4 0800098B */ j .LE000262C -/* 327E98 E00025A8 3C06D838 */ lui $a2, 0xd838 -.LE00025AC: -/* 327E9C E00025AC 46146302 */ mul.s $f12, $f12, $f20 -/* 327EA0 E00025B0 00000000 */ nop -/* 327EA4 E00025B4 3C0142B4 */ lui $at, 0x42b4 -/* 327EA8 E00025B8 44810000 */ mtc1 $at, $f0 -/* 327EAC E00025BC 46026303 */ div.s $f12, $f12, $f2 -/* 327EB0 E00025C0 46006302 */ mul.s $f12, $f12, $f0 -/* 327EB4 E00025C4 00000000 */ nop -/* 327EB8 E00025C8 0C080140 */ jal func_E0200500 -/* 327EBC E00025CC 46146303 */ div.s $f12, $f12, $f20 -/* 327EC0 E00025D0 46140082 */ mul.s $f2, $f0, $f20 -/* 327EC4 E00025D4 00000000 */ nop -/* 327EC8 E00025D8 3C01437F */ lui $at, 0x437f -/* 327ECC E00025DC 44810000 */ mtc1 $at, $f0 -/* 327ED0 E00025E0 00000000 */ nop -/* 327ED4 E00025E4 46001002 */ mul.s $f0, $f2, $f0 -/* 327ED8 E00025E8 00000000 */ nop -/* 327EDC E00025EC 4600010D */ trunc.w.s $f4, $f0 -/* 327EE0 E00025F0 44032000 */ mfc1 $v1, $f4 -/* 327EE4 E00025F4 00000000 */ nop -/* 327EE8 E00025F8 04610002 */ bgez $v1, .LE0002604 -/* 327EEC E00025FC 0060102D */ daddu $v0, $v1, $zero -/* 327EF0 E0002600 246200FF */ addiu $v0, $v1, 0xff -.LE0002604: -/* 327EF4 E0002604 00023A03 */ sra $a3, $v0, 8 -/* 327EF8 E0002608 00071200 */ sll $v0, $a3, 8 -/* 327EFC E000260C 00623823 */ subu $a3, $v1, $v0 -/* 327F00 E0002610 4600110D */ trunc.w.s $f4, $f2 -/* 327F04 E0002614 44022000 */ mfc1 $v0, $f4 -/* 327F08 E0002618 00000000 */ nop -/* 327F0C E000261C 00021080 */ sll $v0, $v0, 2 -/* 327F10 E0002620 00551021 */ addu $v0, $v0, $s5 -/* 327F14 E0002624 8C480000 */ lw $t0, ($v0) -/* 327F18 E0002628 3C06D838 */ lui $a2, 0xd838 -.LE000262C: -/* 327F1C E000262C 34C60002 */ ori $a2, $a2, 2 -/* 327F20 E0002630 3C02FA00 */ lui $v0, 0xfa00 -/* 327F24 E0002634 001118C0 */ sll $v1, $s1, 3 -/* 327F28 E0002638 8E640000 */ lw $a0, ($s3) -/* 327F2C E000263C 00711823 */ subu $v1, $v1, $s1 -/* 327F30 E0002640 0080282D */ daddu $a1, $a0, $zero -/* 327F34 E0002644 24840008 */ addiu $a0, $a0, 8 -/* 327F38 E0002648 AE640000 */ sw $a0, ($s3) -/* 327F3C E000264C ACA20000 */ sw $v0, ($a1) -/* 327F40 E0002650 00031100 */ sll $v0, $v1, 4 -/* 327F44 E0002654 00431023 */ subu $v0, $v0, $v1 -/* 327F48 E0002658 000210C2 */ srl $v0, $v0, 3 -/* 327F4C E000265C 304200FF */ andi $v0, $v0, 0xff -/* 327F50 E0002660 ACA20004 */ sw $v0, 4($a1) -/* 327F54 E0002664 24820008 */ addiu $v0, $a0, 8 -/* 327F58 E0002668 AE620000 */ sw $v0, ($s3) -/* 327F5C E000266C 3C02FB00 */ lui $v0, 0xfb00 -/* 327F60 E0002670 AC820000 */ sw $v0, ($a0) -/* 327F64 E0002674 30E200FF */ andi $v0, $a3, 0xff -/* 327F68 E0002678 AC820004 */ sw $v0, 4($a0) -/* 327F6C E000267C 24820010 */ addiu $v0, $a0, 0x10 -/* 327F70 E0002680 AE620000 */ sw $v0, ($s3) -/* 327F74 E0002684 3C02DE00 */ lui $v0, 0xde00 -/* 327F78 E0002688 AC820008 */ sw $v0, 8($a0) -/* 327F7C E000268C 24820018 */ addiu $v0, $a0, 0x18 -/* 327F80 E0002690 AC88000C */ sw $t0, 0xc($a0) -/* 327F84 E0002694 AE620000 */ sw $v0, ($s3) -/* 327F88 E0002698 24020040 */ addiu $v0, $zero, 0x40 -/* 327F8C E000269C AC860010 */ sw $a2, 0x10($a0) -/* 327F90 E00026A0 AC820014 */ sw $v0, 0x14($a0) -/* 327F94 E00026A4 26520001 */ addiu $s2, $s2, 1 -.LE00026A8: -/* 327F98 E00026A8 8FA90098 */ lw $t1, 0x98($sp) -/* 327F9C E00026AC 2610002C */ addiu $s0, $s0, 0x2c -/* 327FA0 E00026B0 8D220008 */ lw $v0, 8($t1) -/* 327FA4 E00026B4 0242102A */ slt $v0, $s2, $v0 -/* 327FA8 E00026B8 1440FF7B */ bnez $v0, .LE00024A8 -/* 327FAC E00026BC 2694002C */ addiu $s4, $s4, 0x2c -.LE00026C0: -/* 327FB0 E00026C0 3C03D838 */ lui $v1, 0xd838 -/* 327FB4 E00026C4 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* 327FB8 E00026C8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* 327FBC E00026CC 8C820000 */ lw $v0, ($a0) -/* 327FC0 E00026D0 34630002 */ ori $v1, $v1, 2 -/* 327FC4 E00026D4 0040282D */ daddu $a1, $v0, $zero -/* 327FC8 E00026D8 24420008 */ addiu $v0, $v0, 8 -/* 327FCC E00026DC AC820000 */ sw $v0, ($a0) -/* 327FD0 E00026E0 ACA30000 */ sw $v1, ($a1) -/* 327FD4 E00026E4 24030040 */ addiu $v1, $zero, 0x40 -/* 327FD8 E00026E8 ACA30004 */ sw $v1, 4($a1) -/* 327FDC E00026EC 24430008 */ addiu $v1, $v0, 8 -/* 327FE0 E00026F0 AC830000 */ sw $v1, ($a0) -/* 327FE4 E00026F4 3C03E700 */ lui $v1, 0xe700 -/* 327FE8 E00026F8 AC430000 */ sw $v1, ($v0) -/* 327FEC E00026FC AC400004 */ sw $zero, 4($v0) -/* 327FF0 E0002700 8FBF0084 */ lw $ra, 0x84($sp) -/* 327FF4 E0002704 8FBE0080 */ lw $fp, 0x80($sp) -/* 327FF8 E0002708 8FB7007C */ lw $s7, 0x7c($sp) -/* 327FFC E000270C 8FB60078 */ lw $s6, 0x78($sp) -/* 328000 E0002710 8FB50074 */ lw $s5, 0x74($sp) -/* 328004 E0002714 8FB40070 */ lw $s4, 0x70($sp) -/* 328008 E0002718 8FB3006C */ lw $s3, 0x6c($sp) -/* 32800C E000271C 8FB20068 */ lw $s2, 0x68($sp) -/* 328010 E0002720 8FB10064 */ lw $s1, 0x64($sp) -/* 328014 E0002724 8FB00060 */ lw $s0, 0x60($sp) -/* 328018 E0002728 D7B60090 */ ldc1 $f22, 0x90($sp) -/* 32801C E000272C D7B40088 */ ldc1 $f20, 0x88($sp) -/* 328020 E0002730 03E00008 */ jr $ra -/* 328024 E0002734 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/ver/us/asm/nonmatchings/effects/effect_1/fx_1_main.s b/ver/us/asm/nonmatchings/effects/effect_1/fx_1_main.s deleted file mode 100644 index b38d7806ec..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_1/fx_1_main.s +++ /dev/null @@ -1,117 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_1_main -/* 3278F0 E0002000 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 3278F4 E0002004 F7BA0060 */ sdc1 $f26, 0x60($sp) -/* 3278F8 E0002008 46006686 */ mov.s $f26, $f12 -/* 3278FC E000200C F7BC0068 */ sdc1 $f28, 0x68($sp) -/* 327900 E0002010 46007706 */ mov.s $f28, $f14 -/* 327904 E0002014 27A40010 */ addiu $a0, $sp, 0x10 -/* 327908 E0002018 F7BE0070 */ sdc1 $f30, 0x70($sp) -/* 32790C E000201C 4486F000 */ mtc1 $a2, $f30 -/* 327910 E0002020 3C02E000 */ lui $v0, %hi(func_E00021B4) -/* 327914 E0002024 244221B4 */ addiu $v0, $v0, %lo(func_E00021B4) -/* 327918 E0002028 AFA20018 */ sw $v0, 0x18($sp) -/* 32791C E000202C 3C02E000 */ lui $v0, %hi(func_E00021BC) -/* 327920 E0002030 244221BC */ addiu $v0, $v0, %lo(func_E00021BC) -/* 327924 E0002034 AFA2001C */ sw $v0, 0x1c($sp) -/* 327928 E0002038 3C02E000 */ lui $v0, %hi(func_E00022BC) -/* 32792C E000203C 244222BC */ addiu $v0, $v0, %lo(func_E00022BC) -/* 327930 E0002040 AFA20020 */ sw $v0, 0x20($sp) -/* 327934 E0002044 24020001 */ addiu $v0, $zero, 1 -/* 327938 E0002048 AFBF0044 */ sw $ra, 0x44($sp) -/* 32793C E000204C AFB60040 */ sw $s6, 0x40($sp) -/* 327940 E0002050 AFB5003C */ sw $s5, 0x3c($sp) -/* 327944 E0002054 AFB40038 */ sw $s4, 0x38($sp) -/* 327948 E0002058 AFB30034 */ sw $s3, 0x34($sp) -/* 32794C E000205C AFB20030 */ sw $s2, 0x30($sp) -/* 327950 E0002060 AFB1002C */ sw $s1, 0x2c($sp) -/* 327954 E0002064 AFB00028 */ sw $s0, 0x28($sp) -/* 327958 E0002068 F7B80058 */ sdc1 $f24, 0x58($sp) -/* 32795C E000206C F7B60050 */ sdc1 $f22, 0x50($sp) -/* 327960 E0002070 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 327964 E0002074 AFA00010 */ sw $zero, 0x10($sp) -/* 327968 E0002078 AFA00024 */ sw $zero, 0x24($sp) -/* 32796C E000207C 0C080124 */ jal func_E0200490 -/* 327970 E0002080 AFA20014 */ sw $v0, 0x14($sp) -/* 327974 E0002084 240401B8 */ addiu $a0, $zero, 0x1b8 -/* 327978 E0002088 2403000A */ addiu $v1, $zero, 0xa -/* 32797C E000208C 0040A82D */ daddu $s5, $v0, $zero -/* 327980 E0002090 0C08012C */ jal func_E02004B0 -/* 327984 E0002094 AEA30008 */ sw $v1, 8($s5) -/* 327988 E0002098 0040882D */ daddu $s1, $v0, $zero -/* 32798C E000209C 16200003 */ bnez $s1, .LE00020AC -/* 327990 E00020A0 AEB1000C */ sw $s1, 0xc($s5) -.LE00020A4: -/* 327994 E00020A4 08000829 */ j .LE00020A4 -/* 327998 E00020A8 00000000 */ nop -.LE00020AC: -/* 32799C E00020AC 8EA20008 */ lw $v0, 8($s5) -/* 3279A0 E00020B0 18400030 */ blez $v0, .LE0002174 -/* 3279A4 E00020B4 0000902D */ daddu $s2, $zero, $zero -/* 3279A8 E00020B8 24160004 */ addiu $s6, $zero, 4 -/* 3279AC E00020BC 3C0142B4 */ lui $at, 0x42b4 -/* 3279B0 E00020C0 4481C000 */ mtc1 $at, $f24 -/* 3279B4 E00020C4 26300024 */ addiu $s0, $s1, 0x24 -/* 3279B8 E00020C8 3C14E000 */ lui $s4, %hi(D_E0002788) -/* 3279BC E00020CC 26942788 */ addiu $s4, $s4, %lo(D_E0002788) -/* 3279C0 E00020D0 3C13E000 */ lui $s3, %hi(D_E0002760) -/* 3279C4 E00020D4 26732760 */ addiu $s3, $s3, %lo(D_E0002760) -.LE00020D8: -/* 3279C8 E00020D8 24040006 */ addiu $a0, $zero, 6 -/* 3279CC E00020DC 0C080000 */ jal func_E0200000 -/* 3279D0 E00020E0 A6200000 */ sh $zero, ($s1) -/* 3279D4 E00020E4 24420010 */ addiu $v0, $v0, 0x10 -/* 3279D8 E00020E8 A602FFE0 */ sh $v0, -0x20($s0) -/* 3279DC E00020EC A602FFDE */ sh $v0, -0x22($s0) -/* 3279E0 E00020F0 A616FFE2 */ sh $s6, -0x1e($s0) -/* 3279E4 E00020F4 AE00FFE4 */ sw $zero, -0x1c($s0) -/* 3279E8 E00020F8 E61AFFE8 */ swc1 $f26, -0x18($s0) -/* 3279EC E00020FC E61CFFEC */ swc1 $f28, -0x14($s0) -/* 3279F0 E0002100 E61EFFF0 */ swc1 $f30, -0x10($s0) -/* 3279F4 E0002104 AE00FFF4 */ sw $zero, -0xc($s0) -/* 3279F8 E0002108 AE00FFF8 */ sw $zero, -8($s0) -/* 3279FC E000210C C6760000 */ lwc1 $f22, ($s3) -/* 327A00 E0002110 C6940000 */ lwc1 $f20, ($s4) -/* 327A04 E0002114 4618B580 */ add.s $f22, $f22, $f24 -/* 327A08 E0002118 4600A521 */ cvt.d.s $f20, $f20 -/* 327A0C E000211C 4634A500 */ add.d $f20, $f20, $f20 -/* 327A10 E0002120 4600B306 */ mov.s $f12, $f22 -/* 327A14 E0002124 0C080140 */ jal func_E0200500 -/* 327A18 E0002128 4620A520 */ cvt.s.d $f20, $f20 -/* 327A1C E000212C 4600B306 */ mov.s $f12, $f22 -/* 327A20 E0002130 0C080144 */ jal func_E0200510 -/* 327A24 E0002134 46000586 */ mov.s $f22, $f0 -/* 327A28 E0002138 4616A582 */ mul.s $f22, $f20, $f22 -/* 327A2C E000213C 00000000 */ nop -/* 327A30 E0002140 26940004 */ addiu $s4, $s4, 4 -/* 327A34 E0002144 4600A507 */ neg.s $f20, $f20 -/* 327A38 E0002148 4600A502 */ mul.s $f20, $f20, $f0 -/* 327A3C E000214C 00000000 */ nop -/* 327A40 E0002150 26730004 */ addiu $s3, $s3, 4 -/* 327A44 E0002154 26520001 */ addiu $s2, $s2, 1 -/* 327A48 E0002158 2631002C */ addiu $s1, $s1, 0x2c -/* 327A4C E000215C E616FFFC */ swc1 $f22, -4($s0) -/* 327A50 E0002160 E6140000 */ swc1 $f20, ($s0) -/* 327A54 E0002164 8EA20008 */ lw $v0, 8($s5) -/* 327A58 E0002168 0242102A */ slt $v0, $s2, $v0 -/* 327A5C E000216C 1440FFDA */ bnez $v0, .LE00020D8 -/* 327A60 E0002170 2610002C */ addiu $s0, $s0, 0x2c -.LE0002174: -/* 327A64 E0002174 8FBF0044 */ lw $ra, 0x44($sp) -/* 327A68 E0002178 8FB60040 */ lw $s6, 0x40($sp) -/* 327A6C E000217C 8FB5003C */ lw $s5, 0x3c($sp) -/* 327A70 E0002180 8FB40038 */ lw $s4, 0x38($sp) -/* 327A74 E0002184 8FB30034 */ lw $s3, 0x34($sp) -/* 327A78 E0002188 8FB20030 */ lw $s2, 0x30($sp) -/* 327A7C E000218C 8FB1002C */ lw $s1, 0x2c($sp) -/* 327A80 E0002190 8FB00028 */ lw $s0, 0x28($sp) -/* 327A84 E0002194 D7BE0070 */ ldc1 $f30, 0x70($sp) -/* 327A88 E0002198 D7BC0068 */ ldc1 $f28, 0x68($sp) -/* 327A8C E000219C D7BA0060 */ ldc1 $f26, 0x60($sp) -/* 327A90 E00021A0 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 327A94 E00021A4 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 327A98 E00021A8 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 327A9C E00021AC 03E00008 */ jr $ra -/* 327AA0 E00021B0 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/effects/effect_10/func_E0014260.s b/ver/us/asm/nonmatchings/effects/effect_10/func_E0014260.s index b1d8bd1f3a..5cd1de2251 100644 --- a/ver/us/asm/nonmatchings/effects/effect_10/func_E0014260.s +++ b/ver/us/asm/nonmatchings/effects/effect_10/func_E0014260.s @@ -35,10 +35,10 @@ glabel func_E0014260 /* 32E760 E00142D0 C6000024 */ lwc1 $f0, 0x24($s0) /* 32E764 E00142D4 3C014140 */ lui $at, 0x4140 /* 32E768 E00142D8 44816000 */ mtc1 $at, $f12 -/* 32E76C E00142DC 0C08013C */ jal func_E02004F0 +/* 32E76C E00142DC 0C08013C */ jal shim_clamp_angle /* 32E770 E00142E0 460C0300 */ add.s $f12, $f0, $f12 /* 32E774 E00142E4 46000306 */ mov.s $f12, $f0 -/* 32E778 E00142E8 0C080140 */ jal func_E0200500 +/* 32E778 E00142E8 0C080140 */ jal shim_sin_deg /* 32E77C E00142EC E60C0024 */ swc1 $f12, 0x24($s0) /* 32E780 E00142F0 46000021 */ cvt.d.s $f0, $f0 /* 32E784 E00142F4 46340002 */ mul.d $f0, $f0, $f20 @@ -48,7 +48,7 @@ glabel func_E0014260 /* 32E794 E0014304 46201080 */ add.d $f2, $f2, $f0 /* 32E798 E0014308 C60C0024 */ lwc1 $f12, 0x24($s0) /* 32E79C E001430C 462010A0 */ cvt.s.d $f2, $f2 -/* 32E7A0 E0014310 0C080144 */ jal func_E0200510 +/* 32E7A0 E0014310 0C080144 */ jal shim_cos_deg /* 32E7A4 E0014314 E6020010 */ swc1 $f2, 0x10($s0) /* 32E7A8 E0014318 46000021 */ cvt.d.s $f0, $f0 /* 32E7AC E001431C 46340002 */ mul.d $f0, $f0, $f20 @@ -140,7 +140,7 @@ glabel func_E0014260 .LE0014468: /* 32E8F8 E0014468 16400003 */ bnez $s2, .LE0014478 /* 32E8FC E001446C 00000000 */ nop -/* 32E900 E0014470 0C080128 */ jal func_E02004A0 +/* 32E900 E0014470 0C080128 */ jal shim_remove_effect /* 32E904 E0014474 0280202D */ daddu $a0, $s4, $zero .LE0014478: /* 32E908 E0014478 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_10/func_E001449C.s b/ver/us/asm/nonmatchings/effects/effect_10/func_E001449C.s index f33e973fb6..52c55eda83 100644 --- a/ver/us/asm/nonmatchings/effects/effect_10/func_E001449C.s +++ b/ver/us/asm/nonmatchings/effects/effect_10/func_E001449C.s @@ -11,7 +11,7 @@ glabel func_E001449C /* 32E944 E00144B4 27A40010 */ addiu $a0, $sp, 0x10 /* 32E948 E00144B8 AFBF0020 */ sw $ra, 0x20($sp) /* 32E94C E00144BC AFA00014 */ sw $zero, 0x14($sp) -/* 32E950 E00144C0 0C080120 */ jal func_E0200480 +/* 32E950 E00144C0 0C080120 */ jal shim_queue_render_task /* 32E954 E00144C4 AFA20010 */ sw $v0, 0x10($sp) /* 32E958 E00144C8 8C430000 */ lw $v1, ($v0) /* 32E95C E00144CC 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_10/func_E00144E0.s b/ver/us/asm/nonmatchings/effects/effect_10/func_E00144E0.s index d6c433c04b..62ac03888f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_10/func_E00144E0.s +++ b/ver/us/asm/nonmatchings/effects/effect_10/func_E00144E0.s @@ -85,23 +85,23 @@ glabel func_E00144E0 /* 32EAAC E001461C E7A00018 */ swc1 $f0, 0x18($sp) /* 32EAB0 E0014620 C600000C */ lwc1 $f0, 0xc($s0) /* 32EAB4 E0014624 27A40020 */ addiu $a0, $sp, 0x20 -/* 32EAB8 E0014628 0C080180 */ jal func_E0200600 +/* 32EAB8 E0014628 0C080180 */ jal shim_guPositionF /* 32EABC E001462C E7A0001C */ swc1 $f0, 0x1c($sp) /* 32EAC0 E0014630 8E050010 */ lw $a1, 0x10($s0) /* 32EAC4 E0014634 8E060014 */ lw $a2, 0x14($s0) /* 32EAC8 E0014638 8E070018 */ lw $a3, 0x18($s0) -/* 32EACC E001463C 0C080110 */ jal func_E0200440 +/* 32EACC E001463C 0C080110 */ jal shim_guScaleF /* 32EAD0 E0014640 02A0202D */ daddu $a0, $s5, $zero /* 32EAD4 E0014644 02A0202D */ daddu $a0, $s5, $zero /* 32EAD8 E0014648 27A50020 */ addiu $a1, $sp, 0x20 -/* 32EADC E001464C 0C080114 */ jal func_E0200450 +/* 32EADC E001464C 0C080114 */ jal shim_guMtxCatF /* 32EAE0 E0014650 00A0302D */ daddu $a2, $a1, $zero /* 32EAE4 E0014654 27A40020 */ addiu $a0, $sp, 0x20 /* 32EAE8 E0014658 96E50000 */ lhu $a1, ($s7) /* 32EAEC E001465C 8FC20000 */ lw $v0, ($fp) /* 32EAF0 E0014660 00052980 */ sll $a1, $a1, 6 /* 32EAF4 E0014664 00B42821 */ addu $a1, $a1, $s4 -/* 32EAF8 E0014668 0C080118 */ jal func_E0200460 +/* 32EAF8 E0014668 0C080118 */ jal shim_guMtxF2L /* 32EAFC E001466C 00452821 */ addu $a1, $v0, $a1 /* 32EB00 E0014670 3C077060 */ lui $a3, 0x7060 /* 32EB04 E0014674 34E71800 */ ori $a3, $a3, 0x1800 diff --git a/ver/us/asm/nonmatchings/effects/effect_10/fx_10_main.s b/ver/us/asm/nonmatchings/effects/effect_10/fx_10_main.s index d9f0e66596..c3c2800681 100644 --- a/ver/us/asm/nonmatchings/effects/effect_10/fx_10_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_10/fx_10_main.s @@ -32,12 +32,12 @@ glabel fx_10_main /* 32E4FC E001406C AFA7007C */ sw $a3, 0x7c($sp) /* 32E500 E0014070 AFA00010 */ sw $zero, 0x10($sp) /* 32E504 E0014074 AFA00024 */ sw $zero, 0x24($sp) -/* 32E508 E0014078 0C080124 */ jal func_E0200490 +/* 32E508 E0014078 0C080124 */ jal shim_create_effect_instance /* 32E50C E001407C AFA20014 */ sw $v0, 0x14($sp) /* 32E510 E0014080 24040260 */ addiu $a0, $zero, 0x260 /* 32E514 E0014084 24140008 */ addiu $s4, $zero, 8 /* 32E518 E0014088 0040802D */ daddu $s0, $v0, $zero -/* 32E51C E001408C 0C08012C */ jal func_E02004B0 +/* 32E51C E001408C 0C08012C */ jal shim_general_heap_malloc /* 32E520 E0014090 AE140008 */ sw $s4, 8($s0) /* 32E524 E0014094 0040882D */ daddu $s1, $v0, $zero /* 32E528 E0014098 16200003 */ bnez $s1, .LE00140A8 @@ -51,7 +51,7 @@ glabel fx_10_main /* 32E540 E00140B0 00B42821 */ addu $a1, $a1, $s4 /* 32E544 E00140B4 00052880 */ sll $a1, $a1, 2 /* 32E548 E00140B8 00B42823 */ subu $a1, $a1, $s4 -/* 32E54C E00140BC 0C080130 */ jal func_E02004C0 +/* 32E54C E00140BC 0C080130 */ jal shim_mem_clear /* 32E550 E00140C0 00052880 */ sll $a1, $a1, 2 /* 32E554 E00140C4 12800056 */ beqz $s4, .LE0014220 /* 32E558 E00140C8 0000902D */ daddu $s2, $zero, $zero @@ -73,7 +73,7 @@ glabel fx_10_main /* 32E594 E0014104 E618FFD0 */ swc1 $f24, -0x30($s0) /* 32E598 E0014108 E618FFD4 */ swc1 $f24, -0x2c($s0) /* 32E59C E001410C E618FFD8 */ swc1 $f24, -0x28($s0) -/* 32E5A0 E0014110 0C080138 */ jal func_E02004E0 +/* 32E5A0 E0014110 0C080138 */ jal shim_rand_int /* 32E5A4 E0014114 A202FFC0 */ sb $v0, -0x40($s0) /* 32E5A8 E0014118 44820000 */ mtc1 $v0, $f0 /* 32E5AC E001411C 00000000 */ nop @@ -87,7 +87,7 @@ glabel fx_10_main /* 32E5CC E001413C 46220000 */ add.d $f0, $f0, $f2 /* 32E5D0 E0014140 2404000A */ addiu $a0, $zero, 0xa /* 32E5D4 E0014144 46200020 */ cvt.s.d $f0, $f0 -/* 32E5D8 E0014148 0C080138 */ jal func_E02004E0 +/* 32E5D8 E0014148 0C080138 */ jal shim_rand_int /* 32E5DC E001414C E600FFDC */ swc1 $f0, -0x24($s0) /* 32E5E0 E0014150 44820000 */ mtc1 $v0, $f0 /* 32E5E4 E0014154 00000000 */ nop @@ -129,13 +129,13 @@ glabel fx_10_main /* 32E674 E00141E4 E600FFEC */ swc1 $f0, -0x14($s0) /* 32E678 E00141E8 E602FFF0 */ swc1 $f2, -0x10($s0) /* 32E67C E00141EC E604FFF4 */ swc1 $f4, -0xc($s0) -/* 32E680 E00141F0 0C08013C */ jal func_E02004F0 +/* 32E680 E00141F0 0C08013C */ jal shim_clamp_angle /* 32E684 E00141F4 E606FFE8 */ swc1 $f6, -0x18($s0) /* 32E688 E00141F8 46000506 */ mov.s $f20, $f0 -/* 32E68C E00141FC 0C080140 */ jal func_E0200500 +/* 32E68C E00141FC 0C080140 */ jal shim_sin_deg /* 32E690 E0014200 4600A306 */ mov.s $f12, $f20 /* 32E694 E0014204 4600A306 */ mov.s $f12, $f20 -/* 32E698 E0014208 0C080144 */ jal func_E0200510 +/* 32E698 E0014208 0C080144 */ jal shim_cos_deg /* 32E69C E001420C E600FFFC */ swc1 $f0, -4($s0) /* 32E6A0 E0014210 E6000000 */ swc1 $f0, ($s0) /* 32E6A4 E0014214 0254102A */ slt $v0, $s2, $s4 diff --git a/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8220.s b/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8220.s index 9ba8ccd9ab..5652c24b63 100644 --- a/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8220.s +++ b/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8220.s @@ -25,7 +25,7 @@ glabel func_E00C8220 /* 3CF608 E00C8268 24420001 */ addiu $v0, $v0, 1 /* 3CF60C E00C826C 04610005 */ bgez $v1, .LE00C8284 /* 3CF610 E00C8270 ACA2002C */ sw $v0, 0x2c($a1) -/* 3CF614 E00C8274 0C080128 */ jal func_E02004A0 +/* 3CF614 E00C8274 0C080128 */ jal shim_remove_effect /* 3CF618 E00C8278 00000000 */ nop /* 3CF61C E00C827C 080320FE */ j .LE00C83F8 /* 3CF620 E00C8280 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8404.s b/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8404.s index f7f0f59c09..1add794454 100644 --- a/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8404.s +++ b/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8404.s @@ -12,7 +12,7 @@ glabel func_E00C8404 /* 3CF7C0 E00C8420 AFA40018 */ sw $a0, 0x18($sp) /* 3CF7C4 E00C8424 27A40010 */ addiu $a0, $sp, 0x10 /* 3CF7C8 E00C8428 AFBF0020 */ sw $ra, 0x20($sp) -/* 3CF7CC E00C842C 0C080120 */ jal func_E0200480 +/* 3CF7CC E00C842C 0C080120 */ jal shim_queue_render_task /* 3CF7D0 E00C8430 AFA20010 */ sw $v0, 0x10($sp) /* 3CF7D4 E00C8434 8C430000 */ lw $v1, ($v0) /* 3CF7D8 E00C8438 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8454.s b/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8454.s index f6d8a02e89..23f0922e58 100644 --- a/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8454.s +++ b/ver/us/asm/nonmatchings/effects/effect_100/func_E00C8454.s @@ -58,7 +58,7 @@ glabel func_E00C8454 /* 3CF8C8 E00C8528 02228821 */ addu $s1, $s1, $v0 /* 3CF8CC E00C852C 001188C0 */ sll $s1, $s1, 3 /* 3CF8D0 E00C8530 02238821 */ addu $s1, $s1, $v1 -/* 3CF8D4 E00C8534 0C080108 */ jal func_E0200420 +/* 3CF8D4 E00C8534 0C080108 */ jal shim_guTranslateF /* 3CF8D8 E00C8538 4620A520 */ cvt.s.d $f20, $f20 /* 3CF8DC E00C853C C6400058 */ lwc1 $f0, 0x58($s2) /* 3CF8E0 E00C8540 4600A002 */ mul.s $f0, $f20, $f0 @@ -71,11 +71,11 @@ glabel func_E00C8454 /* 3CF8FC E00C855C 27B00058 */ addiu $s0, $sp, 0x58 /* 3CF900 E00C8560 4407A000 */ mfc1 $a3, $f20 /* 3CF904 E00C8564 44060000 */ mfc1 $a2, $f0 -/* 3CF908 E00C8568 0C080110 */ jal func_E0200440 +/* 3CF908 E00C8568 0C080110 */ jal shim_guScaleF /* 3CF90C E00C856C 0200202D */ daddu $a0, $s0, $zero /* 3CF910 E00C8570 0200202D */ daddu $a0, $s0, $zero /* 3CF914 E00C8574 27A50018 */ addiu $a1, $sp, 0x18 -/* 3CF918 E00C8578 0C080114 */ jal func_E0200450 +/* 3CF918 E00C8578 0C080114 */ jal shim_guMtxCatF /* 3CF91C E00C857C 00A0302D */ daddu $a2, $a1, $zero /* 3CF920 E00C8580 3C013F80 */ lui $at, 0x3f80 /* 3CF924 E00C8584 44810000 */ mtc1 $at, $f0 @@ -85,11 +85,11 @@ glabel func_E00C8454 /* 3CF934 E00C8594 0200202D */ daddu $a0, $s0, $zero /* 3CF938 E00C8598 44060000 */ mfc1 $a2, $f0 /* 3CF93C E00C859C 8E450050 */ lw $a1, 0x50($s2) -/* 3CF940 E00C85A0 0C080104 */ jal func_E0200410 +/* 3CF940 E00C85A0 0C080104 */ jal shim_guRotateF /* 3CF944 E00C85A4 00C0382D */ daddu $a3, $a2, $zero /* 3CF948 E00C85A8 0200202D */ daddu $a0, $s0, $zero /* 3CF94C E00C85AC 27A50018 */ addiu $a1, $sp, 0x18 -/* 3CF950 E00C85B0 0C080114 */ jal func_E0200450 +/* 3CF950 E00C85B0 0C080114 */ jal shim_guMtxCatF /* 3CF954 E00C85B4 00A0302D */ daddu $a2, $a1, $zero /* 3CF958 E00C85B8 27A40018 */ addiu $a0, $sp, 0x18 /* 3CF95C E00C85BC 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -100,7 +100,7 @@ glabel func_E00C8454 /* 3CF970 E00C85D0 8E820000 */ lw $v0, ($s4) /* 3CF974 E00C85D4 00052980 */ sll $a1, $a1, 6 /* 3CF978 E00C85D8 00B72821 */ addu $a1, $a1, $s7 -/* 3CF97C E00C85DC 0C080118 */ jal func_E0200460 +/* 3CF97C E00C85DC 0C080118 */ jal shim_guMtxF2L /* 3CF980 E00C85E0 00452821 */ addu $a1, $v0, $a1 /* 3CF984 E00C85E4 3C03DA38 */ lui $v1, 0xda38 /* 3CF988 E00C85E8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_100/fx_100_main.s b/ver/us/asm/nonmatchings/effects/effect_100/fx_100_main.s index 800845732b..a437123fea 100644 --- a/ver/us/asm/nonmatchings/effects/effect_100/fx_100_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_100/fx_100_main.s @@ -35,12 +35,12 @@ glabel fx_100_main /* 3CF418 E00C8078 AFB00028 */ sw $s0, 0x28($sp) /* 3CF41C E00C807C AFA00010 */ sw $zero, 0x10($sp) /* 3CF420 E00C8080 AFA00024 */ sw $zero, 0x24($sp) -/* 3CF424 E00C8084 0C080124 */ jal func_E0200490 +/* 3CF424 E00C8084 0C080124 */ jal shim_create_effect_instance /* 3CF428 E00C8088 AFA20014 */ sw $v0, 0x14($sp) /* 3CF42C E00C808C 2404006C */ addiu $a0, $zero, 0x6c /* 3CF430 E00C8090 24030001 */ addiu $v1, $zero, 1 /* 3CF434 E00C8094 0040902D */ daddu $s2, $v0, $zero -/* 3CF438 E00C8098 0C08012C */ jal func_E02004B0 +/* 3CF438 E00C8098 0C08012C */ jal shim_general_heap_malloc /* 3CF43C E00C809C AE430008 */ sw $v1, 8($s2) /* 3CF440 E00C80A0 0040802D */ daddu $s0, $v0, $zero /* 3CF444 E00C80A4 16000003 */ bnez $s0, .LE00C80B4 @@ -109,13 +109,13 @@ glabel fx_100_main /* 3CF528 E00C8188 AE020034 */ sw $v0, 0x34($s0) /* 3CF52C E00C818C 24020078 */ addiu $v0, $zero, 0x78 /* 3CF530 E00C8190 AE020038 */ sw $v0, 0x38($s0) -/* 3CF534 E00C8194 0C080138 */ jal func_E02004E0 +/* 3CF534 E00C8194 0C080138 */ jal shim_rand_int /* 3CF538 E00C8198 E6000040 */ swc1 $f0, 0x40($s0) /* 3CF53C E00C819C 2404000A */ addiu $a0, $zero, 0xa /* 3CF540 E00C81A0 44820000 */ mtc1 $v0, $f0 /* 3CF544 E00C81A4 00000000 */ nop /* 3CF548 E00C81A8 46800020 */ cvt.s.w $f0, $f0 -/* 3CF54C E00C81AC 0C080138 */ jal func_E02004E0 +/* 3CF54C E00C81AC 0C080138 */ jal shim_rand_int /* 3CF550 E00C81B0 E6000050 */ swc1 $f0, 0x50($s0) /* 3CF554 E00C81B4 24430005 */ addiu $v1, $v0, 5 /* 3CF558 E00C81B8 0240102D */ daddu $v0, $s2, $zero diff --git a/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA248.s b/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA248.s index b81c5735e6..15b6d1343b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA248.s +++ b/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA248.s @@ -29,7 +29,7 @@ glabel func_E00CA248 /* 3D07A0 E00CA2A0 24420001 */ addiu $v0, $v0, 1 /* 3D07A4 E00CA2A4 04610005 */ bgez $v1, .LE00CA2BC /* 3D07A8 E00CA2A8 AE020014 */ sw $v0, 0x14($s0) -/* 3D07AC E00CA2AC 0C080128 */ jal func_E02004A0 +/* 3D07AC E00CA2AC 0C080128 */ jal shim_remove_effect /* 3D07B0 E00CA2B0 00000000 */ nop /* 3D07B4 E00CA2B4 0803291B */ j .LE00CA46C /* 3D07B8 E00CA2B8 00000000 */ nop @@ -43,7 +43,7 @@ glabel func_E00CA248 /* 3D07D0 E00CA2D0 24020003 */ addiu $v0, $zero, 3 /* 3D07D4 E00CA2D4 14A20020 */ bne $a1, $v0, .LE00CA358 /* 3D07D8 E00CA2D8 3C028888 */ lui $v0, %hi(D_8887FFFB) -/* 3D07DC E00CA2DC 0C080138 */ jal func_E02004E0 +/* 3D07DC E00CA2DC 0C080138 */ jal shim_rand_int /* 3D07E0 E00CA2E0 2404000A */ addiu $a0, $zero, 0xa /* 3D07E4 E00CA2E4 2442FFFB */ addiu $v0, $v0, %lo(D_8887FFFB) /* 3D07E8 E00CA2E8 C6000044 */ lwc1 $f0, 0x44($s0) @@ -52,7 +52,7 @@ glabel func_E00CA248 /* 3D07F4 E00CA2F4 468010A0 */ cvt.s.w $f2, $f2 /* 3D07F8 E00CA2F8 46020000 */ add.s $f0, $f0, $f2 /* 3D07FC E00CA2FC 2404000A */ addiu $a0, $zero, 0xa -/* 3D0800 E00CA300 0C080138 */ jal func_E02004E0 +/* 3D0800 E00CA300 0C080138 */ jal shim_rand_int /* 3D0804 E00CA304 E6000044 */ swc1 $f0, 0x44($s0) /* 3D0808 E00CA308 2442FFFB */ addiu $v0, $v0, -5 /* 3D080C E00CA30C 44820000 */ mtc1 $v0, $f0 @@ -141,7 +141,7 @@ glabel func_E00CA248 /* 3D094C E00CA44C 00000000 */ nop /* 3D0950 E00CA450 45010004 */ bc1t .LE00CA464 /* 3D0954 E00CA454 AE1101B8 */ sw $s1, 0x1b8($s0) -/* 3D0958 E00CA458 0C080154 */ jal func_E0200550 +/* 3D0958 E00CA458 0C080154 */ jal shim_sqrtf /* 3D095C E00CA45C 00000000 */ nop /* 3D0960 E00CA460 46000306 */ mov.s $f12, $f0 .LE00CA464: diff --git a/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA484.s b/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA484.s index 7e35db30e3..4025bf4f09 100644 --- a/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA484.s +++ b/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA484.s @@ -12,7 +12,7 @@ glabel func_E00CA484 /* 3D09A0 E00CA4A0 AFA40018 */ sw $a0, 0x18($sp) /* 3D09A4 E00CA4A4 27A40010 */ addiu $a0, $sp, 0x10 /* 3D09A8 E00CA4A8 AFBF0020 */ sw $ra, 0x20($sp) -/* 3D09AC E00CA4AC 0C080120 */ jal func_E0200480 +/* 3D09AC E00CA4AC 0C080120 */ jal shim_queue_render_task /* 3D09B0 E00CA4B0 AFA20010 */ sw $v0, 0x10($sp) /* 3D09B4 E00CA4B4 8C430000 */ lw $v1, ($v0) /* 3D09B8 E00CA4B8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA4CC.s b/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA4CC.s index 21826cb24b..62b1d1c1c6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA4CC.s +++ b/ver/us/asm/nonmatchings/effects/effect_101/func_E00CA4CC.s @@ -53,7 +53,7 @@ glabel func_E00CA4CC /* 3D0A8C E00CA58C 8C62001C */ lw $v0, 0x1c($v1) /* 3D0A90 E00CA590 3C038000 */ lui $v1, 0x8000 /* 3D0A94 E00CA594 00431021 */ addu $v0, $v0, $v1 -/* 3D0A98 E00CA598 0C080108 */ jal func_E0200420 +/* 3D0A98 E00CA598 0C080108 */ jal shim_guTranslateF /* 3D0A9C E00CA59C AD020004 */ sw $v0, 4($t0) /* 3D0AA0 E00CA5A0 27A40010 */ addiu $a0, $sp, 0x10 /* 3D0AA4 E00CA5A4 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -64,7 +64,7 @@ glabel func_E00CA4CC /* 3D0AB8 E00CA5B8 8E220000 */ lw $v0, ($s1) /* 3D0ABC E00CA5BC 00052980 */ sll $a1, $a1, 6 /* 3D0AC0 E00CA5C0 00B22821 */ addu $a1, $a1, $s2 -/* 3D0AC4 E00CA5C4 0C080118 */ jal func_E0200460 +/* 3D0AC4 E00CA5C4 0C080118 */ jal shim_guMtxF2L /* 3D0AC8 E00CA5C8 00452821 */ addu $a1, $v0, $a1 /* 3D0ACC E00CA5CC 3C03DA38 */ lui $v1, 0xda38 /* 3D0AD0 E00CA5D0 34630002 */ ori $v1, $v1, 2 @@ -212,7 +212,7 @@ glabel func_E00CA4CC /* 3D0CF0 E00CA7F0 44856000 */ mtc1 $a1, $f12 /* 3D0CF4 E00CA7F4 00000000 */ nop /* 3D0CF8 E00CA7F8 46806320 */ cvt.s.w $f12, $f12 -/* 3D0CFC E00CA7FC 0C080140 */ jal func_E0200500 +/* 3D0CFC E00CA7FC 0C080140 */ jal shim_sin_deg /* 3D0D00 E00CA800 00829823 */ subu $s3, $a0, $v0 /* 3D0D04 E00CA804 3C01437F */ lui $at, 0x437f /* 3D0D08 E00CA808 44811000 */ mtc1 $at, $f2 @@ -249,7 +249,7 @@ glabel func_E00CA4CC /* 3D0D7C E00CA87C C44E0050 */ lwc1 $f14, 0x50($v0) /* 3D0D80 E00CA880 46000007 */ neg.s $f0, $f0 /* 3D0D84 E00CA884 44070000 */ mfc1 $a3, $f0 -/* 3D0D88 E00CA888 0C080148 */ jal func_E0200520 +/* 3D0D88 E00CA888 0C080148 */ jal shim_atan2 /* 3D0D8C E00CA88C 46007387 */ neg.s $f14, $f14 /* 3D0D90 E00CA890 08032A63 */ j .LE00CA98C /* 3D0D94 E00CA894 46000787 */ neg.s $f30, $f0 @@ -272,7 +272,7 @@ glabel func_E00CA4CC /* 3D0DCC E00CA8CC C44E0050 */ lwc1 $f14, 0x50($v0) /* 3D0DD0 E00CA8D0 46000007 */ neg.s $f0, $f0 /* 3D0DD4 E00CA8D4 44070000 */ mfc1 $a3, $f0 -/* 3D0DD8 E00CA8D8 0C080148 */ jal func_E0200520 +/* 3D0DD8 E00CA8D8 0C080148 */ jal shim_atan2 /* 3D0DDC E00CA8DC 46007387 */ neg.s $f14, $f14 /* 3D0DE0 E00CA8E0 00111080 */ sll $v0, $s1, 2 /* 3D0DE4 E00CA8E4 02C21021 */ addu $v0, $s6, $v0 @@ -283,7 +283,7 @@ glabel func_E00CA4CC /* 3D0DF8 E00CA8F8 C60E0050 */ lwc1 $f14, 0x50($s0) /* 3D0DFC E00CA8FC 46000007 */ neg.s $f0, $f0 /* 3D0E00 E00CA900 44070000 */ mfc1 $a3, $f0 -/* 3D0E04 E00CA904 0C080148 */ jal func_E0200520 +/* 3D0E04 E00CA904 0C080148 */ jal shim_atan2 /* 3D0E08 E00CA908 46007387 */ neg.s $f14, $f14 /* 3D0E0C E00CA90C 46000307 */ neg.s $f12, $f0 /* 3D0E10 E00CA910 46146081 */ sub.s $f2, $f12, $f20 @@ -336,7 +336,7 @@ glabel func_E00CA4CC /* 3D0EBC E00CA9BC 44826000 */ mtc1 $v0, $f12 /* 3D0EC0 E00CA9C0 00000000 */ nop /* 3D0EC4 E00CA9C4 46806320 */ cvt.s.w $f12, $f12 -/* 3D0EC8 E00CA9C8 0C080140 */ jal func_E0200500 +/* 3D0EC8 E00CA9C8 0C080140 */ jal shim_sin_deg /* 3D0ECC E00CA9CC 01638823 */ subu $s1, $t3, $v1 /* 3D0ED0 E00CA9D0 3C014040 */ lui $at, 0x4040 /* 3D0ED4 E00CA9D4 44811000 */ mtc1 $at, $f2 @@ -410,11 +410,11 @@ glabel func_E00CA4CC /* 3D0FE4 E00CAAE4 0220802D */ daddu $s0, $s1, $zero /* 3D0FE8 E00CAAE8 0220982D */ daddu $s3, $s1, $zero .LE00CAAEC: -/* 3D0FEC E00CAAEC 0C080140 */ jal func_E0200500 +/* 3D0FEC E00CAAEC 0C080140 */ jal shim_sin_deg /* 3D0FF0 E00CAAF0 4600F306 */ mov.s $f12, $f30 /* 3D0FF4 E00CAAF4 4600B502 */ mul.s $f20, $f22, $f0 /* 3D0FF8 E00CAAF8 00000000 */ nop -/* 3D0FFC E00CAAFC 0C080144 */ jal func_E0200510 +/* 3D0FFC E00CAAFC 0C080144 */ jal shim_cos_deg /* 3D1000 E00CAB00 4600F306 */ mov.s $f12, $f30 /* 3D1004 E00CAB04 4600B002 */ mul.s $f0, $f22, $f0 /* 3D1008 E00CAB08 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_101/fx_101_main.s b/ver/us/asm/nonmatchings/effects/effect_101/fx_101_main.s index 69afcded93..8993512abf 100644 --- a/ver/us/asm/nonmatchings/effects/effect_101/fx_101_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_101/fx_101_main.s @@ -29,12 +29,12 @@ glabel fx_101_main /* 3D0560 E00CA060 AFB00028 */ sw $s0, 0x28($sp) /* 3D0564 E00CA064 AFA00010 */ sw $zero, 0x10($sp) /* 3D0568 E00CA068 AFA00024 */ sw $zero, 0x24($sp) -/* 3D056C E00CA06C 0C080124 */ jal func_E0200490 +/* 3D056C E00CA06C 0C080124 */ jal shim_create_effect_instance /* 3D0570 E00CA070 AFA20014 */ sw $v0, 0x14($sp) /* 3D0574 E00CA074 24040324 */ addiu $a0, $zero, 0x324 /* 3D0578 E00CA078 24030001 */ addiu $v1, $zero, 1 /* 3D057C E00CA07C 0040902D */ daddu $s2, $v0, $zero -/* 3D0580 E00CA080 0C08012C */ jal func_E02004B0 +/* 3D0580 E00CA080 0C08012C */ jal shim_general_heap_malloc /* 3D0584 E00CA084 AE430008 */ sw $v1, 8($s2) /* 3D0588 E00CA088 0040802D */ daddu $s0, $v0, $zero /* 3D058C E00CA08C 16000003 */ bnez $s0, .LE00CA09C @@ -140,7 +140,7 @@ glabel fx_101_main /* 3D06E4 E00CA1E4 E6180140 */ swc1 $f24, 0x140($s0) /* 3D06E8 E00CA1E8 AE020230 */ sw $v0, 0x230($s0) /* 3D06EC E00CA1EC AE0001B8 */ sw $zero, 0x1b8($s0) -/* 3D06F0 E00CA1F0 0C080138 */ jal func_E02004E0 +/* 3D06F0 E00CA1F0 0C080138 */ jal shim_rand_int /* 3D06F4 E00CA1F4 AE0002AC */ sw $zero, 0x2ac($s0) /* 3D06F8 E00CA1F8 2443000A */ addiu $v1, $v0, 0xa /* 3D06FC E00CA1FC 0240102D */ daddu $v0, $s2, $zero diff --git a/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC258.s b/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC258.s index 7430a9b3de..14d07d9741 100644 --- a/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC258.s +++ b/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC258.s @@ -41,7 +41,7 @@ glabel func_E00CC258 /* 3D1970 E00CC2E0 24420001 */ addiu $v0, $v0, 1 /* 3D1974 E00CC2E4 04610005 */ bgez $v1, .LE00CC2FC /* 3D1978 E00CC2E8 AE420014 */ sw $v0, 0x14($s2) -/* 3D197C E00CC2EC 0C080128 */ jal func_E02004A0 +/* 3D197C E00CC2EC 0C080128 */ jal shim_remove_effect /* 3D1980 E00CC2F0 00000000 */ nop /* 3D1984 E00CC2F4 0803324E */ j .LE00CC938 /* 3D1988 E00CC2F8 00000000 */ nop @@ -273,7 +273,7 @@ glabel LE00CC614_3D1CA4 /* 3D1CE4 E00CC654 44826000 */ mtc1 $v0, $f12 /* 3D1CE8 E00CC658 00000000 */ nop /* 3D1CEC E00CC65C 46806320 */ cvt.s.w $f12, $f12 -/* 3D1CF0 E00CC660 0C080144 */ jal func_E0200510 +/* 3D1CF0 E00CC660 0C080144 */ jal shim_cos_deg /* 3D1CF4 E00CC664 462005A0 */ cvt.s.d $f22, $f0 /* 3D1CF8 E00CC668 4616E081 */ sub.s $f2, $f28, $f22 /* 3D1CFC E00CC66C 3C014487 */ lui $at, 0x4487 @@ -297,10 +297,10 @@ glabel LE00CC614_3D1CA4 /* 3D1D44 E00CC6B4 4680A521 */ cvt.d.w $f20, $f20 /* 3D1D48 E00CC6B8 4622A500 */ add.d $f20, $f20, $f2 /* 3D1D4C E00CC6BC 4620A520 */ cvt.s.d $f20, $f20 -/* 3D1D50 E00CC6C0 0C080140 */ jal func_E0200500 +/* 3D1D50 E00CC6C0 0C080140 */ jal shim_sin_deg /* 3D1D54 E00CC6C4 4600A306 */ mov.s $f12, $f20 /* 3D1D58 E00CC6C8 4600A306 */ mov.s $f12, $f20 -/* 3D1D5C E00CC6CC 0C080144 */ jal func_E0200510 +/* 3D1D5C E00CC6CC 0C080144 */ jal shim_cos_deg /* 3D1D60 E00CC6D0 46000506 */ mov.s $f20, $f0 /* 3D1D64 E00CC6D4 3C014170 */ lui $at, 0x4170 /* 3D1D68 E00CC6D8 44811000 */ mtc1 $at, $f2 @@ -409,23 +409,23 @@ glabel LE00CC790_3D1E20 /* 3D1EF8 E00CC868 08033248 */ j LE00CC920_3D1FB0 /* 3D1EFC E00CC86C E6200478 */ swc1 $f0, 0x478($s1) glabel LE00CC870_3D1F00 -/* 3D1F00 E00CC870 0C080150 */ jal func_E0200540 +/* 3D1F00 E00CC870 0C080150 */ jal shim_load_effect /* 3D1F04 E00CC874 24040069 */ addiu $a0, $zero, 0x69 /* 3D1F08 E00CC878 E7BE0010 */ swc1 $f30, 0x10($sp) /* 3D1F0C E00CC87C 8E2504DC */ lw $a1, 0x4dc($s1) /* 3D1F10 E00CC880 4406F000 */ mfc1 $a2, $f30 /* 3D1F14 E00CC884 4407E000 */ mfc1 $a3, $f28 -/* 3D1F18 E00CC888 0C080104 */ jal func_E0200410 +/* 3D1F18 E00CC888 0C080104 */ jal shim_guRotateF /* 3D1F1C E00CC88C 27A40018 */ addiu $a0, $sp, 0x18 /* 3D1F20 E00CC890 27B00058 */ addiu $s0, $sp, 0x58 /* 3D1F24 E00CC894 8E25002C */ lw $a1, 0x2c($s1) /* 3D1F28 E00CC898 8E260090 */ lw $a2, 0x90($s1) /* 3D1F2C E00CC89C 8E2700F4 */ lw $a3, 0xf4($s1) -/* 3D1F30 E00CC8A0 0C080108 */ jal func_E0200420 +/* 3D1F30 E00CC8A0 0C080108 */ jal shim_guTranslateF /* 3D1F34 E00CC8A4 0200202D */ daddu $a0, $s0, $zero /* 3D1F38 E00CC8A8 0200202D */ daddu $a0, $s0, $zero /* 3D1F3C E00CC8AC 27A50018 */ addiu $a1, $sp, 0x18 -/* 3D1F40 E00CC8B0 0C080114 */ jal func_E0200450 +/* 3D1F40 E00CC8B0 0C080114 */ jal shim_guMtxCatF /* 3D1F44 E00CC8B4 00A0302D */ daddu $a2, $a1, $zero /* 3D1F48 E00CC8B8 C6420004 */ lwc1 $f2, 4($s2) /* 3D1F4C E00CC8BC C7A00048 */ lwc1 $f0, 0x48($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC980.s b/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC980.s index b7b41d6d1e..27a35c468c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC980.s +++ b/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC980.s @@ -12,7 +12,7 @@ glabel func_E00CC980 /* 3D202C E00CC99C AFA40018 */ sw $a0, 0x18($sp) /* 3D2030 E00CC9A0 27A40010 */ addiu $a0, $sp, 0x10 /* 3D2034 E00CC9A4 AFBF0020 */ sw $ra, 0x20($sp) -/* 3D2038 E00CC9A8 0C080120 */ jal func_E0200480 +/* 3D2038 E00CC9A8 0C080120 */ jal shim_queue_render_task /* 3D203C E00CC9AC AFA20010 */ sw $v0, 0x10($sp) /* 3D2040 E00CC9B0 8C430000 */ lw $v1, ($v0) /* 3D2044 E00CC9B4 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC9D0.s b/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC9D0.s index 88569005f9..c63d6159d0 100644 --- a/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC9D0.s +++ b/ver/us/asm/nonmatchings/effects/effect_102/func_E00CC9D0.s @@ -71,23 +71,23 @@ glabel func_E00CC9D0 /* 3D2168 E00CCAD8 00431021 */ addu $v0, $v0, $v1 /* 3D216C E00CCADC 000210C0 */ sll $v0, $v0, 3 /* 3D2170 E00CCAE0 00481021 */ addu $v0, $v0, $t0 -/* 3D2174 E00CCAE4 0C080108 */ jal func_E0200420 +/* 3D2174 E00CCAE4 0C080108 */ jal shim_guTranslateF /* 3D2178 E00CCAE8 AFA20098 */ sw $v0, 0x98($sp) /* 3D217C E00CCAEC 8E450028 */ lw $a1, 0x28($s2) /* 3D2180 E00CCAF0 0260202D */ daddu $a0, $s3, $zero /* 3D2184 E00CCAF4 00A0302D */ daddu $a2, $a1, $zero -/* 3D2188 E00CCAF8 0C080110 */ jal func_E0200440 +/* 3D2188 E00CCAF8 0C080110 */ jal shim_guScaleF /* 3D218C E00CCAFC 00A0382D */ daddu $a3, $a1, $zero /* 3D2190 E00CCB00 0260202D */ daddu $a0, $s3, $zero /* 3D2194 E00CCB04 27A50018 */ addiu $a1, $sp, 0x18 -/* 3D2198 E00CCB08 0C080114 */ jal func_E0200450 +/* 3D2198 E00CCB08 0C080114 */ jal shim_guMtxCatF /* 3D219C E00CCB0C 00A0302D */ daddu $a2, $a1, $zero /* 3D21A0 E00CCB10 27A40018 */ addiu $a0, $sp, 0x18 /* 3D21A4 E00CCB14 96A50000 */ lhu $a1, ($s5) /* 3D21A8 E00CCB18 8FC20000 */ lw $v0, ($fp) /* 3D21AC E00CCB1C 00052980 */ sll $a1, $a1, 6 /* 3D21B0 E00CCB20 00B12821 */ addu $a1, $a1, $s1 -/* 3D21B4 E00CCB24 0C080118 */ jal func_E0200460 +/* 3D21B4 E00CCB24 0C080118 */ jal shim_guMtxF2L /* 3D21B8 E00CCB28 00452821 */ addu $a1, $v0, $a1 /* 3D21BC E00CCB2C 3C03DA38 */ lui $v1, 0xda38 /* 3D21C0 E00CCB30 34630002 */ ori $v1, $v1, 2 @@ -143,16 +143,16 @@ glabel func_E00CC9D0 /* 3D2284 E00CCBF4 8E4504DC */ lw $a1, 0x4dc($s2) /* 3D2288 E00CCBF8 4406A000 */ mfc1 $a2, $f20 /* 3D228C E00CCBFC 4407B000 */ mfc1 $a3, $f22 -/* 3D2290 E00CCC00 0C080104 */ jal func_E0200410 +/* 3D2290 E00CCC00 0C080104 */ jal shim_guRotateF /* 3D2294 E00CCC04 27A40018 */ addiu $a0, $sp, 0x18 /* 3D2298 E00CCC08 8E45002C */ lw $a1, 0x2c($s2) /* 3D229C E00CCC0C 8E460090 */ lw $a2, 0x90($s2) /* 3D22A0 E00CCC10 8E4700F4 */ lw $a3, 0xf4($s2) -/* 3D22A4 E00CCC14 0C080108 */ jal func_E0200420 +/* 3D22A4 E00CCC14 0C080108 */ jal shim_guTranslateF /* 3D22A8 E00CCC18 0260202D */ daddu $a0, $s3, $zero /* 3D22AC E00CCC1C 0260202D */ daddu $a0, $s3, $zero /* 3D22B0 E00CCC20 27A50018 */ addiu $a1, $sp, 0x18 -/* 3D22B4 E00CCC24 0C080114 */ jal func_E0200450 +/* 3D22B4 E00CCC24 0C080114 */ jal shim_guMtxCatF /* 3D22B8 E00CCC28 00A0302D */ daddu $a2, $a1, $zero /* 3D22BC E00CCC2C 4406A000 */ mfc1 $a2, $f20 /* 3D22C0 E00CCC30 C64004DC */ lwc1 $f0, 0x4dc($s2) @@ -160,37 +160,37 @@ glabel func_E00CC9D0 /* 3D22C8 E00CCC38 46000007 */ neg.s $f0, $f0 /* 3D22CC E00CCC3C 44050000 */ mfc1 $a1, $f0 /* 3D22D0 E00CCC40 0260202D */ daddu $a0, $s3, $zero -/* 3D22D4 E00CCC44 0C080104 */ jal func_E0200410 +/* 3D22D4 E00CCC44 0C080104 */ jal shim_guRotateF /* 3D22D8 E00CCC48 E7B40010 */ swc1 $f20, 0x10($sp) /* 3D22DC E00CCC4C 0260202D */ daddu $a0, $s3, $zero /* 3D22E0 E00CCC50 27A50018 */ addiu $a1, $sp, 0x18 -/* 3D22E4 E00CCC54 0C080114 */ jal func_E0200450 +/* 3D22E4 E00CCC54 0C080114 */ jal shim_guMtxCatF /* 3D22E8 E00CCC58 00A0302D */ daddu $a2, $a1, $zero /* 3D22EC E00CCC5C E7B60010 */ swc1 $f22, 0x10($sp) /* 3D22F0 E00CCC60 8E450478 */ lw $a1, 0x478($s2) /* 3D22F4 E00CCC64 4406A000 */ mfc1 $a2, $f20 /* 3D22F8 E00CCC68 4407A000 */ mfc1 $a3, $f20 -/* 3D22FC E00CCC6C 0C080104 */ jal func_E0200410 +/* 3D22FC E00CCC6C 0C080104 */ jal shim_guRotateF /* 3D2300 E00CCC70 0260202D */ daddu $a0, $s3, $zero /* 3D2304 E00CCC74 0260202D */ daddu $a0, $s3, $zero /* 3D2308 E00CCC78 27A50018 */ addiu $a1, $sp, 0x18 -/* 3D230C E00CCC7C 0C080114 */ jal func_E0200450 +/* 3D230C E00CCC7C 0C080114 */ jal shim_guMtxCatF /* 3D2310 E00CCC80 00A0302D */ daddu $a2, $a1, $zero /* 3D2314 E00CCC84 8E4503B0 */ lw $a1, 0x3b0($s2) /* 3D2318 E00CCC88 8E460414 */ lw $a2, 0x414($s2) /* 3D231C E00CCC8C 4407B000 */ mfc1 $a3, $f22 -/* 3D2320 E00CCC90 0C080110 */ jal func_E0200440 +/* 3D2320 E00CCC90 0C080110 */ jal shim_guScaleF /* 3D2324 E00CCC94 0260202D */ daddu $a0, $s3, $zero /* 3D2328 E00CCC98 0260202D */ daddu $a0, $s3, $zero /* 3D232C E00CCC9C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3D2330 E00CCCA0 0C080114 */ jal func_E0200450 +/* 3D2330 E00CCCA0 0C080114 */ jal shim_guMtxCatF /* 3D2334 E00CCCA4 00A0302D */ daddu $a2, $a1, $zero /* 3D2338 E00CCCA8 27A40018 */ addiu $a0, $sp, 0x18 /* 3D233C E00CCCAC 96A50000 */ lhu $a1, ($s5) /* 3D2340 E00CCCB0 8FC20000 */ lw $v0, ($fp) /* 3D2344 E00CCCB4 00052980 */ sll $a1, $a1, 6 /* 3D2348 E00CCCB8 00B72821 */ addu $a1, $a1, $s7 -/* 3D234C E00CCCBC 0C080118 */ jal func_E0200460 +/* 3D234C E00CCCBC 0C080118 */ jal shim_guMtxF2L /* 3D2350 E00CCCC0 00452821 */ addu $a1, $v0, $a1 /* 3D2354 E00CCCC4 3C06DA38 */ lui $a2, 0xda38 /* 3D2358 E00CCCC8 34C60001 */ ori $a2, $a2, 1 diff --git a/ver/us/asm/nonmatchings/effects/effect_102/fx_102_main.s b/ver/us/asm/nonmatchings/effects/effect_102/fx_102_main.s index a934911061..2085581552 100644 --- a/ver/us/asm/nonmatchings/effects/effect_102/fx_102_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_102/fx_102_main.s @@ -33,12 +33,12 @@ glabel fx_102_main /* 3D1700 E00CC070 F7B80058 */ sdc1 $f24, 0x58($sp) /* 3D1704 E00CC074 AFA00010 */ sw $zero, 0x10($sp) /* 3D1708 E00CC078 AFA00024 */ sw $zero, 0x24($sp) -/* 3D170C E00CC07C 0C080124 */ jal func_E0200490 +/* 3D170C E00CC07C 0C080124 */ jal shim_create_effect_instance /* 3D1710 E00CC080 AFA20014 */ sw $v0, 0x14($sp) /* 3D1714 E00CC084 24040798 */ addiu $a0, $zero, 0x798 /* 3D1718 E00CC088 24030001 */ addiu $v1, $zero, 1 /* 3D171C E00CC08C 0040A02D */ daddu $s4, $v0, $zero -/* 3D1720 E00CC090 0C08012C */ jal func_E02004B0 +/* 3D1720 E00CC090 0C08012C */ jal shim_general_heap_malloc /* 3D1724 E00CC094 AE830008 */ sw $v1, 8($s4) /* 3D1728 E00CC098 0040182D */ daddu $v1, $v0, $zero /* 3D172C E00CC09C 14600003 */ bnez $v1, .LE00CC0AC @@ -88,13 +88,13 @@ glabel fx_102_main /* 3D17C8 E00CC138 4482A000 */ mtc1 $v0, $f20 /* 3D17CC E00CC13C 00000000 */ nop /* 3D17D0 E00CC140 4680A520 */ cvt.s.w $f20, $f20 -/* 3D17D4 E00CC144 0C080140 */ jal func_E0200500 +/* 3D17D4 E00CC144 0C080140 */ jal shim_sin_deg /* 3D17D8 E00CC148 4600A306 */ mov.s $f12, $f20 /* 3D17DC E00CC14C 4600A306 */ mov.s $f12, $f20 -/* 3D17E0 E00CC150 0C080144 */ jal func_E0200510 +/* 3D17E0 E00CC150 0C080144 */ jal shim_cos_deg /* 3D17E4 E00CC154 46000506 */ mov.s $f20, $f0 /* 3D17E8 E00CC158 24040167 */ addiu $a0, $zero, 0x167 -/* 3D17EC E00CC15C 0C080138 */ jal func_E02004E0 +/* 3D17EC E00CC15C 0C080138 */ jal shim_rand_int /* 3D17F0 E00CC160 46000586 */ mov.s $f22, $f0 /* 3D17F4 E00CC164 461AA082 */ mul.s $f2, $f20, $f26 /* 3D17F8 E00CC168 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE224.s b/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE224.s index 45be44ad11..9e000b3c3f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE224.s +++ b/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE224.s @@ -25,7 +25,7 @@ glabel func_E00CE224 /* 3D2D2C E00CE26C 24460001 */ addiu $a2, $v0, 1 /* 3D2D30 E00CE270 04610005 */ bgez $v1, .LE00CE288 /* 3D2D34 E00CE274 ACA60014 */ sw $a2, 0x14($a1) -/* 3D2D38 E00CE278 0C080128 */ jal func_E02004A0 +/* 3D2D38 E00CE278 0C080128 */ jal shim_remove_effect /* 3D2D3C E00CE27C 00000000 */ nop /* 3D2D40 E00CE280 08033907 */ j .LE00CE41C /* 3D2D44 E00CE284 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE428.s b/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE428.s index cebba0c8cd..bd430eb3d3 100644 --- a/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE428.s +++ b/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE428.s @@ -12,7 +12,7 @@ glabel func_E00CE428 /* 3D2F04 E00CE444 AFA40018 */ sw $a0, 0x18($sp) /* 3D2F08 E00CE448 27A40010 */ addiu $a0, $sp, 0x10 /* 3D2F0C E00CE44C AFBF0020 */ sw $ra, 0x20($sp) -/* 3D2F10 E00CE450 0C080120 */ jal func_E0200480 +/* 3D2F10 E00CE450 0C080120 */ jal shim_queue_render_task /* 3D2F14 E00CE454 AFA20010 */ sw $v0, 0x10($sp) /* 3D2F18 E00CE458 8C430000 */ lw $v1, ($v0) /* 3D2F1C E00CE45C 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE478.s b/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE478.s index 2c6c117e02..b010eb9421 100644 --- a/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE478.s +++ b/ver/us/asm/nonmatchings/effects/effect_103/func_E00CE478.s @@ -71,7 +71,7 @@ glabel func_E00CE478 /* 3D3040 E00CE580 E7A600B0 */ swc1 $f6, 0xb0($sp) /* 3D3044 E00CE584 4600118D */ trunc.w.s $f6, $f2 /* 3D3048 E00CE588 E7A600B4 */ swc1 $f6, 0xb4($sp) -/* 3D304C E00CE58C 0C080108 */ jal func_E0200420 +/* 3D304C E00CE58C 0C080108 */ jal shim_guTranslateF /* 3D3050 E00CE590 00A0382D */ daddu $a3, $a1, $zero /* 3D3054 E00CE594 27A40020 */ addiu $a0, $sp, 0x20 /* 3D3058 E00CE598 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -82,7 +82,7 @@ glabel func_E00CE478 /* 3D306C E00CE5AC 8E420000 */ lw $v0, ($s2) /* 3D3070 E00CE5B0 00052980 */ sll $a1, $a1, 6 /* 3D3074 E00CE5B4 00B32821 */ addu $a1, $a1, $s3 -/* 3D3078 E00CE5B8 0C080118 */ jal func_E0200460 +/* 3D3078 E00CE5B8 0C080118 */ jal shim_guMtxF2L /* 3D307C E00CE5BC 00452821 */ addu $a1, $v0, $a1 /* 3D3080 E00CE5C0 3C03DA38 */ lui $v1, 0xda38 /* 3D3084 E00CE5C4 34630002 */ ori $v1, $v1, 2 @@ -121,7 +121,7 @@ glabel func_E00CE478 /* 3D3104 E00CE644 4680A520 */ cvt.s.w $f20, $f20 /* 3D3108 E00CE648 8FAC00AC */ lw $t4, 0xac($sp) /* 3D310C E00CE64C 4600A306 */ mov.s $f12, $f20 -/* 3D3110 E00CE650 0C080144 */ jal func_E0200510 +/* 3D3110 E00CE650 0C080144 */ jal shim_cos_deg /* 3D3114 E00CE654 01828021 */ addu $s0, $t4, $v0 /* 3D3118 E00CE658 46160002 */ mul.s $f0, $f0, $f22 /* 3D311C E00CE65C 00000000 */ nop @@ -130,7 +130,7 @@ glabel func_E00CE478 /* 3D3128 E00CE668 A6000002 */ sh $zero, 2($s0) /* 3D312C E00CE66C 4600018D */ trunc.w.s $f6, $f0 /* 3D3130 E00CE670 44023000 */ mfc1 $v0, $f6 -/* 3D3134 E00CE674 0C080140 */ jal func_E0200500 +/* 3D3134 E00CE674 0C080140 */ jal shim_sin_deg /* 3D3138 E00CE678 A6020000 */ sh $v0, ($s0) /* 3D313C E00CE67C 46160002 */ mul.s $f0, $f0, $f22 /* 3D3140 E00CE680 00000000 */ nop @@ -140,7 +140,7 @@ glabel func_E00CE478 /* 3D3150 E00CE690 A600000A */ sh $zero, 0xa($s0) /* 3D3154 E00CE694 4600018D */ trunc.w.s $f6, $f0 /* 3D3158 E00CE698 44023000 */ mfc1 $v0, $f6 -/* 3D315C E00CE69C 0C080144 */ jal func_E0200510 +/* 3D315C E00CE69C 0C080144 */ jal shim_cos_deg /* 3D3160 E00CE6A0 A6020004 */ sh $v0, 4($s0) /* 3D3164 E00CE6A4 46160002 */ mul.s $f0, $f0, $f22 /* 3D3168 E00CE6A8 00000000 */ nop @@ -151,7 +151,7 @@ glabel func_E00CE478 /* 3D317C E00CE6BC A6000002 */ sh $zero, 2($s0) /* 3D3180 E00CE6C0 4600018D */ trunc.w.s $f6, $f0 /* 3D3184 E00CE6C4 44023000 */ mfc1 $v0, $f6 -/* 3D3188 E00CE6C8 0C080140 */ jal func_E0200500 +/* 3D3188 E00CE6C8 0C080140 */ jal shim_sin_deg /* 3D318C E00CE6CC A6020000 */ sh $v0, ($s0) /* 3D3190 E00CE6D0 46160002 */ mul.s $f0, $f0, $f22 /* 3D3194 E00CE6D4 00000000 */ nop @@ -236,7 +236,7 @@ glabel func_E00CE478 /* 3D32CC E00CE80C AC620000 */ sw $v0, ($v1) /* 3D32D0 E00CE810 AC600004 */ sw $zero, 4($v1) /* 3D32D4 E00CE814 00A0302D */ daddu $a2, $a1, $zero -/* 3D32D8 E00CE818 0C080110 */ jal func_E0200440 +/* 3D32D8 E00CE818 0C080110 */ jal shim_guScaleF /* 3D32DC E00CE81C 00A0382D */ daddu $a3, $a1, $zero /* 3D32E0 E00CE820 27A40020 */ addiu $a0, $sp, 0x20 /* 3D32E4 E00CE824 96E50000 */ lhu $a1, ($s7) @@ -244,7 +244,7 @@ glabel func_E00CE478 /* 3D32EC E00CE82C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3D32F0 E00CE830 00052980 */ sll $a1, $a1, 6 /* 3D32F4 E00CE834 00B02821 */ addu $a1, $a1, $s0 -/* 3D32F8 E00CE838 0C080118 */ jal func_E0200460 +/* 3D32F8 E00CE838 0C080118 */ jal shim_guMtxF2L /* 3D32FC E00CE83C 00452821 */ addu $a1, $v0, $a1 /* 3D3300 E00CE840 8EA20000 */ lw $v0, ($s5) /* 3D3304 E00CE844 3C014120 */ lui $at, 0x4120 @@ -292,7 +292,7 @@ glabel func_E00CE478 /* 3D33A8 E00CE8E8 4406F000 */ mfc1 $a2, $f30 /* 3D33AC E00CE8EC E7A0001C */ swc1 $f0, 0x1c($sp) /* 3D33B0 E00CE8F0 8E470118 */ lw $a3, 0x118($s2) -/* 3D33B4 E00CE8F4 0C080180 */ jal func_E0200600 +/* 3D33B4 E00CE8F4 0C080180 */ jal shim_guPositionF /* 3D33B8 E00CE8F8 27A40020 */ addiu $a0, $sp, 0x20 /* 3D33BC E00CE8FC 02940018 */ mult $s4, $s4 /* 3D33C0 E00CE900 00006012 */ mflo $t4 @@ -309,11 +309,11 @@ glabel func_E00CE478 /* 3D33EC E00CE92C 3421CCCD */ ori $at, $at, 0xcccd /* 3D33F0 E00CE930 44810000 */ mtc1 $at, $f0 /* 3D33F4 E00CE934 0260202D */ daddu $a0, $s3, $zero -/* 3D33F8 E00CE938 0C080104 */ jal func_E0200410 +/* 3D33F8 E00CE938 0C080104 */ jal shim_guRotateF /* 3D33FC E00CE93C E7A00010 */ swc1 $f0, 0x10($sp) /* 3D3400 E00CE940 0260202D */ daddu $a0, $s3, $zero /* 3D3404 E00CE944 27A50020 */ addiu $a1, $sp, 0x20 -/* 3D3408 E00CE948 0C080114 */ jal func_E0200450 +/* 3D3408 E00CE948 0C080114 */ jal shim_guMtxCatF /* 3D340C E00CE94C 00A0302D */ daddu $a2, $a1, $zero /* 3D3410 E00CE950 C6400098 */ lwc1 $f0, 0x98($s2) /* 3D3414 E00CE954 8FAC00A0 */ lw $t4, 0xa0($sp) @@ -338,32 +338,32 @@ glabel func_E00CE478 /* 3D345C E00CE99C 0260202D */ daddu $a0, $s3, $zero /* 3D3460 E00CE9A0 44052000 */ mfc1 $a1, $f4 /* 3D3464 E00CE9A4 8FA600B8 */ lw $a2, 0xb8($sp) -/* 3D3468 E00CE9A8 0C080110 */ jal func_E0200440 +/* 3D3468 E00CE9A8 0C080110 */ jal shim_guScaleF /* 3D346C E00CE9AC 00A0382D */ daddu $a3, $a1, $zero /* 3D3470 E00CE9B0 0260202D */ daddu $a0, $s3, $zero /* 3D3474 E00CE9B4 27A50020 */ addiu $a1, $sp, 0x20 -/* 3D3478 E00CE9B8 0C080114 */ jal func_E0200450 +/* 3D3478 E00CE9B8 0C080114 */ jal shim_guMtxCatF /* 3D347C E00CE9BC 00A0302D */ daddu $a2, $a1, $zero /* 3D3480 E00CE9C0 C65400F8 */ lwc1 $f20, 0xf8($s2) /* 3D3484 E00CE9C4 461AA502 */ mul.s $f20, $f20, $f26 /* 3D3488 E00CE9C8 00000000 */ nop /* 3D348C E00CE9CC C65600B8 */ lwc1 $f22, 0xb8($s2) -/* 3D3490 E00CE9D0 0C080140 */ jal func_E0200500 +/* 3D3490 E00CE9D0 0C080140 */ jal shim_sin_deg /* 3D3494 E00CE9D4 4600B306 */ mov.s $f12, $f22 /* 3D3498 E00CE9D8 4600A602 */ mul.s $f24, $f20, $f0 /* 3D349C E00CE9DC 00000000 */ nop -/* 3D34A0 E00CE9E0 0C080144 */ jal func_E0200510 +/* 3D34A0 E00CE9E0 0C080144 */ jal shim_cos_deg /* 3D34A4 E00CE9E4 4600B306 */ mov.s $f12, $f22 /* 3D34A8 E00CE9E8 4600A502 */ mul.s $f20, $f20, $f0 /* 3D34AC E00CE9EC 00000000 */ nop /* 3D34B0 E00CE9F0 4406F000 */ mfc1 $a2, $f30 /* 3D34B4 E00CE9F4 4407A000 */ mfc1 $a3, $f20 /* 3D34B8 E00CE9F8 4405C000 */ mfc1 $a1, $f24 -/* 3D34BC E00CE9FC 0C080108 */ jal func_E0200420 +/* 3D34BC E00CE9FC 0C080108 */ jal shim_guTranslateF /* 3D34C0 E00CEA00 0260202D */ daddu $a0, $s3, $zero /* 3D34C4 E00CEA04 0260202D */ daddu $a0, $s3, $zero /* 3D34C8 E00CEA08 27A50020 */ addiu $a1, $sp, 0x20 -/* 3D34CC E00CEA0C 0C080114 */ jal func_E0200450 +/* 3D34CC E00CEA0C 0C080114 */ jal shim_guMtxCatF /* 3D34D0 E00CEA10 00A0302D */ daddu $a2, $a1, $zero /* 3D34D4 E00CEA14 27A40020 */ addiu $a0, $sp, 0x20 /* 3D34D8 E00CEA18 96E50000 */ lhu $a1, ($s7) @@ -371,7 +371,7 @@ glabel func_E00CE478 /* 3D34E0 E00CEA20 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3D34E4 E00CEA24 00052980 */ sll $a1, $a1, 6 /* 3D34E8 E00CEA28 00BE2821 */ addu $a1, $a1, $fp -/* 3D34EC E00CEA2C 0C080118 */ jal func_E0200460 +/* 3D34EC E00CEA2C 0C080118 */ jal shim_guMtxF2L /* 3D34F0 E00CEA30 00452821 */ addu $a1, $v0, $a1 /* 3D34F4 E00CEA34 3C050101 */ lui $a1, 0x101 /* 3D34F8 E00CEA38 34A50020 */ ori $a1, $a1, 0x20 @@ -423,7 +423,7 @@ glabel func_E00CE478 /* 3D35B0 E00CEAF0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3D35B4 E00CEAF4 8E070118 */ lw $a3, 0x118($s0) /* 3D35B8 E00CEAF8 25080010 */ addiu $t0, $t0, 0x10 -/* 3D35BC E00CEAFC 0C080180 */ jal func_E0200600 +/* 3D35BC E00CEAFC 0C080180 */ jal shim_guPositionF /* 3D35C0 E00CEB00 AEA80000 */ sw $t0, ($s5) /* 3D35C4 E00CEB04 C6C00138 */ lwc1 $f0, 0x138($s6) /* 3D35C8 E00CEB08 461C0000 */ add.s $f0, $f0, $f28 @@ -432,11 +432,11 @@ glabel func_E00CE478 /* 3D35D4 E00CEB14 3C073F80 */ lui $a3, 0x3f80 /* 3D35D8 E00CEB18 44050000 */ mfc1 $a1, $f0 /* 3D35DC E00CEB1C 0260202D */ daddu $a0, $s3, $zero -/* 3D35E0 E00CEB20 0C080104 */ jal func_E0200410 +/* 3D35E0 E00CEB20 0C080104 */ jal shim_guRotateF /* 3D35E4 E00CEB24 E7BE0010 */ swc1 $f30, 0x10($sp) /* 3D35E8 E00CEB28 0260202D */ daddu $a0, $s3, $zero /* 3D35EC E00CEB2C 27A50020 */ addiu $a1, $sp, 0x20 -/* 3D35F0 E00CEB30 0C080114 */ jal func_E0200450 +/* 3D35F0 E00CEB30 0C080114 */ jal shim_guMtxCatF /* 3D35F4 E00CEB34 00A0302D */ daddu $a2, $a1, $zero /* 3D35F8 E00CEB38 C6000098 */ lwc1 $f0, 0x98($s0) /* 3D35FC E00CEB3C C7A600B8 */ lwc1 $f6, 0xb8($sp) @@ -445,31 +445,31 @@ glabel func_E00CE478 /* 3D3608 E00CEB48 0260202D */ daddu $a0, $s3, $zero /* 3D360C E00CEB4C 44050000 */ mfc1 $a1, $f0 /* 3D3610 E00CEB50 44063000 */ mfc1 $a2, $f6 -/* 3D3614 E00CEB54 0C080110 */ jal func_E0200440 +/* 3D3614 E00CEB54 0C080110 */ jal shim_guScaleF /* 3D3618 E00CEB58 00A0382D */ daddu $a3, $a1, $zero /* 3D361C E00CEB5C 0260202D */ daddu $a0, $s3, $zero /* 3D3620 E00CEB60 27A50020 */ addiu $a1, $sp, 0x20 -/* 3D3624 E00CEB64 0C080114 */ jal func_E0200450 +/* 3D3624 E00CEB64 0C080114 */ jal shim_guMtxCatF /* 3D3628 E00CEB68 00A0302D */ daddu $a2, $a1, $zero /* 3D362C E00CEB6C C65400F8 */ lwc1 $f20, 0xf8($s2) /* 3D3630 E00CEB70 461AA502 */ mul.s $f20, $f20, $f26 /* 3D3634 E00CEB74 00000000 */ nop -/* 3D3638 E00CEB78 0C080140 */ jal func_E0200500 +/* 3D3638 E00CEB78 0C080140 */ jal shim_sin_deg /* 3D363C E00CEB7C C64C00B8 */ lwc1 $f12, 0xb8($s2) /* 3D3640 E00CEB80 4600A582 */ mul.s $f22, $f20, $f0 /* 3D3644 E00CEB84 00000000 */ nop -/* 3D3648 E00CEB88 0C080144 */ jal func_E0200510 +/* 3D3648 E00CEB88 0C080144 */ jal shim_cos_deg /* 3D364C E00CEB8C C64C00B8 */ lwc1 $f12, 0xb8($s2) /* 3D3650 E00CEB90 4600A502 */ mul.s $f20, $f20, $f0 /* 3D3654 E00CEB94 00000000 */ nop /* 3D3658 E00CEB98 4406F000 */ mfc1 $a2, $f30 /* 3D365C E00CEB9C 4407A000 */ mfc1 $a3, $f20 /* 3D3660 E00CEBA0 4405B000 */ mfc1 $a1, $f22 -/* 3D3664 E00CEBA4 0C080108 */ jal func_E0200420 +/* 3D3664 E00CEBA4 0C080108 */ jal shim_guTranslateF /* 3D3668 E00CEBA8 0260202D */ daddu $a0, $s3, $zero /* 3D366C E00CEBAC 0260202D */ daddu $a0, $s3, $zero /* 3D3670 E00CEBB0 27A50020 */ addiu $a1, $sp, 0x20 -/* 3D3674 E00CEBB4 0C080114 */ jal func_E0200450 +/* 3D3674 E00CEBB4 0C080114 */ jal shim_guMtxCatF /* 3D3678 E00CEBB8 00A0302D */ daddu $a2, $a1, $zero /* 3D367C E00CEBBC 27A40020 */ addiu $a0, $sp, 0x20 /* 3D3680 E00CEBC0 96E50000 */ lhu $a1, ($s7) @@ -477,7 +477,7 @@ glabel func_E00CE478 /* 3D3688 E00CEBC8 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3D368C E00CEBCC 00052980 */ sll $a1, $a1, 6 /* 3D3690 E00CEBD0 00BE2821 */ addu $a1, $a1, $fp -/* 3D3694 E00CEBD4 0C080118 */ jal func_E0200460 +/* 3D3694 E00CEBD4 0C080118 */ jal shim_guMtxF2L /* 3D3698 E00CEBD8 00452821 */ addu $a1, $v0, $a1 /* 3D369C E00CEBDC 3C080101 */ lui $t0, 0x101 /* 3D36A0 E00CEBE0 35080040 */ ori $t0, $t0, 0x40 diff --git a/ver/us/asm/nonmatchings/effects/effect_103/fx_103_main.s b/ver/us/asm/nonmatchings/effects/effect_103/fx_103_main.s index 0d45708870..304560be18 100644 --- a/ver/us/asm/nonmatchings/effects/effect_103/fx_103_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_103/fx_103_main.s @@ -32,12 +32,12 @@ glabel fx_103_main /* 3D2B2C E00CE06C AFA7007C */ sw $a3, 0x7c($sp) /* 3D2B30 E00CE070 AFA00010 */ sw $zero, 0x10($sp) /* 3D2B34 E00CE074 AFA00024 */ sw $zero, 0x24($sp) -/* 3D2B38 E00CE078 0C080124 */ jal func_E0200490 +/* 3D2B38 E00CE078 0C080124 */ jal shim_create_effect_instance /* 3D2B3C E00CE07C AFA20014 */ sw $v0, 0x14($sp) /* 3D2B40 E00CE080 24040144 */ addiu $a0, $zero, 0x144 /* 3D2B44 E00CE084 24030001 */ addiu $v1, $zero, 1 /* 3D2B48 E00CE088 0040982D */ daddu $s3, $v0, $zero -/* 3D2B4C E00CE08C 0C08012C */ jal func_E02004B0 +/* 3D2B4C E00CE08C 0C08012C */ jal shim_general_heap_malloc /* 3D2B50 E00CE090 AE630008 */ sw $v1, 8($s3) /* 3D2B54 E00CE094 0040882D */ daddu $s1, $v0, $zero /* 3D2B58 E00CE098 16200003 */ bnez $s1, .LE00CE0A8 @@ -95,13 +95,13 @@ glabel fx_103_main /* 3D2C14 E00CE154 24040168 */ addiu $a0, $zero, 0x168 /* 3D2C18 E00CE158 E6020078 */ swc1 $f2, 0x78($s0) /* 3D2C1C E00CE15C 46200020 */ cvt.s.d $f0, $f0 -/* 3D2C20 E00CE160 0C080138 */ jal func_E02004E0 +/* 3D2C20 E00CE160 0C080138 */ jal shim_rand_int /* 3D2C24 E00CE164 E6000098 */ swc1 $f0, 0x98($s0) /* 3D2C28 E00CE168 24040064 */ addiu $a0, $zero, 0x64 /* 3D2C2C E00CE16C 44820000 */ mtc1 $v0, $f0 /* 3D2C30 E00CE170 00000000 */ nop /* 3D2C34 E00CE174 46800020 */ cvt.s.w $f0, $f0 -/* 3D2C38 E00CE178 0C080138 */ jal func_E02004E0 +/* 3D2C38 E00CE178 0C080138 */ jal shim_rand_int /* 3D2C3C E00CE17C E60000B8 */ swc1 $f0, 0xb8($s0) /* 3D2C40 E00CE180 44820000 */ mtc1 $v0, $f0 /* 3D2C44 E00CE184 00000000 */ nop @@ -111,7 +111,7 @@ glabel fx_103_main /* 3D2C54 E00CE194 46360000 */ add.d $f0, $f0, $f22 /* 3D2C58 E00CE198 2404001E */ addiu $a0, $zero, 0x1e /* 3D2C5C E00CE19C 46200020 */ cvt.s.d $f0, $f0 -/* 3D2C60 E00CE1A0 0C080138 */ jal func_E02004E0 +/* 3D2C60 E00CE1A0 0C080138 */ jal shim_rand_int /* 3D2C64 E00CE1A4 E60000D8 */ swc1 $f0, 0xd8($s0) /* 3D2C68 E00CE1A8 44820000 */ mtc1 $v0, $f0 /* 3D2C6C E00CE1AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_104/func_E00D0194.s b/ver/us/asm/nonmatchings/effects/effect_104/func_E00D0194.s index b3d3670003..56cb3850e2 100644 --- a/ver/us/asm/nonmatchings/effects/effect_104/func_E00D0194.s +++ b/ver/us/asm/nonmatchings/effects/effect_104/func_E00D0194.s @@ -22,7 +22,7 @@ glabel func_E00D0194 /* 3D3FF8 E00D01D8 AC82002C */ sw $v0, 0x2c($a0) /* 3D3FFC E00D01DC 04610005 */ bgez $v1, .LE00D01F4 /* 3D4000 E00D01E0 AC830028 */ sw $v1, 0x28($a0) -/* 3D4004 E00D01E4 0C080128 */ jal func_E02004A0 +/* 3D4004 E00D01E4 0C080128 */ jal shim_remove_effect /* 3D4008 E00D01E8 0260202D */ daddu $a0, $s3, $zero /* 3D400C E00D01EC 08034106 */ j .LE00D0418 /* 3D4010 E00D01F0 00000000 */ nop @@ -67,7 +67,7 @@ glabel func_E00D0194 /* 3D40A0 E00D0280 C60CFFF8 */ lwc1 $f12, -8($s0) /* 3D40A4 E00D0284 AE00FFC8 */ sw $zero, -0x38($s0) /* 3D40A8 E00D0288 AE00FFCC */ sw $zero, -0x34($s0) -/* 3D40AC E00D028C 0C080140 */ jal func_E0200500 +/* 3D40AC E00D028C 0C080140 */ jal shim_sin_deg /* 3D40B0 E00D0290 AE00FFD0 */ sw $zero, -0x30($s0) /* 3D40B4 E00D0294 46000007 */ neg.s $f0, $f0 /* 3D40B8 E00D0298 46000021 */ cvt.d.s $f0, $f0 @@ -75,7 +75,7 @@ glabel func_E00D0194 /* 3D40C0 E00D02A0 00000000 */ nop /* 3D40C4 E00D02A4 C60CFFF8 */ lwc1 $f12, -8($s0) /* 3D40C8 E00D02A8 46200020 */ cvt.s.d $f0, $f0 -/* 3D40CC E00D02AC 0C080144 */ jal func_E0200510 +/* 3D40CC E00D02AC 0C080144 */ jal shim_cos_deg /* 3D40D0 E00D02B0 E600FFD4 */ swc1 $f0, -0x2c($s0) /* 3D40D4 E00D02B4 46000021 */ cvt.d.s $f0, $f0 /* 3D40D8 E00D02B8 46340002 */ mul.d $f0, $f0, $f20 diff --git a/ver/us/asm/nonmatchings/effects/effect_104/func_E00D0448.s b/ver/us/asm/nonmatchings/effects/effect_104/func_E00D0448.s index ba9e3681da..98420ba24f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_104/func_E00D0448.s +++ b/ver/us/asm/nonmatchings/effects/effect_104/func_E00D0448.s @@ -11,7 +11,7 @@ glabel func_E00D0448 /* 3D4280 E00D0460 27A40010 */ addiu $a0, $sp, 0x10 /* 3D4284 E00D0464 AFBF0020 */ sw $ra, 0x20($sp) /* 3D4288 E00D0468 AFA00014 */ sw $zero, 0x14($sp) -/* 3D428C E00D046C 0C080120 */ jal func_E0200480 +/* 3D428C E00D046C 0C080120 */ jal shim_queue_render_task /* 3D4290 E00D0470 AFA20010 */ sw $v0, 0x10($sp) /* 3D4294 E00D0474 8C430000 */ lw $v1, ($v0) /* 3D4298 E00D0478 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_104/func_E00D048C.s b/ver/us/asm/nonmatchings/effects/effect_104/func_E00D048C.s index 6b7a7aecf7..1c87f72804 100644 --- a/ver/us/asm/nonmatchings/effects/effect_104/func_E00D048C.s +++ b/ver/us/asm/nonmatchings/effects/effect_104/func_E00D048C.s @@ -108,7 +108,7 @@ glabel func_E00D048C /* 3D4448 E00D0628 E7A00018 */ swc1 $f0, 0x18($sp) /* 3D444C E00D062C C620000C */ lwc1 $f0, 0xc($s1) /* 3D4450 E00D0630 46204620 */ cvt.s.d $f24, $f8 -/* 3D4454 E00D0634 0C080180 */ jal func_E0200600 +/* 3D4454 E00D0634 0C080180 */ jal shim_guPositionF /* 3D4458 E00D0638 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3D445C E00D063C 27A40020 */ addiu $a0, $sp, 0x20 /* 3D4460 E00D0640 3C158007 */ lui $s5, %hi(gMatrixListPos) @@ -119,7 +119,7 @@ glabel func_E00D048C /* 3D4474 E00D0654 8EC20000 */ lw $v0, ($s6) /* 3D4478 E00D0658 00052980 */ sll $a1, $a1, 6 /* 3D447C E00D065C 00B02821 */ addu $a1, $a1, $s0 -/* 3D4480 E00D0660 0C080118 */ jal func_E0200460 +/* 3D4480 E00D0660 0C080118 */ jal shim_guMtxF2L /* 3D4484 E00D0664 00452821 */ addu $a1, $v0, $a1 /* 3D4488 E00D0668 24140001 */ addiu $s4, $zero, 1 /* 3D448C E00D066C 3C02DA38 */ lui $v0, 0xda38 @@ -173,17 +173,17 @@ glabel func_E00D048C /* 3D4548 E00D0728 8E05FFC0 */ lw $a1, -0x40($s0) /* 3D454C E00D072C 8E06FFC4 */ lw $a2, -0x3c($s0) /* 3D4550 E00D0730 8E07FFC8 */ lw $a3, -0x38($s0) -/* 3D4554 E00D0734 0C080108 */ jal func_E0200420 +/* 3D4554 E00D0734 0C080108 */ jal shim_guTranslateF /* 3D4558 E00D0738 27A40020 */ addiu $a0, $sp, 0x20 /* 3D455C E00D073C E7B60010 */ swc1 $f22, 0x10($sp) /* 3D4560 E00D0740 8E05FFF0 */ lw $a1, -0x10($s0) /* 3D4564 E00D0744 4406A000 */ mfc1 $a2, $f20 /* 3D4568 E00D0748 4407A000 */ mfc1 $a3, $f20 -/* 3D456C E00D074C 0C080104 */ jal func_E0200410 +/* 3D456C E00D074C 0C080104 */ jal shim_guRotateF /* 3D4570 E00D0750 0240202D */ daddu $a0, $s2, $zero /* 3D4574 E00D0754 0240202D */ daddu $a0, $s2, $zero /* 3D4578 E00D0758 27A50020 */ addiu $a1, $sp, 0x20 -/* 3D457C E00D075C 0C080114 */ jal func_E0200450 +/* 3D457C E00D075C 0C080114 */ jal shim_guMtxCatF /* 3D4580 E00D0760 00A0302D */ daddu $a2, $a1, $zero /* 3D4584 E00D0764 C600FFD8 */ lwc1 $f0, -0x28($s0) /* 3D4588 E00D0768 461C0002 */ mul.s $f0, $f0, $f28 @@ -197,21 +197,21 @@ glabel func_E00D048C /* 3D45A8 E00D0788 46180002 */ mul.s $f0, $f0, $f24 /* 3D45AC E00D078C 00000000 */ nop /* 3D45B0 E00D0790 44070000 */ mfc1 $a3, $f0 -/* 3D45B4 E00D0794 0C080110 */ jal func_E0200440 +/* 3D45B4 E00D0794 0C080110 */ jal shim_guScaleF /* 3D45B8 E00D0798 0240202D */ daddu $a0, $s2, $zero /* 3D45BC E00D079C 0240202D */ daddu $a0, $s2, $zero /* 3D45C0 E00D07A0 27A50020 */ addiu $a1, $sp, 0x20 -/* 3D45C4 E00D07A4 0C080114 */ jal func_E0200450 +/* 3D45C4 E00D07A4 0C080114 */ jal shim_guMtxCatF /* 3D45C8 E00D07A8 00A0302D */ daddu $a2, $a1, $zero /* 3D45CC E00D07AC E7B40010 */ swc1 $f20, 0x10($sp) /* 3D45D0 E00D07B0 8E05FFEC */ lw $a1, -0x14($s0) /* 3D45D4 E00D07B4 4406A000 */ mfc1 $a2, $f20 /* 3D45D8 E00D07B8 4407B000 */ mfc1 $a3, $f22 -/* 3D45DC E00D07BC 0C080104 */ jal func_E0200410 +/* 3D45DC E00D07BC 0C080104 */ jal shim_guRotateF /* 3D45E0 E00D07C0 0240202D */ daddu $a0, $s2, $zero /* 3D45E4 E00D07C4 0240202D */ daddu $a0, $s2, $zero /* 3D45E8 E00D07C8 27A50020 */ addiu $a1, $sp, 0x20 -/* 3D45EC E00D07CC 0C080114 */ jal func_E0200450 +/* 3D45EC E00D07CC 0C080114 */ jal shim_guMtxCatF /* 3D45F0 E00D07D0 00A0302D */ daddu $a2, $a1, $zero /* 3D45F4 E00D07D4 27A40020 */ addiu $a0, $sp, 0x20 /* 3D45F8 E00D07D8 96C50000 */ lhu $a1, ($s6) @@ -219,7 +219,7 @@ glabel func_E00D048C /* 3D4600 E00D07E0 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3D4604 E00D07E4 00052980 */ sll $a1, $a1, 6 /* 3D4608 E00D07E8 00B52821 */ addu $a1, $a1, $s5 -/* 3D460C E00D07EC 0C080118 */ jal func_E0200460 +/* 3D460C E00D07EC 0C080118 */ jal shim_guMtxF2L /* 3D4610 E00D07F0 00452821 */ addu $a1, $v0, $a1 /* 3D4614 E00D07F4 3C06000F */ lui $a2, 0xf /* 3D4618 E00D07F8 34C6C000 */ ori $a2, $a2, 0xc000 diff --git a/ver/us/asm/nonmatchings/effects/effect_104/fx_104_main.s b/ver/us/asm/nonmatchings/effects/effect_104/fx_104_main.s index e47ecb2ea5..eddf5f30c6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_104/fx_104_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_104/fx_104_main.s @@ -36,7 +36,7 @@ glabel fx_104_main /* 3D3E98 E00D0078 AC820010 */ sw $v0, 0x10($a0) /* 3D3E9C E00D007C 24020068 */ addiu $v0, $zero, 0x68 /* 3D3EA0 E00D0080 AC800014 */ sw $zero, 0x14($a0) -/* 3D3EA4 E00D0084 0C080124 */ jal func_E0200490 +/* 3D3EA4 E00D0084 0C080124 */ jal shim_create_effect_instance /* 3D3EA8 E00D0088 AC820004 */ sw $v0, 4($a0) /* 3D3EAC E00D008C 00102040 */ sll $a0, $s0, 1 /* 3D3EB0 E00D0090 00902021 */ addu $a0, $a0, $s0 @@ -44,7 +44,7 @@ glabel fx_104_main /* 3D3EB8 E00D0098 00902023 */ subu $a0, $a0, $s0 /* 3D3EBC E00D009C 000420C0 */ sll $a0, $a0, 3 /* 3D3EC0 E00D00A0 0040882D */ daddu $s1, $v0, $zero -/* 3D3EC4 E00D00A4 0C08012C */ jal func_E02004B0 +/* 3D3EC4 E00D00A4 0C08012C */ jal shim_general_heap_malloc /* 3D3EC8 E00D00A8 AE300008 */ sw $s0, 8($s1) /* 3D3ECC E00D00AC 0040182D */ daddu $v1, $v0, $zero /* 3D3ED0 E00D00B0 14600003 */ bnez $v1, .LE00D00C0 diff --git a/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2120.s b/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2120.s index d92008e806..75b80b92ad 100644 --- a/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2120.s +++ b/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2120.s @@ -25,7 +25,7 @@ glabel func_E00D2120 /* 3D4AD8 E00D2168 24E60001 */ addiu $a2, $a3, 1 /* 3D4ADC E00D216C 04610005 */ bgez $v1, .LE00D2184 /* 3D4AE0 E00D2170 ACA60014 */ sw $a2, 0x14($a1) -/* 3D4AE4 E00D2174 0C080128 */ jal func_E02004A0 +/* 3D4AE4 E00D2174 0C080128 */ jal shim_remove_effect /* 3D4AE8 E00D2178 00000000 */ nop /* 3D4AEC E00D217C 0803488A */ j .LE00D2228 /* 3D4AF0 E00D2180 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2234.s b/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2234.s index 31122e444e..c6f8efc4a1 100644 --- a/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2234.s +++ b/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2234.s @@ -12,7 +12,7 @@ glabel func_E00D2234 /* 3D4BC0 E00D2250 AFA40018 */ sw $a0, 0x18($sp) /* 3D4BC4 E00D2254 27A40010 */ addiu $a0, $sp, 0x10 /* 3D4BC8 E00D2258 AFBF0020 */ sw $ra, 0x20($sp) -/* 3D4BCC E00D225C 0C080120 */ jal func_E0200480 +/* 3D4BCC E00D225C 0C080120 */ jal shim_queue_render_task /* 3D4BD0 E00D2260 AFA20010 */ sw $v0, 0x10($sp) /* 3D4BD4 E00D2264 8C430000 */ lw $v1, ($v0) /* 3D4BD8 E00D2268 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2284.s b/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2284.s index 1ad90556d7..1f2bda0dfb 100644 --- a/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2284.s +++ b/ver/us/asm/nonmatchings/effects/effect_105/func_E00D2284.s @@ -55,17 +55,17 @@ glabel func_E00D2284 /* 3D4CBC E00D234C 001110C0 */ sll $v0, $s1, 3 /* 3D4CC0 E00D2350 02228821 */ addu $s1, $s1, $v0 /* 3D4CC4 E00D2354 001188C0 */ sll $s1, $s1, 3 -/* 3D4CC8 E00D2358 0C080108 */ jal func_E0200420 +/* 3D4CC8 E00D2358 0C080108 */ jal shim_guTranslateF /* 3D4CCC E00D235C 02238821 */ addu $s1, $s1, $v1 /* 3D4CD0 E00D2360 27B00050 */ addiu $s0, $sp, 0x50 /* 3D4CD4 E00D2364 4405A000 */ mfc1 $a1, $f20 /* 3D4CD8 E00D2368 0200202D */ daddu $a0, $s0, $zero /* 3D4CDC E00D236C 00A0302D */ daddu $a2, $a1, $zero -/* 3D4CE0 E00D2370 0C080110 */ jal func_E0200440 +/* 3D4CE0 E00D2370 0C080110 */ jal shim_guScaleF /* 3D4CE4 E00D2374 00A0382D */ daddu $a3, $a1, $zero /* 3D4CE8 E00D2378 0200202D */ daddu $a0, $s0, $zero /* 3D4CEC E00D237C 27A50010 */ addiu $a1, $sp, 0x10 -/* 3D4CF0 E00D2380 0C080114 */ jal func_E0200450 +/* 3D4CF0 E00D2380 0C080114 */ jal shim_guMtxCatF /* 3D4CF4 E00D2384 00A0302D */ daddu $a2, $a1, $zero /* 3D4CF8 E00D2388 27A40010 */ addiu $a0, $sp, 0x10 /* 3D4CFC E00D238C 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -76,7 +76,7 @@ glabel func_E00D2284 /* 3D4D10 E00D23A0 8E820000 */ lw $v0, ($s4) /* 3D4D14 E00D23A4 00052980 */ sll $a1, $a1, 6 /* 3D4D18 E00D23A8 00B62821 */ addu $a1, $a1, $s6 -/* 3D4D1C E00D23AC 0C080118 */ jal func_E0200460 +/* 3D4D1C E00D23AC 0C080118 */ jal shim_guMtxF2L /* 3D4D20 E00D23B0 00452821 */ addu $a1, $v0, $a1 /* 3D4D24 E00D23B4 3C03DA38 */ lui $v1, 0xda38 /* 3D4D28 E00D23B8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_105/fx_105_main.s b/ver/us/asm/nonmatchings/effects/effect_105/fx_105_main.s index 98a243b230..28692df160 100644 --- a/ver/us/asm/nonmatchings/effects/effect_105/fx_105_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_105/fx_105_main.s @@ -28,12 +28,12 @@ glabel fx_105_main /* 3D49CC E00D205C AFB00028 */ sw $s0, 0x28($sp) /* 3D49D0 E00D2060 AFA00010 */ sw $zero, 0x10($sp) /* 3D49D4 E00D2064 AFA00024 */ sw $zero, 0x24($sp) -/* 3D49D8 E00D2068 0C080124 */ jal func_E0200490 +/* 3D49D8 E00D2068 0C080124 */ jal shim_create_effect_instance /* 3D49DC E00D206C AFA20014 */ sw $v0, 0x14($sp) /* 3D49E0 E00D2070 2404003C */ addiu $a0, $zero, 0x3c /* 3D49E4 E00D2074 24030001 */ addiu $v1, $zero, 1 /* 3D49E8 E00D2078 0040802D */ daddu $s0, $v0, $zero -/* 3D49EC E00D207C 0C08012C */ jal func_E02004B0 +/* 3D49EC E00D207C 0C08012C */ jal shim_general_heap_malloc /* 3D49F0 E00D2080 AE030008 */ sw $v1, 8($s0) /* 3D49F4 E00D2084 0040202D */ daddu $a0, $v0, $zero /* 3D49F8 E00D2088 14800003 */ bnez $a0, .LE00D2098 diff --git a/ver/us/asm/nonmatchings/effects/effect_107/func_E00D6720.s b/ver/us/asm/nonmatchings/effects/effect_107/func_E00D6720.s index a29461d71e..e026c10afb 100644 --- a/ver/us/asm/nonmatchings/effects/effect_107/func_E00D6720.s +++ b/ver/us/asm/nonmatchings/effects/effect_107/func_E00D6720.s @@ -30,7 +30,7 @@ glabel func_E00D6720 /* 3D579C E00D677C 24450001 */ addiu $a1, $v0, 1 /* 3D57A0 E00D6780 04610005 */ bgez $v1, .LE00D6798 /* 3D57A4 E00D6784 AC850014 */ sw $a1, 0x14($a0) -/* 3D57A8 E00D6788 0C080128 */ jal func_E02004A0 +/* 3D57A8 E00D6788 0C080128 */ jal shim_remove_effect /* 3D57AC E00D678C 0240202D */ daddu $a0, $s2, $zero /* 3D57B0 E00D6790 08035A48 */ j .LE00D6920 /* 3D57B4 E00D6794 00000000 */ nop @@ -78,7 +78,7 @@ glabel func_E00D6720 .LE00D682C: /* 3D584C E00D682C E614FFE0 */ swc1 $f20, -0x20($s0) .LE00D6830: -/* 3D5850 E00D6830 0C080138 */ jal func_E02004E0 +/* 3D5850 E00D6830 0C080138 */ jal shim_rand_int /* 3D5854 E00D6834 24040167 */ addiu $a0, $zero, 0x167 /* 3D5858 E00D6838 44820000 */ mtc1 $v0, $f0 /* 3D585C E00D683C 00000000 */ nop @@ -129,7 +129,7 @@ glabel func_E00D6720 /* 3D5900 E00D68E0 08035A43 */ j .LE00D690C /* 3D5904 E00D68E4 AE000000 */ sw $zero, ($s0) .LE00D68E8: -/* 3D5908 E00D68E8 0C080140 */ jal func_E0200500 +/* 3D5908 E00D68E8 0C080140 */ jal shim_sin_deg /* 3D590C E00D68EC 00000000 */ nop /* 3D5910 E00D68F0 3C01437F */ lui $at, 0x437f /* 3D5914 E00D68F4 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/effects/effect_107/func_E00D693C.s b/ver/us/asm/nonmatchings/effects/effect_107/func_E00D693C.s index f9f9c86a31..34c7fa7689 100644 --- a/ver/us/asm/nonmatchings/effects/effect_107/func_E00D693C.s +++ b/ver/us/asm/nonmatchings/effects/effect_107/func_E00D693C.s @@ -12,7 +12,7 @@ glabel func_E00D693C /* 3D5978 E00D6958 AFA40018 */ sw $a0, 0x18($sp) /* 3D597C E00D695C 27A40010 */ addiu $a0, $sp, 0x10 /* 3D5980 E00D6960 AFBF0020 */ sw $ra, 0x20($sp) -/* 3D5984 E00D6964 0C080120 */ jal func_E0200480 +/* 3D5984 E00D6964 0C080120 */ jal shim_queue_render_task /* 3D5988 E00D6968 AFA20010 */ sw $v0, 0x10($sp) /* 3D598C E00D696C 8FBF0020 */ lw $ra, 0x20($sp) /* 3D5990 E00D6970 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_107/func_E00D6980.s b/ver/us/asm/nonmatchings/effects/effect_107/func_E00D6980.s index 88e08fcbf8..ecdb7dfcf5 100644 --- a/ver/us/asm/nonmatchings/effects/effect_107/func_E00D6980.s +++ b/ver/us/asm/nonmatchings/effects/effect_107/func_E00D6980.s @@ -80,7 +80,7 @@ glabel func_E00D6980 /* 3D5ACC E00D6AAC E7A00018 */ swc1 $f0, 0x18($sp) /* 3D5AD0 E00D6AB0 C620000C */ lwc1 $f0, 0xc($s1) /* 3D5AD4 E00D6AB4 24140001 */ addiu $s4, $zero, 1 -/* 3D5AD8 E00D6AB8 0C080180 */ jal func_E0200600 +/* 3D5AD8 E00D6AB8 0C080180 */ jal shim_guPositionF /* 3D5ADC E00D6ABC E7A0001C */ swc1 $f0, 0x1c($sp) /* 3D5AE0 E00D6AC0 27A40020 */ addiu $a0, $sp, 0x20 /* 3D5AE4 E00D6AC4 3C158007 */ lui $s5, %hi(gMatrixListPos) @@ -91,7 +91,7 @@ glabel func_E00D6980 /* 3D5AF8 E00D6AD8 8EE20000 */ lw $v0, ($s7) /* 3D5AFC E00D6ADC 00052980 */ sll $a1, $a1, 6 /* 3D5B00 E00D6AE0 00B02821 */ addu $a1, $a1, $s0 -/* 3D5B04 E00D6AE4 0C080118 */ jal func_E0200460 +/* 3D5B04 E00D6AE4 0C080118 */ jal shim_guMtxF2L /* 3D5B08 E00D6AE8 00452821 */ addu $a1, $v0, $a1 /* 3D5B0C E00D6AEC 3C03DA38 */ lui $v1, 0xda38 /* 3D5B10 E00D6AF0 34630002 */ ori $v1, $v1, 2 @@ -202,18 +202,18 @@ glabel func_E00D6980 /* 3D5CB0 E00D6C90 E7B60010 */ swc1 $f22, 0x10($sp) /* 3D5CB4 E00D6C94 8E050038 */ lw $a1, 0x38($s0) /* 3D5CB8 E00D6C98 25080008 */ addiu $t0, $t0, 8 -/* 3D5CBC E00D6C9C 0C080104 */ jal func_E0200410 +/* 3D5CBC E00D6C9C 0C080104 */ jal shim_guRotateF /* 3D5CC0 E00D6CA0 AE680000 */ sw $t0, ($s3) /* 3D5CC4 E00D6CA4 C6000000 */ lwc1 $f0, ($s0) /* 3D5CC8 E00D6CA8 461A0000 */ add.s $f0, $f0, $f26 /* 3D5CCC E00D6CAC 4406C000 */ mfc1 $a2, $f24 /* 3D5CD0 E00D6CB0 4407C000 */ mfc1 $a3, $f24 /* 3D5CD4 E00D6CB4 44050000 */ mfc1 $a1, $f0 -/* 3D5CD8 E00D6CB8 0C080108 */ jal func_E0200420 +/* 3D5CD8 E00D6CB8 0C080108 */ jal shim_guTranslateF /* 3D5CDC E00D6CBC 0240202D */ daddu $a0, $s2, $zero /* 3D5CE0 E00D6CC0 0240202D */ daddu $a0, $s2, $zero /* 3D5CE4 E00D6CC4 27A50020 */ addiu $a1, $sp, 0x20 -/* 3D5CE8 E00D6CC8 0C080114 */ jal func_E0200450 +/* 3D5CE8 E00D6CC8 0C080114 */ jal shim_guMtxCatF /* 3D5CEC E00D6CCC 00A0302D */ daddu $a2, $a1, $zero /* 3D5CF0 E00D6CD0 8EC30000 */ lw $v1, ($s6) /* 3D5CF4 E00D6CD4 3C020900 */ lui $v0, 0x900 @@ -235,18 +235,18 @@ glabel func_E00D6980 /* 3D5D2C E00D6D0C 4407B000 */ mfc1 $a3, $f22 /* 3D5D30 E00D6D10 00A0302D */ daddu $a2, $a1, $zero .LE00D6D14: -/* 3D5D34 E00D6D14 0C080110 */ jal func_E0200440 +/* 3D5D34 E00D6D14 0C080110 */ jal shim_guScaleF /* 3D5D38 E00D6D18 26940001 */ addiu $s4, $s4, 1 /* 3D5D3C E00D6D1C 27A40060 */ addiu $a0, $sp, 0x60 /* 3D5D40 E00D6D20 27A50020 */ addiu $a1, $sp, 0x20 -/* 3D5D44 E00D6D24 0C080114 */ jal func_E0200450 +/* 3D5D44 E00D6D24 0C080114 */ jal shim_guMtxCatF /* 3D5D48 E00D6D28 00A0302D */ daddu $a2, $a1, $zero /* 3D5D4C E00D6D2C 27A40020 */ addiu $a0, $sp, 0x20 /* 3D5D50 E00D6D30 96E50000 */ lhu $a1, ($s7) /* 3D5D54 E00D6D34 8FC20000 */ lw $v0, ($fp) /* 3D5D58 E00D6D38 00052980 */ sll $a1, $a1, 6 /* 3D5D5C E00D6D3C 00B52821 */ addu $a1, $a1, $s5 -/* 3D5D60 E00D6D40 0C080118 */ jal func_E0200460 +/* 3D5D60 E00D6D40 0C080118 */ jal shim_guMtxF2L /* 3D5D64 E00D6D44 00452821 */ addu $a1, $v0, $a1 /* 3D5D68 E00D6D48 3C06D838 */ lui $a2, 0xd838 /* 3D5D6C E00D6D4C 8E640000 */ lw $a0, ($s3) diff --git a/ver/us/asm/nonmatchings/effects/effect_107/fx_107_main.s b/ver/us/asm/nonmatchings/effects/effect_107/fx_107_main.s index 80ef2212c5..b5d13626bb 100644 --- a/ver/us/asm/nonmatchings/effects/effect_107/fx_107_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_107/fx_107_main.s @@ -40,14 +40,14 @@ glabel fx_107_main /* 3D50AC E00D608C AFA00010 */ sw $zero, 0x10($sp) /* 3D50B0 E00D6090 AFA00024 */ sw $zero, 0x24($sp) /* 3D50B4 E00D6094 AFA20014 */ sw $v0, 0x14($sp) -/* 3D50B8 E00D6098 0C080124 */ jal func_E0200490 +/* 3D50B8 E00D6098 0C080124 */ jal shim_create_effect_instance /* 3D50BC E00D609C AFA8002C */ sw $t0, 0x2c($sp) /* 3D50C0 E00D60A0 8FA9002C */ lw $t1, 0x2c($sp) /* 3D50C4 E00D60A4 AFA20028 */ sw $v0, 0x28($sp) /* 3D50C8 E00D60A8 000920C0 */ sll $a0, $t1, 3 /* 3D50CC E00D60AC 00892021 */ addu $a0, $a0, $t1 /* 3D50D0 E00D60B0 000420C0 */ sll $a0, $a0, 3 -/* 3D50D4 E00D60B4 0C08012C */ jal func_E02004B0 +/* 3D50D4 E00D60B4 0C08012C */ jal shim_general_heap_malloc /* 3D50D8 E00D60B8 AC490008 */ sw $t1, 8($v0) /* 3D50DC E00D60BC 0040902D */ daddu $s2, $v0, $zero /* 3D50E0 E00D60C0 8FA80028 */ lw $t0, 0x28($sp) @@ -92,7 +92,7 @@ glabel fx_107_main /* 3D516C E00D614C 44820000 */ mtc1 $v0, $f0 /* 3D5170 E00D6150 00000000 */ nop /* 3D5174 E00D6154 46800020 */ cvt.s.w $f0, $f0 -/* 3D5178 E00D6158 0C080138 */ jal func_E02004E0 +/* 3D5178 E00D6158 0C080138 */ jal shim_rand_int /* 3D517C E00D615C E6400038 */ swc1 $f0, 0x38($s2) /* 3D5180 E00D6160 8FA90028 */ lw $t1, 0x28($sp) /* 3D5184 E00D6164 8D230008 */ lw $v1, 8($t1) @@ -137,7 +137,7 @@ glabel fx_107_main /* 3D521C E00D61FC 00400008 */ jr $v0 /* 3D5220 E00D6200 00000000 */ nop glabel LE00D6204_3D5224 -/* 3D5224 E00D6204 0C080138 */ jal func_E02004E0 +/* 3D5224 E00D6204 0C080138 */ jal shim_rand_int /* 3D5228 E00D6208 2404000A */ addiu $a0, $zero, 0xa /* 3D522C E00D620C 44821000 */ mtc1 $v0, $f2 /* 3D5230 E00D6210 00000000 */ nop @@ -162,7 +162,7 @@ glabel LE00D6204_3D5224 /* 3D527C E00D625C 08035982 */ j .LE00D6608 /* 3D5280 E00D6260 46201087 */ neg.d $f2, $f2 glabel LE00D6264_3D5284 -/* 3D5284 E00D6264 0C080138 */ jal func_E02004E0 +/* 3D5284 E00D6264 0C080138 */ jal shim_rand_int /* 3D5288 E00D6268 2404000A */ addiu $a0, $zero, 0xa /* 3D528C E00D626C 44821000 */ mtc1 $v0, $f2 /* 3D5290 E00D6270 00000000 */ nop @@ -186,7 +186,7 @@ glabel LE00D6264_3D5284 /* 3D52D8 E00D62B8 08035982 */ j .LE00D6608 /* 3D52DC E00D62BC AE000004 */ sw $zero, 4($s0) glabel LE00D62C0_3D52E0 -/* 3D52E0 E00D62C0 0C080138 */ jal func_E02004E0 +/* 3D52E0 E00D62C0 0C080138 */ jal shim_rand_int /* 3D52E4 E00D62C4 2404000A */ addiu $a0, $zero, 0xa /* 3D52E8 E00D62C8 02330018 */ mult $s1, $s3 /* 3D52EC E00D62CC 001127C3 */ sra $a0, $s1, 0x1f @@ -211,7 +211,7 @@ glabel LE00D62C0_3D52E0 /* 3D5338 E00D6318 08035985 */ j .LE00D6614 /* 3D533C E00D631C AE000004 */ sw $zero, 4($s0) glabel LE00D6320_3D5340 -/* 3D5340 E00D6320 0C080138 */ jal func_E02004E0 +/* 3D5340 E00D6320 0C080138 */ jal shim_rand_int /* 3D5344 E00D6324 2404000A */ addiu $a0, $zero, 0xa /* 3D5348 E00D6328 02330018 */ mult $s1, $s3 /* 3D534C E00D632C 001127C3 */ sra $a0, $s1, 0x1f @@ -236,7 +236,7 @@ glabel LE00D6320_3D5340 /* 3D5398 E00D6378 08035985 */ j .LE00D6614 /* 3D539C E00D637C AE000004 */ sw $zero, 4($s0) glabel LE00D6380_3D53A0 -/* 3D53A0 E00D6380 0C080138 */ jal func_E02004E0 +/* 3D53A0 E00D6380 0C080138 */ jal shim_rand_int /* 3D53A4 E00D6384 2404000A */ addiu $a0, $zero, 0xa /* 3D53A8 E00D6388 44821000 */ mtc1 $v0, $f2 /* 3D53AC E00D638C 00000000 */ nop @@ -262,7 +262,7 @@ glabel LE00D6380_3D53A0 /* 3D53FC E00D63DC 08035980 */ j .LE00D6600 /* 3D5400 E00D63E0 46241080 */ add.d $f2, $f2, $f4 glabel LE00D63E4_3D5404 -/* 3D5404 E00D63E4 0C080138 */ jal func_E02004E0 +/* 3D5404 E00D63E4 0C080138 */ jal shim_rand_int /* 3D5408 E00D63E8 2404000A */ addiu $a0, $zero, 0xa /* 3D540C E00D63EC 44821000 */ mtc1 $v0, $f2 /* 3D5410 E00D63F0 00000000 */ nop @@ -307,7 +307,7 @@ glabel LE00D63E4_3D5404 /* 3D54AC E00D648C 08035987 */ j .LE00D661C /* 3D54B0 E00D6490 AE9E0030 */ sw $fp, 0x30($s4) glabel LE00D6494_3D54B4 -/* 3D54B4 E00D6494 0C080138 */ jal func_E02004E0 +/* 3D54B4 E00D6494 0C080138 */ jal shim_rand_int /* 3D54B8 E00D6498 2404000A */ addiu $a0, $zero, 0xa /* 3D54BC E00D649C 44821000 */ mtc1 $v0, $f2 /* 3D54C0 E00D64A0 00000000 */ nop @@ -346,7 +346,7 @@ glabel LE00D6494_3D54B4 /* 3D5544 E00D6524 08035987 */ j .LE00D661C /* 3D5548 E00D6528 E604FFF8 */ swc1 $f4, -8($s0) glabel LE00D652C_3D554C -/* 3D554C E00D652C 0C080138 */ jal func_E02004E0 +/* 3D554C E00D652C 0C080138 */ jal shim_rand_int /* 3D5550 E00D6530 2404000A */ addiu $a0, $zero, 0xa /* 3D5554 E00D6534 3C01E00D */ lui $at, %hi(D_E00D6F00) /* 3D5558 E00D6538 D4206F00 */ ldc1 $f0, %lo(D_E00D6F00)($at) @@ -376,7 +376,7 @@ glabel LE00D652C_3D554C /* 3D55B8 E00D6598 08035982 */ j .LE00D6608 /* 3D55BC E00D659C AE02FFD4 */ sw $v0, -0x2c($s0) glabel LE00D65A0_3D55C0 -/* 3D55C0 E00D65A0 0C080138 */ jal func_E02004E0 +/* 3D55C0 E00D65A0 0C080138 */ jal shim_rand_int /* 3D55C4 E00D65A4 2404000A */ addiu $a0, $zero, 0xa /* 3D55C8 E00D65A8 44821000 */ mtc1 $v0, $f2 /* 3D55CC E00D65AC 00000000 */ nop @@ -411,7 +411,7 @@ glabel LE00D65A0_3D55C0 /* 3D5634 E00D6614 46200020 */ cvt.s.d $f0, $f0 /* 3D5638 E00D6618 E600FFF8 */ swc1 $f0, -8($s0) .LE00D661C: -/* 3D563C E00D661C 0C080138 */ jal func_E02004E0 +/* 3D563C E00D661C 0C080138 */ jal shim_rand_int /* 3D5640 E00D6620 8E04FFD4 */ lw $a0, -0x2c($s0) /* 3D5644 E00D6624 C602FFFC */ lwc1 $f2, -4($s0) /* 3D5648 E00D6628 44800000 */ mtc1 $zero, $f0 diff --git a/ver/us/asm/nonmatchings/effects/effect_108/func_E00D8128.s b/ver/us/asm/nonmatchings/effects/effect_108/func_E00D8128.s index e0e25080e1..f41796d3be 100644 --- a/ver/us/asm/nonmatchings/effects/effect_108/func_E00D8128.s +++ b/ver/us/asm/nonmatchings/effects/effect_108/func_E00D8128.s @@ -25,7 +25,7 @@ glabel func_E00D8128 /* 3D6930 E00D8170 24620001 */ addiu $v0, $v1, 1 /* 3D6934 E00D8174 04C10005 */ bgez $a2, .LE00D818C /* 3D6938 E00D8178 ACA20014 */ sw $v0, 0x14($a1) -/* 3D693C E00D817C 0C080128 */ jal func_E02004A0 +/* 3D693C E00D817C 0C080128 */ jal shim_remove_effect /* 3D6940 E00D8180 00000000 */ nop /* 3D6944 E00D8184 08036094 */ j .LE00D8250 /* 3D6948 E00D8188 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_108/func_E00D8630.s b/ver/us/asm/nonmatchings/effects/effect_108/func_E00D8630.s index 9836bd14a1..3ed8ef32a3 100644 --- a/ver/us/asm/nonmatchings/effects/effect_108/func_E00D8630.s +++ b/ver/us/asm/nonmatchings/effects/effect_108/func_E00D8630.s @@ -96,7 +96,7 @@ glabel func_E00D8630 /* 3D6F58 E00D8798 44066000 */ mfc1 $a2, $f12 /* 3D6F5C E00D879C 4600130D */ trunc.w.s $f12, $f2 /* 3D6F60 E00D87A0 44076000 */ mfc1 $a3, $f12 -/* 3D6F64 E00D87A4 0C080190 */ jal func_E0200640 +/* 3D6F64 E00D87A4 0C080190 */ jal shim_draw_box /* 3D6F68 E00D87A8 E7A60034 */ swc1 $f6, 0x34($sp) /* 3D6F6C E00D87AC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* 3D6F70 E00D87B0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) diff --git a/ver/us/asm/nonmatchings/effects/effect_108/fx_108_main.s b/ver/us/asm/nonmatchings/effects/effect_108/fx_108_main.s index da2583473d..fc0f30017d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_108/fx_108_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_108/fx_108_main.s @@ -30,12 +30,12 @@ glabel fx_108_main /* 3D6824 E00D8064 AFBF0034 */ sw $ra, 0x34($sp) /* 3D6828 E00D8068 AFB00028 */ sw $s0, 0x28($sp) /* 3D682C E00D806C AFA00010 */ sw $zero, 0x10($sp) -/* 3D6830 E00D8070 0C080124 */ jal func_E0200490 +/* 3D6830 E00D8070 0C080124 */ jal shim_create_effect_instance /* 3D6834 E00D8074 AFA20014 */ sw $v0, 0x14($sp) /* 3D6838 E00D8078 24040038 */ addiu $a0, $zero, 0x38 /* 3D683C E00D807C 24030001 */ addiu $v1, $zero, 1 /* 3D6840 E00D8080 0040802D */ daddu $s0, $v0, $zero -/* 3D6844 E00D8084 0C08012C */ jal func_E02004B0 +/* 3D6844 E00D8084 0C08012C */ jal shim_general_heap_malloc /* 3D6848 E00D8088 AE030008 */ sw $v1, 8($s0) /* 3D684C E00D808C 0040202D */ daddu $a0, $v0, $zero /* 3D6850 E00D8090 14800003 */ bnez $a0, .LE00D80A0 diff --git a/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA104.s b/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA104.s index f41d79e8ed..65711308b2 100644 --- a/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA104.s +++ b/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA104.s @@ -25,7 +25,7 @@ glabel func_E00DA104 /* 3D738C E00DA14C 24460001 */ addiu $a2, $v0, 1 /* 3D7390 E00DA150 04A10005 */ bgez $a1, .LE00DA168 /* 3D7394 E00DA154 AC660014 */ sw $a2, 0x14($v1) -/* 3D7398 E00DA158 0C080128 */ jal func_E02004A0 +/* 3D7398 E00DA158 0C080128 */ jal shim_remove_effect /* 3D739C E00DA15C 00000000 */ nop /* 3D73A0 E00DA160 08036875 */ j .LE00DA1D4 /* 3D73A4 E00DA164 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA1E0.s b/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA1E0.s index 912e1a17d3..6315f8c59e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA1E0.s +++ b/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA1E0.s @@ -12,7 +12,7 @@ glabel func_E00DA1E0 /* 3D743C E00DA1FC AFA40018 */ sw $a0, 0x18($sp) /* 3D7440 E00DA200 27A40010 */ addiu $a0, $sp, 0x10 /* 3D7444 E00DA204 AFBF0020 */ sw $ra, 0x20($sp) -/* 3D7448 E00DA208 0C080120 */ jal func_E0200480 +/* 3D7448 E00DA208 0C080120 */ jal shim_queue_render_task /* 3D744C E00DA20C AFA20010 */ sw $v0, 0x10($sp) /* 3D7450 E00DA210 8C430000 */ lw $v1, ($v0) /* 3D7454 E00DA214 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA230.s b/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA230.s index 7a4ada5403..f65a24f46c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA230.s +++ b/ver/us/asm/nonmatchings/effects/effect_109/func_E00DA230.s @@ -55,17 +55,17 @@ glabel func_E00DA230 /* 3D7538 E00DA2F8 001110C0 */ sll $v0, $s1, 3 /* 3D753C E00DA2FC 02228821 */ addu $s1, $s1, $v0 /* 3D7540 E00DA300 001188C0 */ sll $s1, $s1, 3 -/* 3D7544 E00DA304 0C080108 */ jal func_E0200420 +/* 3D7544 E00DA304 0C080108 */ jal shim_guTranslateF /* 3D7548 E00DA308 02238821 */ addu $s1, $s1, $v1 /* 3D754C E00DA30C 27B00050 */ addiu $s0, $sp, 0x50 /* 3D7550 E00DA310 4405A000 */ mfc1 $a1, $f20 /* 3D7554 E00DA314 0200202D */ daddu $a0, $s0, $zero /* 3D7558 E00DA318 00A0302D */ daddu $a2, $a1, $zero -/* 3D755C E00DA31C 0C080110 */ jal func_E0200440 +/* 3D755C E00DA31C 0C080110 */ jal shim_guScaleF /* 3D7560 E00DA320 00A0382D */ daddu $a3, $a1, $zero /* 3D7564 E00DA324 0200202D */ daddu $a0, $s0, $zero /* 3D7568 E00DA328 27A50010 */ addiu $a1, $sp, 0x10 -/* 3D756C E00DA32C 0C080114 */ jal func_E0200450 +/* 3D756C E00DA32C 0C080114 */ jal shim_guMtxCatF /* 3D7570 E00DA330 00A0302D */ daddu $a2, $a1, $zero /* 3D7574 E00DA334 27A40010 */ addiu $a0, $sp, 0x10 /* 3D7578 E00DA338 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -76,7 +76,7 @@ glabel func_E00DA230 /* 3D758C E00DA34C 8E820000 */ lw $v0, ($s4) /* 3D7590 E00DA350 00052980 */ sll $a1, $a1, 6 /* 3D7594 E00DA354 00B62821 */ addu $a1, $a1, $s6 -/* 3D7598 E00DA358 0C080118 */ jal func_E0200460 +/* 3D7598 E00DA358 0C080118 */ jal shim_guMtxF2L /* 3D759C E00DA35C 00452821 */ addu $a1, $v0, $a1 /* 3D75A0 E00DA360 3C03DA38 */ lui $v1, 0xda38 /* 3D75A4 E00DA364 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_109/fx_109_main.s b/ver/us/asm/nonmatchings/effects/effect_109/fx_109_main.s index e11114e07f..6747f85153 100644 --- a/ver/us/asm/nonmatchings/effects/effect_109/fx_109_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_109/fx_109_main.s @@ -26,12 +26,12 @@ glabel fx_109_main /* 3D7294 E00DA054 AFB00028 */ sw $s0, 0x28($sp) /* 3D7298 E00DA058 AFA00010 */ sw $zero, 0x10($sp) /* 3D729C E00DA05C AFA00024 */ sw $zero, 0x24($sp) -/* 3D72A0 E00DA060 0C080124 */ jal func_E0200490 +/* 3D72A0 E00DA060 0C080124 */ jal shim_create_effect_instance /* 3D72A4 E00DA064 AFA20014 */ sw $v0, 0x14($sp) /* 3D72A8 E00DA068 24040030 */ addiu $a0, $zero, 0x30 /* 3D72AC E00DA06C 24030001 */ addiu $v1, $zero, 1 /* 3D72B0 E00DA070 0040802D */ daddu $s0, $v0, $zero -/* 3D72B4 E00DA074 0C08012C */ jal func_E02004B0 +/* 3D72B4 E00DA074 0C08012C */ jal shim_general_heap_malloc /* 3D72B8 E00DA078 AE030008 */ sw $v1, 8($s0) /* 3D72BC E00DA07C 0040202D */ daddu $a0, $v0, $zero /* 3D72C0 E00DA080 14800003 */ bnez $a0, .LE00DA090 diff --git a/ver/us/asm/nonmatchings/effects/effect_11/func_E0016228.s b/ver/us/asm/nonmatchings/effects/effect_11/func_E0016228.s index 0d44c8e8dd..6979e590db 100644 --- a/ver/us/asm/nonmatchings/effects/effect_11/func_E0016228.s +++ b/ver/us/asm/nonmatchings/effects/effect_11/func_E0016228.s @@ -37,10 +37,10 @@ glabel func_E0016228 /* 32F0D0 E00162A0 C600FFF8 */ lwc1 $f0, -8($s0) /* 32F0D4 E00162A4 3C014140 */ lui $at, 0x4140 /* 32F0D8 E00162A8 44816000 */ mtc1 $at, $f12 -/* 32F0DC E00162AC 0C08013C */ jal func_E02004F0 +/* 32F0DC E00162AC 0C08013C */ jal shim_clamp_angle /* 32F0E0 E00162B0 460C0300 */ add.s $f12, $f0, $f12 /* 32F0E4 E00162B4 46000306 */ mov.s $f12, $f0 -/* 32F0E8 E00162B8 0C080140 */ jal func_E0200500 +/* 32F0E8 E00162B8 0C080140 */ jal shim_sin_deg /* 32F0EC E00162BC E60CFFF8 */ swc1 $f12, -8($s0) /* 32F0F0 E00162C0 46000021 */ cvt.d.s $f0, $f0 /* 32F0F4 E00162C4 46340002 */ mul.d $f0, $f0, $f20 @@ -50,7 +50,7 @@ glabel func_E0016228 /* 32F104 E00162D4 46201080 */ add.d $f2, $f2, $f0 /* 32F108 E00162D8 C60CFFF8 */ lwc1 $f12, -8($s0) /* 32F10C E00162DC 462010A0 */ cvt.s.d $f2, $f2 -/* 32F110 E00162E0 0C080144 */ jal func_E0200510 +/* 32F110 E00162E0 0C080144 */ jal shim_cos_deg /* 32F114 E00162E4 E602FFE4 */ swc1 $f2, -0x1c($s0) /* 32F118 E00162E8 46000021 */ cvt.d.s $f0, $f0 /* 32F11C E00162EC 46340002 */ mul.d $f0, $f0, $f20 @@ -118,7 +118,7 @@ glabel func_E0016228 .LE00163D8: /* 32F208 E00163D8 16600003 */ bnez $s3, .LE00163E8 /* 32F20C E00163DC 00000000 */ nop -/* 32F210 E00163E0 0C080128 */ jal func_E02004A0 +/* 32F210 E00163E0 0C080128 */ jal shim_remove_effect /* 32F214 E00163E4 0280202D */ daddu $a0, $s4, $zero .LE00163E8: /* 32F218 E00163E8 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_11/func_E0016410.s b/ver/us/asm/nonmatchings/effects/effect_11/func_E0016410.s index 0aacc16613..e81afd8bbc 100644 --- a/ver/us/asm/nonmatchings/effects/effect_11/func_E0016410.s +++ b/ver/us/asm/nonmatchings/effects/effect_11/func_E0016410.s @@ -11,7 +11,7 @@ glabel func_E0016410 /* 32F258 E0016428 27A40010 */ addiu $a0, $sp, 0x10 /* 32F25C E001642C AFBF0020 */ sw $ra, 0x20($sp) /* 32F260 E0016430 AFA00014 */ sw $zero, 0x14($sp) -/* 32F264 E0016434 0C080120 */ jal func_E0200480 +/* 32F264 E0016434 0C080120 */ jal shim_queue_render_task /* 32F268 E0016438 AFA20010 */ sw $v0, 0x10($sp) /* 32F26C E001643C 8C430000 */ lw $v1, ($v0) /* 32F270 E0016440 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_11/func_E0016454.s b/ver/us/asm/nonmatchings/effects/effect_11/func_E0016454.s index fb40b27857..fef40572f8 100644 --- a/ver/us/asm/nonmatchings/effects/effect_11/func_E0016454.s +++ b/ver/us/asm/nonmatchings/effects/effect_11/func_E0016454.s @@ -86,33 +86,33 @@ glabel func_E0016454 /* 32F3C4 E0016594 E7A00018 */ swc1 $f0, 0x18($sp) /* 32F3C8 E0016598 C600000C */ lwc1 $f0, 0xc($s0) /* 32F3CC E001659C 27A40020 */ addiu $a0, $sp, 0x20 -/* 32F3D0 E00165A0 0C080180 */ jal func_E0200600 +/* 32F3D0 E00165A0 0C080180 */ jal shim_guPositionF /* 32F3D4 E00165A4 E7A0001C */ swc1 $f0, 0x1c($sp) /* 32F3D8 E00165A8 8E050014 */ lw $a1, 0x14($s0) /* 32F3DC E00165AC 8E060018 */ lw $a2, 0x18($s0) /* 32F3E0 E00165B0 8E07001C */ lw $a3, 0x1c($s0) -/* 32F3E4 E00165B4 0C080110 */ jal func_E0200440 +/* 32F3E4 E00165B4 0C080110 */ jal shim_guScaleF /* 32F3E8 E00165B8 0220202D */ daddu $a0, $s1, $zero /* 32F3EC E00165BC 0220202D */ daddu $a0, $s1, $zero /* 32F3F0 E00165C0 27A50020 */ addiu $a1, $sp, 0x20 -/* 32F3F4 E00165C4 0C080114 */ jal func_E0200450 +/* 32F3F4 E00165C4 0C080114 */ jal shim_guMtxCatF /* 32F3F8 E00165C8 00A0302D */ daddu $a2, $a1, $zero /* 32F3FC E00165CC E7B60010 */ swc1 $f22, 0x10($sp) /* 32F400 E00165D0 8E050010 */ lw $a1, 0x10($s0) /* 32F404 E00165D4 4406A000 */ mfc1 $a2, $f20 /* 32F408 E00165D8 4407A000 */ mfc1 $a3, $f20 -/* 32F40C E00165DC 0C080104 */ jal func_E0200410 +/* 32F40C E00165DC 0C080104 */ jal shim_guRotateF /* 32F410 E00165E0 0220202D */ daddu $a0, $s1, $zero /* 32F414 E00165E4 0220202D */ daddu $a0, $s1, $zero /* 32F418 E00165E8 27A50020 */ addiu $a1, $sp, 0x20 -/* 32F41C E00165EC 0C080114 */ jal func_E0200450 +/* 32F41C E00165EC 0C080114 */ jal shim_guMtxCatF /* 32F420 E00165F0 00A0302D */ daddu $a2, $a1, $zero /* 32F424 E00165F4 27A40020 */ addiu $a0, $sp, 0x20 /* 32F428 E00165F8 96E50000 */ lhu $a1, ($s7) /* 32F42C E00165FC 8FC20000 */ lw $v0, ($fp) /* 32F430 E0016600 00052980 */ sll $a1, $a1, 6 /* 32F434 E0016604 00B52821 */ addu $a1, $a1, $s5 -/* 32F438 E0016608 0C080118 */ jal func_E0200460 +/* 32F438 E0016608 0C080118 */ jal shim_guMtxF2L /* 32F43C E001660C 00452821 */ addu $a1, $v0, $a1 /* 32F440 E0016610 3C077060 */ lui $a3, 0x7060 /* 32F444 E0016614 34E71800 */ ori $a3, $a3, 0x1800 diff --git a/ver/us/asm/nonmatchings/effects/effect_11/fx_11_main.s b/ver/us/asm/nonmatchings/effects/effect_11/fx_11_main.s index 5aa59fc2ca..732128ac23 100644 --- a/ver/us/asm/nonmatchings/effects/effect_11/fx_11_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_11/fx_11_main.s @@ -33,12 +33,12 @@ glabel fx_11_main /* 32EEA0 E0016070 F7B40048 */ sdc1 $f20, 0x48($sp) /* 32EEA4 E0016074 AFA00010 */ sw $zero, 0x10($sp) /* 32EEA8 E0016078 AFA00024 */ sw $zero, 0x24($sp) -/* 32EEAC E001607C 0C080124 */ jal func_E0200490 +/* 32EEAC E001607C 0C080124 */ jal shim_create_effect_instance /* 32EEB0 E0016080 AFA20014 */ sw $v0, 0x14($sp) /* 32EEB4 E0016084 24040050 */ addiu $a0, $zero, 0x50 /* 32EEB8 E0016088 24130001 */ addiu $s3, $zero, 1 /* 32EEBC E001608C 0040802D */ daddu $s0, $v0, $zero -/* 32EEC0 E0016090 0C08012C */ jal func_E02004B0 +/* 32EEC0 E0016090 0C08012C */ jal shim_general_heap_malloc /* 32EEC4 E0016094 AE130008 */ sw $s3, 8($s0) /* 32EEC8 E0016098 0040882D */ daddu $s1, $v0, $zero /* 32EECC E001609C 16200003 */ bnez $s1, .LE00160AC @@ -50,7 +50,7 @@ glabel fx_11_main /* 32EEDC E00160AC 0220202D */ daddu $a0, $s1, $zero /* 32EEE0 E00160B0 00132880 */ sll $a1, $s3, 2 /* 32EEE4 E00160B4 00B32821 */ addu $a1, $a1, $s3 -/* 32EEE8 E00160B8 0C080130 */ jal func_E02004C0 +/* 32EEE8 E00160B8 0C080130 */ jal shim_mem_clear /* 32EEEC E00160BC 00052900 */ sll $a1, $a1, 4 /* 32EEF0 E00160C0 0000902D */ daddu $s2, $zero, $zero /* 32EEF4 E00160C4 0253102A */ slt $v0, $s2, $s3 @@ -74,7 +74,7 @@ glabel fx_11_main /* 32EF38 E0016108 E6160014 */ swc1 $f22, 0x14($s0) /* 32EF3C E001610C E6160018 */ swc1 $f22, 0x18($s0) /* 32EF40 E0016110 E616001C */ swc1 $f22, 0x1c($s0) -/* 32EF44 E0016114 0C080138 */ jal func_E02004E0 +/* 32EF44 E0016114 0C080138 */ jal shim_rand_int /* 32EF48 E0016118 A2140000 */ sb $s4, ($s0) /* 32EF4C E001611C 44820000 */ mtc1 $v0, $f0 /* 32EF50 E0016120 00000000 */ nop @@ -86,7 +86,7 @@ glabel fx_11_main /* 32EF68 E0016138 46220000 */ add.d $f0, $f0, $f2 /* 32EF6C E001613C 2404000A */ addiu $a0, $zero, 0xa /* 32EF70 E0016140 46200020 */ cvt.s.d $f0, $f0 -/* 32EF74 E0016144 0C080138 */ jal func_E02004E0 +/* 32EF74 E0016144 0C080138 */ jal shim_rand_int /* 32EF78 E0016148 E6000020 */ swc1 $f0, 0x20($s0) /* 32EF7C E001614C 44820000 */ mtc1 $v0, $f0 /* 32EF80 E0016150 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC198.s b/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC198.s index 4394d74a88..e64108d4fe 100644 --- a/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC198.s +++ b/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC198.s @@ -25,7 +25,7 @@ glabel func_E00DC198 /* 3D7C50 E00DC1E0 24460001 */ addiu $a2, $v0, 1 /* 3D7C54 E00DC1E4 04A10005 */ bgez $a1, .LE00DC1FC /* 3D7C58 E00DC1E8 AC660014 */ sw $a2, 0x14($v1) -/* 3D7C5C E00DC1EC 0C080128 */ jal func_E02004A0 +/* 3D7C5C E00DC1EC 0C080128 */ jal shim_remove_effect /* 3D7C60 E00DC1F0 00000000 */ nop /* 3D7C64 E00DC1F4 080370AD */ j .LE00DC2B4 /* 3D7C68 E00DC1F8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC2C0.s b/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC2C0.s index 4bad18eb22..a071ce6182 100644 --- a/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC2C0.s +++ b/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC2C0.s @@ -12,7 +12,7 @@ glabel func_E00DC2C0 /* 3D7D4C E00DC2DC AFA40018 */ sw $a0, 0x18($sp) /* 3D7D50 E00DC2E0 27A40010 */ addiu $a0, $sp, 0x10 /* 3D7D54 E00DC2E4 AFBF0020 */ sw $ra, 0x20($sp) -/* 3D7D58 E00DC2E8 0C080120 */ jal func_E0200480 +/* 3D7D58 E00DC2E8 0C080120 */ jal shim_queue_render_task /* 3D7D5C E00DC2EC AFA20010 */ sw $v0, 0x10($sp) /* 3D7D60 E00DC2F0 8FBF0020 */ lw $ra, 0x20($sp) /* 3D7D64 E00DC2F4 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC304.s b/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC304.s index c37eb39a80..ca1abff37e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC304.s +++ b/ver/us/asm/nonmatchings/effects/effect_110/func_E00DC304.s @@ -65,7 +65,7 @@ glabel func_E00DC304 /* 3D7E64 E00DC3F4 44133000 */ mfc1 $s3, $f6 /* 3D7E68 E00DC3F8 4600218D */ trunc.w.s $f6, $f4 /* 3D7E6C E00DC3FC 44163000 */ mfc1 $s6, $f6 -/* 3D7E70 E00DC400 0C080108 */ jal func_E0200420 +/* 3D7E70 E00DC400 0C080108 */ jal shim_guTranslateF /* 3D7E74 E00DC404 02238821 */ addu $s1, $s1, $v1 /* 3D7E78 E00DC408 37DE1630 */ ori $fp, $fp, 0x1630 /* 3D7E7C E00DC40C 3C013F80 */ lui $at, 0x3f80 @@ -76,20 +76,20 @@ glabel func_E00DC304 /* 3D7E90 E00DC420 0200202D */ daddu $a0, $s0, $zero /* 3D7E94 E00DC424 44060000 */ mfc1 $a2, $f0 /* 3D7E98 E00DC428 8E450048 */ lw $a1, 0x48($s2) -/* 3D7E9C E00DC42C 0C080104 */ jal func_E0200410 +/* 3D7E9C E00DC42C 0C080104 */ jal shim_guRotateF /* 3D7EA0 E00DC430 00C0382D */ daddu $a3, $a2, $zero /* 3D7EA4 E00DC434 0200202D */ daddu $a0, $s0, $zero /* 3D7EA8 E00DC438 27A50018 */ addiu $a1, $sp, 0x18 -/* 3D7EAC E00DC43C 0C080114 */ jal func_E0200450 +/* 3D7EAC E00DC43C 0C080114 */ jal shim_guMtxCatF /* 3D7EB0 E00DC440 00A0302D */ daddu $a2, $a1, $zero /* 3D7EB4 E00DC444 8E45004C */ lw $a1, 0x4c($s2) /* 3D7EB8 E00DC448 0200202D */ daddu $a0, $s0, $zero /* 3D7EBC E00DC44C 00A0302D */ daddu $a2, $a1, $zero -/* 3D7EC0 E00DC450 0C080110 */ jal func_E0200440 +/* 3D7EC0 E00DC450 0C080110 */ jal shim_guScaleF /* 3D7EC4 E00DC454 00A0382D */ daddu $a3, $a1, $zero /* 3D7EC8 E00DC458 0200202D */ daddu $a0, $s0, $zero /* 3D7ECC E00DC45C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3D7ED0 E00DC460 0C080114 */ jal func_E0200450 +/* 3D7ED0 E00DC460 0C080114 */ jal shim_guMtxCatF /* 3D7ED4 E00DC464 00A0302D */ daddu $a2, $a1, $zero /* 3D7ED8 E00DC468 27A40018 */ addiu $a0, $sp, 0x18 /* 3D7EDC E00DC46C 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -100,7 +100,7 @@ glabel func_E00DC304 /* 3D7EF0 E00DC480 8EA20000 */ lw $v0, ($s5) /* 3D7EF4 E00DC484 00052980 */ sll $a1, $a1, 6 /* 3D7EF8 E00DC488 00BE2821 */ addu $a1, $a1, $fp -/* 3D7EFC E00DC48C 0C080118 */ jal func_E0200460 +/* 3D7EFC E00DC48C 0C080118 */ jal shim_guMtxF2L /* 3D7F00 E00DC490 00452821 */ addu $a1, $v0, $a1 /* 3D7F04 E00DC494 3C03DA38 */ lui $v1, 0xda38 /* 3D7F08 E00DC498 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_110/fx_110_main.s b/ver/us/asm/nonmatchings/effects/effect_110/fx_110_main.s index a07fc19cd3..7bf6427171 100644 --- a/ver/us/asm/nonmatchings/effects/effect_110/fx_110_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_110/fx_110_main.s @@ -29,12 +29,12 @@ glabel fx_110_main /* 3D7AD0 E00DC060 AFB1002C */ sw $s1, 0x2c($sp) /* 3D7AD4 E00DC064 AFA00010 */ sw $zero, 0x10($sp) /* 3D7AD8 E00DC068 AFA00024 */ sw $zero, 0x24($sp) -/* 3D7ADC E00DC06C 0C080124 */ jal func_E0200490 +/* 3D7ADC E00DC06C 0C080124 */ jal shim_create_effect_instance /* 3D7AE0 E00DC070 AFA20014 */ sw $v0, 0x14($sp) /* 3D7AE4 E00DC074 24040050 */ addiu $a0, $zero, 0x50 /* 3D7AE8 E00DC078 24030001 */ addiu $v1, $zero, 1 /* 3D7AEC E00DC07C 0040902D */ daddu $s2, $v0, $zero -/* 3D7AF0 E00DC080 0C08012C */ jal func_E02004B0 +/* 3D7AF0 E00DC080 0C08012C */ jal shim_general_heap_malloc /* 3D7AF4 E00DC084 AE430008 */ sw $v1, 8($s2) /* 3D7AF8 E00DC088 0040882D */ daddu $s1, $v0, $zero /* 3D7AFC E00DC08C 16200003 */ bnez $s1, .LE00DC09C @@ -73,13 +73,13 @@ glabel fx_110_main /* 3D7B70 E00DC100 E6200048 */ swc1 $f0, 0x48($s1) /* 3D7B74 E00DC104 C7A0006C */ lwc1 $f0, 0x6c($sp) /* 3D7B78 E00DC108 24040020 */ addiu $a0, $zero, 0x20 -/* 3D7B7C E00DC10C 0C080138 */ jal func_E02004E0 +/* 3D7B7C E00DC10C 0C080138 */ jal shim_rand_int /* 3D7B80 E00DC110 E620003C */ swc1 $f0, 0x3c($s1) /* 3D7B84 E00DC114 24040010 */ addiu $a0, $zero, 0x10 /* 3D7B88 E00DC118 44820000 */ mtc1 $v0, $f0 /* 3D7B8C E00DC11C 00000000 */ nop /* 3D7B90 E00DC120 46800020 */ cvt.s.w $f0, $f0 -/* 3D7B94 E00DC124 0C080138 */ jal func_E02004E0 +/* 3D7B94 E00DC124 0C080138 */ jal shim_rand_int /* 3D7B98 E00DC128 E6200038 */ swc1 $f0, 0x38($s1) /* 3D7B9C E00DC12C 44820000 */ mtc1 $v0, $f0 /* 3D7BA0 E00DC130 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE124.s b/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE124.s index 8158b1bc51..7c55a6a8b7 100644 --- a/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE124.s +++ b/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE124.s @@ -26,7 +26,7 @@ glabel func_E00DE124 /* 3D8890 E00DE170 24420001 */ addiu $v0, $v0, 1 /* 3D8894 E00DE174 04A10005 */ bgez $a1, .LE00DE18C /* 3D8898 E00DE178 AC620014 */ sw $v0, 0x14($v1) -/* 3D889C E00DE17C 0C080128 */ jal func_E02004A0 +/* 3D889C E00DE17C 0C080128 */ jal shim_remove_effect /* 3D88A0 E00DE180 00000000 */ nop /* 3D88A4 E00DE184 08037895 */ j .LE00DE254 /* 3D88A8 E00DE188 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE260.s b/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE260.s index 68ab217ae5..df753c9379 100644 --- a/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE260.s +++ b/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE260.s @@ -12,7 +12,7 @@ glabel func_E00DE260 /* 3D899C E00DE27C AFA40018 */ sw $a0, 0x18($sp) /* 3D89A0 E00DE280 27A40010 */ addiu $a0, $sp, 0x10 /* 3D89A4 E00DE284 AFBF0020 */ sw $ra, 0x20($sp) -/* 3D89A8 E00DE288 0C080120 */ jal func_E0200480 +/* 3D89A8 E00DE288 0C080120 */ jal shim_queue_render_task /* 3D89AC E00DE28C AFA20010 */ sw $v0, 0x10($sp) /* 3D89B0 E00DE290 8C430000 */ lw $v1, ($v0) /* 3D89B4 E00DE294 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE2A8.s b/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE2A8.s index 075a25c135..8744e0c3c8 100644 --- a/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE2A8.s +++ b/ver/us/asm/nonmatchings/effects/effect_111/func_E00DE2A8.s @@ -54,17 +54,17 @@ glabel func_E00DE2A8 /* 3D8A8C E00DE36C 001010C0 */ sll $v0, $s0, 3 /* 3D8A90 E00DE370 02028021 */ addu $s0, $s0, $v0 /* 3D8A94 E00DE374 001080C0 */ sll $s0, $s0, 3 -/* 3D8A98 E00DE378 0C080108 */ jal func_E0200420 +/* 3D8A98 E00DE378 0C080108 */ jal shim_guTranslateF /* 3D8A9C E00DE37C 02038021 */ addu $s0, $s0, $v1 /* 3D8AA0 E00DE380 27B10060 */ addiu $s1, $sp, 0x60 /* 3D8AA4 E00DE384 8EC50040 */ lw $a1, 0x40($s6) /* 3D8AA8 E00DE388 0220202D */ daddu $a0, $s1, $zero /* 3D8AAC E00DE38C 00A0302D */ daddu $a2, $a1, $zero -/* 3D8AB0 E00DE390 0C080110 */ jal func_E0200440 +/* 3D8AB0 E00DE390 0C080110 */ jal shim_guScaleF /* 3D8AB4 E00DE394 00A0382D */ daddu $a3, $a1, $zero /* 3D8AB8 E00DE398 0220202D */ daddu $a0, $s1, $zero /* 3D8ABC E00DE39C 27A50020 */ addiu $a1, $sp, 0x20 -/* 3D8AC0 E00DE3A0 0C080114 */ jal func_E0200450 +/* 3D8AC0 E00DE3A0 0C080114 */ jal shim_guMtxCatF /* 3D8AC4 E00DE3A4 00A0302D */ daddu $a2, $a1, $zero /* 3D8AC8 E00DE3A8 27A40020 */ addiu $a0, $sp, 0x20 /* 3D8ACC E00DE3AC 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -75,7 +75,7 @@ glabel func_E00DE2A8 /* 3D8AE0 E00DE3C0 8E620000 */ lw $v0, ($s3) /* 3D8AE4 E00DE3C4 00052980 */ sll $a1, $a1, 6 /* 3D8AE8 E00DE3C8 00B42821 */ addu $a1, $a1, $s4 -/* 3D8AEC E00DE3CC 0C080118 */ jal func_E0200460 +/* 3D8AEC E00DE3CC 0C080118 */ jal shim_guMtxF2L /* 3D8AF0 E00DE3D0 00452821 */ addu $a1, $v0, $a1 /* 3D8AF4 E00DE3D4 3C03DA38 */ lui $v1, 0xda38 /* 3D8AF8 E00DE3D8 34630002 */ ori $v1, $v1, 2 @@ -204,7 +204,7 @@ glabel func_E00DE2A8 /* 3D8CD8 E00DE5B8 00000000 */ nop /* 3D8CDC E00DE5BC 46800020 */ cvt.s.w $f0, $f0 /* 3D8CE0 E00DE5C0 E7A00014 */ swc1 $f0, 0x14($sp) -/* 3D8CE4 E00DE5C4 0C080180 */ jal func_E0200600 +/* 3D8CE4 E00DE5C4 0C080180 */ jal shim_guPositionF /* 3D8CE8 E00DE5C8 E7A20010 */ swc1 $f2, 0x10($sp) /* 3D8CEC E00DE5CC 27A40020 */ addiu $a0, $sp, 0x20 /* 3D8CF0 E00DE5D0 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -215,7 +215,7 @@ glabel func_E00DE2A8 /* 3D8D04 E00DE5E4 8E420000 */ lw $v0, ($s2) /* 3D8D08 E00DE5E8 00052980 */ sll $a1, $a1, 6 /* 3D8D0C E00DE5EC 00B32821 */ addu $a1, $a1, $s3 -/* 3D8D10 E00DE5F0 0C080118 */ jal func_E0200460 +/* 3D8D10 E00DE5F0 0C080118 */ jal shim_guMtxF2L /* 3D8D14 E00DE5F4 00452821 */ addu $a1, $v0, $a1 /* 3D8D18 E00DE5F8 8E850000 */ lw $a1, ($s4) /* 3D8D1C E00DE5FC 00A0202D */ daddu $a0, $a1, $zero diff --git a/ver/us/asm/nonmatchings/effects/effect_111/fx_111_main.s b/ver/us/asm/nonmatchings/effects/effect_111/fx_111_main.s index fb39d599af..dbdc7ee443 100644 --- a/ver/us/asm/nonmatchings/effects/effect_111/fx_111_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_111/fx_111_main.s @@ -28,12 +28,12 @@ glabel fx_111_main /* 3D877C E00DE05C AFB00028 */ sw $s0, 0x28($sp) /* 3D8780 E00DE060 AFA00010 */ sw $zero, 0x10($sp) /* 3D8784 E00DE064 AFA00024 */ sw $zero, 0x24($sp) -/* 3D8788 E00DE068 0C080124 */ jal func_E0200490 +/* 3D8788 E00DE068 0C080124 */ jal shim_create_effect_instance /* 3D878C E00DE06C AFA20014 */ sw $v0, 0x14($sp) /* 3D8790 E00DE070 24040044 */ addiu $a0, $zero, 0x44 /* 3D8794 E00DE074 24030001 */ addiu $v1, $zero, 1 /* 3D8798 E00DE078 0040802D */ daddu $s0, $v0, $zero -/* 3D879C E00DE07C 0C08012C */ jal func_E02004B0 +/* 3D879C E00DE07C 0C08012C */ jal shim_general_heap_malloc /* 3D87A0 E00DE080 AE030008 */ sw $v1, 8($s0) /* 3D87A4 E00DE084 0040202D */ daddu $a0, $v0, $zero /* 3D87A8 E00DE088 14800003 */ bnez $a0, .LE00DE098 diff --git a/ver/us/asm/nonmatchings/effects/effect_112/func_E00E01D8.s b/ver/us/asm/nonmatchings/effects/effect_112/func_E00E01D8.s index 1ec335d4eb..4873450032 100644 --- a/ver/us/asm/nonmatchings/effects/effect_112/func_E00E01D8.s +++ b/ver/us/asm/nonmatchings/effects/effect_112/func_E00E01D8.s @@ -44,7 +44,7 @@ glabel func_E00E01D8 /* 3DB6C8 E00E0268 8C830018 */ lw $v1, 0x18($a0) /* 3DB6CC E00E026C 04610005 */ bgez $v1, .LE00E0284 /* 3DB6D0 E00E0270 28620010 */ slti $v0, $v1, 0x10 -/* 3DB6D4 E00E0274 0C080128 */ jal func_E02004A0 +/* 3DB6D4 E00E0274 0C080128 */ jal shim_remove_effect /* 3DB6D8 E00E0278 0240202D */ daddu $a0, $s2, $zero /* 3DB6DC E00E027C 0803815F */ j .LE00E057C /* 3DB6E0 E00E0280 00000000 */ nop @@ -92,7 +92,7 @@ glabel func_E00E01D8 /* 3DB774 E00E0314 00000000 */ nop /* 3DB778 E00E0318 4600C68D */ trunc.w.s $f26, $f24 /* 3DB77C E00E031C 4404D000 */ mfc1 $a0, $f26 -/* 3DB780 E00E0320 0C080138 */ jal func_E02004E0 +/* 3DB780 E00E0320 0C080138 */ jal shim_rand_int /* 3DB784 E00E0324 00000000 */ nop /* 3DB788 E00E0328 3C013FE0 */ lui $at, 0x3fe0 /* 3DB78C E00E032C 44810800 */ mtc1 $at, $f1 @@ -107,14 +107,14 @@ glabel func_E00E01D8 /* 3DB7B0 E00E0350 4600F68D */ trunc.w.s $f26, $f30 /* 3DB7B4 E00E0354 4404D000 */ mfc1 $a0, $f26 /* 3DB7B8 E00E0358 46200020 */ cvt.s.d $f0, $f0 -/* 3DB7BC E00E035C 0C080138 */ jal func_E02004E0 +/* 3DB7BC E00E035C 0C080138 */ jal shim_rand_int /* 3DB7C0 E00E0360 E600FFB8 */ swc1 $f0, -0x48($s0) /* 3DB7C4 E00E0364 24040014 */ addiu $a0, $zero, 0x14 /* 3DB7C8 E00E0368 44820000 */ mtc1 $v0, $f0 /* 3DB7CC E00E036C 00000000 */ nop /* 3DB7D0 E00E0370 46800020 */ cvt.s.w $f0, $f0 /* 3DB7D4 E00E0374 E600FFBC */ swc1 $f0, -0x44($s0) -/* 3DB7D8 E00E0378 0C080138 */ jal func_E02004E0 +/* 3DB7D8 E00E0378 0C080138 */ jal shim_rand_int /* 3DB7DC E00E037C AE00FFC0 */ sw $zero, -0x40($s0) /* 3DB7E0 E00E0380 2442FFF6 */ addiu $v0, $v0, -0xa /* 3DB7E4 E00E0384 44820000 */ mtc1 $v0, $f0 @@ -125,7 +125,7 @@ glabel func_E00E01D8 /* 3DB7F8 E00E0398 00000000 */ nop /* 3DB7FC E00E039C 24040028 */ addiu $a0, $zero, 0x28 /* 3DB800 E00E03A0 46200020 */ cvt.s.d $f0, $f0 -/* 3DB804 E00E03A4 0C080138 */ jal func_E02004E0 +/* 3DB804 E00E03A4 0C080138 */ jal shim_rand_int /* 3DB808 E00E03A8 E600FFF8 */ swc1 $f0, -8($s0) /* 3DB80C E00E03AC 2442FFFF */ addiu $v0, $v0, -1 /* 3DB810 E00E03B0 44820000 */ mtc1 $v0, $f0 @@ -139,7 +139,7 @@ glabel func_E00E01D8 /* 3DB830 E00E03D0 24040014 */ addiu $a0, $zero, 0x14 /* 3DB834 E00E03D4 AE000000 */ sw $zero, ($s0) /* 3DB838 E00E03D8 46200020 */ cvt.s.d $f0, $f0 -/* 3DB83C E00E03DC 0C080138 */ jal func_E02004E0 +/* 3DB83C E00E03DC 0C080138 */ jal shim_rand_int /* 3DB840 E00E03E0 E600FFFC */ swc1 $f0, -4($s0) /* 3DB844 E00E03E4 2442FFF6 */ addiu $v0, $v0, -0xa /* 3DB848 E00E03E8 44820000 */ mtc1 $v0, $f0 @@ -150,7 +150,7 @@ glabel func_E00E01D8 /* 3DB85C E00E03FC 00000000 */ nop /* 3DB860 E00E0400 2404001E */ addiu $a0, $zero, 0x1e /* 3DB864 E00E0404 46200020 */ cvt.s.d $f0, $f0 -/* 3DB868 E00E0408 0C080138 */ jal func_E02004E0 +/* 3DB868 E00E0408 0C080138 */ jal shim_rand_int /* 3DB86C E00E040C E6000004 */ swc1 $f0, 4($s0) /* 3DB870 E00E0410 2442FFFF */ addiu $v0, $v0, -1 /* 3DB874 E00E0414 C7BA0010 */ lwc1 $f26, 0x10($sp) @@ -165,13 +165,13 @@ glabel func_E00E01D8 /* 3DB898 E00E0438 2404000F */ addiu $a0, $zero, 0xf /* 3DB89C E00E043C AE00000C */ sw $zero, 0xc($s0) /* 3DB8A0 E00E0440 46200020 */ cvt.s.d $f0, $f0 -/* 3DB8A4 E00E0444 0C080138 */ jal func_E02004E0 +/* 3DB8A4 E00E0444 0C080138 */ jal shim_rand_int /* 3DB8A8 E00E0448 E6000008 */ swc1 $f0, 8($s0) /* 3DB8AC E00E044C 2404000F */ addiu $a0, $zero, 0xf /* 3DB8B0 E00E0450 44820000 */ mtc1 $v0, $f0 /* 3DB8B4 E00E0454 00000000 */ nop /* 3DB8B8 E00E0458 46800020 */ cvt.s.w $f0, $f0 -/* 3DB8BC E00E045C 0C080138 */ jal func_E02004E0 +/* 3DB8BC E00E045C 0C080138 */ jal shim_rand_int /* 3DB8C0 E00E0460 E6000010 */ swc1 $f0, 0x10($s0) /* 3DB8C4 E00E0464 44820000 */ mtc1 $v0, $f0 /* 3DB8C8 E00E0468 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_112/func_E00E05B0.s b/ver/us/asm/nonmatchings/effects/effect_112/func_E00E05B0.s index b1cff1ee2a..c25fba3c24 100644 --- a/ver/us/asm/nonmatchings/effects/effect_112/func_E00E05B0.s +++ b/ver/us/asm/nonmatchings/effects/effect_112/func_E00E05B0.s @@ -12,7 +12,7 @@ glabel func_E00E05B0 /* 3DBA2C E00E05CC AFA40018 */ sw $a0, 0x18($sp) /* 3DBA30 E00E05D0 27A40010 */ addiu $a0, $sp, 0x10 /* 3DBA34 E00E05D4 AFBF0020 */ sw $ra, 0x20($sp) -/* 3DBA38 E00E05D8 0C080120 */ jal func_E0200480 +/* 3DBA38 E00E05D8 0C080120 */ jal shim_queue_render_task /* 3DBA3C E00E05DC AFA20010 */ sw $v0, 0x10($sp) /* 3DBA40 E00E05E0 8C430000 */ lw $v1, ($v0) /* 3DBA44 E00E05E4 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_112/func_E00E0600.s b/ver/us/asm/nonmatchings/effects/effect_112/func_E00E0600.s index 9c40bf44bf..8c537e1bc7 100644 --- a/ver/us/asm/nonmatchings/effects/effect_112/func_E00E0600.s +++ b/ver/us/asm/nonmatchings/effects/effect_112/func_E00E0600.s @@ -53,17 +53,17 @@ glabel func_E00E0600 /* 3DBB20 E00E06C0 001010C0 */ sll $v0, $s0, 3 /* 3DBB24 E00E06C4 02028021 */ addu $s0, $s0, $v0 /* 3DBB28 E00E06C8 001080C0 */ sll $s0, $s0, 3 -/* 3DBB2C E00E06CC 0C080108 */ jal func_E0200420 +/* 3DBB2C E00E06CC 0C080108 */ jal shim_guTranslateF /* 3DBB30 E00E06D0 02038021 */ addu $s0, $s0, $v1 /* 3DBB34 E00E06D4 27B10050 */ addiu $s1, $sp, 0x50 /* 3DBB38 E00E06D8 8E850040 */ lw $a1, 0x40($s4) /* 3DBB3C E00E06DC 0220202D */ daddu $a0, $s1, $zero /* 3DBB40 E00E06E0 00A0302D */ daddu $a2, $a1, $zero -/* 3DBB44 E00E06E4 0C080110 */ jal func_E0200440 +/* 3DBB44 E00E06E4 0C080110 */ jal shim_guScaleF /* 3DBB48 E00E06E8 00A0382D */ daddu $a3, $a1, $zero /* 3DBB4C E00E06EC 0220202D */ daddu $a0, $s1, $zero /* 3DBB50 E00E06F0 27A50010 */ addiu $a1, $sp, 0x10 -/* 3DBB54 E00E06F4 0C080114 */ jal func_E0200450 +/* 3DBB54 E00E06F4 0C080114 */ jal shim_guMtxCatF /* 3DBB58 E00E06F8 00A0302D */ daddu $a2, $a1, $zero /* 3DBB5C E00E06FC 27A40010 */ addiu $a0, $sp, 0x10 /* 3DBB60 E00E0700 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -74,7 +74,7 @@ glabel func_E00E0600 /* 3DBB74 E00E0714 8EE20000 */ lw $v0, ($s7) /* 3DBB78 E00E0718 00052980 */ sll $a1, $a1, 6 /* 3DBB7C E00E071C 00B32821 */ addu $a1, $a1, $s3 -/* 3DBB80 E00E0720 0C080118 */ jal func_E0200460 +/* 3DBB80 E00E0720 0C080118 */ jal shim_guMtxF2L /* 3DBB84 E00E0724 00452821 */ addu $a1, $v0, $a1 /* 3DBB88 E00E0728 3C03DA38 */ lui $v1, 0xda38 /* 3DBB8C E00E072C 34630002 */ ori $v1, $v1, 2 @@ -153,14 +153,14 @@ glabel func_E00E0600 /* 3DBCAC E00E084C 8E05FFA4 */ lw $a1, -0x5c($s0) /* 3DBCB0 E00E0850 8E06FFA8 */ lw $a2, -0x58($s0) /* 3DBCB4 E00E0854 8E07FFAC */ lw $a3, -0x54($s0) -/* 3DBCB8 E00E0858 0C080108 */ jal func_E0200420 +/* 3DBCB8 E00E0858 0C080108 */ jal shim_guTranslateF /* 3DBCBC E00E085C 27A40010 */ addiu $a0, $sp, 0x10 /* 3DBCC0 E00E0860 27A40010 */ addiu $a0, $sp, 0x10 /* 3DBCC4 E00E0864 96650000 */ lhu $a1, ($s3) /* 3DBCC8 E00E0868 8EE20000 */ lw $v0, ($s7) /* 3DBCCC E00E086C 00052980 */ sll $a1, $a1, 6 /* 3DBCD0 E00E0870 00B22821 */ addu $a1, $a1, $s2 -/* 3DBCD4 E00E0874 0C080118 */ jal func_E0200460 +/* 3DBCD4 E00E0874 0C080118 */ jal shim_guMtxF2L /* 3DBCD8 E00E0878 00452821 */ addu $a1, $v0, $a1 /* 3DBCDC E00E087C 8E260000 */ lw $a2, ($s1) /* 3DBCE0 E00E0880 02A0382D */ daddu $a3, $s5, $zero diff --git a/ver/us/asm/nonmatchings/effects/effect_112/fx_112_main.s b/ver/us/asm/nonmatchings/effects/effect_112/fx_112_main.s index 5c19d6ed84..e9670d58c4 100644 --- a/ver/us/asm/nonmatchings/effects/effect_112/fx_112_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_112/fx_112_main.s @@ -31,13 +31,13 @@ glabel fx_112_main /* 3DB4C8 E00E0068 AFA00010 */ sw $zero, 0x10($sp) /* 3DB4CC E00E006C AFA00024 */ sw $zero, 0x24($sp) /* 3DB4D0 E00E0070 AFA20014 */ sw $v0, 0x14($sp) -/* 3DB4D4 E00E0074 0C080124 */ jal func_E0200490 +/* 3DB4D4 E00E0074 0C080124 */ jal shim_create_effect_instance /* 3DB4D8 E00E0078 26100001 */ addiu $s0, $s0, 1 /* 3DB4DC E00E007C 001020C0 */ sll $a0, $s0, 3 /* 3DB4E0 E00E0080 00902023 */ subu $a0, $a0, $s0 /* 3DB4E4 E00E0084 00042100 */ sll $a0, $a0, 4 /* 3DB4E8 E00E0088 0040882D */ daddu $s1, $v0, $zero -/* 3DB4EC E00E008C 0C08012C */ jal func_E02004B0 +/* 3DB4EC E00E008C 0C08012C */ jal shim_general_heap_malloc /* 3DB4F0 E00E0090 AE300008 */ sw $s0, 8($s1) /* 3DB4F4 E00E0094 0040202D */ daddu $a0, $v0, $zero /* 3DB4F8 E00E0098 14800003 */ bnez $a0, .LE00E00A8 diff --git a/ver/us/asm/nonmatchings/effects/effect_113/func_E00E2134.s b/ver/us/asm/nonmatchings/effects/effect_113/func_E00E2134.s index 37b86e3a5c..9bfa2bfcf4 100644 --- a/ver/us/asm/nonmatchings/effects/effect_113/func_E00E2134.s +++ b/ver/us/asm/nonmatchings/effects/effect_113/func_E00E2134.s @@ -25,7 +25,7 @@ glabel func_E00E2134 /* 3DC48C E00E217C 24460001 */ addiu $a2, $v0, 1 /* 3DC490 E00E2180 04610005 */ bgez $v1, .LE00E2198 /* 3DC494 E00E2184 ACA60014 */ sw $a2, 0x14($a1) -/* 3DC498 E00E2188 0C080128 */ jal func_E02004A0 +/* 3DC498 E00E2188 0C080128 */ jal shim_remove_effect /* 3DC49C E00E218C 00000000 */ nop /* 3DC4A0 E00E2190 0803886F */ j .LE00E21BC /* 3DC4A4 E00E2194 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_113/func_E00E21C8.s b/ver/us/asm/nonmatchings/effects/effect_113/func_E00E21C8.s index 394aa74f1c..1ddc406f07 100644 --- a/ver/us/asm/nonmatchings/effects/effect_113/func_E00E21C8.s +++ b/ver/us/asm/nonmatchings/effects/effect_113/func_E00E21C8.s @@ -12,7 +12,7 @@ glabel func_E00E21C8 /* 3DC4F4 E00E21E4 AFA40018 */ sw $a0, 0x18($sp) /* 3DC4F8 E00E21E8 27A40010 */ addiu $a0, $sp, 0x10 /* 3DC4FC E00E21EC AFBF0020 */ sw $ra, 0x20($sp) -/* 3DC500 E00E21F0 0C080120 */ jal func_E0200480 +/* 3DC500 E00E21F0 0C080120 */ jal shim_queue_render_task /* 3DC504 E00E21F4 AFA20010 */ sw $v0, 0x10($sp) /* 3DC508 E00E21F8 8C430000 */ lw $v1, ($v0) /* 3DC50C E00E21FC 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_113/func_E00E2218.s b/ver/us/asm/nonmatchings/effects/effect_113/func_E00E2218.s index 76eef0d4f4..905a81b406 100644 --- a/ver/us/asm/nonmatchings/effects/effect_113/func_E00E2218.s +++ b/ver/us/asm/nonmatchings/effects/effect_113/func_E00E2218.s @@ -63,17 +63,17 @@ glabel func_E00E2218 /* 3DC610 E00E2300 001010C0 */ sll $v0, $s0, 3 /* 3DC614 E00E2304 02028021 */ addu $s0, $s0, $v0 /* 3DC618 E00E2308 001080C0 */ sll $s0, $s0, 3 -/* 3DC61C E00E230C 0C080108 */ jal func_E0200420 +/* 3DC61C E00E230C 0C080108 */ jal shim_guTranslateF /* 3DC620 E00E2310 02038021 */ addu $s0, $s0, $v1 /* 3DC624 E00E2314 27B20060 */ addiu $s2, $sp, 0x60 /* 3DC628 E00E2318 8EA50038 */ lw $a1, 0x38($s5) /* 3DC62C E00E231C 0240202D */ daddu $a0, $s2, $zero /* 3DC630 E00E2320 00A0302D */ daddu $a2, $a1, $zero -/* 3DC634 E00E2324 0C080110 */ jal func_E0200440 +/* 3DC634 E00E2324 0C080110 */ jal shim_guScaleF /* 3DC638 E00E2328 00A0382D */ daddu $a3, $a1, $zero /* 3DC63C E00E232C 0240202D */ daddu $a0, $s2, $zero /* 3DC640 E00E2330 27A50020 */ addiu $a1, $sp, 0x20 -/* 3DC644 E00E2334 0C080114 */ jal func_E0200450 +/* 3DC644 E00E2334 0C080114 */ jal shim_guMtxCatF /* 3DC648 E00E2338 00A0302D */ daddu $a2, $a1, $zero /* 3DC64C E00E233C 27A40020 */ addiu $a0, $sp, 0x20 /* 3DC650 E00E2340 96E50000 */ lhu $a1, ($s7) @@ -81,7 +81,7 @@ glabel func_E00E2218 /* 3DC658 E00E2348 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3DC65C E00E234C 00052980 */ sll $a1, $a1, 6 /* 3DC660 E00E2350 00B32821 */ addu $a1, $a1, $s3 -/* 3DC664 E00E2354 0C080118 */ jal func_E0200460 +/* 3DC664 E00E2354 0C080118 */ jal shim_guMtxF2L /* 3DC668 E00E2358 00452821 */ addu $a1, $v0, $a1 /* 3DC66C E00E235C 3C03DA38 */ lui $v1, 0xda38 /* 3DC670 E00E2360 34630002 */ ori $v1, $v1, 2 @@ -172,7 +172,7 @@ glabel func_E00E2218 /* 3DC7C4 E00E24B4 AD09001C */ sw $t1, 0x1c($t0) /* 3DC7C8 E00E24B8 25080028 */ addiu $t0, $t0, 0x28 /* 3DC7CC E00E24BC E7B40010 */ swc1 $f20, 0x10($sp) -/* 3DC7D0 E00E24C0 0C080104 */ jal func_E0200410 +/* 3DC7D0 E00E24C0 0C080104 */ jal shim_guRotateF /* 3DC7D4 E00E24C4 AFA800A4 */ sw $t0, 0xa4($sp) /* 3DC7D8 E00E24C8 3C01E00E */ lui $at, %hi(D_E00E2A30) /* 3DC7DC E00E24CC D4202A30 */ ldc1 $f0, %lo(D_E00E2A30)($at) @@ -181,7 +181,7 @@ glabel func_E00E2218 /* 3DC7E8 E00E24D8 46806321 */ cvt.d.w $f12, $f12 /* 3DC7EC E00E24DC 46206300 */ add.d $f12, $f12, $f0 /* 3DC7F0 E00E24E0 0000A02D */ daddu $s4, $zero, $zero -/* 3DC7F4 E00E24E4 0C080140 */ jal func_E0200500 +/* 3DC7F4 E00E24E4 0C080140 */ jal shim_sin_deg /* 3DC7F8 E00E24E8 46206320 */ cvt.s.d $f12, $f12 /* 3DC7FC E00E24EC 3C01C1F0 */ lui $at, 0xc1f0 /* 3DC800 E00E24F0 44811000 */ mtc1 $at, $f2 @@ -199,11 +199,11 @@ glabel func_E00E2218 /* 3DC830 E00E2520 E7B60010 */ swc1 $f22, 0x10($sp) /* 3DC834 E00E2524 E7B40018 */ swc1 $f20, 0x18($sp) /* 3DC838 E00E2528 E7B4001C */ swc1 $f20, 0x1c($sp) -/* 3DC83C E00E252C 0C080180 */ jal func_E0200600 +/* 3DC83C E00E252C 0C080180 */ jal shim_guPositionF /* 3DC840 E00E2530 E7A40014 */ swc1 $f4, 0x14($sp) /* 3DC844 E00E2534 0240202D */ daddu $a0, $s2, $zero /* 3DC848 E00E2538 27A50020 */ addiu $a1, $sp, 0x20 -/* 3DC84C E00E253C 0C080114 */ jal func_E0200450 +/* 3DC84C E00E253C 0C080114 */ jal shim_guMtxCatF /* 3DC850 E00E2540 00A0302D */ daddu $a2, $a1, $zero /* 3DC854 E00E2544 27A40020 */ addiu $a0, $sp, 0x20 /* 3DC858 E00E2548 96E50000 */ lhu $a1, ($s7) @@ -211,7 +211,7 @@ glabel func_E00E2218 /* 3DC860 E00E2550 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3DC864 E00E2554 00052980 */ sll $a1, $a1, 6 /* 3DC868 E00E2558 00B32821 */ addu $a1, $a1, $s3 -/* 3DC86C E00E255C 0C080118 */ jal func_E0200460 +/* 3DC86C E00E255C 0C080118 */ jal shim_guMtxF2L /* 3DC870 E00E2560 00452821 */ addu $a1, $v0, $a1 /* 3DC874 E00E2564 8EC20000 */ lw $v0, ($s6) /* 3DC878 E00E2568 0280802D */ daddu $s0, $s4, $zero @@ -237,7 +237,7 @@ glabel func_E00E2218 /* 3DC8C4 E00E25B4 44826000 */ mtc1 $v0, $f12 /* 3DC8C8 E00E25B8 00000000 */ nop /* 3DC8CC E00E25BC 46806320 */ cvt.s.w $f12, $f12 -/* 3DC8D0 E00E25C0 0C080140 */ jal func_E0200500 +/* 3DC8D0 E00E25C0 0C080140 */ jal shim_sin_deg /* 3DC8D4 E00E25C4 26100030 */ addiu $s0, $s0, 0x30 /* 3DC8D8 E00E25C8 44941000 */ mtc1 $s4, $f2 /* 3DC8DC E00E25CC 00000000 */ nop @@ -267,7 +267,7 @@ glabel func_E00E2218 /* 3DC93C E00E262C E7B4001C */ swc1 $f20, 0x1c($sp) /* 3DC940 E00E2630 E7A40014 */ swc1 $f4, 0x14($sp) /* 3DC944 E00E2634 462010A0 */ cvt.s.d $f2, $f2 -/* 3DC948 E00E2638 0C080180 */ jal func_E0200600 +/* 3DC948 E00E2638 0C080180 */ jal shim_guPositionF /* 3DC94C E00E263C E7A20010 */ swc1 $f2, 0x10($sp) /* 3DC950 E00E2640 27A40020 */ addiu $a0, $sp, 0x20 /* 3DC954 E00E2644 96E50000 */ lhu $a1, ($s7) @@ -276,7 +276,7 @@ glabel func_E00E2218 /* 3DC960 E00E2650 8FAF00A8 */ lw $t7, 0xa8($sp) /* 3DC964 E00E2654 00052980 */ sll $a1, $a1, 6 /* 3DC968 E00E2658 00AF2821 */ addu $a1, $a1, $t7 -/* 3DC96C E00E265C 0C080118 */ jal func_E0200460 +/* 3DC96C E00E265C 0C080118 */ jal shim_guMtxF2L /* 3DC970 E00E2660 00452821 */ addu $a1, $v0, $a1 /* 3DC974 E00E2664 3C02DA38 */ lui $v0, 0xda38 /* 3DC978 E00E2668 34420001 */ ori $v0, $v0, 1 @@ -424,7 +424,7 @@ glabel func_E00E2218 /* 3DCB8C E00E287C 00628823 */ subu $s1, $v1, $v0 /* 3DCB90 E00E2880 00111100 */ sll $v0, $s1, 4 /* 3DCB94 E00E2884 00511021 */ addu $v0, $v0, $s1 -/* 3DCB98 E00E2888 0C080180 */ jal func_E0200600 +/* 3DCB98 E00E2888 0C080180 */ jal shim_guPositionF /* 3DCB9C E00E288C 02028823 */ subu $s1, $s0, $v0 /* 3DCBA0 E00E2890 27A40020 */ addiu $a0, $sp, 0x20 /* 3DCBA4 E00E2894 26100004 */ addiu $s0, $s0, 4 @@ -432,7 +432,7 @@ glabel func_E00E2218 /* 3DCBAC E00E289C 8FC20000 */ lw $v0, ($fp) /* 3DCBB0 E00E28A0 00052980 */ sll $a1, $a1, 6 /* 3DCBB4 E00E28A4 00B62821 */ addu $a1, $a1, $s6 -/* 3DCBB8 E00E28A8 0C080118 */ jal func_E0200460 +/* 3DCBB8 E00E28A8 0C080118 */ jal shim_guMtxF2L /* 3DCBBC E00E28AC 00452821 */ addu $a1, $v0, $a1 /* 3DCBC0 E00E28B0 3C09D838 */ lui $t1, 0xd838 /* 3DCBC4 E00E28B4 35290002 */ ori $t1, $t1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_113/fx_113_main.s b/ver/us/asm/nonmatchings/effects/effect_113/fx_113_main.s index 807ea5f6c8..03aa3acf2d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_113/fx_113_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_113/fx_113_main.s @@ -28,12 +28,12 @@ glabel fx_113_main /* 3DC36C E00E205C AFB00028 */ sw $s0, 0x28($sp) /* 3DC370 E00E2060 AFA00010 */ sw $zero, 0x10($sp) /* 3DC374 E00E2064 AFA00024 */ sw $zero, 0x24($sp) -/* 3DC378 E00E2068 0C080124 */ jal func_E0200490 +/* 3DC378 E00E2068 0C080124 */ jal shim_create_effect_instance /* 3DC37C E00E206C AFA20014 */ sw $v0, 0x14($sp) /* 3DC380 E00E2070 2404003C */ addiu $a0, $zero, 0x3c /* 3DC384 E00E2074 24030001 */ addiu $v1, $zero, 1 /* 3DC388 E00E2078 0040802D */ daddu $s0, $v0, $zero -/* 3DC38C E00E207C 0C08012C */ jal func_E02004B0 +/* 3DC38C E00E207C 0C08012C */ jal shim_general_heap_malloc /* 3DC390 E00E2080 AE030008 */ sw $v1, 8($s0) /* 3DC394 E00E2084 0040202D */ daddu $a0, $v0, $zero /* 3DC398 E00E2088 14800003 */ bnez $a0, .LE00E2098 diff --git a/ver/us/asm/nonmatchings/effects/effect_114/func_E00E4290.s b/ver/us/asm/nonmatchings/effects/effect_114/func_E00E4290.s index 7892d1727d..f728df34b1 100644 --- a/ver/us/asm/nonmatchings/effects/effect_114/func_E00E4290.s +++ b/ver/us/asm/nonmatchings/effects/effect_114/func_E00E4290.s @@ -42,7 +42,7 @@ glabel func_E00E4290 /* 3DE31C E00E431C 24420001 */ addiu $v0, $v0, 1 /* 3DE320 E00E4320 04610005 */ bgez $v1, .LE00E4338 /* 3DE324 E00E4324 AE220034 */ sw $v0, 0x34($s1) -/* 3DE328 E00E4328 0C080128 */ jal func_E02004A0 +/* 3DE328 E00E4328 0C080128 */ jal shim_remove_effect /* 3DE32C E00E432C 0280202D */ daddu $a0, $s4, $zero /* 3DE330 E00E4330 08039231 */ j .LE00E48C4 /* 3DE334 E00E4334 00000000 */ nop @@ -74,7 +74,7 @@ glabel func_E00E4290 /* 3DE394 E00E4394 C6300008 */ lwc1 $f16, 8($s1) /* 3DE398 E00E4398 E7B00018 */ swc1 $f16, 0x18($sp) /* 3DE39C E00E439C C630000C */ lwc1 $f16, 0xc($s1) -/* 3DE3A0 E00E43A0 0C080144 */ jal func_E0200510 +/* 3DE3A0 E00E43A0 0C080144 */ jal shim_cos_deg /* 3DE3A4 E00E43A4 E7B0001C */ swc1 $f16, 0x1c($sp) /* 3DE3A8 E00E43A8 8E030000 */ lw $v1, ($s0) /* 3DE3AC E00E43AC 00031080 */ sll $v0, $v1, 2 @@ -87,7 +87,7 @@ glabel func_E00E4290 /* 3DE3C8 E00E43C8 3C01800B */ lui $at, %hi(gCameras+0x6C) /* 3DE3CC E00E43CC 00220821 */ addu $at, $at, $v0 /* 3DE3D0 E00E43D0 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* 3DE3D4 E00E43D4 0C080140 */ jal func_E0200500 +/* 3DE3D4 E00E43D4 0C080140 */ jal shim_sin_deg /* 3DE3D8 E00E43D8 46000706 */ mov.s $f28, $f0 /* 3DE3DC E00E43DC 8E250038 */ lw $a1, 0x38($s1) /* 3DE3E0 E00E43E0 24130001 */ addiu $s3, $zero, 1 @@ -129,7 +129,7 @@ glabel func_E00E4290 /* 3DE464 E00E4464 00000000 */ nop /* 3DE468 E00E4468 4600F40D */ trunc.w.s $f16, $f30 /* 3DE46C E00E446C 44048000 */ mfc1 $a0, $f16 -/* 3DE470 E00E4470 0C080138 */ jal func_E02004E0 +/* 3DE470 E00E4470 0C080138 */ jal shim_rand_int /* 3DE474 E00E4474 00000000 */ nop /* 3DE478 E00E4478 3C013FE0 */ lui $at, 0x3fe0 /* 3DE47C E00E447C 44811800 */ mtc1 $at, $f3 @@ -150,7 +150,7 @@ glabel func_E00E4290 /* 3DE4B8 E00E44B8 461A0001 */ sub.s $f0, $f0, $f26 /* 3DE4BC E00E44BC 4600840D */ trunc.w.s $f16, $f16 /* 3DE4C0 E00E44C0 44048000 */ mfc1 $a0, $f16 -/* 3DE4C4 E00E44C4 0C080138 */ jal func_E02004E0 +/* 3DE4C4 E00E44C4 0C080138 */ jal shim_rand_int /* 3DE4C8 E00E44C8 E600FFAC */ swc1 $f0, -0x54($s0) /* 3DE4CC E00E44CC 461AA502 */ mul.s $f20, $f20, $f26 /* 3DE4D0 E00E44D0 00000000 */ nop @@ -184,7 +184,7 @@ glabel func_E00E4290 /* 3DE538 E00E4538 2404000A */ addiu $a0, $zero, 0xa /* 3DE53C E00E453C AE00FFC0 */ sw $zero, -0x40($s0) /* 3DE540 E00E4540 AE00FFC4 */ sw $zero, -0x3c($s0) -/* 3DE544 E00E4544 0C080138 */ jal func_E02004E0 +/* 3DE544 E00E4544 0C080138 */ jal shim_rand_int /* 3DE548 E00E4548 AE00FFCC */ sw $zero, -0x34($s0) /* 3DE54C E00E454C 00021023 */ negu $v0, $v0 /* 3DE550 E00E4550 2442FFFE */ addiu $v0, $v0, -2 @@ -198,7 +198,7 @@ glabel func_E00E4290 /* 3DE570 E00E4570 AE000004 */ sw $zero, 4($s0) /* 3DE574 E00E4574 AE000008 */ sw $zero, 8($s0) /* 3DE578 E00E4578 46200020 */ cvt.s.d $f0, $f0 -/* 3DE57C E00E457C 0C080138 */ jal func_E02004E0 +/* 3DE57C E00E457C 0C080138 */ jal shim_rand_int /* 3DE580 E00E4580 E600FFD0 */ swc1 $f0, -0x30($s0) /* 3DE584 E00E4584 44820000 */ mtc1 $v0, $f0 /* 3DE588 E00E4588 00000000 */ nop @@ -265,7 +265,7 @@ glabel func_E00E4290 /* 3DE674 E00E4674 24020002 */ addiu $v0, $zero, 2 /* 3DE678 E00E4678 56420018 */ bnel $s2, $v0, .LE00E46DC /* 3DE67C E00E467C AE00FFC0 */ sw $zero, -0x40($s0) -/* 3DE680 E00E4680 0C080138 */ jal func_E02004E0 +/* 3DE680 E00E4680 0C080138 */ jal shim_rand_int /* 3DE684 E00E4684 24040014 */ addiu $a0, $zero, 0x14 /* 3DE688 E00E4688 2442FFF6 */ addiu $v0, $v0, -0xa /* 3DE68C E00E468C 44820000 */ mtc1 $v0, $f0 @@ -276,7 +276,7 @@ glabel func_E00E4290 /* 3DE6A0 E00E46A0 00000000 */ nop /* 3DE6A4 E00E46A4 24040014 */ addiu $a0, $zero, 0x14 /* 3DE6A8 E00E46A8 46200020 */ cvt.s.d $f0, $f0 -/* 3DE6AC E00E46AC 0C080138 */ jal func_E02004E0 +/* 3DE6AC E00E46AC 0C080138 */ jal shim_rand_int /* 3DE6B0 E00E46B0 E600FFC0 */ swc1 $f0, -0x40($s0) /* 3DE6B4 E00E46B4 2442FFF6 */ addiu $v0, $v0, -0xa /* 3DE6B8 E00E46B8 44820000 */ mtc1 $v0, $f0 @@ -293,13 +293,13 @@ glabel func_E00E4290 .LE00E46E0: /* 3DE6E0 E00E46E0 2404000F */ addiu $a0, $zero, 0xf /* 3DE6E4 E00E46E4 AE00FFCC */ sw $zero, -0x34($s0) -/* 3DE6E8 E00E46E8 0C080138 */ jal func_E02004E0 +/* 3DE6E8 E00E46E8 0C080138 */ jal shim_rand_int /* 3DE6EC E00E46EC AE00FFD0 */ sw $zero, -0x30($s0) /* 3DE6F0 E00E46F0 2404000F */ addiu $a0, $zero, 0xf /* 3DE6F4 E00E46F4 44820000 */ mtc1 $v0, $f0 /* 3DE6F8 E00E46F8 00000000 */ nop /* 3DE6FC E00E46FC 46800020 */ cvt.s.w $f0, $f0 -/* 3DE700 E00E4700 0C080138 */ jal func_E02004E0 +/* 3DE700 E00E4700 0C080138 */ jal shim_rand_int /* 3DE704 E00E4704 E6000004 */ swc1 $f0, 4($s0) /* 3DE708 E00E4708 44820000 */ mtc1 $v0, $f0 /* 3DE70C E00E470C 00000000 */ nop @@ -374,18 +374,18 @@ glabel func_E00E4290 /* 3DE814 E00E4814 AE000004 */ sw $zero, 4($s0) /* 3DE818 E00E4818 AE000008 */ sw $zero, 8($s0) /* 3DE81C E00E481C AE16FFEC */ sw $s6, -0x14($s0) -/* 3DE820 E00E4820 0C080138 */ jal func_E02004E0 +/* 3DE820 E00E4820 0C080138 */ jal shim_rand_int /* 3DE824 E00E4824 E6000000 */ swc1 $f0, ($s0) /* 3DE828 E00E4828 24420080 */ addiu $v0, $v0, 0x80 /* 3DE82C E00E482C 02C22023 */ subu $a0, $s6, $v0 -/* 3DE830 E00E4830 0C080138 */ jal func_E02004E0 +/* 3DE830 E00E4830 0C080138 */ jal shim_rand_int /* 3DE834 E00E4834 AE02FFE0 */ sw $v0, -0x20($s0) /* 3DE838 E00E4838 24420080 */ addiu $v0, $v0, 0x80 /* 3DE83C E00E483C 2404017F */ addiu $a0, $zero, 0x17f /* 3DE840 E00E4840 8E03FFE0 */ lw $v1, -0x20($s0) /* 3DE844 E00E4844 00822023 */ subu $a0, $a0, $v0 /* 3DE848 E00E4848 AE02FFE4 */ sw $v0, -0x1c($s0) -/* 3DE84C E00E484C 0C080138 */ jal func_E02004E0 +/* 3DE84C E00E484C 0C080138 */ jal shim_rand_int /* 3DE850 E00E4850 00832023 */ subu $a0, $a0, $v1 /* 3DE854 E00E4854 24420080 */ addiu $v0, $v0, 0x80 /* 3DE858 E00E4858 AE02FFE8 */ sw $v0, -0x18($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_114/func_E00E490C.s b/ver/us/asm/nonmatchings/effects/effect_114/func_E00E490C.s index 424d39e32c..c3655f45b6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_114/func_E00E490C.s +++ b/ver/us/asm/nonmatchings/effects/effect_114/func_E00E490C.s @@ -12,7 +12,7 @@ glabel func_E00E490C /* 3DE928 E00E4928 AFA40018 */ sw $a0, 0x18($sp) /* 3DE92C E00E492C 27A40010 */ addiu $a0, $sp, 0x10 /* 3DE930 E00E4930 AFBF0020 */ sw $ra, 0x20($sp) -/* 3DE934 E00E4934 0C080120 */ jal func_E0200480 +/* 3DE934 E00E4934 0C080120 */ jal shim_queue_render_task /* 3DE938 E00E4938 AFA20010 */ sw $v0, 0x10($sp) /* 3DE93C E00E493C 8C430000 */ lw $v1, ($v0) /* 3DE940 E00E4940 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_114/func_E00E495C.s b/ver/us/asm/nonmatchings/effects/effect_114/func_E00E495C.s index ca4da6531f..e556455909 100644 --- a/ver/us/asm/nonmatchings/effects/effect_114/func_E00E495C.s +++ b/ver/us/asm/nonmatchings/effects/effect_114/func_E00E495C.s @@ -118,14 +118,14 @@ glabel func_E00E495C /* 3DEB1C E00E4B1C C600FFA8 */ lwc1 $f0, -0x58($s0) /* 3DEB20 E00E4B20 E7A00018 */ swc1 $f0, 0x18($sp) /* 3DEB24 E00E4B24 C600FFAC */ lwc1 $f0, -0x54($s0) -/* 3DEB28 E00E4B28 0C080180 */ jal func_E0200600 +/* 3DEB28 E00E4B28 0C080180 */ jal shim_guPositionF /* 3DEB2C E00E4B2C E7A0001C */ swc1 $f0, 0x1c($sp) /* 3DEB30 E00E4B30 27A40020 */ addiu $a0, $sp, 0x20 /* 3DEB34 E00E4B34 96A50000 */ lhu $a1, ($s5) /* 3DEB38 E00E4B38 8EC20000 */ lw $v0, ($s6) /* 3DEB3C E00E4B3C 00052980 */ sll $a1, $a1, 6 /* 3DEB40 E00E4B40 00B32821 */ addu $a1, $a1, $s3 -/* 3DEB44 E00E4B44 0C080118 */ jal func_E0200460 +/* 3DEB44 E00E4B44 0C080118 */ jal shim_guMtxF2L /* 3DEB48 E00E4B48 00452821 */ addu $a1, $v0, $a1 /* 3DEB4C E00E4B4C 8E240000 */ lw $a0, ($s1) /* 3DEB50 E00E4B50 0080282D */ daddu $a1, $a0, $zero diff --git a/ver/us/asm/nonmatchings/effects/effect_114/fx_114_main.s b/ver/us/asm/nonmatchings/effects/effect_114/fx_114_main.s index f060a79243..790b0d372a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_114/fx_114_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_114/fx_114_main.s @@ -32,7 +32,7 @@ glabel fx_114_main /* 3DE06C E00E406C AFA00010 */ sw $zero, 0x10($sp) /* 3DE070 E00E4070 AFA00024 */ sw $zero, 0x24($sp) /* 3DE074 E00E4074 AFA20014 */ sw $v0, 0x14($sp) -/* 3DE078 E00E4078 0C080124 */ jal func_E0200490 +/* 3DE078 E00E4078 0C080124 */ jal shim_create_effect_instance /* 3DE07C E00E407C 26310001 */ addiu $s1, $s1, 1 /* 3DE080 E00E4080 00112040 */ sll $a0, $s1, 1 /* 3DE084 E00E4084 00912021 */ addu $a0, $a0, $s1 @@ -40,7 +40,7 @@ glabel fx_114_main /* 3DE08C E00E408C 00912021 */ addu $a0, $a0, $s1 /* 3DE090 E00E4090 00042080 */ sll $a0, $a0, 2 /* 3DE094 E00E4094 0040982D */ daddu $s3, $v0, $zero -/* 3DE098 E00E4098 0C08012C */ jal func_E02004B0 +/* 3DE098 E00E4098 0C08012C */ jal shim_general_heap_malloc /* 3DE09C E00E409C AE710008 */ sw $s1, 8($s3) /* 3DE0A0 E00E40A0 0040802D */ daddu $s0, $v0, $zero /* 3DE0A4 E00E40A4 16000003 */ bnez $s0, .LE00E40B4 @@ -104,19 +104,19 @@ glabel fx_114_main /* 3DE168 E00E4168 08039071 */ j .LE00E41C4 /* 3DE16C E00E416C AE030054 */ sw $v1, 0x54($s0) .LE00E4170: -/* 3DE170 E00E4170 0C080138 */ jal func_E02004E0 +/* 3DE170 E00E4170 0C080138 */ jal shim_rand_int /* 3DE174 E00E4174 2404007F */ addiu $a0, $zero, 0x7f /* 3DE178 E00E4178 24420080 */ addiu $v0, $v0, 0x80 /* 3DE17C E00E417C 240400FF */ addiu $a0, $zero, 0xff /* 3DE180 E00E4180 00822023 */ subu $a0, $a0, $v0 -/* 3DE184 E00E4184 0C080138 */ jal func_E02004E0 +/* 3DE184 E00E4184 0C080138 */ jal shim_rand_int /* 3DE188 E00E4188 AE020038 */ sw $v0, 0x38($s0) /* 3DE18C E00E418C 24420080 */ addiu $v0, $v0, 0x80 /* 3DE190 E00E4190 2404017F */ addiu $a0, $zero, 0x17f /* 3DE194 E00E4194 8E030038 */ lw $v1, 0x38($s0) /* 3DE198 E00E4198 00822023 */ subu $a0, $a0, $v0 /* 3DE19C E00E419C AE02003C */ sw $v0, 0x3c($s0) -/* 3DE1A0 E00E41A0 0C080138 */ jal func_E02004E0 +/* 3DE1A0 E00E41A0 0C080138 */ jal shim_rand_int /* 3DE1A4 E00E41A4 00832023 */ subu $a0, $a0, $v1 /* 3DE1A8 E00E41A8 24420080 */ addiu $v0, $v0, 0x80 /* 3DE1AC E00E41AC AE020040 */ sw $v0, 0x40($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_115/func_E00E6184.s b/ver/us/asm/nonmatchings/effects/effect_115/func_E00E6184.s index f0c142473f..0450bd561b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_115/func_E00E6184.s +++ b/ver/us/asm/nonmatchings/effects/effect_115/func_E00E6184.s @@ -40,7 +40,7 @@ glabel func_E00E6184 /* 3E0B38 E00E6208 24420001 */ addiu $v0, $v0, 1 /* 3E0B3C E00E620C 04810005 */ bgez $a0, .LE00E6224 /* 3E0B40 E00E6210 ACA2002C */ sw $v0, 0x2c($a1) -/* 3E0B44 E00E6214 0C080128 */ jal func_E02004A0 +/* 3E0B44 E00E6214 0C080128 */ jal shim_remove_effect /* 3E0B48 E00E6218 0240202D */ daddu $a0, $s2, $zero /* 3E0B4C E00E621C 08039925 */ j .LE00E6494 /* 3E0B50 E00E6220 00000000 */ nop @@ -112,12 +112,12 @@ glabel func_E00E6184 /* 3E0C40 E00E6310 00000000 */ nop /* 3E0C44 E00E6314 46800020 */ cvt.s.w $f0, $f0 /* 3E0C48 E00E6318 4600A503 */ div.s $f20, $f20, $f0 -/* 3E0C4C E00E631C 0C080140 */ jal func_E0200500 +/* 3E0C4C E00E631C 0C080140 */ jal shim_sin_deg /* 3E0C50 E00E6320 4600A306 */ mov.s $f12, $f20 /* 3E0C54 E00E6324 461C0002 */ mul.s $f0, $f0, $f28 /* 3E0C58 E00E6328 00000000 */ nop /* 3E0C5C E00E632C 4600A306 */ mov.s $f12, $f20 -/* 3E0C60 E00E6330 0C080144 */ jal func_E0200510 +/* 3E0C60 E00E6330 0C080144 */ jal shim_cos_deg /* 3E0C64 E00E6334 E600FFF0 */ swc1 $f0, -0x10($s0) /* 3E0C68 E00E6338 461C0002 */ mul.s $f0, $f0, $f28 /* 3E0C6C E00E633C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_115/func_E00E64D4.s b/ver/us/asm/nonmatchings/effects/effect_115/func_E00E64D4.s index 7136036183..677d7524d0 100644 --- a/ver/us/asm/nonmatchings/effects/effect_115/func_E00E64D4.s +++ b/ver/us/asm/nonmatchings/effects/effect_115/func_E00E64D4.s @@ -12,7 +12,7 @@ glabel func_E00E64D4 /* 3E0E20 E00E64F0 AFA40018 */ sw $a0, 0x18($sp) /* 3E0E24 E00E64F4 27A40010 */ addiu $a0, $sp, 0x10 /* 3E0E28 E00E64F8 AFBF0020 */ sw $ra, 0x20($sp) -/* 3E0E2C E00E64FC 0C080120 */ jal func_E0200480 +/* 3E0E2C E00E64FC 0C080120 */ jal shim_queue_render_task /* 3E0E30 E00E6500 AFA20010 */ sw $v0, 0x10($sp) /* 3E0E34 E00E6504 8C430000 */ lw $v1, ($v0) /* 3E0E38 E00E6508 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_115/func_E00E6524.s b/ver/us/asm/nonmatchings/effects/effect_115/func_E00E6524.s index f01ac5cd49..2ddf7de123 100644 --- a/ver/us/asm/nonmatchings/effects/effect_115/func_E00E6524.s +++ b/ver/us/asm/nonmatchings/effects/effect_115/func_E00E6524.s @@ -56,18 +56,18 @@ glabel func_E00E6524 /* 3E0F20 E00E65F0 001010C0 */ sll $v0, $s0, 3 /* 3E0F24 E00E65F4 02028021 */ addu $s0, $s0, $v0 /* 3E0F28 E00E65F8 001080C0 */ sll $s0, $s0, 3 -/* 3E0F2C E00E65FC 0C080108 */ jal func_E0200420 +/* 3E0F2C E00E65FC 0C080108 */ jal shim_guTranslateF /* 3E0F30 E00E6600 02038021 */ addu $s0, $s0, $v1 /* 3E0F34 E00E6604 27B10060 */ addiu $s1, $sp, 0x60 /* 3E0F38 E00E6608 0220202D */ daddu $a0, $s1, $zero /* 3E0F3C E00E660C 8E850034 */ lw $a1, 0x34($s4) /* 3E0F40 E00E6610 26940038 */ addiu $s4, $s4, 0x38 /* 3E0F44 E00E6614 00A0302D */ daddu $a2, $a1, $zero -/* 3E0F48 E00E6618 0C080110 */ jal func_E0200440 +/* 3E0F48 E00E6618 0C080110 */ jal shim_guScaleF /* 3E0F4C E00E661C 00A0382D */ daddu $a3, $a1, $zero /* 3E0F50 E00E6620 0220202D */ daddu $a0, $s1, $zero /* 3E0F54 E00E6624 27A50020 */ addiu $a1, $sp, 0x20 -/* 3E0F58 E00E6628 0C080114 */ jal func_E0200450 +/* 3E0F58 E00E6628 0C080114 */ jal shim_guMtxCatF /* 3E0F5C E00E662C 00A0302D */ daddu $a2, $a1, $zero /* 3E0F60 E00E6630 27A40020 */ addiu $a0, $sp, 0x20 /* 3E0F64 E00E6634 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -78,7 +78,7 @@ glabel func_E00E6524 /* 3E0F78 E00E6648 8EE20000 */ lw $v0, ($s7) /* 3E0F7C E00E664C 00052980 */ sll $a1, $a1, 6 /* 3E0F80 E00E6650 00B22821 */ addu $a1, $a1, $s2 -/* 3E0F84 E00E6654 0C080118 */ jal func_E0200460 +/* 3E0F84 E00E6654 0C080118 */ jal shim_guMtxF2L /* 3E0F88 E00E6658 00452821 */ addu $a1, $v0, $a1 /* 3E0F8C E00E665C 3C03DA38 */ lui $v1, 0xda38 /* 3E0F90 E00E6660 34630002 */ ori $v1, $v1, 2 @@ -138,14 +138,14 @@ glabel func_E00E6524 /* 3E1064 E00E6734 E7B4001C */ swc1 $f20, 0x1c($sp) /* 3E1068 E00E6738 E7A00018 */ swc1 $f0, 0x18($sp) /* 3E106C E00E673C 8E67FFF4 */ lw $a3, -0xc($s3) -/* 3E1070 E00E6740 0C080180 */ jal func_E0200600 +/* 3E1070 E00E6740 0C080180 */ jal shim_guPositionF /* 3E1074 E00E6744 27A40020 */ addiu $a0, $sp, 0x20 /* 3E1078 E00E6748 27A40020 */ addiu $a0, $sp, 0x20 /* 3E107C E00E674C 96450000 */ lhu $a1, ($s2) /* 3E1080 E00E6750 8EE20000 */ lw $v0, ($s7) /* 3E1084 E00E6754 00052980 */ sll $a1, $a1, 6 /* 3E1088 E00E6758 00B12821 */ addu $a1, $a1, $s1 -/* 3E108C E00E675C 0C080118 */ jal func_E0200460 +/* 3E108C E00E675C 0C080118 */ jal shim_guMtxF2L /* 3E1090 E00E6760 00452821 */ addu $a1, $v0, $a1 /* 3E1094 E00E6764 8E040000 */ lw $a0, ($s0) /* 3E1098 E00E6768 3C06D838 */ lui $a2, 0xd838 diff --git a/ver/us/asm/nonmatchings/effects/effect_115/fx_115_main.s b/ver/us/asm/nonmatchings/effects/effect_115/fx_115_main.s index 3d910a8ed7..c25021e3ae 100644 --- a/ver/us/asm/nonmatchings/effects/effect_115/fx_115_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_115/fx_115_main.s @@ -31,13 +31,13 @@ glabel fx_115_main /* 3E0998 E00E6068 AFA00010 */ sw $zero, 0x10($sp) /* 3E099C E00E606C AFA00024 */ sw $zero, 0x24($sp) /* 3E09A0 E00E6070 AFA20014 */ sw $v0, 0x14($sp) -/* 3E09A4 E00E6074 0C080124 */ jal func_E0200490 +/* 3E09A4 E00E6074 0C080124 */ jal shim_create_effect_instance /* 3E09A8 E00E6078 26100001 */ addiu $s0, $s0, 1 /* 3E09AC E00E607C 001020C0 */ sll $a0, $s0, 3 /* 3E09B0 E00E6080 00902023 */ subu $a0, $a0, $s0 /* 3E09B4 E00E6084 000420C0 */ sll $a0, $a0, 3 /* 3E09B8 E00E6088 0040882D */ daddu $s1, $v0, $zero -/* 3E09BC E00E608C 0C08012C */ jal func_E02004B0 +/* 3E09BC E00E608C 0C08012C */ jal shim_general_heap_malloc /* 3E09C0 E00E6090 AE300008 */ sw $s0, 8($s1) /* 3E09C4 E00E6094 0040182D */ daddu $v1, $v0, $zero /* 3E09C8 E00E6098 14600003 */ bnez $v1, .LE00E60A8 diff --git a/ver/us/asm/nonmatchings/effects/effect_116/func_E00E8264.s b/ver/us/asm/nonmatchings/effects/effect_116/func_E00E8264.s index 923db3cb6e..0712a178e6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_116/func_E00E8264.s +++ b/ver/us/asm/nonmatchings/effects/effect_116/func_E00E8264.s @@ -26,7 +26,7 @@ glabel func_E00E8264 /* 3E1940 E00E82B0 24450001 */ addiu $a1, $v0, 1 /* 3E1944 E00E82B4 04C10005 */ bgez $a2, .LE00E82CC /* 3E1948 E00E82B8 AC650020 */ sw $a1, 0x20($v1) -/* 3E194C E00E82BC 0C080128 */ jal func_E02004A0 +/* 3E194C E00E82BC 0C080128 */ jal shim_remove_effect /* 3E1950 E00E82C0 00000000 */ nop /* 3E1954 E00E82C4 0803A0DA */ j .LE00E8368 /* 3E1958 E00E82C8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_116/func_E00E8374.s b/ver/us/asm/nonmatchings/effects/effect_116/func_E00E8374.s index 9c12f19056..5dbb64b652 100644 --- a/ver/us/asm/nonmatchings/effects/effect_116/func_E00E8374.s +++ b/ver/us/asm/nonmatchings/effects/effect_116/func_E00E8374.s @@ -12,7 +12,7 @@ glabel func_E00E8374 /* 3E1A20 E00E8390 AFA40018 */ sw $a0, 0x18($sp) /* 3E1A24 E00E8394 27A40010 */ addiu $a0, $sp, 0x10 /* 3E1A28 E00E8398 AFBF0020 */ sw $ra, 0x20($sp) -/* 3E1A2C E00E839C 0C080120 */ jal func_E0200480 +/* 3E1A2C E00E839C 0C080120 */ jal shim_queue_render_task /* 3E1A30 E00E83A0 AFA20010 */ sw $v0, 0x10($sp) /* 3E1A34 E00E83A4 8C430000 */ lw $v1, ($v0) /* 3E1A38 E00E83A8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_116/func_E00E83BC.s b/ver/us/asm/nonmatchings/effects/effect_116/func_E00E83BC.s index cce4d9e646..f35be1bd63 100644 --- a/ver/us/asm/nonmatchings/effects/effect_116/func_E00E83BC.s +++ b/ver/us/asm/nonmatchings/effects/effect_116/func_E00E83BC.s @@ -50,17 +50,17 @@ glabel func_E00E83BC /* 3E1B00 E00E8470 001010C0 */ sll $v0, $s0, 3 /* 3E1B04 E00E8474 02028021 */ addu $s0, $s0, $v0 /* 3E1B08 E00E8478 001080C0 */ sll $s0, $s0, 3 -/* 3E1B0C E00E847C 0C080108 */ jal func_E0200420 +/* 3E1B0C E00E847C 0C080108 */ jal shim_guTranslateF /* 3E1B10 E00E8480 02038021 */ addu $s0, $s0, $v1 /* 3E1B14 E00E8484 27B10050 */ addiu $s1, $sp, 0x50 /* 3E1B18 E00E8488 8E450044 */ lw $a1, 0x44($s2) /* 3E1B1C E00E848C 0220202D */ daddu $a0, $s1, $zero /* 3E1B20 E00E8490 00A0302D */ daddu $a2, $a1, $zero -/* 3E1B24 E00E8494 0C080110 */ jal func_E0200440 +/* 3E1B24 E00E8494 0C080110 */ jal shim_guScaleF /* 3E1B28 E00E8498 00A0382D */ daddu $a3, $a1, $zero /* 3E1B2C E00E849C 0220202D */ daddu $a0, $s1, $zero /* 3E1B30 E00E84A0 27A50010 */ addiu $a1, $sp, 0x10 -/* 3E1B34 E00E84A4 0C080114 */ jal func_E0200450 +/* 3E1B34 E00E84A4 0C080114 */ jal shim_guMtxCatF /* 3E1B38 E00E84A8 00A0302D */ daddu $a2, $a1, $zero /* 3E1B3C E00E84AC 27A40010 */ addiu $a0, $sp, 0x10 /* 3E1B40 E00E84B0 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -71,7 +71,7 @@ glabel func_E00E83BC /* 3E1B54 E00E84C4 8E820000 */ lw $v0, ($s4) /* 3E1B58 E00E84C8 00052980 */ sll $a1, $a1, 6 /* 3E1B5C E00E84CC 00B62821 */ addu $a1, $a1, $s6 -/* 3E1B60 E00E84D0 0C080118 */ jal func_E0200460 +/* 3E1B60 E00E84D0 0C080118 */ jal shim_guMtxF2L /* 3E1B64 E00E84D4 00452821 */ addu $a1, $v0, $a1 /* 3E1B68 E00E84D8 3C03DA38 */ lui $v1, 0xda38 /* 3E1B6C E00E84DC 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_116/fx_116_main.s b/ver/us/asm/nonmatchings/effects/effect_116/fx_116_main.s index 272845c0e1..42c2463e6a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_116/fx_116_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_116/fx_116_main.s @@ -31,12 +31,12 @@ glabel fx_116_main /* 3E16F8 E00E8068 AFA70074 */ sw $a3, 0x74($sp) /* 3E16FC E00E806C AFA00010 */ sw $zero, 0x10($sp) /* 3E1700 E00E8070 AFA00024 */ sw $zero, 0x24($sp) -/* 3E1704 E00E8074 0C080124 */ jal func_E0200490 +/* 3E1704 E00E8074 0C080124 */ jal shim_create_effect_instance /* 3E1708 E00E8078 AFA20014 */ sw $v0, 0x14($sp) /* 3E170C E00E807C 24040048 */ addiu $a0, $zero, 0x48 /* 3E1710 E00E8080 24030001 */ addiu $v1, $zero, 1 /* 3E1714 E00E8084 0040882D */ daddu $s1, $v0, $zero -/* 3E1718 E00E8088 0C08012C */ jal func_E02004B0 +/* 3E1718 E00E8088 0C08012C */ jal shim_general_heap_malloc /* 3E171C E00E808C AE230008 */ sw $v1, 8($s1) /* 3E1720 E00E8090 0040802D */ daddu $s0, $v0, $zero /* 3E1724 E00E8094 16000003 */ bnez $s0, .LE00E80A4 @@ -67,7 +67,7 @@ glabel fx_116_main /* 3E1780 E00E80F0 00000000 */ nop /* 3E1784 E00E80F4 45010004 */ bc1t .LE00E8108 /* 3E1788 E00E80F8 AE000020 */ sw $zero, 0x20($s0) -/* 3E178C E00E80FC 0C080154 */ jal func_E0200550 +/* 3E178C E00E80FC 0C080154 */ jal shim_sqrtf /* 3E1790 E00E8100 00000000 */ nop /* 3E1794 E00E8104 46000306 */ mov.s $f12, $f0 .LE00E8108: diff --git a/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA198.s b/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA198.s index d7d60ff636..696977a45f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA198.s +++ b/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA198.s @@ -37,7 +37,7 @@ glabel func_E00EA198 /* 3E20EC E00EA20C 8E030010 */ lw $v1, 0x10($s0) /* 3E20F0 E00EA210 04610005 */ bgez $v1, .LE00EA228 /* 3E20F4 E00EA214 28620010 */ slti $v0, $v1, 0x10 -/* 3E20F8 E00EA218 0C080128 */ jal func_E02004A0 +/* 3E20F8 E00EA218 0C080128 */ jal shim_remove_effect /* 3E20FC E00EA21C 00000000 */ nop /* 3E2100 E00EA220 0803A940 */ j .LE00EA500 /* 3E2104 E00EA224 00000000 */ nop @@ -216,7 +216,7 @@ glabel func_E00EA198 /* 3E238C E00EA4AC 00021080 */ sll $v0, $v0, 2 /* 3E2390 E00EA4B0 44826000 */ mtc1 $v0, $f12 /* 3E2394 E00EA4B4 00000000 */ nop -/* 3E2398 E00EA4B8 0C080140 */ jal func_E0200500 +/* 3E2398 E00EA4B8 0C080140 */ jal shim_sin_deg /* 3E239C E00EA4BC 46806320 */ cvt.s.w $f12, $f12 /* 3E23A0 E00EA4C0 C6040060 */ lwc1 $f4, 0x60($s0) /* 3E23A4 E00EA4C4 C6020064 */ lwc1 $f2, 0x64($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA520.s b/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA520.s index df788e1613..33259749af 100644 --- a/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA520.s +++ b/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA520.s @@ -33,7 +33,7 @@ glabel func_E00EA520 /* 3E2470 E00EA590 8CE50004 */ lw $a1, 4($a3) /* 3E2474 E00EA594 8CE60008 */ lw $a2, 8($a3) /* 3E2478 E00EA598 8CE7000C */ lw $a3, 0xc($a3) -/* 3E247C E00EA59C 0C080168 */ jal func_E02005A0 +/* 3E247C E00EA59C 0C080168 */ jal shim_transform_point /* 3E2480 E00EA5A0 00822021 */ addu $a0, $a0, $v0 /* 3E2484 E00EA5A4 C7A00040 */ lwc1 $f0, 0x40($sp) /* 3E2488 E00EA5A8 3C01459C */ lui $at, 0x459c @@ -76,7 +76,7 @@ glabel func_E00EA520 /* 3E2510 E00EA630 AC820004 */ sw $v0, 4($a0) /* 3E2514 E00EA634 24020011 */ addiu $v0, $zero, 0x11 /* 3E2518 E00EA638 AC910008 */ sw $s1, 8($a0) -/* 3E251C E00EA63C 0C080120 */ jal func_E0200480 +/* 3E251C E00EA63C 0C080120 */ jal shim_queue_render_task /* 3E2520 E00EA640 AC820000 */ sw $v0, ($a0) /* 3E2524 E00EA644 8C430000 */ lw $v1, ($v0) /* 3E2528 E00EA648 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA66C.s b/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA66C.s index 2e1eb35ed9..0d6e21c043 100644 --- a/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA66C.s +++ b/ver/us/asm/nonmatchings/effects/effect_117/func_E00EA66C.s @@ -73,17 +73,17 @@ glabel func_E00EA66C /* 3E265C E00EA77C 441E5000 */ mfc1 $fp, $f10 /* 3E2660 E00EA780 4600428D */ trunc.w.s $f10, $f8 /* 3E2664 E00EA784 E7AA009C */ swc1 $f10, 0x9c($sp) -/* 3E2668 E00EA788 0C080108 */ jal func_E0200420 +/* 3E2668 E00EA788 0C080108 */ jal shim_guTranslateF /* 3E266C E00EA78C 0048A821 */ addu $s5, $v0, $t0 /* 3E2670 E00EA790 27B00058 */ addiu $s0, $sp, 0x58 /* 3E2674 E00EA794 8E65003C */ lw $a1, 0x3c($s3) /* 3E2678 E00EA798 0200202D */ daddu $a0, $s0, $zero /* 3E267C E00EA79C 00A0302D */ daddu $a2, $a1, $zero -/* 3E2680 E00EA7A0 0C080110 */ jal func_E0200440 +/* 3E2680 E00EA7A0 0C080110 */ jal shim_guScaleF /* 3E2684 E00EA7A4 00A0382D */ daddu $a3, $a1, $zero /* 3E2688 E00EA7A8 0200202D */ daddu $a0, $s0, $zero /* 3E268C E00EA7AC 27A50018 */ addiu $a1, $sp, 0x18 -/* 3E2690 E00EA7B0 0C080114 */ jal func_E0200450 +/* 3E2690 E00EA7B0 0C080114 */ jal shim_guMtxCatF /* 3E2694 E00EA7B4 00A0302D */ daddu $a2, $a1, $zero /* 3E2698 E00EA7B8 8FAB0098 */ lw $t3, 0x98($sp) /* 3E269C E00EA7BC 24020001 */ addiu $v0, $zero, 1 @@ -96,11 +96,11 @@ glabel func_E00EA66C /* 3E26B8 E00EA7D8 3C013F80 */ lui $at, 0x3f80 /* 3E26BC E00EA7DC 44810000 */ mtc1 $at, $f0 /* 3E26C0 E00EA7E0 00C0382D */ daddu $a3, $a2, $zero -/* 3E26C4 E00EA7E4 0C080104 */ jal func_E0200410 +/* 3E26C4 E00EA7E4 0C080104 */ jal shim_guRotateF /* 3E26C8 E00EA7E8 E7A00010 */ swc1 $f0, 0x10($sp) /* 3E26CC E00EA7EC 0200202D */ daddu $a0, $s0, $zero /* 3E26D0 E00EA7F0 27A50018 */ addiu $a1, $sp, 0x18 -/* 3E26D4 E00EA7F4 0C080114 */ jal func_E0200450 +/* 3E26D4 E00EA7F4 0C080114 */ jal shim_guMtxCatF /* 3E26D8 E00EA7F8 00A0302D */ daddu $a2, $a1, $zero /* 3E26DC E00EA7FC 3C120001 */ lui $s2, 1 .LE00EA800: @@ -114,7 +114,7 @@ glabel func_E00EA66C /* 3E26FC E00EA81C 8E220000 */ lw $v0, ($s1) /* 3E2700 E00EA820 00052980 */ sll $a1, $a1, 6 /* 3E2704 E00EA824 00B22821 */ addu $a1, $a1, $s2 -/* 3E2708 E00EA828 0C080118 */ jal func_E0200460 +/* 3E2708 E00EA828 0C080118 */ jal shim_guMtxF2L /* 3E270C E00EA82C 00452821 */ addu $a1, $v0, $a1 /* 3E2710 E00EA830 3C03DA38 */ lui $v1, 0xda38 /* 3E2714 E00EA834 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_main.s b/ver/us/asm/nonmatchings/effects/effect_117/fx_117_main.s index 15e2043add..af1c20e9c5 100644 --- a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_117/fx_117_main.s @@ -28,12 +28,12 @@ glabel fx_117_main /* 3E1F3C E00EA05C AFB00028 */ sw $s0, 0x28($sp) /* 3E1F40 E00EA060 AFA00010 */ sw $zero, 0x10($sp) /* 3E1F44 E00EA064 AFA00024 */ sw $zero, 0x24($sp) -/* 3E1F48 E00EA068 0C080124 */ jal func_E0200490 +/* 3E1F48 E00EA068 0C080124 */ jal shim_create_effect_instance /* 3E1F4C E00EA06C AFA20014 */ sw $v0, 0x14($sp) /* 3E1F50 E00EA070 24040080 */ addiu $a0, $zero, 0x80 /* 3E1F54 E00EA074 24030001 */ addiu $v1, $zero, 1 /* 3E1F58 E00EA078 0040802D */ daddu $s0, $v0, $zero -/* 3E1F5C E00EA07C 0C08012C */ jal func_E02004B0 +/* 3E1F5C E00EA07C 0C08012C */ jal shim_general_heap_malloc /* 3E1F60 E00EA080 AE030008 */ sw $v1, 8($s0) /* 3E1F64 E00EA084 0040202D */ daddu $a0, $v0, $zero /* 3E1F68 E00EA088 14800003 */ bnez $a0, .LE00EA098 diff --git a/ver/us/asm/nonmatchings/effects/effect_119/func_E010A18C.s b/ver/us/asm/nonmatchings/effects/effect_119/func_E010A18C.s index ddde276d41..85f7630372 100644 --- a/ver/us/asm/nonmatchings/effects/effect_119/func_E010A18C.s +++ b/ver/us/asm/nonmatchings/effects/effect_119/func_E010A18C.s @@ -29,7 +29,7 @@ glabel func_E010A18C /* 3E4584 E010A1E4 24420001 */ addiu $v0, $v0, 1 /* 3E4588 E010A1E8 04A10005 */ bgez $a1, .LE010A200 /* 3E458C E010A1EC AE220020 */ sw $v0, 0x20($s1) -/* 3E4590 E010A1F0 0C080128 */ jal func_E02004A0 +/* 3E4590 E010A1F0 0C080128 */ jal shim_remove_effect /* 3E4594 E010A1F4 00000000 */ nop /* 3E4598 E010A1F8 08042921 */ j .LE010A484 /* 3E459C E010A1FC 00000000 */ nop @@ -112,7 +112,7 @@ glabel func_E010A18C /* 3E46C4 E010A324 44826000 */ mtc1 $v0, $f12 /* 3E46C8 E010A328 00000000 */ nop /* 3E46CC E010A32C 46806320 */ cvt.s.w $f12, $f12 -/* 3E46D0 E010A330 0C080140 */ jal func_E0200500 +/* 3E46D0 E010A330 0C080140 */ jal shim_sin_deg /* 3E46D4 E010A334 E6020050 */ swc1 $f2, 0x50($s0) /* 3E46D8 E010A338 C6260014 */ lwc1 $f6, 0x14($s1) /* 3E46DC E010A33C 46143182 */ mul.s $f6, $f6, $f20 @@ -133,7 +133,7 @@ glabel func_E010A18C /* 3E4718 E010A378 C622000C */ lwc1 $f2, 0xc($s1) /* 3E471C E010A37C 46001081 */ sub.s $f2, $f2, $f0 /* 3E4720 E010A380 2404000A */ addiu $a0, $zero, 0xa -/* 3E4724 E010A384 0C080138 */ jal func_E02004E0 +/* 3E4724 E010A384 0C080138 */ jal shim_rand_int /* 3E4728 E010A388 E6020070 */ swc1 $f2, 0x70($s0) /* 3E472C E010A38C 2442FFFB */ addiu $v0, $v0, -5 /* 3E4730 E010A390 3C013DCC */ lui $at, 0x3dcc @@ -145,7 +145,7 @@ glabel func_E010A18C /* 3E4748 E010A3A8 46140002 */ mul.s $f0, $f0, $f20 /* 3E474C E010A3AC 00000000 */ nop /* 3E4750 E010A3B0 2404000A */ addiu $a0, $zero, 0xa -/* 3E4754 E010A3B4 0C080138 */ jal func_E02004E0 +/* 3E4754 E010A3B4 0C080138 */ jal shim_rand_int /* 3E4758 E010A3B8 E6000080 */ swc1 $f0, 0x80($s0) /* 3E475C E010A3BC 2442FFFB */ addiu $v0, $v0, -5 /* 3E4760 E010A3C0 44820000 */ mtc1 $v0, $f0 @@ -154,7 +154,7 @@ glabel func_E010A18C /* 3E476C E010A3CC 46140002 */ mul.s $f0, $f0, $f20 /* 3E4770 E010A3D0 00000000 */ nop /* 3E4774 E010A3D4 2404000A */ addiu $a0, $zero, 0xa -/* 3E4778 E010A3D8 0C080138 */ jal func_E02004E0 +/* 3E4778 E010A3D8 0C080138 */ jal shim_rand_int /* 3E477C E010A3DC E6000090 */ swc1 $f0, 0x90($s0) /* 3E4780 E010A3E0 0000202D */ daddu $a0, $zero, $zero /* 3E4784 E010A3E4 2442FFFB */ addiu $v0, $v0, -5 diff --git a/ver/us/asm/nonmatchings/effects/effect_119/func_E010A4A0.s b/ver/us/asm/nonmatchings/effects/effect_119/func_E010A4A0.s index 59ad11c6d5..b9a539474f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_119/func_E010A4A0.s +++ b/ver/us/asm/nonmatchings/effects/effect_119/func_E010A4A0.s @@ -12,7 +12,7 @@ glabel func_E010A4A0 /* 3E485C E010A4BC AFA40018 */ sw $a0, 0x18($sp) /* 3E4860 E010A4C0 27A40010 */ addiu $a0, $sp, 0x10 /* 3E4864 E010A4C4 AFBF0020 */ sw $ra, 0x20($sp) -/* 3E4868 E010A4C8 0C080120 */ jal func_E0200480 +/* 3E4868 E010A4C8 0C080120 */ jal shim_queue_render_task /* 3E486C E010A4CC AFA20010 */ sw $v0, 0x10($sp) /* 3E4870 E010A4D0 8C430000 */ lw $v1, ($v0) /* 3E4874 E010A4D4 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_119/func_E010A4E8.s b/ver/us/asm/nonmatchings/effects/effect_119/func_E010A4E8.s index fb6f41cf9c..54a42a8db8 100644 --- a/ver/us/asm/nonmatchings/effects/effect_119/func_E010A4E8.s +++ b/ver/us/asm/nonmatchings/effects/effect_119/func_E010A4E8.s @@ -37,10 +37,10 @@ glabel func_E010A4E8 /* 3E4908 E010A568 8E330030 */ lw $s3, 0x30($s1) /* 3E490C E010A56C 8E360000 */ lw $s6, ($s1) /* 3E4910 E010A570 4600A507 */ neg.s $f20, $f20 -/* 3E4914 E010A574 0C080140 */ jal func_E0200500 +/* 3E4914 E010A574 0C080140 */ jal shim_sin_deg /* 3E4918 E010A578 4600A306 */ mov.s $f12, $f20 /* 3E491C E010A57C 4600A306 */ mov.s $f12, $f20 -/* 3E4920 E010A580 0C080144 */ jal func_E0200510 +/* 3E4920 E010A580 0C080144 */ jal shim_cos_deg /* 3E4924 E010A584 E7A00058 */ swc1 $f0, 0x58($sp) /* 3E4928 E010A588 3C148007 */ lui $s4, %hi(gGameStatusPtr) /* 3E492C E010A58C 2694419C */ addiu $s4, $s4, %lo(gGameStatusPtr) @@ -65,7 +65,7 @@ glabel func_E010A4E8 /* 3E4978 E010A5D8 24060136 */ addiu $a2, $zero, 0x136 /* 3E497C E010A5DC 240700E6 */ addiu $a3, $zero, 0xe6 /* 3E4980 E010A5E0 46200020 */ cvt.s.d $f0, $f0 -/* 3E4984 E010A5E4 0C08018C */ jal func_E0200630 +/* 3E4984 E010A5E4 0C08018C */ jal shim_func_80138D88 /* 3E4988 E010A5E8 E7A00010 */ swc1 $f0, 0x10($sp) /* 3E498C E010A5EC 8E820000 */ lw $v0, ($s4) /* 3E4990 E010A5F0 94420134 */ lhu $v0, 0x134($v0) @@ -200,7 +200,7 @@ glabel func_E010A4E8 /* 3E4B80 E010A7E0 24020001 */ addiu $v0, $zero, 1 /* 3E4B84 E010A7E4 17C20030 */ bne $fp, $v0, .LE010A8A8 /* 3E4B88 E010A7E8 00000000 */ nop -/* 3E4B8C E010A7EC 0C080138 */ jal func_E02004E0 +/* 3E4B8C E010A7EC 0C080138 */ jal shim_rand_int /* 3E4B90 E010A7F0 24040010 */ addiu $a0, $zero, 0x10 /* 3E4B94 E010A7F4 28420006 */ slti $v0, $v0, 6 /* 3E4B98 E010A7F8 54400117 */ bnel $v0, $zero, .LE010AC58 diff --git a/ver/us/asm/nonmatchings/effects/effect_119/fx_119_main.s b/ver/us/asm/nonmatchings/effects/effect_119/fx_119_main.s index 55e61ca4d9..e0265ba020 100644 --- a/ver/us/asm/nonmatchings/effects/effect_119/fx_119_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_119/fx_119_main.s @@ -28,12 +28,12 @@ glabel fx_119_main /* 3E43FC E010A05C AFB00028 */ sw $s0, 0x28($sp) /* 3E4400 E010A060 AFA00010 */ sw $zero, 0x10($sp) /* 3E4404 E010A064 AFA00024 */ sw $zero, 0x24($sp) -/* 3E4408 E010A068 0C080124 */ jal func_E0200490 +/* 3E4408 E010A068 0C080124 */ jal shim_create_effect_instance /* 3E440C E010A06C AFA20014 */ sw $v0, 0x14($sp) /* 3E4410 E010A070 240400B0 */ addiu $a0, $zero, 0xb0 /* 3E4414 E010A074 24030001 */ addiu $v1, $zero, 1 /* 3E4418 E010A078 0040802D */ daddu $s0, $v0, $zero -/* 3E441C E010A07C 0C08012C */ jal func_E02004B0 +/* 3E441C E010A07C 0C08012C */ jal shim_general_heap_malloc /* 3E4420 E010A080 AE030008 */ sw $v1, 8($s0) /* 3E4424 E010A084 0040202D */ daddu $a0, $v0, $zero /* 3E4428 E010A088 14800003 */ bnez $a0, .LE010A098 diff --git a/ver/us/asm/nonmatchings/effects/effect_12/func_E0018000.s b/ver/us/asm/nonmatchings/effects/effect_12/func_E0018000.s index 7ae8a074a3..8326d7849c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_12/func_E0018000.s +++ b/ver/us/asm/nonmatchings/effects/effect_12/func_E0018000.s @@ -10,7 +10,7 @@ glabel func_E0018000 /* 32F594 E0018014 8E05000C */ lw $a1, 0xc($s0) /* 32F598 E0018018 8E060010 */ lw $a2, 0x10($s0) /* 32F59C E001801C 8E070014 */ lw $a3, 0x14($s0) -/* 32F5A0 E0018020 0C080108 */ jal func_E0200420 +/* 32F5A0 E0018020 0C080108 */ jal shim_guTranslateF /* 32F5A4 E0018024 27A40018 */ addiu $a0, $sp, 0x18 /* 32F5A8 E0018028 3C073F80 */ lui $a3, 0x3f80 /* 32F5AC E001802C 44800000 */ mtc1 $zero, $f0 @@ -18,14 +18,14 @@ glabel func_E0018000 /* 32F5B4 E0018034 E7A00010 */ swc1 $f0, 0x10($sp) /* 32F5B8 E0018038 8E050028 */ lw $a1, 0x28($s0) /* 32F5BC E001803C 44060000 */ mfc1 $a2, $f0 -/* 32F5C0 E0018040 0C080104 */ jal func_E0200410 +/* 32F5C0 E0018040 0C080104 */ jal shim_guRotateF /* 32F5C4 E0018044 0220202D */ daddu $a0, $s1, $zero /* 32F5C8 E0018048 0220202D */ daddu $a0, $s1, $zero /* 32F5CC E001804C 27A50018 */ addiu $a1, $sp, 0x18 -/* 32F5D0 E0018050 0C080114 */ jal func_E0200450 +/* 32F5D0 E0018050 0C080114 */ jal shim_guMtxCatF /* 32F5D4 E0018054 00A0302D */ daddu $a2, $a1, $zero /* 32F5D8 E0018058 27A40018 */ addiu $a0, $sp, 0x18 -/* 32F5DC E001805C 0C080118 */ jal func_E0200460 +/* 32F5DC E001805C 0C080118 */ jal shim_guMtxF2L /* 32F5E0 E0018060 26050030 */ addiu $a1, $s0, 0x30 /* 32F5E4 E0018064 8FBF00A0 */ lw $ra, 0xa0($sp) /* 32F5E8 E0018068 8FB1009C */ lw $s1, 0x9c($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_12/func_E00182B4.s b/ver/us/asm/nonmatchings/effects/effect_12/func_E00182B4.s index 91545adf64..22e38d99fe 100644 --- a/ver/us/asm/nonmatchings/effects/effect_12/func_E00182B4.s +++ b/ver/us/asm/nonmatchings/effects/effect_12/func_E00182B4.s @@ -46,7 +46,7 @@ glabel func_E00182B4 .LE0018348: /* 32F8C8 E0018348 16600003 */ bnez $s3, .LE0018358 /* 32F8CC E001834C 00000000 */ nop -/* 32F8D0 E0018350 0C080128 */ jal func_E02004A0 +/* 32F8D0 E0018350 0C080128 */ jal shim_remove_effect /* 32F8D4 E0018354 0280202D */ daddu $a0, $s4, $zero .LE0018358: /* 32F8D8 E0018358 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_12/func_E0018378.s b/ver/us/asm/nonmatchings/effects/effect_12/func_E0018378.s index b2fc32e4b6..584eb0a132 100644 --- a/ver/us/asm/nonmatchings/effects/effect_12/func_E0018378.s +++ b/ver/us/asm/nonmatchings/effects/effect_12/func_E0018378.s @@ -11,7 +11,7 @@ glabel func_E0018378 /* 32F910 E0018390 27A40010 */ addiu $a0, $sp, 0x10 /* 32F914 E0018394 AFBF0020 */ sw $ra, 0x20($sp) /* 32F918 E0018398 AFA00014 */ sw $zero, 0x14($sp) -/* 32F91C E001839C 0C080120 */ jal func_E0200480 +/* 32F91C E001839C 0C080120 */ jal shim_queue_render_task /* 32F920 E00183A0 AFA20010 */ sw $v0, 0x10($sp) /* 32F924 E00183A4 8C430000 */ lw $v1, ($v0) /* 32F928 E00183A8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_12/func_E00183BC.s b/ver/us/asm/nonmatchings/effects/effect_12/func_E00183BC.s index f4e9249e41..8f0f60e552 100644 --- a/ver/us/asm/nonmatchings/effects/effect_12/func_E00183BC.s +++ b/ver/us/asm/nonmatchings/effects/effect_12/func_E00183BC.s @@ -4,7 +4,7 @@ glabel func_E00183BC /* 32F93C E00183BC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 32F940 E00183C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 32F944 E00183C4 0C080128 */ jal func_E02004A0 +/* 32F944 E00183C4 0C080128 */ jal shim_remove_effect /* 32F948 E00183C8 00000000 */ nop /* 32F94C E00183CC 8FBF0010 */ lw $ra, 0x10($sp) /* 32F950 E00183D0 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_12/fx_12_main.s b/ver/us/asm/nonmatchings/effects/effect_12/fx_12_main.s index 00f9cc59fe..5b15872c60 100644 --- a/ver/us/asm/nonmatchings/effects/effect_12/fx_12_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_12/fx_12_main.s @@ -32,12 +32,12 @@ glabel fx_12_main /* 32F664 E00180E4 AFA60078 */ sw $a2, 0x78($sp) /* 32F668 E00180E8 AFA00010 */ sw $zero, 0x10($sp) /* 32F66C E00180EC AFA00024 */ sw $zero, 0x24($sp) -/* 32F670 E00180F0 0C080124 */ jal func_E0200490 +/* 32F670 E00180F0 0C080124 */ jal shim_create_effect_instance /* 32F674 E00180F4 AFA20014 */ sw $v0, 0x14($sp) /* 32F678 E00180F8 24040098 */ addiu $a0, $zero, 0x98 /* 32F67C E00180FC 24130001 */ addiu $s3, $zero, 1 /* 32F680 E0018100 0040802D */ daddu $s0, $v0, $zero -/* 32F684 E0018104 0C08012C */ jal func_E02004B0 +/* 32F684 E0018104 0C08012C */ jal shim_general_heap_malloc /* 32F688 E0018108 AE130008 */ sw $s3, 8($s0) /* 32F68C E001810C 0040882D */ daddu $s1, $v0, $zero /* 32F690 E0018110 16200003 */ bnez $s1, .LE0018120 @@ -51,7 +51,7 @@ glabel fx_12_main /* 32F6A8 E0018128 00B32821 */ addu $a1, $a1, $s3 /* 32F6AC E001812C 00052880 */ sll $a1, $a1, 2 /* 32F6B0 E0018130 00B32823 */ subu $a1, $a1, $s3 -/* 32F6B4 E0018134 0C080130 */ jal func_E02004C0 +/* 32F6B4 E0018134 0C080130 */ jal shim_mem_clear /* 32F6B8 E0018138 000528C0 */ sll $a1, $a1, 3 /* 32F6BC E001813C 0000902D */ daddu $s2, $zero, $zero /* 32F6C0 E0018140 0253102A */ slt $v0, $s2, $s3 @@ -93,13 +93,13 @@ glabel fx_12_main /* 32F74C E00181CC AE00001C */ sw $zero, 0x1c($s0) /* 32F750 E00181D0 E61A0020 */ swc1 $f26, 0x20($s0) /* 32F754 E00181D4 AE000024 */ sw $zero, 0x24($s0) -/* 32F758 E00181D8 0C08013C */ jal func_E02004F0 +/* 32F758 E00181D8 0C08013C */ jal shim_clamp_angle /* 32F75C E00181DC E606000C */ swc1 $f6, 0xc($s0) /* 32F760 E00181E0 46000506 */ mov.s $f20, $f0 -/* 32F764 E00181E4 0C080140 */ jal func_E0200500 +/* 32F764 E00181E4 0C080140 */ jal shim_sin_deg /* 32F768 E00181E8 4600A306 */ mov.s $f12, $f20 /* 32F76C E00181EC 4600A306 */ mov.s $f12, $f20 -/* 32F770 E00181F0 0C080144 */ jal func_E0200510 +/* 32F770 E00181F0 0C080144 */ jal shim_cos_deg /* 32F774 E00181F4 E6000088 */ swc1 $f0, 0x88($s0) /* 32F778 E00181F8 3C014334 */ lui $at, 0x4334 /* 32F77C E00181FC 44812000 */ mtc1 $at, $f4 @@ -112,14 +112,14 @@ glabel fx_12_main /* 32F798 E0018218 4602A500 */ add.s $f20, $f20, $f2 /* 32F79C E001821C 4604A501 */ sub.s $f20, $f20, $f4 /* 32F7A0 E0018220 E600008C */ swc1 $f0, 0x8c($s0) -/* 32F7A4 E0018224 0C080140 */ jal func_E0200500 +/* 32F7A4 E0018224 0C080140 */ jal shim_sin_deg /* 32F7A8 E0018228 4600A306 */ mov.s $f12, $f20 /* 32F7AC E001822C 46180002 */ mul.s $f0, $f0, $f24 /* 32F7B0 E0018230 00000000 */ nop /* 32F7B4 E0018234 C6020004 */ lwc1 $f2, 4($s0) /* 32F7B8 E0018238 46001080 */ add.s $f2, $f2, $f0 /* 32F7BC E001823C 4600A306 */ mov.s $f12, $f20 -/* 32F7C0 E0018240 0C080144 */ jal func_E0200510 +/* 32F7C0 E0018240 0C080144 */ jal shim_cos_deg /* 32F7C4 E0018244 E6020004 */ swc1 $f2, 4($s0) /* 32F7C8 E0018248 46180002 */ mul.s $f0, $f0, $f24 /* 32F7CC E001824C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_120/func_E010C198.s b/ver/us/asm/nonmatchings/effects/effect_120/func_E010C198.s index f3c19da652..1841ddab70 100644 --- a/ver/us/asm/nonmatchings/effects/effect_120/func_E010C198.s +++ b/ver/us/asm/nonmatchings/effects/effect_120/func_E010C198.s @@ -37,7 +37,7 @@ glabel func_E010C198 /* 3E56D0 E010C210 24420001 */ addiu $v0, $v0, 1 /* 3E56D4 E010C214 04610005 */ bgez $v1, .LE010C22C /* 3E56D8 E010C218 AE220014 */ sw $v0, 0x14($s1) -/* 3E56DC E010C21C 0C080128 */ jal func_E02004A0 +/* 3E56DC E010C21C 0C080128 */ jal shim_remove_effect /* 3E56E0 E010C220 00000000 */ nop /* 3E56E4 E010C224 080430C6 */ j .LE010C318 /* 3E56E8 E010C228 00000000 */ nop @@ -76,14 +76,14 @@ glabel func_E010C198 /* 3E5760 E010C2A0 00000000 */ nop /* 3E5764 E010C2A4 4680A520 */ cvt.s.w $f20, $f20 /* 3E5768 E010C2A8 4614F500 */ add.s $f20, $f30, $f20 -/* 3E576C E010C2AC 0C080140 */ jal func_E0200500 +/* 3E576C E010C2AC 0C080140 */ jal shim_sin_deg /* 3E5770 E010C2B0 4600A306 */ mov.s $f12, $f20 /* 3E5774 E010C2B4 4600E002 */ mul.s $f0, $f28, $f0 /* 3E5778 E010C2B8 00000000 */ nop /* 3E577C E010C2BC 4600D000 */ add.s $f0, $f26, $f0 /* 3E5780 E010C2C0 4600A306 */ mov.s $f12, $f20 /* 3E5784 E010C2C4 E6180008 */ swc1 $f24, 8($s0) -/* 3E5788 E010C2C8 0C080144 */ jal func_E0200510 +/* 3E5788 E010C2C8 0C080144 */ jal shim_cos_deg /* 3E578C E010C2CC E6000004 */ swc1 $f0, 4($s0) /* 3E5790 E010C2D0 4600E002 */ mul.s $f0, $f28, $f0 /* 3E5794 E010C2D4 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_120/func_E010C354.s b/ver/us/asm/nonmatchings/effects/effect_120/func_E010C354.s index d27c08601a..286b6f92b7 100644 --- a/ver/us/asm/nonmatchings/effects/effect_120/func_E010C354.s +++ b/ver/us/asm/nonmatchings/effects/effect_120/func_E010C354.s @@ -12,7 +12,7 @@ glabel func_E010C354 /* 3E5830 E010C370 AFA40018 */ sw $a0, 0x18($sp) /* 3E5834 E010C374 27A40010 */ addiu $a0, $sp, 0x10 /* 3E5838 E010C378 AFBF0020 */ sw $ra, 0x20($sp) -/* 3E583C E010C37C 0C080120 */ jal func_E0200480 +/* 3E583C E010C37C 0C080120 */ jal shim_queue_render_task /* 3E5840 E010C380 AFA20010 */ sw $v0, 0x10($sp) /* 3E5844 E010C384 8C430000 */ lw $v1, ($v0) /* 3E5848 E010C388 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_120/func_E010C39C.s b/ver/us/asm/nonmatchings/effects/effect_120/func_E010C39C.s index d9101d41d5..f05c4a149c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_120/func_E010C39C.s +++ b/ver/us/asm/nonmatchings/effects/effect_120/func_E010C39C.s @@ -99,14 +99,14 @@ glabel func_E010C39C /* 3E59C8 E010C508 E7A60014 */ swc1 $f6, 0x14($sp) /* 3E59CC E010C50C E7A40018 */ swc1 $f4, 0x18($sp) /* 3E59D0 E010C510 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 3E59D4 E010C514 0C080180 */ jal func_E0200600 +/* 3E59D4 E010C514 0C080180 */ jal shim_guPositionF /* 3E59D8 E010C518 E7A00010 */ swc1 $f0, 0x10($sp) /* 3E59DC E010C51C 27A40020 */ addiu $a0, $sp, 0x20 /* 3E59E0 E010C520 96A50000 */ lhu $a1, ($s5) /* 3E59E4 E010C524 8EE20000 */ lw $v0, ($s7) /* 3E59E8 E010C528 00052980 */ sll $a1, $a1, 6 /* 3E59EC E010C52C 00B42821 */ addu $a1, $a1, $s4 -/* 3E59F0 E010C530 0C080118 */ jal func_E0200460 +/* 3E59F0 E010C530 0C080118 */ jal shim_guMtxF2L /* 3E59F4 E010C534 00452821 */ addu $a1, $v0, $a1 /* 3E59F8 E010C538 3C02DA38 */ lui $v0, 0xda38 /* 3E59FC E010C53C 34420002 */ ori $v0, $v0, 2 @@ -194,7 +194,7 @@ glabel func_E010C39C /* 3E5B3C E010C67C 2442A674 */ addiu $v0, $v0, %lo(gDisplayContext) /* 3E5B40 E010C680 462010A0 */ cvt.s.d $f2, $f2 /* 3E5B44 E010C684 44061000 */ mfc1 $a2, $f2 -/* 3E5B48 E010C688 0C080108 */ jal func_E0200420 +/* 3E5B48 E010C688 0C080108 */ jal shim_guTranslateF /* 3E5B4C E010C68C 0040B82D */ daddu $s7, $v0, $zero /* 3E5B50 E010C690 3C028007 */ lui $v0, %hi(gMatrixListPos) /* 3E5B54 E010C694 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) @@ -215,18 +215,18 @@ glabel func_E010C39C /* 3E5B90 E010C6D0 44050000 */ mfc1 $a1, $f0 /* 3E5B94 E010C6D4 4480A000 */ mtc1 $zero, $f20 /* 3E5B98 E010C6D8 00A0302D */ daddu $a2, $a1, $zero -/* 3E5B9C E010C6DC 0C080110 */ jal func_E0200440 +/* 3E5B9C E010C6DC 0C080110 */ jal shim_guScaleF /* 3E5BA0 E010C6E0 00A0382D */ daddu $a3, $a1, $zero /* 3E5BA4 E010C6E4 0200202D */ daddu $a0, $s0, $zero /* 3E5BA8 E010C6E8 27A50020 */ addiu $a1, $sp, 0x20 -/* 3E5BAC E010C6EC 0C080114 */ jal func_E0200450 +/* 3E5BAC E010C6EC 0C080114 */ jal shim_guMtxCatF /* 3E5BB0 E010C6F0 00A0302D */ daddu $a2, $a1, $zero /* 3E5BB4 E010C6F4 27A40020 */ addiu $a0, $sp, 0x20 /* 3E5BB8 E010C6F8 96850000 */ lhu $a1, ($s4) /* 3E5BBC E010C6FC 8EE20000 */ lw $v0, ($s7) /* 3E5BC0 E010C700 00052980 */ sll $a1, $a1, 6 /* 3E5BC4 E010C704 00B12821 */ addu $a1, $a1, $s1 -/* 3E5BC8 E010C708 0C080118 */ jal func_E0200460 +/* 3E5BC8 E010C708 0C080118 */ jal shim_guMtxF2L /* 3E5BCC E010C70C 00452821 */ addu $a1, $v0, $a1 /* 3E5BD0 E010C710 3C03DA38 */ lui $v1, 0xda38 /* 3E5BD4 E010C714 34630002 */ ori $v1, $v1, 2 @@ -344,14 +344,14 @@ glabel func_E010C39C /* 3E5D88 E010C8C8 E7A60014 */ swc1 $f6, 0x14($sp) /* 3E5D8C E010C8CC E7A40018 */ swc1 $f4, 0x18($sp) /* 3E5D90 E010C8D0 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 3E5D94 E010C8D4 0C080180 */ jal func_E0200600 +/* 3E5D94 E010C8D4 0C080180 */ jal shim_guPositionF /* 3E5D98 E010C8D8 E7A00010 */ swc1 $f0, 0x10($sp) /* 3E5D9C E010C8DC 27A40020 */ addiu $a0, $sp, 0x20 /* 3E5DA0 E010C8E0 96850000 */ lhu $a1, ($s4) /* 3E5DA4 E010C8E4 8EE20000 */ lw $v0, ($s7) /* 3E5DA8 E010C8E8 00052980 */ sll $a1, $a1, 6 /* 3E5DAC E010C8EC 00B62821 */ addu $a1, $a1, $s6 -/* 3E5DB0 E010C8F0 0C080118 */ jal func_E0200460 +/* 3E5DB0 E010C8F0 0C080118 */ jal shim_guMtxF2L /* 3E5DB4 E010C8F4 00452821 */ addu $a1, $v0, $a1 /* 3E5DB8 E010C8F8 3C02DA38 */ lui $v0, 0xda38 /* 3E5DBC E010C8FC 34420002 */ ori $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_120/fx_120_main.s b/ver/us/asm/nonmatchings/effects/effect_120/fx_120_main.s index 6d5cb21b51..3a58d48350 100644 --- a/ver/us/asm/nonmatchings/effects/effect_120/fx_120_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_120/fx_120_main.s @@ -28,12 +28,12 @@ glabel fx_120_main /* 3E551C E010C05C AFB00028 */ sw $s0, 0x28($sp) /* 3E5520 E010C060 AFA00010 */ sw $zero, 0x10($sp) /* 3E5524 E010C064 AFA00024 */ sw $zero, 0x24($sp) -/* 3E5528 E010C068 0C080124 */ jal func_E0200490 +/* 3E5528 E010C068 0C080124 */ jal shim_create_effect_instance /* 3E552C E010C06C AFA20014 */ sw $v0, 0x14($sp) /* 3E5530 E010C070 2404013C */ addiu $a0, $zero, 0x13c /* 3E5534 E010C074 24030001 */ addiu $v1, $zero, 1 /* 3E5538 E010C078 0040802D */ daddu $s0, $v0, $zero -/* 3E553C E010C07C 0C08012C */ jal func_E02004B0 +/* 3E553C E010C07C 0C08012C */ jal shim_general_heap_malloc /* 3E5540 E010C080 AE030008 */ sw $v1, 8($s0) /* 3E5544 E010C084 0040202D */ daddu $a0, $v0, $zero /* 3E5548 E010C088 14800003 */ bnez $a0, .LE010C098 diff --git a/ver/us/asm/nonmatchings/effects/effect_121/func_E010E4A8.s b/ver/us/asm/nonmatchings/effects/effect_121/func_E010E4A8.s index ae4f73a377..da0f36ef70 100644 --- a/ver/us/asm/nonmatchings/effects/effect_121/func_E010E4A8.s +++ b/ver/us/asm/nonmatchings/effects/effect_121/func_E010E4A8.s @@ -25,7 +25,7 @@ glabel func_E010E4A8 /* 3EB9D0 E010E4F0 24420001 */ addiu $v0, $v0, 1 /* 3EB9D4 E010E4F4 04610003 */ bgez $v1, .LE010E504 /* 3EB9D8 E010E4F8 ACA2001C */ sw $v0, 0x1c($a1) -/* 3EB9DC E010E4FC 0C080128 */ jal func_E02004A0 +/* 3EB9DC E010E4FC 0C080128 */ jal shim_remove_effect /* 3EB9E0 E010E500 00000000 */ nop .LE010E504: /* 3EB9E4 E010E504 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_121/func_E010E510.s b/ver/us/asm/nonmatchings/effects/effect_121/func_E010E510.s index 04868d030a..252f73f8b8 100644 --- a/ver/us/asm/nonmatchings/effects/effect_121/func_E010E510.s +++ b/ver/us/asm/nonmatchings/effects/effect_121/func_E010E510.s @@ -12,7 +12,7 @@ glabel func_E010E510 /* 3EBA0C E010E52C AFA40018 */ sw $a0, 0x18($sp) /* 3EBA10 E010E530 27A40010 */ addiu $a0, $sp, 0x10 /* 3EBA14 E010E534 AFBF0020 */ sw $ra, 0x20($sp) -/* 3EBA18 E010E538 0C080120 */ jal func_E0200480 +/* 3EBA18 E010E538 0C080120 */ jal shim_queue_render_task /* 3EBA1C E010E53C AFA20010 */ sw $v0, 0x10($sp) /* 3EBA20 E010E540 8C430000 */ lw $v1, ($v0) /* 3EBA24 E010E544 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_121/func_E010E558.s b/ver/us/asm/nonmatchings/effects/effect_121/func_E010E558.s index b812148ac8..08614acaee 100644 --- a/ver/us/asm/nonmatchings/effects/effect_121/func_E010E558.s +++ b/ver/us/asm/nonmatchings/effects/effect_121/func_E010E558.s @@ -116,7 +116,7 @@ glabel LE010E61C_3EBAFC /* 3EBBDC E010E6FC AFA00014 */ sw $zero, 0x14($sp) /* 3EBBE0 E010E700 8E040054 */ lw $a0, 0x54($s0) /* 3EBBE4 E010E704 8E060044 */ lw $a2, 0x44($s0) -/* 3EBBE8 E010E708 0C080194 */ jal func_E0200650 +/* 3EBBE8 E010E708 0C080194 */ jal shim_draw_msg /* 3EBBEC E010E70C 00652823 */ subu $a1, $v1, $a1 .LE010E710: /* 3EBBF0 E010E710 8E420000 */ lw $v0, ($s2) diff --git a/ver/us/asm/nonmatchings/effects/effect_121/fx_121_main.s b/ver/us/asm/nonmatchings/effects/effect_121/fx_121_main.s index 9b6d14848b..3d4238ca07 100644 --- a/ver/us/asm/nonmatchings/effects/effect_121/fx_121_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_121/fx_121_main.s @@ -29,12 +29,12 @@ glabel fx_121_main /* 3EB86C E010E38C AFB00028 */ sw $s0, 0x28($sp) /* 3EB870 E010E390 AFA00010 */ sw $zero, 0x10($sp) /* 3EB874 E010E394 AFA00024 */ sw $zero, 0x24($sp) -/* 3EB878 E010E398 0C080124 */ jal func_E0200490 +/* 3EB878 E010E398 0C080124 */ jal shim_create_effect_instance /* 3EB87C E010E39C AFA20014 */ sw $v0, 0x14($sp) /* 3EB880 E010E3A0 24040058 */ addiu $a0, $zero, 0x58 /* 3EB884 E010E3A4 24030001 */ addiu $v1, $zero, 1 /* 3EB888 E010E3A8 0040882D */ daddu $s1, $v0, $zero -/* 3EB88C E010E3AC 0C08012C */ jal func_E02004B0 +/* 3EB88C E010E3AC 0C08012C */ jal shim_general_heap_malloc /* 3EB890 E010E3B0 AE230008 */ sw $v1, 8($s1) /* 3EB894 E010E3B4 0040802D */ daddu $s0, $v0, $zero /* 3EB898 E010E3B8 16000003 */ bnez $s0, .LE010E3C8 @@ -85,7 +85,7 @@ glabel fx_121_main /* 3EB934 E010E454 240200A0 */ addiu $v0, $zero, 0xa0 /* 3EB938 E010E458 0000282D */ daddu $a1, $zero, $zero /* 3EB93C E010E45C AE020040 */ sw $v0, 0x40($s0) -/* 3EB940 E010E460 0C080198 */ jal func_E0200660 +/* 3EB940 E010E460 0C080198 */ jal shim_get_msg_width /* 3EB944 E010E464 AE020044 */ sw $v0, 0x44($s0) /* 3EB948 E010E468 AE020048 */ sw $v0, 0x48($s0) /* 3EB94C E010E46C 24020018 */ addiu $v0, $zero, 0x18 diff --git a/ver/us/asm/nonmatchings/effects/effect_122/func_E011022C.s b/ver/us/asm/nonmatchings/effects/effect_122/func_E011022C.s index 1ee66efc2a..48718948b0 100644 --- a/ver/us/asm/nonmatchings/effects/effect_122/func_E011022C.s +++ b/ver/us/asm/nonmatchings/effects/effect_122/func_E011022C.s @@ -26,7 +26,7 @@ glabel func_E011022C /* 3F8668 E0110278 24420001 */ addiu $v0, $v0, 1 /* 3F866C E011027C 04A10005 */ bgez $a1, .LE0110294 /* 3F8670 E0110280 AC620014 */ sw $v0, 0x14($v1) -/* 3F8674 E0110284 0C080128 */ jal func_E02004A0 +/* 3F8674 E0110284 0C080128 */ jal shim_remove_effect /* 3F8678 E0110288 00000000 */ nop /* 3F867C E011028C 080440E6 */ j .LE0110398 /* 3F8680 E0110290 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_122/func_E01103A4.s b/ver/us/asm/nonmatchings/effects/effect_122/func_E01103A4.s index b5bd2d630c..ff18ab2203 100644 --- a/ver/us/asm/nonmatchings/effects/effect_122/func_E01103A4.s +++ b/ver/us/asm/nonmatchings/effects/effect_122/func_E01103A4.s @@ -12,7 +12,7 @@ glabel func_E01103A4 /* 3F87B0 E01103C0 AFA40018 */ sw $a0, 0x18($sp) /* 3F87B4 E01103C4 27A40010 */ addiu $a0, $sp, 0x10 /* 3F87B8 E01103C8 AFBF0020 */ sw $ra, 0x20($sp) -/* 3F87BC E01103CC 0C080120 */ jal func_E0200480 +/* 3F87BC E01103CC 0C080120 */ jal shim_queue_render_task /* 3F87C0 E01103D0 AFA20010 */ sw $v0, 0x10($sp) /* 3F87C4 E01103D4 8C430000 */ lw $v1, ($v0) /* 3F87C8 E01103D8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_122/func_E01103EC.s b/ver/us/asm/nonmatchings/effects/effect_122/func_E01103EC.s index 07d3f510b8..1df2e37e8c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_122/func_E01103EC.s +++ b/ver/us/asm/nonmatchings/effects/effect_122/func_E01103EC.s @@ -62,7 +62,7 @@ glabel func_E01103EC /* 3F88C0 E01104D0 E7A00018 */ swc1 $f0, 0x18($sp) /* 3F88C4 E01104D4 C680000C */ lwc1 $f0, 0xc($s4) /* 3F88C8 E01104D8 36521630 */ ori $s2, $s2, 0x1630 -/* 3F88CC E01104DC 0C080180 */ jal func_E0200600 +/* 3F88CC E01104DC 0C080180 */ jal shim_guPositionF /* 3F88D0 E01104E0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3F88D4 E01104E4 27A40020 */ addiu $a0, $sp, 0x20 /* 3F88D8 E01104E8 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -73,7 +73,7 @@ glabel func_E01103EC /* 3F88EC E01104FC 8E220000 */ lw $v0, ($s1) /* 3F88F0 E0110500 00052980 */ sll $a1, $a1, 6 /* 3F88F4 E0110504 00B22821 */ addu $a1, $a1, $s2 -/* 3F88F8 E0110508 0C080118 */ jal func_E0200460 +/* 3F88F8 E0110508 0C080118 */ jal shim_guMtxF2L /* 3F88FC E011050C 00452821 */ addu $a1, $v0, $a1 /* 3F8900 E0110510 3C02DA38 */ lui $v0, 0xda38 /* 3F8904 E0110514 34420002 */ ori $v0, $v0, 2 @@ -97,14 +97,14 @@ glabel func_E01103EC /* 3F894C E011055C 8E85003C */ lw $a1, 0x3c($s4) /* 3F8950 E0110560 25080001 */ addiu $t0, $t0, 1 /* 3F8954 E0110564 AEA90000 */ sw $t1, ($s5) -/* 3F8958 E0110568 0C080104 */ jal func_E0200410 +/* 3F8958 E0110568 0C080104 */ jal shim_guRotateF /* 3F895C E011056C A6080000 */ sh $t0, ($s0) /* 3F8960 E0110570 27A40020 */ addiu $a0, $sp, 0x20 /* 3F8964 E0110574 96050000 */ lhu $a1, ($s0) /* 3F8968 E0110578 8E220000 */ lw $v0, ($s1) /* 3F896C E011057C 00052980 */ sll $a1, $a1, 6 /* 3F8970 E0110580 00B22821 */ addu $a1, $a1, $s2 -/* 3F8974 E0110584 0C080118 */ jal func_E0200460 +/* 3F8974 E0110584 0C080118 */ jal shim_guMtxF2L /* 3F8978 E0110588 00452821 */ addu $a1, $v0, $a1 /* 3F897C E011058C 3C07D838 */ lui $a3, 0xd838 /* 3F8980 E0110590 3C03DA38 */ lui $v1, 0xda38 diff --git a/ver/us/asm/nonmatchings/effects/effect_122/fx_122_main.s b/ver/us/asm/nonmatchings/effects/effect_122/fx_122_main.s index 62308fb59a..990b968e32 100644 --- a/ver/us/asm/nonmatchings/effects/effect_122/fx_122_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_122/fx_122_main.s @@ -29,12 +29,12 @@ glabel fx_122_main /* 3F8450 E0110060 AFB1002C */ sw $s1, 0x2c($sp) /* 3F8454 E0110064 AFA00010 */ sw $zero, 0x10($sp) /* 3F8458 E0110068 AFA00024 */ sw $zero, 0x24($sp) -/* 3F845C E011006C 0C080124 */ jal func_E0200490 +/* 3F845C E011006C 0C080124 */ jal shim_create_effect_instance /* 3F8460 E0110070 AFA20014 */ sw $v0, 0x14($sp) /* 3F8464 E0110074 2404005C */ addiu $a0, $zero, 0x5c /* 3F8468 E0110078 24030001 */ addiu $v1, $zero, 1 /* 3F846C E011007C 0040902D */ daddu $s2, $v0, $zero -/* 3F8470 E0110080 0C08012C */ jal func_E02004B0 +/* 3F8470 E0110080 0C08012C */ jal shim_general_heap_malloc /* 3F8474 E0110084 AE430008 */ sw $v1, 8($s2) /* 3F8478 E0110088 0040882D */ daddu $s1, $v0, $zero /* 3F847C E011008C 16200003 */ bnez $s1, .LE011009C @@ -67,10 +67,10 @@ glabel fx_122_main /* 3F84D8 E01100E8 AE220030 */ sw $v0, 0x30($s1) /* 3F84DC E01100EC AE220034 */ sw $v0, 0x34($s1) /* 3F84E0 E01100F0 AE200044 */ sw $zero, 0x44($s1) -/* 3F84E4 E01100F4 0C080138 */ jal func_E02004E0 +/* 3F84E4 E01100F4 0C080138 */ jal shim_rand_int /* 3F84E8 E01100F8 E6200038 */ swc1 $f0, 0x38($s1) /* 3F84EC E01100FC 24040004 */ addiu $a0, $zero, 4 -/* 3F84F0 E0110100 0C080138 */ jal func_E02004E0 +/* 3F84F0 E0110100 0C080138 */ jal shim_rand_int /* 3F84F4 E0110104 0040802D */ daddu $s0, $v0, $zero /* 3F84F8 E0110108 3C01E011 */ lui $at, %hi(D_E01108C0) /* 3F84FC E011010C D42608C0 */ ldc1 $f6, %lo(D_E01108C0)($at) @@ -94,34 +94,34 @@ glabel fx_122_main /* 3F8544 E0110154 00000000 */ nop /* 3F8548 E0110158 24040167 */ addiu $a0, $zero, 0x167 /* 3F854C E011015C 46200020 */ cvt.s.d $f0, $f0 -/* 3F8550 E0110160 0C080138 */ jal func_E02004E0 +/* 3F8550 E0110160 0C080138 */ jal shim_rand_int /* 3F8554 E0110164 E6200048 */ swc1 $f0, 0x48($s1) /* 3F8558 E0110168 2404000A */ addiu $a0, $zero, 0xa /* 3F855C E011016C 44820000 */ mtc1 $v0, $f0 /* 3F8560 E0110170 00000000 */ nop /* 3F8564 E0110174 46800020 */ cvt.s.w $f0, $f0 -/* 3F8568 E0110178 0C080138 */ jal func_E02004E0 +/* 3F8568 E0110178 0C080138 */ jal shim_rand_int /* 3F856C E011017C E620003C */ swc1 $f0, 0x3c($s1) /* 3F8570 E0110180 2404000A */ addiu $a0, $zero, 0xa /* 3F8574 E0110184 2442FFFB */ addiu $v0, $v0, -5 /* 3F8578 E0110188 44820000 */ mtc1 $v0, $f0 /* 3F857C E011018C 00000000 */ nop /* 3F8580 E0110190 46800020 */ cvt.s.w $f0, $f0 -/* 3F8584 E0110194 0C080138 */ jal func_E02004E0 +/* 3F8584 E0110194 0C080138 */ jal shim_rand_int /* 3F8588 E0110198 E620004C */ swc1 $f0, 0x4c($s1) /* 3F858C E011019C 2404000A */ addiu $a0, $zero, 0xa /* 3F8590 E01101A0 2442FFFB */ addiu $v0, $v0, -5 /* 3F8594 E01101A4 44820000 */ mtc1 $v0, $f0 /* 3F8598 E01101A8 00000000 */ nop /* 3F859C E01101AC 46800020 */ cvt.s.w $f0, $f0 -/* 3F85A0 E01101B0 0C080138 */ jal func_E02004E0 +/* 3F85A0 E01101B0 0C080138 */ jal shim_rand_int /* 3F85A4 E01101B4 E6200050 */ swc1 $f0, 0x50($s1) /* 3F85A8 E01101B8 24040028 */ addiu $a0, $zero, 0x28 /* 3F85AC E01101BC 2442FFFB */ addiu $v0, $v0, -5 /* 3F85B0 E01101C0 44820000 */ mtc1 $v0, $f0 /* 3F85B4 E01101C4 00000000 */ nop /* 3F85B8 E01101C8 46800020 */ cvt.s.w $f0, $f0 -/* 3F85BC E01101CC 0C080138 */ jal func_E02004E0 +/* 3F85BC E01101CC 0C080138 */ jal shim_rand_int /* 3F85C0 E01101D0 E6200054 */ swc1 $f0, 0x54($s1) /* 3F85C4 E01101D4 2443FFEC */ addiu $v1, $v0, -0x14 /* 3F85C8 E01101D8 0240102D */ daddu $v0, $s2, $zero diff --git a/ver/us/asm/nonmatchings/effects/effect_123/func_E01121C0.s b/ver/us/asm/nonmatchings/effects/effect_123/func_E01121C0.s index 9d84d8dd80..8f573c21bd 100644 --- a/ver/us/asm/nonmatchings/effects/effect_123/func_E01121C0.s +++ b/ver/us/asm/nonmatchings/effects/effect_123/func_E01121C0.s @@ -26,7 +26,7 @@ glabel func_E01121C0 /* 3FA05C E011220C 24420001 */ addiu $v0, $v0, 1 /* 3FA060 E0112210 0461000A */ bgez $v1, .LE011223C /* 3FA064 E0112214 AE020014 */ sw $v0, 0x14($s0) -/* 3FA068 E0112218 0C080128 */ jal func_E02004A0 +/* 3FA068 E0112218 0C080128 */ jal shim_remove_effect /* 3FA06C E011221C 00000000 */ nop /* 3FA070 E0112220 8E03001C */ lw $v1, 0x1c($s0) /* 3FA074 E0112224 1060002C */ beqz $v1, .LE01122D8 diff --git a/ver/us/asm/nonmatchings/effects/effect_123/func_E01122E8.s b/ver/us/asm/nonmatchings/effects/effect_123/func_E01122E8.s index c46e7d0d37..7444d48407 100644 --- a/ver/us/asm/nonmatchings/effects/effect_123/func_E01122E8.s +++ b/ver/us/asm/nonmatchings/effects/effect_123/func_E01122E8.s @@ -12,7 +12,7 @@ glabel func_E01122E8 /* 3FA154 E0112304 AFA40018 */ sw $a0, 0x18($sp) /* 3FA158 E0112308 27A40010 */ addiu $a0, $sp, 0x10 /* 3FA15C E011230C AFBF0020 */ sw $ra, 0x20($sp) -/* 3FA160 E0112310 0C080120 */ jal func_E0200480 +/* 3FA160 E0112310 0C080120 */ jal shim_queue_render_task /* 3FA164 E0112314 AFA20010 */ sw $v0, 0x10($sp) /* 3FA168 E0112318 8C430000 */ lw $v1, ($v0) /* 3FA16C E011231C 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_123/func_E0112330.s b/ver/us/asm/nonmatchings/effects/effect_123/func_E0112330.s index 9038aee280..a64aa1306e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_123/func_E0112330.s +++ b/ver/us/asm/nonmatchings/effects/effect_123/func_E0112330.s @@ -46,7 +46,7 @@ glabel func_E0112330 /* 3FA21C E01123CC 46020000 */ add.s $f0, $f0, $f2 /* 3FA220 E01123D0 44062000 */ mfc1 $a2, $f4 /* 3FA224 E01123D4 3C120001 */ lui $s2, 1 -/* 3FA228 E01123D8 0C080180 */ jal func_E0200600 +/* 3FA228 E01123D8 0C080180 */ jal shim_guPositionF /* 3FA22C E01123DC E7A0001C */ swc1 $f0, 0x1c($sp) /* 3FA230 E01123E0 4406A000 */ mfc1 $a2, $f20 /* 3FA234 E01123E4 4407A000 */ mfc1 $a3, $f20 @@ -56,20 +56,20 @@ glabel func_E0112330 /* 3FA244 E01123F4 E7A00010 */ swc1 $f0, 0x10($sp) /* 3FA248 E01123F8 8E050020 */ lw $a1, 0x20($s0) /* 3FA24C E01123FC 27B00060 */ addiu $s0, $sp, 0x60 -/* 3FA250 E0112400 0C080104 */ jal func_E0200410 +/* 3FA250 E0112400 0C080104 */ jal shim_guRotateF /* 3FA254 E0112404 0200202D */ daddu $a0, $s0, $zero /* 3FA258 E0112408 0200202D */ daddu $a0, $s0, $zero /* 3FA25C E011240C 27A50020 */ addiu $a1, $sp, 0x20 -/* 3FA260 E0112410 0C080114 */ jal func_E0200450 +/* 3FA260 E0112410 0C080114 */ jal shim_guMtxCatF /* 3FA264 E0112414 00A0302D */ daddu $a2, $a1, $zero /* 3FA268 E0112418 0200202D */ daddu $a0, $s0, $zero /* 3FA26C E011241C 4405A000 */ mfc1 $a1, $f20 /* 3FA270 E0112420 3C07C000 */ lui $a3, 0xc000 -/* 3FA274 E0112424 0C080108 */ jal func_E0200420 +/* 3FA274 E0112424 0C080108 */ jal shim_guTranslateF /* 3FA278 E0112428 00A0302D */ daddu $a2, $a1, $zero /* 3FA27C E011242C 0200202D */ daddu $a0, $s0, $zero /* 3FA280 E0112430 27A50020 */ addiu $a1, $sp, 0x20 -/* 3FA284 E0112434 0C080114 */ jal func_E0200450 +/* 3FA284 E0112434 0C080114 */ jal shim_guMtxCatF /* 3FA288 E0112438 00A0302D */ daddu $a2, $a1, $zero /* 3FA28C E011243C 27A40020 */ addiu $a0, $sp, 0x20 /* 3FA290 E0112440 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -80,7 +80,7 @@ glabel func_E0112330 /* 3FA2A4 E0112454 8E220000 */ lw $v0, ($s1) /* 3FA2A8 E0112458 00052980 */ sll $a1, $a1, 6 /* 3FA2AC E011245C 00B22821 */ addu $a1, $a1, $s2 -/* 3FA2B0 E0112460 0C080118 */ jal func_E0200460 +/* 3FA2B0 E0112460 0C080118 */ jal shim_guMtxF2L /* 3FA2B4 E0112464 00452821 */ addu $a1, $v0, $a1 /* 3FA2B8 E0112468 3C05DA38 */ lui $a1, 0xda38 /* 3FA2BC E011246C 3C04800A */ lui $a0, %hi(gMasterGfxPos) diff --git a/ver/us/asm/nonmatchings/effects/effect_123/fx_123_main.s b/ver/us/asm/nonmatchings/effects/effect_123/fx_123_main.s index a8d18fb927..309bbd6dbe 100644 --- a/ver/us/asm/nonmatchings/effects/effect_123/fx_123_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_123/fx_123_main.s @@ -32,12 +32,12 @@ glabel fx_123_main /* 3F9EBC E011206C F7B60060 */ sdc1 $f22, 0x60($sp) /* 3F9EC0 E0112070 AFA00028 */ sw $zero, 0x28($sp) /* 3F9EC4 E0112074 AFA0003C */ sw $zero, 0x3c($sp) -/* 3F9EC8 E0112078 0C080124 */ jal func_E0200490 +/* 3F9EC8 E0112078 0C080124 */ jal shim_create_effect_instance /* 3F9ECC E011207C AFA2002C */ sw $v0, 0x2c($sp) /* 3F9ED0 E0112080 24040038 */ addiu $a0, $zero, 0x38 /* 3F9ED4 E0112084 24030001 */ addiu $v1, $zero, 1 /* 3F9ED8 E0112088 0040882D */ daddu $s1, $v0, $zero -/* 3F9EDC E011208C 0C08012C */ jal func_E02004B0 +/* 3F9EDC E011208C 0C08012C */ jal shim_general_heap_malloc /* 3F9EE0 E0112090 AE230008 */ sw $v1, 8($s1) /* 3F9EE4 E0112094 0040802D */ daddu $s0, $v0, $zero /* 3F9EE8 E0112098 16000003 */ bnez $s0, .LE01120A8 @@ -65,7 +65,7 @@ glabel fx_123_main /* 3F9F30 E01120E0 A2000034 */ sb $zero, 0x34($s0) /* 3F9F34 E01120E4 1640000D */ bnez $s2, .LE011211C /* 3F9F38 E01120E8 E6160020 */ swc1 $f22, 0x20($s0) -/* 3F9F3C E01120EC 0C080150 */ jal func_E0200540 +/* 3F9F3C E01120EC 0C080150 */ jal shim_load_effect /* 3F9F40 E01120F0 24040024 */ addiu $a0, $zero, 0x24 /* 3F9F44 E01120F4 3C014040 */ lui $at, 0x4040 /* 3F9F48 E01120F8 44810000 */ mtc1 $at, $f0 @@ -81,7 +81,7 @@ glabel fx_123_main /* 3F9F6C E011211C 2A420002 */ slti $v0, $s2, 2 /* 3F9F70 E0112120 50400018 */ beql $v0, $zero, .LE0112184 /* 3F9F74 E0112124 AE00001C */ sw $zero, 0x1c($s0) -/* 3F9F78 E0112128 0C080150 */ jal func_E0200540 +/* 3F9F78 E0112128 0C080150 */ jal shim_load_effect /* 3F9F7C E011212C 24040072 */ addiu $a0, $zero, 0x72 /* 3F9F80 E0112130 4616A102 */ mul.s $f4, $f20, $f22 /* 3F9F84 E0112134 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_124/func_E01140DC.s b/ver/us/asm/nonmatchings/effects/effect_124/func_E01140DC.s index 20fabb65e0..7db754ed15 100644 --- a/ver/us/asm/nonmatchings/effects/effect_124/func_E01140DC.s +++ b/ver/us/asm/nonmatchings/effects/effect_124/func_E01140DC.s @@ -52,7 +52,7 @@ glabel LE0114158_3FEC38 /* 3FEC64 E0114184 44836000 */ mtc1 $v1, $f12 /* 3FEC68 E0114188 00000000 */ nop /* 3FEC6C E011418C 46806320 */ cvt.s.w $f12, $f12 -/* 3FEC70 E0114190 0C080140 */ jal func_E0200500 +/* 3FEC70 E0114190 0C080140 */ jal shim_sin_deg /* 3FEC74 E0114194 A2220105 */ sb $v0, 0x105($s1) /* 3FEC78 E0114198 C64200B8 */ lwc1 $f2, 0xb8($s2) /* 3FEC7C E011419C 46001080 */ add.s $f2, $f2, $f0 @@ -77,7 +77,7 @@ glabel LE01141B4_3FEC94 /* 3FECC0 E01141E0 44836000 */ mtc1 $v1, $f12 /* 3FECC4 E01141E4 00000000 */ nop /* 3FECC8 E01141E8 46806320 */ cvt.s.w $f12, $f12 -/* 3FECCC E01141EC 0C080140 */ jal func_E0200500 +/* 3FECCC E01141EC 0C080140 */ jal shim_sin_deg /* 3FECD0 E01141F0 A2220105 */ sb $v0, 0x105($s1) /* 3FECD4 E01141F4 46000000 */ add.s $f0, $f0, $f0 /* 3FECD8 E01141F8 24130001 */ addiu $s3, $zero, 1 @@ -102,7 +102,7 @@ glabel LE0114210_3FECF0 /* 3FED1C E011423C 44836000 */ mtc1 $v1, $f12 /* 3FED20 E0114240 00000000 */ nop /* 3FED24 E0114244 46806320 */ cvt.s.w $f12, $f12 -/* 3FED28 E0114248 0C080140 */ jal func_E0200500 +/* 3FED28 E0114248 0C080140 */ jal shim_sin_deg /* 3FED2C E011424C A2220105 */ sb $v0, 0x105($s1) /* 3FED30 E0114250 3C014080 */ lui $at, 0x4080 /* 3FED34 E0114254 44811000 */ mtc1 $at, $f2 @@ -126,7 +126,7 @@ glabel LE011426C_3FED4C /* 3FED74 E0114294 44836000 */ mtc1 $v1, $f12 /* 3FED78 E0114298 00000000 */ nop /* 3FED7C E011429C 46806320 */ cvt.s.w $f12, $f12 -/* 3FED80 E01142A0 0C080140 */ jal func_E0200500 +/* 3FED80 E01142A0 0C080140 */ jal shim_sin_deg /* 3FED84 E01142A4 A2220105 */ sb $v0, 0x105($s1) /* 3FED88 E01142A8 3C014140 */ lui $at, 0x4140 /* 3FED8C E01142AC 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/effects/effect_124/func_E0114340.s b/ver/us/asm/nonmatchings/effects/effect_124/func_E0114340.s index 827bdda87e..8495a4a33d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_124/func_E0114340.s +++ b/ver/us/asm/nonmatchings/effects/effect_124/func_E0114340.s @@ -12,7 +12,7 @@ glabel func_E0114340 /* 3FEE3C E011435C AFA40018 */ sw $a0, 0x18($sp) /* 3FEE40 E0114360 27A40010 */ addiu $a0, $sp, 0x10 /* 3FEE44 E0114364 AFBF0020 */ sw $ra, 0x20($sp) -/* 3FEE48 E0114368 0C080120 */ jal func_E0200480 +/* 3FEE48 E0114368 0C080120 */ jal shim_queue_render_task /* 3FEE4C E011436C AFA20010 */ sw $v0, 0x10($sp) /* 3FEE50 E0114370 8C430000 */ lw $v1, ($v0) /* 3FEE54 E0114374 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_124/func_E0114388.s b/ver/us/asm/nonmatchings/effects/effect_124/func_E0114388.s index ae7a1d2110..650378748d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_124/func_E0114388.s +++ b/ver/us/asm/nonmatchings/effects/effect_124/func_E0114388.s @@ -92,14 +92,14 @@ glabel func_E0114388 /* 3FEFC0 E01144E0 E7A00018 */ swc1 $f0, 0x18($sp) /* 3FEFC4 E01144E4 C620008C */ lwc1 $f0, 0x8c($s1) /* 3FEFC8 E01144E8 44061000 */ mfc1 $a2, $f2 -/* 3FEFCC E01144EC 0C080180 */ jal func_E0200600 +/* 3FEFCC E01144EC 0C080180 */ jal shim_guPositionF /* 3FEFD0 E01144F0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3FEFD4 E01144F4 27A40020 */ addiu $a0, $sp, 0x20 /* 3FEFD8 E01144F8 96E50000 */ lhu $a1, ($s7) /* 3FEFDC E01144FC 8FC20000 */ lw $v0, ($fp) /* 3FEFE0 E0114500 00052980 */ sll $a1, $a1, 6 /* 3FEFE4 E0114504 00B62821 */ addu $a1, $a1, $s6 -/* 3FEFE8 E0114508 0C080118 */ jal func_E0200460 +/* 3FEFE8 E0114508 0C080118 */ jal shim_guMtxF2L /* 3FEFEC E011450C 00452821 */ addu $a1, $v0, $a1 /* 3FEFF0 E0114510 3C02DA38 */ lui $v0, 0xda38 /* 3FEFF4 E0114514 34420002 */ ori $v0, $v0, 2 @@ -136,7 +136,7 @@ glabel func_E0114388 /* 3FF070 E0114590 3C07D838 */ lui $a3, 0xd838 /* 3FF074 E0114594 44946000 */ mtc1 $s4, $f12 /* 3FF078 E0114598 00000000 */ nop -/* 3FF07C E011459C 0C080140 */ jal func_E0200500 +/* 3FF07C E011459C 0C080140 */ jal shim_sin_deg /* 3FF080 E01145A0 46806320 */ cvt.s.w $f12, $f12 /* 3FF084 E01145A4 3C01427C */ lui $at, 0x427c /* 3FF088 E01145A8 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/effects/effect_124/fx_124_main.s b/ver/us/asm/nonmatchings/effects/effect_124/fx_124_main.s index 3d4897a6ca..259ce43e88 100644 --- a/ver/us/asm/nonmatchings/effects/effect_124/fx_124_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_124/fx_124_main.s @@ -18,12 +18,12 @@ glabel fx_124_main /* 3FEB14 E0114034 AFB00028 */ sw $s0, 0x28($sp) /* 3FEB18 E0114038 AFA00010 */ sw $zero, 0x10($sp) /* 3FEB1C E011403C AFA00024 */ sw $zero, 0x24($sp) -/* 3FEB20 E0114040 0C080124 */ jal func_E0200490 +/* 3FEB20 E0114040 0C080124 */ jal shim_create_effect_instance /* 3FEB24 E0114044 AFA20014 */ sw $v0, 0x14($sp) /* 3FEB28 E0114048 24040148 */ addiu $a0, $zero, 0x148 /* 3FEB2C E011404C 24030001 */ addiu $v1, $zero, 1 /* 3FEB30 E0114050 0040802D */ daddu $s0, $v0, $zero -/* 3FEB34 E0114054 0C08012C */ jal func_E02004B0 +/* 3FEB34 E0114054 0C08012C */ jal shim_general_heap_malloc /* 3FEB38 E0114058 AE030008 */ sw $v1, 8($s0) /* 3FEB3C E011405C 0040282D */ daddu $a1, $v0, $zero /* 3FEB40 E0114060 14A00003 */ bnez $a1, .LE0114070 diff --git a/ver/us/asm/nonmatchings/effects/effect_125/func_E011618C.s b/ver/us/asm/nonmatchings/effects/effect_125/func_E011618C.s index 99b69508e0..76421b50e9 100644 --- a/ver/us/asm/nonmatchings/effects/effect_125/func_E011618C.s +++ b/ver/us/asm/nonmatchings/effects/effect_125/func_E011618C.s @@ -46,7 +46,7 @@ glabel func_E011618C /* 402868 E0116228 24440001 */ addiu $a0, $v0, 1 /* 40286C E011622C 04610005 */ bgez $v1, .LE0116244 /* 402870 E0116230 AE240014 */ sw $a0, 0x14($s1) -/* 402874 E0116234 0C080128 */ jal func_E02004A0 +/* 402874 E0116234 0C080128 */ jal shim_remove_effect /* 402878 E0116238 0280202D */ daddu $a0, $s4, $zero /* 40287C E011623C 08045997 */ j .LE011665C /* 402880 E0116240 00000000 */ nop @@ -88,11 +88,11 @@ glabel func_E011618C /* 402908 E01162C8 00000000 */ nop /* 40290C E01162CC 4634E500 */ add.d $f20, $f28, $f20 /* 402910 E01162D0 4620A520 */ cvt.s.d $f20, $f20 -/* 402914 E01162D4 0C080140 */ jal func_E0200500 +/* 402914 E01162D4 0C080140 */ jal shim_sin_deg /* 402918 E01162D8 4600A306 */ mov.s $f12, $f20 /* 40291C E01162DC 4600F306 */ mov.s $f12, $f30 /* 402920 E01162E0 C6160018 */ lwc1 $f22, 0x18($s0) -/* 402924 E01162E4 0C080140 */ jal func_E0200500 +/* 402924 E01162E4 0C080140 */ jal shim_sin_deg /* 402928 E01162E8 46000606 */ mov.s $f24, $f0 /* 40292C E01162EC 4600B002 */ mul.s $f0, $f22, $f0 /* 402930 E01162F0 00000000 */ nop @@ -101,14 +101,14 @@ glabel func_E011618C /* 40293C E01162FC C7A60010 */ lwc1 $f6, 0x10($sp) /* 402940 E0116300 46003000 */ add.s $f0, $f6, $f0 /* 402944 E0116304 4600A306 */ mov.s $f12, $f20 -/* 402948 E0116308 0C080144 */ jal func_E0200510 +/* 402948 E0116308 0C080144 */ jal shim_cos_deg /* 40294C E011630C E600FFF0 */ swc1 $f0, -0x10($s0) /* 402950 E0116310 4600B002 */ mul.s $f0, $f22, $f0 /* 402954 E0116314 00000000 */ nop /* 402958 E0116318 C7A60014 */ lwc1 $f6, 0x14($sp) /* 40295C E011631C 46003000 */ add.s $f0, $f6, $f0 /* 402960 E0116320 4600F306 */ mov.s $f12, $f30 -/* 402964 E0116324 0C080144 */ jal func_E0200510 +/* 402964 E0116324 0C080144 */ jal shim_cos_deg /* 402968 E0116328 E600FFF4 */ swc1 $f0, -0xc($s0) /* 40296C E011632C 4600B582 */ mul.s $f22, $f22, $f0 /* 402970 E0116330 00000000 */ nop @@ -300,7 +300,7 @@ glabel LE01165A8_402BE8 /* 402C08 E01165C8 44826000 */ mtc1 $v0, $f12 /* 402C0C E01165CC 00000000 */ nop /* 402C10 E01165D0 46806320 */ cvt.s.w $f12, $f12 -/* 402C14 E01165D4 0C080140 */ jal func_E0200500 +/* 402C14 E01165D4 0C080140 */ jal shim_sin_deg /* 402C18 E01165D8 26520003 */ addiu $s2, $s2, 3 /* 402C1C E01165DC 3C013F80 */ lui $at, 0x3f80 /* 402C20 E01165E0 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/effects/effect_125/func_E01166A0.s b/ver/us/asm/nonmatchings/effects/effect_125/func_E01166A0.s index dbd7d0d9b0..c38a1f21a8 100644 --- a/ver/us/asm/nonmatchings/effects/effect_125/func_E01166A0.s +++ b/ver/us/asm/nonmatchings/effects/effect_125/func_E01166A0.s @@ -12,7 +12,7 @@ glabel func_E01166A0 /* 402CFC E01166BC AFA40018 */ sw $a0, 0x18($sp) /* 402D00 E01166C0 27A40010 */ addiu $a0, $sp, 0x10 /* 402D04 E01166C4 AFBF0020 */ sw $ra, 0x20($sp) -/* 402D08 E01166C8 0C080120 */ jal func_E0200480 +/* 402D08 E01166C8 0C080120 */ jal shim_queue_render_task /* 402D0C E01166CC AFA20010 */ sw $v0, 0x10($sp) /* 402D10 E01166D0 8C430000 */ lw $v1, ($v0) /* 402D14 E01166D4 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_125/func_E01166E8.s b/ver/us/asm/nonmatchings/effects/effect_125/func_E01166E8.s index 7efb7cd898..65fbf3ce0a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_125/func_E01166E8.s +++ b/ver/us/asm/nonmatchings/effects/effect_125/func_E01166E8.s @@ -46,7 +46,7 @@ glabel func_E01166E8 /* 402DC4 E0116784 46020000 */ add.s $f0, $f0, $f2 /* 402DC8 E0116788 44062000 */ mfc1 $a2, $f4 /* 402DCC E011678C 3C120001 */ lui $s2, 1 -/* 402DD0 E0116790 0C080180 */ jal func_E0200600 +/* 402DD0 E0116790 0C080180 */ jal shim_guPositionF /* 402DD4 E0116794 E7A0001C */ swc1 $f0, 0x1c($sp) /* 402DD8 E0116798 4406A000 */ mfc1 $a2, $f20 /* 402DDC E011679C 4407A000 */ mfc1 $a3, $f20 @@ -56,20 +56,20 @@ glabel func_E01166E8 /* 402DEC E01167AC E7A00010 */ swc1 $f0, 0x10($sp) /* 402DF0 E01167B0 8E05001C */ lw $a1, 0x1c($s0) /* 402DF4 E01167B4 27B00060 */ addiu $s0, $sp, 0x60 -/* 402DF8 E01167B8 0C080104 */ jal func_E0200410 +/* 402DF8 E01167B8 0C080104 */ jal shim_guRotateF /* 402DFC E01167BC 0200202D */ daddu $a0, $s0, $zero /* 402E00 E01167C0 0200202D */ daddu $a0, $s0, $zero /* 402E04 E01167C4 27A50020 */ addiu $a1, $sp, 0x20 -/* 402E08 E01167C8 0C080114 */ jal func_E0200450 +/* 402E08 E01167C8 0C080114 */ jal shim_guMtxCatF /* 402E0C E01167CC 00A0302D */ daddu $a2, $a1, $zero /* 402E10 E01167D0 0200202D */ daddu $a0, $s0, $zero /* 402E14 E01167D4 4405A000 */ mfc1 $a1, $f20 /* 402E18 E01167D8 3C07C000 */ lui $a3, 0xc000 -/* 402E1C E01167DC 0C080108 */ jal func_E0200420 +/* 402E1C E01167DC 0C080108 */ jal shim_guTranslateF /* 402E20 E01167E0 00A0302D */ daddu $a2, $a1, $zero /* 402E24 E01167E4 0200202D */ daddu $a0, $s0, $zero /* 402E28 E01167E8 27A50020 */ addiu $a1, $sp, 0x20 -/* 402E2C E01167EC 0C080114 */ jal func_E0200450 +/* 402E2C E01167EC 0C080114 */ jal shim_guMtxCatF /* 402E30 E01167F0 00A0302D */ daddu $a2, $a1, $zero /* 402E34 E01167F4 27A40020 */ addiu $a0, $sp, 0x20 /* 402E38 E01167F8 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -80,7 +80,7 @@ glabel func_E01166E8 /* 402E4C E011680C 8E220000 */ lw $v0, ($s1) /* 402E50 E0116810 00052980 */ sll $a1, $a1, 6 /* 402E54 E0116814 00B22821 */ addu $a1, $a1, $s2 -/* 402E58 E0116818 0C080118 */ jal func_E0200460 +/* 402E58 E0116818 0C080118 */ jal shim_guMtxF2L /* 402E5C E011681C 00452821 */ addu $a1, $v0, $a1 /* 402E60 E0116820 3C05DA38 */ lui $a1, 0xda38 /* 402E64 E0116824 3C04800A */ lui $a0, %hi(gMasterGfxPos) diff --git a/ver/us/asm/nonmatchings/effects/effect_125/fx_125_main.s b/ver/us/asm/nonmatchings/effects/effect_125/fx_125_main.s index c7e5788bdc..d8334e4783 100644 --- a/ver/us/asm/nonmatchings/effects/effect_125/fx_125_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_125/fx_125_main.s @@ -31,12 +31,12 @@ glabel fx_125_main /* 4026A8 E0116068 AFB00028 */ sw $s0, 0x28($sp) /* 4026AC E011606C AFA00010 */ sw $zero, 0x10($sp) /* 4026B0 E0116070 AFA00024 */ sw $zero, 0x24($sp) -/* 4026B4 E0116074 0C080124 */ jal func_E0200490 +/* 4026B4 E0116074 0C080124 */ jal shim_create_effect_instance /* 4026B8 E0116078 AFA20014 */ sw $v0, 0x14($sp) /* 4026BC E011607C 24040180 */ addiu $a0, $zero, 0x180 /* 4026C0 E0116080 24110008 */ addiu $s1, $zero, 8 /* 4026C4 E0116084 0040802D */ daddu $s0, $v0, $zero -/* 4026C8 E0116088 0C08012C */ jal func_E02004B0 +/* 4026C8 E0116088 0C08012C */ jal shim_general_heap_malloc /* 4026CC E011608C AE110008 */ sw $s1, 8($s0) /* 4026D0 E0116090 0040182D */ daddu $v1, $v0, $zero /* 4026D4 E0116094 14600003 */ bnez $v1, .LE01160A4 diff --git a/ver/us/asm/nonmatchings/effects/effect_126/func_E01182F4.s b/ver/us/asm/nonmatchings/effects/effect_126/func_E01182F4.s index a407e17e5d..e228f258ba 100644 --- a/ver/us/asm/nonmatchings/effects/effect_126/func_E01182F4.s +++ b/ver/us/asm/nonmatchings/effects/effect_126/func_E01182F4.s @@ -25,7 +25,7 @@ glabel func_E01182F4 /* 40373C E011833C 24420001 */ addiu $v0, $v0, 1 /* 403740 E0118340 04610005 */ bgez $v1, .LE0118358 /* 403744 E0118344 ACA20020 */ sw $v0, 0x20($a1) -/* 403748 E0118348 0C080128 */ jal func_E02004A0 +/* 403748 E0118348 0C080128 */ jal shim_remove_effect /* 40374C E011834C 00000000 */ nop /* 403750 E0118350 08046112 */ j .LE0118448 /* 403754 E0118354 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_126/func_E0118454.s b/ver/us/asm/nonmatchings/effects/effect_126/func_E0118454.s index b4fd5df3af..50f0703892 100644 --- a/ver/us/asm/nonmatchings/effects/effect_126/func_E0118454.s +++ b/ver/us/asm/nonmatchings/effects/effect_126/func_E0118454.s @@ -12,7 +12,7 @@ glabel func_E0118454 /* 403870 E0118470 AFA40018 */ sw $a0, 0x18($sp) /* 403874 E0118474 27A40010 */ addiu $a0, $sp, 0x10 /* 403878 E0118478 AFBF0020 */ sw $ra, 0x20($sp) -/* 40387C E011847C 0C080120 */ jal func_E0200480 +/* 40387C E011847C 0C080120 */ jal shim_queue_render_task /* 403880 E0118480 AFA20010 */ sw $v0, 0x10($sp) /* 403884 E0118484 8C430000 */ lw $v1, ($v0) /* 403888 E0118488 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_126/func_E011849C.s b/ver/us/asm/nonmatchings/effects/effect_126/func_E011849C.s index fe4a1b33c2..3dc08b591a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_126/func_E011849C.s +++ b/ver/us/asm/nonmatchings/effects/effect_126/func_E011849C.s @@ -89,7 +89,7 @@ glabel func_E011849C /* 4039E8 E01185E8 E7A00018 */ swc1 $f0, 0x18($sp) /* 4039EC E01185EC C600FFD2 */ lwc1 $f0, -0x2e($s0) /* 4039F0 E01185F0 27A40020 */ addiu $a0, $sp, 0x20 -/* 4039F4 E01185F4 0C080180 */ jal func_E0200600 +/* 4039F4 E01185F4 0C080180 */ jal shim_guPositionF /* 4039F8 E01185F8 E7A0001C */ swc1 $f0, 0x1c($sp) /* 4039FC E01185FC 3C013F80 */ lui $at, 0x3f80 /* 403A00 E0118600 44810000 */ mtc1 $at, $f0 @@ -97,18 +97,18 @@ glabel func_E011849C /* 403A08 E0118608 4407A000 */ mfc1 $a3, $f20 /* 403A0C E011860C E7A00010 */ swc1 $f0, 0x10($sp) /* 403A10 E0118610 8E05FFEE */ lw $a1, -0x12($s0) -/* 403A14 E0118614 0C080104 */ jal func_E0200410 +/* 403A14 E0118614 0C080104 */ jal shim_guRotateF /* 403A18 E0118618 0280202D */ daddu $a0, $s4, $zero /* 403A1C E011861C 0280202D */ daddu $a0, $s4, $zero /* 403A20 E0118620 27A50020 */ addiu $a1, $sp, 0x20 -/* 403A24 E0118624 0C080114 */ jal func_E0200450 +/* 403A24 E0118624 0C080114 */ jal shim_guMtxCatF /* 403A28 E0118628 00A0302D */ daddu $a2, $a1, $zero /* 403A2C E011862C 27A40020 */ addiu $a0, $sp, 0x20 /* 403A30 E0118630 96A50000 */ lhu $a1, ($s5) /* 403A34 E0118634 8EC20000 */ lw $v0, ($s6) /* 403A38 E0118638 00052980 */ sll $a1, $a1, 6 /* 403A3C E011863C 00B32821 */ addu $a1, $a1, $s3 -/* 403A40 E0118640 0C080118 */ jal func_E0200460 +/* 403A40 E0118640 0C080118 */ jal shim_guMtxF2L /* 403A44 E0118644 00452821 */ addu $a1, $v0, $a1 /* 403A48 E0118648 3C02DA38 */ lui $v0, 0xda38 /* 403A4C E011864C 34420002 */ ori $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_126/fx_126_main.s b/ver/us/asm/nonmatchings/effects/effect_126/fx_126_main.s index e8c9893c7f..0e3bf93cb4 100644 --- a/ver/us/asm/nonmatchings/effects/effect_126/fx_126_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_126/fx_126_main.s @@ -33,12 +33,12 @@ glabel fx_126_main /* 403470 E0118070 F7B40040 */ sdc1 $f20, 0x40($sp) /* 403474 E0118074 AFA00010 */ sw $zero, 0x10($sp) /* 403478 E0118078 AFA00024 */ sw $zero, 0x24($sp) -/* 40347C E011807C 0C080124 */ jal func_E0200490 +/* 40347C E011807C 0C080124 */ jal shim_create_effect_instance /* 403480 E0118080 AFA20014 */ sw $v0, 0x14($sp) /* 403484 E0118084 24040168 */ addiu $a0, $zero, 0x168 /* 403488 E0118088 24030006 */ addiu $v1, $zero, 6 /* 40348C E011808C 0040982D */ daddu $s3, $v0, $zero -/* 403490 E0118090 0C08012C */ jal func_E02004B0 +/* 403490 E0118090 0C08012C */ jal shim_general_heap_malloc /* 403494 E0118094 AE630008 */ sw $v1, 8($s3) /* 403498 E0118098 0040182D */ daddu $v1, $v0, $zero /* 40349C E011809C 14600003 */ bnez $v1, .LE01180AC @@ -72,7 +72,7 @@ glabel fx_126_main /* 4034F8 E01180F8 2404000A */ addiu $a0, $zero, 0xa /* 4034FC E01180FC E618FFDC */ swc1 $f24, -0x24($s0) /* 403500 E0118100 E61AFFE0 */ swc1 $f26, -0x20($s0) -/* 403504 E0118104 0C080138 */ jal func_E02004E0 +/* 403504 E0118104 0C080138 */ jal shim_rand_int /* 403508 E0118108 E61CFFE4 */ swc1 $f28, -0x1c($s0) /* 40350C E011810C 2442FFFB */ addiu $v0, $v0, -5 /* 403510 E0118110 44820000 */ mtc1 $v0, $f0 @@ -82,7 +82,7 @@ glabel fx_126_main /* 403520 E0118120 00000000 */ nop /* 403524 E0118124 24040005 */ addiu $a0, $zero, 5 /* 403528 E0118128 46200020 */ cvt.s.d $f0, $f0 -/* 40352C E011812C 0C080138 */ jal func_E02004E0 +/* 40352C E011812C 0C080138 */ jal shim_rand_int /* 403530 E0118130 E600FFE8 */ swc1 $f0, -0x18($s0) /* 403534 E0118134 24420001 */ addiu $v0, $v0, 1 /* 403538 E0118138 3C01E012 */ lui $at, %hi(D_E01187D8) @@ -94,7 +94,7 @@ glabel fx_126_main /* 403550 E0118150 00000000 */ nop /* 403554 E0118154 2404000A */ addiu $a0, $zero, 0xa /* 403558 E0118158 46200020 */ cvt.s.d $f0, $f0 -/* 40355C E011815C 0C080138 */ jal func_E02004E0 +/* 40355C E011815C 0C080138 */ jal shim_rand_int /* 403560 E0118160 E600FFEC */ swc1 $f0, -0x14($s0) /* 403564 E0118164 2442FFFB */ addiu $v0, $v0, -5 /* 403568 E0118168 44820000 */ mtc1 $v0, $f0 @@ -105,12 +105,12 @@ glabel fx_126_main /* 40357C E011817C 240400FF */ addiu $a0, $zero, 0xff /* 403580 E0118180 E61EFFFC */ swc1 $f30, -4($s0) /* 403584 E0118184 46200020 */ cvt.s.d $f0, $f0 -/* 403588 E0118188 0C080138 */ jal func_E02004E0 +/* 403588 E0118188 0C080138 */ jal shim_rand_int /* 40358C E011818C E600FFF0 */ swc1 $f0, -0x10($s0) /* 403590 E0118190 A602000C */ sh $v0, 0xc($s0) /* 403594 E0118194 8604000C */ lh $a0, 0xc($s0) /* 403598 E0118198 A6020004 */ sh $v0, 4($s0) -/* 40359C E011819C 0C080138 */ jal func_E02004E0 +/* 40359C E011819C 0C080138 */ jal shim_rand_int /* 4035A0 E01181A0 02442023 */ subu $a0, $s2, $a0 /* 4035A4 E01181A4 9603000C */ lhu $v1, 0xc($s0) /* 4035A8 E01181A8 A602000E */ sh $v0, 0xe($s0) @@ -173,7 +173,7 @@ glabel fx_126_main /* 403680 E0118280 A602000E */ sh $v0, 0xe($s0) /* 403684 E0118284 4620018D */ trunc.w.d $f6, $f0 /* 403688 E0118288 44023000 */ mfc1 $v0, $f6 -/* 40368C E011828C 0C080138 */ jal func_E02004E0 +/* 40368C E011828C 0C080138 */ jal shim_rand_int /* 403690 E0118290 A6020010 */ sh $v0, 0x10($s0) /* 403694 E0118294 44820000 */ mtc1 $v0, $f0 /* 403698 E0118298 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_127/func_E011A104.s b/ver/us/asm/nonmatchings/effects/effect_127/func_E011A104.s index 6dbd49bbfb..9242e6a5e3 100644 --- a/ver/us/asm/nonmatchings/effects/effect_127/func_E011A104.s +++ b/ver/us/asm/nonmatchings/effects/effect_127/func_E011A104.s @@ -33,7 +33,7 @@ glabel func_E011A104 /* 40438C E011A16C 24450001 */ addiu $a1, $v0, 1 /* 404390 E011A170 04610005 */ bgez $v1, .LE011A188 /* 404394 E011A174 AE250008 */ sw $a1, 8($s1) -/* 404398 E011A178 0C080128 */ jal func_E02004A0 +/* 404398 E011A178 0C080128 */ jal shim_remove_effect /* 40439C E011A17C 00000000 */ nop /* 4043A0 E011A180 080468DC */ j .LE011A370 /* 4043A4 E011A184 00000000 */ nop @@ -63,7 +63,7 @@ glabel func_E011A104 /* 4043F8 E011A1D8 00000000 */ nop /* 4043FC E011A1DC 16A00004 */ bnez $s5, .LE011A1F0 /* 404400 E011A1E0 00000000 */ nop -/* 404404 E011A1E4 0C080138 */ jal func_E02004E0 +/* 404404 E011A1E4 0C080138 */ jal shim_rand_int /* 404408 E011A1E8 24040004 */ addiu $a0, $zero, 4 /* 40440C E011A1EC A6020004 */ sh $v0, 4($s0) .LE011A1F0: diff --git a/ver/us/asm/nonmatchings/effects/effect_127/fx_127_main.s b/ver/us/asm/nonmatchings/effects/effect_127/fx_127_main.s index 35952e9e83..5b82ca2456 100644 --- a/ver/us/asm/nonmatchings/effects/effect_127/fx_127_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_127/fx_127_main.s @@ -24,12 +24,12 @@ glabel fx_127_main /* 40426C E011A04C AFBF0034 */ sw $ra, 0x34($sp) /* 404270 E011A050 AFB00028 */ sw $s0, 0x28($sp) /* 404274 E011A054 AFA00010 */ sw $zero, 0x10($sp) -/* 404278 E011A058 0C080124 */ jal func_E0200490 +/* 404278 E011A058 0C080124 */ jal shim_create_effect_instance /* 40427C E011A05C AFA20014 */ sw $v0, 0x14($sp) /* 404280 E011A060 2404002C */ addiu $a0, $zero, 0x2c /* 404284 E011A064 24030001 */ addiu $v1, $zero, 1 /* 404288 E011A068 0040802D */ daddu $s0, $v0, $zero -/* 40428C E011A06C 0C08012C */ jal func_E02004B0 +/* 40428C E011A06C 0C08012C */ jal shim_general_heap_malloc /* 404290 E011A070 AE030008 */ sw $v1, 8($s0) /* 404294 E011A074 0040282D */ daddu $a1, $v0, $zero /* 404298 E011A078 14A00003 */ bnez $a1, .LE011A088 diff --git a/ver/us/asm/nonmatchings/effects/effect_128/func_E011C0FC.s b/ver/us/asm/nonmatchings/effects/effect_128/func_E011C0FC.s index e438e27215..9763761d2d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_128/func_E011C0FC.s +++ b/ver/us/asm/nonmatchings/effects/effect_128/func_E011C0FC.s @@ -25,7 +25,7 @@ glabel func_E011C0FC /* 406C84 E011C144 24420001 */ addiu $v0, $v0, 1 /* 406C88 E011C148 04A10005 */ bgez $a1, .LE011C160 /* 406C8C E011C14C AC620014 */ sw $v0, 0x14($v1) -/* 406C90 E011C150 0C080128 */ jal func_E02004A0 +/* 406C90 E011C150 0C080128 */ jal shim_remove_effect /* 406C94 E011C154 00000000 */ nop /* 406C98 E011C158 0804705C */ j .LE011C170 /* 406C9C E011C15C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_128/func_E011C17C.s b/ver/us/asm/nonmatchings/effects/effect_128/func_E011C17C.s index 9a3e40617c..532312416d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_128/func_E011C17C.s +++ b/ver/us/asm/nonmatchings/effects/effect_128/func_E011C17C.s @@ -12,7 +12,7 @@ glabel func_E011C17C /* 406CD8 E011C198 AFA40018 */ sw $a0, 0x18($sp) /* 406CDC E011C19C 27A40010 */ addiu $a0, $sp, 0x10 /* 406CE0 E011C1A0 AFBF0020 */ sw $ra, 0x20($sp) -/* 406CE4 E011C1A4 0C080120 */ jal func_E0200480 +/* 406CE4 E011C1A4 0C080120 */ jal shim_queue_render_task /* 406CE8 E011C1A8 AFA20010 */ sw $v0, 0x10($sp) /* 406CEC E011C1AC 8C430000 */ lw $v1, ($v0) /* 406CF0 E011C1B0 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_128/func_E011C1C4.s b/ver/us/asm/nonmatchings/effects/effect_128/func_E011C1C4.s index 0b39976d13..256296a9e6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_128/func_E011C1C4.s +++ b/ver/us/asm/nonmatchings/effects/effect_128/func_E011C1C4.s @@ -40,7 +40,7 @@ glabel func_E011C1C4 /* 406D90 E011C250 8E860008 */ lw $a2, 8($s4) /* 406D94 E011C254 8E87000C */ lw $a3, 0xc($s4) /* 406D98 E011C258 4480A000 */ mtc1 $zero, $f20 -/* 406D9C E011C25C 0C080108 */ jal func_E0200420 +/* 406D9C E011C25C 0C080108 */ jal shim_guTranslateF /* 406DA0 E011C260 3C150001 */ lui $s5, 1 /* 406DA4 E011C264 27B00058 */ addiu $s0, $sp, 0x58 /* 406DA8 E011C268 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -60,20 +60,20 @@ glabel func_E011C1C4 /* 406DE0 E011C2A0 46000007 */ neg.s $f0, $f0 /* 406DE4 E011C2A4 44050000 */ mfc1 $a1, $f0 /* 406DE8 E011C2A8 0200202D */ daddu $a0, $s0, $zero -/* 406DEC E011C2AC 0C080104 */ jal func_E0200410 +/* 406DEC E011C2AC 0C080104 */ jal shim_guRotateF /* 406DF0 E011C2B0 E7B40010 */ swc1 $f20, 0x10($sp) /* 406DF4 E011C2B4 0200202D */ daddu $a0, $s0, $zero /* 406DF8 E011C2B8 27A50018 */ addiu $a1, $sp, 0x18 -/* 406DFC E011C2BC 0C080114 */ jal func_E0200450 +/* 406DFC E011C2BC 0C080114 */ jal shim_guMtxCatF /* 406E00 E011C2C0 00A0302D */ daddu $a2, $a1, $zero /* 406E04 E011C2C4 3C0542B3 */ lui $a1, 0x42b3 /* 406E08 E011C2C8 4406A000 */ mfc1 $a2, $f20 /* 406E0C E011C2CC 3C074000 */ lui $a3, 0x4000 -/* 406E10 E011C2D0 0C080108 */ jal func_E0200420 +/* 406E10 E011C2D0 0C080108 */ jal shim_guTranslateF /* 406E14 E011C2D4 0200202D */ daddu $a0, $s0, $zero /* 406E18 E011C2D8 0200202D */ daddu $a0, $s0, $zero /* 406E1C E011C2DC 27A50018 */ addiu $a1, $sp, 0x18 -/* 406E20 E011C2E0 0C080114 */ jal func_E0200450 +/* 406E20 E011C2E0 0C080114 */ jal shim_guMtxCatF /* 406E24 E011C2E4 00A0302D */ daddu $a2, $a1, $zero /* 406E28 E011C2E8 3C013F36 */ lui $at, 0x3f36 /* 406E2C E011C2EC 3421DB6E */ ori $at, $at, 0xdb6e @@ -82,11 +82,11 @@ glabel func_E011C1C4 /* 406E38 E011C2F8 44050000 */ mfc1 $a1, $f0 /* 406E3C E011C2FC 0200202D */ daddu $a0, $s0, $zero /* 406E40 E011C300 00A0302D */ daddu $a2, $a1, $zero -/* 406E44 E011C304 0C080110 */ jal func_E0200440 +/* 406E44 E011C304 0C080110 */ jal shim_guScaleF /* 406E48 E011C308 00A0382D */ daddu $a3, $a1, $zero /* 406E4C E011C30C 0200202D */ daddu $a0, $s0, $zero /* 406E50 E011C310 27A50018 */ addiu $a1, $sp, 0x18 -/* 406E54 E011C314 0C080114 */ jal func_E0200450 +/* 406E54 E011C314 0C080114 */ jal shim_guMtxCatF /* 406E58 E011C318 00A0302D */ daddu $a2, $a1, $zero /* 406E5C E011C31C 27A40018 */ addiu $a0, $sp, 0x18 /* 406E60 E011C320 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -97,7 +97,7 @@ glabel func_E011C1C4 /* 406E74 E011C334 8E620000 */ lw $v0, ($s3) /* 406E78 E011C338 00052980 */ sll $a1, $a1, 6 /* 406E7C E011C33C 00B52821 */ addu $a1, $a1, $s5 -/* 406E80 E011C340 0C080118 */ jal func_E0200460 +/* 406E80 E011C340 0C080118 */ jal shim_guMtxF2L /* 406E84 E011C344 00452821 */ addu $a1, $v0, $a1 /* 406E88 E011C348 3C03DA38 */ lui $v1, 0xda38 /* 406E8C E011C34C 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_128/fx_128_main.s b/ver/us/asm/nonmatchings/effects/effect_128/fx_128_main.s index ca17397685..5fcac42ea3 100644 --- a/ver/us/asm/nonmatchings/effects/effect_128/fx_128_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_128/fx_128_main.s @@ -28,12 +28,12 @@ glabel fx_128_main /* 406B9C E011C05C AFB00028 */ sw $s0, 0x28($sp) /* 406BA0 E011C060 AFA00010 */ sw $zero, 0x10($sp) /* 406BA4 E011C064 AFA00024 */ sw $zero, 0x24($sp) -/* 406BA8 E011C068 0C080124 */ jal func_E0200490 +/* 406BA8 E011C068 0C080124 */ jal shim_create_effect_instance /* 406BAC E011C06C AFA20014 */ sw $v0, 0x14($sp) /* 406BB0 E011C070 24040020 */ addiu $a0, $zero, 0x20 /* 406BB4 E011C074 24030001 */ addiu $v1, $zero, 1 /* 406BB8 E011C078 0040802D */ daddu $s0, $v0, $zero -/* 406BBC E011C07C 0C08012C */ jal func_E02004B0 +/* 406BBC E011C07C 0C08012C */ jal shim_general_heap_malloc /* 406BC0 E011C080 AE030008 */ sw $v1, 8($s0) /* 406BC4 E011C084 0040202D */ daddu $a0, $v0, $zero /* 406BC8 E011C088 14800003 */ bnez $a0, .LE011C098 diff --git a/ver/us/asm/nonmatchings/effects/effect_129/func_E011E194.s b/ver/us/asm/nonmatchings/effects/effect_129/func_E011E194.s index 8331ba88b7..cffb2763b4 100644 --- a/ver/us/asm/nonmatchings/effects/effect_129/func_E011E194.s +++ b/ver/us/asm/nonmatchings/effects/effect_129/func_E011E194.s @@ -33,13 +33,13 @@ glabel func_E011E194 /* 409B8C E011E1FC 24430001 */ addiu $v1, $v0, 1 /* 409B90 E011E200 04810085 */ bgez $a0, .LE011E418 /* 409B94 E011E204 AE230014 */ sw $v1, 0x14($s1) -/* 409B98 E011E208 0C080150 */ jal func_E0200540 +/* 409B98 E011E208 0C080150 */ jal shim_load_effect /* 409B9C E011E20C 2404007A */ addiu $a0, $zero, 0x7a /* 409BA0 E011E210 0000902D */ daddu $s2, $zero, $zero /* 409BA4 E011E214 3C01E012 */ lui $at, %hi(D_E011E810) /* 409BA8 E011E218 D438E810 */ ldc1 $f24, %lo(D_E011E810)($at) .LE011E21C: -/* 409BAC E011E21C 0C080138 */ jal func_E02004E0 +/* 409BAC E011E21C 0C080138 */ jal shim_rand_int /* 409BB0 E011E220 24040014 */ addiu $a0, $zero, 0x14 /* 409BB4 E011E224 C6340004 */ lwc1 $f20, 4($s1) /* 409BB8 E011E228 44820000 */ mtc1 $v0, $f0 @@ -49,7 +49,7 @@ glabel func_E011E194 /* 409BC8 E011E238 3C014120 */ lui $at, 0x4120 /* 409BCC E011E23C 44810000 */ mtc1 $at, $f0 /* 409BD0 E011E240 24040028 */ addiu $a0, $zero, 0x28 -/* 409BD4 E011E244 0C080138 */ jal func_E02004E0 +/* 409BD4 E011E244 0C080138 */ jal shim_rand_int /* 409BD8 E011E248 4600A501 */ sub.s $f20, $f20, $f0 /* 409BDC E011E24C C6220020 */ lwc1 $f2, 0x20($s1) /* 409BE0 E011E250 44820000 */ mtc1 $v0, $f0 @@ -59,7 +59,7 @@ glabel func_E011E194 /* 409BF0 E011E260 00000000 */ nop /* 409BF4 E011E264 C6360008 */ lwc1 $f22, 8($s1) /* 409BF8 E011E268 2404000A */ addiu $a0, $zero, 0xa -/* 409BFC E011E26C 0C080138 */ jal func_E02004E0 +/* 409BFC E011E26C 0C080138 */ jal shim_rand_int /* 409C00 E011E270 4600B580 */ add.s $f22, $f22, $f0 /* 409C04 E011E274 3C01E012 */ lui $at, %hi(D_E011E818) /* 409C08 E011E278 D422E818 */ ldc1 $f2, %lo(D_E011E818)($at) @@ -96,7 +96,7 @@ glabel func_E011E194 /* 409C84 E011E2F4 0C044000 */ jal fx_122_main /* 409C88 E011E2F8 E7A40010 */ swc1 $f4, 0x10($sp) /* 409C8C E011E2FC 2404000A */ addiu $a0, $zero, 0xa -/* 409C90 E011E300 0C080138 */ jal func_E02004E0 +/* 409C90 E011E300 0C080138 */ jal shim_rand_int /* 409C94 E011E304 0040802D */ daddu $s0, $v0, $zero /* 409C98 E011E308 44820000 */ mtc1 $v0, $f0 /* 409C9C E011E30C 00000000 */ nop @@ -106,7 +106,7 @@ glabel func_E011E194 /* 409CAC E011E31C 2404001E */ addiu $a0, $zero, 0x1e /* 409CB0 E011E320 8E02000C */ lw $v0, 0xc($s0) /* 409CB4 E011E324 46200020 */ cvt.s.d $f0, $f0 -/* 409CB8 E011E328 0C080138 */ jal func_E02004E0 +/* 409CB8 E011E328 0C080138 */ jal shim_rand_int /* 409CBC E011E32C E4400044 */ swc1 $f0, 0x44($v0) /* 409CC0 E011E330 3C01E012 */ lui $at, %hi(D_E011E828) /* 409CC4 E011E334 D422E828 */ ldc1 $f2, %lo(D_E011E828)($at) @@ -119,21 +119,21 @@ glabel func_E011E194 /* 409CE0 E011E350 24040167 */ addiu $a0, $zero, 0x167 /* 409CE4 E011E354 8E02000C */ lw $v0, 0xc($s0) /* 409CE8 E011E358 46200020 */ cvt.s.d $f0, $f0 -/* 409CEC E011E35C 0C080138 */ jal func_E02004E0 +/* 409CEC E011E35C 0C080138 */ jal shim_rand_int /* 409CF0 E011E360 E4400048 */ swc1 $f0, 0x48($v0) /* 409CF4 E011E364 24040014 */ addiu $a0, $zero, 0x14 /* 409CF8 E011E368 8E03000C */ lw $v1, 0xc($s0) /* 409CFC E011E36C 44820000 */ mtc1 $v0, $f0 /* 409D00 E011E370 00000000 */ nop /* 409D04 E011E374 46800020 */ cvt.s.w $f0, $f0 -/* 409D08 E011E378 0C080138 */ jal func_E02004E0 +/* 409D08 E011E378 0C080138 */ jal shim_rand_int /* 409D0C E011E37C E460003C */ swc1 $f0, 0x3c($v1) /* 409D10 E011E380 2404000A */ addiu $a0, $zero, 0xa /* 409D14 E011E384 8E03000C */ lw $v1, 0xc($s0) /* 409D18 E011E388 44820000 */ mtc1 $v0, $f0 /* 409D1C E011E38C 00000000 */ nop /* 409D20 E011E390 46800020 */ cvt.s.w $f0, $f0 -/* 409D24 E011E394 0C080138 */ jal func_E02004E0 +/* 409D24 E011E394 0C080138 */ jal shim_rand_int /* 409D28 E011E398 E4600040 */ swc1 $f0, 0x40($v1) /* 409D2C E011E39C 2404000A */ addiu $a0, $zero, 0xa /* 409D30 E011E3A0 2442FFFB */ addiu $v0, $v0, -5 @@ -141,7 +141,7 @@ glabel func_E011E194 /* 409D38 E011E3A8 44820000 */ mtc1 $v0, $f0 /* 409D3C E011E3AC 00000000 */ nop /* 409D40 E011E3B0 46800020 */ cvt.s.w $f0, $f0 -/* 409D44 E011E3B4 0C080138 */ jal func_E02004E0 +/* 409D44 E011E3B4 0C080138 */ jal shim_rand_int /* 409D48 E011E3B8 E460004C */ swc1 $f0, 0x4c($v1) /* 409D4C E011E3BC 2442FFFB */ addiu $v0, $v0, -5 /* 409D50 E011E3C0 8E03000C */ lw $v1, 0xc($s0) @@ -160,9 +160,9 @@ glabel func_E011E194 /* 409D84 E011E3F4 2A420014 */ slti $v0, $s2, 0x14 /* 409D88 E011E3F8 1440FF88 */ bnez $v0, .LE011E21C /* 409D8C E011E3FC 00000000 */ nop -/* 409D90 E011E400 0C080128 */ jal func_E02004A0 +/* 409D90 E011E400 0C080128 */ jal shim_remove_effect /* 409D94 E011E404 8E240028 */ lw $a0, 0x28($s1) -/* 409D98 E011E408 0C080128 */ jal func_E02004A0 +/* 409D98 E011E408 0C080128 */ jal shim_remove_effect /* 409D9C E011E40C 0260202D */ daddu $a0, $s3, $zero /* 409DA0 E011E410 08047942 */ j .LE011E508 /* 409DA4 E011E414 00000000 */ nop @@ -174,7 +174,7 @@ glabel func_E011E194 /* 409DB8 E011E428 00021600 */ sll $v0, $v0, 0x18 /* 409DBC E011E42C 04410005 */ bgez $v0, .LE011E444 /* 409DC0 E011E430 0060902D */ daddu $s2, $v1, $zero -/* 409DC4 E011E434 0C080138 */ jal func_E02004E0 +/* 409DC4 E011E434 0C080138 */ jal shim_rand_int /* 409DC8 E011E438 2404003C */ addiu $a0, $zero, 0x3c /* 409DCC E011E43C 24420008 */ addiu $v0, $v0, 8 /* 409DD0 E011E440 A2220025 */ sb $v0, 0x25($s1) @@ -197,7 +197,7 @@ glabel func_E011E194 /* 409E08 E011E478 3242000F */ andi $v0, $s2, 0xf /* 409E0C E011E47C 14400013 */ bnez $v0, .LE011E4CC /* 409E10 E011E480 00000000 */ nop -/* 409E14 E011E484 0C080150 */ jal func_E0200540 +/* 409E14 E011E484 0C080150 */ jal shim_load_effect /* 409E18 E011E488 2404006F */ addiu $a0, $zero, 0x6f /* 409E1C E011E48C C6220020 */ lwc1 $f2, 0x20($s1) /* 409E20 E011E490 3C014220 */ lui $at, 0x4220 diff --git a/ver/us/asm/nonmatchings/effects/effect_129/func_E011E530.s b/ver/us/asm/nonmatchings/effects/effect_129/func_E011E530.s index 708b8a26a1..0dba42a3e0 100644 --- a/ver/us/asm/nonmatchings/effects/effect_129/func_E011E530.s +++ b/ver/us/asm/nonmatchings/effects/effect_129/func_E011E530.s @@ -12,7 +12,7 @@ glabel func_E011E530 /* 409EDC E011E54C AFA40018 */ sw $a0, 0x18($sp) /* 409EE0 E011E550 27A40010 */ addiu $a0, $sp, 0x10 /* 409EE4 E011E554 AFBF0020 */ sw $ra, 0x20($sp) -/* 409EE8 E011E558 0C080120 */ jal func_E0200480 +/* 409EE8 E011E558 0C080120 */ jal shim_queue_render_task /* 409EEC E011E55C AFA20010 */ sw $v0, 0x10($sp) /* 409EF0 E011E560 8C430000 */ lw $v1, ($v0) /* 409EF4 E011E564 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_129/func_E011E578.s b/ver/us/asm/nonmatchings/effects/effect_129/func_E011E578.s index e01309d0f7..993673fe44 100644 --- a/ver/us/asm/nonmatchings/effects/effect_129/func_E011E578.s +++ b/ver/us/asm/nonmatchings/effects/effect_129/func_E011E578.s @@ -50,17 +50,17 @@ glabel func_E011E578 /* 409FBC E011E62C 001010C0 */ sll $v0, $s0, 3 /* 409FC0 E011E630 02028021 */ addu $s0, $s0, $v0 /* 409FC4 E011E634 001080C0 */ sll $s0, $s0, 3 -/* 409FC8 E011E638 0C080108 */ jal func_E0200420 +/* 409FC8 E011E638 0C080108 */ jal shim_guTranslateF /* 409FCC E011E63C 02038021 */ addu $s0, $s0, $v1 /* 409FD0 E011E640 27B10050 */ addiu $s1, $sp, 0x50 /* 409FD4 E011E644 8E450020 */ lw $a1, 0x20($s2) /* 409FD8 E011E648 0220202D */ daddu $a0, $s1, $zero /* 409FDC E011E64C 00A0302D */ daddu $a2, $a1, $zero -/* 409FE0 E011E650 0C080110 */ jal func_E0200440 +/* 409FE0 E011E650 0C080110 */ jal shim_guScaleF /* 409FE4 E011E654 00A0382D */ daddu $a3, $a1, $zero /* 409FE8 E011E658 0220202D */ daddu $a0, $s1, $zero /* 409FEC E011E65C 27A50010 */ addiu $a1, $sp, 0x10 -/* 409FF0 E011E660 0C080114 */ jal func_E0200450 +/* 409FF0 E011E660 0C080114 */ jal shim_guMtxCatF /* 409FF4 E011E664 00A0302D */ daddu $a2, $a1, $zero /* 409FF8 E011E668 27A40010 */ addiu $a0, $sp, 0x10 /* 409FFC E011E66C 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -71,7 +71,7 @@ glabel func_E011E578 /* 40A010 E011E680 8E820000 */ lw $v0, ($s4) /* 40A014 E011E684 00052980 */ sll $a1, $a1, 6 /* 40A018 E011E688 00B52821 */ addu $a1, $a1, $s5 -/* 40A01C E011E68C 0C080118 */ jal func_E0200460 +/* 40A01C E011E68C 0C080118 */ jal shim_guMtxF2L /* 40A020 E011E690 00452821 */ addu $a1, $v0, $a1 /* 40A024 E011E694 3C03DA38 */ lui $v1, 0xda38 /* 40A028 E011E698 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_129/fx_129_main.s b/ver/us/asm/nonmatchings/effects/effect_129/fx_129_main.s index 8dee537a15..74a629fe0f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_129/fx_129_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_129/fx_129_main.s @@ -31,12 +31,12 @@ glabel fx_129_main /* 4099F8 E011E068 AFB00040 */ sw $s0, 0x40($sp) /* 4099FC E011E06C AFA00028 */ sw $zero, 0x28($sp) /* 409A00 E011E070 AFA0003C */ sw $zero, 0x3c($sp) -/* 409A04 E011E074 0C080124 */ jal func_E0200490 +/* 409A04 E011E074 0C080124 */ jal shim_create_effect_instance /* 409A08 E011E078 AFA2002C */ sw $v0, 0x2c($sp) /* 409A0C E011E07C 2404002C */ addiu $a0, $zero, 0x2c /* 409A10 E011E080 24030001 */ addiu $v1, $zero, 1 /* 409A14 E011E084 0040882D */ daddu $s1, $v0, $zero -/* 409A18 E011E088 0C08012C */ jal func_E02004B0 +/* 409A18 E011E088 0C08012C */ jal shim_general_heap_malloc /* 409A1C E011E08C AE230008 */ sw $v1, 8($s1) /* 409A20 E011E090 0040802D */ daddu $s0, $v0, $zero /* 409A24 E011E094 16000003 */ bnez $s0, .LE011E0A4 @@ -70,7 +70,7 @@ glabel fx_129_main /* 409A84 E011E0F4 A203001E */ sb $v1, 0x1e($s0) /* 409A88 E011E0F8 A203001F */ sb $v1, 0x1f($s0) /* 409A8C E011E0FC A2000025 */ sb $zero, 0x25($s0) -/* 409A90 E011E100 0C080150 */ jal func_E0200540 +/* 409A90 E011E100 0C080150 */ jal shim_load_effect /* 409A94 E011E104 A2000024 */ sb $zero, 0x24($s0) /* 409A98 E011E108 24040001 */ addiu $a0, $zero, 1 /* 409A9C E011E10C 3C014120 */ lui $at, 0x4120 @@ -91,7 +91,7 @@ glabel fx_129_main /* 409AD8 E011E148 0C039000 */ jal fx_114_main /* 409ADC E011E14C E7A40014 */ swc1 $f4, 0x14($sp) /* 409AE0 E011E150 2404006F */ addiu $a0, $zero, 0x6f -/* 409AE4 E011E154 0C080150 */ jal func_E0200540 +/* 409AE4 E011E154 0C080150 */ jal shim_load_effect /* 409AE8 E011E158 AE020028 */ sw $v0, 0x28($s0) /* 409AEC E011E15C 0220102D */ daddu $v0, $s1, $zero /* 409AF0 E011E160 8FBF0050 */ lw $ra, 0x50($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_13/func_E001A224.s b/ver/us/asm/nonmatchings/effects/effect_13/func_E001A224.s index 5e520e0572..6057152420 100644 --- a/ver/us/asm/nonmatchings/effects/effect_13/func_E001A224.s +++ b/ver/us/asm/nonmatchings/effects/effect_13/func_E001A224.s @@ -122,7 +122,7 @@ glabel func_E001A224 /* 33020C E001A3DC ACA20038 */ sw $v0, 0x38($a1) /* 330210 E001A3E0 04610003 */ bgez $v1, .LE001A3F0 /* 330214 E001A3E4 E4A00008 */ swc1 $f0, 8($a1) -/* 330218 E001A3E8 0C080128 */ jal func_E02004A0 +/* 330218 E001A3E8 0C080128 */ jal shim_remove_effect /* 33021C E001A3EC 00000000 */ nop .LE001A3F0: /* 330220 E001A3F0 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_13/func_E001A3FC.s b/ver/us/asm/nonmatchings/effects/effect_13/func_E001A3FC.s index 76256efb17..967fd37077 100644 --- a/ver/us/asm/nonmatchings/effects/effect_13/func_E001A3FC.s +++ b/ver/us/asm/nonmatchings/effects/effect_13/func_E001A3FC.s @@ -11,7 +11,7 @@ glabel func_E001A3FC /* 330244 E001A414 27A40010 */ addiu $a0, $sp, 0x10 /* 330248 E001A418 AFBF0020 */ sw $ra, 0x20($sp) /* 33024C E001A41C AFA00014 */ sw $zero, 0x14($sp) -/* 330250 E001A420 0C080120 */ jal func_E0200480 +/* 330250 E001A420 0C080120 */ jal shim_queue_render_task /* 330254 E001A424 AFA20010 */ sw $v0, 0x10($sp) /* 330258 E001A428 8C430000 */ lw $v1, ($v0) /* 33025C E001A42C 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_13/func_E001A440.s b/ver/us/asm/nonmatchings/effects/effect_13/func_E001A440.s index c7936fae69..dda5783f38 100644 --- a/ver/us/asm/nonmatchings/effects/effect_13/func_E001A440.s +++ b/ver/us/asm/nonmatchings/effects/effect_13/func_E001A440.s @@ -44,7 +44,7 @@ glabel func_E001A440 /* 33030C E001A4DC 8CC50024 */ lw $a1, 0x24($a2) /* 330310 E001A4E0 8CC60028 */ lw $a2, 0x28($a2) /* 330314 E001A4E4 24630008 */ addiu $v1, $v1, 8 -/* 330318 E001A4E8 0C080180 */ jal func_E0200600 +/* 330318 E001A4E8 0C080180 */ jal shim_guPositionF /* 33031C E001A4EC AE830000 */ sw $v1, ($s4) /* 330320 E001A4F0 27A40020 */ addiu $a0, $sp, 0x20 /* 330324 E001A4F4 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -55,7 +55,7 @@ glabel func_E001A440 /* 330338 E001A508 8E220000 */ lw $v0, ($s1) /* 33033C E001A50C 00052980 */ sll $a1, $a1, 6 /* 330340 E001A510 00B22821 */ addu $a1, $a1, $s2 -/* 330344 E001A514 0C080118 */ jal func_E0200460 +/* 330344 E001A514 0C080118 */ jal shim_guMtxF2L /* 330348 E001A518 00452821 */ addu $a1, $v0, $a1 /* 33034C E001A51C 8E820000 */ lw $v0, ($s4) /* 330350 E001A520 241300FF */ addiu $s3, $zero, 0xff @@ -82,7 +82,7 @@ glabel func_E001A440 /* 3303A4 E001A574 27A400A0 */ addiu $a0, $sp, 0xa0 /* 3303A8 E001A578 0080282D */ daddu $a1, $a0, $zero /* 3303AC E001A57C 0080302D */ daddu $a2, $a0, $zero -/* 3303B0 E001A580 0C08019C */ jal func_E0200670 +/* 3303B0 E001A580 0C08019C */ jal shim_get_background_color_blend /* 3303B4 E001A584 27A700A1 */ addiu $a3, $sp, 0xa1 /* 3303B8 E001A588 93A200A1 */ lbu $v0, 0xa1($sp) /* 3303BC E001A58C 02629823 */ subu $s3, $s3, $v0 diff --git a/ver/us/asm/nonmatchings/effects/effect_13/fx_13_main.s b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_main.s index b242c8d88a..50885f5d97 100644 --- a/ver/us/asm/nonmatchings/effects/effect_13/fx_13_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_main.s @@ -28,12 +28,12 @@ glabel fx_13_main /* 32FE8C E001A05C AFB00028 */ sw $s0, 0x28($sp) /* 32FE90 E001A060 AFA00010 */ sw $zero, 0x10($sp) /* 32FE94 E001A064 AFA00024 */ sw $zero, 0x24($sp) -/* 32FE98 E001A068 0C080124 */ jal func_E0200490 +/* 32FE98 E001A068 0C080124 */ jal shim_create_effect_instance /* 32FE9C E001A06C AFA20014 */ sw $v0, 0x14($sp) /* 32FEA0 E001A070 24040048 */ addiu $a0, $zero, 0x48 /* 32FEA4 E001A074 24030001 */ addiu $v1, $zero, 1 /* 32FEA8 E001A078 0040802D */ daddu $s0, $v0, $zero -/* 32FEAC E001A07C 0C08012C */ jal func_E02004B0 +/* 32FEAC E001A07C 0C08012C */ jal shim_general_heap_malloc /* 32FEB0 E001A080 AE030008 */ sw $v1, 8($s0) /* 32FEB4 E001A084 AE02000C */ sw $v0, 0xc($s0) /* 32FEB8 E001A088 0040802D */ daddu $s0, $v0, $zero @@ -86,7 +86,7 @@ glabel fx_13_main /* 32FF64 E001A134 44811000 */ mtc1 $at, $f2 /* 32FF68 E001A138 24040001 */ addiu $a0, $zero, 1 /* 32FF6C E001A13C E600001C */ swc1 $f0, 0x1c($s0) -/* 32FF70 E001A140 0C080138 */ jal func_E02004E0 +/* 32FF70 E001A140 0C080138 */ jal shim_rand_int /* 32FF74 E001A144 E6020020 */ swc1 $f2, 0x20($s0) /* 32FF78 E001A148 24040168 */ addiu $a0, $zero, 0x168 /* 32FF7C E001A14C 00021900 */ sll $v1, $v0, 4 @@ -96,14 +96,14 @@ glabel fx_13_main /* 32FF8C E001A15C 44830000 */ mtc1 $v1, $f0 /* 32FF90 E001A160 00000000 */ nop /* 32FF94 E001A164 46800020 */ cvt.s.w $f0, $f0 -/* 32FF98 E001A168 0C080138 */ jal func_E02004E0 +/* 32FF98 E001A168 0C080138 */ jal shim_rand_int /* 32FF9C E001A16C E6000024 */ swc1 $f0, 0x24($s0) /* 32FFA0 E001A170 24040001 */ addiu $a0, $zero, 1 /* 32FFA4 E001A174 44820000 */ mtc1 $v0, $f0 /* 32FFA8 E001A178 00000000 */ nop /* 32FFAC E001A17C 46800020 */ cvt.s.w $f0, $f0 /* 32FFB0 E001A180 E6000028 */ swc1 $f0, 0x28($s0) -/* 32FFB4 E001A184 0C080138 */ jal func_E02004E0 +/* 32FFB4 E001A184 0C080138 */ jal shim_rand_int /* 32FFB8 E001A188 AE00002C */ sw $zero, 0x2c($s0) /* 32FFBC E001A18C 2404000A */ addiu $a0, $zero, 0xa /* 32FFC0 E001A190 000210C0 */ sll $v0, $v0, 3 @@ -113,13 +113,13 @@ glabel fx_13_main /* 32FFD0 E001A1A0 46800020 */ cvt.s.w $f0, $f0 /* 32FFD4 E001A1A4 E6000030 */ swc1 $f0, 0x30($s0) /* 32FFD8 E001A1A8 AE120034 */ sw $s2, 0x34($s0) -/* 32FFDC E001A1AC 0C080138 */ jal func_E02004E0 +/* 32FFDC E001A1AC 0C080138 */ jal shim_rand_int /* 32FFE0 E001A1B0 AE000038 */ sw $zero, 0x38($s0) /* 32FFE4 E001A1B4 24040014 */ addiu $a0, $zero, 0x14 -/* 32FFE8 E001A1B8 0C080138 */ jal func_E02004E0 +/* 32FFE8 E001A1B8 0C080138 */ jal shim_rand_int /* 32FFEC E001A1BC AE020044 */ sw $v0, 0x44($s0) /* 32FFF0 E001A1C0 24040001 */ addiu $a0, $zero, 1 -/* 32FFF4 E001A1C4 0C080138 */ jal func_E02004E0 +/* 32FFF4 E001A1C4 0C080138 */ jal shim_rand_int /* 32FFF8 E001A1C8 AE020040 */ sw $v0, 0x40($s0) /* 32FFFC E001A1CC 00021040 */ sll $v0, $v0, 1 /* 330000 E001A1D0 2442FFFF */ addiu $v0, $v0, -1 diff --git a/ver/us/asm/nonmatchings/effects/effect_130/func_E012013C.s b/ver/us/asm/nonmatchings/effects/effect_130/func_E012013C.s index db7efa1f98..e34cfa3b45 100644 --- a/ver/us/asm/nonmatchings/effects/effect_130/func_E012013C.s +++ b/ver/us/asm/nonmatchings/effects/effect_130/func_E012013C.s @@ -41,7 +41,7 @@ glabel func_E012013C /* 40B5B0 E01201C0 8CA20010 */ lw $v0, 0x10($a1) /* 40B5B4 E01201C4 04410005 */ bgez $v0, .LE01201DC /* 40B5B8 E01201C8 28420010 */ slti $v0, $v0, 0x10 -/* 40B5BC E01201CC 0C080128 */ jal func_E02004A0 +/* 40B5BC E01201CC 0C080128 */ jal shim_remove_effect /* 40B5C0 E01201D0 00000000 */ nop /* 40B5C4 E01201D4 080480DC */ j .LE0120370 /* 40B5C8 E01201D8 00000000 */ nop @@ -96,7 +96,7 @@ glabel func_E012013C .LE0120280: /* 40B670 E0120280 44926000 */ mtc1 $s2, $f12 /* 40B674 E0120284 00000000 */ nop -/* 40B678 E0120288 0C080140 */ jal func_E0200500 +/* 40B678 E0120288 0C080140 */ jal shim_sin_deg /* 40B67C E012028C 46806320 */ cvt.s.w $f12, $f12 /* 40B680 E0120290 44936000 */ mtc1 $s3, $f12 /* 40B684 E0120294 00000000 */ nop @@ -114,7 +114,7 @@ glabel func_E012013C /* 40B6B4 E01202C4 468010A1 */ cvt.d.w $f2, $f2 /* 40B6B8 E01202C8 46226300 */ add.d $f12, $f12, $f2 /* 40B6BC E01202CC 46000506 */ mov.s $f20, $f0 -/* 40B6C0 E01202D0 0C080140 */ jal func_E0200500 +/* 40B6C0 E01202D0 0C080140 */ jal shim_sin_deg /* 40B6C4 E01202D4 46206320 */ cvt.s.d $f12, $f12 /* 40B6C8 E01202D8 4600A521 */ cvt.d.s $f20, $f20 /* 40B6CC E01202DC 4638A502 */ mul.d $f20, $f20, $f24 diff --git a/ver/us/asm/nonmatchings/effects/effect_130/func_E012039C.s b/ver/us/asm/nonmatchings/effects/effect_130/func_E012039C.s index 00839927de..ec03803b1c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_130/func_E012039C.s +++ b/ver/us/asm/nonmatchings/effects/effect_130/func_E012039C.s @@ -12,7 +12,7 @@ glabel func_E012039C /* 40B7A8 E01203B8 AFA40018 */ sw $a0, 0x18($sp) /* 40B7AC E01203BC 27A40010 */ addiu $a0, $sp, 0x10 /* 40B7B0 E01203C0 AFBF0020 */ sw $ra, 0x20($sp) -/* 40B7B4 E01203C4 0C080120 */ jal func_E0200480 +/* 40B7B4 E01203C4 0C080120 */ jal shim_queue_render_task /* 40B7B8 E01203C8 AFA20010 */ sw $v0, 0x10($sp) /* 40B7BC E01203CC 8C430000 */ lw $v1, ($v0) /* 40B7C0 E01203D0 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_130/func_E01203E4.s b/ver/us/asm/nonmatchings/effects/effect_130/func_E01203E4.s index ca980b694a..0745e07209 100644 --- a/ver/us/asm/nonmatchings/effects/effect_130/func_E01203E4.s +++ b/ver/us/asm/nonmatchings/effects/effect_130/func_E01203E4.s @@ -55,7 +55,7 @@ glabel func_E01203E4 /* 40B894 E01204A4 E7A00010 */ swc1 $f0, 0x10($sp) /* 40B898 E01204A8 E7A20014 */ swc1 $f2, 0x14($sp) /* 40B89C E01204AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 40B8A0 E01204B0 0C080184 */ jal func_E0200610 +/* 40B8A0 E01204B0 0C080184 */ jal shim_guOrthoF /* 40B8A4 E01204B4 E7A6001C */ swc1 $f6, 0x1c($sp) /* 40B8A8 E01204B8 3C130001 */ lui $s3, 1 /* 40B8AC E01204BC 36731630 */ ori $s3, $s3, 0x1630 @@ -68,7 +68,7 @@ glabel func_E01203E4 /* 40B8C8 E01204D8 8E420000 */ lw $v0, ($s2) /* 40B8CC E01204DC 00052980 */ sll $a1, $a1, 6 /* 40B8D0 E01204E0 00B32821 */ addu $a1, $a1, $s3 -/* 40B8D4 E01204E4 0C080118 */ jal func_E0200460 +/* 40B8D4 E01204E4 0C080118 */ jal shim_guMtxF2L /* 40B8D8 E01204E8 00452821 */ addu $a1, $v0, $a1 /* 40B8DC E01204EC 3C09DA38 */ lui $t1, 0xda38 /* 40B8E0 E01204F0 35290007 */ ori $t1, $t1, 7 @@ -92,14 +92,14 @@ glabel func_E01203E4 /* 40B928 E0120538 00A0302D */ daddu $a2, $a1, $zero /* 40B92C E012053C 00A0382D */ daddu $a3, $a1, $zero /* 40B930 E0120540 00621821 */ addu $v1, $v1, $v0 -/* 40B934 E0120544 0C080108 */ jal func_E0200420 +/* 40B934 E0120544 0C080108 */ jal shim_guTranslateF /* 40B938 E0120548 AD030004 */ sw $v1, 4($t0) /* 40B93C E012054C 27A40020 */ addiu $a0, $sp, 0x20 /* 40B940 E0120550 96250000 */ lhu $a1, ($s1) /* 40B944 E0120554 8E420000 */ lw $v0, ($s2) /* 40B948 E0120558 00052980 */ sll $a1, $a1, 6 /* 40B94C E012055C 00B32821 */ addu $a1, $a1, $s3 -/* 40B950 E0120560 0C080118 */ jal func_E0200460 +/* 40B950 E0120560 0C080118 */ jal shim_guMtxF2L /* 40B954 E0120564 00452821 */ addu $a1, $v0, $a1 /* 40B958 E0120568 3C03DA38 */ lui $v1, 0xda38 /* 40B95C E012056C 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_130/fx_130_main.s b/ver/us/asm/nonmatchings/effects/effect_130/fx_130_main.s index c735d40842..5479645d17 100644 --- a/ver/us/asm/nonmatchings/effects/effect_130/fx_130_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_130/fx_130_main.s @@ -28,12 +28,12 @@ glabel fx_130_main /* 40B44C E012005C AFB00028 */ sw $s0, 0x28($sp) /* 40B450 E0120060 AFA00010 */ sw $zero, 0x10($sp) /* 40B454 E0120064 AFA00024 */ sw $zero, 0x24($sp) -/* 40B458 E0120068 0C080124 */ jal func_E0200490 +/* 40B458 E0120068 0C080124 */ jal shim_create_effect_instance /* 40B45C E012006C AFA20014 */ sw $v0, 0x14($sp) /* 40B460 E0120070 24040040 */ addiu $a0, $zero, 0x40 /* 40B464 E0120074 24030001 */ addiu $v1, $zero, 1 /* 40B468 E0120078 0040802D */ daddu $s0, $v0, $zero -/* 40B46C E012007C 0C08012C */ jal func_E02004B0 +/* 40B46C E012007C 0C08012C */ jal shim_general_heap_malloc /* 40B470 E0120080 AE030008 */ sw $v1, 8($s0) /* 40B474 E0120084 0040202D */ daddu $a0, $v0, $zero /* 40B478 E0120088 14800003 */ bnez $a0, .LE0120098 diff --git a/ver/us/asm/nonmatchings/effects/effect_131/func_E012217C.s b/ver/us/asm/nonmatchings/effects/effect_131/func_E012217C.s index bee2d7d37e..2506b1f725 100644 --- a/ver/us/asm/nonmatchings/effects/effect_131/func_E012217C.s +++ b/ver/us/asm/nonmatchings/effects/effect_131/func_E012217C.s @@ -29,7 +29,7 @@ glabel func_E012217C /* 40C774 E01221D4 24510001 */ addiu $s1, $v0, 1 /* 40C778 E01221D8 04610005 */ bgez $v1, .LE01221F0 /* 40C77C E01221DC AE110018 */ sw $s1, 0x18($s0) -/* 40C780 E01221E0 0C080128 */ jal func_E02004A0 +/* 40C780 E01221E0 0C080128 */ jal shim_remove_effect /* 40C784 E01221E4 00000000 */ nop /* 40C788 E01221E8 080489AB */ j .LE01226AC /* 40C78C E01221EC 00000000 */ nop @@ -73,7 +73,7 @@ glabel func_E012217C /* 40C814 E0122274 244200C8 */ addiu $v0, $v0, 0xc8 /* 40C818 E0122278 AE020050 */ sw $v0, 0x50($s0) /* 40C81C E012227C 24630001 */ addiu $v1, $v1, 1 -/* 40C820 E0122280 0C080140 */ jal func_E0200500 +/* 40C820 E0122280 0C080140 */ jal shim_sin_deg /* 40C824 E0122284 AE030074 */ sw $v1, 0x74($s0) /* 40C828 E0122288 3C01E012 */ lui $at, %hi(D_E0122CA0) /* 40C82C E012228C D4222CA0 */ ldc1 $f2, %lo(D_E0122CA0)($at) @@ -91,7 +91,7 @@ glabel func_E012217C /* 40C85C E01222BC E6000040 */ swc1 $f0, 0x40($s0) /* 40C860 E01222C0 44916000 */ mtc1 $s1, $f12 /* 40C864 E01222C4 00000000 */ nop -/* 40C868 E01222C8 0C080140 */ jal func_E0200500 +/* 40C868 E01222C8 0C080140 */ jal shim_sin_deg /* 40C86C E01222CC 46806320 */ cvt.s.w $f12, $f12 /* 40C870 E01222D0 3C01E012 */ lui $at, %hi(D_E0122CA8) /* 40C874 E01222D4 D4222CA8 */ ldc1 $f2, %lo(D_E0122CA8)($at) @@ -103,7 +103,7 @@ glabel func_E012217C /* 40C88C E01222EC C6020008 */ lwc1 $f2, 8($s0) /* 40C890 E01222F0 46001080 */ add.s $f2, $f2, $f0 /* 40C894 E01222F4 E6020008 */ swc1 $f2, 8($s0) -/* 40C898 E01222F8 0C080144 */ jal func_E0200510 +/* 40C898 E01222F8 0C080144 */ jal shim_cos_deg /* 40C89C E01222FC 46206320 */ cvt.s.d $f12, $f12 /* 40C8A0 E0122300 C602000C */ lwc1 $f2, 0xc($s0) /* 40C8A4 E0122304 8E020074 */ lw $v0, 0x74($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_131/func_E01226C4.s b/ver/us/asm/nonmatchings/effects/effect_131/func_E01226C4.s index d9674179bd..e3b685820a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_131/func_E01226C4.s +++ b/ver/us/asm/nonmatchings/effects/effect_131/func_E01226C4.s @@ -12,7 +12,7 @@ glabel func_E01226C4 /* 40CC80 E01226E0 AFA40018 */ sw $a0, 0x18($sp) /* 40CC84 E01226E4 27A40010 */ addiu $a0, $sp, 0x10 /* 40CC88 E01226E8 AFBF0020 */ sw $ra, 0x20($sp) -/* 40CC8C E01226EC 0C080120 */ jal func_E0200480 +/* 40CC8C E01226EC 0C080120 */ jal shim_queue_render_task /* 40CC90 E01226F0 AFA20010 */ sw $v0, 0x10($sp) /* 40CC94 E01226F4 8C430000 */ lw $v1, ($v0) /* 40CC98 E01226F8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_131/func_E012270C.s b/ver/us/asm/nonmatchings/effects/effect_131/func_E012270C.s index 4046f4f446..516eaca882 100644 --- a/ver/us/asm/nonmatchings/effects/effect_131/func_E012270C.s +++ b/ver/us/asm/nonmatchings/effects/effect_131/func_E012270C.s @@ -75,14 +75,14 @@ glabel func_E012270C /* 40CDC4 E0122824 E7A00018 */ swc1 $f0, 0x18($sp) /* 40CDC8 E0122828 C6200010 */ lwc1 $f0, 0x10($s1) /* 40CDCC E012282C 00A0382D */ daddu $a3, $a1, $zero -/* 40CDD0 E0122830 0C080180 */ jal func_E0200600 +/* 40CDD0 E0122830 0C080180 */ jal shim_guPositionF /* 40CDD4 E0122834 E7A0001C */ swc1 $f0, 0x1c($sp) /* 40CDD8 E0122838 27A40020 */ addiu $a0, $sp, 0x20 /* 40CDDC E012283C 96A50000 */ lhu $a1, ($s5) /* 40CDE0 E0122840 8FC20000 */ lw $v0, ($fp) /* 40CDE4 E0122844 00052980 */ sll $a1, $a1, 6 /* 40CDE8 E0122848 00B02821 */ addu $a1, $a1, $s0 -/* 40CDEC E012284C 0C080118 */ jal func_E0200460 +/* 40CDEC E012284C 0C080118 */ jal shim_guMtxF2L /* 40CDF0 E0122850 00452821 */ addu $a1, $v0, $a1 /* 40CDF4 E0122854 3C03DA38 */ lui $v1, 0xda38 /* 40CDF8 E0122858 34630002 */ ori $v1, $v1, 2 @@ -144,14 +144,14 @@ glabel func_E012270C /* 40CED0 E0122930 E7A00010 */ swc1 $f0, 0x10($sp) /* 40CED4 E0122934 E7B40014 */ swc1 $f20, 0x14($sp) /* 40CED8 E0122938 E7B40018 */ swc1 $f20, 0x18($sp) -/* 40CEDC E012293C 0C080180 */ jal func_E0200600 +/* 40CEDC E012293C 0C080180 */ jal shim_guPositionF /* 40CEE0 E0122940 E7B4001C */ swc1 $f20, 0x1c($sp) /* 40CEE4 E0122944 27A40020 */ addiu $a0, $sp, 0x20 /* 40CEE8 E0122948 96A50000 */ lhu $a1, ($s5) /* 40CEEC E012294C 8FC20000 */ lw $v0, ($fp) /* 40CEF0 E0122950 00052980 */ sll $a1, $a1, 6 /* 40CEF4 E0122954 00B62821 */ addu $a1, $a1, $s6 -/* 40CEF8 E0122958 0C080118 */ jal func_E0200460 +/* 40CEF8 E0122958 0C080118 */ jal shim_guMtxF2L /* 40CEFC E012295C 00452821 */ addu $a1, $v0, $a1 /* 40CF00 E0122960 3C08D838 */ lui $t0, 0xd838 /* 40CF04 E0122964 8E640000 */ lw $a0, ($s3) diff --git a/ver/us/asm/nonmatchings/effects/effect_131/fx_131_main.s b/ver/us/asm/nonmatchings/effects/effect_131/fx_131_main.s index ee04c2c5c8..f94efa706a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_131/fx_131_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_131/fx_131_main.s @@ -28,12 +28,12 @@ glabel fx_131_main /* 40C5FC E012205C AFB1002C */ sw $s1, 0x2c($sp) /* 40C600 E0122060 AFA00010 */ sw $zero, 0x10($sp) /* 40C604 E0122064 AFA00024 */ sw $zero, 0x24($sp) -/* 40C608 E0122068 0C080124 */ jal func_E0200490 +/* 40C608 E0122068 0C080124 */ jal shim_create_effect_instance /* 40C60C E012206C AFA20014 */ sw $v0, 0x14($sp) /* 40C610 E0122070 24040078 */ addiu $a0, $zero, 0x78 /* 40C614 E0122074 24030001 */ addiu $v1, $zero, 1 /* 40C618 E0122078 0040882D */ daddu $s1, $v0, $zero -/* 40C61C E012207C 0C08012C */ jal func_E02004B0 +/* 40C61C E012207C 0C08012C */ jal shim_general_heap_malloc /* 40C620 E0122080 AE230008 */ sw $v1, 8($s1) /* 40C624 E0122084 0040182D */ daddu $v1, $v0, $zero /* 40C628 E0122088 14600003 */ bnez $v1, .LE0122098 diff --git a/ver/us/asm/nonmatchings/effects/effect_132/func_E0124304.s b/ver/us/asm/nonmatchings/effects/effect_132/func_E0124304.s index d08651f55d..75c066c5db 100644 --- a/ver/us/asm/nonmatchings/effects/effect_132/func_E0124304.s +++ b/ver/us/asm/nonmatchings/effects/effect_132/func_E0124304.s @@ -102,7 +102,7 @@ glabel func_E0124304 /* 412BA0 E0124470 14400003 */ bnez $v0, .LE0124480 /* 412BA4 E0124474 00000000 */ nop .LE0124478: -/* 412BA8 E0124478 0C080128 */ jal func_E02004A0 +/* 412BA8 E0124478 0C080128 */ jal shim_remove_effect /* 412BAC E012447C 00000000 */ nop .LE0124480: /* 412BB0 E0124480 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_132/func_E012448C.s b/ver/us/asm/nonmatchings/effects/effect_132/func_E012448C.s index cadd4a1283..655ab7b479 100644 --- a/ver/us/asm/nonmatchings/effects/effect_132/func_E012448C.s +++ b/ver/us/asm/nonmatchings/effects/effect_132/func_E012448C.s @@ -11,7 +11,7 @@ glabel func_E012448C /* 412BD4 E01244A4 27A40010 */ addiu $a0, $sp, 0x10 /* 412BD8 E01244A8 AFBF0020 */ sw $ra, 0x20($sp) /* 412BDC E01244AC AFA00014 */ sw $zero, 0x14($sp) -/* 412BE0 E01244B0 0C080120 */ jal func_E0200480 +/* 412BE0 E01244B0 0C080120 */ jal shim_queue_render_task /* 412BE4 E01244B4 AFA20010 */ sw $v0, 0x10($sp) /* 412BE8 E01244B8 8FBF0020 */ lw $ra, 0x20($sp) /* 412BEC E01244BC 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_132/func_E01244C4.s b/ver/us/asm/nonmatchings/effects/effect_132/func_E01244C4.s index 70e9214160..8a45daca9c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_132/func_E01244C4.s +++ b/ver/us/asm/nonmatchings/effects/effect_132/func_E01244C4.s @@ -56,7 +56,7 @@ glabel func_E01244C4 /* 412CC0 E0124590 2442FFFF */ addiu $v0, $v0, -1 /* 412CC4 E0124594 00021840 */ sll $v1, $v0, 1 /* 412CC8 E0124598 00621821 */ addu $v1, $v1, $v0 -/* 412CCC E012459C 0C080108 */ jal func_E0200420 +/* 412CCC E012459C 0C080108 */ jal shim_guTranslateF /* 412CD0 E01245A0 AFA300D8 */ sw $v1, 0xd8($sp) /* 412CD4 E01245A4 27B20058 */ addiu $s2, $sp, 0x58 /* 412CD8 E01245A8 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -77,11 +77,11 @@ glabel func_E01244C4 /* 412D14 E01245E4 46000007 */ neg.s $f0, $f0 /* 412D18 E01245E8 44050000 */ mfc1 $a1, $f0 /* 412D1C E01245EC 0240202D */ daddu $a0, $s2, $zero -/* 412D20 E01245F0 0C080104 */ jal func_E0200410 +/* 412D20 E01245F0 0C080104 */ jal shim_guRotateF /* 412D24 E01245F4 AFA60010 */ sw $a2, 0x10($sp) /* 412D28 E01245F8 0240202D */ daddu $a0, $s2, $zero /* 412D2C E01245FC 0200282D */ daddu $a1, $s0, $zero -/* 412D30 E0124600 0C080114 */ jal func_E0200450 +/* 412D30 E0124600 0C080114 */ jal shim_guMtxCatF /* 412D34 E0124604 00A0302D */ daddu $a2, $a1, $zero /* 412D38 E0124608 3C013F33 */ lui $at, 0x3f33 /* 412D3C E012460C 34213333 */ ori $at, $at, 0x3333 @@ -112,7 +112,7 @@ glabel func_E01244C4 /* 412D9C E012466C 8E25FFE0 */ lw $a1, -0x20($s1) /* 412DA0 E0124670 8E26FFE4 */ lw $a2, -0x1c($s1) /* 412DA4 E0124674 8E27FFE8 */ lw $a3, -0x18($s1) -/* 412DA8 E0124678 0C080108 */ jal func_E0200420 +/* 412DA8 E0124678 0C080108 */ jal shim_guTranslateF /* 412DAC E012467C 02C0202D */ daddu $a0, $s6, $zero /* 412DB0 E0124680 02C0202D */ daddu $a0, $s6, $zero /* 412DB4 E0124684 27A50098 */ addiu $a1, $sp, 0x98 @@ -120,7 +120,7 @@ glabel func_E01244C4 /* 412DBC E012468C 27A60018 */ addiu $a2, $sp, 0x18 /* 412DC0 E0124690 E7A00080 */ swc1 $f0, 0x80($sp) /* 412DC4 E0124694 E7A0006C */ swc1 $f0, 0x6c($sp) -/* 412DC8 E0124698 0C080114 */ jal func_E0200450 +/* 412DC8 E0124698 0C080114 */ jal shim_guMtxCatF /* 412DCC E012469C E7A00058 */ swc1 $f0, 0x58($sp) /* 412DD0 E01246A0 27A40018 */ addiu $a0, $sp, 0x18 /* 412DD4 E01246A4 96E50000 */ lhu $a1, ($s7) @@ -128,7 +128,7 @@ glabel func_E01244C4 /* 412DDC E01246AC 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 412DE0 E01246B0 00052980 */ sll $a1, $a1, 6 /* 412DE4 E01246B4 00B52821 */ addu $a1, $a1, $s5 -/* 412DE8 E01246B8 0C080118 */ jal func_E0200460 +/* 412DE8 E01246B8 0C080118 */ jal shim_guMtxF2L /* 412DEC E01246BC 00452821 */ addu $a1, $v0, $a1 /* 412DF0 E01246C0 27C20024 */ addiu $v0, $fp, 0x24 /* 412DF4 E01246C4 0202102A */ slt $v0, $s0, $v0 diff --git a/ver/us/asm/nonmatchings/effects/effect_132/fx_132_main.s b/ver/us/asm/nonmatchings/effects/effect_132/fx_132_main.s index cdf88787bf..bf0aa8ff5e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_132/fx_132_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_132/fx_132_main.s @@ -34,12 +34,12 @@ glabel fx_132_main /* 4127A4 E0124074 F7BA0068 */ sdc1 $f26, 0x68($sp) /* 4127A8 E0124078 AFA00010 */ sw $zero, 0x10($sp) /* 4127AC E012407C AFA00024 */ sw $zero, 0x24($sp) -/* 4127B0 E0124080 0C080124 */ jal func_E0200490 +/* 4127B0 E0124080 0C080124 */ jal shim_create_effect_instance /* 4127B4 E0124084 AFA20014 */ sw $v0, 0x14($sp) /* 4127B8 E0124088 2404115C */ addiu $a0, $zero, 0x115c /* 4127BC E012408C 24170065 */ addiu $s7, $zero, 0x65 /* 4127C0 E0124090 0040F02D */ daddu $fp, $v0, $zero -/* 4127C4 E0124094 0C08012C */ jal func_E02004B0 +/* 4127C4 E0124094 0C08012C */ jal shim_general_heap_malloc /* 4127C8 E0124098 AFD70008 */ sw $s7, 8($fp) /* 4127CC E012409C 0040882D */ daddu $s1, $v0, $zero /* 4127D0 E01240A0 16200003 */ bnez $s1, .LE01240B0 @@ -83,7 +83,7 @@ glabel fx_132_main /* 412858 E0124128 2402002E */ addiu $v0, $zero, 0x2e /* 41285C E012412C 50620049 */ beql $v1, $v0, .LE0124254 /* 412860 E0124130 26730001 */ addiu $s3, $s3, 1 -/* 412864 E0124134 0C080138 */ jal func_E02004E0 +/* 412864 E0124134 0C080138 */ jal shim_rand_int /* 412868 E0124138 24040014 */ addiu $a0, $zero, 0x14 /* 41286C E012413C 2442FFF6 */ addiu $v0, $v0, -0xa /* 412870 E0124140 44820000 */ mtc1 $v0, $f0 @@ -96,12 +96,12 @@ glabel fx_132_main /* 41288C E012415C 4680A521 */ cvt.d.w $f20, $f20 /* 412890 E0124160 4620A500 */ add.d $f20, $f20, $f0 /* 412894 E0124164 4600D306 */ mov.s $f12, $f26 -/* 412898 E0124168 0C080144 */ jal func_E0200510 +/* 412898 E0124168 0C080144 */ jal shim_cos_deg /* 41289C E012416C 4620A520 */ cvt.s.d $f20, $f20 /* 4128A0 E0124170 4600A002 */ mul.s $f0, $f20, $f0 /* 4128A4 E0124174 00000000 */ nop /* 4128A8 E0124178 24040014 */ addiu $a0, $zero, 0x14 -/* 4128AC E012417C 0C080138 */ jal func_E02004E0 +/* 4128AC E012417C 0C080138 */ jal shim_rand_int /* 4128B0 E0124180 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 4128B4 E0124184 2442FFF6 */ addiu $v0, $v0, -0xa /* 4128B8 E0124188 44821000 */ mtc1 $v0, $f2 @@ -116,7 +116,7 @@ glabel fx_132_main /* 4128DC E01241AC 46220000 */ add.d $f0, $f0, $f2 /* 4128E0 E01241B0 4600D306 */ mov.s $f12, $f26 /* 4128E4 E01241B4 46200020 */ cvt.s.d $f0, $f0 -/* 4128E8 E01241B8 0C080140 */ jal func_E0200500 +/* 4128E8 E01241B8 0C080140 */ jal shim_sin_deg /* 4128EC E01241BC E600FFE8 */ swc1 $f0, -0x18($s0) /* 4128F0 E01241C0 C602FFE4 */ lwc1 $f2, -0x1c($s0) /* 4128F4 E01241C4 460010A1 */ cvt.d.s $f2, $f2 @@ -133,7 +133,7 @@ glabel fx_132_main /* 412920 E01241F0 462010A0 */ cvt.s.d $f2, $f2 /* 412924 E01241F4 46200020 */ cvt.s.d $f0, $f0 /* 412928 E01241F8 E602FFF0 */ swc1 $f2, -0x10($s0) -/* 41292C E01241FC 0C080138 */ jal func_E02004E0 +/* 41292C E01241FC 0C080138 */ jal shim_rand_int /* 412930 E0124200 E600FFF4 */ swc1 $f0, -0xc($s0) /* 412934 E0124204 3C01E012 */ lui $at, %hi(D_E0124C10) /* 412938 E0124208 D4224C10 */ ldc1 $f2, %lo(D_E0124C10)($at) @@ -146,7 +146,7 @@ glabel fx_132_main /* 412954 E0124224 2631002C */ addiu $s1, $s1, 0x2c /* 412958 E0124228 24040007 */ addiu $a0, $zero, 7 /* 41295C E012422C 46200020 */ cvt.s.d $f0, $f0 -/* 412960 E0124230 0C080138 */ jal func_E02004E0 +/* 412960 E0124230 0C080138 */ jal shim_rand_int /* 412964 E0124234 E600FFF8 */ swc1 $f0, -8($s0) /* 412968 E0124238 2442001E */ addiu $v0, $v0, 0x1e /* 41296C E012423C AE02FFFC */ sw $v0, -4($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_133/func_E0126134.s b/ver/us/asm/nonmatchings/effects/effect_133/func_E0126134.s index baaf36e26e..aa7af39640 100644 --- a/ver/us/asm/nonmatchings/effects/effect_133/func_E0126134.s +++ b/ver/us/asm/nonmatchings/effects/effect_133/func_E0126134.s @@ -32,7 +32,7 @@ glabel func_E0126134 /* 4134F8 E0126198 24420001 */ addiu $v0, $v0, 1 /* 4134FC E012619C 04A10005 */ bgez $a1, .LE01261B4 /* 413500 E01261A0 AE020014 */ sw $v0, 0x14($s0) -/* 413504 E01261A4 0C080128 */ jal func_E02004A0 +/* 413504 E01261A4 0C080128 */ jal shim_remove_effect /* 413508 E01261A8 00000000 */ nop /* 41350C E01261AC 08049920 */ j .LE0126480 /* 413510 E01261B0 00000000 */ nop @@ -110,7 +110,7 @@ glabel func_E0126134 /* 413618 E01262B8 46202120 */ cvt.s.d $f4, $f4 /* 41361C E01262BC 46200020 */ cvt.s.d $f0, $f0 /* 413620 E01262C0 E6040040 */ swc1 $f4, 0x40($s0) -/* 413624 E01262C4 0C080140 */ jal func_E0200500 +/* 413624 E01262C4 0C080140 */ jal shim_sin_deg /* 413628 E01262C8 E6000044 */ swc1 $f0, 0x44($s0) /* 41362C E01262CC 3C01E012 */ lui $at, %hi(D_E0126BE8) /* 413630 E01262D0 D42C6BE8 */ ldc1 $f12, %lo(D_E0126BE8)($at) @@ -127,7 +127,7 @@ glabel func_E0126134 /* 41365C E01262FC 46020000 */ add.s $f0, $f0, $f2 /* 413660 E0126300 4600020D */ trunc.w.s $f8, $f0 /* 413664 E0126304 E6080034 */ swc1 $f8, 0x34($s0) -/* 413668 E0126308 0C080140 */ jal func_E0200500 +/* 413668 E0126308 0C080140 */ jal shim_sin_deg /* 41366C E012630C 46206320 */ cvt.s.d $f12, $f12 /* 413670 E0126310 3C01E012 */ lui $at, %hi(D_E0126BF0) /* 413674 E0126314 D42C6BF0 */ ldc1 $f12, %lo(D_E0126BF0)($at) @@ -141,7 +141,7 @@ glabel func_E0126134 /* 413694 E0126334 46160000 */ add.s $f0, $f0, $f22 /* 413698 E0126338 4600020D */ trunc.w.s $f8, $f0 /* 41369C E012633C E6080018 */ swc1 $f8, 0x18($s0) -/* 4136A0 E0126340 0C080140 */ jal func_E0200500 +/* 4136A0 E0126340 0C080140 */ jal shim_sin_deg /* 4136A4 E0126344 46206320 */ cvt.s.d $f12, $f12 /* 4136A8 E0126348 3C01E012 */ lui $at, %hi(D_E0126BF8) /* 4136AC E012634C D42C6BF8 */ ldc1 $f12, %lo(D_E0126BF8)($at) @@ -152,7 +152,7 @@ glabel func_E0126134 /* 4136C0 E0126360 46160000 */ add.s $f0, $f0, $f22 /* 4136C4 E0126364 4600020D */ trunc.w.s $f8, $f0 /* 4136C8 E0126368 E608001C */ swc1 $f8, 0x1c($s0) -/* 4136CC E012636C 0C080140 */ jal func_E0200500 +/* 4136CC E012636C 0C080140 */ jal shim_sin_deg /* 4136D0 E0126370 46206320 */ cvt.s.d $f12, $f12 /* 4136D4 E0126374 3C01E012 */ lui $at, %hi(D_E0126C00) /* 4136D8 E0126378 D42C6C00 */ ldc1 $f12, %lo(D_E0126C00)($at) @@ -163,7 +163,7 @@ glabel func_E0126134 /* 4136EC E012638C 46160000 */ add.s $f0, $f0, $f22 /* 4136F0 E0126390 4600020D */ trunc.w.s $f8, $f0 /* 4136F4 E0126394 E6080020 */ swc1 $f8, 0x20($s0) -/* 4136F8 E0126398 0C080140 */ jal func_E0200500 +/* 4136F8 E0126398 0C080140 */ jal shim_sin_deg /* 4136FC E012639C 46206320 */ cvt.s.d $f12, $f12 /* 413700 E01263A0 3C01E012 */ lui $at, %hi(D_E0126C08) /* 413704 E01263A4 D42C6C08 */ ldc1 $f12, %lo(D_E0126C08)($at) @@ -177,7 +177,7 @@ glabel func_E0126134 /* 413724 E01263C4 46160000 */ add.s $f0, $f0, $f22 /* 413728 E01263C8 4600020D */ trunc.w.s $f8, $f0 /* 41372C E01263CC E6080028 */ swc1 $f8, 0x28($s0) -/* 413730 E01263D0 0C080140 */ jal func_E0200500 +/* 413730 E01263D0 0C080140 */ jal shim_sin_deg /* 413734 E01263D4 46206320 */ cvt.s.d $f12, $f12 /* 413738 E01263D8 3C01E012 */ lui $at, %hi(D_E0126C10) /* 41373C E01263DC D42C6C10 */ ldc1 $f12, %lo(D_E0126C10)($at) @@ -188,7 +188,7 @@ glabel func_E0126134 /* 413750 E01263F0 46160000 */ add.s $f0, $f0, $f22 /* 413754 E01263F4 4600020D */ trunc.w.s $f8, $f0 /* 413758 E01263F8 E608002C */ swc1 $f8, 0x2c($s0) -/* 41375C E01263FC 0C080140 */ jal func_E0200500 +/* 41375C E01263FC 0C080140 */ jal shim_sin_deg /* 413760 E0126400 46206320 */ cvt.s.d $f12, $f12 /* 413764 E0126404 3C01E012 */ lui $at, %hi(D_E0126C18) /* 413768 E0126408 D4226C18 */ ldc1 $f2, %lo(D_E0126C18)($at) @@ -199,7 +199,7 @@ glabel func_E0126134 /* 41377C E012641C 46160000 */ add.s $f0, $f0, $f22 /* 413780 E0126420 4600020D */ trunc.w.s $f8, $f0 /* 413784 E0126424 E6080030 */ swc1 $f8, 0x30($s0) -/* 413788 E0126428 0C080140 */ jal func_E0200500 +/* 413788 E0126428 0C080140 */ jal shim_sin_deg /* 41378C E012642C 4620A320 */ cvt.s.d $f12, $f20 /* 413790 E0126430 3C01E012 */ lui $at, %hi(D_E0126C20) /* 413794 E0126434 D4226C20 */ ldc1 $f2, %lo(D_E0126C20)($at) diff --git a/ver/us/asm/nonmatchings/effects/effect_133/func_E01264A4.s b/ver/us/asm/nonmatchings/effects/effect_133/func_E01264A4.s index af8447ee3b..64ed663049 100644 --- a/ver/us/asm/nonmatchings/effects/effect_133/func_E01264A4.s +++ b/ver/us/asm/nonmatchings/effects/effect_133/func_E01264A4.s @@ -12,7 +12,7 @@ glabel func_E01264A4 /* 413820 E01264C0 AFA40018 */ sw $a0, 0x18($sp) /* 413824 E01264C4 27A40010 */ addiu $a0, $sp, 0x10 /* 413828 E01264C8 AFBF0020 */ sw $ra, 0x20($sp) -/* 41382C E01264CC 0C080120 */ jal func_E0200480 +/* 41382C E01264CC 0C080120 */ jal shim_queue_render_task /* 413830 E01264D0 AFA20010 */ sw $v0, 0x10($sp) /* 413834 E01264D4 8C430000 */ lw $v1, ($v0) /* 413838 E01264D8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_133/func_E01264EC.s b/ver/us/asm/nonmatchings/effects/effect_133/func_E01264EC.s index a9c012aebf..0e8c034a77 100644 --- a/ver/us/asm/nonmatchings/effects/effect_133/func_E01264EC.s +++ b/ver/us/asm/nonmatchings/effects/effect_133/func_E01264EC.s @@ -155,7 +155,7 @@ glabel func_E01264EC /* 413A64 E0126704 E7A00018 */ swc1 $f0, 0x18($sp) /* 413A68 E0126708 C660000C */ lwc1 $f0, 0xc($s3) /* 413A6C E012670C 3C120001 */ lui $s2, 1 -/* 413A70 E0126710 0C080180 */ jal func_E0200600 +/* 413A70 E0126710 0C080180 */ jal shim_guPositionF /* 413A74 E0126714 E7A0001C */ swc1 $f0, 0x1c($sp) /* 413A78 E0126718 36521630 */ ori $s2, $s2, 0x1630 /* 413A7C E012671C 3C013F80 */ lui $at, 0x3f80 @@ -168,11 +168,11 @@ glabel func_E01264EC /* 413A98 E0126738 8E650048 */ lw $a1, 0x48($s3) /* 413A9C E012673C 8E66004C */ lw $a2, 0x4c($s3) /* 413AA0 E0126740 8E670050 */ lw $a3, 0x50($s3) -/* 413AA4 E0126744 0C080180 */ jal func_E0200600 +/* 413AA4 E0126744 0C080180 */ jal shim_guPositionF /* 413AA8 E0126748 0200202D */ daddu $a0, $s0, $zero /* 413AAC E012674C 0200202D */ daddu $a0, $s0, $zero /* 413AB0 E0126750 27A50020 */ addiu $a1, $sp, 0x20 -/* 413AB4 E0126754 0C080114 */ jal func_E0200450 +/* 413AB4 E0126754 0C080114 */ jal shim_guMtxCatF /* 413AB8 E0126758 00A0302D */ daddu $a2, $a1, $zero /* 413ABC E012675C 27A40020 */ addiu $a0, $sp, 0x20 /* 413AC0 E0126760 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -183,7 +183,7 @@ glabel func_E01264EC /* 413AD4 E0126774 8E220000 */ lw $v0, ($s1) /* 413AD8 E0126778 00052980 */ sll $a1, $a1, 6 /* 413ADC E012677C 00B22821 */ addu $a1, $a1, $s2 -/* 413AE0 E0126780 0C080118 */ jal func_E0200460 +/* 413AE0 E0126780 0C080118 */ jal shim_guMtxF2L /* 413AE4 E0126784 00452821 */ addu $a1, $v0, $a1 /* 413AE8 E0126788 3C02DA38 */ lui $v0, 0xda38 /* 413AEC E012678C 34420002 */ ori $v0, $v0, 2 @@ -300,7 +300,7 @@ glabel func_E01264EC /* 413C9C E012693C E7A00018 */ swc1 $f0, 0x18($sp) /* 413CA0 E0126940 C660000C */ lwc1 $f0, 0xc($s3) /* 413CA4 E0126944 3C120001 */ lui $s2, 1 -/* 413CA8 E0126948 0C080180 */ jal func_E0200600 +/* 413CA8 E0126948 0C080180 */ jal shim_guPositionF /* 413CAC E012694C E7A0001C */ swc1 $f0, 0x1c($sp) /* 413CB0 E0126950 36521630 */ ori $s2, $s2, 0x1630 /* 413CB4 E0126954 3C013F80 */ lui $at, 0x3f80 @@ -313,11 +313,11 @@ glabel func_E01264EC /* 413CD0 E0126970 8E65003C */ lw $a1, 0x3c($s3) /* 413CD4 E0126974 8E660040 */ lw $a2, 0x40($s3) /* 413CD8 E0126978 8E670044 */ lw $a3, 0x44($s3) -/* 413CDC E012697C 0C080180 */ jal func_E0200600 +/* 413CDC E012697C 0C080180 */ jal shim_guPositionF /* 413CE0 E0126980 0200202D */ daddu $a0, $s0, $zero /* 413CE4 E0126984 0200202D */ daddu $a0, $s0, $zero /* 413CE8 E0126988 27A50020 */ addiu $a1, $sp, 0x20 -/* 413CEC E012698C 0C080114 */ jal func_E0200450 +/* 413CEC E012698C 0C080114 */ jal shim_guMtxCatF /* 413CF0 E0126990 00A0302D */ daddu $a2, $a1, $zero /* 413CF4 E0126994 27A40020 */ addiu $a0, $sp, 0x20 /* 413CF8 E0126998 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -328,7 +328,7 @@ glabel func_E01264EC /* 413D0C E01269AC 8E220000 */ lw $v0, ($s1) /* 413D10 E01269B0 00052980 */ sll $a1, $a1, 6 /* 413D14 E01269B4 00B22821 */ addu $a1, $a1, $s2 -/* 413D18 E01269B8 0C080118 */ jal func_E0200460 +/* 413D18 E01269B8 0C080118 */ jal shim_guMtxF2L /* 413D1C E01269BC 00452821 */ addu $a1, $v0, $a1 /* 413D20 E01269C0 3C03DA38 */ lui $v1, 0xda38 /* 413D24 E01269C4 3C06800A */ lui $a2, %hi(gMasterGfxPos) diff --git a/ver/us/asm/nonmatchings/effects/effect_133/fx_133_main.s b/ver/us/asm/nonmatchings/effects/effect_133/fx_133_main.s index f502fb84dc..9714cedbca 100644 --- a/ver/us/asm/nonmatchings/effects/effect_133/fx_133_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_133/fx_133_main.s @@ -28,12 +28,12 @@ glabel fx_133_main /* 4133BC E012605C AFB00028 */ sw $s0, 0x28($sp) /* 4133C0 E0126060 AFA00010 */ sw $zero, 0x10($sp) /* 4133C4 E0126064 AFA00024 */ sw $zero, 0x24($sp) -/* 4133C8 E0126068 0C080124 */ jal func_E0200490 +/* 4133C8 E0126068 0C080124 */ jal shim_create_effect_instance /* 4133CC E012606C AFA20014 */ sw $v0, 0x14($sp) /* 4133D0 E0126070 24040058 */ addiu $a0, $zero, 0x58 /* 4133D4 E0126074 24030001 */ addiu $v1, $zero, 1 /* 4133D8 E0126078 0040802D */ daddu $s0, $v0, $zero -/* 4133DC E012607C 0C08012C */ jal func_E02004B0 +/* 4133DC E012607C 0C08012C */ jal shim_general_heap_malloc /* 4133E0 E0126080 AE030008 */ sw $v1, 8($s0) /* 4133E4 E0126084 0040282D */ daddu $a1, $v0, $zero /* 4133E8 E0126088 14A00003 */ bnez $a1, .LE0126098 diff --git a/ver/us/asm/nonmatchings/effects/effect_134/func_E0128130.s b/ver/us/asm/nonmatchings/effects/effect_134/func_E0128130.s index ad1107da73..a48607f2f7 100644 --- a/ver/us/asm/nonmatchings/effects/effect_134/func_E0128130.s +++ b/ver/us/asm/nonmatchings/effects/effect_134/func_E0128130.s @@ -25,7 +25,7 @@ glabel func_E0128130 /* 414D18 E0128178 24420001 */ addiu $v0, $v0, 1 /* 414D1C E012817C 04610003 */ bgez $v1, .LE012818C /* 414D20 E0128180 ACA20014 */ sw $v0, 0x14($a1) -/* 414D24 E0128184 0C080128 */ jal func_E02004A0 +/* 414D24 E0128184 0C080128 */ jal shim_remove_effect /* 414D28 E0128188 00000000 */ nop .LE012818C: /* 414D2C E012818C 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_134/func_E0128198.s b/ver/us/asm/nonmatchings/effects/effect_134/func_E0128198.s index f81e139f8a..0b1108967b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_134/func_E0128198.s +++ b/ver/us/asm/nonmatchings/effects/effect_134/func_E0128198.s @@ -12,7 +12,7 @@ glabel func_E0128198 /* 414D54 E01281B4 AFA40018 */ sw $a0, 0x18($sp) /* 414D58 E01281B8 27A40010 */ addiu $a0, $sp, 0x10 /* 414D5C E01281BC AFBF0020 */ sw $ra, 0x20($sp) -/* 414D60 E01281C0 0C080120 */ jal func_E0200480 +/* 414D60 E01281C0 0C080120 */ jal shim_queue_render_task /* 414D64 E01281C4 AFA20010 */ sw $v0, 0x10($sp) /* 414D68 E01281C8 8C430000 */ lw $v1, ($v0) /* 414D6C E01281CC 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_134/func_E01281E0.s b/ver/us/asm/nonmatchings/effects/effect_134/func_E01281E0.s index fcd9ff0c84..ccdc1f4659 100644 --- a/ver/us/asm/nonmatchings/effects/effect_134/func_E01281E0.s +++ b/ver/us/asm/nonmatchings/effects/effect_134/func_E01281E0.s @@ -52,17 +52,17 @@ glabel func_E01281E0 /* 414E3C E012829C 001010C0 */ sll $v0, $s0, 3 /* 414E40 E01282A0 02028021 */ addu $s0, $s0, $v0 /* 414E44 E01282A4 001080C0 */ sll $s0, $s0, 3 -/* 414E48 E01282A8 0C080108 */ jal func_E0200420 +/* 414E48 E01282A8 0C080108 */ jal shim_guTranslateF /* 414E4C E01282AC 02038021 */ addu $s0, $s0, $v1 /* 414E50 E01282B0 27B10050 */ addiu $s1, $sp, 0x50 /* 414E54 E01282B4 8E450034 */ lw $a1, 0x34($s2) /* 414E58 E01282B8 0220202D */ daddu $a0, $s1, $zero /* 414E5C E01282BC 00A0302D */ daddu $a2, $a1, $zero -/* 414E60 E01282C0 0C080110 */ jal func_E0200440 +/* 414E60 E01282C0 0C080110 */ jal shim_guScaleF /* 414E64 E01282C4 00A0382D */ daddu $a3, $a1, $zero /* 414E68 E01282C8 0220202D */ daddu $a0, $s1, $zero /* 414E6C E01282CC 27A50010 */ addiu $a1, $sp, 0x10 -/* 414E70 E01282D0 0C080114 */ jal func_E0200450 +/* 414E70 E01282D0 0C080114 */ jal shim_guMtxCatF /* 414E74 E01282D4 00A0302D */ daddu $a2, $a1, $zero /* 414E78 E01282D8 27A40010 */ addiu $a0, $sp, 0x10 /* 414E7C E01282DC 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -73,7 +73,7 @@ glabel func_E01281E0 /* 414E90 E01282F0 8EA20000 */ lw $v0, ($s5) /* 414E94 E01282F4 00052980 */ sll $a1, $a1, 6 /* 414E98 E01282F8 00B72821 */ addu $a1, $a1, $s7 -/* 414E9C E01282FC 0C080118 */ jal func_E0200460 +/* 414E9C E01282FC 0C080118 */ jal shim_guMtxF2L /* 414EA0 E0128300 00452821 */ addu $a1, $v0, $a1 /* 414EA4 E0128304 3C03DA38 */ lui $v1, 0xda38 /* 414EA8 E0128308 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_134/fx_134_main.s b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_main.s index 9ace7d26eb..75496942d5 100644 --- a/ver/us/asm/nonmatchings/effects/effect_134/fx_134_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_main.s @@ -28,12 +28,12 @@ glabel fx_134_main /* 414BFC E012805C AFB00028 */ sw $s0, 0x28($sp) /* 414C00 E0128060 AFA00010 */ sw $zero, 0x10($sp) /* 414C04 E0128064 AFA00024 */ sw $zero, 0x24($sp) -/* 414C08 E0128068 0C080124 */ jal func_E0200490 +/* 414C08 E0128068 0C080124 */ jal shim_create_effect_instance /* 414C0C E012806C AFA20014 */ sw $v0, 0x14($sp) /* 414C10 E0128070 24040038 */ addiu $a0, $zero, 0x38 /* 414C14 E0128074 24030001 */ addiu $v1, $zero, 1 /* 414C18 E0128078 0040802D */ daddu $s0, $v0, $zero -/* 414C1C E012807C 0C08012C */ jal func_E02004B0 +/* 414C1C E012807C 0C08012C */ jal shim_general_heap_malloc /* 414C20 E0128080 AE030008 */ sw $v1, 8($s0) /* 414C24 E0128084 0040202D */ daddu $a0, $v0, $zero /* 414C28 E0128088 14800003 */ bnez $a0, .LE0128098 diff --git a/ver/us/asm/nonmatchings/effects/effect_14/func_E001C128.s b/ver/us/asm/nonmatchings/effects/effect_14/func_E001C128.s index 5e63ac9f67..9033bd0d4d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_14/func_E001C128.s +++ b/ver/us/asm/nonmatchings/effects/effect_14/func_E001C128.s @@ -9,7 +9,7 @@ glabel func_E001C128 /* 330A48 E001C138 2442FFFF */ addiu $v0, $v0, -1 /* 330A4C E001C13C 04410005 */ bgez $v0, .LE001C154 /* 330A50 E001C140 AC620028 */ sw $v0, 0x28($v1) -/* 330A54 E001C144 0C080128 */ jal func_E02004A0 +/* 330A54 E001C144 0C080128 */ jal shim_remove_effect /* 330A58 E001C148 00000000 */ nop /* 330A5C E001C14C 0800707D */ j .LE001C1F4 /* 330A60 E001C150 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_14/func_E001C200.s b/ver/us/asm/nonmatchings/effects/effect_14/func_E001C200.s index 9931e5ee3e..86f21639a5 100644 --- a/ver/us/asm/nonmatchings/effects/effect_14/func_E001C200.s +++ b/ver/us/asm/nonmatchings/effects/effect_14/func_E001C200.s @@ -67,7 +67,7 @@ glabel func_E001C200 /* 330BF0 E001C2E0 2402002D */ addiu $v0, $zero, 0x2d /* 330BF4 E001C2E4 AC850008 */ sw $a1, 8($a0) /* 330BF8 E001C2E8 AC800004 */ sw $zero, 4($a0) -/* 330BFC E001C2EC 0C080120 */ jal func_E0200480 +/* 330BFC E001C2EC 0C080120 */ jal shim_queue_render_task /* 330C00 E001C2F0 AC820000 */ sw $v0, ($a0) /* 330C04 E001C2F4 8C430000 */ lw $v1, ($v0) /* 330C08 E001C2F8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_14/func_E001C30C.s b/ver/us/asm/nonmatchings/effects/effect_14/func_E001C30C.s index c2920cdbbb..c573addcc1 100644 --- a/ver/us/asm/nonmatchings/effects/effect_14/func_E001C30C.s +++ b/ver/us/asm/nonmatchings/effects/effect_14/func_E001C30C.s @@ -48,7 +48,7 @@ glabel func_E001C30C /* 330CC8 E001C3B8 8EC60004 */ lw $a2, 4($s6) /* 330CCC E001C3BC 8EC70008 */ lw $a3, 8($s6) /* 330CD0 E001C3C0 24630010 */ addiu $v1, $v1, 0x10 -/* 330CD4 E001C3C4 0C080108 */ jal func_E0200420 +/* 330CD4 E001C3C4 0C080108 */ jal shim_guTranslateF /* 330CD8 E001C3C8 AE230000 */ sw $v1, ($s1) /* 330CDC E001C3CC 27B000D8 */ addiu $s0, $sp, 0xd8 /* 330CE0 E001C3D0 4480A000 */ mtc1 $zero, $f20 @@ -71,12 +71,12 @@ glabel func_E001C30C /* 330D24 E001C414 46000007 */ neg.s $f0, $f0 /* 330D28 E001C418 44050000 */ mfc1 $a1, $f0 /* 330D2C E001C41C 0200202D */ daddu $a0, $s0, $zero -/* 330D30 E001C420 0C080104 */ jal func_E0200410 +/* 330D30 E001C420 0C080104 */ jal shim_guRotateF /* 330D34 E001C424 E7B40010 */ swc1 $f20, 0x10($sp) /* 330D38 E001C428 0200202D */ daddu $a0, $s0, $zero /* 330D3C E001C42C 27A50018 */ addiu $a1, $sp, 0x18 /* 330D40 E001C430 27B40118 */ addiu $s4, $sp, 0x118 -/* 330D44 E001C434 0C080114 */ jal func_E0200450 +/* 330D44 E001C434 0C080114 */ jal shim_guMtxCatF /* 330D48 E001C438 0280302D */ daddu $a2, $s4, $zero /* 330D4C E001C43C 0280202D */ daddu $a0, $s4, $zero /* 330D50 E001C440 3C128007 */ lui $s2, %hi(gMatrixListPos) @@ -87,7 +87,7 @@ glabel func_E001C30C /* 330D64 E001C454 8EA20000 */ lw $v0, ($s5) /* 330D68 E001C458 00052980 */ sll $a1, $a1, 6 /* 330D6C E001C45C 00B72821 */ addu $a1, $a1, $s7 -/* 330D70 E001C460 0C080118 */ jal func_E0200460 +/* 330D70 E001C460 0C080118 */ jal shim_guMtxF2L /* 330D74 E001C464 00452821 */ addu $a1, $v0, $a1 /* 330D78 E001C468 3C1EDA38 */ lui $fp, 0xda38 /* 330D7C E001C46C 27B30058 */ addiu $s3, $sp, 0x58 @@ -115,25 +115,25 @@ glabel func_E001C30C /* 330DD4 E001C4C4 AE280000 */ sw $t0, ($s1) /* 330DD8 E001C4C8 25080008 */ addiu $t0, $t0, 8 /* 330DDC E001C4CC A6490000 */ sh $t1, ($s2) -/* 330DE0 E001C4D0 0C080104 */ jal func_E0200410 +/* 330DE0 E001C4D0 0C080104 */ jal shim_guRotateF /* 330DE4 E001C4D4 AE280000 */ sw $t0, ($s1) /* 330DE8 E001C4D8 27B00098 */ addiu $s0, $sp, 0x98 /* 330DEC E001C4DC E7B40010 */ swc1 $f20, 0x10($sp) /* 330DF0 E001C4E0 8EC5001C */ lw $a1, 0x1c($s6) /* 330DF4 E001C4E4 4406A000 */ mfc1 $a2, $f20 /* 330DF8 E001C4E8 4407B000 */ mfc1 $a3, $f22 -/* 330DFC E001C4EC 0C080104 */ jal func_E0200410 +/* 330DFC E001C4EC 0C080104 */ jal shim_guRotateF /* 330E00 E001C4F0 0200202D */ daddu $a0, $s0, $zero /* 330E04 E001C4F4 0260202D */ daddu $a0, $s3, $zero /* 330E08 E001C4F8 0200282D */ daddu $a1, $s0, $zero -/* 330E0C E001C4FC 0C080114 */ jal func_E0200450 +/* 330E0C E001C4FC 0C080114 */ jal shim_guMtxCatF /* 330E10 E001C500 0280302D */ daddu $a2, $s4, $zero /* 330E14 E001C504 0280202D */ daddu $a0, $s4, $zero /* 330E18 E001C508 96450000 */ lhu $a1, ($s2) /* 330E1C E001C50C 8EA20000 */ lw $v0, ($s5) /* 330E20 E001C510 00052980 */ sll $a1, $a1, 6 /* 330E24 E001C514 00B72821 */ addu $a1, $a1, $s7 -/* 330E28 E001C518 0C080118 */ jal func_E0200460 +/* 330E28 E001C518 0C080118 */ jal shim_guMtxF2L /* 330E2C E001C51C 00452821 */ addu $a1, $v0, $a1 /* 330E30 E001C520 3C06D838 */ lui $a2, 0xd838 /* 330E34 E001C524 34C60002 */ ori $a2, $a2, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_14/fx_14_main.s b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_main.s index 111fb4cf44..1723e7fc2a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_14/fx_14_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_main.s @@ -26,12 +26,12 @@ glabel fx_14_main /* 330964 E001C054 AFB00028 */ sw $s0, 0x28($sp) /* 330968 E001C058 AFA00010 */ sw $zero, 0x10($sp) /* 33096C E001C05C AFA00024 */ sw $zero, 0x24($sp) -/* 330970 E001C060 0C080124 */ jal func_E0200490 +/* 330970 E001C060 0C080124 */ jal shim_create_effect_instance /* 330974 E001C064 AFA20014 */ sw $v0, 0x14($sp) /* 330978 E001C068 2404002C */ addiu $a0, $zero, 0x2c /* 33097C E001C06C 24030001 */ addiu $v1, $zero, 1 /* 330980 E001C070 0040802D */ daddu $s0, $v0, $zero -/* 330984 E001C074 0C08012C */ jal func_E02004B0 +/* 330984 E001C074 0C08012C */ jal shim_general_heap_malloc /* 330988 E001C078 AE030008 */ sw $v1, 8($s0) /* 33098C E001C07C 14400003 */ bnez $v0, .LE001C08C /* 330990 E001C080 AE02000C */ sw $v0, 0xc($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_15/func_E001E378.s b/ver/us/asm/nonmatchings/effects/effect_15/func_E001E378.s index 59decfb211..5607d7cf97 100644 --- a/ver/us/asm/nonmatchings/effects/effect_15/func_E001E378.s +++ b/ver/us/asm/nonmatchings/effects/effect_15/func_E001E378.s @@ -32,7 +32,7 @@ glabel func_E001E378 /* 331D24 E001E3E4 00000000 */ nop /* 331D28 E001E3E8 45000008 */ bc1f .LE001E40C /* 331D2C E001E3EC E7AC0024 */ swc1 $f12, 0x24($sp) -/* 331D30 E001E3F0 0C080154 */ jal func_E0200550 +/* 331D30 E001E3F0 0C080154 */ jal shim_sqrtf /* 331D34 E001E3F4 00000000 */ nop /* 331D38 E001E3F8 3C013F80 */ lui $at, 0x3f80 /* 331D3C E001E3FC 44811000 */ mtc1 $at, $f2 @@ -84,7 +84,7 @@ glabel func_E001E378 /* 331DF0 E001E4B0 0000202D */ daddu $a0, $zero, $zero /* 331DF4 E001E4B4 27A50018 */ addiu $a1, $sp, 0x18 /* 331DF8 E001E4B8 27A6001C */ addiu $a2, $sp, 0x1c -/* 331DFC E001E4BC 0C08014C */ jal func_E0200530 +/* 331DFC E001E4BC 0C08014C */ jal shim_npc_raycast_down_sides /* 331E00 E001E4C0 27A70020 */ addiu $a3, $sp, 0x20 /* 331E04 E001E4C4 1040004D */ beqz $v0, .LE001E5FC /* 331E08 E001E4C8 00000000 */ nop @@ -130,7 +130,7 @@ glabel func_E001E378 /* 331EA8 E001E568 E6060010 */ swc1 $f6, 0x10($s0) /* 331EAC E001E56C E6020034 */ swc1 $f2, 0x34($s0) /* 331EB0 E001E570 46200020 */ cvt.s.d $f0, $f0 -/* 331EB4 E001E574 0C080150 */ jal func_E0200540 +/* 331EB4 E001E574 0C080150 */ jal shim_load_effect /* 331EB8 E001E578 E600002C */ swc1 $f0, 0x2c($s0) /* 331EBC E001E57C C6020008 */ lwc1 $f2, 8($s0) /* 331EC0 E001E580 3C0140A0 */ lui $at, 0x40a0 @@ -152,7 +152,7 @@ glabel func_E001E378 /* 331F00 E001E5C0 E7A00010 */ swc1 $f0, 0x10($sp) /* 331F04 E001E5C4 8E060004 */ lw $a2, 4($s0) /* 331F08 E001E5C8 8E070008 */ lw $a3, 8($s0) -/* 331F0C E001E5CC 0C0801A0 */ jal func_E0200680 +/* 331F0C E001E5CC 0C0801A0 */ jal shim_sfx_play_sound_at_position /* 331F10 E001E5D0 0000282D */ daddu $a1, $zero, $zero .LE001E5D4: /* 331F14 E001E5D4 C602001C */ lwc1 $f2, 0x1c($s0) @@ -187,7 +187,7 @@ glabel func_E001E378 /* 331F84 E001E644 E6000014 */ swc1 $f0, 0x14($s0) /* 331F88 E001E648 46000007 */ neg.s $f0, $f0 /* 331F8C E001E64C 44060000 */ mfc1 $a2, $f0 -/* 331F90 E001E650 0C080148 */ jal func_E0200520 +/* 331F90 E001E650 0C080148 */ jal shim_atan2 /* 331F94 E001E654 E6020024 */ swc1 $f2, 0x24($s0) /* 331F98 E001E658 E6000020 */ swc1 $f0, 0x20($s0) .LE001E65C: @@ -219,7 +219,7 @@ glabel func_E001E378 /* 331FFC E001E6BC E6020008 */ swc1 $f2, 8($s0) /* 332000 E001E6C0 04410003 */ bgez $v0, .LE001E6D0 /* 332004 E001E6C4 E600000C */ swc1 $f0, 0xc($s0) -/* 332008 E001E6C8 0C080128 */ jal func_E02004A0 +/* 332008 E001E6C8 0C080128 */ jal shim_remove_effect /* 33200C E001E6CC 0220202D */ daddu $a0, $s1, $zero .LE001E6D0: /* 332010 E001E6D0 8FBF0030 */ lw $ra, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_15/func_E001E6E8.s b/ver/us/asm/nonmatchings/effects/effect_15/func_E001E6E8.s index eef5fc0302..2f9076c5da 100644 --- a/ver/us/asm/nonmatchings/effects/effect_15/func_E001E6E8.s +++ b/ver/us/asm/nonmatchings/effects/effect_15/func_E001E6E8.s @@ -16,7 +16,7 @@ glabel func_E001E6E8 /* 332054 E001E714 27A40010 */ addiu $a0, $sp, 0x10 /* 332058 E001E718 2405002D */ addiu $a1, $zero, 0x2d .LE001E71C: -/* 33205C E001E71C 0C080120 */ jal func_E0200480 +/* 33205C E001E71C 0C080120 */ jal shim_queue_render_task /* 332060 E001E720 AFA50010 */ sw $a1, 0x10($sp) /* 332064 E001E724 8FBF0020 */ lw $ra, 0x20($sp) /* 332068 E001E728 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_15/func_E001E730.s b/ver/us/asm/nonmatchings/effects/effect_15/func_E001E730.s index 3501f7bbf4..2b47889a2b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_15/func_E001E730.s +++ b/ver/us/asm/nonmatchings/effects/effect_15/func_E001E730.s @@ -66,7 +66,7 @@ glabel func_E001E730 /* 332164 E001E824 E7A00018 */ swc1 $f0, 0x18($sp) /* 332168 E001E828 C6C0000C */ lwc1 $f0, 0xc($s6) /* 33216C E001E82C 27A40020 */ addiu $a0, $sp, 0x20 -/* 332170 E001E830 0C080180 */ jal func_E0200600 +/* 332170 E001E830 0C080180 */ jal shim_guPositionF /* 332174 E001E834 E7A0001C */ swc1 $f0, 0x1c($sp) /* 332178 E001E838 36B51630 */ ori $s5, $s5, 0x1630 /* 33217C E001E83C 27B00060 */ addiu $s0, $sp, 0x60 @@ -76,11 +76,11 @@ glabel func_E001E730 /* 33218C E001E84C 0200202D */ daddu $a0, $s0, $zero /* 332190 E001E850 E7A00010 */ swc1 $f0, 0x10($sp) /* 332194 E001E854 8EC50024 */ lw $a1, 0x24($s6) -/* 332198 E001E858 0C080104 */ jal func_E0200410 +/* 332198 E001E858 0C080104 */ jal shim_guRotateF /* 33219C E001E85C 00C0382D */ daddu $a3, $a2, $zero /* 3321A0 E001E860 0200202D */ daddu $a0, $s0, $zero /* 3321A4 E001E864 27A50020 */ addiu $a1, $sp, 0x20 -/* 3321A8 E001E868 0C080114 */ jal func_E0200450 +/* 3321A8 E001E868 0C080114 */ jal shim_guMtxCatF /* 3321AC E001E86C 00A0302D */ daddu $a2, $a1, $zero /* 3321B0 E001E870 27A40020 */ addiu $a0, $sp, 0x20 /* 3321B4 E001E874 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -91,7 +91,7 @@ glabel func_E001E730 /* 3321C8 E001E888 8E820000 */ lw $v0, ($s4) /* 3321CC E001E88C 00052980 */ sll $a1, $a1, 6 /* 3321D0 E001E890 00B52821 */ addu $a1, $a1, $s5 -/* 3321D4 E001E894 0C080118 */ jal func_E0200460 +/* 3321D4 E001E894 0C080118 */ jal shim_guMtxF2L /* 3321D8 E001E898 00452821 */ addu $a1, $v0, $a1 /* 3321DC E001E89C 3C05FA00 */ lui $a1, 0xfa00 /* 3321E0 E001E8A0 34A50050 */ ori $a1, $a1, 0x50 @@ -219,24 +219,24 @@ glabel func_E001E730 /* 3323B4 E001EA74 E7A00018 */ swc1 $f0, 0x18($sp) /* 3323B8 E001EA78 C6C0000C */ lwc1 $f0, 0xc($s6) /* 3323BC E001EA7C 27A40020 */ addiu $a0, $sp, 0x20 -/* 3323C0 E001EA80 0C080180 */ jal func_E0200600 +/* 3323C0 E001EA80 0C080180 */ jal shim_guPositionF /* 3323C4 E001EA84 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3323C8 E001EA88 27B00060 */ addiu $s0, $sp, 0x60 /* 3323CC E001EA8C 4406A000 */ mfc1 $a2, $f20 /* 3323D0 E001EA90 0200202D */ daddu $a0, $s0, $zero /* 3323D4 E001EA94 E7B60010 */ swc1 $f22, 0x10($sp) /* 3323D8 E001EA98 8EC50020 */ lw $a1, 0x20($s6) -/* 3323DC E001EA9C 0C080104 */ jal func_E0200410 +/* 3323DC E001EA9C 0C080104 */ jal shim_guRotateF /* 3323E0 E001EAA0 00C0382D */ daddu $a3, $a2, $zero /* 3323E4 E001EAA4 0200202D */ daddu $a0, $s0, $zero /* 3323E8 E001EAA8 27A50020 */ addiu $a1, $sp, 0x20 -/* 3323EC E001EAAC 0C080114 */ jal func_E0200450 +/* 3323EC E001EAAC 0C080114 */ jal shim_guMtxCatF /* 3323F0 E001EAB0 00A0302D */ daddu $a2, $a1, $zero /* 3323F4 E001EAB4 8EC5003C */ lw $a1, 0x3c($s6) /* 3323F8 E001EAB8 27A40020 */ addiu $a0, $sp, 0x20 /* 3323FC E001EABC 00052980 */ sll $a1, $a1, 6 /* 332400 E001EAC0 24A50040 */ addiu $a1, $a1, 0x40 -/* 332404 E001EAC4 0C080118 */ jal func_E0200460 +/* 332404 E001EAC4 0C080118 */ jal shim_guMtxF2L /* 332408 E001EAC8 02C52821 */ addu $a1, $s6, $a1 /* 33240C E001EACC 0000402D */ daddu $t0, $zero, $zero /* 332410 E001EAD0 3C15800A */ lui $s5, %hi(gDisplayContext) diff --git a/ver/us/asm/nonmatchings/effects/effect_15/fx_15_main.s b/ver/us/asm/nonmatchings/effects/effect_15/fx_15_main.s index 1762449954..ef44f905fe 100644 --- a/ver/us/asm/nonmatchings/effects/effect_15/fx_15_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_15/fx_15_main.s @@ -31,12 +31,12 @@ glabel fx_15_main /* 3319A8 E001E068 F7B80048 */ sdc1 $f24, 0x48($sp) /* 3319AC E001E06C AFA00010 */ sw $zero, 0x10($sp) /* 3319B0 E001E070 AFA00024 */ sw $zero, 0x24($sp) -/* 3319B4 E001E074 0C080124 */ jal func_E0200490 +/* 3319B4 E001E074 0C080124 */ jal shim_create_effect_instance /* 3319B8 E001E078 AFA20014 */ sw $v0, 0x14($sp) /* 3319BC E001E07C 24040250 */ addiu $a0, $zero, 0x250 /* 3319C0 E001E080 24030001 */ addiu $v1, $zero, 1 /* 3319C4 E001E084 0040902D */ daddu $s2, $v0, $zero -/* 3319C8 E001E088 0C08012C */ jal func_E02004B0 +/* 3319C8 E001E088 0C08012C */ jal shim_general_heap_malloc /* 3319CC E001E08C AE430008 */ sw $v1, 8($s2) /* 3319D0 E001E090 0040882D */ daddu $s1, $v0, $zero /* 3319D4 E001E094 16200003 */ bnez $s1, .LE001E0A4 @@ -60,11 +60,11 @@ glabel fx_15_main /* 331A14 E001E0D4 3421CCCD */ ori $at, $at, 0xcccd /* 331A18 E001E0D8 44810000 */ mtc1 $at, $f0 /* 331A1C E001E0DC 240400FF */ addiu $a0, $zero, 0xff -/* 331A20 E001E0E0 0C080138 */ jal func_E02004E0 +/* 331A20 E001E0E0 0C080138 */ jal shim_rand_int /* 331A24 E001E0E4 E6200240 */ swc1 $f0, 0x240($s1) /* 331A28 E001E0E8 241000FF */ addiu $s0, $zero, 0xff /* 331A2C E001E0EC 02022023 */ subu $a0, $s0, $v0 -/* 331A30 E001E0F0 0C080138 */ jal func_E02004E0 +/* 331A30 E001E0F0 0C080138 */ jal shim_rand_int /* 331A34 E001E0F4 AE220244 */ sw $v0, 0x244($s1) /* 331A38 E001E0F8 8E230244 */ lw $v1, 0x244($s1) /* 331A3C E001E0FC 02028023 */ subu $s0, $s0, $v0 @@ -103,7 +103,7 @@ glabel fx_15_main /* 331AB8 E001E178 00000000 */ nop /* 331ABC E001E17C 45010005 */ bc1t .LE001E194 /* 331AC0 E001E180 4600D106 */ mov.s $f4, $f26 -/* 331AC4 E001E184 0C080154 */ jal func_E0200550 +/* 331AC4 E001E184 0C080154 */ jal shim_sqrtf /* 331AC8 E001E188 4600D306 */ mov.s $f12, $f26 /* 331ACC E001E18C 46000686 */ mov.s $f26, $f0 /* 331AD0 E001E190 461AF103 */ div.s $f4, $f30, $f26 @@ -129,10 +129,10 @@ glabel fx_15_main /* 331B1C E001E1DC 3C01800B */ lui $at, %hi(gCameras+0x6C) /* 331B20 E001E1E0 00220821 */ addu $at, $at, $v0 /* 331B24 E001E1E4 C4341DEC */ lwc1 $f20, %lo(gCameras+0x6C)($at) -/* 331B28 E001E1E8 0C080144 */ jal func_E0200510 +/* 331B28 E001E1E8 0C080144 */ jal shim_cos_deg /* 331B2C E001E1EC 4600A306 */ mov.s $f12, $f20 /* 331B30 E001E1F0 4600A306 */ mov.s $f12, $f20 -/* 331B34 E001E1F4 0C080140 */ jal func_E0200500 +/* 331B34 E001E1F4 0C080140 */ jal shim_sin_deg /* 331B38 E001E1F8 46000587 */ neg.s $f22, $f0 /* 331B3C E001E1FC C6240010 */ lwc1 $f4, 0x10($s1) /* 331B40 E001E200 4604B102 */ mul.s $f4, $f22, $f4 @@ -150,7 +150,7 @@ glabel fx_15_main /* 331B70 E001E230 00000000 */ nop /* 331B74 E001E234 45010004 */ bc1t .LE001E248 /* 331B78 E001E238 00000000 */ nop -/* 331B7C E001E23C 0C080154 */ jal func_E0200550 +/* 331B7C E001E23C 0C080154 */ jal shim_sqrtf /* 331B80 E001E240 00000000 */ nop /* 331B84 E001E244 46000306 */ mov.s $f12, $f0 .LE001E248: @@ -181,7 +181,7 @@ glabel fx_15_main /* 331BE0 E001E2A0 44806000 */ mtc1 $zero, $f12 /* 331BE4 E001E2A4 46000007 */ neg.s $f0, $f0 /* 331BE8 E001E2A8 44060000 */ mfc1 $a2, $f0 -/* 331BEC E001E2AC 0C080148 */ jal func_E0200520 +/* 331BEC E001E2AC 0C080148 */ jal shim_atan2 /* 331BF0 E001E2B0 46006386 */ mov.s $f14, $f12 /* 331BF4 E001E2B4 461ED083 */ div.s $f2, $f26, $f30 /* 331BF8 E001E2B8 4600118D */ trunc.w.s $f6, $f2 @@ -193,7 +193,7 @@ glabel fx_15_main /* 331C10 E001E2D0 0200202D */ daddu $a0, $s0, $zero /* 331C14 E001E2D4 E6200024 */ swc1 $f0, 0x24($s1) /* 331C18 E001E2D8 E6200020 */ swc1 $f0, 0x20($s1) -/* 331C1C E001E2DC 0C08010C */ jal func_E0200430 +/* 331C1C E001E2DC 0C08010C */ jal shim_guTranslate /* 331C20 E001E2E0 E6340034 */ swc1 $f20, 0x34($s1) /* 331C24 E001E2E4 24050001 */ addiu $a1, $zero, 1 /* 331C28 E001E2E8 26260080 */ addiu $a2, $s1, 0x80 diff --git a/ver/us/asm/nonmatchings/effects/effect_16/func_E0020000.s b/ver/us/asm/nonmatchings/effects/effect_16/func_E0020000.s index 5dcc8212b4..ba61eec939 100644 --- a/ver/us/asm/nonmatchings/effects/effect_16/func_E0020000.s +++ b/ver/us/asm/nonmatchings/effects/effect_16/func_E0020000.s @@ -28,7 +28,7 @@ glabel func_E0020000 /* 333F1C E002005C 00220821 */ addu $at, $at, $v0 /* 333F20 E0020060 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) /* 333F24 E0020064 8E32003C */ lw $s2, 0x3c($s1) -/* 333F28 E0020068 0C080140 */ jal func_E0200500 +/* 333F28 E0020068 0C080140 */ jal shim_sin_deg /* 333F2C E002006C 00A0982D */ daddu $s3, $a1, $zero /* 333F30 E0020070 8E030000 */ lw $v1, ($s0) /* 333F34 E0020074 00031080 */ sll $v0, $v1, 2 @@ -41,7 +41,7 @@ glabel func_E0020000 /* 333F50 E0020090 3C01800B */ lui $at, %hi(gCameras+0x6C) /* 333F54 E0020094 00220821 */ addu $at, $at, $v0 /* 333F58 E0020098 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* 333F5C E002009C 0C080144 */ jal func_E0200510 +/* 333F5C E002009C 0C080144 */ jal shim_cos_deg /* 333F60 E00200A0 46000506 */ mov.s $f20, $f0 /* 333F64 E00200A4 00131080 */ sll $v0, $s3, 2 /* 333F68 E00200A8 46000007 */ neg.s $f0, $f0 @@ -59,7 +59,7 @@ glabel func_E0020000 /* 333F98 E00200D8 4406A000 */ mfc1 $a2, $f20 /* 333F9C E00200DC 46000007 */ neg.s $f0, $f0 /* 333FA0 E00200E0 44050000 */ mfc1 $a1, $f0 -/* 333FA4 E00200E4 0C080104 */ jal func_E0200410 +/* 333FA4 E00200E4 0C080104 */ jal shim_guRotateF /* 333FA8 E00200E8 0000382D */ daddu $a3, $zero, $zero /* 333FAC E00200EC 2402FFFF */ addiu $v0, $zero, -1 /* 333FB0 E00200F0 1642001F */ bne $s2, $v0, .LE0020170 diff --git a/ver/us/asm/nonmatchings/effects/effect_16/func_E0020468.s b/ver/us/asm/nonmatchings/effects/effect_16/func_E0020468.s index 2e2227fd9b..cde73fdfd2 100644 --- a/ver/us/asm/nonmatchings/effects/effect_16/func_E0020468.s +++ b/ver/us/asm/nonmatchings/effects/effect_16/func_E0020468.s @@ -48,7 +48,7 @@ glabel func_E0020468 /* 3343CC E002050C 04410005 */ bgez $v0, .LE0020524 /* 3343D0 E0020510 00000000 */ nop .LE0020514: -/* 3343D4 E0020514 0C080128 */ jal func_E02004A0 +/* 3343D4 E0020514 0C080128 */ jal shim_remove_effect /* 3343D8 E0020518 0240202D */ daddu $a0, $s2, $zero /* 3343DC E002051C 0800815D */ j .LE0020574 /* 3343E0 E0020520 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_16/func_E002058C.s b/ver/us/asm/nonmatchings/effects/effect_16/func_E002058C.s index f3a377ea83..ba88765b4d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_16/func_E002058C.s +++ b/ver/us/asm/nonmatchings/effects/effect_16/func_E002058C.s @@ -11,7 +11,7 @@ glabel func_E002058C /* 334464 E00205A4 27A40010 */ addiu $a0, $sp, 0x10 /* 334468 E00205A8 AFBF0020 */ sw $ra, 0x20($sp) /* 33446C E00205AC AFA00014 */ sw $zero, 0x14($sp) -/* 334470 E00205B0 0C080120 */ jal func_E0200480 +/* 334470 E00205B0 0C080120 */ jal shim_queue_render_task /* 334474 E00205B4 AFA20010 */ sw $v0, 0x10($sp) /* 334478 E00205B8 8C430000 */ lw $v1, ($v0) /* 33447C E00205BC 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_16/func_E00205D0.s b/ver/us/asm/nonmatchings/effects/effect_16/func_E00205D0.s index 484c0b5310..90285a5694 100644 --- a/ver/us/asm/nonmatchings/effects/effect_16/func_E00205D0.s +++ b/ver/us/asm/nonmatchings/effects/effect_16/func_E00205D0.s @@ -43,7 +43,7 @@ glabel func_E00205D0 /* 334528 E0020668 8E850004 */ lw $a1, 4($s4) /* 33452C E002066C 8E860008 */ lw $a2, 8($s4) /* 334530 E0020670 8E87000C */ lw $a3, 0xc($s4) -/* 334534 E0020674 0C080108 */ jal func_E0200420 +/* 334534 E0020674 0C080108 */ jal shim_guTranslateF /* 334538 E0020678 36731630 */ ori $s3, $s3, 0x1630 /* 33453C E002067C 27B00058 */ addiu $s0, $sp, 0x58 /* 334540 E0020680 4480B000 */ mtc1 $zero, $f22 @@ -66,11 +66,11 @@ glabel func_E00205D0 /* 334584 E00206C4 46000007 */ neg.s $f0, $f0 /* 334588 E00206C8 44050000 */ mfc1 $a1, $f0 /* 33458C E00206CC 0200202D */ daddu $a0, $s0, $zero -/* 334590 E00206D0 0C080104 */ jal func_E0200410 +/* 334590 E00206D0 0C080104 */ jal shim_guRotateF /* 334594 E00206D4 E7B60010 */ swc1 $f22, 0x10($sp) /* 334598 E00206D8 0200202D */ daddu $a0, $s0, $zero /* 33459C E00206DC 27A50018 */ addiu $a1, $sp, 0x18 -/* 3345A0 E00206E0 0C080114 */ jal func_E0200450 +/* 3345A0 E00206E0 0C080114 */ jal shim_guMtxCatF /* 3345A4 E00206E4 00A0302D */ daddu $a2, $a1, $zero /* 3345A8 E00206E8 27A40018 */ addiu $a0, $sp, 0x18 /* 3345AC E00206EC 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -87,34 +87,34 @@ glabel func_E00205D0 /* 3345D8 E0020718 00531021 */ addu $v0, $v0, $s3 /* 3345DC E002071C 00C23021 */ addu $a2, $a2, $v0 /* 3345E0 E0020720 A6230000 */ sh $v1, ($s1) -/* 3345E4 E0020724 0C080118 */ jal func_E0200460 +/* 3345E4 E0020724 0C080118 */ jal shim_guMtxF2L /* 3345E8 E0020728 AFA60098 */ sw $a2, 0x98($sp) /* 3345EC E002072C 4405A000 */ mfc1 $a1, $f20 /* 3345F0 E0020730 3C063F4C */ lui $a2, 0x3f4c /* 3345F4 E0020734 34C6CCCD */ ori $a2, $a2, 0xcccd /* 3345F8 E0020738 4407A000 */ mfc1 $a3, $f20 -/* 3345FC E002073C 0C080110 */ jal func_E0200440 +/* 3345FC E002073C 0C080110 */ jal shim_guScaleF /* 334600 E0020740 0200202D */ daddu $a0, $s0, $zero /* 334604 E0020744 0200202D */ daddu $a0, $s0, $zero /* 334608 E0020748 27A50018 */ addiu $a1, $sp, 0x18 -/* 33460C E002074C 0C080114 */ jal func_E0200450 +/* 33460C E002074C 0C080114 */ jal shim_guMtxCatF /* 334610 E0020750 00A0302D */ daddu $a2, $a1, $zero /* 334614 E0020754 4406B000 */ mfc1 $a2, $f22 /* 334618 E0020758 0200202D */ daddu $a0, $s0, $zero /* 33461C E002075C E7B40010 */ swc1 $f20, 0x10($sp) /* 334620 E0020760 8E850024 */ lw $a1, 0x24($s4) -/* 334624 E0020764 0C080104 */ jal func_E0200410 +/* 334624 E0020764 0C080104 */ jal shim_guRotateF /* 334628 E0020768 00C0382D */ daddu $a3, $a2, $zero /* 33462C E002076C 0200202D */ daddu $a0, $s0, $zero /* 334630 E0020770 27A50018 */ addiu $a1, $sp, 0x18 -/* 334634 E0020774 0C080114 */ jal func_E0200450 +/* 334634 E0020774 0C080114 */ jal shim_guMtxCatF /* 334638 E0020778 00A0302D */ daddu $a2, $a1, $zero /* 33463C E002077C 27A40018 */ addiu $a0, $sp, 0x18 /* 334640 E0020780 96250000 */ lhu $a1, ($s1) /* 334644 E0020784 8E420000 */ lw $v0, ($s2) /* 334648 E0020788 00052980 */ sll $a1, $a1, 6 /* 33464C E002078C 00B32821 */ addu $a1, $a1, $s3 -/* 334650 E0020790 0C080118 */ jal func_E0200460 +/* 334650 E0020790 0C080118 */ jal shim_guMtxF2L /* 334654 E0020794 00452821 */ addu $a1, $v0, $a1 /* 334658 E0020798 3C03DA38 */ lui $v1, 0xda38 /* 33465C E002079C 34630002 */ ori $v1, $v1, 2 @@ -168,7 +168,7 @@ glabel func_E00205D0 /* 334714 E0020854 8E05FFDC */ lw $a1, -0x24($s0) /* 334718 E0020858 8E06FFE0 */ lw $a2, -0x20($s0) /* 33471C E002085C 8E07FFE4 */ lw $a3, -0x1c($s0) -/* 334720 E0020860 0C080108 */ jal func_E0200420 +/* 334720 E0020860 0C080108 */ jal shim_guTranslateF /* 334724 E0020864 26730001 */ addiu $s3, $s3, 1 /* 334728 E0020868 3C09800B */ lui $t1, %hi(gCameras) /* 33472C E002086C 25291D80 */ addiu $t1, $t1, %lo(gCameras) @@ -188,38 +188,38 @@ glabel func_E00205D0 /* 334764 E00208A4 46000007 */ neg.s $f0, $f0 /* 334768 E00208A8 44050000 */ mfc1 $a1, $f0 /* 33476C E00208AC 0220202D */ daddu $a0, $s1, $zero -/* 334770 E00208B0 0C080104 */ jal func_E0200410 +/* 334770 E00208B0 0C080104 */ jal shim_guRotateF /* 334774 E00208B4 E7B40010 */ swc1 $f20, 0x10($sp) /* 334778 E00208B8 0220202D */ daddu $a0, $s1, $zero /* 33477C E00208BC 27A50018 */ addiu $a1, $sp, 0x18 -/* 334780 E00208C0 0C080114 */ jal func_E0200450 +/* 334780 E00208C0 0C080114 */ jal shim_guMtxCatF /* 334784 E00208C4 00A0302D */ daddu $a2, $a1, $zero /* 334788 E00208C8 E7B60010 */ swc1 $f22, 0x10($sp) /* 33478C E00208CC 8E05FFFC */ lw $a1, -4($s0) /* 334790 E00208D0 4406A000 */ mfc1 $a2, $f20 /* 334794 E00208D4 4407A000 */ mfc1 $a3, $f20 -/* 334798 E00208D8 0C080104 */ jal func_E0200410 +/* 334798 E00208D8 0C080104 */ jal shim_guRotateF /* 33479C E00208DC 0220202D */ daddu $a0, $s1, $zero /* 3347A0 E00208E0 0220202D */ daddu $a0, $s1, $zero /* 3347A4 E00208E4 27A50018 */ addiu $a1, $sp, 0x18 -/* 3347A8 E00208E8 0C080114 */ jal func_E0200450 +/* 3347A8 E00208E8 0C080114 */ jal shim_guMtxCatF /* 3347AC E00208EC 00A0302D */ daddu $a2, $a1, $zero /* 3347B0 E00208F0 0220202D */ daddu $a0, $s1, $zero /* 3347B4 E00208F4 8E050000 */ lw $a1, ($s0) /* 3347B8 E00208F8 26100040 */ addiu $s0, $s0, 0x40 /* 3347BC E00208FC 4407B000 */ mfc1 $a3, $f22 -/* 3347C0 E0020900 0C080110 */ jal func_E0200440 +/* 3347C0 E0020900 0C080110 */ jal shim_guScaleF /* 3347C4 E0020904 00A0302D */ daddu $a2, $a1, $zero /* 3347C8 E0020908 0220202D */ daddu $a0, $s1, $zero /* 3347CC E002090C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3347D0 E0020910 0C080114 */ jal func_E0200450 +/* 3347D0 E0020910 0C080114 */ jal shim_guMtxCatF /* 3347D4 E0020914 00A0302D */ daddu $a2, $a1, $zero /* 3347D8 E0020918 27A40018 */ addiu $a0, $sp, 0x18 /* 3347DC E002091C 96E50000 */ lhu $a1, ($s7) /* 3347E0 E0020920 8FC20000 */ lw $v0, ($fp) /* 3347E4 E0020924 00052980 */ sll $a1, $a1, 6 /* 3347E8 E0020928 00B52821 */ addu $a1, $a1, $s5 -/* 3347EC E002092C 0C080118 */ jal func_E0200460 +/* 3347EC E002092C 0C080118 */ jal shim_guMtxF2L /* 3347F0 E0020930 00452821 */ addu $a1, $v0, $a1 /* 3347F4 E0020934 3C05EB1C */ lui $a1, 0xeb1c /* 3347F8 E0020938 34A500FF */ ori $a1, $a1, 0xff diff --git a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_main.s b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_main.s index 016ce96bc6..cc616fd3a6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_main.s @@ -40,11 +40,11 @@ glabel fx_16_main /* 334214 E0020354 24020010 */ addiu $v0, $zero, 0x10 /* 334218 E0020358 AFA00010 */ sw $zero, 0x10($sp) /* 33421C E002035C AFA00024 */ sw $zero, 0x24($sp) -/* 334220 E0020360 0C080124 */ jal func_E0200490 +/* 334220 E0020360 0C080124 */ jal shim_create_effect_instance /* 334224 E0020364 AFA20014 */ sw $v0, 0x14($sp) /* 334228 E0020368 00132180 */ sll $a0, $s3, 6 /* 33422C E002036C 0040A02D */ daddu $s4, $v0, $zero -/* 334230 E0020370 0C08012C */ jal func_E02004B0 +/* 334230 E0020370 0C08012C */ jal shim_general_heap_malloc /* 334234 E0020374 AE930008 */ sw $s3, 8($s4) /* 334238 E0020378 0040882D */ daddu $s1, $v0, $zero /* 33423C E002037C 16200003 */ bnez $s1, .LE002038C diff --git a/ver/us/asm/nonmatchings/effects/effect_17/func_E002254C.s b/ver/us/asm/nonmatchings/effects/effect_17/func_E002254C.s index 82a728db4e..5f4e9e48a8 100644 --- a/ver/us/asm/nonmatchings/effects/effect_17/func_E002254C.s +++ b/ver/us/asm/nonmatchings/effects/effect_17/func_E002254C.s @@ -132,12 +132,12 @@ glabel func_E002254C /* 337974 E0022734 44810000 */ mtc1 $at, $f0 /* 337978 E0022738 4600B306 */ mov.s $f12, $f22 /* 33797C E002273C 4600A500 */ add.s $f20, $f20, $f0 -/* 337980 E0022740 0C080140 */ jal func_E0200500 +/* 337980 E0022740 0C080140 */ jal shim_sin_deg /* 337984 E0022744 AFD70000 */ sw $s7, ($fp) /* 337988 E0022748 4600A002 */ mul.s $f0, $f20, $f0 /* 33798C E002274C 00000000 */ nop /* 337990 E0022750 4600B306 */ mov.s $f12, $f22 -/* 337994 E0022754 0C080144 */ jal func_E0200510 +/* 337994 E0022754 0C080144 */ jal shim_cos_deg /* 337998 E0022758 E600FFF4 */ swc1 $f0, -0xc($s0) /* 33799C E002275C 4600A502 */ mul.s $f20, $f20, $f0 /* 3379A0 E0022760 00000000 */ nop @@ -258,7 +258,7 @@ glabel func_E002254C /* 337B4C E002290C 14400003 */ bnez $v0, .LE002291C /* 337B50 E0022910 00000000 */ nop .LE0022914: -/* 337B54 E0022914 0C080128 */ jal func_E02004A0 +/* 337B54 E0022914 0C080128 */ jal shim_remove_effect /* 337B58 E0022918 02A0202D */ daddu $a0, $s5, $zero .LE002291C: /* 337B5C E002291C 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_17/func_E0022960.s b/ver/us/asm/nonmatchings/effects/effect_17/func_E0022960.s index da556bd2d8..78aa16ac9d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_17/func_E0022960.s +++ b/ver/us/asm/nonmatchings/effects/effect_17/func_E0022960.s @@ -11,7 +11,7 @@ glabel func_E0022960 /* 337BB8 E0022978 27A40010 */ addiu $a0, $sp, 0x10 /* 337BBC E002297C AFBF0020 */ sw $ra, 0x20($sp) /* 337BC0 E0022980 AFA00014 */ sw $zero, 0x14($sp) -/* 337BC4 E0022984 0C080120 */ jal func_E0200480 +/* 337BC4 E0022984 0C080120 */ jal shim_queue_render_task /* 337BC8 E0022988 AFA20010 */ sw $v0, 0x10($sp) /* 337BCC E002298C 8FBF0020 */ lw $ra, 0x20($sp) /* 337BD0 E0022990 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_17/func_E0022998.s b/ver/us/asm/nonmatchings/effects/effect_17/func_E0022998.s index 1388351022..0a044f8f11 100644 --- a/ver/us/asm/nonmatchings/effects/effect_17/func_E0022998.s +++ b/ver/us/asm/nonmatchings/effects/effect_17/func_E0022998.s @@ -49,7 +49,7 @@ glabel func_E0022998 /* 337C88 E0022A48 8E07000C */ lw $a3, 0xc($s0) /* 337C8C E0022A4C 2442FFFF */ addiu $v0, $v0, -1 /* 337C90 E0022A50 00021840 */ sll $v1, $v0, 1 -/* 337C94 E0022A54 0C080108 */ jal func_E0200420 +/* 337C94 E0022A54 0C080108 */ jal shim_guTranslateF /* 337C98 E0022A58 00628821 */ addu $s1, $v1, $v0 /* 337C9C E0022A5C 27B20058 */ addiu $s2, $sp, 0x58 /* 337CA0 E0022A60 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -70,11 +70,11 @@ glabel func_E0022998 /* 337CDC E0022A9C 46000007 */ neg.s $f0, $f0 /* 337CE0 E0022AA0 44050000 */ mfc1 $a1, $f0 /* 337CE4 E0022AA4 0240202D */ daddu $a0, $s2, $zero -/* 337CE8 E0022AA8 0C080104 */ jal func_E0200410 +/* 337CE8 E0022AA8 0C080104 */ jal shim_guRotateF /* 337CEC E0022AAC AFA60010 */ sw $a2, 0x10($sp) /* 337CF0 E0022AB0 0240202D */ daddu $a0, $s2, $zero /* 337CF4 E0022AB4 27A50018 */ addiu $a1, $sp, 0x18 -/* 337CF8 E0022AB8 0C080114 */ jal func_E0200450 +/* 337CF8 E0022AB8 0C080114 */ jal shim_guMtxCatF /* 337CFC E0022ABC 27A60098 */ addiu $a2, $sp, 0x98 /* 337D00 E0022AC0 8FAA0100 */ lw $t2, 0x100($sp) /* 337D04 E0022AC4 0000A02D */ daddu $s4, $zero, $zero @@ -98,7 +98,7 @@ glabel func_E0022998 /* 337D48 E0022B08 8E05FFE8 */ lw $a1, -0x18($s0) /* 337D4C E0022B0C 8E06FFEC */ lw $a2, -0x14($s0) /* 337D50 E0022B10 8E07FFF0 */ lw $a3, -0x10($s0) -/* 337D54 E0022B14 0C080108 */ jal func_E0200420 +/* 337D54 E0022B14 0C080108 */ jal shim_guTranslateF /* 337D58 E0022B18 26310003 */ addiu $s1, $s1, 3 /* 337D5C E0022B1C C6000000 */ lwc1 $f0, ($s0) /* 337D60 E0022B20 02C0202D */ daddu $a0, $s6, $zero @@ -108,7 +108,7 @@ glabel func_E0022998 /* 337D70 E0022B30 E7A0006C */ swc1 $f0, 0x6c($sp) /* 337D74 E0022B34 C6000000 */ lwc1 $f0, ($s0) /* 337D78 E0022B38 27A60018 */ addiu $a2, $sp, 0x18 -/* 337D7C E0022B3C 0C080114 */ jal func_E0200450 +/* 337D7C E0022B3C 0C080114 */ jal shim_guMtxCatF /* 337D80 E0022B40 E7A00080 */ swc1 $f0, 0x80($sp) /* 337D84 E0022B44 27A40018 */ addiu $a0, $sp, 0x18 /* 337D88 E0022B48 97C50000 */ lhu $a1, ($fp) @@ -116,7 +116,7 @@ glabel func_E0022998 /* 337D90 E0022B50 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 337D94 E0022B54 00052980 */ sll $a1, $a1, 6 /* 337D98 E0022B58 00B52821 */ addu $a1, $a1, $s5 -/* 337D9C E0022B5C 0C080118 */ jal func_E0200460 +/* 337D9C E0022B5C 0C080118 */ jal shim_guMtxF2L /* 337DA0 E0022B60 00452821 */ addu $a1, $v0, $a1 /* 337DA4 E0022B64 3C0238E3 */ lui $v0, 0x38e3 /* 337DA8 E0022B68 34428E39 */ ori $v0, $v0, 0x8e39 diff --git a/ver/us/asm/nonmatchings/effects/effect_17/fx_17_main.s b/ver/us/asm/nonmatchings/effects/effect_17/fx_17_main.s index b517ef063b..0a586578e1 100644 --- a/ver/us/asm/nonmatchings/effects/effect_17/fx_17_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_17/fx_17_main.s @@ -70,13 +70,13 @@ glabel fx_17_main /* 337328 E00220E8 24020011 */ addiu $v0, $zero, 0x11 /* 33732C E00220EC AC800000 */ sw $zero, ($a0) /* 337330 E00220F0 AC800014 */ sw $zero, 0x14($a0) -/* 337334 E00220F4 0C080124 */ jal func_E0200490 +/* 337334 E00220F4 0C080124 */ jal shim_create_effect_instance /* 337338 E00220F8 AC820004 */ sw $v0, 4($a0) /* 33733C E00220FC 00122040 */ sll $a0, $s2, 1 /* 337340 E0022100 00922021 */ addu $a0, $a0, $s2 /* 337344 E0022104 00042100 */ sll $a0, $a0, 4 /* 337348 E0022108 0040802D */ daddu $s0, $v0, $zero -/* 33734C E002210C 0C08012C */ jal func_E02004B0 +/* 33734C E002210C 0C08012C */ jal shim_general_heap_malloc /* 337350 E0022110 AE120008 */ sw $s2, 8($s0) /* 337354 E0022114 0040202D */ daddu $a0, $v0, $zero /* 337358 E0022118 14800003 */ bnez $a0, .LE0022128 @@ -111,7 +111,7 @@ glabel fx_17_main /* 3373C4 E0022184 4600018D */ trunc.w.s $f6, $f0 /* 3373C8 E0022188 44163000 */ mfc1 $s6, $f6 .LE002218C: -/* 3373CC E002218C 0C080138 */ jal func_E02004E0 +/* 3373CC E002218C 0C080138 */ jal shim_rand_int /* 3373D0 E0022190 02C0202D */ daddu $a0, $s6, $zero /* 3373D4 E0022194 461CF002 */ mul.s $f0, $f30, $f28 /* 3373D8 E0022198 00000000 */ nop @@ -120,7 +120,7 @@ glabel fx_17_main /* 3373E4 E00221A4 44820000 */ mtc1 $v0, $f0 /* 3373E8 E00221A8 00000000 */ nop /* 3373EC E00221AC 46800020 */ cvt.s.w $f0, $f0 -/* 3373F0 E00221B0 0C080138 */ jal func_E02004E0 +/* 3373F0 E00221B0 0C080138 */ jal shim_rand_int /* 3373F4 E00221B4 461C0503 */ div.s $f20, $f0, $f28 /* 3373F8 E00221B8 44820000 */ mtc1 $v0, $f0 /* 3373FC E00221BC 00000000 */ nop @@ -152,10 +152,10 @@ glabel fx_17_main /* 337464 E0022224 3C0142B4 */ lui $at, 0x42b4 /* 337468 E0022228 44810000 */ mtc1 $at, $f0 /* 33746C E002222C 4600D306 */ mov.s $f12, $f26 -/* 337470 E0022230 0C080140 */ jal func_E0200500 +/* 337470 E0022230 0C080140 */ jal shim_sin_deg /* 337474 E0022234 4600B581 */ sub.s $f22, $f22, $f0 /* 337478 E0022238 46000506 */ mov.s $f20, $f0 -/* 33747C E002223C 0C080140 */ jal func_E0200500 +/* 33747C E002223C 0C080140 */ jal shim_sin_deg /* 337480 E0022240 4600B306 */ mov.s $f12, $f22 /* 337484 E0022244 3C014170 */ lui $at, 0x4170 /* 337488 E0022248 44813000 */ mtc1 $at, $f6 @@ -182,10 +182,10 @@ glabel fx_17_main /* 3374DC E002229C 4606A502 */ mul.s $f20, $f20, $f6 /* 3374E0 E00222A0 00000000 */ nop /* 3374E4 E00222A4 4600D306 */ mov.s $f12, $f26 -/* 3374E8 E00222A8 0C080144 */ jal func_E0200510 +/* 3374E8 E00222A8 0C080144 */ jal shim_cos_deg /* 3374EC E00222AC E614FFF0 */ swc1 $f20, -0x10($s0) /* 3374F0 E00222B0 4600B306 */ mov.s $f12, $f22 -/* 3374F4 E00222B4 0C080140 */ jal func_E0200500 +/* 3374F4 E00222B4 0C080140 */ jal shim_sin_deg /* 3374F8 E00222B8 46000506 */ mov.s $f20, $f0 /* 3374FC E00222BC 3C014170 */ lui $at, 0x4170 /* 337500 E00222C0 44813000 */ mtc1 $at, $f6 @@ -210,7 +210,7 @@ glabel fx_17_main /* 33754C E002230C AE000008 */ sw $zero, 8($s0) /* 337550 E0022310 0800893B */ j .LE00224EC /* 337554 E0022314 E614FFF4 */ swc1 $f20, -0xc($s0) -/* 337558 E0022318 0C080138 */ jal func_E02004E0 +/* 337558 E0022318 0C080138 */ jal shim_rand_int /* 33755C E002231C 24040167 */ addiu $a0, $zero, 0x167 /* 337560 E0022320 44941000 */ mtc1 $s4, $f2 /* 337564 E0022324 00000000 */ nop @@ -229,7 +229,7 @@ glabel fx_17_main /* 337598 E0022358 32220001 */ andi $v0, $s1, 1 /* 33759C E002235C 10400014 */ beqz $v0, .LE00223B0 /* 3375A0 E0022360 46001680 */ add.s $f26, $f2, $f0 -/* 3375A4 E0022364 0C080138 */ jal func_E02004E0 +/* 3375A4 E0022364 0C080138 */ jal shim_rand_int /* 3375A8 E0022368 24040032 */ addiu $a0, $zero, 0x32 /* 3375AC E002236C 3C031062 */ lui $v1, 0x1062 /* 3375B0 E0022370 34634DD3 */ ori $v1, $v1, 0x4dd3 @@ -253,12 +253,12 @@ glabel fx_17_main .LE00223B4: /* 3375F4 E00223B4 4600D306 */ mov.s $f12, $f26 /* 3375F8 E00223B8 AE00FFF0 */ sw $zero, -0x10($s0) -/* 3375FC E00223BC 0C080140 */ jal func_E0200500 +/* 3375FC E00223BC 0C080140 */ jal shim_sin_deg /* 337600 E00223C0 AE00FFF4 */ sw $zero, -0xc($s0) /* 337604 E00223C4 4600A002 */ mul.s $f0, $f20, $f0 /* 337608 E00223C8 00000000 */ nop /* 33760C E00223CC 4600D306 */ mov.s $f12, $f26 -/* 337610 E00223D0 0C080144 */ jal func_E0200510 +/* 337610 E00223D0 0C080144 */ jal shim_cos_deg /* 337614 E00223D4 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 337618 E00223D8 3C035555 */ lui $v1, 0x5555 /* 33761C E00223DC 34635556 */ ori $v1, $v1, 0x5556 @@ -266,7 +266,7 @@ glabel fx_17_main /* 337624 E00223E4 0800892B */ j .LE00224AC /* 337628 E00223E8 2662001E */ addiu $v0, $s3, 0x1e .LE00223EC: -/* 33762C E00223EC 0C080138 */ jal func_E02004E0 +/* 33762C E00223EC 0C080138 */ jal shim_rand_int /* 337630 E00223F0 24040167 */ addiu $a0, $zero, 0x167 /* 337634 E00223F4 44941000 */ mtc1 $s4, $f2 /* 337638 E00223F8 00000000 */ nop @@ -283,7 +283,7 @@ glabel fx_17_main /* 337664 E0022424 44820000 */ mtc1 $v0, $f0 /* 337668 E0022428 00000000 */ nop /* 33766C E002242C 46800020 */ cvt.s.w $f0, $f0 -/* 337670 E0022430 0C080138 */ jal func_E02004E0 +/* 337670 E0022430 0C080138 */ jal shim_rand_int /* 337674 E0022434 46001680 */ add.s $f26, $f2, $f0 /* 337678 E0022438 3C031062 */ lui $v1, 0x1062 /* 33767C E002243C 34634DD3 */ ori $v1, $v1, 0x4dd3 @@ -303,12 +303,12 @@ glabel fx_17_main /* 3376B4 E0022474 4600D306 */ mov.s $f12, $f26 /* 3376B8 E0022478 46200007 */ neg.d $f0, $f0 /* 3376BC E002247C 46200020 */ cvt.s.d $f0, $f0 -/* 3376C0 E0022480 0C080140 */ jal func_E0200500 +/* 3376C0 E0022480 0C080140 */ jal shim_sin_deg /* 3376C4 E0022484 E600FFF8 */ swc1 $f0, -8($s0) /* 3376C8 E0022488 4600A002 */ mul.s $f0, $f20, $f0 /* 3376CC E002248C 00000000 */ nop /* 3376D0 E0022490 4600D306 */ mov.s $f12, $f26 -/* 3376D4 E0022494 0C080144 */ jal func_E0200510 +/* 3376D4 E0022494 0C080144 */ jal shim_cos_deg /* 3376D8 E0022498 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 3376DC E002249C 3C035555 */ lui $v1, 0x5555 /* 3376E0 E00224A0 34635556 */ ori $v1, $v1, 0x5556 diff --git a/ver/us/asm/nonmatchings/effects/effect_18/func_E0024188.s b/ver/us/asm/nonmatchings/effects/effect_18/func_E0024188.s index 8cb966e85a..d8ae668981 100644 --- a/ver/us/asm/nonmatchings/effects/effect_18/func_E0024188.s +++ b/ver/us/asm/nonmatchings/effects/effect_18/func_E0024188.s @@ -23,7 +23,7 @@ glabel func_E0024188 /* 33941C E00241CC 24420001 */ addiu $v0, $v0, 1 /* 339420 E00241D0 04610005 */ bgez $v1, .LE00241E8 /* 339424 E00241D4 AE02002C */ sw $v0, 0x2c($s0) -/* 339428 E00241D8 0C080128 */ jal func_E02004A0 +/* 339428 E00241D8 0C080128 */ jal shim_remove_effect /* 33942C E00241DC 00000000 */ nop /* 339430 E00241E0 080090B3 */ j .LE00242CC /* 339434 E00241E4 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_18/func_E00242E0.s b/ver/us/asm/nonmatchings/effects/effect_18/func_E00242E0.s index 0306b1996a..7ad92bb563 100644 --- a/ver/us/asm/nonmatchings/effects/effect_18/func_E00242E0.s +++ b/ver/us/asm/nonmatchings/effects/effect_18/func_E00242E0.s @@ -11,7 +11,7 @@ glabel func_E00242E0 /* 339548 E00242F8 27A40010 */ addiu $a0, $sp, 0x10 /* 33954C E00242FC AFBF0020 */ sw $ra, 0x20($sp) /* 339550 E0024300 AFA00014 */ sw $zero, 0x14($sp) -/* 339554 E0024304 0C080120 */ jal func_E0200480 +/* 339554 E0024304 0C080120 */ jal shim_queue_render_task /* 339558 E0024308 AFA20010 */ sw $v0, 0x10($sp) /* 33955C E002430C 8C430000 */ lw $v1, ($v0) /* 339560 E0024310 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_18/func_E0024324.s b/ver/us/asm/nonmatchings/effects/effect_18/func_E0024324.s index 523f7997dc..ba90d09bed 100644 --- a/ver/us/asm/nonmatchings/effects/effect_18/func_E0024324.s +++ b/ver/us/asm/nonmatchings/effects/effect_18/func_E0024324.s @@ -13,7 +13,7 @@ glabel func_E0024324 /* 339594 E0024344 44826000 */ mtc1 $v0, $f12 /* 339598 E0024348 00000000 */ nop /* 33959C E002434C 46806320 */ cvt.s.w $f12, $f12 -/* 3395A0 E0024350 0C080140 */ jal func_E0200500 +/* 3395A0 E0024350 0C080140 */ jal shim_sin_deg /* 3395A4 E0024354 0080802D */ daddu $s0, $a0, $zero /* 3395A8 E0024358 240200FF */ addiu $v0, $zero, 0xff /* 3395AC E002435C 00501023 */ subu $v0, $v0, $s0 diff --git a/ver/us/asm/nonmatchings/effects/effect_18/func_E00243BC.s b/ver/us/asm/nonmatchings/effects/effect_18/func_E00243BC.s index f573f26174..b184c5bd52 100644 --- a/ver/us/asm/nonmatchings/effects/effect_18/func_E00243BC.s +++ b/ver/us/asm/nonmatchings/effects/effect_18/func_E00243BC.s @@ -14,7 +14,7 @@ glabel func_E00243BC /* 339630 E00243E0 44826000 */ mtc1 $v0, $f12 /* 339634 E00243E4 00000000 */ nop /* 339638 E00243E8 46806320 */ cvt.s.w $f12, $f12 -/* 33963C E00243EC 0C080140 */ jal func_E0200500 +/* 33963C E00243EC 0C080140 */ jal shim_sin_deg /* 339640 E00243F0 0080802D */ daddu $s0, $a0, $zero /* 339644 E00243F4 00101023 */ negu $v0, $s0 /* 339648 E00243F8 44821000 */ mtc1 $v0, $f2 diff --git a/ver/us/asm/nonmatchings/effects/effect_18/func_E0024454.s b/ver/us/asm/nonmatchings/effects/effect_18/func_E0024454.s index 7387940276..6fc282018d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_18/func_E0024454.s +++ b/ver/us/asm/nonmatchings/effects/effect_18/func_E0024454.s @@ -176,7 +176,7 @@ glabel func_E0024454 /* 339938 E00246E8 C7A40088 */ lwc1 $f4, 0x88($sp) /* 33993C E00246EC 27A40020 */ addiu $a0, $sp, 0x20 /* 339940 E00246F0 E7BA0014 */ swc1 $f26, 0x14($sp) -/* 339944 E00246F4 0C080180 */ jal func_E0200600 +/* 339944 E00246F4 0C080180 */ jal shim_guPositionF /* 339948 E00246F8 E7A4001C */ swc1 $f4, 0x1c($sp) /* 33994C E00246FC 27A40020 */ addiu $a0, $sp, 0x20 /* 339950 E0024700 97C50000 */ lhu $a1, ($fp) @@ -185,7 +185,7 @@ glabel func_E0024454 /* 33995C E002470C 8FA8008C */ lw $t0, 0x8c($sp) /* 339960 E0024710 00052980 */ sll $a1, $a1, 6 /* 339964 E0024714 00A82821 */ addu $a1, $a1, $t0 -/* 339968 E0024718 0C080118 */ jal func_E0200460 +/* 339968 E0024718 0C080118 */ jal shim_guMtxF2L /* 33996C E002471C 00452821 */ addu $a1, $v0, $a1 /* 339970 E0024720 8EA20000 */ lw $v0, ($s5) /* 339974 E0024724 4600B306 */ mov.s $f12, $f22 @@ -204,11 +204,11 @@ glabel func_E0024454 /* 3399A8 E0024758 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 3399AC E002475C 00481021 */ addu $v0, $v0, $t0 /* 3399B0 E0024760 00621821 */ addu $v1, $v1, $v0 -/* 3399B4 E0024764 0C080140 */ jal func_E0200500 +/* 3399B4 E0024764 0C080140 */ jal shim_sin_deg /* 3399B8 E0024768 AC830004 */ sw $v1, 4($a0) /* 3399BC E002476C 46180502 */ mul.s $f20, $f0, $f24 /* 3399C0 E0024770 00000000 */ nop -/* 3399C4 E0024774 0C080144 */ jal func_E0200510 +/* 3399C4 E0024774 0C080144 */ jal shim_cos_deg /* 3399C8 E0024778 4600B306 */ mov.s $f12, $f22 /* 3399CC E002477C 46180002 */ mul.s $f0, $f0, $f24 /* 3399D0 E0024780 00000000 */ nop @@ -218,7 +218,7 @@ glabel func_E0024454 /* 3399E0 E0024790 44812000 */ mtc1 $at, $f4 /* 3399E4 E0024794 44060000 */ mfc1 $a2, $f0 /* 3399E8 E0024798 4405A000 */ mfc1 $a1, $f20 -/* 3399EC E002479C 0C080108 */ jal func_E0200420 +/* 3399EC E002479C 0C080108 */ jal shim_guTranslateF /* 3399F0 E00247A0 4604B580 */ add.s $f22, $f22, $f4 /* 3399F4 E00247A4 27A40020 */ addiu $a0, $sp, 0x20 /* 3399F8 E00247A8 97C30000 */ lhu $v1, ($fp) @@ -231,13 +231,13 @@ glabel func_E0024454 /* 339A14 E00247C4 00A22821 */ addu $a1, $a1, $v0 /* 339A18 E00247C8 24630001 */ addiu $v1, $v1, 1 /* 339A1C E00247CC A7C30000 */ sh $v1, ($fp) -/* 339A20 E00247D0 0C080118 */ jal func_E0200460 +/* 339A20 E00247D0 0C080118 */ jal shim_guMtxF2L /* 339A24 E00247D4 AFA50060 */ sw $a1, 0x60($sp) -/* 339A28 E00247D8 0C080140 */ jal func_E0200500 +/* 339A28 E00247D8 0C080140 */ jal shim_sin_deg /* 339A2C E00247DC 4600B306 */ mov.s $f12, $f22 /* 339A30 E00247E0 46180502 */ mul.s $f20, $f0, $f24 /* 339A34 E00247E4 00000000 */ nop -/* 339A38 E00247E8 0C080144 */ jal func_E0200510 +/* 339A38 E00247E8 0C080144 */ jal shim_cos_deg /* 339A3C E00247EC 4600B306 */ mov.s $f12, $f22 /* 339A40 E00247F0 46180002 */ mul.s $f0, $f0, $f24 /* 339A44 E00247F4 00000000 */ nop @@ -247,7 +247,7 @@ glabel func_E0024454 /* 339A54 E0024804 44812000 */ mtc1 $at, $f4 /* 339A58 E0024808 44060000 */ mfc1 $a2, $f0 /* 339A5C E002480C 4405A000 */ mfc1 $a1, $f20 -/* 339A60 E0024810 0C080108 */ jal func_E0200420 +/* 339A60 E0024810 0C080108 */ jal shim_guTranslateF /* 339A64 E0024814 4604B580 */ add.s $f22, $f22, $f4 /* 339A68 E0024818 27A40020 */ addiu $a0, $sp, 0x20 /* 339A6C E002481C 97C30000 */ lhu $v1, ($fp) @@ -260,13 +260,13 @@ glabel func_E0024454 /* 339A88 E0024838 00A22821 */ addu $a1, $a1, $v0 /* 339A8C E002483C 24630001 */ addiu $v1, $v1, 1 /* 339A90 E0024840 A7C30000 */ sh $v1, ($fp) -/* 339A94 E0024844 0C080118 */ jal func_E0200460 +/* 339A94 E0024844 0C080118 */ jal shim_guMtxF2L /* 339A98 E0024848 AFA50064 */ sw $a1, 0x64($sp) -/* 339A9C E002484C 0C080140 */ jal func_E0200500 +/* 339A9C E002484C 0C080140 */ jal shim_sin_deg /* 339AA0 E0024850 4600B306 */ mov.s $f12, $f22 /* 339AA4 E0024854 46180502 */ mul.s $f20, $f0, $f24 /* 339AA8 E0024858 00000000 */ nop -/* 339AAC E002485C 0C080144 */ jal func_E0200510 +/* 339AAC E002485C 0C080144 */ jal shim_cos_deg /* 339AB0 E0024860 4600B306 */ mov.s $f12, $f22 /* 339AB4 E0024864 46180002 */ mul.s $f0, $f0, $f24 /* 339AB8 E0024868 00000000 */ nop @@ -276,7 +276,7 @@ glabel func_E0024454 /* 339AC8 E0024878 4407E000 */ mfc1 $a3, $f28 /* 339ACC E002487C 44060000 */ mfc1 $a2, $f0 /* 339AD0 E0024880 4405A000 */ mfc1 $a1, $f20 -/* 339AD4 E0024884 0C080108 */ jal func_E0200420 +/* 339AD4 E0024884 0C080108 */ jal shim_guTranslateF /* 339AD8 E0024888 27A40020 */ addiu $a0, $sp, 0x20 /* 339ADC E002488C 27A40020 */ addiu $a0, $sp, 0x20 /* 339AE0 E0024890 97C30000 */ lhu $v1, ($fp) @@ -289,7 +289,7 @@ glabel func_E0024454 /* 339AFC E00248AC 00A22821 */ addu $a1, $a1, $v0 /* 339B00 E00248B0 24630001 */ addiu $v1, $v1, 1 /* 339B04 E00248B4 A7C30000 */ sh $v1, ($fp) -/* 339B08 E00248B8 0C080118 */ jal func_E0200460 +/* 339B08 E00248B8 0C080118 */ jal shim_guMtxF2L /* 339B0C E00248BC AFA50068 */ sw $a1, 0x68($sp) .LE00248C0: /* 339B10 E00248C0 8EB20000 */ lw $s2, ($s5) @@ -441,7 +441,7 @@ glabel func_E0024454 /* 339D48 E0024AF8 E7A00018 */ swc1 $f0, 0x18($sp) /* 339D4C E0024AFC C6C0000C */ lwc1 $f0, 0xc($s6) /* 339D50 E0024B00 36101630 */ ori $s0, $s0, 0x1630 -/* 339D54 E0024B04 0C080180 */ jal func_E0200600 +/* 339D54 E0024B04 0C080180 */ jal shim_guPositionF /* 339D58 E0024B08 E7A0001C */ swc1 $f0, 0x1c($sp) /* 339D5C E0024B0C 27A40020 */ addiu $a0, $sp, 0x20 /* 339D60 E0024B10 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -452,7 +452,7 @@ glabel func_E0024454 /* 339D74 E0024B24 8E620000 */ lw $v0, ($s3) /* 339D78 E0024B28 00052980 */ sll $a1, $a1, 6 /* 339D7C E0024B2C 00B02821 */ addu $a1, $a1, $s0 -/* 339D80 E0024B30 0C080118 */ jal func_E0200460 +/* 339D80 E0024B30 0C080118 */ jal shim_guMtxF2L /* 339D84 E0024B34 00452821 */ addu $a1, $v0, $a1 /* 339D88 E0024B38 3C12800A */ lui $s2, %hi(gMasterGfxPos) /* 339D8C E0024B3C 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) @@ -486,7 +486,7 @@ glabel func_E0024454 /* 339DF8 E0024BA8 4406A000 */ mfc1 $a2, $f20 /* 339DFC E0024BAC 0000B82D */ daddu $s7, $zero, $zero /* 339E00 E0024BB0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 339E04 E0024BB4 0C080104 */ jal func_E0200410 +/* 339E04 E0024BB4 0C080104 */ jal shim_guRotateF /* 339E08 E0024BB8 00C0382D */ daddu $a3, $a2, $zero /* 339E0C E0024BBC 27A40020 */ addiu $a0, $sp, 0x20 /* 339E10 E0024BC0 96220000 */ lhu $v0, ($s1) @@ -497,7 +497,7 @@ glabel func_E0024454 /* 339E24 E0024BD4 00A38021 */ addu $s0, $a1, $v1 /* 339E28 E0024BD8 0200282D */ daddu $a1, $s0, $zero /* 339E2C E0024BDC 24420001 */ addiu $v0, $v0, 1 -/* 339E30 E0024BE0 0C080118 */ jal func_E0200460 +/* 339E30 E0024BE0 0C080118 */ jal shim_guMtxF2L /* 339E34 E0024BE4 A6220000 */ sh $v0, ($s1) /* 339E38 E0024BE8 0240202D */ daddu $a0, $s2, $zero /* 339E3C E0024BEC 3C05DA38 */ lui $a1, 0xda38 diff --git a/ver/us/asm/nonmatchings/effects/effect_18/fx_18_main.s b/ver/us/asm/nonmatchings/effects/effect_18/fx_18_main.s index 2c2f3b54ff..86b1a78137 100644 --- a/ver/us/asm/nonmatchings/effects/effect_18/fx_18_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_18/fx_18_main.s @@ -28,12 +28,12 @@ glabel fx_18_main /* 3392AC E002405C AFB00028 */ sw $s0, 0x28($sp) /* 3392B0 E0024060 AFA00010 */ sw $zero, 0x10($sp) /* 3392B4 E0024064 AFA00024 */ sw $zero, 0x24($sp) -/* 3392B8 E0024068 0C080124 */ jal func_E0200490 +/* 3392B8 E0024068 0C080124 */ jal shim_create_effect_instance /* 3392BC E002406C AFA20014 */ sw $v0, 0x14($sp) /* 3392C0 E0024070 24040038 */ addiu $a0, $zero, 0x38 /* 3392C4 E0024074 24030001 */ addiu $v1, $zero, 1 /* 3392C8 E0024078 0040802D */ daddu $s0, $v0, $zero -/* 3392CC E002407C 0C08012C */ jal func_E02004B0 +/* 3392CC E002407C 0C08012C */ jal shim_general_heap_malloc /* 3392D0 E0024080 AE030008 */ sw $v1, 8($s0) /* 3392D4 E0024084 0040182D */ daddu $v1, $v0, $zero /* 3392D8 E0024088 14600003 */ bnez $v1, .LE0024098 diff --git a/ver/us/asm/nonmatchings/effects/effect_19/func_E002618C.s b/ver/us/asm/nonmatchings/effects/effect_19/func_E002618C.s index 8578c76d79..38c8680b07 100644 --- a/ver/us/asm/nonmatchings/effects/effect_19/func_E002618C.s +++ b/ver/us/asm/nonmatchings/effects/effect_19/func_E002618C.s @@ -17,7 +17,7 @@ glabel func_E002618C /* 33B33C E00261BC 24440001 */ addiu $a0, $v0, 1 /* 33B340 E00261C0 04610005 */ bgez $v1, .LE00261D8 /* 33B344 E00261C4 AE04002C */ sw $a0, 0x2c($s0) -/* 33B348 E00261C8 0C080128 */ jal func_E02004A0 +/* 33B348 E00261C8 0C080128 */ jal shim_remove_effect /* 33B34C E00261CC 0220202D */ daddu $a0, $s1, $zero /* 33B350 E00261D0 08009926 */ j .LE0026498 /* 33B354 E00261D4 00000000 */ nop @@ -71,7 +71,7 @@ glabel func_E002618C /* 33B404 E0026284 00021040 */ sll $v0, $v0, 1 /* 33B408 E0026288 44826000 */ mtc1 $v0, $f12 /* 33B40C E002628C 00000000 */ nop -/* 33B410 E0026290 0C080140 */ jal func_E0200500 +/* 33B410 E0026290 0C080140 */ jal shim_sin_deg /* 33B414 E0026294 46806320 */ cvt.s.w $f12, $f12 /* 33B418 E0026298 3C01E002 */ lui $at, %hi(D_E0026A30) /* 33B41C E002629C D4226A30 */ ldc1 $f2, %lo(D_E0026A30)($at) @@ -94,7 +94,7 @@ glabel func_E002618C /* 33B45C E00262DC 00021040 */ sll $v0, $v0, 1 /* 33B460 E00262E0 44826000 */ mtc1 $v0, $f12 /* 33B464 E00262E4 00000000 */ nop -/* 33B468 E00262E8 0C080140 */ jal func_E0200500 +/* 33B468 E00262E8 0C080140 */ jal shim_sin_deg /* 33B46C E00262EC 46806320 */ cvt.s.w $f12, $f12 /* 33B470 E00262F0 3C01E002 */ lui $at, %hi(D_E0026A40) /* 33B474 E00262F4 D4226A40 */ ldc1 $f2, %lo(D_E0026A40)($at) @@ -142,7 +142,7 @@ glabel func_E002618C /* 33B518 E0026398 8E050004 */ lw $a1, 4($s0) /* 33B51C E002639C 8E060008 */ lw $a2, 8($s0) /* 33B520 E00263A0 8E07000C */ lw $a3, 0xc($s0) -/* 33B524 E00263A4 0C080168 */ jal func_E02005A0 +/* 33B524 E00263A4 0C080168 */ jal shim_transform_point /* 33B528 E00263A8 00822021 */ addu $a0, $a0, $v0 /* 33B52C E00263AC C7A00034 */ lwc1 $f0, 0x34($sp) /* 33B530 E00263B0 C7A40028 */ lwc1 $f4, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_19/func_E00264B0.s b/ver/us/asm/nonmatchings/effects/effect_19/func_E00264B0.s index 845fec8eb6..552b555ad4 100644 --- a/ver/us/asm/nonmatchings/effects/effect_19/func_E00264B0.s +++ b/ver/us/asm/nonmatchings/effects/effect_19/func_E00264B0.s @@ -11,7 +11,7 @@ glabel func_E00264B0 /* 33B648 E00264C8 27A40010 */ addiu $a0, $sp, 0x10 /* 33B64C E00264CC AFBF0020 */ sw $ra, 0x20($sp) /* 33B650 E00264D0 AFA00014 */ sw $zero, 0x14($sp) -/* 33B654 E00264D4 0C080120 */ jal func_E0200480 +/* 33B654 E00264D4 0C080120 */ jal shim_queue_render_task /* 33B658 E00264D8 AFA20010 */ sw $v0, 0x10($sp) /* 33B65C E00264DC 8C430000 */ lw $v1, ($v0) /* 33B660 E00264E0 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_19/func_E00264F4.s b/ver/us/asm/nonmatchings/effects/effect_19/func_E00264F4.s index ee7170d8df..1564d86896 100644 --- a/ver/us/asm/nonmatchings/effects/effect_19/func_E00264F4.s +++ b/ver/us/asm/nonmatchings/effects/effect_19/func_E00264F4.s @@ -63,7 +63,7 @@ glabel func_E00264F4 /* 33B75C E00265DC 000218C0 */ sll $v1, $v0, 3 /* 33B760 E00265E0 00431021 */ addu $v0, $v0, $v1 /* 33B764 E00265E4 000210C0 */ sll $v0, $v0, 3 -/* 33B768 E00265E8 0C080108 */ jal func_E0200420 +/* 33B768 E00265E8 0C080108 */ jal shim_guTranslateF /* 33B76C E00265EC 00488821 */ addu $s1, $v0, $t0 /* 33B770 E00265F0 27B00060 */ addiu $s0, $sp, 0x60 /* 33B774 E00265F4 0200202D */ daddu $a0, $s0, $zero @@ -71,11 +71,11 @@ glabel func_E00264F4 /* 33B77C E00265FC 4481A000 */ mtc1 $at, $f20 /* 33B780 E0026600 8E65001C */ lw $a1, 0x1c($s3) /* 33B784 E0026604 4407A000 */ mfc1 $a3, $f20 -/* 33B788 E0026608 0C080110 */ jal func_E0200440 +/* 33B788 E0026608 0C080110 */ jal shim_guScaleF /* 33B78C E002660C 00A0302D */ daddu $a2, $a1, $zero /* 33B790 E0026610 0200202D */ daddu $a0, $s0, $zero /* 33B794 E0026614 27A50020 */ addiu $a1, $sp, 0x20 -/* 33B798 E0026618 0C080114 */ jal func_E0200450 +/* 33B798 E0026618 0C080114 */ jal shim_guMtxCatF /* 33B79C E002661C 00A0302D */ daddu $a2, $a1, $zero /* 33B7A0 E0026620 24160001 */ addiu $s6, $zero, 1 /* 33B7A4 E0026624 3C0141F0 */ lui $at, 0x41f0 @@ -105,11 +105,11 @@ glabel func_E00264F4 /* 33B800 E0026680 36521630 */ ori $s2, $s2, 0x1630 /* 33B804 E0026684 E7B40018 */ swc1 $f20, 0x18($sp) /* 33B808 E0026688 E7A20010 */ swc1 $f2, 0x10($sp) -/* 33B80C E002668C 0C080160 */ jal func_E0200580 +/* 33B80C E002668C 0C080160 */ jal shim_guPerspectiveF /* 33B810 E0026690 E7A40014 */ swc1 $f4, 0x14($sp) /* 33B814 E0026694 0200202D */ daddu $a0, $s0, $zero /* 33B818 E0026698 27A50020 */ addiu $a1, $sp, 0x20 -/* 33B81C E002669C 0C080114 */ jal func_E0200450 +/* 33B81C E002669C 0C080114 */ jal shim_guMtxCatF /* 33B820 E00266A0 00A0302D */ daddu $a2, $a1, $zero /* 33B824 E00266A4 27A40020 */ addiu $a0, $sp, 0x20 /* 33B828 E00266A8 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -120,7 +120,7 @@ glabel func_E00264F4 /* 33B83C E00266BC 8E220000 */ lw $v0, ($s1) /* 33B840 E00266C0 00052980 */ sll $a1, $a1, 6 /* 33B844 E00266C4 00B22821 */ addu $a1, $a1, $s2 -/* 33B848 E00266C8 0C080118 */ jal func_E0200460 +/* 33B848 E00266C8 0C080118 */ jal shim_guMtxF2L /* 33B84C E00266CC 00452821 */ addu $a1, $v0, $a1 /* 33B850 E00266D0 3C04DA38 */ lui $a0, 0xda38 /* 33B854 E00266D4 34840007 */ ori $a0, $a0, 7 @@ -153,7 +153,7 @@ glabel func_E00264F4 /* 33B8BC E002673C 44050000 */ mfc1 $a1, $f0 /* 33B8C0 E0026740 3C07C2A0 */ lui $a3, 0xc2a0 .LE0026744: -/* 33B8C4 E0026744 0C080108 */ jal func_E0200420 +/* 33B8C4 E0026744 0C080108 */ jal shim_guTranslateF /* 33B8C8 E0026748 00A0302D */ daddu $a2, $a1, $zero /* 33B8CC E002674C 3C120001 */ lui $s2, 1 .LE0026750: @@ -167,7 +167,7 @@ glabel func_E00264F4 /* 33B8EC E002676C 8E220000 */ lw $v0, ($s1) /* 33B8F0 E0026770 00052980 */ sll $a1, $a1, 6 /* 33B8F4 E0026774 00B22821 */ addu $a1, $a1, $s2 -/* 33B8F8 E0026778 0C080118 */ jal func_E0200460 +/* 33B8F8 E0026778 0C080118 */ jal shim_guMtxF2L /* 33B8FC E002677C 00452821 */ addu $a1, $v0, $a1 /* 33B900 E0026780 3C03DA38 */ lui $v1, 0xda38 /* 33B904 E0026784 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_19/fx_19_main.s b/ver/us/asm/nonmatchings/effects/effect_19/fx_19_main.s index 0d85c34282..263eac4058 100644 --- a/ver/us/asm/nonmatchings/effects/effect_19/fx_19_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_19/fx_19_main.s @@ -28,12 +28,12 @@ glabel fx_19_main /* 33B1DC E002605C AFB00028 */ sw $s0, 0x28($sp) /* 33B1E0 E0026060 AFA00010 */ sw $zero, 0x10($sp) /* 33B1E4 E0026064 AFA00024 */ sw $zero, 0x24($sp) -/* 33B1E8 E0026068 0C080124 */ jal func_E0200490 +/* 33B1E8 E0026068 0C080124 */ jal shim_create_effect_instance /* 33B1EC E002606C AFA20014 */ sw $v0, 0x14($sp) /* 33B1F0 E0026070 24040060 */ addiu $a0, $zero, 0x60 /* 33B1F4 E0026074 24030001 */ addiu $v1, $zero, 1 /* 33B1F8 E0026078 0040802D */ daddu $s0, $v0, $zero -/* 33B1FC E002607C 0C08012C */ jal func_E02004B0 +/* 33B1FC E002607C 0C08012C */ jal shim_general_heap_malloc /* 33B200 E0026080 AE030008 */ sw $v1, 8($s0) /* 33B204 E0026084 AE02000C */ sw $v0, 0xc($s0) /* 33B208 E0026088 0040802D */ daddu $s0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/effects/effect_20/func_E0028248.s b/ver/us/asm/nonmatchings/effects/effect_20/func_E0028248.s index 5cba438879..70525a344c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_20/func_E0028248.s +++ b/ver/us/asm/nonmatchings/effects/effect_20/func_E0028248.s @@ -21,7 +21,7 @@ glabel func_E0028248 /* 33D078 E0028288 24A20001 */ addiu $v0, $a1, 1 /* 33D07C E002828C 04C10005 */ bgez $a2, .LE00282A4 /* 33D080 E0028290 AC82002C */ sw $v0, 0x2c($a0) -/* 33D084 E0028294 0C080128 */ jal func_E02004A0 +/* 33D084 E0028294 0C080128 */ jal shim_remove_effect /* 33D088 E0028298 0260202D */ daddu $a0, $s3, $zero /* 33D08C E002829C 0800A130 */ j .LE00284C0 /* 33D090 E00282A0 00000000 */ nop @@ -72,7 +72,7 @@ glabel func_E0028248 /* 33D138 E0028348 4481A000 */ mtc1 $at, $f20 .LE002834C: /* 33D13C E002834C C60C0010 */ lwc1 $f12, 0x10($s0) -/* 33D140 E0028350 0C080140 */ jal func_E0200500 +/* 33D140 E0028350 0C080140 */ jal shim_sin_deg /* 33D144 E0028354 460C6300 */ add.s $f12, $f12, $f12 /* 33D148 E0028358 3C01E003 */ lui $at, %hi(D_E00287F0) /* 33D14C E002835C D42287F0 */ ldc1 $f2, %lo(D_E00287F0)($at) @@ -94,7 +94,7 @@ glabel func_E0028248 /* 33D18C E002839C 00000000 */ nop /* 33D190 E00283A0 C60C0010 */ lwc1 $f12, 0x10($s0) /* 33D194 E00283A4 46200020 */ cvt.s.d $f0, $f0 -/* 33D198 E00283A8 0C080140 */ jal func_E0200500 +/* 33D198 E00283A8 0C080140 */ jal shim_sin_deg /* 33D19C E00283AC E6000008 */ swc1 $f0, 8($s0) /* 33D1A0 E00283B0 3C01E003 */ lui $at, %hi(D_E0028800) /* 33D1A4 E00283B4 D4228800 */ ldc1 $f2, %lo(D_E0028800)($at) @@ -133,7 +133,7 @@ glabel func_E0028248 /* 33D220 E0028430 00000000 */ nop /* 33D224 E0028434 46800020 */ cvt.s.w $f0, $f0 /* 33D228 E0028438 46006300 */ add.s $f12, $f12, $f0 -/* 33D22C E002843C 0C080140 */ jal func_E0200500 +/* 33D22C E002843C 0C080140 */ jal shim_sin_deg /* 33D230 E0028440 E60C0014 */ swc1 $f12, 0x14($s0) /* 33D234 E0028444 46140002 */ mul.s $f0, $f0, $f20 /* 33D238 E0028448 00000000 */ nop @@ -145,7 +145,7 @@ glabel func_E0028248 /* 33D250 E0028460 00000000 */ nop /* 33D254 E0028464 C6020010 */ lwc1 $f2, 0x10($s0) /* 33D258 E0028468 46001080 */ add.s $f2, $f2, $f0 -/* 33D25C E002846C 0C080144 */ jal func_E0200510 +/* 33D25C E002846C 0C080144 */ jal shim_cos_deg /* 33D260 E0028470 E6020010 */ swc1 $f2, 0x10($s0) /* 33D264 E0028474 46140002 */ mul.s $f0, $f0, $f20 /* 33D268 E0028478 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_20/func_E00284E8.s b/ver/us/asm/nonmatchings/effects/effect_20/func_E00284E8.s index 58db5824a9..63e3b131fe 100644 --- a/ver/us/asm/nonmatchings/effects/effect_20/func_E00284E8.s +++ b/ver/us/asm/nonmatchings/effects/effect_20/func_E00284E8.s @@ -11,7 +11,7 @@ glabel func_E00284E8 /* 33D2F0 E0028500 27A40010 */ addiu $a0, $sp, 0x10 /* 33D2F4 E0028504 AFBF0020 */ sw $ra, 0x20($sp) /* 33D2F8 E0028508 AFA00014 */ sw $zero, 0x14($sp) -/* 33D2FC E002850C 0C080120 */ jal func_E0200480 +/* 33D2FC E002850C 0C080120 */ jal shim_queue_render_task /* 33D300 E0028510 AFA20010 */ sw $v0, 0x10($sp) /* 33D304 E0028514 8C430000 */ lw $v1, ($v0) /* 33D308 E0028518 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_20/func_E002852C.s b/ver/us/asm/nonmatchings/effects/effect_20/func_E002852C.s index ccd8a38a94..4af1c69a33 100644 --- a/ver/us/asm/nonmatchings/effects/effect_20/func_E002852C.s +++ b/ver/us/asm/nonmatchings/effects/effect_20/func_E002852C.s @@ -50,7 +50,7 @@ glabel func_E002852C /* 33D3D0 E00285E0 8E050004 */ lw $a1, 4($s0) /* 33D3D4 E00285E4 8E060008 */ lw $a2, 8($s0) /* 33D3D8 E00285E8 8E07000C */ lw $a3, 0xc($s0) -/* 33D3DC E00285EC 0C080108 */ jal func_E0200420 +/* 33D3DC E00285EC 0C080108 */ jal shim_guTranslateF /* 33D3E0 E00285F0 27A40018 */ addiu $a0, $sp, 0x18 /* 33D3E4 E00285F4 27B10058 */ addiu $s1, $sp, 0x58 /* 33D3E8 E00285F8 4480A000 */ mtc1 $zero, $f20 @@ -73,11 +73,11 @@ glabel func_E002852C /* 33D42C E002863C 46000007 */ neg.s $f0, $f0 /* 33D430 E0028640 44050000 */ mfc1 $a1, $f0 /* 33D434 E0028644 0220202D */ daddu $a0, $s1, $zero -/* 33D438 E0028648 0C080104 */ jal func_E0200410 +/* 33D438 E0028648 0C080104 */ jal shim_guRotateF /* 33D43C E002864C E7B40010 */ swc1 $f20, 0x10($sp) /* 33D440 E0028650 0220202D */ daddu $a0, $s1, $zero /* 33D444 E0028654 27A50018 */ addiu $a1, $sp, 0x18 -/* 33D448 E0028658 0C080114 */ jal func_E0200450 +/* 33D448 E0028658 0C080114 */ jal shim_guMtxCatF /* 33D44C E002865C 27A60098 */ addiu $a2, $sp, 0x98 /* 33D450 E0028660 8EE20008 */ lw $v0, 8($s7) /* 33D454 E0028664 0242102A */ slt $v0, $s2, $v0 @@ -95,39 +95,39 @@ glabel func_E002852C /* 33D480 E0028690 8E05FFE4 */ lw $a1, -0x1c($s0) /* 33D484 E0028694 8E06FFE8 */ lw $a2, -0x18($s0) /* 33D488 E0028698 8E07FFEC */ lw $a3, -0x14($s0) -/* 33D48C E002869C 0C080108 */ jal func_E0200420 +/* 33D48C E002869C 0C080108 */ jal shim_guTranslateF /* 33D490 E00286A0 26520001 */ addiu $s2, $s2, 1 /* 33D494 E00286A4 0220202D */ daddu $a0, $s1, $zero /* 33D498 E00286A8 27A50098 */ addiu $a1, $sp, 0x98 -/* 33D49C E00286AC 0C080114 */ jal func_E0200450 +/* 33D49C E00286AC 0C080114 */ jal shim_guMtxCatF /* 33D4A0 E00286B0 27A60018 */ addiu $a2, $sp, 0x18 /* 33D4A4 E00286B4 E7B60010 */ swc1 $f22, 0x10($sp) /* 33D4A8 E00286B8 8E05FFF8 */ lw $a1, -8($s0) /* 33D4AC E00286BC 4406A000 */ mfc1 $a2, $f20 /* 33D4B0 E00286C0 4407A000 */ mfc1 $a3, $f20 -/* 33D4B4 E00286C4 0C080104 */ jal func_E0200410 +/* 33D4B4 E00286C4 0C080104 */ jal shim_guRotateF /* 33D4B8 E00286C8 0220202D */ daddu $a0, $s1, $zero /* 33D4BC E00286CC 0220202D */ daddu $a0, $s1, $zero /* 33D4C0 E00286D0 27A50018 */ addiu $a1, $sp, 0x18 -/* 33D4C4 E00286D4 0C080114 */ jal func_E0200450 +/* 33D4C4 E00286D4 0C080114 */ jal shim_guMtxCatF /* 33D4C8 E00286D8 00A0302D */ daddu $a2, $a1, $zero /* 33D4CC E00286DC 0220202D */ daddu $a0, $s1, $zero /* 33D4D0 E00286E0 E7B40010 */ swc1 $f20, 0x10($sp) /* 33D4D4 E00286E4 8E050000 */ lw $a1, ($s0) /* 33D4D8 E00286E8 4406A000 */ mfc1 $a2, $f20 /* 33D4DC E00286EC 4407B000 */ mfc1 $a3, $f22 -/* 33D4E0 E00286F0 0C080104 */ jal func_E0200410 +/* 33D4E0 E00286F0 0C080104 */ jal shim_guRotateF /* 33D4E4 E00286F4 26100030 */ addiu $s0, $s0, 0x30 /* 33D4E8 E00286F8 0220202D */ daddu $a0, $s1, $zero /* 33D4EC E00286FC 27A50018 */ addiu $a1, $sp, 0x18 -/* 33D4F0 E0028700 0C080114 */ jal func_E0200450 +/* 33D4F0 E0028700 0C080114 */ jal shim_guMtxCatF /* 33D4F4 E0028704 00A0302D */ daddu $a2, $a1, $zero /* 33D4F8 E0028708 27A40018 */ addiu $a0, $sp, 0x18 /* 33D4FC E002870C 96A50000 */ lhu $a1, ($s5) /* 33D500 E0028710 8EC20000 */ lw $v0, ($s6) /* 33D504 E0028714 00052980 */ sll $a1, $a1, 6 /* 33D508 E0028718 00B42821 */ addu $a1, $a1, $s4 -/* 33D50C E002871C 0C080118 */ jal func_E0200460 +/* 33D50C E002871C 0C080118 */ jal shim_guMtxF2L /* 33D510 E0028720 00452821 */ addu $a1, $v0, $a1 /* 33D514 E0028724 3C06D838 */ lui $a2, 0xd838 /* 33D518 E0028728 8E640000 */ lw $a0, ($s3) diff --git a/ver/us/asm/nonmatchings/effects/effect_20/fx_20_main.s b/ver/us/asm/nonmatchings/effects/effect_20/fx_20_main.s index d2e0ab2818..5235c95a00 100644 --- a/ver/us/asm/nonmatchings/effects/effect_20/fx_20_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_20/fx_20_main.s @@ -28,12 +28,12 @@ glabel fx_20_main /* 33CE4C E002805C AFB00028 */ sw $s0, 0x28($sp) /* 33CE50 E0028060 AFA00010 */ sw $zero, 0x10($sp) /* 33CE54 E0028064 AFA00024 */ sw $zero, 0x24($sp) -/* 33CE58 E0028068 0C080124 */ jal func_E0200490 +/* 33CE58 E0028068 0C080124 */ jal shim_create_effect_instance /* 33CE5C E002806C AFA20014 */ sw $v0, 0x14($sp) /* 33CE60 E0028070 240400F0 */ addiu $a0, $zero, 0xf0 /* 33CE64 E0028074 24120005 */ addiu $s2, $zero, 5 /* 33CE68 E0028078 0040802D */ daddu $s0, $v0, $zero -/* 33CE6C E002807C 0C08012C */ jal func_E02004B0 +/* 33CE6C E002807C 0C08012C */ jal shim_general_heap_malloc /* 33CE70 E0028080 AE120008 */ sw $s2, 8($s0) /* 33CE74 E0028084 0040182D */ daddu $v1, $v0, $zero /* 33CE78 E0028088 14600003 */ bnez $v1, .LE0028098 diff --git a/ver/us/asm/nonmatchings/effects/effect_21/func_E002A28C.s b/ver/us/asm/nonmatchings/effects/effect_21/func_E002A28C.s index db4d95a3f0..93438b78d0 100644 --- a/ver/us/asm/nonmatchings/effects/effect_21/func_E002A28C.s +++ b/ver/us/asm/nonmatchings/effects/effect_21/func_E002A28C.s @@ -9,7 +9,7 @@ glabel func_E002A28C /* 33EB5C E002A29C 2442FFFF */ addiu $v0, $v0, -1 /* 33EB60 E002A2A0 04410005 */ bgez $v0, .LE002A2B8 /* 33EB64 E002A2A4 AC62002C */ sw $v0, 0x2c($v1) -/* 33EB68 E002A2A8 0C080128 */ jal func_E02004A0 +/* 33EB68 E002A2A8 0C080128 */ jal shim_remove_effect /* 33EB6C E002A2AC 00000000 */ nop /* 33EB70 E002A2B0 0800A8DD */ j .LE002A374 /* 33EB74 E002A2B4 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_21/func_E002A380.s b/ver/us/asm/nonmatchings/effects/effect_21/func_E002A380.s index 6ae32d83e1..848421d36b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_21/func_E002A380.s +++ b/ver/us/asm/nonmatchings/effects/effect_21/func_E002A380.s @@ -11,7 +11,7 @@ glabel func_E002A380 /* 33EC58 E002A398 27A40010 */ addiu $a0, $sp, 0x10 /* 33EC5C E002A39C AFBF0020 */ sw $ra, 0x20($sp) /* 33EC60 E002A3A0 AFA00014 */ sw $zero, 0x14($sp) -/* 33EC64 E002A3A4 0C080120 */ jal func_E0200480 +/* 33EC64 E002A3A4 0C080120 */ jal shim_queue_render_task /* 33EC68 E002A3A8 AFA20010 */ sw $v0, 0x10($sp) /* 33EC6C E002A3AC 8C430000 */ lw $v1, ($v0) /* 33EC70 E002A3B0 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_21/func_E002A3C4.s b/ver/us/asm/nonmatchings/effects/effect_21/func_E002A3C4.s index 3e0715530c..9655530b1e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_21/func_E002A3C4.s +++ b/ver/us/asm/nonmatchings/effects/effect_21/func_E002A3C4.s @@ -73,7 +73,7 @@ glabel func_E002A3C4 /* 33ED90 E002A4D0 8E050004 */ lw $a1, 4($s0) /* 33ED94 E002A4D4 8E060008 */ lw $a2, 8($s0) /* 33ED98 E002A4D8 8E07000C */ lw $a3, 0xc($s0) -/* 33ED9C E002A4DC 0C080108 */ jal func_E0200420 +/* 33ED9C E002A4DC 0C080108 */ jal shim_guTranslateF /* 33EDA0 E002A4E0 27A40018 */ addiu $a0, $sp, 0x18 /* 33EDA4 E002A4E4 27B10058 */ addiu $s1, $sp, 0x58 /* 33EDA8 E002A4E8 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -94,11 +94,11 @@ glabel func_E002A3C4 /* 33EDE4 E002A524 46000007 */ neg.s $f0, $f0 /* 33EDE8 E002A528 44050000 */ mfc1 $a1, $f0 /* 33EDEC E002A52C 0220202D */ daddu $a0, $s1, $zero -/* 33EDF0 E002A530 0C080104 */ jal func_E0200410 +/* 33EDF0 E002A530 0C080104 */ jal shim_guRotateF /* 33EDF4 E002A534 AFA60010 */ sw $a2, 0x10($sp) /* 33EDF8 E002A538 0220202D */ daddu $a0, $s1, $zero /* 33EDFC E002A53C 27A50018 */ addiu $a1, $sp, 0x18 -/* 33EE00 E002A540 0C080114 */ jal func_E0200450 +/* 33EE00 E002A540 0C080114 */ jal shim_guMtxCatF /* 33EE04 E002A544 27A60098 */ addiu $a2, $sp, 0x98 /* 33EE08 E002A548 8E0B0000 */ lw $t3, ($s0) /* 33EE0C E002A54C AFAB00D8 */ sw $t3, 0xd8($sp) @@ -129,26 +129,26 @@ glabel func_E002A3C4 /* 33EE6C E002A5AC A6830000 */ sh $v1, ($s4) /* 33EE70 E002A5B0 8EF00000 */ lw $s0, ($s7) /* 33EE74 E002A5B4 00551021 */ addu $v0, $v0, $s5 -/* 33EE78 E002A5B8 0C080110 */ jal func_E0200440 +/* 33EE78 E002A5B8 0C080110 */ jal shim_guScaleF /* 33EE7C E002A5BC 02028021 */ addu $s0, $s0, $v0 /* 33EE80 E002A5C0 27A40018 */ addiu $a0, $sp, 0x18 -/* 33EE84 E002A5C4 0C080118 */ jal func_E0200460 +/* 33EE84 E002A5C4 0C080118 */ jal shim_guMtxF2L /* 33EE88 E002A5C8 0200282D */ daddu $a1, $s0, $zero /* 33EE8C E002A5CC 8E25FFF8 */ lw $a1, -8($s1) /* 33EE90 E002A5D0 8E26FFFC */ lw $a2, -4($s1) /* 33EE94 E002A5D4 8E270000 */ lw $a3, ($s1) -/* 33EE98 E002A5D8 0C080108 */ jal func_E0200420 +/* 33EE98 E002A5D8 0C080108 */ jal shim_guTranslateF /* 33EE9C E002A5DC 02C0202D */ daddu $a0, $s6, $zero /* 33EEA0 E002A5E0 02C0202D */ daddu $a0, $s6, $zero /* 33EEA4 E002A5E4 27A50098 */ addiu $a1, $sp, 0x98 -/* 33EEA8 E002A5E8 0C080114 */ jal func_E0200450 +/* 33EEA8 E002A5E8 0C080114 */ jal shim_guMtxCatF /* 33EEAC E002A5EC 27A60018 */ addiu $a2, $sp, 0x18 /* 33EEB0 E002A5F0 27A40018 */ addiu $a0, $sp, 0x18 /* 33EEB4 E002A5F4 96850000 */ lhu $a1, ($s4) /* 33EEB8 E002A5F8 8EE20000 */ lw $v0, ($s7) /* 33EEBC E002A5FC 00052980 */ sll $a1, $a1, 6 /* 33EEC0 E002A600 00B52821 */ addu $a1, $a1, $s5 -/* 33EEC4 E002A604 0C080118 */ jal func_E0200460 +/* 33EEC4 E002A604 0C080118 */ jal shim_guMtxF2L /* 33EEC8 E002A608 00452821 */ addu $a1, $v0, $a1 /* 33EECC E002A60C 3C05DA38 */ lui $a1, 0xda38 /* 33EED0 E002A610 8E460000 */ lw $a2, ($s2) diff --git a/ver/us/asm/nonmatchings/effects/effect_21/fx_21_main.s b/ver/us/asm/nonmatchings/effects/effect_21/fx_21_main.s index 1d6cd01553..66cde56c7d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_21/fx_21_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_21/fx_21_main.s @@ -34,13 +34,13 @@ glabel fx_21_main /* 33E930 E002A070 24020015 */ addiu $v0, $zero, 0x15 /* 33E934 E002A074 AFA00010 */ sw $zero, 0x10($sp) /* 33E938 E002A078 AFA00024 */ sw $zero, 0x24($sp) -/* 33E93C E002A07C 0C080124 */ jal func_E0200490 +/* 33E93C E002A07C 0C080124 */ jal shim_create_effect_instance /* 33E940 E002A080 AFA20014 */ sw $v0, 0x14($sp) /* 33E944 E002A084 001220C0 */ sll $a0, $s2, 3 /* 33E948 E002A088 00922021 */ addu $a0, $a0, $s2 /* 33E94C E002A08C 000420C0 */ sll $a0, $a0, 3 /* 33E950 E002A090 0040982D */ daddu $s3, $v0, $zero -/* 33E954 E002A094 0C08012C */ jal func_E02004B0 +/* 33E954 E002A094 0C08012C */ jal shim_general_heap_malloc /* 33E958 E002A098 AE720008 */ sw $s2, 8($s3) /* 33E95C E002A09C 0040202D */ daddu $a0, $v0, $zero /* 33E960 E002A0A0 14800003 */ bnez $a0, .LE002A0B0 @@ -78,14 +78,14 @@ glabel fx_21_main /* 33E9D8 E002A118 3421CCCD */ ori $at, $at, 0xcccd /* 33E9DC E002A11C 4481B000 */ mtc1 $at, $f22 .LE002A120: -/* 33E9E0 E002A120 0C080138 */ jal func_E02004E0 +/* 33E9E0 E002A120 0C080138 */ jal shim_rand_int /* 33E9E4 E002A124 240400C8 */ addiu $a0, $zero, 0xc8 /* 33E9E8 E002A128 24040032 */ addiu $a0, $zero, 0x32 /* 33E9EC E002A12C 2442FF9C */ addiu $v0, $v0, -0x64 /* 33E9F0 E002A130 44820000 */ mtc1 $v0, $f0 /* 33E9F4 E002A134 00000000 */ nop /* 33E9F8 E002A138 46800020 */ cvt.s.w $f0, $f0 -/* 33E9FC E002A13C 0C080138 */ jal func_E02004E0 +/* 33E9FC E002A13C 0C080138 */ jal shim_rand_int /* 33EA00 E002A140 E600FFFC */ swc1 $f0, -4($s0) /* 33EA04 E002A144 2404000A */ addiu $a0, $zero, 0xa /* 33EA08 E002A148 3C01BF80 */ lui $at, 0xbf80 @@ -98,7 +98,7 @@ glabel fx_21_main /* 33EA24 E002A164 AE00000C */ sw $zero, 0xc($s0) /* 33EA28 E002A168 E6180014 */ swc1 $f24, 0x14($s0) /* 33EA2C E002A16C E6180018 */ swc1 $f24, 0x18($s0) -/* 33EA30 E002A170 0C080138 */ jal func_E02004E0 +/* 33EA30 E002A170 0C080138 */ jal shim_rand_int /* 33EA34 E002A174 E6020008 */ swc1 $f2, 8($s0) /* 33EA38 E002A178 3C0351EB */ lui $v1, 0x51eb /* 33EA3C E002A17C 3463851F */ ori $v1, $v1, 0x851f @@ -135,7 +135,7 @@ glabel fx_21_main /* 33EAAC E002A1EC E6000020 */ swc1 $f0, 0x20($s0) .LE002A1F0: /* 33EAB0 E002A1F0 E6160020 */ swc1 $f22, 0x20($s0) -/* 33EAB4 E002A1F4 0C080138 */ jal func_E02004E0 +/* 33EAB4 E002A1F4 0C080138 */ jal shim_rand_int /* 33EAB8 E002A1F8 AE000008 */ sw $zero, 8($s0) /* 33EABC E002A1FC 2442FFEC */ addiu $v0, $v0, -0x14 /* 33EAC0 E002A200 44820000 */ mtc1 $v0, $f0 @@ -145,7 +145,7 @@ glabel fx_21_main /* 33EAD0 E002A210 00000000 */ nop /* 33EAD4 E002A214 24040028 */ addiu $a0, $zero, 0x28 /* 33EAD8 E002A218 46200020 */ cvt.s.d $f0, $f0 -/* 33EADC E002A21C 0C080138 */ jal func_E02004E0 +/* 33EADC E002A21C 0C080138 */ jal shim_rand_int /* 33EAE0 E002A220 E600FFFC */ swc1 $f0, -4($s0) /* 33EAE4 E002A224 2442FFEC */ addiu $v0, $v0, -0x14 /* 33EAE8 E002A228 44820000 */ mtc1 $v0, $f0 diff --git a/ver/us/asm/nonmatchings/effects/effect_22/func_E002C23C.s b/ver/us/asm/nonmatchings/effects/effect_22/func_E002C23C.s index f72b206cc3..b5b5b83fa4 100644 --- a/ver/us/asm/nonmatchings/effects/effect_22/func_E002C23C.s +++ b/ver/us/asm/nonmatchings/effects/effect_22/func_E002C23C.s @@ -42,7 +42,7 @@ glabel func_E002C23C /* 34014C E002C2CC 2442FFFF */ addiu $v0, $v0, -1 /* 340150 E002C2D0 04410005 */ bgez $v0, .LE002C2E8 /* 340154 E002C2D4 ACA20020 */ sw $v0, 0x20($a1) -/* 340158 E002C2D8 0C080128 */ jal func_E02004A0 +/* 340158 E002C2D8 0C080128 */ jal shim_remove_effect /* 34015C E002C2DC 00000000 */ nop /* 340160 E002C2E0 0800B0F1 */ j .LE002C3C4 /* 340164 E002C2E4 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_22/func_E002C3D0.s b/ver/us/asm/nonmatchings/effects/effect_22/func_E002C3D0.s index f1478090d6..a7a5f2ab74 100644 --- a/ver/us/asm/nonmatchings/effects/effect_22/func_E002C3D0.s +++ b/ver/us/asm/nonmatchings/effects/effect_22/func_E002C3D0.s @@ -11,7 +11,7 @@ glabel func_E002C3D0 /* 340268 E002C3E8 27A40010 */ addiu $a0, $sp, 0x10 /* 34026C E002C3EC AFBF0020 */ sw $ra, 0x20($sp) /* 340270 E002C3F0 AFA00014 */ sw $zero, 0x14($sp) -/* 340274 E002C3F4 0C080120 */ jal func_E0200480 +/* 340274 E002C3F4 0C080120 */ jal shim_queue_render_task /* 340278 E002C3F8 AFA20010 */ sw $v0, 0x10($sp) /* 34027C E002C3FC 8C430000 */ lw $v1, ($v0) /* 340280 E002C400 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_22/func_E002C414.s b/ver/us/asm/nonmatchings/effects/effect_22/func_E002C414.s index fa197458f9..97af4a88fd 100644 --- a/ver/us/asm/nonmatchings/effects/effect_22/func_E002C414.s +++ b/ver/us/asm/nonmatchings/effects/effect_22/func_E002C414.s @@ -45,7 +45,7 @@ glabel func_E002C414 /* 340334 E002C4B4 8E650000 */ lw $a1, ($s3) /* 340338 E002C4B8 8E660004 */ lw $a2, 4($s3) /* 34033C E002C4BC 8E670008 */ lw $a3, 8($s3) -/* 340340 E002C4C0 0C080108 */ jal func_E0200420 +/* 340340 E002C4C0 0C080108 */ jal shim_guTranslateF /* 340344 E002C4C4 3C120001 */ lui $s2, 1 /* 340348 E002C4C8 36521630 */ ori $s2, $s2, 0x1630 /* 34034C E002C4CC 3C013FC0 */ lui $at, 0x3fc0 @@ -54,12 +54,12 @@ glabel func_E002C414 /* 340358 E002C4D8 44050000 */ mfc1 $a1, $f0 /* 34035C E002C4DC 0220202D */ daddu $a0, $s1, $zero /* 340360 E002C4E0 00A0302D */ daddu $a2, $a1, $zero -/* 340364 E002C4E4 0C080110 */ jal func_E0200440 +/* 340364 E002C4E4 0C080110 */ jal shim_guScaleF /* 340368 E002C4E8 00A0382D */ daddu $a3, $a1, $zero /* 34036C E002C4EC 0220202D */ daddu $a0, $s1, $zero /* 340370 E002C4F0 27A50020 */ addiu $a1, $sp, 0x20 /* 340374 E002C4F4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* 340378 E002C4F8 0C080114 */ jal func_E0200450 +/* 340378 E002C4F8 0C080114 */ jal shim_guMtxCatF /* 34037C E002C4FC 0200302D */ daddu $a2, $s0, $zero /* 340380 E002C500 4480A000 */ mtc1 $zero, $f20 /* 340384 E002C504 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -81,41 +81,41 @@ glabel func_E002C414 /* 3403C4 E002C544 46000007 */ neg.s $f0, $f0 /* 3403C8 E002C548 44050000 */ mfc1 $a1, $f0 /* 3403CC E002C54C 0220202D */ daddu $a0, $s1, $zero -/* 3403D0 E002C550 0C080104 */ jal func_E0200410 +/* 3403D0 E002C550 0C080104 */ jal shim_guRotateF /* 3403D4 E002C554 E7B40010 */ swc1 $f20, 0x10($sp) /* 3403D8 E002C558 0220202D */ daddu $a0, $s1, $zero /* 3403DC E002C55C 0200282D */ daddu $a1, $s0, $zero -/* 3403E0 E002C560 0C080114 */ jal func_E0200450 +/* 3403E0 E002C560 0C080114 */ jal shim_guMtxCatF /* 3403E4 E002C564 0200302D */ daddu $a2, $s0, $zero /* 3403E8 E002C568 E7B60010 */ swc1 $f22, 0x10($sp) /* 3403EC E002C56C 8E650034 */ lw $a1, 0x34($s3) /* 3403F0 E002C570 4406A000 */ mfc1 $a2, $f20 /* 3403F4 E002C574 4407A000 */ mfc1 $a3, $f20 -/* 3403F8 E002C578 0C080104 */ jal func_E0200410 +/* 3403F8 E002C578 0C080104 */ jal shim_guRotateF /* 3403FC E002C57C 0220202D */ daddu $a0, $s1, $zero /* 340400 E002C580 0220202D */ daddu $a0, $s1, $zero /* 340404 E002C584 0200282D */ daddu $a1, $s0, $zero -/* 340408 E002C588 0C080114 */ jal func_E0200450 +/* 340408 E002C588 0C080114 */ jal shim_guMtxCatF /* 34040C E002C58C 0200302D */ daddu $a2, $s0, $zero /* 340410 E002C590 E7B40010 */ swc1 $f20, 0x10($sp) /* 340414 E002C594 8E65002C */ lw $a1, 0x2c($s3) /* 340418 E002C598 4406B000 */ mfc1 $a2, $f22 /* 34041C E002C59C 4407A000 */ mfc1 $a3, $f20 -/* 340420 E002C5A0 0C080104 */ jal func_E0200410 +/* 340420 E002C5A0 0C080104 */ jal shim_guRotateF /* 340424 E002C5A4 0220202D */ daddu $a0, $s1, $zero /* 340428 E002C5A8 0220202D */ daddu $a0, $s1, $zero /* 34042C E002C5AC 0200282D */ daddu $a1, $s0, $zero -/* 340430 E002C5B0 0C080114 */ jal func_E0200450 +/* 340430 E002C5B0 0C080114 */ jal shim_guMtxCatF /* 340434 E002C5B4 0200302D */ daddu $a2, $s0, $zero /* 340438 E002C5B8 E7B40010 */ swc1 $f20, 0x10($sp) /* 34043C E002C5BC 8E650030 */ lw $a1, 0x30($s3) /* 340440 E002C5C0 4406A000 */ mfc1 $a2, $f20 /* 340444 E002C5C4 4407B000 */ mfc1 $a3, $f22 -/* 340448 E002C5C8 0C080104 */ jal func_E0200410 +/* 340448 E002C5C8 0C080104 */ jal shim_guRotateF /* 34044C E002C5CC 0220202D */ daddu $a0, $s1, $zero /* 340450 E002C5D0 0220202D */ daddu $a0, $s1, $zero /* 340454 E002C5D4 0200282D */ daddu $a1, $s0, $zero -/* 340458 E002C5D8 0C080114 */ jal func_E0200450 +/* 340458 E002C5D8 0C080114 */ jal shim_guMtxCatF /* 34045C E002C5DC 0200302D */ daddu $a2, $s0, $zero /* 340460 E002C5E0 0200202D */ daddu $a0, $s0, $zero /* 340464 E002C5E4 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -126,7 +126,7 @@ glabel func_E002C414 /* 340478 E002C5F8 8E220000 */ lw $v0, ($s1) /* 34047C E002C5FC 00052980 */ sll $a1, $a1, 6 /* 340480 E002C600 00B22821 */ addu $a1, $a1, $s2 -/* 340484 E002C604 0C080118 */ jal func_E0200460 +/* 340484 E002C604 0C080118 */ jal shim_guMtxF2L /* 340488 E002C608 00452821 */ addu $a1, $v0, $a1 /* 34048C E002C60C 3C06666D */ lui $a2, 0x666d /* 340490 E002C610 34C67B00 */ ori $a2, $a2, 0x7b00 @@ -171,7 +171,7 @@ glabel func_E002C414 /* 340528 E002C6A8 8E660004 */ lw $a2, 4($s3) /* 34052C E002C6AC 8E670008 */ lw $a3, 8($s3) /* 340530 E002C6B0 8E760028 */ lw $s6, 0x28($s3) -/* 340534 E002C6B4 0C080108 */ jal func_E0200420 +/* 340534 E002C6B4 0C080108 */ jal shim_guTranslateF /* 340538 E002C6B8 27A40020 */ addiu $a0, $sp, 0x20 /* 34053C E002C6BC 3C013FC0 */ lui $at, 0x3fc0 /* 340540 E002C6C0 44810000 */ mtc1 $at, $f0 @@ -179,12 +179,12 @@ glabel func_E002C414 /* 340548 E002C6C8 44050000 */ mfc1 $a1, $f0 /* 34054C E002C6CC 0220202D */ daddu $a0, $s1, $zero /* 340550 E002C6D0 00A0302D */ daddu $a2, $a1, $zero -/* 340554 E002C6D4 0C080110 */ jal func_E0200440 +/* 340554 E002C6D4 0C080110 */ jal shim_guScaleF /* 340558 E002C6D8 00A0382D */ daddu $a3, $a1, $zero /* 34055C E002C6DC 0220202D */ daddu $a0, $s1, $zero /* 340560 E002C6E0 27A50020 */ addiu $a1, $sp, 0x20 /* 340564 E002C6E4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* 340568 E002C6E8 0C080114 */ jal func_E0200450 +/* 340568 E002C6E8 0C080114 */ jal shim_guMtxCatF /* 34056C E002C6EC 0200302D */ daddu $a2, $s0, $zero /* 340570 E002C6F0 4480B000 */ mtc1 $zero, $f22 /* 340574 E002C6F4 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -206,17 +206,17 @@ glabel func_E002C414 /* 3405B4 E002C734 46000007 */ neg.s $f0, $f0 /* 3405B8 E002C738 44050000 */ mfc1 $a1, $f0 /* 3405BC E002C73C 0220202D */ daddu $a0, $s1, $zero -/* 3405C0 E002C740 0C080104 */ jal func_E0200410 +/* 3405C0 E002C740 0C080104 */ jal shim_guRotateF /* 3405C4 E002C744 E7B60010 */ swc1 $f22, 0x10($sp) /* 3405C8 E002C748 0220202D */ daddu $a0, $s1, $zero /* 3405CC E002C74C 0200282D */ daddu $a1, $s0, $zero -/* 3405D0 E002C750 0C080114 */ jal func_E0200450 +/* 3405D0 E002C750 0C080114 */ jal shim_guMtxCatF /* 3405D4 E002C754 00A0302D */ daddu $a2, $a1, $zero /* 3405D8 E002C758 E7B60010 */ swc1 $f22, 0x10($sp) /* 3405DC E002C75C 8E65002C */ lw $a1, 0x2c($s3) /* 3405E0 E002C760 4406A000 */ mfc1 $a2, $f20 /* 3405E4 E002C764 4407B000 */ mfc1 $a3, $f22 -/* 3405E8 E002C768 0C080104 */ jal func_E0200410 +/* 3405E8 E002C768 0C080104 */ jal shim_guRotateF /* 3405EC E002C76C 27A400E0 */ addiu $a0, $sp, 0xe0 /* 3405F0 E002C770 8FA80160 */ lw $t0, 0x160($sp) /* 3405F4 E002C774 24150001 */ addiu $s5, $zero, 1 @@ -243,15 +243,15 @@ glabel func_E002C414 /* 340644 E002C7C4 8E26FFD0 */ lw $a2, -0x30($s1) /* 340648 E002C7C8 8E27FFD4 */ lw $a3, -0x2c($s1) /* 34064C E002C7CC 8ED00000 */ lw $s0, ($s6) -/* 340650 E002C7D0 0C080108 */ jal func_E0200420 +/* 340650 E002C7D0 0C080108 */ jal shim_guTranslateF /* 340654 E002C7D4 0240202D */ daddu $a0, $s2, $zero /* 340658 E002C7D8 0240202D */ daddu $a0, $s2, $zero /* 34065C E002C7DC 27A500A0 */ addiu $a1, $sp, 0xa0 -/* 340660 E002C7E0 0C080114 */ jal func_E0200450 +/* 340660 E002C7E0 0C080114 */ jal shim_guMtxCatF /* 340664 E002C7E4 27A60020 */ addiu $a2, $sp, 0x20 /* 340668 E002C7E8 27A400E0 */ addiu $a0, $sp, 0xe0 /* 34066C E002C7EC 27A50020 */ addiu $a1, $sp, 0x20 -/* 340670 E002C7F0 0C080114 */ jal func_E0200450 +/* 340670 E002C7F0 0C080114 */ jal shim_guMtxCatF /* 340674 E002C7F4 00A0302D */ daddu $a2, $a1, $zero /* 340678 E002C7F8 4406A000 */ mfc1 $a2, $f20 /* 34067C E002C7FC 3C013F80 */ lui $at, 0x3f80 @@ -267,11 +267,11 @@ glabel func_E002C414 /* 3406A4 E002C824 E7A00018 */ swc1 $f0, 0x18($sp) /* 3406A8 E002C828 8E25FFF8 */ lw $a1, -8($s1) /* 3406AC E002C82C 8E270000 */ lw $a3, ($s1) -/* 3406B0 E002C830 0C080180 */ jal func_E0200600 +/* 3406B0 E002C830 0C080180 */ jal shim_guPositionF /* 3406B4 E002C834 0240202D */ daddu $a0, $s2, $zero /* 3406B8 E002C838 0240202D */ daddu $a0, $s2, $zero /* 3406BC E002C83C 27A50020 */ addiu $a1, $sp, 0x20 -/* 3406C0 E002C840 0C080114 */ jal func_E0200450 +/* 3406C0 E002C840 0C080114 */ jal shim_guMtxCatF /* 3406C4 E002C844 00A0302D */ daddu $a2, $a1, $zero /* 3406C8 E002C848 27A40020 */ addiu $a0, $sp, 0x20 /* 3406CC E002C84C 97C50000 */ lhu $a1, ($fp) @@ -279,7 +279,7 @@ glabel func_E002C414 /* 3406D4 E002C854 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3406D8 E002C858 00052980 */ sll $a1, $a1, 6 /* 3406DC E002C85C 00B72821 */ addu $a1, $a1, $s7 -/* 3406E0 E002C860 0C080118 */ jal func_E0200460 +/* 3406E0 E002C860 0C080118 */ jal shim_guMtxF2L /* 3406E4 E002C864 00452821 */ addu $a1, $v0, $a1 /* 3406E8 E002C868 3C06D838 */ lui $a2, 0xd838 /* 3406EC E002C86C 8E840000 */ lw $a0, ($s4) diff --git a/ver/us/asm/nonmatchings/effects/effect_22/fx_22_main.s b/ver/us/asm/nonmatchings/effects/effect_22/fx_22_main.s index 6d1824adc2..c00b7aeac9 100644 --- a/ver/us/asm/nonmatchings/effects/effect_22/fx_22_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_22/fx_22_main.s @@ -31,12 +31,12 @@ glabel fx_22_main /* 33FEE8 E002C068 AFB00028 */ sw $s0, 0x28($sp) /* 33FEEC E002C06C AFA00010 */ sw $zero, 0x10($sp) /* 33FEF0 E002C070 AFA00024 */ sw $zero, 0x24($sp) -/* 33FEF4 E002C074 0C080124 */ jal func_E0200490 +/* 33FEF4 E002C074 0C080124 */ jal shim_create_effect_instance /* 33FEF8 E002C078 AFA20014 */ sw $v0, 0x14($sp) /* 33FEFC E002C07C 24040240 */ addiu $a0, $zero, 0x240 /* 33FF00 E002C080 24150009 */ addiu $s5, $zero, 9 /* 33FF04 E002C084 0040802D */ daddu $s0, $v0, $zero -/* 33FF08 E002C088 0C08012C */ jal func_E02004B0 +/* 33FF08 E002C088 0C08012C */ jal shim_general_heap_malloc /* 33FF0C E002C08C AE150008 */ sw $s5, 8($s0) /* 33FF10 E002C090 0040882D */ daddu $s1, $v0, $zero /* 33FF14 E002C094 16200003 */ bnez $s1, .LE002C0A4 @@ -56,7 +56,7 @@ glabel fx_22_main /* 33FF44 E002C0C4 AE20002C */ sw $zero, 0x2c($s1) /* 33FF48 E002C0C8 AE200030 */ sw $zero, 0x30($s1) /* 33FF4C E002C0CC E620000C */ swc1 $f0, 0xc($s1) -/* 33FF50 E002C0D0 0C080138 */ jal func_E02004E0 +/* 33FF50 E002C0D0 0C080138 */ jal shim_rand_int /* 33FF54 E002C0D4 E6220014 */ swc1 $f2, 0x14($s1) /* 33FF58 E002C0D8 2404003C */ addiu $a0, $zero, 0x3c /* 33FF5C E002C0DC 2442FFE2 */ addiu $v0, $v0, -0x1e @@ -65,7 +65,7 @@ glabel fx_22_main /* 33FF68 E002C0E8 46800020 */ cvt.s.w $f0, $f0 /* 33FF6C E002C0EC 240200FF */ addiu $v0, $zero, 0xff /* 33FF70 E002C0F0 E6200034 */ swc1 $f0, 0x34($s1) -/* 33FF74 E002C0F4 0C080138 */ jal func_E02004E0 +/* 33FF74 E002C0F4 0C080138 */ jal shim_rand_int /* 33FF78 E002C0F8 AE220028 */ sw $v0, 0x28($s1) /* 33FF7C E002C0FC 2442FFE2 */ addiu $v0, $v0, -0x1e /* 33FF80 E002C100 44822000 */ mtc1 $v0, $f4 @@ -111,7 +111,7 @@ glabel fx_22_main /* 34001C E002C19C C4400000 */ lwc1 $f0, ($v0) /* 340020 E002C1A0 46000000 */ add.s $f0, $f0, $f0 /* 340024 E002C1A4 2404000A */ addiu $a0, $zero, 0xa -/* 340028 E002C1A8 0C080138 */ jal func_E02004E0 +/* 340028 E002C1A8 0C080138 */ jal shim_rand_int /* 34002C E002C1AC E600FFDC */ swc1 $f0, -0x24($s0) /* 340030 E002C1B0 44820000 */ mtc1 $v0, $f0 /* 340034 E002C1B4 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_23/func_E002E250.s b/ver/us/asm/nonmatchings/effects/effect_23/func_E002E250.s index 21c5841032..fc0871b038 100644 --- a/ver/us/asm/nonmatchings/effects/effect_23/func_E002E250.s +++ b/ver/us/asm/nonmatchings/effects/effect_23/func_E002E250.s @@ -17,7 +17,7 @@ glabel func_E002E250 /* 341C60 E002E280 ACA3003C */ sw $v1, 0x3c($a1) /* 341C64 E002E284 04410005 */ bgez $v0, .LE002E29C /* 341C68 E002E288 ACA20040 */ sw $v0, 0x40($a1) -/* 341C6C E002E28C 0C080128 */ jal func_E02004A0 +/* 341C6C E002E28C 0C080128 */ jal shim_remove_effect /* 341C70 E002E290 00000000 */ nop /* 341C74 E002E294 0800B8C9 */ j .LE002E324 /* 341C78 E002E298 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_23/func_E002E330.s b/ver/us/asm/nonmatchings/effects/effect_23/func_E002E330.s index 50045489ca..85914fb894 100644 --- a/ver/us/asm/nonmatchings/effects/effect_23/func_E002E330.s +++ b/ver/us/asm/nonmatchings/effects/effect_23/func_E002E330.s @@ -11,7 +11,7 @@ glabel func_E002E330 /* 341D28 E002E348 27A40010 */ addiu $a0, $sp, 0x10 /* 341D2C E002E34C AFBF0020 */ sw $ra, 0x20($sp) /* 341D30 E002E350 AFA00014 */ sw $zero, 0x14($sp) -/* 341D34 E002E354 0C080120 */ jal func_E0200480 +/* 341D34 E002E354 0C080120 */ jal shim_queue_render_task /* 341D38 E002E358 AFA20010 */ sw $v0, 0x10($sp) /* 341D3C E002E35C 8FBF0020 */ lw $ra, 0x20($sp) /* 341D40 E002E360 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_23/func_E002E368.s b/ver/us/asm/nonmatchings/effects/effect_23/func_E002E368.s index 573b533aef..f9be197fa9 100644 --- a/ver/us/asm/nonmatchings/effects/effect_23/func_E002E368.s +++ b/ver/us/asm/nonmatchings/effects/effect_23/func_E002E368.s @@ -59,7 +59,7 @@ glabel func_E002E368 /* 341E1C E002E43C 8E860008 */ lw $a2, 8($s4) /* 341E20 E002E440 8E87000C */ lw $a3, 0xc($s4) /* 341E24 E002E444 24630010 */ addiu $v1, $v1, 0x10 -/* 341E28 E002E448 0C080108 */ jal func_E0200420 +/* 341E28 E002E448 0C080108 */ jal shim_guTranslateF /* 341E2C E002E44C AE630000 */ sw $v1, ($s3) /* 341E30 E002E450 27B00058 */ addiu $s0, $sp, 0x58 /* 341E34 E002E454 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -80,12 +80,12 @@ glabel func_E002E368 /* 341E70 E002E490 46000007 */ neg.s $f0, $f0 /* 341E74 E002E494 44050000 */ mfc1 $a1, $f0 /* 341E78 E002E498 0200202D */ daddu $a0, $s0, $zero -/* 341E7C E002E49C 0C080104 */ jal func_E0200410 +/* 341E7C E002E49C 0C080104 */ jal shim_guRotateF /* 341E80 E002E4A0 AFA60010 */ sw $a2, 0x10($sp) /* 341E84 E002E4A4 0200202D */ daddu $a0, $s0, $zero /* 341E88 E002E4A8 27A50018 */ addiu $a1, $sp, 0x18 /* 341E8C E002E4AC 27B00098 */ addiu $s0, $sp, 0x98 -/* 341E90 E002E4B0 0C080114 */ jal func_E0200450 +/* 341E90 E002E4B0 0C080114 */ jal shim_guMtxCatF /* 341E94 E002E4B4 0200302D */ daddu $a2, $s0, $zero /* 341E98 E002E4B8 0200202D */ daddu $a0, $s0, $zero /* 341E9C E002E4BC 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -96,7 +96,7 @@ glabel func_E002E368 /* 341EB0 E002E4D0 8E220000 */ lw $v0, ($s1) /* 341EB4 E002E4D4 00052980 */ sll $a1, $a1, 6 /* 341EB8 E002E4D8 00B22821 */ addu $a1, $a1, $s2 -/* 341EBC E002E4DC 0C080118 */ jal func_E0200460 +/* 341EBC E002E4DC 0C080118 */ jal shim_guMtxF2L /* 341EC0 E002E4E0 00452821 */ addu $a1, $v0, $a1 /* 341EC4 E002E4E4 3C05EEDC */ lui $a1, 0xeedc /* 341EC8 E002E4E8 8E660000 */ lw $a2, ($s3) @@ -185,14 +185,14 @@ glabel func_E002E368 /* 342008 E002E628 8E05FFF8 */ lw $a1, -8($s0) /* 34200C E002E62C 8E06FFFC */ lw $a2, -4($s0) /* 342010 E002E630 8E070000 */ lw $a3, ($s0) -/* 342014 E002E634 0C080108 */ jal func_E0200420 +/* 342014 E002E634 0C080108 */ jal shim_guTranslateF /* 342018 E002E638 26100044 */ addiu $s0, $s0, 0x44 /* 34201C E002E63C 27A40018 */ addiu $a0, $sp, 0x18 /* 342020 E002E640 96A50000 */ lhu $a1, ($s5) /* 342024 E002E644 8EC20000 */ lw $v0, ($s6) /* 342028 E002E648 00052980 */ sll $a1, $a1, 6 /* 34202C E002E64C 00B32821 */ addu $a1, $a1, $s3 -/* 342030 E002E650 0C080118 */ jal func_E0200460 +/* 342030 E002E650 0C080118 */ jal shim_guMtxF2L /* 342034 E002E654 00452821 */ addu $a1, $v0, $a1 /* 342038 E002E658 3C06D838 */ lui $a2, 0xd838 /* 34203C E002E65C 8E440000 */ lw $a0, ($s2) diff --git a/ver/us/asm/nonmatchings/effects/effect_23/fx_23_main.s b/ver/us/asm/nonmatchings/effects/effect_23/fx_23_main.s index 70d3c333ff..ee46dd682c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_23/fx_23_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_23/fx_23_main.s @@ -52,13 +52,13 @@ glabel fx_23_main /* 341A8C E002E0AC 24020017 */ addiu $v0, $zero, 0x17 /* 341A90 E002E0B0 AC800000 */ sw $zero, ($a0) /* 341A94 E002E0B4 AC800014 */ sw $zero, 0x14($a0) -/* 341A98 E002E0B8 0C080124 */ jal func_E0200490 +/* 341A98 E002E0B8 0C080124 */ jal shim_create_effect_instance /* 341A9C E002E0BC AC820004 */ sw $v0, 4($a0) /* 341AA0 E002E0C0 00132100 */ sll $a0, $s3, 4 /* 341AA4 E002E0C4 00932021 */ addu $a0, $a0, $s3 /* 341AA8 E002E0C8 00042080 */ sll $a0, $a0, 2 /* 341AAC E002E0CC 0040802D */ daddu $s0, $v0, $zero -/* 341AB0 E002E0D0 0C08012C */ jal func_E02004B0 +/* 341AB0 E002E0D0 0C08012C */ jal shim_general_heap_malloc /* 341AB4 E002E0D4 AE130008 */ sw $s3, 8($s0) /* 341AB8 E002E0D8 0040882D */ daddu $s1, $v0, $zero /* 341ABC E002E0DC 16200003 */ bnez $s1, .LE002E0EC @@ -70,7 +70,7 @@ glabel fx_23_main /* 341ACC E002E0EC 0220202D */ daddu $a0, $s1, $zero /* 341AD0 E002E0F0 00132900 */ sll $a1, $s3, 4 /* 341AD4 E002E0F4 00B32821 */ addu $a1, $a1, $s3 -/* 341AD8 E002E0F8 0C080130 */ jal func_E02004C0 +/* 341AD8 E002E0F8 0C080130 */ jal shim_mem_clear /* 341ADC E002E0FC 00052880 */ sll $a1, $a1, 2 /* 341AE0 E002E100 AE200038 */ sw $zero, 0x38($s1) /* 341AE4 E002E104 AE20003C */ sw $zero, 0x3c($s1) @@ -119,13 +119,13 @@ glabel fx_23_main /* 341B84 E002E1A4 4483A000 */ mtc1 $v1, $f20 /* 341B88 E002E1A8 00000000 */ nop /* 341B8C E002E1AC 4680A520 */ cvt.s.w $f20, $f20 -/* 341B90 E002E1B0 0C080140 */ jal func_E0200500 +/* 341B90 E002E1B0 0C080140 */ jal shim_sin_deg /* 341B94 E002E1B4 4600A306 */ mov.s $f12, $f20 /* 341B98 E002E1B8 46000007 */ neg.s $f0, $f0 /* 341B9C E002E1BC 46160002 */ mul.s $f0, $f0, $f22 /* 341BA0 E002E1C0 00000000 */ nop /* 341BA4 E002E1C4 4600A306 */ mov.s $f12, $f20 -/* 341BA8 E002E1C8 0C080144 */ jal func_E0200510 +/* 341BA8 E002E1C8 0C080144 */ jal shim_cos_deg /* 341BAC E002E1CC E600FFD0 */ swc1 $f0, -0x30($s0) /* 341BB0 E002E1D0 46000007 */ neg.s $f0, $f0 /* 341BB4 E002E1D4 46160002 */ mul.s $f0, $f0, $f22 @@ -134,10 +134,10 @@ glabel fx_23_main /* 341BC0 E002E1E0 26520001 */ addiu $s2, $s2, 1 /* 341BC4 E002E1E4 4600A306 */ mov.s $f12, $f20 /* 341BC8 E002E1E8 AE00FFD8 */ sw $zero, -0x28($s0) -/* 341BCC E002E1EC 0C080140 */ jal func_E0200500 +/* 341BCC E002E1EC 0C080140 */ jal shim_sin_deg /* 341BD0 E002E1F0 E600FFD4 */ swc1 $f0, -0x2c($s0) /* 341BD4 E002E1F4 4600A306 */ mov.s $f12, $f20 -/* 341BD8 E002E1F8 0C080144 */ jal func_E0200510 +/* 341BD8 E002E1F8 0C080144 */ jal shim_cos_deg /* 341BDC E002E1FC E600FFFC */ swc1 $f0, -4($s0) /* 341BE0 E002E200 E6000000 */ swc1 $f0, ($s0) /* 341BE4 E002E204 0253102A */ slt $v0, $s2, $s3 diff --git a/ver/us/asm/nonmatchings/effects/effect_24/func_E0030730.s b/ver/us/asm/nonmatchings/effects/effect_24/func_E0030730.s index 8d373bd400..28a31ba5e1 100644 --- a/ver/us/asm/nonmatchings/effects/effect_24/func_E0030730.s +++ b/ver/us/asm/nonmatchings/effects/effect_24/func_E0030730.s @@ -25,7 +25,7 @@ glabel func_E0030730 /* 3428C0 E0030780 24430001 */ addiu $v1, $v0, 1 /* 3428C4 E0030784 04810005 */ bgez $a0, .LE003079C /* 3428C8 E0030788 AE23002C */ sw $v1, 0x2c($s1) -/* 3428CC E003078C 0C080128 */ jal func_E02004A0 +/* 3428CC E003078C 0C080128 */ jal shim_remove_effect /* 3428D0 E0030790 0280202D */ daddu $a0, $s4, $zero /* 3428D4 E0030794 0800C27B */ j .LE00309EC /* 3428D8 E0030798 00000000 */ nop @@ -55,7 +55,7 @@ glabel func_E0030730 /* 342930 E00307F0 2A620006 */ slti $v0, $s3, 6 /* 342934 E00307F4 44966000 */ mtc1 $s6, $f12 /* 342938 E00307F8 00000000 */ nop -/* 34293C E00307FC 0C080144 */ jal func_E0200510 +/* 34293C E00307FC 0C080144 */ jal shim_cos_deg /* 342940 E0030800 46806320 */ cvt.s.w $f12, $f12 /* 342944 E0030804 C604FFF4 */ lwc1 $f4, -0xc($s0) /* 342948 E0030808 46002121 */ cvt.d.s $f4, $f4 diff --git a/ver/us/asm/nonmatchings/effects/effect_24/func_E0030A24.s b/ver/us/asm/nonmatchings/effects/effect_24/func_E0030A24.s index 75fef3f131..88ec73f931 100644 --- a/ver/us/asm/nonmatchings/effects/effect_24/func_E0030A24.s +++ b/ver/us/asm/nonmatchings/effects/effect_24/func_E0030A24.s @@ -11,7 +11,7 @@ glabel func_E0030A24 /* 342B7C E0030A3C 27A40010 */ addiu $a0, $sp, 0x10 /* 342B80 E0030A40 AFBF0020 */ sw $ra, 0x20($sp) /* 342B84 E0030A44 AFA00014 */ sw $zero, 0x14($sp) -/* 342B88 E0030A48 0C080120 */ jal func_E0200480 +/* 342B88 E0030A48 0C080120 */ jal shim_queue_render_task /* 342B8C E0030A4C AFA20010 */ sw $v0, 0x10($sp) /* 342B90 E0030A50 8C430000 */ lw $v1, ($v0) /* 342B94 E0030A54 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_24/func_E0030A68.s b/ver/us/asm/nonmatchings/effects/effect_24/func_E0030A68.s index b4d1994293..336b9f38be 100644 --- a/ver/us/asm/nonmatchings/effects/effect_24/func_E0030A68.s +++ b/ver/us/asm/nonmatchings/effects/effect_24/func_E0030A68.s @@ -146,7 +146,7 @@ glabel func_E0030A68 /* 342DD8 E0030C98 8E05FFE8 */ lw $a1, -0x18($s0) /* 342DDC E0030C9C 8E06FFEC */ lw $a2, -0x14($s0) /* 342DE0 E0030CA0 8E07FFF0 */ lw $a3, -0x10($s0) -/* 342DE4 E0030CA4 0C080108 */ jal func_E0200420 +/* 342DE4 E0030CA4 0C080108 */ jal shim_guTranslateF /* 342DE8 E0030CA8 27DE0003 */ addiu $fp, $fp, 3 /* 342DEC E0030CAC 3C0A800B */ lui $t2, %hi(gCameras) /* 342DF0 E0030CB0 254A1D80 */ addiu $t2, $t2, %lo(gCameras) @@ -167,11 +167,11 @@ glabel func_E0030A68 /* 342E2C E0030CEC 46000007 */ neg.s $f0, $f0 /* 342E30 E0030CF0 44050000 */ mfc1 $a1, $f0 /* 342E34 E0030CF4 26F70003 */ addiu $s7, $s7, 3 -/* 342E38 E0030CF8 0C080104 */ jal func_E0200410 +/* 342E38 E0030CF8 0C080104 */ jal shim_guRotateF /* 342E3C E0030CFC E7B40010 */ swc1 $f20, 0x10($sp) /* 342E40 E0030D00 27A50018 */ addiu $a1, $sp, 0x18 /* 342E44 E0030D04 8FA4009C */ lw $a0, 0x9c($sp) -/* 342E48 E0030D08 0C080114 */ jal func_E0200450 +/* 342E48 E0030D08 0C080114 */ jal shim_guMtxCatF /* 342E4C E0030D0C 00A0302D */ daddu $a2, $a1, $zero /* 342E50 E0030D10 27A40018 */ addiu $a0, $sp, 0x18 /* 342E54 E0030D14 96C50000 */ lhu $a1, ($s6) @@ -179,7 +179,7 @@ glabel func_E0030A68 /* 342E5C E0030D1C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 342E60 E0030D20 00052980 */ sll $a1, $a1, 6 /* 342E64 E0030D24 00B32821 */ addu $a1, $a1, $s3 -/* 342E68 E0030D28 0C080118 */ jal func_E0200460 +/* 342E68 E0030D28 0C080118 */ jal shim_guMtxF2L /* 342E6C E0030D2C 00452821 */ addu $a1, $v0, $a1 /* 342E70 E0030D30 27A40018 */ addiu $a0, $sp, 0x18 /* 342E74 E0030D34 8E290000 */ lw $t1, ($s1) @@ -201,7 +201,7 @@ glabel func_E0030A68 /* 342EB4 E0030D74 8E050000 */ lw $a1, ($s0) /* 342EB8 E0030D78 25080001 */ addiu $t0, $t0, 1 /* 342EBC E0030D7C AE290000 */ sw $t1, ($s1) -/* 342EC0 E0030D80 0C080104 */ jal func_E0200410 +/* 342EC0 E0030D80 0C080104 */ jal shim_guRotateF /* 342EC4 E0030D84 A6C80000 */ sh $t0, ($s6) /* 342EC8 E0030D88 27A40018 */ addiu $a0, $sp, 0x18 /* 342ECC E0030D8C 96C50000 */ lhu $a1, ($s6) @@ -209,7 +209,7 @@ glabel func_E0030A68 /* 342ED4 E0030D94 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 342ED8 E0030D98 00052980 */ sll $a1, $a1, 6 /* 342EDC E0030D9C 00B32821 */ addu $a1, $a1, $s3 -/* 342EE0 E0030DA0 0C080118 */ jal func_E0200460 +/* 342EE0 E0030DA0 0C080118 */ jal shim_guMtxF2L /* 342EE4 E0030DA4 00452821 */ addu $a1, $v0, $a1 /* 342EE8 E0030DA8 8E240000 */ lw $a0, ($s1) /* 342EEC E0030DAC 96C30000 */ lhu $v1, ($s6) diff --git a/ver/us/asm/nonmatchings/effects/effect_24/fx_24_main.s b/ver/us/asm/nonmatchings/effects/effect_24/fx_24_main.s index e3901e090e..7f167d6d85 100644 --- a/ver/us/asm/nonmatchings/effects/effect_24/fx_24_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_24/fx_24_main.s @@ -43,7 +43,7 @@ glabel fx_24_main /* 3421D8 E0030098 00000000 */ nop /* 3421DC E003009C 45010190 */ bc1t .LE00306E0 /* 3421E0 E00300A0 00000000 */ nop -/* 3421E4 E00300A4 0C080154 */ jal func_E0200550 +/* 3421E4 E00300A4 0C080154 */ jal shim_sqrtf /* 3421E8 E00300A8 00000000 */ nop /* 3421EC E00300AC 3C01BF80 */ lui $at, 0xbf80 /* 3421F0 E00300B0 44811000 */ mtc1 $at, $f2 @@ -98,7 +98,7 @@ glabel fx_24_main /* 3422A8 E0030168 00000000 */ nop /* 3422AC E003016C 4501015C */ bc1t .LE00306E0 /* 3422B0 E0030170 00000000 */ nop -/* 3422B4 E0030174 0C080154 */ jal func_E0200550 +/* 3422B4 E0030174 0C080154 */ jal shim_sqrtf /* 3422B8 E0030178 00000000 */ nop /* 3422BC E003017C 3C013F80 */ lui $at, 0x3f80 /* 3422C0 E0030180 44811000 */ mtc1 $at, $f2 @@ -140,14 +140,14 @@ glabel fx_24_main /* 342350 E0030210 AC820010 */ sw $v0, 0x10($a0) /* 342354 E0030214 24020018 */ addiu $v0, $zero, 0x18 /* 342358 E0030218 AC800014 */ sw $zero, 0x14($a0) -/* 34235C E003021C 0C080124 */ jal func_E0200490 +/* 34235C E003021C 0C080124 */ jal shim_create_effect_instance /* 342360 E0030220 AC820004 */ sw $v0, 4($a0) /* 342364 E0030224 8FA800EC */ lw $t0, 0xec($sp) /* 342368 E0030228 0040802D */ daddu $s0, $v0, $zero /* 34236C E003022C 00082040 */ sll $a0, $t0, 1 /* 342370 E0030230 00882021 */ addu $a0, $a0, $t0 /* 342374 E0030234 00042100 */ sll $a0, $a0, 4 -/* 342378 E0030238 0C08012C */ jal func_E02004B0 +/* 342378 E0030238 0C08012C */ jal shim_general_heap_malloc /* 34237C E003023C AE080008 */ sw $t0, 8($s0) /* 342380 E0030240 0040982D */ daddu $s3, $v0, $zero /* 342384 E0030244 16600003 */ bnez $s3, .LE0030254 @@ -207,7 +207,7 @@ glabel fx_24_main /* 342444 E0030304 00000000 */ nop /* 342448 E0030308 468031A0 */ cvt.s.w $f6, $f6 /* 34244C E003030C 44053000 */ mfc1 $a1, $f6 -/* 342450 E0030310 0C080104 */ jal func_E0200410 +/* 342450 E0030310 0C080104 */ jal shim_guRotateF /* 342454 E0030314 E7BA0010 */ swc1 $f26, 0x10($sp) /* 342458 E0030318 C7A00030 */ lwc1 $f0, 0x30($sp) /* 34245C E003031C 461E0002 */ mul.s $f0, $f0, $f30 @@ -257,7 +257,7 @@ glabel fx_24_main /* 342508 E00303C8 00431021 */ addu $v0, $v0, $v1 /* 34250C E00303CC 000210C0 */ sll $v0, $v0, 3 /* 342510 E00303D0 005E1021 */ addu $v0, $v0, $fp -/* 342514 E00303D4 0C080140 */ jal func_E0200500 +/* 342514 E00303D4 0C080140 */ jal shim_sin_deg /* 342518 E00303D8 C44C006C */ lwc1 $f12, 0x6c($v0) /* 34251C E00303DC 8EE30000 */ lw $v1, ($s7) /* 342520 E00303E0 00031080 */ sll $v0, $v1, 2 @@ -269,7 +269,7 @@ glabel fx_24_main /* 342538 E00303F8 000210C0 */ sll $v0, $v0, 3 /* 34253C E00303FC 005E1021 */ addu $v0, $v0, $fp /* 342540 E0030400 C44C006C */ lwc1 $f12, 0x6c($v0) -/* 342544 E0030404 0C080144 */ jal func_E0200510 +/* 342544 E0030404 0C080144 */ jal shim_cos_deg /* 342548 E0030408 46000506 */ mov.s $f20, $f0 /* 34254C E003040C 24020001 */ addiu $v0, $zero, 1 /* 342550 E0030410 8FA800EC */ lw $t0, 0xec($sp) @@ -311,7 +311,7 @@ glabel fx_24_main /* 3425CC E003048C 00431021 */ addu $v0, $v0, $v1 /* 3425D0 E0030490 000210C0 */ sll $v0, $v0, 3 /* 3425D4 E0030494 005E1021 */ addu $v0, $v0, $fp -/* 3425D8 E0030498 0C080140 */ jal func_E0200500 +/* 3425D8 E0030498 0C080140 */ jal shim_sin_deg /* 3425DC E003049C C44C006C */ lwc1 $f12, 0x6c($v0) /* 3425E0 E00304A0 8EE30000 */ lw $v1, ($s7) /* 3425E4 E00304A4 00031080 */ sll $v0, $v1, 2 @@ -323,7 +323,7 @@ glabel fx_24_main /* 3425FC E00304BC 000210C0 */ sll $v0, $v0, 3 /* 342600 E00304C0 005E1021 */ addu $v0, $v0, $fp /* 342604 E00304C4 C44C006C */ lwc1 $f12, 0x6c($v0) -/* 342608 E00304C8 0C080144 */ jal func_E0200510 +/* 342608 E00304C8 0C080144 */ jal shim_cos_deg /* 34260C E00304CC 46000506 */ mov.s $f20, $f0 /* 342610 E00304D0 3C0143B4 */ lui $at, 0x43b4 /* 342614 E00304D4 44811000 */ mtc1 $at, $f2 @@ -343,7 +343,7 @@ glabel fx_24_main /* 34264C E003050C 44052000 */ mfc1 $a1, $f4 /* 342650 E0030510 0000382D */ daddu $a3, $zero, $zero .LE0030514: -/* 342654 E0030514 0C080104 */ jal func_E0200410 +/* 342654 E0030514 0C080104 */ jal shim_guRotateF /* 342658 E0030518 00000000 */ nop /* 34265C E003051C C7A00030 */ lwc1 $f0, 0x30($sp) /* 342660 E0030520 46160002 */ mul.s $f0, $f0, $f22 diff --git a/ver/us/asm/nonmatchings/effects/effect_25/func_E00321D8.s b/ver/us/asm/nonmatchings/effects/effect_25/func_E00321D8.s index 28a0df8fcb..d57e730b5e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_25/func_E00321D8.s +++ b/ver/us/asm/nonmatchings/effects/effect_25/func_E00321D8.s @@ -12,7 +12,7 @@ glabel func_E00321D8 /* 343874 E00321F4 2442FFFF */ addiu $v0, $v0, -1 /* 343878 E00321F8 04410005 */ bgez $v0, .LE0032210 /* 34387C E00321FC AE020030 */ sw $v0, 0x30($s0) -/* 343880 E0032200 0C080128 */ jal func_E02004A0 +/* 343880 E0032200 0C080128 */ jal shim_remove_effect /* 343884 E0032204 00000000 */ nop /* 343888 E0032208 0800C902 */ j .LE0032408 /* 34388C E003220C 00000000 */ nop @@ -25,7 +25,7 @@ glabel func_E00321D8 /* 3438A4 E0032224 24020007 */ addiu $v0, $zero, 7 /* 3438A8 E0032228 1642000A */ bne $s2, $v0, .LE0032254 /* 3438AC E003222C 24020001 */ addiu $v0, $zero, 1 -/* 3438B0 E0032230 0C080150 */ jal func_E0200540 +/* 3438B0 E0032230 0C080150 */ jal shim_load_effect /* 3438B4 E0032234 24040017 */ addiu $a0, $zero, 0x17 /* 3438B8 E0032238 8E050004 */ lw $a1, 4($s0) /* 3438BC E003223C 8E060008 */ lw $a2, 8($s0) @@ -37,7 +37,7 @@ glabel func_E00321D8 .LE0032254: /* 3438D4 E0032254 5642000E */ bnel $s2, $v0, .LE0032290 /* 3438D8 E0032258 2610003C */ addiu $s0, $s0, 0x3c -/* 3438DC E003225C 0C080150 */ jal func_E0200540 +/* 3438DC E003225C 0C080150 */ jal shim_load_effect /* 3438E0 E0032260 24040044 */ addiu $a0, $zero, 0x44 /* 3438E4 E0032264 3C013F80 */ lui $at, 0x3f80 /* 3438E8 E0032268 44810000 */ mtc1 $at, $f0 diff --git a/ver/us/asm/nonmatchings/effects/effect_25/func_E0032420.s b/ver/us/asm/nonmatchings/effects/effect_25/func_E0032420.s index 5d1ae34df1..b1e30218aa 100644 --- a/ver/us/asm/nonmatchings/effects/effect_25/func_E0032420.s +++ b/ver/us/asm/nonmatchings/effects/effect_25/func_E0032420.s @@ -12,7 +12,7 @@ glabel func_E0032420 /* 343ABC E003243C AFA40018 */ sw $a0, 0x18($sp) /* 343AC0 E0032440 27A40010 */ addiu $a0, $sp, 0x10 /* 343AC4 E0032444 AFBF0020 */ sw $ra, 0x20($sp) -/* 343AC8 E0032448 0C080120 */ jal func_E0200480 +/* 343AC8 E0032448 0C080120 */ jal shim_queue_render_task /* 343ACC E003244C AFA20010 */ sw $v0, 0x10($sp) /* 343AD0 E0032450 8FBF0020 */ lw $ra, 0x20($sp) /* 343AD4 E0032454 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_25/func_E003245C.s b/ver/us/asm/nonmatchings/effects/effect_25/func_E003245C.s index 22b0eccd50..928022969c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_25/func_E003245C.s +++ b/ver/us/asm/nonmatchings/effects/effect_25/func_E003245C.s @@ -42,7 +42,7 @@ glabel func_E003245C /* 343B70 E00324F0 8E250004 */ lw $a1, 4($s1) /* 343B74 E00324F4 8E260008 */ lw $a2, 8($s1) /* 343B78 E00324F8 8E27000C */ lw $a3, 0xc($s1) -/* 343B7C E00324FC 0C080108 */ jal func_E0200420 +/* 343B7C E00324FC 0C080108 */ jal shim_guTranslateF /* 343B80 E0032500 2631003C */ addiu $s1, $s1, 0x3c /* 343B84 E0032504 27B50058 */ addiu $s5, $sp, 0x58 /* 343B88 E0032508 4480B000 */ mtc1 $zero, $f22 @@ -65,11 +65,11 @@ glabel func_E003245C /* 343BCC E003254C 46000007 */ neg.s $f0, $f0 /* 343BD0 E0032550 44050000 */ mfc1 $a1, $f0 /* 343BD4 E0032554 02A0202D */ daddu $a0, $s5, $zero -/* 343BD8 E0032558 0C080104 */ jal func_E0200410 +/* 343BD8 E0032558 0C080104 */ jal shim_guRotateF /* 343BDC E003255C E7B60010 */ swc1 $f22, 0x10($sp) /* 343BE0 E0032560 02A0202D */ daddu $a0, $s5, $zero /* 343BE4 E0032564 27A50018 */ addiu $a1, $sp, 0x18 -/* 343BE8 E0032568 0C080114 */ jal func_E0200450 +/* 343BE8 E0032568 0C080114 */ jal shim_guMtxCatF /* 343BEC E003256C 00A0302D */ daddu $a2, $a1, $zero /* 343BF0 E0032570 27A40018 */ addiu $a0, $sp, 0x18 /* 343BF4 E0032574 3C148007 */ lui $s4, %hi(gMatrixListPos) @@ -80,7 +80,7 @@ glabel func_E003245C /* 343C08 E0032588 8EE20000 */ lw $v0, ($s7) /* 343C0C E003258C 00052980 */ sll $a1, $a1, 6 /* 343C10 E0032590 00B62821 */ addu $a1, $a1, $s6 -/* 343C14 E0032594 0C080118 */ jal func_E0200460 +/* 343C14 E0032594 0C080118 */ jal shim_guMtxF2L /* 343C18 E0032598 00452821 */ addu $a1, $v0, $a1 /* 343C1C E003259C 3C03DA38 */ lui $v1, 0xda38 /* 343C20 E00325A0 34630002 */ ori $v1, $v1, 2 @@ -111,14 +111,14 @@ glabel func_E003245C /* 343C84 E0032604 4407A000 */ mfc1 $a3, $f20 /* 343C88 E0032608 24C20008 */ addiu $v0, $a2, 8 /* 343C8C E003260C AE420000 */ sw $v0, ($s2) -/* 343C90 E0032610 0C080110 */ jal func_E0200440 +/* 343C90 E0032610 0C080110 */ jal shim_guScaleF /* 343C94 E0032614 00A0302D */ daddu $a2, $a1, $zero /* 343C98 E0032618 27A40018 */ addiu $a0, $sp, 0x18 /* 343C9C E003261C 96850000 */ lhu $a1, ($s4) /* 343CA0 E0032620 8EE20000 */ lw $v0, ($s7) /* 343CA4 E0032624 00052980 */ sll $a1, $a1, 6 /* 343CA8 E0032628 00B62821 */ addu $a1, $a1, $s6 -/* 343CAC E003262C 0C080118 */ jal func_E0200460 +/* 343CAC E003262C 0C080118 */ jal shim_guMtxF2L /* 343CB0 E0032630 00452821 */ addu $a1, $v0, $a1 /* 343CB4 E0032634 3C07D838 */ lui $a3, 0xd838 /* 343CB8 E0032638 34E70002 */ ori $a3, $a3, 2 @@ -170,24 +170,24 @@ glabel func_E003245C /* 343D6C E00326EC 24630008 */ addiu $v1, $v1, 8 /* 343D70 E00326F0 AE430000 */ sw $v1, ($s2) /* 343D74 E00326F4 00A0302D */ daddu $a2, $a1, $zero -/* 343D78 E00326F8 0C080110 */ jal func_E0200440 +/* 343D78 E00326F8 0C080110 */ jal shim_guScaleF /* 343D7C E00326FC 00A0382D */ daddu $a3, $a1, $zero /* 343D80 E0032700 4406B000 */ mfc1 $a2, $f22 /* 343D84 E0032704 02A0202D */ daddu $a0, $s5, $zero /* 343D88 E0032708 E7B40010 */ swc1 $f20, 0x10($sp) /* 343D8C E003270C 8E250028 */ lw $a1, 0x28($s1) -/* 343D90 E0032710 0C080104 */ jal func_E0200410 +/* 343D90 E0032710 0C080104 */ jal shim_guRotateF /* 343D94 E0032714 00C0382D */ daddu $a3, $a2, $zero /* 343D98 E0032718 02A0202D */ daddu $a0, $s5, $zero /* 343D9C E003271C 27A50018 */ addiu $a1, $sp, 0x18 -/* 343DA0 E0032720 0C080114 */ jal func_E0200450 +/* 343DA0 E0032720 0C080114 */ jal shim_guMtxCatF /* 343DA4 E0032724 00A0302D */ daddu $a2, $a1, $zero /* 343DA8 E0032728 27A40018 */ addiu $a0, $sp, 0x18 /* 343DAC E003272C 96850000 */ lhu $a1, ($s4) /* 343DB0 E0032730 8EE20000 */ lw $v0, ($s7) /* 343DB4 E0032734 00052980 */ sll $a1, $a1, 6 /* 343DB8 E0032738 00B62821 */ addu $a1, $a1, $s6 -/* 343DBC E003273C 0C080118 */ jal func_E0200460 +/* 343DBC E003273C 0C080118 */ jal shim_guMtxF2L /* 343DC0 E0032740 00452821 */ addu $a1, $v0, $a1 /* 343DC4 E0032744 24020001 */ addiu $v0, $zero, 1 /* 343DC8 E0032748 12620006 */ beq $s3, $v0, .LE0032764 diff --git a/ver/us/asm/nonmatchings/effects/effect_25/fx_25_main.s b/ver/us/asm/nonmatchings/effects/effect_25/fx_25_main.s index 4e924d17ee..8c11b46e22 100644 --- a/ver/us/asm/nonmatchings/effects/effect_25/fx_25_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_25/fx_25_main.s @@ -26,12 +26,12 @@ glabel fx_25_main /* 3436D4 E0032054 AC820010 */ sw $v0, 0x10($a0) /* 3436D8 E0032058 24020019 */ addiu $v0, $zero, 0x19 /* 3436DC E003205C AC800014 */ sw $zero, 0x14($a0) -/* 3436E0 E0032060 0C080124 */ jal func_E0200490 +/* 3436E0 E0032060 0C080124 */ jal shim_create_effect_instance /* 3436E4 E0032064 AC820004 */ sw $v0, 4($a0) /* 3436E8 E0032068 240400B4 */ addiu $a0, $zero, 0xb4 /* 3436EC E003206C 24030003 */ addiu $v1, $zero, 3 /* 3436F0 E0032070 0040802D */ daddu $s0, $v0, $zero -/* 3436F4 E0032074 0C08012C */ jal func_E02004B0 +/* 3436F4 E0032074 0C08012C */ jal shim_general_heap_malloc /* 3436F8 E0032078 AE030008 */ sw $v1, 8($s0) /* 3436FC E003207C 0040182D */ daddu $v1, $v0, $zero /* 343700 E0032080 14600003 */ bnez $v1, .LE0032090 diff --git a/ver/us/asm/nonmatchings/effects/effect_26/func_E0034110.s b/ver/us/asm/nonmatchings/effects/effect_26/func_E0034110.s index ea14e0bce0..1d06bd495c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_26/func_E0034110.s +++ b/ver/us/asm/nonmatchings/effects/effect_26/func_E0034110.s @@ -15,7 +15,7 @@ glabel func_E0034110 /* 344B48 E0034138 24420001 */ addiu $v0, $v0, 1 /* 344B4C E003413C 04610005 */ bgez $v1, .LE0034154 /* 344B50 E0034140 AE020030 */ sw $v0, 0x30($s0) -/* 344B54 E0034144 0C080128 */ jal func_E02004A0 +/* 344B54 E0034144 0C080128 */ jal shim_remove_effect /* 344B58 E0034148 00000000 */ nop /* 344B5C E003414C 0800D0AD */ j .LE00342B4 /* 344B60 E0034150 00000000 */ nop @@ -79,7 +79,7 @@ glabel func_E0034110 /* 344C3C E003422C E600001C */ swc1 $f0, 0x1c($s0) /* 344C40 E0034230 E6020010 */ swc1 $f2, 0x10($s0) /* 344C44 E0034234 46202120 */ cvt.s.d $f4, $f4 -/* 344C48 E0034238 0C080140 */ jal func_E0200500 +/* 344C48 E0034238 0C080140 */ jal shim_sin_deg /* 344C4C E003423C E6040014 */ swc1 $f4, 0x14($s0) /* 344C50 E0034240 3C013FE0 */ lui $at, 0x3fe0 /* 344C54 E0034244 44811800 */ mtc1 $at, $f3 @@ -97,7 +97,7 @@ glabel func_E0034110 /* 344C84 E0034274 00000000 */ nop /* 344C88 E0034278 46806320 */ cvt.s.w $f12, $f12 /* 344C8C E003427C 46200020 */ cvt.s.d $f0, $f0 -/* 344C90 E0034280 0C080140 */ jal func_E0200500 +/* 344C90 E0034280 0C080140 */ jal shim_sin_deg /* 344C94 E0034284 E6000020 */ swc1 $f0, 0x20($s0) /* 344C98 E0034288 3C014280 */ lui $at, 0x4280 /* 344C9C E003428C 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/effects/effect_26/func_E00342C8.s b/ver/us/asm/nonmatchings/effects/effect_26/func_E00342C8.s index b1ba67644c..357e0ba1ec 100644 --- a/ver/us/asm/nonmatchings/effects/effect_26/func_E00342C8.s +++ b/ver/us/asm/nonmatchings/effects/effect_26/func_E00342C8.s @@ -12,7 +12,7 @@ glabel func_E00342C8 /* 344CF4 E00342E4 AFA40018 */ sw $a0, 0x18($sp) /* 344CF8 E00342E8 27A40010 */ addiu $a0, $sp, 0x10 /* 344CFC E00342EC AFBF0020 */ sw $ra, 0x20($sp) -/* 344D00 E00342F0 0C080120 */ jal func_E0200480 +/* 344D00 E00342F0 0C080120 */ jal shim_queue_render_task /* 344D04 E00342F4 AFA20010 */ sw $v0, 0x10($sp) /* 344D08 E00342F8 8C430000 */ lw $v1, ($v0) /* 344D0C E00342FC 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_26/func_E0034310.s b/ver/us/asm/nonmatchings/effects/effect_26/func_E0034310.s index 77a5ffe527..7cb1ca3508 100644 --- a/ver/us/asm/nonmatchings/effects/effect_26/func_E0034310.s +++ b/ver/us/asm/nonmatchings/effects/effect_26/func_E0034310.s @@ -49,7 +49,7 @@ glabel func_E0034310 /* 344DD0 E00343C0 8E860008 */ lw $a2, 8($s4) /* 344DD4 E00343C4 8E87000C */ lw $a3, 0xc($s4) /* 344DD8 E00343C8 25080010 */ addiu $t0, $t0, 0x10 -/* 344DDC E00343CC 0C080108 */ jal func_E0200420 +/* 344DDC E00343CC 0C080108 */ jal shim_guTranslateF /* 344DE0 E00343D0 AEC80000 */ sw $t0, ($s6) /* 344DE4 E00343D4 27B50058 */ addiu $s5, $sp, 0x58 /* 344DE8 E00343D8 4480A000 */ mtc1 $zero, $f20 @@ -72,12 +72,12 @@ glabel func_E0034310 /* 344E2C E003441C 46000007 */ neg.s $f0, $f0 /* 344E30 E0034420 44050000 */ mfc1 $a1, $f0 /* 344E34 E0034424 02A0202D */ daddu $a0, $s5, $zero -/* 344E38 E0034428 0C080104 */ jal func_E0200410 +/* 344E38 E0034428 0C080104 */ jal shim_guRotateF /* 344E3C E003442C E7B40010 */ swc1 $f20, 0x10($sp) /* 344E40 E0034430 02A0202D */ daddu $a0, $s5, $zero /* 344E44 E0034434 27A50018 */ addiu $a1, $sp, 0x18 /* 344E48 E0034438 27BE0098 */ addiu $fp, $sp, 0x98 -/* 344E4C E003443C 0C080114 */ jal func_E0200450 +/* 344E4C E003443C 0C080114 */ jal shim_guMtxCatF /* 344E50 E0034440 03C0302D */ daddu $a2, $fp, $zero /* 344E54 E0034444 8E830030 */ lw $v1, 0x30($s4) /* 344E58 E0034448 8E970028 */ lw $s7, 0x28($s4) @@ -89,11 +89,11 @@ glabel func_E0034310 /* 344E70 E0034460 8E850020 */ lw $a1, 0x20($s4) /* 344E74 E0034464 36521630 */ ori $s2, $s2, 0x1630 /* 344E78 E0034468 00A0302D */ daddu $a2, $a1, $zero -/* 344E7C E003446C 0C080110 */ jal func_E0200440 +/* 344E7C E003446C 0C080110 */ jal shim_guScaleF /* 344E80 E0034470 00A0382D */ daddu $a3, $a1, $zero /* 344E84 E0034474 02A0202D */ daddu $a0, $s5, $zero /* 344E88 E0034478 03C0282D */ daddu $a1, $fp, $zero -/* 344E8C E003447C 0C080114 */ jal func_E0200450 +/* 344E8C E003447C 0C080114 */ jal shim_guMtxCatF /* 344E90 E0034480 27A60018 */ addiu $a2, $sp, 0x18 /* 344E94 E0034484 27A40018 */ addiu $a0, $sp, 0x18 /* 344E98 E0034488 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -104,7 +104,7 @@ glabel func_E0034310 /* 344EAC E003449C 8E220000 */ lw $v0, ($s1) /* 344EB0 E00344A0 00052980 */ sll $a1, $a1, 6 /* 344EB4 E00344A4 00B22821 */ addu $a1, $a1, $s2 -/* 344EB8 E00344A8 0C080118 */ jal func_E0200460 +/* 344EB8 E00344A8 0C080118 */ jal shim_guMtxF2L /* 344EBC E00344AC 00452821 */ addu $a1, $v0, $a1 /* 344EC0 E00344B0 3C022AAA */ lui $v0, 0x2aaa /* 344EC4 E00344B4 3442AAAB */ ori $v0, $v0, 0xaaab @@ -179,21 +179,21 @@ glabel func_E0034310 /* 344FD0 E00345C0 8E850018 */ lw $a1, 0x18($s4) /* 344FD4 E00345C4 36521630 */ ori $s2, $s2, 0x1630 /* 344FD8 E00345C8 00A0302D */ daddu $a2, $a1, $zero -/* 344FDC E00345CC 0C080110 */ jal func_E0200440 +/* 344FDC E00345CC 0C080110 */ jal shim_guScaleF /* 344FE0 E00345D0 00A0382D */ daddu $a3, $a1, $zero /* 344FE4 E00345D4 02A0202D */ daddu $a0, $s5, $zero /* 344FE8 E00345D8 03C0282D */ daddu $a1, $fp, $zero -/* 344FEC E00345DC 0C080114 */ jal func_E0200450 +/* 344FEC E00345DC 0C080114 */ jal shim_guMtxCatF /* 344FF0 E00345E0 27A60018 */ addiu $a2, $sp, 0x18 /* 344FF4 E00345E4 4406A000 */ mfc1 $a2, $f20 /* 344FF8 E00345E8 02A0202D */ daddu $a0, $s5, $zero /* 344FFC E00345EC E7B60010 */ swc1 $f22, 0x10($sp) /* 345000 E00345F0 8E850010 */ lw $a1, 0x10($s4) -/* 345004 E00345F4 0C080104 */ jal func_E0200410 +/* 345004 E00345F4 0C080104 */ jal shim_guRotateF /* 345008 E00345F8 00C0382D */ daddu $a3, $a2, $zero /* 34500C E00345FC 02A0202D */ daddu $a0, $s5, $zero /* 345010 E0034600 27A50018 */ addiu $a1, $sp, 0x18 -/* 345014 E0034604 0C080114 */ jal func_E0200450 +/* 345014 E0034604 0C080114 */ jal shim_guMtxCatF /* 345018 E0034608 00A0302D */ daddu $a2, $a1, $zero /* 34501C E003460C 27A40018 */ addiu $a0, $sp, 0x18 /* 345020 E0034610 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -204,7 +204,7 @@ glabel func_E0034310 /* 345034 E0034624 8E220000 */ lw $v0, ($s1) /* 345038 E0034628 00052980 */ sll $a1, $a1, 6 /* 34503C E003462C 00B22821 */ addu $a1, $a1, $s2 -/* 345040 E0034630 0C080118 */ jal func_E0200460 +/* 345040 E0034630 0C080118 */ jal shim_guMtxF2L /* 345044 E0034634 00452821 */ addu $a1, $v0, $a1 /* 345048 E0034638 3C0AD838 */ lui $t2, 0xd838 /* 34504C E003463C 8EC50000 */ lw $a1, ($s6) diff --git a/ver/us/asm/nonmatchings/effects/effect_26/fx_26_main.s b/ver/us/asm/nonmatchings/effects/effect_26/fx_26_main.s index 12de11166b..7d50593d67 100644 --- a/ver/us/asm/nonmatchings/effects/effect_26/fx_26_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_26/fx_26_main.s @@ -26,12 +26,12 @@ glabel fx_26_main /* 344A64 E0034054 AFB00028 */ sw $s0, 0x28($sp) /* 344A68 E0034058 AFA00010 */ sw $zero, 0x10($sp) /* 344A6C E003405C AFA00024 */ sw $zero, 0x24($sp) -/* 344A70 E0034060 0C080124 */ jal func_E0200490 +/* 344A70 E0034060 0C080124 */ jal shim_create_effect_instance /* 344A74 E0034064 AFA20014 */ sw $v0, 0x14($sp) /* 344A78 E0034068 24040034 */ addiu $a0, $zero, 0x34 /* 344A7C E003406C 24030001 */ addiu $v1, $zero, 1 /* 344A80 E0034070 0040802D */ daddu $s0, $v0, $zero -/* 344A84 E0034074 0C08012C */ jal func_E02004B0 +/* 344A84 E0034074 0C08012C */ jal shim_general_heap_malloc /* 344A88 E0034078 AE030008 */ sw $v1, 8($s0) /* 344A8C E003407C 0040182D */ daddu $v1, $v0, $zero /* 344A90 E0034080 14600003 */ bnez $v1, .LE0034090 diff --git a/ver/us/asm/nonmatchings/effects/effect_27/func_E00360E4.s b/ver/us/asm/nonmatchings/effects/effect_27/func_E00360E4.s index e5dfffc639..ded3de5ed6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_27/func_E00360E4.s +++ b/ver/us/asm/nonmatchings/effects/effect_27/func_E00360E4.s @@ -11,7 +11,7 @@ glabel func_E00360E4 /* 3455DC E00360FC 2462FFFF */ addiu $v0, $v1, -1 /* 3455E0 E0036100 04410005 */ bgez $v0, .LE0036118 /* 3455E4 E0036104 ACA20014 */ sw $v0, 0x14($a1) -/* 3455E8 E0036108 0C080128 */ jal func_E02004A0 +/* 3455E8 E0036108 0C080128 */ jal shim_remove_effect /* 3455EC E003610C 00000000 */ nop /* 3455F0 E0036110 0800D873 */ j .LE00361CC /* 3455F4 E0036114 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_27/func_E00361D8.s b/ver/us/asm/nonmatchings/effects/effect_27/func_E00361D8.s index 74b9b12dde..6260f698bf 100644 --- a/ver/us/asm/nonmatchings/effects/effect_27/func_E00361D8.s +++ b/ver/us/asm/nonmatchings/effects/effect_27/func_E00361D8.s @@ -11,7 +11,7 @@ glabel func_E00361D8 /* 3456D0 E00361F0 27A40010 */ addiu $a0, $sp, 0x10 /* 3456D4 E00361F4 AFBF0020 */ sw $ra, 0x20($sp) /* 3456D8 E00361F8 AFA00014 */ sw $zero, 0x14($sp) -/* 3456DC E00361FC 0C080120 */ jal func_E0200480 +/* 3456DC E00361FC 0C080120 */ jal shim_queue_render_task /* 3456E0 E0036200 AFA20010 */ sw $v0, 0x10($sp) /* 3456E4 E0036204 8C430000 */ lw $v1, ($v0) /* 3456E8 E0036208 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_27/func_E0036224.s b/ver/us/asm/nonmatchings/effects/effect_27/func_E0036224.s index dff61c0210..86a8a2ebf5 100644 --- a/ver/us/asm/nonmatchings/effects/effect_27/func_E0036224.s +++ b/ver/us/asm/nonmatchings/effects/effect_27/func_E0036224.s @@ -83,7 +83,7 @@ glabel func_E0036224 /* 345834 E0036354 8CE50004 */ lw $a1, 4($a3) /* 345838 E0036358 8CE60008 */ lw $a2, 8($a3) /* 34583C E003635C 8CE7000C */ lw $a3, 0xc($a3) -/* 345840 E0036360 0C080108 */ jal func_E0200420 +/* 345840 E0036360 0C080108 */ jal shim_guTranslateF /* 345844 E0036364 27A40018 */ addiu $a0, $sp, 0x18 /* 345848 E0036368 27B00058 */ addiu $s0, $sp, 0x58 /* 34584C E003636C 4480A000 */ mtc1 $zero, $f20 @@ -106,20 +106,20 @@ glabel func_E0036224 /* 345890 E00363B0 46000007 */ neg.s $f0, $f0 /* 345894 E00363B4 44050000 */ mfc1 $a1, $f0 /* 345898 E00363B8 0200202D */ daddu $a0, $s0, $zero -/* 34589C E00363BC 0C080104 */ jal func_E0200410 +/* 34589C E00363BC 0C080104 */ jal shim_guRotateF /* 3458A0 E00363C0 E7B40010 */ swc1 $f20, 0x10($sp) /* 3458A4 E00363C4 0200202D */ daddu $a0, $s0, $zero /* 3458A8 E00363C8 27A50018 */ addiu $a1, $sp, 0x18 -/* 3458AC E00363CC 0C080114 */ jal func_E0200450 +/* 3458AC E00363CC 0C080114 */ jal shim_guMtxCatF /* 3458B0 E00363D0 00A0302D */ daddu $a2, $a1, $zero /* 3458B4 E00363D4 0200202D */ daddu $a0, $s0, $zero /* 3458B8 E00363D8 4405A000 */ mfc1 $a1, $f20 /* 3458BC E00363DC 3C07C000 */ lui $a3, 0xc000 -/* 3458C0 E00363E0 0C080108 */ jal func_E0200420 +/* 3458C0 E00363E0 0C080108 */ jal shim_guTranslateF /* 3458C4 E00363E4 00A0302D */ daddu $a2, $a1, $zero /* 3458C8 E00363E8 0200202D */ daddu $a0, $s0, $zero /* 3458CC E00363EC 27A50018 */ addiu $a1, $sp, 0x18 -/* 3458D0 E00363F0 0C080114 */ jal func_E0200450 +/* 3458D0 E00363F0 0C080114 */ jal shim_guMtxCatF /* 3458D4 E00363F4 00A0302D */ daddu $a2, $a1, $zero /* 3458D8 E00363F8 3C01E003 */ lui $at, %hi(D_E0036650) /* 3458DC E00363FC D4226650 */ ldc1 $f2, %lo(D_E0036650)($at) @@ -132,11 +132,11 @@ glabel func_E0036224 /* 3458F8 E0036418 46200620 */ cvt.s.d $f24, $f0 /* 3458FC E003641C 4405C000 */ mfc1 $a1, $f24 /* 345900 E0036420 4407B000 */ mfc1 $a3, $f22 -/* 345904 E0036424 0C080110 */ jal func_E0200440 +/* 345904 E0036424 0C080110 */ jal shim_guScaleF /* 345908 E0036428 00A0302D */ daddu $a2, $a1, $zero /* 34590C E003642C 0200202D */ daddu $a0, $s0, $zero /* 345910 E0036430 27A50018 */ addiu $a1, $sp, 0x18 -/* 345914 E0036434 0C080114 */ jal func_E0200450 +/* 345914 E0036434 0C080114 */ jal shim_guMtxCatF /* 345918 E0036438 00A0302D */ daddu $a2, $a1, $zero /* 34591C E003643C 27A40018 */ addiu $a0, $sp, 0x18 /* 345920 E0036440 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -147,7 +147,7 @@ glabel func_E0036224 /* 345934 E0036454 8E220000 */ lw $v0, ($s1) /* 345938 E0036458 00052980 */ sll $a1, $a1, 6 /* 34593C E003645C 00B22821 */ addu $a1, $a1, $s2 -/* 345940 E0036460 0C080118 */ jal func_E0200460 +/* 345940 E0036460 0C080118 */ jal shim_guMtxF2L /* 345944 E0036464 00452821 */ addu $a1, $v0, $a1 /* 345948 E0036468 3C05DA38 */ lui $a1, 0xda38 /* 34594C E003646C 34A50002 */ ori $a1, $a1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_27/fx_27_main.s b/ver/us/asm/nonmatchings/effects/effect_27/fx_27_main.s index 5ebec31cc8..521aec39f8 100644 --- a/ver/us/asm/nonmatchings/effects/effect_27/fx_27_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_27/fx_27_main.s @@ -26,12 +26,12 @@ glabel fx_27_main /* 345534 E0036054 AFB00028 */ sw $s0, 0x28($sp) /* 345538 E0036058 AFA00010 */ sw $zero, 0x10($sp) /* 34553C E003605C AFA00024 */ sw $zero, 0x24($sp) -/* 345540 E0036060 0C080124 */ jal func_E0200490 +/* 345540 E0036060 0C080124 */ jal shim_create_effect_instance /* 345544 E0036064 AFA20014 */ sw $v0, 0x14($sp) /* 345548 E0036068 24040020 */ addiu $a0, $zero, 0x20 /* 34554C E003606C 24030001 */ addiu $v1, $zero, 1 /* 345550 E0036070 0040802D */ daddu $s0, $v0, $zero -/* 345554 E0036074 0C08012C */ jal func_E02004B0 +/* 345554 E0036074 0C08012C */ jal shim_general_heap_malloc /* 345558 E0036078 AE030008 */ sw $v1, 8($s0) /* 34555C E003607C 0040182D */ daddu $v1, $v0, $zero /* 345560 E0036080 14600003 */ bnez $v1, .LE0036090 diff --git a/ver/us/asm/nonmatchings/effects/effect_28/func_E0038424.s b/ver/us/asm/nonmatchings/effects/effect_28/func_E0038424.s index c7e39d290b..ba7a77b901 100644 --- a/ver/us/asm/nonmatchings/effects/effect_28/func_E0038424.s +++ b/ver/us/asm/nonmatchings/effects/effect_28/func_E0038424.s @@ -25,7 +25,7 @@ glabel func_E0038424 /* 34E194 E0038474 24450001 */ addiu $a1, $v0, 1 /* 34E198 E0038478 04810005 */ bgez $a0, .LE0038490 /* 34E19C E003847C AC65002C */ sw $a1, 0x2c($v1) -/* 34E1A0 E0038480 0C080128 */ jal func_E02004A0 +/* 34E1A0 E0038480 0C080128 */ jal shim_remove_effect /* 34E1A4 E0038484 0280202D */ daddu $a0, $s4, $zero /* 34E1A8 E0038488 0800E1B3 */ j .LE00386CC /* 34E1AC E003848C 00000000 */ nop @@ -89,14 +89,14 @@ glabel func_E0038424 /* 34E28C E003856C 44826000 */ mtc1 $v0, $f12 /* 34E290 E0038570 00000000 */ nop /* 34E294 E0038574 46806320 */ cvt.s.w $f12, $f12 -/* 34E298 E0038578 0C080140 */ jal func_E0200500 +/* 34E298 E0038578 0C080140 */ jal shim_sin_deg /* 34E29C E003857C AE030018 */ sw $v1, 0x18($s0) /* 34E2A0 E0038580 44926000 */ mtc1 $s2, $f12 /* 34E2A4 E0038584 00000000 */ nop /* 34E2A8 E0038588 46806320 */ cvt.s.w $f12, $f12 /* 34E2AC E003858C 461A6302 */ mul.s $f12, $f12, $f26 /* 34E2B0 E0038590 00000000 */ nop -/* 34E2B4 E0038594 0C080140 */ jal func_E0200500 +/* 34E2B4 E0038594 0C080140 */ jal shim_sin_deg /* 34E2B8 E0038598 46000506 */ mov.s $f20, $f0 /* 34E2BC E003859C 461CA502 */ mul.s $f20, $f20, $f28 /* 34E2C0 E00385A0 00000000 */ nop @@ -138,14 +138,14 @@ glabel func_E0038424 /* 34E34C E003862C 44836000 */ mtc1 $v1, $f12 /* 34E350 E0038630 00000000 */ nop /* 34E354 E0038634 46806320 */ cvt.s.w $f12, $f12 -/* 34E358 E0038638 0C080140 */ jal func_E0200500 +/* 34E358 E0038638 0C080140 */ jal shim_sin_deg /* 34E35C E003863C E6000008 */ swc1 $f0, 8($s0) /* 34E360 E0038640 44926000 */ mtc1 $s2, $f12 /* 34E364 E0038644 00000000 */ nop /* 34E368 E0038648 46806320 */ cvt.s.w $f12, $f12 /* 34E36C E003864C 461A6302 */ mul.s $f12, $f12, $f26 /* 34E370 E0038650 00000000 */ nop -/* 34E374 E0038654 0C080140 */ jal func_E0200500 +/* 34E374 E0038654 0C080140 */ jal shim_sin_deg /* 34E378 E0038658 46000506 */ mov.s $f20, $f0 /* 34E37C E003865C 461CA502 */ mul.s $f20, $f20, $f28 /* 34E380 E0038660 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_28/func_E0038704.s b/ver/us/asm/nonmatchings/effects/effect_28/func_E0038704.s index 1df2a8651f..9e72e9390b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_28/func_E0038704.s +++ b/ver/us/asm/nonmatchings/effects/effect_28/func_E0038704.s @@ -11,7 +11,7 @@ glabel func_E0038704 /* 34E43C E003871C 27A40010 */ addiu $a0, $sp, 0x10 /* 34E440 E0038720 AFBF0020 */ sw $ra, 0x20($sp) /* 34E444 E0038724 AFA00014 */ sw $zero, 0x14($sp) -/* 34E448 E0038728 0C080120 */ jal func_E0200480 +/* 34E448 E0038728 0C080120 */ jal shim_queue_render_task /* 34E44C E003872C AFA20010 */ sw $v0, 0x10($sp) /* 34E450 E0038730 8C430000 */ lw $v1, ($v0) /* 34E454 E0038734 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_28/func_E0038748.s b/ver/us/asm/nonmatchings/effects/effect_28/func_E0038748.s index e370db410a..a2033ecdc0 100644 --- a/ver/us/asm/nonmatchings/effects/effect_28/func_E0038748.s +++ b/ver/us/asm/nonmatchings/effects/effect_28/func_E0038748.s @@ -68,7 +68,7 @@ glabel func_E0038748 /* 34E560 E0038840 8E05FFE4 */ lw $a1, -0x1c($s0) /* 34E564 E0038844 8E06FFE8 */ lw $a2, -0x18($s0) /* 34E568 E0038848 8E07FFEC */ lw $a3, -0x14($s0) -/* 34E56C E003884C 0C080108 */ jal func_E0200420 +/* 34E56C E003884C 0C080108 */ jal shim_guTranslateF /* 34E570 E0038850 26520001 */ addiu $s2, $s2, 1 /* 34E574 E0038854 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 34E578 E0038858 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) @@ -86,38 +86,38 @@ glabel func_E0038748 /* 34E5A8 E0038888 46000007 */ neg.s $f0, $f0 /* 34E5AC E003888C 44050000 */ mfc1 $a1, $f0 /* 34E5B0 E0038890 0220202D */ daddu $a0, $s1, $zero -/* 34E5B4 E0038894 0C080104 */ jal func_E0200410 +/* 34E5B4 E0038894 0C080104 */ jal shim_guRotateF /* 34E5B8 E0038898 E7B40010 */ swc1 $f20, 0x10($sp) /* 34E5BC E003889C 0220202D */ daddu $a0, $s1, $zero /* 34E5C0 E00388A0 27A50018 */ addiu $a1, $sp, 0x18 -/* 34E5C4 E00388A4 0C080114 */ jal func_E0200450 +/* 34E5C4 E00388A4 0C080114 */ jal shim_guMtxCatF /* 34E5C8 E00388A8 00A0302D */ daddu $a2, $a1, $zero /* 34E5CC E00388AC E7B60010 */ swc1 $f22, 0x10($sp) /* 34E5D0 E00388B0 8E05FFFC */ lw $a1, -4($s0) /* 34E5D4 E00388B4 4406A000 */ mfc1 $a2, $f20 /* 34E5D8 E00388B8 4407A000 */ mfc1 $a3, $f20 -/* 34E5DC E00388BC 0C080104 */ jal func_E0200410 +/* 34E5DC E00388BC 0C080104 */ jal shim_guRotateF /* 34E5E0 E00388C0 0220202D */ daddu $a0, $s1, $zero /* 34E5E4 E00388C4 0220202D */ daddu $a0, $s1, $zero /* 34E5E8 E00388C8 27A50018 */ addiu $a1, $sp, 0x18 -/* 34E5EC E00388CC 0C080114 */ jal func_E0200450 +/* 34E5EC E00388CC 0C080114 */ jal shim_guMtxCatF /* 34E5F0 E00388D0 00A0302D */ daddu $a2, $a1, $zero /* 34E5F4 E00388D4 0220202D */ daddu $a0, $s1, $zero /* 34E5F8 E00388D8 8E050000 */ lw $a1, ($s0) /* 34E5FC E00388DC 26100030 */ addiu $s0, $s0, 0x30 /* 34E600 E00388E0 4407B000 */ mfc1 $a3, $f22 -/* 34E604 E00388E4 0C080110 */ jal func_E0200440 +/* 34E604 E00388E4 0C080110 */ jal shim_guScaleF /* 34E608 E00388E8 00A0302D */ daddu $a2, $a1, $zero /* 34E60C E00388EC 0220202D */ daddu $a0, $s1, $zero /* 34E610 E00388F0 27A50018 */ addiu $a1, $sp, 0x18 -/* 34E614 E00388F4 0C080114 */ jal func_E0200450 +/* 34E614 E00388F4 0C080114 */ jal shim_guMtxCatF /* 34E618 E00388F8 00A0302D */ daddu $a2, $a1, $zero /* 34E61C E00388FC 27A40018 */ addiu $a0, $sp, 0x18 /* 34E620 E0038900 96A50000 */ lhu $a1, ($s5) /* 34E624 E0038904 8EC20000 */ lw $v0, ($s6) /* 34E628 E0038908 00052980 */ sll $a1, $a1, 6 /* 34E62C E003890C 00B42821 */ addu $a1, $a1, $s4 -/* 34E630 E0038910 0C080118 */ jal func_E0200460 +/* 34E630 E0038910 0C080118 */ jal shim_guMtxF2L /* 34E634 E0038914 00452821 */ addu $a1, $v0, $a1 /* 34E638 E0038918 3C05D838 */ lui $a1, 0xd838 /* 34E63C E003891C 34A50002 */ ori $a1, $a1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_28/fx_28_main.s b/ver/us/asm/nonmatchings/effects/effect_28/fx_28_main.s index 165c6bd28f..7d8faad62e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_28/fx_28_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_28/fx_28_main.s @@ -28,7 +28,7 @@ glabel fx_28_main /* 34DD7C E003805C AFA400C8 */ sw $a0, 0xc8($sp) /* 34DD80 E0038060 AFA600D0 */ sw $a2, 0xd0($sp) /* 34DD84 E0038064 AFA700D4 */ sw $a3, 0xd4($sp) -/* 34DD88 E0038068 0C080154 */ jal func_E0200550 +/* 34DD88 E0038068 0C080154 */ jal shim_sqrtf /* 34DD8C E003806C 46006706 */ mov.s $f28, $f12 /* 34DD90 E0038070 4600C303 */ div.s $f12, $f24, $f0 /* 34DD94 E0038074 46166682 */ mul.s $f26, $f12, $f22 @@ -73,7 +73,7 @@ glabel fx_28_main /* 34DE24 E0038104 00000000 */ nop /* 34DE28 E0038108 450100B2 */ bc1t .LE00383D4 /* 34DE2C E003810C 00000000 */ nop -/* 34DE30 E0038110 0C080154 */ jal func_E0200550 +/* 34DE30 E0038110 0C080154 */ jal shim_sqrtf /* 34DE34 E0038114 00000000 */ nop /* 34DE38 E0038118 0200202D */ daddu $a0, $s0, $zero /* 34DE3C E003811C 3C014190 */ lui $at, 0x4190 @@ -96,13 +96,13 @@ glabel fx_28_main /* 34DE80 E0038160 AC800014 */ sw $zero, 0x14($a0) /* 34DE84 E0038164 4600B582 */ mul.s $f22, $f22, $f0 /* 34DE88 E0038168 00000000 */ nop -/* 34DE8C E003816C 0C080124 */ jal func_E0200490 +/* 34DE8C E003816C 0C080124 */ jal shim_create_effect_instance /* 34DE90 E0038170 AC820004 */ sw $v0, 4($a0) /* 34DE94 E0038174 00152040 */ sll $a0, $s5, 1 /* 34DE98 E0038178 00952021 */ addu $a0, $a0, $s5 /* 34DE9C E003817C 00042100 */ sll $a0, $a0, 4 /* 34DEA0 E0038180 0040802D */ daddu $s0, $v0, $zero -/* 34DEA4 E0038184 0C08012C */ jal func_E02004B0 +/* 34DEA4 E0038184 0C08012C */ jal shim_general_heap_malloc /* 34DEA8 E0038188 AE150008 */ sw $s5, 8($s0) /* 34DEAC E003818C 0040902D */ daddu $s2, $v0, $zero /* 34DEB0 E0038190 16400003 */ bnez $s2, .LE00381A0 @@ -140,7 +140,7 @@ glabel fx_28_main /* 34DF24 E0038204 C7A600D4 */ lwc1 $f6, 0xd4($sp) /* 34DF28 E0038208 00571021 */ addu $v0, $v0, $s7 /* 34DF2C E003820C E606FFE8 */ swc1 $f6, -0x18($s0) -/* 34DF30 E0038210 0C080140 */ jal func_E0200500 +/* 34DF30 E0038210 0C080140 */ jal shim_sin_deg /* 34DF34 E0038214 C44C006C */ lwc1 $f12, 0x6c($v0) /* 34DF38 E0038218 8EC30000 */ lw $v1, ($s6) /* 34DF3C E003821C 00031080 */ sll $v0, $v1, 2 @@ -152,7 +152,7 @@ glabel fx_28_main /* 34DF54 E0038234 000210C0 */ sll $v0, $v0, 3 /* 34DF58 E0038238 00571021 */ addu $v0, $v0, $s7 /* 34DF5C E003823C C44C006C */ lwc1 $f12, 0x6c($v0) -/* 34DF60 E0038240 0C080144 */ jal func_E0200510 +/* 34DF60 E0038240 0C080144 */ jal shim_cos_deg /* 34DF64 E0038244 46000506 */ mov.s $f20, $f0 /* 34DF68 E0038248 24020001 */ addiu $v0, $zero, 1 /* 34DF6C E003824C 12A20011 */ beq $s5, $v0, .LE0038294 @@ -182,7 +182,7 @@ glabel fx_28_main /* 34DFBC E003829C 44051000 */ mfc1 $a1, $f2 /* 34DFC0 E00382A0 4406A000 */ mfc1 $a2, $f20 /* 34DFC4 E00382A4 0000382D */ daddu $a3, $zero, $zero -/* 34DFC8 E00382A8 0C080104 */ jal func_E0200410 +/* 34DFC8 E00382A8 0C080104 */ jal shim_guRotateF /* 34DFCC E00382AC E7A00010 */ swc1 $f0, 0x10($sp) /* 34DFD0 E00382B0 16600002 */ bnez $s3, .LE00382BC /* 34DFD4 E00382B4 0233001A */ div $zero, $s1, $s3 diff --git a/ver/us/asm/nonmatchings/effects/effect_29/func_E003A1DC.s b/ver/us/asm/nonmatchings/effects/effect_29/func_E003A1DC.s index b677de0ec3..d455646547 100644 --- a/ver/us/asm/nonmatchings/effects/effect_29/func_E003A1DC.s +++ b/ver/us/asm/nonmatchings/effects/effect_29/func_E003A1DC.s @@ -23,7 +23,7 @@ glabel func_E003A1DC /* 34EEA4 E003A224 46001083 */ div.s $f2, $f2, $f0 /* 34EEA8 E003A228 04610005 */ bgez $v1, .LE003A240 /* 34EEAC E003A22C E4A20030 */ swc1 $f2, 0x30($a1) -/* 34EEB0 E003A230 0C080128 */ jal func_E02004A0 +/* 34EEB0 E003A230 0C080128 */ jal shim_remove_effect /* 34EEB4 E003A234 00000000 */ nop /* 34EEB8 E003A238 0800E8C1 */ j .LE003A304 /* 34EEBC E003A23C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_29/func_E003A310.s b/ver/us/asm/nonmatchings/effects/effect_29/func_E003A310.s index 353dc0d9a2..57012db935 100644 --- a/ver/us/asm/nonmatchings/effects/effect_29/func_E003A310.s +++ b/ver/us/asm/nonmatchings/effects/effect_29/func_E003A310.s @@ -11,7 +11,7 @@ glabel func_E003A310 /* 34EFA8 E003A328 27A40010 */ addiu $a0, $sp, 0x10 /* 34EFAC E003A32C AFBF0020 */ sw $ra, 0x20($sp) /* 34EFB0 E003A330 AFA00014 */ sw $zero, 0x14($sp) -/* 34EFB4 E003A334 0C080120 */ jal func_E0200480 +/* 34EFB4 E003A334 0C080120 */ jal shim_queue_render_task /* 34EFB8 E003A338 AFA20010 */ sw $v0, 0x10($sp) /* 34EFBC E003A33C 8C430000 */ lw $v1, ($v0) /* 34EFC0 E003A340 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_29/func_E003A354.s b/ver/us/asm/nonmatchings/effects/effect_29/func_E003A354.s index 8b815649dc..024b919205 100644 --- a/ver/us/asm/nonmatchings/effects/effect_29/func_E003A354.s +++ b/ver/us/asm/nonmatchings/effects/effect_29/func_E003A354.s @@ -70,7 +70,7 @@ glabel func_E003A354 /* 34F0D8 E003A458 2C420001 */ sltiu $v0, $v0, 1 /* 34F0DC E003A45C 4600110D */ trunc.w.s $f4, $f2 /* 34F0E0 E003A460 44162000 */ mfc1 $s6, $f4 -/* 34F0E4 E003A464 0C080108 */ jal func_E0200420 +/* 34F0E4 E003A464 0C080108 */ jal shim_guTranslateF /* 34F0E8 E003A468 AFA200DC */ sw $v0, 0xdc($sp) /* 34F0EC E003A46C 27B00058 */ addiu $s0, $sp, 0x58 /* 34F0F0 E003A470 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -91,12 +91,12 @@ glabel func_E003A354 /* 34F12C E003A4AC 46000007 */ neg.s $f0, $f0 /* 34F130 E003A4B0 44050000 */ mfc1 $a1, $f0 /* 34F134 E003A4B4 0200202D */ daddu $a0, $s0, $zero -/* 34F138 E003A4B8 0C080104 */ jal func_E0200410 +/* 34F138 E003A4B8 0C080104 */ jal shim_guRotateF /* 34F13C E003A4BC AFA60010 */ sw $a2, 0x10($sp) /* 34F140 E003A4C0 0200202D */ daddu $a0, $s0, $zero /* 34F144 E003A4C4 27A50018 */ addiu $a1, $sp, 0x18 /* 34F148 E003A4C8 27B00098 */ addiu $s0, $sp, 0x98 -/* 34F14C E003A4CC 0C080114 */ jal func_E0200450 +/* 34F14C E003A4CC 0C080114 */ jal shim_guMtxCatF /* 34F150 E003A4D0 0200302D */ daddu $a2, $s0, $zero /* 34F154 E003A4D4 0200202D */ daddu $a0, $s0, $zero /* 34F158 E003A4D8 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -107,7 +107,7 @@ glabel func_E003A354 /* 34F16C E003A4EC 8E220000 */ lw $v0, ($s1) /* 34F170 E003A4F0 00052980 */ sll $a1, $a1, 6 /* 34F174 E003A4F4 00B22821 */ addu $a1, $a1, $s2 -/* 34F178 E003A4F8 0C080118 */ jal func_E0200460 +/* 34F178 E003A4F8 0C080118 */ jal shim_guMtxF2L /* 34F17C E003A4FC 00452821 */ addu $a1, $v0, $a1 /* 34F180 E003A500 8E650000 */ lw $a1, ($s3) /* 34F184 E003A504 00A0202D */ daddu $a0, $a1, $zero @@ -225,14 +225,14 @@ glabel func_E003A354 /* 34F330 E003A6B0 8E05FFF8 */ lw $a1, -8($s0) /* 34F334 E003A6B4 8E06FFFC */ lw $a2, -4($s0) /* 34F338 E003A6B8 8E070000 */ lw $a3, ($s0) -/* 34F33C E003A6BC 0C080108 */ jal func_E0200420 +/* 34F33C E003A6BC 0C080108 */ jal shim_guTranslateF /* 34F340 E003A6C0 26100034 */ addiu $s0, $s0, 0x34 /* 34F344 E003A6C4 27A40018 */ addiu $a0, $sp, 0x18 /* 34F348 E003A6C8 96A50000 */ lhu $a1, ($s5) /* 34F34C E003A6CC 8EC20000 */ lw $v0, ($s6) /* 34F350 E003A6D0 00052980 */ sll $a1, $a1, 6 /* 34F354 E003A6D4 00B32821 */ addu $a1, $a1, $s3 -/* 34F358 E003A6D8 0C080118 */ jal func_E0200460 +/* 34F358 E003A6D8 0C080118 */ jal shim_guMtxF2L /* 34F35C E003A6DC 00452821 */ addu $a1, $v0, $a1 /* 34F360 E003A6E0 3C06D838 */ lui $a2, 0xd838 /* 34F364 E003A6E4 8E440000 */ lw $a0, ($s2) diff --git a/ver/us/asm/nonmatchings/effects/effect_29/fx_29_main.s b/ver/us/asm/nonmatchings/effects/effect_29/fx_29_main.s index 068fa22e92..1a6b570b77 100644 --- a/ver/us/asm/nonmatchings/effects/effect_29/fx_29_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_29/fx_29_main.s @@ -35,7 +35,7 @@ glabel fx_29_main /* 34ECF8 E003A078 AFA00010 */ sw $zero, 0x10($sp) /* 34ECFC E003A07C AFA00024 */ sw $zero, 0x24($sp) /* 34ED00 E003A080 AFA20014 */ sw $v0, 0x14($sp) -/* 34ED04 E003A084 0C080124 */ jal func_E0200490 +/* 34ED04 E003A084 0C080124 */ jal shim_create_effect_instance /* 34ED08 E003A088 26730001 */ addiu $s3, $s3, 1 /* 34ED0C E003A08C 00132040 */ sll $a0, $s3, 1 /* 34ED10 E003A090 00932021 */ addu $a0, $a0, $s3 @@ -43,7 +43,7 @@ glabel fx_29_main /* 34ED18 E003A098 00932021 */ addu $a0, $a0, $s3 /* 34ED1C E003A09C 00042080 */ sll $a0, $a0, 2 /* 34ED20 E003A0A0 0040802D */ daddu $s0, $v0, $zero -/* 34ED24 E003A0A4 0C08012C */ jal func_E02004B0 +/* 34ED24 E003A0A4 0C08012C */ jal shim_general_heap_malloc /* 34ED28 E003A0A8 AE130008 */ sw $s3, 8($s0) /* 34ED2C E003A0AC 0040882D */ daddu $s1, $v0, $zero /* 34ED30 E003A0B0 16200003 */ bnez $s1, .LE003A0C0 @@ -57,7 +57,7 @@ glabel fx_29_main /* 34ED48 E003A0C8 00B32821 */ addu $a1, $a1, $s3 /* 34ED4C E003A0CC 00052880 */ sll $a1, $a1, 2 /* 34ED50 E003A0D0 00B32821 */ addu $a1, $a1, $s3 -/* 34ED54 E003A0D4 0C080130 */ jal func_E02004C0 +/* 34ED54 E003A0D4 0C080130 */ jal shim_mem_clear /* 34ED58 E003A0D8 00052880 */ sll $a1, $a1, 2 /* 34ED5C E003A0DC 3C014120 */ lui $at, 0x4120 /* 34ED60 E003A0E0 44811000 */ mtc1 $at, $f2 @@ -101,11 +101,11 @@ glabel fx_29_main /* 34EDEC E003A16C 4614D500 */ add.s $f20, $f26, $f20 /* 34EDF0 E003A170 AE00FFF0 */ sw $zero, -0x10($s0) /* 34EDF4 E003A174 AE00FFF4 */ sw $zero, -0xc($s0) -/* 34EDF8 E003A178 0C080140 */ jal func_E0200500 +/* 34EDF8 E003A178 0C080140 */ jal shim_sin_deg /* 34EDFC E003A17C 4600A306 */ mov.s $f12, $f20 /* 34EE00 E003A180 4600A306 */ mov.s $f12, $f20 /* 34EE04 E003A184 E600FFF8 */ swc1 $f0, -8($s0) -/* 34EE08 E003A188 0C080144 */ jal func_E0200510 +/* 34EE08 E003A188 0C080144 */ jal shim_cos_deg /* 34EE0C E003A18C AE00FFFC */ sw $zero, -4($s0) /* 34EE10 E003A190 E6000000 */ swc1 $f0, ($s0) /* 34EE14 E003A194 0253102A */ slt $v0, $s2, $s3 diff --git a/ver/us/asm/nonmatchings/effects/effect_30/func_E003C244.s b/ver/us/asm/nonmatchings/effects/effect_30/func_E003C244.s index 034d3a7873..969132af67 100644 --- a/ver/us/asm/nonmatchings/effects/effect_30/func_E003C244.s +++ b/ver/us/asm/nonmatchings/effects/effect_30/func_E003C244.s @@ -17,7 +17,7 @@ glabel func_E003C244 /* 34F730 E003C270 24C80001 */ addiu $t0, $a2, 1 /* 34F734 E003C274 04610005 */ bgez $v1, .LE003C28C /* 34F738 E003C278 ACA80034 */ sw $t0, 0x34($a1) -/* 34F73C E003C27C 0C080128 */ jal func_E02004A0 +/* 34F73C E003C27C 0C080128 */ jal shim_remove_effect /* 34F740 E003C280 00000000 */ nop /* 34F744 E003C284 0800F119 */ j .LE003C464 /* 34F748 E003C288 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_30/func_E003C498.s b/ver/us/asm/nonmatchings/effects/effect_30/func_E003C498.s index 6d335ef2c6..fd6aa2847f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_30/func_E003C498.s +++ b/ver/us/asm/nonmatchings/effects/effect_30/func_E003C498.s @@ -45,7 +45,7 @@ glabel func_E003C498 /* 34F9F8 E003C538 8E860008 */ lw $a2, 8($s4) /* 34F9FC E003C53C 8E87000C */ lw $a3, 0xc($s4) /* 34FA00 E003C540 25080008 */ addiu $t0, $t0, 8 -/* 34FA04 E003C544 0C080108 */ jal func_E0200420 +/* 34FA04 E003C544 0C080108 */ jal shim_guTranslateF /* 34FA08 E003C548 AE680000 */ sw $t0, ($s3) /* 34FA0C E003C54C 27B00060 */ addiu $s0, $sp, 0x60 /* 34FA10 E003C550 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -66,11 +66,11 @@ glabel func_E003C498 /* 34FA4C E003C58C 46000007 */ neg.s $f0, $f0 /* 34FA50 E003C590 44050000 */ mfc1 $a1, $f0 /* 34FA54 E003C594 0200202D */ daddu $a0, $s0, $zero -/* 34FA58 E003C598 0C080104 */ jal func_E0200410 +/* 34FA58 E003C598 0C080104 */ jal shim_guRotateF /* 34FA5C E003C59C AFA60010 */ sw $a2, 0x10($sp) /* 34FA60 E003C5A0 0200202D */ daddu $a0, $s0, $zero /* 34FA64 E003C5A4 27A50020 */ addiu $a1, $sp, 0x20 -/* 34FA68 E003C5A8 0C080114 */ jal func_E0200450 +/* 34FA68 E003C5A8 0C080114 */ jal shim_guMtxCatF /* 34FA6C E003C5AC 00A0302D */ daddu $a2, $a1, $zero /* 34FA70 E003C5B0 27A40020 */ addiu $a0, $sp, 0x20 /* 34FA74 E003C5B4 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -81,7 +81,7 @@ glabel func_E003C498 /* 34FA88 E003C5C8 8E220000 */ lw $v0, ($s1) /* 34FA8C E003C5CC 00052980 */ sll $a1, $a1, 6 /* 34FA90 E003C5D0 00B22821 */ addu $a1, $a1, $s2 -/* 34FA94 E003C5D4 0C080118 */ jal func_E0200460 +/* 34FA94 E003C5D4 0C080118 */ jal shim_guMtxF2L /* 34FA98 E003C5D8 00452821 */ addu $a1, $v0, $a1 /* 34FA9C E003C5DC 8E670000 */ lw $a3, ($s3) /* 34FAA0 E003C5E0 00E0282D */ daddu $a1, $a3, $zero @@ -212,14 +212,14 @@ glabel func_E003C498 /* 34FC88 E003C7C8 C620FFDC */ lwc1 $f0, -0x24($s1) /* 34FC8C E003C7CC E7A00018 */ swc1 $f0, 0x18($sp) /* 34FC90 E003C7D0 C620FFE0 */ lwc1 $f0, -0x20($s1) -/* 34FC94 E003C7D4 0C080180 */ jal func_E0200600 +/* 34FC94 E003C7D4 0C080180 */ jal shim_guPositionF /* 34FC98 E003C7D8 E7A0001C */ swc1 $f0, 0x1c($sp) /* 34FC9C E003C7DC 27A40020 */ addiu $a0, $sp, 0x20 /* 34FCA0 E003C7E0 96C50000 */ lhu $a1, ($s6) /* 34FCA4 E003C7E4 8EE20000 */ lw $v0, ($s7) /* 34FCA8 E003C7E8 00052980 */ sll $a1, $a1, 6 /* 34FCAC E003C7EC 00B32821 */ addu $a1, $a1, $s3 -/* 34FCB0 E003C7F0 0C080118 */ jal func_E0200460 +/* 34FCB0 E003C7F0 0C080118 */ jal shim_guMtxF2L /* 34FCB4 E003C7F4 00452821 */ addu $a1, $v0, $a1 /* 34FCB8 E003C7F8 8E080000 */ lw $t0, ($s0) /* 34FCBC E003C7FC 96C90000 */ lhu $t1, ($s6) @@ -276,14 +276,14 @@ glabel func_E003C498 /* 34FD88 E003C8C8 AE020000 */ sw $v0, ($s0) /* 34FD8C E003C8CC AE080000 */ sw $t0, ($s0) /* 34FD90 E003C8D0 46200020 */ cvt.s.d $f0, $f0 -/* 34FD94 E003C8D4 0C080180 */ jal func_E0200600 +/* 34FD94 E003C8D4 0C080180 */ jal shim_guPositionF /* 34FD98 E003C8D8 E7A0001C */ swc1 $f0, 0x1c($sp) /* 34FD9C E003C8DC 27A40020 */ addiu $a0, $sp, 0x20 /* 34FDA0 E003C8E0 96C50000 */ lhu $a1, ($s6) /* 34FDA4 E003C8E4 8EE20000 */ lw $v0, ($s7) /* 34FDA8 E003C8E8 00052980 */ sll $a1, $a1, 6 /* 34FDAC E003C8EC 00B32821 */ addu $a1, $a1, $s3 -/* 34FDB0 E003C8F0 0C080118 */ jal func_E0200460 +/* 34FDB0 E003C8F0 0C080118 */ jal shim_guMtxF2L /* 34FDB4 E003C8F4 00452821 */ addu $a1, $v0, $a1 /* 34FDB8 E003C8F8 8E040000 */ lw $a0, ($s0) /* 34FDBC E003C8FC 96C30000 */ lhu $v1, ($s6) @@ -323,14 +323,14 @@ glabel func_E003C498 /* 34FE40 E003C980 8E26FFD0 */ lw $a2, -0x30($s1) /* 34FE44 E003C984 8E27FFD4 */ lw $a3, -0x2c($s1) /* 34FE48 E003C988 24630008 */ addiu $v1, $v1, 8 -/* 34FE4C E003C98C 0C080108 */ jal func_E0200420 +/* 34FE4C E003C98C 0C080108 */ jal shim_guTranslateF /* 34FE50 E003C990 AE030000 */ sw $v1, ($s0) /* 34FE54 E003C994 27A40020 */ addiu $a0, $sp, 0x20 /* 34FE58 E003C998 96C50000 */ lhu $a1, ($s6) /* 34FE5C E003C99C 8EE20000 */ lw $v0, ($s7) /* 34FE60 E003C9A0 00052980 */ sll $a1, $a1, 6 /* 34FE64 E003C9A4 00B32821 */ addu $a1, $a1, $s3 -/* 34FE68 E003C9A8 0C080118 */ jal func_E0200460 +/* 34FE68 E003C9A8 0C080118 */ jal shim_guMtxF2L /* 34FE6C E003C9AC 00452821 */ addu $a1, $v0, $a1 /* 34FE70 E003C9B0 27A40020 */ addiu $a0, $sp, 0x20 /* 34FE74 E003C9B4 8E060000 */ lw $a2, ($s0) @@ -350,14 +350,14 @@ glabel func_E003C498 /* 34FEAC E003C9EC 25080001 */ addiu $t0, $t0, 1 /* 34FEB0 E003C9F0 AE060000 */ sw $a2, ($s0) /* 34FEB4 E003C9F4 A6C80000 */ sh $t0, ($s6) -/* 34FEB8 E003C9F8 0C080110 */ jal func_E0200440 +/* 34FEB8 E003C9F8 0C080110 */ jal shim_guScaleF /* 34FEBC E003C9FC 00A0302D */ daddu $a2, $a1, $zero /* 34FEC0 E003CA00 27A40020 */ addiu $a0, $sp, 0x20 /* 34FEC4 E003CA04 96C50000 */ lhu $a1, ($s6) /* 34FEC8 E003CA08 8EE20000 */ lw $v0, ($s7) /* 34FECC E003CA0C 00052980 */ sll $a1, $a1, 6 /* 34FED0 E003CA10 00B32821 */ addu $a1, $a1, $s3 -/* 34FED4 E003CA14 0C080118 */ jal func_E0200460 +/* 34FED4 E003CA14 0C080118 */ jal shim_guMtxF2L /* 34FED8 E003CA18 00452821 */ addu $a1, $v0, $a1 /* 34FEDC E003CA1C 8E050000 */ lw $a1, ($s0) /* 34FEE0 E003CA20 96C30000 */ lhu $v1, ($s6) diff --git a/ver/us/asm/nonmatchings/effects/effect_30/fx_30_main.s b/ver/us/asm/nonmatchings/effects/effect_30/fx_30_main.s index 9be651d047..ee04941c27 100644 --- a/ver/us/asm/nonmatchings/effects/effect_30/fx_30_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_30/fx_30_main.s @@ -41,11 +41,11 @@ glabel fx_30_main /* 34F54C E003C08C AFA20024 */ sw $v0, 0x24($sp) /* 34F550 E003C090 2402001E */ addiu $v0, $zero, 0x1e /* 34F554 E003C094 AFA00010 */ sw $zero, 0x10($sp) -/* 34F558 E003C098 0C080124 */ jal func_E0200490 +/* 34F558 E003C098 0C080124 */ jal shim_create_effect_instance /* 34F55C E003C09C AFA20014 */ sw $v0, 0x14($sp) /* 34F560 E003C0A0 00122180 */ sll $a0, $s2, 6 /* 34F564 E003C0A4 0040982D */ daddu $s3, $v0, $zero -/* 34F568 E003C0A8 0C08012C */ jal func_E02004B0 +/* 34F568 E003C0A8 0C08012C */ jal shim_general_heap_malloc /* 34F56C E003C0AC AE720008 */ sw $s2, 8($s3) /* 34F570 E003C0B0 0040182D */ daddu $v1, $v0, $zero /* 34F574 E003C0B4 14600003 */ bnez $v1, .LE003C0C4 @@ -109,7 +109,7 @@ glabel fx_30_main /* 34F650 E003C190 4614E500 */ add.s $f20, $f28, $f20 /* 34F654 E003C194 E600FFEC */ swc1 $f0, -0x14($s0) /* 34F658 E003C198 E602000C */ swc1 $f2, 0xc($s0) -/* 34F65C E003C19C 0C080140 */ jal func_E0200500 +/* 34F65C E003C19C 0C080140 */ jal shim_sin_deg /* 34F660 E003C1A0 4600A306 */ mov.s $f12, $f20 /* 34F664 E003C1A4 46000007 */ neg.s $f0, $f0 /* 34F668 E003C1A8 46180002 */ mul.s $f0, $f0, $f24 @@ -119,7 +119,7 @@ glabel fx_30_main /* 34F678 E003C1B8 00000000 */ nop /* 34F67C E003C1BC 4600A306 */ mov.s $f12, $f20 /* 34F680 E003C1C0 46200020 */ cvt.s.d $f0, $f0 -/* 34F684 E003C1C4 0C080144 */ jal func_E0200510 +/* 34F684 E003C1C4 0C080144 */ jal shim_cos_deg /* 34F688 E003C1C8 E600FFF0 */ swc1 $f0, -0x10($s0) /* 34F68C E003C1CC 46180002 */ mul.s $f0, $f0, $f24 /* 34F690 E003C1D0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_31/func_E003E400.s b/ver/us/asm/nonmatchings/effects/effect_31/func_E003E400.s index 9c5ab0ccf5..37ceb565e2 100644 --- a/ver/us/asm/nonmatchings/effects/effect_31/func_E003E400.s +++ b/ver/us/asm/nonmatchings/effects/effect_31/func_E003E400.s @@ -15,7 +15,7 @@ glabel func_E003E400 /* 352868 E003E428 24420001 */ addiu $v0, $v0, 1 /* 35286C E003E42C 04A10005 */ bgez $a1, .LE003E444 /* 352870 E003E430 AC620070 */ sw $v0, 0x70($v1) -/* 352874 E003E434 0C080128 */ jal func_E02004A0 +/* 352874 E003E434 0C080128 */ jal shim_remove_effect /* 352878 E003E438 00000000 */ nop /* 35287C E003E43C 0800F978 */ j .LE003E5E0 /* 352880 E003E440 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_31/func_E003E5F4.s b/ver/us/asm/nonmatchings/effects/effect_31/func_E003E5F4.s index 05c47671e5..9f636c33a9 100644 --- a/ver/us/asm/nonmatchings/effects/effect_31/func_E003E5F4.s +++ b/ver/us/asm/nonmatchings/effects/effect_31/func_E003E5F4.s @@ -11,7 +11,7 @@ glabel func_E003E5F4 /* 352A4C E003E60C 27A40010 */ addiu $a0, $sp, 0x10 /* 352A50 E003E610 AFBF0020 */ sw $ra, 0x20($sp) /* 352A54 E003E614 AFA00014 */ sw $zero, 0x14($sp) -/* 352A58 E003E618 0C080120 */ jal func_E0200480 +/* 352A58 E003E618 0C080120 */ jal shim_queue_render_task /* 352A5C E003E61C AFA20010 */ sw $v0, 0x10($sp) /* 352A60 E003E620 8C430000 */ lw $v1, ($v0) /* 352A64 E003E624 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_31/func_E003E638.s b/ver/us/asm/nonmatchings/effects/effect_31/func_E003E638.s index 1de085138a..94b4337dcd 100644 --- a/ver/us/asm/nonmatchings/effects/effect_31/func_E003E638.s +++ b/ver/us/asm/nonmatchings/effects/effect_31/func_E003E638.s @@ -62,21 +62,21 @@ glabel func_E003E638 /* 352B5C E003E71C 8E07000C */ lw $a3, 0xc($s0) /* 352B60 E003E720 4600008D */ trunc.w.s $f2, $f0 /* 352B64 E003E724 44111000 */ mfc1 $s1, $f2 -/* 352B68 E003E728 0C080108 */ jal func_E0200420 +/* 352B68 E003E728 0C080108 */ jal shim_guTranslateF /* 352B6C E003E72C 36B51630 */ ori $s5, $s5, 0x1630 /* 352B70 E003E730 2604001C */ addiu $a0, $s0, 0x1c /* 352B74 E003E734 27A50010 */ addiu $a1, $sp, 0x10 -/* 352B78 E003E738 0C080114 */ jal func_E0200450 +/* 352B78 E003E738 0C080114 */ jal shim_guMtxCatF /* 352B7C E003E73C 00A0302D */ daddu $a2, $a1, $zero /* 352B80 E003E740 8E050064 */ lw $a1, 0x64($s0) /* 352B84 E003E744 27B00050 */ addiu $s0, $sp, 0x50 /* 352B88 E003E748 0200202D */ daddu $a0, $s0, $zero /* 352B8C E003E74C 00A0302D */ daddu $a2, $a1, $zero -/* 352B90 E003E750 0C080110 */ jal func_E0200440 +/* 352B90 E003E750 0C080110 */ jal shim_guScaleF /* 352B94 E003E754 00A0382D */ daddu $a3, $a1, $zero /* 352B98 E003E758 0200202D */ daddu $a0, $s0, $zero /* 352B9C E003E75C 27A50010 */ addiu $a1, $sp, 0x10 -/* 352BA0 E003E760 0C080114 */ jal func_E0200450 +/* 352BA0 E003E760 0C080114 */ jal shim_guMtxCatF /* 352BA4 E003E764 00A0302D */ daddu $a2, $a1, $zero /* 352BA8 E003E768 27A40010 */ addiu $a0, $sp, 0x10 /* 352BAC E003E76C 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -87,7 +87,7 @@ glabel func_E003E638 /* 352BC0 E003E780 8E620000 */ lw $v0, ($s3) /* 352BC4 E003E784 00052980 */ sll $a1, $a1, 6 /* 352BC8 E003E788 00B52821 */ addu $a1, $a1, $s5 -/* 352BCC E003E78C 0C080118 */ jal func_E0200460 +/* 352BCC E003E78C 0C080118 */ jal shim_guMtxF2L /* 352BD0 E003E790 00452821 */ addu $a1, $v0, $a1 /* 352BD4 E003E794 3C06D838 */ lui $a2, 0xd838 /* 352BD8 E003E798 8E440000 */ lw $a0, ($s2) diff --git a/ver/us/asm/nonmatchings/effects/effect_31/fx_31_main.s b/ver/us/asm/nonmatchings/effects/effect_31/fx_31_main.s index 13d614db0a..c35e567d0e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_31/fx_31_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_31/fx_31_main.s @@ -49,7 +49,7 @@ glabel fx_31_main /* 3524EC E003E0AC 00000000 */ nop /* 3524F0 E003E0B0 450100C5 */ bc1t .LE003E3C8 /* 3524F4 E003E0B4 0000102D */ daddu $v0, $zero, $zero -/* 3524F8 E003E0B8 0C080154 */ jal func_E0200550 +/* 3524F8 E003E0B8 0C080154 */ jal shim_sqrtf /* 3524FC E003E0BC 00000000 */ nop /* 352500 E003E0C0 3C013F80 */ lui $at, 0x3f80 /* 352504 E003E0C4 44811000 */ mtc1 $at, $f2 @@ -91,7 +91,7 @@ glabel fx_31_main /* 352588 E003E148 00000000 */ nop /* 35258C E003E14C 4501009E */ bc1t .LE003E3C8 /* 352590 E003E150 0000102D */ daddu $v0, $zero, $zero -/* 352594 E003E154 0C080154 */ jal func_E0200550 +/* 352594 E003E154 0C080154 */ jal shim_sqrtf /* 352598 E003E158 00000000 */ nop /* 35259C E003E15C 3C013F80 */ lui $at, 0x3f80 /* 3525A0 E003E160 44819000 */ mtc1 $at, $f18 @@ -136,7 +136,7 @@ glabel fx_31_main /* 35263C E003E1FC 0800F8F2 */ j .LE003E3C8 /* 352640 E003E200 0000102D */ daddu $v0, $zero, $zero .LE003E204: -/* 352644 E003E204 0C080154 */ jal func_E0200550 +/* 352644 E003E204 0C080154 */ jal shim_sqrtf /* 352648 E003E208 00000000 */ nop /* 35264C E003E20C 3C013F80 */ lui $at, 0x3f80 /* 352650 E003E210 44819000 */ mtc1 $at, $f18 @@ -166,13 +166,13 @@ glabel fx_31_main /* 3526B0 E003E270 2402001F */ addiu $v0, $zero, 0x1f /* 3526B4 E003E274 AC800000 */ sw $zero, ($a0) /* 3526B8 E003E278 AC800014 */ sw $zero, 0x14($a0) -/* 3526BC E003E27C 0C080124 */ jal func_E0200490 +/* 3526BC E003E27C 0C080124 */ jal shim_create_effect_instance /* 3526C0 E003E280 AC820004 */ sw $v0, 4($a0) /* 3526C4 E003E284 00112140 */ sll $a0, $s1, 5 /* 3526C8 E003E288 00912023 */ subu $a0, $a0, $s1 /* 3526CC E003E28C 00042080 */ sll $a0, $a0, 2 /* 3526D0 E003E290 0040802D */ daddu $s0, $v0, $zero -/* 3526D4 E003E294 0C08012C */ jal func_E02004B0 +/* 3526D4 E003E294 0C08012C */ jal shim_general_heap_malloc /* 3526D8 E003E298 AE110008 */ sw $s1, 8($s0) /* 3526DC E003E29C 0040302D */ daddu $a2, $v0, $zero /* 3526E0 E003E2A0 14C00003 */ bnez $a2, .LE003E2B0 diff --git a/ver/us/asm/nonmatchings/effects/effect_32/func_E0040210.s b/ver/us/asm/nonmatchings/effects/effect_32/func_E0040210.s index 4459ea1939..78a4ff8d05 100644 --- a/ver/us/asm/nonmatchings/effects/effect_32/func_E0040210.s +++ b/ver/us/asm/nonmatchings/effects/effect_32/func_E0040210.s @@ -33,7 +33,7 @@ glabel func_E0040210 /* 353580 E0040280 8CE50004 */ lw $a1, 4($a3) /* 353584 E0040284 8CE60008 */ lw $a2, 8($a3) /* 353588 E0040288 8CE7000C */ lw $a3, 0xc($a3) -/* 35358C E004028C 0C080168 */ jal func_E02005A0 +/* 35358C E004028C 0C080168 */ jal shim_transform_point /* 353590 E0040290 00822021 */ addu $a0, $a0, $v0 /* 353594 E0040294 C7A00040 */ lwc1 $f0, 0x40($sp) /* 353598 E0040298 3C01459C */ lui $at, 0x459c @@ -76,7 +76,7 @@ glabel func_E0040210 /* 353620 E0040320 AC820004 */ sw $v0, 4($a0) /* 353624 E0040324 24020011 */ addiu $v0, $zero, 0x11 /* 353628 E0040328 AC910008 */ sw $s1, 8($a0) -/* 35362C E004032C 0C080120 */ jal func_E0200480 +/* 35362C E004032C 0C080120 */ jal shim_queue_render_task /* 353630 E0040330 AC820000 */ sw $v0, ($a0) /* 353634 E0040334 8FBF0050 */ lw $ra, 0x50($sp) /* 353638 E0040338 8FB1004C */ lw $s1, 0x4c($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_32/func_E0040348.s b/ver/us/asm/nonmatchings/effects/effect_32/func_E0040348.s index 14bf3fa8c1..db6cc09355 100644 --- a/ver/us/asm/nonmatchings/effects/effect_32/func_E0040348.s +++ b/ver/us/asm/nonmatchings/effects/effect_32/func_E0040348.s @@ -222,7 +222,7 @@ glabel func_E0040348 /* 3539A8 E00406A8 8E450004 */ lw $a1, 4($s2) /* 3539AC E00406AC 8E460008 */ lw $a2, 8($s2) /* 3539B0 E00406B0 8E47000C */ lw $a3, 0xc($s2) -/* 3539B4 E00406B4 0C080108 */ jal func_E0200420 +/* 3539B4 E00406B4 0C080108 */ jal shim_guTranslateF /* 3539B8 E00406B8 27A40018 */ addiu $a0, $sp, 0x18 /* 3539BC E00406BC 27B10058 */ addiu $s1, $sp, 0x58 /* 3539C0 E00406C0 8E030000 */ lw $v1, ($s0) @@ -241,12 +241,12 @@ glabel func_E0040348 /* 3539F4 E00406F4 46000007 */ neg.s $f0, $f0 /* 3539F8 E00406F8 44050000 */ mfc1 $a1, $f0 /* 3539FC E00406FC 0220202D */ daddu $a0, $s1, $zero -/* 353A00 E0040700 0C080104 */ jal func_E0200410 +/* 353A00 E0040700 0C080104 */ jal shim_guRotateF /* 353A04 E0040704 AFA60010 */ sw $a2, 0x10($sp) /* 353A08 E0040708 0220202D */ daddu $a0, $s1, $zero /* 353A0C E004070C 27A50018 */ addiu $a1, $sp, 0x18 /* 353A10 E0040710 27B00098 */ addiu $s0, $sp, 0x98 -/* 353A14 E0040714 0C080114 */ jal func_E0200450 +/* 353A14 E0040714 0C080114 */ jal shim_guMtxCatF /* 353A18 E0040718 0200302D */ daddu $a2, $s0, $zero /* 353A1C E004071C C6420010 */ lwc1 $f2, 0x10($s2) /* 353A20 E0040720 C6400030 */ lwc1 $f0, 0x30($s2) @@ -260,11 +260,11 @@ glabel func_E0040348 /* 353A40 E0040740 44071000 */ mfc1 $a3, $f2 /* 353A44 E0040744 3C120001 */ lui $s2, 1 /* 353A48 E0040748 44060000 */ mfc1 $a2, $f0 -/* 353A4C E004074C 0C080110 */ jal func_E0200440 +/* 353A4C E004074C 0C080110 */ jal shim_guScaleF /* 353A50 E0040750 36521630 */ ori $s2, $s2, 0x1630 /* 353A54 E0040754 0220202D */ daddu $a0, $s1, $zero /* 353A58 E0040758 0200282D */ daddu $a1, $s0, $zero -/* 353A5C E004075C 0C080114 */ jal func_E0200450 +/* 353A5C E004075C 0C080114 */ jal shim_guMtxCatF /* 353A60 E0040760 0200302D */ daddu $a2, $s0, $zero /* 353A64 E0040764 0200202D */ daddu $a0, $s0, $zero /* 353A68 E0040768 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -275,7 +275,7 @@ glabel func_E0040348 /* 353A7C E004077C 8E220000 */ lw $v0, ($s1) /* 353A80 E0040780 00052980 */ sll $a1, $a1, 6 /* 353A84 E0040784 00B22821 */ addu $a1, $a1, $s2 -/* 353A88 E0040788 0C080118 */ jal func_E0200460 +/* 353A88 E0040788 0C080118 */ jal shim_guMtxF2L /* 353A8C E004078C 00452821 */ addu $a1, $v0, $a1 /* 353A90 E0040790 3C06D838 */ lui $a2, 0xd838 /* 353A94 E0040794 8E840000 */ lw $a0, ($s4) diff --git a/ver/us/asm/nonmatchings/effects/effect_32/fx_32_main.s b/ver/us/asm/nonmatchings/effects/effect_32/fx_32_main.s index f3a4829677..f713a71bce 100644 --- a/ver/us/asm/nonmatchings/effects/effect_32/fx_32_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_32/fx_32_main.s @@ -32,12 +32,12 @@ glabel fx_32_main /* 353368 E0040068 24020020 */ addiu $v0, $zero, 0x20 /* 35336C E004006C AFA00010 */ sw $zero, 0x10($sp) /* 353370 E0040070 AFA00024 */ sw $zero, 0x24($sp) -/* 353374 E0040074 0C080124 */ jal func_E0200490 +/* 353374 E0040074 0C080124 */ jal shim_create_effect_instance /* 353378 E0040078 AFA20014 */ sw $v0, 0x14($sp) /* 35337C E004007C 24040034 */ addiu $a0, $zero, 0x34 /* 353380 E0040080 0040882D */ daddu $s1, $v0, $zero /* 353384 E0040084 24020001 */ addiu $v0, $zero, 1 -/* 353388 E0040088 0C08012C */ jal func_E02004B0 +/* 353388 E0040088 0C08012C */ jal shim_general_heap_malloc /* 35338C E004008C AE220008 */ sw $v0, 8($s1) /* 353390 E0040090 0040182D */ daddu $v1, $v0, $zero /* 353394 E0040094 14600003 */ bnez $v1, .LE00400A4 diff --git a/ver/us/asm/nonmatchings/effects/effect_33/func_E0042234.s b/ver/us/asm/nonmatchings/effects/effect_33/func_E0042234.s index 58eb00b301..0e942a639b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_33/func_E0042234.s +++ b/ver/us/asm/nonmatchings/effects/effect_33/func_E0042234.s @@ -13,7 +13,7 @@ glabel func_E0042234 /* 3549F4 E0042254 24420001 */ addiu $v0, $v0, 1 /* 3549F8 E0042258 04A10005 */ bgez $a1, .LE0042270 /* 3549FC E004225C AC620034 */ sw $v0, 0x34($v1) -/* 354A00 E0042260 0C080128 */ jal func_E02004A0 +/* 354A00 E0042260 0C080128 */ jal shim_remove_effect /* 354A04 E0042264 00000000 */ nop /* 354A08 E0042268 080108DA */ j .LE0042368 /* 354A0C E004226C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_33/func_E0042374.s b/ver/us/asm/nonmatchings/effects/effect_33/func_E0042374.s index 75e1cdaa91..8acdfc0450 100644 --- a/ver/us/asm/nonmatchings/effects/effect_33/func_E0042374.s +++ b/ver/us/asm/nonmatchings/effects/effect_33/func_E0042374.s @@ -11,7 +11,7 @@ glabel func_E0042374 /* 354B2C E004238C 27A40010 */ addiu $a0, $sp, 0x10 /* 354B30 E0042390 AFBF0020 */ sw $ra, 0x20($sp) /* 354B34 E0042394 AFA00014 */ sw $zero, 0x14($sp) -/* 354B38 E0042398 0C080120 */ jal func_E0200480 +/* 354B38 E0042398 0C080120 */ jal shim_queue_render_task /* 354B3C E004239C AFA20010 */ sw $v0, 0x10($sp) /* 354B40 E00423A0 8C430000 */ lw $v1, ($v0) /* 354B44 E00423A4 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_33/func_E00423B8.s b/ver/us/asm/nonmatchings/effects/effect_33/func_E00423B8.s index d924682276..34bf3da0af 100644 --- a/ver/us/asm/nonmatchings/effects/effect_33/func_E00423B8.s +++ b/ver/us/asm/nonmatchings/effects/effect_33/func_E00423B8.s @@ -145,7 +145,7 @@ glabel func_E00423B8 /* 354D84 E00425E4 8E05FFE0 */ lw $a1, -0x20($s0) /* 354D88 E00425E8 8E06FFE4 */ lw $a2, -0x1c($s0) /* 354D8C E00425EC 8E07FFE8 */ lw $a3, -0x18($s0) -/* 354D90 E00425F0 0C080108 */ jal func_E0200420 +/* 354D90 E00425F0 0C080108 */ jal shim_guTranslateF /* 354D94 E00425F4 26310003 */ addiu $s1, $s1, 3 /* 354D98 E00425F8 3C09800B */ lui $t1, %hi(gCameras) /* 354D9C E00425FC 25291D80 */ addiu $t1, $t1, %lo(gCameras) @@ -165,20 +165,20 @@ glabel func_E00423B8 /* 354DD4 E0042634 46000007 */ neg.s $f0, $f0 /* 354DD8 E0042638 44050000 */ mfc1 $a1, $f0 /* 354DDC E004263C 0240202D */ daddu $a0, $s2, $zero -/* 354DE0 E0042640 0C080104 */ jal func_E0200410 +/* 354DE0 E0042640 0C080104 */ jal shim_guRotateF /* 354DE4 E0042644 E7B60010 */ swc1 $f22, 0x10($sp) /* 354DE8 E0042648 0240202D */ daddu $a0, $s2, $zero /* 354DEC E004264C 27A50018 */ addiu $a1, $sp, 0x18 -/* 354DF0 E0042650 0C080114 */ jal func_E0200450 +/* 354DF0 E0042650 0C080114 */ jal shim_guMtxCatF /* 354DF4 E0042654 00A0302D */ daddu $a2, $a1, $zero /* 354DF8 E0042658 0240202D */ daddu $a0, $s2, $zero /* 354DFC E004265C 8E050000 */ lw $a1, ($s0) /* 354E00 E0042660 4407A000 */ mfc1 $a3, $f20 -/* 354E04 E0042664 0C080110 */ jal func_E0200440 +/* 354E04 E0042664 0C080110 */ jal shim_guScaleF /* 354E08 E0042668 00A0302D */ daddu $a2, $a1, $zero /* 354E0C E004266C 0240202D */ daddu $a0, $s2, $zero /* 354E10 E0042670 27A50018 */ addiu $a1, $sp, 0x18 -/* 354E14 E0042674 0C080114 */ jal func_E0200450 +/* 354E14 E0042674 0C080114 */ jal shim_guMtxCatF /* 354E18 E0042678 00A0302D */ daddu $a2, $a1, $zero /* 354E1C E004267C 27A40018 */ addiu $a0, $sp, 0x18 /* 354E20 E0042680 3C058007 */ lui $a1, %hi(gMatrixListPos) @@ -188,7 +188,7 @@ glabel func_E00423B8 /* 354E30 E0042690 8FA9009C */ lw $t1, 0x9c($sp) /* 354E34 E0042694 00052980 */ sll $a1, $a1, 6 /* 354E38 E0042698 00A92821 */ addu $a1, $a1, $t1 -/* 354E3C E004269C 0C080118 */ jal func_E0200460 +/* 354E3C E004269C 0C080118 */ jal shim_guMtxF2L /* 354E40 E00426A0 00452821 */ addu $a1, $v0, $a1 /* 354E44 E00426A4 3C06D838 */ lui $a2, 0xd838 /* 354E48 E00426A8 8E840000 */ lw $a0, ($s4) diff --git a/ver/us/asm/nonmatchings/effects/effect_33/fx_33_main.s b/ver/us/asm/nonmatchings/effects/effect_33/fx_33_main.s index 14449d7ca4..b3b3ec6c34 100644 --- a/ver/us/asm/nonmatchings/effects/effect_33/fx_33_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_33/fx_33_main.s @@ -36,13 +36,13 @@ glabel fx_33_main /* 35481C E004207C 24020021 */ addiu $v0, $zero, 0x21 /* 354820 E0042080 AFA00010 */ sw $zero, 0x10($sp) /* 354824 E0042084 AFA00024 */ sw $zero, 0x24($sp) -/* 354828 E0042088 0C080124 */ jal func_E0200490 +/* 354828 E0042088 0C080124 */ jal shim_create_effect_instance /* 35482C E004208C AFA20014 */ sw $v0, 0x14($sp) /* 354830 E0042090 001320C0 */ sll $a0, $s3, 3 /* 354834 E0042094 00932023 */ subu $a0, $a0, $s3 /* 354838 E0042098 000420C0 */ sll $a0, $a0, 3 /* 35483C E004209C 0040802D */ daddu $s0, $v0, $zero -/* 354840 E00420A0 0C08012C */ jal func_E02004B0 +/* 354840 E00420A0 0C08012C */ jal shim_general_heap_malloc /* 354844 E00420A4 AE130008 */ sw $s3, 8($s0) /* 354848 E00420A8 0040882D */ daddu $s1, $v0, $zero /* 35484C E00420AC 16200003 */ bnez $s1, .LE00420BC @@ -71,7 +71,7 @@ glabel fx_33_main /* 3548A0 E0042100 4481D800 */ mtc1 $at, $f27 /* 3548A4 E0042104 4480D000 */ mtc1 $zero, $f26 .LE0042108: -/* 3548A8 E0042108 0C080138 */ jal func_E02004E0 +/* 3548A8 E0042108 0C080138 */ jal shim_rand_int /* 3548AC E004210C 2404000A */ addiu $a0, $zero, 0xa /* 3548B0 E0042110 32440002 */ andi $a0, $s2, 2 /* 3548B4 E0042114 00121FC2 */ srl $v1, $s2, 0x1f @@ -101,23 +101,23 @@ glabel fx_33_main /* 354914 E0042174 3C0140A0 */ lui $at, 0x40a0 /* 354918 E0042178 44811000 */ mtc1 $at, $f2 /* 35491C E004217C 4600C306 */ mov.s $f12, $f24 -/* 354920 E0042180 0C080144 */ jal func_E0200510 +/* 354920 E0042180 0C080144 */ jal shim_cos_deg /* 354924 E0042184 4602A500 */ add.s $f20, $f20, $f2 /* 354928 E0042188 4600E306 */ mov.s $f12, $f28 -/* 35492C E004218C 0C080140 */ jal func_E0200500 +/* 35492C E004218C 0C080140 */ jal shim_sin_deg /* 354930 E0042190 46000586 */ mov.s $f22, $f0 /* 354934 E0042194 4600B582 */ mul.s $f22, $f22, $f0 /* 354938 E0042198 00000000 */ nop /* 35493C E004219C 26520001 */ addiu $s2, $s2, 1 /* 354940 E00421A0 26310038 */ addiu $s1, $s1, 0x38 /* 354944 E00421A4 4600C306 */ mov.s $f12, $f24 -/* 354948 E00421A8 0C080140 */ jal func_E0200500 +/* 354948 E00421A8 0C080140 */ jal shim_sin_deg /* 35494C E00421AC E616FFEC */ swc1 $f22, -0x14($s0) /* 354950 E00421B0 4600C306 */ mov.s $f12, $f24 -/* 354954 E00421B4 0C080144 */ jal func_E0200510 +/* 354954 E00421B4 0C080144 */ jal shim_cos_deg /* 354958 E00421B8 E600FFF0 */ swc1 $f0, -0x10($s0) /* 35495C E00421BC 4600E306 */ mov.s $f12, $f28 -/* 354960 E00421C0 0C080144 */ jal func_E0200510 +/* 354960 E00421C0 0C080144 */ jal shim_cos_deg /* 354964 E00421C4 46000586 */ mov.s $f22, $f0 /* 354968 E00421C8 E6140004 */ swc1 $f20, 4($s0) /* 35496C E00421CC 4600A521 */ cvt.d.s $f20, $f20 diff --git a/ver/us/asm/nonmatchings/effects/effect_34/func_E0044424.s b/ver/us/asm/nonmatchings/effects/effect_34/func_E0044424.s index c482268d72..15030696b2 100644 --- a/ver/us/asm/nonmatchings/effects/effect_34/func_E0044424.s +++ b/ver/us/asm/nonmatchings/effects/effect_34/func_E0044424.s @@ -126,10 +126,10 @@ glabel func_E0044424 .LE00445F8: /* 355558 E00445F8 4600A306 */ mov.s $f12, $f20 /* 35555C E00445FC 2402000A */ addiu $v0, $zero, 0xa -/* 355560 E0044600 0C080140 */ jal func_E0200500 +/* 355560 E0044600 0C080140 */ jal shim_sin_deg /* 355564 E0044604 A6C20002 */ sh $v0, 2($s6) /* 355568 E0044608 4600A306 */ mov.s $f12, $f20 -/* 35556C E004460C 0C080144 */ jal func_E0200510 +/* 35556C E004460C 0C080144 */ jal shim_cos_deg /* 355570 E0044610 E600FFFC */ swc1 $f0, -4($s0) /* 355574 E0044614 3C01BD4C */ lui $at, 0xbd4c /* 355578 E0044618 3421CCCD */ ori $at, $at, 0xcccd @@ -261,13 +261,13 @@ glabel func_E0044424 /* 355754 E00447F4 4482A000 */ mtc1 $v0, $f20 /* 355758 E00447F8 00000000 */ nop /* 35575C E00447FC 4680A520 */ cvt.s.w $f20, $f20 -/* 355760 E0044800 0C080140 */ jal func_E0200500 +/* 355760 E0044800 0C080140 */ jal shim_sin_deg /* 355764 E0044804 4600A306 */ mov.s $f12, $f20 /* 355768 E0044808 C602FFFC */ lwc1 $f2, -4($s0) /* 35576C E004480C 46001082 */ mul.s $f2, $f2, $f0 /* 355770 E0044810 00000000 */ nop /* 355774 E0044814 4600A306 */ mov.s $f12, $f20 -/* 355778 E0044818 0C080144 */ jal func_E0200510 +/* 355778 E0044818 0C080144 */ jal shim_cos_deg /* 35577C E004481C E602FFF0 */ swc1 $f2, -0x10($s0) /* 355780 E0044820 C602FFFC */ lwc1 $f2, -4($s0) /* 355784 E0044824 46001082 */ mul.s $f2, $f2, $f0 @@ -305,7 +305,7 @@ glabel func_E0044424 /* 3557F4 E0044894 14400003 */ bnez $v0, .LE00448A4 /* 3557F8 E0044898 00000000 */ nop .LE004489C: -/* 3557FC E004489C 0C080128 */ jal func_E02004A0 +/* 3557FC E004489C 0C080128 */ jal shim_remove_effect /* 355800 E00448A0 0280202D */ daddu $a0, $s4, $zero .LE00448A4: /* 355804 E00448A4 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_34/func_E00448E4.s b/ver/us/asm/nonmatchings/effects/effect_34/func_E00448E4.s index f18b5cd313..a74c3d28ae 100644 --- a/ver/us/asm/nonmatchings/effects/effect_34/func_E00448E4.s +++ b/ver/us/asm/nonmatchings/effects/effect_34/func_E00448E4.s @@ -11,7 +11,7 @@ glabel func_E00448E4 /* 35585C E00448FC 27A40010 */ addiu $a0, $sp, 0x10 /* 355860 E0044900 AFBF0020 */ sw $ra, 0x20($sp) /* 355864 E0044904 AFA00014 */ sw $zero, 0x14($sp) -/* 355868 E0044908 0C080120 */ jal func_E0200480 +/* 355868 E0044908 0C080120 */ jal shim_queue_render_task /* 35586C E004490C AFA20010 */ sw $v0, 0x10($sp) /* 355870 E0044910 8FBF0020 */ lw $ra, 0x20($sp) /* 355874 E0044914 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_34/func_E004491C.s b/ver/us/asm/nonmatchings/effects/effect_34/func_E004491C.s index 0dd63fda40..e7b5353b1a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_34/func_E004491C.s +++ b/ver/us/asm/nonmatchings/effects/effect_34/func_E004491C.s @@ -53,7 +53,7 @@ glabel func_E004491C /* 35593C E00449DC 8E27000C */ lw $a3, 0xc($s1) /* 355940 E00449E0 2442FFFF */ addiu $v0, $v0, -1 /* 355944 E00449E4 00021840 */ sll $v1, $v0, 1 -/* 355948 E00449E8 0C080108 */ jal func_E0200420 +/* 355948 E00449E8 0C080108 */ jal shim_guTranslateF /* 35594C E00449EC 0062A021 */ addu $s4, $v1, $v0 /* 355950 E00449F0 27B00058 */ addiu $s0, $sp, 0x58 /* 355954 E00449F4 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -74,11 +74,11 @@ glabel func_E004491C /* 355990 E0044A30 46000007 */ neg.s $f0, $f0 /* 355994 E0044A34 44050000 */ mfc1 $a1, $f0 /* 355998 E0044A38 0200202D */ daddu $a0, $s0, $zero -/* 35599C E0044A3C 0C080104 */ jal func_E0200410 +/* 35599C E0044A3C 0C080104 */ jal shim_guRotateF /* 3559A0 E0044A40 AFA60010 */ sw $a2, 0x10($sp) /* 3559A4 E0044A44 0200202D */ daddu $a0, $s0, $zero /* 3559A8 E0044A48 27A50018 */ addiu $a1, $sp, 0x18 -/* 3559AC E0044A4C 0C080114 */ jal func_E0200450 +/* 3559AC E0044A4C 0C080114 */ jal shim_guMtxCatF /* 3559B0 E0044A50 27A60098 */ addiu $a2, $sp, 0x98 /* 3559B4 E0044A54 2E42001F */ sltiu $v0, $s2, 0x1f /* 3559B8 E0044A58 1040002E */ beqz $v0, LE0044B14_355A74 @@ -164,7 +164,7 @@ glabel LE0044B14_355A74 /* 355AE0 E0044B80 8E25FFE8 */ lw $a1, -0x18($s1) /* 355AE4 E0044B84 8E26FFEC */ lw $a2, -0x14($s1) /* 355AE8 E0044B88 8E27FFF0 */ lw $a3, -0x10($s1) -/* 355AEC E0044B8C 0C080108 */ jal func_E0200420 +/* 355AEC E0044B8C 0C080108 */ jal shim_guTranslateF /* 355AF0 E0044B90 02C0202D */ daddu $a0, $s6, $zero /* 355AF4 E0044B94 02C0202D */ daddu $a0, $s6, $zero /* 355AF8 E0044B98 27A50098 */ addiu $a1, $sp, 0x98 @@ -172,7 +172,7 @@ glabel LE0044B14_355A74 /* 355B00 E0044BA0 27A60018 */ addiu $a2, $sp, 0x18 /* 355B04 E0044BA4 E7A00080 */ swc1 $f0, 0x80($sp) /* 355B08 E0044BA8 E7A0006C */ swc1 $f0, 0x6c($sp) -/* 355B0C E0044BAC 0C080114 */ jal func_E0200450 +/* 355B0C E0044BAC 0C080114 */ jal shim_guMtxCatF /* 355B10 E0044BB0 E7A00058 */ swc1 $f0, 0x58($sp) /* 355B14 E0044BB4 27A40018 */ addiu $a0, $sp, 0x18 /* 355B18 E0044BB8 96E50000 */ lhu $a1, ($s7) @@ -180,7 +180,7 @@ glabel LE0044B14_355A74 /* 355B20 E0044BC0 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 355B24 E0044BC4 00052980 */ sll $a1, $a1, 6 /* 355B28 E0044BC8 00B52821 */ addu $a1, $a1, $s5 -/* 355B2C E0044BCC 0C080118 */ jal func_E0200460 +/* 355B2C E0044BCC 0C080118 */ jal shim_guMtxF2L /* 355B30 E0044BD0 00452821 */ addu $a1, $v0, $a1 /* 355B34 E0044BD4 27C20024 */ addiu $v0, $fp, 0x24 /* 355B38 E0044BD8 0202102A */ slt $v0, $s0, $v0 diff --git a/ver/us/asm/nonmatchings/effects/effect_34/fx_34_main.s b/ver/us/asm/nonmatchings/effects/effect_34/fx_34_main.s index 62a94c388b..5379afbd9e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_34/fx_34_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_34/fx_34_main.s @@ -35,7 +35,7 @@ glabel fx_34_main /* 354FD8 E0044078 AFA00010 */ sw $zero, 0x10($sp) /* 354FDC E004407C AFA00024 */ sw $zero, 0x24($sp) /* 354FE0 E0044080 AFA20014 */ sw $v0, 0x14($sp) -/* 354FE4 E0044084 0C080124 */ jal func_E0200490 +/* 354FE4 E0044084 0C080124 */ jal shim_create_effect_instance /* 354FE8 E0044088 26520001 */ addiu $s2, $s2, 1 /* 354FEC E004408C 00122040 */ sll $a0, $s2, 1 /* 354FF0 E0044090 00922021 */ addu $a0, $a0, $s2 @@ -43,7 +43,7 @@ glabel fx_34_main /* 354FF8 E0044098 00922023 */ subu $a0, $a0, $s2 /* 354FFC E004409C 00042080 */ sll $a0, $a0, 2 /* 355000 E00440A0 0040802D */ daddu $s0, $v0, $zero -/* 355004 E00440A4 0C08012C */ jal func_E02004B0 +/* 355004 E00440A4 0C08012C */ jal shim_general_heap_malloc /* 355008 E00440A8 AE120008 */ sw $s2, 8($s0) /* 35500C E00440AC 0040182D */ daddu $v1, $v0, $zero /* 355010 E00440B0 14600003 */ bnez $v1, .LE00440C0 @@ -96,7 +96,7 @@ glabel fx_34_main /* 3550BC E004415C 00000000 */ nop /* 3550C0 E0044160 54400007 */ bnel $v0, $zero, .LE0044180 /* 3550C4 E0044164 461AB600 */ add.s $f24, $f22, $f26 -/* 3550C8 E0044168 0C080138 */ jal func_E02004E0 +/* 3550C8 E0044168 0C080138 */ jal shim_rand_int /* 3550CC E004416C 24040167 */ addiu $a0, $zero, 0x167 /* 3550D0 E0044170 44820000 */ mtc1 $v0, $f0 /* 3550D4 E0044174 00000000 */ nop @@ -111,13 +111,13 @@ glabel fx_34_main /* 3550F4 E0044194 3C0142B4 */ lui $at, 0x42b4 /* 3550F8 E0044198 44810000 */ mtc1 $at, $f0 /* 3550FC E004419C 4600C306 */ mov.s $f12, $f24 -/* 355100 E00441A0 0C080140 */ jal func_E0200500 +/* 355100 E00441A0 0C080140 */ jal shim_sin_deg /* 355104 E00441A4 4600A501 */ sub.s $f20, $f20, $f0 /* 355108 E00441A8 4600C306 */ mov.s $f12, $f24 -/* 35510C E00441AC 0C080144 */ jal func_E0200510 +/* 35510C E00441AC 0C080144 */ jal shim_cos_deg /* 355110 E00441B0 46000586 */ mov.s $f22, $f0 /* 355114 E00441B4 4600A306 */ mov.s $f12, $f20 -/* 355118 E00441B8 0C080140 */ jal func_E0200500 +/* 355118 E00441B8 0C080140 */ jal shim_sin_deg /* 35511C E00441BC 46000506 */ mov.s $f20, $f0 /* 355120 E00441C0 C7AA0090 */ lwc1 $f10, 0x90($sp) /* 355124 E00441C4 460050A1 */ cvt.d.s $f2, $f10 @@ -177,7 +177,7 @@ glabel fx_34_main /* 3551FC E004429C E600FFF8 */ swc1 $f0, -8($s0) /* 355200 E00442A0 080110F4 */ j .LE00443D0 /* 355204 E00442A4 E602FFFC */ swc1 $f2, -4($s0) -/* 355208 E00442A8 0C080138 */ jal func_E02004E0 +/* 355208 E00442A8 0C080138 */ jal shim_rand_int /* 35520C E00442AC 24040064 */ addiu $a0, $zero, 0x64 /* 355210 E00442B0 C7AA0090 */ lwc1 $f10, 0x90($sp) /* 355214 E00442B4 460AB002 */ mul.s $f0, $f22, $f10 @@ -192,7 +192,7 @@ glabel fx_34_main /* 355238 E00442D8 00000000 */ nop /* 35523C E00442DC 24040064 */ addiu $a0, $zero, 0x64 /* 355240 E00442E0 46200020 */ cvt.s.d $f0, $f0 -/* 355244 E00442E4 0C080138 */ jal func_E02004E0 +/* 355244 E00442E4 0C080138 */ jal shim_rand_int /* 355248 E00442E8 E600FFEC */ swc1 $f0, -0x14($s0) /* 35524C E00442EC C7AA0094 */ lwc1 $f10, 0x94($sp) /* 355250 E00442F0 460AA002 */ mul.s $f0, $f20, $f10 @@ -224,7 +224,7 @@ glabel fx_34_main /* 3552B4 E0044354 2404000A */ addiu $a0, $zero, 0xa /* 3552B8 E0044358 E606FFF0 */ swc1 $f6, -0x10($s0) /* 3552BC E004435C E600FFF8 */ swc1 $f0, -8($s0) -/* 3552C0 E0044360 0C080138 */ jal func_E02004E0 +/* 3552C0 E0044360 0C080138 */ jal shim_rand_int /* 3552C4 E0044364 E602FFF4 */ swc1 $f2, -0xc($s0) /* 3552C8 E0044368 00021023 */ negu $v0, $v0 /* 3552CC E004436C 3C013CF5 */ lui $at, 0x3cf5 @@ -236,7 +236,7 @@ glabel fx_34_main /* 3552E4 E0044384 46020002 */ mul.s $f0, $f0, $f2 /* 3552E8 E0044388 00000000 */ nop /* 3552EC E004438C 2404000A */ addiu $a0, $zero, 0xa -/* 3552F0 E0044390 0C080138 */ jal func_E02004E0 +/* 3552F0 E0044390 0C080138 */ jal shim_rand_int /* 3552F4 E0044394 E600FFFC */ swc1 $f0, -4($s0) /* 3552F8 E0044398 3C013D23 */ lui $at, 0x3d23 /* 3552FC E004439C 3421D70A */ ori $at, $at, 0xd70a diff --git a/ver/us/asm/nonmatchings/effects/effect_35/func_E0046160.s b/ver/us/asm/nonmatchings/effects/effect_35/func_E0046160.s index 462f2f8ae5..94a1e954a2 100644 --- a/ver/us/asm/nonmatchings/effects/effect_35/func_E0046160.s +++ b/ver/us/asm/nonmatchings/effects/effect_35/func_E0046160.s @@ -18,7 +18,7 @@ glabel func_E0046160 /* 356074 E0046194 24420001 */ addiu $v0, $v0, 1 /* 356078 E0046198 04610005 */ bgez $v1, .LE00461B0 /* 35607C E004619C ACA2001C */ sw $v0, 0x1c($a1) -/* 356080 E00461A0 0C080128 */ jal func_E02004A0 +/* 356080 E00461A0 0C080128 */ jal shim_remove_effect /* 356084 E00461A4 00000000 */ nop /* 356088 E00461A8 0801189C */ j .LE0046270 /* 35608C E00461AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_35/func_E004627C.s b/ver/us/asm/nonmatchings/effects/effect_35/func_E004627C.s index 26e569a38e..ff9ee3c9e6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_35/func_E004627C.s +++ b/ver/us/asm/nonmatchings/effects/effect_35/func_E004627C.s @@ -11,7 +11,7 @@ glabel func_E004627C /* 356174 E0046294 27A40010 */ addiu $a0, $sp, 0x10 /* 356178 E0046298 AFBF0020 */ sw $ra, 0x20($sp) /* 35617C E004629C AFA00014 */ sw $zero, 0x14($sp) -/* 356180 E00462A0 0C080120 */ jal func_E0200480 +/* 356180 E00462A0 0C080120 */ jal shim_queue_render_task /* 356184 E00462A4 AFA20010 */ sw $v0, 0x10($sp) /* 356188 E00462A8 8C430000 */ lw $v1, ($v0) /* 35618C E00462AC 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_35/func_E00462C0.s b/ver/us/asm/nonmatchings/effects/effect_35/func_E00462C0.s index 05462fb8e8..135679b4b4 100644 --- a/ver/us/asm/nonmatchings/effects/effect_35/func_E00462C0.s +++ b/ver/us/asm/nonmatchings/effects/effect_35/func_E00462C0.s @@ -70,17 +70,17 @@ glabel func_E00462C0 /* 3562A4 E00463C4 8E660008 */ lw $a2, 8($s3) /* 3562A8 E00463C8 8E67000C */ lw $a3, 0xc($s3) /* 3562AC E00463CC 25020020 */ addiu $v0, $t0, 0x20 -/* 3562B0 E00463D0 0C080108 */ jal func_E0200420 +/* 3562B0 E00463D0 0C080108 */ jal shim_guTranslateF /* 3562B4 E00463D4 AD220000 */ sw $v0, ($t1) /* 3562B8 E00463D8 27B00060 */ addiu $s0, $sp, 0x60 /* 3562BC E00463DC 0200202D */ daddu $a0, $s0, $zero /* 3562C0 E00463E0 8E650010 */ lw $a1, 0x10($s3) /* 3562C4 E00463E4 3C063F80 */ lui $a2, 0x3f80 -/* 3562C8 E00463E8 0C080110 */ jal func_E0200440 +/* 3562C8 E00463E8 0C080110 */ jal shim_guScaleF /* 3562CC E00463EC 00A0382D */ daddu $a3, $a1, $zero /* 3562D0 E00463F0 0200202D */ daddu $a0, $s0, $zero /* 3562D4 E00463F4 27A50020 */ addiu $a1, $sp, 0x20 -/* 3562D8 E00463F8 0C080114 */ jal func_E0200450 +/* 3562D8 E00463F8 0C080114 */ jal shim_guMtxCatF /* 3562DC E00463FC 00A0302D */ daddu $a2, $a1, $zero /* 3562E0 E0046400 08011936 */ j .LE00464D8 /* 3562E4 E0046404 3C120001 */ lui $s2, 1 @@ -134,7 +134,7 @@ glabel func_E00462C0 /* 3563A0 E00464C0 E7A00018 */ swc1 $f0, 0x18($sp) /* 3563A4 E00464C4 C660000C */ lwc1 $f0, 0xc($s3) /* 3563A8 E00464C8 27A40020 */ addiu $a0, $sp, 0x20 -/* 3563AC E00464CC 0C080180 */ jal func_E0200600 +/* 3563AC E00464CC 0C080180 */ jal shim_guPositionF /* 3563B0 E00464D0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3563B4 E00464D4 3C120001 */ lui $s2, 1 .LE00464D8: @@ -148,7 +148,7 @@ glabel func_E00462C0 /* 3563D4 E00464F4 8E220000 */ lw $v0, ($s1) /* 3563D8 E00464F8 00052980 */ sll $a1, $a1, 6 /* 3563DC E00464FC 00B22821 */ addu $a1, $a1, $s2 -/* 3563E0 E0046500 0C080118 */ jal func_E0200460 +/* 3563E0 E0046500 0C080118 */ jal shim_guMtxF2L /* 3563E4 E0046504 00452821 */ addu $a1, $v0, $a1 /* 3563E8 E0046508 3C07800A */ lui $a3, %hi(gMasterGfxPos) /* 3563EC E004650C 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) diff --git a/ver/us/asm/nonmatchings/effects/effect_35/fx_35_main.s b/ver/us/asm/nonmatchings/effects/effect_35/fx_35_main.s index 9d37cad0c7..c453a53312 100644 --- a/ver/us/asm/nonmatchings/effects/effect_35/fx_35_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_35/fx_35_main.s @@ -28,12 +28,12 @@ glabel fx_35_main /* 355F3C E004605C AFB00028 */ sw $s0, 0x28($sp) /* 355F40 E0046060 AFA00010 */ sw $zero, 0x10($sp) /* 355F44 E0046064 AFA00024 */ sw $zero, 0x24($sp) -/* 355F48 E0046068 0C080124 */ jal func_E0200490 +/* 355F48 E0046068 0C080124 */ jal shim_create_effect_instance /* 355F4C E004606C AFA20014 */ sw $v0, 0x14($sp) /* 355F50 E0046070 24040028 */ addiu $a0, $zero, 0x28 /* 355F54 E0046074 24030001 */ addiu $v1, $zero, 1 /* 355F58 E0046078 0040802D */ daddu $s0, $v0, $zero -/* 355F5C E004607C 0C08012C */ jal func_E02004B0 +/* 355F5C E004607C 0C08012C */ jal shim_general_heap_malloc /* 355F60 E0046080 AE030008 */ sw $v1, 8($s0) /* 355F64 E0046084 AE02000C */ sw $v0, 0xc($s0) /* 355F68 E0046088 0040802D */ daddu $s0, $v0, $zero @@ -52,7 +52,7 @@ glabel fx_35_main /* 355F94 E00460B4 00000000 */ nop /* 355F98 E00460B8 45010013 */ bc1t .LE0046108 /* 355F9C E00460BC AE00001C */ sw $zero, 0x1c($s0) -/* 355FA0 E00460C0 0C080138 */ jal func_E02004E0 +/* 355FA0 E00460C0 0C080138 */ jal shim_rand_int /* 355FA4 E00460C4 24040003 */ addiu $a0, $zero, 3 /* 355FA8 E00460C8 3C01E004 */ lui $at, %hi(D_E0046620) /* 355FAC E00460CC D4226620 */ ldc1 $f2, %lo(D_E0046620)($at) @@ -78,7 +78,7 @@ glabel fx_35_main /* 355FF4 E0046114 E6000010 */ swc1 $f0, 0x10($s0) /* 355FF8 E0046118 2404001F */ addiu $a0, $zero, 0x1f /* 355FFC E004611C 24020020 */ addiu $v0, $zero, 0x20 -/* 356000 E0046120 0C080138 */ jal func_E02004E0 +/* 356000 E0046120 0C080138 */ jal shim_rand_int /* 356004 E0046124 AE020018 */ sw $v0, 0x18($s0) /* 356008 E0046128 461AC000 */ add.s $f0, $f24, $f26 /* 35600C E004612C AE020020 */ sw $v0, 0x20($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_36/func_E0048130.s b/ver/us/asm/nonmatchings/effects/effect_36/func_E0048130.s index 3a95745da1..9f7ead2406 100644 --- a/ver/us/asm/nonmatchings/effects/effect_36/func_E0048130.s +++ b/ver/us/asm/nonmatchings/effects/effect_36/func_E0048130.s @@ -23,7 +23,7 @@ glabel func_E0048130 /* 356AF8 E0048178 46001083 */ div.s $f2, $f2, $f0 /* 356AFC E004817C 04610005 */ bgez $v1, .LE0048194 /* 356B00 E0048180 E4A20020 */ swc1 $f2, 0x20($a1) -/* 356B04 E0048184 0C080128 */ jal func_E02004A0 +/* 356B04 E0048184 0C080128 */ jal shim_remove_effect /* 356B08 E0048188 00000000 */ nop /* 356B0C E004818C 08012072 */ j .LE00481C8 /* 356B10 E0048190 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_36/func_E00481D4.s b/ver/us/asm/nonmatchings/effects/effect_36/func_E00481D4.s index 590cd04b7c..86034e61f7 100644 --- a/ver/us/asm/nonmatchings/effects/effect_36/func_E00481D4.s +++ b/ver/us/asm/nonmatchings/effects/effect_36/func_E00481D4.s @@ -11,7 +11,7 @@ glabel func_E00481D4 /* 356B6C E00481EC 27A40010 */ addiu $a0, $sp, 0x10 /* 356B70 E00481F0 AFBF0020 */ sw $ra, 0x20($sp) /* 356B74 E00481F4 AFA00014 */ sw $zero, 0x14($sp) -/* 356B78 E00481F8 0C080120 */ jal func_E0200480 +/* 356B78 E00481F8 0C080120 */ jal shim_queue_render_task /* 356B7C E00481FC AFA20010 */ sw $v0, 0x10($sp) /* 356B80 E0048200 8C430000 */ lw $v1, ($v0) /* 356B84 E0048204 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_36/func_E0048218.s b/ver/us/asm/nonmatchings/effects/effect_36/func_E0048218.s index 4d6c448a62..72adb2cf92 100644 --- a/ver/us/asm/nonmatchings/effects/effect_36/func_E0048218.s +++ b/ver/us/asm/nonmatchings/effects/effect_36/func_E0048218.s @@ -95,18 +95,18 @@ glabel func_E0048218 /* 356D00 E0048380 C680000C */ lwc1 $f0, 0xc($s4) /* 356D04 E0048384 4600328D */ trunc.w.s $f10, $f6 /* 356D08 E0048388 44175000 */ mfc1 $s7, $f10 -/* 356D0C E004838C 0C080180 */ jal func_E0200600 +/* 356D0C E004838C 0C080180 */ jal shim_guPositionF /* 356D10 E0048390 E7A0001C */ swc1 $f0, 0x1c($sp) /* 356D14 E0048394 27B00060 */ addiu $s0, $sp, 0x60 /* 356D18 E0048398 E7B60010 */ swc1 $f22, 0x10($sp) /* 356D1C E004839C 8E850024 */ lw $a1, 0x24($s4) /* 356D20 E00483A0 4406A000 */ mfc1 $a2, $f20 /* 356D24 E00483A4 4407A000 */ mfc1 $a3, $f20 -/* 356D28 E00483A8 0C080104 */ jal func_E0200410 +/* 356D28 E00483A8 0C080104 */ jal shim_guRotateF /* 356D2C E00483AC 0200202D */ daddu $a0, $s0, $zero /* 356D30 E00483B0 0200202D */ daddu $a0, $s0, $zero /* 356D34 E00483B4 27A50020 */ addiu $a1, $sp, 0x20 -/* 356D38 E00483B8 0C080114 */ jal func_E0200450 +/* 356D38 E00483B8 0C080114 */ jal shim_guMtxCatF /* 356D3C E00483BC 00A0302D */ daddu $a2, $a1, $zero /* 356D40 E00483C0 27A40020 */ addiu $a0, $sp, 0x20 /* 356D44 E00483C4 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -117,7 +117,7 @@ glabel func_E0048218 /* 356D58 E00483D8 8E220000 */ lw $v0, ($s1) /* 356D5C E00483DC 00052980 */ sll $a1, $a1, 6 /* 356D60 E00483E0 00B32821 */ addu $a1, $a1, $s3 -/* 356D64 E00483E4 0C080118 */ jal func_E0200460 +/* 356D64 E00483E4 0C080118 */ jal shim_guMtxF2L /* 356D68 E00483E8 00452821 */ addu $a1, $v0, $a1 /* 356D6C E00483EC 8EA60000 */ lw $a2, ($s5) /* 356D70 E00483F0 00C0202D */ daddu $a0, $a2, $zero diff --git a/ver/us/asm/nonmatchings/effects/effect_36/fx_36_main.s b/ver/us/asm/nonmatchings/effects/effect_36/fx_36_main.s index 7627c94e76..32613107c4 100644 --- a/ver/us/asm/nonmatchings/effects/effect_36/fx_36_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_36/fx_36_main.s @@ -29,12 +29,12 @@ glabel fx_36_main /* 3569E0 E0048060 AFB00028 */ sw $s0, 0x28($sp) /* 3569E4 E0048064 AFA00010 */ sw $zero, 0x10($sp) /* 3569E8 E0048068 AFA00024 */ sw $zero, 0x24($sp) -/* 3569EC E004806C 0C080124 */ jal func_E0200490 +/* 3569EC E004806C 0C080124 */ jal shim_create_effect_instance /* 3569F0 E0048070 AFA20014 */ sw $v0, 0x14($sp) /* 3569F4 E0048074 2404002C */ addiu $a0, $zero, 0x2c /* 3569F8 E0048078 24110001 */ addiu $s1, $zero, 1 /* 3569FC E004807C 0040802D */ daddu $s0, $v0, $zero -/* 356A00 E0048080 0C08012C */ jal func_E02004B0 +/* 356A00 E0048080 0C08012C */ jal shim_general_heap_malloc /* 356A04 E0048084 AE110008 */ sw $s1, 8($s0) /* 356A08 E0048088 AE02000C */ sw $v0, 0xc($s0) /* 356A0C E004808C 0040802D */ daddu $s0, $v0, $zero @@ -48,7 +48,7 @@ glabel fx_36_main /* 356A24 E00480A4 00B12821 */ addu $a1, $a1, $s1 /* 356A28 E00480A8 00052880 */ sll $a1, $a1, 2 /* 356A2C E00480AC 00B12823 */ subu $a1, $a1, $s1 -/* 356A30 E00480B0 0C080130 */ jal func_E02004C0 +/* 356A30 E00480B0 0C080130 */ jal shim_mem_clear /* 356A34 E00480B4 00052880 */ sll $a1, $a1, 2 /* 356A38 E00480B8 AE120014 */ sw $s2, 0x14($s0) /* 356A3C E00480BC AE000018 */ sw $zero, 0x18($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_37/func_E004A330.s b/ver/us/asm/nonmatchings/effects/effect_37/func_E004A330.s index 10ae259d6e..5ba14047fb 100644 --- a/ver/us/asm/nonmatchings/effects/effect_37/func_E004A330.s +++ b/ver/us/asm/nonmatchings/effects/effect_37/func_E004A330.s @@ -24,7 +24,7 @@ glabel func_E004A330 /* 35883C E004A37C AC82002C */ sw $v0, 0x2c($a0) /* 358840 E004A380 04610005 */ bgez $v1, .LE004A398 /* 358844 E004A384 AC830028 */ sw $v1, 0x28($a0) -/* 358848 E004A388 0C080128 */ jal func_E02004A0 +/* 358848 E004A388 0C080128 */ jal shim_remove_effect /* 35884C E004A38C 0280202D */ daddu $a0, $s4, $zero /* 358850 E004A390 080129C4 */ j .LE004A710 /* 358854 E004A394 00000000 */ nop @@ -87,7 +87,7 @@ glabel func_E004A330 /* 358924 E004A464 C60CFFF8 */ lwc1 $f12, -8($s0) /* 358928 E004A468 AE00FFC8 */ sw $zero, -0x38($s0) /* 35892C E004A46C AE00FFCC */ sw $zero, -0x34($s0) -/* 358930 E004A470 0C080140 */ jal func_E0200500 +/* 358930 E004A470 0C080140 */ jal shim_sin_deg /* 358934 E004A474 AE00FFD0 */ sw $zero, -0x30($s0) /* 358938 E004A478 46000007 */ neg.s $f0, $f0 /* 35893C E004A47C 46000021 */ cvt.d.s $f0, $f0 @@ -95,7 +95,7 @@ glabel func_E004A330 /* 358944 E004A484 00000000 */ nop /* 358948 E004A488 C60CFFF8 */ lwc1 $f12, -8($s0) /* 35894C E004A48C 46200020 */ cvt.s.d $f0, $f0 -/* 358950 E004A490 0C080144 */ jal func_E0200510 +/* 358950 E004A490 0C080144 */ jal shim_cos_deg /* 358954 E004A494 E600FFD4 */ swc1 $f0, -0x2c($s0) /* 358958 E004A498 46000021 */ cvt.d.s $f0, $f0 /* 35895C E004A49C 46340002 */ mul.d $f0, $f0, $f20 diff --git a/ver/us/asm/nonmatchings/effects/effect_37/func_E004A748.s b/ver/us/asm/nonmatchings/effects/effect_37/func_E004A748.s index 02e2ed951d..6bd2af1612 100644 --- a/ver/us/asm/nonmatchings/effects/effect_37/func_E004A748.s +++ b/ver/us/asm/nonmatchings/effects/effect_37/func_E004A748.s @@ -11,7 +11,7 @@ glabel func_E004A748 /* 358C20 E004A760 27A40010 */ addiu $a0, $sp, 0x10 /* 358C24 E004A764 AFBF0020 */ sw $ra, 0x20($sp) /* 358C28 E004A768 AFA00014 */ sw $zero, 0x14($sp) -/* 358C2C E004A76C 0C080120 */ jal func_E0200480 +/* 358C2C E004A76C 0C080120 */ jal shim_queue_render_task /* 358C30 E004A770 AFA20010 */ sw $v0, 0x10($sp) /* 358C34 E004A774 8C430000 */ lw $v1, ($v0) /* 358C38 E004A778 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_37/func_E004A78C.s b/ver/us/asm/nonmatchings/effects/effect_37/func_E004A78C.s index f0fdbb32ed..8137266cfb 100644 --- a/ver/us/asm/nonmatchings/effects/effect_37/func_E004A78C.s +++ b/ver/us/asm/nonmatchings/effects/effect_37/func_E004A78C.s @@ -121,7 +121,7 @@ glabel func_E004A78C /* 358E18 E004A958 E7A00018 */ swc1 $f0, 0x18($sp) /* 358E1C E004A95C C620000C */ lwc1 $f0, 0xc($s1) /* 358E20 E004A960 36101630 */ ori $s0, $s0, 0x1630 -/* 358E24 E004A964 0C080180 */ jal func_E0200600 +/* 358E24 E004A964 0C080180 */ jal shim_guPositionF /* 358E28 E004A968 E7A0001C */ swc1 $f0, 0x1c($sp) /* 358E2C E004A96C 27A40020 */ addiu $a0, $sp, 0x20 /* 358E30 E004A970 3C158007 */ lui $s5, %hi(gMatrixListPos) @@ -132,7 +132,7 @@ glabel func_E004A78C /* 358E44 E004A984 8EC20000 */ lw $v0, ($s6) /* 358E48 E004A988 00052980 */ sll $a1, $a1, 6 /* 358E4C E004A98C 00B02821 */ addu $a1, $a1, $s0 -/* 358E50 E004A990 0C080118 */ jal func_E0200460 +/* 358E50 E004A990 0C080118 */ jal shim_guMtxF2L /* 358E54 E004A994 00452821 */ addu $a1, $v0, $a1 /* 358E58 E004A998 24140001 */ addiu $s4, $zero, 1 /* 358E5C E004A99C 3C02DA38 */ lui $v0, 0xda38 @@ -177,17 +177,17 @@ glabel func_E004A78C /* 358EF4 E004AA34 8E05FFC0 */ lw $a1, -0x40($s0) /* 358EF8 E004AA38 8E06FFC4 */ lw $a2, -0x3c($s0) /* 358EFC E004AA3C 8E07FFC8 */ lw $a3, -0x38($s0) -/* 358F00 E004AA40 0C080108 */ jal func_E0200420 +/* 358F00 E004AA40 0C080108 */ jal shim_guTranslateF /* 358F04 E004AA44 27A40020 */ addiu $a0, $sp, 0x20 /* 358F08 E004AA48 E7B80010 */ swc1 $f24, 0x10($sp) /* 358F0C E004AA4C 8E05FFF0 */ lw $a1, -0x10($s0) /* 358F10 E004AA50 4406B000 */ mfc1 $a2, $f22 /* 358F14 E004AA54 4407B000 */ mfc1 $a3, $f22 -/* 358F18 E004AA58 0C080104 */ jal func_E0200410 +/* 358F18 E004AA58 0C080104 */ jal shim_guRotateF /* 358F1C E004AA5C 0240202D */ daddu $a0, $s2, $zero /* 358F20 E004AA60 0240202D */ daddu $a0, $s2, $zero /* 358F24 E004AA64 27A50020 */ addiu $a1, $sp, 0x20 -/* 358F28 E004AA68 0C080114 */ jal func_E0200450 +/* 358F28 E004AA68 0C080114 */ jal shim_guMtxCatF /* 358F2C E004AA6C 00A0302D */ daddu $a2, $a1, $zero /* 358F30 E004AA70 C604FFD8 */ lwc1 $f4, -0x28($s0) /* 358F34 E004AA74 46002121 */ cvt.d.s $f4, $f4 @@ -207,21 +207,21 @@ glabel func_E004A78C /* 358F6C E004AAAC 44052000 */ mfc1 $a1, $f4 /* 358F70 E004AAB0 44061000 */ mfc1 $a2, $f2 /* 358F74 E004AAB4 44070000 */ mfc1 $a3, $f0 -/* 358F78 E004AAB8 0C080110 */ jal func_E0200440 +/* 358F78 E004AAB8 0C080110 */ jal shim_guScaleF /* 358F7C E004AABC 0240202D */ daddu $a0, $s2, $zero /* 358F80 E004AAC0 0240202D */ daddu $a0, $s2, $zero /* 358F84 E004AAC4 27A50020 */ addiu $a1, $sp, 0x20 -/* 358F88 E004AAC8 0C080114 */ jal func_E0200450 +/* 358F88 E004AAC8 0C080114 */ jal shim_guMtxCatF /* 358F8C E004AACC 00A0302D */ daddu $a2, $a1, $zero /* 358F90 E004AAD0 E7B60010 */ swc1 $f22, 0x10($sp) /* 358F94 E004AAD4 8E05FFEC */ lw $a1, -0x14($s0) /* 358F98 E004AAD8 4406B000 */ mfc1 $a2, $f22 /* 358F9C E004AADC 4407C000 */ mfc1 $a3, $f24 -/* 358FA0 E004AAE0 0C080104 */ jal func_E0200410 +/* 358FA0 E004AAE0 0C080104 */ jal shim_guRotateF /* 358FA4 E004AAE4 0240202D */ daddu $a0, $s2, $zero /* 358FA8 E004AAE8 0240202D */ daddu $a0, $s2, $zero /* 358FAC E004AAEC 27A50020 */ addiu $a1, $sp, 0x20 -/* 358FB0 E004AAF0 0C080114 */ jal func_E0200450 +/* 358FB0 E004AAF0 0C080114 */ jal shim_guMtxCatF /* 358FB4 E004AAF4 00A0302D */ daddu $a2, $a1, $zero /* 358FB8 E004AAF8 27A40020 */ addiu $a0, $sp, 0x20 /* 358FBC E004AAFC 96C50000 */ lhu $a1, ($s6) @@ -229,7 +229,7 @@ glabel func_E004A78C /* 358FC4 E004AB04 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 358FC8 E004AB08 00052980 */ sll $a1, $a1, 6 /* 358FCC E004AB0C 00B52821 */ addu $a1, $a1, $s5 -/* 358FD0 E004AB10 0C080118 */ jal func_E0200460 +/* 358FD0 E004AB10 0C080118 */ jal shim_guMtxF2L /* 358FD4 E004AB14 00452821 */ addu $a1, $v0, $a1 /* 358FD8 E004AB18 3C06000F */ lui $a2, 0xf /* 358FDC E004AB1C 34C6C000 */ ori $a2, $a2, 0xc000 diff --git a/ver/us/asm/nonmatchings/effects/effect_37/fx_37_main.s b/ver/us/asm/nonmatchings/effects/effect_37/fx_37_main.s index b4cb3d7dcd..15b36aea71 100644 --- a/ver/us/asm/nonmatchings/effects/effect_37/fx_37_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_37/fx_37_main.s @@ -78,7 +78,7 @@ glabel fx_37_main /* 3585B8 E004A0F8 24020025 */ addiu $v0, $zero, 0x25 /* 3585BC E004A0FC AC800000 */ sw $zero, ($a0) /* 3585C0 E004A100 AC800014 */ sw $zero, 0x14($a0) -/* 3585C4 E004A104 0C080124 */ jal func_E0200490 +/* 3585C4 E004A104 0C080124 */ jal shim_create_effect_instance /* 3585C8 E004A108 AC820004 */ sw $v0, 4($a0) /* 3585CC E004A10C 00132040 */ sll $a0, $s3, 1 /* 3585D0 E004A110 00932021 */ addu $a0, $a0, $s3 @@ -86,7 +86,7 @@ glabel fx_37_main /* 3585D8 E004A118 00932023 */ subu $a0, $a0, $s3 /* 3585DC E004A11C 000420C0 */ sll $a0, $a0, 3 /* 3585E0 E004A120 0040802D */ daddu $s0, $v0, $zero -/* 3585E4 E004A124 0C08012C */ jal func_E02004B0 +/* 3585E4 E004A124 0C08012C */ jal shim_general_heap_malloc /* 3585E8 E004A128 AE130008 */ sw $s3, 8($s0) /* 3585EC E004A12C 0040882D */ daddu $s1, $v0, $zero /* 3585F0 E004A130 16200003 */ bnez $s1, .LE004A140 @@ -100,7 +100,7 @@ glabel fx_37_main /* 358608 E004A148 00B32821 */ addu $a1, $a1, $s3 /* 35860C E004A14C 00052880 */ sll $a1, $a1, 2 /* 358610 E004A150 00B32823 */ subu $a1, $a1, $s3 -/* 358614 E004A154 0C080130 */ jal func_E02004C0 +/* 358614 E004A154 0C080130 */ jal shim_mem_clear /* 358618 E004A158 000528C0 */ sll $a1, $a1, 3 /* 35861C E004A15C 2A420002 */ slti $v0, $s2, 2 /* 358620 E004A160 14400002 */ bnez $v0, .LE004A16C diff --git a/ver/us/asm/nonmatchings/effects/effect_38/func_E004C20C.s b/ver/us/asm/nonmatchings/effects/effect_38/func_E004C20C.s index 7998a1df98..bfaad62094 100644 --- a/ver/us/asm/nonmatchings/effects/effect_38/func_E004C20C.s +++ b/ver/us/asm/nonmatchings/effects/effect_38/func_E004C20C.s @@ -13,7 +13,7 @@ glabel func_E004C20C /* 35A14C E004C22C 24420001 */ addiu $v0, $v0, 1 /* 35A150 E004C230 04C10005 */ bgez $a2, .LE004C248 /* 35A154 E004C234 ACA2001C */ sw $v0, 0x1c($a1) -/* 35A158 E004C238 0C080128 */ jal func_E02004A0 +/* 35A158 E004C238 0C080128 */ jal shim_remove_effect /* 35A15C E004C23C 00000000 */ nop /* 35A160 E004C240 080130D6 */ j .LE004C358 /* 35A164 E004C244 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_38/func_E004C364.s b/ver/us/asm/nonmatchings/effects/effect_38/func_E004C364.s index b73422a96f..fa5e6367ab 100644 --- a/ver/us/asm/nonmatchings/effects/effect_38/func_E004C364.s +++ b/ver/us/asm/nonmatchings/effects/effect_38/func_E004C364.s @@ -11,7 +11,7 @@ glabel func_E004C364 /* 35A29C E004C37C 27A40010 */ addiu $a0, $sp, 0x10 /* 35A2A0 E004C380 AFBF0020 */ sw $ra, 0x20($sp) /* 35A2A4 E004C384 AFA00014 */ sw $zero, 0x14($sp) -/* 35A2A8 E004C388 0C080120 */ jal func_E0200480 +/* 35A2A8 E004C388 0C080120 */ jal shim_queue_render_task /* 35A2AC E004C38C AFA20010 */ sw $v0, 0x10($sp) /* 35A2B0 E004C390 8C430000 */ lw $v1, ($v0) /* 35A2B4 E004C394 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_38/func_E004C3A8.s b/ver/us/asm/nonmatchings/effects/effect_38/func_E004C3A8.s index da76d6e2e9..cf63b72c9d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_38/func_E004C3A8.s +++ b/ver/us/asm/nonmatchings/effects/effect_38/func_E004C3A8.s @@ -82,7 +82,7 @@ glabel func_E004C3A8 /* 35A3FC E004C4DC 8E260008 */ lw $a2, 8($s1) /* 35A400 E004C4E0 8E27000C */ lw $a3, 0xc($s1) /* 35A404 E004C4E4 4480A000 */ mtc1 $zero, $f20 -/* 35A408 E004C4E8 0C080108 */ jal func_E0200420 +/* 35A408 E004C4E8 0C080108 */ jal shim_guTranslateF /* 35A40C E004C4EC 36B51630 */ ori $s5, $s5, 0x1630 /* 35A410 E004C4F0 27B00058 */ addiu $s0, $sp, 0x58 /* 35A414 E004C4F4 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -102,20 +102,20 @@ glabel func_E004C3A8 /* 35A44C E004C52C 46000007 */ neg.s $f0, $f0 /* 35A450 E004C530 44050000 */ mfc1 $a1, $f0 /* 35A454 E004C534 0200202D */ daddu $a0, $s0, $zero -/* 35A458 E004C538 0C080104 */ jal func_E0200410 +/* 35A458 E004C538 0C080104 */ jal shim_guRotateF /* 35A45C E004C53C E7B40010 */ swc1 $f20, 0x10($sp) /* 35A460 E004C540 0200202D */ daddu $a0, $s0, $zero /* 35A464 E004C544 27A50018 */ addiu $a1, $sp, 0x18 -/* 35A468 E004C548 0C080114 */ jal func_E0200450 +/* 35A468 E004C548 0C080114 */ jal shim_guMtxCatF /* 35A46C E004C54C 00A0302D */ daddu $a2, $a1, $zero /* 35A470 E004C550 0200202D */ daddu $a0, $s0, $zero /* 35A474 E004C554 8E250010 */ lw $a1, 0x10($s1) /* 35A478 E004C558 4407A000 */ mfc1 $a3, $f20 -/* 35A47C E004C55C 0C080110 */ jal func_E0200440 +/* 35A47C E004C55C 0C080110 */ jal shim_guScaleF /* 35A480 E004C560 00A0302D */ daddu $a2, $a1, $zero /* 35A484 E004C564 0200202D */ daddu $a0, $s0, $zero /* 35A488 E004C568 27A50018 */ addiu $a1, $sp, 0x18 -/* 35A48C E004C56C 0C080114 */ jal func_E0200450 +/* 35A48C E004C56C 0C080114 */ jal shim_guMtxCatF /* 35A490 E004C570 00A0302D */ daddu $a2, $a1, $zero /* 35A494 E004C574 27A40018 */ addiu $a0, $sp, 0x18 /* 35A498 E004C578 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -126,7 +126,7 @@ glabel func_E004C3A8 /* 35A4AC E004C58C 8E220000 */ lw $v0, ($s1) /* 35A4B0 E004C590 00052980 */ sll $a1, $a1, 6 /* 35A4B4 E004C594 00B52821 */ addu $a1, $a1, $s5 -/* 35A4B8 E004C598 0C080118 */ jal func_E0200460 +/* 35A4B8 E004C598 0C080118 */ jal shim_guMtxF2L /* 35A4BC E004C59C 00452821 */ addu $a1, $v0, $a1 /* 35A4C0 E004C5A0 3C06D838 */ lui $a2, 0xd838 /* 35A4C4 E004C5A4 34C60002 */ ori $a2, $a2, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_38/fx_38_main.s b/ver/us/asm/nonmatchings/effects/effect_38/fx_38_main.s index f9eef4bcae..347d17ff03 100644 --- a/ver/us/asm/nonmatchings/effects/effect_38/fx_38_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_38/fx_38_main.s @@ -26,12 +26,12 @@ glabel fx_38_main /* 359F74 E004C054 AFB00028 */ sw $s0, 0x28($sp) /* 359F78 E004C058 AFA00010 */ sw $zero, 0x10($sp) /* 359F7C E004C05C AFA00024 */ sw $zero, 0x24($sp) -/* 359F80 E004C060 0C080124 */ jal func_E0200490 +/* 359F80 E004C060 0C080124 */ jal shim_create_effect_instance /* 359F84 E004C064 AFA20014 */ sw $v0, 0x14($sp) /* 359F88 E004C068 24040034 */ addiu $a0, $zero, 0x34 /* 359F8C E004C06C 24030001 */ addiu $v1, $zero, 1 /* 359F90 E004C070 0040802D */ daddu $s0, $v0, $zero -/* 359F94 E004C074 0C08012C */ jal func_E02004B0 +/* 359F94 E004C074 0C08012C */ jal shim_general_heap_malloc /* 359F98 E004C078 AE030008 */ sw $v1, 8($s0) /* 359F9C E004C07C AE02000C */ sw $v0, 0xc($s0) /* 359FA0 E004C080 0040802D */ daddu $s0, $v0, $zero @@ -49,7 +49,7 @@ glabel fx_38_main /* 359FC8 E004C0A8 AE000010 */ sw $zero, 0x10($s0) /* 359FCC E004C0AC AE020018 */ sw $v0, 0x18($s0) /* 359FD0 E004C0B0 AE000014 */ sw $zero, 0x14($s0) -/* 359FD4 E004C0B4 0C080138 */ jal func_E02004E0 +/* 359FD4 E004C0B4 0C080138 */ jal shim_rand_int /* 359FD8 E004C0B8 AE00001C */ sw $zero, 0x1c($s0) /* 359FDC E004C0BC 12200006 */ beqz $s1, .LE004C0D8 /* 359FE0 E004C0C0 AE020020 */ sw $v0, 0x20($s0) @@ -67,7 +67,7 @@ glabel fx_38_main /* 35A00C E004C0EC 08013079 */ j .LE004C1E4 /* 35A010 E004C0F0 E6000030 */ swc1 $f0, 0x30($s0) .LE004C0F4: -/* 35A014 E004C0F4 0C080138 */ jal func_E02004E0 +/* 35A014 E004C0F4 0C080138 */ jal shim_rand_int /* 35A018 E004C0F8 2404000A */ addiu $a0, $zero, 0xa /* 35A01C E004C0FC 3C01E005 */ lui $at, %hi(D_E004C6A0) /* 35A020 E004C100 D434C6A0 */ ldc1 $f20, %lo(D_E004C6A0)($at) @@ -83,7 +83,7 @@ glabel fx_38_main /* 35A048 E004C128 46220000 */ add.d $f0, $f0, $f2 /* 35A04C E004C12C 2404000A */ addiu $a0, $zero, 0xa /* 35A050 E004C130 46200020 */ cvt.s.d $f0, $f0 -/* 35A054 E004C134 0C080138 */ jal func_E02004E0 +/* 35A054 E004C134 0C080138 */ jal shim_rand_int /* 35A058 E004C138 E6000024 */ swc1 $f0, 0x24($s0) /* 35A05C E004C13C 44820000 */ mtc1 $v0, $f0 /* 35A060 E004C140 00000000 */ nop @@ -96,7 +96,7 @@ glabel fx_38_main /* 35A07C E004C15C 08013075 */ j .LE004C1D4 /* 35A080 E004C160 46220000 */ add.d $f0, $f0, $f2 .LE004C164: -/* 35A084 E004C164 0C080138 */ jal func_E02004E0 +/* 35A084 E004C164 0C080138 */ jal shim_rand_int /* 35A088 E004C168 2404000A */ addiu $a0, $zero, 0xa /* 35A08C E004C16C 3C01E005 */ lui $at, %hi(D_E004C6A8) /* 35A090 E004C170 D434C6A8 */ ldc1 $f20, %lo(D_E004C6A8)($at) @@ -112,7 +112,7 @@ glabel fx_38_main /* 35A0B8 E004C198 46220001 */ sub.d $f0, $f0, $f2 /* 35A0BC E004C19C 2404000A */ addiu $a0, $zero, 0xa /* 35A0C0 E004C1A0 46200020 */ cvt.s.d $f0, $f0 -/* 35A0C4 E004C1A4 0C080138 */ jal func_E02004E0 +/* 35A0C4 E004C1A4 0C080138 */ jal shim_rand_int /* 35A0C8 E004C1A8 E6000024 */ swc1 $f0, 0x24($s0) /* 35A0CC E004C1AC 44820000 */ mtc1 $v0, $f0 /* 35A0D0 E004C1B0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_39/func_E004E164.s b/ver/us/asm/nonmatchings/effects/effect_39/func_E004E164.s index b7e9d6128e..69e0052aaf 100644 --- a/ver/us/asm/nonmatchings/effects/effect_39/func_E004E164.s +++ b/ver/us/asm/nonmatchings/effects/effect_39/func_E004E164.s @@ -24,7 +24,7 @@ glabel func_E004E164 /* 35BB80 E004E1B0 46001083 */ div.s $f2, $f2, $f0 /* 35BB84 E004E1B4 04810003 */ bgez $a0, .LE004E1C4 /* 35BB88 E004E1B8 E4420020 */ swc1 $f2, 0x20($v0) -/* 35BB8C E004E1BC 0C080128 */ jal func_E02004A0 +/* 35BB8C E004E1BC 0C080128 */ jal shim_remove_effect /* 35BB90 E004E1C0 00A0202D */ daddu $a0, $a1, $zero .LE004E1C4: /* 35BB94 E004E1C4 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_39/func_E004E1D0.s b/ver/us/asm/nonmatchings/effects/effect_39/func_E004E1D0.s index 1fbc72f5d1..662a00570f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_39/func_E004E1D0.s +++ b/ver/us/asm/nonmatchings/effects/effect_39/func_E004E1D0.s @@ -11,7 +11,7 @@ glabel func_E004E1D0 /* 35BBB8 E004E1E8 27A40010 */ addiu $a0, $sp, 0x10 /* 35BBBC E004E1EC AFBF0020 */ sw $ra, 0x20($sp) /* 35BBC0 E004E1F0 AFA00014 */ sw $zero, 0x14($sp) -/* 35BBC4 E004E1F4 0C080120 */ jal func_E0200480 +/* 35BBC4 E004E1F4 0C080120 */ jal shim_queue_render_task /* 35BBC8 E004E1F8 AFA20010 */ sw $v0, 0x10($sp) /* 35BBCC E004E1FC 8C430000 */ lw $v1, ($v0) /* 35BBD0 E004E200 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_39/func_E004E214.s b/ver/us/asm/nonmatchings/effects/effect_39/func_E004E214.s index e1085b9ed3..8897a81d1b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_39/func_E004E214.s +++ b/ver/us/asm/nonmatchings/effects/effect_39/func_E004E214.s @@ -90,7 +90,7 @@ glabel func_E004E214 /* 35BD38 E004E368 C620000C */ lwc1 $f0, 0xc($s1) /* 35BD3C E004E36C 4600328D */ trunc.w.s $f10, $f6 /* 35BD40 E004E370 44135000 */ mfc1 $s3, $f10 -/* 35BD44 E004E374 0C080180 */ jal func_E0200600 +/* 35BD44 E004E374 0C080180 */ jal shim_guPositionF /* 35BD48 E004E378 E7A0001C */ swc1 $f0, 0x1c($sp) /* 35BD4C E004E37C 27B00060 */ addiu $s0, $sp, 0x60 /* 35BD50 E004E380 0200202D */ daddu $a0, $s0, $zero @@ -99,11 +99,11 @@ glabel func_E004E214 /* 35BD5C E004E38C 3C013F80 */ lui $at, 0x3f80 /* 35BD60 E004E390 44810000 */ mtc1 $at, $f0 /* 35BD64 E004E394 00C0382D */ daddu $a3, $a2, $zero -/* 35BD68 E004E398 0C080104 */ jal func_E0200410 +/* 35BD68 E004E398 0C080104 */ jal shim_guRotateF /* 35BD6C E004E39C E7A00010 */ swc1 $f0, 0x10($sp) /* 35BD70 E004E3A0 0200202D */ daddu $a0, $s0, $zero /* 35BD74 E004E3A4 27A50020 */ addiu $a1, $sp, 0x20 -/* 35BD78 E004E3A8 0C080114 */ jal func_E0200450 +/* 35BD78 E004E3A8 0C080114 */ jal shim_guMtxCatF /* 35BD7C E004E3AC 00A0302D */ daddu $a2, $a1, $zero /* 35BD80 E004E3B0 27A40020 */ addiu $a0, $sp, 0x20 /* 35BD84 E004E3B4 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -114,7 +114,7 @@ glabel func_E004E214 /* 35BD98 E004E3C8 8E420000 */ lw $v0, ($s2) /* 35BD9C E004E3CC 00052980 */ sll $a1, $a1, 6 /* 35BDA0 E004E3D0 00B62821 */ addu $a1, $a1, $s6 -/* 35BDA4 E004E3D4 0C080118 */ jal func_E0200460 +/* 35BDA4 E004E3D4 0C080118 */ jal shim_guMtxF2L /* 35BDA8 E004E3D8 00452821 */ addu $a1, $v0, $a1 /* 35BDAC E004E3DC 3C07E200 */ lui $a3, 0xe200 /* 35BDB0 E004E3E0 34E71E01 */ ori $a3, $a3, 0x1e01 diff --git a/ver/us/asm/nonmatchings/effects/effect_39/fx_39_main.s b/ver/us/asm/nonmatchings/effects/effect_39/fx_39_main.s index 4300370d80..399d572d7f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_39/fx_39_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_39/fx_39_main.s @@ -29,12 +29,12 @@ glabel fx_39_main /* 35BA30 E004E060 AFB00028 */ sw $s0, 0x28($sp) /* 35BA34 E004E064 AFA00010 */ sw $zero, 0x10($sp) /* 35BA38 E004E068 AFA00024 */ sw $zero, 0x24($sp) -/* 35BA3C E004E06C 0C080124 */ jal func_E0200490 +/* 35BA3C E004E06C 0C080124 */ jal shim_create_effect_instance /* 35BA40 E004E070 AFA20014 */ sw $v0, 0x14($sp) /* 35BA44 E004E074 24040028 */ addiu $a0, $zero, 0x28 /* 35BA48 E004E078 24110001 */ addiu $s1, $zero, 1 /* 35BA4C E004E07C 0040802D */ daddu $s0, $v0, $zero -/* 35BA50 E004E080 0C08012C */ jal func_E02004B0 +/* 35BA50 E004E080 0C08012C */ jal shim_general_heap_malloc /* 35BA54 E004E084 AE110008 */ sw $s1, 8($s0) /* 35BA58 E004E088 AE02000C */ sw $v0, 0xc($s0) /* 35BA5C E004E08C 0040802D */ daddu $s0, $v0, $zero @@ -46,7 +46,7 @@ glabel fx_39_main .LE004E0A0: /* 35BA70 E004E0A0 00112880 */ sll $a1, $s1, 2 /* 35BA74 E004E0A4 00B12821 */ addu $a1, $a1, $s1 -/* 35BA78 E004E0A8 0C080130 */ jal func_E02004C0 +/* 35BA78 E004E0A8 0C080130 */ jal shim_mem_clear /* 35BA7C E004E0AC 000528C0 */ sll $a1, $a1, 3 /* 35BA80 E004E0B0 AE130014 */ sw $s3, 0x14($s0) /* 35BA84 E004E0B4 AE000018 */ sw $zero, 0x18($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_40/func_E00501D8.s b/ver/us/asm/nonmatchings/effects/effect_40/func_E00501D8.s index adaf1045f6..d520daa35b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_40/func_E00501D8.s +++ b/ver/us/asm/nonmatchings/effects/effect_40/func_E00501D8.s @@ -9,7 +9,7 @@ glabel func_E00501D8 /* 35C1B8 E00501E8 2442FFFF */ addiu $v0, $v0, -1 /* 35C1BC E00501EC 04410005 */ bgez $v0, .LE0050204 /* 35C1C0 E00501F0 AC620024 */ sw $v0, 0x24($v1) -/* 35C1C4 E00501F4 0C080128 */ jal func_E02004A0 +/* 35C1C4 E00501F4 0C080128 */ jal shim_remove_effect /* 35C1C8 E00501F8 00000000 */ nop /* 35C1CC E00501FC 080140AE */ j .LE00502B8 /* 35C1D0 E0050200 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_40/func_E00502C4.s b/ver/us/asm/nonmatchings/effects/effect_40/func_E00502C4.s index 0f40cc3d42..750625fe06 100644 --- a/ver/us/asm/nonmatchings/effects/effect_40/func_E00502C4.s +++ b/ver/us/asm/nonmatchings/effects/effect_40/func_E00502C4.s @@ -11,7 +11,7 @@ glabel func_E00502C4 /* 35C2AC E00502DC 27A40010 */ addiu $a0, $sp, 0x10 /* 35C2B0 E00502E0 AFBF0020 */ sw $ra, 0x20($sp) /* 35C2B4 E00502E4 AFA00014 */ sw $zero, 0x14($sp) -/* 35C2B8 E00502E8 0C080120 */ jal func_E0200480 +/* 35C2B8 E00502E8 0C080120 */ jal shim_queue_render_task /* 35C2BC E00502EC AFA20010 */ sw $v0, 0x10($sp) /* 35C2C0 E00502F0 8C430000 */ lw $v1, ($v0) /* 35C2C4 E00502F4 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_40/func_E0050308.s b/ver/us/asm/nonmatchings/effects/effect_40/func_E0050308.s index 6c7deb76f0..567c2ff032 100644 --- a/ver/us/asm/nonmatchings/effects/effect_40/func_E0050308.s +++ b/ver/us/asm/nonmatchings/effects/effect_40/func_E0050308.s @@ -37,7 +37,7 @@ glabel func_E0050308 /* 35C358 E0050388 8E660008 */ lw $a2, 8($s3) /* 35C35C E005038C 8E67000C */ lw $a3, 0xc($s3) /* 35C360 E0050390 25080008 */ addiu $t0, $t0, 8 -/* 35C364 E0050394 0C080108 */ jal func_E0200420 +/* 35C364 E0050394 0C080108 */ jal shim_guTranslateF /* 35C368 E0050398 AE880000 */ sw $t0, ($s4) /* 35C36C E005039C 27B00058 */ addiu $s0, $sp, 0x58 /* 35C370 E00503A0 4480A000 */ mtc1 $zero, $f20 @@ -60,21 +60,21 @@ glabel func_E0050308 /* 35C3B4 E00503E4 46000007 */ neg.s $f0, $f0 /* 35C3B8 E00503E8 44050000 */ mfc1 $a1, $f0 /* 35C3BC E00503EC 0200202D */ daddu $a0, $s0, $zero -/* 35C3C0 E00503F0 0C080104 */ jal func_E0200410 +/* 35C3C0 E00503F0 0C080104 */ jal shim_guRotateF /* 35C3C4 E00503F4 E7B40010 */ swc1 $f20, 0x10($sp) /* 35C3C8 E00503F8 0200202D */ daddu $a0, $s0, $zero /* 35C3CC E00503FC 27A50018 */ addiu $a1, $sp, 0x18 -/* 35C3D0 E0050400 0C080114 */ jal func_E0200450 +/* 35C3D0 E0050400 0C080114 */ jal shim_guMtxCatF /* 35C3D4 E0050404 00A0302D */ daddu $a2, $a1, $zero /* 35C3D8 E0050408 E7B60010 */ swc1 $f22, 0x10($sp) /* 35C3DC E005040C 8E650010 */ lw $a1, 0x10($s3) /* 35C3E0 E0050410 4406A000 */ mfc1 $a2, $f20 /* 35C3E4 E0050414 4407A000 */ mfc1 $a3, $f20 -/* 35C3E8 E0050418 0C080104 */ jal func_E0200410 +/* 35C3E8 E0050418 0C080104 */ jal shim_guRotateF /* 35C3EC E005041C 0200202D */ daddu $a0, $s0, $zero /* 35C3F0 E0050420 0200202D */ daddu $a0, $s0, $zero /* 35C3F4 E0050424 27A50018 */ addiu $a1, $sp, 0x18 -/* 35C3F8 E0050428 0C080114 */ jal func_E0200450 +/* 35C3F8 E0050428 0C080114 */ jal shim_guMtxCatF /* 35C3FC E005042C 00A0302D */ daddu $a2, $a1, $zero /* 35C400 E0050430 27A40018 */ addiu $a0, $sp, 0x18 /* 35C404 E0050434 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -85,7 +85,7 @@ glabel func_E0050308 /* 35C418 E0050448 8E220000 */ lw $v0, ($s1) /* 35C41C E005044C 00052980 */ sll $a1, $a1, 6 /* 35C420 E0050450 00B22821 */ addu $a1, $a1, $s2 -/* 35C424 E0050454 0C080118 */ jal func_E0200460 +/* 35C424 E0050454 0C080118 */ jal shim_guMtxF2L /* 35C428 E0050458 00452821 */ addu $a1, $v0, $a1 /* 35C42C E005045C 3C02DA38 */ lui $v0, 0xda38 /* 35C430 E0050460 34420002 */ ori $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_40/fx_40_main.s b/ver/us/asm/nonmatchings/effects/effect_40/fx_40_main.s index 44fb80c9ed..9511ef409f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_40/fx_40_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_40/fx_40_main.s @@ -30,12 +30,12 @@ glabel fx_40_main /* 35C034 E0050064 F7B40080 */ sdc1 $f20, 0x80($sp) /* 35C038 E0050068 AFA00018 */ sw $zero, 0x18($sp) /* 35C03C E005006C AFA0002C */ sw $zero, 0x2c($sp) -/* 35C040 E0050070 0C080124 */ jal func_E0200490 +/* 35C040 E0050070 0C080124 */ jal shim_create_effect_instance /* 35C044 E0050074 AFA2001C */ sw $v0, 0x1c($sp) /* 35C048 E0050078 24040028 */ addiu $a0, $zero, 0x28 /* 35C04C E005007C 24030001 */ addiu $v1, $zero, 1 /* 35C050 E0050080 0040802D */ daddu $s0, $v0, $zero -/* 35C054 E0050084 0C08012C */ jal func_E02004B0 +/* 35C054 E0050084 0C08012C */ jal shim_general_heap_malloc /* 35C058 E0050088 AE030008 */ sw $v1, 8($s0) /* 35C05C E005008C 0040882D */ daddu $s1, $v0, $zero /* 35C060 E0050090 16200003 */ bnez $s1, .LE00500A0 @@ -58,7 +58,7 @@ glabel fx_40_main /* 35C09C E00500CC 3C01800B */ lui $at, %hi(gCameras+0x6C) /* 35C0A0 E00500D0 00220821 */ addu $at, $at, $v0 /* 35C0A4 E00500D4 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* 35C0A8 E00500D8 0C080140 */ jal func_E0200500 +/* 35C0A8 E00500D8 0C080140 */ jal shim_sin_deg /* 35C0AC E00500DC 00000000 */ nop /* 35C0B0 E00500E0 8E030000 */ lw $v1, ($s0) /* 35C0B4 E00500E4 00031080 */ sll $v0, $v1, 2 @@ -71,7 +71,7 @@ glabel fx_40_main /* 35C0D0 E0050100 3C01800B */ lui $at, %hi(gCameras+0x6C) /* 35C0D4 E0050104 00220821 */ addu $at, $at, $v0 /* 35C0D8 E0050108 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* 35C0DC E005010C 0C080144 */ jal func_E0200510 +/* 35C0DC E005010C 0C080144 */ jal shim_cos_deg /* 35C0E0 E0050110 46000506 */ mov.s $f20, $f0 /* 35C0E4 E0050114 27A40030 */ addiu $a0, $sp, 0x30 /* 35C0E8 E0050118 0000382D */ daddu $a3, $zero, $zero @@ -79,7 +79,7 @@ glabel fx_40_main /* 35C0F0 E0050120 4406A000 */ mfc1 $a2, $f20 /* 35C0F4 E0050124 44052000 */ mfc1 $a1, $f4 /* 35C0F8 E0050128 46000007 */ neg.s $f0, $f0 -/* 35C0FC E005012C 0C080104 */ jal func_E0200410 +/* 35C0FC E005012C 0C080104 */ jal shim_guRotateF /* 35C100 E0050130 E7A00010 */ swc1 $f0, 0x10($sp) /* 35C104 E0050134 3C014180 */ lui $at, 0x4180 /* 35C108 E0050138 44810000 */ mtc1 $at, $f0 diff --git a/ver/us/asm/nonmatchings/effects/effect_41/func_E00520F0.s b/ver/us/asm/nonmatchings/effects/effect_41/func_E00520F0.s index a118924287..c87f70fcbe 100644 --- a/ver/us/asm/nonmatchings/effects/effect_41/func_E00520F0.s +++ b/ver/us/asm/nonmatchings/effects/effect_41/func_E00520F0.s @@ -39,7 +39,7 @@ glabel func_E00520F0 /* 35CBF0 E0052170 8E03001C */ lw $v1, 0x1c($s0) /* 35CBF4 E0052174 04610005 */ bgez $v1, .LE005218C /* 35CBF8 E0052178 0060B82D */ daddu $s7, $v1, $zero -/* 35CBFC E005217C 0C080128 */ jal func_E02004A0 +/* 35CBFC E005217C 0C080128 */ jal shim_remove_effect /* 35CC00 E0052180 00000000 */ nop /* 35CC04 E0052184 080148F6 */ j .LE00523D8 /* 35CC08 E0052188 00000000 */ nop @@ -60,7 +60,7 @@ glabel func_E00520F0 /* 35CC40 E00521C0 44826000 */ mtc1 $v0, $f12 /* 35CC44 E00521C4 00000000 */ nop /* 35CC48 E00521C8 46806320 */ cvt.s.w $f12, $f12 -/* 35CC4C E00521CC 0C080140 */ jal func_E0200500 +/* 35CC4C E00521CC 0C080140 */ jal shim_sin_deg /* 35CC50 E00521D0 E6140018 */ swc1 $f20, 0x18($s0) /* 35CC54 E00521D4 4600A002 */ mul.s $f0, $f20, $f0 /* 35CC58 E00521D8 00000000 */ nop @@ -97,12 +97,12 @@ glabel func_E00520F0 /* 35CCD0 E0052250 44811000 */ mtc1 $at, $f2 /* 35CCD4 E0052254 4600A503 */ div.s $f20, $f20, $f0 /* 35CCD8 E0052258 4602A500 */ add.s $f20, $f20, $f2 -/* 35CCDC E005225C 0C080140 */ jal func_E0200500 +/* 35CCDC E005225C 0C080140 */ jal shim_sin_deg /* 35CCE0 E0052260 4600A306 */ mov.s $f12, $f20 /* 35CCE4 E0052264 4600C002 */ mul.s $f0, $f24, $f0 /* 35CCE8 E0052268 00000000 */ nop /* 35CCEC E005226C 4600A306 */ mov.s $f12, $f20 -/* 35CCF0 E0052270 0C080144 */ jal func_E0200510 +/* 35CCF0 E0052270 0C080144 */ jal shim_cos_deg /* 35CCF4 E0052274 E6600000 */ swc1 $f0, ($s3) /* 35CCF8 E0052278 4600C087 */ neg.s $f2, $f24 /* 35CCFC E005227C 46001082 */ mul.s $f2, $f2, $f0 @@ -110,7 +110,7 @@ glabel func_E00520F0 /* 35CD04 E0052284 44946000 */ mtc1 $s4, $f12 /* 35CD08 E0052288 00000000 */ nop /* 35CD0C E005228C 46806320 */ cvt.s.w $f12, $f12 -/* 35CD10 E0052290 0C080140 */ jal func_E0200500 +/* 35CD10 E0052290 0C080140 */ jal shim_sin_deg /* 35CD14 E0052294 E6220000 */ swc1 $f2, ($s1) /* 35CD18 E0052298 46000021 */ cvt.d.s $f0, $f0 /* 35CD1C E005229C 463A0002 */ mul.d $f0, $f0, $f26 @@ -133,7 +133,7 @@ glabel func_E00520F0 /* 35CD60 E00522E0 00000000 */ nop /* 35CD64 E00522E4 460010A1 */ cvt.d.s $f2, $f2 /* 35CD68 E00522E8 46220000 */ add.d $f0, $f0, $f2 -/* 35CD6C E00522EC 0C080140 */ jal func_E0200500 +/* 35CD6C E00522EC 0C080140 */ jal shim_sin_deg /* 35CD70 E00522F0 46200320 */ cvt.s.d $f12, $f0 /* 35CD74 E00522F4 46000021 */ cvt.d.s $f0, $f0 /* 35CD78 E00522F8 463C0002 */ mul.d $f0, $f0, $f28 @@ -145,7 +145,7 @@ glabel func_E00520F0 /* 35CD90 E0052310 00000000 */ nop /* 35CD94 E0052314 46806320 */ cvt.s.w $f12, $f12 /* 35CD98 E0052318 462010A0 */ cvt.s.d $f2, $f2 -/* 35CD9C E005231C 0C080144 */ jal func_E0200510 +/* 35CD9C E005231C 0C080144 */ jal shim_cos_deg /* 35CDA0 E0052320 E6620000 */ swc1 $f2, ($s3) /* 35CDA4 E0052324 46000021 */ cvt.d.s $f0, $f0 /* 35CDA8 E0052328 463A0002 */ mul.d $f0, $f0, $f26 @@ -160,7 +160,7 @@ glabel func_E00520F0 /* 35CDCC E005234C 00000000 */ nop /* 35CDD0 E0052350 4600B5A1 */ cvt.d.s $f22, $f22 /* 35CDD4 E0052354 4636A500 */ add.d $f20, $f20, $f22 -/* 35CDD8 E0052358 0C080144 */ jal func_E0200510 +/* 35CDD8 E0052358 0C080144 */ jal shim_cos_deg /* 35CDDC E005235C 4620A320 */ cvt.s.d $f12, $f20 /* 35CDE0 E0052360 46000021 */ cvt.d.s $f0, $f0 /* 35CDE4 E0052364 463C0002 */ mul.d $f0, $f0, $f28 diff --git a/ver/us/asm/nonmatchings/effects/effect_41/func_E005241C.s b/ver/us/asm/nonmatchings/effects/effect_41/func_E005241C.s index 15e82ac5bd..2eace6fdf4 100644 --- a/ver/us/asm/nonmatchings/effects/effect_41/func_E005241C.s +++ b/ver/us/asm/nonmatchings/effects/effect_41/func_E005241C.s @@ -11,7 +11,7 @@ glabel func_E005241C /* 35CEB4 E0052434 27A40010 */ addiu $a0, $sp, 0x10 /* 35CEB8 E0052438 AFBF0020 */ sw $ra, 0x20($sp) /* 35CEBC E005243C AFA00014 */ sw $zero, 0x14($sp) -/* 35CEC0 E0052440 0C080120 */ jal func_E0200480 +/* 35CEC0 E0052440 0C080120 */ jal shim_queue_render_task /* 35CEC4 E0052444 AFA20010 */ sw $v0, 0x10($sp) /* 35CEC8 E0052448 8C430000 */ lw $v1, ($v0) /* 35CECC E005244C 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_41/func_E0052460.s b/ver/us/asm/nonmatchings/effects/effect_41/func_E0052460.s index 4e9bdbd007..796742eda6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_41/func_E0052460.s +++ b/ver/us/asm/nonmatchings/effects/effect_41/func_E0052460.s @@ -84,14 +84,14 @@ glabel func_E0052460 /* 35D010 E0052590 8D050004 */ lw $a1, 4($t0) /* 35D014 E0052594 8D060008 */ lw $a2, 8($t0) /* 35D018 E0052598 8D07000C */ lw $a3, 0xc($t0) -/* 35D01C E005259C 0C080108 */ jal func_E0200420 +/* 35D01C E005259C 0C080108 */ jal shim_guTranslateF /* 35D020 E00525A0 0100A02D */ daddu $s4, $t0, $zero /* 35D024 E00525A4 27A40018 */ addiu $a0, $sp, 0x18 /* 35D028 E00525A8 96C50000 */ lhu $a1, ($s6) /* 35D02C E00525AC 8EE20000 */ lw $v0, ($s7) /* 35D030 E00525B0 00052980 */ sll $a1, $a1, 6 /* 35D034 E00525B4 00B22821 */ addu $a1, $a1, $s2 -/* 35D038 E00525B8 0C080118 */ jal func_E0200460 +/* 35D038 E00525B8 0C080118 */ jal shim_guMtxF2L /* 35D03C E00525BC 00452821 */ addu $a1, $v0, $a1 /* 35D040 E00525C0 3C02DA38 */ lui $v0, 0xda38 /* 35D044 E00525C4 34420002 */ ori $v0, $v0, 2 @@ -124,14 +124,14 @@ glabel func_E0052460 /* 35D0B0 E0052630 AEA80000 */ sw $t0, ($s5) /* 35D0B4 E0052634 25080008 */ addiu $t0, $t0, 8 /* 35D0B8 E0052638 A6C90000 */ sh $t1, ($s6) -/* 35D0BC E005263C 0C080104 */ jal func_E0200410 +/* 35D0BC E005263C 0C080104 */ jal shim_guRotateF /* 35D0C0 E0052640 AEA80000 */ sw $t0, ($s5) /* 35D0C4 E0052644 27A40018 */ addiu $a0, $sp, 0x18 /* 35D0C8 E0052648 96C50000 */ lhu $a1, ($s6) /* 35D0CC E005264C 8EE20000 */ lw $v0, ($s7) /* 35D0D0 E0052650 00052980 */ sll $a1, $a1, 6 /* 35D0D4 E0052654 00B22821 */ addu $a1, $a1, $s2 -/* 35D0D8 E0052658 0C080118 */ jal func_E0200460 +/* 35D0D8 E0052658 0C080118 */ jal shim_guMtxF2L /* 35D0DC E005265C 00452821 */ addu $a1, $v0, $a1 /* 35D0E0 E0052660 3C03DA38 */ lui $v1, 0xda38 /* 35D0E4 E0052664 34630001 */ ori $v1, $v1, 1 @@ -166,24 +166,24 @@ glabel func_E0052460 /* 35D158 E00526D8 44050000 */ mfc1 $a1, $f0 /* 35D15C E00526DC 25080001 */ addiu $t0, $t0, 1 /* 35D160 E00526E0 A6C80000 */ sh $t0, ($s6) -/* 35D164 E00526E4 0C080104 */ jal func_E0200410 +/* 35D164 E00526E4 0C080104 */ jal shim_guRotateF /* 35D168 E00526E8 E7B40010 */ swc1 $f20, 0x10($sp) /* 35D16C E00526EC 27B00058 */ addiu $s0, $sp, 0x58 /* 35D170 E00526F0 8E8500C4 */ lw $a1, 0xc4($s4) /* 35D174 E00526F4 8E8600C8 */ lw $a2, 0xc8($s4) /* 35D178 E00526F8 4407A000 */ mfc1 $a3, $f20 -/* 35D17C E00526FC 0C080108 */ jal func_E0200420 +/* 35D17C E00526FC 0C080108 */ jal shim_guTranslateF /* 35D180 E0052700 0200202D */ daddu $a0, $s0, $zero /* 35D184 E0052704 0200202D */ daddu $a0, $s0, $zero /* 35D188 E0052708 27A50018 */ addiu $a1, $sp, 0x18 -/* 35D18C E005270C 0C080114 */ jal func_E0200450 +/* 35D18C E005270C 0C080114 */ jal shim_guMtxCatF /* 35D190 E0052710 00A0302D */ daddu $a2, $a1, $zero /* 35D194 E0052714 27A40018 */ addiu $a0, $sp, 0x18 /* 35D198 E0052718 96C50000 */ lhu $a1, ($s6) /* 35D19C E005271C 8EE20000 */ lw $v0, ($s7) /* 35D1A0 E0052720 00052980 */ sll $a1, $a1, 6 /* 35D1A4 E0052724 00B22821 */ addu $a1, $a1, $s2 -/* 35D1A8 E0052728 0C080118 */ jal func_E0200460 +/* 35D1A8 E0052728 0C080118 */ jal shim_guMtxF2L /* 35D1AC E005272C 00452821 */ addu $a1, $v0, $a1 /* 35D1B0 E0052730 3C060100 */ lui $a2, 0x100 /* 35D1B4 E0052734 34C61004 */ ori $a2, $a2, 0x1004 @@ -212,14 +212,14 @@ glabel func_E0052460 /* 35D20C E005278C 0000382D */ daddu $a3, $zero, $zero /* 35D210 E0052790 8E850024 */ lw $a1, 0x24($s4) /* 35D214 E0052794 8E860028 */ lw $a2, 0x28($s4) -/* 35D218 E0052798 0C080108 */ jal func_E0200420 +/* 35D218 E0052798 0C080108 */ jal shim_guTranslateF /* 35D21C E005279C 26940008 */ addiu $s4, $s4, 8 /* 35D220 E00527A0 27A40018 */ addiu $a0, $sp, 0x18 /* 35D224 E00527A4 96C50000 */ lhu $a1, ($s6) /* 35D228 E00527A8 8EE20000 */ lw $v0, ($s7) /* 35D22C E00527AC 00052980 */ sll $a1, $a1, 6 /* 35D230 E00527B0 00BE2821 */ addu $a1, $a1, $fp -/* 35D234 E00527B4 0C080118 */ jal func_E0200460 +/* 35D234 E00527B4 0C080118 */ jal shim_guMtxF2L /* 35D238 E00527B8 00452821 */ addu $a1, $v0, $a1 /* 35D23C E00527BC 3C080100 */ lui $t0, 0x100 /* 35D240 E00527C0 35081000 */ ori $t0, $t0, 0x1000 diff --git a/ver/us/asm/nonmatchings/effects/effect_41/fx_41_main.s b/ver/us/asm/nonmatchings/effects/effect_41/fx_41_main.s index 5a0a1f5708..1a039ee2d2 100644 --- a/ver/us/asm/nonmatchings/effects/effect_41/fx_41_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_41/fx_41_main.s @@ -26,12 +26,12 @@ glabel fx_41_main /* 35CAD4 E0052054 AFB00028 */ sw $s0, 0x28($sp) /* 35CAD8 E0052058 AFA00010 */ sw $zero, 0x10($sp) /* 35CADC E005205C AFA00024 */ sw $zero, 0x24($sp) -/* 35CAE0 E0052060 0C080124 */ jal func_E0200490 +/* 35CAE0 E0052060 0C080124 */ jal shim_create_effect_instance /* 35CAE4 E0052064 AFA20014 */ sw $v0, 0x14($sp) /* 35CAE8 E0052068 240400CC */ addiu $a0, $zero, 0xcc /* 35CAEC E005206C 24030001 */ addiu $v1, $zero, 1 /* 35CAF0 E0052070 0040802D */ daddu $s0, $v0, $zero -/* 35CAF4 E0052074 0C08012C */ jal func_E02004B0 +/* 35CAF4 E0052074 0C08012C */ jal shim_general_heap_malloc /* 35CAF8 E0052078 AE030008 */ sw $v1, 8($s0) /* 35CAFC E005207C 0040182D */ daddu $v1, $v0, $zero /* 35CB00 E0052080 14600003 */ bnez $v1, .LE0052090 diff --git a/ver/us/asm/nonmatchings/effects/effect_43/func_E005630C.s b/ver/us/asm/nonmatchings/effects/effect_43/func_E005630C.s index 0ea573b412..deb1c7a99d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_43/func_E005630C.s +++ b/ver/us/asm/nonmatchings/effects/effect_43/func_E005630C.s @@ -24,7 +24,7 @@ glabel func_E005630C /* 35DD58 E0056358 24A20001 */ addiu $v0, $a1, 1 /* 35DD5C E005635C 04C10005 */ bgez $a2, .LE0056374 /* 35DD60 E0056360 AC82002C */ sw $v0, 0x2c($a0) -/* 35DD64 E0056364 0C080128 */ jal func_E02004A0 +/* 35DD64 E0056364 0C080128 */ jal shim_remove_effect /* 35DD68 E0056368 0280202D */ daddu $a0, $s4, $zero /* 35DD6C E005636C 08015AD6 */ j .LE0056B58 /* 35DD70 E0056370 00000000 */ nop @@ -93,7 +93,7 @@ glabel func_E005630C /* 35DE58 E0056458 D4366ED0 */ ldc1 $f22, %lo(D_E0056ED0)($at) .LE005645C: /* 35DE5C E005645C C60C000C */ lwc1 $f12, 0xc($s0) -/* 35DE60 E0056460 0C080140 */ jal func_E0200500 +/* 35DE60 E0056460 0C080140 */ jal shim_sin_deg /* 35DE64 E0056464 460C6300 */ add.s $f12, $f12, $f12 /* 35DE68 E0056468 3C01E005 */ lui $at, %hi(D_E0056ED8) /* 35DE6C E005646C D4226ED8 */ ldc1 $f2, %lo(D_E0056ED8)($at) @@ -115,7 +115,7 @@ glabel func_E005630C /* 35DEAC E00564AC 00000000 */ nop /* 35DEB0 E00564B0 C60C000C */ lwc1 $f12, 0xc($s0) /* 35DEB4 E00564B4 46200020 */ cvt.s.d $f0, $f0 -/* 35DEB8 E00564B8 0C080140 */ jal func_E0200500 +/* 35DEB8 E00564B8 0C080140 */ jal shim_sin_deg /* 35DEBC E00564BC E6000004 */ swc1 $f0, 4($s0) /* 35DEC0 E00564C0 3C01E005 */ lui $at, %hi(D_E0056EE8) /* 35DEC4 E00564C4 D4226EE8 */ ldc1 $f2, %lo(D_E0056EE8)($at) @@ -154,7 +154,7 @@ glabel func_E005630C /* 35DF40 E0056540 00000000 */ nop /* 35DF44 E0056544 46800020 */ cvt.s.w $f0, $f0 /* 35DF48 E0056548 46006300 */ add.s $f12, $f12, $f0 -/* 35DF4C E005654C 0C080140 */ jal func_E0200500 +/* 35DF4C E005654C 0C080140 */ jal shim_sin_deg /* 35DF50 E0056550 E60C0010 */ swc1 $f12, 0x10($s0) /* 35DF54 E0056554 C60C0010 */ lwc1 $f12, 0x10($s0) /* 35DF58 E0056558 3C013FE0 */ lui $at, 0x3fe0 @@ -168,7 +168,7 @@ glabel func_E005630C /* 35DF78 E0056578 C602000C */ lwc1 $f2, 0xc($s0) /* 35DF7C E005657C 46001080 */ add.s $f2, $f2, $f0 /* 35DF80 E0056580 E602000C */ swc1 $f2, 0xc($s0) -/* 35DF84 E0056584 0C080144 */ jal func_E0200510 +/* 35DF84 E0056584 0C080144 */ jal shim_cos_deg /* 35DF88 E0056588 46206320 */ cvt.s.d $f12, $f12 /* 35DF8C E005658C 461A0002 */ mul.s $f0, $f0, $f26 /* 35DF90 E0056590 00000000 */ nop @@ -326,7 +326,7 @@ glabel func_E005630C /* 35E1C4 E00567C4 D4366F08 */ ldc1 $f22, %lo(D_E0056F08)($at) .LE00567C8: /* 35E1C8 E00567C8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 35E1CC E00567CC 0C080140 */ jal func_E0200500 +/* 35E1CC E00567CC 0C080140 */ jal shim_sin_deg /* 35E1D0 E00567D0 460C6300 */ add.s $f12, $f12, $f12 /* 35E1D4 E00567D4 3C01E005 */ lui $at, %hi(D_E0056F10) /* 35E1D8 E00567D8 D4226F10 */ ldc1 $f2, %lo(D_E0056F10)($at) @@ -359,7 +359,7 @@ glabel func_E005630C /* 35E244 E0056844 00000000 */ nop /* 35E248 E0056848 46800020 */ cvt.s.w $f0, $f0 /* 35E24C E005684C 46006300 */ add.s $f12, $f12, $f0 -/* 35E250 E0056850 0C080140 */ jal func_E0200500 +/* 35E250 E0056850 0C080140 */ jal shim_sin_deg /* 35E254 E0056854 E60C0010 */ swc1 $f12, 0x10($s0) /* 35E258 E0056858 C60C0010 */ lwc1 $f12, 0x10($s0) /* 35E25C E005685C 3C013FE0 */ lui $at, 0x3fe0 @@ -373,7 +373,7 @@ glabel func_E005630C /* 35E27C E005687C C602000C */ lwc1 $f2, 0xc($s0) /* 35E280 E0056880 46001080 */ add.s $f2, $f2, $f0 /* 35E284 E0056884 E602000C */ swc1 $f2, 0xc($s0) -/* 35E288 E0056888 0C080144 */ jal func_E0200510 +/* 35E288 E0056888 0C080144 */ jal shim_cos_deg /* 35E28C E005688C 46206320 */ cvt.s.d $f12, $f12 /* 35E290 E0056890 461A0002 */ mul.s $f0, $f0, $f26 /* 35E294 E0056894 00000000 */ nop @@ -533,7 +533,7 @@ glabel func_E005630C /* 35E4CC E0056ACC 00000000 */ nop /* 35E4D0 E0056AD0 46800020 */ cvt.s.w $f0, $f0 /* 35E4D4 E0056AD4 46006300 */ add.s $f12, $f12, $f0 -/* 35E4D8 E0056AD8 0C080140 */ jal func_E0200500 +/* 35E4D8 E0056AD8 0C080140 */ jal shim_sin_deg /* 35E4DC E0056ADC E60C0014 */ swc1 $f12, 0x14($s0) /* 35E4E0 E0056AE0 C60C0014 */ lwc1 $f12, 0x14($s0) /* 35E4E4 E0056AE4 46006321 */ cvt.d.s $f12, $f12 @@ -544,7 +544,7 @@ glabel func_E005630C /* 35E4F8 E0056AF8 C6020010 */ lwc1 $f2, 0x10($s0) /* 35E4FC E0056AFC 46001080 */ add.s $f2, $f2, $f0 /* 35E500 E0056B00 E6020010 */ swc1 $f2, 0x10($s0) -/* 35E504 E0056B04 0C080144 */ jal func_E0200510 +/* 35E504 E0056B04 0C080144 */ jal shim_cos_deg /* 35E508 E0056B08 46206320 */ cvt.s.d $f12, $f12 /* 35E50C E0056B0C 46140002 */ mul.s $f0, $f0, $f20 /* 35E510 E0056B10 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_43/func_E0056B8C.s b/ver/us/asm/nonmatchings/effects/effect_43/func_E0056B8C.s index 2fb6cb8ced..085f0a9b22 100644 --- a/ver/us/asm/nonmatchings/effects/effect_43/func_E0056B8C.s +++ b/ver/us/asm/nonmatchings/effects/effect_43/func_E0056B8C.s @@ -11,7 +11,7 @@ glabel func_E0056B8C /* 35E5A4 E0056BA4 27A40010 */ addiu $a0, $sp, 0x10 /* 35E5A8 E0056BA8 AFBF0020 */ sw $ra, 0x20($sp) /* 35E5AC E0056BAC AFA00014 */ sw $zero, 0x14($sp) -/* 35E5B0 E0056BB0 0C080120 */ jal func_E0200480 +/* 35E5B0 E0056BB0 0C080120 */ jal shim_queue_render_task /* 35E5B4 E0056BB4 AFA20010 */ sw $v0, 0x10($sp) /* 35E5B8 E0056BB8 8C430000 */ lw $v1, ($v0) /* 35E5BC E0056BBC 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_43/func_E0056BD0.s b/ver/us/asm/nonmatchings/effects/effect_43/func_E0056BD0.s index a7537b6c8e..57b40fd4d5 100644 --- a/ver/us/asm/nonmatchings/effects/effect_43/func_E0056BD0.s +++ b/ver/us/asm/nonmatchings/effects/effect_43/func_E0056BD0.s @@ -58,7 +58,7 @@ glabel func_E0056BD0 /* 35E6A0 E0056CA0 8E050004 */ lw $a1, 4($s0) /* 35E6A4 E0056CA4 8E060008 */ lw $a2, 8($s0) /* 35E6A8 E0056CA8 8E07000C */ lw $a3, 0xc($s0) -/* 35E6AC E0056CAC 0C080108 */ jal func_E0200420 +/* 35E6AC E0056CAC 0C080108 */ jal shim_guTranslateF /* 35E6B0 E0056CB0 27A40018 */ addiu $a0, $sp, 0x18 /* 35E6B4 E0056CB4 27B10058 */ addiu $s1, $sp, 0x58 /* 35E6B8 E0056CB8 4480A000 */ mtc1 $zero, $f20 @@ -81,11 +81,11 @@ glabel func_E0056BD0 /* 35E6FC E0056CFC 46000007 */ neg.s $f0, $f0 /* 35E700 E0056D00 44050000 */ mfc1 $a1, $f0 /* 35E704 E0056D04 0220202D */ daddu $a0, $s1, $zero -/* 35E708 E0056D08 0C080104 */ jal func_E0200410 +/* 35E708 E0056D08 0C080104 */ jal shim_guRotateF /* 35E70C E0056D0C E7B40010 */ swc1 $f20, 0x10($sp) /* 35E710 E0056D10 0220202D */ daddu $a0, $s1, $zero /* 35E714 E0056D14 27A50018 */ addiu $a1, $sp, 0x18 -/* 35E718 E0056D18 0C080114 */ jal func_E0200450 +/* 35E718 E0056D18 0C080114 */ jal shim_guMtxCatF /* 35E71C E0056D1C 27A60098 */ addiu $a2, $sp, 0x98 /* 35E720 E0056D20 8FC20008 */ lw $v0, 8($fp) /* 35E724 E0056D24 0242102A */ slt $v0, $s2, $v0 @@ -103,39 +103,39 @@ glabel func_E0056BD0 /* 35E750 E0056D50 8E05FFE4 */ lw $a1, -0x1c($s0) /* 35E754 E0056D54 8E06FFE8 */ lw $a2, -0x18($s0) /* 35E758 E0056D58 8E07FFEC */ lw $a3, -0x14($s0) -/* 35E75C E0056D5C 0C080108 */ jal func_E0200420 +/* 35E75C E0056D5C 0C080108 */ jal shim_guTranslateF /* 35E760 E0056D60 26520001 */ addiu $s2, $s2, 1 /* 35E764 E0056D64 0220202D */ daddu $a0, $s1, $zero /* 35E768 E0056D68 27A50098 */ addiu $a1, $sp, 0x98 -/* 35E76C E0056D6C 0C080114 */ jal func_E0200450 +/* 35E76C E0056D6C 0C080114 */ jal shim_guMtxCatF /* 35E770 E0056D70 27A60018 */ addiu $a2, $sp, 0x18 /* 35E774 E0056D74 E7B60010 */ swc1 $f22, 0x10($sp) /* 35E778 E0056D78 8E05FFF8 */ lw $a1, -8($s0) /* 35E77C E0056D7C 4406A000 */ mfc1 $a2, $f20 /* 35E780 E0056D80 4407A000 */ mfc1 $a3, $f20 -/* 35E784 E0056D84 0C080104 */ jal func_E0200410 +/* 35E784 E0056D84 0C080104 */ jal shim_guRotateF /* 35E788 E0056D88 0220202D */ daddu $a0, $s1, $zero /* 35E78C E0056D8C 0220202D */ daddu $a0, $s1, $zero /* 35E790 E0056D90 27A50018 */ addiu $a1, $sp, 0x18 -/* 35E794 E0056D94 0C080114 */ jal func_E0200450 +/* 35E794 E0056D94 0C080114 */ jal shim_guMtxCatF /* 35E798 E0056D98 00A0302D */ daddu $a2, $a1, $zero /* 35E79C E0056D9C 0220202D */ daddu $a0, $s1, $zero /* 35E7A0 E0056DA0 E7B40010 */ swc1 $f20, 0x10($sp) /* 35E7A4 E0056DA4 8E050000 */ lw $a1, ($s0) /* 35E7A8 E0056DA8 4406A000 */ mfc1 $a2, $f20 /* 35E7AC E0056DAC 4407B000 */ mfc1 $a3, $f22 -/* 35E7B0 E0056DB0 0C080104 */ jal func_E0200410 +/* 35E7B0 E0056DB0 0C080104 */ jal shim_guRotateF /* 35E7B4 E0056DB4 2610003C */ addiu $s0, $s0, 0x3c /* 35E7B8 E0056DB8 0220202D */ daddu $a0, $s1, $zero /* 35E7BC E0056DBC 27A50018 */ addiu $a1, $sp, 0x18 -/* 35E7C0 E0056DC0 0C080114 */ jal func_E0200450 +/* 35E7C0 E0056DC0 0C080114 */ jal shim_guMtxCatF /* 35E7C4 E0056DC4 00A0302D */ daddu $a2, $a1, $zero /* 35E7C8 E0056DC8 27A40018 */ addiu $a0, $sp, 0x18 /* 35E7CC E0056DCC 96A50000 */ lhu $a1, ($s5) /* 35E7D0 E0056DD0 8EC20000 */ lw $v0, ($s6) /* 35E7D4 E0056DD4 00052980 */ sll $a1, $a1, 6 /* 35E7D8 E0056DD8 00B42821 */ addu $a1, $a1, $s4 -/* 35E7DC E0056DDC 0C080118 */ jal func_E0200460 +/* 35E7DC E0056DDC 0C080118 */ jal shim_guMtxF2L /* 35E7E0 E0056DE0 00452821 */ addu $a1, $v0, $a1 /* 35E7E4 E0056DE4 3C06D838 */ lui $a2, 0xd838 /* 35E7E8 E0056DE8 8E640000 */ lw $a0, ($s3) diff --git a/ver/us/asm/nonmatchings/effects/effect_43/fx_43_main.s b/ver/us/asm/nonmatchings/effects/effect_43/fx_43_main.s index 872ea334a1..e493118845 100644 --- a/ver/us/asm/nonmatchings/effects/effect_43/fx_43_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_43/fx_43_main.s @@ -31,12 +31,12 @@ glabel fx_43_main /* 35DA68 E0056068 AFB00028 */ sw $s0, 0x28($sp) /* 35DA6C E005606C AFA00010 */ sw $zero, 0x10($sp) /* 35DA70 E0056070 AFA00024 */ sw $zero, 0x24($sp) -/* 35DA74 E0056074 0C080124 */ jal func_E0200490 +/* 35DA74 E0056074 0C080124 */ jal shim_create_effect_instance /* 35DA78 E0056078 AFA20014 */ sw $v0, 0x14($sp) /* 35DA7C E005607C 2404012C */ addiu $a0, $zero, 0x12c /* 35DA80 E0056080 24160005 */ addiu $s6, $zero, 5 /* 35DA84 E0056084 0040802D */ daddu $s0, $v0, $zero -/* 35DA88 E0056088 0C08012C */ jal func_E02004B0 +/* 35DA88 E0056088 0C08012C */ jal shim_general_heap_malloc /* 35DA8C E005608C AE160008 */ sw $s6, 8($s0) /* 35DA90 E0056090 0040182D */ daddu $v1, $v0, $zero /* 35DA94 E0056094 14600003 */ bnez $v1, .LE00560A4 @@ -156,7 +156,7 @@ glabel fx_43_main /* 35DC3C E005623C 00000000 */ nop /* 35DC40 E0056240 46200000 */ add.d $f0, $f0, $f0 /* 35DC44 E0056244 46200020 */ cvt.s.d $f0, $f0 -/* 35DC48 E0056248 0C080138 */ jal func_E02004E0 +/* 35DC48 E0056248 0C080138 */ jal shim_rand_int /* 35DC4C E005624C E6600008 */ swc1 $f0, 8($s3) /* 35DC50 E0056250 44821000 */ mtc1 $v0, $f2 /* 35DC54 E0056254 00000000 */ nop @@ -171,7 +171,7 @@ glabel fx_43_main /* 35DC78 E0056278 00000000 */ nop /* 35DC7C E005627C 2404000A */ addiu $a0, $zero, 0xa /* 35DC80 E0056280 46200020 */ cvt.s.d $f0, $f0 -/* 35DC84 E0056284 0C080138 */ jal func_E02004E0 +/* 35DC84 E0056284 0C080138 */ jal shim_rand_int /* 35DC88 E0056288 E660FFFC */ swc1 $f0, -4($s3) /* 35DC8C E005628C 44821000 */ mtc1 $v0, $f2 /* 35DC90 E0056290 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_44/func_E00581B4.s b/ver/us/asm/nonmatchings/effects/effect_44/func_E00581B4.s index a7b8f92144..b686f829da 100644 --- a/ver/us/asm/nonmatchings/effects/effect_44/func_E00581B4.s +++ b/ver/us/asm/nonmatchings/effects/effect_44/func_E00581B4.s @@ -41,7 +41,7 @@ glabel func_E00581B4 /* 35EB58 E0058238 8CA40028 */ lw $a0, 0x28($a1) /* 35EB5C E005823C 04810005 */ bgez $a0, .LE0058254 /* 35EB60 E0058240 00000000 */ nop -/* 35EB64 E0058244 0C080128 */ jal func_E02004A0 +/* 35EB64 E0058244 0C080128 */ jal shim_remove_effect /* 35EB68 E0058248 0260202D */ daddu $a0, $s3, $zero /* 35EB6C E005824C 0801611B */ j .LE005846C /* 35EB70 E0058250 00000000 */ nop @@ -91,7 +91,7 @@ glabel func_E00581B4 /* 35EC14 E00582F4 4481A000 */ mtc1 $at, $f20 .LE00582F8: /* 35EC18 E00582F8 C60C0010 */ lwc1 $f12, 0x10($s0) -/* 35EC1C E00582FC 0C080140 */ jal func_E0200500 +/* 35EC1C E00582FC 0C080140 */ jal shim_sin_deg /* 35EC20 E0058300 460C6300 */ add.s $f12, $f12, $f12 /* 35EC24 E0058304 3C01E006 */ lui $at, %hi(D_E0058790) /* 35EC28 E0058308 D4228790 */ ldc1 $f2, %lo(D_E0058790)($at) @@ -113,7 +113,7 @@ glabel func_E00581B4 /* 35EC68 E0058348 00000000 */ nop /* 35EC6C E005834C C60C0010 */ lwc1 $f12, 0x10($s0) /* 35EC70 E0058350 46200020 */ cvt.s.d $f0, $f0 -/* 35EC74 E0058354 0C080140 */ jal func_E0200500 +/* 35EC74 E0058354 0C080140 */ jal shim_sin_deg /* 35EC78 E0058358 E6000008 */ swc1 $f0, 8($s0) /* 35EC7C E005835C 3C01E006 */ lui $at, %hi(D_E00587A0) /* 35EC80 E0058360 D42287A0 */ ldc1 $f2, %lo(D_E00587A0)($at) @@ -143,7 +143,7 @@ glabel func_E00581B4 /* 35ECDC E00583BC 46200020 */ cvt.s.d $f0, $f0 /* 35ECE0 E00583C0 E6000008 */ swc1 $f0, 8($s0) .LE00583C4: -/* 35ECE4 E00583C4 0C080138 */ jal func_E02004E0 +/* 35ECE4 E00583C4 0C080138 */ jal shim_rand_int /* 35ECE8 E00583C8 24040032 */ addiu $a0, $zero, 0x32 /* 35ECEC E00583CC 3C0141C8 */ lui $at, 0x41c8 /* 35ECF0 E00583D0 44811000 */ mtc1 $at, $f2 @@ -153,7 +153,7 @@ glabel func_E00581B4 /* 35ED00 E00583E0 46020001 */ sub.s $f0, $f0, $f2 /* 35ED04 E00583E4 C60C0014 */ lwc1 $f12, 0x14($s0) /* 35ED08 E00583E8 46006300 */ add.s $f12, $f12, $f0 -/* 35ED0C E00583EC 0C080140 */ jal func_E0200500 +/* 35ED0C E00583EC 0C080140 */ jal shim_sin_deg /* 35ED10 E00583F0 E60C0014 */ swc1 $f12, 0x14($s0) /* 35ED14 E00583F4 46140002 */ mul.s $f0, $f0, $f20 /* 35ED18 E00583F8 00000000 */ nop @@ -165,7 +165,7 @@ glabel func_E00581B4 /* 35ED30 E0058410 00000000 */ nop /* 35ED34 E0058414 C6020010 */ lwc1 $f2, 0x10($s0) /* 35ED38 E0058418 46001080 */ add.s $f2, $f2, $f0 -/* 35ED3C E005841C 0C080144 */ jal func_E0200510 +/* 35ED3C E005841C 0C080144 */ jal shim_cos_deg /* 35ED40 E0058420 E6020010 */ swc1 $f2, 0x10($s0) /* 35ED44 E0058424 46140002 */ mul.s $f0, $f0, $f20 /* 35ED48 E0058428 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_44/func_E0058490.s b/ver/us/asm/nonmatchings/effects/effect_44/func_E0058490.s index a72504f934..8ff8367644 100644 --- a/ver/us/asm/nonmatchings/effects/effect_44/func_E0058490.s +++ b/ver/us/asm/nonmatchings/effects/effect_44/func_E0058490.s @@ -11,7 +11,7 @@ glabel func_E0058490 /* 35EDC8 E00584A8 27A40010 */ addiu $a0, $sp, 0x10 /* 35EDCC E00584AC AFBF0020 */ sw $ra, 0x20($sp) /* 35EDD0 E00584B0 AFA00014 */ sw $zero, 0x14($sp) -/* 35EDD4 E00584B4 0C080120 */ jal func_E0200480 +/* 35EDD4 E00584B4 0C080120 */ jal shim_queue_render_task /* 35EDD8 E00584B8 AFA20010 */ sw $v0, 0x10($sp) /* 35EDDC E00584BC 8C430000 */ lw $v1, ($v0) /* 35EDE0 E00584C0 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_44/func_E00584D4.s b/ver/us/asm/nonmatchings/effects/effect_44/func_E00584D4.s index 1a24c14b83..ff4520aa9e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_44/func_E00584D4.s +++ b/ver/us/asm/nonmatchings/effects/effect_44/func_E00584D4.s @@ -50,7 +50,7 @@ glabel func_E00584D4 /* 35EEA8 E0058588 8E050004 */ lw $a1, 4($s0) /* 35EEAC E005858C 8E060008 */ lw $a2, 8($s0) /* 35EEB0 E0058590 8E07000C */ lw $a3, 0xc($s0) -/* 35EEB4 E0058594 0C080108 */ jal func_E0200420 +/* 35EEB4 E0058594 0C080108 */ jal shim_guTranslateF /* 35EEB8 E0058598 27A40018 */ addiu $a0, $sp, 0x18 /* 35EEBC E005859C 27B10058 */ addiu $s1, $sp, 0x58 /* 35EEC0 E00585A0 4480A000 */ mtc1 $zero, $f20 @@ -73,11 +73,11 @@ glabel func_E00584D4 /* 35EF04 E00585E4 46000007 */ neg.s $f0, $f0 /* 35EF08 E00585E8 44050000 */ mfc1 $a1, $f0 /* 35EF0C E00585EC 0220202D */ daddu $a0, $s1, $zero -/* 35EF10 E00585F0 0C080104 */ jal func_E0200410 +/* 35EF10 E00585F0 0C080104 */ jal shim_guRotateF /* 35EF14 E00585F4 E7B40010 */ swc1 $f20, 0x10($sp) /* 35EF18 E00585F8 0220202D */ daddu $a0, $s1, $zero /* 35EF1C E00585FC 27A50018 */ addiu $a1, $sp, 0x18 -/* 35EF20 E0058600 0C080114 */ jal func_E0200450 +/* 35EF20 E0058600 0C080114 */ jal shim_guMtxCatF /* 35EF24 E0058604 27A60098 */ addiu $a2, $sp, 0x98 /* 35EF28 E0058608 8EE20008 */ lw $v0, 8($s7) /* 35EF2C E005860C 0242102A */ slt $v0, $s2, $v0 @@ -95,39 +95,39 @@ glabel func_E00584D4 /* 35EF58 E0058638 8E05FFE4 */ lw $a1, -0x1c($s0) /* 35EF5C E005863C 8E06FFE8 */ lw $a2, -0x18($s0) /* 35EF60 E0058640 8E07FFEC */ lw $a3, -0x14($s0) -/* 35EF64 E0058644 0C080108 */ jal func_E0200420 +/* 35EF64 E0058644 0C080108 */ jal shim_guTranslateF /* 35EF68 E0058648 26520001 */ addiu $s2, $s2, 1 /* 35EF6C E005864C 0220202D */ daddu $a0, $s1, $zero /* 35EF70 E0058650 27A50098 */ addiu $a1, $sp, 0x98 -/* 35EF74 E0058654 0C080114 */ jal func_E0200450 +/* 35EF74 E0058654 0C080114 */ jal shim_guMtxCatF /* 35EF78 E0058658 27A60018 */ addiu $a2, $sp, 0x18 /* 35EF7C E005865C E7B60010 */ swc1 $f22, 0x10($sp) /* 35EF80 E0058660 8E05FFF8 */ lw $a1, -8($s0) /* 35EF84 E0058664 4406A000 */ mfc1 $a2, $f20 /* 35EF88 E0058668 4407A000 */ mfc1 $a3, $f20 -/* 35EF8C E005866C 0C080104 */ jal func_E0200410 +/* 35EF8C E005866C 0C080104 */ jal shim_guRotateF /* 35EF90 E0058670 0220202D */ daddu $a0, $s1, $zero /* 35EF94 E0058674 0220202D */ daddu $a0, $s1, $zero /* 35EF98 E0058678 27A50018 */ addiu $a1, $sp, 0x18 -/* 35EF9C E005867C 0C080114 */ jal func_E0200450 +/* 35EF9C E005867C 0C080114 */ jal shim_guMtxCatF /* 35EFA0 E0058680 00A0302D */ daddu $a2, $a1, $zero /* 35EFA4 E0058684 0220202D */ daddu $a0, $s1, $zero /* 35EFA8 E0058688 E7B40010 */ swc1 $f20, 0x10($sp) /* 35EFAC E005868C 8E050000 */ lw $a1, ($s0) /* 35EFB0 E0058690 4406A000 */ mfc1 $a2, $f20 /* 35EFB4 E0058694 4407B000 */ mfc1 $a3, $f22 -/* 35EFB8 E0058698 0C080104 */ jal func_E0200410 +/* 35EFB8 E0058698 0C080104 */ jal shim_guRotateF /* 35EFBC E005869C 26100034 */ addiu $s0, $s0, 0x34 /* 35EFC0 E00586A0 0220202D */ daddu $a0, $s1, $zero /* 35EFC4 E00586A4 27A50018 */ addiu $a1, $sp, 0x18 -/* 35EFC8 E00586A8 0C080114 */ jal func_E0200450 +/* 35EFC8 E00586A8 0C080114 */ jal shim_guMtxCatF /* 35EFCC E00586AC 00A0302D */ daddu $a2, $a1, $zero /* 35EFD0 E00586B0 27A40018 */ addiu $a0, $sp, 0x18 /* 35EFD4 E00586B4 96A50000 */ lhu $a1, ($s5) /* 35EFD8 E00586B8 8EC20000 */ lw $v0, ($s6) /* 35EFDC E00586BC 00052980 */ sll $a1, $a1, 6 /* 35EFE0 E00586C0 00B42821 */ addu $a1, $a1, $s4 -/* 35EFE4 E00586C4 0C080118 */ jal func_E0200460 +/* 35EFE4 E00586C4 0C080118 */ jal shim_guMtxF2L /* 35EFE8 E00586C8 00452821 */ addu $a1, $v0, $a1 /* 35EFEC E00586CC 3C06D838 */ lui $a2, 0xd838 /* 35EFF0 E00586D0 8E640000 */ lw $a0, ($s3) diff --git a/ver/us/asm/nonmatchings/effects/effect_44/fx_44_main.s b/ver/us/asm/nonmatchings/effects/effect_44/fx_44_main.s index 9f3918a36e..51cf8349b9 100644 --- a/ver/us/asm/nonmatchings/effects/effect_44/fx_44_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_44/fx_44_main.s @@ -28,12 +28,12 @@ glabel fx_44_main /* 35E97C E005805C AFB00028 */ sw $s0, 0x28($sp) /* 35E980 E0058060 AFA00010 */ sw $zero, 0x10($sp) /* 35E984 E0058064 AFA00024 */ sw $zero, 0x24($sp) -/* 35E988 E0058068 0C080124 */ jal func_E0200490 +/* 35E988 E0058068 0C080124 */ jal shim_create_effect_instance /* 35E98C E005806C AFA20014 */ sw $v0, 0x14($sp) /* 35E990 E0058070 24040104 */ addiu $a0, $zero, 0x104 /* 35E994 E0058074 24120005 */ addiu $s2, $zero, 5 /* 35E998 E0058078 0040802D */ daddu $s0, $v0, $zero -/* 35E99C E005807C 0C08012C */ jal func_E02004B0 +/* 35E99C E005807C 0C08012C */ jal shim_general_heap_malloc /* 35E9A0 E0058080 AE120008 */ sw $s2, 8($s0) /* 35E9A4 E0058084 0040182D */ daddu $v1, $v0, $zero /* 35E9A8 E0058088 14600003 */ bnez $v1, .LE0058098 @@ -58,7 +58,7 @@ glabel fx_44_main /* 35E9EC E00580CC 36736667 */ ori $s3, $s3, 0x6667 /* 35E9F0 E00580D0 24700014 */ addiu $s0, $v1, 0x14 .LE00580D4: -/* 35E9F4 E00580D4 0C080138 */ jal func_E02004E0 +/* 35E9F4 E00580D4 0C080138 */ jal shim_rand_int /* 35E9F8 E00580D8 2404001E */ addiu $a0, $zero, 0x1e /* 35E9FC E00580DC 2404001E */ addiu $a0, $zero, 0x1e /* 35EA00 E00580E0 2442FFF1 */ addiu $v0, $v0, -0xf @@ -66,26 +66,26 @@ glabel fx_44_main /* 35EA08 E00580E8 00000000 */ nop /* 35EA0C E00580EC 46800020 */ cvt.s.w $f0, $f0 /* 35EA10 E00580F0 E600FFF0 */ swc1 $f0, -0x10($s0) -/* 35EA14 E00580F4 0C080138 */ jal func_E02004E0 +/* 35EA14 E00580F4 0C080138 */ jal shim_rand_int /* 35EA18 E00580F8 AE00FFF4 */ sw $zero, -0xc($s0) /* 35EA1C E00580FC 24040168 */ addiu $a0, $zero, 0x168 /* 35EA20 E0058100 2442FFF1 */ addiu $v0, $v0, -0xf /* 35EA24 E0058104 44820000 */ mtc1 $v0, $f0 /* 35EA28 E0058108 00000000 */ nop /* 35EA2C E005810C 46800020 */ cvt.s.w $f0, $f0 -/* 35EA30 E0058110 0C080138 */ jal func_E02004E0 +/* 35EA30 E0058110 0C080138 */ jal shim_rand_int /* 35EA34 E0058114 E600FFF8 */ swc1 $f0, -8($s0) /* 35EA38 E0058118 24040168 */ addiu $a0, $zero, 0x168 /* 35EA3C E005811C 44820000 */ mtc1 $v0, $f0 /* 35EA40 E0058120 00000000 */ nop /* 35EA44 E0058124 46800020 */ cvt.s.w $f0, $f0 -/* 35EA48 E0058128 0C080138 */ jal func_E02004E0 +/* 35EA48 E0058128 0C080138 */ jal shim_rand_int /* 35EA4C E005812C E6000004 */ swc1 $f0, 4($s0) /* 35EA50 E0058130 24040064 */ addiu $a0, $zero, 0x64 /* 35EA54 E0058134 44820000 */ mtc1 $v0, $f0 /* 35EA58 E0058138 00000000 */ nop /* 35EA5C E005813C 46800020 */ cvt.s.w $f0, $f0 -/* 35EA60 E0058140 0C080138 */ jal func_E02004E0 +/* 35EA60 E0058140 0C080138 */ jal shim_rand_int /* 35EA64 E0058144 E600000C */ swc1 $f0, 0xc($s0) /* 35EA68 E0058148 00530018 */ mult $v0, $s3 /* 35EA6C E005814C 26310001 */ addiu $s1, $s1, 1 diff --git a/ver/us/asm/nonmatchings/effects/effect_45/func_E005A1FC.s b/ver/us/asm/nonmatchings/effects/effect_45/func_E005A1FC.s index 5cae0137fc..efa47df85c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_45/func_E005A1FC.s +++ b/ver/us/asm/nonmatchings/effects/effect_45/func_E005A1FC.s @@ -12,7 +12,7 @@ glabel func_E005A1FC /* 3604D8 E005A218 ACA20028 */ sw $v0, 0x28($a1) /* 3604DC E005A21C 04610005 */ bgez $v1, .LE005A234 /* 3604E0 E005A220 ACA30024 */ sw $v1, 0x24($a1) -/* 3604E4 E005A224 0C080128 */ jal func_E02004A0 +/* 3604E4 E005A224 0C080128 */ jal shim_remove_effect /* 3604E8 E005A228 00000000 */ nop /* 3604EC E005A22C 080168E9 */ j .LE005A3A4 /* 3604F0 E005A230 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_45/func_E005A3B0.s b/ver/us/asm/nonmatchings/effects/effect_45/func_E005A3B0.s index a167f8fd6a..4444d07cbd 100644 --- a/ver/us/asm/nonmatchings/effects/effect_45/func_E005A3B0.s +++ b/ver/us/asm/nonmatchings/effects/effect_45/func_E005A3B0.s @@ -11,7 +11,7 @@ glabel func_E005A3B0 /* 360688 E005A3C8 27A40010 */ addiu $a0, $sp, 0x10 /* 36068C E005A3CC AFBF0020 */ sw $ra, 0x20($sp) /* 360690 E005A3D0 AFA00014 */ sw $zero, 0x14($sp) -/* 360694 E005A3D4 0C080120 */ jal func_E0200480 +/* 360694 E005A3D4 0C080120 */ jal shim_queue_render_task /* 360698 E005A3D8 AFA20010 */ sw $v0, 0x10($sp) /* 36069C E005A3DC 8C430000 */ lw $v1, ($v0) /* 3606A0 E005A3E0 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_45/func_E005A3F4.s b/ver/us/asm/nonmatchings/effects/effect_45/func_E005A3F4.s index 5feb6ccfbd..80305ac8ac 100644 --- a/ver/us/asm/nonmatchings/effects/effect_45/func_E005A3F4.s +++ b/ver/us/asm/nonmatchings/effects/effect_45/func_E005A3F4.s @@ -50,7 +50,7 @@ glabel func_E005A3F4 /* 360768 E005A4A8 8E650004 */ lw $a1, 4($s3) /* 36076C E005A4AC 8E660008 */ lw $a2, 8($s3) /* 360770 E005A4B0 8E67000C */ lw $a3, 0xc($s3) -/* 360774 E005A4B4 0C080108 */ jal func_E0200420 +/* 360774 E005A4B4 0C080108 */ jal shim_guTranslateF /* 360778 E005A4B8 24140001 */ addiu $s4, $zero, 1 /* 36077C E005A4BC 27B10058 */ addiu $s1, $sp, 0x58 /* 360780 E005A4C0 4480A000 */ mtc1 $zero, $f20 @@ -73,11 +73,11 @@ glabel func_E005A3F4 /* 3607C4 E005A504 46000007 */ neg.s $f0, $f0 /* 3607C8 E005A508 44050000 */ mfc1 $a1, $f0 /* 3607CC E005A50C 0220202D */ daddu $a0, $s1, $zero -/* 3607D0 E005A510 0C080104 */ jal func_E0200410 +/* 3607D0 E005A510 0C080104 */ jal shim_guRotateF /* 3607D4 E005A514 E7B40010 */ swc1 $f20, 0x10($sp) /* 3607D8 E005A518 0220202D */ daddu $a0, $s1, $zero /* 3607DC E005A51C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3607E0 E005A520 0C080114 */ jal func_E0200450 +/* 3607E0 E005A520 0C080114 */ jal shim_guMtxCatF /* 3607E4 E005A524 00A0302D */ daddu $a2, $a1, $zero /* 3607E8 E005A528 27A40018 */ addiu $a0, $sp, 0x18 /* 3607EC E005A52C 3C158007 */ lui $s5, %hi(gMatrixListPos) @@ -88,7 +88,7 @@ glabel func_E005A3F4 /* 360800 E005A540 8EC20000 */ lw $v0, ($s6) /* 360804 E005A544 00052980 */ sll $a1, $a1, 6 /* 360808 E005A548 00B02821 */ addu $a1, $a1, $s0 -/* 36080C E005A54C 0C080118 */ jal func_E0200460 +/* 36080C E005A54C 0C080118 */ jal shim_guMtxF2L /* 360810 E005A550 00452821 */ addu $a1, $v0, $a1 /* 360814 E005A554 3C06DCDC */ lui $a2, 0xdcdc /* 360818 E005A558 8E440000 */ lw $a0, ($s2) @@ -128,34 +128,34 @@ glabel func_E005A3F4 /* 36089C E005A5DC 8E05FFD4 */ lw $a1, -0x2c($s0) /* 3608A0 E005A5E0 8E06FFD8 */ lw $a2, -0x28($s0) /* 3608A4 E005A5E4 8E07FFDC */ lw $a3, -0x24($s0) -/* 3608A8 E005A5E8 0C080108 */ jal func_E0200420 +/* 3608A8 E005A5E8 0C080108 */ jal shim_guTranslateF /* 3608AC E005A5EC 26940001 */ addiu $s4, $s4, 1 /* 3608B0 E005A5F0 E7B40010 */ swc1 $f20, 0x10($sp) /* 3608B4 E005A5F4 8E05FFEC */ lw $a1, -0x14($s0) /* 3608B8 E005A5F8 4406B000 */ mfc1 $a2, $f22 /* 3608BC E005A5FC 4407B000 */ mfc1 $a3, $f22 -/* 3608C0 E005A600 0C080104 */ jal func_E0200410 +/* 3608C0 E005A600 0C080104 */ jal shim_guRotateF /* 3608C4 E005A604 0220202D */ daddu $a0, $s1, $zero /* 3608C8 E005A608 0220202D */ daddu $a0, $s1, $zero /* 3608CC E005A60C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3608D0 E005A610 0C080114 */ jal func_E0200450 +/* 3608D0 E005A610 0C080114 */ jal shim_guMtxCatF /* 3608D4 E005A614 00A0302D */ daddu $a2, $a1, $zero /* 3608D8 E005A618 0220202D */ daddu $a0, $s1, $zero /* 3608DC E005A61C 8E050000 */ lw $a1, ($s0) /* 3608E0 E005A620 26100034 */ addiu $s0, $s0, 0x34 /* 3608E4 E005A624 4407A000 */ mfc1 $a3, $f20 -/* 3608E8 E005A628 0C080110 */ jal func_E0200440 +/* 3608E8 E005A628 0C080110 */ jal shim_guScaleF /* 3608EC E005A62C 00A0302D */ daddu $a2, $a1, $zero /* 3608F0 E005A630 0220202D */ daddu $a0, $s1, $zero /* 3608F4 E005A634 27A50018 */ addiu $a1, $sp, 0x18 -/* 3608F8 E005A638 0C080114 */ jal func_E0200450 +/* 3608F8 E005A638 0C080114 */ jal shim_guMtxCatF /* 3608FC E005A63C 00A0302D */ daddu $a2, $a1, $zero /* 360900 E005A640 27A40018 */ addiu $a0, $sp, 0x18 /* 360904 E005A644 96C50000 */ lhu $a1, ($s6) /* 360908 E005A648 8EE20000 */ lw $v0, ($s7) /* 36090C E005A64C 00052980 */ sll $a1, $a1, 6 /* 360910 E005A650 00B52821 */ addu $a1, $a1, $s5 -/* 360914 E005A654 0C080118 */ jal func_E0200460 +/* 360914 E005A654 0C080118 */ jal shim_guMtxF2L /* 360918 E005A658 00452821 */ addu $a1, $v0, $a1 /* 36091C E005A65C 3C06D838 */ lui $a2, 0xd838 /* 360920 E005A660 8E440000 */ lw $a0, ($s2) diff --git a/ver/us/asm/nonmatchings/effects/effect_45/fx_45_main.s b/ver/us/asm/nonmatchings/effects/effect_45/fx_45_main.s index bf11a166af..5ec6b8d853 100644 --- a/ver/us/asm/nonmatchings/effects/effect_45/fx_45_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_45/fx_45_main.s @@ -33,7 +33,7 @@ glabel fx_45_main /* 360330 E005A070 AFA00010 */ sw $zero, 0x10($sp) /* 360334 E005A074 AFA00024 */ sw $zero, 0x24($sp) /* 360338 E005A078 AFA20014 */ sw $v0, 0x14($sp) -/* 36033C E005A07C 0C080124 */ jal func_E0200490 +/* 36033C E005A07C 0C080124 */ jal shim_create_effect_instance /* 360340 E005A080 26730001 */ addiu $s3, $s3, 1 /* 360344 E005A084 00132040 */ sll $a0, $s3, 1 /* 360348 E005A088 00932021 */ addu $a0, $a0, $s3 @@ -41,7 +41,7 @@ glabel fx_45_main /* 360350 E005A090 00932021 */ addu $a0, $a0, $s3 /* 360354 E005A094 00042080 */ sll $a0, $a0, 2 /* 360358 E005A098 0040802D */ daddu $s0, $v0, $zero -/* 36035C E005A09C 0C08012C */ jal func_E02004B0 +/* 36035C E005A09C 0C08012C */ jal shim_general_heap_malloc /* 360360 E005A0A0 AE130008 */ sw $s3, 8($s0) /* 360364 E005A0A4 0040882D */ daddu $s1, $v0, $zero /* 360368 E005A0A8 16200003 */ bnez $s1, .LE005A0B8 @@ -55,7 +55,7 @@ glabel fx_45_main /* 360380 E005A0C0 00B32821 */ addu $a1, $a1, $s3 /* 360384 E005A0C4 00052880 */ sll $a1, $a1, 2 /* 360388 E005A0C8 00B32821 */ addu $a1, $a1, $s3 -/* 36038C E005A0CC 0C080130 */ jal func_E02004C0 +/* 36038C E005A0CC 0C080130 */ jal shim_mem_clear /* 360390 E005A0D0 00052880 */ sll $a1, $a1, 2 /* 360394 E005A0D4 AE320024 */ sw $s2, 0x24($s1) /* 360398 E005A0D8 AE200028 */ sw $zero, 0x28($s1) @@ -97,14 +97,14 @@ glabel fx_45_main /* 36041C E005A15C 4483A000 */ mtc1 $v1, $f20 /* 360420 E005A160 00000000 */ nop /* 360424 E005A164 4680A520 */ cvt.s.w $f20, $f20 -/* 360428 E005A168 0C080140 */ jal func_E0200500 +/* 360428 E005A168 0C080140 */ jal shim_sin_deg /* 36042C E005A16C 4600A306 */ mov.s $f12, $f20 /* 360430 E005A170 46000021 */ cvt.d.s $f0, $f0 /* 360434 E005A174 46360002 */ mul.d $f0, $f0, $f22 /* 360438 E005A178 00000000 */ nop /* 36043C E005A17C 4600A306 */ mov.s $f12, $f20 /* 360440 E005A180 46200020 */ cvt.s.d $f0, $f0 -/* 360444 E005A184 0C080144 */ jal func_E0200510 +/* 360444 E005A184 0C080144 */ jal shim_cos_deg /* 360448 E005A188 E600FFE0 */ swc1 $f0, -0x20($s0) /* 36044C E005A18C 46000021 */ cvt.d.s $f0, $f0 /* 360450 E005A190 46360002 */ mul.d $f0, $f0, $f22 diff --git a/ver/us/asm/nonmatchings/effects/effect_46/func_E005C180.s b/ver/us/asm/nonmatchings/effects/effect_46/func_E005C180.s index dced75c71c..e98379c956 100644 --- a/ver/us/asm/nonmatchings/effects/effect_46/func_E005C180.s +++ b/ver/us/asm/nonmatchings/effects/effect_46/func_E005C180.s @@ -23,7 +23,7 @@ glabel func_E005C180 /* 361108 E005C1C8 46001083 */ div.s $f2, $f2, $f0 /* 36110C E005C1CC 04610005 */ bgez $v1, .LE005C1E4 /* 361110 E005C1D0 E4A20030 */ swc1 $f2, 0x30($a1) -/* 361114 E005C1D4 0C080128 */ jal func_E02004A0 +/* 361114 E005C1D4 0C080128 */ jal shim_remove_effect /* 361118 E005C1D8 00000000 */ nop /* 36111C E005C1DC 080170AA */ j .LE005C2A8 /* 361120 E005C1E0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_46/func_E005C2B4.s b/ver/us/asm/nonmatchings/effects/effect_46/func_E005C2B4.s index f172fd7f67..65a2010db9 100644 --- a/ver/us/asm/nonmatchings/effects/effect_46/func_E005C2B4.s +++ b/ver/us/asm/nonmatchings/effects/effect_46/func_E005C2B4.s @@ -11,7 +11,7 @@ glabel func_E005C2B4 /* 36120C E005C2CC 27A40010 */ addiu $a0, $sp, 0x10 /* 361210 E005C2D0 AFBF0020 */ sw $ra, 0x20($sp) /* 361214 E005C2D4 AFA00014 */ sw $zero, 0x14($sp) -/* 361218 E005C2D8 0C080120 */ jal func_E0200480 +/* 361218 E005C2D8 0C080120 */ jal shim_queue_render_task /* 36121C E005C2DC AFA20010 */ sw $v0, 0x10($sp) /* 361220 E005C2E0 8C430000 */ lw $v1, ($v0) /* 361224 E005C2E4 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_46/func_E005C2F8.s b/ver/us/asm/nonmatchings/effects/effect_46/func_E005C2F8.s index c5094f3bc2..acf98a9e1b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_46/func_E005C2F8.s +++ b/ver/us/asm/nonmatchings/effects/effect_46/func_E005C2F8.s @@ -69,7 +69,7 @@ glabel func_E005C2F8 /* 361338 E005C3F8 8EC7000C */ lw $a3, 0xc($s6) /* 36133C E005C3FC 4600110D */ trunc.w.s $f4, $f2 /* 361340 E005C400 44122000 */ mfc1 $s2, $f4 -/* 361344 E005C404 0C080108 */ jal func_E0200420 +/* 361344 E005C404 0C080108 */ jal shim_guTranslateF /* 361348 E005C408 2E940001 */ sltiu $s4, $s4, 1 /* 36134C E005C40C 27B00058 */ addiu $s0, $sp, 0x58 /* 361350 E005C410 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -90,12 +90,12 @@ glabel func_E005C2F8 /* 36138C E005C44C 46000007 */ neg.s $f0, $f0 /* 361390 E005C450 44050000 */ mfc1 $a1, $f0 /* 361394 E005C454 0200202D */ daddu $a0, $s0, $zero -/* 361398 E005C458 0C080104 */ jal func_E0200410 +/* 361398 E005C458 0C080104 */ jal shim_guRotateF /* 36139C E005C45C AFA60010 */ sw $a2, 0x10($sp) /* 3613A0 E005C460 0200202D */ daddu $a0, $s0, $zero /* 3613A4 E005C464 27A50018 */ addiu $a1, $sp, 0x18 /* 3613A8 E005C468 27B00098 */ addiu $s0, $sp, 0x98 -/* 3613AC E005C46C 0C080114 */ jal func_E0200450 +/* 3613AC E005C46C 0C080114 */ jal shim_guMtxCatF /* 3613B0 E005C470 0200302D */ daddu $a2, $s0, $zero /* 3613B4 E005C474 0200202D */ daddu $a0, $s0, $zero /* 3613B8 E005C478 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -106,7 +106,7 @@ glabel func_E005C2F8 /* 3613CC E005C48C 8E220000 */ lw $v0, ($s1) /* 3613D0 E005C490 00052980 */ sll $a1, $a1, 6 /* 3613D4 E005C494 00B52821 */ addu $a1, $a1, $s5 -/* 3613D8 E005C498 0C080118 */ jal func_E0200460 +/* 3613D8 E005C498 0C080118 */ jal shim_guMtxF2L /* 3613DC E005C49C 00452821 */ addu $a1, $v0, $a1 /* 3613E0 E005C4A0 3C05E6DE */ lui $a1, 0xe6de /* 3613E4 E005C4A4 34A5DE82 */ ori $a1, $a1, 0xde82 @@ -200,14 +200,14 @@ glabel func_E005C2F8 /* 361538 E005C5F8 8E05FFF8 */ lw $a1, -8($s0) /* 36153C E005C5FC 8E06FFFC */ lw $a2, -4($s0) /* 361540 E005C600 8E070000 */ lw $a3, ($s0) -/* 361544 E005C604 0C080108 */ jal func_E0200420 +/* 361544 E005C604 0C080108 */ jal shim_guTranslateF /* 361548 E005C608 26100034 */ addiu $s0, $s0, 0x34 /* 36154C E005C60C 27A40018 */ addiu $a0, $sp, 0x18 /* 361550 E005C610 96850000 */ lhu $a1, ($s4) /* 361554 E005C614 8EA20000 */ lw $v0, ($s5) /* 361558 E005C618 00052980 */ sll $a1, $a1, 6 /* 36155C E005C61C 00B32821 */ addu $a1, $a1, $s3 -/* 361560 E005C620 0C080118 */ jal func_E0200460 +/* 361560 E005C620 0C080118 */ jal shim_guMtxF2L /* 361564 E005C624 00452821 */ addu $a1, $v0, $a1 /* 361568 E005C628 3C06D838 */ lui $a2, 0xd838 /* 36156C E005C62C 8E440000 */ lw $a0, ($s2) diff --git a/ver/us/asm/nonmatchings/effects/effect_46/fx_46_main.s b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_main.s index a5849888ce..6a1893131a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_46/fx_46_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_main.s @@ -31,12 +31,12 @@ glabel fx_46_main /* 360FA8 E005C068 AFB00028 */ sw $s0, 0x28($sp) /* 360FAC E005C06C AFA00010 */ sw $zero, 0x10($sp) /* 360FB0 E005C070 AFA00024 */ sw $zero, 0x24($sp) -/* 360FB4 E005C074 0C080124 */ jal func_E0200490 +/* 360FB4 E005C074 0C080124 */ jal shim_create_effect_instance /* 360FB8 E005C078 AFA20014 */ sw $v0, 0x14($sp) /* 360FBC E005C07C 24040068 */ addiu $a0, $zero, 0x68 /* 360FC0 E005C080 24130002 */ addiu $s3, $zero, 2 /* 360FC4 E005C084 0040802D */ daddu $s0, $v0, $zero -/* 360FC8 E005C088 0C08012C */ jal func_E02004B0 +/* 360FC8 E005C088 0C08012C */ jal shim_general_heap_malloc /* 360FCC E005C08C AE130008 */ sw $s3, 8($s0) /* 360FD0 E005C090 0040882D */ daddu $s1, $v0, $zero /* 360FD4 E005C094 16200003 */ bnez $s1, .LE005C0A4 @@ -50,7 +50,7 @@ glabel fx_46_main /* 360FEC E005C0AC 00B32821 */ addu $a1, $a1, $s3 /* 360FF0 E005C0B0 00052880 */ sll $a1, $a1, 2 /* 360FF4 E005C0B4 00B32821 */ addu $a1, $a1, $s3 -/* 360FF8 E005C0B8 0C080130 */ jal func_E02004C0 +/* 360FF8 E005C0B8 0C080130 */ jal shim_mem_clear /* 360FFC E005C0BC 00052880 */ sll $a1, $a1, 2 /* 361000 E005C0C0 24120001 */ addiu $s2, $zero, 1 /* 361004 E005C0C4 3C014120 */ lui $at, 0x4120 @@ -76,11 +76,11 @@ glabel fx_46_main /* 361050 E005C110 4600A306 */ mov.s $f12, $f20 /* 361054 E005C114 E614FFEC */ swc1 $f20, -0x14($s0) /* 361058 E005C118 E614FFF0 */ swc1 $f20, -0x10($s0) -/* 36105C E005C11C 0C080140 */ jal func_E0200500 +/* 36105C E005C11C 0C080140 */ jal shim_sin_deg /* 361060 E005C120 E614FFF4 */ swc1 $f20, -0xc($s0) /* 361064 E005C124 4600A306 */ mov.s $f12, $f20 /* 361068 E005C128 E600FFF8 */ swc1 $f0, -8($s0) -/* 36106C E005C12C 0C080144 */ jal func_E0200510 +/* 36106C E005C12C 0C080144 */ jal shim_cos_deg /* 361070 E005C130 E614FFFC */ swc1 $f20, -4($s0) /* 361074 E005C134 26520001 */ addiu $s2, $s2, 1 /* 361078 E005C138 E6000000 */ swc1 $f0, ($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_47/func_E005E1B8.s b/ver/us/asm/nonmatchings/effects/effect_47/func_E005E1B8.s index 5f8a19392d..6d56cbbf72 100644 --- a/ver/us/asm/nonmatchings/effects/effect_47/func_E005E1B8.s +++ b/ver/us/asm/nonmatchings/effects/effect_47/func_E005E1B8.s @@ -37,16 +37,16 @@ glabel func_E005E1B8 /* 3627F8 E005E238 24700024 */ addiu $s0, $v1, 0x24 .LE005E23C: /* 3627FC E005E23C C60C0000 */ lwc1 $f12, ($s0) -/* 362800 E005E240 0C080140 */ jal func_E0200500 +/* 362800 E005E240 0C080140 */ jal shim_sin_deg /* 362804 E005E244 46806320 */ cvt.s.w $f12, $f12 /* 362808 E005E248 4600B002 */ mul.s $f0, $f22, $f0 /* 36280C E005E24C 00000000 */ nop /* 362810 E005E250 C60C0000 */ lwc1 $f12, ($s0) /* 362814 E005E254 46806320 */ cvt.s.w $f12, $f12 -/* 362818 E005E258 0C080144 */ jal func_E0200510 +/* 362818 E005E258 0C080144 */ jal shim_cos_deg /* 36281C E005E25C E600FFE0 */ swc1 $f0, -0x20($s0) /* 362820 E005E260 C60CFFFC */ lwc1 $f12, -4($s0) -/* 362824 E005E264 0C080144 */ jal func_E0200510 +/* 362824 E005E264 0C080144 */ jal shim_cos_deg /* 362828 E005E268 46000506 */ mov.s $f20, $f0 /* 36282C E005E26C 4614B502 */ mul.s $f20, $f22, $f20 /* 362830 E005E270 00000000 */ nop @@ -54,10 +54,10 @@ glabel func_E005E1B8 /* 362838 E005E278 00000000 */ nop /* 36283C E005E27C C60C0000 */ lwc1 $f12, ($s0) /* 362840 E005E280 46806320 */ cvt.s.w $f12, $f12 -/* 362844 E005E284 0C080144 */ jal func_E0200510 +/* 362844 E005E284 0C080144 */ jal shim_cos_deg /* 362848 E005E288 E614FFE8 */ swc1 $f20, -0x18($s0) /* 36284C E005E28C C60CFFFC */ lwc1 $f12, -4($s0) -/* 362850 E005E290 0C080140 */ jal func_E0200500 +/* 362850 E005E290 0C080140 */ jal shim_sin_deg /* 362854 E005E294 46000506 */ mov.s $f20, $f0 /* 362858 E005E298 4614B502 */ mul.s $f20, $f22, $f20 /* 36285C E005E29C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_47/func_E005E334.s b/ver/us/asm/nonmatchings/effects/effect_47/func_E005E334.s index 71b70f1967..a8166ca811 100644 --- a/ver/us/asm/nonmatchings/effects/effect_47/func_E005E334.s +++ b/ver/us/asm/nonmatchings/effects/effect_47/func_E005E334.s @@ -55,7 +55,7 @@ glabel func_E005E334 /* 3629BC E005E3FC 8E460008 */ lw $a2, 8($s2) /* 3629C0 E005E400 8E47000C */ lw $a3, 0xc($s2) /* 3629C4 E005E404 4480A000 */ mtc1 $zero, $f20 -/* 3629C8 E005E408 0C080108 */ jal func_E0200420 +/* 3629C8 E005E408 0C080108 */ jal shim_guTranslateF /* 3629CC E005E40C 24140001 */ addiu $s4, $zero, 1 /* 3629D0 E005E410 27B30058 */ addiu $s3, $sp, 0x58 /* 3629D4 E005E414 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -75,12 +75,12 @@ glabel func_E005E334 /* 362A0C E005E44C 46000007 */ neg.s $f0, $f0 /* 362A10 E005E450 44050000 */ mfc1 $a1, $f0 /* 362A14 E005E454 0260202D */ daddu $a0, $s3, $zero -/* 362A18 E005E458 0C080104 */ jal func_E0200410 +/* 362A18 E005E458 0C080104 */ jal shim_guRotateF /* 362A1C E005E45C E7B40010 */ swc1 $f20, 0x10($sp) /* 362A20 E005E460 0260202D */ daddu $a0, $s3, $zero /* 362A24 E005E464 27A50018 */ addiu $a1, $sp, 0x18 /* 362A28 E005E468 27B00098 */ addiu $s0, $sp, 0x98 -/* 362A2C E005E46C 0C080114 */ jal func_E0200450 +/* 362A2C E005E46C 0C080114 */ jal shim_guMtxCatF /* 362A30 E005E470 0200302D */ daddu $a2, $s0, $zero /* 362A34 E005E474 0200202D */ daddu $a0, $s0, $zero /* 362A38 E005E478 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -91,7 +91,7 @@ glabel func_E005E334 /* 362A4C E005E48C 8EE20000 */ lw $v0, ($s7) /* 362A50 E005E490 00052980 */ sll $a1, $a1, 6 /* 362A54 E005E494 00B12821 */ addu $a1, $a1, $s1 -/* 362A58 E005E498 0C080118 */ jal func_E0200460 +/* 362A58 E005E498 0C080118 */ jal shim_guMtxF2L /* 362A5C E005E49C 00452821 */ addu $a1, $v0, $a1 /* 362A60 E005E4A0 3C06DCDC */ lui $a2, 0xdcdc /* 362A64 E005E4A4 8EC40000 */ lw $a0, ($s6) @@ -131,7 +131,7 @@ glabel func_E005E334 /* 362AE8 E005E528 8E05FFEC */ lw $a1, -0x14($s0) /* 362AEC E005E52C 8E06FFF0 */ lw $a2, -0x10($s0) /* 362AF0 E005E530 8E07FFF4 */ lw $a3, -0xc($s0) -/* 362AF4 E005E534 0C080108 */ jal func_E0200420 +/* 362AF4 E005E534 0C080108 */ jal shim_guTranslateF /* 362AF8 E005E538 27A40018 */ addiu $a0, $sp, 0x18 /* 362AFC E005E53C 4406A000 */ mfc1 $a2, $f20 /* 362B00 E005E540 4407A000 */ mfc1 $a3, $f20 @@ -140,18 +140,18 @@ glabel func_E005E334 /* 362B0C E005E54C 26940001 */ addiu $s4, $s4, 1 /* 362B10 E005E550 E7A00010 */ swc1 $f0, 0x10($sp) /* 362B14 E005E554 8E050000 */ lw $a1, ($s0) -/* 362B18 E005E558 0C080104 */ jal func_E0200410 +/* 362B18 E005E558 0C080104 */ jal shim_guRotateF /* 362B1C E005E55C 02A0202D */ daddu $a0, $s5, $zero /* 362B20 E005E560 02A0202D */ daddu $a0, $s5, $zero /* 362B24 E005E564 27A50018 */ addiu $a1, $sp, 0x18 -/* 362B28 E005E568 0C080114 */ jal func_E0200450 +/* 362B28 E005E568 0C080114 */ jal shim_guMtxCatF /* 362B2C E005E56C 00A0302D */ daddu $a2, $a1, $zero /* 362B30 E005E570 27A40018 */ addiu $a0, $sp, 0x18 /* 362B34 E005E574 96E50000 */ lhu $a1, ($s7) /* 362B38 E005E578 8FC20000 */ lw $v0, ($fp) /* 362B3C E005E57C 00052980 */ sll $a1, $a1, 6 /* 362B40 E005E580 00B32821 */ addu $a1, $a1, $s3 -/* 362B44 E005E584 0C080118 */ jal func_E0200460 +/* 362B44 E005E584 0C080118 */ jal shim_guMtxF2L /* 362B48 E005E588 00452821 */ addu $a1, $v0, $a1 /* 362B4C E005E58C 3C06D838 */ lui $a2, 0xd838 /* 362B50 E005E590 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/asm/nonmatchings/effects/effect_47/fx_47_main.s b/ver/us/asm/nonmatchings/effects/effect_47/fx_47_main.s index 55df41bec3..c4f46802e8 100644 --- a/ver/us/asm/nonmatchings/effects/effect_47/fx_47_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_47/fx_47_main.s @@ -32,7 +32,7 @@ glabel fx_47_main /* 36262C E005E06C AFB00028 */ sw $s0, 0x28($sp) /* 362630 E005E070 AFA00010 */ sw $zero, 0x10($sp) /* 362634 E005E074 AFA20014 */ sw $v0, 0x14($sp) -/* 362638 E005E078 0C080124 */ jal func_E0200490 +/* 362638 E005E078 0C080124 */ jal shim_create_effect_instance /* 36263C E005E07C 26310001 */ addiu $s1, $s1, 1 /* 362640 E005E080 00112040 */ sll $a0, $s1, 1 /* 362644 E005E084 00912021 */ addu $a0, $a0, $s1 @@ -40,7 +40,7 @@ glabel fx_47_main /* 36264C E005E08C 00912023 */ subu $a0, $a0, $s1 /* 362650 E005E090 00042080 */ sll $a0, $a0, 2 /* 362654 E005E094 0040902D */ daddu $s2, $v0, $zero -/* 362658 E005E098 0C08012C */ jal func_E02004B0 +/* 362658 E005E098 0C08012C */ jal shim_general_heap_malloc /* 36265C E005E09C AE510008 */ sw $s1, 8($s2) /* 362660 E005E0A0 0040802D */ daddu $s0, $v0, $zero /* 362664 E005E0A4 16000003 */ bnez $s0, .LE005E0B4 @@ -54,7 +54,7 @@ glabel fx_47_main /* 36267C E005E0BC 00B12821 */ addu $a1, $a1, $s1 /* 362680 E005E0C0 00052880 */ sll $a1, $a1, 2 /* 362684 E005E0C4 00B12823 */ subu $a1, $a1, $s1 -/* 362688 E005E0C8 0C080130 */ jal func_E02004C0 +/* 362688 E005E0C8 0C080130 */ jal shim_mem_clear /* 36268C E005E0CC 00052880 */ sll $a1, $a1, 2 /* 362690 E005E0D0 24020001 */ addiu $v0, $zero, 1 /* 362694 E005E0D4 AE130000 */ sw $s3, ($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_48/func_E00601E0.s b/ver/us/asm/nonmatchings/effects/effect_48/func_E00601E0.s index 5d3a596a02..960633160d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_48/func_E00601E0.s +++ b/ver/us/asm/nonmatchings/effects/effect_48/func_E00601E0.s @@ -20,7 +20,7 @@ glabel func_E00601E0 /* 36337C E006021C 24420001 */ addiu $v0, $v0, 1 /* 363380 E0060220 04A10005 */ bgez $a1, .LE0060238 /* 363384 E0060224 AC82002C */ sw $v0, 0x2c($a0) -/* 363388 E0060228 0C080128 */ jal func_E02004A0 +/* 363388 E0060228 0C080128 */ jal shim_remove_effect /* 36338C E006022C 0260202D */ daddu $a0, $s3, $zero /* 363390 E0060230 080180FA */ j .LE00603E8 /* 363394 E0060234 00000000 */ nop @@ -71,7 +71,7 @@ glabel func_E00601E0 /* 36343C E00602DC 4481A000 */ mtc1 $at, $f20 .LE00602E0: /* 363440 E00602E0 C60C0010 */ lwc1 $f12, 0x10($s0) -/* 363444 E00602E4 0C080140 */ jal func_E0200500 +/* 363444 E00602E4 0C080140 */ jal shim_sin_deg /* 363448 E00602E8 460C6300 */ add.s $f12, $f12, $f12 /* 36344C E00602EC 3C01E006 */ lui $at, %hi(D_E0060750) /* 363450 E00602F0 D4220750 */ ldc1 $f2, %lo(D_E0060750)($at) @@ -103,7 +103,7 @@ glabel func_E00601E0 /* 3634B8 E0060358 00000000 */ nop /* 3634BC E006035C 46800020 */ cvt.s.w $f0, $f0 /* 3634C0 E0060360 46006300 */ add.s $f12, $f12, $f0 -/* 3634C4 E0060364 0C080140 */ jal func_E0200500 +/* 3634C4 E0060364 0C080140 */ jal shim_sin_deg /* 3634C8 E0060368 E60C0014 */ swc1 $f12, 0x14($s0) /* 3634CC E006036C 46140002 */ mul.s $f0, $f0, $f20 /* 3634D0 E0060370 00000000 */ nop @@ -115,7 +115,7 @@ glabel func_E00601E0 /* 3634E8 E0060388 00000000 */ nop /* 3634EC E006038C C6020010 */ lwc1 $f2, 0x10($s0) /* 3634F0 E0060390 46001080 */ add.s $f2, $f2, $f0 -/* 3634F4 E0060394 0C080144 */ jal func_E0200510 +/* 3634F4 E0060394 0C080144 */ jal shim_cos_deg /* 3634F8 E0060398 E6020010 */ swc1 $f2, 0x10($s0) /* 3634FC E006039C 46140002 */ mul.s $f0, $f0, $f20 /* 363500 E00603A0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_48/func_E006040C.s b/ver/us/asm/nonmatchings/effects/effect_48/func_E006040C.s index cd1dae7d05..8cefefe5b6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_48/func_E006040C.s +++ b/ver/us/asm/nonmatchings/effects/effect_48/func_E006040C.s @@ -11,7 +11,7 @@ glabel func_E006040C /* 363584 E0060424 27A40010 */ addiu $a0, $sp, 0x10 /* 363588 E0060428 AFBF0020 */ sw $ra, 0x20($sp) /* 36358C E006042C AFA00014 */ sw $zero, 0x14($sp) -/* 363590 E0060430 0C080120 */ jal func_E0200480 +/* 363590 E0060430 0C080120 */ jal shim_queue_render_task /* 363594 E0060434 AFA20010 */ sw $v0, 0x10($sp) /* 363598 E0060438 8C430000 */ lw $v1, ($v0) /* 36359C E006043C 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_48/func_E0060450.s b/ver/us/asm/nonmatchings/effects/effect_48/func_E0060450.s index e32f398fb4..994f18096f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_48/func_E0060450.s +++ b/ver/us/asm/nonmatchings/effects/effect_48/func_E0060450.s @@ -51,7 +51,7 @@ glabel func_E0060450 /* 363668 E0060508 8E050004 */ lw $a1, 4($s0) /* 36366C E006050C 8E060008 */ lw $a2, 8($s0) /* 363670 E0060510 8E07000C */ lw $a3, 0xc($s0) -/* 363674 E0060514 0C080108 */ jal func_E0200420 +/* 363674 E0060514 0C080108 */ jal shim_guTranslateF /* 363678 E0060518 27A40018 */ addiu $a0, $sp, 0x18 /* 36367C E006051C 27B10058 */ addiu $s1, $sp, 0x58 /* 363680 E0060520 4480A000 */ mtc1 $zero, $f20 @@ -74,11 +74,11 @@ glabel func_E0060450 /* 3636C4 E0060564 46000007 */ neg.s $f0, $f0 /* 3636C8 E0060568 44050000 */ mfc1 $a1, $f0 /* 3636CC E006056C 0220202D */ daddu $a0, $s1, $zero -/* 3636D0 E0060570 0C080104 */ jal func_E0200410 +/* 3636D0 E0060570 0C080104 */ jal shim_guRotateF /* 3636D4 E0060574 E7B40010 */ swc1 $f20, 0x10($sp) /* 3636D8 E0060578 0220202D */ daddu $a0, $s1, $zero /* 3636DC E006057C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3636E0 E0060580 0C080114 */ jal func_E0200450 +/* 3636E0 E0060580 0C080114 */ jal shim_guMtxCatF /* 3636E4 E0060584 27A60098 */ addiu $a2, $sp, 0x98 /* 3636E8 E0060588 8FA80110 */ lw $t0, 0x110($sp) /* 3636EC E006058C 24130001 */ addiu $s3, $zero, 1 @@ -104,11 +104,11 @@ glabel func_E0060450 /* 363738 E00605D8 8E26FFE8 */ lw $a2, -0x18($s1) /* 36373C E00605DC 8E27FFEC */ lw $a3, -0x14($s1) /* 363740 E00605E0 8C550000 */ lw $s5, ($v0) -/* 363744 E00605E4 0C080108 */ jal func_E0200420 +/* 363744 E00605E4 0C080108 */ jal shim_guTranslateF /* 363748 E00605E8 0240202D */ daddu $a0, $s2, $zero /* 36374C E00605EC 0240202D */ daddu $a0, $s2, $zero /* 363750 E00605F0 27A50098 */ addiu $a1, $sp, 0x98 -/* 363754 E00605F4 0C080114 */ jal func_E0200450 +/* 363754 E00605F4 0C080114 */ jal shim_guMtxCatF /* 363758 E00605F8 27A60018 */ addiu $a2, $sp, 0x18 /* 36375C E00605FC 56000016 */ bnel $s0, $zero, .LE0060658 /* 363760 E0060600 27A40018 */ addiu $a0, $sp, 0x18 @@ -116,21 +116,21 @@ glabel func_E0060450 /* 363768 E0060608 8E25FFF8 */ lw $a1, -8($s1) /* 36376C E006060C 4406A000 */ mfc1 $a2, $f20 /* 363770 E0060610 4407A000 */ mfc1 $a3, $f20 -/* 363774 E0060614 0C080104 */ jal func_E0200410 +/* 363774 E0060614 0C080104 */ jal shim_guRotateF /* 363778 E0060618 0240202D */ daddu $a0, $s2, $zero /* 36377C E006061C 0240202D */ daddu $a0, $s2, $zero /* 363780 E0060620 27A50018 */ addiu $a1, $sp, 0x18 -/* 363784 E0060624 0C080114 */ jal func_E0200450 +/* 363784 E0060624 0C080114 */ jal shim_guMtxCatF /* 363788 E0060628 00A0302D */ daddu $a2, $a1, $zero /* 36378C E006062C E7B40010 */ swc1 $f20, 0x10($sp) /* 363790 E0060630 8E250000 */ lw $a1, ($s1) /* 363794 E0060634 4406A000 */ mfc1 $a2, $f20 /* 363798 E0060638 4407B000 */ mfc1 $a3, $f22 -/* 36379C E006063C 0C080104 */ jal func_E0200410 +/* 36379C E006063C 0C080104 */ jal shim_guRotateF /* 3637A0 E0060640 0240202D */ daddu $a0, $s2, $zero /* 3637A4 E0060644 0240202D */ daddu $a0, $s2, $zero /* 3637A8 E0060648 27A50018 */ addiu $a1, $sp, 0x18 -/* 3637AC E006064C 0C080114 */ jal func_E0200450 +/* 3637AC E006064C 0C080114 */ jal shim_guMtxCatF /* 3637B0 E0060650 00A0302D */ daddu $a2, $a1, $zero /* 3637B4 E0060654 27A40018 */ addiu $a0, $sp, 0x18 .LE0060658: @@ -139,7 +139,7 @@ glabel func_E0060450 /* 3637C0 E0060660 8FC20000 */ lw $v0, ($fp) /* 3637C4 E0060664 00052980 */ sll $a1, $a1, 6 /* 3637C8 E0060668 00B62821 */ addu $a1, $a1, $s6 -/* 3637CC E006066C 0C080118 */ jal func_E0200460 +/* 3637CC E006066C 0C080118 */ jal shim_guMtxF2L /* 3637D0 E0060670 00452821 */ addu $a1, $v0, $a1 /* 3637D4 E0060674 3C06D838 */ lui $a2, 0xd838 /* 3637D8 E0060678 8E840000 */ lw $a0, ($s4) diff --git a/ver/us/asm/nonmatchings/effects/effect_48/fx_48_main.s b/ver/us/asm/nonmatchings/effects/effect_48/fx_48_main.s index ab11b46ce5..69a3424cad 100644 --- a/ver/us/asm/nonmatchings/effects/effect_48/fx_48_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_48/fx_48_main.s @@ -29,12 +29,12 @@ glabel fx_48_main /* 3631C0 E0060060 AFB00028 */ sw $s0, 0x28($sp) /* 3631C4 E0060064 AFA00010 */ sw $zero, 0x10($sp) /* 3631C8 E0060068 AFA00024 */ sw $zero, 0x24($sp) -/* 3631CC E006006C 0C080124 */ jal func_E0200490 +/* 3631CC E006006C 0C080124 */ jal shim_create_effect_instance /* 3631D0 E0060070 AFA20014 */ sw $v0, 0x14($sp) /* 3631D4 E0060074 240401B0 */ addiu $a0, $zero, 0x1b0 /* 3631D8 E0060078 24130009 */ addiu $s3, $zero, 9 /* 3631DC E006007C 0040802D */ daddu $s0, $v0, $zero -/* 3631E0 E0060080 0C08012C */ jal func_E02004B0 +/* 3631E0 E0060080 0C08012C */ jal shim_general_heap_malloc /* 3631E4 E0060084 AE130008 */ sw $s3, 8($s0) /* 3631E8 E0060088 0040882D */ daddu $s1, $v0, $zero /* 3631EC E006008C 16200003 */ bnez $s1, .LE006009C @@ -46,7 +46,7 @@ glabel fx_48_main /* 3631FC E006009C 0220202D */ daddu $a0, $s1, $zero /* 363200 E00600A0 00132840 */ sll $a1, $s3, 1 /* 363204 E00600A4 00B32821 */ addu $a1, $a1, $s3 -/* 363208 E00600A8 0C080130 */ jal func_E02004C0 +/* 363208 E00600A8 0C080130 */ jal shim_mem_clear /* 36320C E00600AC 00052900 */ sll $a1, $a1, 4 /* 363210 E00600B0 2402001E */ addiu $v0, $zero, 0x1e /* 363214 E00600B4 AE320000 */ sw $s2, ($s1) diff --git a/ver/us/asm/nonmatchings/effects/effect_49/func_E0062220.s b/ver/us/asm/nonmatchings/effects/effect_49/func_E0062220.s index 77660df802..0b214b9a93 100644 --- a/ver/us/asm/nonmatchings/effects/effect_49/func_E0062220.s +++ b/ver/us/asm/nonmatchings/effects/effect_49/func_E0062220.s @@ -20,7 +20,7 @@ glabel func_E0062220 /* 36455C E006225C AC820028 */ sw $v0, 0x28($a0) /* 364560 E0062260 04610005 */ bgez $v1, .LE0062278 /* 364564 E0062264 AC830024 */ sw $v1, 0x24($a0) -/* 364568 E0062268 0C080128 */ jal func_E02004A0 +/* 364568 E0062268 0C080128 */ jal shim_remove_effect /* 36456C E006226C 0260202D */ daddu $a0, $s3, $zero /* 364570 E0062270 08018920 */ j .LE0062480 /* 364574 E0062274 00000000 */ nop @@ -141,14 +141,14 @@ glabel func_E0062220 /* 364730 E0062430 E6060028 */ swc1 $f6, 0x28($s0) .LE0062434: /* 364734 E0062434 C60C0024 */ lwc1 $f12, 0x24($s0) -/* 364738 E0062438 0C080144 */ jal func_E0200510 +/* 364738 E0062438 0C080144 */ jal shim_cos_deg /* 36473C E006243C 46186300 */ add.s $f12, $f12, $f24 /* 364740 E0062440 C6020028 */ lwc1 $f2, 0x28($s0) /* 364744 E0062444 46020002 */ mul.s $f0, $f0, $f2 /* 364748 E0062448 00000000 */ nop /* 36474C E006244C C60C0024 */ lwc1 $f12, 0x24($s0) /* 364750 E0062450 46186300 */ add.s $f12, $f12, $f24 -/* 364754 E0062454 0C080140 */ jal func_E0200500 +/* 364754 E0062454 0C080140 */ jal shim_sin_deg /* 364758 E0062458 E600FFFC */ swc1 $f0, -4($s0) /* 36475C E006245C C6020028 */ lwc1 $f2, 0x28($s0) /* 364760 E0062460 46020002 */ mul.s $f0, $f0, $f2 diff --git a/ver/us/asm/nonmatchings/effects/effect_49/func_E00624A8.s b/ver/us/asm/nonmatchings/effects/effect_49/func_E00624A8.s index 46a812fba8..3a585fa465 100644 --- a/ver/us/asm/nonmatchings/effects/effect_49/func_E00624A8.s +++ b/ver/us/asm/nonmatchings/effects/effect_49/func_E00624A8.s @@ -11,7 +11,7 @@ glabel func_E00624A8 /* 3647C0 E00624C0 27A40010 */ addiu $a0, $sp, 0x10 /* 3647C4 E00624C4 AFBF0020 */ sw $ra, 0x20($sp) /* 3647C8 E00624C8 AFA00014 */ sw $zero, 0x14($sp) -/* 3647CC E00624CC 0C080120 */ jal func_E0200480 +/* 3647CC E00624CC 0C080120 */ jal shim_queue_render_task /* 3647D0 E00624D0 AFA20010 */ sw $v0, 0x10($sp) /* 3647D4 E00624D4 8C430000 */ lw $v1, ($v0) /* 3647D8 E00624D8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_49/func_E00624EC.s b/ver/us/asm/nonmatchings/effects/effect_49/func_E00624EC.s index 11b7795dc7..f984e231d7 100644 --- a/ver/us/asm/nonmatchings/effects/effect_49/func_E00624EC.s +++ b/ver/us/asm/nonmatchings/effects/effect_49/func_E00624EC.s @@ -52,7 +52,7 @@ glabel func_E00624EC /* 3648A8 E00625A8 8E460008 */ lw $a2, 8($s2) /* 3648AC E00625AC 8E47000C */ lw $a3, 0xc($s2) /* 3648B0 E00625B0 24630010 */ addiu $v1, $v1, 0x10 -/* 3648B4 E00625B4 0C080108 */ jal func_E0200420 +/* 3648B4 E00625B4 0C080108 */ jal shim_guTranslateF /* 3648B8 E00625B8 AE630000 */ sw $v1, ($s3) /* 3648BC E00625BC 27B50058 */ addiu $s5, $sp, 0x58 /* 3648C0 E00625C0 4480A000 */ mtc1 $zero, $f20 @@ -75,12 +75,12 @@ glabel func_E00624EC /* 364904 E0062604 46000007 */ neg.s $f0, $f0 /* 364908 E0062608 44050000 */ mfc1 $a1, $f0 /* 36490C E006260C 02A0202D */ daddu $a0, $s5, $zero -/* 364910 E0062610 0C080104 */ jal func_E0200410 +/* 364910 E0062610 0C080104 */ jal shim_guRotateF /* 364914 E0062614 E7B40010 */ swc1 $f20, 0x10($sp) /* 364918 E0062618 02A0202D */ daddu $a0, $s5, $zero /* 36491C E006261C 27A50018 */ addiu $a1, $sp, 0x18 /* 364920 E0062620 27B00098 */ addiu $s0, $sp, 0x98 -/* 364924 E0062624 0C080114 */ jal func_E0200450 +/* 364924 E0062624 0C080114 */ jal shim_guMtxCatF /* 364928 E0062628 0200302D */ daddu $a2, $s0, $zero /* 36492C E006262C 0200202D */ daddu $a0, $s0, $zero /* 364930 E0062630 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -91,7 +91,7 @@ glabel func_E00624EC /* 364944 E0062644 8EC20000 */ lw $v0, ($s6) /* 364948 E0062648 00052980 */ sll $a1, $a1, 6 /* 36494C E006264C 00B12821 */ addu $a1, $a1, $s1 -/* 364950 E0062650 0C080118 */ jal func_E0200460 +/* 364950 E0062650 0C080118 */ jal shim_guMtxF2L /* 364954 E0062654 00452821 */ addu $a1, $v0, $a1 /* 364958 E0062658 8E660000 */ lw $a2, ($s3) /* 36495C E006265C 24140001 */ addiu $s4, $zero, 1 @@ -154,34 +154,34 @@ glabel func_E00624EC /* 364A3C E006273C 8E05FFE8 */ lw $a1, -0x18($s0) /* 364A40 E0062740 8E06FFEC */ lw $a2, -0x14($s0) /* 364A44 E0062744 8E07FFF0 */ lw $a3, -0x10($s0) -/* 364A48 E0062748 0C080108 */ jal func_E0200420 +/* 364A48 E0062748 0C080108 */ jal shim_guTranslateF /* 364A4C E006274C 26940001 */ addiu $s4, $s4, 1 /* 364A50 E0062750 E7B40010 */ swc1 $f20, 0x10($sp) /* 364A54 E0062754 8E050010 */ lw $a1, 0x10($s0) /* 364A58 E0062758 4406B000 */ mfc1 $a2, $f22 /* 364A5C E006275C 4407B000 */ mfc1 $a3, $f22 -/* 364A60 E0062760 0C080104 */ jal func_E0200410 +/* 364A60 E0062760 0C080104 */ jal shim_guRotateF /* 364A64 E0062764 0220202D */ daddu $a0, $s1, $zero /* 364A68 E0062768 0220202D */ daddu $a0, $s1, $zero /* 364A6C E006276C 27A50018 */ addiu $a1, $sp, 0x18 -/* 364A70 E0062770 0C080114 */ jal func_E0200450 +/* 364A70 E0062770 0C080114 */ jal shim_guMtxCatF /* 364A74 E0062774 00A0302D */ daddu $a2, $a1, $zero /* 364A78 E0062778 0220202D */ daddu $a0, $s1, $zero /* 364A7C E006277C 8E050004 */ lw $a1, 4($s0) /* 364A80 E0062780 8E060000 */ lw $a2, ($s0) /* 364A84 E0062784 4407A000 */ mfc1 $a3, $f20 -/* 364A88 E0062788 0C080110 */ jal func_E0200440 +/* 364A88 E0062788 0C080110 */ jal shim_guScaleF /* 364A8C E006278C 26100040 */ addiu $s0, $s0, 0x40 /* 364A90 E0062790 0220202D */ daddu $a0, $s1, $zero /* 364A94 E0062794 27A50018 */ addiu $a1, $sp, 0x18 -/* 364A98 E0062798 0C080114 */ jal func_E0200450 +/* 364A98 E0062798 0C080114 */ jal shim_guMtxCatF /* 364A9C E006279C 00A0302D */ daddu $a2, $a1, $zero /* 364AA0 E00627A0 27A40018 */ addiu $a0, $sp, 0x18 /* 364AA4 E00627A4 96C50000 */ lhu $a1, ($s6) /* 364AA8 E00627A8 8EE20000 */ lw $v0, ($s7) /* 364AAC E00627AC 00052980 */ sll $a1, $a1, 6 /* 364AB0 E00627B0 00B52821 */ addu $a1, $a1, $s5 -/* 364AB4 E00627B4 0C080118 */ jal func_E0200460 +/* 364AB4 E00627B4 0C080118 */ jal shim_guMtxF2L /* 364AB8 E00627B8 00452821 */ addu $a1, $v0, $a1 /* 364ABC E00627BC 3C06D838 */ lui $a2, 0xd838 /* 364AC0 E00627C0 8E640000 */ lw $a0, ($s3) diff --git a/ver/us/asm/nonmatchings/effects/effect_49/fx_49_main.s b/ver/us/asm/nonmatchings/effects/effect_49/fx_49_main.s index e30067fdf3..285ce9099b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_49/fx_49_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_49/fx_49_main.s @@ -32,12 +32,12 @@ glabel fx_49_main /* 36436C E006206C F7BA0060 */ sdc1 $f26, 0x60($sp) /* 364370 E0062070 AFA00010 */ sw $zero, 0x10($sp) /* 364374 E0062074 AFA00024 */ sw $zero, 0x24($sp) -/* 364378 E0062078 0C080124 */ jal func_E0200490 +/* 364378 E0062078 0C080124 */ jal shim_create_effect_instance /* 36437C E006207C AFA20014 */ sw $v0, 0x14($sp) /* 364380 E0062080 24040200 */ addiu $a0, $zero, 0x200 /* 364384 E0062084 24150008 */ addiu $s5, $zero, 8 /* 364388 E0062088 0040A02D */ daddu $s4, $v0, $zero -/* 36438C E006208C 0C08012C */ jal func_E02004B0 +/* 36438C E006208C 0C08012C */ jal shim_general_heap_malloc /* 364390 E0062090 AE950008 */ sw $s5, 8($s4) /* 364394 E0062094 0040802D */ daddu $s0, $v0, $zero /* 364398 E0062098 16000003 */ bnez $s0, .LE00620A8 @@ -47,7 +47,7 @@ glabel fx_49_main /* 3643A4 E00620A4 00000000 */ nop .LE00620A8: /* 3643A8 E00620A8 0200202D */ daddu $a0, $s0, $zero -/* 3643AC E00620AC 0C080130 */ jal func_E02004C0 +/* 3643AC E00620AC 0C080130 */ jal shim_mem_clear /* 3643B0 E00620B0 00152980 */ sll $a1, $s5, 6 /* 3643B4 E00620B4 2402001E */ addiu $v0, $zero, 0x1e /* 3643B8 E00620B8 AE020024 */ sw $v0, 0x24($s0) @@ -111,10 +111,10 @@ glabel fx_49_main /* 36448C E006218C 461AB500 */ add.s $f20, $f22, $f26 /* 364490 E0062190 26310168 */ addiu $s1, $s1, 0x168 /* 364494 E0062194 26520001 */ addiu $s2, $s2, 1 -/* 364498 E0062198 0C080144 */ jal func_E0200510 +/* 364498 E0062198 0C080144 */ jal shim_cos_deg /* 36449C E006219C 4600A306 */ mov.s $f12, $f20 /* 3644A0 E00621A0 4600A306 */ mov.s $f12, $f20 -/* 3644A4 E00621A4 0C080140 */ jal func_E0200500 +/* 3644A4 E00621A4 0C080140 */ jal shim_sin_deg /* 3644A8 E00621A8 E600FFD8 */ swc1 $f0, -0x28($s0) /* 3644AC E00621AC E600FFDC */ swc1 $f0, -0x24($s0) /* 3644B0 E00621B0 AE00FFE0 */ sw $zero, -0x20($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_50/func_E00641A4.s b/ver/us/asm/nonmatchings/effects/effect_50/func_E00641A4.s index afcc38f987..f6a78ae7af 100644 --- a/ver/us/asm/nonmatchings/effects/effect_50/func_E00641A4.s +++ b/ver/us/asm/nonmatchings/effects/effect_50/func_E00641A4.s @@ -21,7 +21,7 @@ glabel func_E00641A4 /* 3650F4 E00641E4 AC82002C */ sw $v0, 0x2c($a0) /* 3650F8 E00641E8 04610005 */ bgez $v1, .LE0064200 /* 3650FC E00641EC AC830028 */ sw $v1, 0x28($a0) -/* 365100 E00641F0 0C080128 */ jal func_E02004A0 +/* 365100 E00641F0 0C080128 */ jal shim_remove_effect /* 365104 E00641F4 0240202D */ daddu $a0, $s2, $zero /* 365108 E00641F8 080190EC */ j .LE00643B0 /* 36510C E00641FC 00000000 */ nop @@ -66,7 +66,7 @@ glabel func_E00641A4 /* 36519C E006428C C60CFFF8 */ lwc1 $f12, -8($s0) /* 3651A0 E0064290 AE00FFC8 */ sw $zero, -0x38($s0) /* 3651A4 E0064294 AE00FFCC */ sw $zero, -0x34($s0) -/* 3651A8 E0064298 0C080140 */ jal func_E0200500 +/* 3651A8 E0064298 0C080140 */ jal shim_sin_deg /* 3651AC E006429C AE00FFD0 */ sw $zero, -0x30($s0) /* 3651B0 E00642A0 46000007 */ neg.s $f0, $f0 /* 3651B4 E00642A4 46000021 */ cvt.d.s $f0, $f0 @@ -74,7 +74,7 @@ glabel func_E00641A4 /* 3651BC E00642AC 00000000 */ nop /* 3651C0 E00642B0 C60CFFF8 */ lwc1 $f12, -8($s0) /* 3651C4 E00642B4 46200020 */ cvt.s.d $f0, $f0 -/* 3651C8 E00642B8 0C080144 */ jal func_E0200510 +/* 3651C8 E00642B8 0C080144 */ jal shim_cos_deg /* 3651CC E00642BC E600FFD4 */ swc1 $f0, -0x2c($s0) /* 3651D0 E00642C0 46000021 */ cvt.d.s $f0, $f0 /* 3651D4 E00642C4 3C014120 */ lui $at, 0x4120 diff --git a/ver/us/asm/nonmatchings/effects/effect_50/func_E00643DC.s b/ver/us/asm/nonmatchings/effects/effect_50/func_E00643DC.s index 5bff87d863..24ed0122df 100644 --- a/ver/us/asm/nonmatchings/effects/effect_50/func_E00643DC.s +++ b/ver/us/asm/nonmatchings/effects/effect_50/func_E00643DC.s @@ -11,7 +11,7 @@ glabel func_E00643DC /* 365304 E00643F4 27A40010 */ addiu $a0, $sp, 0x10 /* 365308 E00643F8 AFBF0020 */ sw $ra, 0x20($sp) /* 36530C E00643FC AFA00014 */ sw $zero, 0x14($sp) -/* 365310 E0064400 0C080120 */ jal func_E0200480 +/* 365310 E0064400 0C080120 */ jal shim_queue_render_task /* 365314 E0064404 AFA20010 */ sw $v0, 0x10($sp) /* 365318 E0064408 8FBF0020 */ lw $ra, 0x20($sp) /* 36531C E006440C 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_50/func_E0064414.s b/ver/us/asm/nonmatchings/effects/effect_50/func_E0064414.s index 446393b62f..4e309b8dcd 100644 --- a/ver/us/asm/nonmatchings/effects/effect_50/func_E0064414.s +++ b/ver/us/asm/nonmatchings/effects/effect_50/func_E0064414.s @@ -89,7 +89,7 @@ glabel func_E0064414 /* 365474 E0064564 E7A00018 */ swc1 $f0, 0x18($sp) /* 365478 E0064568 C620000C */ lwc1 $f0, 0xc($s1) /* 36547C E006456C 36101630 */ ori $s0, $s0, 0x1630 -/* 365480 E0064570 0C080180 */ jal func_E0200600 +/* 365480 E0064570 0C080180 */ jal shim_guPositionF /* 365484 E0064574 E7A0001C */ swc1 $f0, 0x1c($sp) /* 365488 E0064578 27A40020 */ addiu $a0, $sp, 0x20 /* 36548C E006457C 3C158007 */ lui $s5, %hi(gMatrixListPos) @@ -100,7 +100,7 @@ glabel func_E0064414 /* 3654A0 E0064590 8EC20000 */ lw $v0, ($s6) /* 3654A4 E0064594 00052980 */ sll $a1, $a1, 6 /* 3654A8 E0064598 00B02821 */ addu $a1, $a1, $s0 -/* 3654AC E006459C 0C080118 */ jal func_E0200460 +/* 3654AC E006459C 0C080118 */ jal shim_guMtxF2L /* 3654B0 E00645A0 00452821 */ addu $a1, $v0, $a1 /* 3654B4 E00645A4 24140001 */ addiu $s4, $zero, 1 /* 3654B8 E00645A8 3C02DA38 */ lui $v0, 0xda38 @@ -157,17 +157,17 @@ glabel func_E0064414 /* 365580 E0064670 8E05FFC0 */ lw $a1, -0x40($s0) /* 365584 E0064674 8E06FFC4 */ lw $a2, -0x3c($s0) /* 365588 E0064678 8E07FFC8 */ lw $a3, -0x38($s0) -/* 36558C E006467C 0C080108 */ jal func_E0200420 +/* 36558C E006467C 0C080108 */ jal shim_guTranslateF /* 365590 E0064680 27A40020 */ addiu $a0, $sp, 0x20 /* 365594 E0064684 E7B80010 */ swc1 $f24, 0x10($sp) /* 365598 E0064688 8E05FFF0 */ lw $a1, -0x10($s0) /* 36559C E006468C 4406B000 */ mfc1 $a2, $f22 /* 3655A0 E0064690 4407B000 */ mfc1 $a3, $f22 -/* 3655A4 E0064694 0C080104 */ jal func_E0200410 +/* 3655A4 E0064694 0C080104 */ jal shim_guRotateF /* 3655A8 E0064698 0240202D */ daddu $a0, $s2, $zero /* 3655AC E006469C 0240202D */ daddu $a0, $s2, $zero /* 3655B0 E00646A0 27A50020 */ addiu $a1, $sp, 0x20 -/* 3655B4 E00646A4 0C080114 */ jal func_E0200450 +/* 3655B4 E00646A4 0C080114 */ jal shim_guMtxCatF /* 3655B8 E00646A8 00A0302D */ daddu $a2, $a1, $zero /* 3655BC E00646AC C604FFD8 */ lwc1 $f4, -0x28($s0) /* 3655C0 E00646B0 46002121 */ cvt.d.s $f4, $f4 @@ -187,21 +187,21 @@ glabel func_E0064414 /* 3655F8 E00646E8 44052000 */ mfc1 $a1, $f4 /* 3655FC E00646EC 44061000 */ mfc1 $a2, $f2 /* 365600 E00646F0 44070000 */ mfc1 $a3, $f0 -/* 365604 E00646F4 0C080110 */ jal func_E0200440 +/* 365604 E00646F4 0C080110 */ jal shim_guScaleF /* 365608 E00646F8 0240202D */ daddu $a0, $s2, $zero /* 36560C E00646FC 0240202D */ daddu $a0, $s2, $zero /* 365610 E0064700 27A50020 */ addiu $a1, $sp, 0x20 -/* 365614 E0064704 0C080114 */ jal func_E0200450 +/* 365614 E0064704 0C080114 */ jal shim_guMtxCatF /* 365618 E0064708 00A0302D */ daddu $a2, $a1, $zero /* 36561C E006470C E7B60010 */ swc1 $f22, 0x10($sp) /* 365620 E0064710 8E05FFEC */ lw $a1, -0x14($s0) /* 365624 E0064714 4406B000 */ mfc1 $a2, $f22 /* 365628 E0064718 4407C000 */ mfc1 $a3, $f24 -/* 36562C E006471C 0C080104 */ jal func_E0200410 +/* 36562C E006471C 0C080104 */ jal shim_guRotateF /* 365630 E0064720 0240202D */ daddu $a0, $s2, $zero /* 365634 E0064724 0240202D */ daddu $a0, $s2, $zero /* 365638 E0064728 27A50020 */ addiu $a1, $sp, 0x20 -/* 36563C E006472C 0C080114 */ jal func_E0200450 +/* 36563C E006472C 0C080114 */ jal shim_guMtxCatF /* 365640 E0064730 00A0302D */ daddu $a2, $a1, $zero /* 365644 E0064734 27A40020 */ addiu $a0, $sp, 0x20 /* 365648 E0064738 96C50000 */ lhu $a1, ($s6) @@ -209,7 +209,7 @@ glabel func_E0064414 /* 365650 E0064740 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 365654 E0064744 00052980 */ sll $a1, $a1, 6 /* 365658 E0064748 00B52821 */ addu $a1, $a1, $s5 -/* 36565C E006474C 0C080118 */ jal func_E0200460 +/* 36565C E006474C 0C080118 */ jal shim_guMtxF2L /* 365660 E0064750 00452821 */ addu $a1, $v0, $a1 /* 365664 E0064754 3C06000F */ lui $a2, 0xf /* 365668 E0064758 34C6C000 */ ori $a2, $a2, 0xc000 diff --git a/ver/us/asm/nonmatchings/effects/effect_50/fx_50_main.s b/ver/us/asm/nonmatchings/effects/effect_50/fx_50_main.s index c0f2fc209a..afe2021b22 100644 --- a/ver/us/asm/nonmatchings/effects/effect_50/fx_50_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_50/fx_50_main.s @@ -35,7 +35,7 @@ glabel fx_50_main /* 364F84 E0064074 AC820010 */ sw $v0, 0x10($a0) /* 364F88 E0064078 24020032 */ addiu $v0, $zero, 0x32 /* 364F8C E006407C AC800014 */ sw $zero, 0x14($a0) -/* 364F90 E0064080 0C080124 */ jal func_E0200490 +/* 364F90 E0064080 0C080124 */ jal shim_create_effect_instance /* 364F94 E0064084 AC820004 */ sw $v0, 4($a0) /* 364F98 E0064088 00112040 */ sll $a0, $s1, 1 /* 364F9C E006408C 00912021 */ addu $a0, $a0, $s1 @@ -43,7 +43,7 @@ glabel fx_50_main /* 364FA4 E0064094 00912023 */ subu $a0, $a0, $s1 /* 364FA8 E0064098 000420C0 */ sll $a0, $a0, 3 /* 364FAC E006409C 0040902D */ daddu $s2, $v0, $zero -/* 364FB0 E00640A0 0C08012C */ jal func_E02004B0 +/* 364FB0 E00640A0 0C08012C */ jal shim_general_heap_malloc /* 364FB4 E00640A4 AE510008 */ sw $s1, 8($s2) /* 364FB8 E00640A8 0040802D */ daddu $s0, $v0, $zero /* 364FBC E00640AC 16000003 */ bnez $s0, .LE00640BC @@ -57,7 +57,7 @@ glabel fx_50_main /* 364FD4 E00640C4 00B12821 */ addu $a1, $a1, $s1 /* 364FD8 E00640C8 00052880 */ sll $a1, $a1, 2 /* 364FDC E00640CC 00B12823 */ subu $a1, $a1, $s1 -/* 364FE0 E00640D0 0C080130 */ jal func_E02004C0 +/* 364FE0 E00640D0 0C080130 */ jal shim_mem_clear /* 364FE4 E00640D4 000528C0 */ sll $a1, $a1, 3 /* 364FE8 E00640D8 2402003C */ addiu $v0, $zero, 0x3c /* 364FEC E00640DC 240300FF */ addiu $v1, $zero, 0xff diff --git a/ver/us/asm/nonmatchings/effects/effect_51/func_E0066498.s b/ver/us/asm/nonmatchings/effects/effect_51/func_E0066498.s index 6208199ccc..247bca7b6e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_51/func_E0066498.s +++ b/ver/us/asm/nonmatchings/effects/effect_51/func_E0066498.s @@ -27,7 +27,7 @@ glabel func_E0066498 /* 36651C E00664EC 8E050028 */ lw $a1, 0x28($s0) /* 366520 E00664F0 04A10005 */ bgez $a1, .LE0066508 /* 366524 E00664F4 00000000 */ nop -/* 366528 E00664F8 0C080128 */ jal func_E02004A0 +/* 366528 E00664F8 0C080128 */ jal shim_remove_effect /* 36652C E00664FC 0220202D */ daddu $a0, $s1, $zero /* 366530 E0066500 080199C5 */ j .LE0066714 /* 366534 E0066504 00000000 */ nop @@ -100,7 +100,7 @@ glabel func_E0066498 /* 366630 E0066600 8E050004 */ lw $a1, 4($s0) /* 366634 E0066604 8E060008 */ lw $a2, 8($s0) /* 366638 E0066608 8E07000C */ lw $a3, 0xc($s0) -/* 36663C E006660C 0C080168 */ jal func_E02005A0 +/* 36663C E006660C 0C080168 */ jal shim_transform_point /* 366640 E0066610 00822021 */ addu $a0, $a0, $v0 /* 366644 E0066614 C7A00034 */ lwc1 $f0, 0x34($sp) /* 366648 E0066618 C7A40028 */ lwc1 $f4, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_51/func_E006672C.s b/ver/us/asm/nonmatchings/effects/effect_51/func_E006672C.s index abd0b1f444..276843de7b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_51/func_E006672C.s +++ b/ver/us/asm/nonmatchings/effects/effect_51/func_E006672C.s @@ -11,7 +11,7 @@ glabel func_E006672C /* 366774 E0066744 27A40010 */ addiu $a0, $sp, 0x10 /* 366778 E0066748 AFBF0020 */ sw $ra, 0x20($sp) /* 36677C E006674C AFA00014 */ sw $zero, 0x14($sp) -/* 366780 E0066750 0C080120 */ jal func_E0200480 +/* 366780 E0066750 0C080120 */ jal shim_queue_render_task /* 366784 E0066754 AFA20010 */ sw $v0, 0x10($sp) /* 366788 E0066758 8C430000 */ lw $v1, ($v0) /* 36678C E006675C 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_51/func_E0066770.s b/ver/us/asm/nonmatchings/effects/effect_51/func_E0066770.s index 9d95f44e00..e97476c8a9 100644 --- a/ver/us/asm/nonmatchings/effects/effect_51/func_E0066770.s +++ b/ver/us/asm/nonmatchings/effects/effect_51/func_E0066770.s @@ -60,7 +60,7 @@ glabel func_E0066770 /* 36687C E006684C 001010C0 */ sll $v0, $s0, 3 /* 366880 E0066850 02028021 */ addu $s0, $s0, $v0 /* 366884 E0066854 001080C0 */ sll $s0, $s0, 3 -/* 366888 E0066858 0C080108 */ jal func_E0200420 +/* 366888 E0066858 0C080108 */ jal shim_guTranslateF /* 36688C E006685C 02038021 */ addu $s0, $s0, $v1 /* 366890 E0066860 27B10060 */ addiu $s1, $sp, 0x60 /* 366894 E0066864 0220202D */ daddu $a0, $s1, $zero @@ -68,11 +68,11 @@ glabel func_E0066770 /* 36689C E006686C 4481A000 */ mtc1 $at, $f20 /* 3668A0 E0066870 8E85001C */ lw $a1, 0x1c($s4) /* 3668A4 E0066874 4407A000 */ mfc1 $a3, $f20 -/* 3668A8 E0066878 0C080110 */ jal func_E0200440 +/* 3668A8 E0066878 0C080110 */ jal shim_guScaleF /* 3668AC E006687C 00A0302D */ daddu $a2, $a1, $zero /* 3668B0 E0066880 0220202D */ daddu $a0, $s1, $zero /* 3668B4 E0066884 27A50020 */ addiu $a1, $sp, 0x20 -/* 3668B8 E0066888 0C080114 */ jal func_E0200450 +/* 3668B8 E0066888 0C080114 */ jal shim_guMtxCatF /* 3668BC E006688C 00A0302D */ daddu $a2, $a1, $zero /* 3668C0 E0066890 8602000A */ lh $v0, 0xa($s0) /* 3668C4 E0066894 8603000C */ lh $v1, 0xc($s0) @@ -93,11 +93,11 @@ glabel func_E0066770 /* 366900 E00668D0 46001083 */ div.s $f2, $f2, $f0 /* 366904 E00668D4 8E860060 */ lw $a2, 0x60($s4) /* 366908 E00668D8 44071000 */ mfc1 $a3, $f2 -/* 36690C E00668DC 0C080160 */ jal func_E0200580 +/* 36690C E00668DC 0C080160 */ jal shim_guPerspectiveF /* 366910 E00668E0 27A500A0 */ addiu $a1, $sp, 0xa0 /* 366914 E00668E4 0220202D */ daddu $a0, $s1, $zero /* 366918 E00668E8 27A50020 */ addiu $a1, $sp, 0x20 -/* 36691C E00668EC 0C080114 */ jal func_E0200450 +/* 36691C E00668EC 0C080114 */ jal shim_guMtxCatF /* 366920 E00668F0 00A0302D */ daddu $a2, $a1, $zero /* 366924 E00668F4 27A40020 */ addiu $a0, $sp, 0x20 /* 366928 E00668F8 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -108,7 +108,7 @@ glabel func_E0066770 /* 36693C E006690C 8E220000 */ lw $v0, ($s1) /* 366940 E0066910 00052980 */ sll $a1, $a1, 6 /* 366944 E0066914 00B22821 */ addu $a1, $a1, $s2 -/* 366948 E0066918 0C080118 */ jal func_E0200460 +/* 366948 E0066918 0C080118 */ jal shim_guMtxF2L /* 36694C E006691C 00452821 */ addu $a1, $v0, $a1 /* 366950 E0066920 3C02DA38 */ lui $v0, 0xda38 /* 366954 E0066924 34420007 */ ori $v0, $v0, 7 @@ -130,14 +130,14 @@ glabel func_E0066770 /* 366994 E0066964 8E870064 */ lw $a3, 0x64($s4) /* 366998 E0066968 00A0302D */ daddu $a2, $a1, $zero /* 36699C E006696C AEC90000 */ sw $t1, ($s6) -/* 3669A0 E0066970 0C080108 */ jal func_E0200420 +/* 3669A0 E0066970 0C080108 */ jal shim_guTranslateF /* 3669A4 E0066974 A6080000 */ sh $t0, ($s0) /* 3669A8 E0066978 27A40020 */ addiu $a0, $sp, 0x20 /* 3669AC E006697C 96050000 */ lhu $a1, ($s0) /* 3669B0 E0066980 8E220000 */ lw $v0, ($s1) /* 3669B4 E0066984 00052980 */ sll $a1, $a1, 6 /* 3669B8 E0066988 00B22821 */ addu $a1, $a1, $s2 -/* 3669BC E006698C 0C080118 */ jal func_E0200460 +/* 3669BC E006698C 0C080118 */ jal shim_guMtxF2L /* 3669C0 E0066990 00452821 */ addu $a1, $v0, $a1 /* 3669C4 E0066994 3C03DA38 */ lui $v1, 0xda38 /* 3669C8 E0066998 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_51/fx_51_main.s b/ver/us/asm/nonmatchings/effects/effect_51/fx_51_main.s index fd7988955a..fc3b6afc15 100644 --- a/ver/us/asm/nonmatchings/effects/effect_51/fx_51_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_51/fx_51_main.s @@ -28,12 +28,12 @@ glabel fx_51_main /* 36608C E006605C AFB20030 */ sw $s2, 0x30($sp) /* 366090 E0066060 AFA00010 */ sw $zero, 0x10($sp) /* 366094 E0066064 AFA00024 */ sw $zero, 0x24($sp) -/* 366098 E0066068 0C080124 */ jal func_E0200490 +/* 366098 E0066068 0C080124 */ jal shim_create_effect_instance /* 36609C E006606C AFA20014 */ sw $v0, 0x14($sp) /* 3660A0 E0066070 24040070 */ addiu $a0, $zero, 0x70 /* 3660A4 E0066074 24030001 */ addiu $v1, $zero, 1 /* 3660A8 E0066078 0040902D */ daddu $s2, $v0, $zero -/* 3660AC E006607C 0C08012C */ jal func_E02004B0 +/* 3660AC E006607C 0C08012C */ jal shim_general_heap_malloc /* 3660B0 E0066080 AE430008 */ sw $v1, 8($s2) /* 3660B4 E0066084 0040202D */ daddu $a0, $v0, $zero /* 3660B8 E0066088 14800003 */ bnez $a0, .LE0066098 diff --git a/ver/us/asm/nonmatchings/effects/effect_52/func_E0068148.s b/ver/us/asm/nonmatchings/effects/effect_52/func_E0068148.s index d05aee0ad6..c46f261b67 100644 --- a/ver/us/asm/nonmatchings/effects/effect_52/func_E0068148.s +++ b/ver/us/asm/nonmatchings/effects/effect_52/func_E0068148.s @@ -25,7 +25,7 @@ glabel func_E0068148 /* 36AA60 E0068190 24420001 */ addiu $v0, $v0, 1 /* 36AA64 E0068194 04A10005 */ bgez $a1, .LE00681AC /* 36AA68 E0068198 AC620020 */ sw $v0, 0x20($v1) -/* 36AA6C E006819C 0C080128 */ jal func_E02004A0 +/* 36AA6C E006819C 0C080128 */ jal shim_remove_effect /* 36AA70 E00681A0 00000000 */ nop /* 36AA74 E00681A4 0801A073 */ j .LE00681CC /* 36AA78 E00681A8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_52/func_E00681D8.s b/ver/us/asm/nonmatchings/effects/effect_52/func_E00681D8.s index d77b40637f..178938dce6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_52/func_E00681D8.s +++ b/ver/us/asm/nonmatchings/effects/effect_52/func_E00681D8.s @@ -19,7 +19,7 @@ glabel func_E00681D8 .LE0068210: /* 36AAE0 E0068210 2402002D */ addiu $v0, $zero, 0x2d .LE0068214: -/* 36AAE4 E0068214 0C080120 */ jal func_E0200480 +/* 36AAE4 E0068214 0C080120 */ jal shim_queue_render_task /* 36AAE8 E0068218 AFA20010 */ sw $v0, 0x10($sp) /* 36AAEC E006821C 8C430000 */ lw $v1, ($v0) /* 36AAF0 E0068220 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_52/func_E0068234.s b/ver/us/asm/nonmatchings/effects/effect_52/func_E0068234.s index f517adf935..2e413875b0 100644 --- a/ver/us/asm/nonmatchings/effects/effect_52/func_E0068234.s +++ b/ver/us/asm/nonmatchings/effects/effect_52/func_E0068234.s @@ -68,7 +68,7 @@ glabel func_E0068234 /* 36AC00 E0068330 AE260000 */ sw $a2, ($s1) /* 36AC04 E0068334 44061000 */ mfc1 $a2, $f2 /* 36AC08 E0068338 27A40020 */ addiu $a0, $sp, 0x20 -/* 36AC0C E006833C 0C080180 */ jal func_E0200600 +/* 36AC0C E006833C 0C080180 */ jal shim_guPositionF /* 36AC10 E0068340 E7A0001C */ swc1 $f0, 0x1c($sp) /* 36AC14 E0068344 27A40020 */ addiu $a0, $sp, 0x20 /* 36AC18 E0068348 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -79,7 +79,7 @@ glabel func_E0068234 /* 36AC2C E006835C 8E420000 */ lw $v0, ($s2) /* 36AC30 E0068360 00052980 */ sll $a1, $a1, 6 /* 36AC34 E0068364 00B32821 */ addu $a1, $a1, $s3 -/* 36AC38 E0068368 0C080118 */ jal func_E0200460 +/* 36AC38 E0068368 0C080118 */ jal shim_guMtxF2L /* 36AC3C E006836C 00452821 */ addu $a1, $v0, $a1 /* 36AC40 E0068370 8E220000 */ lw $v0, ($s1) /* 36AC44 E0068374 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/effects/effect_52/fx_52_main.s b/ver/us/asm/nonmatchings/effects/effect_52/fx_52_main.s index f8365ef861..d2ee712c50 100644 --- a/ver/us/asm/nonmatchings/effects/effect_52/fx_52_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_52/fx_52_main.s @@ -28,12 +28,12 @@ glabel fx_52_main /* 36A92C E006805C AFB00028 */ sw $s0, 0x28($sp) /* 36A930 E0068060 AFA00010 */ sw $zero, 0x10($sp) /* 36A934 E0068064 AFA00024 */ sw $zero, 0x24($sp) -/* 36A938 E0068068 0C080124 */ jal func_E0200490 +/* 36A938 E0068068 0C080124 */ jal shim_create_effect_instance /* 36A93C E006806C AFA20014 */ sw $v0, 0x14($sp) /* 36A940 E0068070 2404002C */ addiu $a0, $zero, 0x2c /* 36A944 E0068074 24030001 */ addiu $v1, $zero, 1 /* 36A948 E0068078 0040802D */ daddu $s0, $v0, $zero -/* 36A94C E006807C 0C08012C */ jal func_E02004B0 +/* 36A94C E006807C 0C08012C */ jal shim_general_heap_malloc /* 36A950 E0068080 AE030008 */ sw $v1, 8($s0) /* 36A954 E0068084 0040202D */ daddu $a0, $v0, $zero /* 36A958 E0068088 14800003 */ bnez $a0, .LE0068098 diff --git a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A580.s b/ver/us/asm/nonmatchings/effects/effect_53/func_E006A580.s index 6c941b4468..798107dd65 100644 --- a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A580.s +++ b/ver/us/asm/nonmatchings/effects/effect_53/func_E006A580.s @@ -33,7 +33,7 @@ glabel func_E006A580 /* 36D608 E006A5E8 8E220028 */ lw $v0, 0x28($s1) /* 36D60C E006A5EC 04410005 */ bgez $v0, .LE006A604 /* 36D610 E006A5F0 0040982D */ daddu $s3, $v0, $zero -/* 36D614 E006A5F4 0C080128 */ jal func_E02004A0 +/* 36D614 E006A5F4 0C080128 */ jal shim_remove_effect /* 36D618 E006A5F8 0280202D */ daddu $a0, $s4, $zero /* 36D61C E006A5FC 0801A9FD */ j .LE006A7F4 /* 36D620 E006A600 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A814.s b/ver/us/asm/nonmatchings/effects/effect_53/func_E006A814.s index fdeae18249..611d26deb7 100644 --- a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A814.s +++ b/ver/us/asm/nonmatchings/effects/effect_53/func_E006A814.s @@ -12,7 +12,7 @@ glabel func_E006A814 /* 36D850 E006A830 AFA40018 */ sw $a0, 0x18($sp) /* 36D854 E006A834 27A40010 */ addiu $a0, $sp, 0x10 /* 36D858 E006A838 AFBF0020 */ sw $ra, 0x20($sp) -/* 36D85C E006A83C 0C080120 */ jal func_E0200480 +/* 36D85C E006A83C 0C080120 */ jal shim_queue_render_task /* 36D860 E006A840 AFA20010 */ sw $v0, 0x10($sp) /* 36D864 E006A844 8C430000 */ lw $v1, ($v0) /* 36D868 E006A848 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A94C.s b/ver/us/asm/nonmatchings/effects/effect_53/func_E006A94C.s index 5378c8a629..720f858e9c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A94C.s +++ b/ver/us/asm/nonmatchings/effects/effect_53/func_E006A94C.s @@ -56,7 +56,7 @@ glabel func_E006A94C /* 36DA38 E006AA18 8E460014 */ lw $a2, 0x14($s2) /* 36DA3C E006AA1C 8E470018 */ lw $a3, 0x18($s2) /* 36DA40 E006AA20 24630010 */ addiu $v1, $v1, 0x10 -/* 36DA44 E006AA24 0C080108 */ jal func_E0200420 +/* 36DA44 E006AA24 0C080108 */ jal shim_guTranslateF /* 36DA48 E006AA28 AE230000 */ sw $v1, ($s1) /* 36DA4C E006AA2C 8FA80120 */ lw $t0, 0x120($sp) /* 36DA50 E006AA30 24140001 */ addiu $s4, $zero, 1 @@ -89,11 +89,11 @@ glabel func_E006A94C /* 36DAB4 E006AA94 8E250038 */ lw $a1, 0x38($s1) /* 36DAB8 E006AA98 4406C000 */ mfc1 $a2, $f24 /* 36DABC E006AA9C 4407B000 */ mfc1 $a3, $f22 -/* 36DAC0 E006AAA0 0C080104 */ jal func_E0200410 +/* 36DAC0 E006AAA0 0C080104 */ jal shim_guRotateF /* 36DAC4 E006AAA4 0200202D */ daddu $a0, $s0, $zero /* 36DAC8 E006AAA8 0200202D */ daddu $a0, $s0, $zero /* 36DACC E006AAAC 27A50098 */ addiu $a1, $sp, 0x98 -/* 36DAD0 E006AAB0 0C080114 */ jal func_E0200450 +/* 36DAD0 E006AAB0 0C080114 */ jal shim_guMtxCatF /* 36DAD4 E006AAB4 27A60018 */ addiu $a2, $sp, 0x18 /* 36DAD8 E006AAB8 56C00060 */ bnel $s6, $zero, .LE006AC3C /* 36DADC E006AABC E7B60010 */ swc1 $f22, 0x10($sp) @@ -110,30 +110,30 @@ glabel func_E006A94C /* 36DB04 E006AAE4 4406B000 */ mfc1 $a2, $f22 /* 36DB08 E006AAE8 4407B000 */ mfc1 $a3, $f22 /* 36DB0C E006AAEC 0200202D */ daddu $a0, $s0, $zero -/* 36DB10 E006AAF0 0C080104 */ jal func_E0200410 +/* 36DB10 E006AAF0 0C080104 */ jal shim_guRotateF /* 36DB14 E006AAF4 E7B80010 */ swc1 $f24, 0x10($sp) /* 36DB18 E006AAF8 0200202D */ daddu $a0, $s0, $zero /* 36DB1C E006AAFC 27A50018 */ addiu $a1, $sp, 0x18 -/* 36DB20 E006AB00 0C080114 */ jal func_E0200450 +/* 36DB20 E006AB00 0C080114 */ jal shim_guMtxCatF /* 36DB24 E006AB04 00A0302D */ daddu $a2, $a1, $zero /* 36DB28 E006AB08 E7B60010 */ swc1 $f22, 0x10($sp) /* 36DB2C E006AB0C 8E25003C */ lw $a1, 0x3c($s1) /* 36DB30 E006AB10 4406B000 */ mfc1 $a2, $f22 /* 36DB34 E006AB14 4407C000 */ mfc1 $a3, $f24 -/* 36DB38 E006AB18 0C080104 */ jal func_E0200410 +/* 36DB38 E006AB18 0C080104 */ jal shim_guRotateF /* 36DB3C E006AB1C 0200202D */ daddu $a0, $s0, $zero /* 36DB40 E006AB20 0200202D */ daddu $a0, $s0, $zero /* 36DB44 E006AB24 27A50018 */ addiu $a1, $sp, 0x18 -/* 36DB48 E006AB28 0C080114 */ jal func_E0200450 +/* 36DB48 E006AB28 0C080114 */ jal shim_guMtxCatF /* 36DB4C E006AB2C 00A0302D */ daddu $a2, $a1, $zero /* 36DB50 E006AB30 8E250034 */ lw $a1, 0x34($s1) /* 36DB54 E006AB34 4406B000 */ mfc1 $a2, $f22 /* 36DB58 E006AB38 4407B000 */ mfc1 $a3, $f22 -/* 36DB5C E006AB3C 0C080108 */ jal func_E0200420 +/* 36DB5C E006AB3C 0C080108 */ jal shim_guTranslateF /* 36DB60 E006AB40 0200202D */ daddu $a0, $s0, $zero /* 36DB64 E006AB44 0200202D */ daddu $a0, $s0, $zero /* 36DB68 E006AB48 27A50018 */ addiu $a1, $sp, 0x18 -/* 36DB6C E006AB4C 0C080114 */ jal func_E0200450 +/* 36DB6C E006AB4C 0C080114 */ jal shim_guMtxCatF /* 36DB70 E006AB50 00A0302D */ daddu $a2, $a1, $zero /* 36DB74 E006AB54 3C014040 */ lui $at, 0x4040 /* 36DB78 E006AB58 44810000 */ mtc1 $at, $f0 @@ -184,11 +184,11 @@ glabel func_E006A94C /* 36DC14 E006ABF4 44053000 */ mfc1 $a1, $f6 /* 36DC18 E006ABF8 44060000 */ mfc1 $a2, $f0 /* 36DC1C E006ABFC 44072000 */ mfc1 $a3, $f4 -/* 36DC20 E006AC00 0C080110 */ jal func_E0200440 +/* 36DC20 E006AC00 0C080110 */ jal shim_guScaleF /* 36DC24 E006AC04 0200202D */ daddu $a0, $s0, $zero /* 36DC28 E006AC08 0200202D */ daddu $a0, $s0, $zero /* 36DC2C E006AC0C 27A50018 */ addiu $a1, $sp, 0x18 -/* 36DC30 E006AC10 0C080114 */ jal func_E0200450 +/* 36DC30 E006AC10 0C080114 */ jal shim_guMtxCatF /* 36DC34 E006AC14 00A0302D */ daddu $a2, $a1, $zero /* 36DC38 E006AC18 8E620000 */ lw $v0, ($s3) /* 36DC3C E006AC1C 0040202D */ daddu $a0, $v0, $zero @@ -203,30 +203,30 @@ glabel func_E006A94C /* 36DC5C E006AC3C 8E25003C */ lw $a1, 0x3c($s1) /* 36DC60 E006AC40 4406B000 */ mfc1 $a2, $f22 /* 36DC64 E006AC44 4407C000 */ mfc1 $a3, $f24 -/* 36DC68 E006AC48 0C080104 */ jal func_E0200410 +/* 36DC68 E006AC48 0C080104 */ jal shim_guRotateF /* 36DC6C E006AC4C 0200202D */ daddu $a0, $s0, $zero /* 36DC70 E006AC50 0200202D */ daddu $a0, $s0, $zero /* 36DC74 E006AC54 27A50018 */ addiu $a1, $sp, 0x18 -/* 36DC78 E006AC58 0C080114 */ jal func_E0200450 +/* 36DC78 E006AC58 0C080114 */ jal shim_guMtxCatF /* 36DC7C E006AC5C 00A0302D */ daddu $a2, $a1, $zero /* 36DC80 E006AC60 E7B80010 */ swc1 $f24, 0x10($sp) /* 36DC84 E006AC64 8E250040 */ lw $a1, 0x40($s1) /* 36DC88 E006AC68 4406B000 */ mfc1 $a2, $f22 /* 36DC8C E006AC6C 4407B000 */ mfc1 $a3, $f22 -/* 36DC90 E006AC70 0C080104 */ jal func_E0200410 +/* 36DC90 E006AC70 0C080104 */ jal shim_guRotateF /* 36DC94 E006AC74 0200202D */ daddu $a0, $s0, $zero /* 36DC98 E006AC78 0200202D */ daddu $a0, $s0, $zero /* 36DC9C E006AC7C 27A50018 */ addiu $a1, $sp, 0x18 -/* 36DCA0 E006AC80 0C080114 */ jal func_E0200450 +/* 36DCA0 E006AC80 0C080114 */ jal shim_guMtxCatF /* 36DCA4 E006AC84 00A0302D */ daddu $a2, $a1, $zero /* 36DCA8 E006AC88 8E250034 */ lw $a1, 0x34($s1) /* 36DCAC E006AC8C 4406B000 */ mfc1 $a2, $f22 /* 36DCB0 E006AC90 4407B000 */ mfc1 $a3, $f22 -/* 36DCB4 E006AC94 0C080108 */ jal func_E0200420 +/* 36DCB4 E006AC94 0C080108 */ jal shim_guTranslateF /* 36DCB8 E006AC98 0200202D */ daddu $a0, $s0, $zero /* 36DCBC E006AC9C 0200202D */ daddu $a0, $s0, $zero /* 36DCC0 E006ACA0 27A50018 */ addiu $a1, $sp, 0x18 -/* 36DCC4 E006ACA4 0C080114 */ jal func_E0200450 +/* 36DCC4 E006ACA4 0C080114 */ jal shim_guMtxCatF /* 36DCC8 E006ACA8 00A0302D */ daddu $a2, $a1, $zero /* 36DCCC E006ACAC 8E620000 */ lw $v0, ($s3) /* 36DCD0 E006ACB0 0040202D */ daddu $a0, $v0, $zero @@ -247,7 +247,7 @@ glabel func_E006A94C /* 36DD08 E006ACE8 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 36DD0C E006ACEC 00052980 */ sll $a1, $a1, 6 /* 36DD10 E006ACF0 00B52821 */ addu $a1, $a1, $s5 -/* 36DD14 E006ACF4 0C080118 */ jal func_E0200460 +/* 36DD14 E006ACF4 0C080118 */ jal shim_guMtxF2L /* 36DD18 E006ACF8 00452821 */ addu $a1, $v0, $a1 /* 36DD1C E006ACFC 3C02DA38 */ lui $v0, 0xda38 /* 36DD20 E006AD00 34420002 */ ori $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_53/fx_53_main.s b/ver/us/asm/nonmatchings/effects/effect_53/fx_53_main.s index 034d032b0a..84b78f316b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_53/fx_53_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_53/fx_53_main.s @@ -39,7 +39,7 @@ glabel fx_53_main /* 36D28C E006A26C 24020035 */ addiu $v0, $zero, 0x35 /* 36D290 E006A270 AFA00010 */ sw $zero, 0x10($sp) /* 36D294 E006A274 AFA00024 */ sw $zero, 0x24($sp) -/* 36D298 E006A278 0C080124 */ jal func_E0200490 +/* 36D298 E006A278 0C080124 */ jal shim_create_effect_instance /* 36D29C E006A27C AFA20014 */ sw $v0, 0x14($sp) /* 36D2A0 E006A280 001220C0 */ sll $a0, $s2, 3 /* 36D2A4 E006A284 00922021 */ addu $a0, $a0, $s2 @@ -47,7 +47,7 @@ glabel fx_53_main /* 36D2AC E006A28C 00922021 */ addu $a0, $a0, $s2 /* 36D2B0 E006A290 00042080 */ sll $a0, $a0, 2 /* 36D2B4 E006A294 0040B02D */ daddu $s6, $v0, $zero -/* 36D2B8 E006A298 0C08012C */ jal func_E02004B0 +/* 36D2B8 E006A298 0C08012C */ jal shim_general_heap_malloc /* 36D2BC E006A29C AED20008 */ sw $s2, 8($s6) /* 36D2C0 E006A2A0 0040882D */ daddu $s1, $v0, $zero /* 36D2C4 E006A2A4 16200003 */ bnez $s1, .LE006A2B4 diff --git a/ver/us/asm/nonmatchings/effects/effect_54/func_E006C2A0.s b/ver/us/asm/nonmatchings/effects/effect_54/func_E006C2A0.s index 1e770284f4..3059ece0e7 100644 --- a/ver/us/asm/nonmatchings/effects/effect_54/func_E006C2A0.s +++ b/ver/us/asm/nonmatchings/effects/effect_54/func_E006C2A0.s @@ -29,19 +29,19 @@ glabel func_E006C2A0 /* 36E4C8 E006C2F8 24420001 */ addiu $v0, $v0, 1 /* 36E4CC E006C2FC 04A10010 */ bgez $a1, .LE006C340 /* 36E4D0 E006C300 AE020018 */ sw $v0, 0x18($s0) -/* 36E4D4 E006C304 0C080128 */ jal func_E02004A0 +/* 36E4D4 E006C304 0C080128 */ jal shim_remove_effect /* 36E4D8 E006C308 00000000 */ nop /* 36E4DC E006C30C 8E040048 */ lw $a0, 0x48($s0) /* 36E4E0 E006C310 10800004 */ beqz $a0, .LE006C324 /* 36E4E4 E006C314 00000000 */ nop -/* 36E4E8 E006C318 0C080128 */ jal func_E02004A0 +/* 36E4E8 E006C318 0C080128 */ jal shim_remove_effect /* 36E4EC E006C31C 00000000 */ nop /* 36E4F0 E006C320 AE000048 */ sw $zero, 0x48($s0) .LE006C324: /* 36E4F4 E006C324 8E040044 */ lw $a0, 0x44($s0) /* 36E4F8 E006C328 10800096 */ beqz $a0, .LE006C584 /* 36E4FC E006C32C 00000000 */ nop -/* 36E500 E006C330 0C080128 */ jal func_E02004A0 +/* 36E500 E006C330 0C080128 */ jal shim_remove_effect /* 36E504 E006C334 00000000 */ nop /* 36E508 E006C338 0801B161 */ j .LE006C584 /* 36E50C E006C33C AE000044 */ sw $zero, 0x44($s0) @@ -53,7 +53,7 @@ glabel func_E006C2A0 /* 36E520 E006C350 2A220012 */ slti $v0, $s1, 0x12 /* 36E524 E006C354 14400005 */ bnez $v0, .LE006C36C /* 36E528 E006C358 2A420003 */ slti $v0, $s2, 3 -/* 36E52C E006C35C 0C080128 */ jal func_E02004A0 +/* 36E52C E006C35C 0C080128 */ jal shim_remove_effect /* 36E530 E006C360 00000000 */ nop /* 36E534 E006C364 AE000044 */ sw $zero, 0x44($s0) .LE006C368: diff --git a/ver/us/asm/nonmatchings/effects/effect_54/func_E006C5A0.s b/ver/us/asm/nonmatchings/effects/effect_54/func_E006C5A0.s index 690124c727..ddf0d9a032 100644 --- a/ver/us/asm/nonmatchings/effects/effect_54/func_E006C5A0.s +++ b/ver/us/asm/nonmatchings/effects/effect_54/func_E006C5A0.s @@ -12,7 +12,7 @@ glabel func_E006C5A0 /* 36E78C E006C5BC AFA40018 */ sw $a0, 0x18($sp) /* 36E790 E006C5C0 27A40010 */ addiu $a0, $sp, 0x10 /* 36E794 E006C5C4 AFBF0020 */ sw $ra, 0x20($sp) -/* 36E798 E006C5C8 0C080120 */ jal func_E0200480 +/* 36E798 E006C5C8 0C080120 */ jal shim_queue_render_task /* 36E79C E006C5CC AFA20010 */ sw $v0, 0x10($sp) /* 36E7A0 E006C5D0 8C430000 */ lw $v1, ($v0) /* 36E7A4 E006C5D4 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_54/func_E006C5E8.s b/ver/us/asm/nonmatchings/effects/effect_54/func_E006C5E8.s index abf4cea93a..cf8126c7be 100644 --- a/ver/us/asm/nonmatchings/effects/effect_54/func_E006C5E8.s +++ b/ver/us/asm/nonmatchings/effects/effect_54/func_E006C5E8.s @@ -115,7 +115,7 @@ glabel func_E006C5E8 /* 36E96C E006C79C 36521630 */ ori $s2, $s2, 0x1630 /* 36E970 E006C7A0 E7A80010 */ swc1 $f8, 0x10($sp) /* 36E974 E006C7A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 36E978 E006C7A8 0C080160 */ jal func_E0200580 +/* 36E978 E006C7A8 0C080160 */ jal shim_guPerspectiveF /* 36E97C E006C7AC E7A40018 */ swc1 $f4, 0x18($sp) /* 36E980 E006C7B0 27A40020 */ addiu $a0, $sp, 0x20 /* 36E984 E006C7B4 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -126,7 +126,7 @@ glabel func_E006C5E8 /* 36E998 E006C7C8 8E220000 */ lw $v0, ($s1) /* 36E99C E006C7CC 00052980 */ sll $a1, $a1, 6 /* 36E9A0 E006C7D0 00B22821 */ addu $a1, $a1, $s2 -/* 36E9A4 E006C7D4 0C080118 */ jal func_E0200460 +/* 36E9A4 E006C7D4 0C080118 */ jal shim_guMtxF2L /* 36E9A8 E006C7D8 00452821 */ addu $a1, $v0, $a1 /* 36E9AC E006C7DC 3C02DA38 */ lui $v0, 0xda38 /* 36E9B0 E006C7E0 34420007 */ ori $v0, $v0, 7 @@ -147,14 +147,14 @@ glabel func_E006C5E8 /* 36E9EC E006C81C 8E660008 */ lw $a2, 8($s3) /* 36E9F0 E006C820 25290001 */ addiu $t1, $t1, 1 /* 36E9F4 E006C824 AE880000 */ sw $t0, ($s4) -/* 36E9F8 E006C828 0C080108 */ jal func_E0200420 +/* 36E9F8 E006C828 0C080108 */ jal shim_guTranslateF /* 36E9FC E006C82C A6090000 */ sh $t1, ($s0) /* 36EA00 E006C830 27A40020 */ addiu $a0, $sp, 0x20 /* 36EA04 E006C834 96050000 */ lhu $a1, ($s0) /* 36EA08 E006C838 8E220000 */ lw $v0, ($s1) /* 36EA0C E006C83C 00052980 */ sll $a1, $a1, 6 /* 36EA10 E006C840 00B22821 */ addu $a1, $a1, $s2 -/* 36EA14 E006C844 0C080118 */ jal func_E0200460 +/* 36EA14 E006C844 0C080118 */ jal shim_guMtxF2L /* 36EA18 E006C848 00452821 */ addu $a1, $v0, $a1 /* 36EA1C E006C84C 3C03DA38 */ lui $v1, 0xda38 /* 36EA20 E006C850 34630002 */ ori $v1, $v1, 2 @@ -186,7 +186,7 @@ glabel func_E006C5E8 /* 36EA80 E006C8B0 8E650004 */ lw $a1, 4($s3) /* 36EA84 E006C8B4 8E660008 */ lw $a2, 8($s3) /* 36EA88 E006C8B8 8E67000C */ lw $a3, 0xc($s3) -/* 36EA8C E006C8BC 0C080108 */ jal func_E0200420 +/* 36EA8C E006C8BC 0C080108 */ jal shim_guTranslateF /* 36EA90 E006C8C0 36521630 */ ori $s2, $s2, 0x1630 /* 36EA94 E006C8C4 27B00060 */ addiu $s0, $sp, 0x60 /* 36EA98 E006C8C8 4480A000 */ mtc1 $zero, $f20 @@ -209,20 +209,20 @@ glabel func_E006C5E8 /* 36EADC E006C90C 46000007 */ neg.s $f0, $f0 /* 36EAE0 E006C910 44050000 */ mfc1 $a1, $f0 /* 36EAE4 E006C914 0200202D */ daddu $a0, $s0, $zero -/* 36EAE8 E006C918 0C080104 */ jal func_E0200410 +/* 36EAE8 E006C918 0C080104 */ jal shim_guRotateF /* 36EAEC E006C91C E7B40010 */ swc1 $f20, 0x10($sp) /* 36EAF0 E006C920 0200202D */ daddu $a0, $s0, $zero /* 36EAF4 E006C924 27A50020 */ addiu $a1, $sp, 0x20 -/* 36EAF8 E006C928 0C080114 */ jal func_E0200450 +/* 36EAF8 E006C928 0C080114 */ jal shim_guMtxCatF /* 36EAFC E006C92C 00A0302D */ daddu $a2, $a1, $zero /* 36EB00 E006C930 0200202D */ daddu $a0, $s0, $zero /* 36EB04 E006C934 4405A000 */ mfc1 $a1, $f20 /* 36EB08 E006C938 4407B000 */ mfc1 $a3, $f22 -/* 36EB0C E006C93C 0C080108 */ jal func_E0200420 +/* 36EB0C E006C93C 0C080108 */ jal shim_guTranslateF /* 36EB10 E006C940 00A0302D */ daddu $a2, $a1, $zero /* 36EB14 E006C944 0200202D */ daddu $a0, $s0, $zero /* 36EB18 E006C948 27A50020 */ addiu $a1, $sp, 0x20 -/* 36EB1C E006C94C 0C080114 */ jal func_E0200450 +/* 36EB1C E006C94C 0C080114 */ jal shim_guMtxCatF /* 36EB20 E006C950 00A0302D */ daddu $a2, $a1, $zero /* 36EB24 E006C954 27A40020 */ addiu $a0, $sp, 0x20 /* 36EB28 E006C958 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -233,7 +233,7 @@ glabel func_E006C5E8 /* 36EB3C E006C96C 8E220000 */ lw $v0, ($s1) /* 36EB40 E006C970 00052980 */ sll $a1, $a1, 6 /* 36EB44 E006C974 00B22821 */ addu $a1, $a1, $s2 -/* 36EB48 E006C978 0C080118 */ jal func_E0200460 +/* 36EB48 E006C978 0C080118 */ jal shim_guMtxF2L /* 36EB4C E006C97C 00452821 */ addu $a1, $v0, $a1 /* 36EB50 E006C980 3C03DA38 */ lui $v1, 0xda38 /* 36EB54 E006C984 3C05800A */ lui $a1, %hi(gMasterGfxPos) diff --git a/ver/us/asm/nonmatchings/effects/effect_54/fx_54_main.s b/ver/us/asm/nonmatchings/effects/effect_54/fx_54_main.s index 5b19e97c7a..8dc3bfe7fa 100644 --- a/ver/us/asm/nonmatchings/effects/effect_54/fx_54_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_54/fx_54_main.s @@ -30,12 +30,12 @@ glabel fx_54_main /* 36E234 E006C064 F7B40048 */ sdc1 $f20, 0x48($sp) /* 36E238 E006C068 AFA00018 */ sw $zero, 0x18($sp) /* 36E23C E006C06C AFA0002C */ sw $zero, 0x2c($sp) -/* 36E240 E006C070 0C080124 */ jal func_E0200490 +/* 36E240 E006C070 0C080124 */ jal shim_create_effect_instance /* 36E244 E006C074 AFA2001C */ sw $v0, 0x1c($sp) /* 36E248 E006C078 2404004C */ addiu $a0, $zero, 0x4c /* 36E24C E006C07C 24030001 */ addiu $v1, $zero, 1 /* 36E250 E006C080 0040982D */ daddu $s3, $v0, $zero -/* 36E254 E006C084 0C08012C */ jal func_E02004B0 +/* 36E254 E006C084 0C08012C */ jal shim_general_heap_malloc /* 36E258 E006C088 AE630008 */ sw $v1, 8($s3) /* 36E25C E006C08C 0040802D */ daddu $s0, $v0, $zero /* 36E260 E006C090 16000003 */ bnez $s0, .LE006C0A0 @@ -87,7 +87,7 @@ glabel fx_54_main /* 36E308 E006C138 24020001 */ addiu $v0, $zero, 1 /* 36E30C E006C13C 16820019 */ bne $s4, $v0, .LE006C1A4 /* 36E310 E006C140 00000000 */ nop -/* 36E314 E006C144 0C080150 */ jal func_E0200540 +/* 36E314 E006C144 0C080150 */ jal shim_load_effect /* 36E318 E006C148 24040047 */ addiu $a0, $zero, 0x47 /* 36E31C E006C14C 0000202D */ daddu $a0, $zero, $zero /* 36E320 E006C150 3C05C2EC */ lui $a1, 0xc2ec @@ -100,7 +100,7 @@ glabel fx_54_main /* 36E33C E006C16C 0C023800 */ jal fx_71_main /* 36E340 E006C170 E7B40010 */ swc1 $f20, 0x10($sp) /* 36E344 E006C174 2404003C */ addiu $a0, $zero, 0x3c -/* 36E348 E006C178 0C080150 */ jal func_E0200540 +/* 36E348 E006C178 0C080150 */ jal shim_load_effect /* 36E34C E006C17C AE020044 */ sw $v0, 0x44($s0) /* 36E350 E006C180 3C05C2F0 */ lui $a1, 0xc2f0 /* 36E354 E006C184 3C06433D */ lui $a2, 0x433d @@ -112,7 +112,7 @@ glabel fx_54_main /* 36E36C E006C19C 0801B087 */ j .LE006C21C /* 36E370 E006C1A0 2A820003 */ slti $v0, $s4, 3 .LE006C1A4: -/* 36E374 E006C1A4 0C080150 */ jal func_E0200540 +/* 36E374 E006C1A4 0C080150 */ jal shim_load_effect /* 36E378 E006C1A8 24040057 */ addiu $a0, $zero, 0x57 /* 36E37C E006C1AC 3C05C2F0 */ lui $a1, 0xc2f0 /* 36E380 E006C1B0 3C06433D */ lui $a2, 0x433d @@ -146,7 +146,7 @@ glabel fx_54_main .LE006C21C: /* 36E3EC E006C21C 14400012 */ bnez $v0, .LE006C268 /* 36E3F0 E006C220 0260102D */ daddu $v0, $s3, $zero -/* 36E3F4 E006C224 0C080150 */ jal func_E0200540 +/* 36E3F4 E006C224 0C080150 */ jal shim_load_effect /* 36E3F8 E006C228 2404004A */ addiu $a0, $zero, 0x4a /* 36E3FC E006C22C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 36E400 E006C230 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) diff --git a/ver/us/asm/nonmatchings/effects/effect_55/func_E006E35C.s b/ver/us/asm/nonmatchings/effects/effect_55/func_E006E35C.s index 747969ea6d..28adb6021e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_55/func_E006E35C.s +++ b/ver/us/asm/nonmatchings/effects/effect_55/func_E006E35C.s @@ -26,7 +26,7 @@ glabel func_E006E35C /* 372B40 E006E3B0 46020003 */ div.s $f0, $f0, $f2 /* 372B44 E006E3B4 04410005 */ bgez $v0, .LE006E3CC /* 372B48 E006E3B8 E600005C */ swc1 $f0, 0x5c($s0) -/* 372B4C E006E3BC 0C080128 */ jal func_E02004A0 +/* 372B4C E006E3BC 0C080128 */ jal shim_remove_effect /* 372B50 E006E3C0 00000000 */ nop /* 372B54 E006E3C4 0801B9B3 */ j .LE006E6CC /* 372B58 E006E3C8 00000000 */ nop @@ -113,7 +113,7 @@ glabel func_E006E35C /* 372C90 E006E500 8E020004 */ lw $v0, 4($s0) /* 372C94 E006E504 18400031 */ blez $v0, .LE006E5CC /* 372C98 E006E508 2A22000A */ slti $v0, $s1, 0xa -/* 372C9C E006E50C 0C080150 */ jal func_E0200540 +/* 372C9C E006E50C 0C080150 */ jal shim_load_effect /* 372CA0 E006E510 24040037 */ addiu $a0, $zero, 0x37 /* 372CA4 E006E514 C6000024 */ lwc1 $f0, 0x24($s0) /* 372CA8 E006E518 E7A00010 */ swc1 $f0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_55/func_E006E6E4.s b/ver/us/asm/nonmatchings/effects/effect_55/func_E006E6E4.s index 9d2fd0e4e6..e5fddbbf61 100644 --- a/ver/us/asm/nonmatchings/effects/effect_55/func_E006E6E4.s +++ b/ver/us/asm/nonmatchings/effects/effect_55/func_E006E6E4.s @@ -28,7 +28,7 @@ glabel func_E006E6E4 /* 372ECC E006E73C AFA00014 */ sw $zero, 0x14($sp) /* 372ED0 E006E740 2402002D */ addiu $v0, $zero, 0x2d .LE006E744: -/* 372ED4 E006E744 0C080120 */ jal func_E0200480 +/* 372ED4 E006E744 0C080120 */ jal shim_queue_render_task /* 372ED8 E006E748 AC820000 */ sw $v0, ($a0) /* 372EDC E006E74C 8C430000 */ lw $v1, ($v0) /* 372EE0 E006E750 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_55/func_E006E764.s b/ver/us/asm/nonmatchings/effects/effect_55/func_E006E764.s index fdcfd9791e..0ce84e9d61 100644 --- a/ver/us/asm/nonmatchings/effects/effect_55/func_E006E764.s +++ b/ver/us/asm/nonmatchings/effects/effect_55/func_E006E764.s @@ -65,7 +65,7 @@ glabel func_E006E764 /* 372FE4 E006E854 8E850018 */ lw $a1, 0x18($s4) /* 372FE8 E006E858 8E86001C */ lw $a2, 0x1c($s4) /* 372FEC E006E85C 8E870020 */ lw $a3, 0x20($s4) -/* 372FF0 E006E860 0C080108 */ jal func_E0200420 +/* 372FF0 E006E860 0C080108 */ jal shim_guTranslateF /* 372FF4 E006E864 36521630 */ ori $s2, $s2, 0x1630 /* 372FF8 E006E868 27B00058 */ addiu $s0, $sp, 0x58 /* 372FFC E006E86C 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -86,11 +86,11 @@ glabel func_E006E764 /* 373038 E006E8A8 46000007 */ neg.s $f0, $f0 /* 37303C E006E8AC 44050000 */ mfc1 $a1, $f0 /* 373040 E006E8B0 0200202D */ daddu $a0, $s0, $zero -/* 373044 E006E8B4 0C080104 */ jal func_E0200410 +/* 373044 E006E8B4 0C080104 */ jal shim_guRotateF /* 373048 E006E8B8 AFA60010 */ sw $a2, 0x10($sp) /* 37304C E006E8BC 0200202D */ daddu $a0, $s0, $zero /* 373050 E006E8C0 27A50018 */ addiu $a1, $sp, 0x18 -/* 373054 E006E8C4 0C080114 */ jal func_E0200450 +/* 373054 E006E8C4 0C080114 */ jal shim_guMtxCatF /* 373058 E006E8C8 00A0302D */ daddu $a2, $a1, $zero /* 37305C E006E8CC 27A40018 */ addiu $a0, $sp, 0x18 /* 373060 E006E8D0 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -101,7 +101,7 @@ glabel func_E006E764 /* 373074 E006E8E4 8E220000 */ lw $v0, ($s1) /* 373078 E006E8E8 00052980 */ sll $a1, $a1, 6 /* 37307C E006E8EC 00B22821 */ addu $a1, $a1, $s2 -/* 373080 E006E8F0 0C080118 */ jal func_E0200460 +/* 373080 E006E8F0 0C080118 */ jal shim_guMtxF2L /* 373084 E006E8F4 00452821 */ addu $a1, $v0, $a1 /* 373088 E006E8F8 3C03DA38 */ lui $v1, 0xda38 /* 37308C E006E8FC 34630002 */ ori $v1, $v1, 2 @@ -210,7 +210,7 @@ glabel func_E006E764 /* 373224 E006EA94 8E860010 */ lw $a2, 0x10($s4) /* 373228 E006EA98 8E870014 */ lw $a3, 0x14($s4) /* 37322C E006EA9C 4480A000 */ mtc1 $zero, $f20 -/* 373230 E006EAA0 0C080108 */ jal func_E0200420 +/* 373230 E006EAA0 0C080108 */ jal shim_guTranslateF /* 373234 E006EAA4 36731630 */ ori $s3, $s3, 0x1630 /* 373238 E006EAA8 27B00058 */ addiu $s0, $sp, 0x58 /* 37323C E006EAAC 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -230,20 +230,20 @@ glabel func_E006E764 /* 373274 E006EAE4 46000007 */ neg.s $f0, $f0 /* 373278 E006EAE8 44050000 */ mfc1 $a1, $f0 /* 37327C E006EAEC 0200202D */ daddu $a0, $s0, $zero -/* 373280 E006EAF0 0C080104 */ jal func_E0200410 +/* 373280 E006EAF0 0C080104 */ jal shim_guRotateF /* 373284 E006EAF4 E7B40010 */ swc1 $f20, 0x10($sp) /* 373288 E006EAF8 0200202D */ daddu $a0, $s0, $zero /* 37328C E006EAFC 27A50018 */ addiu $a1, $sp, 0x18 -/* 373290 E006EB00 0C080114 */ jal func_E0200450 +/* 373290 E006EB00 0C080114 */ jal shim_guMtxCatF /* 373294 E006EB04 00A0302D */ daddu $a2, $a1, $zero /* 373298 E006EB08 0200202D */ daddu $a0, $s0, $zero /* 37329C E006EB0C 8E850038 */ lw $a1, 0x38($s4) /* 3732A0 E006EB10 4407A000 */ mfc1 $a3, $f20 -/* 3732A4 E006EB14 0C080110 */ jal func_E0200440 +/* 3732A4 E006EB14 0C080110 */ jal shim_guScaleF /* 3732A8 E006EB18 00A0302D */ daddu $a2, $a1, $zero /* 3732AC E006EB1C 0200202D */ daddu $a0, $s0, $zero /* 3732B0 E006EB20 27A50018 */ addiu $a1, $sp, 0x18 -/* 3732B4 E006EB24 0C080114 */ jal func_E0200450 +/* 3732B4 E006EB24 0C080114 */ jal shim_guMtxCatF /* 3732B8 E006EB28 00A0302D */ daddu $a2, $a1, $zero /* 3732BC E006EB2C 27A40018 */ addiu $a0, $sp, 0x18 /* 3732C0 E006EB30 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -254,7 +254,7 @@ glabel func_E006E764 /* 3732D4 E006EB44 8E220000 */ lw $v0, ($s1) /* 3732D8 E006EB48 00052980 */ sll $a1, $a1, 6 /* 3732DC E006EB4C 00B32821 */ addu $a1, $a1, $s3 -/* 3732E0 E006EB50 0C080118 */ jal func_E0200460 +/* 3732E0 E006EB50 0C080118 */ jal shim_guMtxF2L /* 3732E4 E006EB54 00452821 */ addu $a1, $v0, $a1 /* 3732E8 E006EB58 3C06D838 */ lui $a2, 0xd838 /* 3732EC E006EB5C 8EA40000 */ lw $a0, ($s5) diff --git a/ver/us/asm/nonmatchings/effects/effect_55/fx_55_main.s b/ver/us/asm/nonmatchings/effects/effect_55/fx_55_main.s index 14d18a137b..62e384d730 100644 --- a/ver/us/asm/nonmatchings/effects/effect_55/fx_55_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_55/fx_55_main.s @@ -37,12 +37,12 @@ glabel fx_55_main /* 372810 E006E080 AFB00028 */ sw $s0, 0x28($sp) /* 372814 E006E084 AFA00010 */ sw $zero, 0x10($sp) /* 372818 E006E088 AFA00024 */ sw $zero, 0x24($sp) -/* 37281C E006E08C 0C080124 */ jal func_E0200490 +/* 37281C E006E08C 0C080124 */ jal shim_create_effect_instance /* 372820 E006E090 AFA20014 */ sw $v0, 0x14($sp) /* 372824 E006E094 2404007C */ addiu $a0, $zero, 0x7c /* 372828 E006E098 24030001 */ addiu $v1, $zero, 1 /* 37282C E006E09C 0040902D */ daddu $s2, $v0, $zero -/* 372830 E006E0A0 0C08012C */ jal func_E02004B0 +/* 372830 E006E0A0 0C08012C */ jal shim_general_heap_malloc /* 372834 E006E0A4 AE430008 */ sw $v1, 8($s2) /* 372838 E006E0A8 0040802D */ daddu $s0, $v0, $zero /* 37283C E006E0AC 16000003 */ bnez $s0, .LE006E0BC diff --git a/ver/us/asm/nonmatchings/effects/effect_56/func_E00701F4.s b/ver/us/asm/nonmatchings/effects/effect_56/func_E00701F4.s index 9d5b0b7286..0142c6c27b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_56/func_E00701F4.s +++ b/ver/us/asm/nonmatchings/effects/effect_56/func_E00701F4.s @@ -38,7 +38,7 @@ glabel func_E00701F4 /* 374320 E0070270 24420001 */ addiu $v0, $v0, 1 /* 374324 E0070274 04810005 */ bgez $a0, .LE007028C /* 374328 E0070278 AC62003C */ sw $v0, 0x3c($v1) -/* 37432C E007027C 0C080128 */ jal func_E02004A0 +/* 37432C E007027C 0C080128 */ jal shim_remove_effect /* 374330 E0070280 0240202D */ daddu $a0, $s2, $zero /* 374334 E0070284 0801C1AE */ j .LE00706B8 /* 374338 E0070288 00000000 */ nop @@ -76,32 +76,32 @@ glabel func_E00701F4 /* 3743A8 E00702F8 26310001 */ addiu $s1, $s1, 1 /* 3743AC E00702FC 144000A6 */ bnez $v0, .LE0070598 /* 3743B0 E0070300 00000000 */ nop -/* 3743B4 E0070304 0C080138 */ jal func_E02004E0 +/* 3743B4 E0070304 0C080138 */ jal shim_rand_int /* 3743B8 E0070308 24040167 */ addiu $a0, $zero, 0x167 /* 3743BC E007030C 24040167 */ addiu $a0, $zero, 0x167 /* 3743C0 E0070310 4482C000 */ mtc1 $v0, $f24 /* 3743C4 E0070314 00000000 */ nop /* 3743C8 E0070318 4680C620 */ cvt.s.w $f24, $f24 -/* 3743CC E007031C 0C080138 */ jal func_E02004E0 +/* 3743CC E007031C 0C080138 */ jal shim_rand_int /* 3743D0 E0070320 E7B80018 */ swc1 $f24, 0x18($sp) /* 3743D4 E0070324 4482B000 */ mtc1 $v0, $f22 /* 3743D8 E0070328 00000000 */ nop /* 3743DC E007032C 1680003F */ bnez $s4, .LE007042C /* 3743E0 E0070330 4680B5A0 */ cvt.s.w $f22, $f22 -/* 3743E4 E0070334 0C080140 */ jal func_E0200500 +/* 3743E4 E0070334 0C080140 */ jal shim_sin_deg /* 3743E8 E0070338 C7AC0018 */ lwc1 $f12, 0x18($sp) /* 3743EC E007033C 4600B306 */ mov.s $f12, $f22 -/* 3743F0 E0070340 0C080144 */ jal func_E0200510 +/* 3743F0 E0070340 0C080144 */ jal shim_cos_deg /* 3743F4 E0070344 46000506 */ mov.s $f20, $f0 /* 3743F8 E0070348 4614D502 */ mul.s $f20, $f26, $f20 /* 3743FC E007034C 00000000 */ nop /* 374400 E0070350 4600A502 */ mul.s $f20, $f20, $f0 /* 374404 E0070354 00000000 */ nop /* 374408 E0070358 C7AC0018 */ lwc1 $f12, 0x18($sp) -/* 37440C E007035C 0C080144 */ jal func_E0200510 +/* 37440C E007035C 0C080144 */ jal shim_cos_deg /* 374410 E0070360 E614FFE4 */ swc1 $f20, -0x1c($s0) /* 374414 E0070364 4600B306 */ mov.s $f12, $f22 -/* 374418 E0070368 0C080144 */ jal func_E0200510 +/* 374418 E0070368 0C080144 */ jal shim_cos_deg /* 37441C E007036C 46000506 */ mov.s $f20, $f0 /* 374420 E0070370 C7B80010 */ lwc1 $f24, 0x10($sp) /* 374424 E0070374 4614C502 */ mul.s $f20, $f24, $f20 @@ -109,7 +109,7 @@ glabel func_E00701F4 /* 37442C E007037C 4600A502 */ mul.s $f20, $f20, $f0 /* 374430 E0070380 00000000 */ nop /* 374434 E0070384 4600B306 */ mov.s $f12, $f22 -/* 374438 E0070388 0C080140 */ jal func_E0200500 +/* 374438 E0070388 0C080140 */ jal shim_sin_deg /* 37443C E007038C E614FFE8 */ swc1 $f20, -0x18($s0) /* 374440 E0070390 C602FFE4 */ lwc1 $f2, -0x1c($s0) /* 374444 E0070394 3C01E007 */ lui $at, %hi(D_E0070D70) @@ -151,7 +151,7 @@ glabel func_E00701F4 /* 3744D4 E0070424 0801C154 */ j .LE0070550 /* 3744D8 E0070428 E6060004 */ swc1 $f6, 4($s0) .LE007042C: -/* 3744DC E007042C 0C080138 */ jal func_E02004E0 +/* 3744DC E007042C 0C080138 */ jal shim_rand_int /* 3744E0 E0070430 0260202D */ daddu $a0, $s3, $zero /* 3744E4 E0070434 3C013FE0 */ lui $at, 0x3fe0 /* 3744E8 E0070438 4481C800 */ mtc1 $at, $f25 @@ -167,7 +167,7 @@ glabel func_E00701F4 /* 374510 E0070460 4600C60D */ trunc.w.s $f24, $f24 /* 374514 E0070464 4404C000 */ mfc1 $a0, $f24 /* 374518 E0070468 46200020 */ cvt.s.d $f0, $f0 -/* 37451C E007046C 0C080138 */ jal func_E02004E0 +/* 37451C E007046C 0C080138 */ jal shim_rand_int /* 374520 E0070470 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 374524 E0070474 C7B80010 */ lwc1 $f24, 0x10($sp) /* 374528 E0070478 4600C0A1 */ cvt.d.s $f2, $f24 @@ -183,7 +183,7 @@ glabel func_E00701F4 /* 374550 E00704A0 46220001 */ sub.d $f0, $f0, $f2 /* 374554 E00704A4 0260202D */ daddu $a0, $s3, $zero /* 374558 E00704A8 46200020 */ cvt.s.d $f0, $f0 -/* 37455C E00704AC 0C080138 */ jal func_E02004E0 +/* 37455C E00704AC 0C080138 */ jal shim_rand_int /* 374560 E00704B0 E600FFE8 */ swc1 $f0, -0x18($s0) /* 374564 E00704B4 C602FFE4 */ lwc1 $f2, -0x1c($s0) /* 374568 E00704B8 3C01E007 */ lui $at, %hi(D_E0070D80) @@ -228,13 +228,13 @@ glabel func_E00701F4 /* 374600 E0070550 E6020008 */ swc1 $f2, 8($s0) /* 374604 E0070554 46200020 */ cvt.s.d $f0, $f0 /* 374608 E0070558 E600000C */ swc1 $f0, 0xc($s0) -/* 37460C E007055C 0C080138 */ jal func_E02004E0 +/* 37460C E007055C 0C080138 */ jal shim_rand_int /* 374610 E0070560 2404000F */ addiu $a0, $zero, 0xf /* 374614 E0070564 2404000F */ addiu $a0, $zero, 0xf /* 374618 E0070568 44820000 */ mtc1 $v0, $f0 /* 37461C E007056C 00000000 */ nop /* 374620 E0070570 46800020 */ cvt.s.w $f0, $f0 -/* 374624 E0070574 0C080138 */ jal func_E02004E0 +/* 374624 E0070574 0C080138 */ jal shim_rand_int /* 374628 E0070578 E6000044 */ swc1 $f0, 0x44($s0) /* 37462C E007057C 44820000 */ mtc1 $v0, $f0 /* 374630 E0070580 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_56/func_E00706F0.s b/ver/us/asm/nonmatchings/effects/effect_56/func_E00706F0.s index c2ec62b1cb..fa6223ed9c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_56/func_E00706F0.s +++ b/ver/us/asm/nonmatchings/effects/effect_56/func_E00706F0.s @@ -12,7 +12,7 @@ glabel func_E00706F0 /* 3747BC E007070C AFA40018 */ sw $a0, 0x18($sp) /* 3747C0 E0070710 27A40010 */ addiu $a0, $sp, 0x10 /* 3747C4 E0070714 AFBF0020 */ sw $ra, 0x20($sp) -/* 3747C8 E0070718 0C080120 */ jal func_E0200480 +/* 3747C8 E0070718 0C080120 */ jal shim_queue_render_task /* 3747CC E007071C AFA20010 */ sw $v0, 0x10($sp) /* 3747D0 E0070720 8C430000 */ lw $v1, ($v0) /* 3747D4 E0070724 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_56/func_E0070740.s b/ver/us/asm/nonmatchings/effects/effect_56/func_E0070740.s index 98cffbd592..f4ea1ddeaa 100644 --- a/ver/us/asm/nonmatchings/effects/effect_56/func_E0070740.s +++ b/ver/us/asm/nonmatchings/effects/effect_56/func_E0070740.s @@ -56,17 +56,17 @@ glabel func_E0070740 /* 3748BC E007080C 8E450004 */ lw $a1, 4($s2) /* 3748C0 E0070810 8E460008 */ lw $a2, 8($s2) /* 3748C4 E0070814 8E47000C */ lw $a3, 0xc($s2) -/* 3748C8 E0070818 0C080108 */ jal func_E0200420 +/* 3748C8 E0070818 0C080108 */ jal shim_guTranslateF /* 3748CC E007081C 46001503 */ div.s $f20, $f2, $f0 /* 3748D0 E0070820 27B00060 */ addiu $s0, $sp, 0x60 /* 3748D4 E0070824 8E450060 */ lw $a1, 0x60($s2) /* 3748D8 E0070828 0200202D */ daddu $a0, $s0, $zero /* 3748DC E007082C 00A0302D */ daddu $a2, $a1, $zero -/* 3748E0 E0070830 0C080110 */ jal func_E0200440 +/* 3748E0 E0070830 0C080110 */ jal shim_guScaleF /* 3748E4 E0070834 00A0382D */ daddu $a3, $a1, $zero /* 3748E8 E0070838 0200202D */ daddu $a0, $s0, $zero /* 3748EC E007083C 27A50020 */ addiu $a1, $sp, 0x20 -/* 3748F0 E0070840 0C080114 */ jal func_E0200450 +/* 3748F0 E0070840 0C080114 */ jal shim_guMtxCatF /* 3748F4 E0070844 00A0302D */ daddu $a2, $a1, $zero /* 3748F8 E0070848 27A40020 */ addiu $a0, $sp, 0x20 /* 3748FC E007084C 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -77,7 +77,7 @@ glabel func_E0070740 /* 374910 E0070860 8EC20000 */ lw $v0, ($s6) /* 374914 E0070864 00052980 */ sll $a1, $a1, 6 /* 374918 E0070868 00B12821 */ addu $a1, $a1, $s1 -/* 37491C E007086C 0C080118 */ jal func_E0200460 +/* 37491C E007086C 0C080118 */ jal shim_guMtxF2L /* 374920 E0070870 00452821 */ addu $a1, $v0, $a1 /* 374924 E0070874 3C03DA38 */ lui $v1, 0xda38 /* 374928 E0070878 34630002 */ ori $v1, $v1, 2 @@ -161,14 +161,14 @@ glabel func_E0070740 /* 374A5C E00709AC C600FFC0 */ lwc1 $f0, -0x40($s0) /* 374A60 E00709B0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 374A64 E00709B4 8E07FFE8 */ lw $a3, -0x18($s0) -/* 374A68 E00709B8 0C080180 */ jal func_E0200600 +/* 374A68 E00709B8 0C080180 */ jal shim_guPositionF /* 374A6C E00709BC 27A40020 */ addiu $a0, $sp, 0x20 /* 374A70 E00709C0 27A40020 */ addiu $a0, $sp, 0x20 /* 374A74 E00709C4 96E50000 */ lhu $a1, ($s7) /* 374A78 E00709C8 8FC20000 */ lw $v0, ($fp) /* 374A7C E00709CC 00052980 */ sll $a1, $a1, 6 /* 374A80 E00709D0 00B62821 */ addu $a1, $a1, $s6 -/* 374A84 E00709D4 0C080118 */ jal func_E0200460 +/* 374A84 E00709D4 0C080118 */ jal shim_guMtxF2L /* 374A88 E00709D8 00452821 */ addu $a1, $v0, $a1 /* 374A8C E00709DC 8E240000 */ lw $a0, ($s1) /* 374A90 E00709E0 0080302D */ daddu $a2, $a0, $zero @@ -272,7 +272,7 @@ glabel func_E0070740 /* 374C08 E0070B58 AE020000 */ sw $v0, ($s0) /* 374C0C E0070B5C AC760000 */ sw $s6, ($v1) /* 374C10 E0070B60 AC740004 */ sw $s4, 4($v1) -/* 374C14 E0070B64 0C080104 */ jal func_E0200410 +/* 374C14 E0070B64 0C080104 */ jal shim_guRotateF /* 374C18 E0070B68 E7B80010 */ swc1 $f24, 0x10($sp) /* 374C1C E0070B6C 27A40020 */ addiu $a0, $sp, 0x20 /* 374C20 E0070B70 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -283,7 +283,7 @@ glabel func_E0070740 /* 374C34 E0070B84 8E620000 */ lw $v0, ($s3) /* 374C38 E0070B88 00052980 */ sll $a1, $a1, 6 /* 374C3C E0070B8C 00B52821 */ addu $a1, $a1, $s5 -/* 374C40 E0070B90 0C080118 */ jal func_E0200460 +/* 374C40 E0070B90 0C080118 */ jal shim_guMtxF2L /* 374C44 E0070B94 00452821 */ addu $a1, $v0, $a1 /* 374C48 E0070B98 27A40020 */ addiu $a0, $sp, 0x20 /* 374C4C E0070B9C 3C17DA38 */ lui $s7, 0xda38 @@ -313,14 +313,14 @@ glabel func_E0070740 /* 374CAC E0070BFC AE020000 */ sw $v0, ($s0) /* 374CB0 E0070C00 AD1E0008 */ sw $fp, 8($t0) /* 374CB4 E0070C04 AD12000C */ sw $s2, 0xc($t0) -/* 374CB8 E0070C08 0C080104 */ jal func_E0200410 +/* 374CB8 E0070C08 0C080104 */ jal shim_guRotateF /* 374CBC E0070C0C E7B80010 */ swc1 $f24, 0x10($sp) /* 374CC0 E0070C10 27A40020 */ addiu $a0, $sp, 0x20 /* 374CC4 E0070C14 96250000 */ lhu $a1, ($s1) /* 374CC8 E0070C18 8E620000 */ lw $v0, ($s3) /* 374CCC E0070C1C 00052980 */ sll $a1, $a1, 6 /* 374CD0 E0070C20 00B52821 */ addu $a1, $a1, $s5 -/* 374CD4 E0070C24 0C080118 */ jal func_E0200460 +/* 374CD4 E0070C24 0C080118 */ jal shim_guMtxF2L /* 374CD8 E0070C28 00452821 */ addu $a1, $v0, $a1 /* 374CDC E0070C2C 8E040000 */ lw $a0, ($s0) /* 374CE0 E0070C30 96220000 */ lhu $v0, ($s1) diff --git a/ver/us/asm/nonmatchings/effects/effect_56/fx_56_main.s b/ver/us/asm/nonmatchings/effects/effect_56/fx_56_main.s index 4f09ce3275..bb7899c57d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_56/fx_56_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_56/fx_56_main.s @@ -29,12 +29,12 @@ glabel fx_56_main /* 374110 E0070060 AFB00028 */ sw $s0, 0x28($sp) /* 374114 E0070064 AFA00010 */ sw $zero, 0x10($sp) /* 374118 E0070068 AFA00024 */ sw $zero, 0x24($sp) -/* 37411C E007006C 0C080124 */ jal func_E0200490 +/* 37411C E007006C 0C080124 */ jal shim_create_effect_instance /* 374120 E0070070 AFA20014 */ sw $v0, 0x14($sp) /* 374124 E0070074 240419BC */ addiu $a0, $zero, 0x19bc /* 374128 E0070078 2411003D */ addiu $s1, $zero, 0x3d /* 37412C E007007C 0040802D */ daddu $s0, $v0, $zero -/* 374130 E0070080 0C08012C */ jal func_E02004B0 +/* 374130 E0070080 0C08012C */ jal shim_general_heap_malloc /* 374134 E0070084 AE110008 */ sw $s1, 8($s0) /* 374138 E0070088 0040182D */ daddu $v1, $v0, $zero /* 37413C E007008C 14600003 */ bnez $v1, .LE007009C diff --git a/ver/us/asm/nonmatchings/effects/effect_57/func_E0072150.s b/ver/us/asm/nonmatchings/effects/effect_57/func_E0072150.s index 3222993b15..85b19dd161 100644 --- a/ver/us/asm/nonmatchings/effects/effect_57/func_E0072150.s +++ b/ver/us/asm/nonmatchings/effects/effect_57/func_E0072150.s @@ -17,7 +17,7 @@ glabel func_E0072150 /* 374FD0 E0072180 24510001 */ addiu $s1, $v0, 1 /* 374FD4 E0072184 06410005 */ bgez $s2, .LE007219C /* 374FD8 E0072188 AE11002C */ sw $s1, 0x2c($s0) -/* 374FDC E007218C 0C080128 */ jal func_E02004A0 +/* 374FDC E007218C 0C080128 */ jal shim_remove_effect /* 374FE0 E0072190 00000000 */ nop /* 374FE4 E0072194 0801C8DC */ j .LE0072370 /* 374FE8 E0072198 00000000 */ nop @@ -31,11 +31,11 @@ glabel func_E0072150 /* 375004 E00721B4 4482A000 */ mtc1 $v0, $f20 /* 375008 E00721B8 00000000 */ nop /* 37500C E00721BC 4680A520 */ cvt.s.w $f20, $f20 -/* 375010 E00721C0 0C080140 */ jal func_E0200500 +/* 375010 E00721C0 0C080140 */ jal shim_sin_deg /* 375014 E00721C4 4600A306 */ mov.s $f12, $f20 -/* 375018 E00721C8 0C080144 */ jal func_E0200510 +/* 375018 E00721C8 0C080144 */ jal shim_cos_deg /* 37501C E00721CC 4600A306 */ mov.s $f12, $f20 -/* 375020 E00721D0 0C080150 */ jal func_E0200540 +/* 375020 E00721D0 0C080150 */ jal shim_load_effect /* 375024 E00721D4 2404003A */ addiu $a0, $zero, 0x3a /* 375028 E00721D8 001110C0 */ sll $v0, $s1, 3 /* 37502C E00721DC 44820000 */ mtc1 $v0, $f0 diff --git a/ver/us/asm/nonmatchings/effects/effect_57/func_E007238C.s b/ver/us/asm/nonmatchings/effects/effect_57/func_E007238C.s index 859d62a299..fbb02f4f89 100644 --- a/ver/us/asm/nonmatchings/effects/effect_57/func_E007238C.s +++ b/ver/us/asm/nonmatchings/effects/effect_57/func_E007238C.s @@ -12,7 +12,7 @@ glabel func_E007238C /* 3751F8 E00723A8 AFA40018 */ sw $a0, 0x18($sp) /* 3751FC E00723AC 27A40010 */ addiu $a0, $sp, 0x10 /* 375200 E00723B0 AFBF0020 */ sw $ra, 0x20($sp) -/* 375204 E00723B4 0C080120 */ jal func_E0200480 +/* 375204 E00723B4 0C080120 */ jal shim_queue_render_task /* 375208 E00723B8 AFA20010 */ sw $v0, 0x10($sp) /* 37520C E00723BC 8C430000 */ lw $v1, ($v0) /* 375210 E00723C0 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_57/func_E00723D4.s b/ver/us/asm/nonmatchings/effects/effect_57/func_E00723D4.s index 5290b0e34f..165ac9cbc8 100644 --- a/ver/us/asm/nonmatchings/effects/effect_57/func_E00723D4.s +++ b/ver/us/asm/nonmatchings/effects/effect_57/func_E00723D4.s @@ -120,17 +120,17 @@ glabel func_E00723D4 /* 3753F0 E00725A0 8E060008 */ lw $a2, 8($s0) /* 3753F4 E00725A4 8E07000C */ lw $a3, 0xc($s0) /* 3753F8 E00725A8 25080030 */ addiu $t0, $t0, 0x30 -/* 3753FC E00725AC 0C080108 */ jal func_E0200420 +/* 3753FC E00725AC 0C080108 */ jal shim_guTranslateF /* 375400 E00725B0 AE280000 */ sw $t0, ($s1) /* 375404 E00725B4 8E05001C */ lw $a1, 0x1c($s0) /* 375408 E00725B8 27B00050 */ addiu $s0, $sp, 0x50 /* 37540C E00725BC 0200202D */ daddu $a0, $s0, $zero /* 375410 E00725C0 00A0302D */ daddu $a2, $a1, $zero -/* 375414 E00725C4 0C080110 */ jal func_E0200440 +/* 375414 E00725C4 0C080110 */ jal shim_guScaleF /* 375418 E00725C8 00A0382D */ daddu $a3, $a1, $zero /* 37541C E00725CC 0200202D */ daddu $a0, $s0, $zero /* 375420 E00725D0 27A50010 */ addiu $a1, $sp, 0x10 -/* 375424 E00725D4 0C080114 */ jal func_E0200450 +/* 375424 E00725D4 0C080114 */ jal shim_guMtxCatF /* 375428 E00725D8 00A0302D */ daddu $a2, $a1, $zero /* 37542C E00725DC 27A40010 */ addiu $a0, $sp, 0x10 /* 375430 E00725E0 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -141,7 +141,7 @@ glabel func_E00723D4 /* 375444 E00725F4 8E420000 */ lw $v0, ($s2) /* 375448 E00725F8 00052980 */ sll $a1, $a1, 6 /* 37544C E00725FC 00B32821 */ addu $a1, $a1, $s3 -/* 375450 E0072600 0C080118 */ jal func_E0200460 +/* 375450 E0072600 0C080118 */ jal shim_guMtxF2L /* 375454 E0072604 00452821 */ addu $a1, $v0, $a1 /* 375458 E0072608 3C06D838 */ lui $a2, 0xd838 /* 37545C E007260C 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/asm/nonmatchings/effects/effect_57/fx_57_main.s b/ver/us/asm/nonmatchings/effects/effect_57/fx_57_main.s index f45207d7a8..93219aceb9 100644 --- a/ver/us/asm/nonmatchings/effects/effect_57/fx_57_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_57/fx_57_main.s @@ -26,12 +26,12 @@ glabel fx_57_main /* 374EA4 E0072054 AFB00028 */ sw $s0, 0x28($sp) /* 374EA8 E0072058 AFA00010 */ sw $zero, 0x10($sp) /* 374EAC E007205C AFA00024 */ sw $zero, 0x24($sp) -/* 374EB0 E0072060 0C080124 */ jal func_E0200490 +/* 374EB0 E0072060 0C080124 */ jal shim_create_effect_instance /* 374EB4 E0072064 AFA20014 */ sw $v0, 0x14($sp) /* 374EB8 E0072068 24040A2C */ addiu $a0, $zero, 0xa2c /* 374EBC E007206C 2403001F */ addiu $v1, $zero, 0x1f /* 374EC0 E0072070 0040802D */ daddu $s0, $v0, $zero -/* 374EC4 E0072074 0C08012C */ jal func_E02004B0 +/* 374EC4 E0072074 0C08012C */ jal shim_general_heap_malloc /* 374EC8 E0072078 AE030008 */ sw $v1, 8($s0) /* 374ECC E007207C 0040202D */ daddu $a0, $v0, $zero /* 374ED0 E0072080 14800003 */ bnez $a0, .LE0072090 diff --git a/ver/us/asm/nonmatchings/effects/effect_58/func_E00741E8.s b/ver/us/asm/nonmatchings/effects/effect_58/func_E00741E8.s index d12ac5af24..e88d7b004a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_58/func_E00741E8.s +++ b/ver/us/asm/nonmatchings/effects/effect_58/func_E00741E8.s @@ -36,7 +36,7 @@ glabel func_E00741E8 /* 3766BC E007425C 24420001 */ addiu $v0, $v0, 1 /* 3766C0 E0074260 04810005 */ bgez $a0, .LE0074278 /* 3766C4 E0074264 AC62003C */ sw $v0, 0x3c($v1) -/* 3766C8 E0074268 0C080128 */ jal func_E02004A0 +/* 3766C8 E0074268 0C080128 */ jal shim_remove_effect /* 3766CC E007426C 0240202D */ daddu $a0, $s2, $zero /* 3766D0 E0074270 0801D159 */ j .LE0074564 /* 3766D4 E0074274 00000000 */ nop @@ -75,21 +75,21 @@ glabel func_E00741E8 /* 376748 E00742E8 26310001 */ addiu $s1, $s1, 1 /* 37674C E00742EC 14400055 */ bnez $v0, .LE0074444 /* 376750 E00742F0 00000000 */ nop -/* 376754 E00742F4 0C080138 */ jal func_E02004E0 +/* 376754 E00742F4 0C080138 */ jal shim_rand_int /* 376758 E00742F8 24040167 */ addiu $a0, $zero, 0x167 /* 37675C E00742FC 4482A000 */ mtc1 $v0, $f20 /* 376760 E0074300 00000000 */ nop /* 376764 E0074304 4680A520 */ cvt.s.w $f20, $f20 -/* 376768 E0074308 0C080138 */ jal func_E02004E0 +/* 376768 E0074308 0C080138 */ jal shim_rand_int /* 37676C E007430C 24040167 */ addiu $a0, $zero, 0x167 -/* 376770 E0074310 0C080140 */ jal func_E0200500 +/* 376770 E0074310 0C080140 */ jal shim_sin_deg /* 376774 E0074314 4600A306 */ mov.s $f12, $f20 /* 376778 E0074318 4600F002 */ mul.s $f0, $f30, $f0 /* 37677C E007431C 00000000 */ nop /* 376780 E0074320 C7BC0010 */ lwc1 $f28, 0x10($sp) /* 376784 E0074324 4600E70D */ trunc.w.s $f28, $f28 /* 376788 E0074328 4404E000 */ mfc1 $a0, $f28 -/* 37678C E007432C 0C080138 */ jal func_E02004E0 +/* 37678C E007432C 0C080138 */ jal shim_rand_int /* 376790 E0074330 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 376794 E0074334 C7BC0010 */ lwc1 $f28, 0x10($sp) /* 376798 E0074338 4600E0A1 */ cvt.d.s $f2, $f28 @@ -101,12 +101,12 @@ glabel func_E00741E8 /* 3767B0 E0074350 46220001 */ sub.d $f0, $f0, $f2 /* 3767B4 E0074354 4600A306 */ mov.s $f12, $f20 /* 3767B8 E0074358 46200020 */ cvt.s.d $f0, $f0 -/* 3767BC E007435C 0C080144 */ jal func_E0200510 +/* 3767BC E007435C 0C080144 */ jal shim_cos_deg /* 3767C0 E0074360 E600FFE8 */ swc1 $f0, -0x18($s0) /* 3767C4 E0074364 4600F002 */ mul.s $f0, $f30, $f0 /* 3767C8 E0074368 00000000 */ nop /* 3767CC E007436C 4600A306 */ mov.s $f12, $f20 -/* 3767D0 E0074370 0C080140 */ jal func_E0200500 +/* 3767D0 E0074370 0C080140 */ jal shim_sin_deg /* 3767D4 E0074374 E600FFEC */ swc1 $f0, -0x14($s0) /* 3767D8 E0074378 C602FFE8 */ lwc1 $f2, -0x18($s0) /* 3767DC E007437C 3C01E007 */ lui $at, %hi(D_E0074BF8) @@ -122,7 +122,7 @@ glabel func_E00741E8 /* 376804 E00743A4 4600A306 */ mov.s $f12, $f20 /* 376808 E00743A8 E600FFF8 */ swc1 $f0, -8($s0) /* 37680C E00743AC 462010A0 */ cvt.s.d $f2, $f2 -/* 376810 E00743B0 0C080144 */ jal func_E0200510 +/* 376810 E00743B0 0C080144 */ jal shim_cos_deg /* 376814 E00743B4 E602FFFC */ swc1 $f2, -4($s0) /* 376818 E00743B8 C604FFF8 */ lwc1 $f4, -8($s0) /* 37681C E00743BC 46002121 */ cvt.d.s $f4, $f4 @@ -144,13 +144,13 @@ glabel func_E00741E8 /* 37685C E00743FC E6040004 */ swc1 $f4, 4($s0) /* 376860 E0074400 E6020008 */ swc1 $f2, 8($s0) /* 376864 E0074404 46200020 */ cvt.s.d $f0, $f0 -/* 376868 E0074408 0C080138 */ jal func_E02004E0 +/* 376868 E0074408 0C080138 */ jal shim_rand_int /* 37686C E007440C E600000C */ swc1 $f0, 0xc($s0) /* 376870 E0074410 2404000F */ addiu $a0, $zero, 0xf /* 376874 E0074414 44820000 */ mtc1 $v0, $f0 /* 376878 E0074418 00000000 */ nop /* 37687C E007441C 46800020 */ cvt.s.w $f0, $f0 -/* 376880 E0074420 0C080138 */ jal func_E02004E0 +/* 376880 E0074420 0C080138 */ jal shim_rand_int /* 376884 E0074424 E6000044 */ swc1 $f0, 0x44($s0) /* 376888 E0074428 44820000 */ mtc1 $v0, $f0 /* 37688C E007442C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_58/func_E0074598.s b/ver/us/asm/nonmatchings/effects/effect_58/func_E0074598.s index 582bad4740..e449217f9f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_58/func_E0074598.s +++ b/ver/us/asm/nonmatchings/effects/effect_58/func_E0074598.s @@ -12,7 +12,7 @@ glabel func_E0074598 /* 376A14 E00745B4 AFA40018 */ sw $a0, 0x18($sp) /* 376A18 E00745B8 27A40010 */ addiu $a0, $sp, 0x10 /* 376A1C E00745BC AFBF0020 */ sw $ra, 0x20($sp) -/* 376A20 E00745C0 0C080120 */ jal func_E0200480 +/* 376A20 E00745C0 0C080120 */ jal shim_queue_render_task /* 376A24 E00745C4 AFA20010 */ sw $v0, 0x10($sp) /* 376A28 E00745C8 8C430000 */ lw $v1, ($v0) /* 376A2C E00745CC 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_58/func_E00745E0.s b/ver/us/asm/nonmatchings/effects/effect_58/func_E00745E0.s index a8f09dca5e..f29c50be0d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_58/func_E00745E0.s +++ b/ver/us/asm/nonmatchings/effects/effect_58/func_E00745E0.s @@ -56,17 +56,17 @@ glabel func_E00745E0 /* 376B0C E00746AC 8E450004 */ lw $a1, 4($s2) /* 376B10 E00746B0 8E460008 */ lw $a2, 8($s2) /* 376B14 E00746B4 8E47000C */ lw $a3, 0xc($s2) -/* 376B18 E00746B8 0C080108 */ jal func_E0200420 +/* 376B18 E00746B8 0C080108 */ jal shim_guTranslateF /* 376B1C E00746BC 46001503 */ div.s $f20, $f2, $f0 /* 376B20 E00746C0 27B00060 */ addiu $s0, $sp, 0x60 /* 376B24 E00746C4 8E450060 */ lw $a1, 0x60($s2) /* 376B28 E00746C8 0200202D */ daddu $a0, $s0, $zero /* 376B2C E00746CC 00A0302D */ daddu $a2, $a1, $zero -/* 376B30 E00746D0 0C080110 */ jal func_E0200440 +/* 376B30 E00746D0 0C080110 */ jal shim_guScaleF /* 376B34 E00746D4 00A0382D */ daddu $a3, $a1, $zero /* 376B38 E00746D8 0200202D */ daddu $a0, $s0, $zero /* 376B3C E00746DC 27A50020 */ addiu $a1, $sp, 0x20 -/* 376B40 E00746E0 0C080114 */ jal func_E0200450 +/* 376B40 E00746E0 0C080114 */ jal shim_guMtxCatF /* 376B44 E00746E4 00A0302D */ daddu $a2, $a1, $zero /* 376B48 E00746E8 27A40020 */ addiu $a0, $sp, 0x20 /* 376B4C E00746EC 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -77,7 +77,7 @@ glabel func_E00745E0 /* 376B60 E0074700 8EC20000 */ lw $v0, ($s6) /* 376B64 E0074704 00052980 */ sll $a1, $a1, 6 /* 376B68 E0074708 00B12821 */ addu $a1, $a1, $s1 -/* 376B6C E007470C 0C080118 */ jal func_E0200460 +/* 376B6C E007470C 0C080118 */ jal shim_guMtxF2L /* 376B70 E0074710 00452821 */ addu $a1, $v0, $a1 /* 376B74 E0074714 3C03DA38 */ lui $v1, 0xda38 /* 376B78 E0074718 34630002 */ ori $v1, $v1, 2 @@ -161,14 +161,14 @@ glabel func_E00745E0 /* 376CAC E007484C C600FFC0 */ lwc1 $f0, -0x40($s0) /* 376CB0 E0074850 E7A0001C */ swc1 $f0, 0x1c($sp) /* 376CB4 E0074854 8E07FFE8 */ lw $a3, -0x18($s0) -/* 376CB8 E0074858 0C080180 */ jal func_E0200600 +/* 376CB8 E0074858 0C080180 */ jal shim_guPositionF /* 376CBC E007485C 27A40020 */ addiu $a0, $sp, 0x20 /* 376CC0 E0074860 27A40020 */ addiu $a0, $sp, 0x20 /* 376CC4 E0074864 96E50000 */ lhu $a1, ($s7) /* 376CC8 E0074868 8FC20000 */ lw $v0, ($fp) /* 376CCC E007486C 00052980 */ sll $a1, $a1, 6 /* 376CD0 E0074870 00B62821 */ addu $a1, $a1, $s6 -/* 376CD4 E0074874 0C080118 */ jal func_E0200460 +/* 376CD4 E0074874 0C080118 */ jal shim_guMtxF2L /* 376CD8 E0074878 00452821 */ addu $a1, $v0, $a1 /* 376CDC E007487C 8E240000 */ lw $a0, ($s1) /* 376CE0 E0074880 0080302D */ daddu $a2, $a0, $zero @@ -268,7 +268,7 @@ glabel func_E00745E0 /* 376E48 E00749E8 AE020000 */ sw $v0, ($s0) /* 376E4C E00749EC AC760000 */ sw $s6, ($v1) /* 376E50 E00749F0 AC740004 */ sw $s4, 4($v1) -/* 376E54 E00749F4 0C080104 */ jal func_E0200410 +/* 376E54 E00749F4 0C080104 */ jal shim_guRotateF /* 376E58 E00749F8 E7B40010 */ swc1 $f20, 0x10($sp) /* 376E5C E00749FC 27A40020 */ addiu $a0, $sp, 0x20 /* 376E60 E0074A00 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -279,7 +279,7 @@ glabel func_E00745E0 /* 376E74 E0074A14 8E620000 */ lw $v0, ($s3) /* 376E78 E0074A18 00052980 */ sll $a1, $a1, 6 /* 376E7C E0074A1C 00B52821 */ addu $a1, $a1, $s5 -/* 376E80 E0074A20 0C080118 */ jal func_E0200460 +/* 376E80 E0074A20 0C080118 */ jal shim_guMtxF2L /* 376E84 E0074A24 00452821 */ addu $a1, $v0, $a1 /* 376E88 E0074A28 27A40020 */ addiu $a0, $sp, 0x20 /* 376E8C E0074A2C 3C17DA38 */ lui $s7, 0xda38 @@ -309,14 +309,14 @@ glabel func_E00745E0 /* 376EEC E0074A8C AE020000 */ sw $v0, ($s0) /* 376EF0 E0074A90 AD1E0008 */ sw $fp, 8($t0) /* 376EF4 E0074A94 AD12000C */ sw $s2, 0xc($t0) -/* 376EF8 E0074A98 0C080104 */ jal func_E0200410 +/* 376EF8 E0074A98 0C080104 */ jal shim_guRotateF /* 376EFC E0074A9C AFA60010 */ sw $a2, 0x10($sp) /* 376F00 E0074AA0 27A40020 */ addiu $a0, $sp, 0x20 /* 376F04 E0074AA4 96250000 */ lhu $a1, ($s1) /* 376F08 E0074AA8 8E620000 */ lw $v0, ($s3) /* 376F0C E0074AAC 00052980 */ sll $a1, $a1, 6 /* 376F10 E0074AB0 00B52821 */ addu $a1, $a1, $s5 -/* 376F14 E0074AB4 0C080118 */ jal func_E0200460 +/* 376F14 E0074AB4 0C080118 */ jal shim_guMtxF2L /* 376F18 E0074AB8 00452821 */ addu $a1, $v0, $a1 /* 376F1C E0074ABC 8E040000 */ lw $a0, ($s0) /* 376F20 E0074AC0 96220000 */ lhu $v0, ($s1) diff --git a/ver/us/asm/nonmatchings/effects/effect_58/fx_58_main.s b/ver/us/asm/nonmatchings/effects/effect_58/fx_58_main.s index 9a7dd9568a..f42aeb1baa 100644 --- a/ver/us/asm/nonmatchings/effects/effect_58/fx_58_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_58/fx_58_main.s @@ -31,7 +31,7 @@ glabel fx_58_main /* 3764C8 E0074068 AFA00010 */ sw $zero, 0x10($sp) /* 3764CC E007406C AFA00024 */ sw $zero, 0x24($sp) /* 3764D0 E0074070 AFA20014 */ sw $v0, 0x14($sp) -/* 3764D4 E0074074 0C080124 */ jal func_E0200490 +/* 3764D4 E0074074 0C080124 */ jal shim_create_effect_instance /* 3764D8 E0074078 26100001 */ addiu $s0, $s0, 1 /* 3764DC E007407C 001020C0 */ sll $a0, $s0, 3 /* 3764E0 E0074080 00902023 */ subu $a0, $a0, $s0 @@ -39,7 +39,7 @@ glabel fx_58_main /* 3764E8 E0074088 00902023 */ subu $a0, $a0, $s0 /* 3764EC E007408C 00042080 */ sll $a0, $a0, 2 /* 3764F0 E0074090 0040882D */ daddu $s1, $v0, $zero -/* 3764F4 E0074094 0C08012C */ jal func_E02004B0 +/* 3764F4 E0074094 0C08012C */ jal shim_general_heap_malloc /* 3764F8 E0074098 AE300008 */ sw $s0, 8($s1) /* 3764FC E007409C 0040202D */ daddu $a0, $v0, $zero /* 376500 E00740A0 14800003 */ bnez $a0, .LE00740B0 diff --git a/ver/us/asm/nonmatchings/effects/effect_59/func_E0076378.s b/ver/us/asm/nonmatchings/effects/effect_59/func_E0076378.s index 826f9cd9ae..8653a8208a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_59/func_E0076378.s +++ b/ver/us/asm/nonmatchings/effects/effect_59/func_E0076378.s @@ -33,7 +33,7 @@ glabel func_E0076378 /* 37744C E00763DC 8CA2002C */ lw $v0, 0x2c($a1) /* 377450 E00763E0 04410005 */ bgez $v0, .LE00763F8 /* 377454 E00763E4 0040382D */ daddu $a3, $v0, $zero -/* 377458 E00763E8 0C080128 */ jal func_E02004A0 +/* 377458 E00763E8 0C080128 */ jal shim_remove_effect /* 37745C E00763EC 00000000 */ nop /* 377460 E00763F0 0801D9FF */ j .LE00767FC /* 377464 E00763F4 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_59/func_E0076808.s b/ver/us/asm/nonmatchings/effects/effect_59/func_E0076808.s index 175e09902a..03f9b7538c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_59/func_E0076808.s +++ b/ver/us/asm/nonmatchings/effects/effect_59/func_E0076808.s @@ -11,7 +11,7 @@ glabel func_E0076808 /* 377890 E0076820 27A40010 */ addiu $a0, $sp, 0x10 /* 377894 E0076824 AFBF0020 */ sw $ra, 0x20($sp) /* 377898 E0076828 AFA00014 */ sw $zero, 0x14($sp) -/* 37789C E007682C 0C080120 */ jal func_E0200480 +/* 37789C E007682C 0C080120 */ jal shim_queue_render_task /* 3778A0 E0076830 AFA20010 */ sw $v0, 0x10($sp) /* 3778A4 E0076834 8C430000 */ lw $v1, ($v0) /* 3778A8 E0076838 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_59/func_E007685C.s b/ver/us/asm/nonmatchings/effects/effect_59/func_E007685C.s index 0f9451806c..116b9ae57e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_59/func_E007685C.s +++ b/ver/us/asm/nonmatchings/effects/effect_59/func_E007685C.s @@ -41,7 +41,7 @@ glabel func_E007685C /* 37795C E00768EC 8E660014 */ lw $a2, 0x14($s3) /* 377960 E00768F0 8E670018 */ lw $a3, 0x18($s3) /* 377964 E00768F4 25080008 */ addiu $t0, $t0, 8 -/* 377968 E00768F8 0C080108 */ jal func_E0200420 +/* 377968 E00768F8 0C080108 */ jal shim_guTranslateF /* 37796C E00768FC AD280000 */ sw $t0, ($t1) /* 377970 E0076900 24020002 */ addiu $v0, $zero, 2 /* 377974 E0076904 16A20008 */ bne $s5, $v0, .LE0076928 @@ -73,24 +73,24 @@ glabel func_E007685C /* 3779D8 E0076968 44050000 */ mfc1 $a1, $f0 /* 3779DC E007696C AFA60010 */ sw $a2, 0x10($sp) .LE0076970: -/* 3779E0 E0076970 0C080104 */ jal func_E0200410 +/* 3779E0 E0076970 0C080104 */ jal shim_guRotateF /* 3779E4 E0076974 00000000 */ nop /* 3779E8 E0076978 27B40058 */ addiu $s4, $sp, 0x58 /* 3779EC E007697C 0280202D */ daddu $a0, $s4, $zero /* 3779F0 E0076980 27A50018 */ addiu $a1, $sp, 0x18 /* 3779F4 E0076984 27B00098 */ addiu $s0, $sp, 0x98 -/* 3779F8 E0076988 0C080114 */ jal func_E0200450 +/* 3779F8 E0076988 0C080114 */ jal shim_guMtxCatF /* 3779FC E007698C 0200302D */ daddu $a2, $s0, $zero /* 377A00 E0076990 8E65001C */ lw $a1, 0x1c($s3) /* 377A04 E0076994 3C013F80 */ lui $at, 0x3f80 /* 377A08 E0076998 4481A000 */ mtc1 $at, $f20 /* 377A0C E007699C 8E660020 */ lw $a2, 0x20($s3) /* 377A10 E00769A0 4407A000 */ mfc1 $a3, $f20 -/* 377A14 E00769A4 0C080110 */ jal func_E0200440 +/* 377A14 E00769A4 0C080110 */ jal shim_guScaleF /* 377A18 E00769A8 0280202D */ daddu $a0, $s4, $zero /* 377A1C E00769AC 0280202D */ daddu $a0, $s4, $zero /* 377A20 E00769B0 0200282D */ daddu $a1, $s0, $zero -/* 377A24 E00769B4 0C080114 */ jal func_E0200450 +/* 377A24 E00769B4 0C080114 */ jal shim_guMtxCatF /* 377A28 E00769B8 0200302D */ daddu $a2, $s0, $zero /* 377A2C E00769BC 16A00016 */ bnez $s5, .LE0076A18 /* 377A30 E00769C0 3C120001 */ lui $s2, 1 @@ -108,11 +108,11 @@ glabel func_E007685C /* 377A60 E00769F0 00000000 */ nop /* 377A64 E00769F4 44060000 */ mfc1 $a2, $f0 /* 377A68 E00769F8 0280202D */ daddu $a0, $s4, $zero -/* 377A6C E00769FC 0C080108 */ jal func_E0200420 +/* 377A6C E00769FC 0C080108 */ jal shim_guTranslateF /* 377A70 E0076A00 00C0382D */ daddu $a3, $a2, $zero /* 377A74 E0076A04 0280202D */ daddu $a0, $s4, $zero /* 377A78 E0076A08 0200282D */ daddu $a1, $s0, $zero -/* 377A7C E0076A0C 0C080114 */ jal func_E0200450 +/* 377A7C E0076A0C 0C080114 */ jal shim_guMtxCatF /* 377A80 E0076A10 0200302D */ daddu $a2, $s0, $zero /* 377A84 E0076A14 3C120001 */ lui $s2, 1 .LE0076A18: @@ -126,7 +126,7 @@ glabel func_E007685C /* 377AA4 E0076A34 8E220000 */ lw $v0, ($s1) /* 377AA8 E0076A38 00052980 */ sll $a1, $a1, 6 /* 377AAC E0076A3C 00B22821 */ addu $a1, $a1, $s2 -/* 377AB0 E0076A40 0C080118 */ jal func_E0200460 +/* 377AB0 E0076A40 0C080118 */ jal shim_guMtxF2L /* 377AB4 E0076A44 00452821 */ addu $a1, $v0, $a1 /* 377AB8 E0076A48 3C03DA38 */ lui $v1, 0xda38 /* 377ABC E0076A4C 34630002 */ ori $v1, $v1, 2 @@ -165,7 +165,7 @@ glabel func_E007685C /* 377B40 E0076AD0 8E660008 */ lw $a2, 8($s3) /* 377B44 E0076AD4 8E67000C */ lw $a3, 0xc($s3) /* 377B48 E0076AD8 25080010 */ addiu $t0, $t0, 0x10 -/* 377B4C E0076ADC 0C080108 */ jal func_E0200420 +/* 377B4C E0076ADC 0C080108 */ jal shim_guTranslateF /* 377B50 E0076AE0 AD280000 */ sw $t0, ($t1) /* 377B54 E0076AE4 24020002 */ addiu $v0, $zero, 2 /* 377B58 E0076AE8 16A20008 */ bne $s5, $v0, .LE0076B0C @@ -197,22 +197,22 @@ glabel func_E007685C /* 377BBC E0076B4C 44050000 */ mfc1 $a1, $f0 /* 377BC0 E0076B50 AFA60010 */ sw $a2, 0x10($sp) .LE0076B54: -/* 377BC4 E0076B54 0C080104 */ jal func_E0200410 +/* 377BC4 E0076B54 0C080104 */ jal shim_guRotateF /* 377BC8 E0076B58 00000000 */ nop /* 377BCC E0076B5C 27B10058 */ addiu $s1, $sp, 0x58 /* 377BD0 E0076B60 0220202D */ daddu $a0, $s1, $zero /* 377BD4 E0076B64 27A50018 */ addiu $a1, $sp, 0x18 /* 377BD8 E0076B68 27B00098 */ addiu $s0, $sp, 0x98 -/* 377BDC E0076B6C 0C080114 */ jal func_E0200450 +/* 377BDC E0076B6C 0C080114 */ jal shim_guMtxCatF /* 377BE0 E0076B70 0200302D */ daddu $a2, $s0, $zero /* 377BE4 E0076B74 8E65001C */ lw $a1, 0x1c($s3) /* 377BE8 E0076B78 8E660020 */ lw $a2, 0x20($s3) /* 377BEC E0076B7C 3C073F80 */ lui $a3, 0x3f80 -/* 377BF0 E0076B80 0C080110 */ jal func_E0200440 +/* 377BF0 E0076B80 0C080110 */ jal shim_guScaleF /* 377BF4 E0076B84 0220202D */ daddu $a0, $s1, $zero /* 377BF8 E0076B88 0220202D */ daddu $a0, $s1, $zero /* 377BFC E0076B8C 0200282D */ daddu $a1, $s0, $zero -/* 377C00 E0076B90 0C080114 */ jal func_E0200450 +/* 377C00 E0076B90 0C080114 */ jal shim_guMtxCatF /* 377C04 E0076B94 0200302D */ daddu $a2, $s0, $zero /* 377C08 E0076B98 16A00016 */ bnez $s5, .LE0076BF4 /* 377C0C E0076B9C 3C120001 */ lui $s2, 1 @@ -230,11 +230,11 @@ glabel func_E007685C /* 377C3C E0076BCC 00000000 */ nop /* 377C40 E0076BD0 44060000 */ mfc1 $a2, $f0 /* 377C44 E0076BD4 0220202D */ daddu $a0, $s1, $zero -/* 377C48 E0076BD8 0C080108 */ jal func_E0200420 +/* 377C48 E0076BD8 0C080108 */ jal shim_guTranslateF /* 377C4C E0076BDC 00C0382D */ daddu $a3, $a2, $zero /* 377C50 E0076BE0 0220202D */ daddu $a0, $s1, $zero /* 377C54 E0076BE4 0200282D */ daddu $a1, $s0, $zero -/* 377C58 E0076BE8 0C080114 */ jal func_E0200450 +/* 377C58 E0076BE8 0C080114 */ jal shim_guMtxCatF /* 377C5C E0076BEC 0200302D */ daddu $a2, $s0, $zero /* 377C60 E0076BF0 3C120001 */ lui $s2, 1 .LE0076BF4: @@ -248,7 +248,7 @@ glabel func_E007685C /* 377C80 E0076C10 8E220000 */ lw $v0, ($s1) /* 377C84 E0076C14 00052980 */ sll $a1, $a1, 6 /* 377C88 E0076C18 00B22821 */ addu $a1, $a1, $s2 -/* 377C8C E0076C1C 0C080118 */ jal func_E0200460 +/* 377C8C E0076C1C 0C080118 */ jal shim_guMtxF2L /* 377C90 E0076C20 00452821 */ addu $a1, $v0, $a1 /* 377C94 E0076C24 3C03DA38 */ lui $v1, 0xda38 /* 377C98 E0076C28 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_59/fx_59_main.s b/ver/us/asm/nonmatchings/effects/effect_59/fx_59_main.s index 5ae32a2fcd..322c605249 100644 --- a/ver/us/asm/nonmatchings/effects/effect_59/fx_59_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_59/fx_59_main.s @@ -28,12 +28,12 @@ glabel fx_59_main /* 3770CC E007605C AFB1002C */ sw $s1, 0x2c($sp) /* 3770D0 E0076060 AFA00010 */ sw $zero, 0x10($sp) /* 3770D4 E0076064 AFA00024 */ sw $zero, 0x24($sp) -/* 3770D8 E0076068 0C080124 */ jal func_E0200490 +/* 3770D8 E0076068 0C080124 */ jal shim_create_effect_instance /* 3770DC E007606C AFA20014 */ sw $v0, 0x14($sp) /* 3770E0 E0076070 24040070 */ addiu $a0, $zero, 0x70 /* 3770E4 E0076074 24030001 */ addiu $v1, $zero, 1 /* 3770E8 E0076078 0040882D */ daddu $s1, $v0, $zero -/* 3770EC E007607C 0C08012C */ jal func_E02004B0 +/* 3770EC E007607C 0C08012C */ jal shim_general_heap_malloc /* 3770F0 E0076080 AE230008 */ sw $v1, 8($s1) /* 3770F4 E0076084 0040182D */ daddu $v1, $v0, $zero /* 3770F8 E0076088 14600003 */ bnez $v1, .LE0076098 diff --git a/ver/us/asm/nonmatchings/effects/effect_6/func_E000C094.s b/ver/us/asm/nonmatchings/effects/effect_6/func_E000C094.s deleted file mode 100644 index 4a5bfadda3..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_6/func_E000C094.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E000C094 -/* 3281A4 E000C094 C4860024 */ lwc1 $f6, 0x24($a0) -/* 3281A8 E000C098 C4800028 */ lwc1 $f0, 0x28($a0) -/* 3281AC E000C09C 46003182 */ mul.s $f6, $f6, $f0 -/* 3281B0 E000C0A0 00000000 */ nop -/* 3281B4 E000C0A4 C4840008 */ lwc1 $f4, 8($a0) -/* 3281B8 E000C0A8 C4800020 */ lwc1 $f0, 0x20($a0) -/* 3281BC E000C0AC 46002100 */ add.s $f4, $f4, $f0 -/* 3281C0 E000C0B0 C4820024 */ lwc1 $f2, 0x24($a0) -/* 3281C4 E000C0B4 46020000 */ add.s $f0, $f0, $f2 -/* 3281C8 E000C0B8 E4840008 */ swc1 $f4, 8($a0) -/* 3281CC E000C0BC E4800020 */ swc1 $f0, 0x20($a0) -/* 3281D0 E000C0C0 03E00008 */ jr $ra -/* 3281D4 E000C0C4 E4860024 */ swc1 $f6, 0x24($a0) diff --git a/ver/us/asm/nonmatchings/effects/effect_6/func_E000C0C8.s b/ver/us/asm/nonmatchings/effects/effect_6/func_E000C0C8.s deleted file mode 100644 index bde8c78f82..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_6/func_E000C0C8.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E000C0C8 -/* 3281D8 E000C0C8 C48C0010 */ lwc1 $f12, 0x10($a0) -/* 3281DC E000C0CC C4800030 */ lwc1 $f0, 0x30($a0) -/* 3281E0 E000C0D0 46006302 */ mul.s $f12, $f12, $f0 -/* 3281E4 E000C0D4 00000000 */ nop -/* 3281E8 E000C0D8 C48E0010 */ lwc1 $f14, 0x10($a0) -/* 3281EC E000C0DC C4800034 */ lwc1 $f0, 0x34($a0) -/* 3281F0 E000C0E0 46007382 */ mul.s $f14, $f14, $f0 -/* 3281F4 E000C0E4 00000000 */ nop -/* 3281F8 E000C0E8 C48A0010 */ lwc1 $f10, 0x10($a0) -/* 3281FC E000C0EC C4800014 */ lwc1 $f0, 0x14($a0) -/* 328200 E000C0F0 46005282 */ mul.s $f10, $f10, $f0 -/* 328204 E000C0F4 00000000 */ nop -/* 328208 E000C0F8 C4800024 */ lwc1 $f0, 0x24($a0) -/* 32820C E000C0FC C4820020 */ lwc1 $f2, 0x20($a0) -/* 328210 E000C100 46000206 */ mov.s $f8, $f0 -/* 328214 E000C104 46001080 */ add.s $f2, $f2, $f0 -/* 328218 E000C108 C4800028 */ lwc1 $f0, 0x28($a0) -/* 32821C E000C10C C4840020 */ lwc1 $f4, 0x20($a0) -/* 328220 E000C110 46004202 */ mul.s $f8, $f8, $f0 -/* 328224 E000C114 00000000 */ nop -/* 328228 E000C118 C480002C */ lwc1 $f0, 0x2c($a0) -/* 32822C E000C11C E4820020 */ swc1 $f2, 0x20($a0) -/* 328230 E000C120 46001186 */ mov.s $f6, $f2 -/* 328234 E000C124 46003182 */ mul.s $f6, $f6, $f0 -/* 328238 E000C128 00000000 */ nop -/* 32823C E000C12C C4800008 */ lwc1 $f0, 8($a0) -/* 328240 E000C130 46040000 */ add.s $f0, $f0, $f4 -/* 328244 E000C134 C4820004 */ lwc1 $f2, 4($a0) -/* 328248 E000C138 460C1080 */ add.s $f2, $f2, $f12 -/* 32824C E000C13C C484000C */ lwc1 $f4, 0xc($a0) -/* 328250 E000C140 E48A0010 */ swc1 $f10, 0x10($a0) -/* 328254 E000C144 460E2100 */ add.s $f4, $f4, $f14 -/* 328258 E000C148 E4800008 */ swc1 $f0, 8($a0) -/* 32825C E000C14C E4880024 */ swc1 $f8, 0x24($a0) -/* 328260 E000C150 E4820004 */ swc1 $f2, 4($a0) -/* 328264 E000C154 E484000C */ swc1 $f4, 0xc($a0) -/* 328268 E000C158 03E00008 */ jr $ra -/* 32826C E000C15C E4860020 */ swc1 $f6, 0x20($a0) diff --git a/ver/us/asm/nonmatchings/effects/effect_6/func_E000C654.s b/ver/us/asm/nonmatchings/effects/effect_6/func_E000C654.s deleted file mode 100644 index d474ccaf83..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_6/func_E000C654.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E000C654 -/* 328764 E000C654 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 328768 E000C658 AFB3001C */ sw $s3, 0x1c($sp) -/* 32876C E000C65C 0080982D */ daddu $s3, $a0, $zero -/* 328770 E000C660 AFBF0024 */ sw $ra, 0x24($sp) -/* 328774 E000C664 AFB40020 */ sw $s4, 0x20($sp) -/* 328778 E000C668 AFB20018 */ sw $s2, 0x18($sp) -/* 32877C E000C66C AFB10014 */ sw $s1, 0x14($sp) -/* 328780 E000C670 AFB00010 */ sw $s0, 0x10($sp) -/* 328784 E000C674 8E70000C */ lw $s0, 0xc($s3) -/* 328788 E000C678 8E020038 */ lw $v0, 0x38($s0) -/* 32878C E000C67C 8E03003C */ lw $v1, 0x3c($s0) -/* 328790 E000C680 00021080 */ sll $v0, $v0, 2 -/* 328794 E000C684 3C01E001 */ lui $at, %hi(D_E000CD24) -/* 328798 E000C688 00220821 */ addu $at, $at, $v0 -/* 32879C E000C68C 8C22CD24 */ lw $v0, %lo(D_E000CD24)($at) -/* 3287A0 E000C690 00431021 */ addu $v0, $v0, $v1 -/* 3287A4 E000C694 80420000 */ lb $v0, ($v0) -/* 3287A8 E000C698 24630001 */ addiu $v1, $v1, 1 -/* 3287AC E000C69C AE03003C */ sw $v1, 0x3c($s0) -/* 3287B0 E000C6A0 04410005 */ bgez $v0, .LE000C6B8 -/* 3287B4 E000C6A4 AE020040 */ sw $v0, 0x40($s0) -/* 3287B8 E000C6A8 0C080128 */ jal func_E02004A0 -/* 3287BC E000C6AC 00000000 */ nop -/* 3287C0 E000C6B0 080031CD */ j .LE000C734 -/* 3287C4 E000C6B4 00000000 */ nop -.LE000C6B8: -/* 3287C8 E000C6B8 96040000 */ lhu $a0, ($s0) -/* 3287CC E000C6BC 8E620008 */ lw $v0, 8($s3) -/* 3287D0 E000C6C0 24110001 */ addiu $s1, $zero, 1 -/* 3287D4 E000C6C4 0222102A */ slt $v0, $s1, $v0 -/* 3287D8 E000C6C8 1040001A */ beqz $v0, .LE000C734 -/* 3287DC E000C6CC 26100044 */ addiu $s0, $s0, 0x44 -/* 3287E0 E000C6D0 2C940005 */ sltiu $s4, $a0, 5 -/* 3287E4 E000C6D4 3C03E001 */ lui $v1, %hi(D_E000CD70) -/* 3287E8 E000C6D8 2463CD70 */ addiu $v1, $v1, %lo(D_E000CD70) -/* 3287EC E000C6DC 00041080 */ sll $v0, $a0, 2 -/* 3287F0 E000C6E0 00439021 */ addu $s2, $v0, $v1 -.LE000C6E4: -/* 3287F4 E000C6E4 5280000F */ beql $s4, $zero, .LE000C724 -/* 3287F8 E000C6E8 26310001 */ addiu $s1, $s1, 1 -/* 3287FC E000C6EC 8E420000 */ lw $v0, ($s2) -/* 328800 E000C6F0 00400008 */ jr $v0 -/* 328804 E000C6F4 00000000 */ nop -/* 328808 E000C6F8 0C003000 */ jal func_E000C000 -/* 32880C E000C6FC 0200202D */ daddu $a0, $s0, $zero -/* 328810 E000C700 080031C9 */ j .LE000C724 -/* 328814 E000C704 26310001 */ addiu $s1, $s1, 1 -/* 328818 E000C708 0C003025 */ jal func_E000C094 -/* 32881C E000C70C 0200202D */ daddu $a0, $s0, $zero -/* 328820 E000C710 080031C9 */ j .LE000C724 -/* 328824 E000C714 26310001 */ addiu $s1, $s1, 1 -/* 328828 E000C718 0C003032 */ jal func_E000C0C8 -/* 32882C E000C71C 0200202D */ daddu $a0, $s0, $zero -/* 328830 E000C720 26310001 */ addiu $s1, $s1, 1 -.LE000C724: -/* 328834 E000C724 8E620008 */ lw $v0, 8($s3) -/* 328838 E000C728 0222102A */ slt $v0, $s1, $v0 -/* 32883C E000C72C 1440FFED */ bnez $v0, .LE000C6E4 -/* 328840 E000C730 26100044 */ addiu $s0, $s0, 0x44 -.LE000C734: -/* 328844 E000C734 8FBF0024 */ lw $ra, 0x24($sp) -/* 328848 E000C738 8FB40020 */ lw $s4, 0x20($sp) -/* 32884C E000C73C 8FB3001C */ lw $s3, 0x1c($sp) -/* 328850 E000C740 8FB20018 */ lw $s2, 0x18($sp) -/* 328854 E000C744 8FB10014 */ lw $s1, 0x14($sp) -/* 328858 E000C748 8FB00010 */ lw $s0, 0x10($sp) -/* 32885C E000C74C 03E00008 */ jr $ra -/* 328860 E000C750 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/effects/effect_6/func_E000C754.s b/ver/us/asm/nonmatchings/effects/effect_6/func_E000C754.s deleted file mode 100644 index ec4c840c00..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_6/func_E000C754.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E000C754 -/* 328864 E000C754 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 328868 E000C758 3C02E001 */ lui $v0, %hi(func_E000C798) -/* 32886C E000C75C 2442C798 */ addiu $v0, $v0, %lo(func_E000C798) -/* 328870 E000C760 AFA2001C */ sw $v0, 0x1c($sp) -/* 328874 E000C764 24020028 */ addiu $v0, $zero, 0x28 -/* 328878 E000C768 AFA40018 */ sw $a0, 0x18($sp) -/* 32887C E000C76C 27A40010 */ addiu $a0, $sp, 0x10 -/* 328880 E000C770 AFBF0020 */ sw $ra, 0x20($sp) -/* 328884 E000C774 AFA00014 */ sw $zero, 0x14($sp) -/* 328888 E000C778 0C080120 */ jal func_E0200480 -/* 32888C E000C77C AFA20010 */ sw $v0, 0x10($sp) -/* 328890 E000C780 8C430000 */ lw $v1, ($v0) -/* 328894 E000C784 34630002 */ ori $v1, $v1, 2 -/* 328898 E000C788 AC430000 */ sw $v1, ($v0) -/* 32889C E000C78C 8FBF0020 */ lw $ra, 0x20($sp) -/* 3288A0 E000C790 03E00008 */ jr $ra -/* 3288A4 E000C794 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/effects/effect_6/func_E000C798.s b/ver/us/asm/nonmatchings/effects/effect_6/fx_6_appendGfx.s similarity index 97% rename from ver/us/asm/nonmatchings/effects/effect_6/func_E000C798.s rename to ver/us/asm/nonmatchings/effects/effect_6/fx_6_appendGfx.s index 705f533f06..74b5cff275 100644 --- a/ver/us/asm/nonmatchings/effects/effect_6/func_E000C798.s +++ b/ver/us/asm/nonmatchings/effects/effect_6/fx_6_appendGfx.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_E000C798 +glabel fx_6_appendGfx /* 3288A8 E000C798 27BDFEF8 */ addiu $sp, $sp, -0x108 /* 3288AC E000C79C AFBE0100 */ sw $fp, 0x100($sp) /* 3288B0 E000C7A0 0080F02D */ daddu $fp, $a0, $zero @@ -59,7 +59,7 @@ glabel func_E000C798 /* 328980 E000C870 8E87000C */ lw $a3, 0xc($s4) /* 328984 E000C874 31080040 */ andi $t0, $t0, 0x40 /* 328988 E000C878 AFAB00D8 */ sw $t3, 0xd8($sp) -/* 32898C E000C87C 0C080108 */ jal func_E0200420 +/* 32898C E000C87C 0C080108 */ jal shim_guTranslateF /* 328990 E000C880 AFA800DC */ sw $t0, 0xdc($sp) /* 328994 E000C884 27B00058 */ addiu $s0, $sp, 0x58 /* 328998 E000C888 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -80,12 +80,12 @@ glabel func_E000C798 /* 3289D4 E000C8C4 46000007 */ neg.s $f0, $f0 /* 3289D8 E000C8C8 44050000 */ mfc1 $a1, $f0 /* 3289DC E000C8CC 0200202D */ daddu $a0, $s0, $zero -/* 3289E0 E000C8D0 0C080104 */ jal func_E0200410 +/* 3289E0 E000C8D0 0C080104 */ jal shim_guRotateF /* 3289E4 E000C8D4 AFA60010 */ sw $a2, 0x10($sp) /* 3289E8 E000C8D8 0200202D */ daddu $a0, $s0, $zero /* 3289EC E000C8DC 27A50018 */ addiu $a1, $sp, 0x18 /* 3289F0 E000C8E0 27B00098 */ addiu $s0, $sp, 0x98 -/* 3289F4 E000C8E4 0C080114 */ jal func_E0200450 +/* 3289F4 E000C8E4 0C080114 */ jal shim_guMtxCatF /* 3289F8 E000C8E8 0200302D */ daddu $a2, $s0, $zero /* 3289FC E000C8EC 0200202D */ daddu $a0, $s0, $zero /* 328A00 E000C8F0 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -96,7 +96,7 @@ glabel func_E000C798 /* 328A14 E000C904 8E220000 */ lw $v0, ($s1) /* 328A18 E000C908 00052980 */ sll $a1, $a1, 6 /* 328A1C E000C90C 00B22821 */ addu $a1, $a1, $s2 -/* 328A20 E000C910 0C080118 */ jal func_E0200460 +/* 328A20 E000C910 0C080118 */ jal shim_guMtxF2L /* 328A24 E000C914 00452821 */ addu $a1, $v0, $a1 /* 328A28 E000C918 8E650000 */ lw $a1, ($s3) /* 328A2C E000C91C 00A0202D */ daddu $a0, $a1, $zero @@ -226,14 +226,14 @@ glabel func_E000C798 /* 328C00 E000CAF0 8E05FFF8 */ lw $a1, -8($s0) /* 328C04 E000CAF4 8E06FFFC */ lw $a2, -4($s0) /* 328C08 E000CAF8 8E070000 */ lw $a3, ($s0) -/* 328C0C E000CAFC 0C080108 */ jal func_E0200420 +/* 328C0C E000CAFC 0C080108 */ jal shim_guTranslateF /* 328C10 E000CB00 26100044 */ addiu $s0, $s0, 0x44 /* 328C14 E000CB04 27A40018 */ addiu $a0, $sp, 0x18 /* 328C18 E000CB08 96A50000 */ lhu $a1, ($s5) /* 328C1C E000CB0C 8EC20000 */ lw $v0, ($s6) /* 328C20 E000CB10 00052980 */ sll $a1, $a1, 6 /* 328C24 E000CB14 00B32821 */ addu $a1, $a1, $s3 -/* 328C28 E000CB18 0C080118 */ jal func_E0200460 +/* 328C28 E000CB18 0C080118 */ jal shim_guMtxF2L /* 328C2C E000CB1C 00452821 */ addu $a1, $v0, $a1 /* 328C30 E000CB20 3C06D838 */ lui $a2, 0xd838 /* 328C34 E000CB24 8E440000 */ lw $a0, ($s2) diff --git a/ver/us/asm/nonmatchings/effects/effect_6/fx_6_main.s b/ver/us/asm/nonmatchings/effects/effect_6/fx_6_main.s deleted file mode 100644 index 54483718f2..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_6/fx_6_main.s +++ /dev/null @@ -1,346 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_6_main -/* 328270 E000C160 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 328274 E000C164 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 328278 E000C168 4485A000 */ mtc1 $a1, $f20 -/* 32827C E000C16C AFB20030 */ sw $s2, 0x30($sp) -/* 328280 E000C170 0080902D */ daddu $s2, $a0, $zero -/* 328284 E000C174 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 328288 E000C178 4486B000 */ mtc1 $a2, $f22 -/* 32828C E000C17C F7B80050 */ sdc1 $f24, 0x50($sp) -/* 328290 E000C180 4487C000 */ mtc1 $a3, $f24 -/* 328294 E000C184 24020003 */ addiu $v0, $zero, 3 -/* 328298 E000C188 AFBF003C */ sw $ra, 0x3c($sp) -/* 32829C E000C18C AFB40038 */ sw $s4, 0x38($sp) -/* 3282A0 E000C190 AFB30034 */ sw $s3, 0x34($sp) -/* 3282A4 E000C194 AFB1002C */ sw $s1, 0x2c($sp) -/* 3282A8 E000C198 AFB00028 */ sw $s0, 0x28($sp) -/* 3282AC E000C19C F7BE0068 */ sdc1 $f30, 0x68($sp) -/* 3282B0 E000C1A0 F7BC0060 */ sdc1 $f28, 0x60($sp) -/* 3282B4 E000C1A4 F7BA0058 */ sdc1 $f26, 0x58($sp) -/* 3282B8 E000C1A8 1242000F */ beq $s2, $v0, .LE000C1E8 -/* 3282BC E000C1AC 27A40010 */ addiu $a0, $sp, 0x10 -/* 3282C0 E000C1B0 2A420004 */ slti $v0, $s2, 4 -/* 3282C4 E000C1B4 10400005 */ beqz $v0, .LE000C1CC -/* 3282C8 E000C1B8 24020002 */ addiu $v0, $zero, 2 -/* 3282CC E000C1BC 12420008 */ beq $s2, $v0, .LE000C1E0 -/* 3282D0 E000C1C0 24130003 */ addiu $s3, $zero, 3 -/* 3282D4 E000C1C4 0800307D */ j .LE000C1F4 -/* 3282D8 E000C1C8 00000000 */ nop -.LE000C1CC: -/* 3282DC E000C1CC 24020004 */ addiu $v0, $zero, 4 -/* 3282E0 E000C1D0 12420007 */ beq $s2, $v0, .LE000C1F0 -/* 3282E4 E000C1D4 24130003 */ addiu $s3, $zero, 3 -/* 3282E8 E000C1D8 0800307D */ j .LE000C1F4 -/* 3282EC E000C1DC 00000000 */ nop -.LE000C1E0: -/* 3282F0 E000C1E0 0800307D */ j .LE000C1F4 -/* 3282F4 E000C1E4 24130001 */ addiu $s3, $zero, 1 -.LE000C1E8: -/* 3282F8 E000C1E8 0800307D */ j .LE000C1F4 -/* 3282FC E000C1EC 24130004 */ addiu $s3, $zero, 4 -.LE000C1F0: -/* 328300 E000C1F0 24130009 */ addiu $s3, $zero, 9 -.LE000C1F4: -/* 328304 E000C1F4 3C02E001 */ lui $v0, %hi(func_E000C64C) -/* 328308 E000C1F8 2442C64C */ addiu $v0, $v0, %lo(func_E000C64C) -/* 32830C E000C1FC AC820008 */ sw $v0, 8($a0) -/* 328310 E000C200 3C02E001 */ lui $v0, %hi(func_E000C654) -/* 328314 E000C204 2442C654 */ addiu $v0, $v0, %lo(func_E000C654) -/* 328318 E000C208 AC82000C */ sw $v0, 0xc($a0) -/* 32831C E000C20C 3C02E001 */ lui $v0, %hi(func_E000C754) -/* 328320 E000C210 2442C754 */ addiu $v0, $v0, %lo(func_E000C754) -/* 328324 E000C214 AC820010 */ sw $v0, 0x10($a0) -/* 328328 E000C218 24020006 */ addiu $v0, $zero, 6 -/* 32832C E000C21C AC800000 */ sw $zero, ($a0) -/* 328330 E000C220 AC800014 */ sw $zero, 0x14($a0) -/* 328334 E000C224 0C080124 */ jal func_E0200490 -/* 328338 E000C228 AC820004 */ sw $v0, 4($a0) -/* 32833C E000C22C 00132100 */ sll $a0, $s3, 4 -/* 328340 E000C230 00932021 */ addu $a0, $a0, $s3 -/* 328344 E000C234 00042080 */ sll $a0, $a0, 2 -/* 328348 E000C238 0040802D */ daddu $s0, $v0, $zero -/* 32834C E000C23C 0C08012C */ jal func_E02004B0 -/* 328350 E000C240 AE130008 */ sw $s3, 8($s0) -/* 328354 E000C244 0040882D */ daddu $s1, $v0, $zero -/* 328358 E000C248 16200003 */ bnez $s1, .LE000C258 -/* 32835C E000C24C AE11000C */ sw $s1, 0xc($s0) -.LE000C250: -/* 328360 E000C250 08003094 */ j .LE000C250 -/* 328364 E000C254 00000000 */ nop -.LE000C258: -/* 328368 E000C258 0220202D */ daddu $a0, $s1, $zero -/* 32836C E000C25C 00132900 */ sll $a1, $s3, 4 -/* 328370 E000C260 00B32821 */ addu $a1, $a1, $s3 -/* 328374 E000C264 0C080130 */ jal func_E02004C0 -/* 328378 E000C268 00052880 */ sll $a1, $a1, 2 -/* 32837C E000C26C 2E420005 */ sltiu $v0, $s2, 5 -/* 328380 E000C270 1040000C */ beqz $v0, .LE000C2A4 -/* 328384 E000C274 00121080 */ sll $v0, $s2, 2 -/* 328388 E000C278 3C01E001 */ lui $at, %hi(jtbl_E000CD40) -/* 32838C E000C27C 00220821 */ addu $at, $at, $v0 -/* 328390 E000C280 8C22CD40 */ lw $v0, %lo(jtbl_E000CD40)($at) -/* 328394 E000C284 00400008 */ jr $v0 -/* 328398 E000C288 00000000 */ nop -glabel LE000C28C_32839C -/* 32839C E000C28C 080030A9 */ j .LE000C2A4 -/* 3283A0 E000C290 AE200038 */ sw $zero, 0x38($s1) -glabel LE000C294_3283A4 -/* 3283A4 E000C294 080030A8 */ j .LE000C2A0 -/* 3283A8 E000C298 24020002 */ addiu $v0, $zero, 2 -glabel LE000C29C_3283AC -/* 3283AC E000C29C 24020003 */ addiu $v0, $zero, 3 -.LE000C2A0: -/* 3283B0 E000C2A0 AE220038 */ sw $v0, 0x38($s1) -.LE000C2A4: -/* 3283B4 E000C2A4 AE20003C */ sw $zero, 0x3c($s1) -/* 3283B8 E000C2A8 A6320000 */ sh $s2, ($s1) -/* 3283BC E000C2AC E6340004 */ swc1 $f20, 4($s1) -/* 3283C0 E000C2B0 E6360008 */ swc1 $f22, 8($s1) -/* 3283C4 E000C2B4 E638000C */ swc1 $f24, 0xc($s1) -/* 3283C8 E000C2B8 2E420005 */ sltiu $v0, $s2, 5 -/* 3283CC E000C2BC 104000D5 */ beqz $v0, LE000C614_328724 -/* 3283D0 E000C2C0 26310044 */ addiu $s1, $s1, 0x44 -/* 3283D4 E000C2C4 00121080 */ sll $v0, $s2, 2 -/* 3283D8 E000C2C8 3C01E001 */ lui $at, %hi(jtbl_E000CD58) -/* 3283DC E000C2CC 00220821 */ addu $at, $at, $v0 -/* 3283E0 E000C2D0 8C22CD58 */ lw $v0, %lo(jtbl_E000CD58)($at) -/* 3283E4 E000C2D4 00400008 */ jr $v0 -/* 3283E8 E000C2D8 00000000 */ nop -glabel LE000C2DC_3283EC -/* 3283EC E000C2DC 24120001 */ addiu $s2, $zero, 1 -/* 3283F0 E000C2E0 0253102A */ slt $v0, $s2, $s3 -/* 3283F4 E000C2E4 104000CB */ beqz $v0, LE000C614_328724 -/* 3283F8 E000C2E8 26300034 */ addiu $s0, $s1, 0x34 -/* 3283FC E000C2EC 2411005A */ addiu $s1, $zero, 0x5a -/* 328400 E000C2F0 3C01C040 */ lui $at, 0xc040 -/* 328404 E000C2F4 4481F000 */ mtc1 $at, $f30 -/* 328408 E000C2F8 3C013E99 */ lui $at, 0x3e99 -/* 32840C E000C2FC 34219999 */ ori $at, $at, 0x9999 -/* 328410 E000C300 4481E000 */ mtc1 $at, $f28 -/* 328414 E000C304 3C013FE0 */ lui $at, 0x3fe0 -/* 328418 E000C308 4481D000 */ mtc1 $at, $f26 -/* 32841C E000C30C 3C01BE23 */ lui $at, 0xbe23 -/* 328420 E000C310 3421D70A */ ori $at, $at, 0xd70a -/* 328424 E000C314 4481C000 */ mtc1 $at, $f24 -/* 328428 E000C318 3C014080 */ lui $at, 0x4080 -/* 32842C E000C31C 4481B000 */ mtc1 $at, $f22 -.LE000C320: -/* 328430 E000C320 44916000 */ mtc1 $s1, $f12 -/* 328434 E000C324 00000000 */ nop -/* 328438 E000C328 46806320 */ cvt.s.w $f12, $f12 -/* 32843C E000C32C E61EFFDC */ swc1 $f30, -0x24($s0) -/* 328440 E000C330 E61CFFE0 */ swc1 $f28, -0x20($s0) -/* 328444 E000C334 AE00FFE4 */ sw $zero, -0x1c($s0) -/* 328448 E000C338 AE00FFE8 */ sw $zero, -0x18($s0) -/* 32844C E000C33C E61AFFEC */ swc1 $f26, -0x14($s0) -/* 328450 E000C340 E618FFF0 */ swc1 $f24, -0x10($s0) -/* 328454 E000C344 AE00FFF4 */ sw $zero, -0xc($s0) -/* 328458 E000C348 AE00FFF8 */ sw $zero, -8($s0) -/* 32845C E000C34C AE00FFD0 */ sw $zero, -0x30($s0) -/* 328460 E000C350 AE00FFD4 */ sw $zero, -0x2c($s0) -/* 328464 E000C354 0C08013C */ jal func_E02004F0 -/* 328468 E000C358 E616FFD8 */ swc1 $f22, -0x28($s0) -/* 32846C E000C35C 46000506 */ mov.s $f20, $f0 -/* 328470 E000C360 0C080140 */ jal func_E0200500 -/* 328474 E000C364 4600A306 */ mov.s $f12, $f20 -/* 328478 E000C368 4600A306 */ mov.s $f12, $f20 -/* 32847C E000C36C 0C080144 */ jal func_E0200510 -/* 328480 E000C370 E600FFFC */ swc1 $f0, -4($s0) -/* 328484 E000C374 263100B4 */ addiu $s1, $s1, 0xb4 -/* 328488 E000C378 26520001 */ addiu $s2, $s2, 1 -/* 32848C E000C37C E6000000 */ swc1 $f0, ($s0) -/* 328490 E000C380 0253102A */ slt $v0, $s2, $s3 -/* 328494 E000C384 1440FFE6 */ bnez $v0, .LE000C320 -/* 328498 E000C388 26100044 */ addiu $s0, $s0, 0x44 -/* 32849C E000C38C 08003185 */ j LE000C614_328724 -/* 3284A0 E000C390 00000000 */ nop -glabel LE000C394_3284A4 -/* 3284A4 E000C394 24120001 */ addiu $s2, $zero, 1 -/* 3284A8 E000C398 0253102A */ slt $v0, $s2, $s3 -/* 3284AC E000C39C 1040009D */ beqz $v0, LE000C614_328724 -/* 3284B0 E000C3A0 26300034 */ addiu $s0, $s1, 0x34 -/* 3284B4 E000C3A4 3C0141C8 */ lui $at, 0x41c8 -/* 3284B8 E000C3A8 4481B000 */ mtc1 $at, $f22 -/* 3284BC E000C3AC 3C01BD23 */ lui $at, 0xbd23 -/* 3284C0 E000C3B0 3421D70A */ ori $at, $at, 0xd70a -/* 3284C4 E000C3B4 4481D000 */ mtc1 $at, $f26 -/* 3284C8 E000C3B8 3C013F70 */ lui $at, 0x3f70 -/* 3284CC E000C3BC 3421A3D7 */ ori $at, $at, 0xa3d7 -/* 3284D0 E000C3C0 4481C000 */ mtc1 $at, $f24 -.LE000C3C4: -/* 3284D4 E000C3C4 2643FFFF */ addiu $v1, $s2, -1 -/* 3284D8 E000C3C8 24020001 */ addiu $v0, $zero, 1 -/* 3284DC E000C3CC 1062001E */ beq $v1, $v0, .LE000C448 -/* 3284E0 E000C3D0 28620002 */ slti $v0, $v1, 2 -/* 3284E4 E000C3D4 10400005 */ beqz $v0, .LE000C3EC -/* 3284E8 E000C3D8 24020002 */ addiu $v0, $zero, 2 -/* 3284EC E000C3DC 10600007 */ beqz $v1, .LE000C3FC -/* 3284F0 E000C3E0 00000000 */ nop -/* 3284F4 E000C3E4 0800313E */ j .LE000C4F8 -/* 3284F8 E000C3E8 26520001 */ addiu $s2, $s2, 1 -.LE000C3EC: -/* 3284FC E000C3EC 1062002B */ beq $v1, $v0, .LE000C49C -/* 328500 E000C3F0 00000000 */ nop -/* 328504 E000C3F4 0800313E */ j .LE000C4F8 -/* 328508 E000C3F8 26520001 */ addiu $s2, $s2, 1 -.LE000C3FC: -/* 32850C E000C3FC 3C014307 */ lui $at, 0x4307 -/* 328510 E000C400 4481A000 */ mtc1 $at, $f20 -/* 328514 E000C404 0C080140 */ jal func_E0200500 -/* 328518 E000C408 4600A306 */ mov.s $f12, $f20 -/* 32851C E000C40C 46000007 */ neg.s $f0, $f0 -/* 328520 E000C410 46160002 */ mul.s $f0, $f0, $f22 -/* 328524 E000C414 00000000 */ nop -/* 328528 E000C418 4600A306 */ mov.s $f12, $f20 -/* 32852C E000C41C AE00FFD4 */ sw $zero, -0x2c($s0) -/* 328530 E000C420 0C080144 */ jal func_E0200510 -/* 328534 E000C424 E600FFD0 */ swc1 $f0, -0x30($s0) -/* 328538 E000C428 46000007 */ neg.s $f0, $f0 -/* 32853C E000C42C 46160002 */ mul.s $f0, $f0, $f22 -/* 328540 E000C430 00000000 */ nop -/* 328544 E000C434 3C013F73 */ lui $at, 0x3f73 -/* 328548 E000C438 34213333 */ ori $at, $at, 0x3333 -/* 32854C E000C43C 44811000 */ mtc1 $at, $f2 -/* 328550 E000C440 0800313A */ j .LE000C4E8 -/* 328554 E000C444 E61AFFF0 */ swc1 $f26, -0x10($s0) -.LE000C448: -/* 328558 E000C448 3C01C307 */ lui $at, 0xc307 -/* 32855C E000C44C 4481A000 */ mtc1 $at, $f20 -/* 328560 E000C450 0C080140 */ jal func_E0200500 -/* 328564 E000C454 4600A306 */ mov.s $f12, $f20 -/* 328568 E000C458 46000007 */ neg.s $f0, $f0 -/* 32856C E000C45C 46160002 */ mul.s $f0, $f0, $f22 -/* 328570 E000C460 00000000 */ nop -/* 328574 E000C464 3C014080 */ lui $at, 0x4080 -/* 328578 E000C468 44811000 */ mtc1 $at, $f2 -/* 32857C E000C46C 4600A306 */ mov.s $f12, $f20 -/* 328580 E000C470 E602FFD4 */ swc1 $f2, -0x2c($s0) -/* 328584 E000C474 0C080144 */ jal func_E0200510 -/* 328588 E000C478 E600FFD0 */ swc1 $f0, -0x30($s0) -/* 32858C E000C47C 46000007 */ neg.s $f0, $f0 -/* 328590 E000C480 46160002 */ mul.s $f0, $f0, $f22 -/* 328594 E000C484 00000000 */ nop -/* 328598 E000C488 3C013F59 */ lui $at, 0x3f59 -/* 32859C E000C48C 34219999 */ ori $at, $at, 0x9999 -/* 3285A0 E000C490 44811000 */ mtc1 $at, $f2 -/* 3285A4 E000C494 0800313A */ j .LE000C4E8 -/* 3285A8 E000C498 E61AFFF0 */ swc1 $f26, -0x10($s0) -.LE000C49C: -/* 3285AC E000C49C 3C0141A0 */ lui $at, 0x41a0 -/* 3285B0 E000C4A0 4481A000 */ mtc1 $at, $f20 -/* 3285B4 E000C4A4 0C080140 */ jal func_E0200500 -/* 3285B8 E000C4A8 4600A306 */ mov.s $f12, $f20 -/* 3285BC E000C4AC 46000007 */ neg.s $f0, $f0 -/* 3285C0 E000C4B0 46160002 */ mul.s $f0, $f0, $f22 -/* 3285C4 E000C4B4 00000000 */ nop -/* 3285C8 E000C4B8 3C014120 */ lui $at, 0x4120 -/* 3285CC E000C4BC 44811000 */ mtc1 $at, $f2 -/* 3285D0 E000C4C0 4600A306 */ mov.s $f12, $f20 -/* 3285D4 E000C4C4 E602FFD4 */ swc1 $f2, -0x2c($s0) -/* 3285D8 E000C4C8 0C080144 */ jal func_E0200510 -/* 3285DC E000C4CC E600FFD0 */ swc1 $f0, -0x30($s0) -/* 3285E0 E000C4D0 46000007 */ neg.s $f0, $f0 -/* 3285E4 E000C4D4 46160002 */ mul.s $f0, $f0, $f22 -/* 3285E8 E000C4D8 00000000 */ nop -/* 3285EC E000C4DC 3C013F40 */ lui $at, 0x3f40 -/* 3285F0 E000C4E0 44811000 */ mtc1 $at, $f2 -/* 3285F4 E000C4E4 E61AFFF0 */ swc1 $f26, -0x10($s0) -.LE000C4E8: -/* 3285F8 E000C4E8 E618FFF4 */ swc1 $f24, -0xc($s0) -/* 3285FC E000C4EC E602FFEC */ swc1 $f2, -0x14($s0) -/* 328600 E000C4F0 E600FFD8 */ swc1 $f0, -0x28($s0) -/* 328604 E000C4F4 26520001 */ addiu $s2, $s2, 1 -.LE000C4F8: -/* 328608 E000C4F8 AE00FFFC */ sw $zero, -4($s0) -/* 32860C E000C4FC AE000000 */ sw $zero, ($s0) -/* 328610 E000C500 0253102A */ slt $v0, $s2, $s3 -/* 328614 E000C504 1440FFAF */ bnez $v0, .LE000C3C4 -/* 328618 E000C508 26100044 */ addiu $s0, $s0, 0x44 -/* 32861C E000C50C 08003185 */ j LE000C614_328724 -/* 328620 E000C510 00000000 */ nop -glabel LE000C514_328624 -/* 328624 E000C514 24120001 */ addiu $s2, $zero, 1 -/* 328628 E000C518 0253102A */ slt $v0, $s2, $s3 -/* 32862C E000C51C 1040003D */ beqz $v0, LE000C614_328724 -/* 328630 E000C520 2674FFFF */ addiu $s4, $s3, -1 -/* 328634 E000C524 26300034 */ addiu $s0, $s1, 0x34 -/* 328638 E000C528 0000882D */ daddu $s1, $zero, $zero -/* 32863C E000C52C 3C01C040 */ lui $at, 0xc040 -/* 328640 E000C530 4481F000 */ mtc1 $at, $f30 -/* 328644 E000C534 3C013F6E */ lui $at, 0x3f6e -/* 328648 E000C538 3421147B */ ori $at, $at, 0x147b -/* 32864C E000C53C 4481E000 */ mtc1 $at, $f28 -/* 328650 E000C540 3C013DCC */ lui $at, 0x3dcc -/* 328654 E000C544 3421CCCC */ ori $at, $at, 0xcccc -/* 328658 E000C548 4481D000 */ mtc1 $at, $f26 -/* 32865C E000C54C 3C013F70 */ lui $at, 0x3f70 -/* 328660 E000C550 3421A3D7 */ ori $at, $at, 0xa3d7 -/* 328664 E000C554 4481C000 */ mtc1 $at, $f24 -/* 328668 E000C558 3C014120 */ lui $at, 0x4120 -/* 32866C E000C55C 4481B000 */ mtc1 $at, $f22 -.LE000C560: -/* 328670 E000C560 16800002 */ bnez $s4, .LE000C56C -/* 328674 E000C564 0234001A */ div $zero, $s1, $s4 -/* 328678 E000C568 0007000D */ break 7 -.LE000C56C: -/* 32867C E000C56C 2401FFFF */ addiu $at, $zero, -1 -/* 328680 E000C570 16810004 */ bne $s4, $at, .LE000C584 -/* 328684 E000C574 3C018000 */ lui $at, 0x8000 -/* 328688 E000C578 16210002 */ bne $s1, $at, .LE000C584 -/* 32868C E000C57C 00000000 */ nop -/* 328690 E000C580 0006000D */ break 6 -.LE000C584: -/* 328694 E000C584 00001812 */ mflo $v1 -/* 328698 E000C588 E61EFFDC */ swc1 $f30, -0x24($s0) -/* 32869C E000C58C E61CFFE0 */ swc1 $f28, -0x20($s0) -/* 3286A0 E000C590 AE00FFEC */ sw $zero, -0x14($s0) -/* 3286A4 E000C594 E61AFFF0 */ swc1 $f26, -0x10($s0) -/* 3286A8 E000C598 C7A40080 */ lwc1 $f4, 0x80($sp) -/* 3286AC E000C59C 44830000 */ mtc1 $v1, $f0 -/* 3286B0 E000C5A0 00000000 */ nop -/* 3286B4 E000C5A4 46800020 */ cvt.s.w $f0, $f0 -/* 3286B8 E000C5A8 46002500 */ add.s $f20, $f4, $f0 -/* 3286BC E000C5AC E618FFF4 */ swc1 $f24, -0xc($s0) -/* 3286C0 E000C5B0 E618FFF8 */ swc1 $f24, -8($s0) -/* 3286C4 E000C5B4 0C080140 */ jal func_E0200500 -/* 3286C8 E000C5B8 4600A306 */ mov.s $f12, $f20 -/* 3286CC E000C5BC 46000007 */ neg.s $f0, $f0 -/* 3286D0 E000C5C0 46160002 */ mul.s $f0, $f0, $f22 -/* 3286D4 E000C5C4 00000000 */ nop -/* 3286D8 E000C5C8 4600A306 */ mov.s $f12, $f20 -/* 3286DC E000C5CC AE00FFD4 */ sw $zero, -0x2c($s0) -/* 3286E0 E000C5D0 0C080144 */ jal func_E0200510 -/* 3286E4 E000C5D4 E600FFD0 */ swc1 $f0, -0x30($s0) -/* 3286E8 E000C5D8 46000007 */ neg.s $f0, $f0 -/* 3286EC E000C5DC 46160002 */ mul.s $f0, $f0, $f22 -/* 3286F0 E000C5E0 00000000 */ nop -/* 3286F4 E000C5E4 26310168 */ addiu $s1, $s1, 0x168 -/* 3286F8 E000C5E8 26520001 */ addiu $s2, $s2, 1 -/* 3286FC E000C5EC 4600A306 */ mov.s $f12, $f20 -/* 328700 E000C5F0 0C080140 */ jal func_E0200500 -/* 328704 E000C5F4 E600FFD8 */ swc1 $f0, -0x28($s0) -/* 328708 E000C5F8 4600A306 */ mov.s $f12, $f20 -/* 32870C E000C5FC 0C080144 */ jal func_E0200510 -/* 328710 E000C600 E600FFFC */ swc1 $f0, -4($s0) -/* 328714 E000C604 E6000000 */ swc1 $f0, ($s0) -/* 328718 E000C608 0253102A */ slt $v0, $s2, $s3 -/* 32871C E000C60C 1440FFD4 */ bnez $v0, .LE000C560 -/* 328720 E000C610 26100044 */ addiu $s0, $s0, 0x44 -glabel LE000C614_328724 -/* 328724 E000C614 8FBF003C */ lw $ra, 0x3c($sp) -/* 328728 E000C618 8FB40038 */ lw $s4, 0x38($sp) -/* 32872C E000C61C 8FB30034 */ lw $s3, 0x34($sp) -/* 328730 E000C620 8FB20030 */ lw $s2, 0x30($sp) -/* 328734 E000C624 8FB1002C */ lw $s1, 0x2c($sp) -/* 328738 E000C628 8FB00028 */ lw $s0, 0x28($sp) -/* 32873C E000C62C D7BE0068 */ ldc1 $f30, 0x68($sp) -/* 328740 E000C630 D7BC0060 */ ldc1 $f28, 0x60($sp) -/* 328744 E000C634 D7BA0058 */ ldc1 $f26, 0x58($sp) -/* 328748 E000C638 D7B80050 */ ldc1 $f24, 0x50($sp) -/* 32874C E000C63C D7B60048 */ ldc1 $f22, 0x48($sp) -/* 328750 E000C640 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 328754 E000C644 03E00008 */ jr $ra -/* 328758 E000C648 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/effects/effect_60/func_E007812C.s b/ver/us/asm/nonmatchings/effects/effect_60/func_E007812C.s index 4842bb9b1c..0d6d8dd37c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_60/func_E007812C.s +++ b/ver/us/asm/nonmatchings/effects/effect_60/func_E007812C.s @@ -26,7 +26,7 @@ glabel func_E007812C /* 37A568 E0078178 8C620014 */ lw $v0, 0x14($v1) /* 37A56C E007817C 04410005 */ bgez $v0, .LE0078194 /* 37A570 E0078180 00000000 */ nop -/* 37A574 E0078184 0C080128 */ jal func_E02004A0 +/* 37A574 E0078184 0C080128 */ jal shim_remove_effect /* 37A578 E0078188 00000000 */ nop /* 37A57C E007818C 0801E081 */ j .LE0078204 /* 37A580 E0078190 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_60/func_E0078210.s b/ver/us/asm/nonmatchings/effects/effect_60/func_E0078210.s index b6fb6d0a52..4edac94552 100644 --- a/ver/us/asm/nonmatchings/effects/effect_60/func_E0078210.s +++ b/ver/us/asm/nonmatchings/effects/effect_60/func_E0078210.s @@ -21,7 +21,7 @@ glabel func_E0078210 /* 37A63C E007824C AFA20014 */ sw $v0, 0x14($sp) /* 37A640 E0078250 2402002D */ addiu $v0, $zero, 0x2d .LE0078254: -/* 37A644 E0078254 0C080120 */ jal func_E0200480 +/* 37A644 E0078254 0C080120 */ jal shim_queue_render_task /* 37A648 E0078258 AFA20010 */ sw $v0, 0x10($sp) /* 37A64C E007825C 8C430000 */ lw $v1, ($v0) /* 37A650 E0078260 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_60/func_E007827C.s b/ver/us/asm/nonmatchings/effects/effect_60/func_E007827C.s index 9371337253..2a3389961c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_60/func_E007827C.s +++ b/ver/us/asm/nonmatchings/effects/effect_60/func_E007827C.s @@ -55,7 +55,7 @@ glabel func_E007827C /* 37A730 E0078340 8E06000C */ lw $a2, 0xc($s0) /* 37A734 E0078344 8E07001C */ lw $a3, 0x1c($s0) /* 37A738 E0078348 24840008 */ addiu $a0, $a0, 8 -/* 37A73C E007834C 0C08015C */ jal func_E0200570 +/* 37A73C E007834C 0C08015C */ jal shim_func_8011CFBC /* 37A740 E0078350 AEA40000 */ sw $a0, ($s5) /* 37A744 E0078354 0040182D */ daddu $v1, $v0, $zero /* 37A748 E0078358 24020005 */ addiu $v0, $zero, 5 diff --git a/ver/us/asm/nonmatchings/effects/effect_60/fx_60_main.s b/ver/us/asm/nonmatchings/effects/effect_60/fx_60_main.s index d76ff90b07..118ca7f5eb 100644 --- a/ver/us/asm/nonmatchings/effects/effect_60/fx_60_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_60/fx_60_main.s @@ -27,12 +27,12 @@ glabel fx_60_main /* 37A448 E0078058 AFB00028 */ sw $s0, 0x28($sp) /* 37A44C E007805C AFA00010 */ sw $zero, 0x10($sp) /* 37A450 E0078060 AFA00024 */ sw $zero, 0x24($sp) -/* 37A454 E0078064 0C080124 */ jal func_E0200490 +/* 37A454 E0078064 0C080124 */ jal shim_create_effect_instance /* 37A458 E0078068 AFA20014 */ sw $v0, 0x14($sp) /* 37A45C E007806C 24040024 */ addiu $a0, $zero, 0x24 /* 37A460 E0078070 24030001 */ addiu $v1, $zero, 1 /* 37A464 E0078074 0040882D */ daddu $s1, $v0, $zero -/* 37A468 E0078078 0C08012C */ jal func_E02004B0 +/* 37A468 E0078078 0C08012C */ jal shim_general_heap_malloc /* 37A46C E007807C AE230008 */ sw $v1, 8($s1) /* 37A470 E0078080 0040802D */ daddu $s0, $v0, $zero /* 37A474 E0078084 16000003 */ bnez $s0, .LE0078094 @@ -65,7 +65,7 @@ glabel fx_60_main /* 37A4D4 E00780E4 50400001 */ beql $v0, $zero, .LE00780EC /* 37A4D8 E00780E8 AC800000 */ sw $zero, ($a0) .LE00780EC: -/* 37A4DC E00780EC 0C080138 */ jal func_E02004E0 +/* 37A4DC E00780EC 0C080138 */ jal shim_rand_int /* 37A4E0 E00780F0 24040007 */ addiu $a0, $zero, 7 /* 37A4E4 E00780F4 AE020020 */ sw $v0, 0x20($s0) /* 37A4E8 E00780F8 8FA20064 */ lw $v0, 0x64($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_61/func_E007A50C.s b/ver/us/asm/nonmatchings/effects/effect_61/func_E007A50C.s index 9d8ccfc1ad..2350348680 100644 --- a/ver/us/asm/nonmatchings/effects/effect_61/func_E007A50C.s +++ b/ver/us/asm/nonmatchings/effects/effect_61/func_E007A50C.s @@ -16,7 +16,7 @@ glabel func_E007A50C /* 37CA78 E007A538 24020002 */ addiu $v0, $zero, 2 /* 37CA7C E007A53C 14E20005 */ bne $a3, $v0, .LE007A554 /* 37CA80 E007A540 00000000 */ nop -/* 37CA84 E007A544 0C080128 */ jal func_E02004A0 +/* 37CA84 E007A544 0C080128 */ jal shim_remove_effect /* 37CA88 E007A548 00000000 */ nop /* 37CA8C E007A54C 0801EA0D */ j .LE007A834 /* 37CA90 E007A550 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_61/func_E007A840.s b/ver/us/asm/nonmatchings/effects/effect_61/func_E007A840.s index 55f340dd6a..d3b52eb6c7 100644 --- a/ver/us/asm/nonmatchings/effects/effect_61/func_E007A840.s +++ b/ver/us/asm/nonmatchings/effects/effect_61/func_E007A840.s @@ -11,7 +11,7 @@ glabel func_E007A840 /* 37CD98 E007A858 27A40010 */ addiu $a0, $sp, 0x10 /* 37CD9C E007A85C AFBF0020 */ sw $ra, 0x20($sp) /* 37CDA0 E007A860 AFA00014 */ sw $zero, 0x14($sp) -/* 37CDA4 E007A864 0C080120 */ jal func_E0200480 +/* 37CDA4 E007A864 0C080120 */ jal shim_queue_render_task /* 37CDA8 E007A868 AFA20010 */ sw $v0, 0x10($sp) /* 37CDAC E007A86C 8C430000 */ lw $v1, ($v0) /* 37CDB0 E007A870 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_61/func_E007A88C.s b/ver/us/asm/nonmatchings/effects/effect_61/func_E007A88C.s index ed9185eb2b..8d1356785a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_61/func_E007A88C.s +++ b/ver/us/asm/nonmatchings/effects/effect_61/func_E007A88C.s @@ -50,7 +50,7 @@ glabel func_E007A88C /* 37CE80 E007A940 8E450008 */ lw $a1, 8($s2) /* 37CE84 E007A944 8E46000C */ lw $a2, 0xc($s2) /* 37CE88 E007A948 8E470010 */ lw $a3, 0x10($s2) -/* 37CE8C E007A94C 0C080108 */ jal func_E0200420 +/* 37CE8C E007A94C 0C080108 */ jal shim_guTranslateF /* 37CE90 E007A950 26520068 */ addiu $s2, $s2, 0x68 /* 37CE94 E007A954 27A40018 */ addiu $a0, $sp, 0x18 /* 37CE98 E007A958 3C148007 */ lui $s4, %hi(gMatrixListPos) @@ -61,7 +61,7 @@ glabel func_E007A88C /* 37CEAC E007A96C 8EC20000 */ lw $v0, ($s6) /* 37CEB0 E007A970 00052980 */ sll $a1, $a1, 6 /* 37CEB4 E007A974 00B02821 */ addu $a1, $a1, $s0 -/* 37CEB8 E007A978 0C080118 */ jal func_E0200460 +/* 37CEB8 E007A978 0C080118 */ jal shim_guMtxF2L /* 37CEBC E007A97C 00452821 */ addu $a1, $v0, $a1 /* 37CEC0 E007A980 3C03DA38 */ lui $v1, 0xda38 /* 37CEC4 E007A984 34630002 */ ori $v1, $v1, 2 @@ -108,7 +108,7 @@ glabel func_E007A88C /* 37CF64 E007AA24 8E05FFBC */ lw $a1, -0x44($s0) /* 37CF68 E007AA28 8E06FFC0 */ lw $a2, -0x40($s0) /* 37CF6C E007AA2C 8E07FFC4 */ lw $a3, -0x3c($s0) -/* 37CF70 E007AA30 0C080108 */ jal func_E0200420 +/* 37CF70 E007AA30 0C080108 */ jal shim_guTranslateF /* 37CF74 E007AA34 26B50001 */ addiu $s5, $s5, 1 /* 37CF78 E007AA38 3C08800B */ lui $t0, %hi(gCameras) /* 37CF7C E007AA3C 25081D80 */ addiu $t0, $t0, %lo(gCameras) @@ -128,38 +128,38 @@ glabel func_E007A88C /* 37CFB4 E007AA74 46000007 */ neg.s $f0, $f0 /* 37CFB8 E007AA78 44050000 */ mfc1 $a1, $f0 /* 37CFBC E007AA7C 0220202D */ daddu $a0, $s1, $zero -/* 37CFC0 E007AA80 0C080104 */ jal func_E0200410 +/* 37CFC0 E007AA80 0C080104 */ jal shim_guRotateF /* 37CFC4 E007AA84 E7B40010 */ swc1 $f20, 0x10($sp) /* 37CFC8 E007AA88 0220202D */ daddu $a0, $s1, $zero /* 37CFCC E007AA8C 27A50018 */ addiu $a1, $sp, 0x18 -/* 37CFD0 E007AA90 0C080114 */ jal func_E0200450 +/* 37CFD0 E007AA90 0C080114 */ jal shim_guMtxCatF /* 37CFD4 E007AA94 00A0302D */ daddu $a2, $a1, $zero /* 37CFD8 E007AA98 0220202D */ daddu $a0, $s1, $zero /* 37CFDC E007AA9C 8E05FFF8 */ lw $a1, -8($s0) /* 37CFE0 E007AAA0 8E06FFFC */ lw $a2, -4($s0) -/* 37CFE4 E007AAA4 0C080110 */ jal func_E0200440 +/* 37CFE4 E007AAA4 0C080110 */ jal shim_guScaleF /* 37CFE8 E007AAA8 00A0382D */ daddu $a3, $a1, $zero /* 37CFEC E007AAAC 0220202D */ daddu $a0, $s1, $zero /* 37CFF0 E007AAB0 27A50018 */ addiu $a1, $sp, 0x18 -/* 37CFF4 E007AAB4 0C080114 */ jal func_E0200450 +/* 37CFF4 E007AAB4 0C080114 */ jal shim_guMtxCatF /* 37CFF8 E007AAB8 00A0302D */ daddu $a2, $a1, $zero /* 37CFFC E007AABC 0220202D */ daddu $a0, $s1, $zero /* 37D000 E007AAC0 E7B60010 */ swc1 $f22, 0x10($sp) /* 37D004 E007AAC4 8E050000 */ lw $a1, ($s0) /* 37D008 E007AAC8 4406A000 */ mfc1 $a2, $f20 /* 37D00C E007AACC 4407A000 */ mfc1 $a3, $f20 -/* 37D010 E007AAD0 0C080104 */ jal func_E0200410 +/* 37D010 E007AAD0 0C080104 */ jal shim_guRotateF /* 37D014 E007AAD4 26100068 */ addiu $s0, $s0, 0x68 /* 37D018 E007AAD8 0220202D */ daddu $a0, $s1, $zero /* 37D01C E007AADC 27A50018 */ addiu $a1, $sp, 0x18 -/* 37D020 E007AAE0 0C080114 */ jal func_E0200450 +/* 37D020 E007AAE0 0C080114 */ jal shim_guMtxCatF /* 37D024 E007AAE4 00A0302D */ daddu $a2, $a1, $zero /* 37D028 E007AAE8 27A40018 */ addiu $a0, $sp, 0x18 /* 37D02C E007AAEC 96C50000 */ lhu $a1, ($s6) /* 37D030 E007AAF0 8EE20000 */ lw $v0, ($s7) /* 37D034 E007AAF4 00052980 */ sll $a1, $a1, 6 /* 37D038 E007AAF8 00B42821 */ addu $a1, $a1, $s4 -/* 37D03C E007AAFC 0C080118 */ jal func_E0200460 +/* 37D03C E007AAFC 0C080118 */ jal shim_guMtxF2L /* 37D040 E007AB00 00452821 */ addu $a1, $v0, $a1 /* 37D044 E007AB04 3C06D838 */ lui $a2, 0xd838 /* 37D048 E007AB08 8E640000 */ lw $a0, ($s3) diff --git a/ver/us/asm/nonmatchings/effects/effect_61/fx_61_main.s b/ver/us/asm/nonmatchings/effects/effect_61/fx_61_main.s index 125ceb17a6..2515cd1252 100644 --- a/ver/us/asm/nonmatchings/effects/effect_61/fx_61_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_61/fx_61_main.s @@ -39,7 +39,7 @@ glabel fx_61_main /* 37C5C8 E007A088 00000000 */ nop /* 37C5CC E007A08C 4501010F */ bc1t .LE007A4CC /* 37C5D0 E007A090 26520001 */ addiu $s2, $s2, 1 -/* 37C5D4 E007A094 0C080154 */ jal func_E0200550 +/* 37C5D4 E007A094 0C080154 */ jal shim_sqrtf /* 37C5D8 E007A098 00000000 */ nop /* 37C5DC E007A09C 3C01BF80 */ lui $at, 0xbf80 /* 37C5E0 E007A0A0 44811000 */ mtc1 $at, $f2 @@ -94,7 +94,7 @@ glabel fx_61_main /* 37C698 E007A158 00000000 */ nop /* 37C69C E007A15C 450100DB */ bc1t .LE007A4CC /* 37C6A0 E007A160 00000000 */ nop -/* 37C6A4 E007A164 0C080154 */ jal func_E0200550 +/* 37C6A4 E007A164 0C080154 */ jal shim_sqrtf /* 37C6A8 E007A168 00000000 */ nop /* 37C6AC E007A16C 3C013F80 */ lui $at, 0x3f80 /* 37C6B0 E007A170 44811000 */ mtc1 $at, $f2 @@ -136,7 +136,7 @@ glabel fx_61_main /* 37C740 E007A200 AC820010 */ sw $v0, 0x10($a0) /* 37C744 E007A204 2402003D */ addiu $v0, $zero, 0x3d /* 37C748 E007A208 AC800014 */ sw $zero, 0x14($a0) -/* 37C74C E007A20C 0C080124 */ jal func_E0200490 +/* 37C74C E007A20C 0C080124 */ jal shim_create_effect_instance /* 37C750 E007A210 AC820004 */ sw $v0, 4($a0) /* 37C754 E007A214 00122040 */ sll $a0, $s2, 1 /* 37C758 E007A218 00922021 */ addu $a0, $a0, $s2 @@ -144,7 +144,7 @@ glabel fx_61_main /* 37C760 E007A220 00922021 */ addu $a0, $a0, $s2 /* 37C764 E007A224 000420C0 */ sll $a0, $a0, 3 /* 37C768 E007A228 0040A02D */ daddu $s4, $v0, $zero -/* 37C76C E007A22C 0C08012C */ jal func_E02004B0 +/* 37C76C E007A22C 0C08012C */ jal shim_general_heap_malloc /* 37C770 E007A230 AE920008 */ sw $s2, 8($s4) /* 37C774 E007A234 0040182D */ daddu $v1, $v0, $zero /* 37C778 E007A238 14600003 */ bnez $v1, .LE007A248 @@ -184,7 +184,7 @@ glabel fx_61_main /* 37C7F4 E007A2B4 AE00FFAC */ sw $zero, -0x54($s0) /* 37C7F8 E007A2B8 AE00FFB0 */ sw $zero, -0x50($s0) /* 37C7FC E007A2BC AE00FFB4 */ sw $zero, -0x4c($s0) -/* 37C800 E007A2C0 0C080104 */ jal func_E0200410 +/* 37C800 E007A2C0 0C080104 */ jal shim_guRotateF /* 37C804 E007A2C4 E7BA0010 */ swc1 $f26, 0x10($sp) /* 37C808 E007A2C8 3C01E008 */ lui $at, %hi(D_E007AC00) /* 37C80C E007A2CC D42EAC00 */ ldc1 $f14, %lo(D_E007AC00)($at) diff --git a/ver/us/asm/nonmatchings/effects/effect_62/func_E007C130.s b/ver/us/asm/nonmatchings/effects/effect_62/func_E007C130.s index 48d00c324d..59c2daaadf 100644 --- a/ver/us/asm/nonmatchings/effects/effect_62/func_E007C130.s +++ b/ver/us/asm/nonmatchings/effects/effect_62/func_E007C130.s @@ -23,7 +23,7 @@ glabel func_E007C130 /* 37D608 E007C178 46001083 */ div.s $f2, $f2, $f0 /* 37D60C E007C17C 04610005 */ bgez $v1, .LE007C194 /* 37D610 E007C180 E4A20020 */ swc1 $f2, 0x20($a1) -/* 37D614 E007C184 0C080128 */ jal func_E02004A0 +/* 37D614 E007C184 0C080128 */ jal shim_remove_effect /* 37D618 E007C188 00000000 */ nop /* 37D61C E007C18C 0801F069 */ j .LE007C1A4 /* 37D620 E007C190 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_62/func_E007C1B0.s b/ver/us/asm/nonmatchings/effects/effect_62/func_E007C1B0.s index 799239b647..240b5b653d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_62/func_E007C1B0.s +++ b/ver/us/asm/nonmatchings/effects/effect_62/func_E007C1B0.s @@ -11,7 +11,7 @@ glabel func_E007C1B0 /* 37D658 E007C1C8 27A40010 */ addiu $a0, $sp, 0x10 /* 37D65C E007C1CC AFBF0020 */ sw $ra, 0x20($sp) /* 37D660 E007C1D0 AFA00014 */ sw $zero, 0x14($sp) -/* 37D664 E007C1D4 0C080120 */ jal func_E0200480 +/* 37D664 E007C1D4 0C080120 */ jal shim_queue_render_task /* 37D668 E007C1D8 AFA20010 */ sw $v0, 0x10($sp) /* 37D66C E007C1DC 8C430000 */ lw $v1, ($v0) /* 37D670 E007C1E0 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_62/func_E007C1F4.s b/ver/us/asm/nonmatchings/effects/effect_62/func_E007C1F4.s index 4ed2109784..1018fdb0ff 100644 --- a/ver/us/asm/nonmatchings/effects/effect_62/func_E007C1F4.s +++ b/ver/us/asm/nonmatchings/effects/effect_62/func_E007C1F4.s @@ -68,7 +68,7 @@ glabel func_E007C1F4 /* 37D780 E007C2F0 8E27000C */ lw $a3, 0xc($s1) /* 37D784 E007C2F4 4600110D */ trunc.w.s $f4, $f2 /* 37D788 E007C2F8 44152000 */ mfc1 $s5, $f4 -/* 37D78C E007C2FC 0C080108 */ jal func_E0200420 +/* 37D78C E007C2FC 0C080108 */ jal shim_guTranslateF /* 37D790 E007C300 36731630 */ ori $s3, $s3, 0x1630 /* 37D794 E007C304 27B00058 */ addiu $s0, $sp, 0x58 /* 37D798 E007C308 4480B000 */ mtc1 $zero, $f22 @@ -91,31 +91,31 @@ glabel func_E007C1F4 /* 37D7DC E007C34C 46000007 */ neg.s $f0, $f0 /* 37D7E0 E007C350 44050000 */ mfc1 $a1, $f0 /* 37D7E4 E007C354 0200202D */ daddu $a0, $s0, $zero -/* 37D7E8 E007C358 0C080104 */ jal func_E0200410 +/* 37D7E8 E007C358 0C080104 */ jal shim_guRotateF /* 37D7EC E007C35C E7B60010 */ swc1 $f22, 0x10($sp) /* 37D7F0 E007C360 0200202D */ daddu $a0, $s0, $zero /* 37D7F4 E007C364 27A50018 */ addiu $a1, $sp, 0x18 /* 37D7F8 E007C368 27B00098 */ addiu $s0, $sp, 0x98 -/* 37D7FC E007C36C 0C080114 */ jal func_E0200450 +/* 37D7FC E007C36C 0C080114 */ jal shim_guMtxCatF /* 37D800 E007C370 0200302D */ daddu $a2, $s0, $zero /* 37D804 E007C374 27A40018 */ addiu $a0, $sp, 0x18 /* 37D808 E007C378 8E250010 */ lw $a1, 0x10($s1) /* 37D80C E007C37C 4407A000 */ mfc1 $a3, $f20 -/* 37D810 E007C380 0C080110 */ jal func_E0200440 +/* 37D810 E007C380 0C080110 */ jal shim_guScaleF /* 37D814 E007C384 00A0302D */ daddu $a2, $a1, $zero /* 37D818 E007C388 27A40018 */ addiu $a0, $sp, 0x18 /* 37D81C E007C38C 0200282D */ daddu $a1, $s0, $zero -/* 37D820 E007C390 0C080114 */ jal func_E0200450 +/* 37D820 E007C390 0C080114 */ jal shim_guMtxCatF /* 37D824 E007C394 0200302D */ daddu $a2, $s0, $zero /* 37D828 E007C398 4406B000 */ mfc1 $a2, $f22 /* 37D82C E007C39C 27A40018 */ addiu $a0, $sp, 0x18 /* 37D830 E007C3A0 E7B40010 */ swc1 $f20, 0x10($sp) /* 37D834 E007C3A4 8E250024 */ lw $a1, 0x24($s1) -/* 37D838 E007C3A8 0C080104 */ jal func_E0200410 +/* 37D838 E007C3A8 0C080104 */ jal shim_guRotateF /* 37D83C E007C3AC 00C0382D */ daddu $a3, $a2, $zero /* 37D840 E007C3B0 27A40018 */ addiu $a0, $sp, 0x18 /* 37D844 E007C3B4 0200282D */ daddu $a1, $s0, $zero -/* 37D848 E007C3B8 0C080114 */ jal func_E0200450 +/* 37D848 E007C3B8 0C080114 */ jal shim_guMtxCatF /* 37D84C E007C3BC 0200302D */ daddu $a2, $s0, $zero /* 37D850 E007C3C0 0200202D */ daddu $a0, $s0, $zero /* 37D854 E007C3C4 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -126,7 +126,7 @@ glabel func_E007C1F4 /* 37D868 E007C3D8 8E420000 */ lw $v0, ($s2) /* 37D86C E007C3DC 00052980 */ sll $a1, $a1, 6 /* 37D870 E007C3E0 00B32821 */ addu $a1, $a1, $s3 -/* 37D874 E007C3E4 0C080118 */ jal func_E0200460 +/* 37D874 E007C3E4 0C080118 */ jal shim_guMtxF2L /* 37D878 E007C3E8 00452821 */ addu $a1, $v0, $a1 /* 37D87C E007C3EC 8E850000 */ lw $a1, ($s4) /* 37D880 E007C3F0 3C014080 */ lui $at, 0x4080 diff --git a/ver/us/asm/nonmatchings/effects/effect_62/fx_62_main.s b/ver/us/asm/nonmatchings/effects/effect_62/fx_62_main.s index 65fe1e28a7..bbcc475a42 100644 --- a/ver/us/asm/nonmatchings/effects/effect_62/fx_62_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_62/fx_62_main.s @@ -29,12 +29,12 @@ glabel fx_62_main /* 37D4F0 E007C060 AFB00028 */ sw $s0, 0x28($sp) /* 37D4F4 E007C064 AFA00010 */ sw $zero, 0x10($sp) /* 37D4F8 E007C068 AFA00024 */ sw $zero, 0x24($sp) -/* 37D4FC E007C06C 0C080124 */ jal func_E0200490 +/* 37D4FC E007C06C 0C080124 */ jal shim_create_effect_instance /* 37D500 E007C070 AFA20014 */ sw $v0, 0x14($sp) /* 37D504 E007C074 2404002C */ addiu $a0, $zero, 0x2c /* 37D508 E007C078 24110001 */ addiu $s1, $zero, 1 /* 37D50C E007C07C 0040802D */ daddu $s0, $v0, $zero -/* 37D510 E007C080 0C08012C */ jal func_E02004B0 +/* 37D510 E007C080 0C08012C */ jal shim_general_heap_malloc /* 37D514 E007C084 AE110008 */ sw $s1, 8($s0) /* 37D518 E007C088 AE02000C */ sw $v0, 0xc($s0) /* 37D51C E007C08C 0040802D */ daddu $s0, $v0, $zero @@ -48,7 +48,7 @@ glabel fx_62_main /* 37D534 E007C0A4 00B12821 */ addu $a1, $a1, $s1 /* 37D538 E007C0A8 00052880 */ sll $a1, $a1, 2 /* 37D53C E007C0AC 00B12823 */ subu $a1, $a1, $s1 -/* 37D540 E007C0B0 0C080130 */ jal func_E02004C0 +/* 37D540 E007C0B0 0C080130 */ jal shim_mem_clear /* 37D544 E007C0B4 00052880 */ sll $a1, $a1, 2 /* 37D548 E007C0B8 AE120014 */ sw $s2, 0x14($s0) /* 37D54C E007C0BC AE000018 */ sw $zero, 0x18($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_63/func_E007E204.s b/ver/us/asm/nonmatchings/effects/effect_63/func_E007E204.s index 092a2a8da3..e2244fcb6a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_63/func_E007E204.s +++ b/ver/us/asm/nonmatchings/effects/effect_63/func_E007E204.s @@ -17,7 +17,7 @@ glabel func_E007E204 /* 37F954 E007E234 24020007 */ addiu $v0, $zero, 7 /* 37F958 E007E238 14A20005 */ bne $a1, $v0, .LE007E250 /* 37F95C E007E23C AE030040 */ sw $v1, 0x40($s0) -/* 37F960 E007E240 0C080128 */ jal func_E02004A0 +/* 37F960 E007E240 0C080128 */ jal shim_remove_effect /* 37F964 E007E244 00000000 */ nop /* 37F968 E007E248 0801F93D */ j .LE007E4F4 /* 37F96C E007E24C 00000000 */ nop @@ -31,7 +31,7 @@ glabel func_E007E204 /* 37F988 E007E268 00400008 */ jr $v0 /* 37F98C E007E26C 00000000 */ nop glabel LE007E270_37F990 -/* 37F990 E007E270 0C080150 */ jal func_E0200540 +/* 37F990 E007E270 0C080150 */ jal shim_load_effect /* 37F994 E007E274 2404002D */ addiu $a0, $zero, 0x2d /* 37F998 E007E278 C6020008 */ lwc1 $f2, 8($s0) /* 37F99C E007E27C 3C014120 */ lui $at, 0x4120 diff --git a/ver/us/asm/nonmatchings/effects/effect_63/func_E007E508.s b/ver/us/asm/nonmatchings/effects/effect_63/func_E007E508.s index ea93085c92..d36989d971 100644 --- a/ver/us/asm/nonmatchings/effects/effect_63/func_E007E508.s +++ b/ver/us/asm/nonmatchings/effects/effect_63/func_E007E508.s @@ -11,7 +11,7 @@ glabel func_E007E508 /* 37FC40 E007E520 27A40010 */ addiu $a0, $sp, 0x10 /* 37FC44 E007E524 AFBF0020 */ sw $ra, 0x20($sp) /* 37FC48 E007E528 AFA00014 */ sw $zero, 0x14($sp) -/* 37FC4C E007E52C 0C080120 */ jal func_E0200480 +/* 37FC4C E007E52C 0C080120 */ jal shim_queue_render_task /* 37FC50 E007E530 AFA20010 */ sw $v0, 0x10($sp) /* 37FC54 E007E534 8C430000 */ lw $v1, ($v0) /* 37FC58 E007E538 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_63/func_E007E54C.s b/ver/us/asm/nonmatchings/effects/effect_63/func_E007E54C.s index 2a5145647c..2101069fdb 100644 --- a/ver/us/asm/nonmatchings/effects/effect_63/func_E007E54C.s +++ b/ver/us/asm/nonmatchings/effects/effect_63/func_E007E54C.s @@ -52,7 +52,7 @@ glabel func_E007E54C /* 37FD28 E007E608 8E26000C */ lw $a2, 0xc($s1) /* 37FD2C E007E60C 8E270010 */ lw $a3, 0x10($s1) /* 37FD30 E007E610 4480A000 */ mtc1 $zero, $f20 -/* 37FD34 E007E614 0C080108 */ jal func_E0200420 +/* 37FD34 E007E614 0C080108 */ jal shim_guTranslateF /* 37FD38 E007E618 36941630 */ ori $s4, $s4, 0x1630 /* 37FD3C E007E61C 27B50058 */ addiu $s5, $sp, 0x58 /* 37FD40 E007E620 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -72,11 +72,11 @@ glabel func_E007E54C /* 37FD78 E007E658 46000007 */ neg.s $f0, $f0 /* 37FD7C E007E65C 44050000 */ mfc1 $a1, $f0 /* 37FD80 E007E660 02A0202D */ daddu $a0, $s5, $zero -/* 37FD84 E007E664 0C080104 */ jal func_E0200410 +/* 37FD84 E007E664 0C080104 */ jal shim_guRotateF /* 37FD88 E007E668 E7B40010 */ swc1 $f20, 0x10($sp) /* 37FD8C E007E66C 02A0202D */ daddu $a0, $s5, $zero /* 37FD90 E007E670 27A50018 */ addiu $a1, $sp, 0x18 -/* 37FD94 E007E674 0C080114 */ jal func_E0200450 +/* 37FD94 E007E674 0C080114 */ jal shim_guMtxCatF /* 37FD98 E007E678 00A0302D */ daddu $a2, $a1, $zero /* 37FD9C E007E67C 27A40018 */ addiu $a0, $sp, 0x18 /* 37FDA0 E007E680 3C138007 */ lui $s3, %hi(gMatrixListPos) @@ -87,7 +87,7 @@ glabel func_E007E54C /* 37FDB4 E007E694 8EE20000 */ lw $v0, ($s7) /* 37FDB8 E007E698 00052980 */ sll $a1, $a1, 6 /* 37FDBC E007E69C 00B42821 */ addu $a1, $a1, $s4 -/* 37FDC0 E007E6A0 0C080118 */ jal func_E0200460 +/* 37FDC0 E007E6A0 0C080118 */ jal shim_guMtxF2L /* 37FDC4 E007E6A4 00452821 */ addu $a1, $v0, $a1 /* 37FDC8 E007E6A8 3C03DA38 */ lui $v1, 0xda38 /* 37FDCC E007E6AC 34630002 */ ori $v1, $v1, 2 @@ -126,14 +126,14 @@ glabel func_E007E54C /* 37FE50 E007E730 4405A000 */ mfc1 $a1, $f20 /* 37FE54 E007E734 3C064180 */ lui $a2, 0x4180 /* 37FE58 E007E738 4407A000 */ mfc1 $a3, $f20 -/* 37FE5C E007E73C 0C080108 */ jal func_E0200420 +/* 37FE5C E007E73C 0C080108 */ jal shim_guTranslateF /* 37FE60 E007E740 27A40018 */ addiu $a0, $sp, 0x18 /* 37FE64 E007E744 27A40018 */ addiu $a0, $sp, 0x18 /* 37FE68 E007E748 96650000 */ lhu $a1, ($s3) /* 37FE6C E007E74C 8EE20000 */ lw $v0, ($s7) /* 37FE70 E007E750 00052980 */ sll $a1, $a1, 6 /* 37FE74 E007E754 00B42821 */ addu $a1, $a1, $s4 -/* 37FE78 E007E758 0C080118 */ jal func_E0200460 +/* 37FE78 E007E758 0C080118 */ jal shim_guMtxF2L /* 37FE7C E007E75C 00452821 */ addu $a1, $v0, $a1 /* 37FE80 E007E760 8EC40000 */ lw $a0, ($s6) /* 37FE84 E007E764 24120001 */ addiu $s2, $zero, 1 @@ -179,23 +179,23 @@ glabel func_E007E54C /* 37FF20 E007E800 4407A000 */ mfc1 $a3, $f20 /* 37FF24 E007E804 E7A00010 */ swc1 $f0, 0x10($sp) /* 37FF28 E007E808 8E050014 */ lw $a1, 0x14($s0) -/* 37FF2C E007E80C 0C080104 */ jal func_E0200410 +/* 37FF2C E007E80C 0C080104 */ jal shim_guRotateF /* 37FF30 E007E810 27A40018 */ addiu $a0, $sp, 0x18 /* 37FF34 E007E814 8E05FFF8 */ lw $a1, -8($s0) /* 37FF38 E007E818 8E06FFFC */ lw $a2, -4($s0) /* 37FF3C E007E81C 8E070000 */ lw $a3, ($s0) -/* 37FF40 E007E820 0C080108 */ jal func_E0200420 +/* 37FF40 E007E820 0C080108 */ jal shim_guTranslateF /* 37FF44 E007E824 02A0202D */ daddu $a0, $s5, $zero /* 37FF48 E007E828 02A0202D */ daddu $a0, $s5, $zero /* 37FF4C E007E82C 27A50018 */ addiu $a1, $sp, 0x18 -/* 37FF50 E007E830 0C080114 */ jal func_E0200450 +/* 37FF50 E007E830 0C080114 */ jal shim_guMtxCatF /* 37FF54 E007E834 00A0302D */ daddu $a2, $a1, $zero /* 37FF58 E007E838 27A40018 */ addiu $a0, $sp, 0x18 /* 37FF5C E007E83C 96E50000 */ lhu $a1, ($s7) /* 37FF60 E007E840 8FC20000 */ lw $v0, ($fp) /* 37FF64 E007E844 00052980 */ sll $a1, $a1, 6 /* 37FF68 E007E848 00B42821 */ addu $a1, $a1, $s4 -/* 37FF6C E007E84C 0C080118 */ jal func_E0200460 +/* 37FF6C E007E84C 0C080118 */ jal shim_guMtxF2L /* 37FF70 E007E850 00452821 */ addu $a1, $v0, $a1 /* 37FF74 E007E854 8E650000 */ lw $a1, ($s3) /* 37FF78 E007E858 3C060900 */ lui $a2, 0x900 @@ -364,27 +364,27 @@ glabel func_E007E54C /* 3801F4 E007EAD4 AC760064 */ sw $s6, 0x64($v1) /* 3801F8 E007EAD8 AE220000 */ sw $v0, ($s1) /* 3801FC E007EADC AC680068 */ sw $t0, 0x68($v1) -/* 380200 E007EAE0 0C080108 */ jal func_E0200420 +/* 380200 E007EAE0 0C080108 */ jal shim_guTranslateF /* 380204 E007EAE4 AC78006C */ sw $t8, 0x6c($v1) /* 380208 E007EAE8 27B00058 */ addiu $s0, $sp, 0x58 /* 38020C E007EAEC 4405C000 */ mfc1 $a1, $f24 /* 380210 E007EAF0 0200202D */ daddu $a0, $s0, $zero /* 380214 E007EAF4 00A0302D */ daddu $a2, $a1, $zero -/* 380218 E007EAF8 0C080110 */ jal func_E0200440 +/* 380218 E007EAF8 0C080110 */ jal shim_guScaleF /* 38021C E007EAFC 00A0382D */ daddu $a3, $a1, $zero /* 380220 E007EB00 0200202D */ daddu $a0, $s0, $zero /* 380224 E007EB04 27A50018 */ addiu $a1, $sp, 0x18 -/* 380228 E007EB08 0C080114 */ jal func_E0200450 +/* 380228 E007EB08 0C080114 */ jal shim_guMtxCatF /* 38022C E007EB0C 00A0302D */ daddu $a2, $a1, $zero /* 380230 E007EB10 4405D000 */ mfc1 $a1, $f26 /* 380234 E007EB14 4406A000 */ mfc1 $a2, $f20 /* 380238 E007EB18 3C073F80 */ lui $a3, 0x3f80 /* 38023C E007EB1C 0200202D */ daddu $a0, $s0, $zero -/* 380240 E007EB20 0C080104 */ jal func_E0200410 +/* 380240 E007EB20 0C080104 */ jal shim_guRotateF /* 380244 E007EB24 AFA60010 */ sw $a2, 0x10($sp) /* 380248 E007EB28 0200202D */ daddu $a0, $s0, $zero /* 38024C E007EB2C 27A50018 */ addiu $a1, $sp, 0x18 -/* 380250 E007EB30 0C080114 */ jal func_E0200450 +/* 380250 E007EB30 0C080114 */ jal shim_guMtxCatF /* 380254 E007EB34 00A0302D */ daddu $a2, $a1, $zero /* 380258 E007EB38 27A40018 */ addiu $a0, $sp, 0x18 /* 38025C E007EB3C 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -395,7 +395,7 @@ glabel func_E007E54C /* 380270 E007EB50 8E420000 */ lw $v0, ($s2) /* 380274 E007EB54 00052980 */ sll $a1, $a1, 6 /* 380278 E007EB58 00BE2821 */ addu $a1, $a1, $fp -/* 38027C E007EB5C 0C080118 */ jal func_E0200460 +/* 38027C E007EB5C 0C080118 */ jal shim_guMtxF2L /* 380280 E007EB60 00452821 */ addu $a1, $v0, $a1 /* 380284 E007EB64 3C06D838 */ lui $a2, 0xd838 /* 380288 E007EB68 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/asm/nonmatchings/effects/effect_63/fx_63_main.s b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_main.s index 04d9373a8f..1e940b3de7 100644 --- a/ver/us/asm/nonmatchings/effects/effect_63/fx_63_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_main.s @@ -32,12 +32,12 @@ glabel fx_63_main /* 37F78C E007E06C AFB1002C */ sw $s1, 0x2c($sp) /* 37F790 E007E070 AFA00010 */ sw $zero, 0x10($sp) /* 37F794 E007E074 AFA00024 */ sw $zero, 0x24($sp) -/* 37F798 E007E078 0C080124 */ jal func_E0200490 +/* 37F798 E007E078 0C080124 */ jal shim_create_effect_instance /* 37F79C E007E07C AFA20014 */ sw $v0, 0x14($sp) /* 37F7A0 E007E080 24040934 */ addiu $a0, $zero, 0x934 /* 37F7A4 E007E084 2414001F */ addiu $s4, $zero, 0x1f /* 37F7A8 E007E088 0040982D */ daddu $s3, $v0, $zero -/* 37F7AC E007E08C 0C08012C */ jal func_E02004B0 +/* 37F7AC E007E08C 0C08012C */ jal shim_general_heap_malloc /* 37F7B0 E007E090 AE740008 */ sw $s4, 8($s3) /* 37F7B4 E007E094 0040882D */ daddu $s1, $v0, $zero /* 37F7B8 E007E098 16200003 */ bnez $s1, .LE007E0A8 diff --git a/ver/us/asm/nonmatchings/effects/effect_64/func_E00801D0.s b/ver/us/asm/nonmatchings/effects/effect_64/func_E00801D0.s index 4188e83043..9c82b2410f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_64/func_E00801D0.s +++ b/ver/us/asm/nonmatchings/effects/effect_64/func_E00801D0.s @@ -24,7 +24,7 @@ glabel func_E00801D0 /* 3814DC E008021C 24420001 */ addiu $v0, $v0, 1 /* 3814E0 E0080220 04810005 */ bgez $a0, .LE0080238 /* 3814E4 E0080224 AC620030 */ sw $v0, 0x30($v1) -/* 3814E8 E0080228 0C080128 */ jal func_E02004A0 +/* 3814E8 E0080228 0C080128 */ jal shim_remove_effect /* 3814EC E008022C 02A0202D */ daddu $a0, $s5, $zero /* 3814F0 E0080230 080200FC */ j .LE00803F0 /* 3814F4 E0080234 00000000 */ nop @@ -85,7 +85,7 @@ glabel func_E00801D0 /* 3815BC E00802FC 46020000 */ add.s $f0, $f0, $f2 /* 3815C0 E0080300 E606FFD8 */ swc1 $f6, -0x28($s0) /* 3815C4 E0080304 E604FFDC */ swc1 $f4, -0x24($s0) -/* 3815C8 E0080308 0C080140 */ jal func_E0200500 +/* 3815C8 E0080308 0C080140 */ jal shim_sin_deg /* 3815CC E008030C E600FFE0 */ swc1 $f0, -0x20($s0) /* 3815D0 E0080310 3C01C1F0 */ lui $at, 0xc1f0 /* 3815D4 E0080314 44811000 */ mtc1 $at, $f2 @@ -93,7 +93,7 @@ glabel func_E00801D0 /* 3815DC E008031C 46020002 */ mul.s $f0, $f0, $f2 /* 3815E0 E0080320 00000000 */ nop /* 3815E4 E0080324 4600A306 */ mov.s $f12, $f20 -/* 3815E8 E0080328 0C080144 */ jal func_E0200510 +/* 3815E8 E0080328 0C080144 */ jal shim_cos_deg /* 3815EC E008032C E600FFF0 */ swc1 $f0, -0x10($s0) /* 3815F0 E0080330 3C014100 */ lui $at, 0x4100 /* 3815F4 E0080334 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/effects/effect_64/func_E0080448.s b/ver/us/asm/nonmatchings/effects/effect_64/func_E0080448.s index 27204573a1..80ca72cefe 100644 --- a/ver/us/asm/nonmatchings/effects/effect_64/func_E0080448.s +++ b/ver/us/asm/nonmatchings/effects/effect_64/func_E0080448.s @@ -44,7 +44,7 @@ glabel func_E0080448 /* 3817A4 E00804E4 8E460008 */ lw $a2, 8($s2) /* 3817A8 E00804E8 8E47000C */ lw $a3, 0xc($s2) /* 3817AC E00804EC 25080008 */ addiu $t0, $t0, 8 -/* 3817B0 E00804F0 0C080108 */ jal func_E0200420 +/* 3817B0 E00804F0 0C080108 */ jal shim_guTranslateF /* 3817B4 E00804F4 AE680000 */ sw $t0, ($s3) /* 3817B8 E00804F8 27B50058 */ addiu $s5, $sp, 0x58 /* 3817BC E00804FC 3C013F80 */ lui $at, 0x3f80 @@ -67,12 +67,12 @@ glabel func_E0080448 /* 381800 E0080540 46000007 */ neg.s $f0, $f0 /* 381804 E0080544 44050000 */ mfc1 $a1, $f0 /* 381808 E0080548 02A0202D */ daddu $a0, $s5, $zero -/* 38180C E008054C 0C080104 */ jal func_E0200410 +/* 38180C E008054C 0C080104 */ jal shim_guRotateF /* 381810 E0080550 AFA60010 */ sw $a2, 0x10($sp) /* 381814 E0080554 02A0202D */ daddu $a0, $s5, $zero /* 381818 E0080558 27A50018 */ addiu $a1, $sp, 0x18 /* 38181C E008055C 27B00098 */ addiu $s0, $sp, 0x98 -/* 381820 E0080560 0C080114 */ jal func_E0200450 +/* 381820 E0080560 0C080114 */ jal shim_guMtxCatF /* 381824 E0080564 0200302D */ daddu $a2, $s0, $zero /* 381828 E0080568 0200202D */ daddu $a0, $s0, $zero /* 38182C E008056C 3C168007 */ lui $s6, %hi(gMatrixListPos) @@ -83,7 +83,7 @@ glabel func_E0080448 /* 381840 E0080580 8FC20000 */ lw $v0, ($fp) /* 381844 E0080584 00052980 */ sll $a1, $a1, 6 /* 381848 E0080588 00B12821 */ addu $a1, $a1, $s1 -/* 38184C E008058C 0C080118 */ jal func_E0200460 +/* 38184C E008058C 0C080118 */ jal shim_guMtxF2L /* 381850 E0080590 00452821 */ addu $a1, $v0, $a1 /* 381854 E0080594 240A0001 */ addiu $t2, $zero, 1 /* 381858 E0080598 8E650000 */ lw $a1, ($s3) @@ -197,16 +197,16 @@ glabel func_E0080448 /* 3819F0 E0080730 8E26FFEC */ lw $a2, -0x14($s1) /* 3819F4 E0080734 8E27FFF0 */ lw $a3, -0x10($s1) /* 3819F8 E0080738 44051000 */ mfc1 $a1, $f2 -/* 3819FC E008073C 0C080108 */ jal func_E0200420 +/* 3819FC E008073C 0C080108 */ jal shim_guTranslateF /* 381A00 E0080740 27A40018 */ addiu $a0, $sp, 0x18 /* 381A04 E0080744 8E25001C */ lw $a1, 0x1c($s1) /* 381A08 E0080748 8E260020 */ lw $a2, 0x20($s1) /* 381A0C E008074C 4407A000 */ mfc1 $a3, $f20 -/* 381A10 E0080750 0C080110 */ jal func_E0200440 +/* 381A10 E0080750 0C080110 */ jal shim_guScaleF /* 381A14 E0080754 8FA400E0 */ lw $a0, 0xe0($sp) /* 381A18 E0080758 27A50018 */ addiu $a1, $sp, 0x18 /* 381A1C E008075C 8FA400E0 */ lw $a0, 0xe0($sp) -/* 381A20 E0080760 0C080114 */ jal func_E0200450 +/* 381A20 E0080760 0C080114 */ jal shim_guMtxCatF /* 381A24 E0080764 00A0302D */ daddu $a2, $a1, $zero /* 381A28 E0080768 27A40018 */ addiu $a0, $sp, 0x18 /* 381A2C E008076C 96C50000 */ lhu $a1, ($s6) @@ -214,7 +214,7 @@ glabel func_E0080448 /* 381A34 E0080774 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 381A38 E0080778 00052980 */ sll $a1, $a1, 6 /* 381A3C E008077C 00B52821 */ addu $a1, $a1, $s5 -/* 381A40 E0080780 0C080118 */ jal func_E0200460 +/* 381A40 E0080780 0C080118 */ jal shim_guMtxF2L /* 381A44 E0080784 00452821 */ addu $a1, $v0, $a1 /* 381A48 E0080788 27A40018 */ addiu $a0, $sp, 0x18 /* 381A4C E008078C 8E080000 */ lw $t0, ($s0) @@ -237,7 +237,7 @@ glabel func_E0080448 /* 381A90 E00807D0 25290001 */ addiu $t1, $t1, 1 /* 381A94 E00807D4 AE080000 */ sw $t0, ($s0) /* 381A98 E00807D8 A6C90000 */ sh $t1, ($s6) -/* 381A9C E00807DC 0C080104 */ jal func_E0200410 +/* 381A9C E00807DC 0C080104 */ jal shim_guRotateF /* 381AA0 E00807E0 00C0382D */ daddu $a3, $a2, $zero /* 381AA4 E00807E4 27A40018 */ addiu $a0, $sp, 0x18 /* 381AA8 E00807E8 96C50000 */ lhu $a1, ($s6) @@ -245,7 +245,7 @@ glabel func_E0080448 /* 381AB0 E00807F0 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 381AB4 E00807F4 00052980 */ sll $a1, $a1, 6 /* 381AB8 E00807F8 00B52821 */ addu $a1, $a1, $s5 -/* 381ABC E00807FC 0C080118 */ jal func_E0200460 +/* 381ABC E00807FC 0C080118 */ jal shim_guMtxF2L /* 381AC0 E0080800 00452821 */ addu $a1, $v0, $a1 /* 381AC4 E0080804 8E050000 */ lw $a1, ($s0) /* 381AC8 E0080808 96C30000 */ lhu $v1, ($s6) diff --git a/ver/us/asm/nonmatchings/effects/effect_64/fx_64_main.s b/ver/us/asm/nonmatchings/effects/effect_64/fx_64_main.s index 28698d8f37..68c4c5a5ad 100644 --- a/ver/us/asm/nonmatchings/effects/effect_64/fx_64_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_64/fx_64_main.s @@ -31,12 +31,12 @@ glabel fx_64_main /* 381328 E0080068 AFB20030 */ sw $s2, 0x30($sp) /* 38132C E008006C AFB1002C */ sw $s1, 0x2c($sp) /* 381330 E0080070 AFA00010 */ sw $zero, 0x10($sp) -/* 381334 E0080074 0C080124 */ jal func_E0200490 +/* 381334 E0080074 0C080124 */ jal shim_create_effect_instance /* 381338 E0080078 AFA20014 */ sw $v0, 0x14($sp) /* 38133C E008007C 24040090 */ addiu $a0, $zero, 0x90 /* 381340 E0080080 24120002 */ addiu $s2, $zero, 2 /* 381344 E0080084 0040882D */ daddu $s1, $v0, $zero -/* 381348 E0080088 0C08012C */ jal func_E02004B0 +/* 381348 E0080088 0C08012C */ jal shim_general_heap_malloc /* 38134C E008008C AE320008 */ sw $s2, 8($s1) /* 381350 E0080090 0040182D */ daddu $v1, $v0, $zero /* 381354 E0080094 14600003 */ bnez $v1, .LE00800A4 diff --git a/ver/us/asm/nonmatchings/effects/effect_65/func_E00821B8.s b/ver/us/asm/nonmatchings/effects/effect_65/func_E00821B8.s index daa59ddfb8..621dc4785c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_65/func_E00821B8.s +++ b/ver/us/asm/nonmatchings/effects/effect_65/func_E00821B8.s @@ -34,7 +34,7 @@ glabel func_E00821B8 /* 385864 E0082224 8E020028 */ lw $v0, 0x28($s0) /* 385868 E0082228 04410005 */ bgez $v0, .LE0082240 /* 38586C E008222C 3C030004 */ lui $v1, 4 -/* 385870 E0082230 0C080128 */ jal func_E02004A0 +/* 385870 E0082230 0C080128 */ jal shim_remove_effect /* 385874 E0082234 0280202D */ daddu $a0, $s4, $zero /* 385878 E0082238 0802093B */ j .LE00824EC /* 38587C E008223C 00000000 */ nop @@ -84,7 +84,7 @@ glabel func_E00821B8 /* 385920 E00822E0 E7A00010 */ swc1 $f0, 0x10($sp) /* 385924 E00822E4 8E060008 */ lw $a2, 8($s0) /* 385928 E00822E8 8E07000C */ lw $a3, 0xc($s0) -/* 38592C E00822EC 0C0801A0 */ jal func_E0200680 +/* 38592C E00822EC 0C0801A0 */ jal shim_sfx_play_sound_at_position /* 385930 E00822F0 0000282D */ daddu $a1, $zero, $zero /* 385934 E00822F4 080208D1 */ j .LE0082344 /* 385938 E00822F8 24020008 */ addiu $v0, $zero, 8 @@ -92,7 +92,7 @@ glabel func_E00821B8 /* 38593C E00822FC 0064102A */ slt $v0, $v1, $a0 /* 385940 E0082300 10400010 */ beqz $v0, .LE0082344 /* 385944 E0082304 24020008 */ addiu $v0, $zero, 8 -/* 385948 E0082308 0C080150 */ jal func_E0200540 +/* 385948 E0082308 0C080150 */ jal shim_load_effect /* 38594C E008230C 24040041 */ addiu $a0, $zero, 0x41 /* 385950 E0082310 C602000C */ lwc1 $f2, 0xc($s0) /* 385954 E0082314 C6000068 */ lwc1 $f0, 0x68($s0) @@ -153,7 +153,7 @@ glabel func_E00821B8 /* 385A18 E00823D8 E6000008 */ swc1 $f0, 8($s0) /* 385A1C E00823DC 44966000 */ mtc1 $s6, $f12 /* 385A20 E00823E0 00000000 */ nop -/* 385A24 E00823E4 0C080144 */ jal func_E0200510 +/* 385A24 E00823E4 0C080144 */ jal shim_cos_deg /* 385A28 E00823E8 46806320 */ cvt.s.w $f12, $f12 /* 385A2C E00823EC 46140002 */ mul.s $f0, $f0, $f20 /* 385A30 E00823F0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_65/func_E0082580.s b/ver/us/asm/nonmatchings/effects/effect_65/func_E0082580.s index fc50d18cfc..4a3bb9ab0e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_65/func_E0082580.s +++ b/ver/us/asm/nonmatchings/effects/effect_65/func_E0082580.s @@ -14,7 +14,7 @@ glabel func_E0082580 /* 385BE4 E00825A4 8E050008 */ lw $a1, 8($s0) /* 385BE8 E00825A8 8E06000C */ lw $a2, 0xc($s0) /* 385BEC E00825AC 8E070010 */ lw $a3, 0x10($s0) -/* 385BF0 E00825B0 0C080108 */ jal func_E0200420 +/* 385BF0 E00825B0 0C080108 */ jal shim_guTranslateF /* 385BF4 E00825B4 36521630 */ ori $s2, $s2, 0x1630 /* 385BF8 E00825B8 27B10058 */ addiu $s1, $sp, 0x58 /* 385BFC E00825BC 0220202D */ daddu $a0, $s1, $zero @@ -22,7 +22,7 @@ glabel func_E0082580 /* 385C04 E00825C4 4481A000 */ mtc1 $at, $f20 /* 385C08 E00825C8 8E050034 */ lw $a1, 0x34($s0) /* 385C0C E00825CC 4407A000 */ mfc1 $a3, $f20 -/* 385C10 E00825D0 0C080110 */ jal func_E0200440 +/* 385C10 E00825D0 0C080110 */ jal shim_guScaleF /* 385C14 E00825D4 00A0302D */ daddu $a2, $a1, $zero /* 385C18 E00825D8 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 385C1C E00825DC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) @@ -42,11 +42,11 @@ glabel func_E0082580 /* 385C54 E0082614 46000007 */ neg.s $f0, $f0 /* 385C58 E0082618 44050000 */ mfc1 $a1, $f0 /* 385C5C E008261C 0220202D */ daddu $a0, $s1, $zero -/* 385C60 E0082620 0C080104 */ jal func_E0200410 +/* 385C60 E0082620 0C080104 */ jal shim_guRotateF /* 385C64 E0082624 AFA60010 */ sw $a2, 0x10($sp) /* 385C68 E0082628 0220202D */ daddu $a0, $s1, $zero /* 385C6C E008262C 27A50018 */ addiu $a1, $sp, 0x18 -/* 385C70 E0082630 0C080114 */ jal func_E0200450 +/* 385C70 E0082630 0C080114 */ jal shim_guMtxCatF /* 385C74 E0082634 00A0302D */ daddu $a2, $a1, $zero /* 385C78 E0082638 27A40018 */ addiu $a0, $sp, 0x18 /* 385C7C E008263C 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -57,7 +57,7 @@ glabel func_E0082580 /* 385C90 E0082650 8E220000 */ lw $v0, ($s1) /* 385C94 E0082654 00052980 */ sll $a1, $a1, 6 /* 385C98 E0082658 00B22821 */ addu $a1, $a1, $s2 -/* 385C9C E008265C 0C080118 */ jal func_E0200460 +/* 385C9C E008265C 0C080118 */ jal shim_guMtxF2L /* 385CA0 E0082660 00452821 */ addu $a1, $v0, $a1 /* 385CA4 E0082664 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* 385CA8 E0082668 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) diff --git a/ver/us/asm/nonmatchings/effects/effect_65/func_E00826C4.s b/ver/us/asm/nonmatchings/effects/effect_65/func_E00826C4.s index 3b050c2ab1..4ab6d7bf21 100644 --- a/ver/us/asm/nonmatchings/effects/effect_65/func_E00826C4.s +++ b/ver/us/asm/nonmatchings/effects/effect_65/func_E00826C4.s @@ -15,7 +15,7 @@ glabel func_E00826C4 /* 385D2C E00826EC 8E250008 */ lw $a1, 8($s1) /* 385D30 E00826F0 8E26000C */ lw $a2, 0xc($s1) /* 385D34 E00826F4 8E270010 */ lw $a3, 0x10($s1) -/* 385D38 E00826F8 0C080108 */ jal func_E0200420 +/* 385D38 E00826F8 0C080108 */ jal shim_guTranslateF /* 385D3C E00826FC 36731630 */ ori $s3, $s3, 0x1630 /* 385D40 E0082700 27B00058 */ addiu $s0, $sp, 0x58 /* 385D44 E0082704 0200202D */ daddu $a0, $s0, $zero @@ -23,31 +23,31 @@ glabel func_E00826C4 /* 385D4C E008270C 4481A000 */ mtc1 $at, $f20 /* 385D50 E0082710 8E250030 */ lw $a1, 0x30($s1) /* 385D54 E0082714 4407A000 */ mfc1 $a3, $f20 -/* 385D58 E0082718 0C080110 */ jal func_E0200440 +/* 385D58 E0082718 0C080110 */ jal shim_guScaleF /* 385D5C E008271C 00A0302D */ daddu $a2, $a1, $zero /* 385D60 E0082720 0200202D */ daddu $a0, $s0, $zero /* 385D64 E0082724 27A50018 */ addiu $a1, $sp, 0x18 -/* 385D68 E0082728 0C080114 */ jal func_E0200450 +/* 385D68 E0082728 0C080114 */ jal shim_guMtxCatF /* 385D6C E008272C 00A0302D */ daddu $a2, $a1, $zero /* 385D70 E0082730 E7B40010 */ swc1 $f20, 0x10($sp) /* 385D74 E0082734 4480A000 */ mtc1 $zero, $f20 /* 385D78 E0082738 8E250040 */ lw $a1, 0x40($s1) /* 385D7C E008273C 4406A000 */ mfc1 $a2, $f20 /* 385D80 E0082740 4407A000 */ mfc1 $a3, $f20 -/* 385D84 E0082744 0C080104 */ jal func_E0200410 +/* 385D84 E0082744 0C080104 */ jal shim_guRotateF /* 385D88 E0082748 0200202D */ daddu $a0, $s0, $zero /* 385D8C E008274C 0200202D */ daddu $a0, $s0, $zero /* 385D90 E0082750 27A50018 */ addiu $a1, $sp, 0x18 -/* 385D94 E0082754 0C080114 */ jal func_E0200450 +/* 385D94 E0082754 0C080114 */ jal shim_guMtxCatF /* 385D98 E0082758 00A0302D */ daddu $a2, $a1, $zero /* 385D9C E008275C 0200202D */ daddu $a0, $s0, $zero /* 385DA0 E0082760 4405A000 */ mfc1 $a1, $f20 /* 385DA4 E0082764 8E260020 */ lw $a2, 0x20($s1) -/* 385DA8 E0082768 0C080108 */ jal func_E0200420 +/* 385DA8 E0082768 0C080108 */ jal shim_guTranslateF /* 385DAC E008276C 00A0382D */ daddu $a3, $a1, $zero /* 385DB0 E0082770 0200202D */ daddu $a0, $s0, $zero /* 385DB4 E0082774 27A50018 */ addiu $a1, $sp, 0x18 -/* 385DB8 E0082778 0C080114 */ jal func_E0200450 +/* 385DB8 E0082778 0C080114 */ jal shim_guMtxCatF /* 385DBC E008277C 00A0302D */ daddu $a2, $a1, $zero /* 385DC0 E0082780 27A40018 */ addiu $a0, $sp, 0x18 /* 385DC4 E0082784 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -58,7 +58,7 @@ glabel func_E00826C4 /* 385DD8 E0082798 8E420000 */ lw $v0, ($s2) /* 385DDC E008279C 00052980 */ sll $a1, $a1, 6 /* 385DE0 E00827A0 00B32821 */ addu $a1, $a1, $s3 -/* 385DE4 E00827A4 0C080118 */ jal func_E0200460 +/* 385DE4 E00827A4 0C080118 */ jal shim_guMtxF2L /* 385DE8 E00827A8 00452821 */ addu $a1, $v0, $a1 /* 385DEC E00827AC 3C08800A */ lui $t0, %hi(gMasterGfxPos) /* 385DF0 E00827B0 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) diff --git a/ver/us/asm/nonmatchings/effects/effect_65/fx_65_main.s b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_main.s index e9aeb394ec..46402aef38 100644 --- a/ver/us/asm/nonmatchings/effects/effect_65/fx_65_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_main.s @@ -29,12 +29,12 @@ glabel fx_65_main /* 3856A0 E0082060 AFB20030 */ sw $s2, 0x30($sp) /* 3856A4 E0082064 AFB1002C */ sw $s1, 0x2c($sp) /* 3856A8 E0082068 AFA00010 */ sw $zero, 0x10($sp) -/* 3856AC E008206C 0C080124 */ jal func_E0200490 +/* 3856AC E008206C 0C080124 */ jal shim_create_effect_instance /* 3856B0 E0082070 AFA20014 */ sw $v0, 0x14($sp) /* 3856B4 E0082074 24040090 */ addiu $a0, $zero, 0x90 /* 3856B8 E0082078 24120002 */ addiu $s2, $zero, 2 /* 3856BC E008207C 0040882D */ daddu $s1, $v0, $zero -/* 3856C0 E0082080 0C08012C */ jal func_E02004B0 +/* 3856C0 E0082080 0C08012C */ jal shim_general_heap_malloc /* 3856C4 E0082084 AE320008 */ sw $s2, 8($s1) /* 3856C8 E0082088 0040182D */ daddu $v1, $v0, $zero /* 3856CC E008208C 14600003 */ bnez $v1, .LE008209C diff --git a/ver/us/asm/nonmatchings/effects/effect_66/func_E0084660.s b/ver/us/asm/nonmatchings/effects/effect_66/func_E0084660.s index 46562b135c..6b30d9a644 100644 --- a/ver/us/asm/nonmatchings/effects/effect_66/func_E0084660.s +++ b/ver/us/asm/nonmatchings/effects/effect_66/func_E0084660.s @@ -15,7 +15,7 @@ glabel func_E0084660 /* 389058 E0084688 ACA20048 */ sw $v0, 0x48($a1) /* 38905C E008468C 04610005 */ bgez $v1, .LE00846A4 /* 389060 E0084690 ACA30044 */ sw $v1, 0x44($a1) -/* 389064 E0084694 0C080128 */ jal func_E02004A0 +/* 389064 E0084694 0C080128 */ jal shim_remove_effect /* 389068 E0084698 00000000 */ nop /* 38906C E008469C 08021233 */ j .LE00848CC /* 389070 E00846A0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_66/func_E00848E4.s b/ver/us/asm/nonmatchings/effects/effect_66/func_E00848E4.s index 11b5cc5400..5f8efb1a8d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_66/func_E00848E4.s +++ b/ver/us/asm/nonmatchings/effects/effect_66/func_E00848E4.s @@ -11,7 +11,7 @@ glabel func_E00848E4 /* 3892CC E00848FC 27A40010 */ addiu $a0, $sp, 0x10 /* 3892D0 E0084900 AFBF0020 */ sw $ra, 0x20($sp) /* 3892D4 E0084904 AFA00014 */ sw $zero, 0x14($sp) -/* 3892D8 E0084908 0C080120 */ jal func_E0200480 +/* 3892D8 E0084908 0C080120 */ jal shim_queue_render_task /* 3892DC E008490C AFA20010 */ sw $v0, 0x10($sp) /* 3892E0 E0084910 8C430000 */ lw $v1, ($v0) /* 3892E4 E0084914 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_66/func_E0084928.s b/ver/us/asm/nonmatchings/effects/effect_66/func_E0084928.s index cde66dc5b3..74ce63f416 100644 --- a/ver/us/asm/nonmatchings/effects/effect_66/func_E0084928.s +++ b/ver/us/asm/nonmatchings/effects/effect_66/func_E0084928.s @@ -59,7 +59,7 @@ glabel func_E0084928 /* 3893D0 E0084A00 8E250008 */ lw $a1, 8($s1) /* 3893D4 E0084A04 8E26000C */ lw $a2, 0xc($s1) /* 3893D8 E0084A08 8E270010 */ lw $a3, 0x10($s1) -/* 3893DC E0084A0C 0C080108 */ jal func_E0200420 +/* 3893DC E0084A0C 0C080108 */ jal shim_guTranslateF /* 3893E0 E0084A10 24120001 */ addiu $s2, $zero, 1 /* 3893E4 E0084A14 27A40020 */ addiu $a0, $sp, 0x20 /* 3893E8 E0084A18 3C148007 */ lui $s4, %hi(gMatrixListPos) @@ -70,7 +70,7 @@ glabel func_E0084928 /* 3893FC E0084A2C 8EA20000 */ lw $v0, ($s5) /* 389400 E0084A30 00052980 */ sll $a1, $a1, 6 /* 389404 E0084A34 00B02821 */ addu $a1, $a1, $s0 -/* 389408 E0084A38 0C080118 */ jal func_E0200460 +/* 389408 E0084A38 0C080118 */ jal shim_guMtxF2L /* 38940C E0084A3C 00452821 */ addu $a1, $v0, $a1 /* 389410 E0084A40 0260202D */ daddu $a0, $s3, $zero /* 389414 E0084A44 3C02DA38 */ lui $v0, 0xda38 @@ -88,7 +88,7 @@ glabel func_E0084928 /* 389444 E0084A74 96250002 */ lhu $a1, 2($s1) /* 389448 E0084A78 00D23021 */ addu $a2, $a2, $s2 /* 38944C E0084A7C AE670000 */ sw $a3, ($s3) -/* 389450 E0084A80 0C080158 */ jal func_E0200560 +/* 389450 E0084A80 0C080158 */ jal shim_mdl_draw_hidden_panel_surface /* 389454 E0084A84 A6860000 */ sh $a2, ($s4) /* 389458 E0084A88 8FAA00A8 */ lw $t2, 0xa8($sp) /* 38945C E0084A8C 0016B080 */ sll $s6, $s6, 2 @@ -130,7 +130,7 @@ glabel func_E0084928 /* 3894E8 E0084B18 E7A00018 */ swc1 $f0, 0x18($sp) /* 3894EC E0084B1C C6000000 */ lwc1 $f0, ($s0) /* 3894F0 E0084B20 26520001 */ addiu $s2, $s2, 1 -/* 3894F4 E0084B24 0C080180 */ jal func_E0200600 +/* 3894F4 E0084B24 0C080180 */ jal shim_guPositionF /* 3894F8 E0084B28 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3894FC E0084B2C 27A40020 */ addiu $a0, $sp, 0x20 /* 389500 E0084B30 3C058007 */ lui $a1, %hi(gMatrixListPos) @@ -139,7 +139,7 @@ glabel func_E0084928 /* 38950C E0084B3C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 389510 E0084B40 00052980 */ sll $a1, $a1, 6 /* 389514 E0084B44 00B72821 */ addu $a1, $a1, $s7 -/* 389518 E0084B48 0C080118 */ jal func_E0200460 +/* 389518 E0084B48 0C080118 */ jal shim_guMtxF2L /* 38951C E0084B4C 00452821 */ addu $a1, $v0, $a1 /* 389520 E0084B50 3C06D838 */ lui $a2, 0xd838 /* 389524 E0084B54 8EA40000 */ lw $a0, ($s5) @@ -251,14 +251,14 @@ glabel func_E0084928 /* 3896C4 E0084CF4 E7A00018 */ swc1 $f0, 0x18($sp) /* 3896C8 E0084CF8 C6000000 */ lwc1 $f0, ($s0) /* 3896CC E0084CFC 26520001 */ addiu $s2, $s2, 1 -/* 3896D0 E0084D00 0C080180 */ jal func_E0200600 +/* 3896D0 E0084D00 0C080180 */ jal shim_guPositionF /* 3896D4 E0084D04 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3896D8 E0084D08 27A40020 */ addiu $a0, $sp, 0x20 /* 3896DC E0084D0C 96A50000 */ lhu $a1, ($s5) /* 3896E0 E0084D10 8EC20000 */ lw $v0, ($s6) /* 3896E4 E0084D14 00052980 */ sll $a1, $a1, 6 /* 3896E8 E0084D18 00B42821 */ addu $a1, $a1, $s4 -/* 3896EC E0084D1C 0C080118 */ jal func_E0200460 +/* 3896EC E0084D1C 0C080118 */ jal shim_guMtxF2L /* 3896F0 E0084D20 00452821 */ addu $a1, $v0, $a1 /* 3896F4 E0084D24 3C06D838 */ lui $a2, 0xd838 /* 3896F8 E0084D28 8E640000 */ lw $a0, ($s3) diff --git a/ver/us/asm/nonmatchings/effects/effect_66/fx_66_main.s b/ver/us/asm/nonmatchings/effects/effect_66/fx_66_main.s index 6b80a49eea..7504589400 100644 --- a/ver/us/asm/nonmatchings/effects/effect_66/fx_66_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_66/fx_66_main.s @@ -110,13 +110,13 @@ glabel fx_66_main /* 388BF0 E0084220 46202520 */ cvt.s.d $f20, $f4 /* 388BF4 E0084224 462017A0 */ cvt.s.d $f30, $f2 /* 388BF8 E0084228 00004012 */ mflo $t0 -/* 388BFC E008422C 0C080124 */ jal func_E0200490 +/* 388BFC E008422C 0C080124 */ jal shim_create_effect_instance /* 388C00 E0084230 25100001 */ addiu $s0, $t0, 1 /* 388C04 E0084234 00102080 */ sll $a0, $s0, 2 /* 388C08 E0084238 00902021 */ addu $a0, $a0, $s0 /* 388C0C E008423C 00042100 */ sll $a0, $a0, 4 /* 388C10 E0084240 0040A02D */ daddu $s4, $v0, $zero -/* 388C14 E0084244 0C08012C */ jal func_E02004B0 +/* 388C14 E0084244 0C08012C */ jal shim_general_heap_malloc /* 388C18 E0084248 AE900008 */ sw $s0, 8($s4) /* 388C1C E008424C 0040202D */ daddu $a0, $v0, $zero /* 388C20 E0084250 14800003 */ bnez $a0, .LE0084260 diff --git a/ver/us/asm/nonmatchings/effects/effect_67/func_E0086278.s b/ver/us/asm/nonmatchings/effects/effect_67/func_E0086278.s index 5267395dd3..b78ba21757 100644 --- a/ver/us/asm/nonmatchings/effects/effect_67/func_E0086278.s +++ b/ver/us/asm/nonmatchings/effects/effect_67/func_E0086278.s @@ -13,7 +13,7 @@ glabel func_E0086278 /* 389AE8 E0086298 AC620030 */ sw $v0, 0x30($v1) /* 389AEC E008629C 04410005 */ bgez $v0, .LE00862B4 /* 389AF0 E00862A0 AC650034 */ sw $a1, 0x34($v1) -/* 389AF4 E00862A4 0C080128 */ jal func_E02004A0 +/* 389AF4 E00862A4 0C080128 */ jal shim_remove_effect /* 389AF8 E00862A8 00000000 */ nop /* 389AFC E00862AC 080218E1 */ j .LE0086384 /* 389B00 E00862B0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_67/func_E00863B4.s b/ver/us/asm/nonmatchings/effects/effect_67/func_E00863B4.s index 5c4977cd50..78c911d857 100644 --- a/ver/us/asm/nonmatchings/effects/effect_67/func_E00863B4.s +++ b/ver/us/asm/nonmatchings/effects/effect_67/func_E00863B4.s @@ -76,7 +76,7 @@ glabel func_E00863B4 /* 389D20 E00864D0 E7A00018 */ swc1 $f0, 0x18($sp) /* 389D24 E00864D4 C680000C */ lwc1 $f0, 0xc($s4) /* 389D28 E00864D8 00A0382D */ daddu $a3, $a1, $zero -/* 389D2C E00864DC 0C080180 */ jal func_E0200600 +/* 389D2C E00864DC 0C080180 */ jal shim_guPositionF /* 389D30 E00864E0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 389D34 E00864E4 27A40020 */ addiu $a0, $sp, 0x20 /* 389D38 E00864E8 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -87,7 +87,7 @@ glabel func_E00863B4 /* 389D4C E00864FC 8E420000 */ lw $v0, ($s2) /* 389D50 E0086500 00052980 */ sll $a1, $a1, 6 /* 389D54 E0086504 00B32821 */ addu $a1, $a1, $s3 -/* 389D58 E0086508 0C080118 */ jal func_E0200460 +/* 389D58 E0086508 0C080118 */ jal shim_guMtxF2L /* 389D5C E008650C 00452821 */ addu $a1, $v0, $a1 /* 389D60 E0086510 8E220000 */ lw $v0, ($s1) /* 389D64 E0086514 3C014380 */ lui $at, 0x4380 @@ -255,26 +255,26 @@ glabel func_E00863B4 /* 389FD0 E0086780 E7B60010 */ swc1 $f22, 0x10($sp) /* 389FD4 E0086784 8E050010 */ lw $a1, 0x10($s0) /* 389FD8 E0086788 26940044 */ addiu $s4, $s4, 0x44 -/* 389FDC E008678C 0C080104 */ jal func_E0200410 +/* 389FDC E008678C 0C080104 */ jal shim_guRotateF /* 389FE0 E0086790 AEA30000 */ sw $v1, ($s5) /* 389FE4 E0086794 E7B40010 */ swc1 $f20, 0x10($sp) /* 389FE8 E0086798 8E050018 */ lw $a1, 0x18($s0) /* 389FEC E008679C 4406A000 */ mfc1 $a2, $f20 /* 389FF0 E00867A0 4407B000 */ mfc1 $a3, $f22 -/* 389FF4 E00867A4 0C080104 */ jal func_E0200410 +/* 389FF4 E00867A4 0C080104 */ jal shim_guRotateF /* 389FF8 E00867A8 0220202D */ daddu $a0, $s1, $zero /* 389FFC E00867AC 0220202D */ daddu $a0, $s1, $zero /* 38A000 E00867B0 27A50020 */ addiu $a1, $sp, 0x20 -/* 38A004 E00867B4 0C080114 */ jal func_E0200450 +/* 38A004 E00867B4 0C080114 */ jal shim_guMtxCatF /* 38A008 E00867B8 00A0302D */ daddu $a2, $a1, $zero /* 38A00C E00867BC 8E05FFF8 */ lw $a1, -8($s0) /* 38A010 E00867C0 8E06FFFC */ lw $a2, -4($s0) /* 38A014 E00867C4 8E070000 */ lw $a3, ($s0) -/* 38A018 E00867C8 0C080108 */ jal func_E0200420 +/* 38A018 E00867C8 0C080108 */ jal shim_guTranslateF /* 38A01C E00867CC 0220202D */ daddu $a0, $s1, $zero /* 38A020 E00867D0 0220202D */ daddu $a0, $s1, $zero /* 38A024 E00867D4 27A50020 */ addiu $a1, $sp, 0x20 -/* 38A028 E00867D8 0C080114 */ jal func_E0200450 +/* 38A028 E00867D8 0C080114 */ jal shim_guMtxCatF /* 38A02C E00867DC 00A0302D */ daddu $a2, $a1, $zero /* 38A030 E00867E0 27A40020 */ addiu $a0, $sp, 0x20 /* 38A034 E00867E4 96E50000 */ lhu $a1, ($s7) @@ -282,7 +282,7 @@ glabel func_E00863B4 /* 38A03C E00867EC 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 38A040 E00867F0 00052980 */ sll $a1, $a1, 6 /* 38A044 E00867F4 00B62821 */ addu $a1, $a1, $s6 -/* 38A048 E00867F8 0C080118 */ jal func_E0200460 +/* 38A048 E00867F8 0C080118 */ jal shim_guMtxF2L /* 38A04C E00867FC 00452821 */ addu $a1, $v0, $a1 /* 38A050 E0086800 8EA40000 */ lw $a0, ($s5) /* 38A054 E0086804 3C06D838 */ lui $a2, 0xd838 @@ -381,7 +381,7 @@ glabel func_E00863B4 /* 38A1C4 E0086974 AE020000 */ sw $v0, ($s0) /* 38A1C8 E0086978 AD140010 */ sw $s4, 0x10($t0) /* 38A1CC E008697C AD130014 */ sw $s3, 0x14($t0) -/* 38A1D0 E0086980 0C080104 */ jal func_E0200410 +/* 38A1D0 E0086980 0C080104 */ jal shim_guRotateF /* 38A1D4 E0086984 AFA60010 */ sw $a2, 0x10($sp) /* 38A1D8 E0086988 27A40020 */ addiu $a0, $sp, 0x20 /* 38A1DC E008698C 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -392,7 +392,7 @@ glabel func_E00863B4 /* 38A1F0 E00869A0 8E420000 */ lw $v0, ($s2) /* 38A1F4 E00869A4 00052980 */ sll $a1, $a1, 6 /* 38A1F8 E00869A8 00B52821 */ addu $a1, $a1, $s5 -/* 38A1FC E00869AC 0C080118 */ jal func_E0200460 +/* 38A1FC E00869AC 0C080118 */ jal shim_guMtxF2L /* 38A200 E00869B0 00452821 */ addu $a1, $v0, $a1 /* 38A204 E00869B4 3C06DA38 */ lui $a2, 0xda38 /* 38A208 E00869B8 34C60001 */ ori $a2, $a2, 1 diff --git a/ver/us/asm/nonmatchings/effects/effect_67/fx_67_main.s b/ver/us/asm/nonmatchings/effects/effect_67/fx_67_main.s index c558a3b46d..e118ed1ffd 100644 --- a/ver/us/asm/nonmatchings/effects/effect_67/fx_67_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_67/fx_67_main.s @@ -45,13 +45,13 @@ glabel fx_67_main /* 3898F0 E00860A0 AFA30014 */ sw $v1, 0x14($sp) /* 3898F4 E00860A4 00004010 */ mfhi $t0 /* 3898F8 E00860A8 01021023 */ subu $v0, $t0, $v0 -/* 3898FC E00860AC 0C080124 */ jal func_E0200490 +/* 3898FC E00860AC 0C080124 */ jal shim_create_effect_instance /* 389900 E00860B0 24550001 */ addiu $s5, $v0, 1 /* 389904 E00860B4 00152100 */ sll $a0, $s5, 4 /* 389908 E00860B8 00952021 */ addu $a0, $a0, $s5 /* 38990C E00860BC 00042080 */ sll $a0, $a0, 2 /* 389910 E00860C0 0040B02D */ daddu $s6, $v0, $zero -/* 389914 E00860C4 0C08012C */ jal func_E02004B0 +/* 389914 E00860C4 0C08012C */ jal shim_general_heap_malloc /* 389918 E00860C8 AED50008 */ sw $s5, 8($s6) /* 38991C E00860CC 0040882D */ daddu $s1, $v0, $zero /* 389920 E00860D0 16200003 */ bnez $s1, .LE00860E0 @@ -133,7 +133,7 @@ glabel fx_67_main /* 389A28 E00861D8 4483A000 */ mtc1 $v1, $f20 /* 389A2C E00861DC 00000000 */ nop /* 389A30 E00861E0 4680A520 */ cvt.s.w $f20, $f20 -/* 389A34 E00861E4 0C080138 */ jal func_E02004E0 +/* 389A34 E00861E4 0C080138 */ jal shim_rand_int /* 389A38 E00861E8 26730001 */ addiu $s3, $s3, 1 /* 389A3C E00861EC 44820000 */ mtc1 $v0, $f0 /* 389A40 E00861F0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_68/func_E0088000.s b/ver/us/asm/nonmatchings/effects/effect_68/func_E0088000.s index 3b6d441ac7..84cd9b7c6f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_68/func_E0088000.s +++ b/ver/us/asm/nonmatchings/effects/effect_68/func_E0088000.s @@ -7,7 +7,7 @@ glabel func_E0088000 /* 38ADF8 E0088008 0080802D */ daddu $s0, $a0, $zero /* 38ADFC E008800C AFBF0014 */ sw $ra, 0x14($sp) /* 38AE00 E0088010 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 38AE04 E0088014 0C080138 */ jal func_E02004E0 +/* 38AE04 E0088014 0C080138 */ jal shim_rand_int /* 38AE08 E0088018 240402BC */ addiu $a0, $zero, 0x2bc /* 38AE0C E008801C 3C013DCC */ lui $at, 0x3dcc /* 38AE10 E0088020 3421CCCD */ ori $at, $at, 0xcccd @@ -23,7 +23,7 @@ glabel func_E0088000 /* 38AE38 E0088048 46020001 */ sub.s $f0, $f0, $f2 /* 38AE3C E008804C 2404012C */ addiu $a0, $zero, 0x12c /* 38AE40 E0088050 AE000008 */ sw $zero, 8($s0) -/* 38AE44 E0088054 0C080138 */ jal func_E02004E0 +/* 38AE44 E0088054 0C080138 */ jal shim_rand_int /* 38AE48 E0088058 E6000004 */ swc1 $f0, 4($s0) /* 38AE4C E008805C 44820000 */ mtc1 $v0, $f0 /* 38AE50 E0088060 00000000 */ nop @@ -35,7 +35,7 @@ glabel func_E0088000 /* 38AE68 E0088078 00000000 */ nop /* 38AE6C E008807C 46020001 */ sub.s $f0, $f0, $f2 /* 38AE70 E0088080 24040064 */ addiu $a0, $zero, 0x64 -/* 38AE74 E0088084 0C080138 */ jal func_E02004E0 +/* 38AE74 E0088084 0C080138 */ jal shim_rand_int /* 38AE78 E0088088 E600000C */ swc1 $f0, 0xc($s0) /* 38AE7C E008808C 44821000 */ mtc1 $v0, $f2 /* 38AE80 E0088090 00000000 */ nop @@ -55,7 +55,7 @@ glabel func_E0088000 /* 38AEB8 E00880C8 00000000 */ nop /* 38AEBC E00880CC 24040320 */ addiu $a0, $zero, 0x320 /* 38AEC0 E00880D0 46200020 */ cvt.s.d $f0, $f0 -/* 38AEC4 E00880D4 0C080138 */ jal func_E02004E0 +/* 38AEC4 E00880D4 0C080138 */ jal shim_rand_int /* 38AEC8 E00880D8 E6000010 */ swc1 $f0, 0x10($s0) /* 38AECC E00880DC 44820000 */ mtc1 $v0, $f0 /* 38AED0 E00880E0 00000000 */ nop @@ -72,7 +72,7 @@ glabel func_E0088000 /* 38AEFC E008810C 46201081 */ sub.d $f2, $f2, $f0 /* 38AF00 E0088110 240400C8 */ addiu $a0, $zero, 0xc8 /* 38AF04 E0088114 462010A0 */ cvt.s.d $f2, $f2 -/* 38AF08 E0088118 0C080138 */ jal func_E02004E0 +/* 38AF08 E0088118 0C080138 */ jal shim_rand_int /* 38AF0C E008811C E6020014 */ swc1 $f2, 0x14($s0) /* 38AF10 E0088120 44820000 */ mtc1 $v0, $f0 /* 38AF14 E0088124 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_68/func_E00885A8.s b/ver/us/asm/nonmatchings/effects/effect_68/func_E00885A8.s index 5bc4f65e43..7b2414c646 100644 --- a/ver/us/asm/nonmatchings/effects/effect_68/func_E00885A8.s +++ b/ver/us/asm/nonmatchings/effects/effect_68/func_E00885A8.s @@ -16,7 +16,7 @@ glabel func_E00885A8 /* 38B3C4 E00885D4 2442FFFF */ addiu $v0, $v0, -1 /* 38B3C8 E00885D8 04410005 */ bgez $v0, .LE00885F0 /* 38B3CC E00885DC AE220020 */ sw $v0, 0x20($s1) -/* 38B3D0 E00885E0 0C080128 */ jal func_E02004A0 +/* 38B3D0 E00885E0 0C080128 */ jal shim_remove_effect /* 38B3D4 E00885E4 00000000 */ nop /* 38B3D8 E00885E8 080221E0 */ j .LE0088780 /* 38B3DC E00885EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_68/func_E00887A8.s b/ver/us/asm/nonmatchings/effects/effect_68/func_E00887A8.s index 48b129dfc6..58f9b05afe 100644 --- a/ver/us/asm/nonmatchings/effects/effect_68/func_E00887A8.s +++ b/ver/us/asm/nonmatchings/effects/effect_68/func_E00887A8.s @@ -11,7 +11,7 @@ glabel func_E00887A8 /* 38B5B0 E00887C0 27A40010 */ addiu $a0, $sp, 0x10 /* 38B5B4 E00887C4 AFBF0020 */ sw $ra, 0x20($sp) /* 38B5B8 E00887C8 AFA00014 */ sw $zero, 0x14($sp) -/* 38B5BC E00887CC 0C080120 */ jal func_E0200480 +/* 38B5BC E00887CC 0C080120 */ jal shim_queue_render_task /* 38B5C0 E00887D0 AFA20010 */ sw $v0, 0x10($sp) /* 38B5C4 E00887D4 8FBF0020 */ lw $ra, 0x20($sp) /* 38B5C8 E00887D8 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_68/func_E00887E0.s b/ver/us/asm/nonmatchings/effects/effect_68/func_E00887E0.s index 3c398af45f..0637691515 100644 --- a/ver/us/asm/nonmatchings/effects/effect_68/func_E00887E0.s +++ b/ver/us/asm/nonmatchings/effects/effect_68/func_E00887E0.s @@ -58,7 +58,7 @@ glabel func_E00887E0 /* 38B6A4 E00888B4 8E650004 */ lw $a1, 4($s3) /* 38B6A8 E00888B8 8E660008 */ lw $a2, 8($s3) /* 38B6AC E00888BC 8E67000C */ lw $a3, 0xc($s3) -/* 38B6B0 E00888C0 0C080108 */ jal func_E0200420 +/* 38B6B0 E00888C0 0C080108 */ jal shim_guTranslateF /* 38B6B4 E00888C4 0000A02D */ daddu $s4, $zero, $zero /* 38B6B8 E00888C8 27B00058 */ addiu $s0, $sp, 0x58 /* 38B6BC E00888CC 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -79,11 +79,11 @@ glabel func_E00887E0 /* 38B6F8 E0088908 46000007 */ neg.s $f0, $f0 /* 38B6FC E008890C 44050000 */ mfc1 $a1, $f0 /* 38B700 E0088910 0200202D */ daddu $a0, $s0, $zero -/* 38B704 E0088914 0C080104 */ jal func_E0200410 +/* 38B704 E0088914 0C080104 */ jal shim_guRotateF /* 38B708 E0088918 AFA60010 */ sw $a2, 0x10($sp) /* 38B70C E008891C 0200202D */ daddu $a0, $s0, $zero /* 38B710 E0088920 27A50018 */ addiu $a1, $sp, 0x18 -/* 38B714 E0088924 0C080114 */ jal func_E0200450 +/* 38B714 E0088924 0C080114 */ jal shim_guMtxCatF /* 38B718 E0088928 00A0302D */ daddu $a2, $a1, $zero /* 38B71C E008892C 27A40018 */ addiu $a0, $sp, 0x18 /* 38B720 E0088930 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -94,7 +94,7 @@ glabel func_E00887E0 /* 38B734 E0088944 8E220000 */ lw $v0, ($s1) /* 38B738 E0088948 00052980 */ sll $a1, $a1, 6 /* 38B73C E008894C 00B22821 */ addu $a1, $a1, $s2 -/* 38B740 E0088950 0C080118 */ jal func_E0200460 +/* 38B740 E0088950 0C080118 */ jal shim_guMtxF2L /* 38B744 E0088954 00452821 */ addu $a1, $v0, $a1 /* 38B748 E0088958 3C04DA38 */ lui $a0, 0xda38 /* 38B74C E008895C 34840002 */ ori $a0, $a0, 2 @@ -152,7 +152,7 @@ glabel func_E00887E0 /* 38B818 E0088A28 8E45FFF8 */ lw $a1, -8($s2) /* 38B81C E0088A2C 8E46FFFC */ lw $a2, -4($s2) /* 38B820 E0088A30 8E470000 */ lw $a3, ($s2) -/* 38B824 E0088A34 0C080108 */ jal func_E0200420 +/* 38B824 E0088A34 0C080108 */ jal shim_guTranslateF /* 38B828 E0088A38 27A40018 */ addiu $a0, $sp, 0x18 /* 38B82C E0088A3C 27A40018 */ addiu $a0, $sp, 0x18 /* 38B830 E0088A40 3C058007 */ lui $a1, %hi(gMatrixListPos) @@ -161,7 +161,7 @@ glabel func_E00887E0 /* 38B83C E0088A4C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 38B840 E0088A50 00052980 */ sll $a1, $a1, 6 /* 38B844 E0088A54 00B72821 */ addu $a1, $a1, $s7 -/* 38B848 E0088A58 0C080118 */ jal func_E0200460 +/* 38B848 E0088A58 0C080118 */ jal shim_guMtxF2L /* 38B84C E0088A5C 00452821 */ addu $a1, $v0, $a1 /* 38B850 E0088A60 3C065555 */ lui $a2, 0x5555 /* 38B854 E0088A64 34C65556 */ ori $a2, $a2, 0x5556 diff --git a/ver/us/asm/nonmatchings/effects/effect_68/fx_68_main.s b/ver/us/asm/nonmatchings/effects/effect_68/fx_68_main.s index 677376c54e..581d4688a3 100644 --- a/ver/us/asm/nonmatchings/effects/effect_68/fx_68_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_68/fx_68_main.s @@ -80,7 +80,7 @@ glabel LE0088250_38B040 /* 38B074 E0088284 24020044 */ addiu $v0, $zero, 0x44 /* 38B078 E0088288 AC800000 */ sw $zero, ($a0) /* 38B07C E008828C AC800014 */ sw $zero, 0x14($a0) -/* 38B080 E0088290 0C080124 */ jal func_E0200490 +/* 38B080 E0088290 0C080124 */ jal shim_create_effect_instance /* 38B084 E0088294 AC820004 */ sw $v0, 4($a0) /* 38B088 E0088298 26630001 */ addiu $v1, $s3, 1 /* 38B08C E008829C 00032040 */ sll $a0, $v1, 1 @@ -89,7 +89,7 @@ glabel LE0088250_38B040 /* 38B098 E00882A8 00832021 */ addu $a0, $a0, $v1 /* 38B09C E00882AC 00042080 */ sll $a0, $a0, 2 /* 38B0A0 E00882B0 0040B02D */ daddu $s6, $v0, $zero -/* 38B0A4 E00882B4 0C08012C */ jal func_E02004B0 +/* 38B0A4 E00882B4 0C08012C */ jal shim_general_heap_malloc /* 38B0A8 E00882B8 AEC30008 */ sw $v1, 8($s6) /* 38B0AC E00882BC 0040902D */ daddu $s2, $v0, $zero /* 38B0B0 E00882C0 16400003 */ bnez $s2, .LE00882D0 @@ -109,7 +109,7 @@ glabel LE0088250_38B040 /* 38B0E0 E00882F0 AE420020 */ sw $v0, 0x20($s2) /* 38B0E4 E00882F4 240200FF */ addiu $v0, $zero, 0xff /* 38B0E8 E00882F8 AE420028 */ sw $v0, 0x28($s2) -/* 38B0EC E00882FC 0C080138 */ jal func_E02004E0 +/* 38B0EC E00882FC 0C080138 */ jal shim_rand_int /* 38B0F0 E0088300 26520034 */ addiu $s2, $s2, 0x34 /* 38B0F4 E0088304 0000882D */ daddu $s1, $zero, $zero /* 38B0F8 E0088308 12600092 */ beqz $s3, .LE0088554 @@ -181,16 +181,16 @@ glabel LE0088250_38B040 /* 38B1F4 E0088404 4482B000 */ mtc1 $v0, $f22 /* 38B1F8 E0088408 00000000 */ nop /* 38B1FC E008840C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 38B200 E0088410 0C080140 */ jal func_E0200500 +/* 38B200 E0088410 0C080140 */ jal shim_sin_deg /* 38B204 E0088414 4600A306 */ mov.s $f12, $f20 /* 38B208 E0088418 4600A306 */ mov.s $f12, $f20 -/* 38B20C E008841C 0C080144 */ jal func_E0200510 +/* 38B20C E008841C 0C080144 */ jal shim_cos_deg /* 38B210 E0088420 46000606 */ mov.s $f24, $f0 /* 38B214 E0088424 4600B306 */ mov.s $f12, $f22 -/* 38B218 E0088428 0C080140 */ jal func_E0200500 +/* 38B218 E0088428 0C080140 */ jal shim_sin_deg /* 38B21C E008842C 46000686 */ mov.s $f26, $f0 /* 38B220 E0088430 4600B306 */ mov.s $f12, $f22 -/* 38B224 E0088434 0C080144 */ jal func_E0200510 +/* 38B224 E0088434 0C080144 */ jal shim_cos_deg /* 38B228 E0088438 46000506 */ mov.s $f20, $f0 /* 38B22C E008843C 24020003 */ addiu $v0, $zero, 3 /* 38B230 E0088440 16A20005 */ bne $s5, $v0, .LE0088458 diff --git a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A53C.s b/ver/us/asm/nonmatchings/effects/effect_69/func_E008A53C.s index d8418cbea1..cfbd5cc32c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A53C.s +++ b/ver/us/asm/nonmatchings/effects/effect_69/func_E008A53C.s @@ -34,7 +34,7 @@ glabel func_E008A53C /* 38CB9C E008A5AC 8E220020 */ lw $v0, 0x20($s1) /* 38CBA0 E008A5B0 04410005 */ bgez $v0, .LE008A5C8 /* 38CBA4 E008A5B4 00000000 */ nop -/* 38CBA8 E008A5B8 0C080128 */ jal func_E02004A0 +/* 38CBA8 E008A5B8 0C080128 */ jal shim_remove_effect /* 38CBAC E008A5BC 00A0202D */ daddu $a0, $a1, $zero /* 38CBB0 E008A5C0 080229AF */ j .LE008A6BC /* 38CBB4 E008A5C4 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A6E4.s b/ver/us/asm/nonmatchings/effects/effect_69/func_E008A6E4.s index 6b4fa1ba4c..d22d66ebbe 100644 --- a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A6E4.s +++ b/ver/us/asm/nonmatchings/effects/effect_69/func_E008A6E4.s @@ -11,7 +11,7 @@ glabel func_E008A6E4 /* 38CCEC E008A6FC 27A40010 */ addiu $a0, $sp, 0x10 /* 38CCF0 E008A700 AFBF0020 */ sw $ra, 0x20($sp) /* 38CCF4 E008A704 AFA00014 */ sw $zero, 0x14($sp) -/* 38CCF8 E008A708 0C080120 */ jal func_E0200480 +/* 38CCF8 E008A708 0C080120 */ jal shim_queue_render_task /* 38CCFC E008A70C AFA20010 */ sw $v0, 0x10($sp) /* 38CD00 E008A710 8C430000 */ lw $v1, ($v0) /* 38CD04 E008A714 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A728.s b/ver/us/asm/nonmatchings/effects/effect_69/func_E008A728.s index 6cf12eb335..23dbcb7655 100644 --- a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A728.s +++ b/ver/us/asm/nonmatchings/effects/effect_69/func_E008A728.s @@ -35,7 +35,7 @@ glabel func_E008A728 /* 38CD90 E008A7A0 27A40058 */ addiu $a0, $sp, 0x58 /* 38CD94 E008A7A4 0080282D */ daddu $a1, $a0, $zero /* 38CD98 E008A7A8 0080302D */ daddu $a2, $a0, $zero -/* 38CD9C E008A7AC 0C08019C */ jal func_E0200670 +/* 38CD9C E008A7AC 0C08019C */ jal shim_get_background_color_blend /* 38CDA0 E008A7B0 27A70059 */ addiu $a3, $sp, 0x59 /* 38CDA4 E008A7B4 93A30059 */ lbu $v1, 0x59($sp) /* 38CDA8 E008A7B8 240200FF */ addiu $v0, $zero, 0xff @@ -96,7 +96,7 @@ glabel func_E008A728 /* 38CE80 E008A890 46000007 */ neg.s $f0, $f0 /* 38CE84 E008A894 44050000 */ mfc1 $a1, $f0 /* 38CE88 E008A898 26730034 */ addiu $s3, $s3, 0x34 -/* 38CE8C E008A89C 0C080104 */ jal func_E0200410 +/* 38CE8C E008A89C 0C080104 */ jal shim_guRotateF /* 38CE90 E008A8A0 AFA60010 */ sw $a2, 0x10($sp) /* 38CE94 E008A8A4 27A40018 */ addiu $a0, $sp, 0x18 /* 38CE98 E008A8A8 3C128007 */ lui $s2, %hi(gMatrixListPos) @@ -107,7 +107,7 @@ glabel func_E008A728 /* 38CEAC E008A8BC 8E820000 */ lw $v0, ($s4) /* 38CEB0 E008A8C0 00052980 */ sll $a1, $a1, 6 /* 38CEB4 E008A8C4 00B02821 */ addu $a1, $a1, $s0 -/* 38CEB8 E008A8C8 0C080118 */ jal func_E0200460 +/* 38CEB8 E008A8C8 0C080118 */ jal shim_guMtxF2L /* 38CEBC E008A8CC 00452821 */ addu $a1, $v0, $a1 /* 38CEC0 E008A8D0 96420000 */ lhu $v0, ($s2) /* 38CEC4 E008A8D4 0000882D */ daddu $s1, $zero, $zero @@ -136,14 +136,14 @@ glabel func_E008A728 /* 38CF1C E008A92C 8E05FFF8 */ lw $a1, -8($s0) /* 38CF20 E008A930 8E06FFFC */ lw $a2, -4($s0) /* 38CF24 E008A934 8E070000 */ lw $a3, ($s0) -/* 38CF28 E008A938 0C080108 */ jal func_E0200420 +/* 38CF28 E008A938 0C080108 */ jal shim_guTranslateF /* 38CF2C E008A93C 27A40018 */ addiu $a0, $sp, 0x18 /* 38CF30 E008A940 27A40018 */ addiu $a0, $sp, 0x18 /* 38CF34 E008A944 96A50000 */ lhu $a1, ($s5) /* 38CF38 E008A948 8EE20000 */ lw $v0, ($s7) /* 38CF3C E008A94C 00052980 */ sll $a1, $a1, 6 /* 38CF40 E008A950 00B42821 */ addu $a1, $a1, $s4 -/* 38CF44 E008A954 0C080118 */ jal func_E0200460 +/* 38CF44 E008A954 0C080118 */ jal shim_guMtxF2L /* 38CF48 E008A958 00452821 */ addu $a1, $v0, $a1 /* 38CF4C E008A95C 3C02DA38 */ lui $v0, 0xda38 /* 38CF50 E008A960 34420002 */ ori $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_69/fx_69_main.s b/ver/us/asm/nonmatchings/effects/effect_69/fx_69_main.s index 774ef4d485..b239efe64e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_69/fx_69_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_69/fx_69_main.s @@ -24,7 +24,7 @@ glabel fx_69_main /* 38C7C4 E008A1D4 AFB20030 */ sw $s2, 0x30($sp) /* 38C7C8 E008A1D8 AFA00010 */ sw $zero, 0x10($sp) /* 38C7CC E008A1DC AFA00024 */ sw $zero, 0x24($sp) -/* 38C7D0 E008A1E0 0C080124 */ jal func_E0200490 +/* 38C7D0 E008A1E0 0C080124 */ jal shim_create_effect_instance /* 38C7D4 E008A1E4 AFA20014 */ sw $v0, 0x14($sp) /* 38C7D8 E008A1E8 00102040 */ sll $a0, $s0, 1 /* 38C7DC E008A1EC 00902021 */ addu $a0, $a0, $s0 @@ -32,7 +32,7 @@ glabel fx_69_main /* 38C7E4 E008A1F4 00902021 */ addu $a0, $a0, $s0 /* 38C7E8 E008A1F8 00042080 */ sll $a0, $a0, 2 /* 38C7EC E008A1FC 0040902D */ daddu $s2, $v0, $zero -/* 38C7F0 E008A200 0C08012C */ jal func_E02004B0 +/* 38C7F0 E008A200 0C08012C */ jal shim_general_heap_malloc /* 38C7F4 E008A204 AE500008 */ sw $s0, 8($s2) /* 38C7F8 E008A208 0040802D */ daddu $s0, $v0, $zero /* 38C7FC E008A20C 16000003 */ bnez $s0, .LE008A21C diff --git a/ver/us/asm/nonmatchings/effects/effect_7/func_E000E174.s b/ver/us/asm/nonmatchings/effects/effect_7/func_E000E174.s index 54f4d78947..f9a4627fc4 100644 --- a/ver/us/asm/nonmatchings/effects/effect_7/func_E000E174.s +++ b/ver/us/asm/nonmatchings/effects/effect_7/func_E000E174.s @@ -17,7 +17,7 @@ glabel func_E000E174 /* 32C2B4 E000E1A4 ACC30070 */ sw $v1, 0x70($a2) /* 32C2B8 E000E1A8 04410005 */ bgez $v0, .LE000E1C0 /* 32C2BC E000E1AC ACC20074 */ sw $v0, 0x74($a2) -/* 32C2C0 E000E1B0 0C080128 */ jal func_E02004A0 +/* 32C2C0 E000E1B0 0C080128 */ jal shim_remove_effect /* 32C2C4 E000E1B4 00000000 */ nop /* 32C2C8 E000E1B8 0800388E */ j .LE000E238 /* 32C2CC E000E1BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_7/func_E000E244.s b/ver/us/asm/nonmatchings/effects/effect_7/func_E000E244.s index 418af353bf..1675be5dae 100644 --- a/ver/us/asm/nonmatchings/effects/effect_7/func_E000E244.s +++ b/ver/us/asm/nonmatchings/effects/effect_7/func_E000E244.s @@ -11,7 +11,7 @@ glabel func_E000E244 /* 32C36C E000E25C 27A40010 */ addiu $a0, $sp, 0x10 /* 32C370 E000E260 AFBF0020 */ sw $ra, 0x20($sp) /* 32C374 E000E264 AFA00014 */ sw $zero, 0x14($sp) -/* 32C378 E000E268 0C080120 */ jal func_E0200480 +/* 32C378 E000E268 0C080120 */ jal shim_queue_render_task /* 32C37C E000E26C AFA20010 */ sw $v0, 0x10($sp) /* 32C380 E000E270 8C430000 */ lw $v1, ($v0) /* 32C384 E000E274 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_7/func_E000E288.s b/ver/us/asm/nonmatchings/effects/effect_7/func_E000E288.s index 14122355b5..ab442f018b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_7/func_E000E288.s +++ b/ver/us/asm/nonmatchings/effects/effect_7/func_E000E288.s @@ -172,7 +172,7 @@ glabel func_E000E288 /* 32C608 E000E4F8 8E05FFF8 */ lw $a1, -8($s0) /* 32C60C E000E4FC 8E06FFFC */ lw $a2, -4($s0) /* 32C610 E000E500 8E070000 */ lw $a3, ($s0) -/* 32C614 E000E504 0C080108 */ jal func_E0200420 +/* 32C614 E000E504 0C080108 */ jal shim_guTranslateF /* 32C618 E000E508 26100078 */ addiu $s0, $s0, 0x78 /* 32C61C E000E50C 3C0E800B */ lui $t6, %hi(gCameras) /* 32C620 E000E510 25CE1D80 */ addiu $t6, $t6, %lo(gCameras) @@ -192,18 +192,18 @@ glabel func_E000E288 /* 32C658 E000E548 46000007 */ neg.s $f0, $f0 /* 32C65C E000E54C 44050000 */ mfc1 $a1, $f0 /* 32C660 E000E550 0280202D */ daddu $a0, $s4, $zero -/* 32C664 E000E554 0C080104 */ jal func_E0200410 +/* 32C664 E000E554 0C080104 */ jal shim_guRotateF /* 32C668 E000E558 E7B40010 */ swc1 $f20, 0x10($sp) /* 32C66C E000E55C 0280202D */ daddu $a0, $s4, $zero /* 32C670 E000E560 27A50018 */ addiu $a1, $sp, 0x18 -/* 32C674 E000E564 0C080114 */ jal func_E0200450 +/* 32C674 E000E564 0C080114 */ jal shim_guMtxCatF /* 32C678 E000E568 00A0302D */ daddu $a2, $a1, $zero /* 32C67C E000E56C 27A40018 */ addiu $a0, $sp, 0x18 /* 32C680 E000E570 96A50000 */ lhu $a1, ($s5) /* 32C684 E000E574 8EC20000 */ lw $v0, ($s6) /* 32C688 E000E578 00052980 */ sll $a1, $a1, 6 /* 32C68C E000E57C 00B32821 */ addu $a1, $a1, $s3 -/* 32C690 E000E580 0C080118 */ jal func_E0200460 +/* 32C690 E000E580 0C080118 */ jal shim_guMtxF2L /* 32C694 E000E584 00452821 */ addu $a1, $v0, $a1 /* 32C698 E000E588 3C02DA38 */ lui $v0, 0xda38 /* 32C69C E000E58C 34420002 */ ori $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_7/fx_7_main.s b/ver/us/asm/nonmatchings/effects/effect_7/fx_7_main.s index b86bcca2b6..18e616cdaa 100644 --- a/ver/us/asm/nonmatchings/effects/effect_7/fx_7_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_7/fx_7_main.s @@ -32,12 +32,12 @@ glabel fx_7_main /* 32C17C E000E06C AFB00028 */ sw $s0, 0x28($sp) /* 32C180 E000E070 AFA00010 */ sw $zero, 0x10($sp) /* 32C184 E000E074 AFA00024 */ sw $zero, 0x24($sp) -/* 32C188 E000E078 0C080124 */ jal func_E0200490 +/* 32C188 E000E078 0C080124 */ jal shim_create_effect_instance /* 32C18C E000E07C AFA20014 */ sw $v0, 0x14($sp) /* 32C190 E000E080 24040078 */ addiu $a0, $zero, 0x78 /* 32C194 E000E084 24120001 */ addiu $s2, $zero, 1 /* 32C198 E000E088 0040802D */ daddu $s0, $v0, $zero -/* 32C19C E000E08C 0C08012C */ jal func_E02004B0 +/* 32C19C E000E08C 0C08012C */ jal shim_general_heap_malloc /* 32C1A0 E000E090 AE120008 */ sw $s2, 8($s0) /* 32C1A4 E000E094 0040882D */ daddu $s1, $v0, $zero /* 32C1A8 E000E098 16200003 */ bnez $s1, .LE000E0A8 @@ -49,7 +49,7 @@ glabel fx_7_main /* 32C1B8 E000E0A8 0220202D */ daddu $a0, $s1, $zero /* 32C1BC E000E0AC 00122900 */ sll $a1, $s2, 4 /* 32C1C0 E000E0B0 00B22823 */ subu $a1, $a1, $s2 -/* 32C1C4 E000E0B4 0C080130 */ jal func_E02004C0 +/* 32C1C4 E000E0B4 0C080130 */ jal shim_mem_clear /* 32C1C8 E000E0B8 000528C0 */ sll $a1, $a1, 3 /* 32C1CC E000E0BC 0000202D */ daddu $a0, $zero, $zero /* 32C1D0 E000E0C0 3A620002 */ xori $v0, $s3, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_70/func_E008C3FC.s b/ver/us/asm/nonmatchings/effects/effect_70/func_E008C3FC.s index d2d0cda85c..eb3f8ecc17 100644 --- a/ver/us/asm/nonmatchings/effects/effect_70/func_E008C3FC.s +++ b/ver/us/asm/nonmatchings/effects/effect_70/func_E008C3FC.s @@ -13,7 +13,7 @@ glabel func_E008C3FC /* 38E21C E008C41C 24420001 */ addiu $v0, $v0, 1 /* 38E220 E008C420 04610005 */ bgez $v1, .LE008C438 /* 38E224 E008C424 ACA20028 */ sw $v0, 0x28($a1) -/* 38E228 E008C428 0C080128 */ jal func_E02004A0 +/* 38E228 E008C428 0C080128 */ jal shim_remove_effect /* 38E22C E008C42C 00000000 */ nop /* 38E230 E008C430 080231AB */ j .LE008C6AC /* 38E234 E008C434 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_70/func_E008C6B8.s b/ver/us/asm/nonmatchings/effects/effect_70/func_E008C6B8.s index 60d49dbe48..bf3fd8f8c9 100644 --- a/ver/us/asm/nonmatchings/effects/effect_70/func_E008C6B8.s +++ b/ver/us/asm/nonmatchings/effects/effect_70/func_E008C6B8.s @@ -11,7 +11,7 @@ glabel func_E008C6B8 /* 38E4D0 E008C6D0 27A40010 */ addiu $a0, $sp, 0x10 /* 38E4D4 E008C6D4 AFBF0020 */ sw $ra, 0x20($sp) /* 38E4D8 E008C6D8 AFA00014 */ sw $zero, 0x14($sp) -/* 38E4DC E008C6DC 0C080120 */ jal func_E0200480 +/* 38E4DC E008C6DC 0C080120 */ jal shim_queue_render_task /* 38E4E0 E008C6E0 AFA20010 */ sw $v0, 0x10($sp) /* 38E4E4 E008C6E4 8C430000 */ lw $v1, ($v0) /* 38E4E8 E008C6E8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_70/func_E008C6FC.s b/ver/us/asm/nonmatchings/effects/effect_70/func_E008C6FC.s index bf72b278c2..1918eaecd4 100644 --- a/ver/us/asm/nonmatchings/effects/effect_70/func_E008C6FC.s +++ b/ver/us/asm/nonmatchings/effects/effect_70/func_E008C6FC.s @@ -58,7 +58,7 @@ glabel func_E008C6FC /* 38E5D0 E008C7D0 8E26000C */ lw $a2, 0xc($s1) /* 38E5D4 E008C7D4 8E270010 */ lw $a3, 0x10($s1) /* 38E5D8 E008C7D8 4480A000 */ mtc1 $zero, $f20 -/* 38E5DC E008C7DC 0C080108 */ jal func_E0200420 +/* 38E5DC E008C7DC 0C080108 */ jal shim_guTranslateF /* 38E5E0 E008C7E0 24160001 */ addiu $s6, $zero, 1 /* 38E5E4 E008C7E4 27B20060 */ addiu $s2, $sp, 0x60 /* 38E5E8 E008C7E8 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -78,11 +78,11 @@ glabel func_E008C6FC /* 38E620 E008C820 46000007 */ neg.s $f0, $f0 /* 38E624 E008C824 44050000 */ mfc1 $a1, $f0 /* 38E628 E008C828 0240202D */ daddu $a0, $s2, $zero -/* 38E62C E008C82C 0C080104 */ jal func_E0200410 +/* 38E62C E008C82C 0C080104 */ jal shim_guRotateF /* 38E630 E008C830 E7B40010 */ swc1 $f20, 0x10($sp) /* 38E634 E008C834 0240202D */ daddu $a0, $s2, $zero /* 38E638 E008C838 27A50020 */ addiu $a1, $sp, 0x20 -/* 38E63C E008C83C 0C080114 */ jal func_E0200450 +/* 38E63C E008C83C 0C080114 */ jal shim_guMtxCatF /* 38E640 E008C840 00A0302D */ daddu $a2, $a1, $zero /* 38E644 E008C844 27A40020 */ addiu $a0, $sp, 0x20 /* 38E648 E008C848 3C148007 */ lui $s4, %hi(gMatrixListPos) @@ -93,7 +93,7 @@ glabel func_E008C6FC /* 38E65C E008C85C 8EA20000 */ lw $v0, ($s5) /* 38E660 E008C860 00052980 */ sll $a1, $a1, 6 /* 38E664 E008C864 00B02821 */ addu $a1, $a1, $s0 -/* 38E668 E008C868 0C080118 */ jal func_E0200460 +/* 38E668 E008C868 0C080118 */ jal shim_guMtxF2L /* 38E66C E008C86C 00452821 */ addu $a1, $v0, $a1 /* 38E670 E008C870 8E620000 */ lw $v0, ($s3) /* 38E674 E008C874 26310048 */ addiu $s1, $s1, 0x48 @@ -135,17 +135,17 @@ glabel func_E008C6FC /* 38E700 E008C900 E7A0001C */ swc1 $f0, 0x1c($sp) /* 38E704 E008C904 8E05FFE6 */ lw $a1, -0x1a($s0) /* 38E708 E008C908 8E07FFEE */ lw $a3, -0x12($s0) -/* 38E70C E008C90C 0C080180 */ jal func_E0200600 +/* 38E70C E008C90C 0C080180 */ jal shim_guPositionF /* 38E710 E008C910 27A40020 */ addiu $a0, $sp, 0x20 /* 38E714 E008C914 E7B40010 */ swc1 $f20, 0x10($sp) /* 38E718 E008C918 8E05FFEA */ lw $a1, -0x16($s0) /* 38E71C E008C91C 4406A000 */ mfc1 $a2, $f20 /* 38E720 E008C920 3C073F80 */ lui $a3, 0x3f80 -/* 38E724 E008C924 0C080104 */ jal func_E0200410 +/* 38E724 E008C924 0C080104 */ jal shim_guRotateF /* 38E728 E008C928 0240202D */ daddu $a0, $s2, $zero /* 38E72C E008C92C 0240202D */ daddu $a0, $s2, $zero /* 38E730 E008C930 27A50020 */ addiu $a1, $sp, 0x20 -/* 38E734 E008C934 0C080114 */ jal func_E0200450 +/* 38E734 E008C934 0C080114 */ jal shim_guMtxCatF /* 38E738 E008C938 00A0302D */ daddu $a2, $a1, $zero /* 38E73C E008C93C 8FA800A0 */ lw $t0, 0xa0($sp) /* 38E740 E008C940 29020008 */ slti $v0, $t0, 8 @@ -166,11 +166,11 @@ glabel func_E008C6FC /* 38E778 E008C978 4406A000 */ mfc1 $a2, $f20 /* 38E77C E008C97C 4407A000 */ mfc1 $a3, $f20 .LE008C980: -/* 38E780 E008C980 0C080108 */ jal func_E0200420 +/* 38E780 E008C980 0C080108 */ jal shim_guTranslateF /* 38E784 E008C984 0240202D */ daddu $a0, $s2, $zero /* 38E788 E008C988 0240202D */ daddu $a0, $s2, $zero /* 38E78C E008C98C 27A50020 */ addiu $a1, $sp, 0x20 -/* 38E790 E008C990 0C080114 */ jal func_E0200450 +/* 38E790 E008C990 0C080114 */ jal shim_guMtxCatF /* 38E794 E008C994 00A0302D */ daddu $a2, $a1, $zero /* 38E798 E008C998 27A40020 */ addiu $a0, $sp, 0x20 /* 38E79C E008C99C 26D60001 */ addiu $s6, $s6, 1 @@ -197,7 +197,7 @@ glabel func_E008C6FC /* 38E7F0 E008C9F0 00661825 */ or $v1, $v1, $a2 /* 38E7F4 E008C9F4 310200FF */ andi $v0, $t0, 0xff /* 38E7F8 E008C9F8 00621825 */ or $v1, $v1, $v0 -/* 38E7FC E008C9FC 0C080118 */ jal func_E0200460 +/* 38E7FC E008C9FC 0C080118 */ jal shim_guMtxF2L /* 38E800 E008CA00 ACE30004 */ sw $v1, 4($a3) /* 38E804 E008CA04 3C06D838 */ lui $a2, 0xd838 /* 38E808 E008CA08 8E640000 */ lw $a0, ($s3) diff --git a/ver/us/asm/nonmatchings/effects/effect_70/fx_70_main.s b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_main.s index 625e531417..a919d2b3d0 100644 --- a/ver/us/asm/nonmatchings/effects/effect_70/fx_70_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_main.s @@ -32,12 +32,12 @@ glabel fx_70_main /* 38DE6C E008C06C AFA50074 */ sw $a1, 0x74($sp) /* 38DE70 E008C070 AFA00010 */ sw $zero, 0x10($sp) /* 38DE74 E008C074 AFA00024 */ sw $zero, 0x24($sp) -/* 38DE78 E008C078 0C080124 */ jal func_E0200490 +/* 38DE78 E008C078 0C080124 */ jal shim_create_effect_instance /* 38DE7C E008C07C AFA20014 */ sw $v0, 0x14($sp) /* 38DE80 E008C080 24040168 */ addiu $a0, $zero, 0x168 /* 38DE84 E008C084 AFA20028 */ sw $v0, 0x28($sp) /* 38DE88 E008C088 24080005 */ addiu $t0, $zero, 5 -/* 38DE8C E008C08C 0C08012C */ jal func_E02004B0 +/* 38DE8C E008C08C 0C08012C */ jal shim_general_heap_malloc /* 38DE90 E008C090 AC480008 */ sw $t0, 8($v0) /* 38DE94 E008C094 8FA90028 */ lw $t1, 0x28($sp) /* 38DE98 E008C098 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/effects/effect_71/func_E008E204.s b/ver/us/asm/nonmatchings/effects/effect_71/func_E008E204.s index 32b240c5a3..f139421d5f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_71/func_E008E204.s +++ b/ver/us/asm/nonmatchings/effects/effect_71/func_E008E204.s @@ -27,7 +27,7 @@ glabel func_E008E204 /* 38F0B8 E008E258 24420001 */ addiu $v0, $v0, 1 /* 38F0BC E008E25C 04610005 */ bgez $v1, .LE008E274 /* 38F0C0 E008E260 AC82001C */ sw $v0, 0x1c($a0) -/* 38F0C4 E008E264 0C080128 */ jal func_E02004A0 +/* 38F0C4 E008E264 0C080128 */ jal shim_remove_effect /* 38F0C8 E008E268 0260202D */ daddu $a0, $s3, $zero /* 38F0CC E008E26C 08023919 */ j .LE008E464 /* 38F0D0 E008E270 00000000 */ nop @@ -71,16 +71,16 @@ glabel func_E008E204 /* 38F154 E008E2F4 C614FFFC */ lwc1 $f20, -4($s0) /* 38F158 E008E2F8 C6180008 */ lwc1 $f24, 8($s0) /* 38F15C E008E2FC C61A0000 */ lwc1 $f26, ($s0) -/* 38F160 E008E300 0C080140 */ jal func_E0200500 +/* 38F160 E008E300 0C080140 */ jal shim_sin_deg /* 38F164 E008E304 4600A306 */ mov.s $f12, $f20 /* 38F168 E008E308 4600A306 */ mov.s $f12, $f20 -/* 38F16C E008E30C 0C080144 */ jal func_E0200510 +/* 38F16C E008E30C 0C080144 */ jal shim_cos_deg /* 38F170 E008E310 46000586 */ mov.s $f22, $f0 /* 38F174 E008E314 4600D306 */ mov.s $f12, $f26 -/* 38F178 E008E318 0C080140 */ jal func_E0200500 +/* 38F178 E008E318 0C080140 */ jal shim_sin_deg /* 38F17C E008E31C 46000506 */ mov.s $f20, $f0 /* 38F180 E008E320 4600D306 */ mov.s $f12, $f26 -/* 38F184 E008E324 0C080144 */ jal func_E0200510 +/* 38F184 E008E324 0C080144 */ jal shim_cos_deg /* 38F188 E008E328 46000686 */ mov.s $f26, $f0 /* 38F18C E008E32C 4616C582 */ mul.s $f22, $f24, $f22 /* 38F190 E008E330 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_71/func_E008E498.s b/ver/us/asm/nonmatchings/effects/effect_71/func_E008E498.s index 9827b77c8d..f056e9c226 100644 --- a/ver/us/asm/nonmatchings/effects/effect_71/func_E008E498.s +++ b/ver/us/asm/nonmatchings/effects/effect_71/func_E008E498.s @@ -12,7 +12,7 @@ glabel func_E008E498 /* 38F314 E008E4B4 AFA40018 */ sw $a0, 0x18($sp) /* 38F318 E008E4B8 27A40010 */ addiu $a0, $sp, 0x10 /* 38F31C E008E4BC AFBF0020 */ sw $ra, 0x20($sp) -/* 38F320 E008E4C0 0C080120 */ jal func_E0200480 +/* 38F320 E008E4C0 0C080120 */ jal shim_queue_render_task /* 38F324 E008E4C4 AFA20010 */ sw $v0, 0x10($sp) /* 38F328 E008E4C8 8C430000 */ lw $v1, ($v0) /* 38F32C E008E4CC 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_71/func_E008E4E0.s b/ver/us/asm/nonmatchings/effects/effect_71/func_E008E4E0.s index 883131c2da..cd8bdebd47 100644 --- a/ver/us/asm/nonmatchings/effects/effect_71/func_E008E4E0.s +++ b/ver/us/asm/nonmatchings/effects/effect_71/func_E008E4E0.s @@ -45,7 +45,7 @@ glabel func_E008E4E0 /* 38F3E0 E008E580 8E46000C */ lw $a2, 0xc($s2) /* 38F3E4 E008E584 8E470010 */ lw $a3, 0x10($s2) /* 38F3E8 E008E588 25080008 */ addiu $t0, $t0, 8 -/* 38F3EC E008E58C 0C080108 */ jal func_E0200420 +/* 38F3EC E008E58C 0C080108 */ jal shim_guTranslateF /* 38F3F0 E008E590 AE880000 */ sw $t0, ($s4) /* 38F3F4 E008E594 27B00098 */ addiu $s0, $sp, 0x98 /* 38F3F8 E008E598 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -66,11 +66,11 @@ glabel func_E008E4E0 /* 38F434 E008E5D4 46000007 */ neg.s $f0, $f0 /* 38F438 E008E5D8 44050000 */ mfc1 $a1, $f0 /* 38F43C E008E5DC 0200202D */ daddu $a0, $s0, $zero -/* 38F440 E008E5E0 0C080104 */ jal func_E0200410 +/* 38F440 E008E5E0 0C080104 */ jal shim_guRotateF /* 38F444 E008E5E4 AFA60010 */ sw $a2, 0x10($sp) /* 38F448 E008E5E8 0200202D */ daddu $a0, $s0, $zero /* 38F44C E008E5EC 27A50018 */ addiu $a1, $sp, 0x18 -/* 38F450 E008E5F0 0C080114 */ jal func_E0200450 +/* 38F450 E008E5F0 0C080114 */ jal shim_guMtxCatF /* 38F454 E008E5F4 00A0302D */ daddu $a2, $a1, $zero /* 38F458 E008E5F8 27A40018 */ addiu $a0, $sp, 0x18 /* 38F45C E008E5FC 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -81,7 +81,7 @@ glabel func_E008E4E0 /* 38F470 E008E610 8EC20000 */ lw $v0, ($s6) /* 38F474 E008E614 00052980 */ sll $a1, $a1, 6 /* 38F478 E008E618 00B12821 */ addu $a1, $a1, $s1 -/* 38F47C E008E61C 0C080118 */ jal func_E0200460 +/* 38F47C E008E61C 0C080118 */ jal shim_guMtxF2L /* 38F480 E008E620 00452821 */ addu $a1, $v0, $a1 /* 38F484 E008E624 3C03DA38 */ lui $v1, 0xda38 /* 38F488 E008E628 34630002 */ ori $v1, $v1, 2 @@ -158,23 +158,23 @@ glabel func_E008E4E0 /* 38F5A0 E008E740 8E05FFF8 */ lw $a1, -8($s0) /* 38F5A4 E008E744 8E06FFFC */ lw $a2, -4($s0) /* 38F5A8 E008E748 8E070000 */ lw $a3, ($s0) -/* 38F5AC E008E74C 0C080108 */ jal func_E0200420 +/* 38F5AC E008E74C 0C080108 */ jal shim_guTranslateF /* 38F5B0 E008E750 27A40018 */ addiu $a0, $sp, 0x18 /* 38F5B4 E008E754 4405A000 */ mfc1 $a1, $f20 /* 38F5B8 E008E758 02A0202D */ daddu $a0, $s5, $zero /* 38F5BC E008E75C 00A0302D */ daddu $a2, $a1, $zero -/* 38F5C0 E008E760 0C080110 */ jal func_E0200440 +/* 38F5C0 E008E760 0C080110 */ jal shim_guScaleF /* 38F5C4 E008E764 00A0382D */ daddu $a3, $a1, $zero /* 38F5C8 E008E768 02A0202D */ daddu $a0, $s5, $zero /* 38F5CC E008E76C 27A50018 */ addiu $a1, $sp, 0x18 -/* 38F5D0 E008E770 0C080114 */ jal func_E0200450 +/* 38F5D0 E008E770 0C080114 */ jal shim_guMtxCatF /* 38F5D4 E008E774 00A0302D */ daddu $a2, $a1, $zero /* 38F5D8 E008E778 27A40018 */ addiu $a0, $sp, 0x18 /* 38F5DC E008E77C 96C50000 */ lhu $a1, ($s6) /* 38F5E0 E008E780 8EE20000 */ lw $v0, ($s7) /* 38F5E4 E008E784 00052980 */ sll $a1, $a1, 6 /* 38F5E8 E008E788 00B42821 */ addu $a1, $a1, $s4 -/* 38F5EC E008E78C 0C080118 */ jal func_E0200460 +/* 38F5EC E008E78C 0C080118 */ jal shim_guMtxF2L /* 38F5F0 E008E790 00452821 */ addu $a1, $v0, $a1 /* 38F5F4 E008E794 3C06D838 */ lui $a2, 0xd838 /* 38F5F8 E008E798 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/asm/nonmatchings/effects/effect_71/fx_71_main.s b/ver/us/asm/nonmatchings/effects/effect_71/fx_71_main.s index f51187bea3..964d8119ee 100644 --- a/ver/us/asm/nonmatchings/effects/effect_71/fx_71_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_71/fx_71_main.s @@ -29,12 +29,12 @@ glabel fx_71_main /* 38EEC0 E008E060 AFB00028 */ sw $s0, 0x28($sp) /* 38EEC4 E008E064 AFA00010 */ sw $zero, 0x10($sp) /* 38EEC8 E008E068 AFA00024 */ sw $zero, 0x24($sp) -/* 38EECC E008E06C 0C080124 */ jal func_E0200490 +/* 38EECC E008E06C 0C080124 */ jal shim_create_effect_instance /* 38EED0 E008E070 AFA20014 */ sw $v0, 0x14($sp) /* 38EED4 E008E074 240408B8 */ addiu $a0, $zero, 0x8b8 /* 38EED8 E008E078 2411001F */ addiu $s1, $zero, 0x1f /* 38EEDC E008E07C 0040802D */ daddu $s0, $v0, $zero -/* 38EEE0 E008E080 0C08012C */ jal func_E02004B0 +/* 38EEE0 E008E080 0C08012C */ jal shim_general_heap_malloc /* 38EEE4 E008E084 AE110008 */ sw $s1, 8($s0) /* 38EEE8 E008E088 0040282D */ daddu $a1, $v0, $zero /* 38EEEC E008E08C 14A00003 */ bnez $a1, .LE008E09C diff --git a/ver/us/asm/nonmatchings/effects/effect_72/func_E00901C8.s b/ver/us/asm/nonmatchings/effects/effect_72/func_E00901C8.s index fac6d40fdc..4df5f7c8ec 100644 --- a/ver/us/asm/nonmatchings/effects/effect_72/func_E00901C8.s +++ b/ver/us/asm/nonmatchings/effects/effect_72/func_E00901C8.s @@ -19,7 +19,7 @@ glabel func_E00901C8 /* 38FAFC E00901FC ACA6001C */ sw $a2, 0x1c($a1) /* 38FB00 E0090200 2402FFFF */ addiu $v0, $zero, -1 /* 38FB04 E0090204 ACA00024 */ sw $zero, 0x24($a1) -/* 38FB08 E0090208 0C080128 */ jal func_E02004A0 +/* 38FB08 E0090208 0C080128 */ jal shim_remove_effect /* 38FB0C E009020C ACA20018 */ sw $v0, 0x18($a1) /* 38FB10 E0090210 08024105 */ j .LE0090414 /* 38FB14 E0090214 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_72/func_E0090444.s b/ver/us/asm/nonmatchings/effects/effect_72/func_E0090444.s index 266cf0aac2..11ec8c4cb3 100644 --- a/ver/us/asm/nonmatchings/effects/effect_72/func_E0090444.s +++ b/ver/us/asm/nonmatchings/effects/effect_72/func_E0090444.s @@ -62,7 +62,7 @@ glabel func_E0090444 /* 38FE24 E0090524 8E650008 */ lw $a1, 8($s3) /* 38FE28 E0090528 8E66000C */ lw $a2, 0xc($s3) /* 38FE2C E009052C 8E670010 */ lw $a3, 0x10($s3) -/* 38FE30 E0090530 0C080108 */ jal func_E0200420 +/* 38FE30 E0090530 0C080108 */ jal shim_guTranslateF /* 38FE34 E0090534 36521630 */ ori $s2, $s2, 0x1630 /* 38FE38 E0090538 27B00058 */ addiu $s0, $sp, 0x58 /* 38FE3C E009053C 3C013F80 */ lui $at, 0x3f80 @@ -85,20 +85,20 @@ glabel func_E0090444 /* 38FE80 E0090580 46000007 */ neg.s $f0, $f0 /* 38FE84 E0090584 44050000 */ mfc1 $a1, $f0 /* 38FE88 E0090588 0200202D */ daddu $a0, $s0, $zero -/* 38FE8C E009058C 0C080104 */ jal func_E0200410 +/* 38FE8C E009058C 0C080104 */ jal shim_guRotateF /* 38FE90 E0090590 AFA60010 */ sw $a2, 0x10($sp) /* 38FE94 E0090594 0200202D */ daddu $a0, $s0, $zero /* 38FE98 E0090598 27A50018 */ addiu $a1, $sp, 0x18 -/* 38FE9C E009059C 0C080114 */ jal func_E0200450 +/* 38FE9C E009059C 0C080114 */ jal shim_guMtxCatF /* 38FEA0 E00905A0 00A0302D */ daddu $a2, $a1, $zero /* 38FEA4 E00905A4 0200202D */ daddu $a0, $s0, $zero /* 38FEA8 E00905A8 4405B000 */ mfc1 $a1, $f22 /* 38FEAC E00905AC 4407A000 */ mfc1 $a3, $f20 -/* 38FEB0 E00905B0 0C080110 */ jal func_E0200440 +/* 38FEB0 E00905B0 0C080110 */ jal shim_guScaleF /* 38FEB4 E00905B4 00A0302D */ daddu $a2, $a1, $zero /* 38FEB8 E00905B8 0200202D */ daddu $a0, $s0, $zero /* 38FEBC E00905BC 27A50018 */ addiu $a1, $sp, 0x18 -/* 38FEC0 E00905C0 0C080114 */ jal func_E0200450 +/* 38FEC0 E00905C0 0C080114 */ jal shim_guMtxCatF /* 38FEC4 E00905C4 00A0302D */ daddu $a2, $a1, $zero /* 38FEC8 E00905C8 27A40018 */ addiu $a0, $sp, 0x18 /* 38FECC E00905CC 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -109,7 +109,7 @@ glabel func_E0090444 /* 38FEE0 E00905E0 8E220000 */ lw $v0, ($s1) /* 38FEE4 E00905E4 00052980 */ sll $a1, $a1, 6 /* 38FEE8 E00905E8 00B22821 */ addu $a1, $a1, $s2 -/* 38FEEC E00905EC 0C080118 */ jal func_E0200460 +/* 38FEEC E00905EC 0C080118 */ jal shim_guMtxF2L /* 38FEF0 E00905F0 00452821 */ addu $a1, $v0, $a1 /* 38FEF4 E00905F4 3C03DA38 */ lui $v1, 0xda38 /* 38FEF8 E00905F8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_72/fx_72_main.s b/ver/us/asm/nonmatchings/effects/effect_72/fx_72_main.s index 1a05e4ca6a..475140a02b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_72/fx_72_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_72/fx_72_main.s @@ -34,12 +34,12 @@ glabel fx_72_main /* 38F974 E0090074 AFB00028 */ sw $s0, 0x28($sp) /* 38F978 E0090078 F7B40040 */ sdc1 $f20, 0x40($sp) /* 38F97C E009007C AFA00010 */ sw $zero, 0x10($sp) -/* 38F980 E0090080 0C080124 */ jal func_E0200490 +/* 38F980 E0090080 0C080124 */ jal shim_create_effect_instance /* 38F984 E0090084 AFA20014 */ sw $v0, 0x14($sp) /* 38F988 E0090088 24040038 */ addiu $a0, $zero, 0x38 /* 38F98C E009008C 24030001 */ addiu $v1, $zero, 1 /* 38F990 E0090090 0040882D */ daddu $s1, $v0, $zero -/* 38F994 E0090094 0C08012C */ jal func_E02004B0 +/* 38F994 E0090094 0C08012C */ jal shim_general_heap_malloc /* 38F998 E0090098 AE230008 */ sw $v1, 8($s1) /* 38F99C E009009C 0040802D */ daddu $s0, $v0, $zero /* 38F9A0 E00900A0 16000003 */ bnez $s0, .LE00900B0 @@ -81,14 +81,14 @@ glabel fx_72_main /* 38FA20 E0090120 E6180008 */ swc1 $f24, 8($s0) /* 38FA24 E0090124 E61A000C */ swc1 $f26, 0xc($s0) /* 38FA28 E0090128 E61C0010 */ swc1 $f28, 0x10($s0) -/* 38FA2C E009012C 0C080140 */ jal func_E0200500 +/* 38FA2C E009012C 0C080140 */ jal shim_sin_deg /* 38FA30 E0090130 4600A306 */ mov.s $f12, $f20 /* 38FA34 E0090134 46000007 */ neg.s $f0, $f0 /* 38FA38 E0090138 46160002 */ mul.s $f0, $f0, $f22 /* 38FA3C E009013C 00000000 */ nop /* 38FA40 E0090140 46000000 */ add.s $f0, $f0, $f0 /* 38FA44 E0090144 4600A306 */ mov.s $f12, $f20 -/* 38FA48 E0090148 0C080144 */ jal func_E0200510 +/* 38FA48 E0090148 0C080144 */ jal shim_cos_deg /* 38FA4C E009014C E6000030 */ swc1 $f0, 0x30($s0) /* 38FA50 E0090150 46160002 */ mul.s $f0, $f0, $f22 /* 38FA54 E0090154 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_73/func_E00921B4.s b/ver/us/asm/nonmatchings/effects/effect_73/func_E00921B4.s index 8cf3cba0bf..9a813251cd 100644 --- a/ver/us/asm/nonmatchings/effects/effect_73/func_E00921B4.s +++ b/ver/us/asm/nonmatchings/effects/effect_73/func_E00921B4.s @@ -13,7 +13,7 @@ glabel func_E00921B4 /* 391F04 E00921D4 24420001 */ addiu $v0, $v0, 1 /* 391F08 E00921D8 04610005 */ bgez $v1, .LE00921F0 /* 391F0C E00921DC ACA20018 */ sw $v0, 0x18($a1) -/* 391F10 E00921E0 0C080128 */ jal func_E02004A0 +/* 391F10 E00921E0 0C080128 */ jal shim_remove_effect /* 391F14 E00921E4 00000000 */ nop /* 391F18 E00921E8 08024893 */ j .LE009224C /* 391F1C E00921EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_73/func_E0092258.s b/ver/us/asm/nonmatchings/effects/effect_73/func_E0092258.s index eddbf7fe62..90d85b2a65 100644 --- a/ver/us/asm/nonmatchings/effects/effect_73/func_E0092258.s +++ b/ver/us/asm/nonmatchings/effects/effect_73/func_E0092258.s @@ -12,7 +12,7 @@ glabel func_E0092258 /* 391FA4 E0092274 AFA40018 */ sw $a0, 0x18($sp) /* 391FA8 E0092278 27A40010 */ addiu $a0, $sp, 0x10 /* 391FAC E009227C AFBF0020 */ sw $ra, 0x20($sp) -/* 391FB0 E0092280 0C080120 */ jal func_E0200480 +/* 391FB0 E0092280 0C080120 */ jal shim_queue_render_task /* 391FB4 E0092284 AFA20010 */ sw $v0, 0x10($sp) /* 391FB8 E0092288 8C430000 */ lw $v1, ($v0) /* 391FBC E009228C 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_73/func_E00922A0.s b/ver/us/asm/nonmatchings/effects/effect_73/func_E00922A0.s index 59b2aa1767..fba066231a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_73/func_E00922A0.s +++ b/ver/us/asm/nonmatchings/effects/effect_73/func_E00922A0.s @@ -42,7 +42,7 @@ glabel func_E00922A0 /* 392064 E0092334 46000007 */ neg.s $f0, $f0 /* 392068 E0092338 44050000 */ mfc1 $a1, $f0 /* 39206C E009233C 24130001 */ addiu $s3, $zero, 1 -/* 392070 E0092340 0C080104 */ jal func_E0200410 +/* 392070 E0092340 0C080104 */ jal shim_guRotateF /* 392074 E0092344 AFA60010 */ sw $a2, 0x10($sp) /* 392078 E0092348 0200202D */ daddu $a0, $s0, $zero /* 39207C E009234C 3C128007 */ lui $s2, %hi(gMatrixListPos) @@ -53,7 +53,7 @@ glabel func_E00922A0 /* 392090 E0092360 8EC20000 */ lw $v0, ($s6) /* 392094 E0092364 00052980 */ sll $a1, $a1, 6 /* 392098 E0092368 00B12821 */ addu $a1, $a1, $s1 -/* 39209C E009236C 0C080118 */ jal func_E0200460 +/* 39209C E009236C 0C080118 */ jal shim_guMtxF2L /* 3920A0 E0092370 00452821 */ addu $a1, $v0, $a1 /* 3920A4 E0092374 3C06DB06 */ lui $a2, 0xdb06 /* 3920A8 E0092378 34C60024 */ ori $a2, $a2, 0x24 @@ -87,14 +87,14 @@ glabel func_E00922A0 /* 392118 E00923E8 8EC20000 */ lw $v0, ($s6) /* 39211C E00923EC 8E870010 */ lw $a3, 0x10($s4) /* 392120 E00923F0 00481021 */ addu $v0, $v0, $t0 -/* 392124 E00923F4 0C080108 */ jal func_E0200420 +/* 392124 E00923F4 0C080108 */ jal shim_guTranslateF /* 392128 E00923F8 AFA200D8 */ sw $v0, 0xd8($sp) /* 39212C E00923FC 27A40018 */ addiu $a0, $sp, 0x18 /* 392130 E0092400 96450000 */ lhu $a1, ($s2) /* 392134 E0092404 8EC20000 */ lw $v0, ($s6) /* 392138 E0092408 00052980 */ sll $a1, $a1, 6 /* 39213C E009240C 00B12821 */ addu $a1, $a1, $s1 -/* 392140 E0092410 0C080118 */ jal func_E0200460 +/* 392140 E0092410 0C080118 */ jal shim_guMtxF2L /* 392144 E0092414 00452821 */ addu $a1, $v0, $a1 /* 392148 E0092418 3C03DA38 */ lui $v1, 0xda38 /* 39214C E009241C 34630002 */ ori $v1, $v1, 2 @@ -148,7 +148,7 @@ glabel func_E00922A0 /* 392208 E00924D8 8E060008 */ lw $a2, 8($s0) /* 39220C E00924DC 8E07000C */ lw $a3, 0xc($s0) /* 392210 E00924E0 C6140018 */ lwc1 $f20, 0x18($s0) -/* 392214 E00924E4 0C080108 */ jal func_E0200420 +/* 392214 E00924E4 0C080108 */ jal shim_guTranslateF /* 392218 E00924E8 27A40018 */ addiu $a0, $sp, 0x18 /* 39221C E00924EC 4616A032 */ c.eq.s $f20, $f22 /* 392220 E00924F0 00000000 */ nop @@ -157,11 +157,11 @@ glabel func_E00922A0 /* 39222C E00924FC 02A0202D */ daddu $a0, $s5, $zero /* 392230 E0092500 4405A000 */ mfc1 $a1, $f20 /* 392234 E0092504 4407B000 */ mfc1 $a3, $f22 -/* 392238 E0092508 0C080110 */ jal func_E0200440 +/* 392238 E0092508 0C080110 */ jal shim_guScaleF /* 39223C E009250C 00A0302D */ daddu $a2, $a1, $zero /* 392240 E0092510 02A0202D */ daddu $a0, $s5, $zero /* 392244 E0092514 27A50018 */ addiu $a1, $sp, 0x18 -/* 392248 E0092518 0C080114 */ jal func_E0200450 +/* 392248 E0092518 0C080114 */ jal shim_guMtxCatF /* 39224C E009251C 00A0302D */ daddu $a2, $a1, $zero /* 392250 E0092520 27A40018 */ addiu $a0, $sp, 0x18 .LE0092524: @@ -169,7 +169,7 @@ glabel func_E00922A0 /* 392258 E0092528 8FC20000 */ lw $v0, ($fp) /* 39225C E009252C 00052980 */ sll $a1, $a1, 6 /* 392260 E0092530 00B22821 */ addu $a1, $a1, $s2 -/* 392264 E0092534 0C080118 */ jal func_E0200460 +/* 392264 E0092534 0C080118 */ jal shim_guMtxF2L /* 392268 E0092538 00452821 */ addu $a1, $v0, $a1 /* 39226C E009253C 3C06DA38 */ lui $a2, 0xda38 /* 392270 E0092540 34C60001 */ ori $a2, $a2, 1 diff --git a/ver/us/asm/nonmatchings/effects/effect_73/fx_73_main.s b/ver/us/asm/nonmatchings/effects/effect_73/fx_73_main.s index 52c8c58a15..44b0163f13 100644 --- a/ver/us/asm/nonmatchings/effects/effect_73/fx_73_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_73/fx_73_main.s @@ -29,12 +29,12 @@ glabel fx_73_main /* 391D90 E0092060 AFB00028 */ sw $s0, 0x28($sp) /* 391D94 E0092064 AFA00010 */ sw $zero, 0x10($sp) /* 391D98 E0092068 AFA00024 */ sw $zero, 0x24($sp) -/* 391D9C E009206C 0C080124 */ jal func_E0200490 +/* 391D9C E009206C 0C080124 */ jal shim_create_effect_instance /* 391DA0 E0092070 AFA20014 */ sw $v0, 0x14($sp) /* 391DA4 E0092074 240400B4 */ addiu $a0, $zero, 0xb4 /* 391DA8 E0092078 24110005 */ addiu $s1, $zero, 5 /* 391DAC E009207C 0040802D */ daddu $s0, $v0, $zero -/* 391DB0 E0092080 0C08012C */ jal func_E02004B0 +/* 391DB0 E0092080 0C08012C */ jal shim_general_heap_malloc /* 391DB4 E0092084 AE110008 */ sw $s1, 8($s0) /* 391DB8 E0092088 0040182D */ daddu $v1, $v0, $zero /* 391DBC E009208C 14600003 */ bnez $v1, .LE009209C diff --git a/ver/us/asm/nonmatchings/effects/effect_74/func_E0094198.s b/ver/us/asm/nonmatchings/effects/effect_74/func_E0094198.s index 4ef67530d7..73f49312d1 100644 --- a/ver/us/asm/nonmatchings/effects/effect_74/func_E0094198.s +++ b/ver/us/asm/nonmatchings/effects/effect_74/func_E0094198.s @@ -17,7 +17,7 @@ glabel func_E0094198 /* 392A94 E00941C4 24420001 */ addiu $v0, $v0, 1 /* 392A98 E00941C8 04A10005 */ bgez $a1, .LE00941E0 /* 392A9C E00941CC AC620020 */ sw $v0, 0x20($v1) -/* 392AA0 E00941D0 0C080128 */ jal func_E02004A0 +/* 392AA0 E00941D0 0C080128 */ jal shim_remove_effect /* 392AA4 E00941D4 00000000 */ nop /* 392AA8 E00941D8 080250AD */ j .LE00942B4 /* 392AAC E00941DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_74/func_E00942C0.s b/ver/us/asm/nonmatchings/effects/effect_74/func_E00942C0.s index 033ba6cf65..e296ef00e0 100644 --- a/ver/us/asm/nonmatchings/effects/effect_74/func_E00942C0.s +++ b/ver/us/asm/nonmatchings/effects/effect_74/func_E00942C0.s @@ -12,7 +12,7 @@ glabel func_E00942C0 /* 392BAC E00942DC AFA40018 */ sw $a0, 0x18($sp) /* 392BB0 E00942E0 27A40010 */ addiu $a0, $sp, 0x10 /* 392BB4 E00942E4 AFBF0020 */ sw $ra, 0x20($sp) -/* 392BB8 E00942E8 0C080120 */ jal func_E0200480 +/* 392BB8 E00942E8 0C080120 */ jal shim_queue_render_task /* 392BBC E00942EC AFA20010 */ sw $v0, 0x10($sp) /* 392BC0 E00942F0 8FBF0020 */ lw $ra, 0x20($sp) /* 392BC4 E00942F4 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_74/func_E00942FC.s b/ver/us/asm/nonmatchings/effects/effect_74/func_E00942FC.s index ea37d5d17b..6667b9ef00 100644 --- a/ver/us/asm/nonmatchings/effects/effect_74/func_E00942FC.s +++ b/ver/us/asm/nonmatchings/effects/effect_74/func_E00942FC.s @@ -36,7 +36,7 @@ glabel func_E00942FC /* 392C48 E0094378 46000007 */ neg.s $f0, $f0 /* 392C4C E009437C 44050000 */ mfc1 $a1, $f0 /* 392C50 E0094380 36941630 */ ori $s4, $s4, 0x1630 -/* 392C54 E0094384 0C080104 */ jal func_E0200410 +/* 392C54 E0094384 0C080104 */ jal shim_guRotateF /* 392C58 E0094388 AFA60010 */ sw $a2, 0x10($sp) /* 392C5C E009438C 3C04DB06 */ lui $a0, 0xdb06 /* 392C60 E0094390 3C13800A */ lui $s3, %hi(gMasterGfxPos) @@ -60,11 +60,11 @@ glabel func_E00942FC /* 392CA8 E00943D8 8E460008 */ lw $a2, 8($s2) /* 392CAC E00943DC 8E47000C */ lw $a3, 0xc($s2) /* 392CB0 E00943E0 25080008 */ addiu $t0, $t0, 8 -/* 392CB4 E00943E4 0C080108 */ jal func_E0200420 +/* 392CB4 E00943E4 0C080108 */ jal shim_guTranslateF /* 392CB8 E00943E8 AE680000 */ sw $t0, ($s3) /* 392CBC E00943EC 0220202D */ daddu $a0, $s1, $zero /* 392CC0 E00943F0 27A50018 */ addiu $a1, $sp, 0x18 -/* 392CC4 E00943F4 0C080114 */ jal func_E0200450 +/* 392CC4 E00943F4 0C080114 */ jal shim_guMtxCatF /* 392CC8 E00943F8 00A0302D */ daddu $a2, $a1, $zero /* 392CCC E00943FC 27A40018 */ addiu $a0, $sp, 0x18 /* 392CD0 E0094400 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -75,7 +75,7 @@ glabel func_E00942FC /* 392CE4 E0094414 8E220000 */ lw $v0, ($s1) /* 392CE8 E0094418 00052980 */ sll $a1, $a1, 6 /* 392CEC E009441C 00B42821 */ addu $a1, $a1, $s4 -/* 392CF0 E0094420 0C080118 */ jal func_E0200460 +/* 392CF0 E0094420 0C080118 */ jal shim_guMtxF2L /* 392CF4 E0094424 00452821 */ addu $a1, $v0, $a1 /* 392CF8 E0094428 3C03DA38 */ lui $v1, 0xda38 /* 392CFC E009442C 34630002 */ ori $v1, $v1, 2 @@ -130,14 +130,14 @@ glabel func_E00942FC /* 392DC0 E00944F0 8E46002C */ lw $a2, 0x2c($s2) /* 392DC4 E00944F4 3C073F89 */ lui $a3, 0x3f89 /* 392DC8 E00944F8 34E72492 */ ori $a3, $a3, 0x2492 -/* 392DCC E00944FC 0C080110 */ jal func_E0200440 +/* 392DCC E00944FC 0C080110 */ jal shim_guScaleF /* 392DD0 E0094500 27A40018 */ addiu $a0, $sp, 0x18 /* 392DD4 E0094504 27A40018 */ addiu $a0, $sp, 0x18 /* 392DD8 E0094508 96050000 */ lhu $a1, ($s0) /* 392DDC E009450C 8E220000 */ lw $v0, ($s1) /* 392DE0 E0094510 00052980 */ sll $a1, $a1, 6 /* 392DE4 E0094514 00B42821 */ addu $a1, $a1, $s4 -/* 392DE8 E0094518 0C080118 */ jal func_E0200460 +/* 392DE8 E0094518 0C080118 */ jal shim_guMtxF2L /* 392DEC E009451C 00452821 */ addu $a1, $v0, $a1 /* 392DF0 E0094520 3C08D838 */ lui $t0, 0xd838 /* 392DF4 E0094524 35080002 */ ori $t0, $t0, 2 @@ -213,7 +213,7 @@ glabel func_E00942FC /* 392F00 E0094630 27A40018 */ addiu $a0, $sp, 0x18 /* 392F04 E0094634 44050000 */ mfc1 $a1, $f0 /* 392F08 E0094638 8E46002C */ lw $a2, 0x2c($s2) -/* 392F0C E009463C 0C080108 */ jal func_E0200420 +/* 392F0C E009463C 0C080108 */ jal shim_guTranslateF /* 392F10 E0094640 00A0382D */ daddu $a3, $a1, $zero /* 392F14 E0094644 C6400024 */ lwc1 $f0, 0x24($s2) /* 392F18 E0094648 3C013FD0 */ lui $at, 0x3fd0 @@ -229,11 +229,11 @@ glabel func_E00942FC /* 392F40 E0094670 46200020 */ cvt.s.d $f0, $f0 /* 392F44 E0094674 44050000 */ mfc1 $a1, $f0 /* 392F48 E0094678 3C073F80 */ lui $a3, 0x3f80 -/* 392F4C E009467C 0C080110 */ jal func_E0200440 +/* 392F4C E009467C 0C080110 */ jal shim_guScaleF /* 392F50 E0094680 00A0302D */ daddu $a2, $a1, $zero /* 392F54 E0094684 0200202D */ daddu $a0, $s0, $zero /* 392F58 E0094688 27A50018 */ addiu $a1, $sp, 0x18 -/* 392F5C E009468C 0C080114 */ jal func_E0200450 +/* 392F5C E009468C 0C080114 */ jal shim_guMtxCatF /* 392F60 E0094690 00A0302D */ daddu $a2, $a1, $zero /* 392F64 E0094694 27A40018 */ addiu $a0, $sp, 0x18 /* 392F68 E0094698 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -244,7 +244,7 @@ glabel func_E00942FC /* 392F7C E00946AC 8E220000 */ lw $v0, ($s1) /* 392F80 E00946B0 00052980 */ sll $a1, $a1, 6 /* 392F84 E00946B4 00B22821 */ addu $a1, $a1, $s2 -/* 392F88 E00946B8 0C080118 */ jal func_E0200460 +/* 392F88 E00946B8 0C080118 */ jal shim_guMtxF2L /* 392F8C E00946BC 00452821 */ addu $a1, $v0, $a1 /* 392F90 E00946C0 3C07D838 */ lui $a3, 0xd838 /* 392F94 E00946C4 3C05800A */ lui $a1, %hi(gMasterGfxPos) diff --git a/ver/us/asm/nonmatchings/effects/effect_74/fx_74_main.s b/ver/us/asm/nonmatchings/effects/effect_74/fx_74_main.s index b2b7c76afc..c6dd276cbd 100644 --- a/ver/us/asm/nonmatchings/effects/effect_74/fx_74_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_74/fx_74_main.s @@ -26,12 +26,12 @@ glabel fx_74_main /* 392924 E0094054 AFB00028 */ sw $s0, 0x28($sp) /* 392928 E0094058 AFA00010 */ sw $zero, 0x10($sp) /* 39292C E009405C AFA00024 */ sw $zero, 0x24($sp) -/* 392930 E0094060 0C080124 */ jal func_E0200490 +/* 392930 E0094060 0C080124 */ jal shim_create_effect_instance /* 392934 E0094064 AFA20014 */ sw $v0, 0x14($sp) /* 392938 E0094068 24040048 */ addiu $a0, $zero, 0x48 /* 39293C E009406C 24030001 */ addiu $v1, $zero, 1 /* 392940 E0094070 0040802D */ daddu $s0, $v0, $zero -/* 392944 E0094074 0C08012C */ jal func_E02004B0 +/* 392944 E0094074 0C08012C */ jal shim_general_heap_malloc /* 392948 E0094078 AE030008 */ sw $v1, 8($s0) /* 39294C E009407C 0040182D */ daddu $v1, $v0, $zero /* 392950 E0094080 14600003 */ bnez $v1, .LE0094090 diff --git a/ver/us/asm/nonmatchings/effects/effect_75/func_E00960F4.s b/ver/us/asm/nonmatchings/effects/effect_75/func_E00960F4.s index 836371d36c..68fd75bb1a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_75/func_E00960F4.s +++ b/ver/us/asm/nonmatchings/effects/effect_75/func_E00960F4.s @@ -13,7 +13,7 @@ glabel func_E00960F4 /* 394394 E0096114 24420001 */ addiu $v0, $v0, 1 /* 394398 E0096118 04610005 */ bgez $v1, .LE0096130 /* 39439C E009611C ACA20020 */ sw $v0, 0x20($a1) -/* 3943A0 E0096120 0C080128 */ jal func_E02004A0 +/* 3943A0 E0096120 0C080128 */ jal shim_remove_effect /* 3943A4 E0096124 00000000 */ nop /* 3943A8 E0096128 0802585B */ j .LE009616C /* 3943AC E009612C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_75/func_E0096178.s b/ver/us/asm/nonmatchings/effects/effect_75/func_E0096178.s index 50453937d1..44962cb3c6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_75/func_E0096178.s +++ b/ver/us/asm/nonmatchings/effects/effect_75/func_E0096178.s @@ -11,7 +11,7 @@ glabel func_E0096178 /* 394410 E0096190 27A40010 */ addiu $a0, $sp, 0x10 /* 394414 E0096194 AFBF0020 */ sw $ra, 0x20($sp) /* 394418 E0096198 AFA00014 */ sw $zero, 0x14($sp) -/* 39441C E009619C 0C080120 */ jal func_E0200480 +/* 39441C E009619C 0C080120 */ jal shim_queue_render_task /* 394420 E00961A0 AFA20010 */ sw $v0, 0x10($sp) /* 394424 E00961A4 8C430000 */ lw $v1, ($v0) /* 394428 E00961A8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_75/func_E00961BC.s b/ver/us/asm/nonmatchings/effects/effect_75/func_E00961BC.s index ab1fbd9de5..56502e8c02 100644 --- a/ver/us/asm/nonmatchings/effects/effect_75/func_E00961BC.s +++ b/ver/us/asm/nonmatchings/effects/effect_75/func_E00961BC.s @@ -38,7 +38,7 @@ glabel func_E00961BC /* 3944C0 E0096240 8E460008 */ lw $a2, 8($s2) /* 3944C4 E0096244 8E47000C */ lw $a3, 0xc($s2) /* 3944C8 E0096248 25080008 */ addiu $t0, $t0, 8 -/* 3944CC E009624C 0C080108 */ jal func_E0200420 +/* 3944CC E009624C 0C080108 */ jal shim_guTranslateF /* 3944D0 E0096250 AE280000 */ sw $t0, ($s1) /* 3944D4 E0096254 27B00058 */ addiu $s0, $sp, 0x58 /* 3944D8 E0096258 3C013F80 */ lui $at, 0x3f80 @@ -61,20 +61,20 @@ glabel func_E00961BC /* 39451C E009629C 46000007 */ neg.s $f0, $f0 /* 394520 E00962A0 44050000 */ mfc1 $a1, $f0 /* 394524 E00962A4 0200202D */ daddu $a0, $s0, $zero -/* 394528 E00962A8 0C080104 */ jal func_E0200410 +/* 394528 E00962A8 0C080104 */ jal shim_guRotateF /* 39452C E00962AC AFA60010 */ sw $a2, 0x10($sp) /* 394530 E00962B0 0200202D */ daddu $a0, $s0, $zero /* 394534 E00962B4 27A50018 */ addiu $a1, $sp, 0x18 -/* 394538 E00962B8 0C080114 */ jal func_E0200450 +/* 394538 E00962B8 0C080114 */ jal shim_guMtxCatF /* 39453C E00962BC 00A0302D */ daddu $a2, $a1, $zero /* 394540 E00962C0 0200202D */ daddu $a0, $s0, $zero /* 394544 E00962C4 8E450018 */ lw $a1, 0x18($s2) /* 394548 E00962C8 4407A000 */ mfc1 $a3, $f20 -/* 39454C E00962CC 0C080110 */ jal func_E0200440 +/* 39454C E00962CC 0C080110 */ jal shim_guScaleF /* 394550 E00962D0 00A0302D */ daddu $a2, $a1, $zero /* 394554 E00962D4 0200202D */ daddu $a0, $s0, $zero /* 394558 E00962D8 27A50018 */ addiu $a1, $sp, 0x18 -/* 39455C E00962DC 0C080114 */ jal func_E0200450 +/* 39455C E00962DC 0C080114 */ jal shim_guMtxCatF /* 394560 E00962E0 00A0302D */ daddu $a2, $a1, $zero /* 394564 E00962E4 27A40018 */ addiu $a0, $sp, 0x18 /* 394568 E00962E8 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -85,7 +85,7 @@ glabel func_E00961BC /* 39457C E00962FC 8E420000 */ lw $v0, ($s2) /* 394580 E0096300 00052980 */ sll $a1, $a1, 6 /* 394584 E0096304 00B42821 */ addu $a1, $a1, $s4 -/* 394588 E0096308 0C080118 */ jal func_E0200460 +/* 394588 E0096308 0C080118 */ jal shim_guMtxF2L /* 39458C E009630C 00452821 */ addu $a1, $v0, $a1 /* 394590 E0096310 3C06D838 */ lui $a2, 0xd838 /* 394594 E0096314 34C60002 */ ori $a2, $a2, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_75/fx_75_main.s b/ver/us/asm/nonmatchings/effects/effect_75/fx_75_main.s index ffae046030..40604d3a0e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_75/fx_75_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_75/fx_75_main.s @@ -26,12 +26,12 @@ glabel fx_75_main /* 3942D4 E0096054 AFB00028 */ sw $s0, 0x28($sp) /* 3942D8 E0096058 AFA00010 */ sw $zero, 0x10($sp) /* 3942DC E009605C AFA00024 */ sw $zero, 0x24($sp) -/* 3942E0 E0096060 0C080124 */ jal func_E0200490 +/* 3942E0 E0096060 0C080124 */ jal shim_create_effect_instance /* 3942E4 E0096064 AFA20014 */ sw $v0, 0x14($sp) /* 3942E8 E0096068 24040024 */ addiu $a0, $zero, 0x24 /* 3942EC E009606C 24030001 */ addiu $v1, $zero, 1 /* 3942F0 E0096070 0040802D */ daddu $s0, $v0, $zero -/* 3942F4 E0096074 0C08012C */ jal func_E02004B0 +/* 3942F4 E0096074 0C08012C */ jal shim_general_heap_malloc /* 3942F8 E0096078 AE030008 */ sw $v1, 8($s0) /* 3942FC E009607C 0040202D */ daddu $a0, $v0, $zero /* 394300 E0096080 14800003 */ bnez $a0, .LE0096090 diff --git a/ver/us/asm/nonmatchings/effects/effect_76/func_E0098170.s b/ver/us/asm/nonmatchings/effects/effect_76/func_E0098170.s index e152555e9d..f2b0aec176 100644 --- a/ver/us/asm/nonmatchings/effects/effect_76/func_E0098170.s +++ b/ver/us/asm/nonmatchings/effects/effect_76/func_E0098170.s @@ -15,7 +15,7 @@ glabel func_E0098170 /* 395D48 E0098198 24420001 */ addiu $v0, $v0, 1 /* 395D4C E009819C 04610005 */ bgez $v1, .LE00981B4 /* 395D50 E00981A0 AE02004C */ sw $v0, 0x4c($s0) -/* 395D54 E00981A4 0C080128 */ jal func_E02004A0 +/* 395D54 E00981A4 0C080128 */ jal shim_remove_effect /* 395D58 E00981A8 00000000 */ nop /* 395D5C E00981AC 080260A2 */ j .LE0098288 /* 395D60 E00981B0 00000000 */ nop @@ -51,7 +51,7 @@ glabel func_E0098170 /* 395DD4 E0098224 4500000D */ bc1f .LE009825C /* 395DD8 E0098228 E6000028 */ swc1 $f0, 0x28($s0) /* 395DDC E009822C 24040015 */ addiu $a0, $zero, 0x15 -/* 395DE0 E0098230 0C080150 */ jal func_E0200540 +/* 395DE0 E0098230 0C080150 */ jal shim_load_effect /* 395DE4 E0098234 E60A0008 */ swc1 $f10, 8($s0) /* 395DE8 E0098238 24020014 */ addiu $v0, $zero, 0x14 /* 395DEC E009823C AFA20010 */ sw $v0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_76/func_E009829C.s b/ver/us/asm/nonmatchings/effects/effect_76/func_E009829C.s index e1170f2fdf..1ccc168b8d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_76/func_E009829C.s +++ b/ver/us/asm/nonmatchings/effects/effect_76/func_E009829C.s @@ -14,7 +14,7 @@ glabel func_E009829C /* 395E70 E00982C0 AFA20010 */ sw $v0, 0x10($sp) /* 395E74 E00982C4 4600008D */ trunc.w.s $f2, $f0 /* 395E78 E00982C8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 395E7C E00982CC 0C080120 */ jal func_E0200480 +/* 395E7C E00982CC 0C080120 */ jal shim_queue_render_task /* 395E80 E00982D0 27A40010 */ addiu $a0, $sp, 0x10 /* 395E84 E00982D4 8C430000 */ lw $v1, ($v0) /* 395E88 E00982D8 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_76/func_E00982EC.s b/ver/us/asm/nonmatchings/effects/effect_76/func_E00982EC.s index 6160638926..955cd00b32 100644 --- a/ver/us/asm/nonmatchings/effects/effect_76/func_E00982EC.s +++ b/ver/us/asm/nonmatchings/effects/effect_76/func_E00982EC.s @@ -44,7 +44,7 @@ glabel func_E00982EC /* 395F38 E0098388 8E86002C */ lw $a2, 0x2c($s4) /* 395F3C E009838C 8E870028 */ lw $a3, 0x28($s4) /* 395F40 E0098390 25080008 */ addiu $t0, $t0, 8 -/* 395F44 E0098394 0C080180 */ jal func_E0200600 +/* 395F44 E0098394 0C080180 */ jal shim_guPositionF /* 395F48 E0098398 AEA80000 */ sw $t0, ($s5) /* 395F4C E009839C 27A40020 */ addiu $a0, $sp, 0x20 /* 395F50 E00983A0 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -55,7 +55,7 @@ glabel func_E00982EC /* 395F64 E00983B4 8E220000 */ lw $v0, ($s1) /* 395F68 E00983B8 00052980 */ sll $a1, $a1, 6 /* 395F6C E00983BC 00B22821 */ addu $a1, $a1, $s2 -/* 395F70 E00983C0 0C080118 */ jal func_E0200460 +/* 395F70 E00983C0 0C080118 */ jal shim_guMtxF2L /* 395F74 E00983C4 00452821 */ addu $a1, $v0, $a1 /* 395F78 E00983C8 3C05D7D7 */ lui $a1, 0xd7d7 /* 395F7C E00983CC 8EA60000 */ lw $a2, ($s5) diff --git a/ver/us/asm/nonmatchings/effects/effect_76/fx_76_main.s b/ver/us/asm/nonmatchings/effects/effect_76/fx_76_main.s index 3a8166bccc..47f23a92be 100644 --- a/ver/us/asm/nonmatchings/effects/effect_76/fx_76_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_76/fx_76_main.s @@ -29,12 +29,12 @@ glabel fx_76_main /* 395C10 E0098060 AFB00028 */ sw $s0, 0x28($sp) /* 395C14 E0098064 AFA00010 */ sw $zero, 0x10($sp) /* 395C18 E0098068 AFA00024 */ sw $zero, 0x24($sp) -/* 395C1C E009806C 0C080124 */ jal func_E0200490 +/* 395C1C E009806C 0C080124 */ jal shim_create_effect_instance /* 395C20 E0098070 AFA20014 */ sw $v0, 0x14($sp) /* 395C24 E0098074 24040050 */ addiu $a0, $zero, 0x50 /* 395C28 E0098078 24030001 */ addiu $v1, $zero, 1 /* 395C2C E009807C 0040882D */ daddu $s1, $v0, $zero -/* 395C30 E0098080 0C08012C */ jal func_E02004B0 +/* 395C30 E0098080 0C08012C */ jal shim_general_heap_malloc /* 395C34 E0098084 AE230008 */ sw $v1, 8($s1) /* 395C38 E0098088 0040802D */ daddu $s0, $v0, $zero /* 395C3C E009808C 16000003 */ bnez $s0, .LE009809C @@ -59,13 +59,13 @@ glabel fx_76_main /* 395C80 E00980D0 AE000014 */ sw $zero, 0x14($s0) /* 395C84 E00980D4 AE00001C */ sw $zero, 0x1c($s0) /* 395C88 E00980D8 AE000024 */ sw $zero, 0x24($s0) -/* 395C8C E00980DC 0C080138 */ jal func_E02004E0 +/* 395C8C E00980DC 0C080138 */ jal shim_rand_int /* 395C90 E00980E0 AE020048 */ sw $v0, 0x48($s0) /* 395C94 E00980E4 24040168 */ addiu $a0, $zero, 0x168 /* 395C98 E00980E8 44820000 */ mtc1 $v0, $f0 /* 395C9C E00980EC 00000000 */ nop /* 395CA0 E00980F0 46800020 */ cvt.s.w $f0, $f0 -/* 395CA4 E00980F4 0C080138 */ jal func_E02004E0 +/* 395CA4 E00980F4 0C080138 */ jal shim_rand_int /* 395CA8 E00980F8 E6000028 */ swc1 $f0, 0x28($s0) /* 395CAC E00980FC 44820000 */ mtc1 $v0, $f0 /* 395CB0 E0098100 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_77/func_E009A140.s b/ver/us/asm/nonmatchings/effects/effect_77/func_E009A140.s index 3e7b739ced..478f218284 100644 --- a/ver/us/asm/nonmatchings/effects/effect_77/func_E009A140.s +++ b/ver/us/asm/nonmatchings/effects/effect_77/func_E009A140.s @@ -16,7 +16,7 @@ glabel func_E009A140 /* 39671C E009A16C 24420001 */ addiu $v0, $v0, 1 /* 396720 E009A170 04610005 */ bgez $v1, .LE009A188 /* 396724 E009A174 AE220044 */ sw $v0, 0x44($s1) -/* 396728 E009A178 0C080128 */ jal func_E02004A0 +/* 396728 E009A178 0C080128 */ jal shim_remove_effect /* 39672C E009A17C 00000000 */ nop /* 396730 E009A180 080268E0 */ j .LE009A380 /* 396734 E009A184 00000000 */ nop @@ -104,7 +104,7 @@ glabel LE009A28C_39683C /* 396868 E009A2B8 45000031 */ bc1f .LE009A380 /* 39686C E009A2BC E6220008 */ swc1 $f2, 8($s1) /* 396870 E009A2C0 24040015 */ addiu $a0, $zero, 0x15 -/* 396874 E009A2C4 0C080150 */ jal func_E0200540 +/* 396874 E009A2C4 0C080150 */ jal shim_load_effect /* 396878 E009A2C8 E6240008 */ swc1 $f4, 8($s1) /* 39687C E009A2CC C6200004 */ lwc1 $f0, 4($s1) /* 396880 E009A2D0 3C0140A0 */ lui $at, 0x40a0 diff --git a/ver/us/asm/nonmatchings/effects/effect_77/func_E009A398.s b/ver/us/asm/nonmatchings/effects/effect_77/func_E009A398.s index 28d9d54121..8c48be0259 100644 --- a/ver/us/asm/nonmatchings/effects/effect_77/func_E009A398.s +++ b/ver/us/asm/nonmatchings/effects/effect_77/func_E009A398.s @@ -12,7 +12,7 @@ glabel func_E009A398 /* 396964 E009A3B4 AFA40018 */ sw $a0, 0x18($sp) /* 396968 E009A3B8 27A40010 */ addiu $a0, $sp, 0x10 /* 39696C E009A3BC AFBF0020 */ sw $ra, 0x20($sp) -/* 396970 E009A3C0 0C080120 */ jal func_E0200480 +/* 396970 E009A3C0 0C080120 */ jal shim_queue_render_task /* 396974 E009A3C4 AFA20010 */ sw $v0, 0x10($sp) /* 396978 E009A3C8 8C430000 */ lw $v1, ($v0) /* 39697C E009A3CC 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_77/func_E009A3E0.s b/ver/us/asm/nonmatchings/effects/effect_77/func_E009A3E0.s index 9968ed28d7..976bbb6ea7 100644 --- a/ver/us/asm/nonmatchings/effects/effect_77/func_E009A3E0.s +++ b/ver/us/asm/nonmatchings/effects/effect_77/func_E009A3E0.s @@ -47,7 +47,7 @@ glabel func_E009A3E0 /* 396A38 E009A488 8D02001C */ lw $v0, 0x1c($t0) /* 396A3C E009A48C 00A0382D */ daddu $a3, $a1, $zero /* 396A40 E009A490 005E1021 */ addu $v0, $v0, $fp -/* 396A44 E009A494 0C080110 */ jal func_E0200440 +/* 396A44 E009A494 0C080110 */ jal shim_guScaleF /* 396A48 E009A498 AC620004 */ sw $v0, 4($v1) /* 396A4C E009A49C C6A00024 */ lwc1 $f0, 0x24($s5) /* 396A50 E009A4A0 3C0142C8 */ lui $at, 0x42c8 @@ -72,11 +72,11 @@ glabel func_E009A3E0 /* 396A9C E009A4EC 0200202D */ daddu $a0, $s0, $zero /* 396AA0 E009A4F0 00A0302D */ daddu $a2, $a1, $zero /* 396AA4 E009A4F4 00A0382D */ daddu $a3, $a1, $zero -/* 396AA8 E009A4F8 0C080180 */ jal func_E0200600 +/* 396AA8 E009A4F8 0C080180 */ jal shim_guPositionF /* 396AAC E009A4FC E7A0001C */ swc1 $f0, 0x1c($sp) /* 396AB0 E009A500 0200202D */ daddu $a0, $s0, $zero /* 396AB4 E009A504 27A50020 */ addiu $a1, $sp, 0x20 -/* 396AB8 E009A508 0C080114 */ jal func_E0200450 +/* 396AB8 E009A508 0C080114 */ jal shim_guMtxCatF /* 396ABC E009A50C 00A0302D */ daddu $a2, $a1, $zero /* 396AC0 E009A510 27A40020 */ addiu $a0, $sp, 0x20 /* 396AC4 E009A514 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -87,7 +87,7 @@ glabel func_E009A3E0 /* 396AD8 E009A528 8E620000 */ lw $v0, ($s3) /* 396ADC E009A52C 00052980 */ sll $a1, $a1, 6 /* 396AE0 E009A530 00B42821 */ addu $a1, $a1, $s4 -/* 396AE4 E009A534 0C080118 */ jal func_E0200460 +/* 396AE4 E009A534 0C080118 */ jal shim_guMtxF2L /* 396AE8 E009A538 00452821 */ addu $a1, $v0, $a1 /* 396AEC E009A53C 3C03DA38 */ lui $v1, 0xda38 /* 396AF0 E009A540 34630002 */ ori $v1, $v1, 2 @@ -115,10 +115,10 @@ glabel func_E009A3E0 /* 396B48 E009A598 AC830004 */ sw $v1, 4($a0) /* 396B4C E009A59C AE420000 */ sw $v0, ($s2) /* 396B50 E009A5A0 3C02FA00 */ lui $v0, 0xfa00 -/* 396B54 E009A5A4 0C080140 */ jal func_E0200500 +/* 396B54 E009A5A4 0C080140 */ jal shim_sin_deg /* 396B58 E009A5A8 AE020000 */ sw $v0, ($s0) /* 396B5C E009A5AC 4600A306 */ mov.s $f12, $f20 -/* 396B60 E009A5B0 0C080140 */ jal func_E0200500 +/* 396B60 E009A5B0 0C080140 */ jal shim_sin_deg /* 396B64 E009A5B4 46000506 */ mov.s $f20, $f0 /* 396B68 E009A5B8 3C0141C8 */ lui $at, 0x41c8 /* 396B6C E009A5BC 44811000 */ mtc1 $at, $f2 @@ -283,7 +283,7 @@ glabel func_E009A3E0 /* 396DC8 E009A818 44826000 */ mtc1 $v0, $f12 /* 396DCC E009A81C 00000000 */ nop /* 396DD0 E009A820 46806320 */ cvt.s.w $f12, $f12 -/* 396DD4 E009A824 0C080140 */ jal func_E0200500 +/* 396DD4 E009A824 0C080140 */ jal shim_sin_deg /* 396DD8 E009A828 02D08021 */ addu $s0, $s6, $s0 /* 396DDC E009A82C 3C0143FA */ lui $at, 0x43fa /* 396DE0 E009A830 44811000 */ mtc1 $at, $f2 @@ -298,7 +298,7 @@ glabel func_E009A3E0 /* 396E04 E009A854 46806320 */ cvt.s.w $f12, $f12 /* 396E08 E009A858 4600018D */ trunc.w.s $f6, $f0 /* 396E0C E009A85C 44113000 */ mfc1 $s1, $f6 -/* 396E10 E009A860 0C080140 */ jal func_E0200500 +/* 396E10 E009A860 0C080140 */ jal shim_sin_deg /* 396E14 E009A864 26730006 */ addiu $s3, $s3, 6 /* 396E18 E009A868 3C014348 */ lui $at, 0x4348 /* 396E1C E009A86C 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/effects/effect_77/fx_77_main.s b/ver/us/asm/nonmatchings/effects/effect_77/fx_77_main.s index 7470475e64..3dd16a0037 100644 --- a/ver/us/asm/nonmatchings/effects/effect_77/fx_77_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_77/fx_77_main.s @@ -31,12 +31,12 @@ glabel fx_77_main /* 396618 E009A068 AFB00028 */ sw $s0, 0x28($sp) /* 39661C E009A06C AFA00010 */ sw $zero, 0x10($sp) /* 396620 E009A070 AFA00024 */ sw $zero, 0x24($sp) -/* 396624 E009A074 0C080124 */ jal func_E0200490 +/* 396624 E009A074 0C080124 */ jal shim_create_effect_instance /* 396628 E009A078 AFA20014 */ sw $v0, 0x14($sp) /* 39662C E009A07C 24040048 */ addiu $a0, $zero, 0x48 /* 396630 E009A080 24030001 */ addiu $v1, $zero, 1 /* 396634 E009A084 0040882D */ daddu $s1, $v0, $zero -/* 396638 E009A088 0C08012C */ jal func_E02004B0 +/* 396638 E009A088 0C08012C */ jal shim_general_heap_malloc /* 39663C E009A08C AE230008 */ sw $v1, 8($s1) /* 396640 E009A090 0040802D */ daddu $s0, $v0, $zero /* 396644 E009A094 16000003 */ bnez $s0, .LE009A0A4 @@ -60,7 +60,7 @@ glabel fx_77_main /* 396684 E009A0D4 8FA2007C */ lw $v0, 0x7c($sp) /* 396688 E009A0D8 24040168 */ addiu $a0, $zero, 0x168 /* 39668C E009A0DC E6020034 */ swc1 $f2, 0x34($s0) -/* 396690 E009A0E0 0C080138 */ jal func_E02004E0 +/* 396690 E009A0E0 0C080138 */ jal shim_rand_int /* 396694 E009A0E4 AE020020 */ sw $v0, 0x20($s0) /* 396698 E009A0E8 AE020038 */ sw $v0, 0x38($s0) /* 39669C E009A0EC 8FA30084 */ lw $v1, 0x84($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_78/func_E009C108.s b/ver/us/asm/nonmatchings/effects/effect_78/func_E009C108.s index cd1336e052..ebd1d981fc 100644 --- a/ver/us/asm/nonmatchings/effects/effect_78/func_E009C108.s +++ b/ver/us/asm/nonmatchings/effects/effect_78/func_E009C108.s @@ -25,7 +25,7 @@ glabel func_E009C108 /* 398340 E009C150 24430001 */ addiu $v1, $v0, 1 /* 398344 E009C154 04C10005 */ bgez $a2, .LE009C16C /* 398348 E009C158 ACA30008 */ sw $v1, 8($a1) -/* 39834C E009C15C 0C080128 */ jal func_E02004A0 +/* 39834C E009C15C 0C080128 */ jal shim_remove_effect /* 398350 E009C160 00000000 */ nop /* 398354 E009C164 08027074 */ j .LE009C1D0 /* 398358 E009C168 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_78/func_E009C1DC.s b/ver/us/asm/nonmatchings/effects/effect_78/func_E009C1DC.s index f074cc03e5..b7910ab2b2 100644 --- a/ver/us/asm/nonmatchings/effects/effect_78/func_E009C1DC.s +++ b/ver/us/asm/nonmatchings/effects/effect_78/func_E009C1DC.s @@ -11,7 +11,7 @@ glabel func_E009C1DC /* 3983E4 E009C1F4 27A40010 */ addiu $a0, $sp, 0x10 /* 3983E8 E009C1F8 AFBF0020 */ sw $ra, 0x20($sp) /* 3983EC E009C1FC AFA00014 */ sw $zero, 0x14($sp) -/* 3983F0 E009C200 0C080120 */ jal func_E0200480 +/* 3983F0 E009C200 0C080120 */ jal shim_queue_render_task /* 3983F4 E009C204 AFA20010 */ sw $v0, 0x10($sp) /* 3983F8 E009C208 8C430000 */ lw $v1, ($v0) /* 3983FC E009C20C 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_78/func_E009C220.s b/ver/us/asm/nonmatchings/effects/effect_78/func_E009C220.s index 3306814cca..e740ed19ab 100644 --- a/ver/us/asm/nonmatchings/effects/effect_78/func_E009C220.s +++ b/ver/us/asm/nonmatchings/effects/effect_78/func_E009C220.s @@ -42,7 +42,7 @@ glabel func_E009C220 /* 3984A4 E009C2B4 8EE60010 */ lw $a2, 0x10($s7) /* 3984A8 E009C2B8 8EE70014 */ lw $a3, 0x14($s7) /* 3984AC E009C2BC 25080008 */ addiu $t0, $t0, 8 -/* 3984B0 E009C2C0 0C080108 */ jal func_E0200420 +/* 3984B0 E009C2C0 0C080108 */ jal shim_guTranslateF /* 3984B4 E009C2C4 AFC80000 */ sw $t0, ($fp) /* 3984B8 E009C2C8 27B10058 */ addiu $s1, $sp, 0x58 /* 3984BC E009C2CC 4480A000 */ mtc1 $zero, $f20 @@ -65,11 +65,11 @@ glabel func_E009C220 /* 398500 E009C310 46000007 */ neg.s $f0, $f0 /* 398504 E009C314 44050000 */ mfc1 $a1, $f0 /* 398508 E009C318 0220202D */ daddu $a0, $s1, $zero -/* 39850C E009C31C 0C080104 */ jal func_E0200410 +/* 39850C E009C31C 0C080104 */ jal shim_guRotateF /* 398510 E009C320 E7B40010 */ swc1 $f20, 0x10($sp) /* 398514 E009C324 0220202D */ daddu $a0, $s1, $zero /* 398518 E009C328 27A50018 */ addiu $a1, $sp, 0x18 -/* 39851C E009C32C 0C080114 */ jal func_E0200450 +/* 39851C E009C32C 0C080114 */ jal shim_guMtxCatF /* 398520 E009C330 00A0302D */ daddu $a2, $a1, $zero /* 398524 E009C334 27A40018 */ addiu $a0, $sp, 0x18 /* 398528 E009C338 3C168007 */ lui $s6, %hi(gMatrixListPos) @@ -80,7 +80,7 @@ glabel func_E009C220 /* 39853C E009C34C 8E620000 */ lw $v0, ($s3) /* 398540 E009C350 00052980 */ sll $a1, $a1, 6 /* 398544 E009C354 00B52821 */ addu $a1, $a1, $s5 -/* 398548 E009C358 0C080118 */ jal func_E0200460 +/* 398548 E009C358 0C080118 */ jal shim_guMtxF2L /* 39854C E009C35C 00452821 */ addu $a1, $v0, $a1 /* 398550 E009C360 3C03DA38 */ lui $v1, 0xda38 /* 398554 E009C364 34630002 */ ori $v1, $v1, 2 @@ -164,14 +164,14 @@ glabel func_E009C220 /* 39868C E009C49C 468010A0 */ cvt.s.w $f2, $f2 /* 398690 E009C4A0 44051000 */ mfc1 $a1, $f2 /* 398694 E009C4A4 27A40018 */ addiu $a0, $sp, 0x18 -/* 398698 E009C4A8 0C080104 */ jal func_E0200410 +/* 398698 E009C4A8 0C080104 */ jal shim_guRotateF /* 39869C E009C4AC E7B40010 */ swc1 $f20, 0x10($sp) /* 3986A0 E009C4B0 27A40018 */ addiu $a0, $sp, 0x18 /* 3986A4 E009C4B4 96C50000 */ lhu $a1, ($s6) /* 3986A8 E009C4B8 8E620000 */ lw $v0, ($s3) /* 3986AC E009C4BC 00052980 */ sll $a1, $a1, 6 /* 3986B0 E009C4C0 00B52821 */ addu $a1, $a1, $s5 -/* 3986B4 E009C4C4 0C080118 */ jal func_E0200460 +/* 3986B4 E009C4C4 0C080118 */ jal shim_guMtxF2L /* 3986B8 E009C4C8 00452821 */ addu $a1, $v0, $a1 /* 3986BC E009C4CC 24120040 */ addiu $s2, $zero, 0x40 /* 3986C0 E009C4D0 2410005A */ addiu $s0, $zero, 0x5a @@ -254,14 +254,14 @@ glabel func_E009C220 /* 3987F4 E009C604 468010A0 */ cvt.s.w $f2, $f2 /* 3987F8 E009C608 44051000 */ mfc1 $a1, $f2 /* 3987FC E009C60C 27A40018 */ addiu $a0, $sp, 0x18 -/* 398800 E009C610 0C080104 */ jal func_E0200410 +/* 398800 E009C610 0C080104 */ jal shim_guRotateF /* 398804 E009C614 E7B60010 */ swc1 $f22, 0x10($sp) /* 398808 E009C618 27A40018 */ addiu $a0, $sp, 0x18 /* 39880C E009C61C 96C50000 */ lhu $a1, ($s6) /* 398810 E009C620 8E620000 */ lw $v0, ($s3) /* 398814 E009C624 00052980 */ sll $a1, $a1, 6 /* 398818 E009C628 00B52821 */ addu $a1, $a1, $s5 -/* 39881C E009C62C 0C080118 */ jal func_E0200460 +/* 39881C E009C62C 0C080118 */ jal shim_guMtxF2L /* 398820 E009C630 00452821 */ addu $a1, $v0, $a1 /* 398824 E009C634 8FC50000 */ lw $a1, ($fp) /* 398828 E009C638 4406A000 */ mfc1 $a2, $f20 @@ -316,14 +316,14 @@ glabel func_E009C220 /* 3988EC E009C6FC 468010A0 */ cvt.s.w $f2, $f2 /* 3988F0 E009C700 44051000 */ mfc1 $a1, $f2 /* 3988F4 E009C704 27A40018 */ addiu $a0, $sp, 0x18 -/* 3988F8 E009C708 0C080104 */ jal func_E0200410 +/* 3988F8 E009C708 0C080104 */ jal shim_guRotateF /* 3988FC E009C70C E7B60010 */ swc1 $f22, 0x10($sp) /* 398900 E009C710 27A40018 */ addiu $a0, $sp, 0x18 /* 398904 E009C714 96C50000 */ lhu $a1, ($s6) /* 398908 E009C718 8E620000 */ lw $v0, ($s3) /* 39890C E009C71C 00052980 */ sll $a1, $a1, 6 /* 398910 E009C720 00B52821 */ addu $a1, $a1, $s5 -/* 398914 E009C724 0C080118 */ jal func_E0200460 +/* 398914 E009C724 0C080118 */ jal shim_guMtxF2L /* 398918 E009C728 00452821 */ addu $a1, $v0, $a1 /* 39891C E009C72C 02328821 */ addu $s1, $s1, $s2 /* 398920 E009C730 8FC50000 */ lw $a1, ($fp) @@ -416,14 +416,14 @@ glabel func_E009C220 /* 398A7C E009C88C 468010A0 */ cvt.s.w $f2, $f2 /* 398A80 E009C890 44051000 */ mfc1 $a1, $f2 /* 398A84 E009C894 27A40018 */ addiu $a0, $sp, 0x18 -/* 398A88 E009C898 0C080104 */ jal func_E0200410 +/* 398A88 E009C898 0C080104 */ jal shim_guRotateF /* 398A8C E009C89C AFA70010 */ sw $a3, 0x10($sp) /* 398A90 E009C8A0 27A40018 */ addiu $a0, $sp, 0x18 /* 398A94 E009C8A4 96C50000 */ lhu $a1, ($s6) /* 398A98 E009C8A8 8E620000 */ lw $v0, ($s3) /* 398A9C E009C8AC 00052980 */ sll $a1, $a1, 6 /* 398AA0 E009C8B0 00B52821 */ addu $a1, $a1, $s5 -/* 398AA4 E009C8B4 0C080118 */ jal func_E0200460 +/* 398AA4 E009C8B4 0C080118 */ jal shim_guMtxF2L /* 398AA8 E009C8B8 00452821 */ addu $a1, $v0, $a1 /* 398AAC E009C8BC 8FC40000 */ lw $a0, ($fp) /* 398AB0 E009C8C0 96C20000 */ lhu $v0, ($s6) diff --git a/ver/us/asm/nonmatchings/effects/effect_78/fx_78_main.s b/ver/us/asm/nonmatchings/effects/effect_78/fx_78_main.s index cf6fac9331..a55806fa0a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_78/fx_78_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_78/fx_78_main.s @@ -26,12 +26,12 @@ glabel fx_78_main /* 398244 E009C054 AFB00028 */ sw $s0, 0x28($sp) /* 398248 E009C058 AFA00010 */ sw $zero, 0x10($sp) /* 39824C E009C05C AFA00024 */ sw $zero, 0x24($sp) -/* 398250 E009C060 0C080124 */ jal func_E0200490 +/* 398250 E009C060 0C080124 */ jal shim_create_effect_instance /* 398254 E009C064 AFA20014 */ sw $v0, 0x14($sp) /* 398258 E009C068 24040044 */ addiu $a0, $zero, 0x44 /* 39825C E009C06C 24030001 */ addiu $v1, $zero, 1 /* 398260 E009C070 0040802D */ daddu $s0, $v0, $zero -/* 398264 E009C074 0C08012C */ jal func_E02004B0 +/* 398264 E009C074 0C08012C */ jal shim_general_heap_malloc /* 398268 E009C078 AE030008 */ sw $v1, 8($s0) /* 39826C E009C07C 0040202D */ daddu $a0, $v0, $zero /* 398270 E009C080 14800003 */ bnez $a0, .LE009C090 diff --git a/ver/us/asm/nonmatchings/effects/effect_79/func_E009E1E4.s b/ver/us/asm/nonmatchings/effects/effect_79/func_E009E1E4.s index 0481c25b64..5b03b93e0d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_79/func_E009E1E4.s +++ b/ver/us/asm/nonmatchings/effects/effect_79/func_E009E1E4.s @@ -34,7 +34,7 @@ glabel func_E009E1E4 /* 3A0170 E009E250 24430001 */ addiu $v1, $v0, 1 /* 3A0174 E009E254 04810005 */ bgez $a0, .LE009E26C /* 3A0178 E009E258 ACA3001C */ sw $v1, 0x1c($a1) -/* 3A017C E009E25C 0C080128 */ jal func_E02004A0 +/* 3A017C E009E25C 0C080128 */ jal shim_remove_effect /* 3A0180 E009E260 0240202D */ daddu $a0, $s2, $zero /* 3A0184 E009E264 080278EC */ j .LE009E3B0 /* 3A0188 E009E268 00000000 */ nop @@ -74,7 +74,7 @@ glabel func_E009E1E4 /* 3A01FC E009E2DC 461C6301 */ sub.s $f12, $f12, $f28 /* 3A0200 E009E2E0 461A6302 */ mul.s $f12, $f12, $f26 /* 3A0204 E009E2E4 00000000 */ nop -/* 3A0208 E009E2E8 0C080144 */ jal func_E0200510 +/* 3A0208 E009E2E8 0C080144 */ jal shim_cos_deg /* 3A020C E009E2EC 46186303 */ div.s $f12, $f12, $f24 /* 3A0210 E009E2F0 46160002 */ mul.s $f0, $f0, $f22 /* 3A0214 E009E2F4 00000000 */ nop @@ -91,7 +91,7 @@ glabel func_E009E1E4 /* 3A0240 E009E320 2404000F */ addiu $a0, $zero, 0xf /* 3A0244 E009E324 3C014270 */ lui $at, 0x4270 /* 3A0248 E009E328 44810000 */ mtc1 $at, $f0 -/* 3A024C E009E32C 0C080138 */ jal func_E02004E0 +/* 3A024C E009E32C 0C080138 */ jal shim_rand_int /* 3A0250 E009E330 E600000C */ swc1 $f0, 0xc($s0) /* 3A0254 E009E334 44820000 */ mtc1 $v0, $f0 /* 3A0258 E009E338 00000000 */ nop @@ -103,7 +103,7 @@ glabel func_E009E1E4 /* 3A0270 E009E350 46220000 */ add.d $f0, $f0, $f2 /* 3A0274 E009E354 2404000A */ addiu $a0, $zero, 0xa /* 3A0278 E009E358 46200020 */ cvt.s.d $f0, $f0 -/* 3A027C E009E35C 0C080138 */ jal func_E02004E0 +/* 3A027C E009E35C 0C080138 */ jal shim_rand_int /* 3A0280 E009E360 E6000008 */ swc1 $f0, 8($s0) /* 3A0284 E009E364 44820000 */ mtc1 $v0, $f0 /* 3A0288 E009E368 00000000 */ nop @@ -113,7 +113,7 @@ glabel func_E009E1E4 /* 3A0298 E009E378 46340000 */ add.d $f0, $f0, $f20 /* 3A029C E009E37C 24040168 */ addiu $a0, $zero, 0x168 /* 3A02A0 E009E380 46200020 */ cvt.s.d $f0, $f0 -/* 3A02A4 E009E384 0C080138 */ jal func_E02004E0 +/* 3A02A4 E009E384 0C080138 */ jal shim_rand_int /* 3A02A8 E009E388 E6000010 */ swc1 $f0, 0x10($s0) /* 3A02AC E009E38C 44820000 */ mtc1 $v0, $f0 /* 3A02B0 E009E390 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_79/func_E009E3DC.s b/ver/us/asm/nonmatchings/effects/effect_79/func_E009E3DC.s index bb4ebcceb0..7c86dffa22 100644 --- a/ver/us/asm/nonmatchings/effects/effect_79/func_E009E3DC.s +++ b/ver/us/asm/nonmatchings/effects/effect_79/func_E009E3DC.s @@ -12,7 +12,7 @@ glabel func_E009E3DC /* 3A0318 E009E3F8 AFA40018 */ sw $a0, 0x18($sp) /* 3A031C E009E3FC 27A40010 */ addiu $a0, $sp, 0x10 /* 3A0320 E009E400 AFBF0020 */ sw $ra, 0x20($sp) -/* 3A0324 E009E404 0C080120 */ jal func_E0200480 +/* 3A0324 E009E404 0C080120 */ jal shim_queue_render_task /* 3A0328 E009E408 AFA20010 */ sw $v0, 0x10($sp) /* 3A032C E009E40C 8C430000 */ lw $v1, ($v0) /* 3A0330 E009E410 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_79/func_E009E424.s b/ver/us/asm/nonmatchings/effects/effect_79/func_E009E424.s index e56e0e48b2..9fe097b324 100644 --- a/ver/us/asm/nonmatchings/effects/effect_79/func_E009E424.s +++ b/ver/us/asm/nonmatchings/effects/effect_79/func_E009E424.s @@ -73,7 +73,7 @@ glabel func_E009E424 /* 3A0450 E009E530 8E850008 */ lw $a1, 8($s4) /* 3A0454 E009E534 8E86000C */ lw $a2, 0xc($s4) /* 3A0458 E009E538 8E870010 */ lw $a3, 0x10($s4) -/* 3A045C E009E53C 0C080108 */ jal func_E0200420 +/* 3A045C E009E53C 0C080108 */ jal shim_guTranslateF /* 3A0460 E009E540 24170001 */ addiu $s7, $zero, 1 /* 3A0464 E009E544 27A40018 */ addiu $a0, $sp, 0x18 /* 3A0468 E009E548 3C138007 */ lui $s3, %hi(gMatrixListPos) @@ -84,7 +84,7 @@ glabel func_E009E424 /* 3A047C E009E55C 8EA20000 */ lw $v0, ($s5) /* 3A0480 E009E560 00052980 */ sll $a1, $a1, 6 /* 3A0484 E009E564 00B02821 */ addu $a1, $a1, $s0 -/* 3A0488 E009E568 0C080118 */ jal func_E0200460 +/* 3A0488 E009E568 0C080118 */ jal shim_guMtxF2L /* 3A048C E009E56C 00452821 */ addu $a1, $v0, $a1 /* 3A0490 E009E570 3C03DA38 */ lui $v1, 0xda38 /* 3A0494 E009E574 34630002 */ ori $v1, $v1, 2 @@ -132,14 +132,14 @@ glabel func_E009E424 /* 3A053C E009E61C 004B1025 */ or $v0, $v0, $t3 /* 3A0540 E009E620 AD02000C */ sw $v0, 0xc($t0) /* 3A0544 E009E624 AD030004 */ sw $v1, 4($t0) -/* 3A0548 E009E628 0C080104 */ jal func_E0200410 +/* 3A0548 E009E628 0C080104 */ jal shim_guRotateF /* 3A054C E009E62C E7B80010 */ swc1 $f24, 0x10($sp) /* 3A0550 E009E630 27A40018 */ addiu $a0, $sp, 0x18 /* 3A0554 E009E634 96650000 */ lhu $a1, ($s3) /* 3A0558 E009E638 8EA20000 */ lw $v0, ($s5) /* 3A055C E009E63C 00052980 */ sll $a1, $a1, 6 /* 3A0560 E009E640 00B02821 */ addu $a1, $a1, $s0 -/* 3A0564 E009E644 0C080118 */ jal func_E0200460 +/* 3A0564 E009E644 0C080118 */ jal shim_guMtxF2L /* 3A0568 E009E648 00452821 */ addu $a1, $v0, $a1 /* 3A056C E009E64C 3C06D838 */ lui $a2, 0xd838 /* 3A0570 E009E650 8E240000 */ lw $a0, ($s1) @@ -235,32 +235,32 @@ glabel func_E009E424 /* 3A06D4 E009E7B4 E7B80010 */ swc1 $f24, 0x10($sp) /* 3A06D8 E009E7B8 8E25FFF4 */ lw $a1, -0xc($s1) /* 3A06DC E009E7BC 25080008 */ addiu $t0, $t0, 8 -/* 3A06E0 E009E7C0 0C080104 */ jal func_E0200410 +/* 3A06E0 E009E7C0 0C080104 */ jal shim_guRotateF /* 3A06E4 E009E7C4 AE480000 */ sw $t0, ($s2) /* 3A06E8 E009E7C8 8E250000 */ lw $a1, ($s1) /* 3A06EC E009E7CC 4406B000 */ mfc1 $a2, $f22 /* 3A06F0 E009E7D0 4407B000 */ mfc1 $a3, $f22 -/* 3A06F4 E009E7D4 0C080108 */ jal func_E0200420 +/* 3A06F4 E009E7D4 0C080108 */ jal shim_guTranslateF /* 3A06F8 E009E7D8 0200202D */ daddu $a0, $s0, $zero /* 3A06FC E009E7DC 0200202D */ daddu $a0, $s0, $zero /* 3A0700 E009E7E0 27A50018 */ addiu $a1, $sp, 0x18 -/* 3A0704 E009E7E4 0C080114 */ jal func_E0200450 +/* 3A0704 E009E7E4 0C080114 */ jal shim_guMtxCatF /* 3A0708 E009E7E8 00A0302D */ daddu $a2, $a1, $zero /* 3A070C E009E7EC 4405A000 */ mfc1 $a1, $f20 /* 3A0710 E009E7F0 4406A000 */ mfc1 $a2, $f20 /* 3A0714 E009E7F4 4407A000 */ mfc1 $a3, $f20 -/* 3A0718 E009E7F8 0C080110 */ jal func_E0200440 +/* 3A0718 E009E7F8 0C080110 */ jal shim_guScaleF /* 3A071C E009E7FC 0200202D */ daddu $a0, $s0, $zero /* 3A0720 E009E800 0200202D */ daddu $a0, $s0, $zero /* 3A0724 E009E804 27A50018 */ addiu $a1, $sp, 0x18 -/* 3A0728 E009E808 0C080114 */ jal func_E0200450 +/* 3A0728 E009E808 0C080114 */ jal shim_guMtxCatF /* 3A072C E009E80C 00A0302D */ daddu $a2, $a1, $zero /* 3A0730 E009E810 27A40018 */ addiu $a0, $sp, 0x18 /* 3A0734 E009E814 96A50000 */ lhu $a1, ($s5) /* 3A0738 E009E818 8EC20000 */ lw $v0, ($s6) /* 3A073C E009E81C 00052980 */ sll $a1, $a1, 6 /* 3A0740 E009E820 00B32821 */ addu $a1, $a1, $s3 -/* 3A0744 E009E824 0C080118 */ jal func_E0200460 +/* 3A0744 E009E824 0C080118 */ jal shim_guMtxF2L /* 3A0748 E009E828 00452821 */ addu $a1, $v0, $a1 /* 3A074C E009E82C 27A40018 */ addiu $a0, $sp, 0x18 /* 3A0750 E009E830 8E480000 */ lw $t0, ($s2) @@ -293,7 +293,7 @@ glabel func_E009E424 /* 3A07BC E009E89C E7B80010 */ swc1 $f24, 0x10($sp) /* 3A07C0 E009E8A0 8E25FFF4 */ lw $a1, -0xc($s1) /* 3A07C4 E009E8A4 25080010 */ addiu $t0, $t0, 0x10 -/* 3A07C8 E009E8A8 0C080104 */ jal func_E0200410 +/* 3A07C8 E009E8A8 0C080104 */ jal shim_guRotateF /* 3A07CC E009E8AC AE480000 */ sw $t0, ($s2) /* 3A07D0 E009E8B0 C6220000 */ lwc1 $f2, ($s1) /* 3A07D4 E009E8B4 3C0140A0 */ lui $at, 0x40a0 @@ -303,11 +303,11 @@ glabel func_E009E424 /* 3A07E4 E009E8C4 4406B000 */ mfc1 $a2, $f22 /* 3A07E8 E009E8C8 4407B000 */ mfc1 $a3, $f22 /* 3A07EC E009E8CC 44051000 */ mfc1 $a1, $f2 -/* 3A07F0 E009E8D0 0C080108 */ jal func_E0200420 +/* 3A07F0 E009E8D0 0C080108 */ jal shim_guTranslateF /* 3A07F4 E009E8D4 0200202D */ daddu $a0, $s0, $zero /* 3A07F8 E009E8D8 0200202D */ daddu $a0, $s0, $zero /* 3A07FC E009E8DC 27A50018 */ addiu $a1, $sp, 0x18 -/* 3A0800 E009E8E0 0C080114 */ jal func_E0200450 +/* 3A0800 E009E8E0 0C080114 */ jal shim_guMtxCatF /* 3A0804 E009E8E4 00A0302D */ daddu $a2, $a1, $zero /* 3A0808 E009E8E8 3C01E00A */ lui $at, %hi(D_E009EE28) /* 3A080C E009E8EC D420EE28 */ ldc1 $f0, %lo(D_E009EE28)($at) @@ -317,18 +317,18 @@ glabel func_E009E424 /* 3A081C E009E8FC 44050000 */ mfc1 $a1, $f0 /* 3A0820 E009E900 0200202D */ daddu $a0, $s0, $zero /* 3A0824 E009E904 00A0302D */ daddu $a2, $a1, $zero -/* 3A0828 E009E908 0C080110 */ jal func_E0200440 +/* 3A0828 E009E908 0C080110 */ jal shim_guScaleF /* 3A082C E009E90C 00A0382D */ daddu $a3, $a1, $zero /* 3A0830 E009E910 0200202D */ daddu $a0, $s0, $zero /* 3A0834 E009E914 27A50018 */ addiu $a1, $sp, 0x18 -/* 3A0838 E009E918 0C080114 */ jal func_E0200450 +/* 3A0838 E009E918 0C080114 */ jal shim_guMtxCatF /* 3A083C E009E91C 00A0302D */ daddu $a2, $a1, $zero /* 3A0840 E009E920 27A40018 */ addiu $a0, $sp, 0x18 /* 3A0844 E009E924 96A50000 */ lhu $a1, ($s5) /* 3A0848 E009E928 8EC20000 */ lw $v0, ($s6) /* 3A084C E009E92C 00052980 */ sll $a1, $a1, 6 /* 3A0850 E009E930 00B32821 */ addu $a1, $a1, $s3 -/* 3A0854 E009E934 0C080118 */ jal func_E0200460 +/* 3A0854 E009E934 0C080118 */ jal shim_guMtxF2L /* 3A0858 E009E938 00452821 */ addu $a1, $v0, $a1 /* 3A085C E009E93C 3C0CFF00 */ lui $t4, 0xff00 /* 3A0860 E009E940 358CFF00 */ ori $t4, $t4, 0xff00 @@ -394,7 +394,7 @@ glabel func_E009E424 /* 3A0950 E009EA30 25080028 */ addiu $t0, $t0, 0x28 /* 3A0954 E009EA34 AE420000 */ sw $v0, ($s2) /* 3A0958 E009EA38 AE480000 */ sw $t0, ($s2) -/* 3A095C E009EA3C 0C080104 */ jal func_E0200410 +/* 3A095C E009EA3C 0C080104 */ jal shim_guRotateF /* 3A0960 E009EA40 E7B80010 */ swc1 $f24, 0x10($sp) /* 3A0964 E009EA44 3C02B60B */ lui $v0, 0xb60b /* 3A0968 E009EA48 344260B7 */ ori $v0, $v0, 0x60b7 @@ -418,20 +418,20 @@ glabel func_E009E424 /* 3A09B0 E009EA90 46802120 */ cvt.s.w $f4, $f4 /* 3A09B4 E009EA94 44052000 */ mfc1 $a1, $f4 /* 3A09B8 E009EA98 0200202D */ daddu $a0, $s0, $zero -/* 3A09BC E009EA9C 0C080104 */ jal func_E0200410 +/* 3A09BC E009EA9C 0C080104 */ jal shim_guRotateF /* 3A09C0 E009EAA0 E7B60010 */ swc1 $f22, 0x10($sp) /* 3A09C4 E009EAA4 0200202D */ daddu $a0, $s0, $zero /* 3A09C8 E009EAA8 27A50018 */ addiu $a1, $sp, 0x18 -/* 3A09CC E009EAAC 0C080114 */ jal func_E0200450 +/* 3A09CC E009EAAC 0C080114 */ jal shim_guMtxCatF /* 3A09D0 E009EAB0 00A0302D */ daddu $a2, $a1, $zero /* 3A09D4 E009EAB4 3C0541A0 */ lui $a1, 0x41a0 /* 3A09D8 E009EAB8 4406B000 */ mfc1 $a2, $f22 /* 3A09DC E009EABC 4407B000 */ mfc1 $a3, $f22 -/* 3A09E0 E009EAC0 0C080108 */ jal func_E0200420 +/* 3A09E0 E009EAC0 0C080108 */ jal shim_guTranslateF /* 3A09E4 E009EAC4 0200202D */ daddu $a0, $s0, $zero /* 3A09E8 E009EAC8 0200202D */ daddu $a0, $s0, $zero /* 3A09EC E009EACC 27A50018 */ addiu $a1, $sp, 0x18 -/* 3A09F0 E009EAD0 0C080114 */ jal func_E0200450 +/* 3A09F0 E009EAD0 0C080114 */ jal shim_guMtxCatF /* 3A09F4 E009EAD4 00A0302D */ daddu $a2, $a1, $zero /* 3A09F8 E009EAD8 C6200000 */ lwc1 $f0, ($s1) /* 3A09FC E009EADC 461C0001 */ sub.s $f0, $f0, $f28 @@ -451,18 +451,18 @@ glabel func_E009E424 /* 3A0A34 E009EB14 46200020 */ cvt.s.d $f0, $f0 /* 3A0A38 E009EB18 44051000 */ mfc1 $a1, $f2 /* 3A0A3C E009EB1C 44060000 */ mfc1 $a2, $f0 -/* 3A0A40 E009EB20 0C080110 */ jal func_E0200440 +/* 3A0A40 E009EB20 0C080110 */ jal shim_guScaleF /* 3A0A44 E009EB24 0200202D */ daddu $a0, $s0, $zero /* 3A0A48 E009EB28 0200202D */ daddu $a0, $s0, $zero /* 3A0A4C E009EB2C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3A0A50 E009EB30 0C080114 */ jal func_E0200450 +/* 3A0A50 E009EB30 0C080114 */ jal shim_guMtxCatF /* 3A0A54 E009EB34 00A0302D */ daddu $a2, $a1, $zero /* 3A0A58 E009EB38 27A40018 */ addiu $a0, $sp, 0x18 /* 3A0A5C E009EB3C 96A50000 */ lhu $a1, ($s5) /* 3A0A60 E009EB40 8EC20000 */ lw $v0, ($s6) /* 3A0A64 E009EB44 00052980 */ sll $a1, $a1, 6 /* 3A0A68 E009EB48 00B32821 */ addu $a1, $a1, $s3 -/* 3A0A6C E009EB4C 0C080118 */ jal func_E0200460 +/* 3A0A6C E009EB4C 0C080118 */ jal shim_guMtxF2L /* 3A0A70 E009EB50 00452821 */ addu $a1, $v0, $a1 /* 3A0A74 E009EB54 3C09FF40 */ lui $t1, 0xff40 /* 3A0A78 E009EB58 8E480000 */ lw $t0, ($s2) @@ -516,7 +516,7 @@ glabel func_E009E424 /* 3A0B38 E009EC18 44051000 */ mfc1 $a1, $f2 /* 3A0B3C E009EC1C 25080018 */ addiu $t0, $t0, 0x18 /* 3A0B40 E009EC20 AE480000 */ sw $t0, ($s2) -/* 3A0B44 E009EC24 0C080104 */ jal func_E0200410 +/* 3A0B44 E009EC24 0C080104 */ jal shim_guRotateF /* 3A0B48 E009EC28 E7B80010 */ swc1 $f24, 0x10($sp) /* 3A0B4C E009EC2C 001710C0 */ sll $v0, $s7, 3 /* 3A0B50 E009EC30 00571021 */ addu $v0, $v0, $s7 @@ -529,20 +529,20 @@ glabel func_E009E424 /* 3A0B6C E009EC4C 4407C000 */ mfc1 $a3, $f24 /* 3A0B70 E009EC50 44052000 */ mfc1 $a1, $f4 /* 3A0B74 E009EC54 0200202D */ daddu $a0, $s0, $zero -/* 3A0B78 E009EC58 0C080104 */ jal func_E0200410 +/* 3A0B78 E009EC58 0C080104 */ jal shim_guRotateF /* 3A0B7C E009EC5C E7B60010 */ swc1 $f22, 0x10($sp) /* 3A0B80 E009EC60 0200202D */ daddu $a0, $s0, $zero /* 3A0B84 E009EC64 27A50018 */ addiu $a1, $sp, 0x18 -/* 3A0B88 E009EC68 0C080114 */ jal func_E0200450 +/* 3A0B88 E009EC68 0C080114 */ jal shim_guMtxCatF /* 3A0B8C E009EC6C 00A0302D */ daddu $a2, $a1, $zero /* 3A0B90 E009EC70 3C054170 */ lui $a1, 0x4170 /* 3A0B94 E009EC74 4406B000 */ mfc1 $a2, $f22 /* 3A0B98 E009EC78 4407B000 */ mfc1 $a3, $f22 -/* 3A0B9C E009EC7C 0C080108 */ jal func_E0200420 +/* 3A0B9C E009EC7C 0C080108 */ jal shim_guTranslateF /* 3A0BA0 E009EC80 0200202D */ daddu $a0, $s0, $zero /* 3A0BA4 E009EC84 0200202D */ daddu $a0, $s0, $zero /* 3A0BA8 E009EC88 27A50018 */ addiu $a1, $sp, 0x18 -/* 3A0BAC E009EC8C 0C080114 */ jal func_E0200450 +/* 3A0BAC E009EC8C 0C080114 */ jal shim_guMtxCatF /* 3A0BB0 E009EC90 00A0302D */ daddu $a2, $a1, $zero /* 3A0BB4 E009EC94 C6200000 */ lwc1 $f0, ($s1) /* 3A0BB8 E009EC98 461C0001 */ sub.s $f0, $f0, $f28 @@ -556,18 +556,18 @@ glabel func_E009E424 /* 3A0BD8 E009ECB8 4407C000 */ mfc1 $a3, $f24 /* 3A0BDC E009ECBC 46200020 */ cvt.s.d $f0, $f0 /* 3A0BE0 E009ECC0 44050000 */ mfc1 $a1, $f0 -/* 3A0BE4 E009ECC4 0C080110 */ jal func_E0200440 +/* 3A0BE4 E009ECC4 0C080110 */ jal shim_guScaleF /* 3A0BE8 E009ECC8 0200202D */ daddu $a0, $s0, $zero /* 3A0BEC E009ECCC 0200202D */ daddu $a0, $s0, $zero /* 3A0BF0 E009ECD0 27A50018 */ addiu $a1, $sp, 0x18 -/* 3A0BF4 E009ECD4 0C080114 */ jal func_E0200450 +/* 3A0BF4 E009ECD4 0C080114 */ jal shim_guMtxCatF /* 3A0BF8 E009ECD8 00A0302D */ daddu $a2, $a1, $zero /* 3A0BFC E009ECDC 27A40018 */ addiu $a0, $sp, 0x18 /* 3A0C00 E009ECE0 96A50000 */ lhu $a1, ($s5) /* 3A0C04 E009ECE4 8EC20000 */ lw $v0, ($s6) /* 3A0C08 E009ECE8 00052980 */ sll $a1, $a1, 6 /* 3A0C0C E009ECEC 00B32821 */ addu $a1, $a1, $s3 -/* 3A0C10 E009ECF0 0C080118 */ jal func_E0200460 +/* 3A0C10 E009ECF0 0C080118 */ jal shim_guMtxF2L /* 3A0C14 E009ECF4 00452821 */ addu $a1, $v0, $a1 /* 3A0C18 E009ECF8 8E440000 */ lw $a0, ($s2) /* 3A0C1C E009ECFC 96A30000 */ lhu $v1, ($s5) diff --git a/ver/us/asm/nonmatchings/effects/effect_79/fx_79_main.s b/ver/us/asm/nonmatchings/effects/effect_79/fx_79_main.s index bb8919a2b9..3674f285f1 100644 --- a/ver/us/asm/nonmatchings/effects/effect_79/fx_79_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_79/fx_79_main.s @@ -30,12 +30,12 @@ glabel fx_79_main /* 39FF84 E009E064 AFB20030 */ sw $s2, 0x30($sp) /* 39FF88 E009E068 AFA00010 */ sw $zero, 0x10($sp) /* 39FF8C E009E06C AFA00024 */ sw $zero, 0x24($sp) -/* 39FF90 E009E070 0C080124 */ jal func_E0200490 +/* 39FF90 E009E070 0C080124 */ jal shim_create_effect_instance /* 39FF94 E009E074 AFA20014 */ sw $v0, 0x14($sp) /* 39FF98 E009E078 24040138 */ addiu $a0, $zero, 0x138 /* 39FF9C E009E07C 24130006 */ addiu $s3, $zero, 6 /* 39FFA0 E009E080 0040902D */ daddu $s2, $v0, $zero -/* 39FFA4 E009E084 0C08012C */ jal func_E02004B0 +/* 39FFA4 E009E084 0C08012C */ jal shim_general_heap_malloc /* 39FFA8 E009E088 AE530008 */ sw $s3, 8($s2) /* 39FFAC E009E08C 0040182D */ daddu $v1, $v0, $zero /* 39FFB0 E009E090 14600003 */ bnez $v1, .LE009E0A0 @@ -69,7 +69,7 @@ glabel fx_79_main /* 3A0010 E009E0F0 3C01E00A */ lui $at, %hi(D_E009EE08) /* 3A0014 E009E0F4 D436EE08 */ ldc1 $f22, %lo(D_E009EE08)($at) .LE009E0F8: -/* 3A0018 E009E0F8 0C080138 */ jal func_E02004E0 +/* 3A0018 E009E0F8 0C080138 */ jal shim_rand_int /* 3A001C E009E0FC 24040168 */ addiu $a0, $zero, 0x168 /* 3A0020 E009E100 00112840 */ sll $a1, $s1, 1 /* 3A0024 E009E104 00B40018 */ mult $a1, $s4 @@ -90,7 +90,7 @@ glabel fx_79_main /* 3A0060 E009E140 44850000 */ mtc1 $a1, $f0 /* 3A0064 E009E144 00000000 */ nop /* 3A0068 E009E148 46800020 */ cvt.s.w $f0, $f0 -/* 3A006C E009E14C 0C080138 */ jal func_E02004E0 +/* 3A006C E009E14C 0C080138 */ jal shim_rand_int /* 3A0070 E009E150 E600FFFC */ swc1 $f0, -4($s0) /* 3A0074 E009E154 44820000 */ mtc1 $v0, $f0 /* 3A0078 E009E158 00000000 */ nop @@ -100,7 +100,7 @@ glabel fx_79_main /* 3A0088 E009E168 46360000 */ add.d $f0, $f0, $f22 /* 3A008C E009E16C 2404000A */ addiu $a0, $zero, 0xa /* 3A0090 E009E170 46200020 */ cvt.s.d $f0, $f0 -/* 3A0094 E009E174 0C080138 */ jal func_E02004E0 +/* 3A0094 E009E174 0C080138 */ jal shim_rand_int /* 3A0098 E009E178 E600FFF8 */ swc1 $f0, -8($s0) /* 3A009C E009E17C 44820000 */ mtc1 $v0, $f0 /* 3A00A0 E009E180 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_8/func_E0010000.s b/ver/us/asm/nonmatchings/effects/effect_8/func_E0010000.s index 3ca8498a9c..1e104279b7 100644 --- a/ver/us/asm/nonmatchings/effects/effect_8/func_E0010000.s +++ b/ver/us/asm/nonmatchings/effects/effect_8/func_E0010000.s @@ -16,49 +16,49 @@ glabel func_E0010000 /* 32C7CC E001002C 8E250024 */ lw $a1, 0x24($s1) /* 32C7D0 E0010030 4406B000 */ mfc1 $a2, $f22 /* 32C7D4 E0010034 4407A000 */ mfc1 $a3, $f20 -/* 32C7D8 E0010038 0C080104 */ jal func_E0200410 +/* 32C7D8 E0010038 0C080104 */ jal shim_guRotateF /* 32C7DC E001003C 27A40018 */ addiu $a0, $sp, 0x18 /* 32C7E0 E0010040 27B00058 */ addiu $s0, $sp, 0x58 /* 32C7E4 E0010044 E7B60010 */ swc1 $f22, 0x10($sp) /* 32C7E8 E0010048 8E25002C */ lw $a1, 0x2c($s1) /* 32C7EC E001004C 4406A000 */ mfc1 $a2, $f20 /* 32C7F0 E0010050 4407A000 */ mfc1 $a3, $f20 -/* 32C7F4 E0010054 0C080104 */ jal func_E0200410 +/* 32C7F4 E0010054 0C080104 */ jal shim_guRotateF /* 32C7F8 E0010058 0200202D */ daddu $a0, $s0, $zero /* 32C7FC E001005C 0200202D */ daddu $a0, $s0, $zero /* 32C800 E0010060 27A50018 */ addiu $a1, $sp, 0x18 -/* 32C804 E0010064 0C080114 */ jal func_E0200450 +/* 32C804 E0010064 0C080114 */ jal shim_guMtxCatF /* 32C808 E0010068 00A0302D */ daddu $a2, $a1, $zero /* 32C80C E001006C E7B40010 */ swc1 $f20, 0x10($sp) /* 32C810 E0010070 8E250028 */ lw $a1, 0x28($s1) /* 32C814 E0010074 4406A000 */ mfc1 $a2, $f20 /* 32C818 E0010078 4407B000 */ mfc1 $a3, $f22 -/* 32C81C E001007C 0C080104 */ jal func_E0200410 +/* 32C81C E001007C 0C080104 */ jal shim_guRotateF /* 32C820 E0010080 0200202D */ daddu $a0, $s0, $zero /* 32C824 E0010084 27A40018 */ addiu $a0, $sp, 0x18 /* 32C828 E0010088 0200282D */ daddu $a1, $s0, $zero -/* 32C82C E001008C 0C080114 */ jal func_E0200450 +/* 32C82C E001008C 0C080114 */ jal shim_guMtxCatF /* 32C830 E0010090 0080302D */ daddu $a2, $a0, $zero /* 32C834 E0010094 8E250018 */ lw $a1, 0x18($s1) /* 32C838 E0010098 8E26001C */ lw $a2, 0x1c($s1) /* 32C83C E001009C 8E270020 */ lw $a3, 0x20($s1) -/* 32C840 E00100A0 0C080110 */ jal func_E0200440 +/* 32C840 E00100A0 0C080110 */ jal shim_guScaleF /* 32C844 E00100A4 0200202D */ daddu $a0, $s0, $zero /* 32C848 E00100A8 0200202D */ daddu $a0, $s0, $zero /* 32C84C E00100AC 27A50018 */ addiu $a1, $sp, 0x18 -/* 32C850 E00100B0 0C080114 */ jal func_E0200450 +/* 32C850 E00100B0 0C080114 */ jal shim_guMtxCatF /* 32C854 E00100B4 00A0302D */ daddu $a2, $a1, $zero /* 32C858 E00100B8 8E25000C */ lw $a1, 0xc($s1) /* 32C85C E00100BC 8E260010 */ lw $a2, 0x10($s1) /* 32C860 E00100C0 8E270014 */ lw $a3, 0x14($s1) -/* 32C864 E00100C4 0C080108 */ jal func_E0200420 +/* 32C864 E00100C4 0C080108 */ jal shim_guTranslateF /* 32C868 E00100C8 0200202D */ daddu $a0, $s0, $zero /* 32C86C E00100CC 27A40018 */ addiu $a0, $sp, 0x18 /* 32C870 E00100D0 0200282D */ daddu $a1, $s0, $zero -/* 32C874 E00100D4 0C080114 */ jal func_E0200450 +/* 32C874 E00100D4 0C080114 */ jal shim_guMtxCatF /* 32C878 E00100D8 0080302D */ daddu $a2, $a0, $zero /* 32C87C E00100DC 27A40018 */ addiu $a0, $sp, 0x18 -/* 32C880 E00100E0 0C080118 */ jal func_E0200460 +/* 32C880 E00100E0 0C080118 */ jal shim_guMtxF2L /* 32C884 E00100E4 26250030 */ addiu $a1, $s1, 0x30 /* 32C888 E00100E8 8FBF00A0 */ lw $ra, 0xa0($sp) /* 32C88C E00100EC 8FB1009C */ lw $s1, 0x9c($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_8/func_E00103F4.s b/ver/us/asm/nonmatchings/effects/effect_8/func_E00103F4.s index 67266973bc..88cc2b3410 100644 --- a/ver/us/asm/nonmatchings/effects/effect_8/func_E00103F4.s +++ b/ver/us/asm/nonmatchings/effects/effect_8/func_E00103F4.s @@ -44,7 +44,7 @@ glabel func_E00103F4 .LE0010480: /* 32CC20 E0010480 16600003 */ bnez $s3, .LE0010490 /* 32CC24 E0010484 00000000 */ nop -/* 32CC28 E0010488 0C080128 */ jal func_E02004A0 +/* 32CC28 E0010488 0C080128 */ jal shim_remove_effect /* 32CC2C E001048C 0280202D */ daddu $a0, $s4, $zero .LE0010490: /* 32CC30 E0010490 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_8/func_E00104B0.s b/ver/us/asm/nonmatchings/effects/effect_8/func_E00104B0.s index 494bda8da2..ef124f6e3a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_8/func_E00104B0.s +++ b/ver/us/asm/nonmatchings/effects/effect_8/func_E00104B0.s @@ -11,7 +11,7 @@ glabel func_E00104B0 /* 32CC68 E00104C8 27A40010 */ addiu $a0, $sp, 0x10 /* 32CC6C E00104CC AFBF0020 */ sw $ra, 0x20($sp) /* 32CC70 E00104D0 AFA00014 */ sw $zero, 0x14($sp) -/* 32CC74 E00104D4 0C080120 */ jal func_E0200480 +/* 32CC74 E00104D4 0C080120 */ jal shim_queue_render_task /* 32CC78 E00104D8 AFA20010 */ sw $v0, 0x10($sp) /* 32CC7C E00104DC 8C430000 */ lw $v1, ($v0) /* 32CC80 E00104E0 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_8/func_E00104F4.s b/ver/us/asm/nonmatchings/effects/effect_8/func_E00104F4.s index 2575c81580..1d85b9264d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_8/func_E00104F4.s +++ b/ver/us/asm/nonmatchings/effects/effect_8/func_E00104F4.s @@ -4,7 +4,7 @@ glabel func_E00104F4 /* 32CC94 E00104F4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 32CC98 E00104F8 AFBF0010 */ sw $ra, 0x10($sp) -/* 32CC9C E00104FC 0C080128 */ jal func_E02004A0 +/* 32CC9C E00104FC 0C080128 */ jal shim_remove_effect /* 32CCA0 E0010500 00000000 */ nop /* 32CCA4 E0010504 8FBF0010 */ lw $ra, 0x10($sp) /* 32CCA8 E0010508 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_8/fx_8_main.s b/ver/us/asm/nonmatchings/effects/effect_8/fx_8_main.s index 7062a12fbb..8ba0a46c13 100644 --- a/ver/us/asm/nonmatchings/effects/effect_8/fx_8_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_8/fx_8_main.s @@ -35,12 +35,12 @@ glabel fx_8_main /* 32CA00 E0010260 AFA7008C */ sw $a3, 0x8c($sp) /* 32CA04 E0010264 AFA00010 */ sw $zero, 0x10($sp) /* 32CA08 E0010268 AFA00024 */ sw $zero, 0x24($sp) -/* 32CA0C E001026C 0C080124 */ jal func_E0200490 +/* 32CA0C E001026C 0C080124 */ jal shim_create_effect_instance /* 32CA10 E0010270 AFA20014 */ sw $v0, 0x14($sp) /* 32CA14 E0010274 240402F8 */ addiu $a0, $zero, 0x2f8 /* 32CA18 E0010278 24140005 */ addiu $s4, $zero, 5 /* 32CA1C E001027C 0040802D */ daddu $s0, $v0, $zero -/* 32CA20 E0010280 0C08012C */ jal func_E02004B0 +/* 32CA20 E0010280 0C08012C */ jal shim_general_heap_malloc /* 32CA24 E0010284 AE140008 */ sw $s4, 8($s0) /* 32CA28 E0010288 0040882D */ daddu $s1, $v0, $zero /* 32CA2C E001028C 16200003 */ bnez $s1, .LE001029C @@ -54,7 +54,7 @@ glabel fx_8_main /* 32CA44 E00102A4 00B42821 */ addu $a1, $a1, $s4 /* 32CA48 E00102A8 00052880 */ sll $a1, $a1, 2 /* 32CA4C E00102AC 00B42823 */ subu $a1, $a1, $s4 -/* 32CA50 E00102B0 0C080130 */ jal func_E02004C0 +/* 32CA50 E00102B0 0C080130 */ jal shim_mem_clear /* 32CA54 E00102B4 000528C0 */ sll $a1, $a1, 3 /* 32CA58 E00102B8 1280003B */ beqz $s4, .LE00103A8 /* 32CA5C E00102BC 0000902D */ daddu $s2, $zero, $zero @@ -105,13 +105,13 @@ glabel fx_8_main /* 32CB0C E001036C AE00FFF8 */ sw $zero, -8($s0) /* 32CB10 E0010370 E602FFF0 */ swc1 $f2, -0x10($s0) /* 32CB14 E0010374 E604FFDC */ swc1 $f4, -0x24($s0) -/* 32CB18 E0010378 0C08013C */ jal func_E02004F0 +/* 32CB18 E0010378 0C08013C */ jal shim_clamp_angle /* 32CB1C E001037C E600FFEC */ swc1 $f0, -0x14($s0) /* 32CB20 E0010380 46000506 */ mov.s $f20, $f0 -/* 32CB24 E0010384 0C080140 */ jal func_E0200500 +/* 32CB24 E0010384 0C080140 */ jal shim_sin_deg /* 32CB28 E0010388 4600A306 */ mov.s $f12, $f20 /* 32CB2C E001038C 4600A306 */ mov.s $f12, $f20 -/* 32CB30 E0010390 0C080144 */ jal func_E0200510 +/* 32CB30 E0010390 0C080144 */ jal shim_cos_deg /* 32CB34 E0010394 E600FFFC */ swc1 $f0, -4($s0) /* 32CB38 E0010398 E6000000 */ swc1 $f0, ($s0) /* 32CB3C E001039C 0254102A */ slt $v0, $s2, $s4 diff --git a/ver/us/asm/nonmatchings/effects/effect_80/fx_80_main.s b/ver/us/asm/nonmatchings/effects/effect_80/fx_80_main.s index 7c62a5069d..bc1064627a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_80/fx_80_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_80/fx_80_main.s @@ -13,7 +13,7 @@ glabel fx_80_main /* 3A22B0 E00A0020 AFA0001C */ sw $zero, 0x1c($sp) /* 3A22B4 E00A0024 AFA00020 */ sw $zero, 0x20($sp) /* 3A22B8 E00A0028 AFA00024 */ sw $zero, 0x24($sp) -/* 3A22BC E00A002C 0C080124 */ jal func_E0200490 +/* 3A22BC E00A002C 0C080124 */ jal shim_create_effect_instance /* 3A22C0 E00A0030 AFA20014 */ sw $v0, 0x14($sp) /* 3A22C4 E00A0034 3C04DB06 */ lui $a0, 0xdb06 /* 3A22C8 E00A0038 34840024 */ ori $a0, $a0, 0x24 @@ -104,7 +104,7 @@ glabel fx_80_main /* 3A2414 E00A0184 ACA30000 */ sw $v1, ($a1) /* 3A2418 E00A0188 3C03DB06 */ lui $v1, 0xdb06 /* 3A241C E00A018C AC430020 */ sw $v1, 0x20($v0) -/* 3A2420 E00A0190 0C080128 */ jal func_E02004A0 +/* 3A2420 E00A0190 0C080128 */ jal shim_remove_effect /* 3A2424 E00A0194 AC400024 */ sw $zero, 0x24($v0) /* 3A2428 E00A0198 8FBF002C */ lw $ra, 0x2c($sp) /* 3A242C E00A019C 8FB00028 */ lw $s0, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_81/func_E00A2120.s b/ver/us/asm/nonmatchings/effects/effect_81/func_E00A2120.s index 5791af6c7d..894361448d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_81/func_E00A2120.s +++ b/ver/us/asm/nonmatchings/effects/effect_81/func_E00A2120.s @@ -26,7 +26,7 @@ glabel func_E00A2120 /* 3A2AFC E00A216C 8C620050 */ lw $v0, 0x50($v1) /* 3A2B00 E00A2170 04410005 */ bgez $v0, .LE00A2188 /* 3A2B04 E00A2174 0040282D */ daddu $a1, $v0, $zero -/* 3A2B08 E00A2178 0C080128 */ jal func_E02004A0 +/* 3A2B08 E00A2178 0C080128 */ jal shim_remove_effect /* 3A2B0C E00A217C 00000000 */ nop /* 3A2B10 E00A2180 08028878 */ j .LE00A21E0 /* 3A2B14 E00A2184 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_81/func_E00A21EC.s b/ver/us/asm/nonmatchings/effects/effect_81/func_E00A21EC.s index bf62e213f3..47a28e3753 100644 --- a/ver/us/asm/nonmatchings/effects/effect_81/func_E00A21EC.s +++ b/ver/us/asm/nonmatchings/effects/effect_81/func_E00A21EC.s @@ -12,7 +12,7 @@ glabel func_E00A21EC /* 3A2B98 E00A2208 AFA40018 */ sw $a0, 0x18($sp) /* 3A2B9C E00A220C 27A40010 */ addiu $a0, $sp, 0x10 /* 3A2BA0 E00A2210 AFBF0020 */ sw $ra, 0x20($sp) -/* 3A2BA4 E00A2214 0C080120 */ jal func_E0200480 +/* 3A2BA4 E00A2214 0C080120 */ jal shim_queue_render_task /* 3A2BA8 E00A2218 AFA20010 */ sw $v0, 0x10($sp) /* 3A2BAC E00A221C 8C430000 */ lw $v1, ($v0) /* 3A2BB0 E00A2220 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_81/func_E00A223C.s b/ver/us/asm/nonmatchings/effects/effect_81/func_E00A223C.s index e7c5b87a8c..a6055bb881 100644 --- a/ver/us/asm/nonmatchings/effects/effect_81/func_E00A223C.s +++ b/ver/us/asm/nonmatchings/effects/effect_81/func_E00A223C.s @@ -70,7 +70,7 @@ glabel func_E00A223C /* 3A2CCC E00A233C 27A2004C */ addiu $v0, $sp, 0x4c /* 3A2CD0 E00A2340 44060000 */ mfc1 $a2, $f0 /* 3A2CD4 E00A2344 2407FFFF */ addiu $a3, $zero, -1 -/* 3A2CD8 E00A2348 0C08015C */ jal func_E0200570 +/* 3A2CD8 E00A2348 0C08015C */ jal shim_func_8011CFBC /* 3A2CDC E00A234C AFA20014 */ sw $v0, 0x14($sp) /* 3A2CE0 E00A2350 080288D9 */ j .LE00A2364 /* 3A2CE4 E00A2354 0040302D */ daddu $a2, $v0, $zero diff --git a/ver/us/asm/nonmatchings/effects/effect_81/fx_81_main.s b/ver/us/asm/nonmatchings/effects/effect_81/fx_81_main.s index 1160139571..6857b39f68 100644 --- a/ver/us/asm/nonmatchings/effects/effect_81/fx_81_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_81/fx_81_main.s @@ -28,12 +28,12 @@ glabel fx_81_main /* 3A29EC E00A205C AFB00028 */ sw $s0, 0x28($sp) /* 3A29F0 E00A2060 AFA00010 */ sw $zero, 0x10($sp) /* 3A29F4 E00A2064 AFA00024 */ sw $zero, 0x24($sp) -/* 3A29F8 E00A2068 0C080124 */ jal func_E0200490 +/* 3A29F8 E00A2068 0C080124 */ jal shim_create_effect_instance /* 3A29FC E00A206C AFA20014 */ sw $v0, 0x14($sp) /* 3A2A00 E00A2070 24040068 */ addiu $a0, $zero, 0x68 /* 3A2A04 E00A2074 24030001 */ addiu $v1, $zero, 1 /* 3A2A08 E00A2078 0040802D */ daddu $s0, $v0, $zero -/* 3A2A0C E00A207C 0C08012C */ jal func_E02004B0 +/* 3A2A0C E00A207C 0C08012C */ jal shim_general_heap_malloc /* 3A2A10 E00A2080 AE030008 */ sw $v1, 8($s0) /* 3A2A14 E00A2084 0040202D */ daddu $a0, $v0, $zero /* 3A2A18 E00A2088 14800003 */ bnez $a0, .LE00A2098 diff --git a/ver/us/asm/nonmatchings/effects/effect_82/func_E00A41AC.s b/ver/us/asm/nonmatchings/effects/effect_82/func_E00A41AC.s index e673d95a52..95cc5e6b76 100644 --- a/ver/us/asm/nonmatchings/effects/effect_82/func_E00A41AC.s +++ b/ver/us/asm/nonmatchings/effects/effect_82/func_E00A41AC.s @@ -27,7 +27,7 @@ glabel func_E00A41AC /* 3A39DC E00A41FC 24420001 */ addiu $v0, $v0, 1 /* 3A39E0 E00A4200 04A10005 */ bgez $a1, .LE00A4218 /* 3A39E4 E00A4204 AE020014 */ sw $v0, 0x14($s0) -/* 3A39E8 E00A4208 0C080128 */ jal func_E02004A0 +/* 3A39E8 E00A4208 0C080128 */ jal shim_remove_effect /* 3A39EC E00A420C 00000000 */ nop /* 3A39F0 E00A4210 08029172 */ j .LE00A45C8 /* 3A39F4 E00A4214 00000000 */ nop @@ -70,7 +70,7 @@ glabel LE00A427C_3A3A5C /* 3A3A74 E00A4294 240200B4 */ addiu $v0, $zero, 0xb4 /* 3A3A78 E00A4298 AE020024 */ sw $v0, 0x24($s0) /* 3A3A7C E00A429C 24020078 */ addiu $v0, $zero, 0x78 -/* 3A3A80 E00A42A0 0C080140 */ jal func_E0200500 +/* 3A3A80 E00A42A0 0C080140 */ jal shim_sin_deg /* 3A3A84 E00A42A4 AE020028 */ sw $v0, 0x28($s0) /* 3A3A88 E00A42A8 3C014120 */ lui $at, 0x4120 /* 3A3A8C E00A42AC 44811000 */ mtc1 $at, $f2 @@ -106,7 +106,7 @@ glabel LE00A4304_3A3AE4 /* 3A3AFC E00A431C 24020028 */ addiu $v0, $zero, 0x28 /* 3A3B00 E00A4320 AE020024 */ sw $v0, 0x24($s0) /* 3A3B04 E00A4324 2402006E */ addiu $v0, $zero, 0x6e -/* 3A3B08 E00A4328 0C080140 */ jal func_E0200500 +/* 3A3B08 E00A4328 0C080140 */ jal shim_sin_deg /* 3A3B0C E00A432C AE020028 */ sw $v0, 0x28($s0) /* 3A3B10 E00A4330 3C014120 */ lui $at, 0x4120 /* 3A3B14 E00A4334 44811000 */ mtc1 $at, $f2 @@ -139,7 +139,7 @@ glabel LE00A4384_3A3B64 /* 3A3B78 E00A4398 AE020020 */ sw $v0, 0x20($s0) /* 3A3B7C E00A439C AE020024 */ sw $v0, 0x24($s0) /* 3A3B80 E00A43A0 240200C8 */ addiu $v0, $zero, 0xc8 -/* 3A3B84 E00A43A4 0C080140 */ jal func_E0200500 +/* 3A3B84 E00A43A4 0C080140 */ jal shim_sin_deg /* 3A3B88 E00A43A8 AE020028 */ sw $v0, 0x28($s0) /* 3A3B8C E00A43AC 3C014170 */ lui $at, 0x4170 /* 3A3B90 E00A43B0 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/effects/effect_82/func_E00A45DC.s b/ver/us/asm/nonmatchings/effects/effect_82/func_E00A45DC.s index 355eeced9f..221d38fc97 100644 --- a/ver/us/asm/nonmatchings/effects/effect_82/func_E00A45DC.s +++ b/ver/us/asm/nonmatchings/effects/effect_82/func_E00A45DC.s @@ -17,12 +17,12 @@ glabel func_E00A45DC /* 3A3DEC E00A460C 28420003 */ slti $v0, $v0, 3 /* 3A3DF0 E00A4610 14400005 */ bnez $v0, .LE00A4628 /* 3A3DF4 E00A4614 27A40010 */ addiu $a0, $sp, 0x10 -/* 3A3DF8 E00A4618 0C080120 */ jal func_E0200480 +/* 3A3DF8 E00A4618 0C080120 */ jal shim_queue_render_task /* 3A3DFC E00A461C 00000000 */ nop /* 3A3E00 E00A4620 0802918F */ j .LE00A463C /* 3A3E04 E00A4624 00000000 */ nop .LE00A4628: -/* 3A3E08 E00A4628 0C080120 */ jal func_E0200480 +/* 3A3E08 E00A4628 0C080120 */ jal shim_queue_render_task /* 3A3E0C E00A462C 00000000 */ nop /* 3A3E10 E00A4630 8C430000 */ lw $v1, ($v0) /* 3A3E14 E00A4634 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_82/func_E00A4650.s b/ver/us/asm/nonmatchings/effects/effect_82/func_E00A4650.s index 84d47a6232..e47d89cf9e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_82/func_E00A4650.s +++ b/ver/us/asm/nonmatchings/effects/effect_82/func_E00A4650.s @@ -60,17 +60,17 @@ glabel func_E00A4650 /* 3A3F0C E00A472C 001010C0 */ sll $v0, $s0, 3 /* 3A3F10 E00A4730 02028021 */ addu $s0, $s0, $v0 /* 3A3F14 E00A4734 001080C0 */ sll $s0, $s0, 3 -/* 3A3F18 E00A4738 0C080108 */ jal func_E0200420 +/* 3A3F18 E00A4738 0C080108 */ jal shim_guTranslateF /* 3A3F1C E00A473C 02038021 */ addu $s0, $s0, $v1 /* 3A3F20 E00A4740 27B10058 */ addiu $s1, $sp, 0x58 /* 3A3F24 E00A4744 8E450030 */ lw $a1, 0x30($s2) /* 3A3F28 E00A4748 0220202D */ daddu $a0, $s1, $zero /* 3A3F2C E00A474C 00A0302D */ daddu $a2, $a1, $zero -/* 3A3F30 E00A4750 0C080110 */ jal func_E0200440 +/* 3A3F30 E00A4750 0C080110 */ jal shim_guScaleF /* 3A3F34 E00A4754 00A0382D */ daddu $a3, $a1, $zero /* 3A3F38 E00A4758 0220202D */ daddu $a0, $s1, $zero /* 3A3F3C E00A475C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3A3F40 E00A4760 0C080114 */ jal func_E0200450 +/* 3A3F40 E00A4760 0C080114 */ jal shim_guMtxCatF /* 3A3F44 E00A4764 00A0302D */ daddu $a2, $a1, $zero /* 3A3F48 E00A4768 27A40018 */ addiu $a0, $sp, 0x18 /* 3A3F4C E00A476C 3C168007 */ lui $s6, %hi(gMatrixListPos) @@ -81,7 +81,7 @@ glabel func_E00A4650 /* 3A3F60 E00A4780 8FC20000 */ lw $v0, ($fp) /* 3A3F64 E00A4784 00052980 */ sll $a1, $a1, 6 /* 3A3F68 E00A4788 00B72821 */ addu $a1, $a1, $s7 -/* 3A3F6C E00A478C 0C080118 */ jal func_E0200460 +/* 3A3F6C E00A478C 0C080118 */ jal shim_guMtxF2L /* 3A3F70 E00A4790 00452821 */ addu $a1, $v0, $a1 /* 3A3F74 E00A4794 3C03DA38 */ lui $v1, 0xda38 /* 3A3F78 E00A4798 34630002 */ ori $v1, $v1, 2 @@ -153,14 +153,14 @@ glabel func_E00A4650 /* 3A4080 E00A48A0 24421000 */ addiu $v0, $v0, 0x1000 /* 3A4084 E00A48A4 AD100020 */ sw $s0, 0x20($t0) /* 3A4088 E00A48A8 AD020024 */ sw $v0, 0x24($t0) -/* 3A408C E00A48AC 0C080104 */ jal func_E0200410 +/* 3A408C E00A48AC 0C080104 */ jal shim_guRotateF /* 3A4090 E00A48B0 E7B60010 */ swc1 $f22, 0x10($sp) /* 3A4094 E00A48B4 27A40018 */ addiu $a0, $sp, 0x18 /* 3A4098 E00A48B8 96C50000 */ lhu $a1, ($s6) /* 3A409C E00A48BC 8FC20000 */ lw $v0, ($fp) /* 3A40A0 E00A48C0 00052980 */ sll $a1, $a1, 6 /* 3A40A4 E00A48C4 00B72821 */ addu $a1, $a1, $s7 -/* 3A40A8 E00A48C8 0C080118 */ jal func_E0200460 +/* 3A40A8 E00A48C8 0C080118 */ jal shim_guMtxF2L /* 3A40AC E00A48CC 00452821 */ addu $a1, $v0, $a1 /* 3A40B0 E00A48D0 27A40018 */ addiu $a0, $sp, 0x18 /* 3A40B4 E00A48D4 8FAA0098 */ lw $t2, 0x98($sp) @@ -203,14 +203,14 @@ glabel func_E00A4650 /* 3A4148 E00A4968 00C0382D */ daddu $a3, $a2, $zero /* 3A414C E00A496C AD0A0010 */ sw $t2, 0x10($t0) /* 3A4150 E00A4970 AD000014 */ sw $zero, 0x14($t0) -/* 3A4154 E00A4974 0C080104 */ jal func_E0200410 +/* 3A4154 E00A4974 0C080104 */ jal shim_guRotateF /* 3A4158 E00A4978 E7B60010 */ swc1 $f22, 0x10($sp) /* 3A415C E00A497C 27A40018 */ addiu $a0, $sp, 0x18 /* 3A4160 E00A4980 96C50000 */ lhu $a1, ($s6) /* 3A4164 E00A4984 8FC20000 */ lw $v0, ($fp) /* 3A4168 E00A4988 00052980 */ sll $a1, $a1, 6 /* 3A416C E00A498C 00B72821 */ addu $a1, $a1, $s7 -/* 3A4170 E00A4990 0C080118 */ jal func_E0200460 +/* 3A4170 E00A4990 0C080118 */ jal shim_guMtxF2L /* 3A4174 E00A4994 00452821 */ addu $a1, $v0, $a1 /* 3A4178 E00A4998 8EA40000 */ lw $a0, ($s5) /* 3A417C E00A499C 96C20000 */ lhu $v0, ($s6) diff --git a/ver/us/asm/nonmatchings/effects/effect_82/fx_82_main.s b/ver/us/asm/nonmatchings/effects/effect_82/fx_82_main.s index 7e8a7231df..87c300289d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_82/fx_82_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_82/fx_82_main.s @@ -30,12 +30,12 @@ glabel fx_82_main /* 3A3844 E00A4064 AFB00028 */ sw $s0, 0x28($sp) /* 3A3848 E00A4068 AFA00010 */ sw $zero, 0x10($sp) /* 3A384C E00A406C AFA00024 */ sw $zero, 0x24($sp) -/* 3A3850 E00A4070 0C080124 */ jal func_E0200490 +/* 3A3850 E00A4070 0C080124 */ jal shim_create_effect_instance /* 3A3854 E00A4074 AFA20014 */ sw $v0, 0x14($sp) /* 3A3858 E00A4078 24040038 */ addiu $a0, $zero, 0x38 /* 3A385C E00A407C 24030001 */ addiu $v1, $zero, 1 /* 3A3860 E00A4080 0040802D */ daddu $s0, $v0, $zero -/* 3A3864 E00A4084 0C08012C */ jal func_E02004B0 +/* 3A3864 E00A4084 0C08012C */ jal shim_general_heap_malloc /* 3A3868 E00A4088 AE030008 */ sw $v1, 8($s0) /* 3A386C E00A408C 0040182D */ daddu $v1, $v0, $zero /* 3A3870 E00A4090 14600003 */ bnez $v1, .LE00A40A0 diff --git a/ver/us/asm/nonmatchings/effects/effect_83/func_E00A6124.s b/ver/us/asm/nonmatchings/effects/effect_83/func_E00A6124.s index 85559929c3..8dae646e06 100644 --- a/ver/us/asm/nonmatchings/effects/effect_83/func_E00A6124.s +++ b/ver/us/asm/nonmatchings/effects/effect_83/func_E00A6124.s @@ -25,7 +25,7 @@ glabel func_E00A6124 /* 3A56BC E00A616C 24420001 */ addiu $v0, $v0, 1 /* 3A56C0 E00A6170 04610005 */ bgez $v1, .LE00A6188 /* 3A56C4 E00A6174 ACA20008 */ sw $v0, 8($a1) -/* 3A56C8 E00A6178 0C080128 */ jal func_E02004A0 +/* 3A56C8 E00A6178 0C080128 */ jal shim_remove_effect /* 3A56CC E00A617C 00000000 */ nop /* 3A56D0 E00A6180 080298D3 */ j .LE00A634C /* 3A56D4 E00A6184 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_83/func_E00A6358.s b/ver/us/asm/nonmatchings/effects/effect_83/func_E00A6358.s index 9d47fcd6d7..5c40af2dda 100644 --- a/ver/us/asm/nonmatchings/effects/effect_83/func_E00A6358.s +++ b/ver/us/asm/nonmatchings/effects/effect_83/func_E00A6358.s @@ -11,7 +11,7 @@ glabel func_E00A6358 /* 3A58C0 E00A6370 27A40010 */ addiu $a0, $sp, 0x10 /* 3A58C4 E00A6374 AFBF0020 */ sw $ra, 0x20($sp) /* 3A58C8 E00A6378 AFA00014 */ sw $zero, 0x14($sp) -/* 3A58CC E00A637C 0C080120 */ jal func_E0200480 +/* 3A58CC E00A637C 0C080120 */ jal shim_queue_render_task /* 3A58D0 E00A6380 AFA20010 */ sw $v0, 0x10($sp) /* 3A58D4 E00A6384 8C430000 */ lw $v1, ($v0) /* 3A58D8 E00A6388 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_83/func_E00A63A4.s b/ver/us/asm/nonmatchings/effects/effect_83/func_E00A63A4.s index 3de8ce0256..cc0fe6748d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_83/func_E00A63A4.s +++ b/ver/us/asm/nonmatchings/effects/effect_83/func_E00A63A4.s @@ -37,7 +37,7 @@ glabel func_E00A63A4 /* 3A5974 E00A6424 8E460010 */ lw $a2, 0x10($s2) /* 3A5978 E00A6428 8E470014 */ lw $a3, 0x14($s2) /* 3A597C E00A642C 25080008 */ addiu $t0, $t0, 8 -/* 3A5980 E00A6430 0C080108 */ jal func_E0200420 +/* 3A5980 E00A6430 0C080108 */ jal shim_guTranslateF /* 3A5984 E00A6434 AE280000 */ sw $t0, ($s1) /* 3A5988 E00A6438 36B51630 */ ori $s5, $s5, 0x1630 /* 3A598C E00A643C 3C013F75 */ lui $at, 0x3f75 @@ -47,11 +47,11 @@ glabel func_E00A63A4 /* 3A599C E00A644C 44050000 */ mfc1 $a1, $f0 /* 3A59A0 E00A6450 0200202D */ daddu $a0, $s0, $zero /* 3A59A4 E00A6454 00A0302D */ daddu $a2, $a1, $zero -/* 3A59A8 E00A6458 0C080110 */ jal func_E0200440 +/* 3A59A8 E00A6458 0C080110 */ jal shim_guScaleF /* 3A59AC E00A645C 00A0382D */ daddu $a3, $a1, $zero /* 3A59B0 E00A6460 0200202D */ daddu $a0, $s0, $zero /* 3A59B4 E00A6464 27A50010 */ addiu $a1, $sp, 0x10 -/* 3A59B8 E00A6468 0C080114 */ jal func_E0200450 +/* 3A59B8 E00A6468 0C080114 */ jal shim_guMtxCatF /* 3A59BC E00A646C 00A0302D */ daddu $a2, $a1, $zero /* 3A59C0 E00A6470 27A40010 */ addiu $a0, $sp, 0x10 /* 3A59C4 E00A6474 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -62,7 +62,7 @@ glabel func_E00A63A4 /* 3A59D8 E00A6488 8E620000 */ lw $v0, ($s3) /* 3A59DC E00A648C 00052980 */ sll $a1, $a1, 6 /* 3A59E0 E00A6490 00B52821 */ addu $a1, $a1, $s5 -/* 3A59E4 E00A6494 0C080118 */ jal func_E0200460 +/* 3A59E4 E00A6494 0C080118 */ jal shim_guMtxF2L /* 3A59E8 E00A6498 00452821 */ addu $a1, $v0, $a1 /* 3A59EC E00A649C 3C03DA38 */ lui $v1, 0xda38 /* 3A59F0 E00A64A0 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_83/fx_83_main.s b/ver/us/asm/nonmatchings/effects/effect_83/fx_83_main.s index a0f8b9ef8f..73e2738ab6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_83/fx_83_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_83/fx_83_main.s @@ -26,12 +26,12 @@ glabel fx_83_main /* 3A55A4 E00A6054 AFB00028 */ sw $s0, 0x28($sp) /* 3A55A8 E00A6058 AFA00010 */ sw $zero, 0x10($sp) /* 3A55AC E00A605C AFA00024 */ sw $zero, 0x24($sp) -/* 3A55B0 E00A6060 0C080124 */ jal func_E0200490 +/* 3A55B0 E00A6060 0C080124 */ jal shim_create_effect_instance /* 3A55B4 E00A6064 AFA20014 */ sw $v0, 0x14($sp) /* 3A55B8 E00A6068 2404003C */ addiu $a0, $zero, 0x3c /* 3A55BC E00A606C 24030001 */ addiu $v1, $zero, 1 /* 3A55C0 E00A6070 0040802D */ daddu $s0, $v0, $zero -/* 3A55C4 E00A6074 0C08012C */ jal func_E02004B0 +/* 3A55C4 E00A6074 0C08012C */ jal shim_general_heap_malloc /* 3A55C8 E00A6078 AE030008 */ sw $v1, 8($s0) /* 3A55CC E00A607C 0040202D */ daddu $a0, $v0, $zero /* 3A55D0 E00A6080 14800003 */ bnez $a0, .LE00A6090 diff --git a/ver/us/asm/nonmatchings/effects/effect_84/func_E00A8104.s b/ver/us/asm/nonmatchings/effects/effect_84/func_E00A8104.s index 01f81f4747..5189af826f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_84/func_E00A8104.s +++ b/ver/us/asm/nonmatchings/effects/effect_84/func_E00A8104.s @@ -29,7 +29,7 @@ glabel func_E00A8104 /* 3A724C E00A815C 24420001 */ addiu $v0, $v0, 1 /* 3A7250 E00A8160 04610005 */ bgez $v1, .LE00A8178 /* 3A7254 E00A8164 ACA20008 */ sw $v0, 8($a1) -/* 3A7258 E00A8168 0C080128 */ jal func_E02004A0 +/* 3A7258 E00A8168 0C080128 */ jal shim_remove_effect /* 3A725C E00A816C 00000000 */ nop /* 3A7260 E00A8170 0802A0AE */ j .LE00A82B8 /* 3A7264 E00A8174 00000000 */ nop @@ -53,17 +53,17 @@ glabel func_E00A8104 /* 3A72A0 E00A81B0 0802A0AA */ j .LE00A82A8 /* 3A72A4 E00A81B4 26100004 */ addiu $s0, $s0, 4 .LE00A81B8: -/* 3A72A8 E00A81B8 0C080138 */ jal func_E02004E0 +/* 3A72A8 E00A81B8 0C080138 */ jal shim_rand_int /* 3A72AC E00A81BC 2404000A */ addiu $a0, $zero, 0xa /* 3A72B0 E00A81C0 2403000A */ addiu $v1, $zero, 0xa /* 3A72B4 E00A81C4 54430038 */ bnel $v0, $v1, .LE00A82A8 /* 3A72B8 E00A81C8 26100004 */ addiu $s0, $s0, 4 /* 3A72BC E00A81CC 24040001 */ addiu $a0, $zero, 1 -/* 3A72C0 E00A81D0 0C080138 */ jal func_E02004E0 +/* 3A72C0 E00A81D0 0C080138 */ jal shim_rand_int /* 3A72C4 E00A81D4 AE12001C */ sw $s2, 0x1c($s0) /* 3A72C8 E00A81D8 24040032 */ addiu $a0, $zero, 0x32 /* 3A72CC E00A81DC AE020044 */ sw $v0, 0x44($s0) -/* 3A72D0 E00A81E0 0C080138 */ jal func_E02004E0 +/* 3A72D0 E00A81E0 0C080138 */ jal shim_rand_int /* 3A72D4 E00A81E4 AE00006C */ sw $zero, 0x6c($s0) /* 3A72D8 E00A81E8 3C01E00B */ lui $at, %hi(D_E00A86A0) /* 3A72DC E00A81EC D42086A0 */ ldc1 $f0, %lo(D_E00A86A0)($at) diff --git a/ver/us/asm/nonmatchings/effects/effect_84/func_E00A82D4.s b/ver/us/asm/nonmatchings/effects/effect_84/func_E00A82D4.s index 70b1bd940e..7bc7298c85 100644 --- a/ver/us/asm/nonmatchings/effects/effect_84/func_E00A82D4.s +++ b/ver/us/asm/nonmatchings/effects/effect_84/func_E00A82D4.s @@ -11,7 +11,7 @@ glabel func_E00A82D4 /* 3A73DC E00A82EC 27A40010 */ addiu $a0, $sp, 0x10 /* 3A73E0 E00A82F0 AFBF0020 */ sw $ra, 0x20($sp) /* 3A73E4 E00A82F4 AFA00014 */ sw $zero, 0x14($sp) -/* 3A73E8 E00A82F8 0C080120 */ jal func_E0200480 +/* 3A73E8 E00A82F8 0C080120 */ jal shim_queue_render_task /* 3A73EC E00A82FC AFA20010 */ sw $v0, 0x10($sp) /* 3A73F0 E00A8300 8C430000 */ lw $v1, ($v0) /* 3A73F4 E00A8304 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_84/func_E00A8320.s b/ver/us/asm/nonmatchings/effects/effect_84/func_E00A8320.s index 93d1d60118..df48df6c95 100644 --- a/ver/us/asm/nonmatchings/effects/effect_84/func_E00A8320.s +++ b/ver/us/asm/nonmatchings/effects/effect_84/func_E00A8320.s @@ -51,7 +51,7 @@ glabel func_E00A8320 /* 3A74C8 E00A83D8 8E660010 */ lw $a2, 0x10($s3) /* 3A74CC E00A83DC 8E670014 */ lw $a3, 0x14($s3) /* 3A74D0 E00A83E0 25080008 */ addiu $t0, $t0, 8 -/* 3A74D4 E00A83E4 0C080108 */ jal func_E0200420 +/* 3A74D4 E00A83E4 0C080108 */ jal shim_guTranslateF /* 3A74D8 E00A83E8 AEA80000 */ sw $t0, ($s5) /* 3A74DC E00A83EC 27B10058 */ addiu $s1, $sp, 0x58 /* 3A74E0 E00A83F0 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -72,18 +72,18 @@ glabel func_E00A8320 /* 3A751C E00A842C 46000007 */ neg.s $f0, $f0 /* 3A7520 E00A8430 44050000 */ mfc1 $a1, $f0 /* 3A7524 E00A8434 0220202D */ daddu $a0, $s1, $zero -/* 3A7528 E00A8438 0C080104 */ jal func_E0200410 +/* 3A7528 E00A8438 0C080104 */ jal shim_guRotateF /* 3A752C E00A843C AFA60010 */ sw $a2, 0x10($sp) /* 3A7530 E00A8440 0220202D */ daddu $a0, $s1, $zero /* 3A7534 E00A8444 27A50018 */ addiu $a1, $sp, 0x18 -/* 3A7538 E00A8448 0C080114 */ jal func_E0200450 +/* 3A7538 E00A8448 0C080114 */ jal shim_guMtxCatF /* 3A753C E00A844C 00A0302D */ daddu $a2, $a1, $zero /* 3A7540 E00A8450 27A40018 */ addiu $a0, $sp, 0x18 /* 3A7544 E00A8454 96C50000 */ lhu $a1, ($s6) /* 3A7548 E00A8458 8FC20000 */ lw $v0, ($fp) /* 3A754C E00A845C 00052980 */ sll $a1, $a1, 6 /* 3A7550 E00A8460 00B22821 */ addu $a1, $a1, $s2 -/* 3A7554 E00A8464 0C080118 */ jal func_E0200460 +/* 3A7554 E00A8464 0C080118 */ jal shim_guMtxF2L /* 3A7558 E00A8468 00452821 */ addu $a1, $v0, $a1 /* 3A755C E00A846C 3C03DA38 */ lui $v1, 0xda38 /* 3A7560 E00A8470 34630002 */ ori $v1, $v1, 2 @@ -127,14 +127,14 @@ glabel func_E00A8320 /* 3A75F4 E00A8504 8E6600E4 */ lw $a2, 0xe4($s3) /* 3A75F8 E00A8508 26730004 */ addiu $s3, $s3, 4 /* 3A75FC E00A850C 00148080 */ sll $s0, $s4, 2 -/* 3A7600 E00A8510 0C080108 */ jal func_E0200420 +/* 3A7600 E00A8510 0C080108 */ jal shim_guTranslateF /* 3A7604 E00A8514 26940001 */ addiu $s4, $s4, 1 /* 3A7608 E00A8518 27A40018 */ addiu $a0, $sp, 0x18 /* 3A760C E00A851C 96C50000 */ lhu $a1, ($s6) /* 3A7610 E00A8520 8FC20000 */ lw $v0, ($fp) /* 3A7614 E00A8524 00052980 */ sll $a1, $a1, 6 /* 3A7618 E00A8528 00B72821 */ addu $a1, $a1, $s7 -/* 3A761C E00A852C 0C080118 */ jal func_E0200460 +/* 3A761C E00A852C 0C080118 */ jal shim_guMtxF2L /* 3A7620 E00A8530 00452821 */ addu $a1, $v0, $a1 /* 3A7624 E00A8534 3C06D838 */ lui $a2, 0xd838 /* 3A7628 E00A8538 8EA40000 */ lw $a0, ($s5) diff --git a/ver/us/asm/nonmatchings/effects/effect_84/fx_84_main.s b/ver/us/asm/nonmatchings/effects/effect_84/fx_84_main.s index 0ab390626e..052d24711c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_84/fx_84_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_84/fx_84_main.s @@ -26,12 +26,12 @@ glabel fx_84_main /* 3A7144 E00A8054 AFB00028 */ sw $s0, 0x28($sp) /* 3A7148 E00A8058 AFA00010 */ sw $zero, 0x10($sp) /* 3A714C E00A805C AFA00024 */ sw $zero, 0x24($sp) -/* 3A7150 E00A8060 0C080124 */ jal func_E0200490 +/* 3A7150 E00A8060 0C080124 */ jal shim_create_effect_instance /* 3A7154 E00A8064 AFA20014 */ sw $v0, 0x14($sp) /* 3A7158 E00A8068 2404010C */ addiu $a0, $zero, 0x10c /* 3A715C E00A806C 24030001 */ addiu $v1, $zero, 1 /* 3A7160 E00A8070 0040802D */ daddu $s0, $v0, $zero -/* 3A7164 E00A8074 0C08012C */ jal func_E02004B0 +/* 3A7164 E00A8074 0C08012C */ jal shim_general_heap_malloc /* 3A7168 E00A8078 AE030008 */ sw $v1, 8($s0) /* 3A716C E00A807C 14400003 */ bnez $v0, .LE00A808C /* 3A7170 E00A8080 AE02000C */ sw $v0, 0xc($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA10C.s b/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA10C.s index 2c5a585065..8a7c5732da 100644 --- a/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA10C.s +++ b/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA10C.s @@ -30,7 +30,7 @@ glabel func_E00AA10C /* 3AAA88 E00AA168 24420001 */ addiu $v0, $v0, 1 /* 3AAA8C E00AA16C 04610005 */ bgez $v1, .LE00AA184 /* 3AAA90 E00AA170 AE020008 */ sw $v0, 8($s0) -/* 3AAA94 E00AA174 0C080128 */ jal func_E02004A0 +/* 3AAA94 E00AA174 0C080128 */ jal shim_remove_effect /* 3AAA98 E00AA178 00000000 */ nop /* 3AAA9C E00AA17C 0802A8E8 */ j .LE00AA3A0 /* 3AAAA0 E00AA180 00000000 */ nop @@ -44,12 +44,12 @@ glabel func_E00AA10C /* 3AAAB8 E00AA198 2442FFFF */ addiu $v0, $v0, -1 /* 3AAABC E00AA19C 1C40006D */ bgtz $v0, .LE00AA354 /* 3AAAC0 E00AA1A0 AE020030 */ sw $v0, 0x30($s0) -/* 3AAAC4 E00AA1A4 0C080138 */ jal func_E02004E0 +/* 3AAAC4 E00AA1A4 0C080138 */ jal shim_rand_int /* 3AAAC8 E00AA1A8 24040167 */ addiu $a0, $zero, 0x167 /* 3AAACC E00AA1AC 4482A000 */ mtc1 $v0, $f20 /* 3AAAD0 E00AA1B0 00000000 */ nop /* 3AAAD4 E00AA1B4 4680A520 */ cvt.s.w $f20, $f20 -/* 3AAAD8 E00AA1B8 0C080140 */ jal func_E0200500 +/* 3AAAD8 E00AA1B8 0C080140 */ jal shim_sin_deg /* 3AAADC E00AA1BC 4600A306 */ mov.s $f12, $f20 /* 3AAAE0 E00AA1C0 C6020034 */ lwc1 $f2, 0x34($s0) /* 3AAAE4 E00AA1C4 46001082 */ mul.s $f2, $f2, $f0 @@ -58,21 +58,21 @@ glabel func_E00AA10C /* 3AAAF0 E00AA1D0 C6180018 */ lwc1 $f24, 0x18($s0) /* 3AAAF4 E00AA1D4 4600028D */ trunc.w.s $f10, $f0 /* 3AAAF8 E00AA1D8 44045000 */ mfc1 $a0, $f10 -/* 3AAAFC E00AA1DC 0C080138 */ jal func_E02004E0 +/* 3AAAFC E00AA1DC 0C080138 */ jal shim_rand_int /* 3AAB00 E00AA1E0 4602C600 */ add.s $f24, $f24, $f2 /* 3AAB04 E00AA1E4 4600A306 */ mov.s $f12, $f20 /* 3AAB08 E00AA1E8 C616001C */ lwc1 $f22, 0x1c($s0) /* 3AAB0C E00AA1EC 44820000 */ mtc1 $v0, $f0 /* 3AAB10 E00AA1F0 00000000 */ nop /* 3AAB14 E00AA1F4 46800020 */ cvt.s.w $f0, $f0 -/* 3AAB18 E00AA1F8 0C080144 */ jal func_E0200510 +/* 3AAB18 E00AA1F8 0C080144 */ jal shim_cos_deg /* 3AAB1C E00AA1FC 4600B580 */ add.s $f22, $f22, $f0 /* 3AAB20 E00AA200 C6020034 */ lwc1 $f2, 0x34($s0) /* 3AAB24 E00AA204 46001082 */ mul.s $f2, $f2, $f0 /* 3AAB28 E00AA208 00000000 */ nop /* 3AAB2C E00AA20C C6140020 */ lwc1 $f20, 0x20($s0) /* 3AAB30 E00AA210 24040064 */ addiu $a0, $zero, 0x64 -/* 3AAB34 E00AA214 0C080138 */ jal func_E02004E0 +/* 3AAB34 E00AA214 0C080138 */ jal shim_rand_int /* 3AAB38 E00AA218 4602A500 */ add.s $f20, $f20, $f2 /* 3AAB3C E00AA21C C604000C */ lwc1 $f4, 0xc($s0) /* 3AAB40 E00AA220 4604C601 */ sub.s $f24, $f24, $f4 @@ -130,7 +130,7 @@ glabel func_E00AA10C /* 3AAC0C E00AA2EC 00000000 */ nop /* 3AAC10 E00AA2F0 45010007 */ bc1t .LE00AA310 /* 3AAC14 E00AA2F4 00000000 */ nop -/* 3AAC18 E00AA2F8 0C080154 */ jal func_E0200550 +/* 3AAC18 E00AA2F8 0C080154 */ jal shim_sqrtf /* 3AAC1C E00AA2FC 00000000 */ nop /* 3AAC20 E00AA300 3C013F80 */ lui $at, 0x3f80 /* 3AAC24 E00AA304 44811000 */ mtc1 $at, $f2 @@ -151,7 +151,7 @@ glabel func_E00AA10C /* 3AAC5C E00AA33C 44060000 */ mfc1 $a2, $f0 /* 3AAC60 E00AA340 46006386 */ mov.s $f14, $f12 /* 3AAC64 E00AA344 E6160040 */ swc1 $f22, 0x40($s0) -/* 3AAC68 E00AA348 0C080148 */ jal func_E0200520 +/* 3AAC68 E00AA348 0C080148 */ jal shim_atan2 /* 3AAC6C E00AA34C E6140044 */ swc1 $f20, 0x44($s0) /* 3AAC70 E00AA350 E6000028 */ swc1 $f0, 0x28($s0) .LE00AA354: diff --git a/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA3C0.s b/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA3C0.s index 83b67f68b2..bc61efa301 100644 --- a/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA3C0.s +++ b/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA3C0.s @@ -11,7 +11,7 @@ glabel func_E00AA3C0 /* 3AACF8 E00AA3D8 27A40010 */ addiu $a0, $sp, 0x10 /* 3AACFC E00AA3DC AFBF0020 */ sw $ra, 0x20($sp) /* 3AAD00 E00AA3E0 AFA00014 */ sw $zero, 0x14($sp) -/* 3AAD04 E00AA3E4 0C080120 */ jal func_E0200480 +/* 3AAD04 E00AA3E4 0C080120 */ jal shim_queue_render_task /* 3AAD08 E00AA3E8 AFA20010 */ sw $v0, 0x10($sp) /* 3AAD0C E00AA3EC 8C430000 */ lw $v1, ($v0) /* 3AAD10 E00AA3F0 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA404.s b/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA404.s index bc0420b343..5dde66452f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA404.s +++ b/ver/us/asm/nonmatchings/effects/effect_85/func_E00AA404.s @@ -51,7 +51,7 @@ glabel func_E00AA404 /* 3AADDC E00AA4BC 8E65000C */ lw $a1, 0xc($s3) /* 3AADE0 E00AA4C0 8E670014 */ lw $a3, 0x14($s3) /* 3AADE4 E00AA4C4 44061000 */ mfc1 $a2, $f2 -/* 3AADE8 E00AA4C8 0C080108 */ jal func_E0200420 +/* 3AADE8 E00AA4C8 0C080108 */ jal shim_guTranslateF /* 3AADEC E00AA4CC 27A40018 */ addiu $a0, $sp, 0x18 /* 3AADF0 E00AA4D0 3C160001 */ lui $s6, 1 /* 3AADF4 E00AA4D4 3C073F80 */ lui $a3, 0x3f80 @@ -60,11 +60,11 @@ glabel func_E00AA404 /* 3AAE00 E00AA4E0 E7A00010 */ swc1 $f0, 0x10($sp) /* 3AAE04 E00AA4E4 8E650028 */ lw $a1, 0x28($s3) /* 3AAE08 E00AA4E8 44060000 */ mfc1 $a2, $f0 -/* 3AAE0C E00AA4EC 0C080104 */ jal func_E0200410 +/* 3AAE0C E00AA4EC 0C080104 */ jal shim_guRotateF /* 3AAE10 E00AA4F0 0200202D */ daddu $a0, $s0, $zero /* 3AAE14 E00AA4F4 0200202D */ daddu $a0, $s0, $zero /* 3AAE18 E00AA4F8 27A50018 */ addiu $a1, $sp, 0x18 -/* 3AAE1C E00AA4FC 0C080114 */ jal func_E0200450 +/* 3AAE1C E00AA4FC 0C080114 */ jal shim_guMtxCatF /* 3AAE20 E00AA500 00A0302D */ daddu $a2, $a1, $zero /* 3AAE24 E00AA504 3C013CA3 */ lui $at, 0x3ca3 /* 3AAE28 E00AA508 3421D70A */ ori $at, $at, 0xd70a @@ -73,11 +73,11 @@ glabel func_E00AA404 /* 3AAE34 E00AA514 44050000 */ mfc1 $a1, $f0 /* 3AAE38 E00AA518 0200202D */ daddu $a0, $s0, $zero /* 3AAE3C E00AA51C 00A0302D */ daddu $a2, $a1, $zero -/* 3AAE40 E00AA520 0C080110 */ jal func_E0200440 +/* 3AAE40 E00AA520 0C080110 */ jal shim_guScaleF /* 3AAE44 E00AA524 00A0382D */ daddu $a3, $a1, $zero /* 3AAE48 E00AA528 0200202D */ daddu $a0, $s0, $zero /* 3AAE4C E00AA52C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3AAE50 E00AA530 0C080114 */ jal func_E0200450 +/* 3AAE50 E00AA530 0C080114 */ jal shim_guMtxCatF /* 3AAE54 E00AA534 00A0302D */ daddu $a2, $a1, $zero /* 3AAE58 E00AA538 27A40018 */ addiu $a0, $sp, 0x18 /* 3AAE5C E00AA53C 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -88,7 +88,7 @@ glabel func_E00AA404 /* 3AAE70 E00AA550 8E820000 */ lw $v0, ($s4) /* 3AAE74 E00AA554 00052980 */ sll $a1, $a1, 6 /* 3AAE78 E00AA558 00B62821 */ addu $a1, $a1, $s6 -/* 3AAE7C E00AA55C 0C080118 */ jal func_E0200460 +/* 3AAE7C E00AA55C 0C080118 */ jal shim_guMtxF2L /* 3AAE80 E00AA560 00452821 */ addu $a1, $v0, $a1 /* 3AAE84 E00AA564 3C03DA38 */ lui $v1, 0xda38 /* 3AAE88 E00AA568 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_85/fx_85_main.s b/ver/us/asm/nonmatchings/effects/effect_85/fx_85_main.s index 7a5fac6c3a..7a66351fc9 100644 --- a/ver/us/asm/nonmatchings/effects/effect_85/fx_85_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_85/fx_85_main.s @@ -26,12 +26,12 @@ glabel fx_85_main /* 3AA974 E00AA054 AFB00028 */ sw $s0, 0x28($sp) /* 3AA978 E00AA058 AFA00010 */ sw $zero, 0x10($sp) /* 3AA97C E00AA05C AFA00024 */ sw $zero, 0x24($sp) -/* 3AA980 E00AA060 0C080124 */ jal func_E0200490 +/* 3AA980 E00AA060 0C080124 */ jal shim_create_effect_instance /* 3AA984 E00AA064 AFA20014 */ sw $v0, 0x14($sp) /* 3AA988 E00AA068 24040048 */ addiu $a0, $zero, 0x48 /* 3AA98C E00AA06C 24030001 */ addiu $v1, $zero, 1 /* 3AA990 E00AA070 0040802D */ daddu $s0, $v0, $zero -/* 3AA994 E00AA074 0C08012C */ jal func_E02004B0 +/* 3AA994 E00AA074 0C08012C */ jal shim_general_heap_malloc /* 3AA998 E00AA078 AE030008 */ sw $v1, 8($s0) /* 3AA99C E00AA07C 0040202D */ daddu $a0, $v0, $zero /* 3AA9A0 E00AA080 14800003 */ bnez $a0, .LE00AA090 diff --git a/ver/us/asm/nonmatchings/effects/effect_86/func_E00AC124.s b/ver/us/asm/nonmatchings/effects/effect_86/func_E00AC124.s index b16cdd378f..5e84c42e6c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_86/func_E00AC124.s +++ b/ver/us/asm/nonmatchings/effects/effect_86/func_E00AC124.s @@ -13,7 +13,7 @@ glabel func_E00AC124 /* 3AEF64 E00AC144 24C20001 */ addiu $v0, $a2, 1 /* 3AEF68 E00AC148 04610005 */ bgez $v1, .LE00AC160 /* 3AEF6C E00AC14C ACA20018 */ sw $v0, 0x18($a1) -/* 3AEF70 E00AC150 0C080128 */ jal func_E02004A0 +/* 3AEF70 E00AC150 0C080128 */ jal shim_remove_effect /* 3AEF74 E00AC154 00000000 */ nop /* 3AEF78 E00AC158 0802B09D */ j .LE00AC274 /* 3AEF7C E00AC15C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_86/func_E00AC2A4.s b/ver/us/asm/nonmatchings/effects/effect_86/func_E00AC2A4.s index fb7a63b321..46f4314b9d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_86/func_E00AC2A4.s +++ b/ver/us/asm/nonmatchings/effects/effect_86/func_E00AC2A4.s @@ -73,7 +73,7 @@ glabel func_E00AC2A4 /* 3AF1D4 E00AC3B4 E7A00018 */ swc1 $f0, 0x18($sp) /* 3AF1D8 E00AC3B8 C680000C */ lwc1 $f0, 0xc($s4) /* 3AF1DC E00AC3BC 00A0382D */ daddu $a3, $a1, $zero -/* 3AF1E0 E00AC3C0 0C080180 */ jal func_E0200600 +/* 3AF1E0 E00AC3C0 0C080180 */ jal shim_guPositionF /* 3AF1E4 E00AC3C4 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3AF1E8 E00AC3C8 27A40020 */ addiu $a0, $sp, 0x20 /* 3AF1EC E00AC3CC 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -84,7 +84,7 @@ glabel func_E00AC2A4 /* 3AF200 E00AC3E0 8E220000 */ lw $v0, ($s1) /* 3AF204 E00AC3E4 00052980 */ sll $a1, $a1, 6 /* 3AF208 E00AC3E8 00B22821 */ addu $a1, $a1, $s2 -/* 3AF20C E00AC3EC 0C080118 */ jal func_E0200460 +/* 3AF20C E00AC3EC 0C080118 */ jal shim_guMtxF2L /* 3AF210 E00AC3F0 00452821 */ addu $a1, $v0, $a1 /* 3AF214 E00AC3F4 8E670000 */ lw $a3, ($s3) /* 3AF218 E00AC3F8 00E0202D */ daddu $a0, $a3, $zero @@ -144,17 +144,17 @@ glabel func_E00AC2A4 /* 3AF2E8 E00AC4C8 8E860040 */ lw $a2, 0x40($s4) /* 3AF2EC E00AC4CC 4405A000 */ mfc1 $a1, $f20 /* 3AF2F0 E00AC4D0 4407A000 */ mfc1 $a3, $f20 -/* 3AF2F4 E00AC4D4 0C080108 */ jal func_E0200420 +/* 3AF2F4 E00AC4D4 0C080108 */ jal shim_guTranslateF /* 3AF2F8 E00AC4D8 36521630 */ ori $s2, $s2, 0x1630 /* 3AF2FC E00AC4DC 27B00060 */ addiu $s0, $sp, 0x60 /* 3AF300 E00AC4E0 8E850028 */ lw $a1, 0x28($s4) /* 3AF304 E00AC4E4 8E86002C */ lw $a2, 0x2c($s4) /* 3AF308 E00AC4E8 3C073F80 */ lui $a3, 0x3f80 -/* 3AF30C E00AC4EC 0C080110 */ jal func_E0200440 +/* 3AF30C E00AC4EC 0C080110 */ jal shim_guScaleF /* 3AF310 E00AC4F0 0200202D */ daddu $a0, $s0, $zero /* 3AF314 E00AC4F4 0200202D */ daddu $a0, $s0, $zero /* 3AF318 E00AC4F8 27A50020 */ addiu $a1, $sp, 0x20 -/* 3AF31C E00AC4FC 0C080114 */ jal func_E0200450 +/* 3AF31C E00AC4FC 0C080114 */ jal shim_guMtxCatF /* 3AF320 E00AC500 00A0302D */ daddu $a2, $a1, $zero /* 3AF324 E00AC504 27A40020 */ addiu $a0, $sp, 0x20 /* 3AF328 E00AC508 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -165,7 +165,7 @@ glabel func_E00AC2A4 /* 3AF33C E00AC51C 8E220000 */ lw $v0, ($s1) /* 3AF340 E00AC520 00052980 */ sll $a1, $a1, 6 /* 3AF344 E00AC524 00B22821 */ addu $a1, $a1, $s2 -/* 3AF348 E00AC528 0C080118 */ jal func_E0200460 +/* 3AF348 E00AC528 0C080118 */ jal shim_guMtxF2L /* 3AF34C E00AC52C 00452821 */ addu $a1, $v0, $a1 /* 3AF350 E00AC530 3C09D838 */ lui $t1, 0xd838 /* 3AF354 E00AC534 35290002 */ ori $t1, $t1, 2 @@ -222,14 +222,14 @@ glabel func_E00AC2A4 /* 3AF420 E00AC600 AD030014 */ sw $v1, 0x14($t0) /* 3AF424 E00AC604 8E86003C */ lw $a2, 0x3c($s4) /* 3AF428 E00AC608 25080028 */ addiu $t0, $t0, 0x28 -/* 3AF42C E00AC60C 0C080108 */ jal func_E0200420 +/* 3AF42C E00AC60C 0C080108 */ jal shim_guTranslateF /* 3AF430 E00AC610 AEA80000 */ sw $t0, ($s5) /* 3AF434 E00AC614 27A40020 */ addiu $a0, $sp, 0x20 /* 3AF438 E00AC618 96050000 */ lhu $a1, ($s0) /* 3AF43C E00AC61C 8E220000 */ lw $v0, ($s1) /* 3AF440 E00AC620 00052980 */ sll $a1, $a1, 6 /* 3AF444 E00AC624 00B22821 */ addu $a1, $a1, $s2 -/* 3AF448 E00AC628 0C080118 */ jal func_E0200460 +/* 3AF448 E00AC628 0C080118 */ jal shim_guMtxF2L /* 3AF44C E00AC62C 00452821 */ addu $a1, $v0, $a1 /* 3AF450 E00AC630 02E0302D */ daddu $a2, $s7, $zero /* 3AF454 E00AC634 8EA50000 */ lw $a1, ($s5) diff --git a/ver/us/asm/nonmatchings/effects/effect_86/fx_86_main.s b/ver/us/asm/nonmatchings/effects/effect_86/fx_86_main.s index 7eb6ede550..d3f4e0a5f9 100644 --- a/ver/us/asm/nonmatchings/effects/effect_86/fx_86_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_86/fx_86_main.s @@ -28,12 +28,12 @@ glabel fx_86_main /* 3AEE7C E00AC05C AFBF0030 */ sw $ra, 0x30($sp) /* 3AEE80 E00AC060 AFB00028 */ sw $s0, 0x28($sp) /* 3AEE84 E00AC064 AFA00010 */ sw $zero, 0x10($sp) -/* 3AEE88 E00AC068 0C080124 */ jal func_E0200490 +/* 3AEE88 E00AC068 0C080124 */ jal shim_create_effect_instance /* 3AEE8C E00AC06C AFA20014 */ sw $v0, 0x14($sp) /* 3AEE90 E00AC070 24040044 */ addiu $a0, $zero, 0x44 /* 3AEE94 E00AC074 24030001 */ addiu $v1, $zero, 1 /* 3AEE98 E00AC078 0040802D */ daddu $s0, $v0, $zero -/* 3AEE9C E00AC07C 0C08012C */ jal func_E02004B0 +/* 3AEE9C E00AC07C 0C08012C */ jal shim_general_heap_malloc /* 3AEEA0 E00AC080 AE030008 */ sw $v1, 8($s0) /* 3AEEA4 E00AC084 0040202D */ daddu $a0, $v0, $zero /* 3AEEA8 E00AC088 14800003 */ bnez $a0, .LE00AC098 diff --git a/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE1B4.s b/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE1B4.s index d8f0e64f8f..1fbad75261 100644 --- a/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE1B4.s +++ b/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE1B4.s @@ -35,7 +35,7 @@ glabel func_E00AE1B4 /* 3B2574 E00AE224 24440001 */ addiu $a0, $v0, 1 /* 3B2578 E00AE228 04610005 */ bgez $v1, .LE00AE240 /* 3B257C E00AE22C AE240014 */ sw $a0, 0x14($s1) -/* 3B2580 E00AE230 0C080128 */ jal func_E02004A0 +/* 3B2580 E00AE230 0C080128 */ jal shim_remove_effect /* 3B2584 E00AE234 0260202D */ daddu $a0, $s3, $zero /* 3B2588 E00AE238 0802B933 */ j .LE00AE4CC /* 3B258C E00AE23C 00000000 */ nop @@ -64,12 +64,12 @@ glabel func_E00AE1B4 /* 3B25D8 E00AE288 0043102A */ slt $v0, $v0, $v1 /* 3B25DC E00AE28C 1440000E */ bnez $v0, .LE00AE2C8 /* 3B25E0 E00AE290 00000000 */ nop -/* 3B25E4 E00AE294 0C080138 */ jal func_E02004E0 +/* 3B25E4 E00AE294 0C080138 */ jal shim_rand_int /* 3B25E8 E00AE298 24040032 */ addiu $a0, $zero, 0x32 /* 3B25EC E00AE29C 24040168 */ addiu $a0, $zero, 0x168 /* 3B25F0 E00AE2A0 24420014 */ addiu $v0, $v0, 0x14 /* 3B25F4 E00AE2A4 AE02FFFC */ sw $v0, -4($s0) -/* 3B25F8 E00AE2A8 0C080138 */ jal func_E02004E0 +/* 3B25F8 E00AE2A8 0C080138 */ jal shim_rand_int /* 3B25FC E00AE2AC AE000000 */ sw $zero, ($s0) /* 3B2600 E00AE2B0 44820000 */ mtc1 $v0, $f0 /* 3B2604 E00AE2B4 00000000 */ nop @@ -78,20 +78,20 @@ glabel func_E00AE1B4 /* 3B2610 E00AE2C0 AE00FFF0 */ sw $zero, -0x10($s0) /* 3B2614 E00AE2C4 AE00FFF4 */ sw $zero, -0xc($s0) .LE00AE2C8: -/* 3B2618 E00AE2C8 0C080138 */ jal func_E02004E0 +/* 3B2618 E00AE2C8 0C080138 */ jal shim_rand_int /* 3B261C E00AE2CC 24040064 */ addiu $a0, $zero, 0x64 /* 3B2620 E00AE2D0 28420033 */ slti $v0, $v0, 0x33 /* 3B2624 E00AE2D4 10400047 */ beqz $v0, .LE00AE3F4 /* 3B2628 E00AE2D8 00000000 */ nop /* 3B262C E00AE2DC C618FFF0 */ lwc1 $f24, -0x10($s0) /* 3B2630 E00AE2E0 C61AFFF4 */ lwc1 $f26, -0xc($s0) -/* 3B2634 E00AE2E4 0C080138 */ jal func_E02004E0 +/* 3B2634 E00AE2E4 0C080138 */ jal shim_rand_int /* 3B2638 E00AE2E8 24040010 */ addiu $a0, $zero, 0x10 /* 3B263C E00AE2EC 2442FFF8 */ addiu $v0, $v0, -8 /* 3B2640 E00AE2F0 4482B000 */ mtc1 $v0, $f22 /* 3B2644 E00AE2F4 00000000 */ nop /* 3B2648 E00AE2F8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 3B264C E00AE2FC 0C080138 */ jal func_E02004E0 +/* 3B264C E00AE2FC 0C080138 */ jal shim_rand_int /* 3B2650 E00AE300 24040010 */ addiu $a0, $zero, 0x10 /* 3B2654 E00AE304 2442FFF8 */ addiu $v0, $v0, -8 /* 3B2658 E00AE308 4482A000 */ mtc1 $v0, $f20 @@ -138,7 +138,7 @@ glabel func_E00AE1B4 /* 3B26F4 E00AE3A4 8C450000 */ lw $a1, ($v0) /* 3B26F8 E00AE3A8 AC650000 */ sw $a1, ($v1) /* 3B26FC E00AE3AC E602FFF0 */ swc1 $f2, -0x10($s0) -/* 3B2700 E00AE3B0 0C080148 */ jal func_E0200520 +/* 3B2700 E00AE3B0 0C080148 */ jal shim_atan2 /* 3B2704 E00AE3B4 E600FFF4 */ swc1 $f0, -0xc($s0) /* 3B2708 E00AE3B8 461CB032 */ c.eq.s $f22, $f28 /* 3B270C E00AE3BC 00000000 */ nop @@ -153,7 +153,7 @@ glabel func_E00AE1B4 /* 3B272C E00AE3DC 00000000 */ nop /* 3B2730 E00AE3E0 4614A302 */ mul.s $f12, $f20, $f20 /* 3B2734 E00AE3E4 00000000 */ nop -/* 3B2738 E00AE3E8 0C080154 */ jal func_E0200550 +/* 3B2738 E00AE3E8 0C080154 */ jal shim_sqrtf /* 3B273C E00AE3EC 460C0300 */ add.s $f12, $f0, $f12 /* 3B2740 E00AE3F0 E6000020 */ swc1 $f0, 0x20($s0) .LE00AE3F4: @@ -178,7 +178,7 @@ glabel func_E00AE1B4 /* 3B2784 E00AE434 00001012 */ mflo $v0 /* 3B2788 E00AE438 44826000 */ mtc1 $v0, $f12 /* 3B278C E00AE43C 00000000 */ nop -/* 3B2790 E00AE440 0C080140 */ jal func_E0200500 +/* 3B2790 E00AE440 0C080140 */ jal shim_sin_deg /* 3B2794 E00AE444 46806320 */ cvt.s.w $f12, $f12 /* 3B2798 E00AE448 3C014480 */ lui $at, 0x4480 /* 3B279C E00AE44C 44811000 */ mtc1 $at, $f2 @@ -208,7 +208,7 @@ glabel func_E00AE1B4 /* 3B27F4 E00AE4A4 0802B92F */ j .LE00AE4BC /* 3B27F8 E00AE4A8 24120001 */ addiu $s2, $zero, 1 .LE00AE4AC: -/* 3B27FC E00AE4AC 0C080138 */ jal func_E02004E0 +/* 3B27FC E00AE4AC 0C080138 */ jal shim_rand_int /* 3B2800 E00AE4B0 2404000F */ addiu $a0, $zero, 0xf /* 3B2804 E00AE4B4 26520001 */ addiu $s2, $s2, 1 /* 3B2808 E00AE4B8 AE220040 */ sw $v0, 0x40($s1) diff --git a/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE4FC.s b/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE4FC.s index 36e91b2e66..0bc296433a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE4FC.s +++ b/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE4FC.s @@ -12,7 +12,7 @@ glabel func_E00AE4FC /* 3B2868 E00AE518 AFA40018 */ sw $a0, 0x18($sp) /* 3B286C E00AE51C 27A40010 */ addiu $a0, $sp, 0x10 /* 3B2870 E00AE520 AFBF0020 */ sw $ra, 0x20($sp) -/* 3B2874 E00AE524 0C080120 */ jal func_E0200480 +/* 3B2874 E00AE524 0C080120 */ jal shim_queue_render_task /* 3B2878 E00AE528 AFA20010 */ sw $v0, 0x10($sp) /* 3B287C E00AE52C 8C430000 */ lw $v1, ($v0) /* 3B2880 E00AE530 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE54C.s b/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE54C.s index 73048171f8..af80fd5ff4 100644 --- a/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE54C.s +++ b/ver/us/asm/nonmatchings/effects/effect_87/func_E00AE54C.s @@ -65,17 +65,17 @@ glabel func_E00AE54C /* 3B298C E00AE63C 001010C0 */ sll $v0, $s0, 3 /* 3B2990 E00AE640 02028021 */ addu $s0, $s0, $v0 /* 3B2994 E00AE644 001080C0 */ sll $s0, $s0, 3 -/* 3B2998 E00AE648 0C080108 */ jal func_E0200420 +/* 3B2998 E00AE648 0C080108 */ jal shim_guTranslateF /* 3B299C E00AE64C 02038021 */ addu $s0, $s0, $v1 /* 3B29A0 E00AE650 27B40058 */ addiu $s4, $sp, 0x58 /* 3B29A4 E00AE654 8E450038 */ lw $a1, 0x38($s2) /* 3B29A8 E00AE658 0280202D */ daddu $a0, $s4, $zero /* 3B29AC E00AE65C 00A0302D */ daddu $a2, $a1, $zero -/* 3B29B0 E00AE660 0C080110 */ jal func_E0200440 +/* 3B29B0 E00AE660 0C080110 */ jal shim_guScaleF /* 3B29B4 E00AE664 00A0382D */ daddu $a3, $a1, $zero /* 3B29B8 E00AE668 0280202D */ daddu $a0, $s4, $zero /* 3B29BC E00AE66C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3B29C0 E00AE670 0C080114 */ jal func_E0200450 +/* 3B29C0 E00AE670 0C080114 */ jal shim_guMtxCatF /* 3B29C4 E00AE674 00A0302D */ daddu $a2, $a1, $zero /* 3B29C8 E00AE678 27A40018 */ addiu $a0, $sp, 0x18 /* 3B29CC E00AE67C 3C168007 */ lui $s6, %hi(gMatrixListPos) @@ -86,7 +86,7 @@ glabel func_E00AE54C /* 3B29E0 E00AE690 8EE20000 */ lw $v0, ($s7) /* 3B29E4 E00AE694 00052980 */ sll $a1, $a1, 6 /* 3B29E8 E00AE698 00B12821 */ addu $a1, $a1, $s1 -/* 3B29EC E00AE69C 0C080118 */ jal func_E0200460 +/* 3B29EC E00AE69C 0C080118 */ jal shim_guMtxF2L /* 3B29F0 E00AE6A0 00452821 */ addu $a1, $v0, $a1 /* 3B29F4 E00AE6A4 3C03DA38 */ lui $v1, 0xda38 /* 3B29F8 E00AE6A8 34630002 */ ori $v1, $v1, 2 @@ -190,17 +190,17 @@ glabel func_E00AE54C /* 3B2B7C E00AE82C 8E05FFC4 */ lw $a1, -0x3c($s0) /* 3B2B80 E00AE830 8E06FFC8 */ lw $a2, -0x38($s0) /* 3B2B84 E00AE834 25080008 */ addiu $t0, $t0, 8 -/* 3B2B88 E00AE838 0C080108 */ jal func_E0200420 +/* 3B2B88 E00AE838 0C080108 */ jal shim_guTranslateF /* 3B2B8C E00AE83C AE280000 */ sw $t0, ($s1) /* 3B2B90 E00AE840 E7B60010 */ swc1 $f22, 0x10($sp) /* 3B2B94 E00AE844 8E05FFFC */ lw $a1, -4($s0) /* 3B2B98 E00AE848 4406A000 */ mfc1 $a2, $f20 /* 3B2B9C E00AE84C 4407A000 */ mfc1 $a3, $f20 -/* 3B2BA0 E00AE850 0C080104 */ jal func_E0200410 +/* 3B2BA0 E00AE850 0C080104 */ jal shim_guRotateF /* 3B2BA4 E00AE854 0260202D */ daddu $a0, $s3, $zero /* 3B2BA8 E00AE858 0260202D */ daddu $a0, $s3, $zero /* 3B2BAC E00AE85C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3B2BB0 E00AE860 0C080114 */ jal func_E0200450 +/* 3B2BB0 E00AE860 0C080114 */ jal shim_guMtxCatF /* 3B2BB4 E00AE864 00A0302D */ daddu $a2, $a1, $zero /* 3B2BB8 E00AE868 C602FFF4 */ lwc1 $f2, -0xc($s0) /* 3B2BBC E00AE86C 3C013D80 */ lui $at, 0x3d80 @@ -211,11 +211,11 @@ glabel func_E00AE54C /* 3B2BD0 E00AE880 0260202D */ daddu $a0, $s3, $zero /* 3B2BD4 E00AE884 44051000 */ mfc1 $a1, $f2 /* 3B2BD8 E00AE888 4407B000 */ mfc1 $a3, $f22 -/* 3B2BDC E00AE88C 0C080110 */ jal func_E0200440 +/* 3B2BDC E00AE88C 0C080110 */ jal shim_guScaleF /* 3B2BE0 E00AE890 00A0302D */ daddu $a2, $a1, $zero /* 3B2BE4 E00AE894 0260202D */ daddu $a0, $s3, $zero /* 3B2BE8 E00AE898 27A50018 */ addiu $a1, $sp, 0x18 -/* 3B2BEC E00AE89C 0C080114 */ jal func_E0200450 +/* 3B2BEC E00AE89C 0C080114 */ jal shim_guMtxCatF /* 3B2BF0 E00AE8A0 00A0302D */ daddu $a2, $a1, $zero /* 3B2BF4 E00AE8A4 27A40018 */ addiu $a0, $sp, 0x18 /* 3B2BF8 E00AE8A8 96E50000 */ lhu $a1, ($s7) @@ -223,7 +223,7 @@ glabel func_E00AE54C /* 3B2C00 E00AE8B0 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3B2C04 E00AE8B4 00052980 */ sll $a1, $a1, 6 /* 3B2C08 E00AE8B8 00B42821 */ addu $a1, $a1, $s4 -/* 3B2C0C E00AE8BC 0C080118 */ jal func_E0200460 +/* 3B2C0C E00AE8BC 0C080118 */ jal shim_guMtxF2L /* 3B2C10 E00AE8C0 00452821 */ addu $a1, $v0, $a1 /* 3B2C14 E00AE8C4 3C060100 */ lui $a2, 0x100 /* 3B2C18 E00AE8C8 34C6007C */ ori $a2, $a2, 0x7c diff --git a/ver/us/asm/nonmatchings/effects/effect_87/fx_87_main.s b/ver/us/asm/nonmatchings/effects/effect_87/fx_87_main.s index 3ba15f9a0c..4982721f68 100644 --- a/ver/us/asm/nonmatchings/effects/effect_87/fx_87_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_87/fx_87_main.s @@ -29,12 +29,12 @@ glabel fx_87_main /* 3B23B0 E00AE060 AFB00028 */ sw $s0, 0x28($sp) /* 3B23B4 E00AE064 AFA00010 */ sw $zero, 0x10($sp) /* 3B23B8 E00AE068 AFA00024 */ sw $zero, 0x24($sp) -/* 3B23BC E00AE06C 0C080124 */ jal func_E0200490 +/* 3B23BC E00AE06C 0C080124 */ jal shim_create_effect_instance /* 3B23C0 E00AE070 AFA20014 */ sw $v0, 0x14($sp) /* 3B23C4 E00AE074 240405D8 */ addiu $a0, $zero, 0x5d8 /* 3B23C8 E00AE078 24110016 */ addiu $s1, $zero, 0x16 /* 3B23CC E00AE07C 0040802D */ daddu $s0, $v0, $zero -/* 3B23D0 E00AE080 0C08012C */ jal func_E02004B0 +/* 3B23D0 E00AE080 0C08012C */ jal shim_general_heap_malloc /* 3B23D4 E00AE084 AE110008 */ sw $s1, 8($s0) /* 3B23D8 E00AE088 0040202D */ daddu $a0, $v0, $zero /* 3B23DC E00AE08C 14800003 */ bnez $a0, .LE00AE09C diff --git a/ver/us/asm/nonmatchings/effects/effect_88/func_E00B0124.s b/ver/us/asm/nonmatchings/effects/effect_88/func_E00B0124.s index 54c3524e51..9105de90c1 100644 --- a/ver/us/asm/nonmatchings/effects/effect_88/func_E00B0124.s +++ b/ver/us/asm/nonmatchings/effects/effect_88/func_E00B0124.s @@ -25,7 +25,7 @@ glabel func_E00B0124 /* 3B401C E00B016C 24450001 */ addiu $a1, $v0, 1 /* 3B4020 E00B0170 04C10005 */ bgez $a2, .LE00B0188 /* 3B4024 E00B0174 AC650014 */ sw $a1, 0x14($v1) -/* 3B4028 E00B0178 0C080128 */ jal func_E02004A0 +/* 3B4028 E00B0178 0C080128 */ jal shim_remove_effect /* 3B402C E00B017C 00000000 */ nop /* 3B4030 E00B0180 0802C07B */ j .LE00B01EC /* 3B4034 E00B0184 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_88/func_E00B01F8.s b/ver/us/asm/nonmatchings/effects/effect_88/func_E00B01F8.s index 154da34368..4a41c27e99 100644 --- a/ver/us/asm/nonmatchings/effects/effect_88/func_E00B01F8.s +++ b/ver/us/asm/nonmatchings/effects/effect_88/func_E00B01F8.s @@ -12,7 +12,7 @@ glabel func_E00B01F8 /* 3B40C4 E00B0214 AFA40018 */ sw $a0, 0x18($sp) /* 3B40C8 E00B0218 27A40010 */ addiu $a0, $sp, 0x10 /* 3B40CC E00B021C AFBF0020 */ sw $ra, 0x20($sp) -/* 3B40D0 E00B0220 0C080120 */ jal func_E0200480 +/* 3B40D0 E00B0220 0C080120 */ jal shim_queue_render_task /* 3B40D4 E00B0224 AFA20010 */ sw $v0, 0x10($sp) /* 3B40D8 E00B0228 8FBF0020 */ lw $ra, 0x20($sp) /* 3B40DC E00B022C 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_88/func_E00B0234.s b/ver/us/asm/nonmatchings/effects/effect_88/func_E00B0234.s index d8595aa32d..d5ab944568 100644 --- a/ver/us/asm/nonmatchings/effects/effect_88/func_E00B0234.s +++ b/ver/us/asm/nonmatchings/effects/effect_88/func_E00B0234.s @@ -80,7 +80,7 @@ glabel func_E00B0234 /* 3B4210 E00B0360 E7A00018 */ swc1 $f0, 0x18($sp) /* 3B4214 E00B0364 C660000C */ lwc1 $f0, 0xc($s3) /* 3B4218 E00B0368 00A0382D */ daddu $a3, $a1, $zero -/* 3B421C E00B036C 0C080180 */ jal func_E0200600 +/* 3B421C E00B036C 0C080180 */ jal shim_guPositionF /* 3B4220 E00B0370 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3B4224 E00B0374 27A40020 */ addiu $a0, $sp, 0x20 /* 3B4228 E00B0378 96A50000 */ lhu $a1, ($s5) @@ -88,7 +88,7 @@ glabel func_E00B0234 /* 3B4230 E00B0380 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3B4234 E00B0384 00052980 */ sll $a1, $a1, 6 /* 3B4238 E00B0388 00B02821 */ addu $a1, $a1, $s0 -/* 3B423C E00B038C 0C080118 */ jal func_E0200460 +/* 3B423C E00B038C 0C080118 */ jal shim_guMtxF2L /* 3B4240 E00B0390 00452821 */ addu $a1, $v0, $a1 /* 3B4244 E00B0394 3C06DA38 */ lui $a2, 0xda38 /* 3B4248 E00B0398 8E440000 */ lw $a0, ($s2) @@ -130,16 +130,16 @@ glabel func_E00B0234 /* 3B42D4 E00B0424 4406A000 */ mfc1 $a2, $f20 /* 3B42D8 E00B0428 4407A000 */ mfc1 $a3, $f20 /* 3B42DC E00B042C 26310001 */ addiu $s1, $s1, 1 -/* 3B42E0 E00B0430 0C080104 */ jal func_E0200410 +/* 3B42E0 E00B0430 0C080104 */ jal shim_guRotateF /* 3B42E4 E00B0434 E7B60010 */ swc1 $f22, 0x10($sp) /* 3B42E8 E00B0438 4405B000 */ mfc1 $a1, $f22 /* 3B42EC E00B043C 4406C000 */ mfc1 $a2, $f24 /* 3B42F0 E00B0440 4407B000 */ mfc1 $a3, $f22 -/* 3B42F4 E00B0444 0C080110 */ jal func_E0200440 +/* 3B42F4 E00B0444 0C080110 */ jal shim_guScaleF /* 3B42F8 E00B0448 0280202D */ daddu $a0, $s4, $zero /* 3B42FC E00B044C 0280202D */ daddu $a0, $s4, $zero /* 3B4300 E00B0450 27A50020 */ addiu $a1, $sp, 0x20 -/* 3B4304 E00B0454 0C080114 */ jal func_E0200450 +/* 3B4304 E00B0454 0C080114 */ jal shim_guMtxCatF /* 3B4308 E00B0458 00A0302D */ daddu $a2, $a1, $zero /* 3B430C E00B045C 4405A000 */ mfc1 $a1, $f20 /* 3B4310 E00B0460 4406A000 */ mfc1 $a2, $f20 @@ -150,11 +150,11 @@ glabel func_E00B0234 /* 3B4324 E00B0474 E7B60010 */ swc1 $f22, 0x10($sp) /* 3B4328 E00B0478 E7B40018 */ swc1 $f20, 0x18($sp) /* 3B432C E00B047C E7B4001C */ swc1 $f20, 0x1c($sp) -/* 3B4330 E00B0480 0C080180 */ jal func_E0200600 +/* 3B4330 E00B0480 0C080180 */ jal shim_guPositionF /* 3B4334 E00B0484 E7A00014 */ swc1 $f0, 0x14($sp) /* 3B4338 E00B0488 0280202D */ daddu $a0, $s4, $zero /* 3B433C E00B048C 27A50020 */ addiu $a1, $sp, 0x20 -/* 3B4340 E00B0490 0C080114 */ jal func_E0200450 +/* 3B4340 E00B0490 0C080114 */ jal shim_guMtxCatF /* 3B4344 E00B0494 00A0302D */ daddu $a2, $a1, $zero /* 3B4348 E00B0498 27A40020 */ addiu $a0, $sp, 0x20 /* 3B434C E00B049C 96A50000 */ lhu $a1, ($s5) @@ -162,7 +162,7 @@ glabel func_E00B0234 /* 3B4354 E00B04A4 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3B4358 E00B04A8 00052980 */ sll $a1, $a1, 6 /* 3B435C E00B04AC 00BE2821 */ addu $a1, $a1, $fp -/* 3B4360 E00B04B0 0C080118 */ jal func_E0200460 +/* 3B4360 E00B04B0 0C080118 */ jal shim_guMtxF2L /* 3B4364 E00B04B4 00452821 */ addu $a1, $v0, $a1 /* 3B4368 E00B04B8 3C06D838 */ lui $a2, 0xd838 /* 3B436C E00B04BC 8E440000 */ lw $a0, ($s2) @@ -266,7 +266,7 @@ glabel func_E00B0234 /* 3B44E8 E00B0638 44826000 */ mtc1 $v0, $f12 /* 3B44EC E00B063C 00000000 */ nop /* 3B44F0 E00B0640 46806320 */ cvt.s.w $f12, $f12 -/* 3B44F4 E00B0644 0C080144 */ jal func_E0200510 +/* 3B44F4 E00B0644 0C080144 */ jal shim_cos_deg /* 3B44F8 E00B0648 26300001 */ addiu $s0, $s1, 1 /* 3B44FC E00B064C 46000021 */ cvt.d.s $f0, $f0 /* 3B4500 E00B0650 3C01E00B */ lui $at, %hi(D_E00B07E8) @@ -295,14 +295,14 @@ glabel func_E00B0234 /* 3B455C E00B06AC E7B40014 */ swc1 $f20, 0x14($sp) /* 3B4560 E00B06B0 E7B40018 */ swc1 $f20, 0x18($sp) /* 3B4564 E00B06B4 E7B4001C */ swc1 $f20, 0x1c($sp) -/* 3B4568 E00B06B8 0C080180 */ jal func_E0200600 +/* 3B4568 E00B06B8 0C080180 */ jal shim_guPositionF /* 3B456C E00B06BC E7A20010 */ swc1 $f2, 0x10($sp) /* 3B4570 E00B06C0 27A40020 */ addiu $a0, $sp, 0x20 /* 3B4574 E00B06C4 96A50000 */ lhu $a1, ($s5) /* 3B4578 E00B06C8 8EC20000 */ lw $v0, ($s6) /* 3B457C E00B06CC 00052980 */ sll $a1, $a1, 6 /* 3B4580 E00B06D0 00B42821 */ addu $a1, $a1, $s4 -/* 3B4584 E00B06D4 0C080118 */ jal func_E0200460 +/* 3B4584 E00B06D4 0C080118 */ jal shim_guMtxF2L /* 3B4588 E00B06D8 00452821 */ addu $a1, $v0, $a1 /* 3B458C E00B06DC 3C07D838 */ lui $a3, 0xd838 /* 3B4590 E00B06E0 34E70002 */ ori $a3, $a3, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_88/fx_88_main.s b/ver/us/asm/nonmatchings/effects/effect_88/fx_88_main.s index 71a49e8e14..025584aa02 100644 --- a/ver/us/asm/nonmatchings/effects/effect_88/fx_88_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_88/fx_88_main.s @@ -28,12 +28,12 @@ glabel fx_88_main /* 3B3F0C E00B005C AFB00028 */ sw $s0, 0x28($sp) /* 3B3F10 E00B0060 AFA00010 */ sw $zero, 0x10($sp) /* 3B3F14 E00B0064 AFA00024 */ sw $zero, 0x24($sp) -/* 3B3F18 E00B0068 0C080124 */ jal func_E0200490 +/* 3B3F18 E00B0068 0C080124 */ jal shim_create_effect_instance /* 3B3F1C E00B006C AFA20014 */ sw $v0, 0x14($sp) /* 3B3F20 E00B0070 24040034 */ addiu $a0, $zero, 0x34 /* 3B3F24 E00B0074 24030001 */ addiu $v1, $zero, 1 /* 3B3F28 E00B0078 0040802D */ daddu $s0, $v0, $zero -/* 3B3F2C E00B007C 0C08012C */ jal func_E02004B0 +/* 3B3F2C E00B007C 0C08012C */ jal shim_general_heap_malloc /* 3B3F30 E00B0080 AE030008 */ sw $v1, 8($s0) /* 3B3F34 E00B0084 0040202D */ daddu $a0, $v0, $zero /* 3B3F38 E00B0088 14800003 */ bnez $a0, .LE00B0098 diff --git a/ver/us/asm/nonmatchings/effects/effect_89/func_E00B21E4.s b/ver/us/asm/nonmatchings/effects/effect_89/func_E00B21E4.s index a4022069c7..2dab84cd74 100644 --- a/ver/us/asm/nonmatchings/effects/effect_89/func_E00B21E4.s +++ b/ver/us/asm/nonmatchings/effects/effect_89/func_E00B21E4.s @@ -35,7 +35,7 @@ glabel func_E00B21E4 /* 3B49E4 E00B2254 24420001 */ addiu $v0, $v0, 1 /* 3B49E8 E00B2258 04610005 */ bgez $v1, .LE00B2270 /* 3B49EC E00B225C AE020030 */ sw $v0, 0x30($s0) -/* 3B49F0 E00B2260 0C080128 */ jal func_E02004A0 +/* 3B49F0 E00B2260 0C080128 */ jal shim_remove_effect /* 3B49F4 E00B2264 00000000 */ nop /* 3B49F8 E00B2268 0802C90C */ j .LE00B2430 /* 3B49FC E00B226C 00000000 */ nop @@ -113,7 +113,7 @@ glabel func_E00B21E4 /* 3B4B04 E00B2374 46140002 */ mul.s $f0, $f0, $f20 /* 3B4B08 E00B2378 00000000 */ nop /* 3B4B0C E00B237C 46001080 */ add.s $f2, $f2, $f0 -/* 3B4B10 E00B2380 0C080140 */ jal func_E0200500 +/* 3B4B10 E00B2380 0C080140 */ jal shim_sin_deg /* 3B4B14 E00B2384 E62200E8 */ swc1 $f2, 0xe8($s1) /* 3B4B18 E00B2388 3C0142F0 */ lui $at, 0x42f0 /* 3B4B1C E00B238C 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/effects/effect_89/func_E00B2460.s b/ver/us/asm/nonmatchings/effects/effect_89/func_E00B2460.s index 66ad924ab1..0fb969352c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_89/func_E00B2460.s +++ b/ver/us/asm/nonmatchings/effects/effect_89/func_E00B2460.s @@ -12,7 +12,7 @@ glabel func_E00B2460 /* 3B4C0C E00B247C AFA40018 */ sw $a0, 0x18($sp) /* 3B4C10 E00B2480 27A40010 */ addiu $a0, $sp, 0x10 /* 3B4C14 E00B2484 AFBF0020 */ sw $ra, 0x20($sp) -/* 3B4C18 E00B2488 0C080120 */ jal func_E0200480 +/* 3B4C18 E00B2488 0C080120 */ jal shim_queue_render_task /* 3B4C1C E00B248C AFA20010 */ sw $v0, 0x10($sp) /* 3B4C20 E00B2490 8C430000 */ lw $v1, ($v0) /* 3B4C24 E00B2494 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_89/func_E00B24B0.s b/ver/us/asm/nonmatchings/effects/effect_89/func_E00B24B0.s index b171e4cbcf..b03913fe8d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_89/func_E00B24B0.s +++ b/ver/us/asm/nonmatchings/effects/effect_89/func_E00B24B0.s @@ -63,7 +63,7 @@ glabel func_E00B24B0 /* 3B4D28 E00B2598 8C62001C */ lw $v0, 0x1c($v1) /* 3B4D2C E00B259C 3C038000 */ lui $v1, 0x8000 /* 3B4D30 E00B25A0 00431021 */ addu $v0, $v0, $v1 -/* 3B4D34 E00B25A4 0C080108 */ jal func_E0200420 +/* 3B4D34 E00B25A4 0C080108 */ jal shim_guTranslateF /* 3B4D38 E00B25A8 AD020004 */ sw $v0, 4($t0) /* 3B4D3C E00B25AC 02E0B02D */ daddu $s6, $s7, $zero /* 3B4D40 E00B25B0 3C013D4C */ lui $at, 0x3d4c @@ -73,11 +73,11 @@ glabel func_E00B24B0 /* 3B4D50 E00B25C0 44050000 */ mfc1 $a1, $f0 /* 3B4D54 E00B25C4 0200202D */ daddu $a0, $s0, $zero /* 3B4D58 E00B25C8 00A0302D */ daddu $a2, $a1, $zero -/* 3B4D5C E00B25CC 0C080110 */ jal func_E0200440 +/* 3B4D5C E00B25CC 0C080110 */ jal shim_guScaleF /* 3B4D60 E00B25D0 00A0382D */ daddu $a3, $a1, $zero /* 3B4D64 E00B25D4 0200202D */ daddu $a0, $s0, $zero /* 3B4D68 E00B25D8 27A50010 */ addiu $a1, $sp, 0x10 -/* 3B4D6C E00B25DC 0C080114 */ jal func_E0200450 +/* 3B4D6C E00B25DC 0C080114 */ jal shim_guMtxCatF /* 3B4D70 E00B25E0 00A0302D */ daddu $a2, $a1, $zero /* 3B4D74 E00B25E4 27A40010 */ addiu $a0, $sp, 0x10 /* 3B4D78 E00B25E8 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -88,7 +88,7 @@ glabel func_E00B24B0 /* 3B4D8C E00B25FC 8E420000 */ lw $v0, ($s2) /* 3B4D90 E00B2600 00052980 */ sll $a1, $a1, 6 /* 3B4D94 E00B2604 00B32821 */ addu $a1, $a1, $s3 -/* 3B4D98 E00B2608 0C080118 */ jal func_E0200460 +/* 3B4D98 E00B2608 0C080118 */ jal shim_guMtxF2L /* 3B4D9C E00B260C 00452821 */ addu $a1, $v0, $a1 /* 3B4DA0 E00B2610 3C03DA38 */ lui $v1, 0xda38 /* 3B4DA4 E00B2614 8E240000 */ lw $a0, ($s1) @@ -163,7 +163,7 @@ glabel func_E00B24B0 /* 3B4EB0 E00B2720 C44C0118 */ lwc1 $f12, 0x118($v0) /* 3B4EB4 E00B2724 C44E00E8 */ lwc1 $f14, 0xe8($v0) /* 3B4EB8 E00B2728 44070000 */ mfc1 $a3, $f0 -/* 3B4EBC E00B272C 0C080148 */ jal func_E0200520 +/* 3B4EBC E00B272C 0C080148 */ jal shim_atan2 /* 3B4EC0 E00B2730 46007387 */ neg.s $f14, $f14 /* 3B4EC4 E00B2734 46000607 */ neg.s $f24, $f0 .LE00B2738: @@ -231,11 +231,11 @@ glabel func_E00B24B0 /* 3B4FAC E00B281C 00000000 */ nop /* 3B4FB0 E00B2820 4600C306 */ mov.s $f12, $f24 /* 3B4FB4 E00B2824 03158021 */ addu $s0, $t8, $s5 -/* 3B4FB8 E00B2828 0C080140 */ jal func_E0200500 +/* 3B4FB8 E00B2828 0C080140 */ jal shim_sin_deg /* 3B4FBC E00B282C 00108180 */ sll $s0, $s0, 6 /* 3B4FC0 E00B2830 4600B502 */ mul.s $f20, $f22, $f0 /* 3B4FC4 E00B2834 00000000 */ nop -/* 3B4FC8 E00B2838 0C080144 */ jal func_E0200510 +/* 3B4FC8 E00B2838 0C080144 */ jal shim_cos_deg /* 3B4FCC E00B283C 4600C306 */ mov.s $f12, $f24 /* 3B4FD0 E00B2840 C6C200E8 */ lwc1 $f2, 0xe8($s6) /* 3B4FD4 E00B2844 46141080 */ add.s $f2, $f2, $f20 diff --git a/ver/us/asm/nonmatchings/effects/effect_89/fx_89_main.s b/ver/us/asm/nonmatchings/effects/effect_89/fx_89_main.s index c4d87f67f0..dc988d9407 100644 --- a/ver/us/asm/nonmatchings/effects/effect_89/fx_89_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_89/fx_89_main.s @@ -28,12 +28,12 @@ glabel fx_89_main /* 3B47EC E00B205C AFB1002C */ sw $s1, 0x2c($sp) /* 3B47F0 E00B2060 AFA00010 */ sw $zero, 0x10($sp) /* 3B47F4 E00B2064 AFA00024 */ sw $zero, 0x24($sp) -/* 3B47F8 E00B2068 0C080124 */ jal func_E0200490 +/* 3B47F8 E00B2068 0C080124 */ jal shim_create_effect_instance /* 3B47FC E00B206C AFA20014 */ sw $v0, 0x14($sp) /* 3B4800 E00B2070 240401E4 */ addiu $a0, $zero, 0x1e4 /* 3B4804 E00B2074 24030001 */ addiu $v1, $zero, 1 /* 3B4808 E00B2078 0040882D */ daddu $s1, $v0, $zero -/* 3B480C E00B207C 0C08012C */ jal func_E02004B0 +/* 3B480C E00B207C 0C08012C */ jal shim_general_heap_malloc /* 3B4810 E00B2080 AE230008 */ sw $v1, 8($s1) /* 3B4814 E00B2084 0040182D */ daddu $v1, $v0, $zero /* 3B4818 E00B2088 14600003 */ bnez $v1, .LE00B2098 diff --git a/ver/us/asm/nonmatchings/effects/effect_9/func_E0012000.s b/ver/us/asm/nonmatchings/effects/effect_9/func_E0012000.s index e8baf6c620..9bc47ad13a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_9/func_E0012000.s +++ b/ver/us/asm/nonmatchings/effects/effect_9/func_E0012000.s @@ -16,49 +16,49 @@ glabel func_E0012000 /* 32DD3C E001202C 8E250024 */ lw $a1, 0x24($s1) /* 32DD40 E0012030 4406B000 */ mfc1 $a2, $f22 /* 32DD44 E0012034 4407A000 */ mfc1 $a3, $f20 -/* 32DD48 E0012038 0C080104 */ jal func_E0200410 +/* 32DD48 E0012038 0C080104 */ jal shim_guRotateF /* 32DD4C E001203C 27A40018 */ addiu $a0, $sp, 0x18 /* 32DD50 E0012040 27B00058 */ addiu $s0, $sp, 0x58 /* 32DD54 E0012044 E7B60010 */ swc1 $f22, 0x10($sp) /* 32DD58 E0012048 8E25002C */ lw $a1, 0x2c($s1) /* 32DD5C E001204C 4406A000 */ mfc1 $a2, $f20 /* 32DD60 E0012050 4407A000 */ mfc1 $a3, $f20 -/* 32DD64 E0012054 0C080104 */ jal func_E0200410 +/* 32DD64 E0012054 0C080104 */ jal shim_guRotateF /* 32DD68 E0012058 0200202D */ daddu $a0, $s0, $zero /* 32DD6C E001205C 0200202D */ daddu $a0, $s0, $zero /* 32DD70 E0012060 27A50018 */ addiu $a1, $sp, 0x18 -/* 32DD74 E0012064 0C080114 */ jal func_E0200450 +/* 32DD74 E0012064 0C080114 */ jal shim_guMtxCatF /* 32DD78 E0012068 00A0302D */ daddu $a2, $a1, $zero /* 32DD7C E001206C E7B40010 */ swc1 $f20, 0x10($sp) /* 32DD80 E0012070 8E250028 */ lw $a1, 0x28($s1) /* 32DD84 E0012074 4406A000 */ mfc1 $a2, $f20 /* 32DD88 E0012078 4407B000 */ mfc1 $a3, $f22 -/* 32DD8C E001207C 0C080104 */ jal func_E0200410 +/* 32DD8C E001207C 0C080104 */ jal shim_guRotateF /* 32DD90 E0012080 0200202D */ daddu $a0, $s0, $zero /* 32DD94 E0012084 27A40018 */ addiu $a0, $sp, 0x18 /* 32DD98 E0012088 0200282D */ daddu $a1, $s0, $zero -/* 32DD9C E001208C 0C080114 */ jal func_E0200450 +/* 32DD9C E001208C 0C080114 */ jal shim_guMtxCatF /* 32DDA0 E0012090 0080302D */ daddu $a2, $a0, $zero /* 32DDA4 E0012094 8E250018 */ lw $a1, 0x18($s1) /* 32DDA8 E0012098 8E26001C */ lw $a2, 0x1c($s1) /* 32DDAC E001209C 8E270020 */ lw $a3, 0x20($s1) -/* 32DDB0 E00120A0 0C080110 */ jal func_E0200440 +/* 32DDB0 E00120A0 0C080110 */ jal shim_guScaleF /* 32DDB4 E00120A4 0200202D */ daddu $a0, $s0, $zero /* 32DDB8 E00120A8 0200202D */ daddu $a0, $s0, $zero /* 32DDBC E00120AC 27A50018 */ addiu $a1, $sp, 0x18 -/* 32DDC0 E00120B0 0C080114 */ jal func_E0200450 +/* 32DDC0 E00120B0 0C080114 */ jal shim_guMtxCatF /* 32DDC4 E00120B4 00A0302D */ daddu $a2, $a1, $zero /* 32DDC8 E00120B8 8E25000C */ lw $a1, 0xc($s1) /* 32DDCC E00120BC 8E260010 */ lw $a2, 0x10($s1) /* 32DDD0 E00120C0 8E270014 */ lw $a3, 0x14($s1) -/* 32DDD4 E00120C4 0C080108 */ jal func_E0200420 +/* 32DDD4 E00120C4 0C080108 */ jal shim_guTranslateF /* 32DDD8 E00120C8 0200202D */ daddu $a0, $s0, $zero /* 32DDDC E00120CC 27A40018 */ addiu $a0, $sp, 0x18 /* 32DDE0 E00120D0 0200282D */ daddu $a1, $s0, $zero -/* 32DDE4 E00120D4 0C080114 */ jal func_E0200450 +/* 32DDE4 E00120D4 0C080114 */ jal shim_guMtxCatF /* 32DDE8 E00120D8 0080302D */ daddu $a2, $a0, $zero /* 32DDEC E00120DC 27A40018 */ addiu $a0, $sp, 0x18 -/* 32DDF0 E00120E0 0C080118 */ jal func_E0200460 +/* 32DDF0 E00120E0 0C080118 */ jal shim_guMtxF2L /* 32DDF4 E00120E4 26250030 */ addiu $a1, $s1, 0x30 /* 32DDF8 E00120E8 8FBF00A0 */ lw $ra, 0xa0($sp) /* 32DDFC E00120EC 8FB1009C */ lw $s1, 0x9c($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_9/func_E0012448.s b/ver/us/asm/nonmatchings/effects/effect_9/func_E0012448.s index ddb5b8517b..ca956db06b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_9/func_E0012448.s +++ b/ver/us/asm/nonmatchings/effects/effect_9/func_E0012448.s @@ -44,7 +44,7 @@ glabel func_E0012448 .LE00124D4: /* 32E1E4 E00124D4 16600003 */ bnez $s3, .LE00124E4 /* 32E1E8 E00124D8 00000000 */ nop -/* 32E1EC E00124DC 0C080128 */ jal func_E02004A0 +/* 32E1EC E00124DC 0C080128 */ jal shim_remove_effect /* 32E1F0 E00124E0 0280202D */ daddu $a0, $s4, $zero .LE00124E4: /* 32E1F4 E00124E4 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_9/func_E0012504.s b/ver/us/asm/nonmatchings/effects/effect_9/func_E0012504.s index 7d0f3ef594..80f59e4da8 100644 --- a/ver/us/asm/nonmatchings/effects/effect_9/func_E0012504.s +++ b/ver/us/asm/nonmatchings/effects/effect_9/func_E0012504.s @@ -11,7 +11,7 @@ glabel func_E0012504 /* 32E22C E001251C 27A40010 */ addiu $a0, $sp, 0x10 /* 32E230 E0012520 AFBF0020 */ sw $ra, 0x20($sp) /* 32E234 E0012524 AFA00014 */ sw $zero, 0x14($sp) -/* 32E238 E0012528 0C080120 */ jal func_E0200480 +/* 32E238 E0012528 0C080120 */ jal shim_queue_render_task /* 32E23C E001252C AFA20010 */ sw $v0, 0x10($sp) /* 32E240 E0012530 8C430000 */ lw $v1, ($v0) /* 32E244 E0012534 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_9/func_E0012548.s b/ver/us/asm/nonmatchings/effects/effect_9/func_E0012548.s index 9dc9201234..e7829bb438 100644 --- a/ver/us/asm/nonmatchings/effects/effect_9/func_E0012548.s +++ b/ver/us/asm/nonmatchings/effects/effect_9/func_E0012548.s @@ -4,7 +4,7 @@ glabel func_E0012548 /* 32E258 E0012548 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 32E25C E001254C AFBF0010 */ sw $ra, 0x10($sp) -/* 32E260 E0012550 0C080128 */ jal func_E02004A0 +/* 32E260 E0012550 0C080128 */ jal shim_remove_effect /* 32E264 E0012554 00000000 */ nop /* 32E268 E0012558 8FBF0010 */ lw $ra, 0x10($sp) /* 32E26C E001255C 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_9/fx_9_main.s b/ver/us/asm/nonmatchings/effects/effect_9/fx_9_main.s index 20efef6b7a..5f8f90e678 100644 --- a/ver/us/asm/nonmatchings/effects/effect_9/fx_9_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_9/fx_9_main.s @@ -34,12 +34,12 @@ glabel fx_9_main /* 32DF88 E0012278 AFA7007C */ sw $a3, 0x7c($sp) /* 32DF8C E001227C AFA00010 */ sw $zero, 0x10($sp) /* 32DF90 E0012280 AFA00024 */ sw $zero, 0x24($sp) -/* 32DF94 E0012284 0C080124 */ jal func_E0200490 +/* 32DF94 E0012284 0C080124 */ jal shim_create_effect_instance /* 32DF98 E0012288 AFA20014 */ sw $v0, 0x14($sp) /* 32DF9C E001228C 24040098 */ addiu $a0, $zero, 0x98 /* 32DFA0 E0012290 24130001 */ addiu $s3, $zero, 1 /* 32DFA4 E0012294 0040802D */ daddu $s0, $v0, $zero -/* 32DFA8 E0012298 0C08012C */ jal func_E02004B0 +/* 32DFA8 E0012298 0C08012C */ jal shim_general_heap_malloc /* 32DFAC E001229C AE130008 */ sw $s3, 8($s0) /* 32DFB0 E00122A0 0040882D */ daddu $s1, $v0, $zero /* 32DFB4 E00122A4 16200003 */ bnez $s1, .LE00122B4 @@ -53,7 +53,7 @@ glabel fx_9_main /* 32DFCC E00122BC 00B32821 */ addu $a1, $a1, $s3 /* 32DFD0 E00122C0 00052880 */ sll $a1, $a1, 2 /* 32DFD4 E00122C4 00B32823 */ subu $a1, $a1, $s3 -/* 32DFD8 E00122C8 0C080130 */ jal func_E02004C0 +/* 32DFD8 E00122C8 0C080130 */ jal shim_mem_clear /* 32DFDC E00122CC 000528C0 */ sll $a1, $a1, 3 /* 32DFE0 E00122D0 0000902D */ daddu $s2, $zero, $zero /* 32DFE4 E00122D4 0253102A */ slt $v0, $s2, $s3 @@ -111,7 +111,7 @@ glabel fx_9_main /* 32E0A8 E0012398 AE00FF98 */ sw $zero, -0x68($s0) /* 32E0AC E001239C E600FFEC */ swc1 $f0, -0x14($s0) /* 32E0B0 E00123A0 E602FFF0 */ swc1 $f2, -0x10($s0) -/* 32E0B4 E00123A4 0C080138 */ jal func_E02004E0 +/* 32E0B4 E00123A4 0C080138 */ jal shim_rand_int /* 32E0B8 E00123A8 E604FFF4 */ swc1 $f4, -0xc($s0) /* 32E0BC E00123AC 00021103 */ sra $v0, $v0, 4 /* 32E0C0 E00123B0 30420001 */ andi $v0, $v0, 1 @@ -123,13 +123,13 @@ glabel fx_9_main /* 32E0D8 E00123C8 3C01C2B4 */ lui $at, 0xc2b4 /* 32E0DC E00123CC 44810000 */ mtc1 $at, $f0 .LE00123D0: -/* 32E0E0 E00123D0 0C08013C */ jal func_E02004F0 +/* 32E0E0 E00123D0 0C08013C */ jal shim_clamp_angle /* 32E0E4 E00123D4 4600D300 */ add.s $f12, $f26, $f0 /* 32E0E8 E00123D8 46000506 */ mov.s $f20, $f0 -/* 32E0EC E00123DC 0C080140 */ jal func_E0200500 +/* 32E0EC E00123DC 0C080140 */ jal shim_sin_deg /* 32E0F0 E00123E0 4600A306 */ mov.s $f12, $f20 /* 32E0F4 E00123E4 4600A306 */ mov.s $f12, $f20 -/* 32E0F8 E00123E8 0C080144 */ jal func_E0200510 +/* 32E0F8 E00123E8 0C080144 */ jal shim_cos_deg /* 32E0FC E00123EC E600FFFC */ swc1 $f0, -4($s0) /* 32E100 E00123F0 26520001 */ addiu $s2, $s2, 1 /* 32E104 E00123F4 E6000000 */ swc1 $f0, ($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_90/func_E00B413C.s b/ver/us/asm/nonmatchings/effects/effect_90/func_E00B413C.s index 4552f4541d..fe29464608 100644 --- a/ver/us/asm/nonmatchings/effects/effect_90/func_E00B413C.s +++ b/ver/us/asm/nonmatchings/effects/effect_90/func_E00B413C.s @@ -52,7 +52,7 @@ glabel func_E00B413C /* 3B5ED4 E00B41E4 24020001 */ addiu $v0, $zero, 1 /* 3B5ED8 E00B41E8 1482001A */ bne $a0, $v0, .LE00B4254 /* 3B5EDC E00B41EC 00000000 */ nop -/* 3B5EE0 E00B41F0 0C080150 */ jal func_E0200540 +/* 3B5EE0 E00B41F0 0C080150 */ jal shim_load_effect /* 3B5EE4 E00B41F4 2404005F */ addiu $a0, $zero, 0x5f /* 3B5EE8 E00B41F8 C6200008 */ lwc1 $f0, 8($s1) /* 3B5EEC E00B41FC 3C0141C0 */ lui $at, 0x41c0 @@ -78,7 +78,7 @@ glabel func_E00B413C /* 3B5F3C E00B424C 0C02F800 */ jal fx_95_main /* 3B5F40 E00B4250 24040001 */ addiu $a0, $zero, 1 .LE00B4254: -/* 3B5F44 E00B4254 0C080128 */ jal func_E02004A0 +/* 3B5F44 E00B4254 0C080128 */ jal shim_remove_effect /* 3B5F48 E00B4258 0240202D */ daddu $a0, $s2, $zero /* 3B5F4C E00B425C 0802D141 */ j .LE00B4504 /* 3B5F50 E00B4260 00000000 */ nop @@ -111,7 +111,7 @@ glabel func_E00B413C /* 3B5FA8 E00B42B8 00501021 */ addu $v0, $v0, $s0 /* 3B5FAC E00B42BC 44826000 */ mtc1 $v0, $f12 /* 3B5FB0 E00B42C0 00000000 */ nop -/* 3B5FB4 E00B42C4 0C080140 */ jal func_E0200500 +/* 3B5FB4 E00B42C4 0C080140 */ jal shim_sin_deg /* 3B5FB8 E00B42C8 46806320 */ cvt.s.w $f12, $f12 /* 3B5FBC E00B42CC 4490A000 */ mtc1 $s0, $f20 /* 3B5FC0 E00B42D0 00000000 */ nop @@ -136,16 +136,16 @@ glabel func_E00B413C /* 3B600C E00B431C 00000000 */ nop /* 3B6010 E00B4320 46020000 */ add.s $f0, $f0, $f2 /* 3B6014 E00B4324 4600038D */ trunc.w.s $f14, $f0 -/* 3B6018 E00B4328 0C080140 */ jal func_E0200500 +/* 3B6018 E00B4328 0C080140 */ jal shim_sin_deg /* 3B601C E00B432C E62E001C */ swc1 $f14, 0x1c($s1) /* 3B6020 E00B4330 4600A306 */ mov.s $f12, $f20 -/* 3B6024 E00B4334 0C080140 */ jal func_E0200500 +/* 3B6024 E00B4334 0C080140 */ jal shim_sin_deg /* 3B6028 E00B4338 46000586 */ mov.s $f22, $f0 /* 3B602C E00B433C 4614A300 */ add.s $f12, $f20, $f20 -/* 3B6030 E00B4340 0C080144 */ jal func_E0200510 +/* 3B6030 E00B4340 0C080144 */ jal shim_cos_deg /* 3B6034 E00B4344 46000686 */ mov.s $f26, $f0 /* 3B6038 E00B4348 4600A306 */ mov.s $f12, $f20 -/* 3B603C E00B434C 0C080144 */ jal func_E0200510 +/* 3B603C E00B434C 0C080144 */ jal shim_cos_deg /* 3B6040 E00B4350 46000506 */ mov.s $f20, $f0 /* 3B6044 E00B4354 4618B582 */ mul.s $f22, $f22, $f24 /* 3B6048 E00B4358 00000000 */ nop @@ -188,7 +188,7 @@ glabel func_E00B413C /* 3B60D4 E00B43E4 3C014370 */ lui $at, 0x4370 /* 3B60D8 E00B43E8 44810000 */ mtc1 $at, $f0 /* 3B60DC E00B43EC AE000038 */ sw $zero, 0x38($s0) -/* 3B60E0 E00B43F0 0C080138 */ jal func_E02004E0 +/* 3B60E0 E00B43F0 0C080138 */ jal shim_rand_int /* 3B60E4 E00B43F4 E6000048 */ swc1 $f0, 0x48($s0) /* 3B60E8 E00B43F8 2442FFFB */ addiu $v0, $v0, -5 /* 3B60EC E00B43FC 3C01E00B */ lui $at, %hi(D_E00B4EE0) @@ -200,14 +200,14 @@ glabel func_E00B413C /* 3B6104 E00B4414 00000000 */ nop /* 3B6108 E00B4418 2404000A */ addiu $a0, $zero, 0xa /* 3B610C E00B441C 46200020 */ cvt.s.d $f0, $f0 -/* 3B6110 E00B4420 0C080138 */ jal func_E02004E0 +/* 3B6110 E00B4420 0C080138 */ jal shim_rand_int /* 3B6114 E00B4424 E6000058 */ swc1 $f0, 0x58($s0) /* 3B6118 E00B4428 2404000A */ addiu $a0, $zero, 0xa /* 3B611C E00B442C 24420002 */ addiu $v0, $v0, 2 /* 3B6120 E00B4430 44820000 */ mtc1 $v0, $f0 /* 3B6124 E00B4434 00000000 */ nop /* 3B6128 E00B4438 46800020 */ cvt.s.w $f0, $f0 -/* 3B612C E00B443C 0C080138 */ jal func_E02004E0 +/* 3B612C E00B443C 0C080138 */ jal shim_rand_int /* 3B6130 E00B4440 E6000068 */ swc1 $f0, 0x68($s0) /* 3B6134 E00B4444 24420001 */ addiu $v0, $v0, 1 /* 3B6138 E00B4448 44820000 */ mtc1 $v0, $f0 @@ -250,7 +250,7 @@ glabel func_E00B413C /* 3B61C8 E00B44D8 46202120 */ cvt.s.d $f4, $f4 /* 3B61CC E00B44DC 45000005 */ bc1f .LE00B44F4 /* 3B61D0 E00B44E0 E6040068 */ swc1 $f4, 0x68($s0) -/* 3B61D4 E00B44E4 0C080138 */ jal func_E02004E0 +/* 3B61D4 E00B44E4 0C080138 */ jal shim_rand_int /* 3B61D8 E00B44E8 2404000A */ addiu $a0, $zero, 0xa /* 3B61DC E00B44EC 00021027 */ nor $v0, $zero, $v0 /* 3B61E0 E00B44F0 AE020088 */ sw $v0, 0x88($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_90/func_E00B452C.s b/ver/us/asm/nonmatchings/effects/effect_90/func_E00B452C.s index 61caa15a19..ac01abb2bf 100644 --- a/ver/us/asm/nonmatchings/effects/effect_90/func_E00B452C.s +++ b/ver/us/asm/nonmatchings/effects/effect_90/func_E00B452C.s @@ -12,7 +12,7 @@ glabel func_E00B452C /* 3B6238 E00B4548 AFA40018 */ sw $a0, 0x18($sp) /* 3B623C E00B454C 27A40010 */ addiu $a0, $sp, 0x10 /* 3B6240 E00B4550 AFBF0020 */ sw $ra, 0x20($sp) -/* 3B6244 E00B4554 0C080120 */ jal func_E0200480 +/* 3B6244 E00B4554 0C080120 */ jal shim_queue_render_task /* 3B6248 E00B4558 AFA20010 */ sw $v0, 0x10($sp) /* 3B624C E00B455C 8C430000 */ lw $v1, ($v0) /* 3B6250 E00B4560 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_90/func_E00B457C.s b/ver/us/asm/nonmatchings/effects/effect_90/func_E00B457C.s index df019e3662..65252dac3d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_90/func_E00B457C.s +++ b/ver/us/asm/nonmatchings/effects/effect_90/func_E00B457C.s @@ -53,7 +53,7 @@ glabel func_E00B457C /* 3B632C E00B463C 8DA60008 */ lw $a2, 8($t5) /* 3B6330 E00B4640 8DA7000C */ lw $a3, 0xc($t5) /* 3B6334 E00B4644 25080008 */ addiu $t0, $t0, 8 -/* 3B6338 E00B4648 0C080108 */ jal func_E0200420 +/* 3B6338 E00B4648 0C080108 */ jal shim_guTranslateF /* 3B633C E00B464C AE280000 */ sw $t0, ($s1) /* 3B6340 E00B4650 27A40020 */ addiu $a0, $sp, 0x20 /* 3B6344 E00B4654 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -64,7 +64,7 @@ glabel func_E00B457C /* 3B6358 E00B4668 8E420000 */ lw $v0, ($s2) /* 3B635C E00B466C 00052980 */ sll $a1, $a1, 6 /* 3B6360 E00B4670 00B32821 */ addu $a1, $a1, $s3 -/* 3B6364 E00B4674 0C080118 */ jal func_E0200460 +/* 3B6364 E00B4674 0C080118 */ jal shim_guMtxF2L /* 3B6368 E00B4678 00452821 */ addu $a1, $v0, $a1 /* 3B636C E00B467C 3C02DA38 */ lui $v0, 0xda38 /* 3B6370 E00B4680 8E240000 */ lw $a0, ($s1) @@ -140,7 +140,7 @@ glabel func_E00B457C /* 3B6484 E00B4794 02021021 */ addu $v0, $s0, $v0 /* 3B6488 E00B4798 44826000 */ mtc1 $v0, $f12 /* 3B648C E00B479C 00000000 */ nop -/* 3B6490 E00B47A0 0C080140 */ jal func_E0200500 +/* 3B6490 E00B47A0 0C080140 */ jal shim_sin_deg /* 3B6494 E00B47A4 46806320 */ cvt.s.w $f12, $f12 /* 3B6498 E00B47A8 3C014120 */ lui $at, 0x4120 /* 3B649C E00B47AC 44813000 */ mtc1 $at, $f6 @@ -166,7 +166,7 @@ glabel func_E00B457C /* 3B64EC E00B47FC 02021021 */ addu $v0, $s0, $v0 /* 3B64F0 E00B4800 44826000 */ mtc1 $v0, $f12 /* 3B64F4 E00B4804 00000000 */ nop -/* 3B64F8 E00B4808 0C080140 */ jal func_E0200500 +/* 3B64F8 E00B4808 0C080140 */ jal shim_sin_deg /* 3B64FC E00B480C 46806320 */ cvt.s.w $f12, $f12 /* 3B6500 E00B4810 3C0142C8 */ lui $at, 0x42c8 /* 3B6504 E00B4814 44813000 */ mtc1 $at, $f6 @@ -192,7 +192,7 @@ glabel func_E00B457C /* 3B6554 E00B4864 02021021 */ addu $v0, $s0, $v0 /* 3B6558 E00B4868 44826000 */ mtc1 $v0, $f12 /* 3B655C E00B486C 00000000 */ nop -/* 3B6560 E00B4870 0C080140 */ jal func_E0200500 +/* 3B6560 E00B4870 0C080140 */ jal shim_sin_deg /* 3B6564 E00B4874 46806320 */ cvt.s.w $f12, $f12 /* 3B6568 E00B4878 3C0141A0 */ lui $at, 0x41a0 /* 3B656C E00B487C 44813000 */ mtc1 $at, $f6 @@ -252,14 +252,14 @@ glabel func_E00B457C /* 3B6640 E00B4950 44050000 */ mfc1 $a1, $f0 /* 3B6644 E00B4954 8FB100A0 */ lw $s1, 0xa0($sp) /* 3B6648 E00B4958 00A0302D */ daddu $a2, $a1, $zero -/* 3B664C E00B495C 0C080110 */ jal func_E0200440 +/* 3B664C E00B495C 0C080110 */ jal shim_guScaleF /* 3B6650 E00B4960 00A0382D */ daddu $a3, $a1, $zero /* 3B6654 E00B4964 27A40020 */ addiu $a0, $sp, 0x20 /* 3B6658 E00B4968 96650000 */ lhu $a1, ($s3) /* 3B665C E00B496C 8EA20000 */ lw $v0, ($s5) /* 3B6660 E00B4970 00052980 */ sll $a1, $a1, 6 /* 3B6664 E00B4974 00B02821 */ addu $a1, $a1, $s0 -/* 3B6668 E00B4978 0C080118 */ jal func_E0200460 +/* 3B6668 E00B4978 0C080118 */ jal shim_guMtxF2L /* 3B666C E00B497C 00452821 */ addu $a1, $v0, $a1 /* 3B6670 E00B4980 3C02800A */ lui $v0, %hi(gMasterGfxPos) /* 3B6674 E00B4984 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) @@ -317,14 +317,14 @@ glabel func_E00B457C /* 3B6740 E00B4A50 C6200048 */ lwc1 $f0, 0x48($s1) /* 3B6744 E00B4A54 27A40020 */ addiu $a0, $sp, 0x20 /* 3B6748 E00B4A58 E7B4001C */ swc1 $f20, 0x1c($sp) -/* 3B674C E00B4A5C 0C080180 */ jal func_E0200600 +/* 3B674C E00B4A5C 0C080180 */ jal shim_guPositionF /* 3B6750 E00B4A60 E7A00018 */ swc1 $f0, 0x18($sp) /* 3B6754 E00B4A64 27A40020 */ addiu $a0, $sp, 0x20 /* 3B6758 E00B4A68 96650000 */ lhu $a1, ($s3) /* 3B675C E00B4A6C 8EA20000 */ lw $v0, ($s5) /* 3B6760 E00B4A70 00052980 */ sll $a1, $a1, 6 /* 3B6764 E00B4A74 00B42821 */ addu $a1, $a1, $s4 -/* 3B6768 E00B4A78 0C080118 */ jal func_E0200460 +/* 3B6768 E00B4A78 0C080118 */ jal shim_guMtxF2L /* 3B676C E00B4A7C 00452821 */ addu $a1, $v0, $a1 /* 3B6770 E00B4A80 3C06D838 */ lui $a2, 0xd838 /* 3B6774 E00B4A84 8E440000 */ lw $a0, ($s2) diff --git a/ver/us/asm/nonmatchings/effects/effect_90/fx_90_main.s b/ver/us/asm/nonmatchings/effects/effect_90/fx_90_main.s index f36eaeb51a..d6e03574ab 100644 --- a/ver/us/asm/nonmatchings/effects/effect_90/fx_90_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_90/fx_90_main.s @@ -28,12 +28,12 @@ glabel fx_90_main /* 3B5D4C E00B405C AFB00028 */ sw $s0, 0x28($sp) /* 3B5D50 E00B4060 AFA00010 */ sw $zero, 0x10($sp) /* 3B5D54 E00B4064 AFA00024 */ sw $zero, 0x24($sp) -/* 3B5D58 E00B4068 0C080124 */ jal func_E0200490 +/* 3B5D58 E00B4068 0C080124 */ jal shim_create_effect_instance /* 3B5D5C E00B406C AFA20014 */ sw $v0, 0x14($sp) /* 3B5D60 E00B4070 24040098 */ addiu $a0, $zero, 0x98 /* 3B5D64 E00B4074 24030001 */ addiu $v1, $zero, 1 /* 3B5D68 E00B4078 0040802D */ daddu $s0, $v0, $zero -/* 3B5D6C E00B407C 0C08012C */ jal func_E02004B0 +/* 3B5D6C E00B407C 0C08012C */ jal shim_general_heap_malloc /* 3B5D70 E00B4080 AE030008 */ sw $v1, 8($s0) /* 3B5D74 E00B4084 0040182D */ daddu $v1, $v0, $zero /* 3B5D78 E00B4088 14600003 */ bnez $v1, .LE00B4098 diff --git a/ver/us/asm/nonmatchings/effects/effect_91/func_E00B6180.s b/ver/us/asm/nonmatchings/effects/effect_91/func_E00B6180.s index ef3d4ad60a..d9490fce86 100644 --- a/ver/us/asm/nonmatchings/effects/effect_91/func_E00B6180.s +++ b/ver/us/asm/nonmatchings/effects/effect_91/func_E00B6180.s @@ -25,7 +25,7 @@ glabel func_E00B6180 /* 3B7328 E00B61C8 24460001 */ addiu $a2, $v0, 1 /* 3B732C E00B61CC 04610005 */ bgez $v1, .LE00B61E4 /* 3B7330 E00B61D0 ACA60014 */ sw $a2, 0x14($a1) -/* 3B7334 E00B61D4 0C080128 */ jal func_E02004A0 +/* 3B7334 E00B61D4 0C080128 */ jal shim_remove_effect /* 3B7338 E00B61D8 00000000 */ nop /* 3B733C E00B61DC 0802D8A4 */ j .LE00B6290 /* 3B7340 E00B61E0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_91/func_E00B629C.s b/ver/us/asm/nonmatchings/effects/effect_91/func_E00B629C.s index e8ea74a651..9e521461ab 100644 --- a/ver/us/asm/nonmatchings/effects/effect_91/func_E00B629C.s +++ b/ver/us/asm/nonmatchings/effects/effect_91/func_E00B629C.s @@ -12,7 +12,7 @@ glabel func_E00B629C /* 3B7418 E00B62B8 AFA40018 */ sw $a0, 0x18($sp) /* 3B741C E00B62BC 27A40010 */ addiu $a0, $sp, 0x10 /* 3B7420 E00B62C0 AFBF0020 */ sw $ra, 0x20($sp) -/* 3B7424 E00B62C4 0C080120 */ jal func_E0200480 +/* 3B7424 E00B62C4 0C080120 */ jal shim_queue_render_task /* 3B7428 E00B62C8 AFA20010 */ sw $v0, 0x10($sp) /* 3B742C E00B62CC 8FBF0020 */ lw $ra, 0x20($sp) /* 3B7430 E00B62D0 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_91/func_E00B62E0.s b/ver/us/asm/nonmatchings/effects/effect_91/func_E00B62E0.s index 423152a353..deb68693b0 100644 --- a/ver/us/asm/nonmatchings/effects/effect_91/func_E00B62E0.s +++ b/ver/us/asm/nonmatchings/effects/effect_91/func_E00B62E0.s @@ -60,17 +60,17 @@ glabel func_E00B62E0 /* 3B751C E00B63BC 02228821 */ addu $s1, $s1, $v0 /* 3B7520 E00B63C0 001188C0 */ sll $s1, $s1, 3 /* 3B7524 E00B63C4 02238821 */ addu $s1, $s1, $v1 -/* 3B7528 E00B63C8 0C080108 */ jal func_E0200420 +/* 3B7528 E00B63C8 0C080108 */ jal shim_guTranslateF /* 3B752C E00B63CC 4620A520 */ cvt.s.d $f20, $f20 /* 3B7530 E00B63D0 27B00050 */ addiu $s0, $sp, 0x50 /* 3B7534 E00B63D4 4405A000 */ mfc1 $a1, $f20 /* 3B7538 E00B63D8 0200202D */ daddu $a0, $s0, $zero /* 3B753C E00B63DC 00A0302D */ daddu $a2, $a1, $zero -/* 3B7540 E00B63E0 0C080110 */ jal func_E0200440 +/* 3B7540 E00B63E0 0C080110 */ jal shim_guScaleF /* 3B7544 E00B63E4 00A0382D */ daddu $a3, $a1, $zero /* 3B7548 E00B63E8 0200202D */ daddu $a0, $s0, $zero /* 3B754C E00B63EC 27A50010 */ addiu $a1, $sp, 0x10 -/* 3B7550 E00B63F0 0C080114 */ jal func_E0200450 +/* 3B7550 E00B63F0 0C080114 */ jal shim_guMtxCatF /* 3B7554 E00B63F4 00A0302D */ daddu $a2, $a1, $zero /* 3B7558 E00B63F8 27A40010 */ addiu $a0, $sp, 0x10 /* 3B755C E00B63FC 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -81,7 +81,7 @@ glabel func_E00B62E0 /* 3B7570 E00B6410 8E820000 */ lw $v0, ($s4) /* 3B7574 E00B6414 00052980 */ sll $a1, $a1, 6 /* 3B7578 E00B6418 00B62821 */ addu $a1, $a1, $s6 -/* 3B757C E00B641C 0C080118 */ jal func_E0200460 +/* 3B757C E00B641C 0C080118 */ jal shim_guMtxF2L /* 3B7580 E00B6420 00452821 */ addu $a1, $v0, $a1 /* 3B7584 E00B6424 3C03DA38 */ lui $v1, 0xda38 /* 3B7588 E00B6428 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_91/fx_91_main.s b/ver/us/asm/nonmatchings/effects/effect_91/fx_91_main.s index 6b7c80bcce..7e209cd39f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_91/fx_91_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_91/fx_91_main.s @@ -30,12 +30,12 @@ glabel fx_91_main /* 3B71C4 E00B6064 F7B40038 */ sdc1 $f20, 0x38($sp) /* 3B71C8 E00B6068 AFA00010 */ sw $zero, 0x10($sp) /* 3B71CC E00B606C AFA00024 */ sw $zero, 0x24($sp) -/* 3B71D0 E00B6070 0C080124 */ jal func_E0200490 +/* 3B71D0 E00B6070 0C080124 */ jal shim_create_effect_instance /* 3B71D4 E00B6074 AFA20014 */ sw $v0, 0x14($sp) /* 3B71D8 E00B6078 2404008C */ addiu $a0, $zero, 0x8c /* 3B71DC E00B607C 24030001 */ addiu $v1, $zero, 1 /* 3B71E0 E00B6080 0040902D */ daddu $s2, $v0, $zero -/* 3B71E4 E00B6084 0C08012C */ jal func_E02004B0 +/* 3B71E4 E00B6084 0C08012C */ jal shim_general_heap_malloc /* 3B71E8 E00B6088 AE430008 */ sw $v1, 8($s2) /* 3B71EC E00B608C 0040182D */ daddu $v1, $v0, $zero /* 3B71F0 E00B6090 14600003 */ bnez $v1, .LE00B60A0 @@ -74,7 +74,7 @@ glabel fx_91_main /* 3B7264 E00B6104 E6000028 */ swc1 $f0, 0x28($s0) .LE00B6108: /* 3B7268 E00B6108 2404000A */ addiu $a0, $zero, 0xa -/* 3B726C E00B610C 0C080138 */ jal func_E02004E0 +/* 3B726C E00B610C 0C080138 */ jal shim_rand_int /* 3B7270 E00B6110 AE00002C */ sw $zero, 0x2c($s0) /* 3B7274 E00B6114 44820000 */ mtc1 $v0, $f0 /* 3B7278 E00B6118 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_92/func_E00B8134.s b/ver/us/asm/nonmatchings/effects/effect_92/func_E00B8134.s index 6be11b7228..e65bab3490 100644 --- a/ver/us/asm/nonmatchings/effects/effect_92/func_E00B8134.s +++ b/ver/us/asm/nonmatchings/effects/effect_92/func_E00B8134.s @@ -25,7 +25,7 @@ glabel func_E00B8134 /* 3B7CFC E00B817C 24450001 */ addiu $a1, $v0, 1 /* 3B7D00 E00B8180 04610005 */ bgez $v1, .LE00B8198 /* 3B7D04 E00B8184 ACC50014 */ sw $a1, 0x14($a2) -/* 3B7D08 E00B8188 0C080128 */ jal func_E02004A0 +/* 3B7D08 E00B8188 0C080128 */ jal shim_remove_effect /* 3B7D0C E00B818C 00000000 */ nop /* 3B7D10 E00B8190 0802E06B */ j .LE00B81AC /* 3B7D14 E00B8194 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_92/func_E00B81B8.s b/ver/us/asm/nonmatchings/effects/effect_92/func_E00B81B8.s index ab0f77fcba..7ec6157536 100644 --- a/ver/us/asm/nonmatchings/effects/effect_92/func_E00B81B8.s +++ b/ver/us/asm/nonmatchings/effects/effect_92/func_E00B81B8.s @@ -12,7 +12,7 @@ glabel func_E00B81B8 /* 3B7D54 E00B81D4 AFA40018 */ sw $a0, 0x18($sp) /* 3B7D58 E00B81D8 27A40010 */ addiu $a0, $sp, 0x10 /* 3B7D5C E00B81DC AFBF0020 */ sw $ra, 0x20($sp) -/* 3B7D60 E00B81E0 0C080120 */ jal func_E0200480 +/* 3B7D60 E00B81E0 0C080120 */ jal shim_queue_render_task /* 3B7D64 E00B81E4 AFA20010 */ sw $v0, 0x10($sp) /* 3B7D68 E00B81E8 8C430000 */ lw $v1, ($v0) /* 3B7D6C E00B81EC 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_92/func_E00B8208.s b/ver/us/asm/nonmatchings/effects/effect_92/func_E00B8208.s index ed95b82e31..88068c246c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_92/func_E00B8208.s +++ b/ver/us/asm/nonmatchings/effects/effect_92/func_E00B8208.s @@ -81,17 +81,17 @@ glabel func_E00B8208 /* 3B7EB0 E00B8330 8E660008 */ lw $a2, 8($s3) /* 3B7EB4 E00B8334 8E67000C */ lw $a3, 0xc($s3) /* 3B7EB8 E00B8338 25080008 */ addiu $t0, $t0, 8 -/* 3B7EBC E00B833C 0C080108 */ jal func_E0200420 +/* 3B7EBC E00B833C 0C080108 */ jal shim_guTranslateF /* 3B7EC0 E00B8340 AE880000 */ sw $t0, ($s4) /* 3B7EC4 E00B8344 27B50058 */ addiu $s5, $sp, 0x58 /* 3B7EC8 E00B8348 8E650034 */ lw $a1, 0x34($s3) /* 3B7ECC E00B834C 02A0202D */ daddu $a0, $s5, $zero /* 3B7ED0 E00B8350 00A0302D */ daddu $a2, $a1, $zero -/* 3B7ED4 E00B8354 0C080110 */ jal func_E0200440 +/* 3B7ED4 E00B8354 0C080110 */ jal shim_guScaleF /* 3B7ED8 E00B8358 00A0382D */ daddu $a3, $a1, $zero /* 3B7EDC E00B835C 02A0202D */ daddu $a0, $s5, $zero /* 3B7EE0 E00B8360 27A50018 */ addiu $a1, $sp, 0x18 -/* 3B7EE4 E00B8364 0C080114 */ jal func_E0200450 +/* 3B7EE4 E00B8364 0C080114 */ jal shim_guMtxCatF /* 3B7EE8 E00B8368 00A0302D */ daddu $a2, $a1, $zero /* 3B7EEC E00B836C 27A40018 */ addiu $a0, $sp, 0x18 /* 3B7EF0 E00B8370 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -102,7 +102,7 @@ glabel func_E00B8208 /* 3B7F04 E00B8384 8E220000 */ lw $v0, ($s1) /* 3B7F08 E00B8388 00052980 */ sll $a1, $a1, 6 /* 3B7F0C E00B838C 00B22821 */ addu $a1, $a1, $s2 -/* 3B7F10 E00B8390 0C080118 */ jal func_E0200460 +/* 3B7F10 E00B8390 0C080118 */ jal shim_guMtxF2L /* 3B7F14 E00B8394 00452821 */ addu $a1, $v0, $a1 /* 3B7F18 E00B8398 3C03DA38 */ lui $v1, 0xda38 /* 3B7F1C E00B839C 34630002 */ ori $v1, $v1, 2 @@ -141,23 +141,23 @@ glabel func_E00B8208 /* 3B7FA0 E00B8420 E7B40010 */ swc1 $f20, 0x10($sp) /* 3B7FA4 E00B8424 8E650038 */ lw $a1, 0x38($s3) /* 3B7FA8 E00B8428 25080010 */ addiu $t0, $t0, 0x10 -/* 3B7FAC E00B842C 0C080104 */ jal func_E0200410 +/* 3B7FAC E00B842C 0C080104 */ jal shim_guRotateF /* 3B7FB0 E00B8430 AE880000 */ sw $t0, ($s4) /* 3B7FB4 E00B8434 8E65003C */ lw $a1, 0x3c($s3) /* 3B7FB8 E00B8438 8E660040 */ lw $a2, 0x40($s3) /* 3B7FBC E00B843C 4407A000 */ mfc1 $a3, $f20 -/* 3B7FC0 E00B8440 0C080110 */ jal func_E0200440 +/* 3B7FC0 E00B8440 0C080110 */ jal shim_guScaleF /* 3B7FC4 E00B8444 02A0202D */ daddu $a0, $s5, $zero /* 3B7FC8 E00B8448 02A0202D */ daddu $a0, $s5, $zero /* 3B7FCC E00B844C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3B7FD0 E00B8450 0C080114 */ jal func_E0200450 +/* 3B7FD0 E00B8450 0C080114 */ jal shim_guMtxCatF /* 3B7FD4 E00B8454 00A0302D */ daddu $a2, $a1, $zero /* 3B7FD8 E00B8458 27A40018 */ addiu $a0, $sp, 0x18 /* 3B7FDC E00B845C 96050000 */ lhu $a1, ($s0) /* 3B7FE0 E00B8460 8E220000 */ lw $v0, ($s1) /* 3B7FE4 E00B8464 00052980 */ sll $a1, $a1, 6 /* 3B7FE8 E00B8468 00B22821 */ addu $a1, $a1, $s2 -/* 3B7FEC E00B846C 0C080118 */ jal func_E0200460 +/* 3B7FEC E00B846C 0C080118 */ jal shim_guMtxF2L /* 3B7FF0 E00B8470 00452821 */ addu $a1, $v0, $a1 /* 3B7FF4 E00B8474 8E850000 */ lw $a1, ($s4) /* 3B7FF8 E00B8478 00A0202D */ daddu $a0, $a1, $zero @@ -291,7 +291,7 @@ glabel func_E00B8208 /* 3B81E4 E00B8664 46802120 */ cvt.s.w $f4, $f4 /* 3B81E8 E00B8668 44052000 */ mfc1 $a1, $f4 /* 3B81EC E00B866C 44060000 */ mfc1 $a2, $f0 -/* 3B81F0 E00B8670 0C080108 */ jal func_E0200420 +/* 3B81F0 E00B8670 0C080108 */ jal shim_guTranslateF /* 3B81F4 E00B8674 27A40018 */ addiu $a0, $sp, 0x18 /* 3B81F8 E00B8678 8FAA00B4 */ lw $t2, 0xb4($sp) /* 3B81FC E00B867C 020A8021 */ addu $s0, $s0, $t2 @@ -314,11 +314,11 @@ glabel func_E00B8208 /* 3B8240 E00B86C0 44051000 */ mfc1 $a1, $f2 /* 3B8244 E00B86C4 46200020 */ cvt.s.d $f0, $f0 /* 3B8248 E00B86C8 44060000 */ mfc1 $a2, $f0 -/* 3B824C E00B86CC 0C080110 */ jal func_E0200440 +/* 3B824C E00B86CC 0C080110 */ jal shim_guScaleF /* 3B8250 E00B86D0 02A0202D */ daddu $a0, $s5, $zero /* 3B8254 E00B86D4 02A0202D */ daddu $a0, $s5, $zero /* 3B8258 E00B86D8 27A50018 */ addiu $a1, $sp, 0x18 -/* 3B825C E00B86DC 0C080114 */ jal func_E0200450 +/* 3B825C E00B86DC 0C080114 */ jal shim_guMtxCatF /* 3B8260 E00B86E0 00A0302D */ daddu $a2, $a1, $zero /* 3B8264 E00B86E4 86220006 */ lh $v0, 6($s1) /* 3B8268 E00B86E8 3C0AE00C */ lui $t2, %hi(D_E00B8CA4) @@ -337,11 +337,11 @@ glabel func_E00B8208 /* 3B829C E00B871C 4407A000 */ mfc1 $a3, $f20 /* 3B82A0 E00B8720 44051000 */ mfc1 $a1, $f2 /* 3B82A4 E00B8724 02A0202D */ daddu $a0, $s5, $zero -/* 3B82A8 E00B8728 0C080104 */ jal func_E0200410 +/* 3B82A8 E00B8728 0C080104 */ jal shim_guRotateF /* 3B82AC E00B872C E7B80010 */ swc1 $f24, 0x10($sp) /* 3B82B0 E00B8730 02A0202D */ daddu $a0, $s5, $zero /* 3B82B4 E00B8734 27A50018 */ addiu $a1, $sp, 0x18 -/* 3B82B8 E00B8738 0C080114 */ jal func_E0200450 +/* 3B82B8 E00B8738 0C080114 */ jal shim_guMtxCatF /* 3B82BC E00B873C 00A0302D */ daddu $a2, $a1, $zero /* 3B82C0 E00B8740 27A40018 */ addiu $a0, $sp, 0x18 /* 3B82C4 E00B8744 3C058007 */ lui $a1, %hi(gMatrixListPos) @@ -350,7 +350,7 @@ glabel func_E00B8208 /* 3B82D0 E00B8750 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3B82D4 E00B8754 00052980 */ sll $a1, $a1, 6 /* 3B82D8 E00B8758 00BE2821 */ addu $a1, $a1, $fp -/* 3B82DC E00B875C 0C080118 */ jal func_E0200460 +/* 3B82DC E00B875C 0C080118 */ jal shim_guMtxF2L /* 3B82E0 E00B8760 00452821 */ addu $a1, $v0, $a1 /* 3B82E4 E00B8764 3C06D838 */ lui $a2, 0xd838 /* 3B82E8 E00B8768 8E840000 */ lw $a0, ($s4) diff --git a/ver/us/asm/nonmatchings/effects/effect_92/fx_92_main.s b/ver/us/asm/nonmatchings/effects/effect_92/fx_92_main.s index 2e5afe8739..f1c0f6ee85 100644 --- a/ver/us/asm/nonmatchings/effects/effect_92/fx_92_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_92/fx_92_main.s @@ -28,12 +28,12 @@ glabel fx_92_main /* 3B7BDC E00B805C AFB00028 */ sw $s0, 0x28($sp) /* 3B7BE0 E00B8060 AFA00010 */ sw $zero, 0x10($sp) /* 3B7BE4 E00B8064 AFA00024 */ sw $zero, 0x24($sp) -/* 3B7BE8 E00B8068 0C080124 */ jal func_E0200490 +/* 3B7BE8 E00B8068 0C080124 */ jal shim_create_effect_instance /* 3B7BEC E00B806C AFA20014 */ sw $v0, 0x14($sp) /* 3B7BF0 E00B8070 24040044 */ addiu $a0, $zero, 0x44 /* 3B7BF4 E00B8074 24030001 */ addiu $v1, $zero, 1 /* 3B7BF8 E00B8078 0040802D */ daddu $s0, $v0, $zero -/* 3B7BFC E00B807C 0C08012C */ jal func_E02004B0 +/* 3B7BFC E00B807C 0C08012C */ jal shim_general_heap_malloc /* 3B7C00 E00B8080 AE030008 */ sw $v1, 8($s0) /* 3B7C04 E00B8084 0040282D */ daddu $a1, $v0, $zero /* 3B7C08 E00B8088 14A00003 */ bnez $a1, .LE00B8098 diff --git a/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA174.s b/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA174.s index b857c9cdc7..43b02f719a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA174.s +++ b/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA174.s @@ -32,7 +32,7 @@ glabel func_E00BA174 /* 3B8DA8 E00BA1D8 24420001 */ addiu $v0, $v0, 1 /* 3B8DAC E00BA1DC 04610005 */ bgez $v1, .LE00BA1F4 /* 3B8DB0 E00BA1E0 AE020014 */ sw $v0, 0x14($s0) -/* 3B8DB4 E00BA1E4 0C080128 */ jal func_E02004A0 +/* 3B8DB4 E00BA1E4 0C080128 */ jal shim_remove_effect /* 3B8DB8 E00BA1E8 00000000 */ nop /* 3B8DBC E00BA1EC 0802E96D */ j .LE00BA5B4 /* 3B8DC0 E00BA1F0 00000000 */ nop @@ -90,7 +90,7 @@ glabel func_E00BA174 /* 3B8E78 E00BA2A8 44826000 */ mtc1 $v0, $f12 /* 3B8E7C E00BA2AC 00000000 */ nop /* 3B8E80 E00BA2B0 46806320 */ cvt.s.w $f12, $f12 -/* 3B8E84 E00BA2B4 0C080140 */ jal func_E0200500 +/* 3B8E84 E00BA2B4 0C080140 */ jal shim_sin_deg /* 3B8E88 E00BA2B8 26520001 */ addiu $s2, $s2, 1 /* 3B8E8C E00BA2BC 46160002 */ mul.s $f0, $f0, $f22 /* 3B8E90 E00BA2C0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA5DC.s b/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA5DC.s index 4ea483dea9..c03d4fc403 100644 --- a/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA5DC.s +++ b/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA5DC.s @@ -12,7 +12,7 @@ glabel func_E00BA5DC /* 3B91C8 E00BA5F8 AFA40018 */ sw $a0, 0x18($sp) /* 3B91CC E00BA5FC 27A40010 */ addiu $a0, $sp, 0x10 /* 3B91D0 E00BA600 AFBF0020 */ sw $ra, 0x20($sp) -/* 3B91D4 E00BA604 0C080120 */ jal func_E0200480 +/* 3B91D4 E00BA604 0C080120 */ jal shim_queue_render_task /* 3B91D8 E00BA608 AFA20010 */ sw $v0, 0x10($sp) /* 3B91DC E00BA60C 8FBF0020 */ lw $ra, 0x20($sp) /* 3B91E0 E00BA610 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA620.s b/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA620.s index f48c625f06..6fe2b4b13c 100644 --- a/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA620.s +++ b/ver/us/asm/nonmatchings/effects/effect_93/func_E00BA620.s @@ -223,7 +223,7 @@ glabel func_E00BA620 /* 3B9554 E00BA984 E7A00010 */ swc1 $f0, 0x10($sp) /* 3B9558 E00BA988 E7A20014 */ swc1 $f2, 0x14($sp) /* 3B955C E00BA98C E7A40018 */ swc1 $f4, 0x18($sp) -/* 3B9560 E00BA990 0C080188 */ jal func_E0200620 +/* 3B9560 E00BA990 0C080188 */ jal shim_guFrustumF /* 3B9564 E00BA994 E7A6001C */ swc1 $f6, 0x1c($sp) /* 3B9568 E00BA998 27A40020 */ addiu $a0, $sp, 0x20 /* 3B956C E00BA99C 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -234,7 +234,7 @@ glabel func_E00BA620 /* 3B9580 E00BA9B0 8E420000 */ lw $v0, ($s2) /* 3B9584 E00BA9B4 00052980 */ sll $a1, $a1, 6 /* 3B9588 E00BA9B8 00B32821 */ addu $a1, $a1, $s3 -/* 3B958C E00BA9BC 0C080118 */ jal func_E0200460 +/* 3B958C E00BA9BC 0C080118 */ jal shim_guMtxF2L /* 3B9590 E00BA9C0 00452821 */ addu $a1, $v0, $a1 /* 3B9594 E00BA9C4 3C03DA38 */ lui $v1, 0xda38 /* 3B9598 E00BA9C8 34630007 */ ori $v1, $v1, 7 diff --git a/ver/us/asm/nonmatchings/effects/effect_93/fx_93_main.s b/ver/us/asm/nonmatchings/effects/effect_93/fx_93_main.s index 747361d886..135481d43e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_93/fx_93_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_93/fx_93_main.s @@ -28,12 +28,12 @@ glabel fx_93_main /* 3B8C2C E00BA05C AFB00028 */ sw $s0, 0x28($sp) /* 3B8C30 E00BA060 AFA00010 */ sw $zero, 0x10($sp) /* 3B8C34 E00BA064 AFA00024 */ sw $zero, 0x24($sp) -/* 3B8C38 E00BA068 0C080124 */ jal func_E0200490 +/* 3B8C38 E00BA068 0C080124 */ jal shim_create_effect_instance /* 3B8C3C E00BA06C AFA20014 */ sw $v0, 0x14($sp) /* 3B8C40 E00BA070 24040308 */ addiu $a0, $zero, 0x308 /* 3B8C44 E00BA074 24030001 */ addiu $v1, $zero, 1 /* 3B8C48 E00BA078 0040802D */ daddu $s0, $v0, $zero -/* 3B8C4C E00BA07C 0C08012C */ jal func_E02004B0 +/* 3B8C4C E00BA07C 0C08012C */ jal shim_general_heap_malloc /* 3B8C50 E00BA080 AE030008 */ sw $v1, 8($s0) /* 3B8C54 E00BA084 0040302D */ daddu $a2, $v0, $zero /* 3B8C58 E00BA088 14C00003 */ bnez $a2, .LE00BA098 diff --git a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC1D8.s b/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC1D8.s index 4bf25958c9..9c424e7f3a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC1D8.s +++ b/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC1D8.s @@ -8,7 +8,7 @@ glabel func_E00BC1D8 /* 3BA214 E00BC1E4 4600A08D */ trunc.w.s $f2, $f20 /* 3BA218 E00BC1E8 44041000 */ mfc1 $a0, $f2 /* 3BA21C E00BC1EC AFBF0010 */ sw $ra, 0x10($sp) -/* 3BA220 E00BC1F0 0C080138 */ jal func_E02004E0 +/* 3BA220 E00BC1F0 0C080138 */ jal shim_rand_int /* 3BA224 E00BC1F4 00000000 */ nop /* 3BA228 E00BC1F8 3C013FE0 */ lui $at, 0x3fe0 /* 3BA22C E00BC1FC 44810800 */ mtc1 $at, $f1 diff --git a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC238.s b/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC238.s index 58e28bc686..bd91735257 100644 --- a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC238.s +++ b/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC238.s @@ -26,7 +26,7 @@ glabel func_E00BC238 /* 3BA2B4 E00BC284 24450001 */ addiu $a1, $v0, 1 /* 3BA2B8 E00BC288 04610005 */ bgez $v1, .LE00BC2A0 /* 3BA2BC E00BC28C ACC5002C */ sw $a1, 0x2c($a2) -/* 3BA2C0 E00BC290 0C080128 */ jal func_E02004A0 +/* 3BA2C0 E00BC290 0C080128 */ jal shim_remove_effect /* 3BA2C4 E00BC294 00000000 */ nop /* 3BA2C8 E00BC298 0802F0B7 */ j .LE00BC2DC /* 3BA2CC E00BC29C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC2E8.s b/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC2E8.s index 437f973d5f..9dacc7e0f6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC2E8.s +++ b/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC2E8.s @@ -29,7 +29,7 @@ glabel func_E00BC2E8 /* 3BA374 E00BC344 AFA20014 */ sw $v0, 0x14($sp) /* 3BA378 E00BC348 2402002D */ addiu $v0, $zero, 0x2d .LE00BC34C: -/* 3BA37C E00BC34C 0C080120 */ jal func_E0200480 +/* 3BA37C E00BC34C 0C080120 */ jal shim_queue_render_task /* 3BA380 E00BC350 AC820000 */ sw $v0, ($a0) /* 3BA384 E00BC354 8C430000 */ lw $v1, ($v0) /* 3BA388 E00BC358 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC374.s b/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC374.s index e2c7c2680f..88c0e619b2 100644 --- a/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC374.s +++ b/ver/us/asm/nonmatchings/effects/effect_94/func_E00BC374.s @@ -53,7 +53,7 @@ glabel func_E00BC374 /* 3BA464 E00BC434 8C62001C */ lw $v0, 0x1c($v1) /* 3BA468 E00BC438 3C038000 */ lui $v1, 0x8000 /* 3BA46C E00BC43C 00431021 */ addu $v0, $v0, $v1 -/* 3BA470 E00BC440 0C080110 */ jal func_E0200440 +/* 3BA470 E00BC440 0C080110 */ jal shim_guScaleF /* 3BA474 E00BC444 AD020004 */ sw $v0, 4($t0) /* 3BA478 E00BC448 27A40010 */ addiu $a0, $sp, 0x10 /* 3BA47C E00BC44C 3C108007 */ lui $s0, %hi(gMatrixListPos) @@ -64,7 +64,7 @@ glabel func_E00BC374 /* 3BA490 E00BC460 8E420000 */ lw $v0, ($s2) /* 3BA494 E00BC464 00052980 */ sll $a1, $a1, 6 /* 3BA498 E00BC468 00B42821 */ addu $a1, $a1, $s4 -/* 3BA49C E00BC46C 0C080118 */ jal func_E0200460 +/* 3BA49C E00BC46C 0C080118 */ jal shim_guMtxF2L /* 3BA4A0 E00BC470 00452821 */ addu $a1, $v0, $a1 /* 3BA4A4 E00BC474 3C03DA38 */ lui $v1, 0xda38 /* 3BA4A8 E00BC478 34630002 */ ori $v1, $v1, 2 @@ -217,7 +217,7 @@ glabel func_E00BC374 /* 3BA6DC E00BC6AC 4482D000 */ mtc1 $v0, $f26 /* 3BA6E0 E00BC6B0 00000000 */ nop /* 3BA6E4 E00BC6B4 4680D6A0 */ cvt.s.w $f26, $f26 -/* 3BA6E8 E00BC6B8 0C080140 */ jal func_E0200500 +/* 3BA6E8 E00BC6B8 0C080140 */ jal shim_sin_deg /* 3BA6EC E00BC6BC 4600E306 */ mov.s $f12, $f28 /* 3BA6F0 E00BC6C0 461A0502 */ mul.s $f20, $f0, $f26 /* 3BA6F4 E00BC6C4 00000000 */ nop @@ -227,7 +227,7 @@ glabel func_E00BC374 /* 3BA704 E00BC6D4 4630A502 */ mul.d $f20, $f20, $f16 /* 3BA708 E00BC6D8 00000000 */ nop /* 3BA70C E00BC6DC 4600E306 */ mov.s $f12, $f28 -/* 3BA710 E00BC6E0 0C080144 */ jal func_E0200510 +/* 3BA710 E00BC6E0 0C080144 */ jal shim_cos_deg /* 3BA714 E00BC6E4 4620A520 */ cvt.s.d $f20, $f20 /* 3BA718 E00BC6E8 461A0002 */ mul.s $f0, $f0, $f26 /* 3BA71C E00BC6EC 00000000 */ nop @@ -331,7 +331,7 @@ glabel func_E00BC374 /* 3BA8A0 E00BC870 C6AE0054 */ lwc1 $f14, 0x54($s5) /* 3BA8A4 E00BC874 46000007 */ neg.s $f0, $f0 /* 3BA8A8 E00BC878 44070000 */ mfc1 $a3, $f0 -/* 3BA8AC E00BC87C 0C080148 */ jal func_E0200520 +/* 3BA8AC E00BC87C 0C080148 */ jal shim_atan2 /* 3BA8B0 E00BC880 46007387 */ neg.s $f14, $f14 /* 3BA8B4 E00BC884 0802F25B */ j .LE00BC96C /* 3BA8B8 E00BC888 46000587 */ neg.s $f22, $f0 @@ -353,7 +353,7 @@ glabel func_E00BC374 /* 3BA8F0 E00BC8C0 C44E0050 */ lwc1 $f14, 0x50($v0) /* 3BA8F4 E00BC8C4 46000007 */ neg.s $f0, $f0 /* 3BA8F8 E00BC8C8 44070000 */ mfc1 $a3, $f0 -/* 3BA8FC E00BC8CC 0C080148 */ jal func_E0200520 +/* 3BA8FC E00BC8CC 0C080148 */ jal shim_atan2 /* 3BA900 E00BC8D0 46007387 */ neg.s $f14, $f14 /* 3BA904 E00BC8D4 2662FFFF */ addiu $v0, $s3, -1 /* 3BA908 E00BC8D8 00021080 */ sll $v0, $v0, 2 @@ -365,7 +365,7 @@ glabel func_E00BC374 /* 3BA920 E00BC8F0 C64E0050 */ lwc1 $f14, 0x50($s2) /* 3BA924 E00BC8F4 46000007 */ neg.s $f0, $f0 /* 3BA928 E00BC8F8 44070000 */ mfc1 $a3, $f0 -/* 3BA92C E00BC8FC 0C080148 */ jal func_E0200520 +/* 3BA92C E00BC8FC 0C080148 */ jal shim_atan2 /* 3BA930 E00BC900 46007387 */ neg.s $f14, $f14 /* 3BA934 E00BC904 46000087 */ neg.s $f2, $f0 /* 3BA938 E00BC908 46141101 */ sub.s $f4, $f2, $f20 @@ -406,11 +406,11 @@ glabel func_E00BC374 /* 3BA9B8 E00BC988 00000000 */ nop /* 3BA9BC E00BC98C 24100080 */ addiu $s0, $zero, 0x80 /* 3BA9C0 E00BC990 020E8023 */ subu $s0, $s0, $t6 -/* 3BA9C4 E00BC994 0C080140 */ jal func_E0200500 +/* 3BA9C4 E00BC994 0C080140 */ jal shim_sin_deg /* 3BA9C8 E00BC998 00108140 */ sll $s0, $s0, 5 /* 3BA9CC E00BC99C 4600C502 */ mul.s $f20, $f24, $f0 /* 3BA9D0 E00BC9A0 00000000 */ nop -/* 3BA9D4 E00BC9A4 0C080144 */ jal func_E0200510 +/* 3BA9D4 E00BC9A4 0C080144 */ jal shim_cos_deg /* 3BA9D8 E00BC9A8 4600B306 */ mov.s $f12, $f22 /* 3BA9DC E00BC9AC C6420050 */ lwc1 $f2, 0x50($s2) /* 3BA9E0 E00BC9B0 46141080 */ add.s $f2, $f2, $f20 diff --git a/ver/us/asm/nonmatchings/effects/effect_94/fx_94_main.s b/ver/us/asm/nonmatchings/effects/effect_94/fx_94_main.s index b7f48c612d..e32ce50c15 100644 --- a/ver/us/asm/nonmatchings/effects/effect_94/fx_94_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_94/fx_94_main.s @@ -35,12 +35,12 @@ glabel fx_94_main /* 3BA0A8 E00BC078 AFB00028 */ sw $s0, 0x28($sp) /* 3BA0AC E00BC07C AFA00010 */ sw $zero, 0x10($sp) /* 3BA0B0 E00BC080 AFA00024 */ sw $zero, 0x24($sp) -/* 3BA0B4 E00BC084 0C080124 */ jal func_E0200490 +/* 3BA0B4 E00BC084 0C080124 */ jal shim_create_effect_instance /* 3BA0B8 E00BC088 AFA20014 */ sw $v0, 0x14($sp) /* 3BA0BC E00BC08C 24040118 */ addiu $a0, $zero, 0x118 /* 3BA0C0 E00BC090 24030001 */ addiu $v1, $zero, 1 /* 3BA0C4 E00BC094 0040902D */ daddu $s2, $v0, $zero -/* 3BA0C8 E00BC098 0C08012C */ jal func_E02004B0 +/* 3BA0C8 E00BC098 0C08012C */ jal shim_general_heap_malloc /* 3BA0CC E00BC09C AE430008 */ sw $v1, 8($s2) /* 3BA0D0 E00BC0A0 0040802D */ daddu $s0, $v0, $zero /* 3BA0D4 E00BC0A4 16000003 */ bnez $s0, .LE00BC0B4 @@ -89,7 +89,7 @@ glabel fx_94_main /* 3BA170 E00BC140 0802F067 */ j .LE00BC19C /* 3BA174 E00BC144 0000102D */ daddu $v0, $zero, $zero .LE00BC148: -/* 3BA178 E00BC148 0C080154 */ jal func_E0200550 +/* 3BA178 E00BC148 0C080154 */ jal shim_sqrtf /* 3BA17C E00BC14C 00000000 */ nop /* 3BA180 E00BC150 24040167 */ addiu $a0, $zero, 0x167 /* 3BA184 E00BC154 46000021 */ cvt.d.s $f0, $f0 @@ -106,7 +106,7 @@ glabel fx_94_main /* 3BA1B0 E00BC180 AE110044 */ sw $s1, 0x44($s0) /* 3BA1B4 E00BC184 AE110048 */ sw $s1, 0x48($s0) /* 3BA1B8 E00BC188 46200020 */ cvt.s.d $f0, $f0 -/* 3BA1BC E00BC18C 0C080138 */ jal func_E02004E0 +/* 3BA1BC E00BC18C 0C080138 */ jal shim_rand_int /* 3BA1C0 E00BC190 E6000114 */ swc1 $f0, 0x114($s0) /* 3BA1C4 E00BC194 AE020110 */ sw $v0, 0x110($s0) /* 3BA1C8 E00BC198 0240102D */ daddu $v0, $s2, $zero diff --git a/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE3A4.s b/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE3A4.s index 8f62a5e14a..9ab2165e4e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE3A4.s +++ b/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE3A4.s @@ -27,7 +27,7 @@ glabel func_E00BE3A4 /* 3BC354 E00BE3F4 24420001 */ addiu $v0, $v0, 1 /* 3BC358 E00BE3F8 04A10005 */ bgez $a1, .LE00BE410 /* 3BC35C E00BE3FC AC620020 */ sw $v0, 0x20($v1) -/* 3BC360 E00BE400 0C080128 */ jal func_E02004A0 +/* 3BC360 E00BE400 0C080128 */ jal shim_remove_effect /* 3BC364 E00BE404 00000000 */ nop /* 3BC368 E00BE408 0802F95A */ j .LE00BE568 /* 3BC36C E00BE40C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE578.s b/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE578.s index 7c74038dbf..221a7f8bf3 100644 --- a/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE578.s +++ b/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE578.s @@ -12,7 +12,7 @@ glabel func_E00BE578 /* 3BC4F4 E00BE594 AFA40018 */ sw $a0, 0x18($sp) /* 3BC4F8 E00BE598 27A40010 */ addiu $a0, $sp, 0x10 /* 3BC4FC E00BE59C AFBF0020 */ sw $ra, 0x20($sp) -/* 3BC500 E00BE5A0 0C080120 */ jal func_E0200480 +/* 3BC500 E00BE5A0 0C080120 */ jal shim_queue_render_task /* 3BC504 E00BE5A4 AFA20010 */ sw $v0, 0x10($sp) /* 3BC508 E00BE5A8 8FBF0020 */ lw $ra, 0x20($sp) /* 3BC50C E00BE5AC 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE5BC.s b/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE5BC.s index 2ca3821118..bdcdcb024d 100644 --- a/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE5BC.s +++ b/ver/us/asm/nonmatchings/effects/effect_95/func_E00BE5BC.s @@ -67,17 +67,17 @@ glabel func_E00BE5BC /* 3BC614 E00BE6B4 001010C0 */ sll $v0, $s0, 3 /* 3BC618 E00BE6B8 02028021 */ addu $s0, $s0, $v0 /* 3BC61C E00BE6BC 001080C0 */ sll $s0, $s0, 3 -/* 3BC620 E00BE6C0 0C080108 */ jal func_E0200420 +/* 3BC620 E00BE6C0 0C080108 */ jal shim_guTranslateF /* 3BC624 E00BE6C4 02038021 */ addu $s0, $s0, $v1 /* 3BC628 E00BE6C8 27B40050 */ addiu $s4, $sp, 0x50 /* 3BC62C E00BE6CC 8E450034 */ lw $a1, 0x34($s2) /* 3BC630 E00BE6D0 0280202D */ daddu $a0, $s4, $zero /* 3BC634 E00BE6D4 00A0302D */ daddu $a2, $a1, $zero -/* 3BC638 E00BE6D8 0C080110 */ jal func_E0200440 +/* 3BC638 E00BE6D8 0C080110 */ jal shim_guScaleF /* 3BC63C E00BE6DC 00A0382D */ daddu $a3, $a1, $zero /* 3BC640 E00BE6E0 0280202D */ daddu $a0, $s4, $zero /* 3BC644 E00BE6E4 27A50010 */ addiu $a1, $sp, 0x10 -/* 3BC648 E00BE6E8 0C080114 */ jal func_E0200450 +/* 3BC648 E00BE6E8 0C080114 */ jal shim_guMtxCatF /* 3BC64C E00BE6EC 00A0302D */ daddu $a2, $a1, $zero /* 3BC650 E00BE6F0 27A40010 */ addiu $a0, $sp, 0x10 /* 3BC654 E00BE6F4 3C158007 */ lui $s5, %hi(gMatrixListPos) @@ -88,7 +88,7 @@ glabel func_E00BE5BC /* 3BC668 E00BE708 8EE20000 */ lw $v0, ($s7) /* 3BC66C E00BE70C 00052980 */ sll $a1, $a1, 6 /* 3BC670 E00BE710 00B12821 */ addu $a1, $a1, $s1 -/* 3BC674 E00BE714 0C080118 */ jal func_E0200460 +/* 3BC674 E00BE714 0C080118 */ jal shim_guMtxF2L /* 3BC678 E00BE718 00452821 */ addu $a1, $v0, $a1 /* 3BC67C E00BE71C 3C03DA38 */ lui $v1, 0xda38 /* 3BC680 E00BE720 34630002 */ ori $v1, $v1, 2 @@ -226,23 +226,23 @@ glabel func_E00BE5BC /* 3BC87C E00BE91C 25020028 */ addiu $v0, $t0, 0x28 /* 3BC880 E00BE920 25080030 */ addiu $t0, $t0, 0x30 /* 3BC884 E00BE924 AE220000 */ sw $v0, ($s1) -/* 3BC888 E00BE928 0C080108 */ jal func_E0200420 +/* 3BC888 E00BE928 0C080108 */ jal shim_guTranslateF /* 3BC88C E00BE92C AE280000 */ sw $t0, ($s1) /* 3BC890 E00BE930 8E050004 */ lw $a1, 4($s0) /* 3BC894 E00BE934 0280202D */ daddu $a0, $s4, $zero /* 3BC898 E00BE938 00A0302D */ daddu $a2, $a1, $zero -/* 3BC89C E00BE93C 0C080110 */ jal func_E0200440 +/* 3BC89C E00BE93C 0C080110 */ jal shim_guScaleF /* 3BC8A0 E00BE940 00A0382D */ daddu $a3, $a1, $zero /* 3BC8A4 E00BE944 0280202D */ daddu $a0, $s4, $zero /* 3BC8A8 E00BE948 27A50010 */ addiu $a1, $sp, 0x10 -/* 3BC8AC E00BE94C 0C080114 */ jal func_E0200450 +/* 3BC8AC E00BE94C 0C080114 */ jal shim_guMtxCatF /* 3BC8B0 E00BE950 00A0302D */ daddu $a2, $a1, $zero /* 3BC8B4 E00BE954 27A40010 */ addiu $a0, $sp, 0x10 /* 3BC8B8 E00BE958 96A50000 */ lhu $a1, ($s5) /* 3BC8BC E00BE95C 8EE20000 */ lw $v0, ($s7) /* 3BC8C0 E00BE960 00052980 */ sll $a1, $a1, 6 /* 3BC8C4 E00BE964 00B32821 */ addu $a1, $a1, $s3 -/* 3BC8C8 E00BE968 0C080118 */ jal func_E0200460 +/* 3BC8C8 E00BE968 0C080118 */ jal shim_guMtxF2L /* 3BC8CC E00BE96C 00452821 */ addu $a1, $v0, $a1 /* 3BC8D0 E00BE970 3C088080 */ lui $t0, 0x8080 /* 3BC8D4 E00BE974 35088081 */ ori $t0, $t0, 0x8081 diff --git a/ver/us/asm/nonmatchings/effects/effect_95/fx_95_main.s b/ver/us/asm/nonmatchings/effects/effect_95/fx_95_main.s index faa9f4f6f6..bbe6b39063 100644 --- a/ver/us/asm/nonmatchings/effects/effect_95/fx_95_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_95/fx_95_main.s @@ -42,13 +42,13 @@ glabel fx_95_main /* 3BBFEC E00BE08C 2402005F */ addiu $v0, $zero, 0x5f /* 3BBFF0 E00BE090 AC800000 */ sw $zero, ($a0) /* 3BBFF4 E00BE094 AC800014 */ sw $zero, 0x14($a0) -/* 3BBFF8 E00BE098 0C080124 */ jal func_E0200490 +/* 3BBFF8 E00BE098 0C080124 */ jal shim_create_effect_instance /* 3BBFFC E00BE09C AC820004 */ sw $v0, 4($a0) /* 3BC000 E00BE0A0 001020C0 */ sll $a0, $s0, 3 /* 3BC004 E00BE0A4 00902023 */ subu $a0, $a0, $s0 /* 3BC008 E00BE0A8 000420C0 */ sll $a0, $a0, 3 /* 3BC00C E00BE0AC 0040982D */ daddu $s3, $v0, $zero -/* 3BC010 E00BE0B0 0C08012C */ jal func_E02004B0 +/* 3BC010 E00BE0B0 0C08012C */ jal shim_general_heap_malloc /* 3BC014 E00BE0B4 AE700008 */ sw $s0, 8($s3) /* 3BC018 E00BE0B8 0040202D */ daddu $a0, $v0, $zero /* 3BC01C E00BE0BC 14800003 */ bnez $a0, .LE00BE0CC @@ -113,21 +113,21 @@ glabel fx_95_main /* 3BC0F0 E00BE190 0802F8B1 */ j .LE00BE2C4 /* 3BC0F4 E00BE194 00000000 */ nop .LE00BE198: -/* 3BC0F8 E00BE198 0C080138 */ jal func_E02004E0 +/* 3BC0F8 E00BE198 0C080138 */ jal shim_rand_int /* 3BC0FC E00BE19C 2404000A */ addiu $a0, $zero, 0xa /* 3BC100 E00BE1A0 2404000A */ addiu $a0, $zero, 0xa /* 3BC104 E00BE1A4 2442FFFE */ addiu $v0, $v0, -2 /* 3BC108 E00BE1A8 44820000 */ mtc1 $v0, $f0 /* 3BC10C E00BE1AC 00000000 */ nop /* 3BC110 E00BE1B0 46800020 */ cvt.s.w $f0, $f0 -/* 3BC114 E00BE1B4 0C080138 */ jal func_E02004E0 +/* 3BC114 E00BE1B4 0C080138 */ jal shim_rand_int /* 3BC118 E00BE1B8 E600FFE0 */ swc1 $f0, -0x20($s0) /* 3BC11C E00BE1BC 2404000A */ addiu $a0, $zero, 0xa /* 3BC120 E00BE1C0 2442FFFB */ addiu $v0, $v0, -5 /* 3BC124 E00BE1C4 44820000 */ mtc1 $v0, $f0 /* 3BC128 E00BE1C8 00000000 */ nop /* 3BC12C E00BE1CC 46800020 */ cvt.s.w $f0, $f0 -/* 3BC130 E00BE1D0 0C080138 */ jal func_E02004E0 +/* 3BC130 E00BE1D0 0C080138 */ jal shim_rand_int /* 3BC134 E00BE1D4 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 3BC138 E00BE1D8 2442FFFB */ addiu $v0, $v0, -5 /* 3BC13C E00BE1DC 44820000 */ mtc1 $v0, $f0 @@ -136,21 +136,21 @@ glabel fx_95_main /* 3BC148 E00BE1E8 0802F8D4 */ j .LE00BE350 /* 3BC14C E00BE1EC E600FFE8 */ swc1 $f0, -0x18($s0) .LE00BE1F0: -/* 3BC150 E00BE1F0 0C080138 */ jal func_E02004E0 +/* 3BC150 E00BE1F0 0C080138 */ jal shim_rand_int /* 3BC154 E00BE1F4 2404000A */ addiu $a0, $zero, 0xa /* 3BC158 E00BE1F8 2404000A */ addiu $a0, $zero, 0xa /* 3BC15C E00BE1FC 02821023 */ subu $v0, $s4, $v0 /* 3BC160 E00BE200 44820000 */ mtc1 $v0, $f0 /* 3BC164 E00BE204 00000000 */ nop /* 3BC168 E00BE208 46800020 */ cvt.s.w $f0, $f0 -/* 3BC16C E00BE20C 0C080138 */ jal func_E02004E0 +/* 3BC16C E00BE20C 0C080138 */ jal shim_rand_int /* 3BC170 E00BE210 E600FFE0 */ swc1 $f0, -0x20($s0) /* 3BC174 E00BE214 2404000A */ addiu $a0, $zero, 0xa /* 3BC178 E00BE218 2442FFFB */ addiu $v0, $v0, -5 /* 3BC17C E00BE21C 44820000 */ mtc1 $v0, $f0 /* 3BC180 E00BE220 00000000 */ nop /* 3BC184 E00BE224 46800020 */ cvt.s.w $f0, $f0 -/* 3BC188 E00BE228 0C080138 */ jal func_E02004E0 +/* 3BC188 E00BE228 0C080138 */ jal shim_rand_int /* 3BC18C E00BE22C E600FFE4 */ swc1 $f0, -0x1c($s0) /* 3BC190 E00BE230 2442FFFB */ addiu $v0, $v0, -5 /* 3BC194 E00BE234 44820000 */ mtc1 $v0, $f0 @@ -159,7 +159,7 @@ glabel fx_95_main /* 3BC1A0 E00BE240 0802F8D4 */ j .LE00BE350 /* 3BC1A4 E00BE244 E600FFE8 */ swc1 $f0, -0x18($s0) .LE00BE248: -/* 3BC1A8 E00BE248 0C080138 */ jal func_E02004E0 +/* 3BC1A8 E00BE248 0C080138 */ jal shim_rand_int /* 3BC1AC E00BE24C 24040064 */ addiu $a0, $zero, 0x64 /* 3BC1B0 E00BE250 2442FFCE */ addiu $v0, $v0, -0x32 /* 3BC1B4 E00BE254 44820000 */ mtc1 $v0, $f0 @@ -168,7 +168,7 @@ glabel fx_95_main /* 3BC1C0 E00BE260 46160002 */ mul.s $f0, $f0, $f22 /* 3BC1C4 E00BE264 00000000 */ nop /* 3BC1C8 E00BE268 24040064 */ addiu $a0, $zero, 0x64 -/* 3BC1CC E00BE26C 0C080138 */ jal func_E02004E0 +/* 3BC1CC E00BE26C 0C080138 */ jal shim_rand_int /* 3BC1D0 E00BE270 E600FFE0 */ swc1 $f0, -0x20($s0) /* 3BC1D4 E00BE274 2442000A */ addiu $v0, $v0, 0xa /* 3BC1D8 E00BE278 3C013E4C */ lui $at, 0x3e4c @@ -180,7 +180,7 @@ glabel fx_95_main /* 3BC1F0 E00BE290 46020002 */ mul.s $f0, $f0, $f2 /* 3BC1F4 E00BE294 00000000 */ nop /* 3BC1F8 E00BE298 24040064 */ addiu $a0, $zero, 0x64 -/* 3BC1FC E00BE29C 0C080138 */ jal func_E02004E0 +/* 3BC1FC E00BE29C 0C080138 */ jal shim_rand_int /* 3BC200 E00BE2A0 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 3BC204 E00BE2A4 2442FFCE */ addiu $v0, $v0, -0x32 /* 3BC208 E00BE2A8 44820000 */ mtc1 $v0, $f0 @@ -191,7 +191,7 @@ glabel fx_95_main /* 3BC21C E00BE2BC 0802F8D4 */ j .LE00BE350 /* 3BC220 E00BE2C0 E600FFE8 */ swc1 $f0, -0x18($s0) .LE00BE2C4: -/* 3BC224 E00BE2C4 0C080138 */ jal func_E02004E0 +/* 3BC224 E00BE2C4 0C080138 */ jal shim_rand_int /* 3BC228 E00BE2C8 2404000A */ addiu $a0, $zero, 0xa /* 3BC22C E00BE2CC 2442FFFB */ addiu $v0, $v0, -5 /* 3BC230 E00BE2D0 44820000 */ mtc1 $v0, $f0 @@ -201,7 +201,7 @@ glabel fx_95_main /* 3BC240 E00BE2E0 00000000 */ nop /* 3BC244 E00BE2E4 2404000A */ addiu $a0, $zero, 0xa /* 3BC248 E00BE2E8 46200020 */ cvt.s.d $f0, $f0 -/* 3BC24C E00BE2EC 0C080138 */ jal func_E02004E0 +/* 3BC24C E00BE2EC 0C080138 */ jal shim_rand_int /* 3BC250 E00BE2F0 E600FFE0 */ swc1 $f0, -0x20($s0) /* 3BC254 E00BE2F4 2442FFFB */ addiu $v0, $v0, -5 /* 3BC258 E00BE2F8 44820000 */ mtc1 $v0, $f0 @@ -211,7 +211,7 @@ glabel fx_95_main /* 3BC268 E00BE308 00000000 */ nop /* 3BC26C E00BE30C 2404000A */ addiu $a0, $zero, 0xa /* 3BC270 E00BE310 46200020 */ cvt.s.d $f0, $f0 -/* 3BC274 E00BE314 0C080138 */ jal func_E02004E0 +/* 3BC274 E00BE314 0C080138 */ jal shim_rand_int /* 3BC278 E00BE318 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 3BC27C E00BE31C 2442FFFB */ addiu $v0, $v0, -5 /* 3BC280 E00BE320 44820000 */ mtc1 $v0, $f0 diff --git a/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0160.s b/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0160.s index 6b7213166b..6a5697113e 100644 --- a/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0160.s +++ b/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0160.s @@ -27,7 +27,7 @@ glabel func_E00C0160 /* 3BCF10 E00C01B0 24420001 */ addiu $v0, $v0, 1 /* 3BCF14 E00C01B4 04A10005 */ bgez $a1, .LE00C01CC /* 3BCF18 E00C01B8 AE020014 */ sw $v0, 0x14($s0) -/* 3BCF1C E00C01BC 0C080128 */ jal func_E02004A0 +/* 3BCF1C E00C01BC 0C080128 */ jal shim_remove_effect /* 3BCF20 E00C01C0 00000000 */ nop /* 3BCF24 E00C01C4 080301BF */ j .LE00C06FC /* 3BCF28 E00C01C8 00000000 */ nop @@ -317,9 +317,9 @@ glabel LE00C0570_3BD2D0 .LE00C05D4: /* 3BD334 E00C05D4 14620049 */ bne $v1, $v0, .LE00C06FC /* 3BD338 E00C05D8 00000000 */ nop -/* 3BD33C E00C05DC 0C080150 */ jal func_E0200540 +/* 3BD33C E00C05DC 0C080150 */ jal shim_load_effect /* 3BD340 E00C05E0 2404006F */ addiu $a0, $zero, 0x6f -/* 3BD344 E00C05E4 0C080138 */ jal func_E02004E0 +/* 3BD344 E00C05E4 0C080138 */ jal shim_rand_int /* 3BD348 E00C05E8 2404003C */ addiu $a0, $zero, 0x3c /* 3BD34C E00C05EC C6140004 */ lwc1 $f20, 4($s0) /* 3BD350 E00C05F0 C6000030 */ lwc1 $f0, 0x30($s0) @@ -331,7 +331,7 @@ glabel LE00C0570_3BD2D0 /* 3BD368 E00C0608 3C0141F0 */ lui $at, 0x41f0 /* 3BD36C E00C060C 44810000 */ mtc1 $at, $f0 /* 3BD370 E00C0610 24040064 */ addiu $a0, $zero, 0x64 -/* 3BD374 E00C0614 0C080138 */ jal func_E02004E0 +/* 3BD374 E00C0614 0C080138 */ jal shim_rand_int /* 3BD378 E00C0618 4600A501 */ sub.s $f20, $f20, $f0 /* 3BD37C E00C061C C602000C */ lwc1 $f2, 0xc($s0) /* 3BD380 E00C0620 C6000038 */ lwc1 $f0, 0x38($s0) @@ -356,7 +356,7 @@ glabel LE00C0570_3BD2D0 /* 3BD3CC E00C066C AFA20014 */ sw $v0, 0x14($sp) /* 3BD3D0 E00C0670 0C037800 */ jal fx_111_main /* 3BD3D4 E00C0674 E7A00010 */ swc1 $f0, 0x10($sp) -/* 3BD3D8 E00C0678 0C080150 */ jal func_E0200540 +/* 3BD3D8 E00C0678 0C080150 */ jal shim_load_effect /* 3BD3DC E00C067C 24040072 */ addiu $a0, $zero, 0x72 /* 3BD3E0 E00C0680 C6020004 */ lwc1 $f2, 4($s0) /* 3BD3E4 E00C0684 C6000030 */ lwc1 $f0, 0x30($s0) diff --git a/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0710.s b/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0710.s index ef9278be57..81a6841014 100644 --- a/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0710.s +++ b/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0710.s @@ -12,7 +12,7 @@ glabel func_E00C0710 /* 3BD48C E00C072C AFA40018 */ sw $a0, 0x18($sp) /* 3BD490 E00C0730 27A40010 */ addiu $a0, $sp, 0x10 /* 3BD494 E00C0734 AFBF0020 */ sw $ra, 0x20($sp) -/* 3BD498 E00C0738 0C080120 */ jal func_E0200480 +/* 3BD498 E00C0738 0C080120 */ jal shim_queue_render_task /* 3BD49C E00C073C AFA20010 */ sw $v0, 0x10($sp) /* 3BD4A0 E00C0740 8C430000 */ lw $v1, ($v0) /* 3BD4A4 E00C0744 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0760.s b/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0760.s index 80b0ffe71d..21ebc6b8ab 100644 --- a/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0760.s +++ b/ver/us/asm/nonmatchings/effects/effect_96/func_E00C0760.s @@ -38,17 +38,17 @@ glabel func_E00C0760 /* 3BD544 E00C07E4 8E060008 */ lw $a2, 8($s0) /* 3BD548 E00C07E8 8E07000C */ lw $a3, 0xc($s0) /* 3BD54C E00C07EC 25080008 */ addiu $t0, $t0, 8 -/* 3BD550 E00C07F0 0C080108 */ jal func_E0200420 +/* 3BD550 E00C07F0 0C080108 */ jal shim_guTranslateF /* 3BD554 E00C07F4 AE280000 */ sw $t0, ($s1) /* 3BD558 E00C07F8 27B20058 */ addiu $s2, $sp, 0x58 /* 3BD55C E00C07FC 8E050028 */ lw $a1, 0x28($s0) /* 3BD560 E00C0800 0240202D */ daddu $a0, $s2, $zero /* 3BD564 E00C0804 00A0302D */ daddu $a2, $a1, $zero -/* 3BD568 E00C0808 0C080110 */ jal func_E0200440 +/* 3BD568 E00C0808 0C080110 */ jal shim_guScaleF /* 3BD56C E00C080C 00A0382D */ daddu $a3, $a1, $zero /* 3BD570 E00C0810 0240202D */ daddu $a0, $s2, $zero /* 3BD574 E00C0814 27A50018 */ addiu $a1, $sp, 0x18 -/* 3BD578 E00C0818 0C080114 */ jal func_E0200450 +/* 3BD578 E00C0818 0C080114 */ jal shim_guMtxCatF /* 3BD57C E00C081C 00A0302D */ daddu $a2, $a1, $zero /* 3BD580 E00C0820 27A40018 */ addiu $a0, $sp, 0x18 /* 3BD584 E00C0824 3C138007 */ lui $s3, %hi(gMatrixListPos) @@ -59,7 +59,7 @@ glabel func_E00C0760 /* 3BD598 E00C0838 8E820000 */ lw $v0, ($s4) /* 3BD59C E00C083C 00052980 */ sll $a1, $a1, 6 /* 3BD5A0 E00C0840 00B52821 */ addu $a1, $a1, $s5 -/* 3BD5A4 E00C0844 0C080118 */ jal func_E0200460 +/* 3BD5A4 E00C0844 0C080118 */ jal shim_guMtxF2L /* 3BD5A8 E00C0848 00452821 */ addu $a1, $v0, $a1 /* 3BD5AC E00C084C 3C02DA38 */ lui $v0, 0xda38 /* 3BD5B0 E00C0850 34420002 */ ori $v0, $v0, 2 @@ -80,34 +80,34 @@ glabel func_E00C0760 /* 3BD5EC E00C088C 8E070038 */ lw $a3, 0x38($s0) /* 3BD5F0 E00C0890 25290001 */ addiu $t1, $t1, 1 /* 3BD5F4 E00C0894 AE280000 */ sw $t0, ($s1) -/* 3BD5F8 E00C0898 0C080108 */ jal func_E0200420 +/* 3BD5F8 E00C0898 0C080108 */ jal shim_guTranslateF /* 3BD5FC E00C089C A6690000 */ sh $t1, ($s3) /* 3BD600 E00C08A0 0240202D */ daddu $a0, $s2, $zero /* 3BD604 E00C08A4 8E050048 */ lw $a1, 0x48($s0) /* 3BD608 E00C08A8 8E06004C */ lw $a2, 0x4c($s0) -/* 3BD60C E00C08AC 0C080110 */ jal func_E0200440 +/* 3BD60C E00C08AC 0C080110 */ jal shim_guScaleF /* 3BD610 E00C08B0 00A0382D */ daddu $a3, $a1, $zero /* 3BD614 E00C08B4 0240202D */ daddu $a0, $s2, $zero /* 3BD618 E00C08B8 27A50018 */ addiu $a1, $sp, 0x18 -/* 3BD61C E00C08BC 0C080114 */ jal func_E0200450 +/* 3BD61C E00C08BC 0C080114 */ jal shim_guMtxCatF /* 3BD620 E00C08C0 00A0302D */ daddu $a2, $a1, $zero /* 3BD624 E00C08C4 44800000 */ mtc1 $zero, $f0 /* 3BD628 E00C08C8 3C073F80 */ lui $a3, 0x3f80 /* 3BD62C E00C08CC E7A00010 */ swc1 $f0, 0x10($sp) /* 3BD630 E00C08D0 8E05002C */ lw $a1, 0x2c($s0) /* 3BD634 E00C08D4 44060000 */ mfc1 $a2, $f0 -/* 3BD638 E00C08D8 0C080104 */ jal func_E0200410 +/* 3BD638 E00C08D8 0C080104 */ jal shim_guRotateF /* 3BD63C E00C08DC 0240202D */ daddu $a0, $s2, $zero /* 3BD640 E00C08E0 0240202D */ daddu $a0, $s2, $zero /* 3BD644 E00C08E4 27A50018 */ addiu $a1, $sp, 0x18 -/* 3BD648 E00C08E8 0C080114 */ jal func_E0200450 +/* 3BD648 E00C08E8 0C080114 */ jal shim_guMtxCatF /* 3BD64C E00C08EC 00A0302D */ daddu $a2, $a1, $zero /* 3BD650 E00C08F0 27A40018 */ addiu $a0, $sp, 0x18 /* 3BD654 E00C08F4 96650000 */ lhu $a1, ($s3) /* 3BD658 E00C08F8 8E820000 */ lw $v0, ($s4) /* 3BD65C E00C08FC 00052980 */ sll $a1, $a1, 6 /* 3BD660 E00C0900 00B52821 */ addu $a1, $a1, $s5 -/* 3BD664 E00C0904 0C080118 */ jal func_E0200460 +/* 3BD664 E00C0904 0C080118 */ jal shim_guMtxF2L /* 3BD668 E00C0908 00452821 */ addu $a1, $v0, $a1 /* 3BD66C E00C090C 3C08D838 */ lui $t0, 0xd838 /* 3BD670 E00C0910 35080002 */ ori $t0, $t0, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_96/fx_96_main.s b/ver/us/asm/nonmatchings/effects/effect_96/fx_96_main.s index d62c8bf84a..24b3bfd187 100644 --- a/ver/us/asm/nonmatchings/effects/effect_96/fx_96_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_96/fx_96_main.s @@ -28,12 +28,12 @@ glabel fx_96_main /* 3BCDBC E00C005C AFB00028 */ sw $s0, 0x28($sp) /* 3BCDC0 E00C0060 AFA00010 */ sw $zero, 0x10($sp) /* 3BCDC4 E00C0064 AFA00024 */ sw $zero, 0x24($sp) -/* 3BCDC8 E00C0068 0C080124 */ jal func_E0200490 +/* 3BCDC8 E00C0068 0C080124 */ jal shim_create_effect_instance /* 3BCDCC E00C006C AFA20014 */ sw $v0, 0x14($sp) /* 3BCDD0 E00C0070 24040060 */ addiu $a0, $zero, 0x60 /* 3BCDD4 E00C0074 24030001 */ addiu $v1, $zero, 1 /* 3BCDD8 E00C0078 0040802D */ daddu $s0, $v0, $zero -/* 3BCDDC E00C007C 0C08012C */ jal func_E02004B0 +/* 3BCDDC E00C007C 0C08012C */ jal shim_general_heap_malloc /* 3BCDE0 E00C0080 AE030008 */ sw $v1, 8($s0) /* 3BCDE4 E00C0084 0040202D */ daddu $a0, $v0, $zero /* 3BCDE8 E00C0088 14800003 */ bnez $a0, .LE00C0098 diff --git a/ver/us/asm/nonmatchings/effects/effect_97/func_E00C212C.s b/ver/us/asm/nonmatchings/effects/effect_97/func_E00C212C.s index b282381266..c714c986d6 100644 --- a/ver/us/asm/nonmatchings/effects/effect_97/func_E00C212C.s +++ b/ver/us/asm/nonmatchings/effects/effect_97/func_E00C212C.s @@ -25,7 +25,7 @@ glabel func_E00C212C /* 3C1344 E00C2174 24430001 */ addiu $v1, $v0, 1 /* 3C1348 E00C2178 04C10005 */ bgez $a2, .LE00C2190 /* 3C134C E00C217C ACA30014 */ sw $v1, 0x14($a1) -/* 3C1350 E00C2180 0C080128 */ jal func_E02004A0 +/* 3C1350 E00C2180 0C080128 */ jal shim_remove_effect /* 3C1354 E00C2184 00000000 */ nop /* 3C1358 E00C2188 08030870 */ j .LE00C21C0 /* 3C135C E00C218C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_97/func_E00C21CC.s b/ver/us/asm/nonmatchings/effects/effect_97/func_E00C21CC.s index 4a89337a41..c3606f7b5a 100644 --- a/ver/us/asm/nonmatchings/effects/effect_97/func_E00C21CC.s +++ b/ver/us/asm/nonmatchings/effects/effect_97/func_E00C21CC.s @@ -12,7 +12,7 @@ glabel func_E00C21CC /* 3C13B8 E00C21E8 AFA40018 */ sw $a0, 0x18($sp) /* 3C13BC E00C21EC 27A40010 */ addiu $a0, $sp, 0x10 /* 3C13C0 E00C21F0 AFBF0020 */ sw $ra, 0x20($sp) -/* 3C13C4 E00C21F4 0C080120 */ jal func_E0200480 +/* 3C13C4 E00C21F4 0C080120 */ jal shim_queue_render_task /* 3C13C8 E00C21F8 AFA20010 */ sw $v0, 0x10($sp) /* 3C13CC E00C21FC 8C430000 */ lw $v1, ($v0) /* 3C13D0 E00C2200 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_97/func_E00C221C.s b/ver/us/asm/nonmatchings/effects/effect_97/func_E00C221C.s index 01d046e88c..afbc9078d5 100644 --- a/ver/us/asm/nonmatchings/effects/effect_97/func_E00C221C.s +++ b/ver/us/asm/nonmatchings/effects/effect_97/func_E00C221C.s @@ -52,7 +52,7 @@ glabel func_E00C221C /* 3C14A8 E00C22D8 001010C0 */ sll $v0, $s0, 3 /* 3C14AC E00C22DC 02028021 */ addu $s0, $s0, $v0 /* 3C14B0 E00C22E0 001080C0 */ sll $s0, $s0, 3 -/* 3C14B4 E00C22E4 0C080108 */ jal func_E0200420 +/* 3C14B4 E00C22E4 0C080108 */ jal shim_guTranslateF /* 3C14B8 E00C22E8 02038021 */ addu $s0, $s0, $v1 /* 3C14BC E00C22EC C6C00028 */ lwc1 $f0, 0x28($s6) /* 3C14C0 E00C22F0 36731630 */ ori $s3, $s3, 0x1630 @@ -62,11 +62,11 @@ glabel func_E00C221C /* 3C14D0 E00C2300 0220202D */ daddu $a0, $s1, $zero /* 3C14D4 E00C2304 46007387 */ neg.s $f14, $f14 /* 3C14D8 E00C2308 44057000 */ mfc1 $a1, $f14 -/* 3C14DC E00C230C 0C080110 */ jal func_E0200440 +/* 3C14DC E00C230C 0C080110 */ jal shim_guScaleF /* 3C14E0 E00C2310 00C0382D */ daddu $a3, $a2, $zero /* 3C14E4 E00C2314 0220202D */ daddu $a0, $s1, $zero /* 3C14E8 E00C2318 27A50010 */ addiu $a1, $sp, 0x10 -/* 3C14EC E00C231C 0C080114 */ jal func_E0200450 +/* 3C14EC E00C231C 0C080114 */ jal shim_guMtxCatF /* 3C14F0 E00C2320 00A0302D */ daddu $a2, $a1, $zero /* 3C14F4 E00C2324 27A40010 */ addiu $a0, $sp, 0x10 /* 3C14F8 E00C2328 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -77,7 +77,7 @@ glabel func_E00C221C /* 3C150C E00C233C 8E420000 */ lw $v0, ($s2) /* 3C1510 E00C2340 00052980 */ sll $a1, $a1, 6 /* 3C1514 E00C2344 00B32821 */ addu $a1, $a1, $s3 -/* 3C1518 E00C2348 0C080118 */ jal func_E0200460 +/* 3C1518 E00C2348 0C080118 */ jal shim_guMtxF2L /* 3C151C E00C234C 00452821 */ addu $a1, $v0, $a1 /* 3C1520 E00C2350 3C03DA38 */ lui $v1, 0xda38 /* 3C1524 E00C2354 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_97/fx_97_main.s b/ver/us/asm/nonmatchings/effects/effect_97/fx_97_main.s index af171ed708..cb3551a23b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_97/fx_97_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_97/fx_97_main.s @@ -28,12 +28,12 @@ glabel fx_97_main /* 3C122C E00C205C AFB00028 */ sw $s0, 0x28($sp) /* 3C1230 E00C2060 AFA00010 */ sw $zero, 0x10($sp) /* 3C1234 E00C2064 AFA00024 */ sw $zero, 0x24($sp) -/* 3C1238 E00C2068 0C080124 */ jal func_E0200490 +/* 3C1238 E00C2068 0C080124 */ jal shim_create_effect_instance /* 3C123C E00C206C AFA20014 */ sw $v0, 0x14($sp) /* 3C1240 E00C2070 2404002C */ addiu $a0, $zero, 0x2c /* 3C1244 E00C2074 24030001 */ addiu $v1, $zero, 1 /* 3C1248 E00C2078 0040802D */ daddu $s0, $v0, $zero -/* 3C124C E00C207C 0C08012C */ jal func_E02004B0 +/* 3C124C E00C207C 0C08012C */ jal shim_general_heap_malloc /* 3C1250 E00C2080 AE030008 */ sw $v1, 8($s0) /* 3C1254 E00C2084 0040202D */ daddu $a0, $v0, $zero /* 3C1258 E00C2088 14800003 */ bnez $a0, .LE00C2098 diff --git a/ver/us/asm/nonmatchings/effects/effect_98/func_E00C4178.s b/ver/us/asm/nonmatchings/effects/effect_98/func_E00C4178.s index 3368e845c0..5d7d2136b8 100644 --- a/ver/us/asm/nonmatchings/effects/effect_98/func_E00C4178.s +++ b/ver/us/asm/nonmatchings/effects/effect_98/func_E00C4178.s @@ -25,7 +25,7 @@ glabel func_E00C4178 /* 3CAFB0 E00C41C0 24420001 */ addiu $v0, $v0, 1 /* 3CAFB4 E00C41C4 04A10005 */ bgez $a1, .LE00C41DC /* 3CAFB8 E00C41C8 AC620014 */ sw $v0, 0x14($v1) -/* 3CAFBC E00C41CC 0C080128 */ jal func_E02004A0 +/* 3CAFBC E00C41CC 0C080128 */ jal shim_remove_effect /* 3CAFC0 E00C41D0 00000000 */ nop /* 3CAFC4 E00C41D4 080310AE */ j .LE00C42B8 /* 3CAFC8 E00C41D8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_98/func_E00C42C4.s b/ver/us/asm/nonmatchings/effects/effect_98/func_E00C42C4.s index 6ecc77a7a3..2cf0887906 100644 --- a/ver/us/asm/nonmatchings/effects/effect_98/func_E00C42C4.s +++ b/ver/us/asm/nonmatchings/effects/effect_98/func_E00C42C4.s @@ -12,7 +12,7 @@ glabel func_E00C42C4 /* 3CB0D0 E00C42E0 AFA40018 */ sw $a0, 0x18($sp) /* 3CB0D4 E00C42E4 27A40010 */ addiu $a0, $sp, 0x10 /* 3CB0D8 E00C42E8 AFBF0020 */ sw $ra, 0x20($sp) -/* 3CB0DC E00C42EC 0C080120 */ jal func_E0200480 +/* 3CB0DC E00C42EC 0C080120 */ jal shim_queue_render_task /* 3CB0E0 E00C42F0 AFA20010 */ sw $v0, 0x10($sp) /* 3CB0E4 E00C42F4 8FBF0020 */ lw $ra, 0x20($sp) /* 3CB0E8 E00C42F8 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/effects/effect_98/func_E00C4308.s b/ver/us/asm/nonmatchings/effects/effect_98/func_E00C4308.s index 410162e790..a1a2973d66 100644 --- a/ver/us/asm/nonmatchings/effects/effect_98/func_E00C4308.s +++ b/ver/us/asm/nonmatchings/effects/effect_98/func_E00C4308.s @@ -58,17 +58,17 @@ glabel func_E00C4308 /* 3CB1CC E00C43DC 001010C0 */ sll $v0, $s0, 3 /* 3CB1D0 E00C43E0 02028021 */ addu $s0, $s0, $v0 /* 3CB1D4 E00C43E4 001080C0 */ sll $s0, $s0, 3 -/* 3CB1D8 E00C43E8 0C080108 */ jal func_E0200420 +/* 3CB1D8 E00C43E8 0C080108 */ jal shim_guTranslateF /* 3CB1DC E00C43EC 02038021 */ addu $s0, $s0, $v1 /* 3CB1E0 E00C43F0 27B10060 */ addiu $s1, $sp, 0x60 /* 3CB1E4 E00C43F4 8FC50028 */ lw $a1, 0x28($fp) /* 3CB1E8 E00C43F8 0220202D */ daddu $a0, $s1, $zero /* 3CB1EC E00C43FC 00A0302D */ daddu $a2, $a1, $zero -/* 3CB1F0 E00C4400 0C080110 */ jal func_E0200440 +/* 3CB1F0 E00C4400 0C080110 */ jal shim_guScaleF /* 3CB1F4 E00C4404 00A0382D */ daddu $a3, $a1, $zero /* 3CB1F8 E00C4408 0220202D */ daddu $a0, $s1, $zero /* 3CB1FC E00C440C 27A50020 */ addiu $a1, $sp, 0x20 -/* 3CB200 E00C4410 0C080114 */ jal func_E0200450 +/* 3CB200 E00C4410 0C080114 */ jal shim_guMtxCatF /* 3CB204 E00C4414 00A0302D */ daddu $a2, $a1, $zero /* 3CB208 E00C4418 27A40020 */ addiu $a0, $sp, 0x20 /* 3CB20C E00C441C 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -80,7 +80,7 @@ glabel func_E00C4308 /* 3CB224 E00C4434 8FAF00A8 */ lw $t7, 0xa8($sp) /* 3CB228 E00C4438 00052980 */ sll $a1, $a1, 6 /* 3CB22C E00C443C 00AF2821 */ addu $a1, $a1, $t7 -/* 3CB230 E00C4440 0C080118 */ jal func_E0200460 +/* 3CB230 E00C4440 0C080118 */ jal shim_guMtxF2L /* 3CB234 E00C4444 00452821 */ addu $a1, $v0, $a1 /* 3CB238 E00C4448 3C03DA38 */ lui $v1, 0xda38 /* 3CB23C E00C444C 34630002 */ ori $v1, $v1, 2 @@ -137,7 +137,7 @@ glabel func_E00C4308 /* 3CB304 E00C4514 46806320 */ cvt.s.w $f12, $f12 /* 3CB308 E00C4518 8FAF00A4 */ lw $t7, 0xa4($sp) /* 3CB30C E00C451C C7D40030 */ lwc1 $f20, 0x30($fp) -/* 3CB310 E00C4520 0C080140 */ jal func_E0200500 +/* 3CB310 E00C4520 0C080140 */ jal shim_sin_deg /* 3CB314 E00C4524 01F08021 */ addu $s0, $t7, $s0 /* 3CB318 E00C4528 3C0143FA */ lui $at, 0x43fa /* 3CB31C E00C452C 44811000 */ mtc1 $at, $f2 @@ -151,7 +151,7 @@ glabel func_E00C4308 /* 3CB33C E00C454C 46806320 */ cvt.s.w $f12, $f12 /* 3CB340 E00C4550 4600010D */ trunc.w.s $f4, $f0 /* 3CB344 E00C4554 44112000 */ mfc1 $s1, $f4 -/* 3CB348 E00C4558 0C080140 */ jal func_E0200500 +/* 3CB348 E00C4558 0C080140 */ jal shim_sin_deg /* 3CB34C E00C455C 26940006 */ addiu $s4, $s4, 6 /* 3CB350 E00C4560 3C014348 */ lui $at, 0x4348 /* 3CB354 E00C4564 44811000 */ mtc1 $at, $f2 @@ -203,7 +203,7 @@ glabel func_E00C4308 /* 3CB40C E00C461C 0040A82D */ daddu $s5, $v0, $zero /* 3CB410 E00C4620 AE020000 */ sw $v0, ($s0) /* 3CB414 E00C4624 00A0302D */ daddu $a2, $a1, $zero -/* 3CB418 E00C4628 0C080110 */ jal func_E0200440 +/* 3CB418 E00C4628 0C080110 */ jal shim_guScaleF /* 3CB41C E00C462C 00A0382D */ daddu $a3, $a1, $zero /* 3CB420 E00C4630 27A40020 */ addiu $a0, $sp, 0x20 /* 3CB424 E00C4634 3C118007 */ lui $s1, %hi(gMatrixListPos) @@ -214,7 +214,7 @@ glabel func_E00C4308 /* 3CB438 E00C4648 8E420000 */ lw $v0, ($s2) /* 3CB43C E00C464C 00052980 */ sll $a1, $a1, 6 /* 3CB440 E00C4650 00B32821 */ addu $a1, $a1, $s3 -/* 3CB444 E00C4654 0C080118 */ jal func_E0200460 +/* 3CB444 E00C4654 0C080118 */ jal shim_guMtxF2L /* 3CB448 E00C4658 00452821 */ addu $a1, $v0, $a1 /* 3CB44C E00C465C 3C060102 */ lui $a2, 0x102 /* 3CB450 E00C4660 34C60040 */ ori $a2, $a2, 0x40 @@ -353,14 +353,14 @@ glabel func_E00C4308 /* 3CB63C E00C484C 8E0500AC */ lw $a1, 0xac($s0) /* 3CB640 E00C4850 8E0600D4 */ lw $a2, 0xd4($s0) /* 3CB644 E00C4854 8E0700FC */ lw $a3, 0xfc($s0) -/* 3CB648 E00C4858 0C080180 */ jal func_E0200600 +/* 3CB648 E00C4858 0C080180 */ jal shim_guPositionF /* 3CB64C E00C485C 27A40020 */ addiu $a0, $sp, 0x20 /* 3CB650 E00C4860 27A40020 */ addiu $a0, $sp, 0x20 /* 3CB654 E00C4864 96650000 */ lhu $a1, ($s3) /* 3CB658 E00C4868 8E820000 */ lw $v0, ($s4) /* 3CB65C E00C486C 00052980 */ sll $a1, $a1, 6 /* 3CB660 E00C4870 00B22821 */ addu $a1, $a1, $s2 -/* 3CB664 E00C4874 0C080118 */ jal func_E0200460 +/* 3CB664 E00C4874 0C080118 */ jal shim_guMtxF2L /* 3CB668 E00C4878 00452821 */ addu $a1, $v0, $a1 /* 3CB66C E00C487C 3C088080 */ lui $t0, 0x8080 /* 3CB670 E00C4880 35088081 */ ori $t0, $t0, 0x8081 diff --git a/ver/us/asm/nonmatchings/effects/effect_98/fx_98_main.s b/ver/us/asm/nonmatchings/effects/effect_98/fx_98_main.s index f42a6653db..839f888f6b 100644 --- a/ver/us/asm/nonmatchings/effects/effect_98/fx_98_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_98/fx_98_main.s @@ -28,12 +28,12 @@ glabel fx_98_main /* 3CAE4C E00C405C AFB00028 */ sw $s0, 0x28($sp) /* 3CAE50 E00C4060 AFA00010 */ sw $zero, 0x10($sp) /* 3CAE54 E00C4064 AFA00024 */ sw $zero, 0x24($sp) -/* 3CAE58 E00C4068 0C080124 */ jal func_E0200490 +/* 3CAE58 E00C4068 0C080124 */ jal shim_create_effect_instance /* 3CAE5C E00C406C AFA20014 */ sw $v0, 0x14($sp) /* 3CAE60 E00C4070 24040174 */ addiu $a0, $zero, 0x174 /* 3CAE64 E00C4074 24030001 */ addiu $v1, $zero, 1 /* 3CAE68 E00C4078 0040802D */ daddu $s0, $v0, $zero -/* 3CAE6C E00C407C 0C08012C */ jal func_E02004B0 +/* 3CAE6C E00C407C 0C08012C */ jal shim_general_heap_malloc /* 3CAE70 E00C4080 AE030008 */ sw $v1, 8($s0) /* 3CAE74 E00C4084 0040182D */ daddu $v1, $v0, $zero /* 3CAE78 E00C4088 14600003 */ bnez $v1, .LE00C4098 diff --git a/ver/us/asm/nonmatchings/effects/effect_99/func_E00C639C.s b/ver/us/asm/nonmatchings/effects/effect_99/func_E00C639C.s index ff6d3ff160..f249ab0652 100644 --- a/ver/us/asm/nonmatchings/effects/effect_99/func_E00C639C.s +++ b/ver/us/asm/nonmatchings/effects/effect_99/func_E00C639C.s @@ -36,7 +36,7 @@ glabel func_E00C639C /* 3CCDF0 E00C6410 00000000 */ nop /* 3CCDF4 E00C6414 16230014 */ bne $s1, $v1, .LE00C6468 /* 3CCDF8 E00C6418 00000000 */ nop -/* 3CCDFC E00C641C 0C080150 */ jal func_E0200540 +/* 3CCDFC E00C641C 0C080150 */ jal shim_load_effect /* 3CCE00 E00C6420 24040063 */ addiu $a0, $zero, 0x63 /* 3CCE04 E00C6424 C6000010 */ lwc1 $f0, 0x10($s0) /* 3CCE08 E00C6428 E7A00010 */ swc1 $f0, 0x10($sp) @@ -59,7 +59,7 @@ glabel func_E00C639C /* 3CCE48 E00C6468 8E020020 */ lw $v0, 0x20($s0) /* 3CCE4C E00C646C 04410005 */ bgez $v0, .LE00C6484 /* 3CCE50 E00C6470 24020001 */ addiu $v0, $zero, 1 -/* 3CCE54 E00C6474 0C080128 */ jal func_E02004A0 +/* 3CCE54 E00C6474 0C080128 */ jal shim_remove_effect /* 3CCE58 E00C6478 0240202D */ daddu $a0, $s2, $zero /* 3CCE5C E00C647C 080319D2 */ j .LE00C6748 /* 3CCE60 E00C6480 00000000 */ nop @@ -81,7 +81,7 @@ glabel func_E00C639C .LE00C64B8: /* 3CCE98 E00C64B8 144000A3 */ bnez $v0, .LE00C6748 /* 3CCE9C E00C64BC 00000000 */ nop -/* 3CCEA0 E00C64C0 0C080150 */ jal func_E0200540 +/* 3CCEA0 E00C64C0 0C080150 */ jal shim_load_effect /* 3CCEA4 E00C64C4 24040063 */ addiu $a0, $zero, 0x63 /* 3CCEA8 E00C64C8 C6000010 */ lwc1 $f0, 0x10($s0) /* 3CCEAC E00C64CC E7A00010 */ swc1 $f0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/effects/effect_99/func_E00C6768.s b/ver/us/asm/nonmatchings/effects/effect_99/func_E00C6768.s index 1fa0e6f093..f0309dae92 100644 --- a/ver/us/asm/nonmatchings/effects/effect_99/func_E00C6768.s +++ b/ver/us/asm/nonmatchings/effects/effect_99/func_E00C6768.s @@ -12,7 +12,7 @@ glabel func_E00C6768 /* 3CD164 E00C6784 AFA40018 */ sw $a0, 0x18($sp) /* 3CD168 E00C6788 27A40010 */ addiu $a0, $sp, 0x10 /* 3CD16C E00C678C AFBF0020 */ sw $ra, 0x20($sp) -/* 3CD170 E00C6790 0C080120 */ jal func_E0200480 +/* 3CD170 E00C6790 0C080120 */ jal shim_queue_render_task /* 3CD174 E00C6794 AFA20010 */ sw $v0, 0x10($sp) /* 3CD178 E00C6798 8C430000 */ lw $v1, ($v0) /* 3CD17C E00C679C 34630002 */ ori $v1, $v1, 2 diff --git a/ver/us/asm/nonmatchings/effects/effect_99/func_E00C67B0.s b/ver/us/asm/nonmatchings/effects/effect_99/func_E00C67B0.s index f7e5e9f87b..10f3f0b882 100644 --- a/ver/us/asm/nonmatchings/effects/effect_99/func_E00C67B0.s +++ b/ver/us/asm/nonmatchings/effects/effect_99/func_E00C67B0.s @@ -135,15 +135,15 @@ glabel func_E00C67B0 /* 3CD394 E00C69B4 46020000 */ add.s $f0, $f0, $f2 /* 3CD398 E00C69B8 4600B386 */ mov.s $f14, $f22 /* 3CD39C E00C69BC E644FFD8 */ swc1 $f4, -0x28($s2) -/* 3CD3A0 E00C69C0 0C080148 */ jal func_E0200520 +/* 3CD3A0 E00C69C0 0C080148 */ jal shim_atan2 /* 3CD3A4 E00C69C4 E640FFDC */ swc1 $f0, -0x24($s2) /* 3CD3A8 E00C69C8 C6420000 */ lwc1 $f2, ($s2) /* 3CD3AC E00C69CC 46000507 */ neg.s $f20, $f0 /* 3CD3B0 E00C69D0 4602A500 */ add.s $f20, $f20, $f2 -/* 3CD3B4 E00C69D4 0C080140 */ jal func_E0200500 +/* 3CD3B4 E00C69D4 0C080140 */ jal shim_sin_deg /* 3CD3B8 E00C69D8 4600A306 */ mov.s $f12, $f20 /* 3CD3BC E00C69DC 4600A306 */ mov.s $f12, $f20 -/* 3CD3C0 E00C69E0 0C080144 */ jal func_E0200510 +/* 3CD3C0 E00C69E0 0C080144 */ jal shim_cos_deg /* 3CD3C4 E00C69E4 E640FFE0 */ swc1 $f0, -0x20($s2) /* 3CD3C8 E00C69E8 C642FFD8 */ lwc1 $f2, -0x28($s2) /* 3CD3CC E00C69EC 4616103C */ c.lt.s $f2, $f22 @@ -175,23 +175,23 @@ glabel func_E00C67B0 /* 3CD42C E00C6A4C 44103000 */ mfc1 $s0, $f6 /* 3CD430 E00C6A50 4600018D */ trunc.w.s $f6, $f0 /* 3CD434 E00C6A54 44113000 */ mfc1 $s1, $f6 -/* 3CD438 E00C6A58 0C080108 */ jal func_E0200420 +/* 3CD438 E00C6A58 0C080108 */ jal shim_guTranslateF /* 3CD43C E00C6A5C 26D60001 */ addiu $s6, $s6, 1 /* 3CD440 E00C6A60 4405C000 */ mfc1 $a1, $f24 /* 3CD444 E00C6A64 4406C000 */ mfc1 $a2, $f24 /* 3CD448 E00C6A68 4407C000 */ mfc1 $a3, $f24 -/* 3CD44C E00C6A6C 0C080110 */ jal func_E0200440 +/* 3CD44C E00C6A6C 0C080110 */ jal shim_guScaleF /* 3CD450 E00C6A70 02A0202D */ daddu $a0, $s5, $zero /* 3CD454 E00C6A74 02A0202D */ daddu $a0, $s5, $zero /* 3CD458 E00C6A78 27A50018 */ addiu $a1, $sp, 0x18 -/* 3CD45C E00C6A7C 0C080114 */ jal func_E0200450 +/* 3CD45C E00C6A7C 0C080114 */ jal shim_guMtxCatF /* 3CD460 E00C6A80 00A0302D */ daddu $a2, $a1, $zero /* 3CD464 E00C6A84 27A40018 */ addiu $a0, $sp, 0x18 /* 3CD468 E00C6A88 96E50000 */ lhu $a1, ($s7) /* 3CD46C E00C6A8C 8FC20000 */ lw $v0, ($fp) /* 3CD470 E00C6A90 00052980 */ sll $a1, $a1, 6 /* 3CD474 E00C6A94 00B42821 */ addu $a1, $a1, $s4 -/* 3CD478 E00C6A98 0C080118 */ jal func_E0200460 +/* 3CD478 E00C6A98 0C080118 */ jal shim_guMtxF2L /* 3CD47C E00C6A9C 00452821 */ addu $a1, $v0, $a1 /* 3CD480 E00C6AA0 3C02DA38 */ lui $v0, 0xda38 /* 3CD484 E00C6AA4 34420002 */ ori $v0, $v0, 2 @@ -219,24 +219,24 @@ glabel func_E00C67B0 /* 3CD4DC E00C6AFC 8E45FFFC */ lw $a1, -4($s2) /* 3CD4E0 E00C6B00 8E46FFF8 */ lw $a2, -8($s2) /* 3CD4E4 E00C6B04 25080008 */ addiu $t0, $t0, 8 -/* 3CD4E8 E00C6B08 0C080110 */ jal func_E0200440 +/* 3CD4E8 E00C6B08 0C080110 */ jal shim_guScaleF /* 3CD4EC E00C6B0C AE680000 */ sw $t0, ($s3) /* 3CD4F0 E00C6B10 E7BC0010 */ swc1 $f28, 0x10($sp) /* 3CD4F4 E00C6B14 8E450000 */ lw $a1, ($s2) /* 3CD4F8 E00C6B18 4406B000 */ mfc1 $a2, $f22 /* 3CD4FC E00C6B1C 4407B000 */ mfc1 $a3, $f22 -/* 3CD500 E00C6B20 0C080104 */ jal func_E0200410 +/* 3CD500 E00C6B20 0C080104 */ jal shim_guRotateF /* 3CD504 E00C6B24 02A0202D */ daddu $a0, $s5, $zero /* 3CD508 E00C6B28 02A0202D */ daddu $a0, $s5, $zero /* 3CD50C E00C6B2C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3CD510 E00C6B30 0C080114 */ jal func_E0200450 +/* 3CD510 E00C6B30 0C080114 */ jal shim_guMtxCatF /* 3CD514 E00C6B34 00A0302D */ daddu $a2, $a1, $zero /* 3CD518 E00C6B38 27A40018 */ addiu $a0, $sp, 0x18 /* 3CD51C E00C6B3C 96E50000 */ lhu $a1, ($s7) /* 3CD520 E00C6B40 8FC20000 */ lw $v0, ($fp) /* 3CD524 E00C6B44 00052980 */ sll $a1, $a1, 6 /* 3CD528 E00C6B48 00B42821 */ addu $a1, $a1, $s4 -/* 3CD52C E00C6B4C 0C080118 */ jal func_E0200460 +/* 3CD52C E00C6B4C 0C080118 */ jal shim_guMtxF2L /* 3CD530 E00C6B50 00452821 */ addu $a1, $v0, $a1 /* 3CD534 E00C6B54 3C06D838 */ lui $a2, 0xd838 /* 3CD538 E00C6B58 8E650000 */ lw $a1, ($s3) diff --git a/ver/us/asm/nonmatchings/effects/effect_99/fx_99_main.s b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_main.s index 6c0cec9949..1c550c2a27 100644 --- a/ver/us/asm/nonmatchings/effects/effect_99/fx_99_main.s +++ b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_main.s @@ -40,13 +40,13 @@ glabel fx_99_main /* 3CCA68 E00C6088 24020063 */ addiu $v0, $zero, 0x63 /* 3CCA6C E00C608C AFA00010 */ sw $zero, 0x10($sp) /* 3CCA70 E00C6090 AFA00024 */ sw $zero, 0x24($sp) -/* 3CCA74 E00C6094 0C080124 */ jal func_E0200490 +/* 3CCA74 E00C6094 0C080124 */ jal shim_create_effect_instance /* 3CCA78 E00C6098 AFA20014 */ sw $v0, 0x14($sp) /* 3CCA7C E00C609C 00132140 */ sll $a0, $s3, 5 /* 3CCA80 E00C60A0 00932023 */ subu $a0, $a0, $s3 /* 3CCA84 E00C60A4 00042080 */ sll $a0, $a0, 2 /* 3CCA88 E00C60A8 0040A02D */ daddu $s4, $v0, $zero -/* 3CCA8C E00C60AC 0C08012C */ jal func_E02004B0 +/* 3CCA8C E00C60AC 0C08012C */ jal shim_general_heap_malloc /* 3CCA90 E00C60B0 AE930008 */ sw $s3, 8($s4) /* 3CCA94 E00C60B4 0040802D */ daddu $s0, $v0, $zero /* 3CCA98 E00C60B8 16000003 */ bnez $s0, .LE00C60C8 @@ -115,13 +115,13 @@ glabel fx_99_main /* 3CCB88 E00C61A8 2402007B */ addiu $v0, $zero, 0x7b /* 3CCB8C E00C61AC AE030028 */ sw $v1, 0x28($s0) /* 3CCB90 E00C61B0 AE020040 */ sw $v0, 0x40($s0) -/* 3CCB94 E00C61B4 0C080138 */ jal func_E02004E0 +/* 3CCB94 E00C61B4 0C080138 */ jal shim_rand_int /* 3CCB98 E00C61B8 AE030044 */ sw $v1, 0x44($s0) /* 3CCB9C E00C61BC 24040040 */ addiu $a0, $zero, 0x40 /* 3CCBA0 E00C61C0 44820000 */ mtc1 $v0, $f0 /* 3CCBA4 E00C61C4 00000000 */ nop /* 3CCBA8 E00C61C8 46800020 */ cvt.s.w $f0, $f0 -/* 3CCBAC E00C61CC 0C080138 */ jal func_E02004E0 +/* 3CCBAC E00C61CC 0C080138 */ jal shim_rand_int /* 3CCBB0 E00C61D0 E600004C */ swc1 $f0, 0x4c($s0) /* 3CCBB4 E00C61D4 3C013E4C */ lui $at, 0x3e4c /* 3CCBB8 E00C61D8 3421CCCD */ ori $at, $at, 0xcccd @@ -157,7 +157,7 @@ glabel fx_99_main /* 3CCC2C E00C624C 2402007B */ addiu $v0, $zero, 0x7b /* 3CCC30 E00C6250 AE030028 */ sw $v1, 0x28($s0) /* 3CCC34 E00C6254 AE020040 */ sw $v0, 0x40($s0) -/* 3CCC38 E00C6258 0C080138 */ jal func_E02004E0 +/* 3CCC38 E00C6258 0C080138 */ jal shim_rand_int /* 3CCC3C E00C625C AE030044 */ sw $v1, 0x44($s0) /* 3CCC40 E00C6260 4482C000 */ mtc1 $v0, $f24 /* 3CCC44 E00C6264 00000000 */ nop @@ -185,7 +185,7 @@ glabel fx_99_main /* 3CCC98 E00C62B8 E60AFF90 */ swc1 $f10, -0x70($s0) /* 3CCC9C E00C62BC C7AA0084 */ lwc1 $f10, 0x84($sp) /* 3CCCA0 E00C62C0 4600A306 */ mov.s $f12, $f20 -/* 3CCCA4 E00C62C4 0C080140 */ jal func_E0200500 +/* 3CCCA4 E00C62C4 0C080140 */ jal shim_sin_deg /* 3CCCA8 E00C62C8 E60AFF94 */ swc1 $f10, -0x6c($s0) /* 3CCCAC E00C62CC 3C0140A0 */ lui $at, 0x40a0 /* 3CCCB0 E00C62D0 44815000 */ mtc1 $at, $f10 @@ -193,20 +193,20 @@ glabel fx_99_main /* 3CCCB8 E00C62D8 460A0002 */ mul.s $f0, $f0, $f10 /* 3CCCBC E00C62DC 00000000 */ nop /* 3CCCC0 E00C62E0 4600A306 */ mov.s $f12, $f20 -/* 3CCCC4 E00C62E4 0C080144 */ jal func_E0200510 +/* 3CCCC4 E00C62E4 0C080144 */ jal shim_cos_deg /* 3CCCC8 E00C62E8 E600FFE8 */ swc1 $f0, -0x18($s0) /* 3CCCCC E00C62EC 46000000 */ add.s $f0, $f0, $f0 /* 3CCCD0 E00C62F0 2652002D */ addiu $s2, $s2, 0x2d /* 3CCCD4 E00C62F4 461E0000 */ add.s $f0, $f0, $f30 /* 3CCCD8 E00C62F8 26310001 */ addiu $s1, $s1, 1 /* 3CCCDC E00C62FC 24040040 */ addiu $a0, $zero, 0x40 -/* 3CCCE0 E00C6300 0C080138 */ jal func_E02004E0 +/* 3CCCE0 E00C6300 0C080138 */ jal shim_rand_int /* 3CCCE4 E00C6304 E600FFEC */ swc1 $f0, -0x14($s0) /* 3CCCE8 E00C6308 24040040 */ addiu $a0, $zero, 0x40 /* 3CCCEC E00C630C 44820000 */ mtc1 $v0, $f0 /* 3CCCF0 E00C6310 00000000 */ nop /* 3CCCF4 E00C6314 46800020 */ cvt.s.w $f0, $f0 -/* 3CCCF8 E00C6318 0C080138 */ jal func_E02004E0 +/* 3CCCF8 E00C6318 0C080138 */ jal shim_rand_int /* 3CCCFC E00C631C E600FFD4 */ swc1 $f0, -0x2c($s0) /* 3CCD00 E00C6320 44820000 */ mtc1 $v0, $f0 /* 3CCD04 E00C6324 00000000 */ nop diff --git a/ver/us/effect_shims.yaml b/ver/us/effect_shims.yaml index 51b17dd9b3..2fb17c8044 100644 --- a/ver/us/effect_shims.yaml +++ b/ver/us/effect_shims.yaml @@ -1,40 +1,40 @@ -- func_E0200410 -- func_E0200420 -- func_E0200430 -- func_E0200440 -- func_E0200450 -- func_E0200460 -- func_E0200470 -- func_E0200480 -- func_E0200490 -- func_E02004A0 -- func_E02004B0 -- func_E02004C0 -- func_E02004D0 -- func_E02004E0 -- func_E02004F0 -- func_E0200500 -- func_E0200510 -- func_E0200520 -- func_E0200530 -- func_E0200540 -- func_E0200550 -- func_E0200560 -- func_E0200570 -- func_E0200580 -- func_E0200590 -- func_E02005A0 -- func_E02005B0 -- func_E02005C0 -- func_E02005D0 -- func_E02005E0 -- func_E02005F0 -- func_E0200600 -- func_E0200610 -- func_E0200620 -- func_E0200630 -- func_E0200640 -- func_E0200650 -- func_E0200660 -- func_E0200670 -- func_E0200680 +- shim_guRotateF +- shim_guTranslateF +- shim_guTranslate +- shim_guScaleF +- shim_guMtxCatF +- shim_guMtxF2L +- shim_guMtxL2F +- shim_queue_render_task +- shim_create_effect_instance +- shim_remove_effect +- shim_general_heap_malloc +- shim_mem_clear +- shim_NULL +- shim_rand_int +- shim_clamp_angle +- shim_sin_deg +- shim_cos_deg +- shim_atan2 +- shim_npc_raycast_down_sides +- shim_load_effect +- shim_sqrtf +- shim_mdl_draw_hidden_panel_surface +- shim_func_8011CFBC +- shim_guPerspectiveF +- shim_guMtxIdentF +- shim_transform_point +- shim_guLookAtHiliteF +- shim_set_screen_overlay_params_back +- shim_set_screen_overlay_center +- shim_set_screen_overlay_center_worldpos +- shim_mdl_get_next_texture_address +- shim_guPositionF +- shim_guOrthoF +- shim_guFrustumF +- shim_func_80138D88 +- shim_draw_box +- shim_draw_msg +- shim_get_msg_width +- shim_get_background_color_blend +- shim_sfx_play_sound_at_position diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 25f90875f4..7d3ebb0aef 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -696,23 +696,23 @@ segments: start: 0xA5DD0 vram: 0x8010F6D0 subsegments: - - [0xa5dd0, c, a5dd0_len_114e0] + - [0xA5DD0, c, a5dd0_len_114e0] - [0xB4580, c, B4580] - - [0xb72b0, c, entity] + - [0xB72B0, c, entity] - [0xB9D60, c, msg] - [0xC50A0, c, C50A0] - - [0xcd180, c, cd180_len_38f0] + - [0xCD180, c, cd180_len_38f0] - [0xCEE40, c, CEE40] - - [0xd0a70, c, d0a70_len_4fe0] - - [0xd5a50, c, hud_element] - - [0xdba20, c, dba20_len_350] - - [0xdbd70, c, trigger] - - [0xdc470, c, dc470_len_14c0] - - [0xdd930, c, dd930_len_1c0] - - [0xddaf0, c, ddaf0_len_c50] - - [0xde740, c, de740_len_23f0] + - [0xD0A70, c, d0a70_len_4fe0] + - [0xD5A50, c, hud_element] + - [0xDBA20, c, dba20_len_350] + - [0xDBD70, c, trigger] + - [0xDC470, c, dc470_len_14c0] + - [0xDD930, c, dd930_len_1c0] + - [0xDDAF0, c, ddaf0_len_c50] + - [0xDE740, c, de740_len_23f0] - [0xDF950, c, DF950] - - [0xe0b30, c, e0b30_len_b80] + - [0xE0B30, c, e0b30_len_b80] - [0xE16B0, .data, a5dd0_len_114e0] - [0xE2950, .data, B4580] - [0xE2960, .data, entity] @@ -731,36 +731,24 @@ segments: start: 0xE79B0 vram: 0x802C3000 subsegments: - - [0xe79b0, c, script_list] - - [0xe92d0, c, evt] + - [0xE79B0, c, script_list] + - [0xE92D0, c, evt] - [0xED510, c, map_api] - - [0xef070, c, cam_api] - - [0xf2470, c, npc_api] - - [0xf4c60, c, msg_api] - - [0xf5750, c, player_api] - - [0xf8f60, c, f8f60_len_1560] - - [0xfa4c0, c, fa4c0_len_3bf0] + - [0xEF070, c, cam_api] + - [0xF2470, c, npc_api] + - [0xF4C60, c, msg_api] + - [0xF5750, c, player_api] + - [0xF8F60, c, f8f60_len_1560] + - [0xFA4C0, c, fa4c0_len_3bf0] - [0xFBE10, c, fx_api] - - [0xfe0b0, c, demo_api] - - [0xFE650, .data, script_list] - - [0xFE660, .data, cam_api] - - [0xFE6D0, .data, player_api] - - [0xFE6E0, .data, fa4c0_len_3bf0] - - [0xFE700, .data, fx_api] - - [0xFE720, .data, evt] - - [0xFE730, .rodata, script_list] - - [0xFE748, .rodata, evt] - - [0xFEB80, .rodata, cam_api] - - [0xFEB90, .rodata, npc_api] - - [0xFEBA0, .rodata, msg_api] - - [0xFEBB8, .rodata, player_api] - - [0xFEC08, .rodata, fx_api] + - [0xFE0B0, c, demo_api] + - [0xFE650] - type: code start: 0xFEE30 vram: 0x802DBD40 subsegments: - - [0x0fee30, c, sprite] - - [0x101b90, c, 101b90_len_8f0] + - [0x0FEE30, c, sprite] + - [0x101B90, c, 101b90_len_8f0] - [0x102480] - type: code start: 0x102610 @@ -2219,7 +2207,7 @@ segments: vram: 0xE0002000 subsegments: - [0x3278F0, c, effect_1] - - [0x328050, data] + - [0x328050] - name: effect_6 dir: effects type: code @@ -2227,7 +2215,7 @@ segments: vram: 0xE000C000 subsegments: - [0x328110, c, effect_6] - - [0x328D20, data] + - [0x328D20] - [0x328EA0, bin] # effect 6,7,23,29,39 gfx - name: effect_7 dir: effects diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index a543b6660f..6c92dc8ea0 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -805,7 +805,7 @@ func_80059D48 = 0x80059D48; // type:func rom:0x35148 update_effects = 0x80059D50; // type:func rom:0x35150 render_effects_world = 0x80059EF4; // type:func rom:0x352F4 render_effects_UI = 0x80059F94; // type:func rom:0x35394 -func_8005A2BC = 0x8005A2BC; // type:func rom:0x356BC +create_effect_instance = 0x8005A2BC; // type:func rom:0x356BC remove_effect = 0x8005A450; // type:func rom:0x35850 remove_all_effects = 0x8005A4E0; // type:func rom:0x358E0 load_effect = 0x8005A564; // type:func rom:0x35964 @@ -4839,62 +4839,62 @@ func_802BD4E8 = 0x802BD4E8; // type:func rom:0x3255B8 func_E0200000 = 0xE0200000; // type:func rom:0x325AD0 func_E0200044 = 0xE0200044; // type:func rom:0x325B14 func_E02000AC = 0xE02000AC; // type:func rom:0x325B7C -func_E0200410 = 0xE0200410; // type:func rom:0x325EE0 -func_E0200420 = 0xE0200420; // type:func rom:0x325EF0 -func_E0200430 = 0xE0200430; // type:func rom:0x325F00 -func_E0200440 = 0xE0200440; // type:func rom:0x325F10 -func_E0200450 = 0xE0200450; // type:func rom:0x325F20 -func_E0200460 = 0xE0200460; // type:func rom:0x325F30 -func_E0200470 = 0xE0200470; // type:func rom:0x325F40 -func_E0200480 = 0xE0200480; // type:func rom:0x325F50 -func_E0200490 = 0xE0200490; // type:func rom:0x325F60 -func_E02004A0 = 0xE02004A0; // type:func rom:0x325F70 -func_E02004B0 = 0xE02004B0; // type:func rom:0x325F80 -func_E02004C0 = 0xE02004C0; // type:func rom:0x325F90 -func_E02004D0 = 0xE02004D0; // type:func rom:0x325FA0 -func_E02004E0 = 0xE02004E0; // type:func rom:0x325FB0 -func_E02004F0 = 0xE02004F0; // type:func rom:0x325FC0 -func_E0200500 = 0xE0200500; // type:func rom:0x325FD0 -func_E0200510 = 0xE0200510; // type:func rom:0x325FE0 -func_E0200520 = 0xE0200520; // type:func rom:0x325FF0 -func_E0200530 = 0xE0200530; // type:func rom:0x326000 -func_E0200540 = 0xE0200540; // type:func rom:0x326010 -func_E0200550 = 0xE0200550; // type:func rom:0x326020 -func_E0200560 = 0xE0200560; // type:func rom:0x326030 -func_E0200570 = 0xE0200570; // type:func rom:0x326040 -func_E0200580 = 0xE0200580; // type:func rom:0x326050 -func_E0200590 = 0xE0200590; // type:func rom:0x326060 -func_E02005A0 = 0xE02005A0; // type:func rom:0x326070 -func_E02005B0 = 0xE02005B0; // type:func rom:0x326080 -func_E02005C0 = 0xE02005C0; // type:func rom:0x326090 -func_E02005D0 = 0xE02005D0; // type:func rom:0x3260A0 -func_E02005E0 = 0xE02005E0; // type:func rom:0x3260B0 -func_E02005F0 = 0xE02005F0; // type:func rom:0x3260C0 -func_E0200600 = 0xE0200600; // type:func rom:0x3260D0 -func_E0200610 = 0xE0200610; // type:func rom:0x3260E0 -func_E0200620 = 0xE0200620; // type:func rom:0x3260F0 -func_E0200630 = 0xE0200630; // type:func rom:0x326100 -func_E0200640 = 0xE0200640; // type:func rom:0x326110 -func_E0200650 = 0xE0200650; // type:func rom:0x326120 -func_E0200660 = 0xE0200660; // type:func rom:0x326130 -func_E0200670 = 0xE0200670; // type:func rom:0x326140 -func_E0200680 = 0xE0200680; // type:func rom:0x326150 +shim_guRotateF = 0xE0200410; // type:func rom:0x325EE0 +shim_guTranslateF = 0xE0200420; // type:func rom:0x325EF0 +shim_guTranslate = 0xE0200430; // type:func rom:0x325F00 +shim_guScaleF = 0xE0200440; // type:func rom:0x325F10 +shim_guMtxCatF = 0xE0200450; // type:func rom:0x325F20 +shim_guMtxF2L = 0xE0200460; // type:func rom:0x325F30 +shim_guMtxL2F = 0xE0200470; // type:func rom:0x325F40 +shim_queue_render_task = 0xE0200480; // type:func rom:0x325F50 +shim_create_effect_instance = 0xE0200490; // type:func rom:0x325F60 +shim_remove_effect = 0xE02004A0; // type:func rom:0x325F70 +shim_general_heap_malloc = 0xE02004B0; // type:func rom:0x325F80 +shim_mem_clear = 0xE02004C0; // type:func rom:0x325F90 +shim_NULL = 0xE02004D0; // type:func rom:0x325FA0 +shim_rand_int = 0xE02004E0; // type:func rom:0x325FB0 +shim_clamp_angle = 0xE02004F0; // type:func rom:0x325FC0 +shim_sin_deg = 0xE0200500; // type:func rom:0x325FD0 +shim_cos_deg = 0xE0200510; // type:func rom:0x325FE0 +shim_atan2 = 0xE0200520; // type:func rom:0x325FF0 +shim_npc_raycast_down_sides = 0xE0200530; // type:func rom:0x326000 +shim_load_effect = 0xE0200540; // type:func rom:0x326010 +shim_sqrtf = 0xE0200550; // type:func rom:0x326020 +shim_mdl_draw_hidden_panel_surface = 0xE0200560; // type:func rom:0x326030 +shim_func_8011CFBC = 0xE0200570; // type:func rom:0x326040 +shim_guPerspectiveF = 0xE0200580; // type:func rom:0x326050 +shim_guMtxIdentF = 0xE0200590; // type:func rom:0x326060 +shim_transform_point = 0xE02005A0; // type:func rom:0x326070 +shim_guLookAtHiliteF = 0xE02005B0; // type:func rom:0x326080 +shim_set_screen_overlay_params_back = 0xE02005C0; // type:func rom:0x326090 +shim_set_screen_overlay_center = 0xE02005D0; // type:func rom:0x3260A0 +shim_set_screen_overlay_center_worldpos = 0xE02005E0; // type:func rom:0x3260B0 +shim_mdl_get_next_texture_address = 0xE02005F0; // type:func rom:0x3260C0 +shim_guPositionF = 0xE0200600; // type:func rom:0x3260D0 +shim_guOrthoF = 0xE0200610; // type:func rom:0x3260E0 +shim_guFrustumF = 0xE0200620; // type:func rom:0x3260F0 +shim_func_80138D88 = 0xE0200630; // type:func rom:0x326100 +shim_draw_box = 0xE0200640; // type:func rom:0x326110 +shim_draw_msg = 0xE0200650; // type:func rom:0x326120 +shim_get_msg_width = 0xE0200660; // type:func rom:0x326130 +shim_get_background_color_blend = 0xE0200670; // type:func rom:0x326140 +shim_sfx_play_sound_at_position = 0xE0200680; // type:func rom:0x326150 D_E0200690 = 0xE0200690; // type:data rom:0x326160 effectFuncs = 0xE0200694; // type:data rom:0x326164 D_E0200734 = 0xE0200734; // type:data rom:0x326204 fx_1_main = 0xE0002000; // type:func rom:0x3278F0 -func_E00021B4 = 0xE00021B4; // type:func rom:0x327AA4 -func_E00021BC = 0xE00021BC; // type:func rom:0x327AAC -func_E00022BC = 0xE00022BC; // type:func rom:0x327BAC -func_E0002300 = 0xE0002300; // type:func rom:0x327BF0 +fx_1_init = 0xE00021B4; // type:func rom:0x327AA4 +fx_1_update = 0xE00021BC; // type:func rom:0x327AAC +fx_1_render = 0xE00022BC; // type:func rom:0x327BAC +fx_1_appendGfx = 0xE0002300; // type:func rom:0x327BF0 func_E0002738 = 0xE0002738; // type:func rom:0x328028 func_E000C000 = 0xE000C000; // type:func rom:0x328110 func_E000C094 = 0xE000C094; // type:func rom:0x3281A4 func_E000C0C8 = 0xE000C0C8; // type:func rom:0x3281D8 fx_6_main = 0xE000C160; // type:func rom:0x328270 -func_E000C64C = 0xE000C64C; // type:func rom:0x32875C -func_E000C654 = 0xE000C654; // type:func rom:0x328764 -func_E000C754 = 0xE000C754; // type:func rom:0x328864 +fx_6_init = 0xE000C64C; // type:func rom:0x32875C +fx_6_update = 0xE000C654; // type:func rom:0x328764 +fx_6_renderWorld = 0xE000C754; // type:func rom:0x328864 func_E000C798 = 0xE000C798; // type:func rom:0x3288A8 fx_7_main = 0xE000E000; // type:func rom:0x32C110 func_E000E16C = 0xE000E16C; // type:func rom:0x32C27C @@ -20586,7 +20586,7 @@ D_E0002800 = 0xE0002800; // type:data D_E000CC10 = 0xE000CC10; // type:data D_E000CC24 = 0xE000CC24; // type:data D_E000CD24 = 0xE000CD24; // type:data -D_E000CD70 = 0xE000CD70; // type:data +jtbl_E000CD70 = 0xE000CD70; // type:data D_E000E684 = 0xE000E684; // type:data D_E0010710 = 0xE0010710; // type:data D_E0014780 = 0xE0014780; // type:data