From ac4a51bf8fdc93221d4ba674351b683d0eedfd9b Mon Sep 17 00:00:00 2001 From: KrimtonZ Date: Tue, 24 Mar 2020 11:52:12 -0500 Subject: [PATCH] Rename SkelAnime functions, which in turn modified a bunch of actor functions. Move necessary skelanime function calls to functions.h, remove unnecessary skelanime functions from functions.h, other skelanime cleanup --- .../code/z_player_lib/func_8008F470.s | 6 +- .../z_skelanime/SkelAnime_ChangeAnimation.s | 20 - ...4FE4.s => SkelAnime_ChangeAnimationImpl.s} | 24 +- .../code/z_skelanime/SkelAnime_Draw.s | 181 - .../{func_800A2288.s => SkelAnime_Draw2.s} | 4 +- ...func_800A180C.s => SkelAnime_DrawLimbSV.s} | 6 +- .../{func_800A1AC8.s => SkelAnime_DrawSV.s} | 4 +- .../z_skelanime/SkelAnime_FrameUpdateMatrix.s | 11 - .../z_skelanime/SkelAnime_GetFrameCount.s | 19 - .../code/z_skelanime/SkelAnime_Init.s | 134 - ...c_800A0D94.s => SkelAnime_LodDrawLimbSV.s} | 6 +- ...{func_800A106C.s => SkelAnime_LodDrawSV.s} | 4 +- .../code/z_skelanime/func_800A08A0.s | 189 - .../code/z_skelanime/func_800A0B40.s | 185 - .../code/z_skelanime/func_800A1344.s | 182 - .../code/z_skelanime/func_800A1D8C.s | 189 - .../code/z_skelanime/func_800A1FC8.s | 16 - .../code/z_skelanime/func_800A2044.s | 158 - .../code/z_skelanime/func_800A24A0.s | 185 - .../code/z_skelanime/func_800A273C.s | 192 - .../code/z_skelanime/func_800A2DBC.s | 16 - .../code/z_skelanime/func_800A2DF4.s | 16 - .../code/z_skelanime/func_800A2E2C.s | 19 - .../code/z_skelanime/func_800A32EC.s | 4 - .../code/z_skelanime/func_800A32F4.s | 9 - .../code/z_skelanime/func_800A3310.s | 11 - .../code/z_skelanime/func_800A3334.s | 18 - .../code/z_skelanime/func_800A336C.s | 76 - .../code/z_skelanime/func_800A3478.s | 28 - .../code/z_skelanime/func_800A34DC.s | 30 - .../code/z_skelanime/func_800A3548.s | 30 - .../code/z_skelanime/func_800A35B4.s | 30 - .../code/z_skelanime/func_800A3620.s | 25 - .../code/z_skelanime/func_800A3678.s | 13 - .../code/z_skelanime/func_800A36A4.s | 32 - .../code/z_skelanime/func_800A3714.s | 26 - .../code/z_skelanime/func_800A3770.s | 37 - .../code/z_skelanime/func_800A37F0.s | 38 - .../code/z_skelanime/func_800A3874.s | 40 - .../code/z_skelanime/func_800A390C.s | 44 - .../code/z_skelanime/func_800A39AC.s | 163 - .../code/z_skelanime/func_800A3B8C.s | 17 - .../code/z_skelanime/func_800A3BC0.s | 11 - .../code/z_skelanime/func_800A3BE4.s | 49 - .../code/z_skelanime/func_800A3C9C.s | 58 - .../code/z_skelanime/func_800A3D70.s | 43 - .../code/z_skelanime/func_800A3E0C.s | 62 - .../code/z_skelanime/func_800A3EE8.s | 10 - .../code/z_skelanime/func_800A3F08.s | 14 +- .../code/z_skelanime/func_800A407C.s | 26 - .../code/z_skelanime/func_800A40DC.s | 27 - .../code/z_skelanime/func_800A4140.s | 25 - .../code/z_skelanime/func_800A419C.s | 26 - .../code/z_skelanime/func_800A41FC.s | 14 - .../code/z_skelanime/func_800A422C.s | 14 - .../code/z_skelanime/func_800A425C.s | 19 - .../code/z_skelanime/func_800A42A0.s | 19 - .../code/z_skelanime/func_800A42E4.s | 16 - .../code/z_skelanime/func_800A431C.s | 41 - .../code/z_skelanime/func_800A43B8.s | 41 - .../code/z_skelanime/func_800A4454.s | 11 - .../code/z_skelanime/func_800A4478.s | 53 - .../code/z_skelanime/func_800A4530.s | 21 - .../code/z_skelanime/func_800A46F8.s | 136 - .../code/z_skelanime/func_800A487C.s | 105 - .../code/z_skelanime/func_800A49B0.s | 23 - .../code/z_skelanime/func_800A4A20.s | 7 +- .../code/z_skelanime/func_800A4C58.s | 20 +- .../code/z_skelanime/func_800A4EE0.s | 77 - .../code/z_skelanime/func_800A51E8.s | 24 - .../code/z_skelanime/func_800A5240.s | 25 - .../code/z_skelanime/func_800A529C.s | 25 - .../code/z_skelanime/func_800A52F8.s | 23 - .../code/z_skelanime/func_800A534C.s | 16 - .../code/z_skelanime/func_800A5384.s | 24 - .../code/z_skelanime/func_800A53DC.s | 13 - .../code/z_skelanime/func_800A5428.s | 31 - .../code/z_skelanime/func_800A5490.s | 32 - .../code/z_skelanime/func_800A54FC.s | 123 - .../code/z_skelanime/func_800A56C8.s | 12 - .../code/z_skelanime/func_800A56F0.s | 59 - .../code/z_skelanime/func_800A5774.s | 22 - .../code/z_skin_awb/func_800A663C.s | 2 +- .../code/z_skin_awb/func_800A6888.s | 2 +- .../ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s | 44 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s | 96 +- .../ovl_Boss_Dodongo/BossDodongo_Destroy.s | 18 +- .../ovl_Boss_Dodongo/BossDodongo_Init.s | 164 +- .../actors/ovl_Boss_Dodongo/func_808C32F4.s | 236 +- .../actors/ovl_Boss_Fd/BossFd_Destroy.s | 30 +- .../actors/ovl_Boss_Fd2/BossFd2_Destroy.s | 18 +- .../actors/ovl_Boss_Fd2/BossFd2_Draw.s | 122 +- .../actors/ovl_Boss_Fd2/BossFd2_Init.s | 56 +- .../actors/ovl_Boss_Fd2/func_808D308C.s | 50 +- .../actors/ovl_Boss_Fd2/func_808D3140.s | 94 +- .../actors/ovl_Boss_Fd2/func_808D3AE0.s | 154 +- .../actors/ovl_Boss_Ganon/BossGanon_Destroy.s | 34 +- .../actors/ovl_Boss_Ganon/BossGanon_Draw.s | 86 +- .../actors/ovl_Boss_Ganon/BossGanon_Init.s | 302 +- .../actors/ovl_Boss_Ganon/func_808D779C.s | 54 +- .../actors/ovl_Boss_Ganon/func_808D7918.s | 942 ++--- .../actors/ovl_Boss_Ganon/func_808D933C.s | 1110 +++--- .../actors/ovl_Boss_Ganon/func_808DB2E8.s | 464 +-- .../actors/ovl_Boss_Ganon/func_808DBAF0.s | 22 +- .../actors/ovl_Boss_Ganon/func_808DC14C.s | 168 +- .../actors/ovl_Boss_Ganon/func_808DC75C.s | 156 +- .../actors/ovl_Boss_Ganon/func_808DCB7C.s | 318 +- .../actors/ovl_Boss_Ganon/func_808DD14C.s | 36 +- .../ovl_Boss_Ganon2/BossGanon2_Destroy.s | 24 +- .../actors/ovl_Boss_Ganon2/BossGanon2_Draw.s | 198 +- .../actors/ovl_Boss_Ganon2/BossGanon2_Init.s | 62 +- .../actors/ovl_Boss_Ganon2/func_808FD5F4.s | 1284 +++--- .../actors/ovl_Boss_Ganon2/func_808FFDB0.s | 54 +- .../actors/ovl_Boss_Ganon2/func_808FFF90.s | 14 +- .../actors/ovl_Boss_Ganon2/func_809000A0.s | 18 +- .../actors/ovl_Boss_Ganon2/func_80900104.s | 60 +- .../actors/ovl_Boss_Ganon2/func_809002CC.s | 22 +- .../actors/ovl_Boss_Ganon2/func_80900344.s | 118 +- .../actors/ovl_Boss_Ganon2/func_80900890.s | 284 +- .../actors/ovl_Boss_Ganon2/func_8090120C.s | 748 ++-- .../BossGanondrof_Destroy.s | 28 +- .../actors/ovl_Boss_Ganondrof/func_80910D80.s | 14 +- .../actors/ovl_Boss_Ganondrof/func_80910DCC.s | 288 +- .../actors/ovl_Boss_Ganondrof/func_80911294.s | 12 +- .../actors/ovl_Boss_Ganondrof/func_809112D4.s | 92 +- .../actors/ovl_Boss_Ganondrof/func_809114E8.s | 22 +- .../actors/ovl_Boss_Ganondrof/func_809121E0.s | 32 +- .../actors/ovl_Boss_Ganondrof/func_809122A4.s | 50 +- .../actors/ovl_Boss_Ganondrof/func_809123D4.s | 22 +- .../actors/ovl_Boss_Ganondrof/func_80912524.s | 20 +- .../actors/ovl_Boss_Ganondrof/func_80912594.s | 394 +- .../actors/ovl_Boss_Ganondrof/func_80912D2C.s | 714 ++-- .../actors/ovl_Boss_Goma/BossGoma_Destroy.s | 18 +- .../actors/ovl_Boss_Goma/BossGoma_Init.s | 86 +- .../actors/ovl_Boss_Sst/BossSst_Draw.s | 222 +- .../actors/ovl_Boss_Sst/BossSst_Init.s | 206 +- .../actors/ovl_Boss_Sst/func_8092CC58.s | 522 +-- .../actors/ovl_Boss_Sst/func_8092DA6C.s | 14 +- .../actors/ovl_Boss_Sst/func_8092DE48.s | 12 +- .../actors/ovl_Boss_Sst/func_8092E25C.s | 18 +- .../actors/ovl_Boss_Sst/func_8092E34C.s | 12 +- .../actors/ovl_Boss_Sst/func_8092E790.s | 14 +- .../actors/ovl_Boss_Sst/func_8092EF28.s | 62 +- .../actors/ovl_Boss_Sst/func_8092FBE4.s | 24 +- .../actors/ovl_Boss_Sst/func_8093051C.s | 128 +- .../actors/ovl_Boss_Sst/func_80931D04.s | 18 +- .../actors/ovl_Boss_Sst/func_809352DC.s | 214 +- .../actors/ovl_Boss_Tw/BossTw_Destroy.s | 30 +- .../overlays/actors/ovl_Boss_Tw/BossTw_Draw.s | 360 +- .../overlays/actors/ovl_Boss_Tw/BossTw_Init.s | 336 +- .../actors/ovl_Boss_Tw/func_8093A0A8.s | 90 +- .../actors/ovl_Boss_Tw/func_8093B1AC.s | 904 ++--- .../actors/ovl_Boss_Tw/func_8093C79C.s | 10 +- .../actors/ovl_Boss_Tw/func_8093C910.s | 492 +-- .../actors/ovl_Boss_Tw/func_8093D3D8.s | 22 +- .../actors/ovl_Boss_Tw/func_8093D5C0.s | 976 ++--- .../actors/ovl_Boss_Tw/func_8093F108.s | 30 +- .../actors/ovl_Boss_Tw/func_8093F1C4.s | 482 +-- .../actors/ovl_Boss_Tw/func_80945084.s | 160 +- .../actors/ovl_Boss_Tw/func_80949530.s | 20 +- .../actors/ovl_Boss_Tw/func_80949BFC.s | 14 +- .../actors/ovl_Boss_Tw/func_80949E10.s | 150 +- .../actors/ovl_Boss_Tw/func_8094A12C.s | 36 +- .../actors/ovl_Boss_Tw/func_8094A1C0.s | 128 +- .../actors/ovl_Boss_Tw/func_8094A608.s | 14 +- .../actors/ovl_Boss_Va/BossVa_Destroy.s | 24 +- .../overlays/actors/ovl_Boss_Va/BossVa_Draw.s | 6 +- .../overlays/actors/ovl_Boss_Va/BossVa_Init.s | 370 +- .../actors/ovl_Boss_Va/func_80954454.s | 238 +- .../actors/ovl_Demo_Du/DemoDu_Destroy.s | 8 +- .../actors/ovl_Demo_Du/func_80969E6C.s | 30 +- .../actors/ovl_Demo_Du/func_8096A360.s | 22 +- .../actors/ovl_Demo_Du/func_8096B3E4.s | 46 +- .../actors/ovl_Demo_Du/func_8096B840.s | 100 +- .../actors/ovl_Demo_Du/func_8096BA2C.s | 22 +- .../actors/ovl_Demo_Du/func_8096BF60.s | 98 +- .../actors/ovl_Demo_Ec/DemoEc_Destroy.s | 8 +- .../actors/ovl_Demo_Ec/func_8096D728.s | 36 +- .../actors/ovl_Demo_Ec/func_8096D8C4.s | 82 +- .../actors/ovl_Demo_Ec/func_8096DA80.s | 146 +- .../actors/ovl_Demo_Ik/func_80983E28.s | 58 +- .../actors/ovl_Demo_Ik/func_8098441C.s | 76 +- .../overlays/actors/ovl_Demo_Im/DemoIm_Init.s | 72 +- .../actors/ovl_Demo_Im/func_80985CE8.s | 66 +- .../actors/ovl_Demo_Im/func_80987658.s | 64 +- .../actors/ovl_Demo_Sa/DemoSa_Destroy.s | 8 +- .../actors/ovl_Demo_Sa/func_8098E7FC.s | 30 +- .../actors/ovl_Demo_Sa/func_8098ECF4.s | 48 +- .../actors/ovl_Demo_Sa/func_8098F1C0.s | 90 +- .../actors/ovl_Demo_Sa/func_8098F390.s | 22 +- .../actors/ovl_Demo_Sa/func_8098F420.s | 22 +- .../actors/ovl_Demo_Sa/func_8098F83C.s | 42 +- .../actors/ovl_Demo_Sa/func_8098FEB4.s | 88 +- .../actors/ovl_Door_Killer/DoorKiller_Init.s | 172 +- .../actors/ovl_Door_Killer/func_80995EC4.s | 30 +- .../actors/ovl_Door_Warp1/func_80998C90.s | 112 +- .../actors/ovl_Door_Warp1/func_80998E5C.s | 74 +- .../actors/ovl_Door_Warp1/func_80998FF4.s | 68 +- .../actors/ovl_Door_Warp1/func_8099A508.s | 46 +- .../actors/ovl_Door_Warp1/func_8099B140.s | 82 +- .../actors/ovl_Door_Warp1/func_8099B33C.s | 124 +- .../overlays/actors/ovl_En_Am/func_809AE538.s | 14 +- .../overlays/actors/ovl_En_Am/func_809AE59C.s | 14 +- .../overlays/actors/ovl_En_Am/func_809AE608.s | 14 +- .../overlays/actors/ovl_En_Am/func_809AE664.s | 14 +- .../overlays/actors/ovl_En_Am/func_809AE6C0.s | 14 +- .../overlays/actors/ovl_En_Ani/EnAni_Draw.s | 56 +- .../overlays/actors/ovl_En_Ani/EnAni_Init.s | 52 +- .../actors/ovl_En_Arrow/EnArrow_Destroy.s | 36 +- .../actors/ovl_En_Arrow/EnArrow_Draw.s | 200 +- .../ovl_En_Attack_Niw/EnAttackNiw_Draw.s | 24 +- .../ovl_En_Attack_Niw/EnAttackNiw_Init.s | 50 +- .../overlays/actors/ovl_En_Bb/func_809B8E34.s | 34 +- .../overlays/actors/ovl_En_Bb/func_809B8EF4.s | 414 +- .../overlays/actors/ovl_En_Bb/func_809B96EC.s | 18 +- .../overlays/actors/ovl_En_Bb/func_809B9A54.s | 24 +- .../overlays/actors/ovl_En_Bb/func_809BA028.s | 28 +- .../overlays/actors/ovl_En_Bb/func_809BA0D8.s | 234 +- .../overlays/actors/ovl_En_Bb/func_809BA458.s | 2 +- .../overlays/actors/ovl_En_Bb/func_809BA590.s | 24 +- .../actors/ovl_En_Bigokuta/EnBigokuta_Draw.s | 158 +- .../actors/ovl_En_Bigokuta/EnBigokuta_Init.s | 64 +- .../actors/ovl_En_Bigokuta/func_809BD318.s | 14 +- .../actors/ovl_En_Bigokuta/func_809BD3F8.s | 20 +- .../actors/ovl_En_Bigokuta/func_809BD4A4.s | 16 +- .../overlays/actors/ovl_En_Bili/EnBili_Draw.s | 68 +- .../actors/ovl_En_Bili/func_809BFA14.s | 14 +- .../actors/ovl_En_Bili/func_809BFA8C.s | 12 +- .../actors/ovl_En_Bili/func_809BFB5C.s | 14 +- .../actors/ovl_En_Bili/func_809BFBC4.s | 20 +- .../actors/ovl_En_Bili/func_809BFC48.s | 18 +- .../ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s | 56 +- .../ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s | 98 +- .../overlays/actors/ovl_En_Box/EnBox_Draw.s | 98 +- .../overlays/actors/ovl_En_Brob/EnBrob_Draw.s | 30 +- .../overlays/actors/ovl_En_Brob/EnBrob_Init.s | 122 +- .../actors/ovl_En_Brob/func_809CAEA0.s | 12 +- .../actors/ovl_En_Brob/func_809CB008.s | 12 +- .../overlays/actors/ovl_En_Bw/EnBw_Draw.s | 202 +- .../overlays/actors/ovl_En_Bw/func_809CE9A8.s | 24 +- .../overlays/actors/ovl_En_Bw/func_809CFBA8.s | 20 +- .../overlays/actors/ovl_En_Bw/func_809CFF10.s | 18 +- .../overlays/actors/ovl_En_Cow/EnCow_Draw.s | 24 +- .../overlays/actors/ovl_En_Cow/EnCow_Init.s | 190 +- .../actors/ovl_En_Cow/func_809E0070.s | 24 +- .../overlays/actors/ovl_En_Crow/EnCrow_Draw.s | 24 +- .../overlays/actors/ovl_En_Crow/EnCrow_Init.s | 48 +- .../actors/ovl_En_Crow/func_809E0770.s | 34 +- .../overlays/actors/ovl_En_Cs/EnCs_Draw.s | 82 +- .../overlays/actors/ovl_En_Cs/EnCs_Init.s | 76 +- .../actors/ovl_En_Daiku/EnDaiku_Draw.s | 50 +- .../actors/ovl_En_Daiku/EnDaiku_Init.s | 140 +- .../EnDaikuKakariko_Draw.s | 50 +- .../EnDaikuKakariko_Init.s | 140 +- .../actors/ovl_En_Dekubaba/func_809E5F44.s | 18 +- .../actors/ovl_En_Dekubaba/func_809E7104.s | 158 +- .../actors/ovl_En_Dekunuts/func_809E9770.s | 12 +- .../actors/ovl_En_Dekunuts/func_809E9800.s | 16 +- .../actors/ovl_En_Dekunuts/func_809E9920.s | 12 +- .../actors/ovl_En_Dekunuts/func_809E9978.s | 14 +- .../actors/ovl_En_Dekunuts/func_809E9AB4.s | 24 +- .../overlays/actors/ovl_En_Dh/EnDh_Draw.s | 132 +- .../overlays/actors/ovl_En_Dh/EnDh_Init.s | 52 +- .../overlays/actors/ovl_En_Dh/func_809EB05C.s | 24 +- .../overlays/actors/ovl_En_Dh/func_809EB4D8.s | 16 +- .../overlays/actors/ovl_En_Dh/func_809EBD78.s | 76 +- .../overlays/actors/ovl_En_Dha/EnDha_Draw.s | 24 +- .../overlays/actors/ovl_En_Dha/EnDha_Init.s | 46 +- .../actors/ovl_En_Dha/func_809EC9C8.s | 24 +- .../ovl_En_Diving_Game/EnDivingGame_Draw.s | 58 +- .../ovl_En_Diving_Game/EnDivingGame_Init.s | 54 +- .../overlays/actors/ovl_En_Dns/EnDns_Draw.s | 24 +- .../overlays/actors/ovl_En_Dns/EnDns_Init.s | 80 +- .../actors/ovl_En_Dodongo/func_809F89CC.s | 18 +- .../overlays/actors/ovl_En_Ds/EnDs_Draw.s | 24 +- .../overlays/actors/ovl_En_Ds/EnDs_Init.s | 34 +- .../overlays/actors/ovl_En_Du/EnDu_Destroy.s | 18 +- .../overlays/actors/ovl_En_Du/EnDu_Init.s | 106 +- .../actors/ovl_En_Eiyer/EnEiyer_Draw.s | 46 +- .../actors/ovl_En_Eiyer/func_80A00218.s | 42 +- .../actors/ovl_En_Eiyer/func_80A004BC.s | 22 +- .../actors/ovl_En_Eiyer/func_80A006B0.s | 22 +- .../overlays/actors/ovl_En_Elf/EnElf_Draw.s | 292 +- .../overlays/actors/ovl_En_Fd/EnFd_Draw.s | 170 +- .../overlays/actors/ovl_En_Fd/EnFd_Init.s | 50 +- .../actors/ovl_En_Firefly/EnFirefly_Draw.s | 40 +- .../actors/ovl_En_Firefly/func_80A14E28.s | 40 +- .../overlays/actors/ovl_En_Fish/EnFish_Draw.s | 28 +- .../overlays/actors/ovl_En_Fish/EnFish_Init.s | 78 +- .../actors/ovl_En_Floormas/EnFloormas_Draw.s | 52 +- .../actors/ovl_En_Floormas/EnFloormas_Init.s | 100 +- .../actors/ovl_En_Floormas/func_80A17808.s | 22 +- .../actors/ovl_En_Floormas/func_80A17D4C.s | 12 +- .../actors/ovl_En_Floormas/func_80A17D9C.s | 14 +- .../actors/ovl_En_Floormas/func_80A1A350.s | 52 +- .../overlays/actors/ovl_En_Fr/EnFr_Update.s | 146 +- .../overlays/actors/ovl_En_Fr/func_80A1CD24.s | 2 +- .../overlays/actors/ovl_En_Fu/EnFu_Draw.s | 76 +- .../overlays/actors/ovl_En_Fu/EnFu_Init.s | 48 +- .../overlays/actors/ovl_En_Fw/EnFw_Draw.s | 36 +- .../overlays/actors/ovl_En_Fw/EnFw_Init.s | 50 +- .../overlays/actors/ovl_En_Gb/EnGb_Draw.s | 74 +- .../overlays/actors/ovl_En_Gb/EnGb_Init.s | 2 +- .../overlays/actors/ovl_En_Ge1/EnGe1_Draw.s | 56 +- .../overlays/actors/ovl_En_Ge1/EnGe1_Init.s | 124 +- .../overlays/actors/ovl_En_Ge2/EnGe2_Draw.s | 54 +- .../overlays/actors/ovl_En_Ge2/EnGe2_Init.s | 92 +- .../overlays/actors/ovl_En_Ge3/EnGe3_Draw.s | 54 +- .../overlays/actors/ovl_En_Ge3/EnGe3_Init.s | 46 +- .../actors/ovl_En_GeldB/EnGeldB_Draw.s | 180 +- .../actors/ovl_En_GeldB/EnGeldB_Init.s | 116 +- .../actors/ovl_En_GeldB/func_80A35D48.s | 24 +- .../actors/ovl_En_GeldB/func_80A367E4.s | 14 +- .../actors/ovl_En_GirlA/EnGirlA_Destroy.s | 12 +- .../overlays/actors/ovl_En_Gm/func_80A3D838.s | 72 +- .../overlays/actors/ovl_En_Gm/func_80A3E1EC.s | 72 +- .../overlays/actors/ovl_En_Go/EnGo_Destroy.s | 18 +- .../overlays/actors/ovl_En_Go/EnGo_Draw.s | 92 +- .../overlays/actors/ovl_En_Go/EnGo_Init.s | 158 +- .../overlays/actors/ovl_En_Go2/EnGo2_Draw.s | 116 +- .../overlays/actors/ovl_En_Go2/EnGo2_Init.s | 238 +- .../overlays/actors/ovl_En_Goma/EnGoma_Init.s | 164 +- .../actors/ovl_En_Goma/func_80A4A470.s | 32 +- .../actors/ovl_En_Guest/EnGuest_Update.s | 72 +- .../actors/ovl_En_Guest/func_80A509D4.s | 68 +- .../actors/ovl_En_Hata/EnHata_Destroy.s | 16 +- .../actors/ovl_En_Hintnuts/func_80A574D4.s | 12 +- .../actors/ovl_En_Hintnuts/func_80A57558.s | 16 +- .../actors/ovl_En_Hintnuts/func_80A576FC.s | 12 +- .../actors/ovl_En_Hintnuts/func_80A57744.s | 12 +- .../actors/ovl_En_Hintnuts/func_80A57790.s | 30 +- .../actors/ovl_En_Hintnuts/func_80A57850.s | 28 +- .../actors/ovl_En_Horse_Ganon/func_80A68AC4.s | 10 +- .../overlays/actors/ovl_En_Hs/EnHs_Draw.s | 24 +- .../overlays/actors/ovl_En_Hs/EnHs_Init.s | 66 +- .../overlays/actors/ovl_En_Hs2/EnHs2_Draw.s | 24 +- .../overlays/actors/ovl_En_Hs2/EnHs2_Init.s | 46 +- .../overlays/actors/ovl_En_Hy/EnHy_Draw.s | 142 +- .../overlays/actors/ovl_En_Hy/func_80A70E34.s | 164 +- .../overlays/actors/ovl_En_Ik/EnIk_Init.s | 52 +- .../overlays/actors/ovl_En_Ik/func_80A76798.s | 192 +- .../overlays/actors/ovl_En_Ik/func_80A7735C.s | 52 +- .../overlays/actors/ovl_En_Ik/func_80A77844.s | 76 +- .../overlays/actors/ovl_En_Ik/func_80A77EDC.s | 76 +- .../overlays/actors/ovl_En_In/EnIn_Draw.s | 76 +- .../overlays/actors/ovl_En_In/func_80A79FB0.s | 184 +- .../overlays/actors/ovl_En_Jj/EnJj_Draw.s | 76 +- .../overlays/actors/ovl_En_Jj/EnJj_Init.s | 116 +- .../overlays/actors/ovl_En_Js/EnJs_Draw.s | 24 +- .../overlays/actors/ovl_En_Js/EnJs_Init.s | 58 +- .../actors/ovl_En_Kakasi/EnKakasi_Draw.s | 34 +- .../actors/ovl_En_Kakasi/EnKakasi_Init.s | 46 +- .../actors/ovl_En_Kakasi2/EnKakasi2_Init.s | 114 +- .../actors/ovl_En_Kakasi2/func_80A90264.s | 110 +- .../actors/ovl_En_Kakasi2/func_80A90948.s | 24 +- .../actors/ovl_En_Kakasi3/EnKakasi3_Draw.s | 24 +- .../actors/ovl_En_Kakasi3/EnKakasi3_Init.s | 40 +- .../overlays/actors/ovl_En_Ko/func_80A99048.s | 170 +- .../overlays/actors/ovl_En_Kz/EnKz_Draw.s | 56 +- .../overlays/actors/ovl_En_Kz/EnKz_Init.s | 72 +- .../actors/ovl_En_Ma1/EnMa1_Destroy.s | 18 +- .../overlays/actors/ovl_En_Ma1/EnMa1_Draw.s | 82 +- .../overlays/actors/ovl_En_Ma1/EnMa1_Init.s | 80 +- .../actors/ovl_En_Ma2/EnMa2_Destroy.s | 18 +- .../overlays/actors/ovl_En_Ma2/EnMa2_Draw.s | 82 +- .../overlays/actors/ovl_En_Ma2/EnMa2_Init.s | 92 +- .../actors/ovl_En_Ma3/EnMa3_Destroy.s | 18 +- .../overlays/actors/ovl_En_Ma3/EnMa3_Draw.s | 82 +- .../overlays/actors/ovl_En_Ma3/EnMa3_Init.s | 78 +- .../overlays/actors/ovl_En_Mb/EnMb_Draw.s | 104 +- .../overlays/actors/ovl_En_Mb/EnMb_Init.s | 136 +- .../overlays/actors/ovl_En_Mb/func_80AA6830.s | 18 +- .../overlays/actors/ovl_En_Mb/func_80AA6898.s | 18 +- .../overlays/actors/ovl_En_Mb/func_80AA68FC.s | 22 +- .../overlays/actors/ovl_En_Mb/func_80AA6B80.s | 18 +- .../overlays/actors/ovl_En_Mb/func_80AA77D0.s | 98 +- .../overlays/actors/ovl_En_Mb/func_80AA7CAC.s | 186 +- .../overlays/actors/ovl_En_Md/EnMd_Init.s | 90 +- .../overlays/actors/ovl_En_Mk/EnMk_Draw.s | 24 +- .../overlays/actors/ovl_En_Mk/EnMk_Init.s | 48 +- .../overlays/actors/ovl_En_Mm/EnMm_Draw.s | 126 +- .../overlays/actors/ovl_En_Mm/EnMm_Init.s | 78 +- .../overlays/actors/ovl_En_Mm2/EnMm2_Draw.s | 56 +- .../overlays/actors/ovl_En_Mm2/EnMm2_Init.s | 80 +- .../overlays/actors/ovl_En_Mu/EnMu_Destroy.s | 8 +- .../overlays/actors/ovl_En_Mu/EnMu_Draw.s | 76 +- .../overlays/actors/ovl_En_Mu/EnMu_Init.s | 46 +- .../overlays/actors/ovl_En_Nb/EnNb_Init.s | 72 +- .../overlays/actors/ovl_En_Nb/func_80AB1E2C.s | 66 +- .../overlays/actors/ovl_En_Nb/func_80AB2E70.s | 54 +- .../overlays/actors/ovl_En_Nb/func_80AB2FE4.s | 64 +- .../overlays/actors/ovl_En_Nb/func_80AB410C.s | 64 +- .../overlays/actors/ovl_En_Niw/EnNiw_Draw.s | 36 +- .../overlays/actors/ovl_En_Niw/EnNiw_Init.s | 190 +- .../actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s | 54 +- .../actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s | 110 +- .../actors/ovl_En_Niw_Lady/func_80AB9F24.s | 178 +- .../actors/ovl_En_Niw_Lady/func_80ABB228.s | 64 +- .../actors/ovl_En_Okuta/func_80AC0B60.s | 16 +- .../actors/ovl_En_Ossan/EnOssan_Destroy.s | 18 +- .../actors/ovl_En_Ossan/func_80AC6ADC.s | 22 +- .../actors/ovl_En_Ossan/func_80AC6B3C.s | 70 +- .../actors/ovl_En_Ossan/func_80AC6C54.s | 56 +- .../actors/ovl_En_Ossan/func_80AC6D30.s | 56 +- .../actors/ovl_En_Ossan/func_80AC6E0C.s | 22 +- .../actors/ovl_En_Ossan/func_80AC6E6C.s | 22 +- .../actors/ovl_En_Ossan/func_80AC6ECC.s | 22 +- .../actors/ovl_En_Ossan/func_80AC7DAC.s | 60 +- .../actors/ovl_En_Ossan/func_80AC80B4.s | 62 +- .../actors/ovl_En_Ossan/func_80AC8244.s | 74 +- .../actors/ovl_En_Ossan/func_80AC83DC.s | 66 +- .../actors/ovl_En_Ossan/func_80AC854C.s | 60 +- .../actors/ovl_En_Ossan/func_80AC8668.s | 60 +- .../actors/ovl_En_Ossan/func_80AC8784.s | 60 +- .../overlays/actors/ovl_En_Owl/EnOwl_Draw.s | 56 +- .../overlays/actors/ovl_En_Owl/EnOwl_Init.s | 212 +- .../actors/ovl_En_Peehat/func_80ACFEB0.s | 14 +- .../actors/ovl_En_Peehat/func_80AD0558.s | 14 +- .../actors/ovl_En_Peehat/func_80AD0720.s | 14 +- .../actors/ovl_En_Peehat/func_80AD0F38.s | 26 +- .../actors/ovl_En_Peehat/func_80AD1AA8.s | 14 +- .../actors/ovl_En_Po_Desert/EnPoDesert_Draw.s | 52 +- .../actors/ovl_En_Po_Desert/func_80AD2E64.s | 68 +- .../actors/ovl_En_Po_Desert/func_80AD2FBC.s | 12 +- .../actors/ovl_En_Po_Field/EnPoField_Draw.s | 98 +- .../actors/ovl_En_Po_Field/func_80AD3F4C.s | 20 +- .../actors/ovl_En_Po_Field/func_80AD3FF0.s | 16 +- .../actors/ovl_En_Po_Field/func_80AD4190.s | 16 +- .../actors/ovl_En_Po_Relay/EnPoRelay_Draw.s | 56 +- .../actors/ovl_En_Po_Relay/EnPoRelay_Init.s | 88 +- .../ovl_En_Po_Sisters/EnPoSisters_Draw.s | 4 +- .../actors/ovl_En_Po_Sisters/func_80AD9368.s | 14 +- .../actors/ovl_En_Po_Sisters/func_80AD93C4.s | 20 +- .../actors/ovl_En_Po_Sisters/func_80AD944C.s | 22 +- .../actors/ovl_En_Po_Sisters/func_80AD94E0.s | 14 +- .../actors/ovl_En_Po_Sisters/func_80AD9568.s | 16 +- .../actors/ovl_En_Po_Sisters/func_80AD96A4.s | 14 +- .../actors/ovl_En_Po_Sisters/func_80AD9AA8.s | 104 +- .../actors/ovl_En_Po_Sisters/func_80AD9E60.s | 26 +- .../actors/ovl_En_Po_Sisters/func_80AD9F1C.s | 12 +- .../actors/ovl_En_Po_Sisters/func_80AD9F90.s | 16 +- .../actors/ovl_En_Po_Sisters/func_80ADA028.s | 12 +- .../actors/ovl_En_Po_Sisters/func_80ADA25C.s | 16 +- .../actors/ovl_En_Po_Sisters/func_80ADA2BC.s | 28 +- .../overlays/actors/ovl_En_Poh/EnPoh_Update.s | 52 +- .../actors/ovl_En_Poh/func_80ADE114.s | 14 +- .../actors/ovl_En_Poh/func_80ADE16C.s | 14 +- .../actors/ovl_En_Poh/func_80ADE1BC.s | 12 +- .../actors/ovl_En_Poh/func_80ADE20C.s | 20 +- .../actors/ovl_En_Poh/func_80ADE368.s | 14 +- .../actors/ovl_En_Poh/func_80ADE514.s | 14 +- .../actors/ovl_En_Poh/func_80AE0EE4.s | 80 +- .../actors/ovl_En_Poh/func_80AE1148.s | 186 +- .../overlays/actors/ovl_En_Rd/EnRd_Draw.s | 76 +- .../overlays/actors/ovl_En_Rd/EnRd_Init.s | 88 +- .../overlays/actors/ovl_En_Rd/func_80AE269C.s | 28 +- .../overlays/actors/ovl_En_Rd/func_80AE2744.s | 122 +- .../overlays/actors/ovl_En_Rd/func_80AE3454.s | 164 +- .../overlays/actors/ovl_En_Rl/EnRl_Destroy.s | 8 +- .../overlays/actors/ovl_En_Rl/func_80AE7544.s | 20 +- .../overlays/actors/ovl_En_Rl/func_80AE7878.s | 22 +- .../overlays/actors/ovl_En_Rl/func_80AE7D94.s | 66 +- .../overlays/actors/ovl_En_Rl/func_80AE7FDC.s | 64 +- .../overlays/actors/ovl_En_Ru1/EnRu1_Init.s | 94 +- .../actors/ovl_En_Ru1/func_80AF0400.s | 90 +- .../actors/ovl_En_Ru1/func_80AF05D4.s | 90 +- .../overlays/actors/ovl_En_Ru2/EnRu2_Init.s | 50 +- .../actors/ovl_En_Ru2/func_80AF321C.s | 66 +- .../actors/ovl_En_Ru2/func_80AF3F20.s | 64 +- .../overlays/actors/ovl_En_Sa/EnSa_Init.s | 110 +- .../overlays/actors/ovl_En_Sb/EnSb_Destroy.s | 18 +- .../overlays/actors/ovl_En_Sb/EnSb_Draw.s | 84 +- .../overlays/actors/ovl_En_Sb/EnSb_Init.s | 42 +- .../actors/ovl_En_Shopnuts/EnShopnuts_Draw.s | 20 +- .../actors/ovl_En_Shopnuts/EnShopnuts_Init.s | 64 +- .../actors/ovl_En_Shopnuts/func_80AFA8E8.s | 12 +- .../actors/ovl_En_Shopnuts/func_80AFA96C.s | 16 +- .../overlays/actors/ovl_En_Skj/EnSkj_Draw.s | 50 +- .../overlays/actors/ovl_En_Skj/EnSkj_Init.s | 196 +- .../actors/ovl_En_Sth/func_80B07734.s | 78 +- .../actors/ovl_En_Sth/func_80B08258.s | 78 +- .../ovl_En_Syateki_Man/EnSyatekiMan_Draw.s | 24 +- .../ovl_En_Syateki_Man/EnSyatekiMan_Init.s | 30 +- .../ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s | 38 +- .../ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s | 60 +- .../overlays/actors/ovl_En_Ta/EnTa_Draw.s | 70 +- .../overlays/actors/ovl_En_Ta/EnTa_Init.s | 308 +- .../ovl_En_Takara_Man/EnTakaraMan_Draw.s | 56 +- .../ovl_En_Takara_Man/EnTakaraMan_Init.s | 42 +- .../actors/ovl_En_Test/func_8085FDD0.s | 18 +- .../actors/ovl_En_Test/func_8085FF28.s | 22 +- .../actors/ovl_En_Test/func_80860068.s | 24 +- .../actors/ovl_En_Test/func_80860438.s | 38 +- .../actors/ovl_En_Test/func_80860BDC.s | 14 +- .../actors/ovl_En_Test/func_80860EC0.s | 32 +- .../actors/ovl_En_Test/func_80862050.s | 14 +- .../actors/ovl_En_Test/func_808627C4.s | 46 +- .../actors/ovl_En_Test/func_80864158.s | 28 +- .../overlays/actors/ovl_En_Tg/EnTg_Destroy.s | 18 +- .../overlays/actors/ovl_En_Tg/EnTg_Draw.s | 50 +- .../overlays/actors/ovl_En_Tg/EnTg_Init.s | 42 +- .../actors/ovl_En_Tite/func_80B18C5C.s | 18 +- .../actors/ovl_En_Tite/func_80B18E7C.s | 330 +- .../actors/ovl_En_Tite/func_80B19524.s | 24 +- .../actors/ovl_En_Tite/func_80B1985C.s | 26 +- .../actors/ovl_En_Tite/func_80B19E28.s | 14 +- .../actors/ovl_En_Tite/func_80B1A76C.s | 40 +- .../actors/ovl_En_Torch2/EnTorch2_Draw.s | 58 +- .../actors/ovl_En_Toryo/EnToryo_Draw.s | 24 +- .../actors/ovl_En_Toryo/EnToryo_Init.s | 102 +- .../overlays/actors/ovl_En_Tr/EnTr_Draw.s | 64 +- .../overlays/actors/ovl_En_Tr/EnTr_Init.s | 62 +- .../overlays/actors/ovl_En_Tr/EnTr_Update.s | 96 +- .../overlays/actors/ovl_En_Tr/func_80B23820.s | 42 +- .../overlays/actors/ovl_En_Tr/func_80B23A88.s | 72 +- .../overlays/actors/ovl_En_Vali/EnVali_Draw.s | 56 +- .../actors/ovl_En_Vali/func_80B26878.s | 12 +- .../actors/ovl_En_Vali/func_80B268FC.s | 16 +- .../actors/ovl_En_Viewer/func_80B2A300.s | 104 +- .../actors/ovl_En_Viewer/func_80B2A448.s | 46 +- .../actors/ovl_En_Viewer/func_80B2A4D8.s | 40 +- .../actors/ovl_En_Viewer/func_80B2A75C.s | 666 ++-- .../actors/ovl_En_Viewer/func_80B2B4A8.s | 228 +- .../actors/ovl_En_Viewer/func_80B2BA38.s | 340 +- .../actors/ovl_En_Viewer/func_80B2C130.s | 50 +- .../actors/ovl_En_Weiyer/EnWeiyer_Draw.s | 46 +- .../actors/ovl_En_Weiyer/func_80B32384.s | 28 +- .../actors/ovl_En_Weiyer/func_80B32434.s | 12 +- .../actors/ovl_En_Weiyer/func_80B32724.s | 16 +- .../overlays/actors/ovl_En_Wf/EnWf_Draw.s | 116 +- .../overlays/actors/ovl_En_Wf/EnWf_Init.s | 88 +- .../overlays/actors/ovl_En_Wf/func_80B3455C.s | 24 +- .../overlays/actors/ovl_En_Wf/func_80B34CFC.s | 14 +- .../overlays/actors/ovl_En_Xc/EnXc_Init.s | 102 +- .../overlays/actors/ovl_En_Xc/func_80B3E908.s | 66 +- .../overlays/actors/ovl_En_Xc/func_80B3EA7C.s | 66 +- .../overlays/actors/ovl_En_Xc/func_80B402C4.s | 2 +- .../overlays/actors/ovl_En_Xc/func_80B414AC.s | 50 +- .../overlays/actors/ovl_En_Xc/func_80B41BA4.s | 66 +- .../overlays/actors/ovl_En_Zf/EnZf_Draw.s | 98 +- .../overlays/actors/ovl_En_Zf/func_80B456B4.s | 28 +- .../overlays/actors/ovl_En_Zf/func_80B4604C.s | 14 +- .../overlays/actors/ovl_En_Zf/func_80B462E4.s | 54 +- .../overlays/actors/ovl_En_Zf/func_80B483E4.s | 88 +- .../overlays/actors/ovl_En_Zf/func_80B49B60.s | 40 +- .../actors/ovl_En_Zl1/EnZl1_Destroy.s | 18 +- .../overlays/actors/ovl_En_Zl1/EnZl1_Draw.s | 78 +- .../overlays/actors/ovl_En_Zl1/EnZl1_Init.s | 154 +- .../actors/ovl_En_Zl2/EnZl2_Destroy.s | 8 +- .../overlays/actors/ovl_En_Zl2/EnZl2_Init.s | 44 +- .../actors/ovl_En_Zl2/func_80B523C8.s | 106 +- .../actors/ovl_En_Zl2/func_80B525D4.s | 90 +- .../overlays/actors/ovl_En_Zl3/EnZl3_Init.s | 50 +- .../actors/ovl_En_Zl3/func_80B59FF4.s | 90 +- .../actors/ovl_En_Zl3/func_80B5A1D0.s | 90 +- .../overlays/actors/ovl_En_Zl4/EnZl4_Draw.s | 92 +- .../overlays/actors/ovl_En_Zl4/EnZl4_Init.s | 70 +- .../overlays/actors/ovl_En_Zo/EnZo_Init.s | 94 +- .../actors/ovl_En_fHG/func_80B62B04.s | 16 +- .../actors/ovl_En_fHG/func_80B62B6C.s | 788 ++-- .../actors/ovl_En_fHG/func_80B63D84.s | 126 +- .../actors/ovl_En_fHG/func_80B6404C.s | 90 +- .../actors/ovl_En_fHG/func_80B6424C.s | 254 +- .../actors/ovl_En_fHG/func_80B6476C.s | 186 +- .../actors/ovl_Fishing/Fishing_Destroy.s | 28 +- .../actors/ovl_Fishing/Fishing_Draw.s | 126 +- .../actors/ovl_Fishing/Fishing_Init.s | 482 +-- .../actors/ovl_Fishing/Fishing_Update.s | 3530 ++++++++--------- .../actors/ovl_Fishing/func_80B7A278.s | 164 +- include/functions.h | 114 +- include/z64animation.h | 106 +- src/code/z_actor.c | 6 +- src/code/z_skelanime.c | 354 +- src/overlays/actors/ovl_Demo_Go/z_demo_go.c | 6 +- src/overlays/actors/ovl_En_Dog/z_en_dog.c | 4 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 4 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 4 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 4 +- 578 files changed, 23343 insertions(+), 27041 deletions(-) delete mode 100644 asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimation.s rename asm/non_matchings/code/z_skelanime/{func_800A4FE4.s => SkelAnime_ChangeAnimationImpl.s} (91%) delete mode 100644 asm/non_matchings/code/z_skelanime/SkelAnime_Draw.s rename asm/non_matchings/code/z_skelanime/{func_800A2288.s => SkelAnime_Draw2.s} (98%) rename asm/non_matchings/code/z_skelanime/{func_800A180C.s => SkelAnime_DrawLimbSV.s} (98%) rename asm/non_matchings/code/z_skelanime/{func_800A1AC8.s => SkelAnime_DrawSV.s} (99%) delete mode 100644 asm/non_matchings/code/z_skelanime/SkelAnime_FrameUpdateMatrix.s delete mode 100644 asm/non_matchings/code/z_skelanime/SkelAnime_GetFrameCount.s delete mode 100644 asm/non_matchings/code/z_skelanime/SkelAnime_Init.s rename asm/non_matchings/code/z_skelanime/{func_800A0D94.s => SkelAnime_LodDrawLimbSV.s} (98%) rename asm/non_matchings/code/z_skelanime/{func_800A106C.s => SkelAnime_LodDrawSV.s} (99%) delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A08A0.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A0B40.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A1344.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A1D8C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A1FC8.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A2044.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A24A0.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A273C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A2DBC.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A2DF4.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A2E2C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A32EC.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A32F4.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3310.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3334.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A336C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3478.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A34DC.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3548.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A35B4.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3620.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3678.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A36A4.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3714.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3770.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A37F0.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3874.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A390C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A39AC.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3B8C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3BC0.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3BE4.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3C9C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3D70.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3E0C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A3EE8.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A407C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A40DC.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A4140.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A419C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A41FC.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A422C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A425C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A42A0.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A42E4.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A431C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A43B8.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A4454.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A4478.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A4530.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A46F8.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A487C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A49B0.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A4EE0.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A51E8.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A5240.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A529C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A52F8.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A534C.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A5384.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A53DC.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A5428.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A5490.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A54FC.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A56C8.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A56F0.s delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A5774.s diff --git a/asm/non_matchings/code/z_player_lib/func_8008F470.s b/asm/non_matchings/code/z_player_lib/func_8008F470.s index 0e043244a4..cf9a6fec69 100644 --- a/asm/non_matchings/code/z_player_lib/func_8008F470.s +++ b/asm/non_matchings/code/z_player_lib/func_8008F470.s @@ -125,7 +125,7 @@ glabel func_8008F470 /* B067CC 8008F62C AFA2001C */ sw $v0, 0x1c($sp) /* B067D0 8008F630 AFAF0018 */ sw $t7, 0x18($sp) /* B067D4 8008F634 AFAC0014 */ sw $t4, 0x14($sp) -/* B067D8 8008F638 0C02841B */ jal func_800A106C +/* B067D8 8008F638 0C02841B */ jal SkelAnime_LodDrawSV /* B067DC 8008F63C AFAD0010 */ sw $t5, 0x10($sp) /* B067E0 8008F640 8FA200A8 */ lw $v0, 0xa8($sp) /* B067E4 8008F644 3C0E8009 */ lui $t6, %hi(func_800902F0) # $t6, 0x8009 @@ -145,7 +145,7 @@ glabel func_8008F470 /* B0681C 8008F67C 3C0C8012 */ lui $t4, %hi(gUpgradeMasks+8) # $t4, 0x8012 /* B06820 8008F680 3C0E8012 */ lui $t6, %hi(gUpgradeShifts+2) # $t6, 0x8012 /* B06824 8008F684 17000066 */ bnez $t8, .L8008F820 -/* B06828 8008F688 00000000 */ nop +/* B06828 8008F688 00000000 */ nop /* B0682C 8008F68C 8C4D00A0 */ lw $t5, 0xa0($v0) /* B06830 8008F690 8D8C71B8 */ lw $t4, %lo(gUpgradeMasks+8)($t4) /* B06834 8008F694 91CE71F6 */ lbu $t6, %lo(gUpgradeShifts+2)($t6) @@ -277,5 +277,5 @@ glabel func_8008F470 /* B06A0C 8008F86C 8FBF0024 */ lw $ra, 0x24($sp) /* B06A10 8008F870 27BD0088 */ addiu $sp, $sp, 0x88 /* B06A14 8008F874 03E00008 */ jr $ra -/* B06A18 8008F878 00000000 */ nop +/* B06A18 8008F878 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimation.s b/asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimation.s deleted file mode 100644 index 0142b207e3..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimation.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel SkelAnime_ChangeAnimation -/* B1C340 800A51A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C344 800A51A4 44866000 */ mtc1 $a2, $f12 -/* B1C348 800A51A8 44877000 */ mtc1 $a3, $f14 -/* B1C34C 800A51AC C7A40038 */ lwc1 $f4, 0x38($sp) -/* B1C350 800A51B0 93AE003F */ lbu $t6, 0x3f($sp) -/* B1C354 800A51B4 C7A60040 */ lwc1 $f6, 0x40($sp) -/* B1C358 800A51B8 AFBF0024 */ sw $ra, 0x24($sp) -/* B1C35C 800A51BC 44066000 */ mfc1 $a2, $f12 -/* B1C360 800A51C0 44077000 */ mfc1 $a3, $f14 -/* B1C364 800A51C4 AFA0001C */ sw $zero, 0x1c($sp) -/* B1C368 800A51C8 E7A40010 */ swc1 $f4, 0x10($sp) -/* B1C36C 800A51CC AFAE0014 */ sw $t6, 0x14($sp) -/* B1C370 800A51D0 0C0293F9 */ jal func_800A4FE4 -/* B1C374 800A51D4 E7A60018 */ swc1 $f6, 0x18($sp) -/* B1C378 800A51D8 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C37C 800A51DC 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C380 800A51E0 03E00008 */ jr $ra -/* B1C384 800A51E4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4FE4.s b/asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimationImpl.s similarity index 91% rename from asm/non_matchings/code/z_skelanime/func_800A4FE4.s rename to asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimationImpl.s index 3a18613b11..a6d9eac999 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A4FE4.s +++ b/asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimationImpl.s @@ -1,4 +1,4 @@ -glabel func_800A4FE4 +glabel SkelAnime_ChangeAnimationImpl /* B1C184 800A4FE4 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B1C188 800A4FE8 C7AC0038 */ lwc1 $f12, 0x38($sp) /* B1C18C 800A4FEC 44802000 */ mtc1 $zero, $f4 @@ -19,22 +19,22 @@ glabel func_800A4FE4 /* B1C1C8 800A5028 44805000 */ mtc1 $zero, $f10 /* B1C1CC 800A502C C4880018 */ lwc1 $f8, 0x18($a0) /* B1C1D0 800A5030 46083032 */ c.eq.s $f6, $f8 -/* B1C1D4 800A5034 00000000 */ nop +/* B1C1D4 800A5034 00000000 */ nop /* B1C1D8 800A5038 4501002B */ bc1t .L800A50E8 -/* B1C1DC 800A503C 00000000 */ nop +/* B1C1DC 800A503C 00000000 */ nop /* B1C1E0 800A5040 44805000 */ mtc1 $zero, $f10 .L800A5044: /* B1C1E4 800A5044 02002025 */ move $a0, $s0 /* B1C1E8 800A5048 83A2003F */ lb $v0, 0x3f($sp) /* B1C1EC 800A504C 460A603C */ c.lt.s $f12, $f10 -/* B1C1F0 800A5050 00000000 */ nop +/* B1C1F0 800A5050 00000000 */ nop /* B1C1F4 800A5054 4500000A */ bc1f .L800A5080 -/* B1C1F8 800A5058 00000000 */ nop +/* B1C1F8 800A5058 00000000 */ nop /* B1C1FC 800A505C 0C02926C */ jal func_800A49B0 /* B1C200 800A5060 E7AC0038 */ swc1 $f12, 0x38($sp) /* B1C204 800A5064 02002025 */ move $a0, $s0 /* B1C208 800A5068 8E050024 */ lw $a1, 0x24($s0) -/* B1C20C 800A506C 0C0295DD */ jal func_800A5774 +/* B1C20C 800A506C 0C0295DD */ jal SkelAnime_CopyVec3s /* B1C210 800A5070 8E060020 */ lw $a2, 0x20($s0) /* B1C214 800A5074 C7AC0038 */ lwc1 $f12, 0x38($sp) /* B1C218 800A5078 10000014 */ b .L800A50CC @@ -58,8 +58,8 @@ glabel func_800A4FE4 /* B1C254 800A50B4 E7AC0038 */ swc1 $f12, 0x38($sp) /* B1C258 800A50B8 8FA40024 */ lw $a0, 0x24($sp) /* B1C25C 800A50BC 44059000 */ mfc1 $a1, $f18 -/* B1C260 800A50C0 0C028763 */ jal func_800A1D8C -/* B1C264 800A50C4 00000000 */ nop +/* B1C260 800A50C0 0C028763 */ jal SkelAnime_AnimateFrame +/* B1C264 800A50C4 00000000 */ nop /* B1C268 800A50C8 C7AC0038 */ lwc1 $f12, 0x38($sp) .L800A50CC: /* B1C26C 800A50CC 3C013F80 */ li $at, 0x3F800000 # 0.000000 @@ -78,10 +78,10 @@ glabel func_800A4FE4 /* B1C29C 800A50FC 4600540D */ trunc.w.s $f16, $f10 /* B1C2A0 800A5100 8E070020 */ lw $a3, 0x20($s0) /* B1C2A4 800A5104 44058000 */ mfc1 $a1, $f16 -/* B1C2A8 800A5108 0C028763 */ jal func_800A1D8C -/* B1C2AC 800A510C 00000000 */ nop +/* B1C2A8 800A5108 0C028763 */ jal SkelAnime_AnimateFrame +/* B1C2AC 800A510C 00000000 */ nop /* B1C2B0 800A5110 44809000 */ mtc1 $zero, $f18 -/* B1C2B4 800A5114 00000000 */ nop +/* B1C2B4 800A5114 00000000 */ nop /* B1C2B8 800A5118 E6120028 */ swc1 $f18, 0x28($s0) .L800A511C: /* B1C2BC 800A511C 8FAB0024 */ lw $t3, 0x24($sp) @@ -118,5 +118,5 @@ glabel func_800A4FE4 /* B1C330 800A5190 8FB00018 */ lw $s0, 0x18($sp) /* B1C334 800A5194 27BD0020 */ addiu $sp, $sp, 0x20 /* B1C338 800A5198 03E00008 */ jr $ra -/* B1C33C 800A519C 00000000 */ nop +/* B1C33C 800A519C 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/SkelAnime_Draw.s b/asm/non_matchings/code/z_skelanime/SkelAnime_Draw.s deleted file mode 100644 index ec8efef1c7..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_Draw.s +++ /dev/null @@ -1,181 +0,0 @@ -.rdata -glabel D_80140104 - .asciz "\x1b[31m" - .balign 4 - -glabel D_8014010C - .asciz "Si2_draw():skelがNULLです。\n" - # EUC-JP: がNULLです。| Is null - .balign 4 - -glabel D_8014012C - .asciz "\x1b[m" - .balign 4 - -glabel D_80140130 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140144 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140158 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel SkelAnime_Draw -/* B18768 800A15C8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B1876C 800A15CC AFBF0024 */ sw $ra, 0x24($sp) -/* B18770 800A15D0 AFA40068 */ sw $a0, 0x68($sp) -/* B18774 800A15D4 AFA5006C */ sw $a1, 0x6c($sp) -/* B18778 800A15D8 AFA60070 */ sw $a2, 0x70($sp) -/* B1877C 800A15DC 14A0000C */ bnez $a1, .L800A1610 -/* B18780 800A15E0 AFA70074 */ sw $a3, 0x74($sp) -/* B18784 800A15E4 3C048014 */ lui $a0, %hi(D_80140104) # $a0, 0x8014 -/* B18788 800A15E8 0C00084C */ jal osSyncPrintf -/* B1878C 800A15EC 24840104 */ addiu $a0, %lo(D_80140104) # addiu $a0, $a0, 0x104 -/* B18790 800A15F0 3C048014 */ lui $a0, %hi(D_8014010C) # $a0, 0x8014 -/* B18794 800A15F4 0C00084C */ jal osSyncPrintf -/* B18798 800A15F8 2484010C */ addiu $a0, %lo(D_8014010C) # addiu $a0, $a0, 0x10c -/* B1879C 800A15FC 3C048014 */ lui $a0, %hi(D_8014012C) # $a0, 0x8014 -/* B187A0 800A1600 0C00084C */ jal osSyncPrintf -/* B187A4 800A1604 2484012C */ addiu $a0, %lo(D_8014012C) # addiu $a0, $a0, 0x12c -/* B187A8 800A1608 1000007D */ b .L800A1800 -/* B187AC 800A160C 8FBF0024 */ lw $ra, 0x24($sp) -.L800A1610: -/* B187B0 800A1610 8FAF0068 */ lw $t7, 0x68($sp) -/* B187B4 800A1614 3C068014 */ lui $a2, %hi(D_80140130) # $a2, 0x8014 -/* B187B8 800A1618 24C60130 */ addiu $a2, %lo(D_80140130) # addiu $a2, $a2, 0x130 -/* B187BC 800A161C 8DE50000 */ lw $a1, ($t7) -/* B187C0 800A1620 27A40034 */ addiu $a0, $sp, 0x34 -/* B187C4 800A1624 2407047C */ li $a3, 1148 -/* B187C8 800A1628 0C031AB1 */ jal func_800C6AC4 -/* B187CC 800A162C AFA50044 */ sw $a1, 0x44($sp) -/* B187D0 800A1630 0C034213 */ jal Matrix_Push -/* B187D4 800A1634 00000000 */ nop -/* B187D8 800A1638 8FB8006C */ lw $t8, 0x6c($sp) -/* B187DC 800A163C 3C0B8016 */ lui $t3, %hi(gSegments) -/* B187E0 800A1640 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B187E4 800A1644 8F020000 */ lw $v0, ($t8) -/* B187E8 800A1648 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B187EC 800A164C 8FA30070 */ lw $v1, 0x70($sp) -/* B187F0 800A1650 00024100 */ sll $t0, $v0, 4 -/* B187F4 800A1654 00084F02 */ srl $t1, $t0, 0x1c -/* B187F8 800A1658 00095080 */ sll $t2, $t1, 2 -/* B187FC 800A165C 016A5821 */ addu $t3, $t3, $t2 -/* B18800 800A1660 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) -/* B18804 800A1664 0041C824 */ and $t9, $v0, $at -/* B18808 800A1668 3C018000 */ lui $at, 0x8000 -/* B1880C 800A166C 032B6021 */ addu $t4, $t9, $t3 -/* B18810 800A1670 01816821 */ addu $t5, $t4, $at -/* B18814 800A1674 AFAD0064 */ sw $t5, 0x64($sp) -/* B18818 800A1678 846E0000 */ lh $t6, ($v1) -/* B1881C 800A167C 27A80048 */ addiu $t0, $sp, 0x48 -/* B18820 800A1680 27AD0048 */ addiu $t5, $sp, 0x48 -/* B18824 800A1684 448E2000 */ mtc1 $t6, $f4 -/* B18828 800A1688 24050001 */ li $a1, 1 -/* B1882C 800A168C 27A6005C */ addiu $a2, $sp, 0x5c -/* B18830 800A1690 468021A0 */ cvt.s.w $f6, $f4 -/* B18834 800A1694 27A70050 */ addiu $a3, $sp, 0x50 -/* B18838 800A1698 E7A60050 */ swc1 $f6, 0x50($sp) -/* B1883C 800A169C 846F0002 */ lh $t7, 2($v1) -/* B18840 800A16A0 448F4000 */ mtc1 $t7, $f8 -/* B18844 800A16A4 00000000 */ nop -/* B18848 800A16A8 468042A0 */ cvt.s.w $f10, $f8 -/* B1884C 800A16AC E7AA0054 */ swc1 $f10, 0x54($sp) -/* B18850 800A16B0 84780004 */ lh $t8, 4($v1) -/* B18854 800A16B4 44988000 */ mtc1 $t8, $f16 -/* B18858 800A16B8 00000000 */ nop -/* B1885C 800A16BC 468084A0 */ cvt.s.w $f18, $f16 -/* B18860 800A16C0 E7B20058 */ swc1 $f18, 0x58($sp) -/* B18864 800A16C4 886A0006 */ lwl $t2, 6($v1) -/* B18868 800A16C8 986A0009 */ lwr $t2, 9($v1) -/* B1886C 800A16CC AD0A0000 */ sw $t2, ($t0) -/* B18870 800A16D0 946A000A */ lhu $t2, 0xa($v1) -/* B18874 800A16D4 A50A0004 */ sh $t2, 4($t0) -/* B18878 800A16D8 8FB90064 */ lw $t9, 0x64($sp) -/* B1887C 800A16DC 8FAC0074 */ lw $t4, 0x74($sp) -/* B18880 800A16E0 8FA40068 */ lw $a0, 0x68($sp) -/* B18884 800A16E4 8F2B0008 */ lw $t3, 8($t9) -/* B18888 800A16E8 11800006 */ beqz $t4, .L800A1704 -/* B1888C 800A16EC AFAB005C */ sw $t3, 0x5c($sp) -/* B18890 800A16F0 8FAE007C */ lw $t6, 0x7c($sp) -/* B18894 800A16F4 AFAD0010 */ sw $t5, 0x10($sp) -/* B18898 800A16F8 0180F809 */ jalr $t4 -/* B1889C 800A16FC AFAE0014 */ sw $t6, 0x14($sp) -/* B188A0 800A1700 1440001E */ bnez $v0, .L800A177C -.L800A1704: -/* B188A4 800A1704 27A40050 */ addiu $a0, $sp, 0x50 -/* B188A8 800A1708 0C0344D0 */ jal Matrix_TranslateThenRotateZYX -/* B188AC 800A170C 27A50048 */ addiu $a1, $sp, 0x48 -/* B188B0 800A1710 8FAF005C */ lw $t7, 0x5c($sp) -/* B188B4 800A1714 8FA70044 */ lw $a3, 0x44($sp) -/* B188B8 800A1718 3C08DA38 */ lui $t0, (0xDA380003 >> 16) # lui $t0, 0xda38 -/* B188BC 800A171C 51E00018 */ beql $t7, $zero, .L800A1780 -/* B188C0 800A1720 8FA20078 */ lw $v0, 0x78($sp) -/* B188C4 800A1724 8CE202C0 */ lw $v0, 0x2c0($a3) -/* B188C8 800A1728 35080003 */ ori $t0, (0xDA380003 & 0xFFFF) # ori $t0, $t0, 3 -/* B188CC 800A172C 3C058014 */ lui $a1, %hi(D_80140144) # $a1, 0x8014 -/* B188D0 800A1730 24580008 */ addiu $t8, $v0, 8 -/* B188D4 800A1734 ACF802C0 */ sw $t8, 0x2c0($a3) -/* B188D8 800A1738 AC480000 */ sw $t0, ($v0) -/* B188DC 800A173C 8FA90068 */ lw $t1, 0x68($sp) -/* B188E0 800A1740 24A50144 */ addiu $a1, %lo(D_80140144) # addiu $a1, $a1, 0x144 -/* B188E4 800A1744 24060498 */ li $a2, 1176 -/* B188E8 800A1748 8D240000 */ lw $a0, ($t1) -/* B188EC 800A174C 0C0346A2 */ jal Matrix_NewMtx -/* B188F0 800A1750 AFA20030 */ sw $v0, 0x30($sp) -/* B188F4 800A1754 8FA30030 */ lw $v1, 0x30($sp) -/* B188F8 800A1758 3C0BDE00 */ lui $t3, 0xde00 -/* B188FC 800A175C AC620004 */ sw $v0, 4($v1) -/* B18900 800A1760 8FAA0044 */ lw $t2, 0x44($sp) -/* B18904 800A1764 8D4202C0 */ lw $v0, 0x2c0($t2) -/* B18908 800A1768 24590008 */ addiu $t9, $v0, 8 -/* B1890C 800A176C AD5902C0 */ sw $t9, 0x2c0($t2) -/* B18910 800A1770 AC4B0000 */ sw $t3, ($v0) -/* B18914 800A1774 8FAD005C */ lw $t5, 0x5c($sp) -/* B18918 800A1778 AC4D0004 */ sw $t5, 4($v0) -.L800A177C: -/* B1891C 800A177C 8FA20078 */ lw $v0, 0x78($sp) -.L800A1780: -/* B18920 800A1780 8FA40068 */ lw $a0, 0x68($sp) -/* B18924 800A1784 24050001 */ li $a1, 1 -/* B18928 800A1788 10400006 */ beqz $v0, .L800A17A4 -/* B1892C 800A178C 27A6005C */ addiu $a2, $sp, 0x5c -/* B18930 800A1790 8FAE007C */ lw $t6, 0x7c($sp) -/* B18934 800A1794 27A70048 */ addiu $a3, $sp, 0x48 -/* B18938 800A1798 0040F809 */ jalr $v0 -/* B1893C 800A179C AFAE0010 */ sw $t6, 0x10($sp) -/* B18940 800A17A0 8FA20078 */ lw $v0, 0x78($sp) -.L800A17A4: -/* B18944 800A17A4 8FAC0064 */ lw $t4, 0x64($sp) -/* B18948 800A17A8 240100FF */ li $at, 255 -/* B1894C 800A17AC 8FA40068 */ lw $a0, 0x68($sp) -/* B18950 800A17B0 91850006 */ lbu $a1, 6($t4) -/* B18954 800A17B4 8FA6006C */ lw $a2, 0x6c($sp) -/* B18958 800A17B8 8FA70070 */ lw $a3, 0x70($sp) -/* B1895C 800A17BC 10A10006 */ beq $a1, $at, .L800A17D8 -/* B18960 800A17C0 8FAF0074 */ lw $t7, 0x74($sp) -/* B18964 800A17C4 8FB8007C */ lw $t8, 0x7c($sp) -/* B18968 800A17C8 AFAF0010 */ sw $t7, 0x10($sp) -/* B1896C 800A17CC AFA20014 */ sw $v0, 0x14($sp) -/* B18970 800A17D0 0C0284D1 */ jal func_800A1344 -/* B18974 800A17D4 AFB80018 */ sw $t8, 0x18($sp) -.L800A17D8: -/* B18978 800A17D8 0C034221 */ jal Matrix_Pull -/* B1897C 800A17DC 00000000 */ nop -/* B18980 800A17E0 8FA80068 */ lw $t0, 0x68($sp) -/* B18984 800A17E4 3C068014 */ lui $a2, %hi(D_80140158) # $a2, 0x8014 -/* B18988 800A17E8 24C60158 */ addiu $a2, %lo(D_80140158) # addiu $a2, $a2, 0x158 -/* B1898C 800A17EC 27A40034 */ addiu $a0, $sp, 0x34 -/* B18990 800A17F0 240704A6 */ li $a3, 1190 -/* B18994 800A17F4 0C031AD5 */ jal func_800C6B54 -/* B18998 800A17F8 8D050000 */ lw $a1, ($t0) -/* B1899C 800A17FC 8FBF0024 */ lw $ra, 0x24($sp) -.L800A1800: -/* B189A0 800A1800 27BD0068 */ addiu $sp, $sp, 0x68 -/* B189A4 800A1804 03E00008 */ jr $ra -/* B189A8 800A1808 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A2288.s b/asm/non_matchings/code/z_skelanime/SkelAnime_Draw2.s similarity index 98% rename from asm/non_matchings/code/z_skelanime/func_800A2288.s rename to asm/non_matchings/code/z_skelanime/SkelAnime_Draw2.s index 029f642c2d..661ca45611 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A2288.s +++ b/asm/non_matchings/code/z_skelanime/SkelAnime_Draw2.s @@ -17,7 +17,7 @@ glabel D_80140314 .balign 4 .text -glabel func_800A2288 +glabel SkelAnime_Draw2 /* B19428 800A2288 27BDFFA8 */ addiu $sp, $sp, -0x58 /* B1942C 800A228C AFBF0024 */ sw $ra, 0x24($sp) /* B19430 800A2290 AFA40058 */ sw $a0, 0x58($sp) @@ -146,7 +146,7 @@ glabel func_800A2288 /* B1960C 800A246C AFA80010 */ sw $t0, 0x10($sp) /* B19610 800A2470 AFA20014 */ sw $v0, 0x14($sp) /* B19614 800A2474 AFA90018 */ sw $t1, 0x18($sp) -/* B19618 800A2478 0C028811 */ jal func_800A2044 +/* B19618 800A2478 0C028811 */ jal SkelAnime_Draw2Limb /* B1961C 800A247C AFB8001C */ sw $t8, 0x1c($sp) /* B19620 800A2480 AFA20070 */ sw $v0, 0x70($sp) .L800A2484: diff --git a/asm/non_matchings/code/z_skelanime/func_800A180C.s b/asm/non_matchings/code/z_skelanime/SkelAnime_DrawLimbSV.s similarity index 98% rename from asm/non_matchings/code/z_skelanime/func_800A180C.s rename to asm/non_matchings/code/z_skelanime/SkelAnime_DrawLimbSV.s index 59875f0a26..df4a87b84c 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A180C.s +++ b/asm/non_matchings/code/z_skelanime/SkelAnime_DrawLimbSV.s @@ -16,7 +16,7 @@ glabel D_801401A8 .balign 4 .text -glabel func_800A180C +glabel SkelAnime_DrawLimbSV /* B189AC 800A180C 27BDFF98 */ addiu $sp, $sp, -0x68 /* B189B0 800A1810 AFBF0024 */ sw $ra, 0x24($sp) /* B189B4 800A1814 AFA40068 */ sw $a0, 0x68($sp) @@ -165,7 +165,7 @@ glabel func_800A180C /* B18BE0 800A1A40 AFAC0010 */ sw $t4, 0x10($sp) /* B18BE4 800A1A44 AFA80014 */ sw $t0, 0x14($sp) /* B18BE8 800A1A48 AFA90018 */ sw $t1, 0x18($sp) -/* B18BEC 800A1A4C 0C028603 */ jal func_800A180C +/* B18BEC 800A1A4C 0C028603 */ jal SkelAnime_DrawLimbSV /* B18BF0 800A1A50 AFAD001C */ sw $t5, 0x1c($sp) .L800A1A54: /* B18BF4 800A1A54 0C034221 */ jal Matrix_Pull @@ -184,7 +184,7 @@ glabel func_800A180C /* B18C28 800A1A88 AFB90010 */ sw $t9, 0x10($sp) /* B18C2C 800A1A8C AFB80014 */ sw $t8, 0x14($sp) /* B18C30 800A1A90 AFAA0018 */ sw $t2, 0x18($sp) -/* B18C34 800A1A94 0C028603 */ jal func_800A180C +/* B18C34 800A1A94 0C028603 */ jal SkelAnime_DrawLimbSV /* B18C38 800A1A98 AFAF001C */ sw $t7, 0x1c($sp) .L800A1A9C: /* B18C3C 800A1A9C 8FAB0068 */ lw $t3, 0x68($sp) diff --git a/asm/non_matchings/code/z_skelanime/func_800A1AC8.s b/asm/non_matchings/code/z_skelanime/SkelAnime_DrawSV.s similarity index 99% rename from asm/non_matchings/code/z_skelanime/func_800A1AC8.s rename to asm/non_matchings/code/z_skelanime/SkelAnime_DrawSV.s index 9a44811061..a013d79309 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A1AC8.s +++ b/asm/non_matchings/code/z_skelanime/SkelAnime_DrawSV.s @@ -29,7 +29,7 @@ glabel D_80140224 .balign 4 .text -glabel func_800A1AC8 +glabel SkelAnime_DrawSV /* B18C68 800A1AC8 27BDFF88 */ addiu $sp, $sp, -0x78 /* B18C6C 800A1ACC AFBF0024 */ sw $ra, 0x24($sp) /* B18C70 800A1AD0 AFA40078 */ sw $a0, 0x78($sp) @@ -197,7 +197,7 @@ glabel func_800A1AC8 /* B18EE4 800A1D44 AFAB001C */ sw $t3, 0x1c($sp) /* B18EE8 800A1D48 AFB90010 */ sw $t9, 0x10($sp) /* B18EEC 800A1D4C AFA20014 */ sw $v0, 0x14($sp) -/* B18EF0 800A1D50 0C028603 */ jal func_800A180C +/* B18EF0 800A1D50 0C028603 */ jal SkelAnime_DrawLimbSV /* B18EF4 800A1D54 AFAA0018 */ sw $t2, 0x18($sp) .L800A1D58: /* B18EF8 800A1D58 0C034221 */ jal Matrix_Pull diff --git a/asm/non_matchings/code/z_skelanime/SkelAnime_FrameUpdateMatrix.s b/asm/non_matchings/code/z_skelanime/SkelAnime_FrameUpdateMatrix.s deleted file mode 100644 index dd17ccf2b7..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_FrameUpdateMatrix.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel SkelAnime_FrameUpdateMatrix -/* B1BB9C 800A49FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1BBA0 800A4A00 AFBF0014 */ sw $ra, 0x14($sp) -/* B1BBA4 800A4A04 8C990030 */ lw $t9, 0x30($a0) -/* B1BBA8 800A4A08 0320F809 */ jalr $t9 -/* B1BBAC 800A4A0C 00000000 */ nop -/* B1BBB0 800A4A10 8FBF0014 */ lw $ra, 0x14($sp) -/* B1BBB4 800A4A14 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1BBB8 800A4A18 03E00008 */ jr $ra -/* B1BBBC 800A4A1C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/SkelAnime_GetFrameCount.s b/asm/non_matchings/code/z_skelanime/SkelAnime_GetFrameCount.s deleted file mode 100644 index 6d6a54360b..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_GetFrameCount.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel SkelAnime_GetFrameCount -/* B191A0 800A2000 00047100 */ sll $t6, $a0, 4 -/* B191A4 800A2004 000E7F02 */ srl $t7, $t6, 0x1c -/* B191A8 800A2008 000FC080 */ sll $t8, $t7, 2 -/* B191AC 800A200C 3C198016 */ lui $t9, %hi(gSegments) -/* B191B0 800A2010 0338C821 */ addu $t9, $t9, $t8 -/* B191B4 800A2014 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B191B8 800A2018 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B191BC 800A201C 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B191C0 800A2020 00814024 */ and $t0, $a0, $at -/* B191C4 800A2024 3C018000 */ lui $at, 0x8000 -/* B191C8 800A2028 03281821 */ addu $v1, $t9, $t0 -/* B191CC 800A202C 00611821 */ addu $v1, $v1, $at -/* B191D0 800A2030 94620000 */ lhu $v0, ($v1) -/* B191D4 800A2034 2442FFFF */ addiu $v0, $v0, -1 -/* B191D8 800A2038 00021400 */ sll $v0, $v0, 0x10 -/* B191DC 800A203C 03E00008 */ jr $ra -/* B191E0 800A2040 00021403 */ sra $v0, $v0, 0x10 - diff --git a/asm/non_matchings/code/z_skelanime/SkelAnime_Init.s b/asm/non_matchings/code/z_skelanime/SkelAnime_Init.s deleted file mode 100644 index 770338d8d2..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_Init.s +++ /dev/null @@ -1,134 +0,0 @@ -.rdata -glabel D_80140464 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140478 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014048C - .asciz "joint_buff_num == this->joint_num" - .balign 4 - -glabel D_801404B0 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801404C4 - .asciz "\x1b[31m" - .balign 4 - -glabel D_801404CC - .asciz "Skeleton_Info2_ct メモリアロケーションエラー\n" - # EUC-JP: メモリアロケーションエラー | Memory allocation error - .balign 4 - -glabel D_801404FC - .asciz "\x1b[m" - .balign 4 - -.text -glabel SkelAnime_Init -/* B1B71C 800A457C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1B720 800A4580 AFA40020 */ sw $a0, 0x20($sp) -/* B1B724 800A4584 00067100 */ sll $t6, $a2, 4 -/* B1B728 800A4588 3C048016 */ lui $a0, %hi(gSegments) # $a0, 0x8016 -/* B1B72C 800A458C 000E7F02 */ srl $t7, $t6, 0x1c -/* B1B730 800A4590 24846FA8 */ addiu $a0, %lo(gSegments) # addiu $a0, $a0, 0x6fa8 -/* B1B734 800A4594 000FC080 */ sll $t8, $t7, 2 -/* B1B738 800A4598 0098C821 */ addu $t9, $a0, $t8 -/* B1B73C 800A459C 8F2A0000 */ lw $t2, ($t9) -/* B1B740 800A45A0 3C0800FF */ lui $t0, (0x00FFFFFF >> 16) # lui $t0, 0xff -/* B1B744 800A45A4 3508FFFF */ ori $t0, (0x00FFFFFF & 0xFFFF) # ori $t0, $t0, 0xffff -/* B1B748 800A45A8 00C85824 */ and $t3, $a2, $t0 -/* B1B74C 800A45AC 3C098000 */ lui $t1, 0x8000 -/* B1B750 800A45B0 014B6021 */ addu $t4, $t2, $t3 -/* B1B754 800A45B4 AFBF001C */ sw $ra, 0x1c($sp) -/* B1B758 800A45B8 AFB00018 */ sw $s0, 0x18($sp) -/* B1B75C 800A45BC AFA7002C */ sw $a3, 0x2c($sp) -/* B1B760 800A45C0 01891021 */ addu $v0, $t4, $t1 -/* B1B764 800A45C4 904D0004 */ lbu $t5, 4($v0) -/* B1B768 800A45C8 00A08025 */ move $s0, $a1 -/* B1B76C 800A45CC 24060B98 */ li $a2, 2968 -/* B1B770 800A45D0 25AE0001 */ addiu $t6, $t5, 1 -/* B1B774 800A45D4 A0AE0000 */ sb $t6, ($a1) -/* B1B778 800A45D8 8C430000 */ lw $v1, ($v0) -/* B1B77C 800A45DC 00037900 */ sll $t7, $v1, 4 -/* B1B780 800A45E0 000FC702 */ srl $t8, $t7, 0x1c -/* B1B784 800A45E4 0018C880 */ sll $t9, $t8, 2 -/* B1B788 800A45E8 00995021 */ addu $t2, $a0, $t9 -/* B1B78C 800A45EC 8D4B0000 */ lw $t3, ($t2) -/* B1B790 800A45F0 00686024 */ and $t4, $v1, $t0 -/* B1B794 800A45F4 016C6821 */ addu $t5, $t3, $t4 -/* B1B798 800A45F8 01A97021 */ addu $t6, $t5, $t1 -/* B1B79C 800A45FC ACAE0004 */ sw $t6, 4($a1) -/* B1B7A0 800A4600 8FAF0030 */ lw $t7, 0x30($sp) -/* B1B7A4 800A4604 8FB80038 */ lw $t8, 0x38($sp) -/* B1B7A8 800A4608 55E00016 */ bnezl $t7, .L800A4664 -/* B1B7AC 800A460C 92190000 */ lbu $t9, ($s0) -/* B1B7B0 800A4610 90A40000 */ lbu $a0, ($a1) -/* B1B7B4 800A4614 3C058014 */ lui $a1, %hi(D_80140464) # $a1, 0x8014 -/* B1B7B8 800A4618 24A50464 */ addiu $a1, %lo(D_80140464) # addiu $a1, $a1, 0x464 -/* B1B7BC 800A461C 00800821 */ addu $at, $a0, $zero -/* B1B7C0 800A4620 00042080 */ sll $a0, $a0, 2 -/* B1B7C4 800A4624 00812023 */ subu $a0, $a0, $at -/* B1B7C8 800A4628 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1B7CC 800A462C 00042040 */ sll $a0, $a0, 1 -/* B1B7D0 800A4630 92040000 */ lbu $a0, ($s0) -/* B1B7D4 800A4634 3C058014 */ lui $a1, %hi(D_80140478) # $a1, 0x8014 -/* B1B7D8 800A4638 AE020020 */ sw $v0, 0x20($s0) -/* B1B7DC 800A463C 00800821 */ addu $at, $a0, $zero -/* B1B7E0 800A4640 00042080 */ sll $a0, $a0, 2 -/* B1B7E4 800A4644 00812023 */ subu $a0, $a0, $at -/* B1B7E8 800A4648 00042040 */ sll $a0, $a0, 1 -/* B1B7EC 800A464C 24A50478 */ addiu $a1, %lo(D_80140478) # addiu $a1, $a1, 0x478 -/* B1B7F0 800A4650 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1B7F4 800A4654 24060B99 */ li $a2, 2969 -/* B1B7F8 800A4658 1000000D */ b .L800A4690 -/* B1B7FC 800A465C AE020024 */ sw $v0, 0x24($s0) -/* B1B800 800A4660 92190000 */ lbu $t9, ($s0) -.L800A4664: -/* B1B804 800A4664 3C048014 */ lui $a0, %hi(D_8014048C) # $a0, 0x8014 -/* B1B808 800A4668 2484048C */ addiu $a0, %lo(D_8014048C) # addiu $a0, $a0, 0x48c -/* B1B80C 800A466C 13190004 */ beq $t8, $t9, .L800A4680 -/* B1B810 800A4670 3C058014 */ lui $a1, %hi(D_801404B0) # $a1, 0x8014 -/* B1B814 800A4674 24A504B0 */ addiu $a1, %lo(D_801404B0) # addiu $a1, $a1, 0x4b0 -/* B1B818 800A4678 0C0007FC */ jal __assert -/* B1B81C 800A467C 24060B9D */ li $a2, 2973 -.L800A4680: -/* B1B820 800A4680 8FAA0030 */ lw $t2, 0x30($sp) -/* B1B824 800A4684 AE0A0020 */ sw $t2, 0x20($s0) -/* B1B828 800A4688 8FAB0034 */ lw $t3, 0x34($sp) -/* B1B82C 800A468C AE0B0024 */ sw $t3, 0x24($s0) -.L800A4690: -/* B1B830 800A4690 8E0C0020 */ lw $t4, 0x20($s0) -/* B1B834 800A4694 3C048014 */ lui $a0, %hi(D_801404C4) # $a0, 0x8014 -/* B1B838 800A4698 11800004 */ beqz $t4, .L800A46AC -/* B1B83C 800A469C 00000000 */ nop -/* B1B840 800A46A0 8E0D0024 */ lw $t5, 0x24($s0) -/* B1B844 800A46A4 55A0000A */ bnezl $t5, .L800A46D0 -/* B1B848 800A46A8 8FAE002C */ lw $t6, 0x2c($sp) -.L800A46AC: -/* B1B84C 800A46AC 0C00084C */ jal osSyncPrintf -/* B1B850 800A46B0 248404C4 */ addiu $a0, %lo(D_801404C4) # addiu $a0, $a0, 0x4c4 -/* B1B854 800A46B4 3C048014 */ lui $a0, %hi(D_801404CC) # $a0, 0x8014 -/* B1B858 800A46B8 0C00084C */ jal osSyncPrintf -/* B1B85C 800A46BC 248404CC */ addiu $a0, %lo(D_801404CC) # addiu $a0, $a0, 0x4cc -/* B1B860 800A46C0 3C048014 */ lui $a0, %hi(D_801404FC) # $a0, 0x8014 -/* B1B864 800A46C4 0C00084C */ jal osSyncPrintf -/* B1B868 800A46C8 248404FC */ addiu $a0, %lo(D_801404FC) # addiu $a0, $a0, 0x4fc -/* B1B86C 800A46CC 8FAE002C */ lw $t6, 0x2c($sp) -.L800A46D0: -/* B1B870 800A46D0 02002025 */ move $a0, $s0 -/* B1B874 800A46D4 51C00004 */ beql $t6, $zero, .L800A46E8 -/* B1B878 800A46D8 8FBF001C */ lw $ra, 0x1c($sp) -/* B1B87C 800A46DC 0C0294BE */ jal func_800A52F8 -/* B1B880 800A46E0 01C02825 */ move $a1, $t6 -/* B1B884 800A46E4 8FBF001C */ lw $ra, 0x1c($sp) -.L800A46E8: -/* B1B888 800A46E8 8FB00018 */ lw $s0, 0x18($sp) -/* B1B88C 800A46EC 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1B890 800A46F0 03E00008 */ jr $ra -/* B1B894 800A46F4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A0D94.s b/asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawLimbSV.s similarity index 98% rename from asm/non_matchings/code/z_skelanime/func_800A0D94.s rename to asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawLimbSV.s index a2a64b69d2..647fbad678 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A0D94.s +++ b/asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawLimbSV.s @@ -16,7 +16,7 @@ glabel D_80140034 .balign 4 .text -glabel func_800A0D94 +glabel SkelAnime_LodDrawLimbSV /* B17F34 800A0D94 27BDFF90 */ addiu $sp, $sp, -0x70 /* B17F38 800A0D98 AFBF002C */ sw $ra, 0x2c($sp) /* B17F3C 800A0D9C AFA40070 */ sw $a0, 0x70($sp) @@ -177,7 +177,7 @@ glabel func_800A0D94 /* B18198 800A0FF8 AFAB0014 */ sw $t3, 0x14($sp) /* B1819C 800A0FFC AFA90018 */ sw $t1, 0x18($sp) /* B181A0 800A1000 AFAC001C */ sw $t4, 0x1c($sp) -/* B181A4 800A1004 0C028365 */ jal func_800A0D94 +/* B181A4 800A1004 0C028365 */ jal SkelAnime_LodDrawLimbSV /* B181A8 800A1008 AFAF0020 */ sw $t7, 0x20($sp) .L800A100C: /* B181AC 800A100C 0C034221 */ jal Matrix_Pull @@ -198,7 +198,7 @@ glabel func_800A0D94 /* B181E8 800A1048 AFAE0014 */ sw $t6, 0x14($sp) /* B181EC 800A104C AFB80018 */ sw $t8, 0x18($sp) /* B181F0 800A1050 AFB9001C */ sw $t9, 0x1c($sp) -/* B181F4 800A1054 0C028365 */ jal func_800A0D94 +/* B181F4 800A1054 0C028365 */ jal SkelAnime_LodDrawLimbSV /* B181F8 800A1058 AFAB0020 */ sw $t3, 0x20($sp) .L800A105C: /* B181FC 800A105C 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/code/z_skelanime/func_800A106C.s b/asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawSV.s similarity index 99% rename from asm/non_matchings/code/z_skelanime/func_800A106C.s rename to asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawSV.s index 5566773573..0f0c661b6b 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A106C.s +++ b/asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawSV.s @@ -29,7 +29,7 @@ glabel D_801400B4 .balign 4 .text -glabel func_800A106C +glabel SkelAnime_LodDrawSV /* B1820C 800A106C 27BDFF80 */ addiu $sp, $sp, -0x80 /* B18210 800A1070 AFBF002C */ sw $ra, 0x2c($sp) /* B18214 800A1074 AFA40080 */ sw $a0, 0x80($sp) @@ -202,7 +202,7 @@ glabel func_800A106C /* B1849C 800A12FC AFAB0010 */ sw $t3, 0x10($sp) /* B184A0 800A1300 AFA20014 */ sw $v0, 0x14($sp) /* B184A4 800A1304 AFAE0018 */ sw $t6, 0x18($sp) -/* B184A8 800A1308 0C028365 */ jal func_800A0D94 +/* B184A8 800A1308 0C028365 */ jal SkelAnime_LodDrawLimbSV /* B184AC 800A130C AFAF001C */ sw $t7, 0x1c($sp) .L800A1310: /* B184B0 800A1310 0C034221 */ jal Matrix_Pull diff --git a/asm/non_matchings/code/z_skelanime/func_800A08A0.s b/asm/non_matchings/code/z_skelanime/func_800A08A0.s deleted file mode 100644 index 51ce612696..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A08A0.s +++ /dev/null @@ -1,189 +0,0 @@ -.rdata -glabel D_8013FF50 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8013FF64 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8013FF78 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A08A0 -/* B17A40 800A08A0 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B17A44 800A08A4 AFBF0024 */ sw $ra, 0x24($sp) -/* B17A48 800A08A8 AFA40068 */ sw $a0, 0x68($sp) -/* B17A4C 800A08AC AFA5006C */ sw $a1, 0x6c($sp) -/* B17A50 800A08B0 AFA60070 */ sw $a2, 0x70($sp) -/* B17A54 800A08B4 AFA70074 */ sw $a3, 0x74($sp) -/* B17A58 800A08B8 8C850000 */ lw $a1, ($a0) -/* B17A5C 800A08BC 3C068014 */ lui $a2, %hi(D_8013FF50) # $a2, 0x8014 -/* B17A60 800A08C0 24C6FF50 */ addiu $a2, %lo(D_8013FF50) # addiu $a2, $a2, -0xb0 -/* B17A64 800A08C4 27A40038 */ addiu $a0, $sp, 0x38 -/* B17A68 800A08C8 24070305 */ li $a3, 773 -/* B17A6C 800A08CC 0C031AB1 */ jal func_800C6AC4 -/* B17A70 800A08D0 AFA50048 */ sw $a1, 0x48($sp) -/* B17A74 800A08D4 0C034213 */ jal Matrix_Push -/* B17A78 800A08D8 00000000 */ nop -/* B17A7C 800A08DC 8FB8006C */ lw $t8, 0x6c($sp) -/* B17A80 800A08E0 8FAF0070 */ lw $t7, 0x70($sp) -/* B17A84 800A08E4 3C0E8016 */ lui $t6, %hi(gSegments) -/* B17A88 800A08E8 0018C880 */ sll $t9, $t8, 2 -/* B17A8C 800A08EC 01F94821 */ addu $t1, $t7, $t9 -/* B17A90 800A08F0 8D220000 */ lw $v0, ($t1) -/* B17A94 800A08F4 270F0001 */ addiu $t7, $t8, 1 -/* B17A98 800A08F8 8FA90074 */ lw $t1, 0x74($sp) -/* B17A9C 800A08FC 00025900 */ sll $t3, $v0, 4 -/* B17AA0 800A0900 000B6702 */ srl $t4, $t3, 0x1c -/* B17AA4 800A0904 000C6880 */ sll $t5, $t4, 2 -/* B17AA8 800A0908 01CD7021 */ addu $t6, $t6, $t5 -/* B17AAC 800A090C 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* B17AB0 800A0910 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B17AB4 800A0914 000F5880 */ sll $t3, $t7, 2 -/* B17AB8 800A0918 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B17ABC 800A091C 016F5823 */ subu $t3, $t3, $t7 -/* B17AC0 800A0920 000B5840 */ sll $t3, $t3, 1 -/* B17AC4 800A0924 00415024 */ and $t2, $v0, $at -/* B17AC8 800A0928 AFAF006C */ sw $t7, 0x6c($sp) -/* B17ACC 800A092C 012B6021 */ addu $t4, $t1, $t3 -/* B17AD0 800A0930 014E4021 */ addu $t0, $t2, $t6 -/* B17AD4 800A0934 898A0000 */ lwl $t2, ($t4) -/* B17AD8 800A0938 998A0003 */ lwr $t2, 3($t4) -/* B17ADC 800A093C 27B9004C */ addiu $t9, $sp, 0x4c -/* B17AE0 800A0940 3C018000 */ lui $at, 0x8000 -/* B17AE4 800A0944 AF2A0000 */ sw $t2, ($t9) -/* B17AE8 800A0948 958A0004 */ lhu $t2, 4($t4) -/* B17AEC 800A094C 01014021 */ addu $t0, $t0, $at -/* B17AF0 800A0950 27A60060 */ addiu $a2, $sp, 0x60 -/* B17AF4 800A0954 A72A0004 */ sh $t2, 4($t9) -/* B17AF8 800A0958 850E0000 */ lh $t6, ($t0) -/* B17AFC 800A095C 8FA90084 */ lw $t1, 0x84($sp) -/* B17B00 800A0960 8FAD0078 */ lw $t5, 0x78($sp) -/* B17B04 800A0964 448E2000 */ mtc1 $t6, $f4 -/* B17B08 800A0968 00095880 */ sll $t3, $t1, 2 -/* B17B0C 800A096C 010BC821 */ addu $t9, $t0, $t3 -/* B17B10 800A0970 468021A0 */ cvt.s.w $f6, $f4 -/* B17B14 800A0974 8FA5006C */ lw $a1, 0x6c($sp) -/* B17B18 800A0978 8FA40068 */ lw $a0, 0x68($sp) -/* B17B1C 800A097C 27AA004C */ addiu $t2, $sp, 0x4c -/* B17B20 800A0980 27A70054 */ addiu $a3, $sp, 0x54 -/* B17B24 800A0984 E7A60054 */ swc1 $f6, 0x54($sp) -/* B17B28 800A0988 85180002 */ lh $t8, 2($t0) -/* B17B2C 800A098C 44984000 */ mtc1 $t8, $f8 -/* B17B30 800A0990 00000000 */ nop -/* B17B34 800A0994 468042A0 */ cvt.s.w $f10, $f8 -/* B17B38 800A0998 E7AA0058 */ swc1 $f10, 0x58($sp) -/* B17B3C 800A099C 850F0004 */ lh $t7, 4($t0) -/* B17B40 800A09A0 448F8000 */ mtc1 $t7, $f16 -/* B17B44 800A09A4 00000000 */ nop -/* B17B48 800A09A8 468084A0 */ cvt.s.w $f18, $f16 -/* B17B4C 800A09AC E7B2005C */ swc1 $f18, 0x5c($sp) -/* B17B50 800A09B0 8F2C0008 */ lw $t4, 8($t9) -/* B17B54 800A09B4 11A00008 */ beqz $t5, .L800A09D8 -/* B17B58 800A09B8 AFAC0060 */ sw $t4, 0x60($sp) -/* B17B5C 800A09BC 8FAE0080 */ lw $t6, 0x80($sp) -/* B17B60 800A09C0 AFAA0010 */ sw $t2, 0x10($sp) -/* B17B64 800A09C4 AFA80064 */ sw $t0, 0x64($sp) -/* B17B68 800A09C8 01A0F809 */ jalr $t5 -/* B17B6C 800A09CC AFAE0014 */ sw $t6, 0x14($sp) -/* B17B70 800A09D0 14400022 */ bnez $v0, .L800A0A5C -/* B17B74 800A09D4 8FA80064 */ lw $t0, 0x64($sp) -.L800A09D8: -/* B17B78 800A09D8 27A40054 */ addiu $a0, $sp, 0x54 -/* B17B7C 800A09DC 27A5004C */ addiu $a1, $sp, 0x4c -/* B17B80 800A09E0 0C0344D0 */ jal Matrix_TranslateThenRotateZYX -/* B17B84 800A09E4 AFA80064 */ sw $t0, 0x64($sp) -/* B17B88 800A09E8 8FB80060 */ lw $t8, 0x60($sp) -/* B17B8C 800A09EC 8FA80064 */ lw $t0, 0x64($sp) -/* B17B90 800A09F0 8FA70048 */ lw $a3, 0x48($sp) -/* B17B94 800A09F4 13000019 */ beqz $t8, .L800A0A5C -/* B17B98 800A09F8 3C09DA38 */ lui $t1, (0xDA380003 >> 16) # lui $t1, 0xda38 -/* B17B9C 800A09FC 8CE202C0 */ lw $v0, 0x2c0($a3) -/* B17BA0 800A0A00 35290003 */ ori $t1, (0xDA380003 & 0xFFFF) # ori $t1, $t1, 3 -/* B17BA4 800A0A04 3C058014 */ lui $a1, %hi(D_8013FF64) # $a1, 0x8014 -/* B17BA8 800A0A08 244F0008 */ addiu $t7, $v0, 8 -/* B17BAC 800A0A0C ACEF02C0 */ sw $t7, 0x2c0($a3) -/* B17BB0 800A0A10 AC490000 */ sw $t1, ($v0) -/* B17BB4 800A0A14 8FAB0068 */ lw $t3, 0x68($sp) -/* B17BB8 800A0A18 24A5FF64 */ addiu $a1, %lo(D_8013FF64) # addiu $a1, $a1, -0x9c -/* B17BBC 800A0A1C 24060325 */ li $a2, 805 -/* B17BC0 800A0A20 8D640000 */ lw $a0, ($t3) -/* B17BC4 800A0A24 AFA80064 */ sw $t0, 0x64($sp) -/* B17BC8 800A0A28 0C0346A2 */ jal Matrix_NewMtx -/* B17BCC 800A0A2C AFA20034 */ sw $v0, 0x34($sp) -/* B17BD0 800A0A30 8FA30034 */ lw $v1, 0x34($sp) -/* B17BD4 800A0A34 8FA80064 */ lw $t0, 0x64($sp) -/* B17BD8 800A0A38 3C0ADE00 */ lui $t2, 0xde00 -/* B17BDC 800A0A3C AC620004 */ sw $v0, 4($v1) -/* B17BE0 800A0A40 8FB90048 */ lw $t9, 0x48($sp) -/* B17BE4 800A0A44 8F2202C0 */ lw $v0, 0x2c0($t9) -/* B17BE8 800A0A48 244C0008 */ addiu $t4, $v0, 8 -/* B17BEC 800A0A4C AF2C02C0 */ sw $t4, 0x2c0($t9) -/* B17BF0 800A0A50 AC4A0000 */ sw $t2, ($v0) -/* B17BF4 800A0A54 8FAE0060 */ lw $t6, 0x60($sp) -/* B17BF8 800A0A58 AC4E0004 */ sw $t6, 4($v0) -.L800A0A5C: -/* B17BFC 800A0A5C 8FAD007C */ lw $t5, 0x7c($sp) -/* B17C00 800A0A60 8FA40068 */ lw $a0, 0x68($sp) -/* B17C04 800A0A64 8FA5006C */ lw $a1, 0x6c($sp) -/* B17C08 800A0A68 11A00007 */ beqz $t5, .L800A0A88 -/* B17C0C 800A0A6C 27A60060 */ addiu $a2, $sp, 0x60 -/* B17C10 800A0A70 8FB80080 */ lw $t8, 0x80($sp) -/* B17C14 800A0A74 27A7004C */ addiu $a3, $sp, 0x4c -/* B17C18 800A0A78 AFA80064 */ sw $t0, 0x64($sp) -/* B17C1C 800A0A7C 01A0F809 */ jalr $t5 -/* B17C20 800A0A80 AFB80010 */ sw $t8, 0x10($sp) -/* B17C24 800A0A84 8FA80064 */ lw $t0, 0x64($sp) -.L800A0A88: -/* B17C28 800A0A88 91050006 */ lbu $a1, 6($t0) -/* B17C2C 800A0A8C 240100FF */ li $at, 255 -/* B17C30 800A0A90 8FA40068 */ lw $a0, 0x68($sp) -/* B17C34 800A0A94 10A1000D */ beq $a1, $at, .L800A0ACC -/* B17C38 800A0A98 8FA60070 */ lw $a2, 0x70($sp) -/* B17C3C 800A0A9C 8FAF0078 */ lw $t7, 0x78($sp) -/* B17C40 800A0AA0 8FA9007C */ lw $t1, 0x7c($sp) -/* B17C44 800A0AA4 8FAB0080 */ lw $t3, 0x80($sp) -/* B17C48 800A0AA8 8FAC0084 */ lw $t4, 0x84($sp) -/* B17C4C 800A0AAC 8FA70074 */ lw $a3, 0x74($sp) -/* B17C50 800A0AB0 AFA80064 */ sw $t0, 0x64($sp) -/* B17C54 800A0AB4 AFAF0010 */ sw $t7, 0x10($sp) -/* B17C58 800A0AB8 AFA90014 */ sw $t1, 0x14($sp) -/* B17C5C 800A0ABC AFAB0018 */ sw $t3, 0x18($sp) -/* B17C60 800A0AC0 0C028228 */ jal func_800A08A0 -/* B17C64 800A0AC4 AFAC001C */ sw $t4, 0x1c($sp) -/* B17C68 800A0AC8 8FA80064 */ lw $t0, 0x64($sp) -.L800A0ACC: -/* B17C6C 800A0ACC 0C034221 */ jal Matrix_Pull -/* B17C70 800A0AD0 AFA80064 */ sw $t0, 0x64($sp) -/* B17C74 800A0AD4 8FA80064 */ lw $t0, 0x64($sp) -/* B17C78 800A0AD8 240100FF */ li $at, 255 -/* B17C7C 800A0ADC 8FA40068 */ lw $a0, 0x68($sp) -/* B17C80 800A0AE0 91050007 */ lbu $a1, 7($t0) -/* B17C84 800A0AE4 8FA60070 */ lw $a2, 0x70($sp) -/* B17C88 800A0AE8 8FA70074 */ lw $a3, 0x74($sp) -/* B17C8C 800A0AEC 10A10009 */ beq $a1, $at, .L800A0B14 -/* B17C90 800A0AF0 8FB90078 */ lw $t9, 0x78($sp) -/* B17C94 800A0AF4 8FAA007C */ lw $t2, 0x7c($sp) -/* B17C98 800A0AF8 8FAE0080 */ lw $t6, 0x80($sp) -/* B17C9C 800A0AFC 8FB80084 */ lw $t8, 0x84($sp) -/* B17CA0 800A0B00 AFB90010 */ sw $t9, 0x10($sp) -/* B17CA4 800A0B04 AFAA0014 */ sw $t2, 0x14($sp) -/* B17CA8 800A0B08 AFAE0018 */ sw $t6, 0x18($sp) -/* B17CAC 800A0B0C 0C028228 */ jal func_800A08A0 -/* B17CB0 800A0B10 AFB8001C */ sw $t8, 0x1c($sp) -.L800A0B14: -/* B17CB4 800A0B14 8FAD0068 */ lw $t5, 0x68($sp) -/* B17CB8 800A0B18 3C068014 */ lui $a2, %hi(D_8013FF78) # $a2, 0x8014 -/* B17CBC 800A0B1C 24C6FF78 */ addiu $a2, %lo(D_8013FF78) # addiu $a2, $a2, -0x88 -/* B17CC0 800A0B20 27A40038 */ addiu $a0, $sp, 0x38 -/* B17CC4 800A0B24 24070335 */ li $a3, 821 -/* B17CC8 800A0B28 0C031AD5 */ jal func_800C6B54 -/* B17CCC 800A0B2C 8DA50000 */ lw $a1, ($t5) -/* B17CD0 800A0B30 8FBF0024 */ lw $ra, 0x24($sp) -/* B17CD4 800A0B34 27BD0068 */ addiu $sp, $sp, 0x68 -/* B17CD8 800A0B38 03E00008 */ jr $ra -/* B17CDC 800A0B3C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A0B40.s b/asm/non_matchings/code/z_skelanime/func_800A0B40.s deleted file mode 100644 index afc154d86e..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A0B40.s +++ /dev/null @@ -1,185 +0,0 @@ -.rdata -glabel D_8013FF8C - .asciz "\x1b[31m" - .balign 4 - -glabel D_8013FF94 - .asciz "Si2_Lod_draw():skelがNULLです。\n" - # EUC-JP: がNULLです。| Is null - .balign 4 - -glabel D_8013FFB8 - .asciz "\x1b[m" - .balign 4 - -glabel D_8013FFBC - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8013FFD0 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8013FFE4 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A0B40 -/* B17CE0 800A0B40 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B17CE4 800A0B44 AFBF0024 */ sw $ra, 0x24($sp) -/* B17CE8 800A0B48 AFA40068 */ sw $a0, 0x68($sp) -/* B17CEC 800A0B4C AFA5006C */ sw $a1, 0x6c($sp) -/* B17CF0 800A0B50 AFA60070 */ sw $a2, 0x70($sp) -/* B17CF4 800A0B54 14A0000C */ bnez $a1, .L800A0B88 -/* B17CF8 800A0B58 AFA70074 */ sw $a3, 0x74($sp) -/* B17CFC 800A0B5C 3C048014 */ lui $a0, %hi(D_8013FF8C) # $a0, 0x8014 -/* B17D00 800A0B60 0C00084C */ jal osSyncPrintf -/* B17D04 800A0B64 2484FF8C */ addiu $a0, %lo(D_8013FF8C) # addiu $a0, $a0, -0x74 -/* B17D08 800A0B68 3C048014 */ lui $a0, %hi(D_8013FF94) # $a0, 0x8014 -/* B17D0C 800A0B6C 0C00084C */ jal osSyncPrintf -/* B17D10 800A0B70 2484FF94 */ addiu $a0, %lo(D_8013FF94) # addiu $a0, $a0, -0x6c -/* B17D14 800A0B74 3C048014 */ lui $a0, %hi(D_8013FFB8) # $a0, 0x8014 -/* B17D18 800A0B78 0C00084C */ jal osSyncPrintf -/* B17D1C 800A0B7C 2484FFB8 */ addiu $a0, %lo(D_8013FFB8) # addiu $a0, $a0, -0x48 -/* B17D20 800A0B80 10000081 */ b .L800A0D88 -/* B17D24 800A0B84 8FBF0024 */ lw $ra, 0x24($sp) -.L800A0B88: -/* B17D28 800A0B88 8FAF0068 */ lw $t7, 0x68($sp) -/* B17D2C 800A0B8C 3C068014 */ lui $a2, %hi(D_8013FFBC) # $a2, 0x8014 -/* B17D30 800A0B90 24C6FFBC */ addiu $a2, %lo(D_8013FFBC) # addiu $a2, $a2, -0x44 -/* B17D34 800A0B94 8DE50000 */ lw $a1, ($t7) -/* B17D38 800A0B98 27A40034 */ addiu $a0, $sp, 0x34 -/* B17D3C 800A0B9C 24070351 */ li $a3, 849 -/* B17D40 800A0BA0 0C031AB1 */ jal func_800C6AC4 -/* B17D44 800A0BA4 AFA50044 */ sw $a1, 0x44($sp) -/* B17D48 800A0BA8 0C034213 */ jal Matrix_Push -/* B17D4C 800A0BAC 00000000 */ nop -/* B17D50 800A0BB0 8FB8006C */ lw $t8, 0x6c($sp) -/* B17D54 800A0BB4 3C0B8016 */ lui $t3, %hi(gSegments) -/* B17D58 800A0BB8 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B17D5C 800A0BBC 8F020000 */ lw $v0, ($t8) -/* B17D60 800A0BC0 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B17D64 800A0BC4 8FA30070 */ lw $v1, 0x70($sp) -/* B17D68 800A0BC8 00024100 */ sll $t0, $v0, 4 -/* B17D6C 800A0BCC 00084F02 */ srl $t1, $t0, 0x1c -/* B17D70 800A0BD0 00095080 */ sll $t2, $t1, 2 -/* B17D74 800A0BD4 016A5821 */ addu $t3, $t3, $t2 -/* B17D78 800A0BD8 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) -/* B17D7C 800A0BDC 0041C824 */ and $t9, $v0, $at -/* B17D80 800A0BE0 3C018000 */ lui $at, 0x8000 -/* B17D84 800A0BE4 032B6021 */ addu $t4, $t9, $t3 -/* B17D88 800A0BE8 01816821 */ addu $t5, $t4, $at -/* B17D8C 800A0BEC AFAD0064 */ sw $t5, 0x64($sp) -/* B17D90 800A0BF0 846E0000 */ lh $t6, ($v1) -/* B17D94 800A0BF4 27A80048 */ addiu $t0, $sp, 0x48 -/* B17D98 800A0BF8 24050001 */ li $a1, 1 -/* B17D9C 800A0BFC 448E2000 */ mtc1 $t6, $f4 -/* B17DA0 800A0C00 27A6005C */ addiu $a2, $sp, 0x5c -/* B17DA4 800A0C04 27A70050 */ addiu $a3, $sp, 0x50 -/* B17DA8 800A0C08 468021A0 */ cvt.s.w $f6, $f4 -/* B17DAC 800A0C0C E7A60050 */ swc1 $f6, 0x50($sp) -/* B17DB0 800A0C10 846F0002 */ lh $t7, 2($v1) -/* B17DB4 800A0C14 448F4000 */ mtc1 $t7, $f8 -/* B17DB8 800A0C18 00000000 */ nop -/* B17DBC 800A0C1C 468042A0 */ cvt.s.w $f10, $f8 -/* B17DC0 800A0C20 E7AA0054 */ swc1 $f10, 0x54($sp) -/* B17DC4 800A0C24 84780004 */ lh $t8, 4($v1) -/* B17DC8 800A0C28 44988000 */ mtc1 $t8, $f16 -/* B17DCC 800A0C2C 27B80048 */ addiu $t8, $sp, 0x48 -/* B17DD0 800A0C30 468084A0 */ cvt.s.w $f18, $f16 -/* B17DD4 800A0C34 E7B20058 */ swc1 $f18, 0x58($sp) -/* B17DD8 800A0C38 886A0006 */ lwl $t2, 6($v1) -/* B17DDC 800A0C3C 986A0009 */ lwr $t2, 9($v1) -/* B17DE0 800A0C40 AD0A0000 */ sw $t2, ($t0) -/* B17DE4 800A0C44 946A000A */ lhu $t2, 0xa($v1) -/* B17DE8 800A0C48 A50A0004 */ sh $t2, 4($t0) -/* B17DEC 800A0C4C 8FAB0080 */ lw $t3, 0x80($sp) -/* B17DF0 800A0C50 8FB90064 */ lw $t9, 0x64($sp) -/* B17DF4 800A0C54 8FAF0074 */ lw $t7, 0x74($sp) -/* B17DF8 800A0C58 000B6080 */ sll $t4, $t3, 2 -/* B17DFC 800A0C5C 032C6821 */ addu $t5, $t9, $t4 -/* B17E00 800A0C60 8DAE0008 */ lw $t6, 8($t5) -/* B17E04 800A0C64 8FA40068 */ lw $a0, 0x68($sp) -/* B17E08 800A0C68 11E00006 */ beqz $t7, .L800A0C84 -/* B17E0C 800A0C6C AFAE005C */ sw $t6, 0x5c($sp) -/* B17E10 800A0C70 8FA8007C */ lw $t0, 0x7c($sp) -/* B17E14 800A0C74 AFB80010 */ sw $t8, 0x10($sp) -/* B17E18 800A0C78 01E0F809 */ jalr $t7 -/* B17E1C 800A0C7C AFA80014 */ sw $t0, 0x14($sp) -/* B17E20 800A0C80 1440001E */ bnez $v0, .L800A0CFC -.L800A0C84: -/* B17E24 800A0C84 27A40050 */ addiu $a0, $sp, 0x50 -/* B17E28 800A0C88 0C0344D0 */ jal Matrix_TranslateThenRotateZYX -/* B17E2C 800A0C8C 27A50048 */ addiu $a1, $sp, 0x48 -/* B17E30 800A0C90 8FA9005C */ lw $t1, 0x5c($sp) -/* B17E34 800A0C94 8FA70044 */ lw $a3, 0x44($sp) -/* B17E38 800A0C98 3C0BDA38 */ lui $t3, (0xDA380003 >> 16) # lui $t3, 0xda38 -/* B17E3C 800A0C9C 51200018 */ beql $t1, $zero, .L800A0D00 -/* B17E40 800A0CA0 8FA20078 */ lw $v0, 0x78($sp) -/* B17E44 800A0CA4 8CE202C0 */ lw $v0, 0x2c0($a3) -/* B17E48 800A0CA8 356B0003 */ ori $t3, (0xDA380003 & 0xFFFF) # ori $t3, $t3, 3 -/* B17E4C 800A0CAC 3C058014 */ lui $a1, %hi(D_8013FFD0) # $a1, 0x8014 -/* B17E50 800A0CB0 244A0008 */ addiu $t2, $v0, 8 -/* B17E54 800A0CB4 ACEA02C0 */ sw $t2, 0x2c0($a3) -/* B17E58 800A0CB8 AC4B0000 */ sw $t3, ($v0) -/* B17E5C 800A0CBC 8FB90068 */ lw $t9, 0x68($sp) -/* B17E60 800A0CC0 24A5FFD0 */ addiu $a1, %lo(D_8013FFD0) # addiu $a1, $a1, -0x30 -/* B17E64 800A0CC4 24060371 */ li $a2, 881 -/* B17E68 800A0CC8 8F240000 */ lw $a0, ($t9) -/* B17E6C 800A0CCC 0C0346A2 */ jal Matrix_NewMtx -/* B17E70 800A0CD0 AFA20030 */ sw $v0, 0x30($sp) -/* B17E74 800A0CD4 8FA30030 */ lw $v1, 0x30($sp) -/* B17E78 800A0CD8 3C0EDE00 */ lui $t6, 0xde00 -/* B17E7C 800A0CDC AC620004 */ sw $v0, 4($v1) -/* B17E80 800A0CE0 8FAC0044 */ lw $t4, 0x44($sp) -/* B17E84 800A0CE4 8D8202C0 */ lw $v0, 0x2c0($t4) -/* B17E88 800A0CE8 244D0008 */ addiu $t5, $v0, 8 -/* B17E8C 800A0CEC AD8D02C0 */ sw $t5, 0x2c0($t4) -/* B17E90 800A0CF0 AC4E0000 */ sw $t6, ($v0) -/* B17E94 800A0CF4 8FB8005C */ lw $t8, 0x5c($sp) -/* B17E98 800A0CF8 AC580004 */ sw $t8, 4($v0) -.L800A0CFC: -/* B17E9C 800A0CFC 8FA20078 */ lw $v0, 0x78($sp) -.L800A0D00: -/* B17EA0 800A0D00 8FA40068 */ lw $a0, 0x68($sp) -/* B17EA4 800A0D04 24050001 */ li $a1, 1 -/* B17EA8 800A0D08 10400006 */ beqz $v0, .L800A0D24 -/* B17EAC 800A0D0C 27A6005C */ addiu $a2, $sp, 0x5c -/* B17EB0 800A0D10 8FA8007C */ lw $t0, 0x7c($sp) -/* B17EB4 800A0D14 27A70048 */ addiu $a3, $sp, 0x48 -/* B17EB8 800A0D18 0040F809 */ jalr $v0 -/* B17EBC 800A0D1C AFA80010 */ sw $t0, 0x10($sp) -/* B17EC0 800A0D20 8FA20078 */ lw $v0, 0x78($sp) -.L800A0D24: -/* B17EC4 800A0D24 8FAF0064 */ lw $t7, 0x64($sp) -/* B17EC8 800A0D28 240100FF */ li $at, 255 -/* B17ECC 800A0D2C 8FA40068 */ lw $a0, 0x68($sp) -/* B17ED0 800A0D30 91E50006 */ lbu $a1, 6($t7) -/* B17ED4 800A0D34 8FA6006C */ lw $a2, 0x6c($sp) -/* B17ED8 800A0D38 8FA70070 */ lw $a3, 0x70($sp) -/* B17EDC 800A0D3C 10A10008 */ beq $a1, $at, .L800A0D60 -/* B17EE0 800A0D40 8FA90074 */ lw $t1, 0x74($sp) -/* B17EE4 800A0D44 8FAA007C */ lw $t2, 0x7c($sp) -/* B17EE8 800A0D48 8FAB0080 */ lw $t3, 0x80($sp) -/* B17EEC 800A0D4C AFA90010 */ sw $t1, 0x10($sp) -/* B17EF0 800A0D50 AFA20014 */ sw $v0, 0x14($sp) -/* B17EF4 800A0D54 AFAA0018 */ sw $t2, 0x18($sp) -/* B17EF8 800A0D58 0C028228 */ jal func_800A08A0 -/* B17EFC 800A0D5C AFAB001C */ sw $t3, 0x1c($sp) -.L800A0D60: -/* B17F00 800A0D60 0C034221 */ jal Matrix_Pull -/* B17F04 800A0D64 00000000 */ nop -/* B17F08 800A0D68 8FB90068 */ lw $t9, 0x68($sp) -/* B17F0C 800A0D6C 3C068014 */ lui $a2, %hi(D_8013FFE4) # $a2, 0x8014 -/* B17F10 800A0D70 24C6FFE4 */ addiu $a2, %lo(D_8013FFE4) # addiu $a2, $a2, -0x1c -/* B17F14 800A0D74 27A40034 */ addiu $a0, $sp, 0x34 -/* B17F18 800A0D78 2407037E */ li $a3, 894 -/* B17F1C 800A0D7C 0C031AD5 */ jal func_800C6B54 -/* B17F20 800A0D80 8F250000 */ lw $a1, ($t9) -/* B17F24 800A0D84 8FBF0024 */ lw $ra, 0x24($sp) -.L800A0D88: -/* B17F28 800A0D88 27BD0068 */ addiu $sp, $sp, 0x68 -/* B17F2C 800A0D8C 03E00008 */ jr $ra -/* B17F30 800A0D90 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A1344.s b/asm/non_matchings/code/z_skelanime/func_800A1344.s deleted file mode 100644 index c297f75a50..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A1344.s +++ /dev/null @@ -1,182 +0,0 @@ -.rdata -glabel D_801400C8 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801400DC - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801400F0 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A1344 -/* B184E4 800A1344 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B184E8 800A1348 AFBF0024 */ sw $ra, 0x24($sp) -/* B184EC 800A134C AFA40068 */ sw $a0, 0x68($sp) -/* B184F0 800A1350 AFA5006C */ sw $a1, 0x6c($sp) -/* B184F4 800A1354 AFA60070 */ sw $a2, 0x70($sp) -/* B184F8 800A1358 AFA70074 */ sw $a3, 0x74($sp) -/* B184FC 800A135C 8C850000 */ lw $a1, ($a0) -/* B18500 800A1360 3C068014 */ lui $a2, %hi(D_801400C8) # $a2, 0x8014 -/* B18504 800A1364 24C600C8 */ addiu $a2, %lo(D_801400C8) # addiu $a2, $a2, 0xc8 -/* B18508 800A1368 27A40038 */ addiu $a0, $sp, 0x38 -/* B1850C 800A136C 24070434 */ li $a3, 1076 -/* B18510 800A1370 0C031AB1 */ jal func_800C6AC4 -/* B18514 800A1374 AFA50048 */ sw $a1, 0x48($sp) -/* B18518 800A1378 0C034213 */ jal Matrix_Push -/* B1851C 800A137C 00000000 */ nop -/* B18520 800A1380 8FB8006C */ lw $t8, 0x6c($sp) -/* B18524 800A1384 8FAF0070 */ lw $t7, 0x70($sp) -/* B18528 800A1388 3C0E8016 */ lui $t6, %hi(gSegments) -/* B1852C 800A138C 0018C880 */ sll $t9, $t8, 2 -/* B18530 800A1390 01F94821 */ addu $t1, $t7, $t9 -/* B18534 800A1394 8D220000 */ lw $v0, ($t1) -/* B18538 800A1398 270F0001 */ addiu $t7, $t8, 1 -/* B1853C 800A139C 8FA90074 */ lw $t1, 0x74($sp) -/* B18540 800A13A0 00025900 */ sll $t3, $v0, 4 -/* B18544 800A13A4 000B6702 */ srl $t4, $t3, 0x1c -/* B18548 800A13A8 000C6880 */ sll $t5, $t4, 2 -/* B1854C 800A13AC 01CD7021 */ addu $t6, $t6, $t5 -/* B18550 800A13B0 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* B18554 800A13B4 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B18558 800A13B8 000F5880 */ sll $t3, $t7, 2 -/* B1855C 800A13BC 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B18560 800A13C0 016F5823 */ subu $t3, $t3, $t7 -/* B18564 800A13C4 000B5840 */ sll $t3, $t3, 1 -/* B18568 800A13C8 00415024 */ and $t2, $v0, $at -/* B1856C 800A13CC AFAF006C */ sw $t7, 0x6c($sp) -/* B18570 800A13D0 012B6021 */ addu $t4, $t1, $t3 -/* B18574 800A13D4 014E4021 */ addu $t0, $t2, $t6 -/* B18578 800A13D8 898A0000 */ lwl $t2, ($t4) -/* B1857C 800A13DC 998A0003 */ lwr $t2, 3($t4) -/* B18580 800A13E0 27B9004C */ addiu $t9, $sp, 0x4c -/* B18584 800A13E4 3C018000 */ lui $at, 0x8000 -/* B18588 800A13E8 AF2A0000 */ sw $t2, ($t9) -/* B1858C 800A13EC 958A0004 */ lhu $t2, 4($t4) -/* B18590 800A13F0 01014021 */ addu $t0, $t0, $at -/* B18594 800A13F4 27A60060 */ addiu $a2, $sp, 0x60 -/* B18598 800A13F8 A72A0004 */ sh $t2, 4($t9) -/* B1859C 800A13FC 850E0000 */ lh $t6, ($t0) -/* B185A0 800A1400 8FAB0078 */ lw $t3, 0x78($sp) -/* B185A4 800A1404 8FA5006C */ lw $a1, 0x6c($sp) -/* B185A8 800A1408 448E2000 */ mtc1 $t6, $f4 -/* B185AC 800A140C 8FA40068 */ lw $a0, 0x68($sp) -/* B185B0 800A1410 27B9004C */ addiu $t9, $sp, 0x4c -/* B185B4 800A1414 468021A0 */ cvt.s.w $f6, $f4 -/* B185B8 800A1418 27A70054 */ addiu $a3, $sp, 0x54 -/* B185BC 800A141C E7A60054 */ swc1 $f6, 0x54($sp) -/* B185C0 800A1420 85180002 */ lh $t8, 2($t0) -/* B185C4 800A1424 44984000 */ mtc1 $t8, $f8 -/* B185C8 800A1428 00000000 */ nop -/* B185CC 800A142C 468042A0 */ cvt.s.w $f10, $f8 -/* B185D0 800A1430 E7AA0058 */ swc1 $f10, 0x58($sp) -/* B185D4 800A1434 850F0004 */ lh $t7, 4($t0) -/* B185D8 800A1438 448F8000 */ mtc1 $t7, $f16 -/* B185DC 800A143C 00000000 */ nop -/* B185E0 800A1440 468084A0 */ cvt.s.w $f18, $f16 -/* B185E4 800A1444 E7B2005C */ swc1 $f18, 0x5c($sp) -/* B185E8 800A1448 8D090008 */ lw $t1, 8($t0) -/* B185EC 800A144C 11600008 */ beqz $t3, .L800A1470 -/* B185F0 800A1450 AFA90060 */ sw $t1, 0x60($sp) -/* B185F4 800A1454 8FAC0080 */ lw $t4, 0x80($sp) -/* B185F8 800A1458 AFB90010 */ sw $t9, 0x10($sp) -/* B185FC 800A145C AFA80064 */ sw $t0, 0x64($sp) -/* B18600 800A1460 0160F809 */ jalr $t3 -/* B18604 800A1464 AFAC0014 */ sw $t4, 0x14($sp) -/* B18608 800A1468 14400022 */ bnez $v0, .L800A14F4 -/* B1860C 800A146C 8FA80064 */ lw $t0, 0x64($sp) -.L800A1470: -/* B18610 800A1470 27A40054 */ addiu $a0, $sp, 0x54 -/* B18614 800A1474 27A5004C */ addiu $a1, $sp, 0x4c -/* B18618 800A1478 0C0344D0 */ jal Matrix_TranslateThenRotateZYX -/* B1861C 800A147C AFA80064 */ sw $t0, 0x64($sp) -/* B18620 800A1480 8FAD0060 */ lw $t5, 0x60($sp) -/* B18624 800A1484 8FA80064 */ lw $t0, 0x64($sp) -/* B18628 800A1488 8FA70048 */ lw $a3, 0x48($sp) -/* B1862C 800A148C 11A00019 */ beqz $t5, .L800A14F4 -/* B18630 800A1490 3C0EDA38 */ lui $t6, (0xDA380003 >> 16) # lui $t6, 0xda38 -/* B18634 800A1494 8CE202C0 */ lw $v0, 0x2c0($a3) -/* B18638 800A1498 35CE0003 */ ori $t6, (0xDA380003 & 0xFFFF) # ori $t6, $t6, 3 -/* B1863C 800A149C 3C058014 */ lui $a1, %hi(D_801400DC) # $a1, 0x8014 -/* B18640 800A14A0 244A0008 */ addiu $t2, $v0, 8 -/* B18644 800A14A4 ACEA02C0 */ sw $t2, 0x2c0($a3) -/* B18648 800A14A8 AC4E0000 */ sw $t6, ($v0) -/* B1864C 800A14AC 8FB80068 */ lw $t8, 0x68($sp) -/* B18650 800A14B0 24A500DC */ addiu $a1, %lo(D_801400DC) # addiu $a1, $a1, 0xdc -/* B18654 800A14B4 2406044F */ li $a2, 1103 -/* B18658 800A14B8 8F040000 */ lw $a0, ($t8) -/* B1865C 800A14BC AFA80064 */ sw $t0, 0x64($sp) -/* B18660 800A14C0 0C0346A2 */ jal Matrix_NewMtx -/* B18664 800A14C4 AFA20034 */ sw $v0, 0x34($sp) -/* B18668 800A14C8 8FA30034 */ lw $v1, 0x34($sp) -/* B1866C 800A14CC 8FA80064 */ lw $t0, 0x64($sp) -/* B18670 800A14D0 3C19DE00 */ lui $t9, 0xde00 -/* B18674 800A14D4 AC620004 */ sw $v0, 4($v1) -/* B18678 800A14D8 8FAF0048 */ lw $t7, 0x48($sp) -/* B1867C 800A14DC 8DE202C0 */ lw $v0, 0x2c0($t7) -/* B18680 800A14E0 24490008 */ addiu $t1, $v0, 8 -/* B18684 800A14E4 ADE902C0 */ sw $t1, 0x2c0($t7) -/* B18688 800A14E8 AC590000 */ sw $t9, ($v0) -/* B1868C 800A14EC 8FAC0060 */ lw $t4, 0x60($sp) -/* B18690 800A14F0 AC4C0004 */ sw $t4, 4($v0) -.L800A14F4: -/* B18694 800A14F4 8FAB007C */ lw $t3, 0x7c($sp) -/* B18698 800A14F8 8FA40068 */ lw $a0, 0x68($sp) -/* B1869C 800A14FC 8FA5006C */ lw $a1, 0x6c($sp) -/* B186A0 800A1500 11600007 */ beqz $t3, .L800A1520 -/* B186A4 800A1504 27A60060 */ addiu $a2, $sp, 0x60 -/* B186A8 800A1508 8FAD0080 */ lw $t5, 0x80($sp) -/* B186AC 800A150C 27A7004C */ addiu $a3, $sp, 0x4c -/* B186B0 800A1510 AFA80064 */ sw $t0, 0x64($sp) -/* B186B4 800A1514 0160F809 */ jalr $t3 -/* B186B8 800A1518 AFAD0010 */ sw $t5, 0x10($sp) -/* B186BC 800A151C 8FA80064 */ lw $t0, 0x64($sp) -.L800A1520: -/* B186C0 800A1520 91050006 */ lbu $a1, 6($t0) -/* B186C4 800A1524 240100FF */ li $at, 255 -/* B186C8 800A1528 8FA40068 */ lw $a0, 0x68($sp) -/* B186CC 800A152C 10A1000B */ beq $a1, $at, .L800A155C -/* B186D0 800A1530 8FA60070 */ lw $a2, 0x70($sp) -/* B186D4 800A1534 8FAA0078 */ lw $t2, 0x78($sp) -/* B186D8 800A1538 8FAE007C */ lw $t6, 0x7c($sp) -/* B186DC 800A153C 8FB80080 */ lw $t8, 0x80($sp) -/* B186E0 800A1540 8FA70074 */ lw $a3, 0x74($sp) -/* B186E4 800A1544 AFA80064 */ sw $t0, 0x64($sp) -/* B186E8 800A1548 AFAA0010 */ sw $t2, 0x10($sp) -/* B186EC 800A154C AFAE0014 */ sw $t6, 0x14($sp) -/* B186F0 800A1550 0C0284D1 */ jal func_800A1344 -/* B186F4 800A1554 AFB80018 */ sw $t8, 0x18($sp) -/* B186F8 800A1558 8FA80064 */ lw $t0, 0x64($sp) -.L800A155C: -/* B186FC 800A155C 0C034221 */ jal Matrix_Pull -/* B18700 800A1560 AFA80064 */ sw $t0, 0x64($sp) -/* B18704 800A1564 8FA80064 */ lw $t0, 0x64($sp) -/* B18708 800A1568 240100FF */ li $at, 255 -/* B1870C 800A156C 8FA40068 */ lw $a0, 0x68($sp) -/* B18710 800A1570 91050007 */ lbu $a1, 7($t0) -/* B18714 800A1574 8FA60070 */ lw $a2, 0x70($sp) -/* B18718 800A1578 8FA70074 */ lw $a3, 0x74($sp) -/* B1871C 800A157C 10A10007 */ beq $a1, $at, .L800A159C -/* B18720 800A1580 8FA90078 */ lw $t1, 0x78($sp) -/* B18724 800A1584 8FAF007C */ lw $t7, 0x7c($sp) -/* B18728 800A1588 8FB90080 */ lw $t9, 0x80($sp) -/* B1872C 800A158C AFA90010 */ sw $t1, 0x10($sp) -/* B18730 800A1590 AFAF0014 */ sw $t7, 0x14($sp) -/* B18734 800A1594 0C0284D1 */ jal func_800A1344 -/* B18738 800A1598 AFB90018 */ sw $t9, 0x18($sp) -.L800A159C: -/* B1873C 800A159C 8FAC0068 */ lw $t4, 0x68($sp) -/* B18740 800A15A0 3C068014 */ lui $a2, %hi(D_801400F0) # $a2, 0x8014 -/* B18744 800A15A4 24C600F0 */ addiu $a2, %lo(D_801400F0) # addiu $a2, $a2, 0xf0 -/* B18748 800A15A8 27A40038 */ addiu $a0, $sp, 0x38 -/* B1874C 800A15AC 24070461 */ li $a3, 1121 -/* B18750 800A15B0 0C031AD5 */ jal func_800C6B54 -/* B18754 800A15B4 8D850000 */ lw $a1, ($t4) -/* B18758 800A15B8 8FBF0024 */ lw $ra, 0x24($sp) -/* B1875C 800A15BC 27BD0068 */ addiu $sp, $sp, 0x68 -/* B18760 800A15C0 03E00008 */ jr $ra -/* B18764 800A15C4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A1D8C.s b/asm/non_matchings/code/z_skelanime/func_800A1D8C.s deleted file mode 100644 index b9b6131c10..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A1D8C.s +++ /dev/null @@ -1,189 +0,0 @@ -.rdata -glabel D_80140238 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014024C - .asciz "out = %08x\n" - .balign 4 - -glabel D_80140258 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014026C - .asciz "ref_tbl = %08x\n" - .balign 4 - -glabel D_8014027C - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140290 - .asciz "frame_tbl = %08x\n" - .balign 4 - -glabel D_801402A4 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801402B8 - .asciz "tbl = %08x\n" - .balign 4 - -.text -glabel func_800A1D8C -/* B18F2C 800A1D8C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B18F30 800A1D90 00047100 */ sll $t6, $a0, 4 -/* B18F34 800A1D94 3C098016 */ lui $t1, %hi(gSegments) # $t1, 0x8016 -/* B18F38 800A1D98 000E7F02 */ srl $t7, $t6, 0x1c -/* B18F3C 800A1D9C 25296FA8 */ addiu $t1, %lo(gSegments) # addiu $t1, $t1, 0x6fa8 -/* B18F40 800A1DA0 000FC080 */ sll $t8, $t7, 2 -/* B18F44 800A1DA4 0138C821 */ addu $t9, $t1, $t8 -/* B18F48 800A1DA8 8F2D0000 */ lw $t5, ($t9) -/* B18F4C 800A1DAC 3C0A00FF */ lui $t2, (0x00FFFFFF >> 16) # lui $t2, 0xff -/* B18F50 800A1DB0 354AFFFF */ ori $t2, (0x00FFFFFF & 0xFFFF) # ori $t2, $t2, 0xffff -/* B18F54 800A1DB4 008A7024 */ and $t6, $a0, $t2 -/* B18F58 800A1DB8 3C0B8000 */ lui $t3, 0x8000 -/* B18F5C 800A1DBC 01AE7821 */ addu $t7, $t5, $t6 -/* B18F60 800A1DC0 AFBF003C */ sw $ra, 0x3c($sp) -/* B18F64 800A1DC4 AFBE0038 */ sw $fp, 0x38($sp) -/* B18F68 800A1DC8 AFB70034 */ sw $s7, 0x34($sp) -/* B18F6C 800A1DCC AFB60030 */ sw $s6, 0x30($sp) -/* B18F70 800A1DD0 AFB5002C */ sw $s5, 0x2c($sp) -/* B18F74 800A1DD4 AFB40028 */ sw $s4, 0x28($sp) -/* B18F78 800A1DD8 AFB30024 */ sw $s3, 0x24($sp) -/* B18F7C 800A1DDC AFB20020 */ sw $s2, 0x20($sp) -/* B18F80 800A1DE0 AFB1001C */ sw $s1, 0x1c($sp) -/* B18F84 800A1DE4 AFB00018 */ sw $s0, 0x18($sp) -/* B18F88 800A1DE8 01EB1021 */ addu $v0, $t7, $t3 -/* B18F8C 800A1DEC 8C430008 */ lw $v1, 8($v0) -/* B18F90 800A1DF0 8C480004 */ lw $t0, 4($v0) -/* B18F94 800A1DF4 00E08025 */ move $s0, $a3 -/* B18F98 800A1DF8 0003C100 */ sll $t8, $v1, 4 -/* B18F9C 800A1DFC 0018CF02 */ srl $t9, $t8, 0x1c -/* B18FA0 800A1E00 00196880 */ sll $t5, $t9, 2 -/* B18FA4 800A1E04 012D7021 */ addu $t6, $t1, $t5 -/* B18FA8 800A1E08 8DCF0000 */ lw $t7, ($t6) -/* B18FAC 800A1E0C 006AC024 */ and $t8, $v1, $t2 -/* B18FB0 800A1E10 00086900 */ sll $t5, $t0, 4 -/* B18FB4 800A1E14 01F8C821 */ addu $t9, $t7, $t8 -/* B18FB8 800A1E18 000D7702 */ srl $t6, $t5, 0x1c -/* B18FBC 800A1E1C 000E7880 */ sll $t7, $t6, 2 -/* B18FC0 800A1E20 032B8821 */ addu $s1, $t9, $t3 -/* B18FC4 800A1E24 012FC021 */ addu $t8, $t1, $t7 -/* B18FC8 800A1E28 8F190000 */ lw $t9, ($t8) -/* B18FCC 800A1E2C 010A6824 */ and $t5, $t0, $t2 -/* B18FD0 800A1E30 00C0B025 */ move $s6, $a2 -/* B18FD4 800A1E34 032D7021 */ addu $t6, $t9, $t5 -/* B18FD8 800A1E38 01CB9021 */ addu $s2, $t6, $t3 -/* B18FDC 800A1E3C 944C000C */ lhu $t4, 0xc($v0) -/* B18FE0 800A1E40 18C00055 */ blez $a2, .L800A1F98 -/* B18FE4 800A1E44 0000A025 */ move $s4, $zero -/* B18FE8 800A1E48 00057840 */ sll $t7, $a1, 1 -/* B18FEC 800A1E4C 3C1E8014 */ lui $fp, %hi(D_8014024C) # $fp, 0x8014 -/* B18FF0 800A1E50 3C178014 */ lui $s7, %hi(D_80140238) # $s7, 0x8014 -/* B18FF4 800A1E54 26F70238 */ addiu $s7, %lo(D_80140238) # addiu $s7, $s7, 0x238 -/* B18FF8 800A1E58 27DE024C */ addiu $fp, %lo(D_8014024C) # addiu $fp, $fp, 0x24c -/* B18FFC 800A1E5C 01F29821 */ addu $s3, $t7, $s2 -/* B19000 800A1E60 0180A825 */ move $s5, $t4 -.L800A1E64: -/* B19004 800A1E64 12000007 */ beqz $s0, .L800A1E84 -/* B19008 800A1E68 02E02025 */ move $a0, $s7 -/* B1900C 800A1E6C 12200005 */ beqz $s1, .L800A1E84 -/* B19010 800A1E70 00000000 */ nop -/* B19014 800A1E74 12600003 */ beqz $s3, .L800A1E84 -/* B19018 800A1E78 00000000 */ nop -/* B1901C 800A1E7C 5640001F */ bnezl $s2, .L800A1EFC -/* B19020 800A1E80 96220000 */ lhu $v0, ($s1) -.L800A1E84: -/* B19024 800A1E84 0C000B84 */ jal LogUtils_LogThreadId -/* B19028 800A1E88 24050570 */ li $a1, 1392 -/* B1902C 800A1E8C 03C02025 */ move $a0, $fp -/* B19030 800A1E90 0C00084C */ jal osSyncPrintf -/* B19034 800A1E94 02002825 */ move $a1, $s0 -/* B19038 800A1E98 3C048014 */ lui $a0, %hi(D_80140258) # $a0, 0x8014 -/* B1903C 800A1E9C 24840258 */ addiu $a0, %lo(D_80140258) # addiu $a0, $a0, 0x258 -/* B19040 800A1EA0 0C000B84 */ jal LogUtils_LogThreadId -/* B19044 800A1EA4 24050571 */ li $a1, 1393 -/* B19048 800A1EA8 3C048014 */ lui $a0, %hi(D_8014026C) # $a0, 0x8014 -/* B1904C 800A1EAC 2484026C */ addiu $a0, %lo(D_8014026C) # addiu $a0, $a0, 0x26c -/* B19050 800A1EB0 0C00084C */ jal osSyncPrintf -/* B19054 800A1EB4 02202825 */ move $a1, $s1 -/* B19058 800A1EB8 3C048014 */ lui $a0, %hi(D_8014027C) # $a0, 0x8014 -/* B1905C 800A1EBC 2484027C */ addiu $a0, %lo(D_8014027C) # addiu $a0, $a0, 0x27c -/* B19060 800A1EC0 0C000B84 */ jal LogUtils_LogThreadId -/* B19064 800A1EC4 24050572 */ li $a1, 1394 -/* B19068 800A1EC8 3C048014 */ lui $a0, %hi(D_80140290) # $a0, 0x8014 -/* B1906C 800A1ECC 24840290 */ addiu $a0, %lo(D_80140290) # addiu $a0, $a0, 0x290 -/* B19070 800A1ED0 0C00084C */ jal osSyncPrintf -/* B19074 800A1ED4 02602825 */ move $a1, $s3 -/* B19078 800A1ED8 3C048014 */ lui $a0, %hi(D_801402A4) # $a0, 0x8014 -/* B1907C 800A1EDC 248402A4 */ addiu $a0, %lo(D_801402A4) # addiu $a0, $a0, 0x2a4 -/* B19080 800A1EE0 0C000B84 */ jal LogUtils_LogThreadId -/* B19084 800A1EE4 24050573 */ li $a1, 1395 -/* B19088 800A1EE8 3C048014 */ lui $a0, %hi(D_801402B8) # $a0, 0x8014 -/* B1908C 800A1EEC 248402B8 */ addiu $a0, %lo(D_801402B8) # addiu $a0, $a0, 0x2b8 -/* B19090 800A1EF0 0C00084C */ jal osSyncPrintf -/* B19094 800A1EF4 02402825 */ move $a1, $s2 -/* B19098 800A1EF8 96220000 */ lhu $v0, ($s1) -.L800A1EFC: -/* B1909C 800A1EFC 26940001 */ addiu $s4, $s4, 1 -/* B190A0 800A1F00 0055082A */ slt $at, $v0, $s5 -/* B190A4 800A1F04 14200006 */ bnez $at, .L800A1F20 -/* B190A8 800A1F08 00027040 */ sll $t6, $v0, 1 -/* B190AC 800A1F0C 0002C040 */ sll $t8, $v0, 1 -/* B190B0 800A1F10 0278C821 */ addu $t9, $s3, $t8 -/* B190B4 800A1F14 872D0000 */ lh $t5, ($t9) -/* B190B8 800A1F18 10000004 */ b .L800A1F2C -/* B190BC 800A1F1C A60D0000 */ sh $t5, ($s0) -.L800A1F20: -/* B190C0 800A1F20 024E7821 */ addu $t7, $s2, $t6 -/* B190C4 800A1F24 85F80000 */ lh $t8, ($t7) -/* B190C8 800A1F28 A6180000 */ sh $t8, ($s0) -.L800A1F2C: -/* B190CC 800A1F2C 96220002 */ lhu $v0, 2($s1) -/* B190D0 800A1F30 0055082A */ slt $at, $v0, $s5 -/* B190D4 800A1F34 14200006 */ bnez $at, .L800A1F50 -/* B190D8 800A1F38 00027840 */ sll $t7, $v0, 1 -/* B190DC 800A1F3C 0002C840 */ sll $t9, $v0, 1 -/* B190E0 800A1F40 02796821 */ addu $t5, $s3, $t9 -/* B190E4 800A1F44 85AE0000 */ lh $t6, ($t5) -/* B190E8 800A1F48 10000004 */ b .L800A1F5C -/* B190EC 800A1F4C A60E0002 */ sh $t6, 2($s0) -.L800A1F50: -/* B190F0 800A1F50 024FC021 */ addu $t8, $s2, $t7 -/* B190F4 800A1F54 87190000 */ lh $t9, ($t8) -/* B190F8 800A1F58 A6190002 */ sh $t9, 2($s0) -.L800A1F5C: -/* B190FC 800A1F5C 96220004 */ lhu $v0, 4($s1) -/* B19100 800A1F60 26310006 */ addiu $s1, $s1, 6 -/* B19104 800A1F64 0055082A */ slt $at, $v0, $s5 -/* B19108 800A1F68 14200006 */ bnez $at, .L800A1F84 -/* B1910C 800A1F6C 0002C040 */ sll $t8, $v0, 1 -/* B19110 800A1F70 00026840 */ sll $t5, $v0, 1 -/* B19114 800A1F74 026D7021 */ addu $t6, $s3, $t5 -/* B19118 800A1F78 85CF0000 */ lh $t7, ($t6) -/* B1911C 800A1F7C 10000004 */ b .L800A1F90 -/* B19120 800A1F80 A60F0004 */ sh $t7, 4($s0) -.L800A1F84: -/* B19124 800A1F84 0258C821 */ addu $t9, $s2, $t8 -/* B19128 800A1F88 872D0000 */ lh $t5, ($t9) -/* B1912C 800A1F8C A60D0004 */ sh $t5, 4($s0) -.L800A1F90: -/* B19130 800A1F90 1696FFB4 */ bne $s4, $s6, .L800A1E64 -/* B19134 800A1F94 26100006 */ addiu $s0, $s0, 6 -.L800A1F98: -/* B19138 800A1F98 8FBF003C */ lw $ra, 0x3c($sp) -/* B1913C 800A1F9C 8FB00018 */ lw $s0, 0x18($sp) -/* B19140 800A1FA0 8FB1001C */ lw $s1, 0x1c($sp) -/* B19144 800A1FA4 8FB20020 */ lw $s2, 0x20($sp) -/* B19148 800A1FA8 8FB30024 */ lw $s3, 0x24($sp) -/* B1914C 800A1FAC 8FB40028 */ lw $s4, 0x28($sp) -/* B19150 800A1FB0 8FB5002C */ lw $s5, 0x2c($sp) -/* B19154 800A1FB4 8FB60030 */ lw $s6, 0x30($sp) -/* B19158 800A1FB8 8FB70034 */ lw $s7, 0x34($sp) -/* B1915C 800A1FBC 8FBE0038 */ lw $fp, 0x38($sp) -/* B19160 800A1FC0 03E00008 */ jr $ra -/* B19164 800A1FC4 27BD0040 */ addiu $sp, $sp, 0x40 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A1FC8.s b/asm/non_matchings/code/z_skelanime/func_800A1FC8.s deleted file mode 100644 index 0eea34027e..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A1FC8.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800A1FC8 -/* B19168 800A1FC8 00047100 */ sll $t6, $a0, 4 -/* B1916C 800A1FCC 000E7F02 */ srl $t7, $t6, 0x1c -/* B19170 800A1FD0 000FC080 */ sll $t8, $t7, 2 -/* B19174 800A1FD4 3C198016 */ lui $t9, %hi(gSegments) -/* B19178 800A1FD8 0338C821 */ addu $t9, $t9, $t8 -/* B1917C 800A1FDC 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B19180 800A1FE0 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B19184 800A1FE4 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B19188 800A1FE8 00814024 */ and $t0, $a0, $at -/* B1918C 800A1FEC 3C018000 */ lui $at, 0x8000 -/* B19190 800A1FF0 03281821 */ addu $v1, $t9, $t0 -/* B19194 800A1FF4 00611821 */ addu $v1, $v1, $at -/* B19198 800A1FF8 03E00008 */ jr $ra -/* B1919C 800A1FFC 84620000 */ lh $v0, ($v1) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A2044.s b/asm/non_matchings/code/z_skelanime/func_800A2044.s deleted file mode 100644 index 7d668a86ab..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A2044.s +++ /dev/null @@ -1,158 +0,0 @@ -.rdata -glabel D_801402C4 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A2044 -/* B191E4 800A2044 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B191E8 800A2048 AFBF002C */ sw $ra, 0x2c($sp) -/* B191EC 800A204C AFB00028 */ sw $s0, 0x28($sp) -/* B191F0 800A2050 AFA40058 */ sw $a0, 0x58($sp) -/* B191F4 800A2054 AFA5005C */ sw $a1, 0x5c($sp) -/* B191F8 800A2058 AFA60060 */ sw $a2, 0x60($sp) -/* B191FC 800A205C 0C034213 */ jal Matrix_Push -/* B19200 800A2060 AFA70064 */ sw $a3, 0x64($sp) -/* B19204 800A2064 8FAF005C */ lw $t7, 0x5c($sp) -/* B19208 800A2068 8FAE0060 */ lw $t6, 0x60($sp) -/* B1920C 800A206C 3C0C8016 */ lui $t4, %hi(gSegments) -/* B19210 800A2070 000FC080 */ sll $t8, $t7, 2 -/* B19214 800A2074 01D8C821 */ addu $t9, $t6, $t8 -/* B19218 800A2078 8F220000 */ lw $v0, ($t9) -/* B1921C 800A207C 25ED0001 */ addiu $t5, $t7, 1 -/* B19220 800A2080 8FB80064 */ lw $t8, 0x64($sp) -/* B19224 800A2084 000DC880 */ sll $t9, $t5, 2 -/* B19228 800A2088 00024900 */ sll $t1, $v0, 4 -/* B1922C 800A208C 00095702 */ srl $t2, $t1, 0x1c -/* B19230 800A2090 032DC823 */ subu $t9, $t9, $t5 -/* B19234 800A2094 000A5880 */ sll $t3, $t2, 2 -/* B19238 800A2098 0019C840 */ sll $t9, $t9, 1 -/* B1923C 800A209C 018B6021 */ addu $t4, $t4, $t3 -/* B19240 800A20A0 AFAD005C */ sw $t5, 0x5c($sp) -/* B19244 800A20A4 03194821 */ addu $t1, $t8, $t9 -/* B19248 800A20A8 892B0000 */ lwl $t3, ($t1) -/* B1924C 800A20AC 992B0003 */ lwr $t3, 3($t1) -/* B19250 800A20B0 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* B19254 800A20B4 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B19258 800A20B8 27AE003C */ addiu $t6, $sp, 0x3c -/* B1925C 800A20BC 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B19260 800A20C0 ADCB0000 */ sw $t3, ($t6) -/* B19264 800A20C4 952B0004 */ lhu $t3, 4($t1) -/* B19268 800A20C8 00414024 */ and $t0, $v0, $at -/* B1926C 800A20CC 3C018000 */ lui $at, 0x8000 -/* B19270 800A20D0 010C8021 */ addu $s0, $t0, $t4 -/* B19274 800A20D4 02018021 */ addu $s0, $s0, $at -/* B19278 800A20D8 A5CB0004 */ sh $t3, 4($t6) -/* B1927C 800A20DC 86080000 */ lh $t0, ($s0) -/* B19280 800A20E0 8FB80068 */ lw $t8, 0x68($sp) -/* B19284 800A20E4 8FA5005C */ lw $a1, 0x5c($sp) -/* B19288 800A20E8 44882000 */ mtc1 $t0, $f4 -/* B1928C 800A20EC 8FA40058 */ lw $a0, 0x58($sp) -/* B19290 800A20F0 27A90074 */ addiu $t1, $sp, 0x74 -/* B19294 800A20F4 468021A0 */ cvt.s.w $f6, $f4 -/* B19298 800A20F8 27B9003C */ addiu $t9, $sp, 0x3c -/* B1929C 800A20FC 27A60050 */ addiu $a2, $sp, 0x50 -/* B192A0 800A2100 27A70044 */ addiu $a3, $sp, 0x44 -/* B192A4 800A2104 E7A60044 */ swc1 $f6, 0x44($sp) -/* B192A8 800A2108 860C0002 */ lh $t4, 2($s0) -/* B192AC 800A210C 448C4000 */ mtc1 $t4, $f8 -/* B192B0 800A2110 00000000 */ nop -/* B192B4 800A2114 468042A0 */ cvt.s.w $f10, $f8 -/* B192B8 800A2118 E7AA0048 */ swc1 $f10, 0x48($sp) -/* B192BC 800A211C 860F0004 */ lh $t7, 4($s0) -/* B192C0 800A2120 448F8000 */ mtc1 $t7, $f16 -/* B192C4 800A2124 00000000 */ nop -/* B192C8 800A2128 468084A0 */ cvt.s.w $f18, $f16 -/* B192CC 800A212C E7B2004C */ swc1 $f18, 0x4c($sp) -/* B192D0 800A2130 8E0D0008 */ lw $t5, 8($s0) -/* B192D4 800A2134 13000007 */ beqz $t8, .L800A2154 -/* B192D8 800A2138 AFAD0050 */ sw $t5, 0x50($sp) -/* B192DC 800A213C 8FAE0070 */ lw $t6, 0x70($sp) -/* B192E0 800A2140 AFB90010 */ sw $t9, 0x10($sp) -/* B192E4 800A2144 AFA90018 */ sw $t1, 0x18($sp) -/* B192E8 800A2148 0300F809 */ jalr $t8 -/* B192EC 800A214C AFAE0014 */ sw $t6, 0x14($sp) -/* B192F0 800A2150 1440001B */ bnez $v0, .L800A21C0 -.L800A2154: -/* B192F4 800A2154 27A40044 */ addiu $a0, $sp, 0x44 -/* B192F8 800A2158 0C0344D0 */ jal Matrix_TranslateThenRotateZYX -/* B192FC 800A215C 27A5003C */ addiu $a1, $sp, 0x3c -/* B19300 800A2160 8FAA0050 */ lw $t2, 0x50($sp) -/* B19304 800A2164 8FAB0074 */ lw $t3, 0x74($sp) -/* B19308 800A2168 3C0CDA38 */ lui $t4, (0xDA380003 >> 16) # lui $t4, 0xda38 -/* B1930C 800A216C 11400014 */ beqz $t2, .L800A21C0 -/* B19310 800A2170 25680008 */ addiu $t0, $t3, 8 -/* B19314 800A2174 AFA80074 */ sw $t0, 0x74($sp) -/* B19318 800A2178 358C0003 */ ori $t4, (0xDA380003 & 0xFFFF) # ori $t4, $t4, 3 -/* B1931C 800A217C AD6C0000 */ sw $t4, ($t3) -/* B19320 800A2180 8FAF0058 */ lw $t7, 0x58($sp) -/* B19324 800A2184 3C058014 */ lui $a1, %hi(D_801402C4) # $a1, 0x8014 -/* B19328 800A2188 24A502C4 */ addiu $a1, %lo(D_801402C4) # addiu $a1, $a1, 0x2c4 -/* B1932C 800A218C 8DE40000 */ lw $a0, ($t7) -/* B19330 800A2190 AFAB0038 */ sw $t3, 0x38($sp) -/* B19334 800A2194 0C0346A2 */ jal Matrix_NewMtx -/* B19338 800A2198 240605D1 */ li $a2, 1489 -/* B1933C 800A219C 8FA30038 */ lw $v1, 0x38($sp) -/* B19340 800A21A0 3C0EDE00 */ lui $t6, 0xde00 -/* B19344 800A21A4 AC620004 */ sw $v0, 4($v1) -/* B19348 800A21A8 8FAD0074 */ lw $t5, 0x74($sp) -/* B1934C 800A21AC 25B90008 */ addiu $t9, $t5, 8 -/* B19350 800A21B0 AFB90074 */ sw $t9, 0x74($sp) -/* B19354 800A21B4 ADAE0000 */ sw $t6, ($t5) -/* B19358 800A21B8 8FA90050 */ lw $t1, 0x50($sp) -/* B1935C 800A21BC ADA90004 */ sw $t1, 4($t5) -.L800A21C0: -/* B19360 800A21C0 8FB8006C */ lw $t8, 0x6c($sp) -/* B19364 800A21C4 8FA40058 */ lw $a0, 0x58($sp) -/* B19368 800A21C8 8FA5005C */ lw $a1, 0x5c($sp) -/* B1936C 800A21CC 13000007 */ beqz $t8, .L800A21EC -/* B19370 800A21D0 27A60050 */ addiu $a2, $sp, 0x50 -/* B19374 800A21D4 8FAA0070 */ lw $t2, 0x70($sp) -/* B19378 800A21D8 27AB0074 */ addiu $t3, $sp, 0x74 -/* B1937C 800A21DC AFAB0014 */ sw $t3, 0x14($sp) -/* B19380 800A21E0 27A7003C */ addiu $a3, $sp, 0x3c -/* B19384 800A21E4 0300F809 */ jalr $t8 -/* B19388 800A21E8 AFAA0010 */ sw $t2, 0x10($sp) -.L800A21EC: -/* B1938C 800A21EC 92050006 */ lbu $a1, 6($s0) -/* B19390 800A21F0 240100FF */ li $at, 255 -/* B19394 800A21F4 8FA40058 */ lw $a0, 0x58($sp) -/* B19398 800A21F8 10A1000C */ beq $a1, $at, .L800A222C -/* B1939C 800A21FC 8FA60060 */ lw $a2, 0x60($sp) -/* B193A0 800A2200 8FA80068 */ lw $t0, 0x68($sp) -/* B193A4 800A2204 8FAC006C */ lw $t4, 0x6c($sp) -/* B193A8 800A2208 8FAF0070 */ lw $t7, 0x70($sp) -/* B193AC 800A220C 8FAD0074 */ lw $t5, 0x74($sp) -/* B193B0 800A2210 8FA70064 */ lw $a3, 0x64($sp) -/* B193B4 800A2214 AFA80010 */ sw $t0, 0x10($sp) -/* B193B8 800A2218 AFAC0014 */ sw $t4, 0x14($sp) -/* B193BC 800A221C AFAF0018 */ sw $t7, 0x18($sp) -/* B193C0 800A2220 0C028811 */ jal func_800A2044 -/* B193C4 800A2224 AFAD001C */ sw $t5, 0x1c($sp) -/* B193C8 800A2228 AFA20074 */ sw $v0, 0x74($sp) -.L800A222C: -/* B193CC 800A222C 0C034221 */ jal Matrix_Pull -/* B193D0 800A2230 00000000 */ nop -/* B193D4 800A2234 92050007 */ lbu $a1, 7($s0) -/* B193D8 800A2238 240100FF */ li $at, 255 -/* B193DC 800A223C 8FA40058 */ lw $a0, 0x58($sp) -/* B193E0 800A2240 10A1000C */ beq $a1, $at, .L800A2274 -/* B193E4 800A2244 8FA60060 */ lw $a2, 0x60($sp) -/* B193E8 800A2248 8FB90068 */ lw $t9, 0x68($sp) -/* B193EC 800A224C 8FAE006C */ lw $t6, 0x6c($sp) -/* B193F0 800A2250 8FA90070 */ lw $t1, 0x70($sp) -/* B193F4 800A2254 8FAA0074 */ lw $t2, 0x74($sp) -/* B193F8 800A2258 8FA70064 */ lw $a3, 0x64($sp) -/* B193FC 800A225C AFB90010 */ sw $t9, 0x10($sp) -/* B19400 800A2260 AFAE0014 */ sw $t6, 0x14($sp) -/* B19404 800A2264 AFA90018 */ sw $t1, 0x18($sp) -/* B19408 800A2268 0C028811 */ jal func_800A2044 -/* B1940C 800A226C AFAA001C */ sw $t2, 0x1c($sp) -/* B19410 800A2270 AFA20074 */ sw $v0, 0x74($sp) -.L800A2274: -/* B19414 800A2274 8FBF002C */ lw $ra, 0x2c($sp) -/* B19418 800A2278 8FA20074 */ lw $v0, 0x74($sp) -/* B1941C 800A227C 8FB00028 */ lw $s0, 0x28($sp) -/* B19420 800A2280 03E00008 */ jr $ra -/* B19424 800A2284 27BD0058 */ addiu $sp, $sp, 0x58 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A24A0.s b/asm/non_matchings/code/z_skelanime/func_800A24A0.s deleted file mode 100644 index 34d0fe5524..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A24A0.s +++ /dev/null @@ -1,185 +0,0 @@ -.rdata -glabel D_80140328 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014033C - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A24A0 -/* B19640 800A24A0 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B19644 800A24A4 AFBF0034 */ sw $ra, 0x34($sp) -/* B19648 800A24A8 AFB00030 */ sw $s0, 0x30($sp) -/* B1964C 800A24AC AFA40068 */ sw $a0, 0x68($sp) -/* B19650 800A24B0 AFA5006C */ sw $a1, 0x6c($sp) -/* B19654 800A24B4 AFA60070 */ sw $a2, 0x70($sp) -/* B19658 800A24B8 0C034213 */ jal Matrix_Push -/* B1965C 800A24BC AFA70074 */ sw $a3, 0x74($sp) -/* B19660 800A24C0 8FAF006C */ lw $t7, 0x6c($sp) -/* B19664 800A24C4 8FAE0070 */ lw $t6, 0x70($sp) -/* B19668 800A24C8 3C0C8016 */ lui $t4, %hi(gSegments) -/* B1966C 800A24CC 000FC080 */ sll $t8, $t7, 2 -/* B19670 800A24D0 01D8C821 */ addu $t9, $t6, $t8 -/* B19674 800A24D4 8F220000 */ lw $v0, ($t9) -/* B19678 800A24D8 25ED0001 */ addiu $t5, $t7, 1 -/* B1967C 800A24DC 8FB80074 */ lw $t8, 0x74($sp) -/* B19680 800A24E0 000DC880 */ sll $t9, $t5, 2 -/* B19684 800A24E4 00024900 */ sll $t1, $v0, 4 -/* B19688 800A24E8 00095702 */ srl $t2, $t1, 0x1c -/* B1968C 800A24EC 032DC823 */ subu $t9, $t9, $t5 -/* B19690 800A24F0 000A5880 */ sll $t3, $t2, 2 -/* B19694 800A24F4 0019C840 */ sll $t9, $t9, 1 -/* B19698 800A24F8 018B6021 */ addu $t4, $t4, $t3 -/* B1969C 800A24FC AFAD006C */ sw $t5, 0x6c($sp) -/* B196A0 800A2500 03194821 */ addu $t1, $t8, $t9 -/* B196A4 800A2504 892B0000 */ lwl $t3, ($t1) -/* B196A8 800A2508 992B0003 */ lwr $t3, 3($t1) -/* B196AC 800A250C 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* B196B0 800A2510 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B196B4 800A2514 27AE0048 */ addiu $t6, $sp, 0x48 -/* B196B8 800A2518 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B196BC 800A251C ADCB0000 */ sw $t3, ($t6) -/* B196C0 800A2520 952B0004 */ lhu $t3, 4($t1) -/* B196C4 800A2524 00414024 */ and $t0, $v0, $at -/* B196C8 800A2528 3C018000 */ lui $at, 0x8000 -/* B196CC 800A252C 010C8021 */ addu $s0, $t0, $t4 -/* B196D0 800A2530 02018021 */ addu $s0, $s0, $at -/* B196D4 800A2534 A5CB0004 */ sh $t3, 4($t6) -/* B196D8 800A2538 86080000 */ lh $t0, ($s0) -/* B196DC 800A253C 8FB90078 */ lw $t9, 0x78($sp) -/* B196E0 800A2540 8FA5006C */ lw $a1, 0x6c($sp) -/* B196E4 800A2544 44882000 */ mtc1 $t0, $f4 -/* B196E8 800A2548 8FA40068 */ lw $a0, 0x68($sp) -/* B196EC 800A254C 27AE0048 */ addiu $t6, $sp, 0x48 -/* B196F0 800A2550 468021A0 */ cvt.s.w $f6, $f4 -/* B196F4 800A2554 27AA0088 */ addiu $t2, $sp, 0x88 -/* B196F8 800A2558 27A60060 */ addiu $a2, $sp, 0x60 -/* B196FC 800A255C 27A70050 */ addiu $a3, $sp, 0x50 -/* B19700 800A2560 E7A60050 */ swc1 $f6, 0x50($sp) -/* B19704 800A2564 860C0002 */ lh $t4, 2($s0) -/* B19708 800A2568 448C4000 */ mtc1 $t4, $f8 -/* B1970C 800A256C 00000000 */ nop -/* B19710 800A2570 468042A0 */ cvt.s.w $f10, $f8 -/* B19714 800A2574 E7AA0054 */ swc1 $f10, 0x54($sp) -/* B19718 800A2578 860F0004 */ lh $t7, 4($s0) -/* B1971C 800A257C 448F8000 */ mtc1 $t7, $f16 -/* B19720 800A2580 00000000 */ nop -/* B19724 800A2584 468084A0 */ cvt.s.w $f18, $f16 -/* B19728 800A2588 E7B20058 */ swc1 $f18, 0x58($sp) -/* B1972C 800A258C 8E0D0008 */ lw $t5, 8($s0) -/* B19730 800A2590 AFAD005C */ sw $t5, 0x5c($sp) -/* B19734 800A2594 13200007 */ beqz $t9, .L800A25B4 -/* B19738 800A2598 AFAD0060 */ sw $t5, 0x60($sp) -/* B1973C 800A259C 8FA90080 */ lw $t1, 0x80($sp) -/* B19740 800A25A0 AFAE0010 */ sw $t6, 0x10($sp) -/* B19744 800A25A4 AFAA0018 */ sw $t2, 0x18($sp) -/* B19748 800A25A8 0320F809 */ jalr $t9 -/* B1974C 800A25AC AFA90014 */ sw $t1, 0x14($sp) -/* B19750 800A25B0 1440002C */ bnez $v0, .L800A2664 -.L800A25B4: -/* B19754 800A25B4 27A40050 */ addiu $a0, $sp, 0x50 -/* B19758 800A25B8 0C0344D0 */ jal Matrix_TranslateThenRotateZYX -/* B1975C 800A25BC 27A50048 */ addiu $a1, $sp, 0x48 -/* B19760 800A25C0 8FAB0060 */ lw $t3, 0x60($sp) -/* B19764 800A25C4 8FA80084 */ lw $t0, 0x84($sp) -/* B19768 800A25C8 3C058014 */ lui $a1, %hi(D_80140328) # $a1, 0x8014 -/* B1976C 800A25CC 1160001A */ beqz $t3, .L800A2638 -/* B19770 800A25D0 8FAD005C */ lw $t5, 0x5c($sp) -/* B19774 800A25D4 8D040000 */ lw $a0, ($t0) -/* B19778 800A25D8 24A50328 */ addiu $a1, %lo(D_80140328) # addiu $a1, $a1, 0x328 -/* B1977C 800A25DC 0C034695 */ jal Matrix_ToMtx -/* B19780 800A25E0 24060657 */ li $a2, 1623 -/* B19784 800A25E4 8FAC0088 */ lw $t4, 0x88($sp) -/* B19788 800A25E8 3C0DDA38 */ lui $t5, (0xDA380003 >> 16) # lui $t5, 0xda38 -/* B1978C 800A25EC 35AD0003 */ ori $t5, (0xDA380003 & 0xFFFF) # ori $t5, $t5, 3 -/* B19790 800A25F0 258F0008 */ addiu $t7, $t4, 8 -/* B19794 800A25F4 AFAF0088 */ sw $t7, 0x88($sp) -/* B19798 800A25F8 AD8D0000 */ sw $t5, ($t4) -/* B1979C 800A25FC 8FB80084 */ lw $t8, 0x84($sp) -/* B197A0 800A2600 3C19DE00 */ lui $t9, 0xde00 -/* B197A4 800A2604 8F0E0000 */ lw $t6, ($t8) -/* B197A8 800A2608 AD8E0004 */ sw $t6, 4($t4) -/* B197AC 800A260C 8FA90088 */ lw $t1, 0x88($sp) -/* B197B0 800A2610 252A0008 */ addiu $t2, $t1, 8 -/* B197B4 800A2614 AFAA0088 */ sw $t2, 0x88($sp) -/* B197B8 800A2618 AD390000 */ sw $t9, ($t1) -/* B197BC 800A261C 8FAB0060 */ lw $t3, 0x60($sp) -/* B197C0 800A2620 AD2B0004 */ sw $t3, 4($t1) -/* B197C4 800A2624 8FA80084 */ lw $t0, 0x84($sp) -/* B197C8 800A2628 8D0C0000 */ lw $t4, ($t0) -/* B197CC 800A262C 258F0040 */ addiu $t7, $t4, 0x40 -/* B197D0 800A2630 1000000C */ b .L800A2664 -/* B197D4 800A2634 AD0F0000 */ sw $t7, ($t0) -.L800A2638: -/* B197D8 800A2638 11A0000A */ beqz $t5, .L800A2664 -/* B197DC 800A263C 8FB80084 */ lw $t8, 0x84($sp) -/* B197E0 800A2640 3C058014 */ lui $a1, %hi(D_8014033C) # $a1, 0x8014 -/* B197E4 800A2644 24A5033C */ addiu $a1, %lo(D_8014033C) # addiu $a1, $a1, 0x33c -/* B197E8 800A2648 8F040000 */ lw $a0, ($t8) -/* B197EC 800A264C 0C034695 */ jal Matrix_ToMtx -/* B197F0 800A2650 2406065E */ li $a2, 1630 -/* B197F4 800A2654 8FAE0084 */ lw $t6, 0x84($sp) -/* B197F8 800A2658 8DC90000 */ lw $t1, ($t6) -/* B197FC 800A265C 252A0040 */ addiu $t2, $t1, 0x40 -/* B19800 800A2660 ADCA0000 */ sw $t2, ($t6) -.L800A2664: -/* B19804 800A2664 8FB9007C */ lw $t9, 0x7c($sp) -/* B19808 800A2668 8FA40068 */ lw $a0, 0x68($sp) -/* B1980C 800A266C 8FA5006C */ lw $a1, 0x6c($sp) -/* B19810 800A2670 13200007 */ beqz $t9, .L800A2690 -/* B19814 800A2674 27A6005C */ addiu $a2, $sp, 0x5c -/* B19818 800A2678 8FAB0080 */ lw $t3, 0x80($sp) -/* B1981C 800A267C 27AC0088 */ addiu $t4, $sp, 0x88 -/* B19820 800A2680 AFAC0014 */ sw $t4, 0x14($sp) -/* B19824 800A2684 27A70048 */ addiu $a3, $sp, 0x48 -/* B19828 800A2688 0320F809 */ jalr $t9 -/* B1982C 800A268C AFAB0010 */ sw $t3, 0x10($sp) -.L800A2690: -/* B19830 800A2690 92050006 */ lbu $a1, 6($s0) -/* B19834 800A2694 240100FF */ li $at, 255 -/* B19838 800A2698 8FA40068 */ lw $a0, 0x68($sp) -/* B1983C 800A269C 10A1000E */ beq $a1, $at, .L800A26D8 -/* B19840 800A26A0 8FA60070 */ lw $a2, 0x70($sp) -/* B19844 800A26A4 8FAF0078 */ lw $t7, 0x78($sp) -/* B19848 800A26A8 8FA8007C */ lw $t0, 0x7c($sp) -/* B1984C 800A26AC 8FAD0080 */ lw $t5, 0x80($sp) -/* B19850 800A26B0 8FB80084 */ lw $t8, 0x84($sp) -/* B19854 800A26B4 8FA90088 */ lw $t1, 0x88($sp) -/* B19858 800A26B8 8FA70074 */ lw $a3, 0x74($sp) -/* B1985C 800A26BC AFAF0010 */ sw $t7, 0x10($sp) -/* B19860 800A26C0 AFA80014 */ sw $t0, 0x14($sp) -/* B19864 800A26C4 AFAD0018 */ sw $t5, 0x18($sp) -/* B19868 800A26C8 AFB8001C */ sw $t8, 0x1c($sp) -/* B1986C 800A26CC 0C028928 */ jal func_800A24A0 -/* B19870 800A26D0 AFA90020 */ sw $t1, 0x20($sp) -/* B19874 800A26D4 AFA20088 */ sw $v0, 0x88($sp) -.L800A26D8: -/* B19878 800A26D8 0C034221 */ jal Matrix_Pull -/* B1987C 800A26DC 00000000 */ nop -/* B19880 800A26E0 92050007 */ lbu $a1, 7($s0) -/* B19884 800A26E4 240100FF */ li $at, 255 -/* B19888 800A26E8 8FA40068 */ lw $a0, 0x68($sp) -/* B1988C 800A26EC 10A1000E */ beq $a1, $at, .L800A2728 -/* B19890 800A26F0 8FA60070 */ lw $a2, 0x70($sp) -/* B19894 800A26F4 8FAA0078 */ lw $t2, 0x78($sp) -/* B19898 800A26F8 8FAE007C */ lw $t6, 0x7c($sp) -/* B1989C 800A26FC 8FAB0080 */ lw $t3, 0x80($sp) -/* B198A0 800A2700 8FAC0084 */ lw $t4, 0x84($sp) -/* B198A4 800A2704 8FB90088 */ lw $t9, 0x88($sp) -/* B198A8 800A2708 8FA70074 */ lw $a3, 0x74($sp) -/* B198AC 800A270C AFAA0010 */ sw $t2, 0x10($sp) -/* B198B0 800A2710 AFAE0014 */ sw $t6, 0x14($sp) -/* B198B4 800A2714 AFAB0018 */ sw $t3, 0x18($sp) -/* B198B8 800A2718 AFAC001C */ sw $t4, 0x1c($sp) -/* B198BC 800A271C 0C028928 */ jal func_800A24A0 -/* B198C0 800A2720 AFB90020 */ sw $t9, 0x20($sp) -/* B198C4 800A2724 AFA20088 */ sw $v0, 0x88($sp) -.L800A2728: -/* B198C8 800A2728 8FBF0034 */ lw $ra, 0x34($sp) -/* B198CC 800A272C 8FA20088 */ lw $v0, 0x88($sp) -/* B198D0 800A2730 8FB00030 */ lw $s0, 0x30($sp) -/* B198D4 800A2734 03E00008 */ jr $ra -/* B198D8 800A2738 27BD0068 */ addiu $sp, $sp, 0x68 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A273C.s b/asm/non_matchings/code/z_skelanime/func_800A273C.s deleted file mode 100644 index 6bcbf0cb50..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A273C.s +++ /dev/null @@ -1,192 +0,0 @@ -.rdata -glabel D_80140350 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80140358 - .asciz "Si2_draw2_SV():skelがNULLです。NULLを返します。\n" - # EUC-JP: がNULLです。| Is null. Returns null. - .balign 4 - -glabel D_8014038C - .asciz "\x1b[m" - .balign 4 - -glabel D_80140390 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801403A4 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A273C -/* B198DC 800A273C 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B198E0 800A2740 AFBF002C */ sw $ra, 0x2c($sp) -/* B198E4 800A2744 AFA40068 */ sw $a0, 0x68($sp) -/* B198E8 800A2748 AFA5006C */ sw $a1, 0x6c($sp) -/* B198EC 800A274C AFA60070 */ sw $a2, 0x70($sp) -/* B198F0 800A2750 8C840000 */ lw $a0, ($a0) -/* B198F4 800A2754 0C031A73 */ jal Graph_Alloc -/* B198F8 800A2758 00072980 */ sll $a1, $a3, 6 -/* B198FC 800A275C 8FAF006C */ lw $t7, 0x6c($sp) -/* B19900 800A2760 8FB80084 */ lw $t8, 0x84($sp) -/* B19904 800A2764 AFA20040 */ sw $v0, 0x40($sp) -/* B19908 800A2768 15E0000C */ bnez $t7, .L800A279C -/* B1990C 800A276C 27190008 */ addiu $t9, $t8, 8 -/* B19910 800A2770 3C048014 */ lui $a0, %hi(D_80140350) # $a0, 0x8014 -/* B19914 800A2774 0C00084C */ jal osSyncPrintf -/* B19918 800A2778 24840350 */ addiu $a0, %lo(D_80140350) # addiu $a0, $a0, 0x350 -/* B1991C 800A277C 3C048014 */ lui $a0, %hi(D_80140358) # $a0, 0x8014 -/* B19920 800A2780 0C00084C */ jal osSyncPrintf -/* B19924 800A2784 24840358 */ addiu $a0, %lo(D_80140358) # addiu $a0, $a0, 0x358 -/* B19928 800A2788 3C048014 */ lui $a0, %hi(D_8014038C) # $a0, 0x8014 -/* B1992C 800A278C 0C00084C */ jal osSyncPrintf -/* B19930 800A2790 2484038C */ addiu $a0, %lo(D_8014038C) # addiu $a0, $a0, 0x38c -/* B19934 800A2794 10000085 */ b .L800A29AC -/* B19938 800A2798 00001025 */ move $v0, $zero -.L800A279C: -/* B1993C 800A279C 3C08DB06 */ lui $t0, (0xDB060034 >> 16) # lui $t0, 0xdb06 -/* B19940 800A27A0 35080034 */ ori $t0, (0xDB060034 & 0xFFFF) # ori $t0, $t0, 0x34 -/* B19944 800A27A4 AFB90084 */ sw $t9, 0x84($sp) -/* B19948 800A27A8 AF080000 */ sw $t0, ($t8) -/* B1994C 800A27AC 8FA90040 */ lw $t1, 0x40($sp) -/* B19950 800A27B0 0C034213 */ jal Matrix_Push -/* B19954 800A27B4 AF090004 */ sw $t1, 4($t8) -/* B19958 800A27B8 8FAA006C */ lw $t2, 0x6c($sp) -/* B1995C 800A27BC 3C0F8016 */ lui $t7, %hi(gSegments) -/* B19960 800A27C0 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B19964 800A27C4 8D420000 */ lw $v0, ($t2) -/* B19968 800A27C8 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B1996C 800A27CC 8FA30070 */ lw $v1, 0x70($sp) -/* B19970 800A27D0 00026100 */ sll $t4, $v0, 4 -/* B19974 800A27D4 000C6F02 */ srl $t5, $t4, 0x1c -/* B19978 800A27D8 000D7080 */ sll $t6, $t5, 2 -/* B1997C 800A27DC 01EE7821 */ addu $t7, $t7, $t6 -/* B19980 800A27E0 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) -/* B19984 800A27E4 00415824 */ and $t3, $v0, $at -/* B19988 800A27E8 3C018000 */ lui $at, 0x8000 -/* B1998C 800A27EC 016FC021 */ addu $t8, $t3, $t7 -/* B19990 800A27F0 0301C821 */ addu $t9, $t8, $at -/* B19994 800A27F4 AFB90064 */ sw $t9, 0x64($sp) -/* B19998 800A27F8 84680000 */ lh $t0, ($v1) -/* B1999C 800A27FC 27AC0044 */ addiu $t4, $sp, 0x44 -/* B199A0 800A2800 27B90044 */ addiu $t9, $sp, 0x44 -/* B199A4 800A2804 44882000 */ mtc1 $t0, $f4 -/* B199A8 800A2808 24050001 */ li $a1, 1 -/* B199AC 800A280C 27A6005C */ addiu $a2, $sp, 0x5c -/* B199B0 800A2810 468021A0 */ cvt.s.w $f6, $f4 -/* B199B4 800A2814 27A7004C */ addiu $a3, $sp, 0x4c -/* B199B8 800A2818 E7A6004C */ swc1 $f6, 0x4c($sp) -/* B199BC 800A281C 84690002 */ lh $t1, 2($v1) -/* B199C0 800A2820 44894000 */ mtc1 $t1, $f8 -/* B199C4 800A2824 27A90084 */ addiu $t1, $sp, 0x84 -/* B199C8 800A2828 468042A0 */ cvt.s.w $f10, $f8 -/* B199CC 800A282C E7AA0050 */ swc1 $f10, 0x50($sp) -/* B199D0 800A2830 846A0004 */ lh $t2, 4($v1) -/* B199D4 800A2834 448A8000 */ mtc1 $t2, $f16 -/* B199D8 800A2838 00000000 */ nop -/* B199DC 800A283C 468084A0 */ cvt.s.w $f18, $f16 -/* B199E0 800A2840 E7B20054 */ swc1 $f18, 0x54($sp) -/* B199E4 800A2844 886E0006 */ lwl $t6, 6($v1) -/* B199E8 800A2848 986E0009 */ lwr $t6, 9($v1) -/* B199EC 800A284C AD8E0000 */ sw $t6, ($t4) -/* B199F0 800A2850 946E000A */ lhu $t6, 0xa($v1) -/* B199F4 800A2854 A58E0004 */ sh $t6, 4($t4) -/* B199F8 800A2858 8FAB0064 */ lw $t3, 0x64($sp) -/* B199FC 800A285C 8FB80078 */ lw $t8, 0x78($sp) -/* B19A00 800A2860 8FA40068 */ lw $a0, 0x68($sp) -/* B19A04 800A2864 8D6F0008 */ lw $t7, 8($t3) -/* B19A08 800A2868 AFAF0058 */ sw $t7, 0x58($sp) -/* B19A0C 800A286C 13000007 */ beqz $t8, .L800A288C -/* B19A10 800A2870 AFAF005C */ sw $t7, 0x5c($sp) -/* B19A14 800A2874 8FA80080 */ lw $t0, 0x80($sp) -/* B19A18 800A2878 AFB90010 */ sw $t9, 0x10($sp) -/* B19A1C 800A287C AFA90018 */ sw $t1, 0x18($sp) -/* B19A20 800A2880 0300F809 */ jalr $t8 -/* B19A24 800A2884 AFA80014 */ sw $t0, 0x14($sp) -/* B19A28 800A2888 14400027 */ bnez $v0, .L800A2928 -.L800A288C: -/* B19A2C 800A288C 27A4004C */ addiu $a0, $sp, 0x4c -/* B19A30 800A2890 0C0344D0 */ jal Matrix_TranslateThenRotateZYX -/* B19A34 800A2894 27A50044 */ addiu $a1, $sp, 0x44 -/* B19A38 800A2898 8FAA005C */ lw $t2, 0x5c($sp) -/* B19A3C 800A289C 8FA40040 */ lw $a0, 0x40($sp) -/* B19A40 800A28A0 3C058014 */ lui $a1, %hi(D_80140390) # $a1, 0x8014 -/* B19A44 800A28A4 11400017 */ beqz $t2, .L800A2904 -/* B19A48 800A28A8 8FAC0058 */ lw $t4, 0x58($sp) -/* B19A4C 800A28AC 24A50390 */ addiu $a1, %lo(D_80140390) # addiu $a1, $a1, 0x390 -/* B19A50 800A28B0 0C034695 */ jal Matrix_ToMtx -/* B19A54 800A28B4 240606AE */ li $a2, 1710 -/* B19A58 800A28B8 8FAC0084 */ lw $t4, 0x84($sp) -/* B19A5C 800A28BC 3C0EDA38 */ lui $t6, (0xDA380003 >> 16) # lui $t6, 0xda38 -/* B19A60 800A28C0 35CE0003 */ ori $t6, (0xDA380003 & 0xFFFF) # ori $t6, $t6, 3 -/* B19A64 800A28C4 258D0008 */ addiu $t5, $t4, 8 -/* B19A68 800A28C8 AFAD0084 */ sw $t5, 0x84($sp) -/* B19A6C 800A28CC AD8E0000 */ sw $t6, ($t4) -/* B19A70 800A28D0 8FAB0040 */ lw $t3, 0x40($sp) -/* B19A74 800A28D4 3C08DE00 */ lui $t0, 0xde00 -/* B19A78 800A28D8 AD8B0004 */ sw $t3, 4($t4) -/* B19A7C 800A28DC 8FAF0084 */ lw $t7, 0x84($sp) -/* B19A80 800A28E0 25F90008 */ addiu $t9, $t7, 8 -/* B19A84 800A28E4 AFB90084 */ sw $t9, 0x84($sp) -/* B19A88 800A28E8 ADE80000 */ sw $t0, ($t7) -/* B19A8C 800A28EC 8FA9005C */ lw $t1, 0x5c($sp) -/* B19A90 800A28F0 ADE90004 */ sw $t1, 4($t7) -/* B19A94 800A28F4 8FB80040 */ lw $t8, 0x40($sp) -/* B19A98 800A28F8 270A0040 */ addiu $t2, $t8, 0x40 -/* B19A9C 800A28FC 1000000A */ b .L800A2928 -/* B19AA0 800A2900 AFAA0040 */ sw $t2, 0x40($sp) -.L800A2904: -/* B19AA4 800A2904 11800008 */ beqz $t4, .L800A2928 -/* B19AA8 800A2908 8FA40040 */ lw $a0, 0x40($sp) -/* B19AAC 800A290C 3C058014 */ lui $a1, %hi(D_801403A4) # $a1, 0x8014 -/* B19AB0 800A2910 24A503A4 */ addiu $a1, %lo(D_801403A4) # addiu $a1, $a1, 0x3a4 -/* B19AB4 800A2914 0C034695 */ jal Matrix_ToMtx -/* B19AB8 800A2918 240606B5 */ li $a2, 1717 -/* B19ABC 800A291C 8FAD0040 */ lw $t5, 0x40($sp) -/* B19AC0 800A2920 25AE0040 */ addiu $t6, $t5, 0x40 -/* B19AC4 800A2924 AFAE0040 */ sw $t6, 0x40($sp) -.L800A2928: -/* B19AC8 800A2928 8FA2007C */ lw $v0, 0x7c($sp) -/* B19ACC 800A292C 8FA40068 */ lw $a0, 0x68($sp) -/* B19AD0 800A2930 24050001 */ li $a1, 1 -/* B19AD4 800A2934 10400008 */ beqz $v0, .L800A2958 -/* B19AD8 800A2938 27A60058 */ addiu $a2, $sp, 0x58 -/* B19ADC 800A293C 8FAB0080 */ lw $t3, 0x80($sp) -/* B19AE0 800A2940 27AF0084 */ addiu $t7, $sp, 0x84 -/* B19AE4 800A2944 AFAF0014 */ sw $t7, 0x14($sp) -/* B19AE8 800A2948 27A70044 */ addiu $a3, $sp, 0x44 -/* B19AEC 800A294C 0040F809 */ jalr $v0 -/* B19AF0 800A2950 AFAB0010 */ sw $t3, 0x10($sp) -/* B19AF4 800A2954 8FA2007C */ lw $v0, 0x7c($sp) -.L800A2958: -/* B19AF8 800A2958 8FB90064 */ lw $t9, 0x64($sp) -/* B19AFC 800A295C 240100FF */ li $at, 255 -/* B19B00 800A2960 8FA40068 */ lw $a0, 0x68($sp) -/* B19B04 800A2964 93250006 */ lbu $a1, 6($t9) -/* B19B08 800A2968 8FA6006C */ lw $a2, 0x6c($sp) -/* B19B0C 800A296C 8FA70070 */ lw $a3, 0x70($sp) -/* B19B10 800A2970 10A1000B */ beq $a1, $at, .L800A29A0 -/* B19B14 800A2974 8FA80078 */ lw $t0, 0x78($sp) -/* B19B18 800A2978 8FA90080 */ lw $t1, 0x80($sp) -/* B19B1C 800A297C 8FAA0084 */ lw $t2, 0x84($sp) -/* B19B20 800A2980 27B80040 */ addiu $t8, $sp, 0x40 -/* B19B24 800A2984 AFB8001C */ sw $t8, 0x1c($sp) -/* B19B28 800A2988 AFA80010 */ sw $t0, 0x10($sp) -/* B19B2C 800A298C AFA20014 */ sw $v0, 0x14($sp) -/* B19B30 800A2990 AFA90018 */ sw $t1, 0x18($sp) -/* B19B34 800A2994 0C028928 */ jal func_800A24A0 -/* B19B38 800A2998 AFAA0020 */ sw $t2, 0x20($sp) -/* B19B3C 800A299C AFA20084 */ sw $v0, 0x84($sp) -.L800A29A0: -/* B19B40 800A29A0 0C034221 */ jal Matrix_Pull -/* B19B44 800A29A4 00000000 */ nop -/* B19B48 800A29A8 8FA20084 */ lw $v0, 0x84($sp) -.L800A29AC: -/* B19B4C 800A29AC 8FBF002C */ lw $ra, 0x2c($sp) -/* B19B50 800A29B0 27BD0068 */ addiu $sp, $sp, 0x68 -/* B19B54 800A29B4 03E00008 */ jr $ra -/* B19B58 800A29B8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A2DBC.s b/asm/non_matchings/code/z_skelanime/func_800A2DBC.s deleted file mode 100644 index 8945726cca..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A2DBC.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800A2DBC -/* B19F5C 800A2DBC 00047100 */ sll $t6, $a0, 4 -/* B19F60 800A2DC0 000E7F02 */ srl $t7, $t6, 0x1c -/* B19F64 800A2DC4 000FC080 */ sll $t8, $t7, 2 -/* B19F68 800A2DC8 3C198016 */ lui $t9, %hi(gSegments) -/* B19F6C 800A2DCC 0338C821 */ addu $t9, $t9, $t8 -/* B19F70 800A2DD0 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B19F74 800A2DD4 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B19F78 800A2DD8 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B19F7C 800A2DDC 00814024 */ and $t0, $a0, $at -/* B19F80 800A2DE0 3C018000 */ lui $at, 0x8000 -/* B19F84 800A2DE4 03281821 */ addu $v1, $t9, $t0 -/* B19F88 800A2DE8 00611821 */ addu $v1, $v1, $at -/* B19F8C 800A2DEC 03E00008 */ jr $ra -/* B19F90 800A2DF0 84620002 */ lh $v0, 2($v1) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A2DF4.s b/asm/non_matchings/code/z_skelanime/func_800A2DF4.s deleted file mode 100644 index d83fd92139..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A2DF4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800A2DF4 -/* B19F94 800A2DF4 00047100 */ sll $t6, $a0, 4 -/* B19F98 800A2DF8 000E7F02 */ srl $t7, $t6, 0x1c -/* B19F9C 800A2DFC 000FC080 */ sll $t8, $t7, 2 -/* B19FA0 800A2E00 3C198016 */ lui $t9, %hi(gSegments) -/* B19FA4 800A2E04 0338C821 */ addu $t9, $t9, $t8 -/* B19FA8 800A2E08 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B19FAC 800A2E0C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B19FB0 800A2E10 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B19FB4 800A2E14 00814024 */ and $t0, $a0, $at -/* B19FB8 800A2E18 3C018000 */ lui $at, 0x8000 -/* B19FBC 800A2E1C 03281821 */ addu $v1, $t9, $t0 -/* B19FC0 800A2E20 00611821 */ addu $v1, $v1, $at -/* B19FC4 800A2E24 03E00008 */ jr $ra -/* B19FC8 800A2E28 84620000 */ lh $v0, ($v1) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A2E2C.s b/asm/non_matchings/code/z_skelanime/func_800A2E2C.s deleted file mode 100644 index 1a71415232..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A2E2C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800A2E2C -/* B19FCC 800A2E2C 00047100 */ sll $t6, $a0, 4 -/* B19FD0 800A2E30 000E7F02 */ srl $t7, $t6, 0x1c -/* B19FD4 800A2E34 000FC080 */ sll $t8, $t7, 2 -/* B19FD8 800A2E38 3C198016 */ lui $t9, %hi(gSegments) -/* B19FDC 800A2E3C 0338C821 */ addu $t9, $t9, $t8 -/* B19FE0 800A2E40 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B19FE4 800A2E44 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B19FE8 800A2E48 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B19FEC 800A2E4C 00814024 */ and $t0, $a0, $at -/* B19FF0 800A2E50 3C018000 */ lui $at, 0x8000 -/* B19FF4 800A2E54 03281821 */ addu $v1, $t9, $t0 -/* B19FF8 800A2E58 00611821 */ addu $v1, $v1, $at -/* B19FFC 800A2E5C 84620000 */ lh $v0, ($v1) -/* B1A000 800A2E60 2442FFFF */ addiu $v0, $v0, -1 -/* B1A004 800A2E64 00021400 */ sll $v0, $v0, 0x10 -/* B1A008 800A2E68 03E00008 */ jr $ra -/* B1A00C 800A2E6C 00021403 */ sra $v0, $v0, 0x10 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A32EC.s b/asm/non_matchings/code/z_skelanime/func_800A32EC.s deleted file mode 100644 index a95d26106e..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A32EC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800A32EC -/* B1A48C 800A32EC 03E00008 */ jr $ra -/* B1A490 800A32F0 A4800000 */ sh $zero, ($a0) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A32F4.s b/asm/non_matchings/code/z_skelanime/func_800A32F4.s deleted file mode 100644 index 6f18607ae1..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A32F4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_800A32F4 -/* B1A494 800A32F4 3C028016 */ lui $v0, %hi(D_801600B0) # $v0, 0x8016 -/* B1A498 800A32F8 244200B0 */ addiu $v0, %lo(D_801600B0) # addiu $v0, $v0, 0xb0 -/* B1A49C 800A32FC 8C4E0000 */ lw $t6, ($v0) -/* B1A4A0 800A3300 AFA40000 */ sw $a0, ($sp) -/* B1A4A4 800A3304 000E7840 */ sll $t7, $t6, 1 -/* B1A4A8 800A3308 03E00008 */ jr $ra -/* B1A4AC 800A330C AC4F0000 */ sw $t7, ($v0) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3310.s b/asm/non_matchings/code/z_skelanime/func_800A3310.s deleted file mode 100644 index 79bb0776d1..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3310.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800A3310 -/* B1A4B0 800A3310 3C028013 */ lui $v0, %hi(D_8012A480) # $v0, 0x8013 -/* B1A4B4 800A3314 2442A480 */ addiu $v0, %lo(D_8012A480) # addiu $v0, $v0, -0x5b80 -/* B1A4B8 800A3318 3C0F8016 */ lui $t7, %hi(D_801600B0) # $t7, 0x8016 -/* B1A4BC 800A331C 8DEF00B0 */ lw $t7, %lo(D_801600B0)($t7) -/* B1A4C0 800A3320 8C4E0000 */ lw $t6, ($v0) -/* B1A4C4 800A3324 AFA40000 */ sw $a0, ($sp) -/* B1A4C8 800A3328 01CFC025 */ or $t8, $t6, $t7 -/* B1A4CC 800A332C 03E00008 */ jr $ra -/* B1A4D0 800A3330 AC580000 */ sw $t8, ($v0) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3334.s b/asm/non_matchings/code/z_skelanime/func_800A3334.s deleted file mode 100644 index bc04aca981..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3334.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_800A3334 -/* B1A4D4 800A3334 84830000 */ lh $v1, ($a0) -/* B1A4D8 800A3338 00A03025 */ move $a2, $a1 -/* B1A4DC 800A333C 28610032 */ slti $at, $v1, 0x32 -/* B1A4E0 800A3340 14200003 */ bnez $at, .L800A3350 -/* B1A4E4 800A3344 246E0001 */ addiu $t6, $v1, 1 -/* B1A4E8 800A3348 03E00008 */ jr $ra -/* B1A4EC 800A334C 00001025 */ move $v0, $zero - -.L800A3350: -/* B1A4F0 800A3350 00037980 */ sll $t7, $v1, 6 -/* B1A4F4 800A3354 008F2821 */ addu $a1, $a0, $t7 -/* B1A4F8 800A3358 A48E0000 */ sh $t6, ($a0) -/* B1A4FC 800A335C A0A60004 */ sb $a2, 4($a1) -/* B1A500 800A3360 24A20004 */ addiu $v0, $a1, 4 -/* B1A504 800A3364 03E00008 */ jr $ra -/* B1A508 800A3368 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A336C.s b/asm/non_matchings/code/z_skelanime/func_800A336C.s deleted file mode 100644 index 0d19fff586..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A336C.s +++ /dev/null @@ -1,76 +0,0 @@ -.rdata -glabel D_801403B8 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A336C -/* B1A50C 800A336C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B1A510 800A3370 3C010001 */ lui $at, (0x00010B20 >> 16) # lui $at, 1 -/* B1A514 800A3374 AFBF002C */ sw $ra, 0x2c($sp) -/* B1A518 800A3378 AFA40040 */ sw $a0, 0x40($sp) -/* B1A51C 800A337C AFA50044 */ sw $a1, 0x44($sp) -/* B1A520 800A3380 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 -/* B1A524 800A3384 AFA60048 */ sw $a2, 0x48($sp) -/* B1A528 800A3388 AFA7004C */ sw $a3, 0x4c($sp) -/* B1A52C 800A338C 00812021 */ addu $a0, $a0, $at -/* B1A530 800A3390 0C028CCD */ jal func_800A3334 -/* B1A534 800A3394 00002825 */ move $a1, $zero -/* B1A538 800A3398 10400033 */ beqz $v0, .L800A3468 -/* B1A53C 800A339C 8FA70044 */ lw $a3, 0x44($sp) -/* B1A540 800A33A0 00077100 */ sll $t6, $a3, 4 -/* B1A544 800A33A4 000E7F02 */ srl $t7, $t6, 0x1c -/* B1A548 800A33A8 000FC080 */ sll $t8, $t7, 2 -/* B1A54C 800A33AC 3C198016 */ lui $t9, %hi(gSegments) -/* B1A550 800A33B0 0338C821 */ addu $t9, $t9, $t8 -/* B1A554 800A33B4 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B1A558 800A33B8 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B1A55C 800A33BC 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B1A560 800A33C0 00E14024 */ and $t0, $a3, $at -/* B1A564 800A33C4 3C018000 */ lui $at, 0x8000 -/* B1A568 800A33C8 03284821 */ addu $t1, $t9, $t0 -/* B1A56C 800A33CC 01215021 */ addu $t2, $t1, $at -/* B1A570 800A33D0 24440024 */ addiu $a0, $v0, 0x24 -/* B1A574 800A33D4 AFAA0038 */ sw $t2, 0x38($sp) -/* B1A578 800A33D8 AFA40030 */ sw $a0, 0x30($sp) -/* B1A57C 800A33DC 2445003C */ addiu $a1, $v0, 0x3c -/* B1A580 800A33E0 24060001 */ li $a2, 1 -/* B1A584 800A33E4 0C001874 */ jal osCreateMesgQueue -/* B1A588 800A33E8 AFA2003C */ sw $v0, 0x3c($sp) -/* B1A58C 800A33EC 8FA7004C */ lw $a3, 0x4c($sp) -/* B1A590 800A33F0 8FB90048 */ lw $t9, 0x48($sp) -/* B1A594 800A33F4 8FAB0038 */ lw $t3, 0x38($sp) -/* B1A598 800A33F8 00E00821 */ addu $at, $a3, $zero -/* B1A59C 800A33FC 00073880 */ sll $a3, $a3, 2 -/* B1A5A0 800A3400 00E13823 */ subu $a3, $a3, $at -/* B1A5A4 800A3404 00073840 */ sll $a3, $a3, 1 -/* B1A5A8 800A3408 24E70002 */ addiu $a3, $a3, 2 -/* B1A5AC 800A340C 00F90019 */ multu $a3, $t9 -/* B1A5B0 800A3410 8D6C0004 */ lw $t4, 4($t3) -/* B1A5B4 800A3414 3C0D004E */ lui $t5, %hi(_link_animetionSegmentRomStart) # $t5, 0x4e -/* B1A5B8 800A3418 25AD5C00 */ addiu $t5, %lo(_link_animetionSegmentRomStart) # addiu $t5, $t5, 0x5c00 -/* B1A5BC 800A341C 3C0F0700 */ lui $t7, 0x700 -/* B1A5C0 800A3420 8FA3003C */ lw $v1, 0x3c($sp) -/* B1A5C4 800A3424 8FA90030 */ lw $t1, 0x30($sp) -/* B1A5C8 800A3428 25EF0000 */ addiu $t7, $t7, 0 -/* B1A5CC 800A342C 3C0A8014 */ lui $t2, %hi(D_801403B8) # $t2, 0x8014 -/* B1A5D0 800A3430 018D7021 */ addu $t6, $t4, $t5 -/* B1A5D4 800A3434 01CFC023 */ subu $t8, $t6, $t7 -/* B1A5D8 800A3438 254A03B8 */ addiu $t2, %lo(D_801403B8) # addiu $t2, $t2, 0x3b8 -/* B1A5DC 800A343C 240B07D4 */ li $t3, 2004 -/* B1A5E0 800A3440 00004012 */ mflo $t0 -/* B1A5E4 800A3444 03083021 */ addu $a2, $t8, $t0 -/* B1A5E8 800A3448 AFAB0020 */ sw $t3, 0x20($sp) -/* B1A5EC 800A344C AFAA001C */ sw $t2, 0x1c($sp) -/* B1A5F0 800A3450 AFA00018 */ sw $zero, 0x18($sp) -/* B1A5F4 800A3454 AFA00010 */ sw $zero, 0x10($sp) -/* B1A5F8 800A3458 8FA50050 */ lw $a1, 0x50($sp) -/* B1A5FC 800A345C 24640004 */ addiu $a0, $v1, 4 -/* B1A600 800A3460 0C000697 */ jal DmaMgr_SendRequest2 -/* B1A604 800A3464 AFA90014 */ sw $t1, 0x14($sp) -.L800A3468: -/* B1A608 800A3468 8FBF002C */ lw $ra, 0x2c($sp) -/* B1A60C 800A346C 27BD0040 */ addiu $sp, $sp, 0x40 -/* B1A610 800A3470 03E00008 */ jr $ra -/* B1A614 800A3474 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3478.s b/asm/non_matchings/code/z_skelanime/func_800A3478.s deleted file mode 100644 index eedd4bc19a..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3478.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_800A3478 -/* B1A618 800A3478 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1A61C 800A347C 3C010001 */ lui $at, (0x00010B20 >> 16) # lui $at, 1 -/* B1A620 800A3480 AFBF0014 */ sw $ra, 0x14($sp) -/* B1A624 800A3484 AFA40018 */ sw $a0, 0x18($sp) -/* B1A628 800A3488 AFA5001C */ sw $a1, 0x1c($sp) -/* B1A62C 800A348C 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 -/* B1A630 800A3490 AFA60020 */ sw $a2, 0x20($sp) -/* B1A634 800A3494 AFA70024 */ sw $a3, 0x24($sp) -/* B1A638 800A3498 00812021 */ addu $a0, $a0, $at -/* B1A63C 800A349C 0C028CCD */ jal func_800A3334 -/* B1A640 800A34A0 24050001 */ li $a1, 1 -/* B1A644 800A34A4 10400009 */ beqz $v0, .L800A34CC -/* B1A648 800A34A8 3C0E8016 */ lui $t6, %hi(D_801600B0) # $t6, 0x8016 -/* B1A64C 800A34AC 8DCE00B0 */ lw $t6, %lo(D_801600B0)($t6) -/* B1A650 800A34B0 A04E0004 */ sb $t6, 4($v0) -/* B1A654 800A34B4 8FAF001C */ lw $t7, 0x1c($sp) -/* B1A658 800A34B8 A04F0005 */ sb $t7, 5($v0) -/* B1A65C 800A34BC 8FB80020 */ lw $t8, 0x20($sp) -/* B1A660 800A34C0 AC580008 */ sw $t8, 8($v0) -/* B1A664 800A34C4 8FB90024 */ lw $t9, 0x24($sp) -/* B1A668 800A34C8 AC59000C */ sw $t9, 0xc($v0) -.L800A34CC: -/* B1A66C 800A34CC 8FBF0014 */ lw $ra, 0x14($sp) -/* B1A670 800A34D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1A674 800A34D4 03E00008 */ jr $ra -/* B1A678 800A34D8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A34DC.s b/asm/non_matchings/code/z_skelanime/func_800A34DC.s deleted file mode 100644 index 2256c0c15b..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A34DC.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800A34DC -/* B1A67C 800A34DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1A680 800A34E0 3C010001 */ lui $at, (0x00010B20 >> 16) # lui $at, 1 -/* B1A684 800A34E4 AFBF0014 */ sw $ra, 0x14($sp) -/* B1A688 800A34E8 AFA40018 */ sw $a0, 0x18($sp) -/* B1A68C 800A34EC AFA5001C */ sw $a1, 0x1c($sp) -/* B1A690 800A34F0 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 -/* B1A694 800A34F4 AFA60020 */ sw $a2, 0x20($sp) -/* B1A698 800A34F8 AFA70024 */ sw $a3, 0x24($sp) -/* B1A69C 800A34FC 00812021 */ addu $a0, $a0, $at -/* B1A6A0 800A3500 0C028CCD */ jal func_800A3334 -/* B1A6A4 800A3504 24050002 */ li $a1, 2 -/* B1A6A8 800A3508 1040000B */ beqz $v0, .L800A3538 -/* B1A6AC 800A350C 3C0E8016 */ lui $t6, %hi(D_801600B0) # $t6, 0x8016 -/* B1A6B0 800A3510 8DCE00B0 */ lw $t6, %lo(D_801600B0)($t6) -/* B1A6B4 800A3514 A04E0004 */ sb $t6, 4($v0) -/* B1A6B8 800A3518 8FAF001C */ lw $t7, 0x1c($sp) -/* B1A6BC 800A351C A04F0005 */ sb $t7, 5($v0) -/* B1A6C0 800A3520 8FB80020 */ lw $t8, 0x20($sp) -/* B1A6C4 800A3524 AC580008 */ sw $t8, 8($v0) -/* B1A6C8 800A3528 8FB90024 */ lw $t9, 0x24($sp) -/* B1A6CC 800A352C AC59000C */ sw $t9, 0xc($v0) -/* B1A6D0 800A3530 C7A40028 */ lwc1 $f4, 0x28($sp) -/* B1A6D4 800A3534 E4440010 */ swc1 $f4, 0x10($v0) -.L800A3538: -/* B1A6D8 800A3538 8FBF0014 */ lw $ra, 0x14($sp) -/* B1A6DC 800A353C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1A6E0 800A3540 03E00008 */ jr $ra -/* B1A6E4 800A3544 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3548.s b/asm/non_matchings/code/z_skelanime/func_800A3548.s deleted file mode 100644 index aa9944c65d..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3548.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800A3548 -/* B1A6E8 800A3548 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1A6EC 800A354C 3C010001 */ lui $at, (0x00010B20 >> 16) # lui $at, 1 -/* B1A6F0 800A3550 AFBF0014 */ sw $ra, 0x14($sp) -/* B1A6F4 800A3554 AFA40018 */ sw $a0, 0x18($sp) -/* B1A6F8 800A3558 AFA5001C */ sw $a1, 0x1c($sp) -/* B1A6FC 800A355C 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 -/* B1A700 800A3560 AFA60020 */ sw $a2, 0x20($sp) -/* B1A704 800A3564 AFA70024 */ sw $a3, 0x24($sp) -/* B1A708 800A3568 00812021 */ addu $a0, $a0, $at -/* B1A70C 800A356C 0C028CCD */ jal func_800A3334 -/* B1A710 800A3570 24050003 */ li $a1, 3 -/* B1A714 800A3574 1040000B */ beqz $v0, .L800A35A4 -/* B1A718 800A3578 3C0E8016 */ lui $t6, %hi(D_801600B0) # $t6, 0x8016 -/* B1A71C 800A357C 8DCE00B0 */ lw $t6, %lo(D_801600B0)($t6) -/* B1A720 800A3580 A04E0004 */ sb $t6, 4($v0) -/* B1A724 800A3584 8FAF001C */ lw $t7, 0x1c($sp) -/* B1A728 800A3588 A04F0005 */ sb $t7, 5($v0) -/* B1A72C 800A358C 8FB80020 */ lw $t8, 0x20($sp) -/* B1A730 800A3590 AC580008 */ sw $t8, 8($v0) -/* B1A734 800A3594 8FB90024 */ lw $t9, 0x24($sp) -/* B1A738 800A3598 AC59000C */ sw $t9, 0xc($v0) -/* B1A73C 800A359C 8FA80028 */ lw $t0, 0x28($sp) -/* B1A740 800A35A0 AC480010 */ sw $t0, 0x10($v0) -.L800A35A4: -/* B1A744 800A35A4 8FBF0014 */ lw $ra, 0x14($sp) -/* B1A748 800A35A8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1A74C 800A35AC 03E00008 */ jr $ra -/* B1A750 800A35B0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A35B4.s b/asm/non_matchings/code/z_skelanime/func_800A35B4.s deleted file mode 100644 index 3bee273f83..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A35B4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800A35B4 -/* B1A754 800A35B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1A758 800A35B8 3C010001 */ lui $at, (0x00010B20 >> 16) # lui $at, 1 -/* B1A75C 800A35BC AFBF0014 */ sw $ra, 0x14($sp) -/* B1A760 800A35C0 AFA40018 */ sw $a0, 0x18($sp) -/* B1A764 800A35C4 AFA5001C */ sw $a1, 0x1c($sp) -/* B1A768 800A35C8 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 -/* B1A76C 800A35CC AFA60020 */ sw $a2, 0x20($sp) -/* B1A770 800A35D0 AFA70024 */ sw $a3, 0x24($sp) -/* B1A774 800A35D4 00812021 */ addu $a0, $a0, $at -/* B1A778 800A35D8 0C028CCD */ jal func_800A3334 -/* B1A77C 800A35DC 24050004 */ li $a1, 4 -/* B1A780 800A35E0 1040000B */ beqz $v0, .L800A3610 -/* B1A784 800A35E4 3C0E8016 */ lui $t6, %hi(D_801600B0) # $t6, 0x8016 -/* B1A788 800A35E8 8DCE00B0 */ lw $t6, %lo(D_801600B0)($t6) -/* B1A78C 800A35EC A04E0004 */ sb $t6, 4($v0) -/* B1A790 800A35F0 8FAF001C */ lw $t7, 0x1c($sp) -/* B1A794 800A35F4 A04F0005 */ sb $t7, 5($v0) -/* B1A798 800A35F8 8FB80020 */ lw $t8, 0x20($sp) -/* B1A79C 800A35FC AC580008 */ sw $t8, 8($v0) -/* B1A7A0 800A3600 8FB90024 */ lw $t9, 0x24($sp) -/* B1A7A4 800A3604 AC59000C */ sw $t9, 0xc($v0) -/* B1A7A8 800A3608 8FA80028 */ lw $t0, 0x28($sp) -/* B1A7AC 800A360C AC480010 */ sw $t0, 0x10($v0) -.L800A3610: -/* B1A7B0 800A3610 8FBF0014 */ lw $ra, 0x14($sp) -/* B1A7B4 800A3614 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1A7B8 800A3618 03E00008 */ jr $ra -/* B1A7BC 800A361C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3620.s b/asm/non_matchings/code/z_skelanime/func_800A3620.s deleted file mode 100644 index d61d4383bc..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3620.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_800A3620 -/* B1A7C0 800A3620 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1A7C4 800A3624 3C010001 */ lui $at, (0x00010B20 >> 16) # lui $at, 1 -/* B1A7C8 800A3628 AFBF0014 */ sw $ra, 0x14($sp) -/* B1A7CC 800A362C AFA40018 */ sw $a0, 0x18($sp) -/* B1A7D0 800A3630 AFA5001C */ sw $a1, 0x1c($sp) -/* B1A7D4 800A3634 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 -/* B1A7D8 800A3638 AFA60020 */ sw $a2, 0x20($sp) -/* B1A7DC 800A363C AFA70024 */ sw $a3, 0x24($sp) -/* B1A7E0 800A3640 00812021 */ addu $a0, $a0, $at -/* B1A7E4 800A3644 0C028CCD */ jal func_800A3334 -/* B1A7E8 800A3648 24050005 */ li $a1, 5 -/* B1A7EC 800A364C 10400006 */ beqz $v0, .L800A3668 -/* B1A7F0 800A3650 8FAE001C */ lw $t6, 0x1c($sp) -/* B1A7F4 800A3654 AC4E0004 */ sw $t6, 4($v0) -/* B1A7F8 800A3658 8FAF0020 */ lw $t7, 0x20($sp) -/* B1A7FC 800A365C AC4F0008 */ sw $t7, 8($v0) -/* B1A800 800A3660 C7A40024 */ lwc1 $f4, 0x24($sp) -/* B1A804 800A3664 E444000C */ swc1 $f4, 0xc($v0) -.L800A3668: -/* B1A808 800A3668 8FBF0014 */ lw $ra, 0x14($sp) -/* B1A80C 800A366C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1A810 800A3670 03E00008 */ jr $ra -/* B1A814 800A3674 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3678.s b/asm/non_matchings/code/z_skelanime/func_800A3678.s deleted file mode 100644 index facc92f4f1..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3678.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800A3678 -/* B1A818 800A3678 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1A81C 800A367C AFA40018 */ sw $a0, 0x18($sp) -/* B1A820 800A3680 AFBF0014 */ sw $ra, 0x14($sp) -/* B1A824 800A3684 24A40020 */ addiu $a0, $a1, 0x20 -/* B1A828 800A3688 00002825 */ move $a1, $zero -/* B1A82C 800A368C 0C000CA0 */ jal osRecvMesg -/* B1A830 800A3690 24060001 */ li $a2, 1 -/* B1A834 800A3694 8FBF0014 */ lw $ra, 0x14($sp) -/* B1A838 800A3698 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1A83C 800A369C 03E00008 */ jr $ra -/* B1A840 800A36A0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A36A4.s b/asm/non_matchings/code/z_skelanime/func_800A36A4.s deleted file mode 100644 index 3259d6f1e4..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A36A4.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800A36A4 -/* B1A844 800A36A4 AFA40000 */ sw $a0, ($sp) -/* B1A848 800A36A8 3C0F8013 */ lui $t7, %hi(D_8012A480) # $t7, 0x8013 -/* B1A84C 800A36AC 8DEFA480 */ lw $t7, %lo(D_8012A480)($t7) -/* B1A850 800A36B0 90AE0000 */ lbu $t6, ($a1) -/* B1A854 800A36B4 00A01025 */ move $v0, $a1 -/* B1A858 800A36B8 01CFC024 */ and $t8, $t6, $t7 -/* B1A85C 800A36BC 17000013 */ bnez $t8, .L800A370C -/* B1A860 800A36C0 00000000 */ nop -/* B1A864 800A36C4 90B90001 */ lbu $t9, 1($a1) -/* B1A868 800A36C8 8CA30004 */ lw $v1, 4($a1) -/* B1A86C 800A36CC 8CA40008 */ lw $a0, 8($a1) -/* B1A870 800A36D0 1B20000E */ blez $t9, .L800A370C -/* B1A874 800A36D4 00003025 */ move $a2, $zero -/* B1A878 800A36D8 88890000 */ lwl $t1, ($a0) -.L800A36DC: -/* B1A87C 800A36DC 98890003 */ lwr $t1, 3($a0) -/* B1A880 800A36E0 24C60001 */ addiu $a2, $a2, 1 -/* B1A884 800A36E4 24630006 */ addiu $v1, $v1, 6 -/* B1A888 800A36E8 A869FFFA */ swl $t1, -6($v1) -/* B1A88C 800A36EC B869FFFD */ swr $t1, -3($v1) -/* B1A890 800A36F0 94890004 */ lhu $t1, 4($a0) -/* B1A894 800A36F4 24840006 */ addiu $a0, $a0, 6 -/* B1A898 800A36F8 A469FFFE */ sh $t1, -2($v1) -/* B1A89C 800A36FC 904A0001 */ lbu $t2, 1($v0) -/* B1A8A0 800A3700 00CA082A */ slt $at, $a2, $t2 -/* B1A8A4 800A3704 5420FFF5 */ bnezl $at, .L800A36DC -/* B1A8A8 800A3708 88890000 */ lwl $t1, ($a0) -.L800A370C: -/* B1A8AC 800A370C 03E00008 */ jr $ra -/* B1A8B0 800A3710 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3714.s b/asm/non_matchings/code/z_skelanime/func_800A3714.s deleted file mode 100644 index e90d9c8c14..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3714.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800A3714 -/* B1A8B4 800A3714 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1A8B8 800A3718 AFBF0024 */ sw $ra, 0x24($sp) -/* B1A8BC 800A371C AFB00020 */ sw $s0, 0x20($sp) -/* B1A8C0 800A3720 AFA40028 */ sw $a0, 0x28($sp) -/* B1A8C4 800A3724 3C0F8013 */ lui $t7, %hi(D_8012A480) # $t7, 0x8013 -/* B1A8C8 800A3728 8DEFA480 */ lw $t7, %lo(D_8012A480)($t7) -/* B1A8CC 800A372C 90AE0000 */ lbu $t6, ($a1) -/* B1A8D0 800A3730 00A08025 */ move $s0, $a1 -/* B1A8D4 800A3734 01CFC024 */ and $t8, $t6, $t7 -/* B1A8D8 800A3738 57000009 */ bnezl $t8, .L800A3760 -/* B1A8DC 800A373C 8FBF0024 */ lw $ra, 0x24($sp) -/* B1A8E0 800A3740 90A40001 */ lbu $a0, 1($a1) -/* B1A8E4 800A3744 8CA50004 */ lw $a1, 4($a1) -/* B1A8E8 800A3748 C604000C */ lwc1 $f4, 0xc($s0) -/* B1A8EC 800A374C 8E070008 */ lw $a3, 8($s0) -/* B1A8F0 800A3750 00A03025 */ move $a2, $a1 -/* B1A8F4 800A3754 0C028B9C */ jal func_800A2E70 -/* B1A8F8 800A3758 E7A40010 */ swc1 $f4, 0x10($sp) -/* B1A8FC 800A375C 8FBF0024 */ lw $ra, 0x24($sp) -.L800A3760: -/* B1A900 800A3760 8FB00020 */ lw $s0, 0x20($sp) -/* B1A904 800A3764 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1A908 800A3768 03E00008 */ jr $ra -/* B1A90C 800A376C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3770.s b/asm/non_matchings/code/z_skelanime/func_800A3770.s deleted file mode 100644 index 910f30d3b8..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3770.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_800A3770 -/* B1A910 800A3770 AFA40000 */ sw $a0, ($sp) -/* B1A914 800A3774 3C0F8013 */ lui $t7, %hi(D_8012A480) # $t7, 0x8013 -/* B1A918 800A3778 8DEFA480 */ lw $t7, %lo(D_8012A480)($t7) -/* B1A91C 800A377C 90AE0000 */ lbu $t6, ($a1) -/* B1A920 800A3780 00A01025 */ move $v0, $a1 -/* B1A924 800A3784 00003825 */ move $a3, $zero -/* B1A928 800A3788 01CFC024 */ and $t8, $t6, $t7 -/* B1A92C 800A378C 17000016 */ bnez $t8, .L800A37E8 -/* B1A930 800A3790 00000000 */ nop -/* B1A934 800A3794 90B90001 */ lbu $t9, 1($a1) -/* B1A938 800A3798 8CA30004 */ lw $v1, 4($a1) -/* B1A93C 800A379C 8CA40008 */ lw $a0, 8($a1) -/* B1A940 800A37A0 1B200011 */ blez $t9, .L800A37E8 -/* B1A944 800A37A4 8CA6000C */ lw $a2, 0xc($a1) -.L800A37A8: -/* B1A948 800A37A8 90C50000 */ lbu $a1, ($a2) -/* B1A94C 800A37AC 24C60001 */ addiu $a2, $a2, 1 -/* B1A950 800A37B0 50A00008 */ beql $a1, $zero, .L800A37D4 -/* B1A954 800A37B4 904A0001 */ lbu $t2, 1($v0) -/* B1A958 800A37B8 88890000 */ lwl $t1, ($a0) -/* B1A95C 800A37BC 98890003 */ lwr $t1, 3($a0) -/* B1A960 800A37C0 A8690000 */ swl $t1, ($v1) -/* B1A964 800A37C4 B8690003 */ swr $t1, 3($v1) -/* B1A968 800A37C8 94890004 */ lhu $t1, 4($a0) -/* B1A96C 800A37CC A4690004 */ sh $t1, 4($v1) -/* B1A970 800A37D0 904A0001 */ lbu $t2, 1($v0) -.L800A37D4: -/* B1A974 800A37D4 24E70001 */ addiu $a3, $a3, 1 -/* B1A978 800A37D8 24630006 */ addiu $v1, $v1, 6 -/* B1A97C 800A37DC 00EA082A */ slt $at, $a3, $t2 -/* B1A980 800A37E0 1420FFF1 */ bnez $at, .L800A37A8 -/* B1A984 800A37E4 24840006 */ addiu $a0, $a0, 6 -.L800A37E8: -/* B1A988 800A37E8 03E00008 */ jr $ra -/* B1A98C 800A37EC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A37F0.s b/asm/non_matchings/code/z_skelanime/func_800A37F0.s deleted file mode 100644 index 30436995c1..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A37F0.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_800A37F0 -/* B1A990 800A37F0 AFA40000 */ sw $a0, ($sp) -/* B1A994 800A37F4 3C0F8013 */ lui $t7, %hi(D_8012A480) # $t7, 0x8013 -/* B1A998 800A37F8 8DEFA480 */ lw $t7, %lo(D_8012A480)($t7) -/* B1A99C 800A37FC 90AE0000 */ lbu $t6, ($a1) -/* B1A9A0 800A3800 00A01025 */ move $v0, $a1 -/* B1A9A4 800A3804 00003825 */ move $a3, $zero -/* B1A9A8 800A3808 01CFC024 */ and $t8, $t6, $t7 -/* B1A9AC 800A380C 17000017 */ bnez $t8, .L800A386C -/* B1A9B0 800A3810 00000000 */ nop -/* B1A9B4 800A3814 90B90001 */ lbu $t9, 1($a1) -/* B1A9B8 800A3818 8CA30004 */ lw $v1, 4($a1) -/* B1A9BC 800A381C 8CA40008 */ lw $a0, 8($a1) -/* B1A9C0 800A3820 1B200012 */ blez $t9, .L800A386C -/* B1A9C4 800A3824 8CA6000C */ lw $a2, 0xc($a1) -.L800A3828: -/* B1A9C8 800A3828 90C50000 */ lbu $a1, ($a2) -/* B1A9CC 800A382C 24C60001 */ addiu $a2, $a2, 1 -/* B1A9D0 800A3830 2CA50001 */ sltiu $a1, $a1, 1 -/* B1A9D4 800A3834 50A00008 */ beql $a1, $zero, .L800A3858 -/* B1A9D8 800A3838 904A0001 */ lbu $t2, 1($v0) -/* B1A9DC 800A383C 88890000 */ lwl $t1, ($a0) -/* B1A9E0 800A3840 98890003 */ lwr $t1, 3($a0) -/* B1A9E4 800A3844 A8690000 */ swl $t1, ($v1) -/* B1A9E8 800A3848 B8690003 */ swr $t1, 3($v1) -/* B1A9EC 800A384C 94890004 */ lhu $t1, 4($a0) -/* B1A9F0 800A3850 A4690004 */ sh $t1, 4($v1) -/* B1A9F4 800A3854 904A0001 */ lbu $t2, 1($v0) -.L800A3858: -/* B1A9F8 800A3858 24E70001 */ addiu $a3, $a3, 1 -/* B1A9FC 800A385C 24630006 */ addiu $v1, $v1, 6 -/* B1AA00 800A3860 00EA082A */ slt $at, $a3, $t2 -/* B1AA04 800A3864 1420FFF0 */ bnez $at, .L800A3828 -/* B1AA08 800A3868 24840006 */ addiu $a0, $a0, 6 -.L800A386C: -/* B1AA0C 800A386C 03E00008 */ jr $ra -/* B1AA10 800A3870 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3874.s b/asm/non_matchings/code/z_skelanime/func_800A3874.s deleted file mode 100644 index 4532135476..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3874.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_800A3874 -/* B1AA14 800A3874 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B1AA18 800A3878 AFBF0014 */ sw $ra, 0x14($sp) -/* B1AA1C 800A387C AFA40030 */ sw $a0, 0x30($sp) -/* B1AA20 800A3880 8CA20000 */ lw $v0, ($a1) -/* B1AA24 800A3884 8CA40004 */ lw $a0, 4($a1) -/* B1AA28 800A3888 00A03825 */ move $a3, $a1 -/* B1AA2C 800A388C 844600B6 */ lh $a2, 0xb6($v0) -/* B1AA30 800A3890 AFA70034 */ sw $a3, 0x34($sp) -/* B1AA34 800A3894 27A5001C */ addiu $a1, $sp, 0x1c -/* B1AA38 800A3898 0C02953F */ jal func_800A54FC -/* B1AA3C 800A389C AFA20028 */ sw $v0, 0x28($sp) -/* B1AA40 800A38A0 8FA20028 */ lw $v0, 0x28($sp) -/* B1AA44 800A38A4 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* B1AA48 800A38A8 8FA70034 */ lw $a3, 0x34($sp) -/* B1AA4C 800A38AC C4460050 */ lwc1 $f6, 0x50($v0) -/* B1AA50 800A38B0 C44A0024 */ lwc1 $f10, 0x24($v0) -/* B1AA54 800A38B4 46062202 */ mul.s $f8, $f4, $f6 -/* B1AA58 800A38B8 C4440054 */ lwc1 $f4, 0x54($v0) -/* B1AA5C 800A38BC 46085400 */ add.s $f16, $f10, $f8 -/* B1AA60 800A38C0 E4500024 */ swc1 $f16, 0x24($v0) -/* B1AA64 800A38C4 C7B20020 */ lwc1 $f18, 0x20($sp) -/* B1AA68 800A38C8 C4EA0008 */ lwc1 $f10, 8($a3) -/* B1AA6C 800A38CC C4500028 */ lwc1 $f16, 0x28($v0) -/* B1AA70 800A38D0 46049182 */ mul.s $f6, $f18, $f4 -/* B1AA74 800A38D4 00000000 */ nop -/* B1AA78 800A38D8 460A3202 */ mul.s $f8, $f6, $f10 -/* B1AA7C 800A38DC C4460058 */ lwc1 $f6, 0x58($v0) -/* B1AA80 800A38E0 46088480 */ add.s $f18, $f16, $f8 -/* B1AA84 800A38E4 C450002C */ lwc1 $f16, 0x2c($v0) -/* B1AA88 800A38E8 E4520028 */ swc1 $f18, 0x28($v0) -/* B1AA8C 800A38EC C7A40024 */ lwc1 $f4, 0x24($sp) -/* B1AA90 800A38F0 46062282 */ mul.s $f10, $f4, $f6 -/* B1AA94 800A38F4 460A8200 */ add.s $f8, $f16, $f10 -/* B1AA98 800A38F8 E448002C */ swc1 $f8, 0x2c($v0) -/* B1AA9C 800A38FC 8FBF0014 */ lw $ra, 0x14($sp) -/* B1AAA0 800A3900 27BD0030 */ addiu $sp, $sp, 0x30 -/* B1AAA4 800A3904 03E00008 */ jr $ra -/* B1AAA8 800A3908 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A390C.s b/asm/non_matchings/code/z_skelanime/func_800A390C.s deleted file mode 100644 index 2e01f280d6..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A390C.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_800A390C -/* B1AAAC 800A390C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1AAB0 800A3910 AFBF0024 */ sw $ra, 0x24($sp) -/* B1AAB4 800A3914 AFB30020 */ sw $s3, 0x20($sp) -/* B1AAB8 800A3918 AFB2001C */ sw $s2, 0x1c($sp) -/* B1AABC 800A391C AFB10018 */ sw $s1, 0x18($sp) -/* B1AAC0 800A3920 AFB00014 */ sw $s0, 0x14($sp) -/* B1AAC4 800A3924 84AE0000 */ lh $t6, ($a1) -/* B1AAC8 800A3928 00A08825 */ move $s1, $a1 -/* B1AACC 800A392C 00809025 */ move $s2, $a0 -/* B1AAD0 800A3930 11C00012 */ beqz $t6, .L800A397C -/* B1AAD4 800A3934 24B00004 */ addiu $s0, $a1, 4 -/* B1AAD8 800A3938 3C138013 */ lui $s3, %hi(D_8012A484) # $s3, 0x8013 -/* B1AADC 800A393C 2673A484 */ addiu $s3, %lo(D_8012A484) # addiu $s3, $s3, -0x5b7c -/* B1AAE0 800A3940 920F0000 */ lbu $t7, ($s0) -.L800A3944: -/* B1AAE4 800A3944 02402025 */ move $a0, $s2 -/* B1AAE8 800A3948 26050004 */ addiu $a1, $s0, 4 -/* B1AAEC 800A394C 000FC080 */ sll $t8, $t7, 2 -/* B1AAF0 800A3950 0278C821 */ addu $t9, $s3, $t8 -/* B1AAF4 800A3954 8F390000 */ lw $t9, ($t9) -/* B1AAF8 800A3958 0320F809 */ jalr $t9 -/* B1AAFC 800A395C 00000000 */ nop -/* B1AB00 800A3960 86280000 */ lh $t0, ($s1) -/* B1AB04 800A3964 26100040 */ addiu $s0, $s0, 0x40 -/* B1AB08 800A3968 2509FFFF */ addiu $t1, $t0, -1 -/* B1AB0C 800A396C A6290000 */ sh $t1, ($s1) -/* B1AB10 800A3970 862A0000 */ lh $t2, ($s1) -/* B1AB14 800A3974 5540FFF3 */ bnezl $t2, .L800A3944 -/* B1AB18 800A3978 920F0000 */ lbu $t7, ($s0) -.L800A397C: -/* B1AB1C 800A397C 8FBF0024 */ lw $ra, 0x24($sp) -/* B1AB20 800A3980 240B0001 */ li $t3, 1 -/* B1AB24 800A3984 3C018016 */ lui $at, %hi(D_801600B0) # $at, 0x8016 -/* B1AB28 800A3988 AC2B00B0 */ sw $t3, %lo(D_801600B0)($at) -/* B1AB2C 800A398C 3C018013 */ lui $at, %hi(D_8012A480) # $at, 0x8013 -/* B1AB30 800A3990 8FB00014 */ lw $s0, 0x14($sp) -/* B1AB34 800A3994 8FB10018 */ lw $s1, 0x18($sp) -/* B1AB38 800A3998 8FB2001C */ lw $s2, 0x1c($sp) -/* B1AB3C 800A399C 8FB30020 */ lw $s3, 0x20($sp) -/* B1AB40 800A39A0 AC20A480 */ sw $zero, %lo(D_8012A480)($at) -/* B1AB44 800A39A4 03E00008 */ jr $ra -/* B1AB48 800A39A8 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A39AC.s b/asm/non_matchings/code/z_skelanime/func_800A39AC.s deleted file mode 100644 index ca01e4b9a6..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A39AC.s +++ /dev/null @@ -1,163 +0,0 @@ -.rdata -glabel D_801403CC - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801403E0 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801403F4 - .asciz "joint_buff_num == joint_num" - .balign 4 - -glabel D_80140410 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140424 - .asciz "\x1b[31m" - .balign 4 - -glabel D_8014042C - .asciz "Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n" - # EUC-JP: メモリアロケーションエラー | Memory allocation error - .balign 4 - -glabel D_80140460 - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_800A39AC -/* B1AB4C 800A39AC 00067100 */ sll $t6, $a2, 4 -/* B1AB50 800A39B0 3C098016 */ lui $t1, %hi(gSegments) # $t1, 0x8016 -/* B1AB54 800A39B4 000E7F02 */ srl $t7, $t6, 0x1c -/* B1AB58 800A39B8 25296FA8 */ addiu $t1, %lo(gSegments) # addiu $t1, $t1, 0x6fa8 -/* B1AB5C 800A39BC 000FC080 */ sll $t8, $t7, 2 -/* B1AB60 800A39C0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B1AB64 800A39C4 0138C821 */ addu $t9, $t1, $t8 -/* B1AB68 800A39C8 8F2C0000 */ lw $t4, ($t9) -/* B1AB6C 800A39CC 3C0A00FF */ lui $t2, (0x00FFFFFF >> 16) # lui $t2, 0xff -/* B1AB70 800A39D0 354AFFFF */ ori $t2, (0x00FFFFFF & 0xFFFF) # ori $t2, $t2, 0xffff -/* B1AB74 800A39D4 00CA6824 */ and $t5, $a2, $t2 -/* B1AB78 800A39D8 8FAF0050 */ lw $t7, 0x50($sp) -/* B1AB7C 800A39DC 3C0B8000 */ lui $t3, 0x8000 -/* B1AB80 800A39E0 018D7021 */ addu $t6, $t4, $t5 -/* B1AB84 800A39E4 AFBF002C */ sw $ra, 0x2c($sp) -/* B1AB88 800A39E8 AFB00028 */ sw $s0, 0x28($sp) -/* B1AB8C 800A39EC AFA40040 */ sw $a0, 0x40($sp) -/* B1AB90 800A39F0 AFA7004C */ sw $a3, 0x4c($sp) -/* B1AB94 800A39F4 01CB4021 */ addu $t0, $t6, $t3 -/* B1AB98 800A39F8 91020004 */ lbu $v0, 4($t0) -/* B1AB9C 800A39FC A0AF0034 */ sb $t7, 0x34($a1) -/* B1ABA0 800A3A00 8FB80050 */ lw $t8, 0x50($sp) -/* B1ABA4 800A3A04 8FAC0050 */ lw $t4, 0x50($sp) -/* B1ABA8 800A3A08 00A08025 */ move $s0, $a1 -/* B1ABAC 800A3A0C 33190002 */ andi $t9, $t8, 2 -/* B1ABB0 800A3A10 13200003 */ beqz $t9, .L800A3A20 -/* B1ABB4 800A3A14 318D0001 */ andi $t5, $t4, 1 -/* B1ABB8 800A3A18 10000002 */ b .L800A3A24 -/* B1ABBC 800A3A1C 00401825 */ move $v1, $v0 -.L800A3A20: -/* B1ABC0 800A3A20 24030001 */ li $v1, 1 -.L800A3A24: -/* B1ABC4 800A3A24 11A00002 */ beqz $t5, .L800A3A30 -/* B1ABC8 800A3A28 8FAE0050 */ lw $t6, 0x50($sp) -/* B1ABCC 800A3A2C 00621821 */ addu $v1, $v1, $v0 -.L800A3A30: -/* B1ABD0 800A3A30 31CF0004 */ andi $t7, $t6, 4 -/* B1ABD4 800A3A34 11E00002 */ beqz $t7, .L800A3A40 -/* B1ABD8 800A3A38 2406093C */ li $a2, 2364 -/* B1ABDC 800A3A3C 00621821 */ addu $v1, $v1, $v0 -.L800A3A40: -/* B1ABE0 800A3A40 A2030000 */ sb $v1, ($s0) -/* B1ABE4 800A3A44 91180008 */ lbu $t8, 8($t0) -/* B1ABE8 800A3A48 00032880 */ sll $a1, $v1, 2 -/* B1ABEC 800A3A4C 00A32823 */ subu $a1, $a1, $v1 -/* B1ABF0 800A3A50 A2180002 */ sb $t8, 2($s0) -/* B1ABF4 800A3A54 8D020000 */ lw $v0, ($t0) -/* B1ABF8 800A3A58 00052840 */ sll $a1, $a1, 1 -/* B1ABFC 800A3A5C 00A02025 */ move $a0, $a1 -/* B1AC00 800A3A60 0002C900 */ sll $t9, $v0, 4 -/* B1AC04 800A3A64 00196702 */ srl $t4, $t9, 0x1c -/* B1AC08 800A3A68 000C6880 */ sll $t5, $t4, 2 -/* B1AC0C 800A3A6C 012D7021 */ addu $t6, $t1, $t5 -/* B1AC10 800A3A70 8DCF0000 */ lw $t7, ($t6) -/* B1AC14 800A3A74 004AC024 */ and $t8, $v0, $t2 -/* B1AC18 800A3A78 01F8C821 */ addu $t9, $t7, $t8 -/* B1AC1C 800A3A7C 032B6021 */ addu $t4, $t9, $t3 -/* B1AC20 800A3A80 AE0C0004 */ sw $t4, 4($s0) -/* B1AC24 800A3A84 8FAD0050 */ lw $t5, 0x50($sp) -/* B1AC28 800A3A88 8FAF0054 */ lw $t7, 0x54($sp) -/* B1AC2C 800A3A8C 8FB8005C */ lw $t8, 0x5c($sp) -/* B1AC30 800A3A90 31AE0008 */ andi $t6, $t5, 8 -/* B1AC34 800A3A94 11C00002 */ beqz $t6, .L800A3AA0 -/* B1AC38 800A3A98 00000000 */ nop -/* B1AC3C 800A3A9C 24A40002 */ addiu $a0, $a1, 2 -.L800A3AA0: -/* B1AC40 800A3AA0 15E0000C */ bnez $t7, .L800A3AD4 -/* B1AC44 800A3AA4 3C058014 */ lui $a1, %hi(D_801403CC) # $a1, 0x8014 -/* B1AC48 800A3AA8 24A503CC */ addiu $a1, %lo(D_801403CC) # addiu $a1, $a1, 0x3cc -/* B1AC4C 800A3AAC 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1AC50 800A3AB0 AFA40030 */ sw $a0, 0x30($sp) -/* B1AC54 800A3AB4 8FA40030 */ lw $a0, 0x30($sp) -/* B1AC58 800A3AB8 3C058014 */ lui $a1, %hi(D_801403E0) # $a1, 0x8014 -/* B1AC5C 800A3ABC AE020020 */ sw $v0, 0x20($s0) -/* B1AC60 800A3AC0 24A503E0 */ addiu $a1, %lo(D_801403E0) # addiu $a1, $a1, 0x3e0 -/* B1AC64 800A3AC4 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1AC68 800A3AC8 2406093D */ li $a2, 2365 -/* B1AC6C 800A3ACC 10000011 */ b .L800A3B14 -/* B1AC70 800A3AD0 AE020024 */ sw $v0, 0x24($s0) -.L800A3AD4: -/* B1AC74 800A3AD4 13030006 */ beq $t8, $v1, .L800A3AF0 -/* B1AC78 800A3AD8 3C048014 */ lui $a0, %hi(D_801403F4) # $a0, 0x8014 -/* B1AC7C 800A3ADC 3C058014 */ lui $a1, %hi(D_80140410) # $a1, 0x8014 -/* B1AC80 800A3AE0 24A50410 */ addiu $a1, %lo(D_80140410) # addiu $a1, $a1, 0x410 -/* B1AC84 800A3AE4 248403F4 */ addiu $a0, %lo(D_801403F4) # addiu $a0, $a0, 0x3f4 -/* B1AC88 800A3AE8 0C0007FC */ jal __assert -/* B1AC8C 800A3AEC 24060941 */ li $a2, 2369 -.L800A3AF0: -/* B1AC90 800A3AF0 8FB90054 */ lw $t9, 0x54($sp) -/* B1AC94 800A3AF4 2402FFF0 */ li $v0, -16 -/* B1AC98 800A3AF8 272C000F */ addiu $t4, $t9, 0xf -/* B1AC9C 800A3AFC 01826824 */ and $t5, $t4, $v0 -/* B1ACA0 800A3B00 AE0D0020 */ sw $t5, 0x20($s0) -/* B1ACA4 800A3B04 8FAE0058 */ lw $t6, 0x58($sp) -/* B1ACA8 800A3B08 25CF000F */ addiu $t7, $t6, 0xf -/* B1ACAC 800A3B0C 01E2C024 */ and $t8, $t7, $v0 -/* B1ACB0 800A3B10 AE180024 */ sw $t8, 0x24($s0) -.L800A3B14: -/* B1ACB4 800A3B14 8E190020 */ lw $t9, 0x20($s0) -/* B1ACB8 800A3B18 3C048014 */ lui $a0, %hi(D_80140424) -/* B1ACBC 800A3B1C 13200004 */ beqz $t9, .L800A3B30 -/* B1ACC0 800A3B20 00000000 */ nop -/* B1ACC4 800A3B24 8E0C0024 */ lw $t4, 0x24($s0) -/* B1ACC8 800A3B28 5580000A */ bnezl $t4, .L800A3B54 -/* B1ACCC 800A3B2C 44800000 */ mtc1 $zero, $f0 -.L800A3B30: -/* B1ACD0 800A3B30 0C00084C */ jal osSyncPrintf -/* B1ACD4 800A3B34 24840424 */ addiu $a0, %lo(D_80140424) -/* B1ACD8 800A3B38 3C048014 */ lui $a0, %hi(D_8014042C) # $a0, 0x8014 -/* B1ACDC 800A3B3C 0C00084C */ jal osSyncPrintf -/* B1ACE0 800A3B40 2484042C */ addiu $a0, %lo(D_8014042C) # addiu $a0, $a0, 0x42c -/* B1ACE4 800A3B44 3C048014 */ lui $a0, %hi(D_80140460) -/* B1ACE8 800A3B48 0C00084C */ jal osSyncPrintf -/* B1ACEC 800A3B4C 24840460 */ addiu $a0, %lo(D_80140460) # addiu $a0, $a0, 0x460 -/* B1ACF0 800A3B50 44800000 */ mtc1 $zero, $f0 -.L800A3B54: -/* B1ACF4 800A3B54 8FA40040 */ lw $a0, 0x40($sp) -/* B1ACF8 800A3B58 02002825 */ move $a1, $s0 -/* B1ACFC 800A3B5C 8FA6004C */ lw $a2, 0x4c($sp) -/* B1AD00 800A3B60 3C073F80 */ lui $a3, 0x3f80 -/* B1AD04 800A3B64 AFA00018 */ sw $zero, 0x18($sp) -/* B1AD08 800A3B68 E7A00010 */ swc1 $f0, 0x10($sp) -/* B1AD0C 800A3B6C E7A00014 */ swc1 $f0, 0x14($sp) -/* B1AD10 800A3B70 0C028FC2 */ jal func_800A3F08 -/* B1AD14 800A3B74 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B1AD18 800A3B78 8FBF002C */ lw $ra, 0x2c($sp) -/* B1AD1C 800A3B7C 8FB00028 */ lw $s0, 0x28($sp) -/* B1AD20 800A3B80 27BD0040 */ addiu $sp, $sp, 0x40 -/* B1AD24 800A3B84 03E00008 */ jr $ra -/* B1AD28 800A3B88 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3B8C.s b/asm/non_matchings/code/z_skelanime/func_800A3B8C.s deleted file mode 100644 index e9be35c47f..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3B8C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_800A3B8C -/* B1AD2C 800A3B8C 908E0001 */ lbu $t6, 1($a0) -/* B1AD30 800A3B90 3C18800A */ lui $t8, %hi(func_800A3E0C) -/* B1AD34 800A3B94 44802000 */ mtc1 $zero, $f4 -/* B1AD38 800A3B98 29C10002 */ slti $at, $t6, 2 -/* B1AD3C 800A3B9C 10200005 */ beqz $at, .L800A3BB4 -/* B1AD40 800A3BA0 27183E0C */ addiu $t8, %lo(func_800A3E0C) -/* B1AD44 800A3BA4 3C0F800A */ lui $t7, %hi(func_800A3D70) # $t7, 0x800a -/* B1AD48 800A3BA8 25EF3D70 */ addiu $t7, %lo(func_800A3D70) # addiu $t7, $t7, 0x3d70 -/* B1AD4C 800A3BAC 10000002 */ b .L800A3BB8 -/* B1AD50 800A3BB0 AC8F0030 */ sw $t7, 0x30($a0) -.L800A3BB4: -/* B1AD54 800A3BB4 AC980030 */ sw $t8, 0x30($a0) -.L800A3BB8: -/* B1AD58 800A3BB8 03E00008 */ jr $ra -/* B1AD5C 800A3BBC E4840028 */ swc1 $f4, 0x28($a0) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3BC0.s b/asm/non_matchings/code/z_skelanime/func_800A3BC0.s deleted file mode 100644 index 5130d0cb8b..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3BC0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800A3BC0 -/* B1AD60 800A3BC0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1AD64 800A3BC4 AFBF0014 */ sw $ra, 0x14($sp) -/* B1AD68 800A3BC8 8CB90030 */ lw $t9, 0x30($a1) -/* B1AD6C 800A3BCC 0320F809 */ jalr $t9 -/* B1AD70 800A3BD0 00000000 */ nop -/* B1AD74 800A3BD4 8FBF0014 */ lw $ra, 0x14($sp) -/* B1AD78 800A3BD8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1AD7C 800A3BDC 03E00008 */ jr $ra -/* B1AD80 800A3BE0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3BE4.s b/asm/non_matchings/code/z_skelanime/func_800A3BE4.s deleted file mode 100644 index 8347a2f618..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3BE4.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_800A3BE4 -/* B1AD84 800A3BE4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B1AD88 800A3BE8 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* B1AD8C 800A3BEC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1AD90 800A3BF0 AFBF0024 */ sw $ra, 0x24($sp) -/* B1AD94 800A3BF4 AFB00020 */ sw $s0, 0x20($sp) -/* B1AD98 800A3BF8 AFA40030 */ sw $a0, 0x30($sp) -/* B1AD9C 800A3BFC 85CF0110 */ lh $t7, 0x110($t6) -/* B1ADA0 800A3C00 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B1ADA4 800A3C04 44814000 */ mtc1 $at, $f8 -/* B1ADA8 800A3C08 448F2000 */ mtc1 $t7, $f4 -/* B1ADAC 800A3C0C C4AA002C */ lwc1 $f10, 0x2c($a1) -/* B1ADB0 800A3C10 C4A00028 */ lwc1 $f0, 0x28($a1) -/* B1ADB4 800A3C14 468021A0 */ cvt.s.w $f6, $f4 -/* B1ADB8 800A3C18 44802000 */ mtc1 $zero, $f4 -/* B1ADBC 800A3C1C 46000306 */ mov.s $f12, $f0 -/* B1ADC0 800A3C20 00A08025 */ move $s0, $a1 -/* B1ADC4 800A3C24 00A02025 */ move $a0, $a1 -/* B1ADC8 800A3C28 46083082 */ mul.s $f2, $f6, $f8 -/* B1ADCC 800A3C2C 00000000 */ nop -/* B1ADD0 800A3C30 46025402 */ mul.s $f16, $f10, $f2 -/* B1ADD4 800A3C34 46100481 */ sub.s $f18, $f0, $f16 -/* B1ADD8 800A3C38 E4B20028 */ swc1 $f18, 0x28($a1) -/* B1ADDC 800A3C3C C4A00028 */ lwc1 $f0, 0x28($a1) -/* B1ADE0 800A3C40 4604003E */ c.le.s $f0, $f4 -/* B1ADE4 800A3C44 00000000 */ nop -/* B1ADE8 800A3C48 45000005 */ bc1f .L800A3C60 -/* B1ADEC 800A3C4C 00000000 */ nop -/* B1ADF0 800A3C50 0C028EE3 */ jal func_800A3B8C -/* B1ADF4 800A3C54 E7AC002C */ swc1 $f12, 0x2c($sp) -/* B1ADF8 800A3C58 C7AC002C */ lwc1 $f12, 0x2c($sp) -/* B1ADFC 800A3C5C C6000028 */ lwc1 $f0, 0x28($s0) -.L800A3C60: -/* B1AE00 800A3C60 460C0203 */ div.s $f8, $f0, $f12 -/* B1AE04 800A3C64 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1AE08 800A3C68 44813000 */ mtc1 $at, $f6 -/* B1AE0C 800A3C6C 92050000 */ lbu $a1, ($s0) -/* B1AE10 800A3C70 8E060020 */ lw $a2, 0x20($s0) -/* B1AE14 800A3C74 8E070024 */ lw $a3, 0x24($s0) -/* B1AE18 800A3C78 8FA40030 */ lw $a0, 0x30($sp) -/* B1AE1C 800A3C7C 46083281 */ sub.s $f10, $f6, $f8 -/* B1AE20 800A3C80 0C028D37 */ jal func_800A34DC -/* B1AE24 800A3C84 E7AA0010 */ swc1 $f10, 0x10($sp) -/* B1AE28 800A3C88 8FBF0024 */ lw $ra, 0x24($sp) -/* B1AE2C 800A3C8C 8FB00020 */ lw $s0, 0x20($sp) -/* B1AE30 800A3C90 27BD0030 */ addiu $sp, $sp, 0x30 -/* B1AE34 800A3C94 03E00008 */ jr $ra -/* B1AE38 800A3C98 00001025 */ move $v0, $zero - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3C9C.s b/asm/non_matchings/code/z_skelanime/func_800A3C9C.s deleted file mode 100644 index fbfdc05530..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3C9C.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_800A3C9C -/* B1AE3C 800A3C9C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1AE40 800A3CA0 AFB00020 */ sw $s0, 0x20($sp) -/* B1AE44 800A3CA4 00A08025 */ move $s0, $a1 -/* B1AE48 800A3CA8 AFBF0024 */ sw $ra, 0x24($sp) -/* B1AE4C 800A3CAC AFA40028 */ sw $a0, 0x28($sp) -/* B1AE50 800A3CB0 C6040018 */ lwc1 $f4, 0x18($s0) -/* B1AE54 800A3CB4 8E0F0020 */ lw $t7, 0x20($s0) -/* B1AE58 800A3CB8 92070000 */ lbu $a3, ($s0) -/* B1AE5C 800A3CBC 4600218D */ trunc.w.s $f6, $f4 -/* B1AE60 800A3CC0 8CA50008 */ lw $a1, 8($a1) -/* B1AE64 800A3CC4 AFAF0010 */ sw $t7, 0x10($sp) -/* B1AE68 800A3CC8 44063000 */ mfc1 $a2, $f6 -/* B1AE6C 800A3CCC 0C028CDB */ jal func_800A336C -/* B1AE70 800A3CD0 00000000 */ nop -/* B1AE74 800A3CD4 C6000028 */ lwc1 $f0, 0x28($s0) -/* B1AE78 800A3CD8 44804000 */ mtc1 $zero, $f8 -/* B1AE7C 800A3CDC 3C188016 */ lui $t8, %hi(gGameInfo) -/* B1AE80 800A3CE0 46004032 */ c.eq.s $f8, $f0 -/* B1AE84 800A3CE4 00000000 */ nop -/* B1AE88 800A3CE8 4503001D */ bc1tl .L800A3D60 -/* B1AE8C 800A3CEC 8FBF0024 */ lw $ra, 0x24($sp) -/* B1AE90 800A3CF0 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* B1AE94 800A3CF4 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B1AE98 800A3CF8 44819000 */ mtc1 $at, $f18 -/* B1AE9C 800A3CFC 87190110 */ lh $t9, 0x110($t8) -/* B1AEA0 800A3D00 C604002C */ lwc1 $f4, 0x2c($s0) -/* B1AEA4 800A3D04 44806000 */ mtc1 $zero, $f12 -/* B1AEA8 800A3D08 44995000 */ mtc1 $t9, $f10 -/* B1AEAC 800A3D0C 00000000 */ nop -/* B1AEB0 800A3D10 46805420 */ cvt.s.w $f16, $f10 -/* B1AEB4 800A3D14 46128082 */ mul.s $f2, $f16, $f18 -/* B1AEB8 800A3D18 00000000 */ nop -/* B1AEBC 800A3D1C 46022182 */ mul.s $f6, $f4, $f2 -/* B1AEC0 800A3D20 46060201 */ sub.s $f8, $f0, $f6 -/* B1AEC4 800A3D24 E6080028 */ swc1 $f8, 0x28($s0) -/* B1AEC8 800A3D28 C6000028 */ lwc1 $f0, 0x28($s0) -/* B1AECC 800A3D2C 8FA40028 */ lw $a0, 0x28($sp) -/* B1AED0 800A3D30 460C003E */ c.le.s $f0, $f12 -/* B1AED4 800A3D34 00000000 */ nop -/* B1AED8 800A3D38 45000003 */ bc1f .L800A3D48 -/* B1AEDC 800A3D3C 00000000 */ nop -/* B1AEE0 800A3D40 10000006 */ b .L800A3D5C -/* B1AEE4 800A3D44 E60C0028 */ swc1 $f12, 0x28($s0) -.L800A3D48: -/* B1AEE8 800A3D48 92050000 */ lbu $a1, ($s0) -/* B1AEEC 800A3D4C 8E060020 */ lw $a2, 0x20($s0) -/* B1AEF0 800A3D50 8E070024 */ lw $a3, 0x24($s0) -/* B1AEF4 800A3D54 0C028D37 */ jal func_800A34DC -/* B1AEF8 800A3D58 E7A00010 */ swc1 $f0, 0x10($sp) -.L800A3D5C: -/* B1AEFC 800A3D5C 8FBF0024 */ lw $ra, 0x24($sp) -.L800A3D60: -/* B1AF00 800A3D60 8FB00020 */ lw $s0, 0x20($sp) -/* B1AF04 800A3D64 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1AF08 800A3D68 03E00008 */ jr $ra -/* B1AF0C 800A3D6C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3D70.s b/asm/non_matchings/code/z_skelanime/func_800A3D70.s deleted file mode 100644 index 3462864250..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3D70.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_800A3D70 -/* B1AF10 800A3D70 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* B1AF14 800A3D74 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1AF18 800A3D78 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1AF1C 800A3D7C AFBF0014 */ sw $ra, 0x14($sp) -/* B1AF20 800A3D80 85CF0110 */ lh $t7, 0x110($t6) -/* B1AF24 800A3D84 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B1AF28 800A3D88 44814000 */ mtc1 $at, $f8 -/* B1AF2C 800A3D8C 448F2000 */ mtc1 $t7, $f4 -/* B1AF30 800A3D90 C4B0001C */ lwc1 $f16, 0x1c($a1) -/* B1AF34 800A3D94 C4AA0018 */ lwc1 $f10, 0x18($a1) -/* B1AF38 800A3D98 468021A0 */ cvt.s.w $f6, $f4 -/* B1AF3C 800A3D9C 46083082 */ mul.s $f2, $f6, $f8 -/* B1AF40 800A3DA0 44803000 */ mtc1 $zero, $f6 -/* B1AF44 800A3DA4 46028482 */ mul.s $f18, $f16, $f2 -/* B1AF48 800A3DA8 46125100 */ add.s $f4, $f10, $f18 -/* B1AF4C 800A3DAC E4A40018 */ swc1 $f4, 0x18($a1) -/* B1AF50 800A3DB0 C4A00018 */ lwc1 $f0, 0x18($a1) -/* B1AF54 800A3DB4 4606003C */ c.lt.s $f0, $f6 -/* B1AF58 800A3DB8 00000000 */ nop -/* B1AF5C 800A3DBC 45020006 */ bc1fl .L800A3DD8 -/* B1AF60 800A3DC0 C4A20014 */ lwc1 $f2, 0x14($a1) -/* B1AF64 800A3DC4 C4A80014 */ lwc1 $f8, 0x14($a1) -/* B1AF68 800A3DC8 46080400 */ add.s $f16, $f0, $f8 -/* B1AF6C 800A3DCC 10000008 */ b .L800A3DF0 -/* B1AF70 800A3DD0 E4B00018 */ swc1 $f16, 0x18($a1) -/* B1AF74 800A3DD4 C4A20014 */ lwc1 $f2, 0x14($a1) -.L800A3DD8: -/* B1AF78 800A3DD8 4600103E */ c.le.s $f2, $f0 -/* B1AF7C 800A3DDC 00000000 */ nop -/* B1AF80 800A3DE0 45000003 */ bc1f .L800A3DF0 -/* B1AF84 800A3DE4 00000000 */ nop -/* B1AF88 800A3DE8 46020281 */ sub.s $f10, $f0, $f2 -/* B1AF8C 800A3DEC E4AA0018 */ swc1 $f10, 0x18($a1) -.L800A3DF0: -/* B1AF90 800A3DF0 0C028F27 */ jal func_800A3C9C -/* B1AF94 800A3DF4 00000000 */ nop -/* B1AF98 800A3DF8 8FBF0014 */ lw $ra, 0x14($sp) -/* B1AF9C 800A3DFC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1AFA0 800A3E00 00001025 */ move $v0, $zero -/* B1AFA4 800A3E04 03E00008 */ jr $ra -/* B1AFA8 800A3E08 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3E0C.s b/asm/non_matchings/code/z_skelanime/func_800A3E0C.s deleted file mode 100644 index baf9686fc4..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3E0C.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_800A3E0C -/* B1AFAC 800A3E0C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* B1AFB0 800A3E10 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1AFB4 800A3E14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1AFB8 800A3E18 AFBF0014 */ sw $ra, 0x14($sp) -/* B1AFBC 800A3E1C 85CF0110 */ lh $t7, 0x110($t6) -/* B1AFC0 800A3E20 C4A00018 */ lwc1 $f0, 0x18($a1) -/* B1AFC4 800A3E24 C4AC0010 */ lwc1 $f12, 0x10($a1) -/* B1AFC8 800A3E28 448F2000 */ mtc1 $t7, $f4 -/* B1AFCC 800A3E2C 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B1AFD0 800A3E30 46006032 */ c.eq.s $f12, $f0 -/* B1AFD4 800A3E34 44814000 */ mtc1 $at, $f8 -/* B1AFD8 800A3E38 468021A0 */ cvt.s.w $f6, $f4 -/* B1AFDC 800A3E3C 46083382 */ mul.s $f14, $f6, $f8 -/* B1AFE0 800A3E40 45020006 */ bc1fl .L800A3E5C -/* B1AFE4 800A3E44 C4A2001C */ lwc1 $f2, 0x1c($a1) -/* B1AFE8 800A3E48 0C028F27 */ jal func_800A3C9C -/* B1AFEC 800A3E4C 00000000 */ nop -/* B1AFF0 800A3E50 10000021 */ b .L800A3ED8 -/* B1AFF4 800A3E54 24020001 */ li $v0, 1 -/* B1AFF8 800A3E58 C4A2001C */ lwc1 $f2, 0x1c($a1) -.L800A3E5C: -/* B1AFFC 800A3E5C 44808000 */ mtc1 $zero, $f16 -/* B1B000 800A3E60 460E1282 */ mul.s $f10, $f2, $f14 -/* B1B004 800A3E64 460A0480 */ add.s $f18, $f0, $f10 -/* B1B008 800A3E68 E4B20018 */ swc1 $f18, 0x18($a1) -/* B1B00C 800A3E6C C4A00018 */ lwc1 $f0, 0x18($a1) -/* B1B010 800A3E70 460C0101 */ sub.s $f4, $f0, $f12 -/* B1B014 800A3E74 46022182 */ mul.s $f6, $f4, $f2 -/* B1B018 800A3E78 4606803C */ c.lt.s $f16, $f6 -/* B1B01C 800A3E7C 00000000 */ nop -/* B1B020 800A3E80 45020004 */ bc1fl .L800A3E94 -/* B1B024 800A3E84 4610003C */ c.lt.s $f0, $f16 -/* B1B028 800A3E88 10000010 */ b .L800A3ECC -/* B1B02C 800A3E8C E4AC0018 */ swc1 $f12, 0x18($a1) -/* B1B030 800A3E90 4610003C */ c.lt.s $f0, $f16 -.L800A3E94: -/* B1B034 800A3E94 00000000 */ nop -/* B1B038 800A3E98 45020006 */ bc1fl .L800A3EB4 -/* B1B03C 800A3E9C C4A20014 */ lwc1 $f2, 0x14($a1) -/* B1B040 800A3EA0 C4A80014 */ lwc1 $f8, 0x14($a1) -/* B1B044 800A3EA4 46080280 */ add.s $f10, $f0, $f8 -/* B1B048 800A3EA8 10000008 */ b .L800A3ECC -/* B1B04C 800A3EAC E4AA0018 */ swc1 $f10, 0x18($a1) -/* B1B050 800A3EB0 C4A20014 */ lwc1 $f2, 0x14($a1) -.L800A3EB4: -/* B1B054 800A3EB4 4600103E */ c.le.s $f2, $f0 -/* B1B058 800A3EB8 00000000 */ nop -/* B1B05C 800A3EBC 45000003 */ bc1f .L800A3ECC -/* B1B060 800A3EC0 00000000 */ nop -/* B1B064 800A3EC4 46020481 */ sub.s $f18, $f0, $f2 -/* B1B068 800A3EC8 E4B20018 */ swc1 $f18, 0x18($a1) -.L800A3ECC: -/* B1B06C 800A3ECC 0C028F27 */ jal func_800A3C9C -/* B1B070 800A3ED0 00000000 */ nop -/* B1B074 800A3ED4 00001025 */ move $v0, $zero -.L800A3ED8: -/* B1B078 800A3ED8 8FBF0014 */ lw $ra, 0x14($sp) -/* B1B07C 800A3EDC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1B080 800A3EE0 03E00008 */ jr $ra -/* B1B084 800A3EE4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3EE8.s b/asm/non_matchings/code/z_skelanime/func_800A3EE8.s deleted file mode 100644 index 391aeba461..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3EE8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800A3EE8 -/* B1B088 800A3EE8 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1B08C 800A3EEC 44810000 */ mtc1 $at, $f0 -/* B1B090 800A3EF0 44866000 */ mtc1 $a2, $f12 -/* B1B094 800A3EF4 AFA40000 */ sw $a0, ($sp) -/* B1B098 800A3EF8 E4A00028 */ swc1 $f0, 0x28($a1) -/* B1B09C 800A3EFC 460C0103 */ div.s $f4, $f0, $f12 -/* B1B0A0 800A3F00 03E00008 */ jr $ra -/* B1B0A4 800A3F04 E4A4002C */ swc1 $f4, 0x2c($a1) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3F08.s b/asm/non_matchings/code/z_skelanime/func_800A3F08.s index 2b6bdb2303..c5c4036659 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A3F08.s +++ b/asm/non_matchings/code/z_skelanime/func_800A3F08.s @@ -19,9 +19,9 @@ glabel func_800A3F08 /* B1B0EC 800A3F4C 44805000 */ mtc1 $zero, $f10 /* B1B0F0 800A3F50 C4A80018 */ lwc1 $f8, 0x18($a1) /* B1B0F4 800A3F54 46083032 */ c.eq.s $f6, $f8 -/* B1B0F8 800A3F58 00000000 */ nop +/* B1B0F8 800A3F58 00000000 */ nop /* B1B0FC 800A3F5C 45010024 */ bc1t .L800A3FF0 -/* B1B100 800A3F60 00000000 */ nop +/* B1B100 800A3F60 00000000 */ nop /* B1B104 800A3F64 44805000 */ mtc1 $zero, $f10 .L800A3F68: /* B1B108 800A3F68 3C18800A */ lui $t8, %hi(func_800A3BE4) # $t8, 0x800a @@ -34,7 +34,7 @@ glabel func_800A3F08 /* B1B124 800A3F84 E7AC0044 */ swc1 $f12, 0x44($sp) /* B1B128 800A3F88 02002025 */ move $a0, $s0 /* B1B12C 800A3F8C 8E050024 */ lw $a1, 0x24($s0) -/* B1B130 800A3F90 0C0295DD */ jal func_800A5774 +/* B1B130 800A3F90 0C0295DD */ jal SkelAnime_CopyVec3s /* B1B134 800A3F94 8E060020 */ lw $a2, 0x20($s0) /* B1B138 800A3F98 C7AC0044 */ lwc1 $f12, 0x44($sp) /* B1B13C 800A3F9C 1000000D */ b .L800A3FD4 @@ -55,7 +55,7 @@ glabel func_800A3F08 .L800A3FD4: /* B1B174 800A3FD4 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* B1B178 800A3FD8 44810000 */ mtc1 $at, $f0 -/* B1B17C 800A3FDC 00000000 */ nop +/* B1B17C 800A3FDC 00000000 */ nop /* B1B180 800A3FE0 460C0103 */ div.s $f4, $f0, $f12 /* B1B184 800A3FE4 E6000028 */ swc1 $f0, 0x28($s0) /* B1B188 800A3FE8 10000010 */ b .L800A402C @@ -72,9 +72,9 @@ glabel func_800A3F08 /* B1B1B0 800A4010 AFAA0010 */ sw $t2, 0x10($sp) /* B1B1B4 800A4014 44064000 */ mfc1 $a2, $f8 /* B1B1B8 800A4018 0C028CDB */ jal func_800A336C -/* B1B1BC 800A401C 00000000 */ nop +/* B1B1BC 800A401C 00000000 */ nop /* B1B1C0 800A4020 44805000 */ mtc1 $zero, $f10 -/* B1B1C4 800A4024 00000000 */ nop +/* B1B1C4 800A4024 00000000 */ nop /* B1B1C8 800A4028 E60A0028 */ swc1 $f10, 0x28($s0) .L800A402C: /* B1B1CC 800A402C AE110008 */ sw $s1, 8($s0) @@ -87,7 +87,7 @@ glabel func_800A3F08 /* B1B1E8 800A4048 0C0287F2 */ jal func_800A1FC8 /* B1B1EC 800A404C E6040010 */ swc1 $f4, 0x10($s0) /* B1B1F0 800A4050 44823000 */ mtc1 $v0, $f6 -/* B1B1F4 800A4054 00000000 */ nop +/* B1B1F4 800A4054 00000000 */ nop /* B1B1F8 800A4058 46803220 */ cvt.s.w $f8, $f6 /* B1B1FC 800A405C E6080014 */ swc1 $f8, 0x14($s0) /* B1B200 800A4060 C7AA0034 */ lwc1 $f10, 0x34($sp) diff --git a/asm/non_matchings/code/z_skelanime/func_800A407C.s b/asm/non_matchings/code/z_skelanime/func_800A407C.s deleted file mode 100644 index f996c1ff58..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A407C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800A407C -/* B1B21C 800A407C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1B220 800A4080 AFBF0024 */ sw $ra, 0x24($sp) -/* B1B224 800A4084 AFA40028 */ sw $a0, 0x28($sp) -/* B1B228 800A4088 AFA5002C */ sw $a1, 0x2c($sp) -/* B1B22C 800A408C AFA60030 */ sw $a2, 0x30($sp) -/* B1B230 800A4090 0C028800 */ jal SkelAnime_GetFrameCount -/* B1B234 800A4094 00C02025 */ move $a0, $a2 -/* B1B238 800A4098 44822000 */ mtc1 $v0, $f4 -/* B1B23C 800A409C 44800000 */ mtc1 $zero, $f0 -/* B1B240 800A40A0 240E0002 */ li $t6, 2 -/* B1B244 800A40A4 468021A0 */ cvt.s.w $f6, $f4 -/* B1B248 800A40A8 AFAE0018 */ sw $t6, 0x18($sp) -/* B1B24C 800A40AC 8FA40028 */ lw $a0, 0x28($sp) -/* B1B250 800A40B0 8FA5002C */ lw $a1, 0x2c($sp) -/* B1B254 800A40B4 8FA60030 */ lw $a2, 0x30($sp) -/* B1B258 800A40B8 3C073F80 */ lui $a3, 0x3f80 -/* B1B25C 800A40BC E7A60014 */ swc1 $f6, 0x14($sp) -/* B1B260 800A40C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* B1B264 800A40C4 0C028FC2 */ jal func_800A3F08 -/* B1B268 800A40C8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B1B26C 800A40CC 8FBF0024 */ lw $ra, 0x24($sp) -/* B1B270 800A40D0 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1B274 800A40D4 03E00008 */ jr $ra -/* B1B278 800A40D8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A40DC.s b/asm/non_matchings/code/z_skelanime/func_800A40DC.s deleted file mode 100644 index d12eff6e07..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A40DC.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_800A40DC -/* B1B27C 800A40DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1B280 800A40E0 AFBF0024 */ sw $ra, 0x24($sp) -/* B1B284 800A40E4 AFA40028 */ sw $a0, 0x28($sp) -/* B1B288 800A40E8 AFA5002C */ sw $a1, 0x2c($sp) -/* B1B28C 800A40EC AFA60030 */ sw $a2, 0x30($sp) -/* B1B290 800A40F0 AFA70034 */ sw $a3, 0x34($sp) -/* B1B294 800A40F4 0C028800 */ jal SkelAnime_GetFrameCount -/* B1B298 800A40F8 00C02025 */ move $a0, $a2 -/* B1B29C 800A40FC 44822000 */ mtc1 $v0, $f4 -/* B1B2A0 800A4100 44800000 */ mtc1 $zero, $f0 -/* B1B2A4 800A4104 240E0002 */ li $t6, 2 -/* B1B2A8 800A4108 468021A0 */ cvt.s.w $f6, $f4 -/* B1B2AC 800A410C AFAE0018 */ sw $t6, 0x18($sp) -/* B1B2B0 800A4110 8FA40028 */ lw $a0, 0x28($sp) -/* B1B2B4 800A4114 8FA5002C */ lw $a1, 0x2c($sp) -/* B1B2B8 800A4118 8FA60030 */ lw $a2, 0x30($sp) -/* B1B2BC 800A411C 8FA70034 */ lw $a3, 0x34($sp) -/* B1B2C0 800A4120 E7A60014 */ swc1 $f6, 0x14($sp) -/* B1B2C4 800A4124 E7A00010 */ swc1 $f0, 0x10($sp) -/* B1B2C8 800A4128 0C028FC2 */ jal func_800A3F08 -/* B1B2CC 800A412C E7A0001C */ swc1 $f0, 0x1c($sp) -/* B1B2D0 800A4130 8FBF0024 */ lw $ra, 0x24($sp) -/* B1B2D4 800A4134 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1B2D8 800A4138 03E00008 */ jr $ra -/* B1B2DC 800A413C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4140.s b/asm/non_matchings/code/z_skelanime/func_800A4140.s deleted file mode 100644 index 40f035d4d6..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4140.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_800A4140 -/* B1B2E0 800A4140 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1B2E4 800A4144 AFBF0024 */ sw $ra, 0x24($sp) -/* B1B2E8 800A4148 AFA40028 */ sw $a0, 0x28($sp) -/* B1B2EC 800A414C AFA5002C */ sw $a1, 0x2c($sp) -/* B1B2F0 800A4150 AFA60030 */ sw $a2, 0x30($sp) -/* B1B2F4 800A4154 0C028800 */ jal SkelAnime_GetFrameCount -/* B1B2F8 800A4158 00C02025 */ move $a0, $a2 -/* B1B2FC 800A415C 44822000 */ mtc1 $v0, $f4 -/* B1B300 800A4160 44800000 */ mtc1 $zero, $f0 -/* B1B304 800A4164 8FA40028 */ lw $a0, 0x28($sp) -/* B1B308 800A4168 468021A0 */ cvt.s.w $f6, $f4 -/* B1B30C 800A416C 8FA5002C */ lw $a1, 0x2c($sp) -/* B1B310 800A4170 8FA60030 */ lw $a2, 0x30($sp) -/* B1B314 800A4174 3C073F80 */ lui $a3, 0x3f80 -/* B1B318 800A4178 AFA00018 */ sw $zero, 0x18($sp) -/* B1B31C 800A417C E7A00010 */ swc1 $f0, 0x10($sp) -/* B1B320 800A4180 E7A60014 */ swc1 $f6, 0x14($sp) -/* B1B324 800A4184 0C028FC2 */ jal func_800A3F08 -/* B1B328 800A4188 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B1B32C 800A418C 8FBF0024 */ lw $ra, 0x24($sp) -/* B1B330 800A4190 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1B334 800A4194 03E00008 */ jr $ra -/* B1B338 800A4198 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A419C.s b/asm/non_matchings/code/z_skelanime/func_800A419C.s deleted file mode 100644 index 16d7446c24..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A419C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800A419C -/* B1B33C 800A419C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1B340 800A41A0 AFBF0024 */ sw $ra, 0x24($sp) -/* B1B344 800A41A4 AFA40028 */ sw $a0, 0x28($sp) -/* B1B348 800A41A8 AFA5002C */ sw $a1, 0x2c($sp) -/* B1B34C 800A41AC AFA60030 */ sw $a2, 0x30($sp) -/* B1B350 800A41B0 AFA70034 */ sw $a3, 0x34($sp) -/* B1B354 800A41B4 0C028800 */ jal SkelAnime_GetFrameCount -/* B1B358 800A41B8 00C02025 */ move $a0, $a2 -/* B1B35C 800A41BC 44822000 */ mtc1 $v0, $f4 -/* B1B360 800A41C0 44800000 */ mtc1 $zero, $f0 -/* B1B364 800A41C4 8FA40028 */ lw $a0, 0x28($sp) -/* B1B368 800A41C8 468021A0 */ cvt.s.w $f6, $f4 -/* B1B36C 800A41CC 8FA5002C */ lw $a1, 0x2c($sp) -/* B1B370 800A41D0 8FA60030 */ lw $a2, 0x30($sp) -/* B1B374 800A41D4 8FA70034 */ lw $a3, 0x34($sp) -/* B1B378 800A41D8 AFA00018 */ sw $zero, 0x18($sp) -/* B1B37C 800A41DC E7A00010 */ swc1 $f0, 0x10($sp) -/* B1B380 800A41E0 E7A60014 */ swc1 $f6, 0x14($sp) -/* B1B384 800A41E4 0C028FC2 */ jal func_800A3F08 -/* B1B388 800A41E8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B1B38C 800A41EC 8FBF0024 */ lw $ra, 0x24($sp) -/* B1B390 800A41F0 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1B394 800A41F4 03E00008 */ jr $ra -/* B1B398 800A41F8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A41FC.s b/asm/non_matchings/code/z_skelanime/func_800A41FC.s deleted file mode 100644 index 8fdc4ffdfc..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A41FC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_800A41FC -/* B1B39C 800A41FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1B3A0 800A4200 AFBF0014 */ sw $ra, 0x14($sp) -/* B1B3A4 800A4204 AFA5001C */ sw $a1, 0x1c($sp) -/* B1B3A8 800A4208 00A07025 */ move $t6, $a1 -/* B1B3AC 800A420C 8DC60024 */ lw $a2, 0x24($t6) -/* B1B3B0 800A4210 8DC70020 */ lw $a3, 0x20($t6) -/* B1B3B4 800A4214 0C028D1E */ jal func_800A3478 -/* B1B3B8 800A4218 90A50000 */ lbu $a1, ($a1) -/* B1B3BC 800A421C 8FBF0014 */ lw $ra, 0x14($sp) -/* B1B3C0 800A4220 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1B3C4 800A4224 03E00008 */ jr $ra -/* B1B3C8 800A4228 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A422C.s b/asm/non_matchings/code/z_skelanime/func_800A422C.s deleted file mode 100644 index 407987b893..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A422C.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_800A422C -/* B1B3CC 800A422C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1B3D0 800A4230 AFBF0014 */ sw $ra, 0x14($sp) -/* B1B3D4 800A4234 AFA5001C */ sw $a1, 0x1c($sp) -/* B1B3D8 800A4238 00A07025 */ move $t6, $a1 -/* B1B3DC 800A423C 8DC60020 */ lw $a2, 0x20($t6) -/* B1B3E0 800A4240 8DC70024 */ lw $a3, 0x24($t6) -/* B1B3E4 800A4244 0C028D1E */ jal func_800A3478 -/* B1B3E8 800A4248 90A50000 */ lbu $a1, ($a1) -/* B1B3EC 800A424C 8FBF0014 */ lw $ra, 0x14($sp) -/* B1B3F0 800A4250 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1B3F4 800A4254 03E00008 */ jr $ra -/* B1B3F8 800A4258 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A425C.s b/asm/non_matchings/code/z_skelanime/func_800A425C.s deleted file mode 100644 index 0a38414a94..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A425C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800A425C -/* B1B3FC 800A425C 44876000 */ mtc1 $a3, $f12 -/* B1B400 800A4260 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1B404 800A4264 AFA50024 */ sw $a1, 0x24($sp) -/* B1B408 800A4268 4600610D */ trunc.w.s $f4, $f12 -/* B1B40C 800A426C 8FAF0024 */ lw $t7, 0x24($sp) -/* B1B410 800A4270 AFA60028 */ sw $a2, 0x28($sp) -/* B1B414 800A4274 AFBF001C */ sw $ra, 0x1c($sp) -/* B1B418 800A4278 8DF80024 */ lw $t8, 0x24($t7) -/* B1B41C 800A427C 00C02825 */ move $a1, $a2 -/* B1B420 800A4280 44062000 */ mfc1 $a2, $f4 -/* B1B424 800A4284 91E70000 */ lbu $a3, ($t7) -/* B1B428 800A4288 0C028CDB */ jal func_800A336C -/* B1B42C 800A428C AFB80010 */ sw $t8, 0x10($sp) -/* B1B430 800A4290 8FBF001C */ lw $ra, 0x1c($sp) -/* B1B434 800A4294 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1B438 800A4298 03E00008 */ jr $ra -/* B1B43C 800A429C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A42A0.s b/asm/non_matchings/code/z_skelanime/func_800A42A0.s deleted file mode 100644 index 993397e476..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A42A0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800A42A0 -/* B1B440 800A42A0 44876000 */ mtc1 $a3, $f12 -/* B1B444 800A42A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1B448 800A42A8 AFA50024 */ sw $a1, 0x24($sp) -/* B1B44C 800A42AC 4600610D */ trunc.w.s $f4, $f12 -/* B1B450 800A42B0 8FAF0024 */ lw $t7, 0x24($sp) -/* B1B454 800A42B4 AFA60028 */ sw $a2, 0x28($sp) -/* B1B458 800A42B8 AFBF001C */ sw $ra, 0x1c($sp) -/* B1B45C 800A42BC 8DF80020 */ lw $t8, 0x20($t7) -/* B1B460 800A42C0 00C02825 */ move $a1, $a2 -/* B1B464 800A42C4 44062000 */ mfc1 $a2, $f4 -/* B1B468 800A42C8 91E70000 */ lbu $a3, ($t7) -/* B1B46C 800A42CC 0C028CDB */ jal func_800A336C -/* B1B470 800A42D0 AFB80010 */ sw $t8, 0x10($sp) -/* B1B474 800A42D4 8FBF001C */ lw $ra, 0x1c($sp) -/* B1B478 800A42D8 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1B47C 800A42DC 03E00008 */ jr $ra -/* B1B480 800A42E0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A42E4.s b/asm/non_matchings/code/z_skelanime/func_800A42E4.s deleted file mode 100644 index 0d340935ed..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A42E4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800A42E4 -/* B1B484 800A42E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1B488 800A42E8 AFBF001C */ sw $ra, 0x1c($sp) -/* B1B48C 800A42EC AFA50024 */ sw $a1, 0x24($sp) -/* B1B490 800A42F0 00A07025 */ move $t6, $a1 -/* B1B494 800A42F4 44866000 */ mtc1 $a2, $f12 -/* B1B498 800A42F8 8DC60020 */ lw $a2, 0x20($t6) -/* B1B49C 800A42FC 8DC70024 */ lw $a3, 0x24($t6) -/* B1B4A0 800A4300 90A50000 */ lbu $a1, ($a1) -/* B1B4A4 800A4304 0C028D37 */ jal func_800A34DC -/* B1B4A8 800A4308 E7AC0010 */ swc1 $f12, 0x10($sp) -/* B1B4AC 800A430C 8FBF001C */ lw $ra, 0x1c($sp) -/* B1B4B0 800A4310 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1B4B4 800A4314 03E00008 */ jr $ra -/* B1B4B8 800A4318 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A431C.s b/asm/non_matchings/code/z_skelanime/func_800A431C.s deleted file mode 100644 index 951123c44e..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A431C.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_800A431C -/* B1B4BC 800A431C 44876000 */ mtc1 $a3, $f12 -/* B1B4C0 800A4320 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B1B4C4 800A4324 AFB00020 */ sw $s0, 0x20($sp) -/* B1B4C8 800A4328 4600610D */ trunc.w.s $f4, $f12 -/* B1B4CC 800A432C 00A08025 */ move $s0, $a1 -/* B1B4D0 800A4330 AFA60038 */ sw $a2, 0x38($sp) -/* B1B4D4 800A4334 AFBF0024 */ sw $ra, 0x24($sp) -/* B1B4D8 800A4338 AFA40030 */ sw $a0, 0x30($sp) -/* B1B4DC 800A433C 8E0F0020 */ lw $t7, 0x20($s0) -/* B1B4E0 800A4340 00C02825 */ move $a1, $a2 -/* B1B4E4 800A4344 44062000 */ mfc1 $a2, $f4 -/* B1B4E8 800A4348 92070000 */ lbu $a3, ($s0) -/* B1B4EC 800A434C 0C028CDB */ jal func_800A336C -/* B1B4F0 800A4350 AFAF0010 */ sw $t7, 0x10($sp) -/* B1B4F4 800A4354 C7A60044 */ lwc1 $f6, 0x44($sp) -/* B1B4F8 800A4358 8FA2004C */ lw $v0, 0x4c($sp) -/* B1B4FC 800A435C 2401FFF0 */ li $at, -16 -/* B1B500 800A4360 4600320D */ trunc.w.s $f8, $f6 -/* B1B504 800A4364 2442000F */ addiu $v0, $v0, 0xf -/* B1B508 800A4368 00411024 */ and $v0, $v0, $at -/* B1B50C 800A436C 92070000 */ lbu $a3, ($s0) -/* B1B510 800A4370 44064000 */ mfc1 $a2, $f8 -/* B1B514 800A4374 AFA20028 */ sw $v0, 0x28($sp) -/* B1B518 800A4378 AFA20010 */ sw $v0, 0x10($sp) -/* B1B51C 800A437C 8FA40030 */ lw $a0, 0x30($sp) -/* B1B520 800A4380 0C028CDB */ jal func_800A336C -/* B1B524 800A4384 8FA50040 */ lw $a1, 0x40($sp) -/* B1B528 800A4388 C7AA0048 */ lwc1 $f10, 0x48($sp) -/* B1B52C 800A438C 92050000 */ lbu $a1, ($s0) -/* B1B530 800A4390 8E060020 */ lw $a2, 0x20($s0) -/* B1B534 800A4394 8FA40030 */ lw $a0, 0x30($sp) -/* B1B538 800A4398 8FA70028 */ lw $a3, 0x28($sp) -/* B1B53C 800A439C 0C028D37 */ jal func_800A34DC -/* B1B540 800A43A0 E7AA0010 */ swc1 $f10, 0x10($sp) -/* B1B544 800A43A4 8FBF0024 */ lw $ra, 0x24($sp) -/* B1B548 800A43A8 8FB00020 */ lw $s0, 0x20($sp) -/* B1B54C 800A43AC 27BD0030 */ addiu $sp, $sp, 0x30 -/* B1B550 800A43B0 03E00008 */ jr $ra -/* B1B554 800A43B4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A43B8.s b/asm/non_matchings/code/z_skelanime/func_800A43B8.s deleted file mode 100644 index 04d465f107..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A43B8.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_800A43B8 -/* B1B558 800A43B8 44876000 */ mtc1 $a3, $f12 -/* B1B55C 800A43BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B1B560 800A43C0 AFB00020 */ sw $s0, 0x20($sp) -/* B1B564 800A43C4 4600610D */ trunc.w.s $f4, $f12 -/* B1B568 800A43C8 00A08025 */ move $s0, $a1 -/* B1B56C 800A43CC AFA60038 */ sw $a2, 0x38($sp) -/* B1B570 800A43D0 AFBF0024 */ sw $ra, 0x24($sp) -/* B1B574 800A43D4 AFA40030 */ sw $a0, 0x30($sp) -/* B1B578 800A43D8 8E0F0024 */ lw $t7, 0x24($s0) -/* B1B57C 800A43DC 00C02825 */ move $a1, $a2 -/* B1B580 800A43E0 44062000 */ mfc1 $a2, $f4 -/* B1B584 800A43E4 92070000 */ lbu $a3, ($s0) -/* B1B588 800A43E8 0C028CDB */ jal func_800A336C -/* B1B58C 800A43EC AFAF0010 */ sw $t7, 0x10($sp) -/* B1B590 800A43F0 C7A60044 */ lwc1 $f6, 0x44($sp) -/* B1B594 800A43F4 8FA2004C */ lw $v0, 0x4c($sp) -/* B1B598 800A43F8 2401FFF0 */ li $at, -16 -/* B1B59C 800A43FC 4600320D */ trunc.w.s $f8, $f6 -/* B1B5A0 800A4400 2442000F */ addiu $v0, $v0, 0xf -/* B1B5A4 800A4404 00411024 */ and $v0, $v0, $at -/* B1B5A8 800A4408 92070000 */ lbu $a3, ($s0) -/* B1B5AC 800A440C 44064000 */ mfc1 $a2, $f8 -/* B1B5B0 800A4410 AFA20028 */ sw $v0, 0x28($sp) -/* B1B5B4 800A4414 AFA20010 */ sw $v0, 0x10($sp) -/* B1B5B8 800A4418 8FA40030 */ lw $a0, 0x30($sp) -/* B1B5BC 800A441C 0C028CDB */ jal func_800A336C -/* B1B5C0 800A4420 8FA50040 */ lw $a1, 0x40($sp) -/* B1B5C4 800A4424 C7AA0048 */ lwc1 $f10, 0x48($sp) -/* B1B5C8 800A4428 92050000 */ lbu $a1, ($s0) -/* B1B5CC 800A442C 8E060024 */ lw $a2, 0x24($s0) -/* B1B5D0 800A4430 8FA40030 */ lw $a0, 0x30($sp) -/* B1B5D4 800A4434 8FA70028 */ lw $a3, 0x28($sp) -/* B1B5D8 800A4438 0C028D37 */ jal func_800A34DC -/* B1B5DC 800A443C E7AA0010 */ swc1 $f10, 0x10($sp) -/* B1B5E0 800A4440 8FBF0024 */ lw $ra, 0x24($sp) -/* B1B5E4 800A4444 8FB00020 */ lw $s0, 0x20($sp) -/* B1B5E8 800A4448 27BD0030 */ addiu $sp, $sp, 0x30 -/* B1B5EC 800A444C 03E00008 */ jr $ra -/* B1B5F0 800A4450 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4454.s b/asm/non_matchings/code/z_skelanime/func_800A4454.s deleted file mode 100644 index 136d1ec1be..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4454.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800A4454 -/* B1B5F4 800A4454 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1B5F8 800A4458 AFBF0014 */ sw $ra, 0x14($sp) -/* B1B5FC 800A445C 240E0002 */ li $t6, 2 -/* B1B600 800A4460 0C028EE3 */ jal func_800A3B8C -/* B1B604 800A4464 A08E0001 */ sb $t6, 1($a0) -/* B1B608 800A4468 8FBF0014 */ lw $ra, 0x14($sp) -/* B1B60C 800A446C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1B610 800A4470 03E00008 */ jr $ra -/* B1B614 800A4474 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4478.s b/asm/non_matchings/code/z_skelanime/func_800A4478.s deleted file mode 100644 index 2f2315e989..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4478.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_800A4478 -/* B1B618 800A4478 44866000 */ mtc1 $a2, $f12 -/* B1B61C 800A447C C484001C */ lwc1 $f4, 0x1c($a0) -/* B1B620 800A4480 C4860018 */ lwc1 $f6, 0x18($a0) -/* B1B624 800A4484 44808000 */ mtc1 $zero, $f16 -/* B1B628 800A4488 460C2002 */ mul.s $f0, $f4, $f12 -/* B1B62C 800A448C 44857000 */ mtc1 $a1, $f14 -/* B1B630 800A4490 00001025 */ move $v0, $zero -/* B1B634 800A4494 46003081 */ sub.s $f2, $f6, $f0 -/* B1B638 800A4498 4610103C */ c.lt.s $f2, $f16 -/* B1B63C 800A449C 00000000 */ nop -/* B1B640 800A44A0 45020005 */ bc1fl .L800A44B8 -/* B1B644 800A44A4 C48C0014 */ lwc1 $f12, 0x14($a0) -/* B1B648 800A44A8 C48C0014 */ lwc1 $f12, 0x14($a0) -/* B1B64C 800A44AC 10000007 */ b .L800A44CC -/* B1B650 800A44B0 460C1080 */ add.s $f2, $f2, $f12 -/* B1B654 800A44B4 C48C0014 */ lwc1 $f12, 0x14($a0) -.L800A44B8: -/* B1B658 800A44B8 4602603E */ c.le.s $f12, $f2 -/* B1B65C 800A44BC 00000000 */ nop -/* B1B660 800A44C0 45020003 */ bc1fl .L800A44D0 -/* B1B664 800A44C4 46107032 */ c.eq.s $f14, $f16 -/* B1B668 800A44C8 460C1081 */ sub.s $f2, $f2, $f12 -.L800A44CC: -/* B1B66C 800A44CC 46107032 */ c.eq.s $f14, $f16 -.L800A44D0: -/* B1B670 800A44D0 46001200 */ add.s $f8, $f2, $f0 -/* B1B674 800A44D4 45020007 */ bc1fl .L800A44F4 -/* B1B678 800A44D8 460E4301 */ sub.s $f12, $f8, $f14 -/* B1B67C 800A44DC 4600803C */ c.lt.s $f16, $f0 -/* B1B680 800A44E0 00000000 */ nop -/* B1B684 800A44E4 45020003 */ bc1fl .L800A44F4 -/* B1B688 800A44E8 460E4301 */ sub.s $f12, $f8, $f14 -/* B1B68C 800A44EC 46006386 */ mov.s $f14, $f12 -/* B1B690 800A44F0 460E4301 */ sub.s $f12, $f8, $f14 -.L800A44F4: -/* B1B694 800A44F4 46006282 */ mul.s $f10, $f12, $f0 -/* B1B698 800A44F8 460A803E */ c.le.s $f16, $f10 -/* B1B69C 800A44FC 00000000 */ nop -/* B1B6A0 800A4500 45000009 */ bc1f .L800A4528 -/* B1B6A4 800A4504 00000000 */ nop -/* B1B6A8 800A4508 46006481 */ sub.s $f18, $f12, $f0 -/* B1B6AC 800A450C 46009102 */ mul.s $f4, $f18, $f0 -/* B1B6B0 800A4510 4610203C */ c.lt.s $f4, $f16 -/* B1B6B4 800A4514 00000000 */ nop -/* B1B6B8 800A4518 45000003 */ bc1f .L800A4528 -/* B1B6BC 800A451C 00000000 */ nop -/* B1B6C0 800A4520 03E00008 */ jr $ra -/* B1B6C4 800A4524 24020001 */ li $v0, 1 -.L800A4528: -/* B1B6C8 800A4528 03E00008 */ jr $ra -/* B1B6CC 800A452C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4530.s b/asm/non_matchings/code/z_skelanime/func_800A4530.s deleted file mode 100644 index 03c97f246e..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4530.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_800A4530 -/* B1B6D0 800A4530 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* B1B6D4 800A4534 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1B6D8 800A4538 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1B6DC 800A453C AFBF0014 */ sw $ra, 0x14($sp) -/* B1B6E0 800A4540 85CF0110 */ lh $t7, 0x110($t6) -/* B1B6E4 800A4544 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B1B6E8 800A4548 44814000 */ mtc1 $at, $f8 -/* B1B6EC 800A454C 448F2000 */ mtc1 $t7, $f4 -/* B1B6F0 800A4550 44856000 */ mtc1 $a1, $f12 -/* B1B6F4 800A4554 468021A0 */ cvt.s.w $f6, $f4 -/* B1B6F8 800A4558 44056000 */ mfc1 $a1, $f12 -/* B1B6FC 800A455C 46083002 */ mul.s $f0, $f6, $f8 -/* B1B700 800A4560 44060000 */ mfc1 $a2, $f0 -/* B1B704 800A4564 0C02911E */ jal func_800A4478 -/* B1B708 800A4568 00000000 */ nop -/* B1B70C 800A456C 8FBF0014 */ lw $ra, 0x14($sp) -/* B1B710 800A4570 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1B714 800A4574 03E00008 */ jr $ra -/* B1B718 800A4578 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A46F8.s b/asm/non_matchings/code/z_skelanime/func_800A46F8.s deleted file mode 100644 index 3e21d05f2b..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A46F8.s +++ /dev/null @@ -1,136 +0,0 @@ -.rdata -glabel D_80140500 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140514 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140528 - .asciz "joint_buff_num == this->joint_num" - .balign 4 - -glabel D_8014054C - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140560 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80140568 - .asciz "Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n" - # EUC-JP: メモリアロケーションエラー | Memory allocation error - .balign 4 - -glabel D_8014059C - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_800A46F8 -/* B1B898 800A46F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1B89C 800A46FC AFA40020 */ sw $a0, 0x20($sp) -/* B1B8A0 800A4700 00067100 */ sll $t6, $a2, 4 -/* B1B8A4 800A4704 3C048016 */ lui $a0, %hi(gSegments) # $a0, 0x8016 -/* B1B8A8 800A4708 000E7F02 */ srl $t7, $t6, 0x1c -/* B1B8AC 800A470C 24846FA8 */ addiu $a0, %lo(gSegments) # addiu $a0, $a0, 0x6fa8 -/* B1B8B0 800A4710 000FC080 */ sll $t8, $t7, 2 -/* B1B8B4 800A4714 0098C821 */ addu $t9, $a0, $t8 -/* B1B8B8 800A4718 8F2A0000 */ lw $t2, ($t9) -/* B1B8BC 800A471C 3C0800FF */ lui $t0, (0x00FFFFFF >> 16) # lui $t0, 0xff -/* B1B8C0 800A4720 3508FFFF */ ori $t0, (0x00FFFFFF & 0xFFFF) # ori $t0, $t0, 0xffff -/* B1B8C4 800A4724 00C85824 */ and $t3, $a2, $t0 -/* B1B8C8 800A4728 3C098000 */ lui $t1, 0x8000 -/* B1B8CC 800A472C 014B6021 */ addu $t4, $t2, $t3 -/* B1B8D0 800A4730 AFBF001C */ sw $ra, 0x1c($sp) -/* B1B8D4 800A4734 AFB00018 */ sw $s0, 0x18($sp) -/* B1B8D8 800A4738 AFA7002C */ sw $a3, 0x2c($sp) -/* B1B8DC 800A473C 01891021 */ addu $v0, $t4, $t1 -/* B1B8E0 800A4740 904D0004 */ lbu $t5, 4($v0) -/* B1B8E4 800A4744 00A08025 */ move $s0, $a1 -/* B1B8E8 800A4748 24060BE7 */ li $a2, 3047 -/* B1B8EC 800A474C 25AE0001 */ addiu $t6, $t5, 1 -/* B1B8F0 800A4750 A0AE0000 */ sb $t6, ($a1) -/* B1B8F4 800A4754 904F0008 */ lbu $t7, 8($v0) -/* B1B8F8 800A4758 A0AF0002 */ sb $t7, 2($a1) -/* B1B8FC 800A475C 8C430000 */ lw $v1, ($v0) -/* B1B900 800A4760 0003C100 */ sll $t8, $v1, 4 -/* B1B904 800A4764 0018CF02 */ srl $t9, $t8, 0x1c -/* B1B908 800A4768 00195080 */ sll $t2, $t9, 2 -/* B1B90C 800A476C 008A5821 */ addu $t3, $a0, $t2 -/* B1B910 800A4770 8D6C0000 */ lw $t4, ($t3) -/* B1B914 800A4774 00686824 */ and $t5, $v1, $t0 -/* B1B918 800A4778 018D7021 */ addu $t6, $t4, $t5 -/* B1B91C 800A477C 01C97821 */ addu $t7, $t6, $t1 -/* B1B920 800A4780 ACAF0004 */ sw $t7, 4($a1) -/* B1B924 800A4784 8FB80030 */ lw $t8, 0x30($sp) -/* B1B928 800A4788 8FB90038 */ lw $t9, 0x38($sp) -/* B1B92C 800A478C 57000016 */ bnezl $t8, .L800A47E8 -/* B1B930 800A4790 920A0000 */ lbu $t2, ($s0) -/* B1B934 800A4794 90A40000 */ lbu $a0, ($a1) -/* B1B938 800A4798 3C058014 */ lui $a1, %hi(D_80140500) # $a1, 0x8014 -/* B1B93C 800A479C 24A50500 */ addiu $a1, %lo(D_80140500) # addiu $a1, $a1, 0x500 -/* B1B940 800A47A0 00800821 */ addu $at, $a0, $zero -/* B1B944 800A47A4 00042080 */ sll $a0, $a0, 2 -/* B1B948 800A47A8 00812023 */ subu $a0, $a0, $at -/* B1B94C 800A47AC 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1B950 800A47B0 00042040 */ sll $a0, $a0, 1 -/* B1B954 800A47B4 92040000 */ lbu $a0, ($s0) -/* B1B958 800A47B8 3C058014 */ lui $a1, %hi(D_80140514) # $a1, 0x8014 -/* B1B95C 800A47BC AE020020 */ sw $v0, 0x20($s0) -/* B1B960 800A47C0 00800821 */ addu $at, $a0, $zero -/* B1B964 800A47C4 00042080 */ sll $a0, $a0, 2 -/* B1B968 800A47C8 00812023 */ subu $a0, $a0, $at -/* B1B96C 800A47CC 00042040 */ sll $a0, $a0, 1 -/* B1B970 800A47D0 24A50514 */ addiu $a1, %lo(D_80140514) # addiu $a1, $a1, 0x514 -/* B1B974 800A47D4 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1B978 800A47D8 24060BE8 */ li $a2, 3048 -/* B1B97C 800A47DC 1000000D */ b .L800A4814 -/* B1B980 800A47E0 AE020024 */ sw $v0, 0x24($s0) -/* B1B984 800A47E4 920A0000 */ lbu $t2, ($s0) -.L800A47E8: -/* B1B988 800A47E8 3C048014 */ lui $a0, %hi(D_80140528) # $a0, 0x8014 -/* B1B98C 800A47EC 24840528 */ addiu $a0, %lo(D_80140528) # addiu $a0, $a0, 0x528 -/* B1B990 800A47F0 132A0004 */ beq $t9, $t2, .L800A4804 -/* B1B994 800A47F4 3C058014 */ lui $a1, %hi(D_8014054C) # $a1, 0x8014 -/* B1B998 800A47F8 24A5054C */ addiu $a1, %lo(D_8014054C) # addiu $a1, $a1, 0x54c -/* B1B99C 800A47FC 0C0007FC */ jal __assert -/* B1B9A0 800A4800 24060BEC */ li $a2, 3052 -.L800A4804: -/* B1B9A4 800A4804 8FAB0030 */ lw $t3, 0x30($sp) -/* B1B9A8 800A4808 AE0B0020 */ sw $t3, 0x20($s0) -/* B1B9AC 800A480C 8FAC0034 */ lw $t4, 0x34($sp) -/* B1B9B0 800A4810 AE0C0024 */ sw $t4, 0x24($s0) -.L800A4814: -/* B1B9B4 800A4814 8E0D0020 */ lw $t5, 0x20($s0) -/* B1B9B8 800A4818 3C048014 */ lui $a0, %hi(D_80140560) # $a0, 0x8014 -/* B1B9BC 800A481C 11A00004 */ beqz $t5, .L800A4830 -/* B1B9C0 800A4820 00000000 */ nop -/* B1B9C4 800A4824 8E0E0024 */ lw $t6, 0x24($s0) -/* B1B9C8 800A4828 55C0000A */ bnezl $t6, .L800A4854 -/* B1B9CC 800A482C 8FAF002C */ lw $t7, 0x2c($sp) -.L800A4830: -/* B1B9D0 800A4830 0C00084C */ jal osSyncPrintf -/* B1B9D4 800A4834 24840560 */ addiu $a0, %lo(D_80140560) # addiu $a0, $a0, 0x560 -/* B1B9D8 800A4838 3C048014 */ lui $a0, %hi(D_80140568) # $a0, 0x8014 -/* B1B9DC 800A483C 0C00084C */ jal osSyncPrintf -/* B1B9E0 800A4840 24840568 */ addiu $a0, %lo(D_80140568) # addiu $a0, $a0, 0x568 -/* B1B9E4 800A4844 3C048014 */ lui $a0, %hi(D_8014059C) # $a0, 0x8014 -/* B1B9E8 800A4848 0C00084C */ jal osSyncPrintf -/* B1B9EC 800A484C 2484059C */ addiu $a0, %lo(D_8014059C) # addiu $a0, $a0, 0x59c -/* B1B9F0 800A4850 8FAF002C */ lw $t7, 0x2c($sp) -.L800A4854: -/* B1B9F4 800A4854 02002025 */ move $a0, $s0 -/* B1B9F8 800A4858 51E00004 */ beql $t7, $zero, .L800A486C -/* B1B9FC 800A485C 8FBF001C */ lw $ra, 0x1c($sp) -/* B1BA00 800A4860 0C0294BE */ jal func_800A52F8 -/* B1BA04 800A4864 01E02825 */ move $a1, $t7 -/* B1BA08 800A4868 8FBF001C */ lw $ra, 0x1c($sp) -.L800A486C: -/* B1BA0C 800A486C 8FB00018 */ lw $s0, 0x18($sp) -/* B1BA10 800A4870 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1BA14 800A4874 03E00008 */ jr $ra -/* B1BA18 800A4878 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A487C.s b/asm/non_matchings/code/z_skelanime/func_800A487C.s deleted file mode 100644 index b873d9cf02..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A487C.s +++ /dev/null @@ -1,105 +0,0 @@ -.rdata -glabel D_801405A0 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801405B4 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801405C8 - .asciz "\x1b[31m" - .balign 4 - -glabel D_801405D0 - .asciz "Skeleton_Info2_skin2_ct メモリアロケーションエラー\n" - # EUC-JP: メモリアロケーションエラー | Memory allocation error - .balign 4 - -glabel D_80140604 - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_800A487C -/* B1BA1C 800A487C 00067900 */ sll $t7, $a2, 4 -/* B1BA20 800A4880 3C088016 */ lui $t0, %hi(gSegments) # $t0, 0x8016 -/* B1BA24 800A4884 000FC702 */ srl $t8, $t7, 0x1c -/* B1BA28 800A4888 25086FA8 */ addiu $t0, %lo(gSegments) # addiu $t0, $t0, 0x6fa8 -/* B1BA2C 800A488C 0018C880 */ sll $t9, $t8, 2 -/* B1BA30 800A4890 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1BA34 800A4894 01195821 */ addu $t3, $t0, $t9 -/* B1BA38 800A4898 8D6C0000 */ lw $t4, ($t3) -/* B1BA3C 800A489C 3C0900FF */ lui $t1, (0x00FFFFFF >> 16) # lui $t1, 0xff -/* B1BA40 800A48A0 3529FFFF */ ori $t1, (0x00FFFFFF & 0xFFFF) # ori $t1, $t1, 0xffff -/* B1BA44 800A48A4 00C96824 */ and $t5, $a2, $t1 -/* B1BA48 800A48A8 3C0A8000 */ lui $t2, 0x8000 -/* B1BA4C 800A48AC 018D7821 */ addu $t7, $t4, $t5 -/* B1BA50 800A48B0 AFBF001C */ sw $ra, 0x1c($sp) -/* B1BA54 800A48B4 AFB00018 */ sw $s0, 0x18($sp) -/* B1BA58 800A48B8 AFA40020 */ sw $a0, 0x20($sp) -/* B1BA5C 800A48BC AFA60028 */ sw $a2, 0x28($sp) -/* B1BA60 800A48C0 AFA7002C */ sw $a3, 0x2c($sp) -/* B1BA64 800A48C4 01EA1021 */ addu $v0, $t7, $t2 -/* B1BA68 800A48C8 90580004 */ lbu $t8, 4($v0) -/* B1BA6C 800A48CC 00A08025 */ move $s0, $a1 -/* B1BA70 800A48D0 24060C30 */ li $a2, 3120 -/* B1BA74 800A48D4 27190001 */ addiu $t9, $t8, 1 -/* B1BA78 800A48D8 A0B90000 */ sb $t9, ($a1) -/* B1BA7C 800A48DC 8C430000 */ lw $v1, ($v0) -/* B1BA80 800A48E0 90A40000 */ lbu $a0, ($a1) -/* B1BA84 800A48E4 00035900 */ sll $t3, $v1, 4 -/* B1BA88 800A48E8 000B7702 */ srl $t6, $t3, 0x1c -/* B1BA8C 800A48EC 000E6080 */ sll $t4, $t6, 2 -/* B1BA90 800A48F0 010C6821 */ addu $t5, $t0, $t4 -/* B1BA94 800A48F4 8DAF0000 */ lw $t7, ($t5) -/* B1BA98 800A48F8 0069C024 */ and $t8, $v1, $t1 -/* B1BA9C 800A48FC 00800821 */ addu $at, $a0, $zero -/* B1BAA0 800A4900 01F8C821 */ addu $t9, $t7, $t8 -/* B1BAA4 800A4904 032A5821 */ addu $t3, $t9, $t2 -/* B1BAA8 800A4908 ACAB0004 */ sw $t3, 4($a1) -/* B1BAAC 800A490C 00042080 */ sll $a0, $a0, 2 -/* B1BAB0 800A4910 00812023 */ subu $a0, $a0, $at -/* B1BAB4 800A4914 3C058014 */ lui $a1, %hi(D_801405A0) # $a1, 0x8014 -/* B1BAB8 800A4918 24A505A0 */ addiu $a1, %lo(D_801405A0) # addiu $a1, $a1, 0x5a0 -/* B1BABC 800A491C 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1BAC0 800A4920 00042040 */ sll $a0, $a0, 1 -/* B1BAC4 800A4924 92040000 */ lbu $a0, ($s0) -/* B1BAC8 800A4928 3C058014 */ lui $a1, %hi(D_801405B4) # $a1, 0x8014 -/* B1BACC 800A492C AE020020 */ sw $v0, 0x20($s0) -/* B1BAD0 800A4930 00800821 */ addu $at, $a0, $zero -/* B1BAD4 800A4934 00042080 */ sll $a0, $a0, 2 -/* B1BAD8 800A4938 00812023 */ subu $a0, $a0, $at -/* B1BADC 800A493C 00042040 */ sll $a0, $a0, 1 -/* B1BAE0 800A4940 24A505B4 */ addiu $a1, %lo(D_801405B4) # addiu $a1, $a1, 0x5b4 -/* B1BAE4 800A4944 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1BAE8 800A4948 24060C31 */ li $a2, 3121 -/* B1BAEC 800A494C 8E0E0020 */ lw $t6, 0x20($s0) -/* B1BAF0 800A4950 AE020024 */ sw $v0, 0x24($s0) -/* B1BAF4 800A4954 3C048014 */ lui $a0, %hi(D_801405C8) # $a0, 0x8014 -/* B1BAF8 800A4958 11C00003 */ beqz $t6, .L800A4968 -/* B1BAFC 800A495C 00000000 */ nop -/* B1BB00 800A4960 5440000A */ bnezl $v0, .L800A498C -/* B1BB04 800A4964 8FA5002C */ lw $a1, 0x2c($sp) -.L800A4968: -/* B1BB08 800A4968 0C00084C */ jal osSyncPrintf -/* B1BB0C 800A496C 248405C8 */ addiu $a0, %lo(D_801405C8) # addiu $a0, $a0, 0x5c8 -/* B1BB10 800A4970 3C048014 */ lui $a0, %hi(D_801405D0) # $a0, 0x8014 -/* B1BB14 800A4974 0C00084C */ jal osSyncPrintf -/* B1BB18 800A4978 248405D0 */ addiu $a0, %lo(D_801405D0) # addiu $a0, $a0, 0x5d0 -/* B1BB1C 800A497C 3C048014 */ lui $a0, %hi(D_80140604) # $a0, 0x8014 -/* B1BB20 800A4980 0C00084C */ jal osSyncPrintf -/* B1BB24 800A4984 24840604 */ addiu $a0, %lo(D_80140604) # addiu $a0, $a0, 0x604 -/* B1BB28 800A4988 8FA5002C */ lw $a1, 0x2c($sp) -.L800A498C: -/* B1BB2C 800A498C 50A00004 */ beql $a1, $zero, .L800A49A0 -/* B1BB30 800A4990 8FBF001C */ lw $ra, 0x1c($sp) -/* B1BB34 800A4994 0C0294BE */ jal func_800A52F8 -/* B1BB38 800A4998 02002025 */ move $a0, $s0 -/* B1BB3C 800A499C 8FBF001C */ lw $ra, 0x1c($sp) -.L800A49A0: -/* B1BB40 800A49A0 8FB00018 */ lw $s0, 0x18($sp) -/* B1BB44 800A49A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1BB48 800A49A8 03E00008 */ jr $ra -/* B1BB4C 800A49AC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A49B0.s b/asm/non_matchings/code/z_skelanime/func_800A49B0.s deleted file mode 100644 index 1c48c71a4c..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A49B0.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_800A49B0 -/* B1BB50 800A49B0 90820001 */ lbu $v0, 1($a0) -/* B1BB54 800A49B4 3C0E800A */ lui $t6, %hi(func_800A4D9C) # $t6, 0x800a -/* B1BB58 800A49B8 25CE4D9C */ addiu $t6, %lo(func_800A4D9C) # addiu $t6, $t6, 0x4d9c -/* B1BB5C 800A49BC 28410002 */ slti $at, $v0, 2 -/* B1BB60 800A49C0 50200004 */ beql $at, $zero, .L800A49D4 -/* B1BB64 800A49C4 28410004 */ slti $at, $v0, 4 -/* B1BB68 800A49C8 03E00008 */ jr $ra -/* B1BB6C 800A49CC AC8E0030 */ sw $t6, 0x30($a0) -/* B1BB70 800A49D0 28410004 */ slti $at, $v0, 4 -.L800A49D4: -/* B1BB74 800A49D4 10200005 */ beqz $at, .L800A49EC -/* B1BB78 800A49D8 3C18800A */ lui $t8, %hi(func_800A4E38) -/* B1BB7C 800A49DC 3C0F800A */ lui $t7, %hi(func_800A4EE0) # $t7, 0x800a -/* B1BB80 800A49E0 25EF4EE0 */ addiu $t7, %lo(func_800A4EE0) # addiu $t7, $t7, 0x4ee0 -/* B1BB84 800A49E4 03E00008 */ jr $ra -/* B1BB88 800A49E8 AC8F0030 */ sw $t7, 0x30($a0) -.L800A49EC: -/* B1BB8C 800A49EC 27184E38 */ addiu $t8, %lo(func_800A4E38) -/* B1BB90 800A49F0 AC980030 */ sw $t8, 0x30($a0) -/* B1BB94 800A49F4 03E00008 */ jr $ra -/* B1BB98 800A49F8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4A20.s b/asm/non_matchings/code/z_skelanime/func_800A4A20.s index 04df19448c..637bf1a0db 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A4A20.s +++ b/asm/non_matchings/code/z_skelanime/func_800A4A20.s @@ -20,15 +20,15 @@ glabel func_800A4A20 /* B1BBF4 800A4A54 46000306 */ mov.s $f12, $f0 /* B1BBF8 800A4A58 00808025 */ move $s0, $a0 /* B1BBFC 800A4A5C 46083082 */ mul.s $f2, $f6, $f8 -/* B1BC00 800A4A60 00000000 */ nop +/* B1BC00 800A4A60 00000000 */ nop /* B1BC04 800A4A64 46025402 */ mul.s $f16, $f10, $f2 /* B1BC08 800A4A68 46100481 */ sub.s $f18, $f0, $f16 /* B1BC0C 800A4A6C E4920028 */ swc1 $f18, 0x28($a0) /* B1BC10 800A4A70 C4800028 */ lwc1 $f0, 0x28($a0) /* B1BC14 800A4A74 4604003E */ c.le.s $f0, $f4 -/* B1BC18 800A4A78 00000000 */ nop +/* B1BC18 800A4A78 00000000 */ nop /* B1BC1C 800A4A7C 45000007 */ bc1f .L800A4A9C -/* B1BC20 800A4A80 00000000 */ nop +/* B1BC20 800A4A80 00000000 */ nop /* B1BC24 800A4A84 0C02926C */ jal func_800A49B0 /* B1BC28 800A4A88 E7AC002C */ swc1 $f12, 0x2c($sp) /* B1BC2C 800A4A8C 44803000 */ mtc1 $zero, $f6 @@ -51,4 +51,3 @@ glabel func_800A4A20 /* B1BC6C 800A4ACC 27BD0030 */ addiu $sp, $sp, 0x30 /* B1BC70 800A4AD0 03E00008 */ jr $ra /* B1BC74 800A4AD4 00001025 */ move $v0, $zero - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4C58.s b/asm/non_matchings/code/z_skelanime/func_800A4C58.s index 0a0f6d6419..a3d3e672da 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A4C58.s +++ b/asm/non_matchings/code/z_skelanime/func_800A4C58.s @@ -14,8 +14,8 @@ glabel func_800A4C58 /* B1BE14 800A4C74 4600218D */ trunc.w.s $f6, $f4 /* B1BE18 800A4C78 8C840008 */ lw $a0, 8($a0) /* B1BE1C 800A4C7C 44053000 */ mfc1 $a1, $f6 -/* B1BE20 800A4C80 0C028763 */ jal func_800A1D8C -/* B1BE24 800A4C84 00000000 */ nop +/* B1BE20 800A4C80 0C028763 */ jal SkelAnime_AnimateFrame +/* B1BE24 800A4C84 00000000 */ nop /* B1BE28 800A4C88 920F0001 */ lbu $t7, 1($s0) /* B1BE2C 800A4C8C 27A70038 */ addiu $a3, $sp, 0x38 /* B1BE30 800A4C90 31F80001 */ andi $t8, $t7, 1 @@ -26,7 +26,7 @@ glabel func_800A4C58 /* B1BE44 800A4CA4 4600020D */ trunc.w.s $f8, $f0 /* B1BE48 800A4CA8 4600910D */ trunc.w.s $f4, $f18 /* B1BE4C 800A4CAC 44054000 */ mfc1 $a1, $f8 -/* B1BE50 800A4CB0 00000000 */ nop +/* B1BE50 800A4CB0 00000000 */ nop /* B1BE54 800A4CB4 44855000 */ mtc1 $a1, $f10 /* B1BE58 800A4CB8 44092000 */ mfc1 $t1, $f4 /* B1BE5C 800A4CBC 24A50001 */ addiu $a1, $a1, 1 @@ -38,7 +38,7 @@ glabel func_800A4C58 .L800A4CD4: /* B1BE74 800A4CD4 8E040008 */ lw $a0, 8($s0) /* B1BE78 800A4CD8 92060000 */ lbu $a2, ($s0) -/* B1BE7C 800A4CDC 0C028763 */ jal func_800A1D8C +/* B1BE7C 800A4CDC 0C028763 */ jal SkelAnime_AnimateFrame /* B1BE80 800A4CE0 E7A20030 */ swc1 $f2, 0x30($sp) /* B1BE84 800A4CE4 C7A20030 */ lwc1 $f2, 0x30($sp) /* B1BE88 800A4CE8 8E050020 */ lw $a1, 0x20($s0) @@ -52,7 +52,7 @@ glabel func_800A4C58 /* B1BEA4 800A4D04 44803000 */ mtc1 $zero, $f6 /* B1BEA8 800A4D08 3C0A8016 */ lui $t2, %hi(gGameInfo) # $t2, 0x8016 /* B1BEAC 800A4D0C 46003032 */ c.eq.s $f6, $f0 -/* B1BEB0 800A4D10 00000000 */ nop +/* B1BEB0 800A4D10 00000000 */ nop /* B1BEB4 800A4D14 4503001D */ bc1tl .L800A4D8C /* B1BEB8 800A4D18 8FBF0024 */ lw $ra, 0x24($sp) /* B1BEBC 800A4D1C 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) @@ -62,18 +62,18 @@ glabel func_800A4C58 /* B1BECC 800A4D2C C612002C */ lwc1 $f18, 0x2c($s0) /* B1BED0 800A4D30 44806000 */ mtc1 $zero, $f12 /* B1BED4 800A4D34 448B4000 */ mtc1 $t3, $f8 -/* B1BED8 800A4D38 00000000 */ nop +/* B1BED8 800A4D38 00000000 */ nop /* B1BEDC 800A4D3C 468042A0 */ cvt.s.w $f10, $f8 /* B1BEE0 800A4D40 46105082 */ mul.s $f2, $f10, $f16 -/* B1BEE4 800A4D44 00000000 */ nop +/* B1BEE4 800A4D44 00000000 */ nop /* B1BEE8 800A4D48 46029102 */ mul.s $f4, $f18, $f2 /* B1BEEC 800A4D4C 46040181 */ sub.s $f6, $f0, $f4 /* B1BEF0 800A4D50 E6060028 */ swc1 $f6, 0x28($s0) /* B1BEF4 800A4D54 C6000028 */ lwc1 $f0, 0x28($s0) /* B1BEF8 800A4D58 460C003E */ c.le.s $f0, $f12 -/* B1BEFC 800A4D5C 00000000 */ nop +/* B1BEFC 800A4D5C 00000000 */ nop /* B1BF00 800A4D60 45000003 */ bc1f .L800A4D70 -/* B1BF04 800A4D64 00000000 */ nop +/* B1BF04 800A4D64 00000000 */ nop /* B1BF08 800A4D68 10000007 */ b .L800A4D88 /* B1BF0C 800A4D6C E60C0028 */ swc1 $f12, 0x28($s0) .L800A4D70: @@ -89,5 +89,5 @@ glabel func_800A4C58 /* B1BF2C 800A4D8C 8FB00020 */ lw $s0, 0x20($sp) /* B1BF30 800A4D90 27BD0290 */ addiu $sp, $sp, 0x290 /* B1BF34 800A4D94 03E00008 */ jr $ra -/* B1BF38 800A4D98 00000000 */ nop +/* B1BF38 800A4D98 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/func_800A4EE0.s b/asm/non_matchings/code/z_skelanime/func_800A4EE0.s deleted file mode 100644 index 3aac74911e..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4EE0.s +++ /dev/null @@ -1,77 +0,0 @@ -.late_rodata -glabel D_8014067C - .float 0.33333334 - -.text -glabel func_800A4EE0 -/* B1C080 800A4EE0 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 -/* B1C084 800A4EE4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1C088 800A4EE8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1C08C 800A4EEC AFBF001C */ sw $ra, 0x1c($sp) -/* B1C090 800A4EF0 AFB00018 */ sw $s0, 0x18($sp) -/* B1C094 800A4EF4 85CF0110 */ lh $t7, 0x110($t6) -/* B1C098 800A4EF8 C4800018 */ lwc1 $f0, 0x18($a0) -/* B1C09C 800A4EFC C48C0010 */ lwc1 $f12, 0x10($a0) -/* B1C0A0 800A4F00 448F2000 */ mtc1 $t7, $f4 -/* B1C0A4 800A4F04 3C018014 */ lui $at, %hi(D_8014067C) -/* B1C0A8 800A4F08 46006032 */ c.eq.s $f12, $f0 -/* B1C0AC 800A4F0C C428067C */ lwc1 $f8, %lo(D_8014067C)($at) -/* B1C0B0 800A4F10 468021A0 */ cvt.s.w $f6, $f4 -/* B1C0B4 800A4F14 00808025 */ move $s0, $a0 -/* B1C0B8 800A4F18 46083382 */ mul.s $f14, $f6, $f8 -/* B1C0BC 800A4F1C 4502000D */ bc1fl .L800A4F54 -/* B1C0C0 800A4F20 C602001C */ lwc1 $f2, 0x1c($s0) -/* B1C0C4 800A4F24 4600028D */ trunc.w.s $f10, $f0 -/* B1C0C8 800A4F28 8C840008 */ lw $a0, 8($a0) -/* B1C0CC 800A4F2C 92060000 */ lbu $a2, ($s0) -/* B1C0D0 800A4F30 8E070020 */ lw $a3, 0x20($s0) -/* B1C0D4 800A4F34 44055000 */ mfc1 $a1, $f10 -/* B1C0D8 800A4F38 0C028763 */ jal func_800A1D8C -/* B1C0DC 800A4F3C 00000000 */ nop -/* B1C0E0 800A4F40 0C029316 */ jal func_800A4C58 -/* B1C0E4 800A4F44 02002025 */ move $a0, $s0 -/* B1C0E8 800A4F48 10000021 */ b .L800A4FD0 -/* B1C0EC 800A4F4C 24020001 */ li $v0, 1 -/* B1C0F0 800A4F50 C602001C */ lwc1 $f2, 0x1c($s0) -.L800A4F54: -/* B1C0F4 800A4F54 44808000 */ mtc1 $zero, $f16 -/* B1C0F8 800A4F58 460E1482 */ mul.s $f18, $f2, $f14 -/* B1C0FC 800A4F5C 46120100 */ add.s $f4, $f0, $f18 -/* B1C100 800A4F60 E6040018 */ swc1 $f4, 0x18($s0) -/* B1C104 800A4F64 C6000018 */ lwc1 $f0, 0x18($s0) -/* B1C108 800A4F68 460C0181 */ sub.s $f6, $f0, $f12 -/* B1C10C 800A4F6C 46023202 */ mul.s $f8, $f6, $f2 -/* B1C110 800A4F70 4608803C */ c.lt.s $f16, $f8 -/* B1C114 800A4F74 00000000 */ nop -/* B1C118 800A4F78 45020004 */ bc1fl .L800A4F8C -/* B1C11C 800A4F7C 4610003C */ c.lt.s $f0, $f16 -/* B1C120 800A4F80 10000010 */ b .L800A4FC4 -/* B1C124 800A4F84 E60C0018 */ swc1 $f12, 0x18($s0) -/* B1C128 800A4F88 4610003C */ c.lt.s $f0, $f16 -.L800A4F8C: -/* B1C12C 800A4F8C 00000000 */ nop -/* B1C130 800A4F90 45020006 */ bc1fl .L800A4FAC -/* B1C134 800A4F94 C6020014 */ lwc1 $f2, 0x14($s0) -/* B1C138 800A4F98 C60A0014 */ lwc1 $f10, 0x14($s0) -/* B1C13C 800A4F9C 460A0480 */ add.s $f18, $f0, $f10 -/* B1C140 800A4FA0 10000008 */ b .L800A4FC4 -/* B1C144 800A4FA4 E6120018 */ swc1 $f18, 0x18($s0) -/* B1C148 800A4FA8 C6020014 */ lwc1 $f2, 0x14($s0) -.L800A4FAC: -/* B1C14C 800A4FAC 4600103E */ c.le.s $f2, $f0 -/* B1C150 800A4FB0 00000000 */ nop -/* B1C154 800A4FB4 45000003 */ bc1f .L800A4FC4 -/* B1C158 800A4FB8 00000000 */ nop -/* B1C15C 800A4FBC 46020101 */ sub.s $f4, $f0, $f2 -/* B1C160 800A4FC0 E6040018 */ swc1 $f4, 0x18($s0) -.L800A4FC4: -/* B1C164 800A4FC4 0C029316 */ jal func_800A4C58 -/* B1C168 800A4FC8 02002025 */ move $a0, $s0 -/* B1C16C 800A4FCC 00001025 */ move $v0, $zero -.L800A4FD0: -/* B1C170 800A4FD0 8FBF001C */ lw $ra, 0x1c($sp) -/* B1C174 800A4FD4 8FB00018 */ lw $s0, 0x18($sp) -/* B1C178 800A4FD8 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1C17C 800A4FDC 03E00008 */ jr $ra -/* B1C180 800A4FE0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A51E8.s b/asm/non_matchings/code/z_skelanime/func_800A51E8.s deleted file mode 100644 index 9dd3dc73c0..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A51E8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800A51E8 -/* B1C388 800A51E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C38C 800A51EC AFBF0024 */ sw $ra, 0x24($sp) -/* B1C390 800A51F0 AFA40028 */ sw $a0, 0x28($sp) -/* B1C394 800A51F4 AFA5002C */ sw $a1, 0x2c($sp) -/* B1C398 800A51F8 0C028800 */ jal SkelAnime_GetFrameCount -/* B1C39C 800A51FC 00A02025 */ move $a0, $a1 -/* B1C3A0 800A5200 44822000 */ mtc1 $v0, $f4 -/* B1C3A4 800A5204 44800000 */ mtc1 $zero, $f0 -/* B1C3A8 800A5208 240E0002 */ li $t6, 2 -/* B1C3AC 800A520C 468021A0 */ cvt.s.w $f6, $f4 -/* B1C3B0 800A5210 44070000 */ mfc1 $a3, $f0 -/* B1C3B4 800A5214 AFAE0014 */ sw $t6, 0x14($sp) -/* B1C3B8 800A5218 8FA40028 */ lw $a0, 0x28($sp) -/* B1C3BC 800A521C 8FA5002C */ lw $a1, 0x2c($sp) -/* B1C3C0 800A5220 3C063F80 */ lui $a2, 0x3f80 -/* B1C3C4 800A5224 E7A60010 */ swc1 $f6, 0x10($sp) -/* B1C3C8 800A5228 0C029468 */ jal SkelAnime_ChangeAnimation -/* B1C3CC 800A522C E7A00018 */ swc1 $f0, 0x18($sp) -/* B1C3D0 800A5230 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C3D4 800A5234 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C3D8 800A5238 03E00008 */ jr $ra -/* B1C3DC 800A523C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A5240.s b/asm/non_matchings/code/z_skelanime/func_800A5240.s deleted file mode 100644 index ea3265ce69..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A5240.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_800A5240 -/* B1C3E0 800A5240 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C3E4 800A5244 AFBF0024 */ sw $ra, 0x24($sp) -/* B1C3E8 800A5248 AFA40028 */ sw $a0, 0x28($sp) -/* B1C3EC 800A524C AFA5002C */ sw $a1, 0x2c($sp) -/* B1C3F0 800A5250 AFA60030 */ sw $a2, 0x30($sp) -/* B1C3F4 800A5254 0C028800 */ jal SkelAnime_GetFrameCount -/* B1C3F8 800A5258 00A02025 */ move $a0, $a1 -/* B1C3FC 800A525C 44822000 */ mtc1 $v0, $f4 -/* B1C400 800A5260 C7A80030 */ lwc1 $f8, 0x30($sp) -/* B1C404 800A5264 240E0002 */ li $t6, 2 -/* B1C408 800A5268 468021A0 */ cvt.s.w $f6, $f4 -/* B1C40C 800A526C AFAE0014 */ sw $t6, 0x14($sp) -/* B1C410 800A5270 8FA40028 */ lw $a0, 0x28($sp) -/* B1C414 800A5274 8FA5002C */ lw $a1, 0x2c($sp) -/* B1C418 800A5278 3C063F80 */ lui $a2, 0x3f80 -/* B1C41C 800A527C 24070000 */ li $a3, 0 -/* B1C420 800A5280 E7A60010 */ swc1 $f6, 0x10($sp) -/* B1C424 800A5284 0C029468 */ jal SkelAnime_ChangeAnimation -/* B1C428 800A5288 E7A80018 */ swc1 $f8, 0x18($sp) -/* B1C42C 800A528C 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C430 800A5290 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C434 800A5294 03E00008 */ jr $ra -/* B1C438 800A5298 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A529C.s b/asm/non_matchings/code/z_skelanime/func_800A529C.s deleted file mode 100644 index 7898c1bf07..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A529C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_800A529C -/* B1C43C 800A529C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C440 800A52A0 AFBF0024 */ sw $ra, 0x24($sp) -/* B1C444 800A52A4 AFA40028 */ sw $a0, 0x28($sp) -/* B1C448 800A52A8 AFA5002C */ sw $a1, 0x2c($sp) -/* B1C44C 800A52AC AFA60030 */ sw $a2, 0x30($sp) -/* B1C450 800A52B0 0C028800 */ jal SkelAnime_GetFrameCount -/* B1C454 800A52B4 00A02025 */ move $a0, $a1 -/* B1C458 800A52B8 44822000 */ mtc1 $v0, $f4 -/* B1C45C 800A52BC 44800000 */ mtc1 $zero, $f0 -/* B1C460 800A52C0 240E0002 */ li $t6, 2 -/* B1C464 800A52C4 468021A0 */ cvt.s.w $f6, $f4 -/* B1C468 800A52C8 44070000 */ mfc1 $a3, $f0 -/* B1C46C 800A52CC AFAE0014 */ sw $t6, 0x14($sp) -/* B1C470 800A52D0 8FA40028 */ lw $a0, 0x28($sp) -/* B1C474 800A52D4 8FA5002C */ lw $a1, 0x2c($sp) -/* B1C478 800A52D8 8FA60030 */ lw $a2, 0x30($sp) -/* B1C47C 800A52DC E7A60010 */ swc1 $f6, 0x10($sp) -/* B1C480 800A52E0 0C029468 */ jal SkelAnime_ChangeAnimation -/* B1C484 800A52E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* B1C488 800A52E8 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C48C 800A52EC 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C490 800A52F0 03E00008 */ jr $ra -/* B1C494 800A52F4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A52F8.s b/asm/non_matchings/code/z_skelanime/func_800A52F8.s deleted file mode 100644 index 1b2d268e62..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A52F8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_800A52F8 -/* B1C498 800A52F8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C49C 800A52FC AFBF0024 */ sw $ra, 0x24($sp) -/* B1C4A0 800A5300 AFA40028 */ sw $a0, 0x28($sp) -/* B1C4A4 800A5304 AFA5002C */ sw $a1, 0x2c($sp) -/* B1C4A8 800A5308 0C028800 */ jal SkelAnime_GetFrameCount -/* B1C4AC 800A530C 00A02025 */ move $a0, $a1 -/* B1C4B0 800A5310 44822000 */ mtc1 $v0, $f4 -/* B1C4B4 800A5314 44800000 */ mtc1 $zero, $f0 -/* B1C4B8 800A5318 8FA40028 */ lw $a0, 0x28($sp) -/* B1C4BC 800A531C 468021A0 */ cvt.s.w $f6, $f4 -/* B1C4C0 800A5320 44070000 */ mfc1 $a3, $f0 -/* B1C4C4 800A5324 8FA5002C */ lw $a1, 0x2c($sp) -/* B1C4C8 800A5328 3C063F80 */ lui $a2, 0x3f80 -/* B1C4CC 800A532C AFA00014 */ sw $zero, 0x14($sp) -/* B1C4D0 800A5330 E7A00018 */ swc1 $f0, 0x18($sp) -/* B1C4D4 800A5334 0C029468 */ jal SkelAnime_ChangeAnimation -/* B1C4D8 800A5338 E7A60010 */ swc1 $f6, 0x10($sp) -/* B1C4DC 800A533C 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C4E0 800A5340 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C4E4 800A5344 03E00008 */ jr $ra -/* B1C4E8 800A5348 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A534C.s b/asm/non_matchings/code/z_skelanime/func_800A534C.s deleted file mode 100644 index 5e43743869..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A534C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800A534C -/* B1C4EC 800A534C 44800000 */ mtc1 $zero, $f0 -/* B1C4F0 800A5350 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C4F4 800A5354 44866000 */ mtc1 $a2, $f12 -/* B1C4F8 800A5358 AFBF0024 */ sw $ra, 0x24($sp) -/* B1C4FC 800A535C 44070000 */ mfc1 $a3, $f0 -/* B1C500 800A5360 3C063F80 */ lui $a2, 0x3f80 -/* B1C504 800A5364 AFA00014 */ sw $zero, 0x14($sp) -/* B1C508 800A5368 E7A00010 */ swc1 $f0, 0x10($sp) -/* B1C50C 800A536C 0C029468 */ jal SkelAnime_ChangeAnimation -/* B1C510 800A5370 E7AC0018 */ swc1 $f12, 0x18($sp) -/* B1C514 800A5374 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C518 800A5378 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C51C 800A537C 03E00008 */ jr $ra -/* B1C520 800A5380 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A5384.s b/asm/non_matchings/code/z_skelanime/func_800A5384.s deleted file mode 100644 index 5b3adaaef7..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A5384.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800A5384 -/* B1C524 800A5384 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C528 800A5388 AFBF0024 */ sw $ra, 0x24($sp) -/* B1C52C 800A538C AFA40028 */ sw $a0, 0x28($sp) -/* B1C530 800A5390 AFA5002C */ sw $a1, 0x2c($sp) -/* B1C534 800A5394 AFA60030 */ sw $a2, 0x30($sp) -/* B1C538 800A5398 0C028800 */ jal SkelAnime_GetFrameCount -/* B1C53C 800A539C 00A02025 */ move $a0, $a1 -/* B1C540 800A53A0 44822000 */ mtc1 $v0, $f4 -/* B1C544 800A53A4 44800000 */ mtc1 $zero, $f0 -/* B1C548 800A53A8 8FA40028 */ lw $a0, 0x28($sp) -/* B1C54C 800A53AC 468021A0 */ cvt.s.w $f6, $f4 -/* B1C550 800A53B0 44070000 */ mfc1 $a3, $f0 -/* B1C554 800A53B4 8FA5002C */ lw $a1, 0x2c($sp) -/* B1C558 800A53B8 8FA60030 */ lw $a2, 0x30($sp) -/* B1C55C 800A53BC AFA00014 */ sw $zero, 0x14($sp) -/* B1C560 800A53C0 E7A00018 */ swc1 $f0, 0x18($sp) -/* B1C564 800A53C4 0C029468 */ jal SkelAnime_ChangeAnimation -/* B1C568 800A53C8 E7A60010 */ swc1 $f6, 0x10($sp) -/* B1C56C 800A53CC 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C570 800A53D0 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C574 800A53D4 03E00008 */ jr $ra -/* B1C578 800A53D8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A53DC.s b/asm/non_matchings/code/z_skelanime/func_800A53DC.s deleted file mode 100644 index b35d39022a..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A53DC.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800A53DC -/* B1C57C 800A53DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1C580 800A53E0 AFBF0014 */ sw $ra, 0x14($sp) -/* B1C584 800A53E4 C4840014 */ lwc1 $f4, 0x14($a0) -/* B1C588 800A53E8 240E0002 */ li $t6, 2 -/* B1C58C 800A53EC A08E0001 */ sb $t6, 1($a0) -/* B1C590 800A53F0 0C02926C */ jal func_800A49B0 -/* B1C594 800A53F4 E4840010 */ swc1 $f4, 0x10($a0) -/* B1C598 800A53F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B1C59C 800A53FC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1C5A0 800A5400 03E00008 */ jr $ra -/* B1C5A4 800A5404 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A5428.s b/asm/non_matchings/code/z_skelanime/func_800A5428.s deleted file mode 100644 index 4cb8230d33..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A5428.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_800A5428 -/* B1C5C8 800A5428 27BDFFF8 */ addiu $sp, $sp, -8 -/* B1C5CC 800A542C AFB00004 */ sw $s0, 4($sp) -/* B1C5D0 800A5430 90830000 */ lbu $v1, ($a0) -/* B1C5D4 800A5434 00A08025 */ move $s0, $a1 -/* B1C5D8 800A5438 00001025 */ move $v0, $zero -/* B1C5DC 800A543C 58600012 */ blezl $v1, .L800A5488 -/* B1C5E0 800A5440 8FB00004 */ lw $s0, 4($sp) -.L800A5444: -/* B1C5E4 800A5444 90E50000 */ lbu $a1, ($a3) -/* B1C5E8 800A5448 24420001 */ addiu $v0, $v0, 1 -/* B1C5EC 800A544C 24E70001 */ addiu $a3, $a3, 1 -/* B1C5F0 800A5450 50A00009 */ beql $a1, $zero, .L800A5478 -/* B1C5F4 800A5454 0043082A */ slt $at, $v0, $v1 -/* B1C5F8 800A5458 88CF0000 */ lwl $t7, ($a2) -/* B1C5FC 800A545C 98CF0003 */ lwr $t7, 3($a2) -/* B1C600 800A5460 AA0F0000 */ swl $t7, ($s0) -/* B1C604 800A5464 BA0F0003 */ swr $t7, 3($s0) -/* B1C608 800A5468 94CF0004 */ lhu $t7, 4($a2) -/* B1C60C 800A546C A60F0004 */ sh $t7, 4($s0) -/* B1C610 800A5470 90830000 */ lbu $v1, ($a0) -/* B1C614 800A5474 0043082A */ slt $at, $v0, $v1 -.L800A5478: -/* B1C618 800A5478 26100006 */ addiu $s0, $s0, 6 -/* B1C61C 800A547C 1420FFF1 */ bnez $at, .L800A5444 -/* B1C620 800A5480 24C60006 */ addiu $a2, $a2, 6 -/* B1C624 800A5484 8FB00004 */ lw $s0, 4($sp) -.L800A5488: -/* B1C628 800A5488 03E00008 */ jr $ra -/* B1C62C 800A548C 27BD0008 */ addiu $sp, $sp, 8 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A5490.s b/asm/non_matchings/code/z_skelanime/func_800A5490.s deleted file mode 100644 index 5a92919a18..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A5490.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800A5490 -/* B1C630 800A5490 27BDFFF8 */ addiu $sp, $sp, -8 -/* B1C634 800A5494 AFB00004 */ sw $s0, 4($sp) -/* B1C638 800A5498 90830000 */ lbu $v1, ($a0) -/* B1C63C 800A549C 00A08025 */ move $s0, $a1 -/* B1C640 800A54A0 00001025 */ move $v0, $zero -/* B1C644 800A54A4 58600013 */ blezl $v1, .L800A54F4 -/* B1C648 800A54A8 8FB00004 */ lw $s0, 4($sp) -.L800A54AC: -/* B1C64C 800A54AC 90E50000 */ lbu $a1, ($a3) -/* B1C650 800A54B0 24420001 */ addiu $v0, $v0, 1 -/* B1C654 800A54B4 24E70001 */ addiu $a3, $a3, 1 -/* B1C658 800A54B8 2CA50001 */ sltiu $a1, $a1, 1 -/* B1C65C 800A54BC 50A00009 */ beql $a1, $zero, .L800A54E4 -/* B1C660 800A54C0 0043082A */ slt $at, $v0, $v1 -/* B1C664 800A54C4 88CF0000 */ lwl $t7, ($a2) -/* B1C668 800A54C8 98CF0003 */ lwr $t7, 3($a2) -/* B1C66C 800A54CC AA0F0000 */ swl $t7, ($s0) -/* B1C670 800A54D0 BA0F0003 */ swr $t7, 3($s0) -/* B1C674 800A54D4 94CF0004 */ lhu $t7, 4($a2) -/* B1C678 800A54D8 A60F0004 */ sh $t7, 4($s0) -/* B1C67C 800A54DC 90830000 */ lbu $v1, ($a0) -/* B1C680 800A54E0 0043082A */ slt $at, $v0, $v1 -.L800A54E4: -/* B1C684 800A54E4 26100006 */ addiu $s0, $s0, 6 -/* B1C688 800A54E8 1420FFF0 */ bnez $at, .L800A54AC -/* B1C68C 800A54EC 24C60006 */ addiu $a2, $a2, 6 -/* B1C690 800A54F0 8FB00004 */ lw $s0, 4($sp) -.L800A54F4: -/* B1C694 800A54F4 03E00008 */ jr $ra -/* B1C698 800A54F8 27BD0008 */ addiu $sp, $sp, 8 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A54FC.s b/asm/non_matchings/code/z_skelanime/func_800A54FC.s deleted file mode 100644 index 2f6b917efe..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A54FC.s +++ /dev/null @@ -1,123 +0,0 @@ -glabel func_800A54FC -/* B1C69C 800A54FC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B1C6A0 800A5500 AFBF0034 */ sw $ra, 0x34($sp) -/* B1C6A4 800A5504 AFB10030 */ sw $s1, 0x30($sp) -/* B1C6A8 800A5508 AFB0002C */ sw $s0, 0x2c($sp) -/* B1C6AC 800A550C F7B80020 */ sdc1 $f24, 0x20($sp) -/* B1C6B0 800A5510 F7B60018 */ sdc1 $f22, 0x18($sp) -/* B1C6B4 800A5514 F7B40010 */ sdc1 $f20, 0x10($sp) -/* B1C6B8 800A5518 AFA60040 */ sw $a2, 0x40($sp) -/* B1C6BC 800A551C 908E0035 */ lbu $t6, 0x35($a0) -/* B1C6C0 800A5520 00808025 */ move $s0, $a0 -/* B1C6C4 800A5524 00A08825 */ move $s1, $a1 -/* B1C6C8 800A5528 31CF0010 */ andi $t7, $t6, 0x10 -/* B1C6CC 800A552C 51E00007 */ beql $t7, $zero, .L800A554C -/* B1C6D0 800A5530 8E020020 */ lw $v0, 0x20($s0) -/* B1C6D4 800A5534 44800000 */ mtc1 $zero, $f0 -/* B1C6D8 800A5538 00000000 */ nop -/* B1C6DC 800A553C E4A00008 */ swc1 $f0, 8($a1) -/* B1C6E0 800A5540 10000030 */ b .L800A5604 -/* B1C6E4 800A5544 E4A00000 */ swc1 $f0, ($a1) -/* B1C6E8 800A5548 8E020020 */ lw $v0, 0x20($s0) -.L800A554C: -/* B1C6EC 800A554C 87A40042 */ lh $a0, 0x42($sp) -/* B1C6F0 800A5550 84580000 */ lh $t8, ($v0) -/* B1C6F4 800A5554 84590004 */ lh $t9, 4($v0) -/* B1C6F8 800A5558 44982000 */ mtc1 $t8, $f4 -/* B1C6FC 800A555C 44993000 */ mtc1 $t9, $f6 -/* B1C700 800A5560 46802520 */ cvt.s.w $f20, $f4 -/* B1C704 800A5564 0C01DE1C */ jal Math_Sins -/* B1C708 800A5568 468035A0 */ cvt.s.w $f22, $f6 -/* B1C70C 800A556C 46000606 */ mov.s $f24, $f0 -/* B1C710 800A5570 0C01DE0D */ jal Math_Coss -/* B1C714 800A5574 87A40042 */ lh $a0, 0x42($sp) -/* B1C718 800A5578 4600A202 */ mul.s $f8, $f20, $f0 -/* B1C71C 800A557C 00000000 */ nop -/* B1C720 800A5580 4618B282 */ mul.s $f10, $f22, $f24 -/* B1C724 800A5584 00000000 */ nop -/* B1C728 800A5588 4600B482 */ mul.s $f18, $f22, $f0 -/* B1C72C 800A558C 00000000 */ nop -/* B1C730 800A5590 4618A102 */ mul.s $f4, $f20, $f24 -/* B1C734 800A5594 460A4400 */ add.s $f16, $f8, $f10 -/* B1C738 800A5598 E6300000 */ swc1 $f16, ($s1) -/* B1C73C 800A559C 46049181 */ sub.s $f6, $f18, $f4 -/* B1C740 800A55A0 E6260008 */ swc1 $f6, 8($s1) -/* B1C744 800A55A4 86080038 */ lh $t0, 0x38($s0) -/* B1C748 800A55A8 8609003C */ lh $t1, 0x3c($s0) -/* B1C74C 800A55AC 86040036 */ lh $a0, 0x36($s0) -/* B1C750 800A55B0 44884000 */ mtc1 $t0, $f8 -/* B1C754 800A55B4 44895000 */ mtc1 $t1, $f10 -/* B1C758 800A55B8 46804520 */ cvt.s.w $f20, $f8 -/* B1C75C 800A55BC 0C01DE1C */ jal Math_Sins -/* B1C760 800A55C0 468055A0 */ cvt.s.w $f22, $f10 -/* B1C764 800A55C4 46000606 */ mov.s $f24, $f0 -/* B1C768 800A55C8 0C01DE0D */ jal Math_Coss -/* B1C76C 800A55CC 86040036 */ lh $a0, 0x36($s0) -/* B1C770 800A55D0 4600A402 */ mul.s $f16, $f20, $f0 -/* B1C774 800A55D4 C6260000 */ lwc1 $f6, ($s1) -/* B1C778 800A55D8 4618B482 */ mul.s $f18, $f22, $f24 -/* B1C77C 800A55DC 46128100 */ add.s $f4, $f16, $f18 -/* B1C780 800A55E0 4600B282 */ mul.s $f10, $f22, $f0 -/* B1C784 800A55E4 44800000 */ mtc1 $zero, $f0 -/* B1C788 800A55E8 4618A402 */ mul.s $f16, $f20, $f24 -/* B1C78C 800A55EC 46043201 */ sub.s $f8, $f6, $f4 -/* B1C790 800A55F0 C6260008 */ lwc1 $f6, 8($s1) -/* B1C794 800A55F4 E6280000 */ swc1 $f8, ($s1) -/* B1C798 800A55F8 46105481 */ sub.s $f18, $f10, $f16 -/* B1C79C 800A55FC 46123101 */ sub.s $f4, $f6, $f18 -/* B1C7A0 800A5600 E6240008 */ swc1 $f4, 8($s1) -.L800A5604: -/* B1C7A4 800A5604 87AA0042 */ lh $t2, 0x42($sp) -/* B1C7A8 800A5608 8E020020 */ lw $v0, 0x20($s0) -/* B1C7AC 800A560C 860C003E */ lh $t4, 0x3e($s0) -/* B1C7B0 800A5610 A60A0036 */ sh $t2, 0x36($s0) -/* B1C7B4 800A5614 844B0000 */ lh $t3, ($v0) -/* B1C7B8 800A5618 A60B0038 */ sh $t3, 0x38($s0) -/* B1C7BC 800A561C A44C0000 */ sh $t4, ($v0) -/* B1C7C0 800A5620 8E020020 */ lw $v0, 0x20($s0) -/* B1C7C4 800A5624 860E0042 */ lh $t6, 0x42($s0) -/* B1C7C8 800A5628 844D0004 */ lh $t5, 4($v0) -/* B1C7CC 800A562C A60D003C */ sh $t5, 0x3c($s0) -/* B1C7D0 800A5630 A44E0004 */ sh $t6, 4($v0) -/* B1C7D4 800A5634 92030035 */ lbu $v1, 0x35($s0) -/* B1C7D8 800A5638 306F0002 */ andi $t7, $v1, 2 -/* B1C7DC 800A563C 11E00013 */ beqz $t7, .L800A568C -/* B1C7E0 800A5640 30780010 */ andi $t8, $v1, 0x10 -/* B1C7E4 800A5644 53000004 */ beql $t8, $zero, .L800A5658 -/* B1C7E8 800A5648 8E190020 */ lw $t9, 0x20($s0) -/* B1C7EC 800A564C 10000009 */ b .L800A5674 -/* B1C7F0 800A5650 E6200004 */ swc1 $f0, 4($s1) -/* B1C7F4 800A5654 8E190020 */ lw $t9, 0x20($s0) -.L800A5658: -/* B1C7F8 800A5658 8609003A */ lh $t1, 0x3a($s0) -/* B1C7FC 800A565C 87280002 */ lh $t0, 2($t9) -/* B1C800 800A5660 01095023 */ subu $t2, $t0, $t1 -/* B1C804 800A5664 448A4000 */ mtc1 $t2, $f8 -/* B1C808 800A5668 00000000 */ nop -/* B1C80C 800A566C 468042A0 */ cvt.s.w $f10, $f8 -/* B1C810 800A5670 E62A0004 */ swc1 $f10, 4($s1) -.L800A5674: -/* B1C814 800A5674 8E020020 */ lw $v0, 0x20($s0) -/* B1C818 800A5678 860C0040 */ lh $t4, 0x40($s0) -/* B1C81C 800A567C 844B0002 */ lh $t3, 2($v0) -/* B1C820 800A5680 A60B003A */ sh $t3, 0x3a($s0) -/* B1C824 800A5684 10000005 */ b .L800A569C -/* B1C828 800A5688 A44C0002 */ sh $t4, 2($v0) -.L800A568C: -/* B1C82C 800A568C E6200004 */ swc1 $f0, 4($s1) -/* B1C830 800A5690 8E0D0020 */ lw $t5, 0x20($s0) -/* B1C834 800A5694 85AE0002 */ lh $t6, 2($t5) -/* B1C838 800A5698 A60E003A */ sh $t6, 0x3a($s0) -.L800A569C: -/* B1C83C 800A569C 920F0035 */ lbu $t7, 0x35($s0) -/* B1C840 800A56A0 31F8FFEF */ andi $t8, $t7, 0xffef -/* B1C844 800A56A4 A2180035 */ sb $t8, 0x35($s0) -/* B1C848 800A56A8 8FBF0034 */ lw $ra, 0x34($sp) -/* B1C84C 800A56AC 8FB10030 */ lw $s1, 0x30($sp) -/* B1C850 800A56B0 8FB0002C */ lw $s0, 0x2c($sp) -/* B1C854 800A56B4 D7B80020 */ ldc1 $f24, 0x20($sp) -/* B1C858 800A56B8 D7B60018 */ ldc1 $f22, 0x18($sp) -/* B1C85C 800A56BC D7B40010 */ ldc1 $f20, 0x10($sp) -/* B1C860 800A56C0 03E00008 */ jr $ra -/* B1C864 800A56C4 27BD0038 */ addiu $sp, $sp, 0x38 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A56C8.s b/asm/non_matchings/code/z_skelanime/func_800A56C8.s deleted file mode 100644 index 17dcc3c703..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A56C8.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_800A56C8 -/* B1C868 800A56C8 44856000 */ mtc1 $a1, $f12 -/* B1C86C 800A56CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1C870 800A56D0 AFBF0014 */ sw $ra, 0x14($sp) -/* B1C874 800A56D4 44056000 */ mfc1 $a1, $f12 -/* B1C878 800A56D8 0C02911E */ jal func_800A4478 -/* B1C87C 800A56DC 3C063F80 */ lui $a2, 0x3f80 -/* B1C880 800A56E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B1C884 800A56E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1C888 800A56E8 03E00008 */ jr $ra -/* B1C88C 800A56EC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A56F0.s b/asm/non_matchings/code/z_skelanime/func_800A56F0.s deleted file mode 100644 index e52bacbae7..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A56F0.s +++ /dev/null @@ -1,59 +0,0 @@ -.rdata -glabel D_80140608 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014061C - .asciz "now_joint あきまへん！！\n" - # EUC-JP: あきまへん！！ | 'Akimane!!'? - .balign 4 - -glabel D_80140638 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014064C - .asciz "morf_joint あきまへん！！\n" - # EUC-JP: あきまへん！！ | 'Akimane!!'? - .balign 4 - -.text -glabel func_800A56F0 -/* B1C890 800A56F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1C894 800A56F4 AFBF0014 */ sw $ra, 0x14($sp) -/* B1C898 800A56F8 AFA40018 */ sw $a0, 0x18($sp) -/* B1C89C 800A56FC AFA5001C */ sw $a1, 0x1c($sp) -/* B1C8A0 800A5700 8C870020 */ lw $a3, 0x20($a0) -/* B1C8A4 800A5704 3C058014 */ lui $a1, %hi(D_80140608) # $a1, 0x8014 -/* B1C8A8 800A5708 24A50608 */ addiu $a1, %lo(D_80140608) # addiu $a1, $a1, 0x608 -/* B1C8AC 800A570C 10E00006 */ beqz $a3, .L800A5728 -/* B1C8B0 800A5710 3C048014 */ lui $a0, %hi(D_8014061C) # $a0, 0x8014 -/* B1C8B4 800A5714 00E02025 */ move $a0, $a3 -/* B1C8B8 800A5718 0C01EC35 */ jal ZeldaArena_FreeDebug -/* B1C8BC 800A571C 24060E91 */ li $a2, 3729 -/* B1C8C0 800A5720 10000004 */ b .L800A5734 -/* B1C8C4 800A5724 8FAF0018 */ lw $t7, 0x18($sp) -.L800A5728: -/* B1C8C8 800A5728 0C00084C */ jal osSyncPrintf -/* B1C8CC 800A572C 2484061C */ addiu $a0, %lo(D_8014061C) # addiu $a0, $a0, 0x61c -/* B1C8D0 800A5730 8FAF0018 */ lw $t7, 0x18($sp) -.L800A5734: -/* B1C8D4 800A5734 3C058014 */ lui $a1, %hi(D_80140638) # $a1, 0x8014 -/* B1C8D8 800A5738 24A50638 */ addiu $a1, %lo(D_80140638) # addiu $a1, $a1, 0x638 -/* B1C8DC 800A573C 8DE40024 */ lw $a0, 0x24($t7) -/* B1C8E0 800A5740 10800005 */ beqz $a0, .L800A5758 -/* B1C8E4 800A5744 00000000 */ nop -/* B1C8E8 800A5748 0C01EC35 */ jal ZeldaArena_FreeDebug -/* B1C8EC 800A574C 24060E93 */ li $a2, 3731 -/* B1C8F0 800A5750 10000005 */ b .L800A5768 -/* B1C8F4 800A5754 8FBF0014 */ lw $ra, 0x14($sp) -.L800A5758: -/* B1C8F8 800A5758 3C048014 */ lui $a0, %hi(D_8014064C) # $a0, 0x8014 -/* B1C8FC 800A575C 0C00084C */ jal osSyncPrintf -/* B1C900 800A5760 2484064C */ addiu $a0, %lo(D_8014064C) # addiu $a0, $a0, 0x64c -/* B1C904 800A5764 8FBF0014 */ lw $ra, 0x14($sp) -.L800A5768: -/* B1C908 800A5768 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1C90C 800A576C 03E00008 */ jr $ra -/* B1C910 800A5770 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A5774.s b/asm/non_matchings/code/z_skelanime/func_800A5774.s deleted file mode 100644 index 2316cd30e7..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A5774.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_800A5774 -/* B1C914 800A5774 908E0000 */ lbu $t6, ($a0) -/* B1C918 800A5778 00001025 */ move $v0, $zero -/* B1C91C 800A577C 19C0000E */ blez $t6, .L800A57B8 -/* B1C920 800A5780 00000000 */ nop -/* B1C924 800A5784 88D80000 */ lwl $t8, ($a2) -.L800A5788: -/* B1C928 800A5788 98D80003 */ lwr $t8, 3($a2) -/* B1C92C 800A578C 24420001 */ addiu $v0, $v0, 1 -/* B1C930 800A5790 24A50006 */ addiu $a1, $a1, 6 -/* B1C934 800A5794 A8B8FFFA */ swl $t8, -6($a1) -/* B1C938 800A5798 B8B8FFFD */ swr $t8, -3($a1) -/* B1C93C 800A579C 94D80004 */ lhu $t8, 4($a2) -/* B1C940 800A57A0 24C60006 */ addiu $a2, $a2, 6 -/* B1C944 800A57A4 A4B8FFFE */ sh $t8, -2($a1) -/* B1C948 800A57A8 90990000 */ lbu $t9, ($a0) -/* B1C94C 800A57AC 0059082A */ slt $at, $v0, $t9 -/* B1C950 800A57B0 5420FFF5 */ bnezl $at, .L800A5788 -/* B1C954 800A57B4 88D80000 */ lwl $t8, ($a2) -.L800A57B8: -/* B1C958 800A57B8 03E00008 */ jr $ra -/* B1C95C 800A57BC 00000000 */ nop diff --git a/asm/non_matchings/code/z_skin_awb/func_800A663C.s b/asm/non_matchings/code/z_skin_awb/func_800A663C.s index 3b24472695..154816ca35 100644 --- a/asm/non_matchings/code/z_skin_awb/func_800A663C.s +++ b/asm/non_matchings/code/z_skin_awb/func_800A663C.s @@ -178,7 +178,7 @@ glabel func_800A663C /* B1D9E4 800A6844 8FA40048 */ lw $a0, 0x48($sp) /* B1D9E8 800A6848 26A5004C */ addiu $a1, $s5, 0x4c /* B1D9EC 800A684C 8FA60050 */ lw $a2, 0x50($sp) -/* B1D9F0 800A6850 0C02921F */ jal func_800A487C +/* B1D9F0 800A6850 0C02921F */ jal SkelAnime_InitSkin /* B1D9F4 800A6854 8FA70054 */ lw $a3, 0x54($sp) /* B1D9F8 800A6858 8FBF003C */ lw $ra, 0x3c($sp) /* B1D9FC 800A685C 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_skin_awb/func_800A6888.s b/asm/non_matchings/code/z_skin_awb/func_800A6888.s index 5d61414c8a..b20412c9ee 100644 --- a/asm/non_matchings/code/z_skin_awb/func_800A6888.s +++ b/asm/non_matchings/code/z_skin_awb/func_800A6888.s @@ -73,7 +73,7 @@ glabel func_800A6888 /* B1DAFC 800A695C 2406011E */ li $a2, 286 .L800A6960: /* B1DB00 800A6960 2624004C */ addiu $a0, $s1, 0x4c -/* B1DB04 800A6964 0C0295BC */ jal func_800A56F0 +/* B1DB04 800A6964 0C0295BC */ jal SkelAnime_Free /* B1DB08 800A6968 8FA50030 */ lw $a1, 0x30($sp) /* B1DB0C 800A696C 8FBF002C */ lw $ra, 0x2c($sp) .L800A6970: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s index 558b8d0649..5a5caa2575 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s @@ -1,10 +1,10 @@ glabel BgDyYoseizo_Init /* 00000 80872830 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 80872834 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00008 80872838 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 8087283C AFB10028 */ sw $s1, 0x0028($sp) -/* 00010 80872840 AFB00024 */ sw $s0, 0x0024($sp) -/* 00014 80872844 00A11021 */ addu $v0, $a1, $at +/* 00008 80872838 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 8087283C AFB10028 */ sw $s1, 0x0028($sp) +/* 00010 80872840 AFB00024 */ sw $s0, 0x0024($sp) +/* 00014 80872844 00A11021 */ addu $v0, $a1, $at /* 00018 80872848 904E1DEA */ lbu $t6, 0x1DEA($v0) ## 00001DEA /* 0001C 8087284C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00020 80872850 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 @@ -12,14 +12,14 @@ glabel BgDyYoseizo_Init /* 00028 80872858 848F02EC */ lh $t7, 0x02EC($a0) ## 000002EC /* 0002C 8087285C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00030 80872860 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00034 80872864 05E30003 */ bgezl $t7, .L80872874 +/* 00034 80872864 05E30003 */ bgezl $t7, .L80872874 /* 00038 80872868 C6000028 */ lwc1 $f0, 0x0028($s0) ## 00000028 /* 0003C 8087286C A48002EC */ sh $zero, 0x02EC($a0) ## 000002EC /* 00040 80872870 C6000028 */ lwc1 $f0, 0x0028($s0) ## 00000028 .L80872874: /* 00044 80872874 8E190024 */ lw $t9, 0x0024($s0) ## 00000024 /* 00048 80872878 8E180028 */ lw $t8, 0x0028($s0) ## 00000028 -/* 0004C 8087287C 46040180 */ add.s $f6, $f0, $f4 +/* 0004C 8087287C 46040180 */ add.s $f6, $f0, $f4 /* 00050 80872880 AE190038 */ sw $t9, 0x0038($s0) ## 00000038 /* 00054 80872884 8E19002C */ lw $t9, 0x002C($s0) ## 0000002C /* 00058 80872888 E6000310 */ swc1 $f0, 0x0310($s0) ## 00000310 @@ -29,53 +29,53 @@ glabel BgDyYoseizo_Init /* 00068 80872898 862800A4 */ lh $t0, 0x00A4($s1) ## 000000A4 /* 0006C 8087289C 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 00070 808728A0 3C048087 */ lui $a0, %hi(D_80875510) ## $a0 = 80870000 -/* 00074 808728A4 15010014 */ bne $t0, $at, .L808728F8 +/* 00074 808728A4 15010014 */ bne $t0, $at, .L808728F8 /* 00078 808728A8 24845510 */ addiu $a0, $a0, %lo(D_80875510) ## $a0 = 80875510 /* 0007C 808728AC 3C048087 */ lui $a0, %hi(D_808754E0) ## $a0 = 80870000 /* 00080 808728B0 248454E0 */ addiu $a0, $a0, %lo(D_808754E0) ## $a0 = 808754E0 /* 00084 808728B4 0C00084C */ jal osSyncPrintf - + /* 00088 808728B8 90451DEA */ lbu $a1, 0x1DEA($v0) ## 00001DEA /* 0008C 808728BC 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 00090 808728C0 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 00094 808728C4 26090194 */ addiu $t1, $s0, 0x0194 ## $t1 = 00000194 /* 00098 808728C8 260A023C */ addiu $t2, $s0, 0x023C ## $t2 = 0000023C /* 0009C 808728CC 240B001C */ addiu $t3, $zero, 0x001C ## $t3 = 0000001C -/* 000A0 808728D0 AFAB0018 */ sw $t3, 0x0018($sp) -/* 000A4 808728D4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 000A8 808728D8 AFA90010 */ sw $t1, 0x0010($sp) +/* 000A0 808728D0 AFAB0018 */ sw $t3, 0x0018($sp) +/* 000A4 808728D4 AFAA0014 */ sw $t2, 0x0014($sp) +/* 000A8 808728D8 AFA90010 */ sw $t1, 0x0010($sp) /* 000AC 808728DC 24E78698 */ addiu $a3, $a3, 0x8698 ## $a3 = 06008698 /* 000B0 808728E0 24C6C450 */ addiu $a2, $a2, 0xC450 ## $a2 = 0601C450 /* 000B4 808728E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000B8 808728E8 0C0291BE */ jal func_800A46F8 +/* 000B8 808728E8 0C0291BE */ jal SkelAnime_InitSV /* 000BC 808728EC 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 000C0 808728F0 10000010 */ beq $zero, $zero, .L80872934 +/* 000C0 808728F0 10000010 */ beq $zero, $zero, .L80872934 /* 000C4 808728F4 00000000 */ nop .L808728F8: /* 000C8 808728F8 0C00084C */ jal osSyncPrintf - + /* 000CC 808728FC 90451DEA */ lbu $a1, 0x1DEA($v0) ## 00001DEA /* 000D0 80872900 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 000D4 80872904 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 000D8 80872908 260C0194 */ addiu $t4, $s0, 0x0194 ## $t4 = 00000194 /* 000DC 8087290C 260D023C */ addiu $t5, $s0, 0x023C ## $t5 = 0000023C /* 000E0 80872910 240E001C */ addiu $t6, $zero, 0x001C ## $t6 = 0000001C -/* 000E4 80872914 AFAE0018 */ sw $t6, 0x0018($sp) -/* 000E8 80872918 AFAD0014 */ sw $t5, 0x0014($sp) -/* 000EC 8087291C AFAC0010 */ sw $t4, 0x0010($sp) +/* 000E4 80872914 AFAE0018 */ sw $t6, 0x0018($sp) +/* 000E8 80872918 AFAD0014 */ sw $t5, 0x0014($sp) +/* 000EC 8087291C AFAC0010 */ sw $t4, 0x0010($sp) /* 000F0 80872920 24E731C0 */ addiu $a3, $a3, 0x31C0 ## $a3 = 060031C0 /* 000F4 80872924 24C6C450 */ addiu $a2, $a2, 0xC450 ## $a2 = 0601C450 /* 000F8 80872928 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000FC 8087292C 0C0291BE */ jal func_800A46F8 +/* 000FC 8087292C 0C0291BE */ jal SkelAnime_InitSV /* 00100 80872930 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 .L80872934: /* 00104 80872934 3C0F8087 */ lui $t7, %hi(func_80872D20) ## $t7 = 80870000 /* 00108 80872938 25EF2D20 */ addiu $t7, $t7, %lo(func_80872D20) ## $t7 = 80872D20 /* 0010C 8087293C AE0F014C */ sw $t7, 0x014C($s0) ## 0000014C -/* 00110 80872940 8FBF002C */ lw $ra, 0x002C($sp) -/* 00114 80872944 8FB10028 */ lw $s1, 0x0028($sp) -/* 00118 80872948 8FB00024 */ lw $s0, 0x0024($sp) -/* 0011C 8087294C 03E00008 */ jr $ra +/* 00110 80872940 8FBF002C */ lw $ra, 0x002C($sp) +/* 00114 80872944 8FB10028 */ lw $s1, 0x0028($sp) +/* 00118 80872948 8FB00024 */ lw $s0, 0x0024($sp) +/* 0011C 8087294C 03E00008 */ jr $ra /* 00120 80872950 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s index 17d474a733..f786982bac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s @@ -1,26 +1,26 @@ glabel func_80874BE0 /* 023B0 80874BE0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 023B4 80874BE4 AFB10028 */ sw $s1, 0x0028($sp) +/* 023B4 80874BE4 AFB10028 */ sw $s1, 0x0028($sp) /* 023B8 80874BE8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 023BC 80874BEC AFBF002C */ sw $ra, 0x002C($sp) -/* 023C0 80874BF0 AFB00024 */ sw $s0, 0x0024($sp) +/* 023BC 80874BEC AFBF002C */ sw $ra, 0x002C($sp) +/* 023C0 80874BF0 AFB00024 */ sw $s0, 0x0024($sp) /* 023C4 80874BF4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 023C8 80874BF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 023CC 80874BFC 3C068087 */ lui $a2, %hi(D_80875608) ## $a2 = 80870000 /* 023D0 80874C00 24C65608 */ addiu $a2, $a2, %lo(D_80875608) ## $a2 = 80875608 /* 023D4 80874C04 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 023D8 80874C08 24070649 */ addiu $a3, $zero, 0x0649 ## $a3 = 00000649 -/* 023DC 80874C0C 0C031AB1 */ jal func_800C6AC4 -/* 023E0 80874C10 AFA50050 */ sw $a1, 0x0050($sp) +/* 023DC 80874C0C 0C031AB1 */ jal func_800C6AC4 +/* 023E0 80874C10 AFA50050 */ sw $a1, 0x0050($sp) /* 023E4 80874C14 8E0F014C */ lw $t7, 0x014C($s0) ## 0000014C /* 023E8 80874C18 3C0E8087 */ lui $t6, %hi(func_80873E04) ## $t6 = 80870000 /* 023EC 80874C1C 25CE3E04 */ addiu $t6, $t6, %lo(func_80873E04) ## $t6 = 80873E04 -/* 023F0 80874C20 11CF0050 */ beq $t6, $t7, .L80874D64 -/* 023F4 80874C24 8FA80050 */ lw $t0, 0x0050($sp) +/* 023F0 80874C20 11CF0050 */ beq $t6, $t7, .L80874D64 +/* 023F4 80874C24 8FA80050 */ lw $t0, 0x0050($sp) /* 023F8 80874C28 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 023FC 80874C2C 0C024F46 */ jal func_80093D18 -/* 02400 80874C30 AFA80050 */ sw $t0, 0x0050($sp) -/* 02404 80874C34 8FA80050 */ lw $t0, 0x0050($sp) +/* 023FC 80874C2C 0C024F46 */ jal func_80093D18 +/* 02400 80874C30 AFA80050 */ sw $t0, 0x0050($sp) +/* 02404 80874C34 8FA80050 */ lw $t0, 0x0050($sp) /* 02408 80874C38 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 0240C 80874C3C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 02410 80874C40 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 @@ -32,20 +32,20 @@ glabel func_80874BE0 /* 02428 80874C58 860A02F2 */ lh $t2, 0x02F2($s0) ## 000002F2 /* 0242C 80874C5C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 02430 80874C60 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 -/* 02434 80874C64 000A5880 */ sll $t3, $t2, 2 -/* 02438 80874C68 012B6021 */ addu $t4, $t1, $t3 +/* 02434 80874C64 000A5880 */ sll $t3, $t2, 2 +/* 02438 80874C68 012B6021 */ addu $t4, $t1, $t3 /* 0243C 80874C6C 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 02440 80874C70 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 02444 80874C74 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 02448 80874C78 00047100 */ sll $t6, $a0, 4 -/* 0244C 80874C7C 000E7F02 */ srl $t7, $t6, 28 -/* 02450 80874C80 000FC080 */ sll $t8, $t7, 2 -/* 02454 80874C84 00D8C821 */ addu $t9, $a2, $t8 +/* 02448 80874C78 00047100 */ sll $t6, $a0, 4 +/* 0244C 80874C7C 000E7F02 */ srl $t7, $t6, 28 +/* 02450 80874C80 000FC080 */ sll $t8, $t7, 2 +/* 02454 80874C84 00D8C821 */ addu $t9, $a2, $t8 /* 02458 80874C88 8F2A0000 */ lw $t2, 0x0000($t9) ## DB060020 -/* 0245C 80874C8C 00856824 */ and $t5, $a0, $a1 +/* 0245C 80874C8C 00856824 */ and $t5, $a0, $a1 /* 02460 80874C90 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 02464 80874C94 01AA5821 */ addu $t3, $t5, $t2 -/* 02468 80874C98 01676021 */ addu $t4, $t3, $a3 +/* 02464 80874C94 01AA5821 */ addu $t3, $t5, $t2 +/* 02468 80874C98 01676021 */ addu $t4, $t3, $a3 /* 0246C 80874C9C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 02470 80874CA0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02474 80874CA4 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -54,18 +54,18 @@ glabel func_80874BE0 /* 02480 80874CB0 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 02484 80874CB4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 02488 80874CB8 861802F4 */ lh $t8, 0x02F4($s0) ## 000002F4 -/* 0248C 80874CBC 0018C880 */ sll $t9, $t8, 2 -/* 02490 80874CC0 01396821 */ addu $t5, $t1, $t9 +/* 0248C 80874CBC 0018C880 */ sll $t9, $t8, 2 +/* 02490 80874CC0 01396821 */ addu $t5, $t1, $t9 /* 02494 80874CC4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 02498 80874CC8 00045900 */ sll $t3, $a0, 4 -/* 0249C 80874CCC 000B6702 */ srl $t4, $t3, 28 -/* 024A0 80874CD0 000C7080 */ sll $t6, $t4, 2 -/* 024A4 80874CD4 00CE7821 */ addu $t7, $a2, $t6 +/* 02498 80874CC8 00045900 */ sll $t3, $a0, 4 +/* 0249C 80874CCC 000B6702 */ srl $t4, $t3, 28 +/* 024A0 80874CD0 000C7080 */ sll $t6, $t4, 2 +/* 024A4 80874CD4 00CE7821 */ addu $t7, $a2, $t6 /* 024A8 80874CD8 8DF80000 */ lw $t8, 0x0000($t7) ## DB060024 -/* 024AC 80874CDC 00855024 */ and $t2, $a0, $a1 +/* 024AC 80874CDC 00855024 */ and $t2, $a0, $a1 /* 024B0 80874CE0 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 024B4 80874CE4 0158C821 */ addu $t9, $t2, $t8 -/* 024B8 80874CE8 03276821 */ addu $t5, $t9, $a3 +/* 024B4 80874CE4 0158C821 */ addu $t9, $t2, $t8 +/* 024B8 80874CE8 03276821 */ addu $t5, $t9, $a3 /* 024BC 80874CEC AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 024C0 80874CF0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 024C4 80874CF4 358C0028 */ ori $t4, $t4, 0x0028 ## $t4 = DB060028 @@ -74,42 +74,42 @@ glabel func_80874BE0 /* 024D0 80874D00 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 024D4 80874D04 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 024D8 80874D08 860E02F6 */ lh $t6, 0x02F6($s0) ## 000002F6 -/* 024DC 80874D0C 000E7880 */ sll $t7, $t6, 2 -/* 024E0 80874D10 008F2021 */ addu $a0, $a0, $t7 -/* 024E4 80874D14 8C8454D8 */ lw $a0, %lo(D_808754D8)($a0) -/* 024E8 80874D18 0004C100 */ sll $t8, $a0, 4 -/* 024EC 80874D1C 0018CF02 */ srl $t9, $t8, 28 -/* 024F0 80874D20 00196880 */ sll $t5, $t9, 2 -/* 024F4 80874D24 00CD5821 */ addu $t3, $a2, $t5 +/* 024DC 80874D0C 000E7880 */ sll $t7, $t6, 2 +/* 024E0 80874D10 008F2021 */ addu $a0, $a0, $t7 +/* 024E4 80874D14 8C8454D8 */ lw $a0, %lo(D_808754D8)($a0) +/* 024E8 80874D18 0004C100 */ sll $t8, $a0, 4 +/* 024EC 80874D1C 0018CF02 */ srl $t9, $t8, 28 +/* 024F0 80874D20 00196880 */ sll $t5, $t9, 2 +/* 024F4 80874D24 00CD5821 */ addu $t3, $a2, $t5 /* 024F8 80874D28 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000008 -/* 024FC 80874D2C 00855024 */ and $t2, $a0, $a1 +/* 024FC 80874D2C 00855024 */ and $t2, $a0, $a1 /* 02500 80874D30 3C188087 */ lui $t8, %hi(func_80874B7C) ## $t8 = 80870000 -/* 02504 80874D34 014C7021 */ addu $t6, $t2, $t4 -/* 02508 80874D38 01C77821 */ addu $t7, $t6, $a3 +/* 02504 80874D34 014C7021 */ addu $t6, $t2, $t4 +/* 02508 80874D38 01C77821 */ addu $t7, $t6, $a3 /* 0250C 80874D3C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 02510 80874D40 92070152 */ lbu $a3, 0x0152($s0) ## 00000152 /* 02514 80874D44 8E060170 */ lw $a2, 0x0170($s0) ## 00000170 /* 02518 80874D48 8E050154 */ lw $a1, 0x0154($s0) ## 00000154 /* 0251C 80874D4C 27184B7C */ addiu $t8, $t8, %lo(func_80874B7C) ## $t8 = 80874B7C -/* 02520 80874D50 AFB80010 */ sw $t8, 0x0010($sp) -/* 02524 80874D54 AFB00018 */ sw $s0, 0x0018($sp) -/* 02528 80874D58 AFA00014 */ sw $zero, 0x0014($sp) -/* 0252C 80874D5C 0C0286B2 */ jal func_800A1AC8 +/* 02520 80874D50 AFB80010 */ sw $t8, 0x0010($sp) +/* 02524 80874D54 AFB00018 */ sw $s0, 0x0018($sp) +/* 02528 80874D58 AFA00014 */ sw $zero, 0x0014($sp) +/* 0252C 80874D5C 0C0286B2 */ jal SkelAnime_DrawSV /* 02530 80874D60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80874D64: /* 02534 80874D64 3C068087 */ lui $a2, %hi(D_80875620) ## $a2 = 80870000 /* 02538 80874D68 24C65620 */ addiu $a2, $a2, %lo(D_80875620) ## $a2 = 80875620 /* 0253C 80874D6C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02540 80874D70 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02544 80874D74 0C031AD5 */ jal func_800C6B54 +/* 02544 80874D74 0C031AD5 */ jal func_800C6B54 /* 02548 80874D78 2407065D */ addiu $a3, $zero, 0x065D ## $a3 = 0000065D /* 0254C 80874D7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02550 80874D80 0C21D468 */ jal func_808751A0 +/* 02550 80874D80 0C21D468 */ jal func_808751A0 /* 02554 80874D84 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02558 80874D88 8FBF002C */ lw $ra, 0x002C($sp) -/* 0255C 80874D8C 8FB00024 */ lw $s0, 0x0024($sp) -/* 02560 80874D90 8FB10028 */ lw $s1, 0x0028($sp) -/* 02564 80874D94 03E00008 */ jr $ra +/* 02558 80874D88 8FBF002C */ lw $ra, 0x002C($sp) +/* 0255C 80874D8C 8FB00024 */ lw $s0, 0x0024($sp) +/* 02560 80874D90 8FB10028 */ lw $s1, 0x0028($sp) +/* 02564 80874D94 03E00008 */ jr $ra /* 02568 80874D98 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s index 13e0880d8c..78b6e51015 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s @@ -1,17 +1,17 @@ glabel BossDodongo_Destroy /* 00AB8 808C1C48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00ABC 808C1C4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AC0 808C1C50 AFA40018 */ sw $a0, 0x0018($sp) -/* 00AC4 808C1C54 AFA5001C */ sw $a1, 0x001C($sp) -/* 00AC8 808C1C58 0C0295BC */ jal func_800A56F0 +/* 00ABC 808C1C4C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00AC0 808C1C50 AFA40018 */ sw $a0, 0x0018($sp) +/* 00AC4 808C1C54 AFA5001C */ sw $a1, 0x001C($sp) +/* 00AC8 808C1C58 0C0295BC */ jal SkelAnime_Free /* 00ACC 808C1C5C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00AD0 808C1C60 8FA50018 */ lw $a1, 0x0018($sp) -/* 00AD4 808C1C64 8FA4001C */ lw $a0, 0x001C($sp) -/* 00AD8 808C1C68 0C016F32 */ jal func_8005BCC8 +/* 00AD0 808C1C60 8FA50018 */ lw $a1, 0x0018($sp) +/* 00AD4 808C1C64 8FA4001C */ lw $a0, 0x001C($sp) +/* 00AD8 808C1C68 0C016F32 */ jal func_8005BCC8 /* 00ADC 808C1C6C 24A50440 */ addiu $a1, $a1, 0x0440 ## $a1 = 00000440 -/* 00AE0 808C1C70 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00AE0 808C1C70 8FBF0014 */ lw $ra, 0x0014($sp) /* 00AE4 808C1C74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AE8 808C1C78 03E00008 */ jr $ra +/* 00AE8 808C1C78 03E00008 */ jr $ra /* 00AEC 808C1C7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s index da157b61e5..c7d27a06d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s @@ -1,19 +1,19 @@ glabel BossDodongo_Init /* 007E0 808C1970 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 007E4 808C1974 AFB30040 */ sw $s3, 0x0040($sp) +/* 007E4 808C1974 AFB30040 */ sw $s3, 0x0040($sp) /* 007E8 808C1978 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 007EC 808C197C 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 007F0 808C1980 00250821 */ addu $at, $at, $a1 -/* 007F4 808C1984 AFBF0044 */ sw $ra, 0x0044($sp) -/* 007F8 808C1988 AFB2003C */ sw $s2, 0x003C($sp) -/* 007FC 808C198C AFB10038 */ sw $s1, 0x0038($sp) -/* 00800 808C1990 AFB00034 */ sw $s0, 0x0034($sp) +/* 007F0 808C1980 00250821 */ addu $at, $at, $a1 +/* 007F4 808C1984 AFBF0044 */ sw $ra, 0x0044($sp) +/* 007F8 808C1988 AFB2003C */ sw $s2, 0x003C($sp) +/* 007FC 808C198C AFB10038 */ sw $s1, 0x0038($sp) +/* 00800 808C1990 AFB00034 */ sw $s0, 0x0034($sp) /* 00804 808C1994 248E0920 */ addiu $t6, $a0, 0x0920 ## $t6 = 00000920 /* 00808 808C1998 3C05808D */ lui $a1, %hi(D_808CA3C8) ## $a1 = 808D0000 /* 0080C 808C199C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00810 808C19A0 AC2E1E10 */ sw $t6, 0x1E10($at) ## 00011E10 /* 00814 808C19A4 0C01E037 */ jal Actor_ProcessInitChain - + /* 00818 808C19A8 24A5A3C8 */ addiu $a1, $a1, %lo(D_808CA3C8) ## $a1 = 808CA3C8 /* 0081C 808C19AC 3C05460F */ lui $a1, 0x460F ## $a1 = 460F0000 /* 00820 808C19B0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 @@ -21,12 +21,12 @@ glabel BossDodongo_Init /* 00828 808C19B8 34A5C000 */ ori $a1, $a1, 0xC000 ## $a1 = 460FC000 /* 0082C 808C19BC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00830 808C19C0 0C00AC78 */ jal ActorShape_Init - + /* 00834 808C19C4 3C07437A */ lui $a3, 0x437A ## $a3 = 437A0000 /* 00838 808C19C8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 0083C 808C19CC 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00840 808C19D0 0C00B58B */ jal Actor_SetScale - + /* 00844 808C19D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00848 808C19D8 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 /* 0084C 808C19DC 2652F0D8 */ addiu $s2, $s2, 0xF0D8 ## $s2 = 0600F0D8 @@ -36,24 +36,24 @@ glabel BossDodongo_Init /* 0085C 808C19EC 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C /* 00860 808C19F0 02403825 */ or $a3, $s2, $zero ## $a3 = 0600F0D8 /* 00864 808C19F4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00868 808C19F8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0086C 808C19FC AFA00014 */ sw $zero, 0x0014($sp) +/* 00868 808C19F8 AFA00010 */ sw $zero, 0x0010($sp) +/* 0086C 808C19FC AFA00014 */ sw $zero, 0x0014($sp) /* 00870 808C1A00 0C02915F */ jal SkelAnime_Init - -/* 00874 808C1A04 AFA00018 */ sw $zero, 0x0018($sp) + +/* 00874 808C1A04 AFA00018 */ sw $zero, 0x0018($sp) /* 00878 808C1A08 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 0087C 808C1A0C 0C0294BE */ jal func_800A52F8 +/* 0087C 808C1A0C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00880 808C1A10 02402825 */ or $a1, $s2, $zero ## $a1 = 0600F0D8 /* 00884 808C1A14 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00888 808C1A18 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 0088C 808C1A1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00890 808C1A20 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 00894 808C1A24 0C230720 */ jal func_808C1C80 +/* 00894 808C1A24 0C230720 */ jal func_808C1C80 /* 00898 808C1A28 E60401F8 */ swc1 $f4, 0x01F8($s0) ## 000001F8 /* 0089C 808C1A2C 240F000C */ addiu $t7, $zero, 0x000C ## $t7 = 0000000C /* 008A0 808C1A30 A60F0194 */ sh $t7, 0x0194($s0) ## 00000194 /* 008A4 808C1A34 3C01808D */ lui $at, %hi(D_808CA644) ## $at = 808D0000 -/* 008A8 808C1A38 C426A644 */ lwc1 $f6, %lo(D_808CA644)($at) +/* 008A8 808C1A38 C426A644 */ lwc1 $f6, %lo(D_808CA644)($at) /* 008AC 808C1A3C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 008B0 808C1A40 44814000 */ mtc1 $at, $f8 ## $f8 = 1000.00 /* 008B4 808C1A44 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -64,133 +64,133 @@ glabel BossDodongo_Init /* 008C8 808C1A58 E606021C */ swc1 $f6, 0x021C($s0) ## 0000021C /* 008CC 808C1A5C E6080220 */ swc1 $f8, 0x0220($s0) ## 00000220 /* 008D0 808C1A60 E60A0224 */ swc1 $f10, 0x0224($s0) ## 00000224 -/* 008D4 808C1A64 C430A648 */ lwc1 $f16, %lo(D_808CA648)($at) +/* 008D4 808C1A64 C430A648 */ lwc1 $f16, %lo(D_808CA648)($at) /* 008D8 808C1A68 26110440 */ addiu $s1, $s0, 0x0440 ## $s1 = 00000440 /* 008DC 808C1A6C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000440 /* 008E0 808C1A70 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 008E4 808C1A74 0C016EFE */ jal func_8005BBF8 +/* 008E4 808C1A74 0C016EFE */ jal func_8005BBF8 /* 008E8 808C1A78 E6100228 */ swc1 $f16, 0x0228($s0) ## 00000228 /* 008EC 808C1A7C 3C07808C */ lui $a3, %hi(D_808C73AC) ## $a3 = 808C0000 /* 008F0 808C1A80 26190460 */ addiu $t9, $s0, 0x0460 ## $t9 = 00000460 -/* 008F4 808C1A84 AFB90010 */ sw $t9, 0x0010($sp) +/* 008F4 808C1A84 AFB90010 */ sw $t9, 0x0010($sp) /* 008F8 808C1A88 24E773AC */ addiu $a3, $a3, %lo(D_808C73AC) ## $a3 = 808C73AC /* 008FC 808C1A8C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00900 808C1A90 02202825 */ or $a1, $s1, $zero ## $a1 = 00000440 -/* 00904 808C1A94 0C017014 */ jal func_8005C050 +/* 00904 808C1A94 0C017014 */ jal func_8005C050 /* 00908 808C1A98 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0090C 808C1A9C 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 00910 808C1AA0 00B32821 */ addu $a1, $a1, $s3 +/* 00910 808C1AA0 00B32821 */ addu $a1, $a1, $s3 /* 00914 808C1AA4 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC /* 00918 808C1AA8 0C00B337 */ jal Flags_GetClear - + /* 0091C 808C1AAC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00920 808C1AB0 1040005A */ beq $v0, $zero, .L808C1C1C +/* 00920 808C1AB0 1040005A */ beq $v0, $zero, .L808C1C1C /* 00924 808C1AB4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 00928 808C1AB8 3C020300 */ lui $v0, 0x0300 ## $v0 = 03000000 /* 0092C 808C1ABC 3C03808D */ lui $v1, %hi(D_808C93C8) ## $v1 = 808D0000 /* 00930 808C1AC0 244221D8 */ addiu $v0, $v0, 0x21D8 ## $v0 = 030021D8 /* 00934 808C1AC4 246393C8 */ addiu $v1, $v1, %lo(D_808C93C8) ## $v1 = 808C93C8 -/* 00938 808C1AC8 00024100 */ sll $t0, $v0, 4 -/* 0093C 808C1ACC 00037900 */ sll $t7, $v1, 4 +/* 00938 808C1AC8 00024100 */ sll $t0, $v0, 4 +/* 0093C 808C1ACC 00037900 */ sll $t7, $v1, 4 /* 00940 808C1AD0 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 -/* 00944 808C1AD4 00084F02 */ srl $t1, $t0, 28 -/* 00948 808C1AD8 000FC702 */ srl $t8, $t7, 28 -/* 0094C 808C1ADC 00095080 */ sll $t2, $t1, 2 -/* 00950 808C1AE0 0018C880 */ sll $t9, $t8, 2 +/* 00944 808C1AD4 00084F02 */ srl $t1, $t0, 28 +/* 00948 808C1AD8 000FC702 */ srl $t8, $t7, 28 +/* 0094C 808C1ADC 00095080 */ sll $t2, $t1, 2 +/* 00950 808C1AE0 0018C880 */ sll $t9, $t8, 2 /* 00954 808C1AE4 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 -/* 00958 808C1AE8 00AA5821 */ addu $t3, $a1, $t2 -/* 0095C 808C1AEC 00B94021 */ addu $t0, $a1, $t9 +/* 00958 808C1AE8 00AA5821 */ addu $t3, $a1, $t2 +/* 0095C 808C1AEC 00B94021 */ addu $t0, $a1, $t9 /* 00960 808C1AF0 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000000 /* 00964 808C1AF4 8D090000 */ lw $t1, 0x0000($t0) ## 00000000 /* 00968 808C1AF8 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 0096C 808C1AFC 00466824 */ and $t5, $v0, $a2 -/* 00970 808C1B00 00665024 */ and $t2, $v1, $a2 +/* 0096C 808C1AFC 00466824 */ and $t5, $v0, $a2 +/* 00970 808C1B00 00665024 */ and $t2, $v1, $a2 /* 00974 808C1B04 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00978 808C1B08 018D7021 */ addu $t6, $t4, $t5 -/* 0097C 808C1B0C 012A5821 */ addu $t3, $t1, $t2 -/* 00980 808C1B10 01C78821 */ addu $s1, $t6, $a3 -/* 00984 808C1B14 01679021 */ addu $s2, $t3, $a3 +/* 00978 808C1B08 018D7021 */ addu $t6, $t4, $t5 +/* 0097C 808C1B0C 012A5821 */ addu $t3, $t1, $t2 +/* 00980 808C1B10 01C78821 */ addu $s1, $t6, $a3 +/* 00984 808C1B14 01679021 */ addu $s2, $t3, $a3 /* 00988 808C1B18 0C00B55C */ jal Actor_Kill - + /* 0098C 808C1B1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00990 808C1B20 3C01808D */ lui $at, %hi(D_808CA64C) ## $at = 808D0000 -/* 00994 808C1B24 C432A64C */ lwc1 $f18, %lo(D_808CA64C)($at) +/* 00994 808C1B24 C432A64C */ lwc1 $f18, %lo(D_808CA64C)($at) /* 00998 808C1B28 3C01808D */ lui $at, %hi(D_808CA650) ## $at = 808D0000 -/* 0099C 808C1B2C C424A650 */ lwc1 $f4, %lo(D_808CA650)($at) +/* 0099C 808C1B2C C424A650 */ lwc1 $f4, %lo(D_808CA650)($at) /* 009A0 808C1B30 3C01808D */ lui $at, %hi(D_808CA654) ## $at = 808D0000 -/* 009A4 808C1B34 C426A654 */ lwc1 $f6, %lo(D_808CA654)($at) +/* 009A4 808C1B34 C426A654 */ lwc1 $f6, %lo(D_808CA654)($at) /* 009A8 808C1B38 26641C24 */ addiu $a0, $s3, 0x1C24 ## $a0 = 00001C24 -/* 009AC 808C1B3C AFA40048 */ sw $a0, 0x0048($sp) +/* 009AC 808C1B3C AFA40048 */ sw $a0, 0x0048($sp) /* 009B0 808C1B40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 009B4 808C1B44 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 009B8 808C1B48 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 009BC 808C1B4C AFA0001C */ sw $zero, 0x001C($sp) -/* 009C0 808C1B50 AFA00020 */ sw $zero, 0x0020($sp) -/* 009C4 808C1B54 AFA00024 */ sw $zero, 0x0024($sp) -/* 009C8 808C1B58 AFA00028 */ sw $zero, 0x0028($sp) -/* 009CC 808C1B5C E7B20010 */ swc1 $f18, 0x0010($sp) -/* 009D0 808C1B60 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 009BC 808C1B4C AFA0001C */ sw $zero, 0x001C($sp) +/* 009C0 808C1B50 AFA00020 */ sw $zero, 0x0020($sp) +/* 009C4 808C1B54 AFA00024 */ sw $zero, 0x0024($sp) +/* 009C8 808C1B58 AFA00028 */ sw $zero, 0x0028($sp) +/* 009CC 808C1B5C E7B20010 */ swc1 $f18, 0x0010($sp) +/* 009D0 808C1B60 E7A40014 */ swc1 $f4, 0x0014($sp) /* 009D4 808C1B64 0C00C916 */ jal Actor_SpawnAttached - -/* 009D8 808C1B68 E7A60018 */ swc1 $f6, 0x0018($sp) + +/* 009D8 808C1B68 E7A60018 */ swc1 $f6, 0x0018($sp) /* 009DC 808C1B6C 3C01808D */ lui $at, %hi(D_808CA658) ## $at = 808D0000 -/* 009E0 808C1B70 C428A658 */ lwc1 $f8, %lo(D_808CA658)($at) +/* 009E0 808C1B70 C428A658 */ lwc1 $f8, %lo(D_808CA658)($at) /* 009E4 808C1B74 3C01808D */ lui $at, %hi(D_808CA65C) ## $at = 808D0000 -/* 009E8 808C1B78 C42AA65C */ lwc1 $f10, %lo(D_808CA65C)($at) +/* 009E8 808C1B78 C42AA65C */ lwc1 $f10, %lo(D_808CA65C)($at) /* 009EC 808C1B7C 3C07C45E */ lui $a3, 0xC45E ## $a3 = C45E0000 /* 009F0 808C1B80 240C6000 */ addiu $t4, $zero, 0x6000 ## $t4 = 00006000 -/* 009F4 808C1B84 AFAC0024 */ sw $t4, 0x0024($sp) +/* 009F4 808C1B84 AFAC0024 */ sw $t4, 0x0024($sp) /* 009F8 808C1B88 34E78000 */ ori $a3, $a3, 0x8000 ## $a3 = C45E8000 -/* 009FC 808C1B8C 8FA40048 */ lw $a0, 0x0048($sp) +/* 009FC 808C1B8C 8FA40048 */ lw $a0, 0x0048($sp) /* 00A00 808C1B90 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00A04 808C1B94 24060059 */ addiu $a2, $zero, 0x0059 ## $a2 = 00000059 -/* 00A08 808C1B98 AFA00018 */ sw $zero, 0x0018($sp) -/* 00A0C 808C1B9C AFA0001C */ sw $zero, 0x001C($sp) -/* 00A10 808C1BA0 AFA00020 */ sw $zero, 0x0020($sp) -/* 00A14 808C1BA4 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00A08 808C1B98 AFA00018 */ sw $zero, 0x0018($sp) +/* 00A0C 808C1B9C AFA0001C */ sw $zero, 0x001C($sp) +/* 00A10 808C1BA0 AFA00020 */ sw $zero, 0x0020($sp) +/* 00A14 808C1BA4 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00A18 808C1BA8 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00A1C 808C1BAC E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 00A1C 808C1BAC E7AA0014 */ swc1 $f10, 0x0014($sp) /* 00A20 808C1BB0 3C01808D */ lui $at, %hi(D_808CA660) ## $at = 808D0000 -/* 00A24 808C1BB4 C430A660 */ lwc1 $f16, %lo(D_808CA660)($at) +/* 00A24 808C1BB4 C430A660 */ lwc1 $f16, %lo(D_808CA660)($at) /* 00A28 808C1BB8 3C01808D */ lui $at, %hi(D_808CA664) ## $at = 808D0000 -/* 00A2C 808C1BBC C432A664 */ lwc1 $f18, %lo(D_808CA664)($at) +/* 00A2C 808C1BBC C432A664 */ lwc1 $f18, %lo(D_808CA664)($at) /* 00A30 808C1BC0 3C07C42C */ lui $a3, 0xC42C ## $a3 = C42C0000 /* 00A34 808C1BC4 34E78000 */ ori $a3, $a3, 0x8000 ## $a3 = C42C8000 -/* 00A38 808C1BC8 8FA40048 */ lw $a0, 0x0048($sp) +/* 00A38 808C1BC8 8FA40048 */ lw $a0, 0x0048($sp) /* 00A3C 808C1BCC 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00A40 808C1BD0 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F -/* 00A44 808C1BD4 AFA00018 */ sw $zero, 0x0018($sp) -/* 00A48 808C1BD8 AFA0001C */ sw $zero, 0x001C($sp) -/* 00A4C 808C1BDC AFA00020 */ sw $zero, 0x0020($sp) -/* 00A50 808C1BE0 AFA00024 */ sw $zero, 0x0024($sp) -/* 00A54 808C1BE4 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00A44 808C1BD4 AFA00018 */ sw $zero, 0x0018($sp) +/* 00A48 808C1BD8 AFA0001C */ sw $zero, 0x001C($sp) +/* 00A4C 808C1BDC AFA00020 */ sw $zero, 0x0020($sp) +/* 00A50 808C1BE0 AFA00024 */ sw $zero, 0x0024($sp) +/* 00A54 808C1BE4 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00A58 808C1BE8 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00A5C 808C1BEC E7B20014 */ swc1 $f18, 0x0014($sp) +/* 00A5C 808C1BEC E7B20014 */ swc1 $f18, 0x0014($sp) /* 00A60 808C1BF0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L808C1BF4: -/* 00A64 808C1BF4 00031040 */ sll $v0, $v1, 1 +/* 00A64 808C1BF4 00031040 */ sll $v0, $v1, 1 /* 00A68 808C1BF8 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 00A6C 808C1BFC 00031C00 */ sll $v1, $v1, 16 -/* 00A70 808C1C00 02426821 */ addu $t5, $s2, $v0 +/* 00A6C 808C1BFC 00031C00 */ sll $v1, $v1, 16 +/* 00A70 808C1C00 02426821 */ addu $t5, $s2, $v0 /* 00A74 808C1C04 95AE0000 */ lhu $t6, 0x0000($t5) ## 00000000 -/* 00A78 808C1C08 00031C03 */ sra $v1, $v1, 16 -/* 00A7C 808C1C0C 28610800 */ slti $at, $v1, 0x0800 -/* 00A80 808C1C10 02227821 */ addu $t7, $s1, $v0 -/* 00A84 808C1C14 1420FFF7 */ bne $at, $zero, .L808C1BF4 +/* 00A78 808C1C08 00031C03 */ sra $v1, $v1, 16 +/* 00A7C 808C1C0C 28610800 */ slti $at, $v1, 0x0800 +/* 00A80 808C1C10 02227821 */ addu $t7, $s1, $v0 +/* 00A84 808C1C14 1420FFF7 */ bne $at, $zero, .L808C1BF4 /* 00A88 808C1C18 A5EE0000 */ sh $t6, 0x0000($t7) ## 00000000 .L808C1C1C: /* 00A8C 808C1C1C 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 00A90 808C1C20 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00A94 808C1C24 0301C824 */ and $t9, $t8, $at +/* 00A94 808C1C24 0301C824 */ and $t9, $t8, $at /* 00A98 808C1C28 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 00A9C 808C1C2C 8FBF0044 */ lw $ra, 0x0044($sp) -/* 00AA0 808C1C30 8FB30040 */ lw $s3, 0x0040($sp) -/* 00AA4 808C1C34 8FB2003C */ lw $s2, 0x003C($sp) -/* 00AA8 808C1C38 8FB10038 */ lw $s1, 0x0038($sp) -/* 00AAC 808C1C3C 8FB00034 */ lw $s0, 0x0034($sp) -/* 00AB0 808C1C40 03E00008 */ jr $ra +/* 00A9C 808C1C2C 8FBF0044 */ lw $ra, 0x0044($sp) +/* 00AA0 808C1C30 8FB30040 */ lw $s3, 0x0040($sp) +/* 00AA4 808C1C34 8FB2003C */ lw $s2, 0x003C($sp) +/* 00AA8 808C1C38 8FB10038 */ lw $s1, 0x0038($sp) +/* 00AAC 808C1C3C 8FB00034 */ lw $s0, 0x0034($sp) +/* 00AB0 808C1C40 03E00008 */ jr $ra /* 00AB4 808C1C44 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s index d1c8420a28..06a6257458 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s @@ -1,57 +1,57 @@ glabel func_808C32F4 /* 02164 808C32F4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02168 808C32F8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0216C 808C32FC AFB00030 */ sw $s0, 0x0030($sp) -/* 02170 808C3300 AFA50054 */ sw $a1, 0x0054($sp) +/* 02168 808C32F8 AFBF0034 */ sw $ra, 0x0034($sp) +/* 0216C 808C32FC AFB00030 */ sw $s0, 0x0030($sp) +/* 02170 808C3300 AFA50054 */ sw $a1, 0x0054($sp) /* 02174 808C3304 848E01AA */ lh $t6, 0x01AA($a0) ## 000001AA /* 02178 808C3308 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0217C 808C330C 15C0000C */ bne $t6, $zero, .L808C3340 +/* 0217C 808C330C 15C0000C */ bne $t6, $zero, .L808C3340 /* 02180 808C3310 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02184 808C3314 AFA4003C */ sw $a0, 0x003C($sp) -/* 02188 808C3318 0C0295B2 */ jal func_800A56C8 +/* 02184 808C3314 AFA4003C */ sw $a0, 0x003C($sp) +/* 02188 808C3318 0C0295B2 */ jal func_800A56C8 /* 0218C 808C331C 3C054160 */ lui $a1, 0x4160 ## $a1 = 41600000 -/* 02190 808C3320 10400050 */ beq $v0, $zero, .L808C3464 -/* 02194 808C3324 8FA4003C */ lw $a0, 0x003C($sp) +/* 02190 808C3320 10400050 */ beq $v0, $zero, .L808C3464 +/* 02194 808C3324 8FA4003C */ lw $a0, 0x003C($sp) /* 02198 808C3328 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 0219C 808C332C 0C0294BE */ jal func_800A52F8 +/* 0219C 808C332C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 021A0 808C3330 24A5CAE0 */ addiu $a1, $a1, 0xCAE0 ## $a1 = 0601CAE0 /* 021A4 808C3334 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 021A8 808C3338 1000004A */ beq $zero, $zero, .L808C3464 +/* 021A8 808C3338 1000004A */ beq $zero, $zero, .L808C3464 /* 021AC 808C333C A60301AA */ sh $v1, 0x01AA($s0) ## 000001AA .L808C3340: /* 021B0 808C3340 860F01BC */ lh $t7, 0x01BC($s0) ## 000001BC /* 021B4 808C3344 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 021B8 808C3348 11E10046 */ beq $t7, $at, .L808C3464 +/* 021B8 808C3348 11E10046 */ beq $t7, $at, .L808C3464 /* 021BC 808C334C 00000000 */ nop /* 021C0 808C3350 C6040164 */ lwc1 $f4, 0x0164($s0) ## 00000164 /* 021C4 808C3354 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 021C8 808C3358 2401001F */ addiu $at, $zero, 0x001F ## $at = 0000001F -/* 021CC 808C335C 4600218D */ trunc.w.s $f6, $f4 -/* 021D0 808C3360 44023000 */ mfc1 $v0, $f6 +/* 021CC 808C335C 4600218D */ trunc.w.s $f6, $f4 +/* 021D0 808C3360 44023000 */ mfc1 $v0, $f6 /* 021D4 808C3364 00000000 */ nop -/* 021D8 808C3368 10620003 */ beq $v1, $v0, .L808C3378 +/* 021D8 808C3368 10620003 */ beq $v1, $v0, .L808C3378 /* 021DC 808C336C 00000000 */ nop -/* 021E0 808C3370 1441003C */ bne $v0, $at, .L808C3464 +/* 021E0 808C3370 1441003C */ bne $v0, $at, .L808C3464 /* 021E4 808C3374 00000000 */ nop .L808C3378: -/* 021E8 808C3378 14620012 */ bne $v1, $v0, .L808C33C4 -/* 021EC 808C337C 8FA40054 */ lw $a0, 0x0054($sp) +/* 021E8 808C3378 14620012 */ bne $v1, $v0, .L808C33C4 +/* 021EC 808C337C 8FA40054 */ lw $a0, 0x0054($sp) /* 021F0 808C3380 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 021F4 808C3384 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 /* 021F8 808C3388 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A /* 021FC 808C338C 240801F4 */ addiu $t0, $zero, 0x01F4 ## $t0 = 000001F4 /* 02200 808C3390 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 02204 808C3394 AFA9001C */ sw $t1, 0x001C($sp) -/* 02208 808C3398 AFA80018 */ sw $t0, 0x0018($sp) -/* 0220C 808C339C AFB90010 */ sw $t9, 0x0010($sp) -/* 02210 808C33A0 8FA40054 */ lw $a0, 0x0054($sp) +/* 02204 808C3394 AFA9001C */ sw $t1, 0x001C($sp) +/* 02208 808C3398 AFA80018 */ sw $t0, 0x0018($sp) +/* 0220C 808C339C AFB90010 */ sw $t9, 0x0010($sp) +/* 02210 808C33A0 8FA40054 */ lw $a0, 0x0054($sp) /* 02214 808C33A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02218 808C33A8 26060410 */ addiu $a2, $s0, 0x0410 ## $a2 = 00000410 /* 0221C 808C33AC 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 02220 808C33B0 AFA00020 */ sw $zero, 0x0020($sp) -/* 02224 808C33B4 0C00CC98 */ jal func_80033260 -/* 02228 808C33B8 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 0222C 808C33BC 10000010 */ beq $zero, $zero, .L808C3400 +/* 02220 808C33B0 AFA00020 */ sw $zero, 0x0020($sp) +/* 02224 808C33B4 0C00CC98 */ jal func_80033260 +/* 02228 808C33B8 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 0222C 808C33BC 10000010 */ beq $zero, $zero, .L808C3400 /* 02230 808C33C0 860D01BC */ lh $t5, 0x01BC($s0) ## 000001BC .L808C33C4: /* 02234 808C33C4 3C014100 */ lui $at, 0x4100 ## $at = 41000000 @@ -59,76 +59,76 @@ glabel func_808C32F4 /* 0223C 808C33CC 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A /* 02240 808C33D0 240B01F4 */ addiu $t3, $zero, 0x01F4 ## $t3 = 000001F4 /* 02244 808C33D4 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 02248 808C33D8 AFAC001C */ sw $t4, 0x001C($sp) -/* 0224C 808C33DC AFAB0018 */ sw $t3, 0x0018($sp) -/* 02250 808C33E0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 02248 808C33D8 AFAC001C */ sw $t4, 0x001C($sp) +/* 0224C 808C33DC AFAB0018 */ sw $t3, 0x0018($sp) +/* 02250 808C33E0 AFAA0010 */ sw $t2, 0x0010($sp) /* 02254 808C33E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02258 808C33E8 26060404 */ addiu $a2, $s0, 0x0404 ## $a2 = 00000404 /* 0225C 808C33EC 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 02260 808C33F0 AFA00020 */ sw $zero, 0x0020($sp) -/* 02264 808C33F4 0C00CC98 */ jal func_80033260 -/* 02268 808C33F8 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 02260 808C33F0 AFA00020 */ sw $zero, 0x0020($sp) +/* 02264 808C33F4 0C00CC98 */ jal func_80033260 +/* 02268 808C33F8 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 0226C 808C33FC 860D01BC */ lh $t5, 0x01BC($s0) ## 000001BC .L808C3400: /* 02270 808C3400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02274 808C3404 11A00005 */ beq $t5, $zero, .L808C341C +/* 02274 808C3404 11A00005 */ beq $t5, $zero, .L808C341C /* 02278 808C3408 00000000 */ nop -/* 0227C 808C340C 0C01E221 */ jal func_80078884 +/* 0227C 808C340C 0C01E221 */ jal func_80078884 /* 02280 808C3410 24043808 */ addiu $a0, $zero, 0x3808 ## $a0 = 00003808 -/* 02284 808C3414 10000004 */ beq $zero, $zero, .L808C3428 +/* 02284 808C3414 10000004 */ beq $zero, $zero, .L808C3428 /* 02288 808C3418 860E01B4 */ lh $t6, 0x01B4($s0) ## 000001B4 .L808C341C: /* 0228C 808C341C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02290 808C3420 24053808 */ addiu $a1, $zero, 0x3808 ## $a1 = 00003808 /* 02294 808C3424 860E01B4 */ lh $t6, 0x01B4($s0) ## 000001B4 .L808C3428: /* 02298 808C3428 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 0229C 808C342C 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 022A0 808C3430 15C00008 */ bne $t6, $zero, .L808C3454 +/* 022A0 808C3430 15C00008 */ bne $t6, $zero, .L808C3454 /* 022A4 808C3434 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 022A8 808C3438 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022AC 808C343C 8FA50054 */ lw $a1, 0x0054($sp) +/* 022AC 808C343C 8FA50054 */ lw $a1, 0x0054($sp) /* 022B0 808C3440 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 022B4 808C3444 0C00CFA2 */ jal func_80033E88 +/* 022B4 808C3444 0C00CFA2 */ jal func_80033E88 /* 022B8 808C3448 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 022BC 808C344C 10000005 */ beq $zero, $zero, .L808C3464 +/* 022BC 808C344C 10000005 */ beq $zero, $zero, .L808C3464 /* 022C0 808C3450 00000000 */ nop .L808C3454: /* 022C4 808C3454 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 022C8 808C3458 A60F01B6 */ sh $t7, 0x01B6($s0) ## 000001B6 -/* 022CC 808C345C 0C02A7DB */ jal func_800A9F6C +/* 022CC 808C345C 0C02A7DB */ jal func_800A9F6C /* 022D0 808C3460 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 .L808C3464: /* 022D4 808C3464 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 022D8 808C3468 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 022DC 808C346C 3C01808D */ lui $at, %hi(D_808CA6C4) ## $at = 808D0000 -/* 022E0 808C3470 C420A6C4 */ lwc1 $f0, %lo(D_808CA6C4)($at) +/* 022E0 808C3470 C420A6C4 */ lwc1 $f0, %lo(D_808CA6C4)($at) /* 022E4 808C3474 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 022E8 808C3478 44818000 */ mtc1 $at, $f16 ## $f16 = 4.00 /* 022EC 808C347C 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 022F0 808C3480 44812000 */ mtc1 $at, $f4 ## $f4 = 0.25 -/* 022F4 808C3484 46100482 */ mul.s $f18, $f0, $f16 +/* 022F4 808C3484 46100482 */ mul.s $f18, $f0, $f16 /* 022F8 808C3488 861801A0 */ lh $t8, 0x01A0($s0) ## 000001A0 /* 022FC 808C348C 3C08808D */ lui $t0, %hi(D_808CA3F8) ## $t0 = 808D0000 -/* 02300 808C3490 46040182 */ mul.s $f6, $f0, $f4 -/* 02304 808C3494 0018C880 */ sll $t9, $t8, 2 -/* 02308 808C3498 0338C823 */ subu $t9, $t9, $t8 -/* 0230C 808C349C 0019C880 */ sll $t9, $t9, 2 +/* 02300 808C3490 46040182 */ mul.s $f6, $f0, $f4 +/* 02304 808C3494 0018C880 */ sll $t9, $t8, 2 +/* 02308 808C3498 0338C823 */ subu $t9, $t9, $t8 +/* 0230C 808C349C 0019C880 */ sll $t9, $t9, 2 /* 02310 808C34A0 2508A3F8 */ addiu $t0, $t0, %lo(D_808CA3F8) ## $t0 = 808CA3F8 -/* 02314 808C34A4 03284821 */ addu $t1, $t9, $t0 +/* 02314 808C34A4 03284821 */ addu $t1, $t9, $t0 /* 02318 808C34A8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0231C 808C34AC AFA9004C */ sw $t1, 0x004C($sp) -/* 02320 808C34B0 44073000 */ mfc1 $a3, $f6 -/* 02324 808C34B4 44059000 */ mfc1 $a1, $f18 +/* 0231C 808C34AC AFA9004C */ sw $t1, 0x004C($sp) +/* 02320 808C34B0 44073000 */ mfc1 $a3, $f6 +/* 02324 808C34B4 44059000 */ mfc1 $a1, $f18 /* 02328 808C34B8 E60001EC */ swc1 $f0, 0x01EC($s0) ## 000001EC /* 0232C 808C34BC 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 02330 808C34C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02334 808C34C4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02338 808C34C8 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 0233C 808C34CC 8FAA004C */ lw $t2, 0x004C($sp) + +/* 02338 808C34C8 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0233C 808C34CC 8FAA004C */ lw $t2, 0x004C($sp) /* 02340 808C34D0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 02344 808C34D4 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 02348 808C34D8 8E0701E4 */ lw $a3, 0x01E4($s0) ## 000001E4 @@ -136,9 +136,9 @@ glabel func_808C32F4 /* 02350 808C34E0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 02354 808C34E4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 02358 808C34E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0235C 808C34EC E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 02360 808C34F0 8FAB004C */ lw $t3, 0x004C($sp) + +/* 0235C 808C34EC E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 02360 808C34F0 8FAB004C */ lw $t3, 0x004C($sp) /* 02364 808C34F4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 02368 808C34F8 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 0236C 808C34FC 8E0701E4 */ lw $a3, 0x01E4($s0) ## 000001E4 @@ -146,87 +146,87 @@ glabel func_808C32F4 /* 02374 808C3504 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 02378 808C3508 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 0237C 808C350C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02380 808C3510 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 02384 808C3514 8FA2004C */ lw $v0, 0x004C($sp) + +/* 02380 808C3510 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 02384 808C3514 8FA2004C */ lw $v0, 0x004C($sp) /* 02388 808C3518 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 0238C 808C351C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 02390 808C3520 C4520000 */ lwc1 $f18, 0x0000($v0) ## 00000000 /* 02394 808C3524 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 /* 02398 808C3528 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 -/* 0239C 808C352C 46049181 */ sub.s $f6, $f18, $f4 +/* 0239C 808C352C 46049181 */ sub.s $f6, $f18, $f4 /* 023A0 808C3530 44812000 */ mtc1 $at, $f4 ## $f4 = 80.00 /* 023A4 808C3534 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 023A8 808C3538 E7A60048 */ swc1 $f6, 0x0048($sp) +/* 023A8 808C3538 E7A60048 */ swc1 $f6, 0x0048($sp) /* 023AC 808C353C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 023B0 808C3540 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00000008 -/* 023B4 808C3544 460A4401 */ sub.s $f16, $f8, $f10 +/* 023B4 808C3544 460A4401 */ sub.s $f16, $f8, $f10 /* 023B8 808C3548 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 023BC 808C354C E7B00044 */ swc1 $f16, 0x0044($sp) +/* 023BC 808C354C E7B00044 */ swc1 $f16, 0x0044($sp) /* 023C0 808C3550 C61201EC */ lwc1 $f18, 0x01EC($s0) ## 000001EC -/* 023C4 808C3554 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 023C8 808C3558 46049182 */ mul.s $f6, $f18, $f4 -/* 023CC 808C355C 44073000 */ mfc1 $a3, $f6 +/* 023C4 808C3554 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 023C8 808C3558 46049182 */ mul.s $f6, $f18, $f4 +/* 023CC 808C355C 44073000 */ mfc1 $a3, $f6 /* 023D0 808C3560 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 023D4 808C3564 00000000 */ nop -/* 023D8 808C3568 C7AC0048 */ lwc1 $f12, 0x0048($sp) -/* 023DC 808C356C 0C03F494 */ jal Math_atan2f -/* 023E0 808C3570 C7AE0044 */ lwc1 $f14, 0x0044($sp) +/* 023D8 808C3568 C7AC0048 */ lwc1 $f12, 0x0048($sp) +/* 023DC 808C356C 0C03F494 */ jal Math_atan2f +/* 023E0 808C3570 C7AE0044 */ lwc1 $f14, 0x0044($sp) /* 023E4 808C3574 3C01808D */ lui $at, %hi(D_808CA6C8) ## $at = 808D0000 -/* 023E8 808C3578 C42AA6C8 */ lwc1 $f10, %lo(D_808CA6C8)($at) +/* 023E8 808C3578 C42AA6C8 */ lwc1 $f10, %lo(D_808CA6C8)($at) /* 023EC 808C357C C60401EC */ lwc1 $f4, 0x01EC($s0) ## 000001EC /* 023F0 808C3580 C60601E8 */ lwc1 $f6, 0x01E8($s0) ## 000001E8 -/* 023F4 808C3584 460A0402 */ mul.s $f16, $f0, $f10 +/* 023F4 808C3584 460A0402 */ mul.s $f16, $f0, $f10 /* 023F8 808C3588 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 023FC 808C358C AFAE0010 */ sw $t6, 0x0010($sp) -/* 02400 808C3590 46062202 */ mul.s $f8, $f4, $f6 +/* 023FC 808C358C AFAE0010 */ sw $t6, 0x0010($sp) +/* 02400 808C3590 46062202 */ mul.s $f8, $f4, $f6 /* 02404 808C3594 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 02408 808C3598 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 0240C 808C359C 4600848D */ trunc.w.s $f18, $f16 -/* 02410 808C35A0 4600428D */ trunc.w.s $f10, $f8 -/* 02414 808C35A4 44059000 */ mfc1 $a1, $f18 -/* 02418 808C35A8 44075000 */ mfc1 $a3, $f10 -/* 0241C 808C35AC 00052C00 */ sll $a1, $a1, 16 -/* 02420 808C35B0 00052C03 */ sra $a1, $a1, 16 -/* 02424 808C35B4 00073C00 */ sll $a3, $a3, 16 +/* 0240C 808C359C 4600848D */ trunc.w.s $f18, $f16 +/* 02410 808C35A0 4600428D */ trunc.w.s $f10, $f8 +/* 02414 808C35A4 44059000 */ mfc1 $a1, $f18 +/* 02418 808C35A8 44075000 */ mfc1 $a3, $f10 +/* 0241C 808C35AC 00052C00 */ sll $a1, $a1, 16 +/* 02420 808C35B0 00052C03 */ sra $a1, $a1, 16 +/* 02424 808C35B4 00073C00 */ sll $a3, $a3, 16 /* 02428 808C35B8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0242C 808C35BC 00073C03 */ sra $a3, $a3, 16 + +/* 0242C 808C35BC 00073C03 */ sra $a3, $a3, 16 /* 02430 808C35C0 260401C4 */ addiu $a0, $s0, 0x01C4 ## $a0 = 000001C4 /* 02434 808C35C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02438 808C35C8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0243C 808C35CC 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 02440 808C35D0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02444 808C35D4 AFA00010 */ sw $zero, 0x0010($sp) -/* 02448 808C35D8 C7A00048 */ lwc1 $f0, 0x0048($sp) + +/* 02444 808C35D4 AFA00010 */ sw $zero, 0x0010($sp) +/* 02448 808C35D8 C7A00048 */ lwc1 $f0, 0x0048($sp) /* 0244C 808C35DC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02450 808C35E0 44811000 */ mtc1 $at, $f2 ## $f2 = 5.00 -/* 02454 808C35E4 46000005 */ abs.s $f0, $f0 -/* 02458 808C35E8 4602003E */ c.le.s $f0, $f2 -/* 0245C 808C35EC C7A00044 */ lwc1 $f0, 0x0044($sp) -/* 02460 808C35F0 4502001E */ bc1fl .L808C366C +/* 02454 808C35E4 46000005 */ abs.s $f0, $f0 +/* 02458 808C35E8 4602003E */ c.le.s $f0, $f2 +/* 0245C 808C35EC C7A00044 */ lwc1 $f0, 0x0044($sp) +/* 02460 808C35F0 4502001E */ bc1fl .L808C366C /* 02464 808C35F4 860D01DA */ lh $t5, 0x01DA($s0) ## 000001DA -/* 02468 808C35F8 46000005 */ abs.s $f0, $f0 -/* 0246C 808C35FC 4602003E */ c.le.s $f0, $f2 +/* 02468 808C35F8 46000005 */ abs.s $f0, $f0 +/* 0246C 808C35FC 4602003E */ c.le.s $f0, $f2 /* 02470 808C3600 00000000 */ nop -/* 02474 808C3604 45020019 */ bc1fl .L808C366C +/* 02474 808C3604 45020019 */ bc1fl .L808C366C /* 02478 808C3608 860D01DA */ lh $t5, 0x01DA($s0) ## 000001DA /* 0247C 808C360C 860F01A2 */ lh $t7, 0x01A2($s0) ## 000001A2 /* 02480 808C3610 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 02484 808C3614 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 02488 808C3618 E61001E8 */ swc1 $f16, 0x01E8($s0) ## 000001E8 -/* 0248C 808C361C 15E0000A */ bne $t7, $zero, .L808C3648 +/* 0248C 808C361C 15E0000A */ bne $t7, $zero, .L808C3648 /* 02490 808C3620 E61201E4 */ swc1 $f18, 0x01E4($s0) ## 000001E4 /* 02494 808C3624 861801A0 */ lh $t8, 0x01A0($s0) ## 000001A0 /* 02498 808C3628 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 0249C 808C362C A61901A0 */ sh $t9, 0x01A0($s0) ## 000001A0 /* 024A0 808C3630 860801A0 */ lh $t0, 0x01A0($s0) ## 000001A0 -/* 024A4 808C3634 29010004 */ slti $at, $t0, 0x0004 -/* 024A8 808C3638 5420000C */ bnel $at, $zero, .L808C366C +/* 024A4 808C3634 29010004 */ slti $at, $t0, 0x0004 +/* 024A8 808C3638 5420000C */ bnel $at, $zero, .L808C366C /* 024AC 808C363C 860D01DA */ lh $t5, 0x01DA($s0) ## 000001DA -/* 024B0 808C3640 10000009 */ beq $zero, $zero, .L808C3668 +/* 024B0 808C3640 10000009 */ beq $zero, $zero, .L808C3668 /* 024B4 808C3644 A60001A0 */ sh $zero, 0x01A0($s0) ## 000001A0 .L808C3648: /* 024B8 808C3648 860901A0 */ lh $t1, 0x01A0($s0) ## 000001A0 @@ -234,51 +234,51 @@ glabel func_808C32F4 /* 024C0 808C3650 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF /* 024C4 808C3654 A60A01A0 */ sh $t2, 0x01A0($s0) ## 000001A0 /* 024C8 808C3658 860B01A0 */ lh $t3, 0x01A0($s0) ## 000001A0 -/* 024CC 808C365C 05630003 */ bgezl $t3, .L808C366C +/* 024CC 808C365C 05630003 */ bgezl $t3, .L808C366C /* 024D0 808C3660 860D01DA */ lh $t5, 0x01DA($s0) ## 000001DA /* 024D4 808C3664 A60C01A0 */ sh $t4, 0x01A0($s0) ## 000001A0 .L808C3668: /* 024D8 808C3668 860D01DA */ lh $t5, 0x01DA($s0) ## 000001DA .L808C366C: -/* 024DC 808C366C 55A00021 */ bnel $t5, $zero, .L808C36F4 -/* 024E0 808C3670 8FBF0034 */ lw $ra, 0x0034($sp) +/* 024DC 808C366C 55A00021 */ bnel $t5, $zero, .L808C36F4 +/* 024E0 808C3670 8FBF0034 */ lw $ra, 0x0034($sp) /* 024E4 808C3674 860E01BC */ lh $t6, 0x01BC($s0) ## 000001BC /* 024E8 808C3678 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 024EC 808C367C 55C0001D */ bnel $t6, $zero, .L808C36F4 -/* 024F0 808C3680 8FBF0034 */ lw $ra, 0x0034($sp) +/* 024EC 808C367C 55C0001D */ bnel $t6, $zero, .L808C36F4 +/* 024F0 808C3680 8FBF0034 */ lw $ra, 0x0034($sp) /* 024F4 808C3684 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 /* 024F8 808C3688 44813000 */ mtc1 $at, $f6 ## $f6 = 500.00 /* 024FC 808C368C 00000000 */ nop -/* 02500 808C3690 4606203C */ c.lt.s $f4, $f6 +/* 02500 808C3690 4606203C */ c.lt.s $f4, $f6 /* 02504 808C3694 00000000 */ nop -/* 02508 808C3698 4502000E */ bc1fl .L808C36D4 +/* 02508 808C3698 4502000E */ bc1fl .L808C36D4 /* 0250C 808C369C 861901BA */ lh $t9, 0x01BA($s0) ## 000001BA /* 02510 808C36A0 860F01A4 */ lh $t7, 0x01A4($s0) ## 000001A4 -/* 02514 808C36A4 51E0000B */ beql $t7, $zero, .L808C36D4 +/* 02514 808C36A4 51E0000B */ beql $t7, $zero, .L808C36D4 /* 02518 808C36A8 861901BA */ lh $t9, 0x01BA($s0) ## 000001BA /* 0251C 808C36AC 861801BA */ lh $t8, 0x01BA($s0) ## 000001BA -/* 02520 808C36B0 57000008 */ bnel $t8, $zero, .L808C36D4 +/* 02520 808C36B0 57000008 */ bnel $t8, $zero, .L808C36D4 /* 02524 808C36B4 861901BA */ lh $t9, 0x01BA($s0) ## 000001BA -/* 02528 808C36B8 0C230ACE */ jal func_808C2B38 +/* 02528 808C36B8 0C230ACE */ jal func_808C2B38 /* 0252C 808C36BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02530 808C36C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02534 808C36C4 8FA50054 */ lw $a1, 0x0054($sp) -/* 02538 808C36C8 0C2314B8 */ jal func_808C52E0 +/* 02534 808C36C4 8FA50054 */ lw $a1, 0x0054($sp) +/* 02538 808C36C8 0C2314B8 */ jal func_808C52E0 /* 0253C 808C36CC 2406FFFF */ addiu $a2, $zero, 0xFFFF ## $a2 = FFFFFFFF /* 02540 808C36D0 861901BA */ lh $t9, 0x01BA($s0) ## 000001BA .L808C36D4: -/* 02544 808C36D4 57200007 */ bnel $t9, $zero, .L808C36F4 -/* 02548 808C36D8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 02544 808C36D4 57200007 */ bnel $t9, $zero, .L808C36F4 +/* 02548 808C36D8 8FBF0034 */ lw $ra, 0x0034($sp) /* 0254C 808C36DC 860801B8 */ lh $t0, 0x01B8($s0) ## 000001B8 -/* 02550 808C36E0 55000004 */ bnel $t0, $zero, .L808C36F4 -/* 02554 808C36E4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 02558 808C36E8 0C230A90 */ jal func_808C2A40 +/* 02550 808C36E0 55000004 */ bnel $t0, $zero, .L808C36F4 +/* 02554 808C36E4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 02558 808C36E8 0C230A90 */ jal func_808C2A40 /* 0255C 808C36EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02560 808C36F0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 02560 808C36F0 8FBF0034 */ lw $ra, 0x0034($sp) .L808C36F4: -/* 02564 808C36F4 8FB00030 */ lw $s0, 0x0030($sp) +/* 02564 808C36F4 8FB00030 */ lw $s0, 0x0030($sp) /* 02568 808C36F8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 0256C 808C36FC 03E00008 */ jr $ra +/* 0256C 808C36FC 03E00008 */ jr $ra /* 02570 808C3700 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s index fcb2e29e74..8e78cb8f09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s @@ -1,25 +1,25 @@ glabel BossFd_Destroy /* 00864 808CB624 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00868 808CB628 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0086C 808CB62C AFA40018 */ sw $a0, 0x0018($sp) -/* 00870 808CB630 AFA5001C */ sw $a1, 0x001C($sp) -/* 00874 808CB634 0C0295BC */ jal func_800A56F0 +/* 00868 808CB628 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0086C 808CB62C AFA40018 */ sw $a0, 0x0018($sp) +/* 00870 808CB630 AFA5001C */ sw $a1, 0x001C($sp) +/* 00874 808CB634 0C0295BC */ jal SkelAnime_Free /* 00878 808CB638 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0087C 808CB63C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00880 808CB640 8FA5001C */ lw $a1, 0x001C($sp) -/* 00884 808CB644 0C0295BC */ jal func_800A56F0 +/* 0087C 808CB63C 8FA40018 */ lw $a0, 0x0018($sp) +/* 00880 808CB640 8FA5001C */ lw $a1, 0x001C($sp) +/* 00884 808CB644 0C0295BC */ jal SkelAnime_Free /* 00888 808CB648 24840190 */ addiu $a0, $a0, 0x0190 ## $a0 = 00000190 -/* 0088C 808CB64C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00890 808CB650 8FA5001C */ lw $a1, 0x001C($sp) -/* 00894 808CB654 0C0295BC */ jal func_800A56F0 +/* 0088C 808CB64C 8FA40018 */ lw $a0, 0x0018($sp) +/* 00890 808CB650 8FA5001C */ lw $a1, 0x001C($sp) +/* 00894 808CB654 0C0295BC */ jal SkelAnime_Free /* 00898 808CB658 248401D4 */ addiu $a0, $a0, 0x01D4 ## $a0 = 000001D4 -/* 0089C 808CB65C 8FA50018 */ lw $a1, 0x0018($sp) -/* 008A0 808CB660 8FA4001C */ lw $a0, 0x001C($sp) -/* 008A4 808CB664 0C016F32 */ jal func_8005BCC8 +/* 0089C 808CB65C 8FA50018 */ lw $a1, 0x0018($sp) +/* 008A0 808CB660 8FA4001C */ lw $a0, 0x001C($sp) +/* 008A4 808CB664 0C016F32 */ jal func_8005BCC8 /* 008A8 808CB668 24A51490 */ addiu $a1, $a1, 0x1490 ## $a1 = 00001490 -/* 008AC 808CB66C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 008AC 808CB66C 8FBF0014 */ lw $ra, 0x0014($sp) /* 008B0 808CB670 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008B4 808CB674 03E00008 */ jr $ra +/* 008B4 808CB674 03E00008 */ jr $ra /* 008B8 808CB678 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s index 8dc0a871ba..35b2b85b7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s @@ -1,17 +1,17 @@ glabel BossFd2_Destroy /* 00528 808D2B98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0052C 808D2B9C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00530 808D2BA0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00534 808D2BA4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00538 808D2BA8 0C0295BC */ jal func_800A56F0 +/* 0052C 808D2B9C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00530 808D2BA0 AFA40018 */ sw $a0, 0x0018($sp) +/* 00534 808D2BA4 AFA5001C */ sw $a1, 0x001C($sp) +/* 00538 808D2BA8 0C0295BC */ jal SkelAnime_Free /* 0053C 808D2BAC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00540 808D2BB0 8FA50018 */ lw $a1, 0x0018($sp) -/* 00544 808D2BB4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00548 808D2BB8 0C016F32 */ jal func_8005BCC8 +/* 00540 808D2BB0 8FA50018 */ lw $a1, 0x0018($sp) +/* 00544 808D2BB4 8FA4001C */ lw $a0, 0x001C($sp) +/* 00548 808D2BB8 0C016F32 */ jal func_8005BCC8 /* 0054C 808D2BBC 24A5141C */ addiu $a1, $a1, 0x141C ## $a1 = 0000141C -/* 00550 808D2BC0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00550 808D2BC0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00554 808D2BC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00558 808D2BC8 03E00008 */ jr $ra +/* 00558 808D2BC8 03E00008 */ jr $ra /* 0055C 808D2BCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s index dad64f368e..6cd4a224c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s @@ -1,42 +1,42 @@ glabel BossFd2_Draw /* 036E0 808D5D50 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 036E4 808D5D54 AFB20040 */ sw $s2, 0x0040($sp) +/* 036E4 808D5D54 AFB20040 */ sw $s2, 0x0040($sp) /* 036E8 808D5D58 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 036EC 808D5D5C AFBF0044 */ sw $ra, 0x0044($sp) -/* 036F0 808D5D60 AFB1003C */ sw $s1, 0x003C($sp) -/* 036F4 808D5D64 AFB00038 */ sw $s0, 0x0038($sp) +/* 036EC 808D5D5C AFBF0044 */ sw $ra, 0x0044($sp) +/* 036F0 808D5D60 AFB1003C */ sw $s1, 0x003C($sp) +/* 036F4 808D5D64 AFB00038 */ sw $s0, 0x0038($sp) /* 036F8 808D5D68 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 036FC 808D5D6C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 03700 808D5D70 3C06808D */ lui $a2, %hi(D_808D6444) ## $a2 = 808D0000 /* 03704 808D5D74 24C66444 */ addiu $a2, $a2, %lo(D_808D6444) ## $a2 = 808D6444 /* 03708 808D5D78 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 0370C 808D5D7C 24070A39 */ addiu $a3, $zero, 0x0A39 ## $a3 = 00000A39 -/* 03710 808D5D80 0C031AB1 */ jal func_800C6AC4 +/* 03710 808D5D80 0C031AB1 */ jal func_800C6AC4 /* 03714 808D5D84 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 03718 808D5D88 3C04808D */ lui $a0, %hi(D_808D6454) ## $a0 = 808D0000 /* 0371C 808D5D8C 0C00084C */ jal osSyncPrintf - + /* 03720 808D5D90 24846454 */ addiu $a0, $a0, %lo(D_808D6454) ## $a0 = 808D6454 /* 03724 808D5D94 8E2F0190 */ lw $t7, 0x0190($s1) ## 00000190 /* 03728 808D5D98 3C0E808D */ lui $t6, %hi(func_808D4748) ## $t6 = 808D0000 /* 0372C 808D5D9C 25CE4748 */ addiu $t6, $t6, %lo(func_808D4748) ## $t6 = 808D4748 -/* 03730 808D5DA0 11CF0075 */ beq $t6, $t7, .L808D5F78 +/* 03730 808D5DA0 11CF0075 */ beq $t6, $t7, .L808D5F78 /* 03734 808D5DA4 00000000 */ nop -/* 03738 808D5DA8 0C024F46 */ jal func_80093D18 +/* 03738 808D5DA8 0C024F46 */ jal func_80093D18 /* 0373C 808D5DAC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 03740 808D5DB0 863801A6 */ lh $t8, 0x01A6($s1) ## 000001A6 /* 03744 808D5DB4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 03748 808D5DB8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 0374C 808D5DBC 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 03750 808D5DC0 13200009 */ beq $t9, $zero, .L808D5DE8 +/* 03750 808D5DC0 13200009 */ beq $t9, $zero, .L808D5DE8 /* 03754 808D5DC4 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF /* 03758 808D5DC8 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0375C 808D5DCC 24080384 */ addiu $t0, $zero, 0x0384 ## $t0 = 00000384 /* 03760 808D5DD0 2409044B */ addiu $t1, $zero, 0x044B ## $t1 = 0000044B -/* 03764 808D5DD4 AFA90018 */ sw $t1, 0x0018($sp) -/* 03768 808D5DD8 AFA80014 */ sw $t0, 0x0014($sp) -/* 0376C 808D5DDC 0C024CDC */ jal func_80093370 -/* 03770 808D5DE0 AFA00010 */ sw $zero, 0x0010($sp) +/* 03764 808D5DD4 AFA90018 */ sw $t1, 0x0018($sp) +/* 03768 808D5DD8 AFA80014 */ sw $t0, 0x0014($sp) +/* 0376C 808D5DDC 0C024CDC */ jal func_80093370 +/* 03770 808D5DE0 AFA00010 */ sw $zero, 0x0010($sp) /* 03774 808D5DE4 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L808D5DE8: /* 03778 808D5DE8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -48,20 +48,20 @@ glabel BossFd2_Draw /* 03790 808D5E00 922C0223 */ lbu $t4, 0x0223($s1) ## 00000223 /* 03794 808D5E04 3C04808D */ lui $a0, %hi(D_808D62C0) ## $a0 = 808D0000 /* 03798 808D5E08 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 0379C 808D5E0C 000C6880 */ sll $t5, $t4, 2 -/* 037A0 808D5E10 008D2021 */ addu $a0, $a0, $t5 -/* 037A4 808D5E14 8C8462C0 */ lw $a0, %lo(D_808D62C0)($a0) +/* 0379C 808D5E0C 000C6880 */ sll $t5, $t4, 2 +/* 037A0 808D5E10 008D2021 */ addu $a0, $a0, $t5 +/* 037A4 808D5E14 8C8462C0 */ lw $a0, %lo(D_808D62C0)($a0) /* 037A8 808D5E18 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 037AC 808D5E1C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 037B0 808D5E20 00047900 */ sll $t7, $a0, 4 -/* 037B4 808D5E24 000FC702 */ srl $t8, $t7, 28 -/* 037B8 808D5E28 0018C880 */ sll $t9, $t8, 2 -/* 037BC 808D5E2C 01194021 */ addu $t0, $t0, $t9 +/* 037B0 808D5E20 00047900 */ sll $t7, $a0, 4 +/* 037B4 808D5E24 000FC702 */ srl $t8, $t7, 28 +/* 037B8 808D5E28 0018C880 */ sll $t9, $t8, 2 +/* 037BC 808D5E2C 01194021 */ addu $t0, $t0, $t9 /* 037C0 808D5E30 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 037C4 808D5E34 00817024 */ and $t6, $a0, $at +/* 037C4 808D5E34 00817024 */ and $t6, $a0, $at /* 037C8 808D5E38 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 037CC 808D5E3C 01C84821 */ addu $t1, $t6, $t0 -/* 037D0 808D5E40 01215021 */ addu $t2, $t1, $at +/* 037CC 808D5E3C 01C84821 */ addu $t1, $t6, $t0 +/* 037D0 808D5E40 01215021 */ addu $t2, $t1, $at /* 037D4 808D5E44 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 037D8 808D5E48 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 037DC 808D5E4C 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 @@ -75,36 +75,36 @@ glabel BossFd2_Draw /* 037FC 808D5E6C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 03800 808D5E70 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 /* 03804 808D5E74 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 03808 808D5E78 AFB80010 */ sw $t8, 0x0010($sp) -/* 0380C 808D5E7C AFB90014 */ sw $t9, 0x0014($sp) -/* 03810 808D5E80 AFAE0018 */ sw $t6, 0x0018($sp) +/* 03808 808D5E78 AFB80010 */ sw $t8, 0x0010($sp) +/* 0380C 808D5E7C AFB90014 */ sw $t9, 0x0014($sp) +/* 03810 808D5E80 AFAE0018 */ sw $t6, 0x0018($sp) /* 03814 808D5E84 C63001D0 */ lwc1 $f16, 0x01D0($s1) ## 000001D0 -/* 03818 808D5E88 4600218D */ trunc.w.s $f6, $f4 +/* 03818 808D5E88 4600218D */ trunc.w.s $f6, $f4 /* 0381C 808D5E8C 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 /* 03820 808D5E90 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03824 808D5E94 4600848D */ trunc.w.s $f18, $f16 -/* 03828 808D5E98 44063000 */ mfc1 $a2, $f6 -/* 0382C 808D5E9C 4600428D */ trunc.w.s $f10, $f8 -/* 03830 808D5EA0 44099000 */ mfc1 $t1, $f18 -/* 03834 808D5EA4 00063400 */ sll $a2, $a2, 16 -/* 03838 808D5EA8 00063403 */ sra $a2, $a2, 16 -/* 0383C 808D5EAC 00095400 */ sll $t2, $t1, 16 -/* 03840 808D5EB0 000A5C03 */ sra $t3, $t2, 16 -/* 03844 808D5EB4 AFAB001C */ sw $t3, 0x001C($sp) +/* 03824 808D5E94 4600848D */ trunc.w.s $f18, $f16 +/* 03828 808D5E98 44063000 */ mfc1 $a2, $f6 +/* 0382C 808D5E9C 4600428D */ trunc.w.s $f10, $f8 +/* 03830 808D5EA0 44099000 */ mfc1 $t1, $f18 +/* 03834 808D5EA4 00063400 */ sll $a2, $a2, 16 +/* 03838 808D5EA8 00063403 */ sra $a2, $a2, 16 +/* 0383C 808D5EAC 00095400 */ sll $t2, $t1, 16 +/* 03840 808D5EB0 000A5C03 */ sra $t3, $t2, 16 +/* 03844 808D5EB4 AFAB001C */ sw $t3, 0x001C($sp) /* 03848 808D5EB8 C62401D4 */ lwc1 $f4, 0x01D4($s1) ## 000001D4 -/* 0384C 808D5EBC 44075000 */ mfc1 $a3, $f10 -/* 03850 808D5EC0 AFAE0028 */ sw $t6, 0x0028($sp) -/* 03854 808D5EC4 4600218D */ trunc.w.s $f6, $f4 -/* 03858 808D5EC8 00073C00 */ sll $a3, $a3, 16 -/* 0385C 808D5ECC 00073C03 */ sra $a3, $a3, 16 -/* 03860 808D5ED0 AFB90024 */ sw $t9, 0x0024($sp) -/* 03864 808D5ED4 440D3000 */ mfc1 $t5, $f6 -/* 03868 808D5ED8 AFA20054 */ sw $v0, 0x0054($sp) -/* 0386C 808D5EDC 000D7C00 */ sll $t7, $t5, 16 -/* 03870 808D5EE0 000FC403 */ sra $t8, $t7, 16 -/* 03874 808D5EE4 0C0253D0 */ jal Draw_TwoTexScroll -/* 03878 808D5EE8 AFB80020 */ sw $t8, 0x0020($sp) -/* 0387C 808D5EEC 8FA30054 */ lw $v1, 0x0054($sp) +/* 0384C 808D5EBC 44075000 */ mfc1 $a3, $f10 +/* 03850 808D5EC0 AFAE0028 */ sw $t6, 0x0028($sp) +/* 03854 808D5EC4 4600218D */ trunc.w.s $f6, $f4 +/* 03858 808D5EC8 00073C00 */ sll $a3, $a3, 16 +/* 0385C 808D5ECC 00073C03 */ sra $a3, $a3, 16 +/* 03860 808D5ED0 AFB90024 */ sw $t9, 0x0024($sp) +/* 03864 808D5ED4 440D3000 */ mfc1 $t5, $f6 +/* 03868 808D5ED8 AFA20054 */ sw $v0, 0x0054($sp) +/* 0386C 808D5EDC 000D7C00 */ sll $t7, $t5, 16 +/* 03870 808D5EE0 000FC403 */ sra $t8, $t7, 16 +/* 03874 808D5EE4 0C0253D0 */ jal Draw_TwoTexScroll +/* 03878 808D5EE8 AFB80020 */ sw $t8, 0x0020($sp) +/* 0387C 808D5EEC 8FA30054 */ lw $v1, 0x0054($sp) /* 03880 808D5EF0 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 /* 03884 808D5EF4 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF /* 03888 808D5EF8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -127,16 +127,16 @@ glabel BossFd2_Draw /* 038CC 808D5F3C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 038D0 808D5F40 27185228 */ addiu $t8, $t8, %lo(func_808D5228) ## $t8 = 808D5228 /* 038D4 808D5F44 25EF4F94 */ addiu $t7, $t7, %lo(func_808D4F94) ## $t7 = 808D4F94 -/* 038D8 808D5F48 AFAF0010 */ sw $t7, 0x0010($sp) -/* 038DC 808D5F4C AFB80014 */ sw $t8, 0x0014($sp) -/* 038E0 808D5F50 AFB10018 */ sw $s1, 0x0018($sp) -/* 038E4 808D5F54 0C0286B2 */ jal func_800A1AC8 +/* 038D8 808D5F48 AFAF0010 */ sw $t7, 0x0010($sp) +/* 038DC 808D5F4C AFB80014 */ sw $t8, 0x0014($sp) +/* 038E0 808D5F50 AFB10018 */ sw $s1, 0x0018($sp) +/* 038E4 808D5F54 0C0286B2 */ jal SkelAnime_DrawSV /* 038E8 808D5F58 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 038EC 808D5F5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 038F0 808D5F60 0C235638 */ jal func_808D58E0 +/* 038F0 808D5F60 0C235638 */ jal func_808D58E0 /* 038F4 808D5F64 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 038F8 808D5F68 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 038FC 808D5F6C 0C02F228 */ jal func_800BC8A0 +/* 038FC 808D5F6C 0C02F228 */ jal func_800BC8A0 /* 03900 808D5F70 8E0502C0 */ lw $a1, 0x02C0($s0) ## 000002C0 /* 03904 808D5F74 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L808D5F78: @@ -144,13 +144,13 @@ glabel BossFd2_Draw /* 0390C 808D5F7C 24C66468 */ addiu $a2, $a2, %lo(D_808D6468) ## $a2 = 808D6468 /* 03910 808D5F80 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 03914 808D5F84 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 03918 808D5F88 0C031AD5 */ jal func_800C6B54 +/* 03918 808D5F88 0C031AD5 */ jal func_800C6B54 /* 0391C 808D5F8C 24070A80 */ addiu $a3, $zero, 0x0A80 ## $a3 = 00000A80 -/* 03920 808D5F90 8FBF0044 */ lw $ra, 0x0044($sp) -/* 03924 808D5F94 8FB00038 */ lw $s0, 0x0038($sp) -/* 03928 808D5F98 8FB1003C */ lw $s1, 0x003C($sp) -/* 0392C 808D5F9C 8FB20040 */ lw $s2, 0x0040($sp) -/* 03930 808D5FA0 03E00008 */ jr $ra +/* 03920 808D5F90 8FBF0044 */ lw $ra, 0x0044($sp) +/* 03924 808D5F94 8FB00038 */ lw $s0, 0x0038($sp) +/* 03928 808D5F98 8FB1003C */ lw $s1, 0x003C($sp) +/* 0392C 808D5F9C 8FB20040 */ lw $s2, 0x0040($sp) +/* 03930 808D5FA0 03E00008 */ jr $ra /* 03934 808D5FA4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 03938 808D5FA8 00000000 */ nop /* 0393C 808D5FAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s index c183699e3a..b4bd2d0086 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s @@ -1,70 +1,70 @@ glabel BossFd2_Init /* 00430 808D2AA0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00434 808D2AA4 AFA50044 */ sw $a1, 0x0044($sp) -/* 00438 808D2AA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0043C 808D2AAC AFB00028 */ sw $s0, 0x0028($sp) +/* 00434 808D2AA4 AFA50044 */ sw $a1, 0x0044($sp) +/* 00438 808D2AA8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0043C 808D2AAC AFB00028 */ sw $s0, 0x0028($sp) /* 00440 808D2AB0 3C05808D */ lui $a1, %hi(D_808D6190) ## $a1 = 808D0000 /* 00444 808D2AB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00448 808D2AB8 0C01E037 */ jal Actor_ProcessInitChain - + /* 0044C 808D2ABC 24A56190 */ addiu $a1, $a1, %lo(D_808D6190) ## $a1 = 808D6190 /* 00450 808D2AC0 3C053BE5 */ lui $a1, 0x3BE5 ## $a1 = 3BE50000 /* 00454 808D2AC4 34A56040 */ ori $a1, $a1, 0x6040 ## $a1 = 3BE56040 /* 00458 808D2AC8 0C00B58B */ jal Actor_SetScale - + /* 0045C 808D2ACC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00460 808D2AD0 3C01808D */ lui $at, %hi(D_808D6478) ## $at = 808D0000 -/* 00464 808D2AD4 C4246478 */ lwc1 $f4, %lo(D_808D6478)($at) +/* 00464 808D2AD4 C4246478 */ lwc1 $f4, %lo(D_808D6478)($at) /* 00468 808D2AD8 3C01C411 */ lui $at, 0xC411 ## $at = C4110000 /* 0046C 808D2ADC 44813000 */ mtc1 $at, $f6 ## $f6 = -580.00 /* 00470 808D2AE0 C6080054 */ lwc1 $f8, 0x0054($s0) ## 00000054 /* 00474 808D2AE4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00478 808D2AE8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0047C 808D2AEC 46083283 */ div.s $f10, $f6, $f8 +/* 0047C 808D2AEC 46083283 */ div.s $f10, $f6, $f8 /* 00480 808D2AF0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00484 808D2AF4 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 00488 808D2AF8 44055000 */ mfc1 $a1, $f10 +/* 00488 808D2AF8 44055000 */ mfc1 $a1, $f10 /* 0048C 808D2AFC 0C00AC78 */ jal ActorShape_Init - + /* 00490 808D2B00 00000000 */ nop /* 00494 808D2B04 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00498 808D2B08 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 0049C 808D2B0C 24E7C8EC */ addiu $a3, $a3, 0xC8EC ## $a3 = 0600C8EC /* 004A0 808D2B10 24C61A78 */ addiu $a2, $a2, 0x1A78 ## $a2 = 06011A78 -/* 004A4 808D2B14 8FA40044 */ lw $a0, 0x0044($sp) +/* 004A4 808D2B14 8FA40044 */ lw $a0, 0x0044($sp) /* 004A8 808D2B18 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 004AC 808D2B1C AFA00010 */ sw $zero, 0x0010($sp) -/* 004B0 808D2B20 AFA00014 */ sw $zero, 0x0014($sp) -/* 004B4 808D2B24 0C0291BE */ jal func_800A46F8 -/* 004B8 808D2B28 AFA00018 */ sw $zero, 0x0018($sp) +/* 004AC 808D2B1C AFA00010 */ sw $zero, 0x0010($sp) +/* 004B0 808D2B20 AFA00014 */ sw $zero, 0x0014($sp) +/* 004B4 808D2B24 0C0291BE */ jal SkelAnime_InitSV +/* 004B8 808D2B28 AFA00018 */ sw $zero, 0x0018($sp) /* 004BC 808D2B2C 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 004C0 808D2B30 3C0F808D */ lui $t7, %hi(func_808D4748) ## $t7 = 808D0000 /* 004C4 808D2B34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004C8 808D2B38 15C00005 */ bne $t6, $zero, .L808D2B50 +/* 004C8 808D2B38 15C00005 */ bne $t6, $zero, .L808D2B50 /* 004CC 808D2B3C 25EF4748 */ addiu $t7, $t7, %lo(func_808D4748) ## $t7 = 808D4748 -/* 004D0 808D2B40 0C234AF4 */ jal func_808D2BD0 -/* 004D4 808D2B44 8FA50044 */ lw $a1, 0x0044($sp) -/* 004D8 808D2B48 10000003 */ beq $zero, $zero, .L808D2B58 +/* 004D0 808D2B40 0C234AF4 */ jal func_808D2BD0 +/* 004D4 808D2B44 8FA50044 */ lw $a1, 0x0044($sp) +/* 004D8 808D2B48 10000003 */ beq $zero, $zero, .L808D2B58 /* 004DC 808D2B4C 2605141C */ addiu $a1, $s0, 0x141C ## $a1 = 0000141C .L808D2B50: /* 004E0 808D2B50 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 /* 004E4 808D2B54 2605141C */ addiu $a1, $s0, 0x141C ## $a1 = 0000141C .L808D2B58: -/* 004E8 808D2B58 AFA50034 */ sw $a1, 0x0034($sp) -/* 004EC 808D2B5C 0C016EFE */ jal func_8005BBF8 -/* 004F0 808D2B60 8FA40044 */ lw $a0, 0x0044($sp) +/* 004E8 808D2B58 AFA50034 */ sw $a1, 0x0034($sp) +/* 004EC 808D2B5C 0C016EFE */ jal func_8005BBF8 +/* 004F0 808D2B60 8FA40044 */ lw $a0, 0x0044($sp) /* 004F4 808D2B64 3C07808D */ lui $a3, %hi(D_808D6114) ## $a3 = 808D0000 /* 004F8 808D2B68 2618143C */ addiu $t8, $s0, 0x143C ## $t8 = 0000143C -/* 004FC 808D2B6C 8FA50034 */ lw $a1, 0x0034($sp) -/* 00500 808D2B70 AFB80010 */ sw $t8, 0x0010($sp) +/* 004FC 808D2B6C 8FA50034 */ lw $a1, 0x0034($sp) +/* 00500 808D2B70 AFB80010 */ sw $t8, 0x0010($sp) /* 00504 808D2B74 24E76114 */ addiu $a3, $a3, %lo(D_808D6114) ## $a3 = 808D6114 -/* 00508 808D2B78 8FA40044 */ lw $a0, 0x0044($sp) -/* 0050C 808D2B7C 0C017014 */ jal func_8005C050 +/* 00508 808D2B78 8FA40044 */ lw $a0, 0x0044($sp) +/* 0050C 808D2B7C 0C017014 */ jal func_8005C050 /* 00510 808D2B80 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00514 808D2B84 8FBF002C */ lw $ra, 0x002C($sp) -/* 00518 808D2B88 8FB00028 */ lw $s0, 0x0028($sp) +/* 00514 808D2B84 8FBF002C */ lw $ra, 0x002C($sp) +/* 00518 808D2B88 8FB00028 */ lw $s0, 0x0028($sp) /* 0051C 808D2B8C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00520 808D2B90 03E00008 */ jr $ra +/* 00520 808D2B90 03E00008 */ jr $ra /* 00524 808D2B94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s index d457f47e68..63b5e23ef0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s @@ -1,53 +1,53 @@ glabel func_808D308C /* 00A1C 808D308C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A20 808D3090 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A24 808D3094 AFA40020 */ sw $a0, 0x0020($sp) -/* 00A28 808D3098 AFA50024 */ sw $a1, 0x0024($sp) +/* 00A20 808D3090 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00A24 808D3094 AFA40020 */ sw $a0, 0x0020($sp) +/* 00A28 808D3098 AFA50024 */ sw $a1, 0x0024($sp) /* 00A2C 808D309C 8C8F0118 */ lw $t7, 0x0118($a0) ## 00000118 /* 00A30 808D30A0 3C04808D */ lui $a0, %hi(D_808D6358) ## $a0 = 808D0000 /* 00A34 808D30A4 24846358 */ addiu $a0, $a0, %lo(D_808D6358) ## $a0 = 808D6358 /* 00A38 808D30A8 0C00084C */ jal osSyncPrintf - -/* 00A3C 808D30AC AFAF001C */ sw $t7, 0x001C($sp) -/* 00A40 808D30B0 8FA40020 */ lw $a0, 0x0020($sp) + +/* 00A3C 808D30AC AFAF001C */ sw $t7, 0x001C($sp) +/* 00A40 808D30B0 8FA40020 */ lw $a0, 0x0020($sp) /* 00A44 808D30B4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00A48 808D30B8 24A5AE90 */ addiu $a1, $a1, 0xAE90 ## $a1 = 0600AE90 -/* 00A4C 808D30BC 0C0294BE */ jal func_800A52F8 +/* 00A4C 808D30BC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00A50 808D30C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A54 808D30C4 8FA30020 */ lw $v1, 0x0020($sp) +/* 00A54 808D30C4 8FA30020 */ lw $v1, 0x0020($sp) /* 00A58 808D30C8 3C18808D */ lui $t8, %hi(func_808D3140) ## $t8 = 808D0000 /* 00A5C 808D30CC 27183140 */ addiu $t8, $t8, %lo(func_808D3140) ## $t8 = 808D3140 /* 00A60 808D30D0 AC780190 */ sw $t8, 0x0190($v1) ## 00000190 -/* 00A64 808D30D4 8FB9001C */ lw $t9, 0x001C($sp) +/* 00A64 808D30D4 8FB9001C */ lw $t9, 0x001C($sp) /* 00A68 808D30D8 24010018 */ addiu $at, $zero, 0x0018 ## $at = 00000018 /* 00A6C 808D30DC 832200AF */ lb $v0, 0x00AF($t9) ## 000000AF -/* 00A70 808D30E0 54410004 */ bnel $v0, $at, .L808D30F4 -/* 00A74 808D30E4 28410012 */ slti $at, $v0, 0x0012 -/* 00A78 808D30E8 10000010 */ beq $zero, $zero, .L808D312C +/* 00A70 808D30E0 54410004 */ bnel $v0, $at, .L808D30F4 +/* 00A74 808D30E4 28410012 */ slti $at, $v0, 0x0012 +/* 00A78 808D30E8 10000010 */ beq $zero, $zero, .L808D312C /* 00A7C 808D30EC 24020032 */ addiu $v0, $zero, 0x0032 ## $v0 = 00000032 -/* 00A80 808D30F0 28410012 */ slti $at, $v0, 0x0012 +/* 00A80 808D30F0 28410012 */ slti $at, $v0, 0x0012 .L808D30F4: -/* 00A84 808D30F4 54200004 */ bnel $at, $zero, .L808D3108 -/* 00A88 808D30F8 2841000C */ slti $at, $v0, 0x000C -/* 00A8C 808D30FC 1000000B */ beq $zero, $zero, .L808D312C +/* 00A84 808D30F4 54200004 */ bnel $at, $zero, .L808D3108 +/* 00A88 808D30F8 2841000C */ slti $at, $v0, 0x000C +/* 00A8C 808D30FC 1000000B */ beq $zero, $zero, .L808D312C /* 00A90 808D3100 24020028 */ addiu $v0, $zero, 0x0028 ## $v0 = 00000028 -/* 00A94 808D3104 2841000C */ slti $at, $v0, 0x000C +/* 00A94 808D3104 2841000C */ slti $at, $v0, 0x000C .L808D3108: -/* 00A98 808D3108 54200004 */ bnel $at, $zero, .L808D311C -/* 00A9C 808D310C 28410006 */ slti $at, $v0, 0x0006 -/* 00AA0 808D3110 10000006 */ beq $zero, $zero, .L808D312C +/* 00A98 808D3108 54200004 */ bnel $at, $zero, .L808D311C +/* 00A9C 808D310C 28410006 */ slti $at, $v0, 0x0006 +/* 00AA0 808D3110 10000006 */ beq $zero, $zero, .L808D312C /* 00AA4 808D3114 24020028 */ addiu $v0, $zero, 0x0028 ## $v0 = 00000028 -/* 00AA8 808D3118 28410006 */ slti $at, $v0, 0x0006 +/* 00AA8 808D3118 28410006 */ slti $at, $v0, 0x0006 .L808D311C: -/* 00AAC 808D311C 14200003 */ bne $at, $zero, .L808D312C +/* 00AAC 808D311C 14200003 */ bne $at, $zero, .L808D312C /* 00AB0 808D3120 24020014 */ addiu $v0, $zero, 0x0014 ## $v0 = 00000014 -/* 00AB4 808D3124 10000001 */ beq $zero, $zero, .L808D312C +/* 00AB4 808D3124 10000001 */ beq $zero, $zero, .L808D312C /* 00AB8 808D3128 2402001E */ addiu $v0, $zero, 0x001E ## $v0 = 0000001E .L808D312C: /* 00ABC 808D312C A46201BC */ sh $v0, 0x01BC($v1) ## 000001BC -/* 00AC0 808D3130 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00AC0 808D3130 8FBF0014 */ lw $ra, 0x0014($sp) /* 00AC4 808D3134 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00AC8 808D3138 03E00008 */ jr $ra +/* 00AC8 808D3138 03E00008 */ jr $ra /* 00ACC 808D313C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s index 350a0d9284..60eb340f4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s @@ -1,104 +1,104 @@ glabel func_808D3140 /* 00AD0 808D3140 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00AD4 808D3144 AFB00020 */ sw $s0, 0x0020($sp) +/* 00AD4 808D3144 AFB00020 */ sw $s0, 0x0020($sp) /* 00AD8 808D3148 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00ADC 808D314C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00ADC 808D314C AFBF0024 */ sw $ra, 0x0024($sp) /* 00AE0 808D3150 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00AE4 808D3154 AFA5003C */ sw $a1, 0x003C($sp) +/* 00AE4 808D3154 AFA5003C */ sw $a1, 0x003C($sp) /* 00AE8 808D3158 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00AEC 808D315C AFA40030 */ sw $a0, 0x0030($sp) + +/* 00AEC 808D315C AFA40030 */ sw $a0, 0x0030($sp) /* 00AF0 808D3160 860E0196 */ lh $t6, 0x0196($s0) ## 00000196 /* 00AF4 808D3164 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 00AF8 808D3168 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00AFC 808D316C A7AE0036 */ sh $t6, 0x0036($sp) +/* 00AFC 808D316C A7AE0036 */ sh $t6, 0x0036($sp) /* 00B00 808D3170 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00B04 808D3174 AFA00010 */ sw $zero, 0x0010($sp) +/* 00B04 808D3174 AFA00010 */ sw $zero, 0x0010($sp) /* 00B08 808D3178 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00B0C 808D317C 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 00B10 808D3180 A6020196 */ sh $v0, 0x0196($s0) ## 00000196 /* 00B14 808D3184 3C04808D */ lui $a0, %hi(D_808D6364) ## $a0 = 808D0000 /* 00B18 808D3188 24846364 */ addiu $a0, $a0, %lo(D_808D6364) ## $a0 = 808D6364 /* 00B1C 808D318C 0C00084C */ jal osSyncPrintf - -/* 00B20 808D3190 87A50036 */ lh $a1, 0x0036($sp) + +/* 00B20 808D3190 87A50036 */ lh $a1, 0x0036($sp) /* 00B24 808D3194 3C04808D */ lui $a0, %hi(D_808D6370) ## $a0 = 808D0000 /* 00B28 808D3198 24846370 */ addiu $a0, $a0, %lo(D_808D6370) ## $a0 = 808D6370 /* 00B2C 808D319C 0C00084C */ jal osSyncPrintf - + /* 00B30 808D31A0 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -/* 00B34 808D31A4 87AF0036 */ lh $t7, 0x0036($sp) +/* 00B34 808D31A4 87AF0036 */ lh $t7, 0x0036($sp) /* 00B38 808D31A8 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 00B3C 808D31AC 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 /* 00B40 808D31B0 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 /* 00B44 808D31B4 00000000 */ nop -/* 00B48 808D31B8 468020A0 */ cvt.s.w $f2, $f4 -/* 00B4C 808D31BC 46001085 */ abs.s $f2, $f2 -/* 00B50 808D31C0 460C103E */ c.le.s $f2, $f12 +/* 00B48 808D31B8 468020A0 */ cvt.s.w $f2, $f4 +/* 00B4C 808D31BC 46001085 */ abs.s $f2, $f2 +/* 00B50 808D31C0 460C103E */ c.le.s $f2, $f12 /* 00B54 808D31C4 00000000 */ nop -/* 00B58 808D31C8 45020013 */ bc1fl .L808D3218 -/* 00B5C 808D31CC 4602603C */ c.lt.s $f12, $f2 +/* 00B58 808D31C8 45020013 */ bc1fl .L808D3218 +/* 00B5C 808D31CC 4602603C */ c.lt.s $f12, $f2 /* 00B60 808D31D0 86180196 */ lh $t8, 0x0196($s0) ## 00000196 /* 00B64 808D31D4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00B68 808D31D8 24A5AE90 */ addiu $a1, $a1, 0xAE90 ## $a1 = 0600AE90 /* 00B6C 808D31DC 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 00B70 808D31E0 8FA40030 */ lw $a0, 0x0030($sp) +/* 00B70 808D31E0 8FA40030 */ lw $a0, 0x0030($sp) /* 00B74 808D31E4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00B78 808D31E8 46803020 */ cvt.s.w $f0, $f6 -/* 00B7C 808D31EC 46000005 */ abs.s $f0, $f0 -/* 00B80 808D31F0 4600603C */ c.lt.s $f12, $f0 +/* 00B78 808D31E8 46803020 */ cvt.s.w $f0, $f6 +/* 00B7C 808D31EC 46000005 */ abs.s $f0, $f0 +/* 00B80 808D31F0 4600603C */ c.lt.s $f12, $f0 /* 00B84 808D31F4 00000000 */ nop -/* 00B88 808D31F8 45020007 */ bc1fl .L808D3218 -/* 00B8C 808D31FC 4602603C */ c.lt.s $f12, $f2 -/* 00B90 808D3200 0C0294D3 */ jal func_800A534C -/* 00B94 808D3204 E7A2002C */ swc1 $f2, 0x002C($sp) +/* 00B88 808D31F8 45020007 */ bc1fl .L808D3218 +/* 00B8C 808D31FC 4602603C */ c.lt.s $f12, $f2 +/* 00B90 808D3200 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00B94 808D3204 E7A2002C */ swc1 $f2, 0x002C($sp) /* 00B98 808D3208 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 00B9C 808D320C 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 -/* 00BA0 808D3210 C7A2002C */ lwc1 $f2, 0x002C($sp) -/* 00BA4 808D3214 4602603C */ c.lt.s $f12, $f2 +/* 00BA0 808D3210 C7A2002C */ lwc1 $f2, 0x002C($sp) +/* 00BA4 808D3214 4602603C */ c.lt.s $f12, $f2 .L808D3218: /* 00BA8 808D3218 00000000 */ nop -/* 00BAC 808D321C 4502000F */ bc1fl .L808D325C +/* 00BAC 808D321C 4502000F */ bc1fl .L808D325C /* 00BB0 808D3220 860801BC */ lh $t0, 0x01BC($s0) ## 000001BC /* 00BB4 808D3224 86190196 */ lh $t9, 0x0196($s0) ## 00000196 /* 00BB8 808D3228 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00BBC 808D322C 24A5C8EC */ addiu $a1, $a1, 0xC8EC ## $a1 = 0600C8EC /* 00BC0 808D3230 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 00BC4 808D3234 8FA40030 */ lw $a0, 0x0030($sp) -/* 00BC8 808D3238 46804020 */ cvt.s.w $f0, $f8 -/* 00BCC 808D323C 46000005 */ abs.s $f0, $f0 -/* 00BD0 808D3240 460C003E */ c.le.s $f0, $f12 +/* 00BC4 808D3234 8FA40030 */ lw $a0, 0x0030($sp) +/* 00BC8 808D3238 46804020 */ cvt.s.w $f0, $f8 +/* 00BCC 808D323C 46000005 */ abs.s $f0, $f0 +/* 00BD0 808D3240 460C003E */ c.le.s $f0, $f12 /* 00BD4 808D3244 00000000 */ nop -/* 00BD8 808D3248 45020004 */ bc1fl .L808D325C +/* 00BD8 808D3248 45020004 */ bc1fl .L808D325C /* 00BDC 808D324C 860801BC */ lh $t0, 0x01BC($s0) ## 000001BC -/* 00BE0 808D3250 0C0294D3 */ jal func_800A534C +/* 00BE0 808D3250 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00BE4 808D3254 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00BE8 808D3258 860801BC */ lh $t0, 0x01BC($s0) ## 000001BC .L808D325C: /* 00BEC 808D325C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00BF0 808D3260 55000010 */ bnel $t0, $zero, .L808D32A4 -/* 00BF4 808D3264 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00BF0 808D3260 55000010 */ bnel $t0, $zero, .L808D32A4 +/* 00BF4 808D3264 8FBF0024 */ lw $ra, 0x0024($sp) /* 00BF8 808D3268 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 /* 00BFC 808D326C 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 -/* 00C00 808D3270 8FA5003C */ lw $a1, 0x003C($sp) +/* 00C00 808D3270 8FA5003C */ lw $a1, 0x003C($sp) /* 00C04 808D3274 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C08 808D3278 4610503C */ c.lt.s $f10, $f16 +/* 00C08 808D3278 4610503C */ c.lt.s $f10, $f16 /* 00C0C 808D327C 00000000 */ nop -/* 00C10 808D3280 45000005 */ bc1f .L808D3298 +/* 00C10 808D3280 45000005 */ bc1f .L808D3298 /* 00C14 808D3284 00000000 */ nop -/* 00C18 808D3288 0C234E6A */ jal func_808D39A8 +/* 00C18 808D3288 0C234E6A */ jal func_808D39A8 /* 00C1C 808D328C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C20 808D3290 10000004 */ beq $zero, $zero, .L808D32A4 -/* 00C24 808D3294 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00C20 808D3290 10000004 */ beq $zero, $zero, .L808D32A4 +/* 00C24 808D3294 8FBF0024 */ lw $ra, 0x0024($sp) .L808D3298: -/* 00C28 808D3298 0C234D00 */ jal func_808D3400 -/* 00C2C 808D329C 8FA5003C */ lw $a1, 0x003C($sp) -/* 00C30 808D32A0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00C28 808D3298 0C234D00 */ jal func_808D3400 +/* 00C2C 808D329C 8FA5003C */ lw $a1, 0x003C($sp) +/* 00C30 808D32A0 8FBF0024 */ lw $ra, 0x0024($sp) .L808D32A4: -/* 00C34 808D32A4 8FB00020 */ lw $s0, 0x0020($sp) +/* 00C34 808D32A4 8FB00020 */ lw $s0, 0x0020($sp) /* 00C38 808D32A8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00C3C 808D32AC 03E00008 */ jr $ra +/* 00C3C 808D32AC 03E00008 */ jr $ra /* 00C40 808D32B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s index a647531bb0..4b8e33017f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s @@ -1,15 +1,15 @@ glabel func_808D3AE0 /* 01470 808D3AE0 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 01474 808D3AE4 AFBF0054 */ sw $ra, 0x0054($sp) -/* 01478 808D3AE8 AFB40050 */ sw $s4, 0x0050($sp) -/* 0147C 808D3AEC AFB3004C */ sw $s3, 0x004C($sp) -/* 01480 808D3AF0 AFB20048 */ sw $s2, 0x0048($sp) -/* 01484 808D3AF4 AFB10044 */ sw $s1, 0x0044($sp) -/* 01488 808D3AF8 AFB00040 */ sw $s0, 0x0040($sp) -/* 0148C 808D3AFC F7BA0038 */ sdc1 $f26, 0x0038($sp) -/* 01490 808D3B00 F7B80030 */ sdc1 $f24, 0x0030($sp) -/* 01494 808D3B04 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 01498 808D3B08 F7B40020 */ sdc1 $f20, 0x0020($sp) +/* 01474 808D3AE4 AFBF0054 */ sw $ra, 0x0054($sp) +/* 01478 808D3AE8 AFB40050 */ sw $s4, 0x0050($sp) +/* 0147C 808D3AEC AFB3004C */ sw $s3, 0x004C($sp) +/* 01480 808D3AF0 AFB20048 */ sw $s2, 0x0048($sp) +/* 01484 808D3AF4 AFB10044 */ sw $s1, 0x0044($sp) +/* 01488 808D3AF8 AFB00040 */ sw $s0, 0x0040($sp) +/* 0148C 808D3AFC F7BA0038 */ sdc1 $f26, 0x0038($sp) +/* 01490 808D3B00 F7B80030 */ sdc1 $f24, 0x0030($sp) +/* 01494 808D3B04 F7B60028 */ sdc1 $f22, 0x0028($sp) +/* 01498 808D3B08 F7B40020 */ sdc1 $f20, 0x0020($sp) /* 0149C 808D3B0C 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 /* 014A0 808D3B10 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 014A4 808D3B14 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -20,35 +20,35 @@ glabel func_808D3AE0 /* 014B8 808D3B28 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 014BC 808D3B2C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 014C0 808D3B30 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 014C4 808D3B34 AFA40060 */ sw $a0, 0x0060($sp) + +/* 014C4 808D3B34 AFA40060 */ sw $a0, 0x0060($sp) /* 014C8 808D3B38 86430198 */ lh $v1, 0x0198($s2) ## 00000198 /* 014CC 808D3B3C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 014D0 808D3B40 8FA40060 */ lw $a0, 0x0060($sp) -/* 014D4 808D3B44 10600005 */ beq $v1, $zero, .L808D3B5C +/* 014D0 808D3B40 8FA40060 */ lw $a0, 0x0060($sp) +/* 014D4 808D3B44 10600005 */ beq $v1, $zero, .L808D3B5C /* 014D8 808D3B48 00000000 */ nop -/* 014DC 808D3B4C 50610061 */ beql $v1, $at, .L808D3CD4 +/* 014DC 808D3B4C 50610061 */ beql $v1, $at, .L808D3CD4 /* 014E0 808D3B50 864B019C */ lh $t3, 0x019C($s2) ## 0000019C -/* 014E4 808D3B54 1000006D */ beq $zero, $zero, .L808D3D0C -/* 014E8 808D3B58 8FBF0054 */ lw $ra, 0x0054($sp) +/* 014E4 808D3B54 1000006D */ beq $zero, $zero, .L808D3D0C +/* 014E8 808D3B58 8FBF0054 */ lw $ra, 0x0054($sp) .L808D3B5C: -/* 014EC 808D3B5C 0C0295B2 */ jal func_800A56C8 +/* 014EC 808D3B5C 0C0295B2 */ jal func_800A56C8 /* 014F0 808D3B60 3C054150 */ lui $a1, 0x4150 ## $a1 = 41500000 -/* 014F4 808D3B64 10400003 */ beq $v0, $zero, .L808D3B74 +/* 014F4 808D3B64 10400003 */ beq $v0, $zero, .L808D3B74 /* 014F8 808D3B68 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 014FC 808D3B6C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01500 808D3B70 240538D3 */ addiu $a1, $zero, 0x38D3 ## $a1 = 000038D3 .L808D3B74: /* 01504 808D3B74 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 01508 808D3B78 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 /* 0150C 808D3B7C C64401F0 */ lwc1 $f4, 0x01F0($s2) ## 000001F0 -/* 01510 808D3B80 8FA40060 */ lw $a0, 0x0060($sp) -/* 01514 808D3B84 46062201 */ sub.s $f8, $f4, $f6 -/* 01518 808D3B88 44054000 */ mfc1 $a1, $f8 -/* 0151C 808D3B8C 0C0295B2 */ jal func_800A56C8 +/* 01510 808D3B80 8FA40060 */ lw $a0, 0x0060($sp) +/* 01514 808D3B84 46062201 */ sub.s $f8, $f4, $f6 +/* 01518 808D3B88 44054000 */ mfc1 $a1, $f8 +/* 0151C 808D3B8C 0C0295B2 */ jal func_800A56C8 /* 01520 808D3B90 00000000 */ nop -/* 01524 808D3B94 10400040 */ beq $v0, $zero, .L808D3C98 +/* 01524 808D3B94 10400040 */ beq $v0, $zero, .L808D3C98 /* 01528 808D3B98 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 0152C 808D3B9C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 01530 808D3BA0 4481D000 */ mtc1 $at, $f26 ## $f26 = 300.00 @@ -65,108 +65,108 @@ glabel func_808D3AE0 /* 0155C 808D3BCC 8E680000 */ lw $t0, 0x0000($s3) ## 808D61C4 .L808D3BD0: /* 01560 808D3BD0 8E790004 */ lw $t9, 0x0004($s3) ## 808D61C8 -/* 01564 808D3BD4 4600B306 */ mov.s $f12, $f22 +/* 01564 808D3BD4 4600B306 */ mov.s $f12, $f22 /* 01568 808D3BD8 AE280000 */ sw $t0, 0x0000($s1) ## FFFFFFE0 /* 0156C 808D3BDC 8E680008 */ lw $t0, 0x0008($s3) ## 808D61CC /* 01570 808D3BE0 AE390004 */ sw $t9, 0x0004($s1) ## FFFFFFE4 /* 01574 808D3BE4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 01578 808D3BE8 AE280008 */ sw $t0, 0x0008($s1) ## FFFFFFE8 /* 0157C 808D3BEC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01580 808D3BF0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 01584 808D3BF4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01588 808D3BF8 E7A00084 */ swc1 $f0, 0x0084($sp) -/* 0158C 808D3BFC E7A00088 */ swc1 $f0, 0x0088($sp) + +/* 01588 808D3BF8 E7A00084 */ swc1 $f0, 0x0084($sp) +/* 0158C 808D3BFC E7A00088 */ swc1 $f0, 0x0088($sp) /* 01590 808D3C00 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01594 808D3C04 4600B306 */ mov.s $f12, $f22 -/* 01598 808D3C08 E7A0008C */ swc1 $f0, 0x008C($sp) -/* 0159C 808D3C0C E7B8007C */ swc1 $f24, 0x007C($sp) + +/* 01594 808D3C04 4600B306 */ mov.s $f12, $f22 +/* 01598 808D3C08 E7A0008C */ swc1 $f0, 0x008C($sp) +/* 0159C 808D3C0C E7B8007C */ swc1 $f24, 0x007C($sp) /* 015A0 808D3C10 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 015A4 808D3C14 4600A306 */ mov.s $f12, $f20 + +/* 015A4 808D3C14 4600A306 */ mov.s $f12, $f20 /* 015A8 808D3C18 C64A0038 */ lwc1 $f10, 0x0038($s2) ## 00000038 -/* 015AC 808D3C1C 4600A306 */ mov.s $f12, $f20 -/* 015B0 808D3C20 460A0400 */ add.s $f16, $f0, $f10 +/* 015AC 808D3C1C 4600A306 */ mov.s $f12, $f20 +/* 015B0 808D3C20 460A0400 */ add.s $f16, $f0, $f10 /* 015B4 808D3C24 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 015B8 808D3C28 E7B0006C */ swc1 $f16, 0x006C($sp) + +/* 015B8 808D3C28 E7B0006C */ swc1 $f16, 0x006C($sp) /* 015BC 808D3C2C C652003C */ lwc1 $f18, 0x003C($s2) ## 0000003C -/* 015C0 808D3C30 4600A306 */ mov.s $f12, $f20 -/* 015C4 808D3C34 46120100 */ add.s $f4, $f0, $f18 +/* 015C0 808D3C30 4600A306 */ mov.s $f12, $f20 +/* 015C4 808D3C34 46120100 */ add.s $f4, $f0, $f18 /* 015C8 808D3C38 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 015CC 808D3C3C E7A40070 */ swc1 $f4, 0x0070($sp) + +/* 015CC 808D3C3C E7A40070 */ swc1 $f4, 0x0070($sp) /* 015D0 808D3C40 C6460040 */ lwc1 $f6, 0x0040($s2) ## 00000040 /* 015D4 808D3C44 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 015D8 808D3C48 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 015DC 808D3C4C 46060200 */ add.s $f8, $f0, $f6 +/* 015DC 808D3C4C 46060200 */ add.s $f8, $f0, $f6 /* 015E0 808D3C50 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 015E4 808D3C54 E7A80074 */ swc1 $f8, 0x0074($sp) -/* 015E8 808D3C58 461A0280 */ add.s $f10, $f0, $f26 + +/* 015E4 808D3C54 E7A80074 */ swc1 $f8, 0x0074($sp) +/* 015E8 808D3C58 461A0280 */ add.s $f10, $f0, $f26 /* 015EC 808D3C5C 02802025 */ or $a0, $s4, $zero ## $a0 = 00001970 /* 015F0 808D3C60 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFD4 /* 015F4 808D3C64 27A60084 */ addiu $a2, $sp, 0x0084 ## $a2 = FFFFFFEC -/* 015F8 808D3C68 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 015FC 808D3C6C 0C234A82 */ jal func_808D2A08 +/* 015F8 808D3C68 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 015FC 808D3C6C 0C234A82 */ jal func_808D2A08 /* 01600 808D3C70 02203825 */ or $a3, $s1, $zero ## $a3 = FFFFFFE0 /* 01604 808D3C74 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 01608 808D3C78 00108400 */ sll $s0, $s0, 16 -/* 0160C 808D3C7C 00108403 */ sra $s0, $s0, 16 -/* 01610 808D3C80 2A010019 */ slti $at, $s0, 0x0019 -/* 01614 808D3C84 5420FFD2 */ bnel $at, $zero, .L808D3BD0 +/* 01608 808D3C78 00108400 */ sll $s0, $s0, 16 +/* 0160C 808D3C7C 00108403 */ sra $s0, $s0, 16 +/* 01610 808D3C80 2A010019 */ slti $at, $s0, 0x0019 +/* 01614 808D3C84 5420FFD2 */ bnel $at, $zero, .L808D3BD0 /* 01618 808D3C88 8E680000 */ lw $t0, 0x0000($s3) ## 808D61C4 /* 0161C 808D3C8C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01620 808D3C90 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01624 808D3C94 24053927 */ addiu $a1, $zero, 0x3927 ## $a1 = 00003927 .L808D3C98: -/* 01628 808D3C98 8FA40060 */ lw $a0, 0x0060($sp) -/* 0162C 808D3C9C 0C0295B2 */ jal func_800A56C8 +/* 01628 808D3C98 8FA40060 */ lw $a0, 0x0060($sp) +/* 0162C 808D3C9C 0C0295B2 */ jal func_800A56C8 /* 01630 808D3CA0 8E4501F0 */ lw $a1, 0x01F0($s2) ## 000001F0 -/* 01634 808D3CA4 10400018 */ beq $v0, $zero, .L808D3D08 -/* 01638 808D3CA8 8FA40060 */ lw $a0, 0x0060($sp) +/* 01634 808D3CA4 10400018 */ beq $v0, $zero, .L808D3D08 +/* 01638 808D3CA8 8FA40060 */ lw $a0, 0x0060($sp) /* 0163C 808D3CAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01640 808D3CB0 24A5A86C */ addiu $a1, $a1, 0xA86C ## $a1 = 0600A86C -/* 01644 808D3CB4 0C0294D3 */ jal func_800A534C +/* 01644 808D3CB4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01648 808D3CB8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0164C 808D3CBC 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 01650 808D3CC0 240A003C */ addiu $t2, $zero, 0x003C ## $t2 = 0000003C /* 01654 808D3CC4 A6490198 */ sh $t1, 0x0198($s2) ## 00000198 -/* 01658 808D3CC8 1000000F */ beq $zero, $zero, .L808D3D08 +/* 01658 808D3CC8 1000000F */ beq $zero, $zero, .L808D3D08 /* 0165C 808D3CCC A64A01BC */ sh $t2, 0x01BC($s2) ## 000001BC /* 01660 808D3CD0 864B019C */ lh $t3, 0x019C($s2) ## 0000019C .L808D3CD4: /* 01664 808D3CD4 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 01668 808D3CD8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0166C 808D3CDC 316C000F */ andi $t4, $t3, 0x000F ## $t4 = 00000000 -/* 01670 808D3CE0 55810004 */ bnel $t4, $at, .L808D3CF4 +/* 01670 808D3CE0 55810004 */ bnel $t4, $at, .L808D3CF4 /* 01674 808D3CE4 864D01BC */ lh $t5, 0x01BC($s2) ## 000001BC /* 01678 808D3CE8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0167C 808D3CEC 240538D4 */ addiu $a1, $zero, 0x38D4 ## $a1 = 000038D4 /* 01680 808D3CF0 864D01BC */ lh $t5, 0x01BC($s2) ## 000001BC .L808D3CF4: /* 01684 808D3CF4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01688 808D3CF8 55A00004 */ bnel $t5, $zero, .L808D3D0C -/* 0168C 808D3CFC 8FBF0054 */ lw $ra, 0x0054($sp) -/* 01690 808D3D00 0C234CAD */ jal func_808D32B4 +/* 01688 808D3CF8 55A00004 */ bnel $t5, $zero, .L808D3D0C +/* 0168C 808D3CFC 8FBF0054 */ lw $ra, 0x0054($sp) +/* 01690 808D3D00 0C234CAD */ jal func_808D32B4 /* 01694 808D3D04 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 .L808D3D08: -/* 01698 808D3D08 8FBF0054 */ lw $ra, 0x0054($sp) +/* 01698 808D3D08 8FBF0054 */ lw $ra, 0x0054($sp) .L808D3D0C: -/* 0169C 808D3D0C D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 016A0 808D3D10 D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 016A4 808D3D14 D7B80030 */ ldc1 $f24, 0x0030($sp) -/* 016A8 808D3D18 D7BA0038 */ ldc1 $f26, 0x0038($sp) -/* 016AC 808D3D1C 8FB00040 */ lw $s0, 0x0040($sp) -/* 016B0 808D3D20 8FB10044 */ lw $s1, 0x0044($sp) -/* 016B4 808D3D24 8FB20048 */ lw $s2, 0x0048($sp) -/* 016B8 808D3D28 8FB3004C */ lw $s3, 0x004C($sp) -/* 016BC 808D3D2C 8FB40050 */ lw $s4, 0x0050($sp) -/* 016C0 808D3D30 03E00008 */ jr $ra +/* 0169C 808D3D0C D7B40020 */ ldc1 $f20, 0x0020($sp) +/* 016A0 808D3D10 D7B60028 */ ldc1 $f22, 0x0028($sp) +/* 016A4 808D3D14 D7B80030 */ ldc1 $f24, 0x0030($sp) +/* 016A8 808D3D18 D7BA0038 */ ldc1 $f26, 0x0038($sp) +/* 016AC 808D3D1C 8FB00040 */ lw $s0, 0x0040($sp) +/* 016B0 808D3D20 8FB10044 */ lw $s1, 0x0044($sp) +/* 016B4 808D3D24 8FB20048 */ lw $s2, 0x0048($sp) +/* 016B8 808D3D28 8FB3004C */ lw $s3, 0x004C($sp) +/* 016BC 808D3D2C 8FB40050 */ lw $s4, 0x0050($sp) +/* 016C0 808D3D30 03E00008 */ jr $ra /* 016C4 808D3D34 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s index 3a61ba5dd8..739df79b51 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s @@ -1,32 +1,32 @@ glabel BossGanon_Destroy /* 00EC8 808D7738 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00ECC 808D773C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00ED0 808D7740 AFA5001C */ sw $a1, 0x001C($sp) +/* 00ECC 808D773C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00ED0 808D7740 AFA5001C */ sw $a1, 0x001C($sp) /* 00ED4 808D7744 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 00ED8 808D7748 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00EDC 808D774C 24C50610 */ addiu $a1, $a2, 0x0610 ## $a1 = 00000610 -/* 00EE0 808D7750 284100C8 */ slti $at, $v0, 0x00C8 -/* 00EE4 808D7754 14200004 */ bne $at, $zero, .L808D7768 -/* 00EE8 808D7758 8FA4001C */ lw $a0, 0x001C($sp) -/* 00EEC 808D775C 28410104 */ slti $at, $v0, 0x0104 -/* 00EF0 808D7760 54200006 */ bnel $at, $zero, .L808D777C -/* 00EF4 808D7764 28410064 */ slti $at, $v0, 0x0064 +/* 00EE0 808D7750 284100C8 */ slti $at, $v0, 0x00C8 +/* 00EE4 808D7754 14200004 */ bne $at, $zero, .L808D7768 +/* 00EE8 808D7758 8FA4001C */ lw $a0, 0x001C($sp) +/* 00EEC 808D775C 28410104 */ slti $at, $v0, 0x0104 +/* 00EF0 808D7760 54200006 */ bnel $at, $zero, .L808D777C +/* 00EF4 808D7764 28410064 */ slti $at, $v0, 0x0064 .L808D7768: /* 00EF8 808D7768 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 00EFC 808D776C AFA60018 */ sw $a2, 0x0018($sp) -/* 00F00 808D7770 8FA60018 */ lw $a2, 0x0018($sp) + +/* 00EFC 808D776C AFA60018 */ sw $a2, 0x0018($sp) +/* 00F00 808D7770 8FA60018 */ lw $a2, 0x0018($sp) /* 00F04 808D7774 84C2001C */ lh $v0, 0x001C($a2) ## 0000001C -/* 00F08 808D7778 28410064 */ slti $at, $v0, 0x0064 +/* 00F08 808D7778 28410064 */ slti $at, $v0, 0x0064 .L808D777C: -/* 00F0C 808D777C 10200003 */ beq $at, $zero, .L808D778C +/* 00F0C 808D777C 10200003 */ beq $at, $zero, .L808D778C /* 00F10 808D7780 24C40150 */ addiu $a0, $a2, 0x0150 ## $a0 = 00000150 -/* 00F14 808D7784 0C0295BC */ jal func_800A56F0 -/* 00F18 808D7788 8FA5001C */ lw $a1, 0x001C($sp) +/* 00F14 808D7784 0C0295BC */ jal SkelAnime_Free +/* 00F18 808D7788 8FA5001C */ lw $a1, 0x001C($sp) .L808D778C: -/* 00F1C 808D778C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00F1C 808D778C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00F20 808D7790 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F24 808D7794 03E00008 */ jr $ra +/* 00F24 808D7794 03E00008 */ jr $ra /* 00F28 808D7798 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s index e886d368b6..1cfae5173d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s @@ -1,63 +1,63 @@ glabel BossGanon_Draw /* 0A468 808E0CD8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 0A46C 808E0CDC AFB1002C */ sw $s1, 0x002C($sp) -/* 0A470 808E0CE0 AFB00028 */ sw $s0, 0x0028($sp) +/* 0A46C 808E0CDC AFB1002C */ sw $s1, 0x002C($sp) +/* 0A470 808E0CE0 AFB00028 */ sw $s0, 0x0028($sp) /* 0A474 808E0CE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0A478 808E0CE8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0A47C 808E0CEC AFB20030 */ sw $s2, 0x0030($sp) +/* 0A478 808E0CE8 AFBF0034 */ sw $ra, 0x0034($sp) +/* 0A47C 808E0CEC AFB20030 */ sw $s2, 0x0030($sp) /* 0A480 808E0CF0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0A484 808E0CF4 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 0A488 808E0CF8 0C031A73 */ jal Graph_Alloc - + /* 0A48C 808E0CFC 24051000 */ addiu $a1, $zero, 0x1000 ## $a1 = 00001000 -/* 0A490 808E0D00 AFA20054 */ sw $v0, 0x0054($sp) +/* 0A490 808E0D00 AFA20054 */ sw $v0, 0x0054($sp) /* 0A494 808E0D04 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 0A498 808E0D08 3C06808F */ lui $a2, %hi(D_808F7C58) ## $a2 = 808F0000 /* 0A49C 808E0D0C 24C67C58 */ addiu $a2, $a2, %lo(D_808F7C58) ## $a2 = 808F7C58 /* 0A4A0 808E0D10 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 0A4A4 808E0D14 240723B2 */ addiu $a3, $zero, 0x23B2 ## $a3 = 000023B2 -/* 0A4A8 808E0D18 0C031AB1 */ jal func_800C6AC4 +/* 0A4A8 808E0D18 0C031AB1 */ jal func_800C6AC4 /* 0A4AC 808E0D1C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 0A4B0 808E0D20 0C024F46 */ jal func_80093D18 +/* 0A4B0 808E0D20 0C024F46 */ jal func_80093D18 /* 0A4B4 808E0D24 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0A4B8 808E0D28 0C024F61 */ jal func_80093D84 +/* 0A4B8 808E0D28 0C024F61 */ jal func_80093D84 /* 0A4BC 808E0D2C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 0A4C0 808E0D30 860E01A6 */ lh $t6, 0x01A6($s0) ## 000001A6 /* 0A4C4 808E0D34 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 0A4C8 808E0D38 51E0000D */ beql $t7, $zero, .L808E0D70 +/* 0A4C8 808E0D38 51E0000D */ beql $t7, $zero, .L808E0D70 /* 0A4CC 808E0D3C 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 /* 0A4D0 808E0D40 8E4402C0 */ lw $a0, 0x02C0($s2) ## 000002C0 /* 0A4D4 808E0D44 24180384 */ addiu $t8, $zero, 0x0384 ## $t8 = 00000384 /* 0A4D8 808E0D48 2419044B */ addiu $t9, $zero, 0x044B ## $t9 = 0000044B -/* 0A4DC 808E0D4C AFB90018 */ sw $t9, 0x0018($sp) -/* 0A4E0 808E0D50 AFB80014 */ sw $t8, 0x0014($sp) -/* 0A4E4 808E0D54 AFA00010 */ sw $zero, 0x0010($sp) +/* 0A4DC 808E0D4C AFB90018 */ sw $t9, 0x0018($sp) +/* 0A4E0 808E0D50 AFB80014 */ sw $t8, 0x0014($sp) +/* 0A4E4 808E0D54 AFA00010 */ sw $zero, 0x0010($sp) /* 0A4E8 808E0D58 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 0A4EC 808E0D5C 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 -/* 0A4F0 808E0D60 0C024CDC */ jal func_80093370 +/* 0A4F0 808E0D60 0C024CDC */ jal func_80093370 /* 0A4F4 808E0D64 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0A4F8 808E0D68 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 /* 0A4FC 808E0D6C 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 .L808E0D70: /* 0A500 808E0D70 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0A504 808E0D74 24849A20 */ addiu $a0, $a0, 0x9A20 ## $a0 = 06009A20 -/* 0A508 808E0D78 00045100 */ sll $t2, $a0, 4 -/* 0A50C 808E0D7C 000A5F02 */ srl $t3, $t2, 28 +/* 0A508 808E0D78 00045100 */ sll $t2, $a0, 4 +/* 0A50C 808E0D7C 000A5F02 */ srl $t3, $t2, 28 /* 0A510 808E0D80 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 0A514 808E0D84 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 /* 0A518 808E0D88 AE4802D0 */ sw $t0, 0x02D0($s2) ## 000002D0 /* 0A51C 808E0D8C 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 0A520 808E0D90 000B6080 */ sll $t4, $t3, 2 +/* 0A520 808E0D90 000B6080 */ sll $t4, $t3, 2 /* 0A524 808E0D94 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 0A528 808E0D98 01AC6821 */ addu $t5, $t5, $t4 +/* 0A528 808E0D98 01AC6821 */ addu $t5, $t5, $t4 /* 0A52C 808E0D9C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0A530 808E0DA0 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 0A534 808E0DA4 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 /* 0A538 808E0DA8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0A53C 808E0DAC 00817024 */ and $t6, $a0, $at +/* 0A53C 808E0DAC 00817024 */ and $t6, $a0, $at /* 0A540 808E0DB0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0A544 808E0DB4 01AE7821 */ addu $t7, $t5, $t6 -/* 0A548 808E0DB8 01E1C021 */ addu $t8, $t7, $at +/* 0A544 808E0DB4 01AE7821 */ addu $t7, $t5, $t6 +/* 0A548 808E0DB8 01E1C021 */ addu $t8, $t7, $at /* 0A54C 808E0DBC AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 0A550 808E0DC0 92070152 */ lbu $a3, 0x0152($s0) ## 00000152 /* 0A554 808E0DC4 8E060170 */ lw $a2, 0x0170($s0) ## 00000170 @@ -66,25 +66,25 @@ glabel BossGanon_Draw /* 0A560 808E0DD0 3C19808E */ lui $t9, %hi(func_808DE734) ## $t9 = 808E0000 /* 0A564 808E0DD4 2739E734 */ addiu $t9, $t9, %lo(func_808DE734) ## $t9 = 808DE734 /* 0A568 808E0DD8 2508E988 */ addiu $t0, $t0, %lo(func_808DE988) ## $t0 = 808DE988 -/* 0A56C 808E0DDC AFA80014 */ sw $t0, 0x0014($sp) -/* 0A570 808E0DE0 AFB90010 */ sw $t9, 0x0010($sp) -/* 0A574 808E0DE4 AFB00018 */ sw $s0, 0x0018($sp) -/* 0A578 808E0DE8 0C0286B2 */ jal func_800A1AC8 +/* 0A56C 808E0DDC AFA80014 */ sw $t0, 0x0014($sp) +/* 0A570 808E0DE0 AFB90010 */ sw $t9, 0x0010($sp) +/* 0A574 808E0DE4 AFB00018 */ sw $s0, 0x0018($sp) +/* 0A578 808E0DE8 0C0286B2 */ jal SkelAnime_DrawSV /* 0A57C 808E0DEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A580 808E0DF0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0A584 808E0DF4 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 0A588 808E0DF8 C60602FC */ lwc1 $f6, 0x02FC($s0) ## 000002FC /* 0A58C 808E0DFC C60402F8 */ lwc1 $f4, 0x02F8($s0) ## 000002F8 /* 0A590 808E0E00 C6100300 */ lwc1 $f16, 0x0300($s0) ## 00000300 -/* 0A594 808E0E04 46083280 */ add.s $f10, $f6, $f8 +/* 0A594 808E0E04 46083280 */ add.s $f10, $f6, $f8 /* 0A598 808E0E08 E60402EC */ swc1 $f4, 0x02EC($s0) ## 000002EC /* 0A59C 808E0E0C E61002F4 */ swc1 $f16, 0x02F4($s0) ## 000002F4 /* 0A5A0 808E0E10 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A5A4 808E0E14 E60A02F0 */ swc1 $f10, 0x02F0($s0) ## 000002F0 -/* 0A5A8 808E0E18 0C02F228 */ jal func_800BC8A0 +/* 0A5A8 808E0E18 0C02F228 */ jal func_800BC8A0 /* 0A5AC 808E0E1C 8E4502C0 */ lw $a1, 0x02C0($s2) ## 000002C0 /* 0A5B0 808E0E20 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 -/* 0A5B4 808E0E24 0C238F61 */ jal func_808E3D84 +/* 0A5B4 808E0E24 0C238F61 */ jal func_808E3D84 /* 0A5B8 808E0E28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A5BC 808E0E2C 3C028090 */ lui $v0, %hi(D_808F93C0) ## $v0 = 80900000 /* 0A5C0 808E0E30 244293C0 */ addiu $v0, $v0, %lo(D_808F93C0) ## $v0 = 808F93C0 @@ -124,39 +124,39 @@ glabel BossGanon_Draw /* 0A648 808E0EB8 8E0C023C */ lw $t4, 0x023C($s0) ## 0000023C /* 0A64C 808E0EBC AD6C16FC */ sw $t4, 0x16FC($t3) ## 000016FC /* 0A650 808E0EC0 8E0D0240 */ lw $t5, 0x0240($s0) ## 00000240 -/* 0A654 808E0EC4 0C237B9C */ jal func_808DEE70 +/* 0A654 808E0EC4 0C237B9C */ jal func_808DEE70 /* 0A658 808E0EC8 AD6D1700 */ sw $t5, 0x1700($t3) ## 00001700 /* 0A65C 808E0ECC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A660 808E0ED0 0C237C97 */ jal func_808DF25C +/* 0A660 808E0ED0 0C237C97 */ jal func_808DF25C /* 0A664 808E0ED4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0A668 808E0ED8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A66C 808E0EDC 0C237D3C */ jal func_808DF4F0 +/* 0A66C 808E0EDC 0C237D3C */ jal func_808DF4F0 /* 0A670 808E0EE0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0A674 808E0EE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A678 808E0EE8 0C237EF4 */ jal func_808DFBD0 +/* 0A678 808E0EE8 0C237EF4 */ jal func_808DFBD0 /* 0A67C 808E0EEC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0A680 808E0EF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A684 808E0EF4 0C237FF2 */ jal func_808DFFC8 +/* 0A684 808E0EF4 0C237FF2 */ jal func_808DFFC8 /* 0A688 808E0EF8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0A68C 808E0EFC 8FA40054 */ lw $a0, 0x0054($sp) +/* 0A68C 808E0EFC 8FA40054 */ lw $a0, 0x0054($sp) /* 0A690 808E0F00 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A694 808E0F04 0C2381BF */ jal func_808E06FC +/* 0A694 808E0F04 0C2381BF */ jal func_808E06FC /* 0A698 808E0F08 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 0A69C 808E0F0C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0A69C 808E0F0C 8FA40054 */ lw $a0, 0x0054($sp) /* 0A6A0 808E0F10 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A6A4 808E0F14 0C23828F */ jal func_808E0A3C +/* 0A6A4 808E0F14 0C23828F */ jal func_808E0A3C /* 0A6A8 808E0F18 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 0A6AC 808E0F1C 3C06808F */ lui $a2, %hi(D_808F7C6C) ## $a2 = 808F0000 /* 0A6B0 808E0F20 24C67C6C */ addiu $a2, $a2, %lo(D_808F7C6C) ## $a2 = 808F7C6C /* 0A6B4 808E0F24 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 0A6B8 808E0F28 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0A6BC 808E0F2C 0C031AD5 */ jal func_800C6B54 +/* 0A6BC 808E0F2C 0C031AD5 */ jal func_800C6B54 /* 0A6C0 808E0F30 240724B1 */ addiu $a3, $zero, 0x24B1 ## $a3 = 000024B1 -/* 0A6C4 808E0F34 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0A6C8 808E0F38 8FB00028 */ lw $s0, 0x0028($sp) -/* 0A6CC 808E0F3C 8FB1002C */ lw $s1, 0x002C($sp) -/* 0A6D0 808E0F40 8FB20030 */ lw $s2, 0x0030($sp) -/* 0A6D4 808E0F44 03E00008 */ jr $ra +/* 0A6C4 808E0F34 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0A6C8 808E0F38 8FB00028 */ lw $s0, 0x0028($sp) +/* 0A6CC 808E0F3C 8FB1002C */ lw $s1, 0x002C($sp) +/* 0A6D0 808E0F40 8FB20030 */ lw $s2, 0x0030($sp) +/* 0A6D4 808E0F44 03E00008 */ jr $ra /* 0A6D8 808E0F48 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s index 6b05272ca0..c8bcc801a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s @@ -1,166 +1,166 @@ glabel BossGanon_Init /* 00928 808D7198 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 0092C 808D719C AFBF003C */ sw $ra, 0x003C($sp) -/* 00930 808D71A0 AFB10038 */ sw $s1, 0x0038($sp) -/* 00934 808D71A4 AFB00034 */ sw $s0, 0x0034($sp) +/* 0092C 808D719C AFBF003C */ sw $ra, 0x003C($sp) +/* 00930 808D71A0 AFB10038 */ sw $s1, 0x0038($sp) +/* 00934 808D71A4 AFB00034 */ sw $s0, 0x0034($sp) /* 00938 808D71A8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 0093C 808D71AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00940 808D71B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00944 808D71B4 29C10064 */ slti $at, $t6, 0x0064 -/* 00948 808D71B8 1020007C */ beq $at, $zero, .L808D73AC +/* 00944 808D71B4 29C10064 */ slti $at, $t6, 0x0064 +/* 00948 808D71B8 1020007C */ beq $at, $zero, .L808D73AC /* 0094C 808D71BC 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 /* 00950 808D71C0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00954 808D71C4 0C00B2DD */ jal Flags_SetSwitch - + /* 00958 808D71C8 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 0095C 808D71CC 3C048090 */ lui $a0, %hi(D_808F93D8) ## $a0 = 80900000 /* 00960 808D71D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00964 808D71D4 248493D8 */ addiu $a0, $a0, %lo(D_808F93D8) ## $a0 = 808F93D8 -/* 00968 808D71D8 00310821 */ addu $at, $at, $s1 +/* 00968 808D71D8 00310821 */ addu $at, $at, $s1 /* 0096C 808D71DC AC241E10 */ sw $a0, 0x1E10($at) ## 00011E10 /* 00970 808D71E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00974 808D71E4 2403004C */ addiu $v1, $zero, 0x004C ## $v1 = 0000004C .L808D71E8: -/* 00978 808D71E8 00430019 */ multu $v0, $v1 +/* 00978 808D71E8 00430019 */ multu $v0, $v1 /* 0097C 808D71EC 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00980 808D71F0 00021400 */ sll $v0, $v0, 16 -/* 00984 808D71F4 00021403 */ sra $v0, $v0, 16 -/* 00988 808D71F8 284100C8 */ slti $at, $v0, 0x00C8 -/* 0098C 808D71FC 00007812 */ mflo $t7 -/* 00990 808D7200 008FC021 */ addu $t8, $a0, $t7 -/* 00994 808D7204 1420FFF8 */ bne $at, $zero, .L808D71E8 +/* 00980 808D71F0 00021400 */ sll $v0, $v0, 16 +/* 00984 808D71F4 00021403 */ sra $v0, $v0, 16 +/* 00988 808D71F8 284100C8 */ slti $at, $v0, 0x00C8 +/* 0098C 808D71FC 00007812 */ mflo $t7 +/* 00990 808D7200 008FC021 */ addu $t8, $a0, $t7 +/* 00994 808D7204 1420FFF8 */ bne $at, $zero, .L808D71E8 /* 00998 808D7208 A3000000 */ sb $zero, 0x0000($t8) ## 00000000 /* 0099C 808D720C 3C018090 */ lui $at, %hi(D_808F93D0) ## $at = 80900000 -/* 009A0 808D7210 AC3093D0 */ sw $s0, %lo(D_808F93D0)($at) +/* 009A0 808D7210 AC3093D0 */ sw $s0, %lo(D_808F93D0)($at) /* 009A4 808D7214 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 /* 009A8 808D7218 3C05808E */ lui $a1, %hi(D_808E4C84) ## $a1 = 808E0000 /* 009AC 808D721C A21900AF */ sb $t9, 0x00AF($s0) ## 000000AF /* 009B0 808D7220 24A54C84 */ addiu $a1, $a1, %lo(D_808E4C84) ## $a1 = 808E4C84 /* 009B4 808D7224 0C01E037 */ jal Actor_ProcessInitChain - + /* 009B8 808D7228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009BC 808D722C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 009C0 808D7230 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 009C4 808D7234 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 009C8 808D7238 44051000 */ mfc1 $a1, $f2 -/* 009CC 808D723C 44071000 */ mfc1 $a3, $f2 +/* 009C8 808D7238 44051000 */ mfc1 $a1, $f2 +/* 009CC 808D723C 44071000 */ mfc1 $a3, $f2 /* 009D0 808D7240 0C00AC78 */ jal ActorShape_Init - + /* 009D4 808D7244 00000000 */ nop /* 009D8 808D7248 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 009DC 808D724C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 009E0 808D7250 0C00B58B */ jal Actor_SetScale - + /* 009E4 808D7254 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009E8 808D7258 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 009EC 808D725C 24C614E8 */ addiu $a2, $a2, 0x14E8 ## $a2 = 060114E8 /* 009F0 808D7260 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 009F4 808D7264 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 009F8 808D7268 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 009FC 808D726C AFA00010 */ sw $zero, 0x0010($sp) -/* 00A00 808D7270 AFA00014 */ sw $zero, 0x0014($sp) -/* 00A04 808D7274 0C0291BE */ jal func_800A46F8 -/* 00A08 808D7278 AFA00018 */ sw $zero, 0x0018($sp) +/* 009FC 808D726C AFA00010 */ sw $zero, 0x0010($sp) +/* 00A00 808D7270 AFA00014 */ sw $zero, 0x0014($sp) +/* 00A04 808D7274 0C0291BE */ jal SkelAnime_InitSV +/* 00A08 808D7278 AFA00018 */ sw $zero, 0x0018($sp) /* 00A0C 808D727C 26050610 */ addiu $a1, $s0, 0x0610 ## $a1 = 00000610 -/* 00A10 808D7280 AFA50044 */ sw $a1, 0x0044($sp) +/* 00A10 808D7280 AFA50044 */ sw $a1, 0x0044($sp) /* 00A14 808D7284 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00A18 808D7288 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A1C 808D728C 3C07808E */ lui $a3, %hi(D_808E4C00) ## $a3 = 808E0000 -/* 00A20 808D7290 8FA50044 */ lw $a1, 0x0044($sp) +/* 00A20 808D7290 8FA50044 */ lw $a1, 0x0044($sp) /* 00A24 808D7294 24E74C00 */ addiu $a3, $a3, %lo(D_808E4C00) ## $a3 = 808E4C00 /* 00A28 808D7298 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A2C 808D729C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00A30 808D72A0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00A34 808D72A4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 00A38 808D72A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00A3C 808D72AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00A40 808D72B0 11010006 */ beq $t0, $at, .L808D72CC +/* 00A40 808D72B0 11010006 */ beq $t0, $at, .L808D72CC /* 00A44 808D72B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A48 808D72B8 0C235DE7 */ jal func_808D779C +/* 00A48 808D72B8 0C235DE7 */ jal func_808D779C /* 00A4C 808D72BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A50 808D72C0 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 00A54 808D72C4 10000021 */ beq $zero, $zero, .L808D734C +/* 00A54 808D72C4 10000021 */ beq $zero, $zero, .L808D734C /* 00A58 808D72C8 A6090718 */ sh $t1, 0x0718($s0) ## 00000718 .L808D72CC: /* 00A5C 808D72CC 0C00B2D0 */ jal Flags_GetSwitch - + /* 00A60 808D72D0 24050037 */ addiu $a1, $zero, 0x0037 ## $a1 = 00000037 -/* 00A64 808D72D4 0002182B */ sltu $v1, $zero, $v0 -/* 00A68 808D72D8 10600010 */ beq $v1, $zero, .L808D731C +/* 00A64 808D72D4 0002182B */ sltu $v1, $zero, $v0 +/* 00A68 808D72D8 10600010 */ beq $v1, $zero, .L808D731C /* 00A6C 808D72DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A70 808D72E0 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 /* 00A74 808D72E4 3843004F */ xori $v1, $v0, 0x004F ## $v1 = 0000004F -/* 00A78 808D72E8 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 00A7C 808D72EC 1460000B */ bne $v1, $zero, .L808D731C +/* 00A78 808D72E8 2C630001 */ sltiu $v1, $v1, 0x0001 +/* 00A7C 808D72EC 1460000B */ bne $v1, $zero, .L808D731C /* 00A80 808D72F0 00000000 */ nop /* 00A84 808D72F4 3843001A */ xori $v1, $v0, 0x001A ## $v1 = 0000001A -/* 00A88 808D72F8 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 00A8C 808D72FC 14600007 */ bne $v1, $zero, .L808D731C +/* 00A88 808D72F8 2C630001 */ sltiu $v1, $v1, 0x0001 +/* 00A8C 808D72FC 14600007 */ bne $v1, $zero, .L808D731C /* 00A90 808D7300 00000000 */ nop /* 00A94 808D7304 3843000E */ xori $v1, $v0, 0x000E ## $v1 = 0000000E -/* 00A98 808D7308 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 00A9C 808D730C 14600003 */ bne $v1, $zero, .L808D731C +/* 00A98 808D7308 2C630001 */ sltiu $v1, $v1, 0x0001 +/* 00A9C 808D730C 14600003 */ bne $v1, $zero, .L808D731C /* 00AA0 808D7310 00000000 */ nop /* 00AA4 808D7314 3843000F */ xori $v1, $v0, 0x000F ## $v1 = 0000000F -/* 00AA8 808D7318 2C630001 */ sltiu $v1, $v1, 0x0001 +/* 00AA8 808D7318 2C630001 */ sltiu $v1, $v1, 0x0001 .L808D731C: -/* 00AAC 808D731C 14600005 */ bne $v1, $zero, .L808D7334 +/* 00AAC 808D731C 14600005 */ bne $v1, $zero, .L808D7334 /* 00AB0 808D7320 00000000 */ nop -/* 00AB4 808D7324 0C23643E */ jal func_808D90F8 +/* 00AB4 808D7324 0C23643E */ jal func_808D90F8 /* 00AB8 808D7328 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00ABC 808D732C 10000005 */ beq $zero, $zero, .L808D7344 +/* 00ABC 808D732C 10000005 */ beq $zero, $zero, .L808D7344 /* 00AC0 808D7330 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L808D7334: /* 00AC4 808D7334 0C00B55C */ jal Actor_Kill - + /* 00AC8 808D7338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ACC 808D733C 100000FA */ beq $zero, $zero, .L808D7728 -/* 00AD0 808D7340 8FBF003C */ lw $ra, 0x003C($sp) +/* 00ACC 808D733C 100000FA */ beq $zero, $zero, .L808D7728 +/* 00AD0 808D7340 8FBF003C */ lw $ra, 0x003C($sp) .L808D7344: -/* 00AD4 808D7344 0C23643E */ jal func_808D90F8 +/* 00AD4 808D7344 0C23643E */ jal func_808D90F8 /* 00AD8 808D7348 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L808D734C: /* 00ADC 808D734C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00AE0 808D7350 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 00AE4 808D7354 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00AE8 808D7358 AFAA0028 */ sw $t2, 0x0028($sp) -/* 00AEC 808D735C AFA40044 */ sw $a0, 0x0044($sp) +/* 00AE8 808D7358 AFAA0028 */ sw $t2, 0x0028($sp) +/* 00AEC 808D735C AFA40044 */ sw $a0, 0x0044($sp) /* 00AF0 808D7360 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00AF4 808D7364 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00AF8 808D7368 2407016F */ addiu $a3, $zero, 0x016F ## $a3 = 0000016F -/* 00AFC 808D736C AFA0001C */ sw $zero, 0x001C($sp) -/* 00B00 808D7370 AFA00020 */ sw $zero, 0x0020($sp) -/* 00B04 808D7374 AFA00024 */ sw $zero, 0x0024($sp) -/* 00B08 808D7378 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00B0C 808D737C E7A00014 */ swc1 $f0, 0x0014($sp) +/* 00AFC 808D736C AFA0001C */ sw $zero, 0x001C($sp) +/* 00B00 808D7370 AFA00020 */ sw $zero, 0x0020($sp) +/* 00B04 808D7374 AFA00024 */ sw $zero, 0x0024($sp) +/* 00B08 808D7378 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00B0C 808D737C E7A00014 */ swc1 $f0, 0x0014($sp) /* 00B10 808D7380 0C00C916 */ jal Actor_SpawnAttached - -/* 00B14 808D7384 E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 00B14 808D7384 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00B18 808D7388 3C018090 */ lui $at, %hi(D_808F93C0) ## $at = 80900000 -/* 00B1C 808D738C AC2293C0 */ sw $v0, %lo(D_808F93C0)($at) +/* 00B1C 808D738C AC2293C0 */ sw $v0, %lo(D_808F93C0)($at) /* 00B20 808D7390 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B24 808D7394 8FA50044 */ lw $a1, 0x0044($sp) +/* 00B24 808D7394 8FA50044 */ lw $a1, 0x0044($sp) /* 00B28 808D7398 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00B2C 808D739C 0C00CDD2 */ jal Actor_ChangeType - + /* 00B30 808D73A0 24070009 */ addiu $a3, $zero, 0x0009 ## $a3 = 00000009 -/* 00B34 808D73A4 100000E0 */ beq $zero, $zero, .L808D7728 -/* 00B38 808D73A8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00B34 808D73A4 100000E0 */ beq $zero, $zero, .L808D7728 +/* 00B38 808D73A8 8FBF003C */ lw $ra, 0x003C($sp) .L808D73AC: /* 00B3C 808D73AC 8E0B0004 */ lw $t3, 0x0004($s0) ## 00000004 /* 00B40 808D73B0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00B44 808D73B4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00B48 808D73B8 01616024 */ and $t4, $t3, $at +/* 00B48 808D73B8 01616024 */ and $t4, $t3, $at /* 00B4C 808D73BC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 00B50 808D73C0 44812000 */ mtc1 $at, $f4 ## $f4 = 255.00 -/* 00B54 808D73C4 284100C8 */ slti $at, $v0, 0x00C8 +/* 00B54 808D73C4 284100C8 */ slti $at, $v0, 0x00C8 /* 00B58 808D73C8 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -/* 00B5C 808D73CC 1420008E */ bne $at, $zero, .L808D7608 +/* 00B5C 808D73CC 1420008E */ bne $at, $zero, .L808D7608 /* 00B60 808D73D0 E60401CC */ swc1 $f4, 0x01CC($s0) ## 000001CC /* 00B64 808D73D4 2401012C */ addiu $at, $zero, 0x012C ## $at = 0000012C -/* 00B68 808D73D8 14410009 */ bne $v0, $at, .L808D7400 +/* 00B68 808D73D8 14410009 */ bne $v0, $at, .L808D7400 /* 00B6C 808D73DC 3C0D808E */ lui $t5, %hi(func_808E1034) ## $t5 = 808E0000 /* 00B70 808D73E0 3C0E808E */ lui $t6, %hi(func_808E1B54) ## $t6 = 808E0000 /* 00B74 808D73E4 25AD1034 */ addiu $t5, $t5, %lo(func_808E1034) ## $t5 = 808E1034 @@ -168,11 +168,11 @@ glabel BossGanon_Init /* 00B7C 808D73EC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00B80 808D73F0 AE0D0130 */ sw $t5, 0x0130($s0) ## 00000130 /* 00B84 808D73F4 AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 -/* 00B88 808D73F8 100000CA */ beq $zero, $zero, .L808D7724 +/* 00B88 808D73F8 100000CA */ beq $zero, $zero, .L808D7724 /* 00B8C 808D73FC A60F01A8 */ sh $t7, 0x01A8($s0) ## 000001A8 .L808D7400: /* 00B90 808D7400 24010190 */ addiu $at, $zero, 0x0190 ## $at = 00000190 -/* 00B94 808D7404 14410009 */ bne $v0, $at, .L808D742C +/* 00B94 808D7404 14410009 */ bne $v0, $at, .L808D742C /* 00B98 808D7408 3C18808E */ lui $t8, %hi(func_808E1034) ## $t8 = 808E0000 /* 00B9C 808D740C 3C19808E */ lui $t9, %hi(func_808E1B54) ## $t9 = 808E0000 /* 00BA0 808D7410 27181034 */ addiu $t8, $t8, %lo(func_808E1034) ## $t8 = 808E1034 @@ -180,17 +180,17 @@ glabel BossGanon_Init /* 00BA8 808D7418 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00BAC 808D741C AE180130 */ sw $t8, 0x0130($s0) ## 00000130 /* 00BB0 808D7420 AE190134 */ sw $t9, 0x0134($s0) ## 00000134 -/* 00BB4 808D7424 100000BF */ beq $zero, $zero, .L808D7724 +/* 00BB4 808D7424 100000BF */ beq $zero, $zero, .L808D7724 /* 00BB8 808D7428 A60801A8 */ sh $t0, 0x01A8($s0) ## 000001A8 .L808D742C: -/* 00BBC 808D742C 28410104 */ slti $at, $v0, 0x0104 -/* 00BC0 808D7430 1420002C */ bne $at, $zero, .L808D74E4 +/* 00BBC 808D742C 28410104 */ slti $at, $v0, 0x0104 +/* 00BC0 808D7430 1420002C */ bne $at, $zero, .L808D74E4 /* 00BC4 808D7434 3C09808E */ lui $t1, %hi(func_808E2544) ## $t1 = 808E0000 /* 00BC8 808D7438 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 00BCC 808D743C 3C0A808E */ lui $t2, %hi(func_808E324C) ## $t2 = 808E0000 /* 00BD0 808D7440 25292544 */ addiu $t1, $t1, %lo(func_808E2544) ## $t1 = 808E2544 -/* 00BD4 808D7444 000C6823 */ subu $t5, $zero, $t4 -/* 00BD8 808D7448 000D7040 */ sll $t6, $t5, 1 +/* 00BD4 808D7444 000C6823 */ subu $t5, $zero, $t4 +/* 00BD8 808D7448 000D7040 */ sll $t6, $t5, 1 /* 00BDC 808D744C 254A324C */ addiu $t2, $t2, %lo(func_808E324C) ## $t2 = 808E324C /* 00BE0 808D7450 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A /* 00BE4 808D7454 25CF0208 */ addiu $t7, $t6, 0x0208 ## $t7 = 808E1D5C @@ -202,39 +202,39 @@ glabel BossGanon_Init /* 00BFC 808D746C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 00C00 808D7470 2403000C */ addiu $v1, $zero, 0x000C ## $v1 = 0000000C .L808D7474: -/* 00C04 808D7474 00430019 */ multu $v0, $v1 +/* 00C04 808D7474 00430019 */ multu $v0, $v1 /* 00C08 808D7478 8C890000 */ lw $t1, 0x0000($a0) ## 00000024 /* 00C0C 808D747C 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00C10 808D7480 00021400 */ sll $v0, $v0, 16 -/* 00C14 808D7484 00021403 */ sra $v0, $v0, 16 -/* 00C18 808D7488 2841000F */ slti $at, $v0, 0x000F -/* 00C1C 808D748C 0000C012 */ mflo $t8 -/* 00C20 808D7490 0218C821 */ addu $t9, $s0, $t8 +/* 00C10 808D7480 00021400 */ sll $v0, $v0, 16 +/* 00C14 808D7484 00021403 */ sra $v0, $v0, 16 +/* 00C18 808D7488 2841000F */ slti $at, $v0, 0x000F +/* 00C1C 808D748C 0000C012 */ mflo $t8 +/* 00C20 808D7490 0218C821 */ addu $t9, $s0, $t8 /* 00C24 808D7494 AF2902EC */ sw $t1, 0x02EC($t9) ## 808E1E40 /* 00C28 808D7498 8C880004 */ lw $t0, 0x0004($a0) ## 00000028 /* 00C2C 808D749C AF2802F0 */ sw $t0, 0x02F0($t9) ## 808E1E44 /* 00C30 808D74A0 8C890008 */ lw $t1, 0x0008($a0) ## 0000002C -/* 00C34 808D74A4 1420FFF3 */ bne $at, $zero, .L808D7474 +/* 00C34 808D74A4 1420FFF3 */ bne $at, $zero, .L808D7474 /* 00C38 808D74A8 AF2902F4 */ sw $t1, 0x02F4($t9) ## 808E1E48 /* 00C3C 808D74AC 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 00C40 808D74B0 A60A01B8 */ sh $t2, 0x01B8($s0) ## 000001B8 /* 00C44 808D74B4 26050610 */ addiu $a1, $s0, 0x0610 ## $a1 = 00000610 -/* 00C48 808D74B8 AFA50044 */ sw $a1, 0x0044($sp) +/* 00C48 808D74B8 AFA50044 */ sw $a1, 0x0044($sp) /* 00C4C 808D74BC 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00C50 808D74C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00C54 808D74C4 3C07808E */ lui $a3, %hi(D_808E4C2C) ## $a3 = 808E0000 -/* 00C58 808D74C8 8FA50044 */ lw $a1, 0x0044($sp) +/* 00C58 808D74C8 8FA50044 */ lw $a1, 0x0044($sp) /* 00C5C 808D74CC 24E74C2C */ addiu $a3, $a3, %lo(D_808E4C2C) ## $a3 = 808E4C2C /* 00C60 808D74D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00C64 808D74D4 0C01712B */ jal ActorCollider_InitCylinder - + /* 00C68 808D74D8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00C6C 808D74DC 10000092 */ beq $zero, $zero, .L808D7728 -/* 00C70 808D74E0 8FBF003C */ lw $ra, 0x003C($sp) +/* 00C6C 808D74DC 10000092 */ beq $zero, $zero, .L808D7728 +/* 00C70 808D74E0 8FBF003C */ lw $ra, 0x003C($sp) .L808D74E4: -/* 00C74 808D74E4 284100FA */ slti $at, $v0, 0x00FA -/* 00C78 808D74E8 14200021 */ bne $at, $zero, .L808D7570 +/* 00C74 808D74E4 284100FA */ slti $at, $v0, 0x00FA +/* 00C78 808D74E8 14200021 */ bne $at, $zero, .L808D7570 /* 00C7C 808D74EC 3C09808E */ lui $t1, %hi(func_808E1EB4) ## $t1 = 808E0000 /* 00C80 808D74F0 3C0B808E */ lui $t3, %hi(func_808E2544) ## $t3 = 808E0000 /* 00C84 808D74F4 3C0C808E */ lui $t4, %hi(func_808E324C) ## $t4 = 808E0000 @@ -244,31 +244,31 @@ glabel BossGanon_Init /* 00C94 808D7504 AE0C0134 */ sw $t4, 0x0134($s0) ## 00000134 /* 00C98 808D7508 3C01808F */ lui $at, %hi(D_808F7E5C) ## $at = 808F0000 /* 00C9C 808D750C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00CA0 808D7510 C42C7E5C */ lwc1 $f12, %lo(D_808F7E5C)($at) -/* 00CA4 808D7514 4600018D */ trunc.w.s $f6, $f0 + +/* 00CA0 808D7510 C42C7E5C */ lwc1 $f12, %lo(D_808F7E5C)($at) +/* 00CA4 808D7514 4600018D */ trunc.w.s $f6, $f0 /* 00CA8 808D7518 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00CAC 808D751C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00CB0 808D7520 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00CB4 808D7524 440E3000 */ mfc1 $t6, $f6 +/* 00CB4 808D7524 440E3000 */ mfc1 $t6, $f6 /* 00CB8 808D7528 2403000C */ addiu $v1, $zero, 0x000C ## $v1 = 0000000C /* 00CBC 808D752C A60E01A2 */ sh $t6, 0x01A2($s0) ## 000001A2 .L808D7530: -/* 00CC0 808D7530 00430019 */ multu $v0, $v1 +/* 00CC0 808D7530 00430019 */ multu $v0, $v1 /* 00CC4 808D7534 8C880000 */ lw $t0, 0x0000($a0) ## 00000024 /* 00CC8 808D7538 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00CCC 808D753C 00021400 */ sll $v0, $v0, 16 -/* 00CD0 808D7540 00021403 */ sra $v0, $v0, 16 -/* 00CD4 808D7544 2841000F */ slti $at, $v0, 0x000F -/* 00CD8 808D7548 00007812 */ mflo $t7 -/* 00CDC 808D754C 020FC021 */ addu $t8, $s0, $t7 +/* 00CCC 808D753C 00021400 */ sll $v0, $v0, 16 +/* 00CD0 808D7540 00021403 */ sra $v0, $v0, 16 +/* 00CD4 808D7544 2841000F */ slti $at, $v0, 0x000F +/* 00CD8 808D7548 00007812 */ mflo $t7 +/* 00CDC 808D754C 020FC021 */ addu $t8, $s0, $t7 /* 00CE0 808D7550 AF0802EC */ sw $t0, 0x02EC($t8) ## 000002EC /* 00CE4 808D7554 8C990004 */ lw $t9, 0x0004($a0) ## 00000028 /* 00CE8 808D7558 AF1902F0 */ sw $t9, 0x02F0($t8) ## 000002F0 /* 00CEC 808D755C 8C880008 */ lw $t0, 0x0008($a0) ## 0000002C -/* 00CF0 808D7560 1420FFF3 */ bne $at, $zero, .L808D7530 +/* 00CF0 808D7560 1420FFF3 */ bne $at, $zero, .L808D7530 /* 00CF4 808D7564 AF0802F4 */ sw $t0, 0x02F4($t8) ## 000002F4 -/* 00CF8 808D7568 1000006E */ beq $zero, $zero, .L808D7724 +/* 00CF8 808D7568 1000006E */ beq $zero, $zero, .L808D7724 /* 00CFC 808D756C E60201CC */ swc1 $f2, 0x01CC($s0) ## 000001CC .L808D7570: /* 00D00 808D7570 3C014130 */ lui $at, 0x4130 ## $at = 41300000 @@ -280,39 +280,39 @@ glabel BossGanon_Init /* 00D18 808D7588 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 /* 00D1C 808D758C AE090130 */ sw $t1, 0x0130($s0) ## 00000130 /* 00D20 808D7590 AE0A0134 */ sw $t2, 0x0134($s0) ## 00000134 -/* 00D24 808D7594 15610004 */ bne $t3, $at, .L808D75A8 +/* 00D24 808D7594 15610004 */ bne $t3, $at, .L808D75A8 /* 00D28 808D7598 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 00D2C 808D759C 240C0007 */ addiu $t4, $zero, 0x0007 ## $t4 = 00000007 -/* 00D30 808D75A0 1000000A */ beq $zero, $zero, .L808D75CC +/* 00D30 808D75A0 1000000A */ beq $zero, $zero, .L808D75CC /* 00D34 808D75A4 A60C01B6 */ sh $t4, 0x01B6($s0) ## 000001B6 .L808D75A8: /* 00D38 808D75A8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 00D3C 808D75AC 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 /* 00D40 808D75B0 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 00D44 808D75B4 00000000 */ nop -/* 00D48 808D75B8 4600028D */ trunc.w.s $f10, $f0 -/* 00D4C 808D75BC 44185000 */ mfc1 $t8, $f10 +/* 00D48 808D75B8 4600028D */ trunc.w.s $f10, $f0 +/* 00D4C 808D75BC 44185000 */ mfc1 $t8, $f10 /* 00D50 808D75C0 00000000 */ nop /* 00D54 808D75C4 27190003 */ addiu $t9, $t8, 0x0003 ## $t9 = 00000003 /* 00D58 808D75C8 A61901B6 */ sh $t9, 0x01B6($s0) ## 000001B6 .L808D75CC: /* 00D5C 808D75CC 3C01808F */ lui $at, %hi(D_808F7E60) ## $at = 808F0000 -/* 00D60 808D75D0 C42C7E60 */ lwc1 $f12, %lo(D_808F7E60)($at) +/* 00D60 808D75D0 C42C7E60 */ lwc1 $f12, %lo(D_808F7E60)($at) /* 00D64 808D75D4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00D68 808D75D8 2403000C */ addiu $v1, $zero, 0x000C ## $v1 = 0000000C .L808D75DC: -/* 00D6C 808D75DC 00430019 */ multu $v0, $v1 +/* 00D6C 808D75DC 00430019 */ multu $v0, $v1 /* 00D70 808D75E0 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00D74 808D75E4 00021400 */ sll $v0, $v0, 16 -/* 00D78 808D75E8 00021403 */ sra $v0, $v0, 16 -/* 00D7C 808D75EC 2841000F */ slti $at, $v0, 0x000F -/* 00D80 808D75F0 00004012 */ mflo $t0 -/* 00D84 808D75F4 02084821 */ addu $t1, $s0, $t0 -/* 00D88 808D75F8 1420FFF8 */ bne $at, $zero, .L808D75DC +/* 00D74 808D75E4 00021400 */ sll $v0, $v0, 16 +/* 00D78 808D75E8 00021403 */ sra $v0, $v0, 16 +/* 00D7C 808D75EC 2841000F */ slti $at, $v0, 0x000F +/* 00D80 808D75F0 00004012 */ mflo $t0 +/* 00D84 808D75F4 02084821 */ addu $t1, $s0, $t0 +/* 00D88 808D75F8 1420FFF8 */ bne $at, $zero, .L808D75DC /* 00D8C 808D75FC E52C02F0 */ swc1 $f12, 0x02F0($t1) ## 000002F0 -/* 00D90 808D7600 10000049 */ beq $zero, $zero, .L808D7728 -/* 00D94 808D7604 8FBF003C */ lw $ra, 0x003C($sp) +/* 00D90 808D7600 10000049 */ beq $zero, $zero, .L808D7728 +/* 00D94 808D7604 8FBF003C */ lw $ra, 0x003C($sp) .L808D7608: /* 00D98 808D7608 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 00D9C 808D760C 44819000 */ mtc1 $at, $f18 ## $f18 = 12.00 @@ -328,77 +328,77 @@ glabel BossGanon_Init /* 00DC4 808D7634 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 00DC8 808D7638 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 /* 00DCC 808D763C C4680028 */ lwc1 $f8, 0x0028($v1) ## 00000034 -/* 00DD0 808D7640 46062381 */ sub.s $f14, $f4, $f6 +/* 00DD0 808D7640 46062381 */ sub.s $f14, $f4, $f6 /* 00DD4 808D7644 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00DD8 808D7648 460A4480 */ add.s $f18, $f8, $f10 -/* 00DDC 808D764C 46049181 */ sub.s $f6, $f18, $f4 -/* 00DE0 808D7650 E7A60058 */ swc1 $f6, 0x0058($sp) +/* 00DD8 808D7648 460A4480 */ add.s $f18, $f8, $f10 +/* 00DDC 808D764C 46049181 */ sub.s $f6, $f18, $f4 +/* 00DE0 808D7650 E7A60058 */ swc1 $f6, 0x0058($sp) /* 00DE4 808D7654 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 00DE8 808D7658 C468002C */ lwc1 $f8, 0x002C($v1) ## 00000038 -/* 00DEC 808D765C E7AE005C */ swc1 $f14, 0x005C($sp) -/* 00DF0 808D7660 460A4301 */ sub.s $f12, $f8, $f10 +/* 00DEC 808D765C E7AE005C */ swc1 $f14, 0x005C($sp) +/* 00DF0 808D7660 460A4301 */ sub.s $f12, $f8, $f10 /* 00DF4 808D7664 0C034199 */ jal atan2s - -/* 00DF8 808D7668 E7AC0054 */ swc1 $f12, 0x0054($sp) -/* 00DFC 808D766C C7A2005C */ lwc1 $f2, 0x005C($sp) -/* 00E00 808D7670 C7B00054 */ lwc1 $f16, 0x0054($sp) + +/* 00DF8 808D7668 E7AC0054 */ swc1 $f12, 0x0054($sp) +/* 00DFC 808D766C C7A2005C */ lwc1 $f2, 0x005C($sp) +/* 00E00 808D7670 C7B00054 */ lwc1 $f16, 0x0054($sp) /* 00E04 808D7674 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 00E08 808D7678 46021482 */ mul.s $f18, $f2, $f2 -/* 00E0C 808D767C C7AE0058 */ lwc1 $f14, 0x0058($sp) -/* 00E10 808D7680 46108102 */ mul.s $f4, $f16, $f16 -/* 00E14 808D7684 46049000 */ add.s $f0, $f18, $f4 +/* 00E08 808D7678 46021482 */ mul.s $f18, $f2, $f2 +/* 00E0C 808D767C C7AE0058 */ lwc1 $f14, 0x0058($sp) +/* 00E10 808D7680 46108102 */ mul.s $f4, $f16, $f16 +/* 00E14 808D7684 46049000 */ add.s $f0, $f18, $f4 /* 00E18 808D7688 0C034199 */ jal atan2s - -/* 00E1C 808D768C 46000304 */ sqrt.s $f12, $f0 + +/* 00E1C 808D768C 46000304 */ sqrt.s $f12, $f0 /* 00E20 808D7690 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00E24 808D7694 A6020030 */ sh $v0, 0x0030($s0) ## 00000030 /* 00E28 808D7698 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00E2C 808D769C 3C01808F */ lui $at, %hi(D_808F7E64) ## $at = 808F0000 -/* 00E30 808D76A0 4602003C */ c.lt.s $f0, $f2 +/* 00E30 808D76A0 4602003C */ c.lt.s $f0, $f2 /* 00E34 808D76A4 00000000 */ nop -/* 00E38 808D76A8 45020013 */ bc1fl .L808D76F8 +/* 00E38 808D76A8 45020013 */ bc1fl .L808D76F8 /* 00E3C 808D76AC 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 00E40 808D76B0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00E44 808D76B4 C42C7E64 */ lwc1 $f12, %lo(D_808F7E64)($at) -/* 00E48 808D76B8 4600018D */ trunc.w.s $f6, $f0 + +/* 00E44 808D76B4 C42C7E64 */ lwc1 $f12, %lo(D_808F7E64)($at) +/* 00E48 808D76B8 4600018D */ trunc.w.s $f6, $f0 /* 00E4C 808D76BC 860C0032 */ lh $t4, 0x0032($s0) ## 00000032 /* 00E50 808D76C0 3C01808F */ lui $at, %hi(D_808F7E68) ## $at = 808F0000 -/* 00E54 808D76C4 C42C7E68 */ lwc1 $f12, %lo(D_808F7E68)($at) -/* 00E58 808D76C8 44183000 */ mfc1 $t8, $f6 +/* 00E54 808D76C4 C42C7E68 */ lwc1 $f12, %lo(D_808F7E68)($at) +/* 00E58 808D76C8 44183000 */ mfc1 $t8, $f6 /* 00E5C 808D76CC 00000000 */ nop -/* 00E60 808D76D0 0198C821 */ addu $t9, $t4, $t8 +/* 00E60 808D76D0 0198C821 */ addu $t9, $t4, $t8 /* 00E64 808D76D4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00E68 808D76D8 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 00E6C 808D76DC 4600020D */ trunc.w.s $f8, $f0 +/* 00E6C 808D76DC 4600020D */ trunc.w.s $f8, $f0 /* 00E70 808D76E0 86080030 */ lh $t0, 0x0030($s0) ## 00000030 -/* 00E74 808D76E4 440D4000 */ mfc1 $t5, $f8 +/* 00E74 808D76E4 440D4000 */ mfc1 $t5, $f8 /* 00E78 808D76E8 00000000 */ nop -/* 00E7C 808D76EC 010D7021 */ addu $t6, $t0, $t5 +/* 00E7C 808D76EC 010D7021 */ addu $t6, $t0, $t5 /* 00E80 808D76F0 A60E0030 */ sh $t6, 0x0030($s0) ## 00000030 /* 00E84 808D76F4 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 .L808D76F8: /* 00E88 808D76F8 A60F01B8 */ sh $t7, 0x01B8($s0) ## 000001B8 /* 00E8C 808D76FC 26050610 */ addiu $a1, $s0, 0x0610 ## $a1 = 00000610 -/* 00E90 808D7700 AFA50044 */ sw $a1, 0x0044($sp) +/* 00E90 808D7700 AFA50044 */ sw $a1, 0x0044($sp) /* 00E94 808D7704 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00E98 808D7708 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E9C 808D770C 3C07808E */ lui $a3, %hi(D_808E4C2C) ## $a3 = 808E0000 -/* 00EA0 808D7710 8FA50044 */ lw $a1, 0x0044($sp) +/* 00EA0 808D7710 8FA50044 */ lw $a1, 0x0044($sp) /* 00EA4 808D7714 24E74C2C */ addiu $a3, $a3, %lo(D_808E4C2C) ## $a3 = 808E4C2C /* 00EA8 808D7718 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00EAC 808D771C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00EB0 808D7720 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 .L808D7724: -/* 00EB4 808D7724 8FBF003C */ lw $ra, 0x003C($sp) +/* 00EB4 808D7724 8FBF003C */ lw $ra, 0x003C($sp) .L808D7728: -/* 00EB8 808D7728 8FB00034 */ lw $s0, 0x0034($sp) -/* 00EBC 808D772C 8FB10038 */ lw $s1, 0x0038($sp) -/* 00EC0 808D7730 03E00008 */ jr $ra +/* 00EB8 808D7728 8FB00034 */ lw $s0, 0x0034($sp) +/* 00EBC 808D772C 8FB10038 */ lw $s1, 0x0038($sp) +/* 00EC0 808D7730 03E00008 */ jr $ra /* 00EC4 808D7734 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s index 00450f515d..73a70ae971 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s @@ -1,65 +1,65 @@ glabel func_808D779C /* 00F2C 808D779C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00F30 808D77A0 AFB00018 */ sw $s0, 0x0018($sp) +/* 00F30 808D77A0 AFB00018 */ sw $s0, 0x0018($sp) /* 00F34 808D77A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00F38 808D77A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00F3C 808D77AC 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00F40 808D77B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00F44 808D77B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00F48 808D77B8 00A12021 */ addu $a0, $a1, $at -/* 00F4C 808D77BC AFA40024 */ sw $a0, 0x0024($sp) +/* 00F40 808D77B0 AFBF001C */ sw $ra, 0x001C($sp) +/* 00F44 808D77B4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00F48 808D77B8 00A12021 */ addu $a0, $a1, $at +/* 00F4C 808D77BC AFA40024 */ sw $a0, 0x0024($sp) /* 00F50 808D77C0 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 00F54 808D77C4 2405017D */ addiu $a1, $zero, 0x017D ## $a1 = 0000017D -/* 00F58 808D77C8 8FA40024 */ lw $a0, 0x0024($sp) -/* 00F5C 808D77CC 04410005 */ bgez $v0, .L808D77E4 +/* 00F58 808D77C8 8FA40024 */ lw $a0, 0x0024($sp) +/* 00F5C 808D77CC 04410005 */ bgez $v0, .L808D77E4 /* 00F60 808D77D0 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 /* 00F64 808D77D4 0C00B55C */ jal Actor_Kill - + /* 00F68 808D77D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F6C 808D77DC 10000023 */ beq $zero, $zero, .L808D786C -/* 00F70 808D77E0 8FBF001C */ lw $ra, 0x001C($sp) +/* 00F6C 808D77DC 10000023 */ beq $zero, $zero, .L808D786C +/* 00F70 808D77E0 8FBF001C */ lw $ra, 0x001C($sp) .L808D77E4: /* 00F74 808D77E4 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 /* 00F78 808D77E8 0C026062 */ jal Object_IsLoaded - -/* 00F7C 808D77EC AFA70028 */ sw $a3, 0x0028($sp) -/* 00F80 808D77F0 1040001A */ beq $v0, $zero, .L808D785C -/* 00F84 808D77F4 8FA70028 */ lw $a3, 0x0028($sp) + +/* 00F7C 808D77EC AFA70028 */ sw $a3, 0x0028($sp) +/* 00F80 808D77F0 1040001A */ beq $v0, $zero, .L808D785C +/* 00F84 808D77F4 8FA70028 */ lw $a3, 0x0028($sp) /* 00F88 808D77F8 3C0E808D */ lui $t6, %hi(func_808D7918) ## $t6 = 808D0000 /* 00F8C 808D77FC 25CE7918 */ addiu $t6, $t6, %lo(func_808D7918) ## $t6 = 808D7918 /* 00F90 808D7800 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00F94 808D7804 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 /* 00F98 808D7808 A20F0198 */ sb $t7, 0x0198($s0) ## 00000198 /* 00F9C 808D780C AE07014C */ sw $a3, 0x014C($s0) ## 0000014C -/* 00FA0 808D7810 8FB80034 */ lw $t8, 0x0034($sp) -/* 00FA4 808D7814 0007C900 */ sll $t9, $a3, 4 -/* 00FA8 808D7818 0327C821 */ addu $t9, $t9, $a3 -/* 00FAC 808D781C 0019C880 */ sll $t9, $t9, 2 +/* 00FA0 808D7810 8FB80034 */ lw $t8, 0x0034($sp) +/* 00FA4 808D7814 0007C900 */ sll $t9, $a3, 4 +/* 00FA8 808D7818 0327C821 */ addu $t9, $t9, $a3 +/* 00FAC 808D781C 0019C880 */ sll $t9, $t9, 2 /* 00FB0 808D7820 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 00FB4 808D7824 03194021 */ addu $t0, $t8, $t9 -/* 00FB8 808D7828 01284821 */ addu $t1, $t1, $t0 +/* 00FB4 808D7824 03194021 */ addu $t0, $t8, $t9 +/* 00FB8 808D7828 01284821 */ addu $t1, $t1, $t0 /* 00FBC 808D782C 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 00FC0 808D7830 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00FC4 808D7834 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00FC8 808D7838 01215021 */ addu $t2, $t1, $at +/* 00FC8 808D7838 01215021 */ addu $t2, $t1, $at /* 00FCC 808D783C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00FD0 808D7840 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 /* 00FD4 808D7844 24A55FFC */ addiu $a1, $a1, 0x5FFC ## $a1 = 06005FFC /* 00FD8 808D7848 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00FDC 808D784C 0C0294D3 */ jal func_800A534C +/* 00FDC 808D784C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00FE0 808D7850 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00FE4 808D7854 10000005 */ beq $zero, $zero, .L808D786C -/* 00FE8 808D7858 8FBF001C */ lw $ra, 0x001C($sp) +/* 00FE4 808D7854 10000005 */ beq $zero, $zero, .L808D786C +/* 00FE8 808D7858 8FBF001C */ lw $ra, 0x001C($sp) .L808D785C: /* 00FEC 808D785C 3C0B808D */ lui $t3, %hi(func_808D779C) ## $t3 = 808D0000 /* 00FF0 808D7860 256B779C */ addiu $t3, $t3, %lo(func_808D779C) ## $t3 = 808D779C /* 00FF4 808D7864 AE0B0194 */ sw $t3, 0x0194($s0) ## 00000194 -/* 00FF8 808D7868 8FBF001C */ lw $ra, 0x001C($sp) +/* 00FF8 808D7868 8FBF001C */ lw $ra, 0x001C($sp) .L808D786C: -/* 00FFC 808D786C 8FB00018 */ lw $s0, 0x0018($sp) +/* 00FFC 808D786C 8FB00018 */ lw $s0, 0x0018($sp) /* 01000 808D7870 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01004 808D7874 03E00008 */ jr $ra +/* 01004 808D7874 03E00008 */ jr $ra /* 01008 808D7878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s index eea25eb140..b7d6659c00 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s @@ -1,24 +1,24 @@ glabel func_808D7918 /* 010A8 808D7918 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 010AC 808D791C AFBF003C */ sw $ra, 0x003C($sp) -/* 010B0 808D7920 AFB00038 */ sw $s0, 0x0038($sp) -/* 010B4 808D7924 A3A0006F */ sb $zero, 0x006F($sp) +/* 010AC 808D791C AFBF003C */ sw $ra, 0x003C($sp) +/* 010B0 808D7920 AFB00038 */ sw $s0, 0x0038($sp) +/* 010B4 808D7924 A3A0006F */ sb $zero, 0x006F($sp) /* 010B8 808D7928 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 010BC 808D792C 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 /* 010C0 808D7930 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 010C4 808D7934 AFAE0068 */ sw $t6, 0x0068($sp) +/* 010C4 808D7934 AFAE0068 */ sw $t6, 0x0068($sp) /* 010C8 808D7938 8C8F014C */ lw $t7, 0x014C($a0) ## 0000014C /* 010CC 808D793C 3C028090 */ lui $v0, %hi(D_808F93C0) ## $v0 = 80900000 /* 010D0 808D7940 244293C0 */ addiu $v0, $v0, %lo(D_808F93C0) ## $v0 = 808F93C0 -/* 010D4 808D7944 000FC100 */ sll $t8, $t7, 4 -/* 010D8 808D7948 030FC021 */ addu $t8, $t8, $t7 -/* 010DC 808D794C 0018C080 */ sll $t8, $t8, 2 -/* 010E0 808D7950 00B8C821 */ addu $t9, $a1, $t8 -/* 010E4 808D7954 01194021 */ addu $t0, $t0, $t9 +/* 010D4 808D7944 000FC100 */ sll $t8, $t7, 4 +/* 010D8 808D7948 030FC021 */ addu $t8, $t8, $t7 +/* 010DC 808D794C 0018C080 */ sll $t8, $t8, 2 +/* 010E0 808D7950 00B8C821 */ addu $t9, $a1, $t8 +/* 010E4 808D7954 01194021 */ addu $t0, $t0, $t9 /* 010E8 808D7958 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 /* 010EC 808D795C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 010F0 808D7960 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010F4 808D7964 01014821 */ addu $t1, $t0, $at +/* 010F4 808D7964 01014821 */ addu $t1, $t0, $at /* 010F8 808D7968 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 010FC 808D796C AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 /* 01100 808D7970 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 @@ -39,25 +39,25 @@ glabel func_808D7918 /* 0113C 808D79AC 8C8E0524 */ lw $t6, 0x0524($a0) ## 00000674 /* 01140 808D79B0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 01144 808D79B4 AC8F0524 */ sw $t7, 0x0524($a0) ## 00000674 -/* 01148 808D79B8 AFA50074 */ sw $a1, 0x0074($sp) +/* 01148 808D79B8 AFA50074 */ sw $a1, 0x0074($sp) /* 0114C 808D79BC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01150 808D79C0 AFA4004C */ sw $a0, 0x004C($sp) + +/* 01150 808D79C0 AFA4004C */ sw $a0, 0x004C($sp) /* 01154 808D79C4 96180678 */ lhu $t8, 0x0678($s0) ## 00000678 -/* 01158 808D79C8 2F010017 */ sltiu $at, $t8, 0x0017 -/* 0115C 808D79CC 10200541 */ beq $at, $zero, .L808D8ED4 -/* 01160 808D79D0 0018C080 */ sll $t8, $t8, 2 +/* 01158 808D79C8 2F010017 */ sltiu $at, $t8, 0x0017 +/* 0115C 808D79CC 10200541 */ beq $at, $zero, .L808D8ED4 +/* 01160 808D79D0 0018C080 */ sll $t8, $t8, 2 /* 01164 808D79D4 3C01808F */ lui $at, %hi(jtbl_808F7E6C) ## $at = 808F0000 -/* 01168 808D79D8 00380821 */ addu $at, $at, $t8 -/* 0116C 808D79DC 8C387E6C */ lw $t8, %lo(jtbl_808F7E6C)($at) -/* 01170 808D79E0 03000008 */ jr $t8 +/* 01168 808D79D8 00380821 */ addu $at, $at, $t8 +/* 0116C 808D79DC 8C387E6C */ lw $t8, %lo(jtbl_808F7E6C)($at) +/* 01170 808D79E0 03000008 */ jr $t8 /* 01174 808D79E4 00000000 */ nop glabel L808D79E8 -/* 01178 808D79E8 8FA20068 */ lw $v0, 0x0068($sp) +/* 01178 808D79E8 8FA20068 */ lw $v0, 0x0068($sp) /* 0117C 808D79EC 3C0143D7 */ lui $at, 0x43D7 ## $at = 43D70000 /* 01180 808D79F0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01184 808D79F4 44818000 */ mtc1 $at, $f16 ## $f16 = 430.00 -/* 01188 808D79F8 8FA40074 */ lw $a0, 0x0074($sp) +/* 01188 808D79F8 8FA40074 */ lw $a0, 0x0074($sp) /* 0118C 808D79FC 3C0142E0 */ lui $at, 0x42E0 ## $at = 42E00000 /* 01190 808D7A00 44819000 */ mtc1 $at, $f18 ## $f18 = 112.00 /* 01194 808D7A04 E4400024 */ swc1 $f0, 0x0024($v0) ## 00000024 @@ -66,28 +66,28 @@ glabel L808D79E8 /* 011A0 808D7A10 3C01808F */ lui $at, %hi(D_808F7EC8) ## $at = 808F0000 /* 011A4 808D7A14 E6000024 */ swc1 $f0, 0x0024($s0) ## 00000024 /* 011A8 808D7A18 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 011AC 808D7A1C C4247EC8 */ lwc1 $f4, %lo(D_808F7EC8)($at) +/* 011AC 808D7A1C C4247EC8 */ lwc1 $f4, %lo(D_808F7EC8)($at) /* 011B0 808D7A20 3C01808F */ lui $at, %hi(D_808F7ECC) ## $at = 808F0000 /* 011B4 808D7A24 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 /* 011B8 808D7A28 E604002C */ swc1 $f4, 0x002C($s0) ## 0000002C -/* 011BC 808D7A2C C4267ECC */ lwc1 $f6, %lo(D_808F7ECC)($at) +/* 011BC 808D7A2C C4267ECC */ lwc1 $f6, %lo(D_808F7ECC)($at) /* 011C0 808D7A30 A60000B6 */ sh $zero, 0x00B6($s0) ## 000000B6 -/* 011C4 808D7A34 0C019148 */ jal func_80064520 +/* 011C4 808D7A34 0C019148 */ jal func_80064520 /* 011C8 808D7A38 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 011CC 808D7A3C 8FA40074 */ lw $a0, 0x0074($sp) +/* 011CC 808D7A3C 8FA40074 */ lw $a0, 0x0074($sp) /* 011D0 808D7A40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 011D4 808D7A44 0C00B7D5 */ jal func_8002DF54 +/* 011D4 808D7A44 0C00B7D5 */ jal func_8002DF54 /* 011D8 808D7A48 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 011DC 808D7A4C 0C03008C */ jal func_800C0230 -/* 011E0 808D7A50 8FA40074 */ lw $a0, 0x0074($sp) +/* 011DC 808D7A4C 0C03008C */ jal func_800C0230 +/* 011E0 808D7A50 8FA40074 */ lw $a0, 0x0074($sp) /* 011E4 808D7A54 A602067A */ sh $v0, 0x067A($s0) ## 0000067A -/* 011E8 808D7A58 8FA40074 */ lw $a0, 0x0074($sp) +/* 011E8 808D7A58 8FA40074 */ lw $a0, 0x0074($sp) /* 011EC 808D7A5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 011F0 808D7A60 0C0300C5 */ jal func_800C0314 +/* 011F0 808D7A60 0C0300C5 */ jal func_800C0314 /* 011F4 808D7A64 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 011F8 808D7A68 8FA40074 */ lw $a0, 0x0074($sp) +/* 011F8 808D7A68 8FA40074 */ lw $a0, 0x0074($sp) /* 011FC 808D7A6C 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 01200 808D7A70 0C0300C5 */ jal func_800C0314 +/* 01200 808D7A70 0C0300C5 */ jal func_800C0314 /* 01204 808D7A74 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01208 808D7A78 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0120C 808D7A7C 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 @@ -98,25 +98,25 @@ glabel L808D79E8 /* 01220 808D7A90 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 01224 808D7A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01228 808D7A98 33280100 */ andi $t0, $t9, 0x0100 ## $t0 = 00000000 -/* 0122C 808D7A9C 11000020 */ beq $t0, $zero, .L808D7B20 +/* 0122C 808D7A9C 11000020 */ beq $t0, $zero, .L808D7B20 /* 01230 808D7AA0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01234 808D7AA4 A6090678 */ sh $t1, 0x0678($s0) ## 00000678 /* 01238 808D7AA8 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 /* 0123C 808D7AAC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01240 808D7AB0 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 01244 808D7AB4 8FAA0068 */ lw $t2, 0x0068($sp) +/* 01244 808D7AB4 8FAA0068 */ lw $t2, 0x0068($sp) /* 01248 808D7AB8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0124C 808D7ABC 24A589F8 */ addiu $a1, $a1, 0x89F8 ## $a1 = 060089F8 /* 01250 808D7AC0 E54A002C */ swc1 $f10, 0x002C($t2) ## 0000002C /* 01254 808D7AC4 A200071A */ sb $zero, 0x071A($s0) ## 0000071A -/* 01258 808D7AC8 8FA4004C */ lw $a0, 0x004C($sp) -/* 0125C 808D7ACC 0C0294D3 */ jal func_800A534C +/* 01258 808D7AC8 8FA4004C */ lw $a0, 0x004C($sp) +/* 0125C 808D7ACC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01260 808D7AD0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01264 808D7AD4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01268 808D7AD8 44818000 */ mtc1 $at, $f16 ## $f16 = 1000.00 /* 0126C 808D7ADC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01270 808D7AE0 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 01274 808D7AE4 0C235E1F */ jal func_808D787C +/* 01274 808D7AE4 0C235E1F */ jal func_808D787C /* 01278 808D7AE8 E61001CC */ swc1 $f16, 0x01CC($s0) ## 000001CC /* 0127C 808D7AEC 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 /* 01280 808D7AF0 240B006E */ addiu $t3, $zero, 0x006E ## $t3 = 0000006E @@ -127,15 +127,15 @@ glabel L808D79E8 /* 01294 808D7B04 3C041000 */ lui $a0, 0x1000 ## $a0 = 10000000 /* 01298 808D7B08 A42CFA84 */ sh $t4, -0x057C($at) ## 8015FA84 /* 0129C 808D7B0C 0C03E803 */ jal Audio_SetBGM - + /* 012A0 808D7B10 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100000FF -/* 012A4 808D7B14 8FA40074 */ lw $a0, 0x0074($sp) -/* 012A8 808D7B18 1000001B */ beq $zero, $zero, .L808D7B88 +/* 012A4 808D7B14 8FA40074 */ lw $a0, 0x0074($sp) +/* 012A8 808D7B18 1000001B */ beq $zero, $zero, .L808D7B88 /* 012AC 808D7B1C 24841C24 */ addiu $a0, $a0, 0x1C24 ## $a0 = 00001C24 .L808D7B20: -/* 012B0 808D7B20 0C235E1F */ jal func_808D787C +/* 012B0 808D7B20 0C235E1F */ jal func_808D787C /* 012B4 808D7B24 A20D071A */ sb $t5, 0x071A($s0) ## 0000071A -/* 012B8 808D7B28 8FA60074 */ lw $a2, 0x0074($sp) +/* 012B8 808D7B28 8FA60074 */ lw $a2, 0x0074($sp) /* 012BC 808D7B2C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 012C0 808D7B30 A60E0678 */ sh $t6, 0x0678($s0) ## 00000678 /* 012C4 808D7B34 3C01435C */ lui $at, 0x435C ## $at = 435C0000 @@ -145,39 +145,39 @@ glabel L808D79E8 /* 012D4 808D7B44 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 012D8 808D7B48 240F2000 */ addiu $t7, $zero, 0x2000 ## $t7 = 00002000 /* 012DC 808D7B4C 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 012E0 808D7B50 AFA40050 */ sw $a0, 0x0050($sp) -/* 012E4 808D7B54 AFAF0028 */ sw $t7, 0x0028($sp) -/* 012E8 808D7B58 AFA00024 */ sw $zero, 0x0024($sp) -/* 012EC 808D7B5C AFA00020 */ sw $zero, 0x0020($sp) -/* 012F0 808D7B60 AFA0001C */ sw $zero, 0x001C($sp) +/* 012E0 808D7B50 AFA40050 */ sw $a0, 0x0050($sp) +/* 012E4 808D7B54 AFAF0028 */ sw $t7, 0x0028($sp) +/* 012E8 808D7B58 AFA00024 */ sw $zero, 0x0024($sp) +/* 012EC 808D7B5C AFA00020 */ sw $zero, 0x0020($sp) +/* 012F0 808D7B60 AFA0001C */ sw $zero, 0x001C($sp) /* 012F4 808D7B64 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 012F8 808D7B68 24070179 */ addiu $a3, $zero, 0x0179 ## $a3 = 00000179 -/* 012FC 808D7B6C E7A40014 */ swc1 $f4, 0x0014($sp) -/* 01300 808D7B70 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 012FC 808D7B6C E7A40014 */ swc1 $f4, 0x0014($sp) +/* 01300 808D7B70 E7A60018 */ swc1 $f6, 0x0018($sp) /* 01304 808D7B74 0C00C916 */ jal Actor_SpawnAttached - -/* 01308 808D7B78 E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 01308 808D7B78 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0130C 808D7B7C 3C018090 */ lui $at, %hi(D_808F93D4) ## $at = 80900000 -/* 01310 808D7B80 AC2293D4 */ sw $v0, %lo(D_808F93D4)($at) -/* 01314 808D7B84 8FA40050 */ lw $a0, 0x0050($sp) +/* 01310 808D7B80 AC2293D4 */ sw $v0, %lo(D_808F93D4)($at) +/* 01314 808D7B84 8FA40050 */ lw $a0, 0x0050($sp) .L808D7B88: /* 01318 808D7B88 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0131C 808D7B8C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01320 808D7B90 AFB80028 */ sw $t8, 0x0028($sp) +/* 01320 808D7B90 AFB80028 */ sw $t8, 0x0028($sp) /* 01324 808D7B94 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01328 808D7B98 8FA60074 */ lw $a2, 0x0074($sp) +/* 01328 808D7B98 8FA60074 */ lw $a2, 0x0074($sp) /* 0132C 808D7B9C 2407015E */ addiu $a3, $zero, 0x015E ## $a3 = 0000015E -/* 01330 808D7BA0 AFA0001C */ sw $zero, 0x001C($sp) -/* 01334 808D7BA4 AFA00020 */ sw $zero, 0x0020($sp) -/* 01338 808D7BA8 AFA00024 */ sw $zero, 0x0024($sp) -/* 0133C 808D7BAC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01340 808D7BB0 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 01330 808D7BA0 AFA0001C */ sw $zero, 0x001C($sp) +/* 01334 808D7BA4 AFA00020 */ sw $zero, 0x0020($sp) +/* 01338 808D7BA8 AFA00024 */ sw $zero, 0x0024($sp) +/* 0133C 808D7BAC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01340 808D7BB0 E7A00014 */ swc1 $f0, 0x0014($sp) /* 01344 808D7BB4 0C00C916 */ jal Actor_SpawnAttached - -/* 01348 808D7BB8 E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 01348 808D7BB8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0134C 808D7BBC 3C014264 */ lui $at, 0x4264 ## $at = 42640000 /* 01350 808D7BC0 3C198090 */ lui $t9, %hi(D_808F93C0) ## $t9 = 80900000 -/* 01354 808D7BC4 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) +/* 01354 808D7BC4 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) /* 01358 808D7BC8 44814000 */ mtc1 $at, $f8 ## $f8 = 57.00 /* 0135C 808D7BCC 00000000 */ nop /* 01360 808D7BD0 E72816AC */ swc1 $f8, 0x16AC($t9) ## 809016AC @@ -185,37 +185,37 @@ glabel L808D7BD4 /* 01364 808D7BD4 8E090674 */ lw $t1, 0x0674($s0) ## 00000674 /* 01368 808D7BD8 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 0136C 808D7BDC 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 01370 808D7BE0 152104BC */ bne $t1, $at, .L808D8ED4 +/* 01370 808D7BE0 152104BC */ bne $t1, $at, .L808D8ED4 /* 01374 808D7BE4 A20801A0 */ sb $t0, 0x01A0($s0) ## 000001A0 /* 01378 808D7BE8 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 /* 0137C 808D7BEC A60A0678 */ sh $t2, 0x0678($s0) ## 00000678 -/* 01380 808D7BF0 100004B8 */ beq $zero, $zero, .L808D8ED4 +/* 01380 808D7BF0 100004B8 */ beq $zero, $zero, .L808D8ED4 /* 01384 808D7BF4 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D7BF8 /* 01388 808D7BF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0138C 808D7BFC 0C235E1F */ jal func_808D787C +/* 0138C 808D7BFC 0C235E1F */ jal func_808D787C /* 01390 808D7C00 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 01394 808D7C04 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01398 808D7C08 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0139C 808D7C0C 8FA40074 */ lw $a0, 0x0074($sp) -/* 013A0 808D7C10 14610004 */ bne $v1, $at, .L808D7C24 +/* 0139C 808D7C0C 8FA40074 */ lw $a0, 0x0074($sp) +/* 013A0 808D7C10 14610004 */ bne $v1, $at, .L808D7C24 /* 013A4 808D7C14 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 013A8 808D7C18 0C00B7D5 */ jal func_8002DF54 +/* 013A8 808D7C18 0C00B7D5 */ jal func_8002DF54 /* 013AC 808D7C1C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 013B0 808D7C20 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D7C24: /* 013B4 808D7C24 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 013B8 808D7C28 14610007 */ bne $v1, $at, .L808D7C48 -/* 013BC 808D7C2C 8FA40068 */ lw $a0, 0x0068($sp) +/* 013B8 808D7C28 14610007 */ bne $v1, $at, .L808D7C48 +/* 013BC 808D7C2C 8FA40068 */ lw $a0, 0x0068($sp) /* 013C0 808D7C30 8C8C0678 */ lw $t4, 0x0678($a0) ## 00000678 /* 013C4 808D7C34 95850092 */ lhu $a1, 0x0092($t4) ## 00000092 /* 013C8 808D7C38 24A56816 */ addiu $a1, $a1, 0x6816 ## $a1 = 00006816 -/* 013CC 808D7C3C 0C00BDF7 */ jal func_8002F7DC +/* 013CC 808D7C3C 0C00BDF7 */ jal func_8002F7DC /* 013D0 808D7C40 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00006816 /* 013D4 808D7C44 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D7C48: /* 013D8 808D7C48 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 013DC 808D7C4C 146104A1 */ bne $v1, $at, .L808D8ED4 +/* 013DC 808D7C4C 146104A1 */ bne $v1, $at, .L808D8ED4 /* 013E0 808D7C50 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 013E4 808D7C54 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 013E8 808D7C58 44818000 */ mtc1 $at, $f16 ## $f16 = 60.00 @@ -230,39 +230,39 @@ glabel L808D7BF8 /* 0140C 808D7C7C E60A0680 */ swc1 $f10, 0x0680($s0) ## 00000680 /* 01410 808D7C80 E6120688 */ swc1 $f18, 0x0688($s0) ## 00000688 /* 01414 808D7C84 E604068C */ swc1 $f4, 0x068C($s0) ## 0000068C -/* 01418 808D7C88 C4267ED0 */ lwc1 $f6, %lo(D_808F7ED0)($at) +/* 01418 808D7C88 C4267ED0 */ lwc1 $f6, %lo(D_808F7ED0)($at) /* 0141C 808D7C8C E6060704 */ swc1 $f6, 0x0704($s0) ## 00000704 glabel L808D7C90 /* 01420 808D7C90 A20001A0 */ sb $zero, 0x01A0($s0) ## 000001A0 -/* 01424 808D7C94 8FAE0074 */ lw $t6, 0x0074($sp) +/* 01424 808D7C94 8FAE0074 */ lw $t6, 0x0074($sp) /* 01428 808D7C98 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0142C 808D7C9C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01430 808D7CA0 002E0821 */ addu $at, $at, $t6 +/* 01430 808D7CA0 002E0821 */ addu $at, $at, $t6 /* 01434 808D7CA4 E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC /* 01438 808D7CA8 0C0400A4 */ jal sinf - + /* 0143C 808D7CAC C60C0704 */ lwc1 $f12, 0x0704($s0) ## 00000704 /* 01440 808D7CB0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 01444 808D7CB4 44815000 */ mtc1 $at, $f10 ## $f10 = 300.00 /* 01448 808D7CB8 C6120684 */ lwc1 $f18, 0x0684($s0) ## 00000684 /* 0144C 808D7CBC C60C0704 */ lwc1 $f12, 0x0704($s0) ## 00000704 -/* 01450 808D7CC0 460A0402 */ mul.s $f16, $f0, $f10 -/* 01454 808D7CC4 46128100 */ add.s $f4, $f16, $f18 +/* 01450 808D7CC0 460A0402 */ mul.s $f16, $f0, $f10 +/* 01454 808D7CC4 46128100 */ add.s $f4, $f16, $f18 /* 01458 808D7CC8 0C041184 */ jal cosf - + /* 0145C 808D7CCC E6040690 */ swc1 $f4, 0x0690($s0) ## 00000690 /* 01460 808D7CD0 3C01C396 */ lui $at, 0xC396 ## $at = C3960000 /* 01464 808D7CD4 44813000 */ mtc1 $at, $f6 ## $f6 = -300.00 /* 01468 808D7CD8 C60A0688 */ lwc1 $f10, 0x0688($s0) ## 00000688 /* 0146C 808D7CDC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 01470 808D7CE0 46060202 */ mul.s $f8, $f0, $f6 +/* 01470 808D7CE0 46060202 */ mul.s $f8, $f0, $f6 /* 01474 808D7CE4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 01478 808D7CE8 26040704 */ addiu $a0, $s0, 0x0704 ## $a0 = 00000704 /* 0147C 808D7CEC 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 /* 01480 808D7CF0 8E0706B4 */ lw $a3, 0x06B4($s0) ## 000006B4 -/* 01484 808D7CF4 460A4400 */ add.s $f16, $f8, $f10 +/* 01484 808D7CF4 460A4400 */ add.s $f16, $f8, $f10 /* 01488 808D7CF8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0148C 808D7CFC E6100694 */ swc1 $f16, 0x0694($s0) ## 00000694 /* 01490 808D7D00 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 01494 808D7D04 3C0738D1 */ lui $a3, 0x38D1 ## $a3 = 38D10000 @@ -270,30 +270,30 @@ glabel L808D7C90 /* 0149C 808D7D0C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 014A0 808D7D10 260406B4 */ addiu $a0, $s0, 0x06B4 ## $a0 = 000006B4 /* 014A4 808D7D14 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 014A8 808D7D18 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 014AC 808D7D1C 8E0F0674 */ lw $t7, 0x0674($s0) ## 00000674 /* 014B0 808D7D20 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 -/* 014B4 808D7D24 8FA40074 */ lw $a0, 0x0074($sp) -/* 014B8 808D7D28 15E1046A */ bne $t7, $at, .L808D8ED4 +/* 014B4 808D7D24 8FA40074 */ lw $a0, 0x0074($sp) +/* 014B8 808D7D28 15E1046A */ bne $t7, $at, .L808D8ED4 /* 014BC 808D7D2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 014C0 808D7D30 0C00B7D5 */ jal func_8002DF54 +/* 014C0 808D7D30 0C00B7D5 */ jal func_8002DF54 /* 014C4 808D7D34 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 /* 014C8 808D7D38 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 /* 014CC 808D7D3C A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 014D0 808D7D40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014D4 808D7D44 0C235E1F */ jal func_808D787C +/* 014D4 808D7D44 0C235E1F */ jal func_808D787C /* 014D8 808D7D48 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 014DC 808D7D4C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D7D50 /* 014E0 808D7D50 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 014E4 808D7D54 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 014E8 808D7D58 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 014EC 808D7D5C 10600004 */ beq $v1, $zero, .L808D7D70 +/* 014EC 808D7D5C 10600004 */ beq $v1, $zero, .L808D7D70 /* 014F0 808D7D60 24080023 */ addiu $t0, $zero, 0x0023 ## $t0 = 00000023 -/* 014F4 808D7D64 10610002 */ beq $v1, $at, .L808D7D70 +/* 014F4 808D7D64 10610002 */ beq $v1, $at, .L808D7D70 /* 014F8 808D7D68 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 014FC 808D7D6C 1461000B */ bne $v1, $at, .L808D7D9C +/* 014FC 808D7D6C 1461000B */ bne $v1, $at, .L808D7D9C .L808D7D70: /* 01500 808D7D70 3C014288 */ lui $at, 0x4288 ## $at = 42880000 /* 01504 808D7D74 44812000 */ mtc1 $at, $f4 ## $f4 = 68.00 @@ -301,74 +301,74 @@ glabel L808D7D50 /* 0150C 808D7D7C C6120684 */ lwc1 $f18, 0x0684($s0) ## 00000684 /* 01510 808D7D80 44815000 */ mtc1 $at, $f10 ## $f10 = 142.00 /* 01514 808D7D84 C6080688 */ lwc1 $f8, 0x0688($s0) ## 00000688 -/* 01518 808D7D88 46049180 */ add.s $f6, $f18, $f4 +/* 01518 808D7D88 46049180 */ add.s $f6, $f18, $f4 /* 0151C 808D7D8C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 01520 808D7D90 460A4401 */ sub.s $f16, $f8, $f10 +/* 01520 808D7D90 460A4401 */ sub.s $f16, $f8, $f10 /* 01524 808D7D94 E6060684 */ swc1 $f6, 0x0684($s0) ## 00000684 /* 01528 808D7D98 E6100688 */ swc1 $f16, 0x0688($s0) ## 00000688 .L808D7D9C: -/* 0152C 808D7D9C 2C610014 */ sltiu $at, $v1, 0x0014 -/* 01530 808D7DA0 14200003 */ bne $at, $zero, .L808D7DB0 +/* 0152C 808D7D9C 2C610014 */ sltiu $at, $v1, 0x0014 +/* 01530 808D7DA0 14200003 */ bne $at, $zero, .L808D7DB0 /* 01534 808D7DA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01538 808D7DA8 10000002 */ beq $zero, $zero, .L808D7DB4 +/* 01538 808D7DA8 10000002 */ beq $zero, $zero, .L808D7DB4 /* 0153C 808D7DAC A21901A0 */ sb $t9, 0x01A0($s0) ## 000001A0 .L808D7DB0: /* 01540 808D7DB0 A20801A0 */ sb $t0, 0x01A0($s0) ## 000001A0 .L808D7DB4: /* 01544 808D7DB4 8E090674 */ lw $t1, 0x0674($s0) ## 00000674 /* 01548 808D7DB8 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 0154C 808D7DBC 55210446 */ bnel $t1, $at, .L808D8ED8 +/* 0154C 808D7DBC 55210446 */ bnel $t1, $at, .L808D8ED8 /* 01550 808D7DC0 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 01554 808D7DC4 0C235E1F */ jal func_808D787C +/* 01554 808D7DC4 0C235E1F */ jal func_808D787C /* 01558 808D7DC8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0155C 808D7DCC 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 /* 01560 808D7DD0 A60A0678 */ sh $t2, 0x0678($s0) ## 00000678 -/* 01564 808D7DD4 1000043F */ beq $zero, $zero, .L808D8ED4 +/* 01564 808D7DD4 1000043F */ beq $zero, $zero, .L808D8ED4 /* 01568 808D7DD8 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D7DDC /* 0156C 808D7DDC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01570 808D7DE0 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 /* 01574 808D7DE4 A20B01A0 */ sb $t3, 0x01A0($s0) ## 000001A0 -/* 01578 808D7DE8 2C610032 */ sltiu $at, $v1, 0x0032 -/* 0157C 808D7DEC 10200007 */ beq $at, $zero, .L808D7E0C -/* 01580 808D7DF0 8FAC0074 */ lw $t4, 0x0074($sp) +/* 01578 808D7DE8 2C610032 */ sltiu $at, $v1, 0x0032 +/* 0157C 808D7DEC 10200007 */ beq $at, $zero, .L808D7E0C +/* 01580 808D7DF0 8FAC0074 */ lw $t4, 0x0074($sp) /* 01584 808D7DF4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01588 808D7DF8 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 /* 0158C 808D7DFC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01590 808D7E00 002C0821 */ addu $at, $at, $t4 +/* 01590 808D7E00 002C0821 */ addu $at, $at, $t4 /* 01594 808D7E04 E4320AFC */ swc1 $f18, 0x0AFC($at) ## 00010AFC /* 01598 808D7E08 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D7E0C: /* 0159C 808D7E0C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 015A0 808D7E10 14610005 */ bne $v1, $at, .L808D7E28 -/* 015A4 808D7E14 8FA40074 */ lw $a0, 0x0074($sp) +/* 015A0 808D7E10 14610005 */ bne $v1, $at, .L808D7E28 +/* 015A4 808D7E14 8FA40074 */ lw $a0, 0x0074($sp) /* 015A8 808D7E18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 015AC 808D7E1C 0C00B7D5 */ jal func_8002DF54 +/* 015AC 808D7E1C 0C00B7D5 */ jal func_8002DF54 /* 015B0 808D7E20 2406004B */ addiu $a2, $zero, 0x004B ## $a2 = 0000004B /* 015B4 808D7E24 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D7E28: /* 015B8 808D7E28 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 015BC 808D7E2C 14610429 */ bne $v1, $at, .L808D8ED4 +/* 015BC 808D7E2C 14610429 */ bne $v1, $at, .L808D8ED4 /* 015C0 808D7E30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015C4 808D7E34 0C235E1F */ jal func_808D787C +/* 015C4 808D7E34 0C235E1F */ jal func_808D787C /* 015C8 808D7E38 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 015CC 808D7E3C 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 /* 015D0 808D7E40 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 015D4 808D7E44 A60D0678 */ sh $t5, 0x0678($s0) ## 00000678 /* 015D8 808D7E48 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 015DC 808D7E4C 10000421 */ beq $zero, $zero, .L808D8ED4 +/* 015DC 808D7E4C 10000421 */ beq $zero, $zero, .L808D8ED4 /* 015E0 808D7E50 A20E01A0 */ sb $t6, 0x01A0($s0) ## 000001A0 glabel L808D7E54 /* 015E4 808D7E54 8E180674 */ lw $t8, 0x0674($s0) ## 00000674 /* 015E8 808D7E58 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 015EC 808D7E5C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 015F0 808D7E60 1701041C */ bne $t8, $at, .L808D8ED4 +/* 015F0 808D7E60 1701041C */ bne $t8, $at, .L808D8ED4 /* 015F4 808D7E64 A20F01A0 */ sb $t7, 0x01A0($s0) ## 000001A0 /* 015F8 808D7E68 24190007 */ addiu $t9, $zero, 0x0007 ## $t9 = 00000007 /* 015FC 808D7E6C A6190678 */ sh $t9, 0x0678($s0) ## 00000678 /* 01600 808D7E70 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 /* 01604 808D7E74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01608 808D7E78 0C235E1F */ jal func_808D787C +/* 01608 808D7E78 0C235E1F */ jal func_808D787C /* 0160C 808D7E7C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 01610 808D7E80 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01614 808D7E84 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 @@ -382,12 +382,12 @@ glabel L808D7E54 /* 01634 808D7EA4 E60401E0 */ swc1 $f4, 0x01E0($s0) ## 000001E0 /* 01638 808D7EA8 E60801D4 */ swc1 $f8, 0x01D4($s0) ## 000001D4 /* 0163C 808D7EAC E60601D8 */ swc1 $f6, 0x01D8($s0) ## 000001D8 -/* 01640 808D7EB0 0C01E221 */ jal func_80078884 +/* 01640 808D7EB0 0C01E221 */ jal func_80078884 /* 01644 808D7EB4 E60A01DC */ swc1 $f10, 0x01DC($s0) ## 000001DC -/* 01648 808D7EB8 8FA80074 */ lw $t0, 0x0074($sp) +/* 01648 808D7EB8 8FA80074 */ lw $t0, 0x0074($sp) /* 0164C 808D7EBC 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 01650 808D7EC0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01654 808D7EC4 00280821 */ addu $at, $at, $t0 +/* 01654 808D7EC4 00280821 */ addu $at, $at, $t0 /* 01658 808D7EC8 E4300AFC */ swc1 $f16, 0x0AFC($at) ## 00010AFC glabel L808D7ECC /* 0165C 808D7ECC 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 @@ -396,7 +396,7 @@ glabel L808D7ECC /* 01668 808D7ED8 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 0166C 808D7EDC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01670 808D7EE0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01674 808D7EE4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01678 808D7EE8 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 /* 0167C 808D7EEC 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 @@ -404,81 +404,81 @@ glabel L808D7ECC /* 01684 808D7EF4 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD /* 01688 808D7EF8 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 /* 0168C 808D7EFC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01690 808D7F00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01694 808D7F04 3C074023 */ lui $a3, 0x4023 ## $a3 = 40230000 /* 01698 808D7F08 34E73333 */ ori $a3, $a3, 0x3333 ## $a3 = 40233333 /* 0169C 808D7F0C 260401D4 */ addiu $a0, $s0, 0x01D4 ## $a0 = 000001D4 /* 016A0 808D7F10 3C05432A */ lui $a1, 0x432A ## $a1 = 432A0000 /* 016A4 808D7F14 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 016A8 808D7F18 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 016AC 808D7F1C 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 016B0 808D7F20 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 016B4 808D7F24 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 016B8 808D7F28 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 016BC 808D7F2C 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 016C0 808D7F30 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 016C4 808D7F34 240A0041 */ addiu $t2, $zero, 0x0041 ## $t2 = 00000041 /* 016C8 808D7F38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016CC 808D7F3C 2C61001E */ sltiu $at, $v1, 0x001E -/* 016D0 808D7F40 54200004 */ bnel $at, $zero, .L808D7F54 +/* 016CC 808D7F3C 2C61001E */ sltiu $at, $v1, 0x001E +/* 016D0 808D7F40 54200004 */ bnel $at, $zero, .L808D7F54 /* 016D4 808D7F44 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 016D8 808D7F48 A20A01A0 */ sb $t2, 0x01A0($s0) ## 000001A0 /* 016DC 808D7F4C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 016E0 808D7F50 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E .L808D7F54: -/* 016E4 808D7F54 14610006 */ bne $v1, $at, .L808D7F70 -/* 016E8 808D7F58 8FAB0074 */ lw $t3, 0x0074($sp) +/* 016E4 808D7F54 14610006 */ bne $v1, $at, .L808D7F70 +/* 016E8 808D7F58 8FAB0074 */ lw $t3, 0x0074($sp) /* 016EC 808D7F5C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 016F0 808D7F60 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 /* 016F4 808D7F64 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 016F8 808D7F68 002B0821 */ addu $at, $at, $t3 +/* 016F8 808D7F68 002B0821 */ addu $at, $at, $t3 /* 016FC 808D7F6C E4320AFC */ swc1 $f18, 0x0AFC($at) ## 00010AFC .L808D7F70: -/* 01700 808D7F70 0C235E1F */ jal func_808D787C +/* 01700 808D7F70 0C235E1F */ jal func_808D787C /* 01704 808D7F74 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 01708 808D7F78 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0170C 808D7F7C 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 /* 01710 808D7F80 C6040680 */ lwc1 $f4, 0x0680($s0) ## 00000680 /* 01714 808D7F84 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01718 808D7F88 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 -/* 0171C 808D7F8C 46062200 */ add.s $f8, $f4, $f6 +/* 0171C 808D7F8C 46062200 */ add.s $f8, $f4, $f6 /* 01720 808D7F90 3C014190 */ lui $at, 0x4190 ## $at = 41900000 /* 01724 808D7F94 C60A0688 */ lwc1 $f10, 0x0688($s0) ## 00000688 /* 01728 808D7F98 44813000 */ mtc1 $at, $f6 ## $f6 = 18.00 /* 0172C 808D7F9C C604068C */ lwc1 $f4, 0x068C($s0) ## 0000068C /* 01730 808D7FA0 E6080680 */ swc1 $f8, 0x0680($s0) ## 00000680 -/* 01734 808D7FA4 46105480 */ add.s $f18, $f10, $f16 +/* 01734 808D7FA4 46105480 */ add.s $f18, $f10, $f16 /* 01738 808D7FA8 8E0C0674 */ lw $t4, 0x0674($s0) ## 00000674 /* 0173C 808D7FAC 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 01740 808D7FB0 46062200 */ add.s $f8, $f4, $f6 +/* 01740 808D7FB0 46062200 */ add.s $f8, $f4, $f6 /* 01744 808D7FB4 E6120688 */ swc1 $f18, 0x0688($s0) ## 00000688 /* 01748 808D7FB8 240D0008 */ addiu $t5, $zero, 0x0008 ## $t5 = 00000008 -/* 0174C 808D7FBC 158103C5 */ bne $t4, $at, .L808D8ED4 +/* 0174C 808D7FBC 158103C5 */ bne $t4, $at, .L808D8ED4 /* 01750 808D7FC0 E608068C */ swc1 $f8, 0x068C($s0) ## 0000068C /* 01754 808D7FC4 A60D0678 */ sh $t5, 0x0678($s0) ## 00000678 -/* 01758 808D7FC8 100003C2 */ beq $zero, $zero, .L808D8ED4 +/* 01758 808D7FC8 100003C2 */ beq $zero, $zero, .L808D8ED4 /* 0175C 808D7FCC AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D7FD0 /* 01760 808D7FD0 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 01764 808D7FD4 A20E01A0 */ sb $t6, 0x01A0($s0) ## 000001A0 /* 01768 808D7FD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0176C 808D7FDC 0C235E1F */ jal func_808D787C +/* 0176C 808D7FDC 0C235E1F */ jal func_808D787C /* 01770 808D7FE0 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 01774 808D7FE4 8E0F0674 */ lw $t7, 0x0674($s0) ## 00000674 /* 01778 808D7FE8 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 0177C 808D7FEC 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 -/* 01780 808D7FF0 15E103B8 */ bne $t7, $at, .L808D8ED4 +/* 01780 808D7FF0 15E103B8 */ bne $t7, $at, .L808D8ED4 /* 01784 808D7FF4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01788 808D7FF8 A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 0178C 808D7FFC AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 01790 808D8000 8FA40074 */ lw $a0, 0x0074($sp) -/* 01794 808D8004 0C00B7D5 */ jal func_8002DF54 +/* 01790 808D8000 8FA40074 */ lw $a0, 0x0074($sp) +/* 01794 808D8004 0C00B7D5 */ jal func_8002DF54 /* 01798 808D8008 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 /* 0179C 808D800C 3C198090 */ lui $t9, %hi(D_808F93D4) ## $t9 = 80900000 -/* 017A0 808D8010 8F3993D4 */ lw $t9, %lo(D_808F93D4)($t9) +/* 017A0 808D8010 8F3993D4 */ lw $t9, %lo(D_808F93D4)($t9) /* 017A4 808D8014 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 017A8 808D8018 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 017AC 808D801C 3C01437F */ lui $at, 0x437F ## $at = 437F0000 @@ -493,24 +493,24 @@ glabel L808D7FD0 /* 017D0 808D8040 E60A01E0 */ swc1 $f10, 0x01E0($s0) ## 000001E0 /* 017D4 808D8044 E61201D4 */ swc1 $f18, 0x01D4($s0) ## 000001D4 /* 017D8 808D8048 E61001D8 */ swc1 $f16, 0x01D8($s0) ## 000001D8 -/* 017DC 808D804C 0C01E221 */ jal func_80078884 +/* 017DC 808D804C 0C01E221 */ jal func_80078884 /* 017E0 808D8050 E60401DC */ swc1 $f4, 0x01DC($s0) ## 000001DC -/* 017E4 808D8054 8FA90074 */ lw $t1, 0x0074($sp) +/* 017E4 808D8054 8FA90074 */ lw $t1, 0x0074($sp) /* 017E8 808D8058 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 017EC 808D805C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 017F0 808D8060 00290821 */ addu $at, $at, $t1 +/* 017F0 808D8060 00290821 */ addu $at, $at, $t1 /* 017F4 808D8064 E4260AFC */ swc1 $f6, 0x0AFC($at) ## 00010AFC glabel L808D8068 /* 017F8 808D8068 240A0007 */ addiu $t2, $zero, 0x0007 ## $t2 = 00000007 /* 017FC 808D806C A20A01A0 */ sb $t2, 0x01A0($s0) ## 000001A0 /* 01800 808D8070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01804 808D8074 0C235E1F */ jal func_808D787C +/* 01804 808D8074 0C235E1F */ jal func_808D787C /* 01808 808D8078 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 /* 0180C 808D807C 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 /* 01810 808D8080 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01814 808D8084 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01818 808D8088 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0181C 808D808C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01820 808D8090 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 /* 01824 808D8094 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 @@ -518,149 +518,149 @@ glabel L808D8068 /* 0182C 808D809C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD /* 01830 808D80A0 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 /* 01834 808D80A4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01838 808D80A8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0183C 808D80AC 3C074023 */ lui $a3, 0x4023 ## $a3 = 40230000 /* 01840 808D80B0 34E73333 */ ori $a3, $a3, 0x3333 ## $a3 = 40233333 /* 01844 808D80B4 260401D4 */ addiu $a0, $s0, 0x01D4 ## $a0 = 000001D4 /* 01848 808D80B8 3C05432A */ lui $a1, 0x432A ## $a1 = 432A0000 /* 0184C 808D80BC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01850 808D80C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01854 808D80C4 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 01858 808D80C8 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 0185C 808D80CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01860 808D80D0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01864 808D80D4 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 01868 808D80D8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 0186C 808D80DC 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 01870 808D80E0 3C0C8090 */ lui $t4, %hi(D_808F93D4) ## $t4 = 80900000 -/* 01874 808D80E4 14610005 */ bne $v1, $at, .L808D80FC +/* 01874 808D80E4 14610005 */ bne $v1, $at, .L808D80FC /* 01878 808D80E8 240D004B */ addiu $t5, $zero, 0x004B ## $t5 = 0000004B -/* 0187C 808D80EC 8D8C93D4 */ lw $t4, %lo(D_808F93D4)($t4) +/* 0187C 808D80EC 8D8C93D4 */ lw $t4, %lo(D_808F93D4)($t4) /* 01880 808D80F0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01884 808D80F4 A18B03C8 */ sb $t3, 0x03C8($t4) ## 809003C8 /* 01888 808D80F8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D80FC: -/* 0188C 808D80FC 2C610020 */ sltiu $at, $v1, 0x0020 -/* 01890 808D8100 14200003 */ bne $at, $zero, .L808D8110 +/* 0188C 808D80FC 2C610020 */ sltiu $at, $v1, 0x0020 +/* 01890 808D8100 14200003 */ bne $at, $zero, .L808D8110 /* 01894 808D8104 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 01898 808D8108 A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 /* 0189C 808D810C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8110: /* 018A0 808D8110 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 018A4 808D8114 14610007 */ bne $v1, $at, .L808D8134 -/* 018A8 808D8118 8FAE0074 */ lw $t6, 0x0074($sp) +/* 018A4 808D8114 14610007 */ bne $v1, $at, .L808D8134 +/* 018A8 808D8118 8FAE0074 */ lw $t6, 0x0074($sp) /* 018AC 808D811C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 018B0 808D8120 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 /* 018B4 808D8124 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 018B8 808D8128 002E0821 */ addu $at, $at, $t6 +/* 018B8 808D8128 002E0821 */ addu $at, $at, $t6 /* 018BC 808D812C E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC /* 018C0 808D8130 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8134: /* 018C4 808D8134 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 018C8 808D8138 54610367 */ bnel $v1, $at, .L808D8ED8 +/* 018C8 808D8138 54610367 */ bnel $v1, $at, .L808D8ED8 /* 018CC 808D813C 8605067A */ lh $a1, 0x067A($s0) ## 0000067A /* 018D0 808D8140 A60F0678 */ sh $t7, 0x0678($s0) ## 00000678 -/* 018D4 808D8144 10000363 */ beq $zero, $zero, .L808D8ED4 +/* 018D4 808D8144 10000363 */ beq $zero, $zero, .L808D8ED4 /* 018D8 808D8148 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D814C /* 018DC 808D814C 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 018E0 808D8150 A21801A0 */ sb $t8, 0x01A0($s0) ## 000001A0 /* 018E4 808D8154 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018E8 808D8158 0C235E1F */ jal func_808D787C +/* 018E8 808D8158 0C235E1F */ jal func_808D787C /* 018EC 808D815C 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 /* 018F0 808D8160 8E190674 */ lw $t9, 0x0674($s0) ## 00000674 /* 018F4 808D8164 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 /* 018F8 808D8168 2408000B */ addiu $t0, $zero, 0x000B ## $t0 = 0000000B -/* 018FC 808D816C 5721035A */ bnel $t9, $at, .L808D8ED8 +/* 018FC 808D816C 5721035A */ bnel $t9, $at, .L808D8ED8 /* 01900 808D8170 8605067A */ lh $a1, 0x067A($s0) ## 0000067A /* 01904 808D8174 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 01908 808D8178 A6080678 */ sh $t0, 0x0678($s0) ## 00000678 /* 0190C 808D817C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 01910 808D8180 10000354 */ beq $zero, $zero, .L808D8ED4 +/* 01910 808D8180 10000354 */ beq $zero, $zero, .L808D8ED4 /* 01914 808D8184 E60A01D8 */ swc1 $f10, 0x01D8($s0) ## 000001D8 glabel L808D8188 /* 01918 808D8188 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 0191C 808D818C A20901A0 */ sb $t1, 0x01A0($s0) ## 000001A0 /* 01920 808D8190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01924 808D8194 0C235E1F */ jal func_808D787C +/* 01924 808D8194 0C235E1F */ jal func_808D787C /* 01928 808D8198 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 0192C 808D819C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01930 808D81A0 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 01934 808D81A4 8FAA0068 */ lw $t2, 0x0068($sp) +/* 01934 808D81A4 8FAA0068 */ lw $t2, 0x0068($sp) /* 01938 808D81A8 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 0193C 808D81AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01940 808D81B0 E550002C */ swc1 $f16, 0x002C($t2) ## 0000002C /* 01944 808D81B4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 01948 808D81B8 8FA40074 */ lw $a0, 0x0074($sp) -/* 0194C 808D81BC 54610007 */ bnel $v1, $at, .L808D81DC +/* 01948 808D81B8 8FA40074 */ lw $a0, 0x0074($sp) +/* 0194C 808D81BC 54610007 */ bnel $v1, $at, .L808D81DC /* 01950 808D81C0 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 01954 808D81C4 0C00B7D5 */ jal func_8002DF54 +/* 01954 808D81C4 0C00B7D5 */ jal func_8002DF54 /* 01958 808D81C8 24060017 */ addiu $a2, $zero, 0x0017 ## $a2 = 00000017 -/* 0195C 808D81CC 0C020978 */ jal Interface_ChangeAlpha +/* 0195C 808D81CC 0C020978 */ jal Interface_ChangeAlpha /* 01960 808D81D0 2404000B */ addiu $a0, $zero, 0x000B ## $a0 = 0000000B /* 01964 808D81D4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01968 808D81D8 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 .L808D81DC: -/* 0196C 808D81DC 14610004 */ bne $v1, $at, .L808D81F0 +/* 0196C 808D81DC 14610004 */ bne $v1, $at, .L808D81F0 /* 01970 808D81E0 240B0140 */ addiu $t3, $zero, 0x0140 ## $t3 = 00000140 /* 01974 808D81E4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 01978 808D81E8 A42BFA84 */ sh $t3, -0x057C($at) ## 8015FA84 /* 0197C 808D81EC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D81F0: /* 01980 808D81F0 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 01984 808D81F4 54610005 */ bnel $v1, $at, .L808D820C +/* 01984 808D81F4 54610005 */ bnel $v1, $at, .L808D820C /* 01988 808D81F8 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 -/* 0198C 808D81FC 0C020978 */ jal Interface_ChangeAlpha +/* 0198C 808D81FC 0C020978 */ jal Interface_ChangeAlpha /* 01990 808D8200 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 01994 808D8204 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01998 808D8208 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 .L808D820C: -/* 0199C 808D820C 14610331 */ bne $v1, $at, .L808D8ED4 +/* 0199C 808D820C 14610331 */ bne $v1, $at, .L808D8ED4 /* 019A0 808D8210 240C000C */ addiu $t4, $zero, 0x000C ## $t4 = 0000000C /* 019A4 808D8214 A60C0678 */ sh $t4, 0x0678($s0) ## 00000678 -/* 019A8 808D8218 1000032E */ beq $zero, $zero, .L808D8ED4 +/* 019A8 808D8218 1000032E */ beq $zero, $zero, .L808D8ED4 /* 019AC 808D821C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D8220 /* 019B0 808D8220 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 019B4 808D8224 A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 /* 019B8 808D8228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019BC 808D822C 0C235E1F */ jal func_808D787C +/* 019BC 808D822C 0C235E1F */ jal func_808D787C /* 019C0 808D8230 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 /* 019C4 808D8234 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 019C8 808D8238 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 019CC 808D823C 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 -/* 019D0 808D8240 54610010 */ bnel $v1, $at, .L808D8284 -/* 019D4 808D8244 2C61001F */ sltiu $at, $v1, 0x001F +/* 019D0 808D8240 54610010 */ bnel $v1, $at, .L808D8284 +/* 019D4 808D8244 2C61001F */ sltiu $at, $v1, 0x001F /* 019D8 808D8248 0C03E803 */ jal Audio_SetBGM - + /* 019DC 808D824C 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 019E0 808D8250 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 019E4 808D8254 0C028800 */ jal SkelAnime_GetFrameCount - + /* 019E8 808D8258 24844F64 */ addiu $a0, $a0, 0x4F64 ## $a0 = 06004F64 /* 019EC 808D825C 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 019F0 808D8260 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 019F4 808D8264 24A54F64 */ addiu $a1, $a1, 0x4F64 ## $a1 = 06004F64 -/* 019F8 808D8268 46809120 */ cvt.s.w $f4, $f18 +/* 019F8 808D8268 46809120 */ cvt.s.w $f4, $f18 /* 019FC 808D826C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01A00 808D8270 E60401CC */ swc1 $f4, 0x01CC($s0) ## 000001CC -/* 01A04 808D8274 0C029490 */ jal func_800A5240 -/* 01A08 808D8278 8FA4004C */ lw $a0, 0x004C($sp) +/* 01A04 808D8274 0C029490 */ jal func_800A5240 +/* 01A08 808D8278 8FA4004C */ lw $a0, 0x004C($sp) /* 01A0C 808D827C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 01A10 808D8280 2C61001F */ sltiu $at, $v1, 0x001F +/* 01A10 808D8280 2C61001F */ sltiu $at, $v1, 0x001F .L808D8284: -/* 01A14 808D8284 1420000D */ bne $at, $zero, .L808D82BC -/* 01A18 808D8288 8FA4004C */ lw $a0, 0x004C($sp) -/* 01A1C 808D828C 0C0295B2 */ jal func_800A56C8 +/* 01A14 808D8284 1420000D */ bne $at, $zero, .L808D82BC +/* 01A18 808D8288 8FA4004C */ lw $a0, 0x004C($sp) +/* 01A1C 808D828C 0C0295B2 */ jal func_800A56C8 /* 01A20 808D8290 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 01A24 808D8294 10400009 */ beq $v0, $zero, .L808D82BC -/* 01A28 808D8298 8FA4004C */ lw $a0, 0x004C($sp) +/* 01A24 808D8294 10400009 */ beq $v0, $zero, .L808D82BC +/* 01A28 808D8298 8FA4004C */ lw $a0, 0x004C($sp) /* 01A2C 808D829C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01A30 808D82A0 24A56AF4 */ addiu $a1, $a1, 0x6AF4 ## $a1 = 06006AF4 -/* 01A34 808D82A4 0C0294D3 */ jal func_800A534C +/* 01A34 808D82A4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01A38 808D82A8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01A3C 808D82AC 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01A40 808D82B0 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 @@ -669,100 +669,100 @@ glabel L808D8220 .L808D82BC: /* 01A4C 808D82BC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01A50 808D82C0 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -/* 01A54 808D82C4 8FA40074 */ lw $a0, 0x0074($sp) -/* 01A58 808D82C8 14610004 */ bne $v1, $at, .L808D82DC +/* 01A54 808D82C4 8FA40074 */ lw $a0, 0x0074($sp) +/* 01A58 808D82C8 14610004 */ bne $v1, $at, .L808D82DC /* 01A5C 808D82CC 240570C8 */ addiu $a1, $zero, 0x70C8 ## $a1 = 000070C8 -/* 01A60 808D82D0 0C042DA0 */ jal func_8010B680 +/* 01A60 808D82D0 0C042DA0 */ jal func_8010B680 /* 01A64 808D82D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01A68 808D82D8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D82DC: -/* 01A6C 808D82DC 2C6100B5 */ sltiu $at, $v1, 0x00B5 -/* 01A70 808D82E0 142002FC */ bne $at, $zero, .L808D8ED4 -/* 01A74 808D82E4 8FA40074 */ lw $a0, 0x0074($sp) -/* 01A78 808D82E8 0C042F6F */ jal func_8010BDBC +/* 01A6C 808D82DC 2C6100B5 */ sltiu $at, $v1, 0x00B5 +/* 01A70 808D82E0 142002FC */ bne $at, $zero, .L808D8ED4 +/* 01A74 808D82E4 8FA40074 */ lw $a0, 0x0074($sp) +/* 01A78 808D82E8 0C042F6F */ jal func_8010BDBC /* 01A7C 808D82EC 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01A80 808D82F0 144002F8 */ bne $v0, $zero, .L808D8ED4 +/* 01A80 808D82F0 144002F8 */ bne $v0, $zero, .L808D8ED4 /* 01A84 808D82F4 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F /* 01A88 808D82F8 A60E0678 */ sh $t6, 0x0678($s0) ## 00000678 /* 01A8C 808D82FC AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 01A90 808D8300 100002F4 */ beq $zero, $zero, .L808D8ED4 +/* 01A90 808D8300 100002F4 */ beq $zero, $zero, .L808D8ED4 /* 01A94 808D8304 A200071A */ sb $zero, 0x071A($s0) ## 0000071A glabel L808D8308 /* 01A98 808D8308 A20001A0 */ sb $zero, 0x01A0($s0) ## 000001A0 -/* 01A9C 808D830C 8FAF0074 */ lw $t7, 0x0074($sp) +/* 01A9C 808D830C 8FAF0074 */ lw $t7, 0x0074($sp) /* 01AA0 808D8310 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01AA4 808D8314 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01AA8 808D8318 002F0821 */ addu $at, $at, $t7 +/* 01AA8 808D8318 002F0821 */ addu $at, $at, $t7 /* 01AAC 808D831C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01AB0 808D8320 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 01AB4 808D8324 0C235E1F */ jal func_808D787C +/* 01AB4 808D8324 0C235E1F */ jal func_808D787C /* 01AB8 808D8328 E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC /* 01ABC 808D832C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01AC0 808D8330 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 01AC4 808D8334 8FA40074 */ lw $a0, 0x0074($sp) -/* 01AC8 808D8338 14610004 */ bne $v1, $at, .L808D834C +/* 01AC4 808D8334 8FA40074 */ lw $a0, 0x0074($sp) +/* 01AC8 808D8338 14610004 */ bne $v1, $at, .L808D834C /* 01ACC 808D833C 240570C9 */ addiu $a1, $zero, 0x70C9 ## $a1 = 000070C9 -/* 01AD0 808D8340 0C042DA0 */ jal func_8010B680 +/* 01AD0 808D8340 0C042DA0 */ jal func_8010B680 /* 01AD4 808D8344 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01AD8 808D8348 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D834C: -/* 01ADC 808D834C 2C610065 */ sltiu $at, $v1, 0x0065 -/* 01AE0 808D8350 142002E0 */ bne $at, $zero, .L808D8ED4 -/* 01AE4 808D8354 8FA40074 */ lw $a0, 0x0074($sp) -/* 01AE8 808D8358 0C042F6F */ jal func_8010BDBC +/* 01ADC 808D834C 2C610065 */ sltiu $at, $v1, 0x0065 +/* 01AE0 808D8350 142002E0 */ bne $at, $zero, .L808D8ED4 +/* 01AE4 808D8354 8FA40074 */ lw $a0, 0x0074($sp) +/* 01AE8 808D8358 0C042F6F */ jal func_8010BDBC /* 01AEC 808D835C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01AF0 808D8360 144002DC */ bne $v0, $zero, .L808D8ED4 +/* 01AF0 808D8360 144002DC */ bne $v0, $zero, .L808D8ED4 /* 01AF4 808D8364 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 /* 01AF8 808D8368 A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 01AFC 808D836C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 /* 01B00 808D8370 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B04 808D8374 0C235E1F */ jal func_808D787C +/* 01B04 808D8374 0C235E1F */ jal func_808D787C /* 01B08 808D8378 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B /* 01B0C 808D837C 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 /* 01B10 808D8380 A2020198 */ sb $v0, 0x0198($s0) ## 00000198 /* 01B14 808D8384 3C198090 */ lui $t9, %hi(D_808F93D4) ## $t9 = 80900000 -/* 01B18 808D8388 8F3993D4 */ lw $t9, %lo(D_808F93D4)($t9) +/* 01B18 808D8388 8F3993D4 */ lw $t9, %lo(D_808F93D4)($t9) /* 01B1C 808D838C 2408006E */ addiu $t0, $zero, 0x006E ## $t0 = 0000006E /* 01B20 808D8390 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 01B24 808D8394 A32203C8 */ sb $v0, 0x03C8($t9) ## 809003C8 /* 01B28 808D8398 A60801BA */ sh $t0, 0x01BA($s0) ## 000001BA -/* 01B2C 808D839C 100002CD */ beq $zero, $zero, .L808D8ED4 +/* 01B2C 808D839C 100002CD */ beq $zero, $zero, .L808D8ED4 /* 01B30 808D83A0 A20901A0 */ sb $t1, 0x01A0($s0) ## 000001A0 glabel L808D83A4 /* 01B34 808D83A4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01B38 808D83A8 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 01B3C 808D83AC A20A01A0 */ sb $t2, 0x01A0($s0) ## 000001A0 -/* 01B40 808D83B0 2C610015 */ sltiu $at, $v1, 0x0015 -/* 01B44 808D83B4 10200010 */ beq $at, $zero, .L808D83F8 -/* 01B48 808D83B8 8FA4004C */ lw $a0, 0x004C($sp) +/* 01B40 808D83B0 2C610015 */ sltiu $at, $v1, 0x0015 +/* 01B44 808D83B4 10200010 */ beq $at, $zero, .L808D83F8 +/* 01B48 808D83B8 8FA4004C */ lw $a0, 0x004C($sp) /* 01B4C 808D83BC 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 01B50 808D83C0 1461001D */ bne $v1, $at, .L808D8438 -/* 01B54 808D83C4 8FA4004C */ lw $a0, 0x004C($sp) +/* 01B50 808D83C0 1461001D */ bne $v1, $at, .L808D8438 +/* 01B54 808D83C4 8FA4004C */ lw $a0, 0x004C($sp) /* 01B58 808D83C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01B5C 808D83CC 24A54304 */ addiu $a1, $a1, 0x4304 ## $a1 = 06004304 -/* 01B60 808D83D0 0C029490 */ jal func_800A5240 +/* 01B60 808D83D0 0C029490 */ jal func_800A5240 /* 01B64 808D83D4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01B68 808D83D8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01B6C 808D83DC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01B70 808D83E0 24844304 */ addiu $a0, $a0, 0x4304 ## $a0 = 06004304 /* 01B74 808D83E4 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01B78 808D83E8 00000000 */ nop -/* 01B7C 808D83EC 46805420 */ cvt.s.w $f16, $f10 -/* 01B80 808D83F0 10000011 */ beq $zero, $zero, .L808D8438 +/* 01B7C 808D83EC 46805420 */ cvt.s.w $f16, $f10 +/* 01B80 808D83F0 10000011 */ beq $zero, $zero, .L808D8438 /* 01B84 808D83F4 E61001CC */ swc1 $f16, 0x01CC($s0) ## 000001CC .L808D83F8: -/* 01B88 808D83F8 0C0295B2 */ jal func_800A56C8 +/* 01B88 808D83F8 0C0295B2 */ jal func_800A56C8 /* 01B8C 808D83FC 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 01B90 808D8400 1040000D */ beq $v0, $zero, .L808D8438 -/* 01B94 808D8404 8FA40074 */ lw $a0, 0x0074($sp) +/* 01B90 808D8400 1040000D */ beq $v0, $zero, .L808D8438 +/* 01B94 808D8404 8FA40074 */ lw $a0, 0x0074($sp) /* 01B98 808D8408 240570CA */ addiu $a1, $zero, 0x70CA ## $a1 = 000070CA -/* 01B9C 808D840C 0C042DA0 */ jal func_8010B680 +/* 01B9C 808D840C 0C042DA0 */ jal func_8010B680 /* 01BA0 808D8410 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01BA4 808D8414 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01BA8 808D8418 24A589F8 */ addiu $a1, $a1, 0x89F8 ## $a1 = 060089F8 -/* 01BAC 808D841C 8FA4004C */ lw $a0, 0x004C($sp) -/* 01BB0 808D8420 0C0294D3 */ jal func_800A534C +/* 01BAC 808D841C 8FA4004C */ lw $a0, 0x004C($sp) +/* 01BB0 808D8420 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01BB4 808D8424 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01BB8 808D8428 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01BBC 808D842C 44819000 */ mtc1 $at, $f18 ## $f18 = 1000.00 @@ -770,131 +770,131 @@ glabel L808D83A4 /* 01BC4 808D8434 E61201CC */ swc1 $f18, 0x01CC($s0) ## 000001CC .L808D8438: /* 01BC8 808D8438 8E0B0674 */ lw $t3, 0x0674($s0) ## 00000674 -/* 01BCC 808D843C 8FA40074 */ lw $a0, 0x0074($sp) -/* 01BD0 808D8440 2D610065 */ sltiu $at, $t3, 0x0065 -/* 01BD4 808D8444 542002A4 */ bnel $at, $zero, .L808D8ED8 +/* 01BCC 808D843C 8FA40074 */ lw $a0, 0x0074($sp) +/* 01BD0 808D8440 2D610065 */ sltiu $at, $t3, 0x0065 +/* 01BD4 808D8444 542002A4 */ bnel $at, $zero, .L808D8ED8 /* 01BD8 808D8448 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 01BDC 808D844C 0C042F6F */ jal func_8010BDBC +/* 01BDC 808D844C 0C042F6F */ jal func_8010BDBC /* 01BE0 808D8450 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01BE4 808D8454 1440029F */ bne $v0, $zero, .L808D8ED4 +/* 01BE4 808D8454 1440029F */ bne $v0, $zero, .L808D8ED4 /* 01BE8 808D8458 240C0011 */ addiu $t4, $zero, 0x0011 ## $t4 = 00000011 /* 01BEC 808D845C A60C0678 */ sh $t4, 0x0678($s0) ## 00000678 -/* 01BF0 808D8460 1000029C */ beq $zero, $zero, .L808D8ED4 +/* 01BF0 808D8460 1000029C */ beq $zero, $zero, .L808D8ED4 /* 01BF4 808D8464 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D8468 /* 01BF8 808D8468 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01BFC 808D846C 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 01C00 808D8470 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 01C04 808D8474 1461000D */ bne $v1, $at, .L808D84AC +/* 01C04 808D8474 1461000D */ bne $v1, $at, .L808D84AC /* 01C08 808D8478 A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 /* 01C0C 808D847C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01C10 808D8480 24A51F58 */ addiu $a1, $a1, 0x1F58 ## $a1 = 06001F58 -/* 01C14 808D8484 8FA4004C */ lw $a0, 0x004C($sp) -/* 01C18 808D8488 0C029490 */ jal func_800A5240 +/* 01C14 808D8484 8FA4004C */ lw $a0, 0x004C($sp) +/* 01C18 808D8488 0C029490 */ jal func_800A5240 /* 01C1C 808D848C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01C20 808D8490 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01C24 808D8494 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01C28 808D8498 24841F58 */ addiu $a0, $a0, 0x1F58 ## $a0 = 06001F58 /* 01C2C 808D849C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01C30 808D84A0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 01C34 808D84A4 468021A0 */ cvt.s.w $f6, $f4 +/* 01C34 808D84A4 468021A0 */ cvt.s.w $f6, $f4 /* 01C38 808D84A8 E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC .L808D84AC: -/* 01C3C 808D84AC 2C61000B */ sltiu $at, $v1, 0x000B -/* 01C40 808D84B0 14200288 */ bne $at, $zero, .L808D8ED4 +/* 01C3C 808D84AC 2C61000B */ sltiu $at, $v1, 0x000B +/* 01C40 808D84B0 14200288 */ bne $at, $zero, .L808D8ED4 /* 01C44 808D84B4 2401003E */ addiu $at, $zero, 0x003E ## $at = 0000003E -/* 01C48 808D84B8 14610006 */ bne $v1, $at, .L808D84D4 +/* 01C48 808D84B8 14610006 */ bne $v1, $at, .L808D84D4 /* 01C4C 808D84BC 3C0E8090 */ lui $t6, %hi(D_808F93C0) ## $t6 = 80900000 /* 01C50 808D84C0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01C54 808D84C4 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 01C58 808D84C8 8DCE93C0 */ lw $t6, %lo(D_808F93C0)($t6) +/* 01C58 808D84C8 8DCE93C0 */ lw $t6, %lo(D_808F93C0)($t6) /* 01C5C 808D84CC E5C816BC */ swc1 $f8, 0x16BC($t6) ## 809016BC /* 01C60 808D84D0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D84D4: /* 01C64 808D84D4 24010039 */ addiu $at, $zero, 0x0039 ## $at = 00000039 -/* 01C68 808D84D8 14610003 */ bne $v1, $at, .L808D84E8 +/* 01C68 808D84D8 14610003 */ bne $v1, $at, .L808D84E8 /* 01C6C 808D84DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01C70 808D84E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01C74 808D84E4 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 .L808D84E8: /* 01C78 808D84E8 C60006EC */ lwc1 $f0, 0x06EC($s0) ## 000006EC /* 01C7C 808D84EC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01C80 808D84F0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01C84 808D84F4 46000280 */ add.s $f10, $f0, $f0 +/* 01C84 808D84F4 46000280 */ add.s $f10, $f0, $f0 /* 01C88 808D84F8 260406F4 */ addiu $a0, $s0, 0x06F4 ## $a0 = 000006F4 /* 01C8C 808D84FC 3C0542DC */ lui $a1, 0x42DC ## $a1 = 42DC0000 -/* 01C90 808D8500 44075000 */ mfc1 $a3, $f10 +/* 01C90 808D8500 44075000 */ mfc1 $a3, $f10 /* 01C94 808D8504 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01C98 808D8508 00000000 */ nop /* 01C9C 808D850C 3C01808F */ lui $at, %hi(D_808F7ED4) ## $at = 808F0000 -/* 01CA0 808D8510 C4327ED4 */ lwc1 $f18, %lo(D_808F7ED4)($at) +/* 01CA0 808D8510 C4327ED4 */ lwc1 $f18, %lo(D_808F7ED4)($at) /* 01CA4 808D8514 C61006EC */ lwc1 $f16, 0x06EC($s0) ## 000006EC /* 01CA8 808D8518 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01CAC 808D851C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01CB0 808D8520 46128102 */ mul.s $f4, $f16, $f18 +/* 01CB0 808D8520 46128102 */ mul.s $f4, $f16, $f18 /* 01CB4 808D8524 26040688 */ addiu $a0, $s0, 0x0688 ## $a0 = 00000688 /* 01CB8 808D8528 3C05C391 */ lui $a1, 0xC391 ## $a1 = C3910000 -/* 01CBC 808D852C 44072000 */ mfc1 $a3, $f4 +/* 01CBC 808D852C 44072000 */ mfc1 $a3, $f4 /* 01CC0 808D8530 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01CC4 808D8534 00000000 */ nop /* 01CC8 808D8538 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 01CCC 808D853C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 01CD0 808D8540 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC /* 01CD4 808D8544 3C053F40 */ lui $a1, 0x3F40 ## $a1 = 3F400000 /* 01CD8 808D8548 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01CDC 808D854C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01CE0 808D8550 8E0F0674 */ lw $t7, 0x0674($s0) ## 00000674 /* 01CE4 808D8554 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 /* 01CE8 808D8558 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 01CEC 808D855C 15E1025D */ bne $t7, $at, .L808D8ED4 +/* 01CEC 808D855C 15E1025D */ bne $t7, $at, .L808D8ED4 /* 01CF0 808D8560 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01CF4 808D8564 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 01CF8 808D8568 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 01CFC 808D856C A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 01D00 808D8570 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 /* 01D04 808D8574 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C -/* 01D08 808D8578 0C235E1F */ jal func_808D787C +/* 01D08 808D8578 0C235E1F */ jal func_808D787C /* 01D0C 808D857C E60606F4 */ swc1 $f6, 0x06F4($s0) ## 000006F4 -/* 01D10 808D8580 8FA40074 */ lw $a0, 0x0074($sp) +/* 01D10 808D8580 8FA40074 */ lw $a0, 0x0074($sp) /* 01D14 808D8584 240570CB */ addiu $a1, $zero, 0x70CB ## $a1 = 000070CB -/* 01D18 808D8588 0C042DA0 */ jal func_8010B680 +/* 01D18 808D8588 0C042DA0 */ jal func_8010B680 /* 01D1C 808D858C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01D20 808D8590 10000251 */ beq $zero, $zero, .L808D8ED8 +/* 01D20 808D8590 10000251 */ beq $zero, $zero, .L808D8ED8 /* 01D24 808D8594 8605067A */ lh $a1, 0x067A($s0) ## 0000067A glabel L808D8598 /* 01D28 808D8598 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 01D2C 808D859C A21901A0 */ sb $t9, 0x01A0($s0) ## 000001A0 /* 01D30 808D85A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D34 808D85A4 0C235E1F */ jal func_808D787C +/* 01D34 808D85A4 0C235E1F */ jal func_808D787C /* 01D38 808D85A8 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C /* 01D3C 808D85AC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 01D40 808D85B0 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 /* 01D44 808D85B4 C6080684 */ lwc1 $f8, 0x0684($s0) ## 00000684 /* 01D48 808D85B8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 01D4C 808D85BC 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 01D50 808D85C0 460A4400 */ add.s $f16, $f8, $f10 +/* 01D50 808D85C0 460A4400 */ add.s $f16, $f8, $f10 /* 01D54 808D85C4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01D58 808D85C8 C6120688 */ lwc1 $f18, 0x0688($s0) ## 00000688 /* 01D5C 808D85CC 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 /* 01D60 808D85D0 C60801CC */ lwc1 $f8, 0x01CC($s0) ## 000001CC /* 01D64 808D85D4 E6100684 */ swc1 $f16, 0x0684($s0) ## 00000684 -/* 01D68 808D85D8 46049180 */ add.s $f6, $f18, $f4 -/* 01D6C 808D85DC 460A4401 */ sub.s $f16, $f8, $f10 +/* 01D68 808D85D8 46049180 */ add.s $f6, $f18, $f4 +/* 01D6C 808D85DC 460A4401 */ sub.s $f16, $f8, $f10 /* 01D70 808D85E0 E6060688 */ swc1 $f6, 0x0688($s0) ## 00000688 -/* 01D74 808D85E4 8FA4004C */ lw $a0, 0x004C($sp) -/* 01D78 808D85E8 44058000 */ mfc1 $a1, $f16 -/* 01D7C 808D85EC 0C0295B2 */ jal func_800A56C8 +/* 01D74 808D85E4 8FA4004C */ lw $a0, 0x004C($sp) +/* 01D78 808D85E8 44058000 */ mfc1 $a1, $f16 +/* 01D7C 808D85EC 0C0295B2 */ jal func_800A56C8 /* 01D80 808D85F0 00000000 */ nop -/* 01D84 808D85F4 10400009 */ beq $v0, $zero, .L808D861C -/* 01D88 808D85F8 8FA4004C */ lw $a0, 0x004C($sp) +/* 01D84 808D85F4 10400009 */ beq $v0, $zero, .L808D861C +/* 01D88 808D85F8 8FA4004C */ lw $a0, 0x004C($sp) /* 01D8C 808D85FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01D90 808D8600 24A53018 */ addiu $a1, $a1, 0x3018 ## $a1 = 06003018 -/* 01D94 808D8604 0C0294D3 */ jal func_800A534C +/* 01D94 808D8604 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01D98 808D8608 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01D9C 808D860C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01DA0 808D8610 44819000 */ mtc1 $at, $f18 ## $f18 = 1000.00 @@ -902,24 +902,24 @@ glabel L808D8598 /* 01DA8 808D8618 E61201CC */ swc1 $f18, 0x01CC($s0) ## 000001CC .L808D861C: /* 01DAC 808D861C 8E080674 */ lw $t0, 0x0674($s0) ## 00000674 -/* 01DB0 808D8620 8FA40074 */ lw $a0, 0x0074($sp) -/* 01DB4 808D8624 2D010033 */ sltiu $at, $t0, 0x0033 -/* 01DB8 808D8628 5420022B */ bnel $at, $zero, .L808D8ED8 +/* 01DB0 808D8620 8FA40074 */ lw $a0, 0x0074($sp) +/* 01DB4 808D8624 2D010033 */ sltiu $at, $t0, 0x0033 +/* 01DB8 808D8628 5420022B */ bnel $at, $zero, .L808D8ED8 /* 01DBC 808D862C 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 01DC0 808D8630 0C042F6F */ jal func_8010BDBC +/* 01DC0 808D8630 0C042F6F */ jal func_8010BDBC /* 01DC4 808D8634 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01DC8 808D8638 14400226 */ bne $v0, $zero, .L808D8ED4 +/* 01DC8 808D8638 14400226 */ bne $v0, $zero, .L808D8ED4 /* 01DCC 808D863C 24090013 */ addiu $t1, $zero, 0x0013 ## $t1 = 00000013 /* 01DD0 808D8640 A6090678 */ sh $t1, 0x0678($s0) ## 00000678 /* 01DD4 808D8644 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 01DD8 808D8648 8FA40074 */ lw $a0, 0x0074($sp) +/* 01DD8 808D8648 8FA40074 */ lw $a0, 0x0074($sp) /* 01DDC 808D864C 240570CC */ addiu $a1, $zero, 0x70CC ## $a1 = 000070CC -/* 01DE0 808D8650 0C042DA0 */ jal func_8010B680 +/* 01DE0 808D8650 0C042DA0 */ jal func_8010B680 /* 01DE4 808D8654 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01DE8 808D8658 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01DEC 808D865C 24A57268 */ addiu $a1, $a1, 0x7268 ## $a1 = 06007268 -/* 01DF0 808D8660 8FA4004C */ lw $a0, 0x004C($sp) -/* 01DF4 808D8664 0C029490 */ jal func_800A5240 +/* 01DF0 808D8660 8FA4004C */ lw $a0, 0x004C($sp) +/* 01DF4 808D8664 0C029490 */ jal func_800A5240 /* 01DF8 808D8668 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01DFC 808D866C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01E00 808D8670 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 @@ -934,30 +934,30 @@ glabel L808D8598 /* 01E24 808D8694 E60801D4 */ swc1 $f8, 0x01D4($s0) ## 000001D4 /* 01E28 808D8698 E60601D8 */ swc1 $f6, 0x01D8($s0) ## 000001D8 /* 01E2C 808D869C E60A01DC */ swc1 $f10, 0x01DC($s0) ## 000001DC -/* 01E30 808D86A0 8FAB0074 */ lw $t3, 0x0074($sp) +/* 01E30 808D86A0 8FAB0074 */ lw $t3, 0x0074($sp) /* 01E34 808D86A4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 01E38 808D86A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01E3C 808D86AC 002B0821 */ addu $at, $at, $t3 +/* 01E3C 808D86AC 002B0821 */ addu $at, $at, $t3 /* 01E40 808D86B0 E4300AFC */ swc1 $f16, 0x0AFC($at) ## 00010AFC glabel L808D86B4 /* 01E44 808D86B4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01E48 808D86B8 240C0008 */ addiu $t4, $zero, 0x0008 ## $t4 = 00000008 /* 01E4C 808D86BC A20C01A0 */ sb $t4, 0x01A0($s0) ## 000001A0 -/* 01E50 808D86C0 2C61003C */ sltiu $at, $v1, 0x003C -/* 01E54 808D86C4 1420000B */ bne $at, $zero, .L808D86F4 +/* 01E50 808D86C0 2C61003C */ sltiu $at, $v1, 0x003C +/* 01E54 808D86C4 1420000B */ bne $at, $zero, .L808D86F4 /* 01E58 808D86C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01E5C 808D86CC 240D0009 */ addiu $t5, $zero, 0x0009 ## $t5 = 00000009 /* 01E60 808D86D0 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 01E64 808D86D4 14610007 */ bne $v1, $at, .L808D86F4 +/* 01E64 808D86D4 14610007 */ bne $v1, $at, .L808D86F4 /* 01E68 808D86D8 A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 /* 01E6C 808D86DC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01E70 808D86E0 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 01E74 808D86E4 8FAE0074 */ lw $t6, 0x0074($sp) +/* 01E74 808D86E4 8FAE0074 */ lw $t6, 0x0074($sp) /* 01E78 808D86E8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01E7C 808D86EC 002E0821 */ addu $at, $at, $t6 +/* 01E7C 808D86EC 002E0821 */ addu $at, $at, $t6 /* 01E80 808D86F0 E4320AFC */ swc1 $f18, 0x0AFC($at) ## 00010AFC .L808D86F4: -/* 01E84 808D86F4 0C235E1F */ jal func_808D787C +/* 01E84 808D86F4 0C235E1F */ jal func_808D787C /* 01E88 808D86F8 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C /* 01E8C 808D86FC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 01E90 808D8700 44813000 */ mtc1 $at, $f6 ## $f6 = -6.00 @@ -966,23 +966,23 @@ glabel L808D86B4 /* 01E9C 808D870C 44818000 */ mtc1 $at, $f16 ## $f16 = 6.00 /* 01EA0 808D8710 C60A0688 */ lwc1 $f10, 0x0688($s0) ## 00000688 /* 01EA4 808D8714 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 01EA8 808D8718 46062200 */ add.s $f8, $f4, $f6 -/* 01EAC 808D871C 2C61001E */ sltiu $at, $v1, 0x001E -/* 01EB0 808D8720 46105480 */ add.s $f18, $f10, $f16 +/* 01EA8 808D8718 46062200 */ add.s $f8, $f4, $f6 +/* 01EAC 808D871C 2C61001E */ sltiu $at, $v1, 0x001E +/* 01EB0 808D8720 46105480 */ add.s $f18, $f10, $f16 /* 01EB4 808D8724 E6080684 */ swc1 $f8, 0x0684($s0) ## 00000684 -/* 01EB8 808D8728 1420001E */ bne $at, $zero, .L808D87A4 +/* 01EB8 808D8728 1420001E */ bne $at, $zero, .L808D87A4 /* 01EBC 808D872C E6120688 */ swc1 $f18, 0x0688($s0) ## 00000688 /* 01EC0 808D8730 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 01EC4 808D8734 54610004 */ bnel $v1, $at, .L808D8748 +/* 01EC4 808D8734 54610004 */ bnel $v1, $at, .L808D8748 /* 01EC8 808D8738 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 -/* 01ECC 808D873C 0C01E221 */ jal func_80078884 +/* 01ECC 808D873C 0C01E221 */ jal func_80078884 /* 01ED0 808D8740 240428C1 */ addiu $a0, $zero, 0x28C1 ## $a0 = 000028C1 /* 01ED4 808D8744 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 .L808D8748: /* 01ED8 808D8748 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01EDC 808D874C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01EE0 808D8750 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01EE4 808D8754 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01EE8 808D8758 3C053F19 */ lui $a1, 0x3F19 ## $a1 = 3F190000 /* 01EEC 808D875C 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 @@ -990,38 +990,38 @@ glabel L808D86B4 /* 01EF4 808D8764 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3F19999A /* 01EF8 808D8768 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 /* 01EFC 808D876C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F00 808D8770 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01F04 808D8774 3C074023 */ lui $a3, 0x4023 ## $a3 = 40230000 /* 01F08 808D8778 34E73333 */ ori $a3, $a3, 0x3333 ## $a3 = 40233333 /* 01F0C 808D877C 260401D4 */ addiu $a0, $s0, 0x01D4 ## $a0 = 000001D4 /* 01F10 808D8780 3C05432A */ lui $a1, 0x432A ## $a1 = 432A0000 /* 01F14 808D8784 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F18 808D8788 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01F1C 808D878C 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 01F20 808D8790 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 01F24 808D8794 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01F28 808D8798 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F2C 808D879C 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 01F30 808D87A0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D87A4: /* 01F34 808D87A4 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 01F38 808D87A8 14610006 */ bne $v1, $at, .L808D87C4 -/* 01F3C 808D87AC 8FA4004C */ lw $a0, 0x004C($sp) +/* 01F38 808D87A8 14610006 */ bne $v1, $at, .L808D87C4 +/* 01F3C 808D87AC 8FA4004C */ lw $a0, 0x004C($sp) /* 01F40 808D87B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01F44 808D87B4 24A57A64 */ addiu $a1, $a1, 0x7A64 ## $a1 = 06007A64 -/* 01F48 808D87B8 0C0294D3 */ jal func_800A534C +/* 01F48 808D87B8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01F4C 808D87BC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01F50 808D87C0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D87C4: -/* 01F54 808D87C4 2C610051 */ sltiu $at, $v1, 0x0051 -/* 01F58 808D87C8 142001C2 */ bne $at, $zero, .L808D8ED4 -/* 01F5C 808D87CC 8FA40074 */ lw $a0, 0x0074($sp) -/* 01F60 808D87D0 0C042F6F */ jal func_8010BDBC +/* 01F54 808D87C4 2C610051 */ sltiu $at, $v1, 0x0051 +/* 01F58 808D87C8 142001C2 */ bne $at, $zero, .L808D8ED4 +/* 01F5C 808D87CC 8FA40074 */ lw $a0, 0x0074($sp) +/* 01F60 808D87D0 0C042F6F */ jal func_8010BDBC /* 01F64 808D87D4 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01F68 808D87D8 144001BE */ bne $v0, $zero, .L808D8ED4 +/* 01F68 808D87D8 144001BE */ bne $v0, $zero, .L808D8ED4 /* 01F6C 808D87DC 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 01F70 808D87E0 44810000 */ mtc1 $at, $f0 ## $f0 = 400.00 /* 01F74 808D87E4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -1031,16 +1031,16 @@ glabel L808D86B4 /* 01F84 808D87F4 C6040680 */ lwc1 $f4, 0x0680($s0) ## 00000680 /* 01F88 808D87F8 C6080684 */ lwc1 $f8, 0x0684($s0) ## 00000684 /* 01F8C 808D87FC C6100688 */ lwc1 $f16, 0x0688($s0) ## 00000688 -/* 01F90 808D8800 460E2181 */ sub.s $f6, $f4, $f14 +/* 01F90 808D8800 460E2181 */ sub.s $f6, $f4, $f14 /* 01F94 808D8804 C604068C */ lwc1 $f4, 0x068C($s0) ## 0000068C /* 01F98 808D8808 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01F9C 808D880C 460C4281 */ sub.s $f10, $f8, $f12 +/* 01F9C 808D880C 460C4281 */ sub.s $f10, $f8, $f12 /* 01FA0 808D8810 E60606BC */ swc1 $f6, 0x06BC($s0) ## 000006BC /* 01FA4 808D8814 C6080690 */ lwc1 $f8, 0x0690($s0) ## 00000690 -/* 01FA8 808D8818 46008480 */ add.s $f18, $f16, $f0 +/* 01FA8 808D8818 46008480 */ add.s $f18, $f16, $f0 /* 01FAC 808D881C E60A06C0 */ swc1 $f10, 0x06C0($s0) ## 000006C0 /* 01FB0 808D8820 C60A0694 */ lwc1 $f10, 0x0694($s0) ## 00000694 -/* 01FB4 808D8824 46002180 */ add.s $f6, $f4, $f0 +/* 01FB4 808D8824 46002180 */ add.s $f6, $f4, $f0 /* 01FB8 808D8828 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 01FBC 808D882C A60F0678 */ sh $t7, 0x0678($s0) ## 00000678 /* 01FC0 808D8830 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 @@ -1054,17 +1054,17 @@ glabel L808D86B4 /* 01FE0 808D8850 E60206EC */ swc1 $f2, 0x06EC($s0) ## 000006EC /* 01FE4 808D8854 E60806D8 */ swc1 $f8, 0x06D8($s0) ## 000006D8 /* 01FE8 808D8858 E60A06DC */ swc1 $f10, 0x06DC($s0) ## 000006DC -/* 01FEC 808D885C C4307ED8 */ lwc1 $f16, %lo(D_808F7ED8)($at) +/* 01FEC 808D885C C4307ED8 */ lwc1 $f16, %lo(D_808F7ED8)($at) /* 01FF0 808D8860 3C01808F */ lui $at, %hi(D_808F7EDC) ## $at = 808F0000 /* 01FF4 808D8864 E60201E4 */ swc1 $f2, 0x01E4($s0) ## 000001E4 /* 01FF8 808D8868 E61006F0 */ swc1 $f16, 0x06F0($s0) ## 000006F0 -/* 01FFC 808D886C C4327EDC */ lwc1 $f18, %lo(D_808F7EDC)($at) +/* 01FFC 808D886C C4327EDC */ lwc1 $f18, %lo(D_808F7EDC)($at) /* 02000 808D8870 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02004 808D8874 240539D5 */ addiu $a1, $zero, 0x39D5 ## $a1 = 000039D5 /* 02008 808D8878 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0200C 808D887C E61201E8 */ swc1 $f18, 0x01E8($s0) ## 000001E8 -/* 02010 808D8880 10000195 */ beq $zero, $zero, .L808D8ED8 +/* 02010 808D8880 10000195 */ beq $zero, $zero, .L808D8ED8 /* 02014 808D8884 8605067A */ lh $a1, 0x067A($s0) ## 0000067A glabel L808D8888 /* 02018 808D8888 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A @@ -1072,21 +1072,21 @@ glabel L808D8888 /* 02020 808D8890 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 02024 808D8894 3C053E19 */ lui $a1, 0x3E19 ## $a1 = 3E190000 /* 02028 808D8898 3C073C75 */ lui $a3, 0x3C75 ## $a3 = 3C750000 -/* 0202C 808D889C A3B9006F */ sb $t9, 0x006F($sp) +/* 0202C 808D889C A3B9006F */ sb $t9, 0x006F($sp) /* 02030 808D88A0 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3C75C28F /* 02034 808D88A4 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E19999A /* 02038 808D88A8 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC /* 0203C 808D88AC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02040 808D88B0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02044 808D88B4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 02048 808D88B8 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 0204C 808D88BC 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 02050 808D88C0 2C610029 */ sltiu $at, $v1, 0x0029 -/* 02054 808D88C4 1020000B */ beq $at, $zero, .L808D88F4 +/* 02050 808D88C0 2C610029 */ sltiu $at, $v1, 0x0029 +/* 02054 808D88C4 1020000B */ beq $at, $zero, .L808D88F4 /* 02058 808D88C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0205C 808D88CC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02060 808D88D0 3C0740D0 */ lui $a3, 0x40D0 ## $a3 = 40D00000 /* 02064 808D88D4 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 /* 02068 808D88D8 3C073CCC */ lui $a3, 0x3CCC ## $a3 = 3CCC0000 @@ -1094,63 +1094,63 @@ glabel L808D8888 /* 02070 808D88E0 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD /* 02074 808D88E4 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 /* 02078 808D88E8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0207C 808D88EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02080 808D88F0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D88F4: -/* 02084 808D88F4 2C610015 */ sltiu $at, $v1, 0x0015 -/* 02088 808D88F8 14200004 */ bne $at, $zero, .L808D890C +/* 02084 808D88F4 2C610015 */ sltiu $at, $v1, 0x0015 +/* 02088 808D88F8 14200004 */ bne $at, $zero, .L808D890C /* 0208C 808D88FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02090 808D8900 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02094 808D8904 24053057 */ addiu $a1, $zero, 0x3057 ## $a1 = 00003057 /* 02098 808D8908 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D890C: -/* 0209C 808D890C 2C610015 */ sltiu $at, $v1, 0x0015 -/* 020A0 808D8910 14200009 */ bne $at, $zero, .L808D8938 -/* 020A4 808D8914 8FA40074 */ lw $a0, 0x0074($sp) +/* 0209C 808D890C 2C610015 */ sltiu $at, $v1, 0x0015 +/* 020A0 808D8910 14200009 */ bne $at, $zero, .L808D8938 +/* 020A4 808D8914 8FA40074 */ lw $a0, 0x0074($sp) /* 020A8 808D8918 3C05442F */ lui $a1, 0x442F ## $a1 = 442F0000 -/* 020AC 808D891C 0C235AFC */ jal func_808D6BF0 +/* 020AC 808D891C 0C235AFC */ jal func_808D6BF0 /* 020B0 808D8920 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 020B4 808D8924 8FA40074 */ lw $a0, 0x0074($sp) +/* 020B4 808D8924 8FA40074 */ lw $a0, 0x0074($sp) /* 020B8 808D8928 3C05442F */ lui $a1, 0x442F ## $a1 = 442F0000 -/* 020BC 808D892C 0C235AFC */ jal func_808D6BF0 +/* 020BC 808D892C 0C235AFC */ jal func_808D6BF0 /* 020C0 808D8930 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 020C4 808D8934 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8938: /* 020C8 808D8938 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 020CC 808D893C 14610005 */ bne $v1, $at, .L808D8954 -/* 020D0 808D8940 8FA40074 */ lw $a0, 0x0074($sp) +/* 020CC 808D893C 14610005 */ bne $v1, $at, .L808D8954 +/* 020D0 808D8940 8FA40074 */ lw $a0, 0x0074($sp) /* 020D4 808D8944 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 020D8 808D8948 0C00B7D5 */ jal func_8002DF54 +/* 020D8 808D8948 0C00B7D5 */ jal func_8002DF54 /* 020DC 808D894C 2406004A */ addiu $a2, $zero, 0x004A ## $a2 = 0000004A /* 020E0 808D8950 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8954: -/* 020E4 808D8954 2C610033 */ sltiu $at, $v1, 0x0033 -/* 020E8 808D8958 1420015E */ bne $at, $zero, .L808D8ED4 +/* 020E4 808D8954 2C610033 */ sltiu $at, $v1, 0x0033 +/* 020E8 808D8958 1420015E */ bne $at, $zero, .L808D8ED4 /* 020EC 808D895C 24080015 */ addiu $t0, $zero, 0x0015 ## $t0 = 00000015 /* 020F0 808D8960 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 020F4 808D8964 A6080678 */ sh $t0, 0x0678($s0) ## 00000678 /* 020F8 808D8968 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 /* 020FC 808D896C 3C01808F */ lui $at, %hi(D_808F7EE0) ## $at = 808F0000 /* 02100 808D8970 E60401D8 */ swc1 $f4, 0x01D8($s0) ## 000001D8 -/* 02104 808D8974 C4267EE0 */ lwc1 $f6, %lo(D_808F7EE0)($at) -/* 02108 808D8978 1000000E */ beq $zero, $zero, .L808D89B4 +/* 02104 808D8974 C4267EE0 */ lwc1 $f6, %lo(D_808F7EE0)($at) +/* 02108 808D8978 1000000E */ beq $zero, $zero, .L808D89B4 /* 0210C 808D897C E60601E8 */ swc1 $f6, 0x01E8($s0) ## 000001E8 glabel L808D8980 /* 02110 808D8980 2409000B */ addiu $t1, $zero, 0x000B ## $t1 = 0000000B /* 02114 808D8984 A20901A0 */ sb $t1, 0x01A0($s0) ## 000001A0 /* 02118 808D8988 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0211C 808D898C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02120 808D8990 24053057 */ addiu $a1, $zero, 0x3057 ## $a1 = 00003057 -/* 02124 808D8994 8FA40074 */ lw $a0, 0x0074($sp) +/* 02124 808D8994 8FA40074 */ lw $a0, 0x0074($sp) /* 02128 808D8998 3C05442F */ lui $a1, 0x442F ## $a1 = 442F0000 -/* 0212C 808D899C 0C235AFC */ jal func_808D6BF0 +/* 0212C 808D899C 0C235AFC */ jal func_808D6BF0 /* 02130 808D89A0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02134 808D89A4 8FA40074 */ lw $a0, 0x0074($sp) +/* 02134 808D89A4 8FA40074 */ lw $a0, 0x0074($sp) /* 02138 808D89A8 3C05442F */ lui $a1, 0x442F ## $a1 = 442F0000 -/* 0213C 808D89AC 0C235AFC */ jal func_808D6BF0 +/* 0213C 808D89AC 0C235AFC */ jal func_808D6BF0 /* 02140 808D89B0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 .L808D89B4: /* 02144 808D89B4 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 @@ -1171,21 +1171,21 @@ glabel L808D8980 /* 02180 808D89F0 E6100688 */ swc1 $f16, 0x0688($s0) ## 00000688 /* 02184 808D89F4 E612068C */ swc1 $f18, 0x068C($s0) ## 0000068C /* 02188 808D89F8 E6040690 */ swc1 $f4, 0x0690($s0) ## 00000690 -/* 0218C 808D89FC 14610006 */ bne $v1, $at, .L808D8A18 +/* 0218C 808D89FC 14610006 */ bne $v1, $at, .L808D8A18 /* 02190 808D8A00 E6060694 */ swc1 $f6, 0x0694($s0) ## 00000694 -/* 02194 808D8A04 8FA40074 */ lw $a0, 0x0074($sp) +/* 02194 808D8A04 8FA40074 */ lw $a0, 0x0074($sp) /* 02198 808D8A08 240570CD */ addiu $a1, $zero, 0x70CD ## $a1 = 000070CD -/* 0219C 808D8A0C 0C042DA0 */ jal func_8010B680 +/* 0219C 808D8A0C 0C042DA0 */ jal func_8010B680 /* 021A0 808D8A10 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 021A4 808D8A14 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8A18: -/* 021A8 808D8A18 2C610079 */ sltiu $at, $v1, 0x0079 -/* 021AC 808D8A1C 5420012E */ bnel $at, $zero, .L808D8ED8 +/* 021A8 808D8A18 2C610079 */ sltiu $at, $v1, 0x0079 +/* 021AC 808D8A1C 5420012E */ bnel $at, $zero, .L808D8ED8 /* 021B0 808D8A20 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 021B4 808D8A24 8FA40074 */ lw $a0, 0x0074($sp) -/* 021B8 808D8A28 0C042F6F */ jal func_8010BDBC +/* 021B4 808D8A24 8FA40074 */ lw $a0, 0x0074($sp) +/* 021B8 808D8A28 0C042F6F */ jal func_8010BDBC /* 021BC 808D8A2C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 021C0 808D8A30 14400128 */ bne $v0, $zero, .L808D8ED4 +/* 021C0 808D8A30 14400128 */ bne $v0, $zero, .L808D8ED4 /* 021C4 808D8A34 240A0016 */ addiu $t2, $zero, 0x0016 ## $t2 = 00000016 /* 021C8 808D8A38 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 021CC 808D8A3C 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 @@ -1193,10 +1193,10 @@ glabel L808D8980 /* 021D4 808D8A44 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 021D8 808D8A48 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 021DC 808D8A4C C6120200 */ lwc1 $f18, 0x0200($s0) ## 00000200 -/* 021E0 808D8A50 460A4401 */ sub.s $f16, $f8, $f10 +/* 021E0 808D8A50 460A4401 */ sub.s $f16, $f8, $f10 /* 021E4 808D8A54 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 021E8 808D8A58 C6080204 */ lwc1 $f8, 0x0204($s0) ## 00000204 -/* 021EC 808D8A5C 46049180 */ add.s $f6, $f18, $f4 +/* 021EC 808D8A5C 46049180 */ add.s $f6, $f18, $f4 /* 021F0 808D8A60 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 /* 021F4 808D8A64 240B001E */ addiu $t3, $zero, 0x001E ## $t3 = 0000001E /* 021F8 808D8A68 240C00FE */ addiu $t4, $zero, 0x00FE ## $t4 = 000000FE @@ -1209,22 +1209,22 @@ glabel L808D8980 /* 02214 808D8A84 3C01808F */ lui $at, %hi(D_808F7EE4) ## $at = 808F0000 /* 02218 808D8A88 E6080694 */ swc1 $f8, 0x0694($s0) ## 00000694 /* 0221C 808D8A8C E60A01E4 */ swc1 $f10, 0x01E4($s0) ## 000001E4 -/* 02220 808D8A90 C4307EE4 */ lwc1 $f16, %lo(D_808F7EE4)($at) +/* 02220 808D8A90 C4307EE4 */ lwc1 $f16, %lo(D_808F7EE4)($at) /* 02224 808D8A94 E61001E8 */ swc1 $f16, 0x01E8($s0) ## 000001E8 glabel L808D8A98 /* 02228 808D8A98 8E0D0674 */ lw $t5, 0x0674($s0) ## 00000674 /* 0222C 808D8A9C 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 02230 808D8AA0 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 02234 808D8AA4 2DA1001F */ sltiu $at, $t5, 0x001F -/* 02238 808D8AA8 14200003 */ bne $at, $zero, .L808D8AB8 +/* 02234 808D8AA4 2DA1001F */ sltiu $at, $t5, 0x001F +/* 02238 808D8AA8 14200003 */ bne $at, $zero, .L808D8AB8 /* 0223C 808D8AAC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 02240 808D8AB0 10000002 */ beq $zero, $zero, .L808D8ABC +/* 02240 808D8AB0 10000002 */ beq $zero, $zero, .L808D8ABC /* 02244 808D8AB4 A20001A0 */ sb $zero, 0x01A0($s0) ## 000001A0 .L808D8AB8: /* 02248 808D8AB8 A20E01A0 */ sb $t6, 0x01A0($s0) ## 000001A0 .L808D8ABC: /* 0224C 808D8ABC 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 02250 808D8AC0 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 02254 808D8AC4 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 /* 02258 808D8AC8 44819000 */ mtc1 $at, $f18 ## $f18 = -30.00 @@ -1237,109 +1237,109 @@ glabel L808D8A98 /* 02274 808D8AE4 C6080200 */ lwc1 $f8, 0x0200($s0) ## 00000200 /* 02278 808D8AE8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 0227C 808D8AEC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 02280 808D8AF0 460A4400 */ add.s $f16, $f8, $f10 +/* 02280 808D8AF0 460A4400 */ add.s $f16, $f8, $f10 /* 02284 808D8AF4 26040690 */ addiu $a0, $s0, 0x0690 ## $a0 = 00000690 /* 02288 808D8AF8 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 0228C 808D8AFC E6120680 */ swc1 $f18, 0x0680($s0) ## 00000680 -/* 02290 808D8B00 44058000 */ mfc1 $a1, $f16 +/* 02290 808D8B00 44058000 */ mfc1 $a1, $f16 /* 02294 808D8B04 E6040684 */ swc1 $f4, 0x0684($s0) ## 00000684 /* 02298 808D8B08 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0229C 808D8B0C E6060688 */ swc1 $f6, 0x0688($s0) ## 00000688 /* 022A0 808D8B10 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 022A4 808D8B14 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 022A8 808D8B18 C61201FC */ lwc1 $f18, 0x01FC($s0) ## 000001FC /* 022AC 808D8B1C 2604068C */ addiu $a0, $s0, 0x068C ## $a0 = 0000068C /* 022B0 808D8B20 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 022B4 808D8B24 46049181 */ sub.s $f6, $f18, $f4 +/* 022B4 808D8B24 46049181 */ sub.s $f6, $f18, $f4 /* 022B8 808D8B28 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 022BC 808D8B2C AFA40048 */ sw $a0, 0x0048($sp) +/* 022BC 808D8B2C AFA40048 */ sw $a0, 0x0048($sp) /* 022C0 808D8B30 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 022C4 808D8B34 44053000 */ mfc1 $a1, $f6 +/* 022C4 808D8B34 44053000 */ mfc1 $a1, $f6 /* 022C8 808D8B38 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 022CC 808D8B3C 00000000 */ nop /* 022D0 808D8B40 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 022D4 808D8B44 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 022D8 808D8B48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022DC 808D8B4C 14610018 */ bne $v1, $at, .L808D8BB0 -/* 022E0 808D8B50 8FA50074 */ lw $a1, 0x0074($sp) -/* 022E4 808D8B54 0C235C4B */ jal func_808D712C +/* 022DC 808D8B4C 14610018 */ bne $v1, $at, .L808D8BB0 +/* 022E0 808D8B50 8FA50074 */ lw $a1, 0x0074($sp) +/* 022E4 808D8B54 0C235C4B */ jal func_808D712C /* 022E8 808D8B58 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C /* 022EC 808D8B5C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 022F0 808D8B60 24A58A88 */ addiu $a1, $a1, 0x8A88 ## $a1 = 06008A88 -/* 022F4 808D8B64 8FA4004C */ lw $a0, 0x004C($sp) -/* 022F8 808D8B68 0C029490 */ jal func_800A5240 +/* 022F4 808D8B64 8FA4004C */ lw $a0, 0x004C($sp) +/* 022F8 808D8B68 0C029490 */ jal func_800A5240 /* 022FC 808D8B6C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02300 808D8B70 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02304 808D8B74 8FA4004C */ lw $a0, 0x004C($sp) + +/* 02304 808D8B74 8FA4004C */ lw $a0, 0x004C($sp) /* 02308 808D8B78 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0230C 808D8B7C 3C014190 */ lui $at, 0x4190 ## $at = 41900000 /* 02310 808D8B80 3C0F8090 */ lui $t7, %hi(D_808F93C0) ## $t7 = 80900000 /* 02314 808D8B84 E60800BC */ swc1 $f8, 0x00BC($s0) ## 000000BC -/* 02318 808D8B88 8DEF93C0 */ lw $t7, %lo(D_808F93C0)($t7) +/* 02318 808D8B88 8DEF93C0 */ lw $t7, %lo(D_808F93C0)($t7) /* 0231C 808D8B8C 44815000 */ mtc1 $at, $f10 ## $f10 = 18.00 /* 02320 808D8B90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02324 808D8B94 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 02328 808D8B98 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0232C 808D8B9C E5EA16C4 */ swc1 $f10, 0x16C4($t7) ## 809016C4 /* 02330 808D8BA0 A2000198 */ sb $zero, 0x0198($s0) ## 00000198 /* 02334 808D8BA4 0C03E803 */ jal Audio_SetBGM - + /* 02338 808D8BA8 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 /* 0233C 808D8BAC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8BB0: /* 02340 808D8BB0 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 02344 808D8BB4 14610034 */ bne $v1, $at, .L808D8C88 -/* 02348 808D8BB8 8FA40074 */ lw $a0, 0x0074($sp) +/* 02344 808D8BB4 14610034 */ bne $v1, $at, .L808D8C88 +/* 02348 808D8BB8 8FA40074 */ lw $a0, 0x0074($sp) /* 0234C 808D8BBC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02350 808D8BC0 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 02354 808D8BC4 00812021 */ addu $a0, $a0, $at +/* 02354 808D8BC4 00812021 */ addu $a0, $a0, $at /* 02358 808D8BC8 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 0235C 808D8BCC 240500E1 */ addiu $a1, $zero, 0x00E1 ## $a1 = 000000E1 -/* 02360 808D8BD0 8FB80074 */ lw $t8, 0x0074($sp) -/* 02364 808D8BD4 0002C900 */ sll $t9, $v0, 4 -/* 02368 808D8BD8 0322C821 */ addu $t9, $t9, $v0 -/* 0236C 808D8BDC 0019C880 */ sll $t9, $t9, 2 +/* 02360 808D8BD0 8FB80074 */ lw $t8, 0x0074($sp) +/* 02364 808D8BD4 0002C900 */ sll $t9, $v0, 4 +/* 02368 808D8BD8 0322C821 */ addu $t9, $t9, $v0 +/* 0236C 808D8BDC 0019C880 */ sll $t9, $t9, 2 /* 02370 808D8BE0 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 02374 808D8BE4 03194021 */ addu $t0, $t8, $t9 -/* 02378 808D8BE8 01284821 */ addu $t1, $t1, $t0 +/* 02374 808D8BE4 03194021 */ addu $t0, $t8, $t9 +/* 02378 808D8BE8 01284821 */ addu $t1, $t1, $t0 /* 0237C 808D8BEC 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 02380 808D8BF0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 02384 808D8BF4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02388 808D8BF8 24636FA8 */ addiu $v1, $v1, 0x6FA8 ## $v1 = 80166FA8 -/* 0238C 808D8BFC 01215021 */ addu $t2, $t1, $at +/* 0238C 808D8BFC 01215021 */ addu $t2, $t1, $at /* 02390 808D8C00 AC6A0018 */ sw $t2, 0x0018($v1) ## 80166FC0 /* 02394 808D8C04 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 /* 02398 808D8C08 9484F542 */ lhu $a0, -0x0ABE($a0) ## 8015F542 /* 0239C 808D8C0C 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 /* 023A0 808D8C10 2442CF00 */ addiu $v0, $v0, 0xCF00 ## $v0 = 0600CF00 /* 023A4 808D8C14 308B0100 */ andi $t3, $a0, 0x0100 ## $t3 = 00000000 -/* 023A8 808D8C18 15600017 */ bne $t3, $zero, .L808D8C78 -/* 023AC 808D8C1C 00026900 */ sll $t5, $v0, 4 -/* 023B0 808D8C20 000D7702 */ srl $t6, $t5, 28 -/* 023B4 808D8C24 000E7880 */ sll $t7, $t6, 2 -/* 023B8 808D8C28 006FC021 */ addu $t8, $v1, $t7 +/* 023A8 808D8C18 15600017 */ bne $t3, $zero, .L808D8C78 +/* 023AC 808D8C1C 00026900 */ sll $t5, $v0, 4 +/* 023B0 808D8C20 000D7702 */ srl $t6, $t5, 28 +/* 023B4 808D8C24 000E7880 */ sll $t7, $t6, 2 +/* 023B8 808D8C28 006FC021 */ addu $t8, $v1, $t7 /* 023BC 808D8C2C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 023C0 808D8C30 8F190000 */ lw $t9, 0x0000($t8) ## 00000000 /* 023C4 808D8C34 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 023C8 808D8C38 00414024 */ and $t0, $v0, $at -/* 023CC 808D8C3C 8FA40074 */ lw $a0, 0x0074($sp) +/* 023C8 808D8C38 00414024 */ and $t0, $v0, $at +/* 023CC 808D8C3C 8FA40074 */ lw $a0, 0x0074($sp) /* 023D0 808D8C40 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 023D4 808D8C44 240900B4 */ addiu $t1, $zero, 0x00B4 ## $t1 = 000000B4 /* 023D8 808D8C48 240A0080 */ addiu $t2, $zero, 0x0080 ## $t2 = 00000080 /* 023DC 808D8C4C 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 -/* 023E0 808D8C50 03283021 */ addu $a2, $t9, $t0 -/* 023E4 808D8C54 00C13021 */ addu $a2, $a2, $at -/* 023E8 808D8C58 AFAB0018 */ sw $t3, 0x0018($sp) -/* 023EC 808D8C5C AFAA0014 */ sw $t2, 0x0014($sp) -/* 023F0 808D8C60 AFA90010 */ sw $t1, 0x0010($sp) +/* 023E0 808D8C50 03283021 */ addu $a2, $t9, $t0 +/* 023E4 808D8C54 00C13021 */ addu $a2, $a2, $at +/* 023E8 808D8C58 AFAB0018 */ sw $t3, 0x0018($sp) +/* 023EC 808D8C5C AFAA0014 */ sw $t2, 0x0014($sp) +/* 023F0 808D8C60 AFA90010 */ sw $t1, 0x0010($sp) /* 023F4 808D8C64 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 /* 023F8 808D8C68 0C00B380 */ jal TitleCard_InitBossName - + /* 023FC 808D8C6C 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 80161D4C /* 02400 808D8C70 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 /* 02404 808D8C74 9484F542 */ lhu $a0, -0x0ABE($a0) ## 8015F542 @@ -1349,27 +1349,27 @@ glabel L808D8A98 /* 02410 808D8C80 A42CF542 */ sh $t4, -0x0ABE($at) ## 8015F542 /* 02414 808D8C84 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8C88: -/* 02418 808D8C88 2C610014 */ sltiu $at, $v1, 0x0014 -/* 0241C 808D8C8C 1420004F */ bne $at, $zero, .L808D8DCC +/* 02418 808D8C88 2C610014 */ sltiu $at, $v1, 0x0014 +/* 0241C 808D8C8C 1420004F */ bne $at, $zero, .L808D8DCC /* 02420 808D8C90 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 02424 808D8C94 A20D0199 */ sb $t5, 0x0199($s0) ## 00000199 /* 02428 808D8C98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0242C 808D8C9C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02430 808D8CA0 24053056 */ addiu $a1, $zero, 0x3056 ## $a1 = 00003056 /* 02434 808D8CA4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02438 808D8CA8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 0243C 808D8CAC 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 02440 808D8CB0 3C054364 */ lui $a1, 0x4364 ## $a1 = 43640000 /* 02444 808D8CB4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02448 808D8CB8 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 0244C 808D8CBC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02450 808D8CC0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02454 808D8CC4 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 02458 808D8CC8 3C05C366 */ lui $a1, 0xC366 ## $a1 = C3660000 /* 0245C 808D8CCC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02460 808D8CD0 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 /* 02464 808D8CD4 3C028090 */ lui $v0, %hi(D_808F93C0) ## $v0 = 80900000 /* 02468 808D8CD8 244293C0 */ addiu $v0, $v0, %lo(D_808F93C0) ## $v0 = 808F93C0 @@ -1384,34 +1384,34 @@ glabel L808D8A98 /* 0248C 808D8CFC 8C580000 */ lw $t8, 0x0000($v0) ## 808F93C0 /* 02490 808D8D00 E70016B8 */ swc1 $f0, 0x16B8($t8) ## 000016B8 /* 02494 808D8D04 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 -/* 02498 808D8D08 00800821 */ addu $at, $a0, $zero -/* 0249C 808D8D0C 00042080 */ sll $a0, $a0, 2 -/* 024A0 808D8D10 00812023 */ subu $a0, $a0, $at -/* 024A4 808D8D14 00042100 */ sll $a0, $a0, 4 -/* 024A8 808D8D18 00812023 */ subu $a0, $a0, $at -/* 024AC 808D8D1C 000420C0 */ sll $a0, $a0, 3 -/* 024B0 808D8D20 00812023 */ subu $a0, $a0, $at -/* 024B4 808D8D24 00042080 */ sll $a0, $a0, 2 -/* 024B8 808D8D28 00042400 */ sll $a0, $a0, 16 +/* 02498 808D8D08 00800821 */ addu $at, $a0, $zero +/* 0249C 808D8D0C 00042080 */ sll $a0, $a0, 2 +/* 024A0 808D8D10 00812023 */ subu $a0, $a0, $at +/* 024A4 808D8D14 00042100 */ sll $a0, $a0, 4 +/* 024A8 808D8D18 00812023 */ subu $a0, $a0, $at +/* 024AC 808D8D1C 000420C0 */ sll $a0, $a0, 3 +/* 024B0 808D8D20 00812023 */ subu $a0, $a0, $at +/* 024B4 808D8D24 00042080 */ sll $a0, $a0, 2 +/* 024B8 808D8D28 00042400 */ sll $a0, $a0, 16 /* 024BC 808D8D2C 0C01DE1C */ jal Math_Sins ## sins? -/* 024C0 808D8D30 00042403 */ sra $a0, $a0, 16 +/* 024C0 808D8D30 00042403 */ sra $a0, $a0, 16 /* 024C4 808D8D34 C61201C8 */ lwc1 $f18, 0x01C8($s0) ## 000001C8 /* 024C8 808D8D38 3C01808F */ lui $at, %hi(D_808F7EE8) ## $at = 808F0000 -/* 024CC 808D8D3C C4267EE8 */ lwc1 $f6, %lo(D_808F7EE8)($at) -/* 024D0 808D8D40 46009102 */ mul.s $f4, $f18, $f0 +/* 024CC 808D8D3C C4267EE8 */ lwc1 $f6, %lo(D_808F7EE8)($at) +/* 024D0 808D8D40 46009102 */ mul.s $f4, $f18, $f0 /* 024D4 808D8D44 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 /* 024D8 808D8D48 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 024DC 808D8D4C 00800821 */ addu $at, $a0, $zero -/* 024E0 808D8D50 000420C0 */ sll $a0, $a0, 3 -/* 024E4 808D8D54 00812023 */ subu $a0, $a0, $at -/* 024E8 808D8D58 46062082 */ mul.s $f2, $f4, $f6 -/* 024EC 808D8D5C 00042140 */ sll $a0, $a0, 5 -/* 024F0 808D8D60 00812021 */ addu $a0, $a0, $at -/* 024F4 808D8D64 000420C0 */ sll $a0, $a0, 3 -/* 024F8 808D8D68 00042400 */ sll $a0, $a0, 16 -/* 024FC 808D8D6C 00042403 */ sra $a0, $a0, 16 -/* 02500 808D8D70 46024280 */ add.s $f10, $f8, $f2 +/* 024DC 808D8D4C 00800821 */ addu $at, $a0, $zero +/* 024E0 808D8D50 000420C0 */ sll $a0, $a0, 3 +/* 024E4 808D8D54 00812023 */ subu $a0, $a0, $at +/* 024E8 808D8D58 46062082 */ mul.s $f2, $f4, $f6 +/* 024EC 808D8D5C 00042140 */ sll $a0, $a0, 5 +/* 024F0 808D8D60 00812021 */ addu $a0, $a0, $at +/* 024F4 808D8D64 000420C0 */ sll $a0, $a0, 3 +/* 024F8 808D8D68 00042400 */ sll $a0, $a0, 16 +/* 024FC 808D8D6C 00042403 */ sra $a0, $a0, 16 +/* 02500 808D8D70 46024280 */ add.s $f10, $f8, $f2 /* 02504 808D8D74 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 /* 02508 808D8D78 0C01DE0D */ jal Math_Coss ## coss? @@ -1419,42 +1419,42 @@ glabel L808D8A98 /* 02510 808D8D80 C61001C8 */ lwc1 $f16, 0x01C8($s0) ## 000001C8 /* 02514 808D8D84 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 02518 808D8D88 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0251C 808D8D8C 46008482 */ mul.s $f18, $f16, $f0 +/* 0251C 808D8D8C 46008482 */ mul.s $f18, $f16, $f0 /* 02520 808D8D90 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02524 808D8D94 44817000 */ mtc1 $at, $f14 ## $f14 = 50.00 /* 02528 808D8D98 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0252C 808D8D9C 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 02530 808D8DA0 C6060100 */ lwc1 $f6, 0x0100($s0) ## 00000100 -/* 02534 808D8DA4 44066000 */ mfc1 $a2, $f12 -/* 02538 808D8DA8 46049082 */ mul.s $f2, $f18, $f4 -/* 0253C 808D8DAC 44076000 */ mfc1 $a3, $f12 -/* 02540 808D8DB0 44057000 */ mfc1 $a1, $f14 +/* 02534 808D8DA4 44066000 */ mfc1 $a2, $f12 +/* 02538 808D8DA8 46049082 */ mul.s $f2, $f18, $f4 +/* 0253C 808D8DAC 44076000 */ mfc1 $a3, $f12 +/* 02540 808D8DB0 44057000 */ mfc1 $a1, $f14 /* 02544 808D8DB4 260401C8 */ addiu $a0, $s0, 0x01C8 ## $a0 = 000001C8 -/* 02548 808D8DB8 46061201 */ sub.s $f8, $f2, $f6 +/* 02548 808D8DB8 46061201 */ sub.s $f8, $f2, $f6 /* 0254C 808D8DBC E6020024 */ swc1 $f2, 0x0024($s0) ## 00000024 /* 02550 808D8DC0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02554 808D8DC4 E608005C */ swc1 $f8, 0x005C($s0) ## 0000005C /* 02558 808D8DC8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8DCC: -/* 0255C 808D8DCC 2C61001F */ sltiu $at, $v1, 0x001F -/* 02560 808D8DD0 14200008 */ bne $at, $zero, .L808D8DF4 +/* 0255C 808D8DCC 2C61001F */ sltiu $at, $v1, 0x001F +/* 02560 808D8DD0 14200008 */ bne $at, $zero, .L808D8DF4 /* 02564 808D8DD4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02568 808D8DD8 86190718 */ lh $t9, 0x0718($s0) ## 00000718 /* 0256C 808D8DDC 2728FFFB */ addiu $t0, $t9, 0xFFFB ## $t0 = FFFFFFFB /* 02570 808D8DE0 A6080718 */ sh $t0, 0x0718($s0) ## 00000718 /* 02574 808D8DE4 86090718 */ lh $t1, 0x0718($s0) ## 00000718 -/* 02578 808D8DE8 05230003 */ bgezl $t1, .L808D8DF8 +/* 02578 808D8DE8 05230003 */ bgezl $t1, .L808D8DF8 /* 0257C 808D8DEC 8E0A0674 */ lw $t2, 0x0674($s0) ## 00000674 /* 02580 808D8DF0 A6000718 */ sh $zero, 0x0718($s0) ## 00000718 .L808D8DF4: /* 02584 808D8DF4 8E0A0674 */ lw $t2, 0x0674($s0) ## 00000674 .L808D8DF8: /* 02588 808D8DF8 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 -/* 0258C 808D8DFC 15410028 */ bne $t2, $at, .L808D8EA0 +/* 0258C 808D8DFC 15410028 */ bne $t2, $at, .L808D8EA0 /* 02590 808D8E00 00000000 */ nop -/* 02594 808D8E04 0C030129 */ jal func_800C04A4 -/* 02598 808D8E08 8FA40074 */ lw $a0, 0x0074($sp) +/* 02594 808D8E04 0C030129 */ jal func_800C04A4 +/* 02598 808D8E08 8FA40074 */ lw $a0, 0x0074($sp) /* 0259C 808D8E0C 26030680 */ addiu $v1, $s0, 0x0680 ## $v1 = 00000680 /* 025A0 808D8E10 8C6C0000 */ lw $t4, 0x0000($v1) ## 00000680 /* 025A4 808D8E14 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 @@ -1469,7 +1469,7 @@ glabel L808D8A98 /* 025C8 808D8E38 AC4D0078 */ sw $t5, 0x0078($v0) ## 00000078 /* 025CC 808D8E3C 8C6E0008 */ lw $t6, 0x0008($v1) ## 00000688 /* 025D0 808D8E40 AC4E007C */ sw $t6, 0x007C($v0) ## 0000007C -/* 025D4 808D8E44 8FAF0048 */ lw $t7, 0x0048($sp) +/* 025D4 808D8E44 8FAF0048 */ lw $t7, 0x0048($sp) /* 025D8 808D8E48 8DF90000 */ lw $t9, 0x0000($t7) ## 00000000 /* 025DC 808D8E4C AC590050 */ sw $t9, 0x0050($v0) ## 00000050 /* 025E0 808D8E50 8DF80004 */ lw $t8, 0x0004($t7) ## 00000004 @@ -1477,26 +1477,26 @@ glabel L808D8A98 /* 025E8 808D8E58 8DF90008 */ lw $t9, 0x0008($t7) ## 00000008 /* 025EC 808D8E5C AC590058 */ sw $t9, 0x0058($v0) ## 00000058 /* 025F0 808D8E60 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 025F4 808D8E64 0C03022B */ jal func_800C08AC -/* 025F8 808D8E68 8FA40074 */ lw $a0, 0x0074($sp) -/* 025FC 808D8E6C 8FA40074 */ lw $a0, 0x0074($sp) +/* 025F4 808D8E64 0C03022B */ jal func_800C08AC +/* 025F8 808D8E68 8FA40074 */ lw $a0, 0x0074($sp) +/* 025FC 808D8E6C 8FA40074 */ lw $a0, 0x0074($sp) /* 02600 808D8E70 A600067A */ sh $zero, 0x067A($s0) ## 0000067A /* 02604 808D8E74 8608067A */ lh $t0, 0x067A($s0) ## 0000067A /* 02608 808D8E78 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 0260C 808D8E7C 0C01914D */ jal func_80064534 +/* 0260C 808D8E7C 0C01914D */ jal func_80064534 /* 02610 808D8E80 A6080678 */ sh $t0, 0x0678($s0) ## 00000678 -/* 02614 808D8E84 8FA40074 */ lw $a0, 0x0074($sp) +/* 02614 808D8E84 8FA40074 */ lw $a0, 0x0074($sp) /* 02618 808D8E88 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0261C 808D8E8C 0C00B7D5 */ jal func_8002DF54 +/* 0261C 808D8E8C 0C00B7D5 */ jal func_8002DF54 /* 02620 808D8E90 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02624 808D8E94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02628 808D8E98 0C236EBC */ jal func_808DBAF0 -/* 0262C 808D8E9C 8FA50074 */ lw $a1, 0x0074($sp) +/* 02628 808D8E98 0C236EBC */ jal func_808DBAF0 +/* 0262C 808D8E9C 8FA50074 */ lw $a1, 0x0074($sp) .L808D8EA0: /* 02630 808D8EA0 3C038090 */ lui $v1, %hi(D_808F93D4) ## $v1 = 80900000 /* 02634 808D8EA4 246393D4 */ addiu $v1, $v1, %lo(D_808F93D4) ## $v1 = 808F93D4 /* 02638 808D8EA8 8C620000 */ lw $v0, 0x0000($v1) ## 808F93D4 -/* 0263C 808D8EAC 5040000A */ beql $v0, $zero, .L808D8ED8 +/* 0263C 808D8EAC 5040000A */ beql $v0, $zero, .L808D8ED8 /* 02640 808D8EB0 8605067A */ lh $a1, 0x067A($s0) ## 0000067A /* 02644 808D8EB4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 02648 808D8EB8 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 @@ -1511,92 +1511,92 @@ glabel L808D8ED4 /* 02664 808D8ED4 8605067A */ lh $a1, 0x067A($s0) ## 0000067A .L808D8ED8: /* 02668 808D8ED8 260B068C */ addiu $t3, $s0, 0x068C ## $t3 = 0000068C -/* 0266C 808D8EDC 50A0004A */ beql $a1, $zero, .L808D9008 -/* 02670 808D8EE0 8FBF003C */ lw $ra, 0x003C($sp) -/* 02674 808D8EE4 93AD006F */ lbu $t5, 0x006F($sp) +/* 0266C 808D8EDC 50A0004A */ beql $a1, $zero, .L808D9008 +/* 02670 808D8EE0 8FBF003C */ lw $ra, 0x003C($sp) +/* 02674 808D8EE4 93AD006F */ lbu $t5, 0x006F($sp) /* 02678 808D8EE8 260C0680 */ addiu $t4, $s0, 0x0680 ## $t4 = 00000680 -/* 0267C 808D8EEC AFAC0044 */ sw $t4, 0x0044($sp) -/* 02680 808D8EF0 11A0003C */ beq $t5, $zero, .L808D8FE4 -/* 02684 808D8EF4 AFAB0048 */ sw $t3, 0x0048($sp) +/* 0267C 808D8EEC AFAC0044 */ sw $t4, 0x0044($sp) +/* 02680 808D8EF0 11A0003C */ beq $t5, $zero, .L808D8FE4 +/* 02684 808D8EF4 AFAB0048 */ sw $t3, 0x0048($sp) /* 02688 808D8EF8 C61006A4 */ lwc1 $f16, 0x06A4($s0) ## 000006A4 /* 0268C 808D8EFC C61206EC */ lwc1 $f18, 0x06EC($s0) ## 000006EC /* 02690 808D8F00 8E0506BC */ lw $a1, 0x06BC($s0) ## 000006BC /* 02694 808D8F04 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 02698 808D8F08 46128102 */ mul.s $f4, $f16, $f18 +/* 02698 808D8F08 46128102 */ mul.s $f4, $f16, $f18 /* 0269C 808D8F0C 260E0688 */ addiu $t6, $s0, 0x0688 ## $t6 = 00000688 /* 026A0 808D8F10 260F0690 */ addiu $t7, $s0, 0x0690 ## $t7 = 00000690 -/* 026A4 808D8F14 AFAF004C */ sw $t7, 0x004C($sp) -/* 026A8 808D8F18 AFAE0050 */ sw $t6, 0x0050($sp) +/* 026A4 808D8F14 AFAF004C */ sw $t7, 0x004C($sp) +/* 026A8 808D8F18 AFAE0050 */ sw $t6, 0x0050($sp) /* 026AC 808D8F1C 01802025 */ or $a0, $t4, $zero ## $a0 = 00000680 -/* 026B0 808D8F20 44072000 */ mfc1 $a3, $f4 +/* 026B0 808D8F20 44072000 */ mfc1 $a3, $f4 /* 026B4 808D8F24 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 026B8 808D8F28 00000000 */ nop /* 026BC 808D8F2C C60606A8 */ lwc1 $f6, 0x06A8($s0) ## 000006A8 /* 026C0 808D8F30 C60806EC */ lwc1 $f8, 0x06EC($s0) ## 000006EC /* 026C4 808D8F34 26040684 */ addiu $a0, $s0, 0x0684 ## $a0 = 00000684 /* 026C8 808D8F38 8E0506C0 */ lw $a1, 0x06C0($s0) ## 000006C0 -/* 026CC 808D8F3C 46083282 */ mul.s $f10, $f6, $f8 +/* 026CC 808D8F3C 46083282 */ mul.s $f10, $f6, $f8 /* 026D0 808D8F40 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 026D4 808D8F44 44075000 */ mfc1 $a3, $f10 +/* 026D4 808D8F44 44075000 */ mfc1 $a3, $f10 /* 026D8 808D8F48 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 026DC 808D8F4C 00000000 */ nop /* 026E0 808D8F50 C61006AC */ lwc1 $f16, 0x06AC($s0) ## 000006AC /* 026E4 808D8F54 C61206EC */ lwc1 $f18, 0x06EC($s0) ## 000006EC -/* 026E8 808D8F58 8FA40050 */ lw $a0, 0x0050($sp) +/* 026E8 808D8F58 8FA40050 */ lw $a0, 0x0050($sp) /* 026EC 808D8F5C 8E0506C4 */ lw $a1, 0x06C4($s0) ## 000006C4 -/* 026F0 808D8F60 46128102 */ mul.s $f4, $f16, $f18 +/* 026F0 808D8F60 46128102 */ mul.s $f4, $f16, $f18 /* 026F4 808D8F64 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 026F8 808D8F68 44072000 */ mfc1 $a3, $f4 +/* 026F8 808D8F68 44072000 */ mfc1 $a3, $f4 /* 026FC 808D8F6C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02700 808D8F70 00000000 */ nop /* 02704 808D8F74 C60606B0 */ lwc1 $f6, 0x06B0($s0) ## 000006B0 /* 02708 808D8F78 C60806EC */ lwc1 $f8, 0x06EC($s0) ## 000006EC -/* 0270C 808D8F7C 8FA40048 */ lw $a0, 0x0048($sp) +/* 0270C 808D8F7C 8FA40048 */ lw $a0, 0x0048($sp) /* 02710 808D8F80 8E0506D4 */ lw $a1, 0x06D4($s0) ## 000006D4 -/* 02714 808D8F84 46083282 */ mul.s $f10, $f6, $f8 +/* 02714 808D8F84 46083282 */ mul.s $f10, $f6, $f8 /* 02718 808D8F88 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 0271C 808D8F8C 44075000 */ mfc1 $a3, $f10 +/* 0271C 808D8F8C 44075000 */ mfc1 $a3, $f10 /* 02720 808D8F90 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02724 808D8F94 00000000 */ nop /* 02728 808D8F98 C61006B4 */ lwc1 $f16, 0x06B4($s0) ## 000006B4 /* 0272C 808D8F9C C61206EC */ lwc1 $f18, 0x06EC($s0) ## 000006EC -/* 02730 808D8FA0 8FA4004C */ lw $a0, 0x004C($sp) +/* 02730 808D8FA0 8FA4004C */ lw $a0, 0x004C($sp) /* 02734 808D8FA4 8E0506D8 */ lw $a1, 0x06D8($s0) ## 000006D8 -/* 02738 808D8FA8 46128102 */ mul.s $f4, $f16, $f18 +/* 02738 808D8FA8 46128102 */ mul.s $f4, $f16, $f18 /* 0273C 808D8FAC 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 02740 808D8FB0 44072000 */ mfc1 $a3, $f4 +/* 02740 808D8FB0 44072000 */ mfc1 $a3, $f4 /* 02744 808D8FB4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02748 808D8FB8 00000000 */ nop /* 0274C 808D8FBC C60606B8 */ lwc1 $f6, 0x06B8($s0) ## 000006B8 /* 02750 808D8FC0 C60806EC */ lwc1 $f8, 0x06EC($s0) ## 000006EC /* 02754 808D8FC4 26040694 */ addiu $a0, $s0, 0x0694 ## $a0 = 00000694 /* 02758 808D8FC8 8E0506DC */ lw $a1, 0x06DC($s0) ## 000006DC -/* 0275C 808D8FCC 46083282 */ mul.s $f10, $f6, $f8 +/* 0275C 808D8FCC 46083282 */ mul.s $f10, $f6, $f8 /* 02760 808D8FD0 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 02764 808D8FD4 44075000 */ mfc1 $a3, $f10 +/* 02764 808D8FD4 44075000 */ mfc1 $a3, $f10 /* 02768 808D8FD8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0276C 808D8FDC 00000000 */ nop /* 02770 808D8FE0 8605067A */ lh $a1, 0x067A($s0) ## 0000067A .L808D8FE4: -/* 02774 808D8FE4 8FA40074 */ lw $a0, 0x0074($sp) -/* 02778 808D8FE8 8FA60048 */ lw $a2, 0x0048($sp) -/* 0277C 808D8FEC 0C030136 */ jal func_800C04D8 -/* 02780 808D8FF0 8FA70044 */ lw $a3, 0x0044($sp) -/* 02784 808D8FF4 8FA40074 */ lw $a0, 0x0074($sp) +/* 02774 808D8FE4 8FA40074 */ lw $a0, 0x0074($sp) +/* 02778 808D8FE8 8FA60048 */ lw $a2, 0x0048($sp) +/* 0277C 808D8FEC 0C030136 */ jal func_800C04D8 +/* 02780 808D8FF0 8FA70044 */ lw $a3, 0x0044($sp) +/* 02784 808D8FF4 8FA40074 */ lw $a0, 0x0074($sp) /* 02788 808D8FF8 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 0278C 808D8FFC 0C0301C1 */ jal func_800C0704 +/* 0278C 808D8FFC 0C0301C1 */ jal func_800C0704 /* 02790 808D9000 8E0606F4 */ lw $a2, 0x06F4($s0) ## 000006F4 -/* 02794 808D9004 8FBF003C */ lw $ra, 0x003C($sp) +/* 02794 808D9004 8FBF003C */ lw $ra, 0x003C($sp) .L808D9008: -/* 02798 808D9008 8FB00038 */ lw $s0, 0x0038($sp) +/* 02798 808D9008 8FB00038 */ lw $s0, 0x0038($sp) /* 0279C 808D900C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 027A0 808D9010 03E00008 */ jr $ra +/* 027A0 808D9010 03E00008 */ jr $ra /* 027A4 808D9014 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s index 0b0879e844..564f1b3c77 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s @@ -1,89 +1,89 @@ glabel func_808D933C /* 02ACC 808D933C 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 -/* 02AD0 808D9340 AFBF003C */ sw $ra, 0x003C($sp) -/* 02AD4 808D9344 AFB00038 */ sw $s0, 0x0038($sp) -/* 02AD8 808D9348 A3A000AD */ sb $zero, 0x00AD($sp) +/* 02AD0 808D9340 AFBF003C */ sw $ra, 0x003C($sp) +/* 02AD4 808D9344 AFB00038 */ sw $s0, 0x0038($sp) +/* 02AD8 808D9348 A3A000AD */ sb $zero, 0x00AD($sp) /* 02ADC 808D934C 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 02AE0 808D9350 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 02AE4 808D9354 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02AE8 808D9358 AFAE00A8 */ sw $t6, 0x00A8($sp) +/* 02AE8 808D9358 AFAE00A8 */ sw $t6, 0x00A8($sp) /* 02AEC 808D935C 8C8F014C */ lw $t7, 0x014C($a0) ## 0000014C /* 02AF0 808D9360 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02AF4 808D9364 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 02AF8 808D9368 000FC100 */ sll $t8, $t7, 4 -/* 02AFC 808D936C 030FC021 */ addu $t8, $t8, $t7 -/* 02B00 808D9370 0018C080 */ sll $t8, $t8, 2 -/* 02B04 808D9374 00B8C821 */ addu $t9, $a1, $t8 -/* 02B08 808D9378 01394821 */ addu $t1, $t1, $t9 +/* 02AF8 808D9368 000FC100 */ sll $t8, $t7, 4 +/* 02AFC 808D936C 030FC021 */ addu $t8, $t8, $t7 +/* 02B00 808D9370 0018C080 */ sll $t8, $t8, 2 +/* 02B04 808D9374 00B8C821 */ addu $t9, $a1, $t8 +/* 02B08 808D9378 01394821 */ addu $t1, $t1, $t9 /* 02B0C 808D937C 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 -/* 02B10 808D9380 01215021 */ addu $t2, $t1, $at +/* 02B10 808D9380 01215021 */ addu $t2, $t1, $at /* 02B14 808D9384 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 02B18 808D9388 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 /* 02B1C 808D938C 8C8B0524 */ lw $t3, 0x0524($a0) ## 00000674 /* 02B20 808D9390 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 /* 02B24 808D9394 AC8C0524 */ sw $t4, 0x0524($a0) ## 00000674 -/* 02B28 808D9398 AFA500B4 */ sw $a1, 0x00B4($sp) +/* 02B28 808D9398 AFA500B4 */ sw $a1, 0x00B4($sp) /* 02B2C 808D939C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02B30 808D93A0 AFA40054 */ sw $a0, 0x0054($sp) + +/* 02B30 808D93A0 AFA40054 */ sw $a0, 0x0054($sp) /* 02B34 808D93A4 86040678 */ lh $a0, 0x0678($s0) ## 00000678 -/* 02B38 808D93A8 28810420 */ slti $at, $a0, 0x0420 -/* 02B3C 808D93AC 14200008 */ bne $at, $zero, .L808D93D0 +/* 02B38 808D93A8 28810420 */ slti $at, $a0, 0x0420 +/* 02B3C 808D93AC 14200008 */ bne $at, $zero, .L808D93D0 /* 02B40 808D93B0 00801825 */ or $v1, $a0, $zero ## $v1 = 00000000 /* 02B44 808D93B4 24010420 */ addiu $at, $zero, 0x0420 ## $at = 00000420 -/* 02B48 808D93B8 1061047C */ beq $v1, $at, .L808DA5AC +/* 02B48 808D93B8 1061047C */ beq $v1, $at, .L808DA5AC /* 02B4C 808D93BC 24010421 */ addiu $at, $zero, 0x0421 ## $at = 00000421 -/* 02B50 808D93C0 506104A7 */ beql $v1, $at, .L808DA660 +/* 02B50 808D93C0 506104A7 */ beql $v1, $at, .L808DA660 /* 02B54 808D93C4 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 -/* 02B58 808D93C8 100005E9 */ beq $zero, $zero, .L808DAB70 -/* 02B5C 808D93CC 28810064 */ slti $at, $a0, 0x0064 +/* 02B58 808D93C8 100005E9 */ beq $zero, $zero, .L808DAB70 +/* 02B5C 808D93CC 28810064 */ slti $at, $a0, 0x0064 .L808D93D0: -/* 02B60 808D93D0 2861006E */ slti $at, $v1, 0x006E -/* 02B64 808D93D4 14200006 */ bne $at, $zero, .L808D93F0 +/* 02B60 808D93D0 2861006E */ slti $at, $v1, 0x006E +/* 02B64 808D93D4 14200006 */ bne $at, $zero, .L808D93F0 /* 02B68 808D93D8 246DFF9C */ addiu $t5, $v1, 0xFF9C ## $t5 = FFFFFF9C /* 02B6C 808D93DC 2401041F */ addiu $at, $zero, 0x041F ## $at = 0000041F -/* 02B70 808D93E0 5061044D */ beql $v1, $at, .L808DA518 +/* 02B70 808D93E0 5061044D */ beql $v1, $at, .L808DA518 /* 02B74 808D93E4 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 -/* 02B78 808D93E8 100005E1 */ beq $zero, $zero, .L808DAB70 -/* 02B7C 808D93EC 28810064 */ slti $at, $a0, 0x0064 +/* 02B78 808D93E8 100005E1 */ beq $zero, $zero, .L808DAB70 +/* 02B7C 808D93EC 28810064 */ slti $at, $a0, 0x0064 .L808D93F0: -/* 02B80 808D93F0 2861000A */ slti $at, $v1, 0x000A -/* 02B84 808D93F4 14200009 */ bne $at, $zero, .L808D941C -/* 02B88 808D93F8 00037080 */ sll $t6, $v1, 2 -/* 02B8C 808D93FC 2DA1000A */ sltiu $at, $t5, 0x000A -/* 02B90 808D9400 102005DA */ beq $at, $zero, .L808DAB6C -/* 02B94 808D9404 000D6880 */ sll $t5, $t5, 2 +/* 02B80 808D93F0 2861000A */ slti $at, $v1, 0x000A +/* 02B84 808D93F4 14200009 */ bne $at, $zero, .L808D941C +/* 02B88 808D93F8 00037080 */ sll $t6, $v1, 2 +/* 02B8C 808D93FC 2DA1000A */ sltiu $at, $t5, 0x000A +/* 02B90 808D9400 102005DA */ beq $at, $zero, .L808DAB6C +/* 02B94 808D9404 000D6880 */ sll $t5, $t5, 2 /* 02B98 808D9408 3C01808F */ lui $at, %hi(jtbl_808F7EF0) ## $at = 808F0000 -/* 02B9C 808D940C 002D0821 */ addu $at, $at, $t5 -/* 02BA0 808D9410 8C2D7EF0 */ lw $t5, %lo(jtbl_808F7EF0)($at) -/* 02BA4 808D9414 01A00008 */ jr $t5 +/* 02B9C 808D940C 002D0821 */ addu $at, $at, $t5 +/* 02BA0 808D9410 8C2D7EF0 */ lw $t5, %lo(jtbl_808F7EF0)($at) +/* 02BA4 808D9414 01A00008 */ jr $t5 /* 02BA8 808D9418 00000000 */ nop .L808D941C: -/* 02BAC 808D941C 2C61000A */ sltiu $at, $v1, 0x000A -/* 02BB0 808D9420 102005D2 */ beq $at, $zero, .L808DAB6C +/* 02BAC 808D941C 2C61000A */ sltiu $at, $v1, 0x000A +/* 02BB0 808D9420 102005D2 */ beq $at, $zero, .L808DAB6C /* 02BB4 808D9424 3C01808F */ lui $at, %hi(jtbl_808F7F18) ## $at = 808F0000 -/* 02BB8 808D9428 002E0821 */ addu $at, $at, $t6 -/* 02BBC 808D942C 8C2E7F18 */ lw $t6, %lo(jtbl_808F7F18)($at) -/* 02BC0 808D9430 01C00008 */ jr $t6 +/* 02BB8 808D9428 002E0821 */ addu $at, $at, $t6 +/* 02BBC 808D942C 8C2E7F18 */ lw $t6, %lo(jtbl_808F7F18)($at) +/* 02BC0 808D9430 01C00008 */ jr $t6 /* 02BC4 808D9434 00000000 */ nop glabel L808D9438 -/* 02BC8 808D9438 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 02BCC 808D943C 0C019148 */ jal func_80064520 +/* 02BC8 808D9438 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02BCC 808D943C 0C019148 */ jal func_80064520 /* 02BD0 808D9440 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 02BD4 808D9444 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02BD4 808D9444 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02BD8 808D9448 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02BDC 808D944C 0C00B7D5 */ jal func_8002DF54 +/* 02BDC 808D944C 0C00B7D5 */ jal func_8002DF54 /* 02BE0 808D9450 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 02BE4 808D9454 0C03008C */ jal func_800C0230 -/* 02BE8 808D9458 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02BE4 808D9454 0C03008C */ jal func_800C0230 +/* 02BE8 808D9458 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02BEC 808D945C A602067A */ sh $v0, 0x067A($s0) ## 0000067A -/* 02BF0 808D9460 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02BF0 808D9460 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02BF4 808D9464 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02BF8 808D9468 0C0300C5 */ jal func_800C0314 +/* 02BF8 808D9468 0C0300C5 */ jal func_800C0314 /* 02BFC 808D946C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02C00 808D9470 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02C00 808D9470 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02C04 808D9474 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 02C08 808D9478 0C0300C5 */ jal func_800C0314 +/* 02C08 808D9478 0C0300C5 */ jal func_800C0314 /* 02C0C 808D947C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02C10 808D9480 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 02C14 808D9484 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 @@ -94,7 +94,7 @@ glabel L808D9438 /* 02C28 808D9498 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 /* 02C2C 808D949C E6020024 */ swc1 $f2, 0x0024($s0) ## 00000024 /* 02C30 808D94A0 E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C -/* 02C34 808D94A4 C4287F40 */ lwc1 $f8, %lo(D_808F7F40)($at) +/* 02C34 808D94A4 C4287F40 */ lwc1 $f8, %lo(D_808F7F40)($at) /* 02C38 808D94A8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 02C3C 808D94AC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 02C40 808D94B0 A60000B6 */ sh $zero, 0x00B6($s0) ## 000000B6 @@ -103,7 +103,7 @@ glabel L808D9438 /* 02C4C 808D94BC A218071A */ sb $t8, 0x071A($s0) ## 0000071A /* 02C50 808D94C0 E60800BC */ swc1 $f8, 0x00BC($s0) ## 000000BC glabel L808D94C4 -/* 02C54 808D94C4 8FA200A8 */ lw $v0, 0x00A8($sp) +/* 02C54 808D94C4 8FA200A8 */ lw $v0, 0x00A8($sp) /* 02C58 808D94C8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 02C5C 808D94CC 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 /* 02C60 808D94D0 3C0142E6 */ lui $at, 0x42E6 ## $at = 42E60000 @@ -117,19 +117,19 @@ glabel L808D94C4 /* 02C80 808D94F0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 02C84 808D94F4 2409000D */ addiu $t1, $zero, 0x000D ## $t1 = 0000000D /* 02C88 808D94F8 A20901A0 */ sb $t1, 0x01A0($s0) ## 000001A0 -/* 02C8C 808D94FC 2C61001E */ sltiu $at, $v1, 0x001E -/* 02C90 808D9500 10200005 */ beq $at, $zero, .L808D9518 -/* 02C94 808D9504 8FAA00B4 */ lw $t2, 0x00B4($sp) +/* 02C8C 808D94FC 2C61001E */ sltiu $at, $v1, 0x001E +/* 02C90 808D9500 10200005 */ beq $at, $zero, .L808D9518 +/* 02C94 808D9504 8FAA00B4 */ lw $t2, 0x00B4($sp) /* 02C98 808D9508 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02C9C 808D950C 002A0821 */ addu $at, $at, $t2 +/* 02C9C 808D950C 002A0821 */ addu $at, $at, $t2 /* 02CA0 808D9510 E4220AFC */ swc1 $f2, 0x0AFC($at) ## 00010AFC /* 02CA4 808D9514 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D9518: -/* 02CA8 808D9518 2C610002 */ sltiu $at, $v1, 0x0002 -/* 02CAC 808D951C 14200004 */ bne $at, $zero, .L808D9530 -/* 02CB0 808D9520 8FAB00B4 */ lw $t3, 0x00B4($sp) +/* 02CA8 808D9518 2C610002 */ sltiu $at, $v1, 0x0002 +/* 02CAC 808D951C 14200004 */ bne $at, $zero, .L808D9530 +/* 02CB0 808D9520 8FAB00B4 */ lw $t3, 0x00B4($sp) /* 02CB4 808D9524 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02CB8 808D9528 002B0821 */ addu $at, $at, $t3 +/* 02CB8 808D9528 002B0821 */ addu $at, $at, $t3 /* 02CBC 808D952C A0200B05 */ sb $zero, 0x0B05($at) ## 00010B05 .L808D9530: /* 02CC0 808D9530 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 @@ -141,27 +141,27 @@ glabel L808D94C4 /* 02CD8 808D9548 C6060200 */ lwc1 $f6, 0x0200($s0) ## 00000200 /* 02CDC 808D954C C60401FC */ lwc1 $f4, 0x01FC($s0) ## 000001FC /* 02CE0 808D9550 C6100204 */ lwc1 $f16, 0x0204($s0) ## 00000204 -/* 02CE4 808D9554 46083280 */ add.s $f10, $f6, $f8 +/* 02CE4 808D9554 46083280 */ add.s $f10, $f6, $f8 /* 02CE8 808D9558 E6000680 */ swc1 $f0, 0x0680($s0) ## 00000680 /* 02CEC 808D955C E6000688 */ swc1 $f0, 0x0688($s0) ## 00000688 /* 02CF0 808D9560 E6120684 */ swc1 $f18, 0x0684($s0) ## 00000684 /* 02CF4 808D9564 E60A0690 */ swc1 $f10, 0x0690($s0) ## 00000690 /* 02CF8 808D9568 E604068C */ swc1 $f4, 0x068C($s0) ## 0000068C /* 02CFC 808D956C E6100694 */ swc1 $f16, 0x0694($s0) ## 00000694 -/* 02D00 808D9570 8FA40054 */ lw $a0, 0x0054($sp) -/* 02D04 808D9574 0C0295B2 */ jal func_800A56C8 +/* 02D00 808D9570 8FA40054 */ lw $a0, 0x0054($sp) +/* 02D04 808D9574 0C0295B2 */ jal func_800A56C8 /* 02D08 808D9578 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 02D0C 808D957C 10400008 */ beq $v0, $zero, .L808D95A0 -/* 02D10 808D9580 8FA40054 */ lw $a0, 0x0054($sp) +/* 02D0C 808D957C 10400008 */ beq $v0, $zero, .L808D95A0 +/* 02D10 808D9580 8FA40054 */ lw $a0, 0x0054($sp) /* 02D14 808D9584 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02D18 808D9588 24A5F19C */ addiu $a1, $a1, 0xF19C ## $a1 = 0600F19C -/* 02D1C 808D958C 0C0294D3 */ jal func_800A534C +/* 02D1C 808D958C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 02D20 808D9590 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02D24 808D9594 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 /* 02D28 808D9598 A60C0678 */ sh $t4, 0x0678($s0) ## 00000678 /* 02D2C 808D959C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808D95A0: -/* 02D30 808D95A0 10000572 */ beq $zero, $zero, .L808DAB6C +/* 02D30 808D95A0 10000572 */ beq $zero, $zero, .L808DAB6C /* 02D34 808D95A4 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D95A8 /* 02D38 808D95A8 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 @@ -176,23 +176,23 @@ glabel L808D95A8 /* 02D5C 808D95CC C6100204 */ lwc1 $f16, 0x0204($s0) ## 00000204 /* 02D60 808D95D0 8E0E0674 */ lw $t6, 0x0674($s0) ## 00000674 /* 02D64 808D95D4 E6040684 */ swc1 $f4, 0x0684($s0) ## 00000684 -/* 02D68 808D95D8 46128100 */ add.s $f4, $f16, $f18 +/* 02D68 808D95D8 46128100 */ add.s $f4, $f16, $f18 /* 02D6C 808D95DC C60801FC */ lwc1 $f8, 0x01FC($s0) ## 000001FC /* 02D70 808D95E0 C60A0200 */ lwc1 $f10, 0x0200($s0) ## 00000200 /* 02D74 808D95E4 240D000D */ addiu $t5, $zero, 0x000D ## $t5 = 0000000D -/* 02D78 808D95E8 2DC1001E */ sltiu $at, $t6, 0x001E +/* 02D78 808D95E8 2DC1001E */ sltiu $at, $t6, 0x001E /* 02D7C 808D95EC A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 /* 02D80 808D95F0 E6040694 */ swc1 $f4, 0x0694($s0) ## 00000694 /* 02D84 808D95F4 E6060688 */ swc1 $f6, 0x0688($s0) ## 00000688 /* 02D88 808D95F8 E608068C */ swc1 $f8, 0x068C($s0) ## 0000068C -/* 02D8C 808D95FC 1420000C */ bne $at, $zero, .L808D9630 +/* 02D8C 808D95FC 1420000C */ bne $at, $zero, .L808D9630 /* 02D90 808D9600 E60A0690 */ swc1 $f10, 0x0690($s0) ## 00000690 /* 02D94 808D9604 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 02D98 808D9608 A60F0678 */ sh $t7, 0x0678($s0) ## 00000678 /* 02D9C 808D960C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 02DA0 808D9610 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02DA0 808D9610 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02DA4 808D9614 240570CE */ addiu $a1, $zero, 0x70CE ## $a1 = 000070CE -/* 02DA8 808D9618 0C042DA0 */ jal func_8010B680 +/* 02DA8 808D9618 0C042DA0 */ jal func_8010B680 /* 02DAC 808D961C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 02DB0 808D9620 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 02DB4 808D9624 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 @@ -202,13 +202,13 @@ glabel L808D95A8 /* 02DC0 808D9630 861801A2 */ lh $t8, 0x01A2($s0) ## 000001A2 /* 02DC4 808D9634 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02DC8 808D9638 3319001F */ andi $t9, $t8, 0x001F ## $t9 = 00000000 -/* 02DCC 808D963C 17200003 */ bne $t9, $zero, .L808D964C +/* 02DCC 808D963C 17200003 */ bne $t9, $zero, .L808D964C /* 02DD0 808D9640 00000000 */ nop /* 02DD4 808D9644 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02DD8 808D9648 240539D1 */ addiu $a1, $zero, 0x39D1 ## $a1 = 000039D1 .L808D964C: -/* 02DDC 808D964C 10000547 */ beq $zero, $zero, .L808DAB6C +/* 02DDC 808D964C 10000547 */ beq $zero, $zero, .L808DAB6C /* 02DE0 808D9650 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D9654 /* 02DE4 808D9654 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -216,17 +216,17 @@ glabel L808D9654 /* 02DEC 808D965C C60001CC */ lwc1 $f0, 0x01CC($s0) ## 000001CC /* 02DF0 808D9660 2409000E */ addiu $t1, $zero, 0x000E ## $t1 = 0000000E /* 02DF4 808D9664 A20901A0 */ sb $t1, 0x01A0($s0) ## 000001A0 -/* 02DF8 808D9668 4600403C */ c.lt.s $f8, $f0 +/* 02DF8 808D9668 4600403C */ c.lt.s $f8, $f0 /* 02DFC 808D966C 00000000 */ nop -/* 02E00 808D9670 4502000A */ bc1fl .L808D969C +/* 02E00 808D9670 4502000A */ bc1fl .L808D969C /* 02E04 808D9674 C6120200 */ lwc1 $f18, 0x0200($s0) ## 00000200 /* 02E08 808D9678 860A01A2 */ lh $t2, 0x01A2($s0) ## 000001A2 /* 02E0C 808D967C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02E10 808D9680 314B001F */ andi $t3, $t2, 0x001F ## $t3 = 00000000 -/* 02E14 808D9684 55600005 */ bnel $t3, $zero, .L808D969C +/* 02E14 808D9684 55600005 */ bnel $t3, $zero, .L808D969C /* 02E18 808D9688 C6120200 */ lwc1 $f18, 0x0200($s0) ## 00000200 /* 02E1C 808D968C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02E20 808D9690 240539D1 */ addiu $a1, $zero, 0x39D1 ## $a1 = 000039D1 /* 02E24 808D9694 C60001CC */ lwc1 $f0, 0x01CC($s0) ## 000001CC /* 02E28 808D9698 C6120200 */ lwc1 $f18, 0x0200($s0) ## 00000200 @@ -242,187 +242,187 @@ glabel L808D9654 /* 02E4C 808D96BC 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 02E50 808D96C0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 02E54 808D96C4 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 02E58 808D96C8 46088201 */ sub.s $f8, $f16, $f8 +/* 02E58 808D96C8 46088201 */ sub.s $f8, $f16, $f8 /* 02E5C 808D96CC C6100204 */ lwc1 $f16, 0x0204($s0) ## 00000204 /* 02E60 808D96D0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02E64 808D96D4 46069180 */ add.s $f6, $f18, $f6 +/* 02E64 808D96D4 46069180 */ add.s $f6, $f18, $f6 /* 02E68 808D96D8 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 02E6C 808D96DC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 02E70 808D96E0 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 02E74 808D96E4 46123481 */ sub.s $f18, $f6, $f18 +/* 02E74 808D96E4 46123481 */ sub.s $f18, $f6, $f18 /* 02E78 808D96E8 E60E0680 */ swc1 $f14, 0x0680($s0) ## 00000680 /* 02E7C 808D96EC E60C0684 */ swc1 $f12, 0x0684($s0) ## 00000684 -/* 02E80 808D96F0 4600203C */ c.lt.s $f4, $f0 +/* 02E80 808D96F0 4600203C */ c.lt.s $f4, $f0 /* 02E84 808D96F4 E60A0688 */ swc1 $f10, 0x0688($s0) ## 00000688 /* 02E88 808D96F8 E608068C */ swc1 $f8, 0x068C($s0) ## 0000068C /* 02E8C 808D96FC E6120690 */ swc1 $f18, 0x0690($s0) ## 00000690 -/* 02E90 808D9700 45000019 */ bc1f .L808D9768 +/* 02E90 808D9700 45000019 */ bc1f .L808D9768 /* 02E94 808D9704 E6100694 */ swc1 $f16, 0x0694($s0) ## 00000694 /* 02E98 808D9708 8E0C0674 */ lw $t4, 0x0674($s0) ## 00000674 -/* 02E9C 808D970C 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 02EA0 808D9710 2D810065 */ sltiu $at, $t4, 0x0065 -/* 02EA4 808D9714 54200015 */ bnel $at, $zero, .L808D976C +/* 02E9C 808D970C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02EA0 808D9710 2D810065 */ sltiu $at, $t4, 0x0065 +/* 02EA4 808D9714 54200015 */ bnel $at, $zero, .L808D976C /* 02EA8 808D9718 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 02EAC 808D971C 0C042F6F */ jal func_8010BDBC +/* 02EAC 808D971C 0C042F6F */ jal func_8010BDBC /* 02EB0 808D9720 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 02EB4 808D9724 14400010 */ bne $v0, $zero, .L808D9768 -/* 02EB8 808D9728 8FA40054 */ lw $a0, 0x0054($sp) +/* 02EB4 808D9724 14400010 */ bne $v0, $zero, .L808D9768 +/* 02EB8 808D9728 8FA40054 */ lw $a0, 0x0054($sp) /* 02EBC 808D972C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02EC0 808D9730 24A5B668 */ addiu $a1, $a1, 0xB668 ## $a1 = 0600B668 -/* 02EC4 808D9734 0C029490 */ jal func_800A5240 +/* 02EC4 808D9734 0C029490 */ jal func_800A5240 /* 02EC8 808D9738 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02ECC 808D973C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02ED0 808D9740 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02ED4 808D9744 2484B668 */ addiu $a0, $a0, 0xB668 ## $a0 = 0600B668 /* 02ED8 808D9748 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 02EDC 808D974C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02EE0 808D9750 240539D2 */ addiu $a1, $zero, 0x39D2 ## $a1 = 000039D2 -/* 02EE4 808D9754 46805420 */ cvt.s.w $f16, $f10 +/* 02EE4 808D9754 46805420 */ cvt.s.w $f16, $f10 /* 02EE8 808D9758 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02EEC 808D975C E61001CC */ swc1 $f16, 0x01CC($s0) ## 000001CC -/* 02EF0 808D9760 10000057 */ beq $zero, $zero, .L808D98C0 +/* 02EF0 808D9760 10000057 */ beq $zero, $zero, .L808D98C0 /* 02EF4 808D9764 00000000 */ nop .L808D9768: /* 02EF8 808D9768 3C014180 */ lui $at, 0x4180 ## $at = 41800000 .L808D976C: /* 02EFC 808D976C 44812000 */ mtc1 $at, $f4 ## $f4 = 16.00 /* 02F00 808D9770 C61201CC */ lwc1 $f18, 0x01CC($s0) ## 000001CC -/* 02F04 808D9774 8FA40054 */ lw $a0, 0x0054($sp) -/* 02F08 808D9778 46049181 */ sub.s $f6, $f18, $f4 -/* 02F0C 808D977C 44053000 */ mfc1 $a1, $f6 -/* 02F10 808D9780 0C0295B2 */ jal func_800A56C8 +/* 02F04 808D9774 8FA40054 */ lw $a0, 0x0054($sp) +/* 02F08 808D9778 46049181 */ sub.s $f6, $f18, $f4 +/* 02F0C 808D977C 44053000 */ mfc1 $a1, $f6 +/* 02F10 808D9780 0C0295B2 */ jal func_800A56C8 /* 02F14 808D9784 00000000 */ nop -/* 02F18 808D9788 10400041 */ beq $v0, $zero, .L808D9890 +/* 02F18 808D9788 10400041 */ beq $v0, $zero, .L808D9890 /* 02F1C 808D978C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02F20 808D9790 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 .L808D9794: /* 02F24 808D9794 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 02F28 808D9798 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02F2C 808D979C A7A200AE */ sh $v0, 0x00AE($sp) + +/* 02F2C 808D979C A7A200AE */ sh $v0, 0x00AE($sp) /* 02F30 808D97A0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 02F34 808D97A4 44816000 */ mtc1 $at, $f12 ## $f12 = 1.50 /* 02F38 808D97A8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02F3C 808D97AC E7A00098 */ swc1 $f0, 0x0098($sp) + +/* 02F3C 808D97AC E7A00098 */ swc1 $f0, 0x0098($sp) /* 02F40 808D97B0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 02F44 808D97B4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 /* 02F48 808D97B8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02F4C 808D97BC 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 02F50 808D97C0 46080280 */ add.s $f10, $f0, $f8 +/* 02F50 808D97C0 46080280 */ add.s $f10, $f0, $f8 /* 02F54 808D97C4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 02F58 808D97C8 E7AA009C */ swc1 $f10, 0x009C($sp) + +/* 02F58 808D97C8 E7AA009C */ swc1 $f10, 0x009C($sp) /* 02F5C 808D97CC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 02F60 808D97D0 44818000 */ mtc1 $at, $f16 ## $f16 = 2.00 /* 02F64 808D97D4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 02F68 808D97D8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 02F6C 808D97DC 46100480 */ add.s $f18, $f0, $f16 +/* 02F6C 808D97DC 46100480 */ add.s $f18, $f0, $f16 /* 02F70 808D97E0 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 02F74 808D97E4 E7A2008C */ swc1 $f2, 0x008C($sp) -/* 02F78 808D97E8 E7A20094 */ swc1 $f2, 0x0094($sp) -/* 02F7C 808D97EC E7B200A0 */ swc1 $f18, 0x00A0($sp) -/* 02F80 808D97F0 E7A40090 */ swc1 $f4, 0x0090($sp) +/* 02F74 808D97E4 E7A2008C */ swc1 $f2, 0x008C($sp) +/* 02F78 808D97E8 E7A20094 */ swc1 $f2, 0x0094($sp) +/* 02F7C 808D97EC E7B200A0 */ swc1 $f18, 0x00A0($sp) +/* 02F80 808D97F0 E7A40090 */ swc1 $f4, 0x0090($sp) /* 02F84 808D97F4 C6060208 */ lwc1 $f6, 0x0208($s0) ## 00000208 /* 02F88 808D97F8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02F8C 808D97FC 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 02F90 808D9800 E7A60080 */ swc1 $f6, 0x0080($sp) +/* 02F90 808D9800 E7A60080 */ swc1 $f6, 0x0080($sp) /* 02F94 808D9804 C608020C */ lwc1 $f8, 0x020C($s0) ## 0000020C /* 02F98 808D9808 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02F9C 808D980C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 02FA0 808D9810 460A4401 */ sub.s $f16, $f8, $f10 -/* 02FA4 808D9814 E7B00084 */ swc1 $f16, 0x0084($sp) +/* 02FA0 808D9810 460A4401 */ sub.s $f16, $f8, $f10 +/* 02FA4 808D9814 E7B00084 */ swc1 $f16, 0x0084($sp) /* 02FA8 808D9818 C6120210 */ lwc1 $f18, 0x0210($s0) ## 00000210 /* 02FAC 808D981C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 02FB0 808D9820 E7B20088 */ swc1 $f18, 0x0088($sp) -/* 02FB4 808D9824 4600010D */ trunc.w.s $f4, $f0 + +/* 02FB0 808D9820 E7B20088 */ swc1 $f18, 0x0088($sp) +/* 02FB4 808D9824 4600010D */ trunc.w.s $f4, $f0 /* 02FB8 808D9828 3C0D808E */ lui $t5, %hi(D_808E4D30) ## $t5 = 808E0000 /* 02FBC 808D982C 3C0E808E */ lui $t6, %hi(D_808E4D34) ## $t6 = 808E0000 /* 02FC0 808D9830 25CE4D34 */ addiu $t6, $t6, %lo(D_808E4D34) ## $t6 = 808E4D34 -/* 02FC4 808D9834 44182000 */ mfc1 $t8, $f4 +/* 02FC4 808D9834 44182000 */ mfc1 $t8, $f4 /* 02FC8 808D9838 25AD4D30 */ addiu $t5, $t5, %lo(D_808E4D30) ## $t5 = 808E4D30 /* 02FCC 808D983C 240B0011 */ addiu $t3, $zero, 0x0011 ## $t3 = 00000011 -/* 02FD0 808D9840 0018CC00 */ sll $t9, $t8, 16 -/* 02FD4 808D9844 00194C03 */ sra $t1, $t9, 16 +/* 02FD0 808D9840 0018CC00 */ sll $t9, $t8, 16 +/* 02FD4 808D9844 00194C03 */ sra $t1, $t9, 16 /* 02FD8 808D9848 252A0032 */ addiu $t2, $t1, 0x0032 ## $t2 = 00000032 -/* 02FDC 808D984C AFAA0018 */ sw $t2, 0x0018($sp) -/* 02FE0 808D9850 AFAB0020 */ sw $t3, 0x0020($sp) -/* 02FE4 808D9854 AFAD0010 */ sw $t5, 0x0010($sp) -/* 02FE8 808D9858 AFAE0014 */ sw $t6, 0x0014($sp) -/* 02FEC 808D985C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02FDC 808D984C AFAA0018 */ sw $t2, 0x0018($sp) +/* 02FE0 808D9850 AFAB0020 */ sw $t3, 0x0020($sp) +/* 02FE4 808D9854 AFAD0010 */ sw $t5, 0x0010($sp) +/* 02FE8 808D9858 AFAE0014 */ sw $t6, 0x0014($sp) +/* 02FEC 808D985C 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02FF0 808D9860 27A50080 */ addiu $a1, $sp, 0x0080 ## $a1 = FFFFFFD0 /* 02FF4 808D9864 27A60098 */ addiu $a2, $sp, 0x0098 ## $a2 = FFFFFFE8 /* 02FF8 808D9868 27A7008C */ addiu $a3, $sp, 0x008C ## $a3 = FFFFFFDC -/* 02FFC 808D986C 0C00A0DB */ jal func_8002836C -/* 03000 808D9870 AFA0001C */ sw $zero, 0x001C($sp) -/* 03004 808D9874 87A200AE */ lh $v0, 0x00AE($sp) +/* 02FFC 808D986C 0C00A0DB */ jal func_8002836C +/* 03000 808D9870 AFA0001C */ sw $zero, 0x001C($sp) +/* 03004 808D9874 87A200AE */ lh $v0, 0x00AE($sp) /* 03008 808D9878 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 0300C 808D987C 00021400 */ sll $v0, $v0, 16 -/* 03010 808D9880 00021403 */ sra $v0, $v0, 16 -/* 03014 808D9884 28410028 */ slti $at, $v0, 0x0028 -/* 03018 808D9888 5420FFC2 */ bnel $at, $zero, .L808D9794 +/* 0300C 808D987C 00021400 */ sll $v0, $v0, 16 +/* 03010 808D9880 00021403 */ sra $v0, $v0, 16 +/* 03014 808D9884 28410028 */ slti $at, $v0, 0x0028 +/* 03018 808D9888 5420FFC2 */ bnel $at, $zero, .L808D9794 /* 0301C 808D988C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 .L808D9890: -/* 03020 808D9890 8FA40054 */ lw $a0, 0x0054($sp) -/* 03024 808D9894 0C0295B2 */ jal func_800A56C8 +/* 03020 808D9890 8FA40054 */ lw $a0, 0x0054($sp) +/* 03024 808D9894 0C0295B2 */ jal func_800A56C8 /* 03028 808D9898 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 0302C 808D989C 10400008 */ beq $v0, $zero, .L808D98C0 -/* 03030 808D98A0 8FA40054 */ lw $a0, 0x0054($sp) +/* 0302C 808D989C 10400008 */ beq $v0, $zero, .L808D98C0 +/* 03030 808D98A0 8FA40054 */ lw $a0, 0x0054($sp) /* 03034 808D98A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03038 808D98A8 24A5BE38 */ addiu $a1, $a1, 0xBE38 ## $a1 = 0600BE38 -/* 0303C 808D98AC 0C0294D3 */ jal func_800A534C +/* 0303C 808D98AC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 03040 808D98B0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03044 808D98B4 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 /* 03048 808D98B8 A60C0678 */ sh $t4, 0x0678($s0) ## 00000678 /* 0304C 808D98BC AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808D98C0: -/* 03050 808D98C0 100004AA */ beq $zero, $zero, .L808DAB6C +/* 03050 808D98C0 100004AA */ beq $zero, $zero, .L808DAB6C /* 03054 808D98C4 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D98C8 /* 03058 808D98C8 8E0E0674 */ lw $t6, 0x0674($s0) ## 00000674 /* 0305C 808D98CC 240D000E */ addiu $t5, $zero, 0x000E ## $t5 = 0000000E /* 03060 808D98D0 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 03064 808D98D4 15C10008 */ bne $t6, $at, .L808D98F8 +/* 03064 808D98D4 15C10008 */ bne $t6, $at, .L808D98F8 /* 03068 808D98D8 A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 -/* 0306C 808D98DC 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 0306C 808D98DC 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03070 808D98E0 240570CF */ addiu $a1, $zero, 0x70CF ## $a1 = 000070CF -/* 03074 808D98E4 0C042DA0 */ jal func_8010B680 +/* 03074 808D98E4 0C042DA0 */ jal func_8010B680 /* 03078 808D98E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0307C 808D98EC 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 /* 03080 808D98F0 A60F0678 */ sh $t7, 0x0678($s0) ## 00000678 /* 03084 808D98F4 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808D98F8: -/* 03088 808D98F8 1000049C */ beq $zero, $zero, .L808DAB6C +/* 03088 808D98F8 1000049C */ beq $zero, $zero, .L808DAB6C /* 0308C 808D98FC 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D9900 /* 03090 808D9900 8E190674 */ lw $t9, 0x0674($s0) ## 00000674 /* 03094 808D9904 2418000E */ addiu $t8, $zero, 0x000E ## $t8 = 0000000E /* 03098 808D9908 A21801A0 */ sb $t8, 0x01A0($s0) ## 000001A0 -/* 0309C 808D990C 2F210047 */ sltiu $at, $t9, 0x0047 -/* 030A0 808D9910 1420004E */ bne $at, $zero, .L808D9A4C -/* 030A4 808D9914 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 030A8 808D9918 0C042F6F */ jal func_8010BDBC +/* 0309C 808D990C 2F210047 */ sltiu $at, $t9, 0x0047 +/* 030A0 808D9910 1420004E */ bne $at, $zero, .L808D9A4C +/* 030A4 808D9914 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 030A8 808D9918 0C042F6F */ jal func_8010BDBC /* 030AC 808D991C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 030B0 808D9920 1440004A */ bne $v0, $zero, .L808D9A4C +/* 030B0 808D9920 1440004A */ bne $v0, $zero, .L808D9A4C /* 030B4 808D9924 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 /* 030B8 808D9928 A6090678 */ sh $t1, 0x0678($s0) ## 00000678 /* 030BC 808D992C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 /* 030C0 808D9930 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 030C4 808D9934 24A50298 */ addiu $a1, $a1, 0x0298 ## $a1 = 06010298 -/* 030C8 808D9938 8FA40054 */ lw $a0, 0x0054($sp) -/* 030CC 808D993C 0C029490 */ jal func_800A5240 +/* 030C8 808D9938 8FA40054 */ lw $a0, 0x0054($sp) +/* 030CC 808D993C 0C029490 */ jal func_800A5240 /* 030D0 808D9940 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 030D4 808D9944 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 030D8 808D9948 0C028800 */ jal SkelAnime_GetFrameCount - + /* 030DC 808D994C 24840298 */ addiu $a0, $a0, 0x0298 ## $a0 = 06010298 /* 030E0 808D9950 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 030E4 808D9954 C61001FC */ lwc1 $f16, 0x01FC($s0) ## 000001FC /* 030E8 808D9958 C60E0200 */ lwc1 $f14, 0x0200($s0) ## 00000200 -/* 030EC 808D995C 468094A0 */ cvt.s.w $f18, $f18 +/* 030EC 808D995C 468094A0 */ cvt.s.w $f18, $f18 /* 030F0 808D9960 C60C0680 */ lwc1 $f12, 0x0680($s0) ## 00000680 /* 030F4 808D9964 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 030F8 808D9968 44815000 */ mtc1 $at, $f10 ## $f10 = 12.00 @@ -431,60 +431,60 @@ glabel L808D9900 /* 03104 808D9974 44813000 */ mtc1 $at, $f6 ## $f6 = 7.00 /* 03108 808D9978 E61201CC */ swc1 $f18, 0x01CC($s0) ## 000001CC /* 0310C 808D997C 3C01808F */ lui $at, %hi(D_808F7F44) ## $at = 808F0000 -/* 03110 808D9980 46066301 */ sub.s $f12, $f12, $f6 -/* 03114 808D9984 C4327F44 */ lwc1 $f18, %lo(D_808F7F44)($at) +/* 03110 808D9980 46066301 */ sub.s $f12, $f12, $f6 +/* 03114 808D9984 C4327F44 */ lwc1 $f18, %lo(D_808F7F44)($at) /* 03118 808D9988 C6040688 */ lwc1 $f4, 0x0688($s0) ## 00000688 /* 0311C 808D998C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 03120 808D9990 44811000 */ mtc1 $at, $f2 ## $f2 = 70.00 -/* 03124 808D9994 46006305 */ abs.s $f12, $f12 -/* 03128 808D9998 460A4201 */ sub.s $f8, $f8, $f10 +/* 03124 808D9994 46006305 */ abs.s $f12, $f12 +/* 03128 808D9998 460A4201 */ sub.s $f8, $f8, $f10 /* 0312C 808D999C E60206C4 */ swc1 $f2, 0x06C4($s0) ## 000006C4 /* 03130 808D99A0 C60206C4 */ lwc1 $f2, 0x06C4($s0) ## 000006C4 /* 03134 808D99A4 C6000204 */ lwc1 $f0, 0x0204($s0) ## 00000204 /* 03138 808D99A8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0313C 808D99AC 46004205 */ abs.s $f8, $f8 -/* 03140 808D99B0 46022081 */ sub.s $f2, $f4, $f2 +/* 0313C 808D99AC 46004205 */ abs.s $f8, $f8 +/* 03140 808D99B0 46022081 */ sub.s $f2, $f4, $f2 /* 03144 808D99B4 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 03148 808D99B8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0314C 808D99BC E60006DC */ swc1 $f0, 0x06DC($s0) ## 000006DC -/* 03150 808D99C0 46048101 */ sub.s $f4, $f16, $f4 +/* 03150 808D99C0 46048101 */ sub.s $f4, $f16, $f4 /* 03154 808D99C4 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 /* 03158 808D99C8 C600068C */ lwc1 $f0, 0x068C($s0) ## 0000068C /* 0315C 808D99CC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 03160 808D99D0 46107400 */ add.s $f16, $f14, $f16 +/* 03160 808D99D0 46107400 */ add.s $f16, $f14, $f16 /* 03164 808D99D4 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 /* 03168 808D99D8 E60406D4 */ swc1 $f4, 0x06D4($s0) ## 000006D4 /* 0316C 808D99DC C60406D4 */ lwc1 $f4, 0x06D4($s0) ## 000006D4 -/* 03170 808D99E0 460E8381 */ sub.s $f14, $f16, $f14 +/* 03170 808D99E0 460E8381 */ sub.s $f14, $f16, $f14 /* 03174 808D99E4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 03178 808D99E8 E61206F0 */ swc1 $f18, 0x06F0($s0) ## 000006F0 /* 0317C 808D99EC C6120690 */ lwc1 $f18, 0x0690($s0) ## 00000690 -/* 03180 808D99F0 46001085 */ abs.s $f2, $f2 -/* 03184 808D99F4 46040101 */ sub.s $f4, $f0, $f4 +/* 03180 808D99F0 46001085 */ abs.s $f2, $f2 +/* 03184 808D99F4 46040101 */ sub.s $f4, $f0, $f4 /* 03188 808D99F8 E60E06D8 */ swc1 $f14, 0x06D8($s0) ## 000006D8 /* 0318C 808D99FC C60E06D8 */ lwc1 $f14, 0x06D8($s0) ## 000006D8 /* 03190 808D9A00 C6000694 */ lwc1 $f0, 0x0694($s0) ## 00000694 -/* 03194 808D9A04 46002105 */ abs.s $f4, $f4 -/* 03198 808D9A08 460E9381 */ sub.s $f14, $f18, $f14 +/* 03194 808D9A04 46002105 */ abs.s $f4, $f4 +/* 03198 808D9A08 460E9381 */ sub.s $f14, $f18, $f14 /* 0319C 808D9A0C C61206DC */ lwc1 $f18, 0x06DC($s0) ## 000006DC /* 031A0 808D9A10 E61006EC */ swc1 $f16, 0x06EC($s0) ## 000006EC /* 031A4 808D9A14 E60606BC */ swc1 $f6, 0x06BC($s0) ## 000006BC -/* 031A8 808D9A18 46007385 */ abs.s $f14, $f14 -/* 031AC 808D9A1C 46120481 */ sub.s $f18, $f0, $f18 +/* 031A8 808D9A18 46007385 */ abs.s $f14, $f14 +/* 031AC 808D9A1C 46120481 */ sub.s $f18, $f0, $f18 /* 031B0 808D9A20 E60A06C0 */ swc1 $f10, 0x06C0($s0) ## 000006C0 /* 031B4 808D9A24 E60C06A4 */ swc1 $f12, 0x06A4($s0) ## 000006A4 /* 031B8 808D9A28 E60806A8 */ swc1 $f8, 0x06A8($s0) ## 000006A8 -/* 031BC 808D9A2C 46009485 */ abs.s $f18, $f18 +/* 031BC 808D9A2C 46009485 */ abs.s $f18, $f18 /* 031C0 808D9A30 E60206AC */ swc1 $f2, 0x06AC($s0) ## 000006AC /* 031C4 808D9A34 E60406B0 */ swc1 $f4, 0x06B0($s0) ## 000006B0 /* 031C8 808D9A38 E60E06B4 */ swc1 $f14, 0x06B4($s0) ## 000006B4 /* 031CC 808D9A3C E61206B8 */ swc1 $f18, 0x06B8($s0) ## 000006B8 /* 031D0 808D9A40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 031D4 808D9A44 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 031D8 808D9A48 240539D3 */ addiu $a1, $zero, 0x39D3 ## $a1 = 000039D3 .L808D9A4C: -/* 031DC 808D9A4C 10000447 */ beq $zero, $zero, .L808DAB6C +/* 031DC 808D9A4C 10000447 */ beq $zero, $zero, .L808DAB6C /* 031E0 808D9A50 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D9A54 /* 031E4 808D9A54 240A000E */ addiu $t2, $zero, 0x000E ## $t2 = 0000000E @@ -492,21 +492,21 @@ glabel L808D9A54 /* 031EC 808D9A5C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 031F0 808D9A60 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 /* 031F4 808D9A64 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 -/* 031F8 808D9A68 A3AB00AD */ sb $t3, 0x00AD($sp) +/* 031F8 808D9A68 A3AB00AD */ sb $t3, 0x00AD($sp) /* 031FC 808D9A6C 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 03200 808D9A70 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD /* 03204 808D9A74 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC /* 03208 808D9A78 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0320C 808D9A7C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03210 808D9A80 8FA40054 */ lw $a0, 0x0054($sp) -/* 03214 808D9A84 0C0295B2 */ jal func_800A56C8 +/* 03210 808D9A80 8FA40054 */ lw $a0, 0x0054($sp) +/* 03214 808D9A84 0C0295B2 */ jal func_800A56C8 /* 03218 808D9A88 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 0321C 808D9A8C 10400014 */ beq $v0, $zero, .L808D9AE0 -/* 03220 808D9A90 8FA40054 */ lw $a0, 0x0054($sp) +/* 0321C 808D9A8C 10400014 */ beq $v0, $zero, .L808D9AE0 +/* 03220 808D9A90 8FA40054 */ lw $a0, 0x0054($sp) /* 03224 808D9A94 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03228 808D9A98 24A50514 */ addiu $a1, $a1, 0x0514 ## $a1 = 06010514 -/* 0322C 808D9A9C 0C0294D3 */ jal func_800A534C +/* 0322C 808D9A9C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 03230 808D9AA0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03234 808D9AA4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 03238 808D9AA8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -519,33 +519,33 @@ glabel L808D9A54 /* 03254 808D9AC4 A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 /* 03258 808D9AC8 E6000508 */ swc1 $f0, 0x0508($s0) ## 00000508 /* 0325C 808D9ACC E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC -/* 03260 808D9AD0 8FAE00B4 */ lw $t6, 0x00B4($sp) +/* 03260 808D9AD0 8FAE00B4 */ lw $t6, 0x00B4($sp) /* 03264 808D9AD4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03268 808D9AD8 002E0821 */ addu $at, $at, $t6 +/* 03268 808D9AD8 002E0821 */ addu $at, $at, $t6 /* 0326C 808D9ADC E4200AFC */ swc1 $f0, 0x0AFC($at) ## 00010AFC .L808D9AE0: -/* 03270 808D9AE0 10000422 */ beq $zero, $zero, .L808DAB6C +/* 03270 808D9AE0 10000422 */ beq $zero, $zero, .L808DAB6C /* 03274 808D9AE4 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D9AE8 /* 03278 808D9AE8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 0327C 808D9AEC 8FAF00B4 */ lw $t7, 0x00B4($sp) +/* 0327C 808D9AEC 8FAF00B4 */ lw $t7, 0x00B4($sp) /* 03280 808D9AF0 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 03284 808D9AF4 2C61000A */ sltiu $at, $v1, 0x000A -/* 03288 808D9AF8 50200007 */ beql $at, $zero, .L808D9B18 +/* 03284 808D9AF4 2C61000A */ sltiu $at, $v1, 0x000A +/* 03288 808D9AF8 50200007 */ beql $at, $zero, .L808D9B18 /* 0328C 808D9AFC 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 03290 808D9B00 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 03294 808D9B04 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03298 808D9B08 002F0821 */ addu $at, $at, $t7 +/* 03298 808D9B08 002F0821 */ addu $at, $at, $t7 /* 0329C 808D9B0C E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC /* 032A0 808D9B10 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 032A4 808D9B14 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E .L808D9B18: -/* 032A8 808D9B18 54610028 */ bnel $v1, $at, .L808D9BBC +/* 032A8 808D9B18 54610028 */ bnel $v1, $at, .L808D9BBC /* 032AC 808D9B1C 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F /* 032B0 808D9B20 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 032B4 808D9B24 A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 032B8 808D9B28 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 032BC 808D9B2C 10000022 */ beq $zero, $zero, .L808D9BB8 +/* 032BC 808D9B2C 10000022 */ beq $zero, $zero, .L808D9BB8 /* 032C0 808D9B30 E60A070C */ swc1 $f10, 0x070C($s0) ## 0000070C glabel L808D9B34 /* 032C4 808D9B34 3C01C270 */ lui $at, 0xC270 ## $at = C2700000 @@ -557,17 +557,17 @@ glabel L808D9B34 /* 032DC 808D9B4C 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 /* 032E0 808D9B50 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 032E4 808D9B54 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 -/* 032E8 808D9B58 00800821 */ addu $at, $a0, $zero -/* 032EC 808D9B5C 00042080 */ sll $a0, $a0, 2 -/* 032F0 808D9B60 00812023 */ subu $a0, $a0, $at -/* 032F4 808D9B64 000420C0 */ sll $a0, $a0, 3 -/* 032F8 808D9B68 00812021 */ addu $a0, $a0, $at -/* 032FC 808D9B6C 00042080 */ sll $a0, $a0, 2 +/* 032E8 808D9B58 00800821 */ addu $at, $a0, $zero +/* 032EC 808D9B5C 00042080 */ sll $a0, $a0, 2 +/* 032F0 808D9B60 00812023 */ subu $a0, $a0, $at +/* 032F4 808D9B64 000420C0 */ sll $a0, $a0, 3 +/* 032F8 808D9B68 00812021 */ addu $a0, $a0, $at +/* 032FC 808D9B6C 00042080 */ sll $a0, $a0, 2 /* 03300 808D9B70 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03304 808D9B74 00812023 */ subu $a0, $a0, $at -/* 03308 808D9B78 00042200 */ sll $a0, $a0, 8 -/* 0330C 808D9B7C 00042400 */ sll $a0, $a0, 16 -/* 03310 808D9B80 00042403 */ sra $a0, $a0, 16 +/* 03304 808D9B74 00812023 */ subu $a0, $a0, $at +/* 03308 808D9B78 00042200 */ sll $a0, $a0, 8 +/* 0330C 808D9B7C 00042400 */ sll $a0, $a0, 16 +/* 03310 808D9B80 00042403 */ sra $a0, $a0, 16 /* 03314 808D9B84 E6100680 */ swc1 $f16, 0x0680($s0) ## 00000680 /* 03318 808D9B88 E6120684 */ swc1 $f18, 0x0684($s0) ## 00000684 /* 0331C 808D9B8C E6040688 */ swc1 $f4, 0x0688($s0) ## 00000688 @@ -577,10 +577,10 @@ glabel L808D9B34 ## sins? /* 0332C 808D9B9C E6000690 */ swc1 $f0, 0x0690($s0) ## 00000690 /* 03330 808D9BA0 3C01808F */ lui $at, %hi(D_808F7F48) ## $at = 808F0000 -/* 03334 808D9BA4 C4287F48 */ lwc1 $f8, %lo(D_808F7F48)($at) +/* 03334 808D9BA4 C4287F48 */ lwc1 $f8, %lo(D_808F7F48)($at) /* 03338 808D9BA8 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 0333C 808D9BAC 46080282 */ mul.s $f10, $f0, $f8 -/* 03340 808D9BB0 0C01E221 */ jal func_80078884 +/* 0333C 808D9BAC 46080282 */ mul.s $f10, $f0, $f8 +/* 03340 808D9BB0 0C01E221 */ jal func_80078884 /* 03344 808D9BB4 E60A070C */ swc1 $f10, 0x070C($s0) ## 0000070C .L808D9BB8: /* 03348 808D9BB8 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F @@ -588,18 +588,18 @@ glabel L808D9B34 /* 0334C 808D9BBC A21901A0 */ sb $t9, 0x01A0($s0) ## 000001A0 /* 03350 808D9BC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03354 808D9BC4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03358 808D9BC8 24053163 */ addiu $a1, $zero, 0x3163 ## $a1 = 00003163 /* 0335C 808D9BCC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 03360 808D9BD0 2403000A */ addiu $v1, $zero, 0x000A ## $v1 = 0000000A .L808D9BD4: -/* 03364 808D9BD4 00024840 */ sll $t1, $v0, 1 +/* 03364 808D9BD4 00024840 */ sll $t1, $v0, 1 /* 03368 808D9BD8 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000002 -/* 0336C 808D9BDC 00021400 */ sll $v0, $v0, 16 -/* 03370 808D9BE0 00021403 */ sra $v0, $v0, 16 -/* 03374 808D9BE4 2841000F */ slti $at, $v0, 0x000F -/* 03378 808D9BE8 02095021 */ addu $t2, $s0, $t1 -/* 0337C 808D9BEC 1420FFF9 */ bne $at, $zero, .L808D9BD4 +/* 0336C 808D9BDC 00021400 */ sll $v0, $v0, 16 +/* 03370 808D9BE0 00021403 */ sra $v0, $v0, 16 +/* 03374 808D9BE4 2841000F */ slti $at, $v0, 0x000F +/* 03378 808D9BE8 02095021 */ addu $t2, $s0, $t1 +/* 0337C 808D9BEC 1420FFF9 */ bne $at, $zero, .L808D9BD4 /* 03380 808D9BF0 A54304E4 */ sh $v1, 0x04E4($t2) ## 000004E4 /* 03384 808D9BF4 240B4E20 */ addiu $t3, $zero, 0x4E20 ## $t3 = 00004E20 /* 03388 808D9BF8 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -609,12 +609,12 @@ glabel L808D9B34 /* 03398 808D9C08 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 0339C 808D9C0C 26040508 */ addiu $a0, $s0, 0x0508 ## $a0 = 00000508 /* 033A0 808D9C10 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 033A4 808D9C14 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 033A8 808D9C18 8E0C0674 */ lw $t4, 0x0674($s0) ## 00000674 /* 033AC 808D9C1C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 033B0 808D9C20 240D0009 */ addiu $t5, $zero, 0x0009 ## $t5 = 00000009 -/* 033B4 808D9C24 15810019 */ bne $t4, $at, .L808D9C8C +/* 033B4 808D9C24 15810019 */ bne $t4, $at, .L808D9C8C /* 033B8 808D9C28 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 /* 033BC 808D9C2C 44818000 */ mtc1 $at, $f16 ## $f16 = -30.00 /* 033C0 808D9C30 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -641,114 +641,114 @@ glabel L808D9B34 /* 03414 808D9C84 E61006EC */ swc1 $f16, 0x06EC($s0) ## 000006EC /* 03418 808D9C88 E6120710 */ swc1 $f18, 0x0710($s0) ## 00000710 .L808D9C8C: -/* 0341C 808D9C8C 100003B7 */ beq $zero, $zero, .L808DAB6C +/* 0341C 808D9C8C 100003B7 */ beq $zero, $zero, .L808DAB6C /* 03420 808D9C90 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D9C94 /* 03424 808D9C94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03428 808D9C98 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0342C 808D9C9C 24053163 */ addiu $a1, $zero, 0x3163 ## $a1 = 00003163 /* 03430 808D9CA0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03434 808D9CA4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03438 808D9CA8 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 0343C 808D9CAC 14610004 */ bne $v1, $at, .L808D9CC0 +/* 03438 808D9CA8 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 0343C 808D9CAC 14610004 */ bne $v1, $at, .L808D9CC0 /* 03440 808D9CB0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03444 808D9CB4 0C00B7D5 */ jal func_8002DF54 +/* 03444 808D9CB4 0C00B7D5 */ jal func_8002DF54 /* 03448 808D9CB8 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 /* 0344C 808D9CBC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D9CC0: -/* 03450 808D9CC0 2C610033 */ sltiu $at, $v1, 0x0033 -/* 03454 808D9CC4 1420003A */ bne $at, $zero, .L808D9DB0 +/* 03450 808D9CC0 2C610033 */ sltiu $at, $v1, 0x0033 +/* 03454 808D9CC4 1420003A */ bne $at, $zero, .L808D9DB0 /* 03458 808D9CC8 26040710 */ addiu $a0, $s0, 0x0710 ## $a0 = 00000710 /* 0345C 808D9CCC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03460 808D9CD0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 03464 808D9CD4 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 03468 808D9CD8 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 0346C 808D9CDC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 03470 808D9CE0 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 03474 808D9CE4 C60406EC */ lwc1 $f4, 0x06EC($s0) ## 000006EC /* 03478 808D9CE8 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 0347C 808D9CEC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 03480 808D9CF0 46062202 */ mul.s $f8, $f4, $f6 +/* 03480 808D9CF0 46062202 */ mul.s $f8, $f4, $f6 /* 03484 808D9CF4 26040680 */ addiu $a0, $s0, 0x0680 ## $a0 = 00000680 /* 03488 808D9CF8 3C054387 */ lui $a1, 0x4387 ## $a1 = 43870000 -/* 0348C 808D9CFC 44074000 */ mfc1 $a3, $f8 +/* 0348C 808D9CFC 44074000 */ mfc1 $a3, $f8 /* 03490 808D9D00 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03494 808D9D04 00000000 */ nop /* 03498 808D9D08 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0349C 808D9D0C 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 /* 034A0 808D9D10 C60A06EC */ lwc1 $f10, 0x06EC($s0) ## 000006EC /* 034A4 808D9D14 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 034A8 808D9D18 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 034AC 808D9D1C 46105482 */ mul.s $f18, $f10, $f16 +/* 034AC 808D9D1C 46105482 */ mul.s $f18, $f10, $f16 /* 034B0 808D9D20 26040688 */ addiu $a0, $s0, 0x0688 ## $a0 = 00000688 /* 034B4 808D9D24 3C054382 */ lui $a1, 0x4382 ## $a1 = 43820000 -/* 034B8 808D9D28 44079000 */ mfc1 $a3, $f18 +/* 034B8 808D9D28 44079000 */ mfc1 $a3, $f18 /* 034BC 808D9D2C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 034C0 808D9D30 00000000 */ nop /* 034C4 808D9D34 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 034C8 808D9D38 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 /* 034CC 808D9D3C C60406EC */ lwc1 $f4, 0x06EC($s0) ## 000006EC /* 034D0 808D9D40 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 034D4 808D9D44 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 034D8 808D9D48 46062202 */ mul.s $f8, $f4, $f6 +/* 034D8 808D9D48 46062202 */ mul.s $f8, $f4, $f6 /* 034DC 808D9D4C 26040690 */ addiu $a0, $s0, 0x0690 ## $a0 = 00000690 /* 034E0 808D9D50 3C0542CE */ lui $a1, 0x42CE ## $a1 = 42CE0000 -/* 034E4 808D9D54 44074000 */ mfc1 $a3, $f8 +/* 034E4 808D9D54 44074000 */ mfc1 $a3, $f8 /* 034E8 808D9D58 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 034EC 808D9D5C 00000000 */ nop /* 034F0 808D9D60 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 034F4 808D9D64 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 /* 034F8 808D9D68 C60A06EC */ lwc1 $f10, 0x06EC($s0) ## 000006EC /* 034FC 808D9D6C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 03500 808D9D70 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 03504 808D9D74 46105482 */ mul.s $f18, $f10, $f16 +/* 03504 808D9D74 46105482 */ mul.s $f18, $f10, $f16 /* 03508 808D9D78 26040694 */ addiu $a0, $s0, 0x0694 ## $a0 = 00000694 /* 0350C 808D9D7C 3C05438C */ lui $a1, 0x438C ## $a1 = 438C0000 -/* 03510 808D9D80 44079000 */ mfc1 $a3, $f18 +/* 03510 808D9D80 44079000 */ mfc1 $a3, $f18 /* 03514 808D9D84 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03518 808D9D88 00000000 */ nop /* 0351C 808D9D8C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03520 808D9D90 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 03524 808D9D94 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 03528 808D9D98 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A -/* 0352C 808D9D9C 44050000 */ mfc1 $a1, $f0 -/* 03530 808D9DA0 44060000 */ mfc1 $a2, $f0 +/* 0352C 808D9D9C 44050000 */ mfc1 $a1, $f0 +/* 03530 808D9DA0 44060000 */ mfc1 $a2, $f0 /* 03534 808D9DA4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03538 808D9DA8 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC /* 0353C 808D9DAC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D9DB0: -/* 03540 808D9DB0 00032080 */ sll $a0, $v1, 2 -/* 03544 808D9DB4 00832023 */ subu $a0, $a0, $v1 -/* 03548 808D9DB8 000420C0 */ sll $a0, $a0, 3 -/* 0354C 808D9DBC 00832021 */ addu $a0, $a0, $v1 -/* 03550 808D9DC0 00042080 */ sll $a0, $a0, 2 -/* 03554 808D9DC4 00832023 */ subu $a0, $a0, $v1 -/* 03558 808D9DC8 00042200 */ sll $a0, $a0, 8 -/* 0355C 808D9DCC 00042400 */ sll $a0, $a0, 16 +/* 03540 808D9DB0 00032080 */ sll $a0, $v1, 2 +/* 03544 808D9DB4 00832023 */ subu $a0, $a0, $v1 +/* 03548 808D9DB8 000420C0 */ sll $a0, $a0, 3 +/* 0354C 808D9DBC 00832021 */ addu $a0, $a0, $v1 +/* 03550 808D9DC0 00042080 */ sll $a0, $a0, 2 +/* 03554 808D9DC4 00832023 */ subu $a0, $a0, $v1 +/* 03558 808D9DC8 00042200 */ sll $a0, $a0, 8 +/* 0355C 808D9DCC 00042400 */ sll $a0, $a0, 16 /* 03560 808D9DD0 0C01DE1C */ jal Math_Sins ## sins? -/* 03564 808D9DD4 00042403 */ sra $a0, $a0, 16 +/* 03564 808D9DD4 00042403 */ sra $a0, $a0, 16 /* 03568 808D9DD8 C6040710 */ lwc1 $f4, 0x0710($s0) ## 00000710 /* 0356C 808D9DDC 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 03570 808D9DE0 46040182 */ mul.s $f6, $f0, $f4 -/* 03574 808D9DE4 0C01E221 */ jal func_80078884 +/* 03570 808D9DE0 46040182 */ mul.s $f6, $f0, $f4 +/* 03574 808D9DE4 0C01E221 */ jal func_80078884 /* 03578 808D9DE8 E606070C */ swc1 $f6, 0x070C($s0) ## 0000070C /* 0357C 808D9DEC 8E0E0674 */ lw $t6, 0x0674($s0) ## 00000674 /* 03580 808D9DF0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 03584 808D9DF4 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 03588 808D9DF8 2DC10064 */ sltiu $at, $t6, 0x0064 -/* 0358C 808D9DFC 10200005 */ beq $at, $zero, .L808D9E14 +/* 03588 808D9DF8 2DC10064 */ sltiu $at, $t6, 0x0064 +/* 0358C 808D9DFC 10200005 */ beq $at, $zero, .L808D9E14 /* 03590 808D9E00 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 03594 808D9E04 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F /* 03598 808D9E08 A20F071B */ sb $t7, 0x071B($s0) ## 0000071B -/* 0359C 808D9E0C 10000003 */ beq $zero, $zero, .L808D9E1C +/* 0359C 808D9E0C 10000003 */ beq $zero, $zero, .L808D9E1C /* 035A0 808D9E10 A21801A0 */ sb $t8, 0x01A0($s0) ## 000001A0 .L808D9E14: /* 035A4 808D9E14 A21901A0 */ sb $t9, 0x01A0($s0) ## 000001A0 @@ -757,96 +757,96 @@ glabel L808D9C94 /* 035AC 808D9E1C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 035B0 808D9E20 26040714 */ addiu $a0, $s0, 0x0714 ## $a0 = 00000714 /* 035B4 808D9E24 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 035B8 808D9E28 2C610082 */ sltiu $at, $v1, 0x0082 -/* 035BC 808D9E2C 14200004 */ bne $at, $zero, .L808D9E40 +/* 035B8 808D9E28 2C610082 */ sltiu $at, $v1, 0x0082 +/* 035BC 808D9E2C 14200004 */ bne $at, $zero, .L808D9E40 /* 035C0 808D9E30 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 035C4 808D9E34 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 035C8 808D9E38 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 035CC 808D9E3C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D9E40: /* 035D0 808D9E40 240100B4 */ addiu $at, $zero, 0x00B4 ## $at = 000000B4 -/* 035D4 808D9E44 1461000F */ bne $v1, $at, .L808D9E84 -/* 035D8 808D9E48 8FAB00B4 */ lw $t3, 0x00B4($sp) +/* 035D4 808D9E44 1461000F */ bne $v1, $at, .L808D9E84 +/* 035D8 808D9E48 8FAB00B4 */ lw $t3, 0x00B4($sp) /* 035DC 808D9E4C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 035E0 808D9E50 002B0821 */ addu $at, $at, $t3 +/* 035E0 808D9E50 002B0821 */ addu $at, $at, $t3 /* 035E4 808D9E54 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 /* 035E8 808D9E58 A02A1E15 */ sb $t2, 0x1E15($at) ## 00011E15 -/* 035EC 808D9E5C 8FAD00B4 */ lw $t5, 0x00B4($sp) +/* 035EC 808D9E5C 8FAD00B4 */ lw $t5, 0x00B4($sp) /* 035F0 808D9E60 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 035F4 808D9E64 240C043F */ addiu $t4, $zero, 0x043F ## $t4 = 0000043F -/* 035F8 808D9E68 002D0821 */ addu $at, $at, $t5 +/* 035F8 808D9E68 002D0821 */ addu $at, $at, $t5 /* 035FC 808D9E6C A42C1E1A */ sh $t4, 0x1E1A($at) ## 00011E1A -/* 03600 808D9E70 8FAF00B4 */ lw $t7, 0x00B4($sp) +/* 03600 808D9E70 8FAF00B4 */ lw $t7, 0x00B4($sp) /* 03604 808D9E74 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03608 808D9E78 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 0360C 808D9E7C 002F0821 */ addu $at, $at, $t7 +/* 0360C 808D9E7C 002F0821 */ addu $at, $at, $t7 /* 03610 808D9E80 A02E1E5E */ sb $t6, 0x1E5E($at) ## 00011E5E .L808D9E84: -/* 03614 808D9E84 10000339 */ beq $zero, $zero, .L808DAB6C +/* 03614 808D9E84 10000339 */ beq $zero, $zero, .L808DAB6C /* 03618 808D9E88 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D9E8C -/* 0361C 808D9E8C 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 03620 808D9E90 0C019148 */ jal func_80064520 +/* 0361C 808D9E8C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03620 808D9E90 0C019148 */ jal func_80064520 /* 03624 808D9E94 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 03628 808D9E98 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03628 808D9E98 8FA400B4 */ lw $a0, 0x00B4($sp) /* 0362C 808D9E9C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03630 808D9EA0 0C00B7D5 */ jal func_8002DF54 +/* 03630 808D9EA0 0C00B7D5 */ jal func_8002DF54 /* 03634 808D9EA4 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 03638 808D9EA8 0C03008C */ jal func_800C0230 -/* 0363C 808D9EAC 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03638 808D9EA8 0C03008C */ jal func_800C0230 +/* 0363C 808D9EAC 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03640 808D9EB0 A602067A */ sh $v0, 0x067A($s0) ## 0000067A -/* 03644 808D9EB4 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03644 808D9EB4 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03648 808D9EB8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0364C 808D9EBC 0C0300C5 */ jal func_800C0314 +/* 0364C 808D9EBC 0C0300C5 */ jal func_800C0314 /* 03650 808D9EC0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 03654 808D9EC4 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03654 808D9EC4 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03658 808D9EC8 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 0365C 808D9ECC 0C0300C5 */ jal func_800C0314 +/* 0365C 808D9ECC 0C0300C5 */ jal func_800C0314 /* 03660 808D9ED0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03664 808D9ED4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03668 808D9ED8 24A5ADDC */ addiu $a1, $a1, 0xADDC ## $a1 = 0600ADDC -/* 0366C 808D9EDC 8FA40054 */ lw $a0, 0x0054($sp) -/* 03670 808D9EE0 0C029490 */ jal func_800A5240 +/* 0366C 808D9EDC 8FA40054 */ lw $a0, 0x0054($sp) +/* 03670 808D9EE0 0C029490 */ jal func_800A5240 /* 03674 808D9EE4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03678 808D9EE8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0367C 808D9EEC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03680 808D9EF0 2484EA00 */ addiu $a0, $a0, 0xEA00 ## $a0 = 0600EA00 /* 03684 808D9EF4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 03688 808D9EF8 8FA600B4 */ lw $a2, 0x00B4($sp) +/* 03688 808D9EF8 8FA600B4 */ lw $a2, 0x00B4($sp) /* 0368C 808D9EFC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03690 808D9F00 468042A0 */ cvt.s.w $f10, $f8 +/* 03690 808D9F00 468042A0 */ cvt.s.w $f10, $f8 /* 03694 808D9F04 24180065 */ addiu $t8, $zero, 0x0065 ## $t8 = 00000065 /* 03698 808D9F08 A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 0369C 808D9F0C E600016C */ swc1 $f0, 0x016C($s0) ## 0000016C /* 036A0 808D9F10 3C01808F */ lui $at, %hi(D_808F7F4C) ## $at = 808F0000 /* 036A4 808D9F14 24192000 */ addiu $t9, $zero, 0x2000 ## $t9 = 00002000 /* 036A8 808D9F18 E60A01CC */ swc1 $f10, 0x01CC($s0) ## 000001CC -/* 036AC 808D9F1C C4307F4C */ lwc1 $f16, %lo(D_808F7F4C)($at) -/* 036B0 808D9F20 AFB90028 */ sw $t9, 0x0028($sp) -/* 036B4 808D9F24 AFA00024 */ sw $zero, 0x0024($sp) -/* 036B8 808D9F28 AFA00020 */ sw $zero, 0x0020($sp) -/* 036BC 808D9F2C AFA0001C */ sw $zero, 0x001C($sp) +/* 036AC 808D9F1C C4307F4C */ lwc1 $f16, %lo(D_808F7F4C)($at) +/* 036B0 808D9F20 AFB90028 */ sw $t9, 0x0028($sp) +/* 036B4 808D9F24 AFA00024 */ sw $zero, 0x0024($sp) +/* 036B8 808D9F28 AFA00020 */ sw $zero, 0x0020($sp) +/* 036BC 808D9F2C AFA0001C */ sw $zero, 0x001C($sp) /* 036C0 808D9F30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 036C4 808D9F34 24070179 */ addiu $a3, $zero, 0x0179 ## $a3 = 00000179 /* 036C8 808D9F38 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 036CC 808D9F3C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 036D0 808D9F40 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 036CC 808D9F3C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 036D0 808D9F40 E7A00010 */ swc1 $f0, 0x0010($sp) /* 036D4 808D9F44 0C00C916 */ jal Actor_SpawnAttached - -/* 036D8 808D9F48 E7B00014 */ swc1 $f16, 0x0014($sp) + +/* 036D8 808D9F48 E7B00014 */ swc1 $f16, 0x0014($sp) /* 036DC 808D9F4C 3C01C3EC */ lui $at, 0xC3EC ## $at = C3EC0000 /* 036E0 808D9F50 44810000 */ mtc1 $at, $f0 ## $f0 = -472.00 /* 036E4 808D9F54 3C01808F */ lui $at, %hi(D_808F7F50) ## $at = 808F0000 -/* 036E8 808D9F58 C4227F50 */ lwc1 $f2, %lo(D_808F7F50)($at) -/* 036EC 808D9F5C 8FA400A8 */ lw $a0, 0x00A8($sp) +/* 036E8 808D9F58 C4227F50 */ lwc1 $f2, %lo(D_808F7F50)($at) +/* 036EC 808D9F5C 8FA400A8 */ lw $a0, 0x00A8($sp) /* 036F0 808D9F60 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 036F4 808D9F64 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 /* 036F8 808D9F68 AD020000 */ sw $v0, 0x0000($t0) ## 808F93D4 /* 036FC 808D9F6C 3C01808F */ lui $at, %hi(D_808F7F54) ## $at = 808F0000 /* 03700 808D9F70 E4800024 */ swc1 $f0, 0x0024($a0) ## 00000024 -/* 03704 808D9F74 C4327F54 */ lwc1 $f18, %lo(D_808F7F54)($at) +/* 03704 808D9F74 C4327F54 */ lwc1 $f18, %lo(D_808F7F54)($at) /* 03708 808D9F78 3C01C302 */ lui $at, 0xC302 ## $at = C3020000 /* 0370C 808D9F7C 44812000 */ mtc1 $at, $f4 ## $f4 = -130.00 /* 03710 808D9F80 24098000 */ addiu $t1, $zero, 0x8000 ## $t1 = FFFF8000 @@ -855,13 +855,13 @@ glabel L808D9E8C /* 0371C 808D9F8C E484002C */ swc1 $f4, 0x002C($a0) ## 0000002C /* 03720 808D9F90 3C01808F */ lui $at, %hi(D_808F7F58) ## $at = 808F0000 /* 03724 808D9F94 E6000024 */ swc1 $f0, 0x0024($s0) ## 00000024 -/* 03728 808D9F98 C4267F58 */ lwc1 $f6, %lo(D_808F7F58)($at) +/* 03728 808D9F98 C4267F58 */ lwc1 $f6, %lo(D_808F7F58)($at) /* 0372C 808D9F9C 3C01C3C8 */ lui $at, 0xC3C8 ## $at = C3C80000 /* 03730 808D9FA0 44814000 */ mtc1 $at, $f8 ## $f8 = -400.00 /* 03734 808D9FA4 3C01808F */ lui $at, %hi(D_808F7F5C) ## $at = 808F0000 /* 03738 808D9FA8 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 0373C 808D9FAC E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 03740 808D9FB0 C42A7F5C */ lwc1 $f10, %lo(D_808F7F5C)($at) +/* 03740 808D9FB0 C42A7F5C */ lwc1 $f10, %lo(D_808F7F5C)($at) /* 03744 808D9FB4 3C01C320 */ lui $at, 0xC320 ## $at = C3200000 /* 03748 808D9FB8 44818000 */ mtc1 $at, $f16 ## $f16 = -160.00 /* 0374C 808D9FBC 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 @@ -894,7 +894,7 @@ glabel L808D9E8C /* 037B8 808DA028 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 037BC 808DA02C E5AA16D0 */ swc1 $f10, 0x16D0($t5) ## 000016D0 /* 037C0 808DA030 8C6E0000 */ lw $t6, 0x0000($v1) ## 808F93C0 -/* 037C4 808DA034 C4307F60 */ lwc1 $f16, %lo(D_808F7F60)($at) +/* 037C4 808DA034 C4307F60 */ lwc1 $f16, %lo(D_808F7F60)($at) /* 037C8 808DA038 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 037CC 808DA03C 44819000 */ mtc1 $at, $f18 ## $f18 = 255.00 /* 037D0 808DA040 E5D016AC */ swc1 $f16, 0x16AC($t6) ## 000016AC @@ -903,72 +903,72 @@ glabel L808D9E8C /* 037DC 808DA04C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 037E0 808DA050 A30F1704 */ sb $t7, 0x1704($t8) ## 00001704 /* 037E4 808DA054 E6120714 */ swc1 $f18, 0x0714($s0) ## 00000714 -/* 037E8 808DA058 8FB900B4 */ lw $t9, 0x00B4($sp) +/* 037E8 808DA058 8FB900B4 */ lw $t9, 0x00B4($sp) /* 037EC 808DA05C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 037F0 808DA060 00390821 */ addu $at, $at, $t9 +/* 037F0 808DA060 00390821 */ addu $at, $at, $t9 /* 037F4 808DA064 E4240AFC */ swc1 $f4, 0x0AFC($at) ## 00010AFC glabel L808DA068 /* 037F8 808DA068 3C01808F */ lui $at, %hi(D_808F7F64) ## $at = 808F0000 -/* 037FC 808DA06C C4267F64 */ lwc1 $f6, %lo(D_808F7F64)($at) -/* 03800 808DA070 8FA900A8 */ lw $t1, 0x00A8($sp) +/* 037FC 808DA06C C4267F64 */ lwc1 $f6, %lo(D_808F7F64)($at) +/* 03800 808DA070 8FA900A8 */ lw $t1, 0x00A8($sp) /* 03804 808DA074 26040714 */ addiu $a0, $s0, 0x0714 ## $a0 = 00000714 /* 03808 808DA078 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 0380C 808DA07C 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 03810 808DA080 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 03814 808DA084 E5260028 */ swc1 $f6, 0x0028($t1) ## FFFF8028 /* 03818 808DA088 8E0A0674 */ lw $t2, 0x0674($s0) ## 00000674 /* 0381C 808DA08C 26040688 */ addiu $a0, $s0, 0x0688 ## $a0 = 00000688 /* 03820 808DA090 3C05C402 */ lui $a1, 0xC402 ## $a1 = C4020000 -/* 03824 808DA094 2D410029 */ sltiu $at, $t2, 0x0029 -/* 03828 808DA098 1420003D */ bne $at, $zero, .L808DA190 +/* 03824 808DA094 2D410029 */ sltiu $at, $t2, 0x0029 +/* 03828 808DA098 1420003D */ bne $at, $zero, .L808DA190 /* 0382C 808DA09C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03830 808DA0A0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 03834 808DA0A4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03838 808DA0A8 8E0706EC */ lw $a3, 0x06EC($s0) ## 000006EC /* 0383C 808DA0AC 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 03840 808DA0B0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 03844 808DA0B4 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC /* 03848 808DA0B8 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 0384C 808DA0BC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03850 808DA0C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03854 808DA0C4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03858 808DA0C8 24010096 */ addiu $at, $zero, 0x0096 ## $at = 00000096 /* 0385C 808DA0CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03860 808DA0D0 14610004 */ bne $v1, $at, .L808DA0E4 +/* 03860 808DA0D0 14610004 */ bne $v1, $at, .L808DA0E4 /* 03864 808DA0D4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03868 808DA0D8 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 /* 0386C 808DA0DC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03870 808DA0E0 E608016C */ swc1 $f8, 0x016C($s0) ## 0000016C .L808DA0E4: /* 03874 808DA0E4 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 03878 808DA0E8 54610005 */ bnel $v1, $at, .L808DA100 +/* 03878 808DA0E8 54610005 */ bnel $v1, $at, .L808DA100 /* 0387C 808DA0EC 240100BB */ addiu $at, $zero, 0x00BB ## $at = 000000BB /* 03880 808DA0F0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03884 808DA0F4 240508C5 */ addiu $a1, $zero, 0x08C5 ## $a1 = 000008C5 /* 03888 808DA0F8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 0388C 808DA0FC 240100BB */ addiu $at, $zero, 0x00BB ## $at = 000000BB .L808DA100: -/* 03890 808DA100 14610004 */ bne $v1, $at, .L808DA114 +/* 03890 808DA100 14610004 */ bne $v1, $at, .L808DA114 /* 03894 808DA104 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03898 808DA108 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0389C 808DA10C 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E /* 038A0 808DA110 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA114: /* 038A4 808DA114 240100B4 */ addiu $at, $zero, 0x00B4 ## $at = 000000B4 -/* 038A8 808DA118 14610004 */ bne $v1, $at, .L808DA12C +/* 038A8 808DA118 14610004 */ bne $v1, $at, .L808DA12C /* 038AC 808DA11C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 038B0 808DA120 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 038B4 808DA124 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 038B8 808DA128 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA12C: /* 038BC 808DA12C 240100BE */ addiu $at, $zero, 0x00BE ## $at = 000000BE -/* 038C0 808DA130 54610013 */ bnel $v1, $at, .L808DA180 +/* 038C0 808DA130 54610013 */ bnel $v1, $at, .L808DA180 /* 038C4 808DA134 240100E6 */ addiu $at, $zero, 0x00E6 ## $at = 000000E6 /* 038C8 808DA138 8E0C0024 */ lw $t4, 0x0024($s0) ## 00000024 /* 038CC 808DA13C 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFC4 @@ -982,30 +982,30 @@ glabel L808DA068 /* 038EC 808DA15C 34E73333 */ ori $a3, $a3, 0x3333 ## $a3 = 3F333333 /* 038F0 808DA160 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 038F4 808DA164 ACAC0008 */ sw $t4, 0x0008($a1) ## FFFFFFCC -/* 038F8 808DA168 C42A7F68 */ lwc1 $f10, %lo(D_808F7F68)($at) -/* 038FC 808DA16C 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 03900 808DA170 0C235B58 */ jal func_808D6D60 -/* 03904 808DA174 E7AA0078 */ swc1 $f10, 0x0078($sp) +/* 038F8 808DA168 C42A7F68 */ lwc1 $f10, %lo(D_808F7F68)($at) +/* 038FC 808DA16C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03900 808DA170 0C235B58 */ jal func_808D6D60 +/* 03904 808DA174 E7AA0078 */ swc1 $f10, 0x0078($sp) /* 03908 808DA178 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 0390C 808DA17C 240100E6 */ addiu $at, $zero, 0x00E6 ## $at = 000000E6 .L808DA180: -/* 03910 808DA180 14610003 */ bne $v1, $at, .L808DA190 +/* 03910 808DA180 14610003 */ bne $v1, $at, .L808DA190 /* 03914 808DA184 240D0066 */ addiu $t5, $zero, 0x0066 ## $t5 = 00000066 /* 03918 808DA188 A60D0678 */ sh $t5, 0x0678($s0) ## 00000678 /* 0391C 808DA18C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA190: -/* 03920 808DA190 10000276 */ beq $zero, $zero, .L808DAB6C +/* 03920 808DA190 10000276 */ beq $zero, $zero, .L808DAB6C /* 03924 808DA194 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA198 /* 03928 808DA198 3C01C3EC */ lui $at, 0xC3EC ## $at = C3EC0000 /* 0392C 808DA19C 44810000 */ mtc1 $at, $f0 ## $f0 = -472.00 /* 03930 808DA1A0 3C01808F */ lui $at, %hi(D_808F7F6C) ## $at = 808F0000 -/* 03934 808DA1A4 C4227F6C */ lwc1 $f2, %lo(D_808F7F6C)($at) +/* 03934 808DA1A4 C4227F6C */ lwc1 $f2, %lo(D_808F7F6C)($at) /* 03938 808DA1A8 3C01C307 */ lui $at, 0xC307 ## $at = C3070000 /* 0393C 808DA1AC 44816000 */ mtc1 $at, $f12 ## $f12 = -135.00 /* 03940 808DA1B0 3C01808F */ lui $at, %hi(D_808F7F70) ## $at = 808F0000 -/* 03944 808DA1B4 C4307F70 */ lwc1 $f16, %lo(D_808F7F70)($at) -/* 03948 808DA1B8 8FAE00A8 */ lw $t6, 0x00A8($sp) +/* 03944 808DA1B4 C4307F70 */ lwc1 $f16, %lo(D_808F7F70)($at) +/* 03948 808DA1B8 8FAE00A8 */ lw $t6, 0x00A8($sp) /* 0394C 808DA1BC 3C01C3DD */ lui $at, 0xC3DD ## $at = C3DD0000 /* 03950 808DA1C0 44819000 */ mtc1 $at, $f18 ## $f18 = -442.00 /* 03954 808DA1C4 E5D00028 */ swc1 $f16, 0x0028($t6) ## 00000028 @@ -1016,28 +1016,28 @@ glabel L808DA198 /* 03968 808DA1D8 E6020690 */ swc1 $f2, 0x0690($s0) ## 00000690 /* 0396C 808DA1DC E60C0688 */ swc1 $f12, 0x0688($s0) ## 00000688 /* 03970 808DA1E0 E60C0694 */ swc1 $f12, 0x0694($s0) ## 00000694 -/* 03974 808DA1E4 14610008 */ bne $v1, $at, .L808DA208 +/* 03974 808DA1E4 14610008 */ bne $v1, $at, .L808DA208 /* 03978 808DA1E8 E6120680 */ swc1 $f18, 0x0680($s0) ## 00000680 -/* 0397C 808DA1EC 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 0397C 808DA1EC 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03980 808DA1F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03984 808DA1F4 0C00B7D5 */ jal func_8002DF54 +/* 03984 808DA1F4 0C00B7D5 */ jal func_8002DF54 /* 03988 808DA1F8 2406004C */ addiu $a2, $zero, 0x004C ## $a2 = 0000004C /* 0398C 808DA1FC 3C01C3EC */ lui $at, 0xC3EC ## $at = C3EC0000 /* 03990 808DA200 44810000 */ mtc1 $at, $f0 ## $f0 = -472.00 /* 03994 808DA204 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA208: /* 03998 808DA208 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 0399C 808DA20C 14610007 */ bne $v1, $at, .L808DA22C -/* 039A0 808DA210 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 0399C 808DA20C 14610007 */ bne $v1, $at, .L808DA22C +/* 039A0 808DA210 8FA400B4 */ lw $a0, 0x00B4($sp) /* 039A4 808DA214 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 039A8 808DA218 0C00B7D5 */ jal func_8002DF54 +/* 039A8 808DA218 0C00B7D5 */ jal func_8002DF54 /* 039AC 808DA21C 2406004D */ addiu $a2, $zero, 0x004D ## $a2 = 0000004D /* 039B0 808DA220 3C01C3EC */ lui $at, 0xC3EC ## $at = C3EC0000 /* 039B4 808DA224 44810000 */ mtc1 $at, $f0 ## $f0 = -472.00 /* 039B8 808DA228 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA22C: /* 039BC 808DA22C 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 039C0 808DA230 14610012 */ bne $v1, $at, .L808DA27C +/* 039C0 808DA230 14610012 */ bne $v1, $at, .L808DA27C /* 039C4 808DA234 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 039C8 808DA238 240F0067 */ addiu $t7, $zero, 0x0067 ## $t7 = 00000067 /* 039CC 808DA23C 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1057,14 +1057,14 @@ glabel L808DA198 /* 03A04 808DA274 8D0B0000 */ lw $t3, 0x0000($t0) ## 808F93D4 /* 03A08 808DA278 A16A03C8 */ sb $t2, 0x03C8($t3) ## 000003C8 .L808DA27C: -/* 03A0C 808DA27C 1000023B */ beq $zero, $zero, .L808DAB6C +/* 03A0C 808DA27C 1000023B */ beq $zero, $zero, .L808DAB6C /* 03A10 808DA280 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA284 /* 03A14 808DA284 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03A18 808DA288 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 /* 03A1C 808DA28C 8D040000 */ lw $a0, 0x0000($t0) ## 808F93D4 /* 03A20 808DA290 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03A24 808DA294 240520D5 */ addiu $a1, $zero, 0x20D5 ## $a1 = 000020D5 /* 03A28 808DA298 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03A2C 808DA29C 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1075,14 +1075,14 @@ glabel L808DA284 /* 03A40 808DA2B0 34A53000 */ ori $a1, $a1, 0x3000 ## $a1 = 45803000 /* 03A44 808DA2B4 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 03A48 808DA2B8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03A4C 808DA2BC 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 03A50 808DA2C0 3C01C372 */ lui $at, 0xC372 ## $at = C3720000 /* 03A54 808DA2C4 44814000 */ mtc1 $at, $f8 ## $f8 = -242.00 /* 03A58 808DA2C8 3C01808F */ lui $at, %hi(D_808F7F74) ## $at = 808F0000 /* 03A5C 808DA2CC 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03A60 808DA2D0 E6080680 */ swc1 $f8, 0x0680($s0) ## 00000680 -/* 03A64 808DA2D4 C42A7F74 */ lwc1 $f10, %lo(D_808F7F74)($at) +/* 03A64 808DA2D4 C42A7F74 */ lwc1 $f10, %lo(D_808F7F74)($at) /* 03A68 808DA2D8 3C01C33E */ lui $at, 0xC33E ## $at = C33E0000 /* 03A6C 808DA2DC 44818000 */ mtc1 $at, $f16 ## $f16 = -190.00 /* 03A70 808DA2E0 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1099,23 +1099,23 @@ glabel L808DA284 /* 03A9C 808DA30C 8E0F0674 */ lw $t7, 0x0674($s0) ## 00000674 /* 03AA0 808DA310 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 /* 03AA4 808DA314 C5A40028 */ lwc1 $f4, 0x0028($t5) ## 00000028 -/* 03AA8 808DA318 46062200 */ add.s $f8, $f4, $f6 -/* 03AAC 808DA31C 460A4400 */ add.s $f16, $f8, $f10 +/* 03AA8 808DA318 46062200 */ add.s $f8, $f4, $f6 +/* 03AAC 808DA31C 460A4400 */ add.s $f16, $f8, $f10 /* 03AB0 808DA320 E6100690 */ swc1 $f16, 0x0690($s0) ## 00000690 /* 03AB4 808DA324 8D0E0000 */ lw $t6, 0x0000($t0) ## 808F93D4 /* 03AB8 808DA328 C5D2002C */ lwc1 $f18, 0x002C($t6) ## 0000002C -/* 03ABC 808DA32C 15E10009 */ bne $t7, $at, .L808DA354 +/* 03ABC 808DA32C 15E10009 */ bne $t7, $at, .L808DA354 /* 03AC0 808DA330 E6120694 */ swc1 $f18, 0x0694($s0) ## 00000694 /* 03AC4 808DA334 3C01808F */ lui $at, %hi(D_808F7F78) ## $at = 808F0000 -/* 03AC8 808DA338 C4247F78 */ lwc1 $f4, %lo(D_808F7F78)($at) +/* 03AC8 808DA338 C4247F78 */ lwc1 $f4, %lo(D_808F7F78)($at) /* 03ACC 808DA33C 8D180000 */ lw $t8, 0x0000($t0) ## 808F93D4 /* 03AD0 808DA340 24190068 */ addiu $t9, $zero, 0x0068 ## $t9 = 00000068 /* 03AD4 808DA344 E7040028 */ swc1 $f4, 0x0028($t8) ## 00000028 /* 03AD8 808DA348 A6190678 */ sh $t9, 0x0678($s0) ## 00000678 -/* 03ADC 808DA34C 10000003 */ beq $zero, $zero, .L808DA35C +/* 03ADC 808DA34C 10000003 */ beq $zero, $zero, .L808DA35C /* 03AE0 808DA350 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA354: -/* 03AE4 808DA354 10000205 */ beq $zero, $zero, .L808DAB6C +/* 03AE4 808DA354 10000205 */ beq $zero, $zero, .L808DAB6C /* 03AE8 808DA358 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA35C .L808DA35C: @@ -1124,7 +1124,7 @@ glabel L808DA35C /* 03AF4 808DA364 3C01808F */ lui $at, %hi(D_808F7F7C) ## $at = 808F0000 /* 03AF8 808DA368 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03AFC 808DA36C E6060680 */ swc1 $f6, 0x0680($s0) ## 00000680 -/* 03B00 808DA370 C4287F7C */ lwc1 $f8, %lo(D_808F7F7C)($at) +/* 03B00 808DA370 C4287F7C */ lwc1 $f8, %lo(D_808F7F7C)($at) /* 03B04 808DA374 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 03B08 808DA378 44815000 */ mtc1 $at, $f10 ## $f10 = -200.00 /* 03B0C 808DA37C 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1141,28 +1141,28 @@ glabel L808DA35C /* 03B38 808DA3A8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03B3C 808DA3AC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 03B40 808DA3B0 C5520028 */ lwc1 $f18, 0x0028($t2) ## 00000028 -/* 03B44 808DA3B4 2C61000A */ sltiu $at, $v1, 0x000A +/* 03B44 808DA3B4 2C61000A */ sltiu $at, $v1, 0x000A /* 03B48 808DA3B8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 03B4C 808DA3BC 46049180 */ add.s $f6, $f18, $f4 +/* 03B4C 808DA3BC 46049180 */ add.s $f6, $f18, $f4 /* 03B50 808DA3C0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 03B54 808DA3C4 46083280 */ add.s $f10, $f6, $f8 +/* 03B54 808DA3C4 46083280 */ add.s $f10, $f6, $f8 /* 03B58 808DA3C8 E60A0690 */ swc1 $f10, 0x0690($s0) ## 00000690 /* 03B5C 808DA3CC 8D0B0000 */ lw $t3, 0x0000($t0) ## 808F93D4 /* 03B60 808DA3D0 C570002C */ lwc1 $f16, 0x002C($t3) ## 0000002C -/* 03B64 808DA3D4 14200009 */ bne $at, $zero, .L808DA3FC +/* 03B64 808DA3D4 14200009 */ bne $at, $zero, .L808DA3FC /* 03B68 808DA3D8 E6100694 */ swc1 $f16, 0x0694($s0) ## 00000694 -/* 03B6C 808DA3DC 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03B6C 808DA3DC 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03B70 808DA3E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03B74 808DA3E4 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 03B78 808DA3E8 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 03B7C 808DA3EC 00812021 */ addu $a0, $a0, $at + +/* 03B7C 808DA3EC 00812021 */ addu $a0, $a0, $at /* 03B80 808DA3F0 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03B84 808DA3F4 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 /* 03B88 808DA3F8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA3FC: /* 03B8C 808DA3FC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 03B90 808DA400 14610005 */ bne $v1, $at, .L808DA418 +/* 03B90 808DA400 14610005 */ bne $v1, $at, .L808DA418 /* 03B94 808DA404 24180069 */ addiu $t8, $zero, 0x0069 ## $t8 = 00000069 /* 03B98 808DA408 8D0D0000 */ lw $t5, 0x0000($t0) ## 808F93D4 /* 03B9C 808DA40C 240C0008 */ addiu $t4, $zero, 0x0008 ## $t4 = 00000008 @@ -1170,7 +1170,7 @@ glabel L808DA35C /* 03BA4 808DA414 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA418: /* 03BA8 808DA418 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 03BAC 808DA41C 54610006 */ bnel $v1, $at, .L808DA438 +/* 03BAC 808DA41C 54610006 */ bnel $v1, $at, .L808DA438 /* 03BB0 808DA420 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 /* 03BB4 808DA424 8D0F0000 */ lw $t7, 0x0000($t0) ## 808F93D4 /* 03BB8 808DA428 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 @@ -1178,12 +1178,12 @@ glabel L808DA35C /* 03BC0 808DA430 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03BC4 808DA434 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 .L808DA438: -/* 03BC8 808DA438 14610003 */ bne $v1, $at, .L808DA448 +/* 03BC8 808DA438 14610003 */ bne $v1, $at, .L808DA448 /* 03BCC 808DA43C 00000000 */ nop /* 03BD0 808DA440 A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 03BD4 808DA444 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA448: -/* 03BD8 808DA448 100001C8 */ beq $zero, $zero, .L808DAB6C +/* 03BD8 808DA448 100001C8 */ beq $zero, $zero, .L808DAB6C /* 03BDC 808DA44C 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA450 /* 03BE0 808DA450 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -1193,7 +1193,7 @@ glabel L808DA450 /* 03BF0 808DA460 3C01808F */ lui $at, %hi(D_808F7F80) ## $at = 808F0000 /* 03BF4 808DA464 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03BF8 808DA468 E6120680 */ swc1 $f18, 0x0680($s0) ## 00000680 -/* 03BFC 808DA46C C4247F80 */ lwc1 $f4, %lo(D_808F7F80)($at) +/* 03BFC 808DA46C C4247F80 */ lwc1 $f4, %lo(D_808F7F80)($at) /* 03C00 808DA470 3C01C336 */ lui $at, 0xC336 ## $at = C3360000 /* 03C04 808DA474 44813000 */ mtc1 $at, $f6 ## $f6 = -182.00 /* 03C08 808DA478 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1205,7 +1205,7 @@ glabel L808DA450 /* 03C20 808DA490 C7280024 */ lwc1 $f8, 0x0024($t9) ## 00000024 /* 03C24 808DA494 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 03C28 808DA498 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 03C2C 808DA49C 46004281 */ sub.s $f10, $f8, $f0 +/* 03C2C 808DA49C 46004281 */ sub.s $f10, $f8, $f0 /* 03C30 808DA4A0 240570D0 */ addiu $a1, $zero, 0x70D0 ## $a1 = 000070D0 /* 03C34 808DA4A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 03C38 808DA4A8 E60A068C */ swc1 $f10, 0x068C($s0) ## 0000068C @@ -1213,94 +1213,94 @@ glabel L808DA450 /* 03C40 808DA4B0 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 /* 03C44 808DA4B4 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 03C48 808DA4B8 C5300028 */ lwc1 $f16, 0x0028($t1) ## 00000028 -/* 03C4C 808DA4BC 46128100 */ add.s $f4, $f16, $f18 -/* 03C50 808DA4C0 46002180 */ add.s $f6, $f4, $f0 +/* 03C4C 808DA4BC 46128100 */ add.s $f4, $f16, $f18 +/* 03C50 808DA4C0 46002180 */ add.s $f6, $f4, $f0 /* 03C54 808DA4C4 E6060690 */ swc1 $f6, 0x0690($s0) ## 00000690 /* 03C58 808DA4C8 8D0A0000 */ lw $t2, 0x0000($t0) ## 808F93D4 /* 03C5C 808DA4CC C548002C */ lwc1 $f8, 0x002C($t2) ## 0000002C -/* 03C60 808DA4D0 460A4401 */ sub.s $f16, $f8, $f10 -/* 03C64 808DA4D4 14610004 */ bne $v1, $at, .L808DA4E8 +/* 03C60 808DA4D0 460A4401 */ sub.s $f16, $f8, $f10 +/* 03C64 808DA4D4 14610004 */ bne $v1, $at, .L808DA4E8 /* 03C68 808DA4D8 E6100694 */ swc1 $f16, 0x0694($s0) ## 00000694 -/* 03C6C 808DA4DC 0C042DA0 */ jal func_8010B680 -/* 03C70 808DA4E0 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03C6C 808DA4DC 0C042DA0 */ jal func_8010B680 +/* 03C70 808DA4E0 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03C74 808DA4E4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA4E8: -/* 03C78 808DA4E8 2C610065 */ sltiu $at, $v1, 0x0065 -/* 03C7C 808DA4EC 14200007 */ bne $at, $zero, .L808DA50C -/* 03C80 808DA4F0 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 03C84 808DA4F4 0C042F6F */ jal func_8010BDBC +/* 03C78 808DA4E8 2C610065 */ sltiu $at, $v1, 0x0065 +/* 03C7C 808DA4EC 14200007 */ bne $at, $zero, .L808DA50C +/* 03C80 808DA4F0 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03C84 808DA4F4 0C042F6F */ jal func_8010BDBC /* 03C88 808DA4F8 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 03C8C 808DA4FC 14400003 */ bne $v0, $zero, .L808DA50C +/* 03C8C 808DA4FC 14400003 */ bne $v0, $zero, .L808DA50C /* 03C90 808DA500 240B041F */ addiu $t3, $zero, 0x041F ## $t3 = 0000041F /* 03C94 808DA504 A60B0678 */ sh $t3, 0x0678($s0) ## 00000678 /* 03C98 808DA508 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA50C: -/* 03C9C 808DA50C 10000197 */ beq $zero, $zero, .L808DAB6C +/* 03C9C 808DA50C 10000197 */ beq $zero, $zero, .L808DAB6C /* 03CA0 808DA510 86040678 */ lh $a0, 0x0678($s0) ## 00000678 /* 03CA4 808DA514 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 .L808DA518: -/* 03CA8 808DA518 00800821 */ addu $at, $a0, $zero -/* 03CAC 808DA51C 00042080 */ sll $a0, $a0, 2 -/* 03CB0 808DA520 00812023 */ subu $a0, $a0, $at -/* 03CB4 808DA524 000420C0 */ sll $a0, $a0, 3 -/* 03CB8 808DA528 00812021 */ addu $a0, $a0, $at -/* 03CBC 808DA52C 00042080 */ sll $a0, $a0, 2 -/* 03CC0 808DA530 00812023 */ subu $a0, $a0, $at -/* 03CC4 808DA534 00042200 */ sll $a0, $a0, 8 -/* 03CC8 808DA538 00042400 */ sll $a0, $a0, 16 +/* 03CA8 808DA518 00800821 */ addu $at, $a0, $zero +/* 03CAC 808DA51C 00042080 */ sll $a0, $a0, 2 +/* 03CB0 808DA520 00812023 */ subu $a0, $a0, $at +/* 03CB4 808DA524 000420C0 */ sll $a0, $a0, 3 +/* 03CB8 808DA528 00812021 */ addu $a0, $a0, $at +/* 03CBC 808DA52C 00042080 */ sll $a0, $a0, 2 +/* 03CC0 808DA530 00812023 */ subu $a0, $a0, $at +/* 03CC4 808DA534 00042200 */ sll $a0, $a0, 8 +/* 03CC8 808DA538 00042400 */ sll $a0, $a0, 16 /* 03CCC 808DA53C 0C01DE1C */ jal Math_Sins ## sins? -/* 03CD0 808DA540 00042403 */ sra $a0, $a0, 16 +/* 03CD0 808DA540 00042403 */ sra $a0, $a0, 16 /* 03CD4 808DA544 3C01808F */ lui $at, %hi(D_808F7F84) ## $at = 808F0000 -/* 03CD8 808DA548 C4327F84 */ lwc1 $f18, %lo(D_808F7F84)($at) +/* 03CD8 808DA548 C4327F84 */ lwc1 $f18, %lo(D_808F7F84)($at) /* 03CDC 808DA54C 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 03CE0 808DA550 46120102 */ mul.s $f4, $f0, $f18 -/* 03CE4 808DA554 0C01E221 */ jal func_80078884 +/* 03CE0 808DA550 46120102 */ mul.s $f4, $f0, $f18 +/* 03CE4 808DA554 0C01E221 */ jal func_80078884 /* 03CE8 808DA558 E604070C */ swc1 $f4, 0x070C($s0) ## 0000070C /* 03CEC 808DA55C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03CF0 808DA560 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 03CF4 808DA564 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 -/* 03CF8 808DA568 14610009 */ bne $v1, $at, .L808DA590 +/* 03CF8 808DA568 14610009 */ bne $v1, $at, .L808DA590 /* 03CFC 808DA56C 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 /* 03D00 808DA570 8D0D0000 */ lw $t5, 0x0000($t0) ## 808F93D4 /* 03D04 808DA574 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 /* 03D08 808DA578 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 03D0C 808DA57C A1AC03C8 */ sb $t4, 0x03C8($t5) ## 000003C8 -/* 03D10 808DA580 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 03D14 808DA584 0C00B7D5 */ jal func_8002DF54 +/* 03D10 808DA580 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03D14 808DA584 0C00B7D5 */ jal func_8002DF54 /* 03D18 808DA588 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 /* 03D1C 808DA58C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA590: /* 03D20 808DA590 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 03D24 808DA594 14610003 */ bne $v1, $at, .L808DA5A4 +/* 03D24 808DA594 14610003 */ bne $v1, $at, .L808DA5A4 /* 03D28 808DA598 240E0420 */ addiu $t6, $zero, 0x0420 ## $t6 = 00000420 /* 03D2C 808DA59C A60E0678 */ sh $t6, 0x0678($s0) ## 00000678 /* 03D30 808DA5A0 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA5A4: -/* 03D34 808DA5A4 10000171 */ beq $zero, $zero, .L808DAB6C +/* 03D34 808DA5A4 10000171 */ beq $zero, $zero, .L808DAB6C /* 03D38 808DA5A8 86040678 */ lh $a0, 0x0678($s0) ## 00000678 .L808DA5AC: /* 03D3C 808DA5AC 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 -/* 03D40 808DA5B0 00800821 */ addu $at, $a0, $zero -/* 03D44 808DA5B4 00042080 */ sll $a0, $a0, 2 -/* 03D48 808DA5B8 00812023 */ subu $a0, $a0, $at -/* 03D4C 808DA5BC 000420C0 */ sll $a0, $a0, 3 -/* 03D50 808DA5C0 00812021 */ addu $a0, $a0, $at -/* 03D54 808DA5C4 00042080 */ sll $a0, $a0, 2 -/* 03D58 808DA5C8 00812023 */ subu $a0, $a0, $at -/* 03D5C 808DA5CC 00042200 */ sll $a0, $a0, 8 -/* 03D60 808DA5D0 00042400 */ sll $a0, $a0, 16 +/* 03D40 808DA5B0 00800821 */ addu $at, $a0, $zero +/* 03D44 808DA5B4 00042080 */ sll $a0, $a0, 2 +/* 03D48 808DA5B8 00812023 */ subu $a0, $a0, $at +/* 03D4C 808DA5BC 000420C0 */ sll $a0, $a0, 3 +/* 03D50 808DA5C0 00812021 */ addu $a0, $a0, $at +/* 03D54 808DA5C4 00042080 */ sll $a0, $a0, 2 +/* 03D58 808DA5C8 00812023 */ subu $a0, $a0, $at +/* 03D5C 808DA5CC 00042200 */ sll $a0, $a0, 8 +/* 03D60 808DA5D0 00042400 */ sll $a0, $a0, 16 /* 03D64 808DA5D4 0C01DE1C */ jal Math_Sins ## sins? -/* 03D68 808DA5D8 00042403 */ sra $a0, $a0, 16 +/* 03D68 808DA5D8 00042403 */ sra $a0, $a0, 16 /* 03D6C 808DA5DC 3C01808F */ lui $at, %hi(D_808F7F88) ## $at = 808F0000 -/* 03D70 808DA5E0 C4267F88 */ lwc1 $f6, %lo(D_808F7F88)($at) +/* 03D70 808DA5E0 C4267F88 */ lwc1 $f6, %lo(D_808F7F88)($at) /* 03D74 808DA5E4 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 03D78 808DA5E8 46060202 */ mul.s $f8, $f0, $f6 -/* 03D7C 808DA5EC 0C01E221 */ jal func_80078884 +/* 03D78 808DA5E8 46060202 */ mul.s $f8, $f0, $f6 +/* 03D7C 808DA5EC 0C01E221 */ jal func_80078884 /* 03D80 808DA5F0 E608070C */ swc1 $f8, 0x070C($s0) ## 0000070C /* 03D84 808DA5F4 3C01808F */ lui $at, %hi(D_808F7F8C) ## $at = 808F0000 -/* 03D88 808DA5F8 C42A7F8C */ lwc1 $f10, %lo(D_808F7F8C)($at) +/* 03D88 808DA5F8 C42A7F8C */ lwc1 $f10, %lo(D_808F7F8C)($at) /* 03D8C 808DA5FC 3C014581 */ lui $at, 0x4581 ## $at = 45810000 /* 03D90 808DA600 44818000 */ mtc1 $at, $f16 ## $f16 = 4128.00 /* 03D94 808DA604 3C01C322 */ lui $at, 0xC322 ## $at = C3220000 @@ -1312,79 +1312,79 @@ glabel L808DA450 /* 03DAC 808DA61C E6100684 */ swc1 $f16, 0x0684($s0) ## 00000684 /* 03DB0 808DA620 E6120688 */ swc1 $f18, 0x0688($s0) ## 00000688 /* 03DB4 808DA624 E604068C */ swc1 $f4, 0x068C($s0) ## 0000068C -/* 03DB8 808DA628 C4267F90 */ lwc1 $f6, %lo(D_808F7F90)($at) +/* 03DB8 808DA628 C4267F90 */ lwc1 $f6, %lo(D_808F7F90)($at) /* 03DBC 808DA62C 8E0F0674 */ lw $t7, 0x0674($s0) ## 00000674 /* 03DC0 808DA630 3C01C296 */ lui $at, 0xC296 ## $at = C2960000 /* 03DC4 808DA634 44814000 */ mtc1 $at, $f8 ## $f8 = -75.00 -/* 03DC8 808DA638 2DE10029 */ sltiu $at, $t7, 0x0029 +/* 03DC8 808DA638 2DE10029 */ sltiu $at, $t7, 0x0029 /* 03DCC 808DA63C E6060690 */ swc1 $f6, 0x0690($s0) ## 00000690 -/* 03DD0 808DA640 14200004 */ bne $at, $zero, .L808DA654 +/* 03DD0 808DA640 14200004 */ bne $at, $zero, .L808DA654 /* 03DD4 808DA644 E6080694 */ swc1 $f8, 0x0694($s0) ## 00000694 /* 03DD8 808DA648 24180421 */ addiu $t8, $zero, 0x0421 ## $t8 = 00000421 /* 03DDC 808DA64C A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 03DE0 808DA650 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA654: -/* 03DE4 808DA654 10000145 */ beq $zero, $zero, .L808DAB6C +/* 03DE4 808DA654 10000145 */ beq $zero, $zero, .L808DAB6C /* 03DE8 808DA658 86040678 */ lh $a0, 0x0678($s0) ## 00000678 /* 03DEC 808DA65C 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 .L808DA660: -/* 03DF0 808DA660 00800821 */ addu $at, $a0, $zero -/* 03DF4 808DA664 00042080 */ sll $a0, $a0, 2 -/* 03DF8 808DA668 00812023 */ subu $a0, $a0, $at -/* 03DFC 808DA66C 000420C0 */ sll $a0, $a0, 3 -/* 03E00 808DA670 00812021 */ addu $a0, $a0, $at -/* 03E04 808DA674 00042080 */ sll $a0, $a0, 2 -/* 03E08 808DA678 00812023 */ subu $a0, $a0, $at -/* 03E0C 808DA67C 00042200 */ sll $a0, $a0, 8 -/* 03E10 808DA680 00042400 */ sll $a0, $a0, 16 +/* 03DF0 808DA660 00800821 */ addu $at, $a0, $zero +/* 03DF4 808DA664 00042080 */ sll $a0, $a0, 2 +/* 03DF8 808DA668 00812023 */ subu $a0, $a0, $at +/* 03DFC 808DA66C 000420C0 */ sll $a0, $a0, 3 +/* 03E00 808DA670 00812021 */ addu $a0, $a0, $at +/* 03E04 808DA674 00042080 */ sll $a0, $a0, 2 +/* 03E08 808DA678 00812023 */ subu $a0, $a0, $at +/* 03E0C 808DA67C 00042200 */ sll $a0, $a0, 8 +/* 03E10 808DA680 00042400 */ sll $a0, $a0, 16 /* 03E14 808DA684 0C01DE1C */ jal Math_Sins ## sins? -/* 03E18 808DA688 00042403 */ sra $a0, $a0, 16 +/* 03E18 808DA688 00042403 */ sra $a0, $a0, 16 /* 03E1C 808DA68C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 03E20 808DA690 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 03E24 808DA694 C61006F0 */ lwc1 $f16, 0x06F0($s0) ## 000006F0 /* 03E28 808DA698 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 03E2C 808DA69C 46105482 */ mul.s $f18, $f10, $f16 +/* 03E2C 808DA69C 46105482 */ mul.s $f18, $f10, $f16 /* 03E30 808DA6A0 00000000 */ nop -/* 03E34 808DA6A4 46120102 */ mul.s $f4, $f0, $f18 -/* 03E38 808DA6A8 0C01E221 */ jal func_80078884 +/* 03E34 808DA6A4 46120102 */ mul.s $f4, $f0, $f18 +/* 03E38 808DA6A8 0C01E221 */ jal func_80078884 /* 03E3C 808DA6AC E604070C */ swc1 $f4, 0x070C($s0) ## 0000070C /* 03E40 808DA6B0 3C01808F */ lui $at, %hi(D_808F7F94) ## $at = 808F0000 -/* 03E44 808DA6B4 C4287F94 */ lwc1 $f8, %lo(D_808F7F94)($at) +/* 03E44 808DA6B4 C4287F94 */ lwc1 $f8, %lo(D_808F7F94)($at) /* 03E48 808DA6B8 C60606F0 */ lwc1 $f6, 0x06F0($s0) ## 000006F0 /* 03E4C 808DA6BC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03E50 808DA6C0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 03E54 808DA6C4 46083282 */ mul.s $f10, $f6, $f8 +/* 03E54 808DA6C4 46083282 */ mul.s $f10, $f6, $f8 /* 03E58 808DA6C8 26040680 */ addiu $a0, $s0, 0x0680 ## $a0 = 00000680 /* 03E5C 808DA6CC 3C05C496 */ lui $a1, 0xC496 ## $a1 = C4960000 -/* 03E60 808DA6D0 44075000 */ mfc1 $a3, $f10 +/* 03E60 808DA6D0 44075000 */ mfc1 $a3, $f10 /* 03E64 808DA6D4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03E68 808DA6D8 00000000 */ nop /* 03E6C 808DA6DC 3C0142E2 */ lui $at, 0x42E2 ## $at = 42E20000 /* 03E70 808DA6E0 44819000 */ mtc1 $at, $f18 ## $f18 = 113.00 /* 03E74 808DA6E4 C61006F0 */ lwc1 $f16, 0x06F0($s0) ## 000006F0 /* 03E78 808DA6E8 3C054584 */ lui $a1, 0x4584 ## $a1 = 45840000 /* 03E7C 808DA6EC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 03E80 808DA6F0 46128102 */ mul.s $f4, $f16, $f18 +/* 03E80 808DA6F0 46128102 */ mul.s $f4, $f16, $f18 /* 03E84 808DA6F4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 03E88 808DA6F8 34A58800 */ ori $a1, $a1, 0x8800 ## $a1 = 45848800 /* 03E8C 808DA6FC 26040684 */ addiu $a0, $s0, 0x0684 ## $a0 = 00000684 -/* 03E90 808DA700 44072000 */ mfc1 $a3, $f4 +/* 03E90 808DA700 44072000 */ mfc1 $a3, $f4 /* 03E94 808DA704 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03E98 808DA708 00000000 */ nop /* 03E9C 808DA70C 3C01808F */ lui $at, %hi(D_808F7F98) ## $at = 808F0000 -/* 03EA0 808DA710 C4287F98 */ lwc1 $f8, %lo(D_808F7F98)($at) +/* 03EA0 808DA710 C4287F98 */ lwc1 $f8, %lo(D_808F7F98)($at) /* 03EA4 808DA714 C60606F0 */ lwc1 $f6, 0x06F0($s0) ## 000006F0 /* 03EA8 808DA718 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03EAC 808DA71C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 03EB0 808DA720 46083282 */ mul.s $f10, $f6, $f8 +/* 03EB0 808DA720 46083282 */ mul.s $f10, $f6, $f8 /* 03EB4 808DA724 26040688 */ addiu $a0, $s0, 0x0688 ## $a0 = 00000688 /* 03EB8 808DA728 3C05C483 */ lui $a1, 0xC483 ## $a1 = C4830000 -/* 03EBC 808DA72C 44075000 */ mfc1 $a3, $f10 +/* 03EBC 808DA72C 44075000 */ mfc1 $a3, $f10 /* 03EC0 808DA730 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03EC4 808DA734 00000000 */ nop /* 03EC8 808DA738 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 /* 03ECC 808DA73C 3C073A83 */ lui $a3, 0x3A83 ## $a3 = 3A830000 @@ -1392,18 +1392,18 @@ glabel L808DA450 /* 03ED4 808DA744 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 03ED8 808DA748 260406F0 */ addiu $a0, $s0, 0x06F0 ## $a0 = 000006F0 /* 03EDC 808DA74C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03EE0 808DA750 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03EE4 808DA754 8E190674 */ lw $t9, 0x0674($s0) ## 00000674 /* 03EE8 808DA758 2409006A */ addiu $t1, $zero, 0x006A ## $t1 = 0000006A /* 03EEC 808DA75C 240A003C */ addiu $t2, $zero, 0x003C ## $t2 = 0000003C -/* 03EF0 808DA760 2F210051 */ sltiu $at, $t9, 0x0051 -/* 03EF4 808DA764 14200003 */ bne $at, $zero, .L808DA774 +/* 03EF0 808DA760 2F210051 */ sltiu $at, $t9, 0x0051 +/* 03EF4 808DA764 14200003 */ bne $at, $zero, .L808DA774 /* 03EF8 808DA768 00000000 */ nop /* 03EFC 808DA76C A6090678 */ sh $t1, 0x0678($s0) ## 00000678 /* 03F00 808DA770 AE0A0674 */ sw $t2, 0x0674($s0) ## 00000674 .L808DA774: -/* 03F04 808DA774 100000FD */ beq $zero, $zero, .L808DAB6C +/* 03F04 808DA774 100000FD */ beq $zero, $zero, .L808DAB6C /* 03F08 808DA778 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA77C /* 03F0C 808DA77C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -1413,7 +1413,7 @@ glabel L808DA77C /* 03F1C 808DA78C 3C01808F */ lui $at, %hi(D_808F7F9C) ## $at = 808F0000 /* 03F20 808DA790 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03F24 808DA794 E6100680 */ swc1 $f16, 0x0680($s0) ## 00000680 -/* 03F28 808DA798 C4327F9C */ lwc1 $f18, %lo(D_808F7F9C)($at) +/* 03F28 808DA798 C4327F9C */ lwc1 $f18, %lo(D_808F7F9C)($at) /* 03F2C 808DA79C 3C01C336 */ lui $at, 0xC336 ## $at = C3360000 /* 03F30 808DA7A0 44812000 */ mtc1 $at, $f4 ## $f4 = -182.00 /* 03F34 808DA7A4 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1425,40 +1425,40 @@ glabel L808DA77C /* 03F4C 808DA7BC C5660024 */ lwc1 $f6, 0x0024($t3) ## 00000024 /* 03F50 808DA7C0 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 /* 03F54 808DA7C4 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 03F58 808DA7C8 46003201 */ sub.s $f8, $f6, $f0 +/* 03F58 808DA7C8 46003201 */ sub.s $f8, $f6, $f0 /* 03F5C 808DA7CC E608068C */ swc1 $f8, 0x068C($s0) ## 0000068C /* 03F60 808DA7D0 8D0C0000 */ lw $t4, 0x0000($t0) ## 808F93D4 /* 03F64 808DA7D4 44814000 */ mtc1 $at, $f8 ## $f8 = 25.00 -/* 03F68 808DA7D8 00800821 */ addu $at, $a0, $zero +/* 03F68 808DA7D8 00800821 */ addu $at, $a0, $zero /* 03F6C 808DA7DC C58A0028 */ lwc1 $f10, 0x0028($t4) ## 00000028 -/* 03F70 808DA7E0 00042080 */ sll $a0, $a0, 2 -/* 03F74 808DA7E4 00812023 */ subu $a0, $a0, $at -/* 03F78 808DA7E8 46105480 */ add.s $f18, $f10, $f16 -/* 03F7C 808DA7EC 000420C0 */ sll $a0, $a0, 3 -/* 03F80 808DA7F0 00812021 */ addu $a0, $a0, $at -/* 03F84 808DA7F4 00042080 */ sll $a0, $a0, 2 -/* 03F88 808DA7F8 46009100 */ add.s $f4, $f18, $f0 -/* 03F8C 808DA7FC 00812023 */ subu $a0, $a0, $at -/* 03F90 808DA800 00042200 */ sll $a0, $a0, 8 -/* 03F94 808DA804 00042400 */ sll $a0, $a0, 16 +/* 03F70 808DA7E0 00042080 */ sll $a0, $a0, 2 +/* 03F74 808DA7E4 00812023 */ subu $a0, $a0, $at +/* 03F78 808DA7E8 46105480 */ add.s $f18, $f10, $f16 +/* 03F7C 808DA7EC 000420C0 */ sll $a0, $a0, 3 +/* 03F80 808DA7F0 00812021 */ addu $a0, $a0, $at +/* 03F84 808DA7F4 00042080 */ sll $a0, $a0, 2 +/* 03F88 808DA7F8 46009100 */ add.s $f4, $f18, $f0 +/* 03F8C 808DA7FC 00812023 */ subu $a0, $a0, $at +/* 03F90 808DA800 00042200 */ sll $a0, $a0, 8 +/* 03F94 808DA804 00042400 */ sll $a0, $a0, 16 /* 03F98 808DA808 E6040690 */ swc1 $f4, 0x0690($s0) ## 00000690 /* 03F9C 808DA80C 8D0D0000 */ lw $t5, 0x0000($t0) ## 808F93D4 -/* 03FA0 808DA810 00042403 */ sra $a0, $a0, 16 +/* 03FA0 808DA810 00042403 */ sra $a0, $a0, 16 /* 03FA4 808DA814 C5A6002C */ lwc1 $f6, 0x002C($t5) ## 0000002C -/* 03FA8 808DA818 46083281 */ sub.s $f10, $f6, $f8 +/* 03FA8 808DA818 46083281 */ sub.s $f10, $f6, $f8 /* 03FAC 808DA81C 0C01DE1C */ jal Math_Sins ## sins? /* 03FB0 808DA820 E60A0694 */ swc1 $f10, 0x0694($s0) ## 00000694 /* 03FB4 808DA824 3C01808F */ lui $at, %hi(D_808F7FA0) ## $at = 808F0000 -/* 03FB8 808DA828 C4307FA0 */ lwc1 $f16, %lo(D_808F7FA0)($at) +/* 03FB8 808DA828 C4307FA0 */ lwc1 $f16, %lo(D_808F7FA0)($at) /* 03FBC 808DA82C 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 03FC0 808DA830 46100482 */ mul.s $f18, $f0, $f16 -/* 03FC4 808DA834 0C01E221 */ jal func_80078884 +/* 03FC0 808DA830 46100482 */ mul.s $f18, $f0, $f16 +/* 03FC4 808DA834 0C01E221 */ jal func_80078884 /* 03FC8 808DA838 E612070C */ swc1 $f18, 0x070C($s0) ## 0000070C /* 03FCC 808DA83C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03FD0 808DA840 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03FD4 808DA844 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 03FD8 808DA848 14610005 */ bne $v1, $at, .L808DA860 +/* 03FD8 808DA848 14610005 */ bne $v1, $at, .L808DA860 /* 03FDC 808DA84C 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 /* 03FE0 808DA850 8D0F0000 */ lw $t7, 0x0000($t0) ## 808F93D4 /* 03FE4 808DA854 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 @@ -1466,52 +1466,52 @@ glabel L808DA77C /* 03FEC 808DA85C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA860: /* 03FF0 808DA860 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 03FF4 808DA864 14610005 */ bne $v1, $at, .L808DA87C -/* 03FF8 808DA868 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03FF4 808DA864 14610005 */ bne $v1, $at, .L808DA87C +/* 03FF8 808DA868 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03FFC 808DA86C 240570D1 */ addiu $a1, $zero, 0x70D1 ## $a1 = 000070D1 -/* 04000 808DA870 0C042DA0 */ jal func_8010B680 +/* 04000 808DA870 0C042DA0 */ jal func_8010B680 /* 04004 808DA874 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04008 808DA878 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA87C: -/* 0400C 808DA87C 2C610097 */ sltiu $at, $v1, 0x0097 -/* 04010 808DA880 1420000F */ bne $at, $zero, .L808DA8C0 -/* 04014 808DA884 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 04018 808DA888 0C042F6F */ jal func_8010BDBC +/* 0400C 808DA87C 2C610097 */ sltiu $at, $v1, 0x0097 +/* 04010 808DA880 1420000F */ bne $at, $zero, .L808DA8C0 +/* 04014 808DA884 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 04018 808DA888 0C042F6F */ jal func_8010BDBC /* 0401C 808DA88C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 04020 808DA890 1440000B */ bne $v0, $zero, .L808DA8C0 +/* 04020 808DA890 1440000B */ bne $v0, $zero, .L808DA8C0 /* 04024 808DA894 2418006B */ addiu $t8, $zero, 0x006B ## $t8 = 0000006B /* 04028 808DA898 A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 0402C 808DA89C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 04030 808DA8A0 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 04030 808DA8A0 8FA400B4 */ lw $a0, 0x00B4($sp) /* 04034 808DA8A4 240570D2 */ addiu $a1, $zero, 0x70D2 ## $a1 = 000070D2 -/* 04038 808DA8A8 0C042DA0 */ jal func_8010B680 +/* 04038 808DA8A8 0C042DA0 */ jal func_8010B680 /* 0403C 808DA8AC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04040 808DA8B0 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 04040 808DA8B0 8FA400B4 */ lw $a0, 0x00B4($sp) /* 04044 808DA8B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04048 808DA8B8 0C00B7D5 */ jal func_8002DF54 +/* 04048 808DA8B8 0C00B7D5 */ jal func_8002DF54 /* 0404C 808DA8BC 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 .L808DA8C0: -/* 04050 808DA8C0 100000AA */ beq $zero, $zero, .L808DAB6C +/* 04050 808DA8C0 100000AA */ beq $zero, $zero, .L808DAB6C /* 04054 808DA8C4 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA8C8 /* 04058 808DA8C8 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 -/* 0405C 808DA8CC 00800821 */ addu $at, $a0, $zero -/* 04060 808DA8D0 00042080 */ sll $a0, $a0, 2 -/* 04064 808DA8D4 00812023 */ subu $a0, $a0, $at -/* 04068 808DA8D8 000420C0 */ sll $a0, $a0, 3 -/* 0406C 808DA8DC 00812021 */ addu $a0, $a0, $at -/* 04070 808DA8E0 00042080 */ sll $a0, $a0, 2 -/* 04074 808DA8E4 00812023 */ subu $a0, $a0, $at -/* 04078 808DA8E8 00042200 */ sll $a0, $a0, 8 -/* 0407C 808DA8EC 00042400 */ sll $a0, $a0, 16 +/* 0405C 808DA8CC 00800821 */ addu $at, $a0, $zero +/* 04060 808DA8D0 00042080 */ sll $a0, $a0, 2 +/* 04064 808DA8D4 00812023 */ subu $a0, $a0, $at +/* 04068 808DA8D8 000420C0 */ sll $a0, $a0, 3 +/* 0406C 808DA8DC 00812021 */ addu $a0, $a0, $at +/* 04070 808DA8E0 00042080 */ sll $a0, $a0, 2 +/* 04074 808DA8E4 00812023 */ subu $a0, $a0, $at +/* 04078 808DA8E8 00042200 */ sll $a0, $a0, 8 +/* 0407C 808DA8EC 00042400 */ sll $a0, $a0, 16 /* 04080 808DA8F0 0C01DE1C */ jal Math_Sins ## sins? -/* 04084 808DA8F4 00042403 */ sra $a0, $a0, 16 +/* 04084 808DA8F4 00042403 */ sra $a0, $a0, 16 /* 04088 808DA8F8 3C01808F */ lui $at, %hi(D_808F7FA4) ## $at = 808F0000 -/* 0408C 808DA8FC C4247FA4 */ lwc1 $f4, %lo(D_808F7FA4)($at) +/* 0408C 808DA8FC C4247FA4 */ lwc1 $f4, %lo(D_808F7FA4)($at) /* 04090 808DA900 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 04094 808DA904 46040182 */ mul.s $f6, $f0, $f4 -/* 04098 808DA908 0C01E221 */ jal func_80078884 +/* 04094 808DA904 46040182 */ mul.s $f6, $f0, $f4 +/* 04098 808DA908 0C01E221 */ jal func_80078884 /* 0409C 808DA90C E606070C */ swc1 $f6, 0x070C($s0) ## 0000070C /* 040A0 808DA910 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 040A4 808DA914 44810000 */ mtc1 $at, $f0 ## $f0 = 5.00 @@ -1520,7 +1520,7 @@ glabel L808DA8C8 /* 040B0 808DA920 3C01808F */ lui $at, %hi(D_808F7FA8) ## $at = 808F0000 /* 040B4 808DA924 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 040B8 808DA928 E6080680 */ swc1 $f8, 0x0680($s0) ## 00000680 -/* 040BC 808DA92C C42A7FA8 */ lwc1 $f10, %lo(D_808F7FA8)($at) +/* 040BC 808DA92C C42A7FA8 */ lwc1 $f10, %lo(D_808F7FA8)($at) /* 040C0 808DA930 3C01C372 */ lui $at, 0xC372 ## $at = C3720000 /* 040C4 808DA934 44818000 */ mtc1 $at, $f16 ## $f16 = -242.00 /* 040C8 808DA938 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1532,34 +1532,34 @@ glabel L808DA8C8 /* 040E0 808DA950 C7320024 */ lwc1 $f18, 0x0024($t9) ## 00000024 /* 040E4 808DA954 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 040E8 808DA958 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 -/* 040EC 808DA95C 46009101 */ sub.s $f4, $f18, $f0 +/* 040EC 808DA95C 46009101 */ sub.s $f4, $f18, $f0 /* 040F0 808DA960 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 040F4 808DA964 8E0B0674 */ lw $t3, 0x0674($s0) ## 00000674 -/* 040F8 808DA968 46062201 */ sub.s $f8, $f4, $f6 +/* 040F8 808DA968 46062201 */ sub.s $f8, $f4, $f6 /* 040FC 808DA96C 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 04100 808DA970 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 04104 808DA974 E608068C */ swc1 $f8, 0x068C($s0) ## 0000068C /* 04108 808DA978 8D090000 */ lw $t1, 0x0000($t0) ## 808F93D4 /* 0410C 808DA97C C52A0028 */ lwc1 $f10, 0x0028($t1) ## 00000028 -/* 04110 808DA980 46105480 */ add.s $f18, $f10, $f16 +/* 04110 808DA980 46105480 */ add.s $f18, $f10, $f16 /* 04114 808DA984 44818000 */ mtc1 $at, $f16 ## $f16 = 25.00 /* 04118 808DA988 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 0411C 808DA98C 46009100 */ add.s $f4, $f18, $f0 -/* 04120 808DA990 46062201 */ sub.s $f8, $f4, $f6 +/* 0411C 808DA98C 46009100 */ add.s $f4, $f18, $f0 +/* 04120 808DA990 46062201 */ sub.s $f8, $f4, $f6 /* 04124 808DA994 44812000 */ mtc1 $at, $f4 ## $f4 = 80.00 -/* 04128 808DA998 2D610033 */ sltiu $at, $t3, 0x0033 +/* 04128 808DA998 2D610033 */ sltiu $at, $t3, 0x0033 /* 0412C 808DA99C E6080690 */ swc1 $f8, 0x0690($s0) ## 00000690 /* 04130 808DA9A0 8D0A0000 */ lw $t2, 0x0000($t0) ## 808F93D4 /* 04134 808DA9A4 C54A002C */ lwc1 $f10, 0x002C($t2) ## 0000002C -/* 04138 808DA9A8 46105481 */ sub.s $f18, $f10, $f16 -/* 0413C 808DA9AC 46049180 */ add.s $f6, $f18, $f4 -/* 04140 808DA9B0 1420000D */ bne $at, $zero, .L808DA9E8 +/* 04138 808DA9A8 46105481 */ sub.s $f18, $f10, $f16 +/* 0413C 808DA9AC 46049180 */ add.s $f6, $f18, $f4 +/* 04140 808DA9B0 1420000D */ bne $at, $zero, .L808DA9E8 /* 04144 808DA9B4 E6060694 */ swc1 $f6, 0x0694($s0) ## 00000694 -/* 04148 808DA9B8 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 0414C 808DA9BC 0C042F6F */ jal func_8010BDBC +/* 04148 808DA9B8 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 0414C 808DA9BC 0C042F6F */ jal func_8010BDBC /* 04150 808DA9C0 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 /* 04154 808DA9C4 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 -/* 04158 808DA9C8 14400007 */ bne $v0, $zero, .L808DA9E8 +/* 04158 808DA9C8 14400007 */ bne $v0, $zero, .L808DA9E8 /* 0415C 808DA9CC 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 /* 04160 808DA9D0 8D0D0000 */ lw $t5, 0x0000($t0) ## 808F93D4 /* 04164 808DA9D4 240C0007 */ addiu $t4, $zero, 0x0007 ## $t4 = 00000007 @@ -1568,27 +1568,27 @@ glabel L808DA8C8 /* 04170 808DA9E0 A60E0678 */ sh $t6, 0x0678($s0) ## 00000678 /* 04174 808DA9E4 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA9E8: -/* 04178 808DA9E8 10000060 */ beq $zero, $zero, .L808DAB6C +/* 04178 808DA9E8 10000060 */ beq $zero, $zero, .L808DAB6C /* 0417C 808DA9EC 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA9F0 /* 04180 808DA9F0 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 -/* 04184 808DA9F4 00800821 */ addu $at, $a0, $zero -/* 04188 808DA9F8 00042080 */ sll $a0, $a0, 2 -/* 0418C 808DA9FC 00812023 */ subu $a0, $a0, $at -/* 04190 808DAA00 000420C0 */ sll $a0, $a0, 3 -/* 04194 808DAA04 00812021 */ addu $a0, $a0, $at -/* 04198 808DAA08 00042080 */ sll $a0, $a0, 2 -/* 0419C 808DAA0C 00812023 */ subu $a0, $a0, $at -/* 041A0 808DAA10 00042200 */ sll $a0, $a0, 8 -/* 041A4 808DAA14 00042400 */ sll $a0, $a0, 16 +/* 04184 808DA9F4 00800821 */ addu $at, $a0, $zero +/* 04188 808DA9F8 00042080 */ sll $a0, $a0, 2 +/* 0418C 808DA9FC 00812023 */ subu $a0, $a0, $at +/* 04190 808DAA00 000420C0 */ sll $a0, $a0, 3 +/* 04194 808DAA04 00812021 */ addu $a0, $a0, $at +/* 04198 808DAA08 00042080 */ sll $a0, $a0, 2 +/* 0419C 808DAA0C 00812023 */ subu $a0, $a0, $at +/* 041A0 808DAA10 00042200 */ sll $a0, $a0, 8 +/* 041A4 808DAA14 00042400 */ sll $a0, $a0, 16 /* 041A8 808DAA18 0C01DE1C */ jal Math_Sins ## sins? -/* 041AC 808DAA1C 00042403 */ sra $a0, $a0, 16 +/* 041AC 808DAA1C 00042403 */ sra $a0, $a0, 16 /* 041B0 808DAA20 3C01808F */ lui $at, %hi(D_808F7FAC) ## $at = 808F0000 -/* 041B4 808DAA24 C4287FAC */ lwc1 $f8, %lo(D_808F7FAC)($at) +/* 041B4 808DAA24 C4287FAC */ lwc1 $f8, %lo(D_808F7FAC)($at) /* 041B8 808DAA28 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 041BC 808DAA2C 46080282 */ mul.s $f10, $f0, $f8 -/* 041C0 808DAA30 0C01E221 */ jal func_80078884 +/* 041BC 808DAA2C 46080282 */ mul.s $f10, $f0, $f8 +/* 041C0 808DAA30 0C01E221 */ jal func_80078884 /* 041C4 808DAA34 E60A070C */ swc1 $f10, 0x070C($s0) ## 0000070C /* 041C8 808DAA38 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 041CC 808DAA3C 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1598,11 +1598,11 @@ glabel L808DA9F0 /* 041DC 808DAA4C C5F00024 */ lwc1 $f16, 0x0024($t7) ## 00000024 /* 041E0 808DAA50 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 041E4 808DAA54 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 041E8 808DAA58 46008481 */ sub.s $f18, $f16, $f0 +/* 041E8 808DAA58 46008481 */ sub.s $f18, $f16, $f0 /* 041EC 808DAA5C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 041F0 808DAA60 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 /* 041F4 808DAA64 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 041F8 808DAA68 46049181 */ sub.s $f6, $f18, $f4 +/* 041F8 808DAA68 46049181 */ sub.s $f6, $f18, $f4 /* 041FC 808DAA6C 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 04200 808DAA70 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 04204 808DAA74 8E090674 */ lw $t1, 0x0674($s0) ## 00000674 @@ -1610,22 +1610,22 @@ glabel L808DA9F0 /* 0420C 808DAA7C 8D180000 */ lw $t8, 0x0000($t0) ## 808F93D4 /* 04210 808DAA80 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04214 808DAA84 C7080028 */ lwc1 $f8, 0x0028($t8) ## 00000028 -/* 04218 808DAA88 460A4400 */ add.s $f16, $f8, $f10 +/* 04218 808DAA88 460A4400 */ add.s $f16, $f8, $f10 /* 0421C 808DAA8C 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 /* 04220 808DAA90 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 04224 808DAA94 46008480 */ add.s $f18, $f16, $f0 -/* 04228 808DAA98 46049181 */ sub.s $f6, $f18, $f4 +/* 04224 808DAA94 46008480 */ add.s $f18, $f16, $f0 +/* 04228 808DAA98 46049181 */ sub.s $f6, $f18, $f4 /* 0422C 808DAA9C 44819000 */ mtc1 $at, $f18 ## $f18 = 80.00 -/* 04230 808DAAA0 2D210033 */ sltiu $at, $t1, 0x0033 +/* 04230 808DAAA0 2D210033 */ sltiu $at, $t1, 0x0033 /* 04234 808DAAA4 E6060690 */ swc1 $f6, 0x0690($s0) ## 00000690 /* 04238 808DAAA8 8D190000 */ lw $t9, 0x0000($t0) ## 808F93D4 /* 0423C 808DAAAC C728002C */ lwc1 $f8, 0x002C($t9) ## 0000002C -/* 04240 808DAAB0 460A4401 */ sub.s $f16, $f8, $f10 -/* 04244 808DAAB4 46128100 */ add.s $f4, $f16, $f18 -/* 04248 808DAAB8 14200027 */ bne $at, $zero, .L808DAB58 +/* 04240 808DAAB0 460A4401 */ sub.s $f16, $f8, $f10 +/* 04244 808DAAB4 46128100 */ add.s $f4, $f16, $f18 +/* 04248 808DAAB8 14200027 */ bne $at, $zero, .L808DAB58 /* 0424C 808DAABC E6040694 */ swc1 $f4, 0x0694($s0) ## 00000694 -/* 04250 808DAAC0 0C030129 */ jal func_800C04A4 -/* 04254 808DAAC4 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 04250 808DAAC0 0C030129 */ jal func_800C04A4 +/* 04254 808DAAC4 8FA400B4 */ lw $a0, 0x00B4($sp) /* 04258 808DAAC8 26030680 */ addiu $v1, $s0, 0x0680 ## $v1 = 00000680 /* 0425C 808DAACC 8C6B0000 */ lw $t3, 0x0000($v1) ## 00000680 /* 04260 808DAAD0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 @@ -1647,114 +1647,114 @@ glabel L808DA9F0 /* 042A0 808DAB10 8E0F0694 */ lw $t7, 0x0694($s0) ## 00000694 /* 042A4 808DAB14 AC4F0058 */ sw $t7, 0x0058($v0) ## 00000058 /* 042A8 808DAB18 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 042AC 808DAB1C 0C03022B */ jal func_800C08AC -/* 042B0 808DAB20 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 042B4 808DAB24 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 042AC 808DAB1C 0C03022B */ jal func_800C08AC +/* 042B0 808DAB20 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 042B4 808DAB24 8FA400B4 */ lw $a0, 0x00B4($sp) /* 042B8 808DAB28 2418006D */ addiu $t8, $zero, 0x006D ## $t8 = 0000006D /* 042BC 808DAB2C A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 042C0 808DAB30 A600067A */ sh $zero, 0x067A($s0) ## 0000067A -/* 042C4 808DAB34 0C01914D */ jal func_80064534 +/* 042C4 808DAB34 0C01914D */ jal func_80064534 /* 042C8 808DAB38 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 042CC 808DAB3C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 042CC 808DAB3C 8FA400B4 */ lw $a0, 0x00B4($sp) /* 042D0 808DAB40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 042D4 808DAB44 0C00B7D5 */ jal func_8002DF54 +/* 042D4 808DAB44 0C00B7D5 */ jal func_8002DF54 /* 042D8 808DAB48 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 042DC 808DAB4C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 042DC 808DAB4C 8FA400B4 */ lw $a0, 0x00B4($sp) /* 042E0 808DAB50 0C00B2DD */ jal Flags_SetSwitch - + /* 042E4 808DAB54 24050037 */ addiu $a1, $zero, 0x0037 ## $a1 = 00000037 .L808DAB58: -/* 042E8 808DAB58 10000004 */ beq $zero, $zero, .L808DAB6C +/* 042E8 808DAB58 10000004 */ beq $zero, $zero, .L808DAB6C /* 042EC 808DAB5C 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DAB60 -/* 042F0 808DAB60 0C01E221 */ jal func_80078884 +/* 042F0 808DAB60 0C01E221 */ jal func_80078884 /* 042F4 808DAB64 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 /* 042F8 808DAB68 86040678 */ lh $a0, 0x0678($s0) ## 00000678 .L808DAB6C: -/* 042FC 808DAB6C 28810064 */ slti $at, $a0, 0x0064 +/* 042FC 808DAB6C 28810064 */ slti $at, $a0, 0x0064 .L808DAB70: -/* 04300 808DAB70 14200002 */ bne $at, $zero, .L808DAB7C +/* 04300 808DAB70 14200002 */ bne $at, $zero, .L808DAB7C /* 04304 808DAB74 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 /* 04308 808DAB78 A21901A0 */ sb $t9, 0x01A0($s0) ## 000001A0 .L808DAB7C: /* 0430C 808DAB7C 8609067A */ lh $t1, 0x067A($s0) ## 0000067A /* 04310 808DAB80 260A0680 */ addiu $t2, $s0, 0x0680 ## $t2 = 00000680 -/* 04314 808DAB84 51200054 */ beql $t1, $zero, .L808DACD8 -/* 04318 808DAB88 8FBF003C */ lw $ra, 0x003C($sp) -/* 0431C 808DAB8C 93AC00AD */ lbu $t4, 0x00AD($sp) +/* 04314 808DAB84 51200054 */ beql $t1, $zero, .L808DACD8 +/* 04318 808DAB88 8FBF003C */ lw $ra, 0x003C($sp) +/* 0431C 808DAB8C 93AC00AD */ lbu $t4, 0x00AD($sp) /* 04320 808DAB90 260B068C */ addiu $t3, $s0, 0x068C ## $t3 = 0000068C -/* 04324 808DAB94 AFAB0044 */ sw $t3, 0x0044($sp) -/* 04328 808DAB98 1180003E */ beq $t4, $zero, .L808DAC94 -/* 0432C 808DAB9C AFAA0058 */ sw $t2, 0x0058($sp) +/* 04324 808DAB94 AFAB0044 */ sw $t3, 0x0044($sp) +/* 04328 808DAB98 1180003E */ beq $t4, $zero, .L808DAC94 +/* 0432C 808DAB9C AFAA0058 */ sw $t2, 0x0058($sp) /* 04330 808DABA0 C60606A4 */ lwc1 $f6, 0x06A4($s0) ## 000006A4 /* 04334 808DABA4 C60806EC */ lwc1 $f8, 0x06EC($s0) ## 000006EC /* 04338 808DABA8 8E0506BC */ lw $a1, 0x06BC($s0) ## 000006BC /* 0433C 808DABAC 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 04340 808DABB0 46083282 */ mul.s $f10, $f6, $f8 +/* 04340 808DABB0 46083282 */ mul.s $f10, $f6, $f8 /* 04344 808DABB4 260D0688 */ addiu $t5, $s0, 0x0688 ## $t5 = 00000688 /* 04348 808DABB8 260E0690 */ addiu $t6, $s0, 0x0690 ## $t6 = 00000690 /* 0434C 808DABBC 260F0694 */ addiu $t7, $s0, 0x0694 ## $t7 = 00000694 /* 04350 808DABC0 26180684 */ addiu $t8, $s0, 0x0684 ## $t8 = 00000684 -/* 04354 808DABC4 AFB80048 */ sw $t8, 0x0048($sp) -/* 04358 808DABC8 AFAF004C */ sw $t7, 0x004C($sp) -/* 0435C 808DABCC 44075000 */ mfc1 $a3, $f10 -/* 04360 808DABD0 AFAE0050 */ sw $t6, 0x0050($sp) -/* 04364 808DABD4 AFAD0054 */ sw $t5, 0x0054($sp) +/* 04354 808DABC4 AFB80048 */ sw $t8, 0x0048($sp) +/* 04358 808DABC8 AFAF004C */ sw $t7, 0x004C($sp) +/* 0435C 808DABCC 44075000 */ mfc1 $a3, $f10 +/* 04360 808DABD0 AFAE0050 */ sw $t6, 0x0050($sp) +/* 04364 808DABD4 AFAD0054 */ sw $t5, 0x0054($sp) /* 04368 808DABD8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0436C 808DABDC 01402025 */ or $a0, $t2, $zero ## $a0 = 00000680 /* 04370 808DABE0 C61006A8 */ lwc1 $f16, 0x06A8($s0) ## 000006A8 /* 04374 808DABE4 C61206EC */ lwc1 $f18, 0x06EC($s0) ## 000006EC -/* 04378 808DABE8 8FA40048 */ lw $a0, 0x0048($sp) +/* 04378 808DABE8 8FA40048 */ lw $a0, 0x0048($sp) /* 0437C 808DABEC 8E0506C0 */ lw $a1, 0x06C0($s0) ## 000006C0 -/* 04380 808DABF0 46128102 */ mul.s $f4, $f16, $f18 +/* 04380 808DABF0 46128102 */ mul.s $f4, $f16, $f18 /* 04384 808DABF4 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 04388 808DABF8 44072000 */ mfc1 $a3, $f4 +/* 04388 808DABF8 44072000 */ mfc1 $a3, $f4 /* 0438C 808DABFC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04390 808DAC00 00000000 */ nop /* 04394 808DAC04 C60606AC */ lwc1 $f6, 0x06AC($s0) ## 000006AC /* 04398 808DAC08 C60806EC */ lwc1 $f8, 0x06EC($s0) ## 000006EC -/* 0439C 808DAC0C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0439C 808DAC0C 8FA40054 */ lw $a0, 0x0054($sp) /* 043A0 808DAC10 8E0506C4 */ lw $a1, 0x06C4($s0) ## 000006C4 -/* 043A4 808DAC14 46083282 */ mul.s $f10, $f6, $f8 +/* 043A4 808DAC14 46083282 */ mul.s $f10, $f6, $f8 /* 043A8 808DAC18 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 043AC 808DAC1C 44075000 */ mfc1 $a3, $f10 +/* 043AC 808DAC1C 44075000 */ mfc1 $a3, $f10 /* 043B0 808DAC20 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 043B4 808DAC24 00000000 */ nop /* 043B8 808DAC28 C61006B0 */ lwc1 $f16, 0x06B0($s0) ## 000006B0 /* 043BC 808DAC2C C61206EC */ lwc1 $f18, 0x06EC($s0) ## 000006EC -/* 043C0 808DAC30 8FA40044 */ lw $a0, 0x0044($sp) +/* 043C0 808DAC30 8FA40044 */ lw $a0, 0x0044($sp) /* 043C4 808DAC34 8E0506D4 */ lw $a1, 0x06D4($s0) ## 000006D4 -/* 043C8 808DAC38 46128102 */ mul.s $f4, $f16, $f18 +/* 043C8 808DAC38 46128102 */ mul.s $f4, $f16, $f18 /* 043CC 808DAC3C 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 043D0 808DAC40 44072000 */ mfc1 $a3, $f4 +/* 043D0 808DAC40 44072000 */ mfc1 $a3, $f4 /* 043D4 808DAC44 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 043D8 808DAC48 00000000 */ nop /* 043DC 808DAC4C C60606B4 */ lwc1 $f6, 0x06B4($s0) ## 000006B4 /* 043E0 808DAC50 C60806EC */ lwc1 $f8, 0x06EC($s0) ## 000006EC -/* 043E4 808DAC54 8FA40050 */ lw $a0, 0x0050($sp) +/* 043E4 808DAC54 8FA40050 */ lw $a0, 0x0050($sp) /* 043E8 808DAC58 8E0506D8 */ lw $a1, 0x06D8($s0) ## 000006D8 -/* 043EC 808DAC5C 46083282 */ mul.s $f10, $f6, $f8 +/* 043EC 808DAC5C 46083282 */ mul.s $f10, $f6, $f8 /* 043F0 808DAC60 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 043F4 808DAC64 44075000 */ mfc1 $a3, $f10 +/* 043F4 808DAC64 44075000 */ mfc1 $a3, $f10 /* 043F8 808DAC68 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 043FC 808DAC6C 00000000 */ nop /* 04400 808DAC70 C61006B8 */ lwc1 $f16, 0x06B8($s0) ## 000006B8 /* 04404 808DAC74 C61206EC */ lwc1 $f18, 0x06EC($s0) ## 000006EC -/* 04408 808DAC78 8FA4004C */ lw $a0, 0x004C($sp) +/* 04408 808DAC78 8FA4004C */ lw $a0, 0x004C($sp) /* 0440C 808DAC7C 8E0506DC */ lw $a1, 0x06DC($s0) ## 000006DC -/* 04410 808DAC80 46128102 */ mul.s $f4, $f16, $f18 +/* 04410 808DAC80 46128102 */ mul.s $f4, $f16, $f18 /* 04414 808DAC84 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 04418 808DAC88 44072000 */ mfc1 $a3, $f4 +/* 04418 808DAC88 44072000 */ mfc1 $a3, $f4 /* 0441C 808DAC8C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04420 808DAC90 00000000 */ nop .L808DAC94: -/* 04424 808DAC94 8FB90044 */ lw $t9, 0x0044($sp) +/* 04424 808DAC94 8FB90044 */ lw $t9, 0x0044($sp) /* 04428 808DAC98 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFFB4 /* 0442C 808DAC9C 8F2A0000 */ lw $t2, 0x0000($t9) ## 00000000 /* 04430 808DACA0 ACCA0000 */ sw $t2, 0x0000($a2) ## FFFFFFB4 @@ -1762,19 +1762,19 @@ glabel L808DAB60 /* 04438 808DACA8 ACC90004 */ sw $t1, 0x0004($a2) ## FFFFFFB8 /* 0443C 808DACAC 8F2A0008 */ lw $t2, 0x0008($t9) ## 00000008 /* 04440 808DACB0 ACCA0008 */ sw $t2, 0x0008($a2) ## FFFFFFBC -/* 04444 808DACB4 C7A60068 */ lwc1 $f6, 0x0068($sp) +/* 04444 808DACB4 C7A60068 */ lwc1 $f6, 0x0068($sp) /* 04448 808DACB8 C608070C */ lwc1 $f8, 0x070C($s0) ## 0000070C -/* 0444C 808DACBC 8FA70058 */ lw $a3, 0x0058($sp) -/* 04450 808DACC0 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 04454 808DACC4 46083280 */ add.s $f10, $f6, $f8 -/* 04458 808DACC8 E7AA0068 */ swc1 $f10, 0x0068($sp) -/* 0445C 808DACCC 0C030136 */ jal func_800C04D8 +/* 0444C 808DACBC 8FA70058 */ lw $a3, 0x0058($sp) +/* 04450 808DACC0 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 04454 808DACC4 46083280 */ add.s $f10, $f6, $f8 +/* 04458 808DACC8 E7AA0068 */ swc1 $f10, 0x0068($sp) +/* 0445C 808DACCC 0C030136 */ jal func_800C04D8 /* 04460 808DACD0 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 04464 808DACD4 8FBF003C */ lw $ra, 0x003C($sp) +/* 04464 808DACD4 8FBF003C */ lw $ra, 0x003C($sp) .L808DACD8: -/* 04468 808DACD8 8FB00038 */ lw $s0, 0x0038($sp) +/* 04468 808DACD8 8FB00038 */ lw $s0, 0x0038($sp) /* 0446C 808DACDC 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 -/* 04470 808DACE0 03E00008 */ jr $ra +/* 04470 808DACE0 03E00008 */ jr $ra /* 04474 808DACE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s index 736ea9bf45..d045e9add4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s @@ -1,160 +1,160 @@ glabel func_808DB2E8 /* 04A78 808DB2E8 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 04A7C 808DB2EC AFB10048 */ sw $s1, 0x0048($sp) +/* 04A7C 808DB2EC AFB10048 */ sw $s1, 0x0048($sp) /* 04A80 808DB2F0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 04A84 808DB2F4 AFBF004C */ sw $ra, 0x004C($sp) +/* 04A84 808DB2F4 AFBF004C */ sw $ra, 0x004C($sp) /* 04A88 808DB2F8 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 04A8C 808DB2FC AFB00044 */ sw $s0, 0x0044($sp) -/* 04A90 808DB300 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 04A94 808DB304 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 04A98 808DB308 AFA5009C */ sw $a1, 0x009C($sp) +/* 04A8C 808DB2FC AFB00044 */ sw $s0, 0x0044($sp) +/* 04A90 808DB300 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 04A94 808DB304 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 04A98 808DB308 AFA5009C */ sw $a1, 0x009C($sp) /* 04A9C 808DB30C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 04AA0 808DB310 AFA4005C */ sw $a0, 0x005C($sp) + +/* 04AA0 808DB310 AFA4005C */ sw $a0, 0x005C($sp) /* 04AA4 808DB314 862401A2 */ lh $a0, 0x01A2($s1) ## 000001A2 -/* 04AA8 808DB318 00800821 */ addu $at, $a0, $zero -/* 04AAC 808DB31C 00042080 */ sll $a0, $a0, 2 -/* 04AB0 808DB320 00812021 */ addu $a0, $a0, $at -/* 04AB4 808DB324 00042200 */ sll $a0, $a0, 8 -/* 04AB8 808DB328 00042400 */ sll $a0, $a0, 16 +/* 04AA8 808DB318 00800821 */ addu $at, $a0, $zero +/* 04AAC 808DB31C 00042080 */ sll $a0, $a0, 2 +/* 04AB0 808DB320 00812021 */ addu $a0, $a0, $at +/* 04AB4 808DB324 00042200 */ sll $a0, $a0, 8 +/* 04AB8 808DB328 00042400 */ sll $a0, $a0, 16 /* 04ABC 808DB32C 0C01DE1C */ jal Math_Sins ## sins? -/* 04AC0 808DB330 00042403 */ sra $a0, $a0, 16 +/* 04AC0 808DB330 00042403 */ sra $a0, $a0, 16 /* 04AC4 808DB334 862401A2 */ lh $a0, 0x01A2($s1) ## 000001A2 /* 04AC8 808DB338 C62401D0 */ lwc1 $f4, 0x01D0($s1) ## 000001D0 -/* 04ACC 808DB33C 00800821 */ addu $at, $a0, $zero -/* 04AD0 808DB340 000420C0 */ sll $a0, $a0, 3 -/* 04AD4 808DB344 00812023 */ subu $a0, $a0, $at -/* 04AD8 808DB348 00042200 */ sll $a0, $a0, 8 -/* 04ADC 808DB34C 00042400 */ sll $a0, $a0, 16 -/* 04AE0 808DB350 46002502 */ mul.s $f20, $f4, $f0 +/* 04ACC 808DB33C 00800821 */ addu $at, $a0, $zero +/* 04AD0 808DB340 000420C0 */ sll $a0, $a0, 3 +/* 04AD4 808DB344 00812023 */ subu $a0, $a0, $at +/* 04AD8 808DB348 00042200 */ sll $a0, $a0, 8 +/* 04ADC 808DB34C 00042400 */ sll $a0, $a0, 16 +/* 04AE0 808DB350 46002502 */ mul.s $f20, $f4, $f0 /* 04AE4 808DB354 0C01DE0D */ jal Math_Coss ## coss? -/* 04AE8 808DB358 00042403 */ sra $a0, $a0, 16 +/* 04AE8 808DB358 00042403 */ sra $a0, $a0, 16 /* 04AEC 808DB35C C62601D0 */ lwc1 $f6, 0x01D0($s1) ## 000001D0 -/* 04AF0 808DB360 4405A000 */ mfc1 $a1, $f20 +/* 04AF0 808DB360 4405A000 */ mfc1 $a1, $f20 /* 04AF4 808DB364 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 04AF8 808DB368 46003582 */ mul.s $f22, $f6, $f0 +/* 04AF8 808DB368 46003582 */ mul.s $f22, $f6, $f0 /* 04AFC 808DB36C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04B00 808DB370 26240024 */ addiu $a0, $s1, 0x0024 ## $a0 = 00000024 /* 04B04 808DB374 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04B08 808DB378 8E2701C8 */ lw $a3, 0x01C8($s1) ## 000001C8 -/* 04B0C 808DB37C 4405B000 */ mfc1 $a1, $f22 +/* 04B0C 808DB37C 4405B000 */ mfc1 $a1, $f22 /* 04B10 808DB380 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 04B14 808DB384 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04B18 808DB388 2624002C */ addiu $a0, $s1, 0x002C ## $a0 = 0000002C /* 04B1C 808DB38C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04B20 808DB390 8E2701C8 */ lw $a3, 0x01C8($s1) ## 000001C8 /* 04B24 808DB394 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04B28 808DB398 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 /* 04B2C 808DB39C 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 /* 04B30 808DB3A0 262401D0 */ addiu $a0, $s1, 0x01D0 ## $a0 = 000001D0 -/* 04B34 808DB3A4 4406A000 */ mfc1 $a2, $f20 -/* 04B38 808DB3A8 4405B000 */ mfc1 $a1, $f22 +/* 04B34 808DB3A4 4406A000 */ mfc1 $a2, $f20 +/* 04B38 808DB3A8 4405B000 */ mfc1 $a1, $f22 /* 04B3C 808DB3AC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04B40 808DB3B0 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 04B44 808DB3B4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 04B48 808DB3B8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04B4C 808DB3BC 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 04B50 808DB3C0 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 04B54 808DB3C4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04B58 808DB3C8 8E270060 */ lw $a3, 0x0060($s1) ## 00000060 -/* 04B5C 808DB3CC 4406A000 */ mfc1 $a2, $f20 -/* 04B60 808DB3D0 4407A000 */ mfc1 $a3, $f20 +/* 04B5C 808DB3CC 4406A000 */ mfc1 $a2, $f20 +/* 04B60 808DB3D0 4407A000 */ mfc1 $a3, $f20 /* 04B64 808DB3D4 26240060 */ addiu $a0, $s1, 0x0060 ## $a0 = 00000060 /* 04B68 808DB3D8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04B6C 808DB3DC 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 /* 04B70 808DB3E0 962E01C2 */ lhu $t6, 0x01C2($s1) ## 000001C2 -/* 04B74 808DB3E4 2DC10006 */ sltiu $at, $t6, 0x0006 -/* 04B78 808DB3E8 102001BA */ beq $at, $zero, .L808DBAD4 -/* 04B7C 808DB3EC 000E7080 */ sll $t6, $t6, 2 +/* 04B74 808DB3E4 2DC10006 */ sltiu $at, $t6, 0x0006 +/* 04B78 808DB3E8 102001BA */ beq $at, $zero, .L808DBAD4 +/* 04B7C 808DB3EC 000E7080 */ sll $t6, $t6, 2 /* 04B80 808DB3F0 3C01808F */ lui $at, %hi(jtbl_808F7FD0) ## $at = 808F0000 -/* 04B84 808DB3F4 002E0821 */ addu $at, $at, $t6 -/* 04B88 808DB3F8 8C2E7FD0 */ lw $t6, %lo(jtbl_808F7FD0)($at) -/* 04B8C 808DB3FC 01C00008 */ jr $t6 +/* 04B84 808DB3F4 002E0821 */ addu $at, $at, $t6 +/* 04B88 808DB3F8 8C2E7FD0 */ lw $t6, %lo(jtbl_808F7FD0)($at) +/* 04B8C 808DB3FC 01C00008 */ jr $t6 /* 04B90 808DB400 00000000 */ nop glabel L808DB404 /* 04B94 808DB404 862F01B6 */ lh $t7, 0x01B6($s1) ## 000001B6 /* 04B98 808DB408 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 04B9C 808DB40C 26101B0C */ addiu $s0, $s0, 0x1B0C ## $s0 = 06001B0C -/* 04BA0 808DB410 55E001B1 */ bnel $t7, $zero, .L808DBAD8 -/* 04BA4 808DB414 8FBF004C */ lw $ra, 0x004C($sp) +/* 04BA0 808DB410 55E001B1 */ bnel $t7, $zero, .L808DBAD8 +/* 04BA4 808DB414 8FBF004C */ lw $ra, 0x004C($sp) /* 04BA8 808DB418 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04BAC 808DB41C 02002025 */ or $a0, $s0, $zero ## $a0 = 06001B0C /* 04BB0 808DB420 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 04BB4 808DB424 4406B000 */ mfc1 $a2, $f22 +/* 04BB4 808DB424 4406B000 */ mfc1 $a2, $f22 /* 04BB8 808DB428 02002825 */ or $a1, $s0, $zero ## $a1 = 06001B0C -/* 04BBC 808DB42C 468042A0 */ cvt.s.w $f10, $f8 +/* 04BBC 808DB42C 468042A0 */ cvt.s.w $f10, $f8 /* 04BC0 808DB430 E62A01CC */ swc1 $f10, 0x01CC($s1) ## 000001CC -/* 04BC4 808DB434 0C029490 */ jal func_800A5240 -/* 04BC8 808DB438 8FA4005C */ lw $a0, 0x005C($sp) +/* 04BC4 808DB434 0C029490 */ jal func_800A5240 +/* 04BC8 808DB438 8FA4005C */ lw $a0, 0x005C($sp) /* 04BCC 808DB43C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 04BD0 808DB440 100001A4 */ beq $zero, $zero, .L808DBAD4 +/* 04BD0 808DB440 100001A4 */ beq $zero, $zero, .L808DBAD4 /* 04BD4 808DB444 A63801C2 */ sh $t8, 0x01C2($s1) ## 000001C2 glabel L808DB448 -/* 04BD8 808DB448 8FA4005C */ lw $a0, 0x005C($sp) -/* 04BDC 808DB44C 0C0295B2 */ jal func_800A56C8 +/* 04BD8 808DB448 8FA4005C */ lw $a0, 0x005C($sp) +/* 04BDC 808DB44C 0C0295B2 */ jal func_800A56C8 /* 04BE0 808DB450 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 04BE4 808DB454 1040019F */ beq $v0, $zero, .L808DBAD4 +/* 04BE4 808DB454 1040019F */ beq $v0, $zero, .L808DBAD4 /* 04BE8 808DB458 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 04BEC 808DB45C 26101FF8 */ addiu $s0, $s0, 0x1FF8 ## $s0 = 06001FF8 /* 04BF0 808DB460 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04BF4 808DB464 02002025 */ or $a0, $s0, $zero ## $a0 = 06001FF8 /* 04BF8 808DB468 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 04BFC 808DB46C 4406B000 */ mfc1 $a2, $f22 +/* 04BFC 808DB46C 4406B000 */ mfc1 $a2, $f22 /* 04C00 808DB470 02002825 */ or $a1, $s0, $zero ## $a1 = 06001FF8 -/* 04C04 808DB474 468084A0 */ cvt.s.w $f18, $f16 +/* 04C04 808DB474 468084A0 */ cvt.s.w $f18, $f16 /* 04C08 808DB478 E63201CC */ swc1 $f18, 0x01CC($s1) ## 000001CC -/* 04C0C 808DB47C 0C0294D3 */ jal func_800A534C -/* 04C10 808DB480 8FA4005C */ lw $a0, 0x005C($sp) +/* 04C0C 808DB47C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 04C10 808DB480 8FA4005C */ lw $a0, 0x005C($sp) /* 04C14 808DB484 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 04C18 808DB488 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 /* 04C1C 808DB48C A63901C2 */ sh $t9, 0x01C2($s1) ## 000001C2 -/* 04C20 808DB490 10000190 */ beq $zero, $zero, .L808DBAD4 +/* 04C20 808DB490 10000190 */ beq $zero, $zero, .L808DBAD4 /* 04C24 808DB494 A62801B6 */ sh $t0, 0x01B6($s1) ## 000001B6 glabel L808DB498 /* 04C28 808DB498 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 04C2C 808DB49C A22901A0 */ sb $t1, 0x01A0($s1) ## 000001A0 /* 04C30 808DB4A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 04C34 808DB4A4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04C38 808DB4A8 2405316C */ addiu $a1, $zero, 0x316C ## $a1 = 0000316C /* 04C3C 808DB4AC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 04C40 808DB4B0 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 04C44 808DB4B4 C62602F0 */ lwc1 $f6, 0x02F0($s1) ## 000002F0 /* 04C48 808DB4B8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 04C4C 808DB4BC C62402EC */ lwc1 $f4, 0x02EC($s1) ## 000002EC -/* 04C50 808DB4C0 46083280 */ add.s $f10, $f6, $f8 +/* 04C50 808DB4C0 46083280 */ add.s $f10, $f6, $f8 /* 04C54 808DB4C4 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 /* 04C58 808DB4C8 E6240278 */ swc1 $f4, 0x0278($s1) ## 00000278 /* 04C5C 808DB4CC C62402F4 */ lwc1 $f4, 0x02F4($s1) ## 000002F4 -/* 04C60 808DB4D0 46105480 */ add.s $f18, $f10, $f16 +/* 04C60 808DB4D0 46105480 */ add.s $f18, $f10, $f16 /* 04C64 808DB4D4 26240284 */ addiu $a0, $s1, 0x0284 ## $a0 = 00000284 /* 04C68 808DB4D8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 04C6C 808DB4DC 3C073BC4 */ lui $a3, 0x3BC4 ## $a3 = 3BC40000 /* 04C70 808DB4E0 E632027C */ swc1 $f18, 0x027C($s1) ## 0000027C /* 04C74 808DB4E4 E6240280 */ swc1 $f4, 0x0280($s1) ## 00000280 -/* 04C78 808DB4E8 AFA40054 */ sw $a0, 0x0054($sp) +/* 04C78 808DB4E8 AFA40054 */ sw $a0, 0x0054($sp) /* 04C7C 808DB4EC 34E79BA6 */ ori $a3, $a3, 0x9BA6 ## $a3 = 3BC49BA6 /* 04C80 808DB4F0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04C84 808DB4F4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04C88 808DB4F8 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 /* 04C8C 808DB4FC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 04C90 808DB500 44810000 */ mtc1 $at, $f0 ## $f0 = 255.00 -/* 04C94 808DB504 4406A000 */ mfc1 $a2, $f20 +/* 04C94 808DB504 4406A000 */ mfc1 $a2, $f20 /* 04C98 808DB508 26240288 */ addiu $a0, $s1, 0x0288 ## $a0 = 00000288 -/* 04C9C 808DB50C 44050000 */ mfc1 $a1, $f0 -/* 04CA0 808DB510 44070000 */ mfc1 $a3, $f0 +/* 04C9C 808DB50C 44050000 */ mfc1 $a1, $f0 +/* 04CA0 808DB510 44070000 */ mfc1 $a3, $f0 /* 04CA4 808DB514 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04CA8 808DB518 00000000 */ nop /* 04CAC 808DB51C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 04CB0 808DB520 3C073BC4 */ lui $a3, 0x3BC4 ## $a3 = 3BC40000 @@ -162,35 +162,35 @@ glabel L808DB498 /* 04CB8 808DB528 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04CBC 808DB52C 2624028C */ addiu $a0, $s1, 0x028C ## $a0 = 0000028C /* 04CC0 808DB530 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04CC4 808DB534 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 /* 04CC8 808DB538 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 -/* 04CCC 808DB53C 28410015 */ slti $at, $v0, 0x0015 -/* 04CD0 808DB540 14200008 */ bne $at, $zero, .L808DB564 -/* 04CD4 808DB544 2841003C */ slti $at, $v0, 0x003C -/* 04CD8 808DB548 10200006 */ beq $at, $zero, .L808DB564 +/* 04CCC 808DB53C 28410015 */ slti $at, $v0, 0x0015 +/* 04CD0 808DB540 14200008 */ bne $at, $zero, .L808DB564 +/* 04CD4 808DB544 2841003C */ slti $at, $v0, 0x003C +/* 04CD8 808DB548 10200006 */ beq $at, $zero, .L808DB564 /* 04CDC 808DB54C 26240290 */ addiu $a0, $s1, 0x0290 ## $a0 = 00000290 -/* 04CE0 808DB550 4406A000 */ mfc1 $a2, $f20 +/* 04CE0 808DB550 4406A000 */ mfc1 $a2, $f20 /* 04CE4 808DB554 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 04CE8 808DB558 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04CEC 808DB55C 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 /* 04CF0 808DB560 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB564: -/* 04CF4 808DB564 14400017 */ bne $v0, $zero, .L808DB5C4 +/* 04CF4 808DB564 14400017 */ bne $v0, $zero, .L808DB5C4 /* 04CF8 808DB568 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 /* 04CFC 808DB56C 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 04D00 808DB570 26100540 */ addiu $s0, $s0, 0x0540 ## $s0 = 06000540 /* 04D04 808DB574 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04D08 808DB578 02002025 */ or $a0, $s0, $zero ## $a0 = 06000540 /* 04D0C 808DB57C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 04D10 808DB580 4406B000 */ mfc1 $a2, $f22 +/* 04D10 808DB580 4406B000 */ mfc1 $a2, $f22 /* 04D14 808DB584 02002825 */ or $a1, $s0, $zero ## $a1 = 06000540 -/* 04D18 808DB588 46803220 */ cvt.s.w $f8, $f6 +/* 04D18 808DB588 46803220 */ cvt.s.w $f8, $f6 /* 04D1C 808DB58C E62801CC */ swc1 $f8, 0x01CC($s1) ## 000001CC -/* 04D20 808DB590 0C029490 */ jal func_800A5240 -/* 04D24 808DB594 8FA4005C */ lw $a0, 0x005C($sp) +/* 04D20 808DB590 0C029490 */ jal func_800A5240 +/* 04D24 808DB594 8FA4005C */ lw $a0, 0x005C($sp) /* 04D28 808DB598 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 04D2C 808DB59C 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 /* 04D30 808DB5A0 240C000F */ addiu $t4, $zero, 0x000F ## $t4 = 0000000F @@ -199,95 +199,95 @@ glabel L808DB498 /* 04D3C 808DB5AC A62C01B8 */ sh $t4, 0x01B8($s1) ## 000001B8 /* 04D40 808DB5B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 04D44 808DB5B4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04D48 808DB5B8 240539D5 */ addiu $a1, $zero, 0x39D5 ## $a1 = 000039D5 -/* 04D4C 808DB5BC 10000146 */ beq $zero, $zero, .L808DBAD8 -/* 04D50 808DB5C0 8FBF004C */ lw $ra, 0x004C($sp) +/* 04D4C 808DB5BC 10000146 */ beq $zero, $zero, .L808DBAD8 +/* 04D50 808DB5C0 8FBF004C */ lw $ra, 0x004C($sp) .L808DB5C4: /* 04D54 808DB5C4 8625008A */ lh $a1, 0x008A($s1) ## 0000008A /* 04D58 808DB5C8 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 04D5C 808DB5CC 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 04D60 808DB5D0 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 04D64 808DB5D4 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 /* 04D68 808DB5D8 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 04D6C 808DB5DC 2841FFFC */ slti $at, $v0, 0xFFFC -/* 04D70 808DB5E0 1020000F */ beq $at, $zero, .L808DB620 -/* 04D74 808DB5E4 00106880 */ sll $t5, $s0, 2 +/* 04D6C 808DB5DC 2841FFFC */ slti $at, $v0, 0xFFFC +/* 04D70 808DB5E0 1020000F */ beq $at, $zero, .L808DB620 +/* 04D74 808DB5E4 00106880 */ sll $t5, $s0, 2 .L808DB5E8: -/* 04D78 808DB5E8 022D2021 */ addu $a0, $s1, $t5 -/* 04D7C 808DB5EC 4405B000 */ mfc1 $a1, $f22 -/* 04D80 808DB5F0 4406A000 */ mfc1 $a2, $f20 +/* 04D78 808DB5E8 022D2021 */ addu $a0, $s1, $t5 +/* 04D7C 808DB5EC 4405B000 */ mfc1 $a1, $f22 +/* 04D80 808DB5F0 4406A000 */ mfc1 $a2, $f20 /* 04D84 808DB5F4 24840294 */ addiu $a0, $a0, 0x0294 ## $a0 = 00000294 /* 04D88 808DB5F8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04D8C 808DB5FC 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 04D90 808DB600 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 04D94 808DB604 00108400 */ sll $s0, $s0, 16 -/* 04D98 808DB608 00108403 */ sra $s0, $s0, 16 -/* 04D9C 808DB60C 2A01000F */ slti $at, $s0, 0x000F -/* 04DA0 808DB610 5420FFF5 */ bnel $at, $zero, .L808DB5E8 -/* 04DA4 808DB614 00106880 */ sll $t5, $s0, 2 -/* 04DA8 808DB618 1000001D */ beq $zero, $zero, .L808DB690 +/* 04D94 808DB604 00108400 */ sll $s0, $s0, 16 +/* 04D98 808DB608 00108403 */ sra $s0, $s0, 16 +/* 04D9C 808DB60C 2A01000F */ slti $at, $s0, 0x000F +/* 04DA0 808DB610 5420FFF5 */ bnel $at, $zero, .L808DB5E8 +/* 04DA4 808DB614 00106880 */ sll $t5, $s0, 2 +/* 04DA8 808DB618 1000001D */ beq $zero, $zero, .L808DB690 /* 04DAC 808DB61C 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB620: -/* 04DB0 808DB620 28410007 */ slti $at, $v0, 0x0007 -/* 04DB4 808DB624 14200019 */ bne $at, $zero, .L808DB68C -/* 04DB8 808DB628 2841001A */ slti $at, $v0, 0x001A -/* 04DBC 808DB62C 50200018 */ beql $at, $zero, .L808DB690 +/* 04DB0 808DB620 28410007 */ slti $at, $v0, 0x0007 +/* 04DB4 808DB624 14200019 */ bne $at, $zero, .L808DB68C +/* 04DB8 808DB628 2841001A */ slti $at, $v0, 0x001A +/* 04DBC 808DB62C 50200018 */ beql $at, $zero, .L808DB690 /* 04DC0 808DB630 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 /* 04DC4 808DB634 862201AC */ lh $v0, 0x01AC($s1) ## 000001AC -/* 04DC8 808DB638 2841000F */ slti $at, $v0, 0x000F -/* 04DCC 808DB63C 10200003 */ beq $at, $zero, .L808DB64C +/* 04DC8 808DB638 2841000F */ slti $at, $v0, 0x000F +/* 04DCC 808DB63C 10200003 */ beq $at, $zero, .L808DB64C /* 04DD0 808DB640 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 /* 04DD4 808DB644 A62E01AC */ sh $t6, 0x01AC($s1) ## 000001AC /* 04DD8 808DB648 862201AC */ lh $v0, 0x01AC($s1) ## 000001AC .L808DB64C: -/* 04DDC 808DB64C 1840000F */ blez $v0, .L808DB68C +/* 04DDC 808DB64C 1840000F */ blez $v0, .L808DB68C /* 04DE0 808DB650 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 04DE4 808DB654 00107880 */ sll $t7, $s0, 2 +/* 04DE4 808DB654 00107880 */ sll $t7, $s0, 2 .L808DB658: -/* 04DE8 808DB658 022F2021 */ addu $a0, $s1, $t7 -/* 04DEC 808DB65C 4406A000 */ mfc1 $a2, $f20 +/* 04DE8 808DB658 022F2021 */ addu $a0, $s1, $t7 +/* 04DEC 808DB65C 4406A000 */ mfc1 $a2, $f20 /* 04DF0 808DB660 24840294 */ addiu $a0, $a0, 0x0294 ## $a0 = 00000294 /* 04DF4 808DB664 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 04DF8 808DB668 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04DFC 808DB66C 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 04E00 808DB670 863801AC */ lh $t8, 0x01AC($s1) ## 000001AC /* 04E04 808DB674 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 04E08 808DB678 00108400 */ sll $s0, $s0, 16 -/* 04E0C 808DB67C 00108403 */ sra $s0, $s0, 16 -/* 04E10 808DB680 0218082A */ slt $at, $s0, $t8 -/* 04E14 808DB684 5420FFF4 */ bnel $at, $zero, .L808DB658 -/* 04E18 808DB688 00107880 */ sll $t7, $s0, 2 +/* 04E08 808DB678 00108400 */ sll $s0, $s0, 16 +/* 04E0C 808DB67C 00108403 */ sra $s0, $s0, 16 +/* 04E10 808DB680 0218082A */ slt $at, $s0, $t8 +/* 04E14 808DB684 5420FFF4 */ bnel $at, $zero, .L808DB658 +/* 04E18 808DB688 00107880 */ sll $t7, $s0, 2 .L808DB68C: /* 04E1C 808DB68C 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB690: -/* 04E20 808DB690 8FA40054 */ lw $a0, 0x0054($sp) +/* 04E20 808DB690 8FA40054 */ lw $a0, 0x0054($sp) /* 04E24 808DB694 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 -/* 04E28 808DB698 2841001F */ slti $at, $v0, 0x001F -/* 04E2C 808DB69C 1020000A */ beq $at, $zero, .L808DB6C8 +/* 04E28 808DB698 2841001F */ slti $at, $v0, 0x001F +/* 04E2C 808DB69C 1020000A */ beq $at, $zero, .L808DB6C8 /* 04E30 808DB6A0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 04E34 808DB6A4 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 /* 04E38 808DB6A8 3C073C8B */ lui $a3, 0x3C8B ## $a3 = 3C8B0000 /* 04E3C 808DB6AC 34E74396 */ ori $a3, $a3, 0x4396 ## $a3 = 3C8B4396 -/* 04E40 808DB6B0 4406A000 */ mfc1 $a2, $f20 +/* 04E40 808DB6B0 4406A000 */ mfc1 $a2, $f20 /* 04E44 808DB6B4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04E48 808DB6B8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD /* 04E4C 808DB6BC C62A0284 */ lwc1 $f10, 0x0284($s1) ## 00000284 /* 04E50 808DB6C0 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 /* 04E54 808DB6C4 E62A028C */ swc1 $f10, 0x028C($s1) ## 0000028C .L808DB6C8: -/* 04E58 808DB6C8 2841001F */ slti $at, $v0, 0x001F -/* 04E5C 808DB6CC 10200013 */ beq $at, $zero, .L808DB71C +/* 04E58 808DB6C8 2841001F */ slti $at, $v0, 0x001F +/* 04E5C 808DB6CC 10200013 */ beq $at, $zero, .L808DB71C /* 04E60 808DB6D0 262402D0 */ addiu $a0, $s1, 0x02D0 ## $a0 = 000002D0 /* 04E64 808DB6D4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 04E68 808DB6D8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04E6C 808DB6DC 3C054234 */ lui $a1, 0x4234 ## $a1 = 42340000 /* 04E70 808DB6E0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04E74 808DB6E4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 04E78 808DB6E8 8E2B0278 */ lw $t3, 0x0278($s1) ## 00000278 /* 04E7C 808DB6EC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 @@ -304,281 +304,281 @@ glabel L808DB498 /* 04EA8 808DB718 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB71C: /* 04EAC 808DB71C 2401002F */ addiu $at, $zero, 0x002F ## $at = 0000002F -/* 04EB0 808DB720 14410003 */ bne $v0, $at, .L808DB730 +/* 04EB0 808DB720 14410003 */ bne $v0, $at, .L808DB730 /* 04EB4 808DB724 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 04EB8 808DB728 A22C0274 */ sb $t4, 0x0274($s1) ## 00000274 /* 04EBC 808DB72C 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB730: /* 04EC0 808DB730 2401002E */ addiu $at, $zero, 0x002E ## $at = 0000002E -/* 04EC4 808DB734 14410003 */ bne $v0, $at, .L808DB744 +/* 04EC4 808DB734 14410003 */ bne $v0, $at, .L808DB744 /* 04EC8 808DB738 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 04ECC 808DB73C A22D0274 */ sb $t5, 0x0274($s1) ## 00000274 /* 04ED0 808DB740 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB744: /* 04ED4 808DB744 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D -/* 04ED8 808DB748 14410003 */ bne $v0, $at, .L808DB758 +/* 04ED8 808DB748 14410003 */ bne $v0, $at, .L808DB758 /* 04EDC 808DB74C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 04EE0 808DB750 A22E0274 */ sb $t6, 0x0274($s1) ## 00000274 /* 04EE4 808DB754 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB758: /* 04EE8 808DB758 2401002C */ addiu $at, $zero, 0x002C ## $at = 0000002C -/* 04EEC 808DB75C 14410003 */ bne $v0, $at, .L808DB76C +/* 04EEC 808DB75C 14410003 */ bne $v0, $at, .L808DB76C /* 04EF0 808DB760 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 04EF4 808DB764 A22F0274 */ sb $t7, 0x0274($s1) ## 00000274 /* 04EF8 808DB768 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB76C: /* 04EFC 808DB76C 2401002B */ addiu $at, $zero, 0x002B ## $at = 0000002B -/* 04F00 808DB770 14410003 */ bne $v0, $at, .L808DB780 +/* 04F00 808DB770 14410003 */ bne $v0, $at, .L808DB780 /* 04F04 808DB774 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 /* 04F08 808DB778 A2380274 */ sb $t8, 0x0274($s1) ## 00000274 /* 04F0C 808DB77C 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB780: /* 04F10 808DB780 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A -/* 04F14 808DB784 14410003 */ bne $v0, $at, .L808DB794 +/* 04F14 808DB784 14410003 */ bne $v0, $at, .L808DB794 /* 04F18 808DB788 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 /* 04F1C 808DB78C A2390274 */ sb $t9, 0x0274($s1) ## 00000274 /* 04F20 808DB790 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB794: -/* 04F24 808DB794 2841001F */ slti $at, $v0, 0x001F -/* 04F28 808DB798 142000CE */ bne $at, $zero, .L808DBAD4 +/* 04F24 808DB794 2841001F */ slti $at, $v0, 0x001F +/* 04F28 808DB798 142000CE */ bne $at, $zero, .L808DBAD4 /* 04F2C 808DB79C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 04F30 808DB7A0 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 04F34 808DB7A4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 04F38 808DB7A8 E7B60074 */ swc1 $f22, 0x0074($sp) + +/* 04F38 808DB7A8 E7B60074 */ swc1 $f22, 0x0074($sp) /* 04F3C 808DB7AC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 04F40 808DB7B0 44818000 */ mtc1 $at, $f16 ## $f16 = 150.00 -/* 04F44 808DB7B4 E7B6007C */ swc1 $f22, 0x007C($sp) +/* 04F44 808DB7B4 E7B6007C */ swc1 $f22, 0x007C($sp) /* 04F48 808DB7B8 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 04F4C 808DB7BC 46100480 */ add.s $f18, $f0, $f16 +/* 04F4C 808DB7BC 46100480 */ add.s $f18, $f0, $f16 /* 04F50 808DB7C0 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 /* 04F54 808DB7C4 3C01808F */ lui $at, %hi(D_808F7FE8) ## $at = 808F0000 -/* 04F58 808DB7C8 C4307FE8 */ lwc1 $f16, %lo(D_808F7FE8)($at) -/* 04F5C 808DB7CC E7B20078 */ swc1 $f18, 0x0078($sp) +/* 04F58 808DB7C8 C4307FE8 */ lwc1 $f16, %lo(D_808F7FE8)($at) +/* 04F5C 808DB7CC E7B20078 */ swc1 $f18, 0x0078($sp) /* 04F60 808DB7D0 8628008A */ lh $t0, 0x008A($s1) ## 0000008A /* 04F64 808DB7D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04F68 808DB7D8 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 /* 04F6C 808DB7DC 00000000 */ nop -/* 04F70 808DB7E0 468021A0 */ cvt.s.w $f6, $f4 -/* 04F74 808DB7E4 46083283 */ div.s $f10, $f6, $f8 -/* 04F78 808DB7E8 46105302 */ mul.s $f12, $f10, $f16 -/* 04F7C 808DB7EC 0C034348 */ jal Matrix_RotateY +/* 04F70 808DB7E0 468021A0 */ cvt.s.w $f6, $f4 +/* 04F74 808DB7E4 46083283 */ div.s $f10, $f6, $f8 +/* 04F78 808DB7E8 46105302 */ mul.s $f12, $f10, $f16 +/* 04F7C 808DB7EC 0C034348 */ jal Matrix_RotateY /* 04F80 808DB7F0 00000000 */ nop /* 04F84 808DB7F4 3C014780 */ lui $at, 0x4780 ## $at = 47800000 /* 04F88 808DB7F8 44816000 */ mtc1 $at, $f12 ## $f12 = 65536.00 /* 04F8C 808DB7FC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 04F90 808DB800 00000000 */ nop -/* 04F94 808DB804 46000306 */ mov.s $f12, $f0 -/* 04F98 808DB808 0C0343B5 */ jal Matrix_RotateZ +/* 04F94 808DB804 46000306 */ mov.s $f12, $f0 +/* 04F98 808DB808 0C0343B5 */ jal Matrix_RotateZ /* 04F9C 808DB80C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 04FA0 808DB810 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC -/* 04FA4 808DB814 0C0346BD */ jal Matrix_MultVec3f +/* 04FA4 808DB814 0C0346BD */ jal Matrix_MultVec3f /* 04FA8 808DB818 27A50068 */ addiu $a1, $sp, 0x0068 ## $a1 = FFFFFFD0 /* 04FAC 808DB81C C6320278 */ lwc1 $f18, 0x0278($s1) ## 00000278 -/* 04FB0 808DB820 C7A40068 */ lwc1 $f4, 0x0068($sp) -/* 04FB4 808DB824 C7AA006C */ lwc1 $f10, 0x006C($sp) -/* 04FB8 808DB828 8FA4009C */ lw $a0, 0x009C($sp) -/* 04FBC 808DB82C 46049180 */ add.s $f6, $f18, $f4 -/* 04FC0 808DB830 C7A40070 */ lwc1 $f4, 0x0070($sp) +/* 04FB0 808DB820 C7A40068 */ lwc1 $f4, 0x0068($sp) +/* 04FB4 808DB824 C7AA006C */ lwc1 $f10, 0x006C($sp) +/* 04FB8 808DB828 8FA4009C */ lw $a0, 0x009C($sp) +/* 04FBC 808DB82C 46049180 */ add.s $f6, $f18, $f4 +/* 04FC0 808DB830 C7A40070 */ lwc1 $f4, 0x0070($sp) /* 04FC4 808DB834 27A50080 */ addiu $a1, $sp, 0x0080 ## $a1 = FFFFFFE8 /* 04FC8 808DB838 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 04FCC 808DB83C E7A60080 */ swc1 $f6, 0x0080($sp) +/* 04FCC 808DB83C E7A60080 */ swc1 $f6, 0x0080($sp) /* 04FD0 808DB840 C628027C */ lwc1 $f8, 0x027C($s1) ## 0000027C -/* 04FD4 808DB844 460A4400 */ add.s $f16, $f8, $f10 -/* 04FD8 808DB848 E7B00084 */ swc1 $f16, 0x0084($sp) +/* 04FD4 808DB844 460A4400 */ add.s $f16, $f8, $f10 +/* 04FD8 808DB848 E7B00084 */ swc1 $f16, 0x0084($sp) /* 04FDC 808DB84C C6320280 */ lwc1 $f18, 0x0280($s1) ## 00000280 -/* 04FE0 808DB850 46049180 */ add.s $f6, $f18, $f4 -/* 04FE4 808DB854 0C235C0D */ jal func_808D7034 -/* 04FE8 808DB858 E7A60088 */ swc1 $f6, 0x0088($sp) -/* 04FEC 808DB85C 1000009E */ beq $zero, $zero, .L808DBAD8 -/* 04FF0 808DB860 8FBF004C */ lw $ra, 0x004C($sp) +/* 04FE0 808DB850 46049180 */ add.s $f6, $f18, $f4 +/* 04FE4 808DB854 0C235C0D */ jal func_808D7034 +/* 04FE8 808DB858 E7A60088 */ swc1 $f6, 0x0088($sp) +/* 04FEC 808DB85C 1000009E */ beq $zero, $zero, .L808DBAD8 +/* 04FF0 808DB860 8FBF004C */ lw $ra, 0x004C($sp) glabel L808DB864 /* 04FF4 808DB864 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 04FF8 808DB868 A22901A0 */ sb $t1, 0x01A0($s1) ## 000001A0 /* 04FFC 808DB86C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 05000 808DB870 00105080 */ sll $t2, $s0, 2 +/* 05000 808DB870 00105080 */ sll $t2, $s0, 2 .L808DB874: -/* 05004 808DB874 022A2021 */ addu $a0, $s1, $t2 -/* 05008 808DB878 4405B000 */ mfc1 $a1, $f22 -/* 0500C 808DB87C 4406A000 */ mfc1 $a2, $f20 +/* 05004 808DB874 022A2021 */ addu $a0, $s1, $t2 +/* 05008 808DB878 4405B000 */ mfc1 $a1, $f22 +/* 0500C 808DB87C 4406A000 */ mfc1 $a2, $f20 /* 05010 808DB880 24840294 */ addiu $a0, $a0, 0x0294 ## $a0 = 00000294 /* 05014 808DB884 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05018 808DB888 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 0501C 808DB88C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 05020 808DB890 00108400 */ sll $s0, $s0, 16 -/* 05024 808DB894 00108403 */ sra $s0, $s0, 16 -/* 05028 808DB898 2A01000F */ slti $at, $s0, 0x000F -/* 0502C 808DB89C 5420FFF5 */ bnel $at, $zero, .L808DB874 -/* 05030 808DB8A0 00105080 */ sll $t2, $s0, 2 +/* 05020 808DB890 00108400 */ sll $s0, $s0, 16 +/* 05024 808DB894 00108403 */ sra $s0, $s0, 16 +/* 05028 808DB898 2A01000F */ slti $at, $s0, 0x000F +/* 0502C 808DB89C 5420FFF5 */ bnel $at, $zero, .L808DB874 +/* 05030 808DB8A0 00105080 */ sll $t2, $s0, 2 /* 05034 808DB8A4 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 /* 05038 808DB8A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0503C 808DB8AC 3C0B8090 */ lui $t3, %hi(D_808F93C0) ## $t3 = 80900000 -/* 05040 808DB8B0 14410008 */ bne $v0, $at, .L808DB8D4 +/* 05040 808DB8B0 14410008 */ bne $v0, $at, .L808DB8D4 /* 05044 808DB8B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05048 808DB8B8 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 0504C 808DB8BC 44814000 */ mtc1 $at, $f8 ## $f8 = 15.00 -/* 05050 808DB8C0 8D6B93C0 */ lw $t3, %lo(D_808F93C0)($t3) +/* 05050 808DB8C0 8D6B93C0 */ lw $t3, %lo(D_808F93C0)($t3) /* 05054 808DB8C4 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 05058 808DB8C8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0505C 808DB8CC E56816C0 */ swc1 $f8, 0x16C0($t3) ## 809016C0 /* 05060 808DB8D0 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB8D4: -/* 05064 808DB8D4 1440001C */ bne $v0, $zero, .L808DB948 +/* 05064 808DB8D4 1440001C */ bne $v0, $zero, .L808DB948 /* 05068 808DB8D8 26240284 */ addiu $a0, $s1, 0x0284 ## $a0 = 00000284 -/* 0506C 808DB8DC 4405A000 */ mfc1 $a1, $f20 +/* 0506C 808DB8DC 4405A000 */ mfc1 $a1, $f20 /* 05070 808DB8E0 3C063DA3 */ lui $a2, 0x3DA3 ## $a2 = 3DA30000 /* 05074 808DB8E4 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 05078 808DB8E8 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3DA3D70A /* 0507C 808DB8EC C62A0284 */ lwc1 $f10, 0x0284($s1) ## 00000284 -/* 05080 808DB8F0 4405A000 */ mfc1 $a1, $f20 +/* 05080 808DB8F0 4405A000 */ mfc1 $a1, $f20 /* 05084 808DB8F4 262402D0 */ addiu $a0, $s1, 0x02D0 ## $a0 = 000002D0 /* 05088 808DB8F8 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 0508C 808DB8FC 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 05090 808DB900 E62A028C */ swc1 $f10, 0x028C($s1) ## 0000028C /* 05094 808DB904 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 05098 808DB908 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 /* 0509C 808DB90C 26240278 */ addiu $a0, $s1, 0x0278 ## $a0 = 00000278 /* 050A0 808DB910 8E2501FC */ lw $a1, 0x01FC($s1) ## 000001FC -/* 050A4 808DB914 4406A000 */ mfc1 $a2, $f20 +/* 050A4 808DB914 4406A000 */ mfc1 $a2, $f20 /* 050A8 808DB918 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 050AC 808DB91C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 050B0 808DB920 4406A000 */ mfc1 $a2, $f20 +/* 050B0 808DB920 4406A000 */ mfc1 $a2, $f20 /* 050B4 808DB924 2624027C */ addiu $a0, $s1, 0x027C ## $a0 = 0000027C /* 050B8 808DB928 8E250200 */ lw $a1, 0x0200($s1) ## 00000200 /* 050BC 808DB92C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 050C0 808DB930 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 050C4 808DB934 4406A000 */ mfc1 $a2, $f20 +/* 050C4 808DB934 4406A000 */ mfc1 $a2, $f20 /* 050C8 808DB938 26240280 */ addiu $a0, $s1, 0x0280 ## $a0 = 00000280 /* 050CC 808DB93C 8E250204 */ lw $a1, 0x0204($s1) ## 00000204 /* 050D0 808DB940 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 050D4 808DB944 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 .L808DB948: /* 050D8 808DB948 862C01B8 */ lh $t4, 0x01B8($s1) ## 000001B8 /* 050DC 808DB94C 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 050E0 808DB950 26100FE8 */ addiu $s0, $s0, 0x0FE8 ## $s0 = 06000FE8 -/* 050E4 808DB954 55800060 */ bnel $t4, $zero, .L808DBAD8 -/* 050E8 808DB958 8FBF004C */ lw $ra, 0x004C($sp) +/* 050E4 808DB954 55800060 */ bnel $t4, $zero, .L808DBAD8 +/* 050E8 808DB958 8FBF004C */ lw $ra, 0x004C($sp) /* 050EC 808DB95C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 050F0 808DB960 02002025 */ or $a0, $s0, $zero ## $a0 = 06000FE8 /* 050F4 808DB964 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 050F8 808DB968 4406B000 */ mfc1 $a2, $f22 +/* 050F8 808DB968 4406B000 */ mfc1 $a2, $f22 /* 050FC 808DB96C 02002825 */ or $a1, $s0, $zero ## $a1 = 06000FE8 -/* 05100 808DB970 468084A0 */ cvt.s.w $f18, $f16 +/* 05100 808DB970 468084A0 */ cvt.s.w $f18, $f16 /* 05104 808DB974 E63201CC */ swc1 $f18, 0x01CC($s1) ## 000001CC -/* 05108 808DB978 0C0294D3 */ jal func_800A534C -/* 0510C 808DB97C 8FA4005C */ lw $a0, 0x005C($sp) +/* 05108 808DB978 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0510C 808DB97C 8FA4005C */ lw $a0, 0x005C($sp) /* 05110 808DB980 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 05114 808DB984 A62D01C2 */ sh $t5, 0x01C2($s1) ## 000001C2 /* 05118 808DB988 E6360288 */ swc1 $f22, 0x0288($s1) ## 00000288 /* 0511C 808DB98C E6360290 */ swc1 $f22, 0x0290($s1) ## 00000290 /* 05120 808DB990 E6360284 */ swc1 $f22, 0x0284($s1) ## 00000284 -/* 05124 808DB994 1000004F */ beq $zero, $zero, .L808DBAD4 +/* 05124 808DB994 1000004F */ beq $zero, $zero, .L808DBAD4 /* 05128 808DB998 E636028C */ swc1 $f22, 0x028C($s1) ## 0000028C glabel L808DB99C /* 0512C 808DB99C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 05130 808DB9A0 A22E01A0 */ sb $t6, 0x01A0($s1) ## 000001A0 -/* 05134 808DB9A4 8FA4005C */ lw $a0, 0x005C($sp) -/* 05138 808DB9A8 0C0295B2 */ jal func_800A56C8 +/* 05134 808DB9A4 8FA4005C */ lw $a0, 0x005C($sp) +/* 05138 808DB9A8 0C0295B2 */ jal func_800A56C8 /* 0513C 808DB9AC 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 05140 808DB9B0 10400021 */ beq $v0, $zero, .L808DBA38 -/* 05144 808DB9B4 8FA6009C */ lw $a2, 0x009C($sp) +/* 05140 808DB9B0 10400021 */ beq $v0, $zero, .L808DBA38 +/* 05144 808DB9B4 8FA6009C */ lw $a2, 0x009C($sp) /* 05148 808DB9B8 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 0514C 808DB9BC AFA40058 */ sw $a0, 0x0058($sp) +/* 0514C 808DB9BC AFA40058 */ sw $a0, 0x0058($sp) /* 05150 808DB9C0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 05154 808DB9C4 C62401FC */ lwc1 $f4, 0x01FC($s1) ## 000001FC .L808DB9C8: /* 05158 808DB9C8 26180104 */ addiu $t8, $s0, 0x0104 ## $t8 = 00000104 -/* 0515C 808DB9CC 8FA40058 */ lw $a0, 0x0058($sp) -/* 05160 808DB9D0 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 0515C 808DB9CC 8FA40058 */ lw $a0, 0x0058($sp) +/* 05160 808DB9D0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05164 808DB9D4 C6260200 */ lwc1 $f6, 0x0200($s1) ## 00000200 -/* 05168 808DB9D8 8FA6009C */ lw $a2, 0x009C($sp) +/* 05168 808DB9D8 8FA6009C */ lw $a2, 0x009C($sp) /* 0516C 808DB9DC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05170 808DB9E0 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 05170 808DB9E0 E7A60014 */ swc1 $f6, 0x0014($sp) /* 05174 808DB9E4 C6280204 */ lwc1 $f8, 0x0204($s1) ## 00000204 -/* 05178 808DB9E8 AFA0001C */ sw $zero, 0x001C($sp) +/* 05178 808DB9E8 AFA0001C */ sw $zero, 0x001C($sp) /* 0517C 808DB9EC 240700E8 */ addiu $a3, $zero, 0x00E8 ## $a3 = 000000E8 -/* 05180 808DB9F0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 05180 808DB9F0 E7A80018 */ swc1 $f8, 0x0018($sp) /* 05184 808DB9F4 862F008A */ lh $t7, 0x008A($s1) ## 0000008A -/* 05188 808DB9F8 AFB80028 */ sw $t8, 0x0028($sp) -/* 0518C 808DB9FC AFA00024 */ sw $zero, 0x0024($sp) +/* 05188 808DB9F8 AFB80028 */ sw $t8, 0x0028($sp) +/* 0518C 808DB9FC AFA00024 */ sw $zero, 0x0024($sp) /* 05190 808DBA00 0C00C916 */ jal Actor_SpawnAttached - -/* 05194 808DBA04 AFAF0020 */ sw $t7, 0x0020($sp) + +/* 05194 808DBA04 AFAF0020 */ sw $t7, 0x0020($sp) /* 05198 808DBA08 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0519C 808DBA0C 00108400 */ sll $s0, $s0, 16 -/* 051A0 808DBA10 00108403 */ sra $s0, $s0, 16 -/* 051A4 808DBA14 2A010005 */ slti $at, $s0, 0x0005 -/* 051A8 808DBA18 5420FFEB */ bnel $at, $zero, .L808DB9C8 +/* 0519C 808DBA0C 00108400 */ sll $s0, $s0, 16 +/* 051A0 808DBA10 00108403 */ sra $s0, $s0, 16 +/* 051A4 808DBA14 2A010005 */ slti $at, $s0, 0x0005 +/* 051A8 808DBA18 5420FFEB */ bnel $at, $zero, .L808DB9C8 /* 051AC 808DBA1C C62401FC */ lwc1 $f4, 0x01FC($s1) ## 000001FC /* 051B0 808DBA20 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 051B4 808DBA24 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 051B8 808DBA28 240539D4 */ addiu $a1, $zero, 0x39D4 ## $a1 = 000039D4 /* 051BC 808DBA2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 051C0 808DBA30 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 051C4 808DBA34 2405396D */ addiu $a1, $zero, 0x396D ## $a1 = 0000396D .L808DBA38: -/* 051C8 808DBA38 8FA4005C */ lw $a0, 0x005C($sp) -/* 051CC 808DBA3C 0C0295B2 */ jal func_800A56C8 +/* 051C8 808DBA38 8FA4005C */ lw $a0, 0x005C($sp) +/* 051CC 808DBA3C 0C0295B2 */ jal func_800A56C8 /* 051D0 808DBA40 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 -/* 051D4 808DBA44 10400008 */ beq $v0, $zero, .L808DBA68 +/* 051D4 808DBA44 10400008 */ beq $v0, $zero, .L808DBA68 /* 051D8 808DBA48 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 /* 051DC 808DBA4C 3C198090 */ lui $t9, %hi(D_808F93C0) ## $t9 = 80900000 -/* 051E0 808DBA50 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) +/* 051E0 808DBA50 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) /* 051E4 808DBA54 44815000 */ mtc1 $at, $f10 ## $f10 = 26.00 /* 051E8 808DBA58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 051EC 808DBA5C 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 051F0 808DBA60 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 051F4 808DBA64 E72A16C4 */ swc1 $f10, 0x16C4($t9) ## 809016C4 .L808DBA68: -/* 051F8 808DBA68 8FA4005C */ lw $a0, 0x005C($sp) -/* 051FC 808DBA6C 0C0295B2 */ jal func_800A56C8 +/* 051F8 808DBA68 8FA4005C */ lw $a0, 0x005C($sp) +/* 051FC 808DBA6C 0C0295B2 */ jal func_800A56C8 /* 05200 808DBA70 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 05204 808DBA74 10400017 */ beq $v0, $zero, .L808DBAD4 +/* 05204 808DBA74 10400017 */ beq $v0, $zero, .L808DBAD4 /* 05208 808DBA78 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 0520C 808DBA7C 26101440 */ addiu $s0, $s0, 0x1440 ## $s0 = 06001440 /* 05210 808DBA80 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05214 808DBA84 02002025 */ or $a0, $s0, $zero ## $a0 = 06001440 /* 05218 808DBA88 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 0521C 808DBA8C 4406B000 */ mfc1 $a2, $f22 +/* 0521C 808DBA8C 4406B000 */ mfc1 $a2, $f22 /* 05220 808DBA90 02002825 */ or $a1, $s0, $zero ## $a1 = 06001440 -/* 05224 808DBA94 468084A0 */ cvt.s.w $f18, $f16 +/* 05224 808DBA94 468084A0 */ cvt.s.w $f18, $f16 /* 05228 808DBA98 E63201CC */ swc1 $f18, 0x01CC($s1) ## 000001CC -/* 0522C 808DBA9C 0C0294D3 */ jal func_800A534C -/* 05230 808DBAA0 8FA4005C */ lw $a0, 0x005C($sp) +/* 0522C 808DBA9C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 05230 808DBAA0 8FA4005C */ lw $a0, 0x005C($sp) /* 05234 808DBAA4 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 05238 808DBAA8 1000000A */ beq $zero, $zero, .L808DBAD4 +/* 05238 808DBAA8 1000000A */ beq $zero, $zero, .L808DBAD4 /* 0523C 808DBAAC A62801C2 */ sh $t0, 0x01C2($s1) ## 000001C2 glabel L808DBAB0 /* 05240 808DBAB0 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 05244 808DBAB4 A22901A0 */ sb $t1, 0x01A0($s1) ## 000001A0 -/* 05248 808DBAB8 8FA4005C */ lw $a0, 0x005C($sp) -/* 0524C 808DBABC 0C0295B2 */ jal func_800A56C8 +/* 05248 808DBAB8 8FA4005C */ lw $a0, 0x005C($sp) +/* 0524C 808DBABC 0C0295B2 */ jal func_800A56C8 /* 05250 808DBAC0 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 05254 808DBAC4 10400003 */ beq $v0, $zero, .L808DBAD4 +/* 05254 808DBAC4 10400003 */ beq $v0, $zero, .L808DBAD4 /* 05258 808DBAC8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0525C 808DBACC 0C236EBC */ jal func_808DBAF0 -/* 05260 808DBAD0 8FA5009C */ lw $a1, 0x009C($sp) +/* 0525C 808DBACC 0C236EBC */ jal func_808DBAF0 +/* 05260 808DBAD0 8FA5009C */ lw $a1, 0x009C($sp) .L808DBAD4: -/* 05264 808DBAD4 8FBF004C */ lw $ra, 0x004C($sp) +/* 05264 808DBAD4 8FBF004C */ lw $ra, 0x004C($sp) .L808DBAD8: -/* 05268 808DBAD8 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 0526C 808DBADC D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 05270 808DBAE0 8FB00044 */ lw $s0, 0x0044($sp) -/* 05274 808DBAE4 8FB10048 */ lw $s1, 0x0048($sp) -/* 05278 808DBAE8 03E00008 */ jr $ra +/* 05268 808DBAD8 D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 0526C 808DBADC D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 05270 808DBAE0 8FB00044 */ lw $s0, 0x0044($sp) +/* 05274 808DBAE4 8FB10048 */ lw $s1, 0x0048($sp) +/* 05278 808DBAE8 03E00008 */ jr $ra /* 0527C 808DBAEC 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s index 0b3a9da7db..66d9db4c3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s @@ -1,14 +1,14 @@ glabel func_808DBAF0 /* 05280 808DBAF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05284 808DBAF4 AFBF001C */ sw $ra, 0x001C($sp) -/* 05288 808DBAF8 AFB00018 */ sw $s0, 0x0018($sp) +/* 05284 808DBAF4 AFBF001C */ sw $ra, 0x001C($sp) +/* 05288 808DBAF8 AFB00018 */ sw $s0, 0x0018($sp) /* 0528C 808DBAFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05290 808DBB00 0C235C4B */ jal func_808D712C +/* 05290 808DBB00 0C235C4B */ jal func_808D712C /* 05294 808DBB04 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C /* 05298 808DBB08 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0529C 808DBB0C 24A59A14 */ addiu $a1, $a1, 0x9A14 ## $a1 = 06009A14 /* 052A0 808DBB10 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 052A4 808DBB14 0C0294D3 */ jal func_800A534C +/* 052A4 808DBB14 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 052A8 808DBB18 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 052AC 808DBB1C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 052B0 808DBB20 3C0E808E */ lui $t6, %hi(func_808DBB78) ## $t6 = 808E0000 @@ -17,22 +17,22 @@ glabel func_808DBAF0 /* 052BC 808DBB2C 44816000 */ mtc1 $at, $f12 ## $f12 = 64.00 /* 052C0 808DBB30 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 /* 052C4 808DBB34 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 052C8 808DBB38 E60401C8 */ swc1 $f4, 0x01C8($s0) ## 000001C8 -/* 052CC 808DBB3C 4600018D */ trunc.w.s $f6, $f0 +/* 052CC 808DBB3C 4600018D */ trunc.w.s $f6, $f0 /* 052D0 808DBB40 A60001C2 */ sh $zero, 0x01C2($s0) ## 000001C2 /* 052D4 808DBB44 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 052D8 808DBB48 3C0A8090 */ lui $t2, %hi(D_808F93C0) ## $t2 = 80900000 -/* 052DC 808DBB4C 44083000 */ mfc1 $t0, $f6 +/* 052DC 808DBB4C 44083000 */ mfc1 $t0, $f6 /* 052E0 808DBB50 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 /* 052E4 808DBB54 2509001E */ addiu $t1, $t0, 0x001E ## $t1 = 0000001E /* 052E8 808DBB58 A60901B6 */ sh $t1, 0x01B6($s0) ## 000001B6 -/* 052EC 808DBB5C 8D4A93C0 */ lw $t2, %lo(D_808F93C0)($t2) +/* 052EC 808DBB5C 8D4A93C0 */ lw $t2, %lo(D_808F93C0)($t2) /* 052F0 808DBB60 E54816AC */ swc1 $f8, 0x16AC($t2) ## 809016AC -/* 052F4 808DBB64 8FBF001C */ lw $ra, 0x001C($sp) -/* 052F8 808DBB68 8FB00018 */ lw $s0, 0x0018($sp) +/* 052F4 808DBB64 8FBF001C */ lw $ra, 0x001C($sp) +/* 052F8 808DBB68 8FB00018 */ lw $s0, 0x0018($sp) /* 052FC 808DBB6C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05300 808DBB70 03E00008 */ jr $ra +/* 05300 808DBB70 03E00008 */ jr $ra /* 05304 808DBB74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s index e035292597..dc31dfd953 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s @@ -1,51 +1,51 @@ glabel func_808DC14C /* 058DC 808DC14C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 058E0 808DC150 AFB00038 */ sw $s0, 0x0038($sp) +/* 058E0 808DC150 AFB00038 */ sw $s0, 0x0038($sp) /* 058E4 808DC154 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 058E8 808DC158 AFBF003C */ sw $ra, 0x003C($sp) +/* 058E8 808DC158 AFBF003C */ sw $ra, 0x003C($sp) /* 058EC 808DC15C 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 058F0 808DC160 AFA50054 */ sw $a1, 0x0054($sp) +/* 058F0 808DC160 AFA50054 */ sw $a1, 0x0054($sp) /* 058F4 808DC164 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 058F8 808DC168 AFA40044 */ sw $a0, 0x0044($sp) + +/* 058F8 808DC168 AFA40044 */ sw $a0, 0x0044($sp) /* 058FC 808DC16C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 05900 808DC170 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 05904 808DC174 26040254 */ addiu $a0, $s0, 0x0254 ## $a0 = 00000254 /* 05908 808DC178 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 0590C 808DC17C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 05910 808DC180 860201C2 */ lh $v0, 0x01C2($s0) ## 000001C2 /* 05914 808DC184 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 05918 808DC188 10400005 */ beq $v0, $zero, .L808DC1A0 +/* 05918 808DC188 10400005 */ beq $v0, $zero, .L808DC1A0 /* 0591C 808DC18C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 05920 808DC190 50410047 */ beql $v0, $at, .L808DC2B0 +/* 05920 808DC190 50410047 */ beql $v0, $at, .L808DC2B0 /* 05924 808DC194 920D01C0 */ lbu $t5, 0x01C0($s0) ## 000001C0 -/* 05928 808DC198 10000071 */ beq $zero, $zero, .L808DC360 +/* 05928 808DC198 10000071 */ beq $zero, $zero, .L808DC360 /* 0592C 808DC19C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 .L808DC1A0: /* 05930 808DC1A0 A20E01A0 */ sb $t6, 0x01A0($s0) ## 000001A0 -/* 05934 808DC1A4 8FA40044 */ lw $a0, 0x0044($sp) -/* 05938 808DC1A8 0C0295B2 */ jal func_800A56C8 +/* 05934 808DC1A4 8FA40044 */ lw $a0, 0x0044($sp) +/* 05938 808DC1A8 0C0295B2 */ jal func_800A56C8 /* 0593C 808DC1AC 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 05940 808DC1B0 10400007 */ beq $v0, $zero, .L808DC1D0 +/* 05940 808DC1B0 10400007 */ beq $v0, $zero, .L808DC1D0 /* 05944 808DC1B4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 05948 808DC1B8 A60F01C2 */ sh $t7, 0x01C2($s0) ## 000001C2 /* 0594C 808DC1BC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 05950 808DC1C0 24A59A14 */ addiu $a1, $a1, 0x9A14 ## $a1 = 06009A14 -/* 05954 808DC1C4 8FA40044 */ lw $a0, 0x0044($sp) -/* 05958 808DC1C8 0C0294D3 */ jal func_800A534C +/* 05954 808DC1C4 8FA40044 */ lw $a0, 0x0044($sp) +/* 05958 808DC1C8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0595C 808DC1CC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L808DC1D0: /* 05960 808DC1D0 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 05964 808DC1D4 44810000 */ mtc1 $at, $f0 ## $f0 = 12.00 /* 05968 808DC1D8 C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 /* 0596C 808DC1DC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 05970 808DC1E0 44050000 */ mfc1 $a1, $f0 -/* 05974 808DC1E4 4600203E */ c.le.s $f4, $f0 +/* 05970 808DC1E0 44050000 */ mfc1 $a1, $f0 +/* 05974 808DC1E4 4600203E */ c.le.s $f4, $f0 /* 05978 808DC1E8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 0597C 808DC1EC 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 05980 808DC1F0 2508FCF8 */ addiu $t0, $t0, 0xFCF8 ## $t0 = 8015FCF8 -/* 05984 808DC1F4 45000009 */ bc1f .L808DC21C +/* 05984 808DC1F4 45000009 */ bc1f .L808DC21C /* 05988 808DC1F8 00000000 */ nop /* 0598C 808DC1FC 8E0A0260 */ lw $t2, 0x0260($s0) ## 00000260 /* 05990 808DC200 A618066E */ sh $t8, 0x066E($s0) ## 0000066E @@ -56,92 +56,92 @@ glabel func_808DC14C /* 059A4 808DC214 8E0A0268 */ lw $t2, 0x0268($s0) ## 00000268 /* 059A8 808DC218 AD0A0008 */ sw $t2, 0x0008($t0) ## 8015FD00 .L808DC21C: -/* 059AC 808DC21C 0C0295B2 */ jal func_800A56C8 -/* 059B0 808DC220 8FA40044 */ lw $a0, 0x0044($sp) -/* 059B4 808DC224 10400004 */ beq $v0, $zero, .L808DC238 +/* 059AC 808DC21C 0C0295B2 */ jal func_800A56C8 +/* 059B0 808DC220 8FA40044 */ lw $a0, 0x0044($sp) +/* 059B4 808DC224 10400004 */ beq $v0, $zero, .L808DC238 /* 059B8 808DC228 3C054130 */ lui $a1, 0x4130 ## $a1 = 41300000 /* 059BC 808DC22C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 059C0 808DC230 00000000 */ nop /* 059C4 808DC234 E6060254 */ swc1 $f6, 0x0254($s0) ## 00000254 .L808DC238: -/* 059C8 808DC238 0C0295B2 */ jal func_800A56C8 -/* 059CC 808DC23C 8FA40044 */ lw $a0, 0x0044($sp) -/* 059D0 808DC240 10400046 */ beq $v0, $zero, .L808DC35C +/* 059C8 808DC238 0C0295B2 */ jal func_800A56C8 +/* 059CC 808DC23C 8FA40044 */ lw $a0, 0x0044($sp) +/* 059D0 808DC240 10400046 */ beq $v0, $zero, .L808DC35C /* 059D4 808DC244 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 059D8 808DC248 A20B025C */ sb $t3, 0x025C($s0) ## 0000025C /* 059DC 808DC24C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 059E0 808DC250 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 059E4 808DC254 240539C9 */ addiu $a1, $zero, 0x39C9 ## $a1 = 000039C9 /* 059E8 808DC258 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 059EC 808DC25C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 059F0 808DC260 24053825 */ addiu $a1, $zero, 0x3825 ## $a1 = 00003825 /* 059F4 808DC264 C6080260 */ lwc1 $f8, 0x0260($s0) ## 00000260 -/* 059F8 808DC268 8FA60054 */ lw $a2, 0x0054($sp) +/* 059F8 808DC268 8FA60054 */ lw $a2, 0x0054($sp) /* 059FC 808DC26C 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 05A00 808DC270 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 05A00 808DC270 E7A80010 */ swc1 $f8, 0x0010($sp) /* 05A04 808DC274 C60A0264 */ lwc1 $f10, 0x0264($s0) ## 00000264 /* 05A08 808DC278 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 05A0C 808DC27C 240700E8 */ addiu $a3, $zero, 0x00E8 ## $a3 = 000000E8 -/* 05A10 808DC280 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 05A10 808DC280 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 05A14 808DC284 C6100268 */ lwc1 $f16, 0x0268($s0) ## 00000268 -/* 05A18 808DC288 AFAC0028 */ sw $t4, 0x0028($sp) -/* 05A1C 808DC28C AFA00024 */ sw $zero, 0x0024($sp) -/* 05A20 808DC290 AFA00020 */ sw $zero, 0x0020($sp) -/* 05A24 808DC294 AFA0001C */ sw $zero, 0x001C($sp) +/* 05A18 808DC288 AFAC0028 */ sw $t4, 0x0028($sp) +/* 05A1C 808DC28C AFA00024 */ sw $zero, 0x0024($sp) +/* 05A20 808DC290 AFA00020 */ sw $zero, 0x0020($sp) +/* 05A24 808DC294 AFA0001C */ sw $zero, 0x001C($sp) /* 05A28 808DC298 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 05A2C 808DC29C 0C00C916 */ jal Actor_SpawnAttached - -/* 05A30 808DC2A0 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 05A34 808DC2A4 1000002E */ beq $zero, $zero, .L808DC360 + +/* 05A30 808DC2A0 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 05A34 808DC2A4 1000002E */ beq $zero, $zero, .L808DC360 /* 05A38 808DC2A8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 05A3C 808DC2AC 920D01C0 */ lbu $t5, 0x01C0($s0) ## 000001C0 .L808DC2B0: -/* 05A40 808DC2B0 51A0002B */ beql $t5, $zero, .L808DC360 +/* 05A40 808DC2B0 51A0002B */ beql $t5, $zero, .L808DC360 /* 05A44 808DC2B4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 05A48 808DC2B8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 05A4C 808DC2BC 00000000 */ nop /* 05A50 808DC2C0 3C018090 */ lui $at, %hi(D_808F8000) ## $at = 80900000 -/* 05A54 808DC2C4 C4328000 */ lwc1 $f18, %lo(D_808F8000)($at) +/* 05A54 808DC2C4 C4328000 */ lwc1 $f18, %lo(D_808F8000)($at) /* 05A58 808DC2C8 3C04808E */ lui $a0, %hi(D_808E4D38) ## $a0 = 808E0000 -/* 05A5C 808DC2CC 46120102 */ mul.s $f4, $f0, $f18 -/* 05A60 808DC2D0 4600218D */ trunc.w.s $f6, $f4 -/* 05A64 808DC2D4 44023000 */ mfc1 $v0, $f6 +/* 05A5C 808DC2CC 46120102 */ mul.s $f4, $f0, $f18 +/* 05A60 808DC2D0 4600218D */ trunc.w.s $f6, $f4 +/* 05A64 808DC2D4 44023000 */ mfc1 $v0, $f6 /* 05A68 808DC2D8 00000000 */ nop -/* 05A6C 808DC2DC 00027C00 */ sll $t7, $v0, 16 -/* 05A70 808DC2E0 000FC403 */ sra $t8, $t7, 16 -/* 05A74 808DC2E4 0018C880 */ sll $t9, $t8, 2 -/* 05A78 808DC2E8 00992021 */ addu $a0, $a0, $t9 -/* 05A7C 808DC2EC 8C844D38 */ lw $a0, %lo(D_808E4D38)($a0) +/* 05A6C 808DC2DC 00027C00 */ sll $t7, $v0, 16 +/* 05A70 808DC2E0 000FC403 */ sra $t8, $t7, 16 +/* 05A74 808DC2E4 0018C880 */ sll $t9, $t8, 2 +/* 05A78 808DC2E8 00992021 */ addu $a0, $a0, $t9 +/* 05A7C 808DC2EC 8C844D38 */ lw $a0, %lo(D_808E4D38)($a0) /* 05A80 808DC2F0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 05A84 808DC2F4 A7A2004E */ sh $v0, 0x004E($sp) + +/* 05A84 808DC2F4 A7A2004E */ sh $v0, 0x004E($sp) /* 05A88 808DC2F8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 05A8C 808DC2FC 3C05808E */ lui $a1, %hi(D_808E4D38) ## $a1 = 808E0000 /* 05A90 808DC300 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05A94 808DC304 468042A0 */ cvt.s.w $f10, $f8 +/* 05A94 808DC304 468042A0 */ cvt.s.w $f10, $f8 /* 05A98 808DC308 E60A01CC */ swc1 $f10, 0x01CC($s0) ## 000001CC -/* 05A9C 808DC30C 87A8004E */ lh $t0, 0x004E($sp) -/* 05AA0 808DC310 8FA40044 */ lw $a0, 0x0044($sp) -/* 05AA4 808DC314 00084880 */ sll $t1, $t0, 2 -/* 05AA8 808DC318 00A92821 */ addu $a1, $a1, $t1 -/* 05AAC 808DC31C 0C029490 */ jal func_800A5240 -/* 05AB0 808DC320 8CA54D38 */ lw $a1, %lo(D_808E4D38)($a1) -/* 05AB4 808DC324 87AA004E */ lh $t2, 0x004E($sp) +/* 05A9C 808DC30C 87A8004E */ lh $t0, 0x004E($sp) +/* 05AA0 808DC310 8FA40044 */ lw $a0, 0x0044($sp) +/* 05AA4 808DC314 00084880 */ sll $t1, $t0, 2 +/* 05AA8 808DC318 00A92821 */ addu $a1, $a1, $t1 +/* 05AAC 808DC31C 0C029490 */ jal func_800A5240 +/* 05AB0 808DC320 8CA54D38 */ lw $a1, %lo(D_808E4D38)($a1) +/* 05AB4 808DC324 87AA004E */ lh $t2, 0x004E($sp) /* 05AB8 808DC328 3C0C808E */ lui $t4, %hi(D_808E4D40) ## $t4 = 808E0000 /* 05ABC 808DC32C 3C0D8090 */ lui $t5, %hi(D_808F93C0) ## $t5 = 80900000 -/* 05AC0 808DC330 000A5840 */ sll $t3, $t2, 1 -/* 05AC4 808DC334 018B6021 */ addu $t4, $t4, $t3 -/* 05AC8 808DC338 858C4D40 */ lh $t4, %lo(D_808E4D40)($t4) -/* 05ACC 808DC33C 8DAD93C0 */ lw $t5, %lo(D_808F93C0)($t5) +/* 05AC0 808DC330 000A5840 */ sll $t3, $t2, 1 +/* 05AC4 808DC334 018B6021 */ addu $t4, $t4, $t3 +/* 05AC8 808DC338 858C4D40 */ lh $t4, %lo(D_808E4D40)($t4) +/* 05ACC 808DC33C 8DAD93C0 */ lw $t5, %lo(D_808F93C0)($t5) /* 05AD0 808DC340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05AD4 808DC344 448C8000 */ mtc1 $t4, $f16 ## $f16 = -0.00 /* 05AD8 808DC348 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 -/* 05ADC 808DC34C 468084A0 */ cvt.s.w $f18, $f16 +/* 05ADC 808DC34C 468084A0 */ cvt.s.w $f18, $f16 /* 05AE0 808DC350 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05AE4 808DC354 E5B216BC */ swc1 $f18, 0x16BC($t5) ## 809016BC /* 05AE8 808DC358 A20001C0 */ sb $zero, 0x01C0($s0) ## 000001C0 .L808DC35C: @@ -150,54 +150,54 @@ glabel func_808DC14C /* 05AF0 808DC360 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 05AF4 808DC364 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 05AF8 808DC368 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 05AFC 808DC36C 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 05B00 808DC370 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 05B04 808DC374 C606005C */ lwc1 $f6, 0x005C($s0) ## 0000005C /* 05B08 808DC378 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 05B0C 808DC37C C6100064 */ lwc1 $f16, 0x0064($s0) ## 00000064 -/* 05B10 808DC380 46062200 */ add.s $f8, $f4, $f6 +/* 05B10 808DC380 46062200 */ add.s $f8, $f4, $f6 /* 05B14 808DC384 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 05B18 808DC388 2604005C */ addiu $a0, $s0, 0x005C ## $a0 = 0000005C -/* 05B1C 808DC38C 46105480 */ add.s $f18, $f10, $f16 +/* 05B1C 808DC38C 46105480 */ add.s $f18, $f10, $f16 /* 05B20 808DC390 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 05B24 808DC394 44050000 */ mfc1 $a1, $f0 +/* 05B24 808DC394 44050000 */ mfc1 $a1, $f0 /* 05B28 808DC398 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05B2C 808DC39C E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C /* 05B30 808DC3A0 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 05B34 808DC3A4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 05B38 808DC3A8 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 05B38 808DC3A8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 05B3C 808DC3AC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 05B40 808DC3B0 26040064 */ addiu $a0, $s0, 0x0064 ## $a0 = 00000064 /* 05B44 808DC3B4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 05B48 808DC3B8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05B4C 808DC3BC 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 05B50 808DC3C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 05B54 808DC3C4 E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 05B54 808DC3C4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05B58 808DC3C8 860401A2 */ lh $a0, 0x01A2($s0) ## 000001A2 -/* 05B5C 808DC3CC 00800821 */ addu $at, $a0, $zero -/* 05B60 808DC3D0 00042080 */ sll $a0, $a0, 2 -/* 05B64 808DC3D4 00812023 */ subu $a0, $a0, $at -/* 05B68 808DC3D8 00042100 */ sll $a0, $a0, 4 -/* 05B6C 808DC3DC 00812023 */ subu $a0, $a0, $at -/* 05B70 808DC3E0 000420C0 */ sll $a0, $a0, 3 -/* 05B74 808DC3E4 00812023 */ subu $a0, $a0, $at -/* 05B78 808DC3E8 00042080 */ sll $a0, $a0, 2 -/* 05B7C 808DC3EC 00042400 */ sll $a0, $a0, 16 +/* 05B5C 808DC3CC 00800821 */ addu $at, $a0, $zero +/* 05B60 808DC3D0 00042080 */ sll $a0, $a0, 2 +/* 05B64 808DC3D4 00812023 */ subu $a0, $a0, $at +/* 05B68 808DC3D8 00042100 */ sll $a0, $a0, 4 +/* 05B6C 808DC3DC 00812023 */ subu $a0, $a0, $at +/* 05B70 808DC3E0 000420C0 */ sll $a0, $a0, 3 +/* 05B74 808DC3E4 00812023 */ subu $a0, $a0, $at +/* 05B78 808DC3E8 00042080 */ sll $a0, $a0, 2 +/* 05B7C 808DC3EC 00042400 */ sll $a0, $a0, 16 /* 05B80 808DC3F0 0C01DE1C */ jal Math_Sins ## sins? -/* 05B84 808DC3F4 00042403 */ sra $a0, $a0, 16 -/* 05B88 808DC3F8 46000080 */ add.s $f2, $f0, $f0 +/* 05B84 808DC3F4 00042403 */ sra $a0, $a0, 16 +/* 05B88 808DC3F8 46000080 */ add.s $f2, $f0, $f0 /* 05B8C 808DC3FC C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 05B90 808DC400 46023200 */ add.s $f8, $f6, $f2 +/* 05B90 808DC400 46023200 */ add.s $f8, $f6, $f2 /* 05B94 808DC404 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 /* 05B98 808DC408 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 05B9C 808DC40C 8FBF003C */ lw $ra, 0x003C($sp) -/* 05BA0 808DC410 8FB00038 */ lw $s0, 0x0038($sp) +/* 05B9C 808DC40C 8FBF003C */ lw $ra, 0x003C($sp) +/* 05BA0 808DC410 8FB00038 */ lw $s0, 0x0038($sp) /* 05BA4 808DC414 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 05BA8 808DC418 03E00008 */ jr $ra +/* 05BA8 808DC418 03E00008 */ jr $ra /* 05BAC 808DC41C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s index 0866907f1c..c156327d25 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s @@ -1,92 +1,92 @@ glabel func_808DC75C /* 05EEC 808DC75C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 05EF0 808DC760 AFB30038 */ sw $s3, 0x0038($sp) +/* 05EF0 808DC760 AFB30038 */ sw $s3, 0x0038($sp) /* 05EF4 808DC764 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 05EF8 808DC768 AFBF003C */ sw $ra, 0x003C($sp) -/* 05EFC 808DC76C AFB20034 */ sw $s2, 0x0034($sp) +/* 05EF8 808DC768 AFBF003C */ sw $ra, 0x003C($sp) +/* 05EFC 808DC76C AFB20034 */ sw $s2, 0x0034($sp) /* 05F00 808DC770 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 /* 05F04 808DC774 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 05F08 808DC778 AFB10030 */ sw $s1, 0x0030($sp) -/* 05F0C 808DC77C AFB0002C */ sw $s0, 0x002C($sp) -/* 05F10 808DC780 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 05F14 808DC784 F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 05F08 808DC778 AFB10030 */ sw $s1, 0x0030($sp) +/* 05F0C 808DC77C AFB0002C */ sw $s0, 0x002C($sp) +/* 05F10 808DC780 F7B60020 */ sdc1 $f22, 0x0020($sp) +/* 05F14 808DC784 F7B40018 */ sdc1 $f20, 0x0018($sp) /* 05F18 808DC788 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 05F1C 808DC78C AFA40048 */ sw $a0, 0x0048($sp) + +/* 05F1C 808DC78C AFA40048 */ sw $a0, 0x0048($sp) /* 05F20 808DC790 866301C2 */ lh $v1, 0x01C2($s3) ## 000001C2 /* 05F24 808DC794 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05F28 808DC798 3C0544BB */ lui $a1, 0x44BB ## $a1 = 44BB0000 -/* 05F2C 808DC79C 14600016 */ bne $v1, $zero, .L808DC7F8 +/* 05F2C 808DC79C 14600016 */ bne $v1, $zero, .L808DC7F8 /* 05F30 808DC7A0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 05F34 808DC7A4 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 44BB8000 -/* 05F38 808DC7A8 0C235AFC */ jal func_808D6BF0 +/* 05F38 808DC7A8 0C235AFC */ jal func_808D6BF0 /* 05F3C 808DC7AC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05F40 808DC7B0 8FA40048 */ lw $a0, 0x0048($sp) -/* 05F44 808DC7B4 0C0295B2 */ jal func_800A56C8 +/* 05F40 808DC7B0 8FA40048 */ lw $a0, 0x0048($sp) +/* 05F44 808DC7B4 0C0295B2 */ jal func_800A56C8 /* 05F48 808DC7B8 8E6501CC */ lw $a1, 0x01CC($s3) ## 000001CC -/* 05F4C 808DC7BC 10400063 */ beq $v0, $zero, .L808DC94C +/* 05F4C 808DC7BC 10400063 */ beq $v0, $zero, .L808DC94C /* 05F50 808DC7C0 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 05F54 808DC7C4 26108F44 */ addiu $s0, $s0, 0x8F44 ## $s0 = 06008F44 /* 05F58 808DC7C8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05F5C 808DC7CC 02002025 */ or $a0, $s0, $zero ## $a0 = 06008F44 /* 05F60 808DC7D0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 05F64 808DC7D4 02002825 */ or $a1, $s0, $zero ## $a1 = 06008F44 /* 05F68 808DC7D8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05F6C 808DC7DC 468021A0 */ cvt.s.w $f6, $f4 +/* 05F6C 808DC7DC 468021A0 */ cvt.s.w $f6, $f4 /* 05F70 808DC7E0 E66601CC */ swc1 $f6, 0x01CC($s3) ## 000001CC -/* 05F74 808DC7E4 0C0294D3 */ jal func_800A534C -/* 05F78 808DC7E8 8FA40048 */ lw $a0, 0x0048($sp) +/* 05F74 808DC7E4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 05F78 808DC7E8 8FA40048 */ lw $a0, 0x0048($sp) /* 05F7C 808DC7EC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 05F80 808DC7F0 10000056 */ beq $zero, $zero, .L808DC94C +/* 05F80 808DC7F0 10000056 */ beq $zero, $zero, .L808DC94C /* 05F84 808DC7F4 A66E01C2 */ sh $t6, 0x01C2($s3) ## 000001C2 .L808DC7F8: -/* 05F88 808DC7F8 14610025 */ bne $v1, $at, .L808DC890 -/* 05F8C 808DC7FC 8FA40048 */ lw $a0, 0x0048($sp) +/* 05F88 808DC7F8 14610025 */ bne $v1, $at, .L808DC890 +/* 05F8C 808DC7FC 8FA40048 */ lw $a0, 0x0048($sp) /* 05F90 808DC800 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05F94 808DC804 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 -/* 05F98 808DC808 0C235AFC */ jal func_808D6BF0 +/* 05F98 808DC808 0C235AFC */ jal func_808D6BF0 /* 05F9C 808DC80C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 05FA0 808DC810 866F01B6 */ lh $t7, 0x01B6($s3) ## 000001B6 /* 05FA4 808DC814 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 05FA8 808DC818 26108A88 */ addiu $s0, $s0, 0x8A88 ## $s0 = 06008A88 -/* 05FAC 808DC81C 55E0004C */ bnel $t7, $zero, .L808DC950 +/* 05FAC 808DC81C 55E0004C */ bnel $t7, $zero, .L808DC950 /* 05FB0 808DC820 866401A2 */ lh $a0, 0x01A2($s3) ## 000001A2 /* 05FB4 808DC824 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05FB8 808DC828 02002025 */ or $a0, $s0, $zero ## $a0 = 06008A88 /* 05FBC 808DC82C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 05FC0 808DC830 02002825 */ or $a1, $s0, $zero ## $a1 = 06008A88 /* 05FC4 808DC834 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05FC8 808DC838 468042A0 */ cvt.s.w $f10, $f8 +/* 05FC8 808DC838 468042A0 */ cvt.s.w $f10, $f8 /* 05FCC 808DC83C E66A01CC */ swc1 $f10, 0x01CC($s3) ## 000001CC -/* 05FD0 808DC840 0C029490 */ jal func_800A5240 -/* 05FD4 808DC844 8FA40048 */ lw $a0, 0x0048($sp) +/* 05FD0 808DC840 0C029490 */ jal func_800A5240 +/* 05FD4 808DC844 8FA40048 */ lw $a0, 0x0048($sp) /* 05FD8 808DC848 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 05FDC 808DC84C A67801C2 */ sh $t8, 0x01C2($s3) ## 000001C2 /* 05FE0 808DC850 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 05FE4 808DC854 8FA40048 */ lw $a0, 0x0048($sp) + +/* 05FE4 808DC854 8FA40048 */ lw $a0, 0x0048($sp) /* 05FE8 808DC858 3C014190 */ lui $at, 0x4190 ## $at = 41900000 /* 05FEC 808DC85C 3C198090 */ lui $t9, %hi(D_808F93C0) ## $t9 = 80900000 -/* 05FF0 808DC860 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) +/* 05FF0 808DC860 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) /* 05FF4 808DC864 44818000 */ mtc1 $at, $f16 ## $f16 = 18.00 /* 05FF8 808DC868 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 05FFC 808DC86C 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 06000 808DC870 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06004 808DC874 E73016C4 */ swc1 $f16, 0x16C4($t9) ## 809016C4 /* 06008 808DC878 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0600C 808DC87C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06010 808DC880 240539CF */ addiu $a1, $zero, 0x39CF ## $a1 = 000039CF /* 06014 808DC884 24080082 */ addiu $t0, $zero, 0x0082 ## $t0 = 00000082 -/* 06018 808DC888 10000030 */ beq $zero, $zero, .L808DC94C +/* 06018 808DC888 10000030 */ beq $zero, $zero, .L808DC94C /* 0601C 808DC88C A66801BA */ sh $t0, 0x01BA($s3) ## 000001BA .L808DC890: -/* 06020 808DC890 0C0295B2 */ jal func_800A56C8 +/* 06020 808DC890 0C0295B2 */ jal func_800A56C8 /* 06024 808DC894 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 -/* 06028 808DC898 10400025 */ beq $v0, $zero, .L808DC930 +/* 06028 808DC898 10400025 */ beq $v0, $zero, .L808DC930 /* 0602C 808DC89C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 06030 808DC8A0 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 06034 808DC8A4 4481B000 */ mtc1 $at, $f22 ## $f22 = 500.00 @@ -95,77 +95,77 @@ glabel func_808DC75C /* 06040 808DC8B0 267101FC */ addiu $s1, $s3, 0x01FC ## $s1 = 000001FC .L808DC8B4: /* 06044 808DC8B4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 06048 808DC8B8 4600A306 */ mov.s $f12, $f20 -/* 0604C 808DC8BC E7A00050 */ swc1 $f0, 0x0050($sp) + +/* 06048 808DC8B8 4600A306 */ mov.s $f12, $f20 +/* 0604C 808DC8BC E7A00050 */ swc1 $f0, 0x0050($sp) /* 06050 808DC8C0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 06054 808DC8C4 4600A306 */ mov.s $f12, $f20 -/* 06058 808DC8C8 E7A00054 */ swc1 $f0, 0x0054($sp) + +/* 06054 808DC8C4 4600A306 */ mov.s $f12, $f20 +/* 06058 808DC8C8 E7A00054 */ swc1 $f0, 0x0054($sp) /* 0605C 808DC8CC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 06060 808DC8D0 4600A306 */ mov.s $f12, $f20 + +/* 06060 808DC8D0 4600A306 */ mov.s $f12, $f20 /* 06064 808DC8D4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 06068 808DC8D8 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 0606C 808DC8DC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 06070 808DC8E0 E7A00058 */ swc1 $f0, 0x0058($sp) -/* 06074 808DC8E4 46160480 */ add.s $f18, $f0, $f22 + +/* 06070 808DC8E0 E7A00058 */ swc1 $f0, 0x0058($sp) +/* 06074 808DC8E4 46160480 */ add.s $f18, $f0, $f22 /* 06078 808DC8E8 3C07808E */ lui $a3, %hi(D_808E4C6C) ## $a3 = 808E0000 /* 0607C 808DC8EC 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 06080 808DC8F0 AFA90014 */ sw $t1, 0x0014($sp) +/* 06080 808DC8F0 AFA90014 */ sw $t1, 0x0014($sp) /* 06084 808DC8F4 24E74C6C */ addiu $a3, $a3, %lo(D_808E4C6C) ## $a3 = 808E4C6C -/* 06088 808DC8F8 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 06088 808DC8F8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0608C 808DC8FC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 06090 808DC900 02202825 */ or $a1, $s1, $zero ## $a1 = 000001FC -/* 06094 808DC904 0C235A6C */ jal func_808D69B0 +/* 06094 808DC904 0C235A6C */ jal func_808D69B0 /* 06098 808DC908 27A60050 */ addiu $a2, $sp, 0x0050 ## $a2 = FFFFFFF0 /* 0609C 808DC90C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 060A0 808DC910 00108400 */ sll $s0, $s0, 16 -/* 060A4 808DC914 00108403 */ sra $s0, $s0, 16 -/* 060A8 808DC918 2A010064 */ slti $at, $s0, 0x0064 -/* 060AC 808DC91C 1420FFE5 */ bne $at, $zero, .L808DC8B4 +/* 060A0 808DC910 00108400 */ sll $s0, $s0, 16 +/* 060A4 808DC914 00108403 */ sra $s0, $s0, 16 +/* 060A8 808DC918 2A010064 */ slti $at, $s0, 0x0064 +/* 060AC 808DC91C 1420FFE5 */ bne $at, $zero, .L808DC8B4 /* 060B0 808DC920 00000000 */ nop /* 060B4 808DC924 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 060B8 808DC928 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 060BC 808DC92C 24050806 */ addiu $a1, $zero, 0x0806 ## $a1 = 00000806 .L808DC930: -/* 060C0 808DC930 8FA40048 */ lw $a0, 0x0048($sp) -/* 060C4 808DC934 0C0295B2 */ jal func_800A56C8 +/* 060C0 808DC930 8FA40048 */ lw $a0, 0x0048($sp) +/* 060C4 808DC934 0C0295B2 */ jal func_800A56C8 /* 060C8 808DC938 8E6501CC */ lw $a1, 0x01CC($s3) ## 000001CC -/* 060CC 808DC93C 10400003 */ beq $v0, $zero, .L808DC94C +/* 060CC 808DC93C 10400003 */ beq $v0, $zero, .L808DC94C /* 060D0 808DC940 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 060D4 808DC944 0C236EBC */ jal func_808DBAF0 +/* 060D4 808DC944 0C236EBC */ jal func_808DBAF0 /* 060D8 808DC948 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 .L808DC94C: /* 060DC 808DC94C 866401A2 */ lh $a0, 0x01A2($s3) ## 000001A2 .L808DC950: -/* 060E0 808DC950 00800821 */ addu $at, $a0, $zero -/* 060E4 808DC954 00042080 */ sll $a0, $a0, 2 -/* 060E8 808DC958 00812023 */ subu $a0, $a0, $at -/* 060EC 808DC95C 00042100 */ sll $a0, $a0, 4 -/* 060F0 808DC960 00812023 */ subu $a0, $a0, $at -/* 060F4 808DC964 000420C0 */ sll $a0, $a0, 3 -/* 060F8 808DC968 00812023 */ subu $a0, $a0, $at -/* 060FC 808DC96C 00042080 */ sll $a0, $a0, 2 -/* 06100 808DC970 00042400 */ sll $a0, $a0, 16 +/* 060E0 808DC950 00800821 */ addu $at, $a0, $zero +/* 060E4 808DC954 00042080 */ sll $a0, $a0, 2 +/* 060E8 808DC958 00812023 */ subu $a0, $a0, $at +/* 060EC 808DC95C 00042100 */ sll $a0, $a0, 4 +/* 060F0 808DC960 00812023 */ subu $a0, $a0, $at +/* 060F4 808DC964 000420C0 */ sll $a0, $a0, 3 +/* 060F8 808DC968 00812023 */ subu $a0, $a0, $at +/* 060FC 808DC96C 00042080 */ sll $a0, $a0, 2 +/* 06100 808DC970 00042400 */ sll $a0, $a0, 16 /* 06104 808DC974 0C01DE1C */ jal Math_Sins ## sins? -/* 06108 808DC978 00042403 */ sra $a0, $a0, 16 -/* 0610C 808DC97C 46000080 */ add.s $f2, $f0, $f0 +/* 06108 808DC978 00042403 */ sra $a0, $a0, 16 +/* 0610C 808DC97C 46000080 */ add.s $f2, $f0, $f0 /* 06110 808DC980 C6640028 */ lwc1 $f4, 0x0028($s3) ## 00000028 -/* 06114 808DC984 46022180 */ add.s $f6, $f4, $f2 +/* 06114 808DC984 46022180 */ add.s $f6, $f4, $f2 /* 06118 808DC988 E6620060 */ swc1 $f2, 0x0060($s3) ## 00000060 /* 0611C 808DC98C E6660028 */ swc1 $f6, 0x0028($s3) ## 00000028 -/* 06120 808DC990 8FBF003C */ lw $ra, 0x003C($sp) -/* 06124 808DC994 8FB30038 */ lw $s3, 0x0038($sp) -/* 06128 808DC998 8FB20034 */ lw $s2, 0x0034($sp) -/* 0612C 808DC99C 8FB10030 */ lw $s1, 0x0030($sp) -/* 06130 808DC9A0 8FB0002C */ lw $s0, 0x002C($sp) -/* 06134 808DC9A4 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 06138 808DC9A8 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 0613C 808DC9AC 03E00008 */ jr $ra +/* 06120 808DC990 8FBF003C */ lw $ra, 0x003C($sp) +/* 06124 808DC994 8FB30038 */ lw $s3, 0x0038($sp) +/* 06128 808DC998 8FB20034 */ lw $s2, 0x0034($sp) +/* 0612C 808DC99C 8FB10030 */ lw $s1, 0x0030($sp) +/* 06130 808DC9A0 8FB0002C */ lw $s0, 0x002C($sp) +/* 06134 808DC9A4 D7B60020 */ ldc1 $f22, 0x0020($sp) +/* 06138 808DC9A8 D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 0613C 808DC9AC 03E00008 */ jr $ra /* 06140 808DC9B0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s index 54c6c979db..ff7fc739bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s @@ -1,13 +1,13 @@ glabel func_808DCB7C /* 0630C 808DCB7C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 06310 808DCB80 AFBF002C */ sw $ra, 0x002C($sp) -/* 06314 808DCB84 AFB10028 */ sw $s1, 0x0028($sp) -/* 06318 808DCB88 AFB00024 */ sw $s0, 0x0024($sp) -/* 0631C 808DCB8C F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 06320 808DCB90 AFA50054 */ sw $a1, 0x0054($sp) +/* 06310 808DCB80 AFBF002C */ sw $ra, 0x002C($sp) +/* 06314 808DCB84 AFB10028 */ sw $s1, 0x0028($sp) +/* 06318 808DCB88 AFB00024 */ sw $s0, 0x0024($sp) +/* 0631C 808DCB8C F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 06320 808DCB90 AFA50054 */ sw $a1, 0x0054($sp) /* 06324 808DCB94 848E01BC */ lh $t6, 0x01BC($a0) ## 000001BC /* 06328 808DCB98 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0632C 808DCB9C 55C00005 */ bnel $t6, $zero, .L808DCBB4 +/* 0632C 808DCB9C 55C00005 */ bnel $t6, $zero, .L808DCBB4 /* 06330 808DCBA0 26240150 */ addiu $a0, $s1, 0x0150 ## $a0 = 00000150 /* 06334 808DCBA4 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000154 /* 06338 808DCBA8 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 @@ -15,111 +15,111 @@ glabel func_808DCB7C /* 06340 808DCBB0 26240150 */ addiu $a0, $s1, 0x0150 ## $a0 = 00000150 .L808DCBB4: /* 06344 808DCBB4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 06348 808DCBB8 AFA40038 */ sw $a0, 0x0038($sp) + +/* 06348 808DCBB8 AFA40038 */ sw $a0, 0x0038($sp) /* 0634C 808DCBBC C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 /* 06350 808DCBC0 C6260060 */ lwc1 $f6, 0x0060($s1) ## 00000060 /* 06354 808DCBC4 862301A4 */ lh $v1, 0x01A4($s1) ## 000001A4 /* 06358 808DCBC8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0635C 808DCBCC 46062200 */ add.s $f8, $f4, $f6 -/* 06360 808DCBD0 28610028 */ slti $at, $v1, 0x0028 +/* 0635C 808DCBCC 46062200 */ add.s $f8, $f4, $f6 +/* 06360 808DCBD0 28610028 */ slti $at, $v1, 0x0028 /* 06364 808DCBD4 A23901A0 */ sb $t9, 0x01A0($s1) ## 000001A0 -/* 06368 808DCBD8 1020000A */ beq $at, $zero, .L808DCC04 +/* 06368 808DCBD8 1020000A */ beq $at, $zero, .L808DCC04 /* 0636C 808DCBDC E6280028 */ swc1 $f8, 0x0028($s1) ## 00000028 /* 06370 808DCBE0 3C018090 */ lui $at, %hi(D_808F8004) ## $at = 80900000 -/* 06374 808DCBE4 C4208004 */ lwc1 $f0, %lo(D_808F8004)($at) +/* 06374 808DCBE4 C4208004 */ lwc1 $f0, %lo(D_808F8004)($at) /* 06378 808DCBE8 26240508 */ addiu $a0, $s1, 0x0508 ## $a0 = 00000508 /* 0637C 808DCBEC 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 -/* 06380 808DCBF0 44060000 */ mfc1 $a2, $f0 -/* 06384 808DCBF4 44070000 */ mfc1 $a3, $f0 +/* 06380 808DCBF0 44060000 */ mfc1 $a2, $f0 +/* 06384 808DCBF4 44070000 */ mfc1 $a3, $f0 /* 06388 808DCBF8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0638C 808DCBFC 00000000 */ nop /* 06390 808DCC00 862301A4 */ lh $v1, 0x01A4($s1) ## 000001A4 .L808DCC04: -/* 06394 808DCC04 28610028 */ slti $at, $v1, 0x0028 -/* 06398 808DCC08 1420000A */ bne $at, $zero, .L808DCC34 -/* 0639C 808DCC0C 28610037 */ slti $at, $v1, 0x0037 -/* 063A0 808DCC10 50200009 */ beql $at, $zero, .L808DCC38 +/* 06394 808DCC04 28610028 */ slti $at, $v1, 0x0028 +/* 06398 808DCC08 1420000A */ bne $at, $zero, .L808DCC34 +/* 0639C 808DCC0C 28610037 */ slti $at, $v1, 0x0037 +/* 063A0 808DCC10 50200009 */ beql $at, $zero, .L808DCC38 /* 063A4 808DCC14 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 063A8 808DCC18 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 063AC 808DCC1C 26240508 */ addiu $a0, $s1, 0x0508 ## $a0 = 00000508 /* 063B0 808DCC20 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 063B4 808DCC24 4405A000 */ mfc1 $a1, $f20 +/* 063B4 808DCC24 4405A000 */ mfc1 $a1, $f20 /* 063B8 808DCC28 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 063BC 808DCC2C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 063C0 808DCC30 862301A4 */ lh $v1, 0x01A4($s1) ## 000001A4 .L808DCC34: /* 063C4 808DCC34 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 .L808DCC38: -/* 063C8 808DCC38 28610037 */ slti $at, $v1, 0x0037 -/* 063CC 808DCC3C 14200009 */ bne $at, $zero, .L808DCC64 +/* 063C8 808DCC38 28610037 */ slti $at, $v1, 0x0037 +/* 063CC 808DCC3C 14200009 */ bne $at, $zero, .L808DCC64 /* 063D0 808DCC40 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 063D4 808DCC44 3C073E19 */ lui $a3, 0x3E19 ## $a3 = 3E190000 /* 063D8 808DCC48 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A /* 063DC 808DCC4C 26240508 */ addiu $a0, $s1, 0x0508 ## $a0 = 00000508 /* 063E0 808DCC50 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 063E4 808DCC54 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 063E8 808DCC58 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 063EC 808DCC5C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 063F0 808DCC60 A22802E4 */ sb $t0, 0x02E4($s1) ## 000002E4 .L808DCC64: /* 063F4 808DCC64 962901C2 */ lhu $t1, 0x01C2($s1) ## 000001C2 -/* 063F8 808DCC68 2D210009 */ sltiu $at, $t1, 0x0009 -/* 063FC 808DCC6C 10200118 */ beq $at, $zero, .L808DD0D0 -/* 06400 808DCC70 00094880 */ sll $t1, $t1, 2 +/* 063F8 808DCC68 2D210009 */ sltiu $at, $t1, 0x0009 +/* 063FC 808DCC6C 10200118 */ beq $at, $zero, .L808DD0D0 +/* 06400 808DCC70 00094880 */ sll $t1, $t1, 2 /* 06404 808DCC74 3C018090 */ lui $at, %hi(jtbl_808F8008) ## $at = 80900000 -/* 06408 808DCC78 00290821 */ addu $at, $at, $t1 -/* 0640C 808DCC7C 8C298008 */ lw $t1, %lo(jtbl_808F8008)($at) -/* 06410 808DCC80 01200008 */ jr $t1 +/* 06408 808DCC78 00290821 */ addu $at, $at, $t1 +/* 0640C 808DCC7C 8C298008 */ lw $t1, %lo(jtbl_808F8008)($at) +/* 06410 808DCC80 01200008 */ jr $t1 /* 06414 808DCC84 00000000 */ nop glabel L808DCC88 -/* 06418 808DCC88 8FA40038 */ lw $a0, 0x0038($sp) -/* 0641C 808DCC8C 0C0295B2 */ jal func_800A56C8 +/* 06418 808DCC88 8FA40038 */ lw $a0, 0x0038($sp) +/* 0641C 808DCC8C 0C0295B2 */ jal func_800A56C8 /* 06420 808DCC90 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 06424 808DCC94 1040010E */ beq $v0, $zero, .L808DD0D0 +/* 06424 808DCC94 1040010E */ beq $v0, $zero, .L808DD0D0 /* 06428 808DCC98 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 0642C 808DCC9C 26104DA8 */ addiu $s0, $s0, 0x4DA8 ## $s0 = 06004DA8 /* 06430 808DCCA0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 06434 808DCCA4 A62A01C2 */ sh $t2, 0x01C2($s1) ## 000001C2 /* 06438 808DCCA8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0643C 808DCCAC 02002025 */ or $a0, $s0, $zero ## $a0 = 06004DA8 /* 06440 808DCCB0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 06444 808DCCB4 4406A000 */ mfc1 $a2, $f20 +/* 06444 808DCCB4 4406A000 */ mfc1 $a2, $f20 /* 06448 808DCCB8 02002825 */ or $a1, $s0, $zero ## $a1 = 06004DA8 -/* 0644C 808DCCBC 46805420 */ cvt.s.w $f16, $f10 +/* 0644C 808DCCBC 46805420 */ cvt.s.w $f16, $f10 /* 06450 808DCCC0 E63001CC */ swc1 $f16, 0x01CC($s1) ## 000001CC -/* 06454 808DCCC4 0C029490 */ jal func_800A5240 -/* 06458 808DCCC8 8FA40038 */ lw $a0, 0x0038($sp) -/* 0645C 808DCCCC 10000101 */ beq $zero, $zero, .L808DD0D4 -/* 06460 808DCCD0 8FBF002C */ lw $ra, 0x002C($sp) +/* 06454 808DCCC4 0C029490 */ jal func_800A5240 +/* 06458 808DCCC8 8FA40038 */ lw $a0, 0x0038($sp) +/* 0645C 808DCCCC 10000101 */ beq $zero, $zero, .L808DD0D4 +/* 06460 808DCCD0 8FBF002C */ lw $ra, 0x002C($sp) glabel L808DCCD4 -/* 06464 808DCCD4 8FA40038 */ lw $a0, 0x0038($sp) -/* 06468 808DCCD8 0C0295B2 */ jal func_800A56C8 +/* 06464 808DCCD4 8FA40038 */ lw $a0, 0x0038($sp) +/* 06468 808DCCD8 0C0295B2 */ jal func_800A56C8 /* 0646C 808DCCDC 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 06470 808DCCE0 104000FB */ beq $v0, $zero, .L808DD0D0 +/* 06470 808DCCE0 104000FB */ beq $v0, $zero, .L808DD0D0 /* 06474 808DCCE4 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 06478 808DCCE8 26103D40 */ addiu $s0, $s0, 0x3D40 ## $s0 = 06003D40 /* 0647C 808DCCEC 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 06480 808DCCF0 A62B01C2 */ sh $t3, 0x01C2($s1) ## 000001C2 /* 06484 808DCCF4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06488 808DCCF8 02002025 */ or $a0, $s0, $zero ## $a0 = 06003D40 /* 0648C 808DCCFC 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 06490 808DCD00 4406A000 */ mfc1 $a2, $f20 +/* 06490 808DCD00 4406A000 */ mfc1 $a2, $f20 /* 06494 808DCD04 02002825 */ or $a1, $s0, $zero ## $a1 = 06003D40 -/* 06498 808DCD08 46809120 */ cvt.s.w $f4, $f18 +/* 06498 808DCD08 46809120 */ cvt.s.w $f4, $f18 /* 0649C 808DCD0C E62401CC */ swc1 $f4, 0x01CC($s1) ## 000001CC -/* 064A0 808DCD10 0C029490 */ jal func_800A5240 -/* 064A4 808DCD14 8FA40038 */ lw $a0, 0x0038($sp) -/* 064A8 808DCD18 100000EE */ beq $zero, $zero, .L808DD0D4 -/* 064AC 808DCD1C 8FBF002C */ lw $ra, 0x002C($sp) +/* 064A0 808DCD10 0C029490 */ jal func_800A5240 +/* 064A4 808DCD14 8FA40038 */ lw $a0, 0x0038($sp) +/* 064A8 808DCD18 100000EE */ beq $zero, $zero, .L808DD0D4 +/* 064AC 808DCD1C 8FBF002C */ lw $ra, 0x002C($sp) glabel L808DCD20 /* 064B0 808DCD20 3C0C8090 */ lui $t4, %hi(D_808F93C0) ## $t4 = 80900000 -/* 064B4 808DCD24 8D8C93C0 */ lw $t4, %lo(D_808F93C0)($t4) +/* 064B4 808DCD24 8D8C93C0 */ lw $t4, %lo(D_808F93C0)($t4) /* 064B8 808DCD28 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 064BC 808DCD2C 44810000 */ mtc1 $at, $f0 ## $f0 = 40.00 /* 064C0 808DCD30 E59416D0 */ swc1 $f20, 0x16D0($t4) ## 809016D0 @@ -127,86 +127,86 @@ glabel L808DCD20 /* 064C8 808DCD38 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 064CC 808DCD3C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 /* 064D0 808DCD40 C6260060 */ lwc1 $f6, 0x0060($s1) ## 00000060 -/* 064D4 808DCD44 4600803C */ c.lt.s $f16, $f0 +/* 064D4 808DCD44 4600803C */ c.lt.s $f16, $f0 /* 064D8 808DCD48 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 064DC 808DCD4C 46083281 */ sub.s $f10, $f6, $f8 +/* 064DC 808DCD4C 46083281 */ sub.s $f10, $f6, $f8 /* 064E0 808DCD50 261063CC */ addiu $s0, $s0, 0x63CC ## $s0 = 060063CC /* 064E4 808DCD54 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 064E8 808DCD58 450000DD */ bc1f .L808DD0D0 +/* 064E8 808DCD58 450000DD */ bc1f .L808DD0D0 /* 064EC 808DCD5C E62A0060 */ swc1 $f10, 0x0060($s1) ## 00000060 /* 064F0 808DCD60 E6200028 */ swc1 $f0, 0x0028($s1) ## 00000028 /* 064F4 808DCD64 E6340060 */ swc1 $f20, 0x0060($s1) ## 00000060 /* 064F8 808DCD68 A62D01C2 */ sh $t5, 0x01C2($s1) ## 000001C2 /* 064FC 808DCD6C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06500 808DCD70 02002025 */ or $a0, $s0, $zero ## $a0 = 060063CC /* 06504 808DCD74 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 06508 808DCD78 4406A000 */ mfc1 $a2, $f20 +/* 06508 808DCD78 4406A000 */ mfc1 $a2, $f20 /* 0650C 808DCD7C 02002825 */ or $a1, $s0, $zero ## $a1 = 060063CC -/* 06510 808DCD80 46809120 */ cvt.s.w $f4, $f18 +/* 06510 808DCD80 46809120 */ cvt.s.w $f4, $f18 /* 06514 808DCD84 E62401CC */ swc1 $f4, 0x01CC($s1) ## 000001CC -/* 06518 808DCD88 0C029490 */ jal func_800A5240 -/* 0651C 808DCD8C 8FA40038 */ lw $a0, 0x0038($sp) +/* 06518 808DCD88 0C029490 */ jal func_800A5240 +/* 0651C 808DCD8C 8FA40038 */ lw $a0, 0x0038($sp) /* 06520 808DCD90 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 /* 06524 808DCD94 240E0046 */ addiu $t6, $zero, 0x0046 ## $t6 = 00000046 /* 06528 808DCD98 A62E01B6 */ sh $t6, 0x01B6($s1) ## 000001B6 /* 0652C 808DCD9C 35F80400 */ ori $t8, $t7, 0x0400 ## $t8 = 00000400 -/* 06530 808DCDA0 100000CB */ beq $zero, $zero, .L808DD0D0 +/* 06530 808DCDA0 100000CB */ beq $zero, $zero, .L808DD0D0 /* 06534 808DCDA4 AE380004 */ sw $t8, 0x0004($s1) ## 00000004 glabel L808DCDA8 /* 06538 808DCDA8 863901B6 */ lh $t9, 0x01B6($s1) ## 000001B6 /* 0653C 808DCDAC 24010044 */ addiu $at, $zero, 0x0044 ## $at = 00000044 /* 06540 808DCDB0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 06544 808DCDB4 57210003 */ bnel $t9, $at, .L808DCDC4 -/* 06548 808DCDB8 8FA40038 */ lw $a0, 0x0038($sp) +/* 06544 808DCDB4 57210003 */ bnel $t9, $at, .L808DCDC4 +/* 06548 808DCDB8 8FA40038 */ lw $a0, 0x0038($sp) /* 0654C 808DCDBC A228019F */ sb $t0, 0x019F($s1) ## 0000019F -/* 06550 808DCDC0 8FA40038 */ lw $a0, 0x0038($sp) +/* 06550 808DCDC0 8FA40038 */ lw $a0, 0x0038($sp) .L808DCDC4: -/* 06554 808DCDC4 0C0295B2 */ jal func_800A56C8 +/* 06554 808DCDC4 0C0295B2 */ jal func_800A56C8 /* 06558 808DCDC8 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 0655C 808DCDCC 104000C0 */ beq $v0, $zero, .L808DD0D0 +/* 0655C 808DCDCC 104000C0 */ beq $v0, $zero, .L808DD0D0 /* 06560 808DCDD0 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 06564 808DCDD4 261069A0 */ addiu $s0, $s0, 0x69A0 ## $s0 = 060069A0 /* 06568 808DCDD8 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 0656C 808DCDDC A62901C2 */ sh $t1, 0x01C2($s1) ## 000001C2 /* 06570 808DCDE0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06574 808DCDE4 02002025 */ or $a0, $s0, $zero ## $a0 = 060069A0 /* 06578 808DCDE8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0657C 808DCDEC 4406A000 */ mfc1 $a2, $f20 +/* 0657C 808DCDEC 4406A000 */ mfc1 $a2, $f20 /* 06580 808DCDF0 02002825 */ or $a1, $s0, $zero ## $a1 = 060069A0 -/* 06584 808DCDF4 46803220 */ cvt.s.w $f8, $f6 +/* 06584 808DCDF4 46803220 */ cvt.s.w $f8, $f6 /* 06588 808DCDF8 E62801CC */ swc1 $f8, 0x01CC($s1) ## 000001CC -/* 0658C 808DCDFC 0C0294D3 */ jal func_800A534C -/* 06590 808DCE00 8FA40038 */ lw $a0, 0x0038($sp) -/* 06594 808DCE04 100000B3 */ beq $zero, $zero, .L808DD0D4 -/* 06598 808DCE08 8FBF002C */ lw $ra, 0x002C($sp) +/* 0658C 808DCDFC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 06590 808DCE00 8FA40038 */ lw $a0, 0x0038($sp) +/* 06594 808DCE04 100000B3 */ beq $zero, $zero, .L808DD0D4 +/* 06598 808DCE08 8FBF002C */ lw $ra, 0x002C($sp) glabel L808DCE0C -/* 0659C 808DCE0C 8FA40038 */ lw $a0, 0x0038($sp) -/* 065A0 808DCE10 0C0295B2 */ jal func_800A56C8 +/* 0659C 808DCE0C 8FA40038 */ lw $a0, 0x0038($sp) +/* 065A0 808DCE10 0C0295B2 */ jal func_800A56C8 /* 065A4 808DCE14 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 065A8 808DCE18 10400003 */ beq $v0, $zero, .L808DCE28 +/* 065A8 808DCE18 10400003 */ beq $v0, $zero, .L808DCE28 /* 065AC 808DCE1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 065B0 808DCE20 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 065B4 808DCE24 240539CE */ addiu $a1, $zero, 0x39CE ## $a1 = 000039CE .L808DCE28: /* 065B8 808DCE28 862A01B6 */ lh $t2, 0x01B6($s1) ## 000001B6 /* 065BC 808DCE2C 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 065C0 808DCE30 261058C4 */ addiu $s0, $s0, 0x58C4 ## $s0 = 060058C4 -/* 065C4 808DCE34 154000A6 */ bne $t2, $zero, .L808DD0D0 +/* 065C4 808DCE34 154000A6 */ bne $t2, $zero, .L808DD0D0 /* 065C8 808DCE38 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 /* 065CC 808DCE3C A62B01C2 */ sh $t3, 0x01C2($s1) ## 000001C2 /* 065D0 808DCE40 0C028800 */ jal SkelAnime_GetFrameCount - + /* 065D4 808DCE44 02002025 */ or $a0, $s0, $zero ## $a0 = 060058C4 /* 065D8 808DCE48 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 065DC 808DCE4C 4406A000 */ mfc1 $a2, $f20 +/* 065DC 808DCE4C 4406A000 */ mfc1 $a2, $f20 /* 065E0 808DCE50 02002825 */ or $a1, $s0, $zero ## $a1 = 060058C4 -/* 065E4 808DCE54 46805420 */ cvt.s.w $f16, $f10 +/* 065E4 808DCE54 46805420 */ cvt.s.w $f16, $f10 /* 065E8 808DCE58 E63001CC */ swc1 $f16, 0x01CC($s1) ## 000001CC -/* 065EC 808DCE5C 0C029490 */ jal func_800A5240 -/* 065F0 808DCE60 8FA40038 */ lw $a0, 0x0038($sp) +/* 065EC 808DCE5C 0C029490 */ jal func_800A5240 +/* 065F0 808DCE60 8FA40038 */ lw $a0, 0x0038($sp) /* 065F4 808DCE64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 065F8 808DCE68 240C0050 */ addiu $t4, $zero, 0x0050 ## $t4 = 00000050 /* 065FC 808DCE6C 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 @@ -214,56 +214,56 @@ glabel L808DCE0C /* 06604 808DCE74 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 .L808DCE78: /* 06608 808DCE78 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0660C 808DCE7C 4600A306 */ mov.s $f12, $f20 -/* 06610 808DCE80 4600048D */ trunc.w.s $f18, $f0 -/* 06614 808DCE84 00107840 */ sll $t7, $s0, 1 + +/* 0660C 808DCE7C 4600A306 */ mov.s $f12, $f20 +/* 06610 808DCE80 4600048D */ trunc.w.s $f18, $f0 +/* 06614 808DCE84 00107840 */ sll $t7, $s0, 1 /* 06618 808DCE88 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000002 -/* 0661C 808DCE8C 00108400 */ sll $s0, $s0, 16 -/* 06620 808DCE90 440E9000 */ mfc1 $t6, $f18 -/* 06624 808DCE94 00108403 */ sra $s0, $s0, 16 -/* 06628 808DCE98 2A01000F */ slti $at, $s0, 0x000F -/* 0662C 808DCE9C 022FC021 */ addu $t8, $s1, $t7 -/* 06630 808DCEA0 1420FFF5 */ bne $at, $zero, .L808DCE78 +/* 0661C 808DCE8C 00108400 */ sll $s0, $s0, 16 +/* 06620 808DCE90 440E9000 */ mfc1 $t6, $f18 +/* 06624 808DCE94 00108403 */ sra $s0, $s0, 16 +/* 06628 808DCE98 2A01000F */ slti $at, $s0, 0x000F +/* 0662C 808DCE9C 022FC021 */ addu $t8, $s1, $t7 +/* 06630 808DCEA0 1420FFF5 */ bne $at, $zero, .L808DCE78 /* 06634 808DCEA4 A70E04E4 */ sh $t6, 0x04E4($t8) ## 000004E4 /* 06638 808DCEA8 8E280004 */ lw $t0, 0x0004($s1) ## 00000004 /* 0663C 808DCEAC 2401FBFF */ addiu $at, $zero, 0xFBFF ## $at = FFFFFBFF /* 06640 808DCEB0 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 -/* 06644 808DCEB4 01014824 */ and $t1, $t0, $at +/* 06644 808DCEB4 01014824 */ and $t1, $t0, $at /* 06648 808DCEB8 A63902E6 */ sh $t9, 0x02E6($s1) ## 000002E6 /* 0664C 808DCEBC A62002E8 */ sh $zero, 0x02E8($s1) ## 000002E8 -/* 06650 808DCEC0 10000083 */ beq $zero, $zero, .L808DD0D0 +/* 06650 808DCEC0 10000083 */ beq $zero, $zero, .L808DD0D0 /* 06654 808DCEC4 AE290004 */ sw $t1, 0x0004($s1) ## 00000004 glabel L808DCEC8 -/* 06658 808DCEC8 8FA40054 */ lw $a0, 0x0054($sp) +/* 06658 808DCEC8 8FA40054 */ lw $a0, 0x0054($sp) /* 0665C 808DCECC 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 -/* 06660 808DCED0 0C235AFC */ jal func_808D6BF0 +/* 06660 808DCED0 0C235AFC */ jal func_808D6BF0 /* 06664 808DCED4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 06668 808DCED8 8FA40038 */ lw $a0, 0x0038($sp) -/* 0666C 808DCEDC 0C0295B2 */ jal func_800A56C8 +/* 06668 808DCED8 8FA40038 */ lw $a0, 0x0038($sp) +/* 0666C 808DCEDC 0C0295B2 */ jal func_800A56C8 /* 06670 808DCEE0 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 06674 808DCEE4 1040007A */ beq $v0, $zero, .L808DD0D0 +/* 06674 808DCEE4 1040007A */ beq $v0, $zero, .L808DD0D0 /* 06678 808DCEE8 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 0667C 808DCEEC 26106028 */ addiu $s0, $s0, 0x6028 ## $s0 = 06006028 /* 06680 808DCEF0 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 /* 06684 808DCEF4 A62A01C2 */ sh $t2, 0x01C2($s1) ## 000001C2 /* 06688 808DCEF8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0668C 808DCEFC 02002025 */ or $a0, $s0, $zero ## $a0 = 06006028 /* 06690 808DCF00 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 06694 808DCF04 4406A000 */ mfc1 $a2, $f20 +/* 06694 808DCF04 4406A000 */ mfc1 $a2, $f20 /* 06698 808DCF08 02002825 */ or $a1, $s0, $zero ## $a1 = 06006028 -/* 0669C 808DCF0C 468021A0 */ cvt.s.w $f6, $f4 +/* 0669C 808DCF0C 468021A0 */ cvt.s.w $f6, $f4 /* 066A0 808DCF10 E62601CC */ swc1 $f6, 0x01CC($s1) ## 000001CC -/* 066A4 808DCF14 0C029490 */ jal func_800A5240 -/* 066A8 808DCF18 8FA40038 */ lw $a0, 0x0038($sp) +/* 066A4 808DCF14 0C029490 */ jal func_800A5240 +/* 066A8 808DCF18 8FA40038 */ lw $a0, 0x0038($sp) /* 066AC 808DCF1C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 066B0 808DCF20 3C0B8090 */ lui $t3, %hi(D_808F93C0) ## $t3 = 80900000 -/* 066B4 808DCF24 8D6B93C0 */ lw $t3, %lo(D_808F93C0)($t3) +/* 066B4 808DCF24 8D6B93C0 */ lw $t3, %lo(D_808F93C0)($t3) /* 066B8 808DCF28 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 066BC 808DCF2C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 066C0 808DCF30 E56816D0 */ swc1 $f8, 0x16D0($t3) ## 809016D0 -/* 066C4 808DCF34 10000066 */ beq $zero, $zero, .L808DD0D0 +/* 066C4 808DCF34 10000066 */ beq $zero, $zero, .L808DD0D0 /* 066C8 808DCF38 A22C019F */ sb $t4, 0x019F($s1) ## 0000019F glabel L808DCF3C /* 066CC 808DCF3C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 @@ -272,14 +272,14 @@ glabel L808DCF3C /* 066D8 808DCF48 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 066DC 808DCF4C 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 066E0 808DCF50 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 066E4 808DCF54 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 -/* 066E8 808DCF58 8FA40038 */ lw $a0, 0x0038($sp) -/* 066EC 808DCF5C 0C0295B2 */ jal func_800A56C8 +/* 066E8 808DCF58 8FA40038 */ lw $a0, 0x0038($sp) +/* 066EC 808DCF5C 0C0295B2 */ jal func_800A56C8 /* 066F0 808DCF60 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 066F4 808DCF64 1040005A */ beq $v0, $zero, .L808DD0D0 +/* 066F4 808DCF64 1040005A */ beq $v0, $zero, .L808DD0D0 /* 066F8 808DCF68 240D0007 */ addiu $t5, $zero, 0x0007 ## $t5 = 00000007 -/* 066FC 808DCF6C 10000058 */ beq $zero, $zero, .L808DD0D0 +/* 066FC 808DCF6C 10000058 */ beq $zero, $zero, .L808DD0D0 /* 06700 808DCF70 A62D01C2 */ sh $t5, 0x01C2($s1) ## 000001C2 glabel L808DCF74 /* 06704 808DCF74 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -288,107 +288,107 @@ glabel L808DCF74 /* 06710 808DCF80 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 06714 808DCF84 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 /* 06718 808DCF88 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0671C 808DCF8C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 06720 808DCF90 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 06724 808DCF94 26108A88 */ addiu $s0, $s0, 0x8A88 ## $s0 = 06008A88 /* 06728 808DCF98 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0672C 808DCF9C 02002025 */ or $a0, $s0, $zero ## $a0 = 06008A88 /* 06730 808DCFA0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 06734 808DCFA4 4406A000 */ mfc1 $a2, $f20 +/* 06734 808DCFA4 4406A000 */ mfc1 $a2, $f20 /* 06738 808DCFA8 02002825 */ or $a1, $s0, $zero ## $a1 = 06008A88 -/* 0673C 808DCFAC 46805420 */ cvt.s.w $f16, $f10 +/* 0673C 808DCFAC 46805420 */ cvt.s.w $f16, $f10 /* 06740 808DCFB0 E63001CC */ swc1 $f16, 0x01CC($s1) ## 000001CC -/* 06744 808DCFB4 0C029490 */ jal func_800A5240 -/* 06748 808DCFB8 8FA40038 */ lw $a0, 0x0038($sp) +/* 06744 808DCFB4 0C029490 */ jal func_800A5240 +/* 06748 808DCFB8 8FA40038 */ lw $a0, 0x0038($sp) /* 0674C 808DCFBC 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 06750 808DCFC0 A62F01C2 */ sh $t7, 0x01C2($s1) ## 000001C2 /* 06754 808DCFC4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 06758 808DCFC8 8FA40038 */ lw $a0, 0x0038($sp) + +/* 06758 808DCFC8 8FA40038 */ lw $a0, 0x0038($sp) /* 0675C 808DCFCC 3C014190 */ lui $at, 0x4190 ## $at = 41900000 /* 06760 808DCFD0 3C0E8090 */ lui $t6, %hi(D_808F93C0) ## $t6 = 80900000 -/* 06764 808DCFD4 8DCE93C0 */ lw $t6, %lo(D_808F93C0)($t6) +/* 06764 808DCFD4 8DCE93C0 */ lw $t6, %lo(D_808F93C0)($t6) /* 06768 808DCFD8 44819000 */ mtc1 $at, $f18 ## $f18 = 18.00 /* 0676C 808DCFDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 06770 808DCFE0 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 06774 808DCFE4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06778 808DCFE8 E5D216C4 */ swc1 $f18, 0x16C4($t6) ## 809016C4 /* 0677C 808DCFEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 06780 808DCFF0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06784 808DCFF4 240539CF */ addiu $a1, $zero, 0x39CF ## $a1 = 000039CF -/* 06788 808DCFF8 10000036 */ beq $zero, $zero, .L808DD0D4 -/* 0678C 808DCFFC 8FBF002C */ lw $ra, 0x002C($sp) +/* 06788 808DCFF8 10000036 */ beq $zero, $zero, .L808DD0D4 +/* 0678C 808DCFFC 8FBF002C */ lw $ra, 0x002C($sp) glabel L808DD000 /* 06790 808DD000 A22001A0 */ sb $zero, 0x01A0($s1) ## 000001A0 -/* 06794 808DD004 8FA40038 */ lw $a0, 0x0038($sp) -/* 06798 808DD008 0C0295B2 */ jal func_800A56C8 +/* 06794 808DD004 8FA40038 */ lw $a0, 0x0038($sp) +/* 06798 808DD008 0C0295B2 */ jal func_800A56C8 /* 0679C 808DD00C 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 -/* 067A0 808DD010 10400028 */ beq $v0, $zero, .L808DD0B4 +/* 067A0 808DD010 10400028 */ beq $v0, $zero, .L808DD0B4 /* 067A4 808DD014 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 067A8 808DD018 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 067AC 808DD01C 263801FC */ addiu $t8, $s1, 0x01FC ## $t8 = 000001FC /* 067B0 808DD020 4481A000 */ mtc1 $at, $f20 ## $f20 = 25.00 -/* 067B4 808DD024 AFB80034 */ sw $t8, 0x0034($sp) +/* 067B4 808DD024 AFB80034 */ sw $t8, 0x0034($sp) .L808DD028: /* 067B8 808DD028 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 067BC 808DD02C 4600A306 */ mov.s $f12, $f20 -/* 067C0 808DD030 E7A00040 */ swc1 $f0, 0x0040($sp) + +/* 067BC 808DD02C 4600A306 */ mov.s $f12, $f20 +/* 067C0 808DD030 E7A00040 */ swc1 $f0, 0x0040($sp) /* 067C4 808DD034 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 067C8 808DD038 4600A306 */ mov.s $f12, $f20 -/* 067CC 808DD03C E7A00044 */ swc1 $f0, 0x0044($sp) + +/* 067C8 808DD038 4600A306 */ mov.s $f12, $f20 +/* 067CC 808DD03C E7A00044 */ swc1 $f0, 0x0044($sp) /* 067D0 808DD040 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 067D4 808DD044 4600A306 */ mov.s $f12, $f20 + +/* 067D4 808DD044 4600A306 */ mov.s $f12, $f20 /* 067D8 808DD048 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 067DC 808DD04C 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 067E0 808DD050 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 067E4 808DD054 E7A00048 */ swc1 $f0, 0x0048($sp) + +/* 067E4 808DD054 E7A00048 */ swc1 $f0, 0x0048($sp) /* 067E8 808DD058 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 067EC 808DD05C 44812000 */ mtc1 $at, $f4 ## $f4 = 500.00 /* 067F0 808DD060 3C07808E */ lui $a3, %hi(D_808E4C6C) ## $a3 = 808E0000 /* 067F4 808DD064 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 067F8 808DD068 46040180 */ add.s $f6, $f0, $f4 -/* 067FC 808DD06C AFB90014 */ sw $t9, 0x0014($sp) +/* 067F8 808DD068 46040180 */ add.s $f6, $f0, $f4 +/* 067FC 808DD06C AFB90014 */ sw $t9, 0x0014($sp) /* 06800 808DD070 24E74C6C */ addiu $a3, $a3, %lo(D_808E4C6C) ## $a3 = 808E4C6C -/* 06804 808DD074 8FA40054 */ lw $a0, 0x0054($sp) -/* 06808 808DD078 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0680C 808DD07C 8FA50034 */ lw $a1, 0x0034($sp) -/* 06810 808DD080 0C235A6C */ jal func_808D69B0 +/* 06804 808DD074 8FA40054 */ lw $a0, 0x0054($sp) +/* 06808 808DD078 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0680C 808DD07C 8FA50034 */ lw $a1, 0x0034($sp) +/* 06810 808DD080 0C235A6C */ jal func_808D69B0 /* 06814 808DD084 27A60040 */ addiu $a2, $sp, 0x0040 ## $a2 = FFFFFFF0 /* 06818 808DD088 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0681C 808DD08C 00108400 */ sll $s0, $s0, 16 -/* 06820 808DD090 00108403 */ sra $s0, $s0, 16 -/* 06824 808DD094 2A010064 */ slti $at, $s0, 0x0064 -/* 06828 808DD098 1420FFE3 */ bne $at, $zero, .L808DD028 +/* 0681C 808DD08C 00108400 */ sll $s0, $s0, 16 +/* 06820 808DD090 00108403 */ sra $s0, $s0, 16 +/* 06824 808DD094 2A010064 */ slti $at, $s0, 0x0064 +/* 06828 808DD098 1420FFE3 */ bne $at, $zero, .L808DD028 /* 0682C 808DD09C 00000000 */ nop /* 06830 808DD0A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 06834 808DD0A4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06838 808DD0A8 24050806 */ addiu $a1, $zero, 0x0806 ## $a1 = 00000806 /* 0683C 808DD0AC 24080032 */ addiu $t0, $zero, 0x0032 ## $t0 = 00000032 /* 06840 808DD0B0 A62801BC */ sh $t0, 0x01BC($s1) ## 000001BC .L808DD0B4: -/* 06844 808DD0B4 8FA40038 */ lw $a0, 0x0038($sp) -/* 06848 808DD0B8 0C0295B2 */ jal func_800A56C8 +/* 06844 808DD0B4 8FA40038 */ lw $a0, 0x0038($sp) +/* 06848 808DD0B8 0C0295B2 */ jal func_800A56C8 /* 0684C 808DD0BC 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 06850 808DD0C0 10400003 */ beq $v0, $zero, .L808DD0D0 +/* 06850 808DD0C0 10400003 */ beq $v0, $zero, .L808DD0D0 /* 06854 808DD0C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 06858 808DD0C8 0C236EBC */ jal func_808DBAF0 -/* 0685C 808DD0CC 8FA50054 */ lw $a1, 0x0054($sp) +/* 06858 808DD0C8 0C236EBC */ jal func_808DBAF0 +/* 0685C 808DD0CC 8FA50054 */ lw $a1, 0x0054($sp) .L808DD0D0: -/* 06860 808DD0D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 06860 808DD0D0 8FBF002C */ lw $ra, 0x002C($sp) .L808DD0D4: -/* 06864 808DD0D4 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 06868 808DD0D8 8FB00024 */ lw $s0, 0x0024($sp) -/* 0686C 808DD0DC 8FB10028 */ lw $s1, 0x0028($sp) -/* 06870 808DD0E0 03E00008 */ jr $ra +/* 06864 808DD0D4 D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 06868 808DD0D8 8FB00024 */ lw $s0, 0x0024($sp) +/* 0686C 808DD0DC 8FB10028 */ lw $s1, 0x0028($sp) +/* 06870 808DD0E0 03E00008 */ jr $ra /* 06874 808DD0E4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s index baafa30858..91d546684e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s @@ -1,34 +1,34 @@ glabel func_808DD14C /* 068DC 808DD14C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 068E0 808DD150 AFBF001C */ sw $ra, 0x001C($sp) -/* 068E4 808DD154 AFB00018 */ sw $s0, 0x0018($sp) -/* 068E8 808DD158 AFA5002C */ sw $a1, 0x002C($sp) +/* 068E0 808DD150 AFBF001C */ sw $ra, 0x001C($sp) +/* 068E4 808DD154 AFB00018 */ sw $s0, 0x0018($sp) +/* 068E8 808DD158 AFA5002C */ sw $a1, 0x002C($sp) /* 068EC 808DD15C 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 /* 068F0 808DD160 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 068F4 808DD164 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 /* 068F8 808DD168 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 068FC 808DD16C AC8FFEB4 */ sw $t7, -0x014C($a0) ## 00000004 /* 06900 808DD170 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 06904 808DD174 AFA40024 */ sw $a0, 0x0024($sp) + +/* 06904 808DD174 AFA40024 */ sw $a0, 0x0024($sp) /* 06908 808DD178 861801A4 */ lh $t8, 0x01A4($s0) ## 000001A4 /* 0690C 808DD17C 26040508 */ addiu $a0, $s0, 0x0508 ## $a0 = 00000508 /* 06910 808DD180 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 06914 808DD184 2B010037 */ slti $at, $t8, 0x0037 -/* 06918 808DD188 14200007 */ bne $at, $zero, .L808DD1A8 +/* 06914 808DD184 2B010037 */ slti $at, $t8, 0x0037 +/* 06918 808DD188 14200007 */ bne $at, $zero, .L808DD1A8 /* 0691C 808DD18C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06920 808DD190 3C073E19 */ lui $a3, 0x3E19 ## $a3 = 3E190000 /* 06924 808DD194 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A /* 06928 808DD198 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0692C 808DD19C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 06930 808DD1A0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 06934 808DD1A4 A21902E4 */ sb $t9, 0x02E4($s0) ## 000002E4 .L808DD1A8: -/* 06938 808DD1A8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0693C 808DD1AC 0C0295B2 */ jal func_800A56C8 +/* 06938 808DD1A8 8FA40024 */ lw $a0, 0x0024($sp) +/* 0693C 808DD1AC 0C0295B2 */ jal func_800A56C8 /* 06940 808DD1B0 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 06944 808DD1B4 10400010 */ beq $v0, $zero, .L808DD1F8 +/* 06944 808DD1B4 10400010 */ beq $v0, $zero, .L808DD1F8 /* 06948 808DD1B8 3C08808E */ lui $t0, %hi(func_808DCB7C) ## $t0 = 808E0000 /* 0694C 808DD1BC 2508CB7C */ addiu $t0, $t0, %lo(func_808DCB7C) ## $t0 = 808DCB7C /* 06950 808DD1C0 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 @@ -36,21 +36,21 @@ glabel func_808DD14C /* 06958 808DD1C8 AE080194 */ sw $t0, 0x0194($s0) ## 00000194 /* 0695C 808DD1CC A60901C2 */ sh $t1, 0x01C2($s0) ## 000001C2 /* 06960 808DD1D0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06964 808DD1D4 248469A0 */ addiu $a0, $a0, 0x69A0 ## $a0 = 060069A0 /* 06968 808DD1D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0696C 808DD1DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 06970 808DD1E0 24A569A0 */ addiu $a1, $a1, 0x69A0 ## $a1 = 060069A0 -/* 06974 808DD1E4 468021A0 */ cvt.s.w $f6, $f4 +/* 06974 808DD1E4 468021A0 */ cvt.s.w $f6, $f4 /* 06978 808DD1E8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0697C 808DD1EC E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC -/* 06980 808DD1F0 0C0294D3 */ jal func_800A534C -/* 06984 808DD1F4 8FA40024 */ lw $a0, 0x0024($sp) +/* 06980 808DD1F0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 06984 808DD1F4 8FA40024 */ lw $a0, 0x0024($sp) .L808DD1F8: -/* 06988 808DD1F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0698C 808DD1FC 8FB00018 */ lw $s0, 0x0018($sp) +/* 06988 808DD1F8 8FBF001C */ lw $ra, 0x001C($sp) +/* 0698C 808DD1FC 8FB00018 */ lw $s0, 0x0018($sp) /* 06990 808DD200 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 06994 808DD204 03E00008 */ jr $ra +/* 06994 808DD204 03E00008 */ jr $ra /* 06998 808DD208 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s index 9b8f828b2f..74dfbdbc02 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s @@ -1,21 +1,21 @@ glabel BossGanon2_Destroy /* 0054C 808FD48C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00550 808FD490 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00554 808FD494 AFA40018 */ sw $a0, 0x0018($sp) -/* 00558 808FD498 AFA5001C */ sw $a1, 0x001C($sp) -/* 0055C 808FD49C 0C0295BC */ jal func_800A56F0 +/* 00550 808FD490 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00554 808FD494 AFA40018 */ sw $a0, 0x0018($sp) +/* 00558 808FD498 AFA5001C */ sw $a1, 0x001C($sp) +/* 0055C 808FD49C 0C0295BC */ jal SkelAnime_Free /* 00560 808FD4A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00564 808FD4A4 8FA50018 */ lw $a1, 0x0018($sp) -/* 00568 808FD4A8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0056C 808FD4AC 0C016F32 */ jal func_8005BCC8 +/* 00564 808FD4A4 8FA50018 */ lw $a1, 0x0018($sp) +/* 00568 808FD4A8 8FA4001C */ lw $a0, 0x001C($sp) +/* 0056C 808FD4AC 0C016F32 */ jal func_8005BCC8 /* 00570 808FD4B0 24A50424 */ addiu $a1, $a1, 0x0424 ## $a1 = 00000424 -/* 00574 808FD4B4 8FA50018 */ lw $a1, 0x0018($sp) -/* 00578 808FD4B8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0057C 808FD4BC 0C016F32 */ jal func_8005BCC8 +/* 00574 808FD4B4 8FA50018 */ lw $a1, 0x0018($sp) +/* 00578 808FD4B8 8FA4001C */ lw $a0, 0x001C($sp) +/* 0057C 808FD4BC 0C016F32 */ jal func_8005BCC8 /* 00580 808FD4C0 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 00000444 -/* 00584 808FD4C4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00584 808FD4C4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00588 808FD4C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0058C 808FD4CC 03E00008 */ jr $ra +/* 0058C 808FD4CC 03E00008 */ jr $ra /* 00590 808FD4D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s index 3251141a3f..ec557c2175 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s @@ -1,66 +1,66 @@ glabel BossGanon2_Draw /* 089B0 809058F0 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 089B4 809058F4 AFB10028 */ sw $s1, 0x0028($sp) -/* 089B8 809058F8 AFB00024 */ sw $s0, 0x0024($sp) +/* 089B4 809058F4 AFB10028 */ sw $s1, 0x0028($sp) +/* 089B8 809058F8 AFB00024 */ sw $s0, 0x0024($sp) /* 089BC 809058FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 089C0 80905900 AFBF002C */ sw $ra, 0x002C($sp) +/* 089C0 80905900 AFBF002C */ sw $ra, 0x002C($sp) /* 089C4 80905904 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 089C8 80905908 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 089CC 8090590C 0C031A73 */ jal Graph_Alloc - + /* 089D0 80905910 24051000 */ addiu $a1, $zero, 0x1000 ## $a1 = 00001000 -/* 089D4 80905914 AFA20074 */ sw $v0, 0x0074($sp) +/* 089D4 80905914 AFA20074 */ sw $v0, 0x0074($sp) /* 089D8 80905918 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 089DC 8090591C 3C068091 */ lui $a2, %hi(D_8090D9BC) ## $a2 = 80910000 /* 089E0 80905920 24C6D9BC */ addiu $a2, $a2, %lo(D_8090D9BC) ## $a2 = 8090D9BC /* 089E4 80905924 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 089E8 80905928 240716D0 */ addiu $a3, $zero, 0x16D0 ## $a3 = 000016D0 -/* 089EC 8090592C 0C031AB1 */ jal func_800C6AC4 -/* 089F0 80905930 AFA50068 */ sw $a1, 0x0068($sp) -/* 089F4 80905934 0C024F46 */ jal func_80093D18 +/* 089EC 8090592C 0C031AB1 */ jal func_800C6AC4 +/* 089F0 80905930 AFA50068 */ sw $a1, 0x0068($sp) +/* 089F4 80905934 0C024F46 */ jal func_80093D18 /* 089F8 80905938 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 089FC 8090593C 0C024F61 */ jal func_80093D84 +/* 089FC 8090593C 0C024F61 */ jal func_80093D84 /* 08A00 80905940 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 08A04 80905944 92020337 */ lbu $v0, 0x0337($s0) ## 00000337 /* 08A08 80905948 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08A0C 8090594C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 08A10 80905950 10400009 */ beq $v0, $zero, .L80905978 +/* 08A10 80905950 10400009 */ beq $v0, $zero, .L80905978 /* 08A14 80905954 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 /* 08A18 80905958 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 08A1C 8090595C 10410036 */ beq $v0, $at, .L80905A38 +/* 08A1C 8090595C 10410036 */ beq $v0, $at, .L80905A38 /* 08A20 80905960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08A24 80905964 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 08A28 80905968 50410034 */ beql $v0, $at, .L80905A3C +/* 08A28 80905968 50410034 */ beql $v0, $at, .L80905A3C /* 08A2C 8090596C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 08A30 80905970 100000AB */ beq $zero, $zero, .L80905C20 +/* 08A30 80905970 100000AB */ beq $zero, $zero, .L80905C20 /* 08A34 80905974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80905978: -/* 08A38 80905978 0C23F442 */ jal func_808FD108 +/* 08A38 80905978 0C23F442 */ jal func_808FD108 /* 08A3C 8090597C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 08A40 80905980 8FAE0068 */ lw $t6, 0x0068($sp) +/* 08A40 80905980 8FAE0068 */ lw $t6, 0x0068($sp) /* 08A44 80905984 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 08A48 80905988 2484A8E0 */ addiu $a0, $a0, 0xA8E0 ## $a0 = 0600A8E0 /* 08A4C 8090598C 8DC302D0 */ lw $v1, 0x02D0($t6) ## 000002D0 -/* 08A50 80905990 0004C900 */ sll $t9, $a0, 4 -/* 08A54 80905994 00194F02 */ srl $t1, $t9, 28 +/* 08A50 80905990 0004C900 */ sll $t9, $a0, 4 +/* 08A54 80905994 00194F02 */ srl $t1, $t9, 28 /* 08A58 80905998 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 08A5C 8090599C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 08A60 809059A0 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 08A64 809059A4 256B6FA8 */ addiu $t3, $t3, 0x6FA8 ## $t3 = 80166FA8 /* 08A68 809059A8 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 08A6C 809059AC 00095080 */ sll $t2, $t1, 2 +/* 08A6C 809059AC 00095080 */ sll $t2, $t1, 2 /* 08A70 809059B0 ADCF02D0 */ sw $t7, 0x02D0($t6) ## 000002D0 -/* 08A74 809059B4 014B2821 */ addu $a1, $t2, $t3 +/* 08A74 809059B4 014B2821 */ addu $a1, $t2, $t3 /* 08A78 809059B8 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 08A7C 809059BC 8CAC0000 */ lw $t4, 0x0000($a1) ## 00000000 /* 08A80 809059C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 08A84 809059C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 08A88 809059C8 00813024 */ and $a2, $a0, $at +/* 08A88 809059C8 00813024 */ and $a2, $a0, $at /* 08A8C 809059CC 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 08A90 809059D0 01866821 */ addu $t5, $t4, $a2 -/* 08A94 809059D4 01A77821 */ addu $t7, $t5, $a3 +/* 08A90 809059D0 01866821 */ addu $t5, $t4, $a2 +/* 08A94 809059D4 01A77821 */ addu $t7, $t5, $a3 /* 08A98 809059D8 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 08A9C 809059DC 8FAE0068 */ lw $t6, 0x0068($sp) +/* 08A9C 809059DC 8FAE0068 */ lw $t6, 0x0068($sp) /* 08AA0 809059E0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 08AA4 809059E4 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 /* 08AA8 809059E8 8DC302D0 */ lw $v1, 0x02D0($t6) ## 000002D0 @@ -71,25 +71,25 @@ glabel BossGanon2_Draw /* 08ABC 809059FC AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 08AC0 80905A00 8CA90000 */ lw $t1, 0x0000($a1) ## 00000000 /* 08AC4 80905A04 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 08AC8 80905A08 01265021 */ addu $t2, $t1, $a2 -/* 08ACC 80905A0C 01475821 */ addu $t3, $t2, $a3 +/* 08AC8 80905A08 01265021 */ addu $t2, $t1, $a2 +/* 08ACC 80905A0C 01475821 */ addu $t3, $t2, $a3 /* 08AD0 80905A10 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 /* 08AD4 80905A14 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 08AD8 80905A18 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 08ADC 80905A1C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 08AE0 80905A20 AFB00018 */ sw $s0, 0x0018($sp) -/* 08AE4 80905A24 AFAC0014 */ sw $t4, 0x0014($sp) -/* 08AE8 80905A28 0C0286B2 */ jal func_800A1AC8 -/* 08AEC 80905A2C AFA00010 */ sw $zero, 0x0010($sp) -/* 08AF0 80905A30 1000007B */ beq $zero, $zero, .L80905C20 +/* 08AE0 80905A20 AFB00018 */ sw $s0, 0x0018($sp) +/* 08AE4 80905A24 AFAC0014 */ sw $t4, 0x0014($sp) +/* 08AE8 80905A28 0C0286B2 */ jal SkelAnime_DrawSV +/* 08AEC 80905A2C AFA00010 */ sw $zero, 0x0010($sp) +/* 08AF0 80905A30 1000007B */ beq $zero, $zero, .L80905C20 /* 08AF4 80905A34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80905A38: /* 08AF8 80905A38 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80905A3C: /* 08AFC 80905A3C 24060153 */ addiu $a2, $zero, 0x0153 ## $a2 = 00000153 -/* 08B00 80905A40 0C23F442 */ jal func_808FD108 +/* 08B00 80905A40 0C23F442 */ jal func_808FD108 /* 08B04 80905A44 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 08B08 80905A48 8FA80068 */ lw $t0, 0x0068($sp) +/* 08B08 80905A48 8FA80068 */ lw $t0, 0x0068($sp) /* 08B0C 80905A4C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 08B10 80905A50 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 08B14 80905A54 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -101,29 +101,29 @@ glabel BossGanon2_Draw /* 08B2C 80905A6C 92180310 */ lbu $t8, 0x0310($s0) ## 00000310 /* 08B30 80905A70 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 08B34 80905A74 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 08B38 80905A78 00187080 */ sll $t6, $t8, 2 -/* 08B3C 80905A7C 008E2021 */ addu $a0, $a0, $t6 -/* 08B40 80905A80 8C847170 */ lw $a0, %lo(D_80907170)($a0) +/* 08B38 80905A78 00187080 */ sll $t6, $t8, 2 +/* 08B3C 80905A7C 008E2021 */ addu $a0, $a0, $t6 +/* 08B40 80905A80 8C847170 */ lw $a0, %lo(D_80907170)($a0) /* 08B44 80905A84 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 /* 08B48 80905A88 26050444 */ addiu $a1, $s0, 0x0444 ## $a1 = 00000444 -/* 08B4C 80905A8C 00044900 */ sll $t1, $a0, 4 -/* 08B50 80905A90 00095702 */ srl $t2, $t1, 28 -/* 08B54 80905A94 000A5880 */ sll $t3, $t2, 2 -/* 08B58 80905A98 018B6021 */ addu $t4, $t4, $t3 +/* 08B4C 80905A8C 00044900 */ sll $t1, $a0, 4 +/* 08B50 80905A90 00095702 */ srl $t2, $t1, 28 +/* 08B54 80905A94 000A5880 */ sll $t3, $t2, 2 +/* 08B58 80905A98 018B6021 */ addu $t4, $t4, $t3 /* 08B5C 80905A9C 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 08B60 80905AA0 0081C824 */ and $t9, $a0, $at +/* 08B60 80905AA0 0081C824 */ and $t9, $a0, $at /* 08B64 80905AA4 3C068090 */ lui $a2, %hi(D_8090717C) ## $a2 = 80900000 -/* 08B68 80905AA8 032C6821 */ addu $t5, $t9, $t4 -/* 08B6C 80905AAC 01A77821 */ addu $t7, $t5, $a3 +/* 08B68 80905AA8 032C6821 */ addu $t5, $t9, $t4 +/* 08B6C 80905AAC 01A77821 */ addu $t7, $t5, $a3 /* 08B70 80905AB0 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 08B74 80905AB4 AFA5003C */ sw $a1, 0x003C($sp) +/* 08B74 80905AB4 AFA5003C */ sw $a1, 0x003C($sp) /* 08B78 80905AB8 24C6717C */ addiu $a2, $a2, %lo(D_8090717C) ## $a2 = 8090717C -/* 08B7C 80905ABC 0C23F420 */ jal func_808FD080 +/* 08B7C 80905ABC 0C23F420 */ jal func_808FD080 /* 08B80 80905AC0 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 08B84 80905AC4 3C068090 */ lui $a2, %hi(D_8090717C) ## $a2 = 80900000 -/* 08B88 80905AC8 8FA5003C */ lw $a1, 0x003C($sp) +/* 08B88 80905AC8 8FA5003C */ lw $a1, 0x003C($sp) /* 08B8C 80905ACC 24C6717C */ addiu $a2, $a2, %lo(D_8090717C) ## $a2 = 8090717C -/* 08B90 80905AD0 0C23F420 */ jal func_808FD080 +/* 08B90 80905AD0 0C23F420 */ jal func_808FD080 /* 08B94 80905AD4 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 08B98 80905AD8 3C188090 */ lui $t8, %hi(D_8090717C) ## $t8 = 80900000 /* 08B9C 80905ADC 2718717C */ addiu $t8, $t8, %lo(D_8090717C) ## $t8 = 8090717C @@ -137,36 +137,36 @@ glabel BossGanon2_Draw /* 08BBC 80905AFC AE0E021C */ sw $t6, 0x021C($s0) ## 0000021C /* 08BC0 80905B00 8F090008 */ lw $t1, 0x0008($t8) ## 80907184 /* 08BC4 80905B04 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08BC8 80905B08 1160000C */ beq $t3, $zero, .L80905B3C +/* 08BC8 80905B08 1160000C */ beq $t3, $zero, .L80905B3C /* 08BCC 80905B0C AE090220 */ sw $t1, 0x0220($s0) ## 00000220 -/* 08BD0 80905B10 8FB90068 */ lw $t9, 0x0068($sp) +/* 08BD0 80905B10 8FB90068 */ lw $t9, 0x0068($sp) /* 08BD4 80905B14 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 08BD8 80905B18 240D0384 */ addiu $t5, $zero, 0x0384 ## $t5 = 00000384 /* 08BDC 80905B1C 8F2402C0 */ lw $a0, 0x02C0($t9) ## 000002C0 /* 08BE0 80905B20 240F044B */ addiu $t7, $zero, 0x044B ## $t7 = 0000044B -/* 08BE4 80905B24 AFAF0018 */ sw $t7, 0x0018($sp) -/* 08BE8 80905B28 AFAD0014 */ sw $t5, 0x0014($sp) -/* 08BEC 80905B2C 0C024CDC */ jal func_80093370 -/* 08BF0 80905B30 AFAC0010 */ sw $t4, 0x0010($sp) -/* 08BF4 80905B34 8FB80068 */ lw $t8, 0x0068($sp) +/* 08BE4 80905B24 AFAF0018 */ sw $t7, 0x0018($sp) +/* 08BE8 80905B28 AFAD0014 */ sw $t5, 0x0014($sp) +/* 08BEC 80905B2C 0C024CDC */ jal func_80093370 +/* 08BF0 80905B30 AFAC0010 */ sw $t4, 0x0010($sp) +/* 08BF4 80905B34 8FB80068 */ lw $t8, 0x0068($sp) /* 08BF8 80905B38 AF0202C0 */ sw $v0, 0x02C0($t8) ## 000002C0 .L80905B3C: /* 08BFC 80905B3C 3C01C57A */ lui $at, 0xC57A ## $at = C57A0000 /* 08C00 80905B40 44817000 */ mtc1 $at, $f14 ## $f14 = -4000.00 /* 08C04 80905B44 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 08C08 80905B48 3C06457A */ lui $a2, 0x457A ## $a2 = 457A0000 -/* 08C0C 80905B4C 0C034261 */ jal Matrix_Translate +/* 08C0C 80905B4C 0C034261 */ jal Matrix_Translate /* 08C10 80905B50 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 08C14 80905B54 C60C0394 */ lwc1 $f12, 0x0394($s0) ## 00000394 -/* 08C18 80905B58 0C0342DC */ jal Matrix_RotateX +/* 08C18 80905B58 0C0342DC */ jal Matrix_RotateX /* 08C1C 80905B5C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 08C20 80905B60 3C01457A */ lui $at, 0x457A ## $at = 457A0000 /* 08C24 80905B64 44817000 */ mtc1 $at, $f14 ## $f14 = 4000.00 /* 08C28 80905B68 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 08C2C 80905B6C 3C06C57A */ lui $a2, 0xC57A ## $a2 = C57A0000 -/* 08C30 80905B70 0C034261 */ jal Matrix_Translate +/* 08C30 80905B70 0C034261 */ jal Matrix_Translate /* 08C34 80905B74 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 08C38 80905B78 8FA20068 */ lw $v0, 0x0068($sp) +/* 08C38 80905B78 8FA20068 */ lw $v0, 0x0068($sp) /* 08C3C 80905B7C 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 /* 08C40 80905B80 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 /* 08C44 80905B84 8C4302C0 */ lw $v1, 0x02C0($v0) ## 000002C0 @@ -177,9 +177,9 @@ glabel BossGanon2_Draw /* 08C58 80905B98 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 08C5C 80905B9C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 08C60 80905BA0 24061716 */ addiu $a2, $zero, 0x1716 ## $a2 = 00001716 -/* 08C64 80905BA4 0C0346A2 */ jal Matrix_NewMtx -/* 08C68 80905BA8 AFA30048 */ sw $v1, 0x0048($sp) -/* 08C6C 80905BAC 8FA70048 */ lw $a3, 0x0048($sp) +/* 08C64 80905BA4 0C0346A2 */ jal Matrix_NewMtx +/* 08C68 80905BA8 AFA30048 */ sw $v1, 0x0048($sp) +/* 08C6C 80905BAC 8FA70048 */ lw $a3, 0x0048($sp) /* 08C70 80905BB0 3C0A8090 */ lui $t2, %hi(func_80904818) ## $t2 = 80900000 /* 08C74 80905BB4 3C0B8090 */ lui $t3, %hi(func_809049A0) ## $t3 = 80900000 /* 08C78 80905BB8 ACE20004 */ sw $v0, 0x0004($a3) ## 00000004 @@ -188,73 +188,73 @@ glabel BossGanon2_Draw /* 08C84 80905BC4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 08C88 80905BC8 256B49A0 */ addiu $t3, $t3, %lo(func_809049A0) ## $t3 = 809049A0 /* 08C8C 80905BCC 254A4818 */ addiu $t2, $t2, %lo(func_80904818) ## $t2 = 80904818 -/* 08C90 80905BD0 AFAA0010 */ sw $t2, 0x0010($sp) -/* 08C94 80905BD4 AFAB0014 */ sw $t3, 0x0014($sp) -/* 08C98 80905BD8 AFB00018 */ sw $s0, 0x0018($sp) -/* 08C9C 80905BDC 0C0286B2 */ jal func_800A1AC8 +/* 08C90 80905BD0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 08C94 80905BD4 AFAB0014 */ sw $t3, 0x0014($sp) +/* 08C98 80905BD8 AFB00018 */ sw $s0, 0x0018($sp) +/* 08C9C 80905BDC 0C0286B2 */ jal SkelAnime_DrawSV /* 08CA0 80905BE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 08CA4 80905BE4 8FB90068 */ lw $t9, 0x0068($sp) +/* 08CA4 80905BE4 8FB90068 */ lw $t9, 0x0068($sp) /* 08CA8 80905BE8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 08CAC 80905BEC 0C02F228 */ jal func_800BC8A0 +/* 08CAC 80905BEC 0C02F228 */ jal func_800BC8A0 /* 08CB0 80905BF0 8F2502C0 */ lw $a1, 0x02C0($t9) ## 000002C0 -/* 08CB4 80905BF4 8FAC0068 */ lw $t4, 0x0068($sp) +/* 08CB4 80905BF4 8FAC0068 */ lw $t4, 0x0068($sp) /* 08CB8 80905BF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 08CBC 80905BFC 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 08CC0 80905C00 AD8202C0 */ sw $v0, 0x02C0($t4) ## 000002C0 -/* 08CC4 80905C04 0C241A7E */ jal func_809069F8 -/* 08CC8 80905C08 8FA40074 */ lw $a0, 0x0074($sp) -/* 08CCC 80905C0C 8FA40074 */ lw $a0, 0x0074($sp) +/* 08CC4 80905C04 0C241A7E */ jal func_809069F8 +/* 08CC8 80905C08 8FA40074 */ lw $a0, 0x0074($sp) +/* 08CCC 80905C0C 8FA40074 */ lw $a0, 0x0074($sp) /* 08CD0 80905C10 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08CD4 80905C14 0C241AAC */ jal func_80906AB0 +/* 08CD4 80905C14 0C241AAC */ jal func_80906AB0 /* 08CD8 80905C18 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 08CDC 80905C1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80905C20: /* 08CE0 80905C20 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08CE4 80905C24 24060153 */ addiu $a2, $zero, 0x0153 ## $a2 = 00000153 -/* 08CE8 80905C28 0C23F442 */ jal func_808FD108 +/* 08CE8 80905C28 0C23F442 */ jal func_808FD108 /* 08CEC 80905C2C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 08CF0 80905C30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08CF4 80905C34 0C2410D0 */ jal func_80904340 +/* 08CF4 80905C34 0C2410D0 */ jal func_80904340 /* 08CF8 80905C38 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08CFC 80905C3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D00 80905C40 0C241042 */ jal func_80904108 +/* 08D00 80905C40 0C241042 */ jal func_80904108 /* 08D04 80905C44 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D08 80905C48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D0C 80905C4C 0C241362 */ jal func_80904D88 +/* 08D0C 80905C4C 0C241362 */ jal func_80904D88 /* 08D10 80905C50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D14 80905C54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D18 80905C58 0C241193 */ jal func_8090464C +/* 08D18 80905C58 0C241193 */ jal func_8090464C /* 08D1C 80905C5C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D20 80905C60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D24 80905C64 0C24159D */ jal func_80905674 +/* 08D24 80905C64 0C24159D */ jal func_80905674 /* 08D28 80905C68 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D2C 80905C6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D30 80905C70 0C2413F2 */ jal func_80904FC8 +/* 08D30 80905C70 0C2413F2 */ jal func_80904FC8 /* 08D34 80905C74 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D38 80905C78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D3C 80905C7C 0C24148F */ jal func_8090523C +/* 08D3C 80905C7C 0C24148F */ jal func_8090523C /* 08D40 80905C80 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D44 80905C84 920D0312 */ lbu $t5, 0x0312($s0) ## 00000312 /* 08D48 80905C88 3C028090 */ lui $v0, %hi(D_80907080) ## $v0 = 80900000 /* 08D4C 80905C8C 24427080 */ addiu $v0, $v0, %lo(D_80907080) ## $v0 = 80907080 -/* 08D50 80905C90 15A00004 */ bne $t5, $zero, .L80905CA4 +/* 08D50 80905C90 15A00004 */ bne $t5, $zero, .L80905CA4 /* 08D54 80905C94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08D58 80905C98 844F0000 */ lh $t7, 0x0000($v0) ## 80907080 -/* 08D5C 80905C9C 11E00015 */ beq $t7, $zero, .L80905CF4 +/* 08D5C 80905C9C 11E00015 */ beq $t7, $zero, .L80905CF4 /* 08D60 80905CA0 00000000 */ nop .L80905CA4: -/* 08D64 80905CA4 0C240FCE */ jal func_80903F38 +/* 08D64 80905CA4 0C240FCE */ jal func_80903F38 /* 08D68 80905CA8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D6C 80905CAC 92180312 */ lbu $t8, 0x0312($s0) ## 00000312 /* 08D70 80905CB0 3C028090 */ lui $v0, %hi(D_80907080) ## $v0 = 80900000 /* 08D74 80905CB4 24427080 */ addiu $v0, $v0, %lo(D_80907080) ## $v0 = 80907080 -/* 08D78 80905CB8 17000008 */ bne $t8, $zero, .L80905CDC +/* 08D78 80905CB8 17000008 */ bne $t8, $zero, .L80905CDC /* 08D7C 80905CBC 00000000 */ nop /* 08D80 80905CC0 844E0000 */ lh $t6, 0x0000($v0) ## 80907080 /* 08D84 80905CC4 25C9FFD8 */ addiu $t1, $t6, 0xFFD8 ## $t1 = FFFFFFD8 /* 08D88 80905CC8 A4490000 */ sh $t1, 0x0000($v0) ## 80907080 /* 08D8C 80905CCC 844A0000 */ lh $t2, 0x0000($v0) ## 80907080 -/* 08D90 80905CD0 1D400002 */ bgtz $t2, .L80905CDC +/* 08D90 80905CD0 1D400002 */ bgtz $t2, .L80905CDC /* 08D94 80905CD4 00000000 */ nop /* 08D98 80905CD8 A4400000 */ sh $zero, 0x0000($v0) ## 80907080 .L80905CDC: @@ -262,7 +262,7 @@ glabel BossGanon2_Draw /* 08DA0 80905CE0 24420638 */ addiu $v0, $v0, %lo(D_80910638) ## $v0 = 80910638 /* 08DA4 80905CE4 804B0000 */ lb $t3, 0x0000($v0) ## 80910638 /* 08DA8 80905CE8 25790001 */ addiu $t9, $t3, 0x0001 ## $t9 = 00000001 -/* 08DAC 80905CEC 10000021 */ beq $zero, $zero, .L80905D74 +/* 08DAC 80905CEC 10000021 */ beq $zero, $zero, .L80905D74 /* 08DB0 80905CF0 A0590000 */ sb $t9, 0x0000($v0) ## 80910638 .L80905CF4: /* 08DB4 80905CF4 3C068091 */ lui $a2, %hi(D_80910608) ## $a2 = 80910000 @@ -274,17 +274,17 @@ glabel BossGanon2_Draw /* 08DCC 80905D0C 2608020C */ addiu $t0, $s0, 0x020C ## $t0 = 0000020C /* 08DD0 80905D10 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C .L80905D14: -/* 08DD4 80905D14 00650019 */ multu $v1, $a1 +/* 08DD4 80905D14 00650019 */ multu $v1, $a1 /* 08DD8 80905D18 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000200 /* 08DDC 80905D1C 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 08DE0 80905D20 00031C00 */ sll $v1, $v1, 16 -/* 08DE4 80905D24 00031C03 */ sra $v1, $v1, 16 -/* 08DE8 80905D28 28610003 */ slti $at, $v1, 0x0003 -/* 08DEC 80905D2C 00001012 */ mflo $v0 -/* 08DF0 80905D30 00826021 */ addu $t4, $a0, $v0 +/* 08DE0 80905D20 00031C00 */ sll $v1, $v1, 16 +/* 08DE4 80905D24 00031C03 */ sra $v1, $v1, 16 +/* 08DE8 80905D28 28610003 */ slti $at, $v1, 0x0003 +/* 08DEC 80905D2C 00001012 */ mflo $v0 +/* 08DF0 80905D30 00826021 */ addu $t4, $a0, $v0 /* 08DF4 80905D34 AD8F0000 */ sw $t7, 0x0000($t4) ## 00000000 /* 08DF8 80905D38 8CED0004 */ lw $t5, 0x0004($a3) ## 00000204 -/* 08DFC 80905D3C 00C2C021 */ addu $t8, $a2, $v0 +/* 08DFC 80905D3C 00C2C021 */ addu $t8, $a2, $v0 /* 08E00 80905D40 AD8D0004 */ sw $t5, 0x0004($t4) ## 00000004 /* 08E04 80905D44 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000208 /* 08E08 80905D48 AD8F0008 */ sw $t7, 0x0008($t4) ## 00000008 @@ -293,7 +293,7 @@ glabel BossGanon2_Draw /* 08E14 80905D54 8D0E0004 */ lw $t6, 0x0004($t0) ## 00000210 /* 08E18 80905D58 AF0E0004 */ sw $t6, 0x0004($t8) ## 00000004 /* 08E1C 80905D5C 8D090008 */ lw $t1, 0x0008($t0) ## 00000214 -/* 08E20 80905D60 1420FFEC */ bne $at, $zero, .L80905D14 +/* 08E20 80905D60 1420FFEC */ bne $at, $zero, .L80905D14 /* 08E24 80905D64 AF090008 */ sw $t1, 0x0008($t8) ## 00000008 /* 08E28 80905D68 3C028091 */ lui $v0, %hi(D_80910638) ## $v0 = 80910000 /* 08E2C 80905D6C 24420638 */ addiu $v0, $v0, %lo(D_80910638) ## $v0 = 80910638 @@ -303,14 +303,14 @@ glabel BossGanon2_Draw /* 08E38 80905D78 24C6D9E4 */ addiu $a2, $a2, %lo(D_8090D9E4) ## $a2 = 8090D9E4 /* 08E3C 80905D7C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 08E40 80905D80 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 08E44 80905D84 0C031AD5 */ jal func_800C6B54 +/* 08E44 80905D84 0C031AD5 */ jal func_800C6B54 /* 08E48 80905D88 2407175F */ addiu $a3, $zero, 0x175F ## $a3 = 0000175F -/* 08E4C 80905D8C 0C24183A */ jal func_809060E8 +/* 08E4C 80905D8C 0C24183A */ jal func_809060E8 /* 08E50 80905D90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 08E54 80905D94 8FBF002C */ lw $ra, 0x002C($sp) -/* 08E58 80905D98 8FB00024 */ lw $s0, 0x0024($sp) -/* 08E5C 80905D9C 8FB10028 */ lw $s1, 0x0028($sp) -/* 08E60 80905DA0 03E00008 */ jr $ra +/* 08E54 80905D94 8FBF002C */ lw $ra, 0x002C($sp) +/* 08E58 80905D98 8FB00024 */ lw $s0, 0x0024($sp) +/* 08E5C 80905D9C 8FB10028 */ lw $s1, 0x0028($sp) +/* 08E60 80905DA0 03E00008 */ jr $ra /* 08E64 80905DA4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s index e40abd44e2..74f3e48605 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s @@ -1,80 +1,80 @@ glabel BossGanon2_Init /* 0041C 808FD35C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00420 808FD360 AFB10028 */ sw $s1, 0x0028($sp) -/* 00424 808FD364 AFB00024 */ sw $s0, 0x0024($sp) +/* 00420 808FD360 AFB10028 */ sw $s1, 0x0028($sp) +/* 00424 808FD364 AFB00024 */ sw $s0, 0x0024($sp) /* 00428 808FD368 3C068091 */ lui $a2, %hi(D_8090EB38) ## $a2 = 80910000 /* 0042C 808FD36C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00430 808FD370 24C6EB38 */ addiu $a2, $a2, %lo(D_8090EB38) ## $a2 = 8090EB38 -/* 00434 808FD374 AFBF002C */ sw $ra, 0x002C($sp) -/* 00438 808FD378 00250821 */ addu $at, $at, $a1 +/* 00434 808FD374 AFBF002C */ sw $ra, 0x002C($sp) +/* 00438 808FD378 00250821 */ addu $at, $at, $a1 /* 0043C 808FD37C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00440 808FD380 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00444 808FD384 AC261E10 */ sw $a2, 0x1E10($at) ## 00011E10 /* 00448 808FD388 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0044C 808FD38C 24030044 */ addiu $v1, $zero, 0x0044 ## $v1 = 00000044 .L808FD390: -/* 00450 808FD390 00430019 */ multu $v0, $v1 +/* 00450 808FD390 00430019 */ multu $v0, $v1 /* 00454 808FD394 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00458 808FD398 00021400 */ sll $v0, $v0, 16 -/* 0045C 808FD39C 00021403 */ sra $v0, $v0, 16 -/* 00460 808FD3A0 28410064 */ slti $at, $v0, 0x0064 -/* 00464 808FD3A4 00007012 */ mflo $t6 -/* 00468 808FD3A8 00CE7821 */ addu $t7, $a2, $t6 -/* 0046C 808FD3AC 1420FFF8 */ bne $at, $zero, .L808FD390 +/* 00458 808FD398 00021400 */ sll $v0, $v0, 16 +/* 0045C 808FD39C 00021403 */ sra $v0, $v0, 16 +/* 00460 808FD3A0 28410064 */ slti $at, $v0, 0x0064 +/* 00464 808FD3A4 00007012 */ mflo $t6 +/* 00468 808FD3A8 00CE7821 */ addu $t7, $a2, $t6 +/* 0046C 808FD3AC 1420FFF8 */ bne $at, $zero, .L808FD390 /* 00470 808FD3B0 A1E00000 */ sb $zero, 0x0000($t7) ## 00000000 /* 00474 808FD3B4 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF /* 00478 808FD3B8 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 0047C 808FD3BC A21800AE */ sb $t8, 0x00AE($s0) ## 000000AE /* 00480 808FD3C0 A21900AF */ sb $t9, 0x00AF($s0) ## 000000AF /* 00484 808FD3C4 26050424 */ addiu $a1, $s0, 0x0424 ## $a1 = 00000424 -/* 00488 808FD3C8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0048C 808FD3CC 0C016EFE */ jal func_8005BBF8 +/* 00488 808FD3C8 AFA50030 */ sw $a1, 0x0030($sp) +/* 0048C 808FD3CC 0C016EFE */ jal func_8005BBF8 /* 00490 808FD3D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00494 808FD3D4 3C078090 */ lui $a3, %hi(D_80906FBC) ## $a3 = 80900000 /* 00498 808FD3D8 26080464 */ addiu $t0, $s0, 0x0464 ## $t0 = 00000464 -/* 0049C 808FD3DC 8FA50030 */ lw $a1, 0x0030($sp) -/* 004A0 808FD3E0 AFA80010 */ sw $t0, 0x0010($sp) +/* 0049C 808FD3DC 8FA50030 */ lw $a1, 0x0030($sp) +/* 004A0 808FD3E0 AFA80010 */ sw $t0, 0x0010($sp) /* 004A4 808FD3E4 24E76FBC */ addiu $a3, $a3, %lo(D_80906FBC) ## $a3 = 80906FBC /* 004A8 808FD3E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004AC 808FD3EC 0C017014 */ jal func_8005C050 +/* 004AC 808FD3EC 0C017014 */ jal func_8005C050 /* 004B0 808FD3F0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 004B4 808FD3F4 26050444 */ addiu $a1, $s0, 0x0444 ## $a1 = 00000444 -/* 004B8 808FD3F8 AFA50030 */ sw $a1, 0x0030($sp) -/* 004BC 808FD3FC 0C016EFE */ jal func_8005BBF8 +/* 004B8 808FD3F8 AFA50030 */ sw $a1, 0x0030($sp) +/* 004BC 808FD3FC 0C016EFE */ jal func_8005BBF8 /* 004C0 808FD400 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 004C4 808FD404 3C078090 */ lui $a3, %hi(D_80907014) ## $a3 = 80900000 /* 004C8 808FD408 26090864 */ addiu $t1, $s0, 0x0864 ## $t1 = 00000864 -/* 004CC 808FD40C 8FA50030 */ lw $a1, 0x0030($sp) -/* 004D0 808FD410 AFA90010 */ sw $t1, 0x0010($sp) +/* 004CC 808FD40C 8FA50030 */ lw $a1, 0x0030($sp) +/* 004D0 808FD410 AFA90010 */ sw $t1, 0x0010($sp) /* 004D4 808FD414 24E77014 */ addiu $a3, $a3, %lo(D_80907014) ## $a3 = 80907014 /* 004D8 808FD418 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004DC 808FD41C 0C017014 */ jal func_8005C050 +/* 004DC 808FD41C 0C017014 */ jal func_8005C050 /* 004E0 808FD420 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 004E4 808FD424 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004E8 808FD428 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 004EC 808FD42C 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 -/* 004F0 808FD430 0C23F442 */ jal func_808FD108 +/* 004F0 808FD430 0C23F442 */ jal func_808FD108 /* 004F4 808FD434 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004F8 808FD438 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 004FC 808FD43C 24C614E8 */ addiu $a2, $a2, 0x14E8 ## $a2 = 060114E8 /* 00500 808FD440 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00504 808FD444 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00508 808FD448 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0050C 808FD44C AFA00010 */ sw $zero, 0x0010($sp) -/* 00510 808FD450 AFA00014 */ sw $zero, 0x0014($sp) -/* 00514 808FD454 0C0291BE */ jal func_800A46F8 -/* 00518 808FD458 AFA00018 */ sw $zero, 0x0018($sp) +/* 0050C 808FD44C AFA00010 */ sw $zero, 0x0010($sp) +/* 00510 808FD450 AFA00014 */ sw $zero, 0x0014($sp) +/* 00514 808FD454 0C0291BE */ jal SkelAnime_InitSV +/* 00518 808FD458 AFA00018 */ sw $zero, 0x0018($sp) /* 0051C 808FD45C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00520 808FD460 0C23F571 */ jal func_808FD5C4 +/* 00520 808FD460 0C23F571 */ jal func_808FD5C4 /* 00524 808FD464 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00528 808FD468 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0052C 808FD46C 240A003E */ addiu $t2, $zero, 0x003E ## $t2 = 0000003E /* 00530 808FD470 A20A0117 */ sb $t2, 0x0117($s0) ## 00000117 /* 00534 808FD474 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 00538 808FD478 8FBF002C */ lw $ra, 0x002C($sp) -/* 0053C 808FD47C 8FB10028 */ lw $s1, 0x0028($sp) -/* 00540 808FD480 8FB00024 */ lw $s0, 0x0024($sp) -/* 00544 808FD484 03E00008 */ jr $ra +/* 00538 808FD478 8FBF002C */ lw $ra, 0x002C($sp) +/* 0053C 808FD47C 8FB10028 */ lw $s1, 0x0028($sp) +/* 00540 808FD480 8FB00024 */ lw $s0, 0x0024($sp) +/* 00544 808FD484 03E00008 */ jr $ra /* 00548 808FD488 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s index 1c6d3e9306..c5ee2ed0fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s @@ -1,104 +1,104 @@ glabel func_808FD5F4 /* 006B4 808FD5F4 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 006B8 808FD5F8 AFBF003C */ sw $ra, 0x003C($sp) -/* 006BC 808FD5FC AFB10038 */ sw $s1, 0x0038($sp) -/* 006C0 808FD600 AFB00034 */ sw $s0, 0x0034($sp) -/* 006C4 808FD604 A3A0008D */ sb $zero, 0x008D($sp) +/* 006B8 808FD5F8 AFBF003C */ sw $ra, 0x003C($sp) +/* 006BC 808FD5FC AFB10038 */ sw $s1, 0x0038($sp) +/* 006C0 808FD600 AFB00034 */ sw $s0, 0x0034($sp) +/* 006C4 808FD604 A3A0008D */ sb $zero, 0x008D($sp) /* 006C8 808FD608 8C8E0398 */ lw $t6, 0x0398($a0) ## 00000398 /* 006CC 808FD60C 9498039C */ lhu $t8, 0x039C($a0) ## 0000039C /* 006D0 808FD610 8CA91C44 */ lw $t1, 0x1C44($a1) ## 00001C44 /* 006D4 808FD614 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 006D8 808FD618 2F01001E */ sltiu $at, $t8, 0x001E +/* 006D8 808FD618 2F01001E */ sltiu $at, $t8, 0x001E /* 006DC 808FD61C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 006E0 808FD620 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 006E4 808FD624 1020087A */ beq $at, $zero, .L808FF810 +/* 006E4 808FD624 1020087A */ beq $at, $zero, .L808FF810 /* 006E8 808FD628 AC8F0398 */ sw $t7, 0x0398($a0) ## 00000398 -/* 006EC 808FD62C 0018C080 */ sll $t8, $t8, 2 +/* 006EC 808FD62C 0018C080 */ sll $t8, $t8, 2 /* 006F0 808FD630 3C018091 */ lui $at, %hi(jtbl_8090DAB4) ## $at = 80910000 -/* 006F4 808FD634 00380821 */ addu $at, $at, $t8 -/* 006F8 808FD638 8C38DAB4 */ lw $t8, %lo(jtbl_8090DAB4)($at) -/* 006FC 808FD63C 03000008 */ jr $t8 +/* 006F4 808FD634 00380821 */ addu $at, $at, $t8 +/* 006F8 808FD638 8C38DAB4 */ lw $t8, %lo(jtbl_8090DAB4)($at) +/* 006FC 808FD63C 03000008 */ jr $t8 /* 00700 808FD640 00000000 */ nop glabel L808FD644 /* 00704 808FD644 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00708 808FD648 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 0070C 808FD64C 02212021 */ addu $a0, $s1, $at -/* 00710 808FD650 AFA40054 */ sw $a0, 0x0054($sp) +/* 0070C 808FD64C 02212021 */ addu $a0, $s1, $at +/* 00710 808FD650 AFA40054 */ sw $a0, 0x0054($sp) /* 00714 808FD654 2405017E */ addiu $a1, $zero, 0x017E ## $a1 = 0000017E /* 00718 808FD658 0C02604B */ jal Object_GetIndex ## ObjectIndex -/* 0071C 808FD65C AFA90088 */ sw $t1, 0x0088($sp) -/* 00720 808FD660 8FA40054 */ lw $a0, 0x0054($sp) +/* 0071C 808FD65C AFA90088 */ sw $t1, 0x0088($sp) +/* 00720 808FD660 8FA40054 */ lw $a0, 0x0054($sp) /* 00724 808FD664 0C026062 */ jal Object_IsLoaded - + /* 00728 808FD668 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0072C 808FD66C 10400868 */ beq $v0, $zero, .L808FF810 -/* 00730 808FD670 8FA90088 */ lw $t1, 0x0088($sp) +/* 0072C 808FD66C 10400868 */ beq $v0, $zero, .L808FF810 +/* 00730 808FD670 8FA90088 */ lw $t1, 0x0088($sp) /* 00734 808FD674 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00738 808FD678 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 -/* 0073C 808FD67C 0C019148 */ jal func_80064520 -/* 00740 808FD680 AFA90088 */ sw $t1, 0x0088($sp) +/* 0073C 808FD67C 0C019148 */ jal func_80064520 +/* 00740 808FD680 AFA90088 */ sw $t1, 0x0088($sp) /* 00744 808FD684 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00748 808FD688 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0074C 808FD68C 0C00B7D5 */ jal func_8002DF54 +/* 0074C 808FD68C 0C00B7D5 */ jal func_8002DF54 /* 00750 808FD690 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00754 808FD694 0C03008C */ jal func_800C0230 +/* 00754 808FD694 0C03008C */ jal func_800C0230 /* 00758 808FD698 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0075C 808FD69C A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 00760 808FD6A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00764 808FD6A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00768 808FD6A8 0C0300C5 */ jal func_800C0314 +/* 00768 808FD6A8 0C0300C5 */ jal func_800C0314 /* 0076C 808FD6AC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00770 808FD6B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00774 808FD6B4 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 00778 808FD6B8 0C0300C5 */ jal func_800C0314 +/* 00778 808FD6B8 0C0300C5 */ jal func_800C0314 /* 0077C 808FD6BC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00780 808FD6C0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00784 808FD6C4 A619039C */ sh $t9, 0x039C($s0) ## 0000039C /* 00788 808FD6C8 3C018091 */ lui $at, %hi(D_8090DB2C) ## $at = 80910000 -/* 0078C 808FD6CC C424DB2C */ lwc1 $f4, %lo(D_8090DB2C)($at) +/* 0078C 808FD6CC C424DB2C */ lwc1 $f4, %lo(D_8090DB2C)($at) /* 00790 808FD6D0 3C018091 */ lui $at, %hi(D_8090DB30) ## $at = 80910000 -/* 00794 808FD6D4 C426DB30 */ lwc1 $f6, %lo(D_8090DB30)($at) +/* 00794 808FD6D4 C426DB30 */ lwc1 $f6, %lo(D_8090DB30)($at) /* 00798 808FD6D8 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 0079C 808FD6DC 44814000 */ mtc1 $at, $f8 ## $f8 = -200.00 /* 007A0 808FD6E0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 007A4 808FD6E4 AFAB0028 */ sw $t3, 0x0028($sp) -/* 007A8 808FD6E8 AFA00024 */ sw $zero, 0x0024($sp) -/* 007AC 808FD6EC AFA00020 */ sw $zero, 0x0020($sp) -/* 007B0 808FD6F0 AFA0001C */ sw $zero, 0x001C($sp) +/* 007A4 808FD6E4 AFAB0028 */ sw $t3, 0x0028($sp) +/* 007A8 808FD6E8 AFA00024 */ sw $zero, 0x0024($sp) +/* 007AC 808FD6EC AFA00020 */ sw $zero, 0x0020($sp) +/* 007B0 808FD6F0 AFA0001C */ sw $zero, 0x001C($sp) /* 007B4 808FD6F4 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 007B8 808FD6F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 007BC 808FD6FC 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 007C0 808FD700 24070179 */ addiu $a3, $zero, 0x0179 ## $a3 = 00000179 -/* 007C4 808FD704 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 007C8 808FD708 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 007C4 808FD704 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 007C8 808FD708 E7A60014 */ swc1 $f6, 0x0014($sp) /* 007CC 808FD70C 0C00C916 */ jal Actor_SpawnAttached - -/* 007D0 808FD710 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 007D0 808FD710 E7A80018 */ swc1 $f8, 0x0018($sp) /* 007D4 808FD714 3C018091 */ lui $at, %hi(D_8090EB2C) ## $at = 80910000 -/* 007D8 808FD718 AC22EB2C */ sw $v0, %lo(D_8090EB2C)($at) +/* 007D8 808FD718 AC22EB2C */ sw $v0, %lo(D_8090EB2C)($at) /* 007DC 808FD71C 3C0C8091 */ lui $t4, %hi(D_8090EB2C) ## $t4 = 80910000 -/* 007E0 808FD720 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) -/* 007E4 808FD724 8FA90088 */ lw $t1, 0x0088($sp) +/* 007E0 808FD720 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) +/* 007E4 808FD724 8FA90088 */ lw $t1, 0x0088($sp) /* 007E8 808FD728 3C018091 */ lui $at, %hi(D_8090DB34) ## $at = 80910000 /* 007EC 808FD72C A18003C8 */ sb $zero, 0x03C8($t4) ## 809103C8 /* 007F0 808FD730 3C0D8091 */ lui $t5, %hi(D_8090EB2C) ## $t5 = 80910000 -/* 007F4 808FD734 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) -/* 007F8 808FD738 C42ADB34 */ lwc1 $f10, %lo(D_8090DB34)($at) +/* 007F4 808FD734 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) +/* 007F8 808FD738 C42ADB34 */ lwc1 $f10, %lo(D_8090DB34)($at) /* 007FC 808FD73C 3C018091 */ lui $at, %hi(D_8090DB38) ## $at = 80910000 /* 00800 808FD740 3C0E8091 */ lui $t6, %hi(D_8090EB2C) ## $t6 = 80910000 /* 00804 808FD744 E5AA0024 */ swc1 $f10, 0x0024($t5) ## 80910024 -/* 00808 808FD748 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) -/* 0080C 808FD74C C424DB38 */ lwc1 $f4, %lo(D_8090DB38)($at) +/* 00808 808FD748 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) +/* 0080C 808FD74C C424DB38 */ lwc1 $f4, %lo(D_8090DB38)($at) /* 00810 808FD750 3C01C356 */ lui $at, 0xC356 ## $at = C3560000 /* 00814 808FD754 3C0F8091 */ lui $t7, %hi(D_8090EB2C) ## $t7 = 80910000 /* 00818 808FD758 E5C40028 */ swc1 $f4, 0x0028($t6) ## 80910028 -/* 0081C 808FD75C 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) +/* 0081C 808FD75C 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) /* 00820 808FD760 44813000 */ mtc1 $at, $f6 ## $f6 = -214.00 /* 00824 808FD764 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 /* 00828 808FD768 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0082C 808FD76C E5E6002C */ swc1 $f6, 0x002C($t7) ## 8091002C -/* 00830 808FD770 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 00830 808FD770 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) /* 00834 808FD774 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00838 808FD778 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 /* 0083C 808FD77C 24189000 */ addiu $t8, $zero, 0x9000 ## $t8 = FFFF9000 @@ -117,11 +117,11 @@ glabel L808FD644 /* 00870 808FD7B0 E60403C4 */ swc1 $f4, 0x03C4($s0) ## 000003C4 /* 00874 808FD7B4 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 /* 00878 808FD7B8 E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC -/* 0087C 808FD7BC C424DB3C */ lwc1 $f4, %lo(D_8090DB3C)($at) +/* 0087C 808FD7BC C424DB3C */ lwc1 $f4, %lo(D_8090DB3C)($at) /* 00880 808FD7C0 3C018091 */ lui $at, %hi(D_8090DB40) ## $at = 80910000 /* 00884 808FD7C4 240BB000 */ addiu $t3, $zero, 0xB000 ## $t3 = FFFFB000 /* 00888 808FD7C8 E5240024 */ swc1 $f4, 0x0024($t1) ## 00000024 -/* 0088C 808FD7CC C426DB40 */ lwc1 $f6, %lo(D_8090DB40)($at) +/* 0088C 808FD7CC C426DB40 */ lwc1 $f6, %lo(D_8090DB40)($at) /* 00890 808FD7D0 3C01C33A */ lui $at, 0xC33A ## $at = C33A0000 /* 00894 808FD7D4 44814000 */ mtc1 $at, $f8 ## $f8 = -186.00 /* 00898 808FD7D8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 @@ -130,49 +130,49 @@ glabel L808FD644 /* 008A4 808FD7E4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 008A8 808FD7E8 A52B00B6 */ sh $t3, 0x00B6($t1) ## 000000B6 /* 008AC 808FD7EC E5260028 */ swc1 $f6, 0x0028($t1) ## 00000028 -/* 008B0 808FD7F0 0C0294D3 */ jal func_800A534C +/* 008B0 808FD7F0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 008B4 808FD7F4 E528002C */ swc1 $f8, 0x002C($t1) ## 0000002C /* 008B8 808FD7F8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 008BC 808FD7FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008C0 808FD800 8FA90088 */ lw $t1, 0x0088($sp) -/* 008C4 808FD804 00310821 */ addu $at, $at, $s1 +/* 008C0 808FD800 8FA90088 */ lw $t1, 0x0088($sp) +/* 008C4 808FD804 00310821 */ addu $at, $at, $s1 /* 008C8 808FD808 E42A0AFC */ swc1 $f10, 0x0AFC($at) ## 00010AFC glabel L808FD80C /* 008CC 808FD80C 8E0C0398 */ lw $t4, 0x0398($s0) ## 00000398 -/* 008D0 808FD810 2D810046 */ sltiu $at, $t4, 0x0046 -/* 008D4 808FD814 10200005 */ beq $at, $zero, .L808FD82C +/* 008D0 808FD810 2D810046 */ sltiu $at, $t4, 0x0046 +/* 008D4 808FD814 10200005 */ beq $at, $zero, .L808FD82C /* 008D8 808FD818 00000000 */ nop /* 008DC 808FD81C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 008E0 808FD820 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008E4 808FD824 00310821 */ addu $at, $at, $s1 +/* 008E4 808FD824 00310821 */ addu $at, $at, $s1 /* 008E8 808FD828 E4240AFC */ swc1 $f4, 0x0AFC($at) ## 00010AFC .L808FD82C: /* 008EC 808FD82C 3C018091 */ lui $at, %hi(D_8090DB44) ## $at = 80910000 -/* 008F0 808FD830 C420DB44 */ lwc1 $f0, %lo(D_8090DB44)($at) +/* 008F0 808FD830 C420DB44 */ lwc1 $f0, %lo(D_8090DB44)($at) /* 008F4 808FD834 C6060410 */ lwc1 $f6, 0x0410($s0) ## 00000410 /* 008F8 808FD838 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 008FC 808FD83C A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 -/* 00900 808FD840 46003202 */ mul.s $f8, $f6, $f0 +/* 00900 808FD840 46003202 */ mul.s $f8, $f6, $f0 /* 00904 808FD844 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00908 808FD848 44050000 */ mfc1 $a1, $f0 +/* 00908 808FD848 44050000 */ mfc1 $a1, $f0 /* 0090C 808FD84C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00910 808FD850 AFA90088 */ sw $t1, 0x0088($sp) +/* 00910 808FD850 AFA90088 */ sw $t1, 0x0088($sp) /* 00914 808FD854 260403A4 */ addiu $a0, $s0, 0x03A4 ## $a0 = 000003A4 -/* 00918 808FD858 44074000 */ mfc1 $a3, $f8 +/* 00918 808FD858 44074000 */ mfc1 $a3, $f8 /* 0091C 808FD85C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00920 808FD860 00000000 */ nop /* 00924 808FD864 3C0144DC */ lui $at, 0x44DC ## $at = 44DC0000 /* 00928 808FD868 44812000 */ mtc1 $at, $f4 ## $f4 = 1760.00 /* 0092C 808FD86C C60A0410 */ lwc1 $f10, 0x0410($s0) ## 00000410 /* 00930 808FD870 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00934 808FD874 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00938 808FD878 46045182 */ mul.s $f6, $f10, $f4 +/* 00938 808FD878 46045182 */ mul.s $f6, $f10, $f4 /* 0093C 808FD87C 260403AC */ addiu $a0, $s0, 0x03AC ## $a0 = 000003AC /* 00940 808FD880 3C05C320 */ lui $a1, 0xC320 ## $a1 = C3200000 -/* 00944 808FD884 44073000 */ mfc1 $a3, $f6 +/* 00944 808FD884 44073000 */ mfc1 $a3, $f6 /* 00948 808FD888 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0094C 808FD88C 00000000 */ nop /* 00950 808FD890 3C053BF5 */ lui $a1, 0x3BF5 ## $a1 = 3BF50000 /* 00954 808FD894 3C0738D1 */ lui $a3, 0x38D1 ## $a3 = 38D10000 @@ -180,36 +180,36 @@ glabel L808FD80C /* 0095C 808FD89C 34A5C28F */ ori $a1, $a1, 0xC28F ## $a1 = 3BF5C28F /* 00960 808FD8A0 26040410 */ addiu $a0, $s0, 0x0410 ## $a0 = 00000410 /* 00964 808FD8A4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00968 808FD8A8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0096C 808FD8AC 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 00970 808FD8B0 44814000 */ mtc1 $at, $f8 ## $f8 = -200.00 -/* 00974 808FD8B4 8FA90088 */ lw $t1, 0x0088($sp) +/* 00974 808FD8B4 8FA90088 */ lw $t1, 0x0088($sp) /* 00978 808FD8B8 3C018091 */ lui $at, %hi(D_8090DB48) ## $at = 80910000 /* 0097C 808FD8BC E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 -/* 00980 808FD8C0 C42ADB48 */ lwc1 $f10, %lo(D_8090DB48)($at) +/* 00980 808FD8C0 C42ADB48 */ lwc1 $f10, %lo(D_8090DB48)($at) /* 00984 808FD8C4 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 00988 808FD8C8 44812000 */ mtc1 $at, $f4 ## $f4 = -200.00 /* 0098C 808FD8CC 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 00990 808FD8D0 24010096 */ addiu $at, $zero, 0x0096 ## $at = 00000096 /* 00994 808FD8D4 E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 -/* 00998 808FD8D8 14610008 */ bne $v1, $at, .L808FD8FC +/* 00998 808FD8D8 14610008 */ bne $v1, $at, .L808FD8FC /* 0099C 808FD8DC E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 /* 009A0 808FD8E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 009A4 808FD8E4 240570D3 */ addiu $a1, $zero, 0x70D3 ## $a1 = 000070D3 /* 009A8 808FD8E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 009AC 808FD8EC 0C042DA0 */ jal func_8010B680 -/* 009B0 808FD8F0 AFA90088 */ sw $t1, 0x0088($sp) -/* 009B4 808FD8F4 8FA90088 */ lw $t1, 0x0088($sp) +/* 009AC 808FD8EC 0C042DA0 */ jal func_8010B680 +/* 009B0 808FD8F0 AFA90088 */ sw $t1, 0x0088($sp) +/* 009B4 808FD8F4 8FA90088 */ lw $t1, 0x0088($sp) /* 009B8 808FD8F8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FD8FC: -/* 009BC 808FD8FC 2C6100FB */ sltiu $at, $v1, 0x00FB -/* 009C0 808FD900 142007C3 */ bne $at, $zero, .L808FF810 +/* 009BC 808FD8FC 2C6100FB */ sltiu $at, $v1, 0x00FB +/* 009C0 808FD900 142007C3 */ bne $at, $zero, .L808FF810 /* 009C4 808FD904 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 009C8 808FD908 0C042F6F */ jal func_8010BDBC -/* 009CC 808FD90C AFA90088 */ sw $t1, 0x0088($sp) -/* 009D0 808FD910 144007BF */ bne $v0, $zero, .L808FF810 -/* 009D4 808FD914 8FA90088 */ lw $t1, 0x0088($sp) +/* 009C8 808FD908 0C042F6F */ jal func_8010BDBC +/* 009CC 808FD90C AFA90088 */ sw $t1, 0x0088($sp) +/* 009D0 808FD910 144007BF */ bne $v0, $zero, .L808FF810 +/* 009D4 808FD914 8FA90088 */ lw $t1, 0x0088($sp) /* 009D8 808FD918 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 009DC 808FD91C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 009E0 808FD920 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 @@ -217,88 +217,88 @@ glabel L808FD80C /* 009E8 808FD928 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 009EC 808FD92C A60E039C */ sh $t6, 0x039C($s0) ## 0000039C /* 009F0 808FD930 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 009F4 808FD934 00310821 */ addu $at, $at, $s1 +/* 009F4 808FD934 00310821 */ addu $at, $at, $s1 /* 009F8 808FD938 E6060410 */ swc1 $f6, 0x0410($s0) ## 00000410 /* 009FC 808FD93C E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC glabel L808FD940 /* 00A00 808FD940 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 00A04 808FD944 A20F0339 */ sb $t7, 0x0339($s0) ## 00000339 /* 00A08 808FD948 3C018091 */ lui $at, %hi(D_8090DB4C) ## $at = 80910000 -/* 00A0C 808FD94C C42ADB4C */ lwc1 $f10, %lo(D_8090DB4C)($at) +/* 00A0C 808FD94C C42ADB4C */ lwc1 $f10, %lo(D_8090DB4C)($at) /* 00A10 808FD950 3C018091 */ lui $at, %hi(D_8090DB50) ## $at = 80910000 /* 00A14 808FD954 3C188091 */ lui $t8, %hi(D_8090EB2C) ## $t8 = 80910000 /* 00A18 808FD958 E52A0024 */ swc1 $f10, 0x0024($t1) ## 00000024 -/* 00A1C 808FD95C C424DB50 */ lwc1 $f4, %lo(D_8090DB50)($at) +/* 00A1C 808FD95C C424DB50 */ lwc1 $f4, %lo(D_8090DB50)($at) /* 00A20 808FD960 3C01C326 */ lui $at, 0xC326 ## $at = C3260000 /* 00A24 808FD964 44813000 */ mtc1 $at, $f6 ## $f6 = -166.00 /* 00A28 808FD968 E5240028 */ swc1 $f4, 0x0028($t1) ## 00000028 /* 00A2C 808FD96C 3C018091 */ lui $at, %hi(D_8090DB54) ## $at = 80910000 /* 00A30 808FD970 E526002C */ swc1 $f6, 0x002C($t1) ## 0000002C -/* 00A34 808FD974 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) -/* 00A38 808FD978 C428DB54 */ lwc1 $f8, %lo(D_8090DB54)($at) +/* 00A34 808FD974 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) +/* 00A38 808FD978 C428DB54 */ lwc1 $f8, %lo(D_8090DB54)($at) /* 00A3C 808FD97C 3C018091 */ lui $at, %hi(D_8090DB58) ## $at = 80910000 /* 00A40 808FD980 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 /* 00A44 808FD984 E7080024 */ swc1 $f8, 0x0024($t8) ## 80910024 -/* 00A48 808FD988 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) -/* 00A4C 808FD98C C42ADB58 */ lwc1 $f10, %lo(D_8090DB58)($at) +/* 00A48 808FD988 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 00A4C 808FD98C C42ADB58 */ lwc1 $f10, %lo(D_8090DB58)($at) /* 00A50 808FD990 3C01C33A */ lui $at, 0xC33A ## $at = C33A0000 /* 00A54 808FD994 3C0B8091 */ lui $t3, %hi(D_8090EB2C) ## $t3 = 80910000 /* 00A58 808FD998 E72A0028 */ swc1 $f10, 0x0028($t9) ## 80910028 -/* 00A5C 808FD99C 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) +/* 00A5C 808FD99C 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) /* 00A60 808FD9A0 44812000 */ mtc1 $at, $f4 ## $f4 = -186.00 /* 00A64 808FD9A4 240CB000 */ addiu $t4, $zero, 0xB000 ## $t4 = FFFFB000 /* 00A68 808FD9A8 3C0E8091 */ lui $t6, %hi(D_8090EB2C) ## $t6 = 80910000 /* 00A6C 808FD9AC E564002C */ swc1 $f4, 0x002C($t3) ## 8091002C /* 00A70 808FD9B0 A52C00B6 */ sh $t4, 0x00B6($t1) ## 000000B6 -/* 00A74 808FD9B4 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) +/* 00A74 808FD9B4 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) /* 00A78 808FD9B8 240DB000 */ addiu $t5, $zero, 0xB000 ## $t5 = FFFFB000 /* 00A7C 808FD9BC 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C /* 00A80 808FD9C0 A5CD00B6 */ sh $t5, 0x00B6($t6) ## 809100B6 /* 00A84 808FD9C4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 00A88 808FD9C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A8C 808FD9CC 240570D4 */ addiu $a1, $zero, 0x70D4 ## $a1 = 000070D4 -/* 00A90 808FD9D0 14610005 */ bne $v1, $at, .L808FD9E8 +/* 00A90 808FD9D0 14610005 */ bne $v1, $at, .L808FD9E8 /* 00A94 808FD9D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A98 808FD9D8 0C042DA0 */ jal func_8010B680 -/* 00A9C 808FD9DC AFA90088 */ sw $t1, 0x0088($sp) -/* 00AA0 808FD9E0 8FA90088 */ lw $t1, 0x0088($sp) +/* 00A98 808FD9D8 0C042DA0 */ jal func_8010B680 +/* 00A9C 808FD9DC AFA90088 */ sw $t1, 0x0088($sp) +/* 00AA0 808FD9E0 8FA90088 */ lw $t1, 0x0088($sp) /* 00AA4 808FD9E4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FD9E8: /* 00AA8 808FD9E8 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 00AAC 808FD9EC 1461000B */ bne $v1, $at, .L808FDA1C +/* 00AAC 808FD9EC 1461000B */ bne $v1, $at, .L808FDA1C /* 00AB0 808FD9F0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 00AB4 808FD9F4 3C0F8091 */ lui $t7, %hi(D_8090EB2C) ## $t7 = 80910000 -/* 00AB8 808FD9F8 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) +/* 00AB8 808FD9F8 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) /* 00ABC 808FD9FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00AC0 808FDA00 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00AC4 808FDA04 A1EA03C8 */ sb $t2, 0x03C8($t7) ## 809103C8 -/* 00AC8 808FDA08 AFA90088 */ sw $t1, 0x0088($sp) -/* 00ACC 808FDA0C 0C00B7D5 */ jal func_8002DF54 +/* 00AC8 808FDA08 AFA90088 */ sw $t1, 0x0088($sp) +/* 00ACC 808FDA0C 0C00B7D5 */ jal func_8002DF54 /* 00AD0 808FDA10 2406004E */ addiu $a2, $zero, 0x004E ## $a2 = 0000004E -/* 00AD4 808FDA14 8FA90088 */ lw $t1, 0x0088($sp) +/* 00AD4 808FDA14 8FA90088 */ lw $t1, 0x0088($sp) /* 00AD8 808FDA18 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDA1C: /* 00ADC 808FDA1C 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 00AE0 808FDA20 1461000B */ bne $v1, $at, .L808FDA50 +/* 00AE0 808FDA20 1461000B */ bne $v1, $at, .L808FDA50 /* 00AE4 808FDA24 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 00AE8 808FDA28 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 -/* 00AEC 808FDA2C 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 00AEC 808FDA2C 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) /* 00AF0 808FDA30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00AF4 808FDA34 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00AF8 808FDA38 A33803C8 */ sb $t8, 0x03C8($t9) ## 809103C8 -/* 00AFC 808FDA3C AFA90088 */ sw $t1, 0x0088($sp) -/* 00B00 808FDA40 0C00B7D5 */ jal func_8002DF54 +/* 00AFC 808FDA3C AFA90088 */ sw $t1, 0x0088($sp) +/* 00B00 808FDA40 0C00B7D5 */ jal func_8002DF54 /* 00B04 808FDA44 2406004F */ addiu $a2, $zero, 0x004F ## $a2 = 0000004F -/* 00B08 808FDA48 8FA90088 */ lw $t1, 0x0088($sp) +/* 00B08 808FDA48 8FA90088 */ lw $t1, 0x0088($sp) /* 00B0C 808FDA4C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDA50: /* 00B10 808FDA50 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 00B14 808FDA54 44817000 */ mtc1 $at, $f14 ## $f14 = 15.00 /* 00B18 808FDA58 3C018091 */ lui $at, %hi(D_8090DB5C) ## $at = 80910000 -/* 00B1C 808FDA5C C426DB5C */ lwc1 $f6, %lo(D_8090DB5C)($at) +/* 00B1C 808FDA5C C426DB5C */ lwc1 $f6, %lo(D_8090DB5C)($at) /* 00B20 808FDA60 3C018091 */ lui $at, %hi(D_8090DB60) ## $at = 80910000 /* 00B24 808FDA64 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 -/* 00B28 808FDA68 C428DB60 */ lwc1 $f8, %lo(D_8090DB60)($at) +/* 00B28 808FDA68 C428DB60 */ lwc1 $f8, %lo(D_8090DB60)($at) /* 00B2C 808FDA6C 3C01C335 */ lui $at, 0xC335 ## $at = C3350000 /* 00B30 808FDA70 44815000 */ mtc1 $at, $f10 ## $f10 = -181.00 /* 00B34 808FDA74 E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 @@ -306,41 +306,41 @@ glabel L808FD940 /* 00B3C 808FDA7C E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 00B40 808FDA80 C5240024 */ lwc1 $f4, 0x0024($t1) ## 00000024 /* 00B44 808FDA84 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 00B48 808FDA88 2C610069 */ sltiu $at, $v1, 0x0069 +/* 00B48 808FDA88 2C610069 */ sltiu $at, $v1, 0x0069 /* 00B4C 808FDA8C E60403B0 */ swc1 $f4, 0x03B0($s0) ## 000003B0 /* 00B50 808FDA90 C526002C */ lwc1 $f6, 0x002C($t1) ## 0000002C -/* 00B54 808FDA94 460E3201 */ sub.s $f8, $f6, $f14 -/* 00B58 808FDA98 460A4100 */ add.s $f4, $f8, $f10 -/* 00B5C 808FDA9C 1420001C */ bne $at, $zero, .L808FDB10 +/* 00B54 808FDA94 460E3201 */ sub.s $f8, $f6, $f14 +/* 00B58 808FDA98 460A4100 */ add.s $f4, $f8, $f10 +/* 00B5C 808FDA9C 1420001C */ bne $at, $zero, .L808FDB10 /* 00B60 808FDAA0 E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 /* 00B64 808FDAA4 3C01423C */ lui $at, 0x423C ## $at = 423C0000 /* 00B68 808FDAA8 44814000 */ mtc1 $at, $f8 ## $f8 = 47.00 /* 00B6C 808FDAAC C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 /* 00B70 808FDAB0 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 00B74 808FDAB4 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 -/* 00B78 808FDAB8 46083280 */ add.s $f10, $f6, $f8 +/* 00B78 808FDAB8 46083280 */ add.s $f10, $f6, $f8 /* 00B7C 808FDABC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00B80 808FDAC0 8E070410 */ lw $a3, 0x0410($s0) ## 00000410 /* 00B84 808FDAC4 260B0410 */ addiu $t3, $s0, 0x0410 ## $t3 = 00000410 -/* 00B88 808FDAC8 46045180 */ add.s $f6, $f10, $f4 -/* 00B8C 808FDACC AFAB0054 */ sw $t3, 0x0054($sp) +/* 00B88 808FDAC8 46045180 */ add.s $f6, $f10, $f4 +/* 00B8C 808FDACC AFAB0054 */ sw $t3, 0x0054($sp) /* 00B90 808FDAD0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00B94 808FDAD4 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 -/* 00B98 808FDAD8 460E3200 */ add.s $f8, $f6, $f14 -/* 00B9C 808FDADC 44054000 */ mfc1 $a1, $f8 +/* 00B98 808FDAD8 460E3200 */ add.s $f8, $f6, $f14 +/* 00B9C 808FDADC 44054000 */ mfc1 $a1, $f8 /* 00BA0 808FDAE0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00BA4 808FDAE4 00000000 */ nop /* 00BA8 808FDAE8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 00BAC 808FDAEC 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 /* 00BB0 808FDAF0 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 00BB4 808FDAF4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 00BB8 808FDAF8 44050000 */ mfc1 $a1, $f0 -/* 00BBC 808FDAFC 8FA40054 */ lw $a0, 0x0054($sp) +/* 00BB8 808FDAF8 44050000 */ mfc1 $a1, $f0 +/* 00BBC 808FDAFC 8FA40054 */ lw $a0, 0x0054($sp) /* 00BC0 808FDB00 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00BC4 808FDB04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00BC8 808FDB08 1000000A */ beq $zero, $zero, .L808FDB34 +/* 00BC8 808FDB08 1000000A */ beq $zero, $zero, .L808FDB34 /* 00BCC 808FDB0C 8E0C0398 */ lw $t4, 0x0398($s0) ## 00000398 .L808FDB10: /* 00BD0 808FDB10 3C01423C */ lui $at, 0x423C ## $at = 423C0000 @@ -348,22 +348,22 @@ glabel L808FD940 /* 00BD8 808FDB18 C52A0028 */ lwc1 $f10, 0x0028($t1) ## 00000028 /* 00BDC 808FDB1C 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 00BE0 808FDB20 44814000 */ mtc1 $at, $f8 ## $f8 = 7.00 -/* 00BE4 808FDB24 46045180 */ add.s $f6, $f10, $f4 -/* 00BE8 808FDB28 46083280 */ add.s $f10, $f6, $f8 +/* 00BE4 808FDB24 46045180 */ add.s $f6, $f10, $f4 +/* 00BE8 808FDB28 46083280 */ add.s $f10, $f6, $f8 /* 00BEC 808FDB2C E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 /* 00BF0 808FDB30 8E0C0398 */ lw $t4, 0x0398($s0) ## 00000398 .L808FDB34: -/* 00BF4 808FDB34 2D8100AB */ sltiu $at, $t4, 0x00AB -/* 00BF8 808FDB38 54200736 */ bnel $at, $zero, .L808FF814 +/* 00BF4 808FDB34 2D8100AB */ sltiu $at, $t4, 0x00AB +/* 00BF8 808FDB38 54200736 */ bnel $at, $zero, .L808FF814 /* 00BFC 808FDB3C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00C00 808FDB40 0C042F6F */ jal func_8010BDBC +/* 00C00 808FDB40 0C042F6F */ jal func_8010BDBC /* 00C04 808FDB44 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 00C08 808FDB48 14400731 */ bne $v0, $zero, .L808FF810 +/* 00C08 808FDB48 14400731 */ bne $v0, $zero, .L808FF810 /* 00C0C 808FDB4C 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 00C10 808FDB50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00C14 808FDB54 A60D039C */ sh $t5, 0x039C($s0) ## 0000039C /* 00C18 808FDB58 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 00C1C 808FDB5C 1000072C */ beq $zero, $zero, .L808FF810 +/* 00C1C 808FDB5C 1000072C */ beq $zero, $zero, .L808FF810 /* 00C20 808FDB60 E6040410 */ swc1 $f4, 0x0410($s0) ## 00000410 glabel L808FDB64 /* 00C24 808FDB64 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -373,87 +373,87 @@ glabel L808FDB64 /* 00C34 808FDB74 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 /* 00C38 808FDB78 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 00C3C 808FDB7C 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 -/* 00C40 808FDB80 46083280 */ add.s $f10, $f6, $f8 +/* 00C40 808FDB80 46083280 */ add.s $f10, $f6, $f8 /* 00C44 808FDB84 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00C48 808FDB88 44070000 */ mfc1 $a3, $f0 +/* 00C48 808FDB88 44070000 */ mfc1 $a3, $f0 /* 00C4C 808FDB8C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00C50 808FDB90 46045180 */ add.s $f6, $f10, $f4 +/* 00C50 808FDB90 46045180 */ add.s $f6, $f10, $f4 /* 00C54 808FDB94 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 -/* 00C58 808FDB98 44053000 */ mfc1 $a1, $f6 +/* 00C58 808FDB98 44053000 */ mfc1 $a1, $f6 /* 00C5C 808FDB9C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00C60 808FDBA0 00000000 */ nop /* 00C64 808FDBA4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 00C68 808FDBA8 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 00C6C 808FDBAC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00C70 808FDBB0 14610009 */ bne $v1, $at, .L808FDBD8 +/* 00C70 808FDBB0 14610009 */ bne $v1, $at, .L808FDBD8 /* 00C74 808FDBB4 A20E0339 */ sb $t6, 0x0339($s0) ## 00000339 /* 00C78 808FDBB8 3C048090 */ lui $a0, %hi(D_80906D6C) ## $a0 = 80900000 /* 00C7C 808FDBBC 24846D6C */ addiu $a0, $a0, %lo(D_80906D6C) ## $a0 = 80906D6C -/* 00C80 808FDBC0 0C01E245 */ jal func_80078914 +/* 00C80 808FDBC0 0C01E245 */ jal func_80078914 /* 00C84 808FDBC4 2405281D */ addiu $a1, $zero, 0x281D ## $a1 = 0000281D /* 00C88 808FDBC8 3C041000 */ lui $a0, 0x1000 ## $a0 = 10000000 /* 00C8C 808FDBCC 0C03E803 */ jal Audio_SetBGM - + /* 00C90 808FDBD0 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100000FF /* 00C94 808FDBD4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDBD8: /* 00C98 808FDBD8 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00C9C 808FDBDC 14610009 */ bne $v1, $at, .L808FDC04 +/* 00C9C 808FDBDC 14610009 */ bne $v1, $at, .L808FDC04 /* 00CA0 808FDBE0 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 00CA4 808FDBE4 3C188091 */ lui $t8, %hi(D_8090EB2C) ## $t8 = 80910000 -/* 00CA8 808FDBE8 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) +/* 00CA8 808FDBE8 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) /* 00CAC 808FDBEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00CB0 808FDBF0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00CB4 808FDBF4 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 00CB8 808FDBF8 0C00B7D5 */ jal func_8002DF54 +/* 00CB8 808FDBF8 0C00B7D5 */ jal func_8002DF54 /* 00CBC 808FDBFC A30F03C8 */ sb $t7, 0x03C8($t8) ## 809103C8 /* 00CC0 808FDC00 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDC04: /* 00CC4 808FDC04 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 00CC8 808FDC08 14610701 */ bne $v1, $at, .L808FF810 +/* 00CC8 808FDC08 14610701 */ bne $v1, $at, .L808FF810 /* 00CCC 808FDC0C 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 00CD0 808FDC10 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00CD4 808FDC14 A619039C */ sh $t9, 0x039C($s0) ## 0000039C /* 00CD8 808FDC18 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 00CDC 808FDC1C 3C0C8091 */ lui $t4, %hi(D_8090EB2C) ## $t4 = 80910000 /* 00CE0 808FDC20 E6080410 */ swc1 $f8, 0x0410($s0) ## 00000410 -/* 00CE4 808FDC24 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) +/* 00CE4 808FDC24 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) /* 00CE8 808FDC28 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 /* 00CEC 808FDC2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00CF0 808FDC30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00CF4 808FDC34 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 00CF8 808FDC38 0C00B7D5 */ jal func_8002DF54 +/* 00CF8 808FDC38 0C00B7D5 */ jal func_8002DF54 /* 00CFC 808FDC3C A18B03C8 */ sb $t3, 0x03C8($t4) ## 809103C8 -/* 00D00 808FDC40 100006F4 */ beq $zero, $zero, .L808FF814 +/* 00D00 808FDC40 100006F4 */ beq $zero, $zero, .L808FF814 /* 00D04 808FDC44 3C014080 */ lui $at, 0x4080 ## $at = 40800000 glabel L808FDC48 /* 00D08 808FDC48 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 00D0C 808FDC4C A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 /* 00D10 808FDC50 3C018091 */ lui $at, %hi(D_8090DB64) ## $at = 80910000 -/* 00D14 808FDC54 C424DB64 */ lwc1 $f4, %lo(D_8090DB64)($at) +/* 00D14 808FDC54 C424DB64 */ lwc1 $f4, %lo(D_8090DB64)($at) /* 00D18 808FDC58 C60A0410 */ lwc1 $f10, 0x0410($s0) ## 00000410 /* 00D1C 808FDC5C 260403A4 */ addiu $a0, $s0, 0x03A4 ## $a0 = 000003A4 /* 00D20 808FDC60 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00D24 808FDC64 46045182 */ mul.s $f6, $f10, $f4 +/* 00D24 808FDC64 46045182 */ mul.s $f6, $f10, $f4 /* 00D28 808FDC68 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00D2C 808FDC6C AFA4004C */ sw $a0, 0x004C($sp) +/* 00D2C 808FDC6C AFA4004C */ sw $a0, 0x004C($sp) /* 00D30 808FDC70 3C05C3B4 */ lui $a1, 0xC3B4 ## $a1 = C3B40000 -/* 00D34 808FDC74 44073000 */ mfc1 $a3, $f6 +/* 00D34 808FDC74 44073000 */ mfc1 $a3, $f6 /* 00D38 808FDC78 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00D3C 808FDC7C 00000000 */ nop /* 00D40 808FDC80 3C01432A */ lui $at, 0x432A ## $at = 432A0000 /* 00D44 808FDC84 44815000 */ mtc1 $at, $f10 ## $f10 = 170.00 /* 00D48 808FDC88 C6080410 */ lwc1 $f8, 0x0410($s0) ## 00000410 /* 00D4C 808FDC8C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00D50 808FDC90 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00D54 808FDC94 460A4102 */ mul.s $f4, $f8, $f10 +/* 00D54 808FDC94 460A4102 */ mul.s $f4, $f8, $f10 /* 00D58 808FDC98 260403AC */ addiu $a0, $s0, 0x03AC ## $a0 = 000003AC /* 00D5C 808FDC9C 3C05C1A0 */ lui $a1, 0xC1A0 ## $a1 = C1A00000 -/* 00D60 808FDCA0 44072000 */ mfc1 $a3, $f4 +/* 00D60 808FDCA0 44072000 */ mfc1 $a3, $f4 /* 00D64 808FDCA4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00D68 808FDCA8 00000000 */ nop /* 00D6C 808FDCAC 3C053D23 */ lui $a1, 0x3D23 ## $a1 = 3D230000 /* 00D70 808FDCB0 3C073A03 */ lui $a3, 0x3A03 ## $a3 = 3A030000 @@ -461,16 +461,16 @@ glabel L808FDC48 /* 00D78 808FDCB8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3D23D70A /* 00D7C 808FDCBC 26040410 */ addiu $a0, $s0, 0x0410 ## $a0 = 00000410 /* 00D80 808FDCC0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00D84 808FDCC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00D88 808FDCC8 8E0E0398 */ lw $t6, 0x0398($s0) ## 00000398 /* 00D8C 808FDCCC 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 /* 00D90 808FDCD0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00D94 808FDCD4 55C106CF */ bnel $t6, $at, .L808FF814 +/* 00D94 808FDCD4 55C106CF */ bnel $t6, $at, .L808FF814 /* 00D98 808FDCD8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00D9C 808FDCDC 0C030129 */ jal func_800C04A4 +/* 00D9C 808FDCDC 0C030129 */ jal func_800C04A4 /* 00DA0 808FDCE0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00DA4 808FDCE4 8FAF004C */ lw $t7, 0x004C($sp) +/* 00DA4 808FDCE4 8FAF004C */ lw $t7, 0x004C($sp) /* 00DA8 808FDCE8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DAC 808FDCEC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00DB0 808FDCF0 8DF90000 */ lw $t9, 0x0000($t7) ## 00000000 @@ -479,7 +479,7 @@ glabel L808FDC48 /* 00DBC 808FDCFC AC580060 */ sw $t8, 0x0060($v0) ## 00000060 /* 00DC0 808FDD00 8DF90008 */ lw $t9, 0x0008($t7) ## 00000008 /* 00DC4 808FDD04 AC590064 */ sw $t9, 0x0064($v0) ## 00000064 -/* 00DC8 808FDD08 8FAB004C */ lw $t3, 0x004C($sp) +/* 00DC8 808FDD08 8FAB004C */ lw $t3, 0x004C($sp) /* 00DCC 808FDD0C 8D6D0000 */ lw $t5, 0x0000($t3) ## 00000000 /* 00DD0 808FDD10 AC4D0074 */ sw $t5, 0x0074($v0) ## 00000074 /* 00DD4 808FDD14 8D6C0004 */ lw $t4, 0x0004($t3) ## 00000004 @@ -492,19 +492,19 @@ glabel L808FDC48 /* 00DF0 808FDD30 AC4E0054 */ sw $t6, 0x0054($v0) ## 00000054 /* 00DF4 808FDD34 8E0F03B8 */ lw $t7, 0x03B8($s0) ## 000003B8 /* 00DF8 808FDD38 AC4F0058 */ sw $t7, 0x0058($v0) ## 00000058 -/* 00DFC 808FDD3C 0C03022B */ jal func_800C08AC +/* 00DFC 808FDD3C 0C03022B */ jal func_800C08AC /* 00E00 808FDD40 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 00E04 808FDD44 A600039E */ sh $zero, 0x039E($s0) ## 0000039E /* 00E08 808FDD48 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E0C 808FDD4C 0C01914D */ jal func_80064534 +/* 00E0C 808FDD4C 0C01914D */ jal func_80064534 /* 00E10 808FDD50 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 /* 00E14 808FDD54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E18 808FDD58 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E1C 808FDD5C 0C00B7D5 */ jal func_8002DF54 +/* 00E1C 808FDD5C 0C00B7D5 */ jal func_8002DF54 /* 00E20 808FDD60 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00E24 808FDD64 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 /* 00E28 808FDD68 A618039C */ sh $t8, 0x039C($s0) ## 0000039C -/* 00E2C 808FDD6C 100006A8 */ beq $zero, $zero, .L808FF810 +/* 00E2C 808FDD6C 100006A8 */ beq $zero, $zero, .L808FF810 /* 00E30 808FDD70 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L808FDD74 /* 00E34 808FDD74 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -512,30 +512,30 @@ glabel L808FDD74 /* 00E3C 808FDD7C C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 /* 00E40 808FDD80 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 00E44 808FDD84 A2190339 */ sb $t9, 0x0339($s0) ## 00000339 -/* 00E48 808FDD88 4608303C */ c.lt.s $f6, $f8 +/* 00E48 808FDD88 4608303C */ c.lt.s $f6, $f8 /* 00E4C 808FDD8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E50 808FDD90 450206A0 */ bc1fl .L808FF814 +/* 00E50 808FDD90 450206A0 */ bc1fl .L808FF814 /* 00E54 808FDD94 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00E58 808FDD98 0C041B33 */ jal func_80106CCC -/* 00E5C 808FDD9C AFA90088 */ sw $t1, 0x0088($sp) +/* 00E58 808FDD98 0C041B33 */ jal func_80106CCC +/* 00E5C 808FDD9C AFA90088 */ sw $t1, 0x0088($sp) /* 00E60 808FDDA0 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A /* 00E64 808FDDA4 A60B039C */ sh $t3, 0x039C($s0) ## 0000039C /* 00E68 808FDDA8 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 00E6C 808FDDAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E70 808FDDB0 0C019148 */ jal func_80064520 +/* 00E70 808FDDB0 0C019148 */ jal func_80064520 /* 00E74 808FDDB4 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 -/* 00E78 808FDDB8 0C03008C */ jal func_800C0230 +/* 00E78 808FDDB8 0C03008C */ jal func_800C0230 /* 00E7C 808FDDBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E80 808FDDC0 A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 00E84 808FDDC4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E88 808FDDC8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00E8C 808FDDCC 0C0300C5 */ jal func_800C0314 +/* 00E8C 808FDDCC 0C0300C5 */ jal func_800C0314 /* 00E90 808FDDD0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00E94 808FDDD4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E98 808FDDD8 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 00E9C 808FDDDC 0C0300C5 */ jal func_800C0314 +/* 00E9C 808FDDDC 0C0300C5 */ jal func_800C0314 /* 00EA0 808FDDE0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00EA4 808FDDE4 8FA90088 */ lw $t1, 0x0088($sp) +/* 00EA4 808FDDE4 8FA90088 */ lw $t1, 0x0088($sp) glabel L808FDDE8 /* 00EA8 808FDDE8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00EAC 808FDDEC 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 @@ -544,7 +544,7 @@ glabel L808FDDE8 /* 00EB8 808FDDF8 3C018091 */ lui $at, %hi(D_8090DB68) ## $at = 80910000 /* 00EBC 808FDDFC 3C028091 */ lui $v0, %hi(D_8090EB2C) ## $v0 = 80910000 /* 00EC0 808FDE00 E52A0024 */ swc1 $f10, 0x0024($t1) ## 00000024 -/* 00EC4 808FDE04 C424DB68 */ lwc1 $f4, %lo(D_8090DB68)($at) +/* 00EC4 808FDE04 C424DB68 */ lwc1 $f4, %lo(D_8090DB68)($at) /* 00EC8 808FDE08 3C01C326 */ lui $at, 0xC326 ## $at = C3260000 /* 00ECC 808FDE0C 44813000 */ mtc1 $at, $f6 ## $f6 = -166.00 /* 00ED0 808FDE10 2442EB2C */ addiu $v0, $v0, %lo(D_8090EB2C) ## $v0 = 8090EB2C @@ -557,7 +557,7 @@ glabel L808FDDE8 /* 00EEC 808FDE2C 240FC000 */ addiu $t7, $zero, 0xC000 ## $t7 = FFFFC000 /* 00EF0 808FDE30 E5880024 */ swc1 $f8, 0x0024($t4) ## 00000024 /* 00EF4 808FDE34 8C4D0000 */ lw $t5, 0x0000($v0) ## 8090EB2C -/* 00EF8 808FDE38 C42ADB6C */ lwc1 $f10, %lo(D_8090DB6C)($at) +/* 00EF8 808FDE38 C42ADB6C */ lwc1 $f10, %lo(D_8090DB6C)($at) /* 00EFC 808FDE3C 3C01C33A */ lui $at, 0xC33A ## $at = C33A0000 /* 00F00 808FDE40 44812000 */ mtc1 $at, $f4 ## $f4 = -186.00 /* 00F04 808FDE44 E5AA0028 */ swc1 $f10, 0x0028($t5) ## 00000028 @@ -579,113 +579,113 @@ glabel L808FDDE8 /* 00F44 808FDE84 C5240024 */ lwc1 $f4, 0x0024($t1) ## 00000024 /* 00F48 808FDE88 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 00F4C 808FDE8C 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 -/* 00F50 808FDE90 460E2180 */ add.s $f6, $f4, $f14 +/* 00F50 808FDE90 460E2180 */ add.s $f6, $f4, $f14 /* 00F54 808FDE94 3C014320 */ lui $at, 0x4320 ## $at = 43200000 /* 00F58 808FDE98 8E0B0398 */ lw $t3, 0x0398($s0) ## 00000398 /* 00F5C 808FDE9C 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 00F60 808FDEA0 E60603B0 */ swc1 $f6, 0x03B0($s0) ## 000003B0 /* 00F64 808FDEA4 C5280028 */ lwc1 $f8, 0x0028($t1) ## 00000028 /* 00F68 808FDEA8 44813000 */ mtc1 $at, $f6 ## $f6 = 160.00 -/* 00F6C 808FDEAC 2D610014 */ sltiu $at, $t3, 0x0014 -/* 00F70 808FDEB0 460A4100 */ add.s $f4, $f8, $f10 -/* 00F74 808FDEB4 46062201 */ sub.s $f8, $f4, $f6 +/* 00F6C 808FDEAC 2D610014 */ sltiu $at, $t3, 0x0014 +/* 00F70 808FDEB0 460A4100 */ add.s $f4, $f8, $f10 +/* 00F74 808FDEB4 46062201 */ sub.s $f8, $f4, $f6 /* 00F78 808FDEB8 E60803B4 */ swc1 $f8, 0x03B4($s0) ## 000003B4 /* 00F7C 808FDEBC C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C -/* 00F80 808FDEC0 14200019 */ bne $at, $zero, .L808FDF28 +/* 00F80 808FDEC0 14200019 */ bne $at, $zero, .L808FDF28 /* 00F84 808FDEC4 E60A03B8 */ swc1 $f10, 0x03B8($s0) ## 000003B8 -/* 00F88 808FDEC8 0C01E221 */ jal func_80078884 +/* 00F88 808FDEC8 0C01E221 */ jal func_80078884 /* 00F8C 808FDECC 2404301C */ addiu $a0, $zero, 0x301C ## $a0 = 0000301C /* 00F90 808FDED0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00F94 808FDED4 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 /* 00F98 808FDED8 26040324 */ addiu $a0, $s0, 0x0324 ## $a0 = 00000324 /* 00F9C 808FDEDC 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 00FA0 808FDEE0 44077000 */ mfc1 $a3, $f14 +/* 00FA0 808FDEE0 44077000 */ mfc1 $a3, $f14 /* 00FA4 808FDEE4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00FA8 808FDEE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FAC 808FDEEC 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 00FB0 808FDEF0 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 /* 00FB4 808FDEF4 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00FB8 808FDEF8 14610008 */ bne $v1, $at, .L808FDF1C +/* 00FB8 808FDEF8 14610008 */ bne $v1, $at, .L808FDF1C /* 00FBC 808FDEFC A20C0339 */ sb $t4, 0x0339($s0) ## 00000339 /* 00FC0 808FDF00 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00FC4 808FDF04 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00FC8 808FDF08 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00FCC 808FDF0C 00310821 */ addu $at, $at, $s1 +/* 00FCC 808FDF0C 00310821 */ addu $at, $at, $s1 /* 00FD0 808FDF10 E604033C */ swc1 $f4, 0x033C($s0) ## 0000033C /* 00FD4 808FDF14 E4260AFC */ swc1 $f6, 0x0AFC($at) ## 00010AFC /* 00FD8 808FDF18 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDF1C: /* 00FDC 808FDF1C 3C028091 */ lui $v0, %hi(D_8090EB2C) ## $v0 = 80910000 -/* 00FE0 808FDF20 10000003 */ beq $zero, $zero, .L808FDF30 +/* 00FE0 808FDF20 10000003 */ beq $zero, $zero, .L808FDF30 /* 00FE4 808FDF24 2442EB2C */ addiu $v0, $v0, %lo(D_8090EB2C) ## $v0 = 8090EB2C .L808FDF28: /* 00FE8 808FDF28 A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 /* 00FEC 808FDF2C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDF30: /* 00FF0 808FDF30 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 00FF4 808FDF34 14610008 */ bne $v1, $at, .L808FDF58 +/* 00FF4 808FDF34 14610008 */ bne $v1, $at, .L808FDF58 /* 00FF8 808FDF38 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00FFC 808FDF3C 8C4F0000 */ lw $t7, 0x0000($v0) ## 8090EB2C /* 01000 808FDF40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01004 808FDF44 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01008 808FDF48 24060051 */ addiu $a2, $zero, 0x0051 ## $a2 = 00000051 -/* 0100C 808FDF4C 0C00B7D5 */ jal func_8002DF54 +/* 0100C 808FDF4C 0C00B7D5 */ jal func_8002DF54 /* 01010 808FDF50 A1EE03C8 */ sb $t6, 0x03C8($t7) ## 000003C8 /* 01014 808FDF54 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDF58: /* 01018 808FDF58 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 0101C 808FDF5C 1461062C */ bne $v1, $at, .L808FF810 +/* 0101C 808FDF5C 1461062C */ bne $v1, $at, .L808FF810 /* 01020 808FDF60 2418000B */ addiu $t8, $zero, 0x000B ## $t8 = 0000000B /* 01024 808FDF64 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 01028 808FDF68 10000629 */ beq $zero, $zero, .L808FF810 +/* 01028 808FDF68 10000629 */ beq $zero, $zero, .L808FF810 /* 0102C 808FDF6C A618039C */ sh $t8, 0x039C($s0) ## 0000039C glabel L808FDF70 /* 01030 808FDF70 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 /* 01034 808FDF74 A2190339 */ sb $t9, 0x0339($s0) ## 00000339 -/* 01038 808FDF78 AFA90088 */ sw $t1, 0x0088($sp) -/* 0103C 808FDF7C 0C01E221 */ jal func_80078884 +/* 01038 808FDF78 AFA90088 */ sw $t1, 0x0088($sp) +/* 0103C 808FDF7C 0C01E221 */ jal func_80078884 /* 01040 808FDF80 2404301C */ addiu $a0, $zero, 0x301C ## $a0 = 0000301C /* 01044 808FDF84 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 01048 808FDF88 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 /* 0104C 808FDF8C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01050 808FDF90 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 /* 01054 808FDF94 3C0143F5 */ lui $at, 0x43F5 ## $at = 43F50000 -/* 01058 808FDF98 8FA90088 */ lw $t1, 0x0088($sp) +/* 01058 808FDF98 8FA90088 */ lw $t1, 0x0088($sp) /* 0105C 808FDF9C 44814000 */ mtc1 $at, $f8 ## $f8 = 490.00 /* 01060 808FDFA0 3C018091 */ lui $at, %hi(D_8090DB70) ## $at = 80910000 /* 01064 808FDFA4 3C0B8091 */ lui $t3, %hi(D_8090EB2C) ## $t3 = 80910000 /* 01068 808FDFA8 E5280024 */ swc1 $f8, 0x0024($t1) ## 00000024 -/* 0106C 808FDFAC C42ADB70 */ lwc1 $f10, %lo(D_8090DB70)($at) +/* 0106C 808FDFAC C42ADB70 */ lwc1 $f10, %lo(D_8090DB70)($at) /* 01070 808FDFB0 3C01C326 */ lui $at, 0xC326 ## $at = C3260000 /* 01074 808FDFB4 44812000 */ mtc1 $at, $f4 ## $f4 = -166.00 /* 01078 808FDFB8 3C014435 */ lui $at, 0x4435 ## $at = 44350000 /* 0107C 808FDFBC E52A0028 */ swc1 $f10, 0x0028($t1) ## 00000028 /* 01080 808FDFC0 E524002C */ swc1 $f4, 0x002C($t1) ## 0000002C -/* 01084 808FDFC4 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) +/* 01084 808FDFC4 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) /* 01088 808FDFC8 44813000 */ mtc1 $at, $f6 ## $f6 = 724.00 /* 0108C 808FDFCC 3C018091 */ lui $at, %hi(D_8090DB74) ## $at = 80910000 /* 01090 808FDFD0 3C0C8091 */ lui $t4, %hi(D_8090EB2C) ## $t4 = 80910000 /* 01094 808FDFD4 E5660024 */ swc1 $f6, 0x0024($t3) ## 80910024 -/* 01098 808FDFD8 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) -/* 0109C 808FDFDC C428DB74 */ lwc1 $f8, %lo(D_8090DB74)($at) +/* 01098 808FDFD8 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) +/* 0109C 808FDFDC C428DB74 */ lwc1 $f8, %lo(D_8090DB74)($at) /* 010A0 808FDFE0 3C01C33A */ lui $at, 0xC33A ## $at = C33A0000 /* 010A4 808FDFE4 3C0D8091 */ lui $t5, %hi(D_8090EB2C) ## $t5 = 80910000 /* 010A8 808FDFE8 E5880028 */ swc1 $f8, 0x0028($t4) ## 80910028 -/* 010AC 808FDFEC 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) +/* 010AC 808FDFEC 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) /* 010B0 808FDFF0 44815000 */ mtc1 $at, $f10 ## $f10 = -186.00 /* 010B4 808FDFF4 240EC000 */ addiu $t6, $zero, 0xC000 ## $t6 = FFFFC000 /* 010B8 808FDFF8 3C188091 */ lui $t8, %hi(D_8090EB2C) ## $t8 = 80910000 /* 010BC 808FDFFC E5AA002C */ swc1 $f10, 0x002C($t5) ## 8091002C /* 010C0 808FE000 A52E00B6 */ sh $t6, 0x00B6($t1) ## 000000B6 -/* 010C4 808FE004 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) +/* 010C4 808FE004 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) /* 010C8 808FE008 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 /* 010CC 808FE00C 44812000 */ mtc1 $at, $f4 ## $f4 = 450.00 /* 010D0 808FE010 240FB000 */ addiu $t7, $zero, 0xB000 ## $t7 = FFFFB000 /* 010D4 808FE014 A70F00B6 */ sh $t7, 0x00B6($t8) ## 809100B6 /* 010D8 808FE018 3C018091 */ lui $at, %hi(D_8090DB78) ## $at = 80910000 /* 010DC 808FE01C E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 -/* 010E0 808FE020 C426DB78 */ lwc1 $f6, %lo(D_8090DB78)($at) +/* 010E0 808FE020 C426DB78 */ lwc1 $f6, %lo(D_8090DB78)($at) /* 010E4 808FE024 3C01C31E */ lui $at, 0xC31E ## $at = C31E0000 /* 010E8 808FE028 44814000 */ mtc1 $at, $f8 ## $f8 = -158.00 /* 010EC 808FE02C E60603A8 */ swc1 $f6, 0x03A8($s0) ## 000003A8 @@ -694,75 +694,75 @@ glabel L808FDF70 /* 010F8 808FE038 C52A0024 */ lwc1 $f10, 0x0024($t1) ## 00000024 /* 010FC 808FE03C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 01100 808FE040 3C048090 */ lui $a0, %hi(D_80906D6C) ## $a0 = 80900000 -/* 01104 808FE044 46025101 */ sub.s $f4, $f10, $f2 +/* 01104 808FE044 46025101 */ sub.s $f4, $f10, $f2 /* 01108 808FE048 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 /* 0110C 808FE04C 3C014317 */ lui $at, 0x4317 ## $at = 43170000 /* 01110 808FE050 24846D6C */ addiu $a0, $a0, %lo(D_80906D6C) ## $a0 = 80906D6C -/* 01114 808FE054 46002180 */ add.s $f6, $f4, $f0 +/* 01114 808FE054 46002180 */ add.s $f6, $f4, $f0 /* 01118 808FE058 2405281D */ addiu $a1, $zero, 0x281D ## $a1 = 0000281D /* 0111C 808FE05C E60603B0 */ swc1 $f6, 0x03B0($s0) ## 000003B0 /* 01120 808FE060 C5280028 */ lwc1 $f8, 0x0028($t1) ## 00000028 /* 01124 808FE064 44813000 */ mtc1 $at, $f6 ## $f6 = 151.00 /* 01128 808FE068 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0112C 808FE06C 460A4100 */ add.s $f4, $f8, $f10 -/* 01130 808FE070 46062201 */ sub.s $f8, $f4, $f6 -/* 01134 808FE074 46004281 */ sub.s $f10, $f8, $f0 +/* 0112C 808FE06C 460A4100 */ add.s $f4, $f8, $f10 +/* 01130 808FE070 46062201 */ sub.s $f8, $f4, $f6 +/* 01134 808FE074 46004281 */ sub.s $f10, $f8, $f0 /* 01138 808FE078 E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 /* 0113C 808FE07C C524002C */ lwc1 $f4, 0x002C($t1) ## 0000002C -/* 01140 808FE080 46002180 */ add.s $f6, $f4, $f0 -/* 01144 808FE084 14610005 */ bne $v1, $at, .L808FE09C +/* 01140 808FE080 46002180 */ add.s $f6, $f4, $f0 +/* 01144 808FE084 14610005 */ bne $v1, $at, .L808FE09C /* 01148 808FE088 E60603B8 */ swc1 $f6, 0x03B8($s0) ## 000003B8 -/* 0114C 808FE08C 0C01E245 */ jal func_80078914 -/* 01150 808FE090 AFA90088 */ sw $t1, 0x0088($sp) -/* 01154 808FE094 8FA90088 */ lw $t1, 0x0088($sp) +/* 0114C 808FE08C 0C01E245 */ jal func_80078914 +/* 01150 808FE090 AFA90088 */ sw $t1, 0x0088($sp) +/* 01154 808FE094 8FA90088 */ lw $t1, 0x0088($sp) /* 01158 808FE098 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE09C: /* 0115C 808FE09C 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 01160 808FE0A0 14610005 */ bne $v1, $at, .L808FE0B8 +/* 01160 808FE0A0 14610005 */ bne $v1, $at, .L808FE0B8 /* 01164 808FE0A4 2404281D */ addiu $a0, $zero, 0x281D ## $a0 = 0000281D -/* 01168 808FE0A8 0C01E221 */ jal func_80078884 -/* 0116C 808FE0AC AFA90088 */ sw $t1, 0x0088($sp) -/* 01170 808FE0B0 8FA90088 */ lw $t1, 0x0088($sp) +/* 01168 808FE0A8 0C01E221 */ jal func_80078884 +/* 0116C 808FE0AC AFA90088 */ sw $t1, 0x0088($sp) +/* 01170 808FE0B0 8FA90088 */ lw $t1, 0x0088($sp) /* 01174 808FE0B4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE0B8: /* 01178 808FE0B8 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 0117C 808FE0BC 14610007 */ bne $v1, $at, .L808FE0DC +/* 0117C 808FE0BC 14610007 */ bne $v1, $at, .L808FE0DC /* 01180 808FE0C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01184 808FE0C4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01188 808FE0C8 24060052 */ addiu $a2, $zero, 0x0052 ## $a2 = 00000052 -/* 0118C 808FE0CC 0C00B7D5 */ jal func_8002DF54 -/* 01190 808FE0D0 AFA90088 */ sw $t1, 0x0088($sp) -/* 01194 808FE0D4 8FA90088 */ lw $t1, 0x0088($sp) +/* 0118C 808FE0CC 0C00B7D5 */ jal func_8002DF54 +/* 01190 808FE0D0 AFA90088 */ sw $t1, 0x0088($sp) +/* 01194 808FE0D4 8FA90088 */ lw $t1, 0x0088($sp) /* 01198 808FE0D8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE0DC: /* 0119C 808FE0DC 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 011A0 808FE0E0 146105CB */ bne $v1, $at, .L808FF810 +/* 011A0 808FE0E0 146105CB */ bne $v1, $at, .L808FF810 /* 011A4 808FE0E4 2419000C */ addiu $t9, $zero, 0x000C ## $t9 = 0000000C /* 011A8 808FE0E8 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 011AC 808FE0EC A619039C */ sh $t9, 0x039C($s0) ## 0000039C /* 011B0 808FE0F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 011B4 808FE0F4 24A52168 */ addiu $a1, $a1, 0x2168 ## $a1 = 06002168 -/* 011B8 808FE0F8 AFA90088 */ sw $t1, 0x0088($sp) +/* 011B8 808FE0F8 AFA90088 */ sw $t1, 0x0088($sp) /* 011BC 808FE0FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 011C0 808FE100 0C029490 */ jal func_800A5240 +/* 011C0 808FE100 0C029490 */ jal func_800A5240 /* 011C4 808FE104 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 011C8 808FE108 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 011CC 808FE10C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 011D0 808FE110 24842168 */ addiu $a0, $a0, 0x2168 ## $a0 = 06002168 /* 011D4 808FE114 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 011D8 808FE118 3C018091 */ lui $at, %hi(D_8090DB7C) ## $at = 80910000 -/* 011DC 808FE11C C420DB7C */ lwc1 $f0, %lo(D_8090DB7C)($at) -/* 011E0 808FE120 468042A0 */ cvt.s.w $f10, $f8 +/* 011DC 808FE11C C420DB7C */ lwc1 $f0, %lo(D_8090DB7C)($at) +/* 011E0 808FE120 468042A0 */ cvt.s.w $f10, $f8 /* 011E4 808FE124 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 011E8 808FE128 44811000 */ mtc1 $at, $f2 ## $f2 = -200.00 -/* 011EC 808FE12C 8FA90088 */ lw $t1, 0x0088($sp) +/* 011EC 808FE12C 8FA90088 */ lw $t1, 0x0088($sp) /* 011F0 808FE130 3C018091 */ lui $at, %hi(D_8090DB80) ## $at = 80910000 /* 011F4 808FE134 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 /* 011F8 808FE138 E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 /* 011FC 808FE13C E6020024 */ swc1 $f2, 0x0024($s0) ## 00000024 /* 01200 808FE140 E602002C */ swc1 $f2, 0x002C($s0) ## 0000002C -/* 01204 808FE144 C424DB80 */ lwc1 $f4, %lo(D_8090DB80)($at) +/* 01204 808FE144 C424DB80 */ lwc1 $f4, %lo(D_8090DB80)($at) /* 01208 808FE148 3C01C270 */ lui $at, 0xC270 ## $at = C2700000 /* 0120C 808FE14C 44813000 */ mtc1 $at, $f6 ## $f6 = -60.00 /* 01210 808FE150 240B5000 */ addiu $t3, $zero, 0x5000 ## $t3 = 00005000 @@ -770,13 +770,13 @@ glabel L808FDF70 /* 01218 808FE158 3C018091 */ lui $at, %hi(D_8090DB84) ## $at = 80910000 /* 0121C 808FE15C E60400BC */ swc1 $f4, 0x00BC($s0) ## 000000BC /* 01220 808FE160 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 -/* 01224 808FE164 C428DB84 */ lwc1 $f8, %lo(D_8090DB84)($at) +/* 01224 808FE164 C428DB84 */ lwc1 $f8, %lo(D_8090DB84)($at) /* 01228 808FE168 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 0122C 808FE16C 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 01230 808FE170 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01234 808FE174 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01238 808FE178 460A0100 */ add.s $f4, $f0, $f10 -/* 0123C 808FE17C 00310821 */ addu $at, $at, $s1 +/* 01238 808FE178 460A0100 */ add.s $f4, $f0, $f10 +/* 0123C 808FE17C 00310821 */ addu $at, $at, $s1 /* 01240 808FE180 E60203AC */ swc1 $f2, 0x03AC($s0) ## 000003AC /* 01244 808FE184 E60203B0 */ swc1 $f2, 0x03B0($s0) ## 000003B0 /* 01248 808FE188 E60403B4 */ swc1 $f4, 0x03B4($s0) ## 000003B4 @@ -784,78 +784,78 @@ glabel L808FDF70 /* 01250 808FE190 E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 01254 808FE194 E4260AFC */ swc1 $f6, 0x0AFC($at) ## 00010AFC /* 01258 808FE198 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0125C 808FE19C 00310821 */ addu $at, $at, $s1 +/* 0125C 808FE19C 00310821 */ addu $at, $at, $s1 /* 01260 808FE1A0 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 01264 808FE1A4 01916021 */ addu $t4, $t4, $s1 +/* 01264 808FE1A4 01916021 */ addu $t4, $t4, $s1 /* 01268 808FE1A8 A0200AE1 */ sb $zero, 0x0AE1($at) ## 00010AE1 /* 0126C 808FE1AC 918C0AE1 */ lbu $t4, 0x0AE1($t4) ## 00010AE1 /* 01270 808FE1B0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01274 808FE1B4 00310821 */ addu $at, $at, $s1 +/* 01274 808FE1B4 00310821 */ addu $at, $at, $s1 /* 01278 808FE1B8 A02C0AE2 */ sb $t4, 0x0AE2($at) ## 00010AE2 /* 0127C 808FE1BC A2000339 */ sb $zero, 0x0339($s0) ## 00000339 glabel L808FE1C0 /* 01280 808FE1C0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01284 808FE1C4 AFA40050 */ sw $a0, 0x0050($sp) +/* 01284 808FE1C4 AFA40050 */ sw $a0, 0x0050($sp) /* 01288 808FE1C8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0128C 808FE1CC AFA90088 */ sw $t1, 0x0088($sp) + +/* 0128C 808FE1CC AFA90088 */ sw $t1, 0x0088($sp) /* 01290 808FE1D0 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 01294 808FE1D4 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 01298 808FE1D8 8FA90088 */ lw $t1, 0x0088($sp) -/* 0129C 808FE1DC 1461000C */ bne $v1, $at, .L808FE210 +/* 01298 808FE1D8 8FA90088 */ lw $t1, 0x0088($sp) +/* 0129C 808FE1DC 1461000C */ bne $v1, $at, .L808FE210 /* 012A0 808FE1E0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 012A4 808FE1E4 3C018090 */ lui $at, %hi(D_80906D78) ## $at = 80900000 -/* 012A8 808FE1E8 A02A6D78 */ sb $t2, %lo(D_80906D78)($at) +/* 012A8 808FE1E8 A02A6D78 */ sb $t2, %lo(D_80906D78)($at) /* 012AC 808FE1EC A20A0314 */ sb $t2, 0x0314($s0) ## 00000314 /* 012B0 808FE1F0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 012B4 808FE1F4 AFA90088 */ sw $t1, 0x0088($sp) +/* 012B4 808FE1F4 AFA90088 */ sw $t1, 0x0088($sp) /* 012B8 808FE1F8 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 /* 012BC 808FE1FC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 012C0 808FE200 0C02A7DB */ jal func_800A9F6C +/* 012C0 808FE200 0C02A7DB */ jal func_800A9F6C /* 012C4 808FE204 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 012C8 808FE208 8FA90088 */ lw $t1, 0x0088($sp) +/* 012C8 808FE208 8FA90088 */ lw $t1, 0x0088($sp) /* 012CC 808FE20C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE210: /* 012D0 808FE210 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 012D4 808FE214 14610005 */ bne $v1, $at, .L808FE22C +/* 012D4 808FE214 14610005 */ bne $v1, $at, .L808FE22C /* 012D8 808FE218 240428C2 */ addiu $a0, $zero, 0x28C2 ## $a0 = 000028C2 -/* 012DC 808FE21C 0C01E221 */ jal func_80078884 -/* 012E0 808FE220 AFA90088 */ sw $t1, 0x0088($sp) -/* 012E4 808FE224 8FA90088 */ lw $t1, 0x0088($sp) +/* 012DC 808FE21C 0C01E221 */ jal func_80078884 +/* 012E0 808FE220 AFA90088 */ sw $t1, 0x0088($sp) +/* 012E4 808FE224 8FA90088 */ lw $t1, 0x0088($sp) /* 012E8 808FE228 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE22C: -/* 012EC 808FE22C 2C61001E */ sltiu $at, $v1, 0x001E -/* 012F0 808FE230 14200010 */ bne $at, $zero, .L808FE274 +/* 012EC 808FE22C 2C61001E */ sltiu $at, $v1, 0x001E +/* 012F0 808FE230 14200010 */ bne $at, $zero, .L808FE274 /* 012F4 808FE234 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 012F8 808FE238 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 012FC 808FE23C 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 /* 01300 808FE240 3C0544A1 */ lui $a1, 0x44A1 ## $a1 = 44A10000 /* 01304 808FE244 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01308 808FE248 44077000 */ mfc1 $a3, $f14 +/* 01308 808FE248 44077000 */ mfc1 $a3, $f14 /* 0130C 808FE24C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01310 808FE250 34A52000 */ ori $a1, $a1, 0x2000 ## $a1 = 44A12000 /* 01314 808FE254 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 01318 808FE258 AFA90088 */ sw $t1, 0x0088($sp) + +/* 01318 808FE258 AFA90088 */ sw $t1, 0x0088($sp) /* 0131C 808FE25C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 01320 808FE260 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 01324 808FE264 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 01328 808FE268 8FA90088 */ lw $t1, 0x0088($sp) -/* 0132C 808FE26C 460A4100 */ add.s $f4, $f8, $f10 +/* 01328 808FE268 8FA90088 */ lw $t1, 0x0088($sp) +/* 0132C 808FE26C 460A4100 */ add.s $f4, $f8, $f10 /* 01330 808FE270 E60403B4 */ swc1 $f4, 0x03B4($s0) ## 000003B4 .L808FE274: /* 01334 808FE274 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 01338 808FE278 AFA90088 */ sw $t1, 0x0088($sp) -/* 0133C 808FE27C 0C0295B2 */ jal func_800A56C8 -/* 01340 808FE280 8FA40050 */ lw $a0, 0x0050($sp) -/* 01344 808FE284 10400562 */ beq $v0, $zero, .L808FF810 -/* 01348 808FE288 8FA90088 */ lw $t1, 0x0088($sp) +/* 01338 808FE278 AFA90088 */ sw $t1, 0x0088($sp) +/* 0133C 808FE27C 0C0295B2 */ jal func_800A56C8 +/* 01340 808FE280 8FA40050 */ lw $a0, 0x0050($sp) +/* 01344 808FE284 10400562 */ beq $v0, $zero, .L808FF810 +/* 01348 808FE288 8FA90088 */ lw $t1, 0x0088($sp) /* 0134C 808FE28C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01350 808FE290 24A52E6C */ addiu $a1, $a1, 0x2E6C ## $a1 = 06002E6C -/* 01354 808FE294 8FA40050 */ lw $a0, 0x0050($sp) +/* 01354 808FE294 8FA40050 */ lw $a0, 0x0050($sp) /* 01358 808FE298 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 0135C 808FE29C 0C0294D3 */ jal func_800A534C -/* 01360 808FE2A0 AFA90088 */ sw $t1, 0x0088($sp) +/* 0135C 808FE29C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01360 808FE2A0 AFA90088 */ sw $t1, 0x0088($sp) /* 01364 808FE2A4 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 01368 808FE2A8 44810000 */ mtc1 $at, $f0 ## $f0 = -200.00 /* 0136C 808FE2AC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -863,41 +863,41 @@ glabel L808FE1C0 /* 01374 808FE2B4 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01378 808FE2B8 240D000E */ addiu $t5, $zero, 0x000E ## $t5 = 0000000E /* 0137C 808FE2BC A60D039C */ sh $t5, 0x039C($s0) ## 0000039C -/* 01380 808FE2C0 46103201 */ sub.s $f8, $f6, $f16 +/* 01380 808FE2C0 46103201 */ sub.s $f8, $f6, $f16 /* 01384 808FE2C4 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 01388 808FE2C8 24040023 */ addiu $a0, $zero, 0x0023 ## $a0 = 00000023 /* 0138C 808FE2CC E6000024 */ swc1 $f0, 0x0024($s0) ## 00000024 /* 01390 808FE2D0 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 01394 808FE2D4 0C03E803 */ jal Audio_SetBGM - + /* 01398 808FE2D8 E600002C */ swc1 $f0, 0x002C($s0) ## 0000002C -/* 0139C 808FE2DC 8FA90088 */ lw $t1, 0x0088($sp) +/* 0139C 808FE2DC 8FA90088 */ lw $t1, 0x0088($sp) glabel L808FE2E0 /* 013A0 808FE2E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 013A4 808FE2E4 02214021 */ addu $t0, $s1, $at +/* 013A4 808FE2E4 02214021 */ addu $t0, $s1, $at /* 013A8 808FE2E8 260E0028 */ addiu $t6, $s0, 0x0028 ## $t6 = 00000028 -/* 013AC 808FE2EC AFAE0054 */ sw $t6, 0x0054($sp) -/* 013B0 808FE2F0 AFA80050 */ sw $t0, 0x0050($sp) +/* 013AC 808FE2EC AFAE0054 */ sw $t6, 0x0054($sp) +/* 013B0 808FE2F0 AFA80050 */ sw $t0, 0x0050($sp) /* 013B4 808FE2F4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 013B8 808FE2F8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 013BC 808FE2FC AFA90088 */ sw $t1, 0x0088($sp) + +/* 013BC 808FE2FC AFA90088 */ sw $t1, 0x0088($sp) /* 013C0 808FE300 3C0544A1 */ lui $a1, 0x44A1 ## $a1 = 44A10000 /* 013C4 808FE304 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 013C8 808FE308 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 013CC 808FE30C 34A52000 */ ori $a1, $a1, 0x2000 ## $a1 = 44A12000 -/* 013D0 808FE310 8FA40054 */ lw $a0, 0x0054($sp) +/* 013D0 808FE310 8FA40054 */ lw $a0, 0x0054($sp) /* 013D4 808FE314 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 013D8 808FE318 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 013DC 808FE31C 3C018091 */ lui $at, %hi(D_8090DB88) ## $at = 80910000 -/* 013E0 808FE320 C420DB88 */ lwc1 $f0, %lo(D_8090DB88)($at) +/* 013E0 808FE320 C420DB88 */ lwc1 $f0, %lo(D_8090DB88)($at) /* 013E4 808FE324 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 013E8 808FE328 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 -/* 013EC 808FE32C 8FA90088 */ lw $t1, 0x0088($sp) +/* 013EC 808FE32C 8FA90088 */ lw $t1, 0x0088($sp) /* 013F0 808FE330 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 013F4 808FE334 44819000 */ mtc1 $at, $f18 ## $f18 = 250.00 -/* 013F8 808FE338 8FA80050 */ lw $t0, 0x0050($sp) +/* 013F8 808FE338 8FA80050 */ lw $t0, 0x0050($sp) /* 013FC 808FE33C 3C01C385 */ lui $at, 0xC385 ## $at = C3850000 /* 01400 808FE340 44815000 */ mtc1 $at, $f10 ## $f10 = -266.00 /* 01404 808FE344 3C028091 */ lui $v0, %hi(D_8090EB2C) ## $v0 = 80910000 @@ -924,15 +924,15 @@ glabel L808FE2E0 /* 01458 808FE398 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 0145C 808FE39C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01460 808FE3A0 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 01464 808FE3A4 460A4100 */ add.s $f4, $f8, $f10 +/* 01464 808FE3A4 460A4100 */ add.s $f4, $f8, $f10 /* 01468 808FE3A8 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 /* 0146C 808FE3AC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01470 808FE3B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01474 808FE3B4 E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 01478 808FE3B8 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 0147C 808FE3BC 46083280 */ add.s $f10, $f6, $f8 +/* 0147C 808FE3BC 46083280 */ add.s $f10, $f6, $f8 /* 01480 808FE3C0 2406001E */ addiu $a2, $zero, 0x001E ## $a2 = 0000001E -/* 01484 808FE3C4 46102180 */ add.s $f6, $f4, $f16 +/* 01484 808FE3C4 46102180 */ add.s $f6, $f4, $f16 /* 01488 808FE3C8 E60A03A8 */ swc1 $f10, 0x03A8($s0) ## 000003A8 /* 0148C 808FE3CC E60603AC */ swc1 $f6, 0x03AC($s0) ## 000003AC /* 01490 808FE3D0 C5280024 */ lwc1 $f8, 0x0024($t1) ## 00000024 @@ -942,16 +942,16 @@ glabel L808FE2E0 /* 014A0 808FE3E0 C52A0028 */ lwc1 $f10, 0x0028($t1) ## 00000028 /* 014A4 808FE3E4 E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 /* 014A8 808FE3E8 C524002C */ lwc1 $f4, 0x002C($t1) ## 0000002C -/* 014AC 808FE3EC 46062201 */ sub.s $f8, $f4, $f6 -/* 014B0 808FE3F0 14610005 */ bne $v1, $at, .L808FE408 +/* 014AC 808FE3EC 46062201 */ sub.s $f8, $f4, $f6 +/* 014B0 808FE3F0 14610005 */ bne $v1, $at, .L808FE408 /* 014B4 808FE3F4 E60803B8 */ swc1 $f8, 0x03B8($s0) ## 000003B8 -/* 014B8 808FE3F8 0C00B7D5 */ jal func_8002DF54 -/* 014BC 808FE3FC AFA80050 */ sw $t0, 0x0050($sp) -/* 014C0 808FE400 8FA80050 */ lw $t0, 0x0050($sp) +/* 014B8 808FE3F8 0C00B7D5 */ jal func_8002DF54 +/* 014BC 808FE3FC AFA80050 */ sw $t0, 0x0050($sp) +/* 014C0 808FE400 8FA80050 */ lw $t0, 0x0050($sp) /* 014C4 808FE404 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE408: /* 014C8 808FE408 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 014CC 808FE40C 14610023 */ bne $v1, $at, .L808FE49C +/* 014CC 808FE40C 14610023 */ bne $v1, $at, .L808FE49C /* 014D0 808FE410 240C000F */ addiu $t4, $zero, 0x000F ## $t4 = 0000000F /* 014D4 808FE414 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 014D8 808FE418 44817000 */ mtc1 $at, $f14 ## $f14 = 15.00 @@ -960,28 +960,28 @@ glabel L808FE2E0 /* 014E4 808FE424 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 /* 014E8 808FE428 3C01431A */ lui $at, 0x431A ## $at = 431A0000 /* 014EC 808FE42C 44813000 */ mtc1 $at, $f6 ## $f6 = 154.00 -/* 014F0 808FE430 460A0100 */ add.s $f4, $f0, $f10 +/* 014F0 808FE430 460A0100 */ add.s $f4, $f0, $f10 /* 014F4 808FE434 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 014F8 808FE438 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 /* 014FC 808FE43C C60C0028 */ lwc1 $f12, 0x0028($s0) ## 00000028 -/* 01500 808FE440 46062201 */ sub.s $f8, $f4, $f6 +/* 01500 808FE440 46062201 */ sub.s $f8, $f4, $f6 /* 01504 808FE444 C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C /* 01508 808FE448 3C01429A */ lui $at, 0x429A ## $at = 429A0000 -/* 0150C 808FE44C 460A6100 */ add.s $f4, $f12, $f10 +/* 0150C 808FE44C 460A6100 */ add.s $f4, $f12, $f10 /* 01510 808FE450 E60803A4 */ swc1 $f8, 0x03A4($s0) ## 000003A4 /* 01514 808FE454 44814000 */ mtc1 $at, $f8 ## $f8 = 77.00 -/* 01518 808FE458 460E1181 */ sub.s $f6, $f2, $f14 +/* 01518 808FE458 460E1181 */ sub.s $f6, $f2, $f14 /* 0151C 808FE45C E60403A8 */ swc1 $f4, 0x03A8($s0) ## 000003A8 /* 01520 808FE460 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 01524 808FE464 46086280 */ add.s $f10, $f12, $f8 +/* 01524 808FE464 46086280 */ add.s $f10, $f12, $f8 /* 01528 808FE468 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 0152C 808FE46C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01530 808FE470 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 01534 808FE474 E60603AC */ swc1 $f6, 0x03AC($s0) ## 000003AC -/* 01538 808FE478 46045180 */ add.s $f6, $f10, $f4 +/* 01538 808FE478 46045180 */ add.s $f6, $f10, $f4 /* 0153C 808FE47C 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 01540 808FE480 A60C039C */ sh $t4, 0x039C($s0) ## 0000039C -/* 01544 808FE484 46081280 */ add.s $f10, $f2, $f8 +/* 01544 808FE484 46081280 */ add.s $f10, $f2, $f8 /* 01548 808FE488 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 0154C 808FE48C E60603B4 */ swc1 $f6, 0x03B4($s0) ## 000003B4 /* 01550 808FE490 A20D0314 */ sb $t5, 0x0314($s0) ## 00000314 @@ -991,73 +991,73 @@ glabel L808FE2E0 /* 0155C 808FE49C 8D0E1DE4 */ lw $t6, 0x1DE4($t0) ## 00001DE4 /* 01560 808FE4A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01564 808FE4A4 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 01568 808FE4A8 55E004DA */ bnel $t7, $zero, .L808FF814 +/* 01568 808FE4A8 55E004DA */ bnel $t7, $zero, .L808FF814 /* 0156C 808FE4AC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 01570 808FE4B0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01574 808FE4B4 240539D1 */ addiu $a1, $zero, 0x39D1 ## $a1 = 000039D1 -/* 01578 808FE4B8 100004D6 */ beq $zero, $zero, .L808FF814 +/* 01578 808FE4B8 100004D6 */ beq $zero, $zero, .L808FF814 /* 0157C 808FE4BC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 glabel L808FE4C0 /* 01580 808FE4C0 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 01584 808FE4C4 0311C021 */ addu $t8, $t8, $s1 +/* 01584 808FE4C4 0311C021 */ addu $t8, $t8, $s1 /* 01588 808FE4C8 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 /* 0158C 808FE4CC 3319001F */ andi $t9, $t8, 0x001F ## $t9 = 00000000 -/* 01590 808FE4D0 57200009 */ bnel $t9, $zero, .L808FE4F8 +/* 01590 808FE4D0 57200009 */ bnel $t9, $zero, .L808FE4F8 /* 01594 808FE4D4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01598 808FE4D8 8E0B0398 */ lw $t3, 0x0398($s0) ## 00000398 /* 0159C 808FE4DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015A0 808FE4E0 2D610064 */ sltiu $at, $t3, 0x0064 -/* 015A4 808FE4E4 50200004 */ beql $at, $zero, .L808FE4F8 +/* 015A0 808FE4E0 2D610064 */ sltiu $at, $t3, 0x0064 +/* 015A4 808FE4E4 50200004 */ beql $at, $zero, .L808FE4F8 /* 015A8 808FE4E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 015AC 808FE4EC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 015B0 808FE4F0 240539D1 */ addiu $a1, $zero, 0x39D1 ## $a1 = 000039D1 /* 015B4 808FE4F4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L808FE4F8: /* 015B8 808FE4F8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 015BC 808FE4FC AFA40050 */ sw $a0, 0x0050($sp) + +/* 015BC 808FE4FC AFA40050 */ sw $a0, 0x0050($sp) /* 015C0 808FE500 3C01429A */ lui $at, 0x429A ## $at = 429A0000 /* 015C4 808FE504 44813000 */ mtc1 $at, $f6 ## $f6 = 77.00 /* 015C8 808FE508 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 015CC 808FE50C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 015D0 808FE510 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 015D4 808FE514 46062200 */ add.s $f8, $f4, $f6 +/* 015D4 808FE514 46062200 */ add.s $f8, $f4, $f6 /* 015D8 808FE518 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 015DC 808FE51C 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 015E0 808FE520 44054000 */ mfc1 $a1, $f8 +/* 015E0 808FE520 44054000 */ mfc1 $a1, $f8 /* 015E4 808FE524 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 015E8 808FE528 00000000 */ nop /* 015EC 808FE52C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 015F0 808FE530 2C610032 */ sltiu $at, $v1, 0x0032 -/* 015F4 808FE534 1420001C */ bne $at, $zero, .L808FE5A8 +/* 015F0 808FE530 2C610032 */ sltiu $at, $v1, 0x0032 +/* 015F4 808FE534 1420001C */ bne $at, $zero, .L808FE5A8 /* 015F8 808FE538 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 015FC 808FE53C 1461000D */ bne $v1, $at, .L808FE574 -/* 01600 808FE540 8FA40050 */ lw $a0, 0x0050($sp) +/* 015FC 808FE53C 1461000D */ bne $v1, $at, .L808FE574 +/* 01600 808FE540 8FA40050 */ lw $a0, 0x0050($sp) /* 01604 808FE544 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01608 808FE548 24A50BFC */ addiu $a1, $a1, 0x0BFC ## $a1 = 06000BFC -/* 0160C 808FE54C 0C029490 */ jal func_800A5240 +/* 0160C 808FE54C 0C029490 */ jal func_800A5240 /* 01610 808FE550 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01614 808FE554 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01618 808FE558 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0161C 808FE55C 24840BFC */ addiu $a0, $a0, 0x0BFC ## $a0 = 06000BFC /* 01620 808FE560 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01624 808FE564 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 /* 01628 808FE568 A20C0314 */ sb $t4, 0x0314($s0) ## 00000314 -/* 0162C 808FE56C 46805120 */ cvt.s.w $f4, $f10 +/* 0162C 808FE56C 46805120 */ cvt.s.w $f4, $f10 /* 01630 808FE570 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 .L808FE574: -/* 01634 808FE574 8FA40050 */ lw $a0, 0x0050($sp) -/* 01638 808FE578 0C0295B2 */ jal func_800A56C8 +/* 01634 808FE574 8FA40050 */ lw $a0, 0x0050($sp) +/* 01638 808FE578 0C0295B2 */ jal func_800A56C8 /* 0163C 808FE57C 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 01640 808FE580 10400009 */ beq $v0, $zero, .L808FE5A8 -/* 01644 808FE584 8FA40050 */ lw $a0, 0x0050($sp) +/* 01640 808FE580 10400009 */ beq $v0, $zero, .L808FE5A8 +/* 01644 808FE584 8FA40050 */ lw $a0, 0x0050($sp) /* 01648 808FE588 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0164C 808FE58C 24A53F38 */ addiu $a1, $a1, 0x3F38 ## $a1 = 06003F38 -/* 01650 808FE590 0C0294D3 */ jal func_800A534C +/* 01650 808FE590 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01654 808FE594 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01658 808FE598 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 0165C 808FE59C 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 @@ -1065,57 +1065,57 @@ glabel L808FE4C0 /* 01664 808FE5A4 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 .L808FE5A8: /* 01668 808FE5A8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 0166C 808FE5AC 2C610047 */ sltiu $at, $v1, 0x0047 -/* 01670 808FE5B0 14200008 */ bne $at, $zero, .L808FE5D4 +/* 0166C 808FE5AC 2C610047 */ sltiu $at, $v1, 0x0047 +/* 01670 808FE5B0 14200008 */ bne $at, $zero, .L808FE5D4 /* 01674 808FE5B4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01678 808FE5B8 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 /* 0167C 808FE5BC 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 /* 01680 808FE5C0 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 01684 808FE5C4 44077000 */ mfc1 $a3, $f14 +/* 01684 808FE5C4 44077000 */ mfc1 $a3, $f14 /* 01688 808FE5C8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0168C 808FE5CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01690 808FE5D0 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE5D4: /* 01694 808FE5D4 2401008C */ addiu $at, $zero, 0x008C ## $at = 0000008C -/* 01698 808FE5D8 1461048D */ bne $v1, $at, .L808FF810 +/* 01698 808FE5D8 1461048D */ bne $v1, $at, .L808FF810 /* 0169C 808FE5DC 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 /* 016A0 808FE5E0 A60D039C */ sh $t5, 0x039C($s0) ## 0000039C /* 016A4 808FE5E4 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 016A8 808FE5E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 016AC 808FE5EC 24A53754 */ addiu $a1, $a1, 0x3754 ## $a1 = 06003754 -/* 016B0 808FE5F0 8FA40050 */ lw $a0, 0x0050($sp) -/* 016B4 808FE5F4 0C029490 */ jal func_800A5240 +/* 016B0 808FE5F0 8FA40050 */ lw $a0, 0x0050($sp) +/* 016B4 808FE5F4 0C029490 */ jal func_800A5240 /* 016B8 808FE5F8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 016BC 808FE5FC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 016C0 808FE600 0C028800 */ jal SkelAnime_GetFrameCount - + /* 016C4 808FE604 24843754 */ addiu $a0, $a0, 0x3754 ## $a0 = 06003754 /* 016C8 808FE608 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 016CC 808FE60C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 016D0 808FE610 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 016D4 808FE614 468042A0 */ cvt.s.w $f10, $f8 +/* 016D4 808FE614 468042A0 */ cvt.s.w $f10, $f8 /* 016D8 808FE618 240E0037 */ addiu $t6, $zero, 0x0037 ## $t6 = 00000037 /* 016DC 808FE61C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 016E0 808FE620 A20E0339 */ sb $t6, 0x0339($s0) ## 00000339 -/* 016E4 808FE624 00310821 */ addu $at, $at, $s1 +/* 016E4 808FE624 00310821 */ addu $at, $at, $s1 /* 016E8 808FE628 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 016EC 808FE62C E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 /* 016F0 808FE630 240539D3 */ addiu $a1, $zero, 0x39D3 ## $a1 = 000039D3 /* 016F4 808FE634 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 016F8 808FE638 E4240AFC */ swc1 $f4, 0x0AFC($at) ## 00010AFC glabel L808FE63C /* 016FC 808FE63C 260F014C */ addiu $t7, $s0, 0x014C ## $t7 = 0000014C /* 01700 808FE640 261803B4 */ addiu $t8, $s0, 0x03B4 ## $t8 = 000003B4 -/* 01704 808FE644 AFB80048 */ sw $t8, 0x0048($sp) -/* 01708 808FE648 AFAF0050 */ sw $t7, 0x0050($sp) +/* 01704 808FE644 AFB80048 */ sw $t8, 0x0048($sp) +/* 01708 808FE648 AFAF0050 */ sw $t7, 0x0050($sp) /* 0170C 808FE64C 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 /* 01710 808FE650 240B0037 */ addiu $t3, $zero, 0x0037 ## $t3 = 00000037 -/* 01714 808FE654 2F210019 */ sltiu $at, $t9, 0x0019 -/* 01718 808FE658 50200004 */ beql $at, $zero, .L808FE66C +/* 01714 808FE654 2F210019 */ sltiu $at, $t9, 0x0019 +/* 01718 808FE658 50200004 */ beql $at, $zero, .L808FE66C /* 0171C 808FE65C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 01720 808FE660 10000019 */ beq $zero, $zero, .L808FE6C8 +/* 01720 808FE660 10000019 */ beq $zero, $zero, .L808FE6C8 /* 01724 808FE664 A20B0339 */ sb $t3, 0x0339($s0) ## 00000339 /* 01728 808FE668 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 .L808FE66C: @@ -1123,27 +1123,27 @@ glabel L808FE63C /* 01730 808FE670 C6080194 */ lwc1 $f8, 0x0194($s0) ## 00000194 /* 01734 808FE674 240C0006 */ addiu $t4, $zero, 0x0006 ## $t4 = 00000006 /* 01738 808FE678 A20C0339 */ sb $t4, 0x0339($s0) ## 00000339 -/* 0173C 808FE67C 4608303C */ c.lt.s $f6, $f8 +/* 0173C 808FE67C 4608303C */ c.lt.s $f6, $f8 /* 01740 808FE680 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C /* 01744 808FE684 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 /* 01748 808FE688 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0174C 808FE68C 4500000C */ bc1f .L808FE6C0 +/* 0174C 808FE68C 4500000C */ bc1f .L808FE6C0 /* 01750 808FE690 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 /* 01754 808FE694 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 01758 808FE698 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 /* 0175C 808FE69C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 01760 808FE6A0 44817000 */ mtc1 $at, $f14 ## $f14 = 15.00 -/* 01764 808FE6A4 44070000 */ mfc1 $a3, $f0 +/* 01764 808FE6A4 44070000 */ mfc1 $a3, $f0 /* 01768 808FE6A8 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C -/* 0176C 808FE6AC 44057000 */ mfc1 $a1, $f14 +/* 0176C 808FE6AC 44057000 */ mfc1 $a1, $f14 /* 01770 808FE6B0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01774 808FE6B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01778 808FE6B8 10000004 */ beq $zero, $zero, .L808FE6CC +/* 01778 808FE6B8 10000004 */ beq $zero, $zero, .L808FE6CC /* 0177C 808FE6BC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 .L808FE6C0: /* 01780 808FE6C0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01784 808FE6C4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD .L808FE6C8: /* 01788 808FE6C8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -1151,16 +1151,16 @@ glabel L808FE63C /* 0178C 808FE6CC 00000000 */ nop /* 01790 808FE6D0 E60A01B4 */ swc1 $f10, 0x01B4($s0) ## 000001B4 /* 01794 808FE6D4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01798 808FE6D8 8FA40050 */ lw $a0, 0x0050($sp) -/* 0179C 808FE6DC 8FA40050 */ lw $a0, 0x0050($sp) -/* 017A0 808FE6E0 0C0295B2 */ jal func_800A56C8 + +/* 01798 808FE6D8 8FA40050 */ lw $a0, 0x0050($sp) +/* 0179C 808FE6DC 8FA40050 */ lw $a0, 0x0050($sp) +/* 017A0 808FE6E0 0C0295B2 */ jal func_800A56C8 /* 017A4 808FE6E4 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 017A8 808FE6E8 10400009 */ beq $v0, $zero, .L808FE710 -/* 017AC 808FE6EC 8FA40050 */ lw $a0, 0x0050($sp) +/* 017A8 808FE6E8 10400009 */ beq $v0, $zero, .L808FE710 +/* 017AC 808FE6EC 8FA40050 */ lw $a0, 0x0050($sp) /* 017B0 808FE6F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 017B4 808FE6F4 24A528A8 */ addiu $a1, $a1, 0x28A8 ## $a1 = 060028A8 -/* 017B8 808FE6F8 0C029490 */ jal func_800A5240 +/* 017B8 808FE6F8 0C029490 */ jal func_800A5240 /* 017BC 808FE6FC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 017C0 808FE700 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 017C4 808FE704 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 @@ -1172,73 +1172,73 @@ glabel L808FE63C /* 017D8 808FE718 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 017DC 808FE71C 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 017E0 808FE720 44812000 */ mtc1 $at, $f4 ## $f4 = 90.00 -/* 017E4 808FE724 46083280 */ add.s $f10, $f6, $f8 +/* 017E4 808FE724 46083280 */ add.s $f10, $f6, $f8 /* 017E8 808FE728 260403A4 */ addiu $a0, $s0, 0x03A4 ## $a0 = 000003A4 /* 017EC 808FE72C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 017F0 808FE730 3C0740CC */ lui $a3, 0x40CC ## $a3 = 40CC0000 -/* 017F4 808FE734 46045181 */ sub.s $f6, $f10, $f4 +/* 017F4 808FE734 46045181 */ sub.s $f6, $f10, $f4 /* 017F8 808FE738 34E7CCCC */ ori $a3, $a3, 0xCCCC ## $a3 = 40CCCCCC /* 017FC 808FE73C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01800 808FE740 AFA4004C */ sw $a0, 0x004C($sp) -/* 01804 808FE744 44053000 */ mfc1 $a1, $f6 +/* 01800 808FE740 AFA4004C */ sw $a0, 0x004C($sp) +/* 01804 808FE744 44053000 */ mfc1 $a1, $f6 /* 01808 808FE748 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0180C 808FE74C 00000000 */ nop /* 01810 808FE750 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 01814 808FE754 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 /* 01818 808FE758 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 0181C 808FE75C 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 01820 808FE760 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 01824 808FE764 460A4100 */ add.s $f4, $f8, $f10 +/* 01824 808FE764 460A4100 */ add.s $f4, $f8, $f10 /* 01828 808FE768 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 0182C 808FE76C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01830 808FE770 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01834 808FE774 46062201 */ sub.s $f8, $f4, $f6 +/* 01834 808FE774 46062201 */ sub.s $f8, $f4, $f6 /* 01838 808FE778 260403A8 */ addiu $a0, $s0, 0x03A8 ## $a0 = 000003A8 /* 0183C 808FE77C 3C074150 */ lui $a3, 0x4150 ## $a3 = 41500000 -/* 01840 808FE780 460A4101 */ sub.s $f4, $f8, $f10 -/* 01844 808FE784 44052000 */ mfc1 $a1, $f4 +/* 01840 808FE780 460A4101 */ sub.s $f4, $f8, $f10 +/* 01844 808FE784 44052000 */ mfc1 $a1, $f4 /* 01848 808FE788 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0184C 808FE78C 00000000 */ nop /* 01850 808FE790 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 01854 808FE794 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 01858 808FE798 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 0185C 808FE79C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01860 808FE7A0 3C07406C */ lui $a3, 0x406C ## $a3 = 406C0000 -/* 01864 808FE7A4 460C3200 */ add.s $f8, $f6, $f12 +/* 01864 808FE7A4 460C3200 */ add.s $f8, $f6, $f12 /* 01868 808FE7A8 34E7CCCC */ ori $a3, $a3, 0xCCCC ## $a3 = 406CCCCC /* 0186C 808FE7AC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01870 808FE7B0 8FA40048 */ lw $a0, 0x0048($sp) -/* 01874 808FE7B4 44054000 */ mfc1 $a1, $f8 +/* 01870 808FE7B0 8FA40048 */ lw $a0, 0x0048($sp) +/* 01874 808FE7B4 44054000 */ mfc1 $a1, $f8 /* 01878 808FE7B8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0187C 808FE7BC 00000000 */ nop /* 01880 808FE7C0 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 01884 808FE7C4 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 01888 808FE7C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0188C 808FE7CC 54610008 */ bnel $v1, $at, .L808FE7F0 -/* 01890 808FE7D0 2C610033 */ sltiu $at, $v1, 0x0033 +/* 0188C 808FE7CC 54610008 */ bnel $v1, $at, .L808FE7F0 +/* 01890 808FE7D0 2C610033 */ sltiu $at, $v1, 0x0033 /* 01894 808FE7D4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01898 808FE7D8 240539D4 */ addiu $a1, $zero, 0x39D4 ## $a1 = 000039D4 /* 0189C 808FE7DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 018A0 808FE7E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 018A4 808FE7E4 2405396D */ addiu $a1, $zero, 0x396D ## $a1 = 0000396D /* 018A8 808FE7E8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 018AC 808FE7EC 2C610033 */ sltiu $at, $v1, 0x0033 +/* 018AC 808FE7EC 2C610033 */ sltiu $at, $v1, 0x0033 .L808FE7F0: -/* 018B0 808FE7F0 10200002 */ beq $at, $zero, .L808FE7FC +/* 018B0 808FE7F0 10200002 */ beq $at, $zero, .L808FE7FC /* 018B4 808FE7F4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 018B8 808FE7F8 A3AD008D */ sb $t5, 0x008D($sp) +/* 018B8 808FE7F8 A3AD008D */ sb $t5, 0x008D($sp) .L808FE7FC: -/* 018BC 808FE7FC 2C61003C */ sltiu $at, $v1, 0x003C -/* 018C0 808FE800 14200403 */ bne $at, $zero, .L808FF810 +/* 018BC 808FE7FC 2C61003C */ sltiu $at, $v1, 0x003C +/* 018C0 808FE800 14200403 */ bne $at, $zero, .L808FF810 /* 018C4 808FE804 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 018C8 808FE808 0C030129 */ jal func_800C04A4 +/* 018C8 808FE808 0C030129 */ jal func_800C04A4 /* 018CC 808FE80C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 018D0 808FE810 8FA3004C */ lw $v1, 0x004C($sp) +/* 018D0 808FE810 8FA3004C */ lw $v1, 0x004C($sp) /* 018D4 808FE814 240D0011 */ addiu $t5, $zero, 0x0011 ## $t5 = 00000011 /* 018D8 808FE818 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 018DC 808FE81C 8C6F0000 */ lw $t7, 0x0000($v1) ## 00000000 @@ -1265,41 +1265,41 @@ glabel L808FE63C /* 01930 808FE870 AC4C0058 */ sw $t4, 0x0058($v0) ## 00000058 /* 01934 808FE874 A60D039C */ sh $t5, 0x039C($s0) ## 0000039C /* 01938 808FE878 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 0193C 808FE87C 0C23F442 */ jal func_808FD108 +/* 0193C 808FE87C 0C23F442 */ jal func_808FD108 /* 01940 808FE880 A20E0337 */ sb $t6, 0x0337($s0) ## 00000337 -/* 01944 808FE884 8FA40050 */ lw $a0, 0x0050($sp) -/* 01948 808FE888 0C0295BC */ jal func_800A56F0 +/* 01944 808FE884 8FA40050 */ lw $a0, 0x0050($sp) +/* 01948 808FE888 0C0295BC */ jal SkelAnime_Free /* 0194C 808FE88C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01950 808FE890 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 01954 808FE894 24C65970 */ addiu $a2, $a2, 0x5970 ## $a2 = 06025970 /* 01958 808FE898 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0195C 808FE89C 8FA50050 */ lw $a1, 0x0050($sp) +/* 0195C 808FE89C 8FA50050 */ lw $a1, 0x0050($sp) /* 01960 808FE8A0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01964 808FE8A4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01968 808FE8A8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0196C 808FE8AC 0C0291BE */ jal func_800A46F8 -/* 01970 808FE8B0 AFA00018 */ sw $zero, 0x0018($sp) +/* 01964 808FE8A4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01968 808FE8A8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0196C 808FE8AC 0C0291BE */ jal SkelAnime_InitSV +/* 01970 808FE8B0 AFA00018 */ sw $zero, 0x0018($sp) /* 01974 808FE8B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01978 808FE8B8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0197C 808FE8BC 2406017E */ addiu $a2, $zero, 0x017E ## $a2 = 0000017E -/* 01980 808FE8C0 0C23F442 */ jal func_808FD108 +/* 01980 808FE8C0 0C23F442 */ jal func_808FD108 /* 01984 808FE8C4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01988 808FE8C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0198C 808FE8CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01990 808FE8D0 0C00B7D5 */ jal func_8002DF54 +/* 01990 808FE8D0 0C00B7D5 */ jal func_8002DF54 /* 01994 808FE8D4 24060054 */ addiu $a2, $zero, 0x0054 ## $a2 = 00000054 /* 01998 808FE8D8 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 0199C 808FE8DC 100003CC */ beq $zero, $zero, .L808FF810 +/* 0199C 808FE8DC 100003CC */ beq $zero, $zero, .L808FF810 /* 019A0 808FE8E0 A20F0314 */ sb $t7, 0x0314($s0) ## 00000314 glabel L808FE8E4 /* 019A4 808FE8E4 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 /* 019A8 808FE8E8 A2180339 */ sb $t8, 0x0339($s0) ## 00000339 /* 019AC 808FE8EC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 019B0 808FE8F0 AFA40050 */ sw $a0, 0x0050($sp) +/* 019B0 808FE8F0 AFA40050 */ sw $a0, 0x0050($sp) /* 019B4 808FE8F4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 019B8 808FE8F8 AFA90088 */ sw $t1, 0x0088($sp) -/* 019BC 808FE8FC 8FA90088 */ lw $t1, 0x0088($sp) + +/* 019B8 808FE8F8 AFA90088 */ sw $t1, 0x0088($sp) +/* 019BC 808FE8FC 8FA90088 */ lw $t1, 0x0088($sp) /* 019C0 808FE900 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 019C4 808FE904 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 /* 019C8 808FE908 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -1307,7 +1307,7 @@ glabel L808FE8E4 /* 019D0 808FE910 C52A0024 */ lwc1 $f10, 0x0024($t1) ## 00000024 /* 019D4 808FE914 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 019D8 808FE918 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 -/* 019DC 808FE91C 460C5101 */ sub.s $f4, $f10, $f12 +/* 019DC 808FE91C 460C5101 */ sub.s $f4, $f10, $f12 /* 019E0 808FE920 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 019E4 808FE924 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 /* 019E8 808FE928 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -1315,30 +1315,30 @@ glabel L808FE8E4 /* 019F0 808FE930 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 /* 019F4 808FE934 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 /* 019F8 808FE938 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 019FC 808FE93C 460C3200 */ add.s $f8, $f6, $f12 +/* 019FC 808FE93C 460C3200 */ add.s $f8, $f6, $f12 /* 01A00 808FE940 240B0012 */ addiu $t3, $zero, 0x0012 ## $t3 = 00000012 /* 01A04 808FE944 24A50380 */ addiu $a1, $a1, 0x0380 ## $a1 = 06010380 /* 01A08 808FE948 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01A0C 808FE94C E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 01A10 808FE950 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C -/* 01A14 808FE954 46025100 */ add.s $f4, $f10, $f2 +/* 01A14 808FE954 46025100 */ add.s $f4, $f10, $f2 /* 01A18 808FE958 E60403AC */ swc1 $f4, 0x03AC($s0) ## 000003AC /* 01A1C 808FE95C C5260024 */ lwc1 $f6, 0x0024($t1) ## 00000024 /* 01A20 808FE960 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 /* 01A24 808FE964 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 01A28 808FE968 E60603B0 */ swc1 $f6, 0x03B0($s0) ## 000003B0 /* 01A2C 808FE96C C5280028 */ lwc1 $f8, 0x0028($t1) ## 00000028 -/* 01A30 808FE970 460E4280 */ add.s $f10, $f8, $f14 -/* 01A34 808FE974 46045180 */ add.s $f6, $f10, $f4 -/* 01A38 808FE978 46103201 */ sub.s $f8, $f6, $f16 +/* 01A30 808FE970 460E4280 */ add.s $f10, $f8, $f14 +/* 01A34 808FE974 46045180 */ add.s $f6, $f10, $f4 +/* 01A38 808FE978 46103201 */ sub.s $f8, $f6, $f16 /* 01A3C 808FE97C E60803B4 */ swc1 $f8, 0x03B4($s0) ## 000003B4 /* 01A40 808FE980 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C -/* 01A44 808FE984 172103A2 */ bne $t9, $at, .L808FF810 +/* 01A44 808FE984 172103A2 */ bne $t9, $at, .L808FF810 /* 01A48 808FE988 E60A03B8 */ swc1 $f10, 0x03B8($s0) ## 000003B8 /* 01A4C 808FE98C A60B039C */ sh $t3, 0x039C($s0) ## 0000039C /* 01A50 808FE990 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 01A54 808FE994 0C029490 */ jal func_800A5240 -/* 01A58 808FE998 8FA40050 */ lw $a0, 0x0050($sp) +/* 01A54 808FE994 0C029490 */ jal func_800A5240 +/* 01A58 808FE998 8FA40050 */ lw $a0, 0x0050($sp) /* 01A5C 808FE99C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 01A60 808FE9A0 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 /* 01A64 808FE9A4 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -1346,34 +1346,34 @@ glabel L808FE8E4 /* 01A6C 808FE9AC C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 /* 01A70 808FE9B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01A74 808FE9B4 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 -/* 01A78 808FE9B8 46060200 */ add.s $f8, $f0, $f6 +/* 01A78 808FE9B8 46060200 */ add.s $f8, $f0, $f6 /* 01A7C 808FE9BC 44815000 */ mtc1 $at, $f10 ## $f10 = 350.00 /* 01A80 808FE9C0 E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 /* 01A84 808FE9C4 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01A88 808FE9C8 460A4101 */ sub.s $f4, $f8, $f10 +/* 01A88 808FE9C8 460A4101 */ sub.s $f4, $f8, $f10 /* 01A8C 808FE9CC C60C0028 */ lwc1 $f12, 0x0028($s0) ## 00000028 /* 01A90 808FE9D0 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 -/* 01A94 808FE9D4 46100200 */ add.s $f8, $f0, $f16 +/* 01A94 808FE9D4 46100200 */ add.s $f8, $f0, $f16 /* 01A98 808FE9D8 C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C /* 01A9C 808FE9DC 240C4000 */ addiu $t4, $zero, 0x4000 ## $t4 = 00004000 -/* 01AA0 808FE9E0 46102181 */ sub.s $f6, $f4, $f16 +/* 01AA0 808FE9E0 46102181 */ sub.s $f6, $f4, $f16 /* 01AA4 808FE9E4 E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 /* 01AA8 808FE9E8 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 -/* 01AAC 808FE9EC 460A6100 */ add.s $f4, $f12, $f10 +/* 01AAC 808FE9EC 460A6100 */ add.s $f4, $f12, $f10 /* 01AB0 808FE9F0 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 /* 01AB4 808FE9F4 E60C03A8 */ swc1 $f12, 0x03A8($s0) ## 000003A8 /* 01AB8 808FE9F8 E60203AC */ swc1 $f2, 0x03AC($s0) ## 000003AC /* 01ABC 808FE9FC E60403B4 */ swc1 $f4, 0x03B4($s0) ## 000003B4 -/* 01AC0 808FEA00 10000383 */ beq $zero, $zero, .L808FF810 +/* 01AC0 808FEA00 10000383 */ beq $zero, $zero, .L808FF810 /* 01AC4 808FEA04 E60203B8 */ swc1 $f2, 0x03B8($s0) ## 000003B8 glabel L808FEA08 /* 01AC8 808FEA08 8E0E0398 */ lw $t6, 0x0398($s0) ## 00000398 /* 01ACC 808FEA0C 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 /* 01AD0 808FEA10 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 01AD4 808FEA14 15C10003 */ bne $t6, $at, .L808FEA24 +/* 01AD4 808FEA14 15C10003 */ bne $t6, $at, .L808FEA24 /* 01AD8 808FEA18 A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 /* 01ADC 808FEA1C 0C03E803 */ jal Audio_SetBGM - + /* 01AE0 808FEA20 24040065 */ addiu $a0, $zero, 0x0065 ## $a0 = 00000065 .L808FEA24: /* 01AE4 808FEA24 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 @@ -1381,29 +1381,29 @@ glabel L808FEA08 /* 01AEC 808FEA2C 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C /* 01AF0 808FEA30 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 /* 01AF4 808FEA34 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01AF8 808FEA38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01AFC 808FEA3C 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 01B00 808FEA40 44814000 */ mtc1 $at, $f8 ## $f8 = 500.00 /* 01B04 808FEA44 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 01B08 808FEA48 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 01B0C 808FEA4C 44812000 */ mtc1 $at, $f4 ## $f4 = 350.00 -/* 01B10 808FEA50 46083280 */ add.s $f10, $f6, $f8 +/* 01B10 808FEA50 46083280 */ add.s $f10, $f6, $f8 /* 01B14 808FEA54 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01B18 808FEA58 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01B1C 808FEA5C 260403A4 */ addiu $a0, $s0, 0x03A4 ## $a0 = 000003A4 -/* 01B20 808FEA60 46045181 */ sub.s $f6, $f10, $f4 +/* 01B20 808FEA60 46045181 */ sub.s $f6, $f10, $f4 /* 01B24 808FEA64 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 01B28 808FEA68 44053000 */ mfc1 $a1, $f6 +/* 01B28 808FEA68 44053000 */ mfc1 $a1, $f6 /* 01B2C 808FEA6C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B30 808FEA70 00000000 */ nop /* 01B34 808FEA74 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01B38 808FEA78 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01B3C 808FEA7C 260403B0 */ addiu $a0, $s0, 0x03B0 ## $a0 = 000003B0 /* 01B40 808FEA80 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 /* 01B44 808FEA84 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B48 808FEA88 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 01B4C 808FEA8C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01B50 808FEA90 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 @@ -1411,15 +1411,15 @@ glabel L808FEA08 /* 01B58 808FEA98 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01B5C 808FEA9C 26040228 */ addiu $a0, $s0, 0x0228 ## $a0 = 00000228 /* 01B60 808FEAA0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B64 808FEAA4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01B68 808FEAA8 8E0F0398 */ lw $t7, 0x0398($s0) ## 00000398 /* 01B6C 808FEAAC 24010041 */ addiu $at, $zero, 0x0041 ## $at = 00000041 /* 01B70 808FEAB0 24180013 */ addiu $t8, $zero, 0x0013 ## $t8 = 00000013 -/* 01B74 808FEAB4 55E10357 */ bnel $t7, $at, .L808FF814 +/* 01B74 808FEAB4 55E10357 */ bnel $t7, $at, .L808FF814 /* 01B78 808FEAB8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 01B7C 808FEABC A618039C */ sh $t8, 0x039C($s0) ## 0000039C -/* 01B80 808FEAC0 10000353 */ beq $zero, $zero, .L808FF810 +/* 01B80 808FEAC0 10000353 */ beq $zero, $zero, .L808FF810 /* 01B84 808FEAC4 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L808FEAC8 /* 01B88 808FEAC8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -1427,51 +1427,51 @@ glabel L808FEAC8 /* 01B90 808FEAD0 C6080394 */ lwc1 $f8, 0x0394($s0) ## 00000394 /* 01B94 808FEAD4 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 /* 01B98 808FEAD8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01B9C 808FEADC 460A4100 */ add.s $f4, $f8, $f10 +/* 01B9C 808FEADC 460A4100 */ add.s $f4, $f8, $f10 /* 01BA0 808FEAE0 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01BA4 808FEAE4 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 /* 01BA8 808FEAE8 8E0B0398 */ lw $t3, 0x0398($s0) ## 00000398 /* 01BAC 808FEAEC E6040394 */ swc1 $f4, 0x0394($s0) ## 00000394 -/* 01BB0 808FEAF0 46003200 */ add.s $f8, $f6, $f0 +/* 01BB0 808FEAF0 46003200 */ add.s $f8, $f6, $f0 /* 01BB4 808FEAF4 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 /* 01BB8 808FEAF8 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01BBC 808FEAFC 460A0101 */ sub.s $f4, $f0, $f10 +/* 01BBC 808FEAFC 460A0101 */ sub.s $f4, $f0, $f10 /* 01BC0 808FEB00 A2190339 */ sb $t9, 0x0339($s0) ## 00000339 /* 01BC4 808FEB04 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 01BC8 808FEB08 15610341 */ bne $t3, $at, .L808FF810 +/* 01BC8 808FEB08 15610341 */ bne $t3, $at, .L808FF810 /* 01BCC 808FEB0C E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 01BD0 808FEB10 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 01BD4 808FEB14 44814000 */ mtc1 $at, $f8 ## $f8 = 250.00 /* 01BD8 808FEB18 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 01BDC 808FEB1C 240C0014 */ addiu $t4, $zero, 0x0014 ## $t4 = 00000014 /* 01BE0 808FEB20 A60C039C */ sh $t4, 0x039C($s0) ## 0000039C -/* 01BE4 808FEB24 46083280 */ add.s $f10, $f6, $f8 +/* 01BE4 808FEB24 46083280 */ add.s $f10, $f6, $f8 /* 01BE8 808FEB28 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 01BEC 808FEB2C 3C018091 */ lui $at, %hi(D_8090DB8C) ## $at = 80910000 /* 01BF0 808FEB30 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01BF4 808FEB34 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 01BF8 808FEB38 C424DB8C */ lwc1 $f4, %lo(D_8090DB8C)($at) +/* 01BF8 808FEB38 C424DB8C */ lwc1 $f4, %lo(D_8090DB8C)($at) /* 01BFC 808FEB3C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01C00 808FEB40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01C04 808FEB44 24060053 */ addiu $a2, $zero, 0x0053 ## $a2 = 00000053 /* 01C08 808FEB48 E6060394 */ swc1 $f6, 0x0394($s0) ## 00000394 -/* 01C0C 808FEB4C 0C00B7D5 */ jal func_8002DF54 +/* 01C0C 808FEB4C 0C00B7D5 */ jal func_8002DF54 /* 01C10 808FEB50 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 /* 01C14 808FEB54 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01C18 808FEB58 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 01C1C 808FEB5C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01C20 808FEB60 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 /* 01C24 808FEB64 E608030C */ swc1 $f8, 0x030C($s0) ## 0000030C -/* 01C28 808FEB68 10000329 */ beq $zero, $zero, .L808FF810 +/* 01C28 808FEB68 10000329 */ beq $zero, $zero, .L808FF810 /* 01C2C 808FEB6C E60A0228 */ swc1 $f10, 0x0228($s0) ## 00000228 glabel L808FEB70 /* 01C30 808FEB70 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 /* 01C34 808FEB74 A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 /* 01C38 808FEB78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01C3C 808FEB7C AFA40050 */ sw $a0, 0x0050($sp) +/* 01C3C 808FEB7C AFA40050 */ sw $a0, 0x0050($sp) /* 01C40 808FEB80 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01C44 808FEB84 AFA90088 */ sw $t1, 0x0088($sp) + +/* 01C44 808FEB84 AFA90088 */ sw $t1, 0x0088($sp) /* 01C48 808FEB88 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01C4C 808FEB8C 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 /* 01C50 808FEB90 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -1486,58 +1486,58 @@ glabel L808FEB70 /* 01C74 808FEBB4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01C78 808FEBB8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 01C7C 808FEBBC 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 01C80 808FEBC0 8FA90088 */ lw $t1, 0x0088($sp) -/* 01C84 808FEBC4 46002180 */ add.s $f6, $f4, $f0 +/* 01C80 808FEBC0 8FA90088 */ lw $t1, 0x0088($sp) +/* 01C84 808FEBC4 46002180 */ add.s $f6, $f4, $f0 /* 01C88 808FEBC8 3C018091 */ lui $at, %hi(D_8090DB90) ## $at = 80910000 /* 01C8C 808FEBCC 240EC000 */ addiu $t6, $zero, 0xC000 ## $t6 = FFFFC000 -/* 01C90 808FEBD0 46080281 */ sub.s $f10, $f0, $f8 +/* 01C90 808FEBD0 46080281 */ sub.s $f10, $f0, $f8 /* 01C94 808FEBD4 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 01C98 808FEBD8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01C9C 808FEBDC 460C9201 */ sub.s $f8, $f18, $f12 +/* 01C9C 808FEBDC 460C9201 */ sub.s $f8, $f18, $f12 /* 01CA0 808FEBE0 E60A0060 */ swc1 $f10, 0x0060($s0) ## 00000060 /* 01CA4 808FEBE4 E5320024 */ swc1 $f18, 0x0024($t1) ## 00000024 -/* 01CA8 808FEBE8 C424DB90 */ lwc1 $f4, %lo(D_8090DB90)($at) +/* 01CA8 808FEBE8 C424DB90 */ lwc1 $f4, %lo(D_8090DB90)($at) /* 01CAC 808FEBEC 3C01C385 */ lui $at, 0xC385 ## $at = C3850000 /* 01CB0 808FEBF0 44813000 */ mtc1 $at, $f6 ## $f6 = -266.00 /* 01CB4 808FEBF4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01CB8 808FEBF8 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 /* 01CBC 808FEBFC E5240028 */ swc1 $f4, 0x0028($t1) ## 00000028 /* 01CC0 808FEC00 A52E00B6 */ sh $t6, 0x00B6($t1) ## 000000B6 -/* 01CC4 808FEC04 460A4101 */ sub.s $f4, $f8, $f10 +/* 01CC4 808FEC04 460A4101 */ sub.s $f4, $f8, $f10 /* 01CC8 808FEC08 E526002C */ swc1 $f6, 0x002C($t1) ## 0000002C /* 01CCC 808FEC0C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 01CD0 808FEC10 240F0015 */ addiu $t7, $zero, 0x0015 ## $t7 = 00000015 /* 01CD4 808FEC14 E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 01CD8 808FEC18 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 /* 01CDC 808FEC1C 24A50380 */ addiu $a1, $a1, 0x0380 ## $a1 = 06010380 -/* 01CE0 808FEC20 460C3200 */ add.s $f8, $f6, $f12 -/* 01CE4 808FEC24 46104281 */ sub.s $f10, $f8, $f16 +/* 01CE0 808FEC20 460C3200 */ add.s $f8, $f6, $f12 +/* 01CE4 808FEC24 46104281 */ sub.s $f10, $f8, $f16 /* 01CE8 808FEC28 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 01CEC 808FEC2C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 01CF0 808FEC30 E60A03A8 */ swc1 $f10, 0x03A8($s0) ## 000003A8 /* 01CF4 808FEC34 C524002C */ lwc1 $f4, 0x002C($t1) ## 0000002C -/* 01CF8 808FEC38 46022181 */ sub.s $f6, $f4, $f2 -/* 01CFC 808FEC3C 46083280 */ add.s $f10, $f6, $f8 +/* 01CF8 808FEC38 46022181 */ sub.s $f6, $f4, $f2 +/* 01CFC 808FEC3C 46083280 */ add.s $f10, $f6, $f8 /* 01D00 808FEC40 E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 01D04 808FEC44 C5240024 */ lwc1 $f4, 0x0024($t1) ## 00000024 /* 01D08 808FEC48 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 /* 01D0C 808FEC4C 3C018091 */ lui $at, %hi(D_8090DB94) ## $at = 80910000 /* 01D10 808FEC50 E60403B0 */ swc1 $f4, 0x03B0($s0) ## 000003B0 /* 01D14 808FEC54 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 -/* 01D18 808FEC58 460E3200 */ add.s $f8, $f6, $f14 -/* 01D1C 808FEC5C 460A4100 */ add.s $f4, $f8, $f10 -/* 01D20 808FEC60 46022181 */ sub.s $f6, $f4, $f2 -/* 01D24 808FEC64 46103200 */ add.s $f8, $f6, $f16 +/* 01D18 808FEC58 460E3200 */ add.s $f8, $f6, $f14 +/* 01D1C 808FEC5C 460A4100 */ add.s $f4, $f8, $f10 +/* 01D20 808FEC60 46022181 */ sub.s $f6, $f4, $f2 +/* 01D24 808FEC64 46103200 */ add.s $f8, $f6, $f16 /* 01D28 808FEC68 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01D2C 808FEC6C E60803B4 */ swc1 $f8, 0x03B4($s0) ## 000003B4 /* 01D30 808FEC70 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C /* 01D34 808FEC74 E60A03B8 */ swc1 $f10, 0x03B8($s0) ## 000003B8 -/* 01D38 808FEC78 C420DB94 */ lwc1 $f0, %lo(D_8090DB94)($at) +/* 01D38 808FEC78 C420DB94 */ lwc1 $f0, %lo(D_8090DB94)($at) /* 01D3C 808FEC7C 3C018091 */ lui $at, %hi(D_8090DB98) ## $at = 80910000 -/* 01D40 808FEC80 C424DB98 */ lwc1 $f4, %lo(D_8090DB98)($at) -/* 01D44 808FEC84 4600303E */ c.le.s $f6, $f0 +/* 01D40 808FEC80 C424DB98 */ lwc1 $f4, %lo(D_8090DB98)($at) +/* 01D44 808FEC84 4600303E */ c.le.s $f6, $f0 /* 01D48 808FEC88 E60403BC */ swc1 $f4, 0x03BC($s0) ## 000003BC -/* 01D4C 808FEC8C 450202E1 */ bc1fl .L808FF814 +/* 01D4C 808FEC8C 450202E1 */ bc1fl .L808FF814 /* 01D50 808FEC90 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 01D54 808FEC94 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 01D58 808FEC98 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 @@ -1545,46 +1545,46 @@ glabel L808FEB70 /* 01D60 808FECA0 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 01D64 808FECA4 E60E0420 */ swc1 $f14, 0x0420($s0) ## 00000420 /* 01D68 808FECA8 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 -/* 01D6C 808FECAC 44061000 */ mfc1 $a2, $f2 -/* 01D70 808FECB0 0C029490 */ jal func_800A5240 -/* 01D74 808FECB4 8FA40050 */ lw $a0, 0x0050($sp) +/* 01D6C 808FECAC 44061000 */ mfc1 $a2, $f2 +/* 01D70 808FECB0 0C029490 */ jal func_800A5240 +/* 01D74 808FECB4 8FA40050 */ lw $a0, 0x0050($sp) /* 01D78 808FECB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D7C 808FECBC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01D80 808FECC0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01D84 808FECC4 0C23F535 */ jal func_808FD4D4 +/* 01D84 808FECC4 0C23F535 */ jal func_808FD4D4 /* 01D88 808FECC8 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 /* 01D8C 808FECCC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 01D90 808FECD0 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 /* 01D94 808FECD4 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 01D98 808FECD8 0C02A7DB */ jal func_800A9F6C +/* 01D98 808FECD8 0C02A7DB */ jal func_800A9F6C /* 01D9C 808FECDC 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 01DA0 808FECE0 100002CC */ beq $zero, $zero, .L808FF814 +/* 01DA0 808FECE0 100002CC */ beq $zero, $zero, .L808FF814 /* 01DA4 808FECE4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 glabel L808FECE8 /* 01DA8 808FECE8 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 /* 01DAC 808FECEC A2180339 */ sb $t8, 0x0339($s0) ## 00000339 /* 01DB0 808FECF0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 01DB4 808FECF4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01DB8 808FECF8 3C040001 */ lui $a0, 0x0001 ## $a0 = 00010000 -/* 01DBC 808FECFC 00912021 */ addu $a0, $a0, $s1 +/* 01DBC 808FECFC 00912021 */ addu $a0, $a0, $s1 /* 01DC0 808FED00 8C841DE4 */ lw $a0, 0x1DE4($a0) ## 00011DE4 -/* 01DC4 808FED04 000423C0 */ sll $a0, $a0, 15 -/* 01DC8 808FED08 00042400 */ sll $a0, $a0, 16 +/* 01DC4 808FED04 000423C0 */ sll $a0, $a0, 15 +/* 01DC8 808FED08 00042400 */ sll $a0, $a0, 16 /* 01DCC 808FED0C 0C01DE0D */ jal Math_Coss ## coss? -/* 01DD0 808FED10 00042403 */ sra $a0, $a0, 16 +/* 01DD0 808FED10 00042403 */ sra $a0, $a0, 16 /* 01DD4 808FED14 C6080420 */ lwc1 $f8, 0x0420($s0) ## 00000420 /* 01DD8 808FED18 26040420 */ addiu $a0, $s0, 0x0420 ## $a0 = 00000420 /* 01DDC 808FED1C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 01DE0 808FED20 46080282 */ mul.s $f10, $f0, $f8 +/* 01DE0 808FED20 46080282 */ mul.s $f10, $f0, $f8 /* 01DE4 808FED24 3C063F40 */ lui $a2, 0x3F40 ## $a2 = 3F400000 /* 01DE8 808FED28 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 01DEC 808FED2C E60A041C */ swc1 $f10, 0x041C($s0) ## 0000041C /* 01DF0 808FED30 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 /* 01DF4 808FED34 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 01DF8 808FED38 172102B5 */ bne $t9, $at, .L808FF810 +/* 01DF8 808FED38 172102B5 */ bne $t9, $at, .L808FF810 /* 01DFC 808FED3C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01E00 808FED40 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 /* 01E04 808FED44 240B0016 */ addiu $t3, $zero, 0x0016 ## $t3 = 00000016 @@ -1594,75 +1594,75 @@ glabel L808FED50 /* 01E10 808FED50 8E0C0398 */ lw $t4, 0x0398($s0) ## 00000398 /* 01E14 808FED54 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01E18 808FED58 240D0007 */ addiu $t5, $zero, 0x0007 ## $t5 = 00000007 -/* 01E1C 808FED5C 2D81003C */ sltiu $at, $t4, 0x003C -/* 01E20 808FED60 50200003 */ beql $at, $zero, .L808FED70 +/* 01E1C 808FED5C 2D81003C */ sltiu $at, $t4, 0x003C +/* 01E20 808FED60 50200003 */ beql $at, $zero, .L808FED70 /* 01E24 808FED64 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 01E28 808FED68 A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 /* 01E2C 808FED6C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 .L808FED70: /* 01E30 808FED70 3C018091 */ lui $at, %hi(D_8090DB9C) ## $at = 80910000 -/* 01E34 808FED74 C430DB9C */ lwc1 $f16, %lo(D_8090DB9C)($at) +/* 01E34 808FED74 C430DB9C */ lwc1 $f16, %lo(D_8090DB9C)($at) /* 01E38 808FED78 E61203BC */ swc1 $f18, 0x03BC($s0) ## 000003BC /* 01E3C 808FED7C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 01E40 808FED80 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 /* 01E44 808FED84 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01E48 808FED88 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01E4C 808FED8C 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C /* 01E50 808FED90 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 01E54 808FED94 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01E58 808FED98 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 01E5C 808FED9C 2C610033 */ sltiu $at, $v1, 0x0033 -/* 01E60 808FEDA0 14200009 */ bne $at, $zero, .L808FEDC8 +/* 01E5C 808FED9C 2C610033 */ sltiu $at, $v1, 0x0033 +/* 01E60 808FEDA0 14200009 */ bne $at, $zero, .L808FEDC8 /* 01E64 808FEDA4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01E68 808FEDA8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 01E6C 808FEDAC 3C073CCC */ lui $a3, 0x3CCC ## $a3 = 3CCC0000 /* 01E70 808FEDB0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3CCCCCCD -/* 01E74 808FEDB4 44050000 */ mfc1 $a1, $f0 -/* 01E78 808FEDB8 44060000 */ mfc1 $a2, $f0 +/* 01E74 808FEDB4 44050000 */ mfc1 $a1, $f0 +/* 01E78 808FEDB8 44060000 */ mfc1 $a2, $f0 /* 01E7C 808FEDBC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01E80 808FEDC0 26040224 */ addiu $a0, $s0, 0x0224 ## $a0 = 00000224 /* 01E84 808FEDC4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEDC8: /* 01E88 808FEDC8 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 01E8C 808FEDCC 14610003 */ bne $v1, $at, .L808FEDDC +/* 01E8C 808FEDCC 14610003 */ bne $v1, $at, .L808FEDDC /* 01E90 808FEDD0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01E94 808FEDD4 A20E0336 */ sb $t6, 0x0336($s0) ## 00000336 /* 01E98 808FEDD8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEDDC: /* 01E9C 808FEDDC 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -/* 01EA0 808FEDE0 1461001E */ bne $v1, $at, .L808FEE5C +/* 01EA0 808FEDE0 1461001E */ bne $v1, $at, .L808FEE5C /* 01EA4 808FEDE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01EA8 808FEDE8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01EAC 808FEDEC 24060153 */ addiu $a2, $zero, 0x0153 ## $a2 = 00000153 -/* 01EB0 808FEDF0 0C23F442 */ jal func_808FD108 +/* 01EB0 808FEDF0 0C23F442 */ jal func_808FD108 /* 01EB4 808FEDF4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01EB8 808FEDF8 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 /* 01EBC 808FEDFC 24421A90 */ addiu $v0, $v0, 0x1A90 ## $v0 = 06021A90 -/* 01EC0 808FEE00 00027900 */ sll $t7, $v0, 4 -/* 01EC4 808FEE04 000FC702 */ srl $t8, $t7, 28 -/* 01EC8 808FEE08 0018C880 */ sll $t9, $t8, 2 +/* 01EC0 808FEE00 00027900 */ sll $t7, $v0, 4 +/* 01EC4 808FEE04 000FC702 */ srl $t8, $t7, 28 +/* 01EC8 808FEE08 0018C880 */ sll $t9, $t8, 2 /* 01ECC 808FEE0C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 01ED0 808FEE10 01795821 */ addu $t3, $t3, $t9 +/* 01ED0 808FEE10 01795821 */ addu $t3, $t3, $t9 /* 01ED4 808FEE14 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01ED8 808FEE18 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 /* 01EDC 808FEE1C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01EE0 808FEE20 00416024 */ and $t4, $v0, $at +/* 01EE0 808FEE20 00416024 */ and $t4, $v0, $at /* 01EE4 808FEE24 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01EE8 808FEE28 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 /* 01EEC 808FEE2C 240D00B4 */ addiu $t5, $zero, 0x00B4 ## $t5 = 000000B4 /* 01EF0 808FEE30 240E0080 */ addiu $t6, $zero, 0x0080 ## $t6 = 00000080 -/* 01EF4 808FEE34 016C3021 */ addu $a2, $t3, $t4 -/* 01EF8 808FEE38 00C13021 */ addu $a2, $a2, $at -/* 01EFC 808FEE3C AFAE0014 */ sw $t6, 0x0014($sp) -/* 01F00 808FEE40 AFAD0010 */ sw $t5, 0x0010($sp) -/* 01F04 808FEE44 AFAF0018 */ sw $t7, 0x0018($sp) +/* 01EF4 808FEE34 016C3021 */ addu $a2, $t3, $t4 +/* 01EF8 808FEE38 00C13021 */ addu $a2, $a2, $at +/* 01EFC 808FEE3C AFAE0014 */ sw $t6, 0x0014($sp) +/* 01F00 808FEE40 AFAD0010 */ sw $t5, 0x0010($sp) +/* 01F04 808FEE44 AFAF0018 */ sw $t7, 0x0018($sp) /* 01F08 808FEE48 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01F0C 808FEE4C 26251D4C */ addiu $a1, $s1, 0x1D4C ## $a1 = 00001D4C /* 01F10 808FEE50 0C00B380 */ jal TitleCard_InitBossName - + /* 01F14 808FEE54 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 /* 01F18 808FEE58 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEE5C: @@ -1673,98 +1673,98 @@ glabel L808FED50 /* 01F2C 808FEE6C C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 /* 01F30 808FEE70 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 01F34 808FEE74 44815000 */ mtc1 $at, $f10 ## $f10 = 350.00 -/* 01F38 808FEE78 46060200 */ add.s $f8, $f0, $f6 +/* 01F38 808FEE78 46060200 */ add.s $f8, $f0, $f6 /* 01F3C 808FEE7C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 01F40 808FEE80 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 01F44 808FEE84 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01F48 808FEE88 460A4101 */ sub.s $f4, $f8, $f10 +/* 01F48 808FEE88 460A4101 */ sub.s $f4, $f8, $f10 /* 01F4C 808FEE8C C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 01F50 808FEE90 C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C /* 01F54 808FEE94 E60003B0 */ swc1 $f0, 0x03B0($s0) ## 000003B0 -/* 01F58 808FEE98 46062200 */ add.s $f8, $f4, $f6 +/* 01F58 808FEE98 46062200 */ add.s $f8, $f4, $f6 /* 01F5C 808FEE9C 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 01F60 808FEEA0 C60401BC */ lwc1 $f4, 0x01BC($s0) ## 000001BC /* 01F64 808FEEA4 E60A03A8 */ swc1 $f10, 0x03A8($s0) ## 000003A8 /* 01F68 808FEEA8 E60803A4 */ swc1 $f8, 0x03A4($s0) ## 000003A4 -/* 01F6C 808FEEAC 46062200 */ add.s $f8, $f4, $f6 -/* 01F70 808FEEB0 2C6100A7 */ sltiu $at, $v1, 0x00A7 +/* 01F6C 808FEEAC 46062200 */ add.s $f8, $f4, $f6 +/* 01F70 808FEEB0 2C6100A7 */ sltiu $at, $v1, 0x00A7 /* 01F74 808FEEB4 E60203AC */ swc1 $f2, 0x03AC($s0) ## 000003AC /* 01F78 808FEEB8 E60203B8 */ swc1 $f2, 0x03B8($s0) ## 000003B8 -/* 01F7C 808FEEBC 460C4281 */ sub.s $f10, $f8, $f12 -/* 01F80 808FEEC0 14200006 */ bne $at, $zero, .L808FEEDC +/* 01F7C 808FEEBC 460C4281 */ sub.s $f10, $f8, $f12 +/* 01F80 808FEEC0 14200006 */ bne $at, $zero, .L808FEEDC /* 01F84 808FEEC4 E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 -/* 01F88 808FEEC8 2C6100AD */ sltiu $at, $v1, 0x00AD -/* 01F8C 808FEECC 10200003 */ beq $at, $zero, .L808FEEDC +/* 01F88 808FEEC8 2C6100AD */ sltiu $at, $v1, 0x00AD +/* 01F8C 808FEECC 10200003 */ beq $at, $zero, .L808FEEDC /* 01F90 808FEED0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 01F94 808FEED4 A2180312 */ sb $t8, 0x0312($s0) ## 00000312 /* 01F98 808FEED8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEEDC: -/* 01F9C 808FEEDC 2C6100BB */ sltiu $at, $v1, 0x00BB -/* 01FA0 808FEEE0 14200005 */ bne $at, $zero, .L808FEEF8 -/* 01FA4 808FEEE4 2C6100C4 */ sltiu $at, $v1, 0x00C4 -/* 01FA8 808FEEE8 10200003 */ beq $at, $zero, .L808FEEF8 +/* 01F9C 808FEEDC 2C6100BB */ sltiu $at, $v1, 0x00BB +/* 01FA0 808FEEE0 14200005 */ bne $at, $zero, .L808FEEF8 +/* 01FA4 808FEEE4 2C6100C4 */ sltiu $at, $v1, 0x00C4 +/* 01FA8 808FEEE8 10200003 */ beq $at, $zero, .L808FEEF8 /* 01FAC 808FEEEC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 01FB0 808FEEF0 A20A0312 */ sb $t2, 0x0312($s0) ## 00000312 /* 01FB4 808FEEF4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEEF8: -/* 01FB8 808FEEF8 2C6100CB */ sltiu $at, $v1, 0x00CB -/* 01FBC 808FEEFC 14200005 */ bne $at, $zero, .L808FEF14 -/* 01FC0 808FEF00 2C6100D2 */ sltiu $at, $v1, 0x00D2 -/* 01FC4 808FEF04 10200003 */ beq $at, $zero, .L808FEF14 +/* 01FB8 808FEEF8 2C6100CB */ sltiu $at, $v1, 0x00CB +/* 01FBC 808FEEFC 14200005 */ bne $at, $zero, .L808FEF14 +/* 01FC0 808FEF00 2C6100D2 */ sltiu $at, $v1, 0x00D2 +/* 01FC4 808FEF04 10200003 */ beq $at, $zero, .L808FEF14 /* 01FC8 808FEF08 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 01FCC 808FEF0C A2190312 */ sb $t9, 0x0312($s0) ## 00000312 /* 01FD0 808FEF10 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEF14: /* 01FD4 808FEF14 240100A6 */ addiu $at, $zero, 0x00A6 ## $at = 000000A6 -/* 01FD8 808FEF18 10610005 */ beq $v1, $at, .L808FEF30 +/* 01FD8 808FEF18 10610005 */ beq $v1, $at, .L808FEF30 /* 01FDC 808FEF1C 240100B9 */ addiu $at, $zero, 0x00B9 ## $at = 000000B9 -/* 01FE0 808FEF20 10610003 */ beq $v1, $at, .L808FEF30 +/* 01FE0 808FEF20 10610003 */ beq $v1, $at, .L808FEF30 /* 01FE4 808FEF24 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 -/* 01FE8 808FEF28 54610007 */ bnel $v1, $at, .L808FEF48 +/* 01FE8 808FEF28 54610007 */ bnel $v1, $at, .L808FEF48 /* 01FEC 808FEF2C 240100D7 */ addiu $at, $zero, 0x00D7 ## $at = 000000D7 .L808FEF30: -/* 01FF0 808FEF30 0C01E221 */ jal func_80078884 +/* 01FF0 808FEF30 0C01E221 */ jal func_80078884 /* 01FF4 808FEF34 24043997 */ addiu $a0, $zero, 0x3997 ## $a0 = 00003997 -/* 01FF8 808FEF38 0C01E221 */ jal func_80078884 +/* 01FF8 808FEF38 0C01E221 */ jal func_80078884 /* 01FFC 808FEF3C 2404398F */ addiu $a0, $zero, 0x398F ## $a0 = 0000398F /* 02000 808FEF40 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 02004 808FEF44 240100D7 */ addiu $at, $zero, 0x00D7 ## $at = 000000D7 .L808FEF48: -/* 02008 808FEF48 14610231 */ bne $v1, $at, .L808FF810 +/* 02008 808FEF48 14610231 */ bne $v1, $at, .L808FF810 /* 0200C 808FEF4C 240B0017 */ addiu $t3, $zero, 0x0017 ## $t3 = 00000017 /* 02010 808FEF50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 02014 808FEF54 A60B039C */ sh $t3, 0x039C($s0) ## 0000039C /* 02018 808FEF58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0201C 808FEF5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02020 808FEF60 24060055 */ addiu $a2, $zero, 0x0055 ## $a2 = 00000055 -/* 02024 808FEF64 0C00B7D5 */ jal func_8002DF54 +/* 02024 808FEF64 0C00B7D5 */ jal func_8002DF54 /* 02028 808FEF68 E6040224 */ swc1 $f4, 0x0224($s0) ## 00000224 -/* 0202C 808FEF6C 10000229 */ beq $zero, $zero, .L808FF814 +/* 0202C 808FEF6C 10000229 */ beq $zero, $zero, .L808FF814 /* 02030 808FEF70 3C014080 */ lui $at, 0x4080 ## $at = 40800000 glabel L808FEF74 /* 02034 808FEF74 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02038 808FEF78 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0203C 808FEF7C AFA90088 */ sw $t1, 0x0088($sp) + +/* 0203C 808FEF7C AFA90088 */ sw $t1, 0x0088($sp) /* 02040 808FEF80 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 02044 808FEF84 8FA90088 */ lw $t1, 0x0088($sp) +/* 02044 808FEF84 8FA90088 */ lw $t1, 0x0088($sp) /* 02048 808FEF88 24043997 */ addiu $a0, $zero, 0x3997 ## $a0 = 00003997 -/* 0204C 808FEF8C 2C6100DF */ sltiu $at, $v1, 0x00DF -/* 02050 808FEF90 14200005 */ bne $at, $zero, .L808FEFA8 -/* 02054 808FEF94 2C6100E8 */ sltiu $at, $v1, 0x00E8 -/* 02058 808FEF98 10200003 */ beq $at, $zero, .L808FEFA8 +/* 0204C 808FEF8C 2C6100DF */ sltiu $at, $v1, 0x00DF +/* 02050 808FEF90 14200005 */ bne $at, $zero, .L808FEFA8 +/* 02054 808FEF94 2C6100E8 */ sltiu $at, $v1, 0x00E8 +/* 02058 808FEF98 10200003 */ beq $at, $zero, .L808FEFA8 /* 0205C 808FEF9C 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 /* 02060 808FEFA0 A20C0312 */ sb $t4, 0x0312($s0) ## 00000312 /* 02064 808FEFA4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEFA8: /* 02068 808FEFA8 240100DE */ addiu $at, $zero, 0x00DE ## $at = 000000DE -/* 0206C 808FEFAC 54610008 */ bnel $v1, $at, .L808FEFD0 +/* 0206C 808FEFAC 54610008 */ bnel $v1, $at, .L808FEFD0 /* 02070 808FEFB0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 02074 808FEFB4 0C01E221 */ jal func_80078884 -/* 02078 808FEFB8 AFA90088 */ sw $t1, 0x0088($sp) -/* 0207C 808FEFBC 0C01E221 */ jal func_80078884 +/* 02074 808FEFB4 0C01E221 */ jal func_80078884 +/* 02078 808FEFB8 AFA90088 */ sw $t1, 0x0088($sp) +/* 0207C 808FEFBC 0C01E221 */ jal func_80078884 /* 02080 808FEFC0 2404398F */ addiu $a0, $zero, 0x398F ## $a0 = 0000398F -/* 02084 808FEFC4 8FA90088 */ lw $t1, 0x0088($sp) +/* 02084 808FEFC4 8FA90088 */ lw $t1, 0x0088($sp) /* 02088 808FEFC8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 0208C 808FEFCC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 .L808FEFD0: @@ -1776,57 +1776,57 @@ glabel L808FEF74 /* 020A4 808FEFE4 C5260024 */ lwc1 $f6, 0x0024($t1) ## 00000024 /* 020A8 808FEFE8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 020AC 808FEFEC 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 -/* 020B0 808FEFF0 460C3201 */ sub.s $f8, $f6, $f12 +/* 020B0 808FEFF0 460C3201 */ sub.s $f8, $f6, $f12 /* 020B4 808FEFF4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 020B8 808FEFF8 44815000 */ mtc1 $at, $f10 ## $f10 = 6.00 /* 020BC 808FEFFC 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 020C0 808FF000 24041808 */ addiu $a0, $zero, 0x1808 ## $a0 = 00001808 -/* 020C4 808FF004 460A4100 */ add.s $f4, $f8, $f10 +/* 020C4 808FF004 460A4100 */ add.s $f4, $f8, $f10 /* 020C8 808FF008 E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 020CC 808FF00C C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 -/* 020D0 808FF010 460C3200 */ add.s $f8, $f6, $f12 +/* 020D0 808FF010 460C3200 */ add.s $f8, $f6, $f12 /* 020D4 808FF014 44813000 */ mtc1 $at, $f6 ## $f6 = 7.00 /* 020D8 808FF018 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 020DC 808FF01C E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 020E0 808FF020 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C -/* 020E4 808FF024 46025100 */ add.s $f4, $f10, $f2 -/* 020E8 808FF028 46062201 */ sub.s $f8, $f4, $f6 +/* 020E4 808FF024 46025100 */ add.s $f4, $f10, $f2 +/* 020E8 808FF028 46062201 */ sub.s $f8, $f4, $f6 /* 020EC 808FF02C E60803AC */ swc1 $f8, 0x03AC($s0) ## 000003AC /* 020F0 808FF030 C52A0024 */ lwc1 $f10, 0x0024($t1) ## 00000024 /* 020F4 808FF034 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 /* 020F8 808FF038 240100E4 */ addiu $at, $zero, 0x00E4 ## $at = 000000E4 /* 020FC 808FF03C E60A03B0 */ swc1 $f10, 0x03B0($s0) ## 000003B0 /* 02100 808FF040 C5240028 */ lwc1 $f4, 0x0028($t1) ## 00000028 -/* 02104 808FF044 460E2180 */ add.s $f6, $f4, $f14 -/* 02108 808FF048 46083280 */ add.s $f10, $f6, $f8 -/* 0210C 808FF04C 46025101 */ sub.s $f4, $f10, $f2 -/* 02110 808FF050 46002181 */ sub.s $f6, $f4, $f0 +/* 02104 808FF044 460E2180 */ add.s $f6, $f4, $f14 +/* 02108 808FF048 46083280 */ add.s $f10, $f6, $f8 +/* 0210C 808FF04C 46025101 */ sub.s $f4, $f10, $f2 +/* 02110 808FF050 46002181 */ sub.s $f6, $f4, $f0 /* 02114 808FF054 E60603B4 */ swc1 $f6, 0x03B4($s0) ## 000003B4 /* 02118 808FF058 C528002C */ lwc1 $f8, 0x002C($t1) ## 0000002C -/* 0211C 808FF05C 1461000E */ bne $v1, $at, .L808FF098 +/* 0211C 808FF05C 1461000E */ bne $v1, $at, .L808FF098 /* 02120 808FF060 E60803B8 */ swc1 $f8, 0x03B8($s0) ## 000003B8 -/* 02124 808FF064 0C01E221 */ jal func_80078884 -/* 02128 808FF068 AFA90088 */ sw $t1, 0x0088($sp) +/* 02124 808FF064 0C01E221 */ jal func_80078884 +/* 02128 808FF068 AFA90088 */ sw $t1, 0x0088($sp) /* 0212C 808FF06C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02130 808FF070 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02134 808FF074 0C00B7D5 */ jal func_8002DF54 +/* 02134 808FF074 0C00B7D5 */ jal func_8002DF54 /* 02138 808FF078 24060056 */ addiu $a2, $zero, 0x0056 ## $a2 = 00000056 /* 0213C 808FF07C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 02140 808FF080 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 02144 808FF084 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 02148 808FF088 0C02A7DB */ jal func_800A9F6C +/* 02148 808FF088 0C02A7DB */ jal func_800A9F6C /* 0214C 808FF08C 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 -/* 02150 808FF090 8FA90088 */ lw $t1, 0x0088($sp) +/* 02150 808FF090 8FA90088 */ lw $t1, 0x0088($sp) /* 02154 808FF094 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FF098: -/* 02158 808FF098 2C6100E5 */ sltiu $at, $v1, 0x00E5 -/* 0215C 808FF09C 142001DC */ bne $at, $zero, .L808FF810 +/* 02158 808FF098 2C6100E5 */ sltiu $at, $v1, 0x00E5 +/* 0215C 808FF09C 142001DC */ bne $at, $zero, .L808FF810 /* 02160 808FF0A0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 02164 808FF0A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02168 808FF0A8 00310821 */ addu $at, $at, $s1 +/* 02168 808FF0A8 00310821 */ addu $at, $at, $s1 /* 0216C 808FF0AC A02A0B05 */ sb $t2, 0x0B05($at) ## 00010B05 /* 02170 808FF0B0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02174 808FF0B4 02214021 */ addu $t0, $s1, $at +/* 02174 808FF0B4 02214021 */ addu $t0, $s1, $at /* 02178 808FF0B8 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 0217C 808FF0BC 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 /* 02180 808FF0C0 A1020B08 */ sb $v0, 0x0B08($t0) ## 00000B08 @@ -1836,9 +1836,9 @@ glabel L808FEF74 /* 02190 808FF0D0 8E0F0398 */ lw $t7, 0x0398($s0) ## 00000398 /* 02194 808FF0D4 240100EA */ addiu $at, $zero, 0x00EA ## $at = 000000EA /* 02198 808FF0D8 24060018 */ addiu $a2, $zero, 0x0018 ## $a2 = 00000018 -/* 0219C 808FF0DC 15E101CC */ bne $t7, $at, .L808FF810 +/* 0219C 808FF0DC 15E101CC */ bne $t7, $at, .L808FF810 /* 021A0 808FF0E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 021A4 808FF0E4 00310821 */ addu $at, $at, $s1 +/* 021A4 808FF0E4 00310821 */ addu $at, $at, $s1 /* 021A8 808FF0E8 A0200B05 */ sb $zero, 0x0B05($at) ## 00010B05 /* 021AC 808FF0EC A606039C */ sh $a2, 0x039C($s0) ## 0000039C /* 021B0 808FF0F0 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 @@ -1852,25 +1852,25 @@ glabel L808FEF74 /* 021D0 808FF110 ACB80004 */ sw $t8, 0x0004($a1) ## FFFFFFDC /* 021D4 808FF114 8D39002C */ lw $t9, 0x002C($t1) ## 0000002C /* 021D8 808FF118 ACB90008 */ sw $t9, 0x0008($a1) ## FFFFFFE0 -/* 021DC 808FF11C C7AA006C */ lwc1 $f10, 0x006C($sp) -/* 021E0 808FF120 46045180 */ add.s $f6, $f10, $f4 -/* 021E4 808FF124 0C23F484 */ jal func_808FD210 -/* 021E8 808FF128 E7A6006C */ swc1 $f6, 0x006C($sp) +/* 021DC 808FF11C C7AA006C */ lwc1 $f10, 0x006C($sp) +/* 021E0 808FF120 46045180 */ add.s $f6, $f10, $f4 +/* 021E4 808FF124 0C23F484 */ jal func_808FD210 +/* 021E8 808FF128 E7A6006C */ swc1 $f6, 0x006C($sp) /* 021EC 808FF12C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 021F0 808FF130 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 021F4 808FF134 00310821 */ addu $at, $at, $s1 +/* 021F4 808FF134 00310821 */ addu $at, $at, $s1 /* 021F8 808FF138 E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC /* 021FC 808FF13C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02200 808FF140 00310821 */ addu $at, $at, $s1 +/* 02200 808FF140 00310821 */ addu $at, $at, $s1 /* 02204 808FF144 A0200AE2 */ sb $zero, 0x0AE2($at) ## 00010AE2 -/* 02208 808FF148 100001B1 */ beq $zero, $zero, .L808FF810 +/* 02208 808FF148 100001B1 */ beq $zero, $zero, .L808FF810 /* 0220C 808FF14C A2000339 */ sb $zero, 0x0339($s0) ## 00000339 glabel L808FF150 /* 02210 808FF150 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 02214 808FF154 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02218 808FF158 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 0221C 808FF15C 00511021 */ addu $v0, $v0, $s1 +/* 0221C 808FF15C 00511021 */ addu $v0, $v0, $s1 /* 02220 808FF160 8C421E10 */ lw $v0, 0x1E10($v0) ## 00011E10 /* 02224 808FF164 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 02228 808FF168 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 @@ -1885,78 +1885,78 @@ glabel L808FF150 /* 0224C 808FF18C 306D0003 */ andi $t5, $v1, 0x0003 ## $t5 = 00000000 /* 02250 808FF190 AE0C03B8 */ sw $t4, 0x03B8($s0) ## 000003B8 /* 02254 808FF194 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 00010004 -/* 02258 808FF198 46045180 */ add.s $f6, $f10, $f4 +/* 02258 808FF198 46045180 */ add.s $f6, $f10, $f4 /* 0225C 808FF19C E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 /* 02260 808FF1A0 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00010008 /* 02264 808FF1A4 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 -/* 02268 808FF1A8 46104281 */ sub.s $f10, $f8, $f16 +/* 02268 808FF1A8 46104281 */ sub.s $f10, $f8, $f16 /* 0226C 808FF1AC E60A03A8 */ swc1 $f10, 0x03A8($s0) ## 000003A8 /* 02270 808FF1B0 C444000C */ lwc1 $f4, 0x000C($v0) ## 0001000C -/* 02274 808FF1B4 46062200 */ add.s $f8, $f4, $f6 -/* 02278 808FF1B8 15A00004 */ bne $t5, $zero, .L808FF1CC +/* 02274 808FF1B4 46062200 */ add.s $f8, $f4, $f6 +/* 02278 808FF1B8 15A00004 */ bne $t5, $zero, .L808FF1CC /* 0227C 808FF1BC E60803AC */ swc1 $f8, 0x03AC($s0) ## 000003AC -/* 02280 808FF1C0 0C01E221 */ jal func_80078884 +/* 02280 808FF1C0 0C01E221 */ jal func_80078884 /* 02284 808FF1C4 24041801 */ addiu $a0, $zero, 0x1801 ## $a0 = 00001801 /* 02288 808FF1C8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FF1CC: /* 0228C 808FF1CC 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 02290 808FF1D0 1461018F */ bne $v1, $at, .L808FF810 +/* 02290 808FF1D0 1461018F */ bne $v1, $at, .L808FF810 /* 02294 808FF1D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02298 808FF1D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0229C 808FF1DC 0C00B7D5 */ jal func_8002DF54 +/* 0229C 808FF1DC 0C00B7D5 */ jal func_8002DF54 /* 022A0 808FF1E0 24060057 */ addiu $a2, $zero, 0x0057 ## $a2 = 00000057 /* 022A4 808FF1E4 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 /* 022A8 808FF1E8 A60E039C */ sh $t6, 0x039C($s0) ## 0000039C -/* 022AC 808FF1EC 10000188 */ beq $zero, $zero, .L808FF810 +/* 022AC 808FF1EC 10000188 */ beq $zero, $zero, .L808FF810 /* 022B0 808FF1F0 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L808FF1F4 /* 022B4 808FF1F4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 022B8 808FF1F8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 022BC 808FF1FC AFA90088 */ sw $t1, 0x0088($sp) + +/* 022BC 808FF1FC AFA90088 */ sw $t1, 0x0088($sp) /* 022C0 808FF200 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 022C4 808FF204 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 022C8 808FF208 8FA90088 */ lw $t1, 0x0088($sp) +/* 022C8 808FF208 8FA90088 */ lw $t1, 0x0088($sp) /* 022CC 808FF20C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 022D0 808FF210 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 022D4 808FF214 C52A0024 */ lwc1 $f10, 0x0024($t1) ## 00000024 /* 022D8 808FF218 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 022DC 808FF21C 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 -/* 022E0 808FF220 460C5101 */ sub.s $f4, $f10, $f12 +/* 022E0 808FF220 460C5101 */ sub.s $f4, $f10, $f12 /* 022E4 808FF224 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 022E8 808FF228 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 /* 022EC 808FF22C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 022F0 808FF230 8E0F0398 */ lw $t7, 0x0398($s0) ## 00000398 -/* 022F4 808FF234 46062200 */ add.s $f8, $f4, $f6 +/* 022F4 808FF234 46062200 */ add.s $f8, $f4, $f6 /* 022F8 808FF238 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 /* 022FC 808FF23C 3C038091 */ lui $v1, %hi(D_8090EB2C) ## $v1 = 80910000 -/* 02300 808FF240 00511021 */ addu $v0, $v0, $s1 +/* 02300 808FF240 00511021 */ addu $v0, $v0, $s1 /* 02304 808FF244 E60803A4 */ swc1 $f8, 0x03A4($s0) ## 000003A4 /* 02308 808FF248 C52A0028 */ lwc1 $f10, 0x0028($t1) ## 00000028 -/* 0230C 808FF24C 460C5100 */ add.s $f4, $f10, $f12 -/* 02310 808FF250 460E2180 */ add.s $f6, $f4, $f14 +/* 0230C 808FF24C 460C5100 */ add.s $f4, $f10, $f12 +/* 02310 808FF250 460E2180 */ add.s $f6, $f4, $f14 /* 02314 808FF254 E60603A8 */ swc1 $f6, 0x03A8($s0) ## 000003A8 /* 02318 808FF258 C528002C */ lwc1 $f8, 0x002C($t1) ## 0000002C -/* 0231C 808FF25C 46024280 */ add.s $f10, $f8, $f2 -/* 02320 808FF260 460E5100 */ add.s $f4, $f10, $f14 +/* 0231C 808FF25C 46024280 */ add.s $f10, $f8, $f2 +/* 02320 808FF260 460E5100 */ add.s $f4, $f10, $f14 /* 02324 808FF264 E60403AC */ swc1 $f4, 0x03AC($s0) ## 000003AC /* 02328 808FF268 C5260024 */ lwc1 $f6, 0x0024($t1) ## 00000024 -/* 0232C 808FF26C 46023201 */ sub.s $f8, $f6, $f2 +/* 0232C 808FF26C 46023201 */ sub.s $f8, $f6, $f2 /* 02330 808FF270 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 02334 808FF274 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 02338 808FF278 E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 /* 0233C 808FF27C C52A0028 */ lwc1 $f10, 0x0028($t1) ## 00000028 -/* 02340 808FF280 460E5100 */ add.s $f4, $f10, $f14 -/* 02344 808FF284 46062200 */ add.s $f8, $f4, $f6 +/* 02340 808FF280 460E5100 */ add.s $f4, $f10, $f14 +/* 02344 808FF284 46062200 */ add.s $f8, $f4, $f6 /* 02348 808FF288 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 0234C 808FF28C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 02350 808FF290 46024281 */ sub.s $f10, $f8, $f2 -/* 02354 808FF294 46045181 */ sub.s $f6, $f10, $f4 +/* 02350 808FF290 46024281 */ sub.s $f10, $f8, $f2 +/* 02354 808FF294 46045181 */ sub.s $f6, $f10, $f4 /* 02358 808FF298 E60603B4 */ swc1 $f6, 0x03B4($s0) ## 000003B4 /* 0235C 808FF29C C528002C */ lwc1 $f8, 0x002C($t1) ## 0000002C -/* 02360 808FF2A0 460C4281 */ sub.s $f10, $f8, $f12 -/* 02364 808FF2A4 460E5101 */ sub.s $f4, $f10, $f14 -/* 02368 808FF2A8 15E10159 */ bne $t7, $at, .L808FF810 +/* 02360 808FF2A0 460C4281 */ sub.s $f10, $f8, $f12 +/* 02364 808FF2A4 460E5101 */ sub.s $f4, $f10, $f14 +/* 02368 808FF2A8 15E10159 */ bne $t7, $at, .L808FF810 /* 0236C 808FF2AC E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 /* 02370 808FF2B0 8C421E10 */ lw $v0, 0x1E10($v0) ## 00011E10 /* 02374 808FF2B4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 @@ -1968,15 +1968,15 @@ glabel L808FF1F4 /* 0238C 808FF2CC C7260024 */ lwc1 $f6, 0x0024($t9) ## 00000024 /* 02390 808FF2D0 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 02394 808FF2D4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02398 808FF2D8 46103200 */ add.s $f8, $f6, $f16 +/* 02398 808FF2D8 46103200 */ add.s $f8, $f6, $f16 /* 0239C 808FF2DC 44813000 */ mtc1 $at, $f6 ## $f6 = 350.00 /* 023A0 808FF2E0 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 023A4 808FF2E4 240D001A */ addiu $t5, $zero, 0x001A ## $t5 = 0000001A -/* 023A8 808FF2E8 460E4280 */ add.s $f10, $f8, $f14 +/* 023A8 808FF2E8 460E4280 */ add.s $f10, $f8, $f14 /* 023AC 808FF2EC E44A0004 */ swc1 $f10, 0x0004($v0) ## 00010004 /* 023B0 808FF2F0 8C6B0000 */ lw $t3, 0x0000($v1) ## 8090EB2C /* 023B4 808FF2F4 C5640028 */ lwc1 $f4, 0x0028($t3) ## 00000028 -/* 023B8 808FF2F8 46062200 */ add.s $f8, $f4, $f6 +/* 023B8 808FF2F8 46062200 */ add.s $f8, $f4, $f6 /* 023BC 808FF2FC 44812000 */ mtc1 $at, $f4 ## $f4 = 25.00 /* 023C0 808FF300 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 /* 023C4 808FF304 E4480008 */ swc1 $f8, 0x0008($v0) ## 00010008 @@ -1985,7 +1985,7 @@ glabel L808FF1F4 /* 023D0 808FF310 C58A002C */ lwc1 $f10, 0x002C($t4) ## 0000002C /* 023D4 808FF314 E4400010 */ swc1 $f0, 0x0010($v0) ## 00010010 /* 023D8 808FF318 E4400018 */ swc1 $f0, 0x0018($v0) ## 00010018 -/* 023DC 808FF31C 46045181 */ sub.s $f6, $f10, $f4 +/* 023DC 808FF31C 46045181 */ sub.s $f6, $f10, $f4 /* 023E0 808FF320 E4480014 */ swc1 $f8, 0x0014($v0) ## 00010014 /* 023E4 808FF324 E446000C */ swc1 $f6, 0x000C($v0) ## 0001000C /* 023E8 808FF328 A60D039C */ sh $t5, 0x039C($s0) ## 0000039C @@ -2005,34 +2005,34 @@ glabel L808FF330 /* 0241C 808FF35C C5CA0024 */ lwc1 $f10, 0x0024($t6) ## 00000024 /* 02420 808FF360 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02424 808FF364 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 02428 808FF368 46045180 */ add.s $f6, $f10, $f4 -/* 0242C 808FF36C 46103200 */ add.s $f8, $f6, $f16 +/* 02428 808FF368 46045180 */ add.s $f6, $f10, $f4 +/* 0242C 808FF36C 46103200 */ add.s $f8, $f6, $f16 /* 02430 808FF370 E60803A4 */ swc1 $f8, 0x03A4($s0) ## 000003A4 /* 02434 808FF374 8C4F0000 */ lw $t7, 0x0000($v0) ## 8090EB2C /* 02438 808FF378 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 0243C 808FF37C 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 /* 02440 808FF380 C5EA0028 */ lwc1 $f10, 0x0028($t7) ## 00000028 /* 02444 808FF384 240F001B */ addiu $t7, $zero, 0x001B ## $t7 = 0000001B -/* 02448 808FF388 460E5100 */ add.s $f4, $f10, $f14 +/* 02448 808FF388 460E5100 */ add.s $f4, $f10, $f14 /* 0244C 808FF38C E60403A8 */ swc1 $f4, 0x03A8($s0) ## 000003A8 /* 02450 808FF390 8C580000 */ lw $t8, 0x0000($v0) ## 8090EB2C /* 02454 808FF394 C706002C */ lwc1 $f6, 0x002C($t8) ## 0000002D -/* 02458 808FF398 46083280 */ add.s $f10, $f6, $f8 +/* 02458 808FF398 46083280 */ add.s $f10, $f6, $f8 /* 0245C 808FF39C E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 02460 808FF3A0 8C590000 */ lw $t9, 0x0000($v0) ## 8090EB2C /* 02464 808FF3A4 C7240024 */ lwc1 $f4, 0x0024($t9) ## 00000024 /* 02468 808FF3A8 E60403B0 */ swc1 $f4, 0x03B0($s0) ## 000003B0 /* 0246C 808FF3AC 8C4B0000 */ lw $t3, 0x0000($v0) ## 8090EB2C /* 02470 808FF3B0 C5660028 */ lwc1 $f6, 0x0028($t3) ## 00000028 -/* 02474 808FF3B4 46103200 */ add.s $f8, $f6, $f16 +/* 02474 808FF3B4 46103200 */ add.s $f8, $f6, $f16 /* 02478 808FF3B8 44813000 */ mtc1 $at, $f6 ## $f6 = -0.50 /* 0247C 808FF3BC 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D /* 02480 808FF3C0 E60803B4 */ swc1 $f8, 0x03B4($s0) ## 000003B4 /* 02484 808FF3C4 8C4C0000 */ lw $t4, 0x0000($v0) ## 8090EB2C /* 02488 808FF3C8 C58A002C */ lwc1 $f10, 0x002C($t4) ## 0000002C /* 0248C 808FF3CC E60603C4 */ swc1 $f6, 0x03C4($s0) ## 000003C4 -/* 02490 808FF3D0 46025101 */ sub.s $f4, $f10, $f2 -/* 02494 808FF3D4 14610005 */ bne $v1, $at, .L808FF3EC +/* 02490 808FF3D0 46025101 */ sub.s $f4, $f10, $f2 +/* 02494 808FF3D4 14610005 */ bne $v1, $at, .L808FF3EC /* 02498 808FF3D8 E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 /* 0249C 808FF3DC 8C4E0000 */ lw $t6, 0x0000($v0) ## 8090EB2C /* 024A0 808FF3E0 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 @@ -2040,23 +2040,23 @@ glabel L808FF330 /* 024A8 808FF3E8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FF3EC: /* 024AC 808FF3EC 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 024B0 808FF3F0 54610108 */ bnel $v1, $at, .L808FF814 +/* 024B0 808FF3F0 54610108 */ bnel $v1, $at, .L808FF814 /* 024B4 808FF3F4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 024B8 808FF3F8 A60F039C */ sh $t7, 0x039C($s0) ## 0000039C -/* 024BC 808FF3FC 10000104 */ beq $zero, $zero, .L808FF810 +/* 024BC 808FF3FC 10000104 */ beq $zero, $zero, .L808FF810 /* 024C0 808FF400 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L808FF404 /* 024C4 808FF404 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 024C8 808FF408 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 024CC 808FF40C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 024D0 808FF410 14610008 */ bne $v1, $at, .L808FF434 +/* 024D0 808FF410 14610008 */ bne $v1, $at, .L808FF434 /* 024D4 808FF414 E60803C4 */ swc1 $f8, 0x03C4($s0) ## 000003C4 /* 024D8 808FF418 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 024DC 808FF41C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 024E0 808FF420 24060058 */ addiu $a2, $zero, 0x0058 ## $a2 = 00000058 -/* 024E4 808FF424 0C00B7D5 */ jal func_8002DF54 -/* 024E8 808FF428 AFA90088 */ sw $t1, 0x0088($sp) -/* 024EC 808FF42C 8FA90088 */ lw $t1, 0x0088($sp) +/* 024E4 808FF424 0C00B7D5 */ jal func_8002DF54 +/* 024E8 808FF428 AFA90088 */ sw $t1, 0x0088($sp) +/* 024EC 808FF42C 8FA90088 */ lw $t1, 0x0088($sp) /* 024F0 808FF430 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FF434: /* 024F4 808FF434 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -2064,35 +2064,35 @@ glabel L808FF404 /* 024FC 808FF43C C52A0024 */ lwc1 $f10, 0x0024($t1) ## 00000024 /* 02500 808FF440 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02504 808FF444 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 -/* 02508 808FF448 46025101 */ sub.s $f4, $f10, $f2 +/* 02508 808FF448 46025101 */ sub.s $f4, $f10, $f2 /* 0250C 808FF44C 2401001A */ addiu $at, $zero, 0x001A ## $at = 0000001A /* 02510 808FF450 E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 02514 808FF454 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 -/* 02518 808FF458 46103200 */ add.s $f8, $f6, $f16 +/* 02518 808FF458 46103200 */ add.s $f8, $f6, $f16 /* 0251C 808FF45C E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 02520 808FF460 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C /* 02524 808FF464 E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 02528 808FF468 C5240024 */ lwc1 $f4, 0x0024($t1) ## 00000024 /* 0252C 808FF46C E60403B0 */ swc1 $f4, 0x03B0($s0) ## 000003B0 /* 02530 808FF470 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 -/* 02534 808FF474 46103200 */ add.s $f8, $f6, $f16 +/* 02534 808FF474 46103200 */ add.s $f8, $f6, $f16 /* 02538 808FF478 E60803B4 */ swc1 $f8, 0x03B4($s0) ## 000003B4 /* 0253C 808FF47C C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C -/* 02540 808FF480 146100E3 */ bne $v1, $at, .L808FF810 +/* 02540 808FF480 146100E3 */ bne $v1, $at, .L808FF810 /* 02544 808FF484 E60A03B8 */ swc1 $f10, 0x03B8($s0) ## 000003B8 /* 02548 808FF488 8E221C6C */ lw $v0, 0x1C6C($s1) ## 00001C6C /* 0254C 808FF48C 3C038091 */ lui $v1, %hi(D_8090EB30) ## $v1 = 80910000 /* 02550 808FF490 2463EB30 */ addiu $v1, $v1, %lo(D_8090EB30) ## $v1 = 8090EB30 -/* 02554 808FF494 1040001D */ beq $v0, $zero, .L808FF50C +/* 02554 808FF494 1040001D */ beq $v0, $zero, .L808FF50C /* 02558 808FF498 AC620000 */ sw $v0, 0x0000($v1) ## 8090EB30 /* 0255C 808FF49C 24060018 */ addiu $a2, $zero, 0x0018 ## $a2 = 00000018 .L808FF4A0: /* 02560 808FF4A0 84590000 */ lh $t9, 0x0000($v0) ## 00000000 -/* 02564 808FF4A4 14D90015 */ bne $a2, $t9, .L808FF4FC +/* 02564 808FF4A4 14D90015 */ bne $a2, $t9, .L808FF4FC /* 02568 808FF4A8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0256C 808FF4AC 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 /* 02570 808FF4B0 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 02574 808FF4B4 46102181 */ sub.s $f6, $f4, $f16 +/* 02574 808FF4B4 46102181 */ sub.s $f6, $f4, $f16 /* 02578 808FF4B8 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 /* 0257C 808FF4BC 8C6B0000 */ lw $t3, 0x0000($v1) ## 8090EB30 /* 02580 808FF4C0 C5680028 */ lwc1 $f8, 0x0028($t3) ## 00000028 @@ -2108,38 +2108,38 @@ glabel L808FF404 /* 025A8 808FF4E8 E60603B4 */ swc1 $f6, 0x03B4($s0) ## 000003B4 /* 025AC 808FF4EC 8C6F0000 */ lw $t7, 0x0000($v1) ## 8090EB30 /* 025B0 808FF4F0 C5E8002C */ lwc1 $f8, 0x002C($t7) ## 0000002C -/* 025B4 808FF4F4 10000005 */ beq $zero, $zero, .L808FF50C +/* 025B4 808FF4F4 10000005 */ beq $zero, $zero, .L808FF50C /* 025B8 808FF4F8 E60803B8 */ swc1 $f8, 0x03B8($s0) ## 000003B8 .L808FF4FC: /* 025BC 808FF4FC 8C580124 */ lw $t8, 0x0124($v0) ## 00000124 /* 025C0 808FF500 03001025 */ or $v0, $t8, $zero ## $v0 = 00000000 -/* 025C4 808FF504 1700FFE6 */ bne $t8, $zero, .L808FF4A0 +/* 025C4 808FF504 1700FFE6 */ bne $t8, $zero, .L808FF4A0 /* 025C8 808FF508 AC780000 */ sw $t8, 0x0000($v1) ## 8090EB30 .L808FF50C: /* 025CC 808FF50C 2419001C */ addiu $t9, $zero, 0x001C ## $t9 = 0000001C /* 025D0 808FF510 A619039C */ sh $t9, 0x039C($s0) ## 0000039C -/* 025D4 808FF514 100000BE */ beq $zero, $zero, .L808FF810 +/* 025D4 808FF514 100000BE */ beq $zero, $zero, .L808FF810 /* 025D8 808FF518 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L808FF51C /* 025DC 808FF51C 8E0B0398 */ lw $t3, 0x0398($s0) ## 00000398 /* 025E0 808FF520 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 025E4 808FF524 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 025E8 808FF528 15610003 */ bne $t3, $at, .L808FF538 +/* 025E8 808FF528 15610003 */ bne $t3, $at, .L808FF538 /* 025EC 808FF52C 240570D6 */ addiu $a1, $zero, 0x70D6 ## $a1 = 000070D6 -/* 025F0 808FF530 0C042DA0 */ jal func_8010B680 +/* 025F0 808FF530 0C042DA0 */ jal func_8010B680 /* 025F4 808FF534 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 .L808FF538: /* 025F8 808FF538 3C038091 */ lui $v1, %hi(D_8090EB30) ## $v1 = 80910000 /* 025FC 808FF53C 2463EB30 */ addiu $v1, $v1, %lo(D_8090EB30) ## $v1 = 8090EB30 /* 02600 808FF540 8C620000 */ lw $v0, 0x0000($v1) ## 8090EB30 /* 02604 808FF544 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02608 808FF548 504000B2 */ beql $v0, $zero, .L808FF814 +/* 02608 808FF548 504000B2 */ beql $v0, $zero, .L808FF814 /* 0260C 808FF54C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 02610 808FF550 44811000 */ mtc1 $at, $f2 ## $f2 = 4.00 /* 02614 808FF554 C44A0024 */ lwc1 $f10, 0x0024($v0) ## 00000024 /* 02618 808FF558 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0261C 808FF55C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 02620 808FF560 46025101 */ sub.s $f4, $f10, $f2 +/* 02620 808FF560 46025101 */ sub.s $f4, $f10, $f2 /* 02624 808FF564 260403B0 */ addiu $a0, $s0, 0x03B0 ## $a0 = 000003B0 /* 02628 808FF568 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 0262C 808FF56C E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 @@ -2151,7 +2151,7 @@ glabel L808FF51C /* 02644 808FF584 E60803AC */ swc1 $f8, 0x03AC($s0) ## 000003AC /* 02648 808FF588 8C6E0000 */ lw $t6, 0x0000($v1) ## 8090EB30 /* 0264C 808FF58C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02650 808FF590 8DC50024 */ lw $a1, 0x0024($t6) ## 00000024 /* 02654 808FF594 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02658 808FF598 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 @@ -2159,11 +2159,11 @@ glabel L808FF51C /* 02660 808FF5A0 2463EB30 */ addiu $v1, $v1, %lo(D_8090EB30) ## $v1 = 8090EB30 /* 02664 808FF5A4 8C6F0000 */ lw $t7, 0x0000($v1) ## 8090EB30 /* 02668 808FF5A8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 0266C 808FF5AC 44078000 */ mfc1 $a3, $f16 +/* 0266C 808FF5AC 44078000 */ mfc1 $a3, $f16 /* 02670 808FF5B0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 02674 808FF5B4 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 02678 808FF5B8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0267C 808FF5BC 8DE50028 */ lw $a1, 0x0028($t7) ## 00000028 /* 02680 808FF5C0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02684 808FF5C4 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 @@ -2171,39 +2171,39 @@ glabel L808FF51C /* 0268C 808FF5CC 2463EB30 */ addiu $v1, $v1, %lo(D_8090EB30) ## $v1 = 8090EB30 /* 02690 808FF5D0 8C780000 */ lw $t8, 0x0000($v1) ## 8090EB30 /* 02694 808FF5D4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 02698 808FF5D8 44078000 */ mfc1 $a3, $f16 +/* 02698 808FF5D8 44078000 */ mfc1 $a3, $f16 /* 0269C 808FF5DC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 026A0 808FF5E0 260403B8 */ addiu $a0, $s0, 0x03B8 ## $a0 = 000003B8 /* 026A4 808FF5E4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 026A8 808FF5E8 8F05002C */ lw $a1, 0x002C($t8) ## 0000002C /* 026AC 808FF5EC 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 -/* 026B0 808FF5F0 2F210029 */ sltiu $at, $t9, 0x0029 -/* 026B4 808FF5F4 54200087 */ bnel $at, $zero, .L808FF814 +/* 026B0 808FF5F0 2F210029 */ sltiu $at, $t9, 0x0029 +/* 026B4 808FF5F4 54200087 */ bnel $at, $zero, .L808FF814 /* 026B8 808FF5F8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 026BC 808FF5FC 0C042F6F */ jal func_8010BDBC +/* 026BC 808FF5FC 0C042F6F */ jal func_8010BDBC /* 026C0 808FF600 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 026C4 808FF604 14400082 */ bne $v0, $zero, .L808FF810 +/* 026C4 808FF604 14400082 */ bne $v0, $zero, .L808FF810 /* 026C8 808FF608 240B001D */ addiu $t3, $zero, 0x001D ## $t3 = 0000001D /* 026CC 808FF60C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 026D0 808FF610 A60B039C */ sh $t3, 0x039C($s0) ## 0000039C /* 026D4 808FF614 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 026D8 808FF618 24A547E0 */ addiu $a1, $a1, 0x47E0 ## $a1 = 060147E0 /* 026DC 808FF61C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 026E0 808FF620 0C029490 */ jal func_800A5240 +/* 026E0 808FF620 0C029490 */ jal func_800A5240 /* 026E4 808FF624 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 026E8 808FF628 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 026EC 808FF62C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 026F0 808FF630 248447E0 */ addiu $a0, $a0, 0x47E0 ## $a0 = 060147E0 /* 026F4 808FF634 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 026F8 808FF638 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 026FC 808FF63C 3C018091 */ lui $at, %hi(D_8090DBA0) ## $at = 80910000 -/* 02700 808FF640 46805120 */ cvt.s.w $f4, $f10 +/* 02700 808FF640 46805120 */ cvt.s.w $f4, $f10 /* 02704 808FF644 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC /* 02708 808FF648 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 0270C 808FF64C E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 -/* 02710 808FF650 C428DBA0 */ lwc1 $f8, %lo(D_8090DBA0)($at) +/* 02710 808FF650 C428DBA0 */ lwc1 $f8, %lo(D_8090DBA0)($at) /* 02714 808FF654 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 02718 808FF658 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 /* 0271C 808FF65C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -2211,14 +2211,14 @@ glabel L808FF51C /* 02724 808FF664 A20A0335 */ sb $t2, 0x0335($s0) ## 00000335 /* 02728 808FF668 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 0272C 808FF66C E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 02730 808FF670 10000067 */ beq $zero, $zero, .L808FF810 +/* 02730 808FF670 10000067 */ beq $zero, $zero, .L808FF810 /* 02734 808FF674 E6040224 */ swc1 $f4, 0x0224($s0) ## 00000224 glabel L808FF678 /* 02738 808FF678 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0273C 808FF67C AFA40050 */ sw $a0, 0x0050($sp) +/* 0273C 808FF67C AFA40050 */ sw $a0, 0x0050($sp) /* 02740 808FF680 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02744 808FF684 AFA90088 */ sw $t1, 0x0088($sp) + +/* 02744 808FF684 AFA90088 */ sw $t1, 0x0088($sp) /* 02748 808FF688 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0274C 808FF68C 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 02750 808FF690 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -2230,48 +2230,48 @@ glabel L808FF678 /* 02768 808FF6A8 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 /* 0276C 808FF6AC 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 02770 808FF6B0 44815000 */ mtc1 $at, $f10 ## $f10 = 350.00 -/* 02774 808FF6B4 46060200 */ add.s $f8, $f0, $f6 +/* 02774 808FF6B4 46060200 */ add.s $f8, $f0, $f6 /* 02778 808FF6B8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0277C 808FF6BC 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 02780 808FF6C0 8FA90088 */ lw $t1, 0x0088($sp) -/* 02784 808FF6C4 460A4101 */ sub.s $f4, $f8, $f10 +/* 02780 808FF6C0 8FA90088 */ lw $t1, 0x0088($sp) +/* 02784 808FF6C4 460A4101 */ sub.s $f4, $f8, $f10 /* 02788 808FF6C8 C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C /* 0278C 808FF6CC 3C01430C */ lui $at, 0x430C ## $at = 430C0000 /* 02790 808FF6D0 E60003B0 */ swc1 $f0, 0x03B0($s0) ## 000003B0 -/* 02794 808FF6D4 46062200 */ add.s $f8, $f4, $f6 +/* 02794 808FF6D4 46062200 */ add.s $f8, $f4, $f6 /* 02798 808FF6D8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 0279C 808FF6DC E60203B8 */ swc1 $f2, 0x03B8($s0) ## 000003B8 -/* 027A0 808FF6E0 460E1180 */ add.s $f6, $f2, $f14 +/* 027A0 808FF6E0 460E1180 */ add.s $f6, $f2, $f14 /* 027A4 808FF6E4 E60403A8 */ swc1 $f4, 0x03A8($s0) ## 000003A8 /* 027A8 808FF6E8 240CC000 */ addiu $t4, $zero, 0xC000 ## $t4 = FFFFC000 -/* 027AC 808FF6EC 46104281 */ sub.s $f10, $f8, $f16 +/* 027AC 808FF6EC 46104281 */ sub.s $f10, $f8, $f16 /* 027B0 808FF6F0 C60801BC */ lwc1 $f8, 0x01BC($s0) ## 000001BC /* 027B4 808FF6F4 E60603AC */ swc1 $f6, 0x03AC($s0) ## 000003AC /* 027B8 808FF6F8 44813000 */ mtc1 $at, $f6 ## $f6 = 140.00 /* 027BC 808FF6FC E60A03A4 */ swc1 $f10, 0x03A4($s0) ## 000003A4 -/* 027C0 808FF700 46104280 */ add.s $f10, $f8, $f16 +/* 027C0 808FF700 46104280 */ add.s $f10, $f8, $f16 /* 027C4 808FF704 3C01C344 */ lui $at, 0xC344 ## $at = C3440000 /* 027C8 808FF708 44814000 */ mtc1 $at, $f8 ## $f8 = -196.00 /* 027CC 808FF70C 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 027D0 808FF710 460C5101 */ sub.s $f4, $f10, $f12 +/* 027D0 808FF710 460C5101 */ sub.s $f4, $f10, $f12 /* 027D4 808FF714 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 027D8 808FF718 E60403B4 */ swc1 $f4, 0x03B4($s0) ## 000003B4 /* 027DC 808FF71C A52C00B6 */ sh $t4, 0x00B6($t1) ## 000000B6 /* 027E0 808FF720 E5260024 */ swc1 $f6, 0x0024($t1) ## 00000024 /* 027E4 808FF724 E528002C */ swc1 $f8, 0x002C($t1) ## 0000002C /* 027E8 808FF728 8E0D0398 */ lw $t5, 0x0398($s0) ## 00000398 -/* 027EC 808FF72C 55A10004 */ bnel $t5, $at, .L808FF740 -/* 027F0 808FF730 8FA40050 */ lw $a0, 0x0050($sp) +/* 027EC 808FF72C 55A10004 */ bnel $t5, $at, .L808FF740 +/* 027F0 808FF730 8FA40050 */ lw $a0, 0x0050($sp) /* 027F4 808FF734 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 027F8 808FF738 2405398F */ addiu $a1, $zero, 0x398F ## $a1 = 0000398F -/* 027FC 808FF73C 8FA40050 */ lw $a0, 0x0050($sp) +/* 027FC 808FF73C 8FA40050 */ lw $a0, 0x0050($sp) .L808FF740: -/* 02800 808FF740 0C0295B2 */ jal func_800A56C8 +/* 02800 808FF740 0C0295B2 */ jal func_800A56C8 /* 02804 808FF744 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 02808 808FF748 10400031 */ beq $v0, $zero, .L808FF810 +/* 02808 808FF748 10400031 */ beq $v0, $zero, .L808FF810 /* 0280C 808FF74C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02810 808FF750 0C030129 */ jal func_800C04A4 +/* 02810 808FF750 0C030129 */ jal func_800C04A4 /* 02814 808FF754 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02818 808FF758 260303A4 */ addiu $v1, $s0, 0x03A4 ## $v1 = 000003A4 /* 0281C 808FF75C 8C6F0000 */ lw $t7, 0x0000($v1) ## 000003A4 @@ -2294,21 +2294,21 @@ glabel L808FF678 /* 02860 808FF7A0 AC4B0054 */ sw $t3, 0x0054($v0) ## 00000054 /* 02864 808FF7A4 8E0C03B8 */ lw $t4, 0x03B8($s0) ## 000003B8 /* 02868 808FF7A8 AC4C0058 */ sw $t4, 0x0058($v0) ## 00000058 -/* 0286C 808FF7AC 0C03022B */ jal func_800C08AC +/* 0286C 808FF7AC 0C03022B */ jal func_800C08AC /* 02870 808FF7B0 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 02874 808FF7B4 A600039E */ sh $zero, 0x039E($s0) ## 0000039E /* 02878 808FF7B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0287C 808FF7BC 0C01914D */ jal func_80064534 +/* 0287C 808FF7BC 0C01914D */ jal func_80064534 /* 02880 808FF7C0 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 /* 02884 808FF7C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02888 808FF7C8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0288C 808FF7CC 0C00B7D5 */ jal func_8002DF54 +/* 0288C 808FF7CC 0C00B7D5 */ jal func_8002DF54 /* 02890 808FF7D0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02894 808FF7D4 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 02898 808FF7D8 A600039C */ sh $zero, 0x039C($s0) ## 0000039C /* 0289C 808FF7DC A20A0337 */ sb $t2, 0x0337($s0) ## 00000337 /* 028A0 808FF7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028A4 808FF7E4 0C23FF6C */ jal func_808FFDB0 +/* 028A4 808FF7E4 0C23FF6C */ jal func_808FFDB0 /* 028A8 808FF7E8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 028AC 808FF7EC 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 028B0 808FF7F0 240D0032 */ addiu $t5, $zero, 0x0032 ## $t5 = 00000032 @@ -2316,7 +2316,7 @@ glabel L808FF678 /* 028B8 808FF7F8 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 028BC 808FF7FC AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 028C0 808FF800 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 -/* 028C4 808FF804 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 028C4 808FF804 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) /* 028C8 808FF808 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 /* 028CC 808FF80C A33803C8 */ sb $t8, 0x03C8($t9) ## 809103C8 glabel L808FF810 @@ -2325,40 +2325,40 @@ glabel L808FF810 .L808FF814: /* 028D4 808FF814 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 /* 028D8 808FF818 C604030C */ lwc1 $f4, 0x030C($s0) ## 0000030C -/* 028DC 808FF81C 93AB008D */ lbu $t3, 0x008D($sp) -/* 028E0 808FF820 4604503C */ c.lt.s $f10, $f4 +/* 028DC 808FF81C 93AB008D */ lbu $t3, 0x008D($sp) +/* 028E0 808FF820 4604503C */ c.lt.s $f10, $f4 /* 028E4 808FF824 00000000 */ nop -/* 028E8 808FF828 45020006 */ bc1fl .L808FF844 +/* 028E8 808FF828 45020006 */ bc1fl .L808FF844 /* 028EC 808FF82C 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 028F0 808FF830 15600003 */ bne $t3, $zero, .L808FF840 +/* 028F0 808FF830 15600003 */ bne $t3, $zero, .L808FF840 /* 028F4 808FF834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 028F8 808FF838 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 028FC 808FF83C 24053163 */ addiu $a1, $zero, 0x3163 ## $a1 = 00003163 .L808FF840: /* 02900 808FF840 8605039E */ lh $a1, 0x039E($s0) ## 0000039E .L808FF844: /* 02904 808FF844 260C03A4 */ addiu $t4, $s0, 0x03A4 ## $t4 = 000003A4 /* 02908 808FF848 260D03B0 */ addiu $t5, $s0, 0x03B0 ## $t5 = 000003B0 -/* 0290C 808FF84C 50A0000E */ beql $a1, $zero, .L808FF888 -/* 02910 808FF850 8FBF003C */ lw $ra, 0x003C($sp) -/* 02914 808FF854 AFAC004C */ sw $t4, 0x004C($sp) -/* 02918 808FF858 AFAD0050 */ sw $t5, 0x0050($sp) +/* 0290C 808FF84C 50A0000E */ beql $a1, $zero, .L808FF888 +/* 02910 808FF850 8FBF003C */ lw $ra, 0x003C($sp) +/* 02914 808FF854 AFAC004C */ sw $t4, 0x004C($sp) +/* 02918 808FF858 AFAD0050 */ sw $t5, 0x0050($sp) /* 0291C 808FF85C C60603B4 */ lwc1 $f6, 0x03B4($s0) ## 000003B4 /* 02920 808FF860 C608041C */ lwc1 $f8, 0x041C($s0) ## 0000041C /* 02924 808FF864 260E03BC */ addiu $t6, $s0, 0x03BC ## $t6 = 000003BC /* 02928 808FF868 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0292C 808FF86C 46083280 */ add.s $f10, $f6, $f8 +/* 0292C 808FF86C 46083280 */ add.s $f10, $f6, $f8 /* 02930 808FF870 E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 -/* 02934 808FF874 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02938 808FF878 8FA7004C */ lw $a3, 0x004C($sp) -/* 0293C 808FF87C 0C030179 */ jal func_800C05E4 -/* 02940 808FF880 8FA60050 */ lw $a2, 0x0050($sp) -/* 02944 808FF884 8FBF003C */ lw $ra, 0x003C($sp) +/* 02934 808FF874 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02938 808FF878 8FA7004C */ lw $a3, 0x004C($sp) +/* 0293C 808FF87C 0C030179 */ jal func_800C05E4 +/* 02940 808FF880 8FA60050 */ lw $a2, 0x0050($sp) +/* 02944 808FF884 8FBF003C */ lw $ra, 0x003C($sp) .L808FF888: -/* 02948 808FF888 8FB00034 */ lw $s0, 0x0034($sp) -/* 0294C 808FF88C 8FB10038 */ lw $s1, 0x0038($sp) -/* 02950 808FF890 03E00008 */ jr $ra +/* 02948 808FF888 8FB00034 */ lw $s0, 0x0034($sp) +/* 0294C 808FF88C 8FB10038 */ lw $s1, 0x0038($sp) +/* 02950 808FF890 03E00008 */ jr $ra /* 02954 808FF894 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s index 8d7d7552c4..596224b294 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s @@ -1,54 +1,54 @@ glabel func_808FFDB0 /* 02E70 808FFDB0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02E74 808FFDB4 AFB00018 */ sw $s0, 0x0018($sp) +/* 02E74 808FFDB4 AFB00018 */ sw $s0, 0x0018($sp) /* 02E78 808FFDB8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02E7C 808FFDBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02E80 808FFDC0 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 02E84 808FFDC4 AFBF001C */ sw $ra, 0x001C($sp) -/* 02E88 808FFDC8 AFA50034 */ sw $a1, 0x0034($sp) -/* 02E8C 808FFDCC 00A12021 */ addu $a0, $a1, $at -/* 02E90 808FFDD0 AFA40024 */ sw $a0, 0x0024($sp) +/* 02E84 808FFDC4 AFBF001C */ sw $ra, 0x001C($sp) +/* 02E88 808FFDC8 AFA50034 */ sw $a1, 0x0034($sp) +/* 02E8C 808FFDCC 00A12021 */ addu $a0, $a1, $at +/* 02E90 808FFDD0 AFA40024 */ sw $a0, 0x0024($sp) /* 02E94 808FFDD4 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 02E98 808FFDD8 24050153 */ addiu $a1, $zero, 0x0153 ## $a1 = 00000153 -/* 02E9C 808FFDDC 8FA40024 */ lw $a0, 0x0024($sp) -/* 02EA0 808FFDE0 AFA20028 */ sw $v0, 0x0028($sp) +/* 02E9C 808FFDDC 8FA40024 */ lw $a0, 0x0024($sp) +/* 02EA0 808FFDE0 AFA20028 */ sw $v0, 0x0028($sp) /* 02EA4 808FFDE4 0C026062 */ jal Object_IsLoaded - + /* 02EA8 808FFDE8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 02EAC 808FFDEC 1040002C */ beq $v0, $zero, .L808FFEA0 +/* 02EAC 808FFDEC 1040002C */ beq $v0, $zero, .L808FFEA0 /* 02EB0 808FFDF0 3C088090 */ lui $t0, %hi(func_808FFDB0) ## $t0 = 80900000 -/* 02EB4 808FFDF4 8FAF0028 */ lw $t7, 0x0028($sp) -/* 02EB8 808FFDF8 8FAE0034 */ lw $t6, 0x0034($sp) +/* 02EB4 808FFDF4 8FAF0028 */ lw $t7, 0x0028($sp) +/* 02EB8 808FFDF8 8FAE0034 */ lw $t6, 0x0034($sp) /* 02EBC 808FFDFC 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 02EC0 808FFE00 000FC100 */ sll $t8, $t7, 4 -/* 02EC4 808FFE04 030FC021 */ addu $t8, $t8, $t7 -/* 02EC8 808FFE08 0018C080 */ sll $t8, $t8, 2 -/* 02ECC 808FFE0C 01D8C821 */ addu $t9, $t6, $t8 -/* 02ED0 808FFE10 01194021 */ addu $t0, $t0, $t9 +/* 02EC0 808FFE00 000FC100 */ sll $t8, $t7, 4 +/* 02EC4 808FFE04 030FC021 */ addu $t8, $t8, $t7 +/* 02EC8 808FFE08 0018C080 */ sll $t8, $t8, 2 +/* 02ECC 808FFE0C 01D8C821 */ addu $t9, $t6, $t8 +/* 02ED0 808FFE10 01194021 */ addu $t0, $t0, $t9 /* 02ED4 808FFE14 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 /* 02ED8 808FFE18 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02EDC 808FFE1C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02EE0 808FFE20 01014821 */ addu $t1, $t0, $at +/* 02EE0 808FFE20 01014821 */ addu $t1, $t0, $at /* 02EE4 808FFE24 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 02EE8 808FFE28 AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 /* 02EEC 808FFE2C 24A5FFE4 */ addiu $a1, $a1, 0xFFE4 ## $a1 = 0600FFE4 /* 02EF0 808FFE30 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02EF4 808FFE34 0C0294D3 */ jal func_800A534C +/* 02EF4 808FFE34 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 02EF8 808FFE38 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 02EFC 808FFE3C 920B0334 */ lbu $t3, 0x0334($s0) ## 00000334 /* 02F00 808FFE40 3C0A8090 */ lui $t2, %hi(func_808FFEBC) ## $t2 = 80900000 /* 02F04 808FFE44 254AFEBC */ addiu $t2, $t2, %lo(func_808FFEBC) ## $t2 = 808FFEBC -/* 02F08 808FFE48 11600009 */ beq $t3, $zero, .L808FFE70 +/* 02F08 808FFE48 11600009 */ beq $t3, $zero, .L808FFE70 /* 02F0C 808FFE4C AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 /* 02F10 808FFE50 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 02F14 808FFE54 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 02F18 808FFE58 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 02F1C 808FFE5C 00000000 */ nop -/* 02F20 808FFE60 4600010D */ trunc.w.s $f4, $f0 -/* 02F24 808FFE64 440D2000 */ mfc1 $t5, $f4 -/* 02F28 808FFE68 10000003 */ beq $zero, $zero, .L808FFE78 +/* 02F20 808FFE60 4600010D */ trunc.w.s $f4, $f0 +/* 02F24 808FFE64 440D2000 */ mfc1 $t5, $f4 +/* 02F28 808FFE68 10000003 */ beq $zero, $zero, .L808FFE78 /* 02F2C 808FFE6C A60D01A2 */ sh $t5, 0x01A2($s0) ## 000001A2 .L808FFE70: /* 02F30 808FFE70 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 @@ -62,16 +62,16 @@ glabel func_808FFDB0 /* 02F4C 808FFE8C A20E0336 */ sb $t6, 0x0336($s0) ## 00000336 /* 02F50 808FFE90 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 02F54 808FFE94 E6000228 */ swc1 $f0, 0x0228($s0) ## 00000228 -/* 02F58 808FFE98 10000003 */ beq $zero, $zero, .L808FFEA8 +/* 02F58 808FFE98 10000003 */ beq $zero, $zero, .L808FFEA8 /* 02F5C 808FFE9C E6000224 */ swc1 $f0, 0x0224($s0) ## 00000224 .L808FFEA0: /* 02F60 808FFEA0 2508FDB0 */ addiu $t0, $t0, %lo(func_808FFDB0) ## $t0 = FFFFFDB0 /* 02F64 808FFEA4 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 .L808FFEA8: -/* 02F68 808FFEA8 8FBF001C */ lw $ra, 0x001C($sp) -/* 02F6C 808FFEAC 8FB00018 */ lw $s0, 0x0018($sp) +/* 02F68 808FFEA8 8FBF001C */ lw $ra, 0x001C($sp) +/* 02F6C 808FFEAC 8FB00018 */ lw $s0, 0x0018($sp) /* 02F70 808FFEB0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02F74 808FFEB4 03E00008 */ jr $ra +/* 02F74 808FFEB4 03E00008 */ jr $ra /* 02F78 808FFEB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s index df6e9e7a03..496ff372fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s @@ -1,23 +1,23 @@ glabel func_808FFF90 /* 03050 808FFF90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03054 808FFF94 AFA5001C */ sw $a1, 0x001C($sp) -/* 03058 808FFF98 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03054 808FFF94 AFA5001C */ sw $a1, 0x001C($sp) +/* 03058 808FFF98 AFBF0014 */ sw $ra, 0x0014($sp) /* 0305C 808FFF9C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 03060 808FFFA0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03064 808FFFA4 24A5FFE4 */ addiu $a1, $a1, 0xFFE4 ## $a1 = 0600FFE4 -/* 03068 808FFFA8 AFA70018 */ sw $a3, 0x0018($sp) +/* 03068 808FFFA8 AFA70018 */ sw $a3, 0x0018($sp) /* 0306C 808FFFAC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03070 808FFFB0 0C0294D3 */ jal func_800A534C +/* 03070 808FFFB0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 03074 808FFFB4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 03078 808FFFB8 8FA70018 */ lw $a3, 0x0018($sp) +/* 03078 808FFFB8 8FA70018 */ lw $a3, 0x0018($sp) /* 0307C 808FFFBC 3C0E8090 */ lui $t6, %hi(func_808FFFE0) ## $t6 = 80900000 /* 03080 808FFFC0 25CEFFE0 */ addiu $t6, $t6, %lo(func_808FFFE0) ## $t6 = 808FFFE0 /* 03084 808FFFC4 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 /* 03088 808FFFC8 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 0308C 808FFFCC A4EF01A2 */ sh $t7, 0x01A2($a3) ## 000001A2 -/* 03090 808FFFD0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03090 808FFFD0 8FBF0014 */ lw $ra, 0x0014($sp) /* 03094 808FFFD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03098 808FFFD8 03E00008 */ jr $ra +/* 03098 808FFFD8 03E00008 */ jr $ra /* 0309C 808FFFDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s index ecf5768477..2fef18bae0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s @@ -1,29 +1,29 @@ glabel func_809000A0 /* 03160 809000A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03164 809000A4 AFA5001C */ sw $a1, 0x001C($sp) -/* 03168 809000A8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03164 809000A4 AFA5001C */ sw $a1, 0x001C($sp) +/* 03168 809000A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0316C 809000AC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 03170 809000B0 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 03174 809000B4 24A56510 */ addiu $a1, $a1, 0x6510 ## $a1 = 06026510 -/* 03178 809000B8 AFA70018 */ sw $a3, 0x0018($sp) +/* 03178 809000B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0317C 809000BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03180 809000C0 0C0294D3 */ jal func_800A534C +/* 03180 809000C0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 03184 809000C4 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 03188 809000C8 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 0318C 809000CC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03190 809000D0 24846510 */ addiu $a0, $a0, 0x6510 ## $a0 = 06026510 /* 03194 809000D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03198 809000D8 8FA70018 */ lw $a3, 0x0018($sp) +/* 03198 809000D8 8FA70018 */ lw $a3, 0x0018($sp) /* 0319C 809000DC 3C0E8090 */ lui $t6, %hi(func_80900104) ## $t6 = 80900000 -/* 031A0 809000E0 468021A0 */ cvt.s.w $f6, $f4 +/* 031A0 809000E0 468021A0 */ cvt.s.w $f6, $f4 /* 031A4 809000E4 25CE0104 */ addiu $t6, $t6, %lo(func_80900104) ## $t6 = 80900104 /* 031A8 809000E8 A4E001AC */ sh $zero, 0x01AC($a3) ## 000001AC /* 031AC 809000EC ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 031B0 809000F0 E4E60194 */ swc1 $f6, 0x0194($a3) ## 00000194 -/* 031B4 809000F4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 031B4 809000F4 8FBF0014 */ lw $ra, 0x0014($sp) /* 031B8 809000F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 031BC 809000FC 03E00008 */ jr $ra +/* 031BC 809000FC 03E00008 */ jr $ra /* 031C0 80900100 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s index 78c0466b13..9d2de3f852 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s @@ -1,78 +1,78 @@ glabel func_80900104 /* 031C4 80900104 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 031C8 80900108 AFB00018 */ sw $s0, 0x0018($sp) +/* 031C8 80900108 AFB00018 */ sw $s0, 0x0018($sp) /* 031CC 8090010C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 031D0 80900110 AFBF001C */ sw $ra, 0x001C($sp) +/* 031D0 80900110 AFBF001C */ sw $ra, 0x001C($sp) /* 031D4 80900114 2487014C */ addiu $a3, $a0, 0x014C ## $a3 = 0000014C -/* 031D8 80900118 AFA5002C */ sw $a1, 0x002C($sp) +/* 031D8 80900118 AFA5002C */ sw $a1, 0x002C($sp) /* 031DC 8090011C 00E02025 */ or $a0, $a3, $zero ## $a0 = 0000014C /* 031E0 80900120 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 031E4 80900124 AFA70020 */ sw $a3, 0x0020($sp) + +/* 031E4 80900124 AFA70020 */ sw $a3, 0x0020($sp) /* 031E8 80900128 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 031EC 8090012C 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 031F0 80900130 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 031F4 80900134 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 031F8 80900138 860201AC */ lh $v0, 0x01AC($s0) ## 000001AC -/* 031FC 8090013C 8FA70020 */ lw $a3, 0x0020($sp) +/* 031FC 8090013C 8FA70020 */ lw $a3, 0x0020($sp) /* 03200 80900140 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03204 80900144 10400007 */ beq $v0, $zero, .L80900164 +/* 03204 80900144 10400007 */ beq $v0, $zero, .L80900164 /* 03208 80900148 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0320C 8090014C 10410014 */ beq $v0, $at, .L809001A0 +/* 0320C 8090014C 10410014 */ beq $v0, $at, .L809001A0 /* 03210 80900150 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03214 80900154 10410023 */ beq $v0, $at, .L809001E4 +/* 03214 80900154 10410023 */ beq $v0, $at, .L809001E4 /* 03218 80900158 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0321C 8090015C 10000028 */ beq $zero, $zero, .L80900200 -/* 03220 80900160 8FBF001C */ lw $ra, 0x001C($sp) +/* 0321C 8090015C 10000028 */ beq $zero, $zero, .L80900200 +/* 03220 80900160 8FBF001C */ lw $ra, 0x001C($sp) .L80900164: /* 03224 80900164 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 03228 80900168 0C0295B2 */ jal func_800A56C8 -/* 0322C 8090016C AFA70020 */ sw $a3, 0x0020($sp) -/* 03230 80900170 10400022 */ beq $v0, $zero, .L809001FC -/* 03234 80900174 8FA70020 */ lw $a3, 0x0020($sp) +/* 03228 80900168 0C0295B2 */ jal func_800A56C8 +/* 0322C 8090016C AFA70020 */ sw $a3, 0x0020($sp) +/* 03230 80900170 10400022 */ beq $v0, $zero, .L809001FC +/* 03234 80900174 8FA70020 */ lw $a3, 0x0020($sp) /* 03238 80900178 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0323C 8090017C 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 03240 80900180 A60E01AC */ sh $t6, 0x01AC($s0) ## 000001AC /* 03244 80900184 24A56AF4 */ addiu $a1, $a1, 0x6AF4 ## $a1 = 06026AF4 /* 03248 80900188 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0324C 8090018C 0C0294D3 */ jal func_800A534C +/* 0324C 8090018C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 03250 80900190 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03254 80900194 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 -/* 03258 80900198 10000018 */ beq $zero, $zero, .L809001FC +/* 03258 80900198 10000018 */ beq $zero, $zero, .L809001FC /* 0325C 8090019C A60F01A2 */ sh $t7, 0x01A2($s0) ## 000001A2 .L809001A0: /* 03260 809001A0 861801A2 */ lh $t8, 0x01A2($s0) ## 000001A2 /* 03264 809001A4 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 03268 809001A8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0326C 809001AC 17000013 */ bne $t8, $zero, .L809001FC +/* 0326C 809001AC 17000013 */ bne $t8, $zero, .L809001FC /* 03270 809001B0 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 03274 809001B4 A61901AC */ sh $t9, 0x01AC($s0) ## 000001AC /* 03278 809001B8 24A57824 */ addiu $a1, $a1, 0x7824 ## $a1 = 06027824 -/* 0327C 809001BC 0C0294D3 */ jal func_800A534C +/* 0327C 809001BC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 03280 809001C0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 03284 809001C4 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 03288 809001C8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0328C 809001CC 24847824 */ addiu $a0, $a0, 0x7824 ## $a0 = 06027824 /* 03290 809001D0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03294 809001D4 00000000 */ nop -/* 03298 809001D8 468021A0 */ cvt.s.w $f6, $f4 -/* 0329C 809001DC 10000007 */ beq $zero, $zero, .L809001FC +/* 03298 809001D8 468021A0 */ cvt.s.w $f6, $f4 +/* 0329C 809001DC 10000007 */ beq $zero, $zero, .L809001FC /* 032A0 809001E0 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 .L809001E4: -/* 032A4 809001E4 0C0295B2 */ jal func_800A56C8 +/* 032A4 809001E4 0C0295B2 */ jal func_800A56C8 /* 032A8 809001E8 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 032AC 809001EC 10400003 */ beq $v0, $zero, .L809001FC +/* 032AC 809001EC 10400003 */ beq $v0, $zero, .L809001FC /* 032B0 809001F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032B4 809001F4 0C2400B3 */ jal func_809002CC -/* 032B8 809001F8 8FA5002C */ lw $a1, 0x002C($sp) +/* 032B4 809001F4 0C2400B3 */ jal func_809002CC +/* 032B8 809001F8 8FA5002C */ lw $a1, 0x002C($sp) .L809001FC: -/* 032BC 809001FC 8FBF001C */ lw $ra, 0x001C($sp) +/* 032BC 809001FC 8FBF001C */ lw $ra, 0x001C($sp) .L80900200: -/* 032C0 80900200 8FB00018 */ lw $s0, 0x0018($sp) +/* 032C0 80900200 8FB00018 */ lw $s0, 0x0018($sp) /* 032C4 80900204 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 032C8 80900208 03E00008 */ jr $ra +/* 032C8 80900208 03E00008 */ jr $ra /* 032CC 8090020C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s index d0606c1dcf..6cd60ad523 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s @@ -1,15 +1,15 @@ glabel func_809002CC /* 0338C 809002CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03390 809002D0 AFA5001C */ sw $a1, 0x001C($sp) -/* 03394 809002D4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03390 809002D0 AFA5001C */ sw $a1, 0x001C($sp) +/* 03394 809002D4 AFBF0014 */ sw $ra, 0x0014($sp) /* 03398 809002D8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0339C 809002DC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 033A0 809002E0 24A5E8EC */ addiu $a1, $a1, 0xE8EC ## $a1 = 0600E8EC -/* 033A4 809002E4 AFA70018 */ sw $a3, 0x0018($sp) +/* 033A4 809002E4 AFA70018 */ sw $a3, 0x0018($sp) /* 033A8 809002E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 033AC 809002EC 0C0294D3 */ jal func_800A534C +/* 033AC 809002EC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 033B0 809002F0 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 033B4 809002F4 8FA70018 */ lw $a3, 0x0018($sp) +/* 033B4 809002F4 8FA70018 */ lw $a3, 0x0018($sp) /* 033B8 809002F8 3C0E8090 */ lui $t6, %hi(func_80900344) ## $t6 = 80900000 /* 033BC 809002FC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 033C0 80900300 25CE0344 */ addiu $t6, $t6, %lo(func_80900344) ## $t6 = 80900344 @@ -18,17 +18,17 @@ glabel func_809002CC /* 033CC 8090030C ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 033D0 80900310 A0E00338 */ sb $zero, 0x0338($a3) ## 00000338 /* 033D4 80900314 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 033D8 80900318 A4EF01A2 */ sh $t7, 0x01A2($a3) ## 000001A2 -/* 033DC 8090031C 4600010D */ trunc.w.s $f4, $f0 -/* 033E0 80900320 8FA70018 */ lw $a3, 0x0018($sp) -/* 033E4 80900324 44092000 */ mfc1 $t1, $f4 +/* 033DC 8090031C 4600010D */ trunc.w.s $f4, $f0 +/* 033E0 80900320 8FA70018 */ lw $a3, 0x0018($sp) +/* 033E4 80900324 44092000 */ mfc1 $t1, $f4 /* 033E8 80900328 00000000 */ nop /* 033EC 8090032C 252A0032 */ addiu $t2, $t1, 0x0032 ## $t2 = 00000032 /* 033F0 80900330 A4EA0390 */ sh $t2, 0x0390($a3) ## 00000390 -/* 033F4 80900334 8FBF0014 */ lw $ra, 0x0014($sp) +/* 033F4 80900334 8FBF0014 */ lw $ra, 0x0014($sp) /* 033F8 80900338 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 033FC 8090033C 03E00008 */ jr $ra +/* 033FC 8090033C 03E00008 */ jr $ra /* 03400 80900340 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s index 503ca54bf2..e45a37d378 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s @@ -1,57 +1,57 @@ glabel func_80900344 /* 03404 80900344 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03408 80900348 AFBF001C */ sw $ra, 0x001C($sp) -/* 0340C 8090034C AFB00018 */ sw $s0, 0x0018($sp) -/* 03410 80900350 AFA5002C */ sw $a1, 0x002C($sp) +/* 03408 80900348 AFBF001C */ sw $ra, 0x001C($sp) +/* 0340C 8090034C AFB00018 */ sw $s0, 0x0018($sp) +/* 03410 80900350 AFA5002C */ sw $a1, 0x002C($sp) /* 03414 80900354 848E0390 */ lh $t6, 0x0390($a0) ## 00000390 /* 03418 80900358 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0341C 8090035C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 03420 80900360 55C0000D */ bnel $t6, $zero, .L80900398 +/* 03420 80900360 55C0000D */ bnel $t6, $zero, .L80900398 /* 03424 80900364 26040324 */ addiu $a0, $s0, 0x0324 ## $a0 = 00000324 /* 03428 80900368 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0342C 8090036C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 03430 80900370 00000000 */ nop -/* 03434 80900374 4600010D */ trunc.w.s $f4, $f0 +/* 03434 80900374 4600010D */ trunc.w.s $f4, $f0 /* 03438 80900378 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0343C 8090037C 240539D9 */ addiu $a1, $zero, 0x39D9 ## $a1 = 000039D9 -/* 03440 80900380 44082000 */ mfc1 $t0, $f4 +/* 03440 80900380 44082000 */ mfc1 $t0, $f4 /* 03444 80900384 00000000 */ nop /* 03448 80900388 2509001E */ addiu $t1, $t0, 0x001E ## $t1 = 0000001E /* 0344C 8090038C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03450 80900390 A6090390 */ sh $t1, 0x0390($s0) ## 00000390 /* 03454 80900394 26040324 */ addiu $a0, $s0, 0x0324 ## $a0 = 00000324 .L80900398: /* 03458 80900398 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 0345C 8090039C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03460 809003A0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03464 809003A4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 03468 809003A8 920A0338 */ lbu $t2, 0x0338($s0) ## 00000338 /* 0346C 809003AC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 03470 809003B0 3C054150 */ lui $a1, 0x4150 ## $a1 = 41500000 -/* 03474 809003B4 11400041 */ beq $t2, $zero, .L809004BC +/* 03474 809003B4 11400041 */ beq $t2, $zero, .L809004BC /* 03478 809003B8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0347C 809003BC 0C0295B2 */ jal func_800A56C8 -/* 03480 809003C0 AFA40020 */ sw $a0, 0x0020($sp) -/* 03484 809003C4 10400008 */ beq $v0, $zero, .L809003E8 -/* 03488 809003C8 8FA40020 */ lw $a0, 0x0020($sp) +/* 0347C 809003BC 0C0295B2 */ jal func_800A56C8 +/* 03480 809003C0 AFA40020 */ sw $a0, 0x0020($sp) +/* 03484 809003C4 10400008 */ beq $v0, $zero, .L809003E8 +/* 03488 809003C8 8FA40020 */ lw $a0, 0x0020($sp) /* 0348C 809003CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03490 809003D0 8FA5002C */ lw $a1, 0x002C($sp) +/* 03490 809003D0 8FA5002C */ lw $a1, 0x002C($sp) /* 03494 809003D4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 03498 809003D8 0C23F535 */ jal func_808FD4D4 +/* 03498 809003D8 0C23F535 */ jal func_808FD4D4 /* 0349C 809003DC 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 034A0 809003E0 1000000A */ beq $zero, $zero, .L8090040C +/* 034A0 809003E0 1000000A */ beq $zero, $zero, .L8090040C /* 034A4 809003E4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 .L809003E8: -/* 034A8 809003E8 0C0295B2 */ jal func_800A56C8 +/* 034A8 809003E8 0C0295B2 */ jal func_800A56C8 /* 034AC 809003EC 3C0541E0 */ lui $a1, 0x41E0 ## $a1 = 41E00000 -/* 034B0 809003F0 10400005 */ beq $v0, $zero, .L80900408 +/* 034B0 809003F0 10400005 */ beq $v0, $zero, .L80900408 /* 034B4 809003F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034B8 809003F8 8FA5002C */ lw $a1, 0x002C($sp) +/* 034B8 809003F8 8FA5002C */ lw $a1, 0x002C($sp) /* 034BC 809003FC 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 034C0 80900400 0C23F535 */ jal func_808FD4D4 +/* 034C0 80900400 0C23F535 */ jal func_808FD4D4 /* 034C4 80900404 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 .L80900408: /* 034C8 80900408 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -60,48 +60,48 @@ glabel func_80900344 /* 034D0 80900410 C6020090 */ lwc1 $f2, 0x0090($s0) ## 00000090 /* 034D4 80900414 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 034D8 80900418 24A5E8EC */ addiu $a1, $a1, 0xE8EC ## $a1 = 0600E8EC -/* 034DC 8090041C 4606103C */ c.lt.s $f2, $f6 +/* 034DC 8090041C 4606103C */ c.lt.s $f2, $f6 /* 034E0 80900420 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 034E4 80900424 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 034E8 80900428 45020007 */ bc1fl .L80900448 +/* 034E8 80900428 45020007 */ bc1fl .L80900448 /* 034EC 8090042C 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 /* 034F0 80900430 A2000338 */ sb $zero, 0x0338($s0) ## 00000338 -/* 034F4 80900434 0C0294D3 */ jal func_800A534C -/* 034F8 80900438 8FA40020 */ lw $a0, 0x0020($sp) -/* 034FC 8090043C 1000001A */ beq $zero, $zero, .L809004A8 +/* 034F4 80900434 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 034F8 80900438 8FA40020 */ lw $a0, 0x0020($sp) +/* 034FC 8090043C 1000001A */ beq $zero, $zero, .L809004A8 /* 03500 80900440 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 03504 80900444 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 .L80900448: /* 03508 80900448 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 0350C 8090044C 44814000 */ mtc1 $at, $f8 ## $f8 = 300.00 /* 03510 80900450 3C018091 */ lui $at, %hi(D_8090DBB8) ## $at = 80910000 -/* 03514 80900454 C430DBB8 */ lwc1 $f16, %lo(D_8090DBB8)($at) -/* 03518 80900458 46081281 */ sub.s $f10, $f2, $f8 +/* 03514 80900454 C430DBB8 */ lwc1 $f16, %lo(D_8090DBB8)($at) +/* 03518 80900458 46081281 */ sub.s $f10, $f2, $f8 /* 0351C 8090045C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03520 80900460 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 03524 80900464 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 03528 80900468 46105482 */ mul.s $f18, $f10, $f16 -/* 0352C 8090046C 46049000 */ add.s $f0, $f18, $f4 -/* 03530 80900470 4600603C */ c.lt.s $f12, $f0 +/* 03528 80900468 46105482 */ mul.s $f18, $f10, $f16 +/* 0352C 8090046C 46049000 */ add.s $f0, $f18, $f4 +/* 03530 80900470 4600603C */ c.lt.s $f12, $f0 /* 03534 80900474 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 03538 80900478 45020003 */ bc1fl .L80900488 +/* 03538 80900478 45020003 */ bc1fl .L80900488 /* 0353C 8090047C 920B0334 */ lbu $t3, 0x0334($s0) ## 00000334 /* 03540 80900480 E60C0168 */ swc1 $f12, 0x0168($s0) ## 00000168 /* 03544 80900484 920B0334 */ lbu $t3, 0x0334($s0) ## 00000334 .L80900488: -/* 03548 80900488 51600007 */ beql $t3, $zero, .L809004A8 +/* 03548 80900488 51600007 */ beql $t3, $zero, .L809004A8 /* 0354C 8090048C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 03550 80900490 C6060168 */ lwc1 $f6, 0x0168($s0) ## 00000168 /* 03554 80900494 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 /* 03558 80900498 00000000 */ nop -/* 0355C 8090049C 46083282 */ mul.s $f10, $f6, $f8 +/* 0355C 8090049C 46083282 */ mul.s $f10, $f6, $f8 /* 03560 809004A0 E60A0168 */ swc1 $f10, 0x0168($s0) ## 00000168 /* 03564 809004A4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 .L809004A8: /* 03568 809004A8 44819000 */ mtc1 $at, $f18 ## $f18 = 3.00 /* 0356C 809004AC C6100168 */ lwc1 $f16, 0x0168($s0) ## 00000168 -/* 03570 809004B0 46128002 */ mul.s $f0, $f16, $f18 -/* 03574 809004B4 10000012 */ beq $zero, $zero, .L80900500 +/* 03570 809004B0 46128002 */ mul.s $f0, $f16, $f18 +/* 03574 809004B4 10000012 */ beq $zero, $zero, .L80900500 /* 03578 809004B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L809004BC: /* 0357C 809004BC 44810000 */ mtc1 $at, $f0 ## $f0 = 3.00 @@ -110,53 +110,53 @@ glabel func_80900344 /* 03588 809004C8 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 /* 0358C 809004CC 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 03590 809004D0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 03594 809004D4 4604303E */ c.le.s $f6, $f4 +/* 03594 809004D4 4604303E */ c.le.s $f6, $f4 /* 03598 809004D8 24A553C0 */ addiu $a1, $a1, 0x53C0 ## $a1 = 060353C0 /* 0359C 809004DC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 035A0 809004E0 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 035A4 809004E4 45020006 */ bc1fl .L80900500 +/* 035A4 809004E4 45020006 */ bc1fl .L80900500 /* 035A8 809004E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 035AC 809004EC A20C0338 */ sb $t4, 0x0338($s0) ## 00000338 -/* 035B0 809004F0 0C0294D3 */ jal func_800A534C -/* 035B4 809004F4 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 035B8 809004F8 C7A00024 */ lwc1 $f0, 0x0024($sp) +/* 035B0 809004F0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 035B4 809004F4 E7A00024 */ swc1 $f0, 0x0024($sp) +/* 035B8 809004F8 C7A00024 */ lwc1 $f0, 0x0024($sp) /* 035BC 809004FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L80900500: /* 035C0 80900500 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 035C4 80900504 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 035C8 80900508 C7A00024 */ lwc1 $f0, 0x0024($sp) + +/* 035C4 80900504 E7A00024 */ swc1 $f0, 0x0024($sp) +/* 035C8 80900508 C7A00024 */ lwc1 $f0, 0x0024($sp) /* 035CC 8090050C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 035D0 80900510 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 035D4 80900514 44050000 */ mfc1 $a1, $f0 +/* 035D4 80900514 44050000 */ mfc1 $a1, $f0 /* 035D8 80900518 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 035DC 8090051C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 035E0 80900520 860D01A2 */ lh $t5, 0x01A2($s0) ## 000001A2 -/* 035E4 80900524 8FA5002C */ lw $a1, 0x002C($sp) +/* 035E4 80900524 8FA5002C */ lw $a1, 0x002C($sp) /* 035E8 80900528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035EC 8090052C 15A00005 */ bne $t5, $zero, .L80900544 +/* 035EC 8090052C 15A00005 */ bne $t5, $zero, .L80900544 /* 035F0 80900530 00000000 */ nop -/* 035F4 80900534 0C23FF6C */ jal func_808FFDB0 +/* 035F4 80900534 0C23FF6C */ jal func_808FFDB0 /* 035F8 80900538 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035FC 8090053C 10000004 */ beq $zero, $zero, .L80900550 +/* 035FC 8090053C 10000004 */ beq $zero, $zero, .L80900550 /* 03600 80900540 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80900544: -/* 03604 80900544 0C23FF3F */ jal func_808FFCFC -/* 03608 80900548 8FA5002C */ lw $a1, 0x002C($sp) +/* 03604 80900544 0C23FF3F */ jal func_808FFCFC +/* 03608 80900548 8FA5002C */ lw $a1, 0x002C($sp) /* 0360C 8090054C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80900550: -/* 03610 80900550 8FA5002C */ lw $a1, 0x002C($sp) -/* 03614 80900554 0C23FEB2 */ jal func_808FFAC8 +/* 03610 80900550 8FA5002C */ lw $a1, 0x002C($sp) +/* 03614 80900554 0C23FEB2 */ jal func_808FFAC8 /* 03618 80900558 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0361C 8090055C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03620 80900560 8FA5002C */ lw $a1, 0x002C($sp) -/* 03624 80900564 0C23FEEF */ jal func_808FFBBC +/* 03620 80900560 8FA5002C */ lw $a1, 0x002C($sp) +/* 03624 80900564 0C23FEEF */ jal func_808FFBBC /* 03628 80900568 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0362C 8090056C 8FBF001C */ lw $ra, 0x001C($sp) -/* 03630 80900570 8FB00018 */ lw $s0, 0x0018($sp) +/* 0362C 8090056C 8FBF001C */ lw $ra, 0x001C($sp) +/* 03630 80900570 8FB00018 */ lw $s0, 0x0018($sp) /* 03634 80900574 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03638 80900578 03E00008 */ jr $ra +/* 03638 80900578 03E00008 */ jr $ra /* 0363C 8090057C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s index b3b05f7430..18a98d2bd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s @@ -1,54 +1,54 @@ glabel func_80900890 /* 03950 80900890 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 03954 80900894 AFB00014 */ sw $s0, 0x0014($sp) +/* 03954 80900894 AFB00014 */ sw $s0, 0x0014($sp) /* 03958 80900898 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0395C 8090089C AFB10018 */ sw $s1, 0x0018($sp) +/* 0395C 8090089C AFB10018 */ sw $s1, 0x0018($sp) /* 03960 809008A0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03964 809008A4 AFBF001C */ sw $ra, 0x001C($sp) +/* 03964 809008A4 AFBF001C */ sw $ra, 0x001C($sp) /* 03968 809008A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0396C 809008AC 0C030129 */ jal func_800C04A4 +/* 0396C 809008AC 0C030129 */ jal func_800C04A4 /* 03970 809008B0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03974 809008B4 AFA2004C */ sw $v0, 0x004C($sp) +/* 03974 809008B4 AFA2004C */ sw $v0, 0x004C($sp) /* 03978 809008B8 8E2E1C44 */ lw $t6, 0x1C44($s1) ## 00001C44 /* 0397C 809008BC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 03980 809008C0 AFA4002C */ sw $a0, 0x002C($sp) +/* 03980 809008C0 AFA4002C */ sw $a0, 0x002C($sp) /* 03984 809008C4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 03988 809008C8 AFAE0048 */ sw $t6, 0x0048($sp) + +/* 03988 809008C8 AFAE0048 */ sw $t6, 0x0048($sp) /* 0398C 809008CC 8E0F0398 */ lw $t7, 0x0398($s0) ## 00000398 /* 03990 809008D0 9608039C */ lhu $t0, 0x039C($s0) ## 0000039C /* 03994 809008D4 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 /* 03998 809008D8 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 0399C 809008DC 2D01000C */ sltiu $at, $t0, 0x000C +/* 0399C 809008DC 2D01000C */ sltiu $at, $t0, 0x000C /* 039A0 809008E0 AE180398 */ sw $t8, 0x0398($s0) ## 00000398 -/* 039A4 809008E4 10200159 */ beq $at, $zero, .L80900E4C +/* 039A4 809008E4 10200159 */ beq $at, $zero, .L80900E4C /* 039A8 809008E8 A2190339 */ sb $t9, 0x0339($s0) ## 00000339 -/* 039AC 809008EC 00084080 */ sll $t0, $t0, 2 +/* 039AC 809008EC 00084080 */ sll $t0, $t0, 2 /* 039B0 809008F0 3C018091 */ lui $at, %hi(jtbl_8090DBBC) ## $at = 80910000 -/* 039B4 809008F4 00280821 */ addu $at, $at, $t0 -/* 039B8 809008F8 8C28DBBC */ lw $t0, %lo(jtbl_8090DBBC)($at) -/* 039BC 809008FC 01000008 */ jr $t0 +/* 039B4 809008F4 00280821 */ addu $at, $at, $t0 +/* 039B8 809008F8 8C28DBBC */ lw $t0, %lo(jtbl_8090DBBC)($at) +/* 039BC 809008FC 01000008 */ jr $t0 /* 039C0 80900900 00000000 */ nop glabel L80900904 /* 039C4 80900904 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 039C8 80900908 0C019148 */ jal func_80064520 +/* 039C8 80900908 0C019148 */ jal func_80064520 /* 039CC 8090090C 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 -/* 039D0 80900910 0C03008C */ jal func_800C0230 +/* 039D0 80900910 0C03008C */ jal func_800C0230 /* 039D4 80900914 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 039D8 80900918 A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 039DC 8090091C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 039E0 80900920 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 039E4 80900924 0C0300C5 */ jal func_800C0314 +/* 039E4 80900924 0C0300C5 */ jal func_800C0314 /* 039E8 80900928 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 039EC 8090092C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 039F0 80900930 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 039F4 80900934 0C0300C5 */ jal func_800C0314 +/* 039F4 80900934 0C0300C5 */ jal func_800C0314 /* 039F8 80900938 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 039FC 8090093C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03A00 80900940 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03A04 80900944 0C00B7D5 */ jal func_8002DF54 +/* 03A04 80900944 0C00B7D5 */ jal func_8002DF54 /* 03A08 80900948 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 03A0C 8090094C 8FA3004C */ lw $v1, 0x004C($sp) +/* 03A0C 8090094C 8FA3004C */ lw $v1, 0x004C($sp) /* 03A10 80900950 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 03A14 80900954 A609039C */ sh $t1, 0x039C($s0) ## 0000039C /* 03A18 80900958 8C6B005C */ lw $t3, 0x005C($v1) ## 0000005C @@ -60,7 +60,7 @@ glabel L80900904 /* 03A30 80900970 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03A34 80900974 AE0A03A8 */ sw $t2, 0x03A8($s0) ## 000003A8 /* 03A38 80900978 8C6B0064 */ lw $t3, 0x0064($v1) ## 00000064 -/* 03A3C 8090097C 00310821 */ addu $at, $at, $s1 +/* 03A3C 8090097C 00310821 */ addu $at, $at, $s1 /* 03A40 80900980 AE0B03AC */ sw $t3, 0x03AC($s0) ## 000003AC /* 03A44 80900984 8C6D0050 */ lw $t5, 0x0050($v1) ## 00000050 /* 03A48 80900988 AE0D03B0 */ sw $t5, 0x03B0($s0) ## 000003B0 @@ -74,13 +74,13 @@ glabel L80900904 glabel L809009A8 /* 03A68 809009A8 261803A4 */ addiu $t8, $s0, 0x03A4 ## $t8 = 000003A4 /* 03A6C 809009AC 261903B0 */ addiu $t9, $s0, 0x03B0 ## $t9 = 000003B0 -/* 03A70 809009B0 AFB90024 */ sw $t9, 0x0024($sp) -/* 03A74 809009B4 AFB80028 */ sw $t8, 0x0028($sp) +/* 03A70 809009B0 AFB90024 */ sw $t9, 0x0024($sp) +/* 03A74 809009B4 AFB80028 */ sw $t8, 0x0028($sp) /* 03A78 809009B8 860801A4 */ lh $t0, 0x01A4($s0) ## 000001A4 /* 03A7C 809009BC 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 03A80 809009C0 55010004 */ bnel $t0, $at, .L809009D4 +/* 03A80 809009C0 55010004 */ bnel $t0, $at, .L809009D4 /* 03A84 809009C4 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 03A88 809009C8 0C01E221 */ jal func_80078884 +/* 03A88 809009C8 0C01E221 */ jal func_80078884 /* 03A8C 809009CC 240439D7 */ addiu $a0, $zero, 0x39D7 ## $a0 = 000039D7 /* 03A90 809009D0 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 .L809009D4: @@ -88,81 +88,81 @@ glabel L809009A8 /* 03A98 809009D8 44815000 */ mtc1 $at, $f10 ## $f10 = 32768.00 /* 03A9C 809009DC 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 /* 03AA0 809009E0 3C018091 */ lui $at, %hi(D_8090DBEC) ## $at = 80910000 -/* 03AA4 809009E4 C432DBEC */ lwc1 $f18, %lo(D_8090DBEC)($at) -/* 03AA8 809009E8 46803220 */ cvt.s.w $f8, $f6 +/* 03AA4 809009E4 C432DBEC */ lwc1 $f18, %lo(D_8090DBEC)($at) +/* 03AA8 809009E8 46803220 */ cvt.s.w $f8, $f6 /* 03AAC 809009EC 3C018091 */ lui $at, %hi(D_8090DBF0) ## $at = 80910000 -/* 03AB0 809009F0 C426DBF0 */ lwc1 $f6, %lo(D_8090DBF0)($at) +/* 03AB0 809009F0 C426DBF0 */ lwc1 $f6, %lo(D_8090DBF0)($at) /* 03AB4 809009F4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03AB8 809009F8 460A4403 */ div.s $f16, $f8, $f10 -/* 03ABC 809009FC 46128102 */ mul.s $f4, $f16, $f18 -/* 03AC0 80900A00 0C034348 */ jal Matrix_RotateY -/* 03AC4 80900A04 46062300 */ add.s $f12, $f4, $f6 +/* 03AB8 809009F8 460A4403 */ div.s $f16, $f8, $f10 +/* 03ABC 809009FC 46128102 */ mul.s $f4, $f16, $f18 +/* 03AC0 80900A00 0C034348 */ jal Matrix_RotateY +/* 03AC4 80900A04 46062300 */ add.s $f12, $f4, $f6 /* 03AC8 80900A08 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 03ACC 80900A0C 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 03AD0 80900A10 44814000 */ mtc1 $at, $f8 ## $f8 = 250.00 /* 03AD4 80900A14 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFF4 /* 03AD8 80900A18 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 03ADC 80900A1C E7A0005C */ swc1 $f0, 0x005C($sp) -/* 03AE0 80900A20 E7A00060 */ swc1 $f0, 0x0060($sp) -/* 03AE4 80900A24 0C0346BD */ jal Matrix_MultVec3f -/* 03AE8 80900A28 E7A80064 */ swc1 $f8, 0x0064($sp) +/* 03ADC 80900A1C E7A0005C */ swc1 $f0, 0x005C($sp) +/* 03AE0 80900A20 E7A00060 */ swc1 $f0, 0x0060($sp) +/* 03AE4 80900A24 0C0346BD */ jal Matrix_MultVec3f +/* 03AE8 80900A28 E7A80064 */ swc1 $f8, 0x0064($sp) /* 03AEC 80900A2C C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 03AF0 80900A30 C7B00050 */ lwc1 $f16, 0x0050($sp) +/* 03AF0 80900A30 C7B00050 */ lwc1 $f16, 0x0050($sp) /* 03AF4 80900A34 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03AF8 80900A38 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 03AFC 80900A3C 46105480 */ add.s $f18, $f10, $f16 -/* 03B00 80900A40 8FA40028 */ lw $a0, 0x0028($sp) +/* 03AFC 80900A3C 46105480 */ add.s $f18, $f10, $f16 +/* 03B00 80900A40 8FA40028 */ lw $a0, 0x0028($sp) /* 03B04 80900A44 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 03B08 80900A48 44059000 */ mfc1 $a1, $f18 +/* 03B08 80900A48 44059000 */ mfc1 $a1, $f18 /* 03B0C 80900A4C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03B10 80900A50 00000000 */ nop /* 03B14 80900A54 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B18 80900A58 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 03B1C 80900A5C 260403A8 */ addiu $a0, $s0, 0x03A8 ## $a0 = 000003A8 /* 03B20 80900A60 3C05448E */ lui $a1, 0x448E ## $a1 = 448E0000 /* 03B24 80900A64 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03B28 80900A68 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B2C 80900A6C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 03B30 80900A70 C7A60058 */ lwc1 $f6, 0x0058($sp) +/* 03B30 80900A70 C7A60058 */ lwc1 $f6, 0x0058($sp) /* 03B34 80900A74 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B38 80900A78 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 03B3C 80900A7C 46062200 */ add.s $f8, $f4, $f6 +/* 03B3C 80900A7C 46062200 */ add.s $f8, $f4, $f6 /* 03B40 80900A80 260403AC */ addiu $a0, $s0, 0x03AC ## $a0 = 000003AC /* 03B44 80900A84 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 03B48 80900A88 44054000 */ mfc1 $a1, $f8 +/* 03B48 80900A88 44054000 */ mfc1 $a1, $f8 /* 03B4C 80900A8C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03B50 80900A90 00000000 */ nop /* 03B54 80900A94 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B58 80900A98 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 03B5C 80900A9C 8FA40024 */ lw $a0, 0x0024($sp) +/* 03B5C 80900A9C 8FA40024 */ lw $a0, 0x0024($sp) /* 03B60 80900AA0 8E0501B8 */ lw $a1, 0x01B8($s0) ## 000001B8 /* 03B64 80900AA4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03B68 80900AA8 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B6C 80900AAC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B70 80900AB0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 03B74 80900AB4 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 03B78 80900AB8 8E0501BC */ lw $a1, 0x01BC($s0) ## 000001BC /* 03B7C 80900ABC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03B80 80900AC0 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B84 80900AC4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B88 80900AC8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 03B8C 80900ACC 260403B8 */ addiu $a0, $s0, 0x03B8 ## $a0 = 000003B8 /* 03B90 80900AD0 8E0501C0 */ lw $a1, 0x01C0($s0) ## 000001C0 /* 03B94 80900AD4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03B98 80900AD8 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B9C 80900ADC 860A01A4 */ lh $t2, 0x01A4($s0) ## 000001A4 /* 03BA0 80900AE0 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 03BA4 80900AE4 240C005A */ addiu $t4, $zero, 0x005A ## $t4 = 0000005A -/* 03BA8 80900AE8 554000D9 */ bnel $t2, $zero, .L80900E50 +/* 03BA8 80900AE8 554000D9 */ bnel $t2, $zero, .L80900E50 /* 03BAC 80900AEC 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 03BB0 80900AF0 A60B039C */ sh $t3, 0x039C($s0) ## 0000039C -/* 03BB4 80900AF4 100000D5 */ beq $zero, $zero, .L80900E4C +/* 03BB4 80900AF4 100000D5 */ beq $zero, $zero, .L80900E4C /* 03BB8 80900AF8 A60C01A4 */ sh $t4, 0x01A4($s0) ## 000001A4 glabel L80900AFC /* 03BBC 80900AFC 3C028091 */ lui $v0, %hi(D_8090EB2C) ## $v0 = 80910000 @@ -179,18 +179,18 @@ glabel L80900AFC /* 03BE8 80900B28 C5CA0024 */ lwc1 $f10, 0x0024($t6) ## 00000024 /* 03BEC 80900B2C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 03BF0 80900B30 26040324 */ addiu $a0, $s0, 0x0324 ## $a0 = 00000324 -/* 03BF4 80900B34 46105481 */ sub.s $f18, $f10, $f16 +/* 03BF4 80900B34 46105481 */ sub.s $f18, $f10, $f16 /* 03BF8 80900B38 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 03BFC 80900B3C 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 03C00 80900B40 E61203A4 */ swc1 $f18, 0x03A4($s0) ## 000003A4 /* 03C04 80900B44 8C4F0000 */ lw $t7, 0x0000($v0) ## 8090EB2C /* 03C08 80900B48 C5E40028 */ lwc1 $f4, 0x0028($t7) ## 00000028 -/* 03C0C 80900B4C 46002180 */ add.s $f6, $f4, $f0 +/* 03C0C 80900B4C 46002180 */ add.s $f6, $f4, $f0 /* 03C10 80900B50 E60603A8 */ swc1 $f6, 0x03A8($s0) ## 000003A8 /* 03C14 80900B54 8C580000 */ lw $t8, 0x0000($v0) ## 8090EB2C /* 03C18 80900B58 C708002C */ lwc1 $f8, 0x002C($t8) ## 0000002C -/* 03C1C 80900B5C 46004280 */ add.s $f10, $f8, $f0 -/* 03C20 80900B60 46025401 */ sub.s $f16, $f10, $f2 +/* 03C1C 80900B5C 46004280 */ add.s $f10, $f8, $f0 +/* 03C20 80900B60 46025401 */ sub.s $f16, $f10, $f2 /* 03C24 80900B64 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 03C28 80900B68 E61003AC */ swc1 $f16, 0x03AC($s0) ## 000003AC /* 03C2C 80900B6C 8C590000 */ lw $t9, 0x0000($v0) ## 8090EB2C @@ -198,40 +198,40 @@ glabel L80900AFC /* 03C34 80900B74 E61203B0 */ swc1 $f18, 0x03B0($s0) ## 000003B0 /* 03C38 80900B78 8C480000 */ lw $t0, 0x0000($v0) ## 8090EB2C /* 03C3C 80900B7C C5040028 */ lwc1 $f4, 0x0028($t0) ## 00000028 -/* 03C40 80900B80 46002180 */ add.s $f6, $f4, $f0 +/* 03C40 80900B80 46002180 */ add.s $f6, $f4, $f0 /* 03C44 80900B84 E60603B4 */ swc1 $f6, 0x03B4($s0) ## 000003B4 /* 03C48 80900B88 8C490000 */ lw $t1, 0x0000($v0) ## 8090EB2C /* 03C4C 80900B8C C528002C */ lwc1 $f8, 0x002C($t1) ## 0000002C -/* 03C50 80900B90 460A4401 */ sub.s $f16, $f8, $f10 +/* 03C50 80900B90 460A4401 */ sub.s $f16, $f8, $f10 /* 03C54 80900B94 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 03C58 80900B98 E61003B8 */ swc1 $f16, 0x03B8($s0) ## 000003B8 /* 03C5C 80900B9C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03C60 80900BA0 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 03C64 80900BA4 3C073CA0 */ lui $a3, 0x3CA0 ## $a3 = 3CA00000 /* 03C68 80900BA8 34E7A0A1 */ ori $a3, $a3, 0xA0A1 ## $a3 = 3CA0A0A1 -/* 03C6C 80900BAC 02212021 */ addu $a0, $s1, $at +/* 03C6C 80900BAC 02212021 */ addu $a0, $s1, $at /* 03C70 80900BB0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 03C74 80900BB4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03C78 80900BB8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03C7C 80900BBC 860201A4 */ lh $v0, 0x01A4($s0) ## 000001A4 /* 03C80 80900BC0 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 /* 03C84 80900BC4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03C88 80900BC8 14410004 */ bne $v0, $at, .L80900BDC +/* 03C88 80900BC8 14410004 */ bne $v0, $at, .L80900BDC /* 03C8C 80900BCC 240570D7 */ addiu $a1, $zero, 0x70D7 ## $a1 = 000070D7 -/* 03C90 80900BD0 0C042DA0 */ jal func_8010B680 +/* 03C90 80900BD0 0C042DA0 */ jal func_8010B680 /* 03C94 80900BD4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 03C98 80900BD8 860201A4 */ lh $v0, 0x01A4($s0) ## 000001A4 .L80900BDC: -/* 03C9C 80900BDC 2841001E */ slti $at, $v0, 0x001E -/* 03CA0 80900BE0 5020009B */ beql $at, $zero, .L80900E50 +/* 03C9C 80900BDC 2841001E */ slti $at, $v0, 0x001E +/* 03CA0 80900BE0 5020009B */ beql $at, $zero, .L80900E50 /* 03CA4 80900BE4 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 03CA8 80900BE8 0C042F6F */ jal func_8010BDBC +/* 03CA8 80900BE8 0C042F6F */ jal func_8010BDBC /* 03CAC 80900BEC 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 03CB0 80900BF0 14400096 */ bne $v0, $zero, .L80900E4C +/* 03CB0 80900BF0 14400096 */ bne $v0, $zero, .L80900E4C /* 03CB4 80900BF4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03CB8 80900BF8 0C030129 */ jal func_800C04A4 +/* 03CB8 80900BF8 0C030129 */ jal func_800C04A4 /* 03CBC 80900BFC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03CC0 80900C00 260303A4 */ addiu $v1, $s0, 0x03A4 ## $v1 = 000003A4 /* 03CC4 80900C04 8C6B0000 */ lw $t3, 0x0000($v1) ## 000003A4 @@ -254,33 +254,33 @@ glabel L80900AFC /* 03D08 80900C48 AC4E0054 */ sw $t6, 0x0054($v0) ## 00000054 /* 03D0C 80900C4C 8E0F03B8 */ lw $t7, 0x03B8($s0) ## 000003B8 /* 03D10 80900C50 AC4F0058 */ sw $t7, 0x0058($v0) ## 00000058 -/* 03D14 80900C54 0C03022B */ jal func_800C08AC +/* 03D14 80900C54 0C03022B */ jal func_800C08AC /* 03D18 80900C58 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 03D1C 80900C5C A600039E */ sh $zero, 0x039E($s0) ## 0000039E /* 03D20 80900C60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03D24 80900C64 0C01914D */ jal func_80064534 +/* 03D24 80900C64 0C01914D */ jal func_80064534 /* 03D28 80900C68 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 /* 03D2C 80900C6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D30 80900C70 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03D34 80900C74 0C00B7D5 */ jal func_8002DF54 +/* 03D34 80900C74 0C00B7D5 */ jal func_8002DF54 /* 03D38 80900C78 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03D3C 80900C7C 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 03D40 80900C80 10000072 */ beq $zero, $zero, .L80900E4C +/* 03D40 80900C80 10000072 */ beq $zero, $zero, .L80900E4C /* 03D44 80900C84 A618039C */ sh $t8, 0x039C($s0) ## 0000039C glabel L80900C88 /* 03D48 80900C88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03D4C 80900C8C 0C019148 */ jal func_80064520 +/* 03D4C 80900C8C 0C019148 */ jal func_80064520 /* 03D50 80900C90 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 -/* 03D54 80900C94 0C03008C */ jal func_800C0230 +/* 03D54 80900C94 0C03008C */ jal func_800C0230 /* 03D58 80900C98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D5C 80900C9C A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 03D60 80900CA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D64 80900CA4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03D68 80900CA8 0C0300C5 */ jal func_800C0314 +/* 03D68 80900CA8 0C0300C5 */ jal func_800C0314 /* 03D6C 80900CAC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03D70 80900CB0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D74 80900CB4 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 03D78 80900CB8 0C0300C5 */ jal func_800C0314 +/* 03D78 80900CB8 0C0300C5 */ jal func_800C0314 /* 03D7C 80900CBC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03D80 80900CC0 2419000B */ addiu $t9, $zero, 0x000B ## $t9 = 0000000B /* 03D84 80900CC4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 @@ -288,7 +288,7 @@ glabel L80900C88 /* 03D8C 80900CCC A2080334 */ sb $t0, 0x0334($s0) ## 00000334 /* 03D90 80900CD0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D94 80900CD4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03D98 80900CD8 0C00B7D5 */ jal func_8002DF54 +/* 03D98 80900CD8 0C00B7D5 */ jal func_8002DF54 /* 03D9C 80900CDC 24060060 */ addiu $a2, $zero, 0x0060 ## $a2 = 00000060 /* 03DA0 80900CE0 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L80900CE4 @@ -304,11 +304,11 @@ glabel L80900CE4 /* 03DC8 80900D08 C5320024 */ lwc1 $f18, 0x0024($t1) ## 00000024 /* 03DCC 80900D0C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 03DD0 80900D10 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 03DD4 80900D14 46049180 */ add.s $f6, $f18, $f4 -/* 03DD8 80900D18 8FA30048 */ lw $v1, 0x0048($sp) +/* 03DD4 80900D14 46049180 */ add.s $f6, $f18, $f4 +/* 03DD8 80900D18 8FA30048 */ lw $v1, 0x0048($sp) /* 03DDC 80900D1C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 03DE0 80900D20 240B8000 */ addiu $t3, $zero, 0x8000 ## $t3 = FFFF8000 -/* 03DE4 80900D24 46083280 */ add.s $f10, $f6, $f8 +/* 03DE4 80900D24 46083280 */ add.s $f10, $f6, $f8 /* 03DE8 80900D28 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 03DEC 80900D2C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 03DF0 80900D30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -317,13 +317,13 @@ glabel L80900CE4 /* 03DFC 80900D3C C4640024 */ lwc1 $f4, 0x0024($v1) ## 00000024 /* 03E00 80900D40 44815000 */ mtc1 $at, $f10 ## $f10 = 80.00 /* 03E04 80900D44 C550002C */ lwc1 $f16, 0x002C($t2) ## 0000002C -/* 03E08 80900D48 46062200 */ add.s $f8, $f4, $f6 +/* 03E08 80900D48 46062200 */ add.s $f8, $f4, $f6 /* 03E0C 80900D4C A46B00B6 */ sh $t3, 0x00B6($v1) ## 000000B6 /* 03E10 80900D50 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 03E14 80900D54 46008481 */ sub.s $f18, $f16, $f0 +/* 03E14 80900D54 46008481 */ sub.s $f18, $f16, $f0 /* 03E18 80900D58 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 /* 03E1C 80900D5C 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 03E20 80900D60 460A4401 */ sub.s $f16, $f8, $f10 +/* 03E20 80900D60 460A4401 */ sub.s $f16, $f8, $f10 /* 03E24 80900D64 E472002C */ swc1 $f18, 0x002C($v1) ## 0000002C /* 03E28 80900D68 8E0C0398 */ lw $t4, 0x0398($s0) ## 00000398 /* 03E2C 80900D6C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 @@ -331,24 +331,24 @@ glabel L80900CE4 /* 03E34 80900D74 C4720028 */ lwc1 $f18, 0x0028($v1) ## 00000028 /* 03E38 80900D78 44818000 */ mtc1 $at, $f16 ## $f16 = 110.00 /* 03E3C 80900D7C 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -/* 03E40 80900D80 46029100 */ add.s $f4, $f18, $f2 +/* 03E40 80900D80 46029100 */ add.s $f4, $f18, $f2 /* 03E44 80900D84 262D1D64 */ addiu $t5, $s1, 0x1D64 ## $t5 = 00001D64 -/* 03E48 80900D88 46062201 */ sub.s $f8, $f4, $f6 +/* 03E48 80900D88 46062201 */ sub.s $f8, $f4, $f6 /* 03E4C 80900D8C E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 03E50 80900D90 C46A002C */ lwc1 $f10, 0x002C($v1) ## 0000002C -/* 03E54 80900D94 46105481 */ sub.s $f18, $f10, $f16 +/* 03E54 80900D94 46105481 */ sub.s $f18, $f10, $f16 /* 03E58 80900D98 E61203AC */ swc1 $f18, 0x03AC($s0) ## 000003AC /* 03E5C 80900D9C C4640024 */ lwc1 $f4, 0x0024($v1) ## 00000024 /* 03E60 80900DA0 E60403B0 */ swc1 $f4, 0x03B0($s0) ## 000003B0 /* 03E64 80900DA4 C4660028 */ lwc1 $f6, 0x0028($v1) ## 00000028 -/* 03E68 80900DA8 46023200 */ add.s $f8, $f6, $f2 -/* 03E6C 80900DAC 46004281 */ sub.s $f10, $f8, $f0 +/* 03E68 80900DA8 46023200 */ add.s $f8, $f6, $f2 +/* 03E6C 80900DAC 46004281 */ sub.s $f10, $f8, $f0 /* 03E70 80900DB0 E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 /* 03E74 80900DB4 C470002C */ lwc1 $f16, 0x002C($v1) ## 0000002C -/* 03E78 80900DB8 15810024 */ bne $t4, $at, .L80900E4C +/* 03E78 80900DB8 15810024 */ bne $t4, $at, .L80900E4C /* 03E7C 80900DBC E61003B8 */ swc1 $f16, 0x03B8($s0) ## 000003B8 -/* 03E80 80900DC0 0C030129 */ jal func_800C04A4 -/* 03E84 80900DC4 AFAD0028 */ sw $t5, 0x0028($sp) +/* 03E80 80900DC0 0C030129 */ jal func_800C04A4 +/* 03E84 80900DC4 AFAD0028 */ sw $t5, 0x0028($sp) /* 03E88 80900DC8 260303A4 */ addiu $v1, $s0, 0x03A4 ## $v1 = 000003A4 /* 03E8C 80900DCC 8C6F0000 */ lw $t7, 0x0000($v1) ## 000003A4 /* 03E90 80900DD0 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 @@ -372,15 +372,15 @@ glabel L80900CE4 /* 03ED8 80900E18 8E0903B8 */ lw $t1, 0x03B8($s0) ## 000003B8 /* 03EDC 80900E1C AC490058 */ sw $t1, 0x0058($v0) ## 00000058 /* 03EE0 80900E20 A60A039C */ sh $t2, 0x039C($s0) ## 0000039C -/* 03EE4 80900E24 0C03022B */ jal func_800C08AC +/* 03EE4 80900E24 0C03022B */ jal func_800C08AC /* 03EE8 80900E28 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 03EEC 80900E2C A600039E */ sh $zero, 0x039E($s0) ## 0000039E -/* 03EF0 80900E30 8FA50028 */ lw $a1, 0x0028($sp) -/* 03EF4 80900E34 0C01914D */ jal func_80064534 +/* 03EF0 80900E30 8FA50028 */ lw $a1, 0x0028($sp) +/* 03EF4 80900E34 0C01914D */ jal func_80064534 /* 03EF8 80900E38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03EFC 80900E3C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03F00 80900E40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03F04 80900E44 0C00B7D5 */ jal func_8002DF54 +/* 03F04 80900E44 0C00B7D5 */ jal func_8002DF54 /* 03F08 80900E48 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 glabel L80900E4C .L80900E4C: @@ -388,119 +388,119 @@ glabel L80900E4C .L80900E50: /* 03F10 80900E50 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03F14 80900E54 260603B0 */ addiu $a2, $s0, 0x03B0 ## $a2 = 000003B0 -/* 03F18 80900E58 50A00004 */ beql $a1, $zero, .L80900E6C +/* 03F18 80900E58 50A00004 */ beql $a1, $zero, .L80900E6C /* 03F1C 80900E5C 860201AC */ lh $v0, 0x01AC($s0) ## 000001AC -/* 03F20 80900E60 0C030136 */ jal func_800C04D8 +/* 03F20 80900E60 0C030136 */ jal func_800C04D8 /* 03F24 80900E64 260703A4 */ addiu $a3, $s0, 0x03A4 ## $a3 = 000003A4 /* 03F28 80900E68 860201AC */ lh $v0, 0x01AC($s0) ## 000001AC .L80900E6C: /* 03F2C 80900E6C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03F30 80900E70 8FA4002C */ lw $a0, 0x002C($sp) -/* 03F34 80900E74 10400008 */ beq $v0, $zero, .L80900E98 +/* 03F30 80900E70 8FA4002C */ lw $a0, 0x002C($sp) +/* 03F34 80900E74 10400008 */ beq $v0, $zero, .L80900E98 /* 03F38 80900E78 00000000 */ nop -/* 03F3C 80900E7C 10410011 */ beq $v0, $at, .L80900EC4 +/* 03F3C 80900E7C 10410011 */ beq $v0, $at, .L80900EC4 /* 03F40 80900E80 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 /* 03F44 80900E84 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03F48 80900E88 10410041 */ beq $v0, $at, .L80900F90 +/* 03F48 80900E88 10410041 */ beq $v0, $at, .L80900F90 /* 03F4C 80900E8C 26040324 */ addiu $a0, $s0, 0x0324 ## $a0 = 00000324 -/* 03F50 80900E90 1000005B */ beq $zero, $zero, .L80901000 +/* 03F50 80900E90 1000005B */ beq $zero, $zero, .L80901000 /* 03F54 80900E94 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 .L80900E98: -/* 03F58 80900E98 0C0295B2 */ jal func_800A56C8 +/* 03F58 80900E98 0C0295B2 */ jal func_800A56C8 /* 03F5C 80900E9C 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 03F60 80900EA0 10400056 */ beq $v0, $zero, .L80900FFC -/* 03F64 80900EA4 8FA4002C */ lw $a0, 0x002C($sp) +/* 03F60 80900EA0 10400056 */ beq $v0, $zero, .L80900FFC +/* 03F64 80900EA4 8FA4002C */ lw $a0, 0x002C($sp) /* 03F68 80900EA8 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 03F6C 80900EAC 24A54278 */ addiu $a1, $a1, 0x4278 ## $a1 = 06034278 -/* 03F70 80900EB0 0C0294D3 */ jal func_800A534C +/* 03F70 80900EB0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 03F74 80900EB4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03F78 80900EB8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 03F7C 80900EBC 1000004F */ beq $zero, $zero, .L80900FFC +/* 03F7C 80900EBC 1000004F */ beq $zero, $zero, .L80900FFC /* 03F80 80900EC0 A60B01AC */ sh $t3, 0x01AC($s0) ## 000001AC .L80900EC4: -/* 03F84 80900EC4 01916021 */ addu $t4, $t4, $s1 +/* 03F84 80900EC4 01916021 */ addu $t4, $t4, $s1 /* 03F88 80900EC8 8D8C1DE4 */ lw $t4, 0x1DE4($t4) ## 00001DE4 /* 03F8C 80900ECC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03F90 80900ED0 318D001F */ andi $t5, $t4, 0x001F ## $t5 = 00000000 -/* 03F94 80900ED4 55A00004 */ bnel $t5, $zero, .L80900EE8 +/* 03F94 80900ED4 55A00004 */ bnel $t5, $zero, .L80900EE8 /* 03F98 80900ED8 860E01A2 */ lh $t6, 0x01A2($s0) ## 000001A2 /* 03F9C 80900EDC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03FA0 80900EE0 240539AF */ addiu $a1, $zero, 0x39AF ## $a1 = 000039AF /* 03FA4 80900EE4 860E01A2 */ lh $t6, 0x01A2($s0) ## 000001A2 .L80900EE8: -/* 03FA8 80900EE8 8FA20048 */ lw $v0, 0x0048($sp) +/* 03FA8 80900EE8 8FA20048 */ lw $v0, 0x0048($sp) /* 03FAC 80900EEC 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -/* 03FB0 80900EF0 51C00005 */ beql $t6, $zero, .L80900F08 +/* 03FB0 80900EF0 51C00005 */ beql $t6, $zero, .L80900F08 /* 03FB4 80900EF4 44817000 */ mtc1 $at, $f14 ## $f14 = -200.00 /* 03FB8 80900EF8 920F0334 */ lbu $t7, 0x0334($s0) ## 00000334 -/* 03FBC 80900EFC 51E00040 */ beql $t7, $zero, .L80901000 +/* 03FBC 80900EFC 51E00040 */ beql $t7, $zero, .L80901000 /* 03FC0 80900F00 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 03FC4 80900F04 44817000 */ mtc1 $at, $f14 ## $f14 = -200.00 .L80900F08: /* 03FC8 80900F08 C4520024 */ lwc1 $f18, 0x0024($v0) ## 00000024 /* 03FCC 80900F0C C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C /* 03FD0 80900F10 3C014444 */ lui $at, 0x4444 ## $at = 44440000 -/* 03FD4 80900F14 46127081 */ sub.s $f2, $f14, $f18 +/* 03FD4 80900F14 46127081 */ sub.s $f2, $f14, $f18 /* 03FD8 80900F18 44815000 */ mtc1 $at, $f10 ## $f10 = 784.00 /* 03FDC 80900F1C 3C110603 */ lui $s1, 0x0603 ## $s1 = 06030000 -/* 03FE0 80900F20 46047301 */ sub.s $f12, $f14, $f4 -/* 03FE4 80900F24 46021182 */ mul.s $f6, $f2, $f2 +/* 03FE0 80900F20 46047301 */ sub.s $f12, $f14, $f4 +/* 03FE4 80900F24 46021182 */ mul.s $f6, $f2, $f2 /* 03FE8 80900F28 263134F8 */ addiu $s1, $s1, 0x34F8 ## $s1 = 060334F8 /* 03FEC 80900F2C 02202825 */ or $a1, $s1, $zero ## $a1 = 060334F8 -/* 03FF0 80900F30 460C6202 */ mul.s $f8, $f12, $f12 -/* 03FF4 80900F34 8FA4002C */ lw $a0, 0x002C($sp) -/* 03FF8 80900F38 46083000 */ add.s $f0, $f6, $f8 -/* 03FFC 80900F3C 46000004 */ sqrt.s $f0, $f0 -/* 04000 80900F40 460A003E */ c.le.s $f0, $f10 +/* 03FF0 80900F30 460C6202 */ mul.s $f8, $f12, $f12 +/* 03FF4 80900F34 8FA4002C */ lw $a0, 0x002C($sp) +/* 03FF8 80900F38 46083000 */ add.s $f0, $f6, $f8 +/* 03FFC 80900F3C 46000004 */ sqrt.s $f0, $f0 +/* 04000 80900F40 460A003E */ c.le.s $f0, $f10 /* 04004 80900F44 00000000 */ nop -/* 04008 80900F48 4502002D */ bc1fl .L80901000 +/* 04008 80900F48 4502002D */ bc1fl .L80901000 /* 0400C 80900F4C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 04010 80900F50 0C029490 */ jal func_800A5240 +/* 04010 80900F50 0C029490 */ jal func_800A5240 /* 04014 80900F54 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 04018 80900F58 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0401C 80900F5C 02202025 */ or $a0, $s1, $zero ## $a0 = 060334F8 /* 04020 80900F60 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 04024 80900F64 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 04028 80900F68 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 -/* 0402C 80900F6C 468084A0 */ cvt.s.w $f18, $f16 +/* 0402C 80900F6C 468084A0 */ cvt.s.w $f18, $f16 /* 04030 80900F70 A61801AC */ sh $t8, 0x01AC($s0) ## 000001AC /* 04034 80900F74 A61901A2 */ sh $t9, 0x01A2($s0) ## 000001A2 /* 04038 80900F78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0403C 80900F7C 2405398F */ addiu $a1, $zero, 0x398F ## $a1 = 0000398F /* 04040 80900F80 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04044 80900F84 E6120194 */ swc1 $f18, 0x0194($s0) ## 00000194 -/* 04048 80900F88 1000001D */ beq $zero, $zero, .L80901000 +/* 04048 80900F88 1000001D */ beq $zero, $zero, .L80901000 /* 0404C 80900F8C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 .L80900F90: /* 04050 80900F90 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04054 80900F94 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 04058 80900F98 02214021 */ addu $t0, $s1, $at -/* 0405C 80900F9C AFA80028 */ sw $t0, 0x0028($sp) +/* 04058 80900F98 02214021 */ addu $t0, $s1, $at +/* 0405C 80900F9C AFA80028 */ sw $t0, 0x0028($sp) /* 04060 80900FA0 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 04064 80900FA4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04068 80900FA8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0406C 80900FAC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 04070 80900FB0 3C063D20 */ lui $a2, 0x3D20 ## $a2 = 3D200000 /* 04074 80900FB4 34C6A0A1 */ ori $a2, $a2, 0xA0A1 ## $a2 = 3D20A0A1 -/* 04078 80900FB8 8FA40028 */ lw $a0, 0x0028($sp) +/* 04078 80900FB8 8FA40028 */ lw $a0, 0x0028($sp) /* 0407C 80900FBC 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 04080 80900FC0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 04084 80900FC4 8FA4002C */ lw $a0, 0x002C($sp) -/* 04088 80900FC8 0C0295B2 */ jal func_800A56C8 +/* 04084 80900FC4 8FA4002C */ lw $a0, 0x002C($sp) +/* 04088 80900FC8 0C0295B2 */ jal func_800A56C8 /* 0408C 80900FCC 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 04090 80900FD0 1040000A */ beq $v0, $zero, .L80900FFC +/* 04090 80900FD0 1040000A */ beq $v0, $zero, .L80900FFC /* 04094 80900FD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04098 80900FD8 0C23FF6C */ jal func_808FFDB0 +/* 04098 80900FD8 0C23FF6C */ jal func_808FFDB0 /* 0409C 80900FDC 02202825 */ or $a1, $s1, $zero ## $a1 = 060334F8 /* 040A0 80900FE0 92090334 */ lbu $t1, 0x0334($s0) ## 00000334 /* 040A4 80900FE4 240A0019 */ addiu $t2, $zero, 0x0019 ## $t2 = 00000019 /* 040A8 80900FE8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 040AC 80900FEC 55200003 */ bnel $t1, $zero, .L80900FFC +/* 040AC 80900FEC 55200003 */ bnel $t1, $zero, .L80900FFC /* 040B0 80900FF0 A20B0336 */ sb $t3, 0x0336($s0) ## 00000336 /* 040B4 80900FF4 A20A00AF */ sb $t2, 0x00AF($s0) ## 000000AF /* 040B8 80900FF8 A20B0336 */ sb $t3, 0x0336($s0) ## 00000336 @@ -509,12 +509,12 @@ glabel L80900E4C .L80901000: /* 040C0 80901000 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 040C4 80901004 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 040C8 80901008 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 040CC 8090100C 8FBF001C */ lw $ra, 0x001C($sp) -/* 040D0 80901010 8FB00014 */ lw $s0, 0x0014($sp) -/* 040D4 80901014 8FB10018 */ lw $s1, 0x0018($sp) -/* 040D8 80901018 03E00008 */ jr $ra +/* 040CC 8090100C 8FBF001C */ lw $ra, 0x001C($sp) +/* 040D0 80901010 8FB00014 */ lw $s0, 0x0014($sp) +/* 040D4 80901014 8FB10018 */ lw $s1, 0x0018($sp) +/* 040D8 80901018 03E00008 */ jr $ra /* 040DC 8090101C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s index ddfb9a15de..7bbeb189a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s @@ -1,66 +1,66 @@ glabel func_8090120C /* 042CC 8090120C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 042D0 80901210 AFBF0024 */ sw $ra, 0x0024($sp) -/* 042D4 80901214 AFB00020 */ sw $s0, 0x0020($sp) -/* 042D8 80901218 AFA50054 */ sw $a1, 0x0054($sp) +/* 042D0 80901210 AFBF0024 */ sw $ra, 0x0024($sp) +/* 042D4 80901214 AFB00020 */ sw $s0, 0x0020($sp) +/* 042D8 80901218 AFA50054 */ sw $a1, 0x0054($sp) /* 042DC 8090121C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 042E0 80901220 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 042E4 80901224 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 042E8 80901228 AFAF004C */ sw $t7, 0x004C($sp) +/* 042E8 80901228 AFAF004C */ sw $t7, 0x004C($sp) /* 042EC 8090122C 8C98024C */ lw $t8, 0x024C($a0) ## 00000398 /* 042F0 80901230 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 042F4 80901234 AC99024C */ sw $t9, 0x024C($a0) ## 00000398 /* 042F8 80901238 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 042FC 8090123C AFA40028 */ sw $a0, 0x0028($sp) + +/* 042FC 8090123C AFA40028 */ sw $a0, 0x0028($sp) /* 04300 80901240 8603039C */ lh $v1, 0x039C($s0) ## 0000039C /* 04304 80901244 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04308 80901248 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 0430C 8090124C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 04310 80901250 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 04314 80901254 28610015 */ slti $at, $v1, 0x0015 +/* 04314 80901254 28610015 */ slti $at, $v1, 0x0015 /* 04318 80901258 E60003C0 */ swc1 $f0, 0x03C0($s0) ## 000003C0 /* 0431C 8090125C E60403BC */ swc1 $f4, 0x03BC($s0) ## 000003BC -/* 04320 80901260 14200006 */ bne $at, $zero, .L8090127C +/* 04320 80901260 14200006 */ bne $at, $zero, .L8090127C /* 04324 80901264 E60603C4 */ swc1 $f6, 0x03C4($s0) ## 000003C4 /* 04328 80901268 2401004B */ addiu $at, $zero, 0x004B ## $at = 0000004B -/* 0432C 8090126C 506102CC */ beql $v1, $at, .L80901DA0 +/* 0432C 8090126C 506102CC */ beql $v1, $at, .L80901DA0 /* 04330 80901270 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 -/* 04334 80901274 10000407 */ beq $zero, $zero, .L80902294 +/* 04334 80901274 10000407 */ beq $zero, $zero, .L80902294 /* 04338 80901278 8605039E */ lh $a1, 0x039E($s0) ## 0000039E .L8090127C: -/* 0433C 8090127C 2C610015 */ sltiu $at, $v1, 0x0015 -/* 04340 80901280 10200403 */ beq $at, $zero, .L80902290 -/* 04344 80901284 00034080 */ sll $t0, $v1, 2 +/* 0433C 8090127C 2C610015 */ sltiu $at, $v1, 0x0015 +/* 04340 80901280 10200403 */ beq $at, $zero, .L80902290 +/* 04344 80901284 00034080 */ sll $t0, $v1, 2 /* 04348 80901288 3C018091 */ lui $at, %hi(jtbl_8090DBF4) ## $at = 80910000 -/* 0434C 8090128C 00280821 */ addu $at, $at, $t0 -/* 04350 80901290 8C28DBF4 */ lw $t0, %lo(jtbl_8090DBF4)($at) -/* 04354 80901294 01000008 */ jr $t0 +/* 0434C 8090128C 00280821 */ addu $at, $at, $t0 +/* 04350 80901290 8C28DBF4 */ lw $t0, %lo(jtbl_8090DBF4)($at) +/* 04354 80901294 01000008 */ jr $t0 /* 04358 80901298 00000000 */ nop glabel L8090129C -/* 0435C 8090129C 8FA40054 */ lw $a0, 0x0054($sp) -/* 04360 809012A0 0C019148 */ jal func_80064520 +/* 0435C 8090129C 8FA40054 */ lw $a0, 0x0054($sp) +/* 04360 809012A0 0C019148 */ jal func_80064520 /* 04364 809012A4 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 04368 809012A8 0C03008C */ jal func_800C0230 -/* 0436C 809012AC 8FA40054 */ lw $a0, 0x0054($sp) +/* 04368 809012A8 0C03008C */ jal func_800C0230 +/* 0436C 809012AC 8FA40054 */ lw $a0, 0x0054($sp) /* 04370 809012B0 A602039E */ sh $v0, 0x039E($s0) ## 0000039E -/* 04374 809012B4 8FA40054 */ lw $a0, 0x0054($sp) +/* 04374 809012B4 8FA40054 */ lw $a0, 0x0054($sp) /* 04378 809012B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0437C 809012BC 0C0300C5 */ jal func_800C0314 +/* 0437C 809012BC 0C0300C5 */ jal func_800C0314 /* 04380 809012C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04384 809012C4 8FA40054 */ lw $a0, 0x0054($sp) +/* 04384 809012C4 8FA40054 */ lw $a0, 0x0054($sp) /* 04388 809012C8 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 0438C 809012CC 0C0300C5 */ jal func_800C0314 +/* 0438C 809012CC 0C0300C5 */ jal func_800C0314 /* 04390 809012D0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 04394 809012D4 8FA40054 */ lw $a0, 0x0054($sp) +/* 04394 809012D4 8FA40054 */ lw $a0, 0x0054($sp) /* 04398 809012D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0439C 809012DC 0C00B7D5 */ jal func_8002DF54 +/* 0439C 809012DC 0C00B7D5 */ jal func_8002DF54 /* 043A0 809012E0 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 /* 043A4 809012E4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 043A8 809012E8 A609039C */ sh $t1, 0x039C($s0) ## 0000039C /* 043AC 809012EC AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 043B0 809012F0 3C0B8091 */ lui $t3, %hi(D_8090EB2C) ## $t3 = 80910000 -/* 043B4 809012F4 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) +/* 043B4 809012F4 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) /* 043B8 809012F8 240A0009 */ addiu $t2, $zero, 0x0009 ## $t2 = 00000009 /* 043BC 809012FC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 043C0 80901300 A16A03C8 */ sb $t2, 0x03C8($t3) ## 809103C8 @@ -72,10 +72,10 @@ glabel L8090129C /* 043D8 80901318 E6080324 */ swc1 $f8, 0x0324($s0) ## 00000324 /* 043DC 8090131C E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 043E0 80901320 A60C031A */ sh $t4, 0x031A($s0) ## 0000031A -/* 043E4 80901324 8FAD0054 */ lw $t5, 0x0054($sp) +/* 043E4 80901324 8FAD0054 */ lw $t5, 0x0054($sp) /* 043E8 80901328 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 043EC 8090132C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 043F0 80901330 002D0821 */ addu $at, $at, $t5 +/* 043F0 80901330 002D0821 */ addu $at, $at, $t5 /* 043F4 80901334 E4300AFC */ swc1 $f16, 0x0AFC($at) ## 00010AFC /* 043F8 80901338 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 043FC 8090133C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -84,76 +84,76 @@ glabel L80901344 /* 04404 80901344 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 04408 80901348 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 0440C 8090134C 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 04410 80901350 2C61005A */ sltiu $at, $v1, 0x005A -/* 04414 80901354 1020000D */ beq $at, $zero, .L8090138C +/* 04410 80901350 2C61005A */ sltiu $at, $v1, 0x005A +/* 04414 80901354 1020000D */ beq $at, $zero, .L8090138C /* 04418 80901358 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 0441C 8090135C A20E0339 */ sb $t6, 0x0339($s0) ## 00000339 -/* 04420 80901360 8FA40054 */ lw $a0, 0x0054($sp) +/* 04420 80901360 8FA40054 */ lw $a0, 0x0054($sp) /* 04424 80901364 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04428 80901368 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 0442C 8090136C 44050000 */ mfc1 $a1, $f0 -/* 04430 80901370 44060000 */ mfc1 $a2, $f0 +/* 0442C 8090136C 44050000 */ mfc1 $a1, $f0 +/* 04430 80901370 44060000 */ mfc1 $a2, $f0 /* 04434 80901374 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 04438 80901378 00812021 */ addu $a0, $a0, $at + +/* 04438 80901378 00812021 */ addu $a0, $a0, $at /* 0443C 8090137C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04440 80901380 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 04444 80901384 10000010 */ beq $zero, $zero, .L809013C8 +/* 04444 80901384 10000010 */ beq $zero, $zero, .L809013C8 /* 04448 80901388 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L8090138C: -/* 0444C 8090138C 2C61005A */ sltiu $at, $v1, 0x005A -/* 04450 80901390 1420000D */ bne $at, $zero, .L809013C8 +/* 0444C 8090138C 2C61005A */ sltiu $at, $v1, 0x005A +/* 04450 80901390 1420000D */ bne $at, $zero, .L809013C8 /* 04454 80901394 240F0015 */ addiu $t7, $zero, 0x0015 ## $t7 = 00000015 /* 04458 80901398 A20F0339 */ sb $t7, 0x0339($s0) ## 00000339 -/* 0445C 8090139C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0445C 8090139C 8FA40054 */ lw $a0, 0x0054($sp) /* 04460 809013A0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04464 809013A4 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 04468 809013A8 44050000 */ mfc1 $a1, $f0 +/* 04468 809013A8 44050000 */ mfc1 $a1, $f0 /* 0446C 809013AC 3C063DA3 */ lui $a2, 0x3DA3 ## $a2 = 3DA30000 /* 04470 809013B0 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3DA3D70A /* 04474 809013B4 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 04478 809013B8 00812021 */ addu $a0, $a0, $at + +/* 04478 809013B8 00812021 */ addu $a0, $a0, $at /* 0447C 809013BC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04480 809013C0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 04484 809013C4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L809013C8: /* 04488 809013C8 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 0448C 809013CC 54610007 */ bnel $v1, $at, .L809013EC -/* 04490 809013D0 2C61005B */ sltiu $at, $v1, 0x005B -/* 04494 809013D4 0C01E221 */ jal func_80078884 +/* 0448C 809013CC 54610007 */ bnel $v1, $at, .L809013EC +/* 04490 809013D0 2C61005B */ sltiu $at, $v1, 0x005B +/* 04494 809013D4 0C01E221 */ jal func_80078884 /* 04498 809013D8 240439D7 */ addiu $a0, $zero, 0x39D7 ## $a0 = 000039D7 /* 0449C 809013DC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 044A0 809013E0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 044A4 809013E4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 044A8 809013E8 2C61005B */ sltiu $at, $v1, 0x005B +/* 044A8 809013E8 2C61005B */ sltiu $at, $v1, 0x005B .L809013EC: -/* 044AC 809013EC 1420000C */ bne $at, $zero, .L80901420 +/* 044AC 809013EC 1420000C */ bne $at, $zero, .L80901420 /* 044B0 809013F0 26040380 */ addiu $a0, $s0, 0x0380 ## $a0 = 00000380 -/* 044B4 809013F4 44060000 */ mfc1 $a2, $f0 +/* 044B4 809013F4 44060000 */ mfc1 $a2, $f0 /* 044B8 809013F8 3C073C4C */ lui $a3, 0x3C4C ## $a3 = 3C4C0000 /* 044BC 809013FC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3C4CCCCD /* 044C0 80901400 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 044C4 80901404 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 /* 044C8 80901408 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 044CC 8090140C 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 /* 044D0 80901410 2404209D */ addiu $a0, $zero, 0x209D ## $a0 = 0000209D -/* 044D4 80901414 0C01E221 */ jal func_80078884 +/* 044D4 80901414 0C01E221 */ jal func_80078884 /* 044D8 80901418 E612037C */ swc1 $f18, 0x037C($s0) ## 0000037C /* 044DC 8090141C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80901420: -/* 044E0 80901420 2C61006E */ sltiu $at, $v1, 0x006E -/* 044E4 80901424 14200012 */ bne $at, $zero, .L80901470 +/* 044E0 80901420 2C61006E */ sltiu $at, $v1, 0x006E +/* 044E4 80901424 14200012 */ bne $at, $zero, .L80901470 /* 044E8 80901428 2401006E */ addiu $at, $zero, 0x006E ## $at = 0000006E -/* 044EC 8090142C 14610006 */ bne $v1, $at, .L80901448 +/* 044EC 8090142C 14610006 */ bne $v1, $at, .L80901448 /* 044F0 80901430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 044F4 80901434 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 044F8 80901438 2405390B */ addiu $a1, $zero, 0x390B ## $a1 = 0000390B /* 044FC 8090143C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04500 80901440 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04504 80901444 2405399B */ addiu $a1, $zero, 0x399B ## $a1 = 0000399B .L80901448: /* 04508 80901448 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 @@ -161,7 +161,7 @@ glabel L80901344 /* 04510 80901450 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C /* 04514 80901454 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 04518 80901458 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0451C 8090145C 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 04520 80901460 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 04524 80901464 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 @@ -169,13 +169,13 @@ glabel L80901344 /* 0452C 8090146C E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 .L80901470: /* 04530 80901470 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 -/* 04534 80901474 14610004 */ bne $v1, $at, .L80901488 -/* 04538 80901478 8FA40054 */ lw $a0, 0x0054($sp) +/* 04534 80901474 14610004 */ bne $v1, $at, .L80901488 +/* 04538 80901478 8FA40054 */ lw $a0, 0x0054($sp) /* 0453C 8090147C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04540 80901480 0C00B7D5 */ jal func_8002DF54 +/* 04540 80901480 0C00B7D5 */ jal func_8002DF54 /* 04544 80901484 24060063 */ addiu $a2, $zero, 0x0063 ## $a2 = 00000063 .L80901488: -/* 04548 80901488 8FA3004C */ lw $v1, 0x004C($sp) +/* 04548 80901488 8FA3004C */ lw $v1, 0x004C($sp) /* 0454C 8090148C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 04550 80901490 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 04554 80901494 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -192,21 +192,21 @@ glabel L80901344 /* 04580 809014C0 A47900B6 */ sh $t9, 0x00B6($v1) ## 000000B6 /* 04584 809014C4 E46A0024 */ swc1 $f10, 0x0024($v1) ## 00000024 /* 04588 809014C8 E470002C */ swc1 $f16, 0x002C($v1) ## 0000002C -/* 0458C 809014CC 8D08EB2C */ lw $t0, %lo(D_8090EB2C)($t0) +/* 0458C 809014CC 8D08EB2C */ lw $t0, %lo(D_8090EB2C)($t0) /* 04590 809014D0 44819000 */ mtc1 $at, $f18 ## $f18 = 340.00 /* 04594 809014D4 3C01C37A */ lui $at, 0xC37A ## $at = C37A0000 /* 04598 809014D8 3C098091 */ lui $t1, %hi(D_8090EB2C) ## $t1 = 80910000 /* 0459C 809014DC E5120024 */ swc1 $f18, 0x0024($t0) ## 80910024 -/* 045A0 809014E0 8D29EB2C */ lw $t1, %lo(D_8090EB2C)($t1) +/* 045A0 809014E0 8D29EB2C */ lw $t1, %lo(D_8090EB2C)($t1) /* 045A4 809014E4 44812000 */ mtc1 $at, $f4 ## $f4 = -250.00 /* 045A8 809014E8 3C0B8091 */ lui $t3, %hi(D_8090EB2C) ## $t3 = 80910000 /* 045AC 809014EC 240AE000 */ addiu $t2, $zero, 0xE000 ## $t2 = FFFFE000 /* 045B0 809014F0 E524002C */ swc1 $f4, 0x002C($t1) ## 8091002C -/* 045B4 809014F4 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) +/* 045B4 809014F4 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) /* 045B8 809014F8 3C028091 */ lui $v0, %hi(D_8090EB2C) ## $v0 = 80910000 /* 045BC 809014FC 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 045C0 80901500 A56A00B6 */ sh $t2, 0x00B6($t3) ## 809100B6 -/* 045C4 80901504 8C42EB2C */ lw $v0, %lo(D_8090EB2C)($v0) +/* 045C4 80901504 8C42EB2C */ lw $v0, %lo(D_8090EB2C)($v0) /* 045C8 80901508 44813000 */ mtc1 $at, $f6 ## $f6 = 250.00 /* 045CC 8090150C 3C018091 */ lui $at, %hi(D_8090DC48) ## $at = 80910000 /* 045D0 80901510 844C00B6 */ lh $t4, 0x00B6($v0) ## 809100B6 @@ -214,88 +214,88 @@ glabel L80901344 /* 045D8 80901518 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 045DC 8090151C A44C0032 */ sh $t4, 0x0032($v0) ## 80910032 /* 045E0 80901520 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 -/* 045E4 80901524 C428DC48 */ lwc1 $f8, %lo(D_8090DC48)($at) +/* 045E4 80901524 C428DC48 */ lwc1 $f8, %lo(D_8090DC48)($at) /* 045E8 80901528 8E0D0398 */ lw $t5, 0x0398($s0) ## 00000398 /* 045EC 8090152C C61001B8 */ lwc1 $f16, 0x01B8($s0) ## 000001B8 /* 045F0 80901530 C61201BC */ lwc1 $f18, 0x01BC($s0) ## 000001BC /* 045F4 80901534 C60401C0 */ lwc1 $f4, 0x01C0($s0) ## 000001C0 -/* 045F8 80901538 2DA10088 */ sltiu $at, $t5, 0x0088 +/* 045F8 80901538 2DA10088 */ sltiu $at, $t5, 0x0088 /* 045FC 8090153C E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 04600 80901540 E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 04604 80901544 E61003B0 */ swc1 $f16, 0x03B0($s0) ## 000003B0 /* 04608 80901548 E61203B4 */ swc1 $f18, 0x03B4($s0) ## 000003B4 -/* 0460C 8090154C 14200350 */ bne $at, $zero, .L80902290 +/* 0460C 8090154C 14200350 */ bne $at, $zero, .L80902290 /* 04610 80901550 E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 /* 04614 80901554 A60E039C */ sh $t6, 0x039C($s0) ## 0000039C -/* 04618 80901558 1000034D */ beq $zero, $zero, .L80902290 +/* 04618 80901558 1000034D */ beq $zero, $zero, .L80902290 /* 0461C 8090155C AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L80901560 /* 04620 80901560 240F0016 */ addiu $t7, $zero, 0x0016 ## $t7 = 00000016 /* 04624 80901564 A20F0339 */ sb $t7, 0x0339($s0) ## 00000339 -/* 04628 80901568 8FA40054 */ lw $a0, 0x0054($sp) +/* 04628 80901568 8FA40054 */ lw $a0, 0x0054($sp) /* 0462C 8090156C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04630 80901570 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 04634 80901574 44050000 */ mfc1 $a1, $f0 -/* 04638 80901578 44060000 */ mfc1 $a2, $f0 +/* 04634 80901574 44050000 */ mfc1 $a1, $f0 +/* 04638 80901578 44060000 */ mfc1 $a2, $f0 /* 0463C 8090157C 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 04640 80901580 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 04644 80901584 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 04648 80901588 00812021 */ addu $a0, $a0, $at -/* 0464C 8090158C 0C01E221 */ jal func_80078884 + +/* 04648 80901588 00812021 */ addu $a0, $a0, $at +/* 0464C 8090158C 0C01E221 */ jal func_80078884 /* 04650 80901590 2404209D */ addiu $a0, $zero, 0x209D ## $a0 = 0000209D /* 04654 80901594 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 04658 80901598 44813000 */ mtc1 $at, $f6 ## $f6 = 250.00 /* 0465C 8090159C 3C018091 */ lui $at, %hi(D_8090DC4C) ## $at = 80910000 /* 04660 809015A0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 04664 809015A4 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 -/* 04668 809015A8 C428DC4C */ lwc1 $f8, %lo(D_8090DC4C)($at) +/* 04668 809015A8 C428DC4C */ lwc1 $f8, %lo(D_8090DC4C)($at) /* 0466C 809015AC 3C188091 */ lui $t8, %hi(D_8090EB2C) ## $t8 = 80910000 /* 04670 809015B0 E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 04674 809015B4 E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 -/* 04678 809015B8 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) +/* 04678 809015B8 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) /* 0467C 809015BC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 04680 809015C0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 04684 809015C4 260403B0 */ addiu $a0, $s0, 0x03B0 ## $a0 = 000003B0 /* 04688 809015C8 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 0468C 809015CC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04690 809015D0 8F050024 */ lw $a1, 0x0024($t8) ## 80910024 /* 04694 809015D4 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 -/* 04698 809015D8 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 04698 809015D8 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) /* 0469C 809015DC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 046A0 809015E0 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 /* 046A4 809015E4 C7300028 */ lwc1 $f16, 0x0028($t9) ## 80910028 /* 046A8 809015E8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 046AC 809015EC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 046B0 809015F0 46008480 */ add.s $f18, $f16, $f0 +/* 046B0 809015F0 46008480 */ add.s $f18, $f16, $f0 /* 046B4 809015F4 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 046B8 809015F8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 046BC 809015FC 44059000 */ mfc1 $a1, $f18 +/* 046BC 809015FC 44059000 */ mfc1 $a1, $f18 /* 046C0 80901600 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 046C4 80901604 00000000 */ nop /* 046C8 80901608 3C088091 */ lui $t0, %hi(D_8090EB2C) ## $t0 = 80910000 -/* 046CC 8090160C 8D08EB2C */ lw $t0, %lo(D_8090EB2C)($t0) +/* 046CC 8090160C 8D08EB2C */ lw $t0, %lo(D_8090EB2C)($t0) /* 046D0 80901610 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 046D4 80901614 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 046D8 80901618 260403B8 */ addiu $a0, $s0, 0x03B8 ## $a0 = 000003B8 /* 046DC 8090161C 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 046E0 80901620 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 046E4 80901624 8D05002C */ lw $a1, 0x002C($t0) ## 8091002C /* 046E8 80901628 8E090398 */ lw $t1, 0x0398($s0) ## 00000398 /* 046EC 8090162C 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 /* 046F0 80901630 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 046F4 80901634 55210317 */ bnel $t1, $at, .L80902294 +/* 046F4 80901634 55210317 */ bnel $t1, $at, .L80902294 /* 046F8 80901638 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 046FC 8090163C A60A039C */ sh $t2, 0x039C($s0) ## 0000039C -/* 04700 80901640 10000313 */ beq $zero, $zero, .L80902290 +/* 04700 80901640 10000313 */ beq $zero, $zero, .L80902290 /* 04704 80901644 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L80901648 /* 04708 80901648 240B0016 */ addiu $t3, $zero, 0x0016 ## $t3 = 00000016 /* 0470C 8090164C A20B0339 */ sb $t3, 0x0339($s0) ## 00000339 -/* 04710 80901650 0C01E221 */ jal func_80078884 +/* 04710 80901650 0C01E221 */ jal func_80078884 /* 04714 80901654 2404209D */ addiu $a0, $zero, 0x209D ## $a0 = 0000209D /* 04718 80901658 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0471C 8090165C 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 @@ -309,70 +309,70 @@ glabel L80901648 /* 0473C 8090167C E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 04740 80901680 E60603A8 */ swc1 $f6, 0x03A8($s0) ## 000003A8 /* 04744 80901684 E60803AC */ swc1 $f8, 0x03AC($s0) ## 000003AC -/* 04748 80901688 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) +/* 04748 80901688 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) /* 0474C 8090168C 3C0D8091 */ lui $t5, %hi(D_8090EB2C) ## $t5 = 80910000 /* 04750 80901690 3C0E8091 */ lui $t6, %hi(D_8090EB2C) ## $t6 = 80910000 /* 04754 80901694 C58A0024 */ lwc1 $f10, 0x0024($t4) ## 80910024 /* 04758 80901698 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 0475C 8090169C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 04760 809016A0 E60A03B0 */ swc1 $f10, 0x03B0($s0) ## 000003B0 -/* 04764 809016A4 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) +/* 04764 809016A4 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) /* 04768 809016A8 240570D8 */ addiu $a1, $zero, 0x70D8 ## $a1 = 000070D8 /* 0476C 809016AC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04770 809016B0 C5B00028 */ lwc1 $f16, 0x0028($t5) ## 80910028 -/* 04774 809016B4 46028480 */ add.s $f18, $f16, $f2 +/* 04774 809016B4 46028480 */ add.s $f18, $f16, $f2 /* 04778 809016B8 E61203B4 */ swc1 $f18, 0x03B4($s0) ## 000003B4 -/* 0477C 809016BC 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) +/* 0477C 809016BC 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) /* 04780 809016C0 C5C4002C */ lwc1 $f4, 0x002C($t6) ## 8091002C -/* 04784 809016C4 14610004 */ bne $v1, $at, .L809016D8 +/* 04784 809016C4 14610004 */ bne $v1, $at, .L809016D8 /* 04788 809016C8 E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 -/* 0478C 809016CC 0C042DA0 */ jal func_8010B680 -/* 04790 809016D0 8FA40054 */ lw $a0, 0x0054($sp) +/* 0478C 809016CC 0C042DA0 */ jal func_8010B680 +/* 04790 809016D0 8FA40054 */ lw $a0, 0x0054($sp) /* 04794 809016D4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L809016D8: -/* 04798 809016D8 2C610051 */ sltiu $at, $v1, 0x0051 -/* 0479C 809016DC 142002EC */ bne $at, $zero, .L80902290 -/* 047A0 809016E0 8FA40054 */ lw $a0, 0x0054($sp) -/* 047A4 809016E4 0C042F6F */ jal func_8010BDBC +/* 04798 809016D8 2C610051 */ sltiu $at, $v1, 0x0051 +/* 0479C 809016DC 142002EC */ bne $at, $zero, .L80902290 +/* 047A0 809016E0 8FA40054 */ lw $a0, 0x0054($sp) +/* 047A4 809016E4 0C042F6F */ jal func_8010BDBC /* 047A8 809016E8 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 047AC 809016EC 144002E8 */ bne $v0, $zero, .L80902290 +/* 047AC 809016EC 144002E8 */ bne $v0, $zero, .L80902290 /* 047B0 809016F0 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 047B4 809016F4 A60F039C */ sh $t7, 0x039C($s0) ## 0000039C -/* 047B8 809016F8 100002E5 */ beq $zero, $zero, .L80902290 +/* 047B8 809016F8 100002E5 */ beq $zero, $zero, .L80902290 /* 047BC 809016FC AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L80901700 /* 047C0 80901700 8E180398 */ lw $t8, 0x0398($s0) ## 00000398 /* 047C4 80901704 2604037C */ addiu $a0, $s0, 0x037C ## $a0 = 0000037C /* 047C8 80901708 240B0016 */ addiu $t3, $zero, 0x0016 ## $t3 = 00000016 -/* 047CC 8090170C 2F01000B */ sltiu $at, $t8, 0x000B -/* 047D0 80901710 5420001A */ bnel $at, $zero, .L8090177C +/* 047CC 8090170C 2F01000B */ sltiu $at, $t8, 0x000B +/* 047D0 80901710 5420001A */ bnel $at, $zero, .L8090177C /* 047D4 80901714 A20B0339 */ sb $t3, 0x0339($s0) ## 00000339 -/* 047D8 80901718 44050000 */ mfc1 $a1, $f0 +/* 047D8 80901718 44050000 */ mfc1 $a1, $f0 /* 047DC 8090171C 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 047E0 80901720 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 047E4 80901724 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 /* 047E8 80901728 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 047EC 8090172C 240A0017 */ addiu $t2, $zero, 0x0017 ## $t2 = 00000017 -/* 047F0 80901730 17210005 */ bne $t9, $at, .L80901748 +/* 047F0 80901730 17210005 */ bne $t9, $at, .L80901748 /* 047F4 80901734 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 047F8 80901738 3C098091 */ lui $t1, %hi(D_8090EB2C) ## $t1 = 80910000 -/* 047FC 8090173C 8D29EB2C */ lw $t1, %lo(D_8090EB2C)($t1) +/* 047FC 8090173C 8D29EB2C */ lw $t1, %lo(D_8090EB2C)($t1) /* 04800 80901740 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A /* 04804 80901744 A12803C8 */ sb $t0, 0x03C8($t1) ## 809103C8 .L80901748: /* 04808 80901748 A20A0339 */ sb $t2, 0x0339($s0) ## 00000339 -/* 0480C 8090174C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0480C 8090174C 8FA40054 */ lw $a0, 0x0054($sp) /* 04810 80901750 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04814 80901754 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 04818 80901758 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 0481C 8090175C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04820 80901760 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 04824 80901764 00812021 */ addu $a0, $a0, $at + +/* 04824 80901764 00812021 */ addu $a0, $a0, $at /* 04828 80901768 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0482C 8090176C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 04830 80901770 10000003 */ beq $zero, $zero, .L80901780 +/* 04830 80901770 10000003 */ beq $zero, $zero, .L80901780 /* 04834 80901774 8E0C0398 */ lw $t4, 0x0398($s0) ## 00000398 /* 04838 80901778 A20B0339 */ sb $t3, 0x0339($s0) ## 00000339 .L8090177C: @@ -380,63 +380,63 @@ glabel L80901700 .L80901780: /* 04840 80901780 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 /* 04844 80901784 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 -/* 04848 80901788 158102C1 */ bne $t4, $at, .L80902290 +/* 04848 80901788 158102C1 */ bne $t4, $at, .L80902290 /* 0484C 8090178C 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 /* 04850 80901790 A60D039C */ sh $t5, 0x039C($s0) ## 0000039C /* 04854 80901794 AE0E0398 */ sw $t6, 0x0398($s0) ## 00000398 /* 04858 80901798 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 0485C 8090179C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0485C 8090179C 8FA40054 */ lw $a0, 0x0054($sp) /* 04860 809017A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04864 809017A4 0C00B7D5 */ jal func_8002DF54 +/* 04864 809017A4 0C00B7D5 */ jal func_8002DF54 /* 04868 809017A8 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 0486C 809017AC 100002B9 */ beq $zero, $zero, .L80902294 +/* 0486C 809017AC 100002B9 */ beq $zero, $zero, .L80902294 /* 04870 809017B0 8605039E */ lh $a1, 0x039E($s0) ## 0000039E glabel L809017B4 /* 04874 809017B4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 04878 809017B8 240F0017 */ addiu $t7, $zero, 0x0017 ## $t7 = 00000017 /* 0487C 809017BC A20F0339 */ sb $t7, 0x0339($s0) ## 00000339 -/* 04880 809017C0 2C61003C */ sltiu $at, $v1, 0x003C -/* 04884 809017C4 14200012 */ bne $at, $zero, .L80901810 +/* 04880 809017C0 2C61003C */ sltiu $at, $v1, 0x003C +/* 04884 809017C4 14200012 */ bne $at, $zero, .L80901810 /* 04888 809017C8 2604038C */ addiu $a0, $s0, 0x038C ## $a0 = 0000038C -/* 0488C 809017CC 2C61005B */ sltiu $at, $v1, 0x005B -/* 04890 809017D0 1020000F */ beq $at, $zero, .L80901810 +/* 0488C 809017CC 2C61005B */ sltiu $at, $v1, 0x005B +/* 04890 809017D0 1020000F */ beq $at, $zero, .L80901810 /* 04894 809017D4 2401003E */ addiu $at, $zero, 0x003E ## $at = 0000003E -/* 04898 809017D8 54610007 */ bnel $v1, $at, .L809017F8 -/* 0489C 809017DC 44060000 */ mfc1 $a2, $f0 -/* 048A0 809017E0 0C01E221 */ jal func_80078884 +/* 04898 809017D8 54610007 */ bnel $v1, $at, .L809017F8 +/* 0489C 809017DC 44060000 */ mfc1 $a2, $f0 +/* 048A0 809017E0 0C01E221 */ jal func_80078884 /* 048A4 809017E4 2404286F */ addiu $a0, $zero, 0x286F ## $a0 = 0000286F /* 048A8 809017E8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 048AC 809017EC 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 048B0 809017F0 00000000 */ nop -/* 048B4 809017F4 44060000 */ mfc1 $a2, $f0 +/* 048B4 809017F4 44060000 */ mfc1 $a2, $f0 .L809017F8: /* 048B8 809017F8 2604038C */ addiu $a0, $s0, 0x038C ## $a0 = 0000038C /* 048BC 809017FC 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 048C0 80901800 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 048C4 80901804 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 048C8 80901808 10000005 */ beq $zero, $zero, .L80901820 +/* 048C8 80901808 10000005 */ beq $zero, $zero, .L80901820 /* 048CC 8090180C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80901810: -/* 048D0 80901810 44050000 */ mfc1 $a1, $f0 +/* 048D0 80901810 44050000 */ mfc1 $a1, $f0 /* 048D4 80901814 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 048D8 80901818 3C064100 */ lui $a2, 0x4100 ## $a2 = 41000000 /* 048DC 8090181C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80901820: /* 048E0 80901820 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 048E4 80901824 8FA40054 */ lw $a0, 0x0054($sp) -/* 048E8 80901828 14610004 */ bne $v1, $at, .L8090183C +/* 048E4 80901824 8FA40054 */ lw $a0, 0x0054($sp) +/* 048E8 80901828 14610004 */ bne $v1, $at, .L8090183C /* 048EC 8090182C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 048F0 80901830 0C00B7D5 */ jal func_8002DF54 +/* 048F0 80901830 0C00B7D5 */ jal func_8002DF54 /* 048F4 80901834 24060065 */ addiu $a2, $zero, 0x0065 ## $a2 = 00000065 /* 048F8 80901838 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L8090183C: /* 048FC 8090183C 24010096 */ addiu $at, $zero, 0x0096 ## $at = 00000096 -/* 04900 80901840 14610004 */ bne $v1, $at, .L80901854 -/* 04904 80901844 8FA40054 */ lw $a0, 0x0054($sp) +/* 04900 80901840 14610004 */ bne $v1, $at, .L80901854 +/* 04904 80901844 8FA40054 */ lw $a0, 0x0054($sp) /* 04908 80901848 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0490C 8090184C 0C00B7D5 */ jal func_8002DF54 +/* 0490C 8090184C 0C00B7D5 */ jal func_8002DF54 /* 04910 80901850 24060066 */ addiu $a2, $zero, 0x0066 ## $a2 = 00000066 .L80901854: /* 04914 80901854 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -447,9 +447,9 @@ glabel L809017B4 /* 04928 80901868 44816000 */ mtc1 $at, $f12 ## $f12 = 250.00 /* 0492C 8090186C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 04930 80901870 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 04934 80901874 8FA2004C */ lw $v0, 0x004C($sp) +/* 04934 80901874 8FA2004C */ lw $v0, 0x004C($sp) /* 04938 80901878 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0493C 8090187C 46006281 */ sub.s $f10, $f12, $f0 +/* 0493C 8090187C 46006281 */ sub.s $f10, $f12, $f0 /* 04940 80901880 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 04944 80901884 E606030C */ swc1 $f6, 0x030C($s0) ## 0000030C /* 04948 80901888 E44C0024 */ swc1 $f12, 0x0024($v0) ## 00000024 @@ -458,22 +458,22 @@ glabel L809017B4 /* 04954 80901894 C4500028 */ lwc1 $f16, 0x0028($v0) ## 00000028 /* 04958 80901898 8E180398 */ lw $t8, 0x0398($s0) ## 00000398 /* 0495C 8090189C 240100A6 */ addiu $at, $zero, 0x00A6 ## $at = 000000A6 -/* 04960 809018A0 46008480 */ add.s $f18, $f16, $f0 +/* 04960 809018A0 46008480 */ add.s $f18, $f16, $f0 /* 04964 809018A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04968 809018A8 E61203A8 */ swc1 $f18, 0x03A8($s0) ## 000003A8 /* 0496C 809018AC C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C -/* 04970 809018B0 46022180 */ add.s $f6, $f4, $f2 +/* 04970 809018B0 46022180 */ add.s $f6, $f4, $f2 /* 04974 809018B4 E60603AC */ swc1 $f6, 0x03AC($s0) ## 000003AC /* 04978 809018B8 C4480024 */ lwc1 $f8, 0x0024($v0) ## 00000024 /* 0497C 809018BC E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 /* 04980 809018C0 C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 04984 809018C4 46025400 */ add.s $f16, $f10, $f2 +/* 04984 809018C4 46025400 */ add.s $f16, $f10, $f2 /* 04988 809018C8 E61003B4 */ swc1 $f16, 0x03B4($s0) ## 000003B4 /* 0498C 809018CC C452002C */ lwc1 $f18, 0x002C($v0) ## 0000002C -/* 04990 809018D0 1701026F */ bne $t8, $at, .L80902290 +/* 04990 809018D0 1701026F */ bne $t8, $at, .L80902290 /* 04994 809018D4 E61203B8 */ swc1 $f18, 0x03B8($s0) ## 000003B8 -/* 04998 809018D8 0C030129 */ jal func_800C04A4 -/* 0499C 809018DC 8FA40054 */ lw $a0, 0x0054($sp) +/* 04998 809018D8 0C030129 */ jal func_800C04A4 +/* 0499C 809018DC 8FA40054 */ lw $a0, 0x0054($sp) /* 049A0 809018E0 260303A4 */ addiu $v1, $s0, 0x03A4 ## $v1 = 000003A4 /* 049A4 809018E4 8C680000 */ lw $t0, 0x0000($v1) ## 000003A4 /* 049A8 809018E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 @@ -495,101 +495,101 @@ glabel L809017B4 /* 049E8 80901928 8E0C03B8 */ lw $t4, 0x03B8($s0) ## 000003B8 /* 049EC 8090192C AC4C0058 */ sw $t4, 0x0058($v0) ## 00000058 /* 049F0 80901930 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 049F4 80901934 0C03022B */ jal func_800C08AC -/* 049F8 80901938 8FA40054 */ lw $a0, 0x0054($sp) +/* 049F4 80901934 0C03022B */ jal func_800C08AC +/* 049F8 80901938 8FA40054 */ lw $a0, 0x0054($sp) /* 049FC 8090193C A600039E */ sh $zero, 0x039E($s0) ## 0000039E -/* 04A00 80901940 8FA40054 */ lw $a0, 0x0054($sp) -/* 04A04 80901944 0C01914D */ jal func_80064534 +/* 04A00 80901940 8FA40054 */ lw $a0, 0x0054($sp) +/* 04A04 80901944 0C01914D */ jal func_80064534 /* 04A08 80901948 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 04A0C 8090194C 8FA40054 */ lw $a0, 0x0054($sp) +/* 04A0C 8090194C 8FA40054 */ lw $a0, 0x0054($sp) /* 04A10 80901950 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04A14 80901954 0C00B7D5 */ jal func_8002DF54 +/* 04A14 80901954 0C00B7D5 */ jal func_8002DF54 /* 04A18 80901958 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 04A1C 8090195C 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 04A20 80901960 1000024B */ beq $zero, $zero, .L80902290 +/* 04A20 80901960 1000024B */ beq $zero, $zero, .L80902290 /* 04A24 80901964 A60E039C */ sh $t6, 0x039C($s0) ## 0000039C glabel L80901968 -/* 04A28 80901968 8FA2004C */ lw $v0, 0x004C($sp) +/* 04A28 80901968 8FA2004C */ lw $v0, 0x004C($sp) /* 04A2C 8090196C 240F0017 */ addiu $t7, $zero, 0x0017 ## $t7 = 00000017 /* 04A30 80901970 A20F0339 */ sb $t7, 0x0339($s0) ## 00000339 /* 04A34 80901974 C60401B8 */ lwc1 $f4, 0x01B8($s0) ## 000001B8 /* 04A38 80901978 C60801C0 */ lwc1 $f8, 0x01C0($s0) ## 000001C0 /* 04A3C 8090197C C4460024 */ lwc1 $f6, 0x0024($v0) ## 00000024 /* 04A40 80901980 C44A002C */ lwc1 $f10, 0x002C($v0) ## 0000002C -/* 04A44 80901984 46062381 */ sub.s $f14, $f4, $f6 -/* 04A48 80901988 460A4301 */ sub.s $f12, $f8, $f10 -/* 04A4C 8090198C E7AE0048 */ swc1 $f14, 0x0048($sp) +/* 04A44 80901984 46062381 */ sub.s $f14, $f4, $f6 +/* 04A48 80901988 460A4301 */ sub.s $f12, $f8, $f10 +/* 04A4C 8090198C E7AE0048 */ swc1 $f14, 0x0048($sp) /* 04A50 80901990 0C034199 */ jal atan2s - -/* 04A54 80901994 E7AC0044 */ swc1 $f12, 0x0044($sp) -/* 04A58 80901998 8FA6004C */ lw $a2, 0x004C($sp) -/* 04A5C 8090199C C7AC0044 */ lwc1 $f12, 0x0044($sp) -/* 04A60 809019A0 C7AE0048 */ lwc1 $f14, 0x0048($sp) + +/* 04A54 80901994 E7AC0044 */ swc1 $f12, 0x0044($sp) +/* 04A58 80901998 8FA6004C */ lw $a2, 0x004C($sp) +/* 04A5C 8090199C C7AC0044 */ lwc1 $f12, 0x0044($sp) +/* 04A60 809019A0 C7AE0048 */ lwc1 $f14, 0x0048($sp) /* 04A64 809019A4 84D800B6 */ lh $t8, 0x00B6($a2) ## 000000B6 -/* 04A68 809019A8 00582023 */ subu $a0, $v0, $t8 -/* 04A6C 809019AC 00042400 */ sll $a0, $a0, 16 -/* 04A70 809019B0 00042403 */ sra $a0, $a0, 16 -/* 04A74 809019B4 04800003 */ bltz $a0, .L809019C4 -/* 04A78 809019B8 00041823 */ subu $v1, $zero, $a0 -/* 04A7C 809019BC 10000001 */ beq $zero, $zero, .L809019C4 +/* 04A68 809019A8 00582023 */ subu $a0, $v0, $t8 +/* 04A6C 809019AC 00042400 */ sll $a0, $a0, 16 +/* 04A70 809019B0 00042403 */ sra $a0, $a0, 16 +/* 04A74 809019B4 04800003 */ bltz $a0, .L809019C4 +/* 04A78 809019B8 00041823 */ subu $v1, $zero, $a0 +/* 04A7C 809019BC 10000001 */ beq $zero, $zero, .L809019C4 /* 04A80 809019C0 00801825 */ or $v1, $a0, $zero ## $v1 = 00000000 .L809019C4: -/* 04A84 809019C4 28612000 */ slti $at, $v1, 0x2000 -/* 04A88 809019C8 50200232 */ beql $at, $zero, .L80902294 +/* 04A84 809019C4 28612000 */ slti $at, $v1, 0x2000 +/* 04A88 809019C8 50200232 */ beql $at, $zero, .L80902294 /* 04A8C 809019CC 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 04A90 809019D0 460E7402 */ mul.s $f16, $f14, $f14 +/* 04A90 809019D0 460E7402 */ mul.s $f16, $f14, $f14 /* 04A94 809019D4 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 04A98 809019D8 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 -/* 04A9C 809019DC 460C6482 */ mul.s $f18, $f12, $f12 -/* 04AA0 809019E0 46128000 */ add.s $f0, $f16, $f18 -/* 04AA4 809019E4 46000004 */ sqrt.s $f0, $f0 -/* 04AA8 809019E8 4604003C */ c.lt.s $f0, $f4 +/* 04A9C 809019DC 460C6482 */ mul.s $f18, $f12, $f12 +/* 04AA0 809019E0 46128000 */ add.s $f0, $f16, $f18 +/* 04AA4 809019E4 46000004 */ sqrt.s $f0, $f0 +/* 04AA8 809019E8 4604003C */ c.lt.s $f0, $f4 /* 04AAC 809019EC 00000000 */ nop -/* 04AB0 809019F0 45020228 */ bc1fl .L80902294 +/* 04AB0 809019F0 45020228 */ bc1fl .L80902294 /* 04AB4 809019F4 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 04AB8 809019F8 80D90843 */ lb $t9, 0x0843($a2) ## 00000843 -/* 04ABC 809019FC 53200225 */ beql $t9, $zero, .L80902294 +/* 04ABC 809019FC 53200225 */ beql $t9, $zero, .L80902294 /* 04AC0 80901A00 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 04AC4 80901A04 80C80151 */ lb $t0, 0x0151($a2) ## 00000151 /* 04AC8 80901A08 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 04ACC 80901A0C 8FA40054 */ lw $a0, 0x0054($sp) -/* 04AD0 80901A10 55010220 */ bnel $t0, $at, .L80902294 +/* 04ACC 80901A0C 8FA40054 */ lw $a0, 0x0054($sp) +/* 04AD0 80901A10 55010220 */ bnel $t0, $at, .L80902294 /* 04AD4 80901A14 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 04AD8 80901A18 0C019148 */ jal func_80064520 +/* 04AD8 80901A18 0C019148 */ jal func_80064520 /* 04ADC 80901A1C 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 04AE0 80901A20 0C03008C */ jal func_800C0230 -/* 04AE4 80901A24 8FA40054 */ lw $a0, 0x0054($sp) +/* 04AE0 80901A20 0C03008C */ jal func_800C0230 +/* 04AE4 80901A24 8FA40054 */ lw $a0, 0x0054($sp) /* 04AE8 80901A28 A602039E */ sh $v0, 0x039E($s0) ## 0000039E -/* 04AEC 80901A2C 8FA40054 */ lw $a0, 0x0054($sp) +/* 04AEC 80901A2C 8FA40054 */ lw $a0, 0x0054($sp) /* 04AF0 80901A30 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04AF4 80901A34 0C0300C5 */ jal func_800C0314 +/* 04AF4 80901A34 0C0300C5 */ jal func_800C0314 /* 04AF8 80901A38 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04AFC 80901A3C 8FA40054 */ lw $a0, 0x0054($sp) +/* 04AFC 80901A3C 8FA40054 */ lw $a0, 0x0054($sp) /* 04B00 80901A40 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 04B04 80901A44 0C0300C5 */ jal func_800C0314 +/* 04B04 80901A44 0C0300C5 */ jal func_800C0314 /* 04B08 80901A48 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 04B0C 80901A4C 24090007 */ addiu $t1, $zero, 0x0007 ## $t1 = 00000007 /* 04B10 80901A50 A609039C */ sh $t1, 0x039C($s0) ## 0000039C /* 04B14 80901A54 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 04B18 80901A58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04B1C 80901A5C 24A53B1C */ addiu $a1, $a1, 0x3B1C ## $a1 = 06003B1C -/* 04B20 80901A60 8FA40028 */ lw $a0, 0x0028($sp) -/* 04B24 80901A64 0C029490 */ jal func_800A5240 +/* 04B20 80901A60 8FA40028 */ lw $a0, 0x0028($sp) +/* 04B24 80901A64 0C029490 */ jal func_800A5240 /* 04B28 80901A68 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 04B2C 80901A6C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04B30 80901A70 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04B34 80901A74 24843B1C */ addiu $a0, $a0, 0x3B1C ## $a0 = 06003B1C /* 04B38 80901A78 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 04B3C 80901A7C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 /* 04B40 80901A80 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04B44 80901A84 46803220 */ cvt.s.w $f8, $f6 +/* 04B44 80901A84 46803220 */ cvt.s.w $f8, $f6 /* 04B48 80901A88 24060061 */ addiu $a2, $zero, 0x0061 ## $a2 = 00000061 /* 04B4C 80901A8C E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 -/* 04B50 80901A90 8FA40054 */ lw $a0, 0x0054($sp) -/* 04B54 80901A94 0324C821 */ addu $t9, $t9, $a0 +/* 04B50 80901A90 8FA40054 */ lw $a0, 0x0054($sp) +/* 04B54 80901A94 0324C821 */ addu $t9, $t9, $a0 /* 04B58 80901A98 8F391D50 */ lw $t9, 0x1D50($t9) ## 00011D50 -/* 04B5C 80901A9C 0320F809 */ jalr $ra, $t9 +/* 04B5C 80901A9C 0320F809 */ jalr $ra, $t9 /* 04B60 80901AA0 00000000 */ nop /* 04B64 80901AA4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04B68 80901AA8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -597,18 +597,18 @@ glabel L80901968 glabel L80901AB0 /* 04B70 80901AB0 240B0017 */ addiu $t3, $zero, 0x0017 ## $t3 = 00000017 /* 04B74 80901AB4 A20B0339 */ sb $t3, 0x0339($s0) ## 00000339 -/* 04B78 80901AB8 8FA40054 */ lw $a0, 0x0054($sp) +/* 04B78 80901AB8 8FA40054 */ lw $a0, 0x0054($sp) /* 04B7C 80901ABC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04B80 80901AC0 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 04B84 80901AC4 44050000 */ mfc1 $a1, $f0 +/* 04B84 80901AC4 44050000 */ mfc1 $a1, $f0 /* 04B88 80901AC8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 04B8C 80901ACC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 04B90 80901AD0 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 04B94 80901AD4 00812021 */ addu $a0, $a0, $at + +/* 04B94 80901AD4 00812021 */ addu $a0, $a0, $at /* 04B98 80901AD8 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 04B9C 80901ADC 44816000 */ mtc1 $at, $f12 ## $f12 = 250.00 -/* 04BA0 80901AE0 8FA6004C */ lw $a2, 0x004C($sp) +/* 04BA0 80901AE0 8FA6004C */ lw $a2, 0x004C($sp) /* 04BA4 80901AE4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 04BA8 80901AE8 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 /* 04BAC 80901AEC 240CC000 */ addiu $t4, $zero, 0xC000 ## $t4 = FFFFC000 @@ -617,68 +617,68 @@ glabel L80901AB0 /* 04BB8 80901AF8 E4CA002C */ swc1 $f10, 0x002C($a2) ## 0000002C /* 04BBC 80901AFC 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 04BC0 80901B00 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 04BC4 80901B04 10610007 */ beq $v1, $at, .L80901B24 +/* 04BC4 80901B04 10610007 */ beq $v1, $at, .L80901B24 /* 04BC8 80901B08 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 04BCC 80901B0C 10610005 */ beq $v1, $at, .L80901B24 +/* 04BCC 80901B0C 10610005 */ beq $v1, $at, .L80901B24 /* 04BD0 80901B10 24010041 */ addiu $at, $zero, 0x0041 ## $at = 00000041 -/* 04BD4 80901B14 10610003 */ beq $v1, $at, .L80901B24 +/* 04BD4 80901B14 10610003 */ beq $v1, $at, .L80901B24 /* 04BD8 80901B18 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 04BDC 80901B1C 54610008 */ bnel $v1, $at, .L80901B40 +/* 04BDC 80901B1C 54610008 */ bnel $v1, $at, .L80901B40 /* 04BE0 80901B20 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 .L80901B24: -/* 04BE4 80901B24 0C01E221 */ jal func_80078884 +/* 04BE4 80901B24 0C01E221 */ jal func_80078884 /* 04BE8 80901B28 24046800 */ addiu $a0, $zero, 0x6800 ## $a0 = 00006800 -/* 04BEC 80901B2C 0C01E221 */ jal func_80078884 +/* 04BEC 80901B2C 0C01E221 */ jal func_80078884 /* 04BF0 80901B30 24041818 */ addiu $a0, $zero, 0x1818 ## $a0 = 00001818 /* 04BF4 80901B34 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 04BF8 80901B38 8FA6004C */ lw $a2, 0x004C($sp) +/* 04BF8 80901B38 8FA6004C */ lw $a2, 0x004C($sp) /* 04BFC 80901B3C 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 .L80901B40: -/* 04C00 80901B40 10610007 */ beq $v1, $at, .L80901B60 +/* 04C00 80901B40 10610007 */ beq $v1, $at, .L80901B60 /* 04C04 80901B44 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 04C08 80901B48 10610005 */ beq $v1, $at, .L80901B60 +/* 04C08 80901B48 10610005 */ beq $v1, $at, .L80901B60 /* 04C0C 80901B4C 24010048 */ addiu $at, $zero, 0x0048 ## $at = 00000048 -/* 04C10 80901B50 10610003 */ beq $v1, $at, .L80901B60 +/* 04C10 80901B50 10610003 */ beq $v1, $at, .L80901B60 /* 04C14 80901B54 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D -/* 04C18 80901B58 5461000E */ bnel $v1, $at, .L80901B94 +/* 04C18 80901B58 5461000E */ bnel $v1, $at, .L80901B94 /* 04C1C 80901B5C 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 .L80901B60: -/* 04C20 80901B60 0C01E221 */ jal func_80078884 +/* 04C20 80901B60 0C01E221 */ jal func_80078884 /* 04C24 80901B64 2404399B */ addiu $a0, $zero, 0x399B ## $a0 = 0000399B -/* 04C28 80901B68 0C01E221 */ jal func_80078884 +/* 04C28 80901B68 0C01E221 */ jal func_80078884 /* 04C2C 80901B6C 24041806 */ addiu $a0, $zero, 0x1806 ## $a0 = 00001806 /* 04C30 80901B70 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04C34 80901B74 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 04C38 80901B78 8FAD0054 */ lw $t5, 0x0054($sp) +/* 04C38 80901B78 8FAD0054 */ lw $t5, 0x0054($sp) /* 04C3C 80901B7C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04C40 80901B80 002D0821 */ addu $at, $at, $t5 +/* 04C40 80901B80 002D0821 */ addu $at, $at, $t5 /* 04C44 80901B84 E4300AFC */ swc1 $f16, 0x0AFC($at) ## 00010AFC -/* 04C48 80901B88 8FA6004C */ lw $a2, 0x004C($sp) +/* 04C48 80901B88 8FA6004C */ lw $a2, 0x004C($sp) /* 04C4C 80901B8C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 04C50 80901B90 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 .L80901B94: -/* 04C54 80901B94 10610008 */ beq $v1, $at, .L80901BB8 +/* 04C54 80901B94 10610008 */ beq $v1, $at, .L80901BB8 /* 04C58 80901B98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04C5C 80901B9C 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 04C60 80901BA0 10610005 */ beq $v1, $at, .L80901BB8 +/* 04C60 80901BA0 10610005 */ beq $v1, $at, .L80901BB8 /* 04C64 80901BA4 24010048 */ addiu $at, $zero, 0x0048 ## $at = 00000048 -/* 04C68 80901BA8 10610003 */ beq $v1, $at, .L80901BB8 +/* 04C68 80901BA8 10610003 */ beq $v1, $at, .L80901BB8 /* 04C6C 80901BAC 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D -/* 04C70 80901BB0 54610006 */ bnel $v1, $at, .L80901BCC -/* 04C74 80901BB4 2C610022 */ sltiu $at, $v1, 0x0022 +/* 04C70 80901BB0 54610006 */ bnel $v1, $at, .L80901BCC +/* 04C74 80901BB4 2C610022 */ sltiu $at, $v1, 0x0022 .L80901BB8: -/* 04C78 80901BB8 0C240427 */ jal func_8090109C -/* 04C7C 80901BBC 8FA50054 */ lw $a1, 0x0054($sp) +/* 04C78 80901BB8 0C240427 */ jal func_8090109C +/* 04C7C 80901BBC 8FA50054 */ lw $a1, 0x0054($sp) /* 04C80 80901BC0 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 04C84 80901BC4 8FA6004C */ lw $a2, 0x004C($sp) -/* 04C88 80901BC8 2C610022 */ sltiu $at, $v1, 0x0022 +/* 04C84 80901BC4 8FA6004C */ lw $a2, 0x004C($sp) +/* 04C88 80901BC8 2C610022 */ sltiu $at, $v1, 0x0022 .L80901BCC: -/* 04C8C 80901BCC 14200016 */ bne $at, $zero, .L80901C28 +/* 04C8C 80901BCC 14200016 */ bne $at, $zero, .L80901C28 /* 04C90 80901BD0 3C0E8090 */ lui $t6, %hi(D_8090702C) ## $t6 = 80900000 -/* 04C94 80901BD4 2C610028 */ sltiu $at, $v1, 0x0028 -/* 04C98 80901BD8 10200013 */ beq $at, $zero, .L80901C28 +/* 04C94 80901BD4 2C610028 */ sltiu $at, $v1, 0x0028 +/* 04C98 80901BD8 10200013 */ beq $at, $zero, .L80901C28 /* 04C9C 80901BDC 3C018091 */ lui $at, %hi(D_8090DC50) ## $at = 80910000 -/* 04CA0 80901BE0 C432DC50 */ lwc1 $f18, %lo(D_8090DC50)($at) +/* 04CA0 80901BE0 C432DC50 */ lwc1 $f18, %lo(D_8090DC50)($at) /* 04CA4 80901BE4 3C01448B */ lui $at, 0x448B ## $at = 448B0000 /* 04CA8 80901BE8 44812000 */ mtc1 $at, $f4 ## $f4 = 1112.00 /* 04CAC 80901BEC 3C01C1E0 */ lui $at, 0xC1E0 ## $at = C1E00000 @@ -690,27 +690,27 @@ glabel L80901AB0 /* 04CC4 80901C04 E60403A8 */ swc1 $f4, 0x03A8($s0) ## 000003A8 /* 04CC8 80901C08 E60603AC */ swc1 $f6, 0x03AC($s0) ## 000003AC /* 04CCC 80901C0C E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 -/* 04CD0 80901C10 C42ADC54 */ lwc1 $f10, %lo(D_8090DC54)($at) +/* 04CD0 80901C10 C42ADC54 */ lwc1 $f10, %lo(D_8090DC54)($at) /* 04CD4 80901C14 3C01C130 */ lui $at, 0xC130 ## $at = C1300000 /* 04CD8 80901C18 44818000 */ mtc1 $at, $f16 ## $f16 = -11.00 /* 04CDC 80901C1C E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 -/* 04CE0 80901C20 1000003B */ beq $zero, $zero, .L80901D10 +/* 04CE0 80901C20 1000003B */ beq $zero, $zero, .L80901D10 /* 04CE4 80901C24 E61003B8 */ swc1 $f16, 0x03B8($s0) ## 000003B8 .L80901C28: -/* 04CE8 80901C28 2C61001E */ sltiu $at, $v1, 0x001E -/* 04CEC 80901C2C 10200003 */ beq $at, $zero, .L80901C3C +/* 04CE8 80901C28 2C61001E */ sltiu $at, $v1, 0x001E +/* 04CEC 80901C2C 10200003 */ beq $at, $zero, .L80901C3C /* 04CF0 80901C30 25CE702C */ addiu $t6, $t6, %lo(D_8090702C) ## $t6 = 8090702C -/* 04CF4 80901C34 1000000F */ beq $zero, $zero, .L80901C74 +/* 04CF4 80901C34 1000000F */ beq $zero, $zero, .L80901C74 /* 04CF8 80901C38 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 .L80901C3C: -/* 04CFC 80901C3C 2C61002B */ sltiu $at, $v1, 0x002B -/* 04D00 80901C40 10200003 */ beq $at, $zero, .L80901C50 +/* 04CFC 80901C3C 2C61002B */ sltiu $at, $v1, 0x002B +/* 04D00 80901C40 10200003 */ beq $at, $zero, .L80901C50 /* 04D04 80901C44 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 04D08 80901C48 1000000A */ beq $zero, $zero, .L80901C74 +/* 04D08 80901C48 1000000A */ beq $zero, $zero, .L80901C74 /* 04D0C 80901C4C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 .L80901C50: /* 04D10 80901C50 3C018091 */ lui $at, %hi(D_8090DC58) ## $at = 80910000 -/* 04D14 80901C54 C432DC58 */ lwc1 $f18, %lo(D_8090DC58)($at) +/* 04D14 80901C54 C432DC58 */ lwc1 $f18, %lo(D_8090DC58)($at) /* 04D18 80901C58 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 04D1C 80901C5C 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 /* 04D20 80901C60 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -722,50 +722,50 @@ glabel L80901AB0 /* 04D34 80901C74 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 04D38 80901C78 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 /* 04D3C 80901C7C C4CA0024 */ lwc1 $f10, 0x0024($a2) ## 00000024 -/* 04D40 80901C80 00052080 */ sll $a0, $a1, 2 -/* 04D44 80901C84 00852023 */ subu $a0, $a0, $a1 -/* 04D48 80901C88 00042080 */ sll $a0, $a0, 2 -/* 04D4C 80901C8C 46005401 */ sub.s $f16, $f10, $f0 -/* 04D50 80901C90 008E1021 */ addu $v0, $a0, $t6 +/* 04D40 80901C80 00052080 */ sll $a0, $a1, 2 +/* 04D44 80901C84 00852023 */ subu $a0, $a0, $a1 +/* 04D48 80901C88 00042080 */ sll $a0, $a0, 2 +/* 04D4C 80901C8C 46005401 */ sub.s $f16, $f10, $f0 +/* 04D50 80901C90 008E1021 */ addu $v0, $a0, $t6 /* 04D54 80901C94 C4480000 */ lwc1 $f8, 0x0000($v0) ## 00000000 /* 04D58 80901C98 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 04D5C 80901C9C 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 -/* 04D60 80901CA0 46104480 */ add.s $f18, $f8, $f16 +/* 04D60 80901CA0 46104480 */ add.s $f18, $f8, $f16 /* 04D64 80901CA4 3C0F8090 */ lui $t7, %hi(D_80907050) ## $t7 = 80900000 /* 04D68 80901CA8 25EF7050 */ addiu $t7, $t7, %lo(D_80907050) ## $t7 = 80907050 -/* 04D6C 80901CAC 008F1821 */ addu $v1, $a0, $t7 +/* 04D6C 80901CAC 008F1821 */ addu $v1, $a0, $t7 /* 04D70 80901CB0 E61203A4 */ swc1 $f18, 0x03A4($s0) ## 000003A4 /* 04D74 80901CB4 C4C60028 */ lwc1 $f6, 0x0028($a2) ## 00000028 /* 04D78 80901CB8 C4440004 */ lwc1 $f4, 0x0004($v0) ## 00000004 -/* 04D7C 80901CBC 46003280 */ add.s $f10, $f6, $f0 -/* 04D80 80901CC0 460A2200 */ add.s $f8, $f4, $f10 +/* 04D7C 80901CBC 46003280 */ add.s $f10, $f6, $f0 +/* 04D80 80901CC0 460A2200 */ add.s $f8, $f4, $f10 /* 04D84 80901CC4 E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 04D88 80901CC8 C4D2002C */ lwc1 $f18, 0x002C($a2) ## 0000002C /* 04D8C 80901CCC C4500008 */ lwc1 $f16, 0x0008($v0) ## 00000008 -/* 04D90 80901CD0 46029180 */ add.s $f6, $f18, $f2 -/* 04D94 80901CD4 46068100 */ add.s $f4, $f16, $f6 +/* 04D90 80901CD0 46029180 */ add.s $f6, $f18, $f2 +/* 04D94 80901CD4 46068100 */ add.s $f4, $f16, $f6 /* 04D98 80901CD8 E60403AC */ swc1 $f4, 0x03AC($s0) ## 000003AC /* 04D9C 80901CDC C4C80024 */ lwc1 $f8, 0x0024($a2) ## 00000024 /* 04DA0 80901CE0 C46A0000 */ lwc1 $f10, 0x0000($v1) ## 00000000 -/* 04DA4 80901CE4 46085480 */ add.s $f18, $f10, $f8 +/* 04DA4 80901CE4 46085480 */ add.s $f18, $f10, $f8 /* 04DA8 80901CE8 E61203B0 */ swc1 $f18, 0x03B0($s0) ## 000003B0 /* 04DAC 80901CEC C4C60028 */ lwc1 $f6, 0x0028($a2) ## 00000028 /* 04DB0 80901CF0 C4700004 */ lwc1 $f16, 0x0004($v1) ## 00000004 -/* 04DB4 80901CF4 46023100 */ add.s $f4, $f6, $f2 -/* 04DB8 80901CF8 46048280 */ add.s $f10, $f16, $f4 +/* 04DB4 80901CF4 46023100 */ add.s $f4, $f6, $f2 +/* 04DB8 80901CF8 46048280 */ add.s $f10, $f16, $f4 /* 04DBC 80901CFC E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 /* 04DC0 80901D00 C4D2002C */ lwc1 $f18, 0x002C($a2) ## 0000002C /* 04DC4 80901D04 C4680008 */ lwc1 $f8, 0x0008($v1) ## 00000008 -/* 04DC8 80901D08 46124180 */ add.s $f6, $f8, $f18 +/* 04DC8 80901D08 46124180 */ add.s $f6, $f8, $f18 /* 04DCC 80901D0C E60603B8 */ swc1 $f6, 0x03B8($s0) ## 000003B8 .L80901D10: /* 04DD0 80901D10 8E180398 */ lw $t8, 0x0398($s0) ## 00000398 /* 04DD4 80901D14 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 -/* 04DD8 80901D18 2F010051 */ sltiu $at, $t8, 0x0051 -/* 04DDC 80901D1C 5420015D */ bnel $at, $zero, .L80902294 +/* 04DD8 80901D18 2F010051 */ sltiu $at, $t8, 0x0051 +/* 04DDC 80901D1C 5420015D */ bnel $at, $zero, .L80902294 /* 04DE0 80901D20 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 04DE4 80901D24 0C03E803 */ jal Audio_SetBGM - + /* 04DE8 80901D28 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 04DEC 80901D2C 3C0142E0 */ lui $at, 0x42E0 ## $at = 42E00000 /* 04DF0 80901D30 44818000 */ mtc1 $at, $f16 ## $f16 = 112.00 @@ -774,7 +774,7 @@ glabel L80901AB0 /* 04DFC 80901D3C AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 04E00 80901D40 3C018091 */ lui $at, %hi(D_8090DC5C) ## $at = 80910000 /* 04E04 80901D44 E61003A4 */ swc1 $f16, 0x03A4($s0) ## 000003A4 -/* 04E08 80901D48 C424DC5C */ lwc1 $f4, %lo(D_8090DC5C)($at) +/* 04E08 80901D48 C424DC5C */ lwc1 $f4, %lo(D_8090DC5C)($at) /* 04E0C 80901D4C 3C01434A */ lui $at, 0x434A ## $at = 434A0000 /* 04E10 80901D50 44815000 */ mtc1 $at, $f10 ## $f10 = 202.00 /* 04E14 80901D54 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 @@ -789,96 +789,96 @@ glabel L80901AB0 /* 04E38 80901D78 E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 /* 04E3C 80901D7C E61203B4 */ swc1 $f18, 0x03B4($s0) ## 000003B4 /* 04E40 80901D80 E60603B8 */ swc1 $f6, 0x03B8($s0) ## 000003B8 -/* 04E44 80901D84 8FA9004C */ lw $t1, 0x004C($sp) +/* 04E44 80901D84 8FA9004C */ lw $t1, 0x004C($sp) /* 04E48 80901D88 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 /* 04E4C 80901D8C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 04E50 80901D90 E5300024 */ swc1 $f16, 0x0024($t1) ## 00000024 -/* 04E54 80901D94 1000013E */ beq $zero, $zero, .L80902290 +/* 04E54 80901D94 1000013E */ beq $zero, $zero, .L80902290 /* 04E58 80901D98 E60403C4 */ swc1 $f4, 0x03C4($s0) ## 000003C4 /* 04E5C 80901D9C 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 .L80901DA0: /* 04E60 80901DA0 240A0017 */ addiu $t2, $zero, 0x0017 ## $t2 = 00000017 /* 04E64 80901DA4 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 04E68 80901DA8 17210139 */ bne $t9, $at, .L80902290 +/* 04E68 80901DA8 17210139 */ bne $t9, $at, .L80902290 /* 04E6C 80901DAC A20A0339 */ sb $t2, 0x0339($s0) ## 00000339 /* 04E70 80901DB0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04E74 80901DB4 24A57288 */ addiu $a1, $a1, 0x7288 ## $a1 = 06007288 -/* 04E78 80901DB8 8FA40028 */ lw $a0, 0x0028($sp) -/* 04E7C 80901DBC 0C029490 */ jal func_800A5240 +/* 04E78 80901DB8 8FA40028 */ lw $a0, 0x0028($sp) +/* 04E7C 80901DBC 0C029490 */ jal func_800A5240 /* 04E80 80901DC0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 04E84 80901DC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04E88 80901DC8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04E8C 80901DCC 24847288 */ addiu $a0, $a0, 0x7288 ## $a0 = 06007288 /* 04E90 80901DD0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 04E94 80901DD4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04E98 80901DD8 24060062 */ addiu $a2, $zero, 0x0062 ## $a2 = 00000062 -/* 04E9C 80901DDC 46805220 */ cvt.s.w $f8, $f10 +/* 04E9C 80901DDC 46805220 */ cvt.s.w $f8, $f10 /* 04EA0 80901DE0 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 -/* 04EA4 80901DE4 0C00B7D5 */ jal func_8002DF54 -/* 04EA8 80901DE8 8FA40054 */ lw $a0, 0x0054($sp) +/* 04EA4 80901DE4 0C00B7D5 */ jal func_8002DF54 +/* 04EA8 80901DE8 8FA40054 */ lw $a0, 0x0054($sp) /* 04EAC 80901DEC 240B0008 */ addiu $t3, $zero, 0x0008 ## $t3 = 00000008 /* 04EB0 80901DF0 240C03E8 */ addiu $t4, $zero, 0x03E8 ## $t4 = 000003E8 /* 04EB4 80901DF4 A60B039C */ sh $t3, 0x039C($s0) ## 0000039C -/* 04EB8 80901DF8 10000125 */ beq $zero, $zero, .L80902290 +/* 04EB8 80901DF8 10000125 */ beq $zero, $zero, .L80902290 /* 04EBC 80901DFC AE0C0398 */ sw $t4, 0x0398($s0) ## 00000398 glabel L80901E00 /* 04EC0 80901E00 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 04EC4 80901E04 24010401 */ addiu $at, $zero, 0x0401 ## $at = 00000401 /* 04EC8 80901E08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04ECC 80901E0C 54610007 */ bnel $v1, $at, .L80901E2C -/* 04ED0 80901E10 2C6103E8 */ sltiu $at, $v1, 0x03E8 +/* 04ECC 80901E0C 54610007 */ bnel $v1, $at, .L80901E2C +/* 04ED0 80901E10 2C6103E8 */ sltiu $at, $v1, 0x03E8 /* 04ED4 80901E14 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04ED8 80901E18 240539D8 */ addiu $a1, $zero, 0x39D8 ## $a1 = 000039D8 /* 04EDC 80901E1C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04EE0 80901E20 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 04EE4 80901E24 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 04EE8 80901E28 2C6103E8 */ sltiu $at, $v1, 0x03E8 +/* 04EE8 80901E28 2C6103E8 */ sltiu $at, $v1, 0x03E8 .L80901E2C: -/* 04EEC 80901E2C 1420000D */ bne $at, $zero, .L80901E64 -/* 04EF0 80901E30 2C610410 */ sltiu $at, $v1, 0x0410 -/* 04EF4 80901E34 1020000B */ beq $at, $zero, .L80901E64 +/* 04EEC 80901E2C 1420000D */ bne $at, $zero, .L80901E64 +/* 04EF0 80901E30 2C610410 */ sltiu $at, $v1, 0x0410 +/* 04EF4 80901E34 1020000B */ beq $at, $zero, .L80901E64 /* 04EF8 80901E38 240D0017 */ addiu $t5, $zero, 0x0017 ## $t5 = 00000017 /* 04EFC 80901E3C A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 -/* 04F00 80901E40 8FA40054 */ lw $a0, 0x0054($sp) +/* 04F00 80901E40 8FA40054 */ lw $a0, 0x0054($sp) /* 04F04 80901E44 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04F08 80901E48 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 04F0C 80901E4C 44050000 */ mfc1 $a1, $f0 +/* 04F0C 80901E4C 44050000 */ mfc1 $a1, $f0 /* 04F10 80901E50 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 04F14 80901E54 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 04F18 80901E58 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 04F1C 80901E5C 00812021 */ addu $a0, $a0, $at + +/* 04F1C 80901E5C 00812021 */ addu $a0, $a0, $at /* 04F20 80901E60 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80901E64: /* 04F24 80901E64 24010410 */ addiu $at, $zero, 0x0410 ## $at = 00000410 -/* 04F28 80901E68 1461000F */ bne $v1, $at, .L80901EA8 +/* 04F28 80901E68 1461000F */ bne $v1, $at, .L80901EA8 /* 04F2C 80901E6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04F30 80901E70 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04F34 80901E74 240539A1 */ addiu $a1, $zero, 0x39A1 ## $a1 = 000039A1 /* 04F38 80901E78 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 04F3C 80901E7C A20E0336 */ sb $t6, 0x0336($s0) ## 00000336 /* 04F40 80901E80 A2000339 */ sb $zero, 0x0339($s0) ## 00000339 -/* 04F44 80901E84 8FAF0054 */ lw $t7, 0x0054($sp) +/* 04F44 80901E84 8FAF0054 */ lw $t7, 0x0054($sp) /* 04F48 80901E88 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04F4C 80901E8C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 04F50 80901E90 002F0821 */ addu $at, $at, $t7 +/* 04F50 80901E90 002F0821 */ addu $at, $at, $t7 /* 04F54 80901E94 A0200AE2 */ sb $zero, 0x0AE2($at) ## 00010AE2 -/* 04F58 80901E98 8FB80054 */ lw $t8, 0x0054($sp) +/* 04F58 80901E98 8FB80054 */ lw $t8, 0x0054($sp) /* 04F5C 80901E9C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04F60 80901EA0 00380821 */ addu $at, $at, $t8 +/* 04F60 80901EA0 00380821 */ addu $at, $at, $t8 /* 04F64 80901EA4 E4320AFC */ swc1 $f18, 0x0AFC($at) ## 00010AFC .L80901EA8: -/* 04F68 80901EA8 8FA40028 */ lw $a0, 0x0028($sp) -/* 04F6C 80901EAC 0C0295B2 */ jal func_800A56C8 +/* 04F68 80901EA8 8FA40028 */ lw $a0, 0x0028($sp) +/* 04F6C 80901EAC 0C0295B2 */ jal func_800A56C8 /* 04F70 80901EB0 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 04F74 80901EB4 10400009 */ beq $v0, $zero, .L80901EDC -/* 04F78 80901EB8 8FA40028 */ lw $a0, 0x0028($sp) +/* 04F74 80901EB4 10400009 */ beq $v0, $zero, .L80901EDC +/* 04F78 80901EB8 8FA40028 */ lw $a0, 0x0028($sp) /* 04F7C 80901EBC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 04F80 80901EC0 24A58EB8 */ addiu $a1, $a1, 0x8EB8 ## $a1 = 06008EB8 -/* 04F84 80901EC4 0C029490 */ jal func_800A5240 +/* 04F84 80901EC4 0C029490 */ jal func_800A5240 /* 04F88 80901EC8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 04F8C 80901ECC 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 04F90 80901ED0 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 @@ -890,45 +890,45 @@ glabel L80901E00 /* 04FA4 80901EE4 3C018091 */ lui $at, %hi(D_8090DC60) ## $at = 80910000 /* 04FA8 80901EE8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 04FAC 80901EEC E61003A4 */ swc1 $f16, 0x03A4($s0) ## 000003A4 -/* 04FB0 80901EF0 C424DC60 */ lwc1 $f4, %lo(D_8090DC60)($at) +/* 04FB0 80901EF0 C424DC60 */ lwc1 $f4, %lo(D_8090DC60)($at) /* 04FB4 80901EF4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 04FB8 80901EF8 C60801B8 */ lwc1 $f8, 0x01B8($s0) ## 000001B8 /* 04FBC 80901EFC C61201BC */ lwc1 $f18, 0x01BC($s0) ## 000001BC /* 04FC0 80901F00 C60601C0 */ lwc1 $f6, 0x01C0($s0) ## 000001C0 -/* 04FC4 80901F04 2C6103E8 */ sltiu $at, $v1, 0x03E8 +/* 04FC4 80901F04 2C6103E8 */ sltiu $at, $v1, 0x03E8 /* 04FC8 80901F08 E60403A8 */ swc1 $f4, 0x03A8($s0) ## 000003A8 /* 04FCC 80901F0C E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 04FD0 80901F10 E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 /* 04FD4 80901F14 E61203B4 */ swc1 $f18, 0x03B4($s0) ## 000003B4 -/* 04FD8 80901F18 10200007 */ beq $at, $zero, .L80901F38 +/* 04FD8 80901F18 10200007 */ beq $at, $zero, .L80901F38 /* 04FDC 80901F1C E60603B8 */ swc1 $f6, 0x03B8($s0) ## 000003B8 /* 04FE0 80901F20 3068000F */ andi $t0, $v1, 0x000F ## $t0 = 00000000 -/* 04FE4 80901F24 15000004 */ bne $t0, $zero, .L80901F38 +/* 04FE4 80901F24 15000004 */ bne $t0, $zero, .L80901F38 /* 04FE8 80901F28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04FEC 80901F2C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04FF0 80901F30 24053997 */ addiu $a1, $zero, 0x3997 ## $a1 = 00003997 /* 04FF4 80901F34 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80901F38: /* 04FF8 80901F38 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 04FFC 80901F3C 146100D4 */ bne $v1, $at, .L80902290 +/* 04FFC 80901F3C 146100D4 */ bne $v1, $at, .L80902290 /* 05000 80901F40 24090009 */ addiu $t1, $zero, 0x0009 ## $t1 = 00000009 /* 05004 80901F44 A609039C */ sh $t1, 0x039C($s0) ## 0000039C /* 05008 80901F48 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 0500C 80901F4C 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 -/* 05010 80901F50 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 05010 80901F50 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) /* 05014 80901F54 240A000B */ addiu $t2, $zero, 0x000B ## $t2 = 0000000B /* 05018 80901F58 240570D9 */ addiu $a1, $zero, 0x70D9 ## $a1 = 000070D9 /* 0501C 80901F5C A32A03C8 */ sb $t2, 0x03C8($t9) ## 809103C8 -/* 05020 80901F60 8FA40054 */ lw $a0, 0x0054($sp) -/* 05024 80901F64 0C042DA0 */ jal func_8010B680 +/* 05020 80901F60 8FA40054 */ lw $a0, 0x0054($sp) +/* 05024 80901F64 0C042DA0 */ jal func_8010B680 /* 05028 80901F68 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0502C 80901F6C A2000336 */ sb $zero, 0x0336($s0) ## 00000336 -/* 05030 80901F70 8FAB0054 */ lw $t3, 0x0054($sp) +/* 05030 80901F70 8FAB0054 */ lw $t3, 0x0054($sp) /* 05034 80901F74 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 05038 80901F78 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0503C 80901F7C 002B0821 */ addu $at, $at, $t3 -/* 05040 80901F80 100000C3 */ beq $zero, $zero, .L80902290 +/* 0503C 80901F7C 002B0821 */ addu $at, $at, $t3 +/* 05040 80901F80 100000C3 */ beq $zero, $zero, .L80902290 /* 05044 80901F84 E4300AFC */ swc1 $f16, 0x0AFC($at) ## 00010AFC glabel L80901F88 /* 05048 80901F88 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -945,26 +945,26 @@ glabel L80901F88 /* 05074 80901FB4 E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 05078 80901FB8 E60A03A8 */ swc1 $f10, 0x03A8($s0) ## 000003A8 /* 0507C 80901FBC E60803AC */ swc1 $f8, 0x03AC($s0) ## 000003AC -/* 05080 80901FC0 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) +/* 05080 80901FC0 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) /* 05084 80901FC4 3C0E8091 */ lui $t6, %hi(D_8090EB2C) ## $t6 = 80910000 /* 05088 80901FC8 3C0F8091 */ lui $t7, %hi(D_8090EB2C) ## $t7 = 80910000 /* 0508C 80901FCC C5B20024 */ lwc1 $f18, 0x0024($t5) ## 80910024 /* 05090 80901FD0 8E180398 */ lw $t8, 0x0398($s0) ## 00000398 /* 05094 80901FD4 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A /* 05098 80901FD8 E61203B0 */ swc1 $f18, 0x03B0($s0) ## 000003B0 -/* 0509C 80901FDC 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) -/* 050A0 80901FE0 2F01003D */ sltiu $at, $t8, 0x003D +/* 0509C 80901FDC 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) +/* 050A0 80901FE0 2F01003D */ sltiu $at, $t8, 0x003D /* 050A4 80901FE4 C5C60028 */ lwc1 $f6, 0x0028($t6) ## 80910028 -/* 050A8 80901FE8 46023400 */ add.s $f16, $f6, $f2 +/* 050A8 80901FE8 46023400 */ add.s $f16, $f6, $f2 /* 050AC 80901FEC E61003B4 */ swc1 $f16, 0x03B4($s0) ## 000003B4 -/* 050B0 80901FF0 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) +/* 050B0 80901FF0 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) /* 050B4 80901FF4 C5E4002C */ lwc1 $f4, 0x002C($t7) ## 8091002C -/* 050B8 80901FF8 142000A5 */ bne $at, $zero, .L80902290 +/* 050B8 80901FF8 142000A5 */ bne $at, $zero, .L80902290 /* 050BC 80901FFC E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 /* 050C0 80902000 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 050C4 80902004 A608039C */ sh $t0, 0x039C($s0) ## 0000039C /* 050C8 80902008 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 050CC 8090200C 100000A0 */ beq $zero, $zero, .L80902290 +/* 050CC 8090200C 100000A0 */ beq $zero, $zero, .L80902290 /* 050D0 80902010 E60A0410 */ swc1 $f10, 0x0410($s0) ## 00000410 glabel L80902014 /* 050D4 80902014 24090018 */ addiu $t1, $zero, 0x0018 ## $t1 = 00000018 @@ -974,100 +974,100 @@ glabel L80902014 /* 050E4 80902024 260403A4 */ addiu $a0, $s0, 0x03A4 ## $a0 = 000003A4 /* 050E8 80902028 3C054391 */ lui $a1, 0x4391 ## $a1 = 43910000 /* 050EC 8090202C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 050F0 80902030 8E070410 */ lw $a3, 0x0410($s0) ## 00000410 /* 050F4 80902034 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 050F8 80902038 44819000 */ mtc1 $at, $f18 ## $f18 = 0.25 /* 050FC 8090203C C6080410 */ lwc1 $f8, 0x0410($s0) ## 00000410 /* 05100 80902040 3C05448D */ lui $a1, 0x448D ## $a1 = 448D0000 /* 05104 80902044 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 05108 80902048 46124182 */ mul.s $f6, $f8, $f18 +/* 05108 80902048 46124182 */ mul.s $f6, $f8, $f18 /* 0510C 8090204C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 05110 80902050 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = 448D4000 /* 05114 80902054 260403A8 */ addiu $a0, $s0, 0x03A8 ## $a0 = 000003A8 -/* 05118 80902058 44073000 */ mfc1 $a3, $f6 +/* 05118 80902058 44073000 */ mfc1 $a3, $f6 /* 0511C 8090205C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05120 80902060 00000000 */ nop /* 05124 80902064 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 /* 05128 80902068 44812000 */ mtc1 $at, $f4 ## $f4 = 1.25 /* 0512C 8090206C C6100410 */ lwc1 $f16, 0x0410($s0) ## 00000410 /* 05130 80902070 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 05134 80902074 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 05138 80902078 46048282 */ mul.s $f10, $f16, $f4 +/* 05138 80902078 46048282 */ mul.s $f10, $f16, $f4 /* 0513C 8090207C 260403AC */ addiu $a0, $s0, 0x03AC ## $a0 = 000003AC /* 05140 80902080 3C05C382 */ lui $a1, 0xC382 ## $a1 = C3820000 -/* 05144 80902084 44075000 */ mfc1 $a3, $f10 +/* 05144 80902084 44075000 */ mfc1 $a3, $f10 /* 05148 80902088 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0514C 8090208C 00000000 */ nop /* 05150 80902090 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 05154 80902094 26040384 */ addiu $a0, $s0, 0x0384 ## $a0 = 00000384 /* 05158 80902098 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 0515C 8090209C 2C610028 */ sltiu $at, $v1, 0x0028 -/* 05160 809020A0 14200019 */ bne $at, $zero, .L80902108 +/* 0515C 8090209C 2C610028 */ sltiu $at, $v1, 0x0028 +/* 05160 809020A0 14200019 */ bne $at, $zero, .L80902108 /* 05164 809020A4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 05168 809020A8 2C61006F */ sltiu $at, $v1, 0x006F -/* 0516C 809020AC 10200016 */ beq $at, $zero, .L80902108 +/* 05168 809020A8 2C61006F */ sltiu $at, $v1, 0x006F +/* 0516C 809020AC 10200016 */ beq $at, $zero, .L80902108 /* 05170 809020B0 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 -/* 05174 809020B4 8FA40054 */ lw $a0, 0x0054($sp) +/* 05174 809020B4 8FA40054 */ lw $a0, 0x0054($sp) /* 05178 809020B8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0517C 809020BC 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 05180 809020C0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 05184 809020C4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05188 809020C8 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 0518C 809020CC 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 05190 809020D0 00812021 */ addu $a0, $a0, $at + +/* 05190 809020D0 00812021 */ addu $a0, $a0, $at /* 05194 809020D4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 05198 809020D8 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 /* 0519C 809020DC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 051A0 809020E0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 051A4 809020E4 26040384 */ addiu $a0, $s0, 0x0384 ## $a0 = 00000384 /* 051A8 809020E8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 051AC 809020EC 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 051B0 809020F0 3C048091 */ lui $a0, %hi(D_8090EB2C) ## $a0 = 80910000 -/* 051B4 809020F4 8C84EB2C */ lw $a0, %lo(D_8090EB2C)($a0) +/* 051B4 809020F4 8C84EB2C */ lw $a0, %lo(D_8090EB2C)($a0) /* 051B8 809020F8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 051BC 809020FC 2405209A */ addiu $a1, $zero, 0x209A ## $a1 = 0000209A -/* 051C0 80902100 10000004 */ beq $zero, $zero, .L80902114 +/* 051C0 80902100 10000004 */ beq $zero, $zero, .L80902114 /* 051C4 80902104 8E0A0398 */ lw $t2, 0x0398($s0) ## 00000398 .L80902108: /* 051C8 80902108 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 051CC 8090210C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 0000CCCD /* 051D0 80902110 8E0A0398 */ lw $t2, 0x0398($s0) ## 00000398 .L80902114: /* 051D4 80902114 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 /* 051D8 80902118 3C0B8091 */ lui $t3, %hi(D_8090EB2C) ## $t3 = 80910000 -/* 051DC 8090211C 2D410083 */ sltiu $at, $t2, 0x0083 -/* 051E0 80902120 14200015 */ bne $at, $zero, .L80902178 +/* 051DC 8090211C 2D410083 */ sltiu $at, $t2, 0x0083 +/* 051E0 80902120 14200015 */ bne $at, $zero, .L80902178 /* 051E4 80902124 00000000 */ nop -/* 051E8 80902128 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 051E8 80902128 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) /* 051EC 8090212C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 051F0 80902130 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 /* 051F4 80902134 C7280028 */ lwc1 $f8, 0x0028($t9) ## 80910028 /* 051F8 80902138 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 051FC 8090213C 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 05200 80902140 46024480 */ add.s $f18, $f8, $f2 +/* 05200 80902140 46024480 */ add.s $f18, $f8, $f2 /* 05204 80902144 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05208 80902148 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 0520C 8090214C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 05210 80902150 46069400 */ add.s $f16, $f18, $f6 +/* 05210 80902150 46069400 */ add.s $f16, $f18, $f6 /* 05214 80902154 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05218 80902158 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 0521C 8090215C 8E070410 */ lw $a3, 0x0410($s0) ## 00000410 -/* 05220 80902160 46048281 */ sub.s $f10, $f16, $f4 -/* 05224 80902164 44055000 */ mfc1 $a1, $f10 +/* 05220 80902160 46048281 */ sub.s $f10, $f16, $f4 +/* 05224 80902164 44055000 */ mfc1 $a1, $f10 /* 05228 80902168 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0522C 8090216C 00000000 */ nop -/* 05230 80902170 10000015 */ beq $zero, $zero, .L809021C8 +/* 05230 80902170 10000015 */ beq $zero, $zero, .L809021C8 /* 05234 80902174 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 .L80902178: -/* 05238 80902178 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) +/* 05238 80902178 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) /* 0523C 8090217C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 05240 80902180 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 /* 05244 80902184 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -1076,16 +1076,16 @@ glabel L80902014 /* 05250 80902190 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 05254 80902194 44815000 */ mtc1 $at, $f10 ## $f10 = 0.25 /* 05258 80902198 C6040410 */ lwc1 $f4, 0x0410($s0) ## 00000410 -/* 0525C 8090219C 46024480 */ add.s $f18, $f8, $f2 +/* 0525C 8090219C 46024480 */ add.s $f18, $f8, $f2 /* 05260 809021A0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 05264 809021A4 460A2202 */ mul.s $f8, $f4, $f10 +/* 05264 809021A4 460A2202 */ mul.s $f8, $f4, $f10 /* 05268 809021A8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 0526C 809021AC 46069400 */ add.s $f16, $f18, $f6 +/* 0526C 809021AC 46069400 */ add.s $f16, $f18, $f6 /* 05270 809021B0 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 -/* 05274 809021B4 44058000 */ mfc1 $a1, $f16 -/* 05278 809021B8 44074000 */ mfc1 $a3, $f8 +/* 05274 809021B4 44058000 */ mfc1 $a1, $f16 +/* 05278 809021B8 44074000 */ mfc1 $a3, $f8 /* 0527C 809021BC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05280 809021C0 00000000 */ nop /* 05284 809021C4 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 .L809021C8: @@ -1093,112 +1093,112 @@ glabel L80902014 /* 0528C 809021CC 26040410 */ addiu $a0, $s0, 0x0410 ## $a0 = 00000410 /* 05290 809021D0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 05294 809021D4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05298 809021D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0529C 809021DC 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 052A0 809021E0 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 052A4 809021E4 3C0D8091 */ lui $t5, %hi(D_8090EB2C) ## $t5 = 80910000 -/* 052A8 809021E8 14610005 */ bne $v1, $at, .L80902200 +/* 052A8 809021E8 14610005 */ bne $v1, $at, .L80902200 /* 052AC 809021EC 3C0F8091 */ lui $t7, %hi(D_8090EB2C) ## $t7 = 80910000 -/* 052B0 809021F0 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) +/* 052B0 809021F0 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) /* 052B4 809021F4 240C000C */ addiu $t4, $zero, 0x000C ## $t4 = 0000000C /* 052B8 809021F8 A1AC03C8 */ sb $t4, 0x03C8($t5) ## 809103C8 /* 052BC 809021FC 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80902200: /* 052C0 80902200 2401006E */ addiu $at, $zero, 0x006E ## $at = 0000006E -/* 052C4 80902204 14610005 */ bne $v1, $at, .L8090221C +/* 052C4 80902204 14610005 */ bne $v1, $at, .L8090221C /* 052C8 80902208 3C048091 */ lui $a0, %hi(D_8090EB2C) ## $a0 = 80910000 -/* 052CC 8090220C 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) +/* 052CC 8090220C 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) /* 052D0 80902210 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D /* 052D4 80902214 A1EE03C8 */ sb $t6, 0x03C8($t7) ## 809103C8 /* 052D8 80902218 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L8090221C: /* 052DC 8090221C 2401008C */ addiu $at, $zero, 0x008C ## $at = 0000008C -/* 052E0 80902220 14610004 */ bne $v1, $at, .L80902234 +/* 052E0 80902220 14610004 */ bne $v1, $at, .L80902234 /* 052E4 80902224 24052896 */ addiu $a1, $zero, 0x2896 ## $a1 = 00002896 /* 052E8 80902228 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 052EC 8090222C 8C84EB2C */ lw $a0, %lo(D_8090EB2C)($a0) + +/* 052EC 8090222C 8C84EB2C */ lw $a0, %lo(D_8090EB2C)($a0) /* 052F0 80902230 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80902234: -/* 052F4 80902234 2C6100A0 */ sltiu $at, $v1, 0x00A0 -/* 052F8 80902238 54200016 */ bnel $at, $zero, .L80902294 +/* 052F4 80902234 2C6100A0 */ sltiu $at, $v1, 0x00A0 +/* 052F8 80902238 54200016 */ bnel $at, $zero, .L80902294 /* 052FC 8090223C 8605039E */ lh $a1, 0x039E($s0) ## 0000039E glabel L80902240 -/* 05300 80902240 8FA20054 */ lw $v0, 0x0054($sp) +/* 05300 80902240 8FA20054 */ lw $v0, 0x0054($sp) /* 05304 80902244 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05308 80902248 2418006B */ addiu $t8, $zero, 0x006B ## $t8 = 0000006B -/* 0530C 8090224C 00220821 */ addu $at, $at, $v0 +/* 0530C 8090224C 00220821 */ addu $at, $at, $v0 /* 05310 80902250 A4381E1A */ sh $t8, 0x1E1A($at) ## 00011E1A /* 05314 80902254 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 05318 80902258 3408FFF2 */ ori $t0, $zero, 0xFFF2 ## $t0 = 0000FFF2 /* 0531C 8090225C A428FA72 */ sh $t0, -0x058E($at) ## 8015FA72 /* 05320 80902260 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05324 80902264 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 05328 80902268 00220821 */ addu $at, $at, $v0 +/* 05328 80902268 00220821 */ addu $at, $at, $v0 /* 0532C 8090226C A0291E15 */ sb $t1, 0x1E15($at) ## 00011E15 /* 05330 80902270 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05334 80902274 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 05338 80902278 00220821 */ addu $at, $at, $v0 +/* 05338 80902278 00220821 */ addu $at, $at, $v0 /* 0533C 8090227C A02A1E5E */ sb $t2, 0x1E5E($at) ## 00011E5E /* 05340 80902280 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05344 80902284 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 05348 80902288 00220821 */ addu $at, $at, $v0 +/* 05348 80902288 00220821 */ addu $at, $at, $v0 /* 0534C 8090228C A0391DE8 */ sb $t9, 0x1DE8($at) ## 00011DE8 glabel L80902290 .L80902290: /* 05350 80902290 8605039E */ lh $a1, 0x039E($s0) ## 0000039E .L80902294: -/* 05354 80902294 8FA40054 */ lw $a0, 0x0054($sp) +/* 05354 80902294 8FA40054 */ lw $a0, 0x0054($sp) /* 05358 80902298 260603B0 */ addiu $a2, $s0, 0x03B0 ## $a2 = 000003B0 -/* 0535C 8090229C 10A00004 */ beq $a1, $zero, .L809022B0 +/* 0535C 8090229C 10A00004 */ beq $a1, $zero, .L809022B0 /* 05360 809022A0 260703A4 */ addiu $a3, $s0, 0x03A4 ## $a3 = 000003A4 /* 05364 809022A4 260B03BC */ addiu $t3, $s0, 0x03BC ## $t3 = 000003BC -/* 05368 809022A8 0C030179 */ jal func_800C05E4 -/* 0536C 809022AC AFAB0010 */ sw $t3, 0x0010($sp) +/* 05368 809022A8 0C030179 */ jal func_800C05E4 +/* 0536C 809022AC AFAB0010 */ sw $t3, 0x0010($sp) .L809022B0: /* 05370 809022B0 860301AC */ lh $v1, 0x01AC($s0) ## 000001AC /* 05374 809022B4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 05378 809022B8 8FA40028 */ lw $a0, 0x0028($sp) -/* 0537C 809022BC 10600005 */ beq $v1, $zero, .L809022D4 +/* 05378 809022B8 8FA40028 */ lw $a0, 0x0028($sp) +/* 0537C 809022BC 10600005 */ beq $v1, $zero, .L809022D4 /* 05380 809022C0 00000000 */ nop -/* 05384 809022C4 5061000F */ beql $v1, $at, .L80902304 +/* 05384 809022C4 5061000F */ beql $v1, $at, .L80902304 /* 05388 809022C8 860D039C */ lh $t5, 0x039C($s0) ## 0000039C -/* 0538C 809022CC 1000001A */ beq $zero, $zero, .L80902338 -/* 05390 809022D0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0538C 809022CC 1000001A */ beq $zero, $zero, .L80902338 +/* 05390 809022D0 8FBF0024 */ lw $ra, 0x0024($sp) .L809022D4: -/* 05394 809022D4 0C0295B2 */ jal func_800A56C8 +/* 05394 809022D4 0C0295B2 */ jal func_800A56C8 /* 05398 809022D8 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 0539C 809022DC 10400015 */ beq $v0, $zero, .L80902334 -/* 053A0 809022E0 8FA40028 */ lw $a0, 0x0028($sp) +/* 0539C 809022DC 10400015 */ beq $v0, $zero, .L80902334 +/* 053A0 809022E0 8FA40028 */ lw $a0, 0x0028($sp) /* 053A4 809022E4 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 053A8 809022E8 24A54278 */ addiu $a1, $a1, 0x4278 ## $a1 = 06034278 -/* 053AC 809022EC 0C0294D3 */ jal func_800A534C +/* 053AC 809022EC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 053B0 809022F0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 053B4 809022F4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 053B8 809022F8 1000000E */ beq $zero, $zero, .L80902334 +/* 053B8 809022F8 1000000E */ beq $zero, $zero, .L80902334 /* 053BC 809022FC A60C01AC */ sh $t4, 0x01AC($s0) ## 000001AC /* 053C0 80902300 860D039C */ lh $t5, 0x039C($s0) ## 0000039C .L80902304: -/* 053C4 80902304 8FAE0054 */ lw $t6, 0x0054($sp) +/* 053C4 80902304 8FAE0054 */ lw $t6, 0x0054($sp) /* 053C8 80902308 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 053CC 8090230C 29A10007 */ slti $at, $t5, 0x0007 -/* 053D0 80902310 10200008 */ beq $at, $zero, .L80902334 -/* 053D4 80902314 01EE7821 */ addu $t7, $t7, $t6 +/* 053CC 8090230C 29A10007 */ slti $at, $t5, 0x0007 +/* 053D0 80902310 10200008 */ beq $at, $zero, .L80902334 +/* 053D4 80902314 01EE7821 */ addu $t7, $t7, $t6 /* 053D8 80902318 8DEF1DE4 */ lw $t7, 0x1DE4($t7) ## 00011DE4 /* 053DC 8090231C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 053E0 80902320 31F8001F */ andi $t8, $t7, 0x001F ## $t8 = 00000000 -/* 053E4 80902324 57000004 */ bnel $t8, $zero, .L80902338 -/* 053E8 80902328 8FBF0024 */ lw $ra, 0x0024($sp) +/* 053E4 80902324 57000004 */ bnel $t8, $zero, .L80902338 +/* 053E8 80902328 8FBF0024 */ lw $ra, 0x0024($sp) /* 053EC 8090232C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 053F0 80902330 240539AF */ addiu $a1, $zero, 0x39AF ## $a1 = 000039AF .L80902334: -/* 053F4 80902334 8FBF0024 */ lw $ra, 0x0024($sp) +/* 053F4 80902334 8FBF0024 */ lw $ra, 0x0024($sp) .L80902338: -/* 053F8 80902338 8FB00020 */ lw $s0, 0x0020($sp) +/* 053F8 80902338 8FB00020 */ lw $s0, 0x0020($sp) /* 053FC 8090233C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 05400 80902340 03E00008 */ jr $ra +/* 05400 80902340 03E00008 */ jr $ra /* 05404 80902344 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s index 8a3b395b48..f47300fd79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s @@ -1,42 +1,42 @@ glabel BossGanondrof_Destroy /* 006BC 80910CFC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 006C0 80910D00 AFB00014 */ sw $s0, 0x0014($sp) +/* 006C0 80910D00 AFB00014 */ sw $s0, 0x0014($sp) /* 006C4 80910D04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006C8 80910D08 AFBF001C */ sw $ra, 0x001C($sp) -/* 006CC 80910D0C AFB10018 */ sw $s1, 0x0018($sp) +/* 006C8 80910D08 AFBF001C */ sw $ra, 0x001C($sp) +/* 006CC 80910D0C AFB10018 */ sw $s1, 0x0018($sp) /* 006D0 80910D10 3C048091 */ lui $a0, %hi(D_80915140) ## $a0 = 80910000 /* 006D4 80910D14 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 006D8 80910D18 0C00084C */ jal osSyncPrintf - + /* 006DC 80910D1C 24845140 */ addiu $a0, $a0, %lo(D_80915140) ## $a0 = 80915140 /* 006E0 80910D20 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 006E4 80910D24 0C0295BC */ jal func_800A56F0 +/* 006E4 80910D24 0C0295BC */ jal SkelAnime_Free /* 006E8 80910D28 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 006EC 80910D2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 006F0 80910D30 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 006F4 80910D34 260504E0 */ addiu $a1, $s0, 0x04E0 ## $a1 = 000004E0 /* 006F8 80910D38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 006FC 80910D3C 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 00700 80910D40 2605052C */ addiu $a1, $s0, 0x052C ## $a1 = 0000052C /* 00704 80910D44 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00708 80910D48 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0070C 80910D4C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00710 80910D50 15C10003 */ bne $t6, $at, .L80910D60 +/* 00710 80910D50 15C10003 */ bne $t6, $at, .L80910D60 /* 00714 80910D54 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 /* 00718 80910D58 0C01E9F1 */ jal Lights_Remove - + /* 0071C 80910D5C 8E0604CC */ lw $a2, 0x04CC($s0) ## 000004CC .L80910D60: /* 00720 80910D60 3C048091 */ lui $a0, %hi(D_80915148) ## $a0 = 80910000 /* 00724 80910D64 0C00084C */ jal osSyncPrintf - + /* 00728 80910D68 24845148 */ addiu $a0, $a0, %lo(D_80915148) ## $a0 = 80915148 -/* 0072C 80910D6C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00730 80910D70 8FB00014 */ lw $s0, 0x0014($sp) -/* 00734 80910D74 8FB10018 */ lw $s1, 0x0018($sp) -/* 00738 80910D78 03E00008 */ jr $ra +/* 0072C 80910D6C 8FBF001C */ lw $ra, 0x001C($sp) +/* 00730 80910D70 8FB00014 */ lw $s0, 0x0014($sp) +/* 00734 80910D74 8FB10018 */ lw $s1, 0x0018($sp) +/* 00738 80910D78 03E00008 */ jr $ra /* 0073C 80910D7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s index 2db1562113..37587134e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s @@ -1,22 +1,22 @@ glabel func_80910D80 /* 00740 80910D80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00744 80910D84 AFA5001C */ sw $a1, 0x001C($sp) -/* 00748 80910D88 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00744 80910D84 AFA5001C */ sw $a1, 0x001C($sp) +/* 00748 80910D88 AFBF0014 */ sw $ra, 0x0014($sp) /* 0074C 80910D8C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00750 80910D90 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00754 80910D94 24A519A4 */ addiu $a1, $a1, 0x19A4 ## $a1 = 060019A4 -/* 00758 80910D98 AFA60018 */ sw $a2, 0x0018($sp) -/* 0075C 80910D9C 0C0294BE */ jal func_800A52F8 +/* 00758 80910D98 AFA60018 */ sw $a2, 0x0018($sp) +/* 0075C 80910D9C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00760 80910DA0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00764 80910DA4 8FA60018 */ lw $a2, 0x0018($sp) +/* 00764 80910DA4 8FA60018 */ lw $a2, 0x0018($sp) /* 00768 80910DA8 3C0E8091 */ lui $t6, %hi(func_80910DCC) ## $t6 = 80910000 /* 0076C 80910DAC 25CE0DCC */ addiu $t6, $t6, %lo(func_80910DCC) ## $t6 = 80910DCC /* 00770 80910DB0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00774 80910DB4 ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 /* 00778 80910DB8 A4CF01A8 */ sh $t7, 0x01A8($a2) ## 000001A8 -/* 0077C 80910DBC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0077C 80910DBC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00780 80910DC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00784 80910DC4 03E00008 */ jr $ra +/* 00784 80910DC4 03E00008 */ jr $ra /* 00788 80910DC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s index 1197a0e779..7b0b11cb82 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s @@ -1,21 +1,21 @@ glabel func_80910DCC /* 0078C 80910DCC 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 00790 80910DD0 AFBF0054 */ sw $ra, 0x0054($sp) -/* 00794 80910DD4 AFB30050 */ sw $s3, 0x0050($sp) -/* 00798 80910DD8 AFB2004C */ sw $s2, 0x004C($sp) -/* 0079C 80910DDC AFB10048 */ sw $s1, 0x0048($sp) -/* 007A0 80910DE0 AFB00044 */ sw $s0, 0x0044($sp) -/* 007A4 80910DE4 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 007A8 80910DE8 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 007AC 80910DEC AFA500A4 */ sw $a1, 0x00A4($sp) +/* 00790 80910DD0 AFBF0054 */ sw $ra, 0x0054($sp) +/* 00794 80910DD4 AFB30050 */ sw $s3, 0x0050($sp) +/* 00798 80910DD8 AFB2004C */ sw $s2, 0x004C($sp) +/* 0079C 80910DDC AFB10048 */ sw $s1, 0x0048($sp) +/* 007A0 80910DE0 AFB00044 */ sw $s0, 0x0044($sp) +/* 007A4 80910DE4 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 007A8 80910DE8 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 007AC 80910DEC AFA500A4 */ sw $a1, 0x00A4($sp) /* 007B0 80910DF0 8C8E011C */ lw $t6, 0x011C($a0) ## 0000011C /* 007B4 80910DF4 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 /* 007B8 80910DF8 2491014C */ addiu $s1, $a0, 0x014C ## $s1 = 0000014C /* 007BC 80910DFC 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 007C0 80910E00 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 007C4 80910E04 AFAE0094 */ sw $t6, 0x0094($sp) -/* 007C8 80910E08 8FA60094 */ lw $a2, 0x0094($sp) + +/* 007C4 80910E04 AFAE0094 */ sw $t6, 0x0094($sp) +/* 007C8 80910E08 8FA60094 */ lw $a2, 0x0094($sp) /* 007CC 80910E0C 3C048091 */ lui $a0, %hi(D_80915150) ## $a0 = 80910000 /* 007D0 80910E10 24845150 */ addiu $a0, $a0, %lo(D_80915150) ## $a0 = 80915150 /* 007D4 80910E14 8CD80024 */ lw $t8, 0x0024($a2) ## 00000024 @@ -28,12 +28,12 @@ glabel func_80910DCC /* 007F0 80910E30 A6630032 */ sh $v1, 0x0032($s3) ## 00000032 /* 007F4 80910E34 A66300B6 */ sh $v1, 0x00B6($s3) ## 000000B6 /* 007F8 80910E38 0C00084C */ jal osSyncPrintf - + /* 007FC 80910E3C 90C5014C */ lbu $a1, 0x014C($a2) ## 0000014C /* 00800 80910E40 866201BE */ lh $v0, 0x01BE($s3) ## 000001BE -/* 00804 80910E44 1040003B */ beq $v0, $zero, .L80910F34 -/* 00808 80910E48 28410019 */ slti $at, $v0, 0x0019 -/* 0080C 80910E4C 10200039 */ beq $at, $zero, .L80910F34 +/* 00804 80910E44 1040003B */ beq $v0, $zero, .L80910F34 +/* 00808 80910E48 28410019 */ slti $at, $v0, 0x0019 +/* 0080C 80910E4C 10200039 */ beq $at, $zero, .L80910F34 /* 00810 80910E50 3C198091 */ lui $t9, %hi(D_809150A0) ## $t9 = 80910000 /* 00814 80910E54 273950A0 */ addiu $t9, $t9, %lo(D_809150A0) ## $t9 = 809150A0 /* 00818 80910E58 8F290000 */ lw $t1, 0x0000($t9) ## 809150A0 @@ -49,160 +49,160 @@ glabel func_80910DCC /* 00840 80910E80 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 /* 00844 80910E84 AE090008 */ sw $t1, 0x0008($s0) ## FFFFFFE4 /* 00848 80910E88 8D4C0000 */ lw $t4, 0x0000($t2) ## 809150AC -/* 0084C 80910E8C 4600A306 */ mov.s $f12, $f20 +/* 0084C 80910E8C 4600A306 */ mov.s $f12, $f20 /* 00850 80910E90 AE4C0000 */ sw $t4, 0x0000($s2) ## FFFFFFD0 /* 00854 80910E94 8D4B0004 */ lw $t3, 0x0004($t2) ## 809150B0 /* 00858 80910E98 AE4B0004 */ sw $t3, 0x0004($s2) ## FFFFFFD4 /* 0085C 80910E9C 8D4C0008 */ lw $t4, 0x0008($t2) ## 809150B4 /* 00860 80910EA0 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00864 80910EA4 AE4C0008 */ sw $t4, 0x0008($s2) ## FFFFFFD8 /* 00868 80910EA8 C66402C0 */ lwc1 $f4, 0x02C0($s3) ## 000002C0 /* 0086C 80910EAC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00870 80910EB0 44816000 */ mtc1 $at, $f12 ## $f12 = -5.00 -/* 00874 80910EB4 46040180 */ add.s $f6, $f0, $f4 +/* 00874 80910EB4 46040180 */ add.s $f6, $f0, $f4 /* 00878 80910EB8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0087C 80910EBC E7A60088 */ swc1 $f6, 0x0088($sp) + +/* 0087C 80910EBC E7A60088 */ swc1 $f6, 0x0088($sp) /* 00880 80910EC0 C66802C4 */ lwc1 $f8, 0x02C4($s3) ## 000002C4 -/* 00884 80910EC4 4600A306 */ mov.s $f12, $f20 -/* 00888 80910EC8 46080280 */ add.s $f10, $f0, $f8 +/* 00884 80910EC4 4600A306 */ mov.s $f12, $f20 +/* 00888 80910EC8 46080280 */ add.s $f10, $f0, $f8 /* 0088C 80910ECC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00890 80910ED0 E7AA008C */ swc1 $f10, 0x008C($sp) + +/* 00890 80910ED0 E7AA008C */ swc1 $f10, 0x008C($sp) /* 00894 80910ED4 C67002C8 */ lwc1 $f16, 0x02C8($s3) ## 000002C8 /* 00898 80910ED8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0089C 80910EDC 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 008A0 80910EE0 46100480 */ add.s $f18, $f0, $f16 +/* 008A0 80910EE0 46100480 */ add.s $f18, $f0, $f16 /* 008A4 80910EE4 3C018091 */ lui $at, %hi(D_80915414) ## $at = 80910000 -/* 008A8 80910EE8 C4285414 */ lwc1 $f8, %lo(D_80915414)($at) -/* 008AC 80910EEC 4600A306 */ mov.s $f12, $f20 -/* 008B0 80910EF0 46049180 */ add.s $f6, $f18, $f4 -/* 008B4 80910EF4 E7A80074 */ swc1 $f8, 0x0074($sp) +/* 008A8 80910EE8 C4285414 */ lwc1 $f8, %lo(D_80915414)($at) +/* 008AC 80910EEC 4600A306 */ mov.s $f12, $f20 +/* 008B0 80910EF0 46049180 */ add.s $f6, $f18, $f4 +/* 008B4 80910EF4 E7A80074 */ swc1 $f8, 0x0074($sp) /* 008B8 80910EF8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 008BC 80910EFC E7A60090 */ swc1 $f6, 0x0090($sp) -/* 008C0 80910F00 4600028D */ trunc.w.s $f10, $f0 -/* 008C4 80910F04 8FA400A4 */ lw $a0, 0x00A4($sp) + +/* 008BC 80910EFC E7A60090 */ swc1 $f6, 0x0090($sp) +/* 008C0 80910F00 4600028D */ trunc.w.s $f10, $f0 +/* 008C4 80910F04 8FA400A4 */ lw $a0, 0x00A4($sp) /* 008C8 80910F08 27A50088 */ addiu $a1, $sp, 0x0088 ## $a1 = FFFFFFE8 /* 008CC 80910F0C 02003025 */ or $a2, $s0, $zero ## $a2 = FFFFFFDC -/* 008D0 80910F10 440E5000 */ mfc1 $t6, $f10 +/* 008D0 80910F10 440E5000 */ mfc1 $t6, $f10 /* 008D4 80910F14 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFFD0 -/* 008D8 80910F18 AFA00014 */ sw $zero, 0x0014($sp) -/* 008DC 80910F1C 000E7C00 */ sll $t7, $t6, 16 -/* 008E0 80910F20 000FC403 */ sra $t8, $t7, 16 +/* 008D8 80910F18 AFA00014 */ sw $zero, 0x0014($sp) +/* 008DC 80910F1C 000E7C00 */ sll $t7, $t6, 16 +/* 008E0 80910F20 000FC403 */ sra $t8, $t7, 16 /* 008E4 80910F24 27190005 */ addiu $t9, $t8, 0x0005 ## $t9 = 00000005 -/* 008E8 80910F28 0C00A76F */ jal func_80029DBC -/* 008EC 80910F2C AFB90010 */ sw $t9, 0x0010($sp) +/* 008E8 80910F28 0C00A76F */ jal func_80029DBC +/* 008EC 80910F2C AFB90010 */ sw $t9, 0x0010($sp) /* 008F0 80910F30 866201BE */ lh $v0, 0x01BE($s3) ## 000001BE .L80910F34: /* 008F4 80910F34 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 008F8 80910F38 54410004 */ bnel $v0, $at, .L80910F4C +/* 008F8 80910F38 54410004 */ bnel $v0, $at, .L80910F4C /* 008FC 80910F3C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 00900 80910F40 A66001A8 */ sh $zero, 0x01A8($s3) ## 000001A8 /* 00904 80910F44 866201BE */ lh $v0, 0x01BE($s3) ## 000001BE /* 00908 80910F48 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E .L80910F4C: -/* 0090C 80910F4C 14410004 */ bne $v0, $at, .L80910F60 +/* 0090C 80910F4C 14410004 */ bne $v0, $at, .L80910F60 /* 00910 80910F50 3C048091 */ lui $a0, %hi(D_80915094) ## $a0 = 80910000 /* 00914 80910F54 24845094 */ addiu $a0, $a0, %lo(D_80915094) ## $a0 = 80915094 -/* 00918 80910F58 0C01E245 */ jal func_80078914 +/* 00918 80910F58 0C01E245 */ jal func_80078914 /* 0091C 80910F5C 240538A1 */ addiu $a1, $zero, 0x38A1 ## $a1 = 000038A1 .L80910F60: -/* 00920 80910F60 8FA80094 */ lw $t0, 0x0094($sp) +/* 00920 80910F60 8FA80094 */ lw $t0, 0x0094($sp) /* 00924 80910F64 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00928 80910F68 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 0092C 80910F6C 9103014C */ lbu $v1, 0x014C($t0) ## 0000014C /* 00930 80910F70 26101144 */ addiu $s0, $s0, 0x1144 ## $s0 = 06001144 -/* 00934 80910F74 54610014 */ bnel $v1, $at, .L80910FC8 +/* 00934 80910F74 54610014 */ bnel $v1, $at, .L80910FC8 /* 00938 80910F78 24120002 */ addiu $s2, $zero, 0x0002 ## $s2 = 00000002 /* 0093C 80910F7C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00940 80910F80 02002025 */ or $a0, $s0, $zero ## $a0 = 06001144 /* 00944 80910F84 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 00948 80910F88 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 /* 0094C 80910F8C 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 00950 80910F90 468084A0 */ cvt.s.w $f18, $f16 -/* 00954 80910F94 4407B000 */ mfc1 $a3, $f22 -/* 00958 80910F98 AFA90014 */ sw $t1, 0x0014($sp) +/* 00950 80910F90 468084A0 */ cvt.s.w $f18, $f16 +/* 00954 80910F94 4407B000 */ mfc1 $a3, $f22 +/* 00958 80910F98 AFA90014 */ sw $t1, 0x0014($sp) /* 0095C 80910F9C 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00960 80910FA0 02002825 */ or $a1, $s0, $zero ## $a1 = 06001144 /* 00964 80910FA4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00968 80910FA8 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00968 80910FA8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0096C 80910FAC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00970 80910FB0 E7B60018 */ swc1 $f22, 0x0018($sp) + +/* 00970 80910FB0 E7B60018 */ swc1 $f22, 0x0018($sp) /* 00974 80910FB4 240A0028 */ addiu $t2, $zero, 0x0028 ## $t2 = 00000028 /* 00978 80910FB8 A66A01BE */ sh $t2, 0x01BE($s3) ## 000001BE -/* 0097C 80910FBC 8FAB0094 */ lw $t3, 0x0094($sp) +/* 0097C 80910FBC 8FAB0094 */ lw $t3, 0x0094($sp) /* 00980 80910FC0 9163014C */ lbu $v1, 0x014C($t3) ## 0000014C /* 00984 80910FC4 24120002 */ addiu $s2, $zero, 0x0002 ## $s2 = 00000002 .L80910FC8: /* 00988 80910FC8 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 -/* 0098C 80910FCC 16430007 */ bne $s2, $v1, .L80910FEC +/* 0098C 80910FCC 16430007 */ bne $s2, $v1, .L80910FEC /* 00990 80910FD0 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00994 80910FD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00998 80910FD8 24A52684 */ addiu $a1, $a1, 0x2684 ## $a1 = 06002684 -/* 0099C 80910FDC 0C029490 */ jal func_800A5240 +/* 0099C 80910FDC 0C029490 */ jal func_800A5240 /* 009A0 80910FE0 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 009A4 80910FE4 8FAC0094 */ lw $t4, 0x0094($sp) +/* 009A4 80910FE4 8FAC0094 */ lw $t4, 0x0094($sp) /* 009A8 80910FE8 9183014C */ lbu $v1, 0x014C($t4) ## 0000014C .L80910FEC: /* 009AC 80910FEC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 009B0 80910FF0 14610007 */ bne $v1, $at, .L80911010 +/* 009B0 80910FF0 14610007 */ bne $v1, $at, .L80911010 /* 009B4 80910FF4 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 009B8 80910FF8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009BC 80910FFC 24A519A4 */ addiu $a1, $a1, 0x19A4 ## $a1 = 060019A4 -/* 009C0 80911000 0C0294D3 */ jal func_800A534C +/* 009C0 80911000 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 009C4 80911004 3C06C150 */ lui $a2, 0xC150 ## $a2 = C1500000 -/* 009C8 80911008 8FAD0094 */ lw $t5, 0x0094($sp) +/* 009C8 80911008 8FAD0094 */ lw $t5, 0x0094($sp) /* 009CC 8091100C 91A3014C */ lbu $v1, 0x014C($t5) ## 0000014C .L80911010: /* 009D0 80911010 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 009D4 80911014 1461001A */ bne $v1, $at, .L80911080 +/* 009D4 80911014 1461001A */ bne $v1, $at, .L80911080 /* 009D8 80911018 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 009DC 8091101C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 009E0 80911020 24A5D99C */ addiu $a1, $a1, 0xD99C ## $a1 = 0600D99C -/* 009E4 80911024 0C029490 */ jal func_800A5240 +/* 009E4 80911024 0C029490 */ jal func_800A5240 /* 009E8 80911028 3C06C0E0 */ lui $a2, 0xC0E0 ## $a2 = C0E00000 /* 009EC 8091102C C6640200 */ lwc1 $f4, 0x0200($s3) ## 00000200 /* 009F0 80911030 8E70011C */ lw $s0, 0x011C($s3) ## 0000011C -/* 009F4 80911034 8FA600A4 */ lw $a2, 0x00A4($sp) -/* 009F8 80911038 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 009F4 80911034 8FA600A4 */ lw $a2, 0x00A4($sp) +/* 009F8 80911038 E7A40010 */ swc1 $f4, 0x0010($sp) /* 009FC 8091103C C6660204 */ lwc1 $f6, 0x0204($s3) ## 00000204 /* 00A00 80911040 240F0032 */ addiu $t7, $zero, 0x0032 ## $t7 = 00000032 /* 00A04 80911044 24180026 */ addiu $t8, $zero, 0x0026 ## $t8 = 00000026 -/* 00A08 80911048 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00A08 80911048 E7A60014 */ swc1 $f6, 0x0014($sp) /* 00A0C 8091104C C6680208 */ lwc1 $f8, 0x0208($s3) ## 00000208 -/* 00A10 80911050 AFB80028 */ sw $t8, 0x0028($sp) -/* 00A14 80911054 AFA00024 */ sw $zero, 0x0024($sp) -/* 00A18 80911058 AFA00020 */ sw $zero, 0x0020($sp) -/* 00A1C 8091105C AFAF001C */ sw $t7, 0x001C($sp) +/* 00A10 80911050 AFB80028 */ sw $t8, 0x0028($sp) +/* 00A14 80911054 AFA00024 */ sw $zero, 0x0024($sp) +/* 00A18 80911058 AFA00020 */ sw $zero, 0x0020($sp) +/* 00A1C 8091105C AFAF001C */ sw $t7, 0x001C($sp) /* 00A20 80911060 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00A24 80911064 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 00A28 80911068 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 00A2C 8091106C 0C00C916 */ jal Actor_SpawnAttached - -/* 00A30 80911070 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 00A30 80911070 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00A34 80911074 AE70011C */ sw $s0, 0x011C($s3) ## 0000011C -/* 00A38 80911078 8FB90094 */ lw $t9, 0x0094($sp) +/* 00A38 80911078 8FB90094 */ lw $t9, 0x0094($sp) /* 00A3C 8091107C 9323014C */ lbu $v1, 0x014C($t9) ## 0000014C .L80911080: /* 00A40 80911080 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00A44 80911084 14610005 */ bne $v1, $at, .L8091109C +/* 00A44 80911084 14610005 */ bne $v1, $at, .L8091109C /* 00A48 80911088 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00A4C 8091108C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00A50 80911090 24A5DF80 */ addiu $a1, $a1, 0xDF80 ## $a1 = 0600DF80 -/* 00A54 80911094 0C029490 */ jal func_800A5240 +/* 00A54 80911094 0C029490 */ jal func_800A5240 /* 00A58 80911098 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 .L8091109C: /* 00A5C 8091109C 866201AA */ lh $v0, 0x01AA($s3) ## 000001AA /* 00A60 809110A0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00A64 809110A4 50410006 */ beql $v0, $at, .L809110C0 +/* 00A64 809110A4 50410006 */ beql $v0, $at, .L809110C0 /* 00A68 809110A8 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00A6C 809110AC 10520011 */ beq $v0, $s2, .L809110F4 +/* 00A6C 809110AC 10520011 */ beq $v0, $s2, .L809110F4 /* 00A70 809110B0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00A74 809110B4 1000001C */ beq $zero, $zero, .L80911128 +/* 00A74 809110B4 1000001C */ beq $zero, $zero, .L80911128 /* 00A78 809110B8 86640194 */ lh $a0, 0x0194($s3) ## 00000194 /* 00A7C 809110BC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 .L809110C0: @@ -210,128 +210,128 @@ glabel func_80910DCC /* 00A84 809110C4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00A88 809110C8 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 /* 00A8C 809110CC C66A01E0 */ lwc1 $f10, 0x01E0($s3) ## 000001E0 -/* 00A90 809110D0 46105480 */ add.s $f18, $f10, $f16 +/* 00A90 809110D0 46105480 */ add.s $f18, $f10, $f16 /* 00A94 809110D4 E67201E0 */ swc1 $f18, 0x01E0($s3) ## 000001E0 /* 00A98 809110D8 C66401E0 */ lwc1 $f4, 0x01E0($s3) ## 000001E0 -/* 00A9C 809110DC 4604003E */ c.le.s $f0, $f4 +/* 00A9C 809110DC 4604003E */ c.le.s $f0, $f4 /* 00AA0 809110E0 00000000 */ nop -/* 00AA4 809110E4 45020010 */ bc1fl .L80911128 +/* 00AA4 809110E4 45020010 */ bc1fl .L80911128 /* 00AA8 809110E8 86640194 */ lh $a0, 0x0194($s3) ## 00000194 -/* 00AAC 809110EC 1000000D */ beq $zero, $zero, .L80911124 +/* 00AAC 809110EC 1000000D */ beq $zero, $zero, .L80911124 /* 00AB0 809110F0 E66001E0 */ swc1 $f0, 0x01E0($s3) ## 000001E0 .L809110F4: /* 00AB4 809110F4 44810000 */ mtc1 $at, $f0 ## $f0 = 40.00 /* 00AB8 809110F8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00ABC 809110FC 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 00AC0 80911100 C66601D4 */ lwc1 $f6, 0x01D4($s3) ## 000001D4 -/* 00AC4 80911104 46083280 */ add.s $f10, $f6, $f8 +/* 00AC4 80911104 46083280 */ add.s $f10, $f6, $f8 /* 00AC8 80911108 E66A01D4 */ swc1 $f10, 0x01D4($s3) ## 000001D4 /* 00ACC 8091110C C67001D4 */ lwc1 $f16, 0x01D4($s3) ## 000001D4 -/* 00AD0 80911110 4610003C */ c.lt.s $f0, $f16 +/* 00AD0 80911110 4610003C */ c.lt.s $f0, $f16 /* 00AD4 80911114 00000000 */ nop -/* 00AD8 80911118 45020003 */ bc1fl .L80911128 +/* 00AD8 80911118 45020003 */ bc1fl .L80911128 /* 00ADC 8091111C 86640194 */ lh $a0, 0x0194($s3) ## 00000194 /* 00AE0 80911120 E66001D4 */ swc1 $f0, 0x01D4($s3) ## 000001D4 .L80911124: /* 00AE4 80911124 86640194 */ lh $a0, 0x0194($s3) ## 00000194 .L80911128: -/* 00AE8 80911128 00800821 */ addu $at, $a0, $zero -/* 00AEC 8091112C 000420C0 */ sll $a0, $a0, 3 -/* 00AF0 80911130 00812023 */ subu $a0, $a0, $at -/* 00AF4 80911134 000420C0 */ sll $a0, $a0, 3 -/* 00AF8 80911138 00812023 */ subu $a0, $a0, $at -/* 00AFC 8091113C 00042080 */ sll $a0, $a0, 2 -/* 00B00 80911140 00812021 */ addu $a0, $a0, $at -/* 00B04 80911144 000420C0 */ sll $a0, $a0, 3 -/* 00B08 80911148 00042400 */ sll $a0, $a0, 16 +/* 00AE8 80911128 00800821 */ addu $at, $a0, $zero +/* 00AEC 8091112C 000420C0 */ sll $a0, $a0, 3 +/* 00AF0 80911130 00812023 */ subu $a0, $a0, $at +/* 00AF4 80911134 000420C0 */ sll $a0, $a0, 3 +/* 00AF8 80911138 00812023 */ subu $a0, $a0, $at +/* 00AFC 8091113C 00042080 */ sll $a0, $a0, 2 +/* 00B00 80911140 00812021 */ addu $a0, $a0, $at +/* 00B04 80911144 000420C0 */ sll $a0, $a0, 3 +/* 00B08 80911148 00042400 */ sll $a0, $a0, 16 /* 00B0C 8091114C 0C01DE1C */ jal Math_Sins ## sins? -/* 00B10 80911150 00042403 */ sra $a0, $a0, 16 +/* 00B10 80911150 00042403 */ sra $a0, $a0, 16 /* 00B14 80911154 86640194 */ lh $a0, 0x0194($s3) ## 00000194 /* 00B18 80911158 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00B1C 8091115C 00800821 */ addu $at, $a0, $zero -/* 00B20 80911160 000420C0 */ sll $a0, $a0, 3 -/* 00B24 80911164 00812021 */ addu $a0, $a0, $at -/* 00B28 80911168 46120102 */ mul.s $f4, $f0, $f18 -/* 00B2C 8091116C 000420C0 */ sll $a0, $a0, 3 -/* 00B30 80911170 00812023 */ subu $a0, $a0, $at -/* 00B34 80911174 000420C0 */ sll $a0, $a0, 3 -/* 00B38 80911178 00812023 */ subu $a0, $a0, $at -/* 00B3C 8091117C 00042080 */ sll $a0, $a0, 2 -/* 00B40 80911180 00042400 */ sll $a0, $a0, 16 +/* 00B1C 8091115C 00800821 */ addu $at, $a0, $zero +/* 00B20 80911160 000420C0 */ sll $a0, $a0, 3 +/* 00B24 80911164 00812021 */ addu $a0, $a0, $at +/* 00B28 80911168 46120102 */ mul.s $f4, $f0, $f18 +/* 00B2C 8091116C 000420C0 */ sll $a0, $a0, 3 +/* 00B30 80911170 00812023 */ subu $a0, $a0, $at +/* 00B34 80911174 000420C0 */ sll $a0, $a0, 3 +/* 00B38 80911178 00812023 */ subu $a0, $a0, $at +/* 00B3C 8091117C 00042080 */ sll $a0, $a0, 2 +/* 00B40 80911180 00042400 */ sll $a0, $a0, 16 /* 00B44 80911184 E66403D4 */ swc1 $f4, 0x03D4($s3) ## 000003D4 /* 00B48 80911188 0C01DE0D */ jal Math_Coss ## coss? -/* 00B4C 8091118C 00042403 */ sra $a0, $a0, 16 +/* 00B4C 8091118C 00042403 */ sra $a0, $a0, 16 /* 00B50 80911190 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 00B54 80911194 44813000 */ mtc1 $at, $f6 ## $f6 = 300.00 /* 00B58 80911198 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00B5C 8091119C 4481A000 */ mtc1 $at, $f20 ## $f20 = 100.00 -/* 00B60 809111A0 46060202 */ mul.s $f8, $f0, $f6 +/* 00B60 809111A0 46060202 */ mul.s $f8, $f0, $f6 /* 00B64 809111A4 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 00B68 809111A8 E66803D8 */ swc1 $f8, 0x03D8($s3) ## 000003D8 .L809111AC: -/* 00B6C 809111AC 00109080 */ sll $s2, $s0, 2 -/* 00B70 809111B0 02509023 */ subu $s2, $s2, $s0 -/* 00B74 809111B4 001290C0 */ sll $s2, $s2, 3 +/* 00B6C 809111AC 00109080 */ sll $s2, $s0, 2 +/* 00B70 809111B0 02509023 */ subu $s2, $s2, $s0 +/* 00B74 809111B4 001290C0 */ sll $s2, $s2, 3 /* 00B78 809111B8 86680194 */ lh $t0, 0x0194($s3) ## 00000194 -/* 00B7C 809111BC 02509021 */ addu $s2, $s2, $s0 -/* 00B80 809111C0 00129040 */ sll $s2, $s2, 1 +/* 00B7C 809111BC 02509021 */ addu $s2, $s2, $s0 +/* 00B80 809111C0 00129040 */ sll $s2, $s2, 1 /* 00B84 809111C4 264907B0 */ addiu $t1, $s2, 0x07B0 ## $t1 = 000007B2 -/* 00B88 809111C8 01090019 */ multu $t0, $t1 -/* 00B8C 809111CC 00002012 */ mflo $a0 -/* 00B90 809111D0 00042400 */ sll $a0, $a0, 16 +/* 00B88 809111C8 01090019 */ multu $t0, $t1 +/* 00B8C 809111CC 00002012 */ mflo $a0 +/* 00B90 809111D0 00042400 */ sll $a0, $a0, 16 /* 00B94 809111D4 0C01DE1C */ jal Math_Sins ## sins? -/* 00B98 809111D8 00042403 */ sra $a0, $a0, 16 -/* 00B9C 809111DC 46140282 */ mul.s $f10, $f0, $f20 -/* 00BA0 809111E0 00105080 */ sll $t2, $s0, 2 -/* 00BA4 809111E4 026A8821 */ addu $s1, $s3, $t2 +/* 00B98 809111D8 00042403 */ sra $a0, $a0, 16 +/* 00B9C 809111DC 46140282 */ mul.s $f10, $f0, $f20 +/* 00BA0 809111E0 00105080 */ sll $t2, $s0, 2 +/* 00BA4 809111E4 026A8821 */ addu $s1, $s3, $t2 /* 00BA8 809111E8 264C08DC */ addiu $t4, $s2, 0x08DC ## $t4 = 000008DE /* 00BAC 809111EC E62A0454 */ swc1 $f10, 0x0454($s1) ## 000005A0 /* 00BB0 809111F0 866B0194 */ lh $t3, 0x0194($s3) ## 00000194 -/* 00BB4 809111F4 016C0019 */ multu $t3, $t4 -/* 00BB8 809111F8 00002012 */ mflo $a0 -/* 00BBC 809111FC 00042400 */ sll $a0, $a0, 16 +/* 00BB4 809111F4 016C0019 */ multu $t3, $t4 +/* 00BB8 809111F8 00002012 */ mflo $a0 +/* 00BBC 809111FC 00042400 */ sll $a0, $a0, 16 /* 00BC0 80911200 0C01DE0D */ jal Math_Coss ## coss? -/* 00BC4 80911204 00042403 */ sra $a0, $a0, 16 -/* 00BC8 80911208 46140402 */ mul.s $f16, $f0, $f20 +/* 00BC4 80911204 00042403 */ sra $a0, $a0, 16 +/* 00BC8 80911208 46140402 */ mul.s $f16, $f0, $f20 /* 00BCC 8091120C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 00BD0 80911210 00108400 */ sll $s0, $s0, 16 -/* 00BD4 80911214 00108403 */ sra $s0, $s0, 16 -/* 00BD8 80911218 2A01001E */ slti $at, $s0, 0x001E -/* 00BDC 8091121C 1420FFE3 */ bne $at, $zero, .L809111AC +/* 00BD0 80911210 00108400 */ sll $s0, $s0, 16 +/* 00BD4 80911214 00108403 */ sra $s0, $s0, 16 +/* 00BD8 80911218 2A01001E */ slti $at, $s0, 0x001E +/* 00BDC 8091121C 1420FFE3 */ bne $at, $zero, .L809111AC /* 00BE0 80911220 E63003DC */ swc1 $f16, 0x03DC($s1) ## 00000528 -/* 00BE4 80911224 8FAD0094 */ lw $t5, 0x0094($sp) +/* 00BE4 80911224 8FAD0094 */ lw $t5, 0x0094($sp) /* 00BE8 80911228 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 00BEC 8091122C 91AE014C */ lbu $t6, 0x014C($t5) ## 0000014C -/* 00BF0 80911230 55C1000E */ bnel $t6, $at, .L8091126C -/* 00BF4 80911234 8FB80094 */ lw $t8, 0x0094($sp) -/* 00BF8 80911238 0C2444A5 */ jal func_80911294 +/* 00BF0 80911230 55C1000E */ bnel $t6, $at, .L8091126C +/* 00BF4 80911234 8FB80094 */ lw $t8, 0x0094($sp) +/* 00BF8 80911238 0C2444A5 */ jal func_80911294 /* 00BFC 8091123C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00C00 80911240 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L80911244: -/* 00C04 80911244 00107880 */ sll $t7, $s0, 2 +/* 00C04 80911244 00107880 */ sll $t7, $s0, 2 /* 00C08 80911248 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 00C0C 8091124C 00108400 */ sll $s0, $s0, 16 -/* 00C10 80911250 00108403 */ sra $s0, $s0, 16 -/* 00C14 80911254 2A01001E */ slti $at, $s0, 0x001E -/* 00C18 80911258 026F8821 */ addu $s1, $s3, $t7 +/* 00C0C 8091124C 00108400 */ sll $s0, $s0, 16 +/* 00C10 80911250 00108403 */ sra $s0, $s0, 16 +/* 00C14 80911254 2A01001E */ slti $at, $s0, 0x001E +/* 00C18 80911258 026F8821 */ addu $s1, $s3, $t7 /* 00C1C 8091125C E63603DC */ swc1 $f22, 0x03DC($s1) ## 00000528 -/* 00C20 80911260 1420FFF8 */ bne $at, $zero, .L80911244 +/* 00C20 80911260 1420FFF8 */ bne $at, $zero, .L80911244 /* 00C24 80911264 E6360454 */ swc1 $f22, 0x0454($s1) ## 000005A0 -/* 00C28 80911268 8FB80094 */ lw $t8, 0x0094($sp) +/* 00C28 80911268 8FB80094 */ lw $t8, 0x0094($sp) .L8091126C: /* 00C2C 8091126C A300014C */ sb $zero, 0x014C($t8) ## 0000014C -/* 00C30 80911270 8FBF0054 */ lw $ra, 0x0054($sp) -/* 00C34 80911274 8FB30050 */ lw $s3, 0x0050($sp) -/* 00C38 80911278 8FB2004C */ lw $s2, 0x004C($sp) -/* 00C3C 8091127C 8FB10048 */ lw $s1, 0x0048($sp) -/* 00C40 80911280 8FB00044 */ lw $s0, 0x0044($sp) -/* 00C44 80911284 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 00C48 80911288 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 00C4C 8091128C 03E00008 */ jr $ra +/* 00C30 80911270 8FBF0054 */ lw $ra, 0x0054($sp) +/* 00C34 80911274 8FB30050 */ lw $s3, 0x0050($sp) +/* 00C38 80911278 8FB2004C */ lw $s2, 0x004C($sp) +/* 00C3C 8091127C 8FB10048 */ lw $s1, 0x0048($sp) +/* 00C40 80911280 8FB00044 */ lw $s0, 0x0044($sp) +/* 00C44 80911284 D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 00C48 80911288 D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 00C4C 8091128C 03E00008 */ jr $ra /* 00C50 80911290 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s index a6bbb2bd60..33009dae73 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s @@ -1,19 +1,19 @@ glabel func_80911294 /* 00C54 80911294 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C58 80911298 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C5C 8091129C AFA40018 */ sw $a0, 0x0018($sp) +/* 00C58 80911298 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00C5C 8091129C AFA40018 */ sw $a0, 0x0018($sp) /* 00C60 809112A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00C64 809112A4 24A53CA4 */ addiu $a1, $a1, 0x3CA4 ## $a1 = 06003CA4 /* 00C68 809112A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00C6C 809112AC 0C0294D3 */ jal func_800A534C +/* 00C6C 809112AC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00C70 809112B0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00C74 809112B4 8FAF0018 */ lw $t7, 0x0018($sp) +/* 00C74 809112B4 8FAF0018 */ lw $t7, 0x0018($sp) /* 00C78 809112B8 3C0E8091 */ lui $t6, %hi(func_809112D4) ## $t6 = 80910000 /* 00C7C 809112BC 25CE12D4 */ addiu $t6, $t6, %lo(func_809112D4) ## $t6 = 809112D4 /* 00C80 809112C0 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 00C84 809112C4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00C84 809112C4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00C88 809112C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C8C 809112CC 03E00008 */ jr $ra +/* 00C8C 809112CC 03E00008 */ jr $ra /* 00C90 809112D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s index 3e5da44255..c764b0360e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s @@ -1,95 +1,95 @@ glabel func_809112D4 /* 00C94 809112D4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00C98 809112D8 AFB00034 */ sw $s0, 0x0034($sp) -/* 00C9C 809112DC AFBF003C */ sw $ra, 0x003C($sp) -/* 00CA0 809112E0 AFB10038 */ sw $s1, 0x0038($sp) -/* 00CA4 809112E4 AFA50054 */ sw $a1, 0x0054($sp) +/* 00C98 809112D8 AFB00034 */ sw $s0, 0x0034($sp) +/* 00C9C 809112DC AFBF003C */ sw $ra, 0x003C($sp) +/* 00CA0 809112E0 AFB10038 */ sw $s1, 0x0038($sp) +/* 00CA4 809112E4 AFA50054 */ sw $a1, 0x0054($sp) /* 00CA8 809112E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00CAC 809112EC 8C91011C */ lw $s1, 0x011C($a0) ## 0000011C /* 00CB0 809112F0 3C048091 */ lui $a0, %hi(D_80915188) ## $a0 = 80910000 /* 00CB4 809112F4 0C00084C */ jal osSyncPrintf - + /* 00CB8 809112F8 24845188 */ addiu $a0, $a0, %lo(D_80915188) ## $a0 = 80915188 /* 00CBC 809112FC 2607014C */ addiu $a3, $s0, 0x014C ## $a3 = 0000014C /* 00CC0 80911300 00E02025 */ or $a0, $a3, $zero ## $a0 = 0000014C /* 00CC4 80911304 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00CC8 80911308 AFA70040 */ sw $a3, 0x0040($sp) + +/* 00CC8 80911308 AFA70040 */ sw $a3, 0x0040($sp) /* 00CCC 8091130C 3C048091 */ lui $a0, %hi(D_80915190) ## $a0 = 80910000 /* 00CD0 80911310 0C00084C */ jal osSyncPrintf - + /* 00CD4 80911314 24845190 */ addiu $a0, $a0, %lo(D_80915190) ## $a0 = 80915190 /* 00CD8 80911318 9222014C */ lbu $v0, 0x014C($s1) ## 0000014C -/* 00CDC 8091131C 8FA70040 */ lw $a3, 0x0040($sp) +/* 00CDC 8091131C 8FA70040 */ lw $a3, 0x0040($sp) /* 00CE0 80911320 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00CE4 80911324 1441001E */ bne $v0, $at, .L809113A0 +/* 00CE4 80911324 1441001E */ bne $v0, $at, .L809113A0 /* 00CE8 80911328 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00CEC 8091132C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00CF0 80911330 24A5D99C */ addiu $a1, $a1, 0xD99C ## $a1 = 0600D99C -/* 00CF4 80911334 0C029490 */ jal func_800A5240 +/* 00CF4 80911334 0C029490 */ jal func_800A5240 /* 00CF8 80911338 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 00CFC 8091133C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00D00 80911340 8E18011C */ lw $t8, 0x011C($s0) ## 0000011C -/* 00D04 80911344 8FA60054 */ lw $a2, 0x0054($sp) +/* 00D04 80911344 8FA60054 */ lw $a2, 0x0054($sp) /* 00D08 80911348 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 00D0C 8091134C AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00D10 80911350 AFB80048 */ sw $t8, 0x0048($sp) +/* 00D10 80911350 AFB80048 */ sw $t8, 0x0048($sp) /* 00D14 80911354 C6040200 */ lwc1 $f4, 0x0200($s0) ## 00000200 /* 00D18 80911358 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 00D1C 8091135C 24080026 */ addiu $t0, $zero, 0x0026 ## $t0 = 00000026 -/* 00D20 80911360 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00D20 80911360 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00D24 80911364 C6060204 */ lwc1 $f6, 0x0204($s0) ## 00000204 /* 00D28 80911368 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00D2C 8091136C 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D -/* 00D30 80911370 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00D30 80911370 E7A60014 */ swc1 $f6, 0x0014($sp) /* 00D34 80911374 C6080208 */ lwc1 $f8, 0x0208($s0) ## 00000208 -/* 00D38 80911378 AFA80028 */ sw $t0, 0x0028($sp) -/* 00D3C 8091137C AFA00024 */ sw $zero, 0x0024($sp) -/* 00D40 80911380 AFA00020 */ sw $zero, 0x0020($sp) -/* 00D44 80911384 AFB9001C */ sw $t9, 0x001C($sp) +/* 00D38 80911378 AFA80028 */ sw $t0, 0x0028($sp) +/* 00D3C 8091137C AFA00024 */ sw $zero, 0x0024($sp) +/* 00D40 80911380 AFA00020 */ sw $zero, 0x0020($sp) +/* 00D44 80911384 AFB9001C */ sw $t9, 0x001C($sp) /* 00D48 80911388 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 00D4C 8091138C 0C00C916 */ jal Actor_SpawnAttached - -/* 00D50 80911390 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00D54 80911394 8FA90048 */ lw $t1, 0x0048($sp) -/* 00D58 80911398 1000001E */ beq $zero, $zero, .L80911414 + +/* 00D50 80911390 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00D54 80911394 8FA90048 */ lw $t1, 0x0048($sp) +/* 00D58 80911398 1000001E */ beq $zero, $zero, .L80911414 /* 00D5C 8091139C AE09011C */ sw $t1, 0x011C($s0) ## 0000011C .L809113A0: /* 00D60 809113A0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00D64 809113A4 14410007 */ bne $v0, $at, .L809113C4 +/* 00D64 809113A4 14410007 */ bne $v0, $at, .L809113C4 /* 00D68 809113A8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00D6C 809113AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00D70 809113B0 24A53080 */ addiu $a1, $a1, 0x3080 ## $a1 = 06003080 -/* 00D74 809113B4 0C029490 */ jal func_800A5240 +/* 00D74 809113B4 0C029490 */ jal func_800A5240 /* 00D78 809113B8 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 00D7C 809113BC 10000015 */ beq $zero, $zero, .L80911414 +/* 00D7C 809113BC 10000015 */ beq $zero, $zero, .L80911414 /* 00D80 809113C0 00000000 */ nop .L809113C4: /* 00D84 809113C4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00D88 809113C8 14410007 */ bne $v0, $at, .L809113E8 +/* 00D88 809113C8 14410007 */ bne $v0, $at, .L809113E8 /* 00D8C 809113CC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00D90 809113D0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00D94 809113D4 24A5DF80 */ addiu $a1, $a1, 0xDF80 ## $a1 = 0600DF80 -/* 00D98 809113D8 0C029490 */ jal func_800A5240 +/* 00D98 809113D8 0C029490 */ jal func_800A5240 /* 00D9C 809113DC 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 00DA0 809113E0 1000000C */ beq $zero, $zero, .L80911414 +/* 00DA0 809113E0 1000000C */ beq $zero, $zero, .L80911414 /* 00DA4 809113E4 00000000 */ nop .L809113E8: /* 00DA8 809113E8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00DAC 809113EC 14410009 */ bne $v0, $at, .L80911414 +/* 00DAC 809113EC 14410009 */ bne $v0, $at, .L80911414 /* 00DB0 809113F0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00DB4 809113F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DB8 809113F8 24A53CA4 */ addiu $a1, $a1, 0x3CA4 ## $a1 = 06003CA4 -/* 00DBC 809113FC 0C0294D3 */ jal func_800A534C +/* 00DBC 809113FC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00DC0 80911400 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 00DC4 80911404 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 00DC8 80911408 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00DCC 8091140C 01415824 */ and $t3, $t2, $at +/* 00DCC 8091140C 01415824 */ and $t3, $t2, $at /* 00DD0 80911410 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 .L80911414: /* 00DD4 80911414 3C048091 */ lui $a0, %hi(D_80915198) ## $a0 = 80910000 /* 00DD8 80911418 0C00084C */ jal osSyncPrintf - + /* 00DDC 8091141C 24845198 */ addiu $a0, $a0, %lo(D_80915198) ## $a0 = 80915198 /* 00DE0 80911420 8E2D0024 */ lw $t5, 0x0024($s1) ## 00000024 /* 00DE4 80911424 920E01C9 */ lbu $t6, 0x01C9($s0) ## 000001C9 @@ -104,9 +104,9 @@ glabel func_809112D4 /* 00E08 80911448 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 00E0C 8091144C 86220032 */ lh $v0, 0x0032($s1) ## 00000032 /* 00E10 80911450 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 00E14 80911454 11C00011 */ beq $t6, $zero, .L8091149C +/* 00E14 80911454 11C00011 */ beq $t6, $zero, .L8091149C /* 00E18 80911458 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00E1C 8091145C 0C24453A */ jal func_809114E8 +/* 00E1C 8091145C 0C24453A */ jal func_809114E8 /* 00E20 80911460 3C05C1A0 */ lui $a1, 0xC1A0 ## $a1 = C1A00000 /* 00E24 80911464 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 /* 00E28 80911468 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 @@ -118,32 +118,32 @@ glabel func_809112D4 /* 00E40 80911480 A6080524 */ sh $t0, 0x0524($s0) ## 00000524 /* 00E44 80911484 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E48 80911488 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00E4C 8091148C 240538B0 */ addiu $a1, $zero, 0x38B0 ## $a1 = 000038B0 /* 00E50 80911490 2409001A */ addiu $t1, $zero, 0x001A ## $t1 = 0000001A -/* 00E54 80911494 1000000F */ beq $zero, $zero, .L809114D4 +/* 00E54 80911494 1000000F */ beq $zero, $zero, .L809114D4 /* 00E58 80911498 A2090117 */ sb $t1, 0x0117($s0) ## 00000117 .L8091149C: -/* 00E5C 8091149C C4205418 */ lwc1 $f0, %lo(D_80915418)($at) +/* 00E5C 8091149C C4205418 */ lwc1 $f0, %lo(D_80915418)($at) /* 00E60 809114A0 C6300050 */ lwc1 $f16, 0x0050($s1) ## 00000050 /* 00E64 809114A4 A220014C */ sb $zero, 0x014C($s1) ## 0000014C /* 00E68 809114A8 3C048091 */ lui $a0, %hi(D_809151A0) ## $a0 = 80910000 -/* 00E6C 809114AC 46008483 */ div.s $f18, $f16, $f0 +/* 00E6C 809114AC 46008483 */ div.s $f18, $f16, $f0 /* 00E70 809114B0 248451A0 */ addiu $a0, $a0, %lo(D_809151A0) ## $a0 = 809151A0 /* 00E74 809114B4 E6120050 */ swc1 $f18, 0x0050($s0) ## 00000050 /* 00E78 809114B8 C6240054 */ lwc1 $f4, 0x0054($s1) ## 00000054 -/* 00E7C 809114BC 46002183 */ div.s $f6, $f4, $f0 +/* 00E7C 809114BC 46002183 */ div.s $f6, $f4, $f0 /* 00E80 809114C0 E6060054 */ swc1 $f6, 0x0054($s0) ## 00000054 /* 00E84 809114C4 C6280058 */ lwc1 $f8, 0x0058($s1) ## 00000058 -/* 00E88 809114C8 46004283 */ div.s $f10, $f8, $f0 +/* 00E88 809114C8 46004283 */ div.s $f10, $f8, $f0 /* 00E8C 809114CC 0C00084C */ jal osSyncPrintf - + /* 00E90 809114D0 E60A0058 */ swc1 $f10, 0x0058($s0) ## 00000058 .L809114D4: -/* 00E94 809114D4 8FBF003C */ lw $ra, 0x003C($sp) -/* 00E98 809114D8 8FB00034 */ lw $s0, 0x0034($sp) -/* 00E9C 809114DC 8FB10038 */ lw $s1, 0x0038($sp) -/* 00EA0 809114E0 03E00008 */ jr $ra +/* 00E94 809114D4 8FBF003C */ lw $ra, 0x003C($sp) +/* 00E98 809114D8 8FB00034 */ lw $s0, 0x0034($sp) +/* 00E9C 809114DC 8FB10038 */ lw $s1, 0x0038($sp) +/* 00EA0 809114E0 03E00008 */ jr $ra /* 00EA4 809114E4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s index d7f2c6ae50..b84a63cf04 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s @@ -1,15 +1,15 @@ glabel func_809114E8 /* 00EA8 809114E8 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 /* 00EAC 809114EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00EB0 809114F0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00EB0 809114F0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00EB4 809114F4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00EB8 809114F8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00EBC 809114FC 44066000 */ mfc1 $a2, $f12 +/* 00EBC 809114FC 44066000 */ mfc1 $a2, $f12 /* 00EC0 80911500 24A50060 */ addiu $a1, $a1, 0x0060 ## $a1 = 06010060 -/* 00EC4 80911504 AFA70018 */ sw $a3, 0x0018($sp) -/* 00EC8 80911508 0C0294D3 */ jal func_800A534C +/* 00EC4 80911504 AFA70018 */ sw $a3, 0x0018($sp) +/* 00EC8 80911508 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00ECC 8091150C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00ED0 80911510 8FA70018 */ lw $a3, 0x0018($sp) +/* 00ED0 80911510 8FA70018 */ lw $a3, 0x0018($sp) /* 00ED4 80911514 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00ED8 80911518 3C0E8091 */ lui $t6, %hi(func_8091156C) ## $t6 = 80910000 /* 00EDC 8091151C 8CEF0004 */ lw $t7, 0x0004($a3) ## 00000004 @@ -22,16 +22,16 @@ glabel func_809114E8 /* 00EF4 80911534 E4E401CC */ swc1 $f4, 0x01CC($a3) ## 000001CC /* 00EF8 80911538 3C014280 */ lui $at, 0x4280 ## $at = 42800000 /* 00EFC 8091153C 44813000 */ mtc1 $at, $f6 ## $f6 = 64.00 -/* 00F00 80911540 8FA70018 */ lw $a3, 0x0018($sp) -/* 00F04 80911544 46060202 */ mul.s $f8, $f0, $f6 -/* 00F08 80911548 4600428D */ trunc.w.s $f10, $f8 -/* 00F0C 8091154C 440A5000 */ mfc1 $t2, $f10 +/* 00F00 80911540 8FA70018 */ lw $a3, 0x0018($sp) +/* 00F04 80911544 46060202 */ mul.s $f8, $f0, $f6 +/* 00F08 80911548 4600428D */ trunc.w.s $f10, $f8 +/* 00F0C 8091154C 440A5000 */ mfc1 $t2, $f10 /* 00F10 80911550 00000000 */ nop /* 00F14 80911554 254B001E */ addiu $t3, $t2, 0x001E ## $t3 = 0000001E /* 00F18 80911558 A4EB01BC */ sh $t3, 0x01BC($a3) ## 000001BC -/* 00F1C 8091155C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00F1C 8091155C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00F20 80911560 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F24 80911564 03E00008 */ jr $ra +/* 00F24 80911564 03E00008 */ jr $ra /* 00F28 80911568 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s index 374f17d6d0..e87a5bb9bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s @@ -2,55 +2,55 @@ glabel func_809121E0 /* 01BA0 809121E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01BA4 809121E4 3C0E8091 */ lui $t6, %hi(func_809122A4) ## $t6 = 80910000 /* 01BA8 809121E8 25CE22A4 */ addiu $t6, $t6, %lo(func_809122A4) ## $t6 = 809122A4 -/* 01BAC 809121EC AFBF001C */ sw $ra, 0x001C($sp) -/* 01BB0 809121F0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01BB4 809121F4 AFA5002C */ sw $a1, 0x002C($sp) -/* 01BB8 809121F8 AFAE0024 */ sw $t6, 0x0024($sp) +/* 01BAC 809121EC AFBF001C */ sw $ra, 0x001C($sp) +/* 01BB0 809121F0 AFB00018 */ sw $s0, 0x0018($sp) +/* 01BB4 809121F4 AFA5002C */ sw $a1, 0x002C($sp) +/* 01BB8 809121F8 AFAE0024 */ sw $t6, 0x0024($sp) /* 01BBC 809121FC 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 /* 01BC0 80912200 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01BC4 80912204 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01BC8 80912208 11CF0011 */ beq $t6, $t7, .L80912250 +/* 01BC8 80912208 11CF0011 */ beq $t6, $t7, .L80912250 /* 01BCC 8091220C 00000000 */ nop /* 01BD0 80912210 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01BD4 80912214 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01BD8 80912218 248408D8 */ addiu $a0, $a0, 0x08D8 ## $a0 = 060108D8 /* 01BDC 8091221C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01BE0 80912220 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01BE4 80912224 24A508D8 */ addiu $a1, $a1, 0x08D8 ## $a1 = 060108D8 -/* 01BE8 80912228 468021A0 */ cvt.s.w $f6, $f4 +/* 01BE8 80912228 468021A0 */ cvt.s.w $f6, $f4 /* 01BEC 8091222C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01BF0 80912230 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01BF4 80912234 0C0294D3 */ jal func_800A534C +/* 01BF4 80912234 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01BF8 80912238 E60601D0 */ swc1 $f6, 0x01D0($s0) ## 000001D0 /* 01BFC 8091223C 24180032 */ addiu $t8, $zero, 0x0032 ## $t8 = 00000032 /* 01C00 80912240 2419003C */ addiu $t9, $zero, 0x003C ## $t9 = 0000003C /* 01C04 80912244 A61801BC */ sh $t8, 0x01BC($s0) ## 000001BC -/* 01C08 80912248 1000000B */ beq $zero, $zero, .L80912278 +/* 01C08 80912248 1000000B */ beq $zero, $zero, .L80912278 /* 01C0C 8091224C A21901C8 */ sb $t9, 0x01C8($s0) ## 000001C8 .L80912250: /* 01C10 80912250 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01C14 80912254 2484FAC8 */ addiu $a0, $a0, 0xFAC8 ## $a0 = FFFFFAC8 /* 01C18 80912258 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01C1C 8091225C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01C20 80912260 24A5FAC8 */ addiu $a1, $a1, 0xFAC8 ## $a1 = 0600FAC8 -/* 01C24 80912264 468042A0 */ cvt.s.w $f10, $f8 +/* 01C24 80912264 468042A0 */ cvt.s.w $f10, $f8 /* 01C28 80912268 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01C2C 8091226C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01C30 80912270 0C0294D3 */ jal func_800A534C +/* 01C30 80912270 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01C34 80912274 E60A01D0 */ swc1 $f10, 0x01D0($s0) ## 000001D0 .L80912278: /* 01C38 80912278 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01C3C 8091227C 8FA80024 */ lw $t0, 0x0024($sp) +/* 01C3C 8091227C 8FA80024 */ lw $t0, 0x0024($sp) /* 01C40 80912280 A60001A2 */ sh $zero, 0x01A2($s0) ## 000001A2 /* 01C44 80912284 E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C /* 01C48 80912288 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 /* 01C4C 8091228C E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 -/* 01C50 80912290 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C54 80912294 8FB00018 */ lw $s0, 0x0018($sp) +/* 01C50 80912290 8FBF001C */ lw $ra, 0x001C($sp) +/* 01C54 80912294 8FB00018 */ lw $s0, 0x0018($sp) /* 01C58 80912298 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01C5C 8091229C 03E00008 */ jr $ra +/* 01C5C 8091229C 03E00008 */ jr $ra /* 01C60 809122A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s index 3b6dcb9947..6891c65dd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s @@ -1,42 +1,42 @@ glabel func_809122A4 /* 01C64 809122A4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01C68 809122A8 AFB00018 */ sw $s0, 0x0018($sp) +/* 01C68 809122A8 AFB00018 */ sw $s0, 0x0018($sp) /* 01C6C 809122AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C70 809122B0 AFBF001C */ sw $ra, 0x001C($sp) +/* 01C70 809122B0 AFBF001C */ sw $ra, 0x001C($sp) /* 01C74 809122B4 3C048091 */ lui $a0, %hi(D_80915268) ## $a0 = 80910000 -/* 01C78 809122B8 AFA5002C */ sw $a1, 0x002C($sp) +/* 01C78 809122B8 AFA5002C */ sw $a1, 0x002C($sp) /* 01C7C 809122BC 0C00084C */ jal osSyncPrintf - + /* 01C80 809122C0 24845268 */ addiu $a0, $a0, %lo(D_80915268) ## $a0 = 80915268 /* 01C84 809122C4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01C88 809122C8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01C8C 809122CC AFA40024 */ sw $a0, 0x0024($sp) + +/* 01C8C 809122CC AFA40024 */ sw $a0, 0x0024($sp) /* 01C90 809122D0 3C018091 */ lui $at, %hi(D_80915440) ## $at = 80910000 -/* 01C94 809122D4 C4245440 */ lwc1 $f4, %lo(D_80915440)($at) +/* 01C94 809122D4 C4245440 */ lwc1 $f4, %lo(D_80915440)($at) /* 01C98 809122D8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01C9C 809122DC 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 /* 01CA0 809122E0 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 01CA4 809122E4 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 01CA8 809122E8 4606403E */ c.le.s $f8, $f6 +/* 01CA8 809122E8 4606403E */ c.le.s $f8, $f6 /* 01CAC 809122EC 00000000 */ nop -/* 01CB0 809122F0 4500001E */ bc1f .L8091236C +/* 01CB0 809122F0 4500001E */ bc1f .L8091236C /* 01CB4 809122F4 00000000 */ nop /* 01CB8 809122F8 860E01A2 */ lh $t6, 0x01A2($s0) ## 000001A2 /* 01CBC 809122FC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01CC0 80912300 55C0000E */ bnel $t6, $zero, .L8091233C +/* 01CC0 80912300 55C0000E */ bnel $t6, $zero, .L8091233C /* 01CC4 80912304 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01CC8 80912308 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01CCC 8091230C 24841BCC */ addiu $a0, $a0, 0x1BCC ## $a0 = 06011BCC /* 01CD0 80912310 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01CD4 80912314 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01CD8 80912318 24A51BCC */ addiu $a1, $a1, 0x1BCC ## $a1 = 06011BCC -/* 01CDC 8091231C 46805420 */ cvt.s.w $f16, $f10 +/* 01CDC 8091231C 46805420 */ cvt.s.w $f16, $f10 /* 01CE0 80912320 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 01CE4 80912324 E61001D0 */ swc1 $f16, 0x01D0($s0) ## 000001D0 -/* 01CE8 80912328 0C0294D3 */ jal func_800A534C -/* 01CEC 8091232C 8FA40024 */ lw $a0, 0x0024($sp) +/* 01CE8 80912328 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01CEC 8091232C 8FA40024 */ lw $a0, 0x0024($sp) /* 01CF0 80912330 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 01CF4 80912334 A60F01A2 */ sh $t7, 0x01A2($s0) ## 000001A2 /* 01CF8 80912338 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -44,12 +44,12 @@ glabel func_809122A4 /* 01CFC 8091233C 8E0501D0 */ lw $a1, 0x01D0($s0) ## 000001D0 /* 01D00 80912340 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 01D04 80912344 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 01D08 80912348 0C0295B2 */ jal func_800A56C8 -/* 01D0C 8091234C 8FA40024 */ lw $a0, 0x0024($sp) -/* 01D10 80912350 10400003 */ beq $v0, $zero, .L80912360 +/* 01D08 80912348 0C0295B2 */ jal func_800A56C8 +/* 01D0C 8091234C 8FA40024 */ lw $a0, 0x0024($sp) +/* 01D10 80912350 10400003 */ beq $v0, $zero, .L80912360 /* 01D14 80912354 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D18 80912358 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01D1C 8091235C 240538B1 */ addiu $a1, $zero, 0x38B1 ## $a1 = 000038B1 .L80912360: /* 01D20 80912360 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 @@ -59,13 +59,13 @@ glabel func_809122A4 /* 01D2C 8091236C 3C048091 */ lui $a0, %hi(D_80915294) ## $a0 = 80910000 /* 01D30 80912370 24845294 */ addiu $a0, $a0, %lo(D_80915294) ## $a0 = 80915294 /* 01D34 80912374 0C00084C */ jal osSyncPrintf - + /* 01D38 80912378 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC /* 01D3C 8091237C 860801BC */ lh $t0, 0x01BC($s0) ## 000001BC /* 01D40 80912380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D44 80912384 1500000C */ bne $t0, $zero, .L809123B8 +/* 01D44 80912384 1500000C */ bne $t0, $zero, .L809123B8 /* 01D48 80912388 00000000 */ nop -/* 01D4C 8091238C 0C24453A */ jal func_809114E8 +/* 01D4C 8091238C 0C24453A */ jal func_809114E8 /* 01D50 80912390 3C05C0A0 */ lui $a1, 0xC0A0 ## $a1 = C0A00000 /* 01D54 80912394 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 01D58 80912398 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -78,12 +78,12 @@ glabel func_809122A4 /* 01D74 809123B4 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C .L809123B8: /* 01D78 809123B8 0C00B638 */ jal Actor_MoveForward - + /* 01D7C 809123BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D80 809123C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01D84 809123C4 8FB00018 */ lw $s0, 0x0018($sp) +/* 01D80 809123C0 8FBF001C */ lw $ra, 0x001C($sp) +/* 01D84 809123C4 8FB00018 */ lw $s0, 0x0018($sp) /* 01D88 809123C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D8C 809123CC 03E00008 */ jr $ra +/* 01D8C 809123CC 03E00008 */ jr $ra /* 01D90 809123D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s index 6923e600ae..f51842f2b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s @@ -1,34 +1,34 @@ glabel func_809123D4 /* 01D94 809123D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01D98 809123D8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01D9C 809123DC AFBF0014 */ sw $ra, 0x0014($sp) +/* 01D9C 809123DC AFBF0014 */ sw $ra, 0x0014($sp) /* 01DA0 809123E0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01DA4 809123E4 AFA5001C */ sw $a1, 0x001C($sp) +/* 01DA4 809123E4 AFA5001C */ sw $a1, 0x001C($sp) /* 01DA8 809123E8 24840344 */ addiu $a0, $a0, 0x0344 ## $a0 = 06010344 /* 01DAC 809123EC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01DB0 809123F0 AFA70018 */ sw $a3, 0x0018($sp) + +/* 01DB0 809123F0 AFA70018 */ sw $a3, 0x0018($sp) /* 01DB4 809123F4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01DB8 809123F8 8FA70018 */ lw $a3, 0x0018($sp) +/* 01DB8 809123F8 8FA70018 */ lw $a3, 0x0018($sp) /* 01DBC 809123FC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01DC0 80912400 468021A0 */ cvt.s.w $f6, $f4 +/* 01DC0 80912400 468021A0 */ cvt.s.w $f6, $f4 /* 01DC4 80912404 24A50344 */ addiu $a1, $a1, 0x0344 ## $a1 = 06010344 /* 01DC8 80912408 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 01DCC 8091240C 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 01DD0 80912410 0C0294D3 */ jal func_800A534C +/* 01DD0 80912410 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01DD4 80912414 E4E601D0 */ swc1 $f6, 0x01D0($a3) ## 000001D0 -/* 01DD8 80912418 8FA40018 */ lw $a0, 0x0018($sp) +/* 01DD8 80912418 8FA40018 */ lw $a0, 0x0018($sp) /* 01DDC 8091241C 3C0E8091 */ lui $t6, %hi(func_80912448) ## $t6 = 80910000 /* 01DE0 80912420 25CE2448 */ addiu $t6, $t6, %lo(func_80912448) ## $t6 = 80912448 /* 01DE4 80912424 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 01DE8 80912428 240538AA */ addiu $a1, $zero, 0x38AA ## $a1 = 000038AA /* 01DEC 8091242C AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 /* 01DF0 80912430 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01DF4 80912434 A48F01BC */ sh $t7, 0x01BC($a0) ## 000001BC -/* 01DF8 80912438 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01DF8 80912438 8FBF0014 */ lw $ra, 0x0014($sp) /* 01DFC 8091243C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E00 80912440 03E00008 */ jr $ra +/* 01E00 80912440 03E00008 */ jr $ra /* 01E04 80912444 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s index 8611500f68..b820280bad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s @@ -1,32 +1,32 @@ glabel func_80912524 /* 01EE4 80912524 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01EE8 80912528 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01EEC 8091252C AFBF0014 */ sw $ra, 0x0014($sp) +/* 01EEC 8091252C AFBF0014 */ sw $ra, 0x0014($sp) /* 01EF0 80912530 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01EF4 80912534 AFA5001C */ sw $a1, 0x001C($sp) +/* 01EF4 80912534 AFA5001C */ sw $a1, 0x001C($sp) /* 01EF8 80912538 248429E0 */ addiu $a0, $a0, 0x29E0 ## $a0 = 060129E0 /* 01EFC 8091253C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01F00 80912540 AFA70018 */ sw $a3, 0x0018($sp) + +/* 01F00 80912540 AFA70018 */ sw $a3, 0x0018($sp) /* 01F04 80912544 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01F08 80912548 8FA70018 */ lw $a3, 0x0018($sp) +/* 01F08 80912548 8FA70018 */ lw $a3, 0x0018($sp) /* 01F0C 8091254C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01F10 80912550 468021A0 */ cvt.s.w $f6, $f4 +/* 01F10 80912550 468021A0 */ cvt.s.w $f6, $f4 /* 01F14 80912554 24A529E0 */ addiu $a1, $a1, 0x29E0 ## $a1 = 060129E0 /* 01F18 80912558 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 01F1C 8091255C 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 01F20 80912560 0C0294D3 */ jal func_800A534C +/* 01F20 80912560 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01F24 80912564 E4E601D0 */ swc1 $f6, 0x01D0($a3) ## 000001D0 -/* 01F28 80912568 8FA70018 */ lw $a3, 0x0018($sp) +/* 01F28 80912568 8FA70018 */ lw $a3, 0x0018($sp) /* 01F2C 8091256C 3C0E8091 */ lui $t6, %hi(func_80912594) ## $t6 = 80910000 /* 01F30 80912570 25CE2594 */ addiu $t6, $t6, %lo(func_80912594) ## $t6 = 80912594 /* 01F34 80912574 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 01F38 80912578 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 01F3C 8091257C A4EF01BC */ sh $t7, 0x01BC($a3) ## 000001BC /* 01F40 80912580 A4E001A2 */ sh $zero, 0x01A2($a3) ## 000001A2 -/* 01F44 80912584 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01F44 80912584 8FBF0014 */ lw $ra, 0x0014($sp) /* 01F48 80912588 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01F4C 8091258C 03E00008 */ jr $ra +/* 01F4C 8091258C 03E00008 */ jr $ra /* 01F50 80912590 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s index b91180630f..9fcad929d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s @@ -1,58 +1,58 @@ glabel func_80912594 /* 01F54 80912594 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 -/* 01F58 80912598 AFB10060 */ sw $s1, 0x0060($sp) -/* 01F5C 8091259C AFBF0064 */ sw $ra, 0x0064($sp) -/* 01F60 809125A0 AFB0005C */ sw $s0, 0x005C($sp) -/* 01F64 809125A4 F7BC0050 */ sdc1 $f28, 0x0050($sp) -/* 01F68 809125A8 F7BA0048 */ sdc1 $f26, 0x0048($sp) -/* 01F6C 809125AC F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 01F70 809125B0 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 01F74 809125B4 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 01F58 80912598 AFB10060 */ sw $s1, 0x0060($sp) +/* 01F5C 8091259C AFBF0064 */ sw $ra, 0x0064($sp) +/* 01F60 809125A0 AFB0005C */ sw $s0, 0x005C($sp) +/* 01F64 809125A4 F7BC0050 */ sdc1 $f28, 0x0050($sp) +/* 01F68 809125A8 F7BA0048 */ sdc1 $f26, 0x0048($sp) +/* 01F6C 809125AC F7B80040 */ sdc1 $f24, 0x0040($sp) +/* 01F70 809125B0 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 01F74 809125B4 F7B40030 */ sdc1 $f20, 0x0030($sp) /* 01F78 809125B8 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 01F7C 809125BC 44819000 */ mtc1 $at, $f18 ## $f18 = 14.00 -/* 01F80 809125C0 AFA500E4 */ sw $a1, 0x00E4($sp) +/* 01F80 809125C0 AFA500E4 */ sw $a1, 0x00E4($sp) /* 01F84 809125C4 C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 /* 01F88 809125C8 C48E002C */ lwc1 $f14, 0x002C($a0) ## 0000002C /* 01F8C 809125CC 3C018091 */ lui $at, %hi(D_80915444) ## $at = 80910000 -/* 01F90 809125D0 C42C5444 */ lwc1 $f12, %lo(D_80915444)($at) -/* 01F94 809125D4 46128501 */ sub.s $f20, $f16, $f18 +/* 01F90 809125D0 C42C5444 */ lwc1 $f12, %lo(D_80915444)($at) +/* 01F94 809125D4 46128501 */ sub.s $f20, $f16, $f18 /* 01F98 809125D8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 01F9C 809125DC 8CB01C44 */ lw $s0, 0x1C44($a1) ## 00001C44 -/* 01FA0 809125E0 460C7581 */ sub.s $f22, $f14, $f12 +/* 01FA0 809125E0 460C7581 */ sub.s $f22, $f14, $f12 /* 01FA4 809125E4 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 /* 01FA8 809125E8 A08F04F4 */ sb $t7, 0x04F4($a0) ## 000004F4 /* 01FAC 809125EC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01FB0 809125F0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01FB4 809125F4 AFA40070 */ sw $a0, 0x0070($sp) + +/* 01FB4 809125F4 AFA40070 */ sw $a0, 0x0070($sp) /* 01FB8 809125F8 862301A2 */ lh $v1, 0x01A2($s1) ## 000001A2 -/* 01FBC 809125FC 1060000A */ beq $v1, $zero, .L80912628 +/* 01FBC 809125FC 1060000A */ beq $v1, $zero, .L80912628 /* 01FC0 80912600 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01FC4 80912604 10610043 */ beq $v1, $at, .L80912714 -/* 01FC8 80912608 8FA40070 */ lw $a0, 0x0070($sp) +/* 01FC4 80912604 10610043 */ beq $v1, $at, .L80912714 +/* 01FC8 80912608 8FA40070 */ lw $a0, 0x0070($sp) /* 01FCC 8091260C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01FD0 80912610 10610051 */ beq $v1, $at, .L80912758 +/* 01FD0 80912610 10610051 */ beq $v1, $at, .L80912758 /* 01FD4 80912614 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01FD8 80912618 10610094 */ beq $v1, $at, .L8091286C +/* 01FD8 80912618 10610094 */ beq $v1, $at, .L8091286C /* 01FDC 8091261C 00000000 */ nop -/* 01FE0 80912620 100000E7 */ beq $zero, $zero, .L809129C0 +/* 01FE0 80912620 100000E7 */ beq $zero, $zero, .L809129C0 /* 01FE4 80912624 C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 .L80912628: /* 01FE8 80912628 862201BC */ lh $v0, 0x01BC($s1) ## 000001BC /* 01FEC 8091262C 240100DA */ addiu $at, $zero, 0x00DA ## $at = 000000DA /* 01FF0 80912630 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01FF4 80912634 54410005 */ bnel $v0, $at, .L8091264C +/* 01FF4 80912634 54410005 */ bnel $v0, $at, .L8091264C /* 01FF8 80912638 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 /* 01FFC 8091263C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02000 80912640 240538AA */ addiu $a1, $zero, 0x38AA ## $a1 = 000038AA /* 02004 80912644 862201BC */ lh $v0, 0x01BC($s1) ## 000001BC /* 02008 80912648 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 .L8091264C: -/* 0200C 8091264C 14410003 */ bne $v0, $at, .L8091265C +/* 0200C 8091264C 14410003 */ bne $v0, $at, .L8091265C /* 02010 80912650 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02014 80912654 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02018 80912658 240538A9 */ addiu $a1, $zero, 0x38A9 ## $a1 = 000038A9 .L8091265C: /* 0201C 8091265C C6320024 */ lwc1 $f18, 0x0024($s1) ## 00000024 @@ -62,25 +62,25 @@ glabel func_80912594 /* 0202C 8091266C C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C /* 02030 80912670 C62A0064 */ lwc1 $f10, 0x0064($s1) ## 00000064 /* 02034 80912674 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 02038 80912678 46049180 */ add.s $f6, $f18, $f4 +/* 02038 80912678 46049180 */ add.s $f6, $f18, $f4 /* 0203C 8091267C 4481D000 */ mtc1 $at, $f26 ## $f26 = 0.50 -/* 02040 80912680 4405C000 */ mfc1 $a1, $f24 -/* 02044 80912684 460A4480 */ add.s $f18, $f8, $f10 -/* 02048 80912688 4406D000 */ mfc1 $a2, $f26 +/* 02040 80912680 4405C000 */ mfc1 $a1, $f24 +/* 02044 80912684 460A4480 */ add.s $f18, $f8, $f10 +/* 02048 80912688 4406D000 */ mfc1 $a2, $f26 /* 0204C 8091268C E6260024 */ swc1 $f6, 0x0024($s1) ## 00000024 /* 02050 80912690 2624005C */ addiu $a0, $s1, 0x005C ## $a0 = 0000005C /* 02054 80912694 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 02058 80912698 E632002C */ swc1 $f18, 0x002C($s1) ## 0000002C -/* 0205C 8091269C 4405C000 */ mfc1 $a1, $f24 -/* 02060 809126A0 4406D000 */ mfc1 $a2, $f26 +/* 0205C 8091269C 4405C000 */ mfc1 $a1, $f24 +/* 02060 809126A0 4406D000 */ mfc1 $a2, $f26 /* 02064 809126A4 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 02068 809126A8 26240064 */ addiu $a0, $s1, 0x0064 ## $a0 = 00000064 /* 0206C 809126AC 863801BC */ lh $t8, 0x01BC($s1) ## 000001BC /* 02070 809126B0 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 02074 809126B4 26101F44 */ addiu $s0, $s0, 0x1F44 ## $s0 = 06011F44 -/* 02078 809126B8 1700000F */ bne $t8, $zero, .L809126F8 +/* 02078 809126B8 1700000F */ bne $t8, $zero, .L809126F8 /* 0207C 809126BC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 02080 809126C0 4480C000 */ mtc1 $zero, $f24 ## $f24 = 0.00 /* 02084 809126C4 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A @@ -88,163 +88,163 @@ glabel func_80912594 /* 0208C 809126CC A62801BC */ sh $t0, 0x01BC($s1) ## 000001BC /* 02090 809126D0 02002025 */ or $a0, $s0, $zero ## $a0 = 06011F44 /* 02094 809126D4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02098 809126D8 E6380068 */ swc1 $f24, 0x0068($s1) ## 00000068 /* 0209C 809126DC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 020A0 809126E0 4406C000 */ mfc1 $a2, $f24 +/* 020A0 809126E0 4406C000 */ mfc1 $a2, $f24 /* 020A4 809126E4 02002825 */ or $a1, $s0, $zero ## $a1 = 06011F44 -/* 020A8 809126E8 468021A0 */ cvt.s.w $f6, $f4 +/* 020A8 809126E8 468021A0 */ cvt.s.w $f6, $f4 /* 020AC 809126EC E62601D0 */ swc1 $f6, 0x01D0($s1) ## 000001D0 -/* 020B0 809126F0 0C029490 */ jal func_800A5240 -/* 020B4 809126F4 8FA40070 */ lw $a0, 0x0070($sp) +/* 020B0 809126F0 0C029490 */ jal func_800A5240 +/* 020B4 809126F4 8FA40070 */ lw $a0, 0x0070($sp) .L809126F8: /* 020B8 809126F8 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 /* 020BC 809126FC 8625008A */ lh $a1, 0x008A($s1) ## 0000008A /* 020C0 80912700 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 020C4 80912704 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 020C8 80912708 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 020CC 8091270C 100000AC */ beq $zero, $zero, .L809129C0 +/* 020CC 8091270C 100000AC */ beq $zero, $zero, .L809129C0 /* 020D0 80912710 C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 .L80912714: -/* 020D4 80912714 0C0295B2 */ jal func_800A56C8 +/* 020D4 80912714 0C0295B2 */ jal func_800A56C8 /* 020D8 80912718 8E2501D0 */ lw $a1, 0x01D0($s1) ## 000001D0 -/* 020DC 8091271C 1040000E */ beq $v0, $zero, .L80912758 +/* 020DC 8091271C 1040000E */ beq $v0, $zero, .L80912758 /* 020E0 80912720 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 020E4 80912724 0C028800 */ jal SkelAnime_GetFrameCount - + /* 020E8 80912728 2484267C */ addiu $a0, $a0, 0x267C ## $a0 = 0601267C /* 020EC 8091272C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 020F0 80912730 4480C000 */ mtc1 $zero, $f24 ## $f24 = 0.00 /* 020F4 80912734 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 020F8 80912738 468042A0 */ cvt.s.w $f10, $f8 -/* 020FC 8091273C 4406C000 */ mfc1 $a2, $f24 +/* 020F8 80912738 468042A0 */ cvt.s.w $f10, $f8 +/* 020FC 8091273C 4406C000 */ mfc1 $a2, $f24 /* 02100 80912740 24A5267C */ addiu $a1, $a1, 0x267C ## $a1 = 0601267C /* 02104 80912744 E62A01D0 */ swc1 $f10, 0x01D0($s1) ## 000001D0 -/* 02108 80912748 0C0294D3 */ jal func_800A534C -/* 0210C 8091274C 8FA40070 */ lw $a0, 0x0070($sp) +/* 02108 80912748 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0210C 8091274C 8FA40070 */ lw $a0, 0x0070($sp) /* 02110 80912750 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 02114 80912754 A62901A2 */ sh $t1, 0x01A2($s1) ## 000001A2 .L80912758: /* 02118 80912758 862A01BC */ lh $t2, 0x01BC($s1) ## 000001BC /* 0211C 8091275C 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 /* 02120 80912760 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 02124 80912764 1140001D */ beq $t2, $zero, .L809127DC +/* 02124 80912764 1140001D */ beq $t2, $zero, .L809127DC /* 02128 80912768 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 0212C 8091276C 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 02130 80912770 8625008A */ lh $a1, 0x008A($s1) ## 0000008A /* 02134 80912774 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 02138 80912778 C6120024 */ lwc1 $f18, 0x0024($s0) ## 06011F68 /* 0213C 8091277C C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 /* 02140 80912780 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 /* 02144 80912784 C6060028 */ lwc1 $f6, 0x0028($s0) ## 06011F6C -/* 02148 80912788 46049081 */ sub.s $f2, $f18, $f4 +/* 02148 80912788 46049081 */ sub.s $f2, $f18, $f4 /* 0214C 8091278C C604002C */ lwc1 $f4, 0x002C($s0) ## 06011F70 /* 02150 80912790 C6320028 */ lwc1 $f18, 0x0028($s1) ## 00000028 -/* 02154 80912794 46083280 */ add.s $f10, $f6, $f8 +/* 02154 80912794 46083280 */ add.s $f10, $f6, $f8 /* 02158 80912798 C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 0215C 8091279C 46021202 */ mul.s $f8, $f2, $f2 +/* 0215C 8091279C 46021202 */ mul.s $f8, $f2, $f2 /* 02160 809127A0 862B00B6 */ lh $t3, 0x00B6($s1) ## 000000B6 -/* 02164 809127A4 46062401 */ sub.s $f16, $f4, $f6 +/* 02164 809127A4 46062401 */ sub.s $f16, $f4, $f6 /* 02168 809127A8 A62B0032 */ sh $t3, 0x0032($s1) ## 00000032 -/* 0216C 809127AC 46125301 */ sub.s $f12, $f10, $f18 -/* 02170 809127B0 46108282 */ mul.s $f10, $f16, $f16 -/* 02174 809127B4 460A4000 */ add.s $f0, $f8, $f10 -/* 02178 809127B8 0C03F494 */ jal Math_atan2f -/* 0217C 809127BC 46000384 */ sqrt.s $f14, $f0 +/* 0216C 809127AC 46125301 */ sub.s $f12, $f10, $f18 +/* 02170 809127B0 46108282 */ mul.s $f10, $f16, $f16 +/* 02174 809127B4 460A4000 */ add.s $f0, $f8, $f10 +/* 02178 809127B8 0C03F494 */ jal Math_atan2f +/* 0217C 809127BC 46000384 */ sqrt.s $f14, $f0 /* 02180 809127C0 3C018091 */ lui $at, %hi(D_80915448) ## $at = 80910000 -/* 02184 809127C4 C4325448 */ lwc1 $f18, %lo(D_80915448)($at) -/* 02188 809127C8 46120102 */ mul.s $f4, $f0, $f18 -/* 0218C 809127CC 4600218D */ trunc.w.s $f6, $f4 -/* 02190 809127D0 440D3000 */ mfc1 $t5, $f6 +/* 02184 809127C4 C4325448 */ lwc1 $f18, %lo(D_80915448)($at) +/* 02188 809127C8 46120102 */ mul.s $f4, $f0, $f18 +/* 0218C 809127CC 4600218D */ trunc.w.s $f6, $f4 +/* 02190 809127D0 440D3000 */ mfc1 $t5, $f6 /* 02194 809127D4 00000000 */ nop /* 02198 809127D8 A62D0030 */ sh $t5, 0x0030($s1) ## 00000030 .L809127DC: -/* 0219C 809127DC 0C00B642 */ jal func_8002D908 +/* 0219C 809127DC 0C00B642 */ jal func_8002D908 /* 021A0 809127E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 021A4 809127E4 0C00B5FB */ jal func_8002D7EC +/* 021A4 809127E4 0C00B5FB */ jal func_8002D7EC /* 021A8 809127E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 021AC 809127EC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 021B0 809127F0 4481C000 */ mtc1 $at, $f24 ## $f24 = 1.00 /* 021B4 809127F4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 021B8 809127F8 4481D000 */ mtc1 $at, $f26 ## $f26 = 0.50 -/* 021BC 809127FC 4406C000 */ mfc1 $a2, $f24 +/* 021BC 809127FC 4406C000 */ mfc1 $a2, $f24 /* 021C0 80912800 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 -/* 021C4 80912804 4407D000 */ mfc1 $a3, $f26 +/* 021C4 80912804 4407D000 */ mfc1 $a3, $f26 /* 021C8 80912808 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 021CC 8091280C 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 021D0 80912810 4614A202 */ mul.s $f8, $f20, $f20 +/* 021D0 80912810 4614A202 */ mul.s $f8, $f20, $f20 /* 021D4 80912814 3C01438C */ lui $at, 0x438C ## $at = 438C0000 /* 021D8 80912818 44819000 */ mtc1 $at, $f18 ## $f18 = 280.00 -/* 021DC 8091281C 4616B282 */ mul.s $f10, $f22, $f22 +/* 021DC 8091281C 4616B282 */ mul.s $f10, $f22, $f22 /* 021E0 80912820 3C018091 */ lui $at, %hi(D_8091544C) ## $at = 80910000 /* 021E4 80912824 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 021E8 80912828 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 021EC 8091282C 460A4000 */ add.s $f0, $f8, $f10 -/* 021F0 80912830 46000004 */ sqrt.s $f0, $f0 -/* 021F4 80912834 4600903C */ c.lt.s $f18, $f0 +/* 021EC 8091282C 460A4000 */ add.s $f0, $f8, $f10 +/* 021F0 80912830 46000004 */ sqrt.s $f0, $f0 +/* 021F4 80912834 4600903C */ c.lt.s $f18, $f0 /* 021F8 80912838 00000000 */ nop -/* 021FC 8091283C 45030008 */ bc1tl .L80912860 +/* 021FC 8091283C 45030008 */ bc1tl .L80912860 /* 02200 80912840 A62E01A2 */ sh $t6, 0x01A2($s1) ## 000001A2 /* 02204 80912844 C624008C */ lwc1 $f4, 0x008C($s1) ## 0000008C -/* 02208 80912848 C426544C */ lwc1 $f6, %lo(D_8091544C)($at) -/* 0220C 8091284C 4606203C */ c.lt.s $f4, $f6 +/* 02208 80912848 C426544C */ lwc1 $f6, %lo(D_8091544C)($at) +/* 0220C 8091284C 4606203C */ c.lt.s $f4, $f6 /* 02210 80912850 00000000 */ nop -/* 02214 80912854 45000003 */ bc1f .L80912864 +/* 02214 80912854 45000003 */ bc1f .L80912864 /* 02218 80912858 00000000 */ nop /* 0221C 8091285C A62E01A2 */ sh $t6, 0x01A2($s1) ## 000001A2 .L80912860: /* 02220 80912860 A62F01BC */ sh $t7, 0x01BC($s1) ## 000001BC .L80912864: -/* 02224 80912864 10000056 */ beq $zero, $zero, .L809129C0 +/* 02224 80912864 10000056 */ beq $zero, $zero, .L809129C0 /* 02228 80912868 C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 .L8091286C: /* 0222C 8091286C 3C018091 */ lui $at, %hi(D_80915450) ## $at = 80910000 -/* 02230 80912870 C4285450 */ lwc1 $f8, %lo(D_80915450)($at) +/* 02230 80912870 C4285450 */ lwc1 $f8, %lo(D_80915450)($at) /* 02234 80912874 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02238 80912878 0C00B638 */ jal Actor_MoveForward - + /* 0223C 8091287C E628006C */ swc1 $f8, 0x006C($s1) ## 0000006C /* 02240 80912880 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 /* 02244 80912884 3C048091 */ lui $a0, %hi(D_809152CC) ## $a0 = 80910000 /* 02248 80912888 248452CC */ addiu $a0, $a0, %lo(D_809152CC) ## $a0 = 809152CC -/* 0224C 8091288C 460054A1 */ cvt.d.s $f18, $f10 -/* 02250 80912890 44079000 */ mfc1 $a3, $f18 -/* 02254 80912894 44069800 */ mfc1 $a2, $f19 +/* 0224C 8091288C 460054A1 */ cvt.d.s $f18, $f10 +/* 02250 80912890 44079000 */ mfc1 $a3, $f18 +/* 02254 80912894 44069800 */ mfc1 $a2, $f19 /* 02258 80912898 0C00084C */ jal osSyncPrintf - + /* 0225C 8091289C 00000000 */ nop /* 02260 809128A0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02264 809128A4 44810000 */ mtc1 $at, $f0 ## $f0 = 5.00 /* 02268 809128A8 C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 -/* 0226C 809128AC 4614A182 */ mul.s $f6, $f20, $f20 -/* 02270 809128B0 4600203C */ c.lt.s $f4, $f0 -/* 02274 809128B4 4616B202 */ mul.s $f8, $f22, $f22 -/* 02278 809128B8 45020005 */ bc1fl .L809128D0 -/* 0227C 809128BC 46083000 */ add.s $f0, $f6, $f8 +/* 0226C 809128AC 4614A182 */ mul.s $f6, $f20, $f20 +/* 02270 809128B0 4600203C */ c.lt.s $f4, $f0 +/* 02274 809128B4 4616B202 */ mul.s $f8, $f22, $f22 +/* 02278 809128B8 45020005 */ bc1fl .L809128D0 +/* 0227C 809128BC 46083000 */ add.s $f0, $f6, $f8 /* 02280 809128C0 4480C000 */ mtc1 $zero, $f24 ## $f24 = 0.00 /* 02284 809128C4 E6200028 */ swc1 $f0, 0x0028($s1) ## 00000028 /* 02288 809128C8 E6380060 */ swc1 $f24, 0x0060($s1) ## 00000060 -/* 0228C 809128CC 46083000 */ add.s $f0, $f6, $f8 +/* 0228C 809128CC 46083000 */ add.s $f0, $f6, $f8 .L809128D0: /* 02290 809128D0 3C01438C */ lui $at, 0x438C ## $at = 438C0000 /* 02294 809128D4 44815000 */ mtc1 $at, $f10 ## $f10 = 280.00 /* 02298 809128D8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0229C 809128DC 46000004 */ sqrt.s $f0, $f0 -/* 022A0 809128E0 4600503C */ c.lt.s $f10, $f0 +/* 0229C 809128DC 46000004 */ sqrt.s $f0, $f0 +/* 022A0 809128E0 4600503C */ c.lt.s $f10, $f0 /* 022A4 809128E4 00000000 */ nop -/* 022A8 809128E8 4502000B */ bc1fl .L80912918 +/* 022A8 809128E8 4502000B */ bc1fl .L80912918 /* 022AC 809128EC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 022B0 809128F0 4481A000 */ mtc1 $at, $f20 ## $f20 = 2.00 /* 022B4 809128F4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 022B8 809128F8 4481C000 */ mtc1 $at, $f24 ## $f24 = 1.00 -/* 022BC 809128FC 4406A000 */ mfc1 $a2, $f20 +/* 022BC 809128FC 4406A000 */ mfc1 $a2, $f20 /* 022C0 80912900 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 -/* 022C4 80912904 4405C000 */ mfc1 $a1, $f24 +/* 022C4 80912904 4405C000 */ mfc1 $a1, $f24 /* 022C8 80912908 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 022CC 8091290C 00000000 */ nop /* 022D0 80912910 A62001BC */ sh $zero, 0x01BC($s1) ## 000001BC /* 022D4 80912914 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -253,41 +253,41 @@ glabel func_80912594 /* 022DC 8091291C 4481A000 */ mtc1 $at, $f20 ## $f20 = 2.00 /* 022E0 80912920 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 022E4 80912924 4481C000 */ mtc1 $at, $f24 ## $f24 = 1.00 -/* 022E8 80912928 57000025 */ bnel $t8, $zero, .L809129C0 +/* 022E8 80912928 57000025 */ bnel $t8, $zero, .L809129C0 /* 022EC 8091292C C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 -/* 022F0 80912930 4405C000 */ mfc1 $a1, $f24 -/* 022F4 80912934 4406A000 */ mfc1 $a2, $f20 +/* 022F0 80912930 4405C000 */ mfc1 $a1, $f24 +/* 022F4 80912934 4406A000 */ mfc1 $a2, $f20 /* 022F8 80912938 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 022FC 8091293C 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 -/* 02300 80912940 4405C000 */ mfc1 $a1, $f24 -/* 02304 80912944 4406A000 */ mfc1 $a2, $f20 +/* 02300 80912940 4405C000 */ mfc1 $a1, $f24 +/* 02304 80912944 4406A000 */ mfc1 $a2, $f20 /* 02308 80912948 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 0230C 8091294C 26240060 */ addiu $a0, $s1, 0x0060 ## $a0 = 00000060 /* 02310 80912950 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 /* 02314 80912954 8625008A */ lh $a1, 0x008A($s1) ## 0000008A /* 02318 80912958 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 0231C 8091295C 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 02320 80912960 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 02324 80912964 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 02328 80912968 4481D000 */ mtc1 $at, $f26 ## $f26 = 0.50 /* 0232C 8091296C C6320068 */ lwc1 $f18, 0x0068($s1) ## 00000068 -/* 02330 80912970 461A903E */ c.le.s $f18, $f26 +/* 02330 80912970 461A903E */ c.le.s $f18, $f26 /* 02334 80912974 00000000 */ nop -/* 02338 80912978 45020011 */ bc1fl .L809129C0 +/* 02338 80912978 45020011 */ bc1fl .L809129C0 /* 0233C 8091297C C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 /* 02340 80912980 C6200060 */ lwc1 $f0, 0x0060($s1) ## 00000060 /* 02344 80912984 3C018091 */ lui $at, %hi(D_80915454) ## $at = 80910000 -/* 02348 80912988 C4245454 */ lwc1 $f4, %lo(D_80915454)($at) -/* 0234C 8091298C 46000005 */ abs.s $f0, $f0 +/* 02348 80912988 C4245454 */ lwc1 $f4, %lo(D_80915454)($at) +/* 0234C 8091298C 46000005 */ abs.s $f0, $f0 /* 02350 80912990 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02354 80912994 4604003E */ c.le.s $f0, $f4 +/* 02354 80912994 4604003E */ c.le.s $f0, $f4 /* 02358 80912998 00000000 */ nop -/* 0235C 8091299C 45020008 */ bc1fl .L809129C0 +/* 0235C 8091299C 45020008 */ bc1fl .L809129C0 /* 02360 809129A0 C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 -/* 02364 809129A4 0C24453A */ jal func_809114E8 +/* 02364 809129A4 0C24453A */ jal func_809114E8 /* 02368 809129A8 3C05C120 */ lui $a1, 0xC120 ## $a1 = C1200000 /* 0236C 809129AC 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 02370 809129B0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 @@ -298,26 +298,26 @@ glabel func_80912594 /* 02380 809129C0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02384 809129C4 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 /* 02388 809129C8 00000000 */ nop -/* 0238C 809129CC 4600303C */ c.lt.s $f6, $f0 +/* 0238C 809129CC 4600303C */ c.lt.s $f6, $f0 /* 02390 809129D0 00000000 */ nop -/* 02394 809129D4 45000011 */ bc1f .L80912A1C +/* 02394 809129D4 45000011 */ bc1f .L80912A1C /* 02398 809129D8 00000000 */ nop /* 0239C 809129DC 86240194 */ lh $a0, 0x0194($s1) ## 00000194 -/* 023A0 809129E0 00800821 */ addu $at, $a0, $zero -/* 023A4 809129E4 00042080 */ sll $a0, $a0, 2 -/* 023A8 809129E8 00812023 */ subu $a0, $a0, $at -/* 023AC 809129EC 00042100 */ sll $a0, $a0, 4 -/* 023B0 809129F0 00812023 */ subu $a0, $a0, $at -/* 023B4 809129F4 000420C0 */ sll $a0, $a0, 3 -/* 023B8 809129F8 00812023 */ subu $a0, $a0, $at -/* 023BC 809129FC 00042080 */ sll $a0, $a0, 2 -/* 023C0 80912A00 00042400 */ sll $a0, $a0, 16 +/* 023A0 809129E0 00800821 */ addu $at, $a0, $zero +/* 023A4 809129E4 00042080 */ sll $a0, $a0, 2 +/* 023A8 809129E8 00812023 */ subu $a0, $a0, $at +/* 023AC 809129EC 00042100 */ sll $a0, $a0, 4 +/* 023B0 809129F0 00812023 */ subu $a0, $a0, $at +/* 023B4 809129F4 000420C0 */ sll $a0, $a0, 3 +/* 023B8 809129F8 00812023 */ subu $a0, $a0, $at +/* 023BC 809129FC 00042080 */ sll $a0, $a0, 2 +/* 023C0 80912A00 00042400 */ sll $a0, $a0, 16 /* 023C4 80912A04 0C01DE1C */ jal Math_Sins ## sins? -/* 023C8 80912A08 00042403 */ sra $a0, $a0, 16 -/* 023CC 80912A0C 46000280 */ add.s $f10, $f0, $f0 +/* 023C8 80912A08 00042403 */ sra $a0, $a0, 16 +/* 023CC 80912A0C 46000280 */ add.s $f10, $f0, $f0 /* 023D0 80912A10 C6280028 */ lwc1 $f8, 0x0028($s1) ## 00000028 -/* 023D4 80912A14 460A4480 */ add.s $f18, $f8, $f10 +/* 023D4 80912A14 460A4480 */ add.s $f18, $f8, $f10 /* 023D8 80912A18 E6320028 */ swc1 $f18, 0x0028($s1) ## 00000028 .L80912A1C: /* 023DC 80912A1C 3C0A8091 */ lui $t2, %hi(D_809150D8) ## $t2 = 80910000 @@ -354,132 +354,132 @@ glabel func_80912594 /* 02458 80912A98 3C018091 */ lui $at, %hi(D_80915458) ## $at = 80910000 /* 0245C 80912A9C AF2A0008 */ sw $t2, 0x0008($t9) ## FFFFFFB4 /* 02460 80912AA0 AF290004 */ sw $t1, 0x0004($t9) ## FFFFFFB0 -/* 02464 80912AA4 C4385458 */ lwc1 $f24, %lo(D_80915458)($at) +/* 02464 80912AA4 C4385458 */ lwc1 $f24, %lo(D_80915458)($at) /* 02468 80912AA8 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0246C 80912AAC 4481B000 */ mtc1 $at, $f22 ## $f22 = 32768.00 /* 02470 80912AB0 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 02474 80912AB4 4481A000 */ mtc1 $at, $f20 ## $f20 = 1000.00 /* 02478 80912AB8 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 0247C 80912ABC E7A40090 */ swc1 $f4, 0x0090($sp) +/* 0247C 80912ABC E7A40090 */ swc1 $f4, 0x0090($sp) .L80912AC0: -/* 02480 80912AC0 0C034213 */ jal Matrix_Push +/* 02480 80912AC0 0C034213 */ jal Matrix_Push /* 02484 80912AC4 00000000 */ nop /* 02488 80912AC8 862B00B6 */ lh $t3, 0x00B6($s1) ## 000000B6 /* 0248C 80912ACC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02490 80912AD0 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 /* 02494 80912AD4 00000000 */ nop -/* 02498 80912AD8 46803220 */ cvt.s.w $f8, $f6 -/* 0249C 80912ADC 46164283 */ div.s $f10, $f8, $f22 -/* 024A0 80912AE0 46185302 */ mul.s $f12, $f10, $f24 -/* 024A4 80912AE4 0C034348 */ jal Matrix_RotateY +/* 02498 80912AD8 46803220 */ cvt.s.w $f8, $f6 +/* 0249C 80912ADC 46164283 */ div.s $f10, $f8, $f22 +/* 024A0 80912AE0 46185302 */ mul.s $f12, $f10, $f24 +/* 024A4 80912AE4 0C034348 */ jal Matrix_RotateY /* 024A8 80912AE8 00000000 */ nop /* 024AC 80912AEC 862C00B4 */ lh $t4, 0x00B4($s1) ## 000000B4 /* 024B0 80912AF0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 024B4 80912AF4 448C9000 */ mtc1 $t4, $f18 ## $f18 = 0.00 /* 024B8 80912AF8 00000000 */ nop -/* 024BC 80912AFC 46809120 */ cvt.s.w $f4, $f18 -/* 024C0 80912B00 46162183 */ div.s $f6, $f4, $f22 -/* 024C4 80912B04 46183302 */ mul.s $f12, $f6, $f24 -/* 024C8 80912B08 0C0342DC */ jal Matrix_RotateX +/* 024BC 80912AFC 46809120 */ cvt.s.w $f4, $f18 +/* 024C0 80912B00 46162183 */ div.s $f6, $f4, $f22 +/* 024C4 80912B04 46183302 */ mul.s $f12, $f6, $f24 +/* 024C8 80912B08 0C0342DC */ jal Matrix_RotateX /* 024CC 80912B0C 00000000 */ nop /* 024D0 80912B10 862D01AC */ lh $t5, 0x01AC($s1) ## 000001AC /* 024D4 80912B14 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 024D8 80912B18 448D4000 */ mtc1 $t5, $f8 ## $f8 = 0.00 /* 024DC 80912B1C 00000000 */ nop -/* 024E0 80912B20 468042A0 */ cvt.s.w $f10, $f8 -/* 024E4 80912B24 46165483 */ div.s $f18, $f10, $f22 -/* 024E8 80912B28 46189302 */ mul.s $f12, $f18, $f24 -/* 024EC 80912B2C 0C0343B5 */ jal Matrix_RotateZ +/* 024E0 80912B20 468042A0 */ cvt.s.w $f10, $f8 +/* 024E4 80912B24 46165483 */ div.s $f18, $f10, $f22 +/* 024E8 80912B28 46189302 */ mul.s $f12, $f18, $f24 +/* 024EC 80912B2C 0C0343B5 */ jal Matrix_RotateZ /* 024F0 80912B30 00000000 */ nop /* 024F4 80912B34 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFAC -/* 024F8 80912B38 0C0346BD */ jal Matrix_MultVec3f +/* 024F8 80912B38 0C0346BD */ jal Matrix_MultVec3f /* 024FC 80912B3C 27A50080 */ addiu $a1, $sp, 0x0080 ## $a1 = FFFFFFA0 -/* 02500 80912B40 0C034221 */ jal Matrix_Pull +/* 02500 80912B40 0C034221 */ jal Matrix_Pull /* 02504 80912B44 00000000 */ nop /* 02508 80912B48 C6240200 */ lwc1 $f4, 0x0200($s1) ## 00000200 -/* 0250C 80912B4C C7A60080 */ lwc1 $f6, 0x0080($sp) -/* 02510 80912B50 C7B20084 */ lwc1 $f18, 0x0084($sp) +/* 0250C 80912B4C C7A60080 */ lwc1 $f6, 0x0080($sp) +/* 02510 80912B50 C7B20084 */ lwc1 $f18, 0x0084($sp) /* 02514 80912B54 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 02518 80912B58 46062200 */ add.s $f8, $f4, $f6 -/* 0251C 80912B5C 0201001A */ div $zero, $s0, $at -/* 02520 80912B60 E7A800B0 */ swc1 $f8, 0x00B0($sp) +/* 02518 80912B58 46062200 */ add.s $f8, $f4, $f6 +/* 0251C 80912B5C 0201001A */ div $zero, $s0, $at +/* 02520 80912B60 E7A800B0 */ swc1 $f8, 0x00B0($sp) /* 02524 80912B64 C62A0204 */ lwc1 $f10, 0x0204($s1) ## 00000204 -/* 02528 80912B68 00007810 */ mfhi $t7 +/* 02528 80912B68 00007810 */ mfhi $t7 /* 0252C 80912B6C 240E0096 */ addiu $t6, $zero, 0x0096 ## $t6 = 00000096 -/* 02530 80912B70 46125100 */ add.s $f4, $f10, $f18 -/* 02534 80912B74 C7AA0088 */ lwc1 $f10, 0x0088($sp) -/* 02538 80912B78 8FA400E4 */ lw $a0, 0x00E4($sp) +/* 02530 80912B70 46125100 */ add.s $f4, $f10, $f18 +/* 02534 80912B74 C7AA0088 */ lwc1 $f10, 0x0088($sp) +/* 02538 80912B78 8FA400E4 */ lw $a0, 0x00E4($sp) /* 0253C 80912B7C 27A500B0 */ addiu $a1, $sp, 0x00B0 ## $a1 = FFFFFFD0 -/* 02540 80912B80 E7A400B4 */ swc1 $f4, 0x00B4($sp) +/* 02540 80912B80 E7A400B4 */ swc1 $f4, 0x00B4($sp) /* 02544 80912B84 C6280208 */ lwc1 $f8, 0x0208($s1) ## 00000208 -/* 02548 80912B88 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0254C 80912B8C AFAE0010 */ sw $t6, 0x0010($sp) -/* 02550 80912B90 460A4100 */ add.s $f4, $f8, $f10 -/* 02554 80912B94 461A3202 */ mul.s $f8, $f6, $f26 +/* 02548 80912B88 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0254C 80912B8C AFAE0010 */ sw $t6, 0x0010($sp) +/* 02550 80912B90 460A4100 */ add.s $f4, $f8, $f10 +/* 02554 80912B94 461A3202 */ mul.s $f8, $f6, $f26 /* 02558 80912B98 27A600A4 */ addiu $a2, $sp, 0x00A4 ## $a2 = FFFFFFC4 /* 0255C 80912B9C 27A70098 */ addiu $a3, $sp, 0x0098 ## $a3 = FFFFFFB8 -/* 02560 80912BA0 E7A400B8 */ swc1 $f4, 0x00B8($sp) -/* 02564 80912BA4 46144103 */ div.s $f4, $f8, $f20 -/* 02568 80912BA8 461A9202 */ mul.s $f8, $f18, $f26 -/* 0256C 80912BAC E7A400A4 */ swc1 $f4, 0x00A4($sp) -/* 02570 80912BB0 46144103 */ div.s $f4, $f8, $f20 -/* 02574 80912BB4 461A5202 */ mul.s $f8, $f10, $f26 -/* 02578 80912BB8 E7A400A8 */ swc1 $f4, 0x00A8($sp) -/* 0257C 80912BBC 46144103 */ div.s $f4, $f8, $f20 -/* 02580 80912BC0 461C3202 */ mul.s $f8, $f6, $f28 +/* 02560 80912BA0 E7A400B8 */ swc1 $f4, 0x00B8($sp) +/* 02564 80912BA4 46144103 */ div.s $f4, $f8, $f20 +/* 02568 80912BA8 461A9202 */ mul.s $f8, $f18, $f26 +/* 0256C 80912BAC E7A400A4 */ swc1 $f4, 0x00A4($sp) +/* 02570 80912BB0 46144103 */ div.s $f4, $f8, $f20 +/* 02574 80912BB4 461A5202 */ mul.s $f8, $f10, $f26 +/* 02578 80912BB8 E7A400A8 */ swc1 $f4, 0x00A8($sp) +/* 0257C 80912BBC 46144103 */ div.s $f4, $f8, $f20 +/* 02580 80912BC0 461C3202 */ mul.s $f8, $f6, $f28 /* 02584 80912BC4 00000000 */ nop -/* 02588 80912BC8 461C9182 */ mul.s $f6, $f18, $f28 -/* 0258C 80912BCC E7A400AC */ swc1 $f4, 0x00AC($sp) -/* 02590 80912BD0 46144103 */ div.s $f4, $f8, $f20 -/* 02594 80912BD4 46143203 */ div.s $f8, $f6, $f20 -/* 02598 80912BD8 E7A40098 */ swc1 $f4, 0x0098($sp) -/* 0259C 80912BDC 461C5102 */ mul.s $f4, $f10, $f28 -/* 025A0 80912BE0 46142483 */ div.s $f18, $f4, $f20 -/* 025A4 80912BE4 E7A8009C */ swc1 $f8, 0x009C($sp) -/* 025A8 80912BE8 0C00A73C */ jal func_80029CF0 -/* 025AC 80912BEC E7B200A0 */ swc1 $f18, 0x00A0($sp) +/* 02588 80912BC8 461C9182 */ mul.s $f6, $f18, $f28 +/* 0258C 80912BCC E7A400AC */ swc1 $f4, 0x00AC($sp) +/* 02590 80912BD0 46144103 */ div.s $f4, $f8, $f20 +/* 02594 80912BD4 46143203 */ div.s $f8, $f6, $f20 +/* 02598 80912BD8 E7A40098 */ swc1 $f4, 0x0098($sp) +/* 0259C 80912BDC 461C5102 */ mul.s $f4, $f10, $f28 +/* 025A0 80912BE0 46142483 */ div.s $f18, $f4, $f20 +/* 025A4 80912BE4 E7A8009C */ swc1 $f8, 0x009C($sp) +/* 025A8 80912BE8 0C00A73C */ jal func_80029CF0 +/* 025AC 80912BEC E7B200A0 */ swc1 $f18, 0x00A0($sp) /* 025B0 80912BF0 863801AC */ lh $t8, 0x01AC($s1) ## 000001AC /* 025B4 80912BF4 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 025B8 80912BF8 00108400 */ sll $s0, $s0, 16 -/* 025BC 80912BFC 00108403 */ sra $s0, $s0, 16 -/* 025C0 80912C00 2A01000A */ slti $at, $s0, 0x000A +/* 025B8 80912BF8 00108400 */ sll $s0, $s0, 16 +/* 025BC 80912BFC 00108403 */ sra $s0, $s0, 16 +/* 025C0 80912C00 2A01000A */ slti $at, $s0, 0x000A /* 025C4 80912C04 27191A5C */ addiu $t9, $t8, 0x1A5C ## $t9 = 00001A5C -/* 025C8 80912C08 1420FFAD */ bne $at, $zero, .L80912AC0 +/* 025C8 80912C08 1420FFAD */ bne $at, $zero, .L80912AC0 /* 025CC 80912C0C A63901AC */ sh $t9, 0x01AC($s1) ## 000001AC /* 025D0 80912C10 86280194 */ lh $t0, 0x0194($s1) ## 00000194 -/* 025D4 80912C14 8FA600E4 */ lw $a2, 0x00E4($sp) +/* 025D4 80912C14 8FA600E4 */ lw $a2, 0x00E4($sp) /* 025D8 80912C18 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 025DC 80912C1C 31090007 */ andi $t1, $t0, 0x0007 ## $t1 = 00000000 -/* 025E0 80912C20 15200012 */ bne $t1, $zero, .L80912C6C +/* 025E0 80912C20 15200012 */ bne $t1, $zero, .L80912C6C /* 025E4 80912C24 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 025E8 80912C28 C6260200 */ lwc1 $f6, 0x0200($s1) ## 00000200 /* 025EC 80912C2C 8E30011C */ lw $s0, 0x011C($s1) ## 0000011C /* 025F0 80912C30 240B0008 */ addiu $t3, $zero, 0x0008 ## $t3 = 00000008 -/* 025F4 80912C34 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 025F4 80912C34 E7A60010 */ swc1 $f6, 0x0010($sp) /* 025F8 80912C38 C6280204 */ lwc1 $f8, 0x0204($s1) ## 00000204 /* 025FC 80912C3C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 02600 80912C40 240D0026 */ addiu $t5, $zero, 0x0026 ## $t5 = 00000026 -/* 02604 80912C44 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 02604 80912C44 E7A80014 */ swc1 $f8, 0x0014($sp) /* 02608 80912C48 C62A0208 */ lwc1 $f10, 0x0208($s1) ## 00000208 -/* 0260C 80912C4C AFAD0028 */ sw $t5, 0x0028($sp) -/* 02610 80912C50 AFA00024 */ sw $zero, 0x0024($sp) -/* 02614 80912C54 AFAC0020 */ sw $t4, 0x0020($sp) -/* 02618 80912C58 AFAB001C */ sw $t3, 0x001C($sp) +/* 0260C 80912C4C AFAD0028 */ sw $t5, 0x0028($sp) +/* 02610 80912C50 AFA00024 */ sw $zero, 0x0024($sp) +/* 02614 80912C54 AFAC0020 */ sw $t4, 0x0020($sp) +/* 02618 80912C58 AFAB001C */ sw $t3, 0x001C($sp) /* 0261C 80912C5C 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 02620 80912C60 0C00C916 */ jal Actor_SpawnAttached - -/* 02624 80912C64 E7AA0018 */ swc1 $f10, 0x0018($sp) + +/* 02624 80912C64 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 02628 80912C68 AE30011C */ sw $s0, 0x011C($s1) ## 0000011C .L80912C6C: -/* 0262C 80912C6C 8FBF0064 */ lw $ra, 0x0064($sp) -/* 02630 80912C70 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 02634 80912C74 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 02638 80912C78 D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 0263C 80912C7C D7BA0048 */ ldc1 $f26, 0x0048($sp) -/* 02640 80912C80 D7BC0050 */ ldc1 $f28, 0x0050($sp) -/* 02644 80912C84 8FB0005C */ lw $s0, 0x005C($sp) -/* 02648 80912C88 8FB10060 */ lw $s1, 0x0060($sp) -/* 0264C 80912C8C 03E00008 */ jr $ra +/* 0262C 80912C6C 8FBF0064 */ lw $ra, 0x0064($sp) +/* 02630 80912C70 D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 02634 80912C74 D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 02638 80912C78 D7B80040 */ ldc1 $f24, 0x0040($sp) +/* 0263C 80912C7C D7BA0048 */ ldc1 $f26, 0x0048($sp) +/* 02640 80912C80 D7BC0050 */ ldc1 $f28, 0x0050($sp) +/* 02644 80912C84 8FB0005C */ lw $s0, 0x005C($sp) +/* 02648 80912C88 8FB10060 */ lw $s1, 0x0060($sp) +/* 0264C 80912C8C 03E00008 */ jr $ra /* 02650 80912C90 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s index b36cb20224..c38a483bd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s @@ -1,90 +1,90 @@ glabel func_80912D2C /* 026EC 80912D2C 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 026F0 80912D30 AFB40048 */ sw $s4, 0x0048($sp) -/* 026F4 80912D34 AFB20040 */ sw $s2, 0x0040($sp) +/* 026F0 80912D30 AFB40048 */ sw $s4, 0x0048($sp) +/* 026F4 80912D34 AFB20040 */ sw $s2, 0x0040($sp) /* 026F8 80912D38 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 026FC 80912D3C AFBF004C */ sw $ra, 0x004C($sp) -/* 02700 80912D40 AFB30044 */ sw $s3, 0x0044($sp) -/* 02704 80912D44 AFB1003C */ sw $s1, 0x003C($sp) -/* 02708 80912D48 AFB00038 */ sw $s0, 0x0038($sp) -/* 0270C 80912D4C A3A000BF */ sb $zero, 0x00BF($sp) -/* 02710 80912D50 A3A000BE */ sb $zero, 0x00BE($sp) +/* 026FC 80912D3C AFBF004C */ sw $ra, 0x004C($sp) +/* 02700 80912D40 AFB30044 */ sw $s3, 0x0044($sp) +/* 02704 80912D44 AFB1003C */ sw $s1, 0x003C($sp) +/* 02708 80912D48 AFB00038 */ sw $s0, 0x0038($sp) +/* 0270C 80912D4C A3A000BF */ sb $zero, 0x00BF($sp) +/* 02710 80912D50 A3A000BE */ sb $zero, 0x00BE($sp) /* 02714 80912D54 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 /* 02718 80912D58 8CB31C44 */ lw $s3, 0x1C44($a1) ## 00001C44 /* 0271C 80912D5C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02720 80912D60 0C030129 */ jal func_800C04A4 +/* 02720 80912D60 0C030129 */ jal func_800C04A4 /* 02724 80912D64 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02728 80912D68 C6640080 */ lwc1 $f4, 0x0080($s3) ## 00000080 /* 0272C 80912D6C 3C048091 */ lui $a0, %hi(D_809152F8) ## $a0 = 80910000 /* 02730 80912D70 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 02734 80912D74 460021A1 */ cvt.d.s $f6, $f4 +/* 02734 80912D74 460021A1 */ cvt.d.s $f6, $f4 /* 02738 80912D78 248452F8 */ addiu $a0, $a0, %lo(D_809152F8) ## $a0 = 809152F8 -/* 0273C 80912D7C 44073000 */ mfc1 $a3, $f6 -/* 02740 80912D80 44063800 */ mfc1 $a2, $f7 +/* 0273C 80912D7C 44073000 */ mfc1 $a3, $f6 +/* 02740 80912D80 44063800 */ mfc1 $a2, $f7 /* 02744 80912D84 0C00084C */ jal osSyncPrintf - + /* 02748 80912D88 00000000 */ nop /* 0274C 80912D8C 2651014C */ addiu $s1, $s2, 0x014C ## $s1 = 0000014C /* 02750 80912D90 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 02754 80912D94 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 02758 80912D98 864E01B6 */ lh $t6, 0x01B6($s2) ## 000001B6 /* 0275C 80912D9C 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 02760 80912DA0 A64F01B6 */ sh $t7, 0x01B6($s2) ## 000001B6 /* 02764 80912DA4 864301B6 */ lh $v1, 0x01B6($s2) ## 000001B6 -/* 02768 80912DA8 2861003D */ slti $at, $v1, 0x003D -/* 0276C 80912DAC 14200002 */ bne $at, $zero, .L80912DB8 -/* 02770 80912DB0 286101F4 */ slti $at, $v1, 0x01F4 -/* 02774 80912DB4 14200005 */ bne $at, $zero, .L80912DCC +/* 02768 80912DA8 2861003D */ slti $at, $v1, 0x003D +/* 0276C 80912DAC 14200002 */ bne $at, $zero, .L80912DB8 +/* 02770 80912DB0 286101F4 */ slti $at, $v1, 0x01F4 +/* 02774 80912DB4 14200005 */ bne $at, $zero, .L80912DCC .L80912DB8: -/* 02778 80912DB8 286101F6 */ slti $at, $v1, 0x01F6 -/* 0277C 80912DBC 14200006 */ bne $at, $zero, .L80912DD8 -/* 02780 80912DC0 2861026C */ slti $at, $v1, 0x026C -/* 02784 80912DC4 50200005 */ beql $at, $zero, .L80912DDC +/* 02778 80912DB8 286101F6 */ slti $at, $v1, 0x01F6 +/* 0277C 80912DBC 14200006 */ bne $at, $zero, .L80912DD8 +/* 02780 80912DC0 2861026C */ slti $at, $v1, 0x026C +/* 02784 80912DC4 50200005 */ beql $at, $zero, .L80912DDC /* 02788 80912DC8 8658035E */ lh $t8, 0x035E($s2) ## 0000035E .L80912DCC: /* 0278C 80912DCC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 02790 80912DD0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02794 80912DD4 2405301C */ addiu $a1, $zero, 0x301C ## $a1 = 0000301C .L80912DD8: /* 02798 80912DD8 8658035E */ lh $t8, 0x035E($s2) ## 0000035E .L80912DDC: /* 0279C 80912DDC 2719FFFF */ addiu $t9, $t8, 0xFFFF ## $t9 = FFFFFFFF -/* 027A0 80912DE0 2F210006 */ sltiu $at, $t9, 0x0006 -/* 027A4 80912DE4 1020023D */ beq $at, $zero, .L809136DC -/* 027A8 80912DE8 0019C880 */ sll $t9, $t9, 2 +/* 027A0 80912DE0 2F210006 */ sltiu $at, $t9, 0x0006 +/* 027A4 80912DE4 1020023D */ beq $at, $zero, .L809136DC +/* 027A8 80912DE8 0019C880 */ sll $t9, $t9, 2 /* 027AC 80912DEC 3C018091 */ lui $at, %hi(jtbl_8091545C) ## $at = 80910000 -/* 027B0 80912DF0 00390821 */ addu $at, $at, $t9 -/* 027B4 80912DF4 8C39545C */ lw $t9, %lo(jtbl_8091545C)($at) -/* 027B8 80912DF8 03200008 */ jr $t9 +/* 027B0 80912DF0 00390821 */ addu $at, $at, $t9 +/* 027B4 80912DF4 8C39545C */ lw $t9, %lo(jtbl_8091545C)($at) +/* 027B8 80912DF8 03200008 */ jr $t9 /* 027BC 80912DFC 00000000 */ nop glabel L80912E00 /* 027C0 80912E00 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 027C4 80912E04 0C019148 */ jal func_80064520 +/* 027C4 80912E04 0C019148 */ jal func_80064520 /* 027C8 80912E08 26851D64 */ addiu $a1, $s4, 0x1D64 ## $a1 = 00001D64 /* 027CC 80912E0C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 027D0 80912E10 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 027D4 80912E14 0C00B7D5 */ jal func_8002DF54 +/* 027D4 80912E14 0C00B7D5 */ jal func_8002DF54 /* 027D8 80912E18 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 027DC 80912E1C 0C03008C */ jal func_800C0230 +/* 027DC 80912E1C 0C03008C */ jal func_800C0230 /* 027E0 80912E20 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 027E4 80912E24 A642035C */ sh $v0, 0x035C($s2) ## 0000035C /* 027E8 80912E28 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 027EC 80912E2C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 027F0 80912E30 0C0300C5 */ jal func_800C0314 +/* 027F0 80912E30 0C0300C5 */ jal func_800C0314 /* 027F4 80912E34 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 027F8 80912E38 3C048091 */ lui $a0, %hi(D_80915300) ## $a0 = 80910000 /* 027FC 80912E3C 0C00084C */ jal osSyncPrintf - + /* 02800 80912E40 24845300 */ addiu $a0, $a0, %lo(D_80915300) ## $a0 = 80915300 /* 02804 80912E44 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 02808 80912E48 8645035C */ lh $a1, 0x035C($s2) ## 0000035C -/* 0280C 80912E4C 0C0300C5 */ jal func_800C0314 +/* 0280C 80912E4C 0C0300C5 */ jal func_800C0314 /* 02810 80912E50 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02814 80912E54 3C048091 */ lui $a0, %hi(D_80915304) ## $a0 = 80910000 /* 02818 80912E58 0C00084C */ jal osSyncPrintf - + /* 0281C 80912E5C 24845304 */ addiu $a0, $a0, %lo(D_80915304) ## $a0 = 80915304 /* 02820 80912E60 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 02824 80912E64 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 @@ -105,15 +105,15 @@ glabel L80912E00 /* 02860 80912EA0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02864 80912EA4 AE4B0368 */ sw $t3, 0x0368($s2) ## 00000368 /* 02868 80912EA8 8E0D0050 */ lw $t5, 0x0050($s0) ## 00000050 -/* 0286C 80912EAC 460A6400 */ add.s $f16, $f12, $f10 +/* 0286C 80912EAC 460A6400 */ add.s $f16, $f12, $f10 /* 02870 80912EB0 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 02874 80912EB4 AE4D036C */ sw $t5, 0x036C($s2) ## 0000036C /* 02878 80912EB8 8E0C0054 */ lw $t4, 0x0054($s0) ## 00000054 /* 0287C 80912EBC C6440210 */ lwc1 $f4, 0x0210($s2) ## 00000210 -/* 02880 80912EC0 460E8480 */ add.s $f18, $f16, $f14 +/* 02880 80912EC0 460E8480 */ add.s $f18, $f16, $f14 /* 02884 80912EC4 AE4C0370 */ sw $t4, 0x0370($s2) ## 00000370 /* 02888 80912EC8 8E0D0058 */ lw $t5, 0x0058($s0) ## 00000058 -/* 0288C 80912ECC 46062201 */ sub.s $f8, $f4, $f6 +/* 0288C 80912ECC 46062201 */ sub.s $f8, $f4, $f6 /* 02890 80912ED0 C642020C */ lwc1 $f2, 0x020C($s2) ## 0000020C /* 02894 80912ED4 E6520398 */ swc1 $f18, 0x0398($s2) ## 00000398 /* 02898 80912ED8 E64E0394 */ swc1 $f14, 0x0394($s2) ## 00000394 @@ -125,46 +125,46 @@ glabel L80912E00 /* 028B0 80912EF0 C60A005C */ lwc1 $f10, 0x005C($s0) ## 0000005C /* 028B4 80912EF4 C6520394 */ lwc1 $f18, 0x0394($s2) ## 00000394 /* 028B8 80912EF8 C6460398 */ lwc1 $f6, 0x0398($s2) ## 00000398 -/* 028BC 80912EFC 46025001 */ sub.s $f0, $f10, $f2 +/* 028BC 80912EFC 46025001 */ sub.s $f0, $f10, $f2 /* 028C0 80912F00 C64A03A8 */ lwc1 $f10, 0x03A8($s2) ## 000003A8 /* 028C4 80912F04 3C018091 */ lui $at, %hi(D_80915474) ## $at = 80910000 /* 028C8 80912F08 240E0096 */ addiu $t6, $zero, 0x0096 ## $t6 = 00000096 -/* 028CC 80912F0C 46000005 */ abs.s $f0, $f0 +/* 028CC 80912F0C 46000005 */ abs.s $f0, $f0 /* 028D0 80912F10 E6400378 */ swc1 $f0, 0x0378($s2) ## 00000378 /* 028D4 80912F14 C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 -/* 028D8 80912F18 46128001 */ sub.s $f0, $f16, $f18 +/* 028D8 80912F18 46128001 */ sub.s $f0, $f16, $f18 /* 028DC 80912F1C C65203AC */ lwc1 $f18, 0x03AC($s2) ## 000003AC -/* 028E0 80912F20 46000005 */ abs.s $f0, $f0 +/* 028E0 80912F20 46000005 */ abs.s $f0, $f0 /* 028E4 80912F24 E640037C */ swc1 $f0, 0x037C($s2) ## 0000037C /* 028E8 80912F28 C6040064 */ lwc1 $f4, 0x0064($s0) ## 00000064 -/* 028EC 80912F2C 46062001 */ sub.s $f0, $f4, $f6 +/* 028EC 80912F2C 46062001 */ sub.s $f0, $f4, $f6 /* 028F0 80912F30 C64603B0 */ lwc1 $f6, 0x03B0($s2) ## 000003B0 -/* 028F4 80912F34 46000005 */ abs.s $f0, $f0 +/* 028F4 80912F34 46000005 */ abs.s $f0, $f0 /* 028F8 80912F38 E6400380 */ swc1 $f0, 0x0380($s2) ## 00000380 /* 028FC 80912F3C C6080050 */ lwc1 $f8, 0x0050($s0) ## 00000050 -/* 02900 80912F40 460A4001 */ sub.s $f0, $f8, $f10 -/* 02904 80912F44 46000005 */ abs.s $f0, $f0 +/* 02900 80912F40 460A4001 */ sub.s $f0, $f8, $f10 +/* 02904 80912F44 46000005 */ abs.s $f0, $f0 /* 02908 80912F48 E6400384 */ swc1 $f0, 0x0384($s2) ## 00000384 /* 0290C 80912F4C C6100054 */ lwc1 $f16, 0x0054($s0) ## 00000054 -/* 02910 80912F50 46128001 */ sub.s $f0, $f16, $f18 -/* 02914 80912F54 46000005 */ abs.s $f0, $f0 +/* 02910 80912F50 46128001 */ sub.s $f0, $f16, $f18 +/* 02914 80912F54 46000005 */ abs.s $f0, $f0 /* 02918 80912F58 E6400388 */ swc1 $f0, 0x0388($s2) ## 00000388 /* 0291C 80912F5C C6040058 */ lwc1 $f4, 0x0058($s0) ## 00000058 -/* 02920 80912F60 C4225474 */ lwc1 $f2, %lo(D_80915474)($at) +/* 02920 80912F60 C4225474 */ lwc1 $f2, %lo(D_80915474)($at) /* 02924 80912F64 3C018091 */ lui $at, %hi(D_80915478) ## $at = 80910000 -/* 02928 80912F68 46062001 */ sub.s $f0, $f4, $f6 -/* 0292C 80912F6C 46000005 */ abs.s $f0, $f0 +/* 02928 80912F68 46062001 */ sub.s $f0, $f4, $f6 +/* 0292C 80912F6C 46000005 */ abs.s $f0, $f0 /* 02930 80912F70 E640038C */ swc1 $f0, 0x038C($s2) ## 0000038C -/* 02934 80912F74 C4285478 */ lwc1 $f8, %lo(D_80915478)($at) +/* 02934 80912F74 C4285478 */ lwc1 $f8, %lo(D_80915478)($at) /* 02938 80912F78 3C018091 */ lui $at, %hi(D_8091547C) ## $at = 80910000 /* 0293C 80912F7C E64803C4 */ swc1 $f8, 0x03C4($s2) ## 000003C4 -/* 02940 80912F80 C42A547C */ lwc1 $f10, %lo(D_8091547C)($at) +/* 02940 80912F80 C42A547C */ lwc1 $f10, %lo(D_8091547C)($at) /* 02944 80912F84 3C018091 */ lui $at, %hi(D_80915480) ## $at = 80910000 /* 02948 80912F88 E64A03A4 */ swc1 $f10, 0x03A4($s2) ## 000003A4 -/* 0294C 80912F8C C4305480 */ lwc1 $f16, %lo(D_80915480)($at) +/* 0294C 80912F8C C4305480 */ lwc1 $f16, %lo(D_80915480)($at) /* 02950 80912F90 3C018091 */ lui $at, %hi(D_80915484) ## $at = 80910000 /* 02954 80912F94 E65003A0 */ swc1 $f16, 0x03A0($s2) ## 000003A0 -/* 02958 80912F98 C4325484 */ lwc1 $f18, %lo(D_80915484)($at) +/* 02958 80912F98 C4325484 */ lwc1 $f18, %lo(D_80915484)($at) /* 0295C 80912F9C A64001A2 */ sh $zero, 0x01A2($s2) ## 000001A2 /* 02960 80912FA0 A64E01BC */ sh $t6, 0x01BC($s2) ## 000001BC /* 02964 80912FA4 E64203B4 */ swc1 $f2, 0x03B4($s2) ## 000003B4 @@ -175,124 +175,124 @@ glabel L80912FB4 /* 02974 80912FB4 864201A2 */ lh $v0, 0x01A2($s2) ## 000001A2 /* 02978 80912FB8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0297C 80912FBC 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 02980 80912FC0 10400008 */ beq $v0, $zero, .L80912FE4 +/* 02980 80912FC0 10400008 */ beq $v0, $zero, .L80912FE4 /* 02984 80912FC4 00000000 */ nop -/* 02988 80912FC8 1041001D */ beq $v0, $at, .L80913040 +/* 02988 80912FC8 1041001D */ beq $v0, $at, .L80913040 /* 0298C 80912FCC 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 02990 80912FD0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02994 80912FD4 5041002B */ beql $v0, $at, .L80913084 +/* 02994 80912FD4 5041002B */ beql $v0, $at, .L80913084 /* 02998 80912FD8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0299C 80912FDC 1000002B */ beq $zero, $zero, .L8091308C +/* 0299C 80912FDC 1000002B */ beq $zero, $zero, .L8091308C /* 029A0 80912FE0 86450194 */ lh $a1, 0x0194($s2) ## 00000194 .L80912FE4: -/* 029A4 80912FE4 0C0295B2 */ jal func_800A56C8 +/* 029A4 80912FE4 0C0295B2 */ jal func_800A56C8 /* 029A8 80912FE8 8E4501D0 */ lw $a1, 0x01D0($s2) ## 000001D0 -/* 029AC 80912FEC 10400026 */ beq $v0, $zero, .L80913088 +/* 029AC 80912FEC 10400026 */ beq $v0, $zero, .L80913088 /* 029B0 80912FF0 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 029B4 80912FF4 261008D8 */ addiu $s0, $s0, 0x08D8 ## $s0 = 060108D8 /* 029B8 80912FF8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 029BC 80912FFC 02002025 */ or $a0, $s0, $zero ## $a0 = 060108D8 /* 029C0 80913000 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 029C4 80913004 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 029C8 80913008 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 029CC 8091300C 46802020 */ cvt.s.w $f0, $f4 +/* 029CC 8091300C 46802020 */ cvt.s.w $f0, $f4 /* 029D0 80913010 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 029D4 80913014 02002825 */ or $a1, $s0, $zero ## $a1 = 060108D8 /* 029D8 80913018 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 029DC 8091301C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 029E0 80913020 E64001D0 */ swc1 $f0, 0x01D0($s2) ## 000001D0 -/* 029E4 80913024 AFAF0014 */ sw $t7, 0x0014($sp) -/* 029E8 80913028 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 029E4 80913024 AFAF0014 */ sw $t7, 0x0014($sp) +/* 029E8 80913028 E7A00010 */ swc1 $f0, 0x0010($sp) /* 029EC 8091302C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 029F0 80913030 E7A60018 */ swc1 $f6, 0x0018($sp) + +/* 029F0 80913030 E7A60018 */ swc1 $f6, 0x0018($sp) /* 029F4 80913034 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 029F8 80913038 10000013 */ beq $zero, $zero, .L80913088 +/* 029F8 80913038 10000013 */ beq $zero, $zero, .L80913088 /* 029FC 8091303C A65801A2 */ sh $t8, 0x01A2($s2) ## 000001A2 .L80913040: -/* 02A00 80913040 0C0295B2 */ jal func_800A56C8 +/* 02A00 80913040 0C0295B2 */ jal func_800A56C8 /* 02A04 80913044 8E4501D0 */ lw $a1, 0x01D0($s2) ## 000001D0 -/* 02A08 80913048 1040000D */ beq $v0, $zero, .L80913080 +/* 02A08 80913048 1040000D */ beq $v0, $zero, .L80913080 /* 02A0C 8091304C 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 02A10 80913050 26100D84 */ addiu $s0, $s0, 0x0D84 ## $s0 = 06000D84 /* 02A14 80913054 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02A18 80913058 02002025 */ or $a0, $s0, $zero ## $a0 = 06000D84 /* 02A1C 8091305C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 02A20 80913060 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 02A24 80913064 02002825 */ or $a1, $s0, $zero ## $a1 = 06000D84 -/* 02A28 80913068 468042A0 */ cvt.s.w $f10, $f8 +/* 02A28 80913068 468042A0 */ cvt.s.w $f10, $f8 /* 02A2C 8091306C 3C06C1A0 */ lui $a2, 0xC1A0 ## $a2 = C1A00000 -/* 02A30 80913070 0C0294D3 */ jal func_800A534C +/* 02A30 80913070 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 02A34 80913074 E64A01D0 */ swc1 $f10, 0x01D0($s2) ## 000001D0 /* 02A38 80913078 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 02A3C 8091307C A65901A2 */ sh $t9, 0x01A2($s2) ## 000001A2 .L80913080: /* 02A40 80913080 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 .L80913084: -/* 02A44 80913084 A3A800BE */ sb $t0, 0x00BE($sp) +/* 02A44 80913084 A3A800BE */ sb $t0, 0x00BE($sp) .L80913088: /* 02A48 80913088 86450194 */ lh $a1, 0x0194($s2) ## 00000194 .L8091308C: /* 02A4C 8091308C 264400B6 */ addiu $a0, $s2, 0x00B6 ## $a0 = 000000B6 /* 02A50 80913090 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 02A54 80913094 00050823 */ subu $at, $zero, $a1 -/* 02A58 80913098 00012880 */ sll $a1, $at, 2 -/* 02A5C 8091309C 00A12823 */ subu $a1, $a1, $at -/* 02A60 809130A0 000528C0 */ sll $a1, $a1, 3 -/* 02A64 809130A4 00A12821 */ addu $a1, $a1, $at -/* 02A68 809130A8 00052880 */ sll $a1, $a1, 2 -/* 02A6C 809130AC 00052C00 */ sll $a1, $a1, 16 -/* 02A70 809130B0 00052C03 */ sra $a1, $a1, 16 +/* 02A54 80913094 00050823 */ subu $at, $zero, $a1 +/* 02A58 80913098 00012880 */ sll $a1, $at, 2 +/* 02A5C 8091309C 00A12823 */ subu $a1, $a1, $at +/* 02A60 809130A0 000528C0 */ sll $a1, $a1, 3 +/* 02A64 809130A4 00A12821 */ addu $a1, $a1, $at +/* 02A68 809130A8 00052880 */ sll $a1, $a1, 2 +/* 02A6C 809130AC 00052C00 */ sll $a1, $a1, 16 +/* 02A70 809130B0 00052C03 */ sra $a1, $a1, 16 /* 02A74 809130B4 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 02A78 809130B8 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 02A7C 809130BC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 02A80 809130C0 44819000 */ mtc1 $at, $f18 ## $f18 = 60.00 /* 02A84 809130C4 C6500214 */ lwc1 $f16, 0x0214($s2) ## 00000214 /* 02A88 809130C8 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 /* 02A8C 809130CC 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A -/* 02A90 809130D0 46128100 */ add.s $f4, $f16, $f18 +/* 02A90 809130D0 46128100 */ add.s $f4, $f16, $f18 /* 02A94 809130D4 26440398 */ addiu $a0, $s2, 0x0398 ## $a0 = 00000398 /* 02A98 809130D8 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 02A9C 809130DC 44052000 */ mfc1 $a1, $f4 +/* 02A9C 809130DC 44052000 */ mfc1 $a1, $f4 /* 02AA0 809130E0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02AA4 809130E4 00000000 */ nop /* 02AA8 809130E8 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02AAC 809130EC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02AB0 809130F0 26440028 */ addiu $a0, $s2, 0x0028 ## $a0 = 00000028 /* 02AB4 809130F4 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 02AB8 809130F8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02ABC 809130FC 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 02AC0 80913100 86440194 */ lh $a0, 0x0194($s2) ## 00000194 -/* 02AC4 80913104 00800821 */ addu $at, $a0, $zero -/* 02AC8 80913108 00042080 */ sll $a0, $a0, 2 -/* 02ACC 8091310C 00812023 */ subu $a0, $a0, $at -/* 02AD0 80913110 00042100 */ sll $a0, $a0, 4 -/* 02AD4 80913114 00812023 */ subu $a0, $a0, $at -/* 02AD8 80913118 000420C0 */ sll $a0, $a0, 3 -/* 02ADC 8091311C 00812023 */ subu $a0, $a0, $at -/* 02AE0 80913120 00042080 */ sll $a0, $a0, 2 -/* 02AE4 80913124 00042400 */ sll $a0, $a0, 16 +/* 02AC4 80913104 00800821 */ addu $at, $a0, $zero +/* 02AC8 80913108 00042080 */ sll $a0, $a0, 2 +/* 02ACC 8091310C 00812023 */ subu $a0, $a0, $at +/* 02AD0 80913110 00042100 */ sll $a0, $a0, 4 +/* 02AD4 80913114 00812023 */ subu $a0, $a0, $at +/* 02AD8 80913118 000420C0 */ sll $a0, $a0, 3 +/* 02ADC 8091311C 00812023 */ subu $a0, $a0, $at +/* 02AE0 80913120 00042080 */ sll $a0, $a0, 2 +/* 02AE4 80913124 00042400 */ sll $a0, $a0, 16 /* 02AE8 80913128 0C01DE1C */ jal Math_Sins ## sins? -/* 02AEC 8091312C 00042403 */ sra $a0, $a0, 16 +/* 02AEC 8091312C 00042403 */ sra $a0, $a0, 16 /* 02AF0 80913130 C6460028 */ lwc1 $f6, 0x0028($s2) ## 00000028 /* 02AF4 80913134 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02AF8 80913138 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 02AFC 8091313C C6500210 */ lwc1 $f16, 0x0210($s2) ## 00000210 -/* 02B00 80913140 46003200 */ add.s $f8, $f6, $f0 +/* 02B00 80913140 46003200 */ add.s $f8, $f6, $f0 /* 02B04 80913144 864901BC */ lh $t1, 0x01BC($s2) ## 000001BC /* 02B08 80913148 C64A020C */ lwc1 $f10, 0x020C($s2) ## 0000020C -/* 02B0C 8091314C 46128101 */ sub.s $f4, $f16, $f18 +/* 02B0C 8091314C 46128101 */ sub.s $f4, $f16, $f18 /* 02B10 80913150 C6460214 */ lwc1 $f6, 0x0214($s2) ## 00000214 /* 02B14 80913154 E6480028 */ swc1 $f8, 0x0028($s2) ## 00000028 /* 02B18 80913158 E64A03A8 */ swc1 $f10, 0x03A8($s2) ## 000003A8 /* 02B1C 8091315C E64403AC */ swc1 $f4, 0x03AC($s2) ## 000003AC -/* 02B20 80913160 1520015E */ bne $t1, $zero, .L809136DC +/* 02B20 80913160 1520015E */ bne $t1, $zero, .L809136DC /* 02B24 80913164 E64603B0 */ swc1 $f6, 0x03B0($s2) ## 000003B0 /* 02B28 80913168 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 02B2C 8091316C 44814000 */ mtc1 $at, $f8 ## $f8 = 300.00 @@ -310,18 +310,18 @@ glabel L80912FB4 /* 02B5C 8091319C E64A0394 */ swc1 $f10, 0x0394($s2) ## 00000394 /* 02B60 809131A0 3C018091 */ lui $at, %hi(D_80915488) ## $at = 80910000 /* 02B64 809131A4 E6700024 */ swc1 $f16, 0x0024($s3) ## 00000024 -/* 02B68 809131A8 C4325488 */ lwc1 $f18, %lo(D_80915488)($at) +/* 02B68 809131A8 C4325488 */ lwc1 $f18, %lo(D_80915488)($at) /* 02B6C 809131AC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 02B70 809131B0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 02B74 809131B4 E672002C */ swc1 $f18, 0x002C($s3) ## 0000002C -/* 02B78 809131B8 A3AD00BF */ sb $t5, 0x00BF($sp) -/* 02B7C 809131BC 10000147 */ beq $zero, $zero, .L809136DC -/* 02B80 809131C0 A3AE00BE */ sb $t6, 0x00BE($sp) +/* 02B78 809131B8 A3AD00BF */ sb $t5, 0x00BF($sp) +/* 02B7C 809131BC 10000147 */ beq $zero, $zero, .L809136DC +/* 02B80 809131C0 A3AE00BE */ sb $t6, 0x00BE($sp) glabel L809131C4 /* 02B84 809131C4 864F01BE */ lh $t7, 0x01BE($s2) ## 000001BE /* 02B88 809131C8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 02B8C 809131CC 26841C24 */ addiu $a0, $s4, 0x1C24 ## $a0 = 00001C24 -/* 02B90 809131D0 15E10019 */ bne $t7, $at, .L80913238 +/* 02B90 809131D0 15E10019 */ bne $t7, $at, .L80913238 /* 02B94 809131D4 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 02B98 809131D8 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02B9C 809131DC 44812000 */ mtc1 $at, $f4 ## $f4 = 14.00 @@ -329,118 +329,118 @@ glabel L809131C4 /* 02BA4 809131E4 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 /* 02BA8 809131E8 44813000 */ mtc1 $at, $f6 ## $f6 = -30.00 /* 02BAC 809131EC 3C018091 */ lui $at, %hi(D_8091548C) ## $at = 80910000 -/* 02BB0 809131F0 C428548C */ lwc1 $f8, %lo(D_8091548C)($at) +/* 02BB0 809131F0 C428548C */ lwc1 $f8, %lo(D_8091548C)($at) /* 02BB4 809131F4 24184000 */ addiu $t8, $zero, 0x4000 ## $t8 = 00004000 /* 02BB8 809131F8 24190029 */ addiu $t9, $zero, 0x0029 ## $t9 = 00000029 -/* 02BBC 809131FC AFB90028 */ sw $t9, 0x0028($sp) -/* 02BC0 80913200 AFB8001C */ sw $t8, 0x001C($sp) -/* 02BC4 80913204 AFA00024 */ sw $zero, 0x0024($sp) -/* 02BC8 80913208 AFA00020 */ sw $zero, 0x0020($sp) +/* 02BBC 809131FC AFB90028 */ sw $t9, 0x0028($sp) +/* 02BC0 80913200 AFB8001C */ sw $t8, 0x001C($sp) +/* 02BC4 80913204 AFA00024 */ sw $zero, 0x0024($sp) +/* 02BC8 80913208 AFA00020 */ sw $zero, 0x0020($sp) /* 02BCC 8091320C 02803025 */ or $a2, $s4, $zero ## $a2 = 00000000 /* 02BD0 80913210 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D -/* 02BD4 80913214 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02BD8 80913218 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 02BD4 80913214 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 02BD8 80913218 E7A60014 */ swc1 $f6, 0x0014($sp) /* 02BDC 8091321C 0C00C916 */ jal Actor_SpawnAttached - -/* 02BE0 80913220 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 02BE0 80913220 E7A80018 */ swc1 $f8, 0x0018($sp) /* 02BE4 80913224 AE50011C */ sw $s0, 0x011C($s2) ## 0000011C /* 02BE8 80913228 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 02BEC 8091322C 2405108E */ addiu $a1, $zero, 0x108E ## $a1 = 0000108E -/* 02BF0 80913230 0C042DA0 */ jal func_8010B680 +/* 02BF0 80913230 0C042DA0 */ jal func_8010B680 /* 02BF4 80913234 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 .L80913238: /* 02BF8 80913238 86440194 */ lh $a0, 0x0194($s2) ## 00000194 /* 02BFC 8091323C 864800B6 */ lh $t0, 0x00B6($s2) ## 000000B6 -/* 02C00 80913240 00800821 */ addu $at, $a0, $zero -/* 02C04 80913244 00042080 */ sll $a0, $a0, 2 -/* 02C08 80913248 00812023 */ subu $a0, $a0, $at -/* 02C0C 8091324C 00042100 */ sll $a0, $a0, 4 -/* 02C10 80913250 00812023 */ subu $a0, $a0, $at -/* 02C14 80913254 000420C0 */ sll $a0, $a0, 3 -/* 02C18 80913258 00812023 */ subu $a0, $a0, $at -/* 02C1C 8091325C 00042080 */ sll $a0, $a0, 2 -/* 02C20 80913260 00042400 */ sll $a0, $a0, 16 +/* 02C00 80913240 00800821 */ addu $at, $a0, $zero +/* 02C04 80913244 00042080 */ sll $a0, $a0, 2 +/* 02C08 80913248 00812023 */ subu $a0, $a0, $at +/* 02C0C 8091324C 00042100 */ sll $a0, $a0, 4 +/* 02C10 80913250 00812023 */ subu $a0, $a0, $at +/* 02C14 80913254 000420C0 */ sll $a0, $a0, 3 +/* 02C18 80913258 00812023 */ subu $a0, $a0, $at +/* 02C1C 8091325C 00042080 */ sll $a0, $a0, 2 +/* 02C20 80913260 00042400 */ sll $a0, $a0, 16 /* 02C24 80913264 2509FF38 */ addiu $t1, $t0, 0xFF38 ## $t1 = FFFFFF38 /* 02C28 80913268 A64900B6 */ sh $t1, 0x00B6($s2) ## 000000B6 /* 02C2C 8091326C 0C01DE1C */ jal Math_Sins ## sins? -/* 02C30 80913270 00042403 */ sra $a0, $a0, 16 +/* 02C30 80913270 00042403 */ sra $a0, $a0, 16 /* 02C34 80913274 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 02C38 80913278 44812000 */ mtc1 $at, $f4 ## $f4 = 120.00 /* 02C3C 8091327C C65201DC */ lwc1 $f18, 0x01DC($s2) ## 000001DC /* 02C40 80913280 C64A0028 */ lwc1 $f10, 0x0028($s2) ## 00000028 -/* 02C44 80913284 46049180 */ add.s $f6, $f18, $f4 -/* 02C48 80913288 46005400 */ add.s $f16, $f10, $f0 +/* 02C44 80913284 46049180 */ add.s $f6, $f18, $f4 +/* 02C48 80913288 46005400 */ add.s $f16, $f10, $f0 /* 02C4C 8091328C E64601DC */ swc1 $f6, 0x01DC($s2) ## 000001DC /* 02C50 80913290 C64801DC */ lwc1 $f8, 0x01DC($s2) ## 000001DC /* 02C54 80913294 E6500028 */ swc1 $f16, 0x0028($s2) ## 00000028 -/* 02C58 80913298 4600428D */ trunc.w.s $f10, $f8 -/* 02C5C 8091329C 44045000 */ mfc1 $a0, $f10 +/* 02C58 80913298 4600428D */ trunc.w.s $f10, $f8 +/* 02C5C 8091329C 44045000 */ mfc1 $a0, $f10 /* 02C60 809132A0 00000000 */ nop -/* 02C64 809132A4 00042400 */ sll $a0, $a0, 16 +/* 02C64 809132A4 00042400 */ sll $a0, $a0, 16 /* 02C68 809132A8 0C01DE1C */ jal Math_Sins ## sins? -/* 02C6C 809132AC 00042403 */ sra $a0, $a0, 16 +/* 02C6C 809132AC 00042403 */ sra $a0, $a0, 16 /* 02C70 809132B0 C65001D8 */ lwc1 $f16, 0x01D8($s2) ## 000001D8 -/* 02C74 809132B4 46008482 */ mul.s $f18, $f16, $f0 -/* 02C78 809132B8 E7B200B8 */ swc1 $f18, 0x00B8($sp) +/* 02C74 809132B4 46008482 */ mul.s $f18, $f16, $f0 +/* 02C78 809132B8 E7B200B8 */ swc1 $f18, 0x00B8($sp) /* 02C7C 809132BC C64401DC */ lwc1 $f4, 0x01DC($s2) ## 000001DC -/* 02C80 809132C0 4600218D */ trunc.w.s $f6, $f4 -/* 02C84 809132C4 44043000 */ mfc1 $a0, $f6 +/* 02C80 809132C0 4600218D */ trunc.w.s $f6, $f4 +/* 02C84 809132C4 44043000 */ mfc1 $a0, $f6 /* 02C88 809132C8 00000000 */ nop -/* 02C8C 809132CC 00042400 */ sll $a0, $a0, 16 +/* 02C8C 809132CC 00042400 */ sll $a0, $a0, 16 /* 02C90 809132D0 0C01DE0D */ jal Math_Coss ## coss? -/* 02C94 809132D4 00042403 */ sra $a0, $a0, 16 +/* 02C94 809132D4 00042403 */ sra $a0, $a0, 16 /* 02C98 809132D8 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02C9C 809132DC 44815000 */ mtc1 $at, $f10 ## $f10 = 14.00 -/* 02CA0 809132E0 C7B000B8 */ lwc1 $f16, 0x00B8($sp) +/* 02CA0 809132E0 C7B000B8 */ lwc1 $f16, 0x00B8($sp) /* 02CA4 809132E4 C64801D8 */ lwc1 $f8, 0x01D8($s2) ## 000001D8 /* 02CA8 809132E8 C6440394 */ lwc1 $f4, 0x0394($s2) ## 00000394 -/* 02CAC 809132EC 46105480 */ add.s $f18, $f10, $f16 -/* 02CB0 809132F0 46004082 */ mul.s $f2, $f8, $f0 +/* 02CAC 809132EC 46105480 */ add.s $f18, $f10, $f16 +/* 02CB0 809132F0 46004082 */ mul.s $f2, $f8, $f0 /* 02CB4 809132F4 3C018091 */ lui $at, %hi(D_80915490) ## $at = 80910000 /* 02CB8 809132F8 E6440364 */ swc1 $f4, 0x0364($s2) ## 00000364 /* 02CBC 809132FC E6520360 */ swc1 $f18, 0x0360($s2) ## 00000360 -/* 02CC0 80913300 C4265490 */ lwc1 $f6, %lo(D_80915490)($at) +/* 02CC0 80913300 C4265490 */ lwc1 $f6, %lo(D_80915490)($at) /* 02CC4 80913304 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02CC8 80913308 44815000 */ mtc1 $at, $f10 ## $f10 = 14.00 -/* 02CCC 8091330C 46023200 */ add.s $f8, $f6, $f2 +/* 02CCC 8091330C 46023200 */ add.s $f8, $f6, $f2 /* 02CD0 80913310 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 02CD4 80913314 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 /* 02CD8 80913318 3C018091 */ lui $at, %hi(D_80915494) ## $at = 80910000 /* 02CDC 8091331C E6480368 */ swc1 $f8, 0x0368($s2) ## 00000368 /* 02CE0 80913320 E64A036C */ swc1 $f10, 0x036C($s2) ## 0000036C /* 02CE4 80913324 E6500370 */ swc1 $f16, 0x0370($s2) ## 00000370 -/* 02CE8 80913328 C4325494 */ lwc1 $f18, %lo(D_80915494)($at) +/* 02CE8 80913328 C4325494 */ lwc1 $f18, %lo(D_80915494)($at) /* 02CEC 8091332C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02CF0 80913330 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02CF4 80913334 26440394 */ addiu $a0, $s2, 0x0394 ## $a0 = 00000394 /* 02CF8 80913338 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02CFC 8091333C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 02D00 80913340 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D04 80913344 E6520374 */ swc1 $f18, 0x0374($s2) ## 00000374 /* 02D08 80913348 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02D0C 8091334C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02D10 80913350 264401D8 */ addiu $a0, $s2, 0x01D8 ## $a0 = 000001D8 /* 02D14 80913354 3C05432A */ lui $a1, 0x432A ## $a1 = 432A0000 /* 02D18 80913358 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D1C 8091335C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 02D20 80913360 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02D24 80913364 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02D28 80913368 26440024 */ addiu $a0, $s2, 0x0024 ## $a0 = 00000024 /* 02D2C 8091336C 3C054160 */ lui $a1, 0x4160 ## $a1 = 41600000 /* 02D30 80913370 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D34 80913374 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 02D38 80913378 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02D3C 8091337C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02D40 80913380 26440028 */ addiu $a0, $s2, 0x0028 ## $a0 = 00000028 /* 02D44 80913384 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 /* 02D48 80913388 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D4C 8091338C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 02D50 80913390 3C05C54F */ lui $a1, 0xC54F ## $a1 = C54F0000 /* 02D54 80913394 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -448,18 +448,18 @@ glabel L809131C4 /* 02D5C 8091339C 34A53000 */ ori $a1, $a1, 0x3000 ## $a1 = C54F3000 /* 02D60 809133A0 2644002C */ addiu $a0, $s2, 0x002C ## $a0 = 0000002C /* 02D64 809133A4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D68 809133A8 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 02D6C 809133AC 864C01BC */ lh $t4, 0x01BC($s2) ## 000001BC /* 02D70 809133B0 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 02D74 809133B4 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 -/* 02D78 809133B8 15800015 */ bne $t4, $zero, .L80913410 +/* 02D78 809133B8 15800015 */ bne $t4, $zero, .L80913410 /* 02D7C 809133BC 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 02D80 809133C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02D84 809133C4 A64D035E */ sh $t5, 0x035E($s2) ## 0000035E /* 02D88 809133C8 A64E01BC */ sh $t6, 0x01BC($s2) ## 000001BC /* 02D8C 809133CC 24A5189C */ addiu $a1, $a1, 0x189C ## $a1 = 0600189C -/* 02D90 809133D0 0C0294D3 */ jal func_800A534C +/* 02D90 809133D0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 02D94 809133D4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 02D98 809133D8 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02D9C 809133DC 44812000 */ mtc1 $at, $f4 ## $f4 = 14.00 @@ -468,20 +468,20 @@ glabel L809131C4 /* 02DA8 809133E8 3C018091 */ lui $at, %hi(D_80915498) ## $at = 80910000 /* 02DAC 809133EC E6440024 */ swc1 $f4, 0x0024($s2) ## 00000024 /* 02DB0 809133F0 E6460028 */ swc1 $f6, 0x0028($s2) ## 00000028 -/* 02DB4 809133F4 C4285498 */ lwc1 $f8, %lo(D_80915498)($at) +/* 02DB4 809133F4 C4285498 */ lwc1 $f8, %lo(D_80915498)($at) /* 02DB8 809133F8 A64000B6 */ sh $zero, 0x00B6($s2) ## 000000B6 /* 02DBC 809133FC A64001AE */ sh $zero, 0x01AE($s2) ## 000001AE /* 02DC0 80913400 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 02DC4 80913404 240538AC */ addiu $a1, $zero, 0x38AC ## $a1 = 000038AC /* 02DC8 80913408 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02DCC 8091340C E648002C */ swc1 $f8, 0x002C($s2) ## 0000002C .L80913410: /* 02DD0 80913410 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 02DD4 80913414 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 02DD8 80913418 A3AF00BF */ sb $t7, 0x00BF($sp) -/* 02DDC 8091341C 100000AF */ beq $zero, $zero, .L809136DC -/* 02DE0 80913420 A3B800BE */ sb $t8, 0x00BE($sp) +/* 02DD8 80913418 A3AF00BF */ sb $t7, 0x00BF($sp) +/* 02DDC 8091341C 100000AF */ beq $zero, $zero, .L809136DC +/* 02DE0 80913420 A3B800BE */ sb $t8, 0x00BE($sp) glabel L80913424 /* 02DE4 80913424 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02DE8 80913428 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 @@ -489,13 +489,13 @@ glabel L80913424 /* 02DF0 80913430 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 02DF4 80913434 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02DF8 80913438 44815000 */ mtc1 $at, $f10 ## $f10 = 14.00 -/* 02DFC 8091343C A3B900BF */ sb $t9, 0x00BF($sp) -/* 02E00 80913440 A3A800BE */ sb $t0, 0x00BE($sp) +/* 02DFC 8091343C A3B900BF */ sb $t9, 0x00BF($sp) +/* 02E00 80913440 A3A800BE */ sb $t0, 0x00BE($sp) /* 02E04 80913444 3C018091 */ lui $at, %hi(D_8091549C) ## $at = 80910000 /* 02E08 80913448 E6400028 */ swc1 $f0, 0x0028($s2) ## 00000028 /* 02E0C 8091344C E6400364 */ swc1 $f0, 0x0364($s2) ## 00000364 /* 02E10 80913450 E64A0360 */ swc1 $f10, 0x0360($s2) ## 00000360 -/* 02E14 80913454 C430549C */ lwc1 $f16, %lo(D_8091549C)($at) +/* 02E14 80913454 C430549C */ lwc1 $f16, %lo(D_8091549C)($at) /* 02E18 80913458 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02E1C 8091345C 44819000 */ mtc1 $at, $f18 ## $f18 = 14.00 /* 02E20 80913460 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -505,30 +505,30 @@ glabel L80913424 /* 02E30 80913470 E6500368 */ swc1 $f16, 0x0368($s2) ## 00000368 /* 02E34 80913474 E652036C */ swc1 $f18, 0x036C($s2) ## 0000036C /* 02E38 80913478 E6440370 */ swc1 $f4, 0x0370($s2) ## 00000370 -/* 02E3C 8091347C C42654A0 */ lwc1 $f6, %lo(D_809154A0)($at) +/* 02E3C 8091347C C42654A0 */ lwc1 $f6, %lo(D_809154A0)($at) /* 02E40 80913480 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 -/* 02E44 80913484 15200095 */ bne $t1, $zero, .L809136DC +/* 02E44 80913484 15200095 */ bne $t1, $zero, .L809136DC /* 02E48 80913488 E6460374 */ swc1 $f6, 0x0374($s2) ## 00000374 /* 02E4C 8091348C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02E50 80913490 A64A035E */ sh $t2, 0x035E($s2) ## 0000035E /* 02E54 80913494 24A51AB0 */ addiu $a1, $a1, 0x1AB0 ## $a1 = 06001AB0 /* 02E58 80913498 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 02E5C 8091349C 0C029490 */ jal func_800A5240 +/* 02E5C 8091349C 0C029490 */ jal func_800A5240 /* 02E60 809134A0 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 02E64 809134A4 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 /* 02E68 809134A8 A64001AE */ sh $zero, 0x01AE($s2) ## 000001AE -/* 02E6C 809134AC 1000008B */ beq $zero, $zero, .L809136DC +/* 02E6C 809134AC 1000008B */ beq $zero, $zero, .L809136DC /* 02E70 809134B0 A64B01BC */ sh $t3, 0x01BC($s2) ## 000001BC glabel L809134B4 /* 02E74 809134B4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 02E78 809134B8 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 02E7C 809134BC 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 -/* 02E80 809134C0 A3AC00BF */ sb $t4, 0x00BF($sp) -/* 02E84 809134C4 A3AD00BE */ sb $t5, 0x00BE($sp) +/* 02E80 809134C0 A3AC00BF */ sb $t4, 0x00BF($sp) +/* 02E84 809134C4 A3AD00BE */ sb $t5, 0x00BE($sp) /* 02E88 809134C8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 02E8C 809134CC 26440364 */ addiu $a0, $s2, 0x0364 ## $a0 = 00000364 /* 02E90 809134D0 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 02E94 809134D4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02E98 809134D8 3C05C544 */ lui $a1, 0xC544 ## $a1 = C5440000 /* 02E9C 809134DC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -536,58 +536,58 @@ glabel L809134B4 /* 02EA4 809134E4 34A59000 */ ori $a1, $a1, 0x9000 ## $a1 = C5449000 /* 02EA8 809134E8 26440368 */ addiu $a0, $s2, 0x0368 ## $a0 = 00000368 /* 02EAC 809134EC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02EB0 809134F0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 02EB4 809134F4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02EB8 809134F8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02EBC 809134FC 26440370 */ addiu $a0, $s2, 0x0370 ## $a0 = 00000370 /* 02EC0 80913500 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 /* 02EC4 80913504 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02EC8 80913508 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 02ECC 8091350C 864E01BC */ lh $t6, 0x01BC($s2) ## 000001BC /* 02ED0 80913510 240F00FA */ addiu $t7, $zero, 0x00FA ## $t7 = 000000FA /* 02ED4 80913514 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 02ED8 80913518 55C00071 */ bnel $t6, $zero, .L809136E0 -/* 02EDC 8091351C 93A900BE */ lbu $t1, 0x00BE($sp) +/* 02ED8 80913518 55C00071 */ bnel $t6, $zero, .L809136E0 +/* 02EDC 8091351C 93A900BE */ lbu $t1, 0x00BE($sp) /* 02EE0 80913520 A64F01BC */ sh $t7, 0x01BC($s2) ## 000001BC -/* 02EE4 80913524 1000006D */ beq $zero, $zero, .L809136DC +/* 02EE4 80913524 1000006D */ beq $zero, $zero, .L809136DC /* 02EE8 80913528 A658035E */ sh $t8, 0x035E($s2) ## 0000035E glabel L8091352C /* 02EEC 8091352C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 02EF0 80913530 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 02EF4 80913534 A3B900BF */ sb $t9, 0x00BF($sp) -/* 02EF8 80913538 A3A800BE */ sb $t0, 0x00BE($sp) +/* 02EF4 80913534 A3B900BF */ sb $t9, 0x00BF($sp) +/* 02EF8 80913538 A3A800BE */ sb $t0, 0x00BE($sp) /* 02EFC 8091353C 864901BC */ lh $t1, 0x01BC($s2) ## 000001BC /* 02F00 80913540 24010096 */ addiu $at, $zero, 0x0096 ## $at = 00000096 -/* 02F04 80913544 55210014 */ bnel $t1, $at, .L80913598 +/* 02F04 80913544 55210014 */ bnel $t1, $at, .L80913598 /* 02F08 80913548 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 /* 02F0C 8091354C 0C03E803 */ jal Audio_SetBGM - + /* 02F10 80913550 24040021 */ addiu $a0, $zero, 0x0021 ## $a0 = 00000021 /* 02F14 80913554 3C01C204 */ lui $at, 0xC204 ## $at = C2040000 /* 02F18 80913558 44814000 */ mtc1 $at, $f8 ## $f8 = -33.00 /* 02F1C 8091355C 3C018091 */ lui $at, %hi(D_809154A4) ## $at = 80910000 -/* 02F20 80913560 C42A54A4 */ lwc1 $f10, %lo(D_809154A4)($at) +/* 02F20 80913560 C42A54A4 */ lwc1 $f10, %lo(D_809154A4)($at) /* 02F24 80913564 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 02F28 80913568 AFAA0024 */ sw $t2, 0x0024($sp) +/* 02F28 80913568 AFAA0024 */ sw $t2, 0x0024($sp) /* 02F2C 8091356C 26841C24 */ addiu $a0, $s4, 0x1C24 ## $a0 = 00001C24 /* 02F30 80913570 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 02F34 80913574 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D /* 02F38 80913578 3C074160 */ lui $a3, 0x4160 ## $a3 = 41600000 -/* 02F3C 8091357C AFA00018 */ sw $zero, 0x0018($sp) -/* 02F40 80913580 AFA0001C */ sw $zero, 0x001C($sp) -/* 02F44 80913584 AFA00020 */ sw $zero, 0x0020($sp) -/* 02F48 80913588 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 02F3C 8091357C AFA00018 */ sw $zero, 0x0018($sp) +/* 02F40 80913580 AFA0001C */ sw $zero, 0x001C($sp) +/* 02F44 80913584 AFA00020 */ sw $zero, 0x0020($sp) +/* 02F48 80913588 E7A80010 */ swc1 $f8, 0x0010($sp) /* 02F4C 8091358C 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 02F50 80913590 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 02F50 80913590 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 02F54 80913594 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 .L80913598: /* 02F58 80913598 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 02F5C 8091359C 26440364 */ addiu $a0, $s2, 0x0364 ## $a0 = 00000364 /* 02F60 809135A0 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 02F64 809135A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02F68 809135A8 3C05C544 */ lui $a1, 0xC544 ## $a1 = C5440000 /* 02F6C 809135AC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -595,19 +595,19 @@ glabel L8091352C /* 02F74 809135B4 34A59000 */ ori $a1, $a1, 0x9000 ## $a1 = C5449000 /* 02F78 809135B8 26440368 */ addiu $a0, $s2, 0x0368 ## $a0 = 00000368 /* 02F7C 809135BC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02F80 809135C0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 02F84 809135C4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02F88 809135C8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02F8C 809135CC 26440370 */ addiu $a0, $s2, 0x0370 ## $a0 = 00000370 /* 02F90 809135D0 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 /* 02F94 809135D4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02F98 809135D8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 02F9C 809135DC 864B01BC */ lh $t3, 0x01BC($s2) ## 000001BC /* 02FA0 809135E0 26510360 */ addiu $s1, $s2, 0x0360 ## $s1 = 00000360 -/* 02FA4 809135E4 5560003E */ bnel $t3, $zero, .L809136E0 -/* 02FA8 809135E8 93A900BE */ lbu $t1, 0x00BE($sp) +/* 02FA4 809135E4 5560003E */ bnel $t3, $zero, .L809136E0 +/* 02FA8 809135E8 93A900BE */ lbu $t1, 0x00BE($sp) /* 02FAC 809135EC 8E2D0000 */ lw $t5, 0x0000($s1) ## 00000360 /* 02FB0 809135F0 8E53011C */ lw $s3, 0x011C($s2) ## 0000011C /* 02FB4 809135F4 26881C24 */ addiu $t0, $s4, 0x1C24 ## $t0 = 00001C24 @@ -631,52 +631,52 @@ glabel L8091352C /* 02FFC 8091363C 8E590374 */ lw $t9, 0x0374($s2) ## 00000374 /* 03000 80913640 AE190058 */ sw $t9, 0x0058($s0) ## 06000DDC /* 03004 80913644 8645035C */ lh $a1, 0x035C($s2) ## 0000035C -/* 03008 80913648 0C03022B */ jal func_800C08AC -/* 0300C 8091364C AFA80060 */ sw $t0, 0x0060($sp) +/* 03008 80913648 0C03022B */ jal func_800C08AC +/* 0300C 8091364C AFA80060 */ sw $t0, 0x0060($sp) /* 03010 80913650 A640035C */ sh $zero, 0x035C($s2) ## 0000035C /* 03014 80913654 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 03018 80913658 0C01914D */ jal func_80064534 +/* 03018 80913658 0C01914D */ jal func_80064534 /* 0301C 8091365C 26851D64 */ addiu $a1, $s4, 0x1D64 ## $a1 = 00001D64 /* 03020 80913660 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 03024 80913664 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 03028 80913668 0C00B7D5 */ jal func_8002DF54 +/* 03028 80913668 0C00B7D5 */ jal func_8002DF54 /* 0302C 8091366C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03030 80913670 3C01C204 */ lui $at, 0xC204 ## $at = C2040000 /* 03034 80913674 44818000 */ mtc1 $at, $f16 ## $f16 = -33.00 /* 03038 80913678 3C018091 */ lui $at, %hi(D_809154A8) ## $at = 80910000 -/* 0303C 8091367C C43254A8 */ lwc1 $f18, %lo(D_809154A8)($at) -/* 03040 80913680 8FA40060 */ lw $a0, 0x0060($sp) +/* 0303C 8091367C C43254A8 */ lwc1 $f18, %lo(D_809154A8)($at) +/* 03040 80913680 8FA40060 */ lw $a0, 0x0060($sp) /* 03044 80913684 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 03048 80913688 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F /* 0304C 8091368C 3C074160 */ lui $a3, 0x4160 ## $a3 = 41600000 -/* 03050 80913690 AFA00018 */ sw $zero, 0x0018($sp) -/* 03054 80913694 AFA0001C */ sw $zero, 0x001C($sp) -/* 03058 80913698 AFA00020 */ sw $zero, 0x0020($sp) -/* 0305C 8091369C AFA00024 */ sw $zero, 0x0024($sp) -/* 03060 809136A0 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 03050 80913690 AFA00018 */ sw $zero, 0x0018($sp) +/* 03054 80913694 AFA0001C */ sw $zero, 0x001C($sp) +/* 03058 80913698 AFA00020 */ sw $zero, 0x0020($sp) +/* 0305C 8091369C AFA00024 */ sw $zero, 0x0024($sp) +/* 03060 809136A0 E7B00010 */ swc1 $f16, 0x0010($sp) /* 03064 809136A4 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 03068 809136A8 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 03068 809136A8 E7B20014 */ swc1 $f18, 0x0014($sp) /* 0306C 809136AC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 03070 809136B0 AE53011C */ sw $s3, 0x011C($s2) ## 0000011C /* 03074 809136B4 A24301C6 */ sb $v1, 0x01C6($s2) ## 000001C6 /* 03078 809136B8 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 /* 0307C 809136BC A263014E */ sb $v1, 0x014E($s3) ## 0000014E -/* 03080 809136C0 00B42821 */ addu $a1, $a1, $s4 +/* 03080 809136C0 00B42821 */ addu $a1, $a1, $s4 /* 03084 809136C4 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC /* 03088 809136C8 0C00B33C */ jal Flags_SetClear - + /* 0308C 809136CC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 03090 809136D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 03094 809136D4 0C00B2DD */ jal Flags_SetSwitch - + /* 03098 809136D8 24050022 */ addiu $a1, $zero, 0x0022 ## $a1 = 00000022 .L809136DC: -/* 0309C 809136DC 93A900BE */ lbu $t1, 0x00BE($sp) +/* 0309C 809136DC 93A900BE */ lbu $t1, 0x00BE($sp) .L809136E0: /* 030A0 809136E0 3C0B8091 */ lui $t3, %hi(D_809150FC) ## $t3 = 80910000 /* 030A4 809136E4 256B50FC */ addiu $t3, $t3, %lo(D_809150FC) ## $t3 = 809150FC -/* 030A8 809136E8 11200103 */ beq $t1, $zero, .L80913AF8 +/* 030A8 809136E8 11200103 */ beq $t1, $zero, .L80913AF8 /* 030AC 809136EC 27AA0088 */ addiu $t2, $sp, 0x0088 ## $t2 = FFFFFFC8 /* 030B0 809136F0 8D6D0000 */ lw $t5, 0x0000($t3) ## 809150FC /* 030B4 809136F4 8D6C0004 */ lw $t4, 0x0004($t3) ## 80915100 @@ -705,77 +705,77 @@ glabel L8091352C /* 03110 80913750 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFB8 /* 03114 80913754 C6460100 */ lwc1 $f6, 0x0100($s2) ## 00000100 /* 03118 80913758 C6440024 */ lwc1 $f4, 0x0024($s2) ## 00000024 -/* 0311C 8091375C 93B300BE */ lbu $s3, 0x00BE($sp) -/* 03120 80913760 46062201 */ sub.s $f8, $f4, $f6 -/* 03124 80913764 2A61000A */ slti $at, $s3, 0x000A -/* 03128 80913768 E7A80088 */ swc1 $f8, 0x0088($sp) +/* 0311C 8091375C 93B300BE */ lbu $s3, 0x00BE($sp) +/* 03120 80913760 46062201 */ sub.s $f8, $f4, $f6 +/* 03124 80913764 2A61000A */ slti $at, $s3, 0x000A +/* 03128 80913768 E7A80088 */ swc1 $f8, 0x0088($sp) /* 0312C 8091376C C6500108 */ lwc1 $f16, 0x0108($s2) ## 00000108 /* 03130 80913770 C64A002C */ lwc1 $f10, 0x002C($s2) ## 0000002C -/* 03134 80913774 46105481 */ sub.s $f18, $f10, $f16 -/* 03138 80913778 102000B8 */ beq $at, $zero, .L80913A5C -/* 0313C 8091377C E7B20090 */ swc1 $f18, 0x0090($sp) +/* 03134 80913774 46105481 */ sub.s $f18, $f10, $f16 +/* 03138 80913778 102000B8 */ beq $at, $zero, .L80913A5C +/* 0313C 8091377C E7B20090 */ swc1 $f18, 0x0090($sp) /* 03140 80913780 864201B4 */ lh $v0, 0x01B4($s2) ## 000001B4 /* 03144 80913784 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 03148 80913788 01946021 */ addu $t4, $t4, $s4 -/* 0314C 8091378C 14400038 */ bne $v0, $zero, .L80913870 +/* 03148 80913788 01946021 */ addu $t4, $t4, $s4 +/* 0314C 8091378C 14400038 */ bne $v0, $zero, .L80913870 /* 03150 80913790 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF /* 03154 80913794 918C0AE3 */ lbu $t4, 0x0AE3($t4) ## 00010AE3 /* 03158 80913798 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0315C 8091379C 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 03160 809137A0 1580001B */ bne $t4, $zero, .L80913810 -/* 03164 809137A4 00340821 */ addu $at, $at, $s4 +/* 03160 809137A0 1580001B */ bne $t4, $zero, .L80913810 +/* 03164 809137A4 00340821 */ addu $at, $at, $s4 /* 03168 809137A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0316C 809137AC 00340821 */ addu $at, $at, $s4 +/* 0316C 809137AC 00340821 */ addu $at, $at, $s4 /* 03170 809137B0 A02D0AE3 */ sb $t5, 0x0AE3($at) ## 00010AE3 /* 03174 809137B4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 03178 809137B8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 0317C 809137BC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 03180 809137C0 00000000 */ nop -/* 03184 809137C4 4600010D */ trunc.w.s $f4, $f0 +/* 03184 809137C4 4600010D */ trunc.w.s $f4, $f0 /* 03188 809137C8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 0318C 809137CC 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 /* 03190 809137D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03194 809137D4 440F2000 */ mfc1 $t7, $f4 -/* 03198 809137D8 00340821 */ addu $at, $at, $s4 +/* 03194 809137D4 440F2000 */ mfc1 $t7, $f4 +/* 03198 809137D8 00340821 */ addu $at, $at, $s4 /* 0319C 809137DC 240A0028 */ addiu $t2, $zero, 0x0028 ## $t2 = 00000028 -/* 031A0 809137E0 000FC400 */ sll $t8, $t7, 16 -/* 031A4 809137E4 0018CC03 */ sra $t9, $t8, 16 +/* 031A0 809137E0 000FC400 */ sll $t8, $t7, 16 +/* 031A4 809137E4 0018CC03 */ sra $t9, $t8, 16 /* 031A8 809137E8 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 /* 031AC 809137EC 00000000 */ nop -/* 031B0 809137F0 46803220 */ cvt.s.w $f8, $f6 -/* 031B4 809137F4 460A4400 */ add.s $f16, $f8, $f10 -/* 031B8 809137F8 4600848D */ trunc.w.s $f18, $f16 -/* 031BC 809137FC 44099000 */ mfc1 $t1, $f18 +/* 031B0 809137F0 46803220 */ cvt.s.w $f8, $f6 +/* 031B4 809137F4 460A4400 */ add.s $f16, $f8, $f10 +/* 031B8 809137F8 4600848D */ trunc.w.s $f18, $f16 +/* 031BC 809137FC 44099000 */ mfc1 $t1, $f18 /* 031C0 80913800 00000000 */ nop /* 031C4 80913804 A64901B4 */ sh $t1, 0x01B4($s2) ## 000001B4 -/* 031C8 80913808 1000001A */ beq $zero, $zero, .L80913874 +/* 031C8 80913808 1000001A */ beq $zero, $zero, .L80913874 /* 031CC 8091380C A42A0AFA */ sh $t2, 0x0AFA($at) ## 00010AFA .L80913810: /* 031D0 80913810 A0200AE3 */ sb $zero, 0x0AE3($at) ## 00010AE3 /* 031D4 80913814 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 031D8 80913818 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 /* 031DC 8091381C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 031E0 80913820 00000000 */ nop -/* 031E4 80913824 4600010D */ trunc.w.s $f4, $f0 +/* 031E4 80913824 4600010D */ trunc.w.s $f4, $f0 /* 031E8 80913828 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 031EC 8091382C 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 /* 031F0 80913830 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 031F4 80913834 440C2000 */ mfc1 $t4, $f4 -/* 031F8 80913838 00340821 */ addu $at, $at, $s4 +/* 031F4 80913834 440C2000 */ mfc1 $t4, $f4 +/* 031F8 80913838 00340821 */ addu $at, $at, $s4 /* 031FC 8091383C 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 03200 80913840 000C6C00 */ sll $t5, $t4, 16 -/* 03204 80913844 000D7403 */ sra $t6, $t5, 16 +/* 03200 80913840 000C6C00 */ sll $t5, $t4, 16 +/* 03204 80913844 000D7403 */ sra $t6, $t5, 16 /* 03208 80913848 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 /* 0320C 8091384C 00000000 */ nop -/* 03210 80913850 46803220 */ cvt.s.w $f8, $f6 -/* 03214 80913854 460A4400 */ add.s $f16, $f8, $f10 -/* 03218 80913858 4600848D */ trunc.w.s $f18, $f16 -/* 0321C 8091385C 44189000 */ mfc1 $t8, $f18 +/* 03210 80913850 46803220 */ cvt.s.w $f8, $f6 +/* 03214 80913854 460A4400 */ add.s $f16, $f8, $f10 +/* 03218 80913858 4600848D */ trunc.w.s $f18, $f16 +/* 0321C 8091385C 44189000 */ mfc1 $t8, $f18 /* 03220 80913860 00000000 */ nop /* 03224 80913864 A65801B4 */ sh $t8, 0x01B4($s2) ## 000001B4 -/* 03228 80913868 10000002 */ beq $zero, $zero, .L80913874 +/* 03228 80913868 10000002 */ beq $zero, $zero, .L80913874 /* 0322C 8091386C A4390AFA */ sh $t9, 0x0AFA($at) ## 00010AFA .L80913870: /* 03230 80913870 A64801B4 */ sh $t0, 0x01B4($s2) ## 000001B4 @@ -784,140 +784,140 @@ glabel L8091352C /* 03238 80913878 864201B2 */ lh $v0, 0x01B2($s2) ## 000001B2 .L8091387C: /* 0323C 8091387C 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 03240 80913880 A7A2006E */ sh $v0, 0x006E($sp) +/* 03240 80913880 A7A2006E */ sh $v0, 0x006E($sp) /* 03244 80913884 24490001 */ addiu $t1, $v0, 0x0001 ## $t1 = 00000001 /* 03248 80913888 A64901B2 */ sh $t1, 0x01B2($s2) ## 000001B2 /* 0324C 8091388C 864A01B2 */ lh $t2, 0x01B2($s2) ## 000001B2 -/* 03250 80913890 0141001A */ div $zero, $t2, $at +/* 03250 80913890 0141001A */ div $zero, $t2, $at /* 03254 80913894 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 03258 80913898 00005810 */ mfhi $t3 +/* 03258 80913898 00005810 */ mfhi $t3 /* 0325C 8091389C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 03260 809138A0 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 03264 809138A4 A64B01B2 */ sh $t3, 0x01B2($s2) ## 000001B2 -/* 03268 809138A8 87AC006E */ lh $t4, 0x006E($sp) +/* 03268 809138A8 87AC006E */ lh $t4, 0x006E($sp) /* 0326C 809138AC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 03270 809138B0 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 03274 809138B4 000C6880 */ sll $t5, $t4, 2 -/* 03278 809138B8 01AC6823 */ subu $t5, $t5, $t4 -/* 0327C 809138BC 000D6880 */ sll $t5, $t5, 2 -/* 03280 809138C0 024D8021 */ addu $s0, $s2, $t5 +/* 03274 809138B4 000C6880 */ sll $t5, $t4, 2 +/* 03278 809138B8 01AC6823 */ subu $t5, $t5, $t4 +/* 0327C 809138BC 000D6880 */ sll $t5, $t5, 2 +/* 03280 809138C0 024D8021 */ addu $s0, $s2, $t5 /* 03284 809138C4 C6040218 */ lwc1 $f4, 0x0218($s0) ## 06000F9C -/* 03288 809138C8 46040180 */ add.s $f6, $f0, $f4 +/* 03288 809138C8 46040180 */ add.s $f6, $f0, $f4 /* 0328C 809138CC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 03290 809138D0 E7A60094 */ swc1 $f6, 0x0094($sp) + +/* 03290 809138D0 E7A60094 */ swc1 $f6, 0x0094($sp) /* 03294 809138D4 C608021C */ lwc1 $f8, 0x021C($s0) ## 06000FA0 /* 03298 809138D8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0329C 809138DC 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 032A0 809138E0 46080280 */ add.s $f10, $f0, $f8 +/* 032A0 809138E0 46080280 */ add.s $f10, $f0, $f8 /* 032A4 809138E4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 032A8 809138E8 E7AA0098 */ swc1 $f10, 0x0098($sp) + +/* 032A8 809138E8 E7AA0098 */ swc1 $f10, 0x0098($sp) /* 032AC 809138EC C6100220 */ lwc1 $f16, 0x0220($s0) ## 06000FA4 /* 032B0 809138F0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 032B4 809138F4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 032B8 809138F8 46100480 */ add.s $f18, $f0, $f16 -/* 032BC 809138FC E7A40080 */ swc1 $f4, 0x0080($sp) -/* 032C0 80913900 1661001F */ bne $s3, $at, .L80913980 -/* 032C4 80913904 E7B2009C */ swc1 $f18, 0x009C($sp) +/* 032B8 809138F8 46100480 */ add.s $f18, $f0, $f16 +/* 032BC 809138FC E7A40080 */ swc1 $f4, 0x0080($sp) +/* 032C0 80913900 1661001F */ bne $s3, $at, .L80913980 +/* 032C4 80913904 E7B2009C */ swc1 $f18, 0x009C($sp) /* 032C8 80913908 3C018091 */ lui $at, %hi(D_809154AC) ## $at = 80910000 -/* 032CC 8091390C C42654AC */ lwc1 $f6, %lo(D_809154AC)($at) +/* 032CC 8091390C C42654AC */ lwc1 $f6, %lo(D_809154AC)($at) /* 032D0 80913910 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 032D4 80913914 44814000 */ mtc1 $at, $f8 ## $f8 = 14.00 -/* 032D8 80913918 C7AA0094 */ lwc1 $f10, 0x0094($sp) +/* 032D8 80913918 C7AA0094 */ lwc1 $f10, 0x0094($sp) /* 032DC 8091391C 3C018091 */ lui $at, %hi(D_809154B0) ## $at = 80910000 -/* 032E0 80913920 C43054B0 */ lwc1 $f16, %lo(D_809154B0)($at) -/* 032E4 80913924 460A4001 */ sub.s $f0, $f8, $f10 +/* 032E0 80913920 C43054B0 */ lwc1 $f16, %lo(D_809154B0)($at) +/* 032E4 80913924 460A4001 */ sub.s $f0, $f8, $f10 /* 032E8 80913928 3C018091 */ lui $at, %hi(D_809154B4) ## $at = 80910000 -/* 032EC 8091392C E7A60080 */ swc1 $f6, 0x0080($sp) -/* 032F0 80913930 C7A6009C */ lwc1 $f6, 0x009C($sp) -/* 032F4 80913934 C42454B4 */ lwc1 $f4, %lo(D_809154B4)($at) -/* 032F8 80913938 46100482 */ mul.s $f18, $f0, $f16 +/* 032EC 8091392C E7A60080 */ swc1 $f6, 0x0080($sp) +/* 032F0 80913930 C7A6009C */ lwc1 $f6, 0x009C($sp) +/* 032F4 80913934 C42454B4 */ lwc1 $f4, %lo(D_809154B4)($at) +/* 032F8 80913938 46100482 */ mul.s $f18, $f0, $f16 /* 032FC 8091393C 3C018091 */ lui $at, %hi(D_809154B8) ## $at = 80910000 -/* 03300 80913940 46062081 */ sub.s $f2, $f4, $f6 -/* 03304 80913944 C42854B8 */ lwc1 $f8, %lo(D_809154B8)($at) +/* 03300 80913940 46062081 */ sub.s $f2, $f4, $f6 +/* 03304 80913944 C42854B8 */ lwc1 $f8, %lo(D_809154B8)($at) /* 03308 80913948 3C018091 */ lui $at, %hi(D_809154BC) ## $at = 80910000 -/* 0330C 8091394C C43054BC */ lwc1 $f16, %lo(D_809154BC)($at) -/* 03310 80913950 46081282 */ mul.s $f10, $f2, $f8 +/* 0330C 8091394C C43054BC */ lwc1 $f16, %lo(D_809154BC)($at) +/* 03310 80913950 46081282 */ mul.s $f10, $f2, $f8 /* 03314 80913954 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 03318 80913958 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 0331C 8091395C E7B2007C */ swc1 $f18, 0x007C($sp) +/* 0331C 8091395C E7B2007C */ swc1 $f18, 0x007C($sp) /* 03320 80913960 3C018091 */ lui $at, %hi(D_809154C0) ## $at = 80910000 -/* 03324 80913964 46100482 */ mul.s $f18, $f0, $f16 -/* 03328 80913968 C42654C0 */ lwc1 $f6, %lo(D_809154C0)($at) -/* 0332C 8091396C E7AA0084 */ swc1 $f10, 0x0084($sp) -/* 03330 80913970 E7A40074 */ swc1 $f4, 0x0074($sp) -/* 03334 80913974 46061202 */ mul.s $f8, $f2, $f6 -/* 03338 80913978 E7B20070 */ swc1 $f18, 0x0070($sp) -/* 0333C 8091397C E7A80078 */ swc1 $f8, 0x0078($sp) +/* 03324 80913964 46100482 */ mul.s $f18, $f0, $f16 +/* 03328 80913968 C42654C0 */ lwc1 $f6, %lo(D_809154C0)($at) +/* 0332C 8091396C E7AA0084 */ swc1 $f10, 0x0084($sp) +/* 03330 80913970 E7A40074 */ swc1 $f4, 0x0074($sp) +/* 03334 80913974 46061202 */ mul.s $f8, $f2, $f6 +/* 03338 80913978 E7B20070 */ swc1 $f18, 0x0070($sp) +/* 0333C 8091397C E7A80078 */ swc1 $f8, 0x0078($sp) .L80913980: /* 03340 80913980 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 03344 80913984 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 03348 80913988 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0334C 8091398C 00000000 */ nop -/* 03350 80913990 4600028D */ trunc.w.s $f10, $f0 -/* 03354 80913994 93A900BE */ lbu $t1, 0x00BE($sp) +/* 03350 80913990 4600028D */ trunc.w.s $f10, $f0 +/* 03354 80913994 93A900BE */ lbu $t1, 0x00BE($sp) /* 03358 80913998 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 0335C 8091399C 27A50094 */ addiu $a1, $sp, 0x0094 ## $a1 = FFFFFFD4 -/* 03360 809139A0 440F5000 */ mfc1 $t7, $f10 +/* 03360 809139A0 440F5000 */ mfc1 $t7, $f10 /* 03364 809139A4 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFC8 /* 03368 809139A8 27A7007C */ addiu $a3, $sp, 0x007C ## $a3 = FFFFFFBC -/* 0336C 809139AC 000FC400 */ sll $t8, $t7, 16 -/* 03370 809139B0 0018CC03 */ sra $t9, $t8, 16 +/* 0336C 809139AC 000FC400 */ sll $t8, $t7, 16 +/* 03370 809139B0 0018CC03 */ sra $t9, $t8, 16 /* 03374 809139B4 2728000F */ addiu $t0, $t9, 0x000F ## $t0 = 0000000F -/* 03378 809139B8 AFA80010 */ sw $t0, 0x0010($sp) -/* 0337C 809139BC 0C00A76F */ jal func_80029DBC -/* 03380 809139C0 AFA90014 */ sw $t1, 0x0014($sp) +/* 03378 809139B8 AFA80010 */ sw $t0, 0x0010($sp) +/* 0337C 809139BC 0C00A76F */ jal func_80029DBC +/* 03380 809139C0 AFA90014 */ sw $t1, 0x0014($sp) /* 03384 809139C4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 03388 809139C8 00000000 */ nop /* 0338C 809139CC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 03390 809139D0 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 /* 03394 809139D4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03398 809139D8 4610003C */ c.lt.s $f0, $f16 +/* 03398 809139D8 4610003C */ c.lt.s $f0, $f16 /* 0339C 809139DC 00000000 */ nop -/* 033A0 809139E0 45030003 */ bc1tl .L809139F0 +/* 033A0 809139E0 45030003 */ bc1tl .L809139F0 /* 033A4 809139E4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 033A8 809139E8 16610015 */ bne $s3, $at, .L80913A40 +/* 033A8 809139E8 16610015 */ bne $s3, $at, .L80913A40 /* 033AC 809139EC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 .L809139F0: /* 033B0 809139F0 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 /* 033B4 809139F4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 033B8 809139F8 00000000 */ nop -/* 033BC 809139FC 4600048D */ trunc.w.s $f18, $f0 +/* 033BC 809139FC 4600048D */ trunc.w.s $f18, $f0 /* 033C0 80913A00 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF /* 033C4 80913A04 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 033C8 80913A08 AFB8001C */ sw $t8, 0x001C($sp) -/* 033CC 80913A0C 440B9000 */ mfc1 $t3, $f18 -/* 033D0 80913A10 AFAF0018 */ sw $t7, 0x0018($sp) +/* 033C8 80913A08 AFB8001C */ sw $t8, 0x001C($sp) +/* 033CC 80913A0C 440B9000 */ mfc1 $t3, $f18 +/* 033D0 80913A10 AFAF0018 */ sw $t7, 0x0018($sp) /* 033D4 80913A14 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 033D8 80913A18 000B6400 */ sll $t4, $t3, 16 -/* 033DC 80913A1C 000C6C03 */ sra $t5, $t4, 16 +/* 033D8 80913A18 000B6400 */ sll $t4, $t3, 16 +/* 033DC 80913A1C 000C6C03 */ sra $t5, $t4, 16 /* 033E0 80913A20 25AE0007 */ addiu $t6, $t5, 0x0007 ## $t6 = 00000007 -/* 033E4 80913A24 AFAE0014 */ sw $t6, 0x0014($sp) +/* 033E4 80913A24 AFAE0014 */ sw $t6, 0x0014($sp) /* 033E8 80913A28 27A50094 */ addiu $a1, $sp, 0x0094 ## $a1 = FFFFFFD4 /* 033EC 80913A2C 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFC8 /* 033F0 80913A30 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFB0 -/* 033F4 80913A34 AFA00010 */ sw $zero, 0x0010($sp) -/* 033F8 80913A38 0C00A5C9 */ jal func_80029724 -/* 033FC 80913A3C AFA00020 */ sw $zero, 0x0020($sp) +/* 033F4 80913A34 AFA00010 */ sw $zero, 0x0010($sp) +/* 033F8 80913A38 0C00A5C9 */ jal func_80029724 +/* 033FC 80913A3C AFA00020 */ sw $zero, 0x0020($sp) .L80913A40: /* 03400 80913A40 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 03404 80913A44 00118C00 */ sll $s1, $s1, 16 -/* 03408 80913A48 00118C03 */ sra $s1, $s1, 16 -/* 0340C 80913A4C 5A20FF8B */ blezl $s1, .L8091387C +/* 03404 80913A44 00118C00 */ sll $s1, $s1, 16 +/* 03408 80913A48 00118C03 */ sra $s1, $s1, 16 +/* 0340C 80913A4C 5A20FF8B */ blezl $s1, .L8091387C /* 03410 80913A50 864201B2 */ lh $v0, 0x01B2($s2) ## 000001B2 -/* 03414 80913A54 10000008 */ beq $zero, $zero, .L80913A78 +/* 03414 80913A54 10000008 */ beq $zero, $zero, .L80913A78 /* 03418 80913A58 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80913A5C: /* 0341C 80913A5C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03420 80913A60 00340821 */ addu $at, $at, $s4 +/* 03420 80913A60 00340821 */ addu $at, $at, $s4 /* 03424 80913A64 A0200AE3 */ sb $zero, 0x0AE3($at) ## 00010AE3 /* 03428 80913A68 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0342C 80913A6C 00340821 */ addu $at, $at, $s4 +/* 0342C 80913A6C 00340821 */ addu $at, $at, $s4 /* 03430 80913A70 A4390AFA */ sh $t9, 0x0AFA($at) ## 00010AFA /* 03434 80913A74 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80913A78: @@ -927,133 +927,133 @@ glabel L8091352C /* 03444 80913A84 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 03448 80913A88 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80913A8C: -/* 0344C 80913A8C 14530005 */ bne $v0, $s3, .L80913AA4 +/* 0344C 80913A8C 14530005 */ bne $v0, $s3, .L80913AA4 /* 03450 80913A90 864501AE */ lh $a1, 0x01AE($s2) ## 000001AE -/* 03454 80913A94 0C2441E1 */ jal func_80910784 +/* 03454 80913A94 0C2441E1 */ jal func_80910784 /* 03458 80913A98 02002025 */ or $a0, $s0, $zero ## $a0 = 80914E28 -/* 0345C 80913A9C 1000000C */ beq $zero, $zero, .L80913AD0 +/* 0345C 80913A9C 1000000C */ beq $zero, $zero, .L80913AD0 /* 03460 80913AA0 864501AE */ lh $a1, 0x01AE($s2) ## 000001AE .L80913AA4: /* 03464 80913AA4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03468 80913AA8 16610006 */ bne $s3, $at, .L80913AC4 +/* 03468 80913AA8 16610006 */ bne $s3, $at, .L80913AC4 /* 0346C 80913AAC 3C048091 */ lui $a0, %hi(D_80914F28) ## $a0 = 80910000 /* 03470 80913AB0 3C048091 */ lui $a0, %hi(D_80914D28) ## $a0 = 80910000 -/* 03474 80913AB4 0C2441E1 */ jal func_80910784 +/* 03474 80913AB4 0C2441E1 */ jal func_80910784 /* 03478 80913AB8 24844D28 */ addiu $a0, $a0, %lo(D_80914D28) ## $a0 = 80914D28 -/* 0347C 80913ABC 10000004 */ beq $zero, $zero, .L80913AD0 +/* 0347C 80913ABC 10000004 */ beq $zero, $zero, .L80913AD0 /* 03480 80913AC0 864501AE */ lh $a1, 0x01AE($s2) ## 000001AE .L80913AC4: -/* 03484 80913AC4 0C2441E1 */ jal func_80910784 +/* 03484 80913AC4 0C2441E1 */ jal func_80910784 /* 03488 80913AC8 24844F28 */ addiu $a0, $a0, %lo(D_80914F28) ## $a0 = 00004F28 /* 0348C 80913ACC 864501AE */ lh $a1, 0x01AE($s2) ## 000001AE .L80913AD0: /* 03490 80913AD0 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 03494 80913AD4 00118C00 */ sll $s1, $s1, 16 -/* 03498 80913AD8 28A10100 */ slti $at, $a1, 0x0100 -/* 0349C 80913ADC 10200003 */ beq $at, $zero, .L80913AEC -/* 034A0 80913AE0 00118C03 */ sra $s1, $s1, 16 +/* 03494 80913AD4 00118C00 */ sll $s1, $s1, 16 +/* 03498 80913AD8 28A10100 */ slti $at, $a1, 0x0100 +/* 0349C 80913ADC 10200003 */ beq $at, $zero, .L80913AEC +/* 034A0 80913AE0 00118C03 */ sra $s1, $s1, 16 /* 034A4 80913AE4 24A80001 */ addiu $t0, $a1, 0x0001 ## $t0 = 00000001 /* 034A8 80913AE8 A64801AE */ sh $t0, 0x01AE($s2) ## 000001AE .L80913AEC: -/* 034AC 80913AEC 2A210005 */ slti $at, $s1, 0x0005 -/* 034B0 80913AF0 5420FFE6 */ bnel $at, $zero, .L80913A8C +/* 034AC 80913AEC 2A210005 */ slti $at, $s1, 0x0005 +/* 034B0 80913AF0 5420FFE6 */ bnel $at, $zero, .L80913A8C /* 034B4 80913AF4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80913AF8: /* 034B8 80913AF8 8645035C */ lh $a1, 0x035C($s2) ## 0000035C -/* 034BC 80913AFC 50A0004E */ beql $a1, $zero, .L80913C38 -/* 034C0 80913B00 8FBF004C */ lw $ra, 0x004C($sp) -/* 034C4 80913B04 93AA00BF */ lbu $t2, 0x00BF($sp) +/* 034BC 80913AFC 50A0004E */ beql $a1, $zero, .L80913C38 +/* 034C0 80913B00 8FBF004C */ lw $ra, 0x004C($sp) +/* 034C4 80913B04 93AA00BF */ lbu $t2, 0x00BF($sp) /* 034C8 80913B08 2649036C */ addiu $t1, $s2, 0x036C ## $t1 = 0000036C -/* 034CC 80913B0C AFA90058 */ sw $t1, 0x0058($sp) -/* 034D0 80913B10 15400044 */ bne $t2, $zero, .L80913C24 +/* 034CC 80913B0C AFA90058 */ sw $t1, 0x0058($sp) +/* 034D0 80913B10 15400044 */ bne $t2, $zero, .L80913C24 /* 034D4 80913B14 26510360 */ addiu $s1, $s2, 0x0360 ## $s1 = 00000360 /* 034D8 80913B18 C6440378 */ lwc1 $f4, 0x0378($s2) ## 00000378 /* 034DC 80913B1C C64603C0 */ lwc1 $f6, 0x03C0($s2) ## 000003C0 /* 034E0 80913B20 8E450390 */ lw $a1, 0x0390($s2) ## 00000390 /* 034E4 80913B24 8E46039C */ lw $a2, 0x039C($s2) ## 0000039C -/* 034E8 80913B28 46062202 */ mul.s $f8, $f4, $f6 +/* 034E8 80913B28 46062202 */ mul.s $f8, $f4, $f6 /* 034EC 80913B2C 264B0370 */ addiu $t3, $s2, 0x0370 ## $t3 = 00000370 -/* 034F0 80913B30 AFAB0050 */ sw $t3, 0x0050($sp) +/* 034F0 80913B30 AFAB0050 */ sw $t3, 0x0050($sp) /* 034F4 80913B34 02202025 */ or $a0, $s1, $zero ## $a0 = 00000360 /* 034F8 80913B38 26500364 */ addiu $s0, $s2, 0x0364 ## $s0 = 00000364 /* 034FC 80913B3C 26530368 */ addiu $s3, $s2, 0x0368 ## $s3 = 00000368 -/* 03500 80913B40 44074000 */ mfc1 $a3, $f8 +/* 03500 80913B40 44074000 */ mfc1 $a3, $f8 /* 03504 80913B44 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03508 80913B48 00000000 */ nop /* 0350C 80913B4C C64A037C */ lwc1 $f10, 0x037C($s2) ## 0000037C /* 03510 80913B50 C65003C0 */ lwc1 $f16, 0x03C0($s2) ## 000003C0 /* 03514 80913B54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000364 /* 03518 80913B58 8E450394 */ lw $a1, 0x0394($s2) ## 00000394 -/* 0351C 80913B5C 46105482 */ mul.s $f18, $f10, $f16 +/* 0351C 80913B5C 46105482 */ mul.s $f18, $f10, $f16 /* 03520 80913B60 8E4603A0 */ lw $a2, 0x03A0($s2) ## 000003A0 -/* 03524 80913B64 44079000 */ mfc1 $a3, $f18 +/* 03524 80913B64 44079000 */ mfc1 $a3, $f18 /* 03528 80913B68 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0352C 80913B6C 00000000 */ nop /* 03530 80913B70 C6440380 */ lwc1 $f4, 0x0380($s2) ## 00000380 /* 03534 80913B74 C64603C0 */ lwc1 $f6, 0x03C0($s2) ## 000003C0 /* 03538 80913B78 02602025 */ or $a0, $s3, $zero ## $a0 = 00000368 /* 0353C 80913B7C 8E450398 */ lw $a1, 0x0398($s2) ## 00000398 -/* 03540 80913B80 46062202 */ mul.s $f8, $f4, $f6 +/* 03540 80913B80 46062202 */ mul.s $f8, $f4, $f6 /* 03544 80913B84 8E4603A4 */ lw $a2, 0x03A4($s2) ## 000003A4 -/* 03548 80913B88 44074000 */ mfc1 $a3, $f8 +/* 03548 80913B88 44074000 */ mfc1 $a3, $f8 /* 0354C 80913B8C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03550 80913B90 00000000 */ nop /* 03554 80913B94 C64A0384 */ lwc1 $f10, 0x0384($s2) ## 00000384 /* 03558 80913B98 C65003C0 */ lwc1 $f16, 0x03C0($s2) ## 000003C0 -/* 0355C 80913B9C 8FA40058 */ lw $a0, 0x0058($sp) +/* 0355C 80913B9C 8FA40058 */ lw $a0, 0x0058($sp) /* 03560 80913BA0 8E4503A8 */ lw $a1, 0x03A8($s2) ## 000003A8 -/* 03564 80913BA4 46105482 */ mul.s $f18, $f10, $f16 +/* 03564 80913BA4 46105482 */ mul.s $f18, $f10, $f16 /* 03568 80913BA8 8E4603B4 */ lw $a2, 0x03B4($s2) ## 000003B4 -/* 0356C 80913BAC 44079000 */ mfc1 $a3, $f18 +/* 0356C 80913BAC 44079000 */ mfc1 $a3, $f18 /* 03570 80913BB0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03574 80913BB4 00000000 */ nop /* 03578 80913BB8 C6440388 */ lwc1 $f4, 0x0388($s2) ## 00000388 /* 0357C 80913BBC C64603C0 */ lwc1 $f6, 0x03C0($s2) ## 000003C0 -/* 03580 80913BC0 8FA40050 */ lw $a0, 0x0050($sp) +/* 03580 80913BC0 8FA40050 */ lw $a0, 0x0050($sp) /* 03584 80913BC4 8E4503AC */ lw $a1, 0x03AC($s2) ## 000003AC -/* 03588 80913BC8 46062202 */ mul.s $f8, $f4, $f6 +/* 03588 80913BC8 46062202 */ mul.s $f8, $f4, $f6 /* 0358C 80913BCC 8E4603B8 */ lw $a2, 0x03B8($s2) ## 000003B8 -/* 03590 80913BD0 44074000 */ mfc1 $a3, $f8 +/* 03590 80913BD0 44074000 */ mfc1 $a3, $f8 /* 03594 80913BD4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03598 80913BD8 00000000 */ nop /* 0359C 80913BDC C64A038C */ lwc1 $f10, 0x038C($s2) ## 0000038C /* 035A0 80913BE0 C65003C0 */ lwc1 $f16, 0x03C0($s2) ## 000003C0 /* 035A4 80913BE4 26440374 */ addiu $a0, $s2, 0x0374 ## $a0 = 00000374 /* 035A8 80913BE8 8E4503B0 */ lw $a1, 0x03B0($s2) ## 000003B0 -/* 035AC 80913BEC 46105482 */ mul.s $f18, $f10, $f16 +/* 035AC 80913BEC 46105482 */ mul.s $f18, $f10, $f16 /* 035B0 80913BF0 8E4603BC */ lw $a2, 0x03BC($s2) ## 000003BC -/* 035B4 80913BF4 44079000 */ mfc1 $a3, $f18 +/* 035B4 80913BF4 44079000 */ mfc1 $a3, $f18 /* 035B8 80913BF8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 035BC 80913BFC 00000000 */ nop /* 035C0 80913C00 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 035C4 80913C04 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 035C8 80913C08 264403C0 */ addiu $a0, $s2, 0x03C0 ## $a0 = 000003C0 /* 035CC 80913C0C 8E4703C4 */ lw $a3, 0x03C4($s2) ## 000003C4 -/* 035D0 80913C10 44050000 */ mfc1 $a1, $f0 -/* 035D4 80913C14 44060000 */ mfc1 $a2, $f0 +/* 035D0 80913C10 44050000 */ mfc1 $a1, $f0 +/* 035D4 80913C14 44060000 */ mfc1 $a2, $f0 /* 035D8 80913C18 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 035DC 80913C1C 00000000 */ nop /* 035E0 80913C20 8645035C */ lh $a1, 0x035C($s2) ## 0000035C .L80913C24: /* 035E4 80913C24 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 035E8 80913C28 8FA60058 */ lw $a2, 0x0058($sp) -/* 035EC 80913C2C 0C030136 */ jal func_800C04D8 +/* 035E8 80913C28 8FA60058 */ lw $a2, 0x0058($sp) +/* 035EC 80913C2C 0C030136 */ jal func_800C04D8 /* 035F0 80913C30 02203825 */ or $a3, $s1, $zero ## $a3 = 00000360 -/* 035F4 80913C34 8FBF004C */ lw $ra, 0x004C($sp) +/* 035F4 80913C34 8FBF004C */ lw $ra, 0x004C($sp) .L80913C38: -/* 035F8 80913C38 8FB00038 */ lw $s0, 0x0038($sp) -/* 035FC 80913C3C 8FB1003C */ lw $s1, 0x003C($sp) -/* 03600 80913C40 8FB20040 */ lw $s2, 0x0040($sp) -/* 03604 80913C44 8FB30044 */ lw $s3, 0x0044($sp) -/* 03608 80913C48 8FB40048 */ lw $s4, 0x0048($sp) -/* 0360C 80913C4C 03E00008 */ jr $ra +/* 035F8 80913C38 8FB00038 */ lw $s0, 0x0038($sp) +/* 035FC 80913C3C 8FB1003C */ lw $s1, 0x003C($sp) +/* 03600 80913C40 8FB20040 */ lw $s2, 0x0040($sp) +/* 03604 80913C44 8FB30044 */ lw $s3, 0x0044($sp) +/* 03608 80913C48 8FB40048 */ lw $s4, 0x0048($sp) +/* 0360C 80913C4C 03E00008 */ jr $ra /* 03610 80913C50 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s index 2227f5be38..e445454646 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s @@ -1,17 +1,17 @@ glabel BossGoma_Destroy /* 004F0 80915F00 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004F4 80915F04 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004F8 80915F08 AFA40018 */ sw $a0, 0x0018($sp) -/* 004FC 80915F0C AFA5001C */ sw $a1, 0x001C($sp) -/* 00500 80915F10 0C0295BC */ jal func_800A56F0 +/* 004F4 80915F04 AFBF0014 */ sw $ra, 0x0014($sp) +/* 004F8 80915F08 AFA40018 */ sw $a0, 0x0018($sp) +/* 004FC 80915F0C AFA5001C */ sw $a1, 0x001C($sp) +/* 00500 80915F10 0C0295BC */ jal SkelAnime_Free /* 00504 80915F14 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00508 80915F18 8FA50018 */ lw $a1, 0x0018($sp) -/* 0050C 80915F1C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00510 80915F20 0C016F32 */ jal func_8005BCC8 +/* 00508 80915F18 8FA50018 */ lw $a1, 0x0018($sp) +/* 0050C 80915F1C 8FA4001C */ lw $a0, 0x001C($sp) +/* 00510 80915F20 0C016F32 */ jal func_8005BCC8 /* 00514 80915F24 24A507BC */ addiu $a1, $a1, 0x07BC ## $a1 = 000007BC -/* 00518 80915F28 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00518 80915F28 8FBF0014 */ lw $ra, 0x0014($sp) /* 0051C 80915F2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00520 80915F30 03E00008 */ jr $ra +/* 00520 80915F30 03E00008 */ jr $ra /* 00524 80915F34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s index 07ec2bbfd7..fed9134134 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s @@ -1,37 +1,37 @@ glabel BossGoma_Init /* 00234 80915C44 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00238 80915C48 AFB10038 */ sw $s1, 0x0038($sp) +/* 00238 80915C48 AFB10038 */ sw $s1, 0x0038($sp) /* 0023C 80915C4C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00240 80915C50 AFBF003C */ sw $ra, 0x003C($sp) -/* 00244 80915C54 AFB00034 */ sw $s0, 0x0034($sp) +/* 00240 80915C50 AFBF003C */ sw $ra, 0x003C($sp) +/* 00244 80915C54 AFB00034 */ sw $s0, 0x0034($sp) /* 00248 80915C58 3C058092 */ lui $a1, %hi(D_8091B2A8) ## $a1 = 80920000 /* 0024C 80915C5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00250 80915C60 0C01E037 */ jal Actor_ProcessInitChain - + /* 00254 80915C64 24A5B2A8 */ addiu $a1, $a1, %lo(D_8091B2A8) ## $a1 = 8091B2A8 /* 00258 80915C68 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0025C 80915C6C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00260 80915C70 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00264 80915C74 3C05457A */ lui $a1, 0x457A ## $a1 = 457A0000 /* 00268 80915C78 0C00AC78 */ jal ActorShape_Init - + /* 0026C 80915C7C 3C074316 */ lui $a3, 0x4316 ## $a3 = 43160000 /* 00270 80915C80 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00274 80915C84 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 00278 80915C88 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 0027C 80915C8C 24E72678 */ addiu $a3, $a3, 0x2678 ## $a3 = 06012678 /* 00280 80915C90 24C6DCF8 */ addiu $a2, $a2, 0xDCF8 ## $a2 = 0601DCF8 -/* 00284 80915C94 AFA50044 */ sw $a1, 0x0044($sp) +/* 00284 80915C94 AFA50044 */ sw $a1, 0x0044($sp) /* 00288 80915C98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0028C 80915C9C AFA00010 */ sw $zero, 0x0010($sp) -/* 00290 80915CA0 AFA00014 */ sw $zero, 0x0014($sp) +/* 0028C 80915C9C AFA00010 */ sw $zero, 0x0010($sp) +/* 00290 80915CA0 AFA00014 */ sw $zero, 0x0014($sp) /* 00294 80915CA4 0C02915F */ jal SkelAnime_Init - -/* 00298 80915CA8 AFA00018 */ sw $zero, 0x0018($sp) + +/* 00298 80915CA8 AFA00018 */ sw $zero, 0x0018($sp) /* 0029C 80915CAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 002A0 80915CB0 24A52678 */ addiu $a1, $a1, 0x2678 ## $a1 = 06012678 -/* 002A4 80915CB4 0C0294BE */ jal func_800A52F8 -/* 002A8 80915CB8 8FA40044 */ lw $a0, 0x0044($sp) +/* 002A4 80915CB4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 002A8 80915CB8 8FA40044 */ lw $a0, 0x0044($sp) /* 002AC 80915CBC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 002B0 80915CC0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 002B4 80915CC4 3C01C396 */ lui $at, 0xC396 ## $at = C3960000 @@ -48,73 +48,73 @@ glabel BossGoma_Init /* 002E0 80915CF0 E60401FC */ swc1 $f4, 0x01FC($s0) ## 000001FC /* 002E4 80915CF4 E6060200 */ swc1 $f6, 0x0200($s0) ## 00000200 /* 002E8 80915CF8 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 002EC 80915CFC 0C245800 */ jal func_80916000 +/* 002EC 80915CFC 0C245800 */ jal func_80916000 /* 002F0 80915D00 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 002F4 80915D04 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 002F8 80915D08 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF /* 002FC 80915D0C A20F00AF */ sb $t7, 0x00AF($s0) ## 000000AF /* 00300 80915D10 A21800AE */ sb $t8, 0x00AE($s0) ## 000000AE /* 00304 80915D14 260507BC */ addiu $a1, $s0, 0x07BC ## $a1 = 000007BC -/* 00308 80915D18 AFA50044 */ sw $a1, 0x0044($sp) -/* 0030C 80915D1C 0C016EFE */ jal func_8005BBF8 +/* 00308 80915D18 AFA50044 */ sw $a1, 0x0044($sp) +/* 0030C 80915D1C 0C016EFE */ jal func_8005BBF8 /* 00310 80915D20 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00314 80915D24 3C078092 */ lui $a3, %hi(D_8091B034) ## $a3 = 80920000 /* 00318 80915D28 261907DC */ addiu $t9, $s0, 0x07DC ## $t9 = 000007DC -/* 0031C 80915D2C 8FA50044 */ lw $a1, 0x0044($sp) -/* 00320 80915D30 AFB90010 */ sw $t9, 0x0010($sp) +/* 0031C 80915D2C 8FA50044 */ lw $a1, 0x0044($sp) +/* 00320 80915D30 AFB90010 */ sw $t9, 0x0010($sp) /* 00324 80915D34 24E7B034 */ addiu $a3, $a3, %lo(D_8091B034) ## $a3 = 8091B034 /* 00328 80915D38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0032C 80915D3C 0C017014 */ jal func_8005C050 +/* 0032C 80915D3C 0C017014 */ jal func_8005C050 /* 00330 80915D40 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00334 80915D44 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 00338 80915D48 00B12821 */ addu $a1, $a1, $s1 +/* 00338 80915D48 00B12821 */ addu $a1, $a1, $s1 /* 0033C 80915D4C 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC /* 00340 80915D50 0C00B337 */ jal Flags_GetClear - + /* 00344 80915D54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00348 80915D58 50400023 */ beql $v0, $zero, .L80915DE8 -/* 0034C 80915D5C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00348 80915D58 50400023 */ beql $v0, $zero, .L80915DE8 +/* 0034C 80915D5C 8FBF003C */ lw $ra, 0x003C($sp) /* 00350 80915D60 0C00B55C */ jal Actor_Kill - + /* 00354 80915D64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00358 80915D68 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0035C 80915D6C 3C01C420 */ lui $at, 0xC420 ## $at = C4200000 /* 00360 80915D70 44818000 */ mtc1 $at, $f16 ## $f16 = -640.00 /* 00364 80915D74 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00368 80915D78 AFA40044 */ sw $a0, 0x0044($sp) +/* 00368 80915D78 AFA40044 */ sw $a0, 0x0044($sp) /* 0036C 80915D7C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00370 80915D80 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00374 80915D84 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 00378 80915D88 AFA0001C */ sw $zero, 0x001C($sp) -/* 0037C 80915D8C AFA00020 */ sw $zero, 0x0020($sp) -/* 00380 80915D90 AFA00024 */ sw $zero, 0x0024($sp) -/* 00384 80915D94 AFA00028 */ sw $zero, 0x0028($sp) -/* 00388 80915D98 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0038C 80915D9C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00378 80915D88 AFA0001C */ sw $zero, 0x001C($sp) +/* 0037C 80915D8C AFA00020 */ sw $zero, 0x0020($sp) +/* 00380 80915D90 AFA00024 */ sw $zero, 0x0024($sp) +/* 00384 80915D94 AFA00028 */ sw $zero, 0x0028($sp) +/* 00388 80915D98 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 0038C 80915D9C E7A00018 */ swc1 $f0, 0x0018($sp) /* 00390 80915DA0 0C00C916 */ jal Actor_SpawnAttached - -/* 00394 80915DA4 E7B00014 */ swc1 $f16, 0x0014($sp) + +/* 00394 80915DA4 E7B00014 */ swc1 $f16, 0x0014($sp) /* 00398 80915DA8 3C01C420 */ lui $at, 0xC420 ## $at = C4200000 /* 0039C 80915DAC 44819000 */ mtc1 $at, $f18 ## $f18 = -640.00 /* 003A0 80915DB0 3C01C2A8 */ lui $at, 0xC2A8 ## $at = C2A80000 /* 003A4 80915DB4 44812000 */ mtc1 $at, $f4 ## $f4 = -84.00 -/* 003A8 80915DB8 8FA40044 */ lw $a0, 0x0044($sp) +/* 003A8 80915DB8 8FA40044 */ lw $a0, 0x0044($sp) /* 003AC 80915DBC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 003B0 80915DC0 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F /* 003B4 80915DC4 3C07430D */ lui $a3, 0x430D ## $a3 = 430D0000 -/* 003B8 80915DC8 AFA00018 */ sw $zero, 0x0018($sp) -/* 003BC 80915DCC AFA0001C */ sw $zero, 0x001C($sp) -/* 003C0 80915DD0 AFA00020 */ sw $zero, 0x0020($sp) -/* 003C4 80915DD4 AFA00024 */ sw $zero, 0x0024($sp) -/* 003C8 80915DD8 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 003B8 80915DC8 AFA00018 */ sw $zero, 0x0018($sp) +/* 003BC 80915DCC AFA0001C */ sw $zero, 0x001C($sp) +/* 003C0 80915DD0 AFA00020 */ sw $zero, 0x0020($sp) +/* 003C4 80915DD4 AFA00024 */ sw $zero, 0x0024($sp) +/* 003C8 80915DD8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 003CC 80915DDC 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 003D0 80915DE0 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 003D4 80915DE4 8FBF003C */ lw $ra, 0x003C($sp) +/* 003D0 80915DE0 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 003D4 80915DE4 8FBF003C */ lw $ra, 0x003C($sp) .L80915DE8: -/* 003D8 80915DE8 8FB00034 */ lw $s0, 0x0034($sp) -/* 003DC 80915DEC 8FB10038 */ lw $s1, 0x0038($sp) -/* 003E0 80915DF0 03E00008 */ jr $ra +/* 003D8 80915DE8 8FB00034 */ lw $s0, 0x0034($sp) +/* 003DC 80915DEC 8FB10038 */ lw $s1, 0x0038($sp) +/* 003E0 80915DF0 03E00008 */ jr $ra /* 003E4 80915DF4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s index 667417cd42..8d0fa18c79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s @@ -1,28 +1,28 @@ glabel BossSst_Draw /* 08098 80934668 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 -/* 0809C 8093466C AFBF005C */ sw $ra, 0x005C($sp) -/* 080A0 80934670 AFBE0058 */ sw $s8, 0x0058($sp) -/* 080A4 80934674 AFB70054 */ sw $s7, 0x0054($sp) -/* 080A8 80934678 AFB60050 */ sw $s6, 0x0050($sp) -/* 080AC 8093467C AFB5004C */ sw $s5, 0x004C($sp) -/* 080B0 80934680 AFB40048 */ sw $s4, 0x0048($sp) -/* 080B4 80934684 AFB30044 */ sw $s3, 0x0044($sp) -/* 080B8 80934688 AFB20040 */ sw $s2, 0x0040($sp) -/* 080BC 8093468C AFB1003C */ sw $s1, 0x003C($sp) -/* 080C0 80934690 AFB00038 */ sw $s0, 0x0038($sp) -/* 080C4 80934694 F7B60030 */ sdc1 $f22, 0x0030($sp) -/* 080C8 80934698 F7B40028 */ sdc1 $f20, 0x0028($sp) -/* 080CC 8093469C AFA500CC */ sw $a1, 0x00CC($sp) +/* 0809C 8093466C AFBF005C */ sw $ra, 0x005C($sp) +/* 080A0 80934670 AFBE0058 */ sw $s8, 0x0058($sp) +/* 080A4 80934674 AFB70054 */ sw $s7, 0x0054($sp) +/* 080A8 80934678 AFB60050 */ sw $s6, 0x0050($sp) +/* 080AC 8093467C AFB5004C */ sw $s5, 0x004C($sp) +/* 080B0 80934680 AFB40048 */ sw $s4, 0x0048($sp) +/* 080B4 80934684 AFB30044 */ sw $s3, 0x0044($sp) +/* 080B8 80934688 AFB20040 */ sw $s2, 0x0040($sp) +/* 080BC 8093468C AFB1003C */ sw $s1, 0x003C($sp) +/* 080C0 80934690 AFB00038 */ sw $s0, 0x0038($sp) +/* 080C4 80934694 F7B60030 */ sdc1 $f22, 0x0030($sp) +/* 080C8 80934698 F7B40028 */ sdc1 $f20, 0x0028($sp) +/* 080CC 8093469C AFA500CC */ sw $a1, 0x00CC($sp) /* 080D0 809346A0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 080D4 809346A4 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 /* 080D8 809346A8 3C068093 */ lui $a2, %hi(D_809378F0) ## $a2 = 80930000 /* 080DC 809346AC 24C678F0 */ addiu $a2, $a2, %lo(D_809378F0) ## $a2 = 809378F0 /* 080E0 809346B0 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE8 /* 080E4 809346B4 240719A3 */ addiu $a3, $zero, 0x19A3 ## $a3 = 000019A3 -/* 080E8 809346B8 0C031AB1 */ jal func_800C6AC4 +/* 080E8 809346B8 0C031AB1 */ jal func_800C6AC4 /* 080EC 809346BC 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 080F0 809346C0 8FAF00CC */ lw $t7, 0x00CC($sp) -/* 080F4 809346C4 0C024F46 */ jal func_80093D18 +/* 080F0 809346C0 8FAF00CC */ lw $t7, 0x00CC($sp) +/* 080F4 809346C4 0C024F46 */ jal func_80093D18 /* 080F8 809346C8 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 080FC 809346CC 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 /* 08100 809346D0 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 @@ -35,18 +35,18 @@ glabel BossSst_Draw /* 0811C 809346EC 908C0001 */ lbu $t4, 0x0001($a0) ## 80937465 /* 08120 809346F0 90890000 */ lbu $t1, 0x0000($a0) ## 80937464 /* 08124 809346F4 90980002 */ lbu $t8, 0x0002($a0) ## 80937466 -/* 08128 809346F8 000C6C00 */ sll $t5, $t4, 16 -/* 0812C 809346FC 00095600 */ sll $t2, $t1, 24 +/* 08128 809346F8 000C6C00 */ sll $t5, $t4, 16 +/* 0812C 809346FC 00095600 */ sll $t2, $t1, 24 /* 08130 80934700 014D7025 */ or $t6, $t2, $t5 ## $t6 = 00000000 -/* 08134 80934704 0018CA00 */ sll $t9, $t8, 8 +/* 08134 80934704 0018CA00 */ sll $t9, $t8, 8 /* 08138 80934708 01D94025 */ or $t0, $t6, $t9 ## $t0 = FA000080 /* 0813C 8093470C 350900FF */ ori $t1, $t0, 0x00FF ## $t1 = FA0000FF /* 08140 80934710 3C0B8093 */ lui $t3, %hi(D_80937448) ## $t3 = 80930000 /* 08144 80934714 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 08148 80934718 8D6B7448 */ lw $t3, %lo(D_80937448)($t3) +/* 08148 80934718 8D6B7448 */ lw $t3, %lo(D_80937448)($t3) /* 0814C 8093471C 3C048093 */ lui $a0, %hi(D_80937468) ## $a0 = 80930000 /* 08150 80934720 24847468 */ addiu $a0, $a0, %lo(D_80937468) ## $a0 = 80937468 -/* 08154 80934724 1560000B */ bne $t3, $zero, .L80934754 +/* 08154 80934724 1560000B */ bne $t3, $zero, .L80934754 /* 08158 80934728 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 /* 0815C 8093472C 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 /* 08160 80934730 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 @@ -56,7 +56,7 @@ glabel BossSst_Draw /* 08170 80934740 25AD6290 */ addiu $t5, $t5, 0x6290 ## $t5 = 80116290 /* 08174 80934744 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 /* 08178 80934748 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0817C 8093474C 10000017 */ beq $zero, $zero, .L809347AC +/* 0817C 8093474C 10000017 */ beq $zero, $zero, .L809347AC /* 08180 80934750 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L80934754: /* 08184 80934754 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 @@ -68,10 +68,10 @@ glabel BossSst_Draw /* 0819C 8093476C 908B0001 */ lbu $t3, 0x0001($a0) ## 80937469 /* 081A0 80934770 90990000 */ lbu $t9, 0x0000($a0) ## 80937468 /* 081A4 80934774 908F0002 */ lbu $t7, 0x0002($a0) ## 8093746A -/* 081A8 80934778 000B6400 */ sll $t4, $t3, 16 -/* 081AC 8093477C 00194600 */ sll $t0, $t9, 24 +/* 081A8 80934778 000B6400 */ sll $t4, $t3, 16 +/* 081AC 8093477C 00194600 */ sll $t0, $t9, 24 /* 081B0 80934780 010C5025 */ or $t2, $t0, $t4 ## $t2 = FA000088 -/* 081B4 80934784 000FC200 */ sll $t8, $t7, 8 +/* 081B4 80934784 000FC200 */ sll $t8, $t7, 8 /* 081B8 80934788 01587025 */ or $t6, $t2, $t8 ## $t6 = FB000088 /* 081BC 8093478C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 081C0 80934790 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 @@ -89,100 +89,100 @@ glabel BossSst_Draw /* 081EC 809347BC 3C0C8093 */ lui $t4, %hi(func_809345F0) ## $t4 = 80930000 /* 081F0 809347C0 258C45F0 */ addiu $t4, $t4, %lo(func_809345F0) ## $t4 = 809345F0 /* 081F4 809347C4 250845A4 */ addiu $t0, $t0, %lo(func_809345A4) ## $t0 = 809345A4 -/* 081F8 809347C8 AFA80010 */ sw $t0, 0x0010($sp) -/* 081FC 809347CC AFAC0014 */ sw $t4, 0x0014($sp) -/* 08200 809347D0 AFB30018 */ sw $s3, 0x0018($sp) -/* 08204 809347D4 0C0286B2 */ jal func_800A1AC8 -/* 08208 809347D8 8FA400CC */ lw $a0, 0x00CC($sp) +/* 081F8 809347C8 AFA80010 */ sw $t0, 0x0010($sp) +/* 081FC 809347CC AFAC0014 */ sw $t4, 0x0014($sp) +/* 08200 809347D0 AFB30018 */ sw $s3, 0x0018($sp) +/* 08204 809347D4 0C0286B2 */ jal SkelAnime_DrawSV +/* 08208 809347D8 8FA400CC */ lw $a0, 0x00CC($sp) /* 0820C 809347DC 866D09D2 */ lh $t5, 0x09D2($s3) ## 000009D2 -/* 08210 809347E0 8FAF00CC */ lw $t7, 0x00CC($sp) -/* 08214 809347E4 29A10002 */ slti $at, $t5, 0x0002 -/* 08218 809347E8 5420007F */ bnel $at, $zero, .L809349E8 -/* 0821C 809347EC 8FA900CC */ lw $t1, 0x00CC($sp) -/* 08220 809347F0 0C024F61 */ jal func_80093D84 +/* 08210 809347E0 8FAF00CC */ lw $t7, 0x00CC($sp) +/* 08214 809347E4 29A10002 */ slti $at, $t5, 0x0002 +/* 08218 809347E8 5420007F */ bnel $at, $zero, .L809349E8 +/* 0821C 809347EC 8FA900CC */ lw $t1, 0x00CC($sp) +/* 08220 809347F0 0C024F61 */ jal func_80093D84 /* 08224 809347F4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 08228 809347F8 866A09D0 */ lh $t2, 0x09D0($s3) ## 000009D0 /* 0822C 809347FC 24030007 */ addiu $v1, $zero, 0x0007 ## $v1 = 00000007 /* 08230 80934800 2406001C */ addiu $a2, $zero, 0x001C ## $a2 = 0000001C /* 08234 80934804 25580004 */ addiu $t8, $t2, 0x0004 ## $t8 = 00000004 -/* 08238 80934808 0303001A */ div $zero, $t8, $v1 -/* 0823C 8093480C 0000A810 */ mfhi $s5 +/* 08238 80934808 0303001A */ div $zero, $t8, $v1 +/* 0823C 8093480C 0000A810 */ mfhi $s5 /* 08240 80934810 26B90002 */ addiu $t9, $s5, 0x0002 ## $t9 = 00000002 /* 08244 80934814 866209D2 */ lh $v0, 0x09D2($s3) ## 000009D2 -/* 08248 80934818 02A60019 */ multu $s5, $a2 +/* 08248 80934818 02A60019 */ multu $s5, $a2 /* 0824C 8093481C 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 08250 80934820 00021043 */ sra $v0, $v0, 1 -/* 08254 80934824 14600002 */ bne $v1, $zero, .L80934830 +/* 08250 80934820 00021043 */ sra $v0, $v0, 1 +/* 08254 80934824 14600002 */ bne $v1, $zero, .L80934830 /* 08258 80934828 00000000 */ nop /* 0825C 8093482C 0007000D */ break 7 .L80934830: /* 08260 80934830 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 08264 80934834 14610004 */ bne $v1, $at, .L80934848 +/* 08264 80934834 14610004 */ bne $v1, $at, .L80934848 /* 08268 80934838 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0826C 8093483C 17010002 */ bne $t8, $at, .L80934848 +/* 0826C 8093483C 17010002 */ bne $t8, $at, .L80934848 /* 08270 80934840 00000000 */ nop /* 08274 80934844 0006000D */ break 6 .L80934848: -/* 08278 80934848 00007012 */ mflo $t6 -/* 0827C 8093484C 026E8021 */ addu $s0, $s3, $t6 +/* 08278 80934848 00007012 */ mflo $t6 +/* 0827C 8093484C 026E8021 */ addu $s0, $s3, $t6 /* 08280 80934850 261009D4 */ addiu $s0, $s0, 0x09D4 ## $s0 = 000009D4 -/* 08284 80934854 0323001A */ div $zero, $t9, $v1 -/* 08288 80934858 00004810 */ mfhi $t1 -/* 0828C 8093485C AFB0009C */ sw $s0, 0x009C($sp) -/* 08290 80934860 14600002 */ bne $v1, $zero, .L8093486C +/* 08284 80934854 0323001A */ div $zero, $t9, $v1 +/* 08288 80934858 00004810 */ mfhi $t1 +/* 0828C 8093485C AFB0009C */ sw $s0, 0x009C($sp) +/* 08290 80934860 14600002 */ bne $v1, $zero, .L8093486C /* 08294 80934864 00000000 */ nop /* 08298 80934868 0007000D */ break 7 .L8093486C: /* 0829C 8093486C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 082A0 80934870 14610004 */ bne $v1, $at, .L80934884 +/* 082A0 80934870 14610004 */ bne $v1, $at, .L80934884 /* 082A4 80934874 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 082A8 80934878 17210002 */ bne $t9, $at, .L80934884 +/* 082A8 80934878 17210002 */ bne $t9, $at, .L80934884 /* 082AC 8093487C 00000000 */ nop /* 082B0 80934880 0006000D */ break 6 .L80934884: -/* 082B4 80934884 01260019 */ multu $t1, $a2 +/* 082B4 80934884 01260019 */ multu $t1, $a2 /* 082B8 80934888 3C014461 */ lui $at, 0x4461 ## $at = 44610000 -/* 082BC 8093488C 00005812 */ mflo $t3 -/* 082C0 80934890 026B2021 */ addu $a0, $s3, $t3 -/* 082C4 80934894 18400053 */ blez $v0, .L809349E4 +/* 082BC 8093488C 00005812 */ mflo $t3 +/* 082C0 80934890 026B2021 */ addu $a0, $s3, $t3 +/* 082C4 80934894 18400053 */ blez $v0, .L809349E4 /* 082C8 80934898 248409D4 */ addiu $a0, $a0, 0x09D4 ## $a0 = 000009D4 /* 082CC 8093489C 4481B000 */ mtc1 $at, $f22 ## $f22 = 900.00 /* 082D0 809348A0 3C018093 */ lui $at, %hi(D_80937A18) ## $at = 80930000 -/* 082D4 809348A4 C4347A18 */ lwc1 $f20, %lo(D_80937A18)($at) -/* 082D8 809348A8 AFA2008C */ sw $v0, 0x008C($sp) +/* 082D4 809348A4 C4347A18 */ lwc1 $f20, %lo(D_80937A18)($at) +/* 082D8 809348A8 AFA2008C */ sw $v0, 0x008C($sp) .L809348AC: -/* 082DC 809348AC 0C032D94 */ jal func_800CB650 +/* 082DC 809348AC 0C032D94 */ jal func_800CB650 /* 082E0 809348B0 02002825 */ or $a1, $s0, $zero ## $a1 = 000009D4 -/* 082E4 809348B4 4600B03C */ c.lt.s $f22, $f0 +/* 082E4 809348B4 4600B03C */ c.lt.s $f22, $f0 /* 082E8 809348B8 3C128093 */ lui $s2, %hi(D_809369A8) ## $s2 = 80930000 /* 082EC 809348BC 265269A8 */ addiu $s2, $s2, %lo(D_809369A8) ## $s2 = 809369A8 /* 082F0 809348C0 2607000C */ addiu $a3, $s0, 0x000C ## $a3 = 000009E0 -/* 082F4 809348C4 45000039 */ bc1f .L809349AC +/* 082F4 809348C4 45000039 */ bc1f .L809349AC /* 082F8 809348C8 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 082FC 809348CC 01111023 */ subu $v0, $t0, $s1 -/* 08300 809348D0 0002B080 */ sll $s6, $v0, 2 -/* 08304 809348D4 0002B880 */ sll $s7, $v0, 2 -/* 08308 809348D8 0002F100 */ sll $s8, $v0, 4 -/* 0830C 809348DC 03C2F023 */ subu $s8, $s8, $v0 -/* 08310 809348E0 02E2B821 */ addu $s7, $s7, $v0 -/* 08314 809348E4 02C2B021 */ addu $s6, $s6, $v0 +/* 082FC 809348CC 01111023 */ subu $v0, $t0, $s1 +/* 08300 809348D0 0002B080 */ sll $s6, $v0, 2 +/* 08304 809348D4 0002B880 */ sll $s7, $v0, 2 +/* 08308 809348D8 0002F100 */ sll $s8, $v0, 4 +/* 0830C 809348DC 03C2F023 */ subu $s8, $s8, $v0 +/* 08310 809348E0 02E2B821 */ addu $s7, $s7, $v0 +/* 08314 809348E4 02C2B021 */ addu $s6, $s6, $v0 /* 08318 809348E8 3C0C8093 */ lui $t4, %hi(func_80934628) ## $t4 = 80930000 /* 0831C 809348EC 258C4628 */ addiu $t4, $t4, %lo(func_80934628) ## $t4 = 80934628 -/* 08320 809348F0 0016B040 */ sll $s6, $s6, 1 -/* 08324 809348F4 0017B880 */ sll $s7, $s7, 2 -/* 08328 809348F8 001EF040 */ sll $s8, $s8, 1 +/* 08320 809348F0 0016B040 */ sll $s6, $s6, 1 +/* 08324 809348F4 0017B880 */ sll $s7, $s7, 2 +/* 08328 809348F8 001EF040 */ sll $s8, $s8, 1 /* 0832C 809348FC C60C0000 */ lwc1 $f12, 0x0000($s0) ## 000009D4 /* 08330 80934900 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 000009D8 /* 08334 80934904 8E060008 */ lw $a2, 0x0008($s0) ## 000009DC -/* 08338 80934908 AFAC0068 */ sw $t4, 0x0068($sp) +/* 08338 80934908 AFAC0068 */ sw $t4, 0x0068($sp) /* 0833C 8093490C 27DE0046 */ addiu $s8, $s8, 0x0046 ## $s8 = 00000046 /* 08340 80934910 26F70032 */ addiu $s7, $s7, 0x0032 ## $s7 = 00000032 -/* 08344 80934914 0C0345A5 */ jal func_800D1694 +/* 08344 80934914 0C0345A5 */ jal func_800D1694 /* 08348 80934918 26D60014 */ addiu $s6, $s6, 0x0014 ## $s6 = 00000014 -/* 0834C 8093491C 4406A000 */ mfc1 $a2, $f20 -/* 08350 80934920 4600A306 */ mov.s $f12, $f20 -/* 08354 80934924 4600A386 */ mov.s $f14, $f20 -/* 08358 80934928 0C0342A3 */ jal Matrix_Scale +/* 0834C 8093491C 4406A000 */ mfc1 $a2, $f20 +/* 08350 80934920 4600A306 */ mov.s $f12, $f20 +/* 08354 80934924 4600A386 */ mov.s $f14, $f20 +/* 08358 80934928 0C0342A3 */ jal Matrix_Scale /* 0835C 8093492C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 08360 80934930 8E8302D0 */ lw $v1, 0x02D0($s4) ## 000002D0 /* 08364 80934934 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -193,8 +193,8 @@ glabel BossSst_Draw /* 08378 80934948 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 /* 0837C 8093494C 8E8302D0 */ lw $v1, 0x02D0($s4) ## 000002D0 /* 08380 80934950 32E900FF */ andi $t1, $s7, 0x00FF ## $t1 = 00000032 -/* 08384 80934954 00095A00 */ sll $t3, $t1, 8 -/* 08388 80934958 0016CE00 */ sll $t9, $s6, 24 +/* 08384 80934954 00095A00 */ sll $t3, $t1, 8 +/* 08388 80934958 0016CE00 */ sll $t9, $s6, 24 /* 0838C 8093495C 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 08390 80934960 AE8A02D0 */ sw $t2, 0x02D0($s4) ## 000002D0 /* 08394 80934964 032B4025 */ or $t0, $t9, $t3 ## $t0 = 00000000 @@ -203,58 +203,58 @@ glabel BossSst_Draw /* 083A0 80934970 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 /* 083A4 80934974 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 083A8 80934978 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 -/* 083AC 8093497C 8FAF0068 */ lw $t7, 0x0068($sp) +/* 083AC 8093497C 8FAF0068 */ lw $t7, 0x0068($sp) /* 083B0 80934980 9267014E */ lbu $a3, 0x014E($s3) ## 0000014E /* 083B4 80934984 8E66016C */ lw $a2, 0x016C($s3) ## 0000016C /* 083B8 80934988 8E650150 */ lw $a1, 0x0150($s3) ## 00000150 -/* 083BC 8093498C AFB00018 */ sw $s0, 0x0018($sp) -/* 083C0 80934990 AFA00014 */ sw $zero, 0x0014($sp) -/* 083C4 80934994 AFAF0010 */ sw $t7, 0x0010($sp) +/* 083BC 8093498C AFB00018 */ sw $s0, 0x0018($sp) +/* 083C0 80934990 AFA00014 */ sw $zero, 0x0014($sp) +/* 083C4 80934994 AFAF0010 */ sw $t7, 0x0010($sp) /* 083C8 80934998 8E8A02D0 */ lw $t2, 0x02D0($s4) ## 000002D0 -/* 083CC 8093499C 8FA400CC */ lw $a0, 0x00CC($sp) -/* 083D0 809349A0 0C0289CF */ jal func_800A273C -/* 083D4 809349A4 AFAA001C */ sw $t2, 0x001C($sp) +/* 083CC 8093499C 8FA400CC */ lw $a0, 0x00CC($sp) +/* 083D0 809349A0 0C0289CF */ jal SkelAnime_DrawSV2 +/* 083D4 809349A4 AFAA001C */ sw $t2, 0x001C($sp) /* 083D8 809349A8 AE8202D0 */ sw $v0, 0x02D0($s4) ## 000002D0 .L809349AC: /* 083DC 809349AC 26B50005 */ addiu $s5, $s5, 0x0005 ## $s5 = 00000005 /* 083E0 809349B0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 083E4 809349B4 02A1001A */ div $zero, $s5, $at -/* 083E8 809349B8 0000A810 */ mfhi $s5 -/* 083EC 809349BC 0015C0C0 */ sll $t8, $s5, 3 -/* 083F0 809349C0 0315C023 */ subu $t8, $t8, $s5 -/* 083F4 809349C4 8FAE008C */ lw $t6, 0x008C($sp) -/* 083F8 809349C8 0018C080 */ sll $t8, $t8, 2 -/* 083FC 809349CC 02788021 */ addu $s0, $s3, $t8 +/* 083E4 809349B4 02A1001A */ div $zero, $s5, $at +/* 083E8 809349B8 0000A810 */ mfhi $s5 +/* 083EC 809349BC 0015C0C0 */ sll $t8, $s5, 3 +/* 083F0 809349C0 0315C023 */ subu $t8, $t8, $s5 +/* 083F4 809349C4 8FAE008C */ lw $t6, 0x008C($sp) +/* 083F8 809349C8 0018C080 */ sll $t8, $t8, 2 +/* 083FC 809349CC 02788021 */ addu $s0, $s3, $t8 /* 08400 809349D0 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 08404 809349D4 8FA4009C */ lw $a0, 0x009C($sp) +/* 08404 809349D4 8FA4009C */ lw $a0, 0x009C($sp) /* 08408 809349D8 261009D4 */ addiu $s0, $s0, 0x09D4 ## $s0 = 000013A8 -/* 0840C 809349DC 162EFFB3 */ bne $s1, $t6, .L809348AC -/* 08410 809349E0 AFB0009C */ sw $s0, 0x009C($sp) +/* 0840C 809349DC 162EFFB3 */ bne $s1, $t6, .L809348AC +/* 08410 809349E0 AFB0009C */ sw $s0, 0x009C($sp) .L809349E4: -/* 08414 809349E4 8FA900CC */ lw $t1, 0x00CC($sp) +/* 08414 809349E4 8FA900CC */ lw $t1, 0x00CC($sp) .L809349E8: /* 08418 809349E8 3C068093 */ lui $a2, %hi(D_80937900) ## $a2 = 80930000 /* 0841C 809349EC 24C67900 */ addiu $a2, $a2, %lo(D_80937900) ## $a2 = 80937900 /* 08420 809349F0 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE8 /* 08424 809349F4 240719FE */ addiu $a3, $zero, 0x19FE ## $a3 = 000019FE -/* 08428 809349F8 0C031AD5 */ jal func_800C6B54 +/* 08428 809349F8 0C031AD5 */ jal func_800C6B54 /* 0842C 809349FC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 08430 80934A00 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 08434 80934A04 0C24D8E7 */ jal func_8093639C -/* 08438 80934A08 8FA500CC */ lw $a1, 0x00CC($sp) -/* 0843C 80934A0C 8FBF005C */ lw $ra, 0x005C($sp) -/* 08440 80934A10 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 08444 80934A14 D7B60030 */ ldc1 $f22, 0x0030($sp) -/* 08448 80934A18 8FB00038 */ lw $s0, 0x0038($sp) -/* 0844C 80934A1C 8FB1003C */ lw $s1, 0x003C($sp) -/* 08450 80934A20 8FB20040 */ lw $s2, 0x0040($sp) -/* 08454 80934A24 8FB30044 */ lw $s3, 0x0044($sp) -/* 08458 80934A28 8FB40048 */ lw $s4, 0x0048($sp) -/* 0845C 80934A2C 8FB5004C */ lw $s5, 0x004C($sp) -/* 08460 80934A30 8FB60050 */ lw $s6, 0x0050($sp) -/* 08464 80934A34 8FB70054 */ lw $s7, 0x0054($sp) -/* 08468 80934A38 8FBE0058 */ lw $s8, 0x0058($sp) -/* 0846C 80934A3C 03E00008 */ jr $ra +/* 08434 80934A04 0C24D8E7 */ jal func_8093639C +/* 08438 80934A08 8FA500CC */ lw $a1, 0x00CC($sp) +/* 0843C 80934A0C 8FBF005C */ lw $ra, 0x005C($sp) +/* 08440 80934A10 D7B40028 */ ldc1 $f20, 0x0028($sp) +/* 08444 80934A14 D7B60030 */ ldc1 $f22, 0x0030($sp) +/* 08448 80934A18 8FB00038 */ lw $s0, 0x0038($sp) +/* 0844C 80934A1C 8FB1003C */ lw $s1, 0x003C($sp) +/* 08450 80934A20 8FB20040 */ lw $s2, 0x0040($sp) +/* 08454 80934A24 8FB30044 */ lw $s3, 0x0044($sp) +/* 08458 80934A28 8FB40048 */ lw $s4, 0x0048($sp) +/* 0845C 80934A2C 8FB5004C */ lw $s5, 0x004C($sp) +/* 08460 80934A30 8FB60050 */ lw $s6, 0x0050($sp) +/* 08464 80934A34 8FB70054 */ lw $s7, 0x0054($sp) +/* 08468 80934A38 8FBE0058 */ lw $s8, 0x0058($sp) +/* 0846C 80934A3C 03E00008 */ jr $ra /* 08470 80934A40 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s index 17d9f2f02b..b51e4aec56 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s @@ -1,69 +1,69 @@ glabel BossSst_Init /* 00000 8092C5D0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 8092C5D4 AFB10030 */ sw $s1, 0x0030($sp) +/* 00004 8092C5D4 AFB10030 */ sw $s1, 0x0030($sp) /* 00008 8092C5D8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 8092C5DC AFBF0034 */ sw $ra, 0x0034($sp) -/* 00010 8092C5E0 AFB0002C */ sw $s0, 0x002C($sp) +/* 0000C 8092C5DC AFBF0034 */ sw $ra, 0x0034($sp) +/* 00010 8092C5E0 AFB0002C */ sw $s0, 0x002C($sp) /* 00014 8092C5E4 3C058093 */ lui $a1, %hi(D_8093788C) ## $a1 = 80930000 /* 00018 8092C5E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0001C 8092C5EC 0C01E037 */ jal Actor_ProcessInitChain - + /* 00020 8092C5F0 24A5788C */ addiu $a1, $a1, %lo(D_8093788C) ## $a1 = 8093788C /* 00024 8092C5F4 260506B4 */ addiu $a1, $s0, 0x06B4 ## $a1 = 000006B4 -/* 00028 8092C5F8 AFA50044 */ sw $a1, 0x0044($sp) +/* 00028 8092C5F8 AFA50044 */ sw $a1, 0x0044($sp) /* 0002C 8092C5FC 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00030 8092C600 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00034 8092C604 260503D4 */ addiu $a1, $s0, 0x03D4 ## $a1 = 000003D4 -/* 00038 8092C608 AFA50040 */ sw $a1, 0x0040($sp) -/* 0003C 8092C60C 0C016EFE */ jal func_8005BBF8 +/* 00038 8092C608 AFA50040 */ sw $a1, 0x0040($sp) +/* 0003C 8092C60C 0C016EFE */ jal func_8005BBF8 /* 00040 8092C610 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00044 8092C614 3C058093 */ lui $a1, %hi(D_8093782C) ## $a1 = 80930000 /* 00048 8092C618 3C068093 */ lui $a2, %hi(D_80937824) ## $a2 = 80930000 /* 0004C 8092C61C 24C67824 */ addiu $a2, $a2, %lo(D_80937824) ## $a2 = 80937824 /* 00050 8092C620 24A5782C */ addiu $a1, $a1, %lo(D_8093782C) ## $a1 = 8093782C -/* 00054 8092C624 0C0187B5 */ jal func_80061ED4 +/* 00054 8092C624 0C0187B5 */ jal func_80061ED4 /* 00058 8092C628 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 0005C 8092C62C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00060 8092C630 0C00B2DD */ jal Flags_SetSwitch - + /* 00064 8092C634 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 00068 8092C638 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 0006C 8092C63C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 00070 8092C640 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00074 8092C644 15C100BA */ bne $t6, $at, .L8092C930 -/* 00078 8092C648 8FA50040 */ lw $a1, 0x0040($sp) +/* 00074 8092C644 15C100BA */ bne $t6, $at, .L8092C930 +/* 00078 8092C648 8FA50040 */ lw $a1, 0x0040($sp) /* 0007C 8092C64C 3C028093 */ lui $v0, %hi(D_80937340) ## $v0 = 80930000 /* 00080 8092C650 24427340 */ addiu $v0, $v0, %lo(D_80937340) ## $v0 = 80937340 /* 00084 8092C654 C4440004 */ lwc1 $f4, 0x0004($v0) ## 80937344 /* 00088 8092C658 C4460008 */ lwc1 $f6, 0x0008($v0) ## 80937348 /* 0008C 8092C65C 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00090 8092C660 AFA4003C */ sw $a0, 0x003C($sp) +/* 00090 8092C660 AFA4003C */ sw $a0, 0x003C($sp) /* 00094 8092C664 8C470000 */ lw $a3, 0x0000($v0) ## 80937340 /* 00098 8092C668 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0009C 8092C66C 24060166 */ addiu $a2, $zero, 0x0166 ## $a2 = 00000166 -/* 000A0 8092C670 AFA00018 */ sw $zero, 0x0018($sp) -/* 000A4 8092C674 AFA0001C */ sw $zero, 0x001C($sp) -/* 000A8 8092C678 AFA00020 */ sw $zero, 0x0020($sp) -/* 000AC 8092C67C AFA00024 */ sw $zero, 0x0024($sp) -/* 000B0 8092C680 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 000A0 8092C670 AFA00018 */ sw $zero, 0x0018($sp) +/* 000A4 8092C674 AFA0001C */ sw $zero, 0x001C($sp) +/* 000A8 8092C678 AFA00020 */ sw $zero, 0x0020($sp) +/* 000AC 8092C67C AFA00024 */ sw $zero, 0x0024($sp) +/* 000B0 8092C680 E7A40010 */ swc1 $f4, 0x0010($sp) /* 000B4 8092C684 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 000B8 8092C688 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 000B8 8092C688 E7A60014 */ swc1 $f6, 0x0014($sp) /* 000BC 8092C68C 3C018094 */ lui $at, %hi(D_80938CA0) ## $at = 80940000 /* 000C0 8092C690 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 000C4 8092C694 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 000C8 8092C698 260F01A8 */ addiu $t7, $s0, 0x01A8 ## $t7 = 000001A8 /* 000CC 8092C69C 261802B6 */ addiu $t8, $s0, 0x02B6 ## $t8 = 000002B6 /* 000D0 8092C6A0 2419002D */ addiu $t9, $zero, 0x002D ## $t9 = 0000002D -/* 000D4 8092C6A4 AC228CA0 */ sw $v0, %lo(D_80938CA0)($at) -/* 000D8 8092C6A8 AFB90018 */ sw $t9, 0x0018($sp) -/* 000DC 8092C6AC AFB80014 */ sw $t8, 0x0014($sp) -/* 000E0 8092C6B0 AFAF0010 */ sw $t7, 0x0010($sp) +/* 000D4 8092C6A4 AC228CA0 */ sw $v0, %lo(D_80938CA0)($at) +/* 000D8 8092C6A8 AFB90018 */ sw $t9, 0x0018($sp) +/* 000DC 8092C6AC AFB80014 */ sw $t8, 0x0014($sp) +/* 000E0 8092C6B0 AFAF0010 */ sw $t7, 0x0010($sp) /* 000E4 8092C6B4 24E7E7B8 */ addiu $a3, $a3, 0xE7B8 ## $a3 = 0600E7B8 /* 000E8 8092C6B8 24C67C40 */ addiu $a2, $a2, 0x7C40 ## $a2 = 06017C40 /* 000EC 8092C6BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000F0 8092C6C0 0C0291BE */ jal func_800A46F8 +/* 000F0 8092C6C0 0C0291BE */ jal SkelAnime_InitSV /* 000F4 8092C6C4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 000F8 8092C6C8 3C054788 */ lui $a1, 0x4788 ## $a1 = 47880000 /* 000FC 8092C6CC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 @@ -71,30 +71,30 @@ glabel BossSst_Init /* 00104 8092C6D4 34A5B800 */ ori $a1, $a1, 0xB800 ## $a1 = 4788B800 /* 00108 8092C6D8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0010C 8092C6DC 0C00AC78 */ jal ActorShape_Init - + /* 00110 8092C6E0 3C0742BE */ lui $a3, 0x42BE ## $a3 = 42BE0000 /* 00114 8092C6E4 3C078093 */ lui $a3, %hi(D_809377BC) ## $a3 = 80930000 /* 00118 8092C6E8 260803F4 */ addiu $t0, $s0, 0x03F4 ## $t0 = 000003F4 -/* 0011C 8092C6EC AFA80010 */ sw $t0, 0x0010($sp) +/* 0011C 8092C6EC AFA80010 */ sw $t0, 0x0010($sp) /* 00120 8092C6F0 24E777BC */ addiu $a3, $a3, %lo(D_809377BC) ## $a3 = 809377BC /* 00124 8092C6F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00128 8092C6F8 8FA50040 */ lw $a1, 0x0040($sp) -/* 0012C 8092C6FC 0C017014 */ jal func_8005C050 +/* 00128 8092C6F8 8FA50040 */ lw $a1, 0x0040($sp) +/* 0012C 8092C6FC 0C017014 */ jal func_8005C050 /* 00130 8092C700 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00134 8092C704 3C078093 */ lui $a3, %hi(D_809377CC) ## $a3 = 80930000 /* 00138 8092C708 24E777CC */ addiu $a3, $a3, %lo(D_809377CC) ## $a3 = 809377CC /* 0013C 8092C70C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00140 8092C710 8FA50044 */ lw $a1, 0x0044($sp) +/* 00140 8092C710 8FA50044 */ lw $a1, 0x0044($sp) /* 00144 8092C714 0C01712B */ jal ActorCollider_InitCylinder - + /* 00148 8092C718 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0014C 8092C71C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00150 8092C720 3C018094 */ lui $at, %hi(D_80938C90) ## $at = 80940000 -/* 00154 8092C724 AC308C90 */ sw $s0, %lo(D_80938C90)($at) +/* 00154 8092C724 AC308C90 */ sw $s0, %lo(D_80938C90)($at) /* 00158 8092C728 E6000024 */ swc1 $f0, 0x0024($s0) ## 00000024 /* 0015C 8092C72C 3C018093 */ lui $at, %hi(D_80937990) ## $at = 80930000 /* 00160 8092C730 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 -/* 00164 8092C734 C4287990 */ lwc1 $f8, %lo(D_80937990)($at) +/* 00164 8092C734 C4287990 */ lwc1 $f8, %lo(D_80937990)($at) /* 00168 8092C738 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 /* 0016C 8092C73C 8E090028 */ lw $t1, 0x0028($s0) ## 00000028 /* 00170 8092C740 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C @@ -102,73 +102,73 @@ glabel BossSst_Init /* 00178 8092C748 8E0A002C */ lw $t2, 0x002C($s0) ## 0000002C /* 0017C 8092C74C 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 /* 00180 8092C750 A60000B6 */ sh $zero, 0x00B6($s0) ## 000000B6 -/* 00184 8092C754 00B12821 */ addu $a1, $a1, $s1 +/* 00184 8092C754 00B12821 */ addu $a1, $a1, $s1 /* 00188 8092C758 AE09000C */ sw $t1, 0x000C($s0) ## 0000000C /* 0018C 8092C75C AE0A0010 */ sw $t2, 0x0010($s0) ## 00000010 /* 00190 8092C760 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC /* 00194 8092C764 0C00B337 */ jal Flags_GetClear - + /* 00198 8092C768 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0019C 8092C76C 10400022 */ beq $v0, $zero, .L8092C7F8 +/* 0019C 8092C76C 10400022 */ beq $v0, $zero, .L8092C7F8 /* 001A0 8092C770 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 001A4 8092C774 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 001A8 8092C778 44818000 */ mtc1 $at, $f16 ## $f16 = 400.00 /* 001AC 8092C77C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 001B0 8092C780 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 001B4 8092C784 AFAB0024 */ sw $t3, 0x0024($sp) -/* 001B8 8092C788 8FA4003C */ lw $a0, 0x003C($sp) +/* 001B4 8092C784 AFAB0024 */ sw $t3, 0x0024($sp) +/* 001B8 8092C788 8FA4003C */ lw $a0, 0x003C($sp) /* 001BC 8092C78C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 001C0 8092C790 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D /* 001C4 8092C794 3C07C248 */ lui $a3, 0xC248 ## $a3 = C2480000 -/* 001C8 8092C798 AFA00018 */ sw $zero, 0x0018($sp) -/* 001CC 8092C79C AFA0001C */ sw $zero, 0x001C($sp) -/* 001D0 8092C7A0 AFA00020 */ sw $zero, 0x0020($sp) -/* 001D4 8092C7A4 E7B00014 */ swc1 $f16, 0x0014($sp) +/* 001C8 8092C798 AFA00018 */ sw $zero, 0x0018($sp) +/* 001CC 8092C79C AFA0001C */ sw $zero, 0x001C($sp) +/* 001D0 8092C7A0 AFA00020 */ sw $zero, 0x0020($sp) +/* 001D4 8092C7A4 E7B00014 */ swc1 $f16, 0x0014($sp) /* 001D8 8092C7A8 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 001DC 8092C7AC E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 001DC 8092C7AC E7AA0010 */ swc1 $f10, 0x0010($sp) /* 001E0 8092C7B0 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 001E4 8092C7B4 44812000 */ mtc1 $at, $f4 ## $f4 = -200.00 /* 001E8 8092C7B8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 001EC 8092C7BC 8FA4003C */ lw $a0, 0x003C($sp) +/* 001EC 8092C7BC 8FA4003C */ lw $a0, 0x003C($sp) /* 001F0 8092C7C0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 001F4 8092C7C4 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F /* 001F8 8092C7C8 3C07C248 */ lui $a3, 0xC248 ## $a3 = C2480000 -/* 001FC 8092C7CC AFA00018 */ sw $zero, 0x0018($sp) -/* 00200 8092C7D0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00204 8092C7D4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00208 8092C7D8 AFA00024 */ sw $zero, 0x0024($sp) -/* 0020C 8092C7DC E7A40014 */ swc1 $f4, 0x0014($sp) +/* 001FC 8092C7CC AFA00018 */ sw $zero, 0x0018($sp) +/* 00200 8092C7D0 AFA0001C */ sw $zero, 0x001C($sp) +/* 00204 8092C7D4 AFA00020 */ sw $zero, 0x0020($sp) +/* 00208 8092C7D8 AFA00024 */ sw $zero, 0x0024($sp) +/* 0020C 8092C7DC E7A40014 */ swc1 $f4, 0x0014($sp) /* 00210 8092C7E0 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00214 8092C7E4 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00214 8092C7E4 E7B20010 */ swc1 $f18, 0x0010($sp) /* 00218 8092C7E8 0C00B55C */ jal Actor_Kill - + /* 0021C 8092C7EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00220 8092C7F0 10000094 */ beq $zero, $zero, .L8092CA44 -/* 00224 8092C7F4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00220 8092C7F0 10000094 */ beq $zero, $zero, .L8092CA44 +/* 00224 8092C7F4 8FBF0034 */ lw $ra, 0x0034($sp) .L8092C7F8: /* 00228 8092C7F8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 0022C 8092C7FC C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 00230 8092C800 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 /* 00234 8092C804 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00238 8092C808 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00238 8092C808 E7B00010 */ swc1 $f16, 0x0010($sp) /* 0023C 8092C80C C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C /* 00240 8092C810 44812000 */ mtc1 $at, $f4 ## $f4 = 400.00 -/* 00244 8092C814 46083280 */ add.s $f10, $f6, $f8 -/* 00248 8092C818 AFA00018 */ sw $zero, 0x0018($sp) -/* 0024C 8092C81C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00250 8092C820 46049180 */ add.s $f6, $f18, $f4 -/* 00254 8092C824 44075000 */ mfc1 $a3, $f10 +/* 00244 8092C814 46083280 */ add.s $f10, $f6, $f8 +/* 00248 8092C818 AFA00018 */ sw $zero, 0x0018($sp) +/* 0024C 8092C81C 8FA4003C */ lw $a0, 0x003C($sp) +/* 00250 8092C820 46049180 */ add.s $f6, $f18, $f4 +/* 00254 8092C824 44075000 */ mfc1 $a3, $f10 /* 00258 8092C828 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0025C 8092C82C 240600E9 */ addiu $a2, $zero, 0x00E9 ## $a2 = 000000E9 -/* 00260 8092C830 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00260 8092C830 E7A60014 */ swc1 $f6, 0x0014($sp) /* 00264 8092C834 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 00268 8092C838 AFA00024 */ sw $zero, 0x0024($sp) -/* 0026C 8092C83C AFA00020 */ sw $zero, 0x0020($sp) +/* 00268 8092C838 AFA00024 */ sw $zero, 0x0024($sp) +/* 0026C 8092C83C AFA00020 */ sw $zero, 0x0020($sp) /* 00270 8092C840 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00274 8092C844 AFAC001C */ sw $t4, 0x001C($sp) +/* 00274 8092C844 AFAC001C */ sw $t4, 0x001C($sp) /* 00278 8092C848 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 /* 0027C 8092C84C 24638C98 */ addiu $v1, $v1, %lo(D_80938C98) ## $v1 = 80938C98 /* 00280 8092C850 AC620000 */ sw $v0, 0x0000($v1) ## 80938C98 @@ -177,24 +177,24 @@ glabel BossSst_Init /* 0028C 8092C85C 44815000 */ mtc1 $at, $f10 ## $f10 = -200.00 /* 00290 8092C860 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 00294 8092C864 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00298 8092C868 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00298 8092C868 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0029C 8092C86C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 002A0 8092C870 44813000 */ mtc1 $at, $f6 ## $f6 = 400.00 -/* 002A4 8092C874 460A4400 */ add.s $f16, $f8, $f10 -/* 002A8 8092C878 AFA00018 */ sw $zero, 0x0018($sp) +/* 002A4 8092C874 460A4400 */ add.s $f16, $f8, $f10 +/* 002A8 8092C878 AFA00018 */ sw $zero, 0x0018($sp) /* 002AC 8092C87C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 002B0 8092C880 46062200 */ add.s $f8, $f4, $f6 -/* 002B4 8092C884 44078000 */ mfc1 $a3, $f16 -/* 002B8 8092C888 8FA4003C */ lw $a0, 0x003C($sp) +/* 002B0 8092C880 46062200 */ add.s $f8, $f4, $f6 +/* 002B4 8092C884 44078000 */ mfc1 $a3, $f16 +/* 002B8 8092C888 8FA4003C */ lw $a0, 0x003C($sp) /* 002BC 8092C88C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 002C0 8092C890 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 002C0 8092C890 E7A80014 */ swc1 $f8, 0x0014($sp) /* 002C4 8092C894 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 002C8 8092C898 AFAE0024 */ sw $t6, 0x0024($sp) -/* 002CC 8092C89C AFA00020 */ sw $zero, 0x0020($sp) +/* 002C8 8092C898 AFAE0024 */ sw $t6, 0x0024($sp) +/* 002CC 8092C89C AFA00020 */ sw $zero, 0x0020($sp) /* 002D0 8092C8A0 240600E9 */ addiu $a2, $zero, 0x00E9 ## $a2 = 000000E9 /* 002D4 8092C8A4 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 002D8 8092C8A8 AFAD001C */ sw $t5, 0x001C($sp) +/* 002D8 8092C8A8 AFAD001C */ sw $t5, 0x001C($sp) /* 002DC 8092C8AC 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 /* 002E0 8092C8B0 24638C98 */ addiu $v1, $v1, %lo(D_80938C98) ## $v1 = 80938C98 /* 002E4 8092C8B4 8C780000 */ lw $t8, 0x0000($v1) ## 80938C98 @@ -209,77 +209,77 @@ glabel BossSst_Init /* 00308 8092C8D8 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 /* 0030C 8092C8DC 256B4338 */ addiu $t3, $t3, %lo(func_80934338) ## $t3 = 80934338 /* 00310 8092C8E0 258C52DC */ addiu $t4, $t4, %lo(func_809352DC) ## $t4 = 809352DC -/* 00314 8092C8E4 01215024 */ and $t2, $t1, $at +/* 00314 8092C8E4 01215024 */ and $t2, $t1, $at /* 00318 8092C8E8 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 /* 0031C 8092C8EC AE0B0130 */ sw $t3, 0x0130($s0) ## 00000130 /* 00320 8092C8F0 AE0C0134 */ sw $t4, 0x0134($s0) ## 00000134 /* 00324 8092C8F4 3C018093 */ lui $at, %hi(D_80937994) ## $at = 80930000 -/* 00328 8092C8F8 C42A7994 */ lwc1 $f10, %lo(D_80937994)($at) +/* 00328 8092C8F8 C42A7994 */ lwc1 $f10, %lo(D_80937994)($at) /* 0032C 8092C8FC 3C01457A */ lui $at, 0x457A ## $at = 457A0000 /* 00330 8092C900 44818000 */ mtc1 $at, $f16 ## $f16 = 4000.00 /* 00334 8092C904 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00338 8092C908 E60A03C4 */ swc1 $f10, 0x03C4($s0) ## 000003C4 -/* 0033C 8092C90C 0C24B2A8 */ jal func_8092CAA0 +/* 0033C 8092C90C 0C24B2A8 */ jal func_8092CAA0 /* 00340 8092C910 E610004C */ swc1 $f16, 0x004C($s0) ## 0000004C /* 00344 8092C914 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00348 8092C918 8FA5003C */ lw $a1, 0x003C($sp) +/* 00348 8092C918 8FA5003C */ lw $a1, 0x003C($sp) /* 0034C 8092C91C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00350 8092C920 0C00CDD2 */ jal Actor_ChangeType - + /* 00354 8092C924 24070009 */ addiu $a3, $zero, 0x0009 ## $a3 = 00000009 -/* 00358 8092C928 10000046 */ beq $zero, $zero, .L8092CA44 -/* 0035C 8092C92C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00358 8092C928 10000046 */ beq $zero, $zero, .L8092CA44 +/* 0035C 8092C92C 8FBF0034 */ lw $ra, 0x0034($sp) .L8092C930: /* 00360 8092C930 3C078093 */ lui $a3, %hi(D_80937620) ## $a3 = 80930000 /* 00364 8092C934 260D03F4 */ addiu $t5, $s0, 0x03F4 ## $t5 = 000003F4 -/* 00368 8092C938 AFAD0010 */ sw $t5, 0x0010($sp) +/* 00368 8092C938 AFAD0010 */ sw $t5, 0x0010($sp) /* 0036C 8092C93C 24E77620 */ addiu $a3, $a3, %lo(D_80937620) ## $a3 = 80937620 -/* 00370 8092C940 0C017014 */ jal func_8005C050 +/* 00370 8092C940 0C017014 */ jal func_8005C050 /* 00374 8092C944 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00378 8092C948 3C078093 */ lui $a3, %hi(D_809377F8) ## $a3 = 80930000 /* 0037C 8092C94C 24E777F8 */ addiu $a3, $a3, %lo(D_809377F8) ## $a3 = 809377F8 /* 00380 8092C950 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00384 8092C954 8FA50044 */ lw $a1, 0x0044($sp) +/* 00384 8092C954 8FA50044 */ lw $a1, 0x0044($sp) /* 00388 8092C958 0C01712B */ jal ActorCollider_InitCylinder - + /* 0038C 8092C95C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00390 8092C960 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00394 8092C964 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00398 8092C968 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0039C 8092C96C 15C00017 */ bne $t6, $zero, .L8092C9CC +/* 0039C 8092C96C 15C00017 */ bne $t6, $zero, .L8092C9CC /* 003A0 8092C970 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 003A4 8092C974 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 003A8 8092C978 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 003AC 8092C97C 260F01A8 */ addiu $t7, $s0, 0x01A8 ## $t7 = 000001A8 /* 003B0 8092C980 261802B6 */ addiu $t8, $s0, 0x02B6 ## $t8 = 000002B6 /* 003B4 8092C984 2419001B */ addiu $t9, $zero, 0x001B ## $t9 = 0000001B -/* 003B8 8092C988 AFB90018 */ sw $t9, 0x0018($sp) -/* 003BC 8092C98C AFB80014 */ sw $t8, 0x0014($sp) -/* 003C0 8092C990 AFAF0010 */ sw $t7, 0x0010($sp) +/* 003B8 8092C988 AFB90018 */ sw $t9, 0x0018($sp) +/* 003BC 8092C98C AFB80014 */ sw $t8, 0x0014($sp) +/* 003C0 8092C990 AFAF0010 */ sw $t7, 0x0010($sp) /* 003C4 8092C994 24E702E8 */ addiu $a3, $a3, 0x02E8 ## $a3 = 060002E8 /* 003C8 8092C998 24C64DE0 */ addiu $a2, $a2, 0x4DE0 ## $a2 = 06004DE0 /* 003CC 8092C99C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 003D0 8092C9A0 0C0291BE */ jal func_800A46F8 +/* 003D0 8092C9A0 0C0291BE */ jal SkelAnime_InitSV /* 003D4 8092C9A4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 003D8 8092C9A8 8E0303F0 */ lw $v1, 0x03F0($s0) ## 000003F0 /* 003DC 8092C9AC 2404FFFF */ addiu $a0, $zero, 0xFFFF ## $a0 = FFFFFFFF /* 003E0 8092C9B0 A2040194 */ sb $a0, 0x0194($s0) ## 00000194 /* 003E4 8092C9B4 8468002C */ lh $t0, 0x002C($v1) ## 0000002C -/* 003E8 8092C9B8 01040019 */ multu $t0, $a0 -/* 003EC 8092C9BC 00004812 */ mflo $t1 +/* 003E8 8092C9B8 01040019 */ multu $t0, $a0 +/* 003EC 8092C9BC 00004812 */ mflo $t1 /* 003F0 8092C9C0 A469002C */ sh $t1, 0x002C($v1) ## 0000002C -/* 003F4 8092C9C4 1000000D */ beq $zero, $zero, .L8092C9FC +/* 003F4 8092C9C4 1000000D */ beq $zero, $zero, .L8092C9FC /* 003F8 8092C9C8 00000000 */ nop .L8092C9CC: /* 003FC 8092C9CC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00400 8092C9D0 260A01A8 */ addiu $t2, $s0, 0x01A8 ## $t2 = 000001A8 /* 00404 8092C9D4 260B02B6 */ addiu $t3, $s0, 0x02B6 ## $t3 = 000002B6 /* 00408 8092C9D8 240C001B */ addiu $t4, $zero, 0x001B ## $t4 = 0000001B -/* 0040C 8092C9DC AFAC0018 */ sw $t4, 0x0018($sp) -/* 00410 8092C9E0 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00414 8092C9E4 AFAA0010 */ sw $t2, 0x0010($sp) +/* 0040C 8092C9DC AFAC0018 */ sw $t4, 0x0018($sp) +/* 00410 8092C9E0 AFAB0014 */ sw $t3, 0x0014($sp) +/* 00414 8092C9E4 AFAA0010 */ sw $t2, 0x0010($sp) /* 00418 8092C9E8 24E75860 */ addiu $a3, $a3, 0x5860 ## $a3 = 06005860 -/* 0041C 8092C9EC 0C0291BE */ jal func_800A46F8 +/* 0041C 8092C9EC 0C0291BE */ jal SkelAnime_InitSV /* 00420 8092C9F0 24C6A350 */ addiu $a2, $a2, 0xA350 ## $a2 = FFFFA350 /* 00424 8092C9F4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 00428 8092C9F8 A20D0194 */ sb $t5, 0x0194($s0) ## 00000194 @@ -289,24 +289,24 @@ glabel BossSst_Init /* 00434 8092CA04 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00438 8092CA08 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0043C 8092CA0C 0C00AC78 */ jal ActorShape_Init - + /* 00440 8092CA10 3C0742BE */ lui $a3, 0x42BE ## $a3 = 42BE0000 /* 00444 8092CA14 240EF254 */ addiu $t6, $zero, 0xF254 ## $t6 = FFFFF254 /* 00448 8092CA18 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 0044C 8092CA1C A60E019E */ sh $t6, 0x019E($s0) ## 0000019E /* 00450 8092CA20 3C018093 */ lui $at, %hi(D_80937998) ## $at = 80930000 -/* 00454 8092CA24 C4327998 */ lwc1 $f18, %lo(D_80937998)($at) +/* 00454 8092CA24 C4327998 */ lwc1 $f18, %lo(D_80937998)($at) /* 00458 8092CA28 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0045C 8092CA2C 01E1C024 */ and $t8, $t7, $at +/* 0045C 8092CA2C 01E1C024 */ and $t8, $t7, $at /* 00460 8092CA30 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 /* 00464 8092CA34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00468 8092CA38 0C24BEF9 */ jal func_8092FBE4 +/* 00468 8092CA38 0C24BEF9 */ jal func_8092FBE4 /* 0046C 8092CA3C E612004C */ swc1 $f18, 0x004C($s0) ## 0000004C -/* 00470 8092CA40 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00470 8092CA40 8FBF0034 */ lw $ra, 0x0034($sp) .L8092CA44: -/* 00474 8092CA44 8FB0002C */ lw $s0, 0x002C($sp) -/* 00478 8092CA48 8FB10030 */ lw $s1, 0x0030($sp) -/* 0047C 8092CA4C 03E00008 */ jr $ra +/* 00474 8092CA44 8FB0002C */ lw $s0, 0x002C($sp) +/* 00478 8092CA48 8FB10030 */ lw $s1, 0x0030($sp) +/* 0047C 8092CA4C 03E00008 */ jr $ra /* 00480 8092CA50 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s index ba4f520565..472ed1cd0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s @@ -1,39 +1,39 @@ glabel func_8092CC58 /* 00688 8092CC58 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0068C 8092CC5C AFBF0034 */ sw $ra, 0x0034($sp) -/* 00690 8092CC60 AFB20030 */ sw $s2, 0x0030($sp) -/* 00694 8092CC64 AFB1002C */ sw $s1, 0x002C($sp) -/* 00698 8092CC68 AFB00028 */ sw $s0, 0x0028($sp) -/* 0069C 8092CC6C AFA50054 */ sw $a1, 0x0054($sp) +/* 0068C 8092CC5C AFBF0034 */ sw $ra, 0x0034($sp) +/* 00690 8092CC60 AFB20030 */ sw $s2, 0x0030($sp) +/* 00694 8092CC64 AFB1002C */ sw $s1, 0x002C($sp) +/* 00698 8092CC68 AFB00028 */ sw $s0, 0x0028($sp) +/* 0069C 8092CC6C AFA50054 */ sw $a1, 0x0054($sp) /* 006A0 8092CC70 84860198 */ lh $a2, 0x0198($a0) ## 00000198 /* 006A4 8092CC74 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 006A8 8092CC78 8CA71C44 */ lw $a3, 0x1C44($a1) ## 00001C44 -/* 006AC 8092CC7C 10C00002 */ beq $a2, $zero, .L8092CC88 +/* 006AC 8092CC7C 10C00002 */ beq $a2, $zero, .L8092CC88 /* 006B0 8092CC80 24CFFFFF */ addiu $t7, $a2, 0xFFFF ## $t7 = FFFFFFFF /* 006B4 8092CC84 A48F0198 */ sh $t7, 0x0198($a0) ## 00000198 .L8092CC88: /* 006B8 8092CC88 2644014C */ addiu $a0, $s2, 0x014C ## $a0 = 0000014C -/* 006BC 8092CC8C AFA40038 */ sw $a0, 0x0038($sp) +/* 006BC 8092CC8C AFA40038 */ sw $a0, 0x0038($sp) /* 006C0 8092CC90 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 006C4 8092CC94 AFA7004C */ sw $a3, 0x004C($sp) -/* 006C8 8092CC98 10400008 */ beq $v0, $zero, .L8092CCBC -/* 006CC 8092CC9C 8FA7004C */ lw $a3, 0x004C($sp) + +/* 006C4 8092CC94 AFA7004C */ sw $a3, 0x004C($sp) +/* 006C8 8092CC98 10400008 */ beq $v0, $zero, .L8092CCBC +/* 006CC 8092CC9C 8FA7004C */ lw $a3, 0x004C($sp) /* 006D0 8092CCA0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 006D4 8092CCA4 24A5DC2C */ addiu $a1, $a1, 0xDC2C ## $a1 = 0600DC2C -/* 006D8 8092CCA8 8FA40038 */ lw $a0, 0x0038($sp) +/* 006D8 8092CCA8 8FA40038 */ lw $a0, 0x0038($sp) /* 006DC 8092CCAC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 006E0 8092CCB0 0C0294D3 */ jal func_800A534C -/* 006E4 8092CCB4 AFA7004C */ sw $a3, 0x004C($sp) -/* 006E8 8092CCB8 8FA7004C */ lw $a3, 0x004C($sp) +/* 006E0 8092CCB0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 006E4 8092CCB4 AFA7004C */ sw $a3, 0x004C($sp) +/* 006E8 8092CCB8 8FA7004C */ lw $a3, 0x004C($sp) .L8092CCBC: /* 006EC 8092CCBC 86460198 */ lh $a2, 0x0198($s2) ## 00000198 -/* 006F0 8092CCC0 54C00054 */ bnel $a2, $zero, .L8092CE14 -/* 006F4 8092CCC4 28C10222 */ slti $at, $a2, 0x0222 +/* 006F0 8092CCC0 54C00054 */ bnel $a2, $zero, .L8092CE14 +/* 006F4 8092CCC4 28C10222 */ slti $at, $a2, 0x0222 /* 006F8 8092CCC8 3C068094 */ lui $a2, %hi(D_80938C98) ## $a2 = 80940000 /* 006FC 8092CCCC 24C68C98 */ addiu $a2, $a2, %lo(D_80938C98) ## $a2 = 80938C98 /* 00700 8092CCD0 8CC20004 */ lw $v0, 0x0004($a2) ## 80938C9C -/* 00704 8092CCD4 8FA40054 */ lw $a0, 0x0054($sp) +/* 00704 8092CCD4 8FA40054 */ lw $a0, 0x0054($sp) /* 00708 8092CCD8 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF /* 0070C 8092CCDC 8C580004 */ lw $t8, 0x0004($v0) ## 00000004 /* 00710 8092CCE0 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 @@ -44,12 +44,12 @@ glabel func_8092CC58 /* 00724 8092CCF4 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 /* 00728 8092CCF8 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 /* 0072C 8092CCFC 8CEC067C */ lw $t4, 0x067C($a3) ## 0000067C -/* 00730 8092CD00 01816824 */ and $t5, $t4, $at -/* 00734 8092CD04 0C01914D */ jal func_80064534 +/* 00730 8092CD00 01816824 */ and $t5, $t4, $at +/* 00734 8092CD04 0C01914D */ jal func_80064534 /* 00738 8092CD08 ACED067C */ sw $t5, 0x067C($a3) ## 0000067C -/* 0073C 8092CD0C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0073C 8092CD0C 8FA40054 */ lw $a0, 0x0054($sp) /* 00740 8092CD10 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00744 8092CD14 0C00B7D5 */ jal func_8002DF54 +/* 00744 8092CD14 0C00B7D5 */ jal func_8002DF54 /* 00748 8092CD18 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 0074C 8092CD1C 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00750 8092CD20 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -59,42 +59,42 @@ glabel func_8092CC58 /* 00760 8092CD30 C6240004 */ lwc1 $f4, 0x0004($s1) ## 80937350 /* 00764 8092CD34 44818000 */ mtc1 $at, $f16 ## $f16 = 300.00 /* 00768 8092CD38 C62A0008 */ lwc1 $f10, 0x0008($s1) ## 80937354 -/* 0076C 8092CD3C 46062200 */ add.s $f8, $f4, $f6 +/* 0076C 8092CD3C 46062200 */ add.s $f8, $f4, $f6 /* 00770 8092CD40 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00774 8092CD44 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00778 8092CD48 46105480 */ add.s $f18, $f10, $f16 +/* 00778 8092CD48 46105480 */ add.s $f18, $f10, $f16 /* 0077C 8092CD4C E6280004 */ swc1 $f8, 0x0004($s1) ## 80937350 /* 00780 8092CD50 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 /* 00784 8092CD54 02003825 */ or $a3, $s0, $zero ## $a3 = 80937358 /* 00788 8092CD58 E6320008 */ swc1 $f18, 0x0008($s1) ## 80937354 -/* 0078C 8092CD5C 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) +/* 0078C 8092CD5C 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) /* 00790 8092CD60 02203025 */ or $a2, $s1, $zero ## $a2 = 8093734C -/* 00794 8092CD64 0C030136 */ jal func_800C04D8 -/* 00798 8092CD68 8FA40054 */ lw $a0, 0x0054($sp) +/* 00794 8092CD64 0C030136 */ jal func_800C04D8 +/* 00798 8092CD68 8FA40054 */ lw $a0, 0x0054($sp) /* 0079C 8092CD6C 3C068094 */ lui $a2, %hi(D_80938CC4) ## $a2 = 80940000 -/* 007A0 8092CD70 84C68CC4 */ lh $a2, %lo(D_80938CC4)($a2) -/* 007A4 8092CD74 8FA40054 */ lw $a0, 0x0054($sp) -/* 007A8 8092CD78 0C0301E3 */ jal func_800C078C +/* 007A0 8092CD70 84C68CC4 */ lh $a2, %lo(D_80938CC4)($a2) +/* 007A4 8092CD74 8FA40054 */ lw $a0, 0x0054($sp) +/* 007A8 8092CD78 0C0301E3 */ jal func_800C078C /* 007AC 8092CD7C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 007B0 8092CD80 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 007B4 8092CD84 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 007B8 8092CD88 8FA40054 */ lw $a0, 0x0054($sp) -/* 007BC 8092CD8C 0C0300C5 */ jal func_800C0314 +/* 007B4 8092CD84 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) +/* 007B8 8092CD88 8FA40054 */ lw $a0, 0x0054($sp) +/* 007BC 8092CD8C 0C0300C5 */ jal func_800C0314 /* 007C0 8092CD90 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 007C4 8092CD94 8FA40054 */ lw $a0, 0x0054($sp) +/* 007C4 8092CD94 8FA40054 */ lw $a0, 0x0054($sp) /* 007C8 8092CD98 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 007CC 8092CD9C 0C0300C5 */ jal func_800C0314 +/* 007CC 8092CD9C 0C0300C5 */ jal func_800C0314 /* 007D0 8092CDA0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 007D4 8092CDA4 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 007D8 8092CDA8 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 007DC 8092CDAC 0C0300E1 */ jal func_800C0384 -/* 007E0 8092CDB0 8FA40054 */ lw $a0, 0x0054($sp) +/* 007D8 8092CDA8 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) +/* 007DC 8092CDAC 0C0300E1 */ jal func_800C0384 +/* 007E0 8092CDB0 8FA40054 */ lw $a0, 0x0054($sp) /* 007E4 8092CDB4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 007E8 8092CDB8 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 /* 007EC 8092CDBC 94AE0EE2 */ lhu $t6, 0x0EE2($a1) ## 8015F542 /* 007F0 8092CDC0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 007F4 8092CDC4 35CF0080 */ ori $t7, $t6, 0x0080 ## $t7 = 00000080 -/* 007F8 8092CDC8 0C24B6CC */ jal func_8092DB30 +/* 007F8 8092CDC8 0C24B6CC */ jal func_8092DB30 /* 007FC 8092CDCC A4AF0EE2 */ sh $t7, 0x0EE2($a1) ## 8015F542 /* 00800 8092CDD0 925803E6 */ lbu $t8, 0x03E6($s2) ## 000003E6 /* 00804 8092CDD4 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 @@ -110,21 +110,21 @@ glabel func_8092CC58 /* 0082C 8092CDFC 904C03E6 */ lbu $t4, 0x03E6($v0) ## 000003E6 /* 00830 8092CE00 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 /* 00834 8092CE04 A04D03E6 */ sb $t5, 0x03E6($v0) ## 000003E6 -/* 00838 8092CE08 10000308 */ beq $zero, $zero, .L8092DA2C +/* 00838 8092CE08 10000308 */ beq $zero, $zero, .L8092DA2C /* 0083C 8092CE0C A64E0198 */ sh $t6, 0x0198($s2) ## 00000198 -/* 00840 8092CE10 28C10222 */ slti $at, $a2, 0x0222 +/* 00840 8092CE10 28C10222 */ slti $at, $a2, 0x0222 .L8092CE14: -/* 00844 8092CE14 1420004F */ bne $at, $zero, .L8092CF54 +/* 00844 8092CE14 1420004F */ bne $at, $zero, .L8092CF54 /* 00848 8092CE18 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0084C 8092CE1C 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 00850 8092CE20 C4E60028 */ lwc1 $f6, 0x0028($a3) ## 00000028 /* 00854 8092CE24 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00858 8092CE28 3C038093 */ lui $v1, %hi(D_80937340) ## $v1 = 80930000 -/* 0085C 8092CE2C 4606203C */ c.lt.s $f4, $f6 +/* 0085C 8092CE2C 4606203C */ c.lt.s $f4, $f6 /* 00860 8092CE30 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C /* 00864 8092CE34 24637340 */ addiu $v1, $v1, %lo(D_80937340) ## $v1 = 80937340 /* 00868 8092CE38 02202025 */ or $a0, $s1, $zero ## $a0 = 8093734C -/* 0086C 8092CE3C 4500000B */ bc1f .L8092CE6C +/* 0086C 8092CE3C 4500000B */ bc1f .L8092CE6C /* 00870 8092CE40 24E50024 */ addiu $a1, $a3, 0x0024 ## $a1 = 00000024 /* 00874 8092CE44 C4680000 */ lwc1 $f8, 0x0000($v1) ## 80937340 /* 00878 8092CE48 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 @@ -139,18 +139,18 @@ glabel func_8092CC58 .L8092CE6C: /* 0089C 8092CE6C 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy -/* 008A0 8092CE70 AFA7004C */ sw $a3, 0x004C($sp) -/* 008A4 8092CE74 8FA7004C */ lw $a3, 0x004C($sp) +/* 008A0 8092CE70 AFA7004C */ sw $a3, 0x004C($sp) +/* 008A4 8092CE74 8FA7004C */ lw $a3, 0x004C($sp) /* 008A8 8092CE78 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008AC 8092CE7C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 008B0 8092CE80 94EF0088 */ lhu $t7, 0x0088($a3) ## 00000088 /* 008B4 8092CE84 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 008B8 8092CE88 13000030 */ beq $t8, $zero, .L8092CF4C +/* 008B8 8092CE88 13000030 */ beq $t8, $zero, .L8092CF4C /* 008BC 8092CE8C 00000000 */ nop /* 008C0 8092CE90 82590195 */ lb $t9, 0x0195($s2) ## 00000195 /* 008C4 8092CE94 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 008C8 8092CE98 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 008CC 8092CE9C 17200011 */ bne $t9, $zero, .L8092CEE4 +/* 008CC 8092CE9C 17200011 */ bne $t9, $zero, .L8092CEE4 /* 008D0 8092CEA0 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 /* 008D4 8092CEA4 3C108094 */ lui $s0, %hi(D_80938CA0) ## $s0 = 80940000 /* 008D8 8092CEA8 26108CA0 */ addiu $s0, $s0, %lo(D_80938CA0) ## $s0 = 80938CA0 @@ -160,28 +160,28 @@ glabel func_8092CC58 /* 008E8 8092CEB8 A542001C */ sh $v0, 0x001C($t2) ## 0000001C /* 008EC 8092CEBC A2420195 */ sb $v0, 0x0195($s2) ## 00000195 /* 008F0 8092CEC0 C64C008C */ lwc1 $f12, 0x008C($s2) ## 0000008C -/* 008F4 8092CEC4 0C02A800 */ jal func_800AA000 +/* 008F4 8092CEC4 0C02A800 */ jal func_800AA000 /* 008F8 8092CEC8 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 /* 008FC 8092CECC 8E040000 */ lw $a0, 0x0000($s0) ## 80938CA0 /* 00900 8092CED0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00904 8092CED4 24053951 */ addiu $a1, $zero, 0x3951 ## $a1 = 00003951 /* 00908 8092CED8 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 0090C 8092CEDC 100002D3 */ beq $zero, $zero, .L8092DA2C +/* 0090C 8092CEDC 100002D3 */ beq $zero, $zero, .L8092DA2C /* 00910 8092CEE0 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 .L8092CEE4: /* 00914 8092CEE4 94AB0EE2 */ lhu $t3, 0x0EE2($a1) ## 00000EE2 /* 00918 8092CEE8 3C028093 */ lui $v0, %hi(BossSst_Draw) ## $v0 = 80930000 /* 0091C 8092CEEC 24424668 */ addiu $v0, $v0, %lo(BossSst_Draw) ## $v0 = 80934668 /* 00920 8092CEF0 316C0080 */ andi $t4, $t3, 0x0080 ## $t4 = 00000000 -/* 00924 8092CEF4 11800014 */ beq $t4, $zero, .L8092CF48 +/* 00924 8092CEF4 11800014 */ beq $t4, $zero, .L8092CF48 /* 00928 8092CEF8 24190222 */ addiu $t9, $zero, 0x0222 ## $t9 = 00000222 /* 0092C 8092CEFC 3C0D8094 */ lui $t5, %hi(D_80938C9C) ## $t5 = 80940000 -/* 00930 8092CF00 8DAD8C9C */ lw $t5, %lo(D_80938C9C)($t5) +/* 00930 8092CF00 8DAD8C9C */ lw $t5, %lo(D_80938C9C)($t5) /* 00934 8092CF04 3C0E8094 */ lui $t6, %hi(D_80938C98) ## $t6 = 80940000 /* 00938 8092CF08 3C0F8093 */ lui $t7, %hi(func_809352DC) ## $t7 = 80930000 /* 0093C 8092CF0C ADA20134 */ sw $v0, 0x0134($t5) ## 80940134 -/* 00940 8092CF10 8DCE8C98 */ lw $t6, %lo(D_80938C98)($t6) +/* 00940 8092CF10 8DCE8C98 */ lw $t6, %lo(D_80938C98)($t6) /* 00944 8092CF14 25EF52DC */ addiu $t7, $t7, %lo(func_809352DC) ## $t7 = 809352DC /* 00948 8092CF18 241800B2 */ addiu $t8, $zero, 0x00B2 ## $t8 = 000000B2 /* 0094C 8092CF1C ADC20134 */ sw $v0, 0x0134($t6) ## 80940134 @@ -193,16 +193,16 @@ glabel func_8092CC58 /* 00964 8092CF34 E6200004 */ swc1 $f0, 0x0004($s1) ## 80937350 /* 00968 8092CF38 E6200008 */ swc1 $f0, 0x0008($s1) ## 80937354 /* 0096C 8092CF3C 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00970 8092CF40 100002BA */ beq $zero, $zero, .L8092DA2C +/* 00970 8092CF40 100002BA */ beq $zero, $zero, .L8092DA2C /* 00974 8092CF44 E6320000 */ swc1 $f18, 0x0000($s1) ## 8093734C .L8092CF48: /* 00978 8092CF48 A6590198 */ sh $t9, 0x0198($s2) ## 00000198 .L8092CF4C: -/* 0097C 8092CF4C 100002B7 */ beq $zero, $zero, .L8092DA2C +/* 0097C 8092CF4C 100002B7 */ beq $zero, $zero, .L8092DA2C /* 00980 8092CF50 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 8093E6B0 .L8092CF54: -/* 00984 8092CF54 28C101DE */ slti $at, $a2, 0x01DE -/* 00988 8092CF58 14200010 */ bne $at, $zero, .L8092CF9C +/* 00984 8092CF54 28C101DE */ slti $at, $a2, 0x01DE +/* 00988 8092CF58 14200010 */ bne $at, $zero, .L8092CF9C /* 0098C 8092CF5C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00990 8092CF60 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 00994 8092CF64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -210,28 +210,28 @@ glabel func_8092CC58 /* 0099C 8092CF6C C6040000 */ lwc1 $f4, 0x0000($s0) ## 80937358 /* 009A0 8092CF70 C6080004 */ lwc1 $f8, 0x0004($s0) ## 8093735C /* 009A4 8092CF74 C6100008 */ lwc1 $f16, 0x0008($s0) ## 80937360 -/* 009A8 8092CF78 46002180 */ add.s $f6, $f4, $f0 +/* 009A8 8092CF78 46002180 */ add.s $f6, $f4, $f0 /* 009AC 8092CF7C 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 009B0 8092CF80 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 009B4 8092CF84 46004280 */ add.s $f10, $f8, $f0 +/* 009B4 8092CF84 46004280 */ add.s $f10, $f8, $f0 /* 009B8 8092CF88 E6060000 */ swc1 $f6, 0x0000($s0) ## 80937358 -/* 009BC 8092CF8C 46008481 */ sub.s $f18, $f16, $f0 +/* 009BC 8092CF8C 46008481 */ sub.s $f18, $f16, $f0 /* 009C0 8092CF90 E60A0004 */ swc1 $f10, 0x0004($s0) ## 8093735C -/* 009C4 8092CF94 100002A5 */ beq $zero, $zero, .L8092DA2C +/* 009C4 8092CF94 100002A5 */ beq $zero, $zero, .L8092DA2C /* 009C8 8092CF98 E6120008 */ swc1 $f18, 0x0008($s0) ## 80937360 .L8092CF9C: -/* 009CC 8092CF9C 28C101C0 */ slti $at, $a2, 0x01C0 -/* 009D0 8092CFA0 14200051 */ bne $at, $zero, .L8092D0E8 +/* 009CC 8092CF9C 28C101C0 */ slti $at, $a2, 0x01C0 +/* 009D0 8092CFA0 14200051 */ bne $at, $zero, .L8092D0E8 /* 009D4 8092CFA4 241001CC */ addiu $s0, $zero, 0x01CC ## $s0 = 000001CC -/* 009D8 8092CFA8 16060015 */ bne $s0, $a2, .L8092D000 +/* 009D8 8092CFA8 16060015 */ bne $s0, $a2, .L8092D000 /* 009DC 8092CFAC 3C038093 */ lui $v1, %hi(D_80937340) ## $v1 = 80930000 /* 009E0 8092CFB0 3C0A8094 */ lui $t2, %hi(D_80938C9C) ## $t2 = 80940000 -/* 009E4 8092CFB4 8D4A8C9C */ lw $t2, %lo(D_80938C9C)($t2) +/* 009E4 8092CFB4 8D4A8C9C */ lw $t2, %lo(D_80938C9C)($t2) /* 009E8 8092CFB8 3C028093 */ lui $v0, %hi(BossSst_Draw) ## $v0 = 80930000 /* 009EC 8092CFBC 24424668 */ addiu $v0, $v0, %lo(BossSst_Draw) ## $v0 = 80934668 /* 009F0 8092CFC0 3C0B8094 */ lui $t3, %hi(D_80938C98) ## $t3 = 80940000 /* 009F4 8092CFC4 AD420134 */ sw $v0, 0x0134($t2) ## 80940134 -/* 009F8 8092CFC8 8D6B8C98 */ lw $t3, %lo(D_80938C98)($t3) +/* 009F8 8092CFC8 8D6B8C98 */ lw $t3, %lo(D_80938C98)($t3) /* 009FC 8092CFCC 3C0C8093 */ lui $t4, %hi(func_809352DC) ## $t4 = 80930000 /* 00A00 8092CFD0 258C52DC */ addiu $t4, $t4, %lo(func_809352DC) ## $t4 = 809352DC /* 00A04 8092CFD4 AD620134 */ sw $v0, 0x0134($t3) ## 80940134 @@ -242,12 +242,12 @@ glabel func_8092CC58 /* 00A18 8092CFE8 E4E40024 */ swc1 $f4, 0x0024($a3) ## 00000024 /* 00A1C 8092CFEC C4660008 */ lwc1 $f6, 0x0008($v1) ## 80937348 /* 00A20 8092CFF0 E4E6002C */ swc1 $f6, 0x002C($a3) ## 0000002C -/* 00A24 8092CFF4 0C24BF74 */ jal func_8092FDD0 -/* 00A28 8092CFF8 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) +/* 00A24 8092CFF4 0C24BF74 */ jal func_8092FDD0 +/* 00A28 8092CFF8 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) /* 00A2C 8092CFFC 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D000: -/* 00A30 8092D000 28C101CD */ slti $at, $a2, 0x01CD -/* 00A34 8092D004 14200011 */ bne $at, $zero, .L8092D04C +/* 00A30 8092D000 28C101CD */ slti $at, $a2, 0x01CD +/* 00A34 8092D004 14200011 */ bne $at, $zero, .L8092D04C /* 00A38 8092D008 00000000 */ nop /* 00A3C 8092D00C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00A40 8092D010 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 @@ -258,17 +258,17 @@ glabel func_8092CC58 /* 00A54 8092D024 C6100004 */ lwc1 $f16, 0x0004($s0) ## 8093735C /* 00A58 8092D028 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 00A5C 8092D02C C6040008 */ lwc1 $f4, 0x0008($s0) ## 80937360 -/* 00A60 8092D030 46024281 */ sub.s $f10, $f8, $f2 -/* 00A64 8092D034 46028481 */ sub.s $f18, $f16, $f2 +/* 00A60 8092D030 46024281 */ sub.s $f10, $f8, $f2 +/* 00A64 8092D034 46028481 */ sub.s $f18, $f16, $f2 /* 00A68 8092D038 E60A0000 */ swc1 $f10, 0x0000($s0) ## 80937358 -/* 00A6C 8092D03C 46062200 */ add.s $f8, $f4, $f6 +/* 00A6C 8092D03C 46062200 */ add.s $f8, $f4, $f6 /* 00A70 8092D040 E6120004 */ swc1 $f18, 0x0004($s0) ## 8093735C -/* 00A74 8092D044 10000023 */ beq $zero, $zero, .L8092D0D4 +/* 00A74 8092D044 10000023 */ beq $zero, $zero, .L8092D0D4 /* 00A78 8092D048 E6080008 */ swc1 $f8, 0x0008($s0) ## 80937360 .L8092D04C: -/* 00A7C 8092D04C 16060021 */ bne $s0, $a2, .L8092D0D4 +/* 00A7C 8092D04C 16060021 */ bne $s0, $a2, .L8092D0D4 /* 00A80 8092D050 3C028094 */ lui $v0, %hi(D_80938C9C) ## $v0 = 80940000 -/* 00A84 8092D054 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) +/* 00A84 8092D054 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) /* 00A88 8092D058 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00A8C 8092D05C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00A90 8092D060 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80940008 @@ -280,38 +280,38 @@ glabel func_8092CC58 /* 00AA8 8092D078 C450000C */ lwc1 $f16, 0x000C($v0) ## 8094000C /* 00AAC 8092D07C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00AB0 8092D080 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00AB4 8092D084 46128101 */ sub.s $f4, $f16, $f18 +/* 00AB4 8092D084 46128101 */ sub.s $f4, $f16, $f18 /* 00AB8 8092D088 44818000 */ mtc1 $at, $f16 ## $f16 = 150.00 /* 00ABC 8092D08C 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 00AC0 8092D090 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00AC4 8092D094 E6240004 */ swc1 $f4, 0x0004($s1) ## 80937350 /* 00AC8 8092D098 C4460010 */ lwc1 $f6, 0x0010($v0) ## 80940010 -/* 00ACC 8092D09C 46003200 */ add.s $f8, $f6, $f0 +/* 00ACC 8092D09C 46003200 */ add.s $f8, $f6, $f0 /* 00AD0 8092D0A0 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 00AD4 8092D0A4 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 00AD8 8092D0A8 E6280008 */ swc1 $f8, 0x0008($s1) ## 80937354 /* 00ADC 8092D0AC C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80940008 -/* 00AE0 8092D0B0 46105480 */ add.s $f18, $f10, $f16 +/* 00AE0 8092D0B0 46105480 */ add.s $f18, $f10, $f16 /* 00AE4 8092D0B4 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 /* 00AE8 8092D0B8 E6120000 */ swc1 $f18, 0x0000($s0) ## 80937358 /* 00AEC 8092D0BC C444000C */ lwc1 $f4, 0x000C($v0) ## 8094000C -/* 00AF0 8092D0C0 46062200 */ add.s $f8, $f4, $f6 +/* 00AF0 8092D0C0 46062200 */ add.s $f8, $f4, $f6 /* 00AF4 8092D0C4 E6080004 */ swc1 $f8, 0x0004($s0) ## 8093735C /* 00AF8 8092D0C8 C44A0010 */ lwc1 $f10, 0x0010($v0) ## 80940010 -/* 00AFC 8092D0CC 46105480 */ add.s $f18, $f10, $f16 +/* 00AFC 8092D0CC 46105480 */ add.s $f18, $f10, $f16 /* 00B00 8092D0D0 E6120008 */ swc1 $f18, 0x0008($s0) ## 80937360 .L8092D0D4: /* 00B04 8092D0D4 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00B08 8092D0D8 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00B0C 8092D0DC 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00B10 8092D0E0 10000252 */ beq $zero, $zero, .L8092DA2C +/* 00B10 8092D0E0 10000252 */ beq $zero, $zero, .L8092DA2C /* 00B14 8092D0E4 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 .L8092D0E8: -/* 00B18 8092D0E8 28C10174 */ slti $at, $a2, 0x0174 -/* 00B1C 8092D0EC 14200068 */ bne $at, $zero, .L8092D290 +/* 00B18 8092D0E8 28C10174 */ slti $at, $a2, 0x0174 +/* 00B1C 8092D0EC 14200068 */ bne $at, $zero, .L8092D290 /* 00B20 8092D0F0 240101BF */ addiu $at, $zero, 0x01BF ## $at = 000001BF /* 00B24 8092D0F4 24C8FE8C */ addiu $t0, $a2, 0xFE8C ## $t0 = FFFFFE8C -/* 00B28 8092D0F8 14C10016 */ bne $a2, $at, .L8092D154 +/* 00B28 8092D0F8 14C10016 */ bne $a2, $at, .L8092D154 /* 00B2C 8092D0FC 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 /* 00B30 8092D100 8CEE0024 */ lw $t6, 0x0024($a3) ## 00000024 /* 00B34 8092D104 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 @@ -332,13 +332,13 @@ glabel func_8092CC58 /* 00B70 8092D140 E6060004 */ swc1 $f6, 0x0004($s0) ## 8093735C /* 00B74 8092D144 AE2E0008 */ sw $t6, 0x0008($s1) ## 80937354 /* 00B78 8092D148 E6080008 */ swc1 $f8, 0x0008($s0) ## 80937360 -/* 00B7C 8092D14C 1000004B */ beq $zero, $zero, .L8092D27C +/* 00B7C 8092D14C 1000004B */ beq $zero, $zero, .L8092D27C /* 00B80 8092D150 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D154: /* 00B84 8092D154 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00B88 8092D158 15010023 */ bne $t0, $at, .L8092D1E8 +/* 00B88 8092D158 15010023 */ bne $t0, $at, .L8092D1E8 /* 00B8C 8092D15C 3C028094 */ lui $v0, %hi(D_80938C9C) ## $v0 = 80940000 -/* 00B90 8092D160 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) +/* 00B90 8092D160 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) /* 00B94 8092D164 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00B98 8092D168 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 /* 00B9C 8092D16C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -346,7 +346,7 @@ glabel func_8092CC58 /* 00BA4 8092D174 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80940008 /* 00BA8 8092D178 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00BAC 8092D17C 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00BB0 8092D180 46105480 */ add.s $f18, $f10, $f16 +/* 00BB0 8092D180 46105480 */ add.s $f18, $f10, $f16 /* 00BB4 8092D184 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00BB8 8092D188 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 00BBC 8092D18C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -358,26 +358,26 @@ glabel func_8092CC58 /* 00BD4 8092D1A4 C4460010 */ lwc1 $f6, 0x0010($v0) ## 80940010 /* 00BD8 8092D1A8 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 00BDC 8092D1AC 3C014352 */ lui $at, 0x4352 ## $at = 43520000 -/* 00BE0 8092D1B0 46083280 */ add.s $f10, $f6, $f8 +/* 00BE0 8092D1B0 46083280 */ add.s $f10, $f6, $f8 /* 00BE4 8092D1B4 E62A0008 */ swc1 $f10, 0x0008($s1) ## 80937354 /* 00BE8 8092D1B8 C4500008 */ lwc1 $f16, 0x0008($v0) ## 80940008 -/* 00BEC 8092D1BC 46128100 */ add.s $f4, $f16, $f18 +/* 00BEC 8092D1BC 46128100 */ add.s $f4, $f16, $f18 /* 00BF0 8092D1C0 44818000 */ mtc1 $at, $f16 ## $f16 = 210.00 /* 00BF4 8092D1C4 E6040000 */ swc1 $f4, 0x0000($s0) ## 80937358 /* 00BF8 8092D1C8 C446000C */ lwc1 $f6, 0x000C($v0) ## 8094000C -/* 00BFC 8092D1CC 46003200 */ add.s $f8, $f6, $f0 +/* 00BFC 8092D1CC 46003200 */ add.s $f8, $f6, $f0 /* 00C00 8092D1D0 E6080004 */ swc1 $f8, 0x0004($s0) ## 8093735C /* 00C04 8092D1D4 C44A0010 */ lwc1 $f10, 0x0010($v0) ## 80940010 -/* 00C08 8092D1D8 46105481 */ sub.s $f18, $f10, $f16 +/* 00C08 8092D1D8 46105481 */ sub.s $f18, $f10, $f16 /* 00C0C 8092D1DC E6120008 */ swc1 $f18, 0x0008($s0) ## 80937360 -/* 00C10 8092D1E0 10000026 */ beq $zero, $zero, .L8092D27C +/* 00C10 8092D1E0 10000026 */ beq $zero, $zero, .L8092D27C /* 00C14 8092D1E4 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D1E8: /* 00C18 8092D1E8 2401003E */ addiu $at, $zero, 0x003E ## $at = 0000003E -/* 00C1C 8092D1EC 15010023 */ bne $t0, $at, .L8092D27C +/* 00C1C 8092D1EC 15010023 */ bne $t0, $at, .L8092D27C /* 00C20 8092D1F0 00000000 */ nop /* 00C24 8092D1F4 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 00C28 8092D1F8 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) +/* 00C28 8092D1F8 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) /* 00C2C 8092D1FC 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00C30 8092D200 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C /* 00C34 8092D204 C4640008 */ lwc1 $f4, 0x0008($v1) ## 80940008 @@ -387,7 +387,7 @@ glabel func_8092CC58 /* 00C44 8092D214 C466000C */ lwc1 $f6, 0x000C($v1) ## 8094000C /* 00C48 8092D218 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00C4C 8092D21C 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 00C50 8092D220 46083280 */ add.s $f10, $f6, $f8 +/* 00C50 8092D220 46083280 */ add.s $f10, $f6, $f8 /* 00C54 8092D224 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 /* 00C58 8092D228 44814000 */ mtc1 $at, $f8 ## $f8 = 110.00 /* 00C5C 8092D22C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 @@ -395,42 +395,42 @@ glabel func_8092CC58 /* 00C64 8092D234 C4700010 */ lwc1 $f16, 0x0010($v1) ## 80940010 /* 00C68 8092D238 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 00C6C 8092D23C 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 00C70 8092D240 46128100 */ add.s $f4, $f16, $f18 +/* 00C70 8092D240 46128100 */ add.s $f4, $f16, $f18 /* 00C74 8092D244 44819000 */ mtc1 $at, $f18 ## $f18 = 180.00 /* 00C78 8092D248 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 00C7C 8092D24C E6240008 */ swc1 $f4, 0x0008($s1) ## 80937354 /* 00C80 8092D250 C4660008 */ lwc1 $f6, 0x0008($v1) ## 80940008 -/* 00C84 8092D254 46083280 */ add.s $f10, $f6, $f8 +/* 00C84 8092D254 46083280 */ add.s $f10, $f6, $f8 /* 00C88 8092D258 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 /* 00C8C 8092D25C E60A0000 */ swc1 $f10, 0x0000($s0) ## 80937358 /* 00C90 8092D260 C470000C */ lwc1 $f16, 0x000C($v1) ## 8094000C -/* 00C94 8092D264 46128100 */ add.s $f4, $f16, $f18 +/* 00C94 8092D264 46128100 */ add.s $f4, $f16, $f18 /* 00C98 8092D268 E6040004 */ swc1 $f4, 0x0004($s0) ## 8093735C /* 00C9C 8092D26C C4660010 */ lwc1 $f6, 0x0010($v1) ## 80940010 -/* 00CA0 8092D270 46083281 */ sub.s $f10, $f6, $f8 +/* 00CA0 8092D270 46083281 */ sub.s $f10, $f6, $f8 /* 00CA4 8092D274 E60A0008 */ swc1 $f10, 0x0008($s0) ## 80937360 /* 00CA8 8092D278 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D27C: /* 00CAC 8092D27C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00CB0 8092D280 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00CB4 8092D284 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00CB8 8092D288 10000116 */ beq $zero, $zero, .L8092D6E4 +/* 00CB8 8092D288 10000116 */ beq $zero, $zero, .L8092D6E4 /* 00CBC 8092D28C 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 .L8092D290: -/* 00CC0 8092D290 28C10130 */ slti $at, $a2, 0x0130 -/* 00CC4 8092D294 1420004F */ bne $at, $zero, .L8092D3D4 +/* 00CC0 8092D290 28C10130 */ slti $at, $a2, 0x0130 +/* 00CC4 8092D294 1420004F */ bne $at, $zero, .L8092D3D4 /* 00CC8 8092D298 24C8FED0 */ addiu $t0, $a2, 0xFED0 ## $t0 = FFFFFED0 /* 00CCC 8092D29C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00CD0 8092D2A0 15010025 */ bne $t0, $at, .L8092D338 +/* 00CD0 8092D2A0 15010025 */ bne $t0, $at, .L8092D338 /* 00CD4 8092D2A4 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 /* 00CD8 8092D2A8 3C028094 */ lui $v0, %hi(D_80938C9C) ## $v0 = 80940000 -/* 00CDC 8092D2AC 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) +/* 00CDC 8092D2AC 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) /* 00CE0 8092D2B0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00CE4 8092D2B4 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 /* 00CE8 8092D2B8 C4500008 */ lwc1 $f16, 0x0008($v0) ## 80940008 /* 00CEC 8092D2BC 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00CF0 8092D2C0 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00CF4 8092D2C4 46028480 */ add.s $f18, $f16, $f2 +/* 00CF4 8092D2C4 46028480 */ add.s $f18, $f16, $f2 /* 00CF8 8092D2C8 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 00CFC 8092D2CC 44813000 */ mtc1 $at, $f6 ## $f6 = 90.00 /* 00D00 8092D2D0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -438,39 +438,39 @@ glabel func_8092CC58 /* 00D08 8092D2D8 C444000C */ lwc1 $f4, 0x000C($v0) ## 8094000C /* 00D0C 8092D2DC 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00D10 8092D2E0 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00D14 8092D2E4 46062201 */ sub.s $f8, $f4, $f6 +/* 00D14 8092D2E4 46062201 */ sub.s $f8, $f4, $f6 /* 00D18 8092D2E8 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 00D1C 8092D2EC 3C014352 */ lui $at, 0x4352 ## $at = 43520000 /* 00D20 8092D2F0 E6280004 */ swc1 $f8, 0x0004($s1) ## 80937350 /* 00D24 8092D2F4 C44A0010 */ lwc1 $f10, 0x0010($v0) ## 80940010 -/* 00D28 8092D2F8 46025401 */ sub.s $f16, $f10, $f2 +/* 00D28 8092D2F8 46025401 */ sub.s $f16, $f10, $f2 /* 00D2C 8092D2FC 44815000 */ mtc1 $at, $f10 ## $f10 = 210.00 /* 00D30 8092D300 3C01432A */ lui $at, 0x432A ## $at = 432A0000 /* 00D34 8092D304 E6300008 */ swc1 $f16, 0x0008($s1) ## 80937354 /* 00D38 8092D308 C4520008 */ lwc1 $f18, 0x0008($v0) ## 80940008 -/* 00D3C 8092D30C 46049181 */ sub.s $f6, $f18, $f4 +/* 00D3C 8092D30C 46049181 */ sub.s $f6, $f18, $f4 /* 00D40 8092D310 44812000 */ mtc1 $at, $f4 ## $f4 = 170.00 /* 00D44 8092D314 E6060000 */ swc1 $f6, 0x0000($s0) ## 80937358 /* 00D48 8092D318 C448000C */ lwc1 $f8, 0x000C($v0) ## 8094000C -/* 00D4C 8092D31C 460A4400 */ add.s $f16, $f8, $f10 +/* 00D4C 8092D31C 460A4400 */ add.s $f16, $f8, $f10 /* 00D50 8092D320 E6100004 */ swc1 $f16, 0x0004($s0) ## 8093735C /* 00D54 8092D324 C4520010 */ lwc1 $f18, 0x0010($v0) ## 80940010 -/* 00D58 8092D328 46049180 */ add.s $f6, $f18, $f4 +/* 00D58 8092D328 46049180 */ add.s $f6, $f18, $f4 /* 00D5C 8092D32C E6060008 */ swc1 $f6, 0x0008($s0) ## 80937360 -/* 00D60 8092D330 10000023 */ beq $zero, $zero, .L8092D3C0 +/* 00D60 8092D330 10000023 */ beq $zero, $zero, .L8092D3C0 /* 00D64 8092D334 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D338: /* 00D68 8092D338 24010170 */ addiu $at, $zero, 0x0170 ## $at = 00000170 -/* 00D6C 8092D33C 14C10020 */ bne $a2, $at, .L8092D3C0 +/* 00D6C 8092D33C 14C10020 */ bne $a2, $at, .L8092D3C0 /* 00D70 8092D340 00000000 */ nop /* 00D74 8092D344 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 00D78 8092D348 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) +/* 00D78 8092D348 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) /* 00D7C 8092D34C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00D80 8092D350 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 00D84 8092D354 C4680008 */ lwc1 $f8, 0x0008($v1) ## 80940008 /* 00D88 8092D358 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00D8C 8092D35C 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00D90 8092D360 460A4401 */ sub.s $f16, $f8, $f10 +/* 00D90 8092D360 460A4401 */ sub.s $f16, $f8, $f10 /* 00D94 8092D364 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 00D98 8092D368 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 /* 00D9C 8092D36C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 @@ -484,33 +484,33 @@ glabel func_8092CC58 /* 00DBC 8092D38C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00DC0 8092D390 E6240008 */ swc1 $f4, 0x0008($s1) ## 80937354 /* 00DC4 8092D394 C4660008 */ lwc1 $f6, 0x0008($v1) ## 80940008 -/* 00DC8 8092D398 46083281 */ sub.s $f10, $f6, $f8 +/* 00DC8 8092D398 46083281 */ sub.s $f10, $f6, $f8 /* 00DCC 8092D39C 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 /* 00DD0 8092D3A0 E60A0000 */ swc1 $f10, 0x0000($s0) ## 80937358 /* 00DD4 8092D3A4 C470000C */ lwc1 $f16, 0x000C($v1) ## 8094000C -/* 00DD8 8092D3A8 46128100 */ add.s $f4, $f16, $f18 +/* 00DD8 8092D3A8 46128100 */ add.s $f4, $f16, $f18 /* 00DDC 8092D3AC E6040004 */ swc1 $f4, 0x0004($s0) ## 8093735C /* 00DE0 8092D3B0 C4660010 */ lwc1 $f6, 0x0010($v1) ## 80940010 -/* 00DE4 8092D3B4 46083280 */ add.s $f10, $f6, $f8 +/* 00DE4 8092D3B4 46083280 */ add.s $f10, $f6, $f8 /* 00DE8 8092D3B8 E60A0008 */ swc1 $f10, 0x0008($s0) ## 80937360 /* 00DEC 8092D3BC 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D3C0: /* 00DF0 8092D3C0 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00DF4 8092D3C4 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00DF8 8092D3C8 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00DFC 8092D3CC 100000C5 */ beq $zero, $zero, .L8092D6E4 +/* 00DFC 8092D3CC 100000C5 */ beq $zero, $zero, .L8092D6E4 /* 00E00 8092D3D0 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 .L8092D3D4: -/* 00E04 8092D3D4 28C100F4 */ slti $at, $a2, 0x00F4 -/* 00E08 8092D3D8 14200055 */ bne $at, $zero, .L8092D530 +/* 00E04 8092D3D4 28C100F4 */ slti $at, $a2, 0x00F4 +/* 00E08 8092D3D8 14200055 */ bne $at, $zero, .L8092D530 /* 00E0C 8092D3DC 24C8FF0C */ addiu $t0, $a2, 0xFF0C ## $t0 = FFFFFF0C /* 00E10 8092D3E0 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00E14 8092D3E4 15010027 */ bne $t0, $at, .L8092D484 +/* 00E14 8092D3E4 15010027 */ bne $t0, $at, .L8092D484 /* 00E18 8092D3E8 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 00E1C 8092D3EC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00E20 8092D3F0 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 /* 00E24 8092D3F4 3C028094 */ lui $v0, %hi(D_80938C9C) ## $v0 = 80940000 -/* 00E28 8092D3F8 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) +/* 00E28 8092D3F8 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) /* 00E2C 8092D3FC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00E30 8092D400 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 /* 00E34 8092D404 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -518,7 +518,7 @@ glabel func_8092CC58 /* 00E3C 8092D40C C4500008 */ lwc1 $f16, 0x0008($v0) ## 80940008 /* 00E40 8092D410 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00E44 8092D414 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00E48 8092D418 46128100 */ add.s $f4, $f16, $f18 +/* 00E48 8092D418 46128100 */ add.s $f4, $f16, $f18 /* 00E4C 8092D41C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 00E50 8092D420 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 /* 00E54 8092D424 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 @@ -526,31 +526,31 @@ glabel func_8092CC58 /* 00E5C 8092D42C C446000C */ lwc1 $f6, 0x000C($v0) ## 8094000C /* 00E60 8092D430 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00E64 8092D434 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00E68 8092D438 46083280 */ add.s $f10, $f6, $f8 +/* 00E68 8092D438 46083280 */ add.s $f10, $f6, $f8 /* 00E6C 8092D43C 44813000 */ mtc1 $at, $f6 ## $f6 = 110.00 /* 00E70 8092D440 3C01430C */ lui $at, 0x430C ## $at = 430C0000 /* 00E74 8092D444 E62A0004 */ swc1 $f10, 0x0004($s1) ## 80937350 /* 00E78 8092D448 C4500010 */ lwc1 $f16, 0x0010($v0) ## 80940010 -/* 00E7C 8092D44C 46028480 */ add.s $f18, $f16, $f2 +/* 00E7C 8092D44C 46028480 */ add.s $f18, $f16, $f2 /* 00E80 8092D450 44818000 */ mtc1 $at, $f16 ## $f16 = 140.00 /* 00E84 8092D454 E6320008 */ swc1 $f18, 0x0008($s1) ## 80937354 /* 00E88 8092D458 C4440008 */ lwc1 $f4, 0x0008($v0) ## 80940008 -/* 00E8C 8092D45C 46062200 */ add.s $f8, $f4, $f6 +/* 00E8C 8092D45C 46062200 */ add.s $f8, $f4, $f6 /* 00E90 8092D460 E6080000 */ swc1 $f8, 0x0000($s0) ## 80937358 /* 00E94 8092D464 C44A000C */ lwc1 $f10, 0x000C($v0) ## 8094000C -/* 00E98 8092D468 46105481 */ sub.s $f18, $f10, $f16 +/* 00E98 8092D468 46105481 */ sub.s $f18, $f10, $f16 /* 00E9C 8092D46C E6120004 */ swc1 $f18, 0x0004($s0) ## 8093735C /* 00EA0 8092D470 C4440010 */ lwc1 $f4, 0x0010($v0) ## 80940010 -/* 00EA4 8092D474 46002181 */ sub.s $f6, $f4, $f0 +/* 00EA4 8092D474 46002181 */ sub.s $f6, $f4, $f0 /* 00EA8 8092D478 E6060008 */ swc1 $f6, 0x0008($s0) ## 80937360 -/* 00EAC 8092D47C 10000027 */ beq $zero, $zero, .L8092D51C +/* 00EAC 8092D47C 10000027 */ beq $zero, $zero, .L8092D51C /* 00EB0 8092D480 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D484: /* 00EB4 8092D484 2401012C */ addiu $at, $zero, 0x012C ## $at = 0000012C -/* 00EB8 8092D488 14C10024 */ bne $a2, $at, .L8092D51C +/* 00EB8 8092D488 14C10024 */ bne $a2, $at, .L8092D51C /* 00EBC 8092D48C 00000000 */ nop /* 00EC0 8092D490 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 00EC4 8092D494 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) +/* 00EC4 8092D494 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) /* 00EC8 8092D498 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 00ECC 8092D49C 44810000 */ mtc1 $at, $f0 ## $f0 = 130.00 /* 00ED0 8092D4A0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -558,7 +558,7 @@ glabel func_8092CC58 /* 00ED8 8092D4A8 C4680008 */ lwc1 $f8, 0x0008($v1) ## 80940008 /* 00EDC 8092D4AC 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00EE0 8092D4B0 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00EE4 8092D4B4 460A4401 */ sub.s $f16, $f8, $f10 +/* 00EE4 8092D4B4 460A4401 */ sub.s $f16, $f8, $f10 /* 00EE8 8092D4B8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 00EEC 8092D4BC 44812000 */ mtc1 $at, $f4 ## $f4 = 80.00 /* 00EF0 8092D4C0 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 @@ -566,41 +566,41 @@ glabel func_8092CC58 /* 00EF8 8092D4C8 C472000C */ lwc1 $f18, 0x000C($v1) ## 8094000C /* 00EFC 8092D4CC 44815000 */ mtc1 $at, $f10 ## $f10 = 320.00 /* 00F00 8092D4D0 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00F04 8092D4D4 46049181 */ sub.s $f6, $f18, $f4 +/* 00F04 8092D4D4 46049181 */ sub.s $f6, $f18, $f4 /* 00F08 8092D4D8 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 00F0C 8092D4DC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00F10 8092D4E0 E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 /* 00F14 8092D4E4 C4680010 */ lwc1 $f8, 0x0010($v1) ## 80940010 -/* 00F18 8092D4E8 460A4400 */ add.s $f16, $f8, $f10 +/* 00F18 8092D4E8 460A4400 */ add.s $f16, $f8, $f10 /* 00F1C 8092D4EC E6300008 */ swc1 $f16, 0x0008($s1) ## 80937354 /* 00F20 8092D4F0 C4720008 */ lwc1 $f18, 0x0008($v1) ## 80940008 /* 00F24 8092D4F4 44818000 */ mtc1 $at, $f16 ## $f16 = 150.00 -/* 00F28 8092D4F8 46009101 */ sub.s $f4, $f18, $f0 +/* 00F28 8092D4F8 46009101 */ sub.s $f4, $f18, $f0 /* 00F2C 8092D4FC E6040000 */ swc1 $f4, 0x0000($s0) ## 80937358 /* 00F30 8092D500 C466000C */ lwc1 $f6, 0x000C($v1) ## 8094000C -/* 00F34 8092D504 46003200 */ add.s $f8, $f6, $f0 +/* 00F34 8092D504 46003200 */ add.s $f8, $f6, $f0 /* 00F38 8092D508 E6080004 */ swc1 $f8, 0x0004($s0) ## 8093735C /* 00F3C 8092D50C C46A0010 */ lwc1 $f10, 0x0010($v1) ## 80940010 -/* 00F40 8092D510 46105481 */ sub.s $f18, $f10, $f16 +/* 00F40 8092D510 46105481 */ sub.s $f18, $f10, $f16 /* 00F44 8092D514 E6120008 */ swc1 $f18, 0x0008($s0) ## 80937360 /* 00F48 8092D518 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D51C: /* 00F4C 8092D51C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00F50 8092D520 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00F54 8092D524 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00F58 8092D528 1000006E */ beq $zero, $zero, .L8092D6E4 +/* 00F58 8092D528 1000006E */ beq $zero, $zero, .L8092D6E4 /* 00F5C 8092D52C 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 .L8092D530: -/* 00F60 8092D530 28C100C0 */ slti $at, $a2, 0x00C0 -/* 00F64 8092D534 14200051 */ bne $at, $zero, .L8092D67C +/* 00F60 8092D530 28C100C0 */ slti $at, $a2, 0x00C0 +/* 00F64 8092D534 14200051 */ bne $at, $zero, .L8092D67C /* 00F68 8092D538 240100F0 */ addiu $at, $zero, 0x00F0 ## $at = 000000F0 /* 00F6C 8092D53C 24C8FF40 */ addiu $t0, $a2, 0xFF40 ## $t0 = FFFFFF40 -/* 00F70 8092D540 14C10027 */ bne $a2, $at, .L8092D5E0 +/* 00F70 8092D540 14C10027 */ bne $a2, $at, .L8092D5E0 /* 00F74 8092D544 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 00F78 8092D548 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 00F7C 8092D54C 44810000 */ mtc1 $at, $f0 ## $f0 = 130.00 /* 00F80 8092D550 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 00F84 8092D554 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) +/* 00F84 8092D554 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) /* 00F88 8092D558 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00F8C 8092D55C 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 /* 00F90 8092D560 3C01433E */ lui $at, 0x433E ## $at = 433E0000 @@ -608,7 +608,7 @@ glabel func_8092CC58 /* 00F98 8092D568 C4640008 */ lwc1 $f4, 0x0008($v1) ## 80940008 /* 00F9C 8092D56C 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00FA0 8092D570 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00FA4 8092D574 46062201 */ sub.s $f8, $f4, $f6 +/* 00FA4 8092D574 46062201 */ sub.s $f8, $f4, $f6 /* 00FA8 8092D578 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 /* 00FAC 8092D57C 44818000 */ mtc1 $at, $f16 ## $f16 = 110.00 /* 00FB0 8092D580 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 @@ -616,28 +616,28 @@ glabel func_8092CC58 /* 00FB8 8092D588 C46A000C */ lwc1 $f10, 0x000C($v1) ## 8094000C /* 00FBC 8092D58C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00FC0 8092D590 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00FC4 8092D594 46105481 */ sub.s $f18, $f10, $f16 +/* 00FC4 8092D594 46105481 */ sub.s $f18, $f10, $f16 /* 00FC8 8092D598 44815000 */ mtc1 $at, $f10 ## $f10 = 120.00 /* 00FCC 8092D59C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 00FD0 8092D5A0 E6320004 */ swc1 $f18, 0x0004($s1) ## 80937350 /* 00FD4 8092D5A4 C4640010 */ lwc1 $f4, 0x0010($v1) ## 80940010 -/* 00FD8 8092D5A8 46022180 */ add.s $f6, $f4, $f2 +/* 00FD8 8092D5A8 46022180 */ add.s $f6, $f4, $f2 /* 00FDC 8092D5AC E6260008 */ swc1 $f6, 0x0008($s1) ## 80937354 /* 00FE0 8092D5B0 C4680008 */ lwc1 $f8, 0x0008($v1) ## 80940008 -/* 00FE4 8092D5B4 460A4400 */ add.s $f16, $f8, $f10 +/* 00FE4 8092D5B4 460A4400 */ add.s $f16, $f8, $f10 /* 00FE8 8092D5B8 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 00FEC 8092D5BC E6100000 */ swc1 $f16, 0x0000($s0) ## 80937358 /* 00FF0 8092D5C0 C472000C */ lwc1 $f18, 0x000C($v1) ## 8094000C -/* 00FF4 8092D5C4 46009100 */ add.s $f4, $f18, $f0 +/* 00FF4 8092D5C4 46009100 */ add.s $f4, $f18, $f0 /* 00FF8 8092D5C8 E6040004 */ swc1 $f4, 0x0004($s0) ## 8093735C /* 00FFC 8092D5CC C4660010 */ lwc1 $f6, 0x0010($v1) ## 80940010 -/* 01000 8092D5D0 46083280 */ add.s $f10, $f6, $f8 +/* 01000 8092D5D0 46083280 */ add.s $f10, $f6, $f8 /* 01004 8092D5D4 E60A0008 */ swc1 $f10, 0x0008($s0) ## 80937360 -/* 01008 8092D5D8 10000023 */ beq $zero, $zero, .L8092D668 +/* 01008 8092D5D8 10000023 */ beq $zero, $zero, .L8092D668 /* 0100C 8092D5DC 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D5E0: /* 01010 8092D5E0 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01014 8092D5E4 15010020 */ bne $t0, $at, .L8092D668 +/* 01014 8092D5E4 15010020 */ bne $t0, $at, .L8092D668 /* 01018 8092D5E8 00000000 */ nop /* 0101C 8092D5EC 3C038093 */ lui $v1, %hi(D_80937340) ## $v1 = 80930000 /* 01020 8092D5F0 24637340 */ addiu $v1, $v1, %lo(D_80937340) ## $v1 = 80937340 @@ -648,23 +648,23 @@ glabel func_8092CC58 /* 01034 8092D604 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 /* 01038 8092D608 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 0103C 8092D60C 44812000 */ mtc1 $at, $f4 ## $f4 = 90.00 -/* 01040 8092D610 46128080 */ add.s $f2, $f16, $f18 +/* 01040 8092D610 46128080 */ add.s $f2, $f16, $f18 /* 01044 8092D614 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01048 8092D618 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 -/* 0104C 8092D61C 46046181 */ sub.s $f6, $f12, $f4 +/* 0104C 8092D61C 46046181 */ sub.s $f6, $f12, $f4 /* 01050 8092D620 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 01054 8092D624 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 01058 8092D628 46080281 */ sub.s $f10, $f0, $f8 +/* 01058 8092D628 46080281 */ sub.s $f10, $f0, $f8 /* 0105C 8092D62C 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 01060 8092D630 44818000 */ mtc1 $at, $f16 ## $f16 = 350.00 /* 01064 8092D634 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 01068 8092D638 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 0106C 8092D63C 46106480 */ add.s $f18, $f12, $f16 +/* 0106C 8092D63C 46106480 */ add.s $f18, $f12, $f16 /* 01070 8092D640 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 01074 8092D644 44812000 */ mtc1 $at, $f4 ## $f4 = 150.00 /* 01078 8092D648 E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 /* 0107C 8092D64C E6220000 */ swc1 $f2, 0x0000($s1) ## 8093734C -/* 01080 8092D650 46040180 */ add.s $f6, $f0, $f4 +/* 01080 8092D650 46040180 */ add.s $f6, $f0, $f4 /* 01084 8092D654 E62A0008 */ swc1 $f10, 0x0008($s1) ## 80937354 /* 01088 8092D658 E6020000 */ swc1 $f2, 0x0000($s0) ## 80937358 /* 0108C 8092D65C E6120004 */ swc1 $f18, 0x0004($s0) ## 8093735C @@ -674,278 +674,278 @@ glabel func_8092CC58 /* 01098 8092D668 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 0109C 8092D66C 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 010A0 8092D670 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 010A4 8092D674 1000001B */ beq $zero, $zero, .L8092D6E4 +/* 010A4 8092D674 1000001B */ beq $zero, $zero, .L8092D6E4 /* 010A8 8092D678 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 .L8092D67C: -/* 010AC 8092D67C 28C10094 */ slti $at, $a2, 0x0094 -/* 010B0 8092D680 14200007 */ bne $at, $zero, .L8092D6A0 +/* 010AC 8092D67C 28C10094 */ slti $at, $a2, 0x0094 +/* 010B0 8092D680 14200007 */ bne $at, $zero, .L8092D6A0 /* 010B4 8092D684 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 010B8 8092D688 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 010BC 8092D68C 24C8FF6C */ addiu $t0, $a2, 0xFF6C ## $t0 = FFFFFF6C /* 010C0 8092D690 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 010C4 8092D694 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 010C8 8092D698 10000012 */ beq $zero, $zero, .L8092D6E4 +/* 010C8 8092D698 10000012 */ beq $zero, $zero, .L8092D6E4 /* 010CC 8092D69C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 .L8092D6A0: -/* 010D0 8092D6A0 28C10070 */ slti $at, $a2, 0x0070 -/* 010D4 8092D6A4 14200008 */ bne $at, $zero, .L8092D6C8 +/* 010D0 8092D6A0 28C10070 */ slti $at, $a2, 0x0070 +/* 010D4 8092D6A4 14200008 */ bne $at, $zero, .L8092D6C8 /* 010D8 8092D6A8 00004825 */ or $t1, $zero, $zero ## $t1 = 00000000 /* 010DC 8092D6AC 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 010E0 8092D6B0 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 010E4 8092D6B4 24C8FF90 */ addiu $t0, $a2, 0xFF90 ## $t0 = FFFFFF90 /* 010E8 8092D6B8 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 010EC 8092D6BC 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 010F0 8092D6C0 10000008 */ beq $zero, $zero, .L8092D6E4 +/* 010F0 8092D6C0 10000008 */ beq $zero, $zero, .L8092D6E4 /* 010F4 8092D6C4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 .L8092D6C8: /* 010F8 8092D6C8 2401001C */ addiu $at, $zero, 0x001C ## $at = 0000001C -/* 010FC 8092D6CC 00C1001A */ div $zero, $a2, $at -/* 01100 8092D6D0 00004010 */ mfhi $t0 +/* 010FC 8092D6CC 00C1001A */ div $zero, $a2, $at +/* 01100 8092D6D0 00004010 */ mfhi $t0 /* 01104 8092D6D4 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 01108 8092D6D8 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 0110C 8092D6DC 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 01110 8092D6E0 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C .L8092D6E4: -/* 01114 8092D6E4 28C100C7 */ slti $at, $a2, 0x00C7 -/* 01118 8092D6E8 502000B3 */ beql $at, $zero, .L8092D9B8 +/* 01114 8092D6E4 28C100C7 */ slti $at, $a2, 0x00C7 +/* 01118 8092D6E8 502000B3 */ beql $at, $zero, .L8092D9B8 /* 0111C 8092D6EC 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 01120 8092D6F0 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 01124 8092D6F4 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 /* 01128 8092D6F8 94A30EE2 */ lhu $v1, 0x0EE2($a1) ## 8015F542 /* 0112C 8092D6FC 240F00C6 */ addiu $t7, $zero, 0x00C6 ## $t7 = 000000C6 -/* 01130 8092D700 01E61023 */ subu $v0, $t7, $a2 +/* 01130 8092D700 01E61023 */ subu $v0, $t7, $a2 /* 01134 8092D704 30630080 */ andi $v1, $v1, 0x0080 ## $v1 = 00000000 -/* 01138 8092D708 1060001C */ beq $v1, $zero, .L8092D77C -/* 0113C 8092D70C 2841002D */ slti $at, $v0, 0x002D -/* 01140 8092D710 1020001A */ beq $at, $zero, .L8092D77C +/* 01138 8092D708 1060001C */ beq $v1, $zero, .L8092D77C +/* 0113C 8092D70C 2841002D */ slti $at, $v0, 0x002D +/* 01140 8092D710 1020001A */ beq $at, $zero, .L8092D77C /* 01144 8092D714 3C018093 */ lui $at, %hi(D_8093799C) ## $at = 80930000 -/* 01148 8092D718 C42A799C */ lwc1 $f10, %lo(D_8093799C)($at) +/* 01148 8092D718 C42A799C */ lwc1 $f10, %lo(D_8093799C)($at) /* 0114C 8092D71C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 01150 8092D720 C6280000 */ lwc1 $f8, 0x0000($s1) ## 8093734C /* 01154 8092D724 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 /* 01158 8092D728 C6320004 */ lwc1 $f18, 0x0004($s1) ## 80937350 -/* 0115C 8092D72C 460A4400 */ add.s $f16, $f8, $f10 +/* 0115C 8092D72C 460A4400 */ add.s $f16, $f8, $f10 /* 01160 8092D730 3C018093 */ lui $at, %hi(D_809379A0) ## $at = 80930000 /* 01164 8092D734 C6080000 */ lwc1 $f8, 0x0000($s0) ## 80937358 -/* 01168 8092D738 46049180 */ add.s $f6, $f18, $f4 +/* 01168 8092D738 46049180 */ add.s $f6, $f18, $f4 /* 0116C 8092D73C E6300000 */ swc1 $f16, 0x0000($s1) ## 8093734C /* 01170 8092D740 C6120004 */ lwc1 $f18, 0x0004($s0) ## 8093735C /* 01174 8092D744 E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 -/* 01178 8092D748 C42A79A0 */ lwc1 $f10, %lo(D_809379A0)($at) +/* 01178 8092D748 C42A79A0 */ lwc1 $f10, %lo(D_809379A0)($at) /* 0117C 8092D74C 3C018093 */ lui $at, %hi(D_809379A4) ## $at = 80930000 -/* 01180 8092D750 460A4401 */ sub.s $f16, $f8, $f10 +/* 01180 8092D750 460A4401 */ sub.s $f16, $f8, $f10 /* 01184 8092D754 C6080008 */ lwc1 $f8, 0x0008($s0) ## 80937360 /* 01188 8092D758 E6100000 */ swc1 $f16, 0x0000($s0) ## 80937358 -/* 0118C 8092D75C C42479A4 */ lwc1 $f4, %lo(D_809379A4)($at) +/* 0118C 8092D75C C42479A4 */ lwc1 $f4, %lo(D_809379A4)($at) /* 01190 8092D760 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01194 8092D764 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 01198 8092D768 46049181 */ sub.s $f6, $f18, $f4 -/* 0119C 8092D76C 460A4400 */ add.s $f16, $f8, $f10 +/* 01198 8092D768 46049181 */ sub.s $f6, $f18, $f4 +/* 0119C 8092D76C 460A4400 */ add.s $f16, $f8, $f10 /* 011A0 8092D770 E6060004 */ swc1 $f6, 0x0004($s0) ## 8093735C -/* 011A4 8092D774 1000008F */ beq $zero, $zero, .L8092D9B4 +/* 011A4 8092D774 1000008F */ beq $zero, $zero, .L8092D9B4 /* 011A8 8092D778 E6100008 */ swc1 $f16, 0x0008($s0) ## 80937360 .L8092D77C: -/* 011AC 8092D77C 28C10015 */ slti $at, $a2, 0x0015 -/* 011B0 8092D780 1020001F */ beq $at, $zero, .L8092D800 +/* 011AC 8092D77C 28C10015 */ slti $at, $a2, 0x0015 +/* 011B0 8092D780 1020001F */ beq $at, $zero, .L8092D800 /* 011B4 8092D784 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 011B8 8092D788 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 /* 011BC 8092D78C C6320004 */ lwc1 $f18, 0x0004($s1) ## 80937350 /* 011C0 8092D790 3C014110 */ lui $at, 0x4110 ## $at = 41100000 /* 011C4 8092D794 44815000 */ mtc1 $at, $f10 ## $f10 = 9.00 -/* 011C8 8092D798 46049181 */ sub.s $f6, $f18, $f4 +/* 011C8 8092D798 46049181 */ sub.s $f6, $f18, $f4 /* 011CC 8092D79C 3C0140D0 */ lui $at, 0x40D0 ## $at = 40D00000 /* 011D0 8092D7A0 C6280008 */ lwc1 $f8, 0x0008($s1) ## 80937354 /* 011D4 8092D7A4 44812000 */ mtc1 $at, $f4 ## $f4 = 6.50 /* 011D8 8092D7A8 C6120000 */ lwc1 $f18, 0x0000($s0) ## 80937358 /* 011DC 8092D7AC E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 -/* 011E0 8092D7B0 460A4400 */ add.s $f16, $f8, $f10 +/* 011E0 8092D7B0 460A4400 */ add.s $f16, $f8, $f10 /* 011E4 8092D7B4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 011E8 8092D7B8 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 011EC 8092D7BC 46049180 */ add.s $f6, $f18, $f4 +/* 011EC 8092D7BC 46049180 */ add.s $f6, $f18, $f4 /* 011F0 8092D7C0 3C014178 */ lui $at, 0x4178 ## $at = 41780000 /* 011F4 8092D7C4 C6080004 */ lwc1 $f8, 0x0004($s0) ## 8093735C /* 011F8 8092D7C8 44812000 */ mtc1 $at, $f4 ## $f4 = 15.50 /* 011FC 8092D7CC C6120008 */ lwc1 $f18, 0x0008($s0) ## 80937360 /* 01200 8092D7D0 E6300008 */ swc1 $f16, 0x0008($s1) ## 80937354 /* 01204 8092D7D4 E6060000 */ swc1 $f6, 0x0000($s0) ## 80937358 -/* 01208 8092D7D8 460A4400 */ add.s $f16, $f8, $f10 +/* 01208 8092D7D8 460A4400 */ add.s $f16, $f8, $f10 /* 0120C 8092D7DC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01210 8092D7E0 46049180 */ add.s $f6, $f18, $f4 +/* 01210 8092D7E0 46049180 */ add.s $f6, $f18, $f4 /* 01214 8092D7E4 E6100004 */ swc1 $f16, 0x0004($s0) ## 8093735C /* 01218 8092D7E8 E6060008 */ swc1 $f6, 0x0008($s0) ## 80937360 /* 0121C 8092D7EC 8E580004 */ lw $t8, 0x0004($s2) ## 00000004 /* 01220 8092D7F0 A2420194 */ sb $v0, 0x0194($s2) ## 00000194 /* 01224 8092D7F4 37190080 */ ori $t9, $t8, 0x0080 ## $t9 = 00000080 -/* 01228 8092D7F8 1000006E */ beq $zero, $zero, .L8092D9B4 +/* 01228 8092D7F8 1000006E */ beq $zero, $zero, .L8092D9B4 /* 0122C 8092D7FC AE590004 */ sw $t9, 0x0004($s2) ## 00000004 .L8092D800: -/* 01230 8092D800 28410028 */ slti $at, $v0, 0x0028 -/* 01234 8092D804 1020001A */ beq $at, $zero, .L8092D870 +/* 01230 8092D800 28410028 */ slti $at, $v0, 0x0028 +/* 01234 8092D804 1020001A */ beq $at, $zero, .L8092D870 /* 01238 8092D808 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 /* 0123C 8092D80C 44815000 */ mtc1 $at, $f10 ## $f10 = 1.25 /* 01240 8092D810 C6280000 */ lwc1 $f8, 0x0000($s1) ## 8093734C /* 01244 8092D814 3C014060 */ lui $at, 0x4060 ## $at = 40600000 /* 01248 8092D818 44812000 */ mtc1 $at, $f4 ## $f4 = 3.50 -/* 0124C 8092D81C 460A4400 */ add.s $f16, $f8, $f10 +/* 0124C 8092D81C 460A4400 */ add.s $f16, $f8, $f10 /* 01250 8092D820 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01254 8092D824 C6320004 */ lwc1 $f18, 0x0004($s1) ## 80937350 /* 01258 8092D828 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 /* 0125C 8092D82C C6280008 */ lwc1 $f8, 0x0008($s1) ## 80937354 /* 01260 8092D830 E6300000 */ swc1 $f16, 0x0000($s1) ## 8093734C -/* 01264 8092D834 46049180 */ add.s $f6, $f18, $f4 +/* 01264 8092D834 46049180 */ add.s $f6, $f18, $f4 /* 01268 8092D838 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 0126C 8092D83C 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 01270 8092D840 460A4400 */ add.s $f16, $f8, $f10 +/* 01270 8092D840 460A4400 */ add.s $f16, $f8, $f10 /* 01274 8092D844 3C014108 */ lui $at, 0x4108 ## $at = 41080000 /* 01278 8092D848 C6120000 */ lwc1 $f18, 0x0000($s0) ## 80937358 /* 0127C 8092D84C 44815000 */ mtc1 $at, $f10 ## $f10 = 8.50 /* 01280 8092D850 C6080004 */ lwc1 $f8, 0x0004($s0) ## 8093735C /* 01284 8092D854 E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 /* 01288 8092D858 E6300008 */ swc1 $f16, 0x0008($s1) ## 80937354 -/* 0128C 8092D85C 46049180 */ add.s $f6, $f18, $f4 -/* 01290 8092D860 460A4401 */ sub.s $f16, $f8, $f10 +/* 0128C 8092D85C 46049180 */ add.s $f6, $f18, $f4 +/* 01290 8092D860 460A4401 */ sub.s $f16, $f8, $f10 /* 01294 8092D864 E6060000 */ swc1 $f6, 0x0000($s0) ## 80937358 -/* 01298 8092D868 10000052 */ beq $zero, $zero, .L8092D9B4 +/* 01298 8092D868 10000052 */ beq $zero, $zero, .L8092D9B4 /* 0129C 8092D86C E6100004 */ swc1 $f16, 0x0004($s0) ## 8093735C .L8092D870: -/* 012A0 8092D870 2841002D */ slti $at, $v0, 0x002D -/* 012A4 8092D874 1420004F */ bne $at, $zero, .L8092D9B4 -/* 012A8 8092D878 28410055 */ slti $at, $v0, 0x0055 -/* 012AC 8092D87C 1020001F */ beq $at, $zero, .L8092D8FC +/* 012A0 8092D870 2841002D */ slti $at, $v0, 0x002D +/* 012A4 8092D874 1420004F */ bne $at, $zero, .L8092D9B4 +/* 012A8 8092D878 28410055 */ slti $at, $v0, 0x0055 +/* 012AC 8092D87C 1020001F */ beq $at, $zero, .L8092D8FC /* 012B0 8092D880 3C014020 */ lui $at, 0x4020 ## $at = 40200000 /* 012B4 8092D884 44812000 */ mtc1 $at, $f4 ## $f4 = 2.50 /* 012B8 8092D888 3C014088 */ lui $at, 0x4088 ## $at = 40880000 /* 012BC 8092D88C C6320000 */ lwc1 $f18, 0x0000($s1) ## 8093734C /* 012C0 8092D890 44815000 */ mtc1 $at, $f10 ## $f10 = 4.25 /* 012C4 8092D894 C6280004 */ lwc1 $f8, 0x0004($s1) ## 80937350 -/* 012C8 8092D898 46049181 */ sub.s $f6, $f18, $f4 +/* 012C8 8092D898 46049181 */ sub.s $f6, $f18, $f4 /* 012CC 8092D89C 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 012D0 8092D8A0 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 012D4 8092D8A4 460A4400 */ add.s $f16, $f8, $f10 +/* 012D4 8092D8A4 460A4400 */ add.s $f16, $f8, $f10 /* 012D8 8092D8A8 3C0140D0 */ lui $at, 0x40D0 ## $at = 40D00000 /* 012DC 8092D8AC C6320008 */ lwc1 $f18, 0x0008($s1) ## 80937354 /* 012E0 8092D8B0 44815000 */ mtc1 $at, $f10 ## $f10 = 6.50 /* 012E4 8092D8B4 C6080000 */ lwc1 $f8, 0x0000($s0) ## 80937358 /* 012E8 8092D8B8 E6260000 */ swc1 $f6, 0x0000($s1) ## 8093734C /* 012EC 8092D8BC E6300004 */ swc1 $f16, 0x0004($s1) ## 80937350 -/* 012F0 8092D8C0 46049181 */ sub.s $f6, $f18, $f4 +/* 012F0 8092D8C0 46049181 */ sub.s $f6, $f18, $f4 /* 012F4 8092D8C4 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 /* 012F8 8092D8C8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.25 -/* 012FC 8092D8CC 460A4401 */ sub.s $f16, $f8, $f10 +/* 012FC 8092D8CC 460A4401 */ sub.s $f16, $f8, $f10 /* 01300 8092D8D0 3C014060 */ lui $at, 0x4060 ## $at = 40600000 /* 01304 8092D8D4 C6120004 */ lwc1 $f18, 0x0004($s0) ## 8093735C /* 01308 8092D8D8 44815000 */ mtc1 $at, $f10 ## $f10 = 3.50 /* 0130C 8092D8DC C6080008 */ lwc1 $f8, 0x0008($s0) ## 80937360 /* 01310 8092D8E0 E6260008 */ swc1 $f6, 0x0008($s1) ## 80937354 /* 01314 8092D8E4 E6100000 */ swc1 $f16, 0x0000($s0) ## 80937358 -/* 01318 8092D8E8 46049180 */ add.s $f6, $f18, $f4 -/* 0131C 8092D8EC 460A4401 */ sub.s $f16, $f8, $f10 +/* 01318 8092D8E8 46049180 */ add.s $f6, $f18, $f4 +/* 0131C 8092D8EC 460A4401 */ sub.s $f16, $f8, $f10 /* 01320 8092D8F0 E6060004 */ swc1 $f6, 0x0004($s0) ## 8093735C -/* 01324 8092D8F4 1000002F */ beq $zero, $zero, .L8092D9B4 +/* 01324 8092D8F4 1000002F */ beq $zero, $zero, .L8092D9B4 /* 01328 8092D8F8 E6100008 */ swc1 $f16, 0x0008($s0) ## 80937360 .L8092D8FC: /* 0132C 8092D8FC 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 01330 8092D900 5441002D */ bnel $v0, $at, .L8092D9B8 +/* 01330 8092D900 5441002D */ bnel $v0, $at, .L8092D9B8 /* 01334 8092D904 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01338 8092D908 1460001C */ bne $v1, $zero, .L8092D97C -/* 0133C 8092D90C 8FA40054 */ lw $a0, 0x0054($sp) +/* 01338 8092D908 1460001C */ bne $v1, $zero, .L8092D97C +/* 0133C 8092D90C 8FA40054 */ lw $a0, 0x0054($sp) /* 01340 8092D910 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 /* 01344 8092D914 24423D80 */ addiu $v0, $v0, 0x3D80 ## $v0 = 06013D80 -/* 01348 8092D918 00025900 */ sll $t3, $v0, 4 -/* 0134C 8092D91C 000B6702 */ srl $t4, $t3, 28 -/* 01350 8092D920 000C6880 */ sll $t5, $t4, 2 +/* 01348 8092D918 00025900 */ sll $t3, $v0, 4 +/* 0134C 8092D91C 000B6702 */ srl $t4, $t3, 28 +/* 01350 8092D920 000C6880 */ sll $t5, $t4, 2 /* 01354 8092D924 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01358 8092D928 01CD7021 */ addu $t6, $t6, $t5 +/* 01358 8092D928 01CD7021 */ addu $t6, $t6, $t5 /* 0135C 8092D92C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01360 8092D930 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 /* 01364 8092D934 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01368 8092D938 00417824 */ and $t7, $v0, $at +/* 01368 8092D938 00417824 */ and $t7, $v0, $at /* 0136C 8092D93C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01370 8092D940 241800B4 */ addiu $t8, $zero, 0x00B4 ## $t8 = 000000B4 /* 01374 8092D944 24190080 */ addiu $t9, $zero, 0x0080 ## $t9 = 00000080 /* 01378 8092D948 240A0028 */ addiu $t2, $zero, 0x0028 ## $t2 = 00000028 -/* 0137C 8092D94C 01CF3021 */ addu $a2, $t6, $t7 -/* 01380 8092D950 00C13021 */ addu $a2, $a2, $at -/* 01384 8092D954 AFAA0018 */ sw $t2, 0x0018($sp) -/* 01388 8092D958 AFB90014 */ sw $t9, 0x0014($sp) -/* 0138C 8092D95C AFB80010 */ sw $t8, 0x0010($sp) +/* 0137C 8092D94C 01CF3021 */ addu $a2, $t6, $t7 +/* 01380 8092D950 00C13021 */ addu $a2, $a2, $at +/* 01384 8092D954 AFAA0018 */ sw $t2, 0x0018($sp) +/* 01388 8092D958 AFB90014 */ sw $t9, 0x0014($sp) +/* 0138C 8092D95C AFB80010 */ sw $t8, 0x0010($sp) /* 01390 8092D960 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 00001D4C /* 01394 8092D964 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 -/* 01398 8092D968 AFA80044 */ sw $t0, 0x0044($sp) +/* 01398 8092D968 AFA80044 */ sw $t0, 0x0044($sp) /* 0139C 8092D96C 0C00B380 */ jal TitleCard_InitBossName - -/* 013A0 8092D970 AFA90048 */ sw $t1, 0x0048($sp) -/* 013A4 8092D974 8FA80044 */ lw $t0, 0x0044($sp) -/* 013A8 8092D978 8FA90048 */ lw $t1, 0x0048($sp) + +/* 013A0 8092D970 AFA90048 */ sw $t1, 0x0048($sp) +/* 013A4 8092D974 8FA80044 */ lw $t0, 0x0044($sp) +/* 013A8 8092D978 8FA90048 */ lw $t1, 0x0048($sp) .L8092D97C: /* 013AC 8092D97C 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B -/* 013B0 8092D980 AFA80044 */ sw $t0, 0x0044($sp) +/* 013B0 8092D980 AFA80044 */ sw $t0, 0x0044($sp) /* 013B4 8092D984 0C03E803 */ jal Audio_SetBGM - -/* 013B8 8092D988 AFA90048 */ sw $t1, 0x0048($sp) + +/* 013B8 8092D988 AFA90048 */ sw $t1, 0x0048($sp) /* 013BC 8092D98C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 013C0 8092D990 24A5C288 */ addiu $a1, $a1, 0xC288 ## $a1 = 0600C288 -/* 013C4 8092D994 8FA40038 */ lw $a0, 0x0038($sp) -/* 013C8 8092D998 0C029490 */ jal func_800A5240 +/* 013C4 8092D994 8FA40038 */ lw $a0, 0x0038($sp) +/* 013C8 8092D998 0C029490 */ jal func_800A5240 /* 013CC 8092D99C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 013D0 8092D9A0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 013D4 8092D9A4 0C24CF4B */ jal func_80933D2C +/* 013D4 8092D9A4 0C24CF4B */ jal func_80933D2C /* 013D8 8092D9A8 2405396B */ addiu $a1, $zero, 0x396B ## $a1 = 0000396B -/* 013DC 8092D9AC 8FA80044 */ lw $t0, 0x0044($sp) -/* 013E0 8092D9B0 8FA90048 */ lw $t1, 0x0048($sp) +/* 013DC 8092D9AC 8FA80044 */ lw $t0, 0x0044($sp) +/* 013E0 8092D9B0 8FA90048 */ lw $t1, 0x0048($sp) .L8092D9B4: /* 013E4 8092D9B4 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C .L8092D9B8: -/* 013E8 8092D9B8 55010009 */ bnel $t0, $at, .L8092D9E0 +/* 013E8 8092D9B8 55010009 */ bnel $t0, $at, .L8092D9E0 /* 013EC 8092D9BC 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 /* 013F0 8092D9C0 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 013F4 8092D9C4 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -/* 013F8 8092D9C8 AFA80044 */ sw $t0, 0x0044($sp) -/* 013FC 8092D9CC 0C24BF74 */ jal func_8092FDD0 -/* 01400 8092D9D0 AFA90048 */ sw $t1, 0x0048($sp) -/* 01404 8092D9D4 8FA80044 */ lw $t0, 0x0044($sp) -/* 01408 8092D9D8 8FA90048 */ lw $t1, 0x0048($sp) +/* 013F4 8092D9C4 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) +/* 013F8 8092D9C8 AFA80044 */ sw $t0, 0x0044($sp) +/* 013FC 8092D9CC 0C24BF74 */ jal func_8092FDD0 +/* 01400 8092D9D0 AFA90048 */ sw $t1, 0x0048($sp) +/* 01404 8092D9D4 8FA80044 */ lw $t0, 0x0044($sp) +/* 01408 8092D9D8 8FA90048 */ lw $t1, 0x0048($sp) /* 0140C 8092D9DC 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L8092D9E0: -/* 01410 8092D9E0 11020012 */ beq $t0, $v0, .L8092DA2C -/* 01414 8092D9E4 00095840 */ sll $t3, $t1, 1 +/* 01410 8092D9E0 11020012 */ beq $t0, $v0, .L8092DA2C +/* 01414 8092D9E4 00095840 */ sll $t3, $t1, 1 /* 01418 8092D9E8 256C0007 */ addiu $t4, $t3, 0x0007 ## $t4 = 00000007 -/* 0141C 8092D9EC 010C001A */ div $zero, $t0, $t4 -/* 01420 8092D9F0 00006810 */ mfhi $t5 +/* 0141C 8092D9EC 010C001A */ div $zero, $t0, $t4 +/* 01420 8092D9F0 00006810 */ mfhi $t5 /* 01424 8092D9F4 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 01428 8092D9F8 15800002 */ bne $t4, $zero, .L8092DA04 +/* 01428 8092D9F8 15800002 */ bne $t4, $zero, .L8092DA04 /* 0142C 8092D9FC 00000000 */ nop /* 01430 8092DA00 0007000D */ break 7 .L8092DA04: /* 01434 8092DA04 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 01438 8092DA08 15810004 */ bne $t4, $at, .L8092DA1C +/* 01438 8092DA08 15810004 */ bne $t4, $at, .L8092DA1C /* 0143C 8092DA0C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01440 8092DA10 15010002 */ bne $t0, $at, .L8092DA1C +/* 01440 8092DA10 15010002 */ bne $t0, $at, .L8092DA1C /* 01444 8092DA14 00000000 */ nop /* 01448 8092DA18 0006000D */ break 6 .L8092DA1C: -/* 0144C 8092DA1C 544D0004 */ bnel $v0, $t5, .L8092DA30 +/* 0144C 8092DA1C 544D0004 */ bnel $v0, $t5, .L8092DA30 /* 01450 8092DA20 8E4F0190 */ lw $t7, 0x0190($s2) ## 00000190 -/* 01454 8092DA24 0C24C039 */ jal func_809300E4 -/* 01458 8092DA28 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) +/* 01454 8092DA24 0C24C039 */ jal func_809300E4 +/* 01458 8092DA28 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) .L8092DA2C: /* 0145C 8092DA2C 8E4F0190 */ lw $t7, 0x0190($s2) ## 00000190 .L8092DA30: /* 01460 8092DA30 3C0E8093 */ lui $t6, %hi(func_8092DB4C) ## $t6 = 80930000 /* 01464 8092DA34 25CEDB4C */ addiu $t6, $t6, %lo(func_8092DB4C) ## $t6 = 8092DB4C -/* 01468 8092DA38 11CF0006 */ beq $t6, $t7, .L8092DA54 +/* 01468 8092DA38 11CF0006 */ beq $t6, $t7, .L8092DA54 /* 0146C 8092DA3C 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 01470 8092DA40 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 01474 8092DA44 8FA40054 */ lw $a0, 0x0054($sp) +/* 01470 8092DA40 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) +/* 01474 8092DA44 8FA40054 */ lw $a0, 0x0054($sp) /* 01478 8092DA48 02203025 */ or $a2, $s1, $zero ## $a2 = 8093734C -/* 0147C 8092DA4C 0C030136 */ jal func_800C04D8 +/* 0147C 8092DA4C 0C030136 */ jal func_800C04D8 /* 01480 8092DA50 02003825 */ or $a3, $s0, $zero ## $a3 = 80937358 .L8092DA54: -/* 01484 8092DA54 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01488 8092DA58 8FB00028 */ lw $s0, 0x0028($sp) -/* 0148C 8092DA5C 8FB1002C */ lw $s1, 0x002C($sp) -/* 01490 8092DA60 8FB20030 */ lw $s2, 0x0030($sp) -/* 01494 8092DA64 03E00008 */ jr $ra +/* 01484 8092DA54 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01488 8092DA58 8FB00028 */ lw $s0, 0x0028($sp) +/* 0148C 8092DA5C 8FB1002C */ lw $s1, 0x002C($sp) +/* 01490 8092DA60 8FB20030 */ lw $s2, 0x0030($sp) +/* 01494 8092DA64 03E00008 */ jr $ra /* 01498 8092DA68 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s index 47bd19a5ac..12c9f77f3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s @@ -1,23 +1,23 @@ glabel func_8092DA6C /* 0149C 8092DA6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014A0 8092DA70 AFBF0014 */ sw $ra, 0x0014($sp) +/* 014A0 8092DA70 AFBF0014 */ sw $ra, 0x0014($sp) /* 014A4 8092DA74 8C8E0154 */ lw $t6, 0x0154($a0) ## 00000154 /* 014A8 8092DA78 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 014AC 8092DA7C 24A5DC2C */ addiu $a1, $a1, 0xDC2C ## $a1 = 0600DC2C -/* 014B0 8092DA80 10AE0006 */ beq $a1, $t6, .L8092DA9C +/* 014B0 8092DA80 10AE0006 */ beq $a1, $t6, .L8092DA9C /* 014B4 8092DA84 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 014B8 8092DA88 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 014BC 8092DA8C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 014C0 8092DA90 0C0294D3 */ jal func_800A534C -/* 014C4 8092DA94 AFA70018 */ sw $a3, 0x0018($sp) -/* 014C8 8092DA98 8FA70018 */ lw $a3, 0x0018($sp) +/* 014C0 8092DA90 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 014C4 8092DA94 AFA70018 */ sw $a3, 0x0018($sp) +/* 014C8 8092DA98 8FA70018 */ lw $a3, 0x0018($sp) .L8092DA9C: /* 014CC 8092DA9C 3C0F8093 */ lui $t7, %hi(func_8092DAB8) ## $t7 = 80930000 /* 014D0 8092DAA0 25EFDAB8 */ addiu $t7, $t7, %lo(func_8092DAB8) ## $t7 = 8092DAB8 /* 014D4 8092DAA4 ACEF0190 */ sw $t7, 0x0190($a3) ## 00000190 -/* 014D8 8092DAA8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 014D8 8092DAA8 8FBF0014 */ lw $ra, 0x0014($sp) /* 014DC 8092DAAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014E0 8092DAB0 03E00008 */ jr $ra +/* 014E0 8092DAB0 03E00008 */ jr $ra /* 014E4 8092DAB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s index 94c5b44412..47c64f9704 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s @@ -1,14 +1,14 @@ glabel func_8092DE48 /* 01878 8092DE48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0187C 8092DE4C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0187C 8092DE4C AFBF0014 */ sw $ra, 0x0014($sp) /* 01880 8092DE50 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01884 8092DE54 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01888 8092DE58 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 -/* 0188C 8092DE5C AFA70018 */ sw $a3, 0x0018($sp) +/* 0188C 8092DE5C AFA70018 */ sw $a3, 0x0018($sp) /* 01890 8092DE60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01894 8092DE64 0C0294D3 */ jal func_800A534C +/* 01894 8092DE64 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01898 8092DE68 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 0189C 8092DE6C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0189C 8092DE6C 8FA70018 */ lw $a3, 0x0018($sp) /* 018A0 8092DE70 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 018A4 8092DE74 3C188093 */ lui $t8, %hi(func_8092DEA0) ## $t8 = 80930000 /* 018A8 8092DE78 90EE06C5 */ lbu $t6, 0x06C5($a3) ## 000006C5 @@ -17,9 +17,9 @@ glabel func_8092DE48 /* 018B4 8092DE84 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 018B8 8092DE88 A0EF06C5 */ sb $t7, 0x06C5($a3) ## 000006C5 /* 018BC 8092DE8C E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 018C0 8092DE90 8FBF0014 */ lw $ra, 0x0014($sp) +/* 018C0 8092DE90 8FBF0014 */ lw $ra, 0x0014($sp) /* 018C4 8092DE94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018C8 8092DE98 03E00008 */ jr $ra +/* 018C8 8092DE98 03E00008 */ jr $ra /* 018CC 8092DE9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s index 449b1ac262..b06ba36378 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s @@ -1,24 +1,24 @@ glabel func_8092E25C /* 01C8C 8092E25C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C90 8092E260 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01C90 8092E260 AFBF0014 */ sw $ra, 0x0014($sp) /* 01C94 8092E264 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01C98 8092E268 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01C9C 8092E26C 24A5DC2C */ addiu $a1, $a1, 0xDC2C ## $a1 = 0600DC2C -/* 01CA0 8092E270 AFA70018 */ sw $a3, 0x0018($sp) +/* 01CA0 8092E270 AFA70018 */ sw $a3, 0x0018($sp) /* 01CA4 8092E274 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01CA8 8092E278 0C0294D3 */ jal func_800A534C +/* 01CA8 8092E278 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01CAC 8092E27C 3C06C1A0 */ lui $a2, 0xC1A0 ## $a2 = C1A00000 /* 01CB0 8092E280 3C058093 */ lui $a1, %hi(D_80937340) ## $a1 = 80930000 -/* 01CB4 8092E284 8FA40018 */ lw $a0, 0x0018($sp) -/* 01CB8 8092E288 0C00B6B0 */ jal func_8002DAC0 +/* 01CB4 8092E284 8FA40018 */ lw $a0, 0x0018($sp) +/* 01CB8 8092E288 0C00B6B0 */ jal func_8002DAC0 /* 01CBC 8092E28C 24A57340 */ addiu $a1, $a1, %lo(D_80937340) ## $a1 = 80937340 -/* 01CC0 8092E290 8FA70018 */ lw $a3, 0x0018($sp) +/* 01CC0 8092E290 8FA70018 */ lw $a3, 0x0018($sp) /* 01CC4 8092E294 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 01CC8 8092E298 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 /* 01CCC 8092E29C C4E403C4 */ lwc1 $f4, 0x03C4($a3) ## 000003C4 /* 01CD0 8092E2A0 90EE03E4 */ lbu $t6, 0x03E4($a3) ## 000003E4 /* 01CD4 8092E2A4 90F806C5 */ lbu $t8, 0x06C5($a3) ## 000006C5 -/* 01CD8 8092E2A8 46062202 */ mul.s $f8, $f4, $f6 +/* 01CD8 8092E2A8 46062202 */ mul.s $f8, $f4, $f6 /* 01CDC 8092E2AC 3C088093 */ lui $t0, %hi(func_8092E2E0) ## $t0 = 80930000 /* 01CE0 8092E2B0 2508E2E0 */ addiu $t0, $t0, %lo(func_8092E2E0) ## $t0 = 8092E2E0 /* 01CE4 8092E2B4 31CFFFFC */ andi $t7, $t6, 0xFFFC ## $t7 = 00000000 @@ -28,9 +28,9 @@ glabel func_8092E25C /* 01CF4 8092E2C4 A0F906C5 */ sb $t9, 0x06C5($a3) ## 000006C5 /* 01CF8 8092E2C8 E4E803C4 */ swc1 $f8, 0x03C4($a3) ## 000003C4 /* 01CFC 8092E2CC ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -/* 01D00 8092E2D0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01D00 8092E2D0 8FBF0014 */ lw $ra, 0x0014($sp) /* 01D04 8092E2D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01D08 8092E2D8 03E00008 */ jr $ra +/* 01D08 8092E2D8 03E00008 */ jr $ra /* 01D0C 8092E2DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s index 32348069c7..b4ece4e402 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s @@ -1,14 +1,14 @@ glabel func_8092E34C /* 01D7C 8092E34C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D80 8092E350 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01D80 8092E350 AFBF0014 */ sw $ra, 0x0014($sp) /* 01D84 8092E354 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01D88 8092E358 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01D8C 8092E35C 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 -/* 01D90 8092E360 AFA70018 */ sw $a3, 0x0018($sp) +/* 01D90 8092E360 AFA70018 */ sw $a3, 0x0018($sp) /* 01D94 8092E364 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D98 8092E368 0C0294D3 */ jal func_800A534C +/* 01D98 8092E368 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01D9C 8092E36C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01DA0 8092E370 8FA70018 */ lw $a3, 0x0018($sp) +/* 01DA0 8092E370 8FA70018 */ lw $a3, 0x0018($sp) /* 01DA4 8092E374 3C188093 */ lui $t8, %hi(func_8092E3A0) ## $t8 = 80930000 /* 01DA8 8092E378 2718E3A0 */ addiu $t8, $t8, %lo(func_8092E3A0) ## $t8 = 8092E3A0 /* 01DAC 8092E37C 90EE06C5 */ lbu $t6, 0x06C5($a3) ## 000006C5 @@ -16,9 +16,9 @@ glabel func_8092E34C /* 01DB4 8092E384 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 01DB8 8092E388 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 01DBC 8092E38C A0EF06C5 */ sb $t7, 0x06C5($a3) ## 000006C5 -/* 01DC0 8092E390 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01DC0 8092E390 8FBF0014 */ lw $ra, 0x0014($sp) /* 01DC4 8092E394 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01DC8 8092E398 03E00008 */ jr $ra +/* 01DC8 8092E398 03E00008 */ jr $ra /* 01DCC 8092E39C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s index 7753217776..94c5af3e3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s @@ -1,14 +1,14 @@ glabel func_8092E790 /* 021C0 8092E790 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 021C4 8092E794 AFBF0014 */ sw $ra, 0x0014($sp) +/* 021C4 8092E794 AFBF0014 */ sw $ra, 0x0014($sp) /* 021C8 8092E798 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 021CC 8092E79C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 021D0 8092E7A0 24A5ACD4 */ addiu $a1, $a1, 0xACD4 ## $a1 = 0600ACD4 -/* 021D4 8092E7A4 AFA70018 */ sw $a3, 0x0018($sp) +/* 021D4 8092E7A4 AFA70018 */ sw $a3, 0x0018($sp) /* 021D8 8092E7A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 021DC 8092E7AC 0C0294D3 */ jal func_800A534C +/* 021DC 8092E7AC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 021E0 8092E7B0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 021E4 8092E7B4 8FA70018 */ lw $a3, 0x0018($sp) +/* 021E4 8092E7B4 8FA70018 */ lw $a3, 0x0018($sp) /* 021E8 8092E7B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 021EC 8092E7BC 3C180FC0 */ lui $t8, 0x0FC0 ## $t8 = 0FC00000 /* 021F0 8092E7C0 90EE06C5 */ lbu $t6, 0x06C5($a3) ## 000006C5 @@ -31,14 +31,14 @@ glabel func_8092E790 /* 02234 8092E804 312AFFFE */ andi $t2, $t1, 0xFFFE ## $t2 = 00000000 /* 02238 8092E808 A04A0016 */ sb $t2, 0x0016($v0) ## 00000016 /* 0223C 8092E80C 8CEC0190 */ lw $t4, 0x0190($a3) ## 00000190 -/* 02240 8092E810 516C0003 */ beql $t3, $t4, .L8092E820 +/* 02240 8092E810 516C0003 */ beql $t3, $t4, .L8092E820 /* 02244 8092E814 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 02248 8092E818 A4ED0198 */ sh $t5, 0x0198($a3) ## 00000198 /* 0224C 8092E81C ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 .L8092E820: -/* 02250 8092E820 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02250 8092E820 8FBF0014 */ lw $ra, 0x0014($sp) /* 02254 8092E824 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02258 8092E828 03E00008 */ jr $ra +/* 02258 8092E828 03E00008 */ jr $ra /* 0225C 8092E82C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s index a1ee4f1917..6f96d20bd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s @@ -1,8 +1,8 @@ glabel func_8092EF28 /* 02958 8092EF28 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0295C 8092EF2C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02960 8092EF30 AFB10020 */ sw $s1, 0x0020($sp) -/* 02964 8092EF34 AFB0001C */ sw $s0, 0x001C($sp) +/* 0295C 8092EF2C AFBF0024 */ sw $ra, 0x0024($sp) +/* 02960 8092EF30 AFB10020 */ sw $s1, 0x0020($sp) +/* 02964 8092EF34 AFB0001C */ sw $s0, 0x001C($sp) /* 02968 8092EF38 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 0296C 8092EF3C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 02970 8092EF40 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 @@ -10,33 +10,33 @@ glabel func_8092EF28 /* 02978 8092EF48 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 /* 0297C 8092EF4C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02980 8092EF50 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 02984 8092EF54 0C0294D3 */ jal func_800A534C -/* 02988 8092EF58 AFAE002C */ sw $t6, 0x002C($sp) +/* 02984 8092EF54 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 02988 8092EF58 AFAE002C */ sw $t6, 0x002C($sp) /* 0298C 8092EF5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02990 8092EF60 0C24CF4B */ jal func_80933D2C +/* 02990 8092EF60 0C24CF4B */ jal func_80933D2C /* 02994 8092EF64 2405396F */ addiu $a1, $zero, 0x396F ## $a1 = 0000396F /* 02998 8092EF68 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 0299C 8092EF6C AFAF0010 */ sw $t7, 0x0010($sp) +/* 0299C 8092EF6C AFAF0010 */ sw $t7, 0x0010($sp) /* 029A0 8092EF70 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 029A4 8092EF74 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 029A8 8092EF78 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 029AC 8092EF7C 0C00D09B */ jal func_8003426C +/* 029AC 8092EF7C 0C00D09B */ jal func_8003426C /* 029B0 8092EF80 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 029B4 8092EF84 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 /* 029B8 8092EF88 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C -/* 029BC 8092EF8C AFB80010 */ sw $t8, 0x0010($sp) -/* 029C0 8092EF90 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) +/* 029BC 8092EF8C AFB80010 */ sw $t8, 0x0010($sp) +/* 029C0 8092EF90 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) /* 029C4 8092EF94 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 029C8 8092EF98 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 029CC 8092EF9C 0C00D09B */ jal func_8003426C +/* 029CC 8092EF9C 0C00D09B */ jal func_8003426C /* 029D0 8092EFA0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 029D4 8092EFA4 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 /* 029D8 8092EFA8 2419003C */ addiu $t9, $zero, 0x003C ## $t9 = 0000003C -/* 029DC 8092EFAC AFB90010 */ sw $t9, 0x0010($sp) -/* 029E0 8092EFB0 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) +/* 029DC 8092EFAC AFB90010 */ sw $t9, 0x0010($sp) +/* 029E0 8092EFB0 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) /* 029E4 8092EFB4 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 029E8 8092EFB8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 029EC 8092EFBC 0C00D09B */ jal func_8003426C +/* 029EC 8092EFBC 0C00D09B */ jal func_8003426C /* 029F0 8092EFC0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 029F4 8092EFC4 922906C5 */ lbu $t1, 0x06C5($s1) ## 000006C5 /* 029F8 8092EFC8 922B03E6 */ lbu $t3, 0x03E6($s1) ## 000003E6 @@ -58,38 +58,38 @@ glabel func_8092EF28 /* 02A38 8092F008 906F03E6 */ lbu $t7, 0x03E6($v1) ## 000003E6 /* 02A3C 8092F00C 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 /* 02A40 8092F010 0C03E803 */ jal Audio_SetBGM - + /* 02A44 8092F014 A07803E6 */ sb $t8, 0x03E6($v1) ## 000003E6 -/* 02A48 8092F018 0C03008C */ jal func_800C0230 +/* 02A48 8092F018 0C03008C */ jal func_800C0230 /* 02A4C 8092F01C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02A50 8092F020 3C018094 */ lui $at, %hi(D_80938CC4) ## $at = 80940000 -/* 02A54 8092F024 A4228CC4 */ sh $v0, %lo(D_80938CC4)($at) +/* 02A54 8092F024 A4228CC4 */ sh $v0, %lo(D_80938CC4)($at) /* 02A58 8092F028 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02A5C 8092F02C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02A60 8092F030 0C0300C5 */ jal func_800C0314 +/* 02A60 8092F030 0C0300C5 */ jal func_800C0314 /* 02A64 8092F034 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 02A68 8092F038 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 02A6C 8092F03C 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) +/* 02A6C 8092F03C 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) /* 02A70 8092F040 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A74 8092F044 0C0300C5 */ jal func_800C0314 +/* 02A74 8092F044 0C0300C5 */ jal func_800C0314 /* 02A78 8092F048 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02A7C 8092F04C 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 02A80 8092F050 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) +/* 02A80 8092F050 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) /* 02A84 8092F054 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A88 8092F058 0C0301E3 */ jal func_800C078C +/* 02A88 8092F058 0C0301E3 */ jal func_800C078C /* 02A8C 8092F05C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 02A90 8092F060 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A94 8092F064 8FA5002C */ lw $a1, 0x002C($sp) -/* 02A98 8092F068 0C00B7D5 */ jal func_8002DF54 +/* 02A94 8092F064 8FA5002C */ lw $a1, 0x002C($sp) +/* 02A98 8092F068 0C00B7D5 */ jal func_8002DF54 /* 02A9C 8092F06C 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 /* 02AA0 8092F070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AA4 8092F074 0C019148 */ jal func_80064520 +/* 02AA4 8092F074 0C019148 */ jal func_80064520 /* 02AA8 8092F078 26051D64 */ addiu $a1, $s0, 0x1D64 ## $a1 = 00001D64 /* 02AAC 8092F07C 861907A0 */ lh $t9, 0x07A0($s0) ## 000007A0 /* 02AB0 8092F080 3C048093 */ lui $a0, %hi(D_80937358) ## $a0 = 80930000 /* 02AB4 8092F084 24847358 */ addiu $a0, $a0, %lo(D_80937358) ## $a0 = 80937358 -/* 02AB8 8092F088 00194080 */ sll $t0, $t9, 2 -/* 02ABC 8092F08C 02084821 */ addu $t1, $s0, $t0 +/* 02AB8 8092F088 00194080 */ sll $t0, $t9, 2 +/* 02ABC 8092F08C 02084821 */ addu $t1, $s0, $t0 /* 02AC0 8092F090 8D250790 */ lw $a1, 0x0790($t1) ## 00000790 /* 02AC4 8092F094 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy @@ -97,10 +97,10 @@ glabel func_8092EF28 /* 02ACC 8092F09C 3C0A8093 */ lui $t2, %hi(func_8092F0BC) ## $t2 = 80930000 /* 02AD0 8092F0A0 254AF0BC */ addiu $t2, $t2, %lo(func_8092F0BC) ## $t2 = 8092F0BC /* 02AD4 8092F0A4 AE2A0190 */ sw $t2, 0x0190($s1) ## 00000190 -/* 02AD8 8092F0A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02ADC 8092F0AC 8FB10020 */ lw $s1, 0x0020($sp) -/* 02AE0 8092F0B0 8FB0001C */ lw $s0, 0x001C($sp) -/* 02AE4 8092F0B4 03E00008 */ jr $ra +/* 02AD8 8092F0A8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02ADC 8092F0AC 8FB10020 */ lw $s1, 0x0020($sp) +/* 02AE0 8092F0B0 8FB0001C */ lw $s0, 0x001C($sp) +/* 02AE4 8092F0B4 03E00008 */ jr $ra /* 02AE8 8092F0B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s index 6b8e7d9243..d0e1d241e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s @@ -1,34 +1,34 @@ glabel func_8092FBE4 /* 03614 8092FBE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03618 8092FBE8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03618 8092FBE8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0361C 8092FBEC 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 03620 8092FBF0 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 03624 8092FBF4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03628 8092FBF8 000E7880 */ sll $t7, $t6, 2 -/* 0362C 8092FBFC 002F0821 */ addu $at, $at, $t7 -/* 03630 8092FC00 AC20746C */ sw $zero, %lo(D_8093746C)($at) +/* 03628 8092FBF8 000E7880 */ sll $t7, $t6, 2 +/* 0362C 8092FBFC 002F0821 */ addu $at, $at, $t7 +/* 03630 8092FC00 AC20746C */ sw $zero, %lo(D_8093746C)($at) /* 03634 8092FC04 909803E4 */ lbu $t8, 0x03E4($a0) ## 000003E4 /* 03638 8092FC08 3C058093 */ lui $a1, %hi(D_8093784C) ## $a1 = 80930000 /* 0363C 8092FC0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03640 8092FC10 3319FFFC */ andi $t9, $t8, 0xFFFC ## $t9 = 00000000 /* 03644 8092FC14 A0990298 */ sb $t9, 0x0298($a0) ## 000003E4 /* 03648 8092FC18 84E8001C */ lh $t0, 0x001C($a3) ## 0000001C -/* 0364C 8092FC1C AFA70018 */ sw $a3, 0x0018($sp) +/* 0364C 8092FC1C AFA70018 */ sw $a3, 0x0018($sp) /* 03650 8092FC20 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 03654 8092FC24 00084880 */ sll $t1, $t0, 2 -/* 03658 8092FC28 00A92821 */ addu $a1, $a1, $t1 -/* 0365C 8092FC2C 0C0294D3 */ jal func_800A534C -/* 03660 8092FC30 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) -/* 03664 8092FC34 8FA70018 */ lw $a3, 0x0018($sp) +/* 03654 8092FC24 00084880 */ sll $t1, $t0, 2 +/* 03658 8092FC28 00A92821 */ addu $a1, $a1, $t1 +/* 0365C 8092FC2C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 03660 8092FC30 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) +/* 03664 8092FC34 8FA70018 */ lw $a3, 0x0018($sp) /* 03668 8092FC38 3C0B8093 */ lui $t3, %hi(func_8092FC60) ## $t3 = 80930000 /* 0366C 8092FC3C 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 /* 03670 8092FC40 256BFC60 */ addiu $t3, $t3, %lo(func_8092FC60) ## $t3 = 8092FC60 /* 03674 8092FC44 A0E00195 */ sb $zero, 0x0195($a3) ## 00000195 /* 03678 8092FC48 A4EA0198 */ sh $t2, 0x0198($a3) ## 00000198 /* 0367C 8092FC4C ACEB0190 */ sw $t3, 0x0190($a3) ## 00000190 -/* 03680 8092FC50 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03680 8092FC50 8FBF0014 */ lw $ra, 0x0014($sp) /* 03684 8092FC54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03688 8092FC58 03E00008 */ jr $ra +/* 03688 8092FC58 03E00008 */ jr $ra /* 0368C 8092FC5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s index 5dd30304b1..534563ea7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s @@ -1,40 +1,40 @@ glabel func_8093051C /* 03F4C 8093051C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03F50 80930520 AFB00020 */ sw $s0, 0x0020($sp) +/* 03F50 80930520 AFB00020 */ sw $s0, 0x0020($sp) /* 03F54 80930524 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03F58 80930528 AFBF0024 */ sw $ra, 0x0024($sp) +/* 03F58 80930528 AFBF0024 */ sw $ra, 0x0024($sp) /* 03F5C 8093052C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03F60 80930530 AFA50044 */ sw $a1, 0x0044($sp) +/* 03F60 80930530 AFA50044 */ sw $a1, 0x0044($sp) /* 03F64 80930534 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 03F68 80930538 AFA4002C */ sw $a0, 0x002C($sp) + +/* 03F68 80930538 AFA4002C */ sw $a0, 0x002C($sp) /* 03F6C 8093053C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 03F70 80930540 44811000 */ mtc1 $at, $f2 ## $f2 = 50.00 /* 03F74 80930544 3C018093 */ lui $at, %hi(D_809379E8) ## $at = 80930000 -/* 03F78 80930548 C42679E8 */ lwc1 $f6, %lo(D_809379E8)($at) +/* 03F78 80930548 C42679E8 */ lwc1 $f6, %lo(D_809379E8)($at) /* 03F7C 8093054C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 /* 03F80 80930550 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03F84 80930554 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 03F88 80930558 46062202 */ mul.s $f8, $f4, $f6 +/* 03F88 80930558 46062202 */ mul.s $f8, $f4, $f6 /* 03F8C 8093055C 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 03F90 80930560 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 03F94 80930564 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 03F98 80930568 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 03F9C 8093056C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 03FA0 80930570 4600103C */ c.lt.s $f2, $f0 +/* 03FA0 80930570 4600103C */ c.lt.s $f2, $f0 /* 03FA4 80930574 00000000 */ nop -/* 03FA8 80930578 45020004 */ bc1fl .L8093058C +/* 03FA8 80930578 45020004 */ bc1fl .L8093058C /* 03FAC 8093057C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 03FB0 80930580 10000002 */ beq $zero, $zero, .L8093058C +/* 03FB0 80930580 10000002 */ beq $zero, $zero, .L8093058C /* 03FB4 80930584 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 /* 03FB8 80930588 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 .L8093058C: /* 03FBC 8093058C 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 /* 03FC0 80930590 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 /* 03FC4 80930594 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 03FC8 80930598 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 03FCC 8093059C E7A0003C */ swc1 $f0, 0x003C($sp) + +/* 03FC8 80930598 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 03FCC 8093059C E7A0003C */ swc1 $f0, 0x003C($sp) /* 03FD0 809305A0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03FD4 809305A4 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 /* 03FD8 809305A8 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 @@ -43,82 +43,82 @@ glabel func_8093051C /* 03FE4 809305B4 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 03FE8 809305B8 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 03FEC 809305BC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 03FF0 809305C0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 03FF4 809305C4 C7B2003C */ lwc1 $f18, 0x003C($sp) + +/* 03FF0 809305C0 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 03FF4 809305C4 C7B2003C */ lwc1 $f18, 0x003C($sp) /* 03FF8 809305C8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 03FFC 809305CC 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 -/* 04000 809305D0 46009100 */ add.s $f4, $f18, $f0 -/* 04004 809305D4 E7A4003C */ swc1 $f4, 0x003C($sp) +/* 04000 809305D0 46009100 */ add.s $f4, $f18, $f0 +/* 04004 809305D4 E7A4003C */ swc1 $f4, 0x003C($sp) /* 04008 809305D8 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 0400C 809305DC 10400028 */ beq $v0, $zero, .L80930680 +/* 0400C 809305DC 10400028 */ beq $v0, $zero, .L80930680 /* 04010 809305E0 00000000 */ nop -/* 04014 809305E4 10400003 */ beq $v0, $zero, .L809305F4 +/* 04014 809305E4 10400003 */ beq $v0, $zero, .L809305F4 /* 04018 809305E8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 0401C 809305EC A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 /* 04020 809305F0 86020198 */ lh $v0, 0x0198($s0) ## 00000198 .L809305F4: /* 04024 809305F4 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 04028 809305F8 3C018093 */ lui $at, %hi(D_809379EC) ## $at = 80930000 -/* 0402C 809305FC C42A79EC */ lwc1 $f10, %lo(D_809379EC)($at) -/* 04030 80930600 46803220 */ cvt.s.w $f8, $f6 +/* 0402C 809305FC C42A79EC */ lwc1 $f10, %lo(D_809379EC)($at) +/* 04030 80930600 46803220 */ cvt.s.w $f8, $f6 /* 04034 80930604 3C013D80 */ lui $at, 0x3D80 ## $at = 3D800000 /* 04038 80930608 44819000 */ mtc1 $at, $f18 ## $f18 = 0.06 -/* 0403C 8093060C 460A4402 */ mul.s $f16, $f8, $f10 +/* 0403C 8093060C 460A4402 */ mul.s $f16, $f8, $f10 /* 04040 80930610 00000000 */ nop -/* 04044 80930614 46128302 */ mul.s $f12, $f16, $f18 +/* 04044 80930614 46128302 */ mul.s $f12, $f16, $f18 /* 04048 80930618 0C0400A4 */ jal sinf - + /* 0404C 8093061C 00000000 */ nop /* 04050 80930620 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 04054 80930624 44812000 */ mtc1 $at, $f4 ## $f4 = 250.00 /* 04058 80930628 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C /* 0405C 8093062C 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 04060 80930630 46040182 */ mul.s $f6, $f0, $f4 +/* 04060 80930630 46040182 */ mul.s $f6, $f0, $f4 /* 04064 80930634 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 04068 80930638 46083280 */ add.s $f10, $f6, $f8 -/* 0406C 8093063C 14400005 */ bne $v0, $zero, .L80930654 +/* 04068 80930638 46083280 */ add.s $f10, $f6, $f8 +/* 0406C 8093063C 14400005 */ bne $v0, $zero, .L80930654 /* 04070 80930640 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 04074 80930644 0C24BEF9 */ jal func_8092FBE4 +/* 04074 80930644 0C24BEF9 */ jal func_8092FBE4 /* 04078 80930648 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0407C 8093064C 1000003A */ beq $zero, $zero, .L80930738 -/* 04080 80930650 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0407C 8093064C 1000003A */ beq $zero, $zero, .L80930738 +/* 04080 80930650 8FBF0024 */ lw $ra, 0x0024($sp) .L80930654: -/* 04084 80930654 14410037 */ bne $v0, $at, .L80930734 -/* 04088 80930658 8FA4002C */ lw $a0, 0x002C($sp) +/* 04084 80930654 14410037 */ bne $v0, $at, .L80930734 +/* 04088 80930658 8FA4002C */ lw $a0, 0x002C($sp) /* 0408C 8093065C 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 04090 80930660 3C058093 */ lui $a1, %hi(D_8093784C) ## $a1 = 80930000 /* 04094 80930664 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 04098 80930668 000FC080 */ sll $t8, $t7, 2 -/* 0409C 8093066C 00B82821 */ addu $a1, $a1, $t8 -/* 040A0 80930670 0C0294D3 */ jal func_800A534C -/* 040A4 80930674 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) -/* 040A8 80930678 1000002F */ beq $zero, $zero, .L80930738 -/* 040AC 8093067C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04098 80930668 000FC080 */ sll $t8, $t7, 2 +/* 0409C 8093066C 00B82821 */ addu $a1, $a1, $t8 +/* 040A0 80930670 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 040A4 80930674 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) +/* 040A8 80930678 1000002F */ beq $zero, $zero, .L80930738 +/* 040AC 8093067C 8FBF0024 */ lw $ra, 0x0024($sp) .L80930680: /* 040B0 80930680 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 040B4 80930684 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 040B8 80930688 AFA20038 */ sw $v0, 0x0038($sp) +/* 040B8 80930688 AFA20038 */ sw $v0, 0x0038($sp) /* 040BC 8093068C 86050018 */ lh $a1, 0x0018($s0) ## 00000018 /* 040C0 80930690 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 040C4 80930694 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 040C8 80930698 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 -/* 040CC 8093069C 8FB90038 */ lw $t9, 0x0038($sp) +/* 040CC 8093069C 8FB90038 */ lw $t9, 0x0038($sp) /* 040D0 809306A0 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 040D4 809306A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 040D8 809306A8 03224024 */ and $t0, $t9, $v0 -/* 040DC 809306AC AFA80038 */ sw $t0, 0x0038($sp) +/* 040D8 809306A8 03224024 */ and $t0, $t9, $v0 +/* 040DC 809306AC AFA80038 */ sw $t0, 0x0038($sp) /* 040E0 809306B0 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 040E4 809306B4 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 040E8 809306B8 8FA90038 */ lw $t1, 0x0038($sp) +/* 040E8 809306B8 8FA90038 */ lw $t1, 0x0038($sp) /* 040EC 809306BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 040F0 809306C0 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -/* 040F4 809306C4 01225024 */ and $t2, $t1, $v0 -/* 040F8 809306C8 0C00BE5D */ jal func_8002F974 -/* 040FC 809306CC AFAA0038 */ sw $t2, 0x0038($sp) +/* 040F4 809306C4 01225024 */ and $t2, $t1, $v0 +/* 040F8 809306C8 0C00BE5D */ jal func_8002F974 +/* 040FC 809306CC AFAA0038 */ sw $t2, 0x0038($sp) /* 04100 809306D0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 04104 809306D4 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 04108 809306D8 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 @@ -126,31 +126,31 @@ glabel func_8093051C /* 04110 809306E0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 04114 809306E4 3C07428C */ lui $a3, 0x428C ## $a3 = 428C0000 /* 04118 809306E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0411C 809306EC E7B00010 */ swc1 $f16, 0x0010($sp) + +/* 0411C 809306EC E7B00010 */ swc1 $f16, 0x0010($sp) /* 04120 809306F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04124 809306F4 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 04128 809306F8 8FAB0038 */ lw $t3, 0x0038($sp) -/* 0412C 809306FC 4612003C */ c.lt.s $f0, $f18 +/* 04128 809306F8 8FAB0038 */ lw $t3, 0x0038($sp) +/* 0412C 809306FC 4612003C */ c.lt.s $f0, $f18 /* 04130 80930700 00000000 */ nop -/* 04134 80930704 4502000C */ bc1fl .L80930738 -/* 04138 80930708 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0413C 8093070C 11600009 */ beq $t3, $zero, .L80930734 -/* 04140 80930710 C7A4003C */ lwc1 $f4, 0x003C($sp) +/* 04134 80930704 4502000C */ bc1fl .L80930738 +/* 04138 80930708 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0413C 8093070C 11600009 */ beq $t3, $zero, .L80930734 +/* 04140 80930710 C7A4003C */ lwc1 $f4, 0x003C($sp) /* 04144 80930714 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 04148 80930718 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 0414C 8093071C 240C0008 */ addiu $t4, $zero, 0x0008 ## $t4 = 00000008 -/* 04150 80930720 4606203C */ c.lt.s $f4, $f6 +/* 04150 80930720 4606203C */ c.lt.s $f4, $f6 /* 04154 80930724 00000000 */ nop -/* 04158 80930728 45020003 */ bc1fl .L80930738 -/* 0415C 8093072C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04158 80930728 45020003 */ bc1fl .L80930738 +/* 0415C 8093072C 8FBF0024 */ lw $ra, 0x0024($sp) /* 04160 80930730 A60C0198 */ sh $t4, 0x0198($s0) ## 00000198 .L80930734: -/* 04164 80930734 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04164 80930734 8FBF0024 */ lw $ra, 0x0024($sp) .L80930738: -/* 04168 80930738 8FB00020 */ lw $s0, 0x0020($sp) +/* 04168 80930738 8FB00020 */ lw $s0, 0x0020($sp) /* 0416C 8093073C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 04170 80930740 03E00008 */ jr $ra +/* 04170 80930740 03E00008 */ jr $ra /* 04174 80930744 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s index e9bfb17e41..6b96f86ca8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s @@ -1,25 +1,25 @@ glabel func_80931D04 /* 05734 80931D04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05738 80931D08 AFBF0014 */ sw $ra, 0x0014($sp) +/* 05738 80931D08 AFBF0014 */ sw $ra, 0x0014($sp) /* 0573C 80931D0C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 05740 80931D10 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C /* 05744 80931D14 3C058093 */ lui $a1, %hi(D_8093786C) ## $a1 = 80930000 -/* 05748 80931D18 AFA70018 */ sw $a3, 0x0018($sp) -/* 0574C 80931D1C 000E7880 */ sll $t7, $t6, 2 -/* 05750 80931D20 00AF2821 */ addu $a1, $a1, $t7 -/* 05754 80931D24 8CA5786C */ lw $a1, %lo(D_8093786C)($a1) +/* 05748 80931D18 AFA70018 */ sw $a3, 0x0018($sp) +/* 0574C 80931D1C 000E7880 */ sll $t7, $t6, 2 +/* 05750 80931D20 00AF2821 */ addu $a1, $a1, $t7 +/* 05754 80931D24 8CA5786C */ lw $a1, %lo(D_8093786C)($a1) /* 05758 80931D28 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0575C 80931D2C 0C0294D3 */ jal func_800A534C +/* 0575C 80931D2C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 05760 80931D30 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 05764 80931D34 8FA70018 */ lw $a3, 0x0018($sp) +/* 05764 80931D34 8FA70018 */ lw $a3, 0x0018($sp) /* 05768 80931D38 3C198093 */ lui $t9, %hi(func_80931D5C) ## $t9 = 80930000 /* 0576C 80931D3C 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 /* 05770 80931D40 27391D5C */ addiu $t9, $t9, %lo(func_80931D5C) ## $t9 = 80931D5C /* 05774 80931D44 A4F80198 */ sh $t8, 0x0198($a3) ## 00000198 /* 05778 80931D48 ACF90190 */ sw $t9, 0x0190($a3) ## 00000190 -/* 0577C 80931D4C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0577C 80931D4C 8FBF0014 */ lw $ra, 0x0014($sp) /* 05780 80931D50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05784 80931D54 03E00008 */ jr $ra +/* 05784 80931D54 03E00008 */ jr $ra /* 05788 80931D58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s index b627c6c2eb..41af913e68 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s @@ -1,24 +1,24 @@ glabel func_809352DC /* 08D0C 809352DC 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 08D10 809352E0 AFBF002C */ sw $ra, 0x002C($sp) -/* 08D14 809352E4 AFB10028 */ sw $s1, 0x0028($sp) -/* 08D18 809352E8 AFB00024 */ sw $s0, 0x0024($sp) -/* 08D1C 809352EC AFA500A4 */ sw $a1, 0x00A4($sp) +/* 08D10 809352E0 AFBF002C */ sw $ra, 0x002C($sp) +/* 08D14 809352E4 AFB10028 */ sw $s1, 0x0028($sp) +/* 08D18 809352E8 AFB00024 */ sw $s0, 0x0024($sp) +/* 08D1C 809352EC AFA500A4 */ sw $a1, 0x00A4($sp) /* 08D20 809352F0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 08D24 809352F4 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 08D28 809352F8 3C068093 */ lui $a2, %hi(D_80937910) ## $a2 = 80930000 /* 08D2C 809352FC 24C67910 */ addiu $a2, $a2, %lo(D_80937910) ## $a2 = 80937910 /* 08D30 80935300 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 08D34 80935304 24071A9A */ addiu $a3, $zero, 0x1A9A ## $a3 = 00001A9A -/* 08D38 80935308 0C031AB1 */ jal func_800C6AC4 +/* 08D38 80935308 0C031AB1 */ jal func_800C6AC4 /* 08D3C 8093530C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 08D40 80935310 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 /* 08D44 80935314 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 08D48 80935318 8FB900A4 */ lw $t9, 0x00A4($sp) +/* 08D48 80935318 8FB900A4 */ lw $t9, 0x00A4($sp) /* 08D4C 8093531C 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 08D50 80935320 1301003C */ beq $t8, $at, .L80935414 -/* 08D54 80935324 8FAA00A4 */ lw $t2, 0x00A4($sp) -/* 08D58 80935328 0C024F46 */ jal func_80093D18 +/* 08D50 80935320 1301003C */ beq $t8, $at, .L80935414 +/* 08D54 80935324 8FAA00A4 */ lw $t2, 0x00A4($sp) +/* 08D58 80935328 0C024F46 */ jal func_80093D18 /* 08D5C 8093532C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 08D60 80935330 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 08D64 80935334 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 @@ -31,18 +31,18 @@ glabel func_809352DC /* 08D80 80935350 908E0001 */ lbu $t6, 0x0001($a0) ## 80937465 /* 08D84 80935354 908B0000 */ lbu $t3, 0x0000($a0) ## 80937464 /* 08D88 80935358 90880002 */ lbu $t0, 0x0002($a0) ## 80937466 -/* 08D8C 8093535C 000E7C00 */ sll $t7, $t6, 16 -/* 08D90 80935360 000B6600 */ sll $t4, $t3, 24 +/* 08D8C 8093535C 000E7C00 */ sll $t7, $t6, 16 +/* 08D90 80935360 000B6600 */ sll $t4, $t3, 24 /* 08D94 80935364 018FC025 */ or $t8, $t4, $t7 ## $t8 = 00000000 -/* 08D98 80935368 00084A00 */ sll $t1, $t0, 8 +/* 08D98 80935368 00084A00 */ sll $t1, $t0, 8 /* 08D9C 8093536C 03095025 */ or $t2, $t8, $t1 ## $t2 = FA000080 /* 08DA0 80935370 354B00FF */ ori $t3, $t2, 0x00FF ## $t3 = FA0000FF /* 08DA4 80935374 3C0D8093 */ lui $t5, %hi(D_80937448) ## $t5 = 80930000 /* 08DA8 80935378 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 08DAC 8093537C 8DAD7448 */ lw $t5, %lo(D_80937448)($t5) +/* 08DAC 8093537C 8DAD7448 */ lw $t5, %lo(D_80937448)($t5) /* 08DB0 80935380 3C048093 */ lui $a0, %hi(D_80937468) ## $a0 = 80930000 /* 08DB4 80935384 24847468 */ addiu $a0, $a0, %lo(D_80937468) ## $a0 = 80937468 -/* 08DB8 80935388 15A0000B */ bne $t5, $zero, .L809353B8 +/* 08DB8 80935388 15A0000B */ bne $t5, $zero, .L809353B8 /* 08DBC 8093538C 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 /* 08DC0 80935390 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 08DC4 80935394 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 @@ -52,7 +52,7 @@ glabel func_809352DC /* 08DD4 809353A4 25EF6290 */ addiu $t7, $t7, 0x6290 ## $t7 = 80116290 /* 08DD8 809353A8 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 /* 08DDC 809353AC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 08DE0 809353B0 1000002B */ beq $zero, $zero, .L80935460 +/* 08DE0 809353B0 1000002B */ beq $zero, $zero, .L80935460 /* 08DE4 809353B4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 .L809353B8: /* 08DE8 809353B8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -64,10 +64,10 @@ glabel func_809352DC /* 08E00 809353D0 908D0001 */ lbu $t5, 0x0001($a0) ## 80937469 /* 08E04 809353D4 90890000 */ lbu $t1, 0x0000($a0) ## 80937468 /* 08E08 809353D8 90990002 */ lbu $t9, 0x0002($a0) ## 8093746A -/* 08E0C 809353DC 000D7400 */ sll $t6, $t5, 16 -/* 08E10 809353E0 00095600 */ sll $t2, $t1, 24 +/* 08E0C 809353DC 000D7400 */ sll $t6, $t5, 16 +/* 08E10 809353E0 00095600 */ sll $t2, $t1, 24 /* 08E14 809353E4 014E6025 */ or $t4, $t2, $t6 ## $t4 = FA000088 -/* 08E18 809353E8 00194200 */ sll $t0, $t9, 8 +/* 08E18 809353E8 00194200 */ sll $t0, $t9, 8 /* 08E1C 809353EC 0188C025 */ or $t8, $t4, $t0 ## $t8 = FB000088 /* 08E20 809353F0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 08E24 809353F4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -76,10 +76,10 @@ glabel func_809352DC /* 08E30 80935400 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 08E34 80935404 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 08E38 80935408 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 08E3C 8093540C 10000014 */ beq $zero, $zero, .L80935460 +/* 08E3C 8093540C 10000014 */ beq $zero, $zero, .L80935460 /* 08E40 80935410 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 .L80935414: -/* 08E44 80935414 0C024F61 */ jal func_80093D84 +/* 08E44 80935414 0C024F61 */ jal func_80093D84 /* 08E48 80935418 8D440000 */ lw $a0, 0x0000($t2) ## FA000080 /* 08E4C 8093541C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 08E50 80935420 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -102,56 +102,56 @@ glabel func_809352DC /* 08E90 80935460 8E2B0190 */ lw $t3, 0x0190($s1) ## 00000190 /* 08E94 80935464 3C098093 */ lui $t1, %hi(func_8092F374) ## $t1 = 80930000 /* 08E98 80935468 2529F374 */ addiu $t1, $t1, %lo(func_8092F374) ## $t1 = 8092F374 -/* 08E9C 8093546C 552B002A */ bnel $t1, $t3, .L80935518 +/* 08E9C 8093546C 552B002A */ bnel $t1, $t3, .L80935518 /* 08EA0 80935470 8E2A0004 */ lw $t2, 0x0004($s1) ## 00000004 /* 08EA4 80935474 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 08EA8 80935478 00000000 */ nop /* 08EAC 8093547C 3C018093 */ lui $at, %hi(D_80937A4C) ## $at = 80930000 -/* 08EB0 80935480 C4247A4C */ lwc1 $f4, %lo(D_80937A4C)($at) -/* 08EB4 80935484 46040182 */ mul.s $f6, $f0, $f4 +/* 08EB0 80935480 C4247A4C */ lwc1 $f4, %lo(D_80937A4C)($at) +/* 08EB4 80935484 46040182 */ mul.s $f6, $f0, $f4 /* 08EB8 80935488 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 08EBC 8093548C E7A60068 */ swc1 $f6, 0x0068($sp) +/* 08EBC 8093548C E7A60068 */ swc1 $f6, 0x0068($sp) /* 08EC0 80935490 3C018093 */ lui $at, %hi(D_80937A50) ## $at = 80930000 -/* 08EC4 80935494 C4287A50 */ lwc1 $f8, %lo(D_80937A50)($at) +/* 08EC4 80935494 C4287A50 */ lwc1 $f8, %lo(D_80937A50)($at) /* 08EC8 80935498 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 08ECC 8093549C 46080302 */ mul.s $f12, $f0, $f8 -/* 08ED0 809354A0 0C034348 */ jal Matrix_RotateY -/* 08ED4 809354A4 E7AC0064 */ swc1 $f12, 0x0064($sp) -/* 08ED8 809354A8 C7AC0068 */ lwc1 $f12, 0x0068($sp) -/* 08EDC 809354AC 0C0342DC */ jal Matrix_RotateX +/* 08ECC 8093549C 46080302 */ mul.s $f12, $f0, $f8 +/* 08ED0 809354A0 0C034348 */ jal Matrix_RotateY +/* 08ED4 809354A4 E7AC0064 */ swc1 $f12, 0x0064($sp) +/* 08ED8 809354A8 C7AC0068 */ lwc1 $f12, 0x0068($sp) +/* 08EDC 809354AC 0C0342DC */ jal Matrix_RotateX /* 08EE0 809354B0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 08EE4 809354B4 862D0198 */ lh $t5, 0x0198($s1) ## 00000198 /* 08EE8 809354B8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 08EEC 809354BC 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 08EF0 809354C0 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 /* 08EF4 809354C4 3C018093 */ lui $at, %hi(D_80937A54) ## $at = 80930000 -/* 08EF8 809354C8 C4307A54 */ lwc1 $f16, %lo(D_80937A54)($at) -/* 08EFC 809354CC 46805020 */ cvt.s.w $f0, $f10 +/* 08EF8 809354C8 C4307A54 */ lwc1 $f16, %lo(D_80937A54)($at) +/* 08EFC 809354CC 46805020 */ cvt.s.w $f0, $f10 /* 08F00 809354D0 3C018093 */ lui $at, %hi(D_80937A58) ## $at = 80930000 -/* 08F04 809354D4 C4247A58 */ lwc1 $f4, %lo(D_80937A58)($at) +/* 08F04 809354D4 C4247A58 */ lwc1 $f4, %lo(D_80937A58)($at) /* 08F08 809354D8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 08F0C 809354DC 46100482 */ mul.s $f18, $f0, $f16 -/* 08F10 809354E0 46029300 */ add.s $f12, $f18, $f2 -/* 08F14 809354E4 46040182 */ mul.s $f6, $f0, $f4 -/* 08F18 809354E8 44066000 */ mfc1 $a2, $f12 -/* 08F1C 809354EC 0C0342A3 */ jal Matrix_Scale -/* 08F20 809354F0 46061381 */ sub.s $f14, $f2, $f6 -/* 08F24 809354F4 C7AC0068 */ lwc1 $f12, 0x0068($sp) +/* 08F0C 809354DC 46100482 */ mul.s $f18, $f0, $f16 +/* 08F10 809354E0 46029300 */ add.s $f12, $f18, $f2 +/* 08F14 809354E4 46040182 */ mul.s $f6, $f0, $f4 +/* 08F18 809354E8 44066000 */ mfc1 $a2, $f12 +/* 08F1C 809354EC 0C0342A3 */ jal Matrix_Scale +/* 08F20 809354F0 46061381 */ sub.s $f14, $f2, $f6 +/* 08F24 809354F4 C7AC0068 */ lwc1 $f12, 0x0068($sp) /* 08F28 809354F8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 08F2C 809354FC 0C0342DC */ jal Matrix_RotateX -/* 08F30 80935500 46006307 */ neg.s $f12, $f12 -/* 08F34 80935504 C7AC0064 */ lwc1 $f12, 0x0064($sp) +/* 08F2C 809354FC 0C0342DC */ jal Matrix_RotateX +/* 08F30 80935500 46006307 */ neg.s $f12, $f12 +/* 08F34 80935504 C7AC0064 */ lwc1 $f12, 0x0064($sp) /* 08F38 80935508 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 08F3C 8093550C 0C034348 */ jal Matrix_RotateY -/* 08F40 80935510 46006307 */ neg.s $f12, $f12 +/* 08F3C 8093550C 0C034348 */ jal Matrix_RotateY +/* 08F40 80935510 46006307 */ neg.s $f12, $f12 /* 08F44 80935514 8E2A0004 */ lw $t2, 0x0004($s1) ## 00000004 .L80935518: /* 08F48 80935518 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 /* 08F4C 8093551C 3C088093 */ lui $t0, %hi(func_80934A44) ## $t0 = 80930000 /* 08F50 80935520 314E0080 */ andi $t6, $t2, 0x0080 ## $t6 = 00000000 -/* 08F54 80935524 11C10011 */ beq $t6, $at, .L8093556C +/* 08F54 80935524 11C10011 */ beq $t6, $at, .L8093556C /* 08F58 80935528 25084A44 */ addiu $t0, $t0, %lo(func_80934A44) ## $t0 = 80934A44 /* 08F5C 8093552C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 08F60 80935530 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C @@ -160,14 +160,14 @@ glabel func_809352DC /* 08F6C 8093553C 3C198093 */ lui $t9, %hi(func_80935238) ## $t9 = 80930000 /* 08F70 80935540 27395238 */ addiu $t9, $t9, %lo(func_80935238) ## $t9 = 80935238 /* 08F74 80935544 25EF4A44 */ addiu $t7, $t7, %lo(func_80934A44) ## $t7 = 80934A44 -/* 08F78 80935548 AFAF0010 */ sw $t7, 0x0010($sp) -/* 08F7C 8093554C AFB90014 */ sw $t9, 0x0014($sp) -/* 08F80 80935550 AFB10018 */ sw $s1, 0x0018($sp) +/* 08F78 80935548 AFAF0010 */ sw $t7, 0x0010($sp) +/* 08F7C 8093554C AFB90014 */ sw $t9, 0x0014($sp) +/* 08F80 80935550 AFB10018 */ sw $s1, 0x0018($sp) /* 08F84 80935554 8E0C02C0 */ lw $t4, 0x02C0($s0) ## 000002C0 -/* 08F88 80935558 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 08F8C 8093555C 0C0289CF */ jal func_800A273C -/* 08F90 80935560 AFAC001C */ sw $t4, 0x001C($sp) -/* 08F94 80935564 1000000E */ beq $zero, $zero, .L809355A0 +/* 08F88 80935558 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 08F8C 8093555C 0C0289CF */ jal SkelAnime_DrawSV2 +/* 08F90 80935560 AFAC001C */ sw $t4, 0x001C($sp) +/* 08F94 80935564 1000000E */ beq $zero, $zero, .L809355A0 /* 08F98 80935568 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L8093556C: /* 08F9C 8093556C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 @@ -175,27 +175,27 @@ glabel func_809352DC /* 08FA4 80935574 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E /* 08FA8 80935578 3C188093 */ lui $t8, %hi(func_80935238) ## $t8 = 80930000 /* 08FAC 8093557C 27185238 */ addiu $t8, $t8, %lo(func_80935238) ## $t8 = 80935238 -/* 08FB0 80935580 AFB80014 */ sw $t8, 0x0014($sp) -/* 08FB4 80935584 AFB10018 */ sw $s1, 0x0018($sp) -/* 08FB8 80935588 AFA80010 */ sw $t0, 0x0010($sp) +/* 08FB0 80935580 AFB80014 */ sw $t8, 0x0014($sp) +/* 08FB4 80935584 AFB10018 */ sw $s1, 0x0018($sp) +/* 08FB8 80935588 AFA80010 */ sw $t0, 0x0010($sp) /* 08FBC 8093558C 8E0902D0 */ lw $t1, 0x02D0($s0) ## 000002D0 -/* 08FC0 80935590 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 08FC4 80935594 0C0289CF */ jal func_800A273C -/* 08FC8 80935598 AFA9001C */ sw $t1, 0x001C($sp) +/* 08FC0 80935590 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 08FC4 80935594 0C0289CF */ jal SkelAnime_DrawSV2 +/* 08FC8 80935598 AFA9001C */ sw $t1, 0x001C($sp) /* 08FCC 8093559C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L809355A0: /* 08FD0 809355A0 8E2D0190 */ lw $t5, 0x0190($s1) ## 00000190 /* 08FD4 809355A4 3C0B8093 */ lui $t3, %hi(func_8092CC58) ## $t3 = 80930000 /* 08FD8 809355A8 256BCC58 */ addiu $t3, $t3, %lo(func_8092CC58) ## $t3 = 8092CC58 -/* 08FDC 809355AC 556D0058 */ bnel $t3, $t5, .L80935710 -/* 08FE0 809355B0 8FB900A4 */ lw $t9, 0x00A4($sp) +/* 08FDC 809355AC 556D0058 */ bnel $t3, $t5, .L80935710 +/* 08FE0 809355B0 8FB900A4 */ lw $t9, 0x00A4($sp) /* 08FE4 809355B4 86220198 */ lh $v0, 0x0198($s1) ## 00000198 -/* 08FE8 809355B8 28410072 */ slti $at, $v0, 0x0072 -/* 08FEC 809355BC 10200053 */ beq $at, $zero, .L8093570C -/* 08FF0 809355C0 28410015 */ slti $at, $v0, 0x0015 -/* 08FF4 809355C4 14200051 */ bne $at, $zero, .L8093570C -/* 08FF8 809355C8 8FAA00A4 */ lw $t2, 0x00A4($sp) -/* 08FFC 809355CC 0C024F61 */ jal func_80093D84 +/* 08FE8 809355B8 28410072 */ slti $at, $v0, 0x0072 +/* 08FEC 809355BC 10200053 */ beq $at, $zero, .L8093570C +/* 08FF0 809355C0 28410015 */ slti $at, $v0, 0x0015 +/* 08FF4 809355C4 14200051 */ bne $at, $zero, .L8093570C +/* 08FF8 809355C8 8FAA00A4 */ lw $t2, 0x00A4($sp) +/* 08FFC 809355CC 0C024F61 */ jal func_80093D84 /* 09000 809355D0 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 09004 809355D4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 09008 809355D8 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -207,66 +207,66 @@ glabel func_809352DC /* 09020 809355F0 862C0198 */ lh $t4, 0x0198($s1) ## 00000198 /* 09024 809355F4 24180388 */ addiu $t8, $zero, 0x0388 ## $t8 = 00000388 /* 09028 809355F8 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 -/* 0902C 809355FC 000C40C0 */ sll $t0, $t4, 3 -/* 09030 80935600 03081023 */ subu $v0, $t8, $t0 +/* 0902C 809355FC 000C40C0 */ sll $t0, $t4, 3 +/* 09030 80935600 03081023 */ subu $v0, $t8, $t0 /* 09034 80935604 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 09038 80935608 44810000 */ mtc1 $at, $f0 ## $f0 = 450.00 /* 0903C 8093560C 3C01420C */ lui $at, 0x420C ## $at = 420C0000 -/* 09040 80935610 46805420 */ cvt.s.w $f16, $f10 +/* 09040 80935610 46805420 */ cvt.s.w $f16, $f10 /* 09044 80935614 44814000 */ mtc1 $at, $f8 ## $f8 = 35.00 /* 09048 80935618 3C01C37A */ lui $at, 0xC37A ## $at = C37A0000 /* 0904C 8093561C 44819000 */ mtc1 $at, $f18 ## $f18 = -250.00 /* 09050 80935620 3C01433E */ lui $at, 0x433E ## $at = 433E0000 /* 09054 80935624 44813000 */ mtc1 $at, $f6 ## $f6 = 190.00 -/* 09058 80935628 46128100 */ add.s $f4, $f16, $f18 +/* 09058 80935628 46128100 */ add.s $f4, $f16, $f18 /* 0905C 8093562C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 09060 80935630 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFB4 /* 09064 80935634 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFA8 -/* 09068 80935638 4604003C */ c.lt.s $f0, $f4 -/* 0906C 8093563C E7A40058 */ swc1 $f4, 0x0058($sp) -/* 09070 80935640 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 09074 80935644 E7A6005C */ swc1 $f6, 0x005C($sp) -/* 09078 80935648 45020003 */ bc1fl .L80935658 -/* 0907C 8093564C 8FA600A4 */ lw $a2, 0x00A4($sp) -/* 09080 80935650 E7A00058 */ swc1 $f0, 0x0058($sp) -/* 09084 80935654 8FA600A4 */ lw $a2, 0x00A4($sp) +/* 09068 80935638 4604003C */ c.lt.s $f0, $f4 +/* 0906C 8093563C E7A40058 */ swc1 $f4, 0x0058($sp) +/* 09070 80935640 E7A80054 */ swc1 $f8, 0x0054($sp) +/* 09074 80935644 E7A6005C */ swc1 $f6, 0x005C($sp) +/* 09078 80935648 45020003 */ bc1fl .L80935658 +/* 0907C 8093564C 8FA600A4 */ lw $a2, 0x00A4($sp) +/* 09080 80935650 E7A00058 */ swc1 $f0, 0x0058($sp) +/* 09084 80935654 8FA600A4 */ lw $a2, 0x00A4($sp) .L80935658: /* 09088 80935658 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0908C 8093565C 0C0347BD */ jal Matrix_MultVec3fExt -/* 09090 80935660 00C13021 */ addu $a2, $a2, $at +/* 0908C 8093565C 0C0347BD */ jal Matrix_MultVec3fExt +/* 09090 80935660 00C13021 */ addu $a2, $a2, $at /* 09094 80935664 C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 -/* 09098 80935668 C7AA0048 */ lwc1 $f10, 0x0048($sp) +/* 09098 80935668 C7AA0048 */ lwc1 $f10, 0x0048($sp) /* 0909C 8093566C C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 090A0 80935670 C7A40050 */ lwc1 $f4, 0x0050($sp) -/* 090A4 80935674 460A4300 */ add.s $f12, $f8, $f10 +/* 090A0 80935670 C7A40050 */ lwc1 $f4, 0x0050($sp) +/* 090A4 80935674 460A4300 */ add.s $f12, $f8, $f10 /* 090A8 80935678 C6300028 */ lwc1 $f16, 0x0028($s1) ## 00000028 -/* 090AC 8093567C C7B2004C */ lwc1 $f18, 0x004C($sp) -/* 090B0 80935680 46043200 */ add.s $f8, $f6, $f4 +/* 090AC 8093567C C7B2004C */ lwc1 $f18, 0x004C($sp) +/* 090B0 80935680 46043200 */ add.s $f8, $f6, $f4 /* 090B4 80935684 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 090B8 80935688 46128380 */ add.s $f14, $f16, $f18 -/* 090BC 8093568C 44064000 */ mfc1 $a2, $f8 -/* 090C0 80935690 0C034261 */ jal Matrix_Translate +/* 090B8 80935688 46128380 */ add.s $f14, $f16, $f18 +/* 090BC 8093568C 44064000 */ mfc1 $a2, $f8 +/* 090C0 80935690 0C034261 */ jal Matrix_Translate /* 090C4 80935694 00000000 */ nop /* 090C8 80935698 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 090CC 8093569C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 090D0 809356A0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 090D4 809356A4 44066000 */ mfc1 $a2, $f12 -/* 090D8 809356A8 0C0342A3 */ jal Matrix_Scale -/* 090DC 809356AC 46006386 */ mov.s $f14, $f12 +/* 090D4 809356A4 44066000 */ mfc1 $a2, $f12 +/* 090D8 809356A8 0C0342A3 */ jal Matrix_Scale +/* 090DC 809356AC 46006386 */ mov.s $f14, $f12 /* 090E0 809356B0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 090E4 809356B4 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 /* 090E8 809356B8 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 /* 090EC 809356BC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 090F0 809356C0 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 /* 090F4 809356C4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 090F8 809356C8 8FAD00A4 */ lw $t5, 0x00A4($sp) +/* 090F8 809356C8 8FAD00A4 */ lw $t5, 0x00A4($sp) /* 090FC 809356CC 3C058093 */ lui $a1, %hi(D_80937920) ## $a1 = 80930000 /* 09100 809356D0 24A57920 */ addiu $a1, $a1, %lo(D_80937920) ## $a1 = 80937920 /* 09104 809356D4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 09108 809356D8 24061B16 */ addiu $a2, $zero, 0x1B16 ## $a2 = 00001B16 -/* 0910C 809356DC 0C0346A2 */ jal Matrix_NewMtx -/* 09110 809356E0 AFA20040 */ sw $v0, 0x0040($sp) -/* 09114 809356E4 8FA30040 */ lw $v1, 0x0040($sp) +/* 0910C 809356DC 0C0346A2 */ jal Matrix_NewMtx +/* 09110 809356E0 AFA20040 */ sw $v0, 0x0040($sp) +/* 09114 809356E4 8FA30040 */ lw $v1, 0x0040($sp) /* 09118 809356E8 3C0F8093 */ lui $t7, %hi(D_80936E08) ## $t7 = 80930000 /* 0911C 809356EC 25EF6E08 */ addiu $t7, $t7, %lo(D_80936E08) ## $t7 = 80936E08 /* 09120 809356F0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -277,28 +277,28 @@ glabel func_809352DC /* 09134 80935704 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 09138 80935708 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 .L8093570C: -/* 0913C 8093570C 8FB900A4 */ lw $t9, 0x00A4($sp) +/* 0913C 8093570C 8FB900A4 */ lw $t9, 0x00A4($sp) .L80935710: /* 09140 80935710 3C068093 */ lui $a2, %hi(D_80937930) ## $a2 = 80930000 /* 09144 80935714 24C67930 */ addiu $a2, $a2, %lo(D_80937930) ## $a2 = 80937930 /* 09148 80935718 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 0914C 8093571C 24071B1D */ addiu $a3, $zero, 0x1B1D ## $a3 = 00001B1D -/* 09150 80935720 0C031AD5 */ jal func_800C6B54 +/* 09150 80935720 0C031AD5 */ jal func_800C6B54 /* 09154 80935724 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -/* 09158 80935728 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 09158 80935728 8FA400A4 */ lw $a0, 0x00A4($sp) /* 0915C 8093572C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 09160 80935730 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 /* 09164 80935734 26250038 */ addiu $a1, $s1, 0x0038 ## $a1 = 00000038 /* 09168 80935738 262603C8 */ addiu $a2, $s1, 0x03C8 ## $a2 = 000003C8 -/* 0916C 8093573C 0C029BBD */ jal func_800A6EF4 -/* 09170 80935740 00812021 */ addu $a0, $a0, $at +/* 0916C 8093573C 0C029BBD */ jal func_800A6EF4 +/* 09170 80935740 00812021 */ addu $a0, $a0, $at /* 09174 80935744 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 09178 80935748 0C24D8E7 */ jal func_8093639C -/* 0917C 8093574C 8FA500A4 */ lw $a1, 0x00A4($sp) -/* 09180 80935750 8FBF002C */ lw $ra, 0x002C($sp) -/* 09184 80935754 8FB00024 */ lw $s0, 0x0024($sp) -/* 09188 80935758 8FB10028 */ lw $s1, 0x0028($sp) -/* 0918C 8093575C 03E00008 */ jr $ra +/* 09178 80935748 0C24D8E7 */ jal func_8093639C +/* 0917C 8093574C 8FA500A4 */ lw $a1, 0x00A4($sp) +/* 09180 80935750 8FBF002C */ lw $ra, 0x002C($sp) +/* 09184 80935754 8FB00024 */ lw $s0, 0x0024($sp) +/* 09188 80935758 8FB10028 */ lw $s1, 0x0028($sp) +/* 0918C 8093575C 03E00008 */ jr $ra /* 09190 80935760 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s index a1b250d0e5..3ef3b808dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s @@ -1,32 +1,32 @@ glabel BossTw_Destroy /* 01208 80939ED8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0120C 80939EDC AFA40018 */ sw $a0, 0x0018($sp) -/* 01210 80939EE0 AFA5001C */ sw $a1, 0x001C($sp) +/* 0120C 80939EDC AFA40018 */ sw $a0, 0x0018($sp) +/* 01210 80939EE0 AFA5001C */ sw $a1, 0x001C($sp) /* 01214 80939EE4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01218 80939EE8 8FA50018 */ lw $a1, 0x0018($sp) -/* 0121C 80939EEC AFBF0014 */ sw $ra, 0x0014($sp) +/* 01218 80939EE8 8FA50018 */ lw $a1, 0x0018($sp) +/* 0121C 80939EEC AFBF0014 */ sw $ra, 0x0014($sp) /* 01220 80939EF0 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 01224 80939EF4 24A505AC */ addiu $a1, $a1, 0x05AC ## $a1 = 000005AC -/* 01228 80939EF8 8FA30018 */ lw $v1, 0x0018($sp) +/* 01228 80939EF8 8FA30018 */ lw $v1, 0x0018($sp) /* 0122C 80939EFC 8462001C */ lh $v0, 0x001C($v1) ## 0000001C /* 01230 80939F00 24640568 */ addiu $a0, $v1, 0x0568 ## $a0 = 00000568 -/* 01234 80939F04 28410064 */ slti $at, $v0, 0x0064 -/* 01238 80939F08 50200006 */ beql $at, $zero, .L80939F24 +/* 01234 80939F04 28410064 */ slti $at, $v0, 0x0064 +/* 01238 80939F08 50200006 */ beql $at, $zero, .L80939F24 /* 0123C 80939F0C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01240 80939F10 0C0295BC */ jal func_800A56F0 -/* 01244 80939F14 8FA5001C */ lw $a1, 0x001C($sp) -/* 01248 80939F18 8FAE0018 */ lw $t6, 0x0018($sp) +/* 01240 80939F10 0C0295BC */ jal SkelAnime_Free +/* 01244 80939F14 8FA5001C */ lw $a1, 0x001C($sp) +/* 01248 80939F18 8FAE0018 */ lw $t6, 0x0018($sp) /* 0124C 80939F1C 85C2001C */ lh $v0, 0x001C($t6) ## 0000001C /* 01250 80939F20 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L80939F24: -/* 01254 80939F24 14410002 */ bne $v0, $at, .L80939F30 +/* 01254 80939F24 14410002 */ bne $v0, $at, .L80939F30 /* 01258 80939F28 3C018095 */ lui $at, %hi(D_8094A89C) ## $at = 80950000 -/* 0125C 80939F2C A020A89C */ sb $zero, %lo(D_8094A89C)($at) +/* 0125C 80939F2C A020A89C */ sb $zero, %lo(D_8094A89C)($at) .L80939F30: -/* 01260 80939F30 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01260 80939F30 8FBF0014 */ lw $ra, 0x0014($sp) /* 01264 80939F34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01268 80939F38 03E00008 */ jr $ra +/* 01268 80939F38 03E00008 */ jr $ra /* 0126C 80939F3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s index 7df1ed4a95..3e1d17ef07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s @@ -1,24 +1,24 @@ glabel BossTw_Draw /* 0A5A4 80943274 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 0A5A8 80943278 AFBF0044 */ sw $ra, 0x0044($sp) -/* 0A5AC 8094327C AFB20040 */ sw $s2, 0x0040($sp) -/* 0A5B0 80943280 AFB1003C */ sw $s1, 0x003C($sp) -/* 0A5B4 80943284 AFB00038 */ sw $s0, 0x0038($sp) +/* 0A5A8 80943278 AFBF0044 */ sw $ra, 0x0044($sp) +/* 0A5AC 8094327C AFB20040 */ sw $s2, 0x0040($sp) +/* 0A5B0 80943280 AFB1003C */ sw $s1, 0x003C($sp) +/* 0A5B4 80943284 AFB00038 */ sw $s0, 0x0038($sp) /* 0A5B8 80943288 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 0A5BC 8094328C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0A5C0 80943290 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0A5C4 80943294 AFAE0084 */ sw $t6, 0x0084($sp) +/* 0A5C4 80943294 AFAE0084 */ sw $t6, 0x0084($sp) /* 0A5C8 80943298 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0A5CC 8094329C 3C068095 */ lui $a2, %hi(D_8094AC28) ## $a2 = 80950000 /* 0A5D0 809432A0 24C6AC28 */ addiu $a2, $a2, %lo(D_8094AC28) ## $a2 = 8094AC28 /* 0A5D4 809432A4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 0A5D8 809432A8 24071B23 */ addiu $a3, $zero, 0x1B23 ## $a3 = 00001B23 -/* 0A5DC 809432AC 0C031AB1 */ jal func_800C6AC4 +/* 0A5DC 809432AC 0C031AB1 */ jal func_800C6AC4 /* 0A5E0 809432B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0A5E4 809432B4 920F0564 */ lbu $t7, 0x0564($s0) ## 00000564 /* 0A5E8 809432B8 3C05DB06 */ lui $a1, 0xDB06 ## $a1 = DB060000 /* 0A5EC 809432BC 34A50028 */ ori $a1, $a1, 0x0028 ## $a1 = DB060028 -/* 0A5F0 809432C0 51E0013B */ beql $t7, $zero, .L809437B0 +/* 0A5F0 809432C0 51E0013B */ beql $t7, $zero, .L809437B0 /* 0A5F4 809432C4 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 0A5F8 809432C8 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 0A5FC 809432CC 3C068095 */ lui $a2, %hi(D_8094A998) ## $a2 = 80950000 @@ -29,20 +29,20 @@ glabel BossTw_Draw /* 0A610 809432E0 861904CC */ lh $t9, 0x04CC($s0) ## 000004CC /* 0A614 809432E4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 0A618 809432E8 25086FA8 */ addiu $t0, $t0, 0x6FA8 ## $t0 = 80166FA8 -/* 0A61C 809432EC 00195080 */ sll $t2, $t9, 2 -/* 0A620 809432F0 00CA5821 */ addu $t3, $a2, $t2 +/* 0A61C 809432EC 00195080 */ sll $t2, $t9, 2 +/* 0A620 809432F0 00CA5821 */ addu $t3, $a2, $t2 /* 0A624 809432F4 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 0A628 809432F8 3C0700FF */ lui $a3, 0x00FF ## $a3 = 00FF0000 /* 0A62C 809432FC 34E7FFFF */ ori $a3, $a3, 0xFFFF ## $a3 = 00FFFFFF -/* 0A630 80943300 00046900 */ sll $t5, $a0, 4 -/* 0A634 80943304 000D7702 */ srl $t6, $t5, 28 -/* 0A638 80943308 000E7880 */ sll $t7, $t6, 2 -/* 0A63C 8094330C 010FC021 */ addu $t8, $t0, $t7 +/* 0A630 80943300 00046900 */ sll $t5, $a0, 4 +/* 0A634 80943304 000D7702 */ srl $t6, $t5, 28 +/* 0A638 80943308 000E7880 */ sll $t7, $t6, 2 +/* 0A63C 8094330C 010FC021 */ addu $t8, $t0, $t7 /* 0A640 80943310 8F190000 */ lw $t9, 0x0000($t8) ## 00000008 -/* 0A644 80943314 00876024 */ and $t4, $a0, $a3 +/* 0A644 80943314 00876024 */ and $t4, $a0, $a3 /* 0A648 80943318 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 -/* 0A64C 8094331C 01995021 */ addu $t2, $t4, $t9 -/* 0A650 80943320 01495821 */ addu $t3, $t2, $t1 +/* 0A64C 8094331C 01995021 */ addu $t2, $t4, $t9 +/* 0A650 80943320 01495821 */ addu $t3, $t2, $t1 /* 0A654 80943324 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 /* 0A658 80943328 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0A65C 8094332C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 @@ -50,18 +50,18 @@ glabel BossTw_Draw /* 0A664 80943334 AC450000 */ sw $a1, 0x0000($v0) ## 00000000 /* 0A668 80943338 860E04CC */ lh $t6, 0x04CC($s0) ## 000004CC /* 0A66C 8094333C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0A670 80943340 000E7880 */ sll $t7, $t6, 2 -/* 0A674 80943344 00CFC021 */ addu $t8, $a2, $t7 +/* 0A670 80943340 000E7880 */ sll $t7, $t6, 2 +/* 0A674 80943344 00CFC021 */ addu $t8, $a2, $t7 /* 0A678 80943348 8F040000 */ lw $a0, 0x0000($t8) ## 00000008 -/* 0A67C 8094334C 0004C900 */ sll $t9, $a0, 4 -/* 0A680 80943350 00195702 */ srl $t2, $t9, 28 -/* 0A684 80943354 000A5880 */ sll $t3, $t2, 2 -/* 0A688 80943358 010B6821 */ addu $t5, $t0, $t3 +/* 0A67C 8094334C 0004C900 */ sll $t9, $a0, 4 +/* 0A680 80943350 00195702 */ srl $t2, $t9, 28 +/* 0A684 80943354 000A5880 */ sll $t3, $t2, 2 +/* 0A688 80943358 010B6821 */ addu $t5, $t0, $t3 /* 0A68C 8094335C 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000008 -/* 0A690 80943360 00876024 */ and $t4, $a0, $a3 +/* 0A690 80943360 00876024 */ and $t4, $a0, $a3 /* 0A694 80943364 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 0A698 80943368 018E7821 */ addu $t7, $t4, $t6 -/* 0A69C 8094336C 01E9C021 */ addu $t8, $t7, $t1 +/* 0A698 80943368 018E7821 */ addu $t7, $t4, $t6 +/* 0A69C 8094336C 01E9C021 */ addu $t8, $t7, $t1 /* 0A6A0 80943370 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 0A6A4 80943374 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0A6A8 80943378 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 @@ -74,42 +74,42 @@ glabel BossTw_Draw /* 0A6C4 80943394 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 0A6C8 80943398 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 /* 0A6CC 8094339C 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 0A6D0 809433A0 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0A6D4 809433A4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0A6D8 809433A8 AFAF0018 */ sw $t7, 0x0018($sp) +/* 0A6D0 809433A0 AFAC0010 */ sw $t4, 0x0010($sp) +/* 0A6D4 809433A4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0A6D8 809433A8 AFAF0018 */ sw $t7, 0x0018($sp) /* 0A6DC 809433AC C6120188 */ lwc1 $f18, 0x0188($s0) ## 00000188 -/* 0A6E0 809433B0 4600218D */ trunc.w.s $f6, $f4 +/* 0A6E0 809433B0 4600218D */ trunc.w.s $f6, $f4 /* 0A6E4 809433B4 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 0A6E8 809433B8 4600910D */ trunc.w.s $f4, $f18 -/* 0A6EC 809433BC 44063000 */ mfc1 $a2, $f6 -/* 0A6F0 809433C0 4600428D */ trunc.w.s $f10, $f8 -/* 0A6F4 809433C4 440B2000 */ mfc1 $t3, $f4 -/* 0A6F8 809433C8 00063400 */ sll $a2, $a2, 16 -/* 0A6FC 809433CC 00063403 */ sra $a2, $a2, 16 +/* 0A6E8 809433B8 4600910D */ trunc.w.s $f4, $f18 +/* 0A6EC 809433BC 44063000 */ mfc1 $a2, $f6 +/* 0A6F0 809433C0 4600428D */ trunc.w.s $f10, $f8 +/* 0A6F4 809433C4 440B2000 */ mfc1 $t3, $f4 +/* 0A6F8 809433C8 00063400 */ sll $a2, $a2, 16 +/* 0A6FC 809433CC 00063403 */ sra $a2, $a2, 16 /* 0A700 809433D0 316D007F */ andi $t5, $t3, 0x007F ## $t5 = 00000000 -/* 0A704 809433D4 AFAD001C */ sw $t5, 0x001C($sp) +/* 0A704 809433D4 AFAD001C */ sw $t5, 0x001C($sp) /* 0A708 809433D8 C6060198 */ lwc1 $f6, 0x0198($s0) ## 00000198 -/* 0A70C 809433DC 44075000 */ mfc1 $a3, $f10 +/* 0A70C 809433DC 44075000 */ mfc1 $a3, $f10 /* 0A710 809433E0 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 -/* 0A714 809433E4 4600320D */ trunc.w.s $f8, $f6 -/* 0A718 809433E8 00073C00 */ sll $a3, $a3, 16 -/* 0A71C 809433EC 00073C03 */ sra $a3, $a3, 16 +/* 0A714 809433E4 4600320D */ trunc.w.s $f8, $f6 +/* 0A718 809433E8 00073C00 */ sll $a3, $a3, 16 +/* 0A71C 809433EC 00073C03 */ sra $a3, $a3, 16 /* 0A720 809433F0 30E7007F */ andi $a3, $a3, 0x007F ## $a3 = 0000007F -/* 0A724 809433F4 44184000 */ mfc1 $t8, $f8 -/* 0A728 809433F8 AFAB0028 */ sw $t3, 0x0028($sp) -/* 0A72C 809433FC AFAA0024 */ sw $t2, 0x0024($sp) +/* 0A724 809433F4 44184000 */ mfc1 $t8, $f8 +/* 0A728 809433F8 AFAB0028 */ sw $t3, 0x0028($sp) +/* 0A72C 809433FC AFAA0024 */ sw $t2, 0x0024($sp) /* 0A730 80943400 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000008 -/* 0A734 80943404 AFB90020 */ sw $t9, 0x0020($sp) +/* 0A734 80943404 AFB90020 */ sw $t9, 0x0020($sp) /* 0A738 80943408 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000018 -/* 0A73C 8094340C 0C0253D0 */ jal Draw_TwoTexScroll -/* 0A740 80943410 AFA20064 */ sw $v0, 0x0064($sp) -/* 0A744 80943414 8FA30064 */ lw $v1, 0x0064($sp) +/* 0A73C 8094340C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0A740 80943410 AFA20064 */ sw $v0, 0x0064($sp) +/* 0A744 80943414 8FA30064 */ lw $v1, 0x0064($sp) /* 0A748 80943418 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 0A74C 8094341C 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 /* 0A750 80943420 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0A754 80943424 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 0A758 80943428 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 0A75C 8094342C 55A0001D */ bnel $t5, $zero, .L809434A4 +/* 0A75C 8094342C 55A0001D */ bnel $t5, $zero, .L809434A4 /* 0A760 80943430 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0A764 80943434 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0A768 80943438 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -120,23 +120,23 @@ glabel BossTw_Draw /* 0A77C 8094344C C604019C */ lwc1 $f4, 0x019C($s0) ## 0000019C /* 0A780 80943450 C60A018C */ lwc1 $f10, 0x018C($s0) ## 0000018C /* 0A784 80943454 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0A788 80943458 4600218D */ trunc.w.s $f6, $f4 +/* 0A788 80943458 4600218D */ trunc.w.s $f6, $f4 /* 0A78C 8094345C 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 0A790 80943460 AFB90010 */ sw $t9, 0x0010($sp) -/* 0A794 80943464 4600548D */ trunc.w.s $f18, $f10 -/* 0A798 80943468 44063000 */ mfc1 $a2, $f6 +/* 0A790 80943460 AFB90010 */ sw $t9, 0x0010($sp) +/* 0A794 80943464 4600548D */ trunc.w.s $f18, $f10 +/* 0A798 80943468 44063000 */ mfc1 $a2, $f6 /* 0A79C 8094346C 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 0A7A0 80943470 AFA20060 */ sw $v0, 0x0060($sp) -/* 0A7A4 80943474 44059000 */ mfc1 $a1, $f18 -/* 0A7A8 80943478 00063400 */ sll $a2, $a2, 16 -/* 0A7AC 8094347C 00063403 */ sra $a2, $a2, 16 -/* 0A7B0 80943480 00052C00 */ sll $a1, $a1, 16 -/* 0A7B4 80943484 00052C03 */ sra $a1, $a1, 16 +/* 0A7A0 80943470 AFA20060 */ sw $v0, 0x0060($sp) +/* 0A7A4 80943474 44059000 */ mfc1 $a1, $f18 +/* 0A7A8 80943478 00063400 */ sll $a2, $a2, 16 +/* 0A7AC 8094347C 00063403 */ sra $a2, $a2, 16 +/* 0A7B0 80943480 00052C00 */ sll $a1, $a1, 16 +/* 0A7B4 80943484 00052C03 */ sra $a1, $a1, 16 /* 0A7B8 80943488 30A5007F */ andi $a1, $a1, 0x007F ## $a1 = 00000000 -/* 0A7BC 8094348C 0C0253A7 */ jal Draw_TexScroll +/* 0A7BC 8094348C 0C0253A7 */ jal Draw_TexScroll /* 0A7C0 80943490 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 -/* 0A7C4 80943494 8FA30060 */ lw $v1, 0x0060($sp) -/* 0A7C8 80943498 1000002A */ beq $zero, $zero, .L80943544 +/* 0A7C4 80943494 8FA30060 */ lw $v1, 0x0060($sp) +/* 0A7C8 80943498 1000002A */ beq $zero, $zero, .L80943544 /* 0A7CC 8094349C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0A7D0 809434A0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 .L809434A4: @@ -148,58 +148,58 @@ glabel BossTw_Draw /* 0A7E8 809434B8 C612019C */ lwc1 $f18, 0x019C($s0) ## 0000019C /* 0A7EC 809434BC C608018C */ lwc1 $f8, 0x018C($s0) ## 0000018C /* 0A7F0 809434C0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0A7F4 809434C4 AFB80018 */ sw $t8, 0x0018($sp) -/* 0A7F8 809434C8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0A7FC 809434CC AFAE0010 */ sw $t6, 0x0010($sp) +/* 0A7F4 809434C4 AFB80018 */ sw $t8, 0x0018($sp) +/* 0A7F8 809434C8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0A7FC 809434CC AFAE0010 */ sw $t6, 0x0010($sp) /* 0A800 809434D0 C6060190 */ lwc1 $f6, 0x0190($s0) ## 00000190 -/* 0A804 809434D4 4600428D */ trunc.w.s $f10, $f8 +/* 0A804 809434D4 4600428D */ trunc.w.s $f10, $f8 /* 0A808 809434D8 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 /* 0A80C 809434DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0A810 809434E0 4600320D */ trunc.w.s $f8, $f6 -/* 0A814 809434E4 44065000 */ mfc1 $a2, $f10 -/* 0A818 809434E8 4600910D */ trunc.w.s $f4, $f18 -/* 0A81C 809434EC 440D4000 */ mfc1 $t5, $f8 -/* 0A820 809434F0 00063400 */ sll $a2, $a2, 16 -/* 0A824 809434F4 00063403 */ sra $a2, $a2, 16 +/* 0A810 809434E0 4600320D */ trunc.w.s $f8, $f6 +/* 0A814 809434E4 44065000 */ mfc1 $a2, $f10 +/* 0A818 809434E8 4600910D */ trunc.w.s $f4, $f18 +/* 0A81C 809434EC 440D4000 */ mfc1 $t5, $f8 +/* 0A820 809434F0 00063400 */ sll $a2, $a2, 16 +/* 0A824 809434F4 00063403 */ sra $a2, $a2, 16 /* 0A828 809434F8 31AC007F */ andi $t4, $t5, 0x007F ## $t4 = 00000000 -/* 0A82C 809434FC AFAC001C */ sw $t4, 0x001C($sp) +/* 0A82C 809434FC AFAC001C */ sw $t4, 0x001C($sp) /* 0A830 80943500 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 -/* 0A834 80943504 44072000 */ mfc1 $a3, $f4 +/* 0A834 80943504 44072000 */ mfc1 $a3, $f4 /* 0A838 80943508 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 0A83C 8094350C 4600548D */ trunc.w.s $f18, $f10 -/* 0A840 80943510 00073C00 */ sll $a3, $a3, 16 -/* 0A844 80943514 00073C03 */ sra $a3, $a3, 16 +/* 0A83C 8094350C 4600548D */ trunc.w.s $f18, $f10 +/* 0A840 80943510 00073C00 */ sll $a3, $a3, 16 +/* 0A844 80943514 00073C03 */ sra $a3, $a3, 16 /* 0A848 80943518 30E7007F */ andi $a3, $a3, 0x007F ## $a3 = 00000000 -/* 0A84C 8094351C 44199000 */ mfc1 $t9, $f18 -/* 0A850 80943520 AFAD0028 */ sw $t5, 0x0028($sp) -/* 0A854 80943524 AFAB0024 */ sw $t3, 0x0024($sp) +/* 0A84C 8094351C 44199000 */ mfc1 $t9, $f18 +/* 0A850 80943520 AFAD0028 */ sw $t5, 0x0028($sp) +/* 0A854 80943524 AFAB0024 */ sw $t3, 0x0024($sp) /* 0A858 80943528 332A00FF */ andi $t2, $t9, 0x00FF ## $t2 = 00000000 -/* 0A85C 8094352C AFAA0020 */ sw $t2, 0x0020($sp) +/* 0A85C 8094352C AFAA0020 */ sw $t2, 0x0020($sp) /* 0A860 80943530 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 0A864 80943534 0C0253D0 */ jal Draw_TwoTexScroll -/* 0A868 80943538 AFA2005C */ sw $v0, 0x005C($sp) -/* 0A86C 8094353C 8FA3005C */ lw $v1, 0x005C($sp) +/* 0A864 80943534 0C0253D0 */ jal Draw_TwoTexScroll +/* 0A868 80943538 AFA2005C */ sw $v0, 0x005C($sp) +/* 0A86C 8094353C 8FA3005C */ lw $v1, 0x005C($sp) /* 0A870 80943540 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80943544: -/* 0A874 80943544 0C024F46 */ jal func_80093D18 +/* 0A874 80943544 0C024F46 */ jal func_80093D18 /* 0A878 80943548 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0A87C 8094354C 0C024F61 */ jal func_80093D84 +/* 0A87C 8094354C 0C024F61 */ jal func_80093D84 /* 0A880 80943550 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 0A884 80943554 860C015C */ lh $t4, 0x015C($s0) ## 0000015C /* 0A888 80943558 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 /* 0A88C 8094355C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0A890 80943560 318E0002 */ andi $t6, $t4, 0x0002 ## $t6 = 00000000 -/* 0A894 80943564 11C0000B */ beq $t6, $zero, .L80943594 +/* 0A894 80943564 11C0000B */ beq $t6, $zero, .L80943594 /* 0A898 80943568 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0A89C 8094356C 8E2402C0 */ lw $a0, 0x02C0($s1) ## 000002C0 /* 0A8A0 80943570 240F0384 */ addiu $t7, $zero, 0x0384 ## $t7 = 00000384 /* 0A8A4 80943574 2418044B */ addiu $t8, $zero, 0x044B ## $t8 = 0000044B -/* 0A8A8 80943578 AFB80018 */ sw $t8, 0x0018($sp) -/* 0A8AC 8094357C AFAF0014 */ sw $t7, 0x0014($sp) -/* 0A8B0 80943580 AFA00010 */ sw $zero, 0x0010($sp) -/* 0A8B4 80943584 0C024CDC */ jal func_80093370 +/* 0A8A8 80943578 AFB80018 */ sw $t8, 0x0018($sp) +/* 0A8AC 8094357C AFAF0014 */ sw $t7, 0x0014($sp) +/* 0A8B0 80943580 AFA00010 */ sw $zero, 0x0010($sp) +/* 0A8B4 80943584 0C024CDC */ jal func_80093370 /* 0A8B8 80943588 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 0A8BC 8094358C 10000073 */ beq $zero, $zero, .L8094375C +/* 0A8BC 8094358C 10000073 */ beq $zero, $zero, .L8094375C /* 0A8C0 80943590 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 .L80943594: /* 0A8C4 80943594 4459F800 */ cfc1 $t9, $31 @@ -207,34 +207,34 @@ glabel BossTw_Draw /* 0A8CC 8094359C C60401D4 */ lwc1 $f4, 0x01D4($s0) ## 000001D4 /* 0A8D0 809435A0 8E2402C0 */ lw $a0, 0x02C0($s1) ## 000002C0 /* 0A8D4 809435A4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 0A8D8 809435A8 460021A4 */ cvt.w.s $f6, $f4 +/* 0A8D8 809435A8 460021A4 */ cvt.w.s $f6, $f4 /* 0A8DC 809435AC 4445F800 */ cfc1 $a1, $31 /* 0A8E0 809435B0 00000000 */ nop /* 0A8E4 809435B4 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0A8E8 809435B8 50A00013 */ beql $a1, $zero, .L80943608 -/* 0A8EC 809435BC 44053000 */ mfc1 $a1, $f6 +/* 0A8E8 809435B8 50A00013 */ beql $a1, $zero, .L80943608 +/* 0A8EC 809435BC 44053000 */ mfc1 $a1, $f6 /* 0A8F0 809435C0 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 /* 0A8F4 809435C4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0A8F8 809435C8 46062181 */ sub.s $f6, $f4, $f6 +/* 0A8F8 809435C8 46062181 */ sub.s $f6, $f4, $f6 /* 0A8FC 809435CC 44C5F800 */ ctc1 $a1, $31 /* 0A900 809435D0 00000000 */ nop -/* 0A904 809435D4 460031A4 */ cvt.w.s $f6, $f6 +/* 0A904 809435D4 460031A4 */ cvt.w.s $f6, $f6 /* 0A908 809435D8 4445F800 */ cfc1 $a1, $31 /* 0A90C 809435DC 00000000 */ nop /* 0A910 809435E0 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0A914 809435E4 14A00005 */ bne $a1, $zero, .L809435FC +/* 0A914 809435E4 14A00005 */ bne $a1, $zero, .L809435FC /* 0A918 809435E8 00000000 */ nop -/* 0A91C 809435EC 44053000 */ mfc1 $a1, $f6 +/* 0A91C 809435EC 44053000 */ mfc1 $a1, $f6 /* 0A920 809435F0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0A924 809435F4 10000007 */ beq $zero, $zero, .L80943614 +/* 0A924 809435F4 10000007 */ beq $zero, $zero, .L80943614 /* 0A928 809435F8 00A12825 */ or $a1, $a1, $at ## $a1 = 80000000 .L809435FC: -/* 0A92C 809435FC 10000005 */ beq $zero, $zero, .L80943614 +/* 0A92C 809435FC 10000005 */ beq $zero, $zero, .L80943614 /* 0A930 80943600 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 0A934 80943604 44053000 */ mfc1 $a1, $f6 +/* 0A934 80943604 44053000 */ mfc1 $a1, $f6 .L80943608: /* 0A938 80943608 00000000 */ nop -/* 0A93C 8094360C 04A0FFFB */ bltz $a1, .L809435FC +/* 0A93C 8094360C 04A0FFFB */ bltz $a1, .L809435FC /* 0A940 80943610 00000000 */ nop .L80943614: /* 0A944 80943614 44D9F800 */ ctc1 $t9, $31 @@ -244,34 +244,34 @@ glabel BossTw_Draw /* 0A954 80943624 444AF800 */ cfc1 $t2, $31 /* 0A958 80943628 44C6F800 */ ctc1 $a2, $31 /* 0A95C 8094362C 00000000 */ nop -/* 0A960 80943630 460042A4 */ cvt.w.s $f10, $f8 +/* 0A960 80943630 460042A4 */ cvt.w.s $f10, $f8 /* 0A964 80943634 4446F800 */ cfc1 $a2, $31 /* 0A968 80943638 00000000 */ nop /* 0A96C 8094363C 30C60078 */ andi $a2, $a2, 0x0078 ## $a2 = 00000000 -/* 0A970 80943640 50C00013 */ beql $a2, $zero, .L80943690 -/* 0A974 80943644 44065000 */ mfc1 $a2, $f10 +/* 0A970 80943640 50C00013 */ beql $a2, $zero, .L80943690 +/* 0A974 80943644 44065000 */ mfc1 $a2, $f10 /* 0A978 80943648 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 0A97C 8094364C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0A980 80943650 460A4281 */ sub.s $f10, $f8, $f10 +/* 0A980 80943650 460A4281 */ sub.s $f10, $f8, $f10 /* 0A984 80943654 44C6F800 */ ctc1 $a2, $31 /* 0A988 80943658 00000000 */ nop -/* 0A98C 8094365C 460052A4 */ cvt.w.s $f10, $f10 +/* 0A98C 8094365C 460052A4 */ cvt.w.s $f10, $f10 /* 0A990 80943660 4446F800 */ cfc1 $a2, $31 /* 0A994 80943664 00000000 */ nop /* 0A998 80943668 30C60078 */ andi $a2, $a2, 0x0078 ## $a2 = 00000000 -/* 0A99C 8094366C 14C00005 */ bne $a2, $zero, .L80943684 +/* 0A99C 8094366C 14C00005 */ bne $a2, $zero, .L80943684 /* 0A9A0 80943670 00000000 */ nop -/* 0A9A4 80943674 44065000 */ mfc1 $a2, $f10 +/* 0A9A4 80943674 44065000 */ mfc1 $a2, $f10 /* 0A9A8 80943678 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0A9AC 8094367C 10000007 */ beq $zero, $zero, .L8094369C +/* 0A9AC 8094367C 10000007 */ beq $zero, $zero, .L8094369C /* 0A9B0 80943680 00C13025 */ or $a2, $a2, $at ## $a2 = 80000000 .L80943684: -/* 0A9B4 80943684 10000005 */ beq $zero, $zero, .L8094369C +/* 0A9B4 80943684 10000005 */ beq $zero, $zero, .L8094369C /* 0A9B8 80943688 2406FFFF */ addiu $a2, $zero, 0xFFFF ## $a2 = FFFFFFFF -/* 0A9BC 8094368C 44065000 */ mfc1 $a2, $f10 +/* 0A9BC 8094368C 44065000 */ mfc1 $a2, $f10 .L80943690: /* 0A9C0 80943690 00000000 */ nop -/* 0A9C4 80943694 04C0FFFB */ bltz $a2, .L80943684 +/* 0A9C4 80943694 04C0FFFB */ bltz $a2, .L80943684 /* 0A9C8 80943698 00000000 */ nop .L8094369C: /* 0A9CC 8094369C 44CAF800 */ ctc1 $t2, $31 @@ -281,52 +281,52 @@ glabel BossTw_Draw /* 0A9DC 809436AC 444BF800 */ cfc1 $t3, $31 /* 0A9E0 809436B0 44C7F800 */ ctc1 $a3, $31 /* 0A9E4 809436B4 00000000 */ nop -/* 0A9E8 809436B8 46009124 */ cvt.w.s $f4, $f18 +/* 0A9E8 809436B8 46009124 */ cvt.w.s $f4, $f18 /* 0A9EC 809436BC 4447F800 */ cfc1 $a3, $31 /* 0A9F0 809436C0 00000000 */ nop /* 0A9F4 809436C4 30E70078 */ andi $a3, $a3, 0x0078 ## $a3 = 00000000 -/* 0A9F8 809436C8 50E00013 */ beql $a3, $zero, .L80943718 -/* 0A9FC 809436CC 44072000 */ mfc1 $a3, $f4 +/* 0A9F8 809436C8 50E00013 */ beql $a3, $zero, .L80943718 +/* 0A9FC 809436CC 44072000 */ mfc1 $a3, $f4 /* 0AA00 809436D0 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 0AA04 809436D4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0AA08 809436D8 46049101 */ sub.s $f4, $f18, $f4 +/* 0AA08 809436D8 46049101 */ sub.s $f4, $f18, $f4 /* 0AA0C 809436DC 44C7F800 */ ctc1 $a3, $31 /* 0AA10 809436E0 00000000 */ nop -/* 0AA14 809436E4 46002124 */ cvt.w.s $f4, $f4 +/* 0AA14 809436E4 46002124 */ cvt.w.s $f4, $f4 /* 0AA18 809436E8 4447F800 */ cfc1 $a3, $31 /* 0AA1C 809436EC 00000000 */ nop /* 0AA20 809436F0 30E70078 */ andi $a3, $a3, 0x0078 ## $a3 = 00000000 -/* 0AA24 809436F4 14E00005 */ bne $a3, $zero, .L8094370C +/* 0AA24 809436F4 14E00005 */ bne $a3, $zero, .L8094370C /* 0AA28 809436F8 00000000 */ nop -/* 0AA2C 809436FC 44072000 */ mfc1 $a3, $f4 +/* 0AA2C 809436FC 44072000 */ mfc1 $a3, $f4 /* 0AA30 80943700 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0AA34 80943704 10000007 */ beq $zero, $zero, .L80943724 +/* 0AA34 80943704 10000007 */ beq $zero, $zero, .L80943724 /* 0AA38 80943708 00E13825 */ or $a3, $a3, $at ## $a3 = 80000000 .L8094370C: -/* 0AA3C 8094370C 10000005 */ beq $zero, $zero, .L80943724 +/* 0AA3C 8094370C 10000005 */ beq $zero, $zero, .L80943724 /* 0AA40 80943710 2407FFFF */ addiu $a3, $zero, 0xFFFF ## $a3 = FFFFFFFF -/* 0AA44 80943714 44072000 */ mfc1 $a3, $f4 +/* 0AA44 80943714 44072000 */ mfc1 $a3, $f4 .L80943718: /* 0AA48 80943718 00000000 */ nop -/* 0AA4C 8094371C 04E0FFFB */ bltz $a3, .L8094370C +/* 0AA4C 8094371C 04E0FFFB */ bltz $a3, .L8094370C /* 0AA50 80943720 00000000 */ nop .L80943724: -/* 0AA54 80943724 AFA00010 */ sw $zero, 0x0010($sp) +/* 0AA54 80943724 AFA00010 */ sw $zero, 0x0010($sp) /* 0AA58 80943728 C60601E0 */ lwc1 $f6, 0x01E0($s0) ## 000001E0 /* 0AA5C 8094372C 44CBF800 */ ctc1 $t3, $31 /* 0AA60 80943730 00000000 */ nop -/* 0AA64 80943734 4600320D */ trunc.w.s $f8, $f6 -/* 0AA68 80943738 440C4000 */ mfc1 $t4, $f8 +/* 0AA64 80943734 4600320D */ trunc.w.s $f8, $f6 +/* 0AA68 80943738 440C4000 */ mfc1 $t4, $f8 /* 0AA6C 8094373C 00000000 */ nop -/* 0AA70 80943740 AFAC0014 */ sw $t4, 0x0014($sp) +/* 0AA70 80943740 AFAC0014 */ sw $t4, 0x0014($sp) /* 0AA74 80943744 C60A01E4 */ lwc1 $f10, 0x01E4($s0) ## 000001E4 -/* 0AA78 80943748 4600548D */ trunc.w.s $f18, $f10 -/* 0AA7C 8094374C 440F9000 */ mfc1 $t7, $f18 -/* 0AA80 80943750 0C024CDC */ jal func_80093370 -/* 0AA84 80943754 AFAF0018 */ sw $t7, 0x0018($sp) +/* 0AA78 80943748 4600548D */ trunc.w.s $f18, $f10 +/* 0AA7C 8094374C 440F9000 */ mfc1 $t7, $f18 +/* 0AA80 80943750 0C024CDC */ jal func_80093370 +/* 0AA84 80943754 AFAF0018 */ sw $t7, 0x0018($sp) /* 0AA88 80943758 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 .L8094375C: -/* 0AA8C 8094375C 0C034213 */ jal Matrix_Push +/* 0AA8C 8094375C 0C034213 */ jal Matrix_Push /* 0AA90 80943760 00000000 */ nop /* 0AA94 80943764 8E05056C */ lw $a1, 0x056C($s0) ## 0000056C /* 0AA98 80943768 8E060588 */ lw $a2, 0x0588($s0) ## 00000588 @@ -335,128 +335,128 @@ glabel BossTw_Draw /* 0AAA4 80943774 3C198094 */ lui $t9, %hi(func_80941788) ## $t9 = 80940000 /* 0AAA8 80943778 27391788 */ addiu $t9, $t9, %lo(func_80941788) ## $t9 = 80941788 /* 0AAAC 8094377C 271816D0 */ addiu $t8, $t8, %lo(func_809416D0) ## $t8 = 809416D0 -/* 0AAB0 80943780 AFB80010 */ sw $t8, 0x0010($sp) -/* 0AAB4 80943784 AFB90014 */ sw $t9, 0x0014($sp) -/* 0AAB8 80943788 AFB00018 */ sw $s0, 0x0018($sp) -/* 0AABC 8094378C 0C0286B2 */ jal func_800A1AC8 +/* 0AAB0 80943780 AFB80010 */ sw $t8, 0x0010($sp) +/* 0AAB4 80943784 AFB90014 */ sw $t9, 0x0014($sp) +/* 0AAB8 80943788 AFB00018 */ sw $s0, 0x0018($sp) +/* 0AABC 8094378C 0C0286B2 */ jal SkelAnime_DrawSV /* 0AAC0 80943790 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0AAC4 80943794 0C034221 */ jal Matrix_Pull +/* 0AAC4 80943794 0C034221 */ jal Matrix_Pull /* 0AAC8 80943798 00000000 */ nop /* 0AACC 8094379C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0AAD0 809437A0 0C02F228 */ jal func_800BC8A0 +/* 0AAD0 809437A0 0C02F228 */ jal func_800BC8A0 /* 0AAD4 809437A4 8E2502C0 */ lw $a1, 0x02C0($s1) ## 000002C0 /* 0AAD8 809437A8 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 /* 0AADC 809437AC 860A001C */ lh $t2, 0x001C($s0) ## 0000001C .L809437B0: /* 0AAE0 809437B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AAE4 809437B4 15400042 */ bne $t2, $zero, .L809438C0 +/* 0AAE4 809437B4 15400042 */ bne $t2, $zero, .L809438C0 /* 0AAE8 809437B8 00000000 */ nop /* 0AAEC 809437BC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0AAF0 809437C0 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 0AAF4 809437C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AAF8 809437C8 4604003C */ c.lt.s $f0, $f4 +/* 0AAF8 809437C8 4604003C */ c.lt.s $f0, $f4 /* 0AAFC 809437CC 00000000 */ nop -/* 0AB00 809437D0 45000039 */ bc1f .L809438B8 +/* 0AB00 809437D0 45000039 */ bc1f .L809438B8 /* 0AB04 809437D4 00000000 */ nop /* 0AB08 809437D8 C61001B0 */ lwc1 $f16, 0x01B0($s0) ## 000001B0 -/* 0AB0C 809437DC 8FA20084 */ lw $v0, 0x0084($sp) -/* 0AB10 809437E0 4610003C */ c.lt.s $f0, $f16 +/* 0AB0C 809437DC 8FA20084 */ lw $v0, 0x0084($sp) +/* 0AB10 809437E0 4610003C */ c.lt.s $f0, $f16 /* 0AB14 809437E4 00000000 */ nop -/* 0AB18 809437E8 45000031 */ bc1f .L809438B0 +/* 0AB18 809437E8 45000031 */ bc1f .L809438B0 /* 0AB1C 809437EC 00000000 */ nop /* 0AB20 809437F0 C60A04C0 */ lwc1 $f10, 0x04C0($s0) ## 000004C0 /* 0AB24 809437F4 C4520028 */ lwc1 $f18, 0x0028($v0) ## 00000028 /* 0AB28 809437F8 C60604BC */ lwc1 $f6, 0x04BC($s0) ## 000004BC /* 0AB2C 809437FC C4480024 */ lwc1 $f8, 0x0024($v0) ## 00000024 -/* 0AB30 80943800 46125081 */ sub.s $f2, $f10, $f18 +/* 0AB30 80943800 46125081 */ sub.s $f2, $f10, $f18 /* 0AB34 80943804 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0AB38 80943808 C60404C4 */ lwc1 $f4, 0x04C4($s0) ## 000004C4 -/* 0AB3C 8094380C 46083301 */ sub.s $f12, $f6, $f8 +/* 0AB3C 8094380C 46083301 */ sub.s $f12, $f6, $f8 /* 0AB40 80943810 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 /* 0AB44 80943814 C446002C */ lwc1 $f6, 0x002C($v0) ## 0000002C -/* 0AB48 80943818 46001005 */ abs.s $f0, $f2 -/* 0AB4C 8094381C 4608003C */ c.lt.s $f0, $f8 -/* 0AB50 80943820 46062381 */ sub.s $f14, $f4, $f6 -/* 0AB54 80943824 45000022 */ bc1f .L809438B0 +/* 0AB48 80943818 46001005 */ abs.s $f0, $f2 +/* 0AB4C 8094381C 4608003C */ c.lt.s $f0, $f8 +/* 0AB50 80943820 46062381 */ sub.s $f14, $f4, $f6 +/* 0AB54 80943824 45000022 */ bc1f .L809438B0 /* 0AB58 80943828 00000000 */ nop /* 0AB5C 8094382C 944B0088 */ lhu $t3, 0x0088($v0) ## 00000088 /* 0AB60 80943830 316D0001 */ andi $t5, $t3, 0x0001 ## $t5 = 00000000 -/* 0AB64 80943834 11A0001E */ beq $t5, $zero, .L809438B0 +/* 0AB64 80943834 11A0001E */ beq $t5, $zero, .L809438B0 /* 0AB68 80943838 00000000 */ nop -/* 0AB6C 8094383C 460C6282 */ mul.s $f10, $f12, $f12 +/* 0AB6C 8094383C 460C6282 */ mul.s $f10, $f12, $f12 /* 0AB70 80943840 3C018095 */ lui $at, %hi(D_8094B06C) ## $at = 80950000 -/* 0AB74 80943844 C426B06C */ lwc1 $f6, %lo(D_8094B06C)($at) -/* 0AB78 80943848 460E7482 */ mul.s $f18, $f14, $f14 +/* 0AB74 80943844 C426B06C */ lwc1 $f6, %lo(D_8094B06C)($at) +/* 0AB78 80943848 460E7482 */ mul.s $f18, $f14, $f14 /* 0AB7C 8094384C C60401B4 */ lwc1 $f4, 0x01B4($s0) ## 000001B4 /* 0AB80 80943850 3C028095 */ lui $v0, %hi(D_8094C85F) ## $v0 = 80950000 /* 0AB84 80943854 2442C85F */ addiu $v0, $v0, %lo(D_8094C85F) ## $v0 = 8094C85F -/* 0AB88 80943858 46062202 */ mul.s $f8, $f4, $f6 -/* 0AB8C 8094385C 46125000 */ add.s $f0, $f10, $f18 -/* 0AB90 80943860 46000004 */ sqrt.s $f0, $f0 -/* 0AB94 80943864 4608003C */ c.lt.s $f0, $f8 +/* 0AB88 80943858 46062202 */ mul.s $f8, $f4, $f6 +/* 0AB8C 8094385C 46125000 */ add.s $f0, $f10, $f18 +/* 0AB90 80943860 46000004 */ sqrt.s $f0, $f0 +/* 0AB94 80943864 4608003C */ c.lt.s $f0, $f8 /* 0AB98 80943868 00000000 */ nop -/* 0AB9C 8094386C 45000010 */ bc1f .L809438B0 +/* 0AB9C 8094386C 45000010 */ bc1f .L809438B0 /* 0ABA0 80943870 00000000 */ nop /* 0ABA4 80943874 904C0000 */ lbu $t4, 0x0000($v0) ## 8094C85F /* 0ABA8 80943878 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 0ABAC 8094387C 1580000C */ bne $t4, $zero, .L809438B0 +/* 0ABAC 8094387C 1580000C */ bne $t4, $zero, .L809438B0 /* 0ABB0 80943880 00000000 */ nop /* 0ABB4 80943884 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 /* 0ABB8 80943888 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0ABBC 8094388C 3C188095 */ lui $t8, %hi(D_8094C84C) ## $t8 = 80950000 -/* 0ABC0 80943890 4610503C */ c.lt.s $f10, $f16 +/* 0ABC0 80943890 4610503C */ c.lt.s $f10, $f16 /* 0ABC4 80943894 00000000 */ nop -/* 0ABC8 80943898 45000005 */ bc1f .L809438B0 +/* 0ABC8 80943898 45000005 */ bc1f .L809438B0 /* 0ABCC 8094389C 00000000 */ nop /* 0ABD0 809438A0 A04E0000 */ sb $t6, 0x0000($v0) ## 8094C85F -/* 0ABD4 809438A4 8F18C84C */ lw $t8, %lo(D_8094C84C)($t8) +/* 0ABD4 809438A4 8F18C84C */ lw $t8, %lo(D_8094C84C)($t8) /* 0ABD8 809438A8 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 /* 0ABDC 809438AC A70F017C */ sh $t7, 0x017C($t8) ## 8095017C .L809438B0: -/* 0ABE0 809438B0 0C2506F0 */ jal func_80941BC0 +/* 0ABE0 809438B0 0C2506F0 */ jal func_80941BC0 /* 0ABE4 809438B4 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 .L809438B8: -/* 0ABE8 809438B8 10000004 */ beq $zero, $zero, .L809438CC +/* 0ABE8 809438B8 10000004 */ beq $zero, $zero, .L809438CC /* 0ABEC 809438BC 92020564 */ lbu $v0, 0x0564($s0) ## 00000564 .L809438C0: -/* 0ABF0 809438C0 0C250860 */ jal func_80942180 +/* 0ABF0 809438C0 0C250860 */ jal func_80942180 /* 0ABF4 809438C4 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 0ABF8 809438C8 92020564 */ lbu $v0, 0x0564($s0) ## 00000564 .L809438CC: -/* 0ABFC 809438CC 10400014 */ beq $v0, $zero, .L80943920 +/* 0ABFC 809438CC 10400014 */ beq $v0, $zero, .L80943920 /* 0AC00 809438D0 00000000 */ nop /* 0AC04 809438D4 8E0A014C */ lw $t2, 0x014C($s0) ## 0000014C /* 0AC08 809438D8 3C198094 */ lui $t9, %hi(func_8093D444) ## $t9 = 80940000 /* 0AC0C 809438DC 2739D444 */ addiu $t9, $t9, %lo(func_8093D444) ## $t9 = 8093D444 -/* 0AC10 809438E0 172A0006 */ bne $t9, $t2, .L809438FC +/* 0AC10 809438E0 172A0006 */ bne $t9, $t2, .L809438FC /* 0AC14 809438E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0AC18 809438E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AC1C 809438EC 0C250C0A */ jal func_80943028 +/* 0AC1C 809438EC 0C250C0A */ jal func_80943028 /* 0AC20 809438F0 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 0AC24 809438F4 1000000A */ beq $zero, $zero, .L80943920 +/* 0AC24 809438F4 1000000A */ beq $zero, $zero, .L80943920 /* 0AC28 809438F8 00000000 */ nop .L809438FC: -/* 0AC2C 809438FC 0C2509BC */ jal func_809426F0 +/* 0AC2C 809438FC 0C2509BC */ jal func_809426F0 /* 0AC30 80943900 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 0AC34 80943904 3C048095 */ lui $a0, %hi(D_8094A9A4) ## $a0 = 80950000 /* 0AC38 80943908 2484A9A4 */ addiu $a0, $a0, %lo(D_8094A9A4) ## $a0 = 8094A9A4 -/* 0AC3C 8094390C 0C0346BD */ jal Matrix_MultVec3f +/* 0AC3C 8094390C 0C0346BD */ jal Matrix_MultVec3f /* 0AC40 80943910 2605048C */ addiu $a1, $s0, 0x048C ## $a1 = 0000048C /* 0AC44 80943914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AC48 80943918 0C250B1C */ jal func_80942C70 +/* 0AC48 80943918 0C250B1C */ jal func_80942C70 /* 0AC4C 8094391C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 .L80943920: /* 0AC50 80943920 3C068095 */ lui $a2, %hi(D_8094AC38) ## $a2 = 80950000 /* 0AC54 80943924 24C6AC38 */ addiu $a2, $a2, %lo(D_8094AC38) ## $a2 = 8094AC38 /* 0AC58 80943928 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 0AC5C 8094392C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0AC60 80943930 0C031AD5 */ jal func_800C6B54 +/* 0AC60 80943930 0C031AD5 */ jal func_800C6B54 /* 0AC64 80943934 24071BD3 */ addiu $a3, $zero, 0x1BD3 ## $a3 = 00001BD3 -/* 0AC68 80943938 8FBF0044 */ lw $ra, 0x0044($sp) -/* 0AC6C 8094393C 8FB00038 */ lw $s0, 0x0038($sp) -/* 0AC70 80943940 8FB1003C */ lw $s1, 0x003C($sp) -/* 0AC74 80943944 8FB20040 */ lw $s2, 0x0040($sp) -/* 0AC78 80943948 03E00008 */ jr $ra +/* 0AC68 80943938 8FBF0044 */ lw $ra, 0x0044($sp) +/* 0AC6C 8094393C 8FB00038 */ lw $s0, 0x0038($sp) +/* 0AC70 80943940 8FB1003C */ lw $s1, 0x003C($sp) +/* 0AC74 80943944 8FB20040 */ lw $s2, 0x0040($sp) +/* 0AC78 80943948 03E00008 */ jr $ra /* 0AC7C 8094394C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s index 39a0c120bb..84a20b44bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s @@ -1,32 +1,32 @@ glabel BossTw_Init /* 009F0 809396C0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 009F4 809396C4 AFB10038 */ sw $s1, 0x0038($sp) +/* 009F4 809396C4 AFB10038 */ sw $s1, 0x0038($sp) /* 009F8 809396C8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 009FC 809396CC AFBF003C */ sw $ra, 0x003C($sp) -/* 00A00 809396D0 AFB00034 */ sw $s0, 0x0034($sp) +/* 009FC 809396CC AFBF003C */ sw $ra, 0x003C($sp) +/* 00A00 809396D0 AFB00034 */ sw $s0, 0x0034($sp) /* 00A04 809396D4 3C058095 */ lui $a1, %hi(D_8094A8A0) ## $a1 = 80950000 /* 00A08 809396D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00A0C 809396DC 0C01E037 */ jal Actor_ProcessInitChain - + /* 00A10 809396E0 24A5A8A0 */ addiu $a1, $a1, %lo(D_8094A8A0) ## $a1 = 8094A8A0 /* 00A14 809396E4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00A18 809396E8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00A1C 809396EC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A20 809396F0 44050000 */ mfc1 $a1, $f0 -/* 00A24 809396F4 44070000 */ mfc1 $a3, $f0 +/* 00A20 809396F0 44050000 */ mfc1 $a1, $f0 +/* 00A24 809396F4 44070000 */ mfc1 $a3, $f0 /* 00A28 809396F8 0C00AC78 */ jal ActorShape_Init - + /* 00A2C 809396FC 00000000 */ nop /* 00A30 80939700 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00A34 80939704 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A38 80939708 3C053CCC */ lui $a1, 0x3CCC ## $a1 = 3CCC0000 -/* 00A3C 8093970C 29C10064 */ slti $at, $t6, 0x0064 -/* 00A40 80939710 14200048 */ bne $at, $zero, .L80939834 +/* 00A3C 8093970C 29C10064 */ slti $at, $t6, 0x0064 +/* 00A40 80939710 14200048 */ bne $at, $zero, .L80939834 /* 00A44 80939714 00000000 */ nop /* 00A48 80939718 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00A4C 8093971C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00A50 80939720 0C00B58B */ jal Actor_SetScale - + /* 00A54 80939724 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A58 80939728 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 /* 00A5C 8093972C 3C0F8094 */ lui $t7, %hi(func_80946B00) ## $t7 = 80940000 @@ -34,47 +34,47 @@ glabel BossTw_Init /* 00A64 80939734 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00A68 80939738 25EF6B00 */ addiu $t7, $t7, %lo(func_80946B00) ## $t7 = 80946B00 /* 00A6C 8093973C 27186C7C */ addiu $t8, $t8, %lo(func_80946C7C) ## $t8 = 80946C7C -/* 00A70 80939740 03217024 */ and $t6, $t9, $at +/* 00A70 80939740 03217024 */ and $t6, $t9, $at /* 00A74 80939744 AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 /* 00A78 80939748 AE180134 */ sw $t8, 0x0134($s0) ## 00000134 /* 00A7C 8093974C AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 /* 00A80 80939750 260505AC */ addiu $a1, $s0, 0x05AC ## $a1 = 000005AC -/* 00A84 80939754 AFA50044 */ sw $a1, 0x0044($sp) +/* 00A84 80939754 AFA50044 */ sw $a1, 0x0044($sp) /* 00A88 80939758 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00A8C 8093975C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A90 80939760 3C078095 */ lui $a3, %hi(D_8094A7E8) ## $a3 = 80950000 -/* 00A94 80939764 8FA50044 */ lw $a1, 0x0044($sp) +/* 00A94 80939764 8FA50044 */ lw $a1, 0x0044($sp) /* 00A98 80939768 24E7A7E8 */ addiu $a3, $a3, %lo(D_8094A7E8) ## $a3 = 8094A7E8 /* 00A9C 8093976C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00AA0 80939770 0C01712B */ jal ActorCollider_InitCylinder - + /* 00AA4 80939774 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00AA8 80939778 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 00AAC 8093977C 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 /* 00AB0 80939780 3C0F8094 */ lui $t7, %hi(func_809453EC) ## $t7 = 80940000 -/* 00AB4 80939784 10610003 */ beq $v1, $at, .L80939794 +/* 00AB4 80939784 10610003 */ beq $v1, $at, .L80939794 /* 00AB8 80939788 25EF53EC */ addiu $t7, $t7, %lo(func_809453EC) ## $t7 = 809453EC /* 00ABC 8093978C 24010065 */ addiu $at, $zero, 0x0065 ## $at = 00000065 -/* 00AC0 80939790 14610004 */ bne $v1, $at, .L809397A4 +/* 00AC0 80939790 14610004 */ bne $v1, $at, .L809397A4 .L80939794: /* 00AC4 80939794 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00AC8 80939798 AE0F014C */ sw $t7, 0x014C($s0) ## 0000014C -/* 00ACC 8093979C 10000022 */ beq $zero, $zero, .L80939828 +/* 00ACC 8093979C 10000022 */ beq $zero, $zero, .L80939828 /* 00AD0 809397A0 A21805C8 */ sb $t8, 0x05C8($s0) ## 000005C8 .L809397A4: /* 00AD4 809397A4 24010066 */ addiu $at, $zero, 0x0066 ## $at = 00000066 -/* 00AD8 809397A8 10610003 */ beq $v1, $at, .L809397B8 +/* 00AD8 809397A8 10610003 */ beq $v1, $at, .L809397B8 /* 00ADC 809397AC 3C198094 */ lui $t9, %hi(func_80945D14) ## $t9 = 80940000 /* 00AE0 809397B0 24010067 */ addiu $at, $zero, 0x0067 ## $at = 00000067 -/* 00AE4 809397B4 14610003 */ bne $v1, $at, .L809397C4 +/* 00AE4 809397B4 14610003 */ bne $v1, $at, .L809397C4 .L809397B8: /* 00AE8 809397B8 27395D14 */ addiu $t9, $t9, %lo(func_80945D14) ## $t9 = 80945D14 -/* 00AEC 809397BC 1000001A */ beq $zero, $zero, .L80939828 +/* 00AEC 809397BC 1000001A */ beq $zero, $zero, .L80939828 /* 00AF0 809397C0 AE19014C */ sw $t9, 0x014C($s0) ## 0000014C .L809397C4: -/* 00AF4 809397C4 28610068 */ slti $at, $v1, 0x0068 -/* 00AF8 809397C8 14200017 */ bne $at, $zero, .L80939828 +/* 00AF4 809397C4 28610068 */ slti $at, $v1, 0x0068 +/* 00AF8 809397C8 14200017 */ bne $at, $zero, .L80939828 /* 00AFC 809397CC 3C0E8094 */ lui $t6, %hi(func_8093EE10) ## $t6 = 80940000 /* 00B00 809397D0 3C014300 */ lui $at, 0x4300 ## $at = 43000000 /* 00B04 809397D4 44812000 */ mtc1 $at, $f4 ## $f4 = 128.00 @@ -85,61 +85,61 @@ glabel BossTw_Init /* 00B18 809397E8 24010068 */ addiu $at, $zero, 0x0068 ## $at = 00000068 /* 00B1C 809397EC AE0E014C */ sw $t6, 0x014C($s0) ## 0000014C /* 00B20 809397F0 AE0F0134 */ sw $t7, 0x0134($s0) ## 00000134 -/* 00B24 809397F4 17010007 */ bne $t8, $at, .L80939814 +/* 00B24 809397F4 17010007 */ bne $t8, $at, .L80939814 /* 00B28 809397F8 E60401AC */ swc1 $f4, 0x01AC($s0) ## 000001AC /* 00B2C 809397FC 3C198095 */ lui $t9, %hi(D_8094C84C) ## $t9 = 80950000 -/* 00B30 80939800 8F39C84C */ lw $t9, %lo(D_8094C84C)($t9) +/* 00B30 80939800 8F39C84C */ lw $t9, %lo(D_8094C84C)($t9) /* 00B34 80939804 872E0032 */ lh $t6, 0x0032($t9) ## 80950032 /* 00B38 80939808 25CF4000 */ addiu $t7, $t6, 0x4000 ## $t7 = 80942E10 -/* 00B3C 8093980C 10000006 */ beq $zero, $zero, .L80939828 +/* 00B3C 8093980C 10000006 */ beq $zero, $zero, .L80939828 /* 00B40 80939810 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 .L80939814: /* 00B44 80939814 3C188095 */ lui $t8, %hi(D_8094C84C) ## $t8 = 80950000 -/* 00B48 80939818 8F18C84C */ lw $t8, %lo(D_8094C84C)($t8) +/* 00B48 80939818 8F18C84C */ lw $t8, %lo(D_8094C84C)($t8) /* 00B4C 8093981C 87190032 */ lh $t9, 0x0032($t8) ## 80950032 /* 00B50 80939820 272EC000 */ addiu $t6, $t9, 0xC000 ## $t6 = 8094C000 /* 00B54 80939824 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 .L80939828: /* 00B58 80939828 240F0096 */ addiu $t7, $zero, 0x0096 ## $t7 = 00000096 -/* 00B5C 8093982C 100001A5 */ beq $zero, $zero, .L80939EC4 +/* 00B5C 8093982C 100001A5 */ beq $zero, $zero, .L80939EC4 /* 00B60 80939830 A60F017A */ sh $t7, 0x017A($s0) ## 0000017A .L80939834: /* 00B64 80939834 0C00B58B */ jal Actor_SetScale - + /* 00B68 80939838 34A5CCCC */ ori $a1, $a1, 0xCCCC ## $a1 = 0000CCCC /* 00B6C 8093983C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF /* 00B70 80939840 A21800AE */ sb $t8, 0x00AE($s0) ## 000000AE /* 00B74 80939844 A20000AF */ sb $zero, 0x00AF($s0) ## 000000AF /* 00B78 80939848 260505AC */ addiu $a1, $s0, 0x05AC ## $a1 = 000005AC -/* 00B7C 8093984C AFA50044 */ sw $a1, 0x0044($sp) +/* 00B7C 8093984C AFA50044 */ sw $a1, 0x0044($sp) /* 00B80 80939850 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00B84 80939854 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B88 80939858 3C198095 */ lui $t9, %hi(D_8094A89C) ## $t9 = 80950000 -/* 00B8C 8093985C 9339A89C */ lbu $t9, %lo(D_8094A89C)($t9) +/* 00B8C 8093985C 9339A89C */ lbu $t9, %lo(D_8094A89C)($t9) /* 00B90 80939860 3C028095 */ lui $v0, %hi(D_8094C851) ## $v0 = 80950000 -/* 00B94 80939864 8FA50044 */ lw $a1, 0x0044($sp) -/* 00B98 80939868 17200082 */ bne $t9, $zero, .L80939A74 +/* 00B94 80939864 8FA50044 */ lw $a1, 0x0044($sp) +/* 00B98 80939868 17200082 */ bne $t9, $zero, .L80939A74 /* 00B9C 8093986C 2442C851 */ addiu $v0, $v0, %lo(D_8094C851) ## $v0 = 8094C851 /* 00BA0 80939870 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00BA4 80939874 3C018095 */ lui $at, %hi(D_8094A89C) ## $at = 80950000 -/* 00BA8 80939878 A02EA89C */ sb $t6, %lo(D_8094A89C)($at) +/* 00BA8 80939878 A02EA89C */ sb $t6, %lo(D_8094A89C)($at) /* 00BAC 8093987C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00BB0 80939880 00310821 */ addu $at, $at, $s1 +/* 00BB0 80939880 00310821 */ addu $at, $at, $s1 /* 00BB4 80939884 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00BB8 80939888 A02F0AE3 */ sb $t7, 0x0AE3($at) ## 00010AE3 /* 00BBC 8093988C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00BC0 80939890 00310821 */ addu $at, $at, $s1 +/* 00BC0 80939890 00310821 */ addu $at, $at, $s1 /* 00BC4 80939894 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00BC8 80939898 A0380AE2 */ sb $t8, 0x0AE2($at) ## 00010AE2 /* 00BCC 8093989C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00BD0 809398A0 00310821 */ addu $at, $at, $s1 +/* 00BD0 809398A0 00310821 */ addu $at, $at, $s1 /* 00BD4 809398A4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00BD8 809398A8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00BDC 809398AC A0390AE1 */ sb $t9, 0x0AE1($at) ## 00010AE1 /* 00BE0 809398B0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00BE4 809398B4 3C098095 */ lui $t1, %hi(D_8094C840) ## $t1 = 80950000 -/* 00BE8 809398B8 00310821 */ addu $at, $at, $s1 +/* 00BE8 809398B8 00310821 */ addu $at, $at, $s1 /* 00BEC 809398BC 2529C840 */ addiu $t1, $t1, %lo(D_8094C840) ## $t1 = 8094C840 /* 00BF0 809398C0 E4200AFC */ swc1 $f0, 0x0AFC($at) ## 00010AFC /* 00BF4 809398C4 A1200000 */ sb $zero, 0x0000($t1) ## 8094C840 @@ -179,91 +179,91 @@ glabel BossTw_Init /* 00C7C 8093994C A1B80000 */ sb $t8, 0x0000($t5) ## 8094C870 /* 00C80 80939950 A3F80000 */ sb $t8, 0x0000($ra) ## 8094C87E /* 00C84 80939954 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000001 -/* 00C88 80939958 A439C87C */ sh $t9, %lo(D_8094C87C)($at) +/* 00C88 80939958 A439C87C */ sh $t9, %lo(D_8094C87C)($at) /* 00C8C 8093995C 3C0E8095 */ lui $t6, %hi(D_8094C87C) ## $t6 = 80950000 -/* 00C90 80939960 85CEC87C */ lh $t6, %lo(D_8094C87C)($t6) +/* 00C90 80939960 85CEC87C */ lh $t6, %lo(D_8094C87C)($t6) /* 00C94 80939964 3C018095 */ lui $at, %hi(D_8094C87A) ## $at = 80950000 -/* 00C98 80939968 AFA50044 */ sw $a1, 0x0044($sp) -/* 00C9C 8093996C A42EC87A */ sh $t6, %lo(D_8094C87A)($at) +/* 00C98 80939968 AFA50044 */ sw $a1, 0x0044($sp) +/* 00C9C 8093996C A42EC87A */ sh $t6, %lo(D_8094C87A)($at) /* 00CA0 80939970 3C018095 */ lui $at, %hi(D_8094C878) ## $at = 80950000 -/* 00CA4 80939974 A02EC878 */ sb $t6, %lo(D_8094C878)($at) +/* 00CA4 80939974 A02EC878 */ sb $t6, %lo(D_8094C878)($at) /* 00CA8 80939978 3C018095 */ lui $at, %hi(D_8094C876) ## $at = 80950000 /* 00CAC 8093997C 31D900FF */ andi $t9, $t6, 0x00FF ## $t9 = 00000000 -/* 00CB0 80939980 A439C876 */ sh $t9, %lo(D_8094C876)($at) +/* 00CB0 80939980 A439C876 */ sh $t9, %lo(D_8094C876)($at) /* 00CB4 80939984 3C018095 */ lui $at, %hi(D_8094C874) ## $at = 80950000 -/* 00CB8 80939988 A439C874 */ sh $t9, %lo(D_8094C874)($at) +/* 00CB8 80939988 A439C874 */ sh $t9, %lo(D_8094C874)($at) /* 00CBC 8093998C 3C018095 */ lui $at, %hi(D_8094C854) ## $at = 80950000 -/* 00CC0 80939990 E420C854 */ swc1 $f0, %lo(D_8094C854)($at) -/* 00CC4 80939994 C426C854 */ lwc1 $f6, %lo(D_8094C854)($at) +/* 00CC0 80939990 E420C854 */ swc1 $f0, %lo(D_8094C854)($at) +/* 00CC4 80939994 C426C854 */ lwc1 $f6, %lo(D_8094C854)($at) /* 00CC8 80939998 3C018095 */ lui $at, %hi(D_8094C858) ## $at = 80950000 -/* 00CCC 8093999C E426C858 */ swc1 $f6, %lo(D_8094C858)($at) +/* 00CCC 8093999C E426C858 */ swc1 $f6, %lo(D_8094C858)($at) /* 00CD0 809399A0 3C018095 */ lui $at, %hi(D_8094AEC4) ## $at = 80950000 /* 00CD4 809399A4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00CD8 809399A8 C42CAEC4 */ lwc1 $f12, %lo(D_8094AEC4)($at) + +/* 00CD8 809399A8 C42CAEC4 */ lwc1 $f12, %lo(D_8094AEC4)($at) /* 00CDC 809399AC 444EF800 */ cfc1 $t6, $31 /* 00CE0 809399B0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00CE4 809399B4 44CFF800 */ ctc1 $t7, $31 /* 00CE8 809399B8 3C048095 */ lui $a0, %hi(D_8094C880) ## $a0 = 80950000 /* 00CEC 809399BC 2484C880 */ addiu $a0, $a0, %lo(D_8094C880) ## $a0 = 8094C880 -/* 00CF0 809399C0 46000224 */ cvt.w.s $f8, $f0 -/* 00CF4 809399C4 8FA50044 */ lw $a1, 0x0044($sp) +/* 00CF0 809399C0 46000224 */ cvt.w.s $f8, $f0 +/* 00CF4 809399C4 8FA50044 */ lw $a1, 0x0044($sp) /* 00CF8 809399C8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 00CFC 809399CC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00D00 809399D0 444FF800 */ cfc1 $t7, $31 /* 00D04 809399D4 24030048 */ addiu $v1, $zero, 0x0048 ## $v1 = 00000048 /* 00D08 809399D8 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 00D0C 809399DC 51E00013 */ beql $t7, $zero, .L80939A2C -/* 00D10 809399E0 440F4000 */ mfc1 $t7, $f8 +/* 00D0C 809399DC 51E00013 */ beql $t7, $zero, .L80939A2C +/* 00D10 809399E0 440F4000 */ mfc1 $t7, $f8 /* 00D14 809399E4 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 /* 00D18 809399E8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00D1C 809399EC 46080201 */ sub.s $f8, $f0, $f8 +/* 00D1C 809399EC 46080201 */ sub.s $f8, $f0, $f8 /* 00D20 809399F0 44CFF800 */ ctc1 $t7, $31 /* 00D24 809399F4 00000000 */ nop -/* 00D28 809399F8 46004224 */ cvt.w.s $f8, $f8 +/* 00D28 809399F8 46004224 */ cvt.w.s $f8, $f8 /* 00D2C 809399FC 444FF800 */ cfc1 $t7, $31 /* 00D30 80939A00 00000000 */ nop /* 00D34 80939A04 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 00D38 80939A08 15E00005 */ bne $t7, $zero, .L80939A20 +/* 00D38 80939A08 15E00005 */ bne $t7, $zero, .L80939A20 /* 00D3C 80939A0C 00000000 */ nop -/* 00D40 80939A10 440F4000 */ mfc1 $t7, $f8 +/* 00D40 80939A10 440F4000 */ mfc1 $t7, $f8 /* 00D44 80939A14 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00D48 80939A18 10000007 */ beq $zero, $zero, .L80939A38 +/* 00D48 80939A18 10000007 */ beq $zero, $zero, .L80939A38 /* 00D4C 80939A1C 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 .L80939A20: -/* 00D50 80939A20 10000005 */ beq $zero, $zero, .L80939A38 +/* 00D50 80939A20 10000005 */ beq $zero, $zero, .L80939A38 /* 00D54 80939A24 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 00D58 80939A28 440F4000 */ mfc1 $t7, $f8 +/* 00D58 80939A28 440F4000 */ mfc1 $t7, $f8 .L80939A2C: /* 00D5C 80939A2C 00000000 */ nop -/* 00D60 80939A30 05E0FFFB */ bltz $t7, .L80939A20 +/* 00D60 80939A30 05E0FFFB */ bltz $t7, .L80939A20 /* 00D64 80939A34 00000000 */ nop .L80939A38: /* 00D68 80939A38 3C018095 */ lui $at, %hi(D_8094C85D) ## $at = 80950000 -/* 00D6C 80939A3C A02FC85D */ sb $t7, %lo(D_8094C85D)($at) +/* 00D6C 80939A3C A02FC85D */ sb $t7, %lo(D_8094C85D)($at) /* 00D70 80939A40 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00D74 80939A44 44CEF800 */ ctc1 $t6, $31 -/* 00D78 80939A48 00310821 */ addu $at, $at, $s1 +/* 00D78 80939A48 00310821 */ addu $at, $at, $s1 /* 00D7C 80939A4C AC241E10 */ sw $a0, 0x1E10($at) ## 00011E10 .L80939A50: -/* 00D80 80939A50 00430019 */ multu $v0, $v1 +/* 00D80 80939A50 00430019 */ multu $v0, $v1 /* 00D84 80939A54 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00D88 80939A58 00021400 */ sll $v0, $v0, 16 -/* 00D8C 80939A5C 00021403 */ sra $v0, $v0, 16 -/* 00D90 80939A60 28410096 */ slti $at, $v0, 0x0096 -/* 00D94 80939A64 0000C012 */ mflo $t8 -/* 00D98 80939A68 0098C821 */ addu $t9, $a0, $t8 -/* 00D9C 80939A6C 1420FFF8 */ bne $at, $zero, .L80939A50 +/* 00D88 80939A58 00021400 */ sll $v0, $v0, 16 +/* 00D8C 80939A5C 00021403 */ sra $v0, $v0, 16 +/* 00D90 80939A60 28410096 */ slti $at, $v0, 0x0096 +/* 00D94 80939A64 0000C012 */ mflo $t8 +/* 00D98 80939A68 0098C821 */ addu $t9, $a0, $t8 +/* 00D9C 80939A6C 1420FFF8 */ bne $at, $zero, .L80939A50 /* 00DA0 80939A70 A3200000 */ sb $zero, 0x0000($t9) ## 00000000 .L80939A74: /* 00DA4 80939A74 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 00DA8 80939A78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DAC 80939A7C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00DB0 80939A80 14600030 */ bne $v1, $zero, .L80939B44 +/* 00DB0 80939A80 14600030 */ bne $v1, $zero, .L80939B44 /* 00DB4 80939A84 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00DB8 80939A88 3C078095 */ lui $a3, %hi(D_8094A814) ## $a3 = 80950000 /* 00DBC 80939A8C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00DC0 80939A90 24E7A814 */ addiu $a3, $a3, %lo(D_8094A814) ## $a3 = 8094A814 /* 00DC4 80939A94 240E0033 */ addiu $t6, $zero, 0x0033 ## $t6 = 00000033 /* 00DC8 80939A98 A20E0117 */ sb $t6, 0x0117($s0) ## 00000117 @@ -272,20 +272,20 @@ glabel BossTw_Init /* 00DD4 80939AA4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00DD8 80939AA8 24E76F28 */ addiu $a3, $a3, 0x6F28 ## $a3 = 06006F28 /* 00DDC 80939AAC 24C670E0 */ addiu $a2, $a2, 0x70E0 ## $a2 = 060070E0 -/* 00DE0 80939AB0 AFA50048 */ sw $a1, 0x0048($sp) -/* 00DE4 80939AB4 AFA00018 */ sw $zero, 0x0018($sp) -/* 00DE8 80939AB8 AFA00014 */ sw $zero, 0x0014($sp) -/* 00DEC 80939ABC AFA00010 */ sw $zero, 0x0010($sp) -/* 00DF0 80939AC0 0C0291BE */ jal func_800A46F8 +/* 00DE0 80939AB0 AFA50048 */ sw $a1, 0x0048($sp) +/* 00DE4 80939AB4 AFA00018 */ sw $zero, 0x0018($sp) +/* 00DE8 80939AB8 AFA00014 */ sw $zero, 0x0014($sp) +/* 00DEC 80939ABC AFA00010 */ sw $zero, 0x0010($sp) +/* 00DF0 80939AC0 0C0291BE */ jal SkelAnime_InitSV /* 00DF4 80939AC4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DF8 80939AC8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00DFC 80939ACC 95EFF542 */ lhu $t7, -0x0ABE($t7) ## 8015F542 /* 00E00 80939AD0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00E04 80939AD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E08 80939AD8 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 -/* 00E0C 80939ADC 1300000F */ beq $t8, $zero, .L80939B1C +/* 00E0C 80939ADC 1300000F */ beq $t8, $zero, .L80939B1C /* 00E10 80939AE0 00000000 */ nop -/* 00E14 80939AE4 0C24E82A */ jal func_8093A0A8 +/* 00E14 80939AE4 0C24E82A */ jal func_8093A0A8 /* 00E18 80939AE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E1C 80939AEC 3C01C416 */ lui $at, 0xC416 ## $at = C4160000 /* 00E20 80939AF0 44815000 */ mtc1 $at, $f10 ## $f10 = -600.00 @@ -296,30 +296,30 @@ glabel BossTw_Init /* 00E34 80939B04 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 00E38 80939B08 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 /* 00E3C 80939B0C 0C03E803 */ jal Audio_SetBGM - + /* 00E40 80939B10 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 00E44 80939B14 10000003 */ beq $zero, $zero, .L80939B24 +/* 00E44 80939B14 10000003 */ beq $zero, $zero, .L80939B24 /* 00E48 80939B18 00000000 */ nop .L80939B1C: -/* 00E4C 80939B1C 0C24F553 */ jal func_8093D54C +/* 00E4C 80939B1C 0C24F553 */ jal func_8093D54C /* 00E50 80939B20 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80939B24: /* 00E54 80939B24 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E58 80939B28 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 -/* 00E5C 80939B2C 8FA40048 */ lw $a0, 0x0048($sp) -/* 00E60 80939B30 0C0294D3 */ jal func_800A534C +/* 00E5C 80939B2C 8FA40048 */ lw $a0, 0x0048($sp) +/* 00E60 80939B30 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00E64 80939B34 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00E68 80939B38 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00E6C 80939B3C 100000BF */ beq $zero, $zero, .L80939E3C +/* 00E6C 80939B3C 100000BF */ beq $zero, $zero, .L80939E3C /* 00E70 80939B40 A2190564 */ sb $t9, 0x0564($s0) ## 00000564 .L80939B44: -/* 00E74 80939B44 1461002F */ bne $v1, $at, .L80939C04 +/* 00E74 80939B44 1461002F */ bne $v1, $at, .L80939C04 /* 00E78 80939B48 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E7C 80939B4C 3C078095 */ lui $a3, %hi(D_8094A814) ## $a3 = 80950000 /* 00E80 80939B50 24E7A814 */ addiu $a3, $a3, %lo(D_8094A814) ## $a3 = 8094A814 /* 00E84 80939B54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E88 80939B58 0C01712B */ jal ActorCollider_InitCylinder - + /* 00E8C 80939B5C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00E90 80939B60 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 /* 00E94 80939B64 A20E0117 */ sb $t6, 0x0117($s0) ## 00000117 @@ -328,20 +328,20 @@ glabel BossTw_Init /* 00EA0 80939B70 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00EA4 80939B74 24E76F28 */ addiu $a3, $a3, 0x6F28 ## $a3 = 06006F28 /* 00EA8 80939B78 24C6F888 */ addiu $a2, $a2, 0xF888 ## $a2 = 0601F888 -/* 00EAC 80939B7C AFA50048 */ sw $a1, 0x0048($sp) -/* 00EB0 80939B80 AFA00018 */ sw $zero, 0x0018($sp) -/* 00EB4 80939B84 AFA00014 */ sw $zero, 0x0014($sp) -/* 00EB8 80939B88 AFA00010 */ sw $zero, 0x0010($sp) -/* 00EBC 80939B8C 0C0291BE */ jal func_800A46F8 +/* 00EAC 80939B7C AFA50048 */ sw $a1, 0x0048($sp) +/* 00EB0 80939B80 AFA00018 */ sw $zero, 0x0018($sp) +/* 00EB4 80939B84 AFA00014 */ sw $zero, 0x0014($sp) +/* 00EB8 80939B88 AFA00010 */ sw $zero, 0x0010($sp) +/* 00EBC 80939B8C 0C0291BE */ jal SkelAnime_InitSV /* 00EC0 80939B90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00EC4 80939B94 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00EC8 80939B98 95EFF542 */ lhu $t7, -0x0ABE($t7) ## 8015F542 /* 00ECC 80939B9C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00ED0 80939BA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00ED4 80939BA4 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 -/* 00ED8 80939BA8 1300000C */ beq $t8, $zero, .L80939BDC +/* 00ED8 80939BA8 1300000C */ beq $t8, $zero, .L80939BDC /* 00EDC 80939BAC 00000000 */ nop -/* 00EE0 80939BB0 0C24E82A */ jal func_8093A0A8 +/* 00EE0 80939BB0 0C24E82A */ jal func_8093A0A8 /* 00EE4 80939BB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00EE8 80939BB8 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 00EEC 80939BBC 44812000 */ mtc1 $at, $f4 ## $f4 = 600.00 @@ -350,25 +350,25 @@ glabel BossTw_Init /* 00EF8 80939BC8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00EFC 80939BCC E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 /* 00F00 80939BD0 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 00F04 80939BD4 10000003 */ beq $zero, $zero, .L80939BE4 +/* 00F04 80939BD4 10000003 */ beq $zero, $zero, .L80939BE4 /* 00F08 80939BD8 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C .L80939BDC: -/* 00F0C 80939BDC 0C24F553 */ jal func_8093D54C +/* 00F0C 80939BDC 0C24F553 */ jal func_8093D54C /* 00F10 80939BE0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80939BE4: /* 00F14 80939BE4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F18 80939BE8 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 -/* 00F1C 80939BEC 8FA40048 */ lw $a0, 0x0048($sp) -/* 00F20 80939BF0 0C0294D3 */ jal func_800A534C +/* 00F1C 80939BEC 8FA40048 */ lw $a0, 0x0048($sp) +/* 00F20 80939BF0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00F24 80939BF4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00F28 80939BF8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00F2C 80939BFC 1000008F */ beq $zero, $zero, .L80939E3C +/* 00F2C 80939BFC 1000008F */ beq $zero, $zero, .L80939E3C /* 00F30 80939C00 A2190564 */ sb $t9, 0x0564($s0) ## 00000564 .L80939C04: /* 00F34 80939C04 3C078095 */ lui $a3, %hi(D_8094A840) ## $a3 = 80950000 /* 00F38 80939C08 24E7A840 */ addiu $a3, $a3, %lo(D_8094A840) ## $a3 = 8094A840 /* 00F3C 80939C0C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00F40 80939C10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00F44 80939C14 3C188094 */ lui $t8, %hi(func_80940D48) ## $t8 = 80940000 /* 00F48 80939C18 3C198094 */ lui $t9, %hi(func_80945084) ## $t9 = 80940000 @@ -385,30 +385,30 @@ glabel BossTw_Init /* 00F74 80939C44 3C070602 */ lui $a3, 0x0602 ## $a3 = 06020000 /* 00F78 80939C48 24E744B4 */ addiu $a3, $a3, 0x44B4 ## $a3 = 060244B4 /* 00F7C 80939C4C 24C62020 */ addiu $a2, $a2, 0x2020 ## $a2 = 06032020 -/* 00F80 80939C50 AFA50048 */ sw $a1, 0x0048($sp) -/* 00F84 80939C54 AFA00018 */ sw $zero, 0x0018($sp) -/* 00F88 80939C58 AFA00014 */ sw $zero, 0x0014($sp) -/* 00F8C 80939C5C AFA00010 */ sw $zero, 0x0010($sp) -/* 00F90 80939C60 0C0291BE */ jal func_800A46F8 +/* 00F80 80939C50 AFA50048 */ sw $a1, 0x0048($sp) +/* 00F84 80939C54 AFA00018 */ sw $zero, 0x0018($sp) +/* 00F88 80939C58 AFA00014 */ sw $zero, 0x0014($sp) +/* 00F8C 80939C5C AFA00010 */ sw $zero, 0x0010($sp) +/* 00F90 80939C60 0C0291BE */ jal SkelAnime_InitSV /* 00F94 80939C64 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00F98 80939C68 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 00F9C 80939C6C 24A544B4 */ addiu $a1, $a1, 0x44B4 ## $a1 = 060244B4 -/* 00FA0 80939C70 8FA40048 */ lw $a0, 0x0048($sp) -/* 00FA4 80939C74 0C0294D3 */ jal func_800A534C +/* 00FA0 80939C70 8FA40048 */ lw $a0, 0x0048($sp) +/* 00FA4 80939C74 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00FA8 80939C78 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00FAC 80939C7C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00FB0 80939C80 95CEF542 */ lhu $t6, -0x0ABE($t6) ## 8015F542 /* 00FB4 80939C84 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00FB8 80939C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00FBC 80939C8C 31CF0020 */ andi $t7, $t6, 0x0020 ## $t7 = 00000000 -/* 00FC0 80939C90 11E00005 */ beq $t7, $zero, .L80939CA8 +/* 00FC0 80939C90 11E00005 */ beq $t7, $zero, .L80939CA8 /* 00FC4 80939C94 00000000 */ nop -/* 00FC8 80939C98 0C24F209 */ jal func_8093C824 +/* 00FC8 80939C98 0C24F209 */ jal func_8093C824 /* 00FCC 80939C9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FD0 80939CA0 1000000B */ beq $zero, $zero, .L80939CD0 +/* 00FD0 80939CA0 1000000B */ beq $zero, $zero, .L80939CD0 /* 00FD4 80939CA4 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 .L80939CA8: -/* 00FD8 80939CA8 0C24F563 */ jal func_8093D58C +/* 00FD8 80939CA8 0C24F563 */ jal func_8093D58C /* 00FDC 80939CAC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00FE0 80939CB0 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 00FE4 80939CB4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -422,16 +422,16 @@ glabel BossTw_Init /* 01000 80939CD0 A618001C */ sh $t8, 0x001C($s0) ## 0000001C /* 01004 80939CD4 3C018095 */ lui $at, %hi(D_8094C84C) ## $at = 80950000 /* 01008 80939CD8 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 0100C 80939CDC AC30C84C */ sw $s0, %lo(D_8094C84C)($at) -/* 01010 80939CE0 00B12821 */ addu $a1, $a1, $s1 +/* 0100C 80939CDC AC30C84C */ sw $s0, %lo(D_8094C84C)($at) +/* 01010 80939CE0 00B12821 */ addu $a1, $a1, $s1 /* 01014 80939CE4 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC /* 01018 80939CE8 0C00B337 */ jal Flags_GetClear - + /* 0101C 80939CEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01020 80939CF0 50400027 */ beql $v0, $zero, .L80939D90 +/* 01020 80939CF0 50400027 */ beql $v0, $zero, .L80939D90 /* 01024 80939CF4 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 /* 01028 80939CF8 0C00B55C */ jal Actor_Kill - + /* 0102C 80939CFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01030 80939D00 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 01034 80939D04 44812000 */ mtc1 $at, $f4 ## $f4 = 600.00 @@ -440,73 +440,73 @@ glabel BossTw_Init /* 01040 80939D10 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01044 80939D14 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 01048 80939D18 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 0104C 80939D1C AFB90028 */ sw $t9, 0x0028($sp) -/* 01050 80939D20 AFA40048 */ sw $a0, 0x0048($sp) +/* 0104C 80939D1C AFB90028 */ sw $t9, 0x0028($sp) +/* 01050 80939D20 AFA40048 */ sw $a0, 0x0048($sp) /* 01054 80939D24 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01058 80939D28 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 0105C 80939D2C 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 01060 80939D30 AFA0001C */ sw $zero, 0x001C($sp) -/* 01064 80939D34 AFA00020 */ sw $zero, 0x0020($sp) -/* 01068 80939D38 AFA00024 */ sw $zero, 0x0024($sp) -/* 0106C 80939D3C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01070 80939D40 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 01060 80939D30 AFA0001C */ sw $zero, 0x001C($sp) +/* 01064 80939D34 AFA00020 */ sw $zero, 0x0020($sp) +/* 01068 80939D38 AFA00024 */ sw $zero, 0x0024($sp) +/* 0106C 80939D3C E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01070 80939D40 E7A60014 */ swc1 $f6, 0x0014($sp) /* 01074 80939D44 0C00C916 */ jal Actor_SpawnAttached - -/* 01078 80939D48 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 01078 80939D48 E7A80018 */ swc1 $f8, 0x0018($sp) /* 0107C 80939D4C 3C014366 */ lui $at, 0x4366 ## $at = 43660000 /* 01080 80939D50 44815000 */ mtc1 $at, $f10 ## $f10 = 230.00 /* 01084 80939D54 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01088 80939D58 8FA40048 */ lw $a0, 0x0048($sp) +/* 01088 80939D58 8FA40048 */ lw $a0, 0x0048($sp) /* 0108C 80939D5C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01090 80939D60 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F /* 01094 80939D64 3C07C416 */ lui $a3, 0xC416 ## $a3 = C4160000 -/* 01098 80939D68 AFA00018 */ sw $zero, 0x0018($sp) -/* 0109C 80939D6C AFA0001C */ sw $zero, 0x001C($sp) -/* 010A0 80939D70 AFA00020 */ sw $zero, 0x0020($sp) -/* 010A4 80939D74 AFA00024 */ sw $zero, 0x0024($sp) -/* 010A8 80939D78 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01098 80939D68 AFA00018 */ sw $zero, 0x0018($sp) +/* 0109C 80939D6C AFA0001C */ sw $zero, 0x001C($sp) +/* 010A0 80939D70 AFA00020 */ sw $zero, 0x0020($sp) +/* 010A4 80939D74 AFA00024 */ sw $zero, 0x0024($sp) +/* 010A8 80939D78 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 010AC 80939D7C 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 010B0 80939D80 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 010B4 80939D84 1000002E */ beq $zero, $zero, .L80939E40 +/* 010B0 80939D80 E7B00014 */ swc1 $f16, 0x0014($sp) +/* 010B4 80939D84 1000002E */ beq $zero, $zero, .L80939E40 /* 010B8 80939D88 922F07AF */ lbu $t7, 0x07AF($s1) ## 000007AF /* 010BC 80939D8C C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 .L80939D90: /* 010C0 80939D90 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 010C4 80939D94 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 010C8 80939D98 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 010C8 80939D98 E7B20010 */ swc1 $f18, 0x0010($sp) /* 010CC 80939D9C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 010D0 80939DA0 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 010D4 80939DA4 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC -/* 010D8 80939DA8 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 010D8 80939DA8 E7A40014 */ swc1 $f4, 0x0014($sp) /* 010DC 80939DAC C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 010E0 80939DB0 AFA40048 */ sw $a0, 0x0048($sp) -/* 010E4 80939DB4 AFA00028 */ sw $zero, 0x0028($sp) -/* 010E8 80939DB8 AFA00024 */ sw $zero, 0x0024($sp) -/* 010EC 80939DBC AFA00020 */ sw $zero, 0x0020($sp) -/* 010F0 80939DC0 AFA0001C */ sw $zero, 0x001C($sp) +/* 010E0 80939DB0 AFA40048 */ sw $a0, 0x0048($sp) +/* 010E4 80939DB4 AFA00028 */ sw $zero, 0x0028($sp) +/* 010E8 80939DB8 AFA00024 */ sw $zero, 0x0024($sp) +/* 010EC 80939DBC AFA00020 */ sw $zero, 0x0020($sp) +/* 010F0 80939DC0 AFA0001C */ sw $zero, 0x001C($sp) /* 010F4 80939DC4 0C00C916 */ jal Actor_SpawnAttached - -/* 010F8 80939DC8 E7A60018 */ swc1 $f6, 0x0018($sp) + +/* 010F8 80939DC8 E7A60018 */ swc1 $f6, 0x0018($sp) /* 010FC 80939DCC 3C018095 */ lui $at, %hi(D_8094C844) ## $at = 80950000 -/* 01100 80939DD0 AC22C844 */ sw $v0, %lo(D_8094C844)($at) +/* 01100 80939DD0 AC22C844 */ sw $v0, %lo(D_8094C844)($at) /* 01104 80939DD4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 01108 80939DD8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0110C 80939DDC 8FA40048 */ lw $a0, 0x0048($sp) -/* 01110 80939DE0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0110C 80939DDC 8FA40048 */ lw $a0, 0x0048($sp) +/* 01110 80939DE0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01114 80939DE4 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 01118 80939DE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0111C 80939DEC 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 01120 80939DF0 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 01120 80939DF0 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 01124 80939DF4 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 01128 80939DF8 AFAE0028 */ sw $t6, 0x0028($sp) -/* 0112C 80939DFC AFA00024 */ sw $zero, 0x0024($sp) -/* 01130 80939E00 AFA00020 */ sw $zero, 0x0020($sp) -/* 01134 80939E04 AFA0001C */ sw $zero, 0x001C($sp) +/* 01128 80939DF8 AFAE0028 */ sw $t6, 0x0028($sp) +/* 0112C 80939DFC AFA00024 */ sw $zero, 0x0024($sp) +/* 01130 80939E00 AFA00020 */ sw $zero, 0x0020($sp) +/* 01134 80939E04 AFA0001C */ sw $zero, 0x001C($sp) /* 01138 80939E08 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC /* 0113C 80939E0C 0C00C916 */ jal Actor_SpawnAttached - -/* 01140 80939E10 E7B00018 */ swc1 $f16, 0x0018($sp) + +/* 01140 80939E10 E7B00018 */ swc1 $f16, 0x0018($sp) /* 01144 80939E14 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 /* 01148 80939E18 2484C844 */ addiu $a0, $a0, %lo(D_8094C844) ## $a0 = 8094C844 /* 0114C 80939E1C 8C980000 */ lw $t8, 0x0000($a0) ## 8094C844 @@ -522,31 +522,31 @@ glabel BossTw_Init .L80939E40: /* 01170 80939E40 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01174 80939E44 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 01178 80939E48 05E10004 */ bgez $t7, .L80939E5C -/* 0117C 80939E4C 46809120 */ cvt.s.w $f4, $f18 +/* 01178 80939E48 05E10004 */ bgez $t7, .L80939E5C +/* 0117C 80939E4C 46809120 */ cvt.s.w $f4, $f18 /* 01180 80939E50 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 01184 80939E54 00000000 */ nop -/* 01188 80939E58 46062100 */ add.s $f4, $f4, $f6 +/* 01188 80939E58 46062100 */ add.s $f4, $f4, $f6 .L80939E5C: /* 0118C 80939E5C E60401D4 */ swc1 $f4, 0x01D4($s0) ## 000001D4 /* 01190 80939E60 923807B0 */ lbu $t8, 0x07B0($s1) ## 000007B0 /* 01194 80939E64 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01198 80939E68 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 0119C 80939E6C 07010004 */ bgez $t8, .L80939E80 -/* 011A0 80939E70 468042A0 */ cvt.s.w $f10, $f8 +/* 0119C 80939E6C 07010004 */ bgez $t8, .L80939E80 +/* 011A0 80939E70 468042A0 */ cvt.s.w $f10, $f8 /* 011A4 80939E74 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 /* 011A8 80939E78 00000000 */ nop -/* 011AC 80939E7C 46105280 */ add.s $f10, $f10, $f16 +/* 011AC 80939E7C 46105280 */ add.s $f10, $f10, $f16 .L80939E80: /* 011B0 80939E80 E60A01D8 */ swc1 $f10, 0x01D8($s0) ## 000001D8 /* 011B4 80939E84 923907B1 */ lbu $t9, 0x07B1($s1) ## 000007B1 /* 011B8 80939E88 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 011BC 80939E8C 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 011C0 80939E90 07210004 */ bgez $t9, .L80939EA4 -/* 011C4 80939E94 468091A0 */ cvt.s.w $f6, $f18 +/* 011C0 80939E90 07210004 */ bgez $t9, .L80939EA4 +/* 011C4 80939E94 468091A0 */ cvt.s.w $f6, $f18 /* 011C8 80939E98 44812000 */ mtc1 $at, $f4 ## $f4 = 4294967296.00 /* 011CC 80939E9C 00000000 */ nop -/* 011D0 80939EA0 46043180 */ add.s $f6, $f6, $f4 +/* 011D0 80939EA0 46043180 */ add.s $f6, $f6, $f4 .L80939EA4: /* 011D4 80939EA4 E60601DC */ swc1 $f6, 0x01DC($s0) ## 000001DC /* 011D8 80939EA8 862E07B2 */ lh $t6, 0x07B2($s1) ## 000007B2 @@ -554,13 +554,13 @@ glabel BossTw_Init /* 011E0 80939EB0 44815000 */ mtc1 $at, $f10 ## $f10 = 1000.00 /* 011E4 80939EB4 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 /* 011E8 80939EB8 E60A01E4 */ swc1 $f10, 0x01E4($s0) ## 000001E4 -/* 011EC 80939EBC 46804420 */ cvt.s.w $f16, $f8 +/* 011EC 80939EBC 46804420 */ cvt.s.w $f16, $f8 /* 011F0 80939EC0 E61001E0 */ swc1 $f16, 0x01E0($s0) ## 000001E0 .L80939EC4: -/* 011F4 80939EC4 8FBF003C */ lw $ra, 0x003C($sp) -/* 011F8 80939EC8 8FB00034 */ lw $s0, 0x0034($sp) -/* 011FC 80939ECC 8FB10038 */ lw $s1, 0x0038($sp) -/* 01200 80939ED0 03E00008 */ jr $ra +/* 011F4 80939EC4 8FBF003C */ lw $ra, 0x003C($sp) +/* 011F8 80939EC8 8FB00034 */ lw $s0, 0x0034($sp) +/* 011FC 80939ECC 8FB10038 */ lw $s1, 0x0038($sp) +/* 01200 80939ED0 03E00008 */ jr $ra /* 01204 80939ED4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s index a1143e9473..6f3c963dac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s @@ -1,12 +1,12 @@ glabel func_8093A0A8 /* 013D8 8093A0A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013DC 8093A0AC AFBF001C */ sw $ra, 0x001C($sp) -/* 013E0 8093A0B0 AFB00018 */ sw $s0, 0x0018($sp) -/* 013E4 8093A0B4 AFA5002C */ sw $a1, 0x002C($sp) +/* 013DC 8093A0AC AFBF001C */ sw $ra, 0x001C($sp) +/* 013E0 8093A0B0 AFB00018 */ sw $s0, 0x0018($sp) +/* 013E4 8093A0B4 AFA5002C */ sw $a1, 0x002C($sp) /* 013E8 8093A0B8 8C8E0118 */ lw $t6, 0x0118($a0) ## 00000118 /* 013EC 8093A0BC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 013F0 8093A0C0 3C088094 */ lui $t0, %hi(func_8093A2AC) ## $t0 = 80940000 -/* 013F4 8093A0C4 AFAE0024 */ sw $t6, 0x0024($sp) +/* 013F4 8093A0C4 AFAE0024 */ sw $t6, 0x0024($sp) /* 013F8 8093A0C8 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 /* 013FC 8093A0CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01400 8093A0D0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 @@ -19,58 +19,58 @@ glabel func_8093A0A8 /* 0141C 8093A0EC 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 01420 8093A0F0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 01424 8093A0F4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 01428 8093A0F8 0C0294D3 */ jal func_800A534C +/* 01428 8093A0F8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0142C 8093A0FC E484FF60 */ swc1 $f4, -0x00A0($a0) ## 000004C8 /* 01430 8093A100 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 01434 8093A104 00000000 */ nop /* 01438 8093A108 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0143C 8093A10C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 01440 8093A110 8FA20024 */ lw $v0, 0x0024($sp) -/* 01444 8093A114 4606003C */ c.lt.s $f0, $f6 +/* 01440 8093A110 8FA20024 */ lw $v0, 0x0024($sp) +/* 01444 8093A114 4606003C */ c.lt.s $f0, $f6 /* 01448 8093A118 00000000 */ nop -/* 0144C 8093A11C 45000026 */ bc1f .L8093A1B8 +/* 0144C 8093A11C 45000026 */ bc1f .L8093A1B8 /* 01450 8093A120 00000000 */ nop -/* 01454 8093A124 10400024 */ beq $v0, $zero, .L8093A1B8 +/* 01454 8093A124 10400024 */ beq $v0, $zero, .L8093A1B8 /* 01458 8093A128 00000000 */ nop /* 0145C 8093A12C 8C4A014C */ lw $t2, 0x014C($v0) ## 0000014C /* 01460 8093A130 3C098094 */ lui $t1, %hi(func_8093B1AC) ## $t1 = 80940000 /* 01464 8093A134 2529B1AC */ addiu $t1, $t1, %lo(func_8093B1AC) ## $t1 = 8093B1AC -/* 01468 8093A138 152A001F */ bne $t1, $t2, .L8093A1B8 +/* 01468 8093A138 152A001F */ bne $t1, $t2, .L8093A1B8 /* 0146C 8093A13C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01470 8093A140 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 01474 8093A144 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 01478 8093A148 00000000 */ nop -/* 0147C 8093A14C 8FAB0024 */ lw $t3, 0x0024($sp) +/* 0147C 8093A14C 8FAB0024 */ lw $t3, 0x0024($sp) /* 01480 8093A150 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01484 8093A154 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 01488 8093A158 C5680024 */ lwc1 $f8, 0x0024($t3) ## 00000024 -/* 0148C 8093A15C 46080280 */ add.s $f10, $f0, $f8 +/* 0148C 8093A15C 46080280 */ add.s $f10, $f0, $f8 /* 01490 8093A160 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 01494 8093A164 E60A04B0 */ swc1 $f10, 0x04B0($s0) ## 000004B0 /* 01498 8093A168 3C0143AA */ lui $at, 0x43AA ## $at = 43AA0000 /* 0149C 8093A16C 44818000 */ mtc1 $at, $f16 ## $f16 = 340.00 /* 014A0 8093A170 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 014A4 8093A174 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 -/* 014A8 8093A178 46100480 */ add.s $f18, $f0, $f16 +/* 014A8 8093A178 46100480 */ add.s $f18, $f0, $f16 /* 014AC 8093A17C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 014B0 8093A180 E61204B4 */ swc1 $f18, 0x04B4($s0) ## 000004B4 -/* 014B4 8093A184 8FAC0024 */ lw $t4, 0x0024($sp) +/* 014B4 8093A184 8FAC0024 */ lw $t4, 0x0024($sp) /* 014B8 8093A188 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 014BC 8093A18C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 014C0 8093A190 C584002C */ lwc1 $f4, 0x002C($t4) ## 0000002C -/* 014C4 8093A194 46040180 */ add.s $f6, $f0, $f4 +/* 014C4 8093A194 46040180 */ add.s $f6, $f0, $f4 /* 014C8 8093A198 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 014CC 8093A19C E60604B8 */ swc1 $f6, 0x04B8($s0) ## 000004B8 -/* 014D0 8093A1A0 4600020D */ trunc.w.s $f8, $f0 -/* 014D4 8093A1A4 44184000 */ mfc1 $t8, $f8 +/* 014D0 8093A1A0 4600020D */ trunc.w.s $f8, $f0 +/* 014D4 8093A1A4 44184000 */ mfc1 $t8, $f8 /* 014D8 8093A1A8 00000000 */ nop /* 014DC 8093A1AC 27190032 */ addiu $t9, $t8, 0x0032 ## $t9 = 00000032 -/* 014E0 8093A1B0 10000039 */ beq $zero, $zero, .L8093A298 +/* 014E0 8093A1B0 10000039 */ beq $zero, $zero, .L8093A298 /* 014E4 8093A1B4 A6190178 */ sh $t9, 0x0178($s0) ## 00000178 .L8093A1B8: /* 014E8 8093A1B8 0C03F66B */ jal Math_Rand_ZeroOne @@ -79,55 +79,55 @@ glabel func_8093A0A8 /* 014F0 8093A1C0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 014F4 8093A1C4 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 /* 014F8 8093A1C8 3C018095 */ lui $at, %hi(D_8094AEC8) ## $at = 80950000 -/* 014FC 8093A1CC 460A003C */ c.lt.s $f0, $f10 +/* 014FC 8093A1CC 460A003C */ c.lt.s $f0, $f10 /* 01500 8093A1D0 00000000 */ nop -/* 01504 8093A1D4 4500001A */ bc1f .L8093A240 +/* 01504 8093A1D4 4500001A */ bc1f .L8093A240 /* 01508 8093A1D8 00000000 */ nop /* 0150C 8093A1DC 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 01510 8093A1E0 44816000 */ mtc1 $at, $f12 ## $f12 = 800.00 /* 01514 8093A1E4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 01518 8093A1E8 00000000 */ nop /* 0151C 8093A1EC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01520 8093A1F0 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 01524 8093A1F4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 01528 8093A1F8 E60004B0 */ swc1 $f0, 0x04B0($s0) ## 000004B0 /* 0152C 8093A1FC 3C0143AA */ lui $at, 0x43AA ## $at = 43AA0000 /* 01530 8093A200 44818000 */ mtc1 $at, $f16 ## $f16 = 340.00 /* 01534 8093A204 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 01538 8093A208 44816000 */ mtc1 $at, $f12 ## $f12 = 800.00 -/* 0153C 8093A20C 46100480 */ add.s $f18, $f0, $f16 +/* 0153C 8093A20C 46100480 */ add.s $f18, $f0, $f16 /* 01540 8093A210 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 01544 8093A214 E61204B4 */ swc1 $f18, 0x04B4($s0) ## 000004B4 /* 01548 8093A218 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0154C 8093A21C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 01550 8093A220 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 01554 8093A224 E60004B8 */ swc1 $f0, 0x04B8($s0) ## 000004B8 -/* 01558 8093A228 4600010D */ trunc.w.s $f4, $f0 -/* 0155C 8093A22C 440B2000 */ mfc1 $t3, $f4 +/* 01558 8093A228 4600010D */ trunc.w.s $f4, $f0 +/* 0155C 8093A22C 440B2000 */ mfc1 $t3, $f4 /* 01560 8093A230 00000000 */ nop /* 01564 8093A234 256C0032 */ addiu $t4, $t3, 0x0032 ## $t4 = 00000032 -/* 01568 8093A238 10000017 */ beq $zero, $zero, .L8093A298 +/* 01568 8093A238 10000017 */ beq $zero, $zero, .L8093A298 /* 0156C 8093A23C A60C0178 */ sh $t4, 0x0178($s0) ## 00000178 .L8093A240: /* 01570 8093A240 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01574 8093A244 C42CAEC8 */ lwc1 $f12, %lo(D_8094AEC8)($at) -/* 01578 8093A248 4600018D */ trunc.w.s $f6, $f0 + +/* 01574 8093A244 C42CAEC8 */ lwc1 $f12, %lo(D_8094AEC8)($at) +/* 01578 8093A248 4600018D */ trunc.w.s $f6, $f0 /* 0157C 8093A24C 3C088095 */ lui $t0, %hi(D_8094A8AC) ## $t0 = 80950000 /* 01580 8093A250 2508A8AC */ addiu $t0, $t0, %lo(D_8094A8AC) ## $t0 = 8094A8AC /* 01584 8093A254 240C00C8 */ addiu $t4, $zero, 0x00C8 ## $t4 = 000000C8 -/* 01588 8093A258 440E3000 */ mfc1 $t6, $f6 +/* 01588 8093A258 440E3000 */ mfc1 $t6, $f6 /* 0158C 8093A25C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 01590 8093A260 000E7C00 */ sll $t7, $t6, 16 -/* 01594 8093A264 000FC403 */ sra $t8, $t7, 16 -/* 01598 8093A268 0018C880 */ sll $t9, $t8, 2 -/* 0159C 8093A26C 0338C823 */ subu $t9, $t9, $t8 -/* 015A0 8093A270 0019C880 */ sll $t9, $t9, 2 -/* 015A4 8093A274 03284821 */ addu $t1, $t9, $t0 +/* 01590 8093A260 000E7C00 */ sll $t7, $t6, 16 +/* 01594 8093A264 000FC403 */ sra $t8, $t7, 16 +/* 01598 8093A268 0018C880 */ sll $t9, $t8, 2 +/* 0159C 8093A26C 0338C823 */ subu $t9, $t9, $t8 +/* 015A0 8093A270 0019C880 */ sll $t9, $t9, 2 +/* 015A4 8093A274 03284821 */ addu $t1, $t9, $t0 /* 015A8 8093A278 8D2B0000 */ lw $t3, 0x0000($t1) ## 00000000 /* 015AC 8093A27C AE0B04B0 */ sw $t3, 0x04B0($s0) ## 000004B0 /* 015B0 8093A280 8D2A0004 */ lw $t2, 0x0004($t1) ## 00000004 @@ -137,10 +137,10 @@ glabel func_8093A0A8 /* 015C0 8093A290 A60D015E */ sh $t5, 0x015E($s0) ## 0000015E /* 015C4 8093A294 AE0B04B8 */ sw $t3, 0x04B8($s0) ## 000004B8 .L8093A298: -/* 015C8 8093A298 8FBF001C */ lw $ra, 0x001C($sp) -/* 015CC 8093A29C 8FB00018 */ lw $s0, 0x0018($sp) +/* 015C8 8093A298 8FBF001C */ lw $ra, 0x001C($sp) +/* 015CC 8093A29C 8FB00018 */ lw $s0, 0x0018($sp) /* 015D0 8093A2A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 015D4 8093A2A4 03E00008 */ jr $ra +/* 015D4 8093A2A4 03E00008 */ jr $ra /* 015D8 8093A2A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s index b2e851404e..ecd084dbb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s @@ -1,124 +1,124 @@ glabel func_8093B1AC /* 024DC 8093B1AC 27BDFEB0 */ addiu $sp, $sp, 0xFEB0 ## $sp = FFFFFEB0 -/* 024E0 8093B1B0 AFBF0064 */ sw $ra, 0x0064($sp) -/* 024E4 8093B1B4 AFB60060 */ sw $s6, 0x0060($sp) -/* 024E8 8093B1B8 AFB5005C */ sw $s5, 0x005C($sp) -/* 024EC 8093B1BC AFB40058 */ sw $s4, 0x0058($sp) -/* 024F0 8093B1C0 AFB30054 */ sw $s3, 0x0054($sp) -/* 024F4 8093B1C4 AFB20050 */ sw $s2, 0x0050($sp) -/* 024F8 8093B1C8 AFB1004C */ sw $s1, 0x004C($sp) -/* 024FC 8093B1CC AFB00048 */ sw $s0, 0x0048($sp) -/* 02500 8093B1D0 F7BA0040 */ sdc1 $f26, 0x0040($sp) -/* 02504 8093B1D4 F7B80038 */ sdc1 $f24, 0x0038($sp) -/* 02508 8093B1D8 F7B60030 */ sdc1 $f22, 0x0030($sp) -/* 0250C 8093B1DC F7B40028 */ sdc1 $f20, 0x0028($sp) +/* 024E0 8093B1B0 AFBF0064 */ sw $ra, 0x0064($sp) +/* 024E4 8093B1B4 AFB60060 */ sw $s6, 0x0060($sp) +/* 024E8 8093B1B8 AFB5005C */ sw $s5, 0x005C($sp) +/* 024EC 8093B1BC AFB40058 */ sw $s4, 0x0058($sp) +/* 024F0 8093B1C0 AFB30054 */ sw $s3, 0x0054($sp) +/* 024F4 8093B1C4 AFB20050 */ sw $s2, 0x0050($sp) +/* 024F8 8093B1C8 AFB1004C */ sw $s1, 0x004C($sp) +/* 024FC 8093B1CC AFB00048 */ sw $s0, 0x0048($sp) +/* 02500 8093B1D0 F7BA0040 */ sdc1 $f26, 0x0040($sp) +/* 02504 8093B1D4 F7B80038 */ sdc1 $f24, 0x0038($sp) +/* 02508 8093B1D8 F7B60030 */ sdc1 $f22, 0x0030($sp) +/* 0250C 8093B1DC F7B40028 */ sdc1 $f20, 0x0028($sp) /* 02510 8093B1E0 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 02514 8093B1E4 0080A825 */ or $s5, $a0, $zero ## $s5 = 00000000 /* 02518 8093B1E8 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 0251C 8093B1EC AFAE0124 */ sw $t6, 0x0124($sp) +/* 0251C 8093B1EC AFAE0124 */ sw $t6, 0x0124($sp) /* 02520 8093B1F0 8C8F0118 */ lw $t7, 0x0118($a0) ## 00000118 /* 02524 8093B1F4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02528 8093B1F8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 0252C 8093B1FC AFAF0120 */ sw $t7, 0x0120($sp) +/* 0252C 8093B1FC AFAF0120 */ sw $t7, 0x0120($sp) /* 02530 8093B200 8EA70068 */ lw $a3, 0x0068($s5) ## 00000068 /* 02534 8093B204 3C0543C8 */ lui $a1, 0x43C8 ## $a1 = 43C80000 /* 02538 8093B208 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0253C 8093B20C 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 02540 8093B210 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02544 8093B214 4481A000 */ mtc1 $at, $f20 ## $f20 = 5.00 /* 02548 8093B218 26A40068 */ addiu $a0, $s5, 0x0068 ## $a0 = 00000068 /* 0254C 8093B21C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02550 8093B220 4405A000 */ mfc1 $a1, $f20 +/* 02550 8093B220 4405A000 */ mfc1 $a1, $f20 /* 02554 8093B224 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02558 8093B228 3C073E80 */ lui $a3, 0x3E80 ## $a3 = 3E800000 /* 0255C 8093B22C 26A40568 */ addiu $a0, $s5, 0x0568 ## $a0 = 00000568 /* 02560 8093B230 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02564 8093B234 AFA40074 */ sw $a0, 0x0074($sp) + +/* 02564 8093B234 AFA40074 */ sw $a0, 0x0074($sp) /* 02568 8093B238 3C018095 */ lui $at, %hi(D_8094AEF4) ## $at = 80950000 -/* 0256C 8093B23C C426AEF4 */ lwc1 $f6, %lo(D_8094AEF4)($at) +/* 0256C 8093B23C C426AEF4 */ lwc1 $f6, %lo(D_8094AEF4)($at) /* 02570 8093B240 C6A40520 */ lwc1 $f4, 0x0520($s5) ## 00000520 /* 02574 8093B244 86B8017A */ lh $t8, 0x017A($s5) ## 0000017A -/* 02578 8093B248 46062200 */ add.s $f8, $f4, $f6 -/* 0257C 8093B24C 13000108 */ beq $t8, $zero, .L8093B670 +/* 02578 8093B248 46062200 */ add.s $f8, $f4, $f6 +/* 0257C 8093B24C 13000108 */ beq $t8, $zero, .L8093B670 /* 02580 8093B250 E6A80520 */ swc1 $f8, 0x0520($s5) ## 00000520 /* 02584 8093B254 C6AA04C8 */ lwc1 $f10, 0x04C8($s5) ## 000004C8 /* 02588 8093B258 26A400B6 */ addiu $a0, $s5, 0x00B6 ## $a0 = 000000B6 /* 0258C 8093B25C 86A5008A */ lh $a1, 0x008A($s5) ## 0000008A -/* 02590 8093B260 4600548D */ trunc.w.s $f18, $f10 +/* 02590 8093B260 4600548D */ trunc.w.s $f18, $f10 /* 02594 8093B264 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 02598 8093B268 44079000 */ mfc1 $a3, $f18 +/* 02598 8093B268 44079000 */ mfc1 $a3, $f18 /* 0259C 8093B26C 00000000 */ nop -/* 025A0 8093B270 00073C00 */ sll $a3, $a3, 16 +/* 025A0 8093B270 00073C00 */ sll $a3, $a3, 16 /* 025A4 8093B274 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 025A8 8093B278 00073C03 */ sra $a3, $a3, 16 -/* 025AC 8093B27C 8FA30124 */ lw $v1, 0x0124($sp) + +/* 025A8 8093B278 00073C03 */ sra $a3, $a3, 16 +/* 025AC 8093B27C 8FA30124 */ lw $v1, 0x0124($sp) /* 025B0 8093B280 26A404B0 */ addiu $a0, $s5, 0x04B0 ## $a0 = 000004B0 /* 025B4 8093B284 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 025B8 8093B288 8C68067C */ lw $t0, 0x067C($v1) ## 0000067C /* 025BC 8093B28C 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 025C0 8093B290 00084A40 */ sll $t1, $t0, 9 -/* 025C4 8093B294 05210020 */ bgez $t1, .L8093B318 +/* 025C0 8093B290 00084A40 */ sll $t1, $t0, 9 +/* 025C4 8093B294 05210020 */ bgez $t1, .L8093B318 /* 025C8 8093B298 00000000 */ nop /* 025CC 8093B29C 846A00B6 */ lh $t2, 0x00B6($v1) ## 000000B6 /* 025D0 8093B2A0 86AB00B6 */ lh $t3, 0x00B6($s5) ## 000000B6 /* 025D4 8093B2A4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 025D8 8093B2A8 014B1023 */ subu $v0, $t2, $t3 -/* 025DC 8093B2AC 00411021 */ addu $v0, $v0, $at -/* 025E0 8093B2B0 00021400 */ sll $v0, $v0, 16 -/* 025E4 8093B2B4 00021403 */ sra $v0, $v0, 16 -/* 025E8 8093B2B8 28412000 */ slti $at, $v0, 0x2000 -/* 025EC 8093B2BC 10200016 */ beq $at, $zero, .L8093B318 -/* 025F0 8093B2C0 2841E001 */ slti $at, $v0, 0xE001 -/* 025F4 8093B2C4 14200014 */ bne $at, $zero, .L8093B318 +/* 025D8 8093B2A8 014B1023 */ subu $v0, $t2, $t3 +/* 025DC 8093B2AC 00411021 */ addu $v0, $v0, $at +/* 025E0 8093B2B0 00021400 */ sll $v0, $v0, 16 +/* 025E4 8093B2B4 00021403 */ sra $v0, $v0, 16 +/* 025E8 8093B2B8 28412000 */ slti $at, $v0, 0x2000 +/* 025EC 8093B2BC 10200016 */ beq $at, $zero, .L8093B318 +/* 025F0 8093B2C0 2841E001 */ slti $at, $v0, 0xE001 +/* 025F4 8093B2C4 14200014 */ bne $at, $zero, .L8093B318 /* 025F8 8093B2C8 00000000 */ nop /* 025FC 8093B2CC 26A404B0 */ addiu $a0, $s5, 0x04B0 ## $a0 = 000004B0 /* 02600 8093B2D0 8C6509BC */ lw $a1, 0x09BC($v1) ## 000009BC /* 02604 8093B2D4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02608 8093B2D8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0260C 8093B2DC 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 02610 8093B2E0 8FAC0124 */ lw $t4, 0x0124($sp) +/* 02610 8093B2E0 8FAC0124 */ lw $t4, 0x0124($sp) /* 02614 8093B2E4 26A404B4 */ addiu $a0, $s5, 0x04B4 ## $a0 = 000004B4 /* 02618 8093B2E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0261C 8093B2EC 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02620 8093B2F0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02624 8093B2F4 8D8509C0 */ lw $a1, 0x09C0($t4) ## 000009C0 -/* 02628 8093B2F8 8FAD0124 */ lw $t5, 0x0124($sp) +/* 02628 8093B2F8 8FAD0124 */ lw $t5, 0x0124($sp) /* 0262C 8093B2FC 26A404B8 */ addiu $a0, $s5, 0x04B8 ## $a0 = 000004B8 /* 02630 8093B300 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02634 8093B304 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02638 8093B308 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0263C 8093B30C 8DA509C4 */ lw $a1, 0x09C4($t5) ## 000009C4 -/* 02640 8093B310 10000015 */ beq $zero, $zero, .L8093B368 +/* 02640 8093B310 10000015 */ beq $zero, $zero, .L8093B368 /* 02644 8093B314 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 .L8093B318: /* 02648 8093B318 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0264C 8093B31C 8C650024 */ lw $a1, 0x0024($v1) ## 00000024 -/* 02650 8093B320 8FAE0124 */ lw $t6, 0x0124($sp) +/* 02650 8093B320 8FAE0124 */ lw $t6, 0x0124($sp) /* 02654 8093B324 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 02658 8093B328 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 0265C 8093B32C C5C40028 */ lwc1 $f4, 0x0028($t6) ## 00000028 /* 02660 8093B330 26A404B4 */ addiu $a0, $s5, 0x04B4 ## $a0 = 000004B4 /* 02664 8093B334 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02668 8093B338 46062200 */ add.s $f8, $f4, $f6 +/* 02668 8093B338 46062200 */ add.s $f8, $f4, $f6 /* 0266C 8093B33C 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 02670 8093B340 44054000 */ mfc1 $a1, $f8 +/* 02670 8093B340 44054000 */ mfc1 $a1, $f8 /* 02674 8093B344 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02678 8093B348 00000000 */ nop -/* 0267C 8093B34C 8FAF0124 */ lw $t7, 0x0124($sp) +/* 0267C 8093B34C 8FAF0124 */ lw $t7, 0x0124($sp) /* 02680 8093B350 26A404B8 */ addiu $a0, $s5, 0x04B8 ## $a0 = 000004B8 /* 02684 8093B354 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02688 8093B358 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 0268C 8093B35C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02690 8093B360 8DE5002C */ lw $a1, 0x002C($t7) ## 0000002C /* 02694 8093B364 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 .L8093B368: @@ -132,311 +132,311 @@ glabel func_8093B1AC /* 026B4 8093B384 E6B60508 */ swc1 $f22, 0x0508($s5) ## 00000508 /* 026B8 8093B388 E6B60504 */ swc1 $f22, 0x0504($s5) ## 00000504 /* 026BC 8093B38C E6B60500 */ swc1 $f22, 0x0500($s5) ## 00000500 -/* 026C0 8093B390 C432AEF8 */ lwc1 $f18, %lo(D_8094AEF8)($at) +/* 026C0 8093B390 C432AEF8 */ lwc1 $f18, %lo(D_8094AEF8)($at) /* 026C4 8093B394 C6AA04F0 */ lwc1 $f10, 0x04F0($s5) ## 000004F0 /* 026C8 8093B398 C6A604EC */ lwc1 $f6, 0x04EC($s5) ## 000004EC /* 026CC 8093B39C 26A404D8 */ addiu $a0, $s5, 0x04D8 ## $a0 = 000004D8 -/* 026D0 8093B3A0 46125102 */ mul.s $f4, $f10, $f18 -/* 026D4 8093B3A4 4407A000 */ mfc1 $a3, $f20 -/* 026D8 8093B3A8 4405D000 */ mfc1 $a1, $f26 +/* 026D0 8093B3A0 46125102 */ mul.s $f4, $f10, $f18 +/* 026D4 8093B3A4 4407A000 */ mfc1 $a3, $f20 +/* 026D8 8093B3A8 4405D000 */ mfc1 $a1, $f26 /* 026DC 8093B3AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 026E0 8093B3B0 46043200 */ add.s $f8, $f6, $f4 +/* 026E0 8093B3B0 46043200 */ add.s $f8, $f6, $f4 /* 026E4 8093B3B4 E6A804EC */ swc1 $f8, 0x04EC($s5) ## 000004EC /* 026E8 8093B3B8 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 026EC 8093B3BC AFA4006C */ sw $a0, 0x006C($sp) + +/* 026EC 8093B3BC AFA4006C */ sw $a0, 0x006C($sp) /* 026F0 8093B3C0 26A404F0 */ addiu $a0, $s5, 0x04F0 ## $a0 = 000004F0 /* 026F4 8093B3C4 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 /* 026F8 8093B3C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 026FC 8093B3CC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02700 8093B3D0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 02704 8093B3D4 86A2017A */ lh $v0, 0x017A($s5) ## 0000017A -/* 02708 8093B3D8 28410032 */ slti $at, $v0, 0x0032 -/* 0270C 8093B3DC 10200083 */ beq $at, $zero, .L8093B5EC -/* 02710 8093B3E0 2841000A */ slti $at, $v0, 0x000A -/* 02714 8093B3E4 1020004F */ beq $at, $zero, .L8093B524 +/* 02708 8093B3D8 28410032 */ slti $at, $v0, 0x0032 +/* 0270C 8093B3DC 10200083 */ beq $at, $zero, .L8093B5EC +/* 02710 8093B3E0 2841000A */ slti $at, $v0, 0x000A +/* 02714 8093B3E4 1020004F */ beq $at, $zero, .L8093B524 /* 02718 8093B3E8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0271C 8093B3EC 1441000F */ bne $v0, $at, .L8093B42C +/* 0271C 8093B3EC 1441000F */ bne $v0, $at, .L8093B42C /* 02720 8093B3F0 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 02724 8093B3F4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 02728 8093B3F8 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 /* 0272C 8093B3FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02730 8093B400 00360821 */ addu $at, $at, $s6 +/* 02730 8093B400 00360821 */ addu $at, $at, $s6 /* 02734 8093B404 E42A0AFC */ swc1 $f10, 0x0AFC($at) ## 00010AFC /* 02738 8093B408 86B9001C */ lh $t9, 0x001C($s5) ## 0000001C /* 0273C 8093B40C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02740 8093B410 00360821 */ addu $at, $at, $s6 -/* 02744 8093B414 01194823 */ subu $t1, $t0, $t9 +/* 02740 8093B410 00360821 */ addu $at, $at, $s6 +/* 02744 8093B414 01194823 */ subu $t1, $t0, $t9 /* 02748 8093B418 A0290AE1 */ sb $t1, 0x0AE1($at) ## 00010AE1 /* 0274C 8093B41C 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 02750 8093B420 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02754 8093B424 24053913 */ addiu $a1, $zero, 0x3913 ## $a1 = 00003913 /* 02758 8093B428 86A2017A */ lh $v0, 0x017A($s5) ## 0000017A .L8093B42C: /* 0275C 8093B42C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02760 8093B430 14410005 */ bne $v0, $at, .L8093B448 +/* 02760 8093B430 14410005 */ bne $v0, $at, .L8093B448 /* 02764 8093B434 27B400F4 */ addiu $s4, $sp, 0x00F4 ## $s4 = FFFFFFA4 /* 02768 8093B438 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 0276C 8093B43C 44819000 */ mtc1 $at, $f18 ## $f18 = 255.00 /* 02770 8093B440 86A2017A */ lh $v0, 0x017A($s5) ## 0000017A /* 02774 8093B444 E6B204D0 */ swc1 $f18, 0x04D0($s5) ## 000004D0 .L8093B448: -/* 02778 8093B448 28410005 */ slti $at, $v0, 0x0005 -/* 0277C 8093B44C 14200035 */ bne $at, $zero, .L8093B524 +/* 02778 8093B448 28410005 */ slti $at, $v0, 0x0005 +/* 0277C 8093B44C 14200035 */ bne $at, $zero, .L8093B524 /* 02780 8093B450 27B30100 */ addiu $s3, $sp, 0x0100 ## $s3 = FFFFFFB0 /* 02784 8093B454 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 02788 8093B458 4481C000 */ mtc1 $at, $f24 ## $f24 = 25.00 -/* 0278C 8093B45C A7A0011A */ sh $zero, 0x011A($sp) +/* 0278C 8093B45C A7A0011A */ sh $zero, 0x011A($sp) /* 02790 8093B460 27B2010C */ addiu $s2, $sp, 0x010C ## $s2 = FFFFFFBC /* 02794 8093B464 2411000C */ addiu $s1, $zero, 0x000C ## $s1 = 0000000C .L8093B468: /* 02798 8093B468 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L8093B46C: -/* 0279C 8093B46C 02110019 */ multu $s0, $s1 -/* 027A0 8093B470 4600A306 */ mov.s $f12, $f20 -/* 027A4 8093B474 00005012 */ mflo $t2 -/* 027A8 8093B478 02AA1021 */ addu $v0, $s5, $t2 +/* 0279C 8093B46C 02110019 */ multu $s0, $s1 +/* 027A0 8093B470 4600A306 */ mov.s $f12, $f20 +/* 027A4 8093B474 00005012 */ mflo $t2 +/* 027A8 8093B478 02AA1021 */ addu $v0, $s5, $t2 /* 027AC 8093B47C C4460450 */ lwc1 $f6, 0x0450($v0) ## 00000450 -/* 027B0 8093B480 E7A6010C */ swc1 $f6, 0x010C($sp) +/* 027B0 8093B480 E7A6010C */ swc1 $f6, 0x010C($sp) /* 027B4 8093B484 C4440454 */ lwc1 $f4, 0x0454($v0) ## 00000454 -/* 027B8 8093B488 E7A40110 */ swc1 $f4, 0x0110($sp) +/* 027B8 8093B488 E7A40110 */ swc1 $f4, 0x0110($sp) /* 027BC 8093B48C C4480458 */ lwc1 $f8, 0x0458($v0) ## 00000458 /* 027C0 8093B490 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 027C4 8093B494 E7A80114 */ swc1 $f8, 0x0114($sp) -/* 027C8 8093B498 E7A00100 */ swc1 $f0, 0x0100($sp) + +/* 027C4 8093B494 E7A80114 */ swc1 $f8, 0x0114($sp) +/* 027C8 8093B498 E7A00100 */ swc1 $f0, 0x0100($sp) /* 027CC 8093B49C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 027D0 8093B4A0 4600A306 */ mov.s $f12, $f20 -/* 027D4 8093B4A4 E7A00104 */ swc1 $f0, 0x0104($sp) + +/* 027D0 8093B4A0 4600A306 */ mov.s $f12, $f20 +/* 027D4 8093B4A4 E7A00104 */ swc1 $f0, 0x0104($sp) /* 027D8 8093B4A8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 027DC 8093B4AC 4600A306 */ mov.s $f12, $f20 -/* 027E0 8093B4B0 E7A00108 */ swc1 $f0, 0x0108($sp) -/* 027E4 8093B4B4 E7B600F4 */ swc1 $f22, 0x00F4($sp) -/* 027E8 8093B4B8 E7B600F8 */ swc1 $f22, 0x00F8($sp) -/* 027EC 8093B4BC E7B600FC */ swc1 $f22, 0x00FC($sp) + +/* 027DC 8093B4AC 4600A306 */ mov.s $f12, $f20 +/* 027E0 8093B4B0 E7A00108 */ swc1 $f0, 0x0108($sp) +/* 027E4 8093B4B4 E7B600F4 */ swc1 $f22, 0x00F4($sp) +/* 027E8 8093B4B8 E7B600F8 */ swc1 $f22, 0x00F8($sp) +/* 027EC 8093B4BC E7B600FC */ swc1 $f22, 0x00FC($sp) /* 027F0 8093B4C0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 027F4 8093B4C4 4600A306 */ mov.s $f12, $f20 -/* 027F8 8093B4C8 46180280 */ add.s $f10, $f0, $f24 + +/* 027F4 8093B4C4 4600A306 */ mov.s $f12, $f20 +/* 027F8 8093B4C8 46180280 */ add.s $f10, $f0, $f24 /* 027FC 8093B4CC 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 02800 8093B4D0 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFBC /* 02804 8093B4D4 02603025 */ or $a2, $s3, $zero ## $a2 = FFFFFFB0 -/* 02808 8093B4D8 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 02808 8093B4D8 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 0280C 8093B4DC 86AB001C */ lh $t3, 0x001C($s5) ## 0000001C /* 02810 8093B4E0 02803825 */ or $a3, $s4, $zero ## $a3 = FFFFFFA4 -/* 02814 8093B4E4 0C24E41C */ jal func_80939070 -/* 02818 8093B4E8 AFAB0014 */ sw $t3, 0x0014($sp) +/* 02814 8093B4E4 0C24E41C */ jal func_80939070 +/* 02818 8093B4E8 AFAB0014 */ sw $t3, 0x0014($sp) /* 0281C 8093B4EC 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 02820 8093B4F0 00108400 */ sll $s0, $s0, 16 -/* 02824 8093B4F4 00108403 */ sra $s0, $s0, 16 -/* 02828 8093B4F8 2A010005 */ slti $at, $s0, 0x0005 -/* 0282C 8093B4FC 1420FFDB */ bne $at, $zero, .L8093B46C +/* 02820 8093B4F0 00108400 */ sll $s0, $s0, 16 +/* 02824 8093B4F4 00108403 */ sra $s0, $s0, 16 +/* 02828 8093B4F8 2A010005 */ slti $at, $s0, 0x0005 +/* 0282C 8093B4FC 1420FFDB */ bne $at, $zero, .L8093B46C /* 02830 8093B500 00000000 */ nop -/* 02834 8093B504 87AC011A */ lh $t4, 0x011A($sp) +/* 02834 8093B504 87AC011A */ lh $t4, 0x011A($sp) /* 02838 8093B508 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 0283C 8093B50C 000D7400 */ sll $t6, $t5, 16 -/* 02840 8093B510 000E7C03 */ sra $t7, $t6, 16 -/* 02844 8093B514 29E10002 */ slti $at, $t7, 0x0002 -/* 02848 8093B518 1420FFD3 */ bne $at, $zero, .L8093B468 -/* 0284C 8093B51C A7AD011A */ sh $t5, 0x011A($sp) +/* 0283C 8093B50C 000D7400 */ sll $t6, $t5, 16 +/* 02840 8093B510 000E7C03 */ sra $t7, $t6, 16 +/* 02844 8093B514 29E10002 */ slti $at, $t7, 0x0002 +/* 02848 8093B518 1420FFD3 */ bne $at, $zero, .L8093B468 +/* 0284C 8093B51C A7AD011A */ sh $t5, 0x011A($sp) /* 02850 8093B520 86A2017A */ lh $v0, 0x017A($s5) ## 0000017A .L8093B524: -/* 02854 8093B524 28410014 */ slti $at, $v0, 0x0014 -/* 02858 8093B528 1020000F */ beq $at, $zero, .L8093B568 +/* 02854 8093B524 28410014 */ slti $at, $v0, 0x0014 +/* 02858 8093B528 1020000F */ beq $at, $zero, .L8093B568 /* 0285C 8093B52C 26A404D4 */ addiu $a0, $s5, 0x04D4 ## $a0 = 000004D4 /* 02860 8093B530 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 02864 8093B534 4481D000 */ mtc1 $at, $f26 ## $f26 = 20.00 /* 02868 8093B538 26A404D4 */ addiu $a0, $s5, 0x04D4 ## $a0 = 000004D4 /* 0286C 8093B53C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 02870 8093B540 4407D000 */ mfc1 $a3, $f26 +/* 02870 8093B540 4407D000 */ mfc1 $a3, $f26 /* 02874 8093B544 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02878 8093B548 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0287C 8093B54C 8FA4006C */ lw $a0, 0x006C($sp) +/* 0287C 8093B54C 8FA4006C */ lw $a0, 0x006C($sp) /* 02880 8093B550 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02884 8093B554 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02888 8093B558 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0288C 8093B55C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 02890 8093B560 10000010 */ beq $zero, $zero, .L8093B5A4 +/* 02890 8093B560 10000010 */ beq $zero, $zero, .L8093B5A4 /* 02894 8093B564 00000000 */ nop .L8093B568: -/* 02898 8093B568 4405D000 */ mfc1 $a1, $f26 -/* 0289C 8093B56C 4407A000 */ mfc1 $a3, $f20 +/* 02898 8093B568 4405D000 */ mfc1 $a1, $f26 +/* 0289C 8093B56C 4407A000 */ mfc1 $a3, $f20 /* 028A0 8093B570 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 028A4 8093B574 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 028A8 8093B578 86B8001C */ lh $t8, 0x001C($s5) ## 0000001C /* 028AC 8093B57C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 028B0 8093B580 2405310E */ addiu $a1, $zero, 0x310E ## $a1 = 0000310E -/* 028B4 8093B584 17010005 */ bne $t8, $at, .L8093B59C +/* 028B4 8093B584 17010005 */ bne $t8, $at, .L8093B59C /* 028B8 8093B588 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 028BC 8093B58C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 028C0 8093B590 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 028C4 8093B594 10000003 */ beq $zero, $zero, .L8093B5A4 +/* 028C4 8093B594 10000003 */ beq $zero, $zero, .L8093B5A4 /* 028C8 8093B598 00000000 */ nop .L8093B59C: /* 028CC 8093B59C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 028D0 8093B5A0 24053112 */ addiu $a1, $zero, 0x3112 ## $a1 = 00003112 .L8093B5A4: /* 028D4 8093B5A4 3C018095 */ lui $at, %hi(D_8094AEFC) ## $at = 80950000 -/* 028D8 8093B5A8 C426AEFC */ lwc1 $f6, %lo(D_8094AEFC)($at) +/* 028D8 8093B5A8 C426AEFC */ lwc1 $f6, %lo(D_8094AEFC)($at) /* 028DC 8093B5AC C6A004E4 */ lwc1 $f0, 0x04E4($s5) ## 000004E4 /* 028E0 8093B5B0 C6B204E8 */ lwc1 $f18, 0x04E8($s5) ## 000004E8 -/* 028E4 8093B5B4 4405B000 */ mfc1 $a1, $f22 -/* 028E8 8093B5B8 46060102 */ mul.s $f4, $f0, $f6 +/* 028E4 8093B5B4 4405B000 */ mfc1 $a1, $f22 +/* 028E8 8093B5B8 46060102 */ mul.s $f4, $f0, $f6 /* 028EC 8093B5BC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 028F0 8093B5C0 44070000 */ mfc1 $a3, $f0 +/* 028F0 8093B5C0 44070000 */ mfc1 $a3, $f0 /* 028F4 8093B5C4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 028F8 8093B5C8 26A404E0 */ addiu $a0, $s5, 0x04E0 ## $a0 = 000004E0 -/* 028FC 8093B5CC 46049200 */ add.s $f8, $f18, $f4 +/* 028FC 8093B5CC 46049200 */ add.s $f8, $f18, $f4 /* 02900 8093B5D0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02904 8093B5D4 E6A804E8 */ swc1 $f8, 0x04E8($s5) ## 000004E8 /* 02908 8093B5D8 26A404E4 */ addiu $a0, $s5, 0x04E4 ## $a0 = 000004E4 /* 0290C 8093B5DC 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 /* 02910 8093B5E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02914 8093B5E4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02918 8093B5E8 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 .L8093B5EC: -/* 0291C 8093B5EC 8FA40074 */ lw $a0, 0x0074($sp) -/* 02920 8093B5F0 0C0295B2 */ jal func_800A56C8 +/* 0291C 8093B5EC 8FA40074 */ lw $a0, 0x0074($sp) +/* 02920 8093B5F0 0C0295B2 */ jal func_800A56C8 /* 02924 8093B5F4 8EA501A4 */ lw $a1, 0x01A4($s5) ## 000001A4 -/* 02928 8093B5F8 10400008 */ beq $v0, $zero, .L8093B61C -/* 0292C 8093B5FC 8FA40074 */ lw $a0, 0x0074($sp) +/* 02928 8093B5F8 10400008 */ beq $v0, $zero, .L8093B61C +/* 0292C 8093B5FC 8FA40074 */ lw $a0, 0x0074($sp) /* 02930 8093B600 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02934 8093B604 4406B000 */ mfc1 $a2, $f22 -/* 02938 8093B608 0C0294D3 */ jal func_800A534C +/* 02934 8093B604 4406B000 */ mfc1 $a2, $f22 +/* 02938 8093B608 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0293C 8093B60C 24A59398 */ addiu $a1, $a1, 0x9398 ## $a1 = 06009398 /* 02940 8093B610 3C018095 */ lui $at, %hi(D_8094AF00) ## $at = 80950000 -/* 02944 8093B614 C42AAF00 */ lwc1 $f10, %lo(D_8094AF00)($at) +/* 02944 8093B614 C42AAF00 */ lwc1 $f10, %lo(D_8094AF00)($at) /* 02948 8093B618 E6AA01A4 */ swc1 $f10, 0x01A4($s5) ## 000001A4 .L8093B61C: /* 0294C 8093B61C 86A8017A */ lh $t0, 0x017A($s5) ## 0000017A /* 02950 8093B620 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 02954 8093B624 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 02958 8093B628 1501000F */ bne $t0, $at, .L8093B668 +/* 02958 8093B628 1501000F */ bne $t0, $at, .L8093B668 /* 0295C 8093B62C 26103614 */ addiu $s0, $s0, 0x3614 ## $s0 = 06003614 -/* 02960 8093B630 4406B000 */ mfc1 $a2, $f22 -/* 02964 8093B634 8FA40074 */ lw $a0, 0x0074($sp) -/* 02968 8093B638 0C029490 */ jal func_800A5240 +/* 02960 8093B630 4406B000 */ mfc1 $a2, $f22 +/* 02964 8093B634 8FA40074 */ lw $a0, 0x0074($sp) +/* 02968 8093B638 0C029490 */ jal func_800A5240 /* 0296C 8093B63C 02002825 */ or $a1, $s0, $zero ## $a1 = 06003614 /* 02970 8093B640 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02974 8093B644 02002025 */ or $a0, $s0, $zero ## $a0 = 06003614 /* 02978 8093B648 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0297C 8093B64C E6B604DC */ swc1 $f22, 0x04DC($s5) ## 000004DC /* 02980 8093B650 E6B604D8 */ swc1 $f22, 0x04D8($s5) ## 000004D8 -/* 02984 8093B654 468034A0 */ cvt.s.w $f18, $f6 +/* 02984 8093B654 468034A0 */ cvt.s.w $f18, $f6 /* 02988 8093B658 E6B604D4 */ swc1 $f22, 0x04D4($s5) ## 000004D4 /* 0298C 8093B65C 3C018095 */ lui $at, %hi(D_8094C86E) ## $at = 80950000 /* 02990 8093B660 E6B201A4 */ swc1 $f18, 0x01A4($s5) ## 000001A4 -/* 02994 8093B664 A020C86E */ sb $zero, %lo(D_8094C86E)($at) +/* 02994 8093B664 A020C86E */ sb $zero, %lo(D_8094C86E)($at) .L8093B668: -/* 02998 8093B668 1000016E */ beq $zero, $zero, .L8093BC24 +/* 02998 8093B668 1000016E */ beq $zero, $zero, .L8093BC24 /* 0299C 8093B66C 26B3050C */ addiu $s3, $s5, 0x050C ## $s3 = 0000050C .L8093B670: -/* 029A0 8093B670 8FA40074 */ lw $a0, 0x0074($sp) -/* 029A4 8093B674 0C0295B2 */ jal func_800A56C8 +/* 029A0 8093B670 8FA40074 */ lw $a0, 0x0074($sp) +/* 029A4 8093B674 0C0295B2 */ jal func_800A56C8 /* 029A8 8093B678 8EA501A4 */ lw $a1, 0x01A4($s5) ## 000001A4 -/* 029AC 8093B67C 5040000B */ beql $v0, $zero, .L8093B6AC +/* 029AC 8093B67C 5040000B */ beql $v0, $zero, .L8093B6AC /* 029B0 8093B680 C6A801A4 */ lwc1 $f8, 0x01A4($s5) ## 000001A4 /* 029B4 8093B684 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 /* 029B8 8093B688 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 029BC 8093B68C 24A53E34 */ addiu $a1, $a1, 0x3E34 ## $a1 = 06003E34 -/* 029C0 8093B690 4406B000 */ mfc1 $a2, $f22 -/* 029C4 8093B694 0C0294D3 */ jal func_800A534C -/* 029C8 8093B698 8FA40074 */ lw $a0, 0x0074($sp) +/* 029C0 8093B690 4406B000 */ mfc1 $a2, $f22 +/* 029C4 8093B694 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 029C8 8093B698 8FA40074 */ lw $a0, 0x0074($sp) /* 029CC 8093B69C 3C018095 */ lui $at, %hi(D_8094AF04) ## $at = 80950000 -/* 029D0 8093B6A0 C424AF04 */ lwc1 $f4, %lo(D_8094AF04)($at) +/* 029D0 8093B6A0 C424AF04 */ lwc1 $f4, %lo(D_8094AF04)($at) /* 029D4 8093B6A4 E6A401A4 */ swc1 $f4, 0x01A4($s5) ## 000001A4 /* 029D8 8093B6A8 C6A801A4 */ lwc1 $f8, 0x01A4($s5) ## 000001A4 .L8093B6AC: /* 029DC 8093B6AC 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 -/* 029E0 8093B6B0 8FA40074 */ lw $a0, 0x0074($sp) -/* 029E4 8093B6B4 46144281 */ sub.s $f10, $f8, $f20 -/* 029E8 8093B6B8 44055000 */ mfc1 $a1, $f10 -/* 029EC 8093B6BC 0C0295B2 */ jal func_800A56C8 +/* 029E0 8093B6B0 8FA40074 */ lw $a0, 0x0074($sp) +/* 029E4 8093B6B4 46144281 */ sub.s $f10, $f8, $f20 +/* 029E8 8093B6B8 44055000 */ mfc1 $a1, $f10 +/* 029EC 8093B6BC 0C0295B2 */ jal func_800A56C8 /* 029F0 8093B6C0 00000000 */ nop -/* 029F4 8093B6C4 50400007 */ beql $v0, $zero, .L8093B6E4 +/* 029F4 8093B6C4 50400007 */ beql $v0, $zero, .L8093B6E4 /* 029F8 8093B6C8 3C014150 */ lui $at, 0x4150 ## $at = 41500000 /* 029FC 8093B6CC 86B9001C */ lh $t9, 0x001C($s5) ## 0000001C /* 02A00 8093B6D0 A6A004FC */ sh $zero, 0x04FC($s5) ## 000004FC /* 02A04 8093B6D4 3C018095 */ lui $at, %hi(D_8094C840) ## $at = 80950000 /* 02A08 8093B6D8 27290001 */ addiu $t1, $t9, 0x0001 ## $t1 = 00000001 -/* 02A0C 8093B6DC A029C840 */ sb $t1, %lo(D_8094C840)($at) +/* 02A0C 8093B6DC A029C840 */ sb $t1, %lo(D_8094C840)($at) /* 02A10 8093B6E0 3C014150 */ lui $at, 0x4150 ## $at = 41500000 .L8093B6E4: /* 02A14 8093B6E4 44819000 */ mtc1 $at, $f18 ## $f18 = 13.00 /* 02A18 8093B6E8 C6A601A4 */ lwc1 $f6, 0x01A4($s5) ## 000001A4 -/* 02A1C 8093B6EC 8FA40074 */ lw $a0, 0x0074($sp) -/* 02A20 8093B6F0 46123101 */ sub.s $f4, $f6, $f18 -/* 02A24 8093B6F4 44052000 */ mfc1 $a1, $f4 -/* 02A28 8093B6F8 0C0295B2 */ jal func_800A56C8 +/* 02A1C 8093B6EC 8FA40074 */ lw $a0, 0x0074($sp) +/* 02A20 8093B6F0 46123101 */ sub.s $f4, $f6, $f18 +/* 02A24 8093B6F4 44052000 */ mfc1 $a1, $f4 +/* 02A28 8093B6F8 0C0295B2 */ jal func_800A56C8 /* 02A2C 8093B6FC 00000000 */ nop -/* 02A30 8093B700 10400006 */ beq $v0, $zero, .L8093B71C +/* 02A30 8093B700 10400006 */ beq $v0, $zero, .L8093B71C /* 02A34 8093B704 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 02A38 8093B708 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02A3C 8093B70C 24053923 */ addiu $a1, $zero, 0x3923 ## $a1 = 00003923 /* 02A40 8093B710 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 02A44 8093B714 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02A48 8093B718 240539B3 */ addiu $a1, $zero, 0x39B3 ## $a1 = 000039B3 .L8093B71C: /* 02A4C 8093B71C C6A804B0 */ lwc1 $f8, 0x04B0($s5) ## 000004B0 /* 02A50 8093B720 C6AA048C */ lwc1 $f10, 0x048C($s5) ## 0000048C /* 02A54 8093B724 C6A404B8 */ lwc1 $f4, 0x04B8($s5) ## 000004B8 /* 02A58 8093B728 C6A604B4 */ lwc1 $f6, 0x04B4($s5) ## 000004B4 -/* 02A5C 8093B72C 460A4501 */ sub.s $f20, $f8, $f10 +/* 02A5C 8093B72C 460A4501 */ sub.s $f20, $f8, $f10 /* 02A60 8093B730 C6A80494 */ lwc1 $f8, 0x0494($s5) ## 00000494 /* 02A64 8093B734 C6B20490 */ lwc1 $f18, 0x0490($s5) ## 00000490 -/* 02A68 8093B738 46082601 */ sub.s $f24, $f4, $f8 -/* 02A6C 8093B73C 4600A306 */ mov.s $f12, $f20 -/* 02A70 8093B740 46123681 */ sub.s $f26, $f6, $f18 -/* 02A74 8093B744 0C03F494 */ jal Math_atan2f -/* 02A78 8093B748 4600C386 */ mov.s $f14, $f24 -/* 02A7C 8093B74C 4614A082 */ mul.s $f2, $f20, $f20 +/* 02A68 8093B738 46082601 */ sub.s $f24, $f4, $f8 +/* 02A6C 8093B73C 4600A306 */ mov.s $f12, $f20 +/* 02A70 8093B740 46123681 */ sub.s $f26, $f6, $f18 +/* 02A74 8093B744 0C03F494 */ jal Math_atan2f +/* 02A78 8093B748 4600C386 */ mov.s $f14, $f24 +/* 02A7C 8093B74C 4614A082 */ mul.s $f2, $f20, $f20 /* 02A80 8093B750 E6A0051C */ swc1 $f0, 0x051C($s5) ## 0000051C -/* 02A84 8093B754 4600D306 */ mov.s $f12, $f26 -/* 02A88 8093B758 4618C402 */ mul.s $f16, $f24, $f24 -/* 02A8C 8093B75C E7A20074 */ swc1 $f2, 0x0074($sp) -/* 02A90 8093B760 46101000 */ add.s $f0, $f2, $f16 -/* 02A94 8093B764 E7B00070 */ swc1 $f16, 0x0070($sp) -/* 02A98 8093B768 0C03F494 */ jal Math_atan2f -/* 02A9C 8093B76C 46000384 */ sqrt.s $f14, $f0 +/* 02A84 8093B754 4600D306 */ mov.s $f12, $f26 +/* 02A88 8093B758 4618C402 */ mul.s $f16, $f24, $f24 +/* 02A8C 8093B75C E7A20074 */ swc1 $f2, 0x0074($sp) +/* 02A90 8093B760 46101000 */ add.s $f0, $f2, $f16 +/* 02A94 8093B764 E7B00070 */ swc1 $f16, 0x0070($sp) +/* 02A98 8093B768 0C03F494 */ jal Math_atan2f +/* 02A9C 8093B76C 46000384 */ sqrt.s $f14, $f0 /* 02AA0 8093B770 86A204FC */ lh $v0, 0x04FC($s5) ## 000004FC -/* 02AA4 8093B774 46000287 */ neg.s $f10, $f0 -/* 02AA8 8093B778 C7B40074 */ lwc1 $f20, 0x0074($sp) -/* 02AAC 8093B77C C7B80070 */ lwc1 $f24, 0x0070($sp) +/* 02AA4 8093B774 46000287 */ neg.s $f10, $f0 +/* 02AA8 8093B778 C7B40074 */ lwc1 $f20, 0x0074($sp) +/* 02AAC 8093B77C C7B80070 */ lwc1 $f24, 0x0070($sp) /* 02AB0 8093B780 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 02AB4 8093B784 10410007 */ beq $v0, $at, .L8093B7A4 +/* 02AB4 8093B784 10410007 */ beq $v0, $at, .L8093B7A4 /* 02AB8 8093B788 E6AA0518 */ swc1 $f10, 0x0518($s5) ## 00000518 -/* 02ABC 8093B78C 10400007 */ beq $v0, $zero, .L8093B7AC +/* 02ABC 8093B78C 10400007 */ beq $v0, $zero, .L8093B7AC /* 02AC0 8093B790 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02AC4 8093B794 504100A2 */ beql $v0, $at, .L8093BA20 +/* 02AC4 8093B794 504100A2 */ beql $v0, $at, .L8093BA20 /* 02AC8 8093B798 96CD0014 */ lhu $t5, 0x0014($s6) ## 00000014 -/* 02ACC 8093B79C 10000104 */ beq $zero, $zero, .L8093BBB0 +/* 02ACC 8093B79C 10000104 */ beq $zero, $zero, .L8093BBB0 /* 02AD0 8093B7A0 26B3050C */ addiu $s3, $s5, 0x050C ## $s3 = 0000050C .L8093B7A4: -/* 02AD4 8093B7A4 10000102 */ beq $zero, $zero, .L8093BBB0 +/* 02AD4 8093B7A4 10000102 */ beq $zero, $zero, .L8093BBB0 /* 02AD8 8093B7A8 26B3050C */ addiu $s3, $s5, 0x050C ## $s3 = 0000050C .L8093B7AC: /* 02ADC 8093B7AC 86AA0178 */ lh $t2, 0x0178($s5) ## 00000178 /* 02AE0 8093B7B0 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 02AE4 8093B7B4 51400076 */ beql $t2, $zero, .L8093B990 +/* 02AE4 8093B7B4 51400076 */ beql $t2, $zero, .L8093B990 /* 02AE8 8093B7B8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02AEC 8093B7BC 0C24EACC */ jal func_8093AB30 +/* 02AEC 8093B7BC 0C24EACC */ jal func_8093AB30 /* 02AF0 8093B7C0 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 /* 02AF4 8093B7C4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02AF8 8093B7C8 1441005E */ bne $v0, $at, .L8093B944 +/* 02AF8 8093B7C8 1441005E */ bne $v0, $at, .L8093B944 /* 02AFC 8093B7CC 3C0B8095 */ lui $t3, %hi(D_8094A8DC) ## $t3 = 80950000 /* 02B00 8093B7D0 256BA8DC */ addiu $t3, $t3, %lo(D_8094A8DC) ## $t3 = 8094A8DC /* 02B04 8093B7D4 8D6D0000 */ lw $t5, 0x0000($t3) ## 8094A8DC @@ -451,21 +451,21 @@ glabel func_8093B1AC /* 02B28 8093B7F8 27B400D8 */ addiu $s4, $sp, 0x00D8 ## $s4 = FFFFFF88 /* 02B2C 8093B7FC 27B100E4 */ addiu $s1, $sp, 0x00E4 ## $s1 = FFFFFF94 /* 02B30 8093B800 AE6D0008 */ sw $t5, 0x0008($s3) ## FFFFFF84 -/* 02B34 8093B804 8FB20124 */ lw $s2, 0x0124($sp) +/* 02B34 8093B804 8FB20124 */ lw $s2, 0x0124($sp) /* 02B38 8093B808 265209BC */ addiu $s2, $s2, 0x09BC ## $s2 = 00000978 .L8093B80C: /* 02B3C 8093B80C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02B40 8093B810 4600A306 */ mov.s $f12, $f20 -/* 02B44 8093B814 E7A000D8 */ swc1 $f0, 0x00D8($sp) + +/* 02B40 8093B810 4600A306 */ mov.s $f12, $f20 +/* 02B44 8093B814 E7A000D8 */ swc1 $f0, 0x00D8($sp) /* 02B48 8093B818 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02B4C 8093B81C 4600A306 */ mov.s $f12, $f20 -/* 02B50 8093B820 E7A000DC */ swc1 $f0, 0x00DC($sp) + +/* 02B4C 8093B81C 4600A306 */ mov.s $f12, $f20 +/* 02B50 8093B820 E7A000DC */ swc1 $f0, 0x00DC($sp) /* 02B54 8093B824 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02B58 8093B828 4600A306 */ mov.s $f12, $f20 -/* 02B5C 8093B82C E7A000E0 */ swc1 $f0, 0x00E0($sp) + +/* 02B58 8093B828 4600A306 */ mov.s $f12, $f20 +/* 02B5C 8093B82C E7A000E0 */ swc1 $f0, 0x00E0($sp) /* 02B60 8093B830 8E4F0000 */ lw $t7, 0x0000($s2) ## 00000978 /* 02B64 8093B834 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 02B68 8093B838 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 @@ -474,87 +474,87 @@ glabel func_8093B1AC /* 02B74 8093B844 AE2E0004 */ sw $t6, 0x0004($s1) ## FFFFFF98 /* 02B78 8093B848 8E4F0008 */ lw $t7, 0x0008($s2) ## 00000980 /* 02B7C 8093B84C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 02B80 8093B850 AE2F0008 */ sw $t7, 0x0008($s1) ## FFFFFF9C -/* 02B84 8093B854 4600018D */ trunc.w.s $f6, $f0 +/* 02B84 8093B854 4600018D */ trunc.w.s $f6, $f0 /* 02B88 8093B858 240C0096 */ addiu $t4, $zero, 0x0096 ## $t4 = 00000096 /* 02B8C 8093B85C 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 02B90 8093B860 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFF94 -/* 02B94 8093B864 44083000 */ mfc1 $t0, $f6 +/* 02B94 8093B864 44083000 */ mfc1 $t0, $f6 /* 02B98 8093B868 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFF88 /* 02B9C 8093B86C 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFF7C -/* 02BA0 8093B870 0008CC00 */ sll $t9, $t0, 16 -/* 02BA4 8093B874 00194C03 */ sra $t1, $t9, 16 +/* 02BA0 8093B870 0008CC00 */ sll $t9, $t0, 16 +/* 02BA4 8093B874 00194C03 */ sra $t1, $t9, 16 /* 02BA8 8093B878 252A0005 */ addiu $t2, $t1, 0x0005 ## $t2 = 00000005 /* 02BAC 8093B87C 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 /* 02BB0 8093B880 00000000 */ nop -/* 02BB4 8093B884 46809120 */ cvt.s.w $f4, $f18 -/* 02BB8 8093B888 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 02BB4 8093B884 46809120 */ cvt.s.w $f4, $f18 +/* 02BB8 8093B888 E7A40010 */ swc1 $f4, 0x0010($sp) /* 02BBC 8093B88C 86AB001C */ lh $t3, 0x001C($s5) ## 0000001C -/* 02BC0 8093B890 AFAC0018 */ sw $t4, 0x0018($sp) -/* 02BC4 8093B894 0C24E334 */ jal func_80938CD0 -/* 02BC8 8093B898 AFAB0014 */ sw $t3, 0x0014($sp) +/* 02BC0 8093B890 AFAC0018 */ sw $t4, 0x0018($sp) +/* 02BC4 8093B894 0C24E334 */ jal func_80938CD0 +/* 02BC8 8093B898 AFAB0014 */ sw $t3, 0x0014($sp) /* 02BCC 8093B89C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 02BD0 8093B8A0 00108400 */ sll $s0, $s0, 16 -/* 02BD4 8093B8A4 00108403 */ sra $s0, $s0, 16 -/* 02BD8 8093B8A8 2A010096 */ slti $at, $s0, 0x0096 -/* 02BDC 8093B8AC 1420FFD7 */ bne $at, $zero, .L8093B80C +/* 02BD0 8093B8A0 00108400 */ sll $s0, $s0, 16 +/* 02BD4 8093B8A4 00108403 */ sra $s0, $s0, 16 +/* 02BD8 8093B8A8 2A010096 */ slti $at, $s0, 0x0096 +/* 02BDC 8093B8AC 1420FFD7 */ bne $at, $zero, .L8093B80C /* 02BE0 8093B8B0 00000000 */ nop /* 02BE4 8093B8B4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 02BE8 8093B8B8 A6AD04FC */ sh $t5, 0x04FC($s5) ## 000004FC -/* 02BEC 8093B8BC 8FA40124 */ lw $a0, 0x0124($sp) +/* 02BEC 8093B8BC 8FA40124 */ lw $a0, 0x0124($sp) /* 02BF0 8093B8C0 2405180C */ addiu $a1, $zero, 0x180C ## $a1 = 0000180C -/* 02BF4 8093B8C4 0C01E245 */ jal func_80078914 +/* 02BF4 8093B8C4 0C01E245 */ jal func_80078914 /* 02BF8 8093B8C8 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 02BFC 8093B8CC 8FA40124 */ lw $a0, 0x0124($sp) +/* 02BFC 8093B8CC 8FA40124 */ lw $a0, 0x0124($sp) /* 02C00 8093B8D0 27A50128 */ addiu $a1, $sp, 0x0128 ## $a1 = FFFFFFD8 /* 02C04 8093B8D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02C08 8093B8D8 0C034833 */ jal func_800D20CC +/* 02C08 8093B8D8 0C034833 */ jal func_800D20CC /* 02C0C 8093B8DC 24840A20 */ addiu $a0, $a0, 0x0A20 ## $a0 = 00000A20 -/* 02C10 8093B8E0 87AE012A */ lh $t6, 0x012A($sp) -/* 02C14 8093B8E4 87B80128 */ lh $t8, 0x0128($sp) +/* 02C10 8093B8E0 87AE012A */ lh $t6, 0x012A($sp) +/* 02C14 8093B8E4 87B80128 */ lh $t8, 0x0128($sp) /* 02C18 8093B8E8 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 02C1C 8093B8EC 01C17821 */ addu $t7, $t6, $at -/* 02C20 8093B8F0 00184823 */ subu $t1, $zero, $t8 -/* 02C24 8093B8F4 A7AF012A */ sh $t7, 0x012A($sp) -/* 02C28 8093B8F8 A7A90128 */ sh $t1, 0x0128($sp) +/* 02C1C 8093B8EC 01C17821 */ addu $t7, $t6, $at +/* 02C20 8093B8F0 00184823 */ subu $t1, $zero, $t8 +/* 02C24 8093B8F4 A7AF012A */ sh $t7, 0x012A($sp) +/* 02C28 8093B8F8 A7A90128 */ sh $t1, 0x0128($sp) /* 02C2C 8093B8FC A6A90524 */ sh $t1, 0x0524($s5) ## 00000524 -/* 02C30 8093B900 87AA012A */ lh $t2, 0x012A($sp) +/* 02C30 8093B900 87AA012A */ lh $t2, 0x012A($sp) /* 02C34 8093B904 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 02C38 8093B908 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 /* 02C3C 8093B90C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02C40 8093B910 E6B60500 */ swc1 $f22, 0x0500($s5) ## 00000500 /* 02C44 8093B914 E6B60504 */ swc1 $f22, 0x0504($s5) ## 00000504 /* 02C48 8093B918 E6B60508 */ swc1 $f22, 0x0508($s5) ## 00000508 -/* 02C4C 8093B91C 00360821 */ addu $at, $at, $s6 +/* 02C4C 8093B91C 00360821 */ addu $at, $at, $s6 /* 02C50 8093B920 A6AA0526 */ sh $t2, 0x0526($s5) ## 00000526 -/* 02C54 8093B924 4600B306 */ mov.s $f12, $f22 +/* 02C54 8093B924 4600B306 */ mov.s $f12, $f22 /* 02C58 8093B928 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 /* 02C5C 8093B92C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 02C60 8093B930 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 02C64 8093B934 0C02A800 */ jal func_800AA000 +/* 02C64 8093B934 0C02A800 */ jal func_800AA000 /* 02C68 8093B938 E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC -/* 02C6C 8093B93C 10000014 */ beq $zero, $zero, .L8093B990 +/* 02C6C 8093B93C 10000014 */ beq $zero, $zero, .L8093B990 /* 02C70 8093B940 3C010001 */ lui $at, 0x0001 ## $at = 00010000 .L8093B944: -/* 02C74 8093B944 14400011 */ bne $v0, $zero, .L8093B98C +/* 02C74 8093B944 14400011 */ bne $v0, $zero, .L8093B98C /* 02C78 8093B948 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 02C7C 8093B94C 0C24EA50 */ jal func_8093A940 +/* 02C7C 8093B94C 0C24EA50 */ jal func_8093A940 /* 02C80 8093B950 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 /* 02C84 8093B954 86AB0440 */ lh $t3, 0x0440($s5) ## 00000440 -/* 02C88 8093B958 5560000D */ bnel $t3, $zero, .L8093B990 +/* 02C88 8093B958 5560000D */ bnel $t3, $zero, .L8093B990 /* 02C8C 8093B95C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02C90 8093B960 461AD282 */ mul.s $f10, $f26, $f26 +/* 02C90 8093B960 461AD282 */ mul.s $f10, $f26, $f26 /* 02C94 8093B964 26A4052C */ addiu $a0, $s5, 0x052C ## $a0 = 0000052C /* 02C98 8093B968 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02C9C 8093B96C 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 -/* 02CA0 8093B970 460AA180 */ add.s $f6, $f20, $f10 -/* 02CA4 8093B974 46183000 */ add.s $f0, $f6, $f24 -/* 02CA8 8093B978 46000004 */ sqrt.s $f0, $f0 -/* 02CAC 8093B97C 46000480 */ add.s $f18, $f0, $f0 -/* 02CB0 8093B980 44059000 */ mfc1 $a1, $f18 +/* 02CA0 8093B970 460AA180 */ add.s $f6, $f20, $f10 +/* 02CA4 8093B974 46183000 */ add.s $f0, $f6, $f24 +/* 02CA8 8093B978 46000004 */ sqrt.s $f0, $f0 +/* 02CAC 8093B97C 46000480 */ add.s $f18, $f0, $f0 +/* 02CB0 8093B980 44059000 */ mfc1 $a1, $f18 /* 02CB4 8093B984 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02CB8 8093B988 00000000 */ nop .L8093B98C: /* 02CBC 8093B98C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -564,92 +564,92 @@ glabel func_8093B1AC /* 02CC8 8093B998 26B1054C */ addiu $s1, $s5, 0x054C ## $s1 = 0000054C /* 02CCC 8093B99C 02203025 */ or $a2, $s1, $zero ## $a2 = 0000054C /* 02CD0 8093B9A0 02602825 */ or $a1, $s3, $zero ## $a1 = 0000050C -/* 02CD4 8093B9A4 02C12021 */ addu $a0, $s6, $at -/* 02CD8 8093B9A8 0C029B84 */ jal func_800A6E10 +/* 02CD4 8093B9A4 02C12021 */ addu $a0, $s6, $at +/* 02CD8 8093B9A8 0C029B84 */ jal func_800A6E10 /* 02CDC 8093B9AC 26A700F0 */ addiu $a3, $s5, 0x00F0 ## $a3 = 000000F0 /* 02CE0 8093B9B0 86AC001C */ lh $t4, 0x001C($s5) ## 0000001C /* 02CE4 8093B9B4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 02CE8 8093B9B8 3C108013 */ lui $s0, 0x8013 ## $s0 = 80130000 -/* 02CEC 8093B9BC 1581000D */ bne $t4, $at, .L8093B9F4 +/* 02CEC 8093B9BC 1581000D */ bne $t4, $at, .L8093B9F4 /* 02CF0 8093B9C0 260733E0 */ addiu $a3, $s0, 0x33E0 ## $a3 = 801333E0 /* 02CF4 8093B9C4 3C108013 */ lui $s0, 0x8013 ## $s0 = 80130000 /* 02CF8 8093B9C8 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 /* 02CFC 8093B9CC 265233E8 */ addiu $s2, $s2, 0x33E8 ## $s2 = 801333E8 /* 02D00 8093B9D0 260733E0 */ addiu $a3, $s0, 0x33E0 ## $a3 = 801333E0 -/* 02D04 8093B9D4 AFA70010 */ sw $a3, 0x0010($sp) -/* 02D08 8093B9D8 AFB20014 */ sw $s2, 0x0014($sp) +/* 02D04 8093B9D4 AFA70010 */ sw $a3, 0x0010($sp) +/* 02D08 8093B9D8 AFB20014 */ sw $s2, 0x0014($sp) /* 02D0C 8093B9DC 24043122 */ addiu $a0, $zero, 0x3122 ## $a0 = 00003122 /* 02D10 8093B9E0 02202825 */ or $a1, $s1, $zero ## $a1 = 0000054C /* 02D14 8093B9E4 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 02D18 8093B9E8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 02D1C 8093B9EC 10000071 */ beq $zero, $zero, .L8093BBB4 +/* 02D1C 8093B9EC 10000071 */ beq $zero, $zero, .L8093BBB4 /* 02D20 8093B9F0 86A20178 */ lh $v0, 0x0178($s5) ## 00000178 .L8093B9F4: /* 02D24 8093B9F4 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 /* 02D28 8093B9F8 265233E8 */ addiu $s2, $s2, 0x33E8 ## $s2 = 801333E8 -/* 02D2C 8093B9FC AFB20014 */ sw $s2, 0x0014($sp) +/* 02D2C 8093B9FC AFB20014 */ sw $s2, 0x0014($sp) /* 02D30 8093BA00 24043111 */ addiu $a0, $zero, 0x3111 ## $a0 = 00003111 /* 02D34 8093BA04 02202825 */ or $a1, $s1, $zero ## $a1 = 0000054C /* 02D38 8093BA08 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02D3C 8093BA0C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 02D40 8093BA10 AFA70010 */ sw $a3, 0x0010($sp) -/* 02D44 8093BA14 10000067 */ beq $zero, $zero, .L8093BBB4 + +/* 02D40 8093BA10 AFA70010 */ sw $a3, 0x0010($sp) +/* 02D44 8093BA14 10000067 */ beq $zero, $zero, .L8093BBB4 /* 02D48 8093BA18 86A20178 */ lh $v0, 0x0178($s5) ## 00000178 /* 02D4C 8093BA1C 96CD0014 */ lhu $t5, 0x0014($s6) ## 00000014 .L8093BA20: /* 02D50 8093BA20 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 02D54 8093BA24 01A17027 */ nor $t6, $t5, $at -/* 02D58 8093BA28 55C0002E */ bnel $t6, $zero, .L8093BAE4 +/* 02D54 8093BA24 01A17027 */ nor $t6, $t5, $at +/* 02D58 8093BA28 55C0002E */ bnel $t6, $zero, .L8093BAE4 /* 02D5C 8093BA2C A6A004FC */ sh $zero, 0x04FC($s5) ## 000004FC -/* 02D60 8093BA30 461AD102 */ mul.s $f4, $f26, $f26 +/* 02D60 8093BA30 461AD102 */ mul.s $f4, $f26, $f26 /* 02D64 8093BA34 8ED01C44 */ lw $s0, 0x1C44($s6) ## 00001C44 /* 02D68 8093BA38 26A40548 */ addiu $a0, $s5, 0x0548 ## $a0 = 00000548 /* 02D6C 8093BA3C 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 02D70 8093BA40 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02D74 8093BA44 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 -/* 02D78 8093BA48 4604A200 */ add.s $f8, $f20, $f4 -/* 02D7C 8093BA4C 46184000 */ add.s $f0, $f8, $f24 -/* 02D80 8093BA50 46000004 */ sqrt.s $f0, $f0 +/* 02D78 8093BA48 4604A200 */ add.s $f8, $f20, $f4 +/* 02D7C 8093BA4C 46184000 */ add.s $f0, $f8, $f24 +/* 02D80 8093BA50 46000004 */ sqrt.s $f0, $f0 /* 02D84 8093BA54 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D88 8093BA58 E6A0052C */ swc1 $f0, 0x052C($s5) ## 0000052C /* 02D8C 8093BA5C 26A404B0 */ addiu $a0, $s5, 0x04B0 ## $a0 = 000004B0 /* 02D90 8093BA60 8E0509BC */ lw $a1, 0x09BC($s0) ## 801309BC /* 02D94 8093BA64 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02D98 8093BA68 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D9C 8093BA6C 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02DA0 8093BA70 26A404B4 */ addiu $a0, $s5, 0x04B4 ## $a0 = 000004B4 /* 02DA4 8093BA74 8E0509C0 */ lw $a1, 0x09C0($s0) ## 801309C0 /* 02DA8 8093BA78 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02DAC 8093BA7C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02DB0 8093BA80 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02DB4 8093BA84 26A404B8 */ addiu $a0, $s5, 0x04B8 ## $a0 = 000004B8 /* 02DB8 8093BA88 8E0509C4 */ lw $a1, 0x09C4($s0) ## 801309C4 /* 02DBC 8093BA8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02DC0 8093BA90 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02DC4 8093BA94 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02DC8 8093BA98 86AF0150 */ lh $t7, 0x0150($s5) ## 00000150 /* 02DCC 8093BA9C 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 02DD0 8093BAA0 260509BC */ addiu $a1, $s0, 0x09BC ## $a1 = 801309BC /* 02DD4 8093BAA4 31F80003 */ andi $t8, $t7, 0x0003 ## $t8 = 00000000 -/* 02DD8 8093BAA8 1700000F */ bne $t8, $zero, .L8093BAE8 +/* 02DD8 8093BAA8 1700000F */ bne $t8, $zero, .L8093BAE8 /* 02DDC 8093BAAC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 02DE0 8093BAB0 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 02DE4 8093BAB4 AFA80010 */ sw $t0, 0x0010($sp) +/* 02DE4 8093BAB4 AFA80010 */ sw $t0, 0x0010($sp) /* 02DE8 8093BAB8 86B9001C */ lh $t9, 0x001C($s5) ## 0000001C /* 02DEC 8093BABC 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 02DF0 8093BAC0 240A0096 */ addiu $t2, $zero, 0x0096 ## $t2 = 00000096 -/* 02DF4 8093BAC4 AFAA001C */ sw $t2, 0x001C($sp) -/* 02DF8 8093BAC8 AFA90018 */ sw $t1, 0x0018($sp) +/* 02DF4 8093BAC4 AFAA001C */ sw $t2, 0x001C($sp) +/* 02DF8 8093BAC8 AFA90018 */ sw $t1, 0x0018($sp) /* 02DFC 8093BACC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 02E00 8093BAD0 0C24E3B0 */ jal func_80938EC0 -/* 02E04 8093BAD4 AFB90014 */ sw $t9, 0x0014($sp) -/* 02E08 8093BAD8 10000004 */ beq $zero, $zero, .L8093BAEC +/* 02E00 8093BAD0 0C24E3B0 */ jal func_80938EC0 +/* 02E04 8093BAD4 AFB90014 */ sw $t9, 0x0014($sp) +/* 02E08 8093BAD8 10000004 */ beq $zero, $zero, .L8093BAEC /* 02E0C 8093BADC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02E10 8093BAE0 A6A004FC */ sh $zero, 0x04FC($s5) ## 000004FC .L8093BAE4: @@ -660,88 +660,88 @@ glabel func_8093B1AC /* 02E1C 8093BAEC 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 /* 02E20 8093BAF0 26B10558 */ addiu $s1, $s5, 0x0558 ## $s1 = 00000558 /* 02E24 8093BAF4 02203025 */ or $a2, $s1, $zero ## $a2 = 00000558 -/* 02E28 8093BAF8 02C12021 */ addu $a0, $s6, $at +/* 02E28 8093BAF8 02C12021 */ addu $a0, $s6, $at /* 02E2C 8093BAFC 26A50530 */ addiu $a1, $s5, 0x0530 ## $a1 = 00000530 -/* 02E30 8093BB00 0C029B84 */ jal func_800A6E10 +/* 02E30 8093BB00 0C029B84 */ jal func_800A6E10 /* 02E34 8093BB04 26A700F0 */ addiu $a3, $s5, 0x00F0 ## $a3 = 000000F0 /* 02E38 8093BB08 86AB001C */ lh $t3, 0x001C($s5) ## 0000001C /* 02E3C 8093BB0C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 02E40 8093BB10 3C108013 */ lui $s0, 0x8013 ## $s0 = 80130000 -/* 02E44 8093BB14 15610015 */ bne $t3, $at, .L8093BB6C +/* 02E44 8093BB14 15610015 */ bne $t3, $at, .L8093BB6C /* 02E48 8093BB18 261033E0 */ addiu $s0, $s0, 0x33E0 ## $s0 = 801333E0 /* 02E4C 8093BB1C 3C108013 */ lui $s0, 0x8013 ## $s0 = 80130000 /* 02E50 8093BB20 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 /* 02E54 8093BB24 265233E8 */ addiu $s2, $s2, 0x33E8 ## $s2 = 801333E8 /* 02E58 8093BB28 261033E0 */ addiu $s0, $s0, 0x33E0 ## $s0 = 801333E0 /* 02E5C 8093BB2C 02003825 */ or $a3, $s0, $zero ## $a3 = 801333E0 -/* 02E60 8093BB30 AFB00010 */ sw $s0, 0x0010($sp) -/* 02E64 8093BB34 AFB20014 */ sw $s2, 0x0014($sp) +/* 02E60 8093BB30 AFB00010 */ sw $s0, 0x0010($sp) +/* 02E64 8093BB34 AFB20014 */ sw $s2, 0x0014($sp) /* 02E68 8093BB38 24043122 */ addiu $a0, $zero, 0x3122 ## $a0 = 00003122 /* 02E6C 8093BB3C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000558 /* 02E70 8093BB40 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 02E74 8093BB44 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02E78 8093BB48 24043117 */ addiu $a0, $zero, 0x3117 ## $a0 = 00003117 /* 02E7C 8093BB4C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000558 /* 02E80 8093BB50 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02E84 8093BB54 02003825 */ or $a3, $s0, $zero ## $a3 = 801333E0 -/* 02E88 8093BB58 AFB00010 */ sw $s0, 0x0010($sp) +/* 02E88 8093BB58 AFB00010 */ sw $s0, 0x0010($sp) /* 02E8C 8093BB5C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 02E90 8093BB60 AFB20014 */ sw $s2, 0x0014($sp) -/* 02E94 8093BB64 10000012 */ beq $zero, $zero, .L8093BBB0 + +/* 02E90 8093BB60 AFB20014 */ sw $s2, 0x0014($sp) +/* 02E94 8093BB64 10000012 */ beq $zero, $zero, .L8093BBB0 /* 02E98 8093BB68 26B3050C */ addiu $s3, $s5, 0x050C ## $s3 = 0000050C .L8093BB6C: /* 02E9C 8093BB6C 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 /* 02EA0 8093BB70 265233E8 */ addiu $s2, $s2, 0x33E8 ## $s2 = 801333E8 -/* 02EA4 8093BB74 AFB20014 */ sw $s2, 0x0014($sp) +/* 02EA4 8093BB74 AFB20014 */ sw $s2, 0x0014($sp) /* 02EA8 8093BB78 24043111 */ addiu $a0, $zero, 0x3111 ## $a0 = 00003111 /* 02EAC 8093BB7C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000558 /* 02EB0 8093BB80 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02EB4 8093BB84 02003825 */ or $a3, $s0, $zero ## $a3 = 801333E0 /* 02EB8 8093BB88 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 02EBC 8093BB8C AFB00010 */ sw $s0, 0x0010($sp) + +/* 02EBC 8093BB8C AFB00010 */ sw $s0, 0x0010($sp) /* 02EC0 8093BB90 24043118 */ addiu $a0, $zero, 0x3118 ## $a0 = 00003118 /* 02EC4 8093BB94 02202825 */ or $a1, $s1, $zero ## $a1 = 00000558 /* 02EC8 8093BB98 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02ECC 8093BB9C 02003825 */ or $a3, $s0, $zero ## $a3 = 801333E0 -/* 02ED0 8093BBA0 AFB00010 */ sw $s0, 0x0010($sp) +/* 02ED0 8093BBA0 AFB00010 */ sw $s0, 0x0010($sp) /* 02ED4 8093BBA4 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 02ED8 8093BBA8 AFB20014 */ sw $s2, 0x0014($sp) + +/* 02ED8 8093BBA8 AFB20014 */ sw $s2, 0x0014($sp) /* 02EDC 8093BBAC 26B3050C */ addiu $s3, $s5, 0x050C ## $s3 = 0000050C .L8093BBB0: /* 02EE0 8093BBB0 86A20178 */ lh $v0, 0x0178($s5) ## 00000178 .L8093BBB4: /* 02EE4 8093BBB4 3C048095 */ lui $a0, %hi(D_8094C840) ## $a0 = 80950000 /* 02EE8 8093BBB8 2484C840 */ addiu $a0, $a0, %lo(D_8094C840) ## $a0 = 8094C840 -/* 02EEC 8093BBBC 14400009 */ bne $v0, $zero, .L8093BBE4 +/* 02EEC 8093BBBC 14400009 */ bne $v0, $zero, .L8093BBE4 /* 02EF0 8093BBC0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02EF4 8093BBC4 80830000 */ lb $v1, 0x0000($a0) ## 8094C840 /* 02EF8 8093BBC8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02EFC 8093BBCC 10610003 */ beq $v1, $at, .L8093BBDC +/* 02EFC 8093BBCC 10610003 */ beq $v1, $at, .L8093BBDC /* 02F00 8093BBD0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02F04 8093BBD4 14610003 */ bne $v1, $at, .L8093BBE4 +/* 02F04 8093BBD4 14610003 */ bne $v1, $at, .L8093BBE4 /* 02F08 8093BBD8 00000000 */ nop .L8093BBDC: /* 02F0C 8093BBDC A0800000 */ sb $zero, 0x0000($a0) ## 8094C840 /* 02F10 8093BBE0 86A20178 */ lh $v0, 0x0178($s5) ## 00000178 .L8093BBE4: -/* 02F14 8093BBE4 1440000F */ bne $v0, $zero, .L8093BC24 +/* 02F14 8093BBE4 1440000F */ bne $v0, $zero, .L8093BC24 /* 02F18 8093BBE8 26A404F8 */ addiu $a0, $s5, 0x04F8 ## $a0 = 000004F8 -/* 02F1C 8093BBEC 4405B000 */ mfc1 $a1, $f22 +/* 02F1C 8093BBEC 4405B000 */ mfc1 $a1, $f22 /* 02F20 8093BBF0 3C073A03 */ lui $a3, 0x3A03 ## $a3 = 3A030000 /* 02F24 8093BBF4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02F28 8093BBF8 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A03126F /* 02F2C 8093BBFC C6AA04F8 */ lwc1 $f10, 0x04F8($s5) ## 000004F8 /* 02F30 8093BC00 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 02F34 8093BC04 460AB032 */ c.eq.s $f22, $f10 +/* 02F34 8093BC04 460AB032 */ c.eq.s $f22, $f10 /* 02F38 8093BC08 00000000 */ nop -/* 02F3C 8093BC0C 45020006 */ bc1fl .L8093BC28 +/* 02F3C 8093BC0C 45020006 */ bc1fl .L8093BC28 /* 02F40 8093BC10 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02F44 8093BC14 0C24F059 */ jal func_8093C164 +/* 02F44 8093BC14 0C24F059 */ jal func_8093C164 /* 02F48 8093BC18 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 /* 02F4C 8093BC1C E6B60548 */ swc1 $f22, 0x0548($s5) ## 00000548 /* 02F50 8093BC20 E6B6052C */ swc1 $f22, 0x052C($s5) ## 0000052C @@ -756,48 +756,48 @@ glabel func_8093B1AC /* 02F6C 8093BC3C C6AC048C */ lwc1 $f12, 0x048C($s5) ## 0000048C /* 02F70 8093BC40 C6AE0490 */ lwc1 $f14, 0x0490($s5) ## 00000490 /* 02F74 8093BC44 8EA60494 */ lw $a2, 0x0494($s5) ## 00000494 -/* 02F78 8093BC48 0C034261 */ jal Matrix_Translate +/* 02F78 8093BC48 0C034261 */ jal Matrix_Translate /* 02F7C 8093BC4C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02F80 8093BC50 C6AC051C */ lwc1 $f12, 0x051C($s5) ## 0000051C -/* 02F84 8093BC54 0C034348 */ jal Matrix_RotateY +/* 02F84 8093BC54 0C034348 */ jal Matrix_RotateY /* 02F88 8093BC58 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 02F8C 8093BC5C C6AC0518 */ lwc1 $f12, 0x0518($s5) ## 00000518 -/* 02F90 8093BC60 0C0342DC */ jal Matrix_RotateX +/* 02F90 8093BC60 0C0342DC */ jal Matrix_RotateX /* 02F94 8093BC64 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02F98 8093BC68 E7B60130 */ swc1 $f22, 0x0130($sp) -/* 02F9C 8093BC6C E7B60134 */ swc1 $f22, 0x0134($sp) +/* 02F98 8093BC68 E7B60130 */ swc1 $f22, 0x0130($sp) +/* 02F9C 8093BC6C E7B60134 */ swc1 $f22, 0x0134($sp) /* 02FA0 8093BC70 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 02FA4 8093BC74 44819000 */ mtc1 $at, $f18 ## $f18 = -5.00 /* 02FA8 8093BC78 C6A6052C */ lwc1 $f6, 0x052C($s5) ## 0000052C /* 02FAC 8093BC7C 27B20130 */ addiu $s2, $sp, 0x0130 ## $s2 = FFFFFFE0 /* 02FB0 8093BC80 02402025 */ or $a0, $s2, $zero ## $a0 = FFFFFFE0 -/* 02FB4 8093BC84 46123100 */ add.s $f4, $f6, $f18 +/* 02FB4 8093BC84 46123100 */ add.s $f4, $f6, $f18 /* 02FB8 8093BC88 02602825 */ or $a1, $s3, $zero ## $a1 = 0000050C -/* 02FBC 8093BC8C 0C0346BD */ jal Matrix_MultVec3f -/* 02FC0 8093BC90 E7A40138 */ swc1 $f4, 0x0138($sp) +/* 02FBC 8093BC8C 0C0346BD */ jal Matrix_MultVec3f +/* 02FC0 8093BC90 E7A40138 */ swc1 $f4, 0x0138($sp) /* 02FC4 8093BC94 86AC0440 */ lh $t4, 0x0440($s5) ## 00000440 -/* 02FC8 8093BC98 55800019 */ bnel $t4, $zero, .L8093BD00 +/* 02FC8 8093BC98 55800019 */ bnel $t4, $zero, .L8093BD00 /* 02FCC 8093BC9C 86A804FC */ lh $t0, 0x04FC($s5) ## 000004FC /* 02FD0 8093BCA0 86AD04FC */ lh $t5, 0x04FC($s5) ## 000004FC -/* 02FD4 8093BCA4 55A00016 */ bnel $t5, $zero, .L8093BD00 +/* 02FD4 8093BCA4 55A00016 */ bnel $t5, $zero, .L8093BD00 /* 02FD8 8093BCA8 86A804FC */ lh $t0, 0x04FC($s5) ## 000004FC /* 02FDC 8093BCAC 86AE0178 */ lh $t6, 0x0178($s5) ## 00000178 -/* 02FE0 8093BCB0 51C00013 */ beql $t6, $zero, .L8093BD00 +/* 02FE0 8093BCB0 51C00013 */ beql $t6, $zero, .L8093BD00 /* 02FE4 8093BCB4 86A804FC */ lh $t0, 0x04FC($s5) ## 000004FC -/* 02FE8 8093BCB8 0C24EBB6 */ jal func_8093AED8 +/* 02FE8 8093BCB8 0C24EBB6 */ jal func_8093AED8 /* 02FEC 8093BCBC 02602025 */ or $a0, $s3, $zero ## $a0 = 0000050C -/* 02FF0 8093BCC0 4600B03E */ c.le.s $f22, $f0 +/* 02FF0 8093BCC0 4600B03E */ c.le.s $f22, $f0 /* 02FF4 8093BCC4 E6A00504 */ swc1 $f0, 0x0504($s5) ## 00000504 /* 02FF8 8093BCC8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 02FFC 8093BCCC 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 03000 8093BCD0 4500000A */ bc1f .L8093BCFC +/* 03000 8093BCD0 4500000A */ bc1f .L8093BCFC /* 03004 8093BCD4 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 /* 03008 8093BCD8 C6A8050C */ lwc1 $f8, 0x050C($s5) ## 0000050C /* 0300C 8093BCDC C6AA0514 */ lwc1 $f10, 0x0514($s5) ## 00000514 /* 03010 8093BCE0 A6AF0440 */ sh $t7, 0x0440($s5) ## 00000440 /* 03014 8093BCE4 86A6001C */ lh $a2, 0x001C($s5) ## 0000001C /* 03018 8093BCE8 E6A80500 */ swc1 $f8, 0x0500($s5) ## 00000500 -/* 0301C 8093BCEC 0C24E971 */ jal func_8093A5C4 +/* 0301C 8093BCEC 0C24E971 */ jal func_8093A5C4 /* 03020 8093BCF0 E6AA0508 */ swc1 $f10, 0x0508($s5) ## 00000508 /* 03024 8093BCF4 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 /* 03028 8093BCF8 A6B80178 */ sh $t8, 0x0178($s5) ## 00000178 @@ -805,35 +805,35 @@ glabel func_8093B1AC /* 0302C 8093BCFC 86A804FC */ lh $t0, 0x04FC($s5) ## 000004FC .L8093BD00: /* 03030 8093BD00 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03034 8093BD04 5501010A */ bnel $t0, $at, .L8093C130 -/* 03038 8093BD08 8FBF0064 */ lw $ra, 0x0064($sp) +/* 03034 8093BD04 5501010A */ bnel $t0, $at, .L8093C130 +/* 03038 8093BD08 8FBF0064 */ lw $ra, 0x0064($sp) /* 0303C 8093BD0C 86B90440 */ lh $t9, 0x0440($s5) ## 00000440 -/* 03040 8093BD10 8FA40124 */ lw $a0, 0x0124($sp) +/* 03040 8093BD10 8FA40124 */ lw $a0, 0x0124($sp) /* 03044 8093BD14 26B30530 */ addiu $s3, $s5, 0x0530 ## $s3 = 00000530 -/* 03048 8093BD18 17200026 */ bne $t9, $zero, .L8093BDB4 +/* 03048 8093BD18 17200026 */ bne $t9, $zero, .L8093BDB4 /* 0304C 8093BD1C 24840A20 */ addiu $a0, $a0, 0x0A20 ## $a0 = 00000A20 /* 03050 8093BD20 27A50128 */ addiu $a1, $sp, 0x0128 ## $a1 = FFFFFFD8 -/* 03054 8093BD24 0C034833 */ jal func_800D20CC +/* 03054 8093BD24 0C034833 */ jal func_800D20CC /* 03058 8093BD28 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0305C 8093BD2C 87A50128 */ lh $a1, 0x0128($sp) -/* 03060 8093BD30 87A9012A */ lh $t1, 0x012A($sp) +/* 0305C 8093BD2C 87A50128 */ lh $a1, 0x0128($sp) +/* 03060 8093BD30 87A9012A */ lh $t1, 0x012A($sp) /* 03064 8093BD34 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 03068 8093BD38 00052823 */ subu $a1, $zero, $a1 -/* 0306C 8093BD3C 00052C00 */ sll $a1, $a1, 16 -/* 03070 8093BD40 00052C03 */ sra $a1, $a1, 16 -/* 03074 8093BD44 01215021 */ addu $t2, $t1, $at -/* 03078 8093BD48 A7AA012A */ sh $t2, 0x012A($sp) -/* 0307C 8093BD4C A7A50128 */ sh $a1, 0x0128($sp) +/* 03068 8093BD38 00052823 */ subu $a1, $zero, $a1 +/* 0306C 8093BD3C 00052C00 */ sll $a1, $a1, 16 +/* 03070 8093BD40 00052C03 */ sra $a1, $a1, 16 +/* 03074 8093BD44 01215021 */ addu $t2, $t1, $at +/* 03078 8093BD48 A7AA012A */ sh $t2, 0x012A($sp) +/* 0307C 8093BD4C A7A50128 */ sh $a1, 0x0128($sp) /* 03080 8093BD50 26A40524 */ addiu $a0, $s5, 0x0524 ## $a0 = 00000524 /* 03084 8093BD54 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 03088 8093BD58 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0308C 8093BD5C 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 03090 8093BD60 26A40526 */ addiu $a0, $s5, 0x0526 ## $a0 = 00000526 -/* 03094 8093BD64 87A5012A */ lh $a1, 0x012A($sp) +/* 03094 8093BD64 87A5012A */ lh $a1, 0x012A($sp) /* 03098 8093BD68 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 0309C 8093BD6C 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 030A0 8093BD70 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 030A4 8093BD74 86AB0524 */ lh $t3, 0x0524($s5) ## 00000524 /* 030A8 8093BD78 86AC0526 */ lh $t4, 0x0526($s5) ## 00000526 @@ -841,181 +841,181 @@ glabel func_8093B1AC /* 030B0 8093BD80 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 /* 030B4 8093BD84 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 /* 030B8 8093BD88 44810000 */ mtc1 $at, $f0 ## $f0 = 32768.00 -/* 030BC 8093BD8C 468034A0 */ cvt.s.w $f18, $f6 +/* 030BC 8093BD8C 468034A0 */ cvt.s.w $f18, $f6 /* 030C0 8093BD90 3C018095 */ lui $at, %hi(D_8094AF08) ## $at = 80950000 -/* 030C4 8093BD94 C422AF08 */ lwc1 $f2, %lo(D_8094AF08)($at) -/* 030C8 8093BD98 468051A0 */ cvt.s.w $f6, $f10 -/* 030CC 8093BD9C 46009103 */ div.s $f4, $f18, $f0 -/* 030D0 8093BDA0 46003483 */ div.s $f18, $f6, $f0 -/* 030D4 8093BDA4 46022202 */ mul.s $f8, $f4, $f2 +/* 030C4 8093BD94 C422AF08 */ lwc1 $f2, %lo(D_8094AF08)($at) +/* 030C8 8093BD98 468051A0 */ cvt.s.w $f6, $f10 +/* 030CC 8093BD9C 46009103 */ div.s $f4, $f18, $f0 +/* 030D0 8093BDA0 46003483 */ div.s $f18, $f6, $f0 +/* 030D4 8093BDA4 46022202 */ mul.s $f8, $f4, $f2 /* 030D8 8093BDA8 E6A8053C */ swc1 $f8, 0x053C($s5) ## 0000053C -/* 030DC 8093BDAC 46029102 */ mul.s $f4, $f18, $f2 +/* 030DC 8093BDAC 46029102 */ mul.s $f4, $f18, $f2 /* 030E0 8093BDB0 E6A40540 */ swc1 $f4, 0x0540($s5) ## 00000540 .L8093BDB4: /* 030E4 8093BDB4 C6AC050C */ lwc1 $f12, 0x050C($s5) ## 0000050C /* 030E8 8093BDB8 C6AE0510 */ lwc1 $f14, 0x0510($s5) ## 00000510 /* 030EC 8093BDBC 8EA60514 */ lw $a2, 0x0514($s5) ## 00000514 -/* 030F0 8093BDC0 0C034261 */ jal Matrix_Translate +/* 030F0 8093BDC0 0C034261 */ jal Matrix_Translate /* 030F4 8093BDC4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 030F8 8093BDC8 C6AC0540 */ lwc1 $f12, 0x0540($s5) ## 00000540 -/* 030FC 8093BDCC 0C034348 */ jal Matrix_RotateY +/* 030FC 8093BDCC 0C034348 */ jal Matrix_RotateY /* 03100 8093BDD0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 03104 8093BDD4 C6AC053C */ lwc1 $f12, 0x053C($s5) ## 0000053C -/* 03108 8093BDD8 0C0342DC */ jal Matrix_RotateX +/* 03108 8093BDD8 0C0342DC */ jal Matrix_RotateX /* 0310C 8093BDDC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 03110 8093BDE0 E7B60130 */ swc1 $f22, 0x0130($sp) -/* 03114 8093BDE4 E7B60134 */ swc1 $f22, 0x0134($sp) +/* 03110 8093BDE0 E7B60130 */ swc1 $f22, 0x0130($sp) +/* 03114 8093BDE4 E7B60134 */ swc1 $f22, 0x0134($sp) /* 03118 8093BDE8 3C01C32A */ lui $at, 0xC32A ## $at = C32A0000 /* 0311C 8093BDEC 44815000 */ mtc1 $at, $f10 ## $f10 = -170.00 /* 03120 8093BDF0 C6A80548 */ lwc1 $f8, 0x0548($s5) ## 00000548 /* 03124 8093BDF4 02402025 */ or $a0, $s2, $zero ## $a0 = FFFFFFE0 /* 03128 8093BDF8 02602825 */ or $a1, $s3, $zero ## $a1 = 00000530 -/* 0312C 8093BDFC 460A4180 */ add.s $f6, $f8, $f10 -/* 03130 8093BE00 0C0346BD */ jal Matrix_MultVec3f -/* 03134 8093BE04 E7A60138 */ swc1 $f6, 0x0138($sp) +/* 0312C 8093BDFC 460A4180 */ add.s $f6, $f8, $f10 +/* 03130 8093BE00 0C0346BD */ jal Matrix_MultVec3f +/* 03134 8093BE04 E7A60138 */ swc1 $f6, 0x0138($sp) /* 03138 8093BE08 86AD0440 */ lh $t5, 0x0440($s5) ## 00000440 /* 0313C 8093BE0C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 03140 8093BE10 27B100BC */ addiu $s1, $sp, 0x00BC ## $s1 = FFFFFF6C -/* 03144 8093BE14 55A00061 */ bnel $t5, $zero, .L8093BF9C +/* 03144 8093BE14 55A00061 */ bnel $t5, $zero, .L8093BF9C /* 03148 8093BE18 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 0314C 8093BE1C E7B60138 */ swc1 $f22, 0x0138($sp) +/* 0314C 8093BE1C E7B60138 */ swc1 $f22, 0x0138($sp) /* 03150 8093BE20 02402025 */ or $a0, $s2, $zero ## $a0 = FFFFFFE0 .L8093BE24: -/* 03154 8093BE24 0C0346BD */ jal Matrix_MultVec3f +/* 03154 8093BE24 0C0346BD */ jal Matrix_MultVec3f /* 03158 8093BE28 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFF6C -/* 0315C 8093BE2C 0C24EBB6 */ jal func_8093AED8 +/* 0315C 8093BE2C 0C24EBB6 */ jal func_8093AED8 /* 03160 8093BE30 02202025 */ or $a0, $s1, $zero ## $a0 = FFFFFF6C -/* 03164 8093BE34 4600B03E */ c.le.s $f22, $f0 +/* 03164 8093BE34 4600B03E */ c.le.s $f22, $f0 /* 03168 8093BE38 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 0316C 8093BE3C E6A00504 */ swc1 $f0, 0x0504($s5) ## 00000504 -/* 03170 8093BE40 00108400 */ sll $s0, $s0, 16 -/* 03174 8093BE44 45000049 */ bc1f .L8093BF6C -/* 03178 8093BE48 C7A80138 */ lwc1 $f8, 0x0138($sp) +/* 03170 8093BE40 00108400 */ sll $s0, $s0, 16 +/* 03174 8093BE44 45000049 */ bc1f .L8093BF6C +/* 03178 8093BE48 C7A80138 */ lwc1 $f8, 0x0138($sp) /* 0317C 8093BE4C 3C01420C */ lui $at, 0x420C ## $at = 420C0000 /* 03180 8093BE50 44819000 */ mtc1 $at, $f18 ## $f18 = 35.00 /* 03184 8093BE54 C6A40504 */ lwc1 $f4, 0x0504($s5) ## 00000504 /* 03188 8093BE58 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 0318C 8093BE5C 27B200A4 */ addiu $s2, $sp, 0x00A4 ## $s2 = FFFFFF54 -/* 03190 8093BE60 46049032 */ c.eq.s $f18, $f4 +/* 03190 8093BE60 46049032 */ c.eq.s $f18, $f4 /* 03194 8093BE64 27B100B0 */ addiu $s1, $sp, 0x00B0 ## $s1 = FFFFFF60 -/* 03198 8093BE68 45010016 */ bc1t .L8093BEC4 +/* 03198 8093BE68 45010016 */ bc1t .L8093BEC4 /* 0319C 8093BE6C 00000000 */ nop /* 031A0 8093BE70 C6A8053C */ lwc1 $f8, 0x053C($s5) ## 0000053C -/* 031A4 8093BE74 4608B03C */ c.lt.s $f22, $f8 +/* 031A4 8093BE74 4608B03C */ c.lt.s $f22, $f8 /* 031A8 8093BE78 00000000 */ nop -/* 031AC 8093BE7C 45000011 */ bc1f .L8093BEC4 +/* 031AC 8093BE7C 45000011 */ bc1f .L8093BEC4 /* 031B0 8093BE80 00000000 */ nop /* 031B4 8093BE84 86AE0178 */ lh $t6, 0x0178($s5) ## 00000178 /* 031B8 8093BE88 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 031BC 8093BE8C 11C0000D */ beq $t6, $zero, .L8093BEC4 +/* 031BC 8093BE8C 11C0000D */ beq $t6, $zero, .L8093BEC4 /* 031C0 8093BE90 00000000 */ nop /* 031C4 8093BE94 A6AF0440 */ sh $t7, 0x0440($s5) ## 00000440 -/* 031C8 8093BE98 C7AA00BC */ lwc1 $f10, 0x00BC($sp) +/* 031C8 8093BE98 C7AA00BC */ lwc1 $f10, 0x00BC($sp) /* 031CC 8093BE9C 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 031D0 8093BEA0 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 /* 031D4 8093BEA4 E6AA0500 */ swc1 $f10, 0x0500($s5) ## 00000500 -/* 031D8 8093BEA8 C7A600C4 */ lwc1 $f6, 0x00C4($sp) +/* 031D8 8093BEA8 C7A600C4 */ lwc1 $f6, 0x00C4($sp) /* 031DC 8093BEAC 86A6001C */ lh $a2, 0x001C($s5) ## 0000001C -/* 031E0 8093BEB0 0C24E971 */ jal func_8093A5C4 +/* 031E0 8093BEB0 0C24E971 */ jal func_8093A5C4 /* 031E4 8093BEB4 E6A60508 */ swc1 $f6, 0x0508($s5) ## 00000508 /* 031E8 8093BEB8 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 031EC 8093BEBC 10000036 */ beq $zero, $zero, .L8093BF98 +/* 031EC 8093BEBC 10000036 */ beq $zero, $zero, .L8093BF98 /* 031F0 8093BEC0 A6B80178 */ sh $t8, 0x0178($s5) ## 00000178 .L8093BEC4: /* 031F4 8093BEC4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 031F8 8093BEC8 4600D306 */ mov.s $f12, $f26 -/* 031FC 8093BECC E7A000B0 */ swc1 $f0, 0x00B0($sp) + +/* 031F8 8093BEC8 4600D306 */ mov.s $f12, $f26 +/* 031FC 8093BECC E7A000B0 */ swc1 $f0, 0x00B0($sp) /* 03200 8093BED0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 03204 8093BED4 4600D306 */ mov.s $f12, $f26 -/* 03208 8093BED8 E7A000B4 */ swc1 $f0, 0x00B4($sp) + +/* 03204 8093BED4 4600D306 */ mov.s $f12, $f26 +/* 03208 8093BED8 E7A000B4 */ swc1 $f0, 0x00B4($sp) /* 0320C 8093BEDC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 03210 8093BEE0 4600D306 */ mov.s $f12, $f26 -/* 03214 8093BEE4 E7A000B8 */ swc1 $f0, 0x00B8($sp) -/* 03218 8093BEE8 E7B600A4 */ swc1 $f22, 0x00A4($sp) -/* 0321C 8093BEEC E7B600A8 */ swc1 $f22, 0x00A8($sp) -/* 03220 8093BEF0 E7B600AC */ swc1 $f22, 0x00AC($sp) + +/* 03210 8093BEE0 4600D306 */ mov.s $f12, $f26 +/* 03214 8093BEE4 E7A000B8 */ swc1 $f0, 0x00B8($sp) +/* 03218 8093BEE8 E7B600A4 */ swc1 $f22, 0x00A4($sp) +/* 0321C 8093BEEC E7B600A8 */ swc1 $f22, 0x00A8($sp) +/* 03220 8093BEF0 E7B600AC */ swc1 $f22, 0x00AC($sp) /* 03224 8093BEF4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 03228 8093BEF8 4600A306 */ mov.s $f12, $f20 -/* 0322C 8093BEFC 46180480 */ add.s $f18, $f0, $f24 + +/* 03228 8093BEF8 4600A306 */ mov.s $f12, $f20 +/* 0322C 8093BEFC 46180480 */ add.s $f18, $f0, $f24 /* 03230 8093BF00 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 03234 8093BF04 02602825 */ or $a1, $s3, $zero ## $a1 = 00000530 /* 03238 8093BF08 02203025 */ or $a2, $s1, $zero ## $a2 = FFFFFF60 -/* 0323C 8093BF0C E7B20010 */ swc1 $f18, 0x0010($sp) +/* 0323C 8093BF0C E7B20010 */ swc1 $f18, 0x0010($sp) /* 03240 8093BF10 86A8001C */ lh $t0, 0x001C($s5) ## 0000001C /* 03244 8093BF14 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFF54 -/* 03248 8093BF18 0C24E41C */ jal func_80939070 -/* 0324C 8093BF1C AFA80014 */ sw $t0, 0x0014($sp) +/* 03248 8093BF18 0C24E41C */ jal func_80939070 +/* 0324C 8093BF1C AFA80014 */ sw $t0, 0x0014($sp) /* 03250 8093BF20 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 03254 8093BF24 00108400 */ sll $s0, $s0, 16 -/* 03258 8093BF28 00108403 */ sra $s0, $s0, 16 -/* 0325C 8093BF2C 2A010005 */ slti $at, $s0, 0x0005 -/* 03260 8093BF30 1420FFE4 */ bne $at, $zero, .L8093BEC4 +/* 03254 8093BF24 00108400 */ sll $s0, $s0, 16 +/* 03258 8093BF28 00108403 */ sra $s0, $s0, 16 +/* 0325C 8093BF2C 2A010005 */ slti $at, $s0, 0x0005 +/* 03260 8093BF30 1420FFE4 */ bne $at, $zero, .L8093BEC4 /* 03264 8093BF34 00000000 */ nop -/* 03268 8093BF38 C7A40138 */ lwc1 $f4, 0x0138($sp) +/* 03268 8093BF38 C7A40138 */ lwc1 $f4, 0x0138($sp) /* 0326C 8093BF3C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03270 8093BF40 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 03274 8093BF44 3C053F4C */ lui $a1, 0x3F4C ## $a1 = 3F4C0000 /* 03278 8093BF48 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 /* 0327C 8093BF4C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 03280 8093BF50 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3F4CCCCD -/* 03284 8093BF54 02C12021 */ addu $a0, $s6, $at +/* 03284 8093BF54 02C12021 */ addu $a0, $s6, $at /* 03288 8093BF58 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0328C 8093BF5C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03290 8093BF60 E6A40548 */ swc1 $f4, 0x0548($s5) ## 00000548 -/* 03294 8093BF64 1000000D */ beq $zero, $zero, .L8093BF9C +/* 03294 8093BF64 1000000D */ beq $zero, $zero, .L8093BF9C /* 03298 8093BF68 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 .L8093BF6C: -/* 0329C 8093BF6C 461A4280 */ add.s $f10, $f8, $f26 -/* 032A0 8093BF70 00108403 */ sra $s0, $s0, 16 -/* 032A4 8093BF74 2A0100C8 */ slti $at, $s0, 0x00C8 -/* 032A8 8093BF78 E7AA0138 */ swc1 $f10, 0x0138($sp) +/* 0329C 8093BF6C 461A4280 */ add.s $f10, $f8, $f26 +/* 032A0 8093BF70 00108403 */ sra $s0, $s0, 16 +/* 032A4 8093BF74 2A0100C8 */ slti $at, $s0, 0x00C8 +/* 032A8 8093BF78 E7AA0138 */ swc1 $f10, 0x0138($sp) /* 032AC 8093BF7C C6A60548 */ lwc1 $f6, 0x0548($s5) ## 00000548 -/* 032B0 8093BF80 460A303C */ c.lt.s $f6, $f10 +/* 032B0 8093BF80 460A303C */ c.lt.s $f6, $f10 /* 032B4 8093BF84 00000000 */ nop -/* 032B8 8093BF88 45030004 */ bc1tl .L8093BF9C +/* 032B8 8093BF88 45030004 */ bc1tl .L8093BF9C /* 032BC 8093BF8C 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 032C0 8093BF90 5420FFA4 */ bnel $at, $zero, .L8093BE24 +/* 032C0 8093BF90 5420FFA4 */ bnel $at, $zero, .L8093BE24 /* 032C4 8093BF94 02402025 */ or $a0, $s2, $zero ## $a0 = FFFFFF54 .L8093BF98: /* 032C8 8093BF98 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 .L8093BF9C: -/* 032CC 8093BF9C 0C24EB6D */ jal func_8093ADB4 +/* 032CC 8093BF9C 0C24EB6D */ jal func_8093ADB4 /* 032D0 8093BFA0 26A50024 */ addiu $a1, $s5, 0x0024 ## $a1 = 00000024 -/* 032D4 8093BFA4 50400012 */ beql $v0, $zero, .L8093BFF0 -/* 032D8 8093BFA8 8FA50120 */ lw $a1, 0x0120($sp) +/* 032D4 8093BFA4 50400012 */ beql $v0, $zero, .L8093BFF0 +/* 032D8 8093BFA8 8FA50120 */ lw $a1, 0x0120($sp) /* 032DC 8093BFAC 86B90150 */ lh $t9, 0x0150($s5) ## 00000150 /* 032E0 8093BFB0 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 032E4 8093BFB4 02602825 */ or $a1, $s3, $zero ## $a1 = 00000530 /* 032E8 8093BFB8 33290003 */ andi $t1, $t9, 0x0003 ## $t1 = 00000000 -/* 032EC 8093BFBC 1520000B */ bne $t1, $zero, .L8093BFEC +/* 032EC 8093BFBC 1520000B */ bne $t1, $zero, .L8093BFEC /* 032F0 8093BFC0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 032F4 8093BFC4 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 032F8 8093BFC8 AFAA0010 */ sw $t2, 0x0010($sp) +/* 032F8 8093BFC8 AFAA0010 */ sw $t2, 0x0010($sp) /* 032FC 8093BFCC 86AB001C */ lh $t3, 0x001C($s5) ## 0000001C /* 03300 8093BFD0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 03304 8093BFD4 240D0096 */ addiu $t5, $zero, 0x0096 ## $t5 = 00000096 -/* 03308 8093BFD8 AFAD001C */ sw $t5, 0x001C($sp) -/* 0330C 8093BFDC AFAC0018 */ sw $t4, 0x0018($sp) +/* 03308 8093BFD8 AFAD001C */ sw $t5, 0x001C($sp) +/* 0330C 8093BFDC AFAC0018 */ sw $t4, 0x0018($sp) /* 03310 8093BFE0 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 03314 8093BFE4 0C24E3B0 */ jal func_80938EC0 -/* 03318 8093BFE8 AFAB0014 */ sw $t3, 0x0014($sp) +/* 03314 8093BFE4 0C24E3B0 */ jal func_80938EC0 +/* 03318 8093BFE8 AFAB0014 */ sw $t3, 0x0014($sp) .L8093BFEC: -/* 0331C 8093BFEC 8FA50120 */ lw $a1, 0x0120($sp) +/* 0331C 8093BFEC 8FA50120 */ lw $a1, 0x0120($sp) .L8093BFF0: /* 03320 8093BFF0 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 03324 8093BFF4 0C24EB6D */ jal func_8093ADB4 +/* 03324 8093BFF4 0C24EB6D */ jal func_8093ADB4 /* 03328 8093BFF8 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 0332C 8093BFFC 1040004B */ beq $v0, $zero, .L8093C12C -/* 03330 8093C000 8FAF0120 */ lw $t7, 0x0120($sp) +/* 0332C 8093BFFC 1040004B */ beq $v0, $zero, .L8093C12C +/* 03330 8093C000 8FAF0120 */ lw $t7, 0x0120($sp) /* 03334 8093C004 8DF8014C */ lw $t8, 0x014C($t7) ## 0000014C /* 03338 8093C008 3C0E8094 */ lui $t6, %hi(func_8093C2C4) ## $t6 = 80940000 /* 0333C 8093C00C 25CEC2C4 */ addiu $t6, $t6, %lo(func_8093C2C4) ## $t6 = 8093C2C4 -/* 03340 8093C010 11D80046 */ beq $t6, $t8, .L8093C12C +/* 03340 8093C010 11D80046 */ beq $t6, $t8, .L8093C12C /* 03344 8093C014 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 03348 8093C018 27B30080 */ addiu $s3, $sp, 0x0080 ## $s3 = FFFFFF30 /* 0334C 8093C01C 27B2008C */ addiu $s2, $sp, 0x008C ## $s2 = FFFFFF3C @@ -1024,92 +1024,92 @@ glabel func_8093B1AC .L8093C028: /* 03358 8093C028 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0335C 8093C02C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 03360 8093C030 00000000 */ nop -/* 03364 8093C034 8FA80120 */ lw $t0, 0x0120($sp) +/* 03364 8093C034 8FA80120 */ lw $t0, 0x0120($sp) /* 03368 8093C038 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0336C 8093C03C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 03370 8093C040 C5120024 */ lwc1 $f18, 0x0024($t0) ## 00000024 -/* 03374 8093C044 46120100 */ add.s $f4, $f0, $f18 +/* 03374 8093C044 46120100 */ add.s $f4, $f0, $f18 /* 03378 8093C048 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0337C 8093C04C E7A40098 */ swc1 $f4, 0x0098($sp) -/* 03380 8093C050 8FB90120 */ lw $t9, 0x0120($sp) + +/* 0337C 8093C04C E7A40098 */ swc1 $f4, 0x0098($sp) +/* 03380 8093C050 8FB90120 */ lw $t9, 0x0120($sp) /* 03384 8093C054 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 03388 8093C058 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0338C 8093C05C C7280028 */ lwc1 $f8, 0x0028($t9) ## 00000028 -/* 03390 8093C060 46080180 */ add.s $f6, $f0, $f8 +/* 03390 8093C060 46080180 */ add.s $f6, $f0, $f8 /* 03394 8093C064 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 03398 8093C068 E7A6009C */ swc1 $f6, 0x009C($sp) -/* 0339C 8093C06C 8FA90120 */ lw $t1, 0x0120($sp) -/* 033A0 8093C070 4600D306 */ mov.s $f12, $f26 + +/* 03398 8093C068 E7A6009C */ swc1 $f6, 0x009C($sp) +/* 0339C 8093C06C 8FA90120 */ lw $t1, 0x0120($sp) +/* 033A0 8093C070 4600D306 */ mov.s $f12, $f26 /* 033A4 8093C074 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C -/* 033A8 8093C078 460A0480 */ add.s $f18, $f0, $f10 +/* 033A8 8093C078 460A0480 */ add.s $f18, $f0, $f10 /* 033AC 8093C07C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 033B0 8093C080 E7B200A0 */ swc1 $f18, 0x00A0($sp) -/* 033B4 8093C084 E7A0008C */ swc1 $f0, 0x008C($sp) + +/* 033B0 8093C080 E7B200A0 */ swc1 $f18, 0x00A0($sp) +/* 033B4 8093C084 E7A0008C */ swc1 $f0, 0x008C($sp) /* 033B8 8093C088 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 033BC 8093C08C 4600D306 */ mov.s $f12, $f26 -/* 033C0 8093C090 E7A00090 */ swc1 $f0, 0x0090($sp) + +/* 033BC 8093C08C 4600D306 */ mov.s $f12, $f26 +/* 033C0 8093C090 E7A00090 */ swc1 $f0, 0x0090($sp) /* 033C4 8093C094 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 033C8 8093C098 4600D306 */ mov.s $f12, $f26 -/* 033CC 8093C09C E7A00094 */ swc1 $f0, 0x0094($sp) -/* 033D0 8093C0A0 E7B60080 */ swc1 $f22, 0x0080($sp) -/* 033D4 8093C0A4 E7B60084 */ swc1 $f22, 0x0084($sp) -/* 033D8 8093C0A8 E7B60088 */ swc1 $f22, 0x0088($sp) + +/* 033C8 8093C098 4600D306 */ mov.s $f12, $f26 +/* 033CC 8093C09C E7A00094 */ swc1 $f0, 0x0094($sp) +/* 033D0 8093C0A0 E7B60080 */ swc1 $f22, 0x0080($sp) +/* 033D4 8093C0A4 E7B60084 */ swc1 $f22, 0x0084($sp) +/* 033D8 8093C0A8 E7B60088 */ swc1 $f22, 0x0088($sp) /* 033DC 8093C0AC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 033E0 8093C0B0 4600A306 */ mov.s $f12, $f20 -/* 033E4 8093C0B4 46180100 */ add.s $f4, $f0, $f24 + +/* 033E0 8093C0B0 4600A306 */ mov.s $f12, $f20 +/* 033E4 8093C0B4 46180100 */ add.s $f4, $f0, $f24 /* 033E8 8093C0B8 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 033EC 8093C0BC 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFF48 /* 033F0 8093C0C0 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFF3C -/* 033F4 8093C0C4 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 033F4 8093C0C4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 033F8 8093C0C8 86AA001C */ lh $t2, 0x001C($s5) ## 0000001C /* 033FC 8093C0CC 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFF30 -/* 03400 8093C0D0 0C24E41C */ jal func_80939070 -/* 03404 8093C0D4 AFAA0014 */ sw $t2, 0x0014($sp) +/* 03400 8093C0D0 0C24E41C */ jal func_80939070 +/* 03404 8093C0D4 AFAA0014 */ sw $t2, 0x0014($sp) /* 03408 8093C0D8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0340C 8093C0DC 00108400 */ sll $s0, $s0, 16 -/* 03410 8093C0E0 00108403 */ sra $s0, $s0, 16 -/* 03414 8093C0E4 2A010032 */ slti $at, $s0, 0x0032 -/* 03418 8093C0E8 5420FFCF */ bnel $at, $zero, .L8093C028 +/* 0340C 8093C0DC 00108400 */ sll $s0, $s0, 16 +/* 03410 8093C0E0 00108403 */ sra $s0, $s0, 16 +/* 03414 8093C0E4 2A010032 */ slti $at, $s0, 0x0032 +/* 03418 8093C0E8 5420FFCF */ bnel $at, $zero, .L8093C028 /* 0341C 8093C0EC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 03420 8093C0F0 8FA40120 */ lw $a0, 0x0120($sp) -/* 03424 8093C0F4 0C24F097 */ jal func_8093C25C +/* 03420 8093C0F0 8FA40120 */ lw $a0, 0x0120($sp) +/* 03424 8093C0F4 0C24F097 */ jal func_8093C25C /* 03428 8093C0F8 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 -/* 0342C 8093C0FC 8FA40120 */ lw $a0, 0x0120($sp) +/* 0342C 8093C0FC 8FA40120 */ lw $a0, 0x0120($sp) /* 03430 8093C100 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03434 8093C104 24053916 */ addiu $a1, $zero, 0x3916 ## $a1 = 00003916 /* 03438 8093C108 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0343C 8093C10C 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 /* 03440 8093C110 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03444 8093C114 00360821 */ addu $at, $at, $s6 +/* 03444 8093C114 00360821 */ addu $at, $at, $s6 /* 03448 8093C118 E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC -/* 0344C 8093C11C 8FAB0120 */ lw $t3, 0x0120($sp) +/* 0344C 8093C11C 8FAB0120 */ lw $t3, 0x0120($sp) /* 03450 8093C120 916C00AF */ lbu $t4, 0x00AF($t3) ## 000000AF /* 03454 8093C124 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 /* 03458 8093C128 A16D00AF */ sb $t5, 0x00AF($t3) ## 000000AF .L8093C12C: -/* 0345C 8093C12C 8FBF0064 */ lw $ra, 0x0064($sp) +/* 0345C 8093C12C 8FBF0064 */ lw $ra, 0x0064($sp) .L8093C130: -/* 03460 8093C130 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 03464 8093C134 D7B60030 */ ldc1 $f22, 0x0030($sp) -/* 03468 8093C138 D7B80038 */ ldc1 $f24, 0x0038($sp) -/* 0346C 8093C13C D7BA0040 */ ldc1 $f26, 0x0040($sp) -/* 03470 8093C140 8FB00048 */ lw $s0, 0x0048($sp) -/* 03474 8093C144 8FB1004C */ lw $s1, 0x004C($sp) -/* 03478 8093C148 8FB20050 */ lw $s2, 0x0050($sp) -/* 0347C 8093C14C 8FB30054 */ lw $s3, 0x0054($sp) -/* 03480 8093C150 8FB40058 */ lw $s4, 0x0058($sp) -/* 03484 8093C154 8FB5005C */ lw $s5, 0x005C($sp) -/* 03488 8093C158 8FB60060 */ lw $s6, 0x0060($sp) -/* 0348C 8093C15C 03E00008 */ jr $ra +/* 03460 8093C130 D7B40028 */ ldc1 $f20, 0x0028($sp) +/* 03464 8093C134 D7B60030 */ ldc1 $f22, 0x0030($sp) +/* 03468 8093C138 D7B80038 */ ldc1 $f24, 0x0038($sp) +/* 0346C 8093C13C D7BA0040 */ ldc1 $f26, 0x0040($sp) +/* 03470 8093C140 8FB00048 */ lw $s0, 0x0048($sp) +/* 03474 8093C144 8FB1004C */ lw $s1, 0x004C($sp) +/* 03478 8093C148 8FB20050 */ lw $s2, 0x0050($sp) +/* 0347C 8093C14C 8FB30054 */ lw $s3, 0x0054($sp) +/* 03480 8093C150 8FB40058 */ lw $s4, 0x0058($sp) +/* 03484 8093C154 8FB5005C */ lw $s5, 0x005C($sp) +/* 03488 8093C158 8FB60060 */ lw $s6, 0x0060($sp) +/* 0348C 8093C15C 03E00008 */ jr $ra /* 03490 8093C160 27BD0150 */ addiu $sp, $sp, 0x0150 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s index 4176c72e93..1187f3e5db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s @@ -1,8 +1,8 @@ glabel func_8093C79C /* 03ACC 8093C79C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 03AD0 8093C7A0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03AD4 8093C7A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03AD8 8093C7A8 AFA5001C */ sw $a1, 0x001C($sp) +/* 03AD4 8093C7A4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03AD8 8093C7A8 AFA5001C */ sw $a1, 0x001C($sp) /* 03ADC 8093C7AC 3C0E8094 */ lui $t6, %hi(func_8093C7E4) ## $t6 = 80940000 /* 03AE0 8093C7B0 25CEC7E4 */ addiu $t6, $t6, %lo(func_8093C7E4) ## $t6 = 8093C7E4 /* 03AE4 8093C7B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 @@ -11,11 +11,11 @@ glabel func_8093C79C /* 03AF0 8093C7C0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 03AF4 8093C7C4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 03AF8 8093C7C8 E480FF60 */ swc1 $f0, -0x00A0($a0) ## 000004C8 -/* 03AFC 8093C7CC 0C0294D3 */ jal func_800A534C +/* 03AFC 8093C7CC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 03B00 8093C7D0 E480FB00 */ swc1 $f0, -0x0500($a0) ## 00000068 -/* 03B04 8093C7D4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03B04 8093C7D4 8FBF0014 */ lw $ra, 0x0014($sp) /* 03B08 8093C7D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03B0C 8093C7DC 03E00008 */ jr $ra +/* 03B0C 8093C7DC 03E00008 */ jr $ra /* 03B10 8093C7E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s index efa7d873e3..8e555b5ece 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s @@ -1,92 +1,92 @@ glabel func_8093C910 /* 03C40 8093C910 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 03C44 8093C914 AFBF003C */ sw $ra, 0x003C($sp) -/* 03C48 8093C918 AFB20038 */ sw $s2, 0x0038($sp) -/* 03C4C 8093C91C AFB10034 */ sw $s1, 0x0034($sp) -/* 03C50 8093C920 AFB00030 */ sw $s0, 0x0030($sp) -/* 03C54 8093C924 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 03C58 8093C928 F7B40020 */ sdc1 $f20, 0x0020($sp) +/* 03C44 8093C914 AFBF003C */ sw $ra, 0x003C($sp) +/* 03C48 8093C918 AFB20038 */ sw $s2, 0x0038($sp) +/* 03C4C 8093C91C AFB10034 */ sw $s1, 0x0034($sp) +/* 03C50 8093C920 AFB00030 */ sw $s0, 0x0030($sp) +/* 03C54 8093C924 F7B60028 */ sdc1 $f22, 0x0028($sp) +/* 03C58 8093C928 F7B40020 */ sdc1 $f20, 0x0020($sp) /* 03C5C 8093C92C 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 03C60 8093C930 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 03C64 8093C934 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 03C68 8093C938 AFAE00A0 */ sw $t6, 0x00A0($sp) +/* 03C68 8093C938 AFAE00A0 */ sw $t6, 0x00A0($sp) /* 03C6C 8093C93C 848205FA */ lh $v0, 0x05FA($a0) ## 000005FA /* 03C70 8093C940 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 03C74 8093C944 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 03C78 8093C948 1040000A */ beq $v0, $zero, .L8093C974 +/* 03C78 8093C948 1040000A */ beq $v0, $zero, .L8093C974 /* 03C7C 8093C94C 26451D64 */ addiu $a1, $s2, 0x1D64 ## $a1 = 00001D64 /* 03C80 8093C950 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03C84 8093C954 10410034 */ beq $v0, $at, .L8093CA28 +/* 03C84 8093C954 10410034 */ beq $v0, $at, .L8093CA28 /* 03C88 8093C958 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03C8C 8093C95C 10410069 */ beq $v0, $at, .L8093CB04 +/* 03C8C 8093C95C 10410069 */ beq $v0, $at, .L8093CB04 /* 03C90 8093C960 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03C94 8093C964 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 /* 03C98 8093C968 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 -/* 03C9C 8093C96C 100000A6 */ beq $zero, $zero, .L8093CC08 +/* 03C9C 8093C96C 100000A6 */ beq $zero, $zero, .L8093CC08 /* 03CA0 8093C970 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC .L8093C974: -/* 03CA4 8093C974 0C019148 */ jal func_80064520 +/* 03CA4 8093C974 0C019148 */ jal func_80064520 /* 03CA8 8093C978 A62F05FA */ sh $t7, 0x05FA($s1) ## 000005FA /* 03CAC 8093C97C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03CB0 8093C980 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03CB4 8093C984 0C00B7D5 */ jal func_8002DF54 +/* 03CB4 8093C984 0C00B7D5 */ jal func_8002DF54 /* 03CB8 8093C988 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 -/* 03CBC 8093C98C 0C03008C */ jal func_800C0230 +/* 03CBC 8093C98C 0C03008C */ jal func_800C0230 /* 03CC0 8093C990 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03CC4 8093C994 A62205FC */ sh $v0, 0x05FC($s1) ## 000005FC /* 03CC8 8093C998 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03CCC 8093C99C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03CD0 8093C9A0 0C0300C5 */ jal func_800C0314 +/* 03CD0 8093C9A0 0C0300C5 */ jal func_800C0314 /* 03CD4 8093C9A4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03CD8 8093C9A8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03CDC 8093C9AC 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC -/* 03CE0 8093C9B0 0C0300C5 */ jal func_800C0314 +/* 03CE0 8093C9B0 0C0300C5 */ jal func_800C0314 /* 03CE4 8093C9B4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03CE8 8093C9B8 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 03CEC 8093C9BC 44812000 */ mtc1 $at, $f4 ## $f4 = 800.00 /* 03CF0 8093C9C0 3C018095 */ lui $at, %hi(D_8094AF10) ## $at = 80950000 /* 03CF4 8093C9C4 3C188095 */ lui $t8, %hi(D_8094C848) ## $t8 = 80950000 /* 03CF8 8093C9C8 E62406A4 */ swc1 $f4, 0x06A4($s1) ## 000006A4 -/* 03CFC 8093C9CC C426AF10 */ lwc1 $f6, %lo(D_8094AF10)($at) +/* 03CFC 8093C9CC C426AF10 */ lwc1 $f6, %lo(D_8094AF10)($at) /* 03D00 8093C9D0 3C198095 */ lui $t9, %hi(D_8094C848) ## $t9 = 80950000 /* 03D04 8093C9D4 3C088095 */ lui $t0, %hi(D_8094C844) ## $t0 = 80950000 /* 03D08 8093C9D8 E62606AC */ swc1 $f6, 0x06AC($s1) ## 000006AC -/* 03D0C 8093C9DC 8F18C848 */ lw $t8, %lo(D_8094C848)($t8) +/* 03D0C 8093C9DC 8F18C848 */ lw $t8, %lo(D_8094C848)($t8) /* 03D10 8093C9E0 3C098095 */ lui $t1, %hi(D_8094C844) ## $t1 = 80950000 /* 03D14 8093C9E4 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 /* 03D18 8093C9E8 A7000030 */ sh $zero, 0x0030($t8) ## 80950030 -/* 03D1C 8093C9EC 8F39C848 */ lw $t9, %lo(D_8094C848)($t9) +/* 03D1C 8093C9EC 8F39C848 */ lw $t9, %lo(D_8094C848)($t9) /* 03D20 8093C9F0 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 03D24 8093C9F4 44814000 */ mtc1 $at, $f8 ## $f8 = 600.00 /* 03D28 8093C9F8 A72000B4 */ sh $zero, 0x00B4($t9) ## 809500B4 -/* 03D2C 8093C9FC 8D08C844 */ lw $t0, %lo(D_8094C844)($t0) +/* 03D2C 8093C9FC 8D08C844 */ lw $t0, %lo(D_8094C844)($t0) /* 03D30 8093CA00 3C0410C8 */ lui $a0, 0x10C8 ## $a0 = 10C80000 /* 03D34 8093CA04 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 10C800FF /* 03D38 8093CA08 A5000030 */ sh $zero, 0x0030($t0) ## 80950030 -/* 03D3C 8093CA0C 8D29C844 */ lw $t1, %lo(D_8094C844)($t1) +/* 03D3C 8093CA0C 8D29C844 */ lw $t1, %lo(D_8094C844)($t1) /* 03D40 8093CA10 A52000B4 */ sh $zero, 0x00B4($t1) ## 809500B4 /* 03D44 8093CA14 E63601A8 */ swc1 $f22, 0x01A8($s1) ## 000001A8 /* 03D48 8093CA18 E63601AC */ swc1 $f22, 0x01AC($s1) ## 000001AC /* 03D4C 8093CA1C 0C03E803 */ jal Audio_SetBGM - + /* 03D50 8093CA20 E62801B0 */ swc1 $f8, 0x01B0($s1) ## 000001B0 /* 03D54 8093CA24 A6200152 */ sh $zero, 0x0152($s1) ## 00000152 .L8093CA28: /* 03D58 8093CA28 86220152 */ lh $v0, 0x0152($s1) ## 00000152 /* 03D5C 8093CA2C 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 /* 03D60 8093CA30 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 03D64 8093CA34 14410005 */ bne $v0, $at, .L8093CA4C +/* 03D64 8093CA34 14410005 */ bne $v0, $at, .L8093CA4C /* 03D68 8093CA38 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03D6C 8093CA3C 24056059 */ addiu $a1, $zero, 0x6059 ## $a1 = 00006059 -/* 03D70 8093CA40 0C042DA0 */ jal func_8010B680 +/* 03D70 8093CA40 0C042DA0 */ jal func_8010B680 /* 03D74 8093CA44 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 03D78 8093CA48 86220152 */ lh $v0, 0x0152($s1) ## 00000152 .L8093CA4C: /* 03D7C 8093CA4C 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -/* 03D80 8093CA50 14410004 */ bne $v0, $at, .L8093CA64 +/* 03D80 8093CA50 14410004 */ bne $v0, $at, .L8093CA64 /* 03D84 8093CA54 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03D88 8093CA58 2405605A */ addiu $a1, $zero, 0x605A ## $a1 = 0000605A -/* 03D8C 8093CA5C 0C042DA0 */ jal func_8010B680 +/* 03D8C 8093CA5C 0C042DA0 */ jal func_8010B680 /* 03D90 8093CA60 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 .L8093CA64: /* 03D94 8093CA64 3C0143DC */ lui $at, 0x43DC ## $at = 43DC0000 @@ -94,23 +94,23 @@ glabel func_8093C910 /* 03D9C 8093CA6C E636060C */ swc1 $f22, 0x060C($s1) ## 0000060C /* 03DA0 8093CA70 E6360614 */ swc1 $f22, 0x0614($s1) ## 00000614 /* 03DA4 8093CA74 E62A0610 */ swc1 $f10, 0x0610($s1) ## 00000610 -/* 03DA8 8093CA78 E7B600B0 */ swc1 $f22, 0x00B0($sp) -/* 03DAC 8093CA7C E7B600B4 */ swc1 $f22, 0x00B4($sp) +/* 03DA8 8093CA78 E7B600B0 */ swc1 $f22, 0x00B0($sp) +/* 03DAC 8093CA7C E7B600B4 */ swc1 $f22, 0x00B4($sp) /* 03DB0 8093CA80 C63006A4 */ lwc1 $f16, 0x06A4($s1) ## 000006A4 /* 03DB4 8093CA84 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03DB8 8093CA88 E7B000B8 */ swc1 $f16, 0x00B8($sp) -/* 03DBC 8093CA8C 0C034348 */ jal Matrix_RotateY +/* 03DB8 8093CA88 E7B000B8 */ swc1 $f16, 0x00B8($sp) +/* 03DBC 8093CA8C 0C034348 */ jal Matrix_RotateY /* 03DC0 8093CA90 C62C06AC */ lwc1 $f12, 0x06AC($s1) ## 000006AC /* 03DC4 8093CA94 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFF0 -/* 03DC8 8093CA98 0C0346BD */ jal Matrix_MultVec3f +/* 03DC8 8093CA98 0C0346BD */ jal Matrix_MultVec3f /* 03DCC 8093CA9C 27A500A4 */ addiu $a1, $sp, 0x00A4 ## $a1 = FFFFFFE4 /* 03DD0 8093CAA0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 03DD4 8093CAA4 C7B200A4 */ lwc1 $f18, 0x00A4($sp) +/* 03DD4 8093CAA4 C7B200A4 */ lwc1 $f18, 0x00A4($sp) /* 03DD8 8093CAA8 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 /* 03DDC 8093CAAC 3C053E99 */ lui $a1, 0x3E99 ## $a1 = 3E990000 /* 03DE0 8093CAB0 E6320600 */ swc1 $f18, 0x0600($s1) ## 00000600 /* 03DE4 8093CAB4 E6240604 */ swc1 $f4, 0x0604($s1) ## 00000604 -/* 03DE8 8093CAB8 C7A600AC */ lwc1 $f6, 0x00AC($sp) +/* 03DE8 8093CAB8 C7A600AC */ lwc1 $f6, 0x00AC($sp) /* 03DEC 8093CABC 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 /* 03DF0 8093CAC0 3C073CF5 */ lui $a3, 0x3CF5 ## $a3 = 3CF50000 /* 03DF4 8093CAC4 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3CF5C28F @@ -118,58 +118,58 @@ glabel func_8093C910 /* 03DFC 8093CACC 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E99999A /* 03E00 8093CAD0 262406AC */ addiu $a0, $s1, 0x06AC ## $a0 = 000006AC /* 03E04 8093CAD4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03E08 8093CAD8 E6260608 */ swc1 $f6, 0x0608($s1) ## 00000608 /* 03E0C 8093CADC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03E10 8093CAE0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 03E14 8093CAE4 262406A4 */ addiu $a0, $s1, 0x06A4 ## $a0 = 000006A4 /* 03E18 8093CAE8 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 03E1C 8093CAEC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03E20 8093CAF0 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 03E24 8093CAF4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03E28 8093CAF8 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 -/* 03E2C 8093CAFC 10000042 */ beq $zero, $zero, .L8093CC08 +/* 03E2C 8093CAFC 10000042 */ beq $zero, $zero, .L8093CC08 /* 03E30 8093CB00 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC .L8093CB04: /* 03E34 8093CB04 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 /* 03E38 8093CB08 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03E3C 8093CB0C E7B600B0 */ swc1 $f22, 0x00B0($sp) -/* 03E40 8093CB10 E7B600B4 */ swc1 $f22, 0x00B4($sp) +/* 03E3C 8093CB0C E7B600B0 */ swc1 $f22, 0x00B0($sp) +/* 03E40 8093CB10 E7B600B4 */ swc1 $f22, 0x00B4($sp) /* 03E44 8093CB14 C62806A4 */ lwc1 $f8, 0x06A4($s1) ## 000006A4 -/* 03E48 8093CB18 E7A800B8 */ swc1 $f8, 0x00B8($sp) -/* 03E4C 8093CB1C 0C034348 */ jal Matrix_RotateY +/* 03E48 8093CB18 E7A800B8 */ swc1 $f8, 0x00B8($sp) +/* 03E4C 8093CB1C 0C034348 */ jal Matrix_RotateY /* 03E50 8093CB20 C62C06AC */ lwc1 $f12, 0x06AC($s1) ## 000006AC /* 03E54 8093CB24 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFF0 -/* 03E58 8093CB28 0C0346BD */ jal Matrix_MultVec3f +/* 03E58 8093CB28 0C0346BD */ jal Matrix_MultVec3f /* 03E5C 8093CB2C 27A500A4 */ addiu $a1, $sp, 0x00A4 ## $a1 = FFFFFFE4 /* 03E60 8093CB30 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 03E64 8093CB34 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 03E68 8093CB38 C632069C */ lwc1 $f18, 0x069C($s1) ## 0000069C -/* 03E6C 8093CB3C C7AA00A4 */ lwc1 $f10, 0x00A4($sp) +/* 03E6C 8093CB3C C7AA00A4 */ lwc1 $f10, 0x00A4($sp) /* 03E70 8093CB40 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 03E74 8093CB44 46049182 */ mul.s $f6, $f18, $f4 +/* 03E74 8093CB44 46049182 */ mul.s $f6, $f18, $f4 /* 03E78 8093CB48 E62A0600 */ swc1 $f10, 0x0600($s1) ## 00000600 -/* 03E7C 8093CB4C C7B000AC */ lwc1 $f16, 0x00AC($sp) +/* 03E7C 8093CB4C C7B000AC */ lwc1 $f16, 0x00AC($sp) /* 03E80 8093CB50 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 03E84 8093CB54 26240604 */ addiu $a0, $s1, 0x0604 ## $a0 = 00000604 /* 03E88 8093CB58 3C0543D2 */ lui $a1, 0x43D2 ## $a1 = 43D20000 /* 03E8C 8093CB5C E6300608 */ swc1 $f16, 0x0608($s1) ## 00000608 -/* 03E90 8093CB60 44073000 */ mfc1 $a3, $f6 +/* 03E90 8093CB60 44073000 */ mfc1 $a3, $f6 /* 03E94 8093CB64 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03E98 8093CB68 00000000 */ nop /* 03E9C 8093CB6C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 03EA0 8093CB70 44815000 */ mtc1 $at, $f10 ## $f10 = 6.00 /* 03EA4 8093CB74 C628069C */ lwc1 $f8, 0x069C($s1) ## 0000069C /* 03EA8 8093CB78 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03EAC 8093CB7C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 03EB0 8093CB80 460A4402 */ mul.s $f16, $f8, $f10 +/* 03EB0 8093CB80 460A4402 */ mul.s $f16, $f8, $f10 /* 03EB4 8093CB84 26240610 */ addiu $a0, $s1, 0x0610 ## $a0 = 00000610 /* 03EB8 8093CB88 3C0543EB */ lui $a1, 0x43EB ## $a1 = 43EB0000 -/* 03EBC 8093CB8C 44078000 */ mfc1 $a3, $f16 +/* 03EBC 8093CB8C 44078000 */ mfc1 $a3, $f16 /* 03EC0 8093CB90 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03EC4 8093CB94 00000000 */ nop /* 03EC8 8093CB98 3C053E99 */ lui $a1, 0x3E99 ## $a1 = 3E990000 /* 03ECC 8093CB9C 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 @@ -178,242 +178,242 @@ glabel func_8093C910 /* 03ED8 8093CBA8 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 03EDC 8093CBAC 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E99999A /* 03EE0 8093CBB0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03EE4 8093CBB4 262406AC */ addiu $a0, $s1, 0x06AC ## $a0 = 000006AC /* 03EE8 8093CBB8 3C014200 */ lui $at, 0x4200 ## $at = 42000000 /* 03EEC 8093CBBC 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 /* 03EF0 8093CBC0 C632069C */ lwc1 $f18, 0x069C($s1) ## 0000069C /* 03EF4 8093CBC4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03EF8 8093CBC8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 03EFC 8093CBCC 46049182 */ mul.s $f6, $f18, $f4 +/* 03EFC 8093CBCC 46049182 */ mul.s $f6, $f18, $f4 /* 03F00 8093CBD0 262406A4 */ addiu $a0, $s1, 0x06A4 ## $a0 = 000006A4 /* 03F04 8093CBD4 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 03F08 8093CBD8 44073000 */ mfc1 $a3, $f6 +/* 03F08 8093CBD8 44073000 */ mfc1 $a3, $f6 /* 03F0C 8093CBDC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03F10 8093CBE0 00000000 */ nop /* 03F14 8093CBE4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03F18 8093CBE8 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 /* 03F1C 8093CBEC 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 03F20 8093CBF0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 03F24 8093CBF4 4405A000 */ mfc1 $a1, $f20 -/* 03F28 8093CBF8 4406A000 */ mfc1 $a2, $f20 +/* 03F24 8093CBF4 4405A000 */ mfc1 $a1, $f20 +/* 03F28 8093CBF8 4406A000 */ mfc1 $a2, $f20 /* 03F2C 8093CBFC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03F30 8093CC00 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 03F34 8093CC04 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC .L8093CC08: -/* 03F38 8093CC08 50A0000E */ beql $a1, $zero, .L8093CC44 +/* 03F38 8093CC08 50A0000E */ beql $a1, $zero, .L8093CC44 /* 03F3C 8093CC0C 86220440 */ lh $v0, 0x0440($s1) ## 00000440 /* 03F40 8093CC10 922A05F9 */ lbu $t2, 0x05F9($s1) ## 000005F9 /* 03F44 8093CC14 26270600 */ addiu $a3, $s1, 0x0600 ## $a3 = 00000600 /* 03F48 8093CC18 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 03F4C 8093CC1C 15400006 */ bne $t2, $zero, .L8093CC38 +/* 03F4C 8093CC1C 15400006 */ bne $t2, $zero, .L8093CC38 /* 03F50 8093CC20 26260630 */ addiu $a2, $s1, 0x0630 ## $a2 = 00000630 /* 03F54 8093CC24 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 03F58 8093CC28 0C030136 */ jal func_800C04D8 +/* 03F58 8093CC28 0C030136 */ jal func_800C04D8 /* 03F5C 8093CC2C 2626060C */ addiu $a2, $s1, 0x060C ## $a2 = 0000060C -/* 03F60 8093CC30 10000004 */ beq $zero, $zero, .L8093CC44 +/* 03F60 8093CC30 10000004 */ beq $zero, $zero, .L8093CC44 /* 03F64 8093CC34 86220440 */ lh $v0, 0x0440($s1) ## 00000440 .L8093CC38: -/* 03F68 8093CC38 0C030136 */ jal func_800C04D8 +/* 03F68 8093CC38 0C030136 */ jal func_800C04D8 /* 03F6C 8093CC3C 26270624 */ addiu $a3, $s1, 0x0624 ## $a3 = 00000624 /* 03F70 8093CC40 86220440 */ lh $v0, 0x0440($s1) ## 00000440 .L8093CC44: /* 03F74 8093CC44 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 03F78 8093CC48 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 03F7C 8093CC4C 10400008 */ beq $v0, $zero, .L8093CC70 +/* 03F7C 8093CC4C 10400008 */ beq $v0, $zero, .L8093CC70 /* 03F80 8093CC50 2405311F */ addiu $a1, $zero, 0x311F ## $a1 = 0000311F -/* 03F84 8093CC54 10410122 */ beq $v0, $at, .L8093D0E0 +/* 03F84 8093CC54 10410122 */ beq $v0, $at, .L8093D0E0 /* 03F88 8093CC58 26300568 */ addiu $s0, $s1, 0x0568 ## $s0 = 00000568 /* 03F8C 8093CC5C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03F90 8093CC60 10410137 */ beq $v0, $at, .L8093D140 +/* 03F90 8093CC60 10410137 */ beq $v0, $at, .L8093D140 /* 03F94 8093CC64 00000000 */ nop -/* 03F98 8093CC68 100001D4 */ beq $zero, $zero, .L8093D3BC -/* 03F9C 8093CC6C 8FBF003C */ lw $ra, 0x003C($sp) +/* 03F98 8093CC68 100001D4 */ beq $zero, $zero, .L8093D3BC +/* 03F9C 8093CC6C 8FBF003C */ lw $ra, 0x003C($sp) .L8093CC70: /* 03FA0 8093CC70 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03FA4 8093CC74 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) + +/* 03FA4 8093CC74 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 03FA8 8093CC78 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 03FAC 8093CC7C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 03FAC 8093CC7C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 03FB0 8093CC80 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03FB4 8093CC84 2405311F */ addiu $a1, $zero, 0x311F ## $a1 = 0000311F /* 03FB8 8093CC88 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 03FBC 8093CC8C C62801B0 */ lwc1 $f8, 0x01B0($s1) ## 000001B0 /* 03FC0 8093CC90 44815000 */ mtc1 $at, $f10 ## $f10 = 400.00 -/* 03FC4 8093CC94 E7B600B8 */ swc1 $f22, 0x00B8($sp) -/* 03FC8 8093CC98 E7A800B0 */ swc1 $f8, 0x00B0($sp) -/* 03FCC 8093CC9C E7AA00B4 */ swc1 $f10, 0x00B4($sp) +/* 03FC4 8093CC94 E7B600B8 */ swc1 $f22, 0x00B8($sp) +/* 03FC8 8093CC98 E7A800B0 */ swc1 $f8, 0x00B0($sp) +/* 03FCC 8093CC9C E7AA00B4 */ swc1 $f10, 0x00B4($sp) /* 03FD0 8093CCA0 C62C01A8 */ lwc1 $f12, 0x01A8($s1) ## 000001A8 -/* 03FD4 8093CCA4 0C034348 */ jal Matrix_RotateY +/* 03FD4 8093CCA4 0C034348 */ jal Matrix_RotateY /* 03FD8 8093CCA8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03FDC 8093CCAC 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFF0 -/* 03FE0 8093CCB0 0C0346BD */ jal Matrix_MultVec3f +/* 03FE0 8093CCB0 0C0346BD */ jal Matrix_MultVec3f /* 03FE4 8093CCB4 27A500A4 */ addiu $a1, $sp, 0x00A4 ## $a1 = FFFFFFE4 /* 03FE8 8093CCB8 3C028095 */ lui $v0, %hi(D_8094C848) ## $v0 = 80950000 /* 03FEC 8093CCBC 2442C848 */ addiu $v0, $v0, %lo(D_8094C848) ## $v0 = 8094C848 /* 03FF0 8093CCC0 8C4B0000 */ lw $t3, 0x0000($v0) ## 8094C848 -/* 03FF4 8093CCC4 C7B000A4 */ lwc1 $f16, 0x00A4($sp) +/* 03FF4 8093CCC4 C7B000A4 */ lwc1 $f16, 0x00A4($sp) /* 03FF8 8093CCC8 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 03FFC 8093CCCC 44810000 */ mtc1 $at, $f0 ## $f0 = 32768.00 /* 04000 8093CCD0 E5700024 */ swc1 $f16, 0x0024($t3) ## 00000024 -/* 04004 8093CCD4 C7B200A8 */ lwc1 $f18, 0x00A8($sp) +/* 04004 8093CCD4 C7B200A8 */ lwc1 $f18, 0x00A8($sp) /* 04008 8093CCD8 8C4C0000 */ lw $t4, 0x0000($v0) ## 8094C848 /* 0400C 8093CCDC 3C018095 */ lui $at, %hi(D_8094AF14) ## $at = 80950000 /* 04010 8093CCE0 3C038095 */ lui $v1, %hi(D_8094C844) ## $v1 = 80950000 /* 04014 8093CCE4 E5920028 */ swc1 $f18, 0x0028($t4) ## 00000028 -/* 04018 8093CCE8 C7A400AC */ lwc1 $f4, 0x00AC($sp) +/* 04018 8093CCE8 C7A400AC */ lwc1 $f4, 0x00AC($sp) /* 0401C 8093CCEC 8C4D0000 */ lw $t5, 0x0000($v0) ## 8094C848 /* 04020 8093CCF0 2463C844 */ addiu $v1, $v1, %lo(D_8094C844) ## $v1 = 8094C844 -/* 04024 8093CCF4 4405B000 */ mfc1 $a1, $f22 +/* 04024 8093CCF4 4405B000 */ mfc1 $a1, $f22 /* 04028 8093CCF8 E5A4002C */ swc1 $f4, 0x002C($t5) ## 0000002C /* 0402C 8093CCFC C62601A8 */ lwc1 $f6, 0x01A8($s1) ## 000001A8 -/* 04030 8093CD00 C428AF14 */ lwc1 $f8, %lo(D_8094AF14)($at) +/* 04030 8093CD00 C428AF14 */ lwc1 $f8, %lo(D_8094AF14)($at) /* 04034 8093CD04 8C580000 */ lw $t8, 0x0000($v0) ## 8094C848 /* 04038 8093CD08 3C018095 */ lui $at, %hi(D_8094AF18) ## $at = 80950000 -/* 0403C 8093CD0C 46083283 */ div.s $f10, $f6, $f8 +/* 0403C 8093CD0C 46083283 */ div.s $f10, $f6, $f8 /* 04040 8093CD10 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 04044 8093CD14 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04048 8093CD18 262401B0 */ addiu $a0, $s1, 0x01B0 ## $a0 = 000001B0 /* 0404C 8093CD1C 3C0740E0 */ lui $a3, 0x40E0 ## $a3 = 40E00000 -/* 04050 8093CD20 46005402 */ mul.s $f16, $f10, $f0 -/* 04054 8093CD24 4600848D */ trunc.w.s $f18, $f16 -/* 04058 8093CD28 440F9000 */ mfc1 $t7, $f18 +/* 04050 8093CD20 46005402 */ mul.s $f16, $f10, $f0 +/* 04054 8093CD24 4600848D */ trunc.w.s $f18, $f16 +/* 04058 8093CD28 440F9000 */ mfc1 $t7, $f18 /* 0405C 8093CD2C 00000000 */ nop /* 04060 8093CD30 A70F00B6 */ sh $t7, 0x00B6($t8) ## 000000B6 -/* 04064 8093CD34 C7A400A4 */ lwc1 $f4, 0x00A4($sp) +/* 04064 8093CD34 C7A400A4 */ lwc1 $f4, 0x00A4($sp) /* 04068 8093CD38 8C790000 */ lw $t9, 0x0000($v1) ## 8094C844 -/* 0406C 8093CD3C 46002187 */ neg.s $f6, $f4 +/* 0406C 8093CD3C 46002187 */ neg.s $f6, $f4 /* 04070 8093CD40 E7260024 */ swc1 $f6, 0x0024($t9) ## 00000024 /* 04074 8093CD44 8C680000 */ lw $t0, 0x0000($v1) ## 8094C844 -/* 04078 8093CD48 C7A800A8 */ lwc1 $f8, 0x00A8($sp) +/* 04078 8093CD48 C7A800A8 */ lwc1 $f8, 0x00A8($sp) /* 0407C 8093CD4C E5080028 */ swc1 $f8, 0x0028($t0) ## 00000028 -/* 04080 8093CD50 C7AA00AC */ lwc1 $f10, 0x00AC($sp) +/* 04080 8093CD50 C7AA00AC */ lwc1 $f10, 0x00AC($sp) /* 04084 8093CD54 8C690000 */ lw $t1, 0x0000($v1) ## 8094C844 -/* 04088 8093CD58 46005407 */ neg.s $f16, $f10 +/* 04088 8093CD58 46005407 */ neg.s $f16, $f10 /* 0408C 8093CD5C E530002C */ swc1 $f16, 0x002C($t1) ## 0000002C -/* 04090 8093CD60 C424AF18 */ lwc1 $f4, %lo(D_8094AF18)($at) +/* 04090 8093CD60 C424AF18 */ lwc1 $f4, %lo(D_8094AF18)($at) /* 04094 8093CD64 C63201A8 */ lwc1 $f18, 0x01A8($s1) ## 000001A8 /* 04098 8093CD68 8C6C0000 */ lw $t4, 0x0000($v1) ## 8094C844 -/* 0409C 8093CD6C 46049183 */ div.s $f6, $f18, $f4 -/* 040A0 8093CD70 46003202 */ mul.s $f8, $f6, $f0 -/* 040A4 8093CD74 46004280 */ add.s $f10, $f8, $f0 -/* 040A8 8093CD78 4600540D */ trunc.w.s $f16, $f10 -/* 040AC 8093CD7C 440B8000 */ mfc1 $t3, $f16 +/* 0409C 8093CD6C 46049183 */ div.s $f6, $f18, $f4 +/* 040A0 8093CD70 46003202 */ mul.s $f8, $f6, $f0 +/* 040A4 8093CD74 46004280 */ add.s $f10, $f8, $f0 +/* 040A8 8093CD78 4600540D */ trunc.w.s $f16, $f10 +/* 040AC 8093CD7C 440B8000 */ mfc1 $t3, $f16 /* 040B0 8093CD80 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 040B4 8093CD84 A58B00B6 */ sh $t3, 0x00B6($t4) ## 000000B6 /* 040B8 8093CD88 C63201A8 */ lwc1 $f18, 0x01A8($s1) ## 000001A8 /* 040BC 8093CD8C C62401AC */ lwc1 $f4, 0x01AC($s1) ## 000001AC -/* 040C0 8093CD90 4406A000 */ mfc1 $a2, $f20 +/* 040C0 8093CD90 4406A000 */ mfc1 $a2, $f20 /* 040C4 8093CD94 3C073B83 */ lui $a3, 0x3B83 ## $a3 = 3B830000 -/* 040C8 8093CD98 46049181 */ sub.s $f6, $f18, $f4 +/* 040C8 8093CD98 46049181 */ sub.s $f6, $f18, $f4 /* 040CC 8093CD9C 34E7126E */ ori $a3, $a3, 0x126E ## $a3 = 3B83126E /* 040D0 8093CDA0 262401AC */ addiu $a0, $s1, 0x01AC ## $a0 = 000001AC /* 040D4 8093CDA4 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 040D8 8093CDA8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 040DC 8093CDAC E62601A8 */ swc1 $f6, 0x01A8($s1) ## 000001A8 /* 040E0 8093CDB0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 040E4 8093CDB4 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 040E8 8093CDB8 C62801B0 */ lwc1 $f8, 0x01B0($s1) ## 000001B0 -/* 040EC 8093CDBC 460A403C */ c.lt.s $f8, $f10 +/* 040EC 8093CDBC 460A403C */ c.lt.s $f8, $f10 /* 040F0 8093CDC0 00000000 */ nop -/* 040F4 8093CDC4 450000B5 */ bc1f .L8093D09C +/* 040F4 8093CDC4 450000B5 */ bc1f .L8093D09C /* 040F8 8093CDC8 00000000 */ nop /* 040FC 8093CDCC 862D0166 */ lh $t5, 0x0166($s1) ## 00000166 /* 04100 8093CDD0 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 /* 04104 8093CDD4 24053910 */ addiu $a1, $zero, 0x3910 ## $a1 = 00003910 -/* 04108 8093CDD8 15A00005 */ bne $t5, $zero, .L8093CDF0 +/* 04108 8093CDD8 15A00005 */ bne $t5, $zero, .L8093CDF0 /* 0410C 8093CDDC 00000000 */ nop /* 04110 8093CDE0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 04114 8093CDE4 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) + +/* 04114 8093CDE4 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 04118 8093CDE8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0411C 8093CDEC A62E0166 */ sh $t6, 0x0166($s1) ## 00000166 .L8093CDF0: /* 04120 8093CDF0 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 04124 8093CDF4 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 04124 8093CDF4 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 04128 8093CDF8 3C053BA3 */ lui $a1, 0x3BA3 ## $a1 = 3BA30000 -/* 0412C 8093CDFC 4406A000 */ mfc1 $a2, $f20 +/* 0412C 8093CDFC 4406A000 */ mfc1 $a2, $f20 /* 04130 8093CE00 3C0739C4 */ lui $a3, 0x39C4 ## $a3 = 39C40000 /* 04134 8093CE04 34E79BA9 */ ori $a3, $a3, 0x9BA9 ## $a3 = 39C49BA9 /* 04138 8093CE08 34A5D70C */ ori $a1, $a1, 0xD70C ## $a1 = 3BA3D70C /* 0413C 8093CE0C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04140 8093CE10 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 80950050 /* 04144 8093CE14 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L8093CE18: /* 04148 8093CE18 3C0F8095 */ lui $t7, %hi(D_8094C848) ## $t7 = 80950000 -/* 0414C 8093CE1C 8DEFC848 */ lw $t7, %lo(D_8094C848)($t7) +/* 0414C 8093CE1C 8DEFC848 */ lw $t7, %lo(D_8094C848)($t7) /* 04150 8093CE20 3C018095 */ lui $at, %hi(D_8094AF1C) ## $at = 80950000 -/* 04154 8093CE24 C432AF1C */ lwc1 $f18, %lo(D_8094AF1C)($at) +/* 04154 8093CE24 C432AF1C */ lwc1 $f18, %lo(D_8094AF1C)($at) /* 04158 8093CE28 C5F00050 */ lwc1 $f16, 0x0050($t7) ## 80950050 -/* 0415C 8093CE2C 46128502 */ mul.s $f20, $f16, $f18 +/* 0415C 8093CE2C 46128502 */ mul.s $f20, $f16, $f18 /* 04160 8093CE30 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 04164 8093CE34 4614A300 */ add.s $f12, $f20, $f20 + +/* 04164 8093CE34 4614A300 */ add.s $f12, $f20, $f20 /* 04168 8093CE38 3C018095 */ lui $at, %hi(D_8094AF20) ## $at = 80950000 -/* 0416C 8093CE3C C424AF20 */ lwc1 $f4, %lo(D_8094AF20)($at) +/* 0416C 8093CE3C C424AF20 */ lwc1 $f4, %lo(D_8094AF20)($at) /* 04170 8093CE40 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 04174 8093CE44 44813000 */ mtc1 $at, $f6 ## $f6 = 400.00 /* 04178 8093CE48 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0417C 8093CE4C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 04180 8093CE50 46003200 */ add.s $f8, $f6, $f0 -/* 04184 8093CE54 E7B6009C */ swc1 $f22, 0x009C($sp) -/* 04188 8093CE58 E7A00090 */ swc1 $f0, 0x0090($sp) -/* 0418C 8093CE5C E7A40094 */ swc1 $f4, 0x0094($sp) +/* 04180 8093CE50 46003200 */ add.s $f8, $f6, $f0 +/* 04184 8093CE54 E7B6009C */ swc1 $f22, 0x009C($sp) +/* 04188 8093CE58 E7A00090 */ swc1 $f0, 0x0090($sp) +/* 0418C 8093CE5C E7A40094 */ swc1 $f4, 0x0094($sp) /* 04190 8093CE60 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 04194 8093CE64 E7A80098 */ swc1 $f8, 0x0098($sp) -/* 04198 8093CE68 4614A282 */ mul.s $f10, $f20, $f20 -/* 0419C 8093CE6C C7A20090 */ lwc1 $f2, 0x0090($sp) -/* 041A0 8093CE70 E7A00054 */ swc1 $f0, 0x0054($sp) + +/* 04194 8093CE64 E7A80098 */ swc1 $f8, 0x0098($sp) +/* 04198 8093CE68 4614A282 */ mul.s $f10, $f20, $f20 +/* 0419C 8093CE6C C7A20090 */ lwc1 $f2, 0x0090($sp) +/* 041A0 8093CE70 E7A00054 */ swc1 $f0, 0x0054($sp) /* 041A4 8093CE74 3C018095 */ lui $at, %hi(D_8094AF24) ## $at = 80950000 -/* 041A8 8093CE78 46021402 */ mul.s $f16, $f2, $f2 -/* 041AC 8093CE7C C42CAF24 */ lwc1 $f12, %lo(D_8094AF24)($at) -/* 041B0 8093CE80 46105001 */ sub.s $f0, $f10, $f16 -/* 041B4 8093CE84 46000004 */ sqrt.s $f0, $f0 +/* 041A8 8093CE78 46021402 */ mul.s $f16, $f2, $f2 +/* 041AC 8093CE7C C42CAF24 */ lwc1 $f12, %lo(D_8094AF24)($at) +/* 041B0 8093CE80 46105001 */ sub.s $f0, $f10, $f16 +/* 041B4 8093CE84 46000004 */ sqrt.s $f0, $f0 /* 041B8 8093CE88 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 041BC 8093CE8C E7A00058 */ swc1 $f0, 0x0058($sp) + +/* 041BC 8093CE8C E7A00058 */ swc1 $f0, 0x0058($sp) /* 041C0 8093CE90 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 041C4 8093CE94 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 041C8 8093CE98 C7B20054 */ lwc1 $f18, 0x0054($sp) -/* 041CC 8093CE9C 4600020D */ trunc.w.s $f8, $f0 +/* 041C8 8093CE98 C7B20054 */ lwc1 $f18, 0x0054($sp) +/* 041CC 8093CE9C 4600020D */ trunc.w.s $f8, $f0 /* 041D0 8093CEA0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 041D4 8093CEA4 27A50094 */ addiu $a1, $sp, 0x0094 ## $a1 = FFFFFFD4 -/* 041D8 8093CEA8 46049180 */ add.s $f6, $f18, $f4 -/* 041DC 8093CEAC 44194000 */ mfc1 $t9, $f8 -/* 041E0 8093CEB0 8FA70058 */ lw $a3, 0x0058($sp) -/* 041E4 8093CEB4 44063000 */ mfc1 $a2, $f6 -/* 041E8 8093CEB8 0C24E452 */ jal func_80939148 -/* 041EC 8093CEBC AFB90010 */ sw $t9, 0x0010($sp) +/* 041D8 8093CEA8 46049180 */ add.s $f6, $f18, $f4 +/* 041DC 8093CEAC 44194000 */ mfc1 $t9, $f8 +/* 041E0 8093CEB0 8FA70058 */ lw $a3, 0x0058($sp) +/* 041E4 8093CEB4 44063000 */ mfc1 $a2, $f6 +/* 041E8 8093CEB8 0C24E452 */ jal func_80939148 +/* 041EC 8093CEBC AFB90010 */ sw $t9, 0x0010($sp) /* 041F0 8093CEC0 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 041F4 8093CEC4 00108400 */ sll $s0, $s0, 16 -/* 041F8 8093CEC8 00108403 */ sra $s0, $s0, 16 -/* 041FC 8093CECC 2A010004 */ slti $at, $s0, 0x0004 -/* 04200 8093CED0 1420FFD1 */ bne $at, $zero, .L8093CE18 +/* 041F4 8093CEC4 00108400 */ sll $s0, $s0, 16 +/* 041F8 8093CEC8 00108403 */ sra $s0, $s0, 16 +/* 041FC 8093CECC 2A010004 */ slti $at, $s0, 0x0004 +/* 04200 8093CED0 1420FFD1 */ bne $at, $zero, .L8093CE18 /* 04204 8093CED4 00000000 */ nop /* 04208 8093CED8 3C088095 */ lui $t0, %hi(D_8094C848) ## $t0 = 80950000 -/* 0420C 8093CEDC 8D08C848 */ lw $t0, %lo(D_8094C848)($t0) +/* 0420C 8093CEDC 8D08C848 */ lw $t0, %lo(D_8094C848)($t0) /* 04210 8093CEE0 3C018095 */ lui $at, %hi(D_8094AF28) ## $at = 80950000 -/* 04214 8093CEE4 C42AAF28 */ lwc1 $f10, %lo(D_8094AF28)($at) +/* 04214 8093CEE4 C42AAF28 */ lwc1 $f10, %lo(D_8094AF28)($at) /* 04218 8093CEE8 C5100050 */ lwc1 $f16, 0x0050($t0) ## 80950050 /* 0421C 8093CEEC 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 04220 8093CEF0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 04224 8093CEF4 460A803E */ c.le.s $f16, $f10 +/* 04224 8093CEF4 460A803E */ c.le.s $f16, $f10 /* 04228 8093CEF8 26220024 */ addiu $v0, $s1, 0x0024 ## $v0 = 00000024 -/* 0422C 8093CEFC 45000067 */ bc1f .L8093D09C +/* 0422C 8093CEFC 45000067 */ bc1f .L8093D09C /* 04230 8093CF00 00000000 */ nop /* 04234 8093CF04 44819000 */ mtc1 $at, $f18 ## $f18 = 400.00 /* 04238 8093CF08 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 0423C 8093CF0C 4481A000 */ mtc1 $at, $f20 ## $f20 = 25.00 /* 04240 8093CF10 E6320028 */ swc1 $f18, 0x0028($s1) ## 00000028 -/* 04244 8093CF14 AFA2004C */ sw $v0, 0x004C($sp) -/* 04248 8093CF18 8FA2004C */ lw $v0, 0x004C($sp) +/* 04244 8093CF14 AFA2004C */ sw $v0, 0x004C($sp) +/* 04248 8093CF18 8FA2004C */ lw $v0, 0x004C($sp) .L8093CF1C: /* 0424C 8093CF1C 27A90080 */ addiu $t1, $sp, 0x0080 ## $t1 = FFFFFFC0 /* 04250 8093CF20 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -424,57 +424,57 @@ glabel func_8093C910 /* 04264 8093CF34 AD2A0004 */ sw $t2, 0x0004($t1) ## FFFFFFC4 /* 04268 8093CF38 8C4B0008 */ lw $t3, 0x0008($v0) ## 0000002C /* 0426C 8093CF3C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 04270 8093CF40 AD2B0008 */ sw $t3, 0x0008($t1) ## FFFFFFC8 /* 04274 8093CF44 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 04278 8093CF48 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 0427C 8093CF4C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 04280 8093CF50 E7A00074 */ swc1 $f0, 0x0074($sp) + +/* 04280 8093CF50 E7A00074 */ swc1 $f0, 0x0074($sp) /* 04284 8093CF54 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 04288 8093CF58 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 0428C 8093CF5C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 04290 8093CF60 E7A00078 */ swc1 $f0, 0x0078($sp) -/* 04294 8093CF64 C7A40080 */ lwc1 $f4, 0x0080($sp) -/* 04298 8093CF68 C7A60074 */ lwc1 $f6, 0x0074($sp) -/* 0429C 8093CF6C C7AA0084 */ lwc1 $f10, 0x0084($sp) -/* 042A0 8093CF70 C7B00078 */ lwc1 $f16, 0x0078($sp) -/* 042A4 8093CF74 46062200 */ add.s $f8, $f4, $f6 -/* 042A8 8093CF78 C7A40088 */ lwc1 $f4, 0x0088($sp) + +/* 04290 8093CF60 E7A00078 */ swc1 $f0, 0x0078($sp) +/* 04294 8093CF64 C7A40080 */ lwc1 $f4, 0x0080($sp) +/* 04298 8093CF68 C7A60074 */ lwc1 $f6, 0x0074($sp) +/* 0429C 8093CF6C C7AA0084 */ lwc1 $f10, 0x0084($sp) +/* 042A0 8093CF70 C7B00078 */ lwc1 $f16, 0x0078($sp) +/* 042A4 8093CF74 46062200 */ add.s $f8, $f4, $f6 +/* 042A8 8093CF78 C7A40088 */ lwc1 $f4, 0x0088($sp) /* 042AC 8093CF7C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 042B0 8093CF80 46105480 */ add.s $f18, $f10, $f16 +/* 042B0 8093CF80 46105480 */ add.s $f18, $f10, $f16 /* 042B4 8093CF84 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 042B8 8093CF88 E7A0007C */ swc1 $f0, 0x007C($sp) -/* 042BC 8093CF8C 46002180 */ add.s $f6, $f4, $f0 -/* 042C0 8093CF90 E7A80080 */ swc1 $f8, 0x0080($sp) -/* 042C4 8093CF94 E7B20084 */ swc1 $f18, 0x0084($sp) -/* 042C8 8093CF98 E7B60068 */ swc1 $f22, 0x0068($sp) -/* 042CC 8093CF9C E7A60088 */ swc1 $f6, 0x0088($sp) -/* 042D0 8093CFA0 E7B6006C */ swc1 $f22, 0x006C($sp) +/* 042B8 8093CF88 E7A0007C */ swc1 $f0, 0x007C($sp) +/* 042BC 8093CF8C 46002180 */ add.s $f6, $f4, $f0 +/* 042C0 8093CF90 E7A80080 */ swc1 $f8, 0x0080($sp) +/* 042C4 8093CF94 E7B20084 */ swc1 $f18, 0x0084($sp) +/* 042C8 8093CF98 E7B60068 */ swc1 $f22, 0x0068($sp) +/* 042CC 8093CF9C E7A60088 */ swc1 $f6, 0x0088($sp) +/* 042D0 8093CFA0 E7B6006C */ swc1 $f22, 0x006C($sp) /* 042D4 8093CFA4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 042D8 8093CFA8 E7B60070 */ swc1 $f22, 0x0070($sp) -/* 042DC 8093CFAC C7AA0074 */ lwc1 $f10, 0x0074($sp) -/* 042E0 8093CFB0 46140200 */ add.s $f8, $f0, $f20 + +/* 042D8 8093CFA8 E7B60070 */ swc1 $f22, 0x0070($sp) +/* 042DC 8093CFAC C7AA0074 */ lwc1 $f10, 0x0074($sp) +/* 042E0 8093CFB0 46140200 */ add.s $f8, $f0, $f20 /* 042E4 8093CFB4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 042E8 8093CFB8 27A50080 */ addiu $a1, $sp, 0x0080 ## $a1 = FFFFFFC0 -/* 042EC 8093CFBC 4616503C */ c.lt.s $f10, $f22 -/* 042F0 8093CFC0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 042EC 8093CFBC 4616503C */ c.lt.s $f10, $f22 +/* 042F0 8093CFC0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 042F4 8093CFC4 27A60074 */ addiu $a2, $sp, 0x0074 ## $a2 = FFFFFFB4 /* 042F8 8093CFC8 27A70068 */ addiu $a3, $sp, 0x0068 ## $a3 = FFFFFFA8 -/* 042FC 8093CFCC 45000002 */ bc1f .L8093CFD8 +/* 042FC 8093CFCC 45000002 */ bc1f .L8093CFD8 /* 04300 8093CFD0 00006025 */ or $t4, $zero, $zero ## $t4 = 00000000 /* 04304 8093CFD4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 .L8093CFD8: -/* 04308 8093CFD8 0C24E41C */ jal func_80939070 -/* 0430C 8093CFDC AFAC0014 */ sw $t4, 0x0014($sp) +/* 04308 8093CFD8 0C24E41C */ jal func_80939070 +/* 0430C 8093CFDC AFAC0014 */ sw $t4, 0x0014($sp) /* 04310 8093CFE0 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 04314 8093CFE4 00108400 */ sll $s0, $s0, 16 -/* 04318 8093CFE8 00108403 */ sra $s0, $s0, 16 -/* 0431C 8093CFEC 2A010032 */ slti $at, $s0, 0x0032 -/* 04320 8093CFF0 5420FFCA */ bnel $at, $zero, .L8093CF1C -/* 04324 8093CFF4 8FA2004C */ lw $v0, 0x004C($sp) +/* 04314 8093CFE4 00108400 */ sll $s0, $s0, 16 +/* 04318 8093CFE8 00108403 */ sra $s0, $s0, 16 +/* 0431C 8093CFEC 2A010032 */ slti $at, $s0, 0x0032 +/* 04320 8093CFF0 5420FFCA */ bnel $at, $zero, .L8093CF1C +/* 04324 8093CFF4 8FA2004C */ lw $v0, 0x004C($sp) /* 04328 8093CFF8 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 /* 0432C 8093CFFC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 04330 8093D000 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -484,106 +484,106 @@ glabel func_8093C910 /* 04340 8093D010 AE380004 */ sw $t8, 0x0004($s1) ## 00000004 /* 04344 8093D014 A62000B6 */ sh $zero, 0x00B6($s1) ## 000000B6 /* 04348 8093D018 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 0434C 8093D01C 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) -/* 04350 8093D020 0C24F209 */ jal func_8093C824 +/* 0434C 8093D01C 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 04350 8093D020 0C24F209 */ jal func_8093C824 /* 04354 8093D024 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 04358 8093D028 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 0435C 8093D02C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) -/* 04360 8093D030 0C24F209 */ jal func_8093C824 +/* 0435C 8093D02C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 04360 8093D030 0C24F209 */ jal func_8093C824 /* 04364 8093D034 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 04368 8093D038 4405B000 */ mfc1 $a1, $f22 +/* 04368 8093D038 4405B000 */ mfc1 $a1, $f22 /* 0436C 8093D03C 0C00B58B */ jal Actor_SetScale - + /* 04370 8093D040 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 04374 8093D044 3C100604 */ lui $s0, 0x0604 ## $s0 = 06040000 /* 04378 8093D048 26108E2C */ addiu $s0, $s0, 0x8E2C ## $s0 = 06038E2C -/* 0437C 8093D04C 4406B000 */ mfc1 $a2, $f22 +/* 0437C 8093D04C 4406B000 */ mfc1 $a2, $f22 /* 04380 8093D050 02002825 */ or $a1, $s0, $zero ## $a1 = 06038E2C -/* 04384 8093D054 0C029490 */ jal func_800A5240 +/* 04384 8093D054 0C029490 */ jal func_800A5240 /* 04388 8093D058 26240568 */ addiu $a0, $s1, 0x0568 ## $a0 = 00000568 /* 0438C 8093D05C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04390 8093D060 02002025 */ or $a0, $s0, $zero ## $a0 = 06038E2C /* 04394 8093D064 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 04398 8093D068 24190032 */ addiu $t9, $zero, 0x0032 ## $t9 = 00000032 /* 0439C 8093D06C A6390178 */ sh $t9, 0x0178($s1) ## 00000178 -/* 043A0 8093D070 468084A0 */ cvt.s.w $f18, $f16 +/* 043A0 8093D070 468084A0 */ cvt.s.w $f18, $f16 /* 043A4 8093D074 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 043A8 8093D078 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 043AC 8093D07C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 043B0 8093D080 0C00B7D5 */ jal func_8002DF54 +/* 043B0 8093D080 0C00B7D5 */ jal func_8002DF54 /* 043B4 8093D084 E63201A4 */ swc1 $f18, 0x01A4($s1) ## 000001A4 /* 043B8 8093D088 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 043BC 8093D08C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 043C0 8093D090 2405390D */ addiu $a1, $zero, 0x390D ## $a1 = 0000390D /* 043C4 8093D094 0C03E803 */ jal Audio_SetBGM - + /* 043C8 8093D098 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B .L8093D09C: /* 043CC 8093D09C 3C028095 */ lui $v0, %hi(D_8094C848) ## $v0 = 80950000 -/* 043D0 8093D0A0 8C42C848 */ lw $v0, %lo(D_8094C848)($v0) +/* 043D0 8093D0A0 8C42C848 */ lw $v0, %lo(D_8094C848)($v0) /* 043D4 8093D0A4 3C088095 */ lui $t0, %hi(D_8094C848) ## $t0 = 80950000 /* 043D8 8093D0A8 3C098095 */ lui $t1, %hi(D_8094C844) ## $t1 = 80950000 /* 043DC 8093D0AC C4400050 */ lwc1 $f0, 0x0050($v0) ## 80950050 /* 043E0 8093D0B0 3C0A8095 */ lui $t2, %hi(D_8094C844) ## $t2 = 80950000 /* 043E4 8093D0B4 3C0B8095 */ lui $t3, %hi(D_8094C844) ## $t3 = 80950000 /* 043E8 8093D0B8 E4400058 */ swc1 $f0, 0x0058($v0) ## 80950058 -/* 043EC 8093D0BC 8D08C848 */ lw $t0, %lo(D_8094C848)($t0) +/* 043EC 8093D0BC 8D08C848 */ lw $t0, %lo(D_8094C848)($t0) /* 043F0 8093D0C0 E5000054 */ swc1 $f0, 0x0054($t0) ## 80950054 -/* 043F4 8093D0C4 8D29C844 */ lw $t1, %lo(D_8094C844)($t1) +/* 043F4 8093D0C4 8D29C844 */ lw $t1, %lo(D_8094C844)($t1) /* 043F8 8093D0C8 E5200058 */ swc1 $f0, 0x0058($t1) ## 80950058 -/* 043FC 8093D0CC 8D4AC844 */ lw $t2, %lo(D_8094C844)($t2) +/* 043FC 8093D0CC 8D4AC844 */ lw $t2, %lo(D_8094C844)($t2) /* 04400 8093D0D0 E5400054 */ swc1 $f0, 0x0054($t2) ## 80950054 -/* 04404 8093D0D4 8D6BC844 */ lw $t3, %lo(D_8094C844)($t3) -/* 04408 8093D0D8 100000B7 */ beq $zero, $zero, .L8093D3B8 +/* 04404 8093D0D4 8D6BC844 */ lw $t3, %lo(D_8094C844)($t3) +/* 04408 8093D0D8 100000B7 */ beq $zero, $zero, .L8093D3B8 /* 0440C 8093D0DC E5600050 */ swc1 $f0, 0x0050($t3) ## 80950050 .L8093D0E0: /* 04410 8093D0E0 02002025 */ or $a0, $s0, $zero ## $a0 = 06038E2C -/* 04414 8093D0E4 0C0295B2 */ jal func_800A56C8 +/* 04414 8093D0E4 0C0295B2 */ jal func_800A56C8 /* 04418 8093D0E8 8E2501A4 */ lw $a1, 0x01A4($s1) ## 000001A4 -/* 0441C 8093D0EC 10400005 */ beq $v0, $zero, .L8093D104 +/* 0441C 8093D0EC 10400005 */ beq $v0, $zero, .L8093D104 /* 04420 8093D0F0 02002025 */ or $a0, $s0, $zero ## $a0 = 06038E2C /* 04424 8093D0F4 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 04428 8093D0F8 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 -/* 0442C 8093D0FC 0C0294D3 */ jal func_800A534C +/* 0442C 8093D0FC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 04430 8093D100 3C06C170 */ lui $a2, 0xC170 ## $a2 = C1700000 .L8093D104: /* 04434 8093D104 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF /* 04438 8093D108 3C018095 */ lui $at, %hi(D_8094C840) ## $at = 80950000 -/* 0443C 8093D10C A02CC840 */ sb $t4, %lo(D_8094C840)($at) +/* 0443C 8093D10C A02CC840 */ sb $t4, %lo(D_8094C840)($at) /* 04440 8093D110 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04444 8093D114 00320821 */ addu $at, $at, $s2 +/* 04444 8093D114 00320821 */ addu $at, $at, $s2 /* 04448 8093D118 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 0444C 8093D11C A02D0AE1 */ sb $t5, 0x0AE1($at) ## 00010AE1 /* 04450 8093D120 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04454 8093D124 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 04458 8093D128 4405A000 */ mfc1 $a1, $f20 -/* 0445C 8093D12C 4406A000 */ mfc1 $a2, $f20 +/* 04458 8093D128 4405A000 */ mfc1 $a1, $f20 +/* 0445C 8093D12C 4406A000 */ mfc1 $a2, $f20 /* 04460 8093D130 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 04464 8093D134 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 04468 8093D138 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 0446C 8093D13C 02412021 */ addu $a0, $s2, $at + +/* 0446C 8093D13C 02412021 */ addu $a0, $s2, $at .L8093D140: /* 04470 8093D140 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 04474 8093D144 26240568 */ addiu $a0, $s1, 0x0568 ## $a0 = 00000568 /* 04478 8093D148 3C053BE5 */ lui $a1, 0x3BE5 ## $a1 = 3BE50000 -/* 0447C 8093D14C 4406A000 */ mfc1 $a2, $f20 +/* 0447C 8093D14C 4406A000 */ mfc1 $a2, $f20 /* 04480 8093D150 3C073A37 */ lui $a3, 0x3A37 ## $a3 = 3A370000 /* 04484 8093D154 34E78033 */ ori $a3, $a3, 0x8033 ## $a3 = 3A378033 /* 04488 8093D158 34A56040 */ ori $a1, $a1, 0x6040 ## $a1 = 3BE56040 /* 0448C 8093D15C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04490 8093D160 26240050 */ addiu $a0, $s1, 0x0050 ## $a0 = 00000050 /* 04494 8093D164 C6200050 */ lwc1 $f0, 0x0050($s1) ## 00000050 /* 04498 8093D168 862E0178 */ lh $t6, 0x0178($s1) ## 00000178 /* 0449C 8093D16C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 044A0 8093D170 E6200058 */ swc1 $f0, 0x0058($s1) ## 00000058 -/* 044A4 8093D174 15C10026 */ bne $t6, $at, .L8093D210 +/* 044A4 8093D174 15C10026 */ bne $t6, $at, .L8093D210 /* 044A8 8093D178 E6200054 */ swc1 $f0, 0x0054($s1) ## 00000054 -/* 044AC 8093D17C 8FA700A0 */ lw $a3, 0x00A0($sp) +/* 044AC 8093D17C 8FA700A0 */ lw $a3, 0x00A0($sp) /* 044B0 8093D180 3C014370 */ lui $at, 0x4370 ## $at = 43700000 /* 044B4 8093D184 44812000 */ mtc1 $at, $f4 ## $f4 = 240.00 /* 044B8 8093D188 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 @@ -616,36 +616,36 @@ glabel func_8093C910 /* 04524 8093D1F4 44812000 */ mtc1 $at, $f4 ## $f4 = 54.00 /* 04528 8093D1F8 E6300630 */ swc1 $f16, 0x0630($s1) ## 00000630 /* 0452C 8093D1FC C4F20028 */ lwc1 $f18, 0x0028($a3) ## 00000028 -/* 04530 8093D200 46049180 */ add.s $f6, $f18, $f4 +/* 04530 8093D200 46049180 */ add.s $f6, $f18, $f4 /* 04534 8093D204 E6260634 */ swc1 $f6, 0x0634($s1) ## 00000634 /* 04538 8093D208 C4E8002C */ lwc1 $f8, 0x002C($a3) ## 0000002C /* 0453C 8093D20C E6280638 */ swc1 $f8, 0x0638($s1) ## 00000638 .L8093D210: /* 04540 8093D210 8623017E */ lh $v1, 0x017E($s1) ## 0000017E /* 04544 8093D214 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 04548 8093D218 8FA700A0 */ lw $a3, 0x00A0($sp) -/* 0454C 8093D21C 14610006 */ bne $v1, $at, .L8093D238 +/* 04548 8093D218 8FA700A0 */ lw $a3, 0x00A0($sp) +/* 0454C 8093D21C 14610006 */ bne $v1, $at, .L8093D238 /* 04550 8093D220 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 04554 8093D224 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04558 8093D228 0C00B7D5 */ jal func_8002DF54 +/* 04558 8093D228 0C00B7D5 */ jal func_8002DF54 /* 0455C 8093D22C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 04560 8093D230 8623017E */ lh $v1, 0x017E($s1) ## 0000017E -/* 04564 8093D234 8FA700A0 */ lw $a3, 0x00A0($sp) +/* 04564 8093D234 8FA700A0 */ lw $a3, 0x00A0($sp) .L8093D238: /* 04568 8093D238 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 0456C 8093D23C 14610008 */ bne $v1, $at, .L8093D260 +/* 0456C 8093D23C 14610008 */ bne $v1, $at, .L8093D260 /* 04570 8093D240 00000000 */ nop /* 04574 8093D244 8CEB0678 */ lw $t3, 0x0678($a3) ## 00000678 /* 04578 8093D248 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 0457C 8093D24C 95650092 */ lhu $a1, 0x0092($t3) ## 00000092 /* 04580 8093D250 24A56816 */ addiu $a1, $a1, 0x6816 ## $a1 = 00006816 -/* 04584 8093D254 0C00BDF7 */ jal func_8002F7DC +/* 04584 8093D254 0C00BDF7 */ jal func_8002F7DC /* 04588 8093D258 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00006816 /* 0458C 8093D25C 8623017E */ lh $v1, 0x017E($s1) ## 0000017E .L8093D260: -/* 04590 8093D260 1060000C */ beq $v1, $zero, .L8093D294 -/* 04594 8093D264 28610014 */ slti $at, $v1, 0x0014 -/* 04598 8093D268 1020000A */ beq $at, $zero, .L8093D294 +/* 04590 8093D260 1060000C */ beq $v1, $zero, .L8093D294 +/* 04594 8093D264 28610014 */ slti $at, $v1, 0x0014 +/* 04598 8093D268 1020000A */ beq $at, $zero, .L8093D294 /* 0459C 8093D26C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 045A0 8093D270 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 045A4 8093D274 A22C05F9 */ sb $t4, 0x05F9($s1) ## 000005F9 @@ -653,9 +653,9 @@ glabel func_8093C910 /* 045AC 8093D27C 2624062C */ addiu $a0, $s1, 0x062C ## $a0 = 0000062C /* 045B0 8093D280 3C054372 */ lui $a1, 0x4372 ## $a1 = 43720000 /* 045B4 8093D284 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 045B8 8093D288 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 045BC 8093D28C 10000003 */ beq $zero, $zero, .L8093D29C +/* 045BC 8093D28C 10000003 */ beq $zero, $zero, .L8093D29C /* 045C0 8093D290 862D017A */ lh $t5, 0x017A($s1) ## 0000017A .L8093D294: /* 045C4 8093D294 A22005F9 */ sb $zero, 0x05F9($s1) ## 000005F9 @@ -663,31 +663,31 @@ glabel func_8093C910 .L8093D29C: /* 045CC 8093D29C 24020008 */ addiu $v0, $zero, 0x0008 ## $v0 = 00000008 /* 045D0 8093D2A0 240439BB */ addiu $a0, $zero, 0x39BB ## $a0 = 000039BB -/* 045D4 8093D2A4 544D0004 */ bnel $v0, $t5, .L8093D2B8 +/* 045D4 8093D2A4 544D0004 */ bnel $v0, $t5, .L8093D2B8 /* 045D8 8093D2A8 8622017C */ lh $v0, 0x017C($s1) ## 0000017C -/* 045DC 8093D2AC 0C01E221 */ jal func_80078884 +/* 045DC 8093D2AC 0C01E221 */ jal func_80078884 /* 045E0 8093D2B0 A6220162 */ sh $v0, 0x0162($s1) ## 00000162 /* 045E4 8093D2B4 8622017C */ lh $v0, 0x017C($s1) ## 0000017C .L8093D2B8: /* 045E8 8093D2B8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 045EC 8093D2BC 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 045F0 8093D2C0 14410007 */ bne $v0, $at, .L8093D2E0 +/* 045F0 8093D2C0 14410007 */ bne $v0, $at, .L8093D2E0 /* 045F4 8093D2C4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 045F8 8093D2C8 3C018095 */ lui $at, %hi(D_8094C840) ## $at = 80950000 -/* 045FC 8093D2CC A020C840 */ sb $zero, %lo(D_8094C840)($at) +/* 045FC 8093D2CC A020C840 */ sb $zero, %lo(D_8094C840)($at) /* 04600 8093D2D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04604 8093D2D4 00320821 */ addu $at, $at, $s2 +/* 04604 8093D2D4 00320821 */ addu $at, $at, $s2 /* 04608 8093D2D8 A02E0AE2 */ sb $t6, 0x0AE2($at) ## 00010AE2 /* 0460C 8093D2DC 8622017C */ lh $v0, 0x017C($s1) ## 0000017C .L8093D2E0: /* 04610 8093D2E0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 04614 8093D2E4 14410034 */ bne $v0, $at, .L8093D3B8 +/* 04614 8093D2E4 14410034 */ bne $v0, $at, .L8093D3B8 /* 04618 8093D2E8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0461C 8093D2EC 264F1D64 */ addiu $t7, $s2, 0x1D64 ## $t7 = 00001D64 /* 04620 8093D2F0 2638060C */ addiu $t8, $s1, 0x060C ## $t8 = 0000060C -/* 04624 8093D2F4 AFB80048 */ sw $t8, 0x0048($sp) -/* 04628 8093D2F8 AFAF004C */ sw $t7, 0x004C($sp) -/* 0462C 8093D2FC 0C030129 */ jal func_800C04A4 +/* 04624 8093D2F4 AFB80048 */ sw $t8, 0x0048($sp) +/* 04628 8093D2F8 AFAF004C */ sw $t7, 0x004C($sp) +/* 0462C 8093D2FC 0C030129 */ jal func_800C04A4 /* 04630 8093D300 26300600 */ addiu $s0, $s1, 0x0600 ## $s0 = 00000600 /* 04634 8093D304 8E080000 */ lw $t0, 0x0000($s0) ## 00000600 /* 04638 8093D308 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 @@ -703,24 +703,24 @@ glabel func_8093C910 /* 04660 8093D330 AC490078 */ sw $t1, 0x0078($v0) ## 00000078 /* 04664 8093D334 8E0A0008 */ lw $t2, 0x0008($s0) ## 00000608 /* 04668 8093D338 AC4A007C */ sw $t2, 0x007C($v0) ## 0000007C -/* 0466C 8093D33C 8FAB0048 */ lw $t3, 0x0048($sp) +/* 0466C 8093D33C 8FAB0048 */ lw $t3, 0x0048($sp) /* 04670 8093D340 8D6D0000 */ lw $t5, 0x0000($t3) ## 00000000 /* 04674 8093D344 AC4D0050 */ sw $t5, 0x0050($v0) ## 00000050 /* 04678 8093D348 8D6C0004 */ lw $t4, 0x0004($t3) ## 00000004 /* 0467C 8093D34C AC4C0054 */ sw $t4, 0x0054($v0) ## 00000054 /* 04680 8093D350 8D6D0008 */ lw $t5, 0x0008($t3) ## 00000008 /* 04684 8093D354 AC4D0058 */ sw $t5, 0x0058($v0) ## 00000058 -/* 04688 8093D358 0C03022B */ jal func_800C08AC +/* 04688 8093D358 0C03022B */ jal func_800C08AC /* 0468C 8093D35C 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC /* 04690 8093D360 A62005FC */ sh $zero, 0x05FC($s1) ## 000005FC /* 04694 8093D364 862E05FC */ lh $t6, 0x05FC($s1) ## 000005FC /* 04698 8093D368 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0469C 8093D36C A62E05FA */ sh $t6, 0x05FA($s1) ## 000005FA -/* 046A0 8093D370 0C01914D */ jal func_80064534 -/* 046A4 8093D374 8FA5004C */ lw $a1, 0x004C($sp) +/* 046A0 8093D370 0C01914D */ jal func_80064534 +/* 046A4 8093D374 8FA5004C */ lw $a1, 0x004C($sp) /* 046A8 8093D378 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 046AC 8093D37C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 046B0 8093D380 0C00B7D5 */ jal func_8002DF54 +/* 046B0 8093D380 0C00B7D5 */ jal func_8002DF54 /* 046B4 8093D384 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 046B8 8093D388 3C0F8095 */ lui $t7, %hi(D_8094A86C) ## $t7 = 80950000 /* 046BC 8093D38C A6200154 */ sh $zero, 0x0154($s1) ## 00000154 @@ -732,17 +732,17 @@ glabel func_8093C910 /* 046D4 8093D3A4 8DF80004 */ lw $t8, 0x0004($t7) ## 8094A870 /* 046D8 8093D3A8 AE3804B4 */ sw $t8, 0x04B4($s1) ## 000004B4 /* 046DC 8093D3AC 8DF90008 */ lw $t9, 0x0008($t7) ## 8094A874 -/* 046E0 8093D3B0 0C252870 */ jal func_8094A1C0 +/* 046E0 8093D3B0 0C252870 */ jal func_8094A1C0 /* 046E4 8093D3B4 AE3904B8 */ sw $t9, 0x04B8($s1) ## 000004B8 .L8093D3B8: -/* 046E8 8093D3B8 8FBF003C */ lw $ra, 0x003C($sp) +/* 046E8 8093D3B8 8FBF003C */ lw $ra, 0x003C($sp) .L8093D3BC: -/* 046EC 8093D3BC D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 046F0 8093D3C0 D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 046F4 8093D3C4 8FB00030 */ lw $s0, 0x0030($sp) -/* 046F8 8093D3C8 8FB10034 */ lw $s1, 0x0034($sp) -/* 046FC 8093D3CC 8FB20038 */ lw $s2, 0x0038($sp) -/* 04700 8093D3D0 03E00008 */ jr $ra +/* 046EC 8093D3BC D7B40020 */ ldc1 $f20, 0x0020($sp) +/* 046F0 8093D3C0 D7B60028 */ ldc1 $f22, 0x0028($sp) +/* 046F4 8093D3C4 8FB00030 */ lw $s0, 0x0030($sp) +/* 046F8 8093D3C8 8FB10034 */ lw $s1, 0x0034($sp) +/* 046FC 8093D3CC 8FB20038 */ lw $s2, 0x0038($sp) +/* 04700 8093D3D0 03E00008 */ jr $ra /* 04704 8093D3D4 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s index 8b44a0b929..ada7c0dd29 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s @@ -1,31 +1,31 @@ glabel func_8093D3D8 /* 04708 8093D3D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0470C 8093D3DC AFA5001C */ sw $a1, 0x001C($sp) +/* 0470C 8093D3DC AFA5001C */ sw $a1, 0x001C($sp) /* 04710 8093D3E0 3C0E8094 */ lui $t6, %hi(func_8093D444) ## $t6 = 80940000 -/* 04714 8093D3E4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 04714 8093D3E4 AFBF0014 */ sw $ra, 0x0014($sp) /* 04718 8093D3E8 25CED444 */ addiu $t6, $t6, %lo(func_8093D444) ## $t6 = 8093D444 /* 0471C 8093D3EC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 04720 8093D3F0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 04724 8093D3F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04728 8093D3F8 24A504A4 */ addiu $a1, $a1, 0x04A4 ## $a1 = 060004A4 -/* 0472C 8093D3FC AFA70018 */ sw $a3, 0x0018($sp) +/* 0472C 8093D3FC AFA70018 */ sw $a3, 0x0018($sp) /* 04730 8093D400 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 04734 8093D404 0C0294D3 */ jal func_800A534C +/* 04734 8093D404 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 04738 8093D408 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 0473C 8093D40C 8FAF0018 */ lw $t7, 0x0018($sp) +/* 0473C 8093D40C 8FAF0018 */ lw $t7, 0x0018($sp) /* 04740 8093D410 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 04744 8093D414 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 04748 8093D418 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0474C 8093D41C A1E005F8 */ sb $zero, 0x05F8($t7) ## 000005F8 -/* 04750 8093D420 4600010D */ trunc.w.s $f4, $f0 -/* 04754 8093D424 8FA80018 */ lw $t0, 0x0018($sp) -/* 04758 8093D428 44192000 */ mfc1 $t9, $f4 +/* 04750 8093D420 4600010D */ trunc.w.s $f4, $f0 +/* 04754 8093D424 8FA80018 */ lw $t0, 0x0018($sp) +/* 04758 8093D428 44192000 */ mfc1 $t9, $f4 /* 0475C 8093D42C 00000000 */ nop /* 04760 8093D430 A5190152 */ sh $t9, 0x0152($t0) ## 00000152 -/* 04764 8093D434 8FBF0014 */ lw $ra, 0x0014($sp) +/* 04764 8093D434 8FBF0014 */ lw $ra, 0x0014($sp) /* 04768 8093D438 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0476C 8093D43C 03E00008 */ jr $ra +/* 0476C 8093D43C 03E00008 */ jr $ra /* 04770 8093D440 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s index 338ccd0c98..fa27c4cba2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s @@ -1,87 +1,87 @@ glabel func_8093D5C0 /* 048F0 8093D5C0 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 048F4 8093D5C4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 048F8 8093D5C8 AFB30030 */ sw $s3, 0x0030($sp) -/* 048FC 8093D5CC AFB2002C */ sw $s2, 0x002C($sp) -/* 04900 8093D5D0 AFB10028 */ sw $s1, 0x0028($sp) -/* 04904 8093D5D4 AFB00024 */ sw $s0, 0x0024($sp) -/* 04908 8093D5D8 AFA500A4 */ sw $a1, 0x00A4($sp) -/* 0490C 8093D5DC A3A0009F */ sb $zero, 0x009F($sp) +/* 048F4 8093D5C4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 048F8 8093D5C8 AFB30030 */ sw $s3, 0x0030($sp) +/* 048FC 8093D5CC AFB2002C */ sw $s2, 0x002C($sp) +/* 04900 8093D5D0 AFB10028 */ sw $s1, 0x0028($sp) +/* 04904 8093D5D4 AFB00024 */ sw $s0, 0x0024($sp) +/* 04908 8093D5D8 AFA500A4 */ sw $a1, 0x00A4($sp) +/* 0490C 8093D5DC A3A0009F */ sb $zero, 0x009F($sp) /* 04910 8093D5E0 848205FE */ lh $v0, 0x05FE($a0) ## 000005FE /* 04914 8093D5E4 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 04918 8093D5E8 8CB01C44 */ lw $s0, 0x1C44($a1) ## 00001C44 -/* 0491C 8093D5EC 284100DD */ slti $at, $v0, 0x00DD -/* 04920 8093D5F0 14200006 */ bne $at, $zero, .L8093D60C -/* 04924 8093D5F4 28410276 */ slti $at, $v0, 0x0276 -/* 04928 8093D5F8 50200005 */ beql $at, $zero, .L8093D610 +/* 0491C 8093D5EC 284100DD */ slti $at, $v0, 0x00DD +/* 04920 8093D5F0 14200006 */ bne $at, $zero, .L8093D60C +/* 04924 8093D5F4 28410276 */ slti $at, $v0, 0x0276 +/* 04928 8093D5F8 50200005 */ beql $at, $zero, .L8093D610 /* 0492C 8093D5FC 241300B4 */ addiu $s3, $zero, 0x00B4 ## $s3 = 000000B4 -/* 04930 8093D600 0C01E221 */ jal func_80078884 +/* 04930 8093D600 0C01E221 */ jal func_80078884 /* 04934 8093D604 24043120 */ addiu $a0, $zero, 0x3120 ## $a0 = 00003120 /* 04938 8093D608 862205FE */ lh $v0, 0x05FE($s1) ## 000005FE .L8093D60C: /* 0493C 8093D60C 241300B4 */ addiu $s3, $zero, 0x00B4 ## $s3 = 000000B4 .L8093D610: -/* 04940 8093D610 5662000D */ bnel $s3, $v0, .L8093D648 +/* 04940 8093D610 5662000D */ bnel $s3, $v0, .L8093D648 /* 04944 8093D614 963805FA */ lhu $t8, 0x05FA($s1) ## 000005FA /* 04948 8093D618 3C128095 */ lui $s2, %hi(D_8094A7D0) ## $s2 = 80950000 /* 0494C 8093D61C 2652A7D0 */ addiu $s2, $s2, %lo(D_8094A7D0) ## $s2 = 8094A7D0 /* 04950 8093D620 02402025 */ or $a0, $s2, $zero ## $a0 = 8094A7D0 -/* 04954 8093D624 0C01E245 */ jal func_80078914 +/* 04954 8093D624 0C01E245 */ jal func_80078914 /* 04958 8093D628 240539B0 */ addiu $a1, $zero, 0x39B0 ## $a1 = 000039B0 /* 0495C 8093D62C 02402025 */ or $a0, $s2, $zero ## $a0 = 8094A7D0 -/* 04960 8093D630 0C01E245 */ jal func_80078914 +/* 04960 8093D630 0C01E245 */ jal func_80078914 /* 04964 8093D634 240539B1 */ addiu $a1, $zero, 0x39B1 ## $a1 = 000039B1 /* 04968 8093D638 0C03E803 */ jal Audio_SetBGM - + /* 0496C 8093D63C 24040061 */ addiu $a0, $zero, 0x0061 ## $a0 = 00000061 /* 04970 8093D640 862205FE */ lh $v0, 0x05FE($s1) ## 000005FE /* 04974 8093D644 963805FA */ lhu $t8, 0x05FA($s1) ## 000005FA .L8093D648: /* 04978 8093D648 244F0001 */ addiu $t7, $v0, 0x0001 ## $t7 = 00000001 /* 0497C 8093D64C A62F05FE */ sh $t7, 0x05FE($s1) ## 000005FE -/* 04980 8093D650 2F010015 */ sltiu $at, $t8, 0x0015 -/* 04984 8093D654 102005A5 */ beq $at, $zero, .L8093ECEC -/* 04988 8093D658 0018C080 */ sll $t8, $t8, 2 +/* 04980 8093D650 2F010015 */ sltiu $at, $t8, 0x0015 +/* 04984 8093D654 102005A5 */ beq $at, $zero, .L8093ECEC +/* 04988 8093D658 0018C080 */ sll $t8, $t8, 2 /* 0498C 8093D65C 3C018095 */ lui $at, %hi(jtbl_8094AF2C) ## $at = 80950000 -/* 04990 8093D660 00380821 */ addu $at, $at, $t8 -/* 04994 8093D664 8C38AF2C */ lw $t8, %lo(jtbl_8094AF2C)($at) -/* 04998 8093D668 03000008 */ jr $t8 +/* 04990 8093D660 00380821 */ addu $at, $at, $t8 +/* 04994 8093D664 8C38AF2C */ lw $t8, %lo(jtbl_8094AF2C)($at) +/* 04998 8093D668 03000008 */ jr $t8 /* 0499C 8093D66C 00000000 */ nop glabel L8093D670 /* 049A0 8093D670 A62005FE */ sh $zero, 0x05FE($s1) ## 000005FE /* 049A4 8093D674 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 /* 049A8 8093D678 C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C /* 049AC 8093D67C 3C018095 */ lui $at, %hi(D_8094AF80) ## $at = 80950000 -/* 049B0 8093D680 46000102 */ mul.s $f4, $f0, $f0 -/* 049B4 8093D684 C42AAF80 */ lwc1 $f10, %lo(D_8094AF80)($at) -/* 049B8 8093D688 46021182 */ mul.s $f6, $f2, $f2 -/* 049BC 8093D68C 46062200 */ add.s $f8, $f4, $f6 -/* 049C0 8093D690 460A403C */ c.lt.s $f8, $f10 +/* 049B0 8093D680 46000102 */ mul.s $f4, $f0, $f0 +/* 049B4 8093D684 C42AAF80 */ lwc1 $f10, %lo(D_8094AF80)($at) +/* 049B8 8093D688 46021182 */ mul.s $f6, $f2, $f2 +/* 049BC 8093D68C 46062200 */ add.s $f8, $f4, $f6 +/* 049C0 8093D690 460A403C */ c.lt.s $f8, $f10 /* 049C4 8093D694 00000000 */ nop -/* 049C8 8093D698 45020595 */ bc1fl .L8093ECF0 +/* 049C8 8093D698 45020595 */ bc1fl .L8093ECF0 /* 049CC 8093D69C 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC /* 049D0 8093D6A0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 049D4 8093D6A4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 049D8 8093D6A8 E600002C */ swc1 $f0, 0x002C($s0) ## 0000002C /* 049DC 8093D6AC E6000024 */ swc1 $f0, 0x0024($s0) ## 00000024 /* 049E0 8093D6B0 A63905FA */ sh $t9, 0x05FA($s1) ## 000005FA -/* 049E4 8093D6B4 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 049E8 8093D6B8 0C019148 */ jal func_80064520 +/* 049E4 8093D6B4 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 049E8 8093D6B8 0C019148 */ jal func_80064520 /* 049EC 8093D6BC 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 049F0 8093D6C0 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 049F0 8093D6C0 8FA400A4 */ lw $a0, 0x00A4($sp) /* 049F4 8093D6C4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 049F8 8093D6C8 0C00B7D5 */ jal func_8002DF54 +/* 049F8 8093D6C8 0C00B7D5 */ jal func_8002DF54 /* 049FC 8093D6CC 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 -/* 04A00 8093D6D0 0C03008C */ jal func_800C0230 -/* 04A04 8093D6D4 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 04A00 8093D6D0 0C03008C */ jal func_800C0230 +/* 04A04 8093D6D4 8FA400A4 */ lw $a0, 0x00A4($sp) /* 04A08 8093D6D8 A62205FC */ sh $v0, 0x05FC($s1) ## 000005FC -/* 04A0C 8093D6DC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 04A0C 8093D6DC 8FA400A4 */ lw $a0, 0x00A4($sp) /* 04A10 8093D6E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04A14 8093D6E4 0C0300C5 */ jal func_800C0314 +/* 04A14 8093D6E4 0C0300C5 */ jal func_800C0314 /* 04A18 8093D6E8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04A1C 8093D6EC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 04A1C 8093D6EC 8FA400A4 */ lw $a0, 0x00A4($sp) /* 04A20 8093D6F0 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC -/* 04A24 8093D6F4 0C0300C5 */ jal func_800C0314 +/* 04A24 8093D6F4 0C0300C5 */ jal func_800C0314 /* 04A28 8093D6F8 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 04A2C 8093D6FC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 04A30 8093D700 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 @@ -91,25 +91,25 @@ glabel L8093D670 /* 04A40 8093D710 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 04A44 8093D714 44816000 */ mtc1 $at, $f12 ## $f12 = 350.00 /* 04A48 8093D718 3C018095 */ lui $at, %hi(D_8094AF84) ## $at = 80950000 -/* 04A4C 8093D71C C42AAF84 */ lwc1 $f10, %lo(D_8094AF84)($at) +/* 04A4C 8093D71C C42AAF84 */ lwc1 $f10, %lo(D_8094AF84)($at) /* 04A50 8093D720 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 04A54 8093D724 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 04A58 8093D728 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 04A5C 8093D72C 46008105 */ abs.s $f4, $f16 -/* 04A60 8093D730 460C7081 */ sub.s $f2, $f14, $f12 +/* 04A5C 8093D72C 46008105 */ abs.s $f4, $f16 +/* 04A60 8093D730 460C7081 */ sub.s $f2, $f14, $f12 /* 04A64 8093D734 E6260608 */ swc1 $f6, 0x0608($s1) ## 00000608 /* 04A68 8093D738 C6260608 */ lwc1 $f6, 0x0608($s1) ## 00000608 /* 04A6C 8093D73C E62A0674 */ swc1 $f10, 0x0674($s1) ## 00000674 /* 04A70 8093D740 C62A0674 */ lwc1 $f10, 0x0674($s1) ## 00000674 -/* 04A74 8093D744 46001085 */ abs.s $f2, $f2 +/* 04A74 8093D744 46001085 */ abs.s $f2, $f2 /* 04A78 8093D748 3C014387 */ lui $at, 0x4387 ## $at = 43870000 -/* 04A7C 8093D74C 46065181 */ sub.s $f6, $f10, $f6 +/* 04A7C 8093D74C 46065181 */ sub.s $f6, $f10, $f6 /* 04A80 8093D750 44815000 */ mtc1 $at, $f10 ## $f10 = 270.00 /* 04A84 8093D754 E632060C */ swc1 $f18, 0x060C($s1) ## 0000060C /* 04A88 8093D758 C620060C */ lwc1 $f0, 0x060C($s1) ## 0000060C /* 04A8C 8093D75C E62A0610 */ swc1 $f10, 0x0610($s1) ## 00000610 /* 04A90 8093D760 C62A0610 */ lwc1 $f10, 0x0610($s1) ## 00000610 -/* 04A94 8093D764 46003185 */ abs.s $f6, $f6 +/* 04A94 8093D764 46003185 */ abs.s $f6, $f6 /* 04A98 8093D768 E6320684 */ swc1 $f18, 0x0684($s1) ## 00000684 /* 04A9C 8093D76C 3C014370 */ lui $at, 0x4370 ## $at = 43700000 /* 04AA0 8093D770 E6320614 */ swc1 $f18, 0x0614($s1) ## 00000614 @@ -121,37 +121,37 @@ glabel L8093D670 /* 04AB8 8093D788 C6320684 */ lwc1 $f18, 0x0684($s1) ## 00000684 /* 04ABC 8093D78C E628068C */ swc1 $f8, 0x068C($s1) ## 0000068C /* 04AC0 8093D790 C6280688 */ lwc1 $f8, 0x0688($s1) ## 00000688 -/* 04AC4 8093D794 46009001 */ sub.s $f0, $f18, $f0 +/* 04AC4 8093D794 46009001 */ sub.s $f0, $f18, $f0 /* 04AC8 8093D798 C632068C */ lwc1 $f18, 0x068C($s1) ## 0000068C /* 04ACC 8093D79C E62C0604 */ swc1 $f12, 0x0604($s1) ## 00000604 /* 04AD0 8093D7A0 C62C0614 */ lwc1 $f12, 0x0614($s1) ## 00000614 -/* 04AD4 8093D7A4 46000005 */ abs.s $f0, $f0 -/* 04AD8 8093D7A8 460A4281 */ sub.s $f10, $f8, $f10 +/* 04AD4 8093D7A4 46000005 */ abs.s $f0, $f0 +/* 04AD8 8093D7A8 460A4281 */ sub.s $f10, $f8, $f10 /* 04ADC 8093D7AC E630066C */ swc1 $f16, 0x066C($s1) ## 0000066C /* 04AE0 8093D7B0 E62E0670 */ swc1 $f14, 0x0670($s1) ## 00000670 /* 04AE4 8093D7B4 E6240654 */ swc1 $f4, 0x0654($s1) ## 00000654 -/* 04AE8 8093D7B8 46005285 */ abs.s $f10, $f10 -/* 04AEC 8093D7BC 460C9301 */ sub.s $f12, $f18, $f12 +/* 04AE8 8093D7B8 46005285 */ abs.s $f10, $f10 +/* 04AEC 8093D7BC 460C9301 */ sub.s $f12, $f18, $f12 /* 04AF0 8093D7C0 E6220658 */ swc1 $f2, 0x0658($s1) ## 00000658 /* 04AF4 8093D7C4 E626065C */ swc1 $f6, 0x065C($s1) ## 0000065C /* 04AF8 8093D7C8 E6200660 */ swc1 $f0, 0x0660($s1) ## 00000660 -/* 04AFC 8093D7CC 46006305 */ abs.s $f12, $f12 +/* 04AFC 8093D7CC 46006305 */ abs.s $f12, $f12 /* 04B00 8093D7D0 E62A0664 */ swc1 $f10, 0x0664($s1) ## 00000664 /* 04B04 8093D7D4 E62C0668 */ swc1 $f12, 0x0668($s1) ## 00000668 /* 04B08 8093D7D8 3C018095 */ lui $at, %hi(D_8094AF88) ## $at = 80950000 -/* 04B0C 8093D7DC C42CAF88 */ lwc1 $f12, %lo(D_8094AF88)($at) +/* 04B0C 8093D7DC C42CAF88 */ lwc1 $f12, %lo(D_8094AF88)($at) /* 04B10 8093D7E0 A6200150 */ sh $zero, 0x0150($s1) ## 00000150 -/* 04B14 8093D7E4 10000541 */ beq $zero, $zero, .L8093ECEC +/* 04B14 8093D7E4 10000541 */ beq $zero, $zero, .L8093ECEC /* 04B18 8093D7E8 E62C06A0 */ swc1 $f12, 0x06A0($s1) ## 000006A0 glabel L8093D7EC /* 04B1C 8093D7EC 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 04B20 8093D7F0 A3A9009F */ sb $t1, 0x009F($sp) +/* 04B20 8093D7F0 A3A9009F */ sb $t1, 0x009F($sp) /* 04B24 8093D7F4 862A0150 */ lh $t2, 0x0150($s1) ## 00000150 /* 04B28 8093D7F8 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 04B2C 8093D7FC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 04B30 8093D800 15410003 */ bne $t2, $at, .L8093D810 +/* 04B2C 8093D7FC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 04B30 8093D800 15410003 */ bne $t2, $at, .L8093D810 /* 04B34 8093D804 24056048 */ addiu $a1, $zero, 0x6048 ## $a1 = 00006048 -/* 04B38 8093D808 0C042DA0 */ jal func_8010B680 +/* 04B38 8093D808 0C042DA0 */ jal func_8010B680 /* 04B3C 8093D80C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 .L8093D810: /* 04B40 8093D810 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 @@ -160,49 +160,49 @@ glabel L8093D7EC /* 04B4C 8093D81C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 04B50 8093D820 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 04B54 8093D824 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04B58 8093D828 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04B5C 8093D82C 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 04B60 8093D830 8FAB00A4 */ lw $t3, 0x00A4($sp) +/* 04B60 8093D830 8FAB00A4 */ lw $t3, 0x00A4($sp) /* 04B64 8093D834 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 04B68 8093D838 28610065 */ slti $at, $v1, 0x0065 -/* 04B6C 8093D83C 1420000C */ bne $at, $zero, .L8093D870 +/* 04B68 8093D838 28610065 */ slti $at, $v1, 0x0065 +/* 04B6C 8093D83C 1420000C */ bne $at, $zero, .L8093D870 /* 04B70 8093D840 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04B74 8093D844 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04B78 8093D848 002B0821 */ addu $at, $at, $t3 +/* 04B78 8093D848 002B0821 */ addu $at, $at, $t3 /* 04B7C 8093D84C A0200AE1 */ sb $zero, 0x0AE1($at) ## 00010AE1 -/* 04B80 8093D850 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 04B80 8093D850 8FA400A4 */ lw $a0, 0x00A4($sp) /* 04B84 8093D854 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04B88 8093D858 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 04B8C 8093D85C 3C073CF5 */ lui $a3, 0x3CF5 ## $a3 = 3CF50000 /* 04B90 8093D860 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3CF5C28F /* 04B94 8093D864 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 04B98 8093D868 00812021 */ addu $a0, $a0, $at + +/* 04B98 8093D868 00812021 */ addu $a0, $a0, $at /* 04B9C 8093D86C 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093D870: -/* 04BA0 8093D870 56630005 */ bnel $s3, $v1, .L8093D888 -/* 04BA4 8093D874 286100B5 */ slti $at, $v1, 0x00B5 -/* 04BA8 8093D878 0C01E221 */ jal func_80078884 +/* 04BA0 8093D870 56630005 */ bnel $s3, $v1, .L8093D888 +/* 04BA4 8093D874 286100B5 */ slti $at, $v1, 0x00B5 +/* 04BA8 8093D878 0C01E221 */ jal func_80078884 /* 04BAC 8093D87C 2404390C */ addiu $a0, $zero, 0x390C ## $a0 = 0000390C /* 04BB0 8093D880 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 04BB4 8093D884 286100B5 */ slti $at, $v1, 0x00B5 +/* 04BB4 8093D884 286100B5 */ slti $at, $v1, 0x00B5 .L8093D888: -/* 04BB8 8093D888 14200518 */ bne $at, $zero, .L8093ECEC +/* 04BB8 8093D888 14200518 */ bne $at, $zero, .L8093ECEC /* 04BBC 8093D88C 262404D8 */ addiu $a0, $s1, 0x04D8 ## $a0 = 000004D8 /* 04BC0 8093D890 3C018095 */ lui $at, %hi(D_8094AF8C) ## $at = 80950000 -/* 04BC4 8093D894 C428AF8C */ lwc1 $f8, %lo(D_8094AF8C)($at) +/* 04BC4 8093D894 C428AF8C */ lwc1 $f8, %lo(D_8094AF8C)($at) /* 04BC8 8093D898 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 04BCC 8093D89C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04BD0 8093D8A0 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 04BD4 8093D8A4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04BD8 8093D8A8 E62804E0 */ swc1 $f8, 0x04E0($s1) ## 000004E0 /* 04BDC 8093D8AC 862C0150 */ lh $t4, 0x0150($s1) ## 00000150 /* 04BE0 8093D8B0 3C128095 */ lui $s2, %hi(D_8094C848) ## $s2 = 80950000 /* 04BE4 8093D8B4 2652C848 */ addiu $s2, $s2, %lo(D_8094C848) ## $s2 = 8094C848 -/* 04BE8 8093D8B8 298100EC */ slti $at, $t4, 0x00EC -/* 04BEC 8093D8BC 1420050B */ bne $at, $zero, .L8093ECEC +/* 04BE8 8093D8B8 298100EC */ slti $at, $t4, 0x00EC +/* 04BEC 8093D8BC 1420050B */ bne $at, $zero, .L8093ECEC /* 04BF0 8093D8C0 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 /* 04BF4 8093D8C4 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 04BF8 8093D8C8 A62D05FA */ sh $t5, 0x05FA($s1) ## 000005FA @@ -212,7 +212,7 @@ glabel L8093D7EC /* 04C08 8093D8D8 A1D00564 */ sb $s0, 0x0564($t6) ## 00000564 /* 04C0C 8093D8DC 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04C10 8093D8E0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 04C14 8093D8E4 0C0294D3 */ jal func_800A534C +/* 04C14 8093D8E4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 04C18 8093D8E8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 04C1C 8093D8EC 3C014382 */ lui $at, 0x4382 ## $at = 43820000 /* 04C20 8093D8F0 44811000 */ mtc1 $at, $f2 ## $f2 = 260.00 @@ -250,16 +250,16 @@ glabel L8093D7EC /* 04CA0 8093D970 E628060C */ swc1 $f8, 0x060C($s1) ## 0000060C /* 04CA4 8093D974 E62A0610 */ swc1 $f10, 0x0610($s1) ## 00000610 /* 04CA8 8093D978 0C00B58B */ jal Actor_SetScale - + /* 04CAC 8093D97C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 -/* 04CB0 8093D980 100004DB */ beq $zero, $zero, .L8093ECF0 +/* 04CB0 8093D980 100004DB */ beq $zero, $zero, .L8093ECF0 /* 04CB4 8093D984 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC glabel L8093D988 /* 04CB8 8093D988 3C128095 */ lui $s2, %hi(D_8094C848) ## $s2 = 80950000 /* 04CBC 8093D98C 2652C848 */ addiu $s2, $s2, %lo(D_8094C848) ## $s2 = 8094C848 /* 04CC0 8093D990 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04CC4 8093D994 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 04CC8 8093D998 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 04CCC 8093D99C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04CD0 8093D9A0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -267,19 +267,19 @@ glabel L8093D988 /* 04CD8 8093D9A8 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 /* 04CDC 8093D9AC 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 04CE0 8093D9B0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04CE4 8093D9B4 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 04CE8 8093D9B8 3C018095 */ lui $at, %hi(D_8094AF90) ## $at = 80950000 -/* 04CEC 8093D9BC C420AF90 */ lwc1 $f0, %lo(D_8094AF90)($at) +/* 04CEC 8093D9BC C420AF90 */ lwc1 $f0, %lo(D_8094AF90)($at) /* 04CF0 8093D9C0 C6240600 */ lwc1 $f4, 0x0600($s1) ## 00000600 /* 04CF4 8093D9C4 C6280608 */ lwc1 $f8, 0x0608($s1) ## 00000608 /* 04CF8 8093D9C8 862B0150 */ lh $t3, 0x0150($s1) ## 00000150 -/* 04CFC 8093D9CC 46002181 */ sub.s $f6, $f4, $f0 +/* 04CFC 8093D9CC 46002181 */ sub.s $f6, $f4, $f0 /* 04D00 8093D9D0 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 04D04 8093D9D4 29610033 */ slti $at, $t3, 0x0033 -/* 04D08 8093D9D8 46004280 */ add.s $f10, $f8, $f0 +/* 04D04 8093D9D4 29610033 */ slti $at, $t3, 0x0033 +/* 04D08 8093D9D8 46004280 */ add.s $f10, $f8, $f0 /* 04D0C 8093D9DC E6260600 */ swc1 $f6, 0x0600($s1) ## 00000600 -/* 04D10 8093D9E0 142004C2 */ bne $at, $zero, .L8093ECEC +/* 04D10 8093D9E0 142004C2 */ bne $at, $zero, .L8093ECEC /* 04D14 8093D9E4 E62A0608 */ swc1 $f10, 0x0608($s1) ## 00000608 /* 04D18 8093D9E8 C6320600 */ lwc1 $f18, 0x0600($s1) ## 00000600 /* 04D1C 8093D9EC 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 @@ -291,83 +291,83 @@ glabel L8093D988 /* 04D34 8093DA04 44814000 */ mtc1 $at, $f8 ## $f8 = -30.00 /* 04D38 8093DA08 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 04D3C 8093DA0C C624060C */ lwc1 $f4, 0x060C($s1) ## 0000060C -/* 04D40 8093DA10 46124481 */ sub.s $f18, $f8, $f18 +/* 04D40 8093DA10 46124481 */ sub.s $f18, $f8, $f18 /* 04D44 8093DA14 3C018095 */ lui $at, %hi(D_8094AF94) ## $at = 80950000 -/* 04D48 8093DA18 C422AF94 */ lwc1 $f2, %lo(D_8094AF94)($at) +/* 04D48 8093DA18 C422AF94 */ lwc1 $f2, %lo(D_8094AF94)($at) /* 04D4C 8093DA1C E628066C */ swc1 $f8, 0x066C($s1) ## 0000066C -/* 04D50 8093DA20 46009485 */ abs.s $f18, $f18 -/* 04D54 8093DA24 460E5381 */ sub.s $f14, $f10, $f14 +/* 04D50 8093DA20 46009485 */ abs.s $f18, $f18 +/* 04D54 8093DA24 460E5381 */ sub.s $f14, $f10, $f14 /* 04D58 8093DA28 E62A0670 */ swc1 $f10, 0x0670($s1) ## 00000670 /* 04D5C 8093DA2C E6300684 */ swc1 $f16, 0x0684($s1) ## 00000684 /* 04D60 8093DA30 C6300610 */ lwc1 $f16, 0x0610($s1) ## 00000610 -/* 04D64 8093DA34 46007385 */ abs.s $f14, $f14 -/* 04D68 8093DA38 460C1301 */ sub.s $f12, $f2, $f12 +/* 04D64 8093DA34 46007385 */ abs.s $f14, $f14 +/* 04D68 8093DA38 460C1301 */ sub.s $f12, $f2, $f12 /* 04D6C 8093DA3C E6220674 */ swc1 $f2, 0x0674($s1) ## 00000674 /* 04D70 8093DA40 A62C05FA */ sh $t4, 0x05FA($s1) ## 000005FA /* 04D74 8093DA44 3C018095 */ lui $at, %hi(D_8094AF98) ## $at = 80950000 -/* 04D78 8093DA48 C422AF98 */ lwc1 $f2, %lo(D_8094AF98)($at) -/* 04D7C 8093DA4C 46006305 */ abs.s $f12, $f12 -/* 04D80 8093DA50 46043101 */ sub.s $f4, $f6, $f4 +/* 04D78 8093DA48 C422AF98 */ lwc1 $f2, %lo(D_8094AF98)($at) +/* 04D7C 8093DA4C 46006305 */ abs.s $f12, $f12 +/* 04D80 8093DA50 46043101 */ sub.s $f4, $f6, $f4 /* 04D84 8093DA54 E6220688 */ swc1 $f2, 0x0688($s1) ## 00000688 /* 04D88 8093DA58 C6220688 */ lwc1 $f2, 0x0688($s1) ## 00000688 /* 04D8C 8093DA5C C6260614 */ lwc1 $f6, 0x0614($s1) ## 00000614 -/* 04D90 8093DA60 46002105 */ abs.s $f4, $f4 -/* 04D94 8093DA64 46101401 */ sub.s $f16, $f2, $f16 +/* 04D90 8093DA60 46002105 */ abs.s $f4, $f4 +/* 04D94 8093DA64 46101401 */ sub.s $f16, $f2, $f16 /* 04D98 8093DA68 3C014411 */ lui $at, 0x4411 ## $at = 44110000 /* 04D9C 8093DA6C 44811000 */ mtc1 $at, $f2 ## $f2 = 580.00 /* 04DA0 8093DA70 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 04DA4 8093DA74 46008405 */ abs.s $f16, $f16 +/* 04DA4 8093DA74 46008405 */ abs.s $f16, $f16 /* 04DA8 8093DA78 E622068C */ swc1 $f2, 0x068C($s1) ## 0000068C /* 04DAC 8093DA7C C622068C */ lwc1 $f2, 0x068C($s1) ## 0000068C /* 04DB0 8093DA80 E6320654 */ swc1 $f18, 0x0654($s1) ## 00000654 /* 04DB4 8093DA84 E62E0658 */ swc1 $f14, 0x0658($s1) ## 00000658 -/* 04DB8 8093DA88 46061181 */ sub.s $f6, $f2, $f6 +/* 04DB8 8093DA88 46061181 */ sub.s $f6, $f2, $f6 /* 04DBC 8093DA8C E62C065C */ swc1 $f12, 0x065C($s1) ## 0000065C /* 04DC0 8093DA90 E6240660 */ swc1 $f4, 0x0660($s1) ## 00000660 /* 04DC4 8093DA94 E6300664 */ swc1 $f16, 0x0664($s1) ## 00000664 -/* 04DC8 8093DA98 46003185 */ abs.s $f6, $f6 +/* 04DC8 8093DA98 46003185 */ abs.s $f6, $f6 /* 04DCC 8093DA9C E62A069C */ swc1 $f10, 0x069C($s1) ## 0000069C /* 04DD0 8093DAA0 E6260668 */ swc1 $f6, 0x0668($s1) ## 00000668 /* 04DD4 8093DAA4 3C018095 */ lui $at, %hi(D_8094AF9C) ## $at = 80950000 -/* 04DD8 8093DAA8 C426AF9C */ lwc1 $f6, %lo(D_8094AF9C)($at) +/* 04DD8 8093DAA8 C426AF9C */ lwc1 $f6, %lo(D_8094AF9C)($at) /* 04DDC 8093DAAC A6200150 */ sh $zero, 0x0150($s1) ## 00000150 -/* 04DE0 8093DAB0 1000048E */ beq $zero, $zero, .L8093ECEC +/* 04DE0 8093DAB0 1000048E */ beq $zero, $zero, .L8093ECEC /* 04DE4 8093DAB4 E62606A0 */ swc1 $f6, 0x06A0($s1) ## 000006A0 glabel L8093DAB8 /* 04DE8 8093DAB8 3C128095 */ lui $s2, %hi(D_8094C848) ## $s2 = 80950000 /* 04DEC 8093DABC 2652C848 */ addiu $s2, $s2, %lo(D_8094C848) ## $s2 = 8094C848 /* 04DF0 8093DAC0 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04DF4 8093DAC4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 04DF8 8093DAC8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 04DFC 8093DACC 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04E00 8093DAD0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 04E04 8093DAD4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 04E08 8093DAD8 A3AD009F */ sb $t5, 0x009F($sp) +/* 04E08 8093DAD8 A3AD009F */ sb $t5, 0x009F($sp) /* 04E0C 8093DADC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04E10 8093DAE0 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 /* 04E14 8093DAE4 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 04E18 8093DAE8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04E1C 8093DAEC 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 04E20 8093DAF0 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 04E24 8093DAF4 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 04E28 8093DAF8 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 04E2C 8093DAFC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 04E30 8093DB00 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04E34 8093DB04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04E38 8093DB08 86230150 */ lh $v1, 0x0150($s1) ## 00000150 /* 04E3C 8093DB0C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 04E40 8093DB10 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 04E44 8093DB14 14610004 */ bne $v1, $at, .L8093DB28 +/* 04E40 8093DB10 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 04E44 8093DB14 14610004 */ bne $v1, $at, .L8093DB28 /* 04E48 8093DB18 24056049 */ addiu $a1, $zero, 0x6049 ## $a1 = 00006049 -/* 04E4C 8093DB1C 0C042DA0 */ jal func_8010B680 +/* 04E4C 8093DB1C 0C042DA0 */ jal func_8010B680 /* 04E50 8093DB20 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04E54 8093DB24 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093DB28: -/* 04E58 8093DB28 28610051 */ slti $at, $v1, 0x0051 -/* 04E5C 8093DB2C 1420046F */ bne $at, $zero, .L8093ECEC +/* 04E58 8093DB28 28610051 */ slti $at, $v1, 0x0051 +/* 04E5C 8093DB2C 1420046F */ bne $at, $zero, .L8093ECEC /* 04E60 8093DB30 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 04E64 8093DB34 3C014382 */ lui $at, 0x4382 ## $at = 43820000 /* 04E68 8093DB38 44811000 */ mtc1 $at, $f2 ## $f2 = 260.00 @@ -393,61 +393,61 @@ glabel L8093DAB8 /* 04EB8 8093DB88 02002825 */ or $a1, $s0, $zero ## $a1 = 06000AAC /* 04EBC 8093DB8C C7040028 */ lwc1 $f4, 0x0028($t8) ## 00000028 /* 04EC0 8093DB90 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 04EC4 8093DB94 46062200 */ add.s $f8, $f4, $f6 +/* 04EC4 8093DB94 46062200 */ add.s $f8, $f4, $f6 /* 04EC8 8093DB98 C6240600 */ lwc1 $f4, 0x0600($s1) ## 00000600 /* 04ECC 8093DB9C C6260604 */ lwc1 $f6, 0x0604($s1) ## 00000604 -/* 04ED0 8093DBA0 46046001 */ sub.s $f0, $f12, $f4 +/* 04ED0 8093DBA0 46046001 */ sub.s $f0, $f12, $f4 /* 04ED4 8093DBA4 E6280688 */ swc1 $f8, 0x0688($s1) ## 00000688 /* 04ED8 8093DBA8 8E590000 */ lw $t9, 0x0000($s2) ## 8094C848 /* 04EDC 8093DBAC C6280608 */ lwc1 $f8, 0x0608($s1) ## 00000608 -/* 04EE0 8093DBB0 46000005 */ abs.s $f0, $f0 +/* 04EE0 8093DBB0 46000005 */ abs.s $f0, $f0 /* 04EE4 8093DBB4 C72A002C */ lwc1 $f10, 0x002C($t9) ## 0000002C /* 04EE8 8093DBB8 E6200654 */ swc1 $f0, 0x0654($s1) ## 00000654 -/* 04EEC 8093DBBC 46061001 */ sub.s $f0, $f2, $f6 +/* 04EEC 8093DBBC 46061001 */ sub.s $f0, $f2, $f6 /* 04EF0 8093DBC0 E62A068C */ swc1 $f10, 0x068C($s1) ## 0000068C /* 04EF4 8093DBC4 C62A0684 */ lwc1 $f10, 0x0684($s1) ## 00000684 /* 04EF8 8093DBC8 C624060C */ lwc1 $f4, 0x060C($s1) ## 0000060C -/* 04EFC 8093DBCC 46000005 */ abs.s $f0, $f0 +/* 04EFC 8093DBCC 46000005 */ abs.s $f0, $f0 /* 04F00 8093DBD0 C6260688 */ lwc1 $f6, 0x0688($s1) ## 00000688 /* 04F04 8093DBD4 E6200658 */ swc1 $f0, 0x0658($s1) ## 00000658 -/* 04F08 8093DBD8 46087001 */ sub.s $f0, $f14, $f8 +/* 04F08 8093DBD8 46087001 */ sub.s $f0, $f14, $f8 /* 04F0C 8093DBDC C6280610 */ lwc1 $f8, 0x0610($s1) ## 00000610 -/* 04F10 8093DBE0 46000005 */ abs.s $f0, $f0 +/* 04F10 8093DBE0 46000005 */ abs.s $f0, $f0 /* 04F14 8093DBE4 E620065C */ swc1 $f0, 0x065C($s1) ## 0000065C -/* 04F18 8093DBE8 46045001 */ sub.s $f0, $f10, $f4 +/* 04F18 8093DBE8 46045001 */ sub.s $f0, $f10, $f4 /* 04F1C 8093DBEC C6240614 */ lwc1 $f4, 0x0614($s1) ## 00000614 /* 04F20 8093DBF0 C62A068C */ lwc1 $f10, 0x068C($s1) ## 0000068C -/* 04F24 8093DBF4 46000005 */ abs.s $f0, $f0 +/* 04F24 8093DBF4 46000005 */ abs.s $f0, $f0 /* 04F28 8093DBF8 E6200660 */ swc1 $f0, 0x0660($s1) ## 00000660 -/* 04F2C 8093DBFC 46083001 */ sub.s $f0, $f6, $f8 +/* 04F2C 8093DBFC 46083001 */ sub.s $f0, $f6, $f8 /* 04F30 8093DC00 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 04F34 8093DC04 46000005 */ abs.s $f0, $f0 +/* 04F34 8093DC04 46000005 */ abs.s $f0, $f0 /* 04F38 8093DC08 E626069C */ swc1 $f6, 0x069C($s1) ## 0000069C /* 04F3C 8093DC0C E6200664 */ swc1 $f0, 0x0664($s1) ## 00000664 -/* 04F40 8093DC10 46045001 */ sub.s $f0, $f10, $f4 -/* 04F44 8093DC14 46000005 */ abs.s $f0, $f0 +/* 04F40 8093DC10 46045001 */ sub.s $f0, $f10, $f4 +/* 04F44 8093DC14 46000005 */ abs.s $f0, $f0 /* 04F48 8093DC18 E6200668 */ swc1 $f0, 0x0668($s1) ## 00000668 -/* 04F4C 8093DC1C C428AFA0 */ lwc1 $f8, %lo(D_8094AFA0)($at) +/* 04F4C 8093DC1C C428AFA0 */ lwc1 $f8, %lo(D_8094AFA0)($at) /* 04F50 8093DC20 E62806A0 */ swc1 $f8, 0x06A0($s1) ## 000006A0 /* 04F54 8093DC24 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 -/* 04F58 8093DC28 0C029490 */ jal func_800A5240 +/* 04F58 8093DC28 0C029490 */ jal func_800A5240 /* 04F5C 8093DC2C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 04F60 8093DC30 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04F64 8093DC34 02002025 */ or $a0, $s0, $zero ## $a0 = 06000AAC /* 04F68 8093DC38 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 04F6C 8093DC3C A6200150 */ sh $zero, 0x0150($s1) ## 00000150 -/* 04F70 8093DC40 46805120 */ cvt.s.w $f4, $f10 -/* 04F74 8093DC44 10000429 */ beq $zero, $zero, .L8093ECEC +/* 04F70 8093DC40 46805120 */ cvt.s.w $f4, $f10 +/* 04F74 8093DC44 10000429 */ beq $zero, $zero, .L8093ECEC /* 04F78 8093DC48 E62401A4 */ swc1 $f4, 0x01A4($s1) ## 000001A4 glabel L8093DC4C /* 04F7C 8093DC4C 3C128095 */ lui $s2, %hi(D_8094C848) ## $s2 = 80950000 /* 04F80 8093DC50 2652C848 */ addiu $s2, $s2, %lo(D_8094C848) ## $s2 = 8094C848 /* 04F84 8093DC54 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04F88 8093DC58 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 04F8C 8093DC5C A3A8009F */ sb $t0, 0x009F($sp) +/* 04F8C 8093DC5C A3A8009F */ sb $t0, 0x009F($sp) /* 04F90 8093DC60 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 04F94 8093DC64 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 04F98 8093DC68 8E490000 */ lw $t1, 0x0000($s2) ## 8094C848 /* 04F9C 8093DC6C 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 @@ -456,207 +456,207 @@ glabel L8093DC4C /* 04FA8 8093DC78 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 04FAC 8093DC7C C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 /* 04FB0 8093DC80 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 04FB4 8093DC84 44058000 */ mfc1 $a1, $f16 -/* 04FB8 8093DC88 46083280 */ add.s $f10, $f6, $f8 +/* 04FB4 8093DC84 44058000 */ mfc1 $a1, $f16 +/* 04FB8 8093DC88 46083280 */ add.s $f10, $f6, $f8 /* 04FBC 8093DC8C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04FC0 8093DC90 8E270068 */ lw $a3, 0x0068($s1) ## 00000068 /* 04FC4 8093DC94 E62A0688 */ swc1 $f10, 0x0688($s1) ## 00000688 /* 04FC8 8093DC98 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04FCC 8093DC9C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04FD0 8093DCA0 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 04FD4 8093DCA4 3C073F66 */ lui $a3, 0x3F66 ## $a3 = 3F660000 /* 04FD8 8093DCA8 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 3F666666 /* 04FDC 8093DCAC 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 /* 04FE0 8093DCB0 3C054110 */ lui $a1, 0x4110 ## $a1 = 41100000 /* 04FE4 8093DCB4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04FE8 8093DCB8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04FEC 8093DCBC 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 04FF0 8093DCC0 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 04FF4 8093DCC4 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 04FF8 8093DCC8 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 04FFC 8093DCCC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05000 8093DCD0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05004 8093DCD4 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 05008 8093DCD8 2861001E */ slti $at, $v1, 0x001E -/* 0500C 8093DCDC 142000F5 */ bne $at, $zero, .L8093E0B4 +/* 05008 8093DCD8 2861001E */ slti $at, $v1, 0x001E +/* 0500C 8093DCDC 142000F5 */ bne $at, $zero, .L8093E0B4 /* 05010 8093DCE0 30780007 */ andi $t8, $v1, 0x0007 ## $t8 = 00000000 -/* 05014 8093DCE4 2861002D */ slti $at, $v1, 0x002D -/* 05018 8093DCE8 10200011 */ beq $at, $zero, .L8093DD30 -/* 0501C 8093DCEC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 05020 8093DCF0 8FAA00A4 */ lw $t2, 0x00A4($sp) +/* 05014 8093DCE4 2861002D */ slti $at, $v1, 0x002D +/* 05018 8093DCE8 10200011 */ beq $at, $zero, .L8093DD30 +/* 0501C 8093DCEC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05020 8093DCF0 8FAA00A4 */ lw $t2, 0x00A4($sp) /* 05024 8093DCF4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05028 8093DCF8 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 0502C 8093DCFC 002A0821 */ addu $at, $at, $t2 +/* 0502C 8093DCFC 002A0821 */ addu $at, $at, $t2 /* 05030 8093DD00 A0200AE2 */ sb $zero, 0x0AE2($at) ## 00010AE2 -/* 05034 8093DD04 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 05034 8093DD04 8FAC00A4 */ lw $t4, 0x00A4($sp) /* 05038 8093DD08 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0503C 8093DD0C 002C0821 */ addu $at, $at, $t4 +/* 0503C 8093DD0C 002C0821 */ addu $at, $at, $t4 /* 05040 8093DD10 A02B0AE1 */ sb $t3, 0x0AE1($at) ## 00010AE1 -/* 05044 8093DD14 8FAD00A4 */ lw $t5, 0x00A4($sp) +/* 05044 8093DD14 8FAD00A4 */ lw $t5, 0x00A4($sp) /* 05048 8093DD18 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0504C 8093DD1C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 05050 8093DD20 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05054 8093DD24 002D0821 */ addu $at, $at, $t5 -/* 05058 8093DD28 10000008 */ beq $zero, $zero, .L8093DD4C +/* 05054 8093DD24 002D0821 */ addu $at, $at, $t5 +/* 05058 8093DD28 10000008 */ beq $zero, $zero, .L8093DD4C /* 0505C 8093DD2C E4240AFC */ swc1 $f4, 0x0AFC($at) ## 00010AFC .L8093DD30: /* 05060 8093DD30 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05064 8093DD34 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 05068 8093DD38 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 0506C 8093DD3C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 05070 8093DD40 00812021 */ addu $a0, $a0, $at +/* 05070 8093DD40 00812021 */ addu $a0, $a0, $at /* 05074 8093DD44 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 05078 8093DD48 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 .L8093DD4C: /* 0507C 8093DD4C 86230150 */ lh $v1, 0x0150($s1) ## 00000150 /* 05080 8093DD50 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 05084 8093DD54 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 05088 8093DD58 14610041 */ bne $v1, $at, .L8093DE60 +/* 05088 8093DD58 14610041 */ bne $v1, $at, .L8093DE60 /* 0508C 8093DD5C 27B30074 */ addiu $s3, $sp, 0x0074 ## $s3 = FFFFFFD4 /* 05090 8093DD60 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L8093DD64: /* 05094 8093DD64 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 05098 8093DD68 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0509C 8093DD6C 00000000 */ nop /* 050A0 8093DD70 8E4E0000 */ lw $t6, 0x0000($s2) ## 8094C848 /* 050A4 8093DD74 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 050A8 8093DD78 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 050AC 8093DD7C C5C60024 */ lwc1 $f6, 0x0024($t6) ## 00000024 -/* 050B0 8093DD80 46060200 */ add.s $f8, $f0, $f6 +/* 050B0 8093DD80 46060200 */ add.s $f8, $f0, $f6 /* 050B4 8093DD84 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 050B8 8093DD88 E7A80074 */ swc1 $f8, 0x0074($sp) + +/* 050B8 8093DD88 E7A80074 */ swc1 $f8, 0x0074($sp) /* 050BC 8093DD8C 8E4F0000 */ lw $t7, 0x0000($s2) ## 8094C848 /* 050C0 8093DD90 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 050C4 8093DD94 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 050C8 8093DD98 C5EA0028 */ lwc1 $f10, 0x0028($t7) ## 00000028 -/* 050CC 8093DD9C 460A0100 */ add.s $f4, $f0, $f10 +/* 050CC 8093DD9C 460A0100 */ add.s $f4, $f0, $f10 /* 050D0 8093DDA0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 050D4 8093DDA4 E7A40078 */ swc1 $f4, 0x0078($sp) + +/* 050D4 8093DDA4 E7A40078 */ swc1 $f4, 0x0078($sp) /* 050D8 8093DDA8 8E580000 */ lw $t8, 0x0000($s2) ## 8094C848 /* 050DC 8093DDAC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 050E0 8093DDB0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 050E4 8093DDB4 C706002C */ lwc1 $f6, 0x002C($t8) ## 0000002C -/* 050E8 8093DDB8 46060200 */ add.s $f8, $f0, $f6 +/* 050E8 8093DDB8 46060200 */ add.s $f8, $f0, $f6 /* 050EC 8093DDBC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 050F0 8093DDC0 E7A8007C */ swc1 $f8, 0x007C($sp) + +/* 050F0 8093DDC0 E7A8007C */ swc1 $f8, 0x007C($sp) /* 050F4 8093DDC4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 050F8 8093DDC8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 050FC 8093DDCC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 05100 8093DDD0 E7A00068 */ swc1 $f0, 0x0068($sp) + +/* 05100 8093DDD0 E7A00068 */ swc1 $f0, 0x0068($sp) /* 05104 8093DDD4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05108 8093DDD8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 0510C 8093DDDC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 05110 8093DDE0 E7A0006C */ swc1 $f0, 0x006C($sp) + +/* 05110 8093DDE0 E7A0006C */ swc1 $f0, 0x006C($sp) /* 05114 8093DDE4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 05118 8093DDE8 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0511C 8093DDEC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 05120 8093DDF0 E7A00070 */ swc1 $f0, 0x0070($sp) + +/* 05120 8093DDF0 E7A00070 */ swc1 $f0, 0x0070($sp) /* 05124 8093DDF4 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 05128 8093DDF8 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 /* 0512C 8093DDFC 3C078095 */ lui $a3, %hi(D_8094A7DC) ## $a3 = 80950000 /* 05130 8093DE00 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 05134 8093DE04 460A0100 */ add.s $f4, $f0, $f10 -/* 05138 8093DE08 AFB90014 */ sw $t9, 0x0014($sp) +/* 05134 8093DE04 460A0100 */ add.s $f4, $f0, $f10 +/* 05138 8093DE08 AFB90014 */ sw $t9, 0x0014($sp) /* 0513C 8093DE0C 24E7A7DC */ addiu $a3, $a3, %lo(D_8094A7DC) ## $a3 = 8094A7DC -/* 05140 8093DE10 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 05144 8093DE14 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 05140 8093DE10 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05144 8093DE14 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05148 8093DE18 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFD4 -/* 0514C 8093DE1C 0C24E41C */ jal func_80939070 +/* 0514C 8093DE1C 0C24E41C */ jal func_80939070 /* 05150 8093DE20 27A60068 */ addiu $a2, $sp, 0x0068 ## $a2 = FFFFFFC8 /* 05154 8093DE24 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 05158 8093DE28 00108400 */ sll $s0, $s0, 16 -/* 0515C 8093DE2C 00108403 */ sra $s0, $s0, 16 -/* 05160 8093DE30 2A010032 */ slti $at, $s0, 0x0032 -/* 05164 8093DE34 5420FFCB */ bnel $at, $zero, .L8093DD64 +/* 05158 8093DE28 00108400 */ sll $s0, $s0, 16 +/* 0515C 8093DE2C 00108403 */ sra $s0, $s0, 16 +/* 05160 8093DE30 2A010032 */ slti $at, $s0, 0x0032 +/* 05164 8093DE34 5420FFCB */ bnel $at, $zero, .L8093DD64 /* 05168 8093DE38 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0516C 8093DE3C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05170 8093DE40 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05174 8093DE44 2405390D */ addiu $a1, $zero, 0x390D ## $a1 = 0000390D -/* 05178 8093DE48 8FA800A4 */ lw $t0, 0x00A4($sp) +/* 05178 8093DE48 8FA800A4 */ lw $t0, 0x00A4($sp) /* 0517C 8093DE4C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 05180 8093DE50 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05184 8093DE54 00280821 */ addu $at, $at, $t0 +/* 05184 8093DE54 00280821 */ addu $at, $at, $t0 /* 05188 8093DE58 E4260AFC */ swc1 $f6, 0x0AFC($at) ## 00010AFC /* 0518C 8093DE5C 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093DE60: -/* 05190 8093DE60 28610023 */ slti $at, $v1, 0x0023 -/* 05194 8093DE64 1420008A */ bne $at, $zero, .L8093E090 -/* 05198 8093DE68 28610032 */ slti $at, $v1, 0x0032 -/* 0519C 8093DE6C 10200019 */ beq $at, $zero, .L8093DED4 -/* 051A0 8093DE70 00032140 */ sll $a0, $v1, 5 -/* 051A4 8093DE74 00832021 */ addu $a0, $a0, $v1 -/* 051A8 8093DE78 00042240 */ sll $a0, $a0, 9 -/* 051AC 8093DE7C 00042400 */ sll $a0, $a0, 16 +/* 05190 8093DE60 28610023 */ slti $at, $v1, 0x0023 +/* 05194 8093DE64 1420008A */ bne $at, $zero, .L8093E090 +/* 05198 8093DE68 28610032 */ slti $at, $v1, 0x0032 +/* 0519C 8093DE6C 10200019 */ beq $at, $zero, .L8093DED4 +/* 051A0 8093DE70 00032140 */ sll $a0, $v1, 5 +/* 051A4 8093DE74 00832021 */ addu $a0, $a0, $v1 +/* 051A8 8093DE78 00042240 */ sll $a0, $a0, 9 +/* 051AC 8093DE7C 00042400 */ sll $a0, $a0, 16 /* 051B0 8093DE80 0C01DE1C */ jal Math_Sins ## sins? -/* 051B4 8093DE84 00042403 */ sra $a0, $a0, 16 +/* 051B4 8093DE84 00042403 */ sra $a0, $a0, 16 /* 051B8 8093DE88 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 051BC 8093DE8C 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 051C0 8093DE90 3C018095 */ lui $at, %hi(D_8094AFA4) ## $at = 80950000 -/* 051C4 8093DE94 C424AFA4 */ lwc1 $f4, %lo(D_8094AFA4)($at) -/* 051C8 8093DE98 46080282 */ mul.s $f10, $f0, $f8 +/* 051C4 8093DE94 C424AFA4 */ lwc1 $f4, %lo(D_8094AFA4)($at) +/* 051C8 8093DE98 46080282 */ mul.s $f10, $f0, $f8 /* 051CC 8093DE9C 3C018095 */ lui $at, %hi(D_8094AFA8) ## $at = 80950000 -/* 051D0 8093DEA0 C428AFA8 */ lwc1 $f8, %lo(D_8094AFA8)($at) +/* 051D0 8093DEA0 C428AFA8 */ lwc1 $f8, %lo(D_8094AFA8)($at) /* 051D4 8093DEA4 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 051D8 8093DEA8 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 /* 051DC 8093DEAC 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 051E0 8093DEB0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 051E4 8093DEB4 46045183 */ div.s $f6, $f10, $f4 +/* 051E4 8093DEB4 46045183 */ div.s $f6, $f10, $f4 /* 051E8 8093DEB8 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 -/* 051EC 8093DEBC 46083280 */ add.s $f10, $f6, $f8 -/* 051F0 8093DEC0 44055000 */ mfc1 $a1, $f10 +/* 051EC 8093DEBC 46083280 */ add.s $f10, $f6, $f8 +/* 051F0 8093DEC0 44055000 */ mfc1 $a1, $f10 /* 051F4 8093DEC4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 051F8 8093DEC8 00000000 */ nop -/* 051FC 8093DECC 1000002E */ beq $zero, $zero, .L8093DF88 +/* 051FC 8093DECC 1000002E */ beq $zero, $zero, .L8093DF88 /* 05200 8093DED0 8E500000 */ lw $s0, 0x0000($s2) ## 8094C848 .L8093DED4: /* 05204 8093DED4 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 05208 8093DED8 1461000D */ bne $v1, $at, .L8093DF10 +/* 05208 8093DED8 1461000D */ bne $v1, $at, .L8093DF10 /* 0520C 8093DEDC 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 05210 8093DEE0 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05214 8093DEE4 261088C8 */ addiu $s0, $s0, 0x88C8 ## $s0 = 060088C8 /* 05218 8093DEE8 02002825 */ or $a1, $s0, $zero ## $a1 = 060088C8 /* 0521C 8093DEEC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 05220 8093DEF0 0C029490 */ jal func_800A5240 +/* 05220 8093DEF0 0C029490 */ jal func_800A5240 /* 05224 8093DEF4 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05228 8093DEF8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0522C 8093DEFC 02002025 */ or $a0, $s0, $zero ## $a0 = 060088C8 /* 05230 8093DF00 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 05234 8093DF04 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 05238 8093DF08 468021A0 */ cvt.s.w $f6, $f4 +/* 05238 8093DF08 468021A0 */ cvt.s.w $f6, $f4 /* 0523C 8093DF0C E62601A4 */ swc1 $f6, 0x01A4($s1) ## 000001A4 .L8093DF10: /* 05240 8093DF10 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 05244 8093DF14 14610003 */ bne $v1, $at, .L8093DF24 +/* 05244 8093DF14 14610003 */ bne $v1, $at, .L8093DF24 /* 05248 8093DF18 240539B0 */ addiu $a1, $zero, 0x39B0 ## $a1 = 000039B0 /* 0524C 8093DF1C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05250 8093DF20 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 .L8093DF24: /* 05254 8093DF24 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05258 8093DF28 8E2501A4 */ lw $a1, 0x01A4($s1) ## 000001A4 -/* 0525C 8093DF2C 0C0295B2 */ jal func_800A56C8 +/* 0525C 8093DF2C 0C0295B2 */ jal func_800A56C8 /* 05260 8093DF30 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 05264 8093DF34 1040000A */ beq $v0, $zero, .L8093DF60 +/* 05264 8093DF34 1040000A */ beq $v0, $zero, .L8093DF60 /* 05268 8093DF38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0526C 8093DF3C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05270 8093DF40 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 05274 8093DF44 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05278 8093DF48 0C0294D3 */ jal func_800A534C +/* 05278 8093DF48 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0527C 8093DF4C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05280 8093DF50 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 05284 8093DF54 44814000 */ mtc1 $at, $f8 ## $f8 = 1000.00 @@ -671,13 +671,13 @@ glabel L8093DC4C /* 052A4 8093DF74 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 052A8 8093DF78 34A5CCCC */ ori $a1, $a1, 0xCCCC ## $a1 = 3CCCCCCC /* 052AC 8093DF7C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 052B0 8093DF80 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 /* 052B4 8093DF84 8E500000 */ lw $s0, 0x0000($s2) ## 8094C848 .L8093DF88: /* 052B8 8093DF88 02002025 */ or $a0, $s0, $zero ## $a0 = 060088C8 /* 052BC 8093DF8C 0C00B58B */ jal Actor_SetScale - + /* 052C0 8093DF90 8E050050 */ lw $a1, 0x0050($s0) ## 06008918 /* 052C4 8093DF94 8E4A0000 */ lw $t2, 0x0000($s2) ## 8094C848 /* 052C8 8093DF98 24098000 */ addiu $t1, $zero, 0x8000 ## $t1 = FFFF8000 @@ -690,7 +690,7 @@ glabel L8093DC4C /* 052E4 8093DFB4 862C0150 */ lh $t4, 0x0150($s1) ## 00000150 /* 052E8 8093DFB8 2673C844 */ addiu $s3, $s3, %lo(D_8094C844) ## $s3 = 8094C844 /* 052EC 8093DFBC 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A -/* 052F0 8093DFC0 548C034B */ bnel $a0, $t4, .L8093ECF0 +/* 052F0 8093DFC0 548C034B */ bnel $a0, $t4, .L8093ECF0 /* 052F4 8093DFC4 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC /* 052F8 8093DFC8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 052FC 8093DFCC A62D05FA */ sh $t5, 0x05FA($s1) ## 000005FA @@ -702,7 +702,7 @@ glabel L8093DC4C /* 05314 8093DFE4 A1D00564 */ sb $s0, 0x0564($t6) ## 00000564 /* 05318 8093DFE8 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 0531C 8093DFEC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05320 8093DFF0 0C0294D3 */ jal func_800A534C +/* 05320 8093DFF0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 05324 8093DFF4 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 000005CC /* 05328 8093DFF8 3C014382 */ lui $at, 0x4382 ## $at = 43820000 /* 0532C 8093DFFC 44811000 */ mtc1 $at, $f2 ## $f2 = 260.00 @@ -739,61 +739,61 @@ glabel L8093DC4C /* 053A8 8093E078 E62A060C */ swc1 $f10, 0x060C($s1) ## 0000060C /* 053AC 8093E07C E6240610 */ swc1 $f4, 0x0610($s1) ## 00000610 /* 053B0 8093E080 0C00B58B */ jal Actor_SetScale - + /* 053B4 8093E084 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 -/* 053B8 8093E088 10000319 */ beq $zero, $zero, .L8093ECF0 +/* 053B8 8093E088 10000319 */ beq $zero, $zero, .L8093ECF0 /* 053BC 8093E08C 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC .L8093E090: /* 053C0 8093E090 C62606B0 */ lwc1 $f6, 0x06B0($s1) ## 000006B0 /* 053C4 8093E094 8E500000 */ lw $s0, 0x0000($s2) ## 8094C848 -/* 053C8 8093E098 4600320D */ trunc.w.s $f8, $f6 +/* 053C8 8093E098 4600320D */ trunc.w.s $f8, $f6 /* 053CC 8093E09C 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B7 -/* 053D0 8093E0A0 440E4000 */ mfc1 $t6, $f8 +/* 053D0 8093E0A0 440E4000 */ mfc1 $t6, $f8 /* 053D4 8093E0A4 00000000 */ nop -/* 053D8 8093E0A8 014E7821 */ addu $t7, $t2, $t6 -/* 053DC 8093E0AC 1000030F */ beq $zero, $zero, .L8093ECEC +/* 053D8 8093E0A8 014E7821 */ addu $t7, $t2, $t6 +/* 053DC 8093E0AC 1000030F */ beq $zero, $zero, .L8093ECEC /* 053E0 8093E0B0 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B7 .L8093E0B4: -/* 053E4 8093E0B4 17000003 */ bne $t8, $zero, .L8093E0C4 +/* 053E4 8093E0B4 17000003 */ bne $t8, $zero, .L8093E0C4 /* 053E8 8093E0B8 24053921 */ addiu $a1, $zero, 0x3921 ## $a1 = 00003921 /* 053EC 8093E0BC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 053F0 8093E0C0 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 .L8093E0C4: /* 053F4 8093E0C4 C62A06B0 */ lwc1 $f10, 0x06B0($s1) ## 000006B0 /* 053F8 8093E0C8 8E500000 */ lw $s0, 0x0000($s2) ## 8094C848 /* 053FC 8093E0CC 262406B0 */ addiu $a0, $s1, 0x06B0 ## $a0 = 000006B0 -/* 05400 8093E0D0 4600510D */ trunc.w.s $f4, $f10 +/* 05400 8093E0D0 4600510D */ trunc.w.s $f4, $f10 /* 05404 8093E0D4 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B7 /* 05408 8093E0D8 3C054640 */ lui $a1, 0x4640 ## $a1 = 46400000 /* 0540C 8093E0DC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05410 8093E0E0 440C2000 */ mfc1 $t4, $f4 +/* 05410 8093E0E0 440C2000 */ mfc1 $t4, $f4 /* 05414 8093E0E4 3C0743C0 */ lui $a3, 0x43C0 ## $a3 = 43C00000 -/* 05418 8093E0E8 032C6821 */ addu $t5, $t9, $t4 +/* 05418 8093E0E8 032C6821 */ addu $t5, $t9, $t4 /* 0541C 8093E0EC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05420 8093E0F0 A60D00B6 */ sh $t5, 0x00B6($s0) ## 000000B7 /* 05424 8093E0F4 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05428 8093E0F8 8E2501A4 */ lw $a1, 0x01A4($s1) ## 000001A4 -/* 0542C 8093E0FC 0C0295B2 */ jal func_800A56C8 +/* 0542C 8093E0FC 0C0295B2 */ jal func_800A56C8 /* 05430 8093E100 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 05434 8093E104 104002F9 */ beq $v0, $zero, .L8093ECEC +/* 05434 8093E104 104002F9 */ beq $v0, $zero, .L8093ECEC /* 05438 8093E108 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0543C 8093E10C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05440 8093E110 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 05444 8093E114 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05448 8093E118 0C0294D3 */ jal func_800A534C +/* 05448 8093E118 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0544C 8093E11C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05450 8093E120 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 05454 8093E124 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 -/* 05458 8093E128 100002F0 */ beq $zero, $zero, .L8093ECEC +/* 05458 8093E128 100002F0 */ beq $zero, $zero, .L8093ECEC /* 0545C 8093E12C E62601A4 */ swc1 $f6, 0x01A4($s1) ## 000001A4 glabel L8093E130 /* 05460 8093E130 3C138095 */ lui $s3, %hi(D_8094C844) ## $s3 = 80950000 /* 05464 8093E134 2673C844 */ addiu $s3, $s3, %lo(D_8094C844) ## $s3 = 8094C844 /* 05468 8093E138 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 0546C 8093E13C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 05470 8093E140 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05474 8093E144 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05478 8093E148 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -801,19 +801,19 @@ glabel L8093E130 /* 05480 8093E150 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 /* 05484 8093E154 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 05488 8093E158 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0548C 8093E15C 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 05490 8093E160 3C018095 */ lui $at, %hi(D_8094AFAC) ## $at = 80950000 -/* 05494 8093E164 C420AFAC */ lwc1 $f0, %lo(D_8094AFAC)($at) +/* 05494 8093E164 C420AFAC */ lwc1 $f0, %lo(D_8094AFAC)($at) /* 05498 8093E168 C6280600 */ lwc1 $f8, 0x0600($s1) ## 00000600 /* 0549C 8093E16C C6240608 */ lwc1 $f4, 0x0608($s1) ## 00000608 /* 054A0 8093E170 862A0150 */ lh $t2, 0x0150($s1) ## 00000150 -/* 054A4 8093E174 46004281 */ sub.s $f10, $f8, $f0 +/* 054A4 8093E174 46004281 */ sub.s $f10, $f8, $f0 /* 054A8 8093E178 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 054AC 8093E17C 29410033 */ slti $at, $t2, 0x0033 -/* 054B0 8093E180 46002181 */ sub.s $f6, $f4, $f0 +/* 054AC 8093E17C 29410033 */ slti $at, $t2, 0x0033 +/* 054B0 8093E180 46002181 */ sub.s $f6, $f4, $f0 /* 054B4 8093E184 E62A0600 */ swc1 $f10, 0x0600($s1) ## 00000600 -/* 054B8 8093E188 142002D8 */ bne $at, $zero, .L8093ECEC +/* 054B8 8093E188 142002D8 */ bne $at, $zero, .L8093ECEC /* 054BC 8093E18C E6260608 */ swc1 $f6, 0x0608($s1) ## 00000608 /* 054C0 8093E190 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 054C4 8093E194 C6300600 */ lwc1 $f16, 0x0600($s1) ## 00000600 @@ -825,81 +825,81 @@ glabel L8093E130 /* 054DC 8093E1AC 44814000 */ mtc1 $at, $f8 ## $f8 = -30.00 /* 054E0 8093E1B0 C626060C */ lwc1 $f6, 0x060C($s1) ## 0000060C /* 054E4 8093E1B4 3C018095 */ lui $at, %hi(D_8094AFB0) ## $at = 80950000 -/* 054E8 8093E1B8 46104401 */ sub.s $f16, $f8, $f16 -/* 054EC 8093E1BC C424AFB0 */ lwc1 $f4, %lo(D_8094AFB0)($at) +/* 054E8 8093E1B8 46104401 */ sub.s $f16, $f8, $f16 +/* 054EC 8093E1BC C424AFB0 */ lwc1 $f4, %lo(D_8094AFB0)($at) /* 054F0 8093E1C0 E628066C */ swc1 $f8, 0x066C($s1) ## 0000066C /* 054F4 8093E1C4 C6280610 */ lwc1 $f8, 0x0610($s1) ## 00000610 -/* 054F8 8093E1C8 46008405 */ abs.s $f16, $f16 -/* 054FC 8093E1CC 460E5381 */ sub.s $f14, $f10, $f14 +/* 054F8 8093E1C8 46008405 */ abs.s $f16, $f16 +/* 054FC 8093E1CC 460E5381 */ sub.s $f14, $f10, $f14 /* 05500 8093E1D0 E62A0670 */ swc1 $f10, 0x0670($s1) ## 00000670 /* 05504 8093E1D4 A62E05FA */ sh $t6, 0x05FA($s1) ## 000005FA /* 05508 8093E1D8 E6240674 */ swc1 $f4, 0x0674($s1) ## 00000674 -/* 0550C 8093E1DC 46007385 */ abs.s $f14, $f14 -/* 05510 8093E1E0 460C2301 */ sub.s $f12, $f4, $f12 +/* 0550C 8093E1DC 46007385 */ abs.s $f14, $f14 +/* 05510 8093E1E0 460C2301 */ sub.s $f12, $f4, $f12 /* 05514 8093E1E4 E6320684 */ swc1 $f18, 0x0684($s1) ## 00000684 /* 05518 8093E1E8 3C018095 */ lui $at, %hi(D_8094AFB4) ## $at = 80950000 -/* 0551C 8093E1EC C424AFB4 */ lwc1 $f4, %lo(D_8094AFB4)($at) -/* 05520 8093E1F0 46006305 */ abs.s $f12, $f12 -/* 05524 8093E1F4 46069181 */ sub.s $f6, $f18, $f6 +/* 0551C 8093E1EC C424AFB4 */ lwc1 $f4, %lo(D_8094AFB4)($at) +/* 05520 8093E1F0 46006305 */ abs.s $f12, $f12 +/* 05524 8093E1F4 46069181 */ sub.s $f6, $f18, $f6 /* 05528 8093E1F8 E6240688 */ swc1 $f4, 0x0688($s1) ## 00000688 /* 0552C 8093E1FC C6240688 */ lwc1 $f4, 0x0688($s1) ## 00000688 /* 05530 8093E200 C62A0614 */ lwc1 $f10, 0x0614($s1) ## 00000614 -/* 05534 8093E204 46003185 */ abs.s $f6, $f6 -/* 05538 8093E208 46082201 */ sub.s $f8, $f4, $f8 +/* 05534 8093E204 46003185 */ abs.s $f6, $f6 +/* 05538 8093E208 46082201 */ sub.s $f8, $f4, $f8 /* 0553C 8093E20C 3C01C411 */ lui $at, 0xC411 ## $at = C4110000 /* 05540 8093E210 44812000 */ mtc1 $at, $f4 ## $f4 = -580.00 /* 05544 8093E214 E6300654 */ swc1 $f16, 0x0654($s1) ## 00000654 -/* 05548 8093E218 46004205 */ abs.s $f8, $f8 +/* 05548 8093E218 46004205 */ abs.s $f8, $f8 /* 0554C 8093E21C E624068C */ swc1 $f4, 0x068C($s1) ## 0000068C /* 05550 8093E220 C624068C */ lwc1 $f4, 0x068C($s1) ## 0000068C /* 05554 8093E224 E62E0658 */ swc1 $f14, 0x0658($s1) ## 00000658 /* 05558 8093E228 E62C065C */ swc1 $f12, 0x065C($s1) ## 0000065C -/* 0555C 8093E22C 460A2281 */ sub.s $f10, $f4, $f10 +/* 0555C 8093E22C 460A2281 */ sub.s $f10, $f4, $f10 /* 05560 8093E230 E6260660 */ swc1 $f6, 0x0660($s1) ## 00000660 /* 05564 8093E234 E6280664 */ swc1 $f8, 0x0664($s1) ## 00000664 /* 05568 8093E238 E632069C */ swc1 $f18, 0x069C($s1) ## 0000069C -/* 0556C 8093E23C 46005285 */ abs.s $f10, $f10 +/* 0556C 8093E23C 46005285 */ abs.s $f10, $f10 /* 05570 8093E240 3C018095 */ lui $at, %hi(D_8094AFB8) ## $at = 80950000 /* 05574 8093E244 E62A0668 */ swc1 $f10, 0x0668($s1) ## 00000668 -/* 05578 8093E248 C42AAFB8 */ lwc1 $f10, %lo(D_8094AFB8)($at) +/* 05578 8093E248 C42AAFB8 */ lwc1 $f10, %lo(D_8094AFB8)($at) /* 0557C 8093E24C A6200150 */ sh $zero, 0x0150($s1) ## 00000150 -/* 05580 8093E250 100002A6 */ beq $zero, $zero, .L8093ECEC +/* 05580 8093E250 100002A6 */ beq $zero, $zero, .L8093ECEC /* 05584 8093E254 E62A06A0 */ swc1 $f10, 0x06A0($s1) ## 000006A0 glabel L8093E258 /* 05588 8093E258 3C138095 */ lui $s3, %hi(D_8094C844) ## $s3 = 80950000 /* 0558C 8093E25C 2673C844 */ addiu $s3, $s3, %lo(D_8094C844) ## $s3 = 8094C844 /* 05590 8093E260 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05594 8093E264 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 05598 8093E268 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 0559C 8093E26C 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 055A0 8093E270 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 055A4 8093E274 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 055A8 8093E278 A3AF009F */ sb $t7, 0x009F($sp) +/* 055A8 8093E278 A3AF009F */ sb $t7, 0x009F($sp) /* 055AC 8093E27C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 055B0 8093E280 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 /* 055B4 8093E284 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 055B8 8093E288 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 055BC 8093E28C 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 055C0 8093E290 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 055C4 8093E294 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 055C8 8093E298 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 055CC 8093E29C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 055D0 8093E2A0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 055D4 8093E2A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 055D8 8093E2A8 86230150 */ lh $v1, 0x0150($s1) ## 00000150 /* 055DC 8093E2AC 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 055E0 8093E2B0 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 055E4 8093E2B4 14610004 */ bne $v1, $at, .L8093E2C8 +/* 055E0 8093E2B0 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 055E4 8093E2B4 14610004 */ bne $v1, $at, .L8093E2C8 /* 055E8 8093E2B8 2405604A */ addiu $a1, $zero, 0x604A ## $a1 = 0000604A -/* 055EC 8093E2BC 0C042DA0 */ jal func_8010B680 +/* 055EC 8093E2BC 0C042DA0 */ jal func_8010B680 /* 055F0 8093E2C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 055F4 8093E2C4 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093E2C8: -/* 055F8 8093E2C8 28610051 */ slti $at, $v1, 0x0051 -/* 055FC 8093E2CC 14200287 */ bne $at, $zero, .L8093ECEC +/* 055F8 8093E2C8 28610051 */ slti $at, $v1, 0x0051 +/* 055FC 8093E2CC 14200287 */ bne $at, $zero, .L8093ECEC /* 05600 8093E2D0 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C /* 05604 8093E2D4 3C014382 */ lui $at, 0x4382 ## $at = 43820000 /* 05608 8093E2D8 44811000 */ mtc1 $at, $f2 ## $f2 = 260.00 @@ -922,63 +922,63 @@ glabel L8093E258 /* 0564C 8093E31C E6260684 */ swc1 $f6, 0x0684($s1) ## 00000684 /* 05650 8093E320 8E690000 */ lw $t1, 0x0000($s3) ## 8094C844 /* 05654 8093E324 26100AAC */ addiu $s0, $s0, 0x0AAC ## $s0 = 06000AAC -/* 05658 8093E328 44068000 */ mfc1 $a2, $f16 +/* 05658 8093E328 44068000 */ mfc1 $a2, $f16 /* 0565C 8093E32C C5280028 */ lwc1 $f8, 0x0028($t1) ## 00000028 /* 05660 8093E330 02002825 */ or $a1, $s0, $zero ## $a1 = 06000AAC -/* 05664 8093E334 460A4100 */ add.s $f4, $f8, $f10 +/* 05664 8093E334 460A4100 */ add.s $f4, $f8, $f10 /* 05668 8093E338 C6280600 */ lwc1 $f8, 0x0600($s1) ## 00000600 /* 0566C 8093E33C C62A0604 */ lwc1 $f10, 0x0604($s1) ## 00000604 -/* 05670 8093E340 46086001 */ sub.s $f0, $f12, $f8 +/* 05670 8093E340 46086001 */ sub.s $f0, $f12, $f8 /* 05674 8093E344 E6240688 */ swc1 $f4, 0x0688($s1) ## 00000688 /* 05678 8093E348 8E6B0000 */ lw $t3, 0x0000($s3) ## 8094C844 /* 0567C 8093E34C C6240608 */ lwc1 $f4, 0x0608($s1) ## 00000608 -/* 05680 8093E350 46000005 */ abs.s $f0, $f0 +/* 05680 8093E350 46000005 */ abs.s $f0, $f0 /* 05684 8093E354 C566002C */ lwc1 $f6, 0x002C($t3) ## 0000002C /* 05688 8093E358 E6200654 */ swc1 $f0, 0x0654($s1) ## 00000654 -/* 0568C 8093E35C 460A1001 */ sub.s $f0, $f2, $f10 +/* 0568C 8093E35C 460A1001 */ sub.s $f0, $f2, $f10 /* 05690 8093E360 E626068C */ swc1 $f6, 0x068C($s1) ## 0000068C /* 05694 8093E364 C6260684 */ lwc1 $f6, 0x0684($s1) ## 00000684 /* 05698 8093E368 C628060C */ lwc1 $f8, 0x060C($s1) ## 0000060C -/* 0569C 8093E36C 46000005 */ abs.s $f0, $f0 +/* 0569C 8093E36C 46000005 */ abs.s $f0, $f0 /* 056A0 8093E370 C62A0688 */ lwc1 $f10, 0x0688($s1) ## 00000688 /* 056A4 8093E374 E6200658 */ swc1 $f0, 0x0658($s1) ## 00000658 -/* 056A8 8093E378 46047001 */ sub.s $f0, $f14, $f4 +/* 056A8 8093E378 46047001 */ sub.s $f0, $f14, $f4 /* 056AC 8093E37C C6240610 */ lwc1 $f4, 0x0610($s1) ## 00000610 /* 056B0 8093E380 E630069C */ swc1 $f16, 0x069C($s1) ## 0000069C -/* 056B4 8093E384 46000005 */ abs.s $f0, $f0 +/* 056B4 8093E384 46000005 */ abs.s $f0, $f0 /* 056B8 8093E388 E620065C */ swc1 $f0, 0x065C($s1) ## 0000065C -/* 056BC 8093E38C 46083001 */ sub.s $f0, $f6, $f8 +/* 056BC 8093E38C 46083001 */ sub.s $f0, $f6, $f8 /* 056C0 8093E390 C6280614 */ lwc1 $f8, 0x0614($s1) ## 00000614 /* 056C4 8093E394 C626068C */ lwc1 $f6, 0x068C($s1) ## 0000068C -/* 056C8 8093E398 46000005 */ abs.s $f0, $f0 +/* 056C8 8093E398 46000005 */ abs.s $f0, $f0 /* 056CC 8093E39C E6200660 */ swc1 $f0, 0x0660($s1) ## 00000660 -/* 056D0 8093E3A0 46045001 */ sub.s $f0, $f10, $f4 -/* 056D4 8093E3A4 46000005 */ abs.s $f0, $f0 +/* 056D0 8093E3A0 46045001 */ sub.s $f0, $f10, $f4 +/* 056D4 8093E3A4 46000005 */ abs.s $f0, $f0 /* 056D8 8093E3A8 E6200664 */ swc1 $f0, 0x0664($s1) ## 00000664 -/* 056DC 8093E3AC 46083001 */ sub.s $f0, $f6, $f8 -/* 056E0 8093E3B0 46000005 */ abs.s $f0, $f0 +/* 056DC 8093E3AC 46083001 */ sub.s $f0, $f6, $f8 +/* 056E0 8093E3B0 46000005 */ abs.s $f0, $f0 /* 056E4 8093E3B4 E6200668 */ swc1 $f0, 0x0668($s1) ## 00000668 -/* 056E8 8093E3B8 C42AAFBC */ lwc1 $f10, %lo(D_8094AFBC)($at) +/* 056E8 8093E3B8 C42AAFBC */ lwc1 $f10, %lo(D_8094AFBC)($at) /* 056EC 8093E3BC E62A06A0 */ swc1 $f10, 0x06A0($s1) ## 000006A0 /* 056F0 8093E3C0 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 -/* 056F4 8093E3C4 0C029490 */ jal func_800A5240 +/* 056F4 8093E3C4 0C029490 */ jal func_800A5240 /* 056F8 8093E3C8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 056FC 8093E3CC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05700 8093E3D0 02002025 */ or $a0, $s0, $zero ## $a0 = 06000AAC /* 05704 8093E3D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 05708 8093E3D8 A6200150 */ sh $zero, 0x0150($s1) ## 00000150 -/* 0570C 8093E3DC 468021A0 */ cvt.s.w $f6, $f4 -/* 05710 8093E3E0 10000242 */ beq $zero, $zero, .L8093ECEC +/* 0570C 8093E3DC 468021A0 */ cvt.s.w $f6, $f4 +/* 05710 8093E3E0 10000242 */ beq $zero, $zero, .L8093ECEC /* 05714 8093E3E4 E62601A4 */ swc1 $f6, 0x01A4($s1) ## 000001A4 glabel L8093E3E8 /* 05718 8093E3E8 3C138095 */ lui $s3, %hi(D_8094C844) ## $s3 = 80950000 /* 0571C 8093E3EC 2673C844 */ addiu $s3, $s3, %lo(D_8094C844) ## $s3 = 8094C844 /* 05720 8093E3F0 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05724 8093E3F4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 05728 8093E3F8 A3B9009F */ sb $t9, 0x009F($sp) +/* 05728 8093E3F8 A3B9009F */ sb $t9, 0x009F($sp) /* 0572C 8093E3FC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 05730 8093E400 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05734 8093E404 8E6C0000 */ lw $t4, 0x0000($s3) ## 8094C844 /* 05738 8093E408 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 @@ -987,204 +987,204 @@ glabel L8093E3E8 /* 05744 8093E414 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 05748 8093E418 C5880028 */ lwc1 $f8, 0x0028($t4) ## 00000028 /* 0574C 8093E41C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 05750 8093E420 44058000 */ mfc1 $a1, $f16 -/* 05754 8093E424 460A4100 */ add.s $f4, $f8, $f10 +/* 05750 8093E420 44058000 */ mfc1 $a1, $f16 +/* 05754 8093E424 460A4100 */ add.s $f4, $f8, $f10 /* 05758 8093E428 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0575C 8093E42C 8E270068 */ lw $a3, 0x0068($s1) ## 00000068 /* 05760 8093E430 E6240688 */ swc1 $f4, 0x0688($s1) ## 00000688 /* 05764 8093E434 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05768 8093E438 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0576C 8093E43C 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 05770 8093E440 3C073F66 */ lui $a3, 0x3F66 ## $a3 = 3F660000 /* 05774 8093E444 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 3F666666 /* 05778 8093E448 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 /* 0577C 8093E44C 3C054110 */ lui $a1, 0x4110 ## $a1 = 41100000 /* 05780 8093E450 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05784 8093E454 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05788 8093E458 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0578C 8093E45C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 05790 8093E460 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 05794 8093E464 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A -/* 05798 8093E468 44050000 */ mfc1 $a1, $f0 -/* 0579C 8093E46C 44060000 */ mfc1 $a2, $f0 +/* 05798 8093E468 44050000 */ mfc1 $a1, $f0 +/* 0579C 8093E46C 44060000 */ mfc1 $a2, $f0 /* 057A0 8093E470 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 057A4 8093E474 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 057A8 8093E478 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 057AC 8093E47C 2861001E */ slti $at, $v1, 0x001E -/* 057B0 8093E480 142000D5 */ bne $at, $zero, .L8093E7D8 +/* 057AC 8093E47C 2861001E */ slti $at, $v1, 0x001E +/* 057B0 8093E480 142000D5 */ bne $at, $zero, .L8093E7D8 /* 057B4 8093E484 306B0007 */ andi $t3, $v1, 0x0007 ## $t3 = 00000000 -/* 057B8 8093E488 2861002D */ slti $at, $v1, 0x002D -/* 057BC 8093E48C 1020000D */ beq $at, $zero, .L8093E4C4 -/* 057C0 8093E490 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 057C4 8093E494 8FAA00A4 */ lw $t2, 0x00A4($sp) +/* 057B8 8093E488 2861002D */ slti $at, $v1, 0x002D +/* 057BC 8093E48C 1020000D */ beq $at, $zero, .L8093E4C4 +/* 057C0 8093E490 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 057C4 8093E494 8FAA00A4 */ lw $t2, 0x00A4($sp) /* 057C8 8093E498 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 057CC 8093E49C 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 057D0 8093E4A0 002A0821 */ addu $at, $at, $t2 +/* 057D0 8093E4A0 002A0821 */ addu $at, $at, $t2 /* 057D4 8093E4A4 A02D0AE1 */ sb $t5, 0x0AE1($at) ## 00010AE1 -/* 057D8 8093E4A8 8FAE00A4 */ lw $t6, 0x00A4($sp) +/* 057D8 8093E4A8 8FAE00A4 */ lw $t6, 0x00A4($sp) /* 057DC 8093E4AC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 057E0 8093E4B0 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 /* 057E4 8093E4B4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 057E8 8093E4B8 002E0821 */ addu $at, $at, $t6 -/* 057EC 8093E4BC 10000008 */ beq $zero, $zero, .L8093E4E0 +/* 057E8 8093E4B8 002E0821 */ addu $at, $at, $t6 +/* 057EC 8093E4BC 10000008 */ beq $zero, $zero, .L8093E4E0 /* 057F0 8093E4C0 E4260AFC */ swc1 $f6, 0x0AFC($at) ## 00010AFC .L8093E4C4: /* 057F4 8093E4C4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 057F8 8093E4C8 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 057FC 8093E4CC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 05800 8093E4D0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 05804 8093E4D4 00812021 */ addu $a0, $a0, $at +/* 05804 8093E4D4 00812021 */ addu $a0, $a0, $at /* 05808 8093E4D8 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 0580C 8093E4DC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 .L8093E4E0: /* 05810 8093E4E0 86230150 */ lh $v1, 0x0150($s1) ## 00000150 /* 05814 8093E4E4 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 05818 8093E4E8 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 0581C 8093E4EC 14610040 */ bne $v1, $at, .L8093E5F0 +/* 0581C 8093E4EC 14610040 */ bne $v1, $at, .L8093E5F0 /* 05820 8093E4F0 27B2005C */ addiu $s2, $sp, 0x005C ## $s2 = FFFFFFBC /* 05824 8093E4F4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L8093E4F8: /* 05828 8093E4F8 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0582C 8093E4FC 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 05830 8093E500 00000000 */ nop /* 05834 8093E504 8E6F0000 */ lw $t7, 0x0000($s3) ## 8094C844 /* 05838 8093E508 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0583C 8093E50C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 05840 8093E510 C5E80024 */ lwc1 $f8, 0x0024($t7) ## 00000024 -/* 05844 8093E514 46080280 */ add.s $f10, $f0, $f8 +/* 05844 8093E514 46080280 */ add.s $f10, $f0, $f8 /* 05848 8093E518 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0584C 8093E51C E7AA005C */ swc1 $f10, 0x005C($sp) + +/* 0584C 8093E51C E7AA005C */ swc1 $f10, 0x005C($sp) /* 05850 8093E520 8E780000 */ lw $t8, 0x0000($s3) ## 8094C844 /* 05854 8093E524 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 05858 8093E528 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0585C 8093E52C C7040028 */ lwc1 $f4, 0x0028($t8) ## 00000028 -/* 05860 8093E530 46040180 */ add.s $f6, $f0, $f4 +/* 05860 8093E530 46040180 */ add.s $f6, $f0, $f4 /* 05864 8093E534 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 05868 8093E538 E7A60060 */ swc1 $f6, 0x0060($sp) + +/* 05868 8093E538 E7A60060 */ swc1 $f6, 0x0060($sp) /* 0586C 8093E53C 8E680000 */ lw $t0, 0x0000($s3) ## 8094C844 /* 05870 8093E540 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05874 8093E544 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 05878 8093E548 C508002C */ lwc1 $f8, 0x002C($t0) ## 0000002C -/* 0587C 8093E54C 46080280 */ add.s $f10, $f0, $f8 +/* 0587C 8093E54C 46080280 */ add.s $f10, $f0, $f8 /* 05880 8093E550 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 05884 8093E554 E7AA0064 */ swc1 $f10, 0x0064($sp) + +/* 05884 8093E554 E7AA0064 */ swc1 $f10, 0x0064($sp) /* 05888 8093E558 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0588C 8093E55C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 05890 8093E560 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 05894 8093E564 E7A00050 */ swc1 $f0, 0x0050($sp) + +/* 05894 8093E564 E7A00050 */ swc1 $f0, 0x0050($sp) /* 05898 8093E568 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0589C 8093E56C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 058A0 8093E570 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 058A4 8093E574 E7A00054 */ swc1 $f0, 0x0054($sp) + +/* 058A4 8093E574 E7A00054 */ swc1 $f0, 0x0054($sp) /* 058A8 8093E578 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 058AC 8093E57C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 058B0 8093E580 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 058B4 8093E584 E7A00058 */ swc1 $f0, 0x0058($sp) + +/* 058B4 8093E584 E7A00058 */ swc1 $f0, 0x0058($sp) /* 058B8 8093E588 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 058BC 8093E58C 44812000 */ mtc1 $at, $f4 ## $f4 = 25.00 /* 058C0 8093E590 3C078095 */ lui $a3, %hi(D_8094A7DC) ## $a3 = 80950000 /* 058C4 8093E594 24E7A7DC */ addiu $a3, $a3, %lo(D_8094A7DC) ## $a3 = 8094A7DC -/* 058C8 8093E598 46040180 */ add.s $f6, $f0, $f4 -/* 058CC 8093E59C 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 058C8 8093E598 46040180 */ add.s $f6, $f0, $f4 +/* 058CC 8093E59C 8FA400A4 */ lw $a0, 0x00A4($sp) /* 058D0 8093E5A0 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFBC /* 058D4 8093E5A4 27A60050 */ addiu $a2, $sp, 0x0050 ## $a2 = FFFFFFB0 -/* 058D8 8093E5A8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 058DC 8093E5AC 0C24E41C */ jal func_80939070 -/* 058E0 8093E5B0 AFA00014 */ sw $zero, 0x0014($sp) +/* 058D8 8093E5A8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 058DC 8093E5AC 0C24E41C */ jal func_80939070 +/* 058E0 8093E5B0 AFA00014 */ sw $zero, 0x0014($sp) /* 058E4 8093E5B4 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 058E8 8093E5B8 00108400 */ sll $s0, $s0, 16 -/* 058EC 8093E5BC 00108403 */ sra $s0, $s0, 16 -/* 058F0 8093E5C0 2A010032 */ slti $at, $s0, 0x0032 -/* 058F4 8093E5C4 5420FFCC */ bnel $at, $zero, .L8093E4F8 +/* 058E8 8093E5B8 00108400 */ sll $s0, $s0, 16 +/* 058EC 8093E5BC 00108403 */ sra $s0, $s0, 16 +/* 058F0 8093E5C0 2A010032 */ slti $at, $s0, 0x0032 +/* 058F4 8093E5C4 5420FFCC */ bnel $at, $zero, .L8093E4F8 /* 058F8 8093E5C8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 058FC 8093E5CC 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05900 8093E5D0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05904 8093E5D4 2405390D */ addiu $a1, $zero, 0x390D ## $a1 = 0000390D -/* 05908 8093E5D8 8FA900A4 */ lw $t1, 0x00A4($sp) +/* 05908 8093E5D8 8FA900A4 */ lw $t1, 0x00A4($sp) /* 0590C 8093E5DC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 05910 8093E5E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05914 8093E5E4 00290821 */ addu $at, $at, $t1 +/* 05914 8093E5E4 00290821 */ addu $at, $at, $t1 /* 05918 8093E5E8 E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC /* 0591C 8093E5EC 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093E5F0: -/* 05920 8093E5F0 28610023 */ slti $at, $v1, 0x0023 -/* 05924 8093E5F4 1420006F */ bne $at, $zero, .L8093E7B4 -/* 05928 8093E5F8 28610032 */ slti $at, $v1, 0x0032 -/* 0592C 8093E5FC 10200019 */ beq $at, $zero, .L8093E664 -/* 05930 8093E600 00032140 */ sll $a0, $v1, 5 -/* 05934 8093E604 00832021 */ addu $a0, $a0, $v1 -/* 05938 8093E608 00042240 */ sll $a0, $a0, 9 -/* 0593C 8093E60C 00042400 */ sll $a0, $a0, 16 +/* 05920 8093E5F0 28610023 */ slti $at, $v1, 0x0023 +/* 05924 8093E5F4 1420006F */ bne $at, $zero, .L8093E7B4 +/* 05928 8093E5F8 28610032 */ slti $at, $v1, 0x0032 +/* 0592C 8093E5FC 10200019 */ beq $at, $zero, .L8093E664 +/* 05930 8093E600 00032140 */ sll $a0, $v1, 5 +/* 05934 8093E604 00832021 */ addu $a0, $a0, $v1 +/* 05938 8093E608 00042240 */ sll $a0, $a0, 9 +/* 0593C 8093E60C 00042400 */ sll $a0, $a0, 16 /* 05940 8093E610 0C01DE1C */ jal Math_Sins ## sins? -/* 05944 8093E614 00042403 */ sra $a0, $a0, 16 +/* 05944 8093E614 00042403 */ sra $a0, $a0, 16 /* 05948 8093E618 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0594C 8093E61C 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 05950 8093E620 3C018095 */ lui $at, %hi(D_8094AFC0) ## $at = 80950000 -/* 05954 8093E624 C426AFC0 */ lwc1 $f6, %lo(D_8094AFC0)($at) -/* 05958 8093E628 460A0102 */ mul.s $f4, $f0, $f10 +/* 05954 8093E624 C426AFC0 */ lwc1 $f6, %lo(D_8094AFC0)($at) +/* 05958 8093E628 460A0102 */ mul.s $f4, $f0, $f10 /* 0595C 8093E62C 3C018095 */ lui $at, %hi(D_8094AFC4) ## $at = 80950000 -/* 05960 8093E630 C42AAFC4 */ lwc1 $f10, %lo(D_8094AFC4)($at) +/* 05960 8093E630 C42AAFC4 */ lwc1 $f10, %lo(D_8094AFC4)($at) /* 05964 8093E634 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05968 8093E638 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 /* 0596C 8093E63C 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 05970 8093E640 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05974 8093E644 46062203 */ div.s $f8, $f4, $f6 +/* 05974 8093E644 46062203 */ div.s $f8, $f4, $f6 /* 05978 8093E648 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 -/* 0597C 8093E64C 460A4100 */ add.s $f4, $f8, $f10 -/* 05980 8093E650 44052000 */ mfc1 $a1, $f4 +/* 0597C 8093E64C 460A4100 */ add.s $f4, $f8, $f10 +/* 05980 8093E650 44052000 */ mfc1 $a1, $f4 /* 05984 8093E654 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05988 8093E658 00000000 */ nop -/* 0598C 8093E65C 1000002E */ beq $zero, $zero, .L8093E718 +/* 0598C 8093E65C 1000002E */ beq $zero, $zero, .L8093E718 /* 05990 8093E660 8E700000 */ lw $s0, 0x0000($s3) ## 8094C844 .L8093E664: /* 05994 8093E664 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 05998 8093E668 1461000D */ bne $v1, $at, .L8093E6A0 +/* 05998 8093E668 1461000D */ bne $v1, $at, .L8093E6A0 /* 0599C 8093E66C 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 059A0 8093E670 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 059A4 8093E674 261088C8 */ addiu $s0, $s0, 0x88C8 ## $s0 = 060088C8 /* 059A8 8093E678 02002825 */ or $a1, $s0, $zero ## $a1 = 060088C8 /* 059AC 8093E67C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 059B0 8093E680 0C029490 */ jal func_800A5240 +/* 059B0 8093E680 0C029490 */ jal func_800A5240 /* 059B4 8093E684 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 059B8 8093E688 0C028800 */ jal SkelAnime_GetFrameCount - + /* 059BC 8093E68C 02002025 */ or $a0, $s0, $zero ## $a0 = 060088C8 /* 059C0 8093E690 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 059C4 8093E694 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 059C8 8093E698 46803220 */ cvt.s.w $f8, $f6 +/* 059C8 8093E698 46803220 */ cvt.s.w $f8, $f6 /* 059CC 8093E69C E62801A4 */ swc1 $f8, 0x01A4($s1) ## 000001A4 .L8093E6A0: /* 059D0 8093E6A0 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 059D4 8093E6A4 14610003 */ bne $v1, $at, .L8093E6B4 +/* 059D4 8093E6A4 14610003 */ bne $v1, $at, .L8093E6B4 /* 059D8 8093E6A8 240539B1 */ addiu $a1, $zero, 0x39B1 ## $a1 = 000039B1 /* 059DC 8093E6AC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 059E0 8093E6B0 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 .L8093E6B4: /* 059E4 8093E6B4 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 059E8 8093E6B8 8E2501A4 */ lw $a1, 0x01A4($s1) ## 000001A4 -/* 059EC 8093E6BC 0C0295B2 */ jal func_800A56C8 +/* 059EC 8093E6BC 0C0295B2 */ jal func_800A56C8 /* 059F0 8093E6C0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 059F4 8093E6C4 1040000A */ beq $v0, $zero, .L8093E6F0 +/* 059F4 8093E6C4 1040000A */ beq $v0, $zero, .L8093E6F0 /* 059F8 8093E6C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 059FC 8093E6CC 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05A00 8093E6D0 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 05A04 8093E6D4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05A08 8093E6D8 0C0294D3 */ jal func_800A534C +/* 05A08 8093E6D8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 05A0C 8093E6DC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05A10 8093E6E0 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 05A14 8093E6E4 44815000 */ mtc1 $at, $f10 ## $f10 = 1000.00 @@ -1199,13 +1199,13 @@ glabel L8093E3E8 /* 05A34 8093E704 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05A38 8093E708 34A5CCCC */ ori $a1, $a1, 0xCCCC ## $a1 = 3CCCCCCC /* 05A3C 8093E70C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05A40 8093E710 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 /* 05A44 8093E714 8E700000 */ lw $s0, 0x0000($s3) ## 8094C844 .L8093E718: /* 05A48 8093E718 02002025 */ or $a0, $s0, $zero ## $a0 = 060088C8 /* 05A4C 8093E71C 0C00B58B */ jal Actor_SetScale - + /* 05A50 8093E720 8E050050 */ lw $a1, 0x0050($s0) ## 06008918 /* 05A54 8093E724 8E6B0000 */ lw $t3, 0x0000($s3) ## 8094C844 /* 05A58 8093E728 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 @@ -1216,7 +1216,7 @@ glabel L8093E3E8 /* 05A6C 8093E73C 240D0014 */ addiu $t5, $zero, 0x0014 ## $t5 = 00000014 /* 05A70 8093E740 A33005F8 */ sb $s0, 0x05F8($t9) ## 000005F8 /* 05A74 8093E744 862C0150 */ lh $t4, 0x0150($s1) ## 00000150 -/* 05A78 8093E748 548C0169 */ bnel $a0, $t4, .L8093ECF0 +/* 05A78 8093E748 548C0169 */ bnel $a0, $t4, .L8093ECF0 /* 05A7C 8093E74C 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC /* 05A80 8093E750 44817000 */ mtc1 $at, $f14 ## $f14 = 600.00 /* 05A84 8093E754 3C014448 */ lui $at, 0x4448 ## $at = 44480000 @@ -1237,132 +1237,132 @@ glabel L8093E3E8 /* 05AC0 8093E790 E6200614 */ swc1 $f0, 0x0614($s1) ## 00000614 /* 05AC4 8093E794 E622060C */ swc1 $f2, 0x060C($s1) ## 0000060C /* 05AC8 8093E798 E6280610 */ swc1 $f8, 0x0610($s1) ## 00000610 -/* 05ACC 8093E79C C42AAFC8 */ lwc1 $f10, %lo(D_8094AFC8)($at) +/* 05ACC 8093E79C C42AAFC8 */ lwc1 $f10, %lo(D_8094AFC8)($at) /* 05AD0 8093E7A0 E62201AC */ swc1 $f2, 0x01AC($s1) ## 000001AC /* 05AD4 8093E7A4 E6220654 */ swc1 $f2, 0x0654($s1) ## 00000654 /* 05AD8 8093E7A8 E62204D8 */ swc1 $f2, 0x04D8($s1) ## 000004D8 -/* 05ADC 8093E7AC 1000014F */ beq $zero, $zero, .L8093ECEC +/* 05ADC 8093E7AC 1000014F */ beq $zero, $zero, .L8093ECEC /* 05AE0 8093E7B0 E62A01A8 */ swc1 $f10, 0x01A8($s1) ## 000001A8 .L8093E7B4: /* 05AE4 8093E7B4 C62406B0 */ lwc1 $f4, 0x06B0($s1) ## 000006B0 /* 05AE8 8093E7B8 8E700000 */ lw $s0, 0x0000($s3) ## 8094C844 -/* 05AEC 8093E7BC 4600218D */ trunc.w.s $f6, $f4 +/* 05AEC 8093E7BC 4600218D */ trunc.w.s $f6, $f4 /* 05AF0 8093E7C0 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B7 -/* 05AF4 8093E7C4 44083000 */ mfc1 $t0, $f6 +/* 05AF4 8093E7C4 44083000 */ mfc1 $t0, $f6 /* 05AF8 8093E7C8 00000000 */ nop -/* 05AFC 8093E7CC 01484821 */ addu $t1, $t2, $t0 -/* 05B00 8093E7D0 10000146 */ beq $zero, $zero, .L8093ECEC +/* 05AFC 8093E7CC 01484821 */ addu $t1, $t2, $t0 +/* 05B00 8093E7D0 10000146 */ beq $zero, $zero, .L8093ECEC /* 05B04 8093E7D4 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B7 .L8093E7D8: -/* 05B08 8093E7D8 15600003 */ bne $t3, $zero, .L8093E7E8 +/* 05B08 8093E7D8 15600003 */ bne $t3, $zero, .L8093E7E8 /* 05B0C 8093E7DC 24053921 */ addiu $a1, $zero, 0x3921 ## $a1 = 00003921 /* 05B10 8093E7E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05B14 8093E7E4 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 .L8093E7E8: /* 05B18 8093E7E8 C62806B0 */ lwc1 $f8, 0x06B0($s1) ## 000006B0 /* 05B1C 8093E7EC 8E700000 */ lw $s0, 0x0000($s3) ## 8094C844 /* 05B20 8093E7F0 262406B0 */ addiu $a0, $s1, 0x06B0 ## $a0 = 000006B0 -/* 05B24 8093E7F4 4600428D */ trunc.w.s $f10, $f8 +/* 05B24 8093E7F4 4600428D */ trunc.w.s $f10, $f8 /* 05B28 8093E7F8 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B7 /* 05B2C 8093E7FC 3C054640 */ lui $a1, 0x4640 ## $a1 = 46400000 /* 05B30 8093E800 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05B34 8093E804 440F5000 */ mfc1 $t7, $f10 +/* 05B34 8093E804 440F5000 */ mfc1 $t7, $f10 /* 05B38 8093E808 3C0743C0 */ lui $a3, 0x43C0 ## $a3 = 43C00000 -/* 05B3C 8093E80C 032FC021 */ addu $t8, $t9, $t7 +/* 05B3C 8093E80C 032FC021 */ addu $t8, $t9, $t7 /* 05B40 8093E810 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05B44 8093E814 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B7 /* 05B48 8093E818 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05B4C 8093E81C 8E2501A4 */ lw $a1, 0x01A4($s1) ## 000001A4 -/* 05B50 8093E820 0C0295B2 */ jal func_800A56C8 +/* 05B50 8093E820 0C0295B2 */ jal func_800A56C8 /* 05B54 8093E824 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 05B58 8093E828 10400130 */ beq $v0, $zero, .L8093ECEC +/* 05B58 8093E828 10400130 */ beq $v0, $zero, .L8093ECEC /* 05B5C 8093E82C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 05B60 8093E830 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05B64 8093E834 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 05B68 8093E838 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05B6C 8093E83C 0C0294D3 */ jal func_800A534C +/* 05B6C 8093E83C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 05B70 8093E840 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05B74 8093E844 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 05B78 8093E848 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 -/* 05B7C 8093E84C 10000127 */ beq $zero, $zero, .L8093ECEC +/* 05B7C 8093E84C 10000127 */ beq $zero, $zero, .L8093ECEC /* 05B80 8093E850 E62401A4 */ swc1 $f4, 0x01A4($s1) ## 000001A4 glabel L8093E854 /* 05B84 8093E854 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 05B88 8093E858 28610015 */ slti $at, $v1, 0x0015 -/* 05B8C 8093E85C 14200013 */ bne $at, $zero, .L8093E8AC -/* 05B90 8093E860 28610078 */ slti $at, $v1, 0x0078 -/* 05B94 8093E864 10200011 */ beq $at, $zero, .L8093E8AC +/* 05B88 8093E858 28610015 */ slti $at, $v1, 0x0015 +/* 05B8C 8093E85C 14200013 */ bne $at, $zero, .L8093E8AC +/* 05B90 8093E860 28610078 */ slti $at, $v1, 0x0078 +/* 05B94 8093E864 10200011 */ beq $at, $zero, .L8093E8AC /* 05B98 8093E868 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 -/* 05B9C 8093E86C 8FAA00A4 */ lw $t2, 0x00A4($sp) +/* 05B9C 8093E86C 8FAA00A4 */ lw $t2, 0x00A4($sp) /* 05BA0 8093E870 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 05BA4 8093E874 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 05BA8 8093E878 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05BAC 8093E87C 002A0821 */ addu $at, $at, $t2 +/* 05BAC 8093E87C 002A0821 */ addu $at, $at, $t2 /* 05BB0 8093E880 A0300AE1 */ sb $s0, 0x0AE1($at) ## 00010AE1 -/* 05BB4 8093E884 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05BB4 8093E884 8FA400A4 */ lw $a0, 0x00A4($sp) /* 05BB8 8093E888 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05BBC 8093E88C 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 05BC0 8093E890 3C073C75 */ lui $a3, 0x3C75 ## $a3 = 3C750000 -/* 05BC4 8093E894 44050000 */ mfc1 $a1, $f0 -/* 05BC8 8093E898 44060000 */ mfc1 $a2, $f0 +/* 05BC4 8093E894 44050000 */ mfc1 $a1, $f0 +/* 05BC8 8093E898 44060000 */ mfc1 $a2, $f0 /* 05BCC 8093E89C 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3C75C28F /* 05BD0 8093E8A0 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 05BD4 8093E8A4 00812021 */ addu $a0, $a0, $at + +/* 05BD4 8093E8A4 00812021 */ addu $a0, $a0, $at /* 05BD8 8093E8A8 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093E8AC: /* 05BDC 8093E8AC 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 05BE0 8093E8B0 14610005 */ bne $v1, $at, .L8093E8C8 +/* 05BE0 8093E8B0 14610005 */ bne $v1, $at, .L8093E8C8 /* 05BE4 8093E8B4 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 /* 05BE8 8093E8B8 3C04105A */ lui $a0, 0x105A ## $a0 = 105A0000 /* 05BEC 8093E8BC 0C03E803 */ jal Audio_SetBGM - + /* 05BF0 8093E8C0 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 105A00FF /* 05BF4 8093E8C4 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093E8C8: /* 05BF8 8093E8C8 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 -/* 05BFC 8093E8CC 1461002F */ bne $v1, $at, .L8093E98C +/* 05BFC 8093E8CC 1461002F */ bne $v1, $at, .L8093E98C /* 05C00 8093E8D0 3C020603 */ lui $v0, 0x0603 ## $v0 = 06030000 -/* 05C04 8093E8D4 8FA800A4 */ lw $t0, 0x00A4($sp) +/* 05C04 8093E8D4 8FA800A4 */ lw $t0, 0x00A4($sp) /* 05C08 8093E8D8 3C018095 */ lui $at, %hi(D_8094C840) ## $at = 80950000 -/* 05C0C 8093E8DC A020C840 */ sb $zero, %lo(D_8094C840)($at) +/* 05C0C 8093E8DC A020C840 */ sb $zero, %lo(D_8094C840)($at) /* 05C10 8093E8E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05C14 8093E8E4 00280821 */ addu $at, $at, $t0 +/* 05C14 8093E8E4 00280821 */ addu $at, $at, $t0 /* 05C18 8093E8E8 A0300AE2 */ sb $s0, 0x0AE2($at) ## 00010AE2 -/* 05C1C 8093E8EC 8FA900A4 */ lw $t1, 0x00A4($sp) +/* 05C1C 8093E8EC 8FA900A4 */ lw $t1, 0x00A4($sp) /* 05C20 8093E8F0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05C24 8093E8F4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 05C28 8093E8F8 00290821 */ addu $at, $at, $t1 +/* 05C28 8093E8F8 00290821 */ addu $at, $at, $t1 /* 05C2C 8093E8FC A0300AE1 */ sb $s0, 0x0AE1($at) ## 00010AE1 -/* 05C30 8093E900 8FAB00A4 */ lw $t3, 0x00A4($sp) +/* 05C30 8093E900 8FAB00A4 */ lw $t3, 0x00A4($sp) /* 05C34 8093E904 2442E170 */ addiu $v0, $v0, 0xE170 ## $v0 = 0602E170 /* 05C38 8093E908 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05C3C 8093E90C 00026900 */ sll $t5, $v0, 4 -/* 05C40 8093E910 000D7702 */ srl $t6, $t5, 28 -/* 05C44 8093E914 002B0821 */ addu $at, $at, $t3 -/* 05C48 8093E918 000EC880 */ sll $t9, $t6, 2 +/* 05C3C 8093E90C 00026900 */ sll $t5, $v0, 4 +/* 05C40 8093E910 000D7702 */ srl $t6, $t5, 28 +/* 05C44 8093E914 002B0821 */ addu $at, $at, $t3 +/* 05C48 8093E918 000EC880 */ sll $t9, $t6, 2 /* 05C4C 8093E91C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 05C50 8093E920 E4260AFC */ swc1 $f6, 0x0AFC($at) ## 00010AFC /* 05C54 8093E924 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 05C58 8093E928 01F97821 */ addu $t7, $t7, $t9 +/* 05C58 8093E928 01F97821 */ addu $t7, $t7, $t9 /* 05C5C 8093E92C 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 /* 05C60 8093E930 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05C64 8093E934 0041C024 */ and $t8, $v0, $at -/* 05C68 8093E938 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05C64 8093E934 0041C024 */ and $t8, $v0, $at +/* 05C68 8093E938 8FA400A4 */ lw $a0, 0x00A4($sp) /* 05C6C 8093E93C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 05C70 8093E940 24090028 */ addiu $t1, $zero, 0x0028 ## $t1 = 00000028 /* 05C74 8093E944 24080080 */ addiu $t0, $zero, 0x0080 ## $t0 = 00000080 /* 05C78 8093E948 240A00B4 */ addiu $t2, $zero, 0x00B4 ## $t2 = 000000B4 -/* 05C7C 8093E94C 01F83021 */ addu $a2, $t7, $t8 -/* 05C80 8093E950 00C13021 */ addu $a2, $a2, $at -/* 05C84 8093E954 AFAA0010 */ sw $t2, 0x0010($sp) -/* 05C88 8093E958 AFA80014 */ sw $t0, 0x0014($sp) -/* 05C8C 8093E95C AFA90018 */ sw $t1, 0x0018($sp) +/* 05C7C 8093E94C 01F83021 */ addu $a2, $t7, $t8 +/* 05C80 8093E950 00C13021 */ addu $a2, $a2, $at +/* 05C84 8093E954 AFAA0010 */ sw $t2, 0x0010($sp) +/* 05C88 8093E958 AFA80014 */ sw $t0, 0x0014($sp) +/* 05C8C 8093E95C AFA90018 */ sw $t1, 0x0018($sp) /* 05C90 8093E960 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 /* 05C94 8093E964 0C00B380 */ jal TitleCard_InitBossName - + /* 05C98 8093E968 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 00001D4C /* 05C9C 8093E96C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 05CA0 8093E970 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 @@ -1370,15 +1370,15 @@ glabel L8093E854 /* 05CA8 8093E978 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 05CAC 8093E97C 356C0020 */ ori $t4, $t3, 0x0020 ## $t4 = 00000020 /* 05CB0 8093E980 0C03E803 */ jal Audio_SetBGM - + /* 05CB4 8093E984 A44C0EE2 */ sh $t4, 0x0EE2($v0) ## 8015F542 /* 05CB8 8093E988 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093E98C: -/* 05CBC 8093E98C 286100A0 */ slti $at, $v1, 0x00A0 -/* 05CC0 8093E990 14200020 */ bne $at, $zero, .L8093EA14 +/* 05CBC 8093E98C 286100A0 */ slti $at, $v1, 0x00A0 +/* 05CC0 8093E990 14200020 */ bne $at, $zero, .L8093EA14 /* 05CC4 8093E994 26300600 */ addiu $s0, $s1, 0x0600 ## $s0 = 00000600 /* 05CC8 8093E998 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 05CCC 8093E99C 54610005 */ bnel $v1, $at, .L8093E9B4 +/* 05CCC 8093E99C 54610005 */ bnel $v1, $at, .L8093E9B4 /* 05CD0 8093E9A0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 05CD4 8093E9A4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 05CD8 8093E9A8 00000000 */ nop @@ -1389,28 +1389,28 @@ glabel L8093E854 /* 05CE8 8093E9B8 C62A0654 */ lwc1 $f10, 0x0654($s1) ## 00000654 /* 05CEC 8093E9BC 26300600 */ addiu $s0, $s1, 0x0600 ## $s0 = 00000600 /* 05CF0 8093E9C0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 05CF4 8093E9C4 46045182 */ mul.s $f6, $f10, $f4 +/* 05CF4 8093E9C4 46045182 */ mul.s $f6, $f10, $f4 /* 05CF8 8093E9C8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 05CFC 8093E9CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000600 /* 05D00 8093E9D0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 05D04 8093E9D4 44073000 */ mfc1 $a3, $f6 +/* 05D04 8093E9D4 44073000 */ mfc1 $a3, $f6 /* 05D08 8093E9D8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05D0C 8093E9DC 00000000 */ nop /* 05D10 8093E9E0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 05D14 8093E9E4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 05D18 8093E9E8 26240608 */ addiu $a0, $s1, 0x0608 ## $a0 = 00000608 /* 05D1C 8093E9EC 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 /* 05D20 8093E9F0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05D24 8093E9F4 8E270654 */ lw $a3, 0x0654($s1) ## 00000654 /* 05D28 8093E9F8 26240654 */ addiu $a0, $s1, 0x0654 ## $a0 = 00000654 /* 05D2C 8093E9FC 3C054220 */ lui $a1, 0x4220 ## $a1 = 42200000 /* 05D30 8093EA00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05D34 8093EA04 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05D38 8093EA08 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 05D3C 8093EA0C 1000000D */ beq $zero, $zero, .L8093EA44 +/* 05D3C 8093EA0C 1000000D */ beq $zero, $zero, .L8093EA44 /* 05D40 8093EA10 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093EA14: /* 05D44 8093EA14 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -1418,56 +1418,56 @@ glabel L8093E854 /* 05D4C 8093EA1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000600 /* 05D50 8093EA20 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 /* 05D54 8093EA24 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05D58 8093EA28 8E270654 */ lw $a3, 0x0654($s1) ## 00000654 /* 05D5C 8093EA2C 26240654 */ addiu $a0, $s1, 0x0654 ## $a0 = 00000654 /* 05D60 8093EA30 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 05D64 8093EA34 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05D68 8093EA38 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05D6C 8093EA3C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 05D70 8093EA40 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093EA44: /* 05D74 8093EA44 3C128095 */ lui $s2, %hi(D_8094C848) ## $s2 = 80950000 /* 05D78 8093EA48 2652C848 */ addiu $s2, $s2, %lo(D_8094C848) ## $s2 = 8094C848 -/* 05D7C 8093EA4C 286100C8 */ slti $at, $v1, 0x00C8 -/* 05D80 8093EA50 10200058 */ beq $at, $zero, .L8093EBB4 +/* 05D7C 8093EA4C 286100C8 */ slti $at, $v1, 0x00C8 +/* 05D80 8093EA50 10200058 */ beq $at, $zero, .L8093EBB4 /* 05D84 8093EA54 2405311F */ addiu $a1, $zero, 0x311F ## $a1 = 0000311F /* 05D88 8093EA58 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05D8C 8093EA5C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05D90 8093EA60 3C138095 */ lui $s3, %hi(D_8094C844) ## $s3 = 80950000 /* 05D94 8093EA64 2673C844 */ addiu $s3, $s3, %lo(D_8094C844) ## $s3 = 8094C844 /* 05D98 8093EA68 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05D9C 8093EA6C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05DA0 8093EA70 2405311F */ addiu $a1, $zero, 0x311F ## $a1 = 0000311F /* 05DA4 8093EA74 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 05DA8 8093EA78 C62801B0 */ lwc1 $f8, 0x01B0($s1) ## 000001B0 /* 05DAC 8093EA7C 44815000 */ mtc1 $at, $f10 ## $f10 = 400.00 /* 05DB0 8093EA80 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 05DB4 8093EA84 E7A80090 */ swc1 $f8, 0x0090($sp) -/* 05DB8 8093EA88 E7AA0094 */ swc1 $f10, 0x0094($sp) -/* 05DBC 8093EA8C E7A40098 */ swc1 $f4, 0x0098($sp) +/* 05DB4 8093EA84 E7A80090 */ swc1 $f8, 0x0090($sp) +/* 05DB8 8093EA88 E7AA0094 */ swc1 $f10, 0x0094($sp) +/* 05DBC 8093EA8C E7A40098 */ swc1 $f4, 0x0098($sp) /* 05DC0 8093EA90 C62C01A8 */ lwc1 $f12, 0x01A8($s1) ## 000001A8 -/* 05DC4 8093EA94 0C034348 */ jal Matrix_RotateY +/* 05DC4 8093EA94 0C034348 */ jal Matrix_RotateY /* 05DC8 8093EA98 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05DCC 8093EA9C 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFF0 -/* 05DD0 8093EAA0 0C0346BD */ jal Matrix_MultVec3f +/* 05DD0 8093EAA0 0C0346BD */ jal Matrix_MultVec3f /* 05DD4 8093EAA4 27A50084 */ addiu $a1, $sp, 0x0084 ## $a1 = FFFFFFE4 /* 05DD8 8093EAA8 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 05DDC 8093EAAC 44810000 */ mtc1 $at, $f0 ## $f0 = 32768.00 -/* 05DE0 8093EAB0 C7A60084 */ lwc1 $f6, 0x0084($sp) +/* 05DE0 8093EAB0 C7A60084 */ lwc1 $f6, 0x0084($sp) /* 05DE4 8093EAB4 8E4D0000 */ lw $t5, 0x0000($s2) ## 8094C848 /* 05DE8 8093EAB8 3C018095 */ lui $at, %hi(D_8094AFCC) ## $at = 80950000 -/* 05DEC 8093EABC C422AFCC */ lwc1 $f2, %lo(D_8094AFCC)($at) +/* 05DEC 8093EABC C422AFCC */ lwc1 $f2, %lo(D_8094AFCC)($at) /* 05DF0 8093EAC0 E5A60024 */ swc1 $f6, 0x0024($t5) ## 00000024 -/* 05DF4 8093EAC4 C7A80088 */ lwc1 $f8, 0x0088($sp) +/* 05DF4 8093EAC4 C7A80088 */ lwc1 $f8, 0x0088($sp) /* 05DF8 8093EAC8 8E4E0000 */ lw $t6, 0x0000($s2) ## 8094C848 /* 05DFC 8093EACC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 05E00 8093EAD0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05E04 8093EAD4 E5C80028 */ swc1 $f8, 0x0028($t6) ## 00000028 -/* 05E08 8093EAD8 C7AA008C */ lwc1 $f10, 0x008C($sp) +/* 05E08 8093EAD8 C7AA008C */ lwc1 $f10, 0x008C($sp) /* 05E0C 8093EADC 8E590000 */ lw $t9, 0x0000($s2) ## 8094C848 /* 05E10 8093EAE0 262401B0 */ addiu $a0, $s1, 0x01B0 ## $a0 = 000001B0 /* 05E14 8093EAE4 3C0542A0 */ lui $a1, 0x42A0 ## $a1 = 42A00000 @@ -1475,53 +1475,53 @@ glabel L8093E854 /* 05E1C 8093EAEC C62401A8 */ lwc1 $f4, 0x01A8($s1) ## 000001A8 /* 05E20 8093EAF0 8E580000 */ lw $t8, 0x0000($s2) ## 8094C848 /* 05E24 8093EAF4 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 05E28 8093EAF8 46022183 */ div.s $f6, $f4, $f2 -/* 05E2C 8093EAFC 46003202 */ mul.s $f8, $f6, $f0 -/* 05E30 8093EB00 4600428D */ trunc.w.s $f10, $f8 -/* 05E34 8093EB04 44025000 */ mfc1 $v0, $f10 +/* 05E28 8093EAF8 46022183 */ div.s $f6, $f4, $f2 +/* 05E2C 8093EAFC 46003202 */ mul.s $f8, $f6, $f0 +/* 05E30 8093EB00 4600428D */ trunc.w.s $f10, $f8 +/* 05E34 8093EB04 44025000 */ mfc1 $v0, $f10 /* 05E38 8093EB08 00000000 */ nop -/* 05E3C 8093EB0C 00021400 */ sll $v0, $v0, 16 -/* 05E40 8093EB10 00021403 */ sra $v0, $v0, 16 +/* 05E3C 8093EB0C 00021400 */ sll $v0, $v0, 16 +/* 05E40 8093EB10 00021403 */ sra $v0, $v0, 16 /* 05E44 8093EB14 A70200B6 */ sh $v0, 0x00B6($t8) ## 000000B6 /* 05E48 8093EB18 8E4A0000 */ lw $t2, 0x0000($s2) ## 8094C848 /* 05E4C 8093EB1C A5420032 */ sh $v0, 0x0032($t2) ## 00000032 -/* 05E50 8093EB20 C7A40084 */ lwc1 $f4, 0x0084($sp) +/* 05E50 8093EB20 C7A40084 */ lwc1 $f4, 0x0084($sp) /* 05E54 8093EB24 8E680000 */ lw $t0, 0x0000($s3) ## 8094C844 -/* 05E58 8093EB28 46002187 */ neg.s $f6, $f4 +/* 05E58 8093EB28 46002187 */ neg.s $f6, $f4 /* 05E5C 8093EB2C E5060024 */ swc1 $f6, 0x0024($t0) ## 00000024 /* 05E60 8093EB30 8E690000 */ lw $t1, 0x0000($s3) ## 8094C844 -/* 05E64 8093EB34 C7A80088 */ lwc1 $f8, 0x0088($sp) +/* 05E64 8093EB34 C7A80088 */ lwc1 $f8, 0x0088($sp) /* 05E68 8093EB38 E5280028 */ swc1 $f8, 0x0028($t1) ## 00000028 -/* 05E6C 8093EB3C C7AA008C */ lwc1 $f10, 0x008C($sp) +/* 05E6C 8093EB3C C7AA008C */ lwc1 $f10, 0x008C($sp) /* 05E70 8093EB40 8E6B0000 */ lw $t3, 0x0000($s3) ## 8094C844 -/* 05E74 8093EB44 46005107 */ neg.s $f4, $f10 +/* 05E74 8093EB44 46005107 */ neg.s $f4, $f10 /* 05E78 8093EB48 E564002C */ swc1 $f4, 0x002C($t3) ## 0000002C /* 05E7C 8093EB4C C62601A8 */ lwc1 $f6, 0x01A8($s1) ## 000001A8 /* 05E80 8093EB50 8E6D0000 */ lw $t5, 0x0000($s3) ## 8094C844 -/* 05E84 8093EB54 46023203 */ div.s $f8, $f6, $f2 -/* 05E88 8093EB58 46004282 */ mul.s $f10, $f8, $f0 -/* 05E8C 8093EB5C 46005100 */ add.s $f4, $f10, $f0 -/* 05E90 8093EB60 4600218D */ trunc.w.s $f6, $f4 -/* 05E94 8093EB64 44023000 */ mfc1 $v0, $f6 +/* 05E84 8093EB54 46023203 */ div.s $f8, $f6, $f2 +/* 05E88 8093EB58 46004282 */ mul.s $f10, $f8, $f0 +/* 05E8C 8093EB5C 46005100 */ add.s $f4, $f10, $f0 +/* 05E90 8093EB60 4600218D */ trunc.w.s $f6, $f4 +/* 05E94 8093EB64 44023000 */ mfc1 $v0, $f6 /* 05E98 8093EB68 00000000 */ nop -/* 05E9C 8093EB6C 00021400 */ sll $v0, $v0, 16 -/* 05EA0 8093EB70 00021403 */ sra $v0, $v0, 16 +/* 05E9C 8093EB6C 00021400 */ sll $v0, $v0, 16 +/* 05EA0 8093EB70 00021403 */ sra $v0, $v0, 16 /* 05EA4 8093EB74 A5A20032 */ sh $v0, 0x0032($t5) ## 00000032 /* 05EA8 8093EB78 8E6E0000 */ lw $t6, 0x0000($s3) ## 8094C844 /* 05EAC 8093EB7C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05EB0 8093EB80 A5C200B6 */ sh $v0, 0x00B6($t6) ## 000000B6 /* 05EB4 8093EB84 C62801A8 */ lwc1 $f8, 0x01A8($s1) ## 000001A8 /* 05EB8 8093EB88 C62A01AC */ lwc1 $f10, 0x01AC($s1) ## 000001AC /* 05EBC 8093EB8C 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 /* 05EC0 8093EB90 3C073B03 */ lui $a3, 0x3B03 ## $a3 = 3B030000 -/* 05EC4 8093EB94 460A4101 */ sub.s $f4, $f8, $f10 +/* 05EC4 8093EB94 460A4101 */ sub.s $f4, $f8, $f10 /* 05EC8 8093EB98 34E7126C */ ori $a3, $a3, 0x126C ## $a3 = 3B03126C /* 05ECC 8093EB9C 34A5CCCC */ ori $a1, $a1, 0xCCCC ## $a1 = 3E4CCCCC /* 05ED0 8093EBA0 262401AC */ addiu $a0, $s1, 0x01AC ## $a0 = 000001AC /* 05ED4 8093EBA4 E62401A8 */ swc1 $f4, 0x01A8($s1) ## 000001A8 /* 05ED8 8093EBA8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05EDC 8093EBAC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05EE0 8093EBB0 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093EBB4: @@ -1529,7 +1529,7 @@ glabel L8093E854 /* 05EE8 8093EBB8 3C138095 */ lui $s3, %hi(D_8094C844) ## $s3 = 80950000 /* 05EEC 8093EBBC 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 /* 05EF0 8093EBC0 2673C844 */ addiu $s3, $s3, %lo(D_8094C844) ## $s3 = 8094C844 -/* 05EF4 8093EBC4 14610021 */ bne $v1, $at, .L8093EC4C +/* 05EF4 8093EBC4 14610021 */ bne $v1, $at, .L8093EC4C /* 05EF8 8093EBC8 2652C848 */ addiu $s2, $s2, %lo(D_8094C848) ## $s2 = 8094C848 /* 05EFC 8093EBCC 8E590000 */ lw $t9, 0x0000($s2) ## 8094C848 /* 05F00 8093EBD0 3C028094 */ lui $v0, %hi(func_8093A2AC) ## $v0 = 80940000 @@ -1565,9 +1565,9 @@ glabel L8093E854 /* 05F78 8093EC48 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093EC4C: /* 05F7C 8093EC4C 24010104 */ addiu $at, $zero, 0x0104 ## $at = 00000104 -/* 05F80 8093EC50 14610026 */ bne $v1, $at, .L8093ECEC -/* 05F84 8093EC54 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 05F88 8093EC58 0C030129 */ jal func_800C04A4 +/* 05F80 8093EC50 14610026 */ bne $v1, $at, .L8093ECEC +/* 05F84 8093EC54 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05F88 8093EC58 0C030129 */ jal func_800C04A4 /* 05F8C 8093EC5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05F90 8093EC60 8E0F0000 */ lw $t7, 0x0000($s0) ## 00000600 /* 05F94 8093EC64 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 @@ -1589,104 +1589,104 @@ glabel L8093E854 /* 05FD4 8093ECA4 8E290614 */ lw $t1, 0x0614($s1) ## 00000614 /* 05FD8 8093ECA8 AC490058 */ sw $t1, 0x0058($v0) ## 00000058 /* 05FDC 8093ECAC 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC -/* 05FE0 8093ECB0 0C03022B */ jal func_800C08AC -/* 05FE4 8093ECB4 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 05FE8 8093ECB8 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05FE0 8093ECB0 0C03022B */ jal func_800C08AC +/* 05FE4 8093ECB4 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05FE8 8093ECB8 8FA400A4 */ lw $a0, 0x00A4($sp) /* 05FEC 8093ECBC A62005FC */ sh $zero, 0x05FC($s1) ## 000005FC /* 05FF0 8093ECC0 862B05FC */ lh $t3, 0x05FC($s1) ## 000005FC /* 05FF4 8093ECC4 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 05FF8 8093ECC8 0C01914D */ jal func_80064534 +/* 05FF8 8093ECC8 0C01914D */ jal func_80064534 /* 05FFC 8093ECCC A62B05FA */ sh $t3, 0x05FA($s1) ## 000005FA -/* 06000 8093ECD0 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 06000 8093ECD0 8FA400A4 */ lw $a0, 0x00A4($sp) /* 06004 8093ECD4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 06008 8093ECD8 0C00B7D5 */ jal func_8002DF54 +/* 06008 8093ECD8 0C00B7D5 */ jal func_8002DF54 /* 0600C 8093ECDC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 06010 8093ECE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 06014 8093ECE4 0C24F209 */ jal func_8093C824 -/* 06018 8093ECE8 8FA500A4 */ lw $a1, 0x00A4($sp) +/* 06014 8093ECE4 0C24F209 */ jal func_8093C824 +/* 06018 8093ECE8 8FA500A4 */ lw $a1, 0x00A4($sp) glabel L8093ECEC .L8093ECEC: /* 0601C 8093ECEC 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC .L8093ECF0: -/* 06020 8093ECF0 93AC009F */ lbu $t4, 0x009F($sp) -/* 06024 8093ECF4 10A0003F */ beq $a1, $zero, .L8093EDF4 +/* 06020 8093ECF0 93AC009F */ lbu $t4, 0x009F($sp) +/* 06024 8093ECF4 10A0003F */ beq $a1, $zero, .L8093EDF4 /* 06028 8093ECF8 26300600 */ addiu $s0, $s1, 0x0600 ## $s0 = 00000600 -/* 0602C 8093ECFC 11800039 */ beq $t4, $zero, .L8093EDE4 +/* 0602C 8093ECFC 11800039 */ beq $t4, $zero, .L8093EDE4 /* 06030 8093ED00 2633060C */ addiu $s3, $s1, 0x060C ## $s3 = 0000060C /* 06034 8093ED04 C62A0654 */ lwc1 $f10, 0x0654($s1) ## 00000654 /* 06038 8093ED08 C624069C */ lwc1 $f4, 0x069C($s1) ## 0000069C /* 0603C 8093ED0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000600 /* 06040 8093ED10 8E25066C */ lw $a1, 0x066C($s1) ## 0000066C -/* 06044 8093ED14 46045182 */ mul.s $f6, $f10, $f4 +/* 06044 8093ED14 46045182 */ mul.s $f6, $f10, $f4 /* 06048 8093ED18 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 /* 0604C 8093ED1C 26320608 */ addiu $s2, $s1, 0x0608 ## $s2 = 00000608 -/* 06050 8093ED20 44073000 */ mfc1 $a3, $f6 +/* 06050 8093ED20 44073000 */ mfc1 $a3, $f6 /* 06054 8093ED24 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06058 8093ED28 00000000 */ nop /* 0605C 8093ED2C C6280658 */ lwc1 $f8, 0x0658($s1) ## 00000658 /* 06060 8093ED30 C62A069C */ lwc1 $f10, 0x069C($s1) ## 0000069C /* 06064 8093ED34 26240604 */ addiu $a0, $s1, 0x0604 ## $a0 = 00000604 /* 06068 8093ED38 8E250670 */ lw $a1, 0x0670($s1) ## 00000670 -/* 0606C 8093ED3C 460A4102 */ mul.s $f4, $f8, $f10 +/* 0606C 8093ED3C 460A4102 */ mul.s $f4, $f8, $f10 /* 06070 8093ED40 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 -/* 06074 8093ED44 44072000 */ mfc1 $a3, $f4 +/* 06074 8093ED44 44072000 */ mfc1 $a3, $f4 /* 06078 8093ED48 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0607C 8093ED4C 00000000 */ nop /* 06080 8093ED50 C626065C */ lwc1 $f6, 0x065C($s1) ## 0000065C /* 06084 8093ED54 C628069C */ lwc1 $f8, 0x069C($s1) ## 0000069C /* 06088 8093ED58 02402025 */ or $a0, $s2, $zero ## $a0 = 00000608 /* 0608C 8093ED5C 8E250674 */ lw $a1, 0x0674($s1) ## 00000674 -/* 06090 8093ED60 46083282 */ mul.s $f10, $f6, $f8 +/* 06090 8093ED60 46083282 */ mul.s $f10, $f6, $f8 /* 06094 8093ED64 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 -/* 06098 8093ED68 44075000 */ mfc1 $a3, $f10 +/* 06098 8093ED68 44075000 */ mfc1 $a3, $f10 /* 0609C 8093ED6C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 060A0 8093ED70 00000000 */ nop /* 060A4 8093ED74 C6240660 */ lwc1 $f4, 0x0660($s1) ## 00000660 /* 060A8 8093ED78 C626069C */ lwc1 $f6, 0x069C($s1) ## 0000069C /* 060AC 8093ED7C 02602025 */ or $a0, $s3, $zero ## $a0 = 0000060C /* 060B0 8093ED80 8E250684 */ lw $a1, 0x0684($s1) ## 00000684 -/* 060B4 8093ED84 46062202 */ mul.s $f8, $f4, $f6 +/* 060B4 8093ED84 46062202 */ mul.s $f8, $f4, $f6 /* 060B8 8093ED88 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 -/* 060BC 8093ED8C 44074000 */ mfc1 $a3, $f8 +/* 060BC 8093ED8C 44074000 */ mfc1 $a3, $f8 /* 060C0 8093ED90 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 060C4 8093ED94 00000000 */ nop /* 060C8 8093ED98 C62A0664 */ lwc1 $f10, 0x0664($s1) ## 00000664 /* 060CC 8093ED9C C624069C */ lwc1 $f4, 0x069C($s1) ## 0000069C /* 060D0 8093EDA0 26240610 */ addiu $a0, $s1, 0x0610 ## $a0 = 00000610 /* 060D4 8093EDA4 8E250688 */ lw $a1, 0x0688($s1) ## 00000688 -/* 060D8 8093EDA8 46045182 */ mul.s $f6, $f10, $f4 +/* 060D8 8093EDA8 46045182 */ mul.s $f6, $f10, $f4 /* 060DC 8093EDAC 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 -/* 060E0 8093EDB0 44073000 */ mfc1 $a3, $f6 +/* 060E0 8093EDB0 44073000 */ mfc1 $a3, $f6 /* 060E4 8093EDB4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 060E8 8093EDB8 00000000 */ nop /* 060EC 8093EDBC C6280668 */ lwc1 $f8, 0x0668($s1) ## 00000668 /* 060F0 8093EDC0 C62A069C */ lwc1 $f10, 0x069C($s1) ## 0000069C /* 060F4 8093EDC4 26240614 */ addiu $a0, $s1, 0x0614 ## $a0 = 00000614 /* 060F8 8093EDC8 8E25068C */ lw $a1, 0x068C($s1) ## 0000068C -/* 060FC 8093EDCC 460A4102 */ mul.s $f4, $f8, $f10 +/* 060FC 8093EDCC 460A4102 */ mul.s $f4, $f8, $f10 /* 06100 8093EDD0 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 -/* 06104 8093EDD4 44072000 */ mfc1 $a3, $f4 +/* 06104 8093EDD4 44072000 */ mfc1 $a3, $f4 /* 06108 8093EDD8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0610C 8093EDDC 00000000 */ nop /* 06110 8093EDE0 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC .L8093EDE4: -/* 06114 8093EDE4 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 06114 8093EDE4 8FA400A4 */ lw $a0, 0x00A4($sp) /* 06118 8093EDE8 02603025 */ or $a2, $s3, $zero ## $a2 = 0000060C -/* 0611C 8093EDEC 0C030136 */ jal func_800C04D8 +/* 0611C 8093EDEC 0C030136 */ jal func_800C04D8 /* 06120 8093EDF0 02003825 */ or $a3, $s0, $zero ## $a3 = 00000600 .L8093EDF4: -/* 06124 8093EDF4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 06128 8093EDF8 8FB00024 */ lw $s0, 0x0024($sp) -/* 0612C 8093EDFC 8FB10028 */ lw $s1, 0x0028($sp) -/* 06130 8093EE00 8FB2002C */ lw $s2, 0x002C($sp) -/* 06134 8093EE04 8FB30030 */ lw $s3, 0x0030($sp) -/* 06138 8093EE08 03E00008 */ jr $ra +/* 06124 8093EDF4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 06128 8093EDF8 8FB00024 */ lw $s0, 0x0024($sp) +/* 0612C 8093EDFC 8FB10028 */ lw $s1, 0x0028($sp) +/* 06130 8093EE00 8FB2002C */ lw $s2, 0x002C($sp) +/* 06134 8093EE04 8FB30030 */ lw $s3, 0x0030($sp) +/* 06138 8093EE08 03E00008 */ jr $ra /* 0613C 8093EE0C 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s index 313c31ea97..f46944b66d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s @@ -1,16 +1,16 @@ glabel func_8093F108 /* 06438 8093F108 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0643C 8093F10C AFB00018 */ sw $s0, 0x0018($sp) -/* 06440 8093F110 AFA50024 */ sw $a1, 0x0024($sp) +/* 0643C 8093F10C AFB00018 */ sw $s0, 0x0018($sp) +/* 06440 8093F110 AFA50024 */ sw $a1, 0x0024($sp) /* 06444 8093F114 3C0E8094 */ lui $t6, %hi(func_8093F9E4) ## $t6 = 80940000 /* 06448 8093F118 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0644C 8093F11C AFBF001C */ sw $ra, 0x001C($sp) +/* 0644C 8093F11C AFBF001C */ sw $ra, 0x001C($sp) /* 06450 8093F120 25CEF9E4 */ addiu $t6, $t6, %lo(func_8093F9E4) ## $t6 = 8093F9E4 /* 06454 8093F124 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 06458 8093F128 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 0645C 8093F12C 24A54374 */ addiu $a1, $a1, 0x4374 ## $a1 = 06024374 /* 06460 8093F130 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 06464 8093F134 0C0294D3 */ jal func_800A534C +/* 06464 8093F134 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 06468 8093F138 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 0646C 8093F13C 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 06470 8093F140 A6000440 */ sh $zero, 0x0440($s0) ## 00000440 @@ -20,31 +20,31 @@ glabel func_8093F108 /* 06480 8093F150 86090152 */ lh $t1, 0x0152($s0) ## 00000152 /* 06484 8093F154 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 06488 8093F158 240A2710 */ addiu $t2, $zero, 0x2710 ## $t2 = 00002710 -/* 0648C 8093F15C 0301C824 */ and $t9, $t8, $at +/* 0648C 8093F15C 0301C824 */ and $t9, $t8, $at /* 06490 8093F160 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 06494 8093F164 A60A015A */ sh $t2, 0x015A($s0) ## 0000015A /* 06498 8093F168 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 /* 0649C 8093F16C A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 064A0 8093F170 A60805FA */ sh $t0, 0x05FA($s0) ## 000005FA /* 064A4 8093F174 A6090150 */ sh $t1, 0x0150($s0) ## 00000150 -/* 064A8 8093F178 8FA50024 */ lw $a1, 0x0024($sp) -/* 064AC 8093F17C 0C24F4F6 */ jal func_8093D3D8 -/* 064B0 8093F180 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 064A8 8093F178 8FA50024 */ lw $a1, 0x0024($sp) +/* 064AC 8093F17C 0C24F4F6 */ jal func_8093D3D8 +/* 064B0 8093F180 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 064B4 8093F184 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 064B8 8093F188 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) -/* 064BC 8093F18C 0C24F4F6 */ jal func_8093D3D8 -/* 064C0 8093F190 8FA50024 */ lw $a1, 0x0024($sp) +/* 064B8 8093F188 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 064BC 8093F18C 0C24F4F6 */ jal func_8093D3D8 +/* 064C0 8093F190 8FA50024 */ lw $a1, 0x0024($sp) /* 064C4 8093F194 3C0C8095 */ lui $t4, %hi(D_8094C844) ## $t4 = 80950000 -/* 064C8 8093F198 8D8CC844 */ lw $t4, %lo(D_8094C844)($t4) +/* 064C8 8093F198 8D8CC844 */ lw $t4, %lo(D_8094C844)($t4) /* 064CC 8093F19C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 064D0 8093F1A0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 064D4 8093F1A4 240B0008 */ addiu $t3, $zero, 0x0008 ## $t3 = 00000008 /* 064D8 8093F1A8 A58B0178 */ sh $t3, 0x0178($t4) ## 80950178 /* 064DC 8093F1AC E60401D0 */ swc1 $f4, 0x01D0($s0) ## 000001D0 -/* 064E0 8093F1B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 064E4 8093F1B4 8FB00018 */ lw $s0, 0x0018($sp) +/* 064E0 8093F1B0 8FBF001C */ lw $ra, 0x001C($sp) +/* 064E4 8093F1B4 8FB00018 */ lw $s0, 0x0018($sp) /* 064E8 8093F1B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 064EC 8093F1BC 03E00008 */ jr $ra +/* 064EC 8093F1BC 03E00008 */ jr $ra /* 064F0 8093F1C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s index 566e4b237d..e18e0c49c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s @@ -1,40 +1,40 @@ glabel func_8093F1C4 /* 064F4 8093F1C4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 064F8 8093F1C8 AFBF001C */ sw $ra, 0x001C($sp) -/* 064FC 8093F1CC AFB00018 */ sw $s0, 0x0018($sp) -/* 06500 8093F1D0 AFA5004C */ sw $a1, 0x004C($sp) -/* 06504 8093F1D4 A7A00038 */ sh $zero, 0x0038($sp) -/* 06508 8093F1D8 A3A00037 */ sb $zero, 0x0037($sp) -/* 0650C 8093F1DC A3A00036 */ sb $zero, 0x0036($sp) -/* 06510 8093F1E0 A3A00035 */ sb $zero, 0x0035($sp) +/* 064F8 8093F1C8 AFBF001C */ sw $ra, 0x001C($sp) +/* 064FC 8093F1CC AFB00018 */ sw $s0, 0x0018($sp) +/* 06500 8093F1D0 AFA5004C */ sw $a1, 0x004C($sp) +/* 06504 8093F1D4 A7A00038 */ sh $zero, 0x0038($sp) +/* 06508 8093F1D8 A3A00037 */ sb $zero, 0x0037($sp) +/* 0650C 8093F1DC A3A00036 */ sb $zero, 0x0036($sp) +/* 06510 8093F1E0 A3A00035 */ sb $zero, 0x0035($sp) /* 06514 8093F1E4 84820152 */ lh $v0, 0x0152($a0) ## 00000152 /* 06518 8093F1E8 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 /* 0651C 8093F1EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06520 8093F1F0 14C20003 */ bne $a2, $v0, .L8093F200 +/* 06520 8093F1F0 14C20003 */ bne $a2, $v0, .L8093F200 /* 06524 8093F1F4 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 06528 8093F1F8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0652C 8093F1FC A3AE0036 */ sb $t6, 0x0036($sp) +/* 0652C 8093F1FC A3AE0036 */ sb $t6, 0x0036($sp) .L8093F200: -/* 06530 8093F200 14C20004 */ bne $a2, $v0, .L8093F214 +/* 06530 8093F200 14C20004 */ bne $a2, $v0, .L8093F214 /* 06534 8093F204 2401008C */ addiu $at, $zero, 0x008C ## $at = 0000008C /* 06538 8093F208 240F0032 */ addiu $t7, $zero, 0x0032 ## $t7 = 00000032 /* 0653C 8093F20C 2403604B */ addiu $v1, $zero, 0x604B ## $v1 = 0000604B -/* 06540 8093F210 A3AF0035 */ sb $t7, 0x0035($sp) +/* 06540 8093F210 A3AF0035 */ sb $t7, 0x0035($sp) .L8093F214: -/* 06544 8093F214 14410004 */ bne $v0, $at, .L8093F228 +/* 06544 8093F214 14410004 */ bne $v0, $at, .L8093F228 /* 06548 8093F218 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 0654C 8093F21C 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 06550 8093F220 A3B90037 */ sb $t9, 0x0037($sp) -/* 06554 8093F224 A3B80036 */ sb $t8, 0x0036($sp) +/* 06550 8093F220 A3B90037 */ sb $t9, 0x0037($sp) +/* 06554 8093F224 A3B80036 */ sb $t8, 0x0036($sp) .L8093F228: /* 06558 8093F228 240100AA */ addiu $at, $zero, 0x00AA ## $at = 000000AA -/* 0655C 8093F22C 54410011 */ bnel $v0, $at, .L8093F274 +/* 0655C 8093F22C 54410011 */ bnel $v0, $at, .L8093F274 /* 06560 8093F230 240100D2 */ addiu $at, $zero, 0x00D2 ## $at = 000000D2 /* 06564 8093F234 3C028095 */ lui $v0, %hi(D_8094C844) ## $v0 = 80950000 /* 06568 8093F238 2442C844 */ addiu $v0, $v0, %lo(D_8094C844) ## $v0 = 8094C844 /* 0656C 8093F23C 8C4A0000 */ lw $t2, 0x0000($v0) ## 8094C844 /* 06570 8093F240 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 06574 8093F244 A3A80037 */ sb $t0, 0x0037($sp) +/* 06574 8093F244 A3A80037 */ sb $t0, 0x0037($sp) /* 06578 8093F248 2409C000 */ addiu $t1, $zero, 0xC000 ## $t1 = FFFFC000 /* 0657C 8093F24C A5490164 */ sh $t1, 0x0164($t2) ## 00000164 /* 06580 8093F250 8C4B0000 */ lw $t3, 0x0000($v0) ## 8094C844 @@ -42,548 +42,548 @@ glabel func_8093F1C4 /* 06588 8093F258 240539B4 */ addiu $a1, $zero, 0x39B4 ## $a1 = 000039B4 /* 0658C 8093F25C E56404C8 */ swc1 $f4, 0x04C8($t3) ## 000004C8 /* 06590 8093F260 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06594 8093F264 8C440000 */ lw $a0, 0x0000($v0) ## 8094C844 /* 06598 8093F268 2403604C */ addiu $v1, $zero, 0x604C ## $v1 = 0000604C /* 0659C 8093F26C 86020152 */ lh $v0, 0x0152($s0) ## 00000152 /* 065A0 8093F270 240100D2 */ addiu $at, $zero, 0x00D2 ## $at = 000000D2 .L8093F274: -/* 065A4 8093F274 14410004 */ bne $v0, $at, .L8093F288 +/* 065A4 8093F274 14410004 */ bne $v0, $at, .L8093F288 /* 065A8 8093F278 240C001E */ addiu $t4, $zero, 0x001E ## $t4 = 0000001E /* 065AC 8093F27C 3C018095 */ lui $at, %hi(D_8094C874) ## $at = 80950000 -/* 065B0 8093F280 A42CC874 */ sh $t4, %lo(D_8094C874)($at) +/* 065B0 8093F280 A42CC874 */ sh $t4, %lo(D_8094C874)($at) /* 065B4 8093F284 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F288: /* 065B8 8093F288 2401010E */ addiu $at, $zero, 0x010E ## $at = 0000010E -/* 065BC 8093F28C 54410012 */ bnel $v0, $at, .L8093F2D8 +/* 065BC 8093F28C 54410012 */ bnel $v0, $at, .L8093F2D8 /* 065C0 8093F290 24010122 */ addiu $at, $zero, 0x0122 ## $at = 00000122 /* 065C4 8093F294 3C028095 */ lui $v0, %hi(D_8094C848) ## $v0 = 80950000 /* 065C8 8093F298 2442C848 */ addiu $v0, $v0, %lo(D_8094C848) ## $v0 = 8094C848 /* 065CC 8093F29C 8C4F0000 */ lw $t7, 0x0000($v0) ## 8094C848 /* 065D0 8093F2A0 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 065D4 8093F2A4 A3AD0036 */ sb $t5, 0x0036($sp) +/* 065D4 8093F2A4 A3AD0036 */ sb $t5, 0x0036($sp) /* 065D8 8093F2A8 240E4000 */ addiu $t6, $zero, 0x4000 ## $t6 = 00004000 /* 065DC 8093F2AC A5EE0164 */ sh $t6, 0x0164($t7) ## 00000164 /* 065E0 8093F2B0 8C580000 */ lw $t8, 0x0000($v0) ## 8094C848 /* 065E4 8093F2B4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 065E8 8093F2B8 240539B4 */ addiu $a1, $zero, 0x39B4 ## $a1 = 000039B4 /* 065EC 8093F2BC E70604C8 */ swc1 $f6, 0x04C8($t8) ## 000004C8 -/* 065F0 8093F2C0 A7A3003A */ sh $v1, 0x003A($sp) +/* 065F0 8093F2C0 A7A3003A */ sh $v1, 0x003A($sp) /* 065F4 8093F2C4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 065F8 8093F2C8 8C440000 */ lw $a0, 0x0000($v0) ## 8094C848 -/* 065FC 8093F2CC 87A3003A */ lh $v1, 0x003A($sp) +/* 065FC 8093F2CC 87A3003A */ lh $v1, 0x003A($sp) /* 06600 8093F2D0 86020152 */ lh $v0, 0x0152($s0) ## 00000152 /* 06604 8093F2D4 24010122 */ addiu $at, $zero, 0x0122 ## $at = 00000122 .L8093F2D8: -/* 06608 8093F2D8 14410003 */ bne $v0, $at, .L8093F2E8 +/* 06608 8093F2D8 14410003 */ bne $v0, $at, .L8093F2E8 /* 0660C 8093F2DC 24190023 */ addiu $t9, $zero, 0x0023 ## $t9 = 00000023 /* 06610 8093F2E0 2403604D */ addiu $v1, $zero, 0x604D ## $v1 = 0000604D -/* 06614 8093F2E4 A3B90035 */ sb $t9, 0x0035($sp) +/* 06614 8093F2E4 A3B90035 */ sb $t9, 0x0035($sp) .L8093F2E8: /* 06618 8093F2E8 2401015E */ addiu $at, $zero, 0x015E ## $at = 0000015E -/* 0661C 8093F2EC 14410018 */ bne $v0, $at, .L8093F350 +/* 0661C 8093F2EC 14410018 */ bne $v0, $at, .L8093F350 /* 06620 8093F2F0 3C0A8095 */ lui $t2, %hi(D_8094C844) ## $t2 = 80950000 -/* 06624 8093F2F4 8D4AC844 */ lw $t2, %lo(D_8094C844)($t2) +/* 06624 8093F2F4 8D4AC844 */ lw $t2, %lo(D_8094C844)($t2) /* 06628 8093F2F8 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 0662C 8093F2FC 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 06630 8093F300 A3A90036 */ sb $t1, 0x0036($sp) -/* 06634 8093F304 A3A80037 */ sb $t0, 0x0037($sp) +/* 06630 8093F300 A3A90036 */ sb $t1, 0x0036($sp) +/* 06634 8093F304 A3A80037 */ sb $t0, 0x0037($sp) /* 06638 8093F308 3C0B8095 */ lui $t3, %hi(D_8094C844) ## $t3 = 80950000 /* 0663C 8093F30C A5400164 */ sh $zero, 0x0164($t2) ## 80950164 -/* 06640 8093F310 8D6BC844 */ lw $t3, %lo(D_8094C844)($t3) +/* 06640 8093F310 8D6BC844 */ lw $t3, %lo(D_8094C844)($t3) /* 06644 8093F314 3C0D8095 */ lui $t5, %hi(D_8094C848) ## $t5 = 80950000 -/* 06648 8093F318 8DADC848 */ lw $t5, %lo(D_8094C848)($t5) +/* 06648 8093F318 8DADC848 */ lw $t5, %lo(D_8094C848)($t5) /* 0664C 8093F31C 856C0164 */ lh $t4, 0x0164($t3) ## 80950164 /* 06650 8093F320 3C0E8095 */ lui $t6, %hi(D_8094C844) ## $t6 = 80950000 /* 06654 8093F324 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 06658 8093F328 A5AC0164 */ sh $t4, 0x0164($t5) ## 80950164 -/* 0665C 8093F32C 8DCEC844 */ lw $t6, %lo(D_8094C844)($t6) +/* 0665C 8093F32C 8DCEC844 */ lw $t6, %lo(D_8094C844)($t6) /* 06660 8093F330 3C0F8095 */ lui $t7, %hi(D_8094C844) ## $t7 = 80950000 /* 06664 8093F334 3C188095 */ lui $t8, %hi(D_8094C848) ## $t8 = 80950000 /* 06668 8093F338 E5C804C8 */ swc1 $f8, 0x04C8($t6) ## 809504C8 -/* 0666C 8093F33C 8DEFC844 */ lw $t7, %lo(D_8094C844)($t7) -/* 06670 8093F340 8F18C848 */ lw $t8, %lo(D_8094C848)($t8) +/* 0666C 8093F33C 8DEFC844 */ lw $t7, %lo(D_8094C844)($t7) +/* 06670 8093F340 8F18C848 */ lw $t8, %lo(D_8094C848)($t8) /* 06674 8093F344 C5EA04C8 */ lwc1 $f10, 0x04C8($t7) ## 809504C8 /* 06678 8093F348 E70A04C8 */ swc1 $f10, 0x04C8($t8) ## 809504C8 /* 0667C 8093F34C 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F350: /* 06680 8093F350 2401017C */ addiu $at, $zero, 0x017C ## $at = 0000017C -/* 06684 8093F354 14410004 */ bne $v0, $at, .L8093F368 +/* 06684 8093F354 14410004 */ bne $v0, $at, .L8093F368 /* 06688 8093F358 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 0668C 8093F35C 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 06690 8093F360 A3A80036 */ sb $t0, 0x0036($sp) -/* 06694 8093F364 A3B90037 */ sb $t9, 0x0037($sp) +/* 06690 8093F360 A3A80036 */ sb $t0, 0x0036($sp) +/* 06694 8093F364 A3B90037 */ sb $t9, 0x0037($sp) .L8093F368: /* 06698 8093F368 24010190 */ addiu $at, $zero, 0x0190 ## $at = 00000190 -/* 0669C 8093F36C 14410004 */ bne $v0, $at, .L8093F380 +/* 0669C 8093F36C 14410004 */ bne $v0, $at, .L8093F380 /* 066A0 8093F370 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 066A4 8093F374 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 066A8 8093F378 A3AA0036 */ sb $t2, 0x0036($sp) -/* 066AC 8093F37C A3A90037 */ sb $t1, 0x0037($sp) +/* 066A8 8093F378 A3AA0036 */ sb $t2, 0x0036($sp) +/* 066AC 8093F37C A3A90037 */ sb $t1, 0x0037($sp) .L8093F380: /* 066B0 8093F380 240101AE */ addiu $at, $zero, 0x01AE ## $at = 000001AE -/* 066B4 8093F384 14410009 */ bne $v0, $at, .L8093F3AC +/* 066B4 8093F384 14410009 */ bne $v0, $at, .L8093F3AC /* 066B8 8093F388 240C01B3 */ addiu $t4, $zero, 0x01B3 ## $t4 = 000001B3 /* 066BC 8093F38C 3C018095 */ lui $at, %hi(D_8094C874) ## $at = 80950000 -/* 066C0 8093F390 A42CC874 */ sh $t4, %lo(D_8094C874)($at) +/* 066C0 8093F390 A42CC874 */ sh $t4, %lo(D_8094C874)($at) /* 066C4 8093F394 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 /* 066C8 8093F398 3C018095 */ lui $at, %hi(D_8094C878) ## $at = 80950000 /* 066CC 8093F39C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 066D0 8093F3A0 A3AB0036 */ sb $t3, 0x0036($sp) -/* 066D4 8093F3A4 A02DC878 */ sb $t5, %lo(D_8094C878)($at) +/* 066D0 8093F3A0 A3AB0036 */ sb $t3, 0x0036($sp) +/* 066D4 8093F3A4 A02DC878 */ sb $t5, %lo(D_8094C878)($at) /* 066D8 8093F3A8 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F3AC: -/* 066DC 8093F3AC 284101B9 */ slti $at, $v0, 0x01B9 -/* 066E0 8093F3B0 14200007 */ bne $at, $zero, .L8093F3D0 -/* 066E4 8093F3B4 2841035C */ slti $at, $v0, 0x035C -/* 066E8 8093F3B8 10200005 */ beq $at, $zero, .L8093F3D0 +/* 066DC 8093F3AC 284101B9 */ slti $at, $v0, 0x01B9 +/* 066E0 8093F3B0 14200007 */ bne $at, $zero, .L8093F3D0 +/* 066E4 8093F3B4 2841035C */ slti $at, $v0, 0x035C +/* 066E8 8093F3B8 10200005 */ beq $at, $zero, .L8093F3D0 /* 066EC 8093F3BC 240431E7 */ addiu $a0, $zero, 0x31E7 ## $a0 = 000031E7 -/* 066F0 8093F3C0 0C01E221 */ jal func_80078884 -/* 066F4 8093F3C4 A7A3003A */ sh $v1, 0x003A($sp) -/* 066F8 8093F3C8 87A3003A */ lh $v1, 0x003A($sp) +/* 066F0 8093F3C0 0C01E221 */ jal func_80078884 +/* 066F4 8093F3C4 A7A3003A */ sh $v1, 0x003A($sp) +/* 066F8 8093F3C8 87A3003A */ lh $v1, 0x003A($sp) /* 066FC 8093F3CC 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F3D0: /* 06700 8093F3D0 240101AE */ addiu $at, $zero, 0x01AE ## $at = 000001AE -/* 06704 8093F3D4 14410002 */ bne $v0, $at, .L8093F3E0 +/* 06704 8093F3D4 14410002 */ bne $v0, $at, .L8093F3E0 /* 06708 8093F3D8 240401E0 */ addiu $a0, $zero, 0x01E0 ## $a0 = 000001E0 /* 0670C 8093F3DC 2403604E */ addiu $v1, $zero, 0x604E ## $v1 = 0000604E .L8093F3E0: -/* 06710 8093F3E0 14820008 */ bne $a0, $v0, .L8093F404 +/* 06710 8093F3E0 14820008 */ bne $a0, $v0, .L8093F404 /* 06714 8093F3E4 240101F4 */ addiu $at, $zero, 0x01F4 ## $at = 000001F4 /* 06718 8093F3E8 3C188095 */ lui $t8, %hi(D_8094C844) ## $t8 = 80950000 -/* 0671C 8093F3EC 8F18C844 */ lw $t8, %lo(D_8094C844)($t8) +/* 0671C 8093F3EC 8F18C844 */ lw $t8, %lo(D_8094C844)($t8) /* 06720 8093F3F0 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 06724 8093F3F4 A3AE0037 */ sb $t6, 0x0037($sp) +/* 06724 8093F3F4 A3AE0037 */ sb $t6, 0x0037($sp) /* 06728 8093F3F8 240FC000 */ addiu $t7, $zero, 0xC000 ## $t7 = FFFFC000 /* 0672C 8093F3FC A70F0164 */ sh $t7, 0x0164($t8) ## 80950164 /* 06730 8093F400 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F404: -/* 06734 8093F404 14410002 */ bne $v0, $at, .L8093F410 +/* 06734 8093F404 14410002 */ bne $v0, $at, .L8093F410 /* 06738 8093F408 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 0673C 8093F40C A3B90036 */ sb $t9, 0x0036($sp) +/* 0673C 8093F40C A3B90036 */ sb $t9, 0x0036($sp) .L8093F410: -/* 06740 8093F410 14820002 */ bne $a0, $v0, .L8093F41C +/* 06740 8093F410 14820002 */ bne $a0, $v0, .L8093F41C /* 06744 8093F414 2408604F */ addiu $t0, $zero, 0x604F ## $t0 = 0000604F -/* 06748 8093F418 A7A80038 */ sh $t0, 0x0038($sp) +/* 06748 8093F418 A7A80038 */ sh $t0, 0x0038($sp) .L8093F41C: /* 0674C 8093F41C 24040212 */ addiu $a0, $zero, 0x0212 ## $a0 = 00000212 -/* 06750 8093F420 1482000D */ bne $a0, $v0, .L8093F458 +/* 06750 8093F420 1482000D */ bne $a0, $v0, .L8093F458 /* 06754 8093F424 3C0B8095 */ lui $t3, %hi(D_8094C848) ## $t3 = 80950000 -/* 06758 8093F428 8D6BC848 */ lw $t3, %lo(D_8094C848)($t3) +/* 06758 8093F428 8D6BC848 */ lw $t3, %lo(D_8094C848)($t3) /* 0675C 8093F42C 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 06760 8093F430 A3A90036 */ sb $t1, 0x0036($sp) +/* 06760 8093F430 A3A90036 */ sb $t1, 0x0036($sp) /* 06764 8093F434 240A4000 */ addiu $t2, $zero, 0x4000 ## $t2 = 00004000 /* 06768 8093F438 240C014F */ addiu $t4, $zero, 0x014F ## $t4 = 0000014F /* 0676C 8093F43C 3C018095 */ lui $at, %hi(D_8094C87A) ## $at = 80950000 /* 06770 8093F440 A56A0164 */ sh $t2, 0x0164($t3) ## 80950164 -/* 06774 8093F444 A42CC87A */ sh $t4, %lo(D_8094C87A)($at) +/* 06774 8093F444 A42CC87A */ sh $t4, %lo(D_8094C87A)($at) /* 06778 8093F448 3C018095 */ lui $at, %hi(D_8094C87E) ## $at = 80950000 /* 0677C 8093F44C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 06780 8093F450 A02DC87E */ sb $t5, %lo(D_8094C87E)($at) +/* 06780 8093F450 A02DC87E */ sb $t5, %lo(D_8094C87E)($at) /* 06784 8093F454 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F458: -/* 06788 8093F458 14820002 */ bne $a0, $v0, .L8093F464 +/* 06788 8093F458 14820002 */ bne $a0, $v0, .L8093F464 /* 0678C 8093F45C 24010244 */ addiu $at, $zero, 0x0244 ## $at = 00000244 /* 06790 8093F460 24036050 */ addiu $v1, $zero, 0x6050 ## $v1 = 00006050 .L8093F464: -/* 06794 8093F464 14410002 */ bne $v0, $at, .L8093F470 +/* 06794 8093F464 14410002 */ bne $v0, $at, .L8093F470 /* 06798 8093F468 240E6051 */ addiu $t6, $zero, 0x6051 ## $t6 = 00006051 -/* 0679C 8093F46C A7AE0038 */ sh $t6, 0x0038($sp) +/* 0679C 8093F46C A7AE0038 */ sh $t6, 0x0038($sp) .L8093F470: /* 067A0 8093F470 2401026C */ addiu $at, $zero, 0x026C ## $at = 0000026C -/* 067A4 8093F474 54410003 */ bnel $v0, $at, .L8093F484 +/* 067A4 8093F474 54410003 */ bnel $v0, $at, .L8093F484 /* 067A8 8093F478 24010294 */ addiu $at, $zero, 0x0294 ## $at = 00000294 /* 067AC 8093F47C 24036052 */ addiu $v1, $zero, 0x6052 ## $v1 = 00006052 /* 067B0 8093F480 24010294 */ addiu $at, $zero, 0x0294 ## $at = 00000294 .L8093F484: -/* 067B4 8093F484 14410002 */ bne $v0, $at, .L8093F490 +/* 067B4 8093F484 14410002 */ bne $v0, $at, .L8093F490 /* 067B8 8093F488 240F6053 */ addiu $t7, $zero, 0x6053 ## $t7 = 00006053 -/* 067BC 8093F48C A7AF0038 */ sh $t7, 0x0038($sp) +/* 067BC 8093F48C A7AF0038 */ sh $t7, 0x0038($sp) .L8093F490: /* 067C0 8093F490 240102BC */ addiu $at, $zero, 0x02BC ## $at = 000002BC -/* 067C4 8093F494 54410003 */ bnel $v0, $at, .L8093F4A4 +/* 067C4 8093F494 54410003 */ bnel $v0, $at, .L8093F4A4 /* 067C8 8093F498 240102E4 */ addiu $at, $zero, 0x02E4 ## $at = 000002E4 /* 067CC 8093F49C 24036054 */ addiu $v1, $zero, 0x6054 ## $v1 = 00006054 /* 067D0 8093F4A0 240102E4 */ addiu $at, $zero, 0x02E4 ## $at = 000002E4 .L8093F4A4: -/* 067D4 8093F4A4 14410002 */ bne $v0, $at, .L8093F4B0 +/* 067D4 8093F4A4 14410002 */ bne $v0, $at, .L8093F4B0 /* 067D8 8093F4A8 24186055 */ addiu $t8, $zero, 0x6055 ## $t8 = 00006055 -/* 067DC 8093F4AC A7B80038 */ sh $t8, 0x0038($sp) +/* 067DC 8093F4AC A7B80038 */ sh $t8, 0x0038($sp) .L8093F4B0: /* 067E0 8093F4B0 2401030C */ addiu $at, $zero, 0x030C ## $at = 0000030C -/* 067E4 8093F4B4 54410003 */ bnel $v0, $at, .L8093F4C4 +/* 067E4 8093F4B4 54410003 */ bnel $v0, $at, .L8093F4C4 /* 067E8 8093F4B8 24010334 */ addiu $at, $zero, 0x0334 ## $at = 00000334 /* 067EC 8093F4BC 24036056 */ addiu $v1, $zero, 0x6056 ## $v1 = 00006056 /* 067F0 8093F4C0 24010334 */ addiu $at, $zero, 0x0334 ## $at = 00000334 .L8093F4C4: -/* 067F4 8093F4C4 14410008 */ bne $v0, $at, .L8093F4E8 +/* 067F4 8093F4C4 14410008 */ bne $v0, $at, .L8093F4E8 /* 067F8 8093F4C8 24196057 */ addiu $t9, $zero, 0x6057 ## $t9 = 00006057 /* 067FC 8093F4CC 3C041050 */ lui $a0, 0x1050 ## $a0 = 10500000 -/* 06800 8093F4D0 A7B90038 */ sh $t9, 0x0038($sp) +/* 06800 8093F4D0 A7B90038 */ sh $t9, 0x0038($sp) /* 06804 8093F4D4 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 105000FF /* 06808 8093F4D8 0C03E803 */ jal Audio_SetBGM - -/* 0680C 8093F4DC A7A3003A */ sh $v1, 0x003A($sp) -/* 06810 8093F4E0 87A3003A */ lh $v1, 0x003A($sp) + +/* 0680C 8093F4DC A7A3003A */ sh $v1, 0x003A($sp) +/* 06810 8093F4E0 87A3003A */ lh $v1, 0x003A($sp) /* 06814 8093F4E4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F4E8: /* 06818 8093F4E8 2401035C */ addiu $at, $zero, 0x035C ## $at = 0000035C -/* 0681C 8093F4EC 14410004 */ bne $v0, $at, .L8093F500 +/* 0681C 8093F4EC 14410004 */ bne $v0, $at, .L8093F500 /* 06820 8093F4F0 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 06824 8093F4F4 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 06828 8093F4F8 A3A90036 */ sb $t1, 0x0036($sp) -/* 0682C 8093F4FC A3A80037 */ sb $t0, 0x0037($sp) +/* 06828 8093F4F8 A3A90036 */ sb $t1, 0x0036($sp) +/* 0682C 8093F4FC A3A80037 */ sb $t0, 0x0037($sp) .L8093F500: /* 06830 8093F500 24010384 */ addiu $at, $zero, 0x0384 ## $at = 00000384 -/* 06834 8093F504 1441000B */ bne $v0, $at, .L8093F534 +/* 06834 8093F504 1441000B */ bne $v0, $at, .L8093F534 /* 06838 8093F508 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 0683C 8093F50C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 0683C 8093F50C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 06840 8093F510 240539B5 */ addiu $a1, $zero, 0x39B5 ## $a1 = 000039B5 /* 06844 8093F514 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 06848 8093F518 A7A3003A */ sh $v1, 0x003A($sp) + +/* 06848 8093F518 A7A3003A */ sh $v1, 0x003A($sp) /* 0684C 8093F51C 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 06850 8093F520 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06850 8093F520 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06854 8093F524 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06858 8093F528 240539B5 */ addiu $a1, $zero, 0x39B5 ## $a1 = 000039B5 -/* 0685C 8093F52C 87A3003A */ lh $v1, 0x003A($sp) +/* 0685C 8093F52C 87A3003A */ lh $v1, 0x003A($sp) /* 06860 8093F530 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F534: /* 06864 8093F534 240103A2 */ addiu $at, $zero, 0x03A2 ## $at = 000003A2 -/* 06868 8093F538 14410002 */ bne $v0, $at, .L8093F544 -/* 0686C 8093F53C 8FA4004C */ lw $a0, 0x004C($sp) +/* 06868 8093F538 14410002 */ bne $v0, $at, .L8093F544 +/* 0686C 8093F53C 8FA4004C */ lw $a0, 0x004C($sp) /* 06870 8093F540 24036058 */ addiu $v1, $zero, 0x6058 ## $v1 = 00006058 .L8093F544: -/* 06874 8093F544 1060000D */ beq $v1, $zero, .L8093F57C +/* 06874 8093F544 1060000D */ beq $v1, $zero, .L8093F57C /* 06878 8093F548 3065FFFF */ andi $a1, $v1, 0xFFFF ## $a1 = 00006058 -/* 0687C 8093F54C 0C042DA0 */ jal func_8010B680 +/* 0687C 8093F54C 0C042DA0 */ jal func_8010B680 /* 06880 8093F550 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 06884 8093F554 93AA0035 */ lbu $t2, 0x0035($sp) +/* 06884 8093F554 93AA0035 */ lbu $t2, 0x0035($sp) /* 06888 8093F558 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A /* 0688C 8093F55C 3C018095 */ lui $at, %hi(D_8094C876) ## $at = 80950000 -/* 06890 8093F560 51400007 */ beql $t2, $zero, .L8093F580 -/* 06894 8093F564 87AC0038 */ lh $t4, 0x0038($sp) -/* 06898 8093F568 A42BC876 */ sh $t3, %lo(D_8094C876)($at) +/* 06890 8093F560 51400007 */ beql $t2, $zero, .L8093F580 +/* 06894 8093F564 87AC0038 */ lh $t4, 0x0038($sp) +/* 06898 8093F568 A42BC876 */ sh $t3, %lo(D_8094C876)($at) /* 0689C 8093F56C 3C018095 */ lui $at, %hi(D_8094C874) ## $at = 80950000 -/* 068A0 8093F570 A42AC874 */ sh $t2, %lo(D_8094C874)($at) +/* 068A0 8093F570 A42AC874 */ sh $t2, %lo(D_8094C874)($at) /* 068A4 8093F574 3C018095 */ lui $at, %hi(D_8094C878) ## $at = 80950000 -/* 068A8 8093F578 A020C878 */ sb $zero, %lo(D_8094C878)($at) +/* 068A8 8093F578 A020C878 */ sb $zero, %lo(D_8094C878)($at) .L8093F57C: -/* 068AC 8093F57C 87AC0038 */ lh $t4, 0x0038($sp) +/* 068AC 8093F57C 87AC0038 */ lh $t4, 0x0038($sp) .L8093F580: -/* 068B0 8093F580 8FA4004C */ lw $a0, 0x004C($sp) -/* 068B4 8093F584 97A50038 */ lhu $a1, 0x0038($sp) -/* 068B8 8093F588 51800004 */ beql $t4, $zero, .L8093F59C -/* 068BC 8093F58C 93A20037 */ lbu $v0, 0x0037($sp) -/* 068C0 8093F590 0C042DA0 */ jal func_8010B680 +/* 068B0 8093F580 8FA4004C */ lw $a0, 0x004C($sp) +/* 068B4 8093F584 97A50038 */ lhu $a1, 0x0038($sp) +/* 068B8 8093F588 51800004 */ beql $t4, $zero, .L8093F59C +/* 068BC 8093F58C 93A20037 */ lbu $v0, 0x0037($sp) +/* 068C0 8093F590 0C042DA0 */ jal func_8010B680 /* 068C4 8093F594 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 068C8 8093F598 93A20037 */ lbu $v0, 0x0037($sp) +/* 068C8 8093F598 93A20037 */ lbu $v0, 0x0037($sp) .L8093F59C: /* 068CC 8093F59C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 068D0 8093F5A0 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 068D4 8093F5A4 1041000C */ beq $v0, $at, .L8093F5D8 +/* 068D4 8093F5A4 1041000C */ beq $v0, $at, .L8093F5D8 /* 068D8 8093F5A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 068DC 8093F5AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 068E0 8093F5B0 10410010 */ beq $v0, $at, .L8093F5F4 +/* 068E0 8093F5B0 10410010 */ beq $v0, $at, .L8093F5F4 /* 068E4 8093F5B4 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 /* 068E8 8093F5B8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 068EC 8093F5BC 10410015 */ beq $v0, $at, .L8093F614 +/* 068EC 8093F5BC 10410015 */ beq $v0, $at, .L8093F614 /* 068F0 8093F5C0 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 /* 068F4 8093F5C4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 068F8 8093F5C8 1041001A */ beq $v0, $at, .L8093F634 +/* 068F8 8093F5C8 1041001A */ beq $v0, $at, .L8093F634 /* 068FC 8093F5CC 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 06900 8093F5D0 1000001F */ beq $zero, $zero, .L8093F650 -/* 06904 8093F5D4 93A20036 */ lbu $v0, 0x0036($sp) +/* 06900 8093F5D0 1000001F */ beq $zero, $zero, .L8093F650 +/* 06904 8093F5D4 93A20036 */ lbu $v0, 0x0036($sp) .L8093F5D8: -/* 06908 8093F5D8 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06908 8093F5D8 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 0690C 8093F5DC 24A5230C */ addiu $a1, $a1, 0x230C ## $a1 = 0600230C /* 06910 8093F5E0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06914 8093F5E4 0C0294D3 */ jal func_800A534C +/* 06914 8093F5E4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 06918 8093F5E8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 80950568 -/* 0691C 8093F5EC 10000018 */ beq $zero, $zero, .L8093F650 -/* 06920 8093F5F0 93A20036 */ lbu $v0, 0x0036($sp) +/* 0691C 8093F5EC 10000018 */ beq $zero, $zero, .L8093F650 +/* 06920 8093F5F0 93A20036 */ lbu $v0, 0x0036($sp) .L8093F5F4: -/* 06924 8093F5F4 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06924 8093F5F4 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06928 8093F5F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0692C 8093F5FC 24A51D10 */ addiu $a1, $a1, 0x1D10 ## $a1 = 06001D10 /* 06930 8093F600 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06934 8093F604 0C0294D3 */ jal func_800A534C +/* 06934 8093F604 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 06938 8093F608 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 0693C 8093F60C 10000010 */ beq $zero, $zero, .L8093F650 -/* 06940 8093F610 93A20036 */ lbu $v0, 0x0036($sp) +/* 0693C 8093F60C 10000010 */ beq $zero, $zero, .L8093F650 +/* 06940 8093F610 93A20036 */ lbu $v0, 0x0036($sp) .L8093F614: -/* 06944 8093F614 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06944 8093F614 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06948 8093F618 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0694C 8093F61C 24A517E0 */ addiu $a1, $a1, 0x17E0 ## $a1 = 060017E0 /* 06950 8093F620 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06954 8093F624 0C0294D3 */ jal func_800A534C +/* 06954 8093F624 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 06958 8093F628 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 0695C 8093F62C 10000008 */ beq $zero, $zero, .L8093F650 -/* 06960 8093F630 93A20036 */ lbu $v0, 0x0036($sp) +/* 0695C 8093F62C 10000008 */ beq $zero, $zero, .L8093F650 +/* 06960 8093F630 93A20036 */ lbu $v0, 0x0036($sp) .L8093F634: -/* 06964 8093F634 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06964 8093F634 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06968 8093F638 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0696C 8093F63C 24A512A4 */ addiu $a1, $a1, 0x12A4 ## $a1 = 060012A4 /* 06970 8093F640 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06974 8093F644 0C0294D3 */ jal func_800A534C +/* 06974 8093F644 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 06978 8093F648 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 0697C 8093F64C 93A20036 */ lbu $v0, 0x0036($sp) +/* 0697C 8093F64C 93A20036 */ lbu $v0, 0x0036($sp) .L8093F650: /* 06980 8093F650 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 06984 8093F654 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 06988 8093F658 1041000C */ beq $v0, $at, .L8093F68C +/* 06988 8093F658 1041000C */ beq $v0, $at, .L8093F68C /* 0698C 8093F65C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 06990 8093F660 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 06994 8093F664 10410010 */ beq $v0, $at, .L8093F6A8 +/* 06994 8093F664 10410010 */ beq $v0, $at, .L8093F6A8 /* 06998 8093F668 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 /* 0699C 8093F66C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 069A0 8093F670 10410015 */ beq $v0, $at, .L8093F6C8 +/* 069A0 8093F670 10410015 */ beq $v0, $at, .L8093F6C8 /* 069A4 8093F674 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 /* 069A8 8093F678 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 069AC 8093F67C 1041001A */ beq $v0, $at, .L8093F6E8 +/* 069AC 8093F67C 1041001A */ beq $v0, $at, .L8093F6E8 /* 069B0 8093F680 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 069B4 8093F684 1000001F */ beq $zero, $zero, .L8093F704 +/* 069B4 8093F684 1000001F */ beq $zero, $zero, .L8093F704 /* 069B8 8093F688 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F68C: -/* 069BC 8093F68C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 069BC 8093F68C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 069C0 8093F690 24A5230C */ addiu $a1, $a1, 0x230C ## $a1 = 0600230C /* 069C4 8093F694 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 069C8 8093F698 0C0294D3 */ jal func_800A534C +/* 069C8 8093F698 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 069CC 8093F69C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 80950568 -/* 069D0 8093F6A0 10000018 */ beq $zero, $zero, .L8093F704 +/* 069D0 8093F6A0 10000018 */ beq $zero, $zero, .L8093F704 /* 069D4 8093F6A4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F6A8: -/* 069D8 8093F6A8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 069D8 8093F6A8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 069DC 8093F6AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 069E0 8093F6B0 24A51D10 */ addiu $a1, $a1, 0x1D10 ## $a1 = 06001D10 /* 069E4 8093F6B4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 069E8 8093F6B8 0C0294D3 */ jal func_800A534C +/* 069E8 8093F6B8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 069EC 8093F6BC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 069F0 8093F6C0 10000010 */ beq $zero, $zero, .L8093F704 +/* 069F0 8093F6C0 10000010 */ beq $zero, $zero, .L8093F704 /* 069F4 8093F6C4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F6C8: -/* 069F8 8093F6C8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 069F8 8093F6C8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 069FC 8093F6CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 06A00 8093F6D0 24A517E0 */ addiu $a1, $a1, 0x17E0 ## $a1 = 060017E0 /* 06A04 8093F6D4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06A08 8093F6D8 0C0294D3 */ jal func_800A534C +/* 06A08 8093F6D8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 06A0C 8093F6DC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 06A10 8093F6E0 10000008 */ beq $zero, $zero, .L8093F704 +/* 06A10 8093F6E0 10000008 */ beq $zero, $zero, .L8093F704 /* 06A14 8093F6E4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F6E8: -/* 06A18 8093F6E8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 06A18 8093F6E8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 06A1C 8093F6EC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 06A20 8093F6F0 24A512A4 */ addiu $a1, $a1, 0x12A4 ## $a1 = 060012A4 /* 06A24 8093F6F4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06A28 8093F6F8 0C0294D3 */ jal func_800A534C +/* 06A28 8093F6F8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 06A2C 8093F6FC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 06A30 8093F700 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F704: -/* 06A34 8093F704 28410078 */ slti $at, $v0, 0x0078 -/* 06A38 8093F708 14200009 */ bne $at, $zero, .L8093F730 -/* 06A3C 8093F70C 284101F4 */ slti $at, $v0, 0x01F4 -/* 06A40 8093F710 10200007 */ beq $at, $zero, .L8093F730 +/* 06A34 8093F704 28410078 */ slti $at, $v0, 0x0078 +/* 06A38 8093F708 14200009 */ bne $at, $zero, .L8093F730 +/* 06A3C 8093F70C 284101F4 */ slti $at, $v0, 0x01F4 +/* 06A40 8093F710 10200007 */ beq $at, $zero, .L8093F730 /* 06A44 8093F714 260401CC */ addiu $a0, $s0, 0x01CC ## $a0 = 000001CC /* 06A48 8093F718 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06A4C 8093F71C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 06A50 8093F720 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 06A54 8093F724 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06A58 8093F728 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 06A5C 8093F72C 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F730: -/* 06A60 8093F730 28410096 */ slti $at, $v0, 0x0096 -/* 06A64 8093F734 542000A7 */ bnel $at, $zero, .L8093F9D4 -/* 06A68 8093F738 8FBF001C */ lw $ra, 0x001C($sp) +/* 06A60 8093F730 28410096 */ slti $at, $v0, 0x0096 +/* 06A64 8093F734 542000A7 */ bnel $at, $zero, .L8093F9D4 +/* 06A68 8093F738 8FBF001C */ lw $ra, 0x001C($sp) /* 06A6C 8093F73C 86040150 */ lh $a0, 0x0150($s0) ## 00000150 -/* 06A70 8093F740 00800821 */ addu $at, $a0, $zero -/* 06A74 8093F744 00042140 */ sll $a0, $a0, 5 -/* 06A78 8093F748 00812023 */ subu $a0, $a0, $at -/* 06A7C 8093F74C 00042080 */ sll $a0, $a0, 2 -/* 06A80 8093F750 00812021 */ addu $a0, $a0, $at -/* 06A84 8093F754 00042100 */ sll $a0, $a0, 4 -/* 06A88 8093F758 00042400 */ sll $a0, $a0, 16 +/* 06A70 8093F740 00800821 */ addu $at, $a0, $zero +/* 06A74 8093F744 00042140 */ sll $a0, $a0, 5 +/* 06A78 8093F748 00812023 */ subu $a0, $a0, $at +/* 06A7C 8093F74C 00042080 */ sll $a0, $a0, 2 +/* 06A80 8093F750 00812021 */ addu $a0, $a0, $at +/* 06A84 8093F754 00042100 */ sll $a0, $a0, 4 +/* 06A88 8093F758 00042400 */ sll $a0, $a0, 16 /* 06A8C 8093F75C 0C01DE1C */ jal Math_Sins ## sins? -/* 06A90 8093F760 00042403 */ sra $a0, $a0, 16 +/* 06A90 8093F760 00042403 */ sra $a0, $a0, 16 /* 06A94 8093F764 3C018095 */ lui $at, %hi(D_8094AFE0) ## $at = 80950000 -/* 06A98 8093F768 C430AFE0 */ lwc1 $f16, %lo(D_8094AFE0)($at) +/* 06A98 8093F768 C430AFE0 */ lwc1 $f16, %lo(D_8094AFE0)($at) /* 06A9C 8093F76C 3C018095 */ lui $at, %hi(D_8094AFE4) ## $at = 80950000 -/* 06AA0 8093F770 C424AFE4 */ lwc1 $f4, %lo(D_8094AFE4)($at) -/* 06AA4 8093F774 46100482 */ mul.s $f18, $f0, $f16 +/* 06AA0 8093F770 C424AFE4 */ lwc1 $f4, %lo(D_8094AFE4)($at) +/* 06AA4 8093F774 46100482 */ mul.s $f18, $f0, $f16 /* 06AA8 8093F778 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 06AAC 8093F77C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 06AAC 8093F77C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 06AB0 8093F780 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06AB4 8093F784 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 06AB8 8093F788 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 06ABC 8093F78C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 06AC0 8093F790 46049180 */ add.s $f6, $f18, $f4 +/* 06AC0 8093F790 46049180 */ add.s $f6, $f18, $f4 /* 06AC4 8093F794 248401C8 */ addiu $a0, $a0, 0x01C8 ## $a0 = 809501C8 -/* 06AC8 8093F798 44053000 */ mfc1 $a1, $f6 +/* 06AC8 8093F798 44053000 */ mfc1 $a1, $f6 /* 06ACC 8093F79C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06AD0 8093F7A0 00000000 */ nop /* 06AD4 8093F7A4 86040150 */ lh $a0, 0x0150($s0) ## 00000150 -/* 06AD8 8093F7A8 00800821 */ addu $at, $a0, $zero -/* 06ADC 8093F7AC 00042080 */ sll $a0, $a0, 2 -/* 06AE0 8093F7B0 00812023 */ subu $a0, $a0, $at -/* 06AE4 8093F7B4 00042080 */ sll $a0, $a0, 2 -/* 06AE8 8093F7B8 00812021 */ addu $a0, $a0, $at -/* 06AEC 8093F7BC 00042080 */ sll $a0, $a0, 2 -/* 06AF0 8093F7C0 00812021 */ addu $a0, $a0, $at -/* 06AF4 8093F7C4 000420C0 */ sll $a0, $a0, 3 -/* 06AF8 8093F7C8 00812021 */ addu $a0, $a0, $at -/* 06AFC 8093F7CC 00042080 */ sll $a0, $a0, 2 -/* 06B00 8093F7D0 00042400 */ sll $a0, $a0, 16 +/* 06AD8 8093F7A8 00800821 */ addu $at, $a0, $zero +/* 06ADC 8093F7AC 00042080 */ sll $a0, $a0, 2 +/* 06AE0 8093F7B0 00812023 */ subu $a0, $a0, $at +/* 06AE4 8093F7B4 00042080 */ sll $a0, $a0, 2 +/* 06AE8 8093F7B8 00812021 */ addu $a0, $a0, $at +/* 06AEC 8093F7BC 00042080 */ sll $a0, $a0, 2 +/* 06AF0 8093F7C0 00812021 */ addu $a0, $a0, $at +/* 06AF4 8093F7C4 000420C0 */ sll $a0, $a0, 3 +/* 06AF8 8093F7C8 00812021 */ addu $a0, $a0, $at +/* 06AFC 8093F7CC 00042080 */ sll $a0, $a0, 2 +/* 06B00 8093F7D0 00042400 */ sll $a0, $a0, 16 /* 06B04 8093F7D4 0C01DE0D */ jal Math_Coss ## coss? -/* 06B08 8093F7D8 00042403 */ sra $a0, $a0, 16 +/* 06B08 8093F7D8 00042403 */ sra $a0, $a0, 16 /* 06B0C 8093F7DC 3C018095 */ lui $at, %hi(D_8094AFE8) ## $at = 80950000 -/* 06B10 8093F7E0 C428AFE8 */ lwc1 $f8, %lo(D_8094AFE8)($at) +/* 06B10 8093F7E0 C428AFE8 */ lwc1 $f8, %lo(D_8094AFE8)($at) /* 06B14 8093F7E4 3C018095 */ lui $at, %hi(D_8094AFEC) ## $at = 80950000 -/* 06B18 8093F7E8 C430AFEC */ lwc1 $f16, %lo(D_8094AFEC)($at) -/* 06B1C 8093F7EC 46080282 */ mul.s $f10, $f0, $f8 +/* 06B18 8093F7E8 C430AFEC */ lwc1 $f16, %lo(D_8094AFEC)($at) +/* 06B1C 8093F7EC 46080282 */ mul.s $f10, $f0, $f8 /* 06B20 8093F7F0 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 06B24 8093F7F4 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06B24 8093F7F4 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06B28 8093F7F8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06B2C 8093F7FC 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 06B30 8093F800 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 06B34 8093F804 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 06B38 8093F808 46105480 */ add.s $f18, $f10, $f16 +/* 06B38 8093F808 46105480 */ add.s $f18, $f10, $f16 /* 06B3C 8093F80C 248401C8 */ addiu $a0, $a0, 0x01C8 ## $a0 = 809501C8 -/* 06B40 8093F810 44059000 */ mfc1 $a1, $f18 +/* 06B40 8093F810 44059000 */ mfc1 $a1, $f18 /* 06B44 8093F814 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06B48 8093F818 00000000 */ nop /* 06B4C 8093F81C 86020152 */ lh $v0, 0x0152($s0) ## 00000152 /* 06B50 8093F820 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 06B54 8093F824 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06B58 8093F828 28410370 */ slti $at, $v0, 0x0370 -/* 06B5C 8093F82C 14200027 */ bne $at, $zero, .L8093F8CC -/* 06B60 8093F830 00022080 */ sll $a0, $v0, 2 +/* 06B58 8093F828 28410370 */ slti $at, $v0, 0x0370 +/* 06B5C 8093F82C 14200027 */ bne $at, $zero, .L8093F8CC +/* 06B60 8093F830 00022080 */ sll $a0, $v0, 2 /* 06B64 8093F834 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 06B68 8093F838 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06B68 8093F838 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06B6C 8093F83C 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 /* 06B70 8093F840 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06B74 8093F844 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 80950028 /* 06B78 8093F848 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 06B7C 8093F84C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 06B7C 8093F84C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 06B80 8093F850 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 06B84 8093F854 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06B88 8093F858 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 /* 06B8C 8093F85C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06B90 8093F860 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 80950028 /* 06B94 8093F864 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 06B98 8093F868 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 06B9C 8093F86C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06BA0 8093F870 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06BA4 8093F874 3C073E80 */ lui $a3, 0x3E80 ## $a3 = 3E800000 /* 06BA8 8093F878 860D0152 */ lh $t5, 0x0152($s0) ## 00000152 /* 06BAC 8093F87C 260401D0 */ addiu $a0, $s0, 0x01D0 ## $a0 = 000001D0 /* 06BB0 8093F880 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 06BB4 8093F884 29A103A2 */ slti $at, $t5, 0x03A2 -/* 06BB8 8093F888 1420000B */ bne $at, $zero, .L8093F8B8 +/* 06BB4 8093F884 29A103A2 */ slti $at, $t5, 0x03A2 +/* 06BB8 8093F888 1420000B */ bne $at, $zero, .L8093F8B8 /* 06BBC 8093F88C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06BC0 8093F890 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 06BC4 8093F894 260E01CC */ addiu $t6, $s0, 0x01CC ## $t6 = 000001CC -/* 06BC8 8093F898 AFAE0024 */ sw $t6, 0x0024($sp) +/* 06BC8 8093F898 AFAE0024 */ sw $t6, 0x0024($sp) /* 06BCC 8093F89C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06BD0 8093F8A0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 06BD4 8093F8A4 8FA40024 */ lw $a0, 0x0024($sp) +/* 06BD4 8093F8A4 8FA40024 */ lw $a0, 0x0024($sp) /* 06BD8 8093F8A8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 06BDC 8093F8AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06BE0 8093F8B0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06BE4 8093F8B4 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 .L8093F8B8: /* 06BE8 8093F8B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06BEC 8093F8BC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06BF0 8093F8C0 24052086 */ addiu $a1, $zero, 0x2086 ## $a1 = 00002086 -/* 06BF4 8093F8C4 10000043 */ beq $zero, $zero, .L8093F9D4 -/* 06BF8 8093F8C8 8FBF001C */ lw $ra, 0x001C($sp) +/* 06BF4 8093F8C4 10000043 */ beq $zero, $zero, .L8093F9D4 +/* 06BF8 8093F8C8 8FBF001C */ lw $ra, 0x001C($sp) .L8093F8CC: -/* 06BFC 8093F8CC 00822023 */ subu $a0, $a0, $v0 -/* 06C00 8093F8D0 00042080 */ sll $a0, $a0, 2 -/* 06C04 8093F8D4 00822021 */ addu $a0, $a0, $v0 -/* 06C08 8093F8D8 00042080 */ sll $a0, $a0, 2 -/* 06C0C 8093F8DC 00822021 */ addu $a0, $a0, $v0 -/* 06C10 8093F8E0 000420C0 */ sll $a0, $a0, 3 -/* 06C14 8093F8E4 00822021 */ addu $a0, $a0, $v0 -/* 06C18 8093F8E8 00042080 */ sll $a0, $a0, 2 -/* 06C1C 8093F8EC 00042400 */ sll $a0, $a0, 16 +/* 06BFC 8093F8CC 00822023 */ subu $a0, $a0, $v0 +/* 06C00 8093F8D0 00042080 */ sll $a0, $a0, 2 +/* 06C04 8093F8D4 00822021 */ addu $a0, $a0, $v0 +/* 06C08 8093F8D8 00042080 */ sll $a0, $a0, 2 +/* 06C0C 8093F8DC 00822021 */ addu $a0, $a0, $v0 +/* 06C10 8093F8E0 000420C0 */ sll $a0, $a0, 3 +/* 06C14 8093F8E4 00822021 */ addu $a0, $a0, $v0 +/* 06C18 8093F8E8 00042080 */ sll $a0, $a0, 2 +/* 06C1C 8093F8EC 00042400 */ sll $a0, $a0, 16 /* 06C20 8093F8F0 0C01DE0D */ jal Math_Coss ## coss? -/* 06C24 8093F8F4 00042403 */ sra $a0, $a0, 16 +/* 06C24 8093F8F4 00042403 */ sra $a0, $a0, 16 /* 06C28 8093F8F8 3C018095 */ lui $at, %hi(D_8094AFF0) ## $at = 80950000 -/* 06C2C 8093F8FC C424AFF0 */ lwc1 $f4, %lo(D_8094AFF0)($at) +/* 06C2C 8093F8FC C424AFF0 */ lwc1 $f4, %lo(D_8094AFF0)($at) /* 06C30 8093F900 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 06C34 8093F904 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 /* 06C38 8093F908 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 06C3C 8093F90C 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 06C40 8093F910 46060202 */ mul.s $f8, $f0, $f6 +/* 06C40 8093F910 46060202 */ mul.s $f8, $f0, $f6 /* 06C44 8093F914 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 06C48 8093F918 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06C48 8093F918 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06C4C 8093F91C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06C50 8093F920 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 06C54 8093F924 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 /* 06C58 8093F928 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 80950028 -/* 06C5C 8093F92C 46082280 */ add.s $f10, $f4, $f8 -/* 06C60 8093F930 46105480 */ add.s $f18, $f10, $f16 -/* 06C64 8093F934 44059000 */ mfc1 $a1, $f18 +/* 06C5C 8093F92C 46082280 */ add.s $f10, $f4, $f8 +/* 06C60 8093F930 46105480 */ add.s $f18, $f10, $f16 +/* 06C64 8093F934 44059000 */ mfc1 $a1, $f18 /* 06C68 8093F938 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06C6C 8093F93C 00000000 */ nop /* 06C70 8093F940 86040152 */ lh $a0, 0x0152($s0) ## 00000152 -/* 06C74 8093F944 00800821 */ addu $at, $a0, $zero -/* 06C78 8093F948 00042080 */ sll $a0, $a0, 2 -/* 06C7C 8093F94C 00812023 */ subu $a0, $a0, $at -/* 06C80 8093F950 00042100 */ sll $a0, $a0, 4 -/* 06C84 8093F954 00812023 */ subu $a0, $a0, $at -/* 06C88 8093F958 000420C0 */ sll $a0, $a0, 3 -/* 06C8C 8093F95C 00812023 */ subu $a0, $a0, $at -/* 06C90 8093F960 00042080 */ sll $a0, $a0, 2 -/* 06C94 8093F964 00042400 */ sll $a0, $a0, 16 +/* 06C74 8093F944 00800821 */ addu $at, $a0, $zero +/* 06C78 8093F948 00042080 */ sll $a0, $a0, 2 +/* 06C7C 8093F94C 00812023 */ subu $a0, $a0, $at +/* 06C80 8093F950 00042100 */ sll $a0, $a0, 4 +/* 06C84 8093F954 00812023 */ subu $a0, $a0, $at +/* 06C88 8093F958 000420C0 */ sll $a0, $a0, 3 +/* 06C8C 8093F95C 00812023 */ subu $a0, $a0, $at +/* 06C90 8093F960 00042080 */ sll $a0, $a0, 2 +/* 06C94 8093F964 00042400 */ sll $a0, $a0, 16 /* 06C98 8093F968 0C01DE1C */ jal Math_Sins ## sins? -/* 06C9C 8093F96C 00042403 */ sra $a0, $a0, 16 +/* 06C9C 8093F96C 00042403 */ sra $a0, $a0, 16 /* 06CA0 8093F970 3C018095 */ lui $at, %hi(D_8094AFF4) ## $at = 80950000 -/* 06CA4 8093F974 C426AFF4 */ lwc1 $f6, %lo(D_8094AFF4)($at) +/* 06CA4 8093F974 C426AFF4 */ lwc1 $f6, %lo(D_8094AFF4)($at) /* 06CA8 8093F978 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 06CAC 8093F97C 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 /* 06CB0 8093F980 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 06CB4 8093F984 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 06CB8 8093F988 46040202 */ mul.s $f8, $f0, $f4 +/* 06CB8 8093F988 46040202 */ mul.s $f8, $f0, $f4 /* 06CBC 8093F98C 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 06CC0 8093F990 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 06CC0 8093F990 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 06CC4 8093F994 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06CC8 8093F998 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 06CCC 8093F99C 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 /* 06CD0 8093F9A0 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 80950028 -/* 06CD4 8093F9A4 46083280 */ add.s $f10, $f6, $f8 -/* 06CD8 8093F9A8 46105480 */ add.s $f18, $f10, $f16 -/* 06CDC 8093F9AC 44059000 */ mfc1 $a1, $f18 +/* 06CD4 8093F9A4 46083280 */ add.s $f10, $f6, $f8 +/* 06CD8 8093F9A8 46105480 */ add.s $f18, $f10, $f16 +/* 06CDC 8093F9AC 44059000 */ mfc1 $a1, $f18 /* 06CE0 8093F9B0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06CE4 8093F9B4 00000000 */ nop /* 06CE8 8093F9B8 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 06CEC 8093F9BC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 06CF0 8093F9C0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 06CF4 8093F9C4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 06CF8 8093F9C8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06CFC 8093F9CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06D00 8093F9D0 8FBF001C */ lw $ra, 0x001C($sp) +/* 06D00 8093F9D0 8FBF001C */ lw $ra, 0x001C($sp) .L8093F9D4: -/* 06D04 8093F9D4 8FB00018 */ lw $s0, 0x0018($sp) +/* 06D04 8093F9D4 8FB00018 */ lw $s0, 0x0018($sp) /* 06D08 8093F9D8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 06D0C 8093F9DC 03E00008 */ jr $ra +/* 06D0C 8093F9DC 03E00008 */ jr $ra /* 06D10 8093F9E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s index 1545d22073..a5b7faa969 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s @@ -1,41 +1,41 @@ glabel func_80945084 /* 0C3B4 80945084 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0C3B8 80945088 AFB1002C */ sw $s1, 0x002C($sp) +/* 0C3B8 80945088 AFB1002C */ sw $s1, 0x002C($sp) /* 0C3BC 8094508C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0C3C0 80945090 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0C3C4 80945094 AFB20030 */ sw $s2, 0x0030($sp) -/* 0C3C8 80945098 AFB00028 */ sw $s0, 0x0028($sp) +/* 0C3C0 80945090 AFBF0034 */ sw $ra, 0x0034($sp) +/* 0C3C4 80945094 AFB20030 */ sw $s2, 0x0030($sp) +/* 0C3C8 80945098 AFB00028 */ sw $s0, 0x0028($sp) /* 0C3CC 8094509C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0C3D0 809450A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0C3D4 809450A4 3C068095 */ lui $a2, %hi(D_8094AD88) ## $a2 = 80950000 /* 0C3D8 809450A8 24C6AD88 */ addiu $a2, $a2, %lo(D_8094AD88) ## $a2 = 8094AD88 /* 0C3DC 809450AC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 0C3E0 809450B0 24071E44 */ addiu $a3, $zero, 0x1E44 ## $a3 = 00001E44 -/* 0C3E4 809450B4 0C031AB1 */ jal func_800C6AC4 +/* 0C3E4 809450B4 0C031AB1 */ jal func_800C6AC4 /* 0C3E8 809450B8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0C3EC 809450BC 920E0564 */ lbu $t6, 0x0564($s0) ## 00000564 -/* 0C3F0 809450C0 11C000A7 */ beq $t6, $zero, .L80945360 +/* 0C3F0 809450C0 11C000A7 */ beq $t6, $zero, .L80945360 /* 0C3F4 809450C4 00000000 */ nop -/* 0C3F8 809450C8 0C024F46 */ jal func_80093D18 +/* 0C3F8 809450C8 0C024F46 */ jal func_80093D18 /* 0C3FC 809450CC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0C400 809450D0 0C024F61 */ jal func_80093D84 +/* 0C400 809450D0 0C024F61 */ jal func_80093D84 /* 0C404 809450D4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 0C408 809450D8 860F015C */ lh $t7, 0x015C($s0) ## 0000015C /* 0C40C 809450DC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0C410 809450E0 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 0C414 809450E4 5300000E */ beql $t8, $zero, .L80945120 +/* 0C414 809450E4 5300000E */ beql $t8, $zero, .L80945120 /* 0C418 809450E8 4449F800 */ cfc1 $t1, $31 /* 0C41C 809450EC 8E4402C0 */ lw $a0, 0x02C0($s2) ## 000002C0 /* 0C420 809450F0 24190384 */ addiu $t9, $zero, 0x0384 ## $t9 = 00000384 /* 0C424 809450F4 2408044B */ addiu $t0, $zero, 0x044B ## $t0 = 0000044B -/* 0C428 809450F8 AFA80018 */ sw $t0, 0x0018($sp) -/* 0C42C 809450FC AFB90014 */ sw $t9, 0x0014($sp) -/* 0C430 80945100 AFA00010 */ sw $zero, 0x0010($sp) +/* 0C428 809450F8 AFA80018 */ sw $t0, 0x0018($sp) +/* 0C42C 809450FC AFB90014 */ sw $t9, 0x0014($sp) +/* 0C430 80945100 AFA00010 */ sw $zero, 0x0010($sp) /* 0C434 80945104 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 0C438 80945108 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 -/* 0C43C 8094510C 0C024DC2 */ jal func_80093708 +/* 0C43C 8094510C 0C024DC2 */ jal func_80093708 /* 0C440 80945110 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0C444 80945114 10000073 */ beq $zero, $zero, .L809452E4 +/* 0C444 80945114 10000073 */ beq $zero, $zero, .L809452E4 /* 0C448 80945118 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 /* 0C44C 8094511C 4449F800 */ cfc1 $t1, $31 .L80945120: @@ -43,34 +43,34 @@ glabel func_80945084 /* 0C454 80945124 C60401D4 */ lwc1 $f4, 0x01D4($s0) ## 000001D4 /* 0C458 80945128 8E4402C0 */ lw $a0, 0x02C0($s2) ## 000002C0 /* 0C45C 8094512C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 0C460 80945130 460021A4 */ cvt.w.s $f6, $f4 +/* 0C460 80945130 460021A4 */ cvt.w.s $f6, $f4 /* 0C464 80945134 4445F800 */ cfc1 $a1, $31 /* 0C468 80945138 00000000 */ nop /* 0C46C 8094513C 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0C470 80945140 50A00013 */ beql $a1, $zero, .L80945190 -/* 0C474 80945144 44053000 */ mfc1 $a1, $f6 +/* 0C470 80945140 50A00013 */ beql $a1, $zero, .L80945190 +/* 0C474 80945144 44053000 */ mfc1 $a1, $f6 /* 0C478 80945148 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 /* 0C47C 8094514C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0C480 80945150 46062181 */ sub.s $f6, $f4, $f6 +/* 0C480 80945150 46062181 */ sub.s $f6, $f4, $f6 /* 0C484 80945154 44C5F800 */ ctc1 $a1, $31 /* 0C488 80945158 00000000 */ nop -/* 0C48C 8094515C 460031A4 */ cvt.w.s $f6, $f6 +/* 0C48C 8094515C 460031A4 */ cvt.w.s $f6, $f6 /* 0C490 80945160 4445F800 */ cfc1 $a1, $31 /* 0C494 80945164 00000000 */ nop /* 0C498 80945168 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0C49C 8094516C 14A00005 */ bne $a1, $zero, .L80945184 +/* 0C49C 8094516C 14A00005 */ bne $a1, $zero, .L80945184 /* 0C4A0 80945170 00000000 */ nop -/* 0C4A4 80945174 44053000 */ mfc1 $a1, $f6 +/* 0C4A4 80945174 44053000 */ mfc1 $a1, $f6 /* 0C4A8 80945178 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0C4AC 8094517C 10000007 */ beq $zero, $zero, .L8094519C +/* 0C4AC 8094517C 10000007 */ beq $zero, $zero, .L8094519C /* 0C4B0 80945180 00A12825 */ or $a1, $a1, $at ## $a1 = 80000000 .L80945184: -/* 0C4B4 80945184 10000005 */ beq $zero, $zero, .L8094519C +/* 0C4B4 80945184 10000005 */ beq $zero, $zero, .L8094519C /* 0C4B8 80945188 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 0C4BC 8094518C 44053000 */ mfc1 $a1, $f6 +/* 0C4BC 8094518C 44053000 */ mfc1 $a1, $f6 .L80945190: /* 0C4C0 80945190 00000000 */ nop -/* 0C4C4 80945194 04A0FFFB */ bltz $a1, .L80945184 +/* 0C4C4 80945194 04A0FFFB */ bltz $a1, .L80945184 /* 0C4C8 80945198 00000000 */ nop .L8094519C: /* 0C4CC 8094519C 44C9F800 */ ctc1 $t1, $31 @@ -80,34 +80,34 @@ glabel func_80945084 /* 0C4DC 809451AC 444AF800 */ cfc1 $t2, $31 /* 0C4E0 809451B0 44C6F800 */ ctc1 $a2, $31 /* 0C4E4 809451B4 00000000 */ nop -/* 0C4E8 809451B8 460042A4 */ cvt.w.s $f10, $f8 +/* 0C4E8 809451B8 460042A4 */ cvt.w.s $f10, $f8 /* 0C4EC 809451BC 4446F800 */ cfc1 $a2, $31 /* 0C4F0 809451C0 00000000 */ nop /* 0C4F4 809451C4 30C60078 */ andi $a2, $a2, 0x0078 ## $a2 = 00000000 -/* 0C4F8 809451C8 50C00013 */ beql $a2, $zero, .L80945218 -/* 0C4FC 809451CC 44065000 */ mfc1 $a2, $f10 +/* 0C4F8 809451C8 50C00013 */ beql $a2, $zero, .L80945218 +/* 0C4FC 809451CC 44065000 */ mfc1 $a2, $f10 /* 0C500 809451D0 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 0C504 809451D4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0C508 809451D8 460A4281 */ sub.s $f10, $f8, $f10 +/* 0C508 809451D8 460A4281 */ sub.s $f10, $f8, $f10 /* 0C50C 809451DC 44C6F800 */ ctc1 $a2, $31 /* 0C510 809451E0 00000000 */ nop -/* 0C514 809451E4 460052A4 */ cvt.w.s $f10, $f10 +/* 0C514 809451E4 460052A4 */ cvt.w.s $f10, $f10 /* 0C518 809451E8 4446F800 */ cfc1 $a2, $31 /* 0C51C 809451EC 00000000 */ nop /* 0C520 809451F0 30C60078 */ andi $a2, $a2, 0x0078 ## $a2 = 00000000 -/* 0C524 809451F4 14C00005 */ bne $a2, $zero, .L8094520C +/* 0C524 809451F4 14C00005 */ bne $a2, $zero, .L8094520C /* 0C528 809451F8 00000000 */ nop -/* 0C52C 809451FC 44065000 */ mfc1 $a2, $f10 +/* 0C52C 809451FC 44065000 */ mfc1 $a2, $f10 /* 0C530 80945200 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0C534 80945204 10000007 */ beq $zero, $zero, .L80945224 +/* 0C534 80945204 10000007 */ beq $zero, $zero, .L80945224 /* 0C538 80945208 00C13025 */ or $a2, $a2, $at ## $a2 = 80000000 .L8094520C: -/* 0C53C 8094520C 10000005 */ beq $zero, $zero, .L80945224 +/* 0C53C 8094520C 10000005 */ beq $zero, $zero, .L80945224 /* 0C540 80945210 2406FFFF */ addiu $a2, $zero, 0xFFFF ## $a2 = FFFFFFFF -/* 0C544 80945214 44065000 */ mfc1 $a2, $f10 +/* 0C544 80945214 44065000 */ mfc1 $a2, $f10 .L80945218: /* 0C548 80945218 00000000 */ nop -/* 0C54C 8094521C 04C0FFFB */ bltz $a2, .L8094520C +/* 0C54C 8094521C 04C0FFFB */ bltz $a2, .L8094520C /* 0C550 80945220 00000000 */ nop .L80945224: /* 0C554 80945224 44CAF800 */ ctc1 $t2, $31 @@ -117,52 +117,52 @@ glabel func_80945084 /* 0C564 80945234 444BF800 */ cfc1 $t3, $31 /* 0C568 80945238 44C7F800 */ ctc1 $a3, $31 /* 0C56C 8094523C 00000000 */ nop -/* 0C570 80945240 460084A4 */ cvt.w.s $f18, $f16 +/* 0C570 80945240 460084A4 */ cvt.w.s $f18, $f16 /* 0C574 80945244 4447F800 */ cfc1 $a3, $31 /* 0C578 80945248 00000000 */ nop /* 0C57C 8094524C 30E70078 */ andi $a3, $a3, 0x0078 ## $a3 = 00000000 -/* 0C580 80945250 50E00013 */ beql $a3, $zero, .L809452A0 -/* 0C584 80945254 44079000 */ mfc1 $a3, $f18 +/* 0C580 80945250 50E00013 */ beql $a3, $zero, .L809452A0 +/* 0C584 80945254 44079000 */ mfc1 $a3, $f18 /* 0C588 80945258 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 /* 0C58C 8094525C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0C590 80945260 46128481 */ sub.s $f18, $f16, $f18 +/* 0C590 80945260 46128481 */ sub.s $f18, $f16, $f18 /* 0C594 80945264 44C7F800 */ ctc1 $a3, $31 /* 0C598 80945268 00000000 */ nop -/* 0C59C 8094526C 460094A4 */ cvt.w.s $f18, $f18 +/* 0C59C 8094526C 460094A4 */ cvt.w.s $f18, $f18 /* 0C5A0 80945270 4447F800 */ cfc1 $a3, $31 /* 0C5A4 80945274 00000000 */ nop /* 0C5A8 80945278 30E70078 */ andi $a3, $a3, 0x0078 ## $a3 = 00000000 -/* 0C5AC 8094527C 14E00005 */ bne $a3, $zero, .L80945294 +/* 0C5AC 8094527C 14E00005 */ bne $a3, $zero, .L80945294 /* 0C5B0 80945280 00000000 */ nop -/* 0C5B4 80945284 44079000 */ mfc1 $a3, $f18 +/* 0C5B4 80945284 44079000 */ mfc1 $a3, $f18 /* 0C5B8 80945288 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0C5BC 8094528C 10000007 */ beq $zero, $zero, .L809452AC +/* 0C5BC 8094528C 10000007 */ beq $zero, $zero, .L809452AC /* 0C5C0 80945290 00E13825 */ or $a3, $a3, $at ## $a3 = 80000000 .L80945294: -/* 0C5C4 80945294 10000005 */ beq $zero, $zero, .L809452AC +/* 0C5C4 80945294 10000005 */ beq $zero, $zero, .L809452AC /* 0C5C8 80945298 2407FFFF */ addiu $a3, $zero, 0xFFFF ## $a3 = FFFFFFFF -/* 0C5CC 8094529C 44079000 */ mfc1 $a3, $f18 +/* 0C5CC 8094529C 44079000 */ mfc1 $a3, $f18 .L809452A0: /* 0C5D0 809452A0 00000000 */ nop -/* 0C5D4 809452A4 04E0FFFB */ bltz $a3, .L80945294 +/* 0C5D4 809452A4 04E0FFFB */ bltz $a3, .L80945294 /* 0C5D8 809452A8 00000000 */ nop .L809452AC: -/* 0C5DC 809452AC AFA00010 */ sw $zero, 0x0010($sp) +/* 0C5DC 809452AC AFA00010 */ sw $zero, 0x0010($sp) /* 0C5E0 809452B0 C60401E0 */ lwc1 $f4, 0x01E0($s0) ## 000001E0 /* 0C5E4 809452B4 44CBF800 */ ctc1 $t3, $31 /* 0C5E8 809452B8 00000000 */ nop -/* 0C5EC 809452BC 4600218D */ trunc.w.s $f6, $f4 -/* 0C5F0 809452C0 440D3000 */ mfc1 $t5, $f6 +/* 0C5EC 809452BC 4600218D */ trunc.w.s $f6, $f4 +/* 0C5F0 809452C0 440D3000 */ mfc1 $t5, $f6 /* 0C5F4 809452C4 00000000 */ nop -/* 0C5F8 809452C8 AFAD0014 */ sw $t5, 0x0014($sp) +/* 0C5F8 809452C8 AFAD0014 */ sw $t5, 0x0014($sp) /* 0C5FC 809452CC C60801E4 */ lwc1 $f8, 0x01E4($s0) ## 000001E4 -/* 0C600 809452D0 4600428D */ trunc.w.s $f10, $f8 -/* 0C604 809452D4 440F5000 */ mfc1 $t7, $f10 -/* 0C608 809452D8 0C024DC2 */ jal func_80093708 -/* 0C60C 809452DC AFAF0018 */ sw $t7, 0x0018($sp) +/* 0C600 809452D0 4600428D */ trunc.w.s $f10, $f8 +/* 0C604 809452D4 440F5000 */ mfc1 $t7, $f10 +/* 0C608 809452D8 0C024DC2 */ jal func_80093708 +/* 0C60C 809452DC AFAF0018 */ sw $t7, 0x0018($sp) /* 0C610 809452E0 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 .L809452E4: -/* 0C614 809452E4 0C034213 */ jal Matrix_Push +/* 0C614 809452E4 0C034213 */ jal Matrix_Push /* 0C618 809452E8 00000000 */ nop /* 0C61C 809452EC 8E05056C */ lw $a1, 0x056C($s0) ## 0000056C /* 0C620 809452F0 8E060588 */ lw $a2, 0x0588($s0) ## 00000588 @@ -171,65 +171,65 @@ glabel func_80945084 /* 0C62C 809452FC 3C198094 */ lui $t9, %hi(func_80943D90) ## $t9 = 80940000 /* 0C630 80945300 27393D90 */ addiu $t9, $t9, %lo(func_80943D90) ## $t9 = 80943D90 /* 0C634 80945304 27183950 */ addiu $t8, $t8, %lo(func_80943950) ## $t8 = 80943950 -/* 0C638 80945308 AFB80010 */ sw $t8, 0x0010($sp) -/* 0C63C 8094530C AFB90014 */ sw $t9, 0x0014($sp) -/* 0C640 80945310 AFB00018 */ sw $s0, 0x0018($sp) -/* 0C644 80945314 0C0286B2 */ jal func_800A1AC8 +/* 0C638 80945308 AFB80010 */ sw $t8, 0x0010($sp) +/* 0C63C 8094530C AFB90014 */ sw $t9, 0x0014($sp) +/* 0C640 80945310 AFB00018 */ sw $s0, 0x0018($sp) +/* 0C644 80945314 0C0286B2 */ jal SkelAnime_DrawSV /* 0C648 80945318 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0C64C 8094531C 0C034221 */ jal Matrix_Pull +/* 0C64C 8094531C 0C034221 */ jal Matrix_Pull /* 0C650 80945320 00000000 */ nop /* 0C654 80945324 3C048095 */ lui $a0, %hi(D_8094A9EC) ## $a0 = 80950000 /* 0C658 80945328 2484A9EC */ addiu $a0, $a0, %lo(D_8094A9EC) ## $a0 = 8094A9EC -/* 0C65C 8094532C 0C0346BD */ jal Matrix_MultVec3f +/* 0C65C 8094532C 0C0346BD */ jal Matrix_MultVec3f /* 0C660 80945330 2605048C */ addiu $a1, $s0, 0x048C ## $a1 = 0000048C /* 0C664 80945334 8E4402C0 */ lw $a0, 0x02C0($s2) ## 000002C0 /* 0C668 80945338 922507AF */ lbu $a1, 0x07AF($s1) ## 000007AF /* 0C66C 8094533C 922607B0 */ lbu $a2, 0x07B0($s1) ## 000007B0 /* 0C670 80945340 922707B1 */ lbu $a3, 0x07B1($s1) ## 000007B1 -/* 0C674 80945344 AFA00010 */ sw $zero, 0x0010($sp) +/* 0C674 80945344 AFA00010 */ sw $zero, 0x0010($sp) /* 0C678 80945348 862807B2 */ lh $t0, 0x07B2($s1) ## 000007B2 /* 0C67C 8094534C 240903E8 */ addiu $t1, $zero, 0x03E8 ## $t1 = 000003E8 -/* 0C680 80945350 AFA90018 */ sw $t1, 0x0018($sp) -/* 0C684 80945354 0C024DC2 */ jal func_80093708 -/* 0C688 80945358 AFA80014 */ sw $t0, 0x0014($sp) +/* 0C680 80945350 AFA90018 */ sw $t1, 0x0018($sp) +/* 0C684 80945354 0C024DC2 */ jal func_80093708 +/* 0C688 80945358 AFA80014 */ sw $t0, 0x0014($sp) /* 0C68C 8094535C AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 .L80945360: -/* 0C690 80945360 0C25219A */ jal func_80948668 +/* 0C690 80945360 0C25219A */ jal func_80948668 /* 0C694 80945364 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0C698 80945368 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C69C 8094536C 0C250FC2 */ jal func_80943F08 +/* 0C69C 8094536C 0C250FC2 */ jal func_80943F08 /* 0C6A0 80945370 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0C6A4 80945374 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 0C6A8 80945378 C61204D8 */ lwc1 $f18, 0x04D8($s0) ## 000004D8 /* 0C6AC 8094537C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C6B0 80945380 4612803C */ c.lt.s $f16, $f18 +/* 0C6B0 80945380 4612803C */ c.lt.s $f16, $f18 /* 0C6B4 80945384 00000000 */ nop -/* 0C6B8 80945388 45020004 */ bc1fl .L8094539C +/* 0C6B8 80945388 45020004 */ bc1fl .L8094539C /* 0C6BC 8094538C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0C6C0 80945390 0C2511EF */ jal func_809447BC +/* 0C6C0 80945390 0C2511EF */ jal func_809447BC /* 0C6C4 80945394 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0C6C8 80945398 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L8094539C: /* 0C6CC 8094539C C60601CC */ lwc1 $f6, 0x01CC($s0) ## 000001CC /* 0C6D0 809453A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C6D4 809453A4 4606203C */ c.lt.s $f4, $f6 +/* 0C6D4 809453A4 4606203C */ c.lt.s $f4, $f6 /* 0C6D8 809453A8 00000000 */ nop -/* 0C6DC 809453AC 45000003 */ bc1f .L809453BC +/* 0C6DC 809453AC 45000003 */ bc1f .L809453BC /* 0C6E0 809453B0 00000000 */ nop -/* 0C6E4 809453B4 0C251314 */ jal func_80944C50 +/* 0C6E4 809453B4 0C251314 */ jal func_80944C50 /* 0C6E8 809453B8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L809453BC: /* 0C6EC 809453BC 3C068095 */ lui $a2, %hi(D_8094AD98) ## $a2 = 80950000 /* 0C6F0 809453C0 24C6AD98 */ addiu $a2, $a2, %lo(D_8094AD98) ## $a2 = 8094AD98 /* 0C6F4 809453C4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 0C6F8 809453C8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0C6FC 809453CC 0C031AD5 */ jal func_800C6B54 +/* 0C6FC 809453CC 0C031AD5 */ jal func_800C6B54 /* 0C700 809453D0 24071E7C */ addiu $a3, $zero, 0x1E7C ## $a3 = 00001E7C -/* 0C704 809453D4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0C708 809453D8 8FB00028 */ lw $s0, 0x0028($sp) -/* 0C70C 809453DC 8FB1002C */ lw $s1, 0x002C($sp) -/* 0C710 809453E0 8FB20030 */ lw $s2, 0x0030($sp) -/* 0C714 809453E4 03E00008 */ jr $ra +/* 0C704 809453D4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0C708 809453D8 8FB00028 */ lw $s0, 0x0028($sp) +/* 0C70C 809453DC 8FB1002C */ lw $s1, 0x002C($sp) +/* 0C710 809453E0 8FB20030 */ lw $s2, 0x0030($sp) +/* 0C714 809453E4 03E00008 */ jr $ra /* 0C718 809453E8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s index aeed3c13cc..5ab2efcce5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s @@ -1,33 +1,33 @@ glabel func_80949530 /* 10860 80949530 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 10864 80949534 AFA5001C */ sw $a1, 0x001C($sp) +/* 10864 80949534 AFA5001C */ sw $a1, 0x001C($sp) /* 10868 80949538 3C0E8095 */ lui $t6, %hi(func_809495A4) ## $t6 = 80950000 -/* 1086C 8094953C AFBF0014 */ sw $ra, 0x0014($sp) +/* 1086C 8094953C AFBF0014 */ sw $ra, 0x0014($sp) /* 10870 80949540 25CE95A4 */ addiu $t6, $t6, %lo(func_809495A4) ## $t6 = 809495A4 /* 10874 80949544 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 10878 80949548 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 1087C 8094954C 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 10880 80949550 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 -/* 10884 80949554 AFA70018 */ sw $a3, 0x0018($sp) +/* 10884 80949554 AFA70018 */ sw $a3, 0x0018($sp) /* 10888 80949558 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 1088C 8094955C 0C0294D3 */ jal func_800A534C +/* 1088C 8094955C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 10890 80949560 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 10894 80949564 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 10898 80949568 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 1089C 8094956C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 108A0 80949570 00000000 */ nop -/* 108A4 80949574 4600010D */ trunc.w.s $f4, $f0 -/* 108A8 80949578 8FA70018 */ lw $a3, 0x0018($sp) +/* 108A4 80949574 4600010D */ trunc.w.s $f4, $f0 +/* 108A8 80949578 8FA70018 */ lw $a3, 0x0018($sp) /* 108AC 8094957C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 108B0 80949580 24190019 */ addiu $t9, $zero, 0x0019 ## $t9 = 00000019 -/* 108B4 80949584 44182000 */ mfc1 $t8, $f4 +/* 108B4 80949584 44182000 */ mfc1 $t8, $f4 /* 108B8 80949588 A4F9017A */ sh $t9, 0x017A($a3) ## 0000017A /* 108BC 8094958C E4E604C8 */ swc1 $f6, 0x04C8($a3) ## 000004C8 /* 108C0 80949590 A4F80150 */ sh $t8, 0x0150($a3) ## 00000150 -/* 108C4 80949594 8FBF0014 */ lw $ra, 0x0014($sp) +/* 108C4 80949594 8FBF0014 */ lw $ra, 0x0014($sp) /* 108C8 80949598 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 108CC 8094959C 03E00008 */ jr $ra +/* 108CC 8094959C 03E00008 */ jr $ra /* 108D0 809495A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s index 1b20451e63..ca4d82e282 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s @@ -1,23 +1,23 @@ glabel func_80949BFC /* 10F2C 80949BFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 10F30 80949C00 AFA5001C */ sw $a1, 0x001C($sp) +/* 10F30 80949C00 AFA5001C */ sw $a1, 0x001C($sp) /* 10F34 80949C04 3C0E8095 */ lui $t6, %hi(func_80949C4C) ## $t6 = 80950000 -/* 10F38 80949C08 AFBF0014 */ sw $ra, 0x0014($sp) +/* 10F38 80949C08 AFBF0014 */ sw $ra, 0x0014($sp) /* 10F3C 80949C0C 25CE9C4C */ addiu $t6, $t6, %lo(func_80949C4C) ## $t6 = 80949C4C /* 10F40 80949C10 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 10F44 80949C14 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 10F48 80949C18 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 10F4C 80949C1C 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 -/* 10F50 80949C20 AFA70018 */ sw $a3, 0x0018($sp) +/* 10F50 80949C20 AFA70018 */ sw $a3, 0x0018($sp) /* 10F54 80949C24 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 10F58 80949C28 0C0294D3 */ jal func_800A534C +/* 10F58 80949C28 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 10F5C 80949C2C 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 10F60 80949C30 8FA70018 */ lw $a3, 0x0018($sp) +/* 10F60 80949C30 8FA70018 */ lw $a3, 0x0018($sp) /* 10F64 80949C34 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C /* 10F68 80949C38 A4EF017A */ sh $t7, 0x017A($a3) ## 0000017A -/* 10F6C 80949C3C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 10F6C 80949C3C 8FBF0014 */ lw $ra, 0x0014($sp) /* 10F70 80949C40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 10F74 80949C44 03E00008 */ jr $ra +/* 10F74 80949C44 03E00008 */ jr $ra /* 10F78 80949C48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s index a7eeee9c0e..20a4d356c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s @@ -1,85 +1,85 @@ glabel func_80949E10 /* 11140 80949E10 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 11144 80949E14 AFBF0034 */ sw $ra, 0x0034($sp) -/* 11148 80949E18 AFB00030 */ sw $s0, 0x0030($sp) -/* 1114C 80949E1C AFA5006C */ sw $a1, 0x006C($sp) +/* 11144 80949E14 AFBF0034 */ sw $ra, 0x0034($sp) +/* 11148 80949E18 AFB00030 */ sw $s0, 0x0030($sp) +/* 1114C 80949E1C AFA5006C */ sw $a1, 0x006C($sp) /* 11150 80949E20 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 /* 11154 80949E24 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 11158 80949E28 A08E05F8 */ sb $t6, 0x05F8($a0) ## 000005F8 /* 1115C 80949E2C 35F80400 */ ori $t8, $t7, 0x0400 ## $t8 = 00000400 /* 11160 80949E30 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 /* 11164 80949E34 3C198095 */ lui $t9, %hi(D_8094C85C) ## $t9 = 80950000 -/* 11168 80949E38 9339C85C */ lbu $t9, %lo(D_8094C85C)($t9) +/* 11168 80949E38 9339C85C */ lbu $t9, %lo(D_8094C85C)($t9) /* 1116C 80949E3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 11170 80949E40 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 11174 80949E44 17200003 */ bne $t9, $zero, .L80949E54 +/* 11174 80949E44 17200003 */ bne $t9, $zero, .L80949E54 /* 11178 80949E48 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 1117C 80949E4C 10000002 */ beq $zero, $zero, .L80949E58 -/* 11180 80949E50 A7A80066 */ sh $t0, 0x0066($sp) +/* 1117C 80949E4C 10000002 */ beq $zero, $zero, .L80949E58 +/* 11180 80949E50 A7A80066 */ sh $t0, 0x0066($sp) .L80949E54: -/* 11184 80949E54 A7A90066 */ sh $t1, 0x0066($sp) +/* 11184 80949E54 A7A90066 */ sh $t1, 0x0066($sp) .L80949E58: /* 11188 80949E58 860A0150 */ lh $t2, 0x0150($s0) ## 00000150 /* 1118C 80949E5C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 11190 80949E60 314B0007 */ andi $t3, $t2, 0x0007 ## $t3 = 00000000 -/* 11194 80949E64 55600031 */ bnel $t3, $zero, .L80949F2C +/* 11194 80949E64 55600031 */ bnel $t3, $zero, .L80949F2C /* 11198 80949E68 26040568 */ addiu $a0, $s0, 0x0568 ## $a0 = 00000568 /* 1119C 80949E6C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 111A0 80949E70 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 111A4 80949E74 00000000 */ nop /* 111A8 80949E78 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 111AC 80949E7C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 111B0 80949E80 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 111B4 80949E84 46040180 */ add.s $f6, $f0, $f4 +/* 111B4 80949E84 46040180 */ add.s $f6, $f0, $f4 /* 111B8 80949E88 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 111BC 80949E8C E7A60058 */ swc1 $f6, 0x0058($sp) + +/* 111BC 80949E8C E7A60058 */ swc1 $f6, 0x0058($sp) /* 111C0 80949E90 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 111C4 80949E94 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 111C8 80949E98 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 111CC 80949E9C 46080280 */ add.s $f10, $f0, $f8 +/* 111CC 80949E9C 46080280 */ add.s $f10, $f0, $f8 /* 111D0 80949EA0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 111D4 80949EA4 46105480 */ add.s $f18, $f10, $f16 +/* 111D4 80949EA4 46105480 */ add.s $f18, $f10, $f16 /* 111D8 80949EA8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 111DC 80949EAC E7B2005C */ swc1 $f18, 0x005C($sp) + +/* 111DC 80949EAC E7B2005C */ swc1 $f18, 0x005C($sp) /* 111E0 80949EB0 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 111E4 80949EB4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 111E8 80949EB8 3C018095 */ lui $at, %hi(D_8094B214) ## $at = 80950000 -/* 111EC 80949EBC 46040180 */ add.s $f6, $f0, $f4 -/* 111F0 80949EC0 C428B214 */ lwc1 $f8, %lo(D_8094B214)($at) +/* 111EC 80949EBC 46040180 */ add.s $f6, $f0, $f4 +/* 111F0 80949EC0 C428B214 */ lwc1 $f8, %lo(D_8094B214)($at) /* 111F4 80949EC4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 111F8 80949EC8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 111FC 80949ECC E7A60060 */ swc1 $f6, 0x0060($sp) -/* 11200 80949ED0 E7A2004C */ swc1 $f2, 0x004C($sp) -/* 11204 80949ED4 E7A20050 */ swc1 $f2, 0x0050($sp) -/* 11208 80949ED8 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 1120C 80949EDC E7A20040 */ swc1 $f2, 0x0040($sp) -/* 11210 80949EE0 E7A20048 */ swc1 $f2, 0x0048($sp) +/* 111FC 80949ECC E7A60060 */ swc1 $f6, 0x0060($sp) +/* 11200 80949ED0 E7A2004C */ swc1 $f2, 0x004C($sp) +/* 11204 80949ED4 E7A20050 */ swc1 $f2, 0x0050($sp) +/* 11208 80949ED8 E7A20054 */ swc1 $f2, 0x0054($sp) +/* 1120C 80949EDC E7A20040 */ swc1 $f2, 0x0040($sp) +/* 11210 80949EE0 E7A20048 */ swc1 $f2, 0x0048($sp) /* 11214 80949EE4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 11218 80949EE8 E7A80044 */ swc1 $f8, 0x0044($sp) + +/* 11218 80949EE8 E7A80044 */ swc1 $f8, 0x0044($sp) /* 1121C 80949EEC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 11220 80949EF0 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 11224 80949EF4 27AC0040 */ addiu $t4, $sp, 0x0040 ## $t4 = FFFFFFD8 /* 11228 80949EF8 240D0096 */ addiu $t5, $zero, 0x0096 ## $t5 = 00000096 -/* 1122C 80949EFC 460A0400 */ add.s $f16, $f0, $f10 -/* 11230 80949F00 AFAD0020 */ sw $t5, 0x0020($sp) -/* 11234 80949F04 AFAC0010 */ sw $t4, 0x0010($sp) -/* 11238 80949F08 8FA4006C */ lw $a0, 0x006C($sp) -/* 1123C 80949F0C E7B00014 */ swc1 $f16, 0x0014($sp) -/* 11240 80949F10 87A50066 */ lh $a1, 0x0066($sp) +/* 1122C 80949EFC 460A0400 */ add.s $f16, $f0, $f10 +/* 11230 80949F00 AFAD0020 */ sw $t5, 0x0020($sp) +/* 11234 80949F04 AFAC0010 */ sw $t4, 0x0010($sp) +/* 11238 80949F08 8FA4006C */ lw $a0, 0x006C($sp) +/* 1123C 80949F0C E7B00014 */ swc1 $f16, 0x0014($sp) +/* 11240 80949F10 87A50066 */ lh $a1, 0x0066($sp) /* 11244 80949F14 27A60058 */ addiu $a2, $sp, 0x0058 ## $a2 = FFFFFFF0 /* 11248 80949F18 27A7004C */ addiu $a3, $sp, 0x004C ## $a3 = FFFFFFE4 -/* 1124C 80949F1C AFA00018 */ sw $zero, 0x0018($sp) -/* 11250 80949F20 0C24E371 */ jal func_80938DC4 -/* 11254 80949F24 AFA0001C */ sw $zero, 0x001C($sp) +/* 1124C 80949F1C AFA00018 */ sw $zero, 0x0018($sp) +/* 11250 80949F20 0C24E371 */ jal func_80938DC4 +/* 11254 80949F24 AFA0001C */ sw $zero, 0x001C($sp) /* 11258 80949F28 26040568 */ addiu $a0, $s0, 0x0568 ## $a0 = 00000568 .L80949F2C: /* 1125C 80949F2C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 11260 80949F30 AFA40038 */ sw $a0, 0x0038($sp) + +/* 11260 80949F30 AFA40038 */ sw $a0, 0x0038($sp) /* 11264 80949F34 860E0160 */ lh $t6, 0x0160($s0) ## 00000160 /* 11268 80949F38 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 1126C 80949F3C 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 @@ -88,23 +88,23 @@ glabel func_80949E10 /* 11278 80949F48 86180160 */ lh $t8, 0x0160($s0) ## 00000160 /* 1127C 80949F4C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 11280 80949F50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 11284 80949F54 2B010100 */ slti $at, $t8, 0x0100 -/* 11288 80949F58 14200002 */ bne $at, $zero, .L80949F64 +/* 11284 80949F54 2B010100 */ slti $at, $t8, 0x0100 +/* 11288 80949F58 14200002 */ bne $at, $zero, .L80949F64 /* 1128C 80949F5C 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 11290 80949F60 A6190160 */ sh $t9, 0x0160($s0) ## 00000160 .L80949F64: /* 11294 80949F64 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 11298 80949F68 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 1129C 80949F6C C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 112A0 80949F70 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 /* 112A4 80949F74 26040060 */ addiu $a0, $s0, 0x0060 ## $a0 = 00000060 /* 112A8 80949F78 3C05C0A0 */ lui $a1, 0xC0A0 ## $a1 = C0A00000 -/* 112AC 80949F7C 46049180 */ add.s $f6, $f18, $f4 +/* 112AC 80949F7C 46049180 */ add.s $f6, $f18, $f4 /* 112B0 80949F80 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 112B4 80949F84 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 112B8 80949F88 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 112BC 80949F8C E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 112C0 80949F90 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 112C4 80949F94 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 @@ -113,82 +113,82 @@ glabel func_80949E10 /* 112D0 80949FA0 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 112D4 80949FA4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 112D8 80949FA8 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 112DC 80949FAC 460A4401 */ sub.s $f16, $f8, $f10 +/* 112DC 80949FAC 460A4401 */ sub.s $f16, $f8, $f10 /* 112E0 80949FB0 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 112E4 80949FB4 44060000 */ mfc1 $a2, $f0 -/* 112E8 80949FB8 44070000 */ mfc1 $a3, $f0 +/* 112E4 80949FB4 44060000 */ mfc1 $a2, $f0 +/* 112E8 80949FB8 44070000 */ mfc1 $a3, $f0 /* 112EC 80949FBC E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 112F0 80949FC0 AFA80014 */ sw $t0, 0x0014($sp) -/* 112F4 80949FC4 8FA4006C */ lw $a0, 0x006C($sp) +/* 112F0 80949FC0 AFA80014 */ sw $t0, 0x0014($sp) +/* 112F4 80949FC4 8FA4006C */ lw $a0, 0x006C($sp) /* 112F8 80949FC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 112FC 80949FCC 0C00B92D */ jal func_8002E4B4 -/* 11300 80949FD0 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 112FC 80949FCC 0C00B92D */ jal func_8002E4B4 +/* 11300 80949FD0 E7B20010 */ swc1 $f18, 0x0010($sp) /* 11304 80949FD4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 11308 80949FD8 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 1130C 80949FDC C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 11310 80949FE0 86090440 */ lh $t1, 0x0440($s0) ## 00000440 -/* 11314 80949FE4 46062200 */ add.s $f8, $f4, $f6 -/* 11318 80949FE8 15200018 */ bne $t1, $zero, .L8094A04C +/* 11314 80949FE4 46062200 */ add.s $f8, $f4, $f6 +/* 11318 80949FE8 15200018 */ bne $t1, $zero, .L8094A04C /* 1131C 80949FEC E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 11320 80949FF0 860A017A */ lh $t2, 0x017A($s0) ## 0000017A /* 11324 80949FF4 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 /* 11328 80949FF8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 1132C 80949FFC 1540001F */ bne $t2, $zero, .L8094A07C +/* 1132C 80949FFC 1540001F */ bne $t2, $zero, .L8094A07C /* 11330 8094A000 248443B4 */ addiu $a0, $a0, 0x43B4 ## $a0 = 060343B4 /* 11334 8094A004 0C028800 */ jal SkelAnime_GetFrameCount - + /* 11338 8094A008 A60B0440 */ sh $t3, 0x0440($s0) ## 00000440 /* 1133C 8094A00C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 11340 8094A010 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 11344 8094A014 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 11348 8094A018 46805020 */ cvt.s.w $f0, $f10 +/* 11348 8094A018 46805020 */ cvt.s.w $f0, $f10 /* 1134C 8094A01C 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 11350 8094A020 44071000 */ mfc1 $a3, $f2 +/* 11350 8094A020 44071000 */ mfc1 $a3, $f2 /* 11354 8094A024 24A543B4 */ addiu $a1, $a1, 0x43B4 ## $a1 = 060343B4 /* 11358 8094A028 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 1135C 8094A02C E60001A4 */ swc1 $f0, 0x01A4($s0) ## 000001A4 -/* 11360 8094A030 AFAC0014 */ sw $t4, 0x0014($sp) -/* 11364 8094A034 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 11368 8094A038 8FA40038 */ lw $a0, 0x0038($sp) +/* 11360 8094A030 AFAC0014 */ sw $t4, 0x0014($sp) +/* 11364 8094A034 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 11368 8094A038 8FA40038 */ lw $a0, 0x0038($sp) /* 1136C 8094A03C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 11370 8094A040 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 11374 8094A044 1000000E */ beq $zero, $zero, .L8094A080 + +/* 11370 8094A040 E7A20018 */ swc1 $f2, 0x0018($sp) +/* 11374 8094A044 1000000E */ beq $zero, $zero, .L8094A080 /* 11378 8094A048 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 .L8094A04C: -/* 1137C 8094A04C 8FA40038 */ lw $a0, 0x0038($sp) -/* 11380 8094A050 0C0295B2 */ jal func_800A56C8 +/* 1137C 8094A04C 8FA40038 */ lw $a0, 0x0038($sp) +/* 11380 8094A050 0C0295B2 */ jal func_800A56C8 /* 11384 8094A054 8E0501A4 */ lw $a1, 0x01A4($s0) ## 000001A4 -/* 11388 8094A058 10400008 */ beq $v0, $zero, .L8094A07C +/* 11388 8094A058 10400008 */ beq $v0, $zero, .L8094A07C /* 1138C 8094A05C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 11390 8094A060 44818000 */ mtc1 $at, $f16 ## $f16 = 1000.00 /* 11394 8094A064 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 11398 8094A068 24A55030 */ addiu $a1, $a1, 0x5030 ## $a1 = 06035030 /* 1139C 8094A06C E61001A4 */ swc1 $f16, 0x01A4($s0) ## 000001A4 -/* 113A0 8094A070 8FA40038 */ lw $a0, 0x0038($sp) -/* 113A4 8094A074 0C0294D3 */ jal func_800A534C +/* 113A0 8094A070 8FA40038 */ lw $a0, 0x0038($sp) +/* 113A4 8094A074 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 113A8 8094A078 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L8094A07C: /* 113AC 8094A07C 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 .L8094A080: /* 113B0 8094A080 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 113B4 8094A084 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 113B8 8094A088 51C00005 */ beql $t6, $zero, .L8094A0A0 +/* 113B8 8094A088 51C00005 */ beql $t6, $zero, .L8094A0A0 /* 113BC 8094A08C 860F0178 */ lh $t7, 0x0178($s0) ## 00000178 /* 113C0 8094A090 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 113C4 8094A094 00000000 */ nop /* 113C8 8094A098 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 /* 113CC 8094A09C 860F0178 */ lh $t7, 0x0178($s0) ## 00000178 .L8094A0A0: -/* 113D0 8094A0A0 55E00004 */ bnel $t7, $zero, .L8094A0B4 -/* 113D4 8094A0A4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 113D8 8094A0A8 0C252831 */ jal func_8094A0C4 -/* 113DC 8094A0AC 8FA5006C */ lw $a1, 0x006C($sp) -/* 113E0 8094A0B0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 113D0 8094A0A0 55E00004 */ bnel $t7, $zero, .L8094A0B4 +/* 113D4 8094A0A4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 113D8 8094A0A8 0C252831 */ jal func_8094A0C4 +/* 113DC 8094A0AC 8FA5006C */ lw $a1, 0x006C($sp) +/* 113E0 8094A0B0 8FBF0034 */ lw $ra, 0x0034($sp) .L8094A0B4: -/* 113E4 8094A0B4 8FB00030 */ lw $s0, 0x0030($sp) +/* 113E4 8094A0B4 8FB00030 */ lw $s0, 0x0030($sp) /* 113E8 8094A0B8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 113EC 8094A0BC 03E00008 */ jr $ra +/* 113EC 8094A0BC 03E00008 */ jr $ra /* 113F0 8094A0C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s index caf86429a2..05679e68a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s @@ -1,44 +1,44 @@ glabel func_8094A12C /* 1145C 8094A12C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 11460 8094A130 AFB00018 */ sw $s0, 0x0018($sp) +/* 11460 8094A130 AFB00018 */ sw $s0, 0x0018($sp) /* 11464 8094A134 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 11468 8094A138 AFBF001C */ sw $ra, 0x001C($sp) +/* 11468 8094A138 AFBF001C */ sw $ra, 0x001C($sp) /* 1146C 8094A13C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 11470 8094A140 AFA5002C */ sw $a1, 0x002C($sp) +/* 11470 8094A140 AFA5002C */ sw $a1, 0x002C($sp) /* 11474 8094A144 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 11478 8094A148 AFA40024 */ sw $a0, 0x0024($sp) + +/* 11478 8094A148 AFA40024 */ sw $a0, 0x0024($sp) /* 1147C 8094A14C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 11480 8094A150 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 11484 8094A154 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 11488 8094A158 8E0504B4 */ lw $a1, 0x04B4($s0) ## 000004B4 /* 1148C 8094A15C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 11490 8094A160 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 11494 8094A164 8FA40024 */ lw $a0, 0x0024($sp) -/* 11498 8094A168 0C0295B2 */ jal func_800A56C8 +/* 11494 8094A164 8FA40024 */ lw $a0, 0x0024($sp) +/* 11498 8094A168 0C0295B2 */ jal func_800A56C8 /* 1149C 8094A16C 8E0501A4 */ lw $a1, 0x01A4($s0) ## 000001A4 -/* 114A0 8094A170 10400008 */ beq $v0, $zero, .L8094A194 +/* 114A0 8094A170 10400008 */ beq $v0, $zero, .L8094A194 /* 114A4 8094A174 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 114A8 8094A178 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 /* 114AC 8094A17C 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 114B0 8094A180 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 /* 114B4 8094A184 E60401A4 */ swc1 $f4, 0x01A4($s0) ## 000001A4 -/* 114B8 8094A188 8FA40024 */ lw $a0, 0x0024($sp) -/* 114BC 8094A18C 0C0294D3 */ jal func_800A534C +/* 114B8 8094A188 8FA40024 */ lw $a0, 0x0024($sp) +/* 114BC 8094A18C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 114C0 8094A190 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L8094A194: /* 114C4 8094A194 860E0178 */ lh $t6, 0x0178($s0) ## 00000178 /* 114C8 8094A198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 114CC 8094A19C 55C00004 */ bnel $t6, $zero, .L8094A1B0 -/* 114D0 8094A1A0 8FBF001C */ lw $ra, 0x001C($sp) -/* 114D4 8094A1A4 0C252870 */ jal func_8094A1C0 -/* 114D8 8094A1A8 8FA5002C */ lw $a1, 0x002C($sp) -/* 114DC 8094A1AC 8FBF001C */ lw $ra, 0x001C($sp) +/* 114CC 8094A19C 55C00004 */ bnel $t6, $zero, .L8094A1B0 +/* 114D0 8094A1A0 8FBF001C */ lw $ra, 0x001C($sp) +/* 114D4 8094A1A4 0C252870 */ jal func_8094A1C0 +/* 114D8 8094A1A8 8FA5002C */ lw $a1, 0x002C($sp) +/* 114DC 8094A1AC 8FBF001C */ lw $ra, 0x001C($sp) .L8094A1B0: -/* 114E0 8094A1B0 8FB00018 */ lw $s0, 0x0018($sp) +/* 114E0 8094A1B0 8FB00018 */ lw $s0, 0x0018($sp) /* 114E4 8094A1B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 114E8 8094A1B8 03E00008 */ jr $ra +/* 114E8 8094A1B8 03E00008 */ jr $ra /* 114EC 8094A1BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s index ca1fa878cc..999c8c6e5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s @@ -1,52 +1,52 @@ glabel func_8094A1C0 /* 114F0 8094A1C0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 114F4 8094A1C4 F7BA0030 */ sdc1 $f26, 0x0030($sp) +/* 114F4 8094A1C4 F7BA0030 */ sdc1 $f26, 0x0030($sp) /* 114F8 8094A1C8 3C018095 */ lui $at, %hi(D_8094B218) ## $at = 80950000 -/* 114FC 8094A1CC AFB40048 */ sw $s4, 0x0048($sp) -/* 11500 8094A1D0 AFB30044 */ sw $s3, 0x0044($sp) -/* 11504 8094A1D4 AFB20040 */ sw $s2, 0x0040($sp) -/* 11508 8094A1D8 AFB00038 */ sw $s0, 0x0038($sp) -/* 1150C 8094A1DC F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 11510 8094A1E0 C43AB218 */ lwc1 $f26, %lo(D_8094B218)($at) -/* 11514 8094A1E4 AFBF004C */ sw $ra, 0x004C($sp) -/* 11518 8094A1E8 AFB1003C */ sw $s1, 0x003C($sp) -/* 1151C 8094A1EC F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 11520 8094A1F0 F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 114FC 8094A1CC AFB40048 */ sw $s4, 0x0048($sp) +/* 11500 8094A1D0 AFB30044 */ sw $s3, 0x0044($sp) +/* 11504 8094A1D4 AFB20040 */ sw $s2, 0x0040($sp) +/* 11508 8094A1D8 AFB00038 */ sw $s0, 0x0038($sp) +/* 1150C 8094A1DC F7B80028 */ sdc1 $f24, 0x0028($sp) +/* 11510 8094A1E0 C43AB218 */ lwc1 $f26, %lo(D_8094B218)($at) +/* 11514 8094A1E4 AFBF004C */ sw $ra, 0x004C($sp) +/* 11518 8094A1E8 AFB1003C */ sw $s1, 0x003C($sp) +/* 1151C 8094A1EC F7B60020 */ sdc1 $f22, 0x0020($sp) +/* 11520 8094A1F0 F7B40018 */ sdc1 $f20, 0x0018($sp) /* 11524 8094A1F4 3C018095 */ lui $at, %hi(D_8094B21C) ## $at = 80950000 /* 11528 8094A1F8 3C138095 */ lui $s3, %hi(D_8094A86C) ## $s3 = 80950000 /* 1152C 8094A1FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 11530 8094A200 8CB11C44 */ lw $s1, 0x1C44($a1) ## 00001C44 /* 11534 8094A204 2673A86C */ addiu $s3, $s3, %lo(D_8094A86C) ## $s3 = 8094A86C -/* 11538 8094A208 C438B21C */ lwc1 $f24, %lo(D_8094B21C)($at) +/* 11538 8094A208 C438B21C */ lwc1 $f24, %lo(D_8094B21C)($at) /* 1153C 8094A20C 249204B0 */ addiu $s2, $a0, 0x04B0 ## $s2 = 000004B0 /* 11540 8094A210 2414000C */ addiu $s4, $zero, 0x000C ## $s4 = 0000000C .L8094A214: /* 11544 8094A214 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 11548 8094A218 4600C306 */ mov.s $f12, $f24 -/* 1154C 8094A21C 4600010D */ trunc.w.s $f4, $f0 + +/* 11548 8094A218 4600C306 */ mov.s $f12, $f24 +/* 1154C 8094A21C 4600010D */ trunc.w.s $f4, $f0 /* 11550 8094A220 860E0154 */ lh $t6, 0x0154($s0) ## 00000154 -/* 11554 8094A224 44182000 */ mfc1 $t8, $f4 +/* 11554 8094A224 44182000 */ mfc1 $t8, $f4 /* 11558 8094A228 00000000 */ nop -/* 1155C 8094A22C 0018CC00 */ sll $t9, $t8, 16 -/* 11560 8094A230 00194403 */ sra $t0, $t9, 16 +/* 1155C 8094A22C 0018CC00 */ sll $t9, $t8, 16 +/* 11560 8094A230 00194403 */ sra $t0, $t9, 16 /* 11564 8094A234 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 11568 8094A238 00095400 */ sll $t2, $t1, 16 -/* 1156C 8094A23C 000A5C03 */ sra $t3, $t2, 16 -/* 11570 8094A240 01CB6021 */ addu $t4, $t6, $t3 +/* 11568 8094A238 00095400 */ sll $t2, $t1, 16 +/* 1156C 8094A23C 000A5C03 */ sra $t3, $t2, 16 +/* 11570 8094A240 01CB6021 */ addu $t4, $t6, $t3 /* 11574 8094A244 A60C0154 */ sh $t4, 0x0154($s0) ## 00000154 /* 11578 8094A248 860D0154 */ lh $t5, 0x0154($s0) ## 00000154 -/* 1157C 8094A24C 05A10004 */ bgez $t5, .L8094A260 +/* 1157C 8094A24C 05A10004 */ bgez $t5, .L8094A260 /* 11580 8094A250 31AF0003 */ andi $t7, $t5, 0x0003 ## $t7 = 00000000 -/* 11584 8094A254 11E00002 */ beq $t7, $zero, .L8094A260 +/* 11584 8094A254 11E00002 */ beq $t7, $zero, .L8094A260 /* 11588 8094A258 00000000 */ nop /* 1158C 8094A25C 25EFFFFC */ addiu $t7, $t7, 0xFFFC ## $t7 = FFFFFFFC .L8094A260: /* 11590 8094A260 A60F0154 */ sh $t7, 0x0154($s0) ## 00000154 /* 11594 8094A264 86180154 */ lh $t8, 0x0154($s0) ## 00000154 -/* 11598 8094A268 03140019 */ multu $t8, $s4 -/* 1159C 8094A26C 0000C812 */ mflo $t9 -/* 115A0 8094A270 02794021 */ addu $t0, $s3, $t9 +/* 11598 8094A268 03140019 */ multu $t8, $s4 +/* 1159C 8094A26C 0000C812 */ mflo $t9 +/* 115A0 8094A270 02794021 */ addu $t0, $s3, $t9 /* 115A4 8094A274 8D0A0000 */ lw $t2, 0x0000($t0) ## 00000000 /* 115A8 8094A278 AE4A0000 */ sw $t2, 0x0000($s2) ## 000004B0 /* 115AC 8094A27C 8D090004 */ lw $t1, 0x0004($t0) ## 00000004 @@ -57,68 +57,68 @@ glabel func_8094A1C0 /* 115C0 8094A290 C60204B0 */ lwc1 $f2, 0x04B0($s0) ## 000004B0 /* 115C4 8094A294 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C /* 115C8 8094A298 C61004B8 */ lwc1 $f16, 0x04B8($s0) ## 000004B8 -/* 115CC 8094A29C 46061501 */ sub.s $f20, $f2, $f6 -/* 115D0 8094A2A0 46088581 */ sub.s $f22, $f16, $f8 -/* 115D4 8094A2A4 4614A282 */ mul.s $f10, $f20, $f20 +/* 115CC 8094A29C 46061501 */ sub.s $f20, $f2, $f6 +/* 115D0 8094A2A0 46088581 */ sub.s $f22, $f16, $f8 +/* 115D4 8094A2A4 4614A282 */ mul.s $f10, $f20, $f20 /* 115D8 8094A2A8 00000000 */ nop -/* 115DC 8094A2AC 4616B102 */ mul.s $f4, $f22, $f22 -/* 115E0 8094A2B0 46045180 */ add.s $f6, $f10, $f4 -/* 115E4 8094A2B4 4606D03C */ c.lt.s $f26, $f6 +/* 115DC 8094A2AC 4616B102 */ mul.s $f4, $f22, $f22 +/* 115E0 8094A2B0 46045180 */ add.s $f6, $f10, $f4 +/* 115E4 8094A2B4 4606D03C */ c.lt.s $f26, $f6 /* 115E8 8094A2B8 00000000 */ nop -/* 115EC 8094A2BC 4500FFD5 */ bc1f .L8094A214 +/* 115EC 8094A2BC 4500FFD5 */ bc1f .L8094A214 /* 115F0 8094A2C0 00000000 */ nop /* 115F4 8094A2C4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 115F8 8094A2C8 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 115FC 8094A2CC 3C0143F0 */ lui $at, 0x43F0 ## $at = 43F00000 -/* 11600 8094A2D0 46081501 */ sub.s $f20, $f2, $f8 +/* 11600 8094A2D0 46081501 */ sub.s $f20, $f2, $f8 /* 11604 8094A2D4 44810000 */ mtc1 $at, $f0 ## $f0 = 480.00 /* 11608 8094A2D8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 1160C 8094A2DC 46048581 */ sub.s $f22, $f16, $f4 +/* 1160C 8094A2DC 46048581 */ sub.s $f22, $f16, $f4 /* 11610 8094A2E0 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 11614 8094A2E4 3C0E8095 */ lui $t6, %hi(func_8094A398) ## $t6 = 80950000 /* 11618 8094A2E8 25CEA398 */ addiu $t6, $t6, %lo(func_8094A398) ## $t6 = 8094A398 /* 1161C 8094A2EC AE0E014C */ sw $t6, 0x014C($s0) ## 0000014C -/* 11620 8094A2F0 4600B386 */ mov.s $f14, $f22 -/* 11624 8094A2F4 4600A306 */ mov.s $f12, $f20 +/* 11620 8094A2F0 4600B386 */ mov.s $f14, $f22 +/* 11624 8094A2F4 4600A306 */ mov.s $f12, $f20 /* 11628 8094A2F8 E60004B4 */ swc1 $f0, 0x04B4($s0) ## 000004B4 /* 1162C 8094A2FC E61204C8 */ swc1 $f18, 0x04C8($s0) ## 000004C8 /* 11630 8094A300 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 11634 8094A304 0C03F494 */ jal Math_atan2f -/* 11638 8094A308 460A0601 */ sub.s $f24, $f0, $f10 +/* 11634 8094A304 0C03F494 */ jal Math_atan2f +/* 11638 8094A308 460A0601 */ sub.s $f24, $f0, $f10 /* 1163C 8094A30C 3C018095 */ lui $at, %hi(D_8094B220) ## $at = 80950000 -/* 11640 8094A310 C43AB220 */ lwc1 $f26, %lo(D_8094B220)($at) -/* 11644 8094A314 4600C306 */ mov.s $f12, $f24 -/* 11648 8094A318 461A0182 */ mul.s $f6, $f0, $f26 +/* 11640 8094A310 C43AB220 */ lwc1 $f26, %lo(D_8094B220)($at) +/* 11644 8094A314 4600C306 */ mov.s $f12, $f24 +/* 11648 8094A318 461A0182 */ mul.s $f6, $f0, $f26 /* 1164C 8094A31C 00000000 */ nop -/* 11650 8094A320 4614A282 */ mul.s $f10, $f20, $f20 +/* 11650 8094A320 4614A282 */ mul.s $f10, $f20, $f20 /* 11654 8094A324 00000000 */ nop -/* 11658 8094A328 4616B102 */ mul.s $f4, $f22, $f22 -/* 1165C 8094A32C 4600320D */ trunc.w.s $f8, $f6 -/* 11660 8094A330 46045000 */ add.s $f0, $f10, $f4 -/* 11664 8094A334 440C4000 */ mfc1 $t4, $f8 -/* 11668 8094A338 46000384 */ sqrt.s $f14, $f0 -/* 1166C 8094A33C 0C03F494 */ jal Math_atan2f +/* 11658 8094A328 4616B102 */ mul.s $f4, $f22, $f22 +/* 1165C 8094A32C 4600320D */ trunc.w.s $f8, $f6 +/* 11660 8094A330 46045000 */ add.s $f0, $f10, $f4 +/* 11664 8094A334 440C4000 */ mfc1 $t4, $f8 +/* 11668 8094A338 46000384 */ sqrt.s $f14, $f0 +/* 1166C 8094A33C 0C03F494 */ jal Math_atan2f /* 11670 8094A340 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 -/* 11674 8094A344 461A0182 */ mul.s $f6, $f0, $f26 +/* 11674 8094A344 461A0182 */ mul.s $f6, $f0, $f26 /* 11678 8094A348 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 1167C 8094A34C 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 /* 11680 8094A350 26040568 */ addiu $a0, $s0, 0x0568 ## $a0 = 00000568 /* 11684 8094A354 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 11688 8094A358 4600320D */ trunc.w.s $f8, $f6 -/* 1168C 8094A35C 440F4000 */ mfc1 $t7, $f8 -/* 11690 8094A360 0C0294D3 */ jal func_800A534C +/* 11688 8094A358 4600320D */ trunc.w.s $f8, $f6 +/* 1168C 8094A35C 440F4000 */ mfc1 $t7, $f8 +/* 11690 8094A360 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 11694 8094A364 A60F0030 */ sh $t7, 0x0030($s0) ## 00000030 -/* 11698 8094A368 8FBF004C */ lw $ra, 0x004C($sp) -/* 1169C 8094A36C D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 116A0 8094A370 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 116A4 8094A374 D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 116A8 8094A378 D7BA0030 */ ldc1 $f26, 0x0030($sp) -/* 116AC 8094A37C 8FB00038 */ lw $s0, 0x0038($sp) -/* 116B0 8094A380 8FB1003C */ lw $s1, 0x003C($sp) -/* 116B4 8094A384 8FB20040 */ lw $s2, 0x0040($sp) -/* 116B8 8094A388 8FB30044 */ lw $s3, 0x0044($sp) -/* 116BC 8094A38C 8FB40048 */ lw $s4, 0x0048($sp) -/* 116C0 8094A390 03E00008 */ jr $ra +/* 11698 8094A368 8FBF004C */ lw $ra, 0x004C($sp) +/* 1169C 8094A36C D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 116A0 8094A370 D7B60020 */ ldc1 $f22, 0x0020($sp) +/* 116A4 8094A374 D7B80028 */ ldc1 $f24, 0x0028($sp) +/* 116A8 8094A378 D7BA0030 */ ldc1 $f26, 0x0030($sp) +/* 116AC 8094A37C 8FB00038 */ lw $s0, 0x0038($sp) +/* 116B0 8094A380 8FB1003C */ lw $s1, 0x003C($sp) +/* 116B4 8094A384 8FB20040 */ lw $s2, 0x0040($sp) +/* 116B8 8094A388 8FB30044 */ lw $s3, 0x0044($sp) +/* 116BC 8094A38C 8FB40048 */ lw $s4, 0x0048($sp) +/* 116C0 8094A390 03E00008 */ jr $ra /* 116C4 8094A394 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s index 49a84f0e40..3e69aa2bc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s @@ -1,25 +1,25 @@ glabel func_8094A608 /* 11938 8094A608 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1193C 8094A60C AFA5001C */ sw $a1, 0x001C($sp) +/* 1193C 8094A60C AFA5001C */ sw $a1, 0x001C($sp) /* 11940 8094A610 3C0E8095 */ lui $t6, %hi(func_8094A660) ## $t6 = 80950000 -/* 11944 8094A614 AFBF0014 */ sw $ra, 0x0014($sp) +/* 11944 8094A614 AFBF0014 */ sw $ra, 0x0014($sp) /* 11948 8094A618 25CEA660 */ addiu $t6, $t6, %lo(func_8094A660) ## $t6 = 8094A660 /* 1194C 8094A61C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 11950 8094A620 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 11954 8094A624 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 11958 8094A628 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 -/* 1195C 8094A62C AFA70018 */ sw $a3, 0x0018($sp) +/* 1195C 8094A62C AFA70018 */ sw $a3, 0x0018($sp) /* 11960 8094A630 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 11964 8094A634 0C0294D3 */ jal func_800A534C +/* 11964 8094A634 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 11968 8094A638 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 1196C 8094A63C 8FA70018 */ lw $a3, 0x0018($sp) +/* 1196C 8094A63C 8FA70018 */ lw $a3, 0x0018($sp) /* 11970 8094A640 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 11974 8094A644 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 11978 8094A648 A4EF0178 */ sh $t7, 0x0178($a3) ## 00000178 /* 1197C 8094A64C E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 11980 8094A650 8FBF0014 */ lw $ra, 0x0014($sp) +/* 11980 8094A650 8FBF0014 */ lw $ra, 0x0014($sp) /* 11984 8094A654 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 11988 8094A658 03E00008 */ jr $ra +/* 11988 8094A658 03E00008 */ jr $ra /* 1198C 8094A65C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s index fc63611591..23ba422a08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s @@ -1,22 +1,22 @@ glabel BossVa_Destroy /* 013E8 809506A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 013EC 809506AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 013F0 809506B0 AFA40018 */ sw $a0, 0x0018($sp) -/* 013F4 809506B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 013F8 809506B8 0C0295BC */ jal func_800A56F0 +/* 013EC 809506AC AFBF0014 */ sw $ra, 0x0014($sp) +/* 013F0 809506B0 AFA40018 */ sw $a0, 0x0018($sp) +/* 013F4 809506B4 AFA5001C */ sw $a1, 0x001C($sp) +/* 013F8 809506B8 0C0295BC */ jal SkelAnime_Free /* 013FC 809506BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01400 809506C0 8FA50018 */ lw $a1, 0x0018($sp) -/* 01404 809506C4 8FA4001C */ lw $a0, 0x001C($sp) -/* 01408 809506C8 0C016F32 */ jal func_8005BCC8 +/* 01400 809506C0 8FA50018 */ lw $a1, 0x0018($sp) +/* 01404 809506C4 8FA4001C */ lw $a0, 0x001C($sp) +/* 01408 809506C8 0C016F32 */ jal func_8005BCC8 /* 0140C 809506CC 24A502D8 */ addiu $a1, $a1, 0x02D8 ## $a1 = 000002D8 -/* 01410 809506D0 8FA50018 */ lw $a1, 0x0018($sp) -/* 01414 809506D4 8FA4001C */ lw $a0, 0x001C($sp) +/* 01410 809506D0 8FA50018 */ lw $a1, 0x0018($sp) +/* 01414 809506D4 8FA4001C */ lw $a0, 0x001C($sp) /* 01418 809506D8 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 0141C 809506DC 24A5028C */ addiu $a1, $a1, 0x028C ## $a1 = 0000028C -/* 01420 809506E0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01420 809506E0 8FBF0014 */ lw $ra, 0x0014($sp) /* 01424 809506E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01428 809506E8 03E00008 */ jr $ra +/* 01428 809506E8 03E00008 */ jr $ra /* 0142C 809506EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s index 08d463040e..dba491b448 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s @@ -212,7 +212,7 @@ glabel L809594D0 /* 0A234 809594F4 25AD86E4 */ addiu $t5, $t5, %lo(func_809586E4) ## $t5 = 809586E4 /* 0A238 809594F8 AFAD0014 */ sw $t5, 0x0014($sp) /* 0A23C 809594FC AFB00018 */ sw $s0, 0x0018($sp) -/* 0A240 80959500 0C0286B2 */ jal func_800A1AC8 +/* 0A240 80959500 0C0286B2 */ jal SkelAnime_DrawSV /* 0A244 80959504 AFAC0010 */ sw $t4, 0x0010($sp) /* 0A248 80959508 100000A1 */ beq $zero, $zero, .L80959790 /* 0A24C 8095950C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C @@ -229,7 +229,7 @@ glabel L80959510 /* 0A274 80959534 27398B0C */ addiu $t9, $t9, %lo(func_80958B0C) ## $t9 = 80958B0C /* 0A278 80959538 AFB90014 */ sw $t9, 0x0014($sp) /* 0A27C 8095953C AFB00018 */ sw $s0, 0x0018($sp) -/* 0A280 80959540 0C0286B2 */ jal func_800A1AC8 +/* 0A280 80959540 0C0286B2 */ jal SkelAnime_DrawSV /* 0A284 80959544 AFAF0010 */ sw $t7, 0x0010($sp) /* 0A288 80959548 10000091 */ beq $zero, $zero, .L80959790 /* 0A28C 8095954C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C @@ -240,7 +240,7 @@ glabel L80959550 /* 0A29C 8095955C AFA00018 */ sw $zero, 0x0018($sp) /* 0A2A0 80959560 AFA00014 */ sw $zero, 0x0014($sp) /* 0A2A4 80959564 AFA00010 */ sw $zero, 0x0010($sp) -/* 0A2A8 80959568 0C0286B2 */ jal func_800A1AC8 +/* 0A2A8 80959568 0C0286B2 */ jal SkelAnime_DrawSV /* 0A2AC 8095956C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A2B0 80959570 10000087 */ beq $zero, $zero, .L80959790 /* 0A2B4 80959574 8602001C */ lh $v0, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s index 7f9c4b7146..a2b85bf5c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s @@ -1,30 +1,30 @@ glabel BossVa_Init /* 00B9C 8094FE5C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00BA0 8094FE60 AFB40048 */ sw $s4, 0x0048($sp) +/* 00BA0 8094FE60 AFB40048 */ sw $s4, 0x0048($sp) /* 00BA4 8094FE64 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 00BA8 8094FE68 AFBF004C */ sw $ra, 0x004C($sp) -/* 00BAC 8094FE6C AFB30044 */ sw $s3, 0x0044($sp) +/* 00BA8 8094FE68 AFBF004C */ sw $ra, 0x004C($sp) +/* 00BAC 8094FE6C AFB30044 */ sw $s3, 0x0044($sp) /* 00BB0 8094FE70 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 /* 00BB4 8094FE74 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 00BB8 8094FE78 AFB20040 */ sw $s2, 0x0040($sp) -/* 00BBC 8094FE7C AFB1003C */ sw $s1, 0x003C($sp) -/* 00BC0 8094FE80 AFB00038 */ sw $s0, 0x0038($sp) +/* 00BB8 8094FE78 AFB20040 */ sw $s2, 0x0040($sp) +/* 00BBC 8094FE7C AFB1003C */ sw $s1, 0x003C($sp) +/* 00BC0 8094FE80 AFB00038 */ sw $s0, 0x0038($sp) /* 00BC4 8094FE84 0C00B58B */ jal Actor_SetScale - + /* 00BC8 8094FE88 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD /* 00BCC 8094FE8C 8678001C */ lh $t8, 0x001C($s3) ## 0000001C /* 00BD0 8094FE90 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00BD4 8094FE94 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF /* 00BD8 8094FE98 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00BDC 8094FE9C 2F210015 */ sltiu $at, $t9, 0x0015 +/* 00BDC 8094FE9C 2F210015 */ sltiu $at, $t9, 0x0015 /* 00BE0 8094FEA0 A26E001F */ sb $t6, 0x001F($s3) ## 0000001F -/* 00BE4 8094FEA4 1020003A */ beq $at, $zero, .L8094FF90 +/* 00BE4 8094FEA4 1020003A */ beq $at, $zero, .L8094FF90 /* 00BE8 8094FEA8 A26F00AE */ sb $t7, 0x00AE($s3) ## 000000AE -/* 00BEC 8094FEAC 0019C880 */ sll $t9, $t9, 2 +/* 00BEC 8094FEAC 0019C880 */ sll $t9, $t9, 2 /* 00BF0 8094FEB0 3C018096 */ lui $at, %hi(jtbl_8095C58C) ## $at = 80960000 -/* 00BF4 8094FEB4 00390821 */ addu $at, $at, $t9 -/* 00BF8 8094FEB8 8C39C58C */ lw $t9, %lo(jtbl_8095C58C)($at) -/* 00BFC 8094FEBC 03200008 */ jr $t9 +/* 00BF4 8094FEB4 00390821 */ addu $at, $at, $t9 +/* 00BF8 8094FEB8 8C39C58C */ lw $t9, %lo(jtbl_8095C58C)($at) +/* 00BFC 8094FEBC 03200008 */ jr $t9 /* 00C00 8094FEC0 00000000 */ nop glabel L8094FEC4 /* 00C04 8094FEC4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -33,15 +33,15 @@ glabel L8094FEC4 /* 00C10 8094FED0 24C65B18 */ addiu $a2, $a2, 0x5B18 ## $a2 = 06015B18 /* 00C14 8094FED4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00C18 8094FED8 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C -/* 00C1C 8094FEDC AFA00010 */ sw $zero, 0x0010($sp) -/* 00C20 8094FEE0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00C1C 8094FEDC AFA00010 */ sw $zero, 0x0010($sp) +/* 00C20 8094FEE0 AFA00014 */ sw $zero, 0x0014($sp) /* 00C24 8094FEE4 0C02915F */ jal SkelAnime_Init - -/* 00C28 8094FEE8 AFA00018 */ sw $zero, 0x0018($sp) + +/* 00C28 8094FEE8 AFA00018 */ sw $zero, 0x0018($sp) /* 00C2C 8094FEEC 8E690004 */ lw $t1, 0x0004($s3) ## 00000004 /* 00C30 8094FEF0 3C010100 */ lui $at, 0x0100 ## $at = 01000000 /* 00C34 8094FEF4 01215025 */ or $t2, $t1, $at ## $t2 = 01000000 -/* 00C38 8094FEF8 10000037 */ beq $zero, $zero, .L8094FFD8 +/* 00C38 8094FEF8 10000037 */ beq $zero, $zero, .L8094FFD8 /* 00C3C 8094FEFC AE6A0004 */ sw $t2, 0x0004($s3) ## 00000004 glabel L8094FF00 /* 00C40 8094FF00 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -50,11 +50,11 @@ glabel L8094FF00 /* 00C4C 8094FF0C 24C67498 */ addiu $a2, $a2, 0x7498 ## $a2 = 06017498 /* 00C50 8094FF10 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00C54 8094FF14 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C -/* 00C58 8094FF18 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C5C 8094FF1C AFA00014 */ sw $zero, 0x0014($sp) -/* 00C60 8094FF20 0C0291BE */ jal func_800A46F8 -/* 00C64 8094FF24 AFA00018 */ sw $zero, 0x0018($sp) -/* 00C68 8094FF28 1000002C */ beq $zero, $zero, .L8094FFDC +/* 00C58 8094FF18 AFA00010 */ sw $zero, 0x0010($sp) +/* 00C5C 8094FF1C AFA00014 */ sw $zero, 0x0014($sp) +/* 00C60 8094FF20 0C0291BE */ jal SkelAnime_InitSV +/* 00C64 8094FF24 AFA00018 */ sw $zero, 0x0018($sp) +/* 00C68 8094FF28 1000002C */ beq $zero, $zero, .L8094FFDC /* 00C6C 8094FF2C 8E6E0024 */ lw $t6, 0x0024($s3) ## 00000024 glabel L8094FF30 /* 00C70 8094FF30 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 @@ -63,11 +63,11 @@ glabel L8094FF30 /* 00C7C 8094FF3C 24C699A0 */ addiu $a2, $a2, 0x99A0 ## $a2 = 060199A0 /* 00C80 8094FF40 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00C84 8094FF44 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C -/* 00C88 8094FF48 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C8C 8094FF4C AFA00014 */ sw $zero, 0x0014($sp) -/* 00C90 8094FF50 0C0291BE */ jal func_800A46F8 -/* 00C94 8094FF54 AFA00018 */ sw $zero, 0x0018($sp) -/* 00C98 8094FF58 10000020 */ beq $zero, $zero, .L8094FFDC +/* 00C88 8094FF48 AFA00010 */ sw $zero, 0x0010($sp) +/* 00C8C 8094FF4C AFA00014 */ sw $zero, 0x0014($sp) +/* 00C90 8094FF50 0C0291BE */ jal SkelAnime_InitSV +/* 00C94 8094FF54 AFA00018 */ sw $zero, 0x0018($sp) +/* 00C98 8094FF58 10000020 */ beq $zero, $zero, .L8094FFDC /* 00C9C 8094FF5C 8E6E0024 */ lw $t6, 0x0024($s3) ## 00000024 glabel L8094FF60 /* 00CA0 8094FF60 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 @@ -76,11 +76,11 @@ glabel L8094FF60 /* 00CAC 8094FF6C 24C68870 */ addiu $a2, $a2, 0x8870 ## $a2 = 06018870 /* 00CB0 8094FF70 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00CB4 8094FF74 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C -/* 00CB8 8094FF78 AFA00010 */ sw $zero, 0x0010($sp) -/* 00CBC 8094FF7C AFA00014 */ sw $zero, 0x0014($sp) -/* 00CC0 8094FF80 0C0291BE */ jal func_800A46F8 -/* 00CC4 8094FF84 AFA00018 */ sw $zero, 0x0018($sp) -/* 00CC8 8094FF88 10000014 */ beq $zero, $zero, .L8094FFDC +/* 00CB8 8094FF78 AFA00010 */ sw $zero, 0x0010($sp) +/* 00CBC 8094FF7C AFA00014 */ sw $zero, 0x0014($sp) +/* 00CC0 8094FF80 0C0291BE */ jal SkelAnime_InitSV +/* 00CC4 8094FF84 AFA00018 */ sw $zero, 0x0018($sp) +/* 00CC8 8094FF88 10000014 */ beq $zero, $zero, .L8094FFDC /* 00CCC 8094FF8C 8E6E0024 */ lw $t6, 0x0024($s3) ## 00000024 glabel L8094FF90 .L8094FF90: @@ -91,13 +91,13 @@ glabel L8094FF90 /* 00CE0 8094FFA0 AE6C0004 */ sw $t4, 0x0004($s3) ## 00000004 /* 00CE4 8094FFA4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00CE8 8094FFA8 24E70024 */ addiu $a3, $a3, 0x0024 ## $a3 = 06000024 -/* 00CEC 8094FFAC AFA00018 */ sw $zero, 0x0018($sp) -/* 00CF0 8094FFB0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00CF4 8094FFB4 AFA00010 */ sw $zero, 0x0010($sp) +/* 00CEC 8094FFAC AFA00018 */ sw $zero, 0x0018($sp) +/* 00CF0 8094FFB0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00CF4 8094FFB4 AFA00010 */ sw $zero, 0x0010($sp) /* 00CF8 8094FFB8 24C64E70 */ addiu $a2, $a2, 0x4E70 ## $a2 = 06004E70 /* 00CFC 8094FFBC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00D00 8094FFC0 0C02915F */ jal SkelAnime_Init - + /* 00D04 8094FFC4 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C /* 00D08 8094FFC8 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 00D0C 8094FFCC 44812000 */ mtc1 $at, $f4 ## $f4 = 400.00 @@ -113,17 +113,17 @@ glabel L8094FFD8 /* 00D28 8094FFE8 8E6E002C */ lw $t6, 0x002C($s3) ## 0000002C /* 00D2C 8094FFEC 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 00D30 8094FFF0 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 00D34 8094FFF4 2F210015 */ sltiu $at, $t9, 0x0015 +/* 00D34 8094FFF4 2F210015 */ sltiu $at, $t9, 0x0015 /* 00D38 8094FFF8 A2600194 */ sb $zero, 0x0194($s3) ## 00000194 /* 00D3C 8094FFFC A26F0117 */ sb $t7, 0x0117($s3) ## 00000117 /* 00D40 80950000 AE6D003C */ sw $t5, 0x003C($s3) ## 0000003C -/* 00D44 80950004 1020016F */ beq $at, $zero, .L809505C4 +/* 00D44 80950004 1020016F */ beq $at, $zero, .L809505C4 /* 00D48 80950008 AE6E0040 */ sw $t6, 0x0040($s3) ## 00000040 -/* 00D4C 8095000C 0019C880 */ sll $t9, $t9, 2 +/* 00D4C 8095000C 0019C880 */ sll $t9, $t9, 2 /* 00D50 80950010 3C018096 */ lui $at, %hi(jtbl_8095C5E0) ## $at = 80960000 -/* 00D54 80950014 00390821 */ addu $at, $at, $t9 -/* 00D58 80950018 8C39C5E0 */ lw $t9, %lo(jtbl_8095C5E0)($at) -/* 00D5C 8095001C 03200008 */ jr $t9 +/* 00D54 80950014 00390821 */ addu $at, $at, $t9 +/* 00D58 80950018 8C39C5E0 */ lw $t9, %lo(jtbl_8095C5E0)($at) +/* 00D5C 8095001C 03200008 */ jr $t9 /* 00D60 80950020 00000000 */ nop glabel L80950024 /* 00D64 80950024 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -133,74 +133,74 @@ glabel L80950024 /* 00D74 80950034 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00D78 80950038 26841C24 */ addiu $a0, $s4, 0x1C24 ## $a0 = 00001C24 /* 00D7C 8095003C 24090013 */ addiu $t1, $zero, 0x0013 ## $t1 = 00000013 -/* 00D80 80950040 AFA90028 */ sw $t1, 0x0028($sp) -/* 00D84 80950044 AFA40050 */ sw $a0, 0x0050($sp) +/* 00D80 80950040 AFA90028 */ sw $t1, 0x0028($sp) +/* 00D84 80950044 AFA40050 */ sw $a0, 0x0050($sp) /* 00D88 80950048 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00D8C 8095004C 02803025 */ or $a2, $s4, $zero ## $a2 = 00000000 /* 00D90 80950050 240700BA */ addiu $a3, $zero, 0x00BA ## $a3 = 000000BA -/* 00D94 80950054 AFA0001C */ sw $zero, 0x001C($sp) -/* 00D98 80950058 AFA00020 */ sw $zero, 0x0020($sp) -/* 00D9C 8095005C AFA00024 */ sw $zero, 0x0024($sp) -/* 00DA0 80950060 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00DA4 80950064 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00D94 80950054 AFA0001C */ sw $zero, 0x001C($sp) +/* 00D98 80950058 AFA00020 */ sw $zero, 0x0020($sp) +/* 00D9C 8095005C AFA00024 */ sw $zero, 0x0024($sp) +/* 00DA0 80950060 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 00DA4 80950064 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00DA8 80950068 0C00C916 */ jal Actor_SpawnAttached - -/* 00DAC 8095006C E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 00DAC 8095006C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00DB0 80950070 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00DB4 80950074 02818021 */ addu $s0, $s4, $at +/* 00DB4 80950074 02818021 */ addu $s0, $s4, $at /* 00DB8 80950078 82051CBC */ lb $a1, 0x1CBC($s0) ## 00001CBC /* 00DBC 8095007C 0C00B337 */ jal Flags_GetClear - + /* 00DC0 80950080 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00DC4 80950084 1040002C */ beq $v0, $zero, .L80950138 +/* 00DC4 80950084 1040002C */ beq $v0, $zero, .L80950138 /* 00DC8 80950088 3C0D8096 */ lui $t5, %hi(D_8095C200) ## $t5 = 80960000 /* 00DCC 8095008C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 00DD0 80950090 954AF53A */ lhu $t2, -0x0AC6($t2) ## 8015F53A /* 00DD4 80950094 240600A1 */ addiu $a2, $zero, 0x00A1 ## $a2 = 000000A1 -/* 00DD8 80950098 8FA40050 */ lw $a0, 0x0050($sp) +/* 00DD8 80950098 8FA40050 */ lw $a0, 0x0050($sp) /* 00DDC 8095009C 314B0080 */ andi $t3, $t2, 0x0080 ## $t3 = 00000000 -/* 00DE0 809500A0 51600003 */ beql $t3, $zero, .L809500B0 +/* 00DE0 809500A0 51600003 */ beql $t3, $zero, .L809500B0 /* 00DE4 809500A4 C6700028 */ lwc1 $f16, 0x0028($s3) ## 00000028 /* 00DE8 809500A8 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D /* 00DEC 809500AC C6700028 */ lwc1 $f16, 0x0028($s3) ## 00000028 .L809500B0: /* 00DF0 809500B0 8E670024 */ lw $a3, 0x0024($s3) ## 00000024 /* 00DF4 809500B4 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 00DF8 809500B8 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00DF8 809500B8 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00DFC 809500BC C672002C */ lwc1 $f18, 0x002C($s3) ## 0000002C -/* 00E00 809500C0 AFA00024 */ sw $zero, 0x0024($sp) -/* 00E04 809500C4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00E08 809500C8 AFA0001C */ sw $zero, 0x001C($sp) -/* 00E0C 809500CC AFA00018 */ sw $zero, 0x0018($sp) +/* 00E00 809500C0 AFA00024 */ sw $zero, 0x0024($sp) +/* 00E04 809500C4 AFA00020 */ sw $zero, 0x0020($sp) +/* 00E08 809500C8 AFA0001C */ sw $zero, 0x001C($sp) +/* 00E0C 809500CC AFA00018 */ sw $zero, 0x0018($sp) /* 00E10 809500D0 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00E14 809500D4 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 00E14 809500D4 E7B20014 */ swc1 $f18, 0x0014($sp) /* 00E18 809500D8 3C014320 */ lui $at, 0x4320 ## $at = 43200000 /* 00E1C 809500DC 44813000 */ mtc1 $at, $f6 ## $f6 = 160.00 /* 00E20 809500E0 C6640024 */ lwc1 $f4, 0x0024($s3) ## 00000024 /* 00E24 809500E4 C66A0028 */ lwc1 $f10, 0x0028($s3) ## 00000028 -/* 00E28 809500E8 8FA40050 */ lw $a0, 0x0050($sp) -/* 00E2C 809500EC 46062200 */ add.s $f8, $f4, $f6 -/* 00E30 809500F0 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00E28 809500E8 8FA40050 */ lw $a0, 0x0050($sp) +/* 00E2C 809500EC 46062200 */ add.s $f8, $f4, $f6 +/* 00E30 809500F0 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00E34 809500F4 C670002C */ lwc1 $f16, 0x002C($s3) ## 0000002C -/* 00E38 809500F8 AFA00024 */ sw $zero, 0x0024($sp) -/* 00E3C 809500FC 44074000 */ mfc1 $a3, $f8 -/* 00E40 80950100 AFA00020 */ sw $zero, 0x0020($sp) -/* 00E44 80950104 AFA0001C */ sw $zero, 0x001C($sp) -/* 00E48 80950108 AFA00018 */ sw $zero, 0x0018($sp) +/* 00E38 809500F8 AFA00024 */ sw $zero, 0x0024($sp) +/* 00E3C 809500FC 44074000 */ mfc1 $a3, $f8 +/* 00E40 80950100 AFA00020 */ sw $zero, 0x0020($sp) +/* 00E44 80950104 AFA0001C */ sw $zero, 0x001C($sp) +/* 00E48 80950108 AFA00018 */ sw $zero, 0x0018($sp) /* 00E4C 8095010C 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 00E50 80950110 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F /* 00E54 80950114 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00E58 80950118 E7B00014 */ swc1 $f16, 0x0014($sp) +/* 00E58 80950118 E7B00014 */ swc1 $f16, 0x0014($sp) /* 00E5C 8095011C 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 /* 00E60 80950120 3C018096 */ lui $at, %hi(D_80966934) ## $at = 80960000 -/* 00E64 80950124 A42C6934 */ sh $t4, %lo(D_80966934)($at) +/* 00E64 80950124 A42C6934 */ sh $t4, %lo(D_80966934)($at) /* 00E68 80950128 0C00B55C */ jal Actor_Kill - + /* 00E6C 8095012C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00E70 80950130 10000156 */ beq $zero, $zero, .L8095068C -/* 00E74 80950134 8FBF004C */ lw $ra, 0x004C($sp) +/* 00E70 80950130 10000156 */ beq $zero, $zero, .L8095068C +/* 00E74 80950134 8FBF004C */ lw $ra, 0x004C($sp) .L80950138: /* 00E78 80950138 25ADC200 */ addiu $t5, $t5, %lo(D_8095C200) ## $t5 = FFFFC200 /* 00E7C 8095013C AE6D0098 */ sw $t5, 0x0098($s3) ## 00000098 @@ -209,17 +209,17 @@ glabel L80950024 /* 00E88 80950148 340EFFFF */ ori $t6, $zero, 0xFFFF ## $t6 = 0000FFFF /* 00E8C 8095014C 3C018096 */ lui $at, %hi(D_8096693E) ## $at = 80960000 /* 00E90 80950150 31F80040 */ andi $t8, $t7, 0x0040 ## $t8 = 00000000 -/* 00E94 80950154 1300008F */ beq $t8, $zero, .L80950394 -/* 00E98 80950158 A42E693E */ sh $t6, %lo(D_8096693E)($at) +/* 00E94 80950154 1300008F */ beq $t8, $zero, .L80950394 +/* 00E98 80950158 A42E693E */ sh $t6, %lo(D_8096693E)($at) /* 00E9C 8095015C 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 /* 00EA0 80950160 3C018096 */ lui $at, %hi(D_809668D2) ## $at = 80960000 -/* 00EA4 80950164 A03968D2 */ sb $t9, %lo(D_809668D2)($at) +/* 00EA4 80950164 A03968D2 */ sb $t9, %lo(D_809668D2)($at) /* 00EA8 80950168 3C018096 */ lui $at, %hi(D_80966934) ## $at = 80960000 /* 00EAC 8095016C 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 -/* 00EB0 80950170 A4296934 */ sh $t1, %lo(D_80966934)($at) +/* 00EB0 80950170 A4296934 */ sh $t1, %lo(D_80966934)($at) /* 00EB4 80950174 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00EB8 80950178 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 00EBC 8095017C 0C00B7D5 */ jal func_8002DF54 +/* 00EBC 8095017C 0C00B7D5 */ jal func_8002DF54 /* 00EC0 80950180 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00EC4 80950184 240300DC */ addiu $v1, $zero, 0x00DC ## $v1 = 000000DC /* 00EC8 80950188 240A00BE */ addiu $t2, $zero, 0x00BE ## $t2 = 000000BE @@ -229,20 +229,20 @@ glabel L80950024 /* 00ED8 80950198 A20A0B08 */ sb $t2, 0x0B08($s0) ## 00000B08 /* 00EDC 8095019C A20B0B09 */ sb $t3, 0x0B09($s0) ## 00000B09 /* 00EE0 809501A0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00EE4 809501A4 0C019148 */ jal func_80064520 +/* 00EE4 809501A4 0C019148 */ jal func_80064520 /* 00EE8 809501A8 26851D64 */ addiu $a1, $s4, 0x1D64 ## $a1 = 00001D64 -/* 00EEC 809501AC 0C03008C */ jal func_800C0230 +/* 00EEC 809501AC 0C03008C */ jal func_800C0230 /* 00EF0 809501B0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00EF4 809501B4 3C108096 */ lui $s0, %hi(D_8095C23C) ## $s0 = 80960000 /* 00EF8 809501B8 2610C23C */ addiu $s0, $s0, %lo(D_8095C23C) ## $s0 = 8095C23C /* 00EFC 809501BC A6020000 */ sh $v0, 0x0000($s0) ## 8095C23C /* 00F00 809501C0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00F04 809501C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00F08 809501C8 0C0300C5 */ jal func_800C0314 +/* 00F08 809501C8 0C0300C5 */ jal func_800C0314 /* 00F0C 809501CC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00F10 809501D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00F14 809501D4 86050000 */ lh $a1, 0x0000($s0) ## 8095C23C -/* 00F18 809501D8 0C0300C5 */ jal func_800C0314 +/* 00F18 809501D8 0C0300C5 */ jal func_800C0314 /* 00F1C 809501DC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00F20 809501E0 3C01430C */ lui $at, 0x430C ## $at = 430C0000 /* 00F24 809501E4 44819000 */ mtc1 $at, $f18 ## $f18 = 140.00 @@ -283,7 +283,7 @@ glabel L80950024 /* 00FB0 80950270 86050000 */ lh $a1, 0x0000($s0) ## 8095C23C /* 00FB4 80950274 E5040000 */ swc1 $f4, 0x0000($t0) ## 80966908 /* 00FB8 80950278 E5080004 */ swc1 $f8, 0x0004($t0) ## 8096690C -/* 00FBC 8095027C 0C030136 */ jal func_800C04D8 +/* 00FBC 8095027C 0C030136 */ jal func_800C04D8 /* 00FC0 80950280 E5100008 */ swc1 $f16, 0x0008($t0) ## 80966910 /* 00FC4 80950284 240C0014 */ addiu $t4, $zero, 0x0014 ## $t4 = 00000014 /* 00FC8 80950288 3C108096 */ lui $s0, %hi(D_8095C0F8) ## $s0 = 80960000 @@ -297,37 +297,37 @@ glabel L80950024 /* 00FE4 809502A4 C6640024 */ lwc1 $f4, 0x0024($s3) ## 00000024 /* 00FE8 809502A8 C6080004 */ lwc1 $f8, 0x0004($s0) ## 8095C0FC /* 00FEC 809502AC 862D0000 */ lh $t5, 0x0000($s1) ## 8095C1D6 -/* 00FF0 809502B0 46049180 */ add.s $f6, $f18, $f4 +/* 00FF0 809502B0 46049180 */ add.s $f6, $f18, $f4 /* 00FF4 809502B4 C6120008 */ lwc1 $f18, 0x0008($s0) ## 8095C100 /* 00FF8 809502B8 86380002 */ lh $t8, 0x0002($s1) ## 8095C1D8 /* 00FFC 809502BC 862A0004 */ lh $t2, 0x0004($s1) ## 8095C1DA -/* 01000 809502C0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01000 809502C0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01004 809502C4 C66A0028 */ lwc1 $f10, 0x0028($s3) ## 00000028 -/* 01008 809502C8 8FA40050 */ lw $a0, 0x0050($sp) +/* 01008 809502C8 8FA40050 */ lw $a0, 0x0050($sp) /* 0100C 809502CC 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 01010 809502D0 460A4400 */ add.s $f16, $f8, $f10 +/* 01010 809502D0 460A4400 */ add.s $f16, $f8, $f10 /* 01014 809502D4 02803025 */ or $a2, $s4, $zero ## $a2 = 00000000 /* 01018 809502D8 240700BA */ addiu $a3, $zero, 0x00BA ## $a3 = 000000BA -/* 0101C 809502DC E7B00014 */ swc1 $f16, 0x0014($sp) +/* 0101C 809502DC E7B00014 */ swc1 $f16, 0x0014($sp) /* 01020 809502E0 C664002C */ lwc1 $f4, 0x002C($s3) ## 0000002C -/* 01024 809502E4 46049180 */ add.s $f6, $f18, $f4 -/* 01028 809502E8 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 01024 809502E4 46049180 */ add.s $f6, $f18, $f4 +/* 01028 809502E8 E7A60018 */ swc1 $f6, 0x0018($sp) /* 0102C 809502EC 866E0030 */ lh $t6, 0x0030($s3) ## 00000030 -/* 01030 809502F0 01AE7821 */ addu $t7, $t5, $t6 -/* 01034 809502F4 AFAF001C */ sw $t7, 0x001C($sp) +/* 01030 809502F0 01AE7821 */ addu $t7, $t5, $t6 +/* 01034 809502F4 AFAF001C */ sw $t7, 0x001C($sp) /* 01038 809502F8 86790032 */ lh $t9, 0x0032($s3) ## 00000032 -/* 0103C 809502FC 03194821 */ addu $t1, $t8, $t9 -/* 01040 80950300 AFA90020 */ sw $t1, 0x0020($sp) +/* 0103C 809502FC 03194821 */ addu $t1, $t8, $t9 +/* 01040 80950300 AFA90020 */ sw $t1, 0x0020($sp) /* 01044 80950304 866B0034 */ lh $t3, 0x0034($s3) ## 00000034 -/* 01048 80950308 AFB20028 */ sw $s2, 0x0028($sp) -/* 0104C 8095030C 014B6021 */ addu $t4, $t2, $t3 +/* 01048 80950308 AFB20028 */ sw $s2, 0x0028($sp) +/* 0104C 8095030C 014B6021 */ addu $t4, $t2, $t3 /* 01050 80950310 0C00C916 */ jal Actor_SpawnAttached - -/* 01054 80950314 AFAC0024 */ sw $t4, 0x0024($sp) + +/* 01054 80950314 AFAC0024 */ sw $t4, 0x0024($sp) /* 01058 80950318 2652FFFF */ addiu $s2, $s2, 0xFFFF ## $s2 = 0000000E /* 0105C 8095031C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 01060 80950320 2610FFF4 */ addiu $s0, $s0, 0xFFF4 ## $s0 = 8095C0EC -/* 01064 80950324 1641FFDE */ bne $s2, $at, .L809502A0 +/* 01064 80950324 1641FFDE */ bne $s2, $at, .L809502A0 /* 01068 80950328 2631FFFA */ addiu $s1, $s1, 0xFFFA ## $s1 = 8095C1D0 /* 0106C 8095032C 3C0D8096 */ lui $t5, %hi(D_8095C220) ## $t5 = 80960000 /* 01070 80950330 25ADC220 */ addiu $t5, $t5, %lo(D_8095C220) ## $t5 = 8095C220 @@ -353,15 +353,15 @@ glabel L80950024 /* 010C0 80950380 8C4B0004 */ lw $t3, 0x0004($v0) ## FFFFFFE8 /* 010C4 80950384 AD4B0004 */ sw $t3, 0x0004($t2) ## 8096692C /* 010C8 80950388 8C4C0008 */ lw $t4, 0x0008($v0) ## FFFFFFEC -/* 010CC 8095038C 10000007 */ beq $zero, $zero, .L809503AC +/* 010CC 8095038C 10000007 */ beq $zero, $zero, .L809503AC /* 010D0 80950390 AD4C0008 */ sw $t4, 0x0008($t2) ## 80966930 .L80950394: /* 010D4 80950394 240DFFFC */ addiu $t5, $zero, 0xFFFC ## $t5 = FFFFFFFC /* 010D8 80950398 3C018096 */ lui $at, %hi(D_809668D2) ## $at = 80960000 -/* 010DC 8095039C A02D68D2 */ sb $t5, %lo(D_809668D2)($at) +/* 010DC 8095039C A02D68D2 */ sb $t5, %lo(D_809668D2)($at) /* 010E0 809503A0 3C018096 */ lui $at, %hi(D_80966934) ## $at = 80960000 /* 010E4 809503A4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 010E8 809503A8 A42E6934 */ sh $t6, %lo(D_80966934)($at) +/* 010E8 809503A8 A42E6934 */ sh $t6, %lo(D_80966934)($at) .L809503AC: /* 010EC 809503AC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 010F0 809503B0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -369,14 +369,14 @@ glabel L80950024 /* 010F8 809503B8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C /* 010FC 809503BC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01100 809503C0 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 01104 809503C4 E66001CC */ swc1 $f0, 0x01CC($s3) ## 000001CC /* 01108 809503C8 3C078096 */ lui $a3, %hi(D_8095BF60) ## $a3 = 80960000 /* 0110C 809503CC 24E7BF60 */ addiu $a3, $a3, %lo(D_8095BF60) ## $a3 = 8095BF60 /* 01110 809503D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01114 809503D4 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C /* 01118 809503D8 0C01712B */ jal ActorCollider_InitCylinder - + /* 0111C 809503DC 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 01120 809503E0 3C108096 */ lui $s0, %hi(D_8095C080) ## $s0 = 80960000 /* 01124 809503E4 3C118096 */ lui $s1, %hi(D_8095C19A) ## $s1 = 80960000 @@ -388,151 +388,151 @@ glabel L80950024 /* 01138 809503F8 C66A0024 */ lwc1 $f10, 0x0024($s3) ## 00000024 /* 0113C 809503FC C6120004 */ lwc1 $f18, 0x0004($s0) ## 8095C084 /* 01140 80950400 862F0000 */ lh $t7, 0x0000($s1) ## 8095C19A -/* 01144 80950404 460A4400 */ add.s $f16, $f8, $f10 +/* 01144 80950404 460A4400 */ add.s $f16, $f8, $f10 /* 01148 80950408 C6080008 */ lwc1 $f8, 0x0008($s0) ## 8095C088 /* 0114C 8095040C 86290002 */ lh $t1, 0x0002($s1) ## 8095C19C /* 01150 80950410 862C0004 */ lh $t4, 0x0004($s1) ## 8095C19E -/* 01154 80950414 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01154 80950414 E7B00010 */ swc1 $f16, 0x0010($sp) /* 01158 80950418 C6640028 */ lwc1 $f4, 0x0028($s3) ## 00000028 -/* 0115C 8095041C 8FA40050 */ lw $a0, 0x0050($sp) +/* 0115C 8095041C 8FA40050 */ lw $a0, 0x0050($sp) /* 01160 80950420 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 01164 80950424 46049180 */ add.s $f6, $f18, $f4 +/* 01164 80950424 46049180 */ add.s $f6, $f18, $f4 /* 01168 80950428 02803025 */ or $a2, $s4, $zero ## $a2 = 00000000 /* 0116C 8095042C 240700BA */ addiu $a3, $zero, 0x00BA ## $a3 = 000000BA -/* 01170 80950430 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 01170 80950430 E7A60014 */ swc1 $f6, 0x0014($sp) /* 01174 80950434 C66A002C */ lwc1 $f10, 0x002C($s3) ## 0000002C -/* 01178 80950438 460A4400 */ add.s $f16, $f8, $f10 -/* 0117C 8095043C E7B00018 */ swc1 $f16, 0x0018($sp) +/* 01178 80950438 460A4400 */ add.s $f16, $f8, $f10 +/* 0117C 8095043C E7B00018 */ swc1 $f16, 0x0018($sp) /* 01180 80950440 86780030 */ lh $t8, 0x0030($s3) ## 00000030 -/* 01184 80950444 01F8C821 */ addu $t9, $t7, $t8 -/* 01188 80950448 AFB9001C */ sw $t9, 0x001C($sp) +/* 01184 80950444 01F8C821 */ addu $t9, $t7, $t8 +/* 01188 80950448 AFB9001C */ sw $t9, 0x001C($sp) /* 0118C 8095044C 866A0032 */ lh $t2, 0x0032($s3) ## 00000032 -/* 01190 80950450 012A5821 */ addu $t3, $t1, $t2 -/* 01194 80950454 AFAB0020 */ sw $t3, 0x0020($sp) +/* 01190 80950450 012A5821 */ addu $t3, $t1, $t2 +/* 01194 80950454 AFAB0020 */ sw $t3, 0x0020($sp) /* 01198 80950458 866D0034 */ lh $t5, 0x0034($s3) ## 00000034 -/* 0119C 8095045C AFB20028 */ sw $s2, 0x0028($sp) -/* 011A0 80950460 018D7021 */ addu $t6, $t4, $t5 +/* 0119C 8095045C AFB20028 */ sw $s2, 0x0028($sp) +/* 011A0 80950460 018D7021 */ addu $t6, $t4, $t5 /* 011A4 80950464 0C00C916 */ jal Actor_SpawnAttached - -/* 011A8 80950468 AFAE0024 */ sw $t6, 0x0024($sp) + +/* 011A8 80950468 AFAE0024 */ sw $t6, 0x0024($sp) /* 011AC 8095046C 2652FFFF */ addiu $s2, $s2, 0xFFFF ## $s2 = 00000004 /* 011B0 80950470 2610FFF4 */ addiu $s0, $s0, 0xFFF4 ## $s0 = 8095C074 -/* 011B4 80950474 0641FFDF */ bgez $s2, .L809503F4 +/* 011B4 80950474 0641FFDF */ bgez $s2, .L809503F4 /* 011B8 80950478 2631FFFA */ addiu $s1, $s1, 0xFFFA ## $s1 = 8095C194 /* 011BC 8095047C 3C048096 */ lui $a0, %hi(D_8095DF50) ## $a0 = 80960000 /* 011C0 80950480 2484DF50 */ addiu $a0, $a0, %lo(D_8095DF50) ## $a0 = 8095DF50 /* 011C4 80950484 34058980 */ ori $a1, $zero, 0x8980 ## $a1 = 00008980 /* 011C8 80950488 0C01DDF8 */ jal Lib_MemSet - + /* 011CC 8095048C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 011D0 80950490 3C0F8096 */ lui $t7, %hi(D_809668D2) ## $t7 = 80960000 -/* 011D4 80950494 81EF68D2 */ lb $t7, %lo(D_809668D2)($t7) -/* 011D8 80950498 29E1000D */ slti $at, $t7, 0x000D -/* 011DC 8095049C 10200005 */ beq $at, $zero, .L809504B4 +/* 011D4 80950494 81EF68D2 */ lb $t7, %lo(D_809668D2)($t7) +/* 011D8 80950498 29E1000D */ slti $at, $t7, 0x000D +/* 011DC 8095049C 10200005 */ beq $at, $zero, .L809504B4 /* 011E0 809504A0 00000000 */ nop -/* 011E4 809504A4 0C2541BC */ jal func_809506F0 +/* 011E4 809504A4 0C2541BC */ jal func_809506F0 /* 011E8 809504A8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 011EC 809504AC 10000077 */ beq $zero, $zero, .L8095068C -/* 011F0 809504B0 8FBF004C */ lw $ra, 0x004C($sp) +/* 011EC 809504AC 10000077 */ beq $zero, $zero, .L8095068C +/* 011F0 809504B0 8FBF004C */ lw $ra, 0x004C($sp) .L809504B4: -/* 011F4 809504B4 0C2545E8 */ jal func_809517A0 +/* 011F4 809504B4 0C2545E8 */ jal func_809517A0 /* 011F8 809504B8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 011FC 809504BC 10000073 */ beq $zero, $zero, .L8095068C -/* 01200 809504C0 8FBF004C */ lw $ra, 0x004C($sp) +/* 011FC 809504BC 10000073 */ beq $zero, $zero, .L8095068C +/* 01200 809504C0 8FBF004C */ lw $ra, 0x004C($sp) glabel L809504C4 /* 01204 809504C4 267002D8 */ addiu $s0, $s3, 0x02D8 ## $s0 = 000002D8 /* 01208 809504C8 02002825 */ or $a1, $s0, $zero ## $a1 = 000002D8 -/* 0120C 809504CC 0C016EFE */ jal func_8005BBF8 +/* 0120C 809504CC 0C016EFE */ jal func_8005BBF8 /* 01210 809504D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01214 809504D4 3C078096 */ lui $a3, %hi(D_8095BFB0) ## $a3 = 80960000 /* 01218 809504D8 267802F8 */ addiu $t8, $s3, 0x02F8 ## $t8 = 000002F8 -/* 0121C 809504DC AFB80010 */ sw $t8, 0x0010($sp) +/* 0121C 809504DC AFB80010 */ sw $t8, 0x0010($sp) /* 01220 809504E0 24E7BFB0 */ addiu $a3, $a3, %lo(D_8095BFB0) ## $a3 = 8095BFB0 /* 01224 809504E4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01228 809504E8 02002825 */ or $a1, $s0, $zero ## $a1 = 000002D8 -/* 0122C 809504EC 0C017014 */ jal func_8005C050 +/* 0122C 809504EC 0C017014 */ jal func_8005C050 /* 01230 809504F0 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 01234 809504F4 3C198096 */ lui $t9, %hi(D_809668D2) ## $t9 = 80960000 -/* 01238 809504F8 833968D2 */ lb $t9, %lo(D_809668D2)($t9) +/* 01238 809504F8 833968D2 */ lb $t9, %lo(D_809668D2)($t9) /* 0123C 809504FC 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 01240 80950500 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01244 80950504 2B21000D */ slti $at, $t9, 0x000D -/* 01248 80950508 10200005 */ beq $at, $zero, .L80950520 +/* 01244 80950504 2B21000D */ slti $at, $t9, 0x000D +/* 01248 80950508 10200005 */ beq $at, $zero, .L80950520 /* 0124C 8095050C 00000000 */ nop -/* 01250 80950510 0C254FD3 */ jal func_80953F4C +/* 01250 80950510 0C254FD3 */ jal func_80953F4C /* 01254 80950514 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01258 80950518 10000004 */ beq $zero, $zero, .L8095052C +/* 01258 80950518 10000004 */ beq $zero, $zero, .L8095052C /* 0125C 8095051C 92690194 */ lbu $t1, 0x0194($s3) ## 00000194 .L80950520: -/* 01260 80950520 0C255039 */ jal func_809540E4 +/* 01260 80950520 0C255039 */ jal func_809540E4 /* 01264 80950524 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 01268 80950528 92690194 */ lbu $t1, 0x0194($s3) ## 00000194 .L8095052C: /* 0126C 8095052C 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 01270 80950530 10000055 */ beq $zero, $zero, .L80950688 +/* 01270 80950530 10000055 */ beq $zero, $zero, .L80950688 /* 01274 80950534 A26A0194 */ sb $t2, 0x0194($s3) ## 00000194 glabel L80950538 /* 01278 80950538 26700338 */ addiu $s0, $s3, 0x0338 ## $s0 = 00000338 /* 0127C 8095053C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000338 -/* 01280 80950540 0C017406 */ jal func_8005D018 +/* 01280 80950540 0C017406 */ jal func_8005D018 /* 01284 80950544 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01288 80950548 3C078096 */ lui $a3, %hi(D_8095BFF4) ## $a3 = 80960000 /* 0128C 8095054C 24E7BFF4 */ addiu $a3, $a3, %lo(D_8095BFF4) ## $a3 = 8095BFF4 /* 01290 80950550 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01294 80950554 02002825 */ or $a1, $s0, $zero ## $a1 = 00000338 -/* 01298 80950558 0C017441 */ jal func_8005D104 +/* 01298 80950558 0C017441 */ jal func_8005D104 /* 0129C 8095055C 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 012A0 80950560 3C0B8096 */ lui $t3, %hi(D_809668D2) ## $t3 = 80960000 -/* 012A4 80950564 816B68D2 */ lb $t3, %lo(D_809668D2)($t3) +/* 012A4 80950564 816B68D2 */ lb $t3, %lo(D_809668D2)($t3) /* 012A8 80950568 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 012AC 8095056C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 012B0 80950570 2961000D */ slti $at, $t3, 0x000D -/* 012B4 80950574 10200005 */ beq $at, $zero, .L8095058C +/* 012B0 80950570 2961000D */ slti $at, $t3, 0x000D +/* 012B4 80950574 10200005 */ beq $at, $zero, .L8095058C /* 012B8 80950578 00000000 */ nop -/* 012BC 8095057C 0C25528F */ jal func_80954A3C +/* 012BC 8095057C 0C25528F */ jal func_80954A3C /* 012C0 80950580 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 012C4 80950584 10000041 */ beq $zero, $zero, .L8095068C -/* 012C8 80950588 8FBF004C */ lw $ra, 0x004C($sp) +/* 012C4 80950584 10000041 */ beq $zero, $zero, .L8095068C +/* 012C8 80950588 8FBF004C */ lw $ra, 0x004C($sp) .L8095058C: -/* 012CC 8095058C 0C2552E3 */ jal func_80954B8C +/* 012CC 8095058C 0C2552E3 */ jal func_80954B8C /* 012D0 80950590 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 012D4 80950594 1000003D */ beq $zero, $zero, .L8095068C -/* 012D8 80950598 8FBF004C */ lw $ra, 0x004C($sp) +/* 012D4 80950594 1000003D */ beq $zero, $zero, .L8095068C +/* 012D8 80950598 8FBF004C */ lw $ra, 0x004C($sp) glabel L8095059C /* 012DC 8095059C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 012E0 809505A0 0C255249 */ jal func_80954924 +/* 012E0 809505A0 0C255249 */ jal func_80954924 /* 012E4 809505A4 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 012E8 809505A8 10000038 */ beq $zero, $zero, .L8095068C -/* 012EC 809505AC 8FBF004C */ lw $ra, 0x004C($sp) +/* 012E8 809505A8 10000038 */ beq $zero, $zero, .L8095068C +/* 012EC 809505AC 8FBF004C */ lw $ra, 0x004C($sp) glabel L809505B0 /* 012F0 809505B0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 012F4 809505B4 0C255F27 */ jal func_80957C9C +/* 012F4 809505B4 0C255F27 */ jal func_80957C9C /* 012F8 809505B8 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 012FC 809505BC 10000033 */ beq $zero, $zero, .L8095068C -/* 01300 809505C0 8FBF004C */ lw $ra, 0x004C($sp) +/* 012FC 809505BC 10000033 */ beq $zero, $zero, .L8095068C +/* 01300 809505C0 8FBF004C */ lw $ra, 0x004C($sp) glabel L809505C4 .L809505C4: /* 01304 809505C4 267002D8 */ addiu $s0, $s3, 0x02D8 ## $s0 = 000002D8 /* 01308 809505C8 02002825 */ or $a1, $s0, $zero ## $a1 = 000002D8 -/* 0130C 809505CC 0C016EFE */ jal func_8005BBF8 +/* 0130C 809505CC 0C016EFE */ jal func_8005BBF8 /* 01310 809505D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01314 809505D4 3C078096 */ lui $a3, %hi(D_8095BFE4) ## $a3 = 80960000 /* 01318 809505D8 266C02F8 */ addiu $t4, $s3, 0x02F8 ## $t4 = 000002F8 -/* 0131C 809505DC AFAC0010 */ sw $t4, 0x0010($sp) +/* 0131C 809505DC AFAC0010 */ sw $t4, 0x0010($sp) /* 01320 809505E0 24E7BFE4 */ addiu $a3, $a3, %lo(D_8095BFE4) ## $a3 = 8095BFE4 /* 01324 809505E4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01328 809505E8 02002825 */ or $a1, $s0, $zero ## $a1 = 000002D8 -/* 0132C 809505EC 0C017014 */ jal func_8005C050 +/* 0132C 809505EC 0C017014 */ jal func_8005C050 /* 01330 809505F0 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 01334 809505F4 26700338 */ addiu $s0, $s3, 0x0338 ## $s0 = 00000338 /* 01338 809505F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000338 -/* 0133C 809505FC 0C017406 */ jal func_8005D018 +/* 0133C 809505FC 0C017406 */ jal func_8005D018 /* 01340 80950600 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01344 80950604 3C078096 */ lui $a3, %hi(D_8095BFF4) ## $a3 = 80960000 /* 01348 80950608 24E7BFF4 */ addiu $a3, $a3, %lo(D_8095BFF4) ## $a3 = 8095BFF4 /* 0134C 8095060C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01350 80950610 02002825 */ or $a1, $s0, $zero ## $a1 = 00000338 -/* 01354 80950614 0C017441 */ jal func_8005D104 +/* 01354 80950614 0C017441 */ jal func_8005D104 /* 01358 80950618 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 0135C 8095061C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01360 80950620 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -540,38 +540,38 @@ glabel L809505C4 /* 01368 80950628 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0136C 8095062C E66001D8 */ swc1 $f0, 0x01D8($s3) ## 000001D8 /* 01370 80950630 E66001DC */ swc1 $f0, 0x01DC($s3) ## 000001DC -/* 01374 80950634 81AD68D2 */ lb $t5, %lo(D_809668D2)($t5) +/* 01374 80950634 81AD68D2 */ lb $t5, %lo(D_809668D2)($t5) /* 01378 80950638 3C0E8096 */ lui $t6, %hi(D_809668D1) ## $t6 = 80960000 -/* 0137C 8095063C 29A1000D */ slti $at, $t5, 0x000D -/* 01380 80950640 10200005 */ beq $at, $zero, .L80950658 +/* 0137C 8095063C 29A1000D */ slti $at, $t5, 0x000D +/* 01380 80950640 10200005 */ beq $at, $zero, .L80950658 /* 01384 80950644 00000000 */ nop -/* 01388 80950648 0C2559F4 */ jal func_809567D0 +/* 01388 80950648 0C2559F4 */ jal func_809567D0 /* 0138C 8095064C 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 01390 80950650 1000000E */ beq $zero, $zero, .L8095068C -/* 01394 80950654 8FBF004C */ lw $ra, 0x004C($sp) +/* 01390 80950650 1000000E */ beq $zero, $zero, .L8095068C +/* 01394 80950654 8FBF004C */ lw $ra, 0x004C($sp) .L80950658: -/* 01398 80950658 91CE68D1 */ lbu $t6, %lo(D_809668D1)($t6) +/* 01398 80950658 91CE68D1 */ lbu $t6, %lo(D_809668D1)($t6) /* 0139C 8095065C 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 013A0 80950660 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 013A4 80950664 29C10009 */ slti $at, $t6, 0x0009 -/* 013A8 80950668 14200005 */ bne $at, $zero, .L80950680 +/* 013A4 80950664 29C10009 */ slti $at, $t6, 0x0009 +/* 013A8 80950668 14200005 */ bne $at, $zero, .L80950680 /* 013AC 8095066C 00000000 */ nop -/* 013B0 80950670 0C255B8E */ jal func_80956E38 +/* 013B0 80950670 0C255B8E */ jal func_80956E38 /* 013B4 80950674 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 013B8 80950678 10000004 */ beq $zero, $zero, .L8095068C -/* 013BC 8095067C 8FBF004C */ lw $ra, 0x004C($sp) +/* 013B8 80950678 10000004 */ beq $zero, $zero, .L8095068C +/* 013BC 8095067C 8FBF004C */ lw $ra, 0x004C($sp) .L80950680: -/* 013C0 80950680 0C255CB7 */ jal func_809572DC +/* 013C0 80950680 0C255CB7 */ jal func_809572DC /* 013C4 80950684 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 .L80950688: -/* 013C8 80950688 8FBF004C */ lw $ra, 0x004C($sp) +/* 013C8 80950688 8FBF004C */ lw $ra, 0x004C($sp) .L8095068C: -/* 013CC 8095068C 8FB00038 */ lw $s0, 0x0038($sp) -/* 013D0 80950690 8FB1003C */ lw $s1, 0x003C($sp) -/* 013D4 80950694 8FB20040 */ lw $s2, 0x0040($sp) -/* 013D8 80950698 8FB30044 */ lw $s3, 0x0044($sp) -/* 013DC 8095069C 8FB40048 */ lw $s4, 0x0048($sp) -/* 013E0 809506A0 03E00008 */ jr $ra +/* 013CC 8095068C 8FB00038 */ lw $s0, 0x0038($sp) +/* 013D0 80950690 8FB1003C */ lw $s1, 0x003C($sp) +/* 013D4 80950694 8FB20040 */ lw $s2, 0x0040($sp) +/* 013D8 80950698 8FB30044 */ lw $s3, 0x0044($sp) +/* 013DC 8095069C 8FB40048 */ lw $s4, 0x0048($sp) +/* 013E0 809506A0 03E00008 */ jr $ra /* 013E4 809506A4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s index 9bec947ef8..227d398b53 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s @@ -1,84 +1,84 @@ glabel func_80954454 /* 05194 80954454 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 05198 80954458 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0519C 8095445C AFB00030 */ sw $s0, 0x0030($sp) -/* 051A0 80954460 AFA50054 */ sw $a1, 0x0054($sp) +/* 05198 80954458 AFBF0034 */ sw $ra, 0x0034($sp) +/* 0519C 8095445C AFB00030 */ sw $s0, 0x0030($sp) +/* 051A0 80954460 AFA50054 */ sw $a1, 0x0054($sp) /* 051A4 80954464 8C8E0118 */ lw $t6, 0x0118($a0) ## 00000118 /* 051A8 80954468 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 051AC 8095446C 0C253CB2 */ jal func_8094F2C8 -/* 051B0 80954470 AFAE004C */ sw $t6, 0x004C($sp) +/* 051AC 8095446C 0C253CB2 */ jal func_8094F2C8 +/* 051B0 80954470 AFAE004C */ sw $t6, 0x004C($sp) /* 051B4 80954474 920F0194 */ lbu $t7, 0x0194($s0) ## 00000194 /* 051B8 80954478 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 051BC 8095447C 51E00054 */ beql $t7, $zero, .L809545D0 -/* 051C0 80954480 8FAA004C */ lw $t2, 0x004C($sp) +/* 051BC 8095447C 51E00054 */ beql $t7, $zero, .L809545D0 +/* 051C0 80954480 8FAA004C */ lw $t2, 0x004C($sp) /* 051C4 80954484 0C028800 */ jal SkelAnime_GetFrameCount - + /* 051C8 80954488 24847694 */ addiu $a0, $a0, 0x7694 ## $a0 = 06017694 /* 051CC 8095448C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 051D0 80954490 00000000 */ nop -/* 051D4 80954494 468021A0 */ cvt.s.w $f6, $f4 -/* 051D8 80954498 E7A60048 */ swc1 $f6, 0x0048($sp) +/* 051D4 80954494 468021A0 */ cvt.s.w $f6, $f4 +/* 051D8 80954498 E7A60048 */ swc1 $f6, 0x0048($sp) /* 051DC 8095449C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 051E0 809544A0 A2000194 */ sb $zero, 0x0194($s0) ## 00000194 /* 051E4 809544A4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 051E8 809544A8 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 /* 051EC 809544AC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 051F0 809544B0 46080282 */ mul.s $f10, $f0, $f8 -/* 051F4 809544B4 4600540D */ trunc.w.s $f16, $f10 -/* 051F8 809544B8 44198000 */ mfc1 $t9, $f16 +/* 051F0 809544B0 46080282 */ mul.s $f10, $f0, $f8 +/* 051F4 809544B4 4600540D */ trunc.w.s $f16, $f10 +/* 051F8 809544B8 44198000 */ mfc1 $t9, $f16 /* 051FC 809544BC 00000000 */ nop /* 05200 809544C0 27280005 */ addiu $t0, $t9, 0x0005 ## $t0 = 00000005 /* 05204 809544C4 AE080198 */ sw $t0, 0x0198($s0) ## 00000198 -/* 05208 809544C8 AFA4003C */ sw $a0, 0x003C($sp) -/* 0520C 809544CC 0C0295BC */ jal func_800A56F0 -/* 05210 809544D0 8FA50054 */ lw $a1, 0x0054($sp) +/* 05208 809544C8 AFA4003C */ sw $a0, 0x003C($sp) +/* 0520C 809544CC 0C0295BC */ jal SkelAnime_Free +/* 05210 809544D0 8FA50054 */ lw $a1, 0x0054($sp) /* 05214 809544D4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 05218 809544D8 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 0521C 809544DC 24E77694 */ addiu $a3, $a3, 0x7694 ## $a3 = 06017694 /* 05220 809544E0 24C67FC8 */ addiu $a2, $a2, 0x7FC8 ## $a2 = 06017FC8 -/* 05224 809544E4 8FA40054 */ lw $a0, 0x0054($sp) -/* 05228 809544E8 8FA5003C */ lw $a1, 0x003C($sp) -/* 0522C 809544EC AFA00010 */ sw $zero, 0x0010($sp) -/* 05230 809544F0 AFA00014 */ sw $zero, 0x0014($sp) -/* 05234 809544F4 0C0291BE */ jal func_800A46F8 -/* 05238 809544F8 AFA00018 */ sw $zero, 0x0018($sp) +/* 05224 809544E4 8FA40054 */ lw $a0, 0x0054($sp) +/* 05228 809544E8 8FA5003C */ lw $a1, 0x003C($sp) +/* 0522C 809544EC AFA00010 */ sw $zero, 0x0010($sp) +/* 05230 809544F0 AFA00014 */ sw $zero, 0x0014($sp) +/* 05234 809544F4 0C0291BE */ jal SkelAnime_InitSV +/* 05238 809544F8 AFA00018 */ sw $zero, 0x0018($sp) /* 0523C 809544FC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 05240 80954500 C7B20048 */ lwc1 $f18, 0x0048($sp) +/* 05240 80954500 C7B20048 */ lwc1 $f18, 0x0048($sp) /* 05244 80954504 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 05248 80954508 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 0524C 8095450C 44070000 */ mfc1 $a3, $f0 -/* 05250 80954510 AFA90014 */ sw $t1, 0x0014($sp) +/* 0524C 8095450C 44070000 */ mfc1 $a3, $f0 +/* 05250 80954510 AFA90014 */ sw $t1, 0x0014($sp) /* 05254 80954514 24A57694 */ addiu $a1, $a1, 0x7694 ## $a1 = 06017694 -/* 05258 80954518 8FA4003C */ lw $a0, 0x003C($sp) +/* 05258 80954518 8FA4003C */ lw $a0, 0x003C($sp) /* 0525C 8095451C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05260 80954520 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 05260 80954520 E7B20010 */ swc1 $f18, 0x0010($sp) /* 05264 80954524 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 05268 80954528 E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 05268 80954528 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0526C 8095452C 3C018096 */ lui $at, %hi(D_809668D0) ## $at = 80960000 -/* 05270 80954530 A02068D0 */ sb $zero, %lo(D_809668D0)($at) +/* 05270 80954530 A02068D0 */ sb $zero, %lo(D_809668D0)($at) /* 05274 80954534 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 /* 05278 80954538 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0527C 8095453C 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 05280 80954540 C44400BC */ lwc1 $f4, 0x00BC($v0) ## 000000BC /* 05284 80954544 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 05288 80954548 46062201 */ sub.s $f8, $f4, $f6 +/* 05288 80954548 46062201 */ sub.s $f8, $f4, $f6 /* 0528C 8095454C E44800BC */ swc1 $f8, 0x00BC($v0) ## 000000BC /* 05290 80954550 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -/* 05294 80954554 50600008 */ beql $v1, $zero, .L80954578 +/* 05294 80954554 50600008 */ beql $v1, $zero, .L80954578 /* 05298 80954558 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -/* 0529C 8095455C 1061000A */ beq $v1, $at, .L80954588 +/* 0529C 8095455C 1061000A */ beq $v1, $at, .L80954588 /* 052A0 80954560 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 052A4 80954564 50610012 */ beql $v1, $at, .L809545B0 +/* 052A4 80954564 50610012 */ beql $v1, $at, .L809545B0 /* 052A8 80954568 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -/* 052AC 8095456C 10000018 */ beq $zero, $zero, .L809545D0 -/* 052B0 80954570 8FAA004C */ lw $t2, 0x004C($sp) +/* 052AC 8095456C 10000018 */ beq $zero, $zero, .L809545D0 +/* 052B0 80954570 8FAA004C */ lw $t2, 0x004C($sp) /* 052B4 80954574 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 .L80954578: /* 052B8 80954578 844A0030 */ lh $t2, 0x0030($v0) ## 00000030 /* 052BC 8095457C 254B04B0 */ addiu $t3, $t2, 0x04B0 ## $t3 = 000004B0 -/* 052C0 80954580 10000012 */ beq $zero, $zero, .L809545CC +/* 052C0 80954580 10000012 */ beq $zero, $zero, .L809545CC /* 052C4 80954584 A44B0030 */ sh $t3, 0x0030($v0) ## 00000030 .L80954588: /* 052C8 80954588 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 @@ -88,7 +88,7 @@ glabel func_80954454 /* 052D8 80954598 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 /* 052DC 8095459C 844E0034 */ lh $t6, 0x0034($v0) ## 00000034 /* 052E0 809545A0 25CFFB1E */ addiu $t7, $t6, 0xFB1E ## $t7 = FFFFFB1E -/* 052E4 809545A4 10000009 */ beq $zero, $zero, .L809545CC +/* 052E4 809545A4 10000009 */ beq $zero, $zero, .L809545CC /* 052E8 809545A8 A44F0034 */ sh $t7, 0x0034($v0) ## 00000034 /* 052EC 809545AC 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 .L809545B0: @@ -100,56 +100,56 @@ glabel func_80954454 /* 05304 809545C4 250904E2 */ addiu $t1, $t0, 0x04E2 ## $t1 = 000004E2 /* 05308 809545C8 A4490034 */ sh $t1, 0x0034($v0) ## 00000034 .L809545CC: -/* 0530C 809545CC 8FAA004C */ lw $t2, 0x004C($sp) +/* 0530C 809545CC 8FAA004C */ lw $t2, 0x004C($sp) .L809545D0: /* 05310 809545D0 260B014C */ addiu $t3, $s0, 0x014C ## $t3 = 0000014C /* 05314 809545D4 260401F6 */ addiu $a0, $s0, 0x01F6 ## $a0 = 000001F6 /* 05318 809545D8 854501F8 */ lh $a1, 0x01F8($t2) ## 000001F8 -/* 0531C 809545DC AFAB003C */ sw $t3, 0x003C($sp) -/* 05320 809545E0 AFA00010 */ sw $zero, 0x0010($sp) -/* 05324 809545E4 00050823 */ subu $at, $zero, $a1 -/* 05328 809545E8 00012880 */ sll $a1, $at, 2 -/* 0532C 809545EC 00A12823 */ subu $a1, $a1, $at -/* 05330 809545F0 00052C00 */ sll $a1, $a1, 16 -/* 05334 809545F4 00052C03 */ sra $a1, $a1, 16 +/* 0531C 809545DC AFAB003C */ sw $t3, 0x003C($sp) +/* 05320 809545E0 AFA00010 */ sw $zero, 0x0010($sp) +/* 05324 809545E4 00050823 */ subu $at, $zero, $a1 +/* 05328 809545E8 00012880 */ sll $a1, $at, 2 +/* 0532C 809545EC 00A12823 */ subu $a1, $a1, $at +/* 05330 809545F0 00052C00 */ sll $a1, $a1, 16 +/* 05334 809545F4 00052C03 */ sra $a1, $a1, 16 /* 05338 809545F8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0533C 809545FC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 05340 80954600 240704B0 */ addiu $a3, $zero, 0x04B0 ## $a3 = 000004B0 /* 05344 80954604 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 05348 80954608 8FA4003C */ lw $a0, 0x003C($sp) -/* 0534C 8095460C 10400014 */ beq $v0, $zero, .L80954660 + +/* 05348 80954608 8FA4003C */ lw $a0, 0x003C($sp) +/* 0534C 8095460C 10400014 */ beq $v0, $zero, .L80954660 /* 05350 80954610 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 05354 80954614 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05358 80954618 248477F4 */ addiu $a0, $a0, 0x77F4 ## $a0 = 060177F4 /* 0535C 8095461C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 05360 80954620 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 05364 80954624 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 05368 80954628 46805420 */ cvt.s.w $f16, $f10 +/* 05368 80954628 46805420 */ cvt.s.w $f16, $f10 /* 0536C 8095462C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 05370 80954630 44070000 */ mfc1 $a3, $f0 -/* 05374 80954634 AFAC0014 */ sw $t4, 0x0014($sp) +/* 05370 80954630 44070000 */ mfc1 $a3, $f0 +/* 05374 80954634 AFAC0014 */ sw $t4, 0x0014($sp) /* 05378 80954638 24A577F4 */ addiu $a1, $a1, 0x77F4 ## $a1 = 060177F4 -/* 0537C 8095463C 8FA4003C */ lw $a0, 0x003C($sp) -/* 05380 80954640 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 0537C 8095463C 8FA4003C */ lw $a0, 0x003C($sp) +/* 05380 80954640 E7B00010 */ swc1 $f16, 0x0010($sp) /* 05384 80954644 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05388 80954648 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0538C 8095464C E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 0538C 8095464C E7A00018 */ swc1 $f0, 0x0018($sp) /* 05390 80954650 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 /* 05394 80954654 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 05398 80954658 01A17024 */ and $t6, $t5, $at +/* 05398 80954658 01A17024 */ and $t6, $t5, $at /* 0539C 8095465C AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 .L80954660: /* 053A0 80954660 8E0F0198 */ lw $t7, 0x0198($s0) ## 00000198 /* 053A4 80954664 3C188096 */ lui $t8, %hi(D_809668D2) ## $t8 = 80960000 -/* 053A8 80954668 15E00014 */ bne $t7, $zero, .L809546BC +/* 053A8 80954668 15E00014 */ bne $t7, $zero, .L809546BC /* 053AC 8095466C 00000000 */ nop -/* 053B0 80954670 831868D2 */ lb $t8, %lo(D_809668D2)($t8) -/* 053B4 80954674 2B01000E */ slti $at, $t8, 0x000E -/* 053B8 80954678 10200010 */ beq $at, $zero, .L809546BC +/* 053B0 80954670 831868D2 */ lb $t8, %lo(D_809668D2)($t8) +/* 053B4 80954674 2B01000E */ slti $at, $t8, 0x000E +/* 053B8 80954678 10200010 */ beq $at, $zero, .L809546BC /* 053BC 8095467C 00000000 */ nop /* 053C0 80954680 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -158,44 +158,44 @@ glabel func_80954454 /* 053CC 8095468C 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 053D0 80954690 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 053D4 80954694 860601F6 */ lh $a2, 0x01F6($s0) ## 000001F6 -/* 053D8 80954698 46120102 */ mul.s $f4, $f0, $f18 +/* 053D8 80954698 46120102 */ mul.s $f4, $f0, $f18 /* 053DC 8095469C 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 053E0 809546A0 4600218D */ trunc.w.s $f6, $f4 -/* 053E4 809546A4 44083000 */ mfc1 $t0, $f6 +/* 053E0 809546A0 4600218D */ trunc.w.s $f6, $f4 +/* 053E4 809546A4 44083000 */ mfc1 $t0, $f6 /* 053E8 809546A8 00000000 */ nop /* 053EC 809546AC 2509000A */ addiu $t1, $t0, 0x000A ## $t1 = 0000000A /* 053F0 809546B0 AE090198 */ sw $t1, 0x0198($s0) ## 00000198 -/* 053F4 809546B4 0C253D43 */ jal func_8094F50C -/* 053F8 809546B8 8FA40054 */ lw $a0, 0x0054($sp) +/* 053F4 809546B4 0C253D43 */ jal func_8094F50C +/* 053F8 809546B8 8FA40054 */ lw $a0, 0x0054($sp) .L809546BC: /* 053FC 809546BC 3C028096 */ lui $v0, %hi(D_809668D2) ## $v0 = 80960000 -/* 05400 809546C0 804268D2 */ lb $v0, %lo(D_809668D2)($v0) +/* 05400 809546C0 804268D2 */ lb $v0, %lo(D_809668D2)($v0) /* 05404 809546C4 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 /* 05408 809546C8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0540C 809546CC 2841000E */ slti $at, $v0, 0x000E -/* 05410 809546D0 14200009 */ bne $at, $zero, .L809546F8 +/* 0540C 809546CC 2841000E */ slti $at, $v0, 0x000E +/* 05410 809546D0 14200009 */ bne $at, $zero, .L809546F8 /* 05414 809546D4 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 05418 809546D8 3C013E00 */ lui $at, 0x3E00 ## $at = 3E000000 /* 0541C 809546DC 44814000 */ mtc1 $at, $f8 ## $f8 = 0.12 /* 05420 809546E0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 05424 809546E4 3C073E80 */ lui $a3, 0x3E80 ## $a3 = 3E800000 /* 05428 809546E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0542C 809546EC E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 0542C 809546EC E7A80010 */ swc1 $f8, 0x0010($sp) /* 05430 809546F0 3C028096 */ lui $v0, %hi(D_809668D2) ## $v0 = 80960000 -/* 05434 809546F4 804268D2 */ lb $v0, %lo(D_809668D2)($v0) +/* 05434 809546F4 804268D2 */ lb $v0, %lo(D_809668D2)($v0) .L809546F8: /* 05438 809546F8 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 0543C 809546FC 1041000A */ beq $v0, $at, .L80954728 +/* 0543C 809546FC 1041000A */ beq $v0, $at, .L80954728 /* 05440 80954700 3C048096 */ lui $a0, %hi(D_809668D8) ## $a0 = 80960000 /* 05444 80954704 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 05448 80954708 10410035 */ beq $v0, $at, .L809547E0 +/* 05448 80954708 10410035 */ beq $v0, $at, .L809547E0 /* 0544C 8095470C 24010015 */ addiu $at, $zero, 0x0015 ## $at = 00000015 -/* 05450 80954710 10410033 */ beq $v0, $at, .L809547E0 +/* 05450 80954710 10410033 */ beq $v0, $at, .L809547E0 /* 05454 80954714 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 -/* 05458 80954718 50410032 */ beql $v0, $at, .L809547E4 +/* 05458 80954718 50410032 */ beql $v0, $at, .L809547E4 /* 0545C 8095471C 92080195 */ lbu $t0, 0x0195($s0) ## 00000195 -/* 05460 80954720 10000079 */ beq $zero, $zero, .L80954908 +/* 05460 80954720 10000079 */ beq $zero, $zero, .L80954908 /* 05464 80954724 8E020198 */ lw $v0, 0x0198($s0) ## 00000198 .L80954728: /* 05468 80954728 3C0A8096 */ lui $t2, %hi(D_809668F8) ## $t2 = 80960000 @@ -222,18 +222,18 @@ glabel func_80954454 /* 054BC 8095477C ADAF0008 */ sw $t7, 0x0008($t5) ## 809668F0 /* 054C0 80954780 8C450000 */ lw $a1, 0x0000($v0) ## 80966908 /* 054C4 80954784 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 054C8 80954788 E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 054C8 80954788 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 054CC 8095478C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 054D0 80954790 3C048096 */ lui $a0, %hi(D_809668E0) ## $a0 = 80960000 /* 054D4 80954794 3C058096 */ lui $a1, %hi(D_80966910) ## $a1 = 80960000 -/* 054D8 80954798 8CA56910 */ lw $a1, %lo(D_80966910)($a1) +/* 054D8 80954798 8CA56910 */ lw $a1, %lo(D_80966910)($a1) /* 054DC 8095479C 248468E0 */ addiu $a0, $a0, %lo(D_809668E0) ## $a0 = 809668E0 /* 054E0 809547A0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 054E4 809547A4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 054E8 809547A8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 054EC 809547AC E7B00010 */ swc1 $f16, 0x0010($sp) + +/* 054EC 809547AC E7B00010 */ swc1 $f16, 0x0010($sp) /* 054F0 809547B0 3C028096 */ lui $v0, %hi(D_809668D8) ## $v0 = 80960000 /* 054F4 809547B4 244268D8 */ addiu $v0, $v0, %lo(D_809668D8) ## $v0 = 809668D8 /* 054F8 809547B8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -241,53 +241,53 @@ glabel func_80954454 /* 05500 809547C0 C4520004 */ lwc1 $f18, 0x0004($v0) ## 809668DC /* 05504 809547C4 3C188096 */ lui $t8, %hi(D_809668D2) ## $t8 = 80960000 /* 05508 809547C8 3C018096 */ lui $at, %hi(D_809668D2) ## $at = 80960000 -/* 0550C 809547CC 46049180 */ add.s $f6, $f18, $f4 +/* 0550C 809547CC 46049180 */ add.s $f6, $f18, $f4 /* 05510 809547D0 E4460004 */ swc1 $f6, 0x0004($v0) ## 809668DC -/* 05514 809547D4 831868D2 */ lb $t8, %lo(D_809668D2)($t8) +/* 05514 809547D4 831868D2 */ lb $t8, %lo(D_809668D2)($t8) /* 05518 809547D8 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 80960001 -/* 0551C 809547DC A03968D2 */ sb $t9, %lo(D_809668D2)($at) +/* 0551C 809547DC A03968D2 */ sb $t9, %lo(D_809668D2)($at) .L809547E0: /* 05520 809547E0 92080195 */ lbu $t0, 0x0195($s0) ## 00000195 .L809547E4: -/* 05524 809547E4 8FA90054 */ lw $t1, 0x0054($sp) +/* 05524 809547E4 8FA90054 */ lw $t1, 0x0054($sp) /* 05528 809547E8 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 0552C 809547EC 1500003D */ bne $t0, $zero, .L809548E4 -/* 05530 809547F0 01495021 */ addu $t2, $t2, $t1 +/* 0552C 809547EC 1500003D */ bne $t0, $zero, .L809548E4 +/* 05530 809547F0 01495021 */ addu $t2, $t2, $t1 /* 05534 809547F4 8D4A1DE4 */ lw $t2, 0x1DE4($t2) ## 00011DE4 /* 05538 809547F8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0553C 809547FC 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 05540 80954800 51600020 */ beql $t3, $zero, .L80954884 +/* 05540 80954800 51600020 */ beql $t3, $zero, .L80954884 /* 05544 80954804 8608019C */ lh $t0, 0x019C($s0) ## 0000019C /* 05548 80954808 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 0554C 8095480C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 05550 80954810 00000000 */ nop /* 05554 80954814 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 05558 80954818 44815000 */ mtc1 $at, $f10 ## $f10 = 7.00 /* 0555C 8095481C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 05560 80954820 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 05564 80954824 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 05568 80954828 AFAD0018 */ sw $t5, 0x0018($sp) -/* 0556C 8095482C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 05570 80954830 E7B00014 */ swc1 $f16, 0x0014($sp) +/* 05568 80954828 AFAD0018 */ sw $t5, 0x0018($sp) +/* 0556C 8095482C E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 05570 80954830 E7B00014 */ swc1 $f16, 0x0014($sp) /* 05574 80954834 860E019C */ lh $t6, 0x019C($s0) ## 0000019C -/* 05578 80954838 4600020D */ trunc.w.s $f8, $f0 +/* 05578 80954838 4600020D */ trunc.w.s $f8, $f0 /* 0557C 8095483C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 05580 80954840 000E78C3 */ sra $t7, $t6, 3 +/* 05580 80954840 000E78C3 */ sra $t7, $t6, 3 /* 05584 80954844 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 /* 05588 80954848 44989000 */ mtc1 $t8, $f18 ## $f18 = 0.00 -/* 0558C 8095484C 44074000 */ mfc1 $a3, $f8 -/* 05590 80954850 AFB90020 */ sw $t9, 0x0020($sp) -/* 05594 80954854 46809120 */ cvt.s.w $f4, $f18 -/* 05598 80954858 00073C00 */ sll $a3, $a3, 16 -/* 0559C 8095485C 00073C03 */ sra $a3, $a3, 16 +/* 0558C 8095484C 44074000 */ mfc1 $a3, $f8 +/* 05590 80954850 AFB90020 */ sw $t9, 0x0020($sp) +/* 05594 80954854 46809120 */ cvt.s.w $f4, $f18 +/* 05598 80954858 00073C00 */ sll $a3, $a3, 16 +/* 0559C 8095485C 00073C03 */ sra $a3, $a3, 16 /* 055A0 80954860 24E70006 */ addiu $a3, $a3, 0x0006 ## $a3 = 00000006 -/* 055A4 80954864 00073C00 */ sll $a3, $a3, 16 -/* 055A8 80954868 00073C03 */ sra $a3, $a3, 16 -/* 055AC 8095486C E7A4001C */ swc1 $f4, 0x001C($sp) -/* 055B0 80954870 8FA40054 */ lw $a0, 0x0054($sp) +/* 055A4 80954864 00073C00 */ sll $a3, $a3, 16 +/* 055A8 80954868 00073C03 */ sra $a3, $a3, 16 +/* 055AC 8095486C E7A4001C */ swc1 $f4, 0x001C($sp) +/* 055B0 80954870 8FA40054 */ lw $a0, 0x0054($sp) /* 055B4 80954874 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 055B8 80954878 0C253E7A */ jal func_8094F9E8 +/* 055B8 80954878 0C253E7A */ jal func_8094F9E8 /* 055BC 8095487C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 055C0 80954880 8608019C */ lh $t0, 0x019C($s0) ## 0000019C .L80954884: @@ -296,45 +296,45 @@ glabel func_80954454 /* 055CC 8095488C 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 /* 055D0 80954890 A609019C */ sh $t1, 0x019C($s0) ## 0000019C /* 055D4 80954894 860A019C */ lh $t2, 0x019C($s0) ## 0000019C -/* 055D8 80954898 29410020 */ slti $at, $t2, 0x0020 -/* 055DC 8095489C 5420001A */ bnel $at, $zero, .L80954908 +/* 055D8 80954898 29410020 */ slti $at, $t2, 0x0020 +/* 055DC 8095489C 5420001A */ bnel $at, $zero, .L80954908 /* 055E0 809548A0 8E020198 */ lw $v0, 0x0198($s0) ## 00000198 /* 055E4 809548A4 920B0195 */ lbu $t3, 0x0195($s0) ## 00000195 /* 055E8 809548A8 A20D0197 */ sb $t5, 0x0197($s0) ## 00000197 /* 055EC 809548AC 24053945 */ addiu $a1, $zero, 0x3945 ## $a1 = 00003945 /* 055F0 809548B0 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 /* 055F4 809548B4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 055F8 809548B8 A20C0195 */ sb $t4, 0x0195($s0) ## 00000195 /* 055FC 809548BC 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 05600 809548C0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 05604 809548C4 3C0F8096 */ lui $t7, %hi(D_809668D2) ## $t7 = 80960000 -/* 05608 809548C8 55C1000F */ bnel $t6, $at, .L80954908 +/* 05608 809548C8 55C1000F */ bnel $t6, $at, .L80954908 /* 0560C 809548CC 8E020198 */ lw $v0, 0x0198($s0) ## 00000198 -/* 05610 809548D0 81EF68D2 */ lb $t7, %lo(D_809668D2)($t7) +/* 05610 809548D0 81EF68D2 */ lb $t7, %lo(D_809668D2)($t7) /* 05614 809548D4 3C018096 */ lui $at, %hi(D_809668D2) ## $at = 80960000 /* 05618 809548D8 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 80960001 -/* 0561C 809548DC 10000009 */ beq $zero, $zero, .L80954904 -/* 05620 809548E0 A03868D2 */ sb $t8, %lo(D_809668D2)($at) +/* 0561C 809548DC 10000009 */ beq $zero, $zero, .L80954904 +/* 05620 809548E0 A03868D2 */ sb $t8, %lo(D_809668D2)($at) .L809548E4: /* 05624 809548E4 8619019C */ lh $t9, 0x019C($s0) ## 0000019C /* 05628 809548E8 2728FFFF */ addiu $t0, $t9, 0xFFFF ## $t0 = FFFFFFFF /* 0562C 809548EC A608019C */ sh $t0, 0x019C($s0) ## 0000019C /* 05630 809548F0 8609019C */ lh $t1, 0x019C($s0) ## 0000019C -/* 05634 809548F4 55200004 */ bnel $t1, $zero, .L80954908 +/* 05634 809548F4 55200004 */ bnel $t1, $zero, .L80954908 /* 05638 809548F8 8E020198 */ lw $v0, 0x0198($s0) ## 00000198 /* 0563C 809548FC 0C00B55C */ jal Actor_Kill - + /* 05640 80954900 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80954904: /* 05644 80954904 8E020198 */ lw $v0, 0x0198($s0) ## 00000198 .L80954908: /* 05648 80954908 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF /* 0564C 8095490C AE0A0198 */ sw $t2, 0x0198($s0) ## 00000198 -/* 05650 80954910 8FBF0034 */ lw $ra, 0x0034($sp) -/* 05654 80954914 8FB00030 */ lw $s0, 0x0030($sp) +/* 05650 80954910 8FBF0034 */ lw $ra, 0x0034($sp) +/* 05654 80954914 8FB00030 */ lw $s0, 0x0030($sp) /* 05658 80954918 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 0565C 8095491C 03E00008 */ jr $ra +/* 0565C 8095491C 03E00008 */ jr $ra /* 05660 80954920 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s index 98689fbb53..2e96d772a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s @@ -1,11 +1,11 @@ glabel DemoDu_Destroy /* 00000 80969AD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80969AD4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80969AD8 0C0295BC */ jal func_800A56F0 +/* 00004 80969AD4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00008 80969AD8 0C0295BC */ jal SkelAnime_Free /* 0000C 80969ADC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 80969AE0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00010 80969AE0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00014 80969AE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 80969AE8 03E00008 */ jr $ra +/* 00018 80969AE8 03E00008 */ jr $ra /* 0001C 80969AEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s index 222617d943..4a0b5382b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s @@ -1,31 +1,31 @@ glabel func_80969E6C /* 0039C 80969E6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003A0 80969E70 AFA40028 */ sw $a0, 0x0028($sp) -/* 003A4 80969E74 AFA5002C */ sw $a1, 0x002C($sp) +/* 003A0 80969E70 AFA40028 */ sw $a0, 0x0028($sp) +/* 003A4 80969E74 AFA5002C */ sw $a1, 0x002C($sp) /* 003A8 80969E78 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003AC 80969E7C 8FA50028 */ lw $a1, 0x0028($sp) -/* 003B0 80969E80 AFBF0024 */ sw $ra, 0x0024($sp) +/* 003AC 80969E7C 8FA50028 */ lw $a1, 0x0028($sp) +/* 003B0 80969E80 AFBF0024 */ sw $ra, 0x0024($sp) /* 003B4 80969E84 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 003B8 80969E88 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 003BC 80969E8C 24E76EB0 */ addiu $a3, $a3, 0x6EB0 ## $a3 = 06006EB0 /* 003C0 80969E90 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 -/* 003C4 80969E94 AFA00010 */ sw $zero, 0x0010($sp) -/* 003C8 80969E98 AFA00014 */ sw $zero, 0x0014($sp) -/* 003CC 80969E9C AFA00018 */ sw $zero, 0x0018($sp) -/* 003D0 80969EA0 0C0291BE */ jal func_800A46F8 +/* 003C4 80969E94 AFA00010 */ sw $zero, 0x0010($sp) +/* 003C8 80969E98 AFA00014 */ sw $zero, 0x0014($sp) +/* 003CC 80969E9C AFA00018 */ sw $zero, 0x0018($sp) +/* 003D0 80969EA0 0C0291BE */ jal SkelAnime_InitSV /* 003D4 80969EA4 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C /* 003D8 80969EA8 3C018097 */ lui $at, %hi(D_8096D0E8) ## $at = 80970000 -/* 003DC 80969EAC 8FA40028 */ lw $a0, 0x0028($sp) -/* 003E0 80969EB0 C424D0E8 */ lwc1 $f4, %lo(D_8096D0E8)($at) +/* 003DC 80969EAC 8FA40028 */ lw $a0, 0x0028($sp) +/* 003E0 80969EB0 C424D0E8 */ lwc1 $f4, %lo(D_8096D0E8)($at) /* 003E4 80969EB4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 003E8 80969EB8 0C25A6DE */ jal func_80969B78 +/* 003E8 80969EB8 0C25A6DE */ jal func_80969B78 /* 003EC 80969EBC E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC -/* 003F0 80969EC0 8FA40028 */ lw $a0, 0x0028($sp) -/* 003F4 80969EC4 0C25A6E3 */ jal func_80969B8C +/* 003F0 80969EC0 8FA40028 */ lw $a0, 0x0028($sp) +/* 003F4 80969EC4 0C25A6E3 */ jal func_80969B8C /* 003F8 80969EC8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 003FC 80969ECC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 003FC 80969ECC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00400 80969ED0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00404 80969ED4 03E00008 */ jr $ra +/* 00404 80969ED4 03E00008 */ jr $ra /* 00408 80969ED8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s index 03b1daae8e..ec4a48b864 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s @@ -1,24 +1,24 @@ glabel func_8096A360 /* 00890 8096A360 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00894 8096A364 AFA40028 */ sw $a0, 0x0028($sp) -/* 00898 8096A368 AFA5002C */ sw $a1, 0x002C($sp) +/* 00894 8096A364 AFA40028 */ sw $a0, 0x0028($sp) +/* 00898 8096A368 AFA5002C */ sw $a1, 0x002C($sp) /* 0089C 8096A36C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 008A0 8096A370 8FA50028 */ lw $a1, 0x0028($sp) -/* 008A4 8096A374 AFBF0024 */ sw $ra, 0x0024($sp) +/* 008A0 8096A370 8FA50028 */ lw $a1, 0x0028($sp) +/* 008A4 8096A374 AFBF0024 */ sw $ra, 0x0024($sp) /* 008A8 8096A378 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 008AC 8096A37C 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 -/* 008B0 8096A380 AFA00010 */ sw $zero, 0x0010($sp) -/* 008B4 8096A384 AFA00014 */ sw $zero, 0x0014($sp) -/* 008B8 8096A388 AFA00018 */ sw $zero, 0x0018($sp) +/* 008B0 8096A380 AFA00010 */ sw $zero, 0x0010($sp) +/* 008B4 8096A384 AFA00014 */ sw $zero, 0x0014($sp) +/* 008B8 8096A388 AFA00018 */ sw $zero, 0x0018($sp) /* 008BC 8096A38C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008C0 8096A390 0C0291BE */ jal func_800A46F8 +/* 008C0 8096A390 0C0291BE */ jal SkelAnime_InitSV /* 008C4 8096A394 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 008C8 8096A398 8FAF0028 */ lw $t7, 0x0028($sp) +/* 008C8 8096A398 8FAF0028 */ lw $t7, 0x0028($sp) /* 008CC 8096A39C 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 /* 008D0 8096A3A0 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -/* 008D4 8096A3A4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 008D4 8096A3A4 8FBF0024 */ lw $ra, 0x0024($sp) /* 008D8 8096A3A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 008DC 8096A3AC 03E00008 */ jr $ra +/* 008DC 8096A3AC 03E00008 */ jr $ra /* 008E0 8096A3B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s index 510a50375c..592008f9d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s @@ -1,46 +1,46 @@ glabel func_8096B3E4 /* 01914 8096B3E4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01918 8096B3E8 AFA40040 */ sw $a0, 0x0040($sp) -/* 0191C 8096B3EC AFBF0024 */ sw $ra, 0x0024($sp) +/* 01918 8096B3E8 AFA40040 */ sw $a0, 0x0040($sp) +/* 0191C 8096B3EC AFBF0024 */ sw $ra, 0x0024($sp) /* 01920 8096B3F0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01924 8096B3F4 AFA50044 */ sw $a1, 0x0044($sp) +/* 01924 8096B3F4 AFA50044 */ sw $a1, 0x0044($sp) /* 01928 8096B3F8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0192C 8096B3FC 24842014 */ addiu $a0, $a0, 0x2014 ## $a0 = 06012014 /* 01930 8096B400 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01934 8096B404 8FA50040 */ lw $a1, 0x0040($sp) +/* 01934 8096B404 8FA50040 */ lw $a1, 0x0040($sp) /* 01938 8096B408 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0193C 8096B40C 468021A0 */ cvt.s.w $f6, $f4 +/* 0193C 8096B40C 468021A0 */ cvt.s.w $f6, $f4 /* 01940 8096B410 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 01944 8096B414 AFA5002C */ sw $a1, 0x002C($sp) +/* 01944 8096B414 AFA5002C */ sw $a1, 0x002C($sp) /* 01948 8096B418 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 -/* 0194C 8096B41C 8FA40044 */ lw $a0, 0x0044($sp) +/* 0194C 8096B41C 8FA40044 */ lw $a0, 0x0044($sp) /* 01950 8096B420 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01954 8096B424 E7A60030 */ swc1 $f6, 0x0030($sp) -/* 01958 8096B428 AFA00010 */ sw $zero, 0x0010($sp) -/* 0195C 8096B42C AFA00014 */ sw $zero, 0x0014($sp) -/* 01960 8096B430 0C0291BE */ jal func_800A46F8 -/* 01964 8096B434 AFA00018 */ sw $zero, 0x0018($sp) +/* 01954 8096B424 E7A60030 */ swc1 $f6, 0x0030($sp) +/* 01958 8096B428 AFA00010 */ sw $zero, 0x0010($sp) +/* 0195C 8096B42C AFA00014 */ sw $zero, 0x0014($sp) +/* 01960 8096B430 0C0291BE */ jal SkelAnime_InitSV +/* 01964 8096B434 AFA00018 */ sw $zero, 0x0018($sp) /* 01968 8096B438 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0196C 8096B43C C7A80030 */ lwc1 $f8, 0x0030($sp) +/* 0196C 8096B43C C7A80030 */ lwc1 $f8, 0x0030($sp) /* 01970 8096B440 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01974 8096B444 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01978 8096B448 44070000 */ mfc1 $a3, $f0 -/* 0197C 8096B44C AFAE0014 */ sw $t6, 0x0014($sp) +/* 01978 8096B448 44070000 */ mfc1 $a3, $f0 +/* 0197C 8096B44C AFAE0014 */ sw $t6, 0x0014($sp) /* 01980 8096B450 24A52014 */ addiu $a1, $a1, 0x2014 ## $a1 = 06012014 -/* 01984 8096B454 8FA4002C */ lw $a0, 0x002C($sp) +/* 01984 8096B454 8FA4002C */ lw $a0, 0x002C($sp) /* 01988 8096B458 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0198C 8096B45C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0198C 8096B45C E7A80010 */ swc1 $f8, 0x0010($sp) /* 01990 8096B460 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01994 8096B464 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01998 8096B468 8FA20040 */ lw $v0, 0x0040($sp) + +/* 01994 8096B464 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01998 8096B468 8FA20040 */ lw $v0, 0x0040($sp) /* 0199C 8096B46C 240F0015 */ addiu $t7, $zero, 0x0015 ## $t7 = 00000015 /* 019A0 8096B470 AC4F0198 */ sw $t7, 0x0198($v0) ## 00000198 /* 019A4 8096B474 A04000C8 */ sb $zero, 0x00C8($v0) ## 000000C8 -/* 019A8 8096B478 8FBF0024 */ lw $ra, 0x0024($sp) +/* 019A8 8096B478 8FBF0024 */ lw $ra, 0x0024($sp) /* 019AC 8096B47C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 019B0 8096B480 03E00008 */ jr $ra +/* 019B0 8096B480 03E00008 */ jr $ra /* 019B4 8096B484 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s index 9f5e8d1a53..8fcb2ef9cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s @@ -1,88 +1,88 @@ glabel func_8096B840 /* 01D70 8096B840 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 01D74 8096B844 AFBF002C */ sw $ra, 0x002C($sp) -/* 01D78 8096B848 AFB00028 */ sw $s0, 0x0028($sp) -/* 01D7C 8096B84C AFA40080 */ sw $a0, 0x0080($sp) -/* 01D80 8096B850 AFA50084 */ sw $a1, 0x0084($sp) +/* 01D74 8096B844 AFBF002C */ sw $ra, 0x002C($sp) +/* 01D78 8096B848 AFB00028 */ sw $s0, 0x0028($sp) +/* 01D7C 8096B84C AFA40080 */ sw $a0, 0x0080($sp) +/* 01D80 8096B850 AFA50084 */ sw $a1, 0x0084($sp) /* 01D84 8096B854 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 01D88 8096B858 3C188097 */ lui $t8, %hi(D_8096CE74) ## $t8 = 80970000 /* 01D8C 8096B85C 3C098097 */ lui $t1, %hi(D_8096CE84) ## $t1 = 80970000 -/* 01D90 8096B860 00027880 */ sll $t7, $v0, 2 -/* 01D94 8096B864 030FC021 */ addu $t8, $t8, $t7 -/* 01D98 8096B868 8F18CE74 */ lw $t8, %lo(D_8096CE74)($t8) +/* 01D90 8096B860 00027880 */ sll $t7, $v0, 2 +/* 01D94 8096B864 030FC021 */ addu $t8, $t8, $t7 +/* 01D98 8096B868 8F18CE74 */ lw $t8, %lo(D_8096CE74)($t8) /* 01D9C 8096B86C 3C068097 */ lui $a2, %hi(D_8096CFD0) ## $a2 = 80970000 /* 01DA0 8096B870 24C6CFD0 */ addiu $a2, $a2, %lo(D_8096CFD0) ## $a2 = 8096CFD0 -/* 01DA4 8096B874 AFB80070 */ sw $t8, 0x0070($sp) +/* 01DA4 8096B874 AFB80070 */ sw $t8, 0x0070($sp) /* 01DA8 8096B878 84830194 */ lh $v1, 0x0194($a0) ## 00000194 /* 01DAC 8096B87C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC /* 01DB0 8096B880 24070113 */ addiu $a3, $zero, 0x0113 ## $a3 = 00000113 -/* 01DB4 8096B884 0003C880 */ sll $t9, $v1, 2 -/* 01DB8 8096B888 01394821 */ addu $t1, $t1, $t9 -/* 01DBC 8096B88C 8D29CE84 */ lw $t1, %lo(D_8096CE84)($t1) -/* 01DC0 8096B890 AFA90064 */ sw $t1, 0x0064($sp) +/* 01DB4 8096B884 0003C880 */ sll $t9, $v1, 2 +/* 01DB8 8096B888 01394821 */ addu $t1, $t1, $t9 +/* 01DBC 8096B88C 8D29CE84 */ lw $t1, %lo(D_8096CE84)($t1) +/* 01DC0 8096B890 AFA90064 */ sw $t1, 0x0064($sp) /* 01DC4 8096B894 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01DC8 8096B898 0C031AB1 */ jal func_800C6AC4 +/* 01DC8 8096B898 0C031AB1 */ jal func_800C6AC4 /* 01DCC 8096B89C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01DD0 8096B8A0 8FAB0084 */ lw $t3, 0x0084($sp) -/* 01DD4 8096B8A4 0C024F61 */ jal func_80093D84 +/* 01DD0 8096B8A0 8FAB0084 */ lw $t3, 0x0084($sp) +/* 01DD4 8096B8A4 0C024F61 */ jal func_80093D84 /* 01DD8 8096B8A8 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 01DDC 8096B8AC 8FA40070 */ lw $a0, 0x0070($sp) +/* 01DDC 8096B8AC 8FA40070 */ lw $a0, 0x0070($sp) /* 01DE0 8096B8B0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01DE4 8096B8B4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 01DE8 8096B8B8 00047900 */ sll $t7, $a0, 4 -/* 01DEC 8096B8BC 000FC702 */ srl $t8, $t7, 28 +/* 01DE8 8096B8B8 00047900 */ sll $t7, $a0, 4 +/* 01DEC 8096B8BC 000FC702 */ srl $t8, $t7, 28 /* 01DF0 8096B8C0 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01DF4 8096B8C4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 01DF8 8096B8C8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 01DFC 8096B8CC 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 01E00 8096B8D0 00187080 */ sll $t6, $t8, 2 +/* 01E00 8096B8D0 00187080 */ sll $t6, $t8, 2 /* 01E04 8096B8D4 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 -/* 01E08 8096B8D8 00AEC821 */ addu $t9, $a1, $t6 +/* 01E08 8096B8D8 00AEC821 */ addu $t9, $a1, $t6 /* 01E0C 8096B8DC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01E10 8096B8E0 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 /* 01E14 8096B8E4 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 /* 01E18 8096B8E8 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 01E1C 8096B8EC 00865024 */ and $t2, $a0, $a2 +/* 01E1C 8096B8EC 00865024 */ and $t2, $a0, $a2 /* 01E20 8096B8F0 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01E24 8096B8F4 012A5821 */ addu $t3, $t1, $t2 -/* 01E28 8096B8F8 01676021 */ addu $t4, $t3, $a3 +/* 01E24 8096B8F4 012A5821 */ addu $t3, $t1, $t2 +/* 01E28 8096B8F8 01676021 */ addu $t4, $t3, $a3 /* 01E2C 8096B8FC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 01E30 8096B900 8FA40064 */ lw $a0, 0x0064($sp) +/* 01E30 8096B900 8FA40064 */ lw $a0, 0x0064($sp) /* 01E34 8096B904 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01E38 8096B908 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 01E3C 8096B90C 0004C100 */ sll $t8, $a0, 4 -/* 01E40 8096B910 00187702 */ srl $t6, $t8, 28 +/* 01E3C 8096B90C 0004C100 */ sll $t8, $a0, 4 +/* 01E40 8096B910 00187702 */ srl $t6, $t8, 28 /* 01E44 8096B914 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01E48 8096B918 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 01E4C 8096B91C 000EC880 */ sll $t9, $t6, 2 +/* 01E4C 8096B91C 000EC880 */ sll $t9, $t6, 2 /* 01E50 8096B920 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 01E54 8096B924 00B94821 */ addu $t1, $a1, $t9 +/* 01E54 8096B924 00B94821 */ addu $t1, $a1, $t9 /* 01E58 8096B928 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 01E5C 8096B92C 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 01E60 8096B930 00865824 */ and $t3, $a0, $a2 +/* 01E60 8096B930 00865824 */ and $t3, $a0, $a2 /* 01E64 8096B934 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01E68 8096B938 014B6021 */ addu $t4, $t2, $t3 -/* 01E6C 8096B93C 01876821 */ addu $t5, $t4, $a3 +/* 01E68 8096B938 014B6021 */ addu $t4, $t2, $t3 +/* 01E6C 8096B93C 01876821 */ addu $t5, $t4, $a3 /* 01E70 8096B940 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 01E74 8096B944 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01E78 8096B948 24847FC0 */ addiu $a0, $a0, 0x7FC0 ## $a0 = 06007FC0 -/* 01E7C 8096B94C 00047100 */ sll $t6, $a0, 4 -/* 01E80 8096B950 000ECF02 */ srl $t9, $t6, 28 +/* 01E7C 8096B94C 00047100 */ sll $t6, $a0, 4 +/* 01E80 8096B950 000ECF02 */ srl $t9, $t6, 28 /* 01E84 8096B954 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01E88 8096B958 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01E8C 8096B95C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 01E90 8096B960 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 01E94 8096B964 00194880 */ sll $t1, $t9, 2 -/* 01E98 8096B968 00A95021 */ addu $t2, $a1, $t1 +/* 01E94 8096B964 00194880 */ sll $t1, $t9, 2 +/* 01E98 8096B968 00A95021 */ addu $t2, $a1, $t1 /* 01E9C 8096B96C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01EA0 8096B970 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 -/* 01EA4 8096B974 00866024 */ and $t4, $a0, $a2 +/* 01EA4 8096B974 00866024 */ and $t4, $a0, $a2 /* 01EA8 8096B978 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 01EAC 8096B97C 016C6821 */ addu $t5, $t3, $t4 -/* 01EB0 8096B980 01A77821 */ addu $t7, $t5, $a3 +/* 01EAC 8096B97C 016C6821 */ addu $t5, $t3, $t4 +/* 01EB0 8096B980 01A77821 */ addu $t7, $t5, $a3 /* 01EB4 8096B984 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01EB8 8096B988 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01EBC 8096B98C 8FA80080 */ lw $t0, 0x0080($sp) +/* 01EBC 8096B98C 8FA80080 */ lw $t0, 0x0080($sp) /* 01EC0 8096B990 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 /* 01EC4 8096B994 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01EC8 8096B998 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 @@ -102,25 +102,25 @@ glabel func_8096B840 /* 01F00 8096B9D0 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 01F04 8096B9D4 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 01F08 8096B9D8 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01F0C 8096B9DC AFA00018 */ sw $zero, 0x0018($sp) -/* 01F10 8096B9E0 AFA00014 */ sw $zero, 0x0014($sp) -/* 01F14 8096B9E4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01F0C 8096B9DC AFA00018 */ sw $zero, 0x0018($sp) +/* 01F10 8096B9E0 AFA00014 */ sw $zero, 0x0014($sp) +/* 01F14 8096B9E4 AFA00010 */ sw $zero, 0x0010($sp) /* 01F18 8096B9E8 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 01F1C 8096B9EC 8FA40084 */ lw $a0, 0x0084($sp) -/* 01F20 8096B9F0 0C0289CF */ jal func_800A273C -/* 01F24 8096B9F4 AFAD001C */ sw $t5, 0x001C($sp) +/* 01F1C 8096B9EC 8FA40084 */ lw $a0, 0x0084($sp) +/* 01F20 8096B9F0 0C0289CF */ jal SkelAnime_DrawSV2 +/* 01F24 8096B9F4 AFAD001C */ sw $t5, 0x001C($sp) /* 01F28 8096B9F8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 01F2C 8096B9FC 8FAF0084 */ lw $t7, 0x0084($sp) +/* 01F2C 8096B9FC 8FAF0084 */ lw $t7, 0x0084($sp) /* 01F30 8096BA00 3C068097 */ lui $a2, %hi(D_8096CFF4) ## $a2 = 80970000 /* 01F34 8096BA04 24C6CFF4 */ addiu $a2, $a2, %lo(D_8096CFF4) ## $a2 = 8096CFF4 /* 01F38 8096BA08 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC /* 01F3C 8096BA0C 24070130 */ addiu $a3, $zero, 0x0130 ## $a3 = 00000130 -/* 01F40 8096BA10 0C031AD5 */ jal func_800C6B54 +/* 01F40 8096BA10 0C031AD5 */ jal func_800C6B54 /* 01F44 8096BA14 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 01F48 8096BA18 8FBF002C */ lw $ra, 0x002C($sp) -/* 01F4C 8096BA1C 8FB00028 */ lw $s0, 0x0028($sp) +/* 01F48 8096BA18 8FBF002C */ lw $ra, 0x002C($sp) +/* 01F4C 8096BA1C 8FB00028 */ lw $s0, 0x0028($sp) /* 01F50 8096BA20 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 01F54 8096BA24 03E00008 */ jr $ra +/* 01F54 8096BA24 03E00008 */ jr $ra /* 01F58 8096BA28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s index 1c83d3d572..1a75b22727 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s @@ -1,30 +1,30 @@ glabel func_8096BA2C /* 01F5C 8096BA2C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01F60 8096BA30 AFB00028 */ sw $s0, 0x0028($sp) +/* 01F60 8096BA30 AFB00028 */ sw $s0, 0x0028($sp) /* 01F64 8096BA34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F68 8096BA38 AFBF002C */ sw $ra, 0x002C($sp) -/* 01F6C 8096BA3C AFA50034 */ sw $a1, 0x0034($sp) +/* 01F68 8096BA38 AFBF002C */ sw $ra, 0x002C($sp) +/* 01F6C 8096BA3C AFA50034 */ sw $a1, 0x0034($sp) /* 01F70 8096BA40 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01F74 8096BA44 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 01F78 8096BA48 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 01F7C 8096BA4C 24E767CC */ addiu $a3, $a3, 0x67CC ## $a3 = 060067CC /* 01F80 8096BA50 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 /* 01F84 8096BA54 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01F88 8096BA58 AFA00010 */ sw $zero, 0x0010($sp) -/* 01F8C 8096BA5C AFA00014 */ sw $zero, 0x0014($sp) -/* 01F90 8096BA60 0C0291BE */ jal func_800A46F8 -/* 01F94 8096BA64 AFA00018 */ sw $zero, 0x0018($sp) +/* 01F88 8096BA58 AFA00010 */ sw $zero, 0x0010($sp) +/* 01F8C 8096BA5C AFA00014 */ sw $zero, 0x0014($sp) +/* 01F90 8096BA60 0C0291BE */ jal SkelAnime_InitSV +/* 01F94 8096BA64 AFA00018 */ sw $zero, 0x0018($sp) /* 01F98 8096BA68 240E0018 */ addiu $t6, $zero, 0x0018 ## $t6 = 00000018 /* 01F9C 8096BA6C AE0E0198 */ sw $t6, 0x0198($s0) ## 00000198 /* 01FA0 8096BA70 AE00019C */ sw $zero, 0x019C($s0) ## 0000019C /* 01FA4 8096BA74 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 /* 01FA8 8096BA78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FAC 8096BA7C 0C25A6E3 */ jal func_80969B8C +/* 01FAC 8096BA7C 0C25A6E3 */ jal func_80969B8C /* 01FB0 8096BA80 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01FB4 8096BA84 8FBF002C */ lw $ra, 0x002C($sp) -/* 01FB8 8096BA88 8FB00028 */ lw $s0, 0x0028($sp) +/* 01FB4 8096BA84 8FBF002C */ lw $ra, 0x002C($sp) +/* 01FB8 8096BA88 8FB00028 */ lw $s0, 0x0028($sp) /* 01FBC 8096BA8C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01FC0 8096BA90 03E00008 */ jr $ra +/* 01FC0 8096BA90 03E00008 */ jr $ra /* 01FC4 8096BA94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s index 6099919b4b..958a629db6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s @@ -1,85 +1,85 @@ glabel func_8096BF60 /* 02490 8096BF60 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 02494 8096BF64 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02498 8096BF68 AFA40078 */ sw $a0, 0x0078($sp) -/* 0249C 8096BF6C AFA5007C */ sw $a1, 0x007C($sp) +/* 02494 8096BF64 AFBF0024 */ sw $ra, 0x0024($sp) +/* 02498 8096BF68 AFA40078 */ sw $a0, 0x0078($sp) +/* 0249C 8096BF6C AFA5007C */ sw $a1, 0x007C($sp) /* 024A0 8096BF70 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 024A4 8096BF74 3C188097 */ lui $t8, %hi(D_8096CE74) ## $t8 = 80970000 /* 024A8 8096BF78 3C098097 */ lui $t1, %hi(D_8096CE84) ## $t1 = 80970000 -/* 024AC 8096BF7C 00027880 */ sll $t7, $v0, 2 -/* 024B0 8096BF80 030FC021 */ addu $t8, $t8, $t7 -/* 024B4 8096BF84 8F18CE74 */ lw $t8, %lo(D_8096CE74)($t8) +/* 024AC 8096BF7C 00027880 */ sll $t7, $v0, 2 +/* 024B0 8096BF80 030FC021 */ addu $t8, $t8, $t7 +/* 024B4 8096BF84 8F18CE74 */ lw $t8, %lo(D_8096CE74)($t8) /* 024B8 8096BF88 3C068097 */ lui $a2, %hi(D_8096D090) ## $a2 = 80970000 /* 024BC 8096BF8C 24C6D090 */ addiu $a2, $a2, %lo(D_8096D090) ## $a2 = 8096D090 -/* 024C0 8096BF90 AFB80068 */ sw $t8, 0x0068($sp) +/* 024C0 8096BF90 AFB80068 */ sw $t8, 0x0068($sp) /* 024C4 8096BF94 84830194 */ lh $v1, 0x0194($a0) ## 00000194 /* 024C8 8096BF98 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFCC /* 024CC 8096BF9C 24070267 */ addiu $a3, $zero, 0x0267 ## $a3 = 00000267 -/* 024D0 8096BFA0 0003C880 */ sll $t9, $v1, 2 -/* 024D4 8096BFA4 01394821 */ addu $t1, $t1, $t9 -/* 024D8 8096BFA8 8D29CE84 */ lw $t1, %lo(D_8096CE84)($t1) -/* 024DC 8096BFAC AFA9005C */ sw $t1, 0x005C($sp) +/* 024D0 8096BFA0 0003C880 */ sll $t9, $v1, 2 +/* 024D4 8096BFA4 01394821 */ addu $t1, $t1, $t9 +/* 024D8 8096BFA8 8D29CE84 */ lw $t1, %lo(D_8096CE84)($t1) +/* 024DC 8096BFAC AFA9005C */ sw $t1, 0x005C($sp) /* 024E0 8096BFB0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 024E4 8096BFB4 0C031AB1 */ jal func_800C6AC4 -/* 024E8 8096BFB8 AFA50054 */ sw $a1, 0x0054($sp) -/* 024EC 8096BFBC 8FAB007C */ lw $t3, 0x007C($sp) -/* 024F0 8096BFC0 0C024F46 */ jal func_80093D18 +/* 024E4 8096BFB4 0C031AB1 */ jal func_800C6AC4 +/* 024E8 8096BFB8 AFA50054 */ sw $a1, 0x0054($sp) +/* 024EC 8096BFBC 8FAB007C */ lw $t3, 0x007C($sp) +/* 024F0 8096BFC0 0C024F46 */ jal func_80093D18 /* 024F4 8096BFC4 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 024F8 8096BFC8 8FA80054 */ lw $t0, 0x0054($sp) -/* 024FC 8096BFCC 8FA40068 */ lw $a0, 0x0068($sp) +/* 024F8 8096BFC8 8FA80054 */ lw $t0, 0x0054($sp) +/* 024FC 8096BFCC 8FA40068 */ lw $a0, 0x0068($sp) /* 02500 8096BFD0 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 02504 8096BFD4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02508 8096BFD8 00047900 */ sll $t7, $a0, 4 -/* 0250C 8096BFDC 000FC702 */ srl $t8, $t7, 28 +/* 02508 8096BFD8 00047900 */ sll $t7, $a0, 4 +/* 0250C 8096BFDC 000FC702 */ srl $t8, $t7, 28 /* 02510 8096BFE0 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 02514 8096BFE4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 02518 8096BFE8 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 0251C 8096BFEC 00187080 */ sll $t6, $t8, 2 +/* 0251C 8096BFEC 00187080 */ sll $t6, $t8, 2 /* 02520 8096BFF0 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 /* 02524 8096BFF4 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 -/* 02528 8096BFF8 00AEC821 */ addu $t9, $a1, $t6 +/* 02528 8096BFF8 00AEC821 */ addu $t9, $a1, $t6 /* 0252C 8096BFFC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 02530 8096C000 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 /* 02534 8096C004 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 /* 02538 8096C008 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 0253C 8096C00C 00865024 */ and $t2, $a0, $a2 +/* 0253C 8096C00C 00865024 */ and $t2, $a0, $a2 /* 02540 8096C010 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 02544 8096C014 012A5821 */ addu $t3, $t1, $t2 -/* 02548 8096C018 01676021 */ addu $t4, $t3, $a3 +/* 02544 8096C014 012A5821 */ addu $t3, $t1, $t2 +/* 02548 8096C018 01676021 */ addu $t4, $t3, $a3 /* 0254C 8096C01C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 02550 8096C020 8FA4005C */ lw $a0, 0x005C($sp) +/* 02550 8096C020 8FA4005C */ lw $a0, 0x005C($sp) /* 02554 8096C024 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02558 8096C028 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 0255C 8096C02C 0004C100 */ sll $t8, $a0, 4 -/* 02560 8096C030 00187702 */ srl $t6, $t8, 28 +/* 0255C 8096C02C 0004C100 */ sll $t8, $a0, 4 +/* 02560 8096C030 00187702 */ srl $t6, $t8, 28 /* 02564 8096C034 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 02568 8096C038 000EC880 */ sll $t9, $t6, 2 +/* 02568 8096C038 000EC880 */ sll $t9, $t6, 2 /* 0256C 8096C03C 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 /* 02570 8096C040 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 02574 8096C044 00B94821 */ addu $t1, $a1, $t9 +/* 02574 8096C044 00B94821 */ addu $t1, $a1, $t9 /* 02578 8096C048 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0257C 8096C04C 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 02580 8096C050 00865824 */ and $t3, $a0, $a2 +/* 02580 8096C050 00865824 */ and $t3, $a0, $a2 /* 02584 8096C054 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 02588 8096C058 014B6021 */ addu $t4, $t2, $t3 -/* 0258C 8096C05C 01876821 */ addu $t5, $t4, $a3 +/* 02588 8096C058 014B6021 */ addu $t4, $t2, $t3 +/* 0258C 8096C05C 01876821 */ addu $t5, $t4, $a3 /* 02590 8096C060 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 02594 8096C064 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02598 8096C068 24847FC0 */ addiu $a0, $a0, 0x7FC0 ## $a0 = 06007FC0 -/* 0259C 8096C06C 00047100 */ sll $t6, $a0, 4 -/* 025A0 8096C070 000ECF02 */ srl $t9, $t6, 28 +/* 0259C 8096C06C 00047100 */ sll $t6, $a0, 4 +/* 025A0 8096C070 000ECF02 */ srl $t9, $t6, 28 /* 025A4 8096C074 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 025A8 8096C078 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 025AC 8096C07C 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 025B0 8096C080 00194880 */ sll $t1, $t9, 2 +/* 025B0 8096C080 00194880 */ sll $t1, $t9, 2 /* 025B4 8096C084 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 025B8 8096C088 00A95021 */ addu $t2, $a1, $t1 +/* 025B8 8096C088 00A95021 */ addu $t2, $a1, $t1 /* 025BC 8096C08C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 025C0 8096C090 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 -/* 025C4 8096C094 00866024 */ and $t4, $a0, $a2 +/* 025C4 8096C094 00866024 */ and $t4, $a0, $a2 /* 025C8 8096C098 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 025CC 8096C09C 016C6821 */ addu $t5, $t3, $t4 -/* 025D0 8096C0A0 01A77821 */ addu $t7, $t5, $a3 +/* 025CC 8096C09C 016C6821 */ addu $t5, $t3, $t4 +/* 025D0 8096C0A0 01A77821 */ addu $t7, $t5, $a3 /* 025D4 8096C0A4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 025D8 8096C0A8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 025DC 8096C0AC 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 @@ -96,26 +96,26 @@ glabel func_8096BF60 /* 02608 8096C0D8 256B6290 */ addiu $t3, $t3, 0x6290 ## $t3 = 80116290 /* 0260C 8096C0DC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 02610 8096C0E0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 02614 8096C0E4 8FA30078 */ lw $v1, 0x0078($sp) -/* 02618 8096C0E8 8FA4007C */ lw $a0, 0x007C($sp) +/* 02614 8096C0E4 8FA30078 */ lw $v1, 0x0078($sp) +/* 02618 8096C0E8 8FA4007C */ lw $a0, 0x007C($sp) /* 0261C 8096C0EC 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 02620 8096C0F0 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 02624 8096C0F4 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 02628 8096C0F8 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 0262C 8096C0FC AFA00014 */ sw $zero, 0x0014($sp) -/* 02630 8096C100 AFA00010 */ sw $zero, 0x0010($sp) -/* 02634 8096C104 0C0286B2 */ jal func_800A1AC8 -/* 02638 8096C108 AFA30018 */ sw $v1, 0x0018($sp) -/* 0263C 8096C10C 8FAC007C */ lw $t4, 0x007C($sp) +/* 0262C 8096C0FC AFA00014 */ sw $zero, 0x0014($sp) +/* 02630 8096C100 AFA00010 */ sw $zero, 0x0010($sp) +/* 02634 8096C104 0C0286B2 */ jal SkelAnime_DrawSV +/* 02638 8096C108 AFA30018 */ sw $v1, 0x0018($sp) +/* 0263C 8096C10C 8FAC007C */ lw $t4, 0x007C($sp) /* 02640 8096C110 3C068097 */ lui $a2, %hi(D_8096D0A0) ## $a2 = 80970000 /* 02644 8096C114 24C6D0A0 */ addiu $a2, $a2, %lo(D_8096D0A0) ## $a2 = 8096D0A0 /* 02648 8096C118 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFCC /* 0264C 8096C11C 2407027E */ addiu $a3, $zero, 0x027E ## $a3 = 0000027E -/* 02650 8096C120 0C031AD5 */ jal func_800C6B54 +/* 02650 8096C120 0C031AD5 */ jal func_800C6B54 /* 02654 8096C124 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 02658 8096C128 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02658 8096C128 8FBF0024 */ lw $ra, 0x0024($sp) /* 0265C 8096C12C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 02660 8096C130 03E00008 */ jr $ra +/* 02660 8096C130 03E00008 */ jr $ra /* 02664 8096C134 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s index 65b685f28e..e302254fb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s @@ -1,11 +1,11 @@ glabel DemoEc_Destroy /* 00000 8096D4B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 8096D4B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 8096D4B8 0C0295BC */ jal func_800A56F0 +/* 00004 8096D4B4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00008 8096D4B8 0C0295BC */ jal SkelAnime_Free /* 0000C 8096D4BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 8096D4C0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00010 8096D4C0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00014 8096D4C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 8096D4C8 03E00008 */ jr $ra +/* 00018 8096D4C8 03E00008 */ jr $ra /* 0001C 8096D4CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s index d7d6400857..2ec0092e09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s @@ -1,32 +1,32 @@ glabel func_8096D728 -/* 00278 8096D728 00067900 */ sll $t7, $a2, 4 +/* 00278 8096D728 00067900 */ sll $t7, $a2, 4 /* 0027C 8096D72C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00280 8096D730 000FC702 */ srl $t8, $t7, 28 -/* 00284 8096D734 0018C880 */ sll $t9, $t8, 2 +/* 00280 8096D730 000FC702 */ srl $t8, $t7, 28 +/* 00284 8096D734 0018C880 */ sll $t9, $t8, 2 /* 00288 8096D738 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 0028C 8096D73C 01194021 */ addu $t0, $t0, $t9 +/* 0028C 8096D73C 01194021 */ addu $t0, $t0, $t9 /* 00290 8096D740 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00294 8096D744 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 00298 8096D748 AFA40028 */ sw $a0, 0x0028($sp) +/* 00298 8096D748 AFA40028 */ sw $a0, 0x0028($sp) /* 0029C 8096D74C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 002A0 8096D750 AFA5002C */ sw $a1, 0x002C($sp) -/* 002A4 8096D754 00C14824 */ and $t1, $a2, $at +/* 002A0 8096D750 AFA5002C */ sw $a1, 0x002C($sp) +/* 002A4 8096D754 00C14824 */ and $t1, $a2, $at /* 002A8 8096D758 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002AC 8096D75C 8FA50028 */ lw $a1, 0x0028($sp) -/* 002B0 8096D760 AFA60030 */ sw $a2, 0x0030($sp) -/* 002B4 8096D764 AFBF0024 */ sw $ra, 0x0024($sp) +/* 002AC 8096D75C 8FA50028 */ lw $a1, 0x0028($sp) +/* 002B0 8096D760 AFA60030 */ sw $a2, 0x0030($sp) +/* 002B4 8096D764 AFBF0024 */ sw $ra, 0x0024($sp) /* 002B8 8096D768 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 002BC 8096D76C 01093021 */ addu $a2, $t0, $t1 -/* 002C0 8096D770 00C13021 */ addu $a2, $a2, $at -/* 002C4 8096D774 AFA00010 */ sw $zero, 0x0010($sp) -/* 002C8 8096D778 AFA00014 */ sw $zero, 0x0014($sp) -/* 002CC 8096D77C AFA00018 */ sw $zero, 0x0018($sp) +/* 002BC 8096D76C 01093021 */ addu $a2, $t0, $t1 +/* 002C0 8096D770 00C13021 */ addu $a2, $a2, $at +/* 002C4 8096D774 AFA00010 */ sw $zero, 0x0010($sp) +/* 002C8 8096D778 AFA00014 */ sw $zero, 0x0014($sp) +/* 002CC 8096D77C AFA00018 */ sw $zero, 0x0018($sp) /* 002D0 8096D780 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 002D4 8096D784 0C0291BE */ jal func_800A46F8 +/* 002D4 8096D784 0C0291BE */ jal SkelAnime_InitSV /* 002D8 8096D788 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 002DC 8096D78C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 002DC 8096D78C 8FBF0024 */ lw $ra, 0x0024($sp) /* 002E0 8096D790 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002E4 8096D794 03E00008 */ jr $ra +/* 002E4 8096D794 03E00008 */ jr $ra /* 002E8 8096D798 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s index b6c7d3ac4f..39abcbdf6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s @@ -1,41 +1,41 @@ glabel func_8096D8C4 /* 00414 8096D8C4 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00418 8096D8C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0041C 8096D8CC AFB00028 */ sw $s0, 0x0028($sp) -/* 00420 8096D8D0 AFA40070 */ sw $a0, 0x0070($sp) -/* 00424 8096D8D4 AFA50074 */ sw $a1, 0x0074($sp) -/* 00428 8096D8D8 AFA60078 */ sw $a2, 0x0078($sp) -/* 0042C 8096D8DC AFA7007C */ sw $a3, 0x007C($sp) +/* 00418 8096D8C8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0041C 8096D8CC AFB00028 */ sw $s0, 0x0028($sp) +/* 00420 8096D8D0 AFA40070 */ sw $a0, 0x0070($sp) +/* 00424 8096D8D4 AFA50074 */ sw $a1, 0x0074($sp) +/* 00428 8096D8D8 AFA60078 */ sw $a2, 0x0078($sp) +/* 0042C 8096D8DC AFA7007C */ sw $a3, 0x007C($sp) /* 00430 8096D8E0 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 00434 8096D8E4 3C068097 */ lui $a2, %hi(D_8097066C) ## $a2 = 80970000 /* 00438 8096D8E8 24C6066C */ addiu $a2, $a2, %lo(D_8097066C) ## $a2 = 8097066C /* 0043C 8096D8EC 24070235 */ addiu $a3, $zero, 0x0235 ## $a3 = 00000235 /* 00440 8096D8F0 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 -/* 00444 8096D8F4 0C031AB1 */ jal func_800C6AC4 +/* 00444 8096D8F4 0C031AB1 */ jal func_800C6AC4 /* 00448 8096D8F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0044C 8096D8FC 0C024F46 */ jal func_80093D18 +/* 0044C 8096D8FC 0C024F46 */ jal func_80093D18 /* 00450 8096D900 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00454 8096D904 8FA60078 */ lw $a2, 0x0078($sp) +/* 00454 8096D904 8FA60078 */ lw $a2, 0x0078($sp) /* 00458 8096D908 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 0045C 8096D90C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 00460 8096D910 10C0001C */ beq $a2, $zero, .L8096D984 +/* 00460 8096D910 10C0001C */ beq $a2, $zero, .L8096D984 /* 00464 8096D914 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 /* 00468 8096D918 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0046C 8096D91C 0006C900 */ sll $t9, $a2, 4 -/* 00470 8096D920 00194702 */ srl $t0, $t9, 28 +/* 0046C 8096D91C 0006C900 */ sll $t9, $a2, 4 +/* 00470 8096D920 00194702 */ srl $t0, $t9, 28 /* 00474 8096D924 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 00478 8096D928 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0047C 8096D92C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 00480 8096D930 254A6FA8 */ addiu $t2, $t2, 0x6FA8 ## $t2 = 80166FA8 -/* 00484 8096D934 00084880 */ sll $t1, $t0, 2 -/* 00488 8096D938 012A2021 */ addu $a0, $t1, $t2 +/* 00484 8096D934 00084880 */ sll $t1, $t0, 2 +/* 00488 8096D938 012A2021 */ addu $a0, $t1, $t2 /* 0048C 8096D93C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00490 8096D940 8C8B0000 */ lw $t3, 0x0000($a0) ## 00000000 /* 00494 8096D944 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00498 8096D948 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0049C 8096D94C 00C12824 */ and $a1, $a2, $at -/* 004A0 8096D950 01656021 */ addu $t4, $t3, $a1 -/* 004A4 8096D954 01876821 */ addu $t5, $t4, $a3 +/* 0049C 8096D94C 00C12824 */ and $a1, $a2, $at +/* 004A0 8096D950 01656021 */ addu $t4, $t3, $a1 +/* 004A4 8096D954 01876821 */ addu $t5, $t4, $a3 /* 004A8 8096D958 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 004AC 8096D95C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 004B0 8096D960 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -44,30 +44,30 @@ glabel func_8096D8C4 /* 004BC 8096D96C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 004C0 8096D970 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 004C4 8096D974 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 004C8 8096D978 0305C821 */ addu $t9, $t8, $a1 -/* 004CC 8096D97C 03274021 */ addu $t0, $t9, $a3 +/* 004C8 8096D978 0305C821 */ addu $t9, $t8, $a1 +/* 004CC 8096D97C 03274021 */ addu $t0, $t9, $a3 /* 004D0 8096D980 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 .L8096D984: -/* 004D4 8096D984 8FA4007C */ lw $a0, 0x007C($sp) +/* 004D4 8096D984 8FA4007C */ lw $a0, 0x007C($sp) /* 004D8 8096D988 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 004DC 8096D98C 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 004E0 8096D990 10800011 */ beq $a0, $zero, .L8096D9D8 +/* 004E0 8096D990 10800011 */ beq $a0, $zero, .L8096D9D8 /* 004E4 8096D994 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 004E8 8096D998 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 004EC 8096D99C 00045900 */ sll $t3, $a0, 4 -/* 004F0 8096D9A0 000B6702 */ srl $t4, $t3, 28 +/* 004EC 8096D99C 00045900 */ sll $t3, $a0, 4 +/* 004F0 8096D9A0 000B6702 */ srl $t4, $t3, 28 /* 004F4 8096D9A4 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 004F8 8096D9A8 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 004FC 8096D9AC 000C6880 */ sll $t5, $t4, 2 +/* 004FC 8096D9AC 000C6880 */ sll $t5, $t4, 2 /* 00500 8096D9B0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00504 8096D9B4 01CD7021 */ addu $t6, $t6, $t5 +/* 00504 8096D9B4 01CD7021 */ addu $t6, $t6, $t5 /* 00508 8096D9B8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 0050C 8096D9BC 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 /* 00510 8096D9C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00514 8096D9C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00518 8096D9C8 00817824 */ and $t7, $a0, $at -/* 0051C 8096D9CC 01CFC021 */ addu $t8, $t6, $t7 -/* 00520 8096D9D0 0307C821 */ addu $t9, $t8, $a3 +/* 00518 8096D9C8 00817824 */ and $t7, $a0, $at +/* 0051C 8096D9CC 01CFC021 */ addu $t8, $t6, $t7 +/* 00520 8096D9D0 0307C821 */ addu $t9, $t8, $a3 /* 00524 8096D9D4 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 .L8096D9D8: /* 00528 8096D9D8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -86,31 +86,31 @@ glabel func_8096D8C4 /* 0055C 8096DA0C 358C0030 */ ori $t4, $t4, 0x0030 ## $t4 = DB060030 /* 00560 8096DA10 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 00564 8096DA14 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00568 8096DA18 8FA30070 */ lw $v1, 0x0070($sp) -/* 0056C 8096DA1C 8FAF0084 */ lw $t7, 0x0084($sp) -/* 00570 8096DA20 8FAE0080 */ lw $t6, 0x0080($sp) +/* 00568 8096DA18 8FA30070 */ lw $v1, 0x0070($sp) +/* 0056C 8096DA1C 8FAF0084 */ lw $t7, 0x0084($sp) +/* 00570 8096DA20 8FAE0080 */ lw $t6, 0x0080($sp) /* 00574 8096DA24 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 00578 8096DA28 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 0057C 8096DA2C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 00580 8096DA30 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00584 8096DA34 AFA30018 */ sw $v1, 0x0018($sp) -/* 00588 8096DA38 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0058C 8096DA3C AFAE0010 */ sw $t6, 0x0010($sp) +/* 00584 8096DA34 AFA30018 */ sw $v1, 0x0018($sp) +/* 00588 8096DA38 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0058C 8096DA3C AFAE0010 */ sw $t6, 0x0010($sp) /* 00590 8096DA40 8E1802C0 */ lw $t8, 0x02C0($s0) ## 000002C0 -/* 00594 8096DA44 8FA40074 */ lw $a0, 0x0074($sp) -/* 00598 8096DA48 0C0289CF */ jal func_800A273C -/* 0059C 8096DA4C AFB8001C */ sw $t8, 0x001C($sp) +/* 00594 8096DA44 8FA40074 */ lw $a0, 0x0074($sp) +/* 00598 8096DA48 0C0289CF */ jal SkelAnime_DrawSV2 +/* 0059C 8096DA4C AFB8001C */ sw $t8, 0x001C($sp) /* 005A0 8096DA50 3C068097 */ lui $a2, %hi(D_8097067C) ## $a2 = 80970000 /* 005A4 8096DA54 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 /* 005A8 8096DA58 24C6067C */ addiu $a2, $a2, %lo(D_8097067C) ## $a2 = 8097067C /* 005AC 8096DA5C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 005B0 8096DA60 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005B4 8096DA64 0C031AD5 */ jal func_800C6B54 +/* 005B4 8096DA64 0C031AD5 */ jal func_800C6B54 /* 005B8 8096DA68 24070253 */ addiu $a3, $zero, 0x0253 ## $a3 = 00000253 -/* 005BC 8096DA6C 8FBF002C */ lw $ra, 0x002C($sp) -/* 005C0 8096DA70 8FB00028 */ lw $s0, 0x0028($sp) +/* 005BC 8096DA6C 8FBF002C */ lw $ra, 0x002C($sp) +/* 005C0 8096DA70 8FB00028 */ lw $s0, 0x0028($sp) /* 005C4 8096DA74 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 005C8 8096DA78 03E00008 */ jr $ra +/* 005C8 8096DA78 03E00008 */ jr $ra /* 005CC 8096DA7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s index eebde36ea4..e00047df2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s @@ -1,100 +1,100 @@ glabel func_8096DA80 /* 005D0 8096DA80 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 005D4 8096DA84 AFBF002C */ sw $ra, 0x002C($sp) -/* 005D8 8096DA88 AFB00028 */ sw $s0, 0x0028($sp) -/* 005DC 8096DA8C AFA40070 */ sw $a0, 0x0070($sp) -/* 005E0 8096DA90 AFA50074 */ sw $a1, 0x0074($sp) -/* 005E4 8096DA94 AFA60078 */ sw $a2, 0x0078($sp) -/* 005E8 8096DA98 AFA7007C */ sw $a3, 0x007C($sp) +/* 005D4 8096DA84 AFBF002C */ sw $ra, 0x002C($sp) +/* 005D8 8096DA88 AFB00028 */ sw $s0, 0x0028($sp) +/* 005DC 8096DA8C AFA40070 */ sw $a0, 0x0070($sp) +/* 005E0 8096DA90 AFA50074 */ sw $a1, 0x0074($sp) +/* 005E4 8096DA94 AFA60078 */ sw $a2, 0x0078($sp) +/* 005E8 8096DA98 AFA7007C */ sw $a3, 0x007C($sp) /* 005EC 8096DA9C 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 005F0 8096DAA0 3C068097 */ lui $a2, %hi(D_8097068C) ## $a2 = 80970000 /* 005F4 8096DAA4 24C6068C */ addiu $a2, $a2, %lo(D_8097068C) ## $a2 = 8097068C /* 005F8 8096DAA8 24070261 */ addiu $a3, $zero, 0x0261 ## $a3 = 00000261 /* 005FC 8096DAAC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 -/* 00600 8096DAB0 0C031AB1 */ jal func_800C6AC4 +/* 00600 8096DAB0 0C031AB1 */ jal func_800C6AC4 /* 00604 8096DAB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00608 8096DAB8 0C024F46 */ jal func_80093D18 +/* 00608 8096DAB8 0C024F46 */ jal func_80093D18 /* 0060C 8096DABC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00610 8096DAC0 8FA40078 */ lw $a0, 0x0078($sp) +/* 00610 8096DAC0 8FA40078 */ lw $a0, 0x0078($sp) /* 00614 8096DAC4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 00618 8096DAC8 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 0061C 8096DACC 10800011 */ beq $a0, $zero, .L8096DB14 -/* 00620 8096DAD0 0004C900 */ sll $t9, $a0, 4 +/* 0061C 8096DACC 10800011 */ beq $a0, $zero, .L8096DB14 +/* 00620 8096DAD0 0004C900 */ sll $t9, $a0, 4 /* 00624 8096DAD4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00628 8096DAD8 00194702 */ srl $t0, $t9, 28 -/* 0062C 8096DADC 00084880 */ sll $t1, $t0, 2 +/* 00628 8096DAD8 00194702 */ srl $t0, $t9, 28 +/* 0062C 8096DADC 00084880 */ sll $t1, $t0, 2 /* 00630 8096DAE0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00634 8096DAE4 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 00638 8096DAE8 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 0063C 8096DAEC 01495021 */ addu $t2, $t2, $t1 +/* 0063C 8096DAEC 01495021 */ addu $t2, $t2, $t1 /* 00640 8096DAF0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00644 8096DAF4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00648 8096DAF8 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 /* 0064C 8096DAFC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00650 8096DB00 00815824 */ and $t3, $a0, $at +/* 00650 8096DB00 00815824 */ and $t3, $a0, $at /* 00654 8096DB04 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00658 8096DB08 014B6021 */ addu $t4, $t2, $t3 -/* 0065C 8096DB0C 01816821 */ addu $t5, $t4, $at +/* 00658 8096DB08 014B6021 */ addu $t4, $t2, $t3 +/* 0065C 8096DB0C 01816821 */ addu $t5, $t4, $at /* 00660 8096DB10 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L8096DB14: -/* 00664 8096DB14 8FA4007C */ lw $a0, 0x007C($sp) +/* 00664 8096DB14 8FA4007C */ lw $a0, 0x007C($sp) /* 00668 8096DB18 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 0066C 8096DB1C 35EF002C */ ori $t7, $t7, 0x002C ## $t7 = DB06002C -/* 00670 8096DB20 10800011 */ beq $a0, $zero, .L8096DB68 -/* 00674 8096DB24 0004C100 */ sll $t8, $a0, 4 +/* 00670 8096DB20 10800011 */ beq $a0, $zero, .L8096DB68 +/* 00674 8096DB24 0004C100 */ sll $t8, $a0, 4 /* 00678 8096DB28 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0067C 8096DB2C 0018CF02 */ srl $t9, $t8, 28 -/* 00680 8096DB30 00194080 */ sll $t0, $t9, 2 +/* 0067C 8096DB2C 0018CF02 */ srl $t9, $t8, 28 +/* 00680 8096DB30 00194080 */ sll $t0, $t9, 2 /* 00684 8096DB34 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 00688 8096DB38 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 0068C 8096DB3C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 00690 8096DB40 01284821 */ addu $t1, $t1, $t0 +/* 00690 8096DB40 01284821 */ addu $t1, $t1, $t0 /* 00694 8096DB44 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00698 8096DB48 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0069C 8096DB4C 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 /* 006A0 8096DB50 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 006A4 8096DB54 00815024 */ and $t2, $a0, $at +/* 006A4 8096DB54 00815024 */ and $t2, $a0, $at /* 006A8 8096DB58 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 006AC 8096DB5C 012A5821 */ addu $t3, $t1, $t2 -/* 006B0 8096DB60 01616021 */ addu $t4, $t3, $at +/* 006AC 8096DB5C 012A5821 */ addu $t3, $t1, $t2 +/* 006B0 8096DB60 01616021 */ addu $t4, $t3, $at /* 006B4 8096DB64 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 .L8096DB68: -/* 006B8 8096DB68 8FA50080 */ lw $a1, 0x0080($sp) +/* 006B8 8096DB68 8FA50080 */ lw $a1, 0x0080($sp) /* 006BC 8096DB6C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 006C0 8096DB70 50A0001E */ beql $a1, $zero, .L8096DBEC -/* 006C4 8096DB74 8FAE0084 */ lw $t6, 0x0084($sp) +/* 006C0 8096DB70 50A0001E */ beql $a1, $zero, .L8096DBEC +/* 006C4 8096DB74 8FAE0084 */ lw $t6, 0x0084($sp) /* 006C8 8096DB78 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 006CC 8096DB7C 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 /* 006D0 8096DB80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006D4 8096DB84 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 006D8 8096DB88 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 006DC 8096DB8C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 006E0 8096DB90 0C25B616 */ jal func_8096D858 -/* 006E4 8096DB94 AFA20044 */ sw $v0, 0x0044($sp) -/* 006E8 8096DB98 AFA20034 */ sw $v0, 0x0034($sp) +/* 006E0 8096DB90 0C25B616 */ jal func_8096D858 +/* 006E4 8096DB94 AFA20044 */ sw $v0, 0x0044($sp) +/* 006E8 8096DB98 AFA20034 */ sw $v0, 0x0034($sp) /* 006EC 8096DB9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006F0 8096DBA0 0C25B616 */ jal func_8096D858 -/* 006F4 8096DBA4 8FA50080 */ lw $a1, 0x0080($sp) -/* 006F8 8096DBA8 8FB80034 */ lw $t8, 0x0034($sp) +/* 006F0 8096DBA0 0C25B616 */ jal func_8096D858 +/* 006F4 8096DBA4 8FA50080 */ lw $a1, 0x0080($sp) +/* 006F8 8096DBA8 8FB80034 */ lw $t8, 0x0034($sp) /* 006FC 8096DBAC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 00700 8096DBB0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00704 8096DBB4 0018C900 */ sll $t9, $t8, 4 -/* 00708 8096DBB8 00194702 */ srl $t0, $t9, 28 -/* 0070C 8096DBBC 00084880 */ sll $t1, $t0, 2 -/* 00710 8096DBC0 01495021 */ addu $t2, $t2, $t1 +/* 00704 8096DBB4 0018C900 */ sll $t9, $t8, 4 +/* 00708 8096DBB8 00194702 */ srl $t0, $t9, 28 +/* 0070C 8096DBBC 00084880 */ sll $t1, $t0, 2 +/* 00710 8096DBC0 01495021 */ addu $t2, $t2, $t1 /* 00714 8096DBC4 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 /* 00718 8096DBC8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0071C 8096DBCC 00417824 */ and $t7, $v0, $at -/* 00720 8096DBD0 8FAD0044 */ lw $t5, 0x0044($sp) +/* 0071C 8096DBCC 00417824 */ and $t7, $v0, $at +/* 00720 8096DBD0 8FAD0044 */ lw $t5, 0x0044($sp) /* 00724 8096DBD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00728 8096DBD8 01EA5821 */ addu $t3, $t7, $t2 -/* 0072C 8096DBDC 01616021 */ addu $t4, $t3, $at +/* 00728 8096DBD8 01EA5821 */ addu $t3, $t7, $t2 +/* 0072C 8096DBDC 01616021 */ addu $t4, $t3, $at /* 00730 8096DBE0 ADAC0004 */ sw $t4, 0x0004($t5) ## 00000004 -/* 00734 8096DBE4 8FA50080 */ lw $a1, 0x0080($sp) -/* 00738 8096DBE8 8FAE0084 */ lw $t6, 0x0084($sp) +/* 00734 8096DBE4 8FA50080 */ lw $a1, 0x0080($sp) +/* 00738 8096DBE8 8FAE0084 */ lw $t6, 0x0084($sp) .L8096DBEC: /* 0073C 8096DBEC 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 00740 8096DBF0 51C0001D */ beql $t6, $zero, .L8096DC68 +/* 00740 8096DBF0 51C0001D */ beql $t6, $zero, .L8096DC68 /* 00744 8096DBF4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00748 8096DBF8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0074C 8096DBFC 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 @@ -102,26 +102,26 @@ glabel func_8096DA80 /* 00754 8096DC04 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 00758 8096DC08 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 0075C 8096DC0C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00760 8096DC10 0C25B616 */ jal func_8096D858 -/* 00764 8096DC14 AFA20040 */ sw $v0, 0x0040($sp) -/* 00768 8096DC18 AFA20034 */ sw $v0, 0x0034($sp) +/* 00760 8096DC10 0C25B616 */ jal func_8096D858 +/* 00764 8096DC14 AFA20040 */ sw $v0, 0x0040($sp) +/* 00768 8096DC18 AFA20034 */ sw $v0, 0x0034($sp) /* 0076C 8096DC1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00770 8096DC20 0C25B616 */ jal func_8096D858 -/* 00774 8096DC24 8FA50080 */ lw $a1, 0x0080($sp) -/* 00778 8096DC28 8FA90034 */ lw $t1, 0x0034($sp) +/* 00770 8096DC20 0C25B616 */ jal func_8096D858 +/* 00774 8096DC24 8FA50080 */ lw $a1, 0x0080($sp) +/* 00778 8096DC28 8FA90034 */ lw $t1, 0x0034($sp) /* 0077C 8096DC2C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 00780 8096DC30 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00784 8096DC34 00097900 */ sll $t7, $t1, 4 -/* 00788 8096DC38 000F5702 */ srl $t2, $t7, 28 -/* 0078C 8096DC3C 000A5880 */ sll $t3, $t2, 2 -/* 00790 8096DC40 018B6021 */ addu $t4, $t4, $t3 +/* 00784 8096DC34 00097900 */ sll $t7, $t1, 4 +/* 00788 8096DC38 000F5702 */ srl $t2, $t7, 28 +/* 0078C 8096DC3C 000A5880 */ sll $t3, $t2, 2 +/* 00790 8096DC40 018B6021 */ addu $t4, $t4, $t3 /* 00794 8096DC44 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 /* 00798 8096DC48 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0079C 8096DC4C 00414024 */ and $t0, $v0, $at -/* 007A0 8096DC50 8FB80040 */ lw $t8, 0x0040($sp) +/* 0079C 8096DC4C 00414024 */ and $t0, $v0, $at +/* 007A0 8096DC50 8FB80040 */ lw $t8, 0x0040($sp) /* 007A4 8096DC54 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 007A8 8096DC58 010C6821 */ addu $t5, $t0, $t4 -/* 007AC 8096DC5C 01A17021 */ addu $t6, $t5, $at +/* 007A8 8096DC58 010C6821 */ addu $t5, $t0, $t4 +/* 007AC 8096DC5C 01A17021 */ addu $t6, $t5, $at /* 007B0 8096DC60 AF0E0004 */ sw $t6, 0x0004($t8) ## 00000004 /* 007B4 8096DC64 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L8096DC68: @@ -140,31 +140,31 @@ glabel func_8096DA80 /* 007E8 8096DC98 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 /* 007EC 8096DC9C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 007F0 8096DCA0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 007F4 8096DCA4 8FA30070 */ lw $v1, 0x0070($sp) -/* 007F8 8096DCA8 8FAD008C */ lw $t5, 0x008C($sp) -/* 007FC 8096DCAC 8FAC0088 */ lw $t4, 0x0088($sp) +/* 007F4 8096DCA4 8FA30070 */ lw $v1, 0x0070($sp) +/* 007F8 8096DCA8 8FAD008C */ lw $t5, 0x008C($sp) +/* 007FC 8096DCAC 8FAC0088 */ lw $t4, 0x0088($sp) /* 00800 8096DCB0 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 00804 8096DCB4 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 00808 8096DCB8 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 0080C 8096DCBC 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00810 8096DCC0 AFA30018 */ sw $v1, 0x0018($sp) -/* 00814 8096DCC4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00818 8096DCC8 AFAC0010 */ sw $t4, 0x0010($sp) +/* 00810 8096DCC0 AFA30018 */ sw $v1, 0x0018($sp) +/* 00814 8096DCC4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00818 8096DCC8 AFAC0010 */ sw $t4, 0x0010($sp) /* 0081C 8096DCCC 8E0E02C0 */ lw $t6, 0x02C0($s0) ## 000002C0 -/* 00820 8096DCD0 8FA40074 */ lw $a0, 0x0074($sp) -/* 00824 8096DCD4 0C0289CF */ jal func_800A273C -/* 00828 8096DCD8 AFAE001C */ sw $t6, 0x001C($sp) +/* 00820 8096DCD0 8FA40074 */ lw $a0, 0x0074($sp) +/* 00824 8096DCD4 0C0289CF */ jal SkelAnime_DrawSV2 +/* 00828 8096DCD8 AFAE001C */ sw $t6, 0x001C($sp) /* 0082C 8096DCDC 3C068097 */ lui $a2, %hi(D_8097069C) ## $a2 = 80970000 /* 00830 8096DCE0 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 /* 00834 8096DCE4 24C6069C */ addiu $a2, $a2, %lo(D_8097069C) ## $a2 = 8097069C /* 00838 8096DCE8 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 0083C 8096DCEC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00840 8096DCF0 0C031AD5 */ jal func_800C6B54 +/* 00840 8096DCF0 0C031AD5 */ jal func_800C6B54 /* 00844 8096DCF4 24070286 */ addiu $a3, $zero, 0x0286 ## $a3 = 00000286 -/* 00848 8096DCF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0084C 8096DCFC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00848 8096DCF8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0084C 8096DCFC 8FB00028 */ lw $s0, 0x0028($sp) /* 00850 8096DD00 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 00854 8096DD04 03E00008 */ jr $ra +/* 00854 8096DD04 03E00008 */ jr $ra /* 00858 8096DD08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s index f22a6defc8..fe9419abb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s @@ -1,37 +1,37 @@ glabel func_80983E28 /* 00B28 80983E28 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00B2C 80983E2C AFBF002C */ sw $ra, 0x002C($sp) -/* 00B30 80983E30 AFB10028 */ sw $s1, 0x0028($sp) -/* 00B34 80983E34 AFB00024 */ sw $s0, 0x0024($sp) -/* 00B38 80983E38 AFA50054 */ sw $a1, 0x0054($sp) +/* 00B2C 80983E2C AFBF002C */ sw $ra, 0x002C($sp) +/* 00B30 80983E30 AFB10028 */ sw $s1, 0x0028($sp) +/* 00B34 80983E34 AFB00024 */ sw $s0, 0x0024($sp) +/* 00B38 80983E38 AFA50054 */ sw $a1, 0x0054($sp) /* 00B3C 80983E3C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 00B40 80983E40 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 00B44 80983E44 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00B48 80983E48 10410009 */ beq $v0, $at, .L80983E70 -/* 00B4C 80983E4C 8FA40054 */ lw $a0, 0x0054($sp) +/* 00B48 80983E48 10410009 */ beq $v0, $at, .L80983E70 +/* 00B4C 80983E4C 8FA40054 */ lw $a0, 0x0054($sp) /* 00B50 80983E50 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00B54 80983E54 1041000B */ beq $v0, $at, .L80983E84 +/* 00B54 80983E54 1041000B */ beq $v0, $at, .L80983E84 /* 00B58 80983E58 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 00B5C 80983E5C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B60 80983E60 1041000C */ beq $v0, $at, .L80983E94 +/* 00B60 80983E60 1041000C */ beq $v0, $at, .L80983E94 /* 00B64 80983E64 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00B68 80983E68 1000000E */ beq $zero, $zero, .L80983EA4 +/* 00B68 80983E68 1000000E */ beq $zero, $zero, .L80983EA4 /* 00B6C 80983E6C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 .L80983E70: /* 00B70 80983E70 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 00B74 80983E74 3C100602 */ lui $s0, 0x0602 ## $s0 = 06020000 /* 00B78 80983E78 24C6EB40 */ addiu $a2, $a2, 0xEB40 ## $a2 = 0601EB40 -/* 00B7C 80983E7C 1000000C */ beq $zero, $zero, .L80983EB0 +/* 00B7C 80983E7C 1000000C */ beq $zero, $zero, .L80983EB0 /* 00B80 80983E80 2610EB14 */ addiu $s0, $s0, 0xEB14 ## $s0 = 0601EB14 .L80983E84: /* 00B84 80983E84 3C100602 */ lui $s0, 0x0602 ## $s0 = 06020000 /* 00B88 80983E88 24C6EE60 */ addiu $a2, $a2, 0xEE60 ## $a2 = 0601D9A0 -/* 00B8C 80983E8C 10000008 */ beq $zero, $zero, .L80983EB0 +/* 00B8C 80983E8C 10000008 */ beq $zero, $zero, .L80983EB0 /* 00B90 80983E90 2610EE34 */ addiu $s0, $s0, 0xEE34 ## $s0 = 0601EE34 .L80983E94: /* 00B94 80983E94 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 00B98 80983E98 24C60F30 */ addiu $a2, $a2, 0x0F30 ## $a2 = 0601E8D0 -/* 00B9C 80983E9C 10000004 */ beq $zero, $zero, .L80983EB0 +/* 00B9C 80983E9C 10000004 */ beq $zero, $zero, .L80983EB0 /* 00BA0 80983EA0 26100F0C */ addiu $s0, $s0, 0x0F0C ## $s0 = 06000F0C .L80983EA4: /* 00BA4 80983EA4 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 @@ -42,35 +42,35 @@ glabel func_80983E28 /* 00BB4 80983EB4 262E0190 */ addiu $t6, $s1, 0x0190 ## $t6 = 00000190 /* 00BB8 80983EB8 262F019C */ addiu $t7, $s1, 0x019C ## $t7 = 0000019C /* 00BBC 80983EBC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00BC0 80983EC0 AFB80018 */ sw $t8, 0x0018($sp) -/* 00BC4 80983EC4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00BC8 80983EC8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00BCC 80983ECC AFA50034 */ sw $a1, 0x0034($sp) -/* 00BD0 80983ED0 0C0291BE */ jal func_800A46F8 +/* 00BC0 80983EC0 AFB80018 */ sw $t8, 0x0018($sp) +/* 00BC4 80983EC4 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00BC8 80983EC8 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00BCC 80983ECC AFA50034 */ sw $a1, 0x0034($sp) +/* 00BD0 80983ED0 0C0291BE */ jal SkelAnime_InitSV /* 00BD4 80983ED4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00BD8 80983ED8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00BDC 80983EDC 02002025 */ or $a0, $s0, $zero ## $a0 = 060008DC /* 00BE0 80983EE0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00BE4 80983EE4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00BE8 80983EE8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00BEC 80983EEC 468021A0 */ cvt.s.w $f6, $f4 -/* 00BF0 80983EF0 44070000 */ mfc1 $a3, $f0 -/* 00BF4 80983EF4 AFB90014 */ sw $t9, 0x0014($sp) -/* 00BF8 80983EF8 8FA40034 */ lw $a0, 0x0034($sp) +/* 00BEC 80983EEC 468021A0 */ cvt.s.w $f6, $f4 +/* 00BF0 80983EF0 44070000 */ mfc1 $a3, $f0 +/* 00BF4 80983EF4 AFB90014 */ sw $t9, 0x0014($sp) +/* 00BF8 80983EF8 8FA40034 */ lw $a0, 0x0034($sp) /* 00BFC 80983EFC 02002825 */ or $a1, $s0, $zero ## $a1 = 060008DC /* 00C00 80983F00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C04 80983F04 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00C04 80983F04 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00C08 80983F08 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00C0C 80983F0C E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 00C0C 80983F0C E7A00018 */ swc1 $f0, 0x0018($sp) /* 00C10 80983F10 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 00C14 80983F14 AE2801A8 */ sw $t0, 0x01A8($s1) ## 000001A8 /* 00C18 80983F18 AE2001AC */ sw $zero, 0x01AC($s1) ## 000001AC -/* 00C1C 80983F1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C20 80983F20 8FB10028 */ lw $s1, 0x0028($sp) -/* 00C24 80983F24 8FB00024 */ lw $s0, 0x0024($sp) -/* 00C28 80983F28 03E00008 */ jr $ra +/* 00C1C 80983F1C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C20 80983F20 8FB10028 */ lw $s1, 0x0028($sp) +/* 00C24 80983F24 8FB00024 */ lw $s0, 0x0024($sp) +/* 00C28 80983F28 03E00008 */ jr $ra /* 00C2C 80983F2C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s index aeedf3adff..a736f7adf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s @@ -1,23 +1,23 @@ glabel func_8098441C /* 0111C 8098441C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 01120 80984420 AFBF002C */ sw $ra, 0x002C($sp) -/* 01124 80984424 AFB00028 */ sw $s0, 0x0028($sp) -/* 01128 80984428 AFA40068 */ sw $a0, 0x0068($sp) -/* 0112C 8098442C AFA5006C */ sw $a1, 0x006C($sp) +/* 01120 80984420 AFBF002C */ sw $ra, 0x002C($sp) +/* 01124 80984424 AFB00028 */ sw $s0, 0x0028($sp) +/* 01128 80984428 AFA40068 */ sw $a0, 0x0068($sp) +/* 0112C 8098442C AFA5006C */ sw $a1, 0x006C($sp) /* 01130 80984430 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 01134 80984434 3C068098 */ lui $a2, %hi(D_8098493C) ## $a2 = 80980000 /* 01138 80984438 24C6493C */ addiu $a2, $a2, %lo(D_8098493C) ## $a2 = 8098493C /* 0113C 8098443C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 01140 80984440 2407013E */ addiu $a3, $zero, 0x013E ## $a3 = 0000013E -/* 01144 80984444 0C031AB1 */ jal func_800C6AC4 +/* 01144 80984444 0C031AB1 */ jal func_800C6AC4 /* 01148 80984448 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0114C 8098444C 8FA40068 */ lw $a0, 0x0068($sp) -/* 01150 80984450 8FA5006C */ lw $a1, 0x006C($sp) -/* 01154 80984454 0C00BAF3 */ jal func_8002EBCC +/* 0114C 8098444C 8FA40068 */ lw $a0, 0x0068($sp) +/* 01150 80984450 8FA5006C */ lw $a1, 0x006C($sp) +/* 01154 80984454 0C00BAF3 */ jal func_8002EBCC /* 01158 80984458 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0115C 8098445C 0C024F46 */ jal func_80093D18 +/* 0115C 8098445C 0C024F46 */ jal func_80093D18 /* 01160 80984460 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01164 80984464 0C024F61 */ jal func_80093D84 +/* 01164 80984464 0C024F61 */ jal func_80093D84 /* 01168 80984468 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0116C 8098446C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 01170 80984470 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -27,16 +27,16 @@ glabel func_8098441C /* 01180 80984480 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01184 80984484 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 01188 80984488 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 0118C 8098448C AFA80014 */ sw $t0, 0x0014($sp) -/* 01190 80984490 AFB90010 */ sw $t9, 0x0010($sp) -/* 01194 80984494 AFA00018 */ sw $zero, 0x0018($sp) +/* 0118C 8098448C AFA80014 */ sw $t0, 0x0014($sp) +/* 01190 80984490 AFB90010 */ sw $t9, 0x0010($sp) +/* 01194 80984494 AFA00018 */ sw $zero, 0x0018($sp) /* 01198 80984498 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0119C 8098449C 240500F5 */ addiu $a1, $zero, 0x00F5 ## $a1 = 000000F5 /* 011A0 809844A0 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 /* 011A4 809844A4 2407009B */ addiu $a3, $zero, 0x009B ## $a3 = 0000009B -/* 011A8 809844A8 0C260D0C */ jal func_80983430 -/* 011AC 809844AC AFA20040 */ sw $v0, 0x0040($sp) -/* 011B0 809844B0 8FA30040 */ lw $v1, 0x0040($sp) +/* 011A8 809844A8 0C260D0C */ jal func_80983430 +/* 011AC 809844AC AFA20040 */ sw $v0, 0x0040($sp) +/* 011B0 809844B0 8FA30040 */ lw $v1, 0x0040($sp) /* 011B4 809844B4 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 011B8 809844B8 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 011BC 809844BC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -46,15 +46,15 @@ glabel func_8098441C /* 011CC 809844CC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 011D0 809844D0 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 011D4 809844D4 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 011D8 809844D8 AFA00018 */ sw $zero, 0x0018($sp) -/* 011DC 809844DC AFA00014 */ sw $zero, 0x0014($sp) -/* 011E0 809844E0 AFAB0010 */ sw $t3, 0x0010($sp) +/* 011D8 809844D8 AFA00018 */ sw $zero, 0x0018($sp) +/* 011DC 809844DC AFA00014 */ sw $zero, 0x0014($sp) +/* 011E0 809844E0 AFAB0010 */ sw $t3, 0x0010($sp) /* 011E4 809844E4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 011E8 809844E8 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 /* 011EC 809844EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 011F0 809844F0 0C260D0C */ jal func_80983430 -/* 011F4 809844F4 AFA2003C */ sw $v0, 0x003C($sp) -/* 011F8 809844F8 8FA3003C */ lw $v1, 0x003C($sp) +/* 011F0 809844F0 0C260D0C */ jal func_80983430 +/* 011F4 809844F4 AFA2003C */ sw $v0, 0x003C($sp) +/* 011F8 809844F8 8FA3003C */ lw $v1, 0x003C($sp) /* 011FC 809844FC 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01200 80984500 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 /* 01204 80984504 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -65,41 +65,41 @@ glabel func_8098441C /* 01218 80984518 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 0121C 8098451C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01220 80984520 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 01224 80984524 AFB80018 */ sw $t8, 0x0018($sp) -/* 01228 80984528 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0122C 8098452C AFAE0010 */ sw $t6, 0x0010($sp) +/* 01224 80984524 AFB80018 */ sw $t8, 0x0018($sp) +/* 01228 80984528 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0122C 8098452C AFAE0010 */ sw $t6, 0x0010($sp) /* 01230 80984530 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01234 80984534 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 01238 80984538 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 0123C 8098453C 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 01240 80984540 0C260D0C */ jal func_80983430 -/* 01244 80984544 AFA20038 */ sw $v0, 0x0038($sp) -/* 01248 80984548 8FA30038 */ lw $v1, 0x0038($sp) +/* 01240 80984540 0C260D0C */ jal func_80983430 +/* 01244 80984544 AFA20038 */ sw $v0, 0x0038($sp) +/* 01248 80984548 8FA30038 */ lw $v1, 0x0038($sp) /* 0124C 8098454C 3C198098 */ lui $t9, %hi(func_8098419C) ## $t9 = 80980000 /* 01250 80984550 3C088098 */ lui $t0, %hi(func_809841F4) ## $t0 = 80980000 /* 01254 80984554 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01258 80984558 8FA30068 */ lw $v1, 0x0068($sp) +/* 01258 80984558 8FA30068 */ lw $v1, 0x0068($sp) /* 0125C 8098455C 250841F4 */ addiu $t0, $t0, %lo(func_809841F4) ## $t0 = 809841F4 /* 01260 80984560 2739419C */ addiu $t9, $t9, %lo(func_8098419C) ## $t9 = 8098419C /* 01264 80984564 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 01268 80984568 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 0126C 8098456C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 01270 80984570 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01274 80984574 AFA80014 */ sw $t0, 0x0014($sp) -/* 01278 80984578 AFB90010 */ sw $t9, 0x0010($sp) -/* 0127C 8098457C 8FA4006C */ lw $a0, 0x006C($sp) -/* 01280 80984580 0C0286B2 */ jal func_800A1AC8 -/* 01284 80984584 AFA30018 */ sw $v1, 0x0018($sp) +/* 01274 80984574 AFA80014 */ sw $t0, 0x0014($sp) +/* 01278 80984578 AFB90010 */ sw $t9, 0x0010($sp) +/* 0127C 8098457C 8FA4006C */ lw $a0, 0x006C($sp) +/* 01280 80984580 0C0286B2 */ jal SkelAnime_DrawSV +/* 01284 80984584 AFA30018 */ sw $v1, 0x0018($sp) /* 01288 80984588 3C068098 */ lui $a2, %hi(D_80984954) ## $a2 = 80980000 /* 0128C 8098458C 24C64954 */ addiu $a2, $a2, %lo(D_80984954) ## $a2 = 80984954 /* 01290 80984590 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 01294 80984594 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01298 80984598 0C031AD5 */ jal func_800C6B54 +/* 01298 80984598 0C031AD5 */ jal func_800C6B54 /* 0129C 8098459C 24070155 */ addiu $a3, $zero, 0x0155 ## $a3 = 00000155 -/* 012A0 809845A0 8FBF002C */ lw $ra, 0x002C($sp) -/* 012A4 809845A4 8FB00028 */ lw $s0, 0x0028($sp) +/* 012A0 809845A0 8FBF002C */ lw $ra, 0x002C($sp) +/* 012A4 809845A4 8FB00028 */ lw $s0, 0x0028($sp) /* 012A8 809845A8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 012AC 809845AC 03E00008 */ jr $ra +/* 012AC 809845AC 03E00008 */ jr $ra /* 012B0 809845B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s index 94490bd22a..e16cf3cb9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s @@ -1,85 +1,85 @@ glabel DemoIm_Init /* 027EC 809873CC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 027F0 809873D0 AFB10028 */ sw $s1, 0x0028($sp) -/* 027F4 809873D4 AFB00024 */ sw $s0, 0x0024($sp) +/* 027F0 809873D0 AFB10028 */ sw $s1, 0x0028($sp) +/* 027F4 809873D4 AFB00024 */ sw $s0, 0x0024($sp) /* 027F8 809873D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 027FC 809873DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02800 809873E0 AFBF002C */ sw $ra, 0x002C($sp) +/* 02800 809873E0 AFBF002C */ sw $ra, 0x002C($sp) /* 02804 809873E4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 02808 809873E8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0280C 809873EC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02810 809873F0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 02814 809873F4 0C00AC78 */ jal ActorShape_Init - + /* 02818 809873F8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 0281C 809873FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02820 80987400 0C261340 */ jal func_80984D00 +/* 02820 80987400 0C261340 */ jal func_80984D00 /* 02824 80987404 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 02828 80987408 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 0282C 8098740C 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 02830 80987410 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 /* 02834 80987414 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 02838 80987418 AFB80018 */ sw $t8, 0x0018($sp) -/* 0283C 8098741C AFAF0014 */ sw $t7, 0x0014($sp) -/* 02840 80987420 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02838 80987418 AFB80018 */ sw $t8, 0x0018($sp) +/* 0283C 8098741C AFAF0014 */ sw $t7, 0x0014($sp) +/* 02840 80987420 AFAE0010 */ sw $t6, 0x0010($sp) /* 02844 80987424 24C6F788 */ addiu $a2, $a2, 0xF788 ## $a2 = 0600F788 /* 02848 80987428 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0284C 8098742C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 02850 80987430 0C0291BE */ jal func_800A46F8 +/* 02850 80987430 0C0291BE */ jal SkelAnime_InitSV /* 02854 80987434 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02858 80987438 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 /* 0285C 8098743C 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 02860 80987440 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 02864 80987444 03214024 */ and $t0, $t9, $at +/* 02864 80987444 03214024 */ and $t0, $t9, $at /* 02868 80987448 252AFFFE */ addiu $t2, $t1, 0xFFFE ## $t2 = FFFFFFFE -/* 0286C 8098744C 2D410005 */ sltiu $at, $t2, 0x0005 -/* 02870 80987450 10200020 */ beq $at, $zero, .L809874D4 +/* 0286C 8098744C 2D410005 */ sltiu $at, $t2, 0x0005 +/* 02870 80987450 10200020 */ beq $at, $zero, .L809874D4 /* 02874 80987454 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 02878 80987458 000A5080 */ sll $t2, $t2, 2 +/* 02878 80987458 000A5080 */ sll $t2, $t2, 2 /* 0287C 8098745C 3C018099 */ lui $at, %hi(jtbl_80988A04) ## $at = 80990000 -/* 02880 80987460 002A0821 */ addu $at, $at, $t2 -/* 02884 80987464 8C2A8A04 */ lw $t2, %lo(jtbl_80988A04)($at) -/* 02888 80987468 01400008 */ jr $t2 +/* 02880 80987460 002A0821 */ addu $at, $at, $t2 +/* 02884 80987464 8C2A8A04 */ lw $t2, %lo(jtbl_80988A04)($at) +/* 02888 80987468 01400008 */ jr $t2 /* 0288C 8098746C 00000000 */ nop glabel L80987470 /* 02890 80987470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02894 80987474 0C261618 */ jal func_80985860 +/* 02894 80987474 0C261618 */ jal func_80985860 /* 02898 80987478 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0289C 8098747C 10000019 */ beq $zero, $zero, .L809874E4 -/* 028A0 80987480 8FBF002C */ lw $ra, 0x002C($sp) +/* 0289C 8098747C 10000019 */ beq $zero, $zero, .L809874E4 +/* 028A0 80987480 8FBF002C */ lw $ra, 0x002C($sp) glabel L80987484 /* 028A4 80987484 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028A8 80987488 0C261798 */ jal func_80985E60 +/* 028A8 80987488 0C261798 */ jal func_80985E60 /* 028AC 8098748C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028B0 80987490 10000014 */ beq $zero, $zero, .L809874E4 -/* 028B4 80987494 8FBF002C */ lw $ra, 0x002C($sp) +/* 028B0 80987490 10000014 */ beq $zero, $zero, .L809874E4 +/* 028B4 80987494 8FBF002C */ lw $ra, 0x002C($sp) glabel L80987498 /* 028B8 80987498 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028BC 8098749C 0C26194B */ jal func_8098652C +/* 028BC 8098749C 0C26194B */ jal func_8098652C /* 028C0 809874A0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028C4 809874A4 1000000F */ beq $zero, $zero, .L809874E4 -/* 028C8 809874A8 8FBF002C */ lw $ra, 0x002C($sp) +/* 028C4 809874A4 1000000F */ beq $zero, $zero, .L809874E4 +/* 028C8 809874A8 8FBF002C */ lw $ra, 0x002C($sp) glabel L809874AC /* 028CC 809874AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028D0 809874B0 0C261A6C */ jal func_809869B0 +/* 028D0 809874B0 0C261A6C */ jal func_809869B0 /* 028D4 809874B4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028D8 809874B8 1000000A */ beq $zero, $zero, .L809874E4 -/* 028DC 809874BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 028D8 809874B8 1000000A */ beq $zero, $zero, .L809874E4 +/* 028DC 809874BC 8FBF002C */ lw $ra, 0x002C($sp) glabel L809874C0 /* 028E0 809874C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028E4 809874C4 0C261C06 */ jal func_80987018 +/* 028E4 809874C4 0C261C06 */ jal func_80987018 /* 028E8 809874C8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028EC 809874CC 10000005 */ beq $zero, $zero, .L809874E4 -/* 028F0 809874D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 028EC 809874CC 10000005 */ beq $zero, $zero, .L809874E4 +/* 028F0 809874D0 8FBF002C */ lw $ra, 0x002C($sp) .L809874D4: /* 028F4 809874D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028F8 809874D8 0C2614C4 */ jal func_80985310 +/* 028F8 809874D8 0C2614C4 */ jal func_80985310 /* 028FC 809874DC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02900 809874E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 02900 809874E0 8FBF002C */ lw $ra, 0x002C($sp) .L809874E4: -/* 02904 809874E4 8FB00024 */ lw $s0, 0x0024($sp) -/* 02908 809874E8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0290C 809874EC 03E00008 */ jr $ra +/* 02904 809874E4 8FB00024 */ lw $s0, 0x0024($sp) +/* 02908 809874E8 8FB10028 */ lw $s1, 0x0028($sp) +/* 0290C 809874EC 03E00008 */ jr $ra /* 02910 809874F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s index dcd7e99143..1d28409eb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s @@ -1,45 +1,45 @@ glabel func_80985CE8 /* 01108 80985CE8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 0110C 80985CEC AFBF002C */ sw $ra, 0x002C($sp) -/* 01110 80985CF0 AFB00028 */ sw $s0, 0x0028($sp) -/* 01114 80985CF4 AFA40078 */ sw $a0, 0x0078($sp) -/* 01118 80985CF8 AFA5007C */ sw $a1, 0x007C($sp) +/* 0110C 80985CEC AFBF002C */ sw $ra, 0x002C($sp) +/* 01110 80985CF0 AFB00028 */ sw $s0, 0x0028($sp) +/* 01114 80985CF4 AFA40078 */ sw $a0, 0x0078($sp) +/* 01118 80985CF8 AFA5007C */ sw $a1, 0x007C($sp) /* 0111C 80985CFC 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 01120 80985D00 3C188098 */ lui $t8, %hi(D_80987830) ## $t8 = 80980000 /* 01124 80985D04 3C068099 */ lui $a2, %hi(D_80988810) ## $a2 = 80990000 -/* 01128 80985D08 00027880 */ sll $t7, $v0, 2 -/* 0112C 80985D0C 030FC021 */ addu $t8, $t8, $t7 -/* 01130 80985D10 8F187830 */ lw $t8, %lo(D_80987830)($t8) +/* 01128 80985D08 00027880 */ sll $t7, $v0, 2 +/* 0112C 80985D0C 030FC021 */ addu $t8, $t8, $t7 +/* 01130 80985D10 8F187830 */ lw $t8, %lo(D_80987830)($t8) /* 01134 80985D14 24C68810 */ addiu $a2, $a2, %lo(D_80988810) ## $a2 = 80988810 /* 01138 80985D18 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 0113C 80985D1C AFB80068 */ sw $t8, 0x0068($sp) +/* 0113C 80985D1C AFB80068 */ sw $t8, 0x0068($sp) /* 01140 80985D20 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01144 80985D24 24070119 */ addiu $a3, $zero, 0x0119 ## $a3 = 00000119 -/* 01148 80985D28 0C031AB1 */ jal func_800C6AC4 +/* 01148 80985D28 0C031AB1 */ jal func_800C6AC4 /* 0114C 80985D2C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01150 80985D30 8FA9007C */ lw $t1, 0x007C($sp) -/* 01154 80985D34 0C024F61 */ jal func_80093D84 +/* 01150 80985D30 8FA9007C */ lw $t1, 0x007C($sp) +/* 01154 80985D34 0C024F61 */ jal func_80093D84 /* 01158 80985D38 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 0115C 80985D3C 8FA70068 */ lw $a3, 0x0068($sp) +/* 0115C 80985D3C 8FA70068 */ lw $a3, 0x0068($sp) /* 01160 80985D40 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01164 80985D44 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01168 80985D48 00076100 */ sll $t4, $a3, 4 -/* 0116C 80985D4C 000C6F02 */ srl $t5, $t4, 28 +/* 01168 80985D48 00076100 */ sll $t4, $a3, 4 +/* 0116C 80985D4C 000C6F02 */ srl $t5, $t4, 28 /* 01170 80985D50 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 01174 80985D54 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 01178 80985D58 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 0117C 80985D5C 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 01180 80985D60 000D7080 */ sll $t6, $t5, 2 +/* 01180 80985D60 000D7080 */ sll $t6, $t5, 2 /* 01184 80985D64 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 01188 80985D68 01CF2021 */ addu $a0, $t6, $t7 +/* 01188 80985D68 01CF2021 */ addu $a0, $t6, $t7 /* 0118C 80985D6C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 01190 80985D70 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 01194 80985D74 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01198 80985D78 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0119C 80985D7C 00E12824 */ and $a1, $a3, $at +/* 0119C 80985D7C 00E12824 */ and $a1, $a3, $at /* 011A0 80985D80 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 011A4 80985D84 0305C821 */ addu $t9, $t8, $a1 -/* 011A8 80985D88 03264821 */ addu $t1, $t9, $a2 +/* 011A4 80985D84 0305C821 */ addu $t9, $t8, $a1 +/* 011A8 80985D88 03264821 */ addu $t1, $t9, $a2 /* 011AC 80985D8C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 011B0 80985D90 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 011B4 80985D94 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,11 +50,11 @@ glabel func_80985CE8 /* 011C8 80985DA8 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 011CC 80985DAC 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 /* 011D0 80985DB0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 011D4 80985DB4 01856821 */ addu $t5, $t4, $a1 -/* 011D8 80985DB8 01A67021 */ addu $t6, $t5, $a2 +/* 011D4 80985DB4 01856821 */ addu $t5, $t4, $a1 +/* 011D8 80985DB8 01A67021 */ addu $t6, $t5, $a2 /* 011DC 80985DBC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 011E0 80985DC0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 011E4 80985DC4 8FA80078 */ lw $t0, 0x0078($sp) +/* 011E4 80985DC4 8FA80078 */ lw $t0, 0x0078($sp) /* 011E8 80985DC8 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 /* 011EC 80985DCC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 011F0 80985DD0 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 @@ -73,25 +73,25 @@ glabel func_80985CE8 /* 01224 80985E04 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 01228 80985E08 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 0122C 80985E0C 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01230 80985E10 AFA00018 */ sw $zero, 0x0018($sp) -/* 01234 80985E14 AFA00014 */ sw $zero, 0x0014($sp) -/* 01238 80985E18 AFA00010 */ sw $zero, 0x0010($sp) +/* 01230 80985E10 AFA00018 */ sw $zero, 0x0018($sp) +/* 01234 80985E14 AFA00014 */ sw $zero, 0x0014($sp) +/* 01238 80985E18 AFA00010 */ sw $zero, 0x0010($sp) /* 0123C 80985E1C 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 01240 80985E20 8FA4007C */ lw $a0, 0x007C($sp) -/* 01244 80985E24 0C0289CF */ jal func_800A273C -/* 01248 80985E28 AFAD001C */ sw $t5, 0x001C($sp) +/* 01240 80985E20 8FA4007C */ lw $a0, 0x007C($sp) +/* 01244 80985E24 0C0289CF */ jal SkelAnime_DrawSV2 +/* 01248 80985E28 AFAD001C */ sw $t5, 0x001C($sp) /* 0124C 80985E2C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 01250 80985E30 8FAE007C */ lw $t6, 0x007C($sp) +/* 01250 80985E30 8FAE007C */ lw $t6, 0x007C($sp) /* 01254 80985E34 3C068099 */ lui $a2, %hi(D_80988834) ## $a2 = 80990000 /* 01258 80985E38 24C68834 */ addiu $a2, $a2, %lo(D_80988834) ## $a2 = 80988834 /* 0125C 80985E3C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 01260 80985E40 24070134 */ addiu $a3, $zero, 0x0134 ## $a3 = 00000134 -/* 01264 80985E44 0C031AD5 */ jal func_800C6B54 +/* 01264 80985E44 0C031AD5 */ jal func_800C6B54 /* 01268 80985E48 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 0126C 80985E4C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01270 80985E50 8FB00028 */ lw $s0, 0x0028($sp) +/* 0126C 80985E4C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01270 80985E50 8FB00028 */ lw $s0, 0x0028($sp) /* 01274 80985E54 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 01278 80985E58 03E00008 */ jr $ra +/* 01278 80985E58 03E00008 */ jr $ra /* 0127C 80985E5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s index 075769e57a..c815c5b443 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s @@ -1,45 +1,45 @@ glabel func_80987658 /* 02A78 80987658 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 02A7C 8098765C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02A80 80987660 AFA40070 */ sw $a0, 0x0070($sp) -/* 02A84 80987664 AFA50074 */ sw $a1, 0x0074($sp) +/* 02A7C 8098765C AFBF0024 */ sw $ra, 0x0024($sp) +/* 02A80 80987660 AFA40070 */ sw $a0, 0x0070($sp) +/* 02A84 80987664 AFA50074 */ sw $a1, 0x0074($sp) /* 02A88 80987668 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 02A8C 8098766C 3C188098 */ lui $t8, %hi(D_80987830) ## $t8 = 80980000 /* 02A90 80987670 3C068099 */ lui $a2, %hi(D_80988980) ## $a2 = 80990000 -/* 02A94 80987674 00027880 */ sll $t7, $v0, 2 -/* 02A98 80987678 030FC021 */ addu $t8, $t8, $t7 -/* 02A9C 8098767C 8F187830 */ lw $t8, %lo(D_80987830)($t8) +/* 02A94 80987674 00027880 */ sll $t7, $v0, 2 +/* 02A98 80987678 030FC021 */ addu $t8, $t8, $t7 +/* 02A9C 8098767C 8F187830 */ lw $t8, %lo(D_80987830)($t8) /* 02AA0 80987680 24C68980 */ addiu $a2, $a2, %lo(D_80988980) ## $a2 = 80988980 /* 02AA4 80987684 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 02AA8 80987688 AFB80060 */ sw $t8, 0x0060($sp) +/* 02AA8 80987688 AFB80060 */ sw $t8, 0x0060($sp) /* 02AAC 8098768C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02AB0 80987690 24070388 */ addiu $a3, $zero, 0x0388 ## $a3 = 00000388 -/* 02AB4 80987694 0C031AB1 */ jal func_800C6AC4 -/* 02AB8 80987698 AFA50058 */ sw $a1, 0x0058($sp) -/* 02ABC 8098769C 8FA90074 */ lw $t1, 0x0074($sp) -/* 02AC0 809876A0 0C024F46 */ jal func_80093D18 +/* 02AB4 80987694 0C031AB1 */ jal func_800C6AC4 +/* 02AB8 80987698 AFA50058 */ sw $a1, 0x0058($sp) +/* 02ABC 8098769C 8FA90074 */ lw $t1, 0x0074($sp) +/* 02AC0 809876A0 0C024F46 */ jal func_80093D18 /* 02AC4 809876A4 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 02AC8 809876A8 8FA80058 */ lw $t0, 0x0058($sp) -/* 02ACC 809876AC 8FA70060 */ lw $a3, 0x0060($sp) +/* 02AC8 809876A8 8FA80058 */ lw $t0, 0x0058($sp) +/* 02ACC 809876AC 8FA70060 */ lw $a3, 0x0060($sp) /* 02AD0 809876B0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 02AD4 809876B4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02AD8 809876B8 00076100 */ sll $t4, $a3, 4 -/* 02ADC 809876BC 000C6F02 */ srl $t5, $t4, 28 +/* 02AD8 809876B8 00076100 */ sll $t4, $a3, 4 +/* 02ADC 809876BC 000C6F02 */ srl $t5, $t4, 28 /* 02AE0 809876C0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 02AE4 809876C4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 02AE8 809876C8 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 02AEC 809876CC 000D7080 */ sll $t6, $t5, 2 +/* 02AEC 809876CC 000D7080 */ sll $t6, $t5, 2 /* 02AF0 809876D0 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 02AF4 809876D4 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 02AF8 809876D8 01CF2021 */ addu $a0, $t6, $t7 +/* 02AF8 809876D8 01CF2021 */ addu $a0, $t6, $t7 /* 02AFC 809876DC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 02B00 809876E0 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 02B04 809876E4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 02B08 809876E8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02B0C 809876EC 00E12824 */ and $a1, $a3, $at +/* 02B0C 809876EC 00E12824 */ and $a1, $a3, $at /* 02B10 809876F0 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 02B14 809876F4 0305C821 */ addu $t9, $t8, $a1 -/* 02B18 809876F8 03264821 */ addu $t1, $t9, $a2 +/* 02B14 809876F4 0305C821 */ addu $t9, $t8, $a1 +/* 02B18 809876F8 03264821 */ addu $t1, $t9, $a2 /* 02B1C 809876FC AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 02B20 80987700 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02B24 80987704 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,8 +50,8 @@ glabel func_80987658 /* 02B38 80987718 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 02B3C 8098771C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 02B40 80987720 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 02B44 80987724 01856821 */ addu $t5, $t4, $a1 -/* 02B48 80987728 01A67021 */ addu $t6, $t5, $a2 +/* 02B44 80987724 01856821 */ addu $t5, $t4, $a1 +/* 02B48 80987728 01A67021 */ addu $t6, $t5, $a2 /* 02B4C 8098772C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 02B50 80987730 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02B54 80987734 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 @@ -67,7 +67,7 @@ glabel func_80987658 /* 02B7C 8098775C AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 02B80 80987760 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 02B84 80987764 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 02B88 80987768 8FA30070 */ lw $v1, 0x0070($sp) +/* 02B88 80987768 8FA30070 */ lw $v1, 0x0070($sp) /* 02B8C 8098776C 3C0D8098 */ lui $t5, %hi(func_809875C0) ## $t5 = 80980000 /* 02B90 80987770 3C0C8098 */ lui $t4, %hi(func_80987514) ## $t4 = 80980000 /* 02B94 80987774 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C @@ -76,21 +76,21 @@ glabel func_80987658 /* 02BA0 80987780 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E /* 02BA4 80987784 258C7514 */ addiu $t4, $t4, %lo(func_80987514) ## $t4 = 80987514 /* 02BA8 80987788 25AD75C0 */ addiu $t5, $t5, %lo(func_809875C0) ## $t5 = 809875C0 -/* 02BAC 8098778C AFAD0014 */ sw $t5, 0x0014($sp) -/* 02BB0 80987790 AFAC0010 */ sw $t4, 0x0010($sp) -/* 02BB4 80987794 8FA40074 */ lw $a0, 0x0074($sp) -/* 02BB8 80987798 0C0286B2 */ jal func_800A1AC8 -/* 02BBC 8098779C AFA30018 */ sw $v1, 0x0018($sp) -/* 02BC0 809877A0 8FAE0074 */ lw $t6, 0x0074($sp) +/* 02BAC 8098778C AFAD0014 */ sw $t5, 0x0014($sp) +/* 02BB0 80987790 AFAC0010 */ sw $t4, 0x0010($sp) +/* 02BB4 80987794 8FA40074 */ lw $a0, 0x0074($sp) +/* 02BB8 80987798 0C0286B2 */ jal SkelAnime_DrawSV +/* 02BBC 8098779C AFA30018 */ sw $v1, 0x0018($sp) +/* 02BC0 809877A0 8FAE0074 */ lw $t6, 0x0074($sp) /* 02BC4 809877A4 3C068099 */ lui $a2, %hi(D_80988990) ## $a2 = 80990000 /* 02BC8 809877A8 24C68990 */ addiu $a2, $a2, %lo(D_80988990) ## $a2 = 80988990 /* 02BCC 809877AC 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 02BD0 809877B0 2407039D */ addiu $a3, $zero, 0x039D ## $a3 = 0000039D -/* 02BD4 809877B4 0C031AD5 */ jal func_800C6B54 +/* 02BD4 809877B4 0C031AD5 */ jal func_800C6B54 /* 02BD8 809877B8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 02BDC 809877BC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02BDC 809877BC 8FBF0024 */ lw $ra, 0x0024($sp) /* 02BE0 809877C0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 02BE4 809877C4 03E00008 */ jr $ra +/* 02BE4 809877C4 03E00008 */ jr $ra /* 02BE8 809877C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s index c375916d27..aec9c036ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s @@ -1,11 +1,11 @@ glabel DemoSa_Destroy /* 00000 8098E460 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 8098E464 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 8098E468 0C0295BC */ jal func_800A56F0 +/* 00004 8098E464 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00008 8098E468 0C0295BC */ jal SkelAnime_Free /* 0000C 8098E46C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 8098E470 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00010 8098E470 8FBF0014 */ lw $ra, 0x0014($sp) /* 00014 8098E474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 8098E478 03E00008 */ jr $ra +/* 00018 8098E478 03E00008 */ jr $ra /* 0001C 8098E47C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s index 4c8339418e..2447843bed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s @@ -1,31 +1,31 @@ glabel func_8098E7FC /* 0039C 8098E7FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003A0 8098E800 AFA40028 */ sw $a0, 0x0028($sp) -/* 003A4 8098E804 AFA5002C */ sw $a1, 0x002C($sp) +/* 003A0 8098E800 AFA40028 */ sw $a0, 0x0028($sp) +/* 003A4 8098E804 AFA5002C */ sw $a1, 0x002C($sp) /* 003A8 8098E808 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003AC 8098E80C 8FA50028 */ lw $a1, 0x0028($sp) -/* 003B0 8098E810 AFBF0024 */ sw $ra, 0x0024($sp) +/* 003AC 8098E80C 8FA50028 */ lw $a1, 0x0028($sp) +/* 003B0 8098E810 AFBF0024 */ sw $ra, 0x0024($sp) /* 003B4 8098E814 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 003B8 8098E818 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 003BC 8098E81C 24E721D8 */ addiu $a3, $a3, 0x21D8 ## $a3 = 060021D8 /* 003C0 8098E820 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 003C4 8098E824 AFA00010 */ sw $zero, 0x0010($sp) -/* 003C8 8098E828 AFA00014 */ sw $zero, 0x0014($sp) -/* 003CC 8098E82C AFA00018 */ sw $zero, 0x0018($sp) -/* 003D0 8098E830 0C0291BE */ jal func_800A46F8 +/* 003C4 8098E824 AFA00010 */ sw $zero, 0x0010($sp) +/* 003C8 8098E828 AFA00014 */ sw $zero, 0x0014($sp) +/* 003CC 8098E82C AFA00018 */ sw $zero, 0x0018($sp) +/* 003D0 8098E830 0C0291BE */ jal SkelAnime_InitSV /* 003D4 8098E834 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C /* 003D8 8098E838 3C018099 */ lui $at, %hi(D_80990F34) ## $at = 80990000 -/* 003DC 8098E83C 8FA40028 */ lw $a0, 0x0028($sp) -/* 003E0 8098E840 C4240F34 */ lwc1 $f4, %lo(D_80990F34)($at) +/* 003DC 8098E83C 8FA40028 */ lw $a0, 0x0028($sp) +/* 003E0 8098E840 C4240F34 */ lwc1 $f4, %lo(D_80990F34)($at) /* 003E4 8098E844 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 003E8 8098E848 0C263942 */ jal func_8098E508 +/* 003E8 8098E848 0C263942 */ jal func_8098E508 /* 003EC 8098E84C E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC -/* 003F0 8098E850 8FA40028 */ lw $a0, 0x0028($sp) -/* 003F4 8098E854 0C263947 */ jal func_8098E51C +/* 003F0 8098E850 8FA40028 */ lw $a0, 0x0028($sp) +/* 003F4 8098E854 0C263947 */ jal func_8098E51C /* 003F8 8098E858 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003FC 8098E85C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 003FC 8098E85C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00400 8098E860 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00404 8098E864 03E00008 */ jr $ra +/* 00404 8098E864 03E00008 */ jr $ra /* 00408 8098E868 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s index b3648e0f40..105f1b8f1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s @@ -1,52 +1,52 @@ glabel func_8098ECF4 /* 00894 8098ECF4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00898 8098ECF8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00898 8098ECF8 AFB00028 */ sw $s0, 0x0028($sp) /* 0089C 8098ECFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008A0 8098ED00 AFBF002C */ sw $ra, 0x002C($sp) +/* 008A0 8098ED00 AFBF002C */ sw $ra, 0x002C($sp) /* 008A4 8098ED04 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 008A8 8098ED08 AFA5004C */ sw $a1, 0x004C($sp) +/* 008A8 8098ED08 AFA5004C */ sw $a1, 0x004C($sp) /* 008AC 8098ED0C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 008B0 8098ED10 24841334 */ addiu $a0, $a0, 0x1334 ## $a0 = 06001334 /* 008B4 8098ED14 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008B8 8098ED18 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 008BC 8098ED1C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 008C0 8098ED20 468021A0 */ cvt.s.w $f6, $f4 +/* 008C0 8098ED20 468021A0 */ cvt.s.w $f6, $f4 /* 008C4 8098ED24 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 008C8 8098ED28 AFA50034 */ sw $a1, 0x0034($sp) -/* 008CC 8098ED2C 8FA4004C */ lw $a0, 0x004C($sp) +/* 008C8 8098ED28 AFA50034 */ sw $a1, 0x0034($sp) +/* 008CC 8098ED2C 8FA4004C */ lw $a0, 0x004C($sp) /* 008D0 8098ED30 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008D4 8098ED34 AFA00010 */ sw $zero, 0x0010($sp) -/* 008D8 8098ED38 E7A60038 */ swc1 $f6, 0x0038($sp) -/* 008DC 8098ED3C AFA00014 */ sw $zero, 0x0014($sp) -/* 008E0 8098ED40 0C0291BE */ jal func_800A46F8 -/* 008E4 8098ED44 AFA00018 */ sw $zero, 0x0018($sp) +/* 008D4 8098ED34 AFA00010 */ sw $zero, 0x0010($sp) +/* 008D8 8098ED38 E7A60038 */ swc1 $f6, 0x0038($sp) +/* 008DC 8098ED3C AFA00014 */ sw $zero, 0x0014($sp) +/* 008E0 8098ED40 0C0291BE */ jal SkelAnime_InitSV +/* 008E4 8098ED44 AFA00018 */ sw $zero, 0x0018($sp) /* 008E8 8098ED48 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 008EC 8098ED4C C7A80038 */ lwc1 $f8, 0x0038($sp) +/* 008EC 8098ED4C C7A80038 */ lwc1 $f8, 0x0038($sp) /* 008F0 8098ED50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008F4 8098ED54 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 008F8 8098ED58 44070000 */ mfc1 $a3, $f0 -/* 008FC 8098ED5C AFAE0014 */ sw $t6, 0x0014($sp) +/* 008F8 8098ED58 44070000 */ mfc1 $a3, $f0 +/* 008FC 8098ED5C AFAE0014 */ sw $t6, 0x0014($sp) /* 00900 8098ED60 24A51334 */ addiu $a1, $a1, 0x1334 ## $a1 = 06001334 -/* 00904 8098ED64 8FA40034 */ lw $a0, 0x0034($sp) +/* 00904 8098ED64 8FA40034 */ lw $a0, 0x0034($sp) /* 00908 8098ED68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0090C 8098ED6C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0090C 8098ED6C E7A80010 */ swc1 $f8, 0x0010($sp) /* 00910 8098ED70 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00914 8098ED74 E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 00914 8098ED74 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00918 8098ED78 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 /* 0091C 8098ED7C AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 /* 00920 8098ED80 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 /* 00924 8098ED84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00928 8098ED88 0C263942 */ jal func_8098E508 +/* 00928 8098ED88 0C263942 */ jal func_8098E508 /* 0092C 8098ED8C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 00930 8098ED90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00934 8098ED94 0C263947 */ jal func_8098E51C +/* 00934 8098ED94 0C263947 */ jal func_8098E51C /* 00938 8098ED98 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 0093C 8098ED9C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00940 8098EDA0 8FB00028 */ lw $s0, 0x0028($sp) +/* 0093C 8098ED9C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00940 8098EDA0 8FB00028 */ lw $s0, 0x0028($sp) /* 00944 8098EDA4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00948 8098EDA8 03E00008 */ jr $ra +/* 00948 8098EDA8 03E00008 */ jr $ra /* 0094C 8098EDAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s index a374463329..51110e9dce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s @@ -1,51 +1,51 @@ glabel func_8098F1C0 /* 00D60 8098F1C0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 00D64 8098F1C4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00D68 8098F1C8 AFB00028 */ sw $s0, 0x0028($sp) -/* 00D6C 8098F1CC AFA40088 */ sw $a0, 0x0088($sp) -/* 00D70 8098F1D0 AFA5008C */ sw $a1, 0x008C($sp) +/* 00D64 8098F1C4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00D68 8098F1C8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00D6C 8098F1CC AFA40088 */ sw $a0, 0x0088($sp) +/* 00D70 8098F1D0 AFA5008C */ sw $a1, 0x008C($sp) /* 00D74 8098F1D4 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 00D78 8098F1D8 3C188099 */ lui $t8, %hi(D_809900E0) ## $t8 = 80990000 /* 00D7C 8098F1DC 3C0A8099 */ lui $t2, %hi(D_809900F4) ## $t2 = 80990000 -/* 00D80 8098F1E0 00027880 */ sll $t7, $v0, 2 -/* 00D84 8098F1E4 030FC021 */ addu $t8, $t8, $t7 -/* 00D88 8098F1E8 8F1800E0 */ lw $t8, %lo(D_809900E0)($t8) +/* 00D80 8098F1E0 00027880 */ sll $t7, $v0, 2 +/* 00D84 8098F1E4 030FC021 */ addu $t8, $t8, $t7 +/* 00D88 8098F1E8 8F1800E0 */ lw $t8, %lo(D_809900E0)($t8) /* 00D8C 8098F1EC 3C068099 */ lui $a2, %hi(D_80990DE0) ## $a2 = 80990000 /* 00D90 8098F1F0 24C60DE0 */ addiu $a2, $a2, %lo(D_80990DE0) ## $a2 = 80990DE0 -/* 00D94 8098F1F4 AFB80078 */ sw $t8, 0x0078($sp) +/* 00D94 8098F1F4 AFB80078 */ sw $t8, 0x0078($sp) /* 00D98 8098F1F8 84830194 */ lh $v1, 0x0194($a0) ## 00000194 /* 00D9C 8098F1FC 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 00DA0 8098F200 24070128 */ addiu $a3, $zero, 0x0128 ## $a3 = 00000128 -/* 00DA4 8098F204 0003C880 */ sll $t9, $v1, 2 -/* 00DA8 8098F208 01595021 */ addu $t2, $t2, $t9 -/* 00DAC 8098F20C 8D4A00F4 */ lw $t2, %lo(D_809900F4)($t2) -/* 00DB0 8098F210 AFAA006C */ sw $t2, 0x006C($sp) +/* 00DA4 8098F204 0003C880 */ sll $t9, $v1, 2 +/* 00DA8 8098F208 01595021 */ addu $t2, $t2, $t9 +/* 00DAC 8098F20C 8D4A00F4 */ lw $t2, %lo(D_809900F4)($t2) +/* 00DB0 8098F210 AFAA006C */ sw $t2, 0x006C($sp) /* 00DB4 8098F214 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00DB8 8098F218 0C031AB1 */ jal func_800C6AC4 +/* 00DB8 8098F218 0C031AB1 */ jal func_800C6AC4 /* 00DBC 8098F21C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00DC0 8098F220 8FAC008C */ lw $t4, 0x008C($sp) -/* 00DC4 8098F224 0C024F61 */ jal func_80093D84 +/* 00DC0 8098F220 8FAC008C */ lw $t4, 0x008C($sp) +/* 00DC4 8098F224 0C024F61 */ jal func_80093D84 /* 00DC8 8098F228 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 00DCC 8098F22C 8FA90078 */ lw $t1, 0x0078($sp) +/* 00DCC 8098F22C 8FA90078 */ lw $t1, 0x0078($sp) /* 00DD0 8098F230 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00DD4 8098F234 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 00DD8 8098F238 0009C100 */ sll $t8, $t1, 4 -/* 00DDC 8098F23C 00187702 */ srl $t6, $t8, 28 +/* 00DD8 8098F238 0009C100 */ sll $t8, $t1, 4 +/* 00DDC 8098F23C 00187702 */ srl $t6, $t8, 28 /* 00DE0 8098F240 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 00DE4 8098F244 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 00DE8 8098F248 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 00DEC 8098F24C 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 00DF0 8098F250 000EC880 */ sll $t9, $t6, 2 +/* 00DF0 8098F250 000EC880 */ sll $t9, $t6, 2 /* 00DF4 8098F254 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 00DF8 8098F258 00F92021 */ addu $a0, $a3, $t9 +/* 00DF8 8098F258 00F92021 */ addu $a0, $a3, $t9 /* 00DFC 8098F25C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 00E00 8098F260 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 /* 00E04 8098F264 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 /* 00E08 8098F268 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 00E0C 8098F26C 01282824 */ and $a1, $t1, $t0 +/* 00E0C 8098F26C 01282824 */ and $a1, $t1, $t0 /* 00E10 8098F270 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00E14 8098F274 01455821 */ addu $t3, $t2, $a1 -/* 00E18 8098F278 01666021 */ addu $t4, $t3, $a2 +/* 00E14 8098F274 01455821 */ addu $t3, $t2, $a1 +/* 00E18 8098F278 01666021 */ addu $t4, $t3, $a2 /* 00E1C 8098F27C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 00E20 8098F280 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00E24 8098F284 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -56,26 +56,26 @@ glabel func_8098F1C0 /* 00E38 8098F298 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 00E3C 8098F29C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 00E40 8098F2A0 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 -/* 00E44 8098F2A4 03057021 */ addu $t6, $t8, $a1 -/* 00E48 8098F2A8 01C6C821 */ addu $t9, $t6, $a2 +/* 00E44 8098F2A4 03057021 */ addu $t6, $t8, $a1 +/* 00E48 8098F2A8 01C6C821 */ addu $t9, $t6, $a2 /* 00E4C 8098F2AC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00E50 8098F2B0 8FA4006C */ lw $a0, 0x006C($sp) +/* 00E50 8098F2B0 8FA4006C */ lw $a0, 0x006C($sp) /* 00E54 8098F2B4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00E58 8098F2B8 00046100 */ sll $t4, $a0, 4 -/* 00E5C 8098F2BC 000C6F02 */ srl $t5, $t4, 28 +/* 00E58 8098F2B8 00046100 */ sll $t4, $a0, 4 +/* 00E5C 8098F2BC 000C6F02 */ srl $t5, $t4, 28 /* 00E60 8098F2C0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 00E64 8098F2C4 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00E68 8098F2C8 000D7880 */ sll $t7, $t5, 2 -/* 00E6C 8098F2CC 00EFC021 */ addu $t8, $a3, $t7 +/* 00E68 8098F2C8 000D7880 */ sll $t7, $t5, 2 +/* 00E6C 8098F2CC 00EFC021 */ addu $t8, $a3, $t7 /* 00E70 8098F2D0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 00E74 8098F2D4 8F0E0000 */ lw $t6, 0x0000($t8) ## 00000000 -/* 00E78 8098F2D8 0088C824 */ and $t9, $a0, $t0 +/* 00E78 8098F2D8 0088C824 */ and $t9, $a0, $t0 /* 00E7C 8098F2DC 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 00E80 8098F2E0 01D95021 */ addu $t2, $t6, $t9 -/* 00E84 8098F2E4 01465821 */ addu $t3, $t2, $a2 +/* 00E80 8098F2E0 01D95021 */ addu $t2, $t6, $t9 +/* 00E84 8098F2E4 01465821 */ addu $t3, $t2, $a2 /* 00E88 8098F2E8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 00E8C 8098F2EC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00E90 8098F2F0 8FA80088 */ lw $t0, 0x0088($sp) +/* 00E90 8098F2F0 8FA80088 */ lw $t0, 0x0088($sp) /* 00E94 8098F2F4 3C0A8011 */ lui $t2, 0x8011 ## $t2 = 80110000 /* 00E98 8098F2F8 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 00E9C 8098F2FC AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 @@ -95,25 +95,25 @@ glabel func_8098F1C0 /* 00ED4 8098F334 8C450004 */ lw $a1, 0x0004($v0) ## 0100014F /* 00ED8 8098F338 8C460020 */ lw $a2, 0x0020($v0) ## 0100016B /* 00EDC 8098F33C 90470002 */ lbu $a3, 0x0002($v0) ## 0100014D -/* 00EE0 8098F340 AFA00018 */ sw $zero, 0x0018($sp) -/* 00EE4 8098F344 AFA00014 */ sw $zero, 0x0014($sp) -/* 00EE8 8098F348 AFA00010 */ sw $zero, 0x0010($sp) +/* 00EE0 8098F340 AFA00018 */ sw $zero, 0x0018($sp) +/* 00EE4 8098F344 AFA00014 */ sw $zero, 0x0014($sp) +/* 00EE8 8098F348 AFA00010 */ sw $zero, 0x0010($sp) /* 00EEC 8098F34C 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 -/* 00EF0 8098F350 8FA4008C */ lw $a0, 0x008C($sp) -/* 00EF4 8098F354 0C0289CF */ jal func_800A273C -/* 00EF8 8098F358 AFAB001C */ sw $t3, 0x001C($sp) +/* 00EF0 8098F350 8FA4008C */ lw $a0, 0x008C($sp) +/* 00EF4 8098F354 0C0289CF */ jal SkelAnime_DrawSV2 +/* 00EF8 8098F358 AFAB001C */ sw $t3, 0x001C($sp) /* 00EFC 8098F35C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00F00 8098F360 8FAC008C */ lw $t4, 0x008C($sp) +/* 00F00 8098F360 8FAC008C */ lw $t4, 0x008C($sp) /* 00F04 8098F364 3C068099 */ lui $a2, %hi(D_80990E04) ## $a2 = 80990000 /* 00F08 8098F368 24C60E04 */ addiu $a2, $a2, %lo(D_80990E04) ## $a2 = 80990E04 /* 00F0C 8098F36C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 00F10 8098F370 24070145 */ addiu $a3, $zero, 0x0145 ## $a3 = 00000145 -/* 00F14 8098F374 0C031AD5 */ jal func_800C6B54 +/* 00F14 8098F374 0C031AD5 */ jal func_800C6B54 /* 00F18 8098F378 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00F1C 8098F37C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00F20 8098F380 8FB00028 */ lw $s0, 0x0028($sp) +/* 00F1C 8098F37C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00F20 8098F380 8FB00028 */ lw $s0, 0x0028($sp) /* 00F24 8098F384 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 00F28 8098F388 03E00008 */ jr $ra +/* 00F28 8098F388 03E00008 */ jr $ra /* 00F2C 8098F38C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s index af44e378c8..12795fd6f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s @@ -1,27 +1,27 @@ glabel func_8098F390 /* 00F30 8098F390 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F34 8098F394 AFA40028 */ sw $a0, 0x0028($sp) -/* 00F38 8098F398 AFA5002C */ sw $a1, 0x002C($sp) +/* 00F34 8098F394 AFA40028 */ sw $a0, 0x0028($sp) +/* 00F38 8098F398 AFA5002C */ sw $a1, 0x002C($sp) /* 00F3C 8098F39C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00F40 8098F3A0 8FA50028 */ lw $a1, 0x0028($sp) -/* 00F44 8098F3A4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00F40 8098F3A0 8FA50028 */ lw $a1, 0x0028($sp) +/* 00F44 8098F3A4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00F48 8098F3A8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00F4C 8098F3AC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00F50 8098F3B0 24E721D8 */ addiu $a3, $a3, 0x21D8 ## $a3 = 060021D8 /* 00F54 8098F3B4 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 00F58 8098F3B8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00F5C 8098F3BC AFA00014 */ sw $zero, 0x0014($sp) -/* 00F60 8098F3C0 AFA00018 */ sw $zero, 0x0018($sp) -/* 00F64 8098F3C4 0C0291BE */ jal func_800A46F8 +/* 00F58 8098F3B8 AFA00010 */ sw $zero, 0x0010($sp) +/* 00F5C 8098F3BC AFA00014 */ sw $zero, 0x0014($sp) +/* 00F60 8098F3C0 AFA00018 */ sw $zero, 0x0018($sp) +/* 00F64 8098F3C4 0C0291BE */ jal SkelAnime_InitSV /* 00F68 8098F3C8 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00F6C 8098F3CC 8FA20028 */ lw $v0, 0x0028($sp) +/* 00F6C 8098F3CC 8FA20028 */ lw $v0, 0x0028($sp) /* 00F70 8098F3D0 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 00F74 8098F3D4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00F78 8098F3D8 AC4E0198 */ sw $t6, 0x0198($v0) ## 00000198 /* 00F7C 8098F3DC AC4F019C */ sw $t7, 0x019C($v0) ## 0000019C -/* 00F80 8098F3E0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00F80 8098F3E0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00F84 8098F3E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00F88 8098F3E8 03E00008 */ jr $ra +/* 00F88 8098F3E8 03E00008 */ jr $ra /* 00F8C 8098F3EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s index 9b16c461ac..73b3733a41 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s @@ -1,27 +1,27 @@ glabel func_8098F420 /* 00FC0 8098F420 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00FC4 8098F424 AFA40028 */ sw $a0, 0x0028($sp) -/* 00FC8 8098F428 AFA5002C */ sw $a1, 0x002C($sp) +/* 00FC4 8098F424 AFA40028 */ sw $a0, 0x0028($sp) +/* 00FC8 8098F428 AFA5002C */ sw $a1, 0x002C($sp) /* 00FCC 8098F42C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00FD0 8098F430 8FA50028 */ lw $a1, 0x0028($sp) -/* 00FD4 8098F434 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00FD0 8098F430 8FA50028 */ lw $a1, 0x0028($sp) +/* 00FD4 8098F434 AFBF0024 */ sw $ra, 0x0024($sp) /* 00FD8 8098F438 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00FDC 8098F43C 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 00FE0 8098F440 24E7FFD4 */ addiu $a3, $a3, 0xFFD4 ## $a3 = 0600FFD4 /* 00FE4 8098F444 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 00FE8 8098F448 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FEC 8098F44C AFA00014 */ sw $zero, 0x0014($sp) -/* 00FF0 8098F450 AFA00018 */ sw $zero, 0x0018($sp) -/* 00FF4 8098F454 0C0291BE */ jal func_800A46F8 +/* 00FE8 8098F448 AFA00010 */ sw $zero, 0x0010($sp) +/* 00FEC 8098F44C AFA00014 */ sw $zero, 0x0014($sp) +/* 00FF0 8098F450 AFA00018 */ sw $zero, 0x0018($sp) +/* 00FF4 8098F454 0C0291BE */ jal SkelAnime_InitSV /* 00FF8 8098F458 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00FFC 8098F45C 8FA20028 */ lw $v0, 0x0028($sp) +/* 00FFC 8098F45C 8FA20028 */ lw $v0, 0x0028($sp) /* 01000 8098F460 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B /* 01004 8098F464 AC4E0198 */ sw $t6, 0x0198($v0) ## 00000198 /* 01008 8098F468 AC40019C */ sw $zero, 0x019C($v0) ## 0000019C /* 0100C 8098F46C A04000C8 */ sb $zero, 0x00C8($v0) ## 000000C8 -/* 01010 8098F470 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01010 8098F470 8FBF0024 */ lw $ra, 0x0024($sp) /* 01014 8098F474 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01018 8098F478 03E00008 */ jr $ra +/* 01018 8098F478 03E00008 */ jr $ra /* 0101C 8098F47C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s index 8993576725..1fb66b1c59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s @@ -1,51 +1,51 @@ glabel func_8098F83C /* 013DC 8098F83C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 013E0 8098F840 AFB00038 */ sw $s0, 0x0038($sp) +/* 013E0 8098F840 AFB00038 */ sw $s0, 0x0038($sp) /* 013E4 8098F844 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013E8 8098F848 AFBF003C */ sw $ra, 0x003C($sp) -/* 013EC 8098F84C AFA50044 */ sw $a1, 0x0044($sp) +/* 013E8 8098F848 AFBF003C */ sw $ra, 0x003C($sp) +/* 013EC 8098F84C AFA50044 */ sw $a1, 0x0044($sp) /* 013F0 8098F850 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 013F4 8098F854 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 013F8 8098F858 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 013FC 8098F85C 24E7113C */ addiu $a3, $a3, 0x113C ## $a3 = 0601113C /* 01400 8098F860 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 /* 01404 8098F864 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01408 8098F868 AFA00010 */ sw $zero, 0x0010($sp) -/* 0140C 8098F86C AFA00014 */ sw $zero, 0x0014($sp) -/* 01410 8098F870 0C0291BE */ jal func_800A46F8 -/* 01414 8098F874 AFA00018 */ sw $zero, 0x0018($sp) +/* 01408 8098F868 AFA00010 */ sw $zero, 0x0010($sp) +/* 0140C 8098F86C AFA00014 */ sw $zero, 0x0014($sp) +/* 01410 8098F870 0C0291BE */ jal SkelAnime_InitSV +/* 01414 8098F874 AFA00018 */ sw $zero, 0x0018($sp) /* 01418 8098F878 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 /* 0141C 8098F87C C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000024 -/* 01420 8098F880 8FA60044 */ lw $a2, 0x0044($sp) +/* 01420 8098F880 8FA60044 */ lw $a2, 0x0044($sp) /* 01424 8098F884 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 01428 8098F888 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01428 8098F888 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0142C 8098F88C C4460004 */ lwc1 $f6, 0x0004($v0) ## 00000028 /* 01430 8098F890 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01434 8098F894 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 -/* 01438 8098F898 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 01438 8098F898 E7A60014 */ swc1 $f6, 0x0014($sp) /* 0143C 8098F89C C4480008 */ lwc1 $f8, 0x0008($v0) ## 0000002C -/* 01440 8098F8A0 AFAE0028 */ sw $t6, 0x0028($sp) -/* 01444 8098F8A4 AFA00024 */ sw $zero, 0x0024($sp) -/* 01448 8098F8A8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0144C 8098F8AC AFA0001C */ sw $zero, 0x001C($sp) +/* 01440 8098F8A0 AFAE0028 */ sw $t6, 0x0028($sp) +/* 01444 8098F8A4 AFA00024 */ sw $zero, 0x0024($sp) +/* 01448 8098F8A8 AFA00020 */ sw $zero, 0x0020($sp) +/* 0144C 8098F8AC AFA0001C */ sw $zero, 0x001C($sp) /* 01450 8098F8B0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 01454 8098F8B4 0C00C916 */ jal Actor_SpawnAttached - -/* 01458 8098F8B8 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 01458 8098F8B8 E7A80018 */ swc1 $f8, 0x0018($sp) /* 0145C 8098F8BC 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 /* 01460 8098F8C0 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 /* 01464 8098F8C4 AE00019C */ sw $zero, 0x019C($s0) ## 0000019C /* 01468 8098F8C8 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 /* 0146C 8098F8CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01470 8098F8D0 0C263942 */ jal func_8098E508 +/* 01470 8098F8D0 0C263942 */ jal func_8098E508 /* 01474 8098F8D4 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 01478 8098F8D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0147C 8098F8DC 0C263947 */ jal func_8098E51C +/* 0147C 8098F8DC 0C263947 */ jal func_8098E51C /* 01480 8098F8E0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01484 8098F8E4 8FBF003C */ lw $ra, 0x003C($sp) -/* 01488 8098F8E8 8FB00038 */ lw $s0, 0x0038($sp) +/* 01484 8098F8E4 8FBF003C */ lw $ra, 0x003C($sp) +/* 01488 8098F8E8 8FB00038 */ lw $s0, 0x0038($sp) /* 0148C 8098F8EC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01490 8098F8F0 03E00008 */ jr $ra +/* 01490 8098F8F0 03E00008 */ jr $ra /* 01494 8098F8F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s index 8fc66b0426..2627bdcd53 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s @@ -1,51 +1,51 @@ glabel func_8098FEB4 /* 01A54 8098FEB4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 01A58 8098FEB8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A5C 8098FEBC AFA40080 */ sw $a0, 0x0080($sp) -/* 01A60 8098FEC0 AFA50084 */ sw $a1, 0x0084($sp) +/* 01A58 8098FEB8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01A5C 8098FEBC AFA40080 */ sw $a0, 0x0080($sp) +/* 01A60 8098FEC0 AFA50084 */ sw $a1, 0x0084($sp) /* 01A64 8098FEC4 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 01A68 8098FEC8 3C188099 */ lui $t8, %hi(D_809900E0) ## $t8 = 80990000 /* 01A6C 8098FECC 3C0B8099 */ lui $t3, %hi(D_809900F4) ## $t3 = 80990000 -/* 01A70 8098FED0 00027880 */ sll $t7, $v0, 2 -/* 01A74 8098FED4 030FC021 */ addu $t8, $t8, $t7 -/* 01A78 8098FED8 8F1800E0 */ lw $t8, %lo(D_809900E0)($t8) +/* 01A70 8098FED0 00027880 */ sll $t7, $v0, 2 +/* 01A74 8098FED4 030FC021 */ addu $t8, $t8, $t7 +/* 01A78 8098FED8 8F1800E0 */ lw $t8, %lo(D_809900E0)($t8) /* 01A7C 8098FEDC 3C068099 */ lui $a2, %hi(D_80990EDC) ## $a2 = 80990000 /* 01A80 8098FEE0 24C60EDC */ addiu $a2, $a2, %lo(D_80990EDC) ## $a2 = 80990EDC -/* 01A84 8098FEE4 AFB80070 */ sw $t8, 0x0070($sp) +/* 01A84 8098FEE4 AFB80070 */ sw $t8, 0x0070($sp) /* 01A88 8098FEE8 84830194 */ lh $v1, 0x0194($a0) ## 00000194 /* 01A8C 8098FEEC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC /* 01A90 8098FEF0 2407025A */ addiu $a3, $zero, 0x025A ## $a3 = 0000025A -/* 01A94 8098FEF4 0003C880 */ sll $t9, $v1, 2 -/* 01A98 8098FEF8 01795821 */ addu $t3, $t3, $t9 -/* 01A9C 8098FEFC 8D6B00F4 */ lw $t3, %lo(D_809900F4)($t3) -/* 01AA0 8098FF00 AFAB0064 */ sw $t3, 0x0064($sp) +/* 01A94 8098FEF4 0003C880 */ sll $t9, $v1, 2 +/* 01A98 8098FEF8 01795821 */ addu $t3, $t3, $t9 +/* 01A9C 8098FEFC 8D6B00F4 */ lw $t3, %lo(D_809900F4)($t3) +/* 01AA0 8098FF00 AFAB0064 */ sw $t3, 0x0064($sp) /* 01AA4 8098FF04 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01AA8 8098FF08 0C031AB1 */ jal func_800C6AC4 -/* 01AAC 8098FF0C AFA5005C */ sw $a1, 0x005C($sp) -/* 01AB0 8098FF10 8FAD0084 */ lw $t5, 0x0084($sp) -/* 01AB4 8098FF14 0C024F46 */ jal func_80093D18 +/* 01AA8 8098FF08 0C031AB1 */ jal func_800C6AC4 +/* 01AAC 8098FF0C AFA5005C */ sw $a1, 0x005C($sp) +/* 01AB0 8098FF10 8FAD0084 */ lw $t5, 0x0084($sp) +/* 01AB4 8098FF14 0C024F46 */ jal func_80093D18 /* 01AB8 8098FF18 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 01ABC 8098FF1C 8FA8005C */ lw $t0, 0x005C($sp) -/* 01AC0 8098FF20 8FAA0070 */ lw $t2, 0x0070($sp) +/* 01ABC 8098FF1C 8FA8005C */ lw $t0, 0x005C($sp) +/* 01AC0 8098FF20 8FAA0070 */ lw $t2, 0x0070($sp) /* 01AC4 8098FF24 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 /* 01AC8 8098FF28 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01ACC 8098FF2C 000A7100 */ sll $t6, $t2, 4 -/* 01AD0 8098FF30 000ECF02 */ srl $t9, $t6, 28 +/* 01ACC 8098FF2C 000A7100 */ sll $t6, $t2, 4 +/* 01AD0 8098FF30 000ECF02 */ srl $t9, $t6, 28 /* 01AD4 8098FF34 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01AD8 8098FF38 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01ADC 8098FF3C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 01AE0 8098FF40 00195880 */ sll $t3, $t9, 2 +/* 01AE0 8098FF40 00195880 */ sll $t3, $t9, 2 /* 01AE4 8098FF44 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 /* 01AE8 8098FF48 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01AEC 8098FF4C 00EB2021 */ addu $a0, $a3, $t3 +/* 01AEC 8098FF4C 00EB2021 */ addu $a0, $a3, $t3 /* 01AF0 8098FF50 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01AF4 8098FF54 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 01AF8 8098FF58 3C0900FF */ lui $t1, 0x00FF ## $t1 = 00FF0000 /* 01AFC 8098FF5C 3529FFFF */ ori $t1, $t1, 0xFFFF ## $t1 = 00FFFFFF -/* 01B00 8098FF60 01492824 */ and $a1, $t2, $t1 +/* 01B00 8098FF60 01492824 */ and $a1, $t2, $t1 /* 01B04 8098FF64 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 01B08 8098FF68 01856821 */ addu $t5, $t4, $a1 -/* 01B0C 8098FF6C 01A67821 */ addu $t7, $t5, $a2 +/* 01B08 8098FF68 01856821 */ addu $t5, $t4, $a1 +/* 01B0C 8098FF6C 01A67821 */ addu $t7, $t5, $a2 /* 01B10 8098FF70 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01B14 8098FF74 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01B18 8098FF78 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -56,23 +56,23 @@ glabel func_8098FEB4 /* 01B2C 8098FF8C 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 /* 01B30 8098FF90 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 01B34 8098FF94 35EF0028 */ ori $t7, $t7, 0x0028 ## $t7 = DB060028 -/* 01B38 8098FF98 03255821 */ addu $t3, $t9, $a1 -/* 01B3C 8098FF9C 01666021 */ addu $t4, $t3, $a2 +/* 01B38 8098FF98 03255821 */ addu $t3, $t9, $a1 +/* 01B3C 8098FF9C 01666021 */ addu $t4, $t3, $a2 /* 01B40 8098FFA0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 01B44 8098FFA4 8FA40064 */ lw $a0, 0x0064($sp) +/* 01B44 8098FFA4 8FA40064 */ lw $a0, 0x0064($sp) /* 01B48 8098FFA8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01B4C 8098FFAC 0004C100 */ sll $t8, $a0, 4 -/* 01B50 8098FFB0 00187702 */ srl $t6, $t8, 28 +/* 01B4C 8098FFAC 0004C100 */ sll $t8, $a0, 4 +/* 01B50 8098FFB0 00187702 */ srl $t6, $t8, 28 /* 01B54 8098FFB4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 01B58 8098FFB8 000EC880 */ sll $t9, $t6, 2 +/* 01B58 8098FFB8 000EC880 */ sll $t9, $t6, 2 /* 01B5C 8098FFBC AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 01B60 8098FFC0 00F95821 */ addu $t3, $a3, $t9 +/* 01B60 8098FFC0 00F95821 */ addu $t3, $a3, $t9 /* 01B64 8098FFC4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 01B68 8098FFC8 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000000 -/* 01B6C 8098FFCC 00896824 */ and $t5, $a0, $t1 +/* 01B6C 8098FFCC 00896824 */ and $t5, $a0, $t1 /* 01B70 8098FFD0 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 01B74 8098FFD4 018D7821 */ addu $t7, $t4, $t5 -/* 01B78 8098FFD8 01E6C021 */ addu $t8, $t7, $a2 +/* 01B74 8098FFD4 018D7821 */ addu $t7, $t4, $t5 +/* 01B78 8098FFD8 01E6C021 */ addu $t8, $t7, $a2 /* 01B7C 8098FFDC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 01B80 8098FFE0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01B84 8098FFE4 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 @@ -89,28 +89,28 @@ glabel func_8098FEB4 /* 01BB0 80990010 25EF6290 */ addiu $t7, $t7, 0x6290 ## $t7 = 80116290 /* 01BB4 80990014 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01BB8 80990018 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01BBC 8099001C 8FA30080 */ lw $v1, 0x0080($sp) +/* 01BBC 8099001C 8FA30080 */ lw $v1, 0x0080($sp) /* 01BC0 80990020 3C188099 */ lui $t8, %hi(func_8098FE74) ## $t8 = 80990000 /* 01BC4 80990024 2718FE74 */ addiu $t8, $t8, %lo(func_8098FE74) ## $t8 = 8098FE74 /* 01BC8 80990028 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 01BCC 8099002C 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 01BD0 80990030 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 01BD4 80990034 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01BD8 80990038 AFA00014 */ sw $zero, 0x0014($sp) -/* 01BDC 8099003C AFB80010 */ sw $t8, 0x0010($sp) -/* 01BE0 80990040 8FA40084 */ lw $a0, 0x0084($sp) -/* 01BE4 80990044 0C0286B2 */ jal func_800A1AC8 -/* 01BE8 80990048 AFA30018 */ sw $v1, 0x0018($sp) -/* 01BEC 8099004C 8FAE0084 */ lw $t6, 0x0084($sp) +/* 01BD8 80990038 AFA00014 */ sw $zero, 0x0014($sp) +/* 01BDC 8099003C AFB80010 */ sw $t8, 0x0010($sp) +/* 01BE0 80990040 8FA40084 */ lw $a0, 0x0084($sp) +/* 01BE4 80990044 0C0286B2 */ jal SkelAnime_DrawSV +/* 01BE8 80990048 AFA30018 */ sw $v1, 0x0018($sp) +/* 01BEC 8099004C 8FAE0084 */ lw $t6, 0x0084($sp) /* 01BF0 80990050 3C068099 */ lui $a2, %hi(D_80990EEC) ## $a2 = 80990000 /* 01BF4 80990054 24C60EEC */ addiu $a2, $a2, %lo(D_80990EEC) ## $a2 = 80990EEC /* 01BF8 80990058 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC /* 01BFC 8099005C 24070272 */ addiu $a3, $zero, 0x0272 ## $a3 = 00000272 -/* 01C00 80990060 0C031AD5 */ jal func_800C6B54 +/* 01C00 80990060 0C031AD5 */ jal func_800C6B54 /* 01C04 80990064 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 01C08 80990068 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01C08 80990068 8FBF0024 */ lw $ra, 0x0024($sp) /* 01C0C 8099006C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 01C10 80990070 03E00008 */ jr $ra +/* 01C10 80990070 03E00008 */ jr $ra /* 01C14 80990074 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s index fa3ffca8a7..6c85e1e5aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s @@ -1,19 +1,19 @@ glabel DoorKiller_Init /* 00000 80994C50 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00004 80994C54 AFB10028 */ sw $s1, 0x0028($sp) +/* 00004 80994C54 AFB10028 */ sw $s1, 0x0028($sp) /* 00008 80994C58 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0000C 80994C5C AFB50038 */ sw $s5, 0x0038($sp) -/* 00010 80994C60 AFB40034 */ sw $s4, 0x0034($sp) -/* 00014 80994C64 AFB2002C */ sw $s2, 0x002C($sp) -/* 00018 80994C68 AFB00024 */ sw $s0, 0x0024($sp) +/* 0000C 80994C5C AFB50038 */ sw $s5, 0x0038($sp) +/* 00010 80994C60 AFB40034 */ sw $s4, 0x0034($sp) +/* 00014 80994C64 AFB2002C */ sw $s2, 0x002C($sp) +/* 00018 80994C68 AFB00024 */ sw $s0, 0x0024($sp) /* 0001C 80994C6C 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 00020 80994C70 3C118099 */ lui $s1, %hi(D_80996010) ## $s1 = 80990000 /* 00024 80994C74 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 00028 80994C78 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 -/* 0002C 80994C7C AFBF003C */ sw $ra, 0x003C($sp) -/* 00030 80994C80 AFB30030 */ sw $s3, 0x0030($sp) +/* 0002C 80994C7C AFBF003C */ sw $ra, 0x003C($sp) +/* 00030 80994C80 AFB30030 */ sw $s3, 0x0030($sp) /* 00034 80994C84 26316010 */ addiu $s1, $s1, %lo(D_80996010) ## $s1 = 80996010 -/* 00038 80994C88 00A1A021 */ addu $s4, $a1, $at +/* 00038 80994C88 00A1A021 */ addu $s4, $a1, $at /* 0003C 80994C8C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L80994C90: /* 00040 80994C90 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 @@ -23,68 +23,68 @@ glabel DoorKiller_Init /* 0004C 80994C9C A250021D */ sb $s0, 0x021D($s2) ## 0000021D /* 00050 80994CA0 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 00054 80994CA4 26310008 */ addiu $s1, $s1, 0x0008 ## $s1 = 80996018 -/* 00058 80994CA8 0440FFF9 */ bltz $v0, .L80994C90 +/* 00058 80994CA8 0440FFF9 */ bltz $v0, .L80994C90 /* 0005C 80994CAC 00409825 */ or $s3, $v0, $zero ## $s3 = 00000000 /* 00060 80994CB0 3C048099 */ lui $a0, %hi(D_80996060) ## $a0 = 80990000 /* 00064 80994CB4 24846060 */ addiu $a0, $a0, %lo(D_80996060) ## $a0 = 80996060 /* 00068 80994CB8 0C00084C */ jal osSyncPrintf - + /* 0006C 80994CBC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00070 80994CC0 3C048099 */ lui $a0, %hi(D_80996070) ## $a0 = 80990000 /* 00074 80994CC4 24846070 */ addiu $a0, $a0, %lo(D_80996070) ## $a0 = 80996070 /* 00078 80994CC8 0C00084C */ jal osSyncPrintf - + /* 0007C 80994CCC 9245021D */ lbu $a1, 0x021D($s2) ## 0000021D /* 00080 80994CD0 924E021D */ lbu $t6, 0x021D($s2) ## 0000021D /* 00084 80994CD4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00088 80994CD8 3C188099 */ lui $t8, %hi(D_80996014) ## $t8 = 80990000 -/* 0008C 80994CDC 000E78C0 */ sll $t7, $t6, 3 +/* 0008C 80994CDC 000E78C0 */ sll $t7, $t6, 3 /* 00090 80994CE0 A253021C */ sb $s3, 0x021C($s2) ## 0000021C -/* 00094 80994CE4 030FC021 */ addu $t8, $t8, $t7 -/* 00098 80994CE8 8F186014 */ lw $t8, %lo(D_80996014)($t8) -/* 0009C 80994CEC 44050000 */ mfc1 $a1, $f0 -/* 000A0 80994CF0 44070000 */ mfc1 $a3, $f0 +/* 00094 80994CE4 030FC021 */ addu $t8, $t8, $t7 +/* 00098 80994CE8 8F186014 */ lw $t8, %lo(D_80996014)($t8) +/* 0009C 80994CEC 44050000 */ mfc1 $a1, $f0 +/* 000A0 80994CF0 44070000 */ mfc1 $a3, $f0 /* 000A4 80994CF4 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 /* 000A8 80994CF8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 000AC 80994CFC 0C00AC78 */ jal ActorShape_Init - + /* 000B0 80994D00 AE580214 */ sw $t8, 0x0214($s2) ## 00000214 /* 000B4 80994D04 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000B8 80994D08 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000BC 80994D0C 0C00B58B */ jal Actor_SetScale - + /* 000C0 80994D10 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 000C4 80994D14 8648001C */ lh $t0, 0x001C($s2) ## 0000001C /* 000C8 80994D18 A640021A */ sh $zero, 0x021A($s2) ## 0000021A /* 000CC 80994D1C A6400218 */ sh $zero, 0x0218($s2) ## 00000218 /* 000D0 80994D20 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 00000000 -/* 000D4 80994D24 2D210005 */ sltiu $at, $t1, 0x0005 +/* 000D4 80994D24 2D210005 */ sltiu $at, $t1, 0x0005 /* 000D8 80994D28 A2400190 */ sb $zero, 0x0190($s2) ## 00000190 -/* 000DC 80994D2C 102000A0 */ beq $at, $zero, .L80994FB0 +/* 000DC 80994D2C 102000A0 */ beq $at, $zero, .L80994FB0 /* 000E0 80994D30 A2400191 */ sb $zero, 0x0191($s2) ## 00000191 -/* 000E4 80994D34 00094880 */ sll $t1, $t1, 2 +/* 000E4 80994D34 00094880 */ sll $t1, $t1, 2 /* 000E8 80994D38 3C018099 */ lui $at, %hi(jtbl_809960A8) ## $at = 80990000 -/* 000EC 80994D3C 00290821 */ addu $at, $at, $t1 -/* 000F0 80994D40 8C2960A8 */ lw $t1, %lo(jtbl_809960A8)($at) -/* 000F4 80994D44 01200008 */ jr $t1 +/* 000EC 80994D3C 00290821 */ addu $at, $at, $t1 +/* 000F0 80994D40 8C2960A8 */ lw $t1, %lo(jtbl_809960A8)($at) +/* 000F4 80994D44 01200008 */ jr $t1 /* 000F8 80994D48 00000000 */ nop glabel L80994D4C /* 000FC 80994D4C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00100 80994D50 26420192 */ addiu $v0, $s2, 0x0192 ## $v0 = 00000192 /* 00104 80994D54 240A0009 */ addiu $t2, $zero, 0x0009 ## $t2 = 00000009 -/* 00108 80994D58 AFAA0018 */ sw $t2, 0x0018($sp) -/* 0010C 80994D5C AFA20010 */ sw $v0, 0x0010($sp) -/* 00110 80994D60 AFA20014 */ sw $v0, 0x0014($sp) +/* 00108 80994D58 AFAA0018 */ sw $t2, 0x0018($sp) +/* 0010C 80994D5C AFA20010 */ sw $v0, 0x0010($sp) +/* 00110 80994D60 AFA20014 */ sw $v0, 0x0014($sp) /* 00114 80994D64 24C61BC8 */ addiu $a2, $a2, 0x1BC8 ## $a2 = 06001BC8 /* 00118 80994D68 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 0011C 80994D6C 2645014C */ addiu $a1, $s2, 0x014C ## $a1 = 0000014C -/* 00120 80994D70 0C0291BE */ jal func_800A46F8 +/* 00120 80994D70 0C0291BE */ jal SkelAnime_InitSV /* 00124 80994D74 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00128 80994D78 3C0B8099 */ lui $t3, %hi(func_80995D6C) ## $t3 = 80990000 /* 0012C 80994D7C 256B5D6C */ addiu $t3, $t3, %lo(func_80995D6C) ## $t3 = 80995D6C /* 00130 80994D80 AE4B0280 */ sw $t3, 0x0280($s2) ## 00000280 /* 00134 80994D84 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00138 80994D88 0C26575B */ jal func_80995D6C +/* 00138 80994D88 0C26575B */ jal func_80995D6C /* 0013C 80994D8C 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000000 /* 00140 80994D90 240C4000 */ addiu $t4, $zero, 0x4000 ## $t4 = 00004000 /* 00144 80994D94 A64C019C */ sh $t4, 0x019C($s2) ## 0000019C @@ -93,26 +93,26 @@ glabel L80994D4C /* 00150 80994DA0 02002825 */ or $a1, $s0, $zero ## $a1 = 000001C8 /* 00154 80994DA4 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 00158 80994DA8 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 0015C 80994DAC A64D0198 */ sh $t5, 0x0198($s2) ## 00000198 /* 00160 80994DB0 3C078099 */ lui $a3, %hi(D_80995FB0) ## $a3 = 80990000 /* 00164 80994DB4 24E75FB0 */ addiu $a3, $a3, %lo(D_80995FB0) ## $a3 = 80995FB0 /* 00168 80994DB8 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 0016C 80994DBC 02002825 */ or $a1, $s0, $zero ## $a1 = 000001C8 /* 00170 80994DC0 0C01712B */ jal ActorCollider_InitCylinder - + /* 00174 80994DC4 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00178 80994DC8 26500220 */ addiu $s0, $s2, 0x0220 ## $s0 = 00000220 /* 0017C 80994DCC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000220 -/* 00180 80994DD0 0C016EFE */ jal func_8005BBF8 +/* 00180 80994DD0 0C016EFE */ jal func_8005BBF8 /* 00184 80994DD4 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 00188 80994DD8 3C078099 */ lui $a3, %hi(D_80996000) ## $a3 = 80990000 /* 0018C 80994DDC 264E0240 */ addiu $t6, $s2, 0x0240 ## $t6 = 00000240 -/* 00190 80994DE0 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00190 80994DE0 AFAE0010 */ sw $t6, 0x0010($sp) /* 00194 80994DE4 24E76000 */ addiu $a3, $a3, %lo(D_80996000) ## $a3 = 80996000 /* 00198 80994DE8 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 0019C 80994DEC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000220 -/* 001A0 80994DF0 0C017014 */ jal func_8005C050 +/* 001A0 80994DF0 0C017014 */ jal func_8005C050 /* 001A4 80994DF4 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 001A8 80994DF8 8E58023C */ lw $t8, 0x023C($s2) ## 0000023C /* 001AC 80994DFC 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 @@ -120,133 +120,133 @@ glabel L80994D4C /* 001B4 80994E04 A70F0036 */ sh $t7, 0x0036($t8) ## 00000036 /* 001B8 80994E08 C6440024 */ lwc1 $f4, 0x0024($s2) ## 00000024 /* 001BC 80994E0C 8E49023C */ lw $t1, 0x023C($s2) ## 0000023C -/* 001C0 80994E10 4600218D */ trunc.w.s $f6, $f4 -/* 001C4 80994E14 44083000 */ mfc1 $t0, $f6 +/* 001C0 80994E10 4600218D */ trunc.w.s $f6, $f4 +/* 001C4 80994E14 44083000 */ mfc1 $t0, $f6 /* 001C8 80994E18 00000000 */ nop /* 001CC 80994E1C A5280030 */ sh $t0, 0x0030($t1) ## 00000030 /* 001D0 80994E20 C6480028 */ lwc1 $f8, 0x0028($s2) ## 00000028 /* 001D4 80994E24 8E4F023C */ lw $t7, 0x023C($s2) ## 0000023C -/* 001D8 80994E28 4600428D */ trunc.w.s $f10, $f8 -/* 001DC 80994E2C 440D5000 */ mfc1 $t5, $f10 +/* 001D8 80994E28 4600428D */ trunc.w.s $f10, $f8 +/* 001DC 80994E2C 440D5000 */ mfc1 $t5, $f10 /* 001E0 80994E30 00000000 */ nop /* 001E4 80994E34 25AE0032 */ addiu $t6, $t5, 0x0032 ## $t6 = 00000032 /* 001E8 80994E38 A5EE0032 */ sh $t6, 0x0032($t7) ## 00000082 /* 001EC 80994E3C C650002C */ lwc1 $f16, 0x002C($s2) ## 0000002C /* 001F0 80994E40 8E48023C */ lw $t0, 0x023C($s2) ## 0000023C -/* 001F4 80994E44 4600848D */ trunc.w.s $f18, $f16 -/* 001F8 80994E48 44199000 */ mfc1 $t9, $f18 +/* 001F4 80994E44 4600848D */ trunc.w.s $f18, $f16 +/* 001F8 80994E48 44199000 */ mfc1 $t9, $f18 /* 001FC 80994E4C 00000000 */ nop /* 00200 80994E50 A5190034 */ sh $t9, 0x0034($t0) ## 00000034 /* 00204 80994E54 8645001C */ lh $a1, 0x001C($s2) ## 0000001C -/* 00208 80994E58 00052A03 */ sra $a1, $a1, 8 +/* 00208 80994E58 00052A03 */ sra $a1, $a1, 8 /* 0020C 80994E5C 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 00210 80994E60 50A10054 */ beql $a1, $at, .L80994FB4 -/* 00214 80994E64 8FBF003C */ lw $ra, 0x003C($sp) +/* 00210 80994E60 50A10054 */ beql $a1, $at, .L80994FB4 +/* 00214 80994E64 8FBF003C */ lw $ra, 0x003C($sp) /* 00218 80994E68 0C00B2D0 */ jal Flags_GetSwitch - + /* 0021C 80994E6C 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 00220 80994E70 50400050 */ beql $v0, $zero, .L80994FB4 -/* 00224 80994E74 8FBF003C */ lw $ra, 0x003C($sp) +/* 00220 80994E70 50400050 */ beql $v0, $zero, .L80994FB4 +/* 00224 80994E74 8FBF003C */ lw $ra, 0x003C($sp) /* 00228 80994E78 0C00B55C */ jal Actor_Kill - + /* 0022C 80994E7C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00230 80994E80 1000004C */ beq $zero, $zero, .L80994FB4 -/* 00234 80994E84 8FBF003C */ lw $ra, 0x003C($sp) +/* 00230 80994E80 1000004C */ beq $zero, $zero, .L80994FB4 +/* 00234 80994E84 8FBF003C */ lw $ra, 0x003C($sp) glabel L80994E88 /* 00238 80994E88 3C098099 */ lui $t1, %hi(func_80995D6C) ## $t1 = 80990000 /* 0023C 80994E8C 25295D6C */ addiu $t1, $t1, %lo(func_80995D6C) ## $t1 = 80995D6C /* 00240 80994E90 AE490280 */ sw $t1, 0x0280($s2) ## 00000280 /* 00244 80994E94 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00248 80994E98 0C26575B */ jal func_80995D6C +/* 00248 80994E98 0C26575B */ jal func_80995D6C /* 0024C 80994E9C 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000000 /* 00250 80994EA0 3C018099 */ lui $at, %hi(D_809960BC) ## $at = 80990000 -/* 00254 80994EA4 C42460BC */ lwc1 $f4, %lo(D_809960BC)($at) +/* 00254 80994EA4 C42460BC */ lwc1 $f4, %lo(D_809960BC)($at) /* 00258 80994EA8 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 0025C 80994EAC 44813000 */ mtc1 $at, $f6 ## $f6 = -6.00 /* 00260 80994EB0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00264 80994EB4 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 /* 00268 80994EB8 E644006C */ swc1 $f4, 0x006C($s2) ## 0000006C /* 0026C 80994EBC 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00270 80994EC0 E6460070 */ swc1 $f6, 0x0070($s2) ## 00000070 /* 00274 80994EC4 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00278 80994EC8 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 /* 0027C 80994ECC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00280 80994ED0 E7A00050 */ swc1 $f0, 0x0050($sp) + +/* 00280 80994ED0 E7A00050 */ swc1 $f0, 0x0050($sp) /* 00284 80994ED4 E6400064 */ swc1 $f0, 0x0064($s2) ## 00000064 /* 00288 80994ED8 0C01DE0D */ jal Math_Coss ## coss? /* 0028C 80994EDC 86440032 */ lh $a0, 0x0032($s2) ## 00000032 -/* 00290 80994EE0 E7A00040 */ swc1 $f0, 0x0040($sp) +/* 00290 80994EE0 E7A00040 */ swc1 $f0, 0x0040($sp) /* 00294 80994EE4 0C01DE1C */ jal Math_Sins ## sins? /* 00298 80994EE8 86440032 */ lh $a0, 0x0032($s2) ## 00000032 -/* 0029C 80994EEC C7A80040 */ lwc1 $f8, 0x0040($sp) -/* 002A0 80994EF0 C7AA0050 */ lwc1 $f10, 0x0050($sp) +/* 0029C 80994EEC C7A80040 */ lwc1 $f8, 0x0040($sp) +/* 002A0 80994EF0 C7AA0050 */ lwc1 $f10, 0x0050($sp) /* 002A4 80994EF4 C6520064 */ lwc1 $f18, 0x0064($s2) ## 00000064 /* 002A8 80994EF8 86440032 */ lh $a0, 0x0032($s2) ## 00000032 -/* 002AC 80994EFC 460A4402 */ mul.s $f16, $f8, $f10 +/* 002AC 80994EFC 460A4402 */ mul.s $f16, $f8, $f10 /* 002B0 80994F00 00000000 */ nop -/* 002B4 80994F04 46120102 */ mul.s $f4, $f0, $f18 -/* 002B8 80994F08 46102180 */ add.s $f6, $f4, $f16 +/* 002B4 80994F04 46120102 */ mul.s $f4, $f0, $f18 +/* 002B8 80994F08 46102180 */ add.s $f6, $f4, $f16 /* 002BC 80994F0C 0C01DE1C */ jal Math_Sins ## sins? /* 002C0 80994F10 E646005C */ swc1 $f6, 0x005C($s2) ## 0000005C -/* 002C4 80994F14 E7A00040 */ swc1 $f0, 0x0040($sp) +/* 002C4 80994F14 E7A00040 */ swc1 $f0, 0x0040($sp) /* 002C8 80994F18 0C01DE0D */ jal Math_Coss ## coss? /* 002CC 80994F1C 86440032 */ lh $a0, 0x0032($s2) ## 00000032 -/* 002D0 80994F20 C7A80040 */ lwc1 $f8, 0x0040($sp) -/* 002D4 80994F24 C7B20050 */ lwc1 $f18, 0x0050($sp) +/* 002D0 80994F20 C7A80040 */ lwc1 $f8, 0x0040($sp) +/* 002D4 80994F24 C7B20050 */ lwc1 $f18, 0x0050($sp) /* 002D8 80994F28 C6500064 */ lwc1 $f16, 0x0064($s2) ## 00000064 -/* 002DC 80994F2C 46004287 */ neg.s $f10, $f8 +/* 002DC 80994F2C 46004287 */ neg.s $f10, $f8 /* 002E0 80994F30 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 002E4 80994F34 46125102 */ mul.s $f4, $f10, $f18 +/* 002E4 80994F34 46125102 */ mul.s $f4, $f10, $f18 /* 002E8 80994F38 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 -/* 002EC 80994F3C 46100182 */ mul.s $f6, $f0, $f16 -/* 002F0 80994F40 46043200 */ add.s $f8, $f6, $f4 +/* 002EC 80994F3C 46100182 */ mul.s $f6, $f0, $f16 +/* 002F0 80994F40 46043200 */ add.s $f8, $f6, $f4 /* 002F4 80994F44 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 002F8 80994F48 E6480064 */ swc1 $f8, 0x0064($s2) ## 00000064 /* 002FC 80994F4C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00300 80994F50 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 /* 00304 80994F54 3C014580 */ lui $at, 0x4580 ## $at = 45800000 /* 00308 80994F58 44816000 */ mtc1 $at, $f12 ## $f12 = 4096.00 -/* 0030C 80994F5C 460A0480 */ add.s $f18, $f0, $f10 +/* 0030C 80994F5C 460A0480 */ add.s $f18, $f0, $f10 /* 00310 80994F60 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00314 80994F64 E6520060 */ swc1 $f18, 0x0060($s2) ## 00000060 -/* 00318 80994F68 4600040D */ trunc.w.s $f16, $f0 +/* 00318 80994F68 4600040D */ trunc.w.s $f16, $f0 /* 0031C 80994F6C 3C014580 */ lui $at, 0x4580 ## $at = 45800000 /* 00320 80994F70 44816000 */ mtc1 $at, $f12 ## $f12 = 4096.00 -/* 00324 80994F74 440B8000 */ mfc1 $t3, $f16 +/* 00324 80994F74 440B8000 */ mfc1 $t3, $f16 /* 00328 80994F78 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0032C 80994F7C A64B0030 */ sh $t3, 0x0030($s2) ## 00000030 -/* 00330 80994F80 4600018D */ trunc.w.s $f6, $f0 +/* 00330 80994F80 4600018D */ trunc.w.s $f6, $f0 /* 00334 80994F84 3C014580 */ lui $at, 0x4580 ## $at = 45800000 /* 00338 80994F88 44816000 */ mtc1 $at, $f12 ## $f12 = 4096.00 -/* 0033C 80994F8C 440D3000 */ mfc1 $t5, $f6 +/* 0033C 80994F8C 440D3000 */ mfc1 $t5, $f6 /* 00340 80994F90 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00344 80994F94 A64D0032 */ sh $t5, 0x0032($s2) ## 00000032 -/* 00348 80994F98 4600010D */ trunc.w.s $f4, $f0 +/* 00348 80994F98 4600010D */ trunc.w.s $f4, $f0 /* 0034C 80994F9C 24180050 */ addiu $t8, $zero, 0x0050 ## $t8 = 00000050 /* 00350 80994FA0 A658021A */ sh $t8, 0x021A($s2) ## 0000021A -/* 00354 80994FA4 440F2000 */ mfc1 $t7, $f4 +/* 00354 80994FA4 440F2000 */ mfc1 $t7, $f4 /* 00358 80994FA8 00000000 */ nop /* 0035C 80994FAC A64F0034 */ sh $t7, 0x0034($s2) ## 00000034 .L80994FB0: -/* 00360 80994FB0 8FBF003C */ lw $ra, 0x003C($sp) +/* 00360 80994FB0 8FBF003C */ lw $ra, 0x003C($sp) .L80994FB4: -/* 00364 80994FB4 8FB00024 */ lw $s0, 0x0024($sp) -/* 00368 80994FB8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0036C 80994FBC 8FB2002C */ lw $s2, 0x002C($sp) -/* 00370 80994FC0 8FB30030 */ lw $s3, 0x0030($sp) -/* 00374 80994FC4 8FB40034 */ lw $s4, 0x0034($sp) -/* 00378 80994FC8 8FB50038 */ lw $s5, 0x0038($sp) -/* 0037C 80994FCC 03E00008 */ jr $ra +/* 00364 80994FB4 8FB00024 */ lw $s0, 0x0024($sp) +/* 00368 80994FB8 8FB10028 */ lw $s1, 0x0028($sp) +/* 0036C 80994FBC 8FB2002C */ lw $s2, 0x002C($sp) +/* 00370 80994FC0 8FB30030 */ lw $s3, 0x0030($sp) +/* 00374 80994FC4 8FB40034 */ lw $s4, 0x0034($sp) +/* 00378 80994FC8 8FB50038 */ lw $s5, 0x0038($sp) +/* 0037C 80994FCC 03E00008 */ jr $ra /* 00380 80994FD0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995EC4.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995EC4.s index 36d888a9b2..91d359ef87 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995EC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995EC4.s @@ -1,25 +1,25 @@ glabel func_80995EC4 /* 01274 80995EC4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01278 80995EC8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0127C 80995ECC AFA40028 */ sw $a0, 0x0028($sp) -/* 01280 80995ED0 AFA5002C */ sw $a1, 0x002C($sp) -/* 01284 80995ED4 0C0250F2 */ jal func_800943C8 +/* 01278 80995EC8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0127C 80995ECC AFA40028 */ sw $a0, 0x0028($sp) +/* 01280 80995ED0 AFA5002C */ sw $a1, 0x002C($sp) +/* 01284 80995ED4 0C0250F2 */ jal func_800943C8 /* 01288 80995ED8 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 0128C 80995EDC 8FA40028 */ lw $a0, 0x0028($sp) -/* 01290 80995EE0 0C265790 */ jal func_80995E40 -/* 01294 80995EE4 8FA5002C */ lw $a1, 0x002C($sp) -/* 01298 80995EE8 8FA20028 */ lw $v0, 0x0028($sp) -/* 0129C 80995EEC 8FA4002C */ lw $a0, 0x002C($sp) +/* 0128C 80995EDC 8FA40028 */ lw $a0, 0x0028($sp) +/* 01290 80995EE0 0C265790 */ jal func_80995E40 +/* 01294 80995EE4 8FA5002C */ lw $a1, 0x002C($sp) +/* 01298 80995EE8 8FA20028 */ lw $v0, 0x0028($sp) +/* 0129C 80995EEC 8FA4002C */ lw $a0, 0x002C($sp) /* 012A0 80995EF0 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 /* 012A4 80995EF4 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C /* 012A8 80995EF8 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E -/* 012AC 80995EFC AFA00018 */ sw $zero, 0x0018($sp) -/* 012B0 80995F00 AFA00014 */ sw $zero, 0x0014($sp) -/* 012B4 80995F04 0C0286B2 */ jal func_800A1AC8 -/* 012B8 80995F08 AFA00010 */ sw $zero, 0x0010($sp) -/* 012BC 80995F0C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 012AC 80995EFC AFA00018 */ sw $zero, 0x0018($sp) +/* 012B0 80995F00 AFA00014 */ sw $zero, 0x0014($sp) +/* 012B4 80995F04 0C0286B2 */ jal SkelAnime_DrawSV +/* 012B8 80995F08 AFA00010 */ sw $zero, 0x0010($sp) +/* 012BC 80995F0C 8FBF0024 */ lw $ra, 0x0024($sp) /* 012C0 80995F10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012C4 80995F14 03E00008 */ jr $ra +/* 012C4 80995F14 03E00008 */ jr $ra /* 012C8 80995F18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s index 7df6a25c56..d8bb735d90 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s @@ -1,21 +1,21 @@ glabel func_80998C90 /* 00510 80998C90 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00514 80998C94 AFB00028 */ sw $s0, 0x0028($sp) +/* 00514 80998C94 AFB00028 */ sw $s0, 0x0028($sp) /* 00518 80998C98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0051C 80998C9C AFA5003C */ sw $a1, 0x003C($sp) +/* 0051C 80998C9C AFA5003C */ sw $a1, 0x003C($sp) /* 00520 80998CA0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00524 80998CA4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00524 80998CA4 AFBF002C */ sw $ra, 0x002C($sp) /* 00528 80998CA8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0052C 80998CAC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00530 80998CB0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00534 80998CB4 24E71374 */ addiu $a3, $a3, 0x1374 ## $a3 = 06001374 /* 00538 80998CB8 24C62CA8 */ addiu $a2, $a2, 0x2CA8 ## $a2 = 06002CA8 -/* 0053C 80998CBC AFA50034 */ sw $a1, 0x0034($sp) -/* 00540 80998CC0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00544 80998CC4 AFA00014 */ sw $zero, 0x0014($sp) +/* 0053C 80998CBC AFA50034 */ sw $a1, 0x0034($sp) +/* 00540 80998CC0 AFA00010 */ sw $zero, 0x0010($sp) +/* 00544 80998CC4 AFA00014 */ sw $zero, 0x0014($sp) /* 00548 80998CC8 0C02915F */ jal SkelAnime_Init - -/* 0054C 80998CCC AFA00018 */ sw $zero, 0x0018($sp) + +/* 0054C 80998CCC AFA00018 */ sw $zero, 0x0018($sp) /* 00550 80998CD0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00554 80998CD4 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 00558 80998CD8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -23,19 +23,19 @@ glabel func_80998C90 /* 00560 80998CE0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00564 80998CE4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00568 80998CE8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0056C 80998CEC 44061000 */ mfc1 $a2, $f2 -/* 00570 80998CF0 44071000 */ mfc1 $a3, $f2 -/* 00574 80998CF4 AFAF001C */ sw $t7, 0x001C($sp) -/* 00578 80998CF8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0056C 80998CEC 44061000 */ mfc1 $a2, $f2 +/* 00570 80998CF0 44071000 */ mfc1 $a3, $f2 +/* 00574 80998CF4 AFAF001C */ sw $t7, 0x001C($sp) +/* 00578 80998CF8 AFAE0014 */ sw $t6, 0x0014($sp) /* 0057C 80998CFC 24A51374 */ addiu $a1, $a1, 0x1374 ## $a1 = 06001374 -/* 00580 80998D00 8FA40034 */ lw $a0, 0x0034($sp) -/* 00584 80998D04 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00588 80998D08 0C0293F9 */ jal func_800A4FE4 -/* 0058C 80998D0C E7A40018 */ swc1 $f4, 0x0018($sp) +/* 00580 80998D00 8FA40034 */ lw $a0, 0x0034($sp) +/* 00584 80998D04 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 00588 80998D08 0C0293F9 */ jal SkelAnime_ChangeAnimationImpl +/* 0058C 80998D0C E7A40018 */ swc1 $f4, 0x0018($sp) /* 00590 80998D10 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00594 80998D14 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 00598 80998D18 3C01809A */ lui $at, %hi(D_8099C724) ## $at = 809A0000 -/* 0059C 80998D1C C42CC724 */ lwc1 $f12, %lo(D_8099C724)($at) +/* 0059C 80998D1C C42CC724 */ lwc1 $f12, %lo(D_8099C724)($at) /* 005A0 80998D20 2418FF74 */ addiu $t8, $zero, 0xFF74 ## $t8 = FFFFFF74 /* 005A4 80998D24 2419FFB0 */ addiu $t9, $zero, 0xFFB0 ## $t9 = FFFFFFB0 /* 005A8 80998D28 A60001AC */ sh $zero, 0x01AC($s0) ## 000001AC @@ -43,7 +43,7 @@ glabel func_80998C90 /* 005B0 80998D30 A61901B0 */ sh $t9, 0x01B0($s0) ## 000001B0 /* 005B4 80998D34 3C01809A */ lui $at, %hi(D_8099CCA0) ## $at = 809A0000 /* 005B8 80998D38 240800A0 */ addiu $t0, $zero, 0x00A0 ## $t0 = 000000A0 -/* 005BC 80998D3C A428CCA0 */ sh $t0, %lo(D_8099CCA0)($at) +/* 005BC 80998D3C A428CCA0 */ sh $t0, %lo(D_8099CCA0)($at) /* 005C0 80998D40 3C01C3C8 */ lui $at, 0xC3C8 ## $at = C3C80000 /* 005C4 80998D44 44813000 */ mtc1 $at, $f6 ## $f6 = -400.00 /* 005C8 80998D48 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C @@ -51,17 +51,17 @@ glabel func_80998C90 /* 005D0 80998D50 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 005D4 80998D54 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 005D8 80998D58 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 005DC 80998D5C 4600218D */ trunc.w.s $f6, $f4 +/* 005DC 80998D5C 4600218D */ trunc.w.s $f6, $f4 /* 005E0 80998D60 A6000192 */ sh $zero, 0x0192($s0) ## 00000192 /* 005E4 80998D64 E60201BC */ swc1 $f2, 0x01BC($s0) ## 000001BC -/* 005E8 80998D68 4600848D */ trunc.w.s $f18, $f16 -/* 005EC 80998D6C 44073000 */ mfc1 $a3, $f6 +/* 005E8 80998D68 4600848D */ trunc.w.s $f18, $f16 +/* 005EC 80998D6C 44073000 */ mfc1 $a3, $f6 /* 005F0 80998D70 E60C0194 */ swc1 $f12, 0x0194($s0) ## 00000194 -/* 005F4 80998D74 4600428D */ trunc.w.s $f10, $f8 -/* 005F8 80998D78 44069000 */ mfc1 $a2, $f18 +/* 005F4 80998D74 4600428D */ trunc.w.s $f10, $f8 +/* 005F8 80998D78 44069000 */ mfc1 $a2, $f18 /* 005FC 80998D7C E60C0198 */ swc1 $f12, 0x0198($s0) ## 00000198 /* 00600 80998D80 E60001A0 */ swc1 $f0, 0x01A0($s0) ## 000001A0 -/* 00604 80998D84 44055000 */ mfc1 $a1, $f10 +/* 00604 80998D84 44055000 */ mfc1 $a1, $f10 /* 00608 80998D88 E60001A4 */ swc1 $f0, 0x01A4($s0) ## 000001A4 /* 0060C 80998D8C E60001A8 */ swc1 $f0, 0x01A8($s0) ## 000001A8 /* 00610 80998D90 E600019C */ swc1 $f0, 0x019C($s0) ## 0000019C @@ -69,53 +69,53 @@ glabel func_80998C90 /* 00618 80998D98 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF /* 0061C 80998D9C 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 00620 80998DA0 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00624 80998DA4 00073C00 */ sll $a3, $a3, 16 -/* 00628 80998DA8 00063400 */ sll $a2, $a2, 16 -/* 0062C 80998DAC 00052C00 */ sll $a1, $a1, 16 -/* 00630 80998DB0 00052C03 */ sra $a1, $a1, 16 -/* 00634 80998DB4 00063403 */ sra $a2, $a2, 16 -/* 00638 80998DB8 00073C03 */ sra $a3, $a3, 16 -/* 0063C 80998DBC AFAF001C */ sw $t7, 0x001C($sp) -/* 00640 80998DC0 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00644 80998DC4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00648 80998DC8 AFAC0010 */ sw $t4, 0x0010($sp) +/* 00624 80998DA4 00073C00 */ sll $a3, $a3, 16 +/* 00628 80998DA8 00063400 */ sll $a2, $a2, 16 +/* 0062C 80998DAC 00052C00 */ sll $a1, $a1, 16 +/* 00630 80998DB0 00052C03 */ sra $a1, $a1, 16 +/* 00634 80998DB4 00063403 */ sra $a2, $a2, 16 +/* 00638 80998DB8 00073C03 */ sra $a3, $a3, 16 +/* 0063C 80998DBC AFAF001C */ sw $t7, 0x001C($sp) +/* 00640 80998DC0 AFAE0018 */ sw $t6, 0x0018($sp) +/* 00644 80998DC4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00648 80998DC8 AFAC0010 */ sw $t4, 0x0010($sp) /* 0064C 80998DCC 0C01E763 */ jal Lights_InitType0PositionalLight - + /* 00650 80998DD0 260401C8 */ addiu $a0, $s0, 0x01C8 ## $a0 = 000001C8 /* 00654 80998DD4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 00658 80998DD8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 0065C 80998DDC C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 00660 80998DE0 4600428D */ trunc.w.s $f10, $f8 +/* 00660 80998DE0 4600428D */ trunc.w.s $f10, $f8 /* 00664 80998DE4 240900C8 */ addiu $t1, $zero, 0x00C8 ## $t1 = 000000C8 /* 00668 80998DE8 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 0066C 80998DEC 4600848D */ trunc.w.s $f18, $f16 -/* 00670 80998DF0 44055000 */ mfc1 $a1, $f10 +/* 0066C 80998DEC 4600848D */ trunc.w.s $f18, $f16 +/* 00670 80998DF0 44055000 */ mfc1 $a1, $f10 /* 00674 80998DF4 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00678 80998DF8 4600218D */ trunc.w.s $f6, $f4 -/* 0067C 80998DFC 44069000 */ mfc1 $a2, $f18 +/* 00678 80998DF8 4600218D */ trunc.w.s $f6, $f4 +/* 0067C 80998DFC 44069000 */ mfc1 $a2, $f18 /* 00680 80998E00 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00684 80998E04 00052C00 */ sll $a1, $a1, 16 -/* 00688 80998E08 44073000 */ mfc1 $a3, $f6 -/* 0068C 80998E0C 00063400 */ sll $a2, $a2, 16 -/* 00690 80998E10 00063403 */ sra $a2, $a2, 16 -/* 00694 80998E14 00073C00 */ sll $a3, $a3, 16 -/* 00698 80998E18 00073C03 */ sra $a3, $a3, 16 -/* 0069C 80998E1C 00052C03 */ sra $a1, $a1, 16 -/* 006A0 80998E20 AFAC001C */ sw $t4, 0x001C($sp) -/* 006A4 80998E24 AFAB0018 */ sw $t3, 0x0018($sp) -/* 006A8 80998E28 AFAA0014 */ sw $t2, 0x0014($sp) -/* 006AC 80998E2C AFA90010 */ sw $t1, 0x0010($sp) +/* 00684 80998E04 00052C00 */ sll $a1, $a1, 16 +/* 00688 80998E08 44073000 */ mfc1 $a3, $f6 +/* 0068C 80998E0C 00063400 */ sll $a2, $a2, 16 +/* 00690 80998E10 00063403 */ sra $a2, $a2, 16 +/* 00694 80998E14 00073C00 */ sll $a3, $a3, 16 +/* 00698 80998E18 00073C03 */ sra $a3, $a3, 16 +/* 0069C 80998E1C 00052C03 */ sra $a1, $a1, 16 +/* 006A0 80998E20 AFAC001C */ sw $t4, 0x001C($sp) +/* 006A4 80998E24 AFAB0018 */ sw $t3, 0x0018($sp) +/* 006A8 80998E28 AFAA0014 */ sw $t2, 0x0014($sp) +/* 006AC 80998E2C AFA90010 */ sw $t1, 0x0010($sp) /* 006B0 80998E30 0C01E763 */ jal Lights_InitType0PositionalLight - + /* 006B4 80998E34 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 006B8 80998E38 3C05809A */ lui $a1, %hi(func_8099A3A4) ## $a1 = 809A0000 /* 006BC 80998E3C 24A5A3A4 */ addiu $a1, $a1, %lo(func_8099A3A4) ## $a1 = 8099A3A4 -/* 006C0 80998E40 0C2661E0 */ jal func_80998780 +/* 006C0 80998E40 0C2661E0 */ jal func_80998780 /* 006C4 80998E44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006C8 80998E48 8FBF002C */ lw $ra, 0x002C($sp) -/* 006CC 80998E4C 8FB00028 */ lw $s0, 0x0028($sp) +/* 006C8 80998E48 8FBF002C */ lw $ra, 0x002C($sp) +/* 006CC 80998E4C 8FB00028 */ lw $s0, 0x0028($sp) /* 006D0 80998E50 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 006D4 80998E54 03E00008 */ jr $ra +/* 006D4 80998E54 03E00008 */ jr $ra /* 006D8 80998E58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s index 0d52f522db..1f6c6b96c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s @@ -1,59 +1,59 @@ glabel func_80998E5C /* 006DC 80998E5C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 006E0 80998E60 AFB00024 */ sw $s0, 0x0024($sp) +/* 006E0 80998E60 AFB00024 */ sw $s0, 0x0024($sp) /* 006E4 80998E64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006E8 80998E68 AFB10028 */ sw $s1, 0x0028($sp) +/* 006E8 80998E68 AFB10028 */ sw $s1, 0x0028($sp) /* 006EC 80998E6C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 006F0 80998E70 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 006F4 80998E74 AFBF002C */ sw $ra, 0x002C($sp) +/* 006F4 80998E74 AFBF002C */ sw $ra, 0x002C($sp) /* 006F8 80998E78 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 006FC 80998E7C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00700 80998E80 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00704 80998E84 24E71374 */ addiu $a3, $a3, 0x1374 ## $a3 = 06001374 /* 00708 80998E88 24C62CA8 */ addiu $a2, $a2, 0x2CA8 ## $a2 = 06002CA8 -/* 0070C 80998E8C AFA50034 */ sw $a1, 0x0034($sp) -/* 00710 80998E90 AFA00010 */ sw $zero, 0x0010($sp) -/* 00714 80998E94 AFA00014 */ sw $zero, 0x0014($sp) +/* 0070C 80998E8C AFA50034 */ sw $a1, 0x0034($sp) +/* 00710 80998E90 AFA00010 */ sw $zero, 0x0010($sp) +/* 00714 80998E94 AFA00014 */ sw $zero, 0x0014($sp) /* 00718 80998E98 0C02915F */ jal SkelAnime_Init - -/* 0071C 80998E9C AFA00018 */ sw $zero, 0x0018($sp) + +/* 0071C 80998E9C AFA00018 */ sw $zero, 0x0018($sp) /* 00720 80998EA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00724 80998EA4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00728 80998EA8 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 0072C 80998EAC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00730 80998EB0 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 00734 80998EB4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00738 80998EB8 A7A2003A */ sh $v0, 0x003A($sp) -/* 0073C 80998EBC 87AE003A */ lh $t6, 0x003A($sp) + +/* 00738 80998EB8 A7A2003A */ sh $v0, 0x003A($sp) +/* 0073C 80998EBC 87AE003A */ lh $t6, 0x003A($sp) /* 00740 80998EC0 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00744 80998EC4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00748 80998EC8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 0074C 80998ECC 46803220 */ cvt.s.w $f8, $f6 +/* 0074C 80998ECC 46803220 */ cvt.s.w $f8, $f6 /* 00750 80998ED0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00754 80998ED4 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00758 80998ED8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 0075C 80998EDC AFB8001C */ sw $t8, 0x001C($sp) -/* 00760 80998EE0 46802120 */ cvt.s.w $f4, $f4 -/* 00764 80998EE4 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0075C 80998EDC AFB8001C */ sw $t8, 0x001C($sp) +/* 00760 80998EE0 46802120 */ cvt.s.w $f4, $f4 +/* 00764 80998EE4 AFAF0014 */ sw $t7, 0x0014($sp) /* 00768 80998EE8 24A51374 */ addiu $a1, $a1, 0x1374 ## $a1 = 06001374 -/* 0076C 80998EEC E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00770 80998EF0 8FA40034 */ lw $a0, 0x0034($sp) +/* 0076C 80998EEC E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00770 80998EF0 8FA40034 */ lw $a0, 0x0034($sp) /* 00774 80998EF4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00778 80998EF8 44072000 */ mfc1 $a3, $f4 -/* 0077C 80998EFC 0C0293F9 */ jal func_800A4FE4 -/* 00780 80998F00 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00778 80998EF8 44072000 */ mfc1 $a3, $f4 +/* 0077C 80998EFC 0C0293F9 */ jal SkelAnime_ChangeAnimationImpl +/* 00780 80998F00 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00784 80998F04 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00788 80998F08 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0078C 80998F0C 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 00790 80998F10 3C01809A */ lui $at, %hi(D_8099C728) ## $at = 809A0000 -/* 00794 80998F14 C422C728 */ lwc1 $f2, %lo(D_8099C728)($at) +/* 00794 80998F14 C422C728 */ lwc1 $f2, %lo(D_8099C728)($at) /* 00798 80998F18 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 0079C 80998F1C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 007A0 80998F20 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 007A4 80998F24 46805420 */ cvt.s.w $f16, $f10 +/* 007A4 80998F24 46805420 */ cvt.s.w $f16, $f10 /* 007A8 80998F28 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 /* 007AC 80998F2C 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 007B0 80998F30 44812000 */ mtc1 $at, $f4 ## $f4 = 800.00 @@ -77,20 +77,20 @@ glabel func_80998E5C /* 007F8 80998F78 E61201BC */ swc1 $f18, 0x01BC($s0) ## 000001BC /* 007FC 80998F7C E60400BC */ swc1 $f4, 0x00BC($s0) ## 000000BC .L80998F80: -/* 00800 80998F80 00045040 */ sll $t2, $a0, 1 -/* 00804 80998F84 022A5821 */ addu $t3, $s1, $t2 -/* 00808 80998F88 01651021 */ addu $v0, $t3, $a1 +/* 00800 80998F80 00045040 */ sll $t2, $a0, 1 +/* 00804 80998F84 022A5821 */ addu $t3, $s1, $t2 +/* 00808 80998F88 01651021 */ addu $v0, $t3, $a1 /* 0080C 80998F8C 24840001 */ addiu $a0, $a0, 0x0001 ## $a0 = 00000001 /* 00810 80998F90 A4460AB6 */ sh $a2, 0x0AB6($v0) ## 00000AB6 /* 00814 80998F94 84430AB6 */ lh $v1, 0x0AB6($v0) ## 00000AB6 -/* 00818 80998F98 00042400 */ sll $a0, $a0, 16 -/* 0081C 80998F9C 00042403 */ sra $a0, $a0, 16 -/* 00820 80998FA0 28810003 */ slti $at, $a0, 0x0003 +/* 00818 80998F98 00042400 */ sll $a0, $a0, 16 +/* 0081C 80998F9C 00042403 */ sra $a0, $a0, 16 +/* 00820 80998FA0 28810003 */ slti $at, $a0, 0x0003 /* 00824 80998FA4 A4430ABC */ sh $v1, 0x0ABC($v0) ## 00000ABC -/* 00828 80998FA8 1420FFF5 */ bne $at, $zero, .L80998F80 +/* 00828 80998FA8 1420FFF5 */ bne $at, $zero, .L80998F80 /* 0082C 80998FAC A4430AB0 */ sh $v1, 0x0AB0($v0) ## 00000AB0 /* 00830 80998FB0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00834 80998FB4 00310821 */ addu $at, $at, $s1 +/* 00834 80998FB4 00310821 */ addu $at, $at, $s1 /* 00838 80998FB8 240CFE0C */ addiu $t4, $zero, 0xFE0C ## $t4 = FFFFFE0C /* 0083C 80998FBC A42C0AC2 */ sh $t4, 0x0AC2($at) ## 00010AC2 /* 00840 80998FC0 240D001E */ addiu $t5, $zero, 0x001E ## $t5 = 0000001E @@ -99,12 +99,12 @@ glabel func_80998E5C /* 0084C 80998FCC A60D0192 */ sh $t5, 0x0192($s0) ## 00000192 /* 00850 80998FD0 A60E01B8 */ sh $t6, 0x01B8($s0) ## 000001B8 /* 00854 80998FD4 24A591C8 */ addiu $a1, $a1, %lo(func_809991C8) ## $a1 = 809991C8 -/* 00858 80998FD8 0C2661E0 */ jal func_80998780 +/* 00858 80998FD8 0C2661E0 */ jal func_80998780 /* 0085C 80998FDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00860 80998FE0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00864 80998FE4 8FB00024 */ lw $s0, 0x0024($sp) -/* 00868 80998FE8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0086C 80998FEC 03E00008 */ jr $ra +/* 00860 80998FE0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00864 80998FE4 8FB00024 */ lw $s0, 0x0024($sp) +/* 00868 80998FE8 8FB10028 */ lw $s1, 0x0028($sp) +/* 0086C 80998FEC 03E00008 */ jr $ra /* 00870 80998FF0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s index 6e2d33109d..bd0d24f5b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s @@ -1,60 +1,60 @@ glabel func_80998FF4 /* 00874 80998FF4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00878 80998FF8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00878 80998FF8 AFB00028 */ sw $s0, 0x0028($sp) /* 0087C 80998FFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00880 80999000 AFA50044 */ sw $a1, 0x0044($sp) +/* 00880 80999000 AFA50044 */ sw $a1, 0x0044($sp) /* 00884 80999004 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00888 80999008 AFBF002C */ sw $ra, 0x002C($sp) +/* 00888 80999008 AFBF002C */ sw $ra, 0x002C($sp) /* 0088C 8099900C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00890 80999010 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00894 80999014 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00898 80999018 24E71374 */ addiu $a3, $a3, 0x1374 ## $a3 = 06001374 /* 0089C 8099901C 24C62CA8 */ addiu $a2, $a2, 0x2CA8 ## $a2 = 06002CA8 -/* 008A0 80999020 AFA50034 */ sw $a1, 0x0034($sp) -/* 008A4 80999024 AFA00010 */ sw $zero, 0x0010($sp) -/* 008A8 80999028 AFA00014 */ sw $zero, 0x0014($sp) +/* 008A0 80999020 AFA50034 */ sw $a1, 0x0034($sp) +/* 008A4 80999024 AFA00010 */ sw $zero, 0x0010($sp) +/* 008A8 80999028 AFA00014 */ sw $zero, 0x0014($sp) /* 008AC 8099902C 0C02915F */ jal SkelAnime_Init - -/* 008B0 80999030 AFA00018 */ sw $zero, 0x0018($sp) + +/* 008B0 80999030 AFA00018 */ sw $zero, 0x0018($sp) /* 008B4 80999034 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 008B8 80999038 0C028800 */ jal SkelAnime_GetFrameCount - + /* 008BC 8099903C 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 008C0 80999040 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 008C4 80999044 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 008C8 80999048 0C028800 */ jal SkelAnime_GetFrameCount - -/* 008CC 8099904C A7A2003C */ sh $v0, 0x003C($sp) -/* 008D0 80999050 87AE003C */ lh $t6, 0x003C($sp) + +/* 008CC 8099904C A7A2003C */ sh $v0, 0x003C($sp) +/* 008D0 80999050 87AE003C */ lh $t6, 0x003C($sp) /* 008D4 80999054 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 008D8 80999058 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008DC 8099905C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 008E0 80999060 46803220 */ cvt.s.w $f8, $f6 +/* 008E0 80999060 46803220 */ cvt.s.w $f8, $f6 /* 008E4 80999064 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008E8 80999068 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 008EC 8099906C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 008F0 80999070 AFB8001C */ sw $t8, 0x001C($sp) -/* 008F4 80999074 46802120 */ cvt.s.w $f4, $f4 -/* 008F8 80999078 AFAF0014 */ sw $t7, 0x0014($sp) +/* 008F0 80999070 AFB8001C */ sw $t8, 0x001C($sp) +/* 008F4 80999074 46802120 */ cvt.s.w $f4, $f4 +/* 008F8 80999078 AFAF0014 */ sw $t7, 0x0014($sp) /* 008FC 8099907C 24A51374 */ addiu $a1, $a1, 0x1374 ## $a1 = 06001374 -/* 00900 80999080 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00904 80999084 8FA40034 */ lw $a0, 0x0034($sp) +/* 00900 80999080 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00904 80999084 8FA40034 */ lw $a0, 0x0034($sp) /* 00908 80999088 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 0090C 8099908C 44072000 */ mfc1 $a3, $f4 -/* 00910 80999090 0C0293F9 */ jal func_800A4FE4 -/* 00914 80999094 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0090C 8099908C 44072000 */ mfc1 $a3, $f4 +/* 00910 80999090 0C0293F9 */ jal SkelAnime_ChangeAnimationImpl +/* 00914 80999094 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00918 80999098 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0091C 8099909C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00920 809990A0 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 00924 809990A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00928 809990A8 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 0092C 809990AC 3C01809A */ lui $at, %hi(D_8099C72C) ## $at = 809A0000 -/* 00930 809990B0 C42CC72C */ lwc1 $f12, %lo(D_8099C72C)($at) +/* 00930 809990B0 C42CC72C */ lwc1 $f12, %lo(D_8099C72C)($at) /* 00934 809990B4 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00938 809990B8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0093C 809990BC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00940 809990C0 46805420 */ cvt.s.w $f16, $f10 +/* 00940 809990C0 46805420 */ cvt.s.w $f16, $f10 /* 00944 809990C4 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 /* 00948 809990C8 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 0094C 809990CC 44812000 */ mtc1 $at, $f4 ## $f4 = 800.00 @@ -82,33 +82,33 @@ glabel func_80998FF4 /* 009A4 80999124 8D6BE660 */ lw $t3, -0x19A0($t3) ## 8015E660 /* 009A8 80999128 24010053 */ addiu $at, $zero, 0x0053 ## $at = 00000053 /* 009AC 8099912C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009B0 80999130 1161000D */ beq $t3, $at, .L80999168 +/* 009B0 80999130 1161000D */ beq $t3, $at, .L80999168 /* 009B4 80999134 3C01809A */ lui $at, %hi(D_8099C730) ## $at = 809A0000 -/* 009B8 80999138 C426C730 */ lwc1 $f6, %lo(D_8099C730)($at) +/* 009B8 80999138 C426C730 */ lwc1 $f6, %lo(D_8099C730)($at) /* 009BC 8099913C 3C01809A */ lui $at, %hi(D_8099C734) ## $at = 809A0000 /* 009C0 80999140 E6060050 */ swc1 $f6, 0x0050($s0) ## 00000050 -/* 009C4 80999144 C428C734 */ lwc1 $f8, %lo(D_8099C734)($at) +/* 009C4 80999144 C428C734 */ lwc1 $f8, %lo(D_8099C734)($at) /* 009C8 80999148 3C01809A */ lui $at, %hi(D_8099C738) ## $at = 809A0000 /* 009CC 8099914C E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 -/* 009D0 80999150 C42AC738 */ lwc1 $f10, %lo(D_8099C738)($at) +/* 009D0 80999150 C42AC738 */ lwc1 $f10, %lo(D_8099C738)($at) /* 009D4 80999154 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 009D8 80999158 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 /* 009DC 8099915C E60A0058 */ swc1 $f10, 0x0058($s0) ## 00000058 -/* 009E0 80999160 10000003 */ beq $zero, $zero, .L80999170 +/* 009E0 80999160 10000003 */ beq $zero, $zero, .L80999170 /* 009E4 80999164 E61001A8 */ swc1 $f16, 0x01A8($s0) ## 000001A8 .L80999168: /* 009E8 80999168 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 009EC 8099916C 24052899 */ addiu $a1, $zero, 0x2899 ## $a1 = 00002899 .L80999170: /* 009F0 80999170 3C05809A */ lui $a1, %hi(func_80999428) ## $a1 = 809A0000 /* 009F4 80999174 24A59428 */ addiu $a1, $a1, %lo(func_80999428) ## $a1 = 80999428 -/* 009F8 80999178 0C2661E0 */ jal func_80998780 +/* 009F8 80999178 0C2661E0 */ jal func_80998780 /* 009FC 8099917C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A00 80999180 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A04 80999184 8FB00028 */ lw $s0, 0x0028($sp) +/* 00A00 80999180 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A04 80999184 8FB00028 */ lw $s0, 0x0028($sp) /* 00A08 80999188 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00A0C 8099918C 03E00008 */ jr $ra +/* 00A0C 8099918C 03E00008 */ jr $ra /* 00A10 80999190 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s index 628b8062b1..9f559b937b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s @@ -1,65 +1,65 @@ glabel func_8099A508 /* 01D88 8099A508 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01D8C 8099A50C AFBF002C */ sw $ra, 0x002C($sp) -/* 01D90 8099A510 AFB00028 */ sw $s0, 0x0028($sp) +/* 01D8C 8099A50C AFBF002C */ sw $ra, 0x002C($sp) +/* 01D90 8099A510 AFB00028 */ sw $s0, 0x0028($sp) /* 01D94 8099A514 848201B2 */ lh $v0, 0x01B2($a0) ## 000001B2 /* 01D98 8099A518 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01D9C 8099A51C 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 01DA0 8099A520 10400004 */ beq $v0, $zero, .L8099A534 +/* 01DA0 8099A520 10400004 */ beq $v0, $zero, .L8099A534 /* 01DA4 8099A524 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 01DA8 8099A528 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01DAC 8099A52C 1000002A */ beq $zero, $zero, .L8099A5D8 +/* 01DAC 8099A52C 1000002A */ beq $zero, $zero, .L8099A5D8 /* 01DB0 8099A530 A48E01B2 */ sh $t6, 0x01B2($a0) ## 000001B2 .L8099A534: /* 01DB4 8099A534 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 /* 01DB8 8099A538 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 01DBC 8099A53C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 01DC0 8099A540 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01DC4 8099A544 AFA70010 */ sw $a3, 0x0010($sp) +/* 01DC0 8099A540 AFAF0014 */ sw $t7, 0x0014($sp) +/* 01DC4 8099A544 AFA70010 */ sw $a3, 0x0010($sp) /* 01DC8 8099A548 24042826 */ addiu $a0, $zero, 0x2826 ## $a0 = 00002826 /* 01DCC 8099A54C 246500E4 */ addiu $a1, $v1, 0x00E4 ## $a1 = 000000E4 /* 01DD0 8099A550 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 01DD4 8099A554 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01DD8 8099A558 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01DDC 8099A55C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01DE0 8099A560 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 01DE4 8099A564 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01DE8 8099A568 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 01DEC 8099A56C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01DF0 8099A570 A7A20030 */ sh $v0, 0x0030($sp) -/* 01DF4 8099A574 87B80030 */ lh $t8, 0x0030($sp) + +/* 01DF0 8099A570 A7A20030 */ sh $v0, 0x0030($sp) +/* 01DF4 8099A574 87B80030 */ lh $t8, 0x0030($sp) /* 01DF8 8099A578 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 01DFC 8099A57C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 01E00 8099A580 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 01E04 8099A584 46803220 */ cvt.s.w $f8, $f6 +/* 01E04 8099A584 46803220 */ cvt.s.w $f8, $f6 /* 01E08 8099A588 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 /* 01E0C 8099A58C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01E10 8099A590 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 01E14 8099A594 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01E18 8099A598 46802120 */ cvt.s.w $f4, $f4 -/* 01E1C 8099A59C AFA8001C */ sw $t0, 0x001C($sp) -/* 01E20 8099A5A0 AFB90014 */ sw $t9, 0x0014($sp) +/* 01E18 8099A598 46802120 */ cvt.s.w $f4, $f4 +/* 01E1C 8099A59C AFA8001C */ sw $t0, 0x001C($sp) +/* 01E20 8099A5A0 AFB90014 */ sw $t9, 0x0014($sp) /* 01E24 8099A5A4 24A51374 */ addiu $a1, $a1, 0x1374 ## $a1 = 06001374 -/* 01E28 8099A5A8 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01E28 8099A5A8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01E2C 8099A5AC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01E30 8099A5B0 44072000 */ mfc1 $a3, $f4 +/* 01E30 8099A5B0 44072000 */ mfc1 $a3, $f4 /* 01E34 8099A5B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01E38 8099A5B8 0C0293F9 */ jal func_800A4FE4 -/* 01E3C 8099A5BC E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 01E38 8099A5B8 0C0293F9 */ jal SkelAnime_ChangeAnimationImpl +/* 01E3C 8099A5BC E7AA0018 */ swc1 $f10, 0x0018($sp) /* 01E40 8099A5C0 24090032 */ addiu $t1, $zero, 0x0032 ## $t1 = 00000032 /* 01E44 8099A5C4 3C05809A */ lui $a1, %hi(func_8099A5EC) ## $a1 = 809A0000 /* 01E48 8099A5C8 A60901B2 */ sh $t1, 0x01B2($s0) ## 000001B2 /* 01E4C 8099A5CC 24A5A5EC */ addiu $a1, $a1, %lo(func_8099A5EC) ## $a1 = 8099A5EC -/* 01E50 8099A5D0 0C2661E0 */ jal func_80998780 +/* 01E50 8099A5D0 0C2661E0 */ jal func_80998780 /* 01E54 8099A5D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8099A5D8: -/* 01E58 8099A5D8 8FBF002C */ lw $ra, 0x002C($sp) -/* 01E5C 8099A5DC 8FB00028 */ lw $s0, 0x0028($sp) +/* 01E58 8099A5D8 8FBF002C */ lw $ra, 0x002C($sp) +/* 01E5C 8099A5DC 8FB00028 */ lw $s0, 0x0028($sp) /* 01E60 8099A5E0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01E64 8099A5E4 03E00008 */ jr $ra +/* 01E64 8099A5E4 03E00008 */ jr $ra /* 01E68 8099A5E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s index bbfb7a95ad..4fe71dea24 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s @@ -1,19 +1,19 @@ glabel func_8099B140 /* 029C0 8099B140 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 029C4 8099B144 AFBF002C */ sw $ra, 0x002C($sp) -/* 029C8 8099B148 AFB10028 */ sw $s1, 0x0028($sp) -/* 029CC 8099B14C AFB00024 */ sw $s0, 0x0024($sp) -/* 029D0 8099B150 AFA5005C */ sw $a1, 0x005C($sp) +/* 029C4 8099B144 AFBF002C */ sw $ra, 0x002C($sp) +/* 029C8 8099B148 AFB10028 */ sw $s1, 0x0028($sp) +/* 029CC 8099B14C AFB00024 */ sw $s0, 0x0024($sp) +/* 029D0 8099B150 AFA5005C */ sw $a1, 0x005C($sp) /* 029D4 8099B154 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 029D8 8099B158 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 029DC 8099B15C 3C06809A */ lui $a2, %hi(D_8099C61C) ## $a2 = 809A0000 /* 029E0 8099B160 24C6C61C */ addiu $a2, $a2, %lo(D_8099C61C) ## $a2 = 8099C61C /* 029E4 8099B164 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 029E8 8099B168 2407081E */ addiu $a3, $zero, 0x081E ## $a3 = 0000081E -/* 029EC 8099B16C 0C031AB1 */ jal func_800C6AC4 +/* 029EC 8099B16C 0C031AB1 */ jal func_800C6AC4 /* 029F0 8099B170 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 029F4 8099B174 8FAF005C */ lw $t7, 0x005C($sp) -/* 029F8 8099B178 0C024F61 */ jal func_80093D84 +/* 029F4 8099B174 8FAF005C */ lw $t7, 0x005C($sp) +/* 029F8 8099B178 0C024F61 */ jal func_80093D84 /* 029FC 8099B17C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 02A00 8099B180 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 02A04 8099B184 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 @@ -27,35 +27,35 @@ glabel func_8099B140 /* 02A24 8099B1A4 C62401A8 */ lwc1 $f4, 0x01A8($s1) ## 000001A8 /* 02A28 8099B1A8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 02A2C 8099B1AC 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 02A30 8099B1B0 460021A4 */ cvt.w.s $f6, $f4 +/* 02A30 8099B1B0 460021A4 */ cvt.w.s $f6, $f4 /* 02A34 8099B1B4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02A38 8099B1B8 4449F800 */ cfc1 $t1, $31 /* 02A3C 8099B1BC 00000000 */ nop /* 02A40 8099B1C0 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 02A44 8099B1C4 51200013 */ beql $t1, $zero, .L8099B214 -/* 02A48 8099B1C8 44093000 */ mfc1 $t1, $f6 +/* 02A44 8099B1C4 51200013 */ beql $t1, $zero, .L8099B214 +/* 02A48 8099B1C8 44093000 */ mfc1 $t1, $f6 /* 02A4C 8099B1CC 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 /* 02A50 8099B1D0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02A54 8099B1D4 46062181 */ sub.s $f6, $f4, $f6 +/* 02A54 8099B1D4 46062181 */ sub.s $f6, $f4, $f6 /* 02A58 8099B1D8 44C9F800 */ ctc1 $t1, $31 /* 02A5C 8099B1DC 00000000 */ nop -/* 02A60 8099B1E0 460031A4 */ cvt.w.s $f6, $f6 +/* 02A60 8099B1E0 460031A4 */ cvt.w.s $f6, $f6 /* 02A64 8099B1E4 4449F800 */ cfc1 $t1, $31 /* 02A68 8099B1E8 00000000 */ nop /* 02A6C 8099B1EC 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 02A70 8099B1F0 15200005 */ bne $t1, $zero, .L8099B208 +/* 02A70 8099B1F0 15200005 */ bne $t1, $zero, .L8099B208 /* 02A74 8099B1F4 00000000 */ nop -/* 02A78 8099B1F8 44093000 */ mfc1 $t1, $f6 +/* 02A78 8099B1F8 44093000 */ mfc1 $t1, $f6 /* 02A7C 8099B1FC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02A80 8099B200 10000007 */ beq $zero, $zero, .L8099B220 +/* 02A80 8099B200 10000007 */ beq $zero, $zero, .L8099B220 /* 02A84 8099B204 01214825 */ or $t1, $t1, $at ## $t1 = 80000000 .L8099B208: -/* 02A88 8099B208 10000005 */ beq $zero, $zero, .L8099B220 +/* 02A88 8099B208 10000005 */ beq $zero, $zero, .L8099B220 /* 02A8C 8099B20C 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 02A90 8099B210 44093000 */ mfc1 $t1, $f6 +/* 02A90 8099B210 44093000 */ mfc1 $t1, $f6 .L8099B214: /* 02A94 8099B214 00000000 */ nop -/* 02A98 8099B218 0520FFFB */ bltz $t1, .L8099B208 +/* 02A98 8099B218 0520FFFB */ bltz $t1, .L8099B208 /* 02A9C 8099B21C 00000000 */ nop .L8099B220: /* 02AA0 8099B220 3C01C8FF */ lui $at, 0xC8FF ## $at = C8FF0000 @@ -73,34 +73,34 @@ glabel func_8099B140 /* 02AD0 8099B250 44D8F800 */ ctc1 $t8, $31 /* 02AD4 8099B254 C62801A8 */ lwc1 $f8, 0x01A8($s1) ## 000001A8 /* 02AD8 8099B258 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02ADC 8099B25C 460042A4 */ cvt.w.s $f10, $f8 +/* 02ADC 8099B25C 460042A4 */ cvt.w.s $f10, $f8 /* 02AE0 8099B260 4458F800 */ cfc1 $t8, $31 /* 02AE4 8099B264 00000000 */ nop /* 02AE8 8099B268 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 02AEC 8099B26C 53000013 */ beql $t8, $zero, .L8099B2BC -/* 02AF0 8099B270 44185000 */ mfc1 $t8, $f10 +/* 02AEC 8099B26C 53000013 */ beql $t8, $zero, .L8099B2BC +/* 02AF0 8099B270 44185000 */ mfc1 $t8, $f10 /* 02AF4 8099B274 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 02AF8 8099B278 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 02AFC 8099B27C 460A4281 */ sub.s $f10, $f8, $f10 +/* 02AFC 8099B27C 460A4281 */ sub.s $f10, $f8, $f10 /* 02B00 8099B280 44D8F800 */ ctc1 $t8, $31 /* 02B04 8099B284 00000000 */ nop -/* 02B08 8099B288 460052A4 */ cvt.w.s $f10, $f10 +/* 02B08 8099B288 460052A4 */ cvt.w.s $f10, $f10 /* 02B0C 8099B28C 4458F800 */ cfc1 $t8, $31 /* 02B10 8099B290 00000000 */ nop /* 02B14 8099B294 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 02B18 8099B298 17000005 */ bne $t8, $zero, .L8099B2B0 +/* 02B18 8099B298 17000005 */ bne $t8, $zero, .L8099B2B0 /* 02B1C 8099B29C 00000000 */ nop -/* 02B20 8099B2A0 44185000 */ mfc1 $t8, $f10 +/* 02B20 8099B2A0 44185000 */ mfc1 $t8, $f10 /* 02B24 8099B2A4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02B28 8099B2A8 10000007 */ beq $zero, $zero, .L8099B2C8 +/* 02B28 8099B2A8 10000007 */ beq $zero, $zero, .L8099B2C8 /* 02B2C 8099B2AC 0301C025 */ or $t8, $t8, $at ## $t8 = 80000000 .L8099B2B0: -/* 02B30 8099B2B0 10000005 */ beq $zero, $zero, .L8099B2C8 +/* 02B30 8099B2B0 10000005 */ beq $zero, $zero, .L8099B2C8 /* 02B34 8099B2B4 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 02B38 8099B2B8 44185000 */ mfc1 $t8, $f10 +/* 02B38 8099B2B8 44185000 */ mfc1 $t8, $f10 .L8099B2BC: /* 02B3C 8099B2BC 00000000 */ nop -/* 02B40 8099B2C0 0700FFFB */ bltz $t8, .L8099B2B0 +/* 02B40 8099B2C0 0700FFFB */ bltz $t8, .L8099B2B0 /* 02B44 8099B2C4 00000000 */ nop .L8099B2C8: /* 02B48 8099B2C8 3C010064 */ lui $at, 0x0064 ## $at = 00640000 @@ -110,28 +110,28 @@ glabel func_8099B140 /* 02B58 8099B2D8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 02B5C 8099B2DC 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 02B60 8099B2E0 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 02B64 8099B2E4 AFB10014 */ sw $s1, 0x0014($sp) -/* 02B68 8099B2E8 AFA00010 */ sw $zero, 0x0010($sp) +/* 02B64 8099B2E4 AFB10014 */ sw $s1, 0x0014($sp) +/* 02B68 8099B2E8 AFA00010 */ sw $zero, 0x0010($sp) /* 02B6C 8099B2EC 8E0A02D0 */ lw $t2, 0x02D0($s0) ## 000002D0 /* 02B70 8099B2F0 44CFF800 */ ctc1 $t7, $31 -/* 02B74 8099B2F4 8FA4005C */ lw $a0, 0x005C($sp) -/* 02B78 8099B2F8 0C0288A2 */ jal func_800A2288 -/* 02B7C 8099B2FC AFAA0018 */ sw $t2, 0x0018($sp) +/* 02B74 8099B2F4 8FA4005C */ lw $a0, 0x005C($sp) +/* 02B78 8099B2F8 0C0288A2 */ jal SkelAnime_Draw2 +/* 02B7C 8099B2FC AFAA0018 */ sw $t2, 0x0018($sp) /* 02B80 8099B300 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 02B84 8099B304 8FAB005C */ lw $t3, 0x005C($sp) +/* 02B84 8099B304 8FAB005C */ lw $t3, 0x005C($sp) /* 02B88 8099B308 3C06809A */ lui $a2, %hi(D_8099C630) ## $a2 = 809A0000 /* 02B8C 8099B30C 24C6C630 */ addiu $a2, $a2, %lo(D_8099C630) ## $a2 = 8099C630 /* 02B90 8099B310 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02B94 8099B314 24070832 */ addiu $a3, $zero, 0x0832 ## $a3 = 00000832 -/* 02B98 8099B318 0C031AD5 */ jal func_800C6B54 +/* 02B98 8099B318 0C031AD5 */ jal func_800C6B54 /* 02B9C 8099B31C 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 02BA0 8099B320 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 02BA4 8099B324 2624014C */ addiu $a0, $s1, 0x014C ## $a0 = 0000014C -/* 02BA8 8099B328 8FBF002C */ lw $ra, 0x002C($sp) -/* 02BAC 8099B32C 8FB00024 */ lw $s0, 0x0024($sp) -/* 02BB0 8099B330 8FB10028 */ lw $s1, 0x0028($sp) -/* 02BB4 8099B334 03E00008 */ jr $ra +/* 02BA8 8099B328 8FBF002C */ lw $ra, 0x002C($sp) +/* 02BAC 8099B32C 8FB00024 */ lw $s0, 0x0024($sp) +/* 02BB0 8099B330 8FB10028 */ lw $s1, 0x0028($sp) +/* 02BB4 8099B334 03E00008 */ jr $ra /* 02BB8 8099B338 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s index 87af50666e..c09ba4467c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s @@ -1,69 +1,69 @@ glabel func_8099B33C /* 02BBC 8099B33C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 02BC0 8099B340 AFBF0034 */ sw $ra, 0x0034($sp) -/* 02BC4 8099B344 AFB20030 */ sw $s2, 0x0030($sp) -/* 02BC8 8099B348 AFB1002C */ sw $s1, 0x002C($sp) -/* 02BCC 8099B34C AFB00028 */ sw $s0, 0x0028($sp) +/* 02BC0 8099B340 AFBF0034 */ sw $ra, 0x0034($sp) +/* 02BC4 8099B344 AFB20030 */ sw $s2, 0x0030($sp) +/* 02BC8 8099B348 AFB1002C */ sw $s1, 0x002C($sp) +/* 02BCC 8099B34C AFB00028 */ sw $s0, 0x0028($sp) /* 02BD0 8099B350 8CAE009C */ lw $t6, 0x009C($a1) ## 0000009C /* 02BD4 8099B354 241000C8 */ addiu $s0, $zero, 0x00C8 ## $s0 = 000000C8 /* 02BD8 8099B358 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 02BDC 8099B35C 01D00019 */ multu $t6, $s0 +/* 02BDC 8099B35C 01D00019 */ multu $t6, $s0 /* 02BE0 8099B360 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02BE4 8099B364 00002012 */ mflo $a0 -/* 02BE8 8099B368 00042400 */ sll $a0, $a0, 16 +/* 02BE4 8099B364 00002012 */ mflo $a0 +/* 02BE8 8099B368 00042400 */ sll $a0, $a0, 16 /* 02BEC 8099B36C 0C01DE1C */ jal Math_Sins ## sins? -/* 02BF0 8099B370 00042403 */ sra $a0, $a0, 16 +/* 02BF0 8099B370 00042403 */ sra $a0, $a0, 16 /* 02BF4 8099B374 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 02BF8 8099B378 44812000 */ mtc1 $at, $f4 ## $f4 = 120.00 /* 02BFC 8099B37C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 02C00 8099B380 44815000 */ mtc1 $at, $f10 ## $f10 = 80.00 -/* 02C04 8099B384 46040182 */ mul.s $f6, $f0, $f4 -/* 02C08 8099B388 46003207 */ neg.s $f8, $f6 -/* 02C0C 8099B38C 460A4402 */ mul.s $f16, $f8, $f10 -/* 02C10 8099B390 E7B0005C */ swc1 $f16, 0x005C($sp) +/* 02C04 8099B384 46040182 */ mul.s $f6, $f0, $f4 +/* 02C08 8099B388 46003207 */ neg.s $f8, $f6 +/* 02C0C 8099B38C 460A4402 */ mul.s $f16, $f8, $f10 +/* 02C10 8099B390 E7B0005C */ swc1 $f16, 0x005C($sp) /* 02C14 8099B394 8E2F009C */ lw $t7, 0x009C($s1) ## 0000009C -/* 02C18 8099B398 01F00019 */ multu $t7, $s0 -/* 02C1C 8099B39C 00002012 */ mflo $a0 -/* 02C20 8099B3A0 00042400 */ sll $a0, $a0, 16 +/* 02C18 8099B398 01F00019 */ multu $t7, $s0 +/* 02C1C 8099B39C 00002012 */ mflo $a0 +/* 02C20 8099B3A0 00042400 */ sll $a0, $a0, 16 /* 02C24 8099B3A4 0C01DE0D */ jal Math_Coss ## coss? -/* 02C28 8099B3A8 00042403 */ sra $a0, $a0, 16 +/* 02C28 8099B3A8 00042403 */ sra $a0, $a0, 16 /* 02C2C 8099B3AC 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 02C30 8099B3B0 44819000 */ mtc1 $at, $f18 ## $f18 = 120.00 /* 02C34 8099B3B4 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 02C38 8099B3B8 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 02C3C 8099B3BC 46120102 */ mul.s $f4, $f0, $f18 +/* 02C3C 8099B3BC 46120102 */ mul.s $f4, $f0, $f18 /* 02C40 8099B3C0 00000000 */ nop -/* 02C44 8099B3C4 46062202 */ mul.s $f8, $f4, $f6 -/* 02C48 8099B3C8 E7A80060 */ swc1 $f8, 0x0060($sp) +/* 02C44 8099B3C4 46062202 */ mul.s $f8, $f4, $f6 +/* 02C48 8099B3C8 E7A80060 */ swc1 $f8, 0x0060($sp) /* 02C4C 8099B3CC 8E38009C */ lw $t8, 0x009C($s1) ## 0000009C -/* 02C50 8099B3D0 03100019 */ multu $t8, $s0 -/* 02C54 8099B3D4 00002012 */ mflo $a0 -/* 02C58 8099B3D8 00042400 */ sll $a0, $a0, 16 +/* 02C50 8099B3D0 03100019 */ multu $t8, $s0 +/* 02C54 8099B3D4 00002012 */ mflo $a0 +/* 02C58 8099B3D8 00042400 */ sll $a0, $a0, 16 /* 02C5C 8099B3DC 0C01DE0D */ jal Math_Coss ## coss? -/* 02C60 8099B3E0 00042403 */ sra $a0, $a0, 16 +/* 02C60 8099B3E0 00042403 */ sra $a0, $a0, 16 /* 02C64 8099B3E4 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 02C68 8099B3E8 44815000 */ mtc1 $at, $f10 ## $f10 = 120.00 /* 02C6C 8099B3EC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 02C70 8099B3F0 44819000 */ mtc1 $at, $f18 ## $f18 = 80.00 -/* 02C74 8099B3F4 460A0402 */ mul.s $f16, $f0, $f10 +/* 02C74 8099B3F4 460A0402 */ mul.s $f16, $f0, $f10 /* 02C78 8099B3F8 3C06809A */ lui $a2, %hi(D_8099C644) ## $a2 = 809A0000 /* 02C7C 8099B3FC 24C6C644 */ addiu $a2, $a2, %lo(D_8099C644) ## $a2 = 8099C644 /* 02C80 8099B400 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 02C84 8099B404 2407084A */ addiu $a3, $zero, 0x084A ## $a3 = 0000084A -/* 02C88 8099B408 46128102 */ mul.s $f4, $f16, $f18 -/* 02C8C 8099B40C E7A40064 */ swc1 $f4, 0x0064($sp) +/* 02C88 8099B408 46128102 */ mul.s $f4, $f16, $f18 +/* 02C8C 8099B40C E7A40064 */ swc1 $f4, 0x0064($sp) /* 02C90 8099B410 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02C94 8099B414 0C031AB1 */ jal func_800C6AC4 +/* 02C94 8099B414 0C031AB1 */ jal func_800C6AC4 /* 02C98 8099B418 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02C9C 8099B41C 0C024F61 */ jal func_80093D84 +/* 02C9C 8099B41C 0C024F61 */ jal func_80093D84 /* 02CA0 8099B420 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 02CA4 8099B424 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFFEC /* 02CA8 8099B428 00A03025 */ or $a2, $a1, $zero ## $a2 = FFFFFFEC /* 02CAC 8099B42C 26440024 */ addiu $a0, $s2, 0x0024 ## $a0 = 00000024 -/* 02CB0 8099B430 0C00BAD1 */ jal func_8002EB44 +/* 02CB0 8099B430 0C00BAD1 */ jal func_8002EB44 /* 02CB4 8099B434 8E270000 */ lw $a3, 0x0000($s1) ## 00000000 /* 02CB8 8099B438 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 02CBC 8099B43C 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 @@ -76,36 +76,36 @@ glabel func_8099B33C /* 02CD8 8099B458 C64601A8 */ lwc1 $f6, 0x01A8($s2) ## 000001A8 /* 02CDC 8099B45C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 02CE0 8099B460 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 02CE4 8099B464 46003224 */ cvt.w.s $f8, $f6 +/* 02CE4 8099B464 46003224 */ cvt.w.s $f8, $f6 /* 02CE8 8099B468 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02CEC 8099B46C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02CF0 8099B470 444AF800 */ cfc1 $t2, $31 /* 02CF4 8099B474 00000000 */ nop /* 02CF8 8099B478 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 02CFC 8099B47C 51400013 */ beql $t2, $zero, .L8099B4CC -/* 02D00 8099B480 440A4000 */ mfc1 $t2, $f8 +/* 02CFC 8099B47C 51400013 */ beql $t2, $zero, .L8099B4CC +/* 02D00 8099B480 440A4000 */ mfc1 $t2, $f8 /* 02D04 8099B484 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 /* 02D08 8099B488 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 02D0C 8099B48C 46083201 */ sub.s $f8, $f6, $f8 +/* 02D0C 8099B48C 46083201 */ sub.s $f8, $f6, $f8 /* 02D10 8099B490 44CAF800 */ ctc1 $t2, $31 /* 02D14 8099B494 00000000 */ nop -/* 02D18 8099B498 46004224 */ cvt.w.s $f8, $f8 +/* 02D18 8099B498 46004224 */ cvt.w.s $f8, $f8 /* 02D1C 8099B49C 444AF800 */ cfc1 $t2, $31 /* 02D20 8099B4A0 00000000 */ nop /* 02D24 8099B4A4 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 02D28 8099B4A8 15400005 */ bne $t2, $zero, .L8099B4C0 +/* 02D28 8099B4A8 15400005 */ bne $t2, $zero, .L8099B4C0 /* 02D2C 8099B4AC 00000000 */ nop -/* 02D30 8099B4B0 440A4000 */ mfc1 $t2, $f8 +/* 02D30 8099B4B0 440A4000 */ mfc1 $t2, $f8 /* 02D34 8099B4B4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02D38 8099B4B8 10000007 */ beq $zero, $zero, .L8099B4D8 +/* 02D38 8099B4B8 10000007 */ beq $zero, $zero, .L8099B4D8 /* 02D3C 8099B4BC 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 .L8099B4C0: -/* 02D40 8099B4C0 10000005 */ beq $zero, $zero, .L8099B4D8 +/* 02D40 8099B4C0 10000005 */ beq $zero, $zero, .L8099B4D8 /* 02D44 8099B4C4 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 02D48 8099B4C8 440A4000 */ mfc1 $t2, $f8 +/* 02D48 8099B4C8 440A4000 */ mfc1 $t2, $f8 .L8099B4CC: /* 02D4C 8099B4CC 00000000 */ nop -/* 02D50 8099B4D0 0540FFFB */ bltz $t2, .L8099B4C0 +/* 02D50 8099B4D0 0540FFFB */ bltz $t2, .L8099B4C0 /* 02D54 8099B4D4 00000000 */ nop .L8099B4D8: /* 02D58 8099B4D8 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 000000FF @@ -122,34 +122,34 @@ glabel func_8099B33C /* 02D84 8099B504 44D9F800 */ ctc1 $t9, $31 /* 02D88 8099B508 C64A01A8 */ lwc1 $f10, 0x01A8($s2) ## 000001A8 /* 02D8C 8099B50C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02D90 8099B510 46005424 */ cvt.w.s $f16, $f10 +/* 02D90 8099B510 46005424 */ cvt.w.s $f16, $f10 /* 02D94 8099B514 4459F800 */ cfc1 $t9, $31 /* 02D98 8099B518 00000000 */ nop /* 02D9C 8099B51C 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 02DA0 8099B520 53200013 */ beql $t9, $zero, .L8099B570 -/* 02DA4 8099B524 44198000 */ mfc1 $t9, $f16 +/* 02DA0 8099B520 53200013 */ beql $t9, $zero, .L8099B570 +/* 02DA4 8099B524 44198000 */ mfc1 $t9, $f16 /* 02DA8 8099B528 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 /* 02DAC 8099B52C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02DB0 8099B530 46105401 */ sub.s $f16, $f10, $f16 +/* 02DB0 8099B530 46105401 */ sub.s $f16, $f10, $f16 /* 02DB4 8099B534 44D9F800 */ ctc1 $t9, $31 /* 02DB8 8099B538 00000000 */ nop -/* 02DBC 8099B53C 46008424 */ cvt.w.s $f16, $f16 +/* 02DBC 8099B53C 46008424 */ cvt.w.s $f16, $f16 /* 02DC0 8099B540 4459F800 */ cfc1 $t9, $31 /* 02DC4 8099B544 00000000 */ nop /* 02DC8 8099B548 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 02DCC 8099B54C 17200005 */ bne $t9, $zero, .L8099B564 +/* 02DCC 8099B54C 17200005 */ bne $t9, $zero, .L8099B564 /* 02DD0 8099B550 00000000 */ nop -/* 02DD4 8099B554 44198000 */ mfc1 $t9, $f16 +/* 02DD4 8099B554 44198000 */ mfc1 $t9, $f16 /* 02DD8 8099B558 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02DDC 8099B55C 10000007 */ beq $zero, $zero, .L8099B57C +/* 02DDC 8099B55C 10000007 */ beq $zero, $zero, .L8099B57C /* 02DE0 8099B560 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L8099B564: -/* 02DE4 8099B564 10000005 */ beq $zero, $zero, .L8099B57C +/* 02DE4 8099B564 10000005 */ beq $zero, $zero, .L8099B57C /* 02DE8 8099B568 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 02DEC 8099B56C 44198000 */ mfc1 $t9, $f16 +/* 02DEC 8099B56C 44198000 */ mfc1 $t9, $f16 .L8099B570: /* 02DF0 8099B570 00000000 */ nop -/* 02DF4 8099B574 0720FFFB */ bltz $t9, .L8099B564 +/* 02DF4 8099B574 0720FFFB */ bltz $t9, .L8099B564 /* 02DF8 8099B578 00000000 */ nop .L8099B57C: /* 02DFC 8099B57C 3C019600 */ lui $at, 0x9600 ## $at = 96000000 @@ -159,27 +159,27 @@ glabel func_8099B33C /* 02E0C 8099B58C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 02E10 8099B590 8E46016C */ lw $a2, 0x016C($s2) ## 0000016C /* 02E14 8099B594 8E450150 */ lw $a1, 0x0150($s2) ## 00000150 -/* 02E18 8099B598 AFB20014 */ sw $s2, 0x0014($sp) -/* 02E1C 8099B59C AFA00010 */ sw $zero, 0x0010($sp) +/* 02E18 8099B598 AFB20014 */ sw $s2, 0x0014($sp) +/* 02E1C 8099B59C AFA00010 */ sw $zero, 0x0010($sp) /* 02E20 8099B5A0 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 /* 02E24 8099B5A4 44D8F800 */ ctc1 $t8, $31 -/* 02E28 8099B5A8 0C0288A2 */ jal func_800A2288 -/* 02E2C 8099B5AC AFAB0018 */ sw $t3, 0x0018($sp) +/* 02E28 8099B5A8 0C0288A2 */ jal SkelAnime_Draw2 +/* 02E2C 8099B5AC AFAB0018 */ sw $t3, 0x0018($sp) /* 02E30 8099B5B0 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 02E34 8099B5B4 3C06809A */ lui $a2, %hi(D_8099C658) ## $a2 = 809A0000 /* 02E38 8099B5B8 24C6C658 */ addiu $a2, $a2, %lo(D_8099C658) ## $a2 = 8099C658 /* 02E3C 8099B5BC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 02E40 8099B5C0 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 02E44 8099B5C4 0C031AD5 */ jal func_800C6B54 +/* 02E44 8099B5C4 0C031AD5 */ jal func_800C6B54 /* 02E48 8099B5C8 24070868 */ addiu $a3, $zero, 0x0868 ## $a3 = 00000868 /* 02E4C 8099B5CC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 02E50 8099B5D0 2644014C */ addiu $a0, $s2, 0x014C ## $a0 = 0000014C -/* 02E54 8099B5D4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 02E58 8099B5D8 8FB00028 */ lw $s0, 0x0028($sp) -/* 02E5C 8099B5DC 8FB1002C */ lw $s1, 0x002C($sp) -/* 02E60 8099B5E0 8FB20030 */ lw $s2, 0x0030($sp) -/* 02E64 8099B5E4 03E00008 */ jr $ra +/* 02E54 8099B5D4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 02E58 8099B5D8 8FB00028 */ lw $s0, 0x0028($sp) +/* 02E5C 8099B5DC 8FB1002C */ lw $s1, 0x002C($sp) +/* 02E60 8099B5E0 8FB20030 */ lw $s2, 0x0030($sp) +/* 02E64 8099B5E4 03E00008 */ jr $ra /* 02E68 8099B5E8 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s index 2778ec6ee5..cd4093213e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s @@ -1,14 +1,14 @@ glabel func_809AE538 /* 00618 809AE538 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0061C 809AE53C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0061C 809AE53C AFBF0014 */ sw $ra, 0x0014($sp) /* 00620 809AE540 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00624 809AE544 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00628 809AE548 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 -/* 0062C 809AE54C AFA70018 */ sw $a3, 0x0018($sp) +/* 0062C 809AE54C AFA70018 */ sw $a3, 0x0018($sp) /* 00630 809AE550 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00634 809AE554 0C0294E1 */ jal func_800A5384 +/* 00634 809AE554 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 00638 809AE558 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 0063C 809AE55C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0063C 809AE55C 8FA40018 */ lw $a0, 0x0018($sp) /* 00640 809AE560 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00644 809AE564 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 00648 809AE568 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 @@ -18,11 +18,11 @@ glabel func_809AE538 /* 00658 809AE578 A48E0258 */ sh $t6, 0x0258($a0) ## 00000258 /* 0065C 809AE57C AC8F01A8 */ sw $t7, 0x01A8($a0) ## 000001A8 /* 00660 809AE580 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00664 809AE584 0C26B7C8 */ jal func_809ADF20 +/* 00664 809AE584 0C26B7C8 */ jal func_809ADF20 /* 00668 809AE588 A4980032 */ sh $t8, 0x0032($a0) ## 00000032 -/* 0066C 809AE58C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0066C 809AE58C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00670 809AE590 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00674 809AE594 03E00008 */ jr $ra +/* 00674 809AE594 03E00008 */ jr $ra /* 00678 809AE598 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s index 592b037e9e..0d31ea466d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s @@ -1,14 +1,14 @@ glabel func_809AE59C /* 0067C 809AE59C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00680 809AE5A0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00680 809AE5A0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00684 809AE5A4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00688 809AE5A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0068C 809AE5AC 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 -/* 00690 809AE5B0 AFA70018 */ sw $a3, 0x0018($sp) +/* 00690 809AE5B0 AFA70018 */ sw $a3, 0x0018($sp) /* 00694 809AE5B4 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00698 809AE5B8 0C0294E1 */ jal func_800A5384 +/* 00698 809AE5B8 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 0069C 809AE5BC 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 006A0 809AE5C0 8FA40018 */ lw $a0, 0x0018($sp) +/* 006A0 809AE5C0 8FA40018 */ lw $a0, 0x0018($sp) /* 006A4 809AE5C4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 006A8 809AE5C8 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 006AC 809AE5CC 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 @@ -20,11 +20,11 @@ glabel func_809AE59C /* 006C4 809AE5E4 A48F025A */ sh $t7, 0x025A($a0) ## 0000025A /* 006C8 809AE5E8 AC9801A8 */ sw $t8, 0x01A8($a0) ## 000001A8 /* 006CC 809AE5EC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 006D0 809AE5F0 0C26B7C8 */ jal func_809ADF20 +/* 006D0 809AE5F0 0C26B7C8 */ jal func_809ADF20 /* 006D4 809AE5F4 A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 006D8 809AE5F8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 006D8 809AE5F8 8FBF0014 */ lw $ra, 0x0014($sp) /* 006DC 809AE5FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006E0 809AE600 03E00008 */ jr $ra +/* 006E0 809AE600 03E00008 */ jr $ra /* 006E4 809AE604 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s index b8ffee41a5..58ab6684e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s @@ -1,14 +1,14 @@ glabel func_809AE608 /* 006E8 809AE608 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006EC 809AE60C AFBF0014 */ sw $ra, 0x0014($sp) +/* 006EC 809AE60C AFBF0014 */ sw $ra, 0x0014($sp) /* 006F0 809AE610 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 006F4 809AE614 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006F8 809AE618 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 -/* 006FC 809AE61C AFA70018 */ sw $a3, 0x0018($sp) +/* 006FC 809AE61C AFA70018 */ sw $a3, 0x0018($sp) /* 00700 809AE620 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00704 809AE624 0C0294E1 */ jal func_800A5384 +/* 00704 809AE624 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 00708 809AE628 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 0070C 809AE62C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0070C 809AE62C 8FA40018 */ lw $a0, 0x0018($sp) /* 00710 809AE630 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00714 809AE634 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 /* 00718 809AE638 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 @@ -16,11 +16,11 @@ glabel func_809AE608 /* 00720 809AE640 24A5ED8C */ addiu $a1, $a1, %lo(func_809AED8C) ## $a1 = 809AED8C /* 00724 809AE644 AC8E01A8 */ sw $t6, 0x01A8($a0) ## 000001A8 /* 00728 809AE648 A48F0258 */ sh $t7, 0x0258($a0) ## 00000258 -/* 0072C 809AE64C 0C26B7C8 */ jal func_809ADF20 +/* 0072C 809AE64C 0C26B7C8 */ jal func_809ADF20 /* 00730 809AE650 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00734 809AE654 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00734 809AE654 8FBF0014 */ lw $ra, 0x0014($sp) /* 00738 809AE658 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0073C 809AE65C 03E00008 */ jr $ra +/* 0073C 809AE65C 03E00008 */ jr $ra /* 00740 809AE660 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s index 633e1611ff..b8a089e9c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s @@ -1,14 +1,14 @@ glabel func_809AE664 /* 00744 809AE664 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00748 809AE668 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00748 809AE668 AFBF0014 */ sw $ra, 0x0014($sp) /* 0074C 809AE66C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00750 809AE670 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00754 809AE674 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 -/* 00758 809AE678 AFA70018 */ sw $a3, 0x0018($sp) +/* 00758 809AE678 AFA70018 */ sw $a3, 0x0018($sp) /* 0075C 809AE67C 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00760 809AE680 0C0294E1 */ jal func_800A5384 +/* 00760 809AE680 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 00764 809AE684 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 00768 809AE688 8FA40018 */ lw $a0, 0x0018($sp) +/* 00768 809AE688 8FA40018 */ lw $a0, 0x0018($sp) /* 0076C 809AE68C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00770 809AE690 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 /* 00774 809AE694 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 @@ -16,11 +16,11 @@ glabel func_809AE664 /* 0077C 809AE69C 24A5EC1C */ addiu $a1, $a1, %lo(func_809AEC1C) ## $a1 = 809AEC1C /* 00780 809AE6A0 AC8E01A8 */ sw $t6, 0x01A8($a0) ## 000001A8 /* 00784 809AE6A4 A48F0258 */ sh $t7, 0x0258($a0) ## 00000258 -/* 00788 809AE6A8 0C26B7C8 */ jal func_809ADF20 +/* 00788 809AE6A8 0C26B7C8 */ jal func_809ADF20 /* 0078C 809AE6AC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00790 809AE6B0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00790 809AE6B0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00794 809AE6B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00798 809AE6B8 03E00008 */ jr $ra +/* 00798 809AE6B8 03E00008 */ jr $ra /* 0079C 809AE6BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s index 94f004af97..ca990e29eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s @@ -1,14 +1,14 @@ glabel func_809AE6C0 /* 007A0 809AE6C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007A4 809AE6C4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 007A4 809AE6C4 AFBF0014 */ sw $ra, 0x0014($sp) /* 007A8 809AE6C8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 007AC 809AE6CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007B0 809AE6D0 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 -/* 007B4 809AE6D4 AFA70018 */ sw $a3, 0x0018($sp) +/* 007B4 809AE6D4 AFA70018 */ sw $a3, 0x0018($sp) /* 007B8 809AE6D8 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 007BC 809AE6DC 0C0294E1 */ jal func_800A5384 +/* 007BC 809AE6DC 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 007C0 809AE6E0 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 007C4 809AE6E4 8FA40018 */ lw $a0, 0x0018($sp) +/* 007C4 809AE6E4 8FA40018 */ lw $a0, 0x0018($sp) /* 007C8 809AE6E8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 007CC 809AE6EC 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 /* 007D0 809AE6F0 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 @@ -16,11 +16,11 @@ glabel func_809AE6C0 /* 007D8 809AE6F8 24A5EB14 */ addiu $a1, $a1, %lo(func_809AEB14) ## $a1 = 809AEB14 /* 007DC 809AE6FC AC8E01A8 */ sw $t6, 0x01A8($a0) ## 000001A8 /* 007E0 809AE700 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 007E4 809AE704 0C26B7C8 */ jal func_809ADF20 +/* 007E4 809AE704 0C26B7C8 */ jal func_809ADF20 /* 007E8 809AE708 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 007EC 809AE70C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007EC 809AE70C 8FBF0014 */ lw $ra, 0x0014($sp) /* 007F0 809AE710 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F4 809AE714 03E00008 */ jr $ra +/* 007F4 809AE714 03E00008 */ jr $ra /* 007F8 809AE718 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Draw.s index 324925d43b..18bc4e75a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Draw.s @@ -1,20 +1,20 @@ glabel EnAni_Draw /* 00AA4 809B0E14 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00AA8 809B0E18 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AAC 809B0E1C AFB00028 */ sw $s0, 0x0028($sp) -/* 00AB0 809B0E20 AFA5005C */ sw $a1, 0x005C($sp) +/* 00AA8 809B0E18 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AAC 809B0E1C AFB00028 */ sw $s0, 0x0028($sp) +/* 00AB0 809B0E20 AFA5005C */ sw $a1, 0x005C($sp) /* 00AB4 809B0E24 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00AB8 809B0E28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00ABC 809B0E2C 3C06809B */ lui $a2, %hi(D_809B0F90) ## $a2 = 809B0000 /* 00AC0 809B0E30 24C60F90 */ addiu $a2, $a2, %lo(D_809B0F90) ## $a2 = 809B0F90 /* 00AC4 809B0E34 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00AC8 809B0E38 240702CF */ addiu $a3, $zero, 0x02CF ## $a3 = 000002CF -/* 00ACC 809B0E3C 0C031AB1 */ jal func_800C6AC4 -/* 00AD0 809B0E40 AFA5004C */ sw $a1, 0x004C($sp) -/* 00AD4 809B0E44 8FAF005C */ lw $t7, 0x005C($sp) -/* 00AD8 809B0E48 0C0250F2 */ jal func_800943C8 +/* 00ACC 809B0E3C 0C031AB1 */ jal func_800C6AC4 +/* 00AD0 809B0E40 AFA5004C */ sw $a1, 0x004C($sp) +/* 00AD4 809B0E44 8FAF005C */ lw $t7, 0x005C($sp) +/* 00AD8 809B0E48 0C0250F2 */ jal func_800943C8 /* 00ADC 809B0E4C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00AE0 809B0E50 8FA5004C */ lw $a1, 0x004C($sp) +/* 00AE0 809B0E50 8FA5004C */ lw $a1, 0x004C($sp) /* 00AE4 809B0E54 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00AE8 809B0E58 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00AEC 809B0E5C 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,42 +26,42 @@ glabel EnAni_Draw /* 00B04 809B0E74 860802AC */ lh $t0, 0x02AC($s0) ## 000002AC /* 00B08 809B0E78 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00B0C 809B0E7C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00B10 809B0E80 00084880 */ sll $t1, $t0, 2 -/* 00B14 809B0E84 00892021 */ addu $a0, $a0, $t1 -/* 00B18 809B0E88 8C840F80 */ lw $a0, %lo(D_809B0F80)($a0) +/* 00B10 809B0E80 00084880 */ sll $t1, $t0, 2 +/* 00B14 809B0E84 00892021 */ addu $a0, $a0, $t1 +/* 00B18 809B0E88 8C840F80 */ lw $a0, %lo(D_809B0F80)($a0) /* 00B1C 809B0E8C 3C08809B */ lui $t0, %hi(func_809B0DD4) ## $t0 = 809B0000 /* 00B20 809B0E90 3C19809B */ lui $t9, %hi(func_809B0D90) ## $t9 = 809B0000 -/* 00B24 809B0E94 00045900 */ sll $t3, $a0, 4 -/* 00B28 809B0E98 000B6702 */ srl $t4, $t3, 28 -/* 00B2C 809B0E9C 000C6880 */ sll $t5, $t4, 2 -/* 00B30 809B0EA0 01CD7021 */ addu $t6, $t6, $t5 +/* 00B24 809B0E94 00045900 */ sll $t3, $a0, 4 +/* 00B28 809B0E98 000B6702 */ srl $t4, $t3, 28 +/* 00B2C 809B0E9C 000C6880 */ sll $t5, $t4, 2 +/* 00B30 809B0EA0 01CD7021 */ addu $t6, $t6, $t5 /* 00B34 809B0EA4 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 00B38 809B0EA8 00815024 */ and $t2, $a0, $at +/* 00B38 809B0EA8 00815024 */ and $t2, $a0, $at /* 00B3C 809B0EAC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00B40 809B0EB0 014E7821 */ addu $t7, $t2, $t6 -/* 00B44 809B0EB4 01E1C021 */ addu $t8, $t7, $at +/* 00B40 809B0EB0 014E7821 */ addu $t7, $t2, $t6 +/* 00B44 809B0EB4 01E1C021 */ addu $t8, $t7, $at /* 00B48 809B0EB8 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 00B4C 809B0EBC 9207019A */ lbu $a3, 0x019A($s0) ## 0000019A /* 00B50 809B0EC0 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 /* 00B54 809B0EC4 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 00B58 809B0EC8 27390D90 */ addiu $t9, $t9, %lo(func_809B0D90) ## $t9 = 809B0D90 /* 00B5C 809B0ECC 25080DD4 */ addiu $t0, $t0, %lo(func_809B0DD4) ## $t0 = 809B0DD4 -/* 00B60 809B0ED0 AFA80014 */ sw $t0, 0x0014($sp) -/* 00B64 809B0ED4 AFB90010 */ sw $t9, 0x0010($sp) -/* 00B68 809B0ED8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B6C 809B0EDC 0C0286B2 */ jal func_800A1AC8 -/* 00B70 809B0EE0 8FA4005C */ lw $a0, 0x005C($sp) -/* 00B74 809B0EE4 8FA9005C */ lw $t1, 0x005C($sp) +/* 00B60 809B0ED0 AFA80014 */ sw $t0, 0x0014($sp) +/* 00B64 809B0ED4 AFB90010 */ sw $t9, 0x0010($sp) +/* 00B68 809B0ED8 AFB00018 */ sw $s0, 0x0018($sp) +/* 00B6C 809B0EDC 0C0286B2 */ jal SkelAnime_DrawSV +/* 00B70 809B0EE0 8FA4005C */ lw $a0, 0x005C($sp) +/* 00B74 809B0EE4 8FA9005C */ lw $t1, 0x005C($sp) /* 00B78 809B0EE8 3C06809B */ lui $a2, %hi(D_809B0FA0) ## $a2 = 809B0000 /* 00B7C 809B0EEC 24C60FA0 */ addiu $a2, $a2, %lo(D_809B0FA0) ## $a2 = 809B0FA0 /* 00B80 809B0EF0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00B84 809B0EF4 240702E0 */ addiu $a3, $zero, 0x02E0 ## $a3 = 000002E0 -/* 00B88 809B0EF8 0C031AD5 */ jal func_800C6B54 +/* 00B88 809B0EF8 0C031AD5 */ jal func_800C6B54 /* 00B8C 809B0EFC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 00B90 809B0F00 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B94 809B0F04 8FB00028 */ lw $s0, 0x0028($sp) +/* 00B90 809B0F00 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B94 809B0F04 8FB00028 */ lw $s0, 0x0028($sp) /* 00B98 809B0F08 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00B9C 809B0F0C 03E00008 */ jr $ra +/* 00B9C 809B0F0C 03E00008 */ jr $ra /* 00BA0 809B0F10 00000000 */ nop /* 00BA4 809B0F14 00000000 */ nop /* 00BA8 809B0F18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Init.s index 9985e2433d..8034a09579 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Init.s @@ -1,19 +1,19 @@ glabel EnAni_Init /* 00008 809B0378 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0000C 809B037C AFA50044 */ sw $a1, 0x0044($sp) -/* 00010 809B0380 AFBF002C */ sw $ra, 0x002C($sp) -/* 00014 809B0384 AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 809B037C AFA50044 */ sw $a1, 0x0044($sp) +/* 00010 809B0380 AFBF002C */ sw $ra, 0x002C($sp) +/* 00014 809B0384 AFB00028 */ sw $s0, 0x0028($sp) /* 00018 809B0388 3C05809B */ lui $a1, %hi(D_809B0F6C) ## $a1 = 809B0000 /* 0001C 809B038C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00020 809B0390 0C01E037 */ jal Actor_ProcessInitChain - + /* 00024 809B0394 24A50F6C */ addiu $a1, $a1, %lo(D_809B0F6C) ## $a1 = 809B0F6C /* 00028 809B0398 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0002C 809B039C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00030 809B03A0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00034 809B03A4 3C05C52F */ lui $a1, 0xC52F ## $a1 = C52F0000 /* 00038 809B03A8 0C00AC78 */ jal ActorShape_Init - + /* 0003C 809B03AC 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 00040 809B03B0 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00044 809B03B4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -21,29 +21,29 @@ glabel EnAni_Init /* 0004C 809B03BC 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 00050 809B03C0 260F023C */ addiu $t7, $s0, 0x023C ## $t7 = 0000023C /* 00054 809B03C4 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 00058 809B03C8 AFB80018 */ sw $t8, 0x0018($sp) -/* 0005C 809B03CC AFAF0014 */ sw $t7, 0x0014($sp) -/* 00060 809B03D0 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00058 809B03C8 AFB80018 */ sw $t8, 0x0018($sp) +/* 0005C 809B03CC AFAF0014 */ sw $t7, 0x0014($sp) +/* 00060 809B03D0 AFAE0010 */ sw $t6, 0x0010($sp) /* 00064 809B03D4 24E776EC */ addiu $a3, $a3, 0x76EC ## $a3 = 060076EC /* 00068 809B03D8 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 0006C 809B03DC AFA50034 */ sw $a1, 0x0034($sp) -/* 00070 809B03E0 0C0291BE */ jal func_800A46F8 -/* 00074 809B03E4 8FA40044 */ lw $a0, 0x0044($sp) +/* 0006C 809B03DC AFA50034 */ sw $a1, 0x0034($sp) +/* 00070 809B03E0 0C0291BE */ jal SkelAnime_InitSV +/* 00074 809B03E4 8FA40044 */ lw $a0, 0x0044($sp) /* 00078 809B03E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0007C 809B03EC 24A576EC */ addiu $a1, $a1, 0x76EC ## $a1 = 060076EC -/* 00080 809B03F0 0C02947A */ jal func_800A51E8 -/* 00084 809B03F4 8FA40034 */ lw $a0, 0x0034($sp) +/* 00080 809B03F0 0C02947A */ jal func_800A51E8 +/* 00084 809B03F4 8FA40034 */ lw $a0, 0x0034($sp) /* 00088 809B03F8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0008C 809B03FC AFA50034 */ sw $a1, 0x0034($sp) +/* 0008C 809B03FC AFA50034 */ sw $a1, 0x0034($sp) /* 00090 809B0400 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00094 809B0404 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00094 809B0404 8FA40044 */ lw $a0, 0x0044($sp) /* 00098 809B0408 3C07809B */ lui $a3, %hi(D_809B0F40) ## $a3 = 809B0000 -/* 0009C 809B040C 8FA50034 */ lw $a1, 0x0034($sp) +/* 0009C 809B040C 8FA50034 */ lw $a1, 0x0034($sp) /* 000A0 809B0410 24E70F40 */ addiu $a3, $a3, %lo(D_809B0F40) ## $a3 = 809B0F40 -/* 000A4 809B0414 8FA40044 */ lw $a0, 0x0044($sp) +/* 000A4 809B0414 8FA40044 */ lw $a0, 0x0044($sp) /* 000A8 809B0418 0C01712B */ jal ActorCollider_InitCylinder - + /* 000AC 809B041C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B0 809B0420 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 000B4 809B0424 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE @@ -51,16 +51,16 @@ glabel EnAni_Init /* 000BC 809B042C 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 /* 000C0 809B0430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000C4 809B0434 3C05809B */ lui $a1, %hi(func_809B07F8) ## $a1 = 809B0000 -/* 000C8 809B0438 11000007 */ beq $t0, $zero, .L809B0458 +/* 000C8 809B0438 11000007 */ beq $t0, $zero, .L809B0458 /* 000CC 809B043C 00000000 */ nop /* 000D0 809B0440 3C05809B */ lui $a1, %hi(func_809B064C) ## $a1 = 809B0000 /* 000D4 809B0444 24A5064C */ addiu $a1, $a1, %lo(func_809B064C) ## $a1 = 809B064C -/* 000D8 809B0448 0C26C0DC */ jal func_809B0370 +/* 000D8 809B0448 0C26C0DC */ jal func_809B0370 /* 000DC 809B044C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000E0 809B0450 10000004 */ beq $zero, $zero, .L809B0464 +/* 000E0 809B0450 10000004 */ beq $zero, $zero, .L809B0464 /* 000E4 809B0454 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 .L809B0458: -/* 000E8 809B0458 0C26C0DC */ jal func_809B0370 +/* 000E8 809B0458 0C26C0DC */ jal func_809B0370 /* 000EC 809B045C 24A507F8 */ addiu $a1, $a1, %lo(func_809B07F8) ## $a1 = 000007F8 /* 000F0 809B0460 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 .L809B0464: @@ -69,10 +69,10 @@ glabel EnAni_Init /* 000FC 809B046C A60002A8 */ sh $zero, 0x02A8($s0) ## 000002A8 /* 00100 809B0470 E6000070 */ swc1 $f0, 0x0070($s0) ## 00000070 /* 00104 809B0474 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 00108 809B0478 8FBF002C */ lw $ra, 0x002C($sp) -/* 0010C 809B047C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00108 809B0478 8FBF002C */ lw $ra, 0x002C($sp) +/* 0010C 809B047C 8FB00028 */ lw $s0, 0x0028($sp) /* 00110 809B0480 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00114 809B0484 03E00008 */ jr $ra +/* 00114 809B0484 03E00008 */ jr $ra /* 00118 809B0488 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s index 08861fbed9..e9bef8871f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s @@ -1,39 +1,39 @@ glabel EnArrow_Destroy /* 0022C 809B3B4C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00230 809B3B50 AFBF001C */ sw $ra, 0x001C($sp) -/* 00234 809B3B54 AFB00018 */ sw $s0, 0x0018($sp) -/* 00238 809B3B58 AFA50024 */ sw $a1, 0x0024($sp) +/* 00230 809B3B50 AFBF001C */ sw $ra, 0x001C($sp) +/* 00234 809B3B54 AFB00018 */ sw $s0, 0x0018($sp) +/* 00238 809B3B58 AFA50024 */ sw $a1, 0x0024($sp) /* 0023C 809B3B5C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 00240 809B3B60 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00244 809B3B64 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00248 809B3B68 29C10006 */ slti $at, $t6, 0x0006 -/* 0024C 809B3B6C 50200004 */ beql $at, $zero, .L809B3B80 +/* 00248 809B3B68 29C10006 */ slti $at, $t6, 0x0006 +/* 0024C 809B3B6C 50200004 */ beql $at, $zero, .L809B3B80 /* 00250 809B3B70 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00254 809B3B74 0C009C27 */ jal func_8002709C +/* 00254 809B3B74 0C009C27 */ jal func_8002709C /* 00258 809B3B78 8E050228 */ lw $a1, 0x0228($s0) ## 00000228 /* 0025C 809B3B7C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L809B3B80: -/* 00260 809B3B80 0C0295BC */ jal func_800A56F0 -/* 00264 809B3B84 8FA50024 */ lw $a1, 0x0024($sp) -/* 00268 809B3B88 8FA40024 */ lw $a0, 0x0024($sp) -/* 0026C 809B3B8C 0C017418 */ jal func_8005D060 +/* 00260 809B3B80 0C0295BC */ jal SkelAnime_Free +/* 00264 809B3B84 8FA50024 */ lw $a1, 0x0024($sp) +/* 00268 809B3B88 8FA40024 */ lw $a0, 0x0024($sp) +/* 0026C 809B3B8C 0C017418 */ jal func_8005D060 /* 00270 809B3B90 26050190 */ addiu $a1, $s0, 0x0190 ## $a1 = 00000190 /* 00274 809B3B94 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C -/* 00278 809B3B98 5040000A */ beql $v0, $zero, .L809B3BC4 -/* 0027C 809B3B9C 8FBF001C */ lw $ra, 0x001C($sp) +/* 00278 809B3B98 5040000A */ beql $v0, $zero, .L809B3BC4 +/* 0027C 809B3B9C 8FBF001C */ lw $ra, 0x001C($sp) /* 00280 809B3BA0 8C4F0130 */ lw $t7, 0x0130($v0) ## 00000130 -/* 00284 809B3BA4 51E00007 */ beql $t7, $zero, .L809B3BC4 -/* 00288 809B3BA8 8FBF001C */ lw $ra, 0x001C($sp) +/* 00284 809B3BA4 51E00007 */ beql $t7, $zero, .L809B3BC4 +/* 00288 809B3BA8 8FBF001C */ lw $ra, 0x001C($sp) /* 0028C 809B3BAC 8C580004 */ lw $t8, 0x0004($v0) ## 00000004 /* 00290 809B3BB0 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 00294 809B3BB4 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 00298 809B3BB8 0301C824 */ and $t9, $t8, $at +/* 00298 809B3BB8 0301C824 */ and $t9, $t8, $at /* 0029C 809B3BBC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 002A0 809B3BC0 8FBF001C */ lw $ra, 0x001C($sp) +/* 002A0 809B3BC0 8FBF001C */ lw $ra, 0x001C($sp) .L809B3BC4: -/* 002A4 809B3BC4 8FB00018 */ lw $s0, 0x0018($sp) +/* 002A4 809B3BC4 8FB00018 */ lw $s0, 0x0018($sp) /* 002A8 809B3BC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 002AC 809B3BCC 03E00008 */ jr $ra +/* 002AC 809B3BCC 03E00008 */ jr $ra /* 002B0 809B3BD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s index cb95dbfb7f..e281af7ce5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s @@ -1,115 +1,115 @@ glabel EnArrow_Draw /* 01048 809B4968 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 0104C 809B496C AFBF002C */ sw $ra, 0x002C($sp) -/* 01050 809B4970 AFB00028 */ sw $s0, 0x0028($sp) -/* 01054 809B4974 AFA5007C */ sw $a1, 0x007C($sp) +/* 0104C 809B496C AFBF002C */ sw $ra, 0x002C($sp) +/* 01050 809B4970 AFB00028 */ sw $s0, 0x0028($sp) +/* 01054 809B4974 AFA5007C */ sw $a1, 0x007C($sp) /* 01058 809B4978 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 0105C 809B497C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01060 809B4980 29C10009 */ slti $at, $t6, 0x0009 -/* 01064 809B4984 5020001C */ beql $at, $zero, .L809B49F8 +/* 01060 809B4980 29C10009 */ slti $at, $t6, 0x0009 +/* 01064 809B4984 5020001C */ beql $at, $zero, .L809B49F8 /* 01068 809B4988 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0106C 809B498C 0C024F46 */ jal func_80093D18 +/* 0106C 809B498C 0C024F46 */ jal func_80093D18 /* 01070 809B4990 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 01074 809B4994 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 /* 01078 809B4998 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 /* 0107C 809B499C C60400EC */ lwc1 $f4, 0x00EC($s0) ## 000000EC -/* 01080 809B49A0 8FA4007C */ lw $a0, 0x007C($sp) +/* 01080 809B49A0 8FA4007C */ lw $a0, 0x007C($sp) /* 01084 809B49A4 87190492 */ lh $t9, 0x0492($t8) ## 80160492 /* 01088 809B49A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0108C 809B49AC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 01090 809B49B0 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 /* 01094 809B49B4 00000000 */ nop -/* 01098 809B49B8 46803220 */ cvt.s.w $f8, $f6 -/* 0109C 809B49BC 4608203C */ c.lt.s $f4, $f8 +/* 01098 809B49B8 46803220 */ cvt.s.w $f8, $f6 +/* 0109C 809B49BC 4608203C */ c.lt.s $f4, $f8 /* 010A0 809B49C0 00000000 */ nop -/* 010A4 809B49C4 45000003 */ bc1f .L809B49D4 +/* 010A4 809B49C4 45000003 */ bc1f .L809B49D4 /* 010A8 809B49C8 00000000 */ nop -/* 010AC 809B49CC 10000001 */ beq $zero, $zero, .L809B49D4 +/* 010AC 809B49CC 10000001 */ beq $zero, $zero, .L809B49D4 /* 010B0 809B49D0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L809B49D4: /* 010B4 809B49D4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 010B8 809B49D8 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 010BC 809B49DC AFA20018 */ sw $v0, 0x0018($sp) -/* 010C0 809B49E0 AFB00014 */ sw $s0, 0x0014($sp) -/* 010C4 809B49E4 0C0282D0 */ jal func_800A0B40 -/* 010C8 809B49E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 010CC 809B49EC 100000C9 */ beq $zero, $zero, .L809B4D14 +/* 010BC 809B49DC AFA20018 */ sw $v0, 0x0018($sp) +/* 010C0 809B49E0 AFB00014 */ sw $s0, 0x0014($sp) +/* 010C4 809B49E4 0C0282D0 */ jal SkelAnime_LodDraw +/* 010C8 809B49E8 AFA00010 */ sw $zero, 0x0010($sp) +/* 010CC 809B49EC 100000C9 */ beq $zero, $zero, .L809B4D14 /* 010D0 809B49F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 010D4 809B49F4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 .L809B49F8: /* 010D8 809B49F8 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 -/* 010DC 809B49FC 46105032 */ c.eq.s $f10, $f16 +/* 010DC 809B49FC 46105032 */ c.eq.s $f10, $f16 /* 010E0 809B4A00 00000000 */ nop -/* 010E4 809B4A04 450300C3 */ bc1tl .L809B4D14 +/* 010E4 809B4A04 450300C3 */ bc1tl .L809B4D14 /* 010E8 809B4A08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 010EC 809B4A0C 92040248 */ lbu $a0, 0x0248($s0) ## 00000248 -/* 010F0 809B4A10 00800821 */ addu $at, $a0, $zero -/* 010F4 809B4A14 00042080 */ sll $a0, $a0, 2 -/* 010F8 809B4A18 00812021 */ addu $a0, $a0, $at -/* 010FC 809B4A1C 000420C0 */ sll $a0, $a0, 3 -/* 01100 809B4A20 00812023 */ subu $a0, $a0, $at -/* 01104 809B4A24 00042100 */ sll $a0, $a0, 4 -/* 01108 809B4A28 00812021 */ addu $a0, $a0, $at -/* 0110C 809B4A2C 000420C0 */ sll $a0, $a0, 3 -/* 01110 809B4A30 00042400 */ sll $a0, $a0, 16 +/* 010F0 809B4A10 00800821 */ addu $at, $a0, $zero +/* 010F4 809B4A14 00042080 */ sll $a0, $a0, 2 +/* 010F8 809B4A18 00812021 */ addu $a0, $a0, $at +/* 010FC 809B4A1C 000420C0 */ sll $a0, $a0, 3 +/* 01100 809B4A20 00812023 */ subu $a0, $a0, $at +/* 01104 809B4A24 00042100 */ sll $a0, $a0, 4 +/* 01108 809B4A28 00812021 */ addu $a0, $a0, $at +/* 0110C 809B4A2C 000420C0 */ sll $a0, $a0, 3 +/* 01110 809B4A30 00042400 */ sll $a0, $a0, 16 /* 01114 809B4A34 0C01DE0D */ jal Math_Coss ## coss? -/* 01118 809B4A38 00042403 */ sra $a0, $a0, 16 +/* 01118 809B4A38 00042403 */ sra $a0, $a0, 16 /* 0111C 809B4A3C 3C0142FF */ lui $at, 0x42FF ## $at = 42FF0000 /* 01120 809B4A40 44811000 */ mtc1 $at, $f2 ## $f2 = 127.50 /* 01124 809B4A44 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 01128 809B4A48 3C06809B */ lui $a2, %hi(D_809B4EF0) ## $a2 = 809B0000 -/* 0112C 809B4A4C 46020482 */ mul.s $f18, $f0, $f2 +/* 0112C 809B4A4C 46020482 */ mul.s $f18, $f0, $f2 /* 01130 809B4A50 24C64EF0 */ addiu $a2, $a2, %lo(D_809B4EF0) ## $a2 = 809B4EF0 /* 01134 809B4A54 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFDC -/* 01138 809B4A58 46029180 */ add.s $f6, $f18, $f2 +/* 01138 809B4A58 46029180 */ add.s $f6, $f18, $f2 /* 0113C 809B4A5C 4449F800 */ cfc1 $t1, $31 /* 01140 809B4A60 44CAF800 */ ctc1 $t2, $31 /* 01144 809B4A64 00000000 */ nop -/* 01148 809B4A68 46003124 */ cvt.w.s $f4, $f6 +/* 01148 809B4A68 46003124 */ cvt.w.s $f4, $f6 /* 0114C 809B4A6C 444AF800 */ cfc1 $t2, $31 /* 01150 809B4A70 00000000 */ nop /* 01154 809B4A74 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 01158 809B4A78 11400012 */ beq $t2, $zero, .L809B4AC4 +/* 01158 809B4A78 11400012 */ beq $t2, $zero, .L809B4AC4 /* 0115C 809B4A7C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 01160 809B4A80 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 01164 809B4A84 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 01168 809B4A88 46043101 */ sub.s $f4, $f6, $f4 +/* 01168 809B4A88 46043101 */ sub.s $f4, $f6, $f4 /* 0116C 809B4A8C 44CAF800 */ ctc1 $t2, $31 /* 01170 809B4A90 00000000 */ nop -/* 01174 809B4A94 46002124 */ cvt.w.s $f4, $f4 +/* 01174 809B4A94 46002124 */ cvt.w.s $f4, $f4 /* 01178 809B4A98 444AF800 */ cfc1 $t2, $31 /* 0117C 809B4A9C 00000000 */ nop /* 01180 809B4AA0 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 01184 809B4AA4 15400005 */ bne $t2, $zero, .L809B4ABC +/* 01184 809B4AA4 15400005 */ bne $t2, $zero, .L809B4ABC /* 01188 809B4AA8 00000000 */ nop -/* 0118C 809B4AAC 440A2000 */ mfc1 $t2, $f4 +/* 0118C 809B4AAC 440A2000 */ mfc1 $t2, $f4 /* 01190 809B4AB0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01194 809B4AB4 10000007 */ beq $zero, $zero, .L809B4AD4 +/* 01194 809B4AB4 10000007 */ beq $zero, $zero, .L809B4AD4 /* 01198 809B4AB8 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 .L809B4ABC: -/* 0119C 809B4ABC 10000005 */ beq $zero, $zero, .L809B4AD4 +/* 0119C 809B4ABC 10000005 */ beq $zero, $zero, .L809B4AD4 /* 011A0 809B4AC0 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF .L809B4AC4: -/* 011A4 809B4AC4 440A2000 */ mfc1 $t2, $f4 +/* 011A4 809B4AC4 440A2000 */ mfc1 $t2, $f4 /* 011A8 809B4AC8 00000000 */ nop -/* 011AC 809B4ACC 0540FFFB */ bltz $t2, .L809B4ABC +/* 011AC 809B4ACC 0540FFFB */ bltz $t2, .L809B4ABC /* 011B0 809B4AD0 00000000 */ nop .L809B4AD4: -/* 011B4 809B4AD4 8FAB007C */ lw $t3, 0x007C($sp) -/* 011B8 809B4AD8 A3AA006F */ sb $t2, 0x006F($sp) +/* 011B4 809B4AD4 8FAB007C */ lw $t3, 0x007C($sp) +/* 011B8 809B4AD8 A3AA006F */ sb $t2, 0x006F($sp) /* 011BC 809B4ADC 44C9F800 */ ctc1 $t1, $31 /* 011C0 809B4AE0 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 011C4 809B4AE4 24070542 */ addiu $a3, $zero, 0x0542 ## $a3 = 00000542 -/* 011C8 809B4AE8 0C031AB1 */ jal func_800C6AC4 -/* 011CC 809B4AEC AFA50064 */ sw $a1, 0x0064($sp) -/* 011D0 809B4AF0 8FAC007C */ lw $t4, 0x007C($sp) -/* 011D4 809B4AF4 0C024F05 */ jal func_80093C14 +/* 011C8 809B4AE8 0C031AB1 */ jal func_800C6AC4 +/* 011CC 809B4AEC AFA50064 */ sw $a1, 0x0064($sp) +/* 011D0 809B4AF0 8FAC007C */ lw $t4, 0x007C($sp) +/* 011D4 809B4AF4 0C024F05 */ jal func_80093C14 /* 011D8 809B4AF8 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 011DC 809B4AFC 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 011E0 809B4B00 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 011E4 809B4B04 8FA80064 */ lw $t0, 0x0064($sp) -/* 011E8 809B4B08 15A10016 */ bne $t5, $at, .L809B4B64 +/* 011E4 809B4B04 8FA80064 */ lw $t0, 0x0064($sp) +/* 011E8 809B4B08 15A10016 */ bne $t5, $at, .L809B4B64 /* 011EC 809B4B0C 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 /* 011F0 809B4B10 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 /* 011F4 809B4B14 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -124,14 +124,14 @@ glabel EnArrow_Draw /* 01218 809B4B38 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 0121C 809B4B3C AD1902D0 */ sw $t9, 0x02D0($t0) ## 000002D0 /* 01220 809B4B40 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 01224 809B4B44 93AB006F */ lbu $t3, 0x006F($sp) +/* 01224 809B4B44 93AB006F */ lbu $t3, 0x006F($sp) /* 01228 809B4B48 3421FF00 */ ori $at, $at, 0xFF00 ## $at = 00FFFF00 /* 0122C 809B4B4C 01616025 */ or $t4, $t3, $at ## $t4 = 00FFFF00 /* 01230 809B4B50 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 01234 809B4B54 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 01238 809B4B58 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 0123C 809B4B5C 10000014 */ beq $zero, $zero, .L809B4BB0 -/* 01240 809B4B60 E7A80068 */ swc1 $f8, 0x0068($sp) +/* 0123C 809B4B5C 10000014 */ beq $zero, $zero, .L809B4BB0 +/* 01240 809B4B60 E7A80068 */ swc1 $f8, 0x0068($sp) .L809B4B64: /* 01244 809B4B64 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 /* 01248 809B4B68 3C0F0C00 */ lui $t7, 0x0C00 ## $t7 = 0C000000 @@ -146,62 +146,62 @@ glabel EnArrow_Draw /* 0126C 809B4B8C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01270 809B4B90 AD1802D0 */ sw $t8, 0x02D0($t0) ## 000002D0 /* 01274 809B4B94 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 01278 809B4B98 93AA006F */ lbu $t2, 0x006F($sp) +/* 01278 809B4B98 93AA006F */ lbu $t2, 0x006F($sp) /* 0127C 809B4B9C 01415825 */ or $t3, $t2, $at ## $t3 = FAFA0000 /* 01280 809B4BA0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 01284 809B4BA4 44815000 */ mtc1 $at, $f10 ## $f10 = 150.00 /* 01288 809B4BA8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 0128C 809B4BAC E7AA0068 */ swc1 $f10, 0x0068($sp) +/* 0128C 809B4BAC E7AA0068 */ swc1 $f10, 0x0068($sp) .L809B4BB0: -/* 01290 809B4BB0 0C034213 */ jal Matrix_Push -/* 01294 809B4BB4 AFA80064 */ sw $t0, 0x0064($sp) -/* 01298 809B4BB8 8FA4007C */ lw $a0, 0x007C($sp) +/* 01290 809B4BB0 0C034213 */ jal Matrix_Push +/* 01294 809B4BB4 AFA80064 */ sw $t0, 0x0064($sp) +/* 01298 809B4BB8 8FA4007C */ lw $a0, 0x007C($sp) /* 0129C 809B4BBC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 012A0 809B4BC0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 012A4 809B4BC4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 012A8 809B4BC8 0C03424C */ jal Matrix_Mult -/* 012AC 809B4BCC 00812021 */ addu $a0, $a0, $at +/* 012A8 809B4BC8 0C03424C */ jal Matrix_Mult +/* 012AC 809B4BCC 00812021 */ addu $a0, $a0, $at /* 012B0 809B4BD0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 012B4 809B4BD4 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 -/* 012B8 809B4BD8 8FAC007C */ lw $t4, 0x007C($sp) +/* 012B8 809B4BD8 8FAC007C */ lw $t4, 0x007C($sp) /* 012BC 809B4BDC 3C0D0001 */ lui $t5, 0x0001 ## $t5 = 00010000 -/* 012C0 809B4BE0 46100032 */ c.eq.s $f0, $f16 -/* 012C4 809B4BE4 8FA80064 */ lw $t0, 0x0064($sp) +/* 012C0 809B4BE0 46100032 */ c.eq.s $f0, $f16 +/* 012C4 809B4BE4 8FA80064 */ lw $t0, 0x0064($sp) /* 012C8 809B4BE8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 012CC 809B4BEC 01AC6821 */ addu $t5, $t5, $t4 -/* 012D0 809B4BF0 45020004 */ bc1fl .L809B4C04 +/* 012CC 809B4BEC 01AC6821 */ addu $t5, $t5, $t4 +/* 012D0 809B4BF0 45020004 */ bc1fl .L809B4C04 /* 012D4 809B4BF4 8DAD1DE4 */ lw $t5, 0x1DE4($t5) ## 00011DE4 -/* 012D8 809B4BF8 10000013 */ beq $zero, $zero, .L809B4C48 -/* 012DC 809B4BFC 46000306 */ mov.s $f12, $f0 +/* 012D8 809B4BF8 10000013 */ beq $zero, $zero, .L809B4C48 +/* 012DC 809B4BFC 46000306 */ mov.s $f12, $f0 /* 012E0 809B4C00 8DAD1DE4 */ lw $t5, 0x1DE4($t5) ## 00011DE4 .L809B4C04: /* 012E4 809B4C04 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 012E8 809B4C08 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 012EC 809B4C0C 000E7940 */ sll $t7, $t6, 5 -/* 012F0 809B4C10 01EE7823 */ subu $t7, $t7, $t6 -/* 012F4 809B4C14 000F7880 */ sll $t7, $t7, 2 -/* 012F8 809B4C18 01EE7821 */ addu $t7, $t7, $t6 -/* 012FC 809B4C1C 000F7940 */ sll $t7, $t7, 5 +/* 012EC 809B4C0C 000E7940 */ sll $t7, $t6, 5 +/* 012F0 809B4C10 01EE7823 */ subu $t7, $t7, $t6 +/* 012F4 809B4C14 000F7880 */ sll $t7, $t7, 2 +/* 012F8 809B4C18 01EE7821 */ addu $t7, $t7, $t6 +/* 012FC 809B4C1C 000F7940 */ sll $t7, $t7, 5 /* 01300 809B4C20 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 01304 809B4C24 05E10004 */ bgez $t7, .L809B4C38 -/* 01308 809B4C28 468091A0 */ cvt.s.w $f6, $f18 +/* 01304 809B4C24 05E10004 */ bgez $t7, .L809B4C38 +/* 01308 809B4C28 468091A0 */ cvt.s.w $f6, $f18 /* 0130C 809B4C2C 44812000 */ mtc1 $at, $f4 ## $f4 = 4294967296.00 /* 01310 809B4C30 00000000 */ nop -/* 01314 809B4C34 46043180 */ add.s $f6, $f6, $f4 +/* 01314 809B4C34 46043180 */ add.s $f6, $f6, $f4 .L809B4C38: /* 01318 809B4C38 3C01809B */ lui $at, %hi(D_809B4F5C) ## $at = 809B0000 -/* 0131C 809B4C3C C4284F5C */ lwc1 $f8, %lo(D_809B4F5C)($at) -/* 01320 809B4C40 46083302 */ mul.s $f12, $f6, $f8 +/* 0131C 809B4C3C C4284F5C */ lwc1 $f8, %lo(D_809B4F5C)($at) +/* 01320 809B4C40 46083302 */ mul.s $f12, $f6, $f8 /* 01324 809B4C44 00000000 */ nop .L809B4C48: -/* 01328 809B4C48 0C0343B5 */ jal Matrix_RotateZ -/* 0132C 809B4C4C AFA80064 */ sw $t0, 0x0064($sp) -/* 01330 809B4C50 C7AC0068 */ lwc1 $f12, 0x0068($sp) +/* 01328 809B4C48 0C0343B5 */ jal Matrix_RotateZ +/* 0132C 809B4C4C AFA80064 */ sw $t0, 0x0064($sp) +/* 01330 809B4C50 C7AC0068 */ lwc1 $f12, 0x0068($sp) /* 01334 809B4C54 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01338 809B4C58 44066000 */ mfc1 $a2, $f12 -/* 0133C 809B4C5C 0C0342A3 */ jal Matrix_Scale -/* 01340 809B4C60 46006386 */ mov.s $f14, $f12 -/* 01344 809B4C64 8FA80064 */ lw $t0, 0x0064($sp) +/* 01338 809B4C58 44066000 */ mfc1 $a2, $f12 +/* 0133C 809B4C5C 0C0342A3 */ jal Matrix_Scale +/* 01340 809B4C60 46006386 */ mov.s $f14, $f12 +/* 01344 809B4C64 8FA80064 */ lw $t0, 0x0064($sp) /* 01348 809B4C68 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 /* 0134C 809B4C6C 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 /* 01350 809B4C70 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 @@ -210,14 +210,14 @@ glabel EnArrow_Draw /* 0135C 809B4C7C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01360 809B4C80 AD1802D0 */ sw $t8, 0x02D0($t0) ## 000002D0 /* 01364 809B4C84 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 01368 809B4C88 8FA9007C */ lw $t1, 0x007C($sp) +/* 01368 809B4C88 8FA9007C */ lw $t1, 0x007C($sp) /* 0136C 809B4C8C 2406055E */ addiu $a2, $zero, 0x055E ## $a2 = 0000055E /* 01370 809B4C90 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 01374 809B4C94 AFA80064 */ sw $t0, 0x0064($sp) -/* 01378 809B4C98 0C0346A2 */ jal Matrix_NewMtx -/* 0137C 809B4C9C AFA20040 */ sw $v0, 0x0040($sp) -/* 01380 809B4CA0 8FA30040 */ lw $v1, 0x0040($sp) -/* 01384 809B4CA4 8FA80064 */ lw $t0, 0x0064($sp) +/* 01374 809B4C94 AFA80064 */ sw $t0, 0x0064($sp) +/* 01378 809B4C98 0C0346A2 */ jal Matrix_NewMtx +/* 0137C 809B4C9C AFA20040 */ sw $v0, 0x0040($sp) +/* 01380 809B4CA0 8FA30040 */ lw $v1, 0x0040($sp) +/* 01384 809B4CA4 8FA80064 */ lw $t0, 0x0064($sp) /* 01388 809B4CA8 3C0C0403 */ lui $t4, 0x0403 ## $t4 = 04030000 /* 0138C 809B4CAC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01390 809B4CB0 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 @@ -226,31 +226,31 @@ glabel EnArrow_Draw /* 0139C 809B4CBC 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 013A0 809B4CC0 AD0A02D0 */ sw $t2, 0x02D0($t0) ## 000002D0 /* 013A4 809B4CC4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 013A8 809B4CC8 0C034221 */ jal Matrix_Pull +/* 013A8 809B4CC8 0C034221 */ jal Matrix_Pull /* 013AC 809B4CCC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 013B0 809B4CD0 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 /* 013B4 809B4CD4 3C01809B */ lui $at, %hi(D_809B4F60) ## $at = 809B0000 -/* 013B8 809B4CD8 C4324F60 */ lwc1 $f18, %lo(D_809B4F60)($at) +/* 013B8 809B4CD8 C4324F60 */ lwc1 $f18, %lo(D_809B4F60)($at) /* 013BC 809B4CDC 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 /* 013C0 809B4CE0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 013C4 809B4CE4 46805420 */ cvt.s.w $f16, $f10 -/* 013C8 809B4CE8 46128302 */ mul.s $f12, $f16, $f18 -/* 013CC 809B4CEC 0C034348 */ jal Matrix_RotateY +/* 013C4 809B4CE4 46805420 */ cvt.s.w $f16, $f10 +/* 013C8 809B4CE8 46128302 */ mul.s $f12, $f16, $f18 +/* 013CC 809B4CEC 0C034348 */ jal Matrix_RotateY /* 013D0 809B4CF0 00000000 */ nop -/* 013D4 809B4CF4 8FAE007C */ lw $t6, 0x007C($sp) +/* 013D4 809B4CF4 8FAE007C */ lw $t6, 0x007C($sp) /* 013D8 809B4CF8 3C06809B */ lui $a2, %hi(D_809B4F10) ## $a2 = 809B0000 /* 013DC 809B4CFC 24C64F10 */ addiu $a2, $a2, %lo(D_809B4F10) ## $a2 = 809B4F10 /* 013E0 809B4D00 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFDC /* 013E4 809B4D04 24070565 */ addiu $a3, $zero, 0x0565 ## $a3 = 00000565 -/* 013E8 809B4D08 0C031AD5 */ jal func_800C6B54 +/* 013E8 809B4D08 0C031AD5 */ jal func_800C6B54 /* 013EC 809B4D0C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 013F0 809B4D10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L809B4D14: -/* 013F4 809B4D14 0C26D200 */ jal func_809B4800 -/* 013F8 809B4D18 8FA5007C */ lw $a1, 0x007C($sp) -/* 013FC 809B4D1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01400 809B4D20 8FB00028 */ lw $s0, 0x0028($sp) +/* 013F4 809B4D14 0C26D200 */ jal func_809B4800 +/* 013F8 809B4D18 8FA5007C */ lw $a1, 0x007C($sp) +/* 013FC 809B4D1C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01400 809B4D20 8FB00028 */ lw $s0, 0x0028($sp) /* 01404 809B4D24 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 01408 809B4D28 03E00008 */ jr $ra +/* 01408 809B4D28 03E00008 */ jr $ra /* 0140C 809B4D2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Draw.s index 8c647b55cb..66144c5c94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Draw.s @@ -1,24 +1,24 @@ glabel EnAttackNiw_Draw /* 00FF0 809B60F0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00FF4 809B60F4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00FF8 809B60F8 AFA40028 */ sw $a0, 0x0028($sp) -/* 00FFC 809B60FC AFA5002C */ sw $a1, 0x002C($sp) -/* 01000 809B6100 0C024F46 */ jal func_80093D18 +/* 00FF4 809B60F4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00FF8 809B60F8 AFA40028 */ sw $a0, 0x0028($sp) +/* 00FFC 809B60FC AFA5002C */ sw $a1, 0x002C($sp) +/* 01000 809B6100 0C024F46 */ jal func_80093D18 /* 01004 809B6104 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01008 809B6108 8FA20028 */ lw $v0, 0x0028($sp) +/* 01008 809B6108 8FA20028 */ lw $v0, 0x0028($sp) /* 0100C 809B610C 3C0F809B */ lui $t7, %hi(func_809B5F98) ## $t7 = 809B0000 /* 01010 809B6110 25EF5F98 */ addiu $t7, $t7, %lo(func_809B5F98) ## $t7 = 809B5F98 /* 01014 809B6114 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 /* 01018 809B6118 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C /* 0101C 809B611C 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E -/* 01020 809B6120 AFA00014 */ sw $zero, 0x0014($sp) -/* 01024 809B6124 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01028 809B6128 8FA4002C */ lw $a0, 0x002C($sp) -/* 0102C 809B612C 0C0286B2 */ jal func_800A1AC8 -/* 01030 809B6130 AFA20018 */ sw $v0, 0x0018($sp) -/* 01034 809B6134 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01020 809B6120 AFA00014 */ sw $zero, 0x0014($sp) +/* 01024 809B6124 AFAF0010 */ sw $t7, 0x0010($sp) +/* 01028 809B6128 8FA4002C */ lw $a0, 0x002C($sp) +/* 0102C 809B612C 0C0286B2 */ jal SkelAnime_DrawSV +/* 01030 809B6130 AFA20018 */ sw $v0, 0x0018($sp) +/* 01034 809B6134 8FBF0024 */ lw $ra, 0x0024($sp) /* 01038 809B6138 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0103C 809B613C 03E00008 */ jr $ra +/* 0103C 809B613C 03E00008 */ jr $ra /* 01040 809B6140 00000000 */ nop /* 01044 809B6144 00000000 */ nop /* 01048 809B6148 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s index fa64187dcc..3bb2eae2ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s @@ -1,89 +1,89 @@ glabel EnAttackNiw_Init /* 00000 809B5100 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 809B5104 AFA50034 */ sw $a1, 0x0034($sp) -/* 00008 809B5108 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 809B510C AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 809B5104 AFA50034 */ sw $a1, 0x0034($sp) +/* 00008 809B5108 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 809B510C AFB00028 */ sw $s0, 0x0028($sp) /* 00010 809B5110 3C05809B */ lui $a1, %hi(D_809B6170) ## $a1 = 809B0000 /* 00014 809B5114 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 809B5118 0C01E037 */ jal Actor_ProcessInitChain - + /* 0001C 809B511C 24A56170 */ addiu $a1, $a1, %lo(D_809B6170) ## $a1 = 809B6170 /* 00020 809B5120 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00024 809B5124 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00028 809B5128 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0002C 809B512C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00030 809B5130 0C00AC78 */ jal ActorShape_Init - + /* 00034 809B5134 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 /* 00038 809B5138 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0003C 809B513C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00040 809B5140 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 00044 809B5144 260F01F0 */ addiu $t7, $s0, 0x01F0 ## $t7 = 000001F0 /* 00048 809B5148 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 0004C 809B514C AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 809B5150 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 809B5154 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0004C 809B514C AFB80018 */ sw $t8, 0x0018($sp) +/* 00050 809B5150 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00054 809B5154 AFAE0010 */ sw $t6, 0x0010($sp) /* 00058 809B5158 24E700E8 */ addiu $a3, $a3, 0x00E8 ## $a3 = 060000E8 /* 0005C 809B515C 24C62530 */ addiu $a2, $a2, 0x2530 ## $a2 = 06002530 -/* 00060 809B5160 8FA40034 */ lw $a0, 0x0034($sp) -/* 00064 809B5164 0C0291BE */ jal func_800A46F8 +/* 00060 809B5160 8FA40034 */ lw $a0, 0x0034($sp) +/* 00064 809B5164 0C0291BE */ jal SkelAnime_InitSV /* 00068 809B5168 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0006C 809B516C 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 00070 809B5170 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00074 809B5174 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00078 809B5178 07210002 */ bgez $t9, .L809B5184 +/* 00078 809B5178 07210002 */ bgez $t9, .L809B5184 /* 0007C 809B517C 00000000 */ nop /* 00080 809B5180 A600001C */ sh $zero, 0x001C($s0) ## 0000001C .L809B5184: /* 00084 809B5184 0C00B58B */ jal Actor_SetScale - + /* 00088 809B5188 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 0008C 809B518C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00090 809B5190 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00094 809B5194 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 00098 809B5198 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0009C 809B519C E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 000A0 809B51A0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 000A4 809B51A4 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 000A8 809B51A8 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 000AC 809B51AC E6000298 */ swc1 $f0, 0x0298($s0) ## 00000298 /* 000B0 809B51B0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 000B4 809B51B4 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 000B8 809B51B8 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 000BC 809B51BC E600029C */ swc1 $f0, 0x029C($s0) ## 0000029C /* 000C0 809B51C0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000C4 809B51C4 E60002A0 */ swc1 $f0, 0x02A0($s0) ## 000002A0 /* 000C8 809B51C8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000CC 809B51CC 0C00B58B */ jal Actor_SetScale - + /* 000D0 809B51D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000D4 809B51D4 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 /* 000D8 809B51D8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 000DC 809B51DC 01014824 */ and $t1, $t0, $at +/* 000DC 809B51DC 01014824 */ and $t1, $t0, $at /* 000E0 809B51E0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 000E4 809B51E4 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 /* 000E8 809B51E8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 000EC 809B51EC 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 000F0 809B51F0 3C01809B */ lui $at, %hi(D_809B6190) ## $at = 809B0000 -/* 000F4 809B51F4 C42A6190 */ lwc1 $f10, %lo(D_809B6190)($at) -/* 000F8 809B51F8 46060201 */ sub.s $f8, $f0, $f6 +/* 000F4 809B51F4 C42A6190 */ lwc1 $f10, %lo(D_809B6190)($at) +/* 000F8 809B51F8 46060201 */ sub.s $f8, $f0, $f6 /* 000FC 809B51FC 3C0B809B */ lui $t3, %hi(func_809B5670) ## $t3 = 809B0000 /* 00100 809B5200 256B5670 */ addiu $t3, $t3, %lo(func_809B5670) ## $t3 = 809B5670 /* 00104 809B5204 AE0B0250 */ sw $t3, 0x0250($s0) ## 00000250 -/* 00108 809B5208 460A4402 */ mul.s $f16, $f8, $f10 -/* 0010C 809B520C 4600848D */ trunc.w.s $f18, $f16 -/* 00110 809B5210 44029000 */ mfc1 $v0, $f18 +/* 00108 809B5208 460A4402 */ mul.s $f16, $f8, $f10 +/* 0010C 809B520C 4600848D */ trunc.w.s $f18, $f16 +/* 00110 809B5210 44029000 */ mfc1 $v0, $f18 /* 00114 809B5214 00000000 */ nop /* 00118 809B5218 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 /* 0011C 809B521C A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00120 809B5220 8FBF002C */ lw $ra, 0x002C($sp) -/* 00124 809B5224 8FB00028 */ lw $s0, 0x0028($sp) +/* 00120 809B5220 8FBF002C */ lw $ra, 0x002C($sp) +/* 00124 809B5224 8FB00028 */ lw $s0, 0x0028($sp) /* 00128 809B5228 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0012C 809B522C 03E00008 */ jr $ra +/* 0012C 809B522C 03E00008 */ jr $ra /* 00130 809B5230 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s index 361feb4e7f..550ef3a2f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s @@ -1,11 +1,11 @@ glabel func_809B8E34 /* 00B54 809B8E34 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B58 809B8E38 AFB00018 */ sw $s0, 0x0018($sp) +/* 00B58 809B8E38 AFB00018 */ sw $s0, 0x0018($sp) /* 00B5C 809B8E3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B60 809B8E40 AFBF001C */ sw $ra, 0x001C($sp) +/* 00B60 809B8E40 AFBF001C */ sw $ra, 0x001C($sp) /* 00B64 809B8E44 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B68 809B8E48 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 -/* 00B6C 809B8E4C 0C0294BE */ jal func_800A52F8 +/* 00B6C 809B8E4C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00B70 809B8E50 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00B74 809B8E54 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -13,8 +13,8 @@ glabel func_809B8E34 /* 00B7C 809B8E5C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 00B80 809B8E60 44811000 */ mtc1 $at, $f2 ## $f2 = 0.50 /* 00B84 809B8E64 00000000 */ nop -/* 00B88 809B8E68 46020102 */ mul.s $f4, $f0, $f2 -/* 00B8C 809B8E6C 46022180 */ add.s $f6, $f4, $f2 +/* 00B88 809B8E68 46020102 */ mul.s $f4, $f0, $f2 +/* 00B8C 809B8E6C 46022180 */ add.s $f6, $f4, $f2 /* 00B90 809B8E70 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00B94 809B8E74 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 @@ -22,10 +22,10 @@ glabel func_809B8E34 /* 00B9C 809B8E7C 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 00BA0 809B8E80 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00BA4 809B8E84 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 -/* 00BA8 809B8E88 46080282 */ mul.s $f10, $f0, $f8 -/* 00BAC 809B8E8C 46105480 */ add.s $f18, $f10, $f16 -/* 00BB0 809B8E90 4600910D */ trunc.w.s $f4, $f18 -/* 00BB4 809B8E94 440F2000 */ mfc1 $t7, $f4 +/* 00BA8 809B8E88 46080282 */ mul.s $f10, $f0, $f8 +/* 00BAC 809B8E8C 46105480 */ add.s $f18, $f10, $f16 +/* 00BB0 809B8E90 4600910D */ trunc.w.s $f4, $f18 +/* 00BB4 809B8E94 440F2000 */ mfc1 $t7, $f4 /* 00BB8 809B8E98 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00BBC 809B8E9C AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 @@ -33,22 +33,22 @@ glabel func_809B8E34 /* 00BC4 809B8EA4 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 00BC8 809B8EA8 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 00BCC 809B8EAC 44815000 */ mtc1 $at, $f10 ## $f10 = 180.00 -/* 00BD0 809B8EB0 46060202 */ mul.s $f8, $f0, $f6 +/* 00BD0 809B8EB0 46060202 */ mul.s $f8, $f0, $f6 /* 00BD4 809B8EB4 24080006 */ addiu $t0, $zero, 0x0006 ## $t0 = 00000006 /* 00BD8 809B8EB8 3C05809C */ lui $a1, %hi(func_809B8EF4) ## $a1 = 809C0000 /* 00BDC 809B8EBC AE000324 */ sw $zero, 0x0324($s0) ## 00000324 /* 00BE0 809B8EC0 AE080250 */ sw $t0, 0x0250($s0) ## 00000250 /* 00BE4 809B8EC4 24A58EF4 */ addiu $a1, $a1, %lo(func_809B8EF4) ## $a1 = 809B8EF4 /* 00BE8 809B8EC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BEC 809B8ECC 460A4400 */ add.s $f16, $f8, $f10 -/* 00BF0 809B8ED0 4600848D */ trunc.w.s $f18, $f16 -/* 00BF4 809B8ED4 44199000 */ mfc1 $t9, $f18 -/* 00BF8 809B8ED8 0C26E0B8 */ jal func_809B82E0 +/* 00BEC 809B8ECC 460A4400 */ add.s $f16, $f8, $f10 +/* 00BF0 809B8ED0 4600848D */ trunc.w.s $f18, $f16 +/* 00BF4 809B8ED4 44199000 */ mfc1 $t9, $f18 +/* 00BF8 809B8ED8 0C26E0B8 */ jal func_809B82E0 /* 00BFC 809B8EDC AE190264 */ sw $t9, 0x0264($s0) ## 00000264 -/* 00C00 809B8EE0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C04 809B8EE4 8FB00018 */ lw $s0, 0x0018($sp) +/* 00C00 809B8EE0 8FBF001C */ lw $ra, 0x001C($sp) +/* 00C04 809B8EE4 8FB00018 */ lw $s0, 0x0018($sp) /* 00C08 809B8EE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C0C 809B8EEC 03E00008 */ jr $ra +/* 00C0C 809B8EEC 03E00008 */ jr $ra /* 00C10 809B8EF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s index 2f455327ed..ba6a5bc6a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s @@ -1,66 +1,66 @@ glabel func_809B8EF4 /* 00C14 809B8EF4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00C18 809B8EF8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00C1C 809B8EFC AFB00020 */ sw $s0, 0x0020($sp) +/* 00C1C 809B8EFC AFB00020 */ sw $s0, 0x0020($sp) /* 00C20 809B8F00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C24 809B8F04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00C28 809B8F08 AFA50054 */ sw $a1, 0x0054($sp) +/* 00C24 809B8F04 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00C28 809B8F08 AFA50054 */ sw $a1, 0x0054($sp) /* 00C2C 809B8F0C 3C0542A0 */ lui $a1, 0x42A0 ## $a1 = 42A00000 /* 00C30 809B8F10 24840288 */ addiu $a0, $a0, 0x0288 ## $a0 = 00000288 /* 00C34 809B8F14 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00C38 809B8F18 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 00C3C 809B8F1C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00C40 809B8F20 E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 00C40 809B8F20 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00C44 809B8F24 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00C48 809B8F28 2604028C */ addiu $a0, $s0, 0x028C ## $a0 = 0000028C /* 00C4C 809B8F2C 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 00C50 809B8F30 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00C54 809B8F34 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 00C58 809B8F38 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00C5C 809B8F3C E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 00C5C 809B8F3C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00C60 809B8F40 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 /* 00C64 809B8F44 44814000 */ mtc1 $at, $f8 ## $f8 = -32000.00 /* 00C68 809B8F48 C6020080 */ lwc1 $f2, 0x0080($s0) ## 00000080 -/* 00C6C 809B8F4C 4602403C */ c.lt.s $f8, $f2 +/* 00C6C 809B8F4C 4602403C */ c.lt.s $f8, $f2 /* 00C70 809B8F50 00000000 */ nop -/* 00C74 809B8F54 4500000D */ bc1f .L809B8F8C +/* 00C74 809B8F54 4500000D */ bc1f .L809B8F8C /* 00C78 809B8F58 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 00C7C 809B8F5C 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 00C80 809B8F60 C6120280 */ lwc1 $f18, 0x0280($s0) ## 00000280 /* 00C84 809B8F64 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00C88 809B8F68 460A1400 */ add.s $f16, $f2, $f10 +/* 00C88 809B8F68 460A1400 */ add.s $f16, $f2, $f10 /* 00C8C 809B8F6C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 00C90 809B8F70 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00C94 809B8F74 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 00C98 809B8F78 46128100 */ add.s $f4, $f16, $f18 -/* 00C9C 809B8F7C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00CA0 809B8F80 44052000 */ mfc1 $a1, $f4 +/* 00C98 809B8F78 46128100 */ add.s $f4, $f16, $f18 +/* 00C9C 809B8F7C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00CA0 809B8F80 44052000 */ mfc1 $a1, $f4 /* 00CA4 809B8F84 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 00CA8 809B8F88 00000000 */ nop .L809B8F8C: /* 00CAC 809B8F8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00CB0 809B8F90 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00CB4 809B8F94 AFA40034 */ sw $a0, 0x0034($sp) -/* 00CB8 809B8F98 0C0329DD */ jal func_800CA774 + +/* 00CB4 809B8F94 AFA40034 */ sw $a0, 0x0034($sp) +/* 00CB8 809B8F98 0C0329DD */ jal func_800CA774 /* 00CBC 809B8F9C C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 00CC0 809B8FA0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00CC4 809B8FA4 00000000 */ nop -/* 00CC8 809B8FA8 46080032 */ c.eq.s $f0, $f8 +/* 00CC8 809B8FA8 46080032 */ c.eq.s $f0, $f8 /* 00CCC 809B8FAC 00000000 */ nop -/* 00CD0 809B8FB0 45000010 */ bc1f .L809B8FF4 +/* 00CD0 809B8FB0 45000010 */ bc1f .L809B8FF4 /* 00CD4 809B8FB4 00000000 */ nop /* 00CD8 809B8FB8 860E026A */ lh $t6, 0x026A($s0) ## 0000026A -/* 00CDC 809B8FBC 11C00006 */ beq $t6, $zero, .L809B8FD8 +/* 00CDC 809B8FBC 11C00006 */ beq $t6, $zero, .L809B8FD8 /* 00CE0 809B8FC0 00000000 */ nop /* 00CE4 809B8FC4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00CE8 809B8FC8 00000000 */ nop -/* 00CEC 809B8FCC 46000280 */ add.s $f10, $f0, $f0 -/* 00CF0 809B8FD0 10000008 */ beq $zero, $zero, .L809B8FF4 +/* 00CEC 809B8FCC 46000280 */ add.s $f10, $f0, $f0 +/* 00CF0 809B8FD0 10000008 */ beq $zero, $zero, .L809B8FF4 /* 00CF4 809B8FD4 E60A0284 */ swc1 $f10, 0x0284($s0) ## 00000284 .L809B8FD8: /* 00CF8 809B8FD8 0C03F66B */ jal Math_Rand_ZeroOne @@ -69,101 +69,101 @@ glabel func_809B8EF4 /* 00D00 809B8FE0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00D04 809B8FE4 44818000 */ mtc1 $at, $f16 ## $f16 = 4.00 /* 00D08 809B8FE8 00000000 */ nop -/* 00D0C 809B8FEC 46100482 */ mul.s $f18, $f0, $f16 +/* 00D0C 809B8FEC 46100482 */ mul.s $f18, $f0, $f16 /* 00D10 809B8FF0 E6120284 */ swc1 $f18, 0x0284($s0) ## 00000284 .L809B8FF4: -/* 00D14 809B8FF4 0C0329DD */ jal func_800CA774 +/* 00D14 809B8FF4 0C0329DD */ jal func_800CA774 /* 00D18 809B8FF8 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 00D1C 809B8FFC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00D20 809B9000 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 00D24 809B9004 C6060284 */ lwc1 $f6, 0x0284($s0) ## 00000284 /* 00D28 809B9008 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 00D2C 809B900C 3C01809C */ lui $at, %hi(D_809BBC8C) ## $at = 809C0000 -/* 00D30 809B9010 46061200 */ add.s $f8, $f2, $f6 +/* 00D30 809B9010 46061200 */ add.s $f8, $f2, $f6 /* 00D34 809B9014 C6120274 */ lwc1 $f18, 0x0274($s0) ## 00000274 /* 00D38 809B9018 8E05027C */ lw $a1, 0x027C($s0) ## 0000027C -/* 00D3C 809B901C 44061000 */ mfc1 $a2, $f2 -/* 00D40 809B9020 46080282 */ mul.s $f10, $f0, $f8 +/* 00D3C 809B901C 44061000 */ mfc1 $a2, $f2 +/* 00D40 809B9020 46080282 */ mul.s $f10, $f0, $f8 /* 00D44 809B9024 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 00D48 809B9028 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 00D4C 809B902C 460A2400 */ add.s $f16, $f4, $f10 +/* 00D4C 809B902C 460A2400 */ add.s $f16, $f4, $f10 /* 00D50 809B9030 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00D54 809B9034 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 00D58 809B9038 C426BC8C */ lwc1 $f6, %lo(D_809BBC8C)($at) -/* 00D5C 809B903C 46069200 */ add.s $f8, $f18, $f6 +/* 00D58 809B9038 C426BC8C */ lwc1 $f6, %lo(D_809BBC8C)($at) +/* 00D5C 809B903C 46069200 */ add.s $f8, $f18, $f6 /* 00D60 809B9040 E6080274 */ swc1 $f8, 0x0274($s0) ## 00000274 /* 00D64 809B9044 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00D68 809B9048 E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 00D68 809B9048 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00D6C 809B904C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 00D70 809B9050 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 00D74 809B9054 AFA5002C */ sw $a1, 0x002C($sp) +/* 00D74 809B9054 AFA5002C */ sw $a1, 0x002C($sp) /* 00D78 809B9058 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 00D7C 809B905C AFA40030 */ sw $a0, 0x0030($sp) + +/* 00D7C 809B905C AFA40030 */ sw $a0, 0x0030($sp) /* 00D80 809B9060 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 00D84 809B9064 44815000 */ mtc1 $at, $f10 ## $f10 = 300.00 -/* 00D88 809B9068 8FA5002C */ lw $a1, 0x002C($sp) -/* 00D8C 809B906C 4600503C */ c.lt.s $f10, $f0 +/* 00D88 809B9068 8FA5002C */ lw $a1, 0x002C($sp) +/* 00D8C 809B906C 4600503C */ c.lt.s $f10, $f0 /* 00D90 809B9070 00000000 */ nop -/* 00D94 809B9074 4502000E */ bc1fl .L809B90B0 +/* 00D94 809B9074 4502000E */ bc1fl .L809B90B0 /* 00D98 809B9078 8E0F0260 */ lw $t7, 0x0260($s0) ## 00000260 /* 00D9C 809B907C 0C01E01A */ jal Math_Vec3f_Yaw - -/* 00DA0 809B9080 8FA40030 */ lw $a0, 0x0030($sp) + +/* 00DA0 809B9080 8FA40030 */ lw $a0, 0x0030($sp) /* 00DA4 809B9084 A602026E */ sh $v0, 0x026E($s0) ## 0000026E /* 00DA8 809B9088 8605026E */ lh $a1, 0x026E($s0) ## 0000026E /* 00DAC 809B908C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00DB0 809B9090 AFA4002C */ sw $a0, 0x002C($sp) -/* 00DB4 809B9094 AFA00010 */ sw $zero, 0x0010($sp) +/* 00DB0 809B9090 AFA4002C */ sw $a0, 0x002C($sp) +/* 00DB4 809B9094 AFA00010 */ sw $zero, 0x0010($sp) /* 00DB8 809B9098 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00DBC 809B909C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00DC0 809B90A0 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 00DC4 809B90A4 1000011F */ beq $zero, $zero, .L809B9524 +/* 00DC4 809B90A4 1000011F */ beq $zero, $zero, .L809B9524 /* 00DC8 809B90A8 8605026E */ lh $a1, 0x026E($s0) ## 0000026E /* 00DCC 809B90AC 8E0F0260 */ lw $t7, 0x0260($s0) ## 00000260 .L809B90B0: /* 00DD0 809B90B0 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 00DD4 809B90B4 1F00005C */ bgtz $t8, .L809B9228 +/* 00DD4 809B90B4 1F00005C */ bgtz $t8, .L809B9228 /* 00DD8 809B90B8 AE180260 */ sw $t8, 0x0260($s0) ## 00000260 /* 00DDC 809B90BC 860A026A */ lh $t2, 0x026A($s0) ## 0000026A /* 00DE0 809B90C0 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 00DE4 809B90C4 394B0001 */ xori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00DE8 809B90C8 0C0329DD */ jal func_800CA774 +/* 00DE8 809B90C8 0C0329DD */ jal func_800CA774 /* 00DEC 809B90CC A60B026A */ sh $t3, 0x026A($s0) ## 0000026A /* 00DF0 809B90D0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00DF4 809B90D4 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 /* 00DF8 809B90D8 8618026A */ lh $t8, 0x026A($s0) ## 0000026A /* 00DFC 809B90DC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00E00 809B90E0 46100482 */ mul.s $f18, $f0, $f16 +/* 00E00 809B90E0 46100482 */ mul.s $f18, $f0, $f16 /* 00E04 809B90E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E08 809B90E8 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 00E0C 809B90EC E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 00E10 809B90F0 4600918D */ trunc.w.s $f6, $f18 -/* 00E14 809B90F4 440D3000 */ mfc1 $t5, $f6 +/* 00E10 809B90F0 4600918D */ trunc.w.s $f6, $f18 +/* 00E14 809B90F4 440D3000 */ mfc1 $t5, $f6 /* 00E18 809B90F8 00000000 */ nop -/* 00E1C 809B90FC 000D7400 */ sll $t6, $t5, 16 -/* 00E20 809B9100 000E7C03 */ sra $t7, $t6, 16 +/* 00E1C 809B90FC 000D7400 */ sll $t6, $t5, 16 +/* 00E20 809B9100 000E7C03 */ sra $t7, $t6, 16 /* 00E24 809B9104 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 /* 00E28 809B9108 00000000 */ nop -/* 00E2C 809B910C 46804120 */ cvt.s.w $f4, $f8 -/* 00E30 809B9110 13000027 */ beq $t8, $zero, .L809B91B0 +/* 00E2C 809B910C 46804120 */ cvt.s.w $f4, $f8 +/* 00E30 809B9110 13000027 */ beq $t8, $zero, .L809B91B0 /* 00E34 809B9114 E6040280 */ swc1 $f4, 0x0280($s0) ## 00000280 /* 00E38 809B9118 8E190324 */ lw $t9, 0x0324($s0) ## 00000324 /* 00E3C 809B911C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00E40 809B9120 17200023 */ bne $t9, $zero, .L809B91B0 +/* 00E40 809B9120 17200023 */ bne $t9, $zero, .L809B91B0 /* 00E44 809B9124 00000000 */ nop /* 00E48 809B9128 C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 /* 00E4C 809B912C 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 /* 00E50 809B9130 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 /* 00E54 809B9134 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E58 809B9138 4612803C */ c.lt.s $f16, $f18 +/* 00E58 809B9138 4612803C */ c.lt.s $f16, $f18 /* 00E5C 809B913C A60A026E */ sh $t2, 0x026E($s0) ## 0000026E -/* 00E60 809B9140 8FA40034 */ lw $a0, 0x0034($sp) -/* 00E64 809B9144 45000005 */ bc1f .L809B915C +/* 00E60 809B9140 8FA40034 */ lw $a0, 0x0034($sp) +/* 00E64 809B9144 45000005 */ bc1f .L809B915C /* 00E68 809B9148 00000000 */ nop -/* 00E6C 809B914C 0C0294BE */ jal func_800A52F8 +/* 00E6C 809B914C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00E70 809B9150 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 /* 00E74 809B9154 860B008A */ lh $t3, 0x008A($s0) ## 0000008A /* 00E78 809B9158 A60B026E */ sh $t3, 0x026E($s0) ## 0000026E @@ -175,8 +175,8 @@ glabel func_809B8EF4 /* 00E88 809B9168 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 /* 00E8C 809B916C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00E90 809B9170 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 00E94 809B9174 46060202 */ mul.s $f8, $f0, $f6 -/* 00E98 809B9178 46044280 */ add.s $f10, $f8, $f4 +/* 00E94 809B9174 46060202 */ mul.s $f8, $f0, $f6 +/* 00E98 809B9178 46044280 */ add.s $f10, $f8, $f4 /* 00E9C 809B917C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00EA0 809B9180 E60A027C */ swc1 $f10, 0x027C($s0) ## 0000027C @@ -184,16 +184,16 @@ glabel func_809B8EF4 /* 00EA8 809B9188 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 00EAC 809B918C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00EB0 809B9190 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 00EB4 809B9194 46100482 */ mul.s $f18, $f0, $f16 +/* 00EB4 809B9194 46100482 */ mul.s $f18, $f0, $f16 /* 00EB8 809B9198 A6000268 */ sh $zero, 0x0268($s0) ## 00000268 -/* 00EBC 809B919C 46069200 */ add.s $f8, $f18, $f6 -/* 00EC0 809B91A0 4600410D */ trunc.w.s $f4, $f8 -/* 00EC4 809B91A4 440D2000 */ mfc1 $t5, $f4 -/* 00EC8 809B91A8 1000001F */ beq $zero, $zero, .L809B9228 +/* 00EBC 809B919C 46069200 */ add.s $f8, $f18, $f6 +/* 00EC0 809B91A0 4600410D */ trunc.w.s $f4, $f8 +/* 00EC4 809B91A4 440D2000 */ mfc1 $t5, $f4 +/* 00EC8 809B91A8 1000001F */ beq $zero, $zero, .L809B9228 /* 00ECC 809B91AC AE0D0260 */ sw $t5, 0x0260($s0) ## 00000260 .L809B91B0: -/* 00ED0 809B91B0 0C0294BE */ jal func_800A52F8 -/* 00ED4 809B91B4 8FA40034 */ lw $a0, 0x0034($sp) +/* 00ED0 809B91B0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00ED4 809B91B4 8FA40034 */ lw $a0, 0x0034($sp) /* 00ED8 809B91B8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00EDC 809B91BC 00000000 */ nop @@ -201,8 +201,8 @@ glabel func_809B8EF4 /* 00EE4 809B91C4 44815000 */ mtc1 $at, $f10 ## $f10 = 1.50 /* 00EE8 809B91C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00EEC 809B91CC 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 00EF0 809B91D0 460A0402 */ mul.s $f16, $f0, $f10 -/* 00EF4 809B91D4 46128180 */ add.s $f6, $f16, $f18 +/* 00EF0 809B91D0 460A0402 */ mul.s $f16, $f0, $f10 +/* 00EF4 809B91D4 46128180 */ add.s $f6, $f16, $f18 /* 00EF8 809B91D8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00EFC 809B91DC E606027C */ swc1 $f6, 0x027C($s0) ## 0000027C @@ -210,18 +210,18 @@ glabel func_809B8EF4 /* 00F04 809B91E4 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 00F08 809B91E8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00F0C 809B91EC 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 00F10 809B91F0 46080102 */ mul.s $f4, $f0, $f8 +/* 00F10 809B91F0 46080102 */ mul.s $f4, $f0, $f8 /* 00F14 809B91F4 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 -/* 00F18 809B91F8 460A2400 */ add.s $f16, $f4, $f10 -/* 00F1C 809B91FC 4600848D */ trunc.w.s $f18, $f16 -/* 00F20 809B9200 440F9000 */ mfc1 $t7, $f18 -/* 00F24 809B9204 0C0329C8 */ jal func_800CA720 +/* 00F18 809B91F8 460A2400 */ add.s $f16, $f4, $f10 +/* 00F1C 809B91FC 4600848D */ trunc.w.s $f18, $f16 +/* 00F20 809B9200 440F9000 */ mfc1 $t7, $f18 +/* 00F24 809B9204 0C0329C8 */ jal func_800CA720 /* 00F28 809B9208 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 /* 00F2C 809B920C 3C01809C */ lui $at, %hi(D_809BBC90) ## $at = 809C0000 -/* 00F30 809B9210 C426BC90 */ lwc1 $f6, %lo(D_809BBC90)($at) -/* 00F34 809B9214 46060202 */ mul.s $f8, $f0, $f6 -/* 00F38 809B9218 4600410D */ trunc.w.s $f4, $f8 -/* 00F3C 809B921C 44192000 */ mfc1 $t9, $f4 +/* 00F30 809B9210 C426BC90 */ lwc1 $f6, %lo(D_809BBC90)($at) +/* 00F34 809B9214 46060202 */ mul.s $f8, $f0, $f6 +/* 00F38 809B9218 4600410D */ trunc.w.s $f4, $f8 +/* 00F3C 809B921C 44192000 */ mfc1 $t9, $f4 /* 00F40 809B9220 00000000 */ nop /* 00F44 809B9224 A619026E */ sh $t9, 0x026E($s0) ## 0000026E .L809B9228: @@ -229,19 +229,19 @@ glabel func_809B8EF4 /* 00F4C 809B922C 44815000 */ mtc1 $at, $f10 ## $f10 = 150.00 /* 00F50 809B9230 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 /* 00F54 809B9234 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00F58 809B9238 460A003C */ c.lt.s $f0, $f10 +/* 00F58 809B9238 460A003C */ c.lt.s $f0, $f10 /* 00F5C 809B923C 00000000 */ nop -/* 00F60 809B9240 45020026 */ bc1fl .L809B92DC +/* 00F60 809B9240 45020026 */ bc1fl .L809B92DC /* 00F64 809B9244 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 /* 00F68 809B9248 860A0268 */ lh $t2, 0x0268($s0) ## 00000268 -/* 00F6C 809B924C 51400023 */ beql $t2, $zero, .L809B92DC +/* 00F6C 809B924C 51400023 */ beql $t2, $zero, .L809B92DC /* 00F70 809B9250 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 /* 00F74 809B9254 860B026A */ lh $t3, 0x026A($s0) ## 0000026A -/* 00F78 809B9258 8FA40034 */ lw $a0, 0x0034($sp) +/* 00F78 809B9258 8FA40034 */ lw $a0, 0x0034($sp) /* 00F7C 809B925C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F80 809B9260 55600026 */ bnel $t3, $zero, .L809B92FC +/* 00F80 809B9260 55600026 */ bnel $t3, $zero, .L809B92FC /* 00F84 809B9264 8E020324 */ lw $v0, 0x0324($s0) ## 00000324 -/* 00F88 809B9268 0C0294BE */ jal func_800A52F8 +/* 00F88 809B9268 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00F8C 809B926C 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 /* 00F90 809B9270 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -250,8 +250,8 @@ glabel func_809B8EF4 /* 00F9C 809B927C 44818000 */ mtc1 $at, $f16 ## $f16 = 1.50 /* 00FA0 809B9280 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00FA4 809B9284 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 -/* 00FA8 809B9288 46100482 */ mul.s $f18, $f0, $f16 -/* 00FAC 809B928C 46069200 */ add.s $f8, $f18, $f6 +/* 00FA8 809B9288 46100482 */ mul.s $f18, $f0, $f16 +/* 00FAC 809B928C 46069200 */ add.s $f8, $f18, $f6 /* 00FB0 809B9290 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00FB4 809B9294 E608027C */ swc1 $f8, 0x027C($s0) ## 0000027C @@ -259,223 +259,223 @@ glabel func_809B8EF4 /* 00FBC 809B929C 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 00FC0 809B92A0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00FC4 809B92A4 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 00FC8 809B92A8 46040282 */ mul.s $f10, $f0, $f4 +/* 00FC8 809B92A8 46040282 */ mul.s $f10, $f0, $f4 /* 00FCC 809B92AC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00FD0 809B92B0 A60F026A */ sh $t7, 0x026A($s0) ## 0000026A /* 00FD4 809B92B4 860E008A */ lh $t6, 0x008A($s0) ## 0000008A /* 00FD8 809B92B8 8618026A */ lh $t8, 0x026A($s0) ## 0000026A /* 00FDC 809B92BC A60E026E */ sh $t6, 0x026E($s0) ## 0000026E -/* 00FE0 809B92C0 46105480 */ add.s $f18, $f10, $f16 +/* 00FE0 809B92C0 46105480 */ add.s $f18, $f10, $f16 /* 00FE4 809B92C4 A6180268 */ sh $t8, 0x0268($s0) ## 00000268 -/* 00FE8 809B92C8 4600918D */ trunc.w.s $f6, $f18 -/* 00FEC 809B92CC 440D3000 */ mfc1 $t5, $f6 -/* 00FF0 809B92D0 10000009 */ beq $zero, $zero, .L809B92F8 +/* 00FE8 809B92C8 4600918D */ trunc.w.s $f6, $f18 +/* 00FEC 809B92CC 440D3000 */ mfc1 $t5, $f6 +/* 00FF0 809B92D0 10000009 */ beq $zero, $zero, .L809B92F8 /* 00FF4 809B92D4 AE0D0260 */ sw $t5, 0x0260($s0) ## 00000260 /* 00FF8 809B92D8 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 .L809B92DC: /* 00FFC 809B92DC 00000000 */ nop -/* 01000 809B92E0 4608003C */ c.lt.s $f0, $f8 +/* 01000 809B92E0 4608003C */ c.lt.s $f0, $f8 /* 01004 809B92E4 00000000 */ nop -/* 01008 809B92E8 45020004 */ bc1fl .L809B92FC +/* 01008 809B92E8 45020004 */ bc1fl .L809B92FC /* 0100C 809B92EC 8E020324 */ lw $v0, 0x0324($s0) ## 00000324 /* 01010 809B92F0 8619008A */ lh $t9, 0x008A($s0) ## 0000008A /* 01014 809B92F4 A619026E */ sh $t9, 0x026E($s0) ## 0000026E .L809B92F8: /* 01018 809B92F8 8E020324 */ lw $v0, 0x0324($s0) ## 00000324 .L809B92FC: -/* 0101C 809B92FC 8FA40054 */ lw $a0, 0x0054($sp) +/* 0101C 809B92FC 8FA40054 */ lw $a0, 0x0054($sp) /* 01020 809B9300 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01024 809B9304 54400006 */ bnel $v0, $zero, .L809B9320 +/* 01024 809B9304 54400006 */ bnel $v0, $zero, .L809B9320 /* 01028 809B9308 844A001C */ lh $t2, 0x001C($v0) ## 0000001C -/* 0102C 809B930C 0C26E0BA */ jal func_809B82E8 +/* 0102C 809B930C 0C26E0BA */ jal func_809B82E8 /* 01030 809B9310 3C064396 */ lui $a2, 0x4396 ## $a2 = 43960000 -/* 01034 809B9314 10000007 */ beq $zero, $zero, .L809B9334 -/* 01038 809B9318 AFA2004C */ sw $v0, 0x004C($sp) +/* 01034 809B9314 10000007 */ beq $zero, $zero, .L809B9334 +/* 01038 809B9318 AFA2004C */ sw $v0, 0x004C($sp) /* 0103C 809B931C 844A001C */ lh $t2, 0x001C($v0) ## 0000001C .L809B9320: -/* 01040 809B9320 55400004 */ bnel $t2, $zero, .L809B9334 -/* 01044 809B9324 AFA0004C */ sw $zero, 0x004C($sp) -/* 01048 809B9328 10000002 */ beq $zero, $zero, .L809B9334 -/* 0104C 809B932C AFA2004C */ sw $v0, 0x004C($sp) -/* 01050 809B9330 AFA0004C */ sw $zero, 0x004C($sp) +/* 01040 809B9320 55400004 */ bnel $t2, $zero, .L809B9334 +/* 01044 809B9324 AFA0004C */ sw $zero, 0x004C($sp) +/* 01048 809B9328 10000002 */ beq $zero, $zero, .L809B9334 +/* 0104C 809B932C AFA2004C */ sw $v0, 0x004C($sp) +/* 01050 809B9330 AFA0004C */ sw $zero, 0x004C($sp) .L809B9334: -/* 01054 809B9334 8FAB004C */ lw $t3, 0x004C($sp) +/* 01054 809B9334 8FAB004C */ lw $t3, 0x004C($sp) /* 01058 809B9338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0105C 809B933C 260D0032 */ addiu $t5, $s0, 0x0032 ## $t5 = 00000032 -/* 01060 809B9340 1160003A */ beq $t3, $zero, .L809B942C +/* 01060 809B9340 1160003A */ beq $t3, $zero, .L809B942C /* 01064 809B9344 01602825 */ or $a1, $t3, $zero ## $a1 = 00000000 /* 01068 809B9348 260C0028 */ addiu $t4, $s0, 0x0028 ## $t4 = 00000028 -/* 0106C 809B934C 0C00B69E */ jal func_8002DA78 -/* 01070 809B9350 AFAC0034 */ sw $t4, 0x0034($sp) +/* 0106C 809B934C 0C00B69E */ jal func_8002DA78 +/* 01070 809B9350 AFAC0034 */ sw $t4, 0x0034($sp) /* 01074 809B9354 860D026C */ lh $t5, 0x026C($s0) ## 0000026C /* 01078 809B9358 A602026E */ sh $v0, 0x026E($s0) ## 0000026E /* 0107C 809B935C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 01080 809B9360 15A0000E */ bne $t5, $zero, .L809B939C +/* 01080 809B9360 15A0000E */ bne $t5, $zero, .L809B939C /* 01084 809B9364 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01088 809B9368 8FAE004C */ lw $t6, 0x004C($sp) +/* 01088 809B9368 8FAE004C */ lw $t6, 0x004C($sp) /* 0108C 809B936C 8E0F0324 */ lw $t7, 0x0324($s0) ## 00000324 /* 01090 809B9370 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01094 809B9374 51CF000A */ beql $t6, $t7, .L809B93A0 +/* 01094 809B9374 51CF000A */ beql $t6, $t7, .L809B93A0 /* 01098 809B9378 8605026E */ lh $a1, 0x026E($s0) ## 0000026E /* 0109C 809B937C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 /* 010A0 809B9380 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 /* 010A4 809B9384 24188000 */ addiu $t8, $zero, 0x8000 ## $t8 = FFFF8000 /* 010A8 809B9388 A618026C */ sh $t8, 0x026C($s0) ## 0000026C -/* 010AC 809B938C 460A2402 */ mul.s $f16, $f4, $f10 -/* 010B0 809B9390 8FB9004C */ lw $t9, 0x004C($sp) +/* 010AC 809B938C 460A2402 */ mul.s $f16, $f4, $f10 +/* 010B0 809B9390 8FB9004C */ lw $t9, 0x004C($sp) /* 010B4 809B9394 AE190324 */ sw $t9, 0x0324($s0) ## 00000324 /* 010B8 809B9398 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 .L809B939C: /* 010BC 809B939C 8605026E */ lh $a1, 0x026E($s0) ## 0000026E .L809B93A0: -/* 010C0 809B93A0 AFA4002C */ sw $a0, 0x002C($sp) -/* 010C4 809B93A4 AFA00010 */ sw $zero, 0x0010($sp) +/* 010C0 809B93A0 AFA4002C */ sw $a0, 0x002C($sp) +/* 010C4 809B93A4 AFA00010 */ sw $zero, 0x0010($sp) /* 010C8 809B93A8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 010CC 809B93AC 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 010D0 809B93B0 8FAA004C */ lw $t2, 0x004C($sp) +/* 010D0 809B93B0 8FAA004C */ lw $t2, 0x004C($sp) /* 010D4 809B93B4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 010D8 809B93B8 8FA40030 */ lw $a0, 0x0030($sp) +/* 010D8 809B93B8 8FA40030 */ lw $a0, 0x0030($sp) /* 010DC 809B93BC 8D450024 */ lw $a1, 0x0024($t2) ## 00000024 /* 010E0 809B93C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 010E4 809B93C4 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 010E8 809B93C8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 010EC 809B93CC E7B20010 */ swc1 $f18, 0x0010($sp) -/* 010F0 809B93D0 8FAB004C */ lw $t3, 0x004C($sp) + +/* 010EC 809B93CC E7B20010 */ swc1 $f18, 0x0010($sp) +/* 010F0 809B93D0 8FAB004C */ lw $t3, 0x004C($sp) /* 010F4 809B93D4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 010F8 809B93D8 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 /* 010FC 809B93DC C5660028 */ lwc1 $f6, 0x0028($t3) ## 00000028 /* 01100 809B93E0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01104 809B93E4 8FA40034 */ lw $a0, 0x0034($sp) -/* 01108 809B93E8 46083100 */ add.s $f4, $f6, $f8 +/* 01104 809B93E4 8FA40034 */ lw $a0, 0x0034($sp) +/* 01108 809B93E8 46083100 */ add.s $f4, $f6, $f8 /* 0110C 809B93EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01110 809B93F0 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 01114 809B93F4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01118 809B93F8 44052000 */ mfc1 $a1, $f4 +/* 01114 809B93F4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01118 809B93F8 44052000 */ mfc1 $a1, $f4 /* 0111C 809B93FC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 01120 809B9400 00000000 */ nop -/* 01124 809B9404 8FAC004C */ lw $t4, 0x004C($sp) +/* 01124 809B9404 8FAC004C */ lw $t4, 0x004C($sp) /* 01128 809B9408 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 0112C 809B940C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 01130 809B9410 8D85002C */ lw $a1, 0x002C($t4) ## 0000002C /* 01134 809B9414 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01138 809B9418 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 0113C 809B941C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01140 809B9420 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01144 809B9424 10000004 */ beq $zero, $zero, .L809B9438 + +/* 01140 809B9420 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01144 809B9424 10000004 */ beq $zero, $zero, .L809B9438 /* 01148 809B9428 8604026C */ lh $a0, 0x026C($s0) ## 0000026C .L809B942C: /* 0114C 809B942C AE000324 */ sw $zero, 0x0324($s0) ## 00000324 -/* 01150 809B9430 AFAD002C */ sw $t5, 0x002C($sp) +/* 01150 809B9430 AFAD002C */ sw $t5, 0x002C($sp) /* 01154 809B9434 8604026C */ lh $a0, 0x026C($s0) ## 0000026C .L809B9438: -/* 01158 809B9438 50800014 */ beql $a0, $zero, .L809B948C +/* 01158 809B9438 50800014 */ beql $a0, $zero, .L809B948C /* 0115C 809B943C 8608007E */ lh $t0, 0x007E($s0) ## 0000007E /* 01160 809B9440 0C01DE0D */ jal Math_Coss ## coss? /* 01164 809B9444 00000000 */ nop /* 01168 809B9448 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0116C 809B944C 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 01170 809B9450 46000487 */ neg.s $f18, $f0 +/* 01170 809B9450 46000487 */ neg.s $f18, $f0 /* 01174 809B9454 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 01178 809B9458 46069202 */ mul.s $f8, $f18, $f6 +/* 01178 809B9458 46069202 */ mul.s $f8, $f18, $f6 /* 0117C 809B945C 860E026C */ lh $t6, 0x026C($s0) ## 0000026C /* 01180 809B9460 8605026E */ lh $a1, 0x026E($s0) ## 0000026E /* 01184 809B9464 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01188 809B9468 25CF1000 */ addiu $t7, $t6, 0x1000 ## $t7 = 00001000 /* 0118C 809B946C A60F026C */ sh $t7, 0x026C($s0) ## 0000026C /* 01190 809B9470 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 01194 809B9474 46082280 */ add.s $f10, $f4, $f8 +/* 01194 809B9474 46082280 */ add.s $f10, $f4, $f8 /* 01198 809B9478 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 0119C 809B947C AFA00010 */ sw $zero, 0x0010($sp) +/* 0119C 809B947C AFA00010 */ sw $zero, 0x0010($sp) /* 011A0 809B9480 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 011A4 809B9484 8FA4002C */ lw $a0, 0x002C($sp) + +/* 011A4 809B9484 8FA4002C */ lw $a0, 0x002C($sp) /* 011A8 809B9488 8608007E */ lh $t0, 0x007E($s0) ## 0000007E .L809B948C: /* 011AC 809B948C 86090032 */ lh $t1, 0x0032($s0) ## 00000032 /* 011B0 809B9490 8605026E */ lh $a1, 0x026E($s0) ## 0000026E /* 011B4 809B9494 8E180324 */ lw $t8, 0x0324($s0) ## 00000324 -/* 011B8 809B9498 01091023 */ subu $v0, $t0, $t1 -/* 011BC 809B949C 01052023 */ subu $a0, $t0, $a1 -/* 011C0 809B94A0 00021400 */ sll $v0, $v0, 16 -/* 011C4 809B94A4 00042400 */ sll $a0, $a0, 16 -/* 011C8 809B94A8 00021403 */ sra $v0, $v0, 16 -/* 011CC 809B94AC 1700001D */ bne $t8, $zero, .L809B9524 -/* 011D0 809B94B0 00042403 */ sra $a0, $a0, 16 +/* 011B8 809B9498 01091023 */ subu $v0, $t0, $t1 +/* 011BC 809B949C 01052023 */ subu $a0, $t0, $a1 +/* 011C0 809B94A0 00021400 */ sll $v0, $v0, 16 +/* 011C4 809B94A4 00042400 */ sll $a0, $a0, 16 +/* 011C8 809B94A8 00021403 */ sra $v0, $v0, 16 +/* 011CC 809B94AC 1700001D */ bne $t8, $zero, .L809B9524 +/* 011D0 809B94B0 00042403 */ sra $a0, $a0, 16 /* 011D4 809B94B4 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 /* 011D8 809B94B8 332A0008 */ andi $t2, $t9, 0x0008 ## $t2 = 00000000 -/* 011DC 809B94BC 5140001A */ beql $t2, $zero, .L809B9528 -/* 011E0 809B94C0 8FA4002C */ lw $a0, 0x002C($sp) -/* 011E4 809B94C4 04400003 */ bltz $v0, .L809B94D4 -/* 011E8 809B94C8 00021823 */ subu $v1, $zero, $v0 -/* 011EC 809B94CC 10000001 */ beq $zero, $zero, .L809B94D4 +/* 011DC 809B94BC 5140001A */ beql $t2, $zero, .L809B9528 +/* 011E0 809B94C0 8FA4002C */ lw $a0, 0x002C($sp) +/* 011E4 809B94C4 04400003 */ bltz $v0, .L809B94D4 +/* 011E8 809B94C8 00021823 */ subu $v1, $zero, $v0 +/* 011EC 809B94CC 10000001 */ beq $zero, $zero, .L809B94D4 /* 011F0 809B94D0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L809B94D4: -/* 011F4 809B94D4 28614001 */ slti $at, $v1, 0x4001 -/* 011F8 809B94D8 10200007 */ beq $at, $zero, .L809B94F8 -/* 011FC 809B94DC 01085821 */ addu $t3, $t0, $t0 -/* 01200 809B94E0 04800003 */ bltz $a0, .L809B94F0 -/* 01204 809B94E4 00041023 */ subu $v0, $zero, $a0 -/* 01208 809B94E8 10000001 */ beq $zero, $zero, .L809B94F0 +/* 011F4 809B94D4 28614001 */ slti $at, $v1, 0x4001 +/* 011F8 809B94D8 10200007 */ beq $at, $zero, .L809B94F8 +/* 011FC 809B94DC 01085821 */ addu $t3, $t0, $t0 +/* 01200 809B94E0 04800003 */ bltz $a0, .L809B94F0 +/* 01204 809B94E4 00041023 */ subu $v0, $zero, $a0 +/* 01208 809B94E8 10000001 */ beq $zero, $zero, .L809B94F0 /* 0120C 809B94EC 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 .L809B94F0: -/* 01210 809B94F0 28414001 */ slti $at, $v0, 0x4001 -/* 01214 809B94F4 1420000B */ bne $at, $zero, .L809B9524 +/* 01210 809B94F0 28414001 */ slti $at, $v0, 0x4001 +/* 01214 809B94F4 1420000B */ bne $at, $zero, .L809B9524 .L809B94F8: -/* 01218 809B94F8 01696023 */ subu $t4, $t3, $t1 +/* 01218 809B94F8 01696023 */ subu $t4, $t3, $t1 /* 0121C 809B94FC 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 01220 809B9500 01816821 */ addu $t5, $t4, $at +/* 01220 809B9500 01816821 */ addu $t5, $t4, $at /* 01224 809B9504 A60D026E */ sh $t5, 0x026E($s0) ## 0000026E /* 01228 809B9508 8605026E */ lh $a1, 0x026E($s0) ## 0000026E -/* 0122C 809B950C AFA00010 */ sw $zero, 0x0010($sp) -/* 01230 809B9510 8FA4002C */ lw $a0, 0x002C($sp) +/* 0122C 809B950C AFA00010 */ sw $zero, 0x0010($sp) +/* 01230 809B9510 8FA4002C */ lw $a0, 0x002C($sp) /* 01234 809B9514 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01238 809B9518 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 0123C 809B951C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 01240 809B9520 8605026E */ lh $a1, 0x026E($s0) ## 0000026E .L809B9524: -/* 01244 809B9524 8FA4002C */ lw $a0, 0x002C($sp) +/* 01244 809B9524 8FA4002C */ lw $a0, 0x002C($sp) .L809B9528: /* 01248 809B9528 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0124C 809B952C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 01250 809B9530 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01254 809B9534 AFA00010 */ sw $zero, 0x0010($sp) + +/* 01254 809B9534 AFA00010 */ sw $zero, 0x0010($sp) /* 01258 809B9538 920302BD */ lbu $v1, 0x02BD($s0) ## 000002BD /* 0125C 809B953C 30630002 */ andi $v1, $v1, 0x0002 ## $v1 = 00000000 -/* 01260 809B9540 54600006 */ bnel $v1, $zero, .L809B955C +/* 01260 809B9540 54600006 */ bnel $v1, $zero, .L809B955C /* 01264 809B9544 8618008A */ lh $t8, 0x008A($s0) ## 0000008A /* 01268 809B9548 920E02BC */ lbu $t6, 0x02BC($s0) ## 000002BC /* 0126C 809B954C 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 01270 809B9550 51E00020 */ beql $t7, $zero, .L809B95D4 +/* 01270 809B9550 51E00020 */ beql $t7, $zero, .L809B95D4 /* 01274 809B9554 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 01278 809B9558 8618008A */ lh $t8, 0x008A($s0) ## 0000008A .L809B955C: /* 0127C 809B955C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 01280 809B9560 24024000 */ addiu $v0, $zero, 0x4000 ## $v0 = 00004000 -/* 01284 809B9564 0301C821 */ addu $t9, $t8, $at -/* 01288 809B9568 10600003 */ beq $v1, $zero, .L809B9578 +/* 01284 809B9564 0301C821 */ addu $t9, $t8, $at +/* 01288 809B9568 10600003 */ beq $v1, $zero, .L809B9578 /* 0128C 809B956C A619026E */ sh $t9, 0x026E($s0) ## 0000026E -/* 01290 809B9570 1000000E */ beq $zero, $zero, .L809B95AC +/* 01290 809B9570 1000000E */ beq $zero, $zero, .L809B95AC /* 01294 809B9574 24028000 */ addiu $v0, $zero, 0x8000 ## $v0 = FFFF8000 .L809B9578: /* 01298 809B9578 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0129C 809B957C 240538CB */ addiu $a1, $zero, 0x38CB ## $a1 = 000038CB /* 012A0 809B9580 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 012A4 809B9584 A7A20046 */ sh $v0, 0x0046($sp) -/* 012A8 809B9588 8FAA0054 */ lw $t2, 0x0054($sp) + +/* 012A4 809B9584 A7A20046 */ sh $v0, 0x0046($sp) +/* 012A8 809B9588 8FAA0054 */ lw $t2, 0x0054($sp) /* 012AC 809B958C 3C0B0001 */ lui $t3, 0x0001 ## $t3 = 00010000 -/* 012B0 809B9590 87A20046 */ lh $v0, 0x0046($sp) -/* 012B4 809B9594 016A5821 */ addu $t3, $t3, $t2 +/* 012B0 809B9590 87A20046 */ lh $v0, 0x0046($sp) +/* 012B4 809B9594 016A5821 */ addu $t3, $t3, $t2 /* 012B8 809B9598 8D6B1DE4 */ lw $t3, 0x1DE4($t3) ## 00011DE4 /* 012BC 809B959C 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 012C0 809B95A0 51800003 */ beql $t4, $zero, .L809B95B0 +/* 012C0 809B95A0 51800003 */ beql $t4, $zero, .L809B95B0 /* 012C4 809B95A4 860D008A */ lh $t5, 0x008A($s0) ## 0000008A /* 012C8 809B95A8 2402C000 */ addiu $v0, $zero, 0xC000 ## $v0 = FFFFC000 .L809B95AC: @@ -483,7 +483,7 @@ glabel func_809B8EF4 .L809B95B0: /* 012D0 809B95B0 920F02BD */ lbu $t7, 0x02BD($s0) ## 000002BD /* 012D4 809B95B4 921902BC */ lbu $t9, 0x02BC($s0) ## 000002BC -/* 012D8 809B95B8 01A27021 */ addu $t6, $t5, $v0 +/* 012D8 809B95B8 01A27021 */ addu $t6, $t5, $v0 /* 012DC 809B95BC 31F8FFFD */ andi $t8, $t7, 0xFFFD ## $t8 = 00000000 /* 012E0 809B95C0 332AFFFD */ andi $t2, $t9, 0xFFFD ## $t2 = 00000000 /* 012E4 809B95C4 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 @@ -493,84 +493,84 @@ glabel func_809B8EF4 .L809B95D4: /* 012F4 809B95D4 44819000 */ mtc1 $at, $f18 ## $f18 = 6.00 /* 012F8 809B95D8 C610027C */ lwc1 $f16, 0x027C($s0) ## 0000027C -/* 012FC 809B95DC 4610903E */ c.le.s $f18, $f16 +/* 012FC 809B95DC 4610903E */ c.le.s $f18, $f16 /* 01300 809B95E0 00000000 */ nop -/* 01304 809B95E4 45020020 */ bc1fl .L809B9668 +/* 01304 809B95E4 45020020 */ bc1fl .L809B9668 /* 01308 809B95E8 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 /* 0130C 809B95EC C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 /* 01310 809B95F0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 01314 809B95F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01318 809B95F8 4600310D */ trunc.w.s $f4, $f6 -/* 0131C 809B95FC 44022000 */ mfc1 $v0, $f4 +/* 01318 809B95F8 4600310D */ trunc.w.s $f4, $f6 +/* 0131C 809B95FC 44022000 */ mfc1 $v0, $f4 /* 01320 809B9600 00000000 */ nop -/* 01324 809B9604 10400003 */ beq $v0, $zero, .L809B9614 +/* 01324 809B9604 10400003 */ beq $v0, $zero, .L809B9614 /* 01328 809B9608 00000000 */ nop -/* 0132C 809B960C 54410009 */ bnel $v0, $at, .L809B9634 +/* 0132C 809B960C 54410009 */ bnel $v0, $at, .L809B9634 /* 01330 809B9610 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L809B9614: /* 01334 809B9614 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01338 809B9618 240538C9 */ addiu $a1, $zero, 0x38C9 ## $a1 = 000038C9 /* 0133C 809B961C C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 -/* 01340 809B9620 4600428D */ trunc.w.s $f10, $f8 -/* 01344 809B9624 44025000 */ mfc1 $v0, $f10 -/* 01348 809B9628 1000001C */ beq $zero, $zero, .L809B969C +/* 01340 809B9620 4600428D */ trunc.w.s $f10, $f8 +/* 01344 809B9624 44025000 */ mfc1 $v0, $f10 +/* 01348 809B9628 1000001C */ beq $zero, $zero, .L809B969C /* 0134C 809B962C 00000000 */ nop /* 01350 809B9630 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L809B9634: -/* 01354 809B9634 10410004 */ beq $v0, $at, .L809B9648 +/* 01354 809B9634 10410004 */ beq $v0, $at, .L809B9648 /* 01358 809B9638 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0135C 809B963C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01360 809B9640 14410016 */ bne $v0, $at, .L809B969C +/* 01360 809B9640 14410016 */ bne $v0, $at, .L809B969C /* 01364 809B9644 00000000 */ nop .L809B9648: /* 01368 809B9648 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0136C 809B964C 240538C8 */ addiu $a1, $zero, 0x38C8 ## $a1 = 000038C8 /* 01370 809B9650 C6100164 */ lwc1 $f16, 0x0164($s0) ## 00000164 -/* 01374 809B9654 4600848D */ trunc.w.s $f18, $f16 -/* 01378 809B9658 44029000 */ mfc1 $v0, $f18 -/* 0137C 809B965C 1000000F */ beq $zero, $zero, .L809B969C +/* 01374 809B9654 4600848D */ trunc.w.s $f18, $f16 +/* 01378 809B9658 44029000 */ mfc1 $v0, $f18 +/* 0137C 809B965C 1000000F */ beq $zero, $zero, .L809B969C /* 01380 809B9660 00000000 */ nop /* 01384 809B9664 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 .L809B9668: /* 01388 809B9668 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 0138C 809B966C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01390 809B9670 4600310D */ trunc.w.s $f4, $f6 -/* 01394 809B9674 44022000 */ mfc1 $v0, $f4 +/* 01390 809B9670 4600310D */ trunc.w.s $f4, $f6 +/* 01394 809B9674 44022000 */ mfc1 $v0, $f4 /* 01398 809B9678 00000000 */ nop -/* 0139C 809B967C 14410007 */ bne $v0, $at, .L809B969C +/* 0139C 809B967C 14410007 */ bne $v0, $at, .L809B969C /* 013A0 809B9680 00000000 */ nop /* 013A4 809B9684 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 013A8 809B9688 240538C8 */ addiu $a1, $zero, 0x38C8 ## $a1 = 000038C8 /* 013AC 809B968C C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 -/* 013B0 809B9690 4600428D */ trunc.w.s $f10, $f8 -/* 013B4 809B9694 44025000 */ mfc1 $v0, $f10 +/* 013B0 809B9690 4600428D */ trunc.w.s $f10, $f8 +/* 013B4 809B9694 44025000 */ mfc1 $v0, $f10 /* 013B8 809B9698 00000000 */ nop .L809B969C: -/* 013BC 809B969C 5440000D */ bnel $v0, $zero, .L809B96D4 +/* 013BC 809B969C 5440000D */ bnel $v0, $zero, .L809B96D4 /* 013C0 809B96A0 86180032 */ lh $t8, 0x0032($s0) ## 00000032 /* 013C4 809B96A4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 013C8 809B96A8 00000000 */ nop /* 013CC 809B96AC 3C01809C */ lui $at, %hi(D_809BBC94) ## $at = 809C0000 -/* 013D0 809B96B0 C430BC94 */ lwc1 $f16, %lo(D_809BBC94)($at) +/* 013D0 809B96B0 C430BC94 */ lwc1 $f16, %lo(D_809BBC94)($at) /* 013D4 809B96B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013D8 809B96B8 4610003C */ c.lt.s $f0, $f16 +/* 013D8 809B96B8 4610003C */ c.lt.s $f0, $f16 /* 013DC 809B96BC 00000000 */ nop -/* 013E0 809B96C0 45020004 */ bc1fl .L809B96D4 +/* 013E0 809B96C0 45020004 */ bc1fl .L809B96D4 /* 013E4 809B96C4 86180032 */ lh $t8, 0x0032($s0) ## 00000032 /* 013E8 809B96C8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 013EC 809B96CC 240538CA */ addiu $a1, $zero, 0x38CA ## $a1 = 000038CA /* 013F0 809B96D0 86180032 */ lh $t8, 0x0032($s0) ## 00000032 .L809B96D4: /* 013F4 809B96D4 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 013F8 809B96D8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 013FC 809B96DC 8FB00020 */ lw $s0, 0x0020($sp) +/* 013F8 809B96D8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 013FC 809B96DC 8FB00020 */ lw $s0, 0x0020($sp) /* 01400 809B96E0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01404 809B96E4 03E00008 */ jr $ra +/* 01404 809B96E4 03E00008 */ jr $ra /* 01408 809B96E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s index d202869190..6f46d3bc25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s @@ -1,13 +1,13 @@ glabel func_809B96EC /* 0140C 809B96EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01410 809B96F0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01410 809B96F0 AFBF0014 */ sw $ra, 0x0014($sp) /* 01414 809B96F4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 01418 809B96F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0141C 809B96FC 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 -/* 01420 809B9700 AFA60018 */ sw $a2, 0x0018($sp) -/* 01424 809B9704 0C0294BE */ jal func_800A52F8 +/* 01420 809B9700 AFA60018 */ sw $a2, 0x0018($sp) +/* 01424 809B9704 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 01428 809B9708 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0142C 809B970C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0142C 809B970C 8FA40018 */ lw $a0, 0x0018($sp) /* 01430 809B9710 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 01434 809B9714 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 01438 809B9718 94980088 */ lhu $t8, 0x0088($a0) ## 00000088 @@ -26,15 +26,15 @@ glabel func_809B96EC /* 0146C 809B974C E480028C */ swc1 $f0, 0x028C($a0) ## 0000028C /* 01470 809B9750 E4800288 */ swc1 $f0, 0x0288($a0) ## 00000288 /* 01474 809B9754 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01478 809B9758 E486006C */ swc1 $f6, 0x006C($a0) ## 0000006C /* 0147C 809B975C 3C05809C */ lui $a1, %hi(func_809B977C) ## $a1 = 809C0000 -/* 01480 809B9760 8FA40018 */ lw $a0, 0x0018($sp) -/* 01484 809B9764 0C26E0B8 */ jal func_809B82E0 +/* 01480 809B9760 8FA40018 */ lw $a0, 0x0018($sp) +/* 01484 809B9764 0C26E0B8 */ jal func_809B82E0 /* 01488 809B9768 24A5977C */ addiu $a1, $a1, %lo(func_809B977C) ## $a1 = 809B977C -/* 0148C 809B976C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0148C 809B976C 8FBF0014 */ lw $ra, 0x0014($sp) /* 01490 809B9770 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01494 809B9774 03E00008 */ jr $ra +/* 01494 809B9774 03E00008 */ jr $ra /* 01498 809B9778 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s index 723a3c468f..6218a0be25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s @@ -1,20 +1,20 @@ glabel func_809B9A54 /* 01774 809B9A54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01778 809B9A58 AFA40018 */ sw $a0, 0x0018($sp) +/* 01778 809B9A58 AFA40018 */ sw $a0, 0x0018($sp) /* 0177C 809B9A5C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 01780 809B9A60 24A4014C */ addiu $a0, $a1, 0x014C ## $a0 = 0000014C -/* 01784 809B9A64 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01784 809B9A64 AFBF0014 */ sw $ra, 0x0014($sp) /* 01788 809B9A68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0178C 809B9A6C 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 -/* 01790 809B9A70 0C0294BE */ jal func_800A52F8 -/* 01794 809B9A74 AFA6001C */ sw $a2, 0x001C($sp) -/* 01798 809B9A78 8FA6001C */ lw $a2, 0x001C($sp) +/* 01790 809B9A70 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 01794 809B9A74 AFA6001C */ sw $a2, 0x001C($sp) +/* 01798 809B9A78 8FA6001C */ lw $a2, 0x001C($sp) /* 0179C 809B9A7C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 017A0 809B9A80 3C05809C */ lui $a1, %hi(func_809B9B64) ## $a1 = 809C0000 /* 017A4 809B9A84 8CCE0250 */ lw $t6, 0x0250($a2) ## 00000250 /* 017A8 809B9A88 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 /* 017AC 809B9A8C 24A59B64 */ addiu $a1, $a1, %lo(func_809B9B64) ## $a1 = 809B9B64 -/* 017B0 809B9A90 15C10012 */ bne $t6, $at, .L809B9ADC +/* 017B0 809B9A90 15C10012 */ bne $t6, $at, .L809B9ADC /* 017B4 809B9A94 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 017B8 809B9A98 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 017BC 809B9A9C 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 @@ -31,7 +31,7 @@ glabel func_809B9A54 /* 017E8 809B9AC8 A4D90088 */ sh $t9, 0x0088($a2) ## 00000088 /* 017EC 809B9ACC E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 017F0 809B9AD0 E4C6006C */ swc1 $f6, 0x006C($a2) ## 0000006C -/* 017F4 809B9AD4 1000001C */ beq $zero, $zero, .L809B9B48 +/* 017F4 809B9AD4 1000001C */ beq $zero, $zero, .L809B9B48 /* 017F8 809B9AD8 E4C80060 */ swc1 $f8, 0x0060($a2) ## 00000060 .L809B9ADC: /* 017FC 809B9ADC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -39,7 +39,7 @@ glabel func_809B9A54 /* 01804 809B9AE4 C4CA0028 */ lwc1 $f10, 0x0028($a2) ## 00000028 /* 01808 809B9AE8 8CCB0024 */ lw $t3, 0x0024($a2) ## 00000024 /* 0180C 809B9AEC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01810 809B9AF0 46105481 */ sub.s $f18, $f10, $f16 +/* 01810 809B9AF0 46105481 */ sub.s $f18, $f10, $f16 /* 01814 809B9AF4 94CC0088 */ lhu $t4, 0x0088($a2) ## 00000088 /* 01818 809B9AF8 8CCE0004 */ lw $t6, 0x0004($a2) ## 00000004 /* 0181C 809B9AFC ACCB0008 */ sw $t3, 0x0008($a2) ## 00000008 @@ -49,7 +49,7 @@ glabel func_809B9A54 /* 0182C 809B9B0C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 01830 809B9B10 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 01834 809B9B14 318DFFFE */ andi $t5, $t4, 0xFFFE ## $t5 = 00000000 -/* 01838 809B9B18 01C17824 */ and $t7, $t6, $at +/* 01838 809B9B18 01C17824 */ and $t7, $t6, $at /* 0183C 809B9B1C A0C800AF */ sb $t0, 0x00AF($a2) ## 000000AF /* 01840 809B9B20 ACC00260 */ sw $zero, 0x0260($a2) ## 00000260 /* 01844 809B9B24 A4C00268 */ sh $zero, 0x0268($a2) ## 00000268 @@ -63,11 +63,11 @@ glabel func_809B9A54 /* 01864 809B9B44 ACCB0010 */ sw $t3, 0x0010($a2) ## 00000010 .L809B9B48: /* 01868 809B9B48 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 0186C 809B9B4C 0C26E0B8 */ jal func_809B82E0 +/* 0186C 809B9B4C 0C26E0B8 */ jal func_809B82E0 /* 01870 809B9B50 ACD80250 */ sw $t8, 0x0250($a2) ## 00000250 -/* 01874 809B9B54 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01874 809B9B54 8FBF0014 */ lw $ra, 0x0014($sp) /* 01878 809B9B58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0187C 809B9B5C 03E00008 */ jr $ra +/* 0187C 809B9B5C 03E00008 */ jr $ra /* 01880 809B9B60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s index 4bd1bd40fd..5449f0df45 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s @@ -1,20 +1,20 @@ glabel func_809BA028 /* 01D48 809BA028 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D4C 809BA02C AFA40018 */ sw $a0, 0x0018($sp) +/* 01D4C 809BA02C AFA40018 */ sw $a0, 0x0018($sp) /* 01D50 809BA030 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 01D54 809BA034 24A4014C */ addiu $a0, $a1, 0x014C ## $a0 = 0000014C -/* 01D58 809BA038 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01D58 809BA038 AFBF0014 */ sw $ra, 0x0014($sp) /* 01D5C 809BA03C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01D60 809BA040 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 -/* 01D64 809BA044 0C0294BE */ jal func_800A52F8 -/* 01D68 809BA048 AFA6001C */ sw $a2, 0x001C($sp) -/* 01D6C 809BA04C 8FA6001C */ lw $a2, 0x001C($sp) +/* 01D64 809BA044 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 01D68 809BA048 AFA6001C */ sw $a2, 0x001C($sp) +/* 01D6C 809BA04C 8FA6001C */ lw $a2, 0x001C($sp) /* 01D70 809BA050 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 01D74 809BA054 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 /* 01D78 809BA058 C4C60028 */ lwc1 $f6, 0x0028($a2) ## 00000028 /* 01D7C 809BA05C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 01D80 809BA060 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01D84 809BA064 46083280 */ add.s $f10, $f6, $f8 +/* 01D84 809BA064 46083280 */ add.s $f10, $f6, $f8 /* 01D88 809BA068 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 /* 01D8C 809BA06C 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 /* 01D90 809BA070 ACCE0250 */ sw $t6, 0x0250($a2) ## 00000250 @@ -28,21 +28,21 @@ glabel func_809BA028 /* 01DAC 809BA08C 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 /* 01DB0 809BA090 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 01DB4 809BA094 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 01DB8 809BA098 46120102 */ mul.s $f4, $f0, $f18 -/* 01DBC 809BA09C 8FA4001C */ lw $a0, 0x001C($sp) +/* 01DB8 809BA098 46120102 */ mul.s $f4, $f0, $f18 +/* 01DBC 809BA09C 8FA4001C */ lw $a0, 0x001C($sp) /* 01DC0 809BA0A0 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 01DC4 809BA0A4 44818000 */ mtc1 $at, $f16 ## $f16 = 7.00 /* 01DC8 809BA0A8 3C05809C */ lui $a1, %hi(func_809BA0D8) ## $a1 = 809C0000 /* 01DCC 809BA0AC 24A5A0D8 */ addiu $a1, $a1, %lo(func_809BA0D8) ## $a1 = 809BA0D8 /* 01DD0 809BA0B0 E490027C */ swc1 $f16, 0x027C($a0) ## 0000027C -/* 01DD4 809BA0B4 46062200 */ add.s $f8, $f4, $f6 -/* 01DD8 809BA0B8 4600428D */ trunc.w.s $f10, $f8 -/* 01DDC 809BA0BC 44185000 */ mfc1 $t8, $f10 -/* 01DE0 809BA0C0 0C26E0B8 */ jal func_809B82E0 +/* 01DD4 809BA0B4 46062200 */ add.s $f8, $f4, $f6 +/* 01DD8 809BA0B8 4600428D */ trunc.w.s $f10, $f8 +/* 01DDC 809BA0BC 44185000 */ mfc1 $t8, $f10 +/* 01DE0 809BA0C0 0C26E0B8 */ jal func_809B82E0 /* 01DE4 809BA0C4 AC980260 */ sw $t8, 0x0260($a0) ## 00000260 -/* 01DE8 809BA0C8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01DE8 809BA0C8 8FBF0014 */ lw $ra, 0x0014($sp) /* 01DEC 809BA0CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01DF0 809BA0D0 03E00008 */ jr $ra +/* 01DF0 809BA0D0 03E00008 */ jr $ra /* 01DF4 809BA0D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s index e57cee7b08..f84a7f921d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s @@ -1,136 +1,136 @@ glabel func_809BA0D8 /* 01DF8 809BA0D8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01DFC 809BA0DC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01E00 809BA0E0 AFB00020 */ sw $s0, 0x0020($sp) -/* 01E04 809BA0E4 AFA50054 */ sw $a1, 0x0054($sp) +/* 01DFC 809BA0DC AFBF0024 */ sw $ra, 0x0024($sp) +/* 01E00 809BA0E0 AFB00020 */ sw $s0, 0x0020($sp) +/* 01E04 809BA0E4 AFA50054 */ sw $a1, 0x0054($sp) /* 01E08 809BA0E8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01E0C 809BA0EC C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 /* 01E10 809BA0F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01E14 809BA0F4 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 -/* 01E18 809BA0F8 46040032 */ c.eq.s $f0, $f4 +/* 01E18 809BA0F8 46040032 */ c.eq.s $f0, $f4 /* 01E1C 809BA0FC 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 /* 01E20 809BA100 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01E24 809BA104 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 01E28 809BA108 45020098 */ bc1fl .L809BA36C -/* 01E2C 809BA10C 44050000 */ mfc1 $a1, $f0 +/* 01E28 809BA108 45020098 */ bc1fl .L809BA36C +/* 01E2C 809BA10C 44050000 */ mfc1 $a1, $f0 /* 01E30 809BA110 0C01E027 */ jal Math_Vec3f_Pitch - -/* 01E34 809BA114 AFA4002C */ sw $a0, 0x002C($sp) -/* 01E38 809BA118 00022400 */ sll $a0, $v0, 16 -/* 01E3C 809BA11C A7A20042 */ sh $v0, 0x0042($sp) + +/* 01E34 809BA114 AFA4002C */ sw $a0, 0x002C($sp) +/* 01E38 809BA118 00022400 */ sll $a0, $v0, 16 +/* 01E3C 809BA11C A7A20042 */ sh $v0, 0x0042($sp) /* 01E40 809BA120 0C01DE1C */ jal Math_Sins ## sins? -/* 01E44 809BA124 00042403 */ sra $a0, $a0, 16 +/* 01E44 809BA124 00042403 */ sra $a0, $a0, 16 /* 01E48 809BA128 C606027C */ lwc1 $f6, 0x027C($s0) ## 0000027C -/* 01E4C 809BA12C 87A40042 */ lh $a0, 0x0042($sp) -/* 01E50 809BA130 46060202 */ mul.s $f8, $f0, $f6 +/* 01E4C 809BA12C 87A40042 */ lh $a0, 0x0042($sp) +/* 01E50 809BA130 46060202 */ mul.s $f8, $f0, $f6 /* 01E54 809BA134 0C01DE0D */ jal Math_Coss ## coss? -/* 01E58 809BA138 E7A8003C */ swc1 $f8, 0x003C($sp) +/* 01E58 809BA138 E7A8003C */ swc1 $f8, 0x003C($sp) /* 01E5C 809BA13C C60A027C */ lwc1 $f10, 0x027C($s0) ## 0000027C -/* 01E60 809BA140 460A0402 */ mul.s $f16, $f0, $f10 -/* 01E64 809BA144 E7B00038 */ swc1 $f16, 0x0038($sp) +/* 01E60 809BA140 460A0402 */ mul.s $f16, $f0, $f10 +/* 01E64 809BA144 E7B00038 */ swc1 $f16, 0x0038($sp) /* 01E68 809BA148 0C01DE1C */ jal Math_Sins ## sins? /* 01E6C 809BA14C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 01E70 809BA150 C7B20038 */ lwc1 $f18, 0x0038($sp) +/* 01E70 809BA150 C7B20038 */ lwc1 $f18, 0x0038($sp) /* 01E74 809BA154 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 01E78 809BA158 46120082 */ mul.s $f2, $f0, $f18 +/* 01E78 809BA158 46120082 */ mul.s $f2, $f0, $f18 /* 01E7C 809BA15C 0C01DE0D */ jal Math_Coss ## coss? -/* 01E80 809BA160 E7A20048 */ swc1 $f2, 0x0048($sp) -/* 01E84 809BA164 C7A20048 */ lwc1 $f2, 0x0048($sp) +/* 01E80 809BA160 E7A20048 */ swc1 $f2, 0x0048($sp) +/* 01E84 809BA164 C7A20048 */ lwc1 $f2, 0x0048($sp) /* 01E88 809BA168 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01E8C 809BA16C C7A40038 */ lwc1 $f4, 0x0038($sp) +/* 01E8C 809BA16C C7A40038 */ lwc1 $f4, 0x0038($sp) /* 01E90 809BA170 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01E94 809BA174 4602303E */ c.le.s $f6, $f2 -/* 01E98 809BA178 46040302 */ mul.s $f12, $f0, $f4 -/* 01E9C 809BA17C 8FA4002C */ lw $a0, 0x002C($sp) +/* 01E94 809BA174 4602303E */ c.le.s $f6, $f2 +/* 01E98 809BA178 46040302 */ mul.s $f12, $f0, $f4 +/* 01E9C 809BA17C 8FA4002C */ lw $a0, 0x002C($sp) /* 01EA0 809BA180 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01EA4 809BA184 45020004 */ bc1fl .L809BA198 -/* 01EA8 809BA188 46001007 */ neg.s $f0, $f2 -/* 01EAC 809BA18C 10000002 */ beq $zero, $zero, .L809BA198 -/* 01EB0 809BA190 46001006 */ mov.s $f0, $f2 -/* 01EB4 809BA194 46001007 */ neg.s $f0, $f2 +/* 01EA4 809BA184 45020004 */ bc1fl .L809BA198 +/* 01EA8 809BA188 46001007 */ neg.s $f0, $f2 +/* 01EAC 809BA18C 10000002 */ beq $zero, $zero, .L809BA198 +/* 01EB0 809BA190 46001006 */ mov.s $f0, $f2 +/* 01EB4 809BA194 46001007 */ neg.s $f0, $f2 .L809BA198: /* 01EB8 809BA198 8E050290 */ lw $a1, 0x0290($s0) ## 00000290 -/* 01EBC 809BA19C 44070000 */ mfc1 $a3, $f0 -/* 01EC0 809BA1A0 E7AC0044 */ swc1 $f12, 0x0044($sp) +/* 01EBC 809BA19C 44070000 */ mfc1 $a3, $f0 +/* 01EC0 809BA1A0 E7AC0044 */ swc1 $f12, 0x0044($sp) /* 01EC4 809BA1A4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01EC8 809BA1A8 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01ECC 809BA1AC C7AE003C */ lwc1 $f14, 0x003C($sp) + +/* 01EC8 809BA1A8 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01ECC 809BA1AC C7AE003C */ lwc1 $f14, 0x003C($sp) /* 01ED0 809BA1B0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 01ED4 809BA1B4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01ED8 809BA1B8 C7AC0044 */ lwc1 $f12, 0x0044($sp) -/* 01EDC 809BA1BC 460E503E */ c.le.s $f10, $f14 -/* 01EE0 809BA1C0 46000086 */ mov.s $f2, $f0 +/* 01ED8 809BA1B8 C7AC0044 */ lwc1 $f12, 0x0044($sp) +/* 01EDC 809BA1BC 460E503E */ c.le.s $f10, $f14 +/* 01EE0 809BA1C0 46000086 */ mov.s $f2, $f0 /* 01EE4 809BA1C4 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 01EE8 809BA1C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01EEC 809BA1CC 45020004 */ bc1fl .L809BA1E0 -/* 01EF0 809BA1D0 46007007 */ neg.s $f0, $f14 -/* 01EF4 809BA1D4 10000002 */ beq $zero, $zero, .L809BA1E0 -/* 01EF8 809BA1D8 46007006 */ mov.s $f0, $f14 -/* 01EFC 809BA1DC 46007007 */ neg.s $f0, $f14 +/* 01EEC 809BA1CC 45020004 */ bc1fl .L809BA1E0 +/* 01EF0 809BA1D0 46007007 */ neg.s $f0, $f14 +/* 01EF4 809BA1D4 10000002 */ beq $zero, $zero, .L809BA1E0 +/* 01EF8 809BA1D8 46007006 */ mov.s $f0, $f14 +/* 01EFC 809BA1DC 46007007 */ neg.s $f0, $f14 .L809BA1E0: /* 01F00 809BA1E0 8E050294 */ lw $a1, 0x0294($s0) ## 00000294 -/* 01F04 809BA1E4 44070000 */ mfc1 $a3, $f0 -/* 01F08 809BA1E8 E7AC0044 */ swc1 $f12, 0x0044($sp) -/* 01F0C 809BA1EC E7A2004C */ swc1 $f2, 0x004C($sp) +/* 01F04 809BA1E4 44070000 */ mfc1 $a3, $f0 +/* 01F08 809BA1E8 E7AC0044 */ swc1 $f12, 0x0044($sp) +/* 01F0C 809BA1EC E7A2004C */ swc1 $f2, 0x004C($sp) /* 01F10 809BA1F0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01F14 809BA1F4 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01F18 809BA1F8 C7AC0044 */ lwc1 $f12, 0x0044($sp) + +/* 01F14 809BA1F4 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01F18 809BA1F8 C7AC0044 */ lwc1 $f12, 0x0044($sp) /* 01F1C 809BA1FC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 01F20 809BA200 C7A2004C */ lwc1 $f2, 0x004C($sp) +/* 01F20 809BA200 C7A2004C */ lwc1 $f2, 0x004C($sp) /* 01F24 809BA204 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01F28 809BA208 460C903E */ c.le.s $f18, $f12 +/* 01F28 809BA208 460C903E */ c.le.s $f18, $f12 /* 01F2C 809BA20C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 01F30 809BA210 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01F34 809BA214 46001080 */ add.s $f2, $f2, $f0 -/* 01F38 809BA218 45020004 */ bc1fl .L809BA22C -/* 01F3C 809BA21C 46006007 */ neg.s $f0, $f12 -/* 01F40 809BA220 10000002 */ beq $zero, $zero, .L809BA22C -/* 01F44 809BA224 46006006 */ mov.s $f0, $f12 -/* 01F48 809BA228 46006007 */ neg.s $f0, $f12 +/* 01F34 809BA214 46001080 */ add.s $f2, $f2, $f0 +/* 01F38 809BA218 45020004 */ bc1fl .L809BA22C +/* 01F3C 809BA21C 46006007 */ neg.s $f0, $f12 +/* 01F40 809BA220 10000002 */ beq $zero, $zero, .L809BA22C +/* 01F44 809BA224 46006006 */ mov.s $f0, $f12 +/* 01F48 809BA228 46006007 */ neg.s $f0, $f12 .L809BA22C: /* 01F4C 809BA22C 8E050298 */ lw $a1, 0x0298($s0) ## 00000298 -/* 01F50 809BA230 44070000 */ mfc1 $a3, $f0 -/* 01F54 809BA234 E7A2004C */ swc1 $f2, 0x004C($sp) +/* 01F50 809BA230 44070000 */ mfc1 $a3, $f0 +/* 01F54 809BA234 E7A2004C */ swc1 $f2, 0x004C($sp) /* 01F58 809BA238 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01F5C 809BA23C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01F60 809BA240 C7A2004C */ lwc1 $f2, 0x004C($sp) -/* 01F64 809BA244 46001080 */ add.s $f2, $f2, $f0 + +/* 01F5C 809BA23C E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01F60 809BA240 C7A2004C */ lwc1 $f2, 0x004C($sp) +/* 01F64 809BA244 46001080 */ add.s $f2, $f2, $f0 /* 01F68 809BA248 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 01F6C 809BA24C E7A2004C */ swc1 $f2, 0x004C($sp) +/* 01F6C 809BA24C E7A2004C */ swc1 $f2, 0x004C($sp) /* 01F70 809BA250 3C01809C */ lui $at, %hi(D_809BBCA4) ## $at = 809C0000 -/* 01F74 809BA254 C426BCA4 */ lwc1 $f6, %lo(D_809BBCA4)($at) +/* 01F74 809BA254 C426BCA4 */ lwc1 $f6, %lo(D_809BBCA4)($at) /* 01F78 809BA258 3C01809C */ lui $at, %hi(D_809BBCA8) ## $at = 809C0000 -/* 01F7C 809BA25C C428BCA8 */ lwc1 $f8, %lo(D_809BBCA8)($at) -/* 01F80 809BA260 C7A2004C */ lwc1 $f2, 0x004C($sp) +/* 01F7C 809BA25C C428BCA8 */ lwc1 $f8, %lo(D_809BBCA8)($at) +/* 01F80 809BA260 C7A2004C */ lwc1 $f2, 0x004C($sp) /* 01F84 809BA264 C6120274 */ lwc1 $f18, 0x0274($s0) ## 00000274 -/* 01F88 809BA268 46080282 */ mul.s $f10, $f0, $f8 +/* 01F88 809BA268 46080282 */ mul.s $f10, $f0, $f8 /* 01F8C 809BA26C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01F90 809BA270 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01F94 809BA274 46081032 */ c.eq.s $f2, $f8 -/* 01F98 809BA278 460A3400 */ add.s $f16, $f6, $f10 -/* 01F9C 809BA27C 46109100 */ add.s $f4, $f18, $f16 -/* 01FA0 809BA280 45000028 */ bc1f .L809BA324 +/* 01F94 809BA274 46081032 */ c.eq.s $f2, $f8 +/* 01F98 809BA278 460A3400 */ add.s $f16, $f6, $f10 +/* 01F9C 809BA27C 46109100 */ add.s $f4, $f18, $f16 +/* 01FA0 809BA280 45000028 */ bc1f .L809BA324 /* 01FA4 809BA284 E6040274 */ swc1 $f4, 0x0274($s0) ## 00000274 /* 01FA8 809BA288 8E0E0260 */ lw $t6, 0x0260($s0) ## 00000260 /* 01FAC 809BA28C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01FB0 809BA290 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 01FB4 809BA294 15E00015 */ bne $t7, $zero, .L809BA2EC +/* 01FB4 809BA294 15E00015 */ bne $t7, $zero, .L809BA2EC /* 01FB8 809BA298 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 -/* 01FBC 809BA29C 0C26E7D8 */ jal func_809B9F60 -/* 01FC0 809BA2A0 8FA50054 */ lw $a1, 0x0054($sp) -/* 01FC4 809BA2A4 0C26E7CA */ jal func_809B9F28 +/* 01FBC 809BA29C 0C26E7D8 */ jal func_809B9F60 +/* 01FC0 809BA2A0 8FA50054 */ lw $a1, 0x0054($sp) +/* 01FC4 809BA2A4 0C26E7CA */ jal func_809B9F28 /* 01FC8 809BA2A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01FCC 809BA2AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01FD0 809BA2B0 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 -/* 01FD4 809BA2B4 0C0294BE */ jal func_800A52F8 +/* 01FD4 809BA2B4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 01FD8 809BA2B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01FDC 809BA2BC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -139,19 +139,19 @@ glabel func_809BA0D8 /* 01FE8 809BA2C8 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 01FEC 809BA2CC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 01FF0 809BA2D0 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 -/* 01FF4 809BA2D4 46060282 */ mul.s $f10, $f0, $f6 -/* 01FF8 809BA2D8 46125400 */ add.s $f16, $f10, $f18 -/* 01FFC 809BA2DC 4600810D */ trunc.w.s $f4, $f16 -/* 02000 809BA2E0 44082000 */ mfc1 $t0, $f4 -/* 02004 809BA2E4 1000000B */ beq $zero, $zero, .L809BA314 +/* 01FF4 809BA2D4 46060282 */ mul.s $f10, $f0, $f6 +/* 01FF8 809BA2D8 46125400 */ add.s $f16, $f10, $f18 +/* 01FFC 809BA2DC 4600810D */ trunc.w.s $f4, $f16 +/* 02000 809BA2E0 44082000 */ mfc1 $t0, $f4 +/* 02004 809BA2E4 1000000B */ beq $zero, $zero, .L809BA314 /* 02008 809BA2E8 AE080260 */ sw $t0, 0x0260($s0) ## 00000260 .L809BA2EC: /* 0200C 809BA2EC 8E09025C */ lw $t1, 0x025C($s0) ## 0000025C /* 02010 809BA2F0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02014 809BA2F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02018 809BA2F8 51200004 */ beql $t1, $zero, .L809BA30C +/* 02018 809BA2F8 51200004 */ beql $t1, $zero, .L809BA30C /* 0201C 809BA2FC 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 -/* 02020 809BA300 0C0294BE */ jal func_800A52F8 +/* 02020 809BA300 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 02024 809BA304 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 02028 809BA308 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 .L809BA30C: @@ -160,7 +160,7 @@ glabel func_809BA0D8 .L809BA314: /* 02034 809BA314 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 02038 809BA318 AE00025C */ sw $zero, 0x025C($s0) ## 0000025C -/* 0203C 809BA31C 10000005 */ beq $zero, $zero, .L809BA334 +/* 0203C 809BA31C 10000005 */ beq $zero, $zero, .L809BA334 /* 02040 809BA320 E608027C */ swc1 $f8, 0x027C($s0) ## 0000027C .L809BA324: /* 02044 809BA324 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 @@ -171,91 +171,91 @@ glabel func_809BA0D8 /* 02054 809BA334 920D02BC */ lbu $t5, 0x02BC($s0) ## 000002BC /* 02058 809BA338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0205C 809BA33C 31AE0002 */ andi $t6, $t5, 0x0002 ## $t6 = 00000000 -/* 02060 809BA340 51C00007 */ beql $t6, $zero, .L809BA360 +/* 02060 809BA340 51C00007 */ beql $t6, $zero, .L809BA360 /* 02064 809BA344 86190032 */ lh $t9, 0x0032($s0) ## 00000032 /* 02068 809BA348 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0206C 809BA34C 240538CB */ addiu $a1, $zero, 0x38CB ## $a1 = 000038CB /* 02070 809BA350 920F02BC */ lbu $t7, 0x02BC($s0) ## 000002BC /* 02074 809BA354 31F8FFFD */ andi $t8, $t7, 0xFFFD ## $t8 = 00000000 /* 02078 809BA358 A21802BC */ sb $t8, 0x02BC($s0) ## 000002BC /* 0207C 809BA35C 86190032 */ lh $t9, 0x0032($s0) ## 00000032 .L809BA360: -/* 02080 809BA360 1000000D */ beq $zero, $zero, .L809BA398 +/* 02080 809BA360 1000000D */ beq $zero, $zero, .L809BA398 /* 02084 809BA364 A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 -/* 02088 809BA368 44050000 */ mfc1 $a1, $f0 +/* 02088 809BA368 44050000 */ mfc1 $a1, $f0 .L809BA36C: /* 0208C 809BA36C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 02090 809BA370 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02094 809BA374 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 02094 809BA374 E7A00010 */ swc1 $f0, 0x0010($sp) /* 02098 809BA378 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0209C 809BA37C 00000000 */ nop -/* 020A0 809BA380 460A0032 */ c.eq.s $f0, $f10 +/* 020A0 809BA380 460A0032 */ c.eq.s $f0, $f10 /* 020A4 809BA384 00000000 */ nop -/* 020A8 809BA388 45000003 */ bc1f .L809BA398 +/* 020A8 809BA388 45000003 */ bc1f .L809BA398 /* 020AC 809BA38C 00000000 */ nop -/* 020B0 809BA390 0C26E7CA */ jal func_809B9F28 +/* 020B0 809BA390 0C26E7CA */ jal func_809B9F28 /* 020B4 809BA394 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L809BA398: /* 020B8 809BA398 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 020BC 809BA39C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 020C0 809BA3A0 C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 -/* 020C4 809BA3A4 4600940D */ trunc.w.s $f16, $f18 -/* 020C8 809BA3A8 44098000 */ mfc1 $t1, $f16 +/* 020C4 809BA3A4 4600940D */ trunc.w.s $f16, $f18 +/* 020C8 809BA3A8 44098000 */ mfc1 $t1, $f16 /* 020CC 809BA3AC 00000000 */ nop -/* 020D0 809BA3B0 5520000D */ bnel $t1, $zero, .L809BA3E8 +/* 020D0 809BA3B0 5520000D */ bnel $t1, $zero, .L809BA3E8 /* 020D4 809BA3B4 C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 /* 020D8 809BA3B8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 020DC 809BA3BC 00000000 */ nop /* 020E0 809BA3C0 3C01809C */ lui $at, %hi(D_809BBCAC) ## $at = 809C0000 -/* 020E4 809BA3C4 C424BCAC */ lwc1 $f4, %lo(D_809BBCAC)($at) +/* 020E4 809BA3C4 C424BCAC */ lwc1 $f4, %lo(D_809BBCAC)($at) /* 020E8 809BA3C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020EC 809BA3CC 4604003E */ c.le.s $f0, $f4 +/* 020EC 809BA3CC 4604003E */ c.le.s $f0, $f4 /* 020F0 809BA3D0 00000000 */ nop -/* 020F4 809BA3D4 45020004 */ bc1fl .L809BA3E8 +/* 020F4 809BA3D4 45020004 */ bc1fl .L809BA3E8 /* 020F8 809BA3D8 C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 /* 020FC 809BA3DC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02100 809BA3E0 240538CA */ addiu $a1, $zero, 0x38CA ## $a1 = 000038CA /* 02104 809BA3E4 C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 .L809BA3E8: /* 02108 809BA3E8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0210C 809BA3EC C612027C */ lwc1 $f18, 0x027C($s0) ## 0000027C -/* 02110 809BA3F0 4600418D */ trunc.w.s $f6, $f8 -/* 02114 809BA3F4 46125032 */ c.eq.s $f10, $f18 -/* 02118 809BA3F8 44023000 */ mfc1 $v0, $f6 -/* 0211C 809BA3FC 4503000A */ bc1tl .L809BA428 +/* 02110 809BA3F0 4600418D */ trunc.w.s $f6, $f8 +/* 02114 809BA3F4 46125032 */ c.eq.s $f10, $f18 +/* 02118 809BA3F8 44023000 */ mfc1 $v0, $f6 +/* 0211C 809BA3FC 4503000A */ bc1tl .L809BA428 /* 02120 809BA400 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02124 809BA404 10400002 */ beq $v0, $zero, .L809BA410 +/* 02124 809BA404 10400002 */ beq $v0, $zero, .L809BA410 /* 02128 809BA408 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0212C 809BA40C 14410005 */ bne $v0, $at, .L809BA424 +/* 0212C 809BA40C 14410005 */ bne $v0, $at, .L809BA424 .L809BA410: /* 02130 809BA410 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02134 809BA414 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02138 809BA418 240538C9 */ addiu $a1, $zero, 0x38C9 ## $a1 = 000038C9 -/* 0213C 809BA41C 1000000A */ beq $zero, $zero, .L809BA448 -/* 02140 809BA420 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0213C 809BA41C 1000000A */ beq $zero, $zero, .L809BA448 +/* 02140 809BA420 8FBF0024 */ lw $ra, 0x0024($sp) .L809BA424: /* 02144 809BA424 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L809BA428: -/* 02148 809BA428 10410004 */ beq $v0, $at, .L809BA43C +/* 02148 809BA428 10410004 */ beq $v0, $at, .L809BA43C /* 0214C 809BA42C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02150 809BA430 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 02154 809BA434 54410004 */ bnel $v0, $at, .L809BA448 -/* 02158 809BA438 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02154 809BA434 54410004 */ bnel $v0, $at, .L809BA448 +/* 02158 809BA438 8FBF0024 */ lw $ra, 0x0024($sp) .L809BA43C: /* 0215C 809BA43C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02160 809BA440 240538C8 */ addiu $a1, $zero, 0x38C8 ## $a1 = 000038C8 -/* 02164 809BA444 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02164 809BA444 8FBF0024 */ lw $ra, 0x0024($sp) .L809BA448: -/* 02168 809BA448 8FB00020 */ lw $s0, 0x0020($sp) +/* 02168 809BA448 8FB00020 */ lw $s0, 0x0020($sp) /* 0216C 809BA44C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 02170 809BA450 03E00008 */ jr $ra +/* 02170 809BA450 03E00008 */ jr $ra /* 02174 809BA454 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s index 453927822a..46b913363f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s @@ -15,7 +15,7 @@ glabel func_809BA458 /* 021AC 809BA48C 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 021B0 809BA490 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 021B4 809BA494 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 021B8 809BA498 0C0294BE */ jal func_800A52F8 +/* 021B8 809BA498 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 021BC 809BA49C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC /* 021C0 809BA4A0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 021C4 809BA4A4 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s index 7d8638e81a..9a58a7c9fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s @@ -1,13 +1,13 @@ glabel func_809BA590 /* 022B0 809BA590 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 022B4 809BA594 AFBF0014 */ sw $ra, 0x0014($sp) +/* 022B4 809BA594 AFBF0014 */ sw $ra, 0x0014($sp) /* 022B8 809BA598 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 022BC 809BA59C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 022C0 809BA5A0 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 -/* 022C4 809BA5A4 AFA60018 */ sw $a2, 0x0018($sp) -/* 022C8 809BA5A8 0C0294BE */ jal func_800A52F8 +/* 022C4 809BA5A4 AFA60018 */ sw $a2, 0x0018($sp) +/* 022C8 809BA5A8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 022CC 809BA5AC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 022D0 809BA5B0 8FA60018 */ lw $a2, 0x0018($sp) +/* 022D0 809BA5B0 8FA60018 */ lw $a2, 0x0018($sp) /* 022D4 809BA5B4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 022D8 809BA5B8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 022DC 809BA5BC 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 @@ -22,21 +22,21 @@ glabel func_809BA590 /* 022FC 809BA5DC 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 02300 809BA5E0 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 02304 809BA5E4 44815000 */ mtc1 $at, $f10 ## $f10 = 180.00 -/* 02308 809BA5E8 46060202 */ mul.s $f8, $f0, $f6 -/* 0230C 809BA5EC 8FA40018 */ lw $a0, 0x0018($sp) +/* 02308 809BA5E8 46060202 */ mul.s $f8, $f0, $f6 +/* 0230C 809BA5EC 8FA40018 */ lw $a0, 0x0018($sp) /* 02310 809BA5F0 3C05809C */ lui $a1, %hi(func_809BA628) ## $a1 = 809C0000 /* 02314 809BA5F4 24A5A628 */ addiu $a1, $a1, %lo(func_809BA628) ## $a1 = 809BA628 /* 02318 809BA5F8 8488008A */ lh $t0, 0x008A($a0) ## 0000008A /* 0231C 809BA5FC A48000B8 */ sh $zero, 0x00B8($a0) ## 000000B8 -/* 02320 809BA600 460A4400 */ add.s $f16, $f8, $f10 +/* 02320 809BA600 460A4400 */ add.s $f16, $f8, $f10 /* 02324 809BA604 A48800B6 */ sh $t0, 0x00B6($a0) ## 000000B6 -/* 02328 809BA608 4600848D */ trunc.w.s $f18, $f16 -/* 0232C 809BA60C 44199000 */ mfc1 $t9, $f18 -/* 02330 809BA610 0C26E0B8 */ jal func_809B82E0 +/* 02328 809BA608 4600848D */ trunc.w.s $f18, $f16 +/* 0232C 809BA60C 44199000 */ mfc1 $t9, $f18 +/* 02330 809BA610 0C26E0B8 */ jal func_809B82E0 /* 02334 809BA614 A499026E */ sh $t9, 0x026E($a0) ## 0000026E -/* 02338 809BA618 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02338 809BA618 8FBF0014 */ lw $ra, 0x0014($sp) /* 0233C 809BA61C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02340 809BA620 03E00008 */ jr $ra +/* 02340 809BA620 03E00008 */ jr $ra /* 02344 809BA624 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s index 363d9af87d..511a181ecf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s @@ -1,37 +1,37 @@ glabel EnBigokuta_Draw /* 0244C 809BF0AC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 02450 809BF0B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 02454 809BF0B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 02458 809BF0B8 AFA50074 */ sw $a1, 0x0074($sp) +/* 02450 809BF0B0 AFBF002C */ sw $ra, 0x002C($sp) +/* 02454 809BF0B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 02458 809BF0B8 AFA50074 */ sw $a1, 0x0074($sp) /* 0245C 809BF0BC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02460 809BF0C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02464 809BF0C4 3C06809C */ lui $a2, %hi(D_809BF500) ## $a2 = 809C0000 /* 02468 809BF0C8 24C6F500 */ addiu $a2, $a2, %lo(D_809BF500) ## $a2 = 809BF500 /* 0246C 809BF0CC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 02470 809BF0D0 240707E1 */ addiu $a3, $zero, 0x07E1 ## $a3 = 000007E1 -/* 02474 809BF0D4 0C031AB1 */ jal func_800C6AC4 -/* 02478 809BF0D8 AFA50068 */ sw $a1, 0x0068($sp) +/* 02474 809BF0D4 0C031AB1 */ jal func_800C6AC4 +/* 02478 809BF0D8 AFA50068 */ sw $a1, 0x0068($sp) /* 0247C 809BF0DC 8E0F0190 */ lw $t7, 0x0190($s0) ## 00000190 /* 02480 809BF0E0 3C05809C */ lui $a1, %hi(func_809BE26C) ## $a1 = 809C0000 /* 02484 809BF0E4 24A5E26C */ addiu $a1, $a1, %lo(func_809BE26C) ## $a1 = 809BE26C -/* 02488 809BF0E8 14AF0008 */ bne $a1, $t7, .L809BF10C -/* 0248C 809BF0EC 8FA80068 */ lw $t0, 0x0068($sp) +/* 02488 809BF0E8 14AF0008 */ bne $a1, $t7, .L809BF10C +/* 0248C 809BF0EC 8FA80068 */ lw $t0, 0x0068($sp) /* 02490 809BF0F0 86180196 */ lh $t8, 0x0196($s0) ## 00000196 -/* 02494 809BF0F4 57000006 */ bnel $t8, $zero, .L809BF110 -/* 02498 809BF0F8 8FA90074 */ lw $t1, 0x0074($sp) +/* 02494 809BF0F4 57000006 */ bnel $t8, $zero, .L809BF110 +/* 02498 809BF0F8 8FA90074 */ lw $t1, 0x0074($sp) /* 0249C 809BF0FC 86190198 */ lh $t9, 0x0198($s0) ## 00000198 -/* 024A0 809BF100 8FAA0074 */ lw $t2, 0x0074($sp) -/* 024A4 809BF104 53200053 */ beql $t9, $zero, .L809BF254 +/* 024A0 809BF100 8FAA0074 */ lw $t2, 0x0074($sp) +/* 024A4 809BF104 53200053 */ beql $t9, $zero, .L809BF254 /* 024A8 809BF108 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 .L809BF10C: -/* 024AC 809BF10C 8FA90074 */ lw $t1, 0x0074($sp) +/* 024AC 809BF10C 8FA90074 */ lw $t1, 0x0074($sp) .L809BF110: /* 024B0 809BF110 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 024B4 809BF114 AFA80068 */ sw $t0, 0x0068($sp) -/* 024B8 809BF118 0C024F46 */ jal func_80093D18 -/* 024BC 809BF11C AFA5003C */ sw $a1, 0x003C($sp) -/* 024C0 809BF120 8FA80068 */ lw $t0, 0x0068($sp) -/* 024C4 809BF124 8FA5003C */ lw $a1, 0x003C($sp) +/* 024B4 809BF114 AFA80068 */ sw $t0, 0x0068($sp) +/* 024B8 809BF118 0C024F46 */ jal func_80093D18 +/* 024BC 809BF11C AFA5003C */ sw $a1, 0x003C($sp) +/* 024C0 809BF120 8FA80068 */ lw $t0, 0x0068($sp) +/* 024C4 809BF124 8FA5003C */ lw $a1, 0x003C($sp) /* 024C8 809BF128 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 024CC 809BF12C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 024D0 809BF130 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 @@ -50,54 +50,54 @@ glabel EnBigokuta_Draw /* 02504 809BF164 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 /* 02508 809BF168 86030196 */ lh $v1, 0x0196($s0) ## 00000196 /* 0250C 809BF16C 30780001 */ andi $t8, $v1, 0x0001 ## $t8 = 00000000 -/* 02510 809BF170 5300002C */ beql $t8, $zero, .L809BF224 +/* 02510 809BF170 5300002C */ beql $t8, $zero, .L809BF224 /* 02514 809BF174 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 02518 809BF178 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 /* 0251C 809BF17C 3C19809C */ lui $t9, %hi(func_809BE180) ## $t9 = 809C0000 /* 02520 809BF180 2739E180 */ addiu $t9, $t9, %lo(func_809BE180) ## $t9 = 809BE180 -/* 02524 809BF184 17220003 */ bne $t9, $v0, .L809BF194 -/* 02528 809BF188 28610008 */ slti $at, $v1, 0x0008 -/* 0252C 809BF18C 10200005 */ beq $at, $zero, .L809BF1A4 +/* 02524 809BF184 17220003 */ bne $t9, $v0, .L809BF194 +/* 02528 809BF188 28610008 */ slti $at, $v1, 0x0008 +/* 0252C 809BF18C 10200005 */ beq $at, $zero, .L809BF1A4 /* 02530 809BF190 00000000 */ nop .L809BF194: -/* 02534 809BF194 14A20022 */ bne $a1, $v0, .L809BF220 -/* 02538 809BF198 2861000A */ slti $at, $v1, 0x000A -/* 0253C 809BF19C 54200021 */ bnel $at, $zero, .L809BF224 +/* 02534 809BF194 14A20022 */ bne $a1, $v0, .L809BF220 +/* 02538 809BF198 2861000A */ slti $at, $v1, 0x000A +/* 0253C 809BF19C 54200021 */ bnel $at, $zero, .L809BF224 /* 02540 809BF1A0 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 .L809BF1A4: /* 02544 809BF1A4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 02548 809BF1A8 00000000 */ nop /* 0254C 809BF1AC 3C01809C */ lui $at, %hi(D_809BF580) ## $at = 809C0000 -/* 02550 809BF1B0 C424F580 */ lwc1 $f4, %lo(D_809BF580)($at) -/* 02554 809BF1B4 46040182 */ mul.s $f6, $f0, $f4 +/* 02550 809BF1B0 C424F580 */ lwc1 $f4, %lo(D_809BF580)($at) +/* 02554 809BF1B4 46040182 */ mul.s $f6, $f0, $f4 /* 02558 809BF1B8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 0255C 809BF1BC E7A6004C */ swc1 $f6, 0x004C($sp) +/* 0255C 809BF1BC E7A6004C */ swc1 $f6, 0x004C($sp) /* 02560 809BF1C0 3C01809C */ lui $at, %hi(D_809BF584) ## $at = 809C0000 -/* 02564 809BF1C4 C428F584 */ lwc1 $f8, %lo(D_809BF584)($at) +/* 02564 809BF1C4 C428F584 */ lwc1 $f8, %lo(D_809BF584)($at) /* 02568 809BF1C8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0256C 809BF1CC 46080302 */ mul.s $f12, $f0, $f8 -/* 02570 809BF1D0 0C034348 */ jal Matrix_RotateY -/* 02574 809BF1D4 E7AC0048 */ swc1 $f12, 0x0048($sp) -/* 02578 809BF1D8 C7AC004C */ lwc1 $f12, 0x004C($sp) -/* 0257C 809BF1DC 0C0342DC */ jal Matrix_RotateX +/* 0256C 809BF1CC 46080302 */ mul.s $f12, $f0, $f8 +/* 02570 809BF1D0 0C034348 */ jal Matrix_RotateY +/* 02574 809BF1D4 E7AC0048 */ swc1 $f12, 0x0048($sp) +/* 02578 809BF1D8 C7AC004C */ lwc1 $f12, 0x004C($sp) +/* 0257C 809BF1DC 0C0342DC */ jal Matrix_RotateX /* 02580 809BF1E0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 02584 809BF1E4 3C01809C */ lui $at, %hi(D_809BF588) ## $at = 809C0000 -/* 02588 809BF1E8 C42CF588 */ lwc1 $f12, %lo(D_809BF588)($at) +/* 02588 809BF1E8 C42CF588 */ lwc1 $f12, %lo(D_809BF588)($at) /* 0258C 809BF1EC 3C01809C */ lui $at, %hi(D_809BF58C) ## $at = 809C0000 -/* 02590 809BF1F0 C42EF58C */ lwc1 $f14, %lo(D_809BF58C)($at) -/* 02594 809BF1F4 44066000 */ mfc1 $a2, $f12 -/* 02598 809BF1F8 0C0342A3 */ jal Matrix_Scale +/* 02590 809BF1F0 C42EF58C */ lwc1 $f14, %lo(D_809BF58C)($at) +/* 02594 809BF1F4 44066000 */ mfc1 $a2, $f12 +/* 02598 809BF1F8 0C0342A3 */ jal Matrix_Scale /* 0259C 809BF1FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 025A0 809BF200 C7AC004C */ lwc1 $f12, 0x004C($sp) +/* 025A0 809BF200 C7AC004C */ lwc1 $f12, 0x004C($sp) /* 025A4 809BF204 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 025A8 809BF208 0C0342DC */ jal Matrix_RotateX -/* 025AC 809BF20C 46006307 */ neg.s $f12, $f12 -/* 025B0 809BF210 C7AC0048 */ lwc1 $f12, 0x0048($sp) +/* 025A8 809BF208 0C0342DC */ jal Matrix_RotateX +/* 025AC 809BF20C 46006307 */ neg.s $f12, $f12 +/* 025B0 809BF210 C7AC0048 */ lwc1 $f12, 0x0048($sp) /* 025B4 809BF214 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 025B8 809BF218 0C034348 */ jal Matrix_RotateY -/* 025BC 809BF21C 46006307 */ neg.s $f12, $f12 +/* 025B8 809BF218 0C034348 */ jal Matrix_RotateY +/* 025BC 809BF21C 46006307 */ neg.s $f12, $f12 .L809BF220: /* 025C0 809BF220 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 .L809BF224: @@ -105,18 +105,18 @@ glabel EnBigokuta_Draw /* 025C8 809BF228 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 025CC 809BF22C 3C09809C */ lui $t1, %hi(func_809BEBBC) ## $t1 = 809C0000 /* 025D0 809BF230 2529EBBC */ addiu $t1, $t1, %lo(func_809BEBBC) ## $t1 = 809BEBBC -/* 025D4 809BF234 AFA90010 */ sw $t1, 0x0010($sp) -/* 025D8 809BF238 AFB00018 */ sw $s0, 0x0018($sp) -/* 025DC 809BF23C AFA00014 */ sw $zero, 0x0014($sp) -/* 025E0 809BF240 0C0286B2 */ jal func_800A1AC8 -/* 025E4 809BF244 8FA40074 */ lw $a0, 0x0074($sp) -/* 025E8 809BF248 10000048 */ beq $zero, $zero, .L809BF36C -/* 025EC 809BF24C 8FAB0074 */ lw $t3, 0x0074($sp) +/* 025D4 809BF234 AFA90010 */ sw $t1, 0x0010($sp) +/* 025D8 809BF238 AFB00018 */ sw $s0, 0x0018($sp) +/* 025DC 809BF23C AFA00014 */ sw $zero, 0x0014($sp) +/* 025E0 809BF240 0C0286B2 */ jal SkelAnime_DrawSV +/* 025E4 809BF244 8FA40074 */ lw $a0, 0x0074($sp) +/* 025E8 809BF248 10000048 */ beq $zero, $zero, .L809BF36C +/* 025EC 809BF24C 8FAB0074 */ lw $t3, 0x0074($sp) /* 025F0 809BF250 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 .L809BF254: -/* 025F4 809BF254 0C024F61 */ jal func_80093D84 -/* 025F8 809BF258 AFA80068 */ sw $t0, 0x0068($sp) -/* 025FC 809BF25C 8FA80068 */ lw $t0, 0x0068($sp) +/* 025F4 809BF254 0C024F61 */ jal func_80093D84 +/* 025F8 809BF258 AFA80068 */ sw $t0, 0x0068($sp) +/* 025FC 809BF25C 8FA80068 */ lw $t0, 0x0068($sp) /* 02600 809BF260 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 02604 809BF264 3C0D8011 */ lui $t5, 0x8011 ## $t5 = 80110000 /* 02608 809BF268 8D0302D0 */ lw $v1, 0x02D0($t0) ## 000002D0 @@ -132,42 +132,42 @@ glabel EnBigokuta_Draw /* 02630 809BF290 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 02634 809BF294 AD0E02D0 */ sw $t6, 0x02D0($t0) ## 000002D0 /* 02638 809BF298 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0263C 809BF29C C430F590 */ lwc1 $f16, %lo(D_809BF590)($at) +/* 0263C 809BF29C C430F590 */ lwc1 $f16, %lo(D_809BF590)($at) /* 02640 809BF2A0 C60A0054 */ lwc1 $f10, 0x0054($s0) ## 00000054 /* 02644 809BF2A4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 02648 809BF2A8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 0264C 809BF2AC 46105482 */ mul.s $f18, $f10, $f16 +/* 0264C 809BF2AC 46105482 */ mul.s $f18, $f10, $f16 /* 02650 809BF2B0 4458F800 */ cfc1 $t8, $31 /* 02654 809BF2B4 44D9F800 */ ctc1 $t9, $31 /* 02658 809BF2B8 00000000 */ nop -/* 0265C 809BF2BC 46009124 */ cvt.w.s $f4, $f18 +/* 0265C 809BF2BC 46009124 */ cvt.w.s $f4, $f18 /* 02660 809BF2C0 4459F800 */ cfc1 $t9, $31 /* 02664 809BF2C4 00000000 */ nop /* 02668 809BF2C8 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 0266C 809BF2CC 53200013 */ beql $t9, $zero, .L809BF31C -/* 02670 809BF2D0 44192000 */ mfc1 $t9, $f4 +/* 0266C 809BF2CC 53200013 */ beql $t9, $zero, .L809BF31C +/* 02670 809BF2D0 44192000 */ mfc1 $t9, $f4 /* 02674 809BF2D4 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 02678 809BF2D8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0267C 809BF2DC 46049101 */ sub.s $f4, $f18, $f4 +/* 0267C 809BF2DC 46049101 */ sub.s $f4, $f18, $f4 /* 02680 809BF2E0 44D9F800 */ ctc1 $t9, $31 /* 02684 809BF2E4 00000000 */ nop -/* 02688 809BF2E8 46002124 */ cvt.w.s $f4, $f4 +/* 02688 809BF2E8 46002124 */ cvt.w.s $f4, $f4 /* 0268C 809BF2EC 4459F800 */ cfc1 $t9, $31 /* 02690 809BF2F0 00000000 */ nop /* 02694 809BF2F4 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 02698 809BF2F8 17200005 */ bne $t9, $zero, .L809BF310 +/* 02698 809BF2F8 17200005 */ bne $t9, $zero, .L809BF310 /* 0269C 809BF2FC 00000000 */ nop -/* 026A0 809BF300 44192000 */ mfc1 $t9, $f4 +/* 026A0 809BF300 44192000 */ mfc1 $t9, $f4 /* 026A4 809BF304 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 026A8 809BF308 10000007 */ beq $zero, $zero, .L809BF328 +/* 026A8 809BF308 10000007 */ beq $zero, $zero, .L809BF328 /* 026AC 809BF30C 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L809BF310: -/* 026B0 809BF310 10000005 */ beq $zero, $zero, .L809BF328 +/* 026B0 809BF310 10000005 */ beq $zero, $zero, .L809BF328 /* 026B4 809BF314 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 026B8 809BF318 44192000 */ mfc1 $t9, $f4 +/* 026B8 809BF318 44192000 */ mfc1 $t9, $f4 .L809BF31C: /* 026BC 809BF31C 00000000 */ nop -/* 026C0 809BF320 0720FFFB */ bltz $t9, .L809BF310 +/* 026C0 809BF320 0720FFFB */ bltz $t9, .L809BF310 /* 026C4 809BF324 00000000 */ nop .L809BF328: /* 026C8 809BF328 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 000000FF @@ -175,29 +175,29 @@ glabel EnBigokuta_Draw /* 026D0 809BF330 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 026D4 809BF334 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 026D8 809BF338 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 026DC 809BF33C AFA00018 */ sw $zero, 0x0018($sp) -/* 026E0 809BF340 AFA00014 */ sw $zero, 0x0014($sp) -/* 026E4 809BF344 AFA00010 */ sw $zero, 0x0010($sp) +/* 026DC 809BF33C AFA00018 */ sw $zero, 0x0018($sp) +/* 026E0 809BF340 AFA00014 */ sw $zero, 0x0014($sp) +/* 026E4 809BF344 AFA00010 */ sw $zero, 0x0010($sp) /* 026E8 809BF348 8D0A02D0 */ lw $t2, 0x02D0($t0) ## 000002D0 /* 026EC 809BF34C 44D8F800 */ ctc1 $t8, $31 -/* 026F0 809BF350 AFA80068 */ sw $t0, 0x0068($sp) -/* 026F4 809BF354 8FA40074 */ lw $a0, 0x0074($sp) -/* 026F8 809BF358 0C0289CF */ jal func_800A273C -/* 026FC 809BF35C AFAA001C */ sw $t2, 0x001C($sp) -/* 02700 809BF360 8FA80068 */ lw $t0, 0x0068($sp) +/* 026F0 809BF350 AFA80068 */ sw $t0, 0x0068($sp) +/* 026F4 809BF354 8FA40074 */ lw $a0, 0x0074($sp) +/* 026F8 809BF358 0C0289CF */ jal SkelAnime_DrawSV2 +/* 026FC 809BF35C AFAA001C */ sw $t2, 0x001C($sp) +/* 02700 809BF360 8FA80068 */ lw $t0, 0x0068($sp) /* 02704 809BF364 AD0202D0 */ sw $v0, 0x02D0($t0) ## 000002D0 -/* 02708 809BF368 8FAB0074 */ lw $t3, 0x0074($sp) +/* 02708 809BF368 8FAB0074 */ lw $t3, 0x0074($sp) .L809BF36C: /* 0270C 809BF36C 3C06809C */ lui $a2, %hi(D_809BF514) ## $a2 = 809C0000 /* 02710 809BF370 24C6F514 */ addiu $a2, $a2, %lo(D_809BF514) ## $a2 = 809BF514 /* 02714 809BF374 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 02718 809BF378 2407081C */ addiu $a3, $zero, 0x081C ## $a3 = 0000081C -/* 0271C 809BF37C 0C031AD5 */ jal func_800C6B54 +/* 0271C 809BF37C 0C031AD5 */ jal func_800C6B54 /* 02720 809BF380 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 02724 809BF384 8FBF002C */ lw $ra, 0x002C($sp) -/* 02728 809BF388 8FB00028 */ lw $s0, 0x0028($sp) +/* 02724 809BF384 8FBF002C */ lw $ra, 0x002C($sp) +/* 02728 809BF388 8FB00028 */ lw $s0, 0x0028($sp) /* 0272C 809BF38C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 02730 809BF390 03E00008 */ jr $ra +/* 02730 809BF390 03E00008 */ jr $ra /* 02734 809BF394 00000000 */ nop /* 02738 809BF398 00000000 */ nop /* 0273C 809BF39C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s index 8701195f58..abb1fbb57f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s @@ -1,41 +1,41 @@ glabel EnBigokuta_Init /* 00000 809BCC60 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 809BCC64 AFB30034 */ sw $s3, 0x0034($sp) +/* 00004 809BCC64 AFB30034 */ sw $s3, 0x0034($sp) /* 00008 809BCC68 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 0000C 809BCC6C AFBF003C */ sw $ra, 0x003C($sp) -/* 00010 809BCC70 AFB20030 */ sw $s2, 0x0030($sp) +/* 0000C 809BCC6C AFBF003C */ sw $ra, 0x003C($sp) +/* 00010 809BCC70 AFB20030 */ sw $s2, 0x0030($sp) /* 00014 809BCC74 3C05809C */ lui $a1, %hi(D_809BF488) ## $a1 = 809C0000 /* 00018 809BCC78 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 0001C 809BCC7C AFB40038 */ sw $s4, 0x0038($sp) -/* 00020 809BCC80 AFB1002C */ sw $s1, 0x002C($sp) -/* 00024 809BCC84 AFB00028 */ sw $s0, 0x0028($sp) +/* 0001C 809BCC7C AFB40038 */ sw $s4, 0x0038($sp) +/* 00020 809BCC80 AFB1002C */ sw $s1, 0x002C($sp) +/* 00024 809BCC84 AFB00028 */ sw $s0, 0x0028($sp) /* 00028 809BCC88 0C01E037 */ jal Actor_ProcessInitChain - + /* 0002C 809BCC8C 24A5F488 */ addiu $a1, $a1, %lo(D_809BF488) ## $a1 = 809BF488 /* 00030 809BCC90 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00034 809BCC94 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00038 809BCC98 264E019C */ addiu $t6, $s2, 0x019C ## $t6 = 0000019C /* 0003C 809BCC9C 264F0214 */ addiu $t7, $s2, 0x0214 ## $t7 = 00000214 /* 00040 809BCCA0 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 00044 809BCCA4 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 809BCCA8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 809BCCAC AFAE0010 */ sw $t6, 0x0010($sp) +/* 00044 809BCCA4 AFB80018 */ sw $t8, 0x0018($sp) +/* 00048 809BCCA8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0004C 809BCCAC AFAE0010 */ sw $t6, 0x0010($sp) /* 00050 809BCCB0 24E714B8 */ addiu $a3, $a3, 0x14B8 ## $a3 = 060014B8 /* 00054 809BCCB4 24C66BC0 */ addiu $a2, $a2, 0x6BC0 ## $a2 = 06006BC0 /* 00058 809BCCB8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 0005C 809BCCBC 0C0291BE */ jal func_800A46F8 +/* 0005C 809BCCBC 0C0291BE */ jal SkelAnime_InitSV /* 00060 809BCCC0 2645014C */ addiu $a1, $s2, 0x014C ## $a1 = 0000014C /* 00064 809BCCC4 2650028C */ addiu $s0, $s2, 0x028C ## $s0 = 0000028C /* 00068 809BCCC8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C -/* 0006C 809BCCCC 0C016EFE */ jal func_8005BBF8 +/* 0006C 809BCCCC 0C016EFE */ jal func_8005BBF8 /* 00070 809BCCD0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00074 809BCCD4 3C07809C */ lui $a3, %hi(D_809BF3F8) ## $a3 = 809C0000 /* 00078 809BCCD8 265902AC */ addiu $t9, $s2, 0x02AC ## $t9 = 000002AC -/* 0007C 809BCCDC AFB90010 */ sw $t9, 0x0010($sp) +/* 0007C 809BCCDC AFB90010 */ sw $t9, 0x0010($sp) /* 00080 809BCCE0 24E7F3F8 */ addiu $a3, $a3, %lo(D_809BF3F8) ## $a3 = 809BF3F8 /* 00084 809BCCE4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00088 809BCCE8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C -/* 0008C 809BCCEC 0C017014 */ jal func_8005C050 +/* 0008C 809BCCEC 0C017014 */ jal func_8005C050 /* 00090 809BCCF0 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00094 809BCCF4 8E4202A8 */ lw $v0, 0x02A8($s2) ## 000002A8 /* 00098 809BCCF8 3C10809C */ lui $s0, %hi(D_809BF408) ## $s0 = 809C0000 @@ -48,53 +48,53 @@ glabel EnBigokuta_Init .L809BCD14: /* 000B4 809BCD14 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 000B8 809BCD18 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 000BC 809BCD1C 02202825 */ or $a1, $s1, $zero ## $a1 = 000002EC /* 000C0 809BCD20 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 000C4 809BCD24 02202825 */ or $a1, $s1, $zero ## $a1 = 000002EC /* 000C8 809BCD28 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 000CC 809BCD2C 0C01712B */ jal ActorCollider_InitCylinder - + /* 000D0 809BCD30 02003825 */ or $a3, $s0, $zero ## $a3 = 809BF408 /* 000D4 809BCD34 2610002C */ addiu $s0, $s0, 0x002C ## $s0 = 809BF434 -/* 000D8 809BCD38 1614FFF6 */ bne $s0, $s4, .L809BCD14 +/* 000D8 809BCD38 1614FFF6 */ bne $s0, $s4, .L809BCD14 /* 000DC 809BCD3C 2631004C */ addiu $s1, $s1, 0x004C ## $s1 = 00000338 /* 000E0 809BCD40 3C05809C */ lui $a1, %hi(D_809BF468) ## $a1 = 809C0000 /* 000E4 809BCD44 3C06809C */ lui $a2, %hi(D_809BF460) ## $a2 = 809C0000 /* 000E8 809BCD48 24C6F460 */ addiu $a2, $a2, %lo(D_809BF460) ## $a2 = 809BF460 /* 000EC 809BCD4C 24A5F468 */ addiu $a1, $a1, %lo(D_809BF468) ## $a1 = 809BF468 -/* 000F0 809BCD50 0C0187B5 */ jal func_80061ED4 +/* 000F0 809BCD50 0C0187B5 */ jal func_80061ED4 /* 000F4 809BCD54 26440098 */ addiu $a0, $s2, 0x0098 ## $a0 = 00000098 /* 000F8 809BCD58 8649001C */ lh $t1, 0x001C($s2) ## 0000001C /* 000FC 809BCD5C 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 /* 00100 809BCD60 A2500194 */ sb $s0, 0x0194($s2) ## 00000194 -/* 00104 809BCD64 15200009 */ bne $t1, $zero, .L809BCD8C +/* 00104 809BCD64 15200009 */ bne $t1, $zero, .L809BCD8C /* 00108 809BCD68 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0010C 809BCD6C 26651C24 */ addiu $a1, $s3, 0x1C24 ## $a1 = 00001C24 /* 00110 809BCD70 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00114 809BCD74 0C00CDD2 */ jal Actor_ChangeType - + /* 00118 809BCD78 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -/* 0011C 809BCD7C 0C26F4C6 */ jal func_809BD318 +/* 0011C 809BCD7C 0C26F4C6 */ jal func_809BD318 /* 00120 809BCD80 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00124 809BCD84 10000009 */ beq $zero, $zero, .L809BCDAC -/* 00128 809BCD88 8FBF003C */ lw $ra, 0x003C($sp) +/* 00124 809BCD84 10000009 */ beq $zero, $zero, .L809BCDAC +/* 00128 809BCD88 8FBF003C */ lw $ra, 0x003C($sp) .L809BCD8C: -/* 0012C 809BCD8C 0C26F4F8 */ jal func_809BD3E0 +/* 0012C 809BCD8C 0C26F4F8 */ jal func_809BD3E0 /* 00130 809BCD90 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00134 809BCD94 A640019A */ sh $zero, 0x019A($s2) ## 0000019A /* 00138 809BCD98 A6500196 */ sh $s0, 0x0196($s2) ## 00000196 /* 0013C 809BCD9C 3C01809C */ lui $at, %hi(D_809BF528) ## $at = 809C0000 -/* 00140 809BCDA0 C424F528 */ lwc1 $f4, %lo(D_809BF528)($at) +/* 00140 809BCDA0 C424F528 */ lwc1 $f4, %lo(D_809BF528)($at) /* 00144 809BCDA4 E644000C */ swc1 $f4, 0x000C($s2) ## 0000000C -/* 00148 809BCDA8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00148 809BCDA8 8FBF003C */ lw $ra, 0x003C($sp) .L809BCDAC: -/* 0014C 809BCDAC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00150 809BCDB0 8FB1002C */ lw $s1, 0x002C($sp) -/* 00154 809BCDB4 8FB20030 */ lw $s2, 0x0030($sp) -/* 00158 809BCDB8 8FB30034 */ lw $s3, 0x0034($sp) -/* 0015C 809BCDBC 8FB40038 */ lw $s4, 0x0038($sp) -/* 00160 809BCDC0 03E00008 */ jr $ra +/* 0014C 809BCDAC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00150 809BCDB0 8FB1002C */ lw $s1, 0x002C($sp) +/* 00154 809BCDB4 8FB20030 */ lw $s2, 0x0030($sp) +/* 00158 809BCDB8 8FB30034 */ lw $s3, 0x0034($sp) +/* 0015C 809BCDBC 8FB40038 */ lw $s4, 0x0038($sp) +/* 00160 809BCDC0 03E00008 */ jr $ra /* 00164 809BCDC4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s index b0d4beaa24..6dca4864f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s @@ -1,25 +1,25 @@ glabel func_809BD318 /* 006B8 809BD318 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006BC 809BD31C AFBF0014 */ sw $ra, 0x0014($sp) +/* 006BC 809BD31C AFBF0014 */ sw $ra, 0x0014($sp) /* 006C0 809BD320 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 006C4 809BD324 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006C8 809BD328 24A514B8 */ addiu $a1, $a1, 0x14B8 ## $a1 = 060014B8 -/* 006CC 809BD32C AFA60018 */ sw $a2, 0x0018($sp) -/* 006D0 809BD330 0C0294BE */ jal func_800A52F8 +/* 006CC 809BD32C AFA60018 */ sw $a2, 0x0018($sp) +/* 006D0 809BD330 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 006D4 809BD334 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006D8 809BD338 8FA60018 */ lw $a2, 0x0018($sp) +/* 006D8 809BD338 8FA60018 */ lw $a2, 0x0018($sp) /* 006DC 809BD33C 3C01809C */ lui $at, %hi(D_809BF534) ## $at = 809C0000 /* 006E0 809BD340 3C0F809C */ lui $t7, %hi(func_809BD84C) ## $t7 = 809C0000 /* 006E4 809BD344 A4C0019A */ sh $zero, 0x019A($a2) ## 0000019A -/* 006E8 809BD348 C424F534 */ lwc1 $f4, %lo(D_809BF534)($at) +/* 006E8 809BD348 C424F534 */ lwc1 $f4, %lo(D_809BF534)($at) /* 006EC 809BD34C 240E0079 */ addiu $t6, $zero, 0x0079 ## $t6 = 00000079 /* 006F0 809BD350 25EFD84C */ addiu $t7, $t7, %lo(func_809BD84C) ## $t7 = 809BD84C /* 006F4 809BD354 A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 /* 006F8 809BD358 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 /* 006FC 809BD35C E4C4000C */ swc1 $f4, 0x000C($a2) ## 0000000C -/* 00700 809BD360 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00700 809BD360 8FBF0014 */ lw $ra, 0x0014($sp) /* 00704 809BD364 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00708 809BD368 03E00008 */ jr $ra +/* 00708 809BD368 03E00008 */ jr $ra /* 0070C 809BD36C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s index 005d817a46..4c68e326d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s @@ -1,24 +1,24 @@ glabel func_809BD3F8 /* 00798 809BD3F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0079C 809BD3FC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0079C 809BD3FC AFBF0014 */ sw $ra, 0x0014($sp) /* 007A0 809BD400 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 007A4 809BD404 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007A8 809BD408 24A51CA4 */ addiu $a1, $a1, 0x1CA4 ## $a1 = 06001CA4 -/* 007AC 809BD40C AFA70018 */ sw $a3, 0x0018($sp) +/* 007AC 809BD40C AFA70018 */ sw $a3, 0x0018($sp) /* 007B0 809BD410 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007B4 809BD414 0C0294D3 */ jal func_800A534C +/* 007B4 809BD414 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 007B8 809BD418 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 007BC 809BD41C 8FA40018 */ lw $a0, 0x0018($sp) +/* 007BC 809BD41C 8FA40018 */ lw $a0, 0x0018($sp) /* 007C0 809BD420 240E015E */ addiu $t6, $zero, 0x015E ## $t6 = 0000015E /* 007C4 809BD424 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 /* 007C8 809BD428 80980194 */ lb $t8, 0x0194($a0) ## 00000194 /* 007CC 809BD42C A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 /* 007D0 809BD430 A48F0198 */ sh $t7, 0x0198($a0) ## 00000198 -/* 007D4 809BD434 00180823 */ subu $at, $zero, $t8 -/* 007D8 809BD438 0001CA40 */ sll $t9, $at, 9 -/* 007DC 809BD43C 0C26F38F */ jal func_809BCE3C +/* 007D4 809BD434 00180823 */ subu $at, $zero, $t8 +/* 007D8 809BD438 0001CA40 */ sll $t9, $at, 9 +/* 007DC 809BD43C 0C26F38F */ jal func_809BCE3C /* 007E0 809BD440 A499019A */ sh $t9, 0x019A($a0) ## 0000019A -/* 007E4 809BD444 8FA70018 */ lw $a3, 0x0018($sp) +/* 007E4 809BD444 8FA70018 */ lw $a3, 0x0018($sp) /* 007E8 809BD448 3C0C809C */ lui $t4, %hi(func_809BDC08) ## $t4 = 809C0000 /* 007EC 809BD44C 258CDC08 */ addiu $t4, $t4, %lo(func_809BDC08) ## $t4 = 809BDC08 /* 007F0 809BD450 90E802FC */ lbu $t0, 0x02FC($a3) ## 000002FC @@ -28,9 +28,9 @@ glabel func_809BD3F8 /* 00800 809BD460 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 /* 00804 809BD464 A0E902FC */ sb $t1, 0x02FC($a3) ## 000002FC /* 00808 809BD468 A0EB029D */ sb $t3, 0x029D($a3) ## 0000029D -/* 0080C 809BD46C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0080C 809BD46C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00810 809BD470 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00814 809BD474 03E00008 */ jr $ra +/* 00814 809BD474 03E00008 */ jr $ra /* 00818 809BD478 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s index edff3afc5e..ff216e1c46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s @@ -1,14 +1,14 @@ glabel func_809BD4A4 /* 00844 809BD4A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00848 809BD4A8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00848 809BD4A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0084C 809BD4AC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00850 809BD4B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00854 809BD4B4 24A514B8 */ addiu $a1, $a1, 0x14B8 ## $a1 = 060014B8 -/* 00858 809BD4B8 AFA70018 */ sw $a3, 0x0018($sp) +/* 00858 809BD4B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0085C 809BD4BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00860 809BD4C0 0C0294D3 */ jal func_800A534C +/* 00860 809BD4C0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00864 809BD4C4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00868 809BD4C8 8FA70018 */ lw $a3, 0x0018($sp) +/* 00868 809BD4C8 8FA70018 */ lw $a3, 0x0018($sp) /* 0086C 809BD4CC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 00870 809BD4D0 3C0D809C */ lui $t5, %hi(func_809BDFC8) ## $t5 = 809C0000 /* 00874 809BD4D4 84EF00B6 */ lh $t7, 0x00B6($a3) ## 000000B6 @@ -17,8 +17,8 @@ glabel func_809BD4A4 /* 00880 809BD4E0 90EB02FC */ lbu $t3, 0x02FC($a3) ## 000002FC /* 00884 809BD4E4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00888 809BD4E8 25ADDFC8 */ addiu $t5, $t5, %lo(func_809BDFC8) ## $t5 = 809BDFC8 -/* 0088C 809BD4EC 01E1C021 */ addu $t8, $t7, $at -/* 00890 809BD4F0 00194240 */ sll $t0, $t9, 9 +/* 0088C 809BD4EC 01E1C021 */ addu $t8, $t7, $at +/* 00890 809BD4F0 00194240 */ sll $t0, $t9, 9 /* 00894 809BD4F4 312AFFFE */ andi $t2, $t1, 0xFFFE ## $t2 = 00000000 /* 00898 809BD4F8 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 /* 0089C 809BD4FC A0EE0195 */ sb $t6, 0x0195($a3) ## 00000195 @@ -27,9 +27,9 @@ glabel func_809BD4A4 /* 008A8 809BD508 A0EA029D */ sb $t2, 0x029D($a3) ## 0000029D /* 008AC 809BD50C A0EC02FC */ sb $t4, 0x02FC($a3) ## 000002FC /* 008B0 809BD510 ACED0190 */ sw $t5, 0x0190($a3) ## 00000190 -/* 008B4 809BD514 8FBF0014 */ lw $ra, 0x0014($sp) +/* 008B4 809BD514 8FBF0014 */ lw $ra, 0x0014($sp) /* 008B8 809BD518 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008BC 809BD51C 03E00008 */ jr $ra +/* 008BC 809BD51C 03E00008 */ jr $ra /* 008C0 809BD520 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s index d653bef92f..54080b3118 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s @@ -1,27 +1,27 @@ glabel EnBili_Draw /* 01BF8 809C1498 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01BFC 809C149C AFBF002C */ sw $ra, 0x002C($sp) -/* 01C00 809C14A0 AFB10028 */ sw $s1, 0x0028($sp) -/* 01C04 809C14A4 AFB00024 */ sw $s0, 0x0024($sp) -/* 01C08 809C14A8 AFA5005C */ sw $a1, 0x005C($sp) +/* 01BFC 809C149C AFBF002C */ sw $ra, 0x002C($sp) +/* 01C00 809C14A0 AFB10028 */ sw $s1, 0x0028($sp) +/* 01C04 809C14A4 AFB00024 */ sw $s0, 0x0024($sp) +/* 01C08 809C14A8 AFA5005C */ sw $a1, 0x005C($sp) /* 01C0C 809C14AC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01C10 809C14B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01C14 809C14B4 3C06809C */ lui $a2, %hi(D_809C1710) ## $a2 = 809C0000 /* 01C18 809C14B8 24C61710 */ addiu $a2, $a2, %lo(D_809C1710) ## $a2 = 809C1710 /* 01C1C 809C14BC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01C20 809C14C0 240705F1 */ addiu $a3, $zero, 0x05F1 ## $a3 = 000005F1 -/* 01C24 809C14C4 0C031AB1 */ jal func_800C6AC4 +/* 01C24 809C14C4 0C031AB1 */ jal func_800C6AC4 /* 01C28 809C14C8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01C2C 809C14CC 8FAF005C */ lw $t7, 0x005C($sp) -/* 01C30 809C14D0 0C024F61 */ jal func_80093D84 +/* 01C2C 809C14CC 8FAF005C */ lw $t7, 0x005C($sp) +/* 01C30 809C14D0 0C024F61 */ jal func_80093D84 /* 01C34 809C14D4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 01C38 809C14D8 92020194 */ lbu $v0, 0x0194($s0) ## 00000194 /* 01C3C 809C14DC 3C07809C */ lui $a3, %hi(func_809C13A8) ## $a3 = 809C0000 /* 01C40 809C14E0 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 01C44 809C14E4 28410008 */ slti $at, $v0, 0x0008 -/* 01C48 809C14E8 14200003 */ bne $at, $zero, .L809C14F8 +/* 01C44 809C14E4 28410008 */ slti $at, $v0, 0x0008 +/* 01C48 809C14E8 14200003 */ bne $at, $zero, .L809C14F8 /* 01C4C 809C14EC 24E713A8 */ addiu $a3, $a3, %lo(func_809C13A8) ## $a3 = 809C13A8 -/* 01C50 809C14F0 10000002 */ beq $zero, $zero, .L809C14FC +/* 01C50 809C14F0 10000002 */ beq $zero, $zero, .L809C14FC /* 01C54 809C14F4 A2180194 */ sb $t8, 0x0194($s0) ## 00000194 .L809C14F8: /* 01C58 809C14F8 A2020194 */ sb $v0, 0x0194($s0) ## 00000194 @@ -35,31 +35,31 @@ glabel EnBili_Draw /* 01C74 809C1514 92090194 */ lbu $t1, 0x0194($s0) ## 00000194 /* 01C78 809C1518 3C04809C */ lui $a0, %hi(D_809C16CC) ## $a0 = 809C0000 /* 01C7C 809C151C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01C80 809C1520 00095080 */ sll $t2, $t1, 2 -/* 01C84 809C1524 008A2021 */ addu $a0, $a0, $t2 -/* 01C88 809C1528 8C8416CC */ lw $a0, %lo(D_809C16CC)($a0) +/* 01C80 809C1520 00095080 */ sll $t2, $t1, 2 +/* 01C84 809C1524 008A2021 */ addu $a0, $a0, $t2 +/* 01C88 809C1528 8C8416CC */ lw $a0, %lo(D_809C16CC)($a0) /* 01C8C 809C152C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01C90 809C1530 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01C94 809C1534 00046100 */ sll $t4, $a0, 4 -/* 01C98 809C1538 000C6F02 */ srl $t5, $t4, 28 -/* 01C9C 809C153C 000D7080 */ sll $t6, $t5, 2 -/* 01CA0 809C1540 01EE7821 */ addu $t7, $t7, $t6 +/* 01C94 809C1534 00046100 */ sll $t4, $a0, 4 +/* 01C98 809C1538 000C6F02 */ srl $t5, $t4, 28 +/* 01C9C 809C153C 000D7080 */ sll $t6, $t5, 2 +/* 01CA0 809C1540 01EE7821 */ addu $t7, $t7, $t6 /* 01CA4 809C1544 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 -/* 01CA8 809C1548 00815824 */ and $t3, $a0, $at +/* 01CA8 809C1548 00815824 */ and $t3, $a0, $at /* 01CAC 809C154C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01CB0 809C1550 016FC021 */ addu $t8, $t3, $t7 -/* 01CB4 809C1554 0301C821 */ addu $t9, $t8, $at +/* 01CB0 809C1550 016FC021 */ addu $t8, $t3, $t7 +/* 01CB4 809C1554 0301C821 */ addu $t9, $t8, $at /* 01CB8 809C1558 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 01CBC 809C155C 8E090190 */ lw $t1, 0x0190($s0) ## 00000190 /* 01CC0 809C1560 3C08809C */ lui $t0, %hi(func_809C02B8) ## $t0 = 809C0000 /* 01CC4 809C1564 250802B8 */ addiu $t0, $t0, %lo(func_809C02B8) ## $t0 = 809C02B8 -/* 01CC8 809C1568 1509000F */ bne $t0, $t1, .L809C15A8 +/* 01CC8 809C1568 1509000F */ bne $t0, $t1, .L809C15A8 /* 01CCC 809C156C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01CD0 809C1570 860A0196 */ lh $t2, 0x0196($s0) ## 00000196 /* 01CD4 809C1574 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 01CD8 809C1578 35CE0024 */ ori $t6, $t6, 0x0024 ## $t6 = DB060024 /* 01CDC 809C157C 314C0001 */ andi $t4, $t2, 0x0001 ## $t4 = 00000000 -/* 01CE0 809C1580 5180000A */ beql $t4, $zero, .L809C15AC +/* 01CE0 809C1580 5180000A */ beql $t4, $zero, .L809C15AC /* 01CE4 809C1584 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 01CE8 809C1588 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 01CEC 809C158C 3C0B809C */ lui $t3, %hi(D_809C16F0) ## $t3 = 809C0000 @@ -67,7 +67,7 @@ glabel EnBili_Draw /* 01CF4 809C1594 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01CF8 809C1598 AE2D02D0 */ sw $t5, 0x02D0($s1) ## 000002D0 /* 01CFC 809C159C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 01D00 809C15A0 10000009 */ beq $zero, $zero, .L809C15C8 +/* 01D00 809C15A0 10000009 */ beq $zero, $zero, .L809C15C8 /* 01D04 809C15A4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 .L809C15A8: /* 01D08 809C15A8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -82,24 +82,24 @@ glabel EnBili_Draw .L809C15C8: /* 01D28 809C15C8 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 01D2C 809C15CC 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 01D30 809C15D0 AFB00014 */ sw $s0, 0x0014($sp) -/* 01D34 809C15D4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01D30 809C15D0 AFB00014 */ sw $s0, 0x0014($sp) +/* 01D34 809C15D4 AFA00010 */ sw $zero, 0x0010($sp) /* 01D38 809C15D8 8E2802D0 */ lw $t0, 0x02D0($s1) ## 000002D0 -/* 01D3C 809C15DC 8FA4005C */ lw $a0, 0x005C($sp) -/* 01D40 809C15E0 0C0288A2 */ jal func_800A2288 -/* 01D44 809C15E4 AFA80018 */ sw $t0, 0x0018($sp) +/* 01D3C 809C15DC 8FA4005C */ lw $a0, 0x005C($sp) +/* 01D40 809C15E0 0C0288A2 */ jal SkelAnime_Draw2 +/* 01D44 809C15E4 AFA80018 */ sw $t0, 0x0018($sp) /* 01D48 809C15E8 AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0 -/* 01D4C 809C15EC 8FA9005C */ lw $t1, 0x005C($sp) +/* 01D4C 809C15EC 8FA9005C */ lw $t1, 0x005C($sp) /* 01D50 809C15F0 3C06809C */ lui $a2, %hi(D_809C1720) ## $a2 = 809C0000 /* 01D54 809C15F4 24C61720 */ addiu $a2, $a2, %lo(D_809C1720) ## $a2 = 809C1720 /* 01D58 809C15F8 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01D5C 809C15FC 24070610 */ addiu $a3, $zero, 0x0610 ## $a3 = 00000610 -/* 01D60 809C1600 0C031AD5 */ jal func_800C6B54 +/* 01D60 809C1600 0C031AD5 */ jal func_800C6B54 /* 01D64 809C1604 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 01D68 809C1608 8FBF002C */ lw $ra, 0x002C($sp) -/* 01D6C 809C160C 8FB00024 */ lw $s0, 0x0024($sp) -/* 01D70 809C1610 8FB10028 */ lw $s1, 0x0028($sp) -/* 01D74 809C1614 03E00008 */ jr $ra +/* 01D68 809C1608 8FBF002C */ lw $ra, 0x002C($sp) +/* 01D6C 809C160C 8FB00024 */ lw $s0, 0x0024($sp) +/* 01D70 809C1610 8FB10028 */ lw $s1, 0x0028($sp) +/* 01D74 809C1614 03E00008 */ jr $ra /* 01D78 809C1618 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01D7C 809C161C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s index 434ce0c714..8fc37980da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s @@ -1,20 +1,20 @@ glabel func_809BFA14 /* 00174 809BFA14 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00178 809BFA18 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00178 809BFA18 AFBF0014 */ sw $ra, 0x0014($sp) /* 0017C 809BFA1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00180 809BFA20 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00184 809BFA24 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 -/* 00188 809BFA28 AFA60018 */ sw $a2, 0x0018($sp) -/* 0018C 809BFA2C 0C0294BE */ jal func_800A52F8 +/* 00188 809BFA28 AFA60018 */ sw $a2, 0x0018($sp) +/* 0018C 809BFA2C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00190 809BFA30 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00194 809BFA34 8FA60018 */ lw $a2, 0x0018($sp) +/* 00194 809BFA34 8FA60018 */ lw $a2, 0x0018($sp) /* 00198 809BFA38 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 0019C 809BFA3C 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 /* 001A0 809BFA40 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 /* 001A4 809BFA44 3C01809C */ lui $at, %hi(D_809C1734) ## $at = 809C0000 /* 001A8 809BFA48 A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 /* 001AC 809BFA4C E4C40060 */ swc1 $f4, 0x0060($a2) ## 00000060 -/* 001B0 809BFA50 C4261734 */ lwc1 $f6, %lo(D_809C1734)($at) +/* 001B0 809BFA50 C4261734 */ lwc1 $f6, %lo(D_809C1734)($at) /* 001B4 809BFA54 90CF01E4 */ lbu $t7, 0x01E4($a2) ## 000001E4 /* 001B8 809BFA58 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 001BC 809BFA5C 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 @@ -25,9 +25,9 @@ glabel func_809BFA14 /* 001D0 809BFA70 ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 /* 001D4 809BFA74 E4C6006C */ swc1 $f6, 0x006C($a2) ## 0000006C /* 001D8 809BFA78 E4C80068 */ swc1 $f8, 0x0068($a2) ## 00000068 -/* 001DC 809BFA7C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 001DC 809BFA7C 8FBF0014 */ lw $ra, 0x0014($sp) /* 001E0 809BFA80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001E4 809BFA84 03E00008 */ jr $ra +/* 001E4 809BFA84 03E00008 */ jr $ra /* 001E8 809BFA88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s index 12bfb71f71..410377e2f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s @@ -1,13 +1,13 @@ glabel func_809BFA8C /* 001EC 809BFA8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001F0 809BFA90 AFBF0014 */ sw $ra, 0x0014($sp) +/* 001F0 809BFA90 AFBF0014 */ sw $ra, 0x0014($sp) /* 001F4 809BFA94 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 001F8 809BFA98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001FC 809BFA9C 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 06000024 -/* 00200 809BFAA0 AFA60018 */ sw $a2, 0x0018($sp) -/* 00204 809BFAA4 0C0294BE */ jal func_800A52F8 +/* 00200 809BFAA0 AFA60018 */ sw $a2, 0x0018($sp) +/* 00204 809BFAA4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00208 809BFAA8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0020C 809BFAAC 8FA60018 */ lw $a2, 0x0018($sp) +/* 0020C 809BFAAC 8FA60018 */ lw $a2, 0x0018($sp) /* 00210 809BFAB0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00214 809BFAB4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00218 809BFAB8 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 @@ -18,9 +18,9 @@ glabel func_809BFA8C /* 0022C 809BFACC ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 /* 00230 809BFAD0 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 00234 809BFAD4 E4C60060 */ swc1 $f6, 0x0060($a2) ## 00000060 -/* 00238 809BFAD8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00238 809BFAD8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0023C 809BFADC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00240 809BFAE0 03E00008 */ jr $ra +/* 00240 809BFAE0 03E00008 */ jr $ra /* 00244 809BFAE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s index f913d5caac..afac54700f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s @@ -1,17 +1,17 @@ glabel func_809BFB5C /* 002BC 809BFB5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002C0 809BFB60 AFBF0014 */ sw $ra, 0x0014($sp) +/* 002C0 809BFB60 AFBF0014 */ sw $ra, 0x0014($sp) /* 002C4 809BFB64 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 002C8 809BFB68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002CC 809BFB6C 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 -/* 002D0 809BFB70 AFA60018 */ sw $a2, 0x0018($sp) -/* 002D4 809BFB74 0C0294BE */ jal func_800A52F8 +/* 002D0 809BFB70 AFA60018 */ sw $a2, 0x0018($sp) +/* 002D4 809BFB74 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 002D8 809BFB78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002DC 809BFB7C 8FA60018 */ lw $a2, 0x0018($sp) +/* 002DC 809BFB7C 8FA60018 */ lw $a2, 0x0018($sp) /* 002E0 809BFB80 240E0060 */ addiu $t6, $zero, 0x0060 ## $t6 = 00000060 /* 002E4 809BFB84 3C01809C */ lui $at, %hi(D_809C173C) ## $at = 809C0000 /* 002E8 809BFB88 A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 -/* 002EC 809BFB8C C424173C */ lwc1 $f4, %lo(D_809C173C)($at) +/* 002EC 809BFB8C C424173C */ lwc1 $f4, %lo(D_809C173C)($at) /* 002F0 809BFB90 90CF01E4 */ lbu $t7, 0x01E4($a2) ## 000001E4 /* 002F4 809BFB94 C4C60028 */ lwc1 $f6, 0x0028($a2) ## 00000028 /* 002F8 809BFB98 3C19809C */ lui $t9, %hi(func_809C0600) ## $t9 = 809C0000 @@ -21,9 +21,9 @@ glabel func_809BFB5C /* 00308 809BFBA8 ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 /* 0030C 809BFBAC E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 00310 809BFBB0 E4C6000C */ swc1 $f6, 0x000C($a2) ## 0000000C -/* 00314 809BFBB4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00314 809BFBB4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00318 809BFBB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0031C 809BFBBC 03E00008 */ jr $ra +/* 0031C 809BFBBC 03E00008 */ jr $ra /* 00320 809BFBC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s index 93d6cfcd33..db14117905 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s @@ -1,25 +1,25 @@ glabel func_809BFBC4 /* 00324 809BFBC4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00328 809BFBC8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0032C 809BFBCC AFB00018 */ sw $s0, 0x0018($sp) +/* 00328 809BFBC8 AFBF001C */ sw $ra, 0x001C($sp) +/* 0032C 809BFBCC AFB00018 */ sw $s0, 0x0018($sp) /* 00330 809BFBD0 8C8E0154 */ lw $t6, 0x0154($a0) ## 00000154 /* 00334 809BFBD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00338 809BFBD8 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 -/* 0033C 809BFBDC 10AE0003 */ beq $a1, $t6, .L809BFBEC +/* 0033C 809BFBDC 10AE0003 */ beq $a1, $t6, .L809BFBEC /* 00340 809BFBE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00344 809BFBE4 0C0294BE */ jal func_800A52F8 +/* 00344 809BFBE4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00348 809BFBE8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C .L809BFBEC: /* 0034C 809BFBEC 8E0501DC */ lw $a1, 0x01DC($s0) ## 000001DC /* 00350 809BFBF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00354 809BFBF4 0C00B6B0 */ jal func_8002DAC0 +/* 00354 809BFBF4 0C00B6B0 */ jal func_8002DAC0 /* 00358 809BFBF8 24A50100 */ addiu $a1, $a1, 0x0100 ## $a1 = 00000100 /* 0035C 809BFBFC 8E0501DC */ lw $a1, 0x01DC($s0) ## 000001DC /* 00360 809BFC00 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00364 809BFC04 00417821 */ addu $t7, $v0, $at +/* 00364 809BFC04 00417821 */ addu $t7, $v0, $at /* 00368 809BFC08 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 0036C 809BFC0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00370 809BFC10 0C00B6CA */ jal func_8002DB28 +/* 00370 809BFC10 0C00B6CA */ jal func_8002DB28 /* 00374 809BFC14 24A50100 */ addiu $a1, $a1, 0x0100 ## $a1 = 00000100 /* 00378 809BFC18 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0037C 809BFC1C 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 @@ -28,10 +28,10 @@ glabel func_809BFBC4 /* 00388 809BFC28 A6020030 */ sh $v0, 0x0030($s0) ## 00000030 /* 0038C 809BFC2C AE180190 */ sw $t8, 0x0190($s0) ## 00000190 /* 00390 809BFC30 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00394 809BFC34 8FBF001C */ lw $ra, 0x001C($sp) -/* 00398 809BFC38 8FB00018 */ lw $s0, 0x0018($sp) +/* 00394 809BFC34 8FBF001C */ lw $ra, 0x001C($sp) +/* 00398 809BFC38 8FB00018 */ lw $s0, 0x0018($sp) /* 0039C 809BFC3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 003A0 809BFC40 03E00008 */ jr $ra +/* 003A0 809BFC40 03E00008 */ jr $ra /* 003A4 809BFC44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s index 3d397ab1b6..1936637ec8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s @@ -1,15 +1,15 @@ glabel func_809BFC48 /* 003A8 809BFC48 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003AC 809BFC4C AFBF0024 */ sw $ra, 0x0024($sp) -/* 003B0 809BFC50 AFB00020 */ sw $s0, 0x0020($sp) +/* 003AC 809BFC4C AFBF0024 */ sw $ra, 0x0024($sp) +/* 003B0 809BFC50 AFB00020 */ sw $s0, 0x0020($sp) /* 003B4 809BFC54 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 /* 003B8 809BFC58 3C0E809C */ lui $t6, %hi(func_809C04B4) ## $t6 = 809C0000 /* 003BC 809BFC5C 25CE04B4 */ addiu $t6, $t6, %lo(func_809C04B4) ## $t6 = 809C04B4 -/* 003C0 809BFC60 15CF0005 */ bne $t6, $t7, .L809BFC78 +/* 003C0 809BFC60 15CF0005 */ bne $t6, $t7, .L809BFC78 /* 003C4 809BFC64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 003C8 809BFC68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003CC 809BFC6C 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 -/* 003D0 809BFC70 0C0294BE */ jal func_800A52F8 +/* 003D0 809BFC70 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 003D4 809BFC74 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C .L809BFC78: /* 003D8 809BFC78 921901E4 */ lbu $t9, 0x01E4($s0) ## 000001E4 @@ -26,19 +26,19 @@ glabel func_809BFC48 /* 00404 809BFCA4 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 /* 00408 809BFCA8 240D0014 */ addiu $t5, $zero, 0x0014 ## $t5 = 00000014 /* 0040C 809BFCAC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00410 809BFCB0 AFAD0010 */ sw $t5, 0x0010($sp) +/* 00410 809BFCB0 AFAD0010 */ sw $t5, 0x0010($sp) /* 00414 809BFCB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00418 809BFCB8 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 0041C 809BFCBC 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 00420 809BFCC0 0C00D09B */ jal func_8003426C +/* 00420 809BFCC0 0C00D09B */ jal func_8003426C /* 00424 809BFCC4 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 00428 809BFCC8 3C0E809C */ lui $t6, %hi(func_809C06E0) ## $t6 = 809C0000 /* 0042C 809BFCCC 25CE06E0 */ addiu $t6, $t6, %lo(func_809C06E0) ## $t6 = 809C06E0 /* 00430 809BFCD0 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 00434 809BFCD4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00438 809BFCD8 8FB00020 */ lw $s0, 0x0020($sp) +/* 00434 809BFCD4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00438 809BFCD8 8FB00020 */ lw $s0, 0x0020($sp) /* 0043C 809BFCDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00440 809BFCE0 03E00008 */ jr $ra +/* 00440 809BFCE0 03E00008 */ jr $ra /* 00444 809BFCE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s index 5be811c2d4..e64d8391de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s @@ -1,20 +1,20 @@ glabel EnBomBowlMan_Draw /* 012BC 809C48EC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 012C0 809C48F0 AFBF002C */ sw $ra, 0x002C($sp) -/* 012C4 809C48F4 AFB00028 */ sw $s0, 0x0028($sp) -/* 012C8 809C48F8 AFA50054 */ sw $a1, 0x0054($sp) +/* 012C0 809C48F0 AFBF002C */ sw $ra, 0x002C($sp) +/* 012C4 809C48F4 AFB00028 */ sw $s0, 0x0028($sp) +/* 012C8 809C48F8 AFA50054 */ sw $a1, 0x0054($sp) /* 012CC 809C48FC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 012D0 809C4900 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 012D4 809C4904 3C06809C */ lui $a2, %hi(D_809C4C44) ## $a2 = 809C0000 /* 012D8 809C4908 24C64C44 */ addiu $a2, $a2, %lo(D_809C4C44) ## $a2 = 809C4C44 /* 012DC 809C490C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 012E0 809C4910 2407038B */ addiu $a3, $zero, 0x038B ## $a3 = 0000038B -/* 012E4 809C4914 0C031AB1 */ jal func_800C6AC4 -/* 012E8 809C4918 AFA50048 */ sw $a1, 0x0048($sp) -/* 012EC 809C491C 8FAF0054 */ lw $t7, 0x0054($sp) -/* 012F0 809C4920 0C024F46 */ jal func_80093D18 +/* 012E4 809C4914 0C031AB1 */ jal func_800C6AC4 +/* 012E8 809C4918 AFA50048 */ sw $a1, 0x0048($sp) +/* 012EC 809C491C 8FAF0054 */ lw $t7, 0x0054($sp) +/* 012F0 809C4920 0C024F46 */ jal func_80093D18 /* 012F4 809C4924 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 012F8 809C4928 8FA50048 */ lw $a1, 0x0048($sp) +/* 012F8 809C4928 8FA50048 */ lw $a1, 0x0048($sp) /* 012FC 809C492C 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01300 809C4930 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 01304 809C4934 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,40 +26,40 @@ glabel EnBomBowlMan_Draw /* 0131C 809C494C 86080234 */ lh $t0, 0x0234($s0) ## 00000234 /* 01320 809C4950 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01324 809C4954 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01328 809C4958 00084880 */ sll $t1, $t0, 2 -/* 0132C 809C495C 00892021 */ addu $a0, $a0, $t1 -/* 01330 809C4960 8C844AA8 */ lw $a0, %lo(D_809C4AA8)($a0) +/* 01328 809C4958 00084880 */ sll $t1, $t0, 2 +/* 0132C 809C495C 00892021 */ addu $a0, $a0, $t1 +/* 01330 809C4960 8C844AA8 */ lw $a0, %lo(D_809C4AA8)($a0) /* 01334 809C4964 3C19809C */ lui $t9, %hi(func_809C48A8) ## $t9 = 809C0000 /* 01338 809C4968 273948A8 */ addiu $t9, $t9, %lo(func_809C48A8) ## $t9 = 809C48A8 -/* 0133C 809C496C 00045900 */ sll $t3, $a0, 4 -/* 01340 809C4970 000B6702 */ srl $t4, $t3, 28 -/* 01344 809C4974 000C6880 */ sll $t5, $t4, 2 -/* 01348 809C4978 01CD7021 */ addu $t6, $t6, $t5 +/* 0133C 809C496C 00045900 */ sll $t3, $a0, 4 +/* 01340 809C4970 000B6702 */ srl $t4, $t3, 28 +/* 01344 809C4974 000C6880 */ sll $t5, $t4, 2 +/* 01348 809C4978 01CD7021 */ addu $t6, $t6, $t5 /* 0134C 809C497C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 01350 809C4980 00815024 */ and $t2, $a0, $at +/* 01350 809C4980 00815024 */ and $t2, $a0, $at /* 01354 809C4984 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01358 809C4988 014E7821 */ addu $t7, $t2, $t6 -/* 0135C 809C498C 01E1C021 */ addu $t8, $t7, $at +/* 01358 809C4988 014E7821 */ addu $t7, $t2, $t6 +/* 0135C 809C498C 01E1C021 */ addu $t8, $t7, $at /* 01360 809C4990 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 01364 809C4994 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 01368 809C4998 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 0136C 809C499C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 01370 809C49A0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01374 809C49A4 AFA00014 */ sw $zero, 0x0014($sp) -/* 01378 809C49A8 AFB90010 */ sw $t9, 0x0010($sp) -/* 0137C 809C49AC 0C0286B2 */ jal func_800A1AC8 -/* 01380 809C49B0 8FA40054 */ lw $a0, 0x0054($sp) -/* 01384 809C49B4 8FA80054 */ lw $t0, 0x0054($sp) +/* 01370 809C49A0 AFB00018 */ sw $s0, 0x0018($sp) +/* 01374 809C49A4 AFA00014 */ sw $zero, 0x0014($sp) +/* 01378 809C49A8 AFB90010 */ sw $t9, 0x0010($sp) +/* 0137C 809C49AC 0C0286B2 */ jal SkelAnime_DrawSV +/* 01380 809C49B0 8FA40054 */ lw $a0, 0x0054($sp) +/* 01384 809C49B4 8FA80054 */ lw $t0, 0x0054($sp) /* 01388 809C49B8 3C06809C */ lui $a2, %hi(D_809C4C5C) ## $a2 = 809C0000 /* 0138C 809C49BC 24C64C5C */ addiu $a2, $a2, %lo(D_809C4C5C) ## $a2 = 809C4C5C /* 01390 809C49C0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01394 809C49C4 2407039B */ addiu $a3, $zero, 0x039B ## $a3 = 0000039B -/* 01398 809C49C8 0C031AD5 */ jal func_800C6B54 +/* 01398 809C49C8 0C031AD5 */ jal func_800C6B54 /* 0139C 809C49CC 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 013A0 809C49D0 8FBF002C */ lw $ra, 0x002C($sp) -/* 013A4 809C49D4 8FB00028 */ lw $s0, 0x0028($sp) +/* 013A0 809C49D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 013A4 809C49D4 8FB00028 */ lw $s0, 0x0028($sp) /* 013A8 809C49D8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 013AC 809C49DC 03E00008 */ jr $ra +/* 013AC 809C49DC 03E00008 */ jr $ra /* 013B0 809C49E0 00000000 */ nop /* 013B4 809C49E4 00000000 */ nop /* 013B8 809C49E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s index 22903f5b8d..61fd8fb8f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s @@ -1,47 +1,47 @@ glabel EnBomBowlMan_Init /* 00000 809C3630 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00004 809C3634 AFBE0050 */ sw $s8, 0x0050($sp) -/* 00008 809C3638 AFB3003C */ sw $s3, 0x003C($sp) +/* 00004 809C3634 AFBE0050 */ sw $s8, 0x0050($sp) +/* 00008 809C3638 AFB3003C */ sw $s3, 0x003C($sp) /* 0000C 809C363C 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 00010 809C3640 0080F025 */ or $s8, $a0, $zero ## $s8 = 00000000 -/* 00014 809C3644 AFBF0054 */ sw $ra, 0x0054($sp) +/* 00014 809C3644 AFBF0054 */ sw $ra, 0x0054($sp) /* 00018 809C3648 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0001C 809C364C AFB7004C */ sw $s7, 0x004C($sp) -/* 00020 809C3650 AFB60048 */ sw $s6, 0x0048($sp) -/* 00024 809C3654 AFB50044 */ sw $s5, 0x0044($sp) -/* 00028 809C3658 AFB40040 */ sw $s4, 0x0040($sp) -/* 0002C 809C365C AFB20038 */ sw $s2, 0x0038($sp) -/* 00030 809C3660 AFB10034 */ sw $s1, 0x0034($sp) -/* 00034 809C3664 AFB00030 */ sw $s0, 0x0030($sp) +/* 0001C 809C364C AFB7004C */ sw $s7, 0x004C($sp) +/* 00020 809C3650 AFB60048 */ sw $s6, 0x0048($sp) +/* 00024 809C3654 AFB50044 */ sw $s5, 0x0044($sp) +/* 00028 809C3658 AFB40040 */ sw $s4, 0x0040($sp) +/* 0002C 809C365C AFB20038 */ sw $s2, 0x0038($sp) +/* 00030 809C3660 AFB10034 */ sw $s1, 0x0034($sp) +/* 00034 809C3664 AFB00030 */ sw $s0, 0x0030($sp) /* 00038 809C3668 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0003C 809C366C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00040 809C3670 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00044 809C3674 0C00AC78 */ jal ActorShape_Init - + /* 00048 809C3678 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 0004C 809C367C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00050 809C3680 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00054 809C3684 27CE0190 */ addiu $t6, $s8, 0x0190 ## $t6 = 00000190 /* 00058 809C3688 27CF01D2 */ addiu $t7, $s8, 0x01D2 ## $t7 = 000001D2 /* 0005C 809C368C 2418000B */ addiu $t8, $zero, 0x000B ## $t8 = 0000000B -/* 00060 809C3690 AFB80018 */ sw $t8, 0x0018($sp) -/* 00064 809C3694 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00068 809C3698 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00060 809C3690 AFB80018 */ sw $t8, 0x0018($sp) +/* 00064 809C3694 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00068 809C3698 AFAE0010 */ sw $t6, 0x0010($sp) /* 0006C 809C369C 24E70710 */ addiu $a3, $a3, 0x0710 ## $a3 = 06000710 /* 00070 809C36A0 24C66EB0 */ addiu $a2, $a2, 0x6EB0 ## $a2 = 06006EB0 /* 00074 809C36A4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00078 809C36A8 0C0291BE */ jal func_800A46F8 +/* 00078 809C36A8 0C0291BE */ jal SkelAnime_InitSV /* 0007C 809C36AC 27C5014C */ addiu $a1, $s8, 0x014C ## $a1 = 0000014C /* 00080 809C36B0 3C04809C */ lui $a0, %hi(D_809C4AC0) ## $a0 = 809C0000 /* 00084 809C36B4 0C00084C */ jal osSyncPrintf - + /* 00088 809C36B8 24844AC0 */ addiu $a0, $a0, %lo(D_809C4AC0) ## $a0 = 809C4AC0 /* 0008C 809C36BC 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 00090 809C36C0 00B32821 */ addu $a1, $a1, $s3 +/* 00090 809C36C0 00B32821 */ addu $a1, $a1, $s3 /* 00094 809C36C4 3C04809C */ lui $a0, %hi(D_809C4AF0) ## $a0 = 809C0000 /* 00098 809C36C8 24844AF0 */ addiu $a0, $a0, %lo(D_809C4AF0) ## $a0 = 809C4AF0 /* 0009C 809C36CC 0C00084C */ jal osSyncPrintf - + /* 000A0 809C36D0 80A51E5D */ lb $a1, 0x1E5D($a1) ## 00011E5D /* 000A4 809C36D4 8FC80024 */ lw $t0, 0x0024($s8) ## 00000024 /* 000A8 809C36D8 3C01C270 */ lui $at, 0xC270 ## $at = C2700000 @@ -55,7 +55,7 @@ glabel EnBomBowlMan_Init /* 000C8 809C36F8 AFD9024C */ sw $t9, 0x024C($s8) ## 0000024C /* 000CC 809C36FC AFC80250 */ sw $t0, 0x0250($s8) ## 00000250 /* 000D0 809C3700 0C00B58B */ jal Actor_SetScale - + /* 000D4 809C3704 E7C400BC */ swc1 $f4, 0x00BC($s8) ## 000000BC /* 000D8 809C3708 3C10809C */ lui $s0, %hi(D_809C4A28) ## $s0 = 809C0000 /* 000DC 809C370C 3C16809C */ lui $s6, %hi(D_809C4A10) ## $s6 = 809C0000 @@ -71,62 +71,62 @@ glabel EnBomBowlMan_Init /* 00100 809C3730 C6060004 */ lwc1 $f6, 0x0004($s0) ## 809C4A2C /* 00104 809C3734 C6080008 */ lwc1 $f8, 0x0008($s0) ## 809C4A30 /* 00108 809C3738 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0010C 809C373C AFA90024 */ sw $t1, 0x0024($sp) +/* 0010C 809C373C AFA90024 */ sw $t1, 0x0024($sp) /* 00110 809C3740 02802025 */ or $a0, $s4, $zero ## $a0 = 00001C24 /* 00114 809C3744 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00118 809C3748 24060143 */ addiu $a2, $zero, 0x0143 ## $a2 = 00000143 /* 0011C 809C374C 8E070000 */ lw $a3, 0x0000($s0) ## 809C4A28 -/* 00120 809C3750 AFA00018 */ sw $zero, 0x0018($sp) -/* 00124 809C3754 AFA0001C */ sw $zero, 0x001C($sp) -/* 00128 809C3758 AFA00020 */ sw $zero, 0x0020($sp) -/* 0012C 809C375C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00120 809C3750 AFA00018 */ sw $zero, 0x0018($sp) +/* 00124 809C3754 AFA0001C */ sw $zero, 0x001C($sp) +/* 00128 809C3758 AFA00020 */ sw $zero, 0x0020($sp) +/* 0012C 809C375C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00130 809C3760 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00134 809C3764 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00138 809C3768 10400010 */ beq $v0, $zero, .L809C37AC +/* 00134 809C3764 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 00138 809C3768 10400010 */ beq $v0, $zero, .L809C37AC /* 0013C 809C376C 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 809C4A34 -/* 00140 809C3770 00115080 */ sll $t2, $s1, 2 -/* 00144 809C3774 02AA5821 */ addu $t3, $s5, $t2 +/* 00140 809C3770 00115080 */ sll $t2, $s1, 2 +/* 00144 809C3774 02AA5821 */ addu $t3, $s5, $t2 /* 00148 809C3778 C56A0000 */ lwc1 $f10, 0x0000($t3) ## 00000000 -/* 0014C 809C377C 02D21821 */ addu $v1, $s6, $s2 +/* 0014C 809C377C 02D21821 */ addu $v1, $s6, $s2 /* 00150 809C3780 E44A02F4 */ swc1 $f10, 0x02F4($v0) ## 000002F4 /* 00154 809C3784 C4700000 */ lwc1 $f16, 0x0000($v1) ## 00000000 -/* 00158 809C3788 4600848D */ trunc.w.s $f18, $f16 -/* 0015C 809C378C 440D9000 */ mfc1 $t5, $f18 +/* 00158 809C3788 4600848D */ trunc.w.s $f18, $f16 +/* 0015C 809C378C 440D9000 */ mfc1 $t5, $f18 /* 00160 809C3790 00000000 */ nop /* 00164 809C3794 A44D033C */ sh $t5, 0x033C($v0) ## 0000033C /* 00168 809C3798 C4640004 */ lwc1 $f4, 0x0004($v1) ## 00000004 -/* 0016C 809C379C 4600218D */ trunc.w.s $f6, $f4 -/* 00170 809C37A0 440F3000 */ mfc1 $t7, $f6 +/* 0016C 809C379C 4600218D */ trunc.w.s $f6, $f4 +/* 00170 809C37A0 440F3000 */ mfc1 $t7, $f6 /* 00174 809C37A4 00000000 */ nop /* 00178 809C37A8 A44F033E */ sh $t7, 0x033E($v0) ## 0000033E .L809C37AC: /* 0017C 809C37AC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00180 809C37B0 1637FFDF */ bne $s1, $s7, .L809C3730 +/* 00180 809C37B0 1637FFDF */ bne $s1, $s7, .L809C3730 /* 00184 809C37B4 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 0000000C /* 00188 809C37B8 3C01809C */ lui $at, %hi(D_809C4C74) ## $at = 809C0000 /* 0018C 809C37BC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00190 809C37C0 C42C4C74 */ lwc1 $f12, %lo(D_809C4C74)($at) -/* 00194 809C37C4 4600020D */ trunc.w.s $f8, $f0 + +/* 00190 809C37C0 C42C4C74 */ lwc1 $f12, %lo(D_809C4C74)($at) +/* 00194 809C37C4 4600020D */ trunc.w.s $f8, $f0 /* 00198 809C37C8 3C09809C */ lui $t1, %hi(func_809C3820) ## $t1 = 809C0000 /* 0019C 809C37CC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 001A0 809C37D0 25293820 */ addiu $t1, $t1, %lo(func_809C3820) ## $t1 = 809C3820 -/* 001A4 809C37D4 44194000 */ mfc1 $t9, $f8 +/* 001A4 809C37D4 44194000 */ mfc1 $t9, $f8 /* 001A8 809C37D8 A3C8001F */ sb $t0, 0x001F($s8) ## 0000001F /* 001AC 809C37DC AFC90214 */ sw $t1, 0x0214($s8) ## 00000214 /* 001B0 809C37E0 A7D90242 */ sh $t9, 0x0242($s8) ## 00000242 -/* 001B4 809C37E4 8FBF0054 */ lw $ra, 0x0054($sp) -/* 001B8 809C37E8 8FBE0050 */ lw $s8, 0x0050($sp) -/* 001BC 809C37EC 8FB7004C */ lw $s7, 0x004C($sp) -/* 001C0 809C37F0 8FB60048 */ lw $s6, 0x0048($sp) -/* 001C4 809C37F4 8FB50044 */ lw $s5, 0x0044($sp) -/* 001C8 809C37F8 8FB40040 */ lw $s4, 0x0040($sp) -/* 001CC 809C37FC 8FB3003C */ lw $s3, 0x003C($sp) -/* 001D0 809C3800 8FB20038 */ lw $s2, 0x0038($sp) -/* 001D4 809C3804 8FB10034 */ lw $s1, 0x0034($sp) -/* 001D8 809C3808 8FB00030 */ lw $s0, 0x0030($sp) -/* 001DC 809C380C 03E00008 */ jr $ra +/* 001B4 809C37E4 8FBF0054 */ lw $ra, 0x0054($sp) +/* 001B8 809C37E8 8FBE0050 */ lw $s8, 0x0050($sp) +/* 001BC 809C37EC 8FB7004C */ lw $s7, 0x004C($sp) +/* 001C0 809C37F0 8FB60048 */ lw $s6, 0x0048($sp) +/* 001C4 809C37F4 8FB50044 */ lw $s5, 0x0044($sp) +/* 001C8 809C37F8 8FB40040 */ lw $s4, 0x0040($sp) +/* 001CC 809C37FC 8FB3003C */ lw $s3, 0x003C($sp) +/* 001D0 809C3800 8FB20038 */ lw $s2, 0x0038($sp) +/* 001D4 809C3804 8FB10034 */ lw $s1, 0x0034($sp) +/* 001D8 809C3808 8FB00030 */ lw $s0, 0x0030($sp) +/* 001DC 809C380C 03E00008 */ jr $ra /* 001E0 809C3810 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s index 131c1dfeb6..d98c03e7a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s @@ -1,39 +1,39 @@ glabel EnBox_Draw /* 017D0 809CA590 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 017D4 809CA594 AFBF002C */ sw $ra, 0x002C($sp) -/* 017D8 809CA598 AFB10028 */ sw $s1, 0x0028($sp) -/* 017DC 809CA59C AFB00024 */ sw $s0, 0x0024($sp) -/* 017E0 809CA5A0 AFA50074 */ sw $a1, 0x0074($sp) +/* 017D4 809CA594 AFBF002C */ sw $ra, 0x002C($sp) +/* 017D8 809CA598 AFB10028 */ sw $s1, 0x0028($sp) +/* 017DC 809CA59C AFB00024 */ sw $s0, 0x0024($sp) +/* 017E0 809CA5A0 AFA50074 */ sw $a1, 0x0074($sp) /* 017E4 809CA5A4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 017E8 809CA5A8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 017EC 809CA5AC 3C06809D */ lui $a2, %hi(D_809CA8D0) ## $a2 = 809D0000 /* 017F0 809CA5B0 24C6A8D0 */ addiu $a2, $a2, %lo(D_809CA8D0) ## $a2 = 809CA8D0 /* 017F4 809CA5B4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 017F8 809CA5B8 2407062D */ addiu $a3, $zero, 0x062D ## $a3 = 0000062D -/* 017FC 809CA5BC 0C031AB1 */ jal func_800C6AC4 +/* 017FC 809CA5BC 0C031AB1 */ jal func_800C6AC4 /* 01800 809CA5C0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01804 809CA5C4 922301F7 */ lbu $v1, 0x01F7($s1) ## 000001F7 /* 01808 809CA5C8 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 0180C 809CA5CC 54610008 */ bnel $v1, $at, .L809CA5F0 +/* 0180C 809CA5CC 54610008 */ bnel $v1, $at, .L809CA5F0 /* 01810 809CA5D0 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 /* 01814 809CA5D4 922201F9 */ lbu $v0, 0x01F9($s1) ## 000001F9 /* 01818 809CA5D8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0181C 809CA5DC 10410003 */ beq $v0, $at, .L809CA5EC +/* 0181C 809CA5DC 10410003 */ beq $v0, $at, .L809CA5EC /* 01820 809CA5E0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01824 809CA5E4 5441000D */ bnel $v0, $at, .L809CA61C +/* 01824 809CA5E4 5441000D */ bnel $v0, $at, .L809CA61C /* 01828 809CA5E8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L809CA5EC: /* 0182C 809CA5EC 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 .L809CA5F0: /* 01830 809CA5F0 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 /* 01834 809CA5F4 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 01838 809CA5F8 13010030 */ beq $t8, $at, .L809CA6BC +/* 01838 809CA5F8 13010030 */ beq $t8, $at, .L809CA6BC /* 0183C 809CA5FC 00000000 */ nop /* 01840 809CA600 922201F9 */ lbu $v0, 0x01F9($s1) ## 000001F9 /* 01844 809CA604 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01848 809CA608 10410003 */ beq $v0, $at, .L809CA618 +/* 01848 809CA608 10410003 */ beq $v0, $at, .L809CA618 /* 0184C 809CA60C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01850 809CA610 1441002A */ bne $v0, $at, .L809CA6BC +/* 01850 809CA610 1441002A */ bne $v0, $at, .L809CA6BC /* 01854 809CA614 00000000 */ nop .L809CA618: /* 01858 809CA618 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -56,39 +56,39 @@ glabel EnBox_Draw /* 01898 809CA658 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 0189C 809CA65C AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 018A0 809CA660 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 018A4 809CA664 8FAE0074 */ lw $t6, 0x0074($sp) +/* 018A4 809CA664 8FAE0074 */ lw $t6, 0x0074($sp) /* 018A8 809CA668 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 018AC 809CA66C 0C272912 */ jal func_809CA448 -/* 018B0 809CA670 AFA2004C */ sw $v0, 0x004C($sp) -/* 018B4 809CA674 8FA3004C */ lw $v1, 0x004C($sp) +/* 018AC 809CA66C 0C272912 */ jal func_809CA448 +/* 018B0 809CA670 AFA2004C */ sw $v0, 0x004C($sp) +/* 018B4 809CA674 8FA3004C */ lw $v1, 0x004C($sp) /* 018B8 809CA678 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 018BC 809CA67C 8FAF0074 */ lw $t7, 0x0074($sp) -/* 018C0 809CA680 0C024F46 */ jal func_80093D18 +/* 018BC 809CA67C 8FAF0074 */ lw $t7, 0x0074($sp) +/* 018C0 809CA680 0C024F46 */ jal func_80093D18 /* 018C4 809CA684 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 018C8 809CA688 8E250168 */ lw $a1, 0x0168($s1) ## 00000168 /* 018CC 809CA68C 8E260184 */ lw $a2, 0x0184($s1) ## 00000184 /* 018D0 809CA690 3C18809D */ lui $t8, %hi(func_809CA2D8) ## $t8 = 809D0000 /* 018D4 809CA694 2718A2D8 */ addiu $t8, $t8, %lo(func_809CA2D8) ## $t8 = 809CA2D8 -/* 018D8 809CA698 AFB80010 */ sw $t8, 0x0010($sp) -/* 018DC 809CA69C AFB10014 */ sw $s1, 0x0014($sp) +/* 018D8 809CA698 AFB80010 */ sw $t8, 0x0010($sp) +/* 018DC 809CA69C AFB10014 */ sw $s1, 0x0014($sp) /* 018E0 809CA6A0 8E1902C0 */ lw $t9, 0x02C0($s0) ## 000002C0 -/* 018E4 809CA6A4 8FA40074 */ lw $a0, 0x0074($sp) +/* 018E4 809CA6A4 8FA40074 */ lw $a0, 0x0074($sp) /* 018E8 809CA6A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 018EC 809CA6AC 0C0288A2 */ jal func_800A2288 -/* 018F0 809CA6B0 AFB90018 */ sw $t9, 0x0018($sp) -/* 018F4 809CA6B4 1000003E */ beq $zero, $zero, .L809CA7B0 +/* 018EC 809CA6AC 0C0288A2 */ jal SkelAnime_Draw2 +/* 018F0 809CA6B0 AFB90018 */ sw $t9, 0x0018($sp) +/* 018F4 809CA6B4 1000003E */ beq $zero, $zero, .L809CA7B0 /* 018F8 809CA6B8 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L809CA6BC: -/* 018FC 809CA6BC 5060003D */ beql $v1, $zero, .L809CA7B4 -/* 01900 809CA6C0 8FAD0074 */ lw $t5, 0x0074($sp) +/* 018FC 809CA6BC 5060003D */ beql $v1, $zero, .L809CA7B4 +/* 01900 809CA6C0 8FAD0074 */ lw $t5, 0x0074($sp) /* 01904 809CA6C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01908 809CA6C8 3C09E700 */ lui $t1, 0xE700 ## $t1 = E7000000 /* 0190C 809CA6CC 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 01910 809CA6D0 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 /* 01914 809CA6D4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 01918 809CA6D8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0191C 809CA6DC 8FAA0074 */ lw $t2, 0x0074($sp) -/* 01920 809CA6E0 0C024F61 */ jal func_80093D84 +/* 0191C 809CA6DC 8FAA0074 */ lw $t2, 0x0074($sp) +/* 01920 809CA6E0 0C024F61 */ jal func_80093D84 /* 01924 809CA6E4 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 01928 809CA6E8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0192C 809CA6EC 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 @@ -99,9 +99,9 @@ glabel EnBox_Draw /* 01940 809CA700 922E01F7 */ lbu $t6, 0x01F7($s1) ## 000001F7 /* 01944 809CA704 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01948 809CA708 922201F9 */ lbu $v0, 0x01F9($s1) ## 000001F9 -/* 0194C 809CA70C 10410003 */ beq $v0, $at, .L809CA71C +/* 0194C 809CA70C 10410003 */ beq $v0, $at, .L809CA71C /* 01950 809CA710 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01954 809CA714 5441000F */ bnel $v0, $at, .L809CA754 +/* 01954 809CA714 5441000F */ bnel $v0, $at, .L809CA754 /* 01958 809CA718 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 .L809CA71C: /* 0195C 809CA71C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -110,12 +110,12 @@ glabel EnBox_Draw /* 01968 809CA728 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0196C 809CA72C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 01970 809CA730 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01974 809CA734 8FB90074 */ lw $t9, 0x0074($sp) +/* 01974 809CA734 8FB90074 */ lw $t9, 0x0074($sp) /* 01978 809CA738 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 0197C 809CA73C 0C272946 */ jal func_809CA518 -/* 01980 809CA740 AFA20040 */ sw $v0, 0x0040($sp) -/* 01984 809CA744 8FA30040 */ lw $v1, 0x0040($sp) -/* 01988 809CA748 1000000D */ beq $zero, $zero, .L809CA780 +/* 0197C 809CA73C 0C272946 */ jal func_809CA518 +/* 01980 809CA740 AFA20040 */ sw $v0, 0x0040($sp) +/* 01984 809CA744 8FA30040 */ lw $v1, 0x0040($sp) +/* 01988 809CA748 1000000D */ beq $zero, $zero, .L809CA780 /* 0198C 809CA74C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01990 809CA750 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 .L809CA754: @@ -124,37 +124,37 @@ glabel EnBox_Draw /* 0199C 809CA75C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 019A0 809CA760 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 /* 019A4 809CA764 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 019A8 809CA768 8FAA0074 */ lw $t2, 0x0074($sp) +/* 019A8 809CA768 8FAA0074 */ lw $t2, 0x0074($sp) /* 019AC 809CA76C 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 019B0 809CA770 0C272928 */ jal func_809CA4A0 -/* 019B4 809CA774 AFA2003C */ sw $v0, 0x003C($sp) -/* 019B8 809CA778 8FA3003C */ lw $v1, 0x003C($sp) +/* 019B0 809CA770 0C272928 */ jal func_809CA4A0 +/* 019B4 809CA774 AFA2003C */ sw $v0, 0x003C($sp) +/* 019B8 809CA778 8FA3003C */ lw $v1, 0x003C($sp) /* 019BC 809CA77C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L809CA780: /* 019C0 809CA780 8E250168 */ lw $a1, 0x0168($s1) ## 00000168 /* 019C4 809CA784 8E260184 */ lw $a2, 0x0184($s1) ## 00000184 /* 019C8 809CA788 3C0B809D */ lui $t3, %hi(func_809CA2D8) ## $t3 = 809D0000 /* 019CC 809CA78C 256BA2D8 */ addiu $t3, $t3, %lo(func_809CA2D8) ## $t3 = 809CA2D8 -/* 019D0 809CA790 AFAB0010 */ sw $t3, 0x0010($sp) -/* 019D4 809CA794 AFB10014 */ sw $s1, 0x0014($sp) +/* 019D0 809CA790 AFAB0010 */ sw $t3, 0x0010($sp) +/* 019D4 809CA794 AFB10014 */ sw $s1, 0x0014($sp) /* 019D8 809CA798 8E0C02D0 */ lw $t4, 0x02D0($s0) ## 000002D0 -/* 019DC 809CA79C 8FA40074 */ lw $a0, 0x0074($sp) +/* 019DC 809CA79C 8FA40074 */ lw $a0, 0x0074($sp) /* 019E0 809CA7A0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 019E4 809CA7A4 0C0288A2 */ jal func_800A2288 -/* 019E8 809CA7A8 AFAC0018 */ sw $t4, 0x0018($sp) +/* 019E4 809CA7A4 0C0288A2 */ jal SkelAnime_Draw2 +/* 019E8 809CA7A8 AFAC0018 */ sw $t4, 0x0018($sp) /* 019EC 809CA7AC AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L809CA7B0: -/* 019F0 809CA7B0 8FAD0074 */ lw $t5, 0x0074($sp) +/* 019F0 809CA7B0 8FAD0074 */ lw $t5, 0x0074($sp) .L809CA7B4: /* 019F4 809CA7B4 3C06809D */ lui $a2, %hi(D_809CA8E0) ## $a2 = 809D0000 /* 019F8 809CA7B8 24C6A8E0 */ addiu $a2, $a2, %lo(D_809CA8E0) ## $a2 = 809CA8E0 /* 019FC 809CA7BC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 01A00 809CA7C0 24070667 */ addiu $a3, $zero, 0x0667 ## $a3 = 00000667 -/* 01A04 809CA7C4 0C031AD5 */ jal func_800C6B54 +/* 01A04 809CA7C4 0C031AD5 */ jal func_800C6B54 /* 01A08 809CA7C8 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 01A0C 809CA7CC 8FBF002C */ lw $ra, 0x002C($sp) -/* 01A10 809CA7D0 8FB00024 */ lw $s0, 0x0024($sp) -/* 01A14 809CA7D4 8FB10028 */ lw $s1, 0x0028($sp) -/* 01A18 809CA7D8 03E00008 */ jr $ra +/* 01A0C 809CA7CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 01A10 809CA7D0 8FB00024 */ lw $s0, 0x0024($sp) +/* 01A14 809CA7D4 8FB10028 */ lw $s1, 0x0028($sp) +/* 01A18 809CA7D8 03E00008 */ jr $ra /* 01A1C 809CA7DC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Draw.s index dd87939664..875c976745 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Draw.s @@ -1,32 +1,32 @@ glabel EnBrob_Draw /* 00ED0 809CB9E0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00ED4 809CB9E4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00ED4 809CB9E4 AFB00028 */ sw $s0, 0x0028($sp) /* 00ED8 809CB9E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EDC 809CB9EC AFBF002C */ sw $ra, 0x002C($sp) -/* 00EE0 809CB9F0 AFA50034 */ sw $a1, 0x0034($sp) -/* 00EE4 809CB9F4 0C024F46 */ jal func_80093D18 +/* 00EDC 809CB9EC AFBF002C */ sw $ra, 0x002C($sp) +/* 00EE0 809CB9F0 AFA50034 */ sw $a1, 0x0034($sp) +/* 00EE4 809CB9F4 0C024F46 */ jal func_80093D18 /* 00EE8 809CB9F8 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 00EEC 809CB9FC 860F01AE */ lh $t7, 0x01AE($s0) ## 000001AE /* 00EF0 809CBA00 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00EF4 809CBA04 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00EF8 809CBA08 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00EFC 809CBA0C 44066000 */ mfc1 $a2, $f12 -/* 00F00 809CBA10 0C034261 */ jal Matrix_Translate -/* 00F04 809CBA14 468023A0 */ cvt.s.w $f14, $f4 +/* 00EFC 809CBA0C 44066000 */ mfc1 $a2, $f12 +/* 00F00 809CBA10 0C034261 */ jal Matrix_Translate +/* 00F04 809CBA14 468023A0 */ cvt.s.w $f14, $f4 /* 00F08 809CBA18 8E050168 */ lw $a1, 0x0168($s0) ## 00000168 /* 00F0C 809CBA1C 8E060184 */ lw $a2, 0x0184($s0) ## 00000184 /* 00F10 809CBA20 92070166 */ lbu $a3, 0x0166($s0) ## 00000166 /* 00F14 809CBA24 3C18809D */ lui $t8, %hi(func_809CB90C) ## $t8 = 809D0000 /* 00F18 809CBA28 2718B90C */ addiu $t8, $t8, %lo(func_809CB90C) ## $t8 = 809CB90C -/* 00F1C 809CBA2C AFB80014 */ sw $t8, 0x0014($sp) -/* 00F20 809CBA30 AFB00018 */ sw $s0, 0x0018($sp) -/* 00F24 809CBA34 AFA00010 */ sw $zero, 0x0010($sp) -/* 00F28 809CBA38 0C0286B2 */ jal func_800A1AC8 -/* 00F2C 809CBA3C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00F30 809CBA40 8FBF002C */ lw $ra, 0x002C($sp) -/* 00F34 809CBA44 8FB00028 */ lw $s0, 0x0028($sp) +/* 00F1C 809CBA2C AFB80014 */ sw $t8, 0x0014($sp) +/* 00F20 809CBA30 AFB00018 */ sw $s0, 0x0018($sp) +/* 00F24 809CBA34 AFA00010 */ sw $zero, 0x0010($sp) +/* 00F28 809CBA38 0C0286B2 */ jal SkelAnime_DrawSV +/* 00F2C 809CBA3C 8FA40034 */ lw $a0, 0x0034($sp) +/* 00F30 809CBA40 8FBF002C */ lw $ra, 0x002C($sp) +/* 00F34 809CBA44 8FB00028 */ lw $s0, 0x0028($sp) /* 00F38 809CBA48 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00F3C 809CBA4C 03E00008 */ jr $ra +/* 00F3C 809CBA4C 03E00008 */ jr $ra /* 00F40 809CBA50 00000000 */ nop /* 00F44 809CBA54 00000000 */ nop /* 00F48 809CBA58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s index e4915fe982..4b5ce0b40f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s @@ -1,117 +1,117 @@ glabel EnBrob_Init /* 00000 809CAB10 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 809CAB14 AFB00024 */ sw $s0, 0x0024($sp) +/* 00004 809CAB14 AFB00024 */ sw $s0, 0x0024($sp) /* 00008 809CAB18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 809CAB1C AFB10028 */ sw $s1, 0x0028($sp) +/* 0000C 809CAB1C AFB10028 */ sw $s1, 0x0028($sp) /* 00010 809CAB20 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00014 809CAB24 AFBF002C */ sw $ra, 0x002C($sp) +/* 00014 809CAB24 AFBF002C */ sw $ra, 0x002C($sp) /* 00018 809CAB28 260E01B0 */ addiu $t6, $s0, 0x01B0 ## $t6 = 000001B0 /* 0001C 809CAB2C 260F01EC */ addiu $t7, $s0, 0x01EC ## $t7 = 000001EC /* 00020 809CAB30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00024 809CAB34 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00028 809CAB38 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0002C 809CAB3C 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 00030 809CAB40 AFA00034 */ sw $zero, 0x0034($sp) -/* 00034 809CAB44 AFB80018 */ sw $t8, 0x0018($sp) +/* 00030 809CAB40 AFA00034 */ sw $zero, 0x0034($sp) +/* 00034 809CAB44 AFB80018 */ sw $t8, 0x0018($sp) /* 00038 809CAB48 24E71750 */ addiu $a3, $a3, 0x1750 ## $a3 = 06001750 /* 0003C 809CAB4C 24C615D8 */ addiu $a2, $a2, 0x15D8 ## $a2 = 060015D8 /* 00040 809CAB50 26050164 */ addiu $a1, $s0, 0x0164 ## $a1 = 00000164 -/* 00044 809CAB54 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00048 809CAB58 0C0291BE */ jal func_800A46F8 -/* 0004C 809CAB5C AFAE0010 */ sw $t6, 0x0010($sp) +/* 00044 809CAB54 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00048 809CAB58 0C0291BE */ jal SkelAnime_InitSV +/* 0004C 809CAB5C AFAE0010 */ sw $t6, 0x0010($sp) /* 00050 809CAB60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00054 809CAB64 0C010D20 */ jal DynaPolyInfo_SetActorMove - + /* 00058 809CAB68 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0005C 809CAB6C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00060 809CAB70 24841A70 */ addiu $a0, $a0, 0x1A70 ## $a0 = 06001A70 /* 00064 809CAB74 0C010620 */ jal DynaPolyInfo_Alloc - + /* 00068 809CAB78 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 /* 0006C 809CAB7C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00070 809CAB80 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 /* 00074 809CAB84 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00078 809CAB88 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor -/* 0007C 809CAB8C 8FA70034 */ lw $a3, 0x0034($sp) +/* 0007C 809CAB8C 8FA70034 */ lw $a3, 0x0034($sp) /* 00080 809CAB90 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 00084 809CAB94 26050228 */ addiu $a1, $s0, 0x0228 ## $a1 = 00000228 -/* 00088 809CAB98 AFA50030 */ sw $a1, 0x0030($sp) +/* 00088 809CAB98 AFA50030 */ sw $a1, 0x0030($sp) /* 0008C 809CAB9C 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00090 809CABA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00094 809CABA4 3C07809D */ lui $a3, %hi(D_809CBA80) ## $a3 = 809D0000 -/* 00098 809CABA8 8FA50030 */ lw $a1, 0x0030($sp) +/* 00098 809CABA8 8FA50030 */ lw $a1, 0x0030($sp) /* 0009C 809CABAC 24E7BA80 */ addiu $a3, $a3, %lo(D_809CBA80) ## $a3 = 809CBA80 /* 000A0 809CABB0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000A4 809CABB4 0C01712B */ jal ActorCollider_InitCylinder - + /* 000A8 809CABB8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000AC 809CABBC 26050274 */ addiu $a1, $s0, 0x0274 ## $a1 = 00000274 -/* 000B0 809CABC0 AFA50030 */ sw $a1, 0x0030($sp) +/* 000B0 809CABC0 AFA50030 */ sw $a1, 0x0030($sp) /* 000B4 809CABC4 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 000B8 809CABC8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000BC 809CABCC 3C07809D */ lui $a3, %hi(D_809CBA80) ## $a3 = 809D0000 -/* 000C0 809CABD0 8FA50030 */ lw $a1, 0x0030($sp) +/* 000C0 809CABD0 8FA50030 */ lw $a1, 0x0030($sp) /* 000C4 809CABD4 24E7BA80 */ addiu $a3, $a3, %lo(D_809CBA80) ## $a3 = 809CBA80 /* 000C8 809CABD8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000CC 809CABDC 0C01712B */ jal ActorCollider_InitCylinder - + /* 000D0 809CABE0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000D4 809CABE4 3C06809D */ lui $a2, %hi(D_809CBAAC) ## $a2 = 809D0000 /* 000D8 809CABE8 24C6BAAC */ addiu $a2, $a2, %lo(D_809CBAAC) ## $a2 = 809CBAAC /* 000DC 809CABEC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 000E0 809CABF0 0C0187B5 */ jal func_80061ED4 +/* 000E0 809CABF0 0C0187B5 */ jal func_80061ED4 /* 000E4 809CABF4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 000E8 809CABF8 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 000EC 809CABFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000F0 809CAC00 3C053BA3 */ lui $a1, 0x3BA3 ## $a1 = 3BA30000 -/* 000F4 809CAC04 00194203 */ sra $t0, $t9, 8 +/* 000F4 809CAC04 00194203 */ sra $t0, $t9, 8 /* 000F8 809CAC08 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 00000000 -/* 000FC 809CAC0C 15200016 */ bne $t1, $zero, .L809CAC68 +/* 000FC 809CAC0C 15200016 */ bne $t1, $zero, .L809CAC68 /* 00100 809CAC10 00000000 */ nop /* 00104 809CAC14 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00108 809CAC18 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 0010C 809CAC1C 0C00B58B */ jal Actor_SetScale - + /* 00110 809CAC20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00114 809CAC24 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 00118 809CAC28 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 0011C 809CAC2C 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 /* 00120 809CAC30 A60B001C */ sh $t3, 0x001C($s0) ## 0000001C /* 00124 809CAC34 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00128 809CAC38 1041001D */ beq $v0, $at, .L809CACB0 +/* 00128 809CAC38 1041001D */ beq $v0, $at, .L809CACB0 /* 0012C 809CAC3C 304C00FF */ andi $t4, $v0, 0x00FF ## $t4 = 00000000 /* 00130 809CAC40 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 /* 00134 809CAC44 3C01809D */ lui $at, %hi(D_809CBAC0) ## $at = 809D0000 -/* 00138 809CAC48 C428BAC0 */ lwc1 $f8, %lo(D_809CBAC0)($at) -/* 0013C 809CAC4C 468021A0 */ cvt.s.w $f6, $f4 +/* 00138 809CAC48 C428BAC0 */ lwc1 $f8, %lo(D_809CBAC0)($at) +/* 0013C 809CAC4C 468021A0 */ cvt.s.w $f6, $f4 /* 00140 809CAC50 C6100054 */ lwc1 $f16, 0x0054($s0) ## 00000054 -/* 00144 809CAC54 46083282 */ mul.s $f10, $f6, $f8 +/* 00144 809CAC54 46083282 */ mul.s $f10, $f6, $f8 /* 00148 809CAC58 00000000 */ nop -/* 0014C 809CAC5C 460A8482 */ mul.s $f18, $f16, $f10 -/* 00150 809CAC60 10000013 */ beq $zero, $zero, .L809CACB0 +/* 0014C 809CAC5C 460A8482 */ mul.s $f18, $f16, $f10 +/* 00150 809CAC60 10000013 */ beq $zero, $zero, .L809CACB0 /* 00154 809CAC64 E6120054 */ swc1 $f18, 0x0054($s0) ## 00000054 .L809CAC68: /* 00158 809CAC68 0C00B58B */ jal Actor_SetScale - + /* 0015C 809CAC6C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 0000D70A /* 00160 809CAC70 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 00164 809CAC74 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 00168 809CAC78 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 /* 0016C 809CAC7C A60E001C */ sh $t6, 0x001C($s0) ## 0000001C /* 00170 809CAC80 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00174 809CAC84 1041000A */ beq $v0, $at, .L809CACB0 +/* 00174 809CAC84 1041000A */ beq $v0, $at, .L809CACB0 /* 00178 809CAC88 304F00FF */ andi $t7, $v0, 0x00FF ## $t7 = 00000000 /* 0017C 809CAC8C 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 /* 00180 809CAC90 3C01809D */ lui $at, %hi(D_809CBAC4) ## $at = 809D0000 -/* 00184 809CAC94 C428BAC4 */ lwc1 $f8, %lo(D_809CBAC4)($at) -/* 00188 809CAC98 468021A0 */ cvt.s.w $f6, $f4 +/* 00184 809CAC94 C428BAC4 */ lwc1 $f8, %lo(D_809CBAC4)($at) +/* 00188 809CAC98 468021A0 */ cvt.s.w $f6, $f4 /* 0018C 809CAC9C C60A0054 */ lwc1 $f10, 0x0054($s0) ## 00000054 -/* 00190 809CACA0 46083402 */ mul.s $f16, $f6, $f8 +/* 00190 809CACA0 46083402 */ mul.s $f16, $f6, $f8 /* 00194 809CACA4 00000000 */ nop -/* 00198 809CACA8 46105482 */ mul.s $f18, $f10, $f16 +/* 00198 809CACA8 46105482 */ mul.s $f18, $f10, $f16 /* 0019C 809CACAC E6120054 */ swc1 $f18, 0x0054($s0) ## 00000054 .L809CACB0: /* 001A0 809CACB0 86180268 */ lh $t8, 0x0268($s0) ## 00000268 @@ -120,52 +120,52 @@ glabel EnBrob_Init /* 001AC 809CACBC 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 001B0 809CACC0 3C01809D */ lui $at, %hi(D_809CBAC8) ## $at = 809D0000 /* 001B4 809CACC4 C6120054 */ lwc1 $f18, 0x0054($s0) ## 00000054 -/* 001B8 809CACC8 468021A0 */ cvt.s.w $f6, $f4 +/* 001B8 809CACC8 468021A0 */ cvt.s.w $f6, $f4 /* 001BC 809CACCC 860E02B6 */ lh $t6, 0x02B6($s0) ## 000002B6 /* 001C0 809CACD0 861902B8 */ lh $t9, 0x02B8($s0) ## 000002B8 /* 001C4 809CACD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001C8 809CACD8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 001CC 809CACDC 46083282 */ mul.s $f10, $f6, $f8 -/* 001D0 809CACE0 4600540D */ trunc.w.s $f16, $f10 +/* 001CC 809CACDC 46083282 */ mul.s $f10, $f6, $f8 +/* 001D0 809CACE0 4600540D */ trunc.w.s $f16, $f10 /* 001D4 809CACE4 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 -/* 001D8 809CACE8 44088000 */ mfc1 $t0, $f16 -/* 001DC 809CACEC 46805420 */ cvt.s.w $f16, $f10 +/* 001D8 809CACE8 44088000 */ mfc1 $t0, $f16 +/* 001DC 809CACEC 46805420 */ cvt.s.w $f16, $f10 /* 001E0 809CACF0 A6080268 */ sh $t0, 0x0268($s0) ## 00000268 -/* 001E4 809CACF4 C424BAC8 */ lwc1 $f4, %lo(D_809CBAC8)($at) +/* 001E4 809CACF4 C424BAC8 */ lwc1 $f4, %lo(D_809CBAC8)($at) /* 001E8 809CACF8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 001EC 809CACFC A600026C */ sh $zero, 0x026C($s0) ## 0000026C -/* 001F0 809CAD00 46049182 */ mul.s $f6, $f18, $f4 +/* 001F0 809CAD00 46049182 */ mul.s $f6, $f18, $f4 /* 001F4 809CAD04 C6120050 */ lwc1 $f18, 0x0050($s0) ## 00000050 /* 001F8 809CAD08 AE0001A8 */ sw $zero, 0x01A8($s0) ## 000001A8 -/* 001FC 809CAD0C 46128102 */ mul.s $f4, $f16, $f18 +/* 001FC 809CAD0C 46128102 */ mul.s $f4, $f16, $f18 /* 00200 809CAD10 C6100054 */ lwc1 $f16, 0x0054($s0) ## 00000054 -/* 00204 809CAD14 4600320D */ trunc.w.s $f8, $f6 -/* 00208 809CAD18 4600218D */ trunc.w.s $f6, $f4 -/* 0020C 809CAD1C 440A4000 */ mfc1 $t2, $f8 +/* 00204 809CAD14 4600320D */ trunc.w.s $f8, $f6 +/* 00208 809CAD18 4600218D */ trunc.w.s $f6, $f4 +/* 0020C 809CAD1C 440A4000 */ mfc1 $t2, $f8 /* 00210 809CAD20 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 00214 809CAD24 440D3000 */ mfc1 $t5, $f6 -/* 00218 809CAD28 468042A0 */ cvt.s.w $f10, $f8 +/* 00214 809CAD24 440D3000 */ mfc1 $t5, $f6 +/* 00218 809CAD28 468042A0 */ cvt.s.w $f10, $f8 /* 0021C 809CAD2C 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 /* 00220 809CAD30 A60A026A */ sh $t2, 0x026A($s0) ## 0000026A /* 00224 809CAD34 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 00228 809CAD38 A60D02B4 */ sh $t5, 0x02B4($s0) ## 000002B4 -/* 0022C 809CAD3C 46803220 */ cvt.s.w $f8, $f6 -/* 00230 809CAD40 46105482 */ mul.s $f18, $f10, $f16 +/* 0022C 809CAD3C 46803220 */ cvt.s.w $f8, $f6 +/* 00230 809CAD40 46105482 */ mul.s $f18, $f10, $f16 /* 00234 809CAD44 C60A0054 */ lwc1 $f10, 0x0054($s0) ## 00000054 -/* 00238 809CAD48 01415824 */ and $t3, $t2, $at +/* 00238 809CAD48 01415824 */ and $t3, $t2, $at /* 0023C 809CAD4C AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 00240 809CAD50 460A4402 */ mul.s $f16, $f8, $f10 -/* 00244 809CAD54 4600910D */ trunc.w.s $f4, $f18 -/* 00248 809CAD58 4600848D */ trunc.w.s $f18, $f16 -/* 0024C 809CAD5C 44182000 */ mfc1 $t8, $f4 -/* 00250 809CAD60 44099000 */ mfc1 $t1, $f18 +/* 00240 809CAD50 460A4402 */ mul.s $f16, $f8, $f10 +/* 00244 809CAD54 4600910D */ trunc.w.s $f4, $f18 +/* 00248 809CAD58 4600848D */ trunc.w.s $f18, $f16 +/* 0024C 809CAD5C 44182000 */ mfc1 $t8, $f4 +/* 00250 809CAD60 44099000 */ mfc1 $t1, $f18 /* 00254 809CAD64 A61802B6 */ sh $t8, 0x02B6($s0) ## 000002B6 -/* 00258 809CAD68 0C272B77 */ jal func_809CADDC +/* 00258 809CAD68 0C272B77 */ jal func_809CADDC /* 0025C 809CAD6C A60902B8 */ sh $t1, 0x02B8($s0) ## 000002B8 -/* 00260 809CAD70 8FBF002C */ lw $ra, 0x002C($sp) -/* 00264 809CAD74 8FB00024 */ lw $s0, 0x0024($sp) -/* 00268 809CAD78 8FB10028 */ lw $s1, 0x0028($sp) -/* 0026C 809CAD7C 03E00008 */ jr $ra +/* 00260 809CAD70 8FBF002C */ lw $ra, 0x002C($sp) +/* 00264 809CAD74 8FB00024 */ lw $s0, 0x0024($sp) +/* 00268 809CAD78 8FB10028 */ lw $s1, 0x0028($sp) +/* 0026C 809CAD7C 03E00008 */ jr $ra /* 00270 809CAD80 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s index 33c8445c82..1b7d2fe138 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s @@ -1,14 +1,14 @@ glabel func_809CAEA0 /* 00390 809CAEA0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00394 809CAEA4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00394 809CAEA4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00398 809CAEA8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0039C 809CAEAC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003A0 809CAEB0 24A51958 */ addiu $a1, $a1, 0x1958 ## $a1 = 06001958 -/* 003A4 809CAEB4 AFA70018 */ sw $a3, 0x0018($sp) +/* 003A4 809CAEB4 AFA70018 */ sw $a3, 0x0018($sp) /* 003A8 809CAEB8 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 003AC 809CAEBC 0C0294D3 */ jal func_800A534C +/* 003AC 809CAEBC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 003B0 809CAEC0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 003B4 809CAEC4 8FA70018 */ lw $a3, 0x0018($sp) +/* 003B4 809CAEC4 8FA70018 */ lw $a3, 0x0018($sp) /* 003B8 809CAEC8 3C18809D */ lui $t8, %hi(func_809CB218) ## $t8 = 809D0000 /* 003BC 809CAECC 240E1F40 */ addiu $t6, $zero, 0x1F40 ## $t6 = 00001F40 /* 003C0 809CAED0 240F04B0 */ addiu $t7, $zero, 0x04B0 ## $t7 = 000004B0 @@ -16,9 +16,9 @@ glabel func_809CAEA0 /* 003C8 809CAED8 A4EE01AE */ sh $t6, 0x01AE($a3) ## 000001AE /* 003CC 809CAEDC A4EF01AC */ sh $t7, 0x01AC($a3) ## 000001AC /* 003D0 809CAEE0 ACF801A8 */ sw $t8, 0x01A8($a3) ## 000001A8 -/* 003D4 809CAEE4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003D4 809CAEE4 8FBF0014 */ lw $ra, 0x0014($sp) /* 003D8 809CAEE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003DC 809CAEEC 03E00008 */ jr $ra +/* 003DC 809CAEEC 03E00008 */ jr $ra /* 003E0 809CAEF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s index 7a42216b76..8c217277b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s @@ -1,22 +1,22 @@ glabel func_809CB008 /* 004F8 809CB008 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004FC 809CB00C AFBF0014 */ sw $ra, 0x0014($sp) +/* 004FC 809CB00C AFBF0014 */ sw $ra, 0x0014($sp) /* 00500 809CB010 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00504 809CB014 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00508 809CB018 24A51678 */ addiu $a1, $a1, 0x1678 ## $a1 = 06001678 -/* 0050C 809CB01C AFA70018 */ sw $a3, 0x0018($sp) +/* 0050C 809CB01C AFA70018 */ sw $a3, 0x0018($sp) /* 00510 809CB020 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00514 809CB024 0C0294D3 */ jal func_800A534C +/* 00514 809CB024 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00518 809CB028 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 0051C 809CB02C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0051C 809CB02C 8FA70018 */ lw $a3, 0x0018($sp) /* 00520 809CB030 3C0F809D */ lui $t7, %hi(func_809CB458) ## $t7 = 809D0000 /* 00524 809CB034 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 00528 809CB038 25EFB458 */ addiu $t7, $t7, %lo(func_809CB458) ## $t7 = 809CB458 /* 0052C 809CB03C A4EE01AC */ sh $t6, 0x01AC($a3) ## 000001AC /* 00530 809CB040 ACEF01A8 */ sw $t7, 0x01A8($a3) ## 000001A8 -/* 00534 809CB044 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00534 809CB044 8FBF0014 */ lw $ra, 0x0014($sp) /* 00538 809CB048 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0053C 809CB04C 03E00008 */ jr $ra +/* 0053C 809CB04C 03E00008 */ jr $ra /* 00540 809CB050 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s index c34b43592e..261c769cc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s @@ -1,10 +1,10 @@ glabel EnBw_Draw /* 02858 809D0F38 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 0285C 809D0F3C 3C0F809D */ lui $t7, %hi(D_809D1554) ## $t7 = 809D0000 -/* 02860 809D0F40 AFBF0044 */ sw $ra, 0x0044($sp) -/* 02864 809D0F44 AFB20040 */ sw $s2, 0x0040($sp) -/* 02868 809D0F48 AFB1003C */ sw $s1, 0x003C($sp) -/* 0286C 809D0F4C AFB00038 */ sw $s0, 0x0038($sp) +/* 02860 809D0F40 AFBF0044 */ sw $ra, 0x0044($sp) +/* 02864 809D0F44 AFB20040 */ sw $s2, 0x0040($sp) +/* 02868 809D0F48 AFB1003C */ sw $s1, 0x003C($sp) +/* 0286C 809D0F4C AFB00038 */ sw $s0, 0x0038($sp) /* 02870 809D0F50 25EF1554 */ addiu $t7, $t7, %lo(D_809D1554) ## $t7 = 809D1554 /* 02874 809D0F54 8DF90000 */ lw $t9, 0x0000($t7) ## 809D1554 /* 02878 809D0F58 27AE00AC */ addiu $t6, $sp, 0x00AC ## $t6 = FFFFFFF4 @@ -20,13 +20,13 @@ glabel EnBw_Draw /* 028A0 809D0F80 24C61570 */ addiu $a2, $a2, %lo(D_809D1570) ## $a2 = 809D1570 /* 028A4 809D0F84 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFC8 /* 028A8 809D0F88 2407058F */ addiu $a3, $zero, 0x058F ## $a3 = 0000058F -/* 028AC 809D0F8C 0C031AB1 */ jal func_800C6AC4 +/* 028AC 809D0F8C 0C031AB1 */ jal func_800C6AC4 /* 028B0 809D0F90 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 028B4 809D0F94 9209022F */ lbu $t1, 0x022F($s0) ## 0000022F /* 028B8 809D0F98 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 028BC 809D0F9C 15210028 */ bne $t1, $at, .L809D1040 +/* 028BC 809D0F9C 15210028 */ bne $t1, $at, .L809D1040 /* 028C0 809D0FA0 00000000 */ nop -/* 028C4 809D0FA4 0C024F46 */ jal func_80093D18 +/* 028C4 809D0FA4 0C024F46 */ jal func_80093D18 /* 028C8 809D0FA8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 028CC 809D0FAC 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 028D0 809D0FB0 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 @@ -37,11 +37,11 @@ glabel EnBw_Draw /* 028E4 809D0FC4 9218022D */ lbu $t8, 0x022D($s0) ## 0000022D /* 028E8 809D0FC8 920D022C */ lbu $t5, 0x022C($s0) ## 0000022C /* 028EC 809D0FCC 920B022E */ lbu $t3, 0x022E($s0) ## 0000022E -/* 028F0 809D0FD0 0018CC00 */ sll $t9, $t8, 16 +/* 028F0 809D0FD0 0018CC00 */ sll $t9, $t8, 16 /* 028F4 809D0FD4 9218022F */ lbu $t8, 0x022F($s0) ## 0000022F -/* 028F8 809D0FD8 000D7600 */ sll $t6, $t5, 24 +/* 028F8 809D0FD8 000D7600 */ sll $t6, $t5, 24 /* 028FC 809D0FDC 01D94825 */ or $t1, $t6, $t9 ## $t1 = 00000000 -/* 02900 809D0FE0 000B6200 */ sll $t4, $t3, 8 +/* 02900 809D0FE0 000B6200 */ sll $t4, $t3, 8 /* 02904 809D0FE4 012C6825 */ or $t5, $t1, $t4 ## $t5 = 00000000 /* 02908 809D0FE8 01B87025 */ or $t6, $t5, $t8 ## $t6 = 00000000 /* 0290C 809D0FEC AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 @@ -56,17 +56,17 @@ glabel EnBw_Draw /* 02930 809D1010 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 02934 809D1014 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 02938 809D1018 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 0293C 809D101C AFB00014 */ sw $s0, 0x0014($sp) -/* 02940 809D1020 AFA00010 */ sw $zero, 0x0010($sp) +/* 0293C 809D101C AFB00014 */ sw $s0, 0x0014($sp) +/* 02940 809D1020 AFA00010 */ sw $zero, 0x0010($sp) /* 02944 809D1024 8E2902C0 */ lw $t1, 0x02C0($s1) ## 000002C0 /* 02948 809D1028 24E70D18 */ addiu $a3, $a3, %lo(func_809D0D18) ## $a3 = 809D0D18 /* 0294C 809D102C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02950 809D1030 0C0288A2 */ jal func_800A2288 -/* 02954 809D1034 AFA90018 */ sw $t1, 0x0018($sp) -/* 02958 809D1038 10000035 */ beq $zero, $zero, .L809D1110 +/* 02950 809D1030 0C0288A2 */ jal SkelAnime_Draw2 +/* 02954 809D1034 AFA90018 */ sw $t1, 0x0018($sp) +/* 02958 809D1038 10000035 */ beq $zero, $zero, .L809D1110 /* 0295C 809D103C AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 .L809D1040: -/* 02960 809D1040 0C024F61 */ jal func_80093D84 +/* 02960 809D1040 0C024F61 */ jal func_80093D84 /* 02964 809D1044 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 02968 809D1048 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0296C 809D104C 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 @@ -93,11 +93,11 @@ glabel EnBw_Draw /* 029C0 809D10A0 9218022D */ lbu $t8, 0x022D($s0) ## 0000022D /* 029C4 809D10A4 920C022C */ lbu $t4, 0x022C($s0) ## 0000022C /* 029C8 809D10A8 920B022E */ lbu $t3, 0x022E($s0) ## 0000022E -/* 029CC 809D10AC 00187400 */ sll $t6, $t8, 16 +/* 029CC 809D10AC 00187400 */ sll $t6, $t8, 16 /* 029D0 809D10B0 9218022F */ lbu $t8, 0x022F($s0) ## 0000022F -/* 029D4 809D10B4 000C7E00 */ sll $t7, $t4, 24 +/* 029D4 809D10B4 000C7E00 */ sll $t7, $t4, 24 /* 029D8 809D10B8 01EEC825 */ or $t9, $t7, $t6 ## $t9 = E7000000 -/* 029DC 809D10BC 000B4A00 */ sll $t1, $t3, 8 +/* 029DC 809D10BC 000B4A00 */ sll $t1, $t3, 8 /* 029E0 809D10C0 03296025 */ or $t4, $t9, $t1 ## $t4 = E7000000 /* 029E4 809D10C4 01987825 */ or $t7, $t4, $t8 ## $t7 = FF008080 /* 029E8 809D10C8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 @@ -112,67 +112,67 @@ glabel EnBw_Draw /* 02A0C 809D10EC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 02A10 809D10F0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 02A14 809D10F4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 02A18 809D10F8 AFB00014 */ sw $s0, 0x0014($sp) -/* 02A1C 809D10FC AFA00010 */ sw $zero, 0x0010($sp) +/* 02A18 809D10F8 AFB00014 */ sw $s0, 0x0014($sp) +/* 02A1C 809D10FC AFA00010 */ sw $zero, 0x0010($sp) /* 02A20 809D1100 8E3902D0 */ lw $t9, 0x02D0($s1) ## 000002D0 -/* 02A24 809D1104 0C0288A2 */ jal func_800A2288 -/* 02A28 809D1108 AFB90018 */ sw $t9, 0x0018($sp) +/* 02A24 809D1104 0C0288A2 */ jal SkelAnime_Draw2 +/* 02A28 809D1108 AFB90018 */ sw $t9, 0x0018($sp) /* 02A2C 809D110C AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0 .L809D1110: /* 02A30 809D1110 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02A34 809D1114 02414821 */ addu $t1, $s2, $at -/* 02A38 809D1118 AFA90050 */ sw $t1, 0x0050($sp) +/* 02A34 809D1114 02414821 */ addu $t1, $s2, $at +/* 02A38 809D1118 AFA90050 */ sw $t1, 0x0050($sp) /* 02A3C 809D111C 8D381DE4 */ lw $t8, 0x1DE4($t1) ## 00001DE4 /* 02A40 809D1120 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 02A44 809D1124 3C01809D */ lui $at, %hi(D_809D16CC) ## $at = 809D0000 /* 02A48 809D1128 270F0001 */ addiu $t7, $t8, 0x0001 ## $t7 = 00000001 /* 02A4C 809D112C 31EE0003 */ andi $t6, $t7, 0x0003 ## $t6 = 00000001 -/* 02A50 809D1130 15AE001E */ bne $t5, $t6, .L809D11AC +/* 02A50 809D1130 15AE001E */ bne $t5, $t6, .L809D11AC /* 02A54 809D1134 00000000 */ nop /* 02A58 809D1138 C6040058 */ lwc1 $f4, 0x0058($s0) ## 00000058 -/* 02A5C 809D113C C42616CC */ lwc1 $f6, %lo(D_809D16CC)($at) +/* 02A5C 809D113C C42616CC */ lwc1 $f6, %lo(D_809D16CC)($at) /* 02A60 809D1140 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFF4 /* 02A64 809D1144 26050264 */ addiu $a1, $s0, 0x0264 ## $a1 = 00000264 -/* 02A68 809D1148 46062202 */ mul.s $f8, $f4, $f6 -/* 02A6C 809D114C 0C0346BD */ jal Matrix_MultVec3f -/* 02A70 809D1150 E7A800B4 */ swc1 $f8, 0x00B4($sp) +/* 02A68 809D1148 46062202 */ mul.s $f8, $f4, $f6 +/* 02A6C 809D114C 0C0346BD */ jal Matrix_MultVec3f +/* 02A70 809D1150 E7A800B4 */ swc1 $f8, 0x00B4($sp) /* 02A74 809D1154 3C01809D */ lui $at, %hi(D_809D16D0) ## $at = 809D0000 -/* 02A78 809D1158 C43016D0 */ lwc1 $f16, %lo(D_809D16D0)($at) +/* 02A78 809D1158 C43016D0 */ lwc1 $f16, %lo(D_809D16D0)($at) /* 02A7C 809D115C C60A0058 */ lwc1 $f10, 0x0058($s0) ## 00000058 /* 02A80 809D1160 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFF4 /* 02A84 809D1164 26050270 */ addiu $a1, $s0, 0x0270 ## $a1 = 00000270 -/* 02A88 809D1168 46105482 */ mul.s $f18, $f10, $f16 -/* 02A8C 809D116C 0C0346BD */ jal Matrix_MultVec3f -/* 02A90 809D1170 E7B200B4 */ swc1 $f18, 0x00B4($sp) +/* 02A88 809D1168 46105482 */ mul.s $f18, $f10, $f16 +/* 02A8C 809D116C 0C0346BD */ jal Matrix_MultVec3f +/* 02A90 809D1170 E7B200B4 */ swc1 $f18, 0x00B4($sp) /* 02A94 809D1174 3C01809D */ lui $at, %hi(D_809D16D4) ## $at = 809D0000 -/* 02A98 809D1178 C42616D4 */ lwc1 $f6, %lo(D_809D16D4)($at) +/* 02A98 809D1178 C42616D4 */ lwc1 $f6, %lo(D_809D16D4)($at) /* 02A9C 809D117C C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 /* 02AA0 809D1180 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFF4 /* 02AA4 809D1184 26050288 */ addiu $a1, $s0, 0x0288 ## $a1 = 00000288 -/* 02AA8 809D1188 46062202 */ mul.s $f8, $f4, $f6 -/* 02AAC 809D118C 0C0346BD */ jal Matrix_MultVec3f -/* 02AB0 809D1190 E7A800AC */ swc1 $f8, 0x00AC($sp) -/* 02AB4 809D1194 C7AA00AC */ lwc1 $f10, 0x00AC($sp) +/* 02AA8 809D1188 46062202 */ mul.s $f8, $f4, $f6 +/* 02AAC 809D118C 0C0346BD */ jal Matrix_MultVec3f +/* 02AB0 809D1190 E7A800AC */ swc1 $f8, 0x00AC($sp) +/* 02AB4 809D1194 C7AA00AC */ lwc1 $f10, 0x00AC($sp) /* 02AB8 809D1198 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFF4 /* 02ABC 809D119C 2605027C */ addiu $a1, $s0, 0x027C ## $a1 = 0000027C -/* 02AC0 809D11A0 46005407 */ neg.s $f16, $f10 -/* 02AC4 809D11A4 0C0346BD */ jal Matrix_MultVec3f -/* 02AC8 809D11A8 E7B000AC */ swc1 $f16, 0x00AC($sp) +/* 02AC0 809D11A0 46005407 */ neg.s $f16, $f10 +/* 02AC4 809D11A4 0C0346BD */ jal Matrix_MultVec3f +/* 02AC8 809D11A8 E7B000AC */ swc1 $f16, 0x00AC($sp) .L809D11AC: /* 02ACC 809D11AC 3C01809D */ lui $at, %hi(D_809D16D8) ## $at = 809D0000 -/* 02AD0 809D11B0 C42416D8 */ lwc1 $f4, %lo(D_809D16D8)($at) +/* 02AD0 809D11B0 C42416D8 */ lwc1 $f4, %lo(D_809D16D8)($at) /* 02AD4 809D11B4 C6120054 */ lwc1 $f18, 0x0054($s0) ## 00000054 /* 02AD8 809D11B8 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 02ADC 809D11BC 44814000 */ mtc1 $at, $f8 ## $f8 = 1000.00 -/* 02AE0 809D11C0 46049181 */ sub.s $f6, $f18, $f4 +/* 02AE0 809D11C0 46049181 */ sub.s $f6, $f18, $f4 /* 02AE4 809D11C4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 02AE8 809D11C8 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 /* 02AEC 809D11CC 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 02AF0 809D11D0 46083282 */ mul.s $f10, $f6, $f8 +/* 02AF0 809D11D0 46083282 */ mul.s $f10, $f6, $f8 /* 02AF4 809D11D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02AF8 809D11D8 0C034261 */ jal Matrix_Translate -/* 02AFC 809D11DC 460A8380 */ add.s $f14, $f16, $f10 -/* 02B00 809D11E0 0C024F61 */ jal func_80093D84 +/* 02AF8 809D11D8 0C034261 */ jal Matrix_Translate +/* 02AFC 809D11DC 460A8380 */ add.s $f14, $f16, $f10 +/* 02B00 809D11E0 0C024F61 */ jal func_80093D84 /* 02B04 809D11E4 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 02B08 809D11E8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 02B0C 809D11EC 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 @@ -188,31 +188,31 @@ glabel EnBw_Draw /* 02B34 809D1214 AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 /* 02B38 809D1218 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 02B3C 809D121C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02B40 809D1220 8FAE0050 */ lw $t6, 0x0050($sp) +/* 02B40 809D1220 8FAE0050 */ lw $t6, 0x0050($sp) /* 02B44 809D1224 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 /* 02B48 809D1228 240F0040 */ addiu $t7, $zero, 0x0040 ## $t7 = 00000040 /* 02B4C 809D122C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 02B50 809D1230 AFAD0018 */ sw $t5, 0x0018($sp) -/* 02B54 809D1234 AFAF0014 */ sw $t7, 0x0014($sp) -/* 02B58 809D1238 AFB80010 */ sw $t8, 0x0010($sp) -/* 02B5C 809D123C AFA0001C */ sw $zero, 0x001C($sp) +/* 02B50 809D1230 AFAD0018 */ sw $t5, 0x0018($sp) +/* 02B54 809D1234 AFAF0014 */ sw $t7, 0x0014($sp) +/* 02B58 809D1238 AFB80010 */ sw $t8, 0x0010($sp) +/* 02B5C 809D123C AFA0001C */ sw $zero, 0x001C($sp) /* 02B60 809D1240 8DCA1DE4 */ lw $t2, 0x1DE4($t6) ## 00001DE4 /* 02B64 809D1244 240C0080 */ addiu $t4, $zero, 0x0080 ## $t4 = 00000080 /* 02B68 809D1248 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 02B6C 809D124C 000A0823 */ subu $at, $zero, $t2 -/* 02B70 809D1250 00015880 */ sll $t3, $at, 2 -/* 02B74 809D1254 01615821 */ addu $t3, $t3, $at -/* 02B78 809D1258 000B5880 */ sll $t3, $t3, 2 +/* 02B6C 809D124C 000A0823 */ subu $at, $zero, $t2 +/* 02B70 809D1250 00015880 */ sll $t3, $at, 2 +/* 02B74 809D1254 01615821 */ addu $t3, $t3, $at +/* 02B78 809D1258 000B5880 */ sll $t3, $t3, 2 /* 02B7C 809D125C 317901FF */ andi $t9, $t3, 0x01FF ## $t9 = 00000000 -/* 02B80 809D1260 AFB90020 */ sw $t9, 0x0020($sp) -/* 02B84 809D1264 AFA90024 */ sw $t1, 0x0024($sp) -/* 02B88 809D1268 AFAC0028 */ sw $t4, 0x0028($sp) +/* 02B80 809D1260 AFB90020 */ sw $t9, 0x0020($sp) +/* 02B84 809D1264 AFA90024 */ sw $t1, 0x0024($sp) +/* 02B88 809D1268 AFAC0028 */ sw $t4, 0x0028($sp) /* 02B8C 809D126C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02B90 809D1270 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 02B94 809D1274 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02B98 809D1278 0C0253D0 */ jal Draw_TwoTexScroll -/* 02B9C 809D127C AFA20060 */ sw $v0, 0x0060($sp) -/* 02BA0 809D1280 8FA30060 */ lw $v1, 0x0060($sp) +/* 02B98 809D1278 0C0253D0 */ jal Draw_TwoTexScroll +/* 02B9C 809D127C AFA20060 */ sw $v0, 0x0060($sp) +/* 02BA0 809D1280 8FA30060 */ lw $v1, 0x0060($sp) /* 02BA4 809D1284 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 /* 02BA8 809D1288 3C0DFFFF */ lui $t5, 0xFFFF ## $t5 = FFFF0000 /* 02BAC 809D128C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -224,17 +224,17 @@ glabel EnBw_Draw /* 02BC4 809D12A4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 02BC8 809D12A8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 02BCC 809D12AC 3C01809D */ lui $at, %hi(D_809D16DC) ## $at = 809D0000 -/* 02BD0 809D12B0 C42416DC */ lwc1 $f4, %lo(D_809D16DC)($at) +/* 02BD0 809D12B0 C42416DC */ lwc1 $f4, %lo(D_809D16DC)($at) /* 02BD4 809D12B4 C6120248 */ lwc1 $f18, 0x0248($s0) ## 00000248 /* 02BD8 809D12B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02BDC 809D12BC 46049302 */ mul.s $f12, $f18, $f4 -/* 02BE0 809D12C0 44066000 */ mfc1 $a2, $f12 -/* 02BE4 809D12C4 0C0342A3 */ jal Matrix_Scale -/* 02BE8 809D12C8 46006386 */ mov.s $f14, $f12 +/* 02BDC 809D12BC 46049302 */ mul.s $f12, $f18, $f4 +/* 02BE0 809D12C0 44066000 */ mfc1 $a2, $f12 +/* 02BE4 809D12C4 0C0342A3 */ jal Matrix_Scale +/* 02BE8 809D12C8 46006386 */ mov.s $f14, $f12 /* 02BEC 809D12CC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02BF0 809D12D0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 02BF4 809D12D4 0C0347F5 */ jal func_800D1FD4 -/* 02BF8 809D12D8 02412021 */ addu $a0, $s2, $at +/* 02BF4 809D12D4 0C0347F5 */ jal func_800D1FD4 +/* 02BF8 809D12D8 02412021 */ addu $a0, $s2, $at /* 02BFC 809D12DC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 02C00 809D12E0 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 /* 02C04 809D12E4 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 @@ -245,9 +245,9 @@ glabel EnBw_Draw /* 02C18 809D12F8 3C05809D */ lui $a1, %hi(D_809D1580) ## $a1 = 809D0000 /* 02C1C 809D12FC 24A51580 */ addiu $a1, $a1, %lo(D_809D1580) ## $a1 = 809D1580 /* 02C20 809D1300 240605DC */ addiu $a2, $zero, 0x05DC ## $a2 = 000005DC -/* 02C24 809D1304 0C0346A2 */ jal Matrix_NewMtx -/* 02C28 809D1308 AFA20058 */ sw $v0, 0x0058($sp) -/* 02C2C 809D130C 8FA30058 */ lw $v1, 0x0058($sp) +/* 02C24 809D1304 0C0346A2 */ jal Matrix_NewMtx +/* 02C28 809D1308 AFA20058 */ sw $v0, 0x0058($sp) +/* 02C2C 809D130C 8FA30058 */ lw $v1, 0x0058($sp) /* 02C30 809D1310 3C090405 */ lui $t1, 0x0405 ## $t1 = 04050000 /* 02C34 809D1314 2529D4E0 */ addiu $t1, $t1, 0xD4E0 ## $t1 = 0404D4E0 /* 02C38 809D1318 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -258,7 +258,7 @@ glabel EnBw_Draw /* 02C4C 809D132C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 02C50 809D1330 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 02C54 809D1334 920C023B */ lbu $t4, 0x023B($s0) ## 0000023B -/* 02C58 809D1338 11800031 */ beq $t4, $zero, .L809D1400 +/* 02C58 809D1338 11800031 */ beq $t4, $zero, .L809D1400 /* 02C5C 809D133C 00000000 */ nop /* 02C60 809D1340 920D023B */ lbu $t5, 0x023B($s0) ## 0000023B /* 02C64 809D1344 92180114 */ lbu $t8, 0x0114($s0) ## 00000114 @@ -268,57 +268,57 @@ glabel EnBw_Draw /* 02C74 809D1354 310A0003 */ andi $t2, $t0, 0x0003 ## $t2 = 00000003 /* 02C78 809D1358 270F0001 */ addiu $t7, $t8, 0x0001 ## $t7 = 00000001 /* 02C7C 809D135C A20F0114 */ sb $t7, 0x0114($s0) ## 00000114 -/* 02C80 809D1360 15400027 */ bne $t2, $zero, .L809D1400 +/* 02C80 809D1360 15400027 */ bne $t2, $zero, .L809D1400 /* 02C84 809D1364 A20E023B */ sb $t6, 0x023B($s0) ## 0000023B -/* 02C88 809D1368 00081883 */ sra $v1, $t0, 2 -/* 02C8C 809D136C 00035880 */ sll $t3, $v1, 2 -/* 02C90 809D1370 01635823 */ subu $t3, $t3, $v1 -/* 02C94 809D1374 000B5880 */ sll $t3, $t3, 2 +/* 02C88 809D1368 00081883 */ sra $v1, $t0, 2 +/* 02C8C 809D136C 00035880 */ sll $t3, $v1, 2 +/* 02C90 809D1370 01635823 */ subu $t3, $t3, $v1 +/* 02C94 809D1374 000B5880 */ sll $t3, $t3, 2 /* 02C98 809D1378 273914F4 */ addiu $t9, $t9, %lo(D_809D14F4) ## $t9 = 809D14F4 -/* 02C9C 809D137C 01791021 */ addu $v0, $t3, $t9 +/* 02C9C 809D137C 01791021 */ addu $v0, $t3, $t9 /* 02CA0 809D1380 C4460000 */ lwc1 $f6, 0x0000($v0) ## 00000000 /* 02CA4 809D1384 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 02CA8 809D1388 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 00000004 /* 02CAC 809D138C 3C01809D */ lui $at, %hi(D_809D16E0) ## $at = 809D0000 -/* 02CB0 809D1390 46083400 */ add.s $f16, $f6, $f8 +/* 02CB0 809D1390 46083400 */ add.s $f16, $f6, $f8 /* 02CB4 809D1394 C4460008 */ lwc1 $f6, 0x0008($v0) ## 00000008 /* 02CB8 809D1398 24090096 */ addiu $t1, $zero, 0x0096 ## $t1 = 00000096 /* 02CBC 809D139C 240C0096 */ addiu $t4, $zero, 0x0096 ## $t4 = 00000096 -/* 02CC0 809D13A0 E7B00098 */ swc1 $f16, 0x0098($sp) +/* 02CC0 809D13A0 E7B00098 */ swc1 $f16, 0x0098($sp) /* 02CC4 809D13A4 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 02CC8 809D13A8 241800FA */ addiu $t8, $zero, 0x00FA ## $t8 = 000000FA /* 02CCC 809D13AC 240F00EB */ addiu $t7, $zero, 0x00EB ## $t7 = 000000EB -/* 02CD0 809D13B0 46125100 */ add.s $f4, $f10, $f18 -/* 02CD4 809D13B4 C42A16E0 */ lwc1 $f10, %lo(D_809D16E0)($at) +/* 02CD0 809D13B0 46125100 */ add.s $f4, $f10, $f18 +/* 02CD4 809D13B4 C42A16E0 */ lwc1 $f10, %lo(D_809D16E0)($at) /* 02CD8 809D13B8 240D00F5 */ addiu $t5, $zero, 0x00F5 ## $t5 = 000000F5 /* 02CDC 809D13BC 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 02CE0 809D13C0 E7A4009C */ swc1 $f4, 0x009C($sp) +/* 02CE0 809D13C0 E7A4009C */ swc1 $f4, 0x009C($sp) /* 02CE4 809D13C4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 02CE8 809D13C8 AFAE0024 */ sw $t6, 0x0024($sp) -/* 02CEC 809D13CC AFAD0020 */ sw $t5, 0x0020($sp) -/* 02CF0 809D13D0 46083400 */ add.s $f16, $f6, $f8 -/* 02CF4 809D13D4 AFAF001C */ sw $t7, 0x001C($sp) -/* 02CF8 809D13D8 AFB80018 */ sw $t8, 0x0018($sp) -/* 02CFC 809D13DC AFAC0014 */ sw $t4, 0x0014($sp) -/* 02D00 809D13E0 E7B000A0 */ swc1 $f16, 0x00A0($sp) -/* 02D04 809D13E4 AFA90010 */ sw $t1, 0x0010($sp) +/* 02CE8 809D13C8 AFAE0024 */ sw $t6, 0x0024($sp) +/* 02CEC 809D13CC AFAD0020 */ sw $t5, 0x0020($sp) +/* 02CF0 809D13D0 46083400 */ add.s $f16, $f6, $f8 +/* 02CF4 809D13D4 AFAF001C */ sw $t7, 0x001C($sp) +/* 02CF8 809D13D8 AFB80018 */ sw $t8, 0x0018($sp) +/* 02CFC 809D13DC AFAC0014 */ sw $t4, 0x0014($sp) +/* 02D00 809D13E0 E7B000A0 */ swc1 $f16, 0x00A0($sp) +/* 02D04 809D13E4 AFA90010 */ sw $t1, 0x0010($sp) /* 02D08 809D13E8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 02D0C 809D13EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02D10 809D13F0 27A60098 */ addiu $a2, $sp, 0x0098 ## $a2 = FFFFFFE0 /* 02D14 809D13F4 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 02D18 809D13F8 0C00A850 */ jal func_8002A140 -/* 02D1C 809D13FC E7AA0028 */ swc1 $f10, 0x0028($sp) +/* 02D18 809D13F8 0C00A850 */ jal func_8002A140 +/* 02D1C 809D13FC E7AA0028 */ swc1 $f10, 0x0028($sp) .L809D1400: /* 02D20 809D1400 3C06809D */ lui $a2, %hi(D_809D1590) ## $a2 = 809D0000 /* 02D24 809D1404 24C61590 */ addiu $a2, $a2, %lo(D_809D1590) ## $a2 = 809D1590 /* 02D28 809D1408 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFC8 /* 02D2C 809D140C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 02D30 809D1410 0C031AD5 */ jal func_800C6B54 +/* 02D30 809D1410 0C031AD5 */ jal func_800C6B54 /* 02D34 809D1414 240705F1 */ addiu $a3, $zero, 0x05F1 ## $a3 = 000005F1 -/* 02D38 809D1418 8FBF0044 */ lw $ra, 0x0044($sp) -/* 02D3C 809D141C 8FB00038 */ lw $s0, 0x0038($sp) -/* 02D40 809D1420 8FB1003C */ lw $s1, 0x003C($sp) -/* 02D44 809D1424 8FB20040 */ lw $s2, 0x0040($sp) -/* 02D48 809D1428 03E00008 */ jr $ra +/* 02D38 809D1418 8FBF0044 */ lw $ra, 0x0044($sp) +/* 02D3C 809D141C 8FB00038 */ lw $s0, 0x0038($sp) +/* 02D40 809D1420 8FB1003C */ lw $s1, 0x003C($sp) +/* 02D44 809D1424 8FB20040 */ lw $s2, 0x0040($sp) +/* 02D48 809D1428 03E00008 */ jr $ra /* 02D4C 809D142C 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s index 45e5f114d0..46e7347f81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s @@ -1,35 +1,35 @@ glabel func_809CE9A8 /* 002C8 809CE9A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002CC 809CE9AC AFBF0014 */ sw $ra, 0x0014($sp) +/* 002CC 809CE9AC AFBF0014 */ sw $ra, 0x0014($sp) /* 002D0 809CE9B0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 002D4 809CE9B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002D8 809CE9B8 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 06000228 -/* 002DC 809CE9BC AFA70018 */ sw $a3, 0x0018($sp) +/* 002DC 809CE9BC AFA70018 */ sw $a3, 0x0018($sp) /* 002E0 809CE9C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002E4 809CE9C4 0C0294D3 */ jal func_800A534C +/* 002E4 809CE9C4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 002E8 809CE9C8 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 002EC 809CE9CC 8FA70018 */ lw $a3, 0x0018($sp) +/* 002EC 809CE9CC 8FA70018 */ lw $a3, 0x0018($sp) /* 002F0 809CE9D0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 002F4 809CE9D4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 002F8 809CE9D8 A0EE0220 */ sb $t6, 0x0220($a3) ## 00000220 /* 002FC 809CE9DC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 00300 809CE9E0 44811000 */ mtc1 $at, $f2 ## $f2 = 200.00 -/* 00304 809CE9E4 8FA40018 */ lw $a0, 0x0018($sp) +/* 00304 809CE9E4 8FA40018 */ lw $a0, 0x0018($sp) /* 00308 809CE9E8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0030C 809CE9EC 46020102 */ mul.s $f4, $f0, $f2 +/* 0030C 809CE9EC 46020102 */ mul.s $f4, $f0, $f2 /* 00310 809CE9F0 3C05809D */ lui $a1, %hi(func_809CEA24) ## $a1 = 809D0000 /* 00314 809CE9F4 24A5EA24 */ addiu $a1, $a1, %lo(func_809CEA24) ## $a1 = 809CEA24 /* 00318 809CE9F8 A0800232 */ sb $zero, 0x0232($a0) ## 00000232 /* 0031C 809CE9FC E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 -/* 00320 809CEA00 46022180 */ add.s $f6, $f4, $f2 -/* 00324 809CEA04 4600320D */ trunc.w.s $f8, $f6 -/* 00328 809CEA08 44184000 */ mfc1 $t8, $f8 -/* 0032C 809CEA0C 0C2739B8 */ jal func_809CE6E0 +/* 00320 809CEA00 46022180 */ add.s $f6, $f4, $f2 +/* 00324 809CEA04 4600320D */ trunc.w.s $f8, $f6 +/* 00328 809CEA08 44184000 */ mfc1 $t8, $f8 +/* 0032C 809CEA0C 0C2739B8 */ jal func_809CE6E0 /* 00330 809CEA10 A4980222 */ sh $t8, 0x0222($a0) ## 00000222 -/* 00334 809CEA14 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00334 809CEA14 8FBF0014 */ lw $ra, 0x0014($sp) /* 00338 809CEA18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0033C 809CEA1C 03E00008 */ jr $ra +/* 0033C 809CEA1C 03E00008 */ jr $ra /* 00340 809CEA20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s index ca80deeaf1..0287a13ca8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s @@ -1,12 +1,12 @@ glabel func_809CFBA8 /* 014C8 809CFBA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 014CC 809CFBAC AFB00018 */ sw $s0, 0x0018($sp) +/* 014CC 809CFBAC AFB00018 */ sw $s0, 0x0018($sp) /* 014D0 809CFBB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 014D4 809CFBB4 AFBF001C */ sw $ra, 0x001C($sp) +/* 014D4 809CFBB4 AFBF001C */ sw $ra, 0x001C($sp) /* 014D8 809CFBB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 014DC 809CFBBC 24A52250 */ addiu $a1, $a1, 0x2250 ## $a1 = 06002250 /* 014E0 809CFBC0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 014E4 809CFBC4 0C0294D3 */ jal func_800A534C +/* 014E4 809CFBC4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 014E8 809CFBC8 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 014EC 809CFBCC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 014F0 809CFBD0 3C014130 */ lui $at, 0x4130 ## $at = 41300000 @@ -24,23 +24,23 @@ glabel func_809CFBA8 /* 0151C 809CFBFC 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 /* 01520 809CFC00 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01524 809CFC04 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 01528 809CFC08 46060202 */ mul.s $f8, $f0, $f6 +/* 01528 809CFC08 46060202 */ mul.s $f8, $f0, $f6 /* 0152C 809CFC0C 24180BB8 */ addiu $t8, $zero, 0x0BB8 ## $t8 = 00000BB8 /* 01530 809CFC10 A6180224 */ sh $t8, 0x0224($s0) ## 00000224 /* 01534 809CFC14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01538 809CFC18 24053976 */ addiu $a1, $zero, 0x3976 ## $a1 = 00003976 -/* 0153C 809CFC1C 460A4400 */ add.s $f16, $f8, $f10 +/* 0153C 809CFC1C 460A4400 */ add.s $f16, $f8, $f10 /* 01540 809CFC20 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01544 809CFC24 E610025C */ swc1 $f16, 0x025C($s0) ## 0000025C /* 01548 809CFC28 3C05809D */ lui $a1, %hi(func_809CFC4C) ## $a1 = 809D0000 /* 0154C 809CFC2C 24A5FC4C */ addiu $a1, $a1, %lo(func_809CFC4C) ## $a1 = 809CFC4C -/* 01550 809CFC30 0C2739B8 */ jal func_809CE6E0 +/* 01550 809CFC30 0C2739B8 */ jal func_809CE6E0 /* 01554 809CFC34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01558 809CFC38 8FBF001C */ lw $ra, 0x001C($sp) -/* 0155C 809CFC3C 8FB00018 */ lw $s0, 0x0018($sp) +/* 01558 809CFC38 8FBF001C */ lw $ra, 0x001C($sp) +/* 0155C 809CFC3C 8FB00018 */ lw $s0, 0x0018($sp) /* 01560 809CFC40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01564 809CFC44 03E00008 */ jr $ra +/* 01564 809CFC44 03E00008 */ jr $ra /* 01568 809CFC48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s index 0f468a1bc4..d8864f8d4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s @@ -1,14 +1,14 @@ glabel func_809CFF10 /* 01830 809CFF10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01834 809CFF14 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01834 809CFF14 AFBF0014 */ sw $ra, 0x0014($sp) /* 01838 809CFF18 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0183C 809CFF1C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01840 809CFF20 24A52250 */ addiu $a1, $a1, 0x2250 ## $a1 = 06002250 -/* 01844 809CFF24 AFA70018 */ sw $a3, 0x0018($sp) +/* 01844 809CFF24 AFA70018 */ sw $a3, 0x0018($sp) /* 01848 809CFF28 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0184C 809CFF2C 0C0294D3 */ jal func_800A534C +/* 0184C 809CFF2C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01850 809CFF30 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 01854 809CFF34 8FA40018 */ lw $a0, 0x0018($sp) +/* 01854 809CFF34 8FA40018 */ lw $a0, 0x0018($sp) /* 01858 809CFF38 3C014130 */ lui $at, 0x4130 ## $at = 41300000 /* 0185C 809CFF3C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01860 809CFF40 44813000 */ mtc1 $at, $f6 ## $f6 = 11.00 @@ -21,18 +21,18 @@ glabel func_809CFF10 /* 0187C 809CFF5C A0980221 */ sb $t8, 0x0221($a0) ## 00000221 /* 01880 809CFF60 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 01884 809CFF64 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01888 809CFF68 E4860060 */ swc1 $f6, 0x0060($a0) ## 00000060 -/* 0188C 809CFF6C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0188C 809CFF6C 8FA40018 */ lw $a0, 0x0018($sp) /* 01890 809CFF70 3C05809D */ lui $a1, %hi(func_809CFF98) ## $a1 = 809D0000 /* 01894 809CFF74 24A5FF98 */ addiu $a1, $a1, %lo(func_809CFF98) ## $a1 = 809CFF98 /* 01898 809CFF78 94990088 */ lhu $t9, 0x0088($a0) ## 00000088 /* 0189C 809CFF7C 3328FFFE */ andi $t0, $t9, 0xFFFE ## $t0 = 00000000 -/* 018A0 809CFF80 0C2739B8 */ jal func_809CE6E0 +/* 018A0 809CFF80 0C2739B8 */ jal func_809CE6E0 /* 018A4 809CFF84 A4880088 */ sh $t0, 0x0088($a0) ## 00000088 -/* 018A8 809CFF88 8FBF0014 */ lw $ra, 0x0014($sp) +/* 018A8 809CFF88 8FBF0014 */ lw $ra, 0x0014($sp) /* 018AC 809CFF8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018B0 809CFF90 03E00008 */ jr $ra +/* 018B0 809CFF90 03E00008 */ jr $ra /* 018B4 809CFF94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Draw.s index adf918f7ee..ef97dc040a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Draw.s @@ -1,11 +1,11 @@ glabel EnCow_Draw /* 01214 809E0014 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01218 809E0018 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0121C 809E001C AFA40028 */ sw $a0, 0x0028($sp) -/* 01220 809E0020 AFA5002C */ sw $a1, 0x002C($sp) -/* 01224 809E0024 0C0250F2 */ jal func_800943C8 +/* 01218 809E0018 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0121C 809E001C AFA40028 */ sw $a0, 0x0028($sp) +/* 01220 809E0020 AFA5002C */ sw $a1, 0x002C($sp) +/* 01224 809E0024 0C0250F2 */ jal func_800943C8 /* 01228 809E0028 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 0122C 809E002C 8FA20028 */ lw $v0, 0x0028($sp) +/* 0122C 809E002C 8FA20028 */ lw $v0, 0x0028($sp) /* 01230 809E0030 3C0F809E */ lui $t7, %hi(func_809DFF84) ## $t7 = 809E0000 /* 01234 809E0034 3C18809E */ lui $t8, %hi(func_809DFFD4) ## $t8 = 809E0000 /* 01238 809E0038 8C4501E8 */ lw $a1, 0x01E8($v0) ## 000001E8 @@ -13,14 +13,14 @@ glabel EnCow_Draw /* 01240 809E0040 904701E6 */ lbu $a3, 0x01E6($v0) ## 000001E6 /* 01244 809E0044 2718FFD4 */ addiu $t8, $t8, %lo(func_809DFFD4) ## $t8 = 809DFFD4 /* 01248 809E0048 25EFFF84 */ addiu $t7, $t7, %lo(func_809DFF84) ## $t7 = 809DFF84 -/* 0124C 809E004C AFAF0010 */ sw $t7, 0x0010($sp) -/* 01250 809E0050 AFB80014 */ sw $t8, 0x0014($sp) -/* 01254 809E0054 8FA4002C */ lw $a0, 0x002C($sp) -/* 01258 809E0058 0C0286B2 */ jal func_800A1AC8 -/* 0125C 809E005C AFA20018 */ sw $v0, 0x0018($sp) -/* 01260 809E0060 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0124C 809E004C AFAF0010 */ sw $t7, 0x0010($sp) +/* 01250 809E0050 AFB80014 */ sw $t8, 0x0014($sp) +/* 01254 809E0054 8FA4002C */ lw $a0, 0x002C($sp) +/* 01258 809E0058 0C0286B2 */ jal SkelAnime_DrawSV +/* 0125C 809E005C AFA20018 */ sw $v0, 0x0018($sp) +/* 01260 809E0060 8FBF0024 */ lw $ra, 0x0024($sp) /* 01264 809E0064 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01268 809E0068 03E00008 */ jr $ra +/* 01268 809E0068 03E00008 */ jr $ra /* 0126C 809E006C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s index 5ce00241f0..35549e9d13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s @@ -1,67 +1,67 @@ glabel EnCow_Init /* 00214 809DF014 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00218 809DF018 AFB10038 */ sw $s1, 0x0038($sp) -/* 0021C 809DF01C AFB00034 */ sw $s0, 0x0034($sp) +/* 00218 809DF018 AFB10038 */ sw $s1, 0x0038($sp) +/* 0021C 809DF01C AFB00034 */ sw $s0, 0x0034($sp) /* 00220 809DF020 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00224 809DF024 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00228 809DF028 AFBF003C */ sw $ra, 0x003C($sp) +/* 00228 809DF028 AFBF003C */ sw $ra, 0x003C($sp) /* 0022C 809DF02C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00230 809DF030 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00234 809DF034 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00238 809DF038 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0023C 809DF03C 0C00AC78 */ jal ActorShape_Init - + /* 00240 809DF040 3C074290 */ lui $a3, 0x4290 ## $a3 = 42900000 /* 00244 809DF044 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00248 809DF048 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0024C 809DF04C 260501E4 */ addiu $a1, $s0, 0x01E4 ## $a1 = 000001E4 -/* 00250 809DF050 10400006 */ beq $v0, $zero, .L809DF06C +/* 00250 809DF050 10400006 */ beq $v0, $zero, .L809DF06C /* 00254 809DF054 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00258 809DF058 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0025C 809DF05C 1041007F */ beq $v0, $at, .L809DF25C +/* 0025C 809DF05C 1041007F */ beq $v0, $at, .L809DF25C /* 00260 809DF060 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00264 809DF064 100000EE */ beq $zero, $zero, .L809DF420 +/* 00264 809DF064 100000EE */ beq $zero, $zero, .L809DF420 /* 00268 809DF068 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF .L809DF06C: /* 0026C 809DF06C 260E0228 */ addiu $t6, $s0, 0x0228 ## $t6 = 00000228 /* 00270 809DF070 260F024C */ addiu $t7, $s0, 0x024C ## $t7 = 0000024C /* 00274 809DF074 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00278 809DF078 AFB80018 */ sw $t8, 0x0018($sp) -/* 0027C 809DF07C AFAF0014 */ sw $t7, 0x0014($sp) -/* 00280 809DF080 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00278 809DF078 AFB80018 */ sw $t8, 0x0018($sp) +/* 0027C 809DF07C AFAF0014 */ sw $t7, 0x0014($sp) +/* 00280 809DF080 AFAE0010 */ sw $t6, 0x0010($sp) /* 00284 809DF084 24C64010 */ addiu $a2, $a2, 0x4010 ## $a2 = 06004010 /* 00288 809DF088 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0028C 809DF08C 0C0291BE */ jal func_800A46F8 -/* 00290 809DF090 AFA50040 */ sw $a1, 0x0040($sp) +/* 0028C 809DF08C 0C0291BE */ jal SkelAnime_InitSV +/* 00290 809DF090 AFA50040 */ sw $a1, 0x0040($sp) /* 00294 809DF094 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00298 809DF098 24A501CC */ addiu $a1, $a1, 0x01CC ## $a1 = 060001CC -/* 0029C 809DF09C 0C0294BE */ jal func_800A52F8 -/* 002A0 809DF0A0 8FA40040 */ lw $a0, 0x0040($sp) +/* 0029C 809DF09C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 002A0 809DF0A0 8FA40040 */ lw $a0, 0x0040($sp) /* 002A4 809DF0A4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 002A8 809DF0A8 AFA50040 */ sw $a1, 0x0040($sp) +/* 002A8 809DF0A8 AFA50040 */ sw $a1, 0x0040($sp) /* 002AC 809DF0AC 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 002B0 809DF0B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002B4 809DF0B4 3C07809E */ lui $a3, %hi(D_809E00E0) ## $a3 = 809E0000 -/* 002B8 809DF0B8 8FA50040 */ lw $a1, 0x0040($sp) +/* 002B8 809DF0B8 8FA50040 */ lw $a1, 0x0040($sp) /* 002BC 809DF0BC 24E700E0 */ addiu $a3, $a3, %lo(D_809E00E0) ## $a3 = 809E00E0 /* 002C0 809DF0C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002C4 809DF0C4 0C01712B */ jal ActorCollider_InitCylinder - + /* 002C8 809DF0C8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002CC 809DF0CC 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 -/* 002D0 809DF0D0 AFA50040 */ sw $a1, 0x0040($sp) +/* 002D0 809DF0D0 AFA50040 */ sw $a1, 0x0040($sp) /* 002D4 809DF0D4 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 002D8 809DF0D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002DC 809DF0DC 3C07809E */ lui $a3, %hi(D_809E00E0) ## $a3 = 809E0000 -/* 002E0 809DF0E0 8FA50040 */ lw $a1, 0x0040($sp) +/* 002E0 809DF0E0 8FA50040 */ lw $a1, 0x0040($sp) /* 002E4 809DF0E4 24E700E0 */ addiu $a3, $a3, %lo(D_809E00E0) ## $a3 = 809E00E0 /* 002E8 809DF0E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002EC 809DF0EC 0C01712B */ jal ActorCollider_InitCylinder - + /* 002F0 809DF0F0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 002F4 809DF0F4 0C277BA7 */ jal func_809DEE9C +/* 002F4 809DF0F4 0C277BA7 */ jal func_809DEE9C /* 002F8 809DF0F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002FC 809DF0FC 3C19809E */ lui $t9, %hi(func_809DF96C) ## $t9 = 809E0000 /* 00300 809DF100 2739F96C */ addiu $t9, $t9, %lo(func_809DF96C) ## $t9 = 809DF96C @@ -69,89 +69,89 @@ glabel EnCow_Init /* 00308 809DF108 862800A4 */ lh $t0, 0x00A4($s1) ## 000000A4 /* 0030C 809DF10C 24010034 */ addiu $at, $zero, 0x0034 ## $at = 00000034 /* 00310 809DF110 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00314 809DF114 15010010 */ bne $t0, $at, .L809DF158 +/* 00314 809DF114 15010010 */ bne $t0, $at, .L809DF158 /* 00318 809DF118 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 0031C 809DF11C 8C490004 */ lw $t1, 0x0004($v0) ## 8015E664 -/* 00320 809DF120 51200006 */ beql $t1, $zero, .L809DF13C +/* 00320 809DF120 51200006 */ beql $t1, $zero, .L809DF13C /* 00324 809DF124 944A0ED6 */ lhu $t2, 0x0ED6($v0) ## 8015F536 /* 00328 809DF128 0C00B55C */ jal Actor_Kill - + /* 0032C 809DF12C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00330 809DF130 100000C2 */ beq $zero, $zero, .L809DF43C -/* 00334 809DF134 8FBF003C */ lw $ra, 0x003C($sp) +/* 00330 809DF130 100000C2 */ beq $zero, $zero, .L809DF43C +/* 00334 809DF134 8FBF003C */ lw $ra, 0x003C($sp) /* 00338 809DF138 944A0ED6 */ lhu $t2, 0x0ED6($v0) ## 00000ED6 .L809DF13C: /* 0033C 809DF13C 314B4000 */ andi $t3, $t2, 0x4000 ## $t3 = 00000000 -/* 00340 809DF140 55600006 */ bnel $t3, $zero, .L809DF15C +/* 00340 809DF140 55600006 */ bnel $t3, $zero, .L809DF15C /* 00344 809DF144 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 00348 809DF148 0C00B55C */ jal Actor_Kill - + /* 0034C 809DF14C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00350 809DF150 100000BA */ beq $zero, $zero, .L809DF43C -/* 00354 809DF154 8FBF003C */ lw $ra, 0x003C($sp) +/* 00350 809DF150 100000BA */ beq $zero, $zero, .L809DF43C +/* 00354 809DF154 8FBF003C */ lw $ra, 0x003C($sp) .L809DF158: /* 00358 809DF158 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 .L809DF15C: /* 0035C 809DF15C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 00360 809DF160 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00364 809DF164 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00364 809DF164 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00368 809DF168 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 0036C 809DF16C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00370 809DF170 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 00374 809DF174 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00374 809DF174 E7A60014 */ swc1 $f6, 0x0014($sp) /* 00378 809DF178 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 0037C 809DF17C AFA0001C */ sw $zero, 0x001C($sp) +/* 0037C 809DF17C AFA0001C */ sw $zero, 0x001C($sp) /* 00380 809DF180 240701C6 */ addiu $a3, $zero, 0x01C6 ## $a3 = 000001C6 -/* 00384 809DF184 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00384 809DF184 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00388 809DF188 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 0038C 809DF18C AFAD0028 */ sw $t5, 0x0028($sp) -/* 00390 809DF190 AFA00024 */ sw $zero, 0x0024($sp) +/* 0038C 809DF18C AFAD0028 */ sw $t5, 0x0028($sp) +/* 00390 809DF190 AFA00024 */ sw $zero, 0x0024($sp) /* 00394 809DF194 0C00C916 */ jal Actor_SpawnAttached - -/* 00398 809DF198 AFAC0020 */ sw $t4, 0x0020($sp) + +/* 00398 809DF198 AFAC0020 */ sw $t4, 0x0020($sp) /* 0039C 809DF19C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 003A0 809DF1A0 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 /* 003A4 809DF1A4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 003A8 809DF1A8 00000000 */ nop /* 003AC 809DF1AC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 003B0 809DF1B0 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 /* 003B4 809DF1B4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 003B8 809DF1B8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 003BC 809DF1BC 460A0400 */ add.s $f16, $f0, $f10 +/* 003BC 809DF1BC 460A0400 */ add.s $f16, $f0, $f10 /* 003C0 809DF1C0 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 /* 003C4 809DF1C4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 003C8 809DF1C8 444EF800 */ cfc1 $t6, $31 /* 003CC 809DF1CC 44CFF800 */ ctc1 $t7, $31 /* 003D0 809DF1D0 00000000 */ nop -/* 003D4 809DF1D4 460084A4 */ cvt.w.s $f18, $f16 +/* 003D4 809DF1D4 460084A4 */ cvt.w.s $f18, $f16 /* 003D8 809DF1D8 444FF800 */ cfc1 $t7, $31 /* 003DC 809DF1DC 00000000 */ nop /* 003E0 809DF1E0 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 003E4 809DF1E4 51E00013 */ beql $t7, $zero, .L809DF234 -/* 003E8 809DF1E8 440F9000 */ mfc1 $t7, $f18 +/* 003E4 809DF1E4 51E00013 */ beql $t7, $zero, .L809DF234 +/* 003E8 809DF1E8 440F9000 */ mfc1 $t7, $f18 /* 003EC 809DF1EC 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 /* 003F0 809DF1F0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 003F4 809DF1F4 46128481 */ sub.s $f18, $f16, $f18 +/* 003F4 809DF1F4 46128481 */ sub.s $f18, $f16, $f18 /* 003F8 809DF1F8 44CFF800 */ ctc1 $t7, $31 /* 003FC 809DF1FC 00000000 */ nop -/* 00400 809DF200 460094A4 */ cvt.w.s $f18, $f18 +/* 00400 809DF200 460094A4 */ cvt.w.s $f18, $f18 /* 00404 809DF204 444FF800 */ cfc1 $t7, $31 /* 00408 809DF208 00000000 */ nop /* 0040C 809DF20C 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 00410 809DF210 15E00005 */ bne $t7, $zero, .L809DF228 +/* 00410 809DF210 15E00005 */ bne $t7, $zero, .L809DF228 /* 00414 809DF214 00000000 */ nop -/* 00418 809DF218 440F9000 */ mfc1 $t7, $f18 +/* 00418 809DF218 440F9000 */ mfc1 $t7, $f18 /* 0041C 809DF21C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00420 809DF220 10000007 */ beq $zero, $zero, .L809DF240 +/* 00420 809DF220 10000007 */ beq $zero, $zero, .L809DF240 /* 00424 809DF224 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 .L809DF228: -/* 00428 809DF228 10000005 */ beq $zero, $zero, .L809DF240 +/* 00428 809DF228 10000005 */ beq $zero, $zero, .L809DF240 /* 0042C 809DF22C 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 00430 809DF230 440F9000 */ mfc1 $t7, $f18 +/* 00430 809DF230 440F9000 */ mfc1 $t7, $f18 .L809DF234: /* 00434 809DF234 00000000 */ nop -/* 00438 809DF238 05E0FFFB */ bltz $t7, .L809DF228 +/* 00438 809DF238 05E0FFFB */ bltz $t7, .L809DF228 /* 0043C 809DF23C 00000000 */ nop .L809DF240: /* 00440 809DF240 A60F0278 */ sh $t7, 0x0278($s0) ## 00000278 @@ -159,7 +159,7 @@ glabel EnCow_Init /* 00448 809DF248 A218001F */ sb $t8, 0x001F($s0) ## 0000001F /* 0044C 809DF24C 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 /* 00450 809DF250 44CEF800 */ ctc1 $t6, $31 -/* 00454 809DF254 10000071 */ beq $zero, $zero, .L809DF41C +/* 00454 809DF254 10000071 */ beq $zero, $zero, .L809DF41C /* 00458 809DF258 A72005BE */ sh $zero, 0x05BE($t9) ## 801605BE .L809DF25C: /* 0045C 809DF25C 260501E4 */ addiu $a1, $s0, 0x01E4 ## $a1 = 000001E4 @@ -167,17 +167,17 @@ glabel EnCow_Init /* 00464 809DF264 26080228 */ addiu $t0, $s0, 0x0228 ## $t0 = 00000228 /* 00468 809DF268 2609024C */ addiu $t1, $s0, 0x024C ## $t1 = 0000024C /* 0046C 809DF26C 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 00470 809DF270 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00474 809DF274 AFA90014 */ sw $t1, 0x0014($sp) -/* 00478 809DF278 AFA80010 */ sw $t0, 0x0010($sp) +/* 00470 809DF270 AFAA0018 */ sw $t2, 0x0018($sp) +/* 00474 809DF274 AFA90014 */ sw $t1, 0x0014($sp) +/* 00478 809DF278 AFA80010 */ sw $t0, 0x0010($sp) /* 0047C 809DF27C 24C64C30 */ addiu $a2, $a2, 0x4C30 ## $a2 = 06004C30 -/* 00480 809DF280 AFA50040 */ sw $a1, 0x0040($sp) -/* 00484 809DF284 0C0291BE */ jal func_800A46F8 +/* 00480 809DF280 AFA50040 */ sw $a1, 0x0040($sp) +/* 00484 809DF284 0C0291BE */ jal SkelAnime_InitSV /* 00488 809DF288 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0048C 809DF28C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00490 809DF290 24A54348 */ addiu $a1, $a1, 0x4348 ## $a1 = 06004348 -/* 00494 809DF294 0C0294BE */ jal func_800A52F8 -/* 00498 809DF298 8FA40040 */ lw $a0, 0x0040($sp) +/* 00494 809DF294 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00498 809DF298 8FA40040 */ lw $a0, 0x0040($sp) /* 0049C 809DF29C 3C0B809E */ lui $t3, %hi(func_809DFE98) ## $t3 = 809E0000 /* 004A0 809DF2A0 3C0C809E */ lui $t4, %hi(func_809E0070) ## $t4 = 809E0000 /* 004A4 809DF2A4 3C0D809E */ lui $t5, %hi(func_809DFA84) ## $t5 = 809E0000 @@ -187,96 +187,96 @@ glabel EnCow_Init /* 004B4 809DF2B4 AE0B0130 */ sw $t3, 0x0130($s0) ## 00000130 /* 004B8 809DF2B8 AE0C0134 */ sw $t4, 0x0134($s0) ## 00000134 /* 004BC 809DF2BC AE0D027C */ sw $t5, 0x027C($s0) ## 0000027C -/* 004C0 809DF2C0 0C277BE5 */ jal func_809DEF94 +/* 004C0 809DF2C0 0C277BE5 */ jal func_809DEF94 /* 004C4 809DF2C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004C8 809DF2C8 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 004CC 809DF2CC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 004D0 809DF2D0 01C17824 */ and $t7, $t6, $at +/* 004D0 809DF2D0 01C17824 */ and $t7, $t6, $at /* 004D4 809DF2D4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 004D8 809DF2D8 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 /* 004DC 809DF2DC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 004E0 809DF2E0 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 004E4 809DF2E4 4458F800 */ cfc1 $t8, $31 /* 004E8 809DF2E8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 004EC 809DF2EC 44D9F800 */ ctc1 $t9, $31 /* 004F0 809DF2F0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 004F4 809DF2F4 46000124 */ cvt.w.s $f4, $f0 +/* 004F4 809DF2F4 46000124 */ cvt.w.s $f4, $f0 /* 004F8 809DF2F8 4459F800 */ cfc1 $t9, $31 /* 004FC 809DF2FC 00000000 */ nop /* 00500 809DF300 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 00504 809DF304 53200013 */ beql $t9, $zero, .L809DF354 -/* 00508 809DF308 44192000 */ mfc1 $t9, $f4 +/* 00504 809DF304 53200013 */ beql $t9, $zero, .L809DF354 +/* 00508 809DF308 44192000 */ mfc1 $t9, $f4 /* 0050C 809DF30C 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 00510 809DF310 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00514 809DF314 46040101 */ sub.s $f4, $f0, $f4 +/* 00514 809DF314 46040101 */ sub.s $f4, $f0, $f4 /* 00518 809DF318 44D9F800 */ ctc1 $t9, $31 /* 0051C 809DF31C 00000000 */ nop -/* 00520 809DF320 46002124 */ cvt.w.s $f4, $f4 +/* 00520 809DF320 46002124 */ cvt.w.s $f4, $f4 /* 00524 809DF324 4459F800 */ cfc1 $t9, $31 /* 00528 809DF328 00000000 */ nop /* 0052C 809DF32C 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 00530 809DF330 17200005 */ bne $t9, $zero, .L809DF348 +/* 00530 809DF330 17200005 */ bne $t9, $zero, .L809DF348 /* 00534 809DF334 00000000 */ nop -/* 00538 809DF338 44192000 */ mfc1 $t9, $f4 +/* 00538 809DF338 44192000 */ mfc1 $t9, $f4 /* 0053C 809DF33C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00540 809DF340 10000007 */ beq $zero, $zero, .L809DF360 +/* 00540 809DF340 10000007 */ beq $zero, $zero, .L809DF360 /* 00544 809DF344 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L809DF348: -/* 00548 809DF348 10000005 */ beq $zero, $zero, .L809DF360 +/* 00548 809DF348 10000005 */ beq $zero, $zero, .L809DF360 /* 0054C 809DF34C 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 00550 809DF350 44192000 */ mfc1 $t9, $f4 +/* 00550 809DF350 44192000 */ mfc1 $t9, $f4 .L809DF354: /* 00554 809DF354 00000000 */ nop -/* 00558 809DF358 0720FFFB */ bltz $t9, .L809DF348 +/* 00558 809DF358 0720FFFB */ bltz $t9, .L809DF348 /* 0055C 809DF35C 00000000 */ nop .L809DF360: /* 00560 809DF360 3328FFFF */ andi $t0, $t9, 0xFFFF ## $t0 = 0000FFFF /* 00564 809DF364 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 /* 00568 809DF368 44D8F800 */ ctc1 $t8, $31 /* 0056C 809DF36C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 00570 809DF370 05010004 */ bgez $t0, .L809DF384 -/* 00574 809DF374 46803220 */ cvt.s.w $f8, $f6 +/* 00570 809DF370 05010004 */ bgez $t0, .L809DF384 +/* 00574 809DF374 46803220 */ cvt.s.w $f8, $f6 /* 00578 809DF378 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 /* 0057C 809DF37C 00000000 */ nop -/* 00580 809DF380 460A4200 */ add.s $f8, $f8, $f10 +/* 00580 809DF380 460A4200 */ add.s $f8, $f8, $f10 .L809DF384: /* 00584 809DF384 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00588 809DF388 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 /* 0058C 809DF38C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 00590 809DF390 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00594 809DF394 46104480 */ add.s $f18, $f8, $f16 +/* 00594 809DF394 46104480 */ add.s $f18, $f8, $f16 /* 00598 809DF398 4449F800 */ cfc1 $t1, $31 /* 0059C 809DF39C 44CAF800 */ ctc1 $t2, $31 /* 005A0 809DF3A0 00000000 */ nop -/* 005A4 809DF3A4 46009124 */ cvt.w.s $f4, $f18 +/* 005A4 809DF3A4 46009124 */ cvt.w.s $f4, $f18 /* 005A8 809DF3A8 444AF800 */ cfc1 $t2, $31 /* 005AC 809DF3AC 00000000 */ nop /* 005B0 809DF3B0 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 005B4 809DF3B4 51400013 */ beql $t2, $zero, .L809DF404 -/* 005B8 809DF3B8 440A2000 */ mfc1 $t2, $f4 +/* 005B4 809DF3B4 51400013 */ beql $t2, $zero, .L809DF404 +/* 005B8 809DF3B8 440A2000 */ mfc1 $t2, $f4 /* 005BC 809DF3BC 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 005C0 809DF3C0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 005C4 809DF3C4 46049101 */ sub.s $f4, $f18, $f4 +/* 005C4 809DF3C4 46049101 */ sub.s $f4, $f18, $f4 /* 005C8 809DF3C8 44CAF800 */ ctc1 $t2, $31 /* 005CC 809DF3CC 00000000 */ nop -/* 005D0 809DF3D0 46002124 */ cvt.w.s $f4, $f4 +/* 005D0 809DF3D0 46002124 */ cvt.w.s $f4, $f4 /* 005D4 809DF3D4 444AF800 */ cfc1 $t2, $31 /* 005D8 809DF3D8 00000000 */ nop /* 005DC 809DF3DC 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 005E0 809DF3E0 15400005 */ bne $t2, $zero, .L809DF3F8 +/* 005E0 809DF3E0 15400005 */ bne $t2, $zero, .L809DF3F8 /* 005E4 809DF3E4 00000000 */ nop -/* 005E8 809DF3E8 440A2000 */ mfc1 $t2, $f4 +/* 005E8 809DF3E8 440A2000 */ mfc1 $t2, $f4 /* 005EC 809DF3EC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 005F0 809DF3F0 10000007 */ beq $zero, $zero, .L809DF410 +/* 005F0 809DF3F0 10000007 */ beq $zero, $zero, .L809DF410 /* 005F4 809DF3F4 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 .L809DF3F8: -/* 005F8 809DF3F8 10000005 */ beq $zero, $zero, .L809DF410 +/* 005F8 809DF3F8 10000005 */ beq $zero, $zero, .L809DF410 /* 005FC 809DF3FC 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 00600 809DF400 440A2000 */ mfc1 $t2, $f4 +/* 00600 809DF400 440A2000 */ mfc1 $t2, $f4 .L809DF404: /* 00604 809DF404 00000000 */ nop -/* 00608 809DF408 0540FFFB */ bltz $t2, .L809DF3F8 +/* 00608 809DF408 0540FFFB */ bltz $t2, .L809DF3F8 /* 0060C 809DF40C 00000000 */ nop .L809DF410: /* 00610 809DF410 44C9F800 */ ctc1 $t1, $31 @@ -289,14 +289,14 @@ glabel EnCow_Init /* 00624 809DF424 A20B00AE */ sb $t3, 0x00AE($s0) ## 000000AE /* 00628 809DF428 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 0062C 809DF42C 0C00B58B */ jal Actor_SetScale - + /* 00630 809DF430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00634 809DF434 A6000276 */ sh $zero, 0x0276($s0) ## 00000276 -/* 00638 809DF438 8FBF003C */ lw $ra, 0x003C($sp) +/* 00638 809DF438 8FBF003C */ lw $ra, 0x003C($sp) .L809DF43C: -/* 0063C 809DF43C 8FB00034 */ lw $s0, 0x0034($sp) -/* 00640 809DF440 8FB10038 */ lw $s1, 0x0038($sp) -/* 00644 809DF444 03E00008 */ jr $ra +/* 0063C 809DF43C 8FB00034 */ lw $s0, 0x0034($sp) +/* 00640 809DF440 8FB10038 */ lw $s1, 0x0038($sp) +/* 00644 809DF444 03E00008 */ jr $ra /* 00648 809DF448 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809E0070.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809E0070.s index 3aca511e73..8b04f983dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809E0070.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809E0070.s @@ -1,22 +1,22 @@ glabel func_809E0070 /* 01270 809E0070 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01274 809E0074 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01278 809E0078 AFA40028 */ sw $a0, 0x0028($sp) -/* 0127C 809E007C AFA5002C */ sw $a1, 0x002C($sp) -/* 01280 809E0080 0C0250F2 */ jal func_800943C8 +/* 01274 809E0074 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01278 809E0078 AFA40028 */ sw $a0, 0x0028($sp) +/* 0127C 809E007C AFA5002C */ sw $a1, 0x002C($sp) +/* 01280 809E0080 0C0250F2 */ jal func_800943C8 /* 01284 809E0084 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01288 809E0088 8FA20028 */ lw $v0, 0x0028($sp) -/* 0128C 809E008C 8FA4002C */ lw $a0, 0x002C($sp) +/* 01288 809E0088 8FA20028 */ lw $v0, 0x0028($sp) +/* 0128C 809E008C 8FA4002C */ lw $a0, 0x002C($sp) /* 01290 809E0090 8C4501E8 */ lw $a1, 0x01E8($v0) ## 000001E8 /* 01294 809E0094 8C460204 */ lw $a2, 0x0204($v0) ## 00000204 /* 01298 809E0098 904701E6 */ lbu $a3, 0x01E6($v0) ## 000001E6 -/* 0129C 809E009C AFA00014 */ sw $zero, 0x0014($sp) -/* 012A0 809E00A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 012A4 809E00A4 0C0286B2 */ jal func_800A1AC8 -/* 012A8 809E00A8 AFA20018 */ sw $v0, 0x0018($sp) -/* 012AC 809E00AC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0129C 809E009C AFA00014 */ sw $zero, 0x0014($sp) +/* 012A0 809E00A0 AFA00010 */ sw $zero, 0x0010($sp) +/* 012A4 809E00A4 0C0286B2 */ jal SkelAnime_DrawSV +/* 012A8 809E00A8 AFA20018 */ sw $v0, 0x0018($sp) +/* 012AC 809E00AC 8FBF0024 */ lw $ra, 0x0024($sp) /* 012B0 809E00B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012B4 809E00B4 03E00008 */ jr $ra +/* 012B4 809E00B4 03E00008 */ jr $ra /* 012B8 809E00B8 00000000 */ nop /* 012BC 809E00BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Draw.s index 2a8163938c..1bff8bad0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Draw.s @@ -1,11 +1,11 @@ glabel EnCrow_Draw /* 013A0 809E15E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013A4 809E15E4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 013A8 809E15E8 AFA40028 */ sw $a0, 0x0028($sp) -/* 013AC 809E15EC AFA5002C */ sw $a1, 0x002C($sp) -/* 013B0 809E15F0 0C024F46 */ jal func_80093D18 +/* 013A4 809E15E4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 013A8 809E15E8 AFA40028 */ sw $a0, 0x0028($sp) +/* 013AC 809E15EC AFA5002C */ sw $a1, 0x002C($sp) +/* 013B0 809E15F0 0C024F46 */ jal func_80093D18 /* 013B4 809E15F4 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 013B8 809E15F8 8FA20028 */ lw $v0, 0x0028($sp) +/* 013B8 809E15F8 8FA20028 */ lw $v0, 0x0028($sp) /* 013BC 809E15FC 3C0F809E */ lui $t7, %hi(func_809E1434) ## $t7 = 809E0000 /* 013C0 809E1600 3C18809E */ lui $t8, %hi(func_809E1520) ## $t8 = 809E0000 /* 013C4 809E1604 8C450180 */ lw $a1, 0x0180($v0) ## 00000180 @@ -13,14 +13,14 @@ glabel EnCrow_Draw /* 013CC 809E160C 9047017E */ lbu $a3, 0x017E($v0) ## 0000017E /* 013D0 809E1610 27181520 */ addiu $t8, $t8, %lo(func_809E1520) ## $t8 = 809E1520 /* 013D4 809E1614 25EF1434 */ addiu $t7, $t7, %lo(func_809E1434) ## $t7 = 809E1434 -/* 013D8 809E1618 AFAF0010 */ sw $t7, 0x0010($sp) -/* 013DC 809E161C AFB80014 */ sw $t8, 0x0014($sp) -/* 013E0 809E1620 8FA4002C */ lw $a0, 0x002C($sp) -/* 013E4 809E1624 0C0286B2 */ jal func_800A1AC8 -/* 013E8 809E1628 AFA20018 */ sw $v0, 0x0018($sp) -/* 013EC 809E162C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 013D8 809E1618 AFAF0010 */ sw $t7, 0x0010($sp) +/* 013DC 809E161C AFB80014 */ sw $t8, 0x0014($sp) +/* 013E0 809E1620 8FA4002C */ lw $a0, 0x002C($sp) +/* 013E4 809E1624 0C0286B2 */ jal SkelAnime_DrawSV +/* 013E8 809E1628 AFA20018 */ sw $v0, 0x0018($sp) +/* 013EC 809E162C 8FBF0024 */ lw $ra, 0x0024($sp) /* 013F0 809E1630 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 013F4 809E1634 03E00008 */ jr $ra +/* 013F4 809E1634 03E00008 */ jr $ra /* 013F8 809E1638 00000000 */ nop /* 013FC 809E163C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s index 26c75d3d45..0107a44945 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s @@ -1,40 +1,40 @@ glabel EnCrow_Init /* 00000 809E0240 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809E0244 AFA5003C */ sw $a1, 0x003C($sp) -/* 00008 809E0248 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 809E024C AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 809E0244 AFA5003C */ sw $a1, 0x003C($sp) +/* 00008 809E0248 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 809E024C AFB00028 */ sw $s0, 0x0028($sp) /* 00010 809E0250 3C05809E */ lui $a1, %hi(D_809E16CC) ## $a1 = 809E0000 /* 00014 809E0254 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 809E0258 0C01E037 */ jal Actor_ProcessInitChain - + /* 0001C 809E025C 24A516CC */ addiu $a1, $a1, %lo(D_809E16CC) ## $a1 = 809E16CC /* 00020 809E0260 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00024 809E0264 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00028 809E0268 260E01CA */ addiu $t6, $s0, 0x01CA ## $t6 = 000001CA /* 0002C 809E026C 260F0200 */ addiu $t7, $s0, 0x0200 ## $t7 = 00000200 /* 00030 809E0270 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 -/* 00034 809E0274 AFB80018 */ sw $t8, 0x0018($sp) -/* 00038 809E0278 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0003C 809E027C AFAE0010 */ sw $t6, 0x0010($sp) +/* 00034 809E0274 AFB80018 */ sw $t8, 0x0018($sp) +/* 00038 809E0278 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0003C 809E027C AFAE0010 */ sw $t6, 0x0010($sp) /* 00040 809E0280 24E700F0 */ addiu $a3, $a3, 0x00F0 ## $a3 = 060000F0 /* 00044 809E0284 24C610C0 */ addiu $a2, $a2, 0x10C0 ## $a2 = 060010C0 -/* 00048 809E0288 8FA4003C */ lw $a0, 0x003C($sp) -/* 0004C 809E028C 0C0291BE */ jal func_800A46F8 +/* 00048 809E0288 8FA4003C */ lw $a0, 0x003C($sp) +/* 0004C 809E028C 0C0291BE */ jal SkelAnime_InitSV /* 00050 809E0290 2605017C */ addiu $a1, $s0, 0x017C ## $a1 = 0000017C /* 00054 809E0294 26050238 */ addiu $a1, $s0, 0x0238 ## $a1 = 00000238 -/* 00058 809E0298 AFA50030 */ sw $a1, 0x0030($sp) -/* 0005C 809E029C 0C016EFE */ jal func_8005BBF8 -/* 00060 809E02A0 8FA4003C */ lw $a0, 0x003C($sp) +/* 00058 809E0298 AFA50030 */ sw $a1, 0x0030($sp) +/* 0005C 809E029C 0C016EFE */ jal func_8005BBF8 +/* 00060 809E02A0 8FA4003C */ lw $a0, 0x003C($sp) /* 00064 809E02A4 3C07809E */ lui $a3, %hi(D_809E1690) ## $a3 = 809E0000 /* 00068 809E02A8 26190258 */ addiu $t9, $s0, 0x0258 ## $t9 = 00000258 -/* 0006C 809E02AC 8FA50030 */ lw $a1, 0x0030($sp) -/* 00070 809E02B0 AFB90010 */ sw $t9, 0x0010($sp) +/* 0006C 809E02AC 8FA50030 */ lw $a1, 0x0030($sp) +/* 00070 809E02B0 AFB90010 */ sw $t9, 0x0010($sp) /* 00074 809E02B4 24E71690 */ addiu $a3, $a3, %lo(D_809E1690) ## $a3 = 809E1690 -/* 00078 809E02B8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0007C 809E02BC 0C017014 */ jal func_8005C050 +/* 00078 809E02B8 8FA4003C */ lw $a0, 0x003C($sp) +/* 0007C 809E02BC 0C017014 */ jal func_8005C050 /* 00080 809E02C0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00084 809E02C4 3C08809E */ lui $t0, %hi(D_809E169C) ## $t0 = 809E0000 -/* 00088 809E02C8 8D08169C */ lw $t0, %lo(D_809E169C)($t0) +/* 00088 809E02C8 8D08169C */ lw $t0, %lo(D_809E169C)($t0) /* 0008C 809E02CC 8E0A0254 */ lw $t2, 0x0254($s0) ## 00000254 /* 00090 809E02D0 3C05809E */ lui $a1, %hi(D_809E16A8) ## $a1 = 809E0000 /* 00094 809E02D4 85090020 */ lh $t1, 0x0020($t0) ## 809E0020 @@ -42,23 +42,23 @@ glabel EnCrow_Init /* 0009C 809E02DC 24C616A0 */ addiu $a2, $a2, %lo(D_809E16A0) ## $a2 = 809E16A0 /* 000A0 809E02E0 24A516A8 */ addiu $a1, $a1, %lo(D_809E16A8) ## $a1 = 809E16A8 /* 000A4 809E02E4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 000A8 809E02E8 0C0187B5 */ jal func_80061ED4 +/* 000A8 809E02E8 0C0187B5 */ jal func_80061ED4 /* 000AC 809E02EC A5490036 */ sh $t1, 0x0036($t2) ## 00000036 /* 000B0 809E02F0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 000B4 809E02F4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 000B8 809E02F8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 000BC 809E02FC 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 000C0 809E0300 0C00AC78 */ jal ActorShape_Init - + /* 000C4 809E0304 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 000C8 809E0308 3C01809E */ lui $at, %hi(D_809E16C8) ## $at = 809E0000 -/* 000CC 809E030C AC2016C8 */ sw $zero, %lo(D_809E16C8)($at) -/* 000D0 809E0310 0C2780D5 */ jal func_809E0354 +/* 000CC 809E030C AC2016C8 */ sw $zero, %lo(D_809E16C8)($at) +/* 000D0 809E0310 0C2780D5 */ jal func_809E0354 /* 000D4 809E0314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000D8 809E0318 8FBF002C */ lw $ra, 0x002C($sp) -/* 000DC 809E031C 8FB00028 */ lw $s0, 0x0028($sp) +/* 000D8 809E0318 8FBF002C */ lw $ra, 0x002C($sp) +/* 000DC 809E031C 8FB00028 */ lw $s0, 0x0028($sp) /* 000E0 809E0320 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000E4 809E0324 03E00008 */ jr $ra +/* 000E4 809E0324 03E00008 */ jr $ra /* 000E8 809E0328 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s index 9e177e32c7..68a1e3c357 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s @@ -4,33 +4,33 @@ glabel func_809E0770 /* 00538 809E0778 8C4E0000 */ lw $t6, 0x0000($v0) ## 809E16C8 /* 0053C 809E077C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00540 809E0780 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00544 809E0784 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00548 809E0788 15C10015 */ bne $t6, $at, .L809E07E0 +/* 00544 809E0784 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00548 809E0788 15C10015 */ bne $t6, $at, .L809E07E0 /* 0054C 809E078C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00550 809E0790 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00554 809E0794 A48F001C */ sh $t7, 0x001C($a0) ## 0000001C /* 00558 809E0798 AC400000 */ sw $zero, 0x0000($v0) ## 809E16C8 /* 0055C 809E079C 3C18809E */ lui $t8, %hi(D_809E169C) ## $t8 = 809E0000 -/* 00560 809E07A0 8F18169C */ lw $t8, %lo(D_809E169C)($t8) +/* 00560 809E07A0 8F18169C */ lw $t8, %lo(D_809E169C)($t8) /* 00564 809E07A4 3C01809E */ lui $at, %hi(D_809E16F8) ## $at = 809E0000 -/* 00568 809E07A8 C42816F8 */ lwc1 $f8, %lo(D_809E16F8)($at) +/* 00568 809E07A8 C42816F8 */ lwc1 $f8, %lo(D_809E16F8)($at) /* 0056C 809E07AC 87190020 */ lh $t9, 0x0020($t8) ## 809E0020 /* 00570 809E07B0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00574 809E07B4 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 /* 00578 809E07B8 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 /* 0057C 809E07BC 8C8A0254 */ lw $t2, 0x0254($a0) ## 00000254 -/* 00580 809E07C0 468021A0 */ cvt.s.w $f6, $f4 -/* 00584 809E07C4 46083282 */ mul.s $f10, $f6, $f8 +/* 00580 809E07C0 468021A0 */ cvt.s.w $f6, $f4 +/* 00584 809E07C4 46083282 */ mul.s $f10, $f6, $f8 /* 00588 809E07C8 00000000 */ nop -/* 0058C 809E07CC 46105482 */ mul.s $f18, $f10, $f16 -/* 00590 809E07D0 4600910D */ trunc.w.s $f4, $f18 -/* 00594 809E07D4 44092000 */ mfc1 $t1, $f4 -/* 00598 809E07D8 10000007 */ beq $zero, $zero, .L809E07F8 +/* 0058C 809E07CC 46105482 */ mul.s $f18, $f10, $f16 +/* 00590 809E07D0 4600910D */ trunc.w.s $f4, $f18 +/* 00594 809E07D4 44092000 */ mfc1 $t1, $f4 +/* 00598 809E07D8 10000007 */ beq $zero, $zero, .L809E07F8 /* 0059C 809E07DC A5490036 */ sh $t1, 0x0036($t2) ## 00000036 .L809E07E0: /* 005A0 809E07E0 A4C0001C */ sh $zero, 0x001C($a2) ## 0000001C /* 005A4 809E07E4 3C0B809E */ lui $t3, %hi(D_809E169C) ## $t3 = 809E0000 -/* 005A8 809E07E8 8D6B169C */ lw $t3, %lo(D_809E169C)($t3) +/* 005A8 809E07E8 8D6B169C */ lw $t3, %lo(D_809E169C)($t3) /* 005AC 809E07EC 8CCD0254 */ lw $t5, 0x0254($a2) ## 00000254 /* 005B0 809E07F0 856C0020 */ lh $t4, 0x0020($t3) ## 809E0020 /* 005B4 809E07F4 A5AC0036 */ sh $t4, 0x0036($t5) ## 00000036 @@ -38,14 +38,14 @@ glabel func_809E0770 /* 005B8 809E07F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005BC 809E07FC 24A500F0 */ addiu $a1, $a1, 0x00F0 ## $a1 = 060000F0 /* 005C0 809E0800 24C4017C */ addiu $a0, $a2, 0x017C ## $a0 = 0000017C -/* 005C4 809E0804 0C0294BE */ jal func_800A52F8 -/* 005C8 809E0808 AFA60018 */ sw $a2, 0x0018($sp) -/* 005CC 809E080C 8FA60018 */ lw $a2, 0x0018($sp) +/* 005C4 809E0804 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 005C8 809E0808 AFA60018 */ sw $a2, 0x0018($sp) +/* 005CC 809E080C 8FA60018 */ lw $a2, 0x0018($sp) /* 005D0 809E0810 24C40024 */ addiu $a0, $a2, 0x0024 ## $a0 = 00000024 /* 005D4 809E0814 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 005D8 809E0818 24C50008 */ addiu $a1, $a2, 0x0008 ## $a1 = 00000008 -/* 005DC 809E081C 8FA60018 */ lw $a2, 0x0018($sp) +/* 005DC 809E081C 8FA60018 */ lw $a2, 0x0018($sp) /* 005E0 809E0820 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 005E4 809E0824 44813000 */ mtc1 $at, $f6 ## $f6 = 2000.00 /* 005E8 809E0828 44814000 */ mtc1 $at, $f8 ## $f8 = 2000.00 @@ -59,9 +59,9 @@ glabel func_809E0770 /* 00608 809E0848 ACCF01C0 */ sw $t7, 0x01C0($a2) ## 000001C0 /* 0060C 809E084C E4C600BC */ swc1 $f6, 0x00BC($a2) ## 000000BC /* 00610 809E0850 E4C8004C */ swc1 $f8, 0x004C($a2) ## 0000004C -/* 00614 809E0854 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00614 809E0854 8FBF0014 */ lw $ra, 0x0014($sp) /* 00618 809E0858 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0061C 809E085C 03E00008 */ jr $ra +/* 0061C 809E085C 03E00008 */ jr $ra /* 00620 809E0860 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s index 41631f211f..aa2da68f2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s @@ -1,19 +1,19 @@ glabel EnCs_Draw /* 00CE4 809E2594 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00CE8 809E2598 AFB1002C */ sw $s1, 0x002C($sp) +/* 00CE8 809E2598 AFB1002C */ sw $s1, 0x002C($sp) /* 00CEC 809E259C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00CF0 809E25A0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00CF4 809E25A4 AFB20030 */ sw $s2, 0x0030($sp) -/* 00CF8 809E25A8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00CF0 809E25A0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00CF4 809E25A4 AFB20030 */ sw $s2, 0x0030($sp) +/* 00CF8 809E25A8 AFB00028 */ sw $s0, 0x0028($sp) /* 00CFC 809E25AC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00D00 809E25B0 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 00D04 809E25B4 3C06809E */ lui $a2, %hi(D_809E2980) ## $a2 = 809E0000 /* 00D08 809E25B8 24C62980 */ addiu $a2, $a2, %lo(D_809E2980) ## $a2 = 809E2980 /* 00D0C 809E25BC 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 00D10 809E25C0 240703C8 */ addiu $a3, $zero, 0x03C8 ## $a3 = 000003C8 -/* 00D14 809E25C4 0C031AB1 */ jal func_800C6AC4 +/* 00D14 809E25C4 0C031AB1 */ jal func_800C6AC4 /* 00D18 809E25C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00D1C 809E25CC 0C024F46 */ jal func_80093D18 +/* 00D1C 809E25CC 0C024F46 */ jal func_80093D18 /* 00D20 809E25D0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 00D24 809E25D4 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 00D28 809E25D8 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -24,20 +24,20 @@ glabel EnCs_Draw /* 00D3C 809E25EC 8E5801E4 */ lw $t8, 0x01E4($s2) ## 000001E4 /* 00D40 809E25F0 3C04809E */ lui $a0, %hi(D_809E2964) ## $a0 = 809E0000 /* 00D44 809E25F4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 00D48 809E25F8 0018C880 */ sll $t9, $t8, 2 -/* 00D4C 809E25FC 00992021 */ addu $a0, $a0, $t9 -/* 00D50 809E2600 8C842964 */ lw $a0, %lo(D_809E2964)($a0) +/* 00D48 809E25F8 0018C880 */ sll $t9, $t8, 2 +/* 00D4C 809E25FC 00992021 */ addu $a0, $a0, $t9 +/* 00D50 809E2600 8C842964 */ lw $a0, %lo(D_809E2964)($a0) /* 00D54 809E2604 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00D58 809E2608 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00D5C 809E260C 00044900 */ sll $t1, $a0, 4 -/* 00D60 809E2610 00095702 */ srl $t2, $t1, 28 -/* 00D64 809E2614 000A5880 */ sll $t3, $t2, 2 -/* 00D68 809E2618 018B6021 */ addu $t4, $t4, $t3 +/* 00D5C 809E260C 00044900 */ sll $t1, $a0, 4 +/* 00D60 809E2610 00095702 */ srl $t2, $t1, 28 +/* 00D64 809E2614 000A5880 */ sll $t3, $t2, 2 +/* 00D68 809E2618 018B6021 */ addu $t4, $t4, $t3 /* 00D6C 809E261C 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 00D70 809E2620 00814024 */ and $t0, $a0, $at +/* 00D70 809E2620 00814024 */ and $t0, $a0, $at /* 00D74 809E2624 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00D78 809E2628 010C6821 */ addu $t5, $t0, $t4 -/* 00D7C 809E262C 01A17021 */ addu $t6, $t5, $at +/* 00D78 809E2628 010C6821 */ addu $t5, $t0, $t4 +/* 00D7C 809E262C 01A17021 */ addu $t6, $t5, $at /* 00D80 809E2630 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 00D84 809E2634 9247014E */ lbu $a3, 0x014E($s2) ## 0000014E /* 00D88 809E2638 8E46016C */ lw $a2, 0x016C($s2) ## 0000016C @@ -46,29 +46,29 @@ glabel EnCs_Draw /* 00D94 809E2644 3C0F809E */ lui $t7, %hi(func_809E2784) ## $t7 = 809E0000 /* 00D98 809E2648 25EF2784 */ addiu $t7, $t7, %lo(func_809E2784) ## $t7 = 809E2784 /* 00D9C 809E264C 27182814 */ addiu $t8, $t8, %lo(func_809E2814) ## $t8 = 809E2814 -/* 00DA0 809E2650 AFB80014 */ sw $t8, 0x0014($sp) -/* 00DA4 809E2654 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00DA8 809E2658 AFB20018 */ sw $s2, 0x0018($sp) -/* 00DAC 809E265C 0C0286B2 */ jal func_800A1AC8 +/* 00DA0 809E2650 AFB80014 */ sw $t8, 0x0014($sp) +/* 00DA4 809E2654 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00DA8 809E2658 AFB20018 */ sw $s2, 0x0018($sp) +/* 00DAC 809E265C 0C0286B2 */ jal SkelAnime_DrawSV /* 00DB0 809E2660 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DB4 809E2664 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 00DB8 809E2668 9739F556 */ lhu $t9, -0x0AAA($t9) ## 8015F556 /* 00DBC 809E266C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00DC0 809E2670 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 00DC4 809E2674 33290400 */ andi $t1, $t9, 0x0400 ## $t1 = 00000000 -/* 00DC8 809E2678 11200036 */ beq $t1, $zero, .L809E2754 -/* 00DCC 809E267C 02212021 */ addu $a0, $s1, $at +/* 00DC8 809E2678 11200036 */ beq $t1, $zero, .L809E2754 +/* 00DCC 809E267C 02212021 */ addu $a0, $s1, $at /* 00DD0 809E2680 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 00DD4 809E2684 24050015 */ addiu $a1, $zero, 0x0015 ## $a1 = 00000015 -/* 00DD8 809E2688 04400032 */ bltz $v0, .L809E2754 -/* 00DDC 809E268C AFA20054 */ sw $v0, 0x0054($sp) -/* 00DE0 809E2690 0C03423F */ jal Matrix_Put +/* 00DD8 809E2688 04400032 */ bltz $v0, .L809E2754 +/* 00DDC 809E268C AFA20054 */ sw $v0, 0x0054($sp) +/* 00DE0 809E2690 0C03423F */ jal Matrix_Put /* 00DE4 809E2694 26440218 */ addiu $a0, $s2, 0x0218 ## $a0 = 00000218 /* 00DE8 809E2698 3C05809E */ lui $a1, %hi(D_809E2990) ## $a1 = 809E0000 /* 00DEC 809E269C 24A52990 */ addiu $a1, $a1, %lo(D_809E2990) ## $a1 = 809E2990 /* 00DF0 809E26A0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00DF4 809E26A4 0C0346A2 */ jal Matrix_NewMtx +/* 00DF4 809E26A4 0C0346A2 */ jal Matrix_NewMtx /* 00DF8 809E26A8 240603E8 */ addiu $a2, $zero, 0x03E8 ## $a2 = 000003E8 /* 00DFC 809E26AC 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 00E00 809E26B0 3C05DB06 */ lui $a1, 0xDB06 ## $a1 = DB060000 @@ -76,19 +76,19 @@ glabel EnCs_Draw /* 00E08 809E26B8 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 00E0C 809E26BC AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 /* 00E10 809E26C0 AC650000 */ sw $a1, 0x0000($v1) ## 00000000 -/* 00E14 809E26C4 8FAB0054 */ lw $t3, 0x0054($sp) +/* 00E14 809E26C4 8FAB0054 */ lw $t3, 0x0054($sp) /* 00E18 809E26C8 24060044 */ addiu $a2, $zero, 0x0044 ## $a2 = 00000044 /* 00E1C 809E26CC 3C070001 */ lui $a3, 0x0001 ## $a3 = 00010000 -/* 00E20 809E26D0 01660019 */ multu $t3, $a2 +/* 00E20 809E26D0 01660019 */ multu $t3, $a2 /* 00E24 809E26D4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 00E28 809E26D8 37180034 */ ori $t8, $t8, 0x0034 ## $t8 = DB060034 /* 00E2C 809E26DC 2459FE40 */ addiu $t9, $v0, 0xFE40 ## $t9 = FFFFFE40 /* 00E30 809E26E0 3C0B0603 */ lui $t3, 0x0603 ## $t3 = 06030000 /* 00E34 809E26E4 256BAF70 */ addiu $t3, $t3, 0xAF70 ## $t3 = 0602AF70 /* 00E38 809E26E8 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 00E3C 809E26EC 00004012 */ mflo $t0 -/* 00E40 809E26F0 02286021 */ addu $t4, $s1, $t0 -/* 00E44 809E26F4 01876821 */ addu $t5, $t4, $a3 +/* 00E3C 809E26EC 00004012 */ mflo $t0 +/* 00E40 809E26F0 02286021 */ addu $t4, $s1, $t0 +/* 00E44 809E26F4 01876821 */ addu $t5, $t4, $a3 /* 00E48 809E26F8 8DAE17B4 */ lw $t6, 0x17B4($t5) ## 000017B4 /* 00E4C 809E26FC AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 00E50 809E2700 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 @@ -106,10 +106,10 @@ glabel EnCs_Draw /* 00E80 809E2730 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 00E84 809E2734 AC650000 */ sw $a1, 0x0000($v1) ## 00000000 /* 00E88 809E2738 824C001E */ lb $t4, 0x001E($s2) ## 0000001E -/* 00E8C 809E273C 01860019 */ multu $t4, $a2 -/* 00E90 809E2740 00006812 */ mflo $t5 -/* 00E94 809E2744 022D7021 */ addu $t6, $s1, $t5 -/* 00E98 809E2748 01C77821 */ addu $t7, $t6, $a3 +/* 00E8C 809E273C 01860019 */ multu $t4, $a2 +/* 00E90 809E2740 00006812 */ mflo $t5 +/* 00E94 809E2744 022D7021 */ addu $t6, $s1, $t5 +/* 00E98 809E2748 01C77821 */ addu $t7, $t6, $a3 /* 00E9C 809E274C 8DF817B4 */ lw $t8, 0x17B4($t7) ## 000017BC /* 00EA0 809E2750 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 .L809E2754: @@ -117,13 +117,13 @@ glabel EnCs_Draw /* 00EA8 809E2758 24C629A0 */ addiu $a2, $a2, %lo(D_809E29A0) ## $a2 = 809E29A0 /* 00EAC 809E275C 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 00EB0 809E2760 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00EB4 809E2764 0C031AD5 */ jal func_800C6B54 +/* 00EB4 809E2764 0C031AD5 */ jal func_800C6B54 /* 00EB8 809E2768 240703F7 */ addiu $a3, $zero, 0x03F7 ## $a3 = 000003F7 -/* 00EBC 809E276C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00EC0 809E2770 8FB00028 */ lw $s0, 0x0028($sp) -/* 00EC4 809E2774 8FB1002C */ lw $s1, 0x002C($sp) -/* 00EC8 809E2778 8FB20030 */ lw $s2, 0x0030($sp) -/* 00ECC 809E277C 03E00008 */ jr $ra +/* 00EBC 809E276C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00EC0 809E2770 8FB00028 */ lw $s0, 0x0028($sp) +/* 00EC4 809E2774 8FB1002C */ lw $s1, 0x002C($sp) +/* 00EC8 809E2778 8FB20030 */ lw $s2, 0x0030($sp) +/* 00ECC 809E277C 03E00008 */ jr $ra /* 00ED0 809E2780 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s index 0f07026a1d..fe371de5f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s @@ -2,84 +2,84 @@ glabel EnCs_Init /* 00120 809E19D0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00124 809E19D4 8DCEE670 */ lw $t6, -0x1990($t6) ## 8015E670 /* 00128 809E19D8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0012C 809E19DC AFB00028 */ sw $s0, 0x0028($sp) +/* 0012C 809E19DC AFB00028 */ sw $s0, 0x0028($sp) /* 00130 809E19E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00134 809E19E4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00138 809E19E8 11C00005 */ beq $t6, $zero, .L809E1A00 -/* 0013C 809E19EC AFA5004C */ sw $a1, 0x004C($sp) +/* 00134 809E19E4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00138 809E19E8 11C00005 */ beq $t6, $zero, .L809E1A00 +/* 0013C 809E19EC AFA5004C */ sw $a1, 0x004C($sp) /* 00140 809E19F0 0C00B55C */ jal Actor_Kill - + /* 00144 809E19F4 00000000 */ nop -/* 00148 809E19F8 10000056 */ beq $zero, $zero, .L809E1B54 -/* 0014C 809E19FC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00148 809E19F8 10000056 */ beq $zero, $zero, .L809E1B54 +/* 0014C 809E19FC 8FBF002C */ lw $ra, 0x002C($sp) .L809E1A00: /* 00150 809E1A00 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00154 809E1A04 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00158 809E1A08 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0015C 809E1A0C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00160 809E1A10 0C00AC78 */ jal ActorShape_Init - + /* 00164 809E1A14 3C074198 */ lui $a3, 0x4198 ## $a3 = 41980000 /* 00168 809E1A18 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0016C 809E1A1C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00170 809E1A20 260F0284 */ addiu $t7, $s0, 0x0284 ## $t7 = 00000284 /* 00174 809E1A24 261802E4 */ addiu $t8, $s0, 0x02E4 ## $t8 = 000002E4 /* 00178 809E1A28 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 0017C 809E1A2C AFB90018 */ sw $t9, 0x0018($sp) -/* 00180 809E1A30 AFB80014 */ sw $t8, 0x0014($sp) -/* 00184 809E1A34 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0017C 809E1A2C AFB90018 */ sw $t9, 0x0018($sp) +/* 00180 809E1A30 AFB80014 */ sw $t8, 0x0014($sp) +/* 00184 809E1A34 AFAF0010 */ sw $t7, 0x0010($sp) /* 00188 809E1A38 24C68540 */ addiu $a2, $a2, 0x8540 ## $a2 = 06008540 -/* 0018C 809E1A3C AFA50038 */ sw $a1, 0x0038($sp) -/* 00190 809E1A40 8FA4004C */ lw $a0, 0x004C($sp) -/* 00194 809E1A44 0C0291BE */ jal func_800A46F8 +/* 0018C 809E1A3C AFA50038 */ sw $a1, 0x0038($sp) +/* 00190 809E1A40 8FA4004C */ lw $a0, 0x004C($sp) +/* 00194 809E1A44 0C0291BE */ jal SkelAnime_InitSV /* 00198 809E1A48 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0019C 809E1A4C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 001A0 809E1A50 AFA50034 */ sw $a1, 0x0034($sp) +/* 001A0 809E1A50 AFA50034 */ sw $a1, 0x0034($sp) /* 001A4 809E1A54 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 001A8 809E1A58 8FA4004C */ lw $a0, 0x004C($sp) + +/* 001A8 809E1A58 8FA4004C */ lw $a0, 0x004C($sp) /* 001AC 809E1A5C 3C07809E */ lui $a3, %hi(D_809E28C0) ## $a3 = 809E0000 -/* 001B0 809E1A60 8FA50034 */ lw $a1, 0x0034($sp) +/* 001B0 809E1A60 8FA50034 */ lw $a1, 0x0034($sp) /* 001B4 809E1A64 24E728C0 */ addiu $a3, $a3, %lo(D_809E28C0) ## $a3 = 809E28C0 -/* 001B8 809E1A68 8FA4004C */ lw $a0, 0x004C($sp) +/* 001B8 809E1A68 8FA4004C */ lw $a0, 0x004C($sp) /* 001BC 809E1A6C 0C01712B */ jal ActorCollider_InitCylinder - + /* 001C0 809E1A70 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001C4 809E1A74 3C05809E */ lui $a1, %hi(D_809E28F8) ## $a1 = 809E0000 /* 001C8 809E1A78 3C06809E */ lui $a2, %hi(D_809E28EC) ## $a2 = 809E0000 /* 001CC 809E1A7C 24C628EC */ addiu $a2, $a2, %lo(D_809E28EC) ## $a2 = 809E28EC /* 001D0 809E1A80 24A528F8 */ addiu $a1, $a1, %lo(D_809E28F8) ## $a1 = 809E28F8 -/* 001D4 809E1A84 0C0187BF */ jal func_80061EFC +/* 001D4 809E1A84 0C0187BF */ jal func_80061EFC /* 001D8 809E1A88 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 001DC 809E1A8C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001E0 809E1A90 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 001E4 809E1A94 AFA80014 */ sw $t0, 0x0014($sp) -/* 001E8 809E1A98 44060000 */ mfc1 $a2, $f0 -/* 001EC 809E1A9C 44070000 */ mfc1 $a3, $f0 -/* 001F0 809E1AA0 8FA4004C */ lw $a0, 0x004C($sp) +/* 001E4 809E1A94 AFA80014 */ sw $t0, 0x0014($sp) +/* 001E8 809E1A98 44060000 */ mfc1 $a2, $f0 +/* 001EC 809E1A9C 44070000 */ mfc1 $a3, $f0 +/* 001F0 809E1AA0 8FA4004C */ lw $a0, 0x004C($sp) /* 001F4 809E1AA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001F8 809E1AA8 0C00B92D */ jal func_8002E4B4 -/* 001FC 809E1AAC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 001F8 809E1AA8 0C00B92D */ jal func_8002E4B4 +/* 001FC 809E1AAC E7A00010 */ swc1 $f0, 0x0010($sp) /* 00200 809E1AB0 3C03809E */ lui $v1, %hi(D_809E2918) ## $v1 = 809E0000 /* 00204 809E1AB4 24632918 */ addiu $v1, $v1, %lo(D_809E2918) ## $v1 = 809E2918 /* 00208 809E1AB8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0020C 809E1ABC 8C640000 */ lw $a0, 0x0000($v1) ## 809E2918 /* 00210 809E1AC0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00214 809E1AC4 3C03809E */ lui $v1, %hi(D_809E2918) ## $v1 = 809E0000 /* 00218 809E1AC8 24632918 */ addiu $v1, $v1, %lo(D_809E2918) ## $v1 = 809E2918 -/* 0021C 809E1ACC 468021A0 */ cvt.s.w $f6, $f4 +/* 0021C 809E1ACC 468021A0 */ cvt.s.w $f6, $f4 /* 00220 809E1AD0 90690008 */ lbu $t1, 0x0008($v1) ## 809E2920 /* 00224 809E1AD4 C468000C */ lwc1 $f8, 0x000C($v1) ## 809E2924 /* 00228 809E1AD8 8C650000 */ lw $a1, 0x0000($v1) ## 809E2918 -/* 0022C 809E1ADC 8FA40038 */ lw $a0, 0x0038($sp) +/* 0022C 809E1ADC 8FA40038 */ lw $a0, 0x0038($sp) /* 00230 809E1AE0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00234 809E1AE4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00234 809E1AE4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00238 809E1AE8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0023C 809E1AEC AFA90014 */ sw $t1, 0x0014($sp) +/* 0023C 809E1AEC AFA90014 */ sw $t1, 0x0014($sp) /* 00240 809E1AF0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00244 809E1AF4 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 00244 809E1AF4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00248 809E1AF8 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 0024C 809E1AFC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00250 809E1B00 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 @@ -94,7 +94,7 @@ glabel EnCs_Init /* 00274 809E1B24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00278 809E1B28 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0027C 809E1B2C 26060210 */ addiu $a2, $s0, 0x0210 ## $a2 = 00000210 -/* 00280 809E1B30 0C27862C */ jal func_809E18B0 +/* 00280 809E1B30 0C27862C */ jal func_809E18B0 /* 00284 809E1B34 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 00288 809E1B38 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0028C 809E1B3C 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 @@ -102,11 +102,11 @@ glabel EnCs_Init /* 00294 809E1B44 25CE2134 */ addiu $t6, $t6, %lo(func_809E2134) ## $t6 = 809E2134 /* 00298 809E1B48 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 /* 0029C 809E1B4C E610020C */ swc1 $f16, 0x020C($s0) ## 0000020C -/* 002A0 809E1B50 8FBF002C */ lw $ra, 0x002C($sp) +/* 002A0 809E1B50 8FBF002C */ lw $ra, 0x002C($sp) .L809E1B54: -/* 002A4 809E1B54 8FB00028 */ lw $s0, 0x0028($sp) +/* 002A4 809E1B54 8FB00028 */ lw $s0, 0x0028($sp) /* 002A8 809E1B58 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 002AC 809E1B5C 03E00008 */ jr $ra +/* 002AC 809E1B5C 03E00008 */ jr $ra /* 002B0 809E1B60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s index 94e25c5889..c98c07bf4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s @@ -1,25 +1,25 @@ glabel EnDaiku_Draw /* 01278 809E3DA8 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0127C 809E3DAC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01280 809E3DB0 AFA40058 */ sw $a0, 0x0058($sp) -/* 01284 809E3DB4 AFA5005C */ sw $a1, 0x005C($sp) +/* 0127C 809E3DAC AFBF0024 */ sw $ra, 0x0024($sp) +/* 01280 809E3DB0 AFA40058 */ sw $a0, 0x0058($sp) +/* 01284 809E3DB4 AFA5005C */ sw $a1, 0x005C($sp) /* 01288 809E3DB8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0128C 809E3DBC 3C06809E */ lui $a2, %hi(D_809E4170) ## $a2 = 809E0000 /* 01290 809E3DC0 24C64170 */ addiu $a2, $a2, %lo(D_809E4170) ## $a2 = 809E4170 /* 01294 809E3DC4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01298 809E3DC8 240704CB */ addiu $a3, $zero, 0x04CB ## $a3 = 000004CB -/* 0129C 809E3DCC 0C031AB1 */ jal func_800C6AC4 -/* 012A0 809E3DD0 AFA50050 */ sw $a1, 0x0050($sp) -/* 012A4 809E3DD4 8FAF005C */ lw $t7, 0x005C($sp) -/* 012A8 809E3DD8 0C024F46 */ jal func_80093D18 +/* 0129C 809E3DCC 0C031AB1 */ jal func_800C6AC4 +/* 012A0 809E3DD0 AFA50050 */ sw $a1, 0x0050($sp) +/* 012A4 809E3DD4 8FAF005C */ lw $t7, 0x005C($sp) +/* 012A8 809E3DD8 0C024F46 */ jal func_80093D18 /* 012AC 809E3DDC 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 012B0 809E3DE0 8FA90058 */ lw $t1, 0x0058($sp) -/* 012B4 809E3DE4 8FA80050 */ lw $t0, 0x0050($sp) +/* 012B0 809E3DE0 8FA90058 */ lw $t1, 0x0058($sp) +/* 012B4 809E3DE4 8FA80050 */ lw $t0, 0x0050($sp) /* 012B8 809E3DE8 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 /* 012BC 809E3DEC 8522001C */ lh $v0, 0x001C($t1) ## 0000001C /* 012C0 809E3DF0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 012C4 809E3DF4 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 012C8 809E3DF8 14400009 */ bne $v0, $zero, .L809E3E20 +/* 012C8 809E3DF8 14400009 */ bne $v0, $zero, .L809E3E20 /* 012CC 809E3DFC 00000000 */ nop /* 012D0 809E3E00 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 012D4 809E3E04 3C0AAA0A */ lui $t2, 0xAA0A ## $t2 = AA0A0000 @@ -27,10 +27,10 @@ glabel EnDaiku_Draw /* 012DC 809E3E0C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 012E0 809E3E10 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 012E4 809E3E14 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 012E8 809E3E18 10000020 */ beq $zero, $zero, .L809E3E9C +/* 012E8 809E3E18 10000020 */ beq $zero, $zero, .L809E3E9C /* 012EC 809E3E1C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 .L809E3E20: -/* 012F0 809E3E20 14410009 */ bne $v0, $at, .L809E3E48 +/* 012F0 809E3E20 14410009 */ bne $v0, $at, .L809E3E48 /* 012F4 809E3E24 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 /* 012F8 809E3E28 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 012FC 809E3E2C 3C0DAAC8 */ lui $t5, 0xAAC8 ## $t5 = AAC80000 @@ -38,11 +38,11 @@ glabel EnDaiku_Draw /* 01304 809E3E34 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 01308 809E3E38 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 0130C 809E3E3C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 01310 809E3E40 10000016 */ beq $zero, $zero, .L809E3E9C +/* 01310 809E3E40 10000016 */ beq $zero, $zero, .L809E3E9C /* 01314 809E3E44 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 .L809E3E48: /* 01318 809E3E48 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0131C 809E3E4C 14410009 */ bne $v0, $at, .L809E3E74 +/* 0131C 809E3E4C 14410009 */ bne $v0, $at, .L809E3E74 /* 01320 809E3E50 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 /* 01324 809E3E54 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01328 809E3E58 3C1800E6 */ lui $t8, 0x00E6 ## $t8 = 00E60000 @@ -50,11 +50,11 @@ glabel EnDaiku_Draw /* 01330 809E3E60 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 01334 809E3E64 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 01338 809E3E68 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 0133C 809E3E6C 1000000B */ beq $zero, $zero, .L809E3E9C +/* 0133C 809E3E6C 1000000B */ beq $zero, $zero, .L809E3E9C /* 01340 809E3E70 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 .L809E3E74: /* 01344 809E3E74 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01348 809E3E78 14410008 */ bne $v0, $at, .L809E3E9C +/* 01348 809E3E78 14410008 */ bne $v0, $at, .L809E3E9C /* 0134C 809E3E7C 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 /* 01350 809E3E80 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01354 809E3E84 3C0BC800 */ lui $t3, 0xC800 ## $t3 = C8000000 @@ -71,21 +71,21 @@ glabel EnDaiku_Draw /* 0137C 809E3EAC 3C0D809E */ lui $t5, %hi(func_809E3F7C) ## $t5 = 809E0000 /* 01380 809E3EB0 25AD3F7C */ addiu $t5, $t5, %lo(func_809E3F7C) ## $t5 = 809E3F7C /* 01384 809E3EB4 258C3EF8 */ addiu $t4, $t4, %lo(func_809E3EF8) ## $t4 = 809E3EF8 -/* 01388 809E3EB8 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0138C 809E3EBC AFAD0014 */ sw $t5, 0x0014($sp) -/* 01390 809E3EC0 AFA90018 */ sw $t1, 0x0018($sp) -/* 01394 809E3EC4 0C0286B2 */ jal func_800A1AC8 -/* 01398 809E3EC8 8FA4005C */ lw $a0, 0x005C($sp) -/* 0139C 809E3ECC 8FAE005C */ lw $t6, 0x005C($sp) +/* 01388 809E3EB8 AFAC0010 */ sw $t4, 0x0010($sp) +/* 0138C 809E3EBC AFAD0014 */ sw $t5, 0x0014($sp) +/* 01390 809E3EC0 AFA90018 */ sw $t1, 0x0018($sp) +/* 01394 809E3EC4 0C0286B2 */ jal SkelAnime_DrawSV +/* 01398 809E3EC8 8FA4005C */ lw $a0, 0x005C($sp) +/* 0139C 809E3ECC 8FAE005C */ lw $t6, 0x005C($sp) /* 013A0 809E3ED0 3C06809E */ lui $a2, %hi(D_809E4180) ## $a2 = 809E0000 /* 013A4 809E3ED4 24C64180 */ addiu $a2, $a2, %lo(D_809E4180) ## $a2 = 809E4180 /* 013A8 809E3ED8 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 013AC 809E3EDC 240704E7 */ addiu $a3, $zero, 0x04E7 ## $a3 = 000004E7 -/* 013B0 809E3EE0 0C031AD5 */ jal func_800C6B54 +/* 013B0 809E3EE0 0C031AD5 */ jal func_800C6B54 /* 013B4 809E3EE4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 013B8 809E3EE8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 013B8 809E3EE8 8FBF0024 */ lw $ra, 0x0024($sp) /* 013BC 809E3EEC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 013C0 809E3EF0 03E00008 */ jr $ra +/* 013C0 809E3EF0 03E00008 */ jr $ra /* 013C4 809E3EF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s index d8c6011b2f..2659ba612e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s @@ -1,71 +1,71 @@ glabel EnDaiku_Init /* 000B0 809E2BE0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 000B4 809E2BE4 AFBF002C */ sw $ra, 0x002C($sp) -/* 000B8 809E2BE8 AFB00028 */ sw $s0, 0x0028($sp) -/* 000BC 809E2BEC AFA50054 */ sw $a1, 0x0054($sp) +/* 000B4 809E2BE4 AFBF002C */ sw $ra, 0x002C($sp) +/* 000B8 809E2BE8 AFB00028 */ sw $s0, 0x0028($sp) +/* 000BC 809E2BEC AFA50054 */ sw $a1, 0x0054($sp) /* 000C0 809E2BF0 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 000C4 809E2BF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 000C8 809E2BF8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 000CC 809E2BFC 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 000D0 809E2C00 14400009 */ bne $v0, $zero, .L809E2C28 +/* 000D0 809E2C00 14400009 */ bne $v0, $zero, .L809E2C28 /* 000D4 809E2C04 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 000D8 809E2C08 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 /* 000DC 809E2C0C 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 /* 000E0 809E2C10 948E0EE6 */ lhu $t6, 0x0EE6($a0) ## 8015F546 /* 000E4 809E2C14 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 000E8 809E2C18 11E00003 */ beq $t7, $zero, .L809E2C28 +/* 000E8 809E2C18 11E00003 */ beq $t7, $zero, .L809E2C28 /* 000EC 809E2C1C 00000000 */ nop -/* 000F0 809E2C20 1000001C */ beq $zero, $zero, .L809E2C94 +/* 000F0 809E2C20 1000001C */ beq $zero, $zero, .L809E2C94 /* 000F4 809E2C24 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L809E2C28: /* 000F8 809E2C28 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 /* 000FC 809E2C2C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00100 809E2C30 14410007 */ bne $v0, $at, .L809E2C50 +/* 00100 809E2C30 14410007 */ bne $v0, $at, .L809E2C50 /* 00104 809E2C34 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 /* 00108 809E2C38 94980EE6 */ lhu $t8, 0x0EE6($a0) ## 8015F546 /* 0010C 809E2C3C 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 00110 809E2C40 53200004 */ beql $t9, $zero, .L809E2C54 +/* 00110 809E2C40 53200004 */ beql $t9, $zero, .L809E2C54 /* 00114 809E2C44 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00118 809E2C48 10000012 */ beq $zero, $zero, .L809E2C94 +/* 00118 809E2C48 10000012 */ beq $zero, $zero, .L809E2C94 /* 0011C 809E2C4C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L809E2C50: /* 00120 809E2C50 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L809E2C54: -/* 00124 809E2C54 54410008 */ bnel $v0, $at, .L809E2C78 +/* 00124 809E2C54 54410008 */ bnel $v0, $at, .L809E2C78 /* 00128 809E2C58 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 0012C 809E2C5C 94890EE6 */ lhu $t1, 0x0EE6($a0) ## 8015F546 /* 00130 809E2C60 312A0004 */ andi $t2, $t1, 0x0004 ## $t2 = 00000000 -/* 00134 809E2C64 51400004 */ beql $t2, $zero, .L809E2C78 +/* 00134 809E2C64 51400004 */ beql $t2, $zero, .L809E2C78 /* 00138 809E2C68 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0013C 809E2C6C 10000009 */ beq $zero, $zero, .L809E2C94 +/* 0013C 809E2C6C 10000009 */ beq $zero, $zero, .L809E2C94 /* 00140 809E2C70 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 00144 809E2C74 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 .L809E2C78: -/* 00148 809E2C78 54410007 */ bnel $v0, $at, .L809E2C98 +/* 00148 809E2C78 54410007 */ bnel $v0, $at, .L809E2C98 /* 0014C 809E2C7C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00150 809E2C80 948B0EE6 */ lhu $t3, 0x0EE6($a0) ## 8015F546 /* 00154 809E2C84 316C0008 */ andi $t4, $t3, 0x0008 ## $t4 = 00000000 -/* 00158 809E2C88 51800003 */ beql $t4, $zero, .L809E2C98 +/* 00158 809E2C88 51800003 */ beql $t4, $zero, .L809E2C98 /* 0015C 809E2C8C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00160 809E2C90 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L809E2C94: /* 00164 809E2C94 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L809E2C98: -/* 00168 809E2C98 14610008 */ bne $v1, $at, .L809E2CBC +/* 00168 809E2C98 14610008 */ bne $v1, $at, .L809E2CBC /* 0016C 809E2C9C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00170 809E2CA0 8FAD0054 */ lw $t5, 0x0054($sp) +/* 00170 809E2CA0 8FAD0054 */ lw $t5, 0x0054($sp) /* 00174 809E2CA4 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 00178 809E2CA8 85AE00A4 */ lh $t6, 0x00A4($t5) ## 000000A4 -/* 0017C 809E2CAC 15C10003 */ bne $t6, $at, .L809E2CBC +/* 0017C 809E2CAC 15C10003 */ bne $t6, $at, .L809E2CBC /* 00180 809E2CB0 00000000 */ nop -/* 00184 809E2CB4 10000008 */ beq $zero, $zero, .L809E2CD8 +/* 00184 809E2CB4 10000008 */ beq $zero, $zero, .L809E2CD8 /* 00188 809E2CB8 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 .L809E2CBC: -/* 0018C 809E2CBC 14600006 */ bne $v1, $zero, .L809E2CD8 -/* 00190 809E2CC0 8FAF0054 */ lw $t7, 0x0054($sp) +/* 0018C 809E2CBC 14600006 */ bne $v1, $zero, .L809E2CD8 +/* 00190 809E2CC0 8FAF0054 */ lw $t7, 0x0054($sp) /* 00194 809E2CC4 85F800A4 */ lh $t8, 0x00A4($t7) ## 000000A4 /* 00198 809E2CC8 24010039 */ addiu $at, $zero, 0x0039 ## $at = 00000039 -/* 0019C 809E2CCC 57010003 */ bnel $t8, $at, .L809E2CDC +/* 0019C 809E2CCC 57010003 */ bnel $t8, $at, .L809E2CDC /* 001A0 809E2CD0 861900B8 */ lh $t9, 0x00B8($s0) ## 000000B8 /* 001A4 809E2CD4 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 .L809E2CD8: @@ -75,81 +75,81 @@ glabel EnDaiku_Init /* 001B0 809E2CE0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 001B4 809E2CE4 3329003F */ andi $t1, $t9, 0x003F ## $t1 = 00000000 /* 001B8 809E2CE8 AE090240 */ sw $t1, 0x0240($s0) ## 00000240 -/* 001BC 809E2CEC AFA80044 */ sw $t0, 0x0044($sp) +/* 001BC 809E2CEC AFA80044 */ sw $t0, 0x0044($sp) /* 001C0 809E2CF0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 001C4 809E2CF4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 001C8 809E2CF8 0C00AC78 */ jal ActorShape_Init - + /* 001CC 809E2CFC 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 001D0 809E2D00 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 001D4 809E2D04 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 001D8 809E2D08 260A026C */ addiu $t2, $s0, 0x026C ## $t2 = 0000026C /* 001DC 809E2D0C 260B02D2 */ addiu $t3, $s0, 0x02D2 ## $t3 = 000002D2 /* 001E0 809E2D10 240C0011 */ addiu $t4, $zero, 0x0011 ## $t4 = 00000011 -/* 001E4 809E2D14 AFAC0018 */ sw $t4, 0x0018($sp) -/* 001E8 809E2D18 AFAB0014 */ sw $t3, 0x0014($sp) -/* 001EC 809E2D1C AFAA0010 */ sw $t2, 0x0010($sp) +/* 001E4 809E2D14 AFAC0018 */ sw $t4, 0x0018($sp) +/* 001E8 809E2D18 AFAB0014 */ sw $t3, 0x0014($sp) +/* 001EC 809E2D1C AFAA0010 */ sw $t2, 0x0010($sp) /* 001F0 809E2D20 24C67958 */ addiu $a2, $a2, 0x7958 ## $a2 = 06007958 -/* 001F4 809E2D24 AFA50038 */ sw $a1, 0x0038($sp) -/* 001F8 809E2D28 8FA40054 */ lw $a0, 0x0054($sp) -/* 001FC 809E2D2C 0C0291BE */ jal func_800A46F8 +/* 001F4 809E2D24 AFA50038 */ sw $a1, 0x0038($sp) +/* 001F8 809E2D28 8FA40054 */ lw $a0, 0x0054($sp) +/* 001FC 809E2D2C 0C0291BE */ jal SkelAnime_InitSV /* 00200 809E2D30 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00204 809E2D34 8FA80044 */ lw $t0, 0x0044($sp) -/* 00208 809E2D38 8FA40054 */ lw $a0, 0x0054($sp) +/* 00204 809E2D34 8FA80044 */ lw $t0, 0x0044($sp) +/* 00208 809E2D38 8FA40054 */ lw $a0, 0x0054($sp) /* 0020C 809E2D3C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00210 809E2D40 15000005 */ bne $t0, $zero, .L809E2D58 +/* 00210 809E2D40 15000005 */ bne $t0, $zero, .L809E2D58 /* 00214 809E2D44 00000000 */ nop /* 00218 809E2D48 0C00B55C */ jal Actor_Kill - + /* 0021C 809E2D4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00220 809E2D50 10000071 */ beq $zero, $zero, .L809E2F18 -/* 00224 809E2D54 8FBF002C */ lw $ra, 0x002C($sp) +/* 00220 809E2D50 10000071 */ beq $zero, $zero, .L809E2F18 +/* 00224 809E2D54 8FBF002C */ lw $ra, 0x002C($sp) .L809E2D58: /* 00228 809E2D58 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 0022C 809E2D5C AFA50034 */ sw $a1, 0x0034($sp) + +/* 0022C 809E2D5C AFA50034 */ sw $a1, 0x0034($sp) /* 00230 809E2D60 3C07809E */ lui $a3, %hi(D_809E4060) ## $a3 = 809E0000 -/* 00234 809E2D64 8FA50034 */ lw $a1, 0x0034($sp) +/* 00234 809E2D64 8FA50034 */ lw $a1, 0x0034($sp) /* 00238 809E2D68 24E74060 */ addiu $a3, $a3, %lo(D_809E4060) ## $a3 = 809E4060 -/* 0023C 809E2D6C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0023C 809E2D6C 8FA40054 */ lw $a0, 0x0054($sp) /* 00240 809E2D70 0C01712B */ jal ActorCollider_InitCylinder - + /* 00244 809E2D74 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00248 809E2D78 3C05809E */ lui $a1, %hi(D_809E4098) ## $a1 = 809E0000 /* 0024C 809E2D7C 3C06809E */ lui $a2, %hi(D_809E408C) ## $a2 = 809E0000 /* 00250 809E2D80 24C6408C */ addiu $a2, $a2, %lo(D_809E408C) ## $a2 = 809E408C /* 00254 809E2D84 24A54098 */ addiu $a1, $a1, %lo(D_809E4098) ## $a1 = 809E4098 -/* 00258 809E2D88 0C0187BF */ jal func_80061EFC +/* 00258 809E2D88 0C0187BF */ jal func_80061EFC /* 0025C 809E2D8C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 00260 809E2D90 3C03809E */ lui $v1, %hi(D_809E40B8) ## $v1 = 809E0000 /* 00264 809E2D94 246340B8 */ addiu $v1, $v1, %lo(D_809E40B8) ## $v1 = 809E40B8 /* 00268 809E2D98 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0026C 809E2D9C 8C640000 */ lw $a0, 0x0000($v1) ## 809E40B8 /* 00270 809E2DA0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00274 809E2DA4 3C03809E */ lui $v1, %hi(D_809E40B8) ## $v1 = 809E0000 /* 00278 809E2DA8 246340B8 */ addiu $v1, $v1, %lo(D_809E40B8) ## $v1 = 809E40B8 -/* 0027C 809E2DAC 468021A0 */ cvt.s.w $f6, $f4 +/* 0027C 809E2DAC 468021A0 */ cvt.s.w $f6, $f4 /* 00280 809E2DB0 906D0008 */ lbu $t5, 0x0008($v1) ## 809E40C0 /* 00284 809E2DB4 C468000C */ lwc1 $f8, 0x000C($v1) ## 809E40C4 /* 00288 809E2DB8 8C650000 */ lw $a1, 0x0000($v1) ## 809E40B8 -/* 0028C 809E2DBC 8FA40038 */ lw $a0, 0x0038($sp) +/* 0028C 809E2DBC 8FA40038 */ lw $a0, 0x0038($sp) /* 00290 809E2DC0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00294 809E2DC4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00294 809E2DC4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00298 809E2DC8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0029C 809E2DCC AFAD0014 */ sw $t5, 0x0014($sp) +/* 0029C 809E2DCC AFAD0014 */ sw $t5, 0x0014($sp) /* 002A0 809E2DD0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 002A4 809E2DD4 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 002A4 809E2DD4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 002A8 809E2DD8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 002AC 809E2DDC 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 002B0 809E2DE0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 002B4 809E2DE4 44060000 */ mfc1 $a2, $f0 -/* 002B8 809E2DE8 44070000 */ mfc1 $a3, $f0 -/* 002BC 809E2DEC 8FA40054 */ lw $a0, 0x0054($sp) +/* 002B0 809E2DE0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 002B4 809E2DE4 44060000 */ mfc1 $a2, $f0 +/* 002B8 809E2DE8 44070000 */ mfc1 $a3, $f0 +/* 002BC 809E2DEC 8FA40054 */ lw $a0, 0x0054($sp) /* 002C0 809E2DF0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 002C4 809E2DF4 0C00B92D */ jal func_8002E4B4 -/* 002C8 809E2DF8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 002C4 809E2DF4 0C00B92D */ jal func_8002E4B4 +/* 002C8 809E2DF8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 002CC 809E2DFC 8A090030 */ lwl $t1, 0x0030($s0) ## 00000030 /* 002D0 809E2E00 9A090033 */ lwr $t1, 0x0033($s0) ## 00000033 /* 002D4 809E2E04 8E0B0024 */ lw $t3, 0x0024($s0) ## 00000024 @@ -169,42 +169,42 @@ glabel EnDaiku_Init /* 0030C 809E2E3C A609033C */ sh $t1, 0x033C($s0) ## 0000033C /* 00310 809E2E40 AE0B0348 */ sw $t3, 0x0348($s0) ## 00000348 /* 00314 809E2E44 AE0A0344 */ sw $t2, 0x0344($s0) ## 00000344 -/* 00318 809E2E48 8FAC0054 */ lw $t4, 0x0054($sp) +/* 00318 809E2E48 8FAC0054 */ lw $t4, 0x0054($sp) /* 0031C 809E2E4C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 00320 809E2E50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00324 809E2E54 858D00A4 */ lh $t5, 0x00A4($t4) ## 000000A4 /* 00328 809E2E58 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0032C 809E2E5C 55A1000B */ bnel $t5, $at, .L809E2E8C +/* 0032C 809E2E5C 55A1000B */ bnel $t5, $at, .L809E2E8C /* 00330 809E2E60 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00334 809E2E64 0C278ACC */ jal func_809E2B30 +/* 00334 809E2E64 0C278ACC */ jal func_809E2B30 /* 00338 809E2E68 260601F4 */ addiu $a2, $s0, 0x01F4 ## $a2 = 000001F4 /* 0033C 809E2E6C 8E0E023C */ lw $t6, 0x023C($s0) ## 0000023C /* 00340 809E2E70 3C18809E */ lui $t8, %hi(func_809E336C) ## $t8 = 809E0000 /* 00344 809E2E74 2718336C */ addiu $t8, $t8, %lo(func_809E336C) ## $t8 = 809E336C /* 00348 809E2E78 35CF0006 */ ori $t7, $t6, 0x0006 ## $t7 = 00000006 /* 0034C 809E2E7C AE0F023C */ sw $t7, 0x023C($s0) ## 0000023C -/* 00350 809E2E80 10000024 */ beq $zero, $zero, .L809E2F14 +/* 00350 809E2E80 10000024 */ beq $zero, $zero, .L809E2F14 /* 00354 809E2E84 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 /* 00358 809E2E88 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L809E2E8C: /* 0035C 809E2E8C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00360 809E2E90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00364 809E2E94 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 00368 809E2E98 10410004 */ beq $v0, $at, .L809E2EAC +/* 00368 809E2E98 10410004 */ beq $v0, $at, .L809E2EAC /* 0036C 809E2E9C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 00370 809E2EA0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00374 809E2EA4 14410007 */ bne $v0, $at, .L809E2EC4 +/* 00374 809E2EA4 14410007 */ bne $v0, $at, .L809E2EC4 /* 00378 809E2EA8 260601F4 */ addiu $a2, $s0, 0x01F4 ## $a2 = 000001F4 .L809E2EAC: -/* 0037C 809E2EAC 0C278ACC */ jal func_809E2B30 +/* 0037C 809E2EAC 0C278ACC */ jal func_809E2B30 /* 00380 809E2EB0 260601F4 */ addiu $a2, $s0, 0x01F4 ## $a2 = 000001F4 /* 00384 809E2EB4 8E19023C */ lw $t9, 0x023C($s0) ## 0000023C /* 00388 809E2EB8 37290002 */ ori $t1, $t9, 0x0002 ## $t1 = 00000002 -/* 0038C 809E2EBC 10000007 */ beq $zero, $zero, .L809E2EDC +/* 0038C 809E2EBC 10000007 */ beq $zero, $zero, .L809E2EDC /* 00390 809E2EC0 AE09023C */ sw $t1, 0x023C($s0) ## 0000023C .L809E2EC4: /* 00394 809E2EC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00398 809E2EC8 0C278ACC */ jal func_809E2B30 +/* 00398 809E2EC8 0C278ACC */ jal func_809E2B30 /* 0039C 809E2ECC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003A0 809E2ED0 8E0A023C */ lw $t2, 0x023C($s0) ## 0000023C /* 003A4 809E2ED4 354B0006 */ ori $t3, $t2, 0x0006 ## $t3 = 00000006 @@ -216,21 +216,21 @@ glabel EnDaiku_Init /* 003B4 809E2EE4 C610015C */ lwc1 $f16, 0x015C($s0) ## 0000015C /* 003B8 809E2EE8 3C0E809E */ lui $t6, %hi(func_809E3338) ## $t6 = 809E0000 /* 003BC 809E2EEC 25CE3338 */ addiu $t6, $t6, %lo(func_809E3338) ## $t6 = 809E3338 -/* 003C0 809E2EF0 46100482 */ mul.s $f18, $f0, $f16 +/* 003C0 809E2EF0 46100482 */ mul.s $f18, $f0, $f16 /* 003C4 809E2EF4 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 003C8 809E2EF8 4600910D */ trunc.w.s $f4, $f18 -/* 003CC 809E2EFC 440D2000 */ mfc1 $t5, $f4 +/* 003C8 809E2EF8 4600910D */ trunc.w.s $f4, $f18 +/* 003CC 809E2EFC 440D2000 */ mfc1 $t5, $f4 /* 003D0 809E2F00 00000000 */ nop /* 003D4 809E2F04 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 /* 003D8 809E2F08 00000000 */ nop -/* 003DC 809E2F0C 46803220 */ cvt.s.w $f8, $f6 +/* 003DC 809E2F0C 46803220 */ cvt.s.w $f8, $f6 /* 003E0 809E2F10 E6080164 */ swc1 $f8, 0x0164($s0) ## 00000164 .L809E2F14: -/* 003E4 809E2F14 8FBF002C */ lw $ra, 0x002C($sp) +/* 003E4 809E2F14 8FBF002C */ lw $ra, 0x002C($sp) .L809E2F18: -/* 003E8 809E2F18 8FB00028 */ lw $s0, 0x0028($sp) +/* 003E8 809E2F18 8FB00028 */ lw $s0, 0x0028($sp) /* 003EC 809E2F1C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 003F0 809E2F20 03E00008 */ jr $ra +/* 003F0 809E2F20 03E00008 */ jr $ra /* 003F4 809E2F24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s index 5ca8ee320e..1ada9a4868 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s @@ -1,25 +1,25 @@ glabel EnDaikuKakariko_Draw /* 01020 809E5340 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01024 809E5344 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01028 809E5348 AFA40058 */ sw $a0, 0x0058($sp) -/* 0102C 809E534C AFA5005C */ sw $a1, 0x005C($sp) +/* 01024 809E5344 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01028 809E5348 AFA40058 */ sw $a0, 0x0058($sp) +/* 0102C 809E534C AFA5005C */ sw $a1, 0x005C($sp) /* 01030 809E5350 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01034 809E5354 3C06809E */ lui $a2, %hi(D_809E55E0) ## $a2 = 809E0000 /* 01038 809E5358 24C655E0 */ addiu $a2, $a2, %lo(D_809E55E0) ## $a2 = 809E55E0 /* 0103C 809E535C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01040 809E5360 24070464 */ addiu $a3, $zero, 0x0464 ## $a3 = 00000464 -/* 01044 809E5364 0C031AB1 */ jal func_800C6AC4 -/* 01048 809E5368 AFA50050 */ sw $a1, 0x0050($sp) -/* 0104C 809E536C 8FAF005C */ lw $t7, 0x005C($sp) -/* 01050 809E5370 0C024F46 */ jal func_80093D18 +/* 01044 809E5364 0C031AB1 */ jal func_800C6AC4 +/* 01048 809E5368 AFA50050 */ sw $a1, 0x0050($sp) +/* 0104C 809E536C 8FAF005C */ lw $t7, 0x005C($sp) +/* 01050 809E5370 0C024F46 */ jal func_80093D18 /* 01054 809E5374 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01058 809E5378 8FA90058 */ lw $t1, 0x0058($sp) -/* 0105C 809E537C 8FA80050 */ lw $t0, 0x0050($sp) +/* 01058 809E5378 8FA90058 */ lw $t1, 0x0058($sp) +/* 0105C 809E537C 8FA80050 */ lw $t0, 0x0050($sp) /* 01060 809E5380 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 /* 01064 809E5384 8522001C */ lh $v0, 0x001C($t1) ## 0000001C /* 01068 809E5388 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0106C 809E538C 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 01070 809E5390 14400009 */ bne $v0, $zero, .L809E53B8 +/* 01070 809E5390 14400009 */ bne $v0, $zero, .L809E53B8 /* 01074 809E5394 00000000 */ nop /* 01078 809E5398 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0107C 809E539C 3C0AAA0A */ lui $t2, 0xAA0A ## $t2 = AA0A0000 @@ -27,10 +27,10 @@ glabel EnDaikuKakariko_Draw /* 01084 809E53A4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01088 809E53A8 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 0108C 809E53AC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 01090 809E53B0 10000020 */ beq $zero, $zero, .L809E5434 +/* 01090 809E53B0 10000020 */ beq $zero, $zero, .L809E5434 /* 01094 809E53B4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 .L809E53B8: -/* 01098 809E53B8 14410009 */ bne $v0, $at, .L809E53E0 +/* 01098 809E53B8 14410009 */ bne $v0, $at, .L809E53E0 /* 0109C 809E53BC 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 /* 010A0 809E53C0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 010A4 809E53C4 3C0DAAC8 */ lui $t5, 0xAAC8 ## $t5 = AAC80000 @@ -38,11 +38,11 @@ glabel EnDaikuKakariko_Draw /* 010AC 809E53CC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 010B0 809E53D0 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 010B4 809E53D4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 010B8 809E53D8 10000016 */ beq $zero, $zero, .L809E5434 +/* 010B8 809E53D8 10000016 */ beq $zero, $zero, .L809E5434 /* 010BC 809E53DC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 .L809E53E0: /* 010C0 809E53E0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 010C4 809E53E4 14410009 */ bne $v0, $at, .L809E540C +/* 010C4 809E53E4 14410009 */ bne $v0, $at, .L809E540C /* 010C8 809E53E8 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 /* 010CC 809E53EC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 010D0 809E53F0 3C1800E6 */ lui $t8, 0x00E6 ## $t8 = 00E60000 @@ -50,11 +50,11 @@ glabel EnDaikuKakariko_Draw /* 010D8 809E53F8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 010DC 809E53FC AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 010E0 809E5400 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 010E4 809E5404 1000000B */ beq $zero, $zero, .L809E5434 +/* 010E4 809E5404 1000000B */ beq $zero, $zero, .L809E5434 /* 010E8 809E5408 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 .L809E540C: /* 010EC 809E540C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 010F0 809E5410 14410008 */ bne $v0, $at, .L809E5434 +/* 010F0 809E5410 14410008 */ bne $v0, $at, .L809E5434 /* 010F4 809E5414 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 /* 010F8 809E5418 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 010FC 809E541C 3C0BC800 */ lui $t3, 0xC800 ## $t3 = C8000000 @@ -71,20 +71,20 @@ glabel EnDaikuKakariko_Draw /* 01124 809E5444 3C0D809E */ lui $t5, %hi(func_809E5288) ## $t5 = 809E0000 /* 01128 809E5448 25AD5288 */ addiu $t5, $t5, %lo(func_809E5288) ## $t5 = 809E5288 /* 0112C 809E544C 258C50B4 */ addiu $t4, $t4, %lo(func_809E50B4) ## $t4 = 809E50B4 -/* 01130 809E5450 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01134 809E5454 AFAD0014 */ sw $t5, 0x0014($sp) -/* 01138 809E5458 AFA90018 */ sw $t1, 0x0018($sp) -/* 0113C 809E545C 0C0286B2 */ jal func_800A1AC8 -/* 01140 809E5460 8FA4005C */ lw $a0, 0x005C($sp) -/* 01144 809E5464 8FAE005C */ lw $t6, 0x005C($sp) +/* 01130 809E5450 AFAC0010 */ sw $t4, 0x0010($sp) +/* 01134 809E5454 AFAD0014 */ sw $t5, 0x0014($sp) +/* 01138 809E5458 AFA90018 */ sw $t1, 0x0018($sp) +/* 0113C 809E545C 0C0286B2 */ jal SkelAnime_DrawSV +/* 01140 809E5460 8FA4005C */ lw $a0, 0x005C($sp) +/* 01144 809E5464 8FAE005C */ lw $t6, 0x005C($sp) /* 01148 809E5468 3C06809E */ lui $a2, %hi(D_809E55FC) ## $a2 = 809E0000 /* 0114C 809E546C 24C655FC */ addiu $a2, $a2, %lo(D_809E55FC) ## $a2 = 809E55FC /* 01150 809E5470 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01154 809E5474 2407047F */ addiu $a3, $zero, 0x047F ## $a3 = 0000047F -/* 01158 809E5478 0C031AD5 */ jal func_800C6B54 +/* 01158 809E5478 0C031AD5 */ jal func_800C6B54 /* 0115C 809E547C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 01160 809E5480 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01160 809E5480 8FBF0024 */ lw $ra, 0x0024($sp) /* 01164 809E5484 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01168 809E5488 03E00008 */ jr $ra +/* 01168 809E5488 03E00008 */ jr $ra /* 0116C 809E548C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s index c13083db61..6b5a710ae1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s @@ -3,51 +3,51 @@ glabel EnDaikuKakariko_Init /* 000B4 809E43D4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 000B8 809E43D8 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 000BC 809E43DC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 000C0 809E43E0 AFB00028 */ sw $s0, 0x0028($sp) +/* 000C0 809E43E0 AFB00028 */ sw $s0, 0x0028($sp) /* 000C4 809E43E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000C8 809E43E8 AFBF002C */ sw $ra, 0x002C($sp) -/* 000CC 809E43EC 11C00003 */ beq $t6, $zero, .L809E43FC -/* 000D0 809E43F0 AFA5004C */ sw $a1, 0x004C($sp) -/* 000D4 809E43F4 10000002 */ beq $zero, $zero, .L809E4400 +/* 000C8 809E43E8 AFBF002C */ sw $ra, 0x002C($sp) +/* 000CC 809E43EC 11C00003 */ beq $t6, $zero, .L809E43FC +/* 000D0 809E43F0 AFA5004C */ sw $a1, 0x004C($sp) +/* 000D4 809E43F4 10000002 */ beq $zero, $zero, .L809E4400 /* 000D8 809E43F8 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L809E43FC: /* 000DC 809E43FC 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 .L809E4400: /* 000E0 809E4400 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 000E4 809E4404 54410025 */ bnel $v0, $at, .L809E449C +/* 000E4 809E4404 54410025 */ bnel $v0, $at, .L809E449C /* 000E8 809E4408 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 -/* 000EC 809E440C 8FAF004C */ lw $t7, 0x004C($sp) +/* 000EC 809E440C 8FAF004C */ lw $t7, 0x004C($sp) /* 000F0 809E4410 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A /* 000F4 809E4414 85E200A4 */ lh $v0, 0x00A4($t7) ## 000000A4 -/* 000F8 809E4418 10410014 */ beq $v0, $at, .L809E446C +/* 000F8 809E4418 10410014 */ beq $v0, $at, .L809E446C /* 000FC 809E441C 24010030 */ addiu $at, $zero, 0x0030 ## $at = 00000030 -/* 00100 809E4420 1041001A */ beq $v0, $at, .L809E448C +/* 00100 809E4420 1041001A */ beq $v0, $at, .L809E448C /* 00104 809E4424 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 -/* 00108 809E4428 5441001C */ bnel $v0, $at, .L809E449C +/* 00108 809E4428 5441001C */ bnel $v0, $at, .L809E449C /* 0010C 809E442C 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 /* 00110 809E4430 8C780010 */ lw $t8, 0x0010($v1) ## 8015E670 -/* 00114 809E4434 57000019 */ bnel $t8, $zero, .L809E449C +/* 00114 809E4434 57000019 */ bnel $t8, $zero, .L809E449C /* 00118 809E4438 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 /* 0011C 809E443C 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 00120 809E4440 96190200 */ lhu $t9, 0x0200($s0) ## 00000200 /* 00124 809E4444 3C0D809E */ lui $t5, %hi(D_809E5568) ## $t5 = 809E0000 /* 00128 809E4448 314B0003 */ andi $t3, $t2, 0x0003 ## $t3 = 00000000 -/* 0012C 809E444C 000B6040 */ sll $t4, $t3, 1 +/* 0012C 809E444C 000B6040 */ sll $t4, $t3, 1 /* 00130 809E4450 37290001 */ ori $t1, $t9, 0x0001 ## $t1 = 00000001 /* 00134 809E4454 A6090200 */ sh $t1, 0x0200($s0) ## 00000200 -/* 00138 809E4458 01AC6821 */ addu $t5, $t5, $t4 -/* 0013C 809E445C 95AD5568 */ lhu $t5, %lo(D_809E5568)($t5) +/* 00138 809E4458 01AC6821 */ addu $t5, $t5, $t4 +/* 0013C 809E445C 95AD5568 */ lhu $t5, %lo(D_809E5568)($t5) /* 00140 809E4460 012D7025 */ or $t6, $t1, $t5 ## $t6 = 809E0001 -/* 00144 809E4464 1000000C */ beq $zero, $zero, .L809E4498 +/* 00144 809E4464 1000000C */ beq $zero, $zero, .L809E4498 /* 00148 809E4468 A60E0200 */ sh $t6, 0x0200($s0) ## 00000200 .L809E446C: /* 0014C 809E446C 8C6F0010 */ lw $t7, 0x0010($v1) ## 8015E670 /* 00150 809E4470 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00154 809E4474 55E10009 */ bnel $t7, $at, .L809E449C +/* 00154 809E4474 55E10009 */ bnel $t7, $at, .L809E449C /* 00158 809E4478 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 /* 0015C 809E447C 96180200 */ lhu $t8, 0x0200($s0) ## 00000200 /* 00160 809E4480 37190002 */ ori $t9, $t8, 0x0002 ## $t9 = 00000002 -/* 00164 809E4484 10000004 */ beq $zero, $zero, .L809E4498 +/* 00164 809E4484 10000004 */ beq $zero, $zero, .L809E4498 /* 00168 809E4488 A6190200 */ sh $t9, 0x0200($s0) ## 00000200 .L809E448C: /* 0016C 809E448C 96080200 */ lhu $t0, 0x0200($s0) ## 00000200 @@ -57,10 +57,10 @@ glabel EnDaikuKakariko_Init /* 00178 809E4498 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 .L809E449C: /* 0017C 809E449C 316C0007 */ andi $t4, $t3, 0x0007 ## $t4 = 00000000 -/* 00180 809E44A0 55800006 */ bnel $t4, $zero, .L809E44BC +/* 00180 809E44A0 55800006 */ bnel $t4, $zero, .L809E44BC /* 00184 809E44A4 8C690010 */ lw $t1, 0x0010($v1) ## 8015E670 /* 00188 809E44A8 0C00B55C */ jal Actor_Kill - + /* 0018C 809E44AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00190 809E44B0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 00194 809E44B4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 @@ -68,7 +68,7 @@ glabel EnDaikuKakariko_Init .L809E44BC: /* 0019C 809E44BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 001A0 809E44C0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 001A4 809E44C4 15210004 */ bne $t1, $at, .L809E44D8 +/* 001A4 809E44C4 15210004 */ bne $t1, $at, .L809E44D8 /* 001A8 809E44C8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 001AC 809E44CC 960D0200 */ lhu $t5, 0x0200($s0) ## 00000200 /* 001B0 809E44D0 35AE0008 */ ori $t6, $t5, 0x0008 ## $t6 = 00000008 @@ -77,68 +77,68 @@ glabel EnDaikuKakariko_Init /* 001B8 809E44D8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 001BC 809E44DC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 001C0 809E44E0 0C00AC78 */ jal ActorShape_Init - + /* 001C4 809E44E4 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 001C8 809E44E8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 001CC 809E44EC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 001D0 809E44F0 260F022C */ addiu $t7, $s0, 0x022C ## $t7 = 0000022C /* 001D4 809E44F4 26180292 */ addiu $t8, $s0, 0x0292 ## $t8 = 00000292 /* 001D8 809E44F8 24190011 */ addiu $t9, $zero, 0x0011 ## $t9 = 00000011 -/* 001DC 809E44FC AFB90018 */ sw $t9, 0x0018($sp) -/* 001E0 809E4500 AFB80014 */ sw $t8, 0x0014($sp) -/* 001E4 809E4504 AFAF0010 */ sw $t7, 0x0010($sp) +/* 001DC 809E44FC AFB90018 */ sw $t9, 0x0018($sp) +/* 001E0 809E4500 AFB80014 */ sw $t8, 0x0014($sp) +/* 001E4 809E4504 AFAF0010 */ sw $t7, 0x0010($sp) /* 001E8 809E4508 24C67958 */ addiu $a2, $a2, 0x7958 ## $a2 = 06007958 -/* 001EC 809E450C AFA50034 */ sw $a1, 0x0034($sp) -/* 001F0 809E4510 8FA4004C */ lw $a0, 0x004C($sp) -/* 001F4 809E4514 0C0291BE */ jal func_800A46F8 +/* 001EC 809E450C AFA50034 */ sw $a1, 0x0034($sp) +/* 001F0 809E4510 8FA4004C */ lw $a0, 0x004C($sp) +/* 001F4 809E4514 0C0291BE */ jal SkelAnime_InitSV /* 001F8 809E4518 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 001FC 809E451C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00200 809E4520 AFA50030 */ sw $a1, 0x0030($sp) +/* 00200 809E4520 AFA50030 */ sw $a1, 0x0030($sp) /* 00204 809E4524 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00208 809E4528 8FA4004C */ lw $a0, 0x004C($sp) + +/* 00208 809E4528 8FA4004C */ lw $a0, 0x004C($sp) /* 0020C 809E452C 3C07809E */ lui $a3, %hi(D_809E54B0) ## $a3 = 809E0000 -/* 00210 809E4530 8FA50030 */ lw $a1, 0x0030($sp) +/* 00210 809E4530 8FA50030 */ lw $a1, 0x0030($sp) /* 00214 809E4534 24E754B0 */ addiu $a3, $a3, %lo(D_809E54B0) ## $a3 = 809E54B0 -/* 00218 809E4538 8FA4004C */ lw $a0, 0x004C($sp) +/* 00218 809E4538 8FA4004C */ lw $a0, 0x004C($sp) /* 0021C 809E453C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00220 809E4540 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00224 809E4544 3C05809E */ lui $a1, %hi(D_809E54E8) ## $a1 = 809E0000 /* 00228 809E4548 3C06809E */ lui $a2, %hi(D_809E54DC) ## $a2 = 809E0000 /* 0022C 809E454C 24C654DC */ addiu $a2, $a2, %lo(D_809E54DC) ## $a2 = 809E54DC /* 00230 809E4550 24A554E8 */ addiu $a1, $a1, %lo(D_809E54E8) ## $a1 = 809E54E8 -/* 00234 809E4554 0C0187BF */ jal func_80061EFC +/* 00234 809E4554 0C0187BF */ jal func_80061EFC /* 00238 809E4558 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 0023C 809E455C 3C03809E */ lui $v1, %hi(D_809E5508) ## $v1 = 809E0000 /* 00240 809E4560 24635508 */ addiu $v1, $v1, %lo(D_809E5508) ## $v1 = 809E5508 /* 00244 809E4564 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00248 809E4568 8C640000 */ lw $a0, 0x0000($v1) ## 809E5508 /* 0024C 809E456C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00250 809E4570 3C03809E */ lui $v1, %hi(D_809E5508) ## $v1 = 809E0000 /* 00254 809E4574 24635508 */ addiu $v1, $v1, %lo(D_809E5508) ## $v1 = 809E5508 -/* 00258 809E4578 468021A0 */ cvt.s.w $f6, $f4 +/* 00258 809E4578 468021A0 */ cvt.s.w $f6, $f4 /* 0025C 809E457C 90680008 */ lbu $t0, 0x0008($v1) ## 809E5510 /* 00260 809E4580 C468000C */ lwc1 $f8, 0x000C($v1) ## 809E5514 /* 00264 809E4584 8C650000 */ lw $a1, 0x0000($v1) ## 809E5508 -/* 00268 809E4588 8FA40034 */ lw $a0, 0x0034($sp) +/* 00268 809E4588 8FA40034 */ lw $a0, 0x0034($sp) /* 0026C 809E458C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00270 809E4590 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00270 809E4590 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00274 809E4594 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00278 809E4598 AFA80014 */ sw $t0, 0x0014($sp) +/* 00278 809E4598 AFA80014 */ sw $t0, 0x0014($sp) /* 0027C 809E459C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00280 809E45A0 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 00280 809E45A0 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00284 809E45A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00288 809E45A8 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 0028C 809E45AC AFAA0014 */ sw $t2, 0x0014($sp) -/* 00290 809E45B0 44060000 */ mfc1 $a2, $f0 -/* 00294 809E45B4 44070000 */ mfc1 $a3, $f0 -/* 00298 809E45B8 8FA4004C */ lw $a0, 0x004C($sp) +/* 0028C 809E45AC AFAA0014 */ sw $t2, 0x0014($sp) +/* 00290 809E45B0 44060000 */ mfc1 $a2, $f0 +/* 00294 809E45B4 44070000 */ mfc1 $a3, $f0 +/* 00298 809E45B8 8FA4004C */ lw $a0, 0x004C($sp) /* 0029C 809E45BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 002A0 809E45C0 0C00B92D */ jal func_8002E4B4 -/* 002A4 809E45C4 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 002A0 809E45C0 0C00B92D */ jal func_8002E4B4 +/* 002A4 809E45C4 E7A00010 */ swc1 $f0, 0x0010($sp) /* 002A8 809E45C8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 002AC 809E45CC 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 /* 002B0 809E45D0 96020200 */ lhu $v0, 0x0200($s0) ## 00000200 @@ -152,7 +152,7 @@ glabel EnDaikuKakariko_Init /* 002D0 809E45F0 AE0C01EC */ sw $t4, 0x01EC($s0) ## 000001EC /* 002D4 809E45F4 E61001E8 */ swc1 $f16, 0x01E8($s0) ## 000001E8 /* 002D8 809E45F8 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 002DC 809E45FC 11200005 */ beq $t1, $zero, .L809E4614 +/* 002DC 809E45FC 11200005 */ beq $t1, $zero, .L809E4614 /* 002E0 809E4600 E61200F4 */ swc1 $f18, 0x00F4($s0) ## 000000F4 /* 002E4 809E4604 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 002E8 809E4608 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 @@ -160,68 +160,68 @@ glabel EnDaikuKakariko_Init /* 002F0 809E4610 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C .L809E4614: /* 002F4 809E4614 304D0010 */ andi $t5, $v0, 0x0010 ## $t5 = 00000000 -/* 002F8 809E4618 11A00009 */ beq $t5, $zero, .L809E4640 +/* 002F8 809E4618 11A00009 */ beq $t5, $zero, .L809E4640 /* 002FC 809E461C 304F0008 */ andi $t7, $v0, 0x0008 ## $t7 = 00000000 /* 00300 809E4620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00304 809E4624 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00308 809E4628 0C2790C8 */ jal func_809E4320 +/* 00308 809E4628 0C2790C8 */ jal func_809E4320 /* 0030C 809E462C 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC /* 00310 809E4630 3C0E809E */ lui $t6, %hi(func_809E4BC4) ## $t6 = 809E0000 /* 00314 809E4634 25CE4BC4 */ addiu $t6, $t6, %lo(func_809E4BC4) ## $t6 = 809E4BC4 -/* 00318 809E4638 10000035 */ beq $zero, $zero, .L809E4710 +/* 00318 809E4638 10000035 */ beq $zero, $zero, .L809E4710 /* 0031C 809E463C AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 .L809E4640: -/* 00320 809E4640 11E0001F */ beq $t7, $zero, .L809E46C0 +/* 00320 809E4640 11E0001F */ beq $t7, $zero, .L809E46C0 /* 00324 809E4644 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00328 809E4648 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 0032C 809E464C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00330 809E4650 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00334 809E4654 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 00338 809E4658 10410004 */ beq $v0, $at, .L809E466C +/* 00338 809E4658 10410004 */ beq $v0, $at, .L809E466C /* 0033C 809E465C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00340 809E4660 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00344 809E4664 14410007 */ bne $v0, $at, .L809E4684 +/* 00344 809E4664 14410007 */ bne $v0, $at, .L809E4684 /* 00348 809E4668 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC .L809E466C: -/* 0034C 809E466C 0C2790C8 */ jal func_809E4320 +/* 0034C 809E466C 0C2790C8 */ jal func_809E4320 /* 00350 809E4670 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC /* 00354 809E4674 96180200 */ lhu $t8, 0x0200($s0) ## 00000200 /* 00358 809E4678 37190800 */ ori $t9, $t8, 0x0800 ## $t9 = 00000800 -/* 0035C 809E467C 10000004 */ beq $zero, $zero, .L809E4690 +/* 0035C 809E467C 10000004 */ beq $zero, $zero, .L809E4690 /* 00360 809E4680 A6190200 */ sh $t9, 0x0200($s0) ## 00000200 .L809E4684: /* 00364 809E4684 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00368 809E4688 0C2790C8 */ jal func_809E4320 +/* 00368 809E4688 0C2790C8 */ jal func_809E4320 /* 0036C 809E468C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 .L809E4690: /* 00370 809E4690 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00374 809E4694 00000000 */ nop /* 00378 809E4698 C606015C */ lwc1 $f6, 0x015C($s0) ## 0000015C -/* 0037C 809E469C 46060202 */ mul.s $f8, $f0, $f6 -/* 00380 809E46A0 4600428D */ trunc.w.s $f10, $f8 -/* 00384 809E46A4 440A5000 */ mfc1 $t2, $f10 +/* 0037C 809E469C 46060202 */ mul.s $f8, $f0, $f6 +/* 00380 809E46A0 4600428D */ trunc.w.s $f10, $f8 +/* 00384 809E46A4 440A5000 */ mfc1 $t2, $f10 /* 00388 809E46A8 00000000 */ nop /* 0038C 809E46AC 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 /* 00390 809E46B0 00000000 */ nop -/* 00394 809E46B4 468084A0 */ cvt.s.w $f18, $f16 -/* 00398 809E46B8 1000000F */ beq $zero, $zero, .L809E46F8 +/* 00394 809E46B4 468084A0 */ cvt.s.w $f18, $f16 +/* 00398 809E46B8 1000000F */ beq $zero, $zero, .L809E46F8 /* 0039C 809E46BC E6120164 */ swc1 $f18, 0x0164($s0) ## 00000164 .L809E46C0: /* 003A0 809E46C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003A4 809E46C4 0C2790C8 */ jal func_809E4320 +/* 003A4 809E46C4 0C2790C8 */ jal func_809E4320 /* 003A8 809E46C8 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC /* 003AC 809E46CC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 003B0 809E46D0 00000000 */ nop /* 003B4 809E46D4 C604015C */ lwc1 $f4, 0x015C($s0) ## 0000015C -/* 003B8 809E46D8 46040182 */ mul.s $f6, $f0, $f4 -/* 003BC 809E46DC 4600320D */ trunc.w.s $f8, $f6 -/* 003C0 809E46E0 440C4000 */ mfc1 $t4, $f8 +/* 003B8 809E46D8 46040182 */ mul.s $f6, $f0, $f4 +/* 003BC 809E46DC 4600320D */ trunc.w.s $f8, $f6 +/* 003C0 809E46E0 440C4000 */ mfc1 $t4, $f8 /* 003C4 809E46E4 00000000 */ nop /* 003C8 809E46E8 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 /* 003CC 809E46EC 00000000 */ nop -/* 003D0 809E46F0 46805420 */ cvt.s.w $f16, $f10 +/* 003D0 809E46F0 46805420 */ cvt.s.w $f16, $f10 /* 003D4 809E46F4 E6100164 */ swc1 $f16, 0x0164($s0) ## 00000164 .L809E46F8: /* 003D8 809E46F8 96090200 */ lhu $t1, 0x0200($s0) ## 00000200 @@ -231,10 +231,10 @@ glabel EnDaikuKakariko_Init /* 003E8 809E4708 A60D0200 */ sh $t5, 0x0200($s0) ## 00000200 /* 003EC 809E470C AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 .L809E4710: -/* 003F0 809E4710 8FBF002C */ lw $ra, 0x002C($sp) -/* 003F4 809E4714 8FB00028 */ lw $s0, 0x0028($sp) +/* 003F0 809E4710 8FBF002C */ lw $ra, 0x002C($sp) +/* 003F4 809E4714 8FB00028 */ lw $s0, 0x0028($sp) /* 003F8 809E4718 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 003FC 809E471C 03E00008 */ jr $ra +/* 003FC 809E471C 03E00008 */ jr $ra /* 00400 809E4720 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s index 25eb7db5c9..b1cb1a6a60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s @@ -1,26 +1,26 @@ glabel func_809E5F44 /* 00774 809E5F44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00778 809E5F48 AFA40018 */ sw $a0, 0x0018($sp) -/* 0077C 809E5F4C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00778 809E5F48 AFA40018 */ sw $a0, 0x0018($sp) +/* 0077C 809E5F4C AFBF0014 */ sw $ra, 0x0014($sp) /* 00780 809E5F50 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00784 809E5F54 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00788 809E5F58 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 -/* 0078C 809E5F5C 8FA30018 */ lw $v1, 0x0018($sp) -/* 00790 809E5F60 00027040 */ sll $t6, $v0, 1 +/* 0078C 809E5F5C 8FA30018 */ lw $v1, 0x0018($sp) +/* 00790 809E5F60 00027040 */ sll $t6, $v0, 1 /* 00794 809E5F64 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00798 809E5F68 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 /* 0079C 809E5F6C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 007A0 809E5F70 A46E01C6 */ sh $t6, 0x01C6($v1) ## 000001C6 -/* 007A4 809E5F74 0C0294D3 */ jal func_800A534C +/* 007A4 809E5F74 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 007A8 809E5F78 2464017C */ addiu $a0, $v1, 0x017C ## $a0 = 0000017C -/* 007AC 809E5F7C 8FB80018 */ lw $t8, 0x0018($sp) +/* 007AC 809E5F7C 8FB80018 */ lw $t8, 0x0018($sp) /* 007B0 809E5F80 3C0F809E */ lui $t7, %hi(func_809E6ED4) ## $t7 = 809E0000 /* 007B4 809E5F84 25EF6ED4 */ addiu $t7, $t7, %lo(func_809E6ED4) ## $t7 = 809E6ED4 /* 007B8 809E5F88 AF0F01C0 */ sw $t7, 0x01C0($t8) ## 000001C0 -/* 007BC 809E5F8C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007BC 809E5F8C 8FBF0014 */ lw $ra, 0x0014($sp) /* 007C0 809E5F90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007C4 809E5F94 03E00008 */ jr $ra +/* 007C4 809E5F94 03E00008 */ jr $ra /* 007C8 809E5F98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s index 8619ece5a5..92ef275ee8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s @@ -1,86 +1,86 @@ glabel func_809E7104 /* 01934 809E7104 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01938 809E7108 AFB00028 */ sw $s0, 0x0028($sp) +/* 01938 809E7108 AFB00028 */ sw $s0, 0x0028($sp) /* 0193C 809E710C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01940 809E7110 AFBF002C */ sw $ra, 0x002C($sp) +/* 01940 809E7110 AFBF002C */ sw $ra, 0x002C($sp) /* 01944 809E7114 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0000017C -/* 01948 809E7118 AFA50054 */ sw $a1, 0x0054($sp) +/* 01948 809E7118 AFA50054 */ sw $a1, 0x0054($sp) /* 0194C 809E711C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01950 809E7120 AFA40034 */ sw $a0, 0x0034($sp) + +/* 01950 809E7120 AFA40034 */ sw $a0, 0x0034($sp) /* 01954 809E7124 860301C6 */ lh $v1, 0x01C6($s0) ## 000001C6 -/* 01958 809E7128 8FA40034 */ lw $a0, 0x0034($sp) -/* 0195C 809E712C 14600068 */ bne $v1, $zero, .L809E72D0 -/* 01960 809E7130 2861000B */ slti $at, $v1, 0x000B -/* 01964 809E7134 0C0295B2 */ jal func_800A56C8 +/* 01958 809E7128 8FA40034 */ lw $a0, 0x0034($sp) +/* 0195C 809E712C 14600068 */ bne $v1, $zero, .L809E72D0 +/* 01960 809E7130 2861000B */ slti $at, $v1, 0x000B +/* 01964 809E7134 0C0295B2 */ jal func_800A56C8 /* 01968 809E7138 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 0196C 809E713C 5040000D */ beql $v0, $zero, .L809E7174 +/* 0196C 809E713C 5040000D */ beql $v0, $zero, .L809E7174 /* 01970 809E7140 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01974 809E7144 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 01978 809E7148 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0197C 809E714C 2405385D */ addiu $a1, $zero, 0x385D ## $a1 = 0000385D -/* 01980 809E7150 15C10005 */ bne $t6, $at, .L809E7168 +/* 01980 809E7150 15C10005 */ bne $t6, $at, .L809E7168 /* 01984 809E7154 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01988 809E7158 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0198C 809E715C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01990 809E7160 10000004 */ beq $zero, $zero, .L809E7174 +/* 01990 809E7160 10000004 */ beq $zero, $zero, .L809E7174 /* 01994 809E7164 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 .L809E7168: /* 01998 809E7168 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0199C 809E716C 24053861 */ addiu $a1, $zero, 0x3861 ## $a1 = 00003861 /* 019A0 809E7170 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 .L809E7174: /* 019A4 809E7174 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 019A8 809E7178 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 019AC 809E717C 24060222 */ addiu $a2, $zero, 0x0222 ## $a2 = 00000222 /* 019B0 809E7180 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 019B4 809E7184 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 019B8 809E7188 C6040194 */ lwc1 $f4, 0x0194($s0) ## 00000194 /* 019BC 809E718C 260401CA */ addiu $a0, $s0, 0x01CA ## $a0 = 000001CA /* 019C0 809E7190 2405F1C8 */ addiu $a1, $zero, 0xF1C8 ## $a1 = FFFFF1C8 -/* 019C4 809E7194 46062202 */ mul.s $f8, $f4, $f6 -/* 019C8 809E7198 4600428D */ trunc.w.s $f10, $f8 -/* 019CC 809E719C 44035000 */ mfc1 $v1, $f10 +/* 019C4 809E7194 46062202 */ mul.s $f8, $f4, $f6 +/* 019C8 809E7198 4600428D */ trunc.w.s $f10, $f8 +/* 019CC 809E719C 44035000 */ mfc1 $v1, $f10 /* 019D0 809E71A0 00000000 */ nop -/* 019D4 809E71A4 00031C00 */ sll $v1, $v1, 16 -/* 019D8 809E71A8 00031C03 */ sra $v1, $v1, 16 +/* 019D4 809E71A4 00031C00 */ sll $v1, $v1, 16 +/* 019D8 809E71A8 00031C03 */ sra $v1, $v1, 16 /* 019DC 809E71AC 2466038E */ addiu $a2, $v1, 0x038E ## $a2 = 0000038E -/* 019E0 809E71B0 00063400 */ sll $a2, $a2, 16 -/* 019E4 809E71B4 00063403 */ sra $a2, $a2, 16 +/* 019E0 809E71B0 00063400 */ sll $a2, $a2, 16 +/* 019E4 809E71B4 00063403 */ sra $a2, $a2, 16 /* 019E8 809E71B8 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 019EC 809E71BC A7A3004A */ sh $v1, 0x004A($sp) -/* 019F0 809E71C0 87A6004A */ lh $a2, 0x004A($sp) + +/* 019EC 809E71BC A7A3004A */ sh $v1, 0x004A($sp) +/* 019F0 809E71C0 87A6004A */ lh $a2, 0x004A($sp) /* 019F4 809E71C4 30430001 */ andi $v1, $v0, 0x0001 ## $v1 = 00000000 -/* 019F8 809E71C8 AFA3004C */ sw $v1, 0x004C($sp) +/* 019F8 809E71C8 AFA3004C */ sw $v1, 0x004C($sp) /* 019FC 809E71CC 24C6071C */ addiu $a2, $a2, 0x071C ## $a2 = 0000071C -/* 01A00 809E71D0 00063400 */ sll $a2, $a2, 16 -/* 01A04 809E71D4 00063403 */ sra $a2, $a2, 16 +/* 01A00 809E71D0 00063400 */ sll $a2, $a2, 16 +/* 01A04 809E71D4 00063403 */ sra $a2, $a2, 16 /* 01A08 809E71D8 260401CC */ addiu $a0, $s0, 0x01CC ## $a0 = 000001CC /* 01A0C 809E71DC 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 01A10 809E71E0 2405F1C8 */ addiu $a1, $zero, 0xF1C8 ## $a1 = FFFFF1C8 -/* 01A14 809E71E4 87A6004A */ lh $a2, 0x004A($sp) -/* 01A18 809E71E8 8FA3004C */ lw $v1, 0x004C($sp) +/* 01A14 809E71E4 87A6004A */ lh $a2, 0x004A($sp) +/* 01A18 809E71E8 8FA3004C */ lw $v1, 0x004C($sp) /* 01A1C 809E71EC 260401CE */ addiu $a0, $s0, 0x01CE ## $a0 = 000001CE /* 01A20 809E71F0 24C60E38 */ addiu $a2, $a2, 0x0E38 ## $a2 = 00000E38 -/* 01A24 809E71F4 00063400 */ sll $a2, $a2, 16 -/* 01A28 809E71F8 00621824 */ and $v1, $v1, $v0 -/* 01A2C 809E71FC AFA3004C */ sw $v1, 0x004C($sp) -/* 01A30 809E7200 00063403 */ sra $a2, $a2, 16 +/* 01A24 809E71F4 00063400 */ sll $a2, $a2, 16 +/* 01A28 809E71F8 00621824 */ and $v1, $v1, $v0 +/* 01A2C 809E71FC AFA3004C */ sw $v1, 0x004C($sp) +/* 01A30 809E7200 00063403 */ sra $a2, $a2, 16 /* 01A34 809E7204 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 01A38 809E7208 2405F1C8 */ addiu $a1, $zero, 0xF1C8 ## $a1 = FFFFF1C8 -/* 01A3C 809E720C 8FA3004C */ lw $v1, 0x004C($sp) +/* 01A3C 809E720C 8FA3004C */ lw $v1, 0x004C($sp) /* 01A40 809E7210 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01A44 809E7214 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 -/* 01A48 809E7218 00621824 */ and $v1, $v1, $v0 -/* 01A4C 809E721C 10600054 */ beq $v1, $zero, .L809E7370 -/* 01A50 809E7220 8FA40034 */ lw $a0, 0x0034($sp) -/* 01A54 809E7224 0C0294E1 */ jal func_800A5384 +/* 01A48 809E7218 00621824 */ and $v1, $v1, $v0 +/* 01A4C 809E721C 10600054 */ beq $v1, $zero, .L809E7370 +/* 01A50 809E7220 8FA40034 */ lw $a0, 0x0034($sp) +/* 01A54 809E7224 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 01A58 809E7228 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 01A5C 809E722C 0C01DE1C */ jal Math_Sins ## sins? @@ -88,9 +88,9 @@ glabel func_809E7104 /* 01A64 809E7234 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01A68 809E7238 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 01A6C 809E723C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01A70 809E7240 46100482 */ mul.s $f18, $f0, $f16 -/* 01A74 809E7244 E7A40040 */ swc1 $f4, 0x0040($sp) -/* 01A78 809E7248 E7B2003C */ swc1 $f18, 0x003C($sp) +/* 01A70 809E7240 46100482 */ mul.s $f18, $f0, $f16 +/* 01A74 809E7244 E7A40040 */ swc1 $f4, 0x0040($sp) +/* 01A78 809E7248 E7B2003C */ swc1 $f18, 0x003C($sp) /* 01A7C 809E724C 0C01DE0D */ jal Math_Coss ## coss? /* 01A80 809E7250 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 @@ -98,89 +98,89 @@ glabel func_809E7104 /* 01A88 809E7258 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 /* 01A8C 809E725C 3C18809F */ lui $t8, %hi(D_809E9024) ## $t8 = 809F0000 /* 01A90 809E7260 3C19809F */ lui $t9, %hi(D_809E9028) ## $t9 = 809F0000 -/* 01A94 809E7264 46060202 */ mul.s $f8, $f0, $f6 +/* 01A94 809E7264 46060202 */ mul.s $f8, $f0, $f6 /* 01A98 809E7268 27399028 */ addiu $t9, $t9, %lo(D_809E9028) ## $t9 = 809E9028 /* 01A9C 809E726C 27189024 */ addiu $t8, $t8, %lo(D_809E9024) ## $t8 = 809E9024 /* 01AA0 809E7270 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01AA4 809E7274 AFA80018 */ sw $t0, 0x0018($sp) -/* 01AA8 809E7278 AFB80010 */ sw $t8, 0x0010($sp) -/* 01AAC 809E727C AFB90014 */ sw $t9, 0x0014($sp) -/* 01AB0 809E7280 E7A80044 */ swc1 $f8, 0x0044($sp) +/* 01AA4 809E7274 AFA80018 */ sw $t0, 0x0018($sp) +/* 01AA8 809E7278 AFB80010 */ sw $t8, 0x0010($sp) +/* 01AAC 809E727C AFB90014 */ sw $t9, 0x0014($sp) +/* 01AB0 809E7280 E7A80044 */ swc1 $f8, 0x0044($sp) /* 01AB4 809E7284 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 01AB8 809E7288 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 /* 01ABC 809E728C C60A0230 */ lwc1 $f10, 0x0230($s0) ## 00000230 /* 01AC0 809E7290 3C07809F */ lui $a3, %hi(D_809E8EA0) ## $a3 = 809F0000 /* 01AC4 809E7294 24E78EA0 */ addiu $a3, $a3, %lo(D_809E8EA0) ## $a3 = 809E8EA0 -/* 01AC8 809E7298 46105482 */ mul.s $f18, $f10, $f16 -/* 01ACC 809E729C 8FA40054 */ lw $a0, 0x0054($sp) +/* 01AC8 809E7298 46105482 */ mul.s $f18, $f10, $f16 +/* 01ACC 809E729C 8FA40054 */ lw $a0, 0x0054($sp) /* 01AD0 809E72A0 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 01AD4 809E72A4 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFEC -/* 01AD8 809E72A8 4600910D */ trunc.w.s $f4, $f18 -/* 01ADC 809E72AC 440A2000 */ mfc1 $t2, $f4 -/* 01AE0 809E72B0 0C00A0A7 */ jal func_8002829C -/* 01AE4 809E72B4 AFAA001C */ sw $t2, 0x001C($sp) +/* 01AD8 809E72A8 4600910D */ trunc.w.s $f4, $f18 +/* 01ADC 809E72AC 440A2000 */ mfc1 $t2, $f4 +/* 01AE0 809E72B0 0C00A0A7 */ jal func_8002829C +/* 01AE4 809E72B4 AFAA001C */ sw $t2, 0x001C($sp) /* 01AE8 809E72B8 920C0249 */ lbu $t4, 0x0249($s0) ## 00000249 /* 01AEC 809E72BC 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01AF0 809E72C0 A60B01C6 */ sh $t3, 0x01C6($s0) ## 000001C6 /* 01AF4 809E72C4 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 01AF8 809E72C8 10000029 */ beq $zero, $zero, .L809E7370 +/* 01AF8 809E72C8 10000029 */ beq $zero, $zero, .L809E7370 /* 01AFC 809E72CC A20D0249 */ sb $t5, 0x0249($s0) ## 00000249 .L809E72D0: -/* 01B00 809E72D0 14200005 */ bne $at, $zero, .L809E72E8 +/* 01B00 809E72D0 14200005 */ bne $at, $zero, .L809E72E8 /* 01B04 809E72D4 246E0001 */ addiu $t6, $v1, 0x0001 ## $t6 = 00000001 -/* 01B08 809E72D8 0C279800 */ jal func_809E6000 +/* 01B08 809E72D8 0C279800 */ jal func_809E6000 /* 01B0C 809E72DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B10 809E72E0 10000023 */ beq $zero, $zero, .L809E7370 +/* 01B10 809E72E0 10000023 */ beq $zero, $zero, .L809E7370 /* 01B14 809E72E4 00000000 */ nop .L809E72E8: /* 01B18 809E72E8 A60E01C6 */ sh $t6, 0x01C6($s0) ## 000001C6 /* 01B1C 809E72EC 860F01C6 */ lh $t7, 0x01C6($s0) ## 000001C6 /* 01B20 809E72F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B24 809E72F4 29E10004 */ slti $at, $t7, 0x0004 -/* 01B28 809E72F8 5420000A */ bnel $at, $zero, .L809E7324 -/* 01B2C 809E72FC 8FA40034 */ lw $a0, 0x0034($sp) -/* 01B30 809E7300 0C00B821 */ jal func_8002E084 +/* 01B24 809E72F4 29E10004 */ slti $at, $t7, 0x0004 +/* 01B28 809E72F8 5420000A */ bnel $at, $zero, .L809E7324 +/* 01B2C 809E72FC 8FA40034 */ lw $a0, 0x0034($sp) +/* 01B30 809E7300 0C00B821 */ jal func_8002E084 /* 01B34 809E7304 2405016C */ addiu $a1, $zero, 0x016C ## $a1 = 0000016C -/* 01B38 809E7308 14400005 */ bne $v0, $zero, .L809E7320 +/* 01B38 809E7308 14400005 */ bne $v0, $zero, .L809E7320 /* 01B3C 809E730C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 01B40 809E7310 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 01B44 809E7314 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F /* 01B48 809E7318 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 01B4C 809E731C 2407071C */ addiu $a3, $zero, 0x071C ## $a3 = 0000071C .L809E7320: -/* 01B50 809E7320 8FA40034 */ lw $a0, 0x0034($sp) +/* 01B50 809E7320 8FA40034 */ lw $a0, 0x0034($sp) .L809E7324: -/* 01B54 809E7324 0C0295B2 */ jal func_800A56C8 +/* 01B54 809E7324 0C0295B2 */ jal func_800A56C8 /* 01B58 809E7328 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01B5C 809E732C 14400005 */ bne $v0, $zero, .L809E7344 -/* 01B60 809E7330 8FA40034 */ lw $a0, 0x0034($sp) -/* 01B64 809E7334 0C0295B2 */ jal func_800A56C8 +/* 01B5C 809E732C 14400005 */ bne $v0, $zero, .L809E7344 +/* 01B60 809E7330 8FA40034 */ lw $a0, 0x0034($sp) +/* 01B64 809E7334 0C0295B2 */ jal func_800A56C8 /* 01B68 809E7338 3C054140 */ lui $a1, 0x4140 ## $a1 = 41400000 -/* 01B6C 809E733C 1040000C */ beq $v0, $zero, .L809E7370 +/* 01B6C 809E733C 1040000C */ beq $v0, $zero, .L809E7370 /* 01B70 809E7340 00000000 */ nop .L809E7344: /* 01B74 809E7344 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 01B78 809E7348 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01B7C 809E734C 2405385C */ addiu $a1, $zero, 0x385C ## $a1 = 0000385C -/* 01B80 809E7350 17010005 */ bne $t8, $at, .L809E7368 +/* 01B80 809E7350 17010005 */ bne $t8, $at, .L809E7368 /* 01B84 809E7354 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01B88 809E7358 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01B8C 809E735C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B90 809E7360 10000003 */ beq $zero, $zero, .L809E7370 +/* 01B90 809E7360 10000003 */ beq $zero, $zero, .L809E7370 /* 01B94 809E7364 00000000 */ nop .L809E7368: /* 01B98 809E7368 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01B9C 809E736C 24053860 */ addiu $a1, $zero, 0x3860 ## $a1 = 00003860 .L809E7370: -/* 01BA0 809E7370 0C279B73 */ jal func_809E6DCC +/* 01BA0 809E7370 0C279B73 */ jal func_809E6DCC /* 01BA4 809E7374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BA8 809E7378 8FBF002C */ lw $ra, 0x002C($sp) -/* 01BAC 809E737C 8FB00028 */ lw $s0, 0x0028($sp) +/* 01BA8 809E7378 8FBF002C */ lw $ra, 0x002C($sp) +/* 01BAC 809E737C 8FB00028 */ lw $s0, 0x0028($sp) /* 01BB0 809E7380 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01BB4 809E7384 03E00008 */ jr $ra +/* 01BB4 809E7384 03E00008 */ jr $ra /* 01BB8 809E7388 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s index 87ef57375f..6eb0172848 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s @@ -1,21 +1,21 @@ glabel func_809E9770 /* 00210 809E9770 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00214 809E9774 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00214 809E9774 AFBF0014 */ sw $ra, 0x0014($sp) /* 00218 809E9778 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0021C 809E977C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00220 809E9780 24A50AF0 */ addiu $a1, $a1, 0x0AF0 ## $a1 = 06000AF0 -/* 00224 809E9784 AFA60018 */ sw $a2, 0x0018($sp) -/* 00228 809E9788 0C0294BE */ jal func_800A52F8 +/* 00224 809E9784 AFA60018 */ sw $a2, 0x0018($sp) +/* 00228 809E9788 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 0022C 809E978C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00230 809E9790 8FA60018 */ lw $a2, 0x0018($sp) +/* 00230 809E9790 8FA60018 */ lw $a2, 0x0018($sp) /* 00234 809E9794 3C0F809F */ lui $t7, %hi(func_809E9DFC) ## $t7 = 809F0000 /* 00238 809E9798 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 0023C 809E979C 25EF9DFC */ addiu $t7, $t7, %lo(func_809E9DFC) ## $t7 = 809E9DFC /* 00240 809E97A0 A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 /* 00244 809E97A4 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 00248 809E97A8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00248 809E97A8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0024C 809E97AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00250 809E97B0 03E00008 */ jr $ra +/* 00250 809E97B0 03E00008 */ jr $ra /* 00254 809E97B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s index 2f5c78d7f4..45877d1949 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s @@ -1,31 +1,31 @@ glabel func_809E9800 /* 002A0 809E9800 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002A4 809E9804 AFBF0014 */ sw $ra, 0x0014($sp) +/* 002A4 809E9804 AFBF0014 */ sw $ra, 0x0014($sp) /* 002A8 809E9808 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 002AC 809E980C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002B0 809E9810 24A50E6C */ addiu $a1, $a1, 0x0E6C ## $a1 = 06000E6C -/* 002B4 809E9814 AFA70018 */ sw $a3, 0x0018($sp) +/* 002B4 809E9814 AFA70018 */ sw $a3, 0x0018($sp) /* 002B8 809E9818 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002BC 809E981C 0C0294D3 */ jal func_800A534C +/* 002BC 809E981C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 002C0 809E9820 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 002C4 809E9824 8FA70018 */ lw $a3, 0x0018($sp) +/* 002C4 809E9824 8FA70018 */ lw $a3, 0x0018($sp) /* 002C8 809E9828 3C0E809F */ lui $t6, %hi(func_809E9F6C) ## $t6 = 809F0000 /* 002CC 809E982C 25CE9F6C */ addiu $t6, $t6, %lo(func_809E9F6C) ## $t6 = 809E9F6C /* 002D0 809E9830 8CEF0190 */ lw $t7, 0x0190($a3) ## 00000190 /* 002D4 809E9834 3C08809F */ lui $t0, %hi(func_809E9E80) ## $t0 = 809F0000 /* 002D8 809E9838 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 002DC 809E983C 15CF0004 */ bne $t6, $t7, .L809E9850 +/* 002DC 809E983C 15CF0004 */ bne $t6, $t7, .L809E9850 /* 002E0 809E9840 25089E80 */ addiu $t0, $t0, %lo(func_809E9E80) ## $t0 = 809E9E80 /* 002E4 809E9844 24181002 */ addiu $t8, $zero, 0x1002 ## $t8 = 00001002 -/* 002E8 809E9848 10000002 */ beq $zero, $zero, .L809E9854 +/* 002E8 809E9848 10000002 */ beq $zero, $zero, .L809E9854 /* 002EC 809E984C A4F80196 */ sh $t8, 0x0196($a3) ## 00000196 .L809E9850: /* 002F0 809E9850 A4F90196 */ sh $t9, 0x0196($a3) ## 00000196 .L809E9854: /* 002F4 809E9854 ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -/* 002F8 809E9858 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002F8 809E9858 8FBF0014 */ lw $ra, 0x0014($sp) /* 002FC 809E985C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00300 809E9860 03E00008 */ jr $ra +/* 00300 809E9860 03E00008 */ jr $ra /* 00304 809E9864 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s index 3c02e3218c..e18df59c54 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s @@ -1,13 +1,13 @@ glabel func_809E9920 /* 003C0 809E9920 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003C4 809E9924 AFBF0014 */ sw $ra, 0x0014($sp) +/* 003C4 809E9924 AFBF0014 */ sw $ra, 0x0014($sp) /* 003C8 809E9928 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 003CC 809E992C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003D0 809E9930 24A53650 */ addiu $a1, $a1, 0x3650 ## $a1 = 06003650 -/* 003D4 809E9934 AFA60018 */ sw $a2, 0x0018($sp) -/* 003D8 809E9938 0C0294BE */ jal func_800A52F8 +/* 003D4 809E9934 AFA60018 */ sw $a2, 0x0018($sp) +/* 003D8 809E9938 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 003DC 809E993C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003E0 809E9940 8FA60018 */ lw $a2, 0x0018($sp) +/* 003E0 809E9940 8FA60018 */ lw $a2, 0x0018($sp) /* 003E4 809E9944 3C19809F */ lui $t9, %hi(func_809EA240) ## $t9 = 809F0000 /* 003E8 809E9948 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 003EC 809E994C 90CF02D9 */ lbu $t7, 0x02D9($a2) ## 000002D9 @@ -17,9 +17,9 @@ glabel func_809E9920 /* 003FC 809E995C A0C00194 */ sb $zero, 0x0194($a2) ## 00000194 /* 00400 809E9960 A0D802D9 */ sb $t8, 0x02D9($a2) ## 000002D9 /* 00404 809E9964 ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 -/* 00408 809E9968 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00408 809E9968 8FBF0014 */ lw $ra, 0x0014($sp) /* 0040C 809E996C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00410 809E9970 03E00008 */ jr $ra +/* 00410 809E9970 03E00008 */ jr $ra /* 00414 809E9974 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s index 436f3659f8..b21177d05b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s @@ -1,28 +1,28 @@ glabel func_809E9978 /* 00418 809E9978 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0041C 809E997C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0041C 809E997C AFBF0014 */ sw $ra, 0x0014($sp) /* 00420 809E9980 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00424 809E9984 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00428 809E9988 24A51024 */ addiu $a1, $a1, 0x1024 ## $a1 = 06001024 -/* 0042C 809E998C AFA60018 */ sw $a2, 0x0018($sp) -/* 00430 809E9990 0C0294BE */ jal func_800A52F8 +/* 0042C 809E998C AFA60018 */ sw $a2, 0x0018($sp) +/* 00430 809E9990 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00434 809E9994 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00438 809E9998 8FA60018 */ lw $a2, 0x0018($sp) +/* 00438 809E9998 8FA60018 */ lw $a2, 0x0018($sp) /* 0043C 809E999C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00440 809E99A0 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 00444 809E99A4 90C20195 */ lbu $v0, 0x0195($a2) ## 00000195 /* 00448 809E99A8 3C18809F */ lui $t8, %hi(func_809EA480) ## $t8 = 809F0000 /* 0044C 809E99AC A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 -/* 00450 809E99B0 10400003 */ beq $v0, $zero, .L809E99C0 +/* 00450 809E99B0 10400003 */ beq $v0, $zero, .L809E99C0 /* 00454 809E99B4 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 00458 809E99B8 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 0045C 809E99BC A0CF0195 */ sb $t7, 0x0195($a2) ## 00000195 .L809E99C0: /* 00460 809E99C0 2718A480 */ addiu $t8, $t8, %lo(func_809EA480) ## $t8 = 809EA480 /* 00464 809E99C4 ACD80190 */ sw $t8, 0x0190($a2) ## 00000190 -/* 00468 809E99C8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00468 809E99C8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0046C 809E99CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00470 809E99D0 03E00008 */ jr $ra +/* 00470 809E99D0 03E00008 */ jr $ra /* 00474 809E99D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s index f38b040a22..ca4d31a437 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s @@ -1,12 +1,12 @@ glabel func_809E9AB4 /* 00554 809E9AB4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00558 809E9AB8 AFB00020 */ sw $s0, 0x0020($sp) +/* 00558 809E9AB8 AFB00020 */ sw $s0, 0x0020($sp) /* 0055C 809E9ABC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00560 809E9AC0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00560 809E9AC0 AFBF0024 */ sw $ra, 0x0024($sp) /* 00564 809E9AC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00568 809E9AC8 24A50368 */ addiu $a1, $a1, 0x0368 ## $a1 = 06000368 /* 0056C 809E9ACC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00570 809E9AD0 0C0294D3 */ jal func_800A534C +/* 00570 809E9AD0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00574 809E9AD4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00578 809E9AD8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0057C 809E9ADC 3C0F809F */ lui $t7, %hi(func_809EA534) ## $t7 = 809F0000 @@ -17,26 +17,26 @@ glabel func_809E9AB4 /* 00590 809E9AF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00594 809E9AF4 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 00598 809E9AF8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0059C 809E9AFC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 005A0 809E9B00 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 005A4 809E9B04 0C028800 */ jal SkelAnime_GetFrameCount - + /* 005A8 809E9B08 24840368 */ addiu $a0, $a0, 0x0368 ## $a0 = 06000368 /* 005AC 809E9B0C 86180196 */ lh $t8, 0x0196($s0) ## 00000196 /* 005B0 809E9B10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005B4 809E9B14 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005B8 809E9B18 00580019 */ multu $v0, $t8 +/* 005B8 809E9B18 00580019 */ multu $v0, $t8 /* 005BC 809E9B1C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 005C0 809E9B20 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005C4 809E9B24 0000C812 */ mflo $t9 -/* 005C8 809E9B28 AFB90010 */ sw $t9, 0x0010($sp) -/* 005CC 809E9B2C 0C00D09B */ jal func_8003426C +/* 005C4 809E9B24 0000C812 */ mflo $t9 +/* 005C8 809E9B28 AFB90010 */ sw $t9, 0x0010($sp) +/* 005CC 809E9B2C 0C00D09B */ jal func_8003426C /* 005D0 809E9B30 00000000 */ nop -/* 005D4 809E9B34 8FBF0024 */ lw $ra, 0x0024($sp) -/* 005D8 809E9B38 8FB00020 */ lw $s0, 0x0020($sp) +/* 005D4 809E9B34 8FBF0024 */ lw $ra, 0x0024($sp) +/* 005D8 809E9B38 8FB00020 */ lw $s0, 0x0020($sp) /* 005DC 809E9B3C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 005E0 809E9B40 03E00008 */ jr $ra +/* 005E0 809E9B40 03E00008 */ jr $ra /* 005E4 809E9B44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s index b24cedb788..012294c461 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s @@ -1,23 +1,23 @@ glabel EnDh_Draw /* 014F0 809EC230 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 014F4 809EC234 AFB20040 */ sw $s2, 0x0040($sp) +/* 014F4 809EC234 AFB20040 */ sw $s2, 0x0040($sp) /* 014F8 809EC238 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 014FC 809EC23C AFBF0044 */ sw $ra, 0x0044($sp) -/* 01500 809EC240 AFB1003C */ sw $s1, 0x003C($sp) -/* 01504 809EC244 AFB00038 */ sw $s0, 0x0038($sp) +/* 014FC 809EC23C AFBF0044 */ sw $ra, 0x0044($sp) +/* 01500 809EC240 AFB1003C */ sw $s1, 0x003C($sp) +/* 01504 809EC244 AFB00038 */ sw $s0, 0x0038($sp) /* 01508 809EC248 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0150C 809EC24C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 01510 809EC250 3C06809F */ lui $a2, %hi(D_809EC680) ## $a2 = 809F0000 /* 01514 809EC254 24C6C680 */ addiu $a2, $a2, %lo(D_809EC680) ## $a2 = 809EC680 /* 01518 809EC258 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 0151C 809EC25C 2407044B */ addiu $a3, $zero, 0x044B ## $a3 = 0000044B -/* 01520 809EC260 0C031AB1 */ jal func_800C6AC4 +/* 01520 809EC260 0C031AB1 */ jal func_800C6AC4 /* 01524 809EC264 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01528 809EC268 922E025A */ lbu $t6, 0x025A($s1) ## 0000025A /* 0152C 809EC26C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01530 809EC270 15C10021 */ bne $t6, $at, .L809EC2F8 +/* 01530 809EC270 15C10021 */ bne $t6, $at, .L809EC2F8 /* 01534 809EC274 00000000 */ nop -/* 01538 809EC278 0C024F46 */ jal func_80093D18 +/* 01538 809EC278 0C024F46 */ jal func_80093D18 /* 0153C 809EC27C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01540 809EC280 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 01544 809EC284 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 @@ -40,17 +40,17 @@ glabel EnDh_Draw /* 01588 809EC2C8 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 0158C 809EC2CC 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 01590 809EC2D0 25ADC1A0 */ addiu $t5, $t5, %lo(func_809EC1A0) ## $t5 = 809EC1A0 -/* 01594 809EC2D4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 01598 809EC2D8 AFB10018 */ sw $s1, 0x0018($sp) -/* 0159C 809EC2DC AFA00010 */ sw $zero, 0x0010($sp) +/* 01594 809EC2D4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 01598 809EC2D8 AFB10018 */ sw $s1, 0x0018($sp) +/* 0159C 809EC2DC AFA00010 */ sw $zero, 0x0010($sp) /* 015A0 809EC2E0 8E0E02C0 */ lw $t6, 0x02C0($s0) ## 000002C0 /* 015A4 809EC2E4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 015A8 809EC2E8 0C0289CF */ jal func_800A273C -/* 015AC 809EC2EC AFAE001C */ sw $t6, 0x001C($sp) -/* 015B0 809EC2F0 1000001E */ beq $zero, $zero, .L809EC36C +/* 015A8 809EC2E8 0C0289CF */ jal SkelAnime_DrawSV2 +/* 015AC 809EC2EC AFAE001C */ sw $t6, 0x001C($sp) +/* 015B0 809EC2F0 1000001E */ beq $zero, $zero, .L809EC36C /* 015B4 809EC2F4 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L809EC2F8: -/* 015B8 809EC2F8 0C024F61 */ jal func_80093D84 +/* 015B8 809EC2F8 0C024F61 */ jal func_80093D84 /* 015BC 809EC2FC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 015C0 809EC300 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 015C4 809EC304 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 @@ -72,18 +72,18 @@ glabel EnDh_Draw /* 01604 809EC344 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E /* 01608 809EC348 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 0160C 809EC34C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 01610 809EC350 AFB10018 */ sw $s1, 0x0018($sp) -/* 01614 809EC354 AFA00014 */ sw $zero, 0x0014($sp) -/* 01618 809EC358 AFA00010 */ sw $zero, 0x0010($sp) +/* 01610 809EC350 AFB10018 */ sw $s1, 0x0018($sp) +/* 01614 809EC354 AFA00014 */ sw $zero, 0x0014($sp) +/* 01618 809EC358 AFA00010 */ sw $zero, 0x0010($sp) /* 0161C 809EC35C 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 01620 809EC360 0C0289CF */ jal func_800A273C -/* 01624 809EC364 AFAD001C */ sw $t5, 0x001C($sp) +/* 01620 809EC360 0C0289CF */ jal SkelAnime_DrawSV2 +/* 01624 809EC364 AFAD001C */ sw $t5, 0x001C($sp) /* 01628 809EC368 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L809EC36C: /* 0162C 809EC36C 922E0252 */ lbu $t6, 0x0252($s1) ## 00000252 -/* 01630 809EC370 11C0007F */ beq $t6, $zero, .L809EC570 +/* 01630 809EC370 11C0007F */ beq $t6, $zero, .L809EC570 /* 01634 809EC374 00000000 */ nop -/* 01638 809EC378 0C024F61 */ jal func_80093D84 +/* 01638 809EC378 0C024F61 */ jal func_80093D84 /* 0163C 809EC37C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01640 809EC380 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01644 809EC384 3C195537 */ lui $t9, 0x5537 ## $t9 = 55370000 @@ -102,34 +102,34 @@ glabel EnDh_Draw /* 01678 809EC3B8 8E43009C */ lw $v1, 0x009C($s2) ## 0000009C /* 0167C 809EC3BC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01680 809EC3C0 240A0040 */ addiu $t2, $zero, 0x0040 ## $t2 = 00000040 -/* 01684 809EC3C4 00030823 */ subu $at, $zero, $v1 -/* 01688 809EC3C8 00017080 */ sll $t6, $at, 2 -/* 0168C 809EC3CC 0001C080 */ sll $t8, $at, 2 -/* 01690 809EC3D0 0301C021 */ addu $t8, $t8, $at -/* 01694 809EC3D4 01C17021 */ addu $t6, $t6, $at -/* 01698 809EC3D8 000E7040 */ sll $t6, $t6, 1 -/* 0169C 809EC3DC 0018C080 */ sll $t8, $t8, 2 -/* 016A0 809EC3E0 00013080 */ sll $a2, $at, 2 -/* 016A4 809EC3E4 00C13023 */ subu $a2, $a2, $at +/* 01684 809EC3C4 00030823 */ subu $at, $zero, $v1 +/* 01688 809EC3C8 00017080 */ sll $t6, $at, 2 +/* 0168C 809EC3CC 0001C080 */ sll $t8, $at, 2 +/* 01690 809EC3D0 0301C021 */ addu $t8, $t8, $at +/* 01694 809EC3D4 01C17021 */ addu $t6, $t6, $at +/* 01698 809EC3D8 000E7040 */ sll $t6, $t6, 1 +/* 0169C 809EC3DC 0018C080 */ sll $t8, $t8, 2 +/* 016A0 809EC3E0 00013080 */ sll $a2, $at, 2 +/* 016A4 809EC3E4 00C13023 */ subu $a2, $a2, $at /* 016A8 809EC3E8 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 /* 016AC 809EC3EC 31CF007F */ andi $t7, $t6, 0x007F ## $t7 = 00000000 /* 016B0 809EC3F0 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 /* 016B4 809EC3F4 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 /* 016B8 809EC3F8 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 /* 016BC 809EC3FC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 016C0 809EC400 AFAD0018 */ sw $t5, 0x0018($sp) -/* 016C4 809EC404 AFAC0014 */ sw $t4, 0x0014($sp) -/* 016C8 809EC408 AFAB0010 */ sw $t3, 0x0010($sp) -/* 016CC 809EC40C AFA90024 */ sw $t1, 0x0024($sp) -/* 016D0 809EC410 AFAF001C */ sw $t7, 0x001C($sp) -/* 016D4 809EC414 AFB90020 */ sw $t9, 0x0020($sp) +/* 016C0 809EC400 AFAD0018 */ sw $t5, 0x0018($sp) +/* 016C4 809EC404 AFAC0014 */ sw $t4, 0x0014($sp) +/* 016C8 809EC408 AFAB0010 */ sw $t3, 0x0010($sp) +/* 016CC 809EC40C AFA90024 */ sw $t1, 0x0024($sp) +/* 016D0 809EC410 AFAF001C */ sw $t7, 0x001C($sp) +/* 016D4 809EC414 AFB90020 */ sw $t9, 0x0020($sp) /* 016D8 809EC418 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 016DC 809EC41C AFAA0028 */ sw $t2, 0x0028($sp) +/* 016DC 809EC41C AFAA0028 */ sw $t2, 0x0028($sp) /* 016E0 809EC420 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 016E4 809EC424 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 016E8 809EC428 0C0253D0 */ jal Draw_TwoTexScroll -/* 016EC 809EC42C AFA2005C */ sw $v0, 0x005C($sp) -/* 016F0 809EC430 8FA8005C */ lw $t0, 0x005C($sp) +/* 016E8 809EC428 0C0253D0 */ jal Draw_TwoTexScroll +/* 016EC 809EC42C AFA2005C */ sw $v0, 0x005C($sp) +/* 016F0 809EC430 8FA8005C */ lw $t0, 0x005C($sp) /* 016F4 809EC434 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 /* 016F8 809EC438 358C8080 */ ori $t4, $t4, 0x8080 ## $t4 = FA008080 /* 016FC 809EC43C AD020004 */ sw $v0, 0x0004($t0) ## 00000004 @@ -143,34 +143,34 @@ glabel EnDh_Draw /* 0171C 809EC45C C6240320 */ lwc1 $f4, 0x0320($s1) ## 00000320 /* 01720 809EC460 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 01724 809EC464 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01728 809EC468 460021A4 */ cvt.w.s $f6, $f4 +/* 01728 809EC468 460021A4 */ cvt.w.s $f6, $f4 /* 0172C 809EC46C 444EF800 */ cfc1 $t6, $31 /* 01730 809EC470 00000000 */ nop /* 01734 809EC474 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 01738 809EC478 51C00013 */ beql $t6, $zero, .L809EC4C8 -/* 0173C 809EC47C 440E3000 */ mfc1 $t6, $f6 +/* 01738 809EC478 51C00013 */ beql $t6, $zero, .L809EC4C8 +/* 0173C 809EC47C 440E3000 */ mfc1 $t6, $f6 /* 01740 809EC480 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 /* 01744 809EC484 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01748 809EC488 46062181 */ sub.s $f6, $f4, $f6 +/* 01748 809EC488 46062181 */ sub.s $f6, $f4, $f6 /* 0174C 809EC48C 44CEF800 */ ctc1 $t6, $31 /* 01750 809EC490 00000000 */ nop -/* 01754 809EC494 460031A4 */ cvt.w.s $f6, $f6 +/* 01754 809EC494 460031A4 */ cvt.w.s $f6, $f6 /* 01758 809EC498 444EF800 */ cfc1 $t6, $31 /* 0175C 809EC49C 00000000 */ nop /* 01760 809EC4A0 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 01764 809EC4A4 15C00005 */ bne $t6, $zero, .L809EC4BC +/* 01764 809EC4A4 15C00005 */ bne $t6, $zero, .L809EC4BC /* 01768 809EC4A8 00000000 */ nop -/* 0176C 809EC4AC 440E3000 */ mfc1 $t6, $f6 +/* 0176C 809EC4AC 440E3000 */ mfc1 $t6, $f6 /* 01770 809EC4B0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01774 809EC4B4 10000007 */ beq $zero, $zero, .L809EC4D4 +/* 01774 809EC4B4 10000007 */ beq $zero, $zero, .L809EC4D4 /* 01778 809EC4B8 01C17025 */ or $t6, $t6, $at ## $t6 = 80000000 .L809EC4BC: -/* 0177C 809EC4BC 10000005 */ beq $zero, $zero, .L809EC4D4 +/* 0177C 809EC4BC 10000005 */ beq $zero, $zero, .L809EC4D4 /* 01780 809EC4C0 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 01784 809EC4C4 440E3000 */ mfc1 $t6, $f6 +/* 01784 809EC4C4 440E3000 */ mfc1 $t6, $f6 .L809EC4C8: /* 01788 809EC4C8 00000000 */ nop -/* 0178C 809EC4CC 05C0FFFB */ bltz $t6, .L809EC4BC +/* 0178C 809EC4CC 05C0FFFB */ bltz $t6, .L809EC4BC /* 01790 809EC4D0 00000000 */ nop .L809EC4D4: /* 01794 809EC4D4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 @@ -178,18 +178,18 @@ glabel EnDh_Draw /* 0179C 809EC4DC AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 /* 017A0 809EC4E0 44CDF800 */ ctc1 $t5, $31 /* 017A4 809EC4E4 C62E00BC */ lwc1 $f14, 0x00BC($s1) ## 000000BC -/* 017A8 809EC4E8 44066000 */ mfc1 $a2, $f12 -/* 017AC 809EC4EC 0C034261 */ jal Matrix_Translate -/* 017B0 809EC4F0 46007387 */ neg.s $f14, $f14 +/* 017A8 809EC4E8 44066000 */ mfc1 $a2, $f12 +/* 017AC 809EC4EC 0C034261 */ jal Matrix_Translate +/* 017B0 809EC4F0 46007387 */ neg.s $f14, $f14 /* 017B4 809EC4F4 3C01809F */ lui $at, %hi(D_809EC6EC) ## $at = 809F0000 -/* 017B8 809EC4F8 C420C6EC */ lwc1 $f0, %lo(D_809EC6EC)($at) +/* 017B8 809EC4F8 C420C6EC */ lwc1 $f0, %lo(D_809EC6EC)($at) /* 017BC 809EC4FC C6280318 */ lwc1 $f8, 0x0318($s1) ## 00000318 /* 017C0 809EC500 C62A031C */ lwc1 $f10, 0x031C($s1) ## 0000031C /* 017C4 809EC504 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 017C8 809EC508 46004302 */ mul.s $f12, $f8, $f0 -/* 017CC 809EC50C 44066000 */ mfc1 $a2, $f12 -/* 017D0 809EC510 46005382 */ mul.s $f14, $f10, $f0 -/* 017D4 809EC514 0C0342A3 */ jal Matrix_Scale +/* 017C8 809EC508 46004302 */ mul.s $f12, $f8, $f0 +/* 017CC 809EC50C 44066000 */ mfc1 $a2, $f12 +/* 017D0 809EC510 46005382 */ mul.s $f14, $f10, $f0 +/* 017D4 809EC514 0C0342A3 */ jal Matrix_Scale /* 017D8 809EC518 00000000 */ nop /* 017DC 809EC51C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 017E0 809EC520 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 @@ -201,7 +201,7 @@ glabel EnDh_Draw /* 017F8 809EC538 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 017FC 809EC53C 24A5C690 */ addiu $a1, $a1, %lo(D_809EC690) ## $a1 = 809EC690 /* 01800 809EC540 24060488 */ addiu $a2, $zero, 0x0488 ## $a2 = 00000488 -/* 01804 809EC544 0C0346A2 */ jal Matrix_NewMtx +/* 01804 809EC544 0C0346A2 */ jal Matrix_NewMtx /* 01808 809EC548 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 /* 0180C 809EC54C AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 01810 809EC550 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -217,12 +217,12 @@ glabel EnDh_Draw /* 01834 809EC574 24C6C6A0 */ addiu $a2, $a2, %lo(D_809EC6A0) ## $a2 = 809EC6A0 /* 01838 809EC578 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 0183C 809EC57C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 01840 809EC580 0C031AD5 */ jal func_800C6B54 +/* 01840 809EC580 0C031AD5 */ jal func_800C6B54 /* 01844 809EC584 2407048E */ addiu $a3, $zero, 0x048E ## $a3 = 0000048E -/* 01848 809EC588 8FBF0044 */ lw $ra, 0x0044($sp) -/* 0184C 809EC58C 8FB00038 */ lw $s0, 0x0038($sp) -/* 01850 809EC590 8FB1003C */ lw $s1, 0x003C($sp) -/* 01854 809EC594 8FB20040 */ lw $s2, 0x0040($sp) -/* 01858 809EC598 03E00008 */ jr $ra +/* 01848 809EC588 8FBF0044 */ lw $ra, 0x0044($sp) +/* 0184C 809EC58C 8FB00038 */ lw $s0, 0x0038($sp) +/* 01850 809EC590 8FB1003C */ lw $s1, 0x003C($sp) +/* 01854 809EC594 8FB20040 */ lw $s2, 0x0040($sp) +/* 01858 809EC598 03E00008 */ jr $ra /* 0185C 809EC59C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s index fb86f63910..aff50d5f7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s @@ -1,13 +1,13 @@ glabel EnDh_Init /* 00008 809EAD48 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0000C 809EAD4C AFB10028 */ sw $s1, 0x0028($sp) +/* 0000C 809EAD4C AFB10028 */ sw $s1, 0x0028($sp) /* 00010 809EAD50 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00014 809EAD54 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 809EAD58 AFB00024 */ sw $s0, 0x0024($sp) +/* 00014 809EAD54 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 809EAD58 AFB00024 */ sw $s0, 0x0024($sp) /* 0001C 809EAD5C 3C05809F */ lui $a1, %hi(D_809EC640) ## $a1 = 809F0000 /* 00020 809EAD60 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00024 809EAD64 0C01E037 */ jal Actor_ProcessInitChain - + /* 00028 809EAD68 24A5C640 */ addiu $a1, $a1, %lo(D_809EC640) ## $a1 = 809EC640 /* 0002C 809EAD6C 3C0E809F */ lui $t6, %hi(D_809EC620) ## $t6 = 809F0000 /* 00030 809EAD70 25CEC620 */ addiu $t6, $t6, %lo(D_809EC620) ## $t6 = 809EC620 @@ -17,20 +17,20 @@ glabel EnDh_Init /* 00040 809EAD80 260F0190 */ addiu $t7, $s0, 0x0190 ## $t7 = 00000190 /* 00044 809EAD84 261801F0 */ addiu $t8, $s0, 0x01F0 ## $t8 = 000001F0 /* 00048 809EAD88 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 0004C 809EAD8C AFB90018 */ sw $t9, 0x0018($sp) -/* 00050 809EAD90 AFB80014 */ sw $t8, 0x0014($sp) -/* 00054 809EAD94 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0004C 809EAD8C AFB90018 */ sw $t9, 0x0018($sp) +/* 00050 809EAD90 AFB80014 */ sw $t8, 0x0014($sp) +/* 00054 809EAD94 AFAF0010 */ sw $t7, 0x0010($sp) /* 00058 809EAD98 24E75880 */ addiu $a3, $a3, 0x5880 ## $a3 = 06005880 /* 0005C 809EAD9C 24C67E88 */ addiu $a2, $a2, 0x7E88 ## $a2 = 06007E88 /* 00060 809EADA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00064 809EADA4 0C0291BE */ jal func_800A46F8 +/* 00064 809EADA4 0C0291BE */ jal SkelAnime_InitSV /* 00068 809EADA8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0006C 809EADAC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00070 809EADB0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00074 809EADB4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00078 809EADB8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0007C 809EADBC 0C00AC78 */ jal ActorShape_Init - + /* 00080 809EADC0 3C074280 */ lui $a3, 0x4280 ## $a3 = 42800000 /* 00084 809EADC4 240800FE */ addiu $t0, $zero, 0x00FE ## $t0 = 000000FE /* 00088 809EADC8 A600001C */ sh $zero, 0x001C($s0) ## 0000001C @@ -39,10 +39,10 @@ glabel EnDh_Init /* 00094 809EADD4 8D29E664 */ lw $t1, -0x199C($t1) ## 8015E664 /* 00098 809EADD8 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF /* 0009C 809EADDC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 000A0 809EADE0 15200004 */ bne $t1, $zero, .L809EADF4 +/* 000A0 809EADE0 15200004 */ bne $t1, $zero, .L809EADF4 /* 000A4 809EADE4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000A8 809EADE8 240A000E */ addiu $t2, $zero, 0x000E ## $t2 = 0000000E -/* 000AC 809EADEC 10000003 */ beq $zero, $zero, .L809EADFC +/* 000AC 809EADEC 10000003 */ beq $zero, $zero, .L809EADFC /* 000B0 809EADF0 A20A00AF */ sb $t2, 0x00AF($s0) ## 000000AF .L809EADF4: /* 000B4 809EADF4 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 @@ -51,37 +51,37 @@ glabel EnDh_Init /* 000BC 809EADFC 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 000C0 809EAE00 A20D0258 */ sb $t5, 0x0258($s0) ## 00000258 /* 000C4 809EAE04 A20D025A */ sb $t5, 0x025A($s0) ## 0000025A -/* 000C8 809EAE08 01C17824 */ and $t7, $t6, $at +/* 000C8 809EAE08 01C17824 */ and $t7, $t6, $at /* 000CC 809EAE0C AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 000D0 809EAE10 26050260 */ addiu $a1, $s0, 0x0260 ## $a1 = 00000260 /* 000D4 809EAE14 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 000D8 809EAE18 AFA50030 */ sw $a1, 0x0030($sp) + +/* 000D8 809EAE18 AFA50030 */ sw $a1, 0x0030($sp) /* 000DC 809EAE1C 3C07809F */ lui $a3, %hi(D_809EC5C0) ## $a3 = 809F0000 -/* 000E0 809EAE20 8FA50030 */ lw $a1, 0x0030($sp) +/* 000E0 809EAE20 8FA50030 */ lw $a1, 0x0030($sp) /* 000E4 809EAE24 24E7C5C0 */ addiu $a3, $a3, %lo(D_809EC5C0) ## $a3 = 809EC5C0 /* 000E8 809EAE28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000EC 809EAE2C 0C01712B */ jal ActorCollider_InitCylinder - + /* 000F0 809EAE30 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000F4 809EAE34 260502AC */ addiu $a1, $s0, 0x02AC ## $a1 = 000002AC -/* 000F8 809EAE38 AFA50030 */ sw $a1, 0x0030($sp) -/* 000FC 809EAE3C 0C016EFE */ jal func_8005BBF8 +/* 000F8 809EAE38 AFA50030 */ sw $a1, 0x0030($sp) +/* 000FC 809EAE3C 0C016EFE */ jal func_8005BBF8 /* 00100 809EAE40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00104 809EAE44 3C07809F */ lui $a3, %hi(D_809EC610) ## $a3 = 809F0000 /* 00108 809EAE48 261802CC */ addiu $t8, $s0, 0x02CC ## $t8 = 000002CC -/* 0010C 809EAE4C 8FA50030 */ lw $a1, 0x0030($sp) -/* 00110 809EAE50 AFB80010 */ sw $t8, 0x0010($sp) +/* 0010C 809EAE4C 8FA50030 */ lw $a1, 0x0030($sp) +/* 00110 809EAE50 AFB80010 */ sw $t8, 0x0010($sp) /* 00114 809EAE54 24E7C610 */ addiu $a3, $a3, %lo(D_809EC610) ## $a3 = 809EC610 /* 00118 809EAE58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0011C 809EAE5C 0C017014 */ jal func_8005C050 +/* 0011C 809EAE5C 0C017014 */ jal func_8005C050 /* 00120 809EAE60 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00124 809EAE64 0C27AC17 */ jal func_809EB05C +/* 00124 809EAE64 0C27AC17 */ jal func_809EB05C /* 00128 809EAE68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0012C 809EAE6C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00130 809EAE70 8FB00024 */ lw $s0, 0x0024($sp) -/* 00134 809EAE74 8FB10028 */ lw $s1, 0x0028($sp) -/* 00138 809EAE78 03E00008 */ jr $ra +/* 0012C 809EAE6C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00130 809EAE70 8FB00024 */ lw $s0, 0x0024($sp) +/* 00134 809EAE74 8FB10028 */ lw $s1, 0x0028($sp) +/* 00138 809EAE78 03E00008 */ jr $ra /* 0013C 809EAE7C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s index cd7f2838a4..6e3e8ab7c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s @@ -1,33 +1,33 @@ glabel func_809EB05C /* 0031C 809EB05C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00320 809EB060 AFB00018 */ sw $s0, 0x0018($sp) +/* 00320 809EB060 AFB00018 */ sw $s0, 0x0018($sp) /* 00324 809EB064 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00328 809EB068 AFBF001C */ sw $ra, 0x001C($sp) +/* 00328 809EB068 AFBF001C */ sw $ra, 0x001C($sp) /* 0032C 809EB06C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00330 809EB070 24A53A8C */ addiu $a1, $a1, 0x3A8C ## $a1 = 06003A8C -/* 00334 809EB074 0C0294BE */ jal func_800A52F8 +/* 00334 809EB074 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00338 809EB078 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0033C 809EB07C 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 00340 809EB080 44816000 */ mtc1 $at, $f12 ## $f12 = 600.00 /* 00344 809EB084 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00348 809EB088 A200025B */ sb $zero, 0x025B($s0) ## 0000025B /* 0034C 809EB08C C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 /* 00350 809EB090 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 00354 809EB094 44816000 */ mtc1 $at, $f12 ## $f12 = 600.00 -/* 00358 809EB098 46040180 */ add.s $f6, $f0, $f4 +/* 00358 809EB098 46040180 */ add.s $f6, $f0, $f4 /* 0035C 809EB09C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00360 809EB0A0 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 00364 809EB0A4 C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010 /* 00368 809EB0A8 3C01809F */ lui $at, %hi(D_809EC6B4) ## $at = 809F0000 /* 0036C 809EB0AC 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 00370 809EB0B0 46080280 */ add.s $f10, $f0, $f8 +/* 00370 809EB0B0 46080280 */ add.s $f10, $f0, $f8 /* 00374 809EB0B4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00378 809EB0B8 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 /* 0037C 809EB0BC 3C05809F */ lui $a1, %hi(func_809EB110) ## $a1 = 809F0000 /* 00380 809EB0C0 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 00384 809EB0C4 C430C6B4 */ lwc1 $f16, %lo(D_809EC6B4)($at) +/* 00384 809EB0C4 C430C6B4 */ lwc1 $f16, %lo(D_809EC6B4)($at) /* 00388 809EB0C8 A600001C */ sh $zero, 0x001C($s0) ## 0000001C /* 0038C 809EB0CC 9202001D */ lbu $v0, 0x001D($s0) ## 0000001D /* 00390 809EB0D0 35F80080 */ ori $t8, $t7, 0x0080 ## $t8 = 00000080 @@ -39,12 +39,12 @@ glabel func_809EB05C /* 003A8 809EB0E8 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 /* 003AC 809EB0EC E61000BC */ swc1 $f16, 0x00BC($s0) ## 000000BC /* 003B0 809EB0F0 A2020250 */ sb $v0, 0x0250($s0) ## 00000250 -/* 003B4 809EB0F4 0C27AB50 */ jal func_809EAD40 +/* 003B4 809EB0F4 0C27AB50 */ jal func_809EAD40 /* 003B8 809EB0F8 A602025E */ sh $v0, 0x025E($s0) ## 0000025E -/* 003BC 809EB0FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 003C0 809EB100 8FB00018 */ lw $s0, 0x0018($sp) +/* 003BC 809EB0FC 8FBF001C */ lw $ra, 0x001C($sp) +/* 003C0 809EB100 8FB00018 */ lw $s0, 0x0018($sp) /* 003C4 809EB104 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 003C8 809EB108 03E00008 */ jr $ra +/* 003C8 809EB108 03E00008 */ jr $ra /* 003CC 809EB10C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s index afa26c51bb..f7bb5ccf86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s @@ -1,15 +1,15 @@ glabel func_809EB4D8 /* 00798 809EB4D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0079C 809EB4DC AFA5001C */ sw $a1, 0x001C($sp) -/* 007A0 809EB4E0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0079C 809EB4DC AFA5001C */ sw $a1, 0x001C($sp) +/* 007A0 809EB4E0 AFBF0014 */ sw $ra, 0x0014($sp) /* 007A4 809EB4E4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 007A8 809EB4E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007AC 809EB4EC 24A55880 */ addiu $a1, $a1, 0x5880 ## $a1 = 06005880 -/* 007B0 809EB4F0 AFA70018 */ sw $a3, 0x0018($sp) +/* 007B0 809EB4F0 AFA70018 */ sw $a3, 0x0018($sp) /* 007B4 809EB4F4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007B8 809EB4F8 0C0294D3 */ jal func_800A534C +/* 007B8 809EB4F8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 007BC 809EB4FC 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 007C0 809EB500 8FA40018 */ lw $a0, 0x0018($sp) +/* 007C0 809EB500 8FA40018 */ lw $a0, 0x0018($sp) /* 007C4 809EB504 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 007C8 809EB508 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 007CC 809EB50C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -18,11 +18,11 @@ glabel func_809EB4D8 /* 007D8 809EB518 24A5B53C */ addiu $a1, $a1, %lo(func_809EB53C) ## $a1 = 809EB53C /* 007DC 809EB51C A08E025B */ sb $t6, 0x025B($a0) ## 0000025B /* 007E0 809EB520 A48F025C */ sh $t7, 0x025C($a0) ## 0000025C -/* 007E4 809EB524 0C27AB50 */ jal func_809EAD40 +/* 007E4 809EB524 0C27AB50 */ jal func_809EAD40 /* 007E8 809EB528 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 007EC 809EB52C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007EC 809EB52C 8FBF0014 */ lw $ra, 0x0014($sp) /* 007F0 809EB530 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F4 809EB534 03E00008 */ jr $ra +/* 007F4 809EB534 03E00008 */ jr $ra /* 007F8 809EB538 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s index 06b035cb29..3a0e5ff7a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s @@ -1,91 +1,91 @@ glabel func_809EBD78 /* 01038 809EBD78 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0103C 809EBD7C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01040 809EBD80 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01040 809EBD80 AFBF0014 */ sw $ra, 0x0014($sp) /* 01044 809EBD84 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01048 809EBD88 AFA50024 */ sw $a1, 0x0024($sp) -/* 0104C 809EBD8C AFA4001C */ sw $a0, 0x001C($sp) +/* 01048 809EBD88 AFA50024 */ sw $a1, 0x0024($sp) +/* 0104C 809EBD8C AFA4001C */ sw $a0, 0x001C($sp) /* 01050 809EBD90 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01054 809EBD94 AFA60020 */ sw $a2, 0x0020($sp) -/* 01058 809EBD98 8FA4001C */ lw $a0, 0x001C($sp) -/* 0105C 809EBD9C 14400005 */ bne $v0, $zero, .L809EBDB4 -/* 01060 809EBDA0 8FA60020 */ lw $a2, 0x0020($sp) + +/* 01054 809EBD94 AFA60020 */ sw $a2, 0x0020($sp) +/* 01058 809EBD98 8FA4001C */ lw $a0, 0x001C($sp) +/* 0105C 809EBD9C 14400005 */ bne $v0, $zero, .L809EBDB4 +/* 01060 809EBDA0 8FA60020 */ lw $a2, 0x0020($sp) /* 01064 809EBDA4 84CE025C */ lh $t6, 0x025C($a2) ## 0000025C /* 01068 809EBDA8 2401012C */ addiu $at, $zero, 0x012C ## $at = 0000012C -/* 0106C 809EBDAC 51C10021 */ beql $t6, $at, .L809EBE34 +/* 0106C 809EBDAC 51C10021 */ beql $t6, $at, .L809EBE34 /* 01070 809EBDB0 C4CA0164 */ lwc1 $f10, 0x0164($a2) ## 00000164 .L809EBDB4: /* 01074 809EBDB4 84C2025C */ lh $v0, 0x025C($a2) ## 0000025C /* 01078 809EBDB8 2401012C */ addiu $at, $zero, 0x012C ## $at = 0000012C /* 0107C 809EBDBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01080 809EBDC0 14410005 */ bne $v0, $at, .L809EBDD8 +/* 01080 809EBDC0 14410005 */ bne $v0, $at, .L809EBDD8 /* 01084 809EBDC4 24A5375C */ addiu $a1, $a1, 0x375C ## $a1 = 0600375C -/* 01088 809EBDC8 0C0294BE */ jal func_800A52F8 -/* 0108C 809EBDCC AFA60020 */ sw $a2, 0x0020($sp) -/* 01090 809EBDD0 8FA60020 */ lw $a2, 0x0020($sp) +/* 01088 809EBDC8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 0108C 809EBDCC AFA60020 */ sw $a2, 0x0020($sp) +/* 01090 809EBDD0 8FA60020 */ lw $a2, 0x0020($sp) /* 01094 809EBDD4 84C2025C */ lh $v0, 0x025C($a2) ## 0000025C .L809EBDD8: /* 01098 809EBDD8 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 0109C 809EBDDC A4CF025C */ sh $t7, 0x025C($a2) ## 0000025C /* 010A0 809EBDE0 84D8025C */ lh $t8, 0x025C($a2) ## 0000025C -/* 010A4 809EBDE4 2B010096 */ slti $at, $t8, 0x0096 -/* 010A8 809EBDE8 5020002C */ beql $at, $zero, .L809EBE9C -/* 010AC 809EBDEC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 010A4 809EBDE4 2B010096 */ slti $at, $t8, 0x0096 +/* 010A8 809EBDE8 5020002C */ beql $at, $zero, .L809EBE9C +/* 010AC 809EBDEC 8FBF0014 */ lw $ra, 0x0014($sp) /* 010B0 809EBDF0 90C2025A */ lbu $v0, 0x025A($a2) ## 0000025A /* 010B4 809EBDF4 3C01809F */ lui $at, %hi(D_809EC6E8) ## $at = 809F0000 -/* 010B8 809EBDF8 10400009 */ beq $v0, $zero, .L809EBE20 +/* 010B8 809EBDF8 10400009 */ beq $v0, $zero, .L809EBE20 /* 010BC 809EBDFC 00000000 */ nop /* 010C0 809EBE00 C4C40054 */ lwc1 $f4, 0x0054($a2) ## 00000054 -/* 010C4 809EBE04 C426C6E8 */ lwc1 $f6, %lo(D_809EC6E8)($at) +/* 010C4 809EBE04 C426C6E8 */ lwc1 $f6, %lo(D_809EC6E8)($at) /* 010C8 809EBE08 2448FFFB */ addiu $t0, $v0, 0xFFFB ## $t0 = FFFFFFFB /* 010CC 809EBE0C A0C8025A */ sb $t0, 0x025A($a2) ## 0000025A -/* 010D0 809EBE10 46062201 */ sub.s $f8, $f4, $f6 +/* 010D0 809EBE10 46062201 */ sub.s $f8, $f4, $f6 /* 010D4 809EBE14 A0C800C8 */ sb $t0, 0x00C8($a2) ## 000000C8 -/* 010D8 809EBE18 1000001F */ beq $zero, $zero, .L809EBE98 +/* 010D8 809EBE18 1000001F */ beq $zero, $zero, .L809EBE98 /* 010DC 809EBE1C E4C80054 */ swc1 $f8, 0x0054($a2) ## 00000054 .L809EBE20: /* 010E0 809EBE20 0C00B55C */ jal Actor_Kill - + /* 010E4 809EBE24 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 010E8 809EBE28 1000001C */ beq $zero, $zero, .L809EBE9C -/* 010EC 809EBE2C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 010E8 809EBE28 1000001C */ beq $zero, $zero, .L809EBE9C +/* 010EC 809EBE2C 8FBF0014 */ lw $ra, 0x0014($sp) /* 010F0 809EBE30 C4CA0164 */ lwc1 $f10, 0x0164($a2) ## 00000164 .L809EBE34: /* 010F4 809EBE34 24010035 */ addiu $at, $zero, 0x0035 ## $at = 00000035 /* 010F8 809EBE38 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 010FC 809EBE3C 4600540D */ trunc.w.s $f16, $f10 +/* 010FC 809EBE3C 4600540D */ trunc.w.s $f16, $f10 /* 01100 809EBE40 2405387A */ addiu $a1, $zero, 0x387A ## $a1 = 0000387A -/* 01104 809EBE44 44028000 */ mfc1 $v0, $f16 +/* 01104 809EBE44 44028000 */ mfc1 $v0, $f16 /* 01108 809EBE48 00000000 */ nop -/* 0110C 809EBE4C 10410005 */ beq $v0, $at, .L809EBE64 +/* 0110C 809EBE4C 10410005 */ beq $v0, $at, .L809EBE64 /* 01110 809EBE50 24010038 */ addiu $at, $zero, 0x0038 ## $at = 00000038 -/* 01114 809EBE54 10410003 */ beq $v0, $at, .L809EBE64 +/* 01114 809EBE54 10410003 */ beq $v0, $at, .L809EBE64 /* 01118 809EBE58 2401003D */ addiu $at, $zero, 0x003D ## $at = 0000003D -/* 0111C 809EBE5C 54410009 */ bnel $v0, $at, .L809EBE84 +/* 0111C 809EBE5C 54410009 */ bnel $v0, $at, .L809EBE84 /* 01120 809EBE60 2401003D */ addiu $at, $zero, 0x003D ## $at = 0000003D .L809EBE64: /* 01124 809EBE64 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01128 809EBE68 AFA60020 */ sw $a2, 0x0020($sp) -/* 0112C 809EBE6C 8FA60020 */ lw $a2, 0x0020($sp) + +/* 01128 809EBE68 AFA60020 */ sw $a2, 0x0020($sp) +/* 0112C 809EBE6C 8FA60020 */ lw $a2, 0x0020($sp) /* 01130 809EBE70 C4D20164 */ lwc1 $f18, 0x0164($a2) ## 00000164 -/* 01134 809EBE74 4600910D */ trunc.w.s $f4, $f18 -/* 01138 809EBE78 44022000 */ mfc1 $v0, $f4 +/* 01134 809EBE74 4600910D */ trunc.w.s $f4, $f18 +/* 01138 809EBE78 44022000 */ mfc1 $v0, $f4 /* 0113C 809EBE7C 00000000 */ nop /* 01140 809EBE80 2401003D */ addiu $at, $zero, 0x003D ## $at = 0000003D .L809EBE84: -/* 01144 809EBE84 14410004 */ bne $v0, $at, .L809EBE98 -/* 01148 809EBE88 8FA40024 */ lw $a0, 0x0024($sp) +/* 01144 809EBE84 14410004 */ bne $v0, $at, .L809EBE98 +/* 01148 809EBE88 8FA40024 */ lw $a0, 0x0024($sp) /* 0114C 809EBE8C 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 /* 01150 809EBE90 0C00CDD2 */ jal Actor_ChangeType - + /* 01154 809EBE94 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 .L809EBE98: -/* 01158 809EBE98 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01158 809EBE98 8FBF0014 */ lw $ra, 0x0014($sp) .L809EBE9C: /* 0115C 809EBE9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01160 809EBEA0 03E00008 */ jr $ra +/* 01160 809EBEA0 03E00008 */ jr $ra /* 01164 809EBEA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Draw.s index 83e04ef297..f6483f80c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Draw.s @@ -1,11 +1,11 @@ glabel EnDha_Draw /* 00D50 809ED5D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D54 809ED5D4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D58 809ED5D8 AFA40028 */ sw $a0, 0x0028($sp) -/* 00D5C 809ED5DC AFA5002C */ sw $a1, 0x002C($sp) -/* 00D60 809ED5E0 0C024F46 */ jal func_80093D18 +/* 00D54 809ED5D4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00D58 809ED5D8 AFA40028 */ sw $a0, 0x0028($sp) +/* 00D5C 809ED5DC AFA5002C */ sw $a1, 0x002C($sp) +/* 00D60 809ED5E0 0C024F46 */ jal func_80093D18 /* 00D64 809ED5E4 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00D68 809ED5E8 8FA20028 */ lw $v0, 0x0028($sp) +/* 00D68 809ED5E8 8FA20028 */ lw $v0, 0x0028($sp) /* 00D6C 809ED5EC 3C0F809F */ lui $t7, %hi(func_809ED414) ## $t7 = 809F0000 /* 00D70 809ED5F0 3C18809F */ lui $t8, %hi(func_809ED4B8) ## $t8 = 809F0000 /* 00D74 809ED5F4 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 @@ -13,14 +13,14 @@ glabel EnDha_Draw /* 00D7C 809ED5FC 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E /* 00D80 809ED600 2718D4B8 */ addiu $t8, $t8, %lo(func_809ED4B8) ## $t8 = 809ED4B8 /* 00D84 809ED604 25EFD414 */ addiu $t7, $t7, %lo(func_809ED414) ## $t7 = 809ED414 -/* 00D88 809ED608 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00D8C 809ED60C AFB80014 */ sw $t8, 0x0014($sp) -/* 00D90 809ED610 8FA4002C */ lw $a0, 0x002C($sp) -/* 00D94 809ED614 0C0286B2 */ jal func_800A1AC8 -/* 00D98 809ED618 AFA20018 */ sw $v0, 0x0018($sp) -/* 00D9C 809ED61C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00D88 809ED608 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00D8C 809ED60C AFB80014 */ sw $t8, 0x0014($sp) +/* 00D90 809ED610 8FA4002C */ lw $a0, 0x002C($sp) +/* 00D94 809ED614 0C0286B2 */ jal SkelAnime_DrawSV +/* 00D98 809ED618 AFA20018 */ sw $v0, 0x0018($sp) +/* 00D9C 809ED61C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00DA0 809ED620 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00DA4 809ED624 03E00008 */ jr $ra +/* 00DA4 809ED624 03E00008 */ jr $ra /* 00DA8 809ED628 00000000 */ nop /* 00DAC 809ED62C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s index 35af0be3a9..56219dd1e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s @@ -1,12 +1,12 @@ glabel EnDha_Init /* 00008 809EC888 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0000C 809EC88C AFA5003C */ sw $a1, 0x003C($sp) -/* 00010 809EC890 AFBF002C */ sw $ra, 0x002C($sp) -/* 00014 809EC894 AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 809EC88C AFA5003C */ sw $a1, 0x003C($sp) +/* 00010 809EC890 AFBF002C */ sw $ra, 0x002C($sp) +/* 00014 809EC894 AFB00028 */ sw $s0, 0x0028($sp) /* 00018 809EC898 3C05809F */ lui $a1, %hi(D_809ED734) ## $a1 = 809F0000 /* 0001C 809EC89C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00020 809EC8A0 0C01E037 */ jal Actor_ProcessInitChain - + /* 00024 809EC8A4 24A5D734 */ addiu $a1, $a1, %lo(D_809ED734) ## $a1 = 809ED734 /* 00028 809EC8A8 3C0E809F */ lui $t6, %hi(D_809ED650) ## $t6 = 809F0000 /* 0002C 809EC8AC 25CED650 */ addiu $t6, $t6, %lo(D_809ED650) ## $t6 = 809ED650 @@ -16,20 +16,20 @@ glabel EnDha_Init /* 0003C 809EC8BC 260F0190 */ addiu $t7, $s0, 0x0190 ## $t7 = 00000190 /* 00040 809EC8C0 261801A8 */ addiu $t8, $s0, 0x01A8 ## $t8 = 000001A8 /* 00044 809EC8C4 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 00048 809EC8C8 AFB90018 */ sw $t9, 0x0018($sp) -/* 0004C 809EC8CC AFB80014 */ sw $t8, 0x0014($sp) -/* 00050 809EC8D0 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00048 809EC8C8 AFB90018 */ sw $t9, 0x0018($sp) +/* 0004C 809EC8CC AFB80014 */ sw $t8, 0x0014($sp) +/* 00050 809EC8D0 AFAF0010 */ sw $t7, 0x0010($sp) /* 00054 809EC8D4 24E715B0 */ addiu $a3, $a3, 0x15B0 ## $a3 = 060015B0 /* 00058 809EC8D8 24C60BD8 */ addiu $a2, $a2, 0x0BD8 ## $a2 = 06000BD8 -/* 0005C 809EC8DC 8FA4003C */ lw $a0, 0x003C($sp) -/* 00060 809EC8E0 0C0291BE */ jal func_800A46F8 +/* 0005C 809EC8DC 8FA4003C */ lw $a0, 0x003C($sp) +/* 00060 809EC8E0 0C0291BE */ jal SkelAnime_InitSV /* 00064 809EC8E4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00068 809EC8E8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0006C 809EC8EC 24C6B8C4 */ addiu $a2, $a2, 0xB8C4 ## $a2 = 8002B8C4 /* 00070 809EC8F0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00074 809EC8F4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00078 809EC8F8 0C00AC78 */ jal ActorShape_Init - + /* 0007C 809EC8FC 3C0742B4 */ lui $a3, 0x42B4 ## $a3 = 42B40000 /* 00080 809EC900 8E080028 */ lw $t0, 0x0028($s0) ## 00000028 /* 00084 809EC904 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -39,7 +39,7 @@ glabel EnDha_Init /* 00094 809EC914 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 /* 00098 809EC918 AE090038 */ sw $t1, 0x0038($s0) ## 00000038 /* 0009C 809EC91C 8E09002C */ lw $t1, 0x002C($s0) ## 0000002C -/* 000A0 809EC920 46062200 */ add.s $f8, $f4, $f6 +/* 000A0 809EC920 46062200 */ add.s $f8, $f4, $f6 /* 000A4 809EC924 240A00FE */ addiu $t2, $zero, 0x00FE ## $t2 = 000000FE /* 000A8 809EC928 240B0008 */ addiu $t3, $zero, 0x0008 ## $t3 = 00000008 /* 000AC 809EC92C 240CC000 */ addiu $t4, $zero, 0xC000 ## $t4 = FFFFC000 @@ -49,27 +49,27 @@ glabel EnDha_Init /* 000BC 809EC93C A60C01CE */ sh $t4, 0x01CE($s0) ## 000001CE /* 000C0 809EC940 26050200 */ addiu $a1, $s0, 0x0200 ## $a1 = 00000200 /* 000C4 809EC944 AE090040 */ sw $t1, 0x0040($s0) ## 00000040 -/* 000C8 809EC948 AFA50030 */ sw $a1, 0x0030($sp) -/* 000CC 809EC94C 0C016EFE */ jal func_8005BBF8 -/* 000D0 809EC950 8FA4003C */ lw $a0, 0x003C($sp) +/* 000C8 809EC948 AFA50030 */ sw $a1, 0x0030($sp) +/* 000CC 809EC94C 0C016EFE */ jal func_8005BBF8 +/* 000D0 809EC950 8FA4003C */ lw $a0, 0x003C($sp) /* 000D4 809EC954 3C07809F */ lui $a3, %hi(D_809ED724) ## $a3 = 809F0000 /* 000D8 809EC958 260D0220 */ addiu $t5, $s0, 0x0220 ## $t5 = 00000220 -/* 000DC 809EC95C 8FA50030 */ lw $a1, 0x0030($sp) -/* 000E0 809EC960 AFAD0010 */ sw $t5, 0x0010($sp) +/* 000DC 809EC95C 8FA50030 */ lw $a1, 0x0030($sp) +/* 000E0 809EC960 AFAD0010 */ sw $t5, 0x0010($sp) /* 000E4 809EC964 24E7D724 */ addiu $a3, $a3, %lo(D_809ED724) ## $a3 = 809ED724 -/* 000E8 809EC968 8FA4003C */ lw $a0, 0x003C($sp) -/* 000EC 809EC96C 0C017014 */ jal func_8005C050 +/* 000E8 809EC968 8FA4003C */ lw $a0, 0x003C($sp) +/* 000EC 809EC96C 0C017014 */ jal func_8005C050 /* 000F0 809EC970 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000F4 809EC974 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 000F8 809EC978 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 000FC 809EC97C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00100 809EC980 01C17824 */ and $t7, $t6, $at -/* 00104 809EC984 0C27B272 */ jal func_809EC9C8 +/* 00100 809EC980 01C17824 */ and $t7, $t6, $at +/* 00104 809EC984 0C27B272 */ jal func_809EC9C8 /* 00108 809EC988 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 0010C 809EC98C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00110 809EC990 8FB00028 */ lw $s0, 0x0028($sp) +/* 0010C 809EC98C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00110 809EC990 8FB00028 */ lw $s0, 0x0028($sp) /* 00114 809EC994 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00118 809EC998 03E00008 */ jr $ra +/* 00118 809EC998 03E00008 */ jr $ra /* 0011C 809EC99C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s index 2bb0cf756a..aad42736e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s @@ -1,13 +1,13 @@ glabel func_809EC9C8 /* 00148 809EC9C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0014C 809EC9CC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0014C 809EC9CC AFBF0014 */ sw $ra, 0x0014($sp) /* 00150 809EC9D0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00154 809EC9D4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00158 809EC9D8 24A515B0 */ addiu $a1, $a1, 0x15B0 ## $a1 = 060015B0 -/* 0015C 809EC9DC AFA60018 */ sw $a2, 0x0018($sp) -/* 00160 809EC9E0 0C0294BE */ jal func_800A52F8 +/* 0015C 809EC9DC AFA60018 */ sw $a2, 0x0018($sp) +/* 00160 809EC9E0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00164 809EC9E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00168 809EC9E8 8FA60018 */ lw $a2, 0x0018($sp) +/* 00168 809EC9E8 8FA60018 */ lw $a2, 0x0018($sp) /* 0016C 809EC9EC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00170 809EC9F0 A0C001C0 */ sb $zero, 0x01C0($a2) ## 000001C0 @@ -15,24 +15,24 @@ glabel func_809EC9C8 /* 00178 809EC9F8 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 0017C 809EC9FC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00180 809ECA00 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 00184 809ECA04 46040182 */ mul.s $f6, $f0, $f4 -/* 00188 809ECA08 8FA40018 */ lw $a0, 0x0018($sp) +/* 00184 809ECA04 46040182 */ mul.s $f6, $f0, $f4 +/* 00188 809ECA08 8FA40018 */ lw $a0, 0x0018($sp) /* 0018C 809ECA0C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00190 809ECA10 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00194 809ECA14 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 /* 00198 809ECA18 3C05809F */ lui $a1, %hi(func_809ECA50) ## $a1 = 809F0000 /* 0019C 809ECA1C 24A5CA50 */ addiu $a1, $a1, %lo(func_809ECA50) ## $a1 = 809ECA50 -/* 001A0 809ECA20 46083280 */ add.s $f10, $f6, $f8 +/* 001A0 809ECA20 46083280 */ add.s $f10, $f6, $f8 /* 001A4 809ECA24 A4990018 */ sh $t9, 0x0018($a0) ## 00000018 /* 001A8 809ECA28 E4920068 */ swc1 $f18, 0x0068($a0) ## 00000068 /* 001AC 809ECA2C A4980032 */ sh $t8, 0x0032($a0) ## 00000032 -/* 001B0 809ECA30 4600540D */ trunc.w.s $f16, $f10 -/* 001B4 809ECA34 440F8000 */ mfc1 $t7, $f16 -/* 001B8 809ECA38 0C27B220 */ jal func_809EC880 +/* 001B0 809ECA30 4600540D */ trunc.w.s $f16, $f10 +/* 001B4 809ECA34 440F8000 */ mfc1 $t7, $f16 +/* 001B8 809ECA38 0C27B220 */ jal func_809EC880 /* 001BC 809ECA3C A48F01C8 */ sh $t7, 0x01C8($a0) ## 000001C8 -/* 001C0 809ECA40 8FBF0014 */ lw $ra, 0x0014($sp) +/* 001C0 809ECA40 8FBF0014 */ lw $ra, 0x0014($sp) /* 001C4 809ECA44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001C8 809ECA48 03E00008 */ jr $ra +/* 001C8 809ECA48 03E00008 */ jr $ra /* 001CC 809ECA4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s index 7369a62fd8..2d70da7185 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s @@ -1,19 +1,19 @@ glabel EnDivingGame_Draw /* 016D4 809EEF44 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 016D8 809EEF48 AFB20030 */ sw $s2, 0x0030($sp) +/* 016D8 809EEF48 AFB20030 */ sw $s2, 0x0030($sp) /* 016DC 809EEF4C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 016E0 809EEF50 AFBF0034 */ sw $ra, 0x0034($sp) -/* 016E4 809EEF54 AFB1002C */ sw $s1, 0x002C($sp) -/* 016E8 809EEF58 AFB00028 */ sw $s0, 0x0028($sp) +/* 016E0 809EEF50 AFBF0034 */ sw $ra, 0x0034($sp) +/* 016E4 809EEF54 AFB1002C */ sw $s1, 0x002C($sp) +/* 016E8 809EEF58 AFB00028 */ sw $s0, 0x0028($sp) /* 016EC 809EEF5C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 016F0 809EEF60 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 016F4 809EEF64 3C06809F */ lui $a2, %hi(D_809EF17C) ## $a2 = 809F0000 /* 016F8 809EEF68 24C6F17C */ addiu $a2, $a2, %lo(D_809EF17C) ## $a2 = 809EF17C /* 016FC 809EEF6C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 01700 809EEF70 240704BC */ addiu $a3, $zero, 0x04BC ## $a3 = 000004BC -/* 01704 809EEF74 0C031AB1 */ jal func_800C6AC4 +/* 01704 809EEF74 0C031AB1 */ jal func_800C6AC4 /* 01708 809EEF78 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0170C 809EEF7C 0C024F46 */ jal func_80093D18 +/* 0170C 809EEF7C 0C024F46 */ jal func_80093D18 /* 01710 809EEF80 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01714 809EEF84 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 01718 809EEF88 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 @@ -29,9 +29,9 @@ glabel EnDivingGame_Draw /* 01740 809EEFB0 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 01744 809EEFB4 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 01748 809EEFB8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0174C 809EEFBC 0C27BB6E */ jal func_809EEDB8 -/* 01750 809EEFC0 AFA20044 */ sw $v0, 0x0044($sp) -/* 01754 809EEFC4 8FA30044 */ lw $v1, 0x0044($sp) +/* 0174C 809EEFBC 0C27BB6E */ jal func_809EEDB8 +/* 01750 809EEFC0 AFA20044 */ sw $v0, 0x0044($sp) +/* 01754 809EEFC4 8FA30044 */ lw $v1, 0x0044($sp) /* 01758 809EEFC8 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 0175C 809EEFCC 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 /* 01760 809EEFD0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -44,40 +44,40 @@ glabel EnDivingGame_Draw /* 0177C 809EEFEC 862B029E */ lh $t3, 0x029E($s1) ## 0000029E /* 01780 809EEFF0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01784 809EEFF4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01788 809EEFF8 000B6080 */ sll $t4, $t3, 2 -/* 0178C 809EEFFC 008C2021 */ addu $a0, $a0, $t4 -/* 01790 809EF000 8C84F0E0 */ lw $a0, %lo(D_809EF0E0)($a0) +/* 01788 809EEFF8 000B6080 */ sll $t4, $t3, 2 +/* 0178C 809EEFFC 008C2021 */ addu $a0, $a0, $t4 +/* 01790 809EF000 8C84F0E0 */ lw $a0, %lo(D_809EF0E0)($a0) /* 01794 809EF004 3C0A809F */ lui $t2, %hi(func_809EEDE4) ## $t2 = 809F0000 /* 01798 809EF008 254AEDE4 */ addiu $t2, $t2, %lo(func_809EEDE4) ## $t2 = 809EEDE4 -/* 0179C 809EF00C 00047100 */ sll $t6, $a0, 4 -/* 017A0 809EF010 000E7F02 */ srl $t7, $t6, 28 -/* 017A4 809EF014 000FC080 */ sll $t8, $t7, 2 -/* 017A8 809EF018 0338C821 */ addu $t9, $t9, $t8 +/* 0179C 809EF00C 00047100 */ sll $t6, $a0, 4 +/* 017A0 809EF010 000E7F02 */ srl $t7, $t6, 28 +/* 017A4 809EF014 000FC080 */ sll $t8, $t7, 2 +/* 017A8 809EF018 0338C821 */ addu $t9, $t9, $t8 /* 017AC 809EF01C 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 -/* 017B0 809EF020 00816824 */ and $t5, $a0, $at +/* 017B0 809EF020 00816824 */ and $t5, $a0, $at /* 017B4 809EF024 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 017B8 809EF028 01B94021 */ addu $t0, $t5, $t9 -/* 017BC 809EF02C 01014821 */ addu $t1, $t0, $at +/* 017B8 809EF028 01B94021 */ addu $t0, $t5, $t9 +/* 017BC 809EF02C 01014821 */ addu $t1, $t0, $at /* 017C0 809EF030 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 017C4 809EF034 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E /* 017C8 809EF038 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 017CC 809EF03C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 017D0 809EF040 AFB10018 */ sw $s1, 0x0018($sp) -/* 017D4 809EF044 AFA00014 */ sw $zero, 0x0014($sp) -/* 017D8 809EF048 AFAA0010 */ sw $t2, 0x0010($sp) -/* 017DC 809EF04C 0C0286B2 */ jal func_800A1AC8 +/* 017D0 809EF040 AFB10018 */ sw $s1, 0x0018($sp) +/* 017D4 809EF044 AFA00014 */ sw $zero, 0x0014($sp) +/* 017D8 809EF048 AFAA0010 */ sw $t2, 0x0010($sp) +/* 017DC 809EF04C 0C0286B2 */ jal SkelAnime_DrawSV /* 017E0 809EF050 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 017E4 809EF054 3C06809F */ lui $a2, %hi(D_809EF194) ## $a2 = 809F0000 /* 017E8 809EF058 24C6F194 */ addiu $a2, $a2, %lo(D_809EF194) ## $a2 = 809EF194 /* 017EC 809EF05C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 017F0 809EF060 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 017F4 809EF064 0C031AD5 */ jal func_800C6B54 +/* 017F4 809EF064 0C031AD5 */ jal func_800C6B54 /* 017F8 809EF068 240704D0 */ addiu $a3, $zero, 0x04D0 ## $a3 = 000004D0 -/* 017FC 809EF06C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01800 809EF070 8FB00028 */ lw $s0, 0x0028($sp) -/* 01804 809EF074 8FB1002C */ lw $s1, 0x002C($sp) -/* 01808 809EF078 8FB20030 */ lw $s2, 0x0030($sp) -/* 0180C 809EF07C 03E00008 */ jr $ra +/* 017FC 809EF06C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01800 809EF070 8FB00028 */ lw $s0, 0x0028($sp) +/* 01804 809EF074 8FB1002C */ lw $s1, 0x002C($sp) +/* 01808 809EF078 8FB20030 */ lw $s2, 0x0030($sp) +/* 0180C 809EF07C 03E00008 */ jr $ra /* 01810 809EF080 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 01814 809EF084 00000000 */ nop /* 01818 809EF088 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s index 45420ec7b1..aaf483eb35 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s @@ -2,87 +2,87 @@ glabel EnDivingGame_Init /* 00000 809ED870 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 809ED874 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00008 809ED878 44812000 */ mtc1 $at, $f4 ## $f4 = -3.00 -/* 0000C 809ED87C AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 809ED87C AFB00028 */ sw $s0, 0x0028($sp) /* 00010 809ED880 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 809ED884 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 809ED888 AFA5003C */ sw $a1, 0x003C($sp) +/* 00014 809ED884 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 809ED888 AFA5003C */ sw $a1, 0x003C($sp) /* 0001C 809ED88C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00020 809ED890 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00024 809ED894 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00028 809ED898 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0002C 809ED89C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 00030 809ED8A0 0C00AC78 */ jal ActorShape_Init - + /* 00034 809ED8A4 E484FFB8 */ swc1 $f4, -0x0048($a0) ## 0000006C /* 00038 809ED8A8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 0003C 809ED8AC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00040 809ED8B0 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 00044 809ED8B4 260F0208 */ addiu $t7, $s0, 0x0208 ## $t7 = 00000208 /* 00048 809ED8B8 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 0004C 809ED8BC AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 809ED8C0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 809ED8C4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0004C 809ED8BC AFB80018 */ sw $t8, 0x0018($sp) +/* 00050 809ED8C0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00054 809ED8C4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00058 809ED8C8 24E72FE8 */ addiu $a3, $a3, 0x2FE8 ## $a3 = 06002FE8 /* 0005C 809ED8CC 24C6BFA8 */ addiu $a2, $a2, 0xBFA8 ## $a2 = 0600BFA8 -/* 00060 809ED8D0 8FA4003C */ lw $a0, 0x003C($sp) -/* 00064 809ED8D4 0C0291BE */ jal func_800A46F8 +/* 00060 809ED8D0 8FA4003C */ lw $a0, 0x003C($sp) +/* 00064 809ED8D4 0C0291BE */ jal SkelAnime_InitSV /* 00068 809ED8D8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0006C 809ED8DC 2605034C */ addiu $a1, $s0, 0x034C ## $a1 = 0000034C -/* 00070 809ED8E0 AFA50030 */ sw $a1, 0x0030($sp) +/* 00070 809ED8E0 AFA50030 */ sw $a1, 0x0030($sp) /* 00074 809ED8E4 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00078 809ED8E8 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00078 809ED8E8 8FA4003C */ lw $a0, 0x003C($sp) /* 0007C 809ED8EC 3C07809F */ lui $a3, %hi(D_809EF0B4) ## $a3 = 809F0000 -/* 00080 809ED8F0 8FA50030 */ lw $a1, 0x0030($sp) +/* 00080 809ED8F0 8FA50030 */ lw $a1, 0x0030($sp) /* 00084 809ED8F4 24E7F0B4 */ addiu $a3, $a3, %lo(D_809EF0B4) ## $a3 = 809EF0B4 -/* 00088 809ED8F8 8FA4003C */ lw $a0, 0x003C($sp) +/* 00088 809ED8F8 8FA4003C */ lw $a0, 0x003C($sp) /* 0008C 809ED8FC 0C01712B */ jal ActorCollider_InitCylinder - + /* 00090 809ED900 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00094 809ED904 3C04809F */ lui $a0, %hi(D_809EF0F0) ## $a0 = 809F0000 /* 00098 809ED908 0C00084C */ jal osSyncPrintf - + /* 0009C 809ED90C 2484F0F0 */ addiu $a0, $a0, %lo(D_809EF0F0) ## $a0 = 809EF0F0 /* 000A0 809ED910 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF /* 000A4 809ED914 A2190003 */ sb $t9, 0x0003($s0) ## 00000003 /* 000A8 809ED918 3C01809F */ lui $at, %hi(D_809EF1AC) ## $at = 809F0000 -/* 000AC 809ED91C C426F1AC */ lwc1 $f6, %lo(D_809EF1AC)($at) +/* 000AC 809ED91C C426F1AC */ lwc1 $f6, %lo(D_809EF1AC)($at) /* 000B0 809ED920 3C01809F */ lui $at, %hi(D_809EF1B0) ## $at = 809F0000 /* 000B4 809ED924 3C02809F */ lui $v0, %hi(D_809EF0B0) ## $v0 = 809F0000 /* 000B8 809ED928 E6060050 */ swc1 $f6, 0x0050($s0) ## 00000050 -/* 000BC 809ED92C C428F1B0 */ lwc1 $f8, %lo(D_809EF1B0)($at) +/* 000BC 809ED92C C428F1B0 */ lwc1 $f8, %lo(D_809EF1B0)($at) /* 000C0 809ED930 3C01809F */ lui $at, %hi(D_809EF1B4) ## $at = 809F0000 /* 000C4 809ED934 2442F0B0 */ addiu $v0, $v0, %lo(D_809EF0B0) ## $v0 = 809EF0B0 /* 000C8 809ED938 E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 -/* 000CC 809ED93C C42AF1B4 */ lwc1 $f10, %lo(D_809EF1B4)($at) +/* 000CC 809ED93C C42AF1B4 */ lwc1 $f10, %lo(D_809EF1B4)($at) /* 000D0 809ED940 3C0C809F */ lui $t4, %hi(func_809EDCB0) ## $t4 = 809F0000 /* 000D4 809ED944 3C04809F */ lui $a0, %hi(D_809EF120) ## $a0 = 809F0000 /* 000D8 809ED948 E60A0058 */ swc1 $f10, 0x0058($s0) ## 00000058 /* 000DC 809ED94C 90480000 */ lbu $t0, 0x0000($v0) ## 809EF0B0 /* 000E0 809ED950 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 000E4 809ED954 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 000E8 809ED958 11000009 */ beq $t0, $zero, .L809ED980 +/* 000E8 809ED958 11000009 */ beq $t0, $zero, .L809ED980 /* 000EC 809ED95C 258CDCB0 */ addiu $t4, $t4, %lo(func_809EDCB0) ## $t4 = 809EDCB0 /* 000F0 809ED960 0C00084C */ jal osSyncPrintf - + /* 000F4 809ED964 2484F120 */ addiu $a0, $a0, %lo(D_809EF120) ## $a0 = 809EF120 /* 000F8 809ED968 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 000FC 809ED96C A209031F */ sb $t1, 0x031F($s0) ## 0000031F /* 00100 809ED970 0C00B55C */ jal Actor_Kill - + /* 00104 809ED974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00108 809ED978 10000006 */ beq $zero, $zero, .L809ED994 -/* 0010C 809ED97C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00108 809ED978 10000006 */ beq $zero, $zero, .L809ED994 +/* 0010C 809ED97C 8FBF002C */ lw $ra, 0x002C($sp) .L809ED980: /* 00110 809ED980 A04A0000 */ sb $t2, 0x0000($v0) ## 00000000 /* 00114 809ED984 A200001F */ sb $zero, 0x001F($s0) ## 0000001F /* 00118 809ED988 A20B00AE */ sb $t3, 0x00AE($s0) ## 000000AE /* 0011C 809ED98C AE0C0280 */ sw $t4, 0x0280($s0) ## 00000280 -/* 00120 809ED990 8FBF002C */ lw $ra, 0x002C($sp) +/* 00120 809ED990 8FBF002C */ lw $ra, 0x002C($sp) .L809ED994: -/* 00124 809ED994 8FB00028 */ lw $s0, 0x0028($sp) +/* 00124 809ED994 8FB00028 */ lw $s0, 0x0028($sp) /* 00128 809ED998 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0012C 809ED99C 03E00008 */ jr $ra +/* 0012C 809ED99C 03E00008 */ jr $ra /* 00130 809ED9A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Draw.s index 8b8e77604c..9799d86a93 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Draw.s @@ -1,22 +1,22 @@ glabel EnDns_Draw /* 0101C 809F036C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01020 809F0370 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01024 809F0374 AFA40028 */ sw $a0, 0x0028($sp) -/* 01028 809F0378 AFA5002C */ sw $a1, 0x002C($sp) -/* 0102C 809F037C 0C024F46 */ jal func_80093D18 +/* 01020 809F0370 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01024 809F0374 AFA40028 */ sw $a0, 0x0028($sp) +/* 01028 809F0378 AFA5002C */ sw $a1, 0x002C($sp) +/* 0102C 809F037C 0C024F46 */ jal func_80093D18 /* 01030 809F0380 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01034 809F0384 8FA20028 */ lw $v0, 0x0028($sp) -/* 01038 809F0388 8FA4002C */ lw $a0, 0x002C($sp) +/* 01034 809F0384 8FA20028 */ lw $v0, 0x0028($sp) +/* 01038 809F0388 8FA4002C */ lw $a0, 0x002C($sp) /* 0103C 809F038C 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 /* 01040 809F0390 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C /* 01044 809F0394 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E -/* 01048 809F0398 AFA00014 */ sw $zero, 0x0014($sp) -/* 0104C 809F039C AFA00010 */ sw $zero, 0x0010($sp) -/* 01050 809F03A0 0C0286B2 */ jal func_800A1AC8 -/* 01054 809F03A4 AFA20018 */ sw $v0, 0x0018($sp) -/* 01058 809F03A8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01048 809F0398 AFA00014 */ sw $zero, 0x0014($sp) +/* 0104C 809F039C AFA00010 */ sw $zero, 0x0010($sp) +/* 01050 809F03A0 0C0286B2 */ jal SkelAnime_DrawSV +/* 01054 809F03A4 AFA20018 */ sw $v0, 0x0018($sp) +/* 01058 809F03A8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0105C 809F03AC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01060 809F03B0 03E00008 */ jr $ra +/* 01060 809F03B0 03E00008 */ jr $ra /* 01064 809F03B4 00000000 */ nop /* 01068 809F03B8 00000000 */ nop /* 0106C 809F03BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s index ebc2596481..4f355702ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s @@ -1,93 +1,93 @@ glabel EnDns_Init /* 00000 809EF350 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 809EF354 AFBF002C */ sw $ra, 0x002C($sp) -/* 00008 809EF358 AFB00028 */ sw $s0, 0x0028($sp) -/* 0000C 809EF35C AFA50044 */ sw $a1, 0x0044($sp) +/* 00004 809EF354 AFBF002C */ sw $ra, 0x002C($sp) +/* 00008 809EF358 AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 809EF35C AFA50044 */ sw $a1, 0x0044($sp) /* 00010 809EF360 8486001C */ lh $a2, 0x001C($a0) ## 0000001C /* 00014 809EF364 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 809EF368 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0001C 809EF36C 04C10009 */ bgez $a2, .L809EF394 +/* 0001C 809EF36C 04C10009 */ bgez $a2, .L809EF394 /* 00020 809EF370 3C04809F */ lui $a0, %hi(D_809F06C8) ## $a0 = 809F0000 /* 00024 809EF374 3C04809F */ lui $a0, %hi(D_809F0694) ## $a0 = 809F0000 /* 00028 809EF378 24840694 */ addiu $a0, $a0, %lo(D_809F0694) ## $a0 = 809F0694 /* 0002C 809EF37C 0C00084C */ jal osSyncPrintf - + /* 00030 809EF380 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 /* 00034 809EF384 0C00B55C */ jal Actor_Kill - + /* 00038 809EF388 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0003C 809EF38C 10000055 */ beq $zero, $zero, .L809EF4E4 -/* 00040 809EF390 8FBF002C */ lw $ra, 0x002C($sp) +/* 0003C 809EF38C 10000055 */ beq $zero, $zero, .L809EF4E4 +/* 00040 809EF390 8FBF002C */ lw $ra, 0x002C($sp) .L809EF394: -/* 00044 809EF394 14C1000D */ bne $a2, $at, .L809EF3CC +/* 00044 809EF394 14C1000D */ bne $a2, $at, .L809EF3CC /* 00048 809EF398 248406C8 */ addiu $a0, $a0, %lo(D_809F06C8) ## $a0 = 000006C8 /* 0004C 809EF39C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00050 809EF3A0 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 /* 00054 809EF3A4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00058 809EF3A8 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 0005C 809EF3AC 11C00003 */ beq $t6, $zero, .L809EF3BC +/* 0005C 809EF3AC 11C00003 */ beq $t6, $zero, .L809EF3BC /* 00060 809EF3B0 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 00064 809EF3B4 10000001 */ beq $zero, $zero, .L809EF3BC +/* 00064 809EF3B4 10000001 */ beq $zero, $zero, .L809EF3BC /* 00068 809EF3B8 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L809EF3BC: -/* 0006C 809EF3BC 54410004 */ bnel $v0, $at, .L809EF3D0 -/* 00070 809EF3C0 0006C080 */ sll $t8, $a2, 2 +/* 0006C 809EF3BC 54410004 */ bnel $v0, $at, .L809EF3D0 +/* 00070 809EF3C0 0006C080 */ sll $t8, $a2, 2 /* 00074 809EF3C4 A60F001C */ sh $t7, 0x001C($s0) ## 0000001C /* 00078 809EF3C8 8606001C */ lh $a2, 0x001C($s0) ## 0000001C .L809EF3CC: -/* 0007C 809EF3CC 0006C080 */ sll $t8, $a2, 2 +/* 0007C 809EF3CC 0006C080 */ sll $t8, $a2, 2 .L809EF3D0: /* 00080 809EF3D0 3C05809F */ lui $a1, %hi(D_809F0424) ## $a1 = 809F0000 -/* 00084 809EF3D4 00B82821 */ addu $a1, $a1, $t8 +/* 00084 809EF3D4 00B82821 */ addu $a1, $a1, $t8 /* 00088 809EF3D8 0C00084C */ jal osSyncPrintf - -/* 0008C 809EF3DC 8CA50424 */ lw $a1, %lo(D_809F0424)($a1) + +/* 0008C 809EF3DC 8CA50424 */ lw $a1, %lo(D_809F0424)($a1) /* 00090 809EF3E0 3C05809F */ lui $a1, %hi(D_809F052C) ## $a1 = 809F0000 /* 00094 809EF3E4 24A5052C */ addiu $a1, $a1, %lo(D_809F052C) ## $a1 = 809F052C /* 00098 809EF3E8 0C01E037 */ jal Actor_ProcessInitChain - + /* 0009C 809EF3EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000A0 809EF3F0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 000A4 809EF3F4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 000A8 809EF3F8 26190190 */ addiu $t9, $s0, 0x0190 ## $t9 = 00000190 /* 000AC 809EF3FC 260801FC */ addiu $t0, $s0, 0x01FC ## $t0 = 000001FC /* 000B0 809EF400 24090012 */ addiu $t1, $zero, 0x0012 ## $t1 = 00000012 -/* 000B4 809EF404 AFA90018 */ sw $t1, 0x0018($sp) -/* 000B8 809EF408 AFA80014 */ sw $t0, 0x0014($sp) -/* 000BC 809EF40C AFB90010 */ sw $t9, 0x0010($sp) +/* 000B4 809EF404 AFA90018 */ sw $t1, 0x0018($sp) +/* 000B8 809EF408 AFA80014 */ sw $t0, 0x0014($sp) +/* 000BC 809EF40C AFB90010 */ sw $t9, 0x0010($sp) /* 000C0 809EF410 24E709A0 */ addiu $a3, $a3, 0x09A0 ## $a3 = 060009A0 /* 000C4 809EF414 24C641A8 */ addiu $a2, $a2, 0x41A8 ## $a2 = 060041A8 -/* 000C8 809EF418 8FA40044 */ lw $a0, 0x0044($sp) -/* 000CC 809EF41C 0C0291BE */ jal func_800A46F8 +/* 000C8 809EF418 8FA40044 */ lw $a0, 0x0044($sp) +/* 000CC 809EF41C 0C0291BE */ jal SkelAnime_InitSV /* 000D0 809EF420 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 000D4 809EF424 2605026C */ addiu $a1, $s0, 0x026C ## $a1 = 0000026C -/* 000D8 809EF428 AFA50034 */ sw $a1, 0x0034($sp) +/* 000D8 809EF428 AFA50034 */ sw $a1, 0x0034($sp) /* 000DC 809EF42C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 000E0 809EF430 8FA40044 */ lw $a0, 0x0044($sp) + +/* 000E0 809EF430 8FA40044 */ lw $a0, 0x0044($sp) /* 000E4 809EF434 3C07809F */ lui $a3, %hi(D_809F03E0) ## $a3 = 809F0000 -/* 000E8 809EF438 8FA50034 */ lw $a1, 0x0034($sp) +/* 000E8 809EF438 8FA50034 */ lw $a1, 0x0034($sp) /* 000EC 809EF43C 24E703E0 */ addiu $a3, $a3, %lo(D_809F03E0) ## $a3 = 809F03E0 -/* 000F0 809EF440 8FA40044 */ lw $a0, 0x0044($sp) -/* 000F4 809EF444 0C017114 */ jal func_8005C450 +/* 000F0 809EF440 8FA40044 */ lw $a0, 0x0044($sp) +/* 000F4 809EF444 0C017114 */ jal func_8005C450 /* 000F8 809EF448 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000FC 809EF44C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00100 809EF450 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00104 809EF454 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00108 809EF458 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0010C 809EF45C 0C00AC78 */ jal ActorShape_Init - + /* 00110 809EF460 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 /* 00114 809EF464 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 00118 809EF468 3C0C809F */ lui $t4, %hi(D_809F040C) ## $t4 = 809F0000 /* 0011C 809EF46C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00120 809EF470 000A5840 */ sll $t3, $t2, 1 -/* 00124 809EF474 018B6021 */ addu $t4, $t4, $t3 -/* 00128 809EF478 958C040C */ lhu $t4, %lo(D_809F040C)($t4) +/* 00120 809EF470 000A5840 */ sll $t3, $t2, 1 +/* 00124 809EF474 018B6021 */ addu $t4, $t4, $t3 +/* 00128 809EF478 958C040C */ lhu $t4, %lo(D_809F040C)($t4) /* 0012C 809EF47C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00130 809EF480 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00134 809EF484 0C00B58B */ jal Actor_SetScale - + /* 00138 809EF488 A60C010E */ sh $t4, 0x010E($s0) ## 0000010E /* 0013C 809EF48C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00140 809EF490 860E001C */ lh $t6, 0x001C($s0) ## 0000001C @@ -96,25 +96,25 @@ glabel EnDns_Init /* 0014C 809EF49C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 00150 809EF4A0 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF /* 00154 809EF4A4 3C18809F */ lui $t8, %hi(D_809F0500) ## $t8 = 809F0000 -/* 00158 809EF4A8 000E7880 */ sll $t7, $t6, 2 +/* 00158 809EF4A8 000E7880 */ sll $t7, $t6, 2 /* 0015C 809EF4AC A20D00AE */ sb $t5, 0x00AE($s0) ## 000000AE /* 00160 809EF4B0 A20202BB */ sb $v0, 0x02BB($s0) ## 000002BB /* 00164 809EF4B4 A20202BC */ sb $v0, 0x02BC($s0) ## 000002BC /* 00168 809EF4B8 A20002BD */ sb $zero, 0x02BD($s0) ## 000002BD -/* 0016C 809EF4BC 030FC021 */ addu $t8, $t8, $t7 +/* 0016C 809EF4BC 030FC021 */ addu $t8, $t8, $t7 /* 00170 809EF4C0 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 00174 809EF4C4 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 00178 809EF4C8 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 0017C 809EF4CC 8F180500 */ lw $t8, %lo(D_809F0500)($t8) +/* 0017C 809EF4CC 8F180500 */ lw $t8, %lo(D_809F0500)($t8) /* 00180 809EF4D0 3C19809F */ lui $t9, %hi(func_809EFB84) ## $t9 = 809F0000 /* 00184 809EF4D4 2739FB84 */ addiu $t9, $t9, %lo(func_809EFB84) ## $t9 = 809EFB84 /* 00188 809EF4D8 AE190268 */ sw $t9, 0x0268($s0) ## 00000268 /* 0018C 809EF4DC AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 00190 809EF4E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00190 809EF4E0 8FBF002C */ lw $ra, 0x002C($sp) .L809EF4E4: -/* 00194 809EF4E4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00194 809EF4E4 8FB00028 */ lw $s0, 0x0028($sp) /* 00198 809EF4E8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0019C 809EF4EC 03E00008 */ jr $ra +/* 0019C 809EF4EC 03E00008 */ jr $ra /* 001A0 809EF4F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s index 02fb5edd20..b3d5ec5855 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s @@ -1,30 +1,30 @@ glabel func_809F89CC /* 0077C 809F89CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00780 809F89D0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00780 809F89D0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00784 809F89D4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00788 809F89D8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0078C 809F89DC 24A54C20 */ addiu $a1, $a1, 0x4C20 ## $a1 = 06004C20 -/* 00790 809F89E0 AFA70018 */ sw $a3, 0x0018($sp) +/* 00790 809F89E0 AFA70018 */ sw $a3, 0x0018($sp) /* 00794 809F89E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00798 809F89E8 0C0294D3 */ jal func_800A534C +/* 00798 809F89E8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0079C 809F89EC 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 007A0 809F89F0 8FA70018 */ lw $a3, 0x0018($sp) +/* 007A0 809F89F0 8FA70018 */ lw $a3, 0x0018($sp) /* 007A4 809F89F4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 007A8 809F89F8 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E /* 007AC 809F89FC 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 /* 007B0 809F8A00 0C01DF64 */ jal Math_Rand_S16Offset - + /* 007B4 809F8A04 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 007B8 809F8A08 8FA40018 */ lw $a0, 0x0018($sp) +/* 007B8 809F8A08 8FA40018 */ lw $a0, 0x0018($sp) /* 007BC 809F8A0C 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 007C0 809F8A10 3C0580A0 */ lui $a1, %hi(func_809F8C94) ## $a1 = 80A00000 /* 007C4 809F8A14 24A58C94 */ addiu $a1, $a1, %lo(func_809F8C94) ## $a1 = 809F8C94 /* 007C8 809F8A18 A482030C */ sh $v0, 0x030C($a0) ## 0000030C -/* 007CC 809F8A1C 0C27E094 */ jal func_809F8250 +/* 007CC 809F8A1C 0C27E094 */ jal func_809F8250 /* 007D0 809F8A20 AC8E0304 */ sw $t6, 0x0304($a0) ## 00000304 -/* 007D4 809F8A24 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007D4 809F8A24 8FBF0014 */ lw $ra, 0x0014($sp) /* 007D8 809F8A28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007DC 809F8A2C 03E00008 */ jr $ra +/* 007DC 809F8A2C 03E00008 */ jr $ra /* 007E0 809F8A30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Draw.s index e1f7b0fe80..49ddd6d419 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Draw.s @@ -1,11 +1,11 @@ glabel EnDs_Draw /* 00A8C 809FDABC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A90 809FDAC0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A94 809FDAC4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00A98 809FDAC8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00A9C 809FDACC 0C0250F2 */ jal func_800943C8 +/* 00A90 809FDAC0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00A94 809FDAC4 AFA40028 */ sw $a0, 0x0028($sp) +/* 00A98 809FDAC8 AFA5002C */ sw $a1, 0x002C($sp) +/* 00A9C 809FDACC 0C0250F2 */ jal func_800943C8 /* 00AA0 809FDAD0 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00AA4 809FDAD4 8FA20028 */ lw $v0, 0x0028($sp) +/* 00AA4 809FDAD4 8FA20028 */ lw $v0, 0x0028($sp) /* 00AA8 809FDAD8 3C0F80A0 */ lui $t7, %hi(func_809FDA38) ## $t7 = 80A00000 /* 00AAC 809FDADC 3C1880A0 */ lui $t8, %hi(func_809FDA7C) ## $t8 = 80A00000 /* 00AB0 809FDAE0 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 @@ -13,14 +13,14 @@ glabel EnDs_Draw /* 00AB8 809FDAE8 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E /* 00ABC 809FDAEC 2718DA7C */ addiu $t8, $t8, %lo(func_809FDA7C) ## $t8 = 809FDA7C /* 00AC0 809FDAF0 25EFDA38 */ addiu $t7, $t7, %lo(func_809FDA38) ## $t7 = 809FDA38 -/* 00AC4 809FDAF4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00AC8 809FDAF8 AFB80014 */ sw $t8, 0x0014($sp) -/* 00ACC 809FDAFC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00AD0 809FDB00 0C0286B2 */ jal func_800A1AC8 -/* 00AD4 809FDB04 AFA20018 */ sw $v0, 0x0018($sp) -/* 00AD8 809FDB08 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00AC4 809FDAF4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00AC8 809FDAF8 AFB80014 */ sw $t8, 0x0014($sp) +/* 00ACC 809FDAFC 8FA4002C */ lw $a0, 0x002C($sp) +/* 00AD0 809FDB00 0C0286B2 */ jal SkelAnime_DrawSV +/* 00AD4 809FDB04 AFA20018 */ sw $v0, 0x0018($sp) +/* 00AD8 809FDB08 8FBF0024 */ lw $ra, 0x0024($sp) /* 00ADC 809FDB0C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AE0 809FDB10 03E00008 */ jr $ra +/* 00AE0 809FDB10 03E00008 */ jr $ra /* 00AE4 809FDB14 00000000 */ nop /* 00AE8 809FDB18 00000000 */ nop /* 00AEC 809FDB1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Init.s index eda442f9cb..36fd0b23f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Init.s @@ -1,15 +1,15 @@ glabel EnDs_Init /* 00000 809FD030 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809FD034 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 809FD034 AFB00028 */ sw $s0, 0x0028($sp) /* 00008 809FD038 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 809FD03C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 809FD040 AFA5003C */ sw $a1, 0x003C($sp) +/* 0000C 809FD03C AFBF002C */ sw $ra, 0x002C($sp) +/* 00010 809FD040 AFA5003C */ sw $a1, 0x003C($sp) /* 00014 809FD044 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00018 809FD048 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0001C 809FD04C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00020 809FD050 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00024 809FD054 0C00AC78 */ jal ActorShape_Init - + /* 00028 809FD058 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 0002C 809FD05C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00030 809FD060 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -17,24 +17,24 @@ glabel EnDs_Init /* 00038 809FD068 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 0003C 809FD06C 260F01B4 */ addiu $t7, $s0, 0x01B4 ## $t7 = 000001B4 /* 00040 809FD070 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00044 809FD074 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 809FD078 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 809FD07C AFAE0010 */ sw $t6, 0x0010($sp) +/* 00044 809FD074 AFB80018 */ sw $t8, 0x0018($sp) +/* 00048 809FD078 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0004C 809FD07C AFAE0010 */ sw $t6, 0x0010($sp) /* 00050 809FD080 24E7039C */ addiu $a3, $a3, 0x039C ## $a3 = 0600039C /* 00054 809FD084 24C64768 */ addiu $a2, $a2, 0x4768 ## $a2 = 06004768 -/* 00058 809FD088 AFA50030 */ sw $a1, 0x0030($sp) -/* 0005C 809FD08C 0C0291BE */ jal func_800A46F8 -/* 00060 809FD090 8FA4003C */ lw $a0, 0x003C($sp) +/* 00058 809FD088 AFA50030 */ sw $a1, 0x0030($sp) +/* 0005C 809FD08C 0C0291BE */ jal SkelAnime_InitSV +/* 00060 809FD090 8FA4003C */ lw $a0, 0x003C($sp) /* 00064 809FD094 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00068 809FD098 24A5039C */ addiu $a1, $a1, 0x039C ## $a1 = 0600039C -/* 0006C 809FD09C 0C02947A */ jal func_800A51E8 -/* 00070 809FD0A0 8FA40030 */ lw $a0, 0x0030($sp) +/* 0006C 809FD09C 0C02947A */ jal func_800A51E8 +/* 00070 809FD0A0 8FA40030 */ lw $a0, 0x0030($sp) /* 00074 809FD0A4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 00078 809FD0A8 3C053C54 */ lui $a1, 0x3C54 ## $a1 = 3C540000 /* 0007C 809FD0AC A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 00080 809FD0B0 34A5FDF4 */ ori $a1, $a1, 0xFDF4 ## $a1 = 3C54FDF4 /* 00084 809FD0B4 0C00B58B */ jal Actor_SetScale - + /* 00088 809FD0B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0008C 809FD0BC 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 00090 809FD0C0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -42,16 +42,16 @@ glabel EnDs_Init /* 00098 809FD0C8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 0009C 809FD0CC 2508D7B4 */ addiu $t0, $t0, %lo(func_809FD7B4) ## $t0 = 809FD7B4 /* 000A0 809FD0D0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 000A4 809FD0D4 01415824 */ and $t3, $t2, $at +/* 000A4 809FD0D4 01415824 */ and $t3, $t2, $at /* 000A8 809FD0D8 AE0801EC */ sw $t0, 0x01EC($s0) ## 000001EC /* 000AC 809FD0DC A209001F */ sb $t1, 0x001F($s0) ## 0000001F /* 000B0 809FD0E0 A60001E8 */ sh $zero, 0x01E8($s0) ## 000001E8 /* 000B4 809FD0E4 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 /* 000B8 809FD0E8 E60401E4 */ swc1 $f4, 0x01E4($s0) ## 000001E4 -/* 000BC 809FD0EC 8FBF002C */ lw $ra, 0x002C($sp) -/* 000C0 809FD0F0 8FB00028 */ lw $s0, 0x0028($sp) +/* 000BC 809FD0EC 8FBF002C */ lw $ra, 0x002C($sp) +/* 000C0 809FD0F0 8FB00028 */ lw $s0, 0x0028($sp) /* 000C4 809FD0F4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000C8 809FD0F8 03E00008 */ jr $ra +/* 000C8 809FD0F8 03E00008 */ jr $ra /* 000CC 809FD0FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s index 3a8bccd96a..ffe7e0b9c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s @@ -1,18 +1,18 @@ glabel EnDu_Destroy /* 0074C 809FE37C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00750 809FE380 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00754 809FE384 AFA40018 */ sw $a0, 0x0018($sp) -/* 00758 809FE388 AFA5001C */ sw $a1, 0x001C($sp) -/* 0075C 809FE38C 0C0295BC */ jal func_800A56F0 +/* 00750 809FE380 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00754 809FE384 AFA40018 */ sw $a0, 0x0018($sp) +/* 00758 809FE388 AFA5001C */ sw $a1, 0x001C($sp) +/* 0075C 809FE38C 0C0295BC */ jal SkelAnime_Free /* 00760 809FE390 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00764 809FE394 8FA50018 */ lw $a1, 0x0018($sp) -/* 00768 809FE398 8FA4001C */ lw $a0, 0x001C($sp) +/* 00764 809FE394 8FA50018 */ lw $a1, 0x0018($sp) +/* 00768 809FE398 8FA4001C */ lw $a0, 0x001C($sp) /* 0076C 809FE39C 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 00770 809FE3A0 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 00774 809FE3A4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00774 809FE3A4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00778 809FE3A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0077C 809FE3AC 03E00008 */ jr $ra +/* 0077C 809FE3AC 03E00008 */ jr $ra /* 00780 809FE3B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s index c746593904..5688b34b71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s @@ -1,65 +1,65 @@ glabel EnDu_Init /* 0057C 809FE1AC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00580 809FE1B0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00580 809FE1B0 AFB00028 */ sw $s0, 0x0028($sp) /* 00584 809FE1B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00588 809FE1B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0058C 809FE1BC AFA5004C */ sw $a1, 0x004C($sp) +/* 00588 809FE1B8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0058C 809FE1BC AFA5004C */ sw $a1, 0x004C($sp) /* 00590 809FE1C0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00594 809FE1C4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00598 809FE1C8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0059C 809FE1CC 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 005A0 809FE1D0 0C00AC78 */ jal ActorShape_Init - + /* 005A4 809FE1D4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 005A8 809FE1D8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 005AC 809FE1DC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 005B0 809FE1E0 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 -/* 005B4 809FE1E4 AFA50038 */ sw $a1, 0x0038($sp) -/* 005B8 809FE1E8 8FA4004C */ lw $a0, 0x004C($sp) +/* 005B4 809FE1E4 AFA50038 */ sw $a1, 0x0038($sp) +/* 005B8 809FE1E8 8FA4004C */ lw $a0, 0x004C($sp) /* 005BC 809FE1EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005C0 809FE1F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 005C4 809FE1F4 AFA00014 */ sw $zero, 0x0014($sp) -/* 005C8 809FE1F8 0C0291BE */ jal func_800A46F8 -/* 005CC 809FE1FC AFA00018 */ sw $zero, 0x0018($sp) +/* 005C0 809FE1F0 AFA00010 */ sw $zero, 0x0010($sp) +/* 005C4 809FE1F4 AFA00014 */ sw $zero, 0x0014($sp) +/* 005C8 809FE1F8 0C0291BE */ jal SkelAnime_InitSV +/* 005CC 809FE1FC AFA00018 */ sw $zero, 0x0018($sp) /* 005D0 809FE200 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 005D4 809FE204 AFA50034 */ sw $a1, 0x0034($sp) +/* 005D4 809FE204 AFA50034 */ sw $a1, 0x0034($sp) /* 005D8 809FE208 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 005DC 809FE20C 8FA4004C */ lw $a0, 0x004C($sp) + +/* 005DC 809FE20C 8FA4004C */ lw $a0, 0x004C($sp) /* 005E0 809FE210 3C0780A0 */ lui $a3, %hi(D_809FF230) ## $a3 = 80A00000 -/* 005E4 809FE214 8FA50034 */ lw $a1, 0x0034($sp) +/* 005E4 809FE214 8FA50034 */ lw $a1, 0x0034($sp) /* 005E8 809FE218 24E7F230 */ addiu $a3, $a3, %lo(D_809FF230) ## $a3 = 809FF230 -/* 005EC 809FE21C 8FA4004C */ lw $a0, 0x004C($sp) +/* 005EC 809FE21C 8FA4004C */ lw $a0, 0x004C($sp) /* 005F0 809FE220 0C01712B */ jal ActorCollider_InitCylinder - + /* 005F4 809FE224 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 005F8 809FE228 0C016C80 */ jal CollisionBtlTbl_Get - + /* 005FC 809FE22C 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 00600 809FE230 3C0680A0 */ lui $a2, %hi(D_809FF25C) ## $a2 = 80A00000 /* 00604 809FE234 24C6F25C */ addiu $a2, $a2, %lo(D_809FF25C) ## $a2 = 809FF25C /* 00608 809FE238 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 0060C 809FE23C 0C0187BF */ jal func_80061EFC +/* 0060C 809FE23C 0C0187BF */ jal func_80061EFC /* 00610 809FE240 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00614 809FE244 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00618 809FE248 0C27F76D */ jal func_809FDDB4 -/* 0061C 809FE24C 8FA5004C */ lw $a1, 0x004C($sp) -/* 00620 809FE250 14400005 */ bne $v0, $zero, .L809FE268 -/* 00624 809FE254 8FA40038 */ lw $a0, 0x0038($sp) +/* 00618 809FE248 0C27F76D */ jal func_809FDDB4 +/* 0061C 809FE24C 8FA5004C */ lw $a1, 0x004C($sp) +/* 00620 809FE250 14400005 */ bne $v0, $zero, .L809FE268 +/* 00624 809FE254 8FA40038 */ lw $a0, 0x0038($sp) /* 00628 809FE258 0C00B55C */ jal Actor_Kill - + /* 0062C 809FE25C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00630 809FE260 10000042 */ beq $zero, $zero, .L809FE36C -/* 00634 809FE264 8FBF002C */ lw $ra, 0x002C($sp) +/* 00630 809FE260 10000042 */ beq $zero, $zero, .L809FE36C +/* 00634 809FE264 8FBF002C */ lw $ra, 0x002C($sp) .L809FE268: /* 00638 809FE268 3C0580A0 */ lui $a1, %hi(D_809FF268) ## $a1 = 80A00000 /* 0063C 809FE26C 24A5F268 */ addiu $a1, $a1, %lo(D_809FF268) ## $a1 = 809FF268 -/* 00640 809FE270 0C00D3B0 */ jal func_80034EC0 +/* 00640 809FE270 0C00D3B0 */ jal func_80034EC0 /* 00644 809FE274 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00648 809FE278 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 0064C 809FE27C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00650 809FE280 0C00B58B */ jal Actor_SetScale - + /* 00654 809FE284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00658 809FE288 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 0065C 809FE28C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -69,62 +69,62 @@ glabel EnDu_Init /* 0066C 809FE29C 8C6F0008 */ lw $t7, 0x0008($v1) ## 8015E668 /* 00670 809FE2A0 3401FFF0 */ ori $at, $zero, 0xFFF0 ## $at = 0000FFF0 /* 00674 809FE2A4 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 00678 809FE2A8 01E1082A */ slt $at, $t7, $at -/* 0067C 809FE2AC 14200018 */ bne $at, $zero, .L809FE310 -/* 00680 809FE2B0 8FAF004C */ lw $t7, 0x004C($sp) +/* 00678 809FE2A8 01E1082A */ slt $at, $t7, $at +/* 0067C 809FE2AC 14200018 */ bne $at, $zero, .L809FE310 +/* 00680 809FE2B0 8FAF004C */ lw $t7, 0x004C($sp) /* 00684 809FE2B4 24426930 */ addiu $v0, $v0, 0x6930 ## $v0 = 02006930 -/* 00688 809FE2B8 0002C100 */ sll $t8, $v0, 4 -/* 0068C 809FE2BC 0018CF02 */ srl $t9, $t8, 28 -/* 00690 809FE2C0 00194080 */ sll $t0, $t9, 2 +/* 00688 809FE2B8 0002C100 */ sll $t8, $v0, 4 +/* 0068C 809FE2BC 0018CF02 */ srl $t9, $t8, 28 +/* 00690 809FE2C0 00194080 */ sll $t0, $t9, 2 /* 00694 809FE2C4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 00698 809FE2C8 01284821 */ addu $t1, $t1, $t0 +/* 00698 809FE2C8 01284821 */ addu $t1, $t1, $t0 /* 0069C 809FE2CC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 006A0 809FE2D0 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 /* 006A4 809FE2D4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 006A8 809FE2D8 00415024 */ and $t2, $v0, $at -/* 006AC 809FE2DC 8FAD004C */ lw $t5, 0x004C($sp) +/* 006A8 809FE2D8 00415024 */ and $t2, $v0, $at +/* 006AC 809FE2DC 8FAD004C */ lw $t5, 0x004C($sp) /* 006B0 809FE2E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 006B4 809FE2E4 012A5821 */ addu $t3, $t1, $t2 -/* 006B8 809FE2E8 01616021 */ addu $t4, $t3, $at +/* 006B4 809FE2E4 012A5821 */ addu $t3, $t1, $t2 +/* 006B8 809FE2E8 01616021 */ addu $t4, $t3, $at /* 006BC 809FE2EC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 006C0 809FE2F0 3C0580A0 */ lui $a1, %hi(func_809FE890) ## $a1 = 80A00000 /* 006C4 809FE2F4 ADAC1D68 */ sw $t4, 0x1D68($t5) ## 00001D68 /* 006C8 809FE2F8 A06E1414 */ sb $t6, 0x1414($v1) ## 8015FA74 /* 006CC 809FE2FC 24A5E890 */ addiu $a1, $a1, %lo(func_809FE890) ## $a1 = 809FE890 -/* 006D0 809FE300 0C27F70C */ jal func_809FDC30 +/* 006D0 809FE300 0C27F70C */ jal func_809FDC30 /* 006D4 809FE304 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006D8 809FE308 10000018 */ beq $zero, $zero, .L809FE36C -/* 006DC 809FE30C 8FBF002C */ lw $ra, 0x002C($sp) +/* 006D8 809FE308 10000018 */ beq $zero, $zero, .L809FE36C +/* 006DC 809FE30C 8FBF002C */ lw $ra, 0x002C($sp) .L809FE310: /* 006E0 809FE310 85F800A4 */ lh $t8, 0x00A4($t7) ## 000000A4 /* 006E4 809FE314 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 006E8 809FE318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006EC 809FE31C 17010005 */ bne $t8, $at, .L809FE334 +/* 006EC 809FE31C 17010005 */ bne $t8, $at, .L809FE334 /* 006F0 809FE320 3C0580A0 */ lui $a1, %hi(func_809FE638) ## $a1 = 80A00000 -/* 006F4 809FE324 0C27F70C */ jal func_809FDC30 +/* 006F4 809FE324 0C27F70C */ jal func_809FDC30 /* 006F8 809FE328 24A5E638 */ addiu $a1, $a1, %lo(func_809FE638) ## $a1 = 809FE638 -/* 006FC 809FE32C 1000000F */ beq $zero, $zero, .L809FE36C -/* 00700 809FE330 8FBF002C */ lw $ra, 0x002C($sp) +/* 006FC 809FE32C 1000000F */ beq $zero, $zero, .L809FE36C +/* 00700 809FE330 8FBF002C */ lw $ra, 0x002C($sp) .L809FE334: /* 00704 809FE334 8C790004 */ lw $t9, 0x0004($v1) ## 00000004 /* 00708 809FE338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0070C 809FE33C 3C0580A0 */ lui $a1, %hi(func_809FE3B4) ## $a1 = 80A00000 -/* 00710 809FE340 13200007 */ beq $t9, $zero, .L809FE360 +/* 00710 809FE340 13200007 */ beq $t9, $zero, .L809FE360 /* 00714 809FE344 00000000 */ nop /* 00718 809FE348 3C0580A0 */ lui $a1, %hi(func_809FE3C0) ## $a1 = 80A00000 /* 0071C 809FE34C 24A5E3C0 */ addiu $a1, $a1, %lo(func_809FE3C0) ## $a1 = 809FE3C0 -/* 00720 809FE350 0C27F70C */ jal func_809FDC30 +/* 00720 809FE350 0C27F70C */ jal func_809FDC30 /* 00724 809FE354 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00728 809FE358 10000004 */ beq $zero, $zero, .L809FE36C -/* 0072C 809FE35C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00728 809FE358 10000004 */ beq $zero, $zero, .L809FE36C +/* 0072C 809FE35C 8FBF002C */ lw $ra, 0x002C($sp) .L809FE360: -/* 00730 809FE360 0C27F70C */ jal func_809FDC30 +/* 00730 809FE360 0C27F70C */ jal func_809FDC30 /* 00734 809FE364 24A5E3B4 */ addiu $a1, $a1, %lo(func_809FE3B4) ## $a1 = FFFFE3B4 -/* 00738 809FE368 8FBF002C */ lw $ra, 0x002C($sp) +/* 00738 809FE368 8FBF002C */ lw $ra, 0x002C($sp) .L809FE36C: -/* 0073C 809FE36C 8FB00028 */ lw $s0, 0x0028($sp) +/* 0073C 809FE36C 8FB00028 */ lw $s0, 0x0028($sp) /* 00740 809FE370 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00744 809FE374 03E00008 */ jr $ra +/* 00744 809FE374 03E00008 */ jr $ra /* 00748 809FE378 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s index a00141bf1c..b361328423 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s @@ -1,24 +1,24 @@ glabel EnEiyer_Draw /* 0183C 80A017DC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 01840 80A017E0 AFB20030 */ sw $s2, 0x0030($sp) +/* 01840 80A017E0 AFB20030 */ sw $s2, 0x0030($sp) /* 01844 80A017E4 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 01848 80A017E8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0184C 80A017EC AFB1002C */ sw $s1, 0x002C($sp) -/* 01850 80A017F0 AFB00028 */ sw $s0, 0x0028($sp) +/* 01848 80A017E8 AFBF0034 */ sw $ra, 0x0034($sp) +/* 0184C 80A017EC AFB1002C */ sw $s1, 0x002C($sp) +/* 01850 80A017F0 AFB00028 */ sw $s0, 0x0028($sp) /* 01854 80A017F4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01858 80A017F8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 0185C 80A017FC 3C0680A0 */ lui $a2, %hi(D_80A019D0) ## $a2 = 80A00000 /* 01860 80A01800 24C619D0 */ addiu $a2, $a2, %lo(D_80A019D0) ## $a2 = 80A019D0 /* 01864 80A01804 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 01868 80A01808 240705D6 */ addiu $a3, $zero, 0x05D6 ## $a3 = 000005D6 -/* 0186C 80A0180C 0C031AB1 */ jal func_800C6AC4 +/* 0186C 80A0180C 0C031AB1 */ jal func_800C6AC4 /* 01870 80A01810 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01874 80A01814 8E2F0190 */ lw $t7, 0x0190($s1) ## 00000190 /* 01878 80A01818 3C0E80A0 */ lui $t6, %hi(func_80A012F4) ## $t6 = 80A00000 /* 0187C 80A0181C 25CE12F4 */ addiu $t6, $t6, %lo(func_80A012F4) ## $t6 = 80A012F4 -/* 01880 80A01820 11CF001F */ beq $t6, $t7, .L80A018A0 +/* 01880 80A01820 11CF001F */ beq $t6, $t7, .L80A018A0 /* 01884 80A01824 00000000 */ nop -/* 01888 80A01828 0C024F46 */ jal func_80093D18 +/* 01888 80A01828 0C024F46 */ jal func_80093D18 /* 0188C 80A0182C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01890 80A01830 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 01894 80A01834 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -38,18 +38,18 @@ glabel EnEiyer_Draw /* 018CC 80A0186C AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 018D0 80A01870 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 018D4 80A01874 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 018D8 80A01878 AFB10014 */ sw $s1, 0x0014($sp) -/* 018DC 80A0187C AFA00010 */ sw $zero, 0x0010($sp) +/* 018D8 80A01878 AFB10014 */ sw $s1, 0x0014($sp) +/* 018DC 80A0187C AFA00010 */ sw $zero, 0x0010($sp) /* 018E0 80A01880 8E0C02C0 */ lw $t4, 0x02C0($s0) ## 000002C0 /* 018E4 80A01884 3C0780A0 */ lui $a3, %hi(func_80A0178C) ## $a3 = 80A00000 /* 018E8 80A01888 24E7178C */ addiu $a3, $a3, %lo(func_80A0178C) ## $a3 = 80A0178C /* 018EC 80A0188C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 018F0 80A01890 0C0288A2 */ jal func_800A2288 -/* 018F4 80A01894 AFAC0018 */ sw $t4, 0x0018($sp) -/* 018F8 80A01898 10000020 */ beq $zero, $zero, .L80A0191C +/* 018F0 80A01890 0C0288A2 */ jal SkelAnime_Draw2 +/* 018F4 80A01894 AFAC0018 */ sw $t4, 0x0018($sp) +/* 018F8 80A01898 10000020 */ beq $zero, $zero, .L80A0191C /* 018FC 80A0189C AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L80A018A0: -/* 01900 80A018A0 0C024F61 */ jal func_80093D84 +/* 01900 80A018A0 0C024F61 */ jal func_80093D84 /* 01904 80A018A4 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01908 80A018A8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 0190C 80A018AC 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -73,25 +73,25 @@ glabel EnEiyer_Draw /* 01954 80A018F4 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 01958 80A018F8 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 0195C 80A018FC 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 01960 80A01900 AFB10014 */ sw $s1, 0x0014($sp) -/* 01964 80A01904 AFA00010 */ sw $zero, 0x0010($sp) +/* 01960 80A01900 AFB10014 */ sw $s1, 0x0014($sp) +/* 01964 80A01904 AFA00010 */ sw $zero, 0x0010($sp) /* 01968 80A01908 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 /* 0196C 80A0190C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01970 80A01910 0C0288A2 */ jal func_800A2288 -/* 01974 80A01914 AFAB0018 */ sw $t3, 0x0018($sp) +/* 01970 80A01910 0C0288A2 */ jal SkelAnime_Draw2 +/* 01974 80A01914 AFAB0018 */ sw $t3, 0x0018($sp) /* 01978 80A01918 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80A0191C: /* 0197C 80A0191C 3C0680A0 */ lui $a2, %hi(D_80A019E0) ## $a2 = 80A00000 /* 01980 80A01920 24C619E0 */ addiu $a2, $a2, %lo(D_80A019E0) ## $a2 = 80A019E0 /* 01984 80A01924 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 01988 80A01928 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0198C 80A0192C 0C031AD5 */ jal func_800C6B54 +/* 0198C 80A0192C 0C031AD5 */ jal func_800C6B54 /* 01990 80A01930 24070605 */ addiu $a3, $zero, 0x0605 ## $a3 = 00000605 -/* 01994 80A01934 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01998 80A01938 8FB00028 */ lw $s0, 0x0028($sp) -/* 0199C 80A0193C 8FB1002C */ lw $s1, 0x002C($sp) -/* 019A0 80A01940 8FB20030 */ lw $s2, 0x0030($sp) -/* 019A4 80A01944 03E00008 */ jr $ra +/* 01994 80A01934 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01998 80A01938 8FB00028 */ lw $s0, 0x0028($sp) +/* 0199C 80A0193C 8FB1002C */ lw $s1, 0x002C($sp) +/* 019A0 80A01940 8FB20030 */ lw $s2, 0x0030($sp) +/* 019A4 80A01944 03E00008 */ jr $ra /* 019A8 80A01948 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 019AC 80A0194C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s index 5ea8058cf1..5ef062509e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s @@ -1,13 +1,13 @@ glabel func_80A00218 /* 00278 80A00218 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0027C 80A0021C AFB00018 */ sw $s0, 0x0018($sp) +/* 0027C 80A0021C AFB00018 */ sw $s0, 0x0018($sp) /* 00280 80A00220 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00284 80A00224 AFBF001C */ sw $ra, 0x001C($sp) +/* 00284 80A00224 AFBF001C */ sw $ra, 0x001C($sp) /* 00288 80A00228 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 /* 0028C 80A0022C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00290 80A00230 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 /* 00294 80A00234 24A512AC */ addiu $a1, $a1, 0x12AC ## $a1 = 060012AC -/* 00298 80A00238 0C0294BE */ jal func_800A52F8 +/* 00298 80A00238 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 0029C 80A0023C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 002A0 80A00240 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 002A4 80A00244 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 @@ -15,7 +15,7 @@ glabel func_80A00218 /* 002AC 80A0024C C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C /* 002B0 80A00250 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 002B4 80A00254 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 002B8 80A00258 46083281 */ sub.s $f10, $f6, $f8 +/* 002B8 80A00258 46083281 */ sub.s $f10, $f6, $f8 /* 002BC 80A0025C C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 /* 002C0 80A00260 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 002C4 80A00264 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -23,9 +23,9 @@ glabel func_80A00218 /* 002CC 80A0026C E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 002D0 80A00270 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C /* 002D4 80A00274 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -/* 002D8 80A00278 10410016 */ beq $v0, $at, .L80A002D4 +/* 002D8 80A00278 10410016 */ beq $v0, $at, .L80A002D4 /* 002DC 80A0027C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 002E0 80A00280 5440000C */ bnel $v0, $zero, .L80A002B4 +/* 002E0 80A00280 5440000C */ bnel $v0, $zero, .L80A002B4 /* 002E4 80A00284 8E190118 */ lw $t9, 0x0118($s0) ## 00000118 /* 002E8 80A00288 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -33,21 +33,21 @@ glabel func_80A00218 /* 002F0 80A00290 3C014780 */ lui $at, 0x4780 ## $at = 47800000 /* 002F4 80A00294 44813000 */ mtc1 $at, $f6 ## $f6 = 65536.00 /* 002F8 80A00298 00000000 */ nop -/* 002FC 80A0029C 46060202 */ mul.s $f8, $f0, $f6 -/* 00300 80A002A0 4600428D */ trunc.w.s $f10, $f8 -/* 00304 80A002A4 44185000 */ mfc1 $t8, $f10 -/* 00308 80A002A8 10000006 */ beq $zero, $zero, .L80A002C4 +/* 002FC 80A0029C 46060202 */ mul.s $f8, $f0, $f6 +/* 00300 80A002A0 4600428D */ trunc.w.s $f10, $f8 +/* 00304 80A002A4 44185000 */ mfc1 $t8, $f10 +/* 00308 80A002A8 10000006 */ beq $zero, $zero, .L80A002C4 /* 0030C 80A002AC A6180032 */ sh $t8, 0x0032($s0) ## 00000032 /* 00310 80A002B0 8E190118 */ lw $t9, 0x0118($s0) ## 00000118 .L80A002B4: -/* 00314 80A002B4 00024B80 */ sll $t1, $v0, 14 +/* 00314 80A002B4 00024B80 */ sll $t1, $v0, 14 /* 00318 80A002B8 87280032 */ lh $t0, 0x0032($t9) ## 00000032 -/* 0031C 80A002BC 01095021 */ addu $t2, $t0, $t1 +/* 0031C 80A002BC 01095021 */ addu $t2, $t0, $t1 /* 00320 80A002C0 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 .L80A002C4: -/* 00324 80A002C4 0C280069 */ jal func_80A001A4 +/* 00324 80A002C4 0C280069 */ jal func_80A001A4 /* 00328 80A002C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0032C 80A002CC 1000000D */ beq $zero, $zero, .L80A00304 +/* 0032C 80A002CC 1000000D */ beq $zero, $zero, .L80A00304 /* 00330 80A002D0 920C0298 */ lbu $t4, 0x0298($s0) ## 00000298 .L80A002D4: /* 00334 80A002D4 0C03F66B */ jal Math_Rand_ZeroOne @@ -56,9 +56,9 @@ glabel func_80A00218 /* 0033C 80A002DC 3C014780 */ lui $at, 0x4780 ## $at = 47800000 /* 00340 80A002E0 44818000 */ mtc1 $at, $f16 ## $f16 = 65536.00 /* 00344 80A002E4 00000000 */ nop -/* 00348 80A002E8 46100482 */ mul.s $f18, $f0, $f16 -/* 0034C 80A002EC 4600910D */ trunc.w.s $f4, $f18 -/* 00350 80A002F0 44022000 */ mfc1 $v0, $f4 +/* 00348 80A002E8 46100482 */ mul.s $f18, $f0, $f16 +/* 0034C 80A002EC 4600910D */ trunc.w.s $f4, $f18 +/* 00350 80A002F0 44022000 */ mfc1 $v0, $f4 /* 00354 80A002F4 00000000 */ nop /* 00358 80A002F8 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 /* 0035C 80A002FC A6020032 */ sh $v0, 0x0032($s0) ## 00000032 @@ -73,17 +73,17 @@ glabel func_80A00218 /* 0037C 80A0031C 25080858 */ addiu $t0, $t0, %lo(func_80A00858) ## $t0 = 80A00858 /* 00380 80A00320 318DFFFE */ andi $t5, $t4, 0xFFFE ## $t5 = 00000000 /* 00384 80A00324 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 -/* 00388 80A00328 0301C824 */ and $t9, $t8, $at +/* 00388 80A00328 0301C824 */ and $t9, $t8, $at /* 0038C 80A0032C A20D0298 */ sb $t5, 0x0298($s0) ## 00000298 /* 00390 80A00330 A20F0299 */ sb $t7, 0x0299($s0) ## 00000299 /* 00394 80A00334 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 00398 80A00338 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 /* 0039C 80A0033C E60600C4 */ swc1 $f6, 0x00C4($s0) ## 000000C4 /* 003A0 80A00340 E60800BC */ swc1 $f8, 0x00BC($s0) ## 000000BC -/* 003A4 80A00344 8FBF001C */ lw $ra, 0x001C($sp) -/* 003A8 80A00348 8FB00018 */ lw $s0, 0x0018($sp) +/* 003A4 80A00344 8FBF001C */ lw $ra, 0x001C($sp) +/* 003A8 80A00348 8FB00018 */ lw $s0, 0x0018($sp) /* 003AC 80A0034C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 003B0 80A00350 03E00008 */ jr $ra +/* 003B0 80A00350 03E00008 */ jr $ra /* 003B4 80A00354 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s index ff0a2adb0d..739816bd51 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s @@ -1,34 +1,34 @@ glabel func_80A004BC /* 0051C 80A004BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00520 80A004C0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00520 80A004C0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00524 80A004C4 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 /* 00528 80A004C8 3C0180A0 */ lui $at, %hi(D_80A019F0) ## $at = 80A00000 /* 0052C 80A004CC A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -/* 00530 80A004D0 AFA40018 */ sw $a0, 0x0018($sp) +/* 00530 80A004D0 AFA40018 */ sw $a0, 0x0018($sp) /* 00534 80A004D4 0C041184 */ jal cosf - -/* 00538 80A004D8 C42C19F0 */ lwc1 $f12, %lo(D_80A019F0)($at) + +/* 00538 80A004D8 C42C19F0 */ lwc1 $f12, %lo(D_80A019F0)($at) /* 0053C 80A004DC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00540 80A004E0 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 00544 80A004E4 8FA70018 */ lw $a3, 0x0018($sp) +/* 00544 80A004E4 8FA70018 */ lw $a3, 0x0018($sp) /* 00548 80A004E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0054C 80A004EC 46040182 */ mul.s $f6, $f0, $f4 +/* 0054C 80A004EC 46040182 */ mul.s $f6, $f0, $f4 /* 00550 80A004F0 C4E80028 */ lwc1 $f8, 0x0028($a3) ## 00000028 /* 00554 80A004F4 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 00558 80A004F8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0055C 80A004FC 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 00560 80A00500 46083280 */ add.s $f10, $f6, $f8 -/* 00564 80A00504 0C0294D3 */ jal func_800A534C +/* 00560 80A00500 46083280 */ add.s $f10, $f6, $f8 +/* 00564 80A00504 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00568 80A00508 E4EA0280 */ swc1 $f10, 0x0280($a3) ## 00000280 -/* 0056C 80A0050C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0056C 80A0050C 8FA70018 */ lw $a3, 0x0018($sp) /* 00570 80A00510 3C1880A0 */ lui $t8, %hi(func_80A00C70) ## $t8 = 80A00000 /* 00574 80A00514 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C /* 00578 80A00518 27180C70 */ addiu $t8, $t8, %lo(func_80A00C70) ## $t8 = 80A00C70 /* 0057C 80A0051C A4EF0194 */ sh $t7, 0x0194($a3) ## 00000194 /* 00580 80A00520 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 00584 80A00524 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00584 80A00524 8FBF0014 */ lw $ra, 0x0014($sp) /* 00588 80A00528 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0058C 80A0052C 03E00008 */ jr $ra +/* 0058C 80A0052C 03E00008 */ jr $ra /* 00590 80A00530 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s index 9e2319719f..406ed0c659 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s @@ -1,34 +1,34 @@ glabel func_80A006B0 /* 00710 80A006B0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00714 80A006B4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00718 80A006B8 AFB00020 */ sw $s0, 0x0020($sp) +/* 00714 80A006B4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00718 80A006B8 AFB00020 */ sw $s0, 0x0020($sp) /* 0071C 80A006BC 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 /* 00720 80A006C0 A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 /* 00724 80A006C4 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 /* 00728 80A006C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0072C 80A006CC AFAF0010 */ sw $t7, 0x0010($sp) +/* 0072C 80A006CC AFAF0010 */ sw $t7, 0x0010($sp) /* 00730 80A006D0 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 00734 80A006D4 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 00738 80A006D8 0C00D09B */ jal func_8003426C +/* 00738 80A006D8 0C00D09B */ jal func_8003426C /* 0073C 80A006DC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00740 80A006E0 8E1802A8 */ lw $t8, 0x02A8($s0) ## 000002A8 /* 00744 80A006E4 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 00748 80A006E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0074C 80A006EC 13010009 */ beq $t8, $at, .L80A00714 +/* 0074C 80A006EC 13010009 */ beq $t8, $at, .L80A00714 /* 00750 80A006F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00754 80A006F4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00758 80A006F8 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 /* 0075C 80A006FC 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 00760 80A00700 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00764 80A00704 0C0294D3 */ jal func_800A534C +/* 00764 80A00704 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00768 80A00708 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 0076C 80A0070C 10000007 */ beq $zero, $zero, .L80A0072C +/* 0076C 80A0070C 10000007 */ beq $zero, $zero, .L80A0072C /* 00770 80A00710 92080298 */ lbu $t0, 0x0298($s0) ## 00000298 .L80A00714: /* 00774 80A00714 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00778 80A00718 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 /* 0077C 80A0071C C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 00780 80A00720 46083281 */ sub.s $f10, $f6, $f8 +/* 00780 80A00720 46083281 */ sub.s $f10, $f6, $f8 /* 00784 80A00724 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 00788 80A00728 92080298 */ lbu $t0, 0x0298($s0) ## 00000298 .L80A0072C: @@ -43,10 +43,10 @@ glabel func_80A006B0 /* 007AC 80A0074C A2090298 */ sb $t1, 0x0298($s0) ## 00000298 /* 007B0 80A00750 A20B0299 */ sb $t3, 0x0299($s0) ## 00000299 /* 007B4 80A00754 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 007B8 80A00758 8FBF0024 */ lw $ra, 0x0024($sp) -/* 007BC 80A0075C 8FB00020 */ lw $s0, 0x0020($sp) +/* 007B8 80A00758 8FBF0024 */ lw $ra, 0x0024($sp) +/* 007BC 80A0075C 8FB00020 */ lw $s0, 0x0020($sp) /* 007C0 80A00760 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 007C4 80A00764 03E00008 */ jr $ra +/* 007C4 80A00764 03E00008 */ jr $ra /* 007C8 80A00768 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s index 2b2d241d5a..17112aaac0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s @@ -1,80 +1,80 @@ glabel EnElf_Draw /* 03C28 80A05858 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 03C2C 80A0585C AFBF002C */ sw $ra, 0x002C($sp) -/* 03C30 80A05860 AFB00028 */ sw $s0, 0x0028($sp) +/* 03C2C 80A0585C AFBF002C */ sw $ra, 0x002C($sp) +/* 03C30 80A05860 AFB00028 */ sw $s0, 0x0028($sp) /* 03C34 80A05864 848E02A8 */ lh $t6, 0x02A8($a0) ## 000002A8 /* 03C38 80A05868 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 03C3C 80A0586C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 03C40 80A05870 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 03C44 80A05874 11C101A1 */ beq $t6, $at, .L80A05EFC +/* 03C44 80A05874 11C101A1 */ beq $t6, $at, .L80A05EFC /* 03C48 80A05878 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 /* 03C4C 80A0587C 948F02C4 */ lhu $t7, 0x02C4($a0) ## 000002C4 /* 03C50 80A05880 31F80008 */ andi $t8, $t7, 0x0008 ## $t8 = 00000000 -/* 03C54 80A05884 5700019E */ bnel $t8, $zero, .L80A05F00 -/* 03C58 80A05888 8FBF002C */ lw $ra, 0x002C($sp) +/* 03C54 80A05884 5700019E */ bnel $t8, $zero, .L80A05F00 +/* 03C58 80A05888 8FBF002C */ lw $ra, 0x002C($sp) /* 03C5C 80A0588C 8C59067C */ lw $t9, 0x067C($v0) ## 0000067C /* 03C60 80A05890 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 03C64 80A05894 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 03C68 80A05898 001952C0 */ sll $t2, $t9, 11 -/* 03C6C 80A0589C 0543000C */ bgezl $t2, .L80A058D0 +/* 03C68 80A05898 001952C0 */ sll $t2, $t9, 11 +/* 03C6C 80A0589C 0543000C */ bgezl $t2, .L80A058D0 /* 03C70 80A058A0 8CC40000 */ lw $a0, 0x0000($a2) ## 00000000 /* 03C74 80A058A4 8D6BFA90 */ lw $t3, -0x0570($t3) ## 8015FA90 /* 03C78 80A058A8 C48800EC */ lwc1 $f8, 0x00EC($a0) ## 000000EC /* 03C7C 80A058AC 856C1508 */ lh $t4, 0x1508($t3) ## 80161508 /* 03C80 80A058B0 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 /* 03C84 80A058B4 00000000 */ nop -/* 03C88 80A058B8 468021A0 */ cvt.s.w $f6, $f4 -/* 03C8C 80A058BC 4608303C */ c.lt.s $f6, $f8 +/* 03C88 80A058B8 468021A0 */ cvt.s.w $f6, $f4 +/* 03C8C 80A058BC 4608303C */ c.lt.s $f6, $f8 /* 03C90 80A058C0 00000000 */ nop -/* 03C94 80A058C4 4502018E */ bc1fl .L80A05F00 -/* 03C98 80A058C8 8FBF002C */ lw $ra, 0x002C($sp) +/* 03C94 80A058C4 4502018E */ bc1fl .L80A05F00 +/* 03C98 80A058C8 8FBF002C */ lw $ra, 0x002C($sp) /* 03C9C 80A058CC 8CC40000 */ lw $a0, 0x0000($a2) ## 00000000 .L80A058D0: /* 03CA0 80A058D0 0C031A73 */ jal Graph_Alloc - -/* 03CA4 80A058D4 AFA60084 */ sw $a2, 0x0084($sp) -/* 03CA8 80A058D8 8FAD0084 */ lw $t5, 0x0084($sp) + +/* 03CA4 80A058D4 AFA60084 */ sw $a2, 0x0084($sp) +/* 03CA8 80A058D8 8FAD0084 */ lw $t5, 0x0084($sp) /* 03CAC 80A058DC 3C0680A0 */ lui $a2, %hi(D_80A06124) ## $a2 = 80A00000 /* 03CB0 80A058E0 24C66124 */ addiu $a2, $a2, %lo(D_80A06124) ## $a2 = 80A06124 /* 03CB4 80A058E4 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 03CB8 80A058E8 AFA20068 */ sw $v0, 0x0068($sp) +/* 03CB8 80A058E8 AFA20068 */ sw $v0, 0x0068($sp) /* 03CBC 80A058EC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 03CC0 80A058F0 24070AAA */ addiu $a3, $zero, 0x0AAA ## $a3 = 00000AAA -/* 03CC4 80A058F4 0C031AB1 */ jal func_800C6AC4 -/* 03CC8 80A058F8 AFA50060 */ sw $a1, 0x0060($sp) -/* 03CCC 80A058FC 8FAE0084 */ lw $t6, 0x0084($sp) -/* 03CD0 80A05900 0C0252D6 */ jal func_80094B58 +/* 03CC4 80A058F4 0C031AB1 */ jal func_800C6AC4 +/* 03CC8 80A058F8 AFA50060 */ sw $a1, 0x0060($sp) +/* 03CCC 80A058FC 8FAE0084 */ lw $t6, 0x0084($sp) +/* 03CD0 80A05900 0C0252D6 */ jal func_80094B58 /* 03CD4 80A05904 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 /* 03CD8 80A05908 960402BE */ lhu $a0, 0x02BE($s0) ## 000002BE -/* 03CDC 80A0590C 8FA80068 */ lw $t0, 0x0068($sp) -/* 03CE0 80A05910 8FA90060 */ lw $t1, 0x0060($sp) -/* 03CE4 80A05914 00800821 */ addu $at, $a0, $zero -/* 03CE8 80A05918 00042080 */ sll $a0, $a0, 2 -/* 03CEC 80A0591C 00812023 */ subu $a0, $a0, $at -/* 03CF0 80A05920 000420C0 */ sll $a0, $a0, 3 -/* 03CF4 80A05924 00812021 */ addu $a0, $a0, $at -/* 03CF8 80A05928 00042040 */ sll $a0, $a0, 1 +/* 03CDC 80A0590C 8FA80068 */ lw $t0, 0x0068($sp) +/* 03CE0 80A05910 8FA90060 */ lw $t1, 0x0060($sp) +/* 03CE4 80A05914 00800821 */ addu $at, $a0, $zero +/* 03CE8 80A05918 00042080 */ sll $a0, $a0, 2 +/* 03CEC 80A0591C 00812023 */ subu $a0, $a0, $at +/* 03CF0 80A05920 000420C0 */ sll $a0, $a0, 3 +/* 03CF4 80A05924 00812021 */ addu $a0, $a0, $at +/* 03CF8 80A05928 00042040 */ sll $a0, $a0, 1 /* 03CFC 80A0592C 308401FF */ andi $a0, $a0, 0x01FF ## $a0 = 00000000 -/* 03D00 80A05930 28810100 */ slti $at, $a0, 0x0100 -/* 03D04 80A05934 14200003 */ bne $at, $zero, .L80A05944 +/* 03D00 80A05930 28810100 */ slti $at, $a0, 0x0100 +/* 03D04 80A05934 14200003 */ bne $at, $zero, .L80A05944 /* 03D08 80A05938 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 03D0C 80A0593C 240F01FF */ addiu $t7, $zero, 0x01FF ## $t7 = 000001FF -/* 03D10 80A05940 01E42023 */ subu $a0, $t7, $a0 +/* 03D10 80A05940 01E42023 */ subu $a0, $t7, $a0 .L80A05944: /* 03D14 80A05944 860202C2 */ lh $v0, 0x02C2($s0) ## 000002C2 /* 03D18 80A05948 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 03D1C 80A0594C 3C0AE700 */ lui $t2, 0xE700 ## $t2 = E7000000 -/* 03D20 80A05950 0441000A */ bgez $v0, .L80A0597C +/* 03D20 80A05950 0441000A */ bgez $v0, .L80A0597C /* 03D24 80A05954 3C0BFA00 */ lui $t3, 0xFA00 ## $t3 = FA000000 /* 03D28 80A05958 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 03D2C 80A0595C 3C0180A0 */ lui $at, %hi(D_80A0623C) ## $at = 80A00000 -/* 03D30 80A05960 C432623C */ lwc1 $f18, %lo(D_80A0623C)($at) -/* 03D34 80A05964 46805420 */ cvt.s.w $f16, $f10 +/* 03D30 80A05960 C432623C */ lwc1 $f18, %lo(D_80A0623C)($at) +/* 03D34 80A05964 46805420 */ cvt.s.w $f16, $f10 /* 03D38 80A05968 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03D3C 80A0596C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 03D40 80A05970 46128102 */ mul.s $f4, $f16, $f18 -/* 03D44 80A05974 10000004 */ beq $zero, $zero, .L80A05988 -/* 03D48 80A05978 46062000 */ add.s $f0, $f4, $f6 +/* 03D40 80A05970 46128102 */ mul.s $f4, $f16, $f18 +/* 03D44 80A05974 10000004 */ beq $zero, $zero, .L80A05988 +/* 03D48 80A05978 46062000 */ add.s $f0, $f4, $f6 .L80A0597C: /* 03D4C 80A0597C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03D50 80A05980 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -98,72 +98,72 @@ glabel EnElf_Draw /* 03D94 80A059C4 C6080244 */ lwc1 $f8, 0x0244($s0) ## 00000244 /* 03D98 80A059C8 3C0780A0 */ lui $a3, %hi(func_80A05734) ## $a3 = 80A00000 /* 03D9C 80A059CC 25080008 */ addiu $t0, $t0, 0x0008 ## $t0 = 00000010 -/* 03DA0 80A059D0 460042A4 */ cvt.w.s $f10, $f8 +/* 03DA0 80A059D0 460042A4 */ cvt.w.s $f10, $f8 /* 03DA4 80A059D4 24E75734 */ addiu $a3, $a3, %lo(func_80A05734) ## $a3 = 80A05734 /* 03DA8 80A059D8 444DF800 */ cfc1 $t5, $31 /* 03DAC 80A059DC 00000000 */ nop /* 03DB0 80A059E0 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 03DB4 80A059E4 11A00012 */ beq $t5, $zero, .L80A05A30 +/* 03DB4 80A059E4 11A00012 */ beq $t5, $zero, .L80A05A30 /* 03DB8 80A059E8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 03DBC 80A059EC 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 03DC0 80A059F0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 03DC4 80A059F4 460A4281 */ sub.s $f10, $f8, $f10 +/* 03DC4 80A059F4 460A4281 */ sub.s $f10, $f8, $f10 /* 03DC8 80A059F8 44CDF800 */ ctc1 $t5, $31 /* 03DCC 80A059FC 00000000 */ nop -/* 03DD0 80A05A00 460052A4 */ cvt.w.s $f10, $f10 +/* 03DD0 80A05A00 460052A4 */ cvt.w.s $f10, $f10 /* 03DD4 80A05A04 444DF800 */ cfc1 $t5, $31 /* 03DD8 80A05A08 00000000 */ nop /* 03DDC 80A05A0C 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 03DE0 80A05A10 15A00005 */ bne $t5, $zero, .L80A05A28 +/* 03DE0 80A05A10 15A00005 */ bne $t5, $zero, .L80A05A28 /* 03DE4 80A05A14 00000000 */ nop -/* 03DE8 80A05A18 440D5000 */ mfc1 $t5, $f10 +/* 03DE8 80A05A18 440D5000 */ mfc1 $t5, $f10 /* 03DEC 80A05A1C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03DF0 80A05A20 10000007 */ beq $zero, $zero, .L80A05A40 +/* 03DF0 80A05A20 10000007 */ beq $zero, $zero, .L80A05A40 /* 03DF4 80A05A24 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 .L80A05A28: -/* 03DF8 80A05A28 10000005 */ beq $zero, $zero, .L80A05A40 +/* 03DF8 80A05A28 10000005 */ beq $zero, $zero, .L80A05A40 /* 03DFC 80A05A2C 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF .L80A05A30: -/* 03E00 80A05A30 440D5000 */ mfc1 $t5, $f10 +/* 03E00 80A05A30 440D5000 */ mfc1 $t5, $f10 /* 03E04 80A05A34 00000000 */ nop -/* 03E08 80A05A38 05A0FFFB */ bltz $t5, .L80A05A28 +/* 03E08 80A05A38 05A0FFFB */ bltz $t5, .L80A05A28 /* 03E0C 80A05A3C 00000000 */ nop .L80A05A40: /* 03E10 80A05A40 44CCF800 */ ctc1 $t4, $31 /* 03E14 80A05A44 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 03E18 80A05A48 C6100248 */ lwc1 $f16, 0x0248($s0) ## 00000248 -/* 03E1C 80A05A4C 000DC600 */ sll $t8, $t5, 24 +/* 03E1C 80A05A4C 000DC600 */ sll $t8, $t5, 24 /* 03E20 80A05A50 4459F800 */ cfc1 $t9, $31 /* 03E24 80A05A54 44CAF800 */ ctc1 $t2, $31 /* 03E28 80A05A58 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03E2C 80A05A5C 460084A4 */ cvt.w.s $f18, $f16 +/* 03E2C 80A05A5C 460084A4 */ cvt.w.s $f18, $f16 /* 03E30 80A05A60 444AF800 */ cfc1 $t2, $31 /* 03E34 80A05A64 00000000 */ nop /* 03E38 80A05A68 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 03E3C 80A05A6C 51400013 */ beql $t2, $zero, .L80A05ABC -/* 03E40 80A05A70 440A9000 */ mfc1 $t2, $f18 +/* 03E3C 80A05A6C 51400013 */ beql $t2, $zero, .L80A05ABC +/* 03E40 80A05A70 440A9000 */ mfc1 $t2, $f18 /* 03E44 80A05A74 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 /* 03E48 80A05A78 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 03E4C 80A05A7C 46128481 */ sub.s $f18, $f16, $f18 +/* 03E4C 80A05A7C 46128481 */ sub.s $f18, $f16, $f18 /* 03E50 80A05A80 44CAF800 */ ctc1 $t2, $31 /* 03E54 80A05A84 00000000 */ nop -/* 03E58 80A05A88 460094A4 */ cvt.w.s $f18, $f18 +/* 03E58 80A05A88 460094A4 */ cvt.w.s $f18, $f18 /* 03E5C 80A05A8C 444AF800 */ cfc1 $t2, $31 /* 03E60 80A05A90 00000000 */ nop /* 03E64 80A05A94 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 03E68 80A05A98 15400005 */ bne $t2, $zero, .L80A05AB0 +/* 03E68 80A05A98 15400005 */ bne $t2, $zero, .L80A05AB0 /* 03E6C 80A05A9C 00000000 */ nop -/* 03E70 80A05AA0 440A9000 */ mfc1 $t2, $f18 +/* 03E70 80A05AA0 440A9000 */ mfc1 $t2, $f18 /* 03E74 80A05AA4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03E78 80A05AA8 10000007 */ beq $zero, $zero, .L80A05AC8 +/* 03E78 80A05AA8 10000007 */ beq $zero, $zero, .L80A05AC8 /* 03E7C 80A05AAC 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 .L80A05AB0: -/* 03E80 80A05AB0 10000005 */ beq $zero, $zero, .L80A05AC8 +/* 03E80 80A05AB0 10000005 */ beq $zero, $zero, .L80A05AC8 /* 03E84 80A05AB4 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 03E88 80A05AB8 440A9000 */ mfc1 $t2, $f18 +/* 03E88 80A05AB8 440A9000 */ mfc1 $t2, $f18 .L80A05ABC: /* 03E8C 80A05ABC 00000000 */ nop -/* 03E90 80A05AC0 0540FFFB */ bltz $t2, .L80A05AB0 +/* 03E90 80A05AC0 0540FFFB */ bltz $t2, .L80A05AB0 /* 03E94 80A05AC4 00000000 */ nop .L80A05AC8: /* 03E98 80A05AC8 44D9F800 */ ctc1 $t9, $31 @@ -172,45 +172,45 @@ glabel EnElf_Draw /* 03EA4 80A05AD4 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 000000FF /* 03EA8 80A05AD8 444FF800 */ cfc1 $t7, $31 /* 03EAC 80A05ADC 44D9F800 */ ctc1 $t9, $31 -/* 03EB0 80A05AE0 000C6C00 */ sll $t5, $t4, 16 +/* 03EB0 80A05AE0 000C6C00 */ sll $t5, $t4, 16 /* 03EB4 80A05AE4 030D7025 */ or $t6, $t8, $t5 ## $t6 = FFFFFFFF -/* 03EB8 80A05AE8 460021A4 */ cvt.w.s $f6, $f4 +/* 03EB8 80A05AE8 460021A4 */ cvt.w.s $f6, $f4 /* 03EBC 80A05AEC 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 03EC0 80A05AF0 4459F800 */ cfc1 $t9, $31 /* 03EC4 80A05AF4 00000000 */ nop /* 03EC8 80A05AF8 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 03ECC 80A05AFC 53200013 */ beql $t9, $zero, .L80A05B4C -/* 03ED0 80A05B00 44193000 */ mfc1 $t9, $f6 +/* 03ECC 80A05AFC 53200013 */ beql $t9, $zero, .L80A05B4C +/* 03ED0 80A05B00 44193000 */ mfc1 $t9, $f6 /* 03ED4 80A05B04 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 /* 03ED8 80A05B08 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 03EDC 80A05B0C 46062181 */ sub.s $f6, $f4, $f6 +/* 03EDC 80A05B0C 46062181 */ sub.s $f6, $f4, $f6 /* 03EE0 80A05B10 44D9F800 */ ctc1 $t9, $31 /* 03EE4 80A05B14 00000000 */ nop -/* 03EE8 80A05B18 460031A4 */ cvt.w.s $f6, $f6 +/* 03EE8 80A05B18 460031A4 */ cvt.w.s $f6, $f6 /* 03EEC 80A05B1C 4459F800 */ cfc1 $t9, $31 /* 03EF0 80A05B20 00000000 */ nop /* 03EF4 80A05B24 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 03EF8 80A05B28 17200005 */ bne $t9, $zero, .L80A05B40 +/* 03EF8 80A05B28 17200005 */ bne $t9, $zero, .L80A05B40 /* 03EFC 80A05B2C 00000000 */ nop -/* 03F00 80A05B30 44193000 */ mfc1 $t9, $f6 +/* 03F00 80A05B30 44193000 */ mfc1 $t9, $f6 /* 03F04 80A05B34 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03F08 80A05B38 10000007 */ beq $zero, $zero, .L80A05B58 +/* 03F08 80A05B38 10000007 */ beq $zero, $zero, .L80A05B58 /* 03F0C 80A05B3C 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L80A05B40: -/* 03F10 80A05B40 10000005 */ beq $zero, $zero, .L80A05B58 +/* 03F10 80A05B40 10000005 */ beq $zero, $zero, .L80A05B58 /* 03F14 80A05B44 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 03F18 80A05B48 44193000 */ mfc1 $t9, $f6 +/* 03F18 80A05B48 44193000 */ mfc1 $t9, $f6 .L80A05B4C: /* 03F1C 80A05B4C 00000000 */ nop -/* 03F20 80A05B50 0720FFFB */ bltz $t9, .L80A05B40 +/* 03F20 80A05B50 0720FFFB */ bltz $t9, .L80A05B40 /* 03F24 80A05B54 00000000 */ nop .L80A05B58: /* 03F28 80A05B58 44CFF800 */ ctc1 $t7, $31 /* 03F2C 80A05B5C C6080250 */ lwc1 $f8, 0x0250($s0) ## 00000250 /* 03F30 80A05B60 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 03F34 80A05B64 332B00FF */ andi $t3, $t9, 0x00FF ## $t3 = 000000FF -/* 03F38 80A05B68 46004282 */ mul.s $f10, $f8, $f0 -/* 03F3C 80A05B6C 000B6200 */ sll $t4, $t3, 8 +/* 03F38 80A05B68 46004282 */ mul.s $f10, $f8, $f0 +/* 03F3C 80A05B6C 000B6200 */ sll $t4, $t3, 8 /* 03F40 80A05B70 3C19E200 */ lui $t9, 0xE200 ## $t9 = E2000000 /* 03F44 80A05B74 01CCC025 */ or $t8, $t6, $t4 ## $t8 = FFFFFFFF /* 03F48 80A05B78 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 @@ -218,34 +218,34 @@ glabel EnElf_Draw /* 03F50 80A05B80 444DF800 */ cfc1 $t5, $31 /* 03F54 80A05B84 44CFF800 */ ctc1 $t7, $31 /* 03F58 80A05B88 00000000 */ nop -/* 03F5C 80A05B8C 46005424 */ cvt.w.s $f16, $f10 +/* 03F5C 80A05B8C 46005424 */ cvt.w.s $f16, $f10 /* 03F60 80A05B90 444FF800 */ cfc1 $t7, $31 /* 03F64 80A05B94 00000000 */ nop /* 03F68 80A05B98 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 03F6C 80A05B9C 51E00013 */ beql $t7, $zero, .L80A05BEC -/* 03F70 80A05BA0 440F8000 */ mfc1 $t7, $f16 +/* 03F6C 80A05B9C 51E00013 */ beql $t7, $zero, .L80A05BEC +/* 03F70 80A05BA0 440F8000 */ mfc1 $t7, $f16 /* 03F74 80A05BA4 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 /* 03F78 80A05BA8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03F7C 80A05BAC 46105401 */ sub.s $f16, $f10, $f16 +/* 03F7C 80A05BAC 46105401 */ sub.s $f16, $f10, $f16 /* 03F80 80A05BB0 44CFF800 */ ctc1 $t7, $31 /* 03F84 80A05BB4 00000000 */ nop -/* 03F88 80A05BB8 46008424 */ cvt.w.s $f16, $f16 +/* 03F88 80A05BB8 46008424 */ cvt.w.s $f16, $f16 /* 03F8C 80A05BBC 444FF800 */ cfc1 $t7, $31 /* 03F90 80A05BC0 00000000 */ nop /* 03F94 80A05BC4 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 03F98 80A05BC8 15E00005 */ bne $t7, $zero, .L80A05BE0 +/* 03F98 80A05BC8 15E00005 */ bne $t7, $zero, .L80A05BE0 /* 03F9C 80A05BCC 00000000 */ nop -/* 03FA0 80A05BD0 440F8000 */ mfc1 $t7, $f16 +/* 03FA0 80A05BD0 440F8000 */ mfc1 $t7, $f16 /* 03FA4 80A05BD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03FA8 80A05BD8 10000007 */ beq $zero, $zero, .L80A05BF8 +/* 03FA8 80A05BD8 10000007 */ beq $zero, $zero, .L80A05BF8 /* 03FAC 80A05BDC 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 .L80A05BE0: -/* 03FB0 80A05BE0 10000005 */ beq $zero, $zero, .L80A05BF8 +/* 03FB0 80A05BE0 10000005 */ beq $zero, $zero, .L80A05BF8 /* 03FB4 80A05BE4 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 03FB8 80A05BE8 440F8000 */ mfc1 $t7, $f16 +/* 03FB8 80A05BE8 440F8000 */ mfc1 $t7, $f16 .L80A05BEC: /* 03FBC 80A05BEC 00000000 */ nop -/* 03FC0 80A05BF0 05E0FFFB */ bltz $t7, .L80A05BE0 +/* 03FC0 80A05BF0 05E0FFFB */ bltz $t7, .L80A05BE0 /* 03FC4 80A05BF4 00000000 */ nop .L80A05BF8: /* 03FC8 80A05BF8 31EA00FF */ andi $t2, $t7, 0x00FF ## $t2 = 000000FF @@ -255,7 +255,7 @@ glabel EnElf_Draw /* 03FD8 80A05C08 44CDF800 */ ctc1 $t5, $31 /* 03FDC 80A05C0C 3C0ADF00 */ lui $t2, 0xDF00 ## $t2 = DF000000 /* 03FE0 80A05C10 31CC0004 */ andi $t4, $t6, 0x0004 ## $t4 = 00000004 -/* 03FE4 80A05C14 1180000A */ beq $t4, $zero, .L80A05C40 +/* 03FE4 80A05C14 1180000A */ beq $t4, $zero, .L80A05C40 /* 03FE8 80A05C18 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 /* 03FEC 80A05C1C 01001025 */ or $v0, $t0, $zero ## $v0 = 00000010 /* 03FF0 80A05C20 3C0DE200 */ lui $t5, 0xE200 ## $t5 = E2000000 @@ -264,7 +264,7 @@ glabel EnElf_Draw /* 03FFC 80A05C2C 35AD001C */ ori $t5, $t5, 0x001C ## $t5 = E200001C /* 04000 80A05C30 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000010 /* 04004 80A05C34 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000014 -/* 04008 80A05C38 10000007 */ beq $zero, $zero, .L80A05C58 +/* 04008 80A05C38 10000007 */ beq $zero, $zero, .L80A05C58 /* 0400C 80A05C3C 25080008 */ addiu $t0, $t0, 0x0008 ## $t0 = 00000018 .L80A05C40: /* 04010 80A05C40 01001025 */ or $v0, $t0, $zero ## $v0 = 00000018 @@ -285,71 +285,71 @@ glabel EnElf_Draw /* 04048 80A05C78 44CDF800 */ ctc1 $t5, $31 /* 0404C 80A05C7C C6120254 */ lwc1 $f18, 0x0254($s0) ## 00000254 /* 04050 80A05C80 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 04054 80A05C84 46009124 */ cvt.w.s $f4, $f18 +/* 04054 80A05C84 46009124 */ cvt.w.s $f4, $f18 /* 04058 80A05C88 444DF800 */ cfc1 $t5, $31 /* 0405C 80A05C8C 00000000 */ nop /* 04060 80A05C90 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 04064 80A05C94 51A00013 */ beql $t5, $zero, .L80A05CE4 -/* 04068 80A05C98 440D2000 */ mfc1 $t5, $f4 +/* 04064 80A05C94 51A00013 */ beql $t5, $zero, .L80A05CE4 +/* 04068 80A05C98 440D2000 */ mfc1 $t5, $f4 /* 0406C 80A05C9C 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 04070 80A05CA0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 04074 80A05CA4 46049101 */ sub.s $f4, $f18, $f4 +/* 04074 80A05CA4 46049101 */ sub.s $f4, $f18, $f4 /* 04078 80A05CA8 44CDF800 */ ctc1 $t5, $31 /* 0407C 80A05CAC 00000000 */ nop -/* 04080 80A05CB0 46002124 */ cvt.w.s $f4, $f4 +/* 04080 80A05CB0 46002124 */ cvt.w.s $f4, $f4 /* 04084 80A05CB4 444DF800 */ cfc1 $t5, $31 /* 04088 80A05CB8 00000000 */ nop /* 0408C 80A05CBC 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 04090 80A05CC0 15A00005 */ bne $t5, $zero, .L80A05CD8 +/* 04090 80A05CC0 15A00005 */ bne $t5, $zero, .L80A05CD8 /* 04094 80A05CC4 00000000 */ nop -/* 04098 80A05CC8 440D2000 */ mfc1 $t5, $f4 +/* 04098 80A05CC8 440D2000 */ mfc1 $t5, $f4 /* 0409C 80A05CCC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 040A0 80A05CD0 10000007 */ beq $zero, $zero, .L80A05CF0 +/* 040A0 80A05CD0 10000007 */ beq $zero, $zero, .L80A05CF0 /* 040A4 80A05CD4 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 .L80A05CD8: -/* 040A8 80A05CD8 10000005 */ beq $zero, $zero, .L80A05CF0 +/* 040A8 80A05CD8 10000005 */ beq $zero, $zero, .L80A05CF0 /* 040AC 80A05CDC 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 040B0 80A05CE0 440D2000 */ mfc1 $t5, $f4 +/* 040B0 80A05CE0 440D2000 */ mfc1 $t5, $f4 .L80A05CE4: /* 040B4 80A05CE4 00000000 */ nop -/* 040B8 80A05CE8 05A0FFFB */ bltz $t5, .L80A05CD8 +/* 040B8 80A05CE8 05A0FFFB */ bltz $t5, .L80A05CD8 /* 040BC 80A05CEC 00000000 */ nop .L80A05CF0: /* 040C0 80A05CF0 44CCF800 */ ctc1 $t4, $31 /* 040C4 80A05CF4 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 040C8 80A05CF8 C6060258 */ lwc1 $f6, 0x0258($s0) ## 00000258 -/* 040CC 80A05CFC 000DC600 */ sll $t8, $t5, 24 +/* 040CC 80A05CFC 000DC600 */ sll $t8, $t5, 24 /* 040D0 80A05D00 444AF800 */ cfc1 $t2, $31 /* 040D4 80A05D04 44CBF800 */ ctc1 $t3, $31 /* 040D8 80A05D08 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 040DC 80A05D0C 46003224 */ cvt.w.s $f8, $f6 +/* 040DC 80A05D0C 46003224 */ cvt.w.s $f8, $f6 /* 040E0 80A05D10 444BF800 */ cfc1 $t3, $31 /* 040E4 80A05D14 00000000 */ nop /* 040E8 80A05D18 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 040EC 80A05D1C 51600013 */ beql $t3, $zero, .L80A05D6C -/* 040F0 80A05D20 440B4000 */ mfc1 $t3, $f8 +/* 040EC 80A05D1C 51600013 */ beql $t3, $zero, .L80A05D6C +/* 040F0 80A05D20 440B4000 */ mfc1 $t3, $f8 /* 040F4 80A05D24 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 /* 040F8 80A05D28 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 040FC 80A05D2C 46083201 */ sub.s $f8, $f6, $f8 +/* 040FC 80A05D2C 46083201 */ sub.s $f8, $f6, $f8 /* 04100 80A05D30 44CBF800 */ ctc1 $t3, $31 /* 04104 80A05D34 00000000 */ nop -/* 04108 80A05D38 46004224 */ cvt.w.s $f8, $f8 +/* 04108 80A05D38 46004224 */ cvt.w.s $f8, $f8 /* 0410C 80A05D3C 444BF800 */ cfc1 $t3, $31 /* 04110 80A05D40 00000000 */ nop /* 04114 80A05D44 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 04118 80A05D48 15600005 */ bne $t3, $zero, .L80A05D60 +/* 04118 80A05D48 15600005 */ bne $t3, $zero, .L80A05D60 /* 0411C 80A05D4C 00000000 */ nop -/* 04120 80A05D50 440B4000 */ mfc1 $t3, $f8 +/* 04120 80A05D50 440B4000 */ mfc1 $t3, $f8 /* 04124 80A05D54 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04128 80A05D58 10000007 */ beq $zero, $zero, .L80A05D78 +/* 04128 80A05D58 10000007 */ beq $zero, $zero, .L80A05D78 /* 0412C 80A05D5C 01615825 */ or $t3, $t3, $at ## $t3 = 80000000 .L80A05D60: -/* 04130 80A05D60 10000005 */ beq $zero, $zero, .L80A05D78 +/* 04130 80A05D60 10000005 */ beq $zero, $zero, .L80A05D78 /* 04134 80A05D64 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 04138 80A05D68 440B4000 */ mfc1 $t3, $f8 +/* 04138 80A05D68 440B4000 */ mfc1 $t3, $f8 .L80A05D6C: /* 0413C 80A05D6C 00000000 */ nop -/* 04140 80A05D70 0560FFFB */ bltz $t3, .L80A05D60 +/* 04140 80A05D70 0560FFFB */ bltz $t3, .L80A05D60 /* 04144 80A05D74 00000000 */ nop .L80A05D78: /* 04148 80A05D78 44CAF800 */ ctc1 $t2, $31 @@ -358,79 +358,79 @@ glabel EnElf_Draw /* 04154 80A05D84 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 000000FF /* 04158 80A05D88 4459F800 */ cfc1 $t9, $31 /* 0415C 80A05D8C 44CAF800 */ ctc1 $t2, $31 -/* 04160 80A05D90 000C6C00 */ sll $t5, $t4, 16 +/* 04160 80A05D90 000C6C00 */ sll $t5, $t4, 16 /* 04164 80A05D94 030D7825 */ or $t7, $t8, $t5 ## $t7 = FFFFFFFF -/* 04168 80A05D98 46005424 */ cvt.w.s $f16, $f10 +/* 04168 80A05D98 46005424 */ cvt.w.s $f16, $f10 /* 0416C 80A05D9C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 04170 80A05DA0 444AF800 */ cfc1 $t2, $31 /* 04174 80A05DA4 00000000 */ nop /* 04178 80A05DA8 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 0417C 80A05DAC 51400013 */ beql $t2, $zero, .L80A05DFC -/* 04180 80A05DB0 440A8000 */ mfc1 $t2, $f16 +/* 0417C 80A05DAC 51400013 */ beql $t2, $zero, .L80A05DFC +/* 04180 80A05DB0 440A8000 */ mfc1 $t2, $f16 /* 04184 80A05DB4 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 /* 04188 80A05DB8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0418C 80A05DBC 46105401 */ sub.s $f16, $f10, $f16 +/* 0418C 80A05DBC 46105401 */ sub.s $f16, $f10, $f16 /* 04190 80A05DC0 44CAF800 */ ctc1 $t2, $31 /* 04194 80A05DC4 00000000 */ nop -/* 04198 80A05DC8 46008424 */ cvt.w.s $f16, $f16 +/* 04198 80A05DC8 46008424 */ cvt.w.s $f16, $f16 /* 0419C 80A05DCC 444AF800 */ cfc1 $t2, $31 /* 041A0 80A05DD0 00000000 */ nop /* 041A4 80A05DD4 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 041A8 80A05DD8 15400005 */ bne $t2, $zero, .L80A05DF0 +/* 041A8 80A05DD8 15400005 */ bne $t2, $zero, .L80A05DF0 /* 041AC 80A05DDC 00000000 */ nop -/* 041B0 80A05DE0 440A8000 */ mfc1 $t2, $f16 +/* 041B0 80A05DE0 440A8000 */ mfc1 $t2, $f16 /* 041B4 80A05DE4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 041B8 80A05DE8 10000007 */ beq $zero, $zero, .L80A05E08 +/* 041B8 80A05DE8 10000007 */ beq $zero, $zero, .L80A05E08 /* 041BC 80A05DEC 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 .L80A05DF0: -/* 041C0 80A05DF0 10000005 */ beq $zero, $zero, .L80A05E08 +/* 041C0 80A05DF0 10000005 */ beq $zero, $zero, .L80A05E08 /* 041C4 80A05DF4 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 041C8 80A05DF8 440A8000 */ mfc1 $t2, $f16 +/* 041C8 80A05DF8 440A8000 */ mfc1 $t2, $f16 .L80A05DFC: /* 041CC 80A05DFC 00000000 */ nop -/* 041D0 80A05E00 0540FFFB */ bltz $t2, .L80A05DF0 +/* 041D0 80A05E00 0540FFFB */ bltz $t2, .L80A05DF0 /* 041D4 80A05E04 00000000 */ nop .L80A05E08: /* 041D8 80A05E08 44D9F800 */ ctc1 $t9, $31 /* 041DC 80A05E0C 44849000 */ mtc1 $a0, $f18 ## $f18 = 0.00 /* 041E0 80A05E10 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 041E4 80A05E14 314E00FF */ andi $t6, $t2, 0x00FF ## $t6 = 000000FF -/* 041E8 80A05E18 46809120 */ cvt.s.w $f4, $f18 -/* 041EC 80A05E1C 000E6200 */ sll $t4, $t6, 8 +/* 041E8 80A05E18 46809120 */ cvt.s.w $f4, $f18 +/* 041EC 80A05E1C 000E6200 */ sll $t4, $t6, 8 /* 041F0 80A05E20 01ECC025 */ or $t8, $t7, $t4 ## $t8 = FFFFFFFF /* 041F4 80A05E24 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 041F8 80A05E28 46002182 */ mul.s $f6, $f4, $f0 +/* 041F8 80A05E28 46002182 */ mul.s $f6, $f4, $f0 /* 041FC 80A05E2C 444DF800 */ cfc1 $t5, $31 /* 04200 80A05E30 44D9F800 */ ctc1 $t9, $31 /* 04204 80A05E34 00000000 */ nop -/* 04208 80A05E38 46003224 */ cvt.w.s $f8, $f6 +/* 04208 80A05E38 46003224 */ cvt.w.s $f8, $f6 /* 0420C 80A05E3C 4459F800 */ cfc1 $t9, $31 /* 04210 80A05E40 00000000 */ nop /* 04214 80A05E44 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 04218 80A05E48 53200013 */ beql $t9, $zero, .L80A05E98 -/* 0421C 80A05E4C 44194000 */ mfc1 $t9, $f8 +/* 04218 80A05E48 53200013 */ beql $t9, $zero, .L80A05E98 +/* 0421C 80A05E4C 44194000 */ mfc1 $t9, $f8 /* 04220 80A05E50 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 /* 04224 80A05E54 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 04228 80A05E58 46083201 */ sub.s $f8, $f6, $f8 +/* 04228 80A05E58 46083201 */ sub.s $f8, $f6, $f8 /* 0422C 80A05E5C 44D9F800 */ ctc1 $t9, $31 /* 04230 80A05E60 00000000 */ nop -/* 04234 80A05E64 46004224 */ cvt.w.s $f8, $f8 +/* 04234 80A05E64 46004224 */ cvt.w.s $f8, $f8 /* 04238 80A05E68 4459F800 */ cfc1 $t9, $31 /* 0423C 80A05E6C 00000000 */ nop /* 04240 80A05E70 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 04244 80A05E74 17200005 */ bne $t9, $zero, .L80A05E8C +/* 04244 80A05E74 17200005 */ bne $t9, $zero, .L80A05E8C /* 04248 80A05E78 00000000 */ nop -/* 0424C 80A05E7C 44194000 */ mfc1 $t9, $f8 +/* 0424C 80A05E7C 44194000 */ mfc1 $t9, $f8 /* 04250 80A05E80 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04254 80A05E84 10000007 */ beq $zero, $zero, .L80A05EA4 +/* 04254 80A05E84 10000007 */ beq $zero, $zero, .L80A05EA4 /* 04258 80A05E88 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L80A05E8C: -/* 0425C 80A05E8C 10000005 */ beq $zero, $zero, .L80A05EA4 +/* 0425C 80A05E8C 10000005 */ beq $zero, $zero, .L80A05EA4 /* 04260 80A05E90 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 04264 80A05E94 44194000 */ mfc1 $t9, $f8 +/* 04264 80A05E94 44194000 */ mfc1 $t9, $f8 .L80A05E98: /* 04268 80A05E98 00000000 */ nop -/* 0426C 80A05E9C 0720FFFB */ bltz $t9, .L80A05E8C +/* 0426C 80A05E9C 0720FFFB */ bltz $t9, .L80A05E8C /* 04270 80A05EA0 00000000 */ nop .L80A05EA4: /* 04274 80A05EA4 332B00FF */ andi $t3, $t9, 0x00FF ## $t3 = 000000FF @@ -438,29 +438,29 @@ glabel EnElf_Draw /* 0427C 80A05EAC AC4E0004 */ sw $t6, 0x0004($v0) ## 0000001C /* 04280 80A05EB0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 04284 80A05EB4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 04288 80A05EB8 AFB00014 */ sw $s0, 0x0014($sp) -/* 0428C 80A05EBC AFA00010 */ sw $zero, 0x0010($sp) +/* 04288 80A05EB8 AFB00014 */ sw $s0, 0x0014($sp) +/* 0428C 80A05EBC AFA00010 */ sw $zero, 0x0010($sp) /* 04290 80A05EC0 8D2F02D0 */ lw $t7, 0x02D0($t1) ## 000002D0 /* 04294 80A05EC4 44CDF800 */ ctc1 $t5, $31 -/* 04298 80A05EC8 AFA90060 */ sw $t1, 0x0060($sp) -/* 0429C 80A05ECC 8FA40084 */ lw $a0, 0x0084($sp) -/* 042A0 80A05ED0 0C0288A2 */ jal func_800A2288 -/* 042A4 80A05ED4 AFAF0018 */ sw $t7, 0x0018($sp) -/* 042A8 80A05ED8 8FA90060 */ lw $t1, 0x0060($sp) +/* 04298 80A05EC8 AFA90060 */ sw $t1, 0x0060($sp) +/* 0429C 80A05ECC 8FA40084 */ lw $a0, 0x0084($sp) +/* 042A0 80A05ED0 0C0288A2 */ jal SkelAnime_Draw2 +/* 042A4 80A05ED4 AFAF0018 */ sw $t7, 0x0018($sp) +/* 042A8 80A05ED8 8FA90060 */ lw $t1, 0x0060($sp) /* 042AC 80A05EDC 3C0680A0 */ lui $a2, %hi(D_80A06134) ## $a2 = 80A00000 /* 042B0 80A05EE0 24C66134 */ addiu $a2, $a2, %lo(D_80A06134) ## $a2 = 80A06134 /* 042B4 80A05EE4 AD2202D0 */ sw $v0, 0x02D0($t1) ## 000002D0 -/* 042B8 80A05EE8 8FAC0084 */ lw $t4, 0x0084($sp) +/* 042B8 80A05EE8 8FAC0084 */ lw $t4, 0x0084($sp) /* 042BC 80A05EEC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 042C0 80A05EF0 24070AE9 */ addiu $a3, $zero, 0x0AE9 ## $a3 = 00000AE9 -/* 042C4 80A05EF4 0C031AD5 */ jal func_800C6B54 +/* 042C4 80A05EF4 0C031AD5 */ jal func_800C6B54 /* 042C8 80A05EF8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 .L80A05EFC: -/* 042CC 80A05EFC 8FBF002C */ lw $ra, 0x002C($sp) +/* 042CC 80A05EFC 8FBF002C */ lw $ra, 0x002C($sp) .L80A05F00: -/* 042D0 80A05F00 8FB00028 */ lw $s0, 0x0028($sp) +/* 042D0 80A05F00 8FB00028 */ lw $s0, 0x0028($sp) /* 042D4 80A05F04 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 042D8 80A05F08 03E00008 */ jr $ra +/* 042D8 80A05F08 03E00008 */ jr $ra /* 042DC 80A05F0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s index 42e30d077f..3863ea3247 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s @@ -1,10 +1,10 @@ glabel EnFd_Draw /* 0195C 80A0D01C 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 01960 80A0D020 3C0F80A1 */ lui $t7, %hi(D_80A0E0D0) ## $t7 = 80A10000 -/* 01964 80A0D024 AFBF003C */ sw $ra, 0x003C($sp) -/* 01968 80A0D028 AFB10038 */ sw $s1, 0x0038($sp) -/* 0196C 80A0D02C AFB00034 */ sw $s0, 0x0034($sp) -/* 01970 80A0D030 AFA500A4 */ sw $a1, 0x00A4($sp) +/* 01964 80A0D024 AFBF003C */ sw $ra, 0x003C($sp) +/* 01968 80A0D028 AFB10038 */ sw $s1, 0x0038($sp) +/* 0196C 80A0D02C AFB00034 */ sw $s0, 0x0034($sp) +/* 01970 80A0D030 AFA500A4 */ sw $a1, 0x00A4($sp) /* 01974 80A0D034 25EFE0D0 */ addiu $t7, $t7, %lo(D_80A0E0D0) ## $t7 = 80A0E0D0 /* 01978 80A0D038 8DF90000 */ lw $t9, 0x0000($t7) ## 80A0E0D0 /* 0197C 80A0D03C 27AE008C */ addiu $t6, $sp, 0x008C ## $t6 = FFFFFFEC @@ -23,53 +23,53 @@ glabel EnFd_Draw /* 019B0 80A0D070 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFE4 /* 019B4 80A0D074 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 019B8 80A0D078 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE8 -/* 019BC 80A0D07C 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 019BC 80A0D07C 8FAC00A4 */ lw $t4, 0x00A4($sp) /* 019C0 80A0D080 3C0680A1 */ lui $a2, %hi(D_80A0E120) ## $a2 = 80A10000 /* 019C4 80A0D084 24C6E120 */ addiu $a2, $a2, %lo(D_80A0E120) ## $a2 = 80A0E120 /* 019C8 80A0D088 8D8D009C */ lw $t5, 0x009C($t4) ## 0000009C /* 019CC 80A0D08C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFC4 /* 019D0 80A0D090 240706D7 */ addiu $a3, $zero, 0x06D7 ## $a3 = 000006D7 -/* 019D4 80A0D094 AFAD007C */ sw $t5, 0x007C($sp) +/* 019D4 80A0D094 AFAD007C */ sw $t5, 0x007C($sp) /* 019D8 80A0D098 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 019DC 80A0D09C 0C031AB1 */ jal func_800C6AC4 +/* 019DC 80A0D09C 0C031AB1 */ jal func_800C6AC4 /* 019E0 80A0D0A0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 019E4 80A0D0A4 0C034213 */ jal Matrix_Push +/* 019E4 80A0D0A4 0C034213 */ jal Matrix_Push /* 019E8 80A0D0A8 00000000 */ nop /* 019EC 80A0D0AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 019F0 80A0D0B0 0C2836D1 */ jal func_80A0DB44 -/* 019F4 80A0D0B4 8FA500A4 */ lw $a1, 0x00A4($sp) +/* 019F0 80A0D0B0 0C2836D1 */ jal func_80A0DB44 +/* 019F4 80A0D0B4 8FA500A4 */ lw $a1, 0x00A4($sp) /* 019F8 80A0D0B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 019FC 80A0D0BC 0C2835CC */ jal func_80A0D730 -/* 01A00 80A0D0C0 8FA500A4 */ lw $a1, 0x00A4($sp) -/* 01A04 80A0D0C4 0C034221 */ jal Matrix_Pull +/* 019FC 80A0D0BC 0C2835CC */ jal func_80A0D730 +/* 01A00 80A0D0C0 8FA500A4 */ lw $a1, 0x00A4($sp) +/* 01A04 80A0D0C4 0C034221 */ jal Matrix_Pull /* 01A08 80A0D0C8 00000000 */ nop /* 01A0C 80A0D0CC 8E2F0190 */ lw $t7, 0x0190($s1) ## 00000190 /* 01A10 80A0D0D0 3C0E80A1 */ lui $t6, %hi(func_80A0C310) ## $t6 = 80A10000 /* 01A14 80A0D0D4 25CEC310 */ addiu $t6, $t6, %lo(func_80A0C310) ## $t6 = 80A0C310 -/* 01A18 80A0D0D8 11CF00C0 */ beq $t6, $t7, .L80A0D3DC +/* 01A18 80A0D0D8 11CF00C0 */ beq $t6, $t7, .L80A0D3DC /* 01A1C 80A0D0DC 3C0180A1 */ lui $at, %hi(D_80A0E1D8) ## $at = 80A10000 /* 01A20 80A0D0E0 C62404CC */ lwc1 $f4, 0x04CC($s1) ## 000004CC -/* 01A24 80A0D0E4 C426E1D8 */ lwc1 $f6, %lo(D_80A0E1D8)($at) -/* 01A28 80A0D0E8 8FB800A4 */ lw $t8, 0x00A4($sp) -/* 01A2C 80A0D0EC 4606203C */ c.lt.s $f4, $f6 +/* 01A24 80A0D0E4 C426E1D8 */ lwc1 $f6, %lo(D_80A0E1D8)($at) +/* 01A28 80A0D0E8 8FB800A4 */ lw $t8, 0x00A4($sp) +/* 01A2C 80A0D0EC 4606203C */ c.lt.s $f4, $f6 /* 01A30 80A0D0F0 00000000 */ nop -/* 01A34 80A0D0F4 450300BA */ bc1tl .L80A0D3E0 -/* 01A38 80A0D0F8 8FA800A4 */ lw $t0, 0x00A4($sp) -/* 01A3C 80A0D0FC 0C024F61 */ jal func_80093D84 +/* 01A34 80A0D0F4 450300BA */ bc1tl .L80A0D3E0 +/* 01A38 80A0D0F8 8FA800A4 */ lw $t0, 0x00A4($sp) +/* 01A3C 80A0D0FC 0C024F61 */ jal func_80093D84 /* 01A40 80A0D100 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 01A44 80A0D104 922200AF */ lbu $v0, 0x00AF($s1) ## 000000AF /* 01A48 80A0D108 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 /* 01A4C 80A0D10C 35080080 */ ori $t0, $t0, 0x0080 ## $t0 = FA000080 /* 01A50 80A0D110 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = FFFFFFFF -/* 01A54 80A0D114 04410003 */ bgez $v0, .L80A0D124 +/* 01A54 80A0D114 04410003 */ bgez $v0, .L80A0D124 /* 01A58 80A0D118 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01A5C 80A0D11C 10000007 */ beq $zero, $zero, .L80A0D13C +/* 01A5C 80A0D11C 10000007 */ beq $zero, $zero, .L80A0D13C /* 01A60 80A0D120 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 .L80A0D124: -/* 01A64 80A0D124 28410018 */ slti $at, $v0, 0x0018 -/* 01A68 80A0D128 14200003 */ bne $at, $zero, .L80A0D138 +/* 01A64 80A0D124 28410018 */ slti $at, $v0, 0x0018 +/* 01A68 80A0D128 14200003 */ bne $at, $zero, .L80A0D138 /* 01A6C 80A0D12C 00401825 */ or $v1, $v0, $zero ## $v1 = FFFFFFFF -/* 01A70 80A0D130 10000001 */ beq $zero, $zero, .L80A0D138 +/* 01A70 80A0D130 10000001 */ beq $zero, $zero, .L80A0D138 /* 01A74 80A0D134 24030017 */ addiu $v1, $zero, 0x0017 ## $v1 = 00000017 .L80A0D138: /* 01A78 80A0D138 00602825 */ or $a1, $v1, $zero ## $a1 = 00000017 @@ -82,53 +82,53 @@ glabel EnFd_Draw /* 01A90 80A0D150 AC480000 */ sw $t0, 0x0000($v0) ## FFFFFFFF /* 01A94 80A0D154 C62804CC */ lwc1 $f8, 0x04CC($s1) ## 000004CC /* 01A98 80A0D158 00402025 */ or $a0, $v0, $zero ## $a0 = FFFFFFFF -/* 01A9C 80A0D15C 04A10003 */ bgez $a1, .L80A0D16C -/* 01AA0 80A0D160 000530C3 */ sra $a2, $a1, 3 +/* 01A9C 80A0D15C 04A10003 */ bgez $a1, .L80A0D16C +/* 01AA0 80A0D160 000530C3 */ sra $a2, $a1, 3 /* 01AA4 80A0D164 24A10007 */ addiu $at, $a1, 0x0007 ## $at = 0000001E -/* 01AA8 80A0D168 000130C3 */ sra $a2, $at, 3 +/* 01AA8 80A0D168 000130C3 */ sra $a2, $at, 3 .L80A0D16C: -/* 01AAC 80A0D16C 00063080 */ sll $a2, $a2, 2 -/* 01AB0 80A0D170 00C91821 */ addu $v1, $a2, $t1 +/* 01AAC 80A0D16C 00063080 */ sll $a2, $a2, 2 +/* 01AB0 80A0D170 00C91821 */ addu $v1, $a2, $t1 /* 01AB4 80A0D174 906B0002 */ lbu $t3, 0x0002($v1) ## 00000019 /* 01AB8 80A0D178 906E0000 */ lbu $t6, 0x0000($v1) ## 00000017 /* 01ABC 80A0D17C 90680001 */ lbu $t0, 0x0001($v1) ## 00000018 -/* 01AC0 80A0D180 000B6A00 */ sll $t5, $t3, 8 +/* 01AC0 80A0D180 000B6A00 */ sll $t5, $t3, 8 /* 01AC4 80A0D184 444BF800 */ cfc1 $t3, $31 /* 01AC8 80A0D188 44CCF800 */ ctc1 $t4, $31 -/* 01ACC 80A0D18C 000E7E00 */ sll $t7, $t6, 24 +/* 01ACC 80A0D18C 000E7E00 */ sll $t7, $t6, 24 /* 01AD0 80A0D190 01AFC025 */ or $t8, $t5, $t7 ## $t8 = 00000000 -/* 01AD4 80A0D194 460042A4 */ cvt.w.s $f10, $f8 -/* 01AD8 80A0D198 00084C00 */ sll $t1, $t0, 16 +/* 01AD4 80A0D194 460042A4 */ cvt.w.s $f10, $f8 +/* 01AD8 80A0D198 00084C00 */ sll $t1, $t0, 16 /* 01ADC 80A0D19C 03095025 */ or $t2, $t8, $t1 ## $t2 = FFFFFFEC /* 01AE0 80A0D1A0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 01AE4 80A0D1A4 444CF800 */ cfc1 $t4, $31 /* 01AE8 80A0D1A8 27B80080 */ addiu $t8, $sp, 0x0080 ## $t8 = FFFFFFE0 /* 01AEC 80A0D1AC 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 /* 01AF0 80A0D1B0 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 01AF4 80A0D1B4 11800012 */ beq $t4, $zero, .L80A0D200 +/* 01AF4 80A0D1B4 11800012 */ beq $t4, $zero, .L80A0D200 /* 01AF8 80A0D1B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01AFC 80A0D1BC 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 01B00 80A0D1C0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 01B04 80A0D1C4 460A4281 */ sub.s $f10, $f8, $f10 +/* 01B04 80A0D1C4 460A4281 */ sub.s $f10, $f8, $f10 /* 01B08 80A0D1C8 44CCF800 */ ctc1 $t4, $31 /* 01B0C 80A0D1CC 00000000 */ nop -/* 01B10 80A0D1D0 460052A4 */ cvt.w.s $f10, $f10 +/* 01B10 80A0D1D0 460052A4 */ cvt.w.s $f10, $f10 /* 01B14 80A0D1D4 444CF800 */ cfc1 $t4, $31 /* 01B18 80A0D1D8 00000000 */ nop /* 01B1C 80A0D1DC 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 01B20 80A0D1E0 15800005 */ bne $t4, $zero, .L80A0D1F8 +/* 01B20 80A0D1E0 15800005 */ bne $t4, $zero, .L80A0D1F8 /* 01B24 80A0D1E4 00000000 */ nop -/* 01B28 80A0D1E8 440C5000 */ mfc1 $t4, $f10 +/* 01B28 80A0D1E8 440C5000 */ mfc1 $t4, $f10 /* 01B2C 80A0D1EC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01B30 80A0D1F0 10000007 */ beq $zero, $zero, .L80A0D210 +/* 01B30 80A0D1F0 10000007 */ beq $zero, $zero, .L80A0D210 /* 01B34 80A0D1F4 01816025 */ or $t4, $t4, $at ## $t4 = 80000000 .L80A0D1F8: -/* 01B38 80A0D1F8 10000005 */ beq $zero, $zero, .L80A0D210 +/* 01B38 80A0D1F8 10000005 */ beq $zero, $zero, .L80A0D210 /* 01B3C 80A0D1FC 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF .L80A0D200: -/* 01B40 80A0D200 440C5000 */ mfc1 $t4, $f10 +/* 01B40 80A0D200 440C5000 */ mfc1 $t4, $f10 /* 01B44 80A0D204 00000000 */ nop -/* 01B48 80A0D208 0580FFFB */ bltz $t4, .L80A0D1F8 +/* 01B48 80A0D208 0580FFFB */ bltz $t4, .L80A0D1F8 /* 01B4C 80A0D20C 00000000 */ nop .L80A0D210: /* 01B50 80A0D210 01807025 */ or $t6, $t4, $zero ## $t6 = FFFFFFFF @@ -137,51 +137,51 @@ glabel EnFd_Draw /* 01B5C 80A0D21C AC8F0004 */ sw $t7, 0x0004($a0) ## 00000003 /* 01B60 80A0D220 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 01B64 80A0D224 44CBF800 */ ctc1 $t3, $31 -/* 01B68 80A0D228 00D81821 */ addu $v1, $a2, $t8 +/* 01B68 80A0D228 00D81821 */ addu $v1, $a2, $t8 /* 01B6C 80A0D22C 24990008 */ addiu $t9, $a0, 0x0008 ## $t9 = 00000007 /* 01B70 80A0D230 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 01B74 80A0D234 AC880000 */ sw $t0, 0x0000($a0) ## FFFFFFFF /* 01B78 80A0D238 906B0002 */ lbu $t3, 0x0002($v1) ## 00000019 /* 01B7C 80A0D23C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 01B80 80A0D240 C63004CC */ lwc1 $f16, 0x04CC($s1) ## 000004CC -/* 01B84 80A0D244 000B6200 */ sll $t4, $t3, 8 +/* 01B84 80A0D244 000B6200 */ sll $t4, $t3, 8 /* 01B88 80A0D248 444BF800 */ cfc1 $t3, $31 /* 01B8C 80A0D24C 44CEF800 */ ctc1 $t6, $31 /* 01B90 80A0D250 90680001 */ lbu $t0, 0x0001($v1) ## 00000018 /* 01B94 80A0D254 906A0000 */ lbu $t2, 0x0000($v1) ## 00000017 -/* 01B98 80A0D258 460084A4 */ cvt.w.s $f18, $f16 -/* 01B9C 80A0D25C 0008C400 */ sll $t8, $t0, 16 -/* 01BA0 80A0D260 000A6E00 */ sll $t5, $t2, 24 +/* 01B98 80A0D258 460084A4 */ cvt.w.s $f18, $f16 +/* 01B9C 80A0D25C 0008C400 */ sll $t8, $t0, 16 +/* 01BA0 80A0D260 000A6E00 */ sll $t5, $t2, 24 /* 01BA4 80A0D264 018D7825 */ or $t7, $t4, $t5 ## $t7 = FFFFFFFF /* 01BA8 80A0D268 444EF800 */ cfc1 $t6, $31 /* 01BAC 80A0D26C 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 /* 01BB0 80A0D270 01F84825 */ or $t1, $t7, $t8 ## $t1 = FFFFFFFF /* 01BB4 80A0D274 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 01BB8 80A0D278 11C00013 */ beq $t6, $zero, .L80A0D2C8 +/* 01BB8 80A0D278 11C00013 */ beq $t6, $zero, .L80A0D2C8 /* 01BBC 80A0D27C 35080020 */ ori $t0, $t0, 0x0020 ## $t0 = DB060020 /* 01BC0 80A0D280 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 01BC4 80A0D284 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 /* 01BC8 80A0D288 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01BCC 80A0D28C 46128481 */ sub.s $f18, $f16, $f18 +/* 01BCC 80A0D28C 46128481 */ sub.s $f18, $f16, $f18 /* 01BD0 80A0D290 44CEF800 */ ctc1 $t6, $31 /* 01BD4 80A0D294 00000000 */ nop -/* 01BD8 80A0D298 460094A4 */ cvt.w.s $f18, $f18 +/* 01BD8 80A0D298 460094A4 */ cvt.w.s $f18, $f18 /* 01BDC 80A0D29C 444EF800 */ cfc1 $t6, $31 /* 01BE0 80A0D2A0 00000000 */ nop /* 01BE4 80A0D2A4 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 01BE8 80A0D2A8 15C00005 */ bne $t6, $zero, .L80A0D2C0 +/* 01BE8 80A0D2A8 15C00005 */ bne $t6, $zero, .L80A0D2C0 /* 01BEC 80A0D2AC 00000000 */ nop -/* 01BF0 80A0D2B0 440E9000 */ mfc1 $t6, $f18 +/* 01BF0 80A0D2B0 440E9000 */ mfc1 $t6, $f18 /* 01BF4 80A0D2B4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01BF8 80A0D2B8 10000007 */ beq $zero, $zero, .L80A0D2D8 +/* 01BF8 80A0D2B8 10000007 */ beq $zero, $zero, .L80A0D2D8 /* 01BFC 80A0D2BC 01C17025 */ or $t6, $t6, $at ## $t6 = 80000000 .L80A0D2C0: -/* 01C00 80A0D2C0 10000005 */ beq $zero, $zero, .L80A0D2D8 +/* 01C00 80A0D2C0 10000005 */ beq $zero, $zero, .L80A0D2D8 /* 01C04 80A0D2C4 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF .L80A0D2C8: -/* 01C08 80A0D2C8 440E9000 */ mfc1 $t6, $f18 +/* 01C08 80A0D2C8 440E9000 */ mfc1 $t6, $f18 /* 01C0C 80A0D2CC 00000000 */ nop -/* 01C10 80A0D2D0 05C0FFFB */ bltz $t6, .L80A0D2C0 +/* 01C10 80A0D2D0 05C0FFFB */ bltz $t6, .L80A0D2C0 /* 01C14 80A0D2D4 00000000 */ nop .L80A0D2D8: /* 01C18 80A0D2D8 01C05025 */ or $t2, $t6, $zero ## $t2 = FFFFFFFF @@ -194,30 +194,30 @@ glabel EnFd_Draw /* 01C34 80A0D2F4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000007 /* 01C38 80A0D2F8 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 01C3C 80A0D2FC AC480000 */ sw $t0, 0x0000($v0) ## FFFFFFFF -/* 01C40 80A0D300 8FAF00A4 */ lw $t7, 0x00A4($sp) -/* 01C44 80A0D304 8FAA007C */ lw $t2, 0x007C($sp) +/* 01C40 80A0D300 8FAF00A4 */ lw $t7, 0x00A4($sp) +/* 01C44 80A0D304 8FAA007C */ lw $t2, 0x007C($sp) /* 01C48 80A0D308 24080008 */ addiu $t0, $zero, 0x0008 ## $t0 = 00000008 /* 01C4C 80A0D30C 8DE40000 */ lw $a0, 0x0000($t7) ## FFFFFFFF -/* 01C50 80A0D310 000A4880 */ sll $t1, $t2, 2 -/* 01C54 80A0D314 012A4823 */ subu $t1, $t1, $t2 -/* 01C58 80A0D318 00094840 */ sll $t1, $t1, 1 +/* 01C50 80A0D310 000A4880 */ sll $t1, $t2, 2 +/* 01C54 80A0D314 012A4823 */ subu $t1, $t1, $t2 +/* 01C58 80A0D318 00094840 */ sll $t1, $t1, 1 /* 01C5C 80A0D31C 312C00FF */ andi $t4, $t1, 0x00FF ## $t4 = 000000FF -/* 01C60 80A0D320 01ACC823 */ subu $t9, $t5, $t4 +/* 01C60 80A0D320 01ACC823 */ subu $t9, $t5, $t4 /* 01C64 80A0D324 240F0040 */ addiu $t7, $zero, 0x0040 ## $t7 = 00000040 /* 01C68 80A0D328 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 /* 01C6C 80A0D32C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 01C70 80A0D330 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 01C74 80A0D334 AFB80010 */ sw $t8, 0x0010($sp) -/* 01C78 80A0D338 AFAE0018 */ sw $t6, 0x0018($sp) -/* 01C7C 80A0D33C AFAB0014 */ sw $t3, 0x0014($sp) -/* 01C80 80A0D340 AFAF0028 */ sw $t7, 0x0028($sp) -/* 01C84 80A0D344 AFB90020 */ sw $t9, 0x0020($sp) -/* 01C88 80A0D348 AFA80024 */ sw $t0, 0x0024($sp) -/* 01C8C 80A0D34C AFA0001C */ sw $zero, 0x001C($sp) +/* 01C74 80A0D334 AFB80010 */ sw $t8, 0x0010($sp) +/* 01C78 80A0D338 AFAE0018 */ sw $t6, 0x0018($sp) +/* 01C7C 80A0D33C AFAB0014 */ sw $t3, 0x0014($sp) +/* 01C80 80A0D340 AFAF0028 */ sw $t7, 0x0028($sp) +/* 01C84 80A0D344 AFB90020 */ sw $t9, 0x0020($sp) +/* 01C88 80A0D348 AFA80024 */ sw $t0, 0x0024($sp) +/* 01C8C 80A0D34C AFA0001C */ sw $zero, 0x001C($sp) /* 01C90 80A0D350 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01C94 80A0D354 0C0253D0 */ jal Draw_TwoTexScroll -/* 01C98 80A0D358 AFA20058 */ sw $v0, 0x0058($sp) -/* 01C9C 80A0D35C 8FA30058 */ lw $v1, 0x0058($sp) +/* 01C94 80A0D354 0C0253D0 */ jal Draw_TwoTexScroll +/* 01C98 80A0D358 AFA20058 */ sw $v0, 0x0058($sp) +/* 01C9C 80A0D35C 8FA30058 */ lw $v1, 0x0058($sp) /* 01CA0 80A0D360 3C0BE700 */ lui $t3, 0xE700 ## $t3 = E7000000 /* 01CA4 80A0D364 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 01CA8 80A0D368 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -241,27 +241,27 @@ glabel EnFd_Draw /* 01CF0 80A0D3B0 3C0C80A1 */ lui $t4, %hi(func_80A0CCF0) ## $t4 = 80A10000 /* 01CF4 80A0D3B4 258CCCF0 */ addiu $t4, $t4, %lo(func_80A0CCF0) ## $t4 = 80A0CCF0 /* 01CF8 80A0D3B8 25ADCCB8 */ addiu $t5, $t5, %lo(func_80A0CCB8) ## $t5 = 80A0CCB8 -/* 01CFC 80A0D3BC AFAD0010 */ sw $t5, 0x0010($sp) -/* 01D00 80A0D3C0 AFAC0014 */ sw $t4, 0x0014($sp) -/* 01D04 80A0D3C4 AFB10018 */ sw $s1, 0x0018($sp) +/* 01CFC 80A0D3BC AFAD0010 */ sw $t5, 0x0010($sp) +/* 01D00 80A0D3C0 AFAC0014 */ sw $t4, 0x0014($sp) +/* 01D04 80A0D3C4 AFB10018 */ sw $s1, 0x0018($sp) /* 01D08 80A0D3C8 8E1902D0 */ lw $t9, 0x02D0($s0) ## 000002D0 -/* 01D0C 80A0D3CC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01D10 80A0D3D0 0C0289CF */ jal func_800A273C -/* 01D14 80A0D3D4 AFB9001C */ sw $t9, 0x001C($sp) +/* 01D0C 80A0D3CC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01D10 80A0D3D0 0C0289CF */ jal SkelAnime_DrawSV2 +/* 01D14 80A0D3D4 AFB9001C */ sw $t9, 0x001C($sp) /* 01D18 80A0D3D8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80A0D3DC: -/* 01D1C 80A0D3DC 8FA800A4 */ lw $t0, 0x00A4($sp) +/* 01D1C 80A0D3DC 8FA800A4 */ lw $t0, 0x00A4($sp) .L80A0D3E0: /* 01D20 80A0D3E0 3C0680A1 */ lui $a2, %hi(D_80A0E130) ## $a2 = 80A10000 /* 01D24 80A0D3E4 24C6E130 */ addiu $a2, $a2, %lo(D_80A0E130) ## $a2 = 80A0E130 /* 01D28 80A0D3E8 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFC4 /* 01D2C 80A0D3EC 2407071E */ addiu $a3, $zero, 0x071E ## $a3 = 0000071E -/* 01D30 80A0D3F0 0C031AD5 */ jal func_800C6B54 +/* 01D30 80A0D3F0 0C031AD5 */ jal func_800C6B54 /* 01D34 80A0D3F4 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 01D38 80A0D3F8 8FBF003C */ lw $ra, 0x003C($sp) -/* 01D3C 80A0D3FC 8FB00034 */ lw $s0, 0x0034($sp) -/* 01D40 80A0D400 8FB10038 */ lw $s1, 0x0038($sp) -/* 01D44 80A0D404 03E00008 */ jr $ra +/* 01D38 80A0D3F8 8FBF003C */ lw $ra, 0x003C($sp) +/* 01D3C 80A0D3FC 8FB00034 */ lw $s0, 0x0034($sp) +/* 01D40 80A0D400 8FB10038 */ lw $s1, 0x0038($sp) +/* 01D44 80A0D404 03E00008 */ jr $ra /* 01D48 80A0D408 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s index faf23917dd..33f60c136f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s @@ -1,59 +1,59 @@ glabel EnFd_Init /* 00AEC 80A0C1AC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00AF0 80A0C1B0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00AF0 80A0C1B0 AFB00028 */ sw $s0, 0x0028($sp) /* 00AF4 80A0C1B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AF8 80A0C1B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AFC 80A0C1BC AFA50044 */ sw $a1, 0x0044($sp) +/* 00AF8 80A0C1B8 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AFC 80A0C1BC AFA50044 */ sw $a1, 0x0044($sp) /* 00B00 80A0C1C0 260E04DC */ addiu $t6, $s0, 0x04DC ## $t6 = 000004DC /* 00B04 80A0C1C4 260F057E */ addiu $t7, $s0, 0x057E ## $t7 = 0000057E /* 00B08 80A0C1C8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00B0C 80A0C1CC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00B10 80A0C1D0 2418001B */ addiu $t8, $zero, 0x001B ## $t8 = 0000001B -/* 00B14 80A0C1D4 AFB80018 */ sw $t8, 0x0018($sp) +/* 00B14 80A0C1D4 AFB80018 */ sw $t8, 0x0018($sp) /* 00B18 80A0C1D8 24C65810 */ addiu $a2, $a2, 0x5810 ## $a2 = 06005810 /* 00B1C 80A0C1DC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00B20 80A0C1E0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00B24 80A0C1E4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00B28 80A0C1E8 0C0291BE */ jal func_800A46F8 +/* 00B20 80A0C1E0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00B24 80A0C1E4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00B28 80A0C1E8 0C0291BE */ jal SkelAnime_InitSV /* 00B2C 80A0C1EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00B30 80A0C1F0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00B34 80A0C1F4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00B38 80A0C1F8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00B3C 80A0C1FC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00B40 80A0C200 0C00AC78 */ jal ActorShape_Init - + /* 00B44 80A0C204 3C074200 */ lui $a3, 0x4200 ## $a3 = 42000000 /* 00B48 80A0C208 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00B4C 80A0C20C AFA50034 */ sw $a1, 0x0034($sp) -/* 00B50 80A0C210 0C016EFE */ jal func_8005BBF8 -/* 00B54 80A0C214 8FA40044 */ lw $a0, 0x0044($sp) +/* 00B4C 80A0C20C AFA50034 */ sw $a1, 0x0034($sp) +/* 00B50 80A0C210 0C016EFE */ jal func_8005BBF8 +/* 00B54 80A0C214 8FA40044 */ lw $a0, 0x0044($sp) /* 00B58 80A0C218 3C0780A1 */ lui $a3, %hi(D_80A0DFD0) ## $a3 = 80A10000 /* 00B5C 80A0C21C 261901B4 */ addiu $t9, $s0, 0x01B4 ## $t9 = 000001B4 -/* 00B60 80A0C220 8FA50034 */ lw $a1, 0x0034($sp) -/* 00B64 80A0C224 AFB90010 */ sw $t9, 0x0010($sp) +/* 00B60 80A0C220 8FA50034 */ lw $a1, 0x0034($sp) +/* 00B64 80A0C224 AFB90010 */ sw $t9, 0x0010($sp) /* 00B68 80A0C228 24E7DFD0 */ addiu $a3, $a3, %lo(D_80A0DFD0) ## $a3 = 80A0DFD0 -/* 00B6C 80A0C22C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00B70 80A0C230 0C017014 */ jal func_8005C050 +/* 00B6C 80A0C22C 8FA40044 */ lw $a0, 0x0044($sp) +/* 00B70 80A0C230 0C017014 */ jal func_8005C050 /* 00B74 80A0C234 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00B78 80A0C238 0C016C80 */ jal CollisionBtlTbl_Get - + /* 00B7C 80A0C23C 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F /* 00B80 80A0C240 3C0680A1 */ lui $a2, %hi(D_80A0DFE0) ## $a2 = 80A10000 /* 00B84 80A0C244 24C6DFE0 */ addiu $a2, $a2, %lo(D_80A0DFE0) ## $a2 = 80A0DFE0 /* 00B88 80A0C248 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00B8C 80A0C24C 0C0187BF */ jal func_80061EFC +/* 00B8C 80A0C24C 0C0187BF */ jal func_80061EFC /* 00B90 80A0C250 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00B94 80A0C254 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 /* 00B98 80A0C258 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00B9C 80A0C25C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00BA0 80A0C260 01014824 */ and $t1, $t0, $at +/* 00BA0 80A0C260 01014824 */ and $t1, $t0, $at /* 00BA4 80A0C264 3C010100 */ lui $at, 0x0100 ## $at = 01000000 /* 00BA8 80A0C268 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 /* 00BAC 80A0C26C 01215825 */ or $t3, $t1, $at ## $t3 = 01000000 /* 00BB0 80A0C270 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 /* 00BB4 80A0C274 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00BB8 80A0C278 0C00B58B */ jal Actor_SetScale - + /* 00BBC 80A0C27C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00BC0 80A0C280 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00BC4 80A0C284 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 @@ -66,22 +66,22 @@ glabel EnFd_Init /* 00BDC 80A0C29C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 00BE0 80A0C2A0 3C1880A1 */ lui $t8, %hi(func_80A0C310) ## $t8 = 80A10000 /* 00BE4 80A0C2A4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00BE8 80A0C2A8 4606003C */ c.lt.s $f0, $f6 +/* 00BE8 80A0C2A8 4606003C */ c.lt.s $f0, $f6 /* 00BEC 80A0C2AC 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF /* 00BF0 80A0C2B0 240F0022 */ addiu $t7, $zero, 0x0022 ## $t7 = 00000022 /* 00BF4 80A0C2B4 2718C310 */ addiu $t8, $t8, %lo(func_80A0C310) ## $t8 = 80A0C310 -/* 00BF8 80A0C2B8 45020004 */ bc1fl .L80A0C2CC +/* 00BF8 80A0C2B8 45020004 */ bc1fl .L80A0C2CC /* 00BFC 80A0C2BC A60E04BA */ sh $t6, 0x04BA($s0) ## 000004BA -/* 00C00 80A0C2C0 10000002 */ beq $zero, $zero, .L80A0C2CC +/* 00C00 80A0C2C0 10000002 */ beq $zero, $zero, .L80A0C2CC /* 00C04 80A0C2C4 A60D04BA */ sh $t5, 0x04BA($s0) ## 000004BA /* 00C08 80A0C2C8 A60E04BA */ sh $t6, 0x04BA($s0) ## 000004BA .L80A0C2CC: /* 00C0C 80A0C2CC A20F0117 */ sb $t7, 0x0117($s0) ## 00000117 /* 00C10 80A0C2D0 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 00C14 80A0C2D4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C18 80A0C2D8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00C14 80A0C2D4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C18 80A0C2D8 8FB00028 */ lw $s0, 0x0028($sp) /* 00C1C 80A0C2DC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00C20 80A0C2E0 03E00008 */ jr $ra +/* 00C20 80A0C2E0 03E00008 */ jr $ra /* 00C24 80A0C2E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s index 1043a7e328..69175567f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s @@ -1,33 +1,33 @@ glabel EnFirefly_Draw /* 01CD0 80A14D40 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01CD4 80A14D44 AFBF002C */ sw $ra, 0x002C($sp) -/* 01CD8 80A14D48 AFB00028 */ sw $s0, 0x0028($sp) -/* 01CDC 80A14D4C AFA40058 */ sw $a0, 0x0058($sp) -/* 01CE0 80A14D50 AFA5005C */ sw $a1, 0x005C($sp) +/* 01CD4 80A14D44 AFBF002C */ sw $ra, 0x002C($sp) +/* 01CD8 80A14D48 AFB00028 */ sw $s0, 0x0028($sp) +/* 01CDC 80A14D4C AFA40058 */ sw $a0, 0x0058($sp) +/* 01CE0 80A14D50 AFA5005C */ sw $a1, 0x005C($sp) /* 01CE4 80A14D54 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01CE8 80A14D58 3C0680A1 */ lui $a2, %hi(D_80A14FE0) ## $a2 = 80A10000 /* 01CEC 80A14D5C 24C64FE0 */ addiu $a2, $a2, %lo(D_80A14FE0) ## $a2 = 80A14FE0 /* 01CF0 80A14D60 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01CF4 80A14D64 240706C5 */ addiu $a3, $zero, 0x06C5 ## $a3 = 000006C5 -/* 01CF8 80A14D68 0C031AB1 */ jal func_800C6AC4 +/* 01CF8 80A14D68 0C031AB1 */ jal func_800C6AC4 /* 01CFC 80A14D6C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01D00 80A14D70 8FAF005C */ lw $t7, 0x005C($sp) -/* 01D04 80A14D74 0C024F46 */ jal func_80093D18 +/* 01D00 80A14D70 8FAF005C */ lw $t7, 0x005C($sp) +/* 01D04 80A14D74 0C024F46 */ jal func_80093D18 /* 01D08 80A14D78 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01D0C 80A14D7C 8FA80058 */ lw $t0, 0x0058($sp) +/* 01D0C 80A14D7C 8FA80058 */ lw $t0, 0x0058($sp) /* 01D10 80A14D80 3C0780A1 */ lui $a3, %hi(func_80A14960) ## $a3 = 80A10000 /* 01D14 80A14D84 3C0D80A1 */ lui $t5, %hi(func_80A149B4) ## $t5 = 80A10000 /* 01D18 80A14D88 911801B9 */ lbu $t8, 0x01B9($t0) ## 000001B9 /* 01D1C 80A14D8C 25AD49B4 */ addiu $t5, $t5, %lo(func_80A149B4) ## $t5 = 80A149B4 /* 01D20 80A14D90 24E74960 */ addiu $a3, $a3, %lo(func_80A14960) ## $a3 = 80A14960 -/* 01D24 80A14D94 53000009 */ beql $t8, $zero, .L80A14DBC +/* 01D24 80A14D94 53000009 */ beql $t8, $zero, .L80A14DBC /* 01D28 80A14D98 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 01D2C 80A14D9C 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 01D30 80A14DA0 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 /* 01D34 80A14DA4 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 01D38 80A14DA8 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 01D3C 80A14DAC AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 01D40 80A14DB0 10000008 */ beq $zero, $zero, .L80A14DD4 +/* 01D40 80A14DB0 10000008 */ beq $zero, $zero, .L80A14DD4 /* 01D44 80A14DB4 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 01D48 80A14DB8 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 .L80A14DBC: @@ -40,24 +40,24 @@ glabel EnFirefly_Draw .L80A14DD4: /* 01D64 80A14DD4 8D050174 */ lw $a1, 0x0174($t0) ## 00000174 /* 01D68 80A14DD8 8D060190 */ lw $a2, 0x0190($t0) ## 00000190 -/* 01D6C 80A14DDC AFA80014 */ sw $t0, 0x0014($sp) -/* 01D70 80A14DE0 AFAD0010 */ sw $t5, 0x0010($sp) +/* 01D6C 80A14DDC AFA80014 */ sw $t0, 0x0014($sp) +/* 01D70 80A14DE0 AFAD0010 */ sw $t5, 0x0010($sp) /* 01D74 80A14DE4 8E0E02C0 */ lw $t6, 0x02C0($s0) ## 000002C0 -/* 01D78 80A14DE8 8FA4005C */ lw $a0, 0x005C($sp) -/* 01D7C 80A14DEC 0C0288A2 */ jal func_800A2288 -/* 01D80 80A14DF0 AFAE0018 */ sw $t6, 0x0018($sp) +/* 01D78 80A14DE8 8FA4005C */ lw $a0, 0x005C($sp) +/* 01D7C 80A14DEC 0C0288A2 */ jal SkelAnime_Draw2 +/* 01D80 80A14DF0 AFAE0018 */ sw $t6, 0x0018($sp) /* 01D84 80A14DF4 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 01D88 80A14DF8 8FAF005C */ lw $t7, 0x005C($sp) +/* 01D88 80A14DF8 8FAF005C */ lw $t7, 0x005C($sp) /* 01D8C 80A14DFC 3C0680A1 */ lui $a2, %hi(D_80A14FF4) ## $a2 = 80A10000 /* 01D90 80A14E00 24C64FF4 */ addiu $a2, $a2, %lo(D_80A14FF4) ## $a2 = 80A14FF4 /* 01D94 80A14E04 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01D98 80A14E08 240706E3 */ addiu $a3, $zero, 0x06E3 ## $a3 = 000006E3 -/* 01D9C 80A14E0C 0C031AD5 */ jal func_800C6B54 +/* 01D9C 80A14E0C 0C031AD5 */ jal func_800C6B54 /* 01DA0 80A14E10 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 01DA4 80A14E14 8FBF002C */ lw $ra, 0x002C($sp) -/* 01DA8 80A14E18 8FB00028 */ lw $s0, 0x0028($sp) +/* 01DA4 80A14E14 8FBF002C */ lw $ra, 0x002C($sp) +/* 01DA8 80A14E18 8FB00028 */ lw $s0, 0x0028($sp) /* 01DAC 80A14E1C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01DB0 80A14E20 03E00008 */ jr $ra +/* 01DB0 80A14E20 03E00008 */ jr $ra /* 01DB4 80A14E24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s index fb3850a2fc..84ff55c883 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s @@ -1,33 +1,33 @@ glabel func_80A14E28 /* 01DB8 80A14E28 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01DBC 80A14E2C AFBF002C */ sw $ra, 0x002C($sp) -/* 01DC0 80A14E30 AFB00028 */ sw $s0, 0x0028($sp) -/* 01DC4 80A14E34 AFA40058 */ sw $a0, 0x0058($sp) -/* 01DC8 80A14E38 AFA5005C */ sw $a1, 0x005C($sp) +/* 01DBC 80A14E2C AFBF002C */ sw $ra, 0x002C($sp) +/* 01DC0 80A14E30 AFB00028 */ sw $s0, 0x0028($sp) +/* 01DC4 80A14E34 AFA40058 */ sw $a0, 0x0058($sp) +/* 01DC8 80A14E38 AFA5005C */ sw $a1, 0x005C($sp) /* 01DCC 80A14E3C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01DD0 80A14E40 3C0680A1 */ lui $a2, %hi(D_80A15008) ## $a2 = 80A10000 /* 01DD4 80A14E44 24C65008 */ addiu $a2, $a2, %lo(D_80A15008) ## $a2 = 80A15008 /* 01DD8 80A14E48 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01DDC 80A14E4C 240706EF */ addiu $a3, $zero, 0x06EF ## $a3 = 000006EF -/* 01DE0 80A14E50 0C031AB1 */ jal func_800C6AC4 +/* 01DE0 80A14E50 0C031AB1 */ jal func_800C6AC4 /* 01DE4 80A14E54 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01DE8 80A14E58 8FAF005C */ lw $t7, 0x005C($sp) -/* 01DEC 80A14E5C 0C024F61 */ jal func_80093D84 +/* 01DE8 80A14E58 8FAF005C */ lw $t7, 0x005C($sp) +/* 01DEC 80A14E5C 0C024F61 */ jal func_80093D84 /* 01DF0 80A14E60 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01DF4 80A14E64 8FA80058 */ lw $t0, 0x0058($sp) +/* 01DF4 80A14E64 8FA80058 */ lw $t0, 0x0058($sp) /* 01DF8 80A14E68 3C0780A1 */ lui $a3, %hi(func_80A14960) ## $a3 = 80A10000 /* 01DFC 80A14E6C 3C0D80A1 */ lui $t5, %hi(func_80A149B4) ## $t5 = 80A10000 /* 01E00 80A14E70 911801B9 */ lbu $t8, 0x01B9($t0) ## 000001B9 /* 01E04 80A14E74 25AD49B4 */ addiu $t5, $t5, %lo(func_80A149B4) ## $t5 = 80A149B4 /* 01E08 80A14E78 24E74960 */ addiu $a3, $a3, %lo(func_80A14960) ## $a3 = 80A14960 -/* 01E0C 80A14E7C 53000009 */ beql $t8, $zero, .L80A14EA4 +/* 01E0C 80A14E7C 53000009 */ beql $t8, $zero, .L80A14EA4 /* 01E10 80A14E80 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 01E14 80A14E84 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 01E18 80A14E88 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 /* 01E1C 80A14E8C 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 01E20 80A14E90 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 01E24 80A14E94 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 01E28 80A14E98 10000008 */ beq $zero, $zero, .L80A14EBC +/* 01E28 80A14E98 10000008 */ beq $zero, $zero, .L80A14EBC /* 01E2C 80A14E9C AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 01E30 80A14EA0 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 .L80A14EA4: @@ -40,23 +40,23 @@ glabel func_80A14E28 .L80A14EBC: /* 01E4C 80A14EBC 8D050174 */ lw $a1, 0x0174($t0) ## 00000174 /* 01E50 80A14EC0 8D060190 */ lw $a2, 0x0190($t0) ## 00000190 -/* 01E54 80A14EC4 AFA80014 */ sw $t0, 0x0014($sp) -/* 01E58 80A14EC8 AFAD0010 */ sw $t5, 0x0010($sp) +/* 01E54 80A14EC4 AFA80014 */ sw $t0, 0x0014($sp) +/* 01E58 80A14EC8 AFAD0010 */ sw $t5, 0x0010($sp) /* 01E5C 80A14ECC 8E0E02D0 */ lw $t6, 0x02D0($s0) ## 000002D0 -/* 01E60 80A14ED0 8FA4005C */ lw $a0, 0x005C($sp) -/* 01E64 80A14ED4 0C0288A2 */ jal func_800A2288 -/* 01E68 80A14ED8 AFAE0018 */ sw $t6, 0x0018($sp) +/* 01E60 80A14ED0 8FA4005C */ lw $a0, 0x005C($sp) +/* 01E64 80A14ED4 0C0288A2 */ jal SkelAnime_Draw2 +/* 01E68 80A14ED8 AFAE0018 */ sw $t6, 0x0018($sp) /* 01E6C 80A14EDC AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 01E70 80A14EE0 8FAF005C */ lw $t7, 0x005C($sp) +/* 01E70 80A14EE0 8FAF005C */ lw $t7, 0x005C($sp) /* 01E74 80A14EE4 3C0680A1 */ lui $a2, %hi(D_80A1501C) ## $a2 = 80A10000 /* 01E78 80A14EE8 24C6501C */ addiu $a2, $a2, %lo(D_80A1501C) ## $a2 = 80A1501C /* 01E7C 80A14EEC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01E80 80A14EF0 2407070D */ addiu $a3, $zero, 0x070D ## $a3 = 0000070D -/* 01E84 80A14EF4 0C031AD5 */ jal func_800C6B54 +/* 01E84 80A14EF4 0C031AD5 */ jal func_800C6B54 /* 01E88 80A14EF8 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 01E8C 80A14EFC 8FBF002C */ lw $ra, 0x002C($sp) -/* 01E90 80A14F00 8FB00028 */ lw $s0, 0x0028($sp) +/* 01E8C 80A14EFC 8FBF002C */ lw $ra, 0x002C($sp) +/* 01E90 80A14F00 8FB00028 */ lw $s0, 0x0028($sp) /* 01E94 80A14F04 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01E98 80A14F08 03E00008 */ jr $ra +/* 01E98 80A14F08 03E00008 */ jr $ra /* 01E9C 80A14F0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Draw.s index 901d4c8cbf..dcf7ca467f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Draw.s @@ -1,26 +1,26 @@ glabel EnFish_Draw /* 01D2C 80A16FAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01D30 80A16FB0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01D34 80A16FB4 AFA40028 */ sw $a0, 0x0028($sp) -/* 01D38 80A16FB8 AFA5002C */ sw $a1, 0x002C($sp) -/* 01D3C 80A16FBC 0C024F46 */ jal func_80093D18 +/* 01D30 80A16FB0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01D34 80A16FB4 AFA40028 */ sw $a0, 0x0028($sp) +/* 01D38 80A16FB8 AFA5002C */ sw $a1, 0x002C($sp) +/* 01D3C 80A16FBC 0C024F46 */ jal func_80093D18 /* 01D40 80A16FC0 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01D44 80A16FC4 8FA20028 */ lw $v0, 0x0028($sp) -/* 01D48 80A16FC8 8FA4002C */ lw $a0, 0x002C($sp) +/* 01D44 80A16FC4 8FA20028 */ lw $v0, 0x0028($sp) +/* 01D48 80A16FC8 8FA4002C */ lw $a0, 0x002C($sp) /* 01D4C 80A16FCC 8C4501B0 */ lw $a1, 0x01B0($v0) ## 000001B0 /* 01D50 80A16FD0 8C4601CC */ lw $a2, 0x01CC($v0) ## 000001CC /* 01D54 80A16FD4 904701AE */ lbu $a3, 0x01AE($v0) ## 000001AE -/* 01D58 80A16FD8 AFA00018 */ sw $zero, 0x0018($sp) -/* 01D5C 80A16FDC AFA00014 */ sw $zero, 0x0014($sp) -/* 01D60 80A16FE0 0C0286B2 */ jal func_800A1AC8 -/* 01D64 80A16FE4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01D68 80A16FE8 8FA20028 */ lw $v0, 0x0028($sp) +/* 01D58 80A16FD8 AFA00018 */ sw $zero, 0x0018($sp) +/* 01D5C 80A16FDC AFA00014 */ sw $zero, 0x0014($sp) +/* 01D60 80A16FE0 0C0286B2 */ jal SkelAnime_DrawSV +/* 01D64 80A16FE4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01D68 80A16FE8 8FA20028 */ lw $v0, 0x0028($sp) /* 01D6C 80A16FEC 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 01D70 80A16FF0 0C018A29 */ jal func_800628A4 +/* 01D70 80A16FF0 0C018A29 */ jal func_800628A4 /* 01D74 80A16FF4 2445014C */ addiu $a1, $v0, 0x014C ## $a1 = 0000014C -/* 01D78 80A16FF8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01D78 80A16FF8 8FBF0024 */ lw $ra, 0x0024($sp) /* 01D7C 80A16FFC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D80 80A17000 03E00008 */ jr $ra +/* 01D80 80A17000 03E00008 */ jr $ra /* 01D84 80A17004 00000000 */ nop /* 01D88 80A17008 00000000 */ nop /* 01D8C 80A1700C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s index 3ee4c1a789..6628950a41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s @@ -1,90 +1,90 @@ glabel EnFish_Init /* 001E8 80A15468 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 001EC 80A1546C AFBF002C */ sw $ra, 0x002C($sp) -/* 001F0 80A15470 AFB00028 */ sw $s0, 0x0028($sp) -/* 001F4 80A15474 AFA50044 */ sw $a1, 0x0044($sp) +/* 001EC 80A1546C AFBF002C */ sw $ra, 0x002C($sp) +/* 001F0 80A15470 AFB00028 */ sw $s0, 0x0028($sp) +/* 001F4 80A15474 AFA50044 */ sw $a1, 0x0044($sp) /* 001F8 80A15478 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 001FC 80A1547C 3C0580A1 */ lui $a1, %hi(D_80A17070) ## $a1 = 80A10000 /* 00200 80A15480 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00204 80A15484 24A57070 */ addiu $a1, $a1, %lo(D_80A17070) ## $a1 = 80A17070 /* 00208 80A15488 0C01E037 */ jal Actor_ProcessInitChain - -/* 0020C 80A1548C A7AE003A */ sh $t6, 0x003A($sp) + +/* 0020C 80A1548C A7AE003A */ sh $t6, 0x003A($sp) /* 00210 80A15490 3C060402 */ lui $a2, 0x0402 ## $a2 = 04020000 /* 00214 80A15494 3C070402 */ lui $a3, 0x0402 ## $a3 = 04020000 /* 00218 80A15498 260F01F0 */ addiu $t7, $s0, 0x01F0 ## $t7 = 000001F0 /* 0021C 80A1549C 2618021A */ addiu $t8, $s0, 0x021A ## $t8 = 0000021A /* 00220 80A154A0 24190007 */ addiu $t9, $zero, 0x0007 ## $t9 = 00000007 -/* 00224 80A154A4 AFB90018 */ sw $t9, 0x0018($sp) -/* 00228 80A154A8 AFB80014 */ sw $t8, 0x0014($sp) -/* 0022C 80A154AC AFAF0010 */ sw $t7, 0x0010($sp) +/* 00224 80A154A4 AFB90018 */ sw $t9, 0x0018($sp) +/* 00228 80A154A8 AFB80014 */ sw $t8, 0x0014($sp) +/* 0022C 80A154AC AFAF0010 */ sw $t7, 0x0010($sp) /* 00230 80A154B0 24E7909C */ addiu $a3, $a3, 0x909C ## $a3 = 0401909C /* 00234 80A154B4 24C68FE0 */ addiu $a2, $a2, 0x8FE0 ## $a2 = 04018FE0 -/* 00238 80A154B8 8FA40044 */ lw $a0, 0x0044($sp) -/* 0023C 80A154BC 0C0291BE */ jal func_800A46F8 +/* 00238 80A154B8 8FA40044 */ lw $a0, 0x0044($sp) +/* 0023C 80A154BC 0C0291BE */ jal SkelAnime_InitSV /* 00240 80A154C0 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC /* 00244 80A154C4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00248 80A154C8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0024C 80A154CC 0C016EFE */ jal func_8005BBF8 -/* 00250 80A154D0 8FA40044 */ lw $a0, 0x0044($sp) +/* 00248 80A154C8 AFA50034 */ sw $a1, 0x0034($sp) +/* 0024C 80A154CC 0C016EFE */ jal func_8005BBF8 +/* 00250 80A154D0 8FA40044 */ lw $a0, 0x0044($sp) /* 00254 80A154D4 3C0780A1 */ lui $a3, %hi(D_80A17040) ## $a3 = 80A10000 /* 00258 80A154D8 2608016C */ addiu $t0, $s0, 0x016C ## $t0 = 0000016C -/* 0025C 80A154DC 8FA50034 */ lw $a1, 0x0034($sp) -/* 00260 80A154E0 AFA80010 */ sw $t0, 0x0010($sp) +/* 0025C 80A154DC 8FA50034 */ lw $a1, 0x0034($sp) +/* 00260 80A154E0 AFA80010 */ sw $t0, 0x0010($sp) /* 00264 80A154E4 24E77040 */ addiu $a3, $a3, %lo(D_80A17040) ## $a3 = 80A17040 -/* 00268 80A154E8 8FA40044 */ lw $a0, 0x0044($sp) -/* 0026C 80A154EC 0C017014 */ jal func_8005C050 +/* 00268 80A154E8 8FA40044 */ lw $a0, 0x0044($sp) +/* 0026C 80A154EC 0C017014 */ jal func_8005C050 /* 00270 80A154F0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00274 80A154F4 24090032 */ addiu $t1, $zero, 0x0032 ## $t1 = 00000032 /* 00278 80A154F8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 0027C 80A154FC A20900AE */ sb $t1, 0x00AE($s0) ## 000000AE /* 00280 80A15500 3C0180A1 */ lui $at, %hi(D_80A17194) ## $at = 80A10000 -/* 00284 80A15504 C4247194 */ lwc1 $f4, %lo(D_80A17194)($at) -/* 00288 80A15508 46040182 */ mul.s $f6, $f0, $f4 -/* 0028C 80A1550C 4600320D */ trunc.w.s $f8, $f6 -/* 00290 80A15510 440B4000 */ mfc1 $t3, $f8 +/* 00284 80A15504 C4247194 */ lwc1 $f4, %lo(D_80A17194)($at) +/* 00288 80A15508 46040182 */ mul.s $f6, $f0, $f4 +/* 0028C 80A1550C 4600320D */ trunc.w.s $f8, $f6 +/* 00290 80A15510 440B4000 */ mfc1 $t3, $f8 /* 00294 80A15514 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00298 80A15518 A60B024C */ sh $t3, 0x024C($s0) ## 0000024C /* 0029C 80A1551C 3C0180A1 */ lui $at, %hi(D_80A17198) ## $at = 80A10000 -/* 002A0 80A15520 C42A7198 */ lwc1 $f10, %lo(D_80A17198)($at) -/* 002A4 80A15524 87A2003A */ lh $v0, 0x003A($sp) +/* 002A0 80A15520 C42A7198 */ lwc1 $f10, %lo(D_80A17198)($at) +/* 002A4 80A15524 87A2003A */ lh $v0, 0x003A($sp) /* 002A8 80A15528 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 002AC 80A1552C 460A0402 */ mul.s $f16, $f0, $f10 +/* 002AC 80A1552C 460A0402 */ mul.s $f16, $f0, $f10 /* 002B0 80A15530 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 002B4 80A15534 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 002B8 80A15538 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 002BC 80A1553C 4600848D */ trunc.w.s $f18, $f16 -/* 002C0 80A15540 440D9000 */ mfc1 $t5, $f18 -/* 002C4 80A15544 1440000B */ bne $v0, $zero, .L80A15574 +/* 002BC 80A1553C 4600848D */ trunc.w.s $f18, $f16 +/* 002C0 80A15540 440D9000 */ mfc1 $t5, $f18 +/* 002C4 80A15544 1440000B */ bne $v0, $zero, .L80A15574 /* 002C8 80A15548 A60D024E */ sh $t5, 0x024E($s0) ## 0000024E /* 002CC 80A1554C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 002D0 80A15550 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 002D4 80A15554 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 /* 002D8 80A15558 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 /* 002DC 80A1555C 0C00AC78 */ jal ActorShape_Init - + /* 002E0 80A15560 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 002E4 80A15564 0C2857C9 */ jal func_80A15F24 +/* 002E4 80A15564 0C2857C9 */ jal func_80A15F24 /* 002E8 80A15568 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002EC 80A1556C 1000000A */ beq $zero, $zero, .L80A15598 -/* 002F0 80A15570 8FBF002C */ lw $ra, 0x002C($sp) +/* 002EC 80A1556C 1000000A */ beq $zero, $zero, .L80A15598 +/* 002F0 80A15570 8FBF002C */ lw $ra, 0x002C($sp) .L80A15574: -/* 002F4 80A15574 14410005 */ bne $v0, $at, .L80A1558C +/* 002F4 80A15574 14410005 */ bne $v0, $at, .L80A1558C /* 002F8 80A15578 00000000 */ nop -/* 002FC 80A1557C 0C285986 */ jal func_80A16618 +/* 002FC 80A1557C 0C285986 */ jal func_80A16618 /* 00300 80A15580 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00304 80A15584 10000004 */ beq $zero, $zero, .L80A15598 -/* 00308 80A15588 8FBF002C */ lw $ra, 0x002C($sp) +/* 00304 80A15584 10000004 */ beq $zero, $zero, .L80A15598 +/* 00308 80A15588 8FBF002C */ lw $ra, 0x002C($sp) .L80A1558C: -/* 0030C 80A1558C 0C2855E9 */ jal func_80A157A4 +/* 0030C 80A1558C 0C2855E9 */ jal func_80A157A4 /* 00310 80A15590 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00314 80A15594 8FBF002C */ lw $ra, 0x002C($sp) +/* 00314 80A15594 8FBF002C */ lw $ra, 0x002C($sp) .L80A15598: -/* 00318 80A15598 8FB00028 */ lw $s0, 0x0028($sp) +/* 00318 80A15598 8FB00028 */ lw $s0, 0x0028($sp) /* 0031C 80A1559C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00320 80A155A0 03E00008 */ jr $ra +/* 00320 80A155A0 03E00008 */ jr $ra /* 00324 80A155A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s index eb25b0f8fe..870db11dfd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s @@ -1,68 +1,68 @@ glabel EnFloormas_Draw /* 02D44 80A1A254 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02D48 80A1A258 AFB10028 */ sw $s1, 0x0028($sp) +/* 02D48 80A1A258 AFB10028 */ sw $s1, 0x0028($sp) /* 02D4C 80A1A25C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02D50 80A1A260 AFBF002C */ sw $ra, 0x002C($sp) -/* 02D54 80A1A264 AFB00024 */ sw $s0, 0x0024($sp) +/* 02D50 80A1A260 AFBF002C */ sw $ra, 0x002C($sp) +/* 02D54 80A1A264 AFB00024 */ sw $s0, 0x0024($sp) /* 02D58 80A1A268 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02D5C 80A1A26C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02D60 80A1A270 3C0680A2 */ lui $a2, %hi(D_80A1A514) ## $a2 = 80A20000 /* 02D64 80A1A274 24C6A514 */ addiu $a2, $a2, %lo(D_80A1A514) ## $a2 = 80A1A514 /* 02D68 80A1A278 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 02D6C 80A1A27C 2407090E */ addiu $a3, $zero, 0x090E ## $a3 = 0000090E -/* 02D70 80A1A280 0C031AB1 */ jal func_800C6AC4 -/* 02D74 80A1A284 AFA50048 */ sw $a1, 0x0048($sp) -/* 02D78 80A1A288 0C024F46 */ jal func_80093D18 +/* 02D70 80A1A280 0C031AB1 */ jal func_800C6AC4 +/* 02D74 80A1A284 AFA50048 */ sw $a1, 0x0048($sp) +/* 02D78 80A1A288 0C024F46 */ jal func_80093D18 /* 02D7C 80A1A28C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 02D80 80A1A290 920E02DC */ lbu $t6, 0x02DC($s0) ## 000002DC /* 02D84 80A1A294 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 02D88 80A1A298 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02D8C 80A1A29C 15C1000A */ bne $t6, $at, .L80A1A2C8 +/* 02D8C 80A1A29C 15C1000A */ bne $t6, $at, .L80A1A2C8 /* 02D90 80A1A2A0 3C0580A2 */ lui $a1, %hi(D_80A1A4F4) ## $a1 = 80A20000 /* 02D94 80A1A2A4 86060196 */ lh $a2, 0x0196($s0) ## 00000196 /* 02D98 80A1A2A8 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 /* 02D9C 80A1A2AC 24A5A4F4 */ addiu $a1, $a1, %lo(D_80A1A4F4) ## $a1 = 80A1A4F4 -/* 02DA0 80A1A2B0 00C1001A */ div $zero, $a2, $at -/* 02DA4 80A1A2B4 00003010 */ mfhi $a2 -/* 02DA8 80A1A2B8 00063400 */ sll $a2, $a2, 16 -/* 02DAC 80A1A2BC 00063403 */ sra $a2, $a2, 16 -/* 02DB0 80A1A2C0 0C00988C */ jal func_80026230 +/* 02DA0 80A1A2B0 00C1001A */ div $zero, $a2, $at +/* 02DA4 80A1A2B4 00003010 */ mfhi $a2 +/* 02DA8 80A1A2B8 00063400 */ sll $a2, $a2, 16 +/* 02DAC 80A1A2BC 00063403 */ sra $a2, $a2, 16 +/* 02DB0 80A1A2C0 0C00988C */ jal func_80026230 /* 02DB4 80A1A2C4 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 .L80A1A2C8: /* 02DB8 80A1A2C8 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 02DBC 80A1A2CC 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 02DC0 80A1A2D0 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 02DC4 80A1A2D4 8FB90048 */ lw $t9, 0x0048($sp) +/* 02DC4 80A1A2D4 8FB90048 */ lw $t9, 0x0048($sp) /* 02DC8 80A1A2D8 3C0F80A2 */ lui $t7, %hi(func_80A1A128) ## $t7 = 80A20000 /* 02DCC 80A1A2DC 3C1880A2 */ lui $t8, %hi(func_80A1A160) ## $t8 = 80A20000 /* 02DD0 80A1A2E0 2718A160 */ addiu $t8, $t8, %lo(func_80A1A160) ## $t8 = 80A1A160 /* 02DD4 80A1A2E4 25EFA128 */ addiu $t7, $t7, %lo(func_80A1A128) ## $t7 = 80A1A128 -/* 02DD8 80A1A2E8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02DDC 80A1A2EC AFB80014 */ sw $t8, 0x0014($sp) -/* 02DE0 80A1A2F0 AFB00018 */ sw $s0, 0x0018($sp) +/* 02DD8 80A1A2E8 AFAF0010 */ sw $t7, 0x0010($sp) +/* 02DDC 80A1A2EC AFB80014 */ sw $t8, 0x0014($sp) +/* 02DE0 80A1A2F0 AFB00018 */ sw $s0, 0x0018($sp) /* 02DE4 80A1A2F4 8F2802C0 */ lw $t0, 0x02C0($t9) ## 000002C0 /* 02DE8 80A1A2F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02DEC 80A1A2FC 0C0289CF */ jal func_800A273C -/* 02DF0 80A1A300 AFA8001C */ sw $t0, 0x001C($sp) -/* 02DF4 80A1A304 8FA90048 */ lw $t1, 0x0048($sp) +/* 02DEC 80A1A2FC 0C0289CF */ jal SkelAnime_DrawSV2 +/* 02DF0 80A1A300 AFA8001C */ sw $t0, 0x001C($sp) +/* 02DF4 80A1A304 8FA90048 */ lw $t1, 0x0048($sp) /* 02DF8 80A1A308 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 02DFC 80A1A30C AD2202C0 */ sw $v0, 0x02C0($t1) ## 000002C0 /* 02E00 80A1A310 920A02DC */ lbu $t2, 0x02DC($s0) ## 000002DC -/* 02E04 80A1A314 15410003 */ bne $t2, $at, .L80A1A324 +/* 02E04 80A1A314 15410003 */ bne $t2, $at, .L80A1A324 /* 02E08 80A1A318 00000000 */ nop -/* 02E0C 80A1A31C 0C009982 */ jal func_80026608 +/* 02E0C 80A1A31C 0C009982 */ jal func_80026608 /* 02E10 80A1A320 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80A1A324: /* 02E14 80A1A324 3C0680A2 */ lui $a2, %hi(D_80A1A528) ## $a2 = 80A20000 /* 02E18 80A1A328 24C6A528 */ addiu $a2, $a2, %lo(D_80A1A528) ## $a2 = 80A1A528 /* 02E1C 80A1A32C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 02E20 80A1A330 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02E24 80A1A334 0C031AD5 */ jal func_800C6B54 +/* 02E24 80A1A334 0C031AD5 */ jal func_800C6B54 /* 02E28 80A1A338 24070924 */ addiu $a3, $zero, 0x0924 ## $a3 = 00000924 -/* 02E2C 80A1A33C 8FBF002C */ lw $ra, 0x002C($sp) -/* 02E30 80A1A340 8FB00024 */ lw $s0, 0x0024($sp) -/* 02E34 80A1A344 8FB10028 */ lw $s1, 0x0028($sp) -/* 02E38 80A1A348 03E00008 */ jr $ra +/* 02E2C 80A1A33C 8FBF002C */ lw $ra, 0x002C($sp) +/* 02E30 80A1A340 8FB00024 */ lw $s0, 0x0024($sp) +/* 02E34 80A1A344 8FB10028 */ lw $s1, 0x0028($sp) +/* 02E38 80A1A348 03E00008 */ jr $ra /* 02E3C 80A1A34C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s index bcc83e12b2..a6fb262a8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s @@ -1,58 +1,58 @@ glabel EnFloormas_Init /* 00000 80A17510 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 80A17514 AFB10030 */ sw $s1, 0x0030($sp) +/* 00004 80A17514 AFB10030 */ sw $s1, 0x0030($sp) /* 00008 80A17518 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 80A1751C AFBF0034 */ sw $ra, 0x0034($sp) -/* 00010 80A17520 AFB0002C */ sw $s0, 0x002C($sp) +/* 0000C 80A1751C AFBF0034 */ sw $ra, 0x0034($sp) +/* 00010 80A17520 AFB0002C */ sw $s0, 0x002C($sp) /* 00014 80A17524 3C0580A2 */ lui $a1, %hi(D_80A1A4C4) ## $a1 = 80A20000 /* 00018 80A17528 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0001C 80A1752C 0C01E037 */ jal Actor_ProcessInitChain - + /* 00020 80A17530 24A5A4C4 */ addiu $a1, $a1, %lo(D_80A1A4C4) ## $a1 = 80A1A4C4 /* 00024 80A17534 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00028 80A17538 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0002C 80A1753C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00030 80A17540 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00034 80A17544 0C00AC78 */ jal ActorShape_Init - + /* 00038 80A17548 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 0003C 80A1754C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00040 80A17550 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 00044 80A17554 260E019C */ addiu $t6, $s0, 0x019C ## $t6 = 0000019C /* 00048 80A17558 260F0232 */ addiu $t7, $s0, 0x0232 ## $t7 = 00000232 /* 0004C 80A1755C 24180019 */ addiu $t8, $zero, 0x0019 ## $t8 = 00000019 -/* 00050 80A17560 AFB80018 */ sw $t8, 0x0018($sp) -/* 00054 80A17564 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00058 80A17568 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00050 80A17560 AFB80018 */ sw $t8, 0x0018($sp) +/* 00054 80A17564 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00058 80A17568 AFAE0010 */ sw $t6, 0x0010($sp) /* 0005C 80A1756C 24E79DB0 */ addiu $a3, $a3, 0x9DB0 ## $a3 = 06009DB0 /* 00060 80A17570 24C68FB0 */ addiu $a2, $a2, 0x8FB0 ## $a2 = 06008FB0 /* 00064 80A17574 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00068 80A17578 0C0291BE */ jal func_800A46F8 +/* 00068 80A17578 0C0291BE */ jal SkelAnime_InitSV /* 0006C 80A1757C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00070 80A17580 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8 -/* 00074 80A17584 AFA5003C */ sw $a1, 0x003C($sp) +/* 00074 80A17584 AFA5003C */ sw $a1, 0x003C($sp) /* 00078 80A17588 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 0007C 80A1758C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00080 80A17590 3C0780A2 */ lui $a3, %hi(D_80A1A470) ## $a3 = 80A20000 -/* 00084 80A17594 8FA5003C */ lw $a1, 0x003C($sp) +/* 00084 80A17594 8FA5003C */ lw $a1, 0x003C($sp) /* 00088 80A17598 24E7A470 */ addiu $a3, $a3, %lo(D_80A1A470) ## $a3 = 80A1A470 /* 0008C 80A1759C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00090 80A175A0 0C01712B */ jal ActorCollider_InitCylinder - + /* 00094 80A175A4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00098 80A175A8 3C0580A2 */ lui $a1, %hi(D_80A1A4A4) ## $a1 = 80A20000 /* 0009C 80A175AC 3C0680A2 */ lui $a2, %hi(D_80A1A49C) ## $a2 = 80A20000 /* 000A0 80A175B0 24C6A49C */ addiu $a2, $a2, %lo(D_80A1A49C) ## $a2 = 80A1A49C /* 000A4 80A175B4 24A5A4A4 */ addiu $a1, $a1, %lo(D_80A1A4A4) ## $a1 = 80A1A4A4 -/* 000A8 80A175B8 0C0187B5 */ jal func_80061ED4 +/* 000A8 80A175B8 0C0187B5 */ jal func_80061ED4 /* 000AC 80A175BC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 000B0 80A175C0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 000B4 80A175C4 2419F9C0 */ addiu $t9, $zero, 0xF9C0 ## $t9 = FFFFF9C0 /* 000B8 80A175C8 A6190198 */ sh $t9, 0x0198($s0) ## 00000198 /* 000BC 80A175CC 30438000 */ andi $v1, $v0, 0x8000 ## $v1 = 00000000 /* 000C0 80A175D0 30497FFF */ andi $t1, $v0, 0x7FFF ## $t1 = 00000000 -/* 000C4 80A175D4 10600007 */ beq $v1, $zero, .L80A175F4 +/* 000C4 80A175D4 10600007 */ beq $v1, $zero, .L80A175F4 /* 000C8 80A175D8 A609001C */ sh $t1, 0x001C($s0) ## 0000001C /* 000CC 80A175DC 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 000D0 80A175E0 3C0C80A2 */ lui $t4, %hi(func_80A1A350) ## $t4 = 80A20000 @@ -64,68 +64,68 @@ glabel EnFloormas_Init /* 000E4 80A175F4 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 000E8 80A175F8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 /* 000EC 80A175FC 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 000F0 80A17600 15A1000A */ bne $t5, $at, .L80A1762C +/* 000F0 80A17600 15A1000A */ bne $t5, $at, .L80A1762C /* 000F4 80A17604 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 000F8 80A17608 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 000FC 80A1760C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00100 80A17610 3C1880A2 */ lui $t8, %hi(func_80A19B9C) ## $t8 = 80A20000 /* 00104 80A17614 27189B9C */ addiu $t8, $t8, %lo(func_80A19B9C) ## $t8 = 80A19B9C -/* 00108 80A17618 01C17824 */ and $t7, $t6, $at +/* 00108 80A17618 01C17824 */ and $t7, $t6, $at /* 0010C 80A1761C AE000134 */ sw $zero, 0x0134($s0) ## 00000134 /* 00110 80A17620 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00114 80A17624 10000039 */ beq $zero, $zero, .L80A1770C +/* 00114 80A17624 10000039 */ beq $zero, $zero, .L80A1770C /* 00118 80A17628 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 .L80A1762C: /* 0011C 80A1762C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 00120 80A17630 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 /* 00124 80A17634 24680010 */ addiu $t0, $v1, 0x0010 ## $t0 = 00000010 -/* 00128 80A17638 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00128 80A17638 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0012C 80A1763C C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00130 80A17640 00084400 */ sll $t0, $t0, 16 -/* 00134 80A17644 00084403 */ sra $t0, $t0, 16 -/* 00138 80A17648 AFA80024 */ sw $t0, 0x0024($sp) -/* 0013C 80A1764C AFA8003C */ sw $t0, 0x003C($sp) -/* 00140 80A17650 AFA40038 */ sw $a0, 0x0038($sp) -/* 00144 80A17654 AFA00020 */ sw $zero, 0x0020($sp) -/* 00148 80A17658 AFA0001C */ sw $zero, 0x001C($sp) -/* 0014C 80A1765C AFA00018 */ sw $zero, 0x0018($sp) +/* 00130 80A17640 00084400 */ sll $t0, $t0, 16 +/* 00134 80A17644 00084403 */ sra $t0, $t0, 16 +/* 00138 80A17648 AFA80024 */ sw $t0, 0x0024($sp) +/* 0013C 80A1764C AFA8003C */ sw $t0, 0x003C($sp) +/* 00140 80A17650 AFA40038 */ sw $a0, 0x0038($sp) +/* 00144 80A17654 AFA00020 */ sw $zero, 0x0020($sp) +/* 00148 80A17658 AFA0001C */ sw $zero, 0x001C($sp) +/* 0014C 80A1765C AFA00018 */ sw $zero, 0x0018($sp) /* 00150 80A17660 2406008E */ addiu $a2, $zero, 0x008E ## $a2 = 0000008E /* 00154 80A17664 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00158 80A17668 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 0015C 80A1766C 8FA40038 */ lw $a0, 0x0038($sp) -/* 00160 80A17670 8FA8003C */ lw $t0, 0x003C($sp) -/* 00164 80A17674 14400005 */ bne $v0, $zero, .L80A1768C +/* 00158 80A17668 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 0015C 80A1766C 8FA40038 */ lw $a0, 0x0038($sp) +/* 00160 80A17670 8FA8003C */ lw $t0, 0x003C($sp) +/* 00164 80A17674 14400005 */ bne $v0, $zero, .L80A1768C /* 00168 80A17678 AE020118 */ sw $v0, 0x0118($s0) ## 00000118 /* 0016C 80A1767C 0C00B55C */ jal Actor_Kill - + /* 00170 80A17680 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00174 80A17684 10000022 */ beq $zero, $zero, .L80A17710 -/* 00178 80A17688 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00174 80A17684 10000022 */ beq $zero, $zero, .L80A17710 +/* 00178 80A17688 8FBF0034 */ lw $ra, 0x0034($sp) .L80A1768C: /* 0017C 80A1768C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 00180 80A17690 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 /* 00184 80A17694 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00188 80A17698 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00188 80A17698 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0018C 80A1769C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00190 80A176A0 AFA80024 */ sw $t0, 0x0024($sp) -/* 00194 80A176A4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00198 80A176A8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0019C 80A176AC AFA00018 */ sw $zero, 0x0018($sp) +/* 00190 80A176A0 AFA80024 */ sw $t0, 0x0024($sp) +/* 00194 80A176A4 AFA00020 */ sw $zero, 0x0020($sp) +/* 00198 80A176A8 AFA0001C */ sw $zero, 0x001C($sp) +/* 0019C 80A176AC AFA00018 */ sw $zero, 0x0018($sp) /* 001A0 80A176B0 2406008E */ addiu $a2, $zero, 0x008E ## $a2 = 0000008E /* 001A4 80A176B4 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 001A8 80A176B8 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 001AC 80A176BC 14400007 */ bne $v0, $zero, .L80A176DC +/* 001A8 80A176B8 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 001AC 80A176BC 14400007 */ bne $v0, $zero, .L80A176DC /* 001B0 80A176C0 AE02011C */ sw $v0, 0x011C($s0) ## 0000011C /* 001B4 80A176C4 0C00B55C */ jal Actor_Kill - + /* 001B8 80A176C8 8E040118 */ lw $a0, 0x0118($s0) ## 00000118 /* 001BC 80A176CC 0C00B55C */ jal Actor_Kill - + /* 001C0 80A176D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001C4 80A176D4 1000000E */ beq $zero, $zero, .L80A17710 -/* 001C8 80A176D8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 001C4 80A176D4 1000000E */ beq $zero, $zero, .L80A17710 +/* 001C8 80A176D8 8FBF0034 */ lw $ra, 0x0034($sp) .L80A176DC: /* 001CC 80A176DC 8E190118 */ lw $t9, 0x0118($s0) ## 00000118 /* 001D0 80A176E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -137,14 +137,14 @@ glabel EnFloormas_Init /* 001E8 80A176F8 AD700118 */ sw $s0, 0x0118($t3) ## 00000118 /* 001EC 80A176FC 8E0D011C */ lw $t5, 0x011C($s0) ## 0000011C /* 001F0 80A17700 8E0C0118 */ lw $t4, 0x0118($s0) ## 00000118 -/* 001F4 80A17704 0C285DE0 */ jal func_80A17780 +/* 001F4 80A17704 0C285DE0 */ jal func_80A17780 /* 001F8 80A17708 ADAC011C */ sw $t4, 0x011C($t5) ## 0000011C .L80A1770C: -/* 001FC 80A1770C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 001FC 80A1770C 8FBF0034 */ lw $ra, 0x0034($sp) .L80A17710: -/* 00200 80A17710 8FB0002C */ lw $s0, 0x002C($sp) -/* 00204 80A17714 8FB10030 */ lw $s1, 0x0030($sp) -/* 00208 80A17718 03E00008 */ jr $ra +/* 00200 80A17710 8FB0002C */ lw $s0, 0x002C($sp) +/* 00204 80A17714 8FB10030 */ lw $s1, 0x0030($sp) +/* 00208 80A17718 03E00008 */ jr $ra /* 0020C 80A1771C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s index e615cf5d34..078946b3d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s @@ -1,19 +1,19 @@ glabel func_80A17808 /* 002F8 80A17808 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002FC 80A1780C AFBF0014 */ sw $ra, 0x0014($sp) +/* 002FC 80A1780C AFBF0014 */ sw $ra, 0x0014($sp) /* 00300 80A17810 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 /* 00304 80A17814 3C0E80A2 */ lui $t6, %hi(func_80A187E4) ## $t6 = 80A20000 /* 00308 80A17818 25CE87E4 */ addiu $t6, $t6, %lo(func_80A187E4) ## $t6 = 80A187E4 -/* 0030C 80A1781C 11CF0009 */ beq $t6, $t7, .L80A17844 +/* 0030C 80A1781C 11CF0009 */ beq $t6, $t7, .L80A17844 /* 00310 80A17820 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00314 80A17824 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00318 80A17828 24A541F4 */ addiu $a1, $a1, 0x41F4 ## $a1 = 060041F4 /* 0031C 80A1782C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00320 80A17830 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 00324 80A17834 0C0294E1 */ jal func_800A5384 -/* 00328 80A17838 AFA70018 */ sw $a3, 0x0018($sp) -/* 0032C 80A1783C 10000005 */ beq $zero, $zero, .L80A17854 -/* 00330 80A17840 8FA70018 */ lw $a3, 0x0018($sp) +/* 00324 80A17834 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00328 80A17838 AFA70018 */ sw $a3, 0x0018($sp) +/* 0032C 80A1783C 10000005 */ beq $zero, $zero, .L80A17854 +/* 00330 80A17840 8FA70018 */ lw $a3, 0x0018($sp) .L80A17844: /* 00334 80A17844 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 00338 80A17848 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 @@ -23,9 +23,9 @@ glabel func_80A17808 /* 00344 80A17854 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 /* 00348 80A17858 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 0034C 80A1785C 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00350 80A17860 AFA70018 */ sw $a3, 0x0018($sp) -/* 00354 80A17864 8FA70018 */ lw $a3, 0x0018($sp) + +/* 00350 80A17860 AFA70018 */ sw $a3, 0x0018($sp) +/* 00354 80A17864 8FA70018 */ lw $a3, 0x0018($sp) /* 00358 80A17868 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0035C 80A1786C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 /* 00360 80A17870 3C1880A2 */ lui $t8, %hi(func_80A18650) ## $t8 = 80A20000 @@ -33,9 +33,9 @@ glabel func_80A17808 /* 00368 80A17878 A4E20194 */ sh $v0, 0x0194($a3) ## 00000194 /* 0036C 80A1787C ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 00370 80A17880 E4E60068 */ swc1 $f6, 0x0068($a3) ## 00000068 -/* 00374 80A17884 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00374 80A17884 8FBF0014 */ lw $ra, 0x0014($sp) /* 00378 80A17888 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0037C 80A1788C 03E00008 */ jr $ra +/* 0037C 80A1788C 03E00008 */ jr $ra /* 00380 80A17890 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s index 0819aa8f5d..a7559e869d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s @@ -1,23 +1,23 @@ glabel func_80A17D4C /* 0083C 80A17D4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00840 80A17D50 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00840 80A17D50 AFBF0014 */ sw $ra, 0x0014($sp) /* 00844 80A17D54 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00848 80A17D58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0084C 80A17D5C 24A541F4 */ addiu $a1, $a1, 0x41F4 ## $a1 = 060041F4 -/* 00850 80A17D60 AFA70018 */ sw $a3, 0x0018($sp) +/* 00850 80A17D60 AFA70018 */ sw $a3, 0x0018($sp) /* 00854 80A17D64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00858 80A17D68 0C0294E1 */ jal func_800A5384 +/* 00858 80A17D68 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 0085C 80A17D6C 3C064090 */ lui $a2, 0x4090 ## $a2 = 40900000 -/* 00860 80A17D70 8FA70018 */ lw $a3, 0x0018($sp) +/* 00860 80A17D70 8FA70018 */ lw $a3, 0x0018($sp) /* 00864 80A17D74 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00868 80A17D78 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 0086C 80A17D7C 3C0E80A2 */ lui $t6, %hi(func_80A18FD8) ## $t6 = 80A20000 /* 00870 80A17D80 25CE8FD8 */ addiu $t6, $t6, %lo(func_80A18FD8) ## $t6 = 80A18FD8 /* 00874 80A17D84 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 00878 80A17D88 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 0087C 80A17D8C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0087C 80A17D8C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00880 80A17D90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00884 80A17D94 03E00008 */ jr $ra +/* 00884 80A17D94 03E00008 */ jr $ra /* 00888 80A17D98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s index f10c327e2b..a1684128da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s @@ -1,18 +1,18 @@ glabel func_80A17D9C /* 0088C 80A17D9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00890 80A17DA0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00890 80A17DA0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00894 80A17DA4 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 /* 00898 80A17DA8 3C0E80A2 */ lui $t6, %hi(func_80A18FD8) ## $t6 = 80A20000 /* 0089C 80A17DAC 25CE8FD8 */ addiu $t6, $t6, %lo(func_80A18FD8) ## $t6 = 80A18FD8 -/* 008A0 80A17DB0 11CF0008 */ beq $t6, $t7, .L80A17DD4 +/* 008A0 80A17DB0 11CF0008 */ beq $t6, $t7, .L80A17DD4 /* 008A4 80A17DB4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 008A8 80A17DB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008AC 80A17DBC 24A541F4 */ addiu $a1, $a1, 0x41F4 ## $a1 = 060041F4 /* 008B0 80A17DC0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 008B4 80A17DC4 3C064090 */ lui $a2, 0x4090 ## $a2 = 40900000 -/* 008B8 80A17DC8 0C0294E1 */ jal func_800A5384 -/* 008BC 80A17DCC AFA70018 */ sw $a3, 0x0018($sp) -/* 008C0 80A17DD0 8FA70018 */ lw $a3, 0x0018($sp) +/* 008B8 80A17DC8 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 008BC 80A17DCC AFA70018 */ sw $a3, 0x0018($sp) +/* 008C0 80A17DD0 8FA70018 */ lw $a3, 0x0018($sp) .L80A17DD4: /* 008C4 80A17DD4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 008C8 80A17DD8 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 @@ -20,9 +20,9 @@ glabel func_80A17D9C /* 008D0 80A17DE0 271890C8 */ addiu $t8, $t8, %lo(func_80A190C8) ## $t8 = 80A190C8 /* 008D4 80A17DE4 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 008D8 80A17DE8 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 008DC 80A17DEC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 008DC 80A17DEC 8FBF0014 */ lw $ra, 0x0014($sp) /* 008E0 80A17DF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008E4 80A17DF4 03E00008 */ jr $ra +/* 008E4 80A17DF4 03E00008 */ jr $ra /* 008E8 80A17DF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s index 91c9eda4e1..72b038cfa5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s @@ -1,68 +1,68 @@ glabel func_80A1A350 /* 02E40 80A1A350 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02E44 80A1A354 AFB10028 */ sw $s1, 0x0028($sp) +/* 02E44 80A1A354 AFB10028 */ sw $s1, 0x0028($sp) /* 02E48 80A1A358 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02E4C 80A1A35C AFBF002C */ sw $ra, 0x002C($sp) -/* 02E50 80A1A360 AFB00024 */ sw $s0, 0x0024($sp) +/* 02E4C 80A1A35C AFBF002C */ sw $ra, 0x002C($sp) +/* 02E50 80A1A360 AFB00024 */ sw $s0, 0x0024($sp) /* 02E54 80A1A364 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02E58 80A1A368 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02E5C 80A1A36C 3C0680A2 */ lui $a2, %hi(D_80A1A53C) ## $a2 = 80A20000 /* 02E60 80A1A370 24C6A53C */ addiu $a2, $a2, %lo(D_80A1A53C) ## $a2 = 80A1A53C /* 02E64 80A1A374 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 02E68 80A1A378 24070930 */ addiu $a3, $zero, 0x0930 ## $a3 = 00000930 -/* 02E6C 80A1A37C 0C031AB1 */ jal func_800C6AC4 -/* 02E70 80A1A380 AFA50048 */ sw $a1, 0x0048($sp) -/* 02E74 80A1A384 0C024F61 */ jal func_80093D84 +/* 02E6C 80A1A37C 0C031AB1 */ jal func_800C6AC4 +/* 02E70 80A1A380 AFA50048 */ sw $a1, 0x0048($sp) +/* 02E74 80A1A384 0C024F61 */ jal func_80093D84 /* 02E78 80A1A388 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 02E7C 80A1A38C 920E02DC */ lbu $t6, 0x02DC($s0) ## 000002DC /* 02E80 80A1A390 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 02E84 80A1A394 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02E88 80A1A398 15C1000A */ bne $t6, $at, .L80A1A3C4 +/* 02E88 80A1A398 15C1000A */ bne $t6, $at, .L80A1A3C4 /* 02E8C 80A1A39C 3C0580A2 */ lui $a1, %hi(D_80A1A4F4) ## $a1 = 80A20000 /* 02E90 80A1A3A0 86060196 */ lh $a2, 0x0196($s0) ## 00000196 /* 02E94 80A1A3A4 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 /* 02E98 80A1A3A8 24A5A4F4 */ addiu $a1, $a1, %lo(D_80A1A4F4) ## $a1 = 80A1A4F4 -/* 02E9C 80A1A3AC 00C1001A */ div $zero, $a2, $at -/* 02EA0 80A1A3B0 00003010 */ mfhi $a2 -/* 02EA4 80A1A3B4 00063400 */ sll $a2, $a2, 16 -/* 02EA8 80A1A3B8 00063403 */ sra $a2, $a2, 16 -/* 02EAC 80A1A3BC 0C0099A4 */ jal func_80026690 +/* 02E9C 80A1A3AC 00C1001A */ div $zero, $a2, $at +/* 02EA0 80A1A3B0 00003010 */ mfhi $a2 +/* 02EA4 80A1A3B4 00063400 */ sll $a2, $a2, 16 +/* 02EA8 80A1A3B8 00063403 */ sra $a2, $a2, 16 +/* 02EAC 80A1A3BC 0C0099A4 */ jal func_80026690 /* 02EB0 80A1A3C0 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 .L80A1A3C4: /* 02EB4 80A1A3C4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 02EB8 80A1A3C8 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 02EBC 80A1A3CC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 02EC0 80A1A3D0 8FB90048 */ lw $t9, 0x0048($sp) +/* 02EC0 80A1A3D0 8FB90048 */ lw $t9, 0x0048($sp) /* 02EC4 80A1A3D4 3C0F80A2 */ lui $t7, %hi(func_80A1A128) ## $t7 = 80A20000 /* 02EC8 80A1A3D8 3C1880A2 */ lui $t8, %hi(func_80A1A160) ## $t8 = 80A20000 /* 02ECC 80A1A3DC 2718A160 */ addiu $t8, $t8, %lo(func_80A1A160) ## $t8 = 80A1A160 /* 02ED0 80A1A3E0 25EFA128 */ addiu $t7, $t7, %lo(func_80A1A128) ## $t7 = 80A1A128 -/* 02ED4 80A1A3E4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02ED8 80A1A3E8 AFB80014 */ sw $t8, 0x0014($sp) -/* 02EDC 80A1A3EC AFB00018 */ sw $s0, 0x0018($sp) +/* 02ED4 80A1A3E4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 02ED8 80A1A3E8 AFB80014 */ sw $t8, 0x0014($sp) +/* 02EDC 80A1A3EC AFB00018 */ sw $s0, 0x0018($sp) /* 02EE0 80A1A3F0 8F2802D0 */ lw $t0, 0x02D0($t9) ## 000002D0 /* 02EE4 80A1A3F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02EE8 80A1A3F8 0C0289CF */ jal func_800A273C -/* 02EEC 80A1A3FC AFA8001C */ sw $t0, 0x001C($sp) -/* 02EF0 80A1A400 8FA90048 */ lw $t1, 0x0048($sp) +/* 02EE8 80A1A3F8 0C0289CF */ jal SkelAnime_DrawSV2 +/* 02EEC 80A1A3FC AFA8001C */ sw $t0, 0x001C($sp) +/* 02EF0 80A1A400 8FA90048 */ lw $t1, 0x0048($sp) /* 02EF4 80A1A404 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 02EF8 80A1A408 AD2202D0 */ sw $v0, 0x02D0($t1) ## 000002D0 /* 02EFC 80A1A40C 920A02DC */ lbu $t2, 0x02DC($s0) ## 000002DC -/* 02F00 80A1A410 15410003 */ bne $t2, $at, .L80A1A420 +/* 02F00 80A1A410 15410003 */ bne $t2, $at, .L80A1A420 /* 02F04 80A1A414 00000000 */ nop -/* 02F08 80A1A418 0C009A9B */ jal func_80026A6C +/* 02F08 80A1A418 0C009A9B */ jal func_80026A6C /* 02F0C 80A1A41C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80A1A420: /* 02F10 80A1A420 3C0680A2 */ lui $a2, %hi(D_80A1A550) ## $a2 = 80A20000 /* 02F14 80A1A424 24C6A550 */ addiu $a2, $a2, %lo(D_80A1A550) ## $a2 = 80A1A550 /* 02F18 80A1A428 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 02F1C 80A1A42C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02F20 80A1A430 0C031AD5 */ jal func_800C6B54 +/* 02F20 80A1A430 0C031AD5 */ jal func_800C6B54 /* 02F24 80A1A434 24070946 */ addiu $a3, $zero, 0x0946 ## $a3 = 00000946 -/* 02F28 80A1A438 8FBF002C */ lw $ra, 0x002C($sp) -/* 02F2C 80A1A43C 8FB00024 */ lw $s0, 0x0024($sp) -/* 02F30 80A1A440 8FB10028 */ lw $s1, 0x0028($sp) -/* 02F34 80A1A444 03E00008 */ jr $ra +/* 02F28 80A1A438 8FBF002C */ lw $ra, 0x002C($sp) +/* 02F2C 80A1A43C 8FB00024 */ lw $s0, 0x0024($sp) +/* 02F30 80A1A440 8FB10028 */ lw $s1, 0x0028($sp) +/* 02F34 80A1A444 03E00008 */ jr $ra /* 02F38 80A1A448 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 02F3C 80A1A44C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s index abbce08957..42cfe0e635 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s @@ -1,110 +1,110 @@ glabel EnFr_Update /* 002A4 80A1AC44 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 002A8 80A1AC48 AFB00024 */ sw $s0, 0x0024($sp) +/* 002A8 80A1AC48 AFB00024 */ sw $s0, 0x0024($sp) /* 002AC 80A1AC4C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 002B0 80A1AC50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002B4 80A1AC54 AFB10028 */ sw $s1, 0x0028($sp) +/* 002B4 80A1AC54 AFB10028 */ sw $s1, 0x0028($sp) /* 002B8 80A1AC58 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 002BC 80A1AC5C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 002C0 80A1AC60 AFBF002C */ sw $ra, 0x002C($sp) -/* 002C4 80A1AC64 00A12021 */ addu $a0, $a1, $at +/* 002C0 80A1AC60 AFBF002C */ sw $ra, 0x002C($sp) +/* 002C4 80A1AC64 00A12021 */ addu $a0, $a1, $at /* 002C8 80A1AC68 0C026062 */ jal Object_IsLoaded - + /* 002CC 80A1AC6C 8205036A */ lb $a1, 0x036A($s0) ## 0000036A -/* 002D0 80A1AC70 104000AD */ beq $v0, $zero, .L80A1AF28 +/* 002D0 80A1AC70 104000AD */ beq $v0, $zero, .L80A1AF28 /* 002D4 80A1AC74 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 002D8 80A1AC78 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 002DC 80A1AC7C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 002E0 80A1AC80 3C0580A2 */ lui $a1, %hi(D_80A1D0BC) ## $a1 = 80A20000 -/* 002E4 80A1AC84 01C17824 */ and $t7, $t6, $at +/* 002E4 80A1AC84 01C17824 */ and $t7, $t6, $at /* 002E8 80A1AC88 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = FFFFFFFF -/* 002EC 80A1AC8C 0002C080 */ sll $t8, $v0, 2 +/* 002EC 80A1AC8C 0002C080 */ sll $t8, $v0, 2 /* 002F0 80A1AC90 3C0180A2 */ lui $at, %hi(D_80A1CFF4) ## $at = 80A20000 /* 002F4 80A1AC94 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 002F8 80A1AC98 00380821 */ addu $at, $at, $t8 -/* 002FC 80A1AC9C AC30CFF4 */ sw $s0, %lo(D_80A1CFF4)($at) -/* 00300 80A1ACA0 AFA2003C */ sw $v0, 0x003C($sp) +/* 002F8 80A1AC98 00380821 */ addu $at, $at, $t8 +/* 002FC 80A1AC9C AC30CFF4 */ sw $s0, %lo(D_80A1CFF4)($at) +/* 00300 80A1ACA0 AFA2003C */ sw $v0, 0x003C($sp) /* 00304 80A1ACA4 24A5D0BC */ addiu $a1, $a1, %lo(D_80A1D0BC) ## $a1 = 80A1D0BC /* 00308 80A1ACA8 0C01E037 */ jal Actor_ProcessInitChain - + /* 0030C 80A1ACAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00310 80A1ACB0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00314 80A1ACB4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00318 80A1ACB8 26190190 */ addiu $t9, $s0, 0x0190 ## $t9 = 00000190 /* 0031C 80A1ACBC 26080220 */ addiu $t0, $s0, 0x0220 ## $t0 = 00000220 /* 00320 80A1ACC0 24090018 */ addiu $t1, $zero, 0x0018 ## $t1 = 00000018 -/* 00324 80A1ACC4 AFA90018 */ sw $t1, 0x0018($sp) -/* 00328 80A1ACC8 AFA80014 */ sw $t0, 0x0014($sp) -/* 0032C 80A1ACCC AFB90010 */ sw $t9, 0x0010($sp) +/* 00324 80A1ACC4 AFA90018 */ sw $t1, 0x0018($sp) +/* 00328 80A1ACC8 AFA80014 */ sw $t0, 0x0014($sp) +/* 0032C 80A1ACCC AFB90010 */ sw $t9, 0x0010($sp) /* 00330 80A1ACD0 24E71534 */ addiu $a3, $a3, 0x1534 ## $a3 = 06001534 /* 00334 80A1ACD4 24C6B498 */ addiu $a2, $a2, 0xB498 ## $a2 = 0600B498 /* 00338 80A1ACD8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0033C 80A1ACDC 0C0291BE */ jal func_800A46F8 +/* 0033C 80A1ACDC 0C0291BE */ jal SkelAnime_InitSV /* 00340 80A1ACE0 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00344 80A1ACE4 3C060500 */ lui $a2, 0x0500 ## $a2 = 05000000 /* 00348 80A1ACE8 3C070500 */ lui $a3, 0x0500 ## $a3 = 05000000 /* 0034C 80A1ACEC 260A02F4 */ addiu $t2, $s0, 0x02F4 ## $t2 = 000002F4 /* 00350 80A1ACF0 260B0324 */ addiu $t3, $s0, 0x0324 ## $t3 = 00000324 /* 00354 80A1ACF4 240C0008 */ addiu $t4, $zero, 0x0008 ## $t4 = 00000008 -/* 00358 80A1ACF8 AFAC0018 */ sw $t4, 0x0018($sp) -/* 0035C 80A1ACFC AFAB0014 */ sw $t3, 0x0014($sp) -/* 00360 80A1AD00 AFAA0010 */ sw $t2, 0x0010($sp) +/* 00358 80A1ACF8 AFAC0018 */ sw $t4, 0x0018($sp) +/* 0035C 80A1ACFC AFAB0014 */ sw $t3, 0x0014($sp) +/* 00360 80A1AD00 AFAA0010 */ sw $t2, 0x0010($sp) /* 00364 80A1AD04 24E72470 */ addiu $a3, $a3, 0x2470 ## $a3 = 05002470 /* 00368 80A1AD08 24C636F0 */ addiu $a2, $a2, 0x36F0 ## $a2 = 050036F0 /* 0036C 80A1AD0C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00370 80A1AD10 0C02915F */ jal SkelAnime_Init - + /* 00374 80A1AD14 260502B0 */ addiu $a1, $s0, 0x02B0 ## $a1 = 000002B0 /* 00378 80A1AD18 2606035C */ addiu $a2, $s0, 0x035C ## $a2 = 0000035C -/* 0037C 80A1AD1C AFA60030 */ sw $a2, 0x0030($sp) +/* 0037C 80A1AD1C AFA60030 */ sw $a2, 0x0030($sp) /* 00380 80A1AD20 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00384 80A1AD24 0C01E9D9 */ jal Lights_Insert - + /* 00388 80A1AD28 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 /* 0038C 80A1AD2C C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 /* 00390 80A1AD30 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C /* 00394 80A1AD34 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 00398 80A1AD38 4600218D */ trunc.w.s $f6, $f4 +/* 00398 80A1AD38 4600218D */ trunc.w.s $f6, $f4 /* 0039C 80A1AD3C AE020358 */ sw $v0, 0x0358($s0) ## 00000358 /* 003A0 80A1AD40 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 003A4 80A1AD44 4600428D */ trunc.w.s $f10, $f8 -/* 003A8 80A1AD48 44053000 */ mfc1 $a1, $f6 +/* 003A4 80A1AD44 4600428D */ trunc.w.s $f10, $f8 +/* 003A8 80A1AD48 44053000 */ mfc1 $a1, $f6 /* 003AC 80A1AD4C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 003B0 80A1AD50 4600848D */ trunc.w.s $f18, $f16 -/* 003B4 80A1AD54 44065000 */ mfc1 $a2, $f10 +/* 003B0 80A1AD50 4600848D */ trunc.w.s $f18, $f16 +/* 003B4 80A1AD54 44065000 */ mfc1 $a2, $f10 /* 003B8 80A1AD58 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF /* 003BC 80A1AD5C 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 003C0 80A1AD60 44079000 */ mfc1 $a3, $f18 -/* 003C4 80A1AD64 00052C00 */ sll $a1, $a1, 16 -/* 003C8 80A1AD68 00063400 */ sll $a2, $a2, 16 -/* 003CC 80A1AD6C 00073C00 */ sll $a3, $a3, 16 -/* 003D0 80A1AD70 00073C03 */ sra $a3, $a3, 16 -/* 003D4 80A1AD74 00063403 */ sra $a2, $a2, 16 -/* 003D8 80A1AD78 00052C03 */ sra $a1, $a1, 16 -/* 003DC 80A1AD7C AFA9001C */ sw $t1, 0x001C($sp) -/* 003E0 80A1AD80 AFA80018 */ sw $t0, 0x0018($sp) -/* 003E4 80A1AD84 AFB90014 */ sw $t9, 0x0014($sp) -/* 003E8 80A1AD88 AFB80010 */ sw $t8, 0x0010($sp) +/* 003C0 80A1AD60 44079000 */ mfc1 $a3, $f18 +/* 003C4 80A1AD64 00052C00 */ sll $a1, $a1, 16 +/* 003C8 80A1AD68 00063400 */ sll $a2, $a2, 16 +/* 003CC 80A1AD6C 00073C00 */ sll $a3, $a3, 16 +/* 003D0 80A1AD70 00073C03 */ sra $a3, $a3, 16 +/* 003D4 80A1AD74 00063403 */ sra $a2, $a2, 16 +/* 003D8 80A1AD78 00052C03 */ sra $a1, $a1, 16 +/* 003DC 80A1AD7C AFA9001C */ sw $t1, 0x001C($sp) +/* 003E0 80A1AD80 AFA80018 */ sw $t0, 0x0018($sp) +/* 003E4 80A1AD84 AFB90014 */ sw $t9, 0x0014($sp) +/* 003E8 80A1AD88 AFB80010 */ sw $t8, 0x0010($sp) /* 003EC 80A1AD8C 0C01E763 */ jal Lights_InitType0PositionalLight - -/* 003F0 80A1AD90 8FA40030 */ lw $a0, 0x0030($sp) -/* 003F4 80A1AD94 8FAA003C */ lw $t2, 0x003C($sp) + +/* 003F0 80A1AD90 8FA40030 */ lw $a0, 0x0030($sp) +/* 003F4 80A1AD94 8FAA003C */ lw $t2, 0x003C($sp) /* 003F8 80A1AD98 3C0B80A2 */ lui $t3, %hi(D_80A1D018) ## $t3 = 80A20000 /* 003FC 80A1AD9C 3C0D80A2 */ lui $t5, %hi(D_80A1D008) ## $t5 = 80A20000 -/* 00400 80A1ADA0 016A5821 */ addu $t3, $t3, $t2 -/* 00404 80A1ADA4 916BD018 */ lbu $t3, %lo(D_80A1D018)($t3) +/* 00400 80A1ADA0 016A5821 */ addu $t3, $t3, $t2 +/* 00404 80A1ADA4 916BD018 */ lbu $t3, %lo(D_80A1D018)($t3) /* 00408 80A1ADA8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 0040C 80A1ADAC 95CEF54E */ lhu $t6, -0x0AB2($t6) ## 8015F54E -/* 00410 80A1ADB0 000B6040 */ sll $t4, $t3, 1 -/* 00414 80A1ADB4 01AC6821 */ addu $t5, $t5, $t4 -/* 00418 80A1ADB8 95ADD008 */ lhu $t5, %lo(D_80A1D008)($t5) +/* 00410 80A1ADB0 000B6040 */ sll $t4, $t3, 1 +/* 00414 80A1ADB4 01AC6821 */ addu $t5, $t5, $t4 +/* 00418 80A1ADB8 95ADD008 */ lhu $t5, %lo(D_80A1D008)($t5) /* 0041C 80A1ADBC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00420 80A1ADC0 01AE7824 */ and $t7, $t5, $t6 -/* 00424 80A1ADC4 51E00006 */ beql $t7, $zero, .L80A1ADE0 +/* 00420 80A1ADC0 01AE7824 */ and $t7, $t5, $t6 +/* 00424 80A1ADC4 51E00006 */ beql $t7, $zero, .L80A1ADE0 /* 00428 80A1ADC8 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 /* 0042C 80A1ADCC 3C014387 */ lui $at, 0x4387 ## $at = 43870000 /* 00430 80A1ADD0 44812000 */ mtc1 $at, $f4 ## $f4 = 270.00 -/* 00434 80A1ADD4 10000004 */ beq $zero, $zero, .L80A1ADE8 +/* 00434 80A1ADD4 10000004 */ beq $zero, $zero, .L80A1ADE8 /* 00438 80A1ADD8 E60403A0 */ swc1 $f4, 0x03A0($s0) ## 000003A0 /* 0043C 80A1ADDC 44813000 */ mtc1 $at, $f6 ## $f6 = 270.00 .L80A1ADE0: @@ -112,44 +112,44 @@ glabel EnFr_Update /* 00444 80A1ADE4 E60603A0 */ swc1 $f6, 0x03A0($s0) ## 000003A0 .L80A1ADE8: /* 00448 80A1ADE8 3C0180A2 */ lui $at, %hi(D_80A1D28C) ## $at = 80A20000 -/* 0044C 80A1ADEC C42AD28C */ lwc1 $f10, %lo(D_80A1D28C)($at) +/* 0044C 80A1ADEC C42AD28C */ lwc1 $f10, %lo(D_80A1D28C)($at) /* 00450 80A1ADF0 C60803A0 */ lwc1 $f8, 0x03A0($s0) ## 000003A0 /* 00454 80A1ADF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00458 80A1ADF8 460A4402 */ mul.s $f16, $f8, $f10 -/* 0045C 80A1ADFC 44058000 */ mfc1 $a1, $f16 +/* 00458 80A1ADF8 460A4402 */ mul.s $f16, $f8, $f10 +/* 0045C 80A1ADFC 44058000 */ mfc1 $a1, $f16 /* 00460 80A1AE00 0C00B58B */ jal Actor_SetScale - + /* 00464 80A1AE04 00000000 */ nop /* 00468 80A1AE08 3C0180A2 */ lui $at, %hi(D_80A1D290) ## $at = 80A20000 -/* 0046C 80A1AE0C C432D290 */ lwc1 $f18, %lo(D_80A1D290)($at) +/* 0046C 80A1AE0C C432D290 */ lwc1 $f18, %lo(D_80A1D290)($at) /* 00470 80A1AE10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00474 80A1AE14 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 00478 80A1AE18 0C00B56E */ jal Actor_SetHeight - + /* 0047C 80A1AE1C E6120070 */ swc1 $f18, 0x0070($s0) ## 00000070 /* 00480 80A1AE20 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 00484 80A1AE24 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00488 80A1AE28 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 /* 0048C 80A1AE2C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 00490 80A1AE30 A2180378 */ sb $t8, 0x0378($s0) ## 00000378 /* 00494 80A1AE34 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00498 80A1AE38 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 0049C 80A1AE3C 8E0E0024 */ lw $t6, 0x0024($s0) ## 00000024 /* 004A0 80A1AE40 8E0D0028 */ lw $t5, 0x0028($s0) ## 00000028 -/* 004A4 80A1AE44 46040180 */ add.s $f6, $f0, $f4 +/* 004A4 80A1AE44 46040180 */ add.s $f6, $f0, $f4 /* 004A8 80A1AE48 AE0E038C */ sw $t6, 0x038C($s0) ## 0000038C /* 004AC 80A1AE4C 8E0E002C */ lw $t6, 0x002C($s0) ## 0000002C /* 004B0 80A1AE50 3C0B80A2 */ lui $t3, %hi(func_80A1B19C) ## $t3 = 80A20000 -/* 004B4 80A1AE54 4600320D */ trunc.w.s $f8, $f6 +/* 004B4 80A1AE54 4600320D */ trunc.w.s $f8, $f6 /* 004B8 80A1AE58 3C0F80A2 */ lui $t7, %hi(func_80A1B22C) ## $t7 = 80A20000 /* 004BC 80A1AE5C 256BB19C */ addiu $t3, $t3, %lo(func_80A1B19C) ## $t3 = 80A1B19C /* 004C0 80A1AE60 25EFB22C */ addiu $t7, $t7, %lo(func_80A1B22C) ## $t7 = 80A1B22C -/* 004C4 80A1AE64 44084000 */ mfc1 $t0, $f8 +/* 004C4 80A1AE64 44084000 */ mfc1 $t0, $f8 /* 004C8 80A1AE68 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 /* 004CC 80A1AE6C AE0B0374 */ sw $t3, 0x0374($s0) ## 00000374 -/* 004D0 80A1AE70 00084C00 */ sll $t1, $t0, 16 -/* 004D4 80A1AE74 00095403 */ sra $t2, $t1, 16 +/* 004D0 80A1AE70 00084C00 */ sll $t1, $t0, 16 +/* 004D4 80A1AE74 00095403 */ sra $t2, $t1, 16 /* 004D8 80A1AE78 AE0A0370 */ sw $t2, 0x0370($s0) ## 00000370 /* 004DC 80A1AE7C A200037A */ sb $zero, 0x037A($s0) ## 0000037A /* 004E0 80A1AE80 A200037B */ sb $zero, 0x037B($s0) ## 0000037B @@ -163,9 +163,9 @@ glabel EnFr_Update /* 00500 80A1AEA0 AE0003A4 */ sw $zero, 0x03A4($s0) ## 000003A4 /* 00504 80A1AEA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00508 80A1AEA8 AE0D0390 */ sw $t5, 0x0390($s0) ## 00000390 -/* 0050C 80A1AEAC 0C286A68 */ jal func_80A1A9A0 +/* 0050C 80A1AEAC 0C286A68 */ jal func_80A1A9A0 /* 00510 80A1AEB0 AE0E0394 */ sw $t6, 0x0394($s0) ## 00000394 -/* 00514 80A1AEB4 0C286B03 */ jal func_80A1AC0C +/* 00514 80A1AEB4 0C286B03 */ jal func_80A1AC0C /* 00518 80A1AEB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0051C 80A1AEBC 3C1980A2 */ lui $t9, %hi(func_80A1BB34) ## $t9 = 80A20000 /* 00520 80A1AEC0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 @@ -173,7 +173,7 @@ glabel EnFr_Update /* 00528 80A1AEC8 44816000 */ mtc1 $at, $f12 ## $f12 = 255.00 /* 0052C 80A1AECC AE190130 */ sw $t9, 0x0130($s0) ## 00000130 /* 00530 80A1AED0 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 00534 80A1AED4 A20003A8 */ sb $zero, 0x03A8($s0) ## 000003A8 /* 00538 80A1AED8 C602038C */ lwc1 $f2, 0x038C($s0) ## 0000038C /* 0053C 80A1AEDC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -181,25 +181,25 @@ glabel EnFr_Update /* 00544 80A1AEE4 C6100390 */ lwc1 $f16, 0x0390($s0) ## 00000390 /* 00548 80A1AEE8 E60203AC */ swc1 $f2, 0x03AC($s0) ## 000003AC /* 0054C 80A1AEEC E60203B8 */ swc1 $f2, 0x03B8($s0) ## 000003B8 -/* 00550 80A1AEF0 46128080 */ add.s $f2, $f16, $f18 +/* 00550 80A1AEF0 46128080 */ add.s $f2, $f16, $f18 /* 00554 80A1AEF4 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 /* 00558 80A1AEF8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0055C 80A1AEFC 4600028D */ trunc.w.s $f10, $f0 +/* 0055C 80A1AEFC 4600028D */ trunc.w.s $f10, $f0 /* 00560 80A1AF00 E60203B0 */ swc1 $f2, 0x03B0($s0) ## 000003B0 /* 00564 80A1AF04 E60203BC */ swc1 $f2, 0x03BC($s0) ## 000003BC /* 00568 80A1AF08 C6020394 */ lwc1 $f2, 0x0394($s0) ## 00000394 -/* 0056C 80A1AF0C 440B5000 */ mfc1 $t3, $f10 -/* 00570 80A1AF10 01A17024 */ and $t6, $t5, $at +/* 0056C 80A1AF0C 440B5000 */ mfc1 $t3, $f10 +/* 00570 80A1AF10 01A17024 */ and $t6, $t5, $at /* 00574 80A1AF14 AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 -/* 00578 80A1AF18 000B6300 */ sll $t4, $t3, 12 +/* 00578 80A1AF18 000B6300 */ sll $t4, $t3, 12 /* 0057C 80A1AF1C A60C03AA */ sh $t4, 0x03AA($s0) ## 000003AA /* 00580 80A1AF20 E60203B4 */ swc1 $f2, 0x03B4($s0) ## 000003B4 /* 00584 80A1AF24 E60203C0 */ swc1 $f2, 0x03C0($s0) ## 000003C0 .L80A1AF28: -/* 00588 80A1AF28 8FBF002C */ lw $ra, 0x002C($sp) -/* 0058C 80A1AF2C 8FB00024 */ lw $s0, 0x0024($sp) -/* 00590 80A1AF30 8FB10028 */ lw $s1, 0x0028($sp) -/* 00594 80A1AF34 03E00008 */ jr $ra +/* 00588 80A1AF28 8FBF002C */ lw $ra, 0x002C($sp) +/* 0058C 80A1AF2C 8FB00024 */ lw $s0, 0x0024($sp) +/* 00590 80A1AF30 8FB10028 */ lw $s1, 0x0028($sp) +/* 00594 80A1AF34 03E00008 */ jr $ra /* 00598 80A1AF38 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s index 646b2a8e73..15041a8148 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s @@ -140,7 +140,7 @@ glabel func_80A1CD24 /* 025A0 80A1CF40 AFB90014 */ sw $t9, 0x0014($sp) /* 025A4 80A1CF44 AFAB0010 */ sw $t3, 0x0010($sp) /* 025A8 80A1CF48 AFB00018 */ sw $s0, 0x0018($sp) -/* 025AC 80A1CF4C 0C0286B2 */ jal func_800A1AC8 +/* 025AC 80A1CF4C 0C0286B2 */ jal SkelAnime_DrawSV /* 025B0 80A1CF50 8FA4006C */ lw $a0, 0x006C($sp) /* 025B4 80A1CF54 920E03A8 */ lbu $t6, 0x03A8($s0) ## 000003A8 /* 025B8 80A1CF58 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s index 2b3be3f20c..36543956e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s @@ -1,20 +1,20 @@ glabel EnFu_Draw /* 00A9C 80A1E2AC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00AA0 80A1E2B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AA4 80A1E2B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00AA8 80A1E2B8 AFA5005C */ sw $a1, 0x005C($sp) +/* 00AA0 80A1E2B0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AA4 80A1E2B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00AA8 80A1E2B8 AFA5005C */ sw $a1, 0x005C($sp) /* 00AAC 80A1E2BC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00AB0 80A1E2C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00AB4 80A1E2C4 3C0680A2 */ lui $a2, %hi(D_80A1E470) ## $a2 = 80A20000 /* 00AB8 80A1E2C8 24C6E470 */ addiu $a2, $a2, %lo(D_80A1E470) ## $a2 = 80A1E470 /* 00ABC 80A1E2CC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00AC0 80A1E2D0 24070305 */ addiu $a3, $zero, 0x0305 ## $a3 = 00000305 -/* 00AC4 80A1E2D4 0C031AB1 */ jal func_800C6AC4 -/* 00AC8 80A1E2D8 AFA5004C */ sw $a1, 0x004C($sp) -/* 00ACC 80A1E2DC 8FAF005C */ lw $t7, 0x005C($sp) -/* 00AD0 80A1E2E0 0C0250F2 */ jal func_800943C8 +/* 00AC4 80A1E2D4 0C031AB1 */ jal func_800C6AC4 +/* 00AC8 80A1E2D8 AFA5004C */ sw $a1, 0x004C($sp) +/* 00ACC 80A1E2DC 8FAF005C */ lw $t7, 0x005C($sp) +/* 00AD0 80A1E2E0 0C0250F2 */ jal func_800943C8 /* 00AD4 80A1E2E4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00AD8 80A1E2E8 8FA8004C */ lw $t0, 0x004C($sp) +/* 00AD8 80A1E2E8 8FA8004C */ lw $t0, 0x004C($sp) /* 00ADC 80A1E2EC 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00AE0 80A1E2F0 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00AE4 80A1E2F4 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -26,20 +26,20 @@ glabel EnFu_Draw /* 00AFC 80A1E30C 960902AA */ lhu $t1, 0x02AA($s0) ## 000002AA /* 00B00 80A1E310 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 00B04 80A1E314 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 00B08 80A1E318 00095080 */ sll $t2, $t1, 2 -/* 00B0C 80A1E31C 008A2021 */ addu $a0, $a0, $t2 -/* 00B10 80A1E320 8C84E458 */ lw $a0, %lo(D_80A1E458)($a0) +/* 00B08 80A1E318 00095080 */ sll $t2, $t1, 2 +/* 00B0C 80A1E31C 008A2021 */ addu $a0, $a0, $t2 +/* 00B10 80A1E320 8C84E458 */ lw $a0, %lo(D_80A1E458)($a0) /* 00B14 80A1E324 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF /* 00B18 80A1E328 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00B1C 80A1E32C 00046100 */ sll $t4, $a0, 4 -/* 00B20 80A1E330 000C6F02 */ srl $t5, $t4, 28 -/* 00B24 80A1E334 000D7080 */ sll $t6, $t5, 2 -/* 00B28 80A1E338 00CE7821 */ addu $t7, $a2, $t6 +/* 00B1C 80A1E32C 00046100 */ sll $t4, $a0, 4 +/* 00B20 80A1E330 000C6F02 */ srl $t5, $t4, 28 +/* 00B24 80A1E334 000D7080 */ sll $t6, $t5, 2 +/* 00B28 80A1E338 00CE7821 */ addu $t7, $a2, $t6 /* 00B2C 80A1E33C 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 00B30 80A1E340 00855824 */ and $t3, $a0, $a1 +/* 00B30 80A1E340 00855824 */ and $t3, $a0, $a1 /* 00B34 80A1E344 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 00B38 80A1E348 0178C821 */ addu $t9, $t3, $t8 -/* 00B3C 80A1E34C 03274821 */ addu $t1, $t9, $a3 +/* 00B38 80A1E348 0178C821 */ addu $t9, $t3, $t8 +/* 00B3C 80A1E34C 03274821 */ addu $t1, $t9, $a3 /* 00B40 80A1E350 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 /* 00B44 80A1E354 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 00B48 80A1E358 358C0024 */ ori $t4, $t4, 0x0024 ## $t4 = DB060024 @@ -48,40 +48,40 @@ glabel EnFu_Draw /* 00B54 80A1E364 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 /* 00B58 80A1E368 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 /* 00B5C 80A1E36C 960D02AA */ lhu $t5, 0x02AA($s0) ## 000002AA -/* 00B60 80A1E370 000D7080 */ sll $t6, $t5, 2 -/* 00B64 80A1E374 008E2021 */ addu $a0, $a0, $t6 -/* 00B68 80A1E378 8C84E460 */ lw $a0, %lo(D_80A1E460)($a0) +/* 00B60 80A1E370 000D7080 */ sll $t6, $t5, 2 +/* 00B64 80A1E374 008E2021 */ addu $a0, $a0, $t6 +/* 00B68 80A1E378 8C84E460 */ lw $a0, %lo(D_80A1E460)($a0) /* 00B6C 80A1E37C 3C0E80A2 */ lui $t6, %hi(func_80A1E110) ## $t6 = 80A20000 /* 00B70 80A1E380 25CEE110 */ addiu $t6, $t6, %lo(func_80A1E110) ## $t6 = 80A1E110 -/* 00B74 80A1E384 00045900 */ sll $t3, $a0, 4 -/* 00B78 80A1E388 000BC702 */ srl $t8, $t3, 28 -/* 00B7C 80A1E38C 0018C880 */ sll $t9, $t8, 2 -/* 00B80 80A1E390 00D94821 */ addu $t1, $a2, $t9 +/* 00B74 80A1E384 00045900 */ sll $t3, $a0, 4 +/* 00B78 80A1E388 000BC702 */ srl $t8, $t3, 28 +/* 00B7C 80A1E38C 0018C880 */ sll $t9, $t8, 2 +/* 00B80 80A1E390 00D94821 */ addu $t1, $a2, $t9 /* 00B84 80A1E394 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 00B88 80A1E398 00857824 */ and $t7, $a0, $a1 +/* 00B88 80A1E398 00857824 */ and $t7, $a0, $a1 /* 00B8C 80A1E39C 3C0B80A2 */ lui $t3, %hi(func_80A1E26C) ## $t3 = 80A20000 -/* 00B90 80A1E3A0 01EA6021 */ addu $t4, $t7, $t2 -/* 00B94 80A1E3A4 01876821 */ addu $t5, $t4, $a3 +/* 00B90 80A1E3A0 01EA6021 */ addu $t4, $t7, $t2 +/* 00B94 80A1E3A4 01876821 */ addu $t5, $t4, $a3 /* 00B98 80A1E3A8 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 /* 00B9C 80A1E3AC 9207019A */ lbu $a3, 0x019A($s0) ## 0000019A /* 00BA0 80A1E3B0 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 /* 00BA4 80A1E3B4 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 00BA8 80A1E3B8 256BE26C */ addiu $t3, $t3, %lo(func_80A1E26C) ## $t3 = 80A1E26C -/* 00BAC 80A1E3BC AFAB0014 */ sw $t3, 0x0014($sp) -/* 00BB0 80A1E3C0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00BB4 80A1E3C4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00BB8 80A1E3C8 0C0286B2 */ jal func_800A1AC8 -/* 00BBC 80A1E3CC 8FA4005C */ lw $a0, 0x005C($sp) -/* 00BC0 80A1E3D0 8FB8005C */ lw $t8, 0x005C($sp) +/* 00BAC 80A1E3BC AFAB0014 */ sw $t3, 0x0014($sp) +/* 00BB0 80A1E3C0 AFB00018 */ sw $s0, 0x0018($sp) +/* 00BB4 80A1E3C4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00BB8 80A1E3C8 0C0286B2 */ jal SkelAnime_DrawSV +/* 00BBC 80A1E3CC 8FA4005C */ lw $a0, 0x005C($sp) +/* 00BC0 80A1E3D0 8FB8005C */ lw $t8, 0x005C($sp) /* 00BC4 80A1E3D4 3C0680A2 */ lui $a2, %hi(D_80A1E480) ## $a2 = 80A20000 /* 00BC8 80A1E3D8 24C6E480 */ addiu $a2, $a2, %lo(D_80A1E480) ## $a2 = 80A1E480 /* 00BCC 80A1E3DC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00BD0 80A1E3E0 24070317 */ addiu $a3, $zero, 0x0317 ## $a3 = 00000317 -/* 00BD4 80A1E3E4 0C031AD5 */ jal func_800C6B54 +/* 00BD4 80A1E3E4 0C031AD5 */ jal func_800C6B54 /* 00BD8 80A1E3E8 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 00BDC 80A1E3EC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00BE0 80A1E3F0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00BDC 80A1E3EC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00BE0 80A1E3F0 8FB00028 */ lw $s0, 0x0028($sp) /* 00BE4 80A1E3F4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00BE8 80A1E3F8 03E00008 */ jr $ra +/* 00BE8 80A1E3F8 03E00008 */ jr $ra /* 00BEC 80A1E3FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s index cce2e834d2..b36aa92696 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s @@ -1,15 +1,15 @@ glabel EnFu_Init /* 00000 80A1D810 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80A1D814 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80A1D814 AFB00028 */ sw $s0, 0x0028($sp) /* 00008 80A1D818 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80A1D81C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80A1D820 AFA50044 */ sw $a1, 0x0044($sp) +/* 0000C 80A1D81C AFBF002C */ sw $ra, 0x002C($sp) +/* 00010 80A1D820 AFA50044 */ sw $a1, 0x0044($sp) /* 00014 80A1D824 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00018 80A1D828 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0001C 80A1D82C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00020 80A1D830 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00024 80A1D834 0C00AC78 */ jal ActorShape_Init - + /* 00028 80A1D838 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 0002C 80A1D83C 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00030 80A1D840 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -17,47 +17,47 @@ glabel EnFu_Init /* 00038 80A1D848 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 0003C 80A1D84C 260F023C */ addiu $t7, $s0, 0x023C ## $t7 = 0000023C /* 00040 80A1D850 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 00044 80A1D854 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 80A1D858 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 80A1D85C AFAE0010 */ sw $t6, 0x0010($sp) +/* 00044 80A1D854 AFB80018 */ sw $t8, 0x0018($sp) +/* 00048 80A1D858 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0004C 80A1D85C AFAE0010 */ sw $t6, 0x0010($sp) /* 00050 80A1D860 24E70B04 */ addiu $a3, $a3, 0x0B04 ## $a3 = 06000B04 /* 00054 80A1D864 24C66C90 */ addiu $a2, $a2, 0x6C90 ## $a2 = 06006C90 -/* 00058 80A1D868 AFA50034 */ sw $a1, 0x0034($sp) -/* 0005C 80A1D86C 0C0291BE */ jal func_800A46F8 -/* 00060 80A1D870 8FA40044 */ lw $a0, 0x0044($sp) +/* 00058 80A1D868 AFA50034 */ sw $a1, 0x0034($sp) +/* 0005C 80A1D86C 0C0291BE */ jal SkelAnime_InitSV +/* 00060 80A1D870 8FA40044 */ lw $a0, 0x0044($sp) /* 00064 80A1D874 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00068 80A1D878 24A50B04 */ addiu $a1, $a1, 0x0B04 ## $a1 = 06000B04 -/* 0006C 80A1D87C 0C0294BE */ jal func_800A52F8 -/* 00070 80A1D880 8FA40034 */ lw $a0, 0x0034($sp) +/* 0006C 80A1D87C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00070 80A1D880 8FA40034 */ lw $a0, 0x0034($sp) /* 00074 80A1D884 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00078 80A1D888 AFA50034 */ sw $a1, 0x0034($sp) +/* 00078 80A1D888 AFA50034 */ sw $a1, 0x0034($sp) /* 0007C 80A1D88C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00080 80A1D890 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00080 80A1D890 8FA40044 */ lw $a0, 0x0044($sp) /* 00084 80A1D894 3C0780A2 */ lui $a3, %hi(D_80A1E420) ## $a3 = 80A20000 -/* 00088 80A1D898 8FA50034 */ lw $a1, 0x0034($sp) +/* 00088 80A1D898 8FA50034 */ lw $a1, 0x0034($sp) /* 0008C 80A1D89C 24E7E420 */ addiu $a3, $a3, %lo(D_80A1E420) ## $a3 = 80A1E420 -/* 00090 80A1D8A0 8FA40044 */ lw $a0, 0x0044($sp) +/* 00090 80A1D8A0 8FA40044 */ lw $a0, 0x0044($sp) /* 00094 80A1D8A4 0C01712B */ jal ActorCollider_InitCylinder - + /* 00098 80A1D8A8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0009C 80A1D8AC 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 000A0 80A1D8B0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000A4 80A1D8B4 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 000A8 80A1D8B8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000AC 80A1D8BC 0C00B58B */ jal Actor_SetScale - + /* 000B0 80A1D8C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000B4 80A1D8C4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 000B8 80A1D8C8 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 /* 000BC 80A1D8CC 3C0A80A2 */ lui $t2, %hi(func_80A1DE24) ## $t2 = 80A20000 /* 000C0 80A1D8D0 254ADE24 */ addiu $t2, $t2, %lo(func_80A1DE24) ## $t2 = 80A1DE24 -/* 000C4 80A1D8D4 11000006 */ beq $t0, $zero, .L80A1D8F0 +/* 000C4 80A1D8D4 11000006 */ beq $t0, $zero, .L80A1D8F0 /* 000C8 80A1D8D8 240C0006 */ addiu $t4, $zero, 0x0006 ## $t4 = 00000006 /* 000CC 80A1D8DC 3C0980A2 */ lui $t1, %hi(func_80A1DA9C) ## $t1 = 80A20000 /* 000D0 80A1D8E0 2529DA9C */ addiu $t1, $t1, %lo(func_80A1DA9C) ## $t1 = 80A1DA9C /* 000D4 80A1D8E4 AE0902AC */ sw $t1, 0x02AC($s0) ## 000002AC -/* 000D8 80A1D8E8 10000007 */ beq $zero, $zero, .L80A1D908 +/* 000D8 80A1D8E8 10000007 */ beq $zero, $zero, .L80A1D908 /* 000DC 80A1D8EC A60002AA */ sh $zero, 0x02AA($s0) ## 000002AA .L80A1D8F0: /* 000E0 80A1D8F0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -69,10 +69,10 @@ glabel EnFu_Init .L80A1D908: /* 000F8 80A1D908 A60002A8 */ sh $zero, 0x02A8($s0) ## 000002A8 /* 000FC 80A1D90C A20C001F */ sb $t4, 0x001F($s0) ## 0000001F -/* 00100 80A1D910 8FBF002C */ lw $ra, 0x002C($sp) -/* 00104 80A1D914 8FB00028 */ lw $s0, 0x0028($sp) +/* 00100 80A1D910 8FBF002C */ lw $ra, 0x002C($sp) +/* 00104 80A1D914 8FB00028 */ lw $s0, 0x0028($sp) /* 00108 80A1D918 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0010C 80A1D91C 03E00008 */ jr $ra +/* 0010C 80A1D91C 03E00008 */ jr $ra /* 00110 80A1D920 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Draw.s index 5cff89c738..be0a35094a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Draw.s @@ -1,19 +1,19 @@ glabel EnFw_Draw /* 01040 80A1F5E0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01044 80A1F5E4 AFBF002C */ sw $ra, 0x002C($sp) -/* 01048 80A1F5E8 AFB00028 */ sw $s0, 0x0028($sp) +/* 01044 80A1F5E4 AFBF002C */ sw $ra, 0x002C($sp) +/* 01048 80A1F5E8 AFB00028 */ sw $s0, 0x0028($sp) /* 0104C 80A1F5EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01050 80A1F5F0 0C287DC2 */ jal func_80A1F708 -/* 01054 80A1F5F4 AFA50034 */ sw $a1, 0x0034($sp) -/* 01058 80A1F5F8 0C034213 */ jal Matrix_Push +/* 01050 80A1F5F0 0C287DC2 */ jal func_80A1F708 +/* 01054 80A1F5F4 AFA50034 */ sw $a1, 0x0034($sp) +/* 01058 80A1F5F8 0C034213 */ jal Matrix_Push /* 0105C 80A1F5FC 00000000 */ nop /* 01060 80A1F600 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01064 80A1F604 0C287E05 */ jal func_80A1F814 -/* 01068 80A1F608 8FA50034 */ lw $a1, 0x0034($sp) -/* 0106C 80A1F60C 0C034221 */ jal Matrix_Pull +/* 01064 80A1F604 0C287E05 */ jal func_80A1F814 +/* 01068 80A1F608 8FA50034 */ lw $a1, 0x0034($sp) +/* 0106C 80A1F60C 0C034221 */ jal Matrix_Pull /* 01070 80A1F610 00000000 */ nop -/* 01074 80A1F614 8FAE0034 */ lw $t6, 0x0034($sp) -/* 01078 80A1F618 0C024F46 */ jal func_80093D18 +/* 01074 80A1F614 8FAE0034 */ lw $t6, 0x0034($sp) +/* 01078 80A1F618 0C024F46 */ jal func_80093D18 /* 0107C 80A1F61C 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 /* 01080 80A1F620 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 01084 80A1F624 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -22,15 +22,15 @@ glabel EnFw_Draw /* 01090 80A1F630 3C1880A2 */ lui $t8, %hi(func_80A1F544) ## $t8 = 80A20000 /* 01094 80A1F634 2718F544 */ addiu $t8, $t8, %lo(func_80A1F544) ## $t8 = 80A1F544 /* 01098 80A1F638 25EFF52C */ addiu $t7, $t7, %lo(func_80A1F52C) ## $t7 = 80A1F52C -/* 0109C 80A1F63C AFAF0010 */ sw $t7, 0x0010($sp) -/* 010A0 80A1F640 AFB80014 */ sw $t8, 0x0014($sp) -/* 010A4 80A1F644 AFB00018 */ sw $s0, 0x0018($sp) -/* 010A8 80A1F648 0C0286B2 */ jal func_800A1AC8 -/* 010AC 80A1F64C 8FA40034 */ lw $a0, 0x0034($sp) -/* 010B0 80A1F650 8FBF002C */ lw $ra, 0x002C($sp) -/* 010B4 80A1F654 8FB00028 */ lw $s0, 0x0028($sp) +/* 0109C 80A1F63C AFAF0010 */ sw $t7, 0x0010($sp) +/* 010A0 80A1F640 AFB80014 */ sw $t8, 0x0014($sp) +/* 010A4 80A1F644 AFB00018 */ sw $s0, 0x0018($sp) +/* 010A8 80A1F648 0C0286B2 */ jal SkelAnime_DrawSV +/* 010AC 80A1F64C 8FA40034 */ lw $a0, 0x0034($sp) +/* 010B0 80A1F650 8FBF002C */ lw $ra, 0x002C($sp) +/* 010B4 80A1F654 8FB00028 */ lw $s0, 0x0028($sp) /* 010B8 80A1F658 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 010BC 80A1F65C 03E00008 */ jr $ra +/* 010BC 80A1F65C 03E00008 */ jr $ra /* 010C0 80A1F660 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s index ae961564de..265297deca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s @@ -1,72 +1,72 @@ glabel EnFw_Init /* 005A0 80A1EB40 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 005A4 80A1EB44 AFB00028 */ sw $s0, 0x0028($sp) +/* 005A4 80A1EB44 AFB00028 */ sw $s0, 0x0028($sp) /* 005A8 80A1EB48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005AC 80A1EB4C AFA50044 */ sw $a1, 0x0044($sp) +/* 005AC 80A1EB4C AFA50044 */ sw $a1, 0x0044($sp) /* 005B0 80A1EB50 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005B4 80A1EB54 AFBF002C */ sw $ra, 0x002C($sp) +/* 005B4 80A1EB54 AFBF002C */ sw $ra, 0x002C($sp) /* 005B8 80A1EB58 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 005BC 80A1EB5C 260E021C */ addiu $t6, $s0, 0x021C ## $t6 = 0000021C /* 005C0 80A1EB60 260F025E */ addiu $t7, $s0, 0x025E ## $t7 = 0000025E /* 005C4 80A1EB64 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 005C8 80A1EB68 2418000B */ addiu $t8, $zero, 0x000B ## $t8 = 0000000B -/* 005CC 80A1EB6C AFB80018 */ sw $t8, 0x0018($sp) +/* 005CC 80A1EB6C AFB80018 */ sw $t8, 0x0018($sp) /* 005D0 80A1EB70 24C67C30 */ addiu $a2, $a2, 0x7C30 ## $a2 = 06007C30 -/* 005D4 80A1EB74 AFAF0014 */ sw $t7, 0x0014($sp) -/* 005D8 80A1EB78 AFAE0010 */ sw $t6, 0x0010($sp) -/* 005DC 80A1EB7C AFA50034 */ sw $a1, 0x0034($sp) -/* 005E0 80A1EB80 0C0291BE */ jal func_800A46F8 +/* 005D4 80A1EB74 AFAF0014 */ sw $t7, 0x0014($sp) +/* 005D8 80A1EB78 AFAE0010 */ sw $t6, 0x0010($sp) +/* 005DC 80A1EB7C AFA50034 */ sw $a1, 0x0034($sp) +/* 005E0 80A1EB80 0C0291BE */ jal SkelAnime_InitSV /* 005E4 80A1EB84 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 005E8 80A1EB88 3C0580A2 */ lui $a1, %hi(D_80A1FBA0) ## $a1 = 80A20000 /* 005EC 80A1EB8C 24A5FBA0 */ addiu $a1, $a1, %lo(D_80A1FBA0) ## $a1 = 80A1FBA0 -/* 005F0 80A1EB90 8FA40034 */ lw $a0, 0x0034($sp) -/* 005F4 80A1EB94 0C00D3B0 */ jal func_80034EC0 +/* 005F0 80A1EB90 8FA40034 */ lw $a0, 0x0034($sp) +/* 005F4 80A1EB94 0C00D3B0 */ jal func_80034EC0 /* 005F8 80A1EB98 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 005FC 80A1EB9C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00600 80A1EBA0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00604 80A1EBA4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00608 80A1EBA8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0060C 80A1EBAC 0C00AC78 */ jal ActorShape_Init - + /* 00610 80A1EBB0 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 00614 80A1EBB4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00618 80A1EBB8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0061C 80A1EBBC 0C016EFE */ jal func_8005BBF8 -/* 00620 80A1EBC0 8FA40044 */ lw $a0, 0x0044($sp) +/* 00618 80A1EBB8 AFA50034 */ sw $a1, 0x0034($sp) +/* 0061C 80A1EBBC 0C016EFE */ jal func_8005BBF8 +/* 00620 80A1EBC0 8FA40044 */ lw $a0, 0x0044($sp) /* 00624 80A1EBC4 3C0780A2 */ lui $a3, %hi(D_80A1FB84) ## $a3 = 80A20000 /* 00628 80A1EBC8 261901B4 */ addiu $t9, $s0, 0x01B4 ## $t9 = 000001B4 -/* 0062C 80A1EBCC 8FA50034 */ lw $a1, 0x0034($sp) -/* 00630 80A1EBD0 AFB90010 */ sw $t9, 0x0010($sp) +/* 0062C 80A1EBCC 8FA50034 */ lw $a1, 0x0034($sp) +/* 00630 80A1EBD0 AFB90010 */ sw $t9, 0x0010($sp) /* 00634 80A1EBD4 24E7FB84 */ addiu $a3, $a3, %lo(D_80A1FB84) ## $a3 = 80A1FB84 -/* 00638 80A1EBD8 8FA40044 */ lw $a0, 0x0044($sp) -/* 0063C 80A1EBDC 0C017014 */ jal func_8005C050 +/* 00638 80A1EBD8 8FA40044 */ lw $a0, 0x0044($sp) +/* 0063C 80A1EBDC 0C017014 */ jal func_8005C050 /* 00640 80A1EBE0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00644 80A1EBE4 0C016C80 */ jal CollisionBtlTbl_Get - + /* 00648 80A1EBE8 24040010 */ addiu $a0, $zero, 0x0010 ## $a0 = 00000010 /* 0064C 80A1EBEC 3C0680A2 */ lui $a2, %hi(D_80A1FB94) ## $a2 = 80A20000 /* 00650 80A1EBF0 24C6FB94 */ addiu $a2, $a2, %lo(D_80A1FB94) ## $a2 = 80A1FB94 /* 00654 80A1EBF4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00658 80A1EBF8 0C0187BF */ jal func_80061EFC +/* 00658 80A1EBF8 0C0187BF */ jal func_80061EFC /* 0065C 80A1EBFC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00660 80A1EC00 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00664 80A1EC04 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00668 80A1EC08 0C00B58B */ jal Actor_SetScale - + /* 0066C 80A1EC0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00670 80A1EC10 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 00674 80A1EC14 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00678 80A1EC18 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 /* 0067C 80A1EC1C 3C0A80A2 */ lui $t2, %hi(func_80A1EC70) ## $t2 = 80A20000 /* 00680 80A1EC20 254AEC70 */ addiu $t2, $t2, %lo(func_80A1EC70) ## $t2 = 80A1EC70 -/* 00684 80A1EC24 00084823 */ subu $t1, $zero, $t0 +/* 00684 80A1EC24 00084823 */ subu $t1, $zero, $t0 /* 00688 80A1EC28 A6090202 */ sh $t1, 0x0202($s0) ## 00000202 /* 0068C 80A1EC2C AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 /* 00690 80A1EC30 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 00694 80A1EC34 8FBF002C */ lw $ra, 0x002C($sp) -/* 00698 80A1EC38 8FB00028 */ lw $s0, 0x0028($sp) +/* 00694 80A1EC34 8FBF002C */ lw $ra, 0x002C($sp) +/* 00698 80A1EC38 8FB00028 */ lw $s0, 0x0028($sp) /* 0069C 80A1EC3C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 006A0 80A1EC40 03E00008 */ jr $ra +/* 006A0 80A1EC40 03E00008 */ jr $ra /* 006A4 80A1EC44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s index 711c128e4b..ccfcc85e3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s @@ -1,20 +1,20 @@ glabel EnGb_Draw /* 00D2C 80A2FEAC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00D30 80A2FEB0 AFB10028 */ sw $s1, 0x0028($sp) +/* 00D30 80A2FEB0 AFB10028 */ sw $s1, 0x0028($sp) /* 00D34 80A2FEB4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00D38 80A2FEB8 AFBF002C */ sw $ra, 0x002C($sp) -/* 00D3C 80A2FEBC AFB00024 */ sw $s0, 0x0024($sp) +/* 00D38 80A2FEB8 AFBF002C */ sw $ra, 0x002C($sp) +/* 00D3C 80A2FEBC AFB00024 */ sw $s0, 0x0024($sp) /* 00D40 80A2FEC0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00D44 80A2FEC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00D48 80A2FEC8 3C0680A3 */ lui $a2, %hi(D_80A307A0) ## $a2 = 80A30000 /* 00D4C 80A2FECC 24C607A0 */ addiu $a2, $a2, %lo(D_80A307A0) ## $a2 = 80A307A0 /* 00D50 80A2FED0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00D54 80A2FED4 240702FB */ addiu $a3, $zero, 0x02FB ## $a3 = 000002FB -/* 00D58 80A2FED8 0C031AB1 */ jal func_800C6AC4 -/* 00D5C 80A2FEDC AFA5004C */ sw $a1, 0x004C($sp) -/* 00D60 80A2FEE0 0C024F46 */ jal func_80093D18 +/* 00D58 80A2FED8 0C031AB1 */ jal func_800C6AC4 +/* 00D5C 80A2FEDC AFA5004C */ sw $a1, 0x004C($sp) +/* 00D60 80A2FEE0 0C024F46 */ jal func_80093D18 /* 00D64 80A2FEE4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00D68 80A2FEE8 8FA8004C */ lw $t0, 0x004C($sp) +/* 00D68 80A2FEE8 8FA8004C */ lw $t0, 0x004C($sp) /* 00D6C 80A2FEEC 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 /* 00D70 80A2FEF0 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 /* 00D74 80A2FEF4 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -30,10 +30,10 @@ glabel EnGb_Draw /* 00D9C 80A2FF1C 920D0385 */ lbu $t5, 0x0385($s0) ## 00000385 /* 00DA0 80A2FF20 920A0384 */ lbu $t2, 0x0384($s0) ## 00000384 /* 00DA4 80A2FF24 92190386 */ lbu $t9, 0x0386($s0) ## 00000386 -/* 00DA8 80A2FF28 000D7400 */ sll $t6, $t5, 16 -/* 00DAC 80A2FF2C 000A5E00 */ sll $t3, $t2, 24 +/* 00DA8 80A2FF28 000D7400 */ sll $t6, $t5, 16 +/* 00DAC 80A2FF2C 000A5E00 */ sll $t3, $t2, 24 /* 00DB0 80A2FF30 016E7825 */ or $t7, $t3, $t6 ## $t7 = 00000008 -/* 00DB4 80A2FF34 00194A00 */ sll $t1, $t9, 8 +/* 00DB4 80A2FF34 00194A00 */ sll $t1, $t9, 8 /* 00DB8 80A2FF38 01E95025 */ or $t2, $t7, $t1 ## $t2 = 00000008 /* 00DBC 80A2FF3C 354C00FF */ ori $t4, $t2, 0x00FF ## $t4 = 000000FF /* 00DC0 80A2FF40 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 @@ -41,48 +41,48 @@ glabel EnGb_Draw /* 00DC8 80A2FF48 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C /* 00DCC 80A2FF4C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 00DD0 80A2FF50 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00DD4 80A2FF54 AFB80010 */ sw $t8, 0x0010($sp) +/* 00DD4 80A2FF54 AFB80010 */ sw $t8, 0x0010($sp) /* 00DD8 80A2FF58 92190385 */ lbu $t9, 0x0385($s0) ## 00000385 -/* 00DDC 80A2FF5C 4600848D */ trunc.w.s $f18, $f16 -/* 00DE0 80A2FF60 AFB90014 */ sw $t9, 0x0014($sp) -/* 00DE4 80A2FF64 4600428D */ trunc.w.s $f10, $f8 +/* 00DDC 80A2FF5C 4600848D */ trunc.w.s $f18, $f16 +/* 00DE0 80A2FF60 AFB90014 */ sw $t9, 0x0014($sp) +/* 00DE4 80A2FF64 4600428D */ trunc.w.s $f10, $f8 /* 00DE8 80A2FF68 920F0386 */ lbu $t7, 0x0386($s0) ## 00000386 -/* 00DEC 80A2FF6C 44079000 */ mfc1 $a3, $f18 -/* 00DF0 80A2FF70 4600218D */ trunc.w.s $f6, $f4 -/* 00DF4 80A2FF74 44065000 */ mfc1 $a2, $f10 -/* 00DF8 80A2FF78 AFAF0018 */ sw $t7, 0x0018($sp) +/* 00DEC 80A2FF6C 44079000 */ mfc1 $a3, $f18 +/* 00DF0 80A2FF70 4600218D */ trunc.w.s $f6, $f4 +/* 00DF4 80A2FF74 44065000 */ mfc1 $a2, $f10 +/* 00DF8 80A2FF78 AFAF0018 */ sw $t7, 0x0018($sp) /* 00DFC 80A2FF7C 92090387 */ lbu $t1, 0x0387($s0) ## 00000387 -/* 00E00 80A2FF80 44053000 */ mfc1 $a1, $f6 -/* 00E04 80A2FF84 00073C00 */ sll $a3, $a3, 16 -/* 00E08 80A2FF88 00063400 */ sll $a2, $a2, 16 -/* 00E0C 80A2FF8C 00052C00 */ sll $a1, $a1, 16 -/* 00E10 80A2FF90 00052C03 */ sra $a1, $a1, 16 -/* 00E14 80A2FF94 00063403 */ sra $a2, $a2, 16 -/* 00E18 80A2FF98 00073C03 */ sra $a3, $a3, 16 +/* 00E00 80A2FF80 44053000 */ mfc1 $a1, $f6 +/* 00E04 80A2FF84 00073C00 */ sll $a3, $a3, 16 +/* 00E08 80A2FF88 00063400 */ sll $a2, $a2, 16 +/* 00E0C 80A2FF8C 00052C00 */ sll $a1, $a1, 16 +/* 00E10 80A2FF90 00052C03 */ sra $a1, $a1, 16 +/* 00E14 80A2FF94 00063403 */ sra $a2, $a2, 16 +/* 00E18 80A2FF98 00073C03 */ sra $a3, $a3, 16 /* 00E1C 80A2FF9C 0C01E763 */ jal Lights_InitType0PositionalLight - -/* 00E20 80A2FFA0 AFA9001C */ sw $t1, 0x001C($sp) + +/* 00E20 80A2FFA0 AFA9001C */ sw $t1, 0x001C($sp) /* 00E24 80A2FFA4 8E050168 */ lw $a1, 0x0168($s0) ## 00000168 /* 00E28 80A2FFA8 8E060184 */ lw $a2, 0x0184($s0) ## 00000184 /* 00E2C 80A2FFAC 92070166 */ lbu $a3, 0x0166($s0) ## 00000166 -/* 00E30 80A2FFB0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00E34 80A2FFB4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00E38 80A2FFB8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00E3C 80A2FFBC 0C0286B2 */ jal func_800A1AC8 +/* 00E30 80A2FFB0 AFB00018 */ sw $s0, 0x0018($sp) +/* 00E34 80A2FFB4 AFA00014 */ sw $zero, 0x0014($sp) +/* 00E38 80A2FFB8 AFA00010 */ sw $zero, 0x0010($sp) +/* 00E3C 80A2FFBC 0C0286B2 */ jal SkelAnime_DrawSV /* 00E40 80A2FFC0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E44 80A2FFC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E48 80A2FFC8 0C28C0D4 */ jal func_80A30350 +/* 00E48 80A2FFC8 0C28C0D4 */ jal func_80A30350 /* 00E4C 80A2FFCC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00E50 80A2FFD0 3C0680A3 */ lui $a2, %hi(D_80A307B0) ## $a2 = 80A30000 /* 00E54 80A2FFD4 24C607B0 */ addiu $a2, $a2, %lo(D_80A307B0) ## $a2 = 80A307B0 /* 00E58 80A2FFD8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00E5C 80A2FFDC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00E60 80A2FFE0 0C031AD5 */ jal func_800C6B54 +/* 00E60 80A2FFE0 0C031AD5 */ jal func_800C6B54 /* 00E64 80A2FFE4 2407031C */ addiu $a3, $zero, 0x031C ## $a3 = 0000031C -/* 00E68 80A2FFE8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E6C 80A2FFEC 8FB00024 */ lw $s0, 0x0024($sp) -/* 00E70 80A2FFF0 8FB10028 */ lw $s1, 0x0028($sp) -/* 00E74 80A2FFF4 03E00008 */ jr $ra +/* 00E68 80A2FFE8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00E6C 80A2FFEC 8FB00024 */ lw $s0, 0x0024($sp) +/* 00E70 80A2FFF0 8FB10028 */ lw $s1, 0x0028($sp) +/* 00E74 80A2FFF4 03E00008 */ jr $ra /* 00E78 80A2FFF8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s index 9b431fa834..5719db4a97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s @@ -45,7 +45,7 @@ glabel EnGb_Init /* 000CC 80A2F24C 24E7049C */ addiu $a3, $a3, 0x049C ## $a3 = 0600049C /* 000D0 80A2F250 24C6C220 */ addiu $a2, $a2, 0xC220 ## $a2 = 0600C220 /* 000D4 80A2F254 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 000D8 80A2F258 0C0291BE */ jal func_800A46F8 +/* 000D8 80A2F258 0C0291BE */ jal SkelAnime_InitSV /* 000DC 80A2F25C 26450164 */ addiu $a1, $s2, 0x0164 ## $a1 = 00000164 /* 000E0 80A2F260 2650023C */ addiu $s0, $s2, 0x023C ## $s0 = 0000023C /* 000E4 80A2F264 02002825 */ or $a1, $s0, $zero ## $a1 = 0000023C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s index a490069686..e8c7dc8b42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s @@ -1,20 +1,20 @@ glabel EnGe1_Draw /* 01CD8 80A32648 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01CDC 80A3264C AFBF002C */ sw $ra, 0x002C($sp) -/* 01CE0 80A32650 AFB00028 */ sw $s0, 0x0028($sp) -/* 01CE4 80A32654 AFA5005C */ sw $a1, 0x005C($sp) +/* 01CDC 80A3264C AFBF002C */ sw $ra, 0x002C($sp) +/* 01CE0 80A32650 AFB00028 */ sw $s0, 0x0028($sp) +/* 01CE4 80A32654 AFA5005C */ sw $a1, 0x005C($sp) /* 01CE8 80A32658 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01CEC 80A3265C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01CF0 80A32660 3C0680A3 */ lui $a2, %hi(D_80A328A8) ## $a2 = 80A30000 /* 01CF4 80A32664 24C628A8 */ addiu $a2, $a2, %lo(D_80A328A8) ## $a2 = 80A328A8 /* 01CF8 80A32668 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01CFC 80A3266C 240705A2 */ addiu $a3, $zero, 0x05A2 ## $a3 = 000005A2 -/* 01D00 80A32670 0C031AB1 */ jal func_800C6AC4 -/* 01D04 80A32674 AFA5004C */ sw $a1, 0x004C($sp) -/* 01D08 80A32678 8FAF005C */ lw $t7, 0x005C($sp) -/* 01D0C 80A3267C 0C0250F2 */ jal func_800943C8 +/* 01D00 80A32670 0C031AB1 */ jal func_800C6AC4 +/* 01D04 80A32674 AFA5004C */ sw $a1, 0x004C($sp) +/* 01D08 80A32678 8FAF005C */ lw $t7, 0x005C($sp) +/* 01D0C 80A3267C 0C0250F2 */ jal func_800943C8 /* 01D10 80A32680 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01D14 80A32684 8FA5004C */ lw $a1, 0x004C($sp) +/* 01D14 80A32684 8FA5004C */ lw $a1, 0x004C($sp) /* 01D18 80A32688 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01D1C 80A3268C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 01D20 80A32690 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,42 +26,42 @@ glabel EnGe1_Draw /* 01D38 80A326A8 860802A8 */ lh $t0, 0x02A8($s0) ## 000002A8 /* 01D3C 80A326AC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01D40 80A326B0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01D44 80A326B4 00084880 */ sll $t1, $t0, 2 -/* 01D48 80A326B8 00892021 */ addu $a0, $a0, $t1 -/* 01D4C 80A326BC 8C8427B4 */ lw $a0, %lo(D_80A327B4)($a0) +/* 01D44 80A326B4 00084880 */ sll $t1, $t0, 2 +/* 01D48 80A326B8 00892021 */ addu $a0, $a0, $t1 +/* 01D4C 80A326BC 8C8427B4 */ lw $a0, %lo(D_80A327B4)($a0) /* 01D50 80A326C0 3C0880A3 */ lui $t0, %hi(func_80A32598) ## $t0 = 80A30000 /* 01D54 80A326C4 3C1980A3 */ lui $t9, %hi(func_80A32444) ## $t9 = 80A30000 -/* 01D58 80A326C8 00045900 */ sll $t3, $a0, 4 -/* 01D5C 80A326CC 000B6702 */ srl $t4, $t3, 28 -/* 01D60 80A326D0 000C6880 */ sll $t5, $t4, 2 -/* 01D64 80A326D4 01CD7021 */ addu $t6, $t6, $t5 +/* 01D58 80A326C8 00045900 */ sll $t3, $a0, 4 +/* 01D5C 80A326CC 000B6702 */ srl $t4, $t3, 28 +/* 01D60 80A326D0 000C6880 */ sll $t5, $t4, 2 +/* 01D64 80A326D4 01CD7021 */ addu $t6, $t6, $t5 /* 01D68 80A326D8 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 01D6C 80A326DC 00815024 */ and $t2, $a0, $at +/* 01D6C 80A326DC 00815024 */ and $t2, $a0, $at /* 01D70 80A326E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01D74 80A326E4 014E7821 */ addu $t7, $t2, $t6 -/* 01D78 80A326E8 01E1C021 */ addu $t8, $t7, $at +/* 01D74 80A326E4 014E7821 */ addu $t7, $t2, $t6 +/* 01D78 80A326E8 01E1C021 */ addu $t8, $t7, $at /* 01D7C 80A326EC AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 01D80 80A326F0 9207019A */ lbu $a3, 0x019A($s0) ## 0000019A /* 01D84 80A326F4 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 /* 01D88 80A326F8 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 01D8C 80A326FC 27392444 */ addiu $t9, $t9, %lo(func_80A32444) ## $t9 = 80A32444 /* 01D90 80A32700 25082598 */ addiu $t0, $t0, %lo(func_80A32598) ## $t0 = 80A32598 -/* 01D94 80A32704 AFA80014 */ sw $t0, 0x0014($sp) -/* 01D98 80A32708 AFB90010 */ sw $t9, 0x0010($sp) -/* 01D9C 80A3270C AFB00018 */ sw $s0, 0x0018($sp) -/* 01DA0 80A32710 0C0286B2 */ jal func_800A1AC8 -/* 01DA4 80A32714 8FA4005C */ lw $a0, 0x005C($sp) -/* 01DA8 80A32718 8FA9005C */ lw $t1, 0x005C($sp) +/* 01D94 80A32704 AFA80014 */ sw $t0, 0x0014($sp) +/* 01D98 80A32708 AFB90010 */ sw $t9, 0x0010($sp) +/* 01D9C 80A3270C AFB00018 */ sw $s0, 0x0018($sp) +/* 01DA0 80A32710 0C0286B2 */ jal SkelAnime_DrawSV +/* 01DA4 80A32714 8FA4005C */ lw $a0, 0x005C($sp) +/* 01DA8 80A32718 8FA9005C */ lw $t1, 0x005C($sp) /* 01DAC 80A3271C 3C0680A3 */ lui $a2, %hi(D_80A328B8) ## $a2 = 80A30000 /* 01DB0 80A32720 24C628B8 */ addiu $a2, $a2, %lo(D_80A328B8) ## $a2 = 80A328B8 /* 01DB4 80A32724 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01DB8 80A32728 240705B3 */ addiu $a3, $zero, 0x05B3 ## $a3 = 000005B3 -/* 01DBC 80A3272C 0C031AD5 */ jal func_800C6B54 +/* 01DBC 80A3272C 0C031AD5 */ jal func_800C6B54 /* 01DC0 80A32730 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 01DC4 80A32734 8FBF002C */ lw $ra, 0x002C($sp) -/* 01DC8 80A32738 8FB00028 */ lw $s0, 0x0028($sp) +/* 01DC4 80A32734 8FBF002C */ lw $ra, 0x002C($sp) +/* 01DC8 80A32738 8FB00028 */ lw $s0, 0x0028($sp) /* 01DCC 80A3273C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01DD0 80A32740 03E00008 */ jr $ra +/* 01DD0 80A32740 03E00008 */ jr $ra /* 01DD4 80A32744 00000000 */ nop /* 01DD8 80A32748 00000000 */ nop /* 01DDC 80A3274C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s index 62500eccb2..0e4b3357e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s @@ -1,15 +1,15 @@ glabel EnGe1_Init /* 00000 80A30970 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80A30974 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80A30974 AFB00028 */ sw $s0, 0x0028($sp) /* 00008 80A30978 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80A3097C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80A30980 AFA50044 */ sw $a1, 0x0044($sp) +/* 0000C 80A3097C AFBF002C */ sw $ra, 0x002C($sp) +/* 00010 80A30980 AFA50044 */ sw $a1, 0x0044($sp) /* 00014 80A30984 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00018 80A30988 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0001C 80A3098C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00020 80A30990 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00024 80A30994 0C00AC78 */ jal ActorShape_Init - + /* 00028 80A30998 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 0002C 80A3099C 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00030 80A309A0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -17,29 +17,29 @@ glabel EnGe1_Init /* 00038 80A309A8 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 0003C 80A309AC 260F023C */ addiu $t7, $s0, 0x023C ## $t7 = 0000023C /* 00040 80A309B0 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 00044 80A309B4 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 80A309B8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 80A309BC AFAE0010 */ sw $t6, 0x0010($sp) +/* 00044 80A309B4 AFB80018 */ sw $t8, 0x0018($sp) +/* 00048 80A309B8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0004C 80A309BC AFAE0010 */ sw $t6, 0x0010($sp) /* 00050 80A309C0 24E70228 */ addiu $a3, $a3, 0x0228 ## $a3 = 06000228 /* 00054 80A309C4 24C60330 */ addiu $a2, $a2, 0x0330 ## $a2 = 06000330 -/* 00058 80A309C8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0005C 80A309CC 0C0291BE */ jal func_800A46F8 -/* 00060 80A309D0 8FA40044 */ lw $a0, 0x0044($sp) +/* 00058 80A309C8 AFA50030 */ sw $a1, 0x0030($sp) +/* 0005C 80A309CC 0C0291BE */ jal SkelAnime_InitSV +/* 00060 80A309D0 8FA40044 */ lw $a0, 0x0044($sp) /* 00064 80A309D4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00068 80A309D8 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 06000228 -/* 0006C 80A309DC 0C02947A */ jal func_800A51E8 -/* 00070 80A309E0 8FA40030 */ lw $a0, 0x0030($sp) +/* 0006C 80A309DC 0C02947A */ jal func_800A51E8 +/* 00070 80A309E0 8FA40030 */ lw $a0, 0x0030($sp) /* 00074 80A309E4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00078 80A309E8 AFA50030 */ sw $a1, 0x0030($sp) +/* 00078 80A309E8 AFA50030 */ sw $a1, 0x0030($sp) /* 0007C 80A309EC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00080 80A309F0 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00080 80A309F0 8FA40044 */ lw $a0, 0x0044($sp) /* 00084 80A309F4 3C0780A3 */ lui $a3, %hi(D_80A32770) ## $a3 = 80A30000 -/* 00088 80A309F8 8FA50030 */ lw $a1, 0x0030($sp) +/* 00088 80A309F8 8FA50030 */ lw $a1, 0x0030($sp) /* 0008C 80A309FC 24E72770 */ addiu $a3, $a3, %lo(D_80A32770) ## $a3 = 80A32770 -/* 00090 80A30A00 8FA40044 */ lw $a0, 0x0044($sp) +/* 00090 80A30A00 8FA40044 */ lw $a0, 0x0044($sp) /* 00094 80A30A04 0C01712B */ jal ActorCollider_InitCylinder - + /* 00098 80A30A08 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0009C 80A30A0C 3C080600 */ lui $t0, 0x0600 ## $t0 = 06000000 /* 000A0 80A30A10 3C0980A3 */ lui $t1, %hi(func_80A323B0) ## $t1 = 80A30000 @@ -54,18 +54,18 @@ glabel EnGe1_Init /* 000C4 80A30A34 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F /* 000C8 80A30A38 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000CC 80A30A3C 0C00B58B */ jal Actor_SetScale - + /* 000D0 80A30A40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000D4 80A30A44 8FAB0044 */ lw $t3, 0x0044($sp) +/* 000D4 80A30A44 8FAB0044 */ lw $t3, 0x0044($sp) /* 000D8 80A30A48 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A /* 000DC 80A30A4C 3C0E80A3 */ lui $t6, %hi(func_80A31880) ## $t6 = 80A30000 /* 000E0 80A30A50 856C00A4 */ lh $t4, 0x00A4($t3) ## 000000A4 /* 000E4 80A30A54 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 000E8 80A30A58 25CE1880 */ addiu $t6, $t6, %lo(func_80A31880) ## $t6 = 80A31880 -/* 000EC 80A30A5C 15810004 */ bne $t4, $at, .L80A30A70 +/* 000EC 80A30A5C 15810004 */ bne $t4, $at, .L80A30A70 /* 000F0 80A30A60 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 000F4 80A30A64 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 -/* 000F8 80A30A68 10000005 */ beq $zero, $zero, .L80A30A80 +/* 000F8 80A30A68 10000005 */ beq $zero, $zero, .L80A30A80 /* 000FC 80A30A6C E60400F4 */ swc1 $f4, 0x00F4($s0) ## 000000F4 .L80A30A70: /* 00100 80A30A70 3C014496 */ lui $at, 0x4496 ## $at = 44960000 @@ -76,124 +76,124 @@ glabel EnGe1_Init /* 00110 80A30A80 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00114 80A30A84 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00118 80A30A88 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 0011C 80A30A8C 50400012 */ beql $v0, $zero, .L80A30AD8 +/* 0011C 80A30A8C 50400012 */ beql $v0, $zero, .L80A30AD8 /* 00120 80A30A90 A20D02AE */ sb $t5, 0x02AE($s0) ## 000002AE -/* 00124 80A30A94 10410012 */ beq $v0, $at, .L80A30AE0 +/* 00124 80A30A94 10410012 */ beq $v0, $at, .L80A30AE0 /* 00128 80A30A98 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 0012C 80A30A9C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00130 80A30AA0 1041001A */ beq $v0, $at, .L80A30B0C +/* 00130 80A30AA0 1041001A */ beq $v0, $at, .L80A30B0C /* 00134 80A30AA4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00138 80A30AA8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0013C 80A30AAC 10410022 */ beq $v0, $at, .L80A30B38 +/* 0013C 80A30AAC 10410022 */ beq $v0, $at, .L80A30B38 /* 00140 80A30AB0 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 00144 80A30AB4 24010045 */ addiu $at, $zero, 0x0045 ## $at = 00000045 -/* 00148 80A30AB8 1041002D */ beq $v0, $at, .L80A30B70 +/* 00148 80A30AB8 1041002D */ beq $v0, $at, .L80A30B70 /* 0014C 80A30ABC 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 /* 00150 80A30AC0 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 00154 80A30AC4 10410050 */ beq $v0, $at, .L80A30C08 +/* 00154 80A30AC4 10410050 */ beq $v0, $at, .L80A30C08 /* 00158 80A30AC8 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 0015C 80A30ACC 10000059 */ beq $zero, $zero, .L80A30C34 +/* 0015C 80A30ACC 10000059 */ beq $zero, $zero, .L80A30C34 /* 00160 80A30AD0 A60002AC */ sh $zero, 0x02AC($s0) ## 000002AC /* 00164 80A30AD4 A20D02AE */ sb $t5, 0x02AE($s0) ## 000002AE .L80A30AD8: -/* 00168 80A30AD8 10000055 */ beq $zero, $zero, .L80A30C30 +/* 00168 80A30AD8 10000055 */ beq $zero, $zero, .L80A30C30 /* 0016C 80A30ADC AE0E02B4 */ sw $t6, 0x02B4($s0) ## 000002B4 .L80A30AE0: -/* 00170 80A30AE0 0C28C373 */ jal func_80A30DCC +/* 00170 80A30AE0 0C28C373 */ jal func_80A30DCC /* 00174 80A30AE4 A20F02AE */ sb $t7, 0x02AE($s0) ## 000002AE -/* 00178 80A30AE8 10400005 */ beq $v0, $zero, .L80A30B00 +/* 00178 80A30AE8 10400005 */ beq $v0, $zero, .L80A30B00 /* 0017C 80A30AEC 3C1980A3 */ lui $t9, %hi(func_80A30F48) ## $t9 = 80A30000 /* 00180 80A30AF0 3C1880A3 */ lui $t8, %hi(func_80A317C0) ## $t8 = 80A30000 /* 00184 80A30AF4 271817C0 */ addiu $t8, $t8, %lo(func_80A317C0) ## $t8 = 80A317C0 -/* 00188 80A30AF8 1000004D */ beq $zero, $zero, .L80A30C30 +/* 00188 80A30AF8 1000004D */ beq $zero, $zero, .L80A30C30 /* 0018C 80A30AFC AE1802B4 */ sw $t8, 0x02B4($s0) ## 000002B4 .L80A30B00: /* 00190 80A30B00 27390F48 */ addiu $t9, $t9, %lo(func_80A30F48) ## $t9 = 80A30F48 -/* 00194 80A30B04 1000004A */ beq $zero, $zero, .L80A30C30 +/* 00194 80A30B04 1000004A */ beq $zero, $zero, .L80A30C30 /* 00198 80A30B08 AE1902B4 */ sw $t9, 0x02B4($s0) ## 000002B4 .L80A30B0C: -/* 0019C 80A30B0C 0C28C373 */ jal func_80A30DCC +/* 0019C 80A30B0C 0C28C373 */ jal func_80A30DCC /* 001A0 80A30B10 A20802AE */ sb $t0, 0x02AE($s0) ## 000002AE -/* 001A4 80A30B14 10400005 */ beq $v0, $zero, .L80A30B2C +/* 001A4 80A30B14 10400005 */ beq $v0, $zero, .L80A30B2C /* 001A8 80A30B18 3C0A80A3 */ lui $t2, %hi(func_80A310C4) ## $t2 = 80A30000 /* 001AC 80A30B1C 3C0980A3 */ lui $t1, %hi(func_80A31094) ## $t1 = 80A30000 /* 001B0 80A30B20 25291094 */ addiu $t1, $t1, %lo(func_80A31094) ## $t1 = 80A31094 -/* 001B4 80A30B24 10000042 */ beq $zero, $zero, .L80A30C30 +/* 001B4 80A30B24 10000042 */ beq $zero, $zero, .L80A30C30 /* 001B8 80A30B28 AE0902B4 */ sw $t1, 0x02B4($s0) ## 000002B4 .L80A30B2C: /* 001BC 80A30B2C 254A10C4 */ addiu $t2, $t2, %lo(func_80A310C4) ## $t2 = 80A310C4 -/* 001C0 80A30B30 1000003F */ beq $zero, $zero, .L80A30C30 +/* 001C0 80A30B30 1000003F */ beq $zero, $zero, .L80A30C30 /* 001C4 80A30B34 AE0A02B4 */ sw $t2, 0x02B4($s0) ## 000002B4 .L80A30B38: /* 001C8 80A30B38 8D6BE664 */ lw $t3, -0x199C($t3) ## FFFFE664 /* 001CC 80A30B3C 3C0C80A3 */ lui $t4, %hi(func_80A3118C) ## $t4 = 80A30000 /* 001D0 80A30B40 3C0480A3 */ lui $a0, %hi(D_80A327C0) ## $a0 = 80A30000 -/* 001D4 80A30B44 15600007 */ bne $t3, $zero, .L80A30B64 +/* 001D4 80A30B44 15600007 */ bne $t3, $zero, .L80A30B64 /* 001D8 80A30B48 258C118C */ addiu $t4, $t4, %lo(func_80A3118C) ## $t4 = 80A3118C /* 001DC 80A30B4C 0C00084C */ jal osSyncPrintf - + /* 001E0 80A30B50 248427C0 */ addiu $a0, $a0, %lo(D_80A327C0) ## $a0 = 80A327C0 /* 001E4 80A30B54 0C00B55C */ jal Actor_Kill - + /* 001E8 80A30B58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001EC 80A30B5C 10000036 */ beq $zero, $zero, .L80A30C38 -/* 001F0 80A30B60 8FBF002C */ lw $ra, 0x002C($sp) +/* 001EC 80A30B5C 10000036 */ beq $zero, $zero, .L80A30C38 +/* 001F0 80A30B60 8FBF002C */ lw $ra, 0x002C($sp) .L80A30B64: /* 001F4 80A30B64 A20002AE */ sb $zero, 0x02AE($s0) ## 000002AE -/* 001F8 80A30B68 10000031 */ beq $zero, $zero, .L80A30C30 +/* 001F8 80A30B68 10000031 */ beq $zero, $zero, .L80A30C30 /* 001FC 80A30B6C AE0C02B4 */ sw $t4, 0x02B4($s0) ## 000002B4 .L80A30B70: /* 00200 80A30B70 91AD7467 */ lbu $t5, 0x7467($t5) ## 00007467 /* 00204 80A30B74 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00208 80A30B78 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0020C 80A30B7C 004D7021 */ addu $t6, $v0, $t5 +/* 0020C 80A30B7C 004D7021 */ addu $t6, $v0, $t5 /* 00210 80A30B80 91CF0074 */ lbu $t7, 0x0074($t6) ## 00000074 /* 00214 80A30B84 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 00218 80A30B88 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 0021C 80A30B8C 15E10005 */ bne $t7, $at, .L80A30BA4 +/* 0021C 80A30B8C 15E10005 */ bne $t7, $at, .L80A30BA4 /* 00220 80A30B90 3C0480A3 */ lui $a0, %hi(D_80A327DC) ## $a0 = 80A30000 /* 00224 80A30B94 0C00B55C */ jal Actor_Kill - + /* 00228 80A30B98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0022C 80A30B9C 10000026 */ beq $zero, $zero, .L80A30C38 -/* 00230 80A30BA0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0022C 80A30B9C 10000026 */ beq $zero, $zero, .L80A30C38 +/* 00230 80A30BA0 8FBF002C */ lw $ra, 0x002C($sp) .L80A30BA4: /* 00234 80A30BA4 A218001F */ sb $t8, 0x001F($s0) ## 0000001F /* 00238 80A30BA8 A20002AE */ sb $zero, 0x02AE($s0) ## 000002AE /* 0023C 80A30BAC 944513FA */ lhu $a1, 0x13FA($v0) ## 000013FA /* 00240 80A30BB0 0C00084C */ jal osSyncPrintf - + /* 00244 80A30BB4 248427DC */ addiu $a0, $a0, %lo(D_80A327DC) ## $a0 = 000027DC /* 00248 80A30BB8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 0024C 80A30BBC 9739FA5A */ lhu $t9, -0x05A6($t9) ## 8015FA5A /* 00250 80A30BC0 3C0980A3 */ lui $t1, %hi(func_80A31E2C) ## $t1 = 80A30000 /* 00254 80A30BC4 25291E2C */ addiu $t1, $t1, %lo(func_80A31E2C) ## $t1 = 80A31E2C /* 00258 80A30BC8 33280100 */ andi $t0, $t9, 0x0100 ## $t0 = 00000000 -/* 0025C 80A30BCC 11000003 */ beq $t0, $zero, .L80A30BDC +/* 0025C 80A30BCC 11000003 */ beq $t0, $zero, .L80A30BDC /* 00260 80A30BD0 00000000 */ nop -/* 00264 80A30BD4 10000016 */ beq $zero, $zero, .L80A30C30 +/* 00264 80A30BD4 10000016 */ beq $zero, $zero, .L80A30C30 /* 00268 80A30BD8 AE0902B4 */ sw $t1, 0x02B4($s0) ## 000002B4 .L80A30BDC: -/* 0026C 80A30BDC 0C28C373 */ jal func_80A30DCC +/* 0026C 80A30BDC 0C28C373 */ jal func_80A30DCC /* 00270 80A30BE0 00000000 */ nop -/* 00274 80A30BE4 10400005 */ beq $v0, $zero, .L80A30BFC +/* 00274 80A30BE4 10400005 */ beq $v0, $zero, .L80A30BFC /* 00278 80A30BE8 3C0B80A3 */ lui $t3, %hi(func_80A30F48) ## $t3 = 80A30000 /* 0027C 80A30BEC 3C0A80A3 */ lui $t2, %hi(func_80A31FE0) ## $t2 = 80A30000 /* 00280 80A30BF0 254A1FE0 */ addiu $t2, $t2, %lo(func_80A31FE0) ## $t2 = 80A31FE0 -/* 00284 80A30BF4 1000000E */ beq $zero, $zero, .L80A30C30 +/* 00284 80A30BF4 1000000E */ beq $zero, $zero, .L80A30C30 /* 00288 80A30BF8 AE0A02B4 */ sw $t2, 0x02B4($s0) ## 000002B4 .L80A30BFC: /* 0028C 80A30BFC 256B0F48 */ addiu $t3, $t3, %lo(func_80A30F48) ## $t3 = 80A30F48 -/* 00290 80A30C00 1000000B */ beq $zero, $zero, .L80A30C30 +/* 00290 80A30C00 1000000B */ beq $zero, $zero, .L80A30C30 /* 00294 80A30C04 AE0B02B4 */ sw $t3, 0x02B4($s0) ## 000002B4 .L80A30C08: -/* 00298 80A30C08 0C28C373 */ jal func_80A30DCC +/* 00298 80A30C08 0C28C373 */ jal func_80A30DCC /* 0029C 80A30C0C A20C02AE */ sb $t4, 0x02AE($s0) ## 000002AE -/* 002A0 80A30C10 10400005 */ beq $v0, $zero, .L80A30C28 +/* 002A0 80A30C10 10400005 */ beq $v0, $zero, .L80A30C28 /* 002A4 80A30C14 3C0E80A3 */ lui $t6, %hi(func_80A30F48) ## $t6 = 80A30000 /* 002A8 80A30C18 3C0D80A3 */ lui $t5, %hi(func_80A31514) ## $t5 = 80A30000 /* 002AC 80A30C1C 25AD1514 */ addiu $t5, $t5, %lo(func_80A31514) ## $t5 = 80A31514 -/* 002B0 80A30C20 10000003 */ beq $zero, $zero, .L80A30C30 +/* 002B0 80A30C20 10000003 */ beq $zero, $zero, .L80A30C30 /* 002B4 80A30C24 AE0D02B4 */ sw $t5, 0x02B4($s0) ## 000002B4 .L80A30C28: /* 002B8 80A30C28 25CE0F48 */ addiu $t6, $t6, %lo(func_80A30F48) ## $t6 = 80A30F48 @@ -201,11 +201,11 @@ glabel EnGe1_Init .L80A30C30: /* 002C0 80A30C30 A60002AC */ sh $zero, 0x02AC($s0) ## 000002AC .L80A30C34: -/* 002C4 80A30C34 8FBF002C */ lw $ra, 0x002C($sp) +/* 002C4 80A30C34 8FBF002C */ lw $ra, 0x002C($sp) .L80A30C38: -/* 002C8 80A30C38 8FB00028 */ lw $s0, 0x0028($sp) +/* 002C8 80A30C38 8FB00028 */ lw $s0, 0x0028($sp) /* 002CC 80A30C3C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 002D0 80A30C40 03E00008 */ jr $ra +/* 002D0 80A30C40 03E00008 */ jr $ra /* 002D4 80A30C44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s index 6e3984cc97..06a51a35e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s @@ -1,20 +1,20 @@ glabel EnGe2_Draw /* 01610 80A341E0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01614 80A341E4 AFB10028 */ sw $s1, 0x0028($sp) +/* 01614 80A341E4 AFB10028 */ sw $s1, 0x0028($sp) /* 01618 80A341E8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0161C 80A341EC AFBF002C */ sw $ra, 0x002C($sp) -/* 01620 80A341F0 AFB00024 */ sw $s0, 0x0024($sp) +/* 0161C 80A341EC AFBF002C */ sw $ra, 0x002C($sp) +/* 01620 80A341F0 AFB00024 */ sw $s0, 0x0024($sp) /* 01624 80A341F4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01628 80A341F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0162C 80A341FC 3C0680A3 */ lui $a2, %hi(D_80A3441C) ## $a2 = 80A30000 /* 01630 80A34200 24C6441C */ addiu $a2, $a2, %lo(D_80A3441C) ## $a2 = 80A3441C /* 01634 80A34204 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01638 80A34208 240704FA */ addiu $a3, $zero, 0x04FA ## $a3 = 000004FA -/* 0163C 80A3420C 0C031AB1 */ jal func_800C6AC4 -/* 01640 80A34210 AFA5004C */ sw $a1, 0x004C($sp) -/* 01644 80A34214 0C0250F2 */ jal func_800943C8 +/* 0163C 80A3420C 0C031AB1 */ jal func_800C6AC4 +/* 01640 80A34210 AFA5004C */ sw $a1, 0x004C($sp) +/* 01644 80A34214 0C0250F2 */ jal func_800943C8 /* 01648 80A34218 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0164C 80A3421C 8FA5004C */ lw $a1, 0x004C($sp) +/* 0164C 80A3421C 8FA5004C */ lw $a1, 0x004C($sp) /* 01650 80A34220 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 01654 80A34224 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 01658 80A34228 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,22 +26,22 @@ glabel EnGe2_Draw /* 01670 80A34240 861802E4 */ lh $t8, 0x02E4($s0) ## 000002E4 /* 01674 80A34244 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01678 80A34248 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0167C 80A3424C 0018C880 */ sll $t9, $t8, 2 -/* 01680 80A34250 00992021 */ addu $a0, $a0, $t9 -/* 01684 80A34254 8C8443BC */ lw $a0, %lo(D_80A343BC)($a0) +/* 0167C 80A3424C 0018C880 */ sll $t9, $t8, 2 +/* 01680 80A34250 00992021 */ addu $a0, $a0, $t9 +/* 01684 80A34254 8C8443BC */ lw $a0, %lo(D_80A343BC)($a0) /* 01688 80A34258 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0168C 80A3425C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01690 80A34260 00044900 */ sll $t1, $a0, 4 -/* 01694 80A34264 00095702 */ srl $t2, $t1, 28 -/* 01698 80A34268 000A5880 */ sll $t3, $t2, 2 -/* 0169C 80A3426C 018B6021 */ addu $t4, $t4, $t3 +/* 01690 80A34260 00044900 */ sll $t1, $a0, 4 +/* 01694 80A34264 00095702 */ srl $t2, $t1, 28 +/* 01698 80A34268 000A5880 */ sll $t3, $t2, 2 +/* 0169C 80A3426C 018B6021 */ addu $t4, $t4, $t3 /* 016A0 80A34270 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 016A4 80A34274 00814024 */ and $t0, $a0, $at +/* 016A4 80A34274 00814024 */ and $t0, $a0, $at /* 016A8 80A34278 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 016AC 80A3427C 010C6821 */ addu $t5, $t0, $t4 -/* 016B0 80A34280 01A17021 */ addu $t6, $t5, $at +/* 016AC 80A3427C 010C6821 */ addu $t5, $t0, $t4 +/* 016B0 80A34280 01A17021 */ addu $t6, $t5, $at /* 016B4 80A34284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016B8 80A34288 0C00BAF3 */ jal func_8002EBCC +/* 016B8 80A34288 0C00BAF3 */ jal func_8002EBCC /* 016BC 80A3428C AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 016C0 80A34290 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 016C4 80A34294 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 @@ -50,21 +50,21 @@ glabel EnGe2_Draw /* 016D0 80A342A0 3C1880A3 */ lui $t8, %hi(func_80A341A0) ## $t8 = 80A30000 /* 016D4 80A342A4 271841A0 */ addiu $t8, $t8, %lo(func_80A341A0) ## $t8 = 80A341A0 /* 016D8 80A342A8 25EF415C */ addiu $t7, $t7, %lo(func_80A3415C) ## $t7 = 80A3415C -/* 016DC 80A342AC AFAF0010 */ sw $t7, 0x0010($sp) -/* 016E0 80A342B0 AFB80014 */ sw $t8, 0x0014($sp) -/* 016E4 80A342B4 AFB00018 */ sw $s0, 0x0018($sp) -/* 016E8 80A342B8 0C0286B2 */ jal func_800A1AC8 +/* 016DC 80A342AC AFAF0010 */ sw $t7, 0x0010($sp) +/* 016E0 80A342B0 AFB80014 */ sw $t8, 0x0014($sp) +/* 016E4 80A342B4 AFB00018 */ sw $s0, 0x0018($sp) +/* 016E8 80A342B8 0C0286B2 */ jal SkelAnime_DrawSV /* 016EC 80A342BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 016F0 80A342C0 3C0680A3 */ lui $a2, %hi(D_80A3442C) ## $a2 = 80A30000 /* 016F4 80A342C4 24C6442C */ addiu $a2, $a2, %lo(D_80A3442C) ## $a2 = 80A3442C /* 016F8 80A342C8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 016FC 80A342CC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01700 80A342D0 0C031AD5 */ jal func_800C6B54 +/* 01700 80A342D0 0C031AD5 */ jal func_800C6B54 /* 01704 80A342D4 2407050B */ addiu $a3, $zero, 0x050B ## $a3 = 0000050B -/* 01708 80A342D8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0170C 80A342DC 8FB00024 */ lw $s0, 0x0024($sp) -/* 01710 80A342E0 8FB10028 */ lw $s1, 0x0028($sp) -/* 01714 80A342E4 03E00008 */ jr $ra +/* 01708 80A342D8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0170C 80A342DC 8FB00024 */ lw $s0, 0x0024($sp) +/* 01710 80A342E0 8FB10028 */ lw $s1, 0x0028($sp) +/* 01714 80A342E4 03E00008 */ jr $ra /* 01718 80A342E8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 0171C 80A342EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s index 099dd0f82a..728e2666b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s @@ -1,60 +1,60 @@ glabel EnGe2_Init /* 000A4 80A32C74 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 000A8 80A32C78 AFB00028 */ sw $s0, 0x0028($sp) +/* 000A8 80A32C78 AFB00028 */ sw $s0, 0x0028($sp) /* 000AC 80A32C7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000B0 80A32C80 AFBF002C */ sw $ra, 0x002C($sp) -/* 000B4 80A32C84 AFA50044 */ sw $a1, 0x0044($sp) +/* 000B0 80A32C80 AFBF002C */ sw $ra, 0x002C($sp) +/* 000B4 80A32C84 AFA50044 */ sw $a1, 0x0044($sp) /* 000B8 80A32C88 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 000BC 80A32C8C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 000C0 80A32C90 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 000C4 80A32C94 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 000C8 80A32C98 0C00AC78 */ jal ActorShape_Init - + /* 000CC 80A32C9C 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 000D0 80A32CA0 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 000D4 80A32CA4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 000D8 80A32CA8 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 000DC 80A32CAC 260F0260 */ addiu $t7, $s0, 0x0260 ## $t7 = 00000260 /* 000E0 80A32CB0 24180016 */ addiu $t8, $zero, 0x0016 ## $t8 = 00000016 -/* 000E4 80A32CB4 AFB80018 */ sw $t8, 0x0018($sp) -/* 000E8 80A32CB8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 000EC 80A32CBC AFAE0010 */ sw $t6, 0x0010($sp) +/* 000E4 80A32CB4 AFB80018 */ sw $t8, 0x0018($sp) +/* 000E8 80A32CB8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 000EC 80A32CBC AFAE0010 */ sw $t6, 0x0010($sp) /* 000F0 80A32CC0 24C68968 */ addiu $a2, $a2, 0x8968 ## $a2 = 06008968 -/* 000F4 80A32CC4 AFA50030 */ sw $a1, 0x0030($sp) -/* 000F8 80A32CC8 8FA40044 */ lw $a0, 0x0044($sp) -/* 000FC 80A32CCC 0C0291BE */ jal func_800A46F8 +/* 000F4 80A32CC4 AFA50030 */ sw $a1, 0x0030($sp) +/* 000F8 80A32CC8 8FA40044 */ lw $a0, 0x0044($sp) +/* 000FC 80A32CCC 0C0291BE */ jal SkelAnime_InitSV /* 00100 80A32CD0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00104 80A32CD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00108 80A32CD8 24A59ED4 */ addiu $a1, $a1, 0x9ED4 ## $a1 = 06009ED4 -/* 0010C 80A32CDC 0C0294BE */ jal func_800A52F8 -/* 00110 80A32CE0 8FA40030 */ lw $a0, 0x0030($sp) +/* 0010C 80A32CDC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00110 80A32CE0 8FA40030 */ lw $a0, 0x0030($sp) /* 00114 80A32CE4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00118 80A32CE8 AFA50030 */ sw $a1, 0x0030($sp) +/* 00118 80A32CE8 AFA50030 */ sw $a1, 0x0030($sp) /* 0011C 80A32CEC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00120 80A32CF0 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00120 80A32CF0 8FA40044 */ lw $a0, 0x0044($sp) /* 00124 80A32CF4 3C0780A3 */ lui $a3, %hi(D_80A34310) ## $a3 = 80A30000 -/* 00128 80A32CF8 8FA50030 */ lw $a1, 0x0030($sp) +/* 00128 80A32CF8 8FA50030 */ lw $a1, 0x0030($sp) /* 0012C 80A32CFC 24E74310 */ addiu $a3, $a3, %lo(D_80A34310) ## $a3 = 80A34310 -/* 00130 80A32D00 8FA40044 */ lw $a0, 0x0044($sp) +/* 00130 80A32D00 8FA40044 */ lw $a0, 0x0044($sp) /* 00134 80A32D04 0C01712B */ jal ActorCollider_InitCylinder - + /* 00138 80A32D08 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0013C 80A32D0C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 00140 80A32D10 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00144 80A32D14 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 00148 80A32D18 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 0014C 80A32D1C 0C00B58B */ jal Actor_SetScale - + /* 00150 80A32D20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00154 80A32D24 8FA80044 */ lw $t0, 0x0044($sp) +/* 00154 80A32D24 8FA80044 */ lw $t0, 0x0044($sp) /* 00158 80A32D28 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A /* 0015C 80A32D2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00160 80A32D30 850900A4 */ lh $t1, 0x00A4($t0) ## 000000A4 -/* 00164 80A32D34 15210004 */ bne $t1, $at, .L80A32D48 +/* 00164 80A32D34 15210004 */ bne $t1, $at, .L80A32D48 /* 00168 80A32D38 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 0016C 80A32D3C 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 -/* 00170 80A32D40 10000005 */ beq $zero, $zero, .L80A32D58 +/* 00170 80A32D40 10000005 */ beq $zero, $zero, .L80A32D58 /* 00174 80A32D44 E60400F4 */ swc1 $f4, 0x00F4($s0) ## 000000F4 .L80A32D48: /* 00178 80A32D48 3C014496 */ lui $at, 0x4496 ## $at = 44960000 @@ -69,46 +69,46 @@ glabel EnGe2_Init /* 00198 80A32D68 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 /* 0019C 80A32D6C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 001A0 80A32D70 A6000034 */ sh $zero, 0x0034($s0) ## 00000034 -/* 001A4 80A32D74 468042A0 */ cvt.s.w $f10, $f8 +/* 001A4 80A32D74 468042A0 */ cvt.s.w $f10, $f8 /* 001A8 80A32D78 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 /* 001AC 80A32D7C A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 001B0 80A32D80 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 001B4 80A32D84 46105482 */ mul.s $f18, $f10, $f16 -/* 001B8 80A32D88 10400008 */ beq $v0, $zero, .L80A32DAC +/* 001B4 80A32D84 46105482 */ mul.s $f18, $f10, $f16 +/* 001B8 80A32D88 10400008 */ beq $v0, $zero, .L80A32DAC /* 001BC 80A32D8C E61202FC */ swc1 $f18, 0x02FC($s0) ## 000002FC -/* 001C0 80A32D90 10410011 */ beq $v0, $at, .L80A32DD8 +/* 001C0 80A32D90 10410011 */ beq $v0, $at, .L80A32DD8 /* 001C4 80A32D94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001C8 80A32D98 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 001CC 80A32D9C 10410019 */ beq $v0, $at, .L80A32E04 +/* 001CC 80A32D9C 10410019 */ beq $v0, $at, .L80A32E04 /* 001D0 80A32DA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001D4 80A32DA4 10000022 */ beq $zero, $zero, .L80A32E30 +/* 001D4 80A32DA4 10000022 */ beq $zero, $zero, .L80A32E30 /* 001D8 80A32DA8 3C0480A3 */ lui $a0, %hi(D_80A343D0) ## $a0 = 80A30000 .L80A32DAC: -/* 001DC 80A32DAC 0C28CAF4 */ jal func_80A32BD0 +/* 001DC 80A32DAC 0C28CAF4 */ jal func_80A32BD0 /* 001E0 80A32DB0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 001E4 80A32DB4 0C28CC28 */ jal func_80A330A0 +/* 001E4 80A32DB4 0C28CC28 */ jal func_80A330A0 /* 001E8 80A32DB8 00000000 */ nop -/* 001EC 80A32DBC 10400021 */ beq $v0, $zero, .L80A32E44 +/* 001EC 80A32DBC 10400021 */ beq $v0, $zero, .L80A32E44 /* 001F0 80A32DC0 3C0C80A3 */ lui $t4, %hi(func_80A33D10) ## $t4 = 80A30000 /* 001F4 80A32DC4 258C3D10 */ addiu $t4, $t4, %lo(func_80A33D10) ## $t4 = 80A33D10 /* 001F8 80A32DC8 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 /* 001FC 80A32DCC AE0C0130 */ sw $t4, 0x0130($s0) ## 00000130 -/* 00200 80A32DD0 1000001C */ beq $zero, $zero, .L80A32E44 +/* 00200 80A32DD0 1000001C */ beq $zero, $zero, .L80A32E44 /* 00204 80A32DD4 A20D001F */ sb $t5, 0x001F($s0) ## 0000001F .L80A32DD8: -/* 00208 80A32DD8 0C28CAF4 */ jal func_80A32BD0 +/* 00208 80A32DD8 0C28CAF4 */ jal func_80A32BD0 /* 0020C 80A32DDC 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 00210 80A32DE0 0C28CC28 */ jal func_80A330A0 +/* 00210 80A32DE0 0C28CC28 */ jal func_80A330A0 /* 00214 80A32DE4 00000000 */ nop -/* 00218 80A32DE8 10400016 */ beq $v0, $zero, .L80A32E44 +/* 00218 80A32DE8 10400016 */ beq $v0, $zero, .L80A32E44 /* 0021C 80A32DEC 3C0E80A3 */ lui $t6, %hi(func_80A33D10) ## $t6 = 80A30000 /* 00220 80A32DF0 25CE3D10 */ addiu $t6, $t6, %lo(func_80A33D10) ## $t6 = 80A33D10 /* 00224 80A32DF4 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 /* 00228 80A32DF8 AE0E0130 */ sw $t6, 0x0130($s0) ## 00000130 -/* 0022C 80A32DFC 10000011 */ beq $zero, $zero, .L80A32E44 +/* 0022C 80A32DFC 10000011 */ beq $zero, $zero, .L80A32E44 /* 00230 80A32E00 A20F001F */ sb $t7, 0x001F($s0) ## 0000001F .L80A32E04: -/* 00234 80A32E04 0C28CAF4 */ jal func_80A32BD0 +/* 00234 80A32E04 0C28CAF4 */ jal func_80A32BD0 /* 00238 80A32E08 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 0023C 80A32E0C 3C1880A3 */ lui $t8, %hi(func_80A33DE0) ## $t8 = 80A30000 /* 00240 80A32E10 3C1980A3 */ lui $t9, %hi(func_80A33AFC) ## $t9 = 80A30000 @@ -117,14 +117,14 @@ glabel EnGe2_Init /* 0024C 80A32E1C 24080006 */ addiu $t0, $zero, 0x0006 ## $t0 = 00000006 /* 00250 80A32E20 AE180130 */ sw $t8, 0x0130($s0) ## 00000130 /* 00254 80A32E24 AE190308 */ sw $t9, 0x0308($s0) ## 00000308 -/* 00258 80A32E28 10000006 */ beq $zero, $zero, .L80A32E44 +/* 00258 80A32E28 10000006 */ beq $zero, $zero, .L80A32E44 /* 0025C 80A32E2C A208001F */ sb $t0, 0x001F($s0) ## 0000001F .L80A32E30: /* 00260 80A32E30 3C0580A3 */ lui $a1, %hi(D_80A343D4) ## $a1 = 80A30000 /* 00264 80A32E34 24A543D4 */ addiu $a1, $a1, %lo(D_80A343D4) ## $a1 = 80A343D4 /* 00268 80A32E38 248443D0 */ addiu $a0, $a0, %lo(D_80A343D0) ## $a0 = 000043D0 /* 0026C 80A32E3C 0C0007FC */ jal __assert - + /* 00270 80A32E40 240601A2 */ addiu $a2, $zero, 0x01A2 ## $a2 = 000001A2 .L80A32E44: /* 00274 80A32E44 860A001C */ lh $t2, 0x001C($s0) ## 0000001C @@ -132,12 +132,12 @@ glabel EnGe2_Init /* 0027C 80A32E4C 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 /* 00280 80A32E50 314BFF00 */ andi $t3, $t2, 0xFF00 ## $t3 = 00000000 /* 00284 80A32E54 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00288 80A32E58 000B6203 */ sra $t4, $t3, 8 +/* 00288 80A32E58 000B6203 */ sra $t4, $t3, 8 /* 0028C 80A32E5C 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 /* 00290 80A32E60 86090032 */ lh $t1, 0x0032($s0) ## 00000032 -/* 00294 80A32E64 000C6880 */ sll $t5, $t4, 2 -/* 00298 80A32E68 01AC6821 */ addu $t5, $t5, $t4 -/* 0029C 80A32E6C 000D6840 */ sll $t5, $t5, 1 +/* 00294 80A32E64 000C6880 */ sll $t5, $t4, 2 +/* 00298 80A32E68 01AC6821 */ addu $t5, $t5, $t4 +/* 0029C 80A32E6C 000D6840 */ sll $t5, $t5, 1 /* 002A0 80A32E70 A60002F4 */ sh $zero, 0x02F4($s0) ## 000002F4 /* 002A4 80A32E74 A2000304 */ sb $zero, 0x0304($s0) ## 00000304 /* 002A8 80A32E78 A6000302 */ sh $zero, 0x0302($s0) ## 00000302 @@ -146,10 +146,10 @@ glabel EnGe2_Init /* 002B4 80A32E84 E6040070 */ swc1 $f4, 0x0070($s0) ## 00000070 /* 002B8 80A32E88 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C /* 002BC 80A32E8C A60902F6 */ sh $t1, 0x02F6($s0) ## 000002F6 -/* 002C0 80A32E90 8FBF002C */ lw $ra, 0x002C($sp) -/* 002C4 80A32E94 8FB00028 */ lw $s0, 0x0028($sp) +/* 002C0 80A32E90 8FBF002C */ lw $ra, 0x002C($sp) +/* 002C4 80A32E94 8FB00028 */ lw $s0, 0x0028($sp) /* 002C8 80A32E98 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 002CC 80A32E9C 03E00008 */ jr $ra +/* 002CC 80A32E9C 03E00008 */ jr $ra /* 002D0 80A32EA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s index a3b087d5ae..08e1dbf351 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s @@ -1,20 +1,20 @@ glabel EnGe3_Draw /* 00A40 80A35060 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00A44 80A35064 AFB10028 */ sw $s1, 0x0028($sp) +/* 00A44 80A35064 AFB10028 */ sw $s1, 0x0028($sp) /* 00A48 80A35068 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00A4C 80A3506C AFBF002C */ sw $ra, 0x002C($sp) -/* 00A50 80A35070 AFB00024 */ sw $s0, 0x0024($sp) +/* 00A4C 80A3506C AFBF002C */ sw $ra, 0x002C($sp) +/* 00A50 80A35070 AFB00024 */ sw $s0, 0x0024($sp) /* 00A54 80A35074 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00A58 80A35078 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00A5C 80A3507C 3C0680A3 */ lui $a2, %hi(D_80A35200) ## $a2 = 80A30000 /* 00A60 80A35080 24C65200 */ addiu $a2, $a2, %lo(D_80A35200) ## $a2 = 80A35200 /* 00A64 80A35084 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00A68 80A35088 24070266 */ addiu $a3, $zero, 0x0266 ## $a3 = 00000266 -/* 00A6C 80A3508C 0C031AB1 */ jal func_800C6AC4 -/* 00A70 80A35090 AFA5004C */ sw $a1, 0x004C($sp) -/* 00A74 80A35094 0C0250F2 */ jal func_800943C8 +/* 00A6C 80A3508C 0C031AB1 */ jal func_800C6AC4 +/* 00A70 80A35090 AFA5004C */ sw $a1, 0x004C($sp) +/* 00A74 80A35094 0C0250F2 */ jal func_800943C8 /* 00A78 80A35098 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00A7C 80A3509C 8FA5004C */ lw $a1, 0x004C($sp) +/* 00A7C 80A3509C 8FA5004C */ lw $a1, 0x004C($sp) /* 00A80 80A350A0 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 00A84 80A350A4 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 00A88 80A350A8 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,22 +26,22 @@ glabel EnGe3_Draw /* 00AA0 80A350C0 861802FC */ lh $t8, 0x02FC($s0) ## 000002FC /* 00AA4 80A350C4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00AA8 80A350C8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00AAC 80A350CC 0018C880 */ sll $t9, $t8, 2 -/* 00AB0 80A350D0 00992021 */ addu $a0, $a0, $t9 -/* 00AB4 80A350D4 8C8451D4 */ lw $a0, %lo(D_80A351D4)($a0) +/* 00AAC 80A350CC 0018C880 */ sll $t9, $t8, 2 +/* 00AB0 80A350D0 00992021 */ addu $a0, $a0, $t9 +/* 00AB4 80A350D4 8C8451D4 */ lw $a0, %lo(D_80A351D4)($a0) /* 00AB8 80A350D8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00ABC 80A350DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00AC0 80A350E0 00044900 */ sll $t1, $a0, 4 -/* 00AC4 80A350E4 00095702 */ srl $t2, $t1, 28 -/* 00AC8 80A350E8 000A5880 */ sll $t3, $t2, 2 -/* 00ACC 80A350EC 018B6021 */ addu $t4, $t4, $t3 +/* 00AC0 80A350E0 00044900 */ sll $t1, $a0, 4 +/* 00AC4 80A350E4 00095702 */ srl $t2, $t1, 28 +/* 00AC8 80A350E8 000A5880 */ sll $t3, $t2, 2 +/* 00ACC 80A350EC 018B6021 */ addu $t4, $t4, $t3 /* 00AD0 80A350F0 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 00AD4 80A350F4 00814024 */ and $t0, $a0, $at +/* 00AD4 80A350F4 00814024 */ and $t0, $a0, $at /* 00AD8 80A350F8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00ADC 80A350FC 010C6821 */ addu $t5, $t0, $t4 -/* 00AE0 80A35100 01A17021 */ addu $t6, $t5, $at +/* 00ADC 80A350FC 010C6821 */ addu $t5, $t0, $t4 +/* 00AE0 80A35100 01A17021 */ addu $t6, $t5, $at /* 00AE4 80A35104 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AE8 80A35108 0C00BAF3 */ jal func_8002EBCC +/* 00AE8 80A35108 0C00BAF3 */ jal func_8002EBCC /* 00AEC 80A3510C AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 00AF0 80A35110 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 00AF4 80A35114 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 @@ -50,21 +50,21 @@ glabel EnGe3_Draw /* 00B00 80A35120 3C1880A3 */ lui $t8, %hi(func_80A35004) ## $t8 = 80A30000 /* 00B04 80A35124 27185004 */ addiu $t8, $t8, %lo(func_80A35004) ## $t8 = 80A35004 /* 00B08 80A35128 25EF4E58 */ addiu $t7, $t7, %lo(func_80A34E58) ## $t7 = 80A34E58 -/* 00B0C 80A3512C AFAF0010 */ sw $t7, 0x0010($sp) -/* 00B10 80A35130 AFB80014 */ sw $t8, 0x0014($sp) -/* 00B14 80A35134 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B18 80A35138 0C0286B2 */ jal func_800A1AC8 +/* 00B0C 80A3512C AFAF0010 */ sw $t7, 0x0010($sp) +/* 00B10 80A35130 AFB80014 */ sw $t8, 0x0014($sp) +/* 00B14 80A35134 AFB00018 */ sw $s0, 0x0018($sp) +/* 00B18 80A35138 0C0286B2 */ jal SkelAnime_DrawSV /* 00B1C 80A3513C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B20 80A35140 3C0680A3 */ lui $a2, %hi(D_80A35210) ## $a2 = 80A30000 /* 00B24 80A35144 24C65210 */ addiu $a2, $a2, %lo(D_80A35210) ## $a2 = 80A35210 /* 00B28 80A35148 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00B2C 80A3514C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00B30 80A35150 0C031AD5 */ jal func_800C6B54 +/* 00B30 80A35150 0C031AD5 */ jal func_800C6B54 /* 00B34 80A35154 24070277 */ addiu $a3, $zero, 0x0277 ## $a3 = 00000277 -/* 00B38 80A35158 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B3C 80A3515C 8FB00024 */ lw $s0, 0x0024($sp) -/* 00B40 80A35160 8FB10028 */ lw $s1, 0x0028($sp) -/* 00B44 80A35164 03E00008 */ jr $ra +/* 00B38 80A35158 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B3C 80A3515C 8FB00024 */ lw $s0, 0x0024($sp) +/* 00B40 80A35160 8FB10028 */ lw $s1, 0x0028($sp) +/* 00B44 80A35164 03E00008 */ jr $ra /* 00B48 80A35168 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00B4C 80A3516C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s index 16e91ee1bf..d0737217bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s @@ -1,56 +1,56 @@ glabel EnGe3_Init /* 000A4 80A346C4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 000A8 80A346C8 AFB00028 */ sw $s0, 0x0028($sp) +/* 000A8 80A346C8 AFB00028 */ sw $s0, 0x0028($sp) /* 000AC 80A346CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000B0 80A346D0 AFBF002C */ sw $ra, 0x002C($sp) -/* 000B4 80A346D4 AFA50044 */ sw $a1, 0x0044($sp) +/* 000B0 80A346D0 AFBF002C */ sw $ra, 0x002C($sp) +/* 000B4 80A346D4 AFA50044 */ sw $a1, 0x0044($sp) /* 000B8 80A346D8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 000BC 80A346DC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 000C0 80A346E0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 000C4 80A346E4 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 000C8 80A346E8 0C00AC78 */ jal ActorShape_Init - + /* 000CC 80A346EC 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 000D0 80A346F0 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 000D4 80A346F4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 000D8 80A346F8 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 000DC 80A346FC 260F026C */ addiu $t7, $s0, 0x026C ## $t7 = 0000026C /* 000E0 80A34700 24180018 */ addiu $t8, $zero, 0x0018 ## $t8 = 00000018 -/* 000E4 80A34704 AFB80018 */ sw $t8, 0x0018($sp) -/* 000E8 80A34708 AFAF0014 */ sw $t7, 0x0014($sp) -/* 000EC 80A3470C AFAE0010 */ sw $t6, 0x0010($sp) +/* 000E4 80A34704 AFB80018 */ sw $t8, 0x0018($sp) +/* 000E8 80A34708 AFAF0014 */ sw $t7, 0x0014($sp) +/* 000EC 80A3470C AFAE0010 */ sw $t6, 0x0010($sp) /* 000F0 80A34710 24C6A458 */ addiu $a2, $a2, 0xA458 ## $a2 = 0600A458 -/* 000F4 80A34714 AFA50034 */ sw $a1, 0x0034($sp) -/* 000F8 80A34718 8FA40044 */ lw $a0, 0x0044($sp) -/* 000FC 80A3471C 0C0291BE */ jal func_800A46F8 +/* 000F4 80A34714 AFA50034 */ sw $a1, 0x0034($sp) +/* 000F8 80A34718 8FA40044 */ lw $a0, 0x0044($sp) +/* 000FC 80A3471C 0C0291BE */ jal SkelAnime_InitSV /* 00100 80A34720 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00104 80A34724 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00108 80A34728 24A5B07C */ addiu $a1, $a1, 0xB07C ## $a1 = 0600B07C -/* 0010C 80A3472C 0C0294BE */ jal func_800A52F8 -/* 00110 80A34730 8FA40034 */ lw $a0, 0x0034($sp) +/* 0010C 80A3472C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00110 80A34730 8FA40034 */ lw $a0, 0x0034($sp) /* 00114 80A34734 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00118 80A34738 AFA50034 */ sw $a1, 0x0034($sp) +/* 00118 80A34738 AFA50034 */ sw $a1, 0x0034($sp) /* 0011C 80A3473C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00120 80A34740 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00120 80A34740 8FA40044 */ lw $a0, 0x0044($sp) /* 00124 80A34744 3C0780A3 */ lui $a3, %hi(D_80A35190) ## $a3 = 80A30000 -/* 00128 80A34748 8FA50034 */ lw $a1, 0x0034($sp) +/* 00128 80A34748 8FA50034 */ lw $a1, 0x0034($sp) /* 0012C 80A3474C 24E75190 */ addiu $a3, $a3, %lo(D_80A35190) ## $a3 = 80A35190 -/* 00130 80A34750 8FA40044 */ lw $a0, 0x0044($sp) +/* 00130 80A34750 8FA40044 */ lw $a0, 0x0044($sp) /* 00134 80A34754 0C01712B */ jal ActorCollider_InitCylinder - + /* 00138 80A34758 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0013C 80A3475C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 00140 80A34760 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00144 80A34764 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 00148 80A34768 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 0014C 80A3476C 0C00B58B */ jal Actor_SetScale - + /* 00150 80A34770 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00154 80A34774 A6000034 */ sh $zero, 0x0034($s0) ## 00000034 /* 00158 80A34778 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 0015C 80A3477C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00160 80A34780 0C28D188 */ jal func_80A34620 +/* 00160 80A34780 0C28D188 */ jal func_80A34620 /* 00164 80A34784 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00168 80A34788 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 0016C 80A3478C 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 @@ -64,10 +64,10 @@ glabel EnGe3_Init /* 0018C 80A347AC A209001F */ sb $t1, 0x001F($s0) ## 0000001F /* 00190 80A347B0 E6040070 */ swc1 $f4, 0x0070($s0) ## 00000070 /* 00194 80A347B4 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 00198 80A347B8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0019C 80A347BC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00198 80A347B8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0019C 80A347BC 8FB00028 */ lw $s0, 0x0028($sp) /* 001A0 80A347C0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 001A4 80A347C4 03E00008 */ jr $ra +/* 001A4 80A347C4 03E00008 */ jr $ra /* 001A8 80A347C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s index c6f968589a..b71607a802 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s @@ -1,118 +1,118 @@ glabel EnGeldB_Draw /* 04788 80A39A98 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 -/* 0478C 80A39A9C AFBF004C */ sw $ra, 0x004C($sp) -/* 04790 80A39AA0 AFB40048 */ sw $s4, 0x0048($sp) -/* 04794 80A39AA4 AFB30044 */ sw $s3, 0x0044($sp) -/* 04798 80A39AA8 AFB20040 */ sw $s2, 0x0040($sp) -/* 0479C 80A39AAC AFB1003C */ sw $s1, 0x003C($sp) -/* 047A0 80A39AB0 AFB00038 */ sw $s0, 0x0038($sp) -/* 047A4 80A39AB4 AFA500DC */ sw $a1, 0x00DC($sp) +/* 0478C 80A39A9C AFBF004C */ sw $ra, 0x004C($sp) +/* 04790 80A39AA0 AFB40048 */ sw $s4, 0x0048($sp) +/* 04794 80A39AA4 AFB30044 */ sw $s3, 0x0044($sp) +/* 04798 80A39AA8 AFB20040 */ sw $s2, 0x0040($sp) +/* 0479C 80A39AAC AFB1003C */ sw $s1, 0x003C($sp) +/* 047A0 80A39AB0 AFB00038 */ sw $s0, 0x0038($sp) +/* 047A4 80A39AB4 AFA500DC */ sw $a1, 0x00DC($sp) /* 047A8 80A39AB8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 047AC 80A39ABC 0080A025 */ or $s4, $a0, $zero ## $s4 = 00000000 /* 047B0 80A39AC0 3C0680A4 */ lui $a2, %hi(D_80A3A200) ## $a2 = 80A40000 /* 047B4 80A39AC4 24C6A200 */ addiu $a2, $a2, %lo(D_80A3A200) ## $a2 = 80A3A200 /* 047B8 80A39AC8 27A400BC */ addiu $a0, $sp, 0x00BC ## $a0 = FFFFFFE4 /* 047BC 80A39ACC 24070A70 */ addiu $a3, $zero, 0x0A70 ## $a3 = 00000A70 -/* 047C0 80A39AD0 0C031AB1 */ jal func_800C6AC4 +/* 047C0 80A39AD0 0C031AB1 */ jal func_800C6AC4 /* 047C4 80A39AD4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 047C8 80A39AD8 868F0312 */ lh $t7, 0x0312($s4) ## 00000312 /* 047CC 80A39ADC 26900188 */ addiu $s0, $s4, 0x0188 ## $s0 = 00000188 -/* 047D0 80A39AE0 29E10002 */ slti $at, $t7, 0x0002 -/* 047D4 80A39AE4 5420004D */ bnel $at, $zero, .L80A39C1C +/* 047D0 80A39AE0 29E10002 */ slti $at, $t7, 0x0002 +/* 047D4 80A39AE4 5420004D */ bnel $at, $zero, .L80A39C1C /* 047D8 80A39AE8 8E8B02EC */ lw $t3, 0x02EC($s4) ## 000002EC /* 047DC 80A39AEC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 047E0 80A39AF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000188 -/* 047E4 80A39AF4 50400049 */ beql $v0, $zero, .L80A39C1C +/* 047E4 80A39AF4 50400049 */ beql $v0, $zero, .L80A39C1C /* 047E8 80A39AF8 8E8B02EC */ lw $t3, 0x02EC($s4) ## 000002EC /* 047EC 80A39AFC 86980312 */ lh $t8, 0x0312($s4) ## 00000312 /* 047F0 80A39B00 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 047F4 80A39B04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000188 -/* 047F8 80A39B08 17010014 */ bne $t8, $at, .L80A39B5C +/* 047F8 80A39B08 17010014 */ bne $t8, $at, .L80A39B5C /* 047FC 80A39B0C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04800 80A39B10 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 04804 80A39B14 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 /* 04808 80A39B18 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 0480C 80A39B1C 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 /* 04810 80A39B20 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 04814 80A39B24 AFB90014 */ sw $t9, 0x0014($sp) +/* 04814 80A39B24 AFB90014 */ sw $t9, 0x0014($sp) /* 04818 80A39B28 24A50F5C */ addiu $a1, $a1, 0x0F5C ## $a1 = 06000F5C /* 0481C 80A39B2C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 04820 80A39B30 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04824 80A39B34 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 04824 80A39B34 E7A40010 */ swc1 $f4, 0x0010($sp) /* 04828 80A39B38 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0482C 80A39B3C E7A60018 */ swc1 $f6, 0x0018($sp) + +/* 0482C 80A39B3C E7A60018 */ swc1 $f6, 0x0018($sp) /* 04830 80A39B40 86880312 */ lh $t0, 0x0312($s4) ## 00000312 /* 04834 80A39B44 8682008A */ lh $v0, 0x008A($s4) ## 0000008A /* 04838 80A39B48 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 /* 0483C 80A39B4C A6890312 */ sh $t1, 0x0312($s4) ## 00000312 /* 04840 80A39B50 A68200B6 */ sh $v0, 0x00B6($s4) ## 000000B6 -/* 04844 80A39B54 10000030 */ beq $zero, $zero, .L80A39C18 +/* 04844 80A39B54 10000030 */ beq $zero, $zero, .L80A39C18 /* 04848 80A39B58 A6820032 */ sh $v0, 0x0032($s4) ## 00000032 .L80A39B5C: /* 0484C 80A39B5C 8E8A0300 */ lw $t2, 0x0300($s4) ## 00000300 /* 04850 80A39B60 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 /* 04854 80A39B64 24847464 */ addiu $a0, $a0, 0x7464 ## $a0 = 80127464 /* 04858 80A39B68 254BFFFF */ addiu $t3, $t2, 0xFFFF ## $t3 = FFFFFFFF -/* 0485C 80A39B6C 1560002A */ bne $t3, $zero, .L80A39C18 +/* 0485C 80A39B6C 1560002A */ bne $t3, $zero, .L80A39C18 /* 04860 80A39B70 AE8B0300 */ sw $t3, 0x0300($s4) ## 00000300 /* 04864 80A39B74 908D000A */ lbu $t5, 0x000A($a0) ## 8012746E /* 04868 80A39B78 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 0486C 80A39B7C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 04870 80A39B80 004D7021 */ addu $t6, $v0, $t5 +/* 04870 80A39B80 004D7021 */ addu $t6, $v0, $t5 /* 04874 80A39B84 91CF0074 */ lbu $t7, 0x0074($t6) ## 00000074 /* 04878 80A39B88 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 0487C 80A39B8C 8FAA00DC */ lw $t2, 0x00DC($sp) -/* 04880 80A39B90 106F0005 */ beq $v1, $t7, .L80A39BA8 +/* 0487C 80A39B8C 8FAA00DC */ lw $t2, 0x00DC($sp) +/* 04880 80A39B90 106F0005 */ beq $v1, $t7, .L80A39BA8 /* 04884 80A39B94 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04888 80A39B98 9098000B */ lbu $t8, 0x000B($a0) ## 8012746F -/* 0488C 80A39B9C 0058C821 */ addu $t9, $v0, $t8 +/* 0488C 80A39B9C 0058C821 */ addu $t9, $v0, $t8 /* 04890 80A39BA0 93280074 */ lbu $t0, 0x0074($t9) ## 00000074 -/* 04894 80A39BA4 14680004 */ bne $v1, $t0, .L80A39BB8 +/* 04894 80A39BA4 14680004 */ bne $v1, $t0, .L80A39BB8 .L80A39BA8: /* 04898 80A39BA8 240901A5 */ addiu $t1, $zero, 0x01A5 ## $t1 = 000001A5 -/* 0489C 80A39BAC 002A0821 */ addu $at, $at, $t2 -/* 048A0 80A39BB0 1000000F */ beq $zero, $zero, .L80A39BF0 +/* 0489C 80A39BAC 002A0821 */ addu $at, $at, $t2 +/* 048A0 80A39BB0 1000000F */ beq $zero, $zero, .L80A39BF0 /* 048A4 80A39BB4 A4291E1A */ sh $t1, 0x1E1A($at) ## 00011E1A .L80A39BB8: /* 048A8 80A39BB8 944B0EEC */ lhu $t3, 0x0EEC($v0) ## 8015F54C -/* 048AC 80A39BBC 8FB800DC */ lw $t8, 0x00DC($sp) +/* 048AC 80A39BBC 8FB800DC */ lw $t8, 0x00DC($sp) /* 048B0 80A39BC0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 048B4 80A39BC4 316C0080 */ andi $t4, $t3, 0x0080 ## $t4 = 00000080 -/* 048B8 80A39BC8 11800007 */ beq $t4, $zero, .L80A39BE8 -/* 048BC 80A39BCC 00380821 */ addu $at, $at, $t8 -/* 048C0 80A39BD0 8FAE00DC */ lw $t6, 0x00DC($sp) +/* 048B8 80A39BC8 11800007 */ beq $t4, $zero, .L80A39BE8 +/* 048BC 80A39BCC 00380821 */ addu $at, $at, $t8 +/* 048C0 80A39BD0 8FAE00DC */ lw $t6, 0x00DC($sp) /* 048C4 80A39BD4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 048C8 80A39BD8 240D05F8 */ addiu $t5, $zero, 0x05F8 ## $t5 = 000005F8 -/* 048CC 80A39BDC 002E0821 */ addu $at, $at, $t6 -/* 048D0 80A39BE0 10000003 */ beq $zero, $zero, .L80A39BF0 +/* 048CC 80A39BDC 002E0821 */ addu $at, $at, $t6 +/* 048D0 80A39BE0 10000003 */ beq $zero, $zero, .L80A39BF0 /* 048D4 80A39BE4 A42D1E1A */ sh $t5, 0x1E1A($at) ## 00011E1A .L80A39BE8: /* 048D8 80A39BE8 240F03B4 */ addiu $t7, $zero, 0x03B4 ## $t7 = 000003B4 /* 048DC 80A39BEC A42F1E1A */ sh $t7, 0x1E1A($at) ## 00011E1A .L80A39BF0: -/* 048E0 80A39BF0 8FA800DC */ lw $t0, 0x00DC($sp) +/* 048E0 80A39BF0 8FA800DC */ lw $t0, 0x00DC($sp) /* 048E4 80A39BF4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 048E8 80A39BF8 24190026 */ addiu $t9, $zero, 0x0026 ## $t9 = 00000026 -/* 048EC 80A39BFC 00280821 */ addu $at, $at, $t0 +/* 048EC 80A39BFC 00280821 */ addu $at, $at, $t0 /* 048F0 80A39C00 A0391E5E */ sb $t9, 0x1E5E($at) ## 00011E5E -/* 048F4 80A39C04 8FAA00DC */ lw $t2, 0x00DC($sp) +/* 048F4 80A39C04 8FAA00DC */ lw $t2, 0x00DC($sp) /* 048F8 80A39C08 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 048FC 80A39C0C 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 04900 80A39C10 002A0821 */ addu $at, $at, $t2 +/* 04900 80A39C10 002A0821 */ addu $at, $at, $t2 /* 04904 80A39C14 A0291E15 */ sb $t1, 0x1E15($at) ## 00011E15 .L80A39C18: /* 04908 80A39C18 8E8B02EC */ lw $t3, 0x02EC($s4) ## 000002EC .L80A39C1C: -/* 0490C 80A39C1C 8FAD00DC */ lw $t5, 0x00DC($sp) -/* 04910 80A39C20 15600004 */ bne $t3, $zero, .L80A39C34 +/* 0490C 80A39C1C 8FAD00DC */ lw $t5, 0x00DC($sp) +/* 04910 80A39C20 15600004 */ bne $t3, $zero, .L80A39C34 /* 04914 80A39C24 00000000 */ nop /* 04918 80A39C28 868C0318 */ lh $t4, 0x0318($s4) ## 00000318 -/* 0491C 80A39C2C 55800071 */ bnel $t4, $zero, .L80A39DF4 -/* 04920 80A39C30 8FAE00DC */ lw $t6, 0x00DC($sp) +/* 0491C 80A39C2C 55800071 */ bnel $t4, $zero, .L80A39DF4 +/* 04920 80A39C30 8FAE00DC */ lw $t6, 0x00DC($sp) .L80A39C34: -/* 04924 80A39C34 0C024F46 */ jal func_80093D18 +/* 04924 80A39C34 0C024F46 */ jal func_80093D18 /* 04928 80A39C38 8DA40000 */ lw $a0, 0x0000($t5) ## 000005F8 /* 0492C 80A39C3C 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 04930 80A39C40 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -123,20 +123,20 @@ glabel EnGeldB_Draw /* 04944 80A39C54 9298031A */ lbu $t8, 0x031A($s4) ## 0000031A /* 04948 80A39C58 3C0480A4 */ lui $a0, %hi(D_80A3A1C4) ## $a0 = 80A40000 /* 0494C 80A39C5C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 04950 80A39C60 0018C880 */ sll $t9, $t8, 2 -/* 04954 80A39C64 00992021 */ addu $a0, $a0, $t9 -/* 04958 80A39C68 8C84A1C4 */ lw $a0, %lo(D_80A3A1C4)($a0) +/* 04950 80A39C60 0018C880 */ sll $t9, $t8, 2 +/* 04954 80A39C64 00992021 */ addu $a0, $a0, $t9 +/* 04958 80A39C68 8C84A1C4 */ lw $a0, %lo(D_80A3A1C4)($a0) /* 0495C 80A39C6C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 04960 80A39C70 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 04964 80A39C74 00044900 */ sll $t1, $a0, 4 -/* 04968 80A39C78 00095702 */ srl $t2, $t1, 28 -/* 0496C 80A39C7C 000A5880 */ sll $t3, $t2, 2 -/* 04970 80A39C80 018B6021 */ addu $t4, $t4, $t3 +/* 04964 80A39C74 00044900 */ sll $t1, $a0, 4 +/* 04968 80A39C78 00095702 */ srl $t2, $t1, 28 +/* 0496C 80A39C7C 000A5880 */ sll $t3, $t2, 2 +/* 04970 80A39C80 018B6021 */ addu $t4, $t4, $t3 /* 04974 80A39C84 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 04978 80A39C88 00814024 */ and $t0, $a0, $at +/* 04978 80A39C88 00814024 */ and $t0, $a0, $at /* 0497C 80A39C8C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04980 80A39C90 010C6821 */ addu $t5, $t0, $t4 -/* 04984 80A39C94 01A17021 */ addu $t6, $t5, $at +/* 04980 80A39C90 010C6821 */ addu $t5, $t0, $t4 +/* 04984 80A39C94 01A17021 */ addu $t6, $t5, $at /* 04988 80A39C98 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 0498C 80A39C9C 9287018A */ lbu $a3, 0x018A($s4) ## 0000018A /* 04990 80A39CA0 8E8601A8 */ lw $a2, 0x01A8($s4) ## 000001A8 @@ -145,15 +145,15 @@ glabel EnGeldB_Draw /* 0499C 80A39CAC 3C0F80A4 */ lui $t7, %hi(func_80A39688) ## $t7 = 80A40000 /* 049A0 80A39CB0 25EF9688 */ addiu $t7, $t7, %lo(func_80A39688) ## $t7 = 80A39688 /* 049A4 80A39CB4 27189824 */ addiu $t8, $t8, %lo(func_80A39824) ## $t8 = 80A39824 -/* 049A8 80A39CB8 AFB80014 */ sw $t8, 0x0014($sp) -/* 049AC 80A39CBC AFAF0010 */ sw $t7, 0x0010($sp) -/* 049B0 80A39CC0 AFB40018 */ sw $s4, 0x0018($sp) -/* 049B4 80A39CC4 0C0286B2 */ jal func_800A1AC8 -/* 049B8 80A39CC8 8FA400DC */ lw $a0, 0x00DC($sp) +/* 049A8 80A39CB8 AFB80014 */ sw $t8, 0x0014($sp) +/* 049AC 80A39CBC AFAF0010 */ sw $t7, 0x0010($sp) +/* 049B0 80A39CC0 AFB40018 */ sw $s4, 0x0018($sp) +/* 049B4 80A39CC4 0C0286B2 */ jal SkelAnime_DrawSV +/* 049B8 80A39CC8 8FA400DC */ lw $a0, 0x00DC($sp) /* 049BC 80A39CCC 8E9902EC */ lw $t9, 0x02EC($s4) ## 000002EC /* 049C0 80A39CD0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 049C4 80A39CD4 3C1180A4 */ lui $s1, %hi(D_80A3A17C) ## $s1 = 80A40000 -/* 049C8 80A39CD8 17210020 */ bne $t9, $at, .L80A39D5C +/* 049C8 80A39CD8 17210020 */ bne $t9, $at, .L80A39D5C /* 049CC 80A39CDC 2631A17C */ addiu $s1, $s1, %lo(D_80A3A17C) ## $s1 = 80A3A17C /* 049D0 80A39CE0 3C1380A4 */ lui $s3, %hi(D_80A3A1A0) ## $s3 = 80A40000 /* 049D4 80A39CE4 2673A1A0 */ addiu $s3, $s3, %lo(D_80A3A1A0) ## $s3 = 80A3A1A0 @@ -161,36 +161,36 @@ glabel EnGeldB_Draw /* 049DC 80A39CEC 27B0006C */ addiu $s0, $sp, 0x006C ## $s0 = FFFFFF94 .L80A39CF0: /* 049E0 80A39CF0 02202025 */ or $a0, $s1, $zero ## $a0 = 80A3A17C -/* 049E4 80A39CF4 0C0346BD */ jal Matrix_MultVec3f +/* 049E4 80A39CF4 0C0346BD */ jal Matrix_MultVec3f /* 049E8 80A39CF8 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFB8 /* 049EC 80A39CFC 02602025 */ or $a0, $s3, $zero ## $a0 = 80A3A1A0 -/* 049F0 80A39D00 0C0346BD */ jal Matrix_MultVec3f +/* 049F0 80A39D00 0C0346BD */ jal Matrix_MultVec3f /* 049F4 80A39D04 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFF94 /* 049F8 80A39D08 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = FFFFFFA0 /* 049FC 80A39D0C 27A90090 */ addiu $t1, $sp, 0x0090 ## $t1 = FFFFFFB8 /* 04A00 80A39D10 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 80A3A188 /* 04A04 80A39D14 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = FFFFFFC4 -/* 04A08 80A39D18 1609FFF5 */ bne $s0, $t1, .L80A39CF0 +/* 04A08 80A39D18 1609FFF5 */ bne $s0, $t1, .L80A39CF0 /* 04A0C 80A39D1C 2673000C */ addiu $s3, $s3, 0x000C ## $s3 = 80A3A1AC /* 04A10 80A39D20 269003EC */ addiu $s0, $s4, 0x03EC ## $s0 = 000003EC /* 04A14 80A39D24 27AA00A8 */ addiu $t2, $sp, 0x00A8 ## $t2 = FFFFFFD0 -/* 04A18 80A39D28 AFAA0010 */ sw $t2, 0x0010($sp) +/* 04A18 80A39D28 AFAA0010 */ sw $t2, 0x0010($sp) /* 04A1C 80A39D2C 02002025 */ or $a0, $s0, $zero ## $a0 = 000003EC /* 04A20 80A39D30 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04A24 80A39D34 27A60090 */ addiu $a2, $sp, 0x0090 ## $a2 = FFFFFFB8 -/* 04A28 80A39D38 0C0189E8 */ jal func_800627A0 +/* 04A28 80A39D38 0C0189E8 */ jal func_800627A0 /* 04A2C 80A39D3C 27A7009C */ addiu $a3, $sp, 0x009C ## $a3 = FFFFFFC4 /* 04A30 80A39D40 27AB0084 */ addiu $t3, $sp, 0x0084 ## $t3 = FFFFFFAC -/* 04A34 80A39D44 AFAB0010 */ sw $t3, 0x0010($sp) +/* 04A34 80A39D44 AFAB0010 */ sw $t3, 0x0010($sp) /* 04A38 80A39D48 02002025 */ or $a0, $s0, $zero ## $a0 = 000003EC /* 04A3C 80A39D4C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 04A40 80A39D50 27A6006C */ addiu $a2, $sp, 0x006C ## $a2 = FFFFFF94 -/* 04A44 80A39D54 0C0189E8 */ jal func_800627A0 +/* 04A44 80A39D54 0C0189E8 */ jal func_800627A0 /* 04A48 80A39D58 27A70078 */ addiu $a3, $sp, 0x0078 ## $a3 = FFFFFFA0 .L80A39D5C: /* 04A4C 80A39D5C 868802FC */ lh $t0, 0x02FC($s4) ## 000002FC -/* 04A50 80A39D60 51000024 */ beql $t0, $zero, .L80A39DF4 -/* 04A54 80A39D64 8FAE00DC */ lw $t6, 0x00DC($sp) +/* 04A50 80A39D60 51000024 */ beql $t0, $zero, .L80A39DF4 +/* 04A54 80A39D64 8FAE00DC */ lw $t6, 0x00DC($sp) /* 04A58 80A39D68 868E02FC */ lh $t6, 0x02FC($s4) ## 000002FC /* 04A5C 80A39D6C 928C0114 */ lbu $t4, 0x0114($s4) ## 00000114 /* 04A60 80A39D70 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 @@ -200,47 +200,47 @@ glabel EnGeldB_Draw /* 04A70 80A39D80 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 /* 04A74 80A39D84 A28D0114 */ sb $t5, 0x0114($s4) ## 00000114 /* 04A78 80A39D88 30780003 */ andi $t8, $v1, 0x0003 ## $t8 = 00000000 -/* 04A7C 80A39D8C 17000018 */ bne $t8, $zero, .L80A39DF0 -/* 04A80 80A39D90 00031083 */ sra $v0, $v1, 2 -/* 04A84 80A39D94 0002C880 */ sll $t9, $v0, 2 -/* 04A88 80A39D98 0322C823 */ subu $t9, $t9, $v0 +/* 04A7C 80A39D8C 17000018 */ bne $t8, $zero, .L80A39DF0 +/* 04A80 80A39D90 00031083 */ sra $v0, $v1, 2 +/* 04A84 80A39D94 0002C880 */ sll $t9, $v0, 2 +/* 04A88 80A39D98 0322C823 */ subu $t9, $t9, $v0 /* 04A8C 80A39D9C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 04A90 80A39DA0 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 -/* 04A94 80A39DA4 0019C840 */ sll $t9, $t9, 1 -/* 04A98 80A39DA8 02993021 */ addu $a2, $s4, $t9 +/* 04A94 80A39DA4 0019C840 */ sll $t9, $t9, 1 +/* 04A98 80A39DA8 02993021 */ addu $a2, $s4, $t9 /* 04A9C 80A39DAC 24090096 */ addiu $t1, $zero, 0x0096 ## $t1 = 00000096 /* 04AA0 80A39DB0 240A0096 */ addiu $t2, $zero, 0x0096 ## $t2 = 00000096 /* 04AA4 80A39DB4 240B00FA */ addiu $t3, $zero, 0x00FA ## $t3 = 000000FA /* 04AA8 80A39DB8 240800EB */ addiu $t0, $zero, 0x00EB ## $t0 = 000000EB /* 04AAC 80A39DBC 240C00F5 */ addiu $t4, $zero, 0x00F5 ## $t4 = 000000F5 /* 04AB0 80A39DC0 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 04AB4 80A39DC4 AFAD0024 */ sw $t5, 0x0024($sp) -/* 04AB8 80A39DC8 AFAC0020 */ sw $t4, 0x0020($sp) -/* 04ABC 80A39DCC AFA8001C */ sw $t0, 0x001C($sp) -/* 04AC0 80A39DD0 AFAB0018 */ sw $t3, 0x0018($sp) -/* 04AC4 80A39DD4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 04AC8 80A39DD8 AFA90010 */ sw $t1, 0x0010($sp) +/* 04AB4 80A39DC4 AFAD0024 */ sw $t5, 0x0024($sp) +/* 04AB8 80A39DC8 AFAC0020 */ sw $t4, 0x0020($sp) +/* 04ABC 80A39DCC AFA8001C */ sw $t0, 0x001C($sp) +/* 04AC0 80A39DD0 AFAB0018 */ sw $t3, 0x0018($sp) +/* 04AC4 80A39DD4 AFAA0014 */ sw $t2, 0x0014($sp) +/* 04AC8 80A39DD8 AFA90010 */ sw $t1, 0x0010($sp) /* 04ACC 80A39DDC 24C6014C */ addiu $a2, $a2, 0x014C ## $a2 = 0000014C -/* 04AD0 80A39DE0 8FA400DC */ lw $a0, 0x00DC($sp) +/* 04AD0 80A39DE0 8FA400DC */ lw $a0, 0x00DC($sp) /* 04AD4 80A39DE4 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 04AD8 80A39DE8 0C00A877 */ jal func_8002A1DC -/* 04ADC 80A39DEC E7A80028 */ swc1 $f8, 0x0028($sp) +/* 04AD8 80A39DE8 0C00A877 */ jal func_8002A1DC +/* 04ADC 80A39DEC E7A80028 */ swc1 $f8, 0x0028($sp) .L80A39DF0: -/* 04AE0 80A39DF0 8FAE00DC */ lw $t6, 0x00DC($sp) +/* 04AE0 80A39DF0 8FAE00DC */ lw $t6, 0x00DC($sp) .L80A39DF4: /* 04AE4 80A39DF4 3C0680A4 */ lui $a2, %hi(D_80A3A210) ## $a2 = 80A40000 /* 04AE8 80A39DF8 24C6A210 */ addiu $a2, $a2, %lo(D_80A3A210) ## $a2 = 80A3A210 /* 04AEC 80A39DFC 27A400BC */ addiu $a0, $sp, 0x00BC ## $a0 = FFFFFFE4 /* 04AF0 80A39E00 24070AB8 */ addiu $a3, $zero, 0x0AB8 ## $a3 = 00000AB8 -/* 04AF4 80A39E04 0C031AD5 */ jal func_800C6B54 +/* 04AF4 80A39E04 0C031AD5 */ jal func_800C6B54 /* 04AF8 80A39E08 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 04AFC 80A39E0C 8FBF004C */ lw $ra, 0x004C($sp) -/* 04B00 80A39E10 8FB00038 */ lw $s0, 0x0038($sp) -/* 04B04 80A39E14 8FB1003C */ lw $s1, 0x003C($sp) -/* 04B08 80A39E18 8FB20040 */ lw $s2, 0x0040($sp) -/* 04B0C 80A39E1C 8FB30044 */ lw $s3, 0x0044($sp) -/* 04B10 80A39E20 8FB40048 */ lw $s4, 0x0048($sp) -/* 04B14 80A39E24 03E00008 */ jr $ra +/* 04AFC 80A39E0C 8FBF004C */ lw $ra, 0x004C($sp) +/* 04B00 80A39E10 8FB00038 */ lw $s0, 0x0038($sp) +/* 04B04 80A39E14 8FB1003C */ lw $s1, 0x003C($sp) +/* 04B08 80A39E18 8FB20040 */ lw $s2, 0x0040($sp) +/* 04B0C 80A39E1C 8FB30044 */ lw $s3, 0x0044($sp) +/* 04B10 80A39E20 8FB40048 */ lw $s4, 0x0048($sp) +/* 04B14 80A39E24 03E00008 */ jr $ra /* 04B18 80A39E28 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s index 7400585cf3..5fcfc7351d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s @@ -1,24 +1,24 @@ glabel EnGeldB_Init /* 00008 80A35318 27BDFE18 */ addiu $sp, $sp, 0xFE18 ## $sp = FFFFFE18 -/* 0000C 80A3531C AFB10028 */ sw $s1, 0x0028($sp) +/* 0000C 80A3531C AFB10028 */ sw $s1, 0x0028($sp) /* 00010 80A35320 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00014 80A35324 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 80A35328 AFB00024 */ sw $s0, 0x0024($sp) +/* 00014 80A35324 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 80A35328 AFB00024 */ sw $s0, 0x0024($sp) /* 0001C 80A3532C 3C0580A4 */ lui $a1, %hi(D_80A3A104) ## $a1 = 80A40000 /* 00020 80A35330 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00024 80A35334 0C01E037 */ jal Actor_ProcessInitChain - + /* 00028 80A35338 24A5A104 */ addiu $a1, $a1, %lo(D_80A3A104) ## $a1 = 80A3A104 /* 0002C 80A3533C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00030 80A35340 3C0E80A4 */ lui $t6, %hi(D_80A3A0E4) ## $t6 = 80A40000 /* 00034 80A35344 25CEA0E4 */ addiu $t6, $t6, %lo(D_80A3A0E4) ## $t6 = 80A3A0E4 /* 00038 80A35348 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0003C 80A3534C 44050000 */ mfc1 $a1, $f0 -/* 00040 80A35350 44070000 */ mfc1 $a3, $f0 +/* 0003C 80A3534C 44050000 */ mfc1 $a1, $f0 +/* 00040 80A35350 44070000 */ mfc1 $a3, $f0 /* 00044 80A35354 AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 /* 00048 80A35358 24C6B8C4 */ addiu $a2, $a2, 0xB8C4 ## $a2 = 8002B8C4 /* 0004C 80A3535C 0C00AC78 */ jal ActorShape_Init - + /* 00050 80A35360 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00054 80A35364 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 00058 80A35368 860E001C */ lh $t6, 0x001C($s0) ## 0000001C @@ -47,102 +47,102 @@ glabel EnGeldB_Init /* 000B4 80A353C4 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 000B8 80A353C8 24E7B6D4 */ addiu $a3, $a3, 0xB6D4 ## $a3 = 0600B6D4 /* 000BC 80A353CC 24C6A458 */ addiu $a2, $a2, 0xA458 ## $a2 = 0600A458 -/* 000C0 80A353D0 AFB80010 */ sw $t8, 0x0010($sp) -/* 000C4 80A353D4 AFB90014 */ sw $t9, 0x0014($sp) -/* 000C8 80A353D8 AFAA0018 */ sw $t2, 0x0018($sp) +/* 000C0 80A353D0 AFB80010 */ sw $t8, 0x0010($sp) +/* 000C4 80A353D4 AFB90014 */ sw $t9, 0x0014($sp) +/* 000C8 80A353D8 AFAA0018 */ sw $t2, 0x0018($sp) /* 000CC 80A353DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000D0 80A353E0 0C0291BE */ jal func_800A46F8 +/* 000D0 80A353E0 0C0291BE */ jal SkelAnime_InitSV /* 000D4 80A353E4 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 /* 000D8 80A353E8 26050320 */ addiu $a1, $s0, 0x0320 ## $a1 = 00000320 -/* 000DC 80A353EC AFA50030 */ sw $a1, 0x0030($sp) +/* 000DC 80A353EC AFA50030 */ sw $a1, 0x0030($sp) /* 000E0 80A353F0 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 000E4 80A353F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000E8 80A353F8 3C0780A4 */ lui $a3, %hi(D_80A39FE0) ## $a3 = 80A40000 -/* 000EC 80A353FC 8FA50030 */ lw $a1, 0x0030($sp) +/* 000EC 80A353FC 8FA50030 */ lw $a1, 0x0030($sp) /* 000F0 80A35400 24E79FE0 */ addiu $a3, $a3, %lo(D_80A39FE0) ## $a3 = 80A39FE0 /* 000F4 80A35404 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000F8 80A35408 0C01712B */ jal ActorCollider_InitCylinder - + /* 000FC 80A3540C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00100 80A35410 260503EC */ addiu $a1, $s0, 0x03EC ## $a1 = 000003EC -/* 00104 80A35414 AFA50030 */ sw $a1, 0x0030($sp) -/* 00108 80A35418 0C0171F8 */ jal func_8005C7E0 +/* 00104 80A35414 AFA50030 */ sw $a1, 0x0030($sp) +/* 00108 80A35418 0C0171F8 */ jal func_8005C7E0 /* 0010C 80A3541C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00110 80A35420 3C0780A4 */ lui $a3, %hi(D_80A3A084) ## $a3 = 80A40000 /* 00114 80A35424 260B040C */ addiu $t3, $s0, 0x040C ## $t3 = 0000040C -/* 00118 80A35428 8FA50030 */ lw $a1, 0x0030($sp) -/* 0011C 80A3542C AFAB0010 */ sw $t3, 0x0010($sp) +/* 00118 80A35428 8FA50030 */ lw $a1, 0x0030($sp) +/* 0011C 80A3542C AFAB0010 */ sw $t3, 0x0010($sp) /* 00120 80A35430 24E7A084 */ addiu $a3, $a3, %lo(D_80A3A084) ## $a3 = 80A3A084 /* 00124 80A35434 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00128 80A35438 0C0172EB */ jal func_8005CBAC +/* 00128 80A35438 0C0172EB */ jal func_8005CBAC /* 0012C 80A3543C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00130 80A35440 2605036C */ addiu $a1, $s0, 0x036C ## $a1 = 0000036C -/* 00134 80A35444 AFA50030 */ sw $a1, 0x0030($sp) -/* 00138 80A35448 0C017406 */ jal func_8005D018 +/* 00134 80A35444 AFA50030 */ sw $a1, 0x0030($sp) +/* 00138 80A35448 0C017406 */ jal func_8005D018 /* 0013C 80A3544C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00140 80A35450 3C0780A4 */ lui $a3, %hi(D_80A3A094) ## $a3 = 80A40000 -/* 00144 80A35454 8FA50030 */ lw $a1, 0x0030($sp) +/* 00144 80A35454 8FA50030 */ lw $a1, 0x0030($sp) /* 00148 80A35458 24E7A094 */ addiu $a3, $a3, %lo(D_80A3A094) ## $a3 = 80A3A094 /* 0014C 80A3545C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00150 80A35460 0C017441 */ jal func_8005D104 +/* 00150 80A35460 0C017441 */ jal func_8005D104 /* 00154 80A35464 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00158 80A35468 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF /* 0015C 80A3546C 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 /* 00160 80A35470 240D0008 */ addiu $t5, $zero, 0x0008 ## $t5 = 00000008 /* 00164 80A35474 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00168 80A35478 27AF0044 */ addiu $t7, $sp, 0x0044 ## $t7 = FFFFFE5C -/* 0016C 80A3547C A3A301D5 */ sb $v1, 0x01D5($sp) -/* 00170 80A35480 A3A301D4 */ sb $v1, 0x01D4($sp) -/* 00174 80A35484 A3A301D2 */ sb $v1, 0x01D2($sp) -/* 00178 80A35488 A3A301D1 */ sb $v1, 0x01D1($sp) -/* 0017C 80A3548C A3A301D0 */ sb $v1, 0x01D0($sp) -/* 00180 80A35490 A3A301CE */ sb $v1, 0x01CE($sp) -/* 00184 80A35494 A3A301CD */ sb $v1, 0x01CD($sp) -/* 00188 80A35498 A3A301CC */ sb $v1, 0x01CC($sp) -/* 0018C 80A3549C A3A301CB */ sb $v1, 0x01CB($sp) -/* 00190 80A354A0 A3A301CA */ sb $v1, 0x01CA($sp) -/* 00194 80A354A4 A3A301C9 */ sb $v1, 0x01C9($sp) -/* 00198 80A354A8 A3A301C8 */ sb $v1, 0x01C8($sp) -/* 0019C 80A354AC A3AC01CF */ sb $t4, 0x01CF($sp) -/* 001A0 80A354B0 A3A001D3 */ sb $zero, 0x01D3($sp) -/* 001A4 80A354B4 AFAD01D8 */ sw $t5, 0x01D8($sp) -/* 001A8 80A354B8 AFA001DC */ sw $zero, 0x01DC($sp) -/* 001AC 80A354BC AFAE01E0 */ sw $t6, 0x01E0($sp) -/* 001B0 80A354C0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 001B4 80A354C4 A3A301D6 */ sb $v1, 0x01D6($sp) +/* 0016C 80A3547C A3A301D5 */ sb $v1, 0x01D5($sp) +/* 00170 80A35480 A3A301D4 */ sb $v1, 0x01D4($sp) +/* 00174 80A35484 A3A301D2 */ sb $v1, 0x01D2($sp) +/* 00178 80A35488 A3A301D1 */ sb $v1, 0x01D1($sp) +/* 0017C 80A3548C A3A301D0 */ sb $v1, 0x01D0($sp) +/* 00180 80A35490 A3A301CE */ sb $v1, 0x01CE($sp) +/* 00184 80A35494 A3A301CD */ sb $v1, 0x01CD($sp) +/* 00188 80A35498 A3A301CC */ sb $v1, 0x01CC($sp) +/* 0018C 80A3549C A3A301CB */ sb $v1, 0x01CB($sp) +/* 00190 80A354A0 A3A301CA */ sb $v1, 0x01CA($sp) +/* 00194 80A354A4 A3A301C9 */ sb $v1, 0x01C9($sp) +/* 00198 80A354A8 A3A301C8 */ sb $v1, 0x01C8($sp) +/* 0019C 80A354AC A3AC01CF */ sb $t4, 0x01CF($sp) +/* 001A0 80A354B0 A3A001D3 */ sb $zero, 0x01D3($sp) +/* 001A4 80A354B4 AFAD01D8 */ sw $t5, 0x01D8($sp) +/* 001A8 80A354B8 AFA001DC */ sw $zero, 0x01DC($sp) +/* 001AC 80A354BC AFAE01E0 */ sw $t6, 0x01E0($sp) +/* 001B0 80A354C0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 001B4 80A354C4 A3A301D6 */ sb $v1, 0x01D6($sp) /* 001B8 80A354C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001BC 80A354CC 2605031C */ addiu $a1, $s0, 0x031C ## $a1 = 0000031C /* 001C0 80A354D0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 001C4 80A354D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 001C8 80A354D8 AFA00010 */ sw $zero, 0x0010($sp) +/* 001C8 80A354D8 AFA00010 */ sw $zero, 0x0010($sp) /* 001CC 80A354DC 0C009B35 */ jal Effect_Add ## Effect_Add -/* 001D0 80A354E0 A3A001D7 */ sb $zero, 0x01D7($sp) +/* 001D0 80A354E0 A3A001D7 */ sb $zero, 0x01D7($sp) /* 001D4 80A354E4 3C053C4C */ lui $a1, 0x3C4C ## $a1 = 3C4C0000 /* 001D8 80A354E8 34A5CCCC */ ori $a1, $a1, 0xCCCC ## $a1 = 3C4CCCCC /* 001DC 80A354EC 0C00B58B */ jal Actor_SetScale - + /* 001E0 80A354F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001E4 80A354F4 0C28D65D */ jal func_80A35974 +/* 001E4 80A354F4 0C28D65D */ jal func_80A35974 /* 001E8 80A354F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001EC 80A354FC 86020314 */ lh $v0, 0x0314($s0) ## 00000314 /* 001F0 80A35500 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001F4 80A35504 50400008 */ beql $v0, $zero, .L80A35528 -/* 001F8 80A35508 8FBF002C */ lw $ra, 0x002C($sp) +/* 001F4 80A35504 50400008 */ beql $v0, $zero, .L80A35528 +/* 001F8 80A35508 8FBF002C */ lw $ra, 0x002C($sp) /* 001FC 80A3550C 0C00B35B */ jal Flags_GetCollectible - -/* 00200 80A35510 00022A03 */ sra $a1, $v0, 8 -/* 00204 80A35514 50400004 */ beql $v0, $zero, .L80A35528 -/* 00208 80A35518 8FBF002C */ lw $ra, 0x002C($sp) + +/* 00200 80A35510 00022A03 */ sra $a1, $v0, 8 +/* 00204 80A35514 50400004 */ beql $v0, $zero, .L80A35528 +/* 00208 80A35518 8FBF002C */ lw $ra, 0x002C($sp) /* 0020C 80A3551C 0C00B55C */ jal Actor_Kill - + /* 00210 80A35520 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00214 80A35524 8FBF002C */ lw $ra, 0x002C($sp) +/* 00214 80A35524 8FBF002C */ lw $ra, 0x002C($sp) .L80A35528: -/* 00218 80A35528 8FB00024 */ lw $s0, 0x0024($sp) -/* 0021C 80A3552C 8FB10028 */ lw $s1, 0x0028($sp) -/* 00220 80A35530 03E00008 */ jr $ra +/* 00218 80A35528 8FB00024 */ lw $s0, 0x0024($sp) +/* 0021C 80A3552C 8FB10028 */ lw $s1, 0x0028($sp) +/* 00220 80A35530 03E00008 */ jr $ra /* 00224 80A35534 27BD01E8 */ addiu $sp, $sp, 0x01E8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s index b53f1f84e3..4b948f2694 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s @@ -1,14 +1,14 @@ glabel func_80A35D48 /* 00A38 80A35D48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A3C 80A35D4C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00A3C 80A35D4C AFBF0014 */ sw $ra, 0x0014($sp) /* 00A40 80A35D50 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00A44 80A35D54 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00A48 80A35D58 24A5B6D4 */ addiu $a1, $a1, 0xB6D4 ## $a1 = 0600B6D4 -/* 00A4C 80A35D5C AFA70018 */ sw $a3, 0x0018($sp) +/* 00A4C 80A35D5C AFA70018 */ sw $a3, 0x0018($sp) /* 00A50 80A35D60 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00A54 80A35D64 0C0294D3 */ jal func_800A534C +/* 00A54 80A35D64 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00A58 80A35D68 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 00A5C 80A35D6C 8FA70018 */ lw $a3, 0x0018($sp) +/* 00A5C 80A35D6C 8FA70018 */ lw $a3, 0x0018($sp) /* 00A60 80A35D70 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00A64 80A35D74 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -17,22 +17,22 @@ glabel func_80A35D48 /* 00A70 80A35D80 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 00A74 80A35D84 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00A78 80A35D88 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 00A7C 80A35D8C 46040182 */ mul.s $f6, $f0, $f4 -/* 00A80 80A35D90 8FA40018 */ lw $a0, 0x0018($sp) +/* 00A7C 80A35D8C 46040182 */ mul.s $f6, $f0, $f4 +/* 00A80 80A35D90 8FA40018 */ lw $a0, 0x0018($sp) /* 00A84 80A35D94 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00A88 80A35D98 3C0580A3 */ lui $a1, %hi(func_80A35DD0) ## $a1 = 80A30000 /* 00A8C 80A35D9C 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 /* 00A90 80A35DA0 24A55DD0 */ addiu $a1, $a1, %lo(func_80A35DD0) ## $a1 = 80A35DD0 /* 00A94 80A35DA4 E4920068 */ swc1 $f18, 0x0068($a0) ## 00000068 -/* 00A98 80A35DA8 46083280 */ add.s $f10, $f6, $f8 +/* 00A98 80A35DA8 46083280 */ add.s $f10, $f6, $f8 /* 00A9C 80A35DAC A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 00AA0 80A35DB0 4600540D */ trunc.w.s $f16, $f10 -/* 00AA4 80A35DB4 44188000 */ mfc1 $t8, $f16 -/* 00AA8 80A35DB8 0C28D4C4 */ jal func_80A35310 +/* 00AA0 80A35DB0 4600540D */ trunc.w.s $f16, $f10 +/* 00AA4 80A35DB4 44188000 */ mfc1 $t8, $f16 +/* 00AA8 80A35DB8 0C28D4C4 */ jal func_80A35310 /* 00AAC 80A35DBC AC980300 */ sw $t8, 0x0300($a0) ## 00000300 -/* 00AB0 80A35DC0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00AB0 80A35DC0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00AB4 80A35DC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AB8 80A35DC8 03E00008 */ jr $ra +/* 00AB8 80A35DC8 03E00008 */ jr $ra /* 00ABC 80A35DCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s index c55741b085..39c8429876 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s @@ -1,22 +1,22 @@ glabel func_80A367E4 /* 014D4 80A367E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014D8 80A367E8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 014D8 80A367E8 AFBF0014 */ sw $ra, 0x0014($sp) /* 014DC 80A367EC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 014E0 80A367F0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 014E4 80A367F4 24A5A814 */ addiu $a1, $a1, 0xA814 ## $a1 = 0600A814 -/* 014E8 80A367F8 AFA70018 */ sw $a3, 0x0018($sp) +/* 014E8 80A367F8 AFA70018 */ sw $a3, 0x0018($sp) /* 014EC 80A367FC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 014F0 80A36800 0C0294D3 */ jal func_800A534C +/* 014F0 80A36800 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 014F4 80A36804 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 014F8 80A36808 8FA40018 */ lw $a0, 0x0018($sp) +/* 014F8 80A36808 8FA40018 */ lw $a0, 0x0018($sp) /* 014FC 80A3680C 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 /* 01500 80A36810 3C0580A3 */ lui $a1, %hi(func_80A36830) ## $a1 = 80A30000 /* 01504 80A36814 24A56830 */ addiu $a1, $a1, %lo(func_80A36830) ## $a1 = 80A36830 -/* 01508 80A36818 0C28D4C4 */ jal func_80A35310 +/* 01508 80A36818 0C28D4C4 */ jal func_80A35310 /* 0150C 80A3681C AC8E02EC */ sw $t6, 0x02EC($a0) ## 000002EC -/* 01510 80A36820 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01510 80A36820 8FBF0014 */ lw $ra, 0x0014($sp) /* 01514 80A36824 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01518 80A36828 03E00008 */ jr $ra +/* 01518 80A36828 03E00008 */ jr $ra /* 0151C 80A3682C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s index 7be21923a1..d9a621439c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s @@ -1,15 +1,15 @@ glabel EnGirlA_Destroy /* 0032C 80A3AA7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00330 80A3AA80 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00330 80A3AA80 AFBF0014 */ sw $ra, 0x0014($sp) /* 00334 80A3AA84 8C8E019C */ lw $t6, 0x019C($a0) ## 0000019C -/* 00338 80A3AA88 51C00004 */ beql $t6, $zero, .L80A3AA9C -/* 0033C 80A3AA8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00340 80A3AA90 0C0295BC */ jal func_800A56F0 +/* 00338 80A3AA88 51C00004 */ beql $t6, $zero, .L80A3AA9C +/* 0033C 80A3AA8C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00340 80A3AA90 0C0295BC */ jal SkelAnime_Free /* 00344 80A3AA94 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00348 80A3AA98 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00348 80A3AA98 8FBF0014 */ lw $ra, 0x0014($sp) .L80A3AA9C: /* 0034C 80A3AA9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00350 80A3AAA0 03E00008 */ jr $ra +/* 00350 80A3AAA0 03E00008 */ jr $ra /* 00354 80A3AAA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s index d39ee9688f..ff6e561f3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s @@ -1,88 +1,88 @@ glabel func_80A3D838 /* 00158 80A3D838 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0015C 80A3D83C AFB00024 */ sw $s0, 0x0024($sp) +/* 0015C 80A3D83C AFB00024 */ sw $s0, 0x0024($sp) /* 00160 80A3D840 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00164 80A3D844 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00168 80A3D848 AFB10028 */ sw $s1, 0x0028($sp) +/* 00168 80A3D848 AFB10028 */ sw $s1, 0x0028($sp) /* 0016C 80A3D84C 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 00170 80A3D850 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00174 80A3D854 AFBF002C */ sw $ra, 0x002C($sp) -/* 00178 80A3D858 00A12021 */ addu $a0, $a1, $at +/* 00174 80A3D854 AFBF002C */ sw $ra, 0x002C($sp) +/* 00178 80A3D858 00A12021 */ addu $a0, $a1, $at /* 0017C 80A3D85C 0C026062 */ jal Object_IsLoaded - + /* 00180 80A3D860 820502BC */ lb $a1, 0x02BC($s0) ## 000002BC -/* 00184 80A3D864 10400057 */ beq $v0, $zero, .L80A3D9C4 +/* 00184 80A3D864 10400057 */ beq $v0, $zero, .L80A3D9C4 /* 00188 80A3D868 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 0018C 80A3D86C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00190 80A3D870 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00194 80A3D874 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00198 80A3D878 01C17824 */ and $t7, $t6, $at +/* 00198 80A3D878 01C17824 */ and $t7, $t6, $at /* 0019C 80A3D87C AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 001A0 80A3D880 26180190 */ addiu $t8, $s0, 0x0190 ## $t8 = 00000190 /* 001A4 80A3D884 261901FC */ addiu $t9, $s0, 0x01FC ## $t9 = 000001FC /* 001A8 80A3D888 24080012 */ addiu $t0, $zero, 0x0012 ## $t0 = 00000012 -/* 001AC 80A3D88C AFA80018 */ sw $t0, 0x0018($sp) -/* 001B0 80A3D890 AFB90014 */ sw $t9, 0x0014($sp) -/* 001B4 80A3D894 AFB80010 */ sw $t8, 0x0010($sp) -/* 001B8 80A3D898 AFA50030 */ sw $a1, 0x0030($sp) +/* 001AC 80A3D88C AFA80018 */ sw $t0, 0x0018($sp) +/* 001B0 80A3D890 AFB90014 */ sw $t9, 0x0014($sp) +/* 001B4 80A3D894 AFB80010 */ sw $t8, 0x0010($sp) +/* 001B8 80A3D898 AFA50030 */ sw $a1, 0x0030($sp) /* 001BC 80A3D89C 24C6FEF0 */ addiu $a2, $a2, 0xFEF0 ## $a2 = 0600FEF0 /* 001C0 80A3D8A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001C4 80A3D8A4 0C0291BE */ jal func_800A46F8 +/* 001C4 80A3D8A4 0C0291BE */ jal SkelAnime_InitSV /* 001C8 80A3D8A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 001CC 80A3D8AC 820902BC */ lb $t1, 0x02BC($s0) ## 000002BC /* 001D0 80A3D8B0 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 /* 001D4 80A3D8B4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 001D8 80A3D8B8 00095100 */ sll $t2, $t1, 4 -/* 001DC 80A3D8BC 01495021 */ addu $t2, $t2, $t1 -/* 001E0 80A3D8C0 000A5080 */ sll $t2, $t2, 2 -/* 001E4 80A3D8C4 022A5821 */ addu $t3, $s1, $t2 -/* 001E8 80A3D8C8 018B6021 */ addu $t4, $t4, $t3 +/* 001D8 80A3D8B8 00095100 */ sll $t2, $t1, 4 +/* 001DC 80A3D8BC 01495021 */ addu $t2, $t2, $t1 +/* 001E0 80A3D8C0 000A5080 */ sll $t2, $t2, 2 +/* 001E4 80A3D8C4 022A5821 */ addu $t3, $s1, $t2 +/* 001E8 80A3D8C8 018B6021 */ addu $t4, $t4, $t3 /* 001EC 80A3D8CC 8D8C17B4 */ lw $t4, 0x17B4($t4) ## 000117B4 /* 001F0 80A3D8D0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 001F4 80A3D8D4 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 -/* 001F8 80A3D8D8 01816821 */ addu $t5, $t4, $at +/* 001F8 80A3D8D8 01816821 */ addu $t5, $t4, $at /* 001FC 80A3D8DC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00200 80A3D8E0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00204 80A3D8E4 AC2D6FC0 */ sw $t5, 0x6FC0($at) ## 80166FC0 /* 00208 80A3D8E8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0020C 80A3D8EC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00210 80A3D8F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00214 80A3D8F4 468021A0 */ cvt.s.w $f6, $f4 -/* 00218 80A3D8F8 44070000 */ mfc1 $a3, $f0 +/* 00214 80A3D8F4 468021A0 */ cvt.s.w $f6, $f4 +/* 00218 80A3D8F8 44070000 */ mfc1 $a3, $f0 /* 0021C 80A3D8FC 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 -/* 00220 80A3D900 8FA40030 */ lw $a0, 0x0030($sp) +/* 00220 80A3D900 8FA40030 */ lw $a0, 0x0030($sp) /* 00224 80A3D904 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00228 80A3D908 AFA00014 */ sw $zero, 0x0014($sp) -/* 0022C 80A3D90C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00228 80A3D908 AFA00014 */ sw $zero, 0x0014($sp) +/* 0022C 80A3D90C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00230 80A3D910 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00234 80A3D914 E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 00234 80A3D914 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00238 80A3D918 3C0E80A4 */ lui $t6, %hi(func_80A3E1EC) ## $t6 = 80A40000 /* 0023C 80A3D91C 25CEE1EC */ addiu $t6, $t6, %lo(func_80A3E1EC) ## $t6 = 80A3E1EC /* 00240 80A3D920 AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 /* 00244 80A3D924 26050270 */ addiu $a1, $s0, 0x0270 ## $a1 = 00000270 -/* 00248 80A3D928 AFA50030 */ sw $a1, 0x0030($sp) +/* 00248 80A3D928 AFA50030 */ sw $a1, 0x0030($sp) /* 0024C 80A3D92C 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00250 80A3D930 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00254 80A3D934 3C0780A4 */ lui $a3, %hi(D_80A3E350) ## $a3 = 80A40000 -/* 00258 80A3D938 8FA50030 */ lw $a1, 0x0030($sp) +/* 00258 80A3D938 8FA50030 */ lw $a1, 0x0030($sp) /* 0025C 80A3D93C 24E7E350 */ addiu $a3, $a3, %lo(D_80A3E350) ## $a3 = 80A3E350 /* 00260 80A3D940 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00264 80A3D944 0C017114 */ jal func_8005C450 +/* 00264 80A3D944 0C017114 */ jal func_8005C450 /* 00268 80A3D948 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0026C 80A3D94C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00270 80A3D950 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00274 80A3D954 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00278 80A3D958 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0027C 80A3D95C 0C00AC78 */ jal ActorShape_Init - + /* 00280 80A3D960 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 /* 00284 80A3D964 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 /* 00288 80A3D968 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 0028C 80A3D96C 0C00B58B */ jal Actor_SetScale - + /* 00290 80A3D970 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00294 80A3D974 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00298 80A3D978 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -105,10 +105,10 @@ glabel func_80A3D838 /* 002DC 80A3D9BC E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 002E0 80A3D9C0 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 .L80A3D9C4: -/* 002E4 80A3D9C4 8FBF002C */ lw $ra, 0x002C($sp) -/* 002E8 80A3D9C8 8FB00024 */ lw $s0, 0x0024($sp) -/* 002EC 80A3D9CC 8FB10028 */ lw $s1, 0x0028($sp) -/* 002F0 80A3D9D0 03E00008 */ jr $ra +/* 002E4 80A3D9C4 8FBF002C */ lw $ra, 0x002C($sp) +/* 002E8 80A3D9C8 8FB00024 */ lw $s0, 0x0024($sp) +/* 002EC 80A3D9CC 8FB10028 */ lw $s1, 0x0028($sp) +/* 002F0 80A3D9D0 03E00008 */ jr $ra /* 002F4 80A3D9D4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s index 41781e7509..8d76068fcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s @@ -1,20 +1,20 @@ glabel func_80A3E1EC /* 00B0C 80A3E1EC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00B10 80A3E1F0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00B14 80A3E1F4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00B18 80A3E1F8 AFA5005C */ sw $a1, 0x005C($sp) +/* 00B10 80A3E1F0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00B14 80A3E1F4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00B18 80A3E1F8 AFA5005C */ sw $a1, 0x005C($sp) /* 00B1C 80A3E1FC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00B20 80A3E200 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00B24 80A3E204 3C0680A4 */ lui $a2, %hi(D_80A3E40C) ## $a2 = 80A40000 /* 00B28 80A3E208 24C6E40C */ addiu $a2, $a2, %lo(D_80A3E40C) ## $a2 = 80A3E40C /* 00B2C 80A3E20C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00B30 80A3E210 24070265 */ addiu $a3, $zero, 0x0265 ## $a3 = 00000265 -/* 00B34 80A3E214 0C031AB1 */ jal func_800C6AC4 -/* 00B38 80A3E218 AFA5004C */ sw $a1, 0x004C($sp) -/* 00B3C 80A3E21C 8FAF005C */ lw $t7, 0x005C($sp) -/* 00B40 80A3E220 0C024F46 */ jal func_80093D18 +/* 00B34 80A3E214 0C031AB1 */ jal func_800C6AC4 +/* 00B38 80A3E218 AFA5004C */ sw $a1, 0x004C($sp) +/* 00B3C 80A3E21C 8FAF005C */ lw $t7, 0x005C($sp) +/* 00B40 80A3E220 0C024F46 */ jal func_80093D18 /* 00B44 80A3E224 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00B48 80A3E228 8FA8004C */ lw $t0, 0x004C($sp) +/* 00B48 80A3E228 8FA8004C */ lw $t0, 0x004C($sp) /* 00B4C 80A3E22C 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00B50 80A3E230 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00B54 80A3E234 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -26,58 +26,58 @@ glabel func_80A3E1EC /* 00B6C 80A3E24C 920902C2 */ lbu $t1, 0x02C2($s0) ## 000002C2 /* 00B70 80A3E250 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 00B74 80A3E254 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 00B78 80A3E258 00095080 */ sll $t2, $t1, 2 -/* 00B7C 80A3E25C 008A2021 */ addu $a0, $a0, $t2 -/* 00B80 80A3E260 8C84E384 */ lw $a0, %lo(D_80A3E384)($a0) +/* 00B78 80A3E258 00095080 */ sll $t2, $t1, 2 +/* 00B7C 80A3E25C 008A2021 */ addu $a0, $a0, $t2 +/* 00B80 80A3E260 8C84E384 */ lw $a0, %lo(D_80A3E384)($a0) /* 00B84 80A3E264 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF /* 00B88 80A3E268 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00B8C 80A3E26C 00046100 */ sll $t4, $a0, 4 -/* 00B90 80A3E270 000C6F02 */ srl $t5, $t4, 28 -/* 00B94 80A3E274 000D7080 */ sll $t6, $t5, 2 -/* 00B98 80A3E278 00CE7821 */ addu $t7, $a2, $t6 +/* 00B8C 80A3E26C 00046100 */ sll $t4, $a0, 4 +/* 00B90 80A3E270 000C6F02 */ srl $t5, $t4, 28 +/* 00B94 80A3E274 000D7080 */ sll $t6, $t5, 2 +/* 00B98 80A3E278 00CE7821 */ addu $t7, $a2, $t6 /* 00B9C 80A3E27C 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 00BA0 80A3E280 00855824 */ and $t3, $a0, $a1 +/* 00BA0 80A3E280 00855824 */ and $t3, $a0, $a1 /* 00BA4 80A3E284 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00BA8 80A3E288 0178C821 */ addu $t9, $t3, $t8 -/* 00BAC 80A3E28C 03274821 */ addu $t1, $t9, $a3 +/* 00BA8 80A3E288 0178C821 */ addu $t9, $t3, $t8 +/* 00BAC 80A3E28C 03274821 */ addu $t1, $t9, $a3 /* 00BB0 80A3E290 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 /* 00BB4 80A3E294 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 00BB8 80A3E298 2484DE80 */ addiu $a0, $a0, 0xDE80 ## $a0 = 0600DE80 -/* 00BBC 80A3E29C 00046900 */ sll $t5, $a0, 4 -/* 00BC0 80A3E2A0 000D7702 */ srl $t6, $t5, 28 +/* 00BBC 80A3E29C 00046900 */ sll $t5, $a0, 4 +/* 00BC0 80A3E2A0 000D7702 */ srl $t6, $t5, 28 /* 00BC4 80A3E2A4 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 00BC8 80A3E2A8 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 00BCC 80A3E2AC 358C0024 */ ori $t4, $t4, 0x0024 ## $t4 = DB060024 -/* 00BD0 80A3E2B0 000E7880 */ sll $t7, $t6, 2 +/* 00BD0 80A3E2B0 000E7880 */ sll $t7, $t6, 2 /* 00BD4 80A3E2B4 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 00BD8 80A3E2B8 00CF5821 */ addu $t3, $a2, $t7 +/* 00BD8 80A3E2B8 00CF5821 */ addu $t3, $a2, $t7 /* 00BDC 80A3E2BC AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 /* 00BE0 80A3E2C0 8D780000 */ lw $t8, 0x0000($t3) ## 00000000 -/* 00BE4 80A3E2C4 0085C824 */ and $t9, $a0, $a1 -/* 00BE8 80A3E2C8 03194821 */ addu $t1, $t8, $t9 -/* 00BEC 80A3E2CC 01275021 */ addu $t2, $t1, $a3 +/* 00BE4 80A3E2C4 0085C824 */ and $t9, $a0, $a1 +/* 00BE8 80A3E2C8 03194821 */ addu $t1, $t8, $t9 +/* 00BEC 80A3E2CC 01275021 */ addu $t2, $t1, $a3 /* 00BF0 80A3E2D0 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 00BF4 80A3E2D4 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 00BF8 80A3E2D8 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 00BFC 80A3E2DC 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 00C00 80A3E2E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00C04 80A3E2E4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00C08 80A3E2E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C0C 80A3E2EC 0C0286B2 */ jal func_800A1AC8 -/* 00C10 80A3E2F0 8FA4005C */ lw $a0, 0x005C($sp) -/* 00C14 80A3E2F4 8FAC005C */ lw $t4, 0x005C($sp) +/* 00C00 80A3E2E0 AFB00018 */ sw $s0, 0x0018($sp) +/* 00C04 80A3E2E4 AFA00014 */ sw $zero, 0x0014($sp) +/* 00C08 80A3E2E8 AFA00010 */ sw $zero, 0x0010($sp) +/* 00C0C 80A3E2EC 0C0286B2 */ jal SkelAnime_DrawSV +/* 00C10 80A3E2F0 8FA4005C */ lw $a0, 0x005C($sp) +/* 00C14 80A3E2F4 8FAC005C */ lw $t4, 0x005C($sp) /* 00C18 80A3E2F8 3C0680A4 */ lui $a2, %hi(D_80A3E41C) ## $a2 = 80A40000 /* 00C1C 80A3E2FC 24C6E41C */ addiu $a2, $a2, %lo(D_80A3E41C) ## $a2 = 80A3E41C /* 00C20 80A3E300 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00C24 80A3E304 24070275 */ addiu $a3, $zero, 0x0275 ## $a3 = 00000275 -/* 00C28 80A3E308 0C031AD5 */ jal func_800C6B54 +/* 00C28 80A3E308 0C031AD5 */ jal func_800C6B54 /* 00C2C 80A3E30C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00C30 80A3E310 0C28F824 */ jal func_80A3E090 +/* 00C30 80A3E310 0C28F824 */ jal func_80A3E090 /* 00C34 80A3E314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C38 80A3E318 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C3C 80A3E31C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00C38 80A3E318 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C3C 80A3E31C 8FB00028 */ lw $s0, 0x0028($sp) /* 00C40 80A3E320 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00C44 80A3E324 03E00008 */ jr $ra +/* 00C44 80A3E324 03E00008 */ jr $ra /* 00C48 80A3E328 00000000 */ nop /* 00C4C 80A3E32C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s index 6d959c40fe..9b200911ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s @@ -1,18 +1,18 @@ glabel EnGo_Destroy /* 0190C 80A3FE7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01910 80A3FE80 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01914 80A3FE84 AFA40018 */ sw $a0, 0x0018($sp) -/* 01918 80A3FE88 AFA5001C */ sw $a1, 0x001C($sp) -/* 0191C 80A3FE8C 0C0295BC */ jal func_800A56F0 +/* 01910 80A3FE80 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01914 80A3FE84 AFA40018 */ sw $a0, 0x0018($sp) +/* 01918 80A3FE88 AFA5001C */ sw $a1, 0x001C($sp) +/* 0191C 80A3FE8C 0C0295BC */ jal SkelAnime_Free /* 01920 80A3FE90 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01924 80A3FE94 8FA50018 */ lw $a1, 0x0018($sp) -/* 01928 80A3FE98 8FA4001C */ lw $a0, 0x001C($sp) +/* 01924 80A3FE94 8FA50018 */ lw $a1, 0x0018($sp) +/* 01928 80A3FE98 8FA4001C */ lw $a0, 0x001C($sp) /* 0192C 80A3FE9C 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 01930 80A3FEA0 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 01934 80A3FEA4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01934 80A3FEA4 8FBF0014 */ lw $ra, 0x0014($sp) /* 01938 80A3FEA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0193C 80A3FEAC 03E00008 */ jr $ra +/* 0193C 80A3FEAC 03E00008 */ jr $ra /* 01940 80A3FEB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s index 5fa37e7e4c..9a2b76bdb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s @@ -1,97 +1,97 @@ glabel EnGo_Draw /* 02EC8 80A41438 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 02ECC 80A4143C AFB10028 */ sw $s1, 0x0028($sp) +/* 02ECC 80A4143C AFB10028 */ sw $s1, 0x0028($sp) /* 02ED0 80A41440 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02ED4 80A41444 AFBF002C */ sw $ra, 0x002C($sp) -/* 02ED8 80A41448 AFB00024 */ sw $s0, 0x0024($sp) +/* 02ED4 80A41444 AFBF002C */ sw $ra, 0x002C($sp) +/* 02ED8 80A41448 AFB00024 */ sw $s0, 0x0024($sp) /* 02EDC 80A4144C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02EE0 80A41450 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02EE4 80A41454 3C0680A4 */ lui $a2, %hi(D_80A41C60) ## $a2 = 80A40000 /* 02EE8 80A41458 24C61C60 */ addiu $a2, $a2, %lo(D_80A41C60) ## $a2 = 80A41C60 /* 02EEC 80A4145C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02EF0 80A41460 240709AF */ addiu $a3, $zero, 0x09AF ## $a3 = 000009AF -/* 02EF4 80A41464 0C031AB1 */ jal func_800C6AC4 -/* 02EF8 80A41468 AFA50050 */ sw $a1, 0x0050($sp) -/* 02EFC 80A4146C 0C2905AA */ jal func_80A416A8 +/* 02EF4 80A41464 0C031AB1 */ jal func_800C6AC4 +/* 02EF8 80A41468 AFA50050 */ sw $a1, 0x0050($sp) +/* 02EFC 80A4146C 0C2905AA */ jal func_80A416A8 /* 02F00 80A41470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F04 80A41474 0C034213 */ jal Matrix_Push +/* 02F04 80A41474 0C034213 */ jal Matrix_Push /* 02F08 80A41478 00000000 */ nop /* 02F0C 80A4147C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F10 80A41480 0C2905ED */ jal func_80A417B4 +/* 02F10 80A41480 0C2905ED */ jal func_80A417B4 /* 02F14 80A41484 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02F18 80A41488 0C034221 */ jal Matrix_Pull +/* 02F18 80A41488 0C034221 */ jal Matrix_Pull /* 02F1C 80A4148C 00000000 */ nop /* 02F20 80A41490 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 /* 02F24 80A41494 3C0E80A4 */ lui $t6, %hi(func_80A40218) ## $t6 = 80A40000 /* 02F28 80A41498 25CE0218 */ addiu $t6, $t6, %lo(func_80A40218) ## $t6 = 80A40218 -/* 02F2C 80A4149C 15C20006 */ bne $t6, $v0, .L80A414B8 +/* 02F2C 80A4149C 15C20006 */ bne $t6, $v0, .L80A414B8 /* 02F30 80A414A0 3C0F80A4 */ lui $t7, %hi(func_80A4011C) ## $t7 = 80A40000 /* 02F34 80A414A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F38 80A414A8 0C2903D6 */ jal func_80A40F58 +/* 02F38 80A414A8 0C2903D6 */ jal func_80A40F58 /* 02F3C 80A414AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02F40 80A414B0 10000050 */ beq $zero, $zero, .L80A415F4 -/* 02F44 80A414B4 8FBF002C */ lw $ra, 0x002C($sp) +/* 02F40 80A414B0 10000050 */ beq $zero, $zero, .L80A415F4 +/* 02F44 80A414B4 8FBF002C */ lw $ra, 0x002C($sp) .L80A414B8: /* 02F48 80A414B8 25EF011C */ addiu $t7, $t7, %lo(func_80A4011C) ## $t7 = 0000011C -/* 02F4C 80A414BC 11E20008 */ beq $t7, $v0, .L80A414E0 +/* 02F4C 80A414BC 11E20008 */ beq $t7, $v0, .L80A414E0 /* 02F50 80A414C0 3C0380A4 */ lui $v1, %hi(func_80A3FEB4) ## $v1 = 80A40000 /* 02F54 80A414C4 2463FEB4 */ addiu $v1, $v1, %lo(func_80A3FEB4) ## $v1 = 80A3FEB4 -/* 02F58 80A414C8 10620005 */ beq $v1, $v0, .L80A414E0 +/* 02F58 80A414C8 10620005 */ beq $v1, $v0, .L80A414E0 /* 02F5C 80A414CC 3C1880A4 */ lui $t8, %hi(func_80A3FEF8) ## $t8 = 80A40000 /* 02F60 80A414D0 2718FEF8 */ addiu $t8, $t8, %lo(func_80A3FEF8) ## $t8 = 80A3FEF8 -/* 02F64 80A414D4 53020003 */ beql $t8, $v0, .L80A414E4 +/* 02F64 80A414D4 53020003 */ beql $t8, $v0, .L80A414E4 /* 02F68 80A414D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F6C 80A414DC 14620005 */ bne $v1, $v0, .L80A414F4 +/* 02F6C 80A414DC 14620005 */ bne $v1, $v0, .L80A414F4 .L80A414E0: /* 02F70 80A414E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A414E4: -/* 02F74 80A414E4 0C29041A */ jal func_80A41068 +/* 02F74 80A414E4 0C29041A */ jal func_80A41068 /* 02F78 80A414E8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02F7C 80A414EC 10000041 */ beq $zero, $zero, .L80A415F4 -/* 02F80 80A414F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 02F7C 80A414EC 10000041 */ beq $zero, $zero, .L80A415F4 +/* 02F80 80A414F0 8FBF002C */ lw $ra, 0x002C($sp) .L80A414F4: -/* 02F84 80A414F4 0C0250F2 */ jal func_800943C8 +/* 02F84 80A414F4 0C0250F2 */ jal func_800943C8 /* 02F88 80A414F8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02F8C 80A414FC 8FA50050 */ lw $a1, 0x0050($sp) +/* 02F8C 80A414FC 8FA50050 */ lw $a1, 0x0050($sp) /* 02F90 80A41500 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02F94 80A41504 2484CE80 */ addiu $a0, $a0, 0xCE80 ## $a0 = 0600CE80 /* 02F98 80A41508 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 02F9C 80A4150C 00045100 */ sll $t2, $a0, 4 -/* 02FA0 80A41510 000A5F02 */ srl $t3, $t2, 28 +/* 02F9C 80A4150C 00045100 */ sll $t2, $a0, 4 +/* 02FA0 80A41510 000A5F02 */ srl $t3, $t2, 28 /* 02FA4 80A41514 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 02FA8 80A41518 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 02FAC 80A4151C 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 02FB0 80A41520 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 /* 02FB4 80A41524 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 -/* 02FB8 80A41528 000B6080 */ sll $t4, $t3, 2 +/* 02FB8 80A41528 000B6080 */ sll $t4, $t3, 2 /* 02FBC 80A4152C ACB902C0 */ sw $t9, 0x02C0($a1) ## 000002C0 -/* 02FC0 80A41530 00CC6821 */ addu $t5, $a2, $t4 +/* 02FC0 80A41530 00CC6821 */ addu $t5, $a2, $t4 /* 02FC4 80A41534 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 02FC8 80A41538 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 /* 02FCC 80A4153C 3C0700FF */ lui $a3, 0x00FF ## $a3 = 00FF0000 /* 02FD0 80A41540 34E7FFFF */ ori $a3, $a3, 0xFFFF ## $a3 = 00FFFFFF -/* 02FD4 80A41544 00877824 */ and $t7, $a0, $a3 +/* 02FD4 80A41544 00877824 */ and $t7, $a0, $a3 /* 02FD8 80A41548 3C088000 */ lui $t0, 0x8000 ## $t0 = 80000000 -/* 02FDC 80A4154C 01CFC021 */ addu $t8, $t6, $t7 -/* 02FE0 80A41550 0308C821 */ addu $t9, $t8, $t0 +/* 02FDC 80A4154C 01CFC021 */ addu $t8, $t6, $t7 +/* 02FE0 80A41550 0308C821 */ addu $t9, $t8, $t0 /* 02FE4 80A41554 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 02FE8 80A41558 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 02FEC 80A4155C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02FF0 80A41560 2484DE80 */ addiu $a0, $a0, 0xDE80 ## $a0 = 0600DE80 -/* 02FF4 80A41564 00045900 */ sll $t3, $a0, 4 -/* 02FF8 80A41568 000B6702 */ srl $t4, $t3, 28 +/* 02FF4 80A41564 00045900 */ sll $t3, $a0, 4 +/* 02FF8 80A41568 000B6702 */ srl $t4, $t3, 28 /* 02FFC 80A4156C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 03000 80A41570 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 /* 03004 80A41574 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 -/* 03008 80A41578 000C6880 */ sll $t5, $t4, 2 +/* 03008 80A41578 000C6880 */ sll $t5, $t4, 2 /* 0300C 80A4157C ACA902C0 */ sw $t1, 0x02C0($a1) ## 000002C0 -/* 03010 80A41580 00CD7021 */ addu $t6, $a2, $t5 +/* 03010 80A41580 00CD7021 */ addu $t6, $a2, $t5 /* 03014 80A41584 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 03018 80A41588 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 0301C 80A4158C 0087C024 */ and $t8, $a0, $a3 +/* 0301C 80A4158C 0087C024 */ and $t8, $a0, $a3 /* 03020 80A41590 3C0A80A4 */ lui $t2, %hi(func_80A411C8) ## $t2 = 80A40000 -/* 03024 80A41594 01F8C821 */ addu $t9, $t7, $t8 -/* 03028 80A41598 03284821 */ addu $t1, $t9, $t0 +/* 03024 80A41594 01F8C821 */ addu $t9, $t7, $t8 +/* 03028 80A41598 03284821 */ addu $t1, $t9, $t0 /* 0302C 80A4159C AC690004 */ sw $t1, 0x0004($v1) ## 00000004 /* 03030 80A415A0 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 03034 80A415A4 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -99,25 +99,25 @@ glabel EnGo_Draw /* 0303C 80A415AC 3C0B80A4 */ lui $t3, %hi(func_80A413DC) ## $t3 = 80A40000 /* 03040 80A415B0 256B13DC */ addiu $t3, $t3, %lo(func_80A413DC) ## $t3 = 80A413DC /* 03044 80A415B4 254A11C8 */ addiu $t2, $t2, %lo(func_80A411C8) ## $t2 = 80A411C8 -/* 03048 80A415B8 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0304C 80A415BC AFAB0014 */ sw $t3, 0x0014($sp) -/* 03050 80A415C0 AFB00018 */ sw $s0, 0x0018($sp) -/* 03054 80A415C4 0C0286B2 */ jal func_800A1AC8 +/* 03048 80A415B8 AFAA0010 */ sw $t2, 0x0010($sp) +/* 0304C 80A415BC AFAB0014 */ sw $t3, 0x0014($sp) +/* 03050 80A415C0 AFB00018 */ sw $s0, 0x0018($sp) +/* 03054 80A415C4 0C0286B2 */ jal SkelAnime_DrawSV /* 03058 80A415C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0305C 80A415CC 3C0680A4 */ lui $a2, %hi(D_80A41C70) ## $a2 = 80A40000 /* 03060 80A415D0 24C61C70 */ addiu $a2, $a2, %lo(D_80A41C70) ## $a2 = 80A41C70 /* 03064 80A415D4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 03068 80A415D8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0306C 80A415DC 0C031AD5 */ jal func_800C6B54 +/* 0306C 80A415DC 0C031AD5 */ jal func_800C6B54 /* 03070 80A415E0 240709DD */ addiu $a3, $zero, 0x09DD ## $a3 = 000009DD /* 03074 80A415E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03078 80A415E8 0C2905ED */ jal func_80A417B4 +/* 03078 80A415E8 0C2905ED */ jal func_80A417B4 /* 0307C 80A415EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03080 80A415F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 03080 80A415F0 8FBF002C */ lw $ra, 0x002C($sp) .L80A415F4: -/* 03084 80A415F4 8FB00024 */ lw $s0, 0x0024($sp) -/* 03088 80A415F8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0308C 80A415FC 03E00008 */ jr $ra +/* 03084 80A415F4 8FB00024 */ lw $s0, 0x0024($sp) +/* 03088 80A415F8 8FB10028 */ lw $s1, 0x0028($sp) +/* 0308C 80A415FC 03E00008 */ jr $ra /* 03090 80A41600 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s index d08d46d0df..11f5318a3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s @@ -1,9 +1,9 @@ glabel EnGo_Init /* 015BC 80A3FB2C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 015C0 80A3FB30 3C0F80A4 */ lui $t7, %hi(D_80A41B9C) ## $t7 = 80A40000 -/* 015C4 80A3FB34 AFBF002C */ sw $ra, 0x002C($sp) -/* 015C8 80A3FB38 AFB00028 */ sw $s0, 0x0028($sp) -/* 015CC 80A3FB3C AFA5005C */ sw $a1, 0x005C($sp) +/* 015C4 80A3FB34 AFBF002C */ sw $ra, 0x002C($sp) +/* 015C8 80A3FB38 AFB00028 */ sw $s0, 0x0028($sp) +/* 015CC 80A3FB3C AFA5005C */ sw $a1, 0x005C($sp) /* 015D0 80A3FB40 25EF1B9C */ addiu $t7, $t7, %lo(D_80A41B9C) ## $t7 = 80A41B9C /* 015D4 80A3FB44 8DF90000 */ lw $t9, 0x0000($t7) ## 80A41B9C /* 015D8 80A3FB48 27AE0044 */ addiu $t6, $sp, 0x0044 ## $t6 = FFFFFFEC @@ -27,94 +27,94 @@ glabel EnGo_Init /* 01620 80A3FB90 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 01624 80A3FB94 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFE4 /* 01628 80A3FB98 0C00AC78 */ jal ActorShape_Init - + /* 0162C 80A3FB9C AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE8 /* 01630 80A3FBA0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 01634 80A3FBA4 24C6FEF0 */ addiu $a2, $a2, 0xFEF0 ## $a2 = 0600FEF0 -/* 01638 80A3FBA8 8FA4005C */ lw $a0, 0x005C($sp) +/* 01638 80A3FBA8 8FA4005C */ lw $a0, 0x005C($sp) /* 0163C 80A3FBAC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 01640 80A3FBB0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01644 80A3FBB4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01648 80A3FBB8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0164C 80A3FBBC 0C0291BE */ jal func_800A46F8 -/* 01650 80A3FBC0 AFA00018 */ sw $zero, 0x0018($sp) +/* 01644 80A3FBB4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01648 80A3FBB8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0164C 80A3FBBC 0C0291BE */ jal SkelAnime_InitSV +/* 01650 80A3FBC0 AFA00018 */ sw $zero, 0x0018($sp) /* 01654 80A3FBC4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 01658 80A3FBC8 AFA50030 */ sw $a1, 0x0030($sp) +/* 01658 80A3FBC8 AFA50030 */ sw $a1, 0x0030($sp) /* 0165C 80A3FBCC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 01660 80A3FBD0 8FA4005C */ lw $a0, 0x005C($sp) + +/* 01660 80A3FBD0 8FA4005C */ lw $a0, 0x005C($sp) /* 01664 80A3FBD4 3C0780A4 */ lui $a3, %hi(D_80A41B00) ## $a3 = 80A40000 -/* 01668 80A3FBD8 8FA50030 */ lw $a1, 0x0030($sp) +/* 01668 80A3FBD8 8FA50030 */ lw $a1, 0x0030($sp) /* 0166C 80A3FBDC 24E71B00 */ addiu $a3, $a3, %lo(D_80A41B00) ## $a3 = 80A41B00 -/* 01670 80A3FBE0 8FA4005C */ lw $a0, 0x005C($sp) +/* 01670 80A3FBE0 8FA4005C */ lw $a0, 0x005C($sp) /* 01674 80A3FBE4 0C01712B */ jal ActorCollider_InitCylinder - + /* 01678 80A3FBE8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0167C 80A3FBEC 0C016C80 */ jal CollisionBtlTbl_Get - + /* 01680 80A3FBF0 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 01684 80A3FBF4 3C0680A4 */ lui $a2, %hi(D_80A41B2C) ## $a2 = 80A40000 /* 01688 80A3FBF8 24C61B2C */ addiu $a2, $a2, %lo(D_80A41B2C) ## $a2 = 80A41B2C /* 0168C 80A3FBFC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 01690 80A3FC00 0C0187BF */ jal func_80061EFC +/* 01690 80A3FC00 0C0187BF */ jal func_80061EFC /* 01694 80A3FC04 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 01698 80A3FC08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0169C 80A3FC0C 0C28FBA3 */ jal func_80A3EE8C -/* 016A0 80A3FC10 8FA5005C */ lw $a1, 0x005C($sp) -/* 016A4 80A3FC14 14400005 */ bne $v0, $zero, .L80A3FC2C +/* 0169C 80A3FC0C 0C28FBA3 */ jal func_80A3EE8C +/* 016A0 80A3FC10 8FA5005C */ lw $a1, 0x005C($sp) +/* 016A4 80A3FC14 14400005 */ bne $v0, $zero, .L80A3FC2C /* 016A8 80A3FC18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 016AC 80A3FC1C 0C00B55C */ jal Actor_Kill - + /* 016B0 80A3FC20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016B4 80A3FC24 10000091 */ beq $zero, $zero, .L80A3FE6C -/* 016B8 80A3FC28 8FBF002C */ lw $ra, 0x002C($sp) +/* 016B4 80A3FC24 10000091 */ beq $zero, $zero, .L80A3FE6C +/* 016B8 80A3FC28 8FBF002C */ lw $ra, 0x002C($sp) .L80A3FC2C: /* 016BC 80A3FC2C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 016C0 80A3FC30 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 /* 016C4 80A3FC34 304200F0 */ andi $v0, $v0, 0x00F0 ## $v0 = 00000000 -/* 016C8 80A3FC38 1040000A */ beq $v0, $zero, .L80A3FC64 +/* 016C8 80A3FC38 1040000A */ beq $v0, $zero, .L80A3FC64 /* 016CC 80A3FC3C 00000000 */ nop -/* 016D0 80A3FC40 10410008 */ beq $v0, $at, .L80A3FC64 +/* 016D0 80A3FC40 10410008 */ beq $v0, $at, .L80A3FC64 /* 016D4 80A3FC44 00000000 */ nop /* 016D8 80A3FC48 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 /* 016DC 80A3FC4C 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 016E0 80A3FC50 01816824 */ and $t5, $t4, $at +/* 016E0 80A3FC50 01816824 */ and $t5, $t4, $at /* 016E4 80A3FC54 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF /* 016E8 80A3FC58 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 016EC 80A3FC5C 01A17824 */ and $t7, $t5, $at +/* 016EC 80A3FC5C 01A17824 */ and $t7, $t5, $at /* 016F0 80A3FC60 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 .L80A3FC64: -/* 016F4 80A3FC64 0C28FB78 */ jal func_80A3EDE0 +/* 016F4 80A3FC64 0C28FB78 */ jal func_80A3EDE0 /* 016F8 80A3FC68 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 016FC 80A3FC6C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 01700 80A3FC70 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 01704 80A3FC74 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 /* 01708 80A3FC78 304200F0 */ andi $v0, $v0, 0x00F0 ## $v0 = 00000000 /* 0170C 80A3FC7C 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 01710 80A3FC80 28410071 */ slti $at, $v0, 0x0071 +/* 01710 80A3FC80 28410071 */ slti $at, $v0, 0x0071 /* 01714 80A3FC84 A218001F */ sb $t8, 0x001F($s0) ## 0000001F /* 01718 80A3FC88 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 0171C 80A3FC8C 14200006 */ bne $at, $zero, .L80A3FCA8 +/* 0171C 80A3FC8C 14200006 */ bne $at, $zero, .L80A3FCA8 /* 01720 80A3FC90 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 01724 80A3FC94 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 01728 80A3FC98 1041005C */ beq $v0, $at, .L80A3FE0C +/* 01728 80A3FC98 1041005C */ beq $v0, $at, .L80A3FE0C /* 0172C 80A3FC9C 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 01730 80A3FCA0 1000006F */ beq $zero, $zero, .L80A3FE60 +/* 01730 80A3FCA0 1000006F */ beq $zero, $zero, .L80A3FE60 /* 01734 80A3FCA4 00000000 */ nop .L80A3FCA8: -/* 01738 80A3FCA8 2C410071 */ sltiu $at, $v0, 0x0071 -/* 0173C 80A3FCAC 1020006C */ beq $at, $zero, .L80A3FE60 -/* 01740 80A3FCB0 0002C880 */ sll $t9, $v0, 2 +/* 01738 80A3FCA8 2C410071 */ sltiu $at, $v0, 0x0071 +/* 0173C 80A3FCAC 1020006C */ beq $at, $zero, .L80A3FE60 +/* 01740 80A3FCB0 0002C880 */ sll $t9, $v0, 2 /* 01744 80A3FCB4 3C0180A4 */ lui $at, %hi(jtbl_80A420E4) ## $at = 80A40000 -/* 01748 80A3FCB8 00390821 */ addu $at, $at, $t9 -/* 0174C 80A3FCBC 8C3920E4 */ lw $t9, %lo(jtbl_80A420E4)($at) -/* 01750 80A3FCC0 03200008 */ jr $t9 +/* 01748 80A3FCB8 00390821 */ addu $at, $at, $t9 +/* 0174C 80A3FCBC 8C3920E4 */ lw $t9, %lo(jtbl_80A420E4)($at) +/* 01750 80A3FCC0 03200008 */ jr $t9 /* 01754 80A3FCC4 00000000 */ nop glabel L80A3FCC8 /* 01758 80A3FCC8 3C053C03 */ lui $a1, 0x3C03 ## $a1 = 3C030000 /* 0175C 80A3FCCC 34A5126F */ ori $a1, $a1, 0x126F ## $a1 = 3C03126F /* 01760 80A3FCD0 0C00B58B */ jal Actor_SetScale - + /* 01764 80A3FCD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01768 80A3FCD8 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 /* 0176C 80A3FCDC 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 @@ -122,20 +122,20 @@ glabel L80A3FCC8 /* 01774 80A3FCE4 8D087124 */ lw $t0, 0x7124($t0) ## 80127124 /* 01778 80A3FCE8 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 0177C 80A3FCEC 956BE6FC */ lhu $t3, -0x1904($t3) ## 8015E6FC -/* 01780 80A3FCF0 01285004 */ sllv $t2, $t0, $t1 +/* 01780 80A3FCF0 01285004 */ sllv $t2, $t0, $t1 /* 01784 80A3FCF4 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 -/* 01788 80A3FCF8 014B6024 */ and $t4, $t2, $t3 -/* 0178C 80A3FCFC 1180000A */ beq $t4, $zero, .L80A3FD28 +/* 01788 80A3FCF8 014B6024 */ and $t4, $t2, $t3 +/* 0178C 80A3FCFC 1180000A */ beq $t4, $zero, .L80A3FD28 /* 01790 80A3FD00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01794 80A3FD04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01798 80A3FD08 0C28FD2F */ jal func_80A3F4BC -/* 0179C 80A3FD0C 8FA5005C */ lw $a1, 0x005C($sp) +/* 01798 80A3FD08 0C28FD2F */ jal func_80A3F4BC +/* 0179C 80A3FD0C 8FA5005C */ lw $a1, 0x005C($sp) /* 017A0 80A3FD10 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 /* 017A4 80A3FD14 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 017A8 80A3FD18 0C28F95C */ jal func_80A3E570 +/* 017A8 80A3FD18 0C28F95C */ jal func_80A3E570 /* 017AC 80A3FD1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017B0 80A3FD20 10000052 */ beq $zero, $zero, .L80A3FE6C -/* 017B4 80A3FD24 8FBF002C */ lw $ra, 0x002C($sp) +/* 017B0 80A3FD20 10000052 */ beq $zero, $zero, .L80A3FE6C +/* 017B4 80A3FD24 8FBF002C */ lw $ra, 0x002C($sp) .L80A3FD28: /* 017B8 80A3FD28 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 /* 017BC 80A3FD2C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -143,50 +143,50 @@ glabel L80A3FCC8 /* 017C4 80A3FD34 3C0580A4 */ lui $a1, %hi(func_80A4011C) ## $a1 = 80A40000 /* 017C8 80A3FD38 24A5011C */ addiu $a1, $a1, %lo(func_80A4011C) ## $a1 = 80A4011C /* 017CC 80A3FD3C E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 017D0 80A3FD40 0C28F95C */ jal func_80A3E570 +/* 017D0 80A3FD40 0C28F95C */ jal func_80A3E570 /* 017D4 80A3FD44 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 017D8 80A3FD48 10000048 */ beq $zero, $zero, .L80A3FE6C -/* 017DC 80A3FD4C 8FBF002C */ lw $ra, 0x002C($sp) +/* 017D8 80A3FD48 10000048 */ beq $zero, $zero, .L80A3FE6C +/* 017DC 80A3FD4C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A3FD50 /* 017E0 80A3FD50 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 017E4 80A3FD54 0C028800 */ jal SkelAnime_GetFrameCount - + /* 017E8 80A3FD58 24844930 */ addiu $a0, $a0, 0x4930 ## $a0 = 06004930 /* 017EC 80A3FD5C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 017F0 80A3FD60 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 017F4 80A3FD64 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 017F8 80A3FD68 46805420 */ cvt.s.w $f16, $f10 +/* 017F8 80A3FD68 46805420 */ cvt.s.w $f16, $f10 /* 017FC 80A3FD6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01800 80A3FD70 0C00B58B */ jal Actor_SetScale - + /* 01804 80A3FD74 E6100164 */ swc1 $f16, 0x0164($s0) ## 00000164 /* 01808 80A3FD78 3C0580A4 */ lui $a1, %hi(func_80A4020C) ## $a1 = 80A40000 /* 0180C 80A3FD7C 24A5020C */ addiu $a1, $a1, %lo(func_80A4020C) ## $a1 = 80A4020C -/* 01810 80A3FD80 0C28F95C */ jal func_80A3E570 +/* 01810 80A3FD80 0C28F95C */ jal func_80A3E570 /* 01814 80A3FD84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01818 80A3FD88 10000038 */ beq $zero, $zero, .L80A3FE6C -/* 0181C 80A3FD8C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01818 80A3FD88 10000038 */ beq $zero, $zero, .L80A3FE6C +/* 0181C 80A3FD8C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A3FD90 /* 01820 80A3FD90 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 01824 80A3FD94 95ADF574 */ lhu $t5, -0x0A8C($t5) ## 8015F574 /* 01828 80A3FD98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0182C 80A3FD9C 31AE0800 */ andi $t6, $t5, 0x0800 ## $t6 = 00000000 -/* 01830 80A3FDA0 51C00004 */ beql $t6, $zero, .L80A3FDB4 +/* 01830 80A3FDA0 51C00004 */ beql $t6, $zero, .L80A3FDB4 /* 01834 80A3FDA4 3C053C75 */ lui $a1, 0x3C75 ## $a1 = 3C750000 -/* 01838 80A3FDA8 0C28FD2F */ jal func_80A3F4BC -/* 0183C 80A3FDAC 8FA5005C */ lw $a1, 0x005C($sp) +/* 01838 80A3FDA8 0C28FD2F */ jal func_80A3F4BC +/* 0183C 80A3FDAC 8FA5005C */ lw $a1, 0x005C($sp) /* 01840 80A3FDB0 3C053C75 */ lui $a1, 0x3C75 ## $a1 = 3C750000 .L80A3FDB4: /* 01844 80A3FDB4 34A5C28F */ ori $a1, $a1, 0xC28F ## $a1 = 3C75C28F /* 01848 80A3FDB8 0C00B58B */ jal Actor_SetScale - + /* 0184C 80A3FDBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01850 80A3FDC0 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 /* 01854 80A3FDC4 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 01858 80A3FDC8 0C28F95C */ jal func_80A3E570 +/* 01858 80A3FDC8 0C28F95C */ jal func_80A3E570 /* 0185C 80A3FDCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01860 80A3FDD0 10000026 */ beq $zero, $zero, .L80A3FE6C -/* 01864 80A3FDD4 8FBF002C */ lw $ra, 0x002C($sp) +/* 01860 80A3FDD0 10000026 */ beq $zero, $zero, .L80A3FE6C +/* 01864 80A3FDD4 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A3FDD8 /* 01868 80A3FDD8 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 /* 0186C 80A3FDDC 44819000 */ mtc1 $at, $f18 ## $f18 = 1400.00 @@ -194,49 +194,49 @@ glabel L80A3FDD8 /* 01874 80A3FDE4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 01878 80A3FDE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0187C 80A3FDEC 0C00B58B */ jal Actor_SetScale - + /* 01880 80A3FDF0 E61200BC */ swc1 $f18, 0x00BC($s0) ## 000000BC /* 01884 80A3FDF4 3C0580A4 */ lui $a1, %hi(func_80A3FEB4) ## $a1 = 80A40000 /* 01888 80A3FDF8 24A5FEB4 */ addiu $a1, $a1, %lo(func_80A3FEB4) ## $a1 = 80A3FEB4 -/* 0188C 80A3FDFC 0C28F95C */ jal func_80A3E570 +/* 0188C 80A3FDFC 0C28F95C */ jal func_80A3E570 /* 01890 80A3FE00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01894 80A3FE04 10000019 */ beq $zero, $zero, .L80A3FE6C -/* 01898 80A3FE08 8FBF002C */ lw $ra, 0x002C($sp) +/* 01894 80A3FE04 10000019 */ beq $zero, $zero, .L80A3FE6C +/* 01898 80A3FE08 8FBF002C */ lw $ra, 0x002C($sp) .L80A3FE0C: /* 0189C 80A3FE0C 3C053E23 */ lui $a1, 0x3E23 ## $a1 = 3E230000 /* 018A0 80A3FE10 A20F001F */ sb $t7, 0x001F($s0) ## 0000001F /* 018A4 80A3FE14 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3E23D70A /* 018A8 80A3FE18 0C00B58B */ jal Actor_SetScale - + /* 018AC 80A3FE1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 018B0 80A3FE20 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 /* 018B4 80A3FE24 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 018B8 80A3FE28 0C28F95C */ jal func_80A3E570 +/* 018B8 80A3FE28 0C28F95C */ jal func_80A3E570 /* 018BC 80A3FE2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018C0 80A3FE30 1000000E */ beq $zero, $zero, .L80A3FE6C -/* 018C4 80A3FE34 8FBF002C */ lw $ra, 0x002C($sp) +/* 018C0 80A3FE30 1000000E */ beq $zero, $zero, .L80A3FE6C +/* 018C4 80A3FE34 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A3FE38 /* 018C8 80A3FE38 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 018CC 80A3FE3C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 018D0 80A3FE40 0C00B58B */ jal Actor_SetScale - + /* 018D4 80A3FE44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 018D8 80A3FE48 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 /* 018DC 80A3FE4C 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 018E0 80A3FE50 0C28F95C */ jal func_80A3E570 +/* 018E0 80A3FE50 0C28F95C */ jal func_80A3E570 /* 018E4 80A3FE54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018E8 80A3FE58 10000004 */ beq $zero, $zero, .L80A3FE6C -/* 018EC 80A3FE5C 8FBF002C */ lw $ra, 0x002C($sp) +/* 018E8 80A3FE58 10000004 */ beq $zero, $zero, .L80A3FE6C +/* 018EC 80A3FE5C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A3FE60 .L80A3FE60: /* 018F0 80A3FE60 0C00B55C */ jal Actor_Kill - + /* 018F4 80A3FE64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018F8 80A3FE68 8FBF002C */ lw $ra, 0x002C($sp) +/* 018F8 80A3FE68 8FBF002C */ lw $ra, 0x002C($sp) .L80A3FE6C: -/* 018FC 80A3FE6C 8FB00028 */ lw $s0, 0x0028($sp) +/* 018FC 80A3FE6C 8FB00028 */ lw $s0, 0x0028($sp) /* 01900 80A3FE70 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01904 80A3FE74 03E00008 */ jr $ra +/* 01904 80A3FE74 03E00008 */ jr $ra /* 01908 80A3FE78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s index a629478a13..77caa3f4d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s @@ -1,9 +1,9 @@ glabel EnGo2_Draw /* 05160 80A47E90 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 05164 80A47E94 3C0F80A5 */ lui $t7, %hi(D_80A48578) ## $t7 = 80A50000 -/* 05168 80A47E98 AFBF002C */ sw $ra, 0x002C($sp) -/* 0516C 80A47E9C AFB00028 */ sw $s0, 0x0028($sp) -/* 05170 80A47EA0 AFA50074 */ sw $a1, 0x0074($sp) +/* 05168 80A47E98 AFBF002C */ sw $ra, 0x002C($sp) +/* 0516C 80A47E9C AFB00028 */ sw $s0, 0x0028($sp) +/* 05170 80A47EA0 AFA50074 */ sw $a1, 0x0074($sp) /* 05174 80A47EA4 25EF8578 */ addiu $t7, $t7, %lo(D_80A48578) ## $t7 = 80A48578 /* 05178 80A47EA8 8DF90000 */ lw $t9, 0x0000($t7) ## 80A48578 /* 0517C 80A47EAC 8DF80004 */ lw $t8, 0x0004($t7) ## 80A4857C @@ -21,64 +21,64 @@ glabel EnGo2_Draw /* 051AC 80A47EDC 27A90054 */ addiu $t1, $sp, 0x0054 ## $t1 = FFFFFFE4 /* 051B0 80A47EE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 051B4 80A47EE4 AD2B0004 */ sw $t3, 0x0004($t1) ## FFFFFFE8 -/* 051B8 80A47EE8 0C290B75 */ jal func_80A42DD4 +/* 051B8 80A47EE8 0C290B75 */ jal func_80A42DD4 /* 051BC 80A47EEC AD2C0000 */ sw $t4, 0x0000($t1) ## FFFFFFE4 -/* 051C0 80A47EF0 0C034213 */ jal Matrix_Push +/* 051C0 80A47EF0 0C034213 */ jal Matrix_Push /* 051C4 80A47EF4 00000000 */ nop /* 051C8 80A47EF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 051CC 80A47EFC 0C290BB8 */ jal func_80A42EE0 -/* 051D0 80A47F00 8FA50074 */ lw $a1, 0x0074($sp) -/* 051D4 80A47F04 0C034221 */ jal Matrix_Pull +/* 051CC 80A47EFC 0C290BB8 */ jal func_80A42EE0 +/* 051D0 80A47F00 8FA50074 */ lw $a1, 0x0074($sp) +/* 051D4 80A47F04 0C034221 */ jal Matrix_Pull /* 051D8 80A47F08 00000000 */ nop /* 051DC 80A47F0C 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 /* 051E0 80A47F10 3C0D80A4 */ lui $t5, %hi(func_80A4696C) ## $t5 = 80A40000 /* 051E4 80A47F14 25AD696C */ addiu $t5, $t5, %lo(func_80A4696C) ## $t5 = 80A4696C -/* 051E8 80A47F18 15A20011 */ bne $t5, $v0, .L80A47F60 +/* 051E8 80A47F18 15A20011 */ bne $t5, $v0, .L80A47F60 /* 051EC 80A47F1C 3C0E80A4 */ lui $t6, %hi(func_80A46E54) ## $t6 = 80A40000 /* 051F0 80A47F20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 051F4 80A47F24 C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 -/* 051F8 80A47F28 46040032 */ c.eq.s $f0, $f4 +/* 051F8 80A47F28 46040032 */ c.eq.s $f0, $f4 /* 051FC 80A47F2C 00000000 */ nop -/* 05200 80A47F30 4500000B */ bc1f .L80A47F60 +/* 05200 80A47F30 4500000B */ bc1f .L80A47F60 /* 05204 80A47F34 00000000 */ nop /* 05208 80A47F38 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 /* 0520C 80A47F3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05210 80A47F40 46060032 */ c.eq.s $f0, $f6 +/* 05210 80A47F40 46060032 */ c.eq.s $f0, $f6 /* 05214 80A47F44 00000000 */ nop -/* 05218 80A47F48 45000005 */ bc1f .L80A47F60 +/* 05218 80A47F48 45000005 */ bc1f .L80A47F60 /* 0521C 80A47F4C 00000000 */ nop -/* 05220 80A47F50 0C291E6C */ jal func_80A479B0 -/* 05224 80A47F54 8FA50074 */ lw $a1, 0x0074($sp) -/* 05228 80A47F58 10000059 */ beq $zero, $zero, .L80A480C0 -/* 0522C 80A47F5C 8FBF002C */ lw $ra, 0x002C($sp) +/* 05220 80A47F50 0C291E6C */ jal func_80A479B0 +/* 05224 80A47F54 8FA50074 */ lw $a1, 0x0074($sp) +/* 05228 80A47F58 10000059 */ beq $zero, $zero, .L80A480C0 +/* 0522C 80A47F5C 8FBF002C */ lw $ra, 0x002C($sp) .L80A47F60: /* 05230 80A47F60 25CE6E54 */ addiu $t6, $t6, %lo(func_80A46E54) ## $t6 = 00006E54 -/* 05234 80A47F64 11C20007 */ beq $t6, $v0, .L80A47F84 +/* 05234 80A47F64 11C20007 */ beq $t6, $v0, .L80A47F84 /* 05238 80A47F68 3C0F80A4 */ lui $t7, %hi(func_80A47024) ## $t7 = 80A40000 /* 0523C 80A47F6C 25EF7024 */ addiu $t7, $t7, %lo(func_80A47024) ## $t7 = 80A47024 -/* 05240 80A47F70 11E20004 */ beq $t7, $v0, .L80A47F84 +/* 05240 80A47F70 11E20004 */ beq $t7, $v0, .L80A47F84 /* 05244 80A47F74 3C1880A4 */ lui $t8, %hi(func_80A46DBC) ## $t8 = 80A40000 /* 05248 80A47F78 27186DBC */ addiu $t8, $t8, %lo(func_80A46DBC) ## $t8 = 80A46DBC -/* 0524C 80A47F7C 17020006 */ bne $t8, $v0, .L80A47F98 -/* 05250 80A47F80 8FB90074 */ lw $t9, 0x0074($sp) +/* 0524C 80A47F7C 17020006 */ bne $t8, $v0, .L80A47F98 +/* 05250 80A47F80 8FB90074 */ lw $t9, 0x0074($sp) .L80A47F84: /* 05254 80A47F84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05258 80A47F88 0C291EAC */ jal func_80A47AB0 -/* 0525C 80A47F8C 8FA50074 */ lw $a1, 0x0074($sp) -/* 05260 80A47F90 1000004B */ beq $zero, $zero, .L80A480C0 -/* 05264 80A47F94 8FBF002C */ lw $ra, 0x002C($sp) +/* 05258 80A47F88 0C291EAC */ jal func_80A47AB0 +/* 0525C 80A47F8C 8FA50074 */ lw $a1, 0x0074($sp) +/* 05260 80A47F90 1000004B */ beq $zero, $zero, .L80A480C0 +/* 05264 80A47F94 8FBF002C */ lw $ra, 0x002C($sp) .L80A47F98: /* 05268 80A47F98 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 0526C 80A47F9C 3C0680A5 */ lui $a2, %hi(D_80A4862C) ## $a2 = 80A50000 /* 05270 80A47FA0 24C6862C */ addiu $a2, $a2, %lo(D_80A4862C) ## $a2 = 80A4862C /* 05274 80A47FA4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFD0 /* 05278 80A47FA8 24070BF7 */ addiu $a3, $zero, 0x0BF7 ## $a3 = 00000BF7 -/* 0527C 80A47FAC 0C031AB1 */ jal func_800C6AC4 -/* 05280 80A47FB0 AFA50050 */ sw $a1, 0x0050($sp) -/* 05284 80A47FB4 8FA90074 */ lw $t1, 0x0074($sp) -/* 05288 80A47FB8 0C024F46 */ jal func_80093D18 +/* 0527C 80A47FAC 0C031AB1 */ jal func_800C6AC4 +/* 05280 80A47FB0 AFA50050 */ sw $a1, 0x0050($sp) +/* 05284 80A47FB4 8FA90074 */ lw $t1, 0x0074($sp) +/* 05288 80A47FB8 0C024F46 */ jal func_80093D18 /* 0528C 80A47FBC 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 05290 80A47FC0 8FA80050 */ lw $t0, 0x0050($sp) +/* 05290 80A47FC0 8FA80050 */ lw $t0, 0x0050($sp) /* 05294 80A47FC4 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 05298 80A47FC8 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 0529C 80A47FCC 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -90,19 +90,19 @@ glabel EnGo2_Draw /* 052B4 80A47FE4 920C0214 */ lbu $t4, 0x0214($s0) ## 00000214 /* 052B8 80A47FE8 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 052BC 80A47FEC 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 052C0 80A47FF0 000C6880 */ sll $t5, $t4, 2 -/* 052C4 80A47FF4 03AD2021 */ addu $a0, $sp, $t5 +/* 052C0 80A47FF0 000C6880 */ sll $t5, $t4, 2 +/* 052C4 80A47FF4 03AD2021 */ addu $a0, $sp, $t5 /* 052C8 80A47FF8 8C84005C */ lw $a0, 0x005C($a0) ## 0000005C /* 052CC 80A47FFC 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 052D0 80A48000 00047900 */ sll $t7, $a0, 4 -/* 052D4 80A48004 000FC702 */ srl $t8, $t7, 28 -/* 052D8 80A48008 0018C880 */ sll $t9, $t8, 2 -/* 052DC 80A4800C 00D94821 */ addu $t1, $a2, $t9 +/* 052D0 80A48000 00047900 */ sll $t7, $a0, 4 +/* 052D4 80A48004 000FC702 */ srl $t8, $t7, 28 +/* 052D8 80A48008 0018C880 */ sll $t9, $t8, 2 +/* 052DC 80A4800C 00D94821 */ addu $t1, $a2, $t9 /* 052E0 80A48010 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 052E4 80A48014 00857024 */ and $t6, $a0, $a1 +/* 052E4 80A48014 00857024 */ and $t6, $a0, $a1 /* 052E8 80A48018 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 052EC 80A4801C 01CA5821 */ addu $t3, $t6, $t2 -/* 052F0 80A48020 01676021 */ addu $t4, $t3, $a3 +/* 052EC 80A4801C 01CA5821 */ addu $t3, $t6, $t2 +/* 052F0 80A48020 01676021 */ addu $t4, $t3, $a3 /* 052F4 80A48024 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 /* 052F8 80A48028 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 052FC 80A4802C 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 @@ -110,41 +110,41 @@ glabel EnGo2_Draw /* 05304 80A48034 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 05308 80A48038 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 /* 0530C 80A4803C 92180215 */ lbu $t8, 0x0215($s0) ## 00000215 -/* 05310 80A48040 0018C880 */ sll $t9, $t8, 2 -/* 05314 80A48044 03B92021 */ addu $a0, $sp, $t9 +/* 05310 80A48040 0018C880 */ sll $t9, $t8, 2 +/* 05314 80A48044 03B92021 */ addu $a0, $sp, $t9 /* 05318 80A48048 8C840054 */ lw $a0, 0x0054($a0) ## 00000054 /* 0531C 80A4804C 3C1980A4 */ lui $t9, %hi(func_80A47C20) ## $t9 = 80A40000 /* 05320 80A48050 27397C20 */ addiu $t9, $t9, %lo(func_80A47C20) ## $t9 = 80A47C20 -/* 05324 80A48054 00047100 */ sll $t6, $a0, 4 -/* 05328 80A48058 000E5702 */ srl $t2, $t6, 28 -/* 0532C 80A4805C 000A5880 */ sll $t3, $t2, 2 -/* 05330 80A48060 00CB6021 */ addu $t4, $a2, $t3 +/* 05324 80A48054 00047100 */ sll $t6, $a0, 4 +/* 05328 80A48058 000E5702 */ srl $t2, $t6, 28 +/* 0532C 80A4805C 000A5880 */ sll $t3, $t2, 2 +/* 05330 80A48060 00CB6021 */ addu $t4, $a2, $t3 /* 05334 80A48064 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000000 -/* 05338 80A48068 00854824 */ and $t1, $a0, $a1 +/* 05338 80A48068 00854824 */ and $t1, $a0, $a1 /* 0533C 80A4806C 3C0E80A4 */ lui $t6, %hi(func_80A47E34) ## $t6 = 80A40000 -/* 05340 80A48070 012D7821 */ addu $t7, $t1, $t5 -/* 05344 80A48074 01E7C021 */ addu $t8, $t7, $a3 +/* 05340 80A48070 012D7821 */ addu $t7, $t1, $t5 +/* 05344 80A48074 01E7C021 */ addu $t8, $t7, $a3 /* 05348 80A48078 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 0534C 80A4807C 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 05350 80A48080 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05354 80A48084 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 05358 80A48088 25CE7E34 */ addiu $t6, $t6, %lo(func_80A47E34) ## $t6 = 80A47E34 -/* 0535C 80A4808C AFAE0014 */ sw $t6, 0x0014($sp) -/* 05360 80A48090 AFB00018 */ sw $s0, 0x0018($sp) -/* 05364 80A48094 AFB90010 */ sw $t9, 0x0010($sp) -/* 05368 80A48098 0C0286B2 */ jal func_800A1AC8 -/* 0536C 80A4809C 8FA40074 */ lw $a0, 0x0074($sp) -/* 05370 80A480A0 8FAA0074 */ lw $t2, 0x0074($sp) +/* 0535C 80A4808C AFAE0014 */ sw $t6, 0x0014($sp) +/* 05360 80A48090 AFB00018 */ sw $s0, 0x0018($sp) +/* 05364 80A48094 AFB90010 */ sw $t9, 0x0010($sp) +/* 05368 80A48098 0C0286B2 */ jal SkelAnime_DrawSV +/* 0536C 80A4809C 8FA40074 */ lw $a0, 0x0074($sp) +/* 05370 80A480A0 8FAA0074 */ lw $t2, 0x0074($sp) /* 05374 80A480A4 3C0680A5 */ lui $a2, %hi(D_80A4863C) ## $a2 = 80A50000 /* 05378 80A480A8 24C6863C */ addiu $a2, $a2, %lo(D_80A4863C) ## $a2 = 80A4863C /* 0537C 80A480AC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFD0 /* 05380 80A480B0 24070C09 */ addiu $a3, $zero, 0x0C09 ## $a3 = 00000C09 -/* 05384 80A480B4 0C031AD5 */ jal func_800C6B54 +/* 05384 80A480B4 0C031AD5 */ jal func_800C6B54 /* 05388 80A480B8 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 0538C 80A480BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 0538C 80A480BC 8FBF002C */ lw $ra, 0x002C($sp) .L80A480C0: -/* 05390 80A480C0 8FB00028 */ lw $s0, 0x0028($sp) +/* 05390 80A480C0 8FB00028 */ lw $s0, 0x0028($sp) /* 05394 80A480C4 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 05398 80A480C8 03E00008 */ jr $ra +/* 05398 80A480C8 03E00008 */ jr $ra /* 0539C 80A480CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s index d97761a761..b17349d3a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s @@ -1,74 +1,74 @@ glabel EnGo2_Init /* 0379C 80A464CC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 037A0 80A464D0 AFB00028 */ sw $s0, 0x0028($sp) +/* 037A0 80A464D0 AFB00028 */ sw $s0, 0x0028($sp) /* 037A4 80A464D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 037A8 80A464D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 037AC 80A464DC AFA50044 */ sw $a1, 0x0044($sp) +/* 037A8 80A464D8 AFBF002C */ sw $ra, 0x002C($sp) +/* 037AC 80A464DC AFA50044 */ sw $a1, 0x0044($sp) /* 037B0 80A464E0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 037B4 80A464E4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 037B8 80A464E8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 037BC 80A464EC 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 037C0 80A464F0 0C00AC78 */ jal ActorShape_Init - + /* 037C4 80A464F4 3C0741E0 */ lui $a3, 0x41E0 ## $a3 = 41E00000 /* 037C8 80A464F8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 037CC 80A464FC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 037D0 80A46500 260E04B8 */ addiu $t6, $s0, 0x04B8 ## $t6 = 000004B8 /* 037D4 80A46504 260F0524 */ addiu $t7, $s0, 0x0524 ## $t7 = 00000524 /* 037D8 80A46508 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 037DC 80A4650C AFB80018 */ sw $t8, 0x0018($sp) -/* 037E0 80A46510 AFAF0014 */ sw $t7, 0x0014($sp) -/* 037E4 80A46514 AFAE0010 */ sw $t6, 0x0010($sp) +/* 037DC 80A4650C AFB80018 */ sw $t8, 0x0018($sp) +/* 037E0 80A46510 AFAF0014 */ sw $t7, 0x0014($sp) +/* 037E4 80A46514 AFAE0010 */ sw $t6, 0x0010($sp) /* 037E8 80A46518 24C6FEF0 */ addiu $a2, $a2, 0xFEF0 ## $a2 = 0600FEF0 -/* 037EC 80A4651C AFA50034 */ sw $a1, 0x0034($sp) -/* 037F0 80A46520 8FA40044 */ lw $a0, 0x0044($sp) -/* 037F4 80A46524 0C0291BE */ jal func_800A46F8 +/* 037EC 80A4651C AFA50034 */ sw $a1, 0x0034($sp) +/* 037F0 80A46520 8FA40044 */ lw $a0, 0x0044($sp) +/* 037F4 80A46524 0C0291BE */ jal SkelAnime_InitSV /* 037F8 80A46528 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 037FC 80A4652C 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC -/* 03800 80A46530 AFA50030 */ sw $a1, 0x0030($sp) +/* 03800 80A46530 AFA50030 */ sw $a1, 0x0030($sp) /* 03804 80A46534 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 03808 80A46538 8FA40044 */ lw $a0, 0x0044($sp) + +/* 03808 80A46538 8FA40044 */ lw $a0, 0x0044($sp) /* 0380C 80A4653C 3C0780A5 */ lui $a3, %hi(D_80A48114) ## $a3 = 80A50000 -/* 03810 80A46540 8FA50030 */ lw $a1, 0x0030($sp) +/* 03810 80A46540 8FA50030 */ lw $a1, 0x0030($sp) /* 03814 80A46544 24E78114 */ addiu $a3, $a3, %lo(D_80A48114) ## $a3 = 80A48114 -/* 03818 80A46548 8FA40044 */ lw $a0, 0x0044($sp) +/* 03818 80A46548 8FA40044 */ lw $a0, 0x0044($sp) /* 0381C 80A4654C 0C01712B */ jal ActorCollider_InitCylinder - + /* 03820 80A46550 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 03824 80A46554 3C0680A5 */ lui $a2, %hi(D_80A48140) ## $a2 = 80A50000 /* 03828 80A46558 24C68140 */ addiu $a2, $a2, %lo(D_80A48140) ## $a2 = 80A48140 /* 0382C 80A4655C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 03830 80A46560 0C0187BF */ jal func_80061EFC +/* 03830 80A46560 0C0187BF */ jal func_80061EFC /* 03834 80A46564 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03838 80A46568 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 0383C 80A4656C 3328001F */ andi $t0, $t9, 0x001F ## $t0 = 00000000 /* 03840 80A46570 2509FFFD */ addiu $t1, $t0, 0xFFFD ## $t1 = FFFFFFFD -/* 03844 80A46574 2D21000B */ sltiu $at, $t1, 0x000B -/* 03848 80A46578 1020000D */ beq $at, $zero, .L80A465B0 -/* 0384C 80A4657C 00094880 */ sll $t1, $t1, 2 +/* 03844 80A46574 2D21000B */ sltiu $at, $t1, 0x000B +/* 03848 80A46578 1020000D */ beq $at, $zero, .L80A465B0 +/* 0384C 80A4657C 00094880 */ sll $t1, $t1, 2 /* 03850 80A46580 3C0180A5 */ lui $at, %hi(jtbl_80A4872C) ## $at = 80A50000 -/* 03854 80A46584 00290821 */ addu $at, $at, $t1 -/* 03858 80A46588 8C29872C */ lw $t1, %lo(jtbl_80A4872C)($at) -/* 0385C 80A4658C 01200008 */ jr $t1 +/* 03854 80A46584 00290821 */ addu $at, $at, $t1 +/* 03858 80A46588 8C29872C */ lw $t1, %lo(jtbl_80A4872C)($at) +/* 0385C 80A4658C 01200008 */ jr $t1 /* 03860 80A46590 00000000 */ nop glabel L80A46594 /* 03864 80A46594 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 03868 80A46598 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 0386C 80A4659C 01415824 */ and $t3, $t2, $at +/* 0386C 80A4659C 01415824 */ and $t3, $t2, $at /* 03870 80A465A0 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF /* 03874 80A465A4 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 03878 80A465A8 01616824 */ and $t5, $t3, $at +/* 03878 80A465A8 01616824 */ and $t5, $t3, $at /* 0387C 80A465AC AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 .L80A465B0: -/* 03880 80A465B0 0C291223 */ jal func_80A4488C +/* 03880 80A465B0 0C291223 */ jal func_80A4488C /* 03884 80A465B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03888 80A465B8 0C291231 */ jal func_80A448C4 +/* 03888 80A465B8 0C291231 */ jal func_80A448C4 /* 0388C 80A465BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03890 80A465C0 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 /* 03894 80A465C4 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -/* 03898 80A465C8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0389C 80A465CC 0C00D3B0 */ jal func_80034EC0 +/* 03898 80A465C8 8FA40034 */ lw $a0, 0x0034($sp) +/* 0389C 80A465CC 0C00D3B0 */ jal func_80034EC0 /* 038A0 80A465D0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 038A4 80A465D4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 038A8 80A465D8 300E00FF */ andi $t6, $zero, 0x00FF ## $t6 = 00000000 @@ -76,18 +76,18 @@ glabel L80A46594 /* 038B0 80A465E0 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 /* 038B4 80A465E4 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 /* 038B8 80A465E8 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 038BC 80A465EC 05C10005 */ bgez $t6, .L80A46604 -/* 038C0 80A465F0 46803220 */ cvt.s.w $f8, $f6 +/* 038BC 80A465EC 05C10005 */ bgez $t6, .L80A46604 +/* 038C0 80A465F0 46803220 */ cvt.s.w $f8, $f6 /* 038C4 80A465F4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 038C8 80A465F8 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 /* 038CC 80A465FC 00000000 */ nop -/* 038D0 80A46600 460A4200 */ add.s $f8, $f8, $f10 +/* 038D0 80A46600 460A4200 */ add.s $f8, $f8, $f10 .L80A46604: /* 038D4 80A46604 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 038D8 80A46608 860F00B8 */ lh $t7, 0x00B8($s0) ## 000000B8 /* 038DC 80A4660C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 038E0 80A46610 30A503E0 */ andi $a1, $a1, 0x03E0 ## $a1 = 00000000 -/* 038E4 80A46614 00052943 */ sra $a1, $a1, 5 +/* 038E4 80A46614 00052943 */ sra $a1, $a1, 5 /* 038E8 80A46618 E6080220 */ swc1 $f8, 0x0220($s0) ## 00000220 /* 038EC 80A4661C A200020E */ sb $zero, 0x020E($s0) ## 0000020E /* 038F0 80A46620 A200020F */ sb $zero, 0x020F($s0) ## 0000020F @@ -95,22 +95,22 @@ glabel L80A46594 /* 038F8 80A46628 A2000212 */ sb $zero, 0x0212($s0) ## 00000212 /* 038FC 80A4662C A2000210 */ sb $zero, 0x0210($s0) ## 00000210 /* 03900 80A46630 A618026E */ sh $t8, 0x026E($s0) ## 0000026E -/* 03904 80A46634 00052C00 */ sll $a1, $a1, 16 +/* 03904 80A46634 00052C00 */ sll $a1, $a1, 16 /* 03908 80A46638 A20F0216 */ sb $t7, 0x0216($s0) ## 00000216 -/* 0390C 80A4663C 8FA40044 */ lw $a0, 0x0044($sp) -/* 03910 80A46640 00052C03 */ sra $a1, $a1, 16 -/* 03914 80A46644 0C023938 */ jal func_8008E4E0 +/* 0390C 80A4663C 8FA40044 */ lw $a0, 0x0044($sp) +/* 03910 80A46640 00052C03 */ sra $a1, $a1, 16 +/* 03914 80A46644 0C023938 */ jal func_8008E4E0 /* 03918 80A46648 2406001F */ addiu $a2, $zero, 0x001F ## $a2 = 0000001F /* 0391C 80A4664C 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 03920 80A46650 AE020208 */ sw $v0, 0x0208($s0) ## 00000208 /* 03924 80A46654 3066001F */ andi $a2, $v1, 0x001F ## $a2 = 00000000 -/* 03928 80A46658 2CC1000E */ sltiu $at, $a2, 0x000E -/* 0392C 80A4665C 102000B8 */ beq $at, $zero, .L80A46940 -/* 03930 80A46660 0006C880 */ sll $t9, $a2, 2 +/* 03928 80A46658 2CC1000E */ sltiu $at, $a2, 0x000E +/* 0392C 80A4665C 102000B8 */ beq $at, $zero, .L80A46940 +/* 03930 80A46660 0006C880 */ sll $t9, $a2, 2 /* 03934 80A46664 3C0180A5 */ lui $at, %hi(jtbl_80A48758) ## $at = 80A50000 -/* 03938 80A46668 00390821 */ addu $at, $at, $t9 -/* 0393C 80A4666C 8C398758 */ lw $t9, %lo(jtbl_80A48758)($at) -/* 03940 80A46670 03200008 */ jr $t9 +/* 03938 80A46668 00390821 */ addu $at, $at, $t9 +/* 0393C 80A4666C 8C398758 */ lw $t9, %lo(jtbl_80A48758)($at) +/* 03940 80A46670 03200008 */ jr $t9 /* 03944 80A46674 00000000 */ nop glabel L80A46678 /* 03948 80A46678 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 @@ -118,54 +118,54 @@ glabel L80A46678 /* 03950 80A46680 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 /* 03954 80A46684 8D087124 */ lw $t0, 0x7124($t0) ## 80127124 /* 03958 80A46688 8C6900A4 */ lw $t1, 0x00A4($v1) ## 8015E704 -/* 0395C 80A4668C 01095024 */ and $t2, $t0, $t1 -/* 03960 80A46690 15400006 */ bne $t2, $zero, .L80A466AC +/* 0395C 80A4668C 01095024 */ and $t2, $t0, $t1 +/* 03960 80A46690 15400006 */ bne $t2, $zero, .L80A466AC /* 03964 80A46694 00000000 */ nop /* 03968 80A46698 8C6B0004 */ lw $t3, 0x0004($v1) ## 8015E664 -/* 0396C 80A4669C 15600003 */ bne $t3, $zero, .L80A466AC +/* 0396C 80A4669C 15600003 */ bne $t3, $zero, .L80A466AC /* 03970 80A466A0 00000000 */ nop /* 03974 80A466A4 0C00B55C */ jal Actor_Kill - + /* 03978 80A466A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A466AC: /* 0397C 80A466AC 3C0C80A4 */ lui $t4, %hi(func_80A4696C) ## $t4 = 80A40000 /* 03980 80A466B0 258C696C */ addiu $t4, $t4, %lo(func_80A4696C) ## $t4 = 80A4696C -/* 03984 80A466B4 100000A5 */ beq $zero, $zero, .L80A4694C +/* 03984 80A466B4 100000A5 */ beq $zero, $zero, .L80A4694C /* 03988 80A466B8 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 glabel L80A466BC /* 0398C 80A466BC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 03990 80A466C0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 03994 80A466C4 8C6D0004 */ lw $t5, 0x0004($v1) ## 8015E664 /* 03998 80A466C8 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 0399C 80A466CC 11A00006 */ beq $t5, $zero, .L80A466E8 +/* 0399C 80A466CC 11A00006 */ beq $t5, $zero, .L80A466E8 /* 039A0 80A466D0 00000000 */ nop /* 039A4 80A466D4 8DCE716C */ lw $t6, 0x716C($t6) ## 8012716C /* 039A8 80A466D8 8C6F00A4 */ lw $t7, 0x00A4($v1) ## 8015E704 -/* 039AC 80A466DC 01CFC024 */ and $t8, $t6, $t7 -/* 039B0 80A466E0 57000004 */ bnel $t8, $zero, .L80A466F4 +/* 039AC 80A466DC 01CFC024 */ and $t8, $t6, $t7 +/* 039B0 80A466E0 57000004 */ bnel $t8, $zero, .L80A466F4 /* 039B4 80A466E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A466E8: /* 039B8 80A466E8 0C00B55C */ jal Actor_Kill - + /* 039BC 80A466EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 039C0 80A466F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A466F4: -/* 039C4 80A466F4 0C291750 */ jal func_80A45D40 -/* 039C8 80A466F8 8FA50044 */ lw $a1, 0x0044($sp) -/* 039CC 80A466FC 10000094 */ beq $zero, $zero, .L80A46950 -/* 039D0 80A46700 8FBF002C */ lw $ra, 0x002C($sp) +/* 039C4 80A466F4 0C291750 */ jal func_80A45D40 +/* 039C8 80A466F8 8FA50044 */ lw $a1, 0x0044($sp) +/* 039CC 80A466FC 10000094 */ beq $zero, $zero, .L80A46950 +/* 039D0 80A46700 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A46704 /* 039D4 80A46704 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 039D8 80A46708 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 039DC 80A4670C 94620F18 */ lhu $v0, 0x0F18($v1) ## 8015F578 /* 039E0 80A46710 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 039E4 80A46714 30590200 */ andi $t9, $v0, 0x0200 ## $t9 = 00000000 -/* 039E8 80A46718 53200024 */ beql $t9, $zero, .L80A467AC +/* 039E8 80A46718 53200024 */ beql $t9, $zero, .L80A467AC /* 039EC 80A4671C 3059EFFF */ andi $t9, $v0, 0xEFFF ## $t9 = 00000000 /* 039F0 80A46720 8E040208 */ lw $a0, 0x0208($s0) ## 00000208 -/* 039F4 80A46724 0C023983 */ jal func_8008E60C -/* 039F8 80A46728 AFA50030 */ sw $a1, 0x0030($sp) -/* 039FC 80A4672C 8FA50030 */ lw $a1, 0x0030($sp) +/* 039F4 80A46724 0C023983 */ jal func_8008E60C +/* 039F8 80A46728 AFA50030 */ sw $a1, 0x0030($sp) +/* 039FC 80A4672C 8FA50030 */ lw $a1, 0x0030($sp) /* 03A00 80A46730 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 03A04 80A46734 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 03A08 80A46738 8CA90000 */ lw $t1, 0x0000($a1) ## 00000000 @@ -180,22 +180,22 @@ glabel L80A46704 /* 03A2C 80A4675C AE090010 */ sw $t1, 0x0010($s0) ## 00000010 /* 03A30 80A46760 8C6A00A4 */ lw $t2, 0x00A4($v1) ## 8015E704 /* 03A34 80A46764 8C427124 */ lw $v0, 0x7124($v0) ## 80127124 -/* 03A38 80A46768 004A5824 */ and $t3, $v0, $t2 -/* 03A3C 80A4676C 1560000C */ bne $t3, $zero, .L80A467A0 +/* 03A38 80A46768 004A5824 */ and $t3, $v0, $t2 +/* 03A3C 80A4676C 1560000C */ bne $t3, $zero, .L80A467A0 /* 03A40 80A46770 00000000 */ nop /* 03A44 80A46774 918C71F2 */ lbu $t4, 0x71F2($t4) ## 801271F2 /* 03A48 80A46778 946E009C */ lhu $t6, 0x009C($v1) ## 8015E6FC /* 03A4C 80A4677C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03A50 80A46780 01826804 */ sllv $t5, $v0, $t4 -/* 03A54 80A46784 01AE7824 */ and $t7, $t5, $t6 -/* 03A58 80A46788 11E00005 */ beq $t7, $zero, .L80A467A0 +/* 03A50 80A46780 01826804 */ sllv $t5, $v0, $t4 +/* 03A54 80A46784 01AE7824 */ and $t7, $t5, $t6 +/* 03A58 80A46788 11E00005 */ beq $t7, $zero, .L80A467A0 /* 03A5C 80A4678C 00000000 */ nop -/* 03A60 80A46790 0C291750 */ jal func_80A45D40 -/* 03A64 80A46794 8FA50044 */ lw $a1, 0x0044($sp) -/* 03A68 80A46798 1000006D */ beq $zero, $zero, .L80A46950 -/* 03A6C 80A4679C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03A60 80A46790 0C291750 */ jal func_80A45D40 +/* 03A64 80A46794 8FA50044 */ lw $a1, 0x0044($sp) +/* 03A68 80A46798 1000006D */ beq $zero, $zero, .L80A46950 +/* 03A6C 80A4679C 8FBF002C */ lw $ra, 0x002C($sp) .L80A467A0: -/* 03A70 80A467A0 1000006A */ beq $zero, $zero, .L80A4694C +/* 03A70 80A467A0 1000006A */ beq $zero, $zero, .L80A4694C /* 03A74 80A467A4 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 /* 03A78 80A467A8 3059EFFF */ andi $t9, $v0, 0xEFFF ## $t9 = 00000000 .L80A467AC: @@ -204,91 +204,91 @@ glabel L80A46704 /* 03A84 80A467B4 3C0B80A5 */ lui $t3, %hi(D_80A48174) ## $t3 = 80A50000 /* 03A88 80A467B8 3C0180A5 */ lui $at, %hi(D_80A48790) ## $at = 80A50000 /* 03A8C 80A467BC 3109001F */ andi $t1, $t0, 0x001F ## $t1 = 00000000 -/* 03A90 80A467C0 00095080 */ sll $t2, $t1, 2 -/* 03A94 80A467C4 01495021 */ addu $t2, $t2, $t1 -/* 03A98 80A467C8 000A5040 */ sll $t2, $t2, 1 -/* 03A9C 80A467CC 016A5821 */ addu $t3, $t3, $t2 -/* 03AA0 80A467D0 856B8174 */ lh $t3, %lo(D_80A48174)($t3) -/* 03AA4 80A467D4 C4248790 */ lwc1 $f4, %lo(D_80A48790)($at) +/* 03A90 80A467C0 00095080 */ sll $t2, $t1, 2 +/* 03A94 80A467C4 01495021 */ addu $t2, $t2, $t1 +/* 03A98 80A467C8 000A5040 */ sll $t2, $t2, 1 +/* 03A9C 80A467CC 016A5821 */ addu $t3, $t3, $t2 +/* 03AA0 80A467D0 856B8174 */ lh $t3, %lo(D_80A48174)($t3) +/* 03AA4 80A467D4 C4248790 */ lwc1 $f4, %lo(D_80A48790)($at) /* 03AA8 80A467D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03AAC 80A467DC 448B8000 */ mtc1 $t3, $f16 ## $f16 = -0.00 /* 03AB0 80A467E0 00000000 */ nop -/* 03AB4 80A467E4 468084A0 */ cvt.s.w $f18, $f16 -/* 03AB8 80A467E8 46049182 */ mul.s $f6, $f18, $f4 -/* 03ABC 80A467EC 4600328D */ trunc.w.s $f10, $f6 -/* 03AC0 80A467F0 440D5000 */ mfc1 $t5, $f10 +/* 03AB4 80A467E4 468084A0 */ cvt.s.w $f18, $f16 +/* 03AB8 80A467E8 46049182 */ mul.s $f6, $f18, $f4 +/* 03ABC 80A467EC 4600328D */ trunc.w.s $f10, $f6 +/* 03AC0 80A467F0 440D5000 */ mfc1 $t5, $f10 /* 03AC4 80A467F4 00000000 */ nop /* 03AC8 80A467F8 A60D01FE */ sh $t5, 0x01FE($s0) ## 000001FE -/* 03ACC 80A467FC 0C291769 */ jal func_80A45DA4 -/* 03AD0 80A46800 8FA50044 */ lw $a1, 0x0044($sp) +/* 03ACC 80A467FC 0C291769 */ jal func_80A45DA4 +/* 03AD0 80A46800 8FA50044 */ lw $a1, 0x0044($sp) /* 03AD4 80A46804 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 03AD8 80A46808 10000050 */ beq $zero, $zero, .L80A4694C +/* 03AD8 80A46808 10000050 */ beq $zero, $zero, .L80A4694C /* 03ADC 80A4680C A20E020F */ sb $t6, 0x020F($s0) ## 0000020F glabel L80A46810 -/* 03AE0 80A46810 00067880 */ sll $t7, $a2, 2 -/* 03AE4 80A46814 01E67821 */ addu $t7, $t7, $a2 -/* 03AE8 80A46818 000F7840 */ sll $t7, $t7, 1 +/* 03AE0 80A46810 00067880 */ sll $t7, $a2, 2 +/* 03AE4 80A46814 01E67821 */ addu $t7, $t7, $a2 +/* 03AE8 80A46818 000F7840 */ sll $t7, $t7, 1 /* 03AEC 80A4681C 3C1880A5 */ lui $t8, %hi(D_80A48174) ## $t8 = 80A50000 -/* 03AF0 80A46820 030FC021 */ addu $t8, $t8, $t7 -/* 03AF4 80A46824 87188174 */ lh $t8, %lo(D_80A48174)($t8) +/* 03AF0 80A46820 030FC021 */ addu $t8, $t8, $t7 +/* 03AF4 80A46824 87188174 */ lh $t8, %lo(D_80A48174)($t8) /* 03AF8 80A46828 3C0180A5 */ lui $at, %hi(D_80A48794) ## $at = 80A50000 -/* 03AFC 80A4682C C4328794 */ lwc1 $f18, %lo(D_80A48794)($at) +/* 03AFC 80A4682C C4328794 */ lwc1 $f18, %lo(D_80A48794)($at) /* 03B00 80A46830 44984000 */ mtc1 $t8, $f8 ## $f8 = -0.00 /* 03B04 80A46834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03B08 80A46838 46804420 */ cvt.s.w $f16, $f8 -/* 03B0C 80A4683C 46128102 */ mul.s $f4, $f16, $f18 -/* 03B10 80A46840 4600218D */ trunc.w.s $f6, $f4 -/* 03B14 80A46844 44083000 */ mfc1 $t0, $f6 +/* 03B08 80A46838 46804420 */ cvt.s.w $f16, $f8 +/* 03B0C 80A4683C 46128102 */ mul.s $f4, $f16, $f18 +/* 03B10 80A46840 4600218D */ trunc.w.s $f6, $f4 +/* 03B14 80A46844 44083000 */ mfc1 $t0, $f6 /* 03B18 80A46848 00000000 */ nop /* 03B1C 80A4684C A60801FE */ sh $t0, 0x01FE($s0) ## 000001FE -/* 03B20 80A46850 0C291769 */ jal func_80A45DA4 -/* 03B24 80A46854 8FA50044 */ lw $a1, 0x0044($sp) -/* 03B28 80A46858 1000003D */ beq $zero, $zero, .L80A46950 -/* 03B2C 80A4685C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03B20 80A46850 0C291769 */ jal func_80A45DA4 +/* 03B24 80A46854 8FA50044 */ lw $a1, 0x0044($sp) +/* 03B28 80A46858 1000003D */ beq $zero, $zero, .L80A46950 +/* 03B2C 80A4685C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A46860 /* 03B30 80A46860 3065FC00 */ andi $a1, $v1, 0xFC00 ## $a1 = 00000000 -/* 03B34 80A46864 00052A83 */ sra $a1, $a1, 10 +/* 03B34 80A46864 00052A83 */ sra $a1, $a1, 10 /* 03B38 80A46868 0C00B2D0 */ jal Flags_GetSwitch - -/* 03B3C 80A4686C 8FA40044 */ lw $a0, 0x0044($sp) -/* 03B40 80A46870 10400005 */ beq $v0, $zero, .L80A46888 + +/* 03B3C 80A4686C 8FA40044 */ lw $a0, 0x0044($sp) +/* 03B40 80A46870 10400005 */ beq $v0, $zero, .L80A46888 /* 03B44 80A46874 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 03B48 80A46878 0C00B55C */ jal Actor_Kill - + /* 03B4C 80A4687C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03B50 80A46880 10000033 */ beq $zero, $zero, .L80A46950 -/* 03B54 80A46884 8FBF002C */ lw $ra, 0x002C($sp) +/* 03B50 80A46880 10000033 */ beq $zero, $zero, .L80A46950 +/* 03B54 80A46884 8FBF002C */ lw $ra, 0x002C($sp) .L80A46888: /* 03B58 80A46888 3C0A80A4 */ lui $t2, %hi(func_80A4696C) ## $t2 = 80A40000 /* 03B5C 80A4688C 254A696C */ addiu $t2, $t2, %lo(func_80A4696C) ## $t2 = 80A4696C /* 03B60 80A46890 A209020F */ sb $t1, 0x020F($s0) ## 0000020F -/* 03B64 80A46894 1000002D */ beq $zero, $zero, .L80A4694C +/* 03B64 80A46894 1000002D */ beq $zero, $zero, .L80A4694C /* 03B68 80A46898 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 glabel L80A4689C /* 03B6C 80A4689C 8E0B0004 */ lw $t3, 0x0004($s0) ## 00000004 /* 03B70 80A468A0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 03B74 80A468A4 AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 -/* 03B78 80A468A8 01616024 */ and $t4, $t3, $at +/* 03B78 80A468A8 01616024 */ and $t4, $t3, $at /* 03B7C 80A468AC AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 /* 03B80 80A468B0 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 /* 03B84 80A468B4 91AD7491 */ lbu $t5, 0x7491($t5) ## 80127491 /* 03B88 80A468B8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 03B8C 80A468BC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 03B90 80A468C0 006D7021 */ addu $t6, $v1, $t5 +/* 03B90 80A468C0 006D7021 */ addu $t6, $v1, $t5 /* 03B94 80A468C4 91C20074 */ lbu $v0, 0x0074($t6) ## 00000074 /* 03B98 80A468C8 3C1980A4 */ lui $t9, %hi(func_80A4696C) ## $t9 = 80A40000 /* 03B9C 80A468CC 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 03BA0 80A468D0 28410033 */ slti $at, $v0, 0x0033 -/* 03BA4 80A468D4 14200005 */ bne $at, $zero, .L80A468EC +/* 03BA0 80A468D0 28410033 */ slti $at, $v0, 0x0033 +/* 03BA4 80A468D4 14200005 */ bne $at, $zero, .L80A468EC /* 03BA8 80A468D8 2739696C */ addiu $t9, $t9, %lo(func_80A4696C) ## $t9 = 80A4696C -/* 03BAC 80A468DC 28410037 */ slti $at, $v0, 0x0037 -/* 03BB0 80A468E0 10200002 */ beq $at, $zero, .L80A468EC +/* 03BAC 80A468DC 28410037 */ slti $at, $v0, 0x0037 +/* 03BB0 80A468E0 10200002 */ beq $at, $zero, .L80A468EC /* 03BB4 80A468E4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 03BB8 80A468E8 A20F0213 */ sb $t7, 0x0213($s0) ## 00000213 .L80A468EC: /* 03BBC 80A468EC A20001CD */ sb $zero, 0x01CD($s0) ## 000001CD /* 03BC0 80A468F0 A21801CE */ sb $t8, 0x01CE($s0) ## 000001CE -/* 03BC4 80A468F4 10000015 */ beq $zero, $zero, .L80A4694C +/* 03BC4 80A468F4 10000015 */ beq $zero, $zero, .L80A4694C /* 03BC8 80A468F8 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 glabel L80A468FC /* 03BCC 80A468FC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 @@ -296,12 +296,12 @@ glabel L80A468FC /* 03BD4 80A46904 94680F14 */ lhu $t0, 0x0F14($v1) ## 8015F574 /* 03BD8 80A46908 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 03BDC 80A4690C 31090800 */ andi $t1, $t0, 0x0800 ## $t1 = 00000000 -/* 03BE0 80A46910 1120000B */ beq $t1, $zero, .L80A46940 +/* 03BE0 80A46910 1120000B */ beq $t1, $zero, .L80A46940 /* 03BE4 80A46914 00000000 */ nop /* 03BE8 80A46918 8E040208 */ lw $a0, 0x0208($s0) ## 00000208 -/* 03BEC 80A4691C 0C023983 */ jal func_8008E60C -/* 03BF0 80A46920 AFA50030 */ sw $a1, 0x0030($sp) -/* 03BF4 80A46924 8FA50030 */ lw $a1, 0x0030($sp) +/* 03BEC 80A4691C 0C023983 */ jal func_8008E60C +/* 03BF0 80A46920 AFA50030 */ sw $a1, 0x0030($sp) +/* 03BF4 80A46924 8FA50030 */ lw $a1, 0x0030($sp) /* 03BF8 80A46928 8CAB0000 */ lw $t3, 0x0000($a1) ## 00000000 /* 03BFC 80A4692C AE0B0008 */ sw $t3, 0x0008($s0) ## 00000008 /* 03C00 80A46930 8CAA0004 */ lw $t2, 0x0004($a1) ## 00000004 @@ -314,11 +314,11 @@ glabel L80A46940 /* 03C14 80A46944 258C696C */ addiu $t4, $t4, %lo(func_80A4696C) ## $t4 = 80A4696C /* 03C18 80A46948 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 .L80A4694C: -/* 03C1C 80A4694C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03C1C 80A4694C 8FBF002C */ lw $ra, 0x002C($sp) .L80A46950: -/* 03C20 80A46950 8FB00028 */ lw $s0, 0x0028($sp) +/* 03C20 80A46950 8FB00028 */ lw $s0, 0x0028($sp) /* 03C24 80A46954 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 03C28 80A46958 03E00008 */ jr $ra +/* 03C28 80A46958 03E00008 */ jr $ra /* 03C2C 80A4695C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s index 89ff947d8d..22c8d33b7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s @@ -1,66 +1,66 @@ glabel EnGoma_Init /* 00000 80A48EC0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80A48EC4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00008 80A48EC8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80A48EC4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00008 80A48EC8 AFB00028 */ sw $s0, 0x0028($sp) /* 0000C 80A48ECC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00010 80A48ED0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 00014 80A48ED4 AFA50044 */ sw $a1, 0x0044($sp) +/* 00014 80A48ED4 AFA50044 */ sw $a1, 0x0044($sp) /* 00018 80A48ED8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0001C 80A48EDC 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 /* 00020 80A48EE0 3C0580A5 */ lui $a1, %hi(D_80A4B808) ## $a1 = 80A50000 /* 00024 80A48EE4 24A5B808 */ addiu $a1, $a1, %lo(D_80A4B808) ## $a1 = 80A4B808 -/* 00028 80A48EE8 46040182 */ mul.s $f6, $f0, $f4 +/* 00028 80A48EE8 46040182 */ mul.s $f6, $f0, $f4 /* 0002C 80A48EEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00030 80A48EF0 4600320D */ trunc.w.s $f8, $f6 -/* 00034 80A48EF4 440F4000 */ mfc1 $t7, $f8 +/* 00030 80A48EF0 4600320D */ trunc.w.s $f8, $f6 +/* 00034 80A48EF4 440F4000 */ mfc1 $t7, $f8 /* 00038 80A48EF8 0C01E037 */ jal Actor_ProcessInitChain - + /* 0003C 80A48EFC A60F02C0 */ sh $t7, 0x02C0($s0) ## 000002C0 /* 00040 80A48F00 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00044 80A48F04 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00048 80A48F08 0C00B58B */ jal Actor_SetScale - + /* 0004C 80A48F0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00050 80A48F10 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00054 80A48F14 8FA40044 */ lw $a0, 0x0044($sp) +/* 00054 80A48F14 8FA40044 */ lw $a0, 0x0044($sp) /* 00058 80A48F18 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0005C 80A48F1C 28410064 */ slti $at, $v0, 0x0064 -/* 00060 80A48F20 14200017 */ bne $at, $zero, .L80A48F80 +/* 0005C 80A48F1C 28410064 */ slti $at, $v0, 0x0064 +/* 00060 80A48F20 14200017 */ bne $at, $zero, .L80A48F80 /* 00064 80A48F24 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 /* 00068 80A48F28 0C00CDD2 */ jal Actor_ChangeType - + /* 0006C 80A48F2C 24070009 */ addiu $a3, $zero, 0x0009 ## $a3 = 00000009 /* 00070 80A48F30 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00074 80A48F34 3C1880A5 */ lui $t8, %hi(func_80A4B554) ## $t8 = 80A50000 /* 00078 80A48F38 2718B554 */ addiu $t8, $t8, %lo(func_80A4B554) ## $t8 = 80A4B554 /* 0007C 80A48F3C 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 00080 80A48F40 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00084 80A48F44 44051000 */ mfc1 $a1, $f2 -/* 00088 80A48F48 44071000 */ mfc1 $a3, $f2 +/* 00084 80A48F44 44051000 */ mfc1 $a1, $f2 +/* 00088 80A48F48 44071000 */ mfc1 $a3, $f2 /* 0008C 80A48F4C AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 /* 00090 80A48F50 A61902B8 */ sh $t9, 0x02B8($s0) ## 000002B8 /* 00094 80A48F54 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00098 80A48F58 0C00AC78 */ jal ActorShape_Init - + /* 0009C 80A48F5C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 000A0 80A48F60 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 000A4 80A48F64 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 000A8 80A48F68 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 000AC 80A48F6C 25090096 */ addiu $t1, $t0, 0x0096 ## $t1 = 00000096 -/* 000B0 80A48F70 01415824 */ and $t3, $t2, $at +/* 000B0 80A48F70 01415824 */ and $t3, $t2, $at /* 000B4 80A48F74 A60902CC */ sh $t1, 0x02CC($s0) ## 000002CC -/* 000B8 80A48F78 100000AE */ beq $zero, $zero, .L80A49234 +/* 000B8 80A48F78 100000AE */ beq $zero, $zero, .L80A49234 /* 000BC 80A48F7C AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 .L80A48F80: -/* 000C0 80A48F80 2841000A */ slti $at, $v0, 0x000A -/* 000C4 80A48F84 14200043 */ bne $at, $zero, .L80A49094 +/* 000C0 80A48F80 2841000A */ slti $at, $v0, 0x000A +/* 000C4 80A48F84 14200043 */ bne $at, $zero, .L80A49094 /* 000C8 80A48F88 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 000CC 80A48F8C 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 /* 000D0 80A48F90 3C0180A5 */ lui $at, %hi(D_80A4B8F0) ## $at = 80A50000 -/* 000D4 80A48F94 C42AB8F0 */ lwc1 $f10, %lo(D_80A4B8F0)($at) +/* 000D4 80A48F94 C42AB8F0 */ lwc1 $f10, %lo(D_80A4B8F0)($at) /* 000D8 80A48F98 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 000DC 80A48F9C 01816824 */ and $t5, $t4, $at +/* 000DC 80A48F9C 01816824 */ and $t5, $t4, $at /* 000E0 80A48FA0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 000E4 80A48FA4 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 /* 000E8 80A48FA8 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 @@ -76,65 +76,65 @@ glabel EnGoma_Init /* 0010C 80A48FCC 44811000 */ mtc1 $at, $f2 ## $f2 = 5.00 /* 00110 80A48FD0 3C1880A5 */ lui $t8, %hi(func_80A4B3AC) ## $t8 = 80A50000 /* 00114 80A48FD4 2718B3AC */ addiu $t8, $t8, %lo(func_80A4B3AC) ## $t8 = 80A4B3AC -/* 00118 80A48FD8 46020482 */ mul.s $f18, $f0, $f2 +/* 00118 80A48FD8 46020482 */ mul.s $f18, $f0, $f2 /* 0011C 80A48FDC AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 -/* 00120 80A48FE0 46029100 */ add.s $f4, $f18, $f2 +/* 00120 80A48FE0 46029100 */ add.s $f4, $f18, $f2 /* 00124 80A48FE4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00128 80A48FE8 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 0012C 80A48FEC 3C0180A5 */ lui $at, %hi(D_80A4B8F4) ## $at = 80A50000 -/* 00130 80A48FF0 C426B8F4 */ lwc1 $f6, %lo(D_80A4B8F4)($at) +/* 00130 80A48FF0 C426B8F4 */ lwc1 $f6, %lo(D_80A4B8F4)($at) /* 00134 80A48FF4 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 00138 80A48FF8 44815000 */ mtc1 $at, $f10 ## $f10 = 1.50 -/* 0013C 80A48FFC 46060202 */ mul.s $f8, $f0, $f6 +/* 0013C 80A48FFC 46060202 */ mul.s $f8, $f0, $f6 /* 00140 80A49000 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 00144 80A49004 A61902CC */ sh $t9, 0x02CC($s0) ## 000002CC -/* 00148 80A49008 460A4400 */ add.s $f16, $f8, $f10 +/* 00148 80A49008 460A4400 */ add.s $f16, $f8, $f10 /* 0014C 80A4900C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00150 80A49010 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 00154 80A49014 3C0180A5 */ lui $at, %hi(D_80A4B8F8) ## $at = 80A50000 -/* 00158 80A49018 C432B8F8 */ lwc1 $f18, %lo(D_80A4B8F8)($at) +/* 00158 80A49018 C432B8F8 */ lwc1 $f18, %lo(D_80A4B8F8)($at) /* 0015C 80A4901C 3C0180A5 */ lui $at, %hi(D_80A4B8FC) ## $at = 80A50000 -/* 00160 80A49020 C426B8FC */ lwc1 $f6, %lo(D_80A4B8FC)($at) -/* 00164 80A49024 46120102 */ mul.s $f4, $f0, $f18 -/* 00168 80A49028 46062200 */ add.s $f8, $f4, $f6 +/* 00160 80A49020 C426B8FC */ lwc1 $f6, %lo(D_80A4B8FC)($at) +/* 00164 80A49024 46120102 */ mul.s $f4, $f0, $f18 +/* 00168 80A49028 46062200 */ add.s $f8, $f4, $f6 /* 0016C 80A4902C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00170 80A49030 E6080050 */ swc1 $f8, 0x0050($s0) ## 00000050 /* 00174 80A49034 3C0180A5 */ lui $at, %hi(D_80A4B900) ## $at = 80A50000 -/* 00178 80A49038 C42AB900 */ lwc1 $f10, %lo(D_80A4B900)($at) +/* 00178 80A49038 C42AB900 */ lwc1 $f10, %lo(D_80A4B900)($at) /* 0017C 80A4903C 3C0180A5 */ lui $at, %hi(D_80A4B904) ## $at = 80A50000 -/* 00180 80A49040 C432B904 */ lwc1 $f18, %lo(D_80A4B904)($at) -/* 00184 80A49044 460A0402 */ mul.s $f16, $f0, $f10 -/* 00188 80A49048 46128100 */ add.s $f4, $f16, $f18 +/* 00180 80A49040 C432B904 */ lwc1 $f18, %lo(D_80A4B904)($at) +/* 00184 80A49044 460A0402 */ mul.s $f16, $f0, $f10 +/* 00188 80A49048 46128100 */ add.s $f4, $f16, $f18 /* 0018C 80A4904C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00190 80A49050 E6040054 */ swc1 $f4, 0x0054($s0) ## 00000054 /* 00194 80A49054 3C0180A5 */ lui $at, %hi(D_80A4B908) ## $at = 80A50000 -/* 00198 80A49058 C426B908 */ lwc1 $f6, %lo(D_80A4B908)($at) +/* 00198 80A49058 C426B908 */ lwc1 $f6, %lo(D_80A4B908)($at) /* 0019C 80A4905C 3C0180A5 */ lui $at, %hi(D_80A4B90C) ## $at = 80A50000 -/* 001A0 80A49060 C42AB90C */ lwc1 $f10, %lo(D_80A4B90C)($at) -/* 001A4 80A49064 46060202 */ mul.s $f8, $f0, $f6 +/* 001A0 80A49060 C42AB90C */ lwc1 $f10, %lo(D_80A4B90C)($at) +/* 001A4 80A49064 46060202 */ mul.s $f8, $f0, $f6 /* 001A8 80A49068 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 001AC 80A4906C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 001B0 80A49070 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 001B4 80A49074 44051000 */ mfc1 $a1, $f2 -/* 001B8 80A49078 44071000 */ mfc1 $a3, $f2 +/* 001B4 80A49074 44051000 */ mfc1 $a1, $f2 +/* 001B8 80A49078 44071000 */ mfc1 $a3, $f2 /* 001BC 80A4907C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 001C0 80A49080 460A4400 */ add.s $f16, $f8, $f10 +/* 001C0 80A49080 460A4400 */ add.s $f16, $f8, $f10 /* 001C4 80A49084 0C00AC78 */ jal ActorShape_Init - + /* 001C8 80A49088 E6100058 */ swc1 $f16, 0x0058($s0) ## 00000058 -/* 001CC 80A4908C 1000006A */ beq $zero, $zero, .L80A49238 -/* 001D0 80A49090 8FBF002C */ lw $ra, 0x002C($sp) +/* 001CC 80A4908C 1000006A */ beq $zero, $zero, .L80A49238 +/* 001D0 80A49090 8FBF002C */ lw $ra, 0x002C($sp) .L80A49094: /* 001D4 80A49094 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 001D8 80A49098 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 001DC 80A4909C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 001E0 80A490A0 44051000 */ mfc1 $a1, $f2 +/* 001E0 80A490A0 44051000 */ mfc1 $a1, $f2 /* 001E4 80A490A4 0C00AC78 */ jal ActorShape_Init - + /* 001E8 80A490A8 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 001EC 80A490AC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 001F0 80A490B0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -142,24 +142,24 @@ glabel EnGoma_Init /* 001F8 80A490B8 26080190 */ addiu $t0, $s0, 0x0190 ## $t0 = 00000190 /* 001FC 80A490BC 26090220 */ addiu $t1, $s0, 0x0220 ## $t1 = 00000220 /* 00200 80A490C0 240A0018 */ addiu $t2, $zero, 0x0018 ## $t2 = 00000018 -/* 00204 80A490C4 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00208 80A490C8 AFA90014 */ sw $t1, 0x0014($sp) -/* 0020C 80A490CC AFA80010 */ sw $t0, 0x0010($sp) +/* 00204 80A490C4 AFAA0018 */ sw $t2, 0x0018($sp) +/* 00208 80A490C8 AFA90014 */ sw $t1, 0x0014($sp) +/* 0020C 80A490CC AFA80010 */ sw $t0, 0x0010($sp) /* 00210 80A490D0 24E71548 */ addiu $a3, $a3, 0x1548 ## $a3 = 06001548 /* 00214 80A490D4 24C63B40 */ addiu $a2, $a2, 0x3B40 ## $a2 = 06003B40 -/* 00218 80A490D8 AFA50034 */ sw $a1, 0x0034($sp) +/* 00218 80A490D8 AFA50034 */ sw $a1, 0x0034($sp) /* 0021C 80A490DC 0C02915F */ jal SkelAnime_Init - -/* 00220 80A490E0 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00220 80A490E0 8FA40044 */ lw $a0, 0x0044($sp) /* 00224 80A490E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00228 80A490E8 24A51548 */ addiu $a1, $a1, 0x1548 ## $a1 = 06001548 -/* 0022C 80A490EC 0C0294BE */ jal func_800A52F8 -/* 00230 80A490F0 8FA40034 */ lw $a0, 0x0034($sp) +/* 0022C 80A490EC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00230 80A490F0 8FA40034 */ lw $a0, 0x0034($sp) /* 00234 80A490F4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00238 80A490F8 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 0023C 80A490FC A20B00AF */ sb $t3, 0x00AF($s0) ## 000000AF -/* 00240 80A49100 28410003 */ slti $at, $v0, 0x0003 -/* 00244 80A49104 1020000A */ beq $at, $zero, .L80A49130 +/* 00240 80A49100 28410003 */ slti $at, $v0, 0x0003 +/* 00244 80A49104 1020000A */ beq $at, $zero, .L80A49130 /* 00248 80A49108 3C0C80A5 */ lui $t4, %hi(func_80A493D8) ## $t4 = 80A50000 /* 0024C 80A4910C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 00250 80A49110 44819000 */ mtc1 $at, $f18 ## $f18 = 1.50 @@ -168,14 +168,14 @@ glabel EnGoma_Init /* 0025C 80A4911C AE0C02B0 */ sw $t4, 0x02B0($s0) ## 000002B0 /* 00260 80A49120 A60D02CA */ sh $t5, 0x02CA($s0) ## 000002CA /* 00264 80A49124 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00268 80A49128 10000019 */ beq $zero, $zero, .L80A49190 +/* 00268 80A49128 10000019 */ beq $zero, $zero, .L80A49190 /* 0026C 80A4912C E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 .L80A49130: /* 00270 80A49130 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00274 80A49134 10410003 */ beq $v0, $at, .L80A49144 +/* 00274 80A49134 10410003 */ beq $v0, $at, .L80A49144 /* 00278 80A49138 3C0380A5 */ lui $v1, %hi(D_80A4B7F8) ## $v1 = 80A50000 /* 0027C 80A4913C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00280 80A49140 1441000B */ bne $v0, $at, .L80A49170 +/* 00280 80A49140 1441000B */ bne $v0, $at, .L80A49170 .L80A49144: /* 00284 80A49144 3C0E80A5 */ lui $t6, %hi(func_80A49668) ## $t6 = 80A50000 /* 00288 80A49148 25CE9668 */ addiu $t6, $t6, %lo(func_80A49668) ## $t6 = 80A49668 @@ -186,29 +186,29 @@ glabel EnGoma_Init /* 0029C 80A4915C 90780000 */ lbu $t8, 0x0000($v1) ## 80A4B7F8 /* 002A0 80A49160 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 002A4 80A49164 A0790000 */ sb $t9, 0x0000($v1) ## 80A4B7F8 -/* 002A8 80A49168 10000009 */ beq $zero, $zero, .L80A49190 +/* 002A8 80A49168 10000009 */ beq $zero, $zero, .L80A49190 /* 002AC 80A4916C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80A49170: /* 002B0 80A49170 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 002B4 80A49174 10410002 */ beq $v0, $at, .L80A49180 +/* 002B4 80A49174 10410002 */ beq $v0, $at, .L80A49180 /* 002B8 80A49178 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 002BC 80A4917C 14410004 */ bne $v0, $at, .L80A49190 +/* 002BC 80A4917C 14410004 */ bne $v0, $at, .L80A49190 .L80A49180: /* 002C0 80A49180 3C0880A5 */ lui $t0, %hi(func_80A49668) ## $t0 = 80A50000 /* 002C4 80A49184 25089668 */ addiu $t0, $t0, %lo(func_80A49668) ## $t0 = 80A49668 /* 002C8 80A49188 AE0802B0 */ sw $t0, 0x02B0($s0) ## 000002B0 /* 002CC 80A4918C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80A49190: -/* 002D0 80A49190 28410008 */ slti $at, $v0, 0x0008 -/* 002D4 80A49194 14200005 */ bne $at, $zero, .L80A491AC +/* 002D0 80A49190 28410008 */ slti $at, $v0, 0x0008 +/* 002D4 80A49194 14200005 */ bne $at, $zero, .L80A491AC /* 002D8 80A49198 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 002DC 80A4919C 3C0180A5 */ lui $at, %hi(D_80A4B910) ## $at = 80A50000 -/* 002E0 80A491A0 C424B910 */ lwc1 $f4, %lo(D_80A4B910)($at) -/* 002E4 80A491A4 10000004 */ beq $zero, $zero, .L80A491B8 +/* 002E0 80A491A0 C424B910 */ lwc1 $f4, %lo(D_80A4B910)($at) +/* 002E4 80A491A4 10000004 */ beq $zero, $zero, .L80A491B8 /* 002E8 80A491A8 E60402F0 */ swc1 $f4, 0x02F0($s0) ## 000002F0 .L80A491AC: /* 002EC 80A491AC 3C0180A5 */ lui $at, %hi(D_80A4B914) ## $at = 80A50000 -/* 002F0 80A491B0 C426B914 */ lwc1 $f6, %lo(D_80A4B914)($at) +/* 002F0 80A491B0 C426B914 */ lwc1 $f6, %lo(D_80A4B914)($at) /* 002F4 80A491B4 E60602F0 */ swc1 $f6, 0x02F0($s0) ## 000002F0 .L80A491B8: /* 002F8 80A491B8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -221,38 +221,38 @@ glabel EnGoma_Init /* 00310 80A491D0 44815000 */ mtc1 $at, $f10 ## $f10 = 1000.00 /* 00314 80A491D4 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 /* 00318 80A491D8 A60A02CC */ sh $t2, 0x02CC($s0) ## 000002CC -/* 0031C 80A491DC 460A0402 */ mul.s $f16, $f0, $f10 +/* 0031C 80A491DC 460A0402 */ mul.s $f16, $f0, $f10 /* 00320 80A491E0 2605030C */ addiu $a1, $s0, 0x030C ## $a1 = 0000030C /* 00324 80A491E4 E61002D8 */ swc1 $f16, 0x02D8($s0) ## 000002D8 -/* 00328 80A491E8 AFA50034 */ sw $a1, 0x0034($sp) +/* 00328 80A491E8 AFA50034 */ sw $a1, 0x0034($sp) /* 0032C 80A491EC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00330 80A491F0 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00330 80A491F0 8FA40044 */ lw $a0, 0x0044($sp) /* 00334 80A491F4 3C0780A5 */ lui $a3, %hi(D_80A4B7A0) ## $a3 = 80A50000 -/* 00338 80A491F8 8FA50034 */ lw $a1, 0x0034($sp) +/* 00338 80A491F8 8FA50034 */ lw $a1, 0x0034($sp) /* 0033C 80A491FC 24E7B7A0 */ addiu $a3, $a3, %lo(D_80A4B7A0) ## $a3 = 80A4B7A0 -/* 00340 80A49200 8FA40044 */ lw $a0, 0x0044($sp) +/* 00340 80A49200 8FA40044 */ lw $a0, 0x0044($sp) /* 00344 80A49204 0C01712B */ jal ActorCollider_InitCylinder - + /* 00348 80A49208 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0034C 80A4920C 26050358 */ addiu $a1, $s0, 0x0358 ## $a1 = 00000358 -/* 00350 80A49210 AFA50034 */ sw $a1, 0x0034($sp) +/* 00350 80A49210 AFA50034 */ sw $a1, 0x0034($sp) /* 00354 80A49214 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00358 80A49218 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00358 80A49218 8FA40044 */ lw $a0, 0x0044($sp) /* 0035C 80A4921C 3C0780A5 */ lui $a3, %hi(D_80A4B7CC) ## $a3 = 80A50000 -/* 00360 80A49220 8FA50034 */ lw $a1, 0x0034($sp) +/* 00360 80A49220 8FA50034 */ lw $a1, 0x0034($sp) /* 00364 80A49224 24E7B7CC */ addiu $a3, $a3, %lo(D_80A4B7CC) ## $a3 = 80A4B7CC -/* 00368 80A49228 8FA40044 */ lw $a0, 0x0044($sp) +/* 00368 80A49228 8FA40044 */ lw $a0, 0x0044($sp) /* 0036C 80A4922C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00370 80A49230 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 .L80A49234: -/* 00374 80A49234 8FBF002C */ lw $ra, 0x002C($sp) +/* 00374 80A49234 8FBF002C */ lw $ra, 0x002C($sp) .L80A49238: -/* 00378 80A49238 8FB00028 */ lw $s0, 0x0028($sp) +/* 00378 80A49238 8FB00028 */ lw $s0, 0x0028($sp) /* 0037C 80A4923C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00380 80A49240 03E00008 */ jr $ra +/* 00380 80A49240 03E00008 */ jr $ra /* 00384 80A49244 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s index c21b271dd9..90a3d04286 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s @@ -1,7 +1,7 @@ glabel func_80A4A470 /* 015B0 80A4A470 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 015B4 80A4A474 AFA5001C */ sw $a1, 0x001C($sp) -/* 015B8 80A4A478 AFBF0014 */ sw $ra, 0x0014($sp) +/* 015B4 80A4A474 AFA5001C */ sw $a1, 0x001C($sp) +/* 015B8 80A4A478 AFBF0014 */ sw $ra, 0x0014($sp) /* 015BC 80A4A47C 3C0E80A5 */ lui $t6, %hi(func_80A4A50C) ## $t6 = 80A50000 /* 015C0 80A4A480 25CEA50C */ addiu $t6, $t6, %lo(func_80A4A50C) ## $t6 = 80A4A50C /* 015C4 80A4A484 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 @@ -10,38 +10,38 @@ glabel func_80A4A470 /* 015D0 80A4A490 A48F02F8 */ sh $t7, 0x02F8($a0) ## 000002F8 /* 015D4 80A4A494 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 015D8 80A4A498 24A51548 */ addiu $a1, $a1, 0x1548 ## $a1 = 06001548 -/* 015DC 80A4A49C AFA70018 */ sw $a3, 0x0018($sp) +/* 015DC 80A4A49C AFA70018 */ sw $a3, 0x0018($sp) /* 015E0 80A4A4A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 015E4 80A4A4A4 0C0294D3 */ jal func_800A534C +/* 015E4 80A4A4A4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 015E8 80A4A4A8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 015EC 80A4A4AC 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 015F0 80A4A4B0 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 /* 015F4 80A4A4B4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 015F8 80A4A4B8 00000000 */ nop -/* 015FC 80A4A4BC 4600010D */ trunc.w.s $f4, $f0 -/* 01600 80A4A4C0 8FA70018 */ lw $a3, 0x0018($sp) +/* 015FC 80A4A4BC 4600010D */ trunc.w.s $f4, $f0 +/* 01600 80A4A4C0 8FA70018 */ lw $a3, 0x0018($sp) /* 01604 80A4A4C4 2405381F */ addiu $a1, $zero, 0x381F ## $a1 = 0000381F -/* 01608 80A4A4C8 44092000 */ mfc1 $t1, $f4 +/* 01608 80A4A4C8 44092000 */ mfc1 $t1, $f4 /* 0160C 80A4A4CC 84EB001C */ lh $t3, 0x001C($a3) ## 0000001C /* 01610 80A4A4D0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 01614 80A4A4D4 252A0003 */ addiu $t2, $t1, 0x0003 ## $t2 = 00000003 -/* 01618 80A4A4D8 29610006 */ slti $at, $t3, 0x0006 -/* 0161C 80A4A4DC 10200005 */ beq $at, $zero, .L80A4A4F4 +/* 01618 80A4A4D8 29610006 */ slti $at, $t3, 0x0006 +/* 0161C 80A4A4DC 10200005 */ beq $at, $zero, .L80A4A4F4 /* 01620 80A4A4E0 A4EA02CC */ sh $t2, 0x02CC($a3) ## 000002CC /* 01624 80A4A4E4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01628 80A4A4E8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0162C 80A4A4EC 10000004 */ beq $zero, $zero, .L80A4A500 -/* 01630 80A4A4F0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0162C 80A4A4EC 10000004 */ beq $zero, $zero, .L80A4A500 +/* 01630 80A4A4F0 8FBF0014 */ lw $ra, 0x0014($sp) .L80A4A4F4: /* 01634 80A4A4F4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01638 80A4A4F8 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E -/* 0163C 80A4A4FC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0163C 80A4A4FC 8FBF0014 */ lw $ra, 0x0014($sp) .L80A4A500: /* 01640 80A4A500 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01644 80A4A504 03E00008 */ jr $ra +/* 01644 80A4A504 03E00008 */ jr $ra /* 01648 80A4A508 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s index 7a09d39a22..dfe058384e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s @@ -1,68 +1,68 @@ glabel EnGuest_Update /* 000DC 80A502FC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 000E0 80A50300 AFB00024 */ sw $s0, 0x0024($sp) +/* 000E0 80A50300 AFB00024 */ sw $s0, 0x0024($sp) /* 000E4 80A50304 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 000E8 80A50308 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000EC 80A5030C AFB10028 */ sw $s1, 0x0028($sp) +/* 000EC 80A5030C AFB10028 */ sw $s1, 0x0028($sp) /* 000F0 80A50310 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 000F4 80A50314 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 000F8 80A50318 AFBF002C */ sw $ra, 0x002C($sp) -/* 000FC 80A5031C 00A12021 */ addu $a0, $a1, $at +/* 000F8 80A50318 AFBF002C */ sw $ra, 0x002C($sp) +/* 000FC 80A5031C 00A12021 */ addu $a0, $a1, $at /* 00100 80A50320 0C026062 */ jal Object_IsLoaded - + /* 00104 80A50324 8205030C */ lb $a1, 0x030C($s0) ## 0000030C -/* 00108 80A50328 1040004B */ beq $v0, $zero, .L80A50458 +/* 00108 80A50328 1040004B */ beq $v0, $zero, .L80A50458 /* 0010C 80A5032C 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 00110 80A50330 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00114 80A50334 3C0580A5 */ lui $a1, %hi(D_80A50B9C) ## $a1 = 80A50000 /* 00118 80A50338 24A50B9C */ addiu $a1, $a1, %lo(D_80A50B9C) ## $a1 = 80A50B9C -/* 0011C 80A5033C 01C17824 */ and $t7, $t6, $at +/* 0011C 80A5033C 01C17824 */ and $t7, $t6, $at /* 00120 80A50340 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 00124 80A50344 0C01E037 */ jal Actor_ProcessInitChain - + /* 00128 80A50348 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0012C 80A5034C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00130 80A50350 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00134 80A50354 26180190 */ addiu $t8, $s0, 0x0190 ## $t8 = 00000190 /* 00138 80A50358 261901F0 */ addiu $t9, $s0, 0x01F0 ## $t9 = 000001F0 /* 0013C 80A5035C 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 -/* 00140 80A50360 AFA80018 */ sw $t0, 0x0018($sp) -/* 00144 80A50364 AFB90014 */ sw $t9, 0x0014($sp) -/* 00148 80A50368 AFB80010 */ sw $t8, 0x0010($sp) +/* 00140 80A50360 AFA80018 */ sw $t0, 0x0018($sp) +/* 00144 80A50364 AFB90014 */ sw $t9, 0x0014($sp) +/* 00148 80A50368 AFB80010 */ sw $t8, 0x0010($sp) /* 0014C 80A5036C 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 00150 80A50370 AFA50030 */ sw $a1, 0x0030($sp) +/* 00150 80A50370 AFA50030 */ sw $a1, 0x0030($sp) /* 00154 80A50374 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00158 80A50378 0C0291BE */ jal func_800A46F8 +/* 00158 80A50378 0C0291BE */ jal SkelAnime_InitSV /* 0015C 80A5037C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00160 80A50380 8209030C */ lb $t1, 0x030C($s0) ## 0000030C /* 00164 80A50384 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 /* 00168 80A50388 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0016C 80A5038C 00095100 */ sll $t2, $t1, 4 -/* 00170 80A50390 01495021 */ addu $t2, $t2, $t1 -/* 00174 80A50394 000A5080 */ sll $t2, $t2, 2 -/* 00178 80A50398 022A5821 */ addu $t3, $s1, $t2 -/* 0017C 80A5039C 018B6021 */ addu $t4, $t4, $t3 +/* 0016C 80A5038C 00095100 */ sll $t2, $t1, 4 +/* 00170 80A50390 01495021 */ addu $t2, $t2, $t1 +/* 00174 80A50394 000A5080 */ sll $t2, $t2, 2 +/* 00178 80A50398 022A5821 */ addu $t3, $s1, $t2 +/* 0017C 80A5039C 018B6021 */ addu $t4, $t4, $t3 /* 00180 80A503A0 8D8C17B4 */ lw $t4, 0x17B4($t4) ## 000117B4 /* 00184 80A503A4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00188 80A503A8 248442AC */ addiu $a0, $a0, 0x42AC ## $a0 = 060042AC -/* 0018C 80A503AC 01816821 */ addu $t5, $t4, $at +/* 0018C 80A503AC 01816821 */ addu $t5, $t4, $at /* 00190 80A503B0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00194 80A503B4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00198 80A503B8 AC2D6FC0 */ sw $t5, 0x6FC0($at) ## 80166FC0 /* 0019C 80A503BC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 001A0 80A503C0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001A4 80A503C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001A8 80A503C8 468021A0 */ cvt.s.w $f6, $f4 -/* 001AC 80A503CC 44070000 */ mfc1 $a3, $f0 +/* 001A8 80A503C8 468021A0 */ cvt.s.w $f6, $f4 +/* 001AC 80A503CC 44070000 */ mfc1 $a3, $f0 /* 001B0 80A503D0 24A542AC */ addiu $a1, $a1, 0x42AC ## $a1 = 060042AC -/* 001B4 80A503D4 8FA40030 */ lw $a0, 0x0030($sp) +/* 001B4 80A503D4 8FA40030 */ lw $a0, 0x0030($sp) /* 001B8 80A503D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 001BC 80A503DC AFA00014 */ sw $zero, 0x0014($sp) -/* 001C0 80A503E0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 001BC 80A503DC AFA00014 */ sw $zero, 0x0014($sp) +/* 001C0 80A503E0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 001C4 80A503E4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 001C8 80A503E8 E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 001C8 80A503E8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 001CC 80A503EC 3C0E80A5 */ lui $t6, %hi(func_80A509D4) ## $t6 = 80A50000 /* 001D0 80A503F0 3C0F80A5 */ lui $t7, %hi(func_80A505CC) ## $t7 = 80A50000 /* 001D4 80A503F4 25CE09D4 */ addiu $t6, $t6, %lo(func_80A509D4) ## $t6 = 80A509D4 @@ -70,19 +70,19 @@ glabel EnGuest_Update /* 001DC 80A503FC AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 /* 001E0 80A50400 AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 /* 001E4 80A50404 26050254 */ addiu $a1, $s0, 0x0254 ## $a1 = 00000254 -/* 001E8 80A50408 AFA50030 */ sw $a1, 0x0030($sp) +/* 001E8 80A50408 AFA50030 */ sw $a1, 0x0030($sp) /* 001EC 80A5040C 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 001F0 80A50410 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001F4 80A50414 3C0780A5 */ lui $a3, %hi(D_80A50B70) ## $a3 = 80A50000 -/* 001F8 80A50418 8FA50030 */ lw $a1, 0x0030($sp) +/* 001F8 80A50418 8FA50030 */ lw $a1, 0x0030($sp) /* 001FC 80A5041C 24E70B70 */ addiu $a3, $a3, %lo(D_80A50B70) ## $a3 = 80A50B70 /* 00200 80A50420 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00204 80A50424 0C017114 */ jal func_8005C450 +/* 00204 80A50424 0C017114 */ jal func_8005C450 /* 00208 80A50428 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0020C 80A5042C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00210 80A50430 0C00B56E */ jal Actor_SetHeight - + /* 00214 80A50434 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 /* 00218 80A50438 3C1980A5 */ lui $t9, %hi(func_80A50518) ## $t9 = 80A50000 /* 0021C 80A5043C 2418700D */ addiu $t8, $zero, 0x700D ## $t8 = 0000700D @@ -93,10 +93,10 @@ glabel EnGuest_Update /* 00230 80A50450 A618010E */ sh $t8, 0x010E($s0) ## 0000010E /* 00234 80A50454 AE190250 */ sw $t9, 0x0250($s0) ## 00000250 .L80A50458: -/* 00238 80A50458 8FBF002C */ lw $ra, 0x002C($sp) -/* 0023C 80A5045C 8FB00024 */ lw $s0, 0x0024($sp) -/* 00240 80A50460 8FB10028 */ lw $s1, 0x0028($sp) -/* 00244 80A50464 03E00008 */ jr $ra +/* 00238 80A50458 8FBF002C */ lw $ra, 0x002C($sp) +/* 0023C 80A5045C 8FB00024 */ lw $s0, 0x0024($sp) +/* 00240 80A50460 8FB10028 */ lw $s1, 0x0028($sp) +/* 00244 80A50464 03E00008 */ jr $ra /* 00248 80A50468 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s index aabb929870..69adb0928d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s @@ -1,19 +1,19 @@ glabel func_80A509D4 /* 007B4 80A509D4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 007B8 80A509D8 AFB1002C */ sw $s1, 0x002C($sp) +/* 007B8 80A509D8 AFB1002C */ sw $s1, 0x002C($sp) /* 007BC 80A509DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 007C0 80A509E0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 007C4 80A509E4 AFB20030 */ sw $s2, 0x0030($sp) -/* 007C8 80A509E8 AFB00028 */ sw $s0, 0x0028($sp) +/* 007C0 80A509E0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 007C4 80A509E4 AFB20030 */ sw $s2, 0x0030($sp) +/* 007C8 80A509E8 AFB00028 */ sw $s0, 0x0028($sp) /* 007CC 80A509EC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 007D0 80A509F0 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 007D4 80A509F4 3C0680A5 */ lui $a2, %hi(D_80A50C24) ## $a2 = 80A50000 /* 007D8 80A509F8 24C60C24 */ addiu $a2, $a2, %lo(D_80A50C24) ## $a2 = 80A50C24 /* 007DC 80A509FC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 007E0 80A50A00 24070194 */ addiu $a3, $zero, 0x0194 ## $a3 = 00000194 -/* 007E4 80A50A04 0C031AB1 */ jal func_800C6AC4 +/* 007E4 80A50A04 0C031AB1 */ jal func_800C6AC4 /* 007E8 80A50A08 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 007EC 80A50A0C 0C024F46 */ jal func_80093D18 +/* 007EC 80A50A0C 0C024F46 */ jal func_80093D18 /* 007F0 80A50A10 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 007F4 80A50A14 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 007F8 80A50A18 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -23,13 +23,13 @@ glabel func_80A509D4 /* 00808 80A50A28 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0080C 80A50A2C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 00810 80A50A30 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00814 80A50A34 AFB80010 */ sw $t8, 0x0010($sp) +/* 00814 80A50A34 AFB80010 */ sw $t8, 0x0010($sp) /* 00818 80A50A38 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 0081C 80A50A3C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 00820 80A50A40 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 00824 80A50A44 0C2941C2 */ jal func_80A50708 -/* 00828 80A50A48 AFA20048 */ sw $v0, 0x0048($sp) -/* 0082C 80A50A4C 8FA30048 */ lw $v1, 0x0048($sp) +/* 00824 80A50A44 0C2941C2 */ jal func_80A50708 +/* 00828 80A50A48 AFA20048 */ sw $v0, 0x0048($sp) +/* 0082C 80A50A4C 8FA30048 */ lw $v1, 0x0048($sp) /* 00830 80A50A50 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 /* 00834 80A50A54 35080024 */ ori $t0, $t0, 0x0024 ## $t0 = DB060024 /* 00838 80A50A58 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -40,12 +40,12 @@ glabel func_80A509D4 /* 0084C 80A50A6C AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 00850 80A50A70 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 00854 80A50A74 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00858 80A50A78 AFA90010 */ sw $t1, 0x0010($sp) +/* 00858 80A50A78 AFA90010 */ sw $t1, 0x0010($sp) /* 0085C 80A50A7C 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C /* 00860 80A50A80 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC -/* 00864 80A50A84 0C2941C2 */ jal func_80A50708 -/* 00868 80A50A88 AFA20044 */ sw $v0, 0x0044($sp) -/* 0086C 80A50A8C 8FA30044 */ lw $v1, 0x0044($sp) +/* 00864 80A50A84 0C2941C2 */ jal func_80A50708 +/* 00868 80A50A88 AFA20044 */ sw $v0, 0x0044($sp) +/* 0086C 80A50A8C 8FA30044 */ lw $v1, 0x0044($sp) /* 00870 80A50A90 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 00874 80A50A94 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 /* 00878 80A50A98 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -58,40 +58,40 @@ glabel func_80A509D4 /* 00894 80A50AB4 924C030E */ lbu $t4, 0x030E($s2) ## 0000030E /* 00898 80A50AB8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0089C 80A50ABC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 008A0 80A50AC0 000C6880 */ sll $t5, $t4, 2 -/* 008A4 80A50AC4 008D2021 */ addu $a0, $a0, $t5 -/* 008A8 80A50AC8 8C840BA4 */ lw $a0, %lo(D_80A50BA4)($a0) +/* 008A0 80A50AC0 000C6880 */ sll $t5, $t4, 2 +/* 008A4 80A50AC4 008D2021 */ addu $a0, $a0, $t5 +/* 008A8 80A50AC8 8C840BA4 */ lw $a0, %lo(D_80A50BA4)($a0) /* 008AC 80A50ACC 3C0B80A5 */ lui $t3, %hi(func_80A50774) ## $t3 = 80A50000 /* 008B0 80A50AD0 256B0774 */ addiu $t3, $t3, %lo(func_80A50774) ## $t3 = 80A50774 -/* 008B4 80A50AD4 00047900 */ sll $t7, $a0, 4 -/* 008B8 80A50AD8 000FC702 */ srl $t8, $t7, 28 -/* 008BC 80A50ADC 0018C880 */ sll $t9, $t8, 2 -/* 008C0 80A50AE0 01194021 */ addu $t0, $t0, $t9 +/* 008B4 80A50AD4 00047900 */ sll $t7, $a0, 4 +/* 008B8 80A50AD8 000FC702 */ srl $t8, $t7, 28 +/* 008BC 80A50ADC 0018C880 */ sll $t9, $t8, 2 +/* 008C0 80A50AE0 01194021 */ addu $t0, $t0, $t9 /* 008C4 80A50AE4 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 008C8 80A50AE8 00817024 */ and $t6, $a0, $at +/* 008C8 80A50AE8 00817024 */ and $t6, $a0, $at /* 008CC 80A50AEC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 008D0 80A50AF0 01C84821 */ addu $t1, $t6, $t0 -/* 008D4 80A50AF4 01215021 */ addu $t2, $t1, $at +/* 008D0 80A50AF0 01C84821 */ addu $t1, $t6, $t0 +/* 008D4 80A50AF4 01215021 */ addu $t2, $t1, $at /* 008D8 80A50AF8 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 008DC 80A50AFC 9247014E */ lbu $a3, 0x014E($s2) ## 0000014E /* 008E0 80A50B00 8E46016C */ lw $a2, 0x016C($s2) ## 0000016C /* 008E4 80A50B04 8E450150 */ lw $a1, 0x0150($s2) ## 00000150 -/* 008E8 80A50B08 AFB20018 */ sw $s2, 0x0018($sp) -/* 008EC 80A50B0C AFA00014 */ sw $zero, 0x0014($sp) -/* 008F0 80A50B10 AFAB0010 */ sw $t3, 0x0010($sp) -/* 008F4 80A50B14 0C0286B2 */ jal func_800A1AC8 +/* 008E8 80A50B08 AFB20018 */ sw $s2, 0x0018($sp) +/* 008EC 80A50B0C AFA00014 */ sw $zero, 0x0014($sp) +/* 008F0 80A50B10 AFAB0010 */ sw $t3, 0x0010($sp) +/* 008F4 80A50B14 0C0286B2 */ jal SkelAnime_DrawSV /* 008F8 80A50B18 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 008FC 80A50B1C 3C0680A5 */ lui $a2, %hi(D_80A50C34) ## $a2 = 80A50000 /* 00900 80A50B20 24C60C34 */ addiu $a2, $a2, %lo(D_80A50C34) ## $a2 = 80A50C34 /* 00904 80A50B24 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 00908 80A50B28 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0090C 80A50B2C 0C031AD5 */ jal func_800C6B54 +/* 0090C 80A50B2C 0C031AD5 */ jal func_800C6B54 /* 00910 80A50B30 240701A5 */ addiu $a3, $zero, 0x01A5 ## $a3 = 000001A5 -/* 00914 80A50B34 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00918 80A50B38 8FB00028 */ lw $s0, 0x0028($sp) -/* 0091C 80A50B3C 8FB1002C */ lw $s1, 0x002C($sp) -/* 00920 80A50B40 8FB20030 */ lw $s2, 0x0030($sp) -/* 00924 80A50B44 03E00008 */ jr $ra +/* 00914 80A50B34 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00918 80A50B38 8FB00028 */ lw $s0, 0x0028($sp) +/* 0091C 80A50B3C 8FB1002C */ lw $s1, 0x002C($sp) +/* 00920 80A50B40 8FB20030 */ lw $s2, 0x0030($sp) +/* 00924 80A50B44 03E00008 */ jr $ra /* 00928 80A50B48 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 0092C 80A50B4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Destroy.s index afe8027293..a60ad7d2ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Destroy.s @@ -1,19 +1,19 @@ glabel EnHata_Destroy /* 0013C 80A50E8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00140 80A50E90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00144 80A50E94 AFA40018 */ sw $a0, 0x0018($sp) +/* 00140 80A50E90 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00144 80A50E94 AFA40018 */ sw $a0, 0x0018($sp) /* 00148 80A50E98 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 0014C 80A50E9C 0C0295BC */ jal func_800A56F0 -/* 00150 80A50EA0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00154 80A50EA4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00158 80A50EA8 8FAE0018 */ lw $t6, 0x0018($sp) +/* 0014C 80A50E9C 0C0295BC */ jal SkelAnime_Free +/* 00150 80A50EA0 AFA5001C */ sw $a1, 0x001C($sp) +/* 00154 80A50EA4 8FA4001C */ lw $a0, 0x001C($sp) +/* 00158 80A50EA8 8FAE0018 */ lw $t6, 0x0018($sp) /* 0015C 80A50EAC 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 /* 00160 80A50EB0 0C00FB56 */ jal DynaPolyInfo_Free ## DynaPolyInfo_delReserve /* 00164 80A50EB4 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00168 80A50EB8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00168 80A50EB8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0016C 80A50EBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00170 80A50EC0 03E00008 */ jr $ra +/* 00170 80A50EC0 03E00008 */ jr $ra /* 00174 80A50EC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s index 436827b0d4..79b9476a22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s @@ -1,21 +1,21 @@ glabel func_80A574D4 /* 002D4 80A574D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002D8 80A574D8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 002D8 80A574D8 AFBF0014 */ sw $ra, 0x0014($sp) /* 002DC 80A574DC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 002E0 80A574E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002E4 80A574E4 24A52894 */ addiu $a1, $a1, 0x2894 ## $a1 = 06002894 -/* 002E8 80A574E8 AFA60018 */ sw $a2, 0x0018($sp) -/* 002EC 80A574EC 0C0294BE */ jal func_800A52F8 +/* 002E8 80A574E8 AFA60018 */ sw $a2, 0x0018($sp) +/* 002EC 80A574EC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 002F0 80A574F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002F4 80A574F4 8FA60018 */ lw $a2, 0x0018($sp) +/* 002F4 80A574F4 8FA60018 */ lw $a2, 0x0018($sp) /* 002F8 80A574F8 3C0F80A5 */ lui $t7, %hi(func_80A57B60) ## $t7 = 80A50000 /* 002FC 80A574FC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00300 80A57500 25EF7B60 */ addiu $t7, $t7, %lo(func_80A57B60) ## $t7 = 80A57B60 /* 00304 80A57504 A4CE0194 */ sh $t6, 0x0194($a2) ## 00000194 /* 00308 80A57508 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 0030C 80A5750C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0030C 80A5750C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00310 80A57510 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00314 80A57514 03E00008 */ jr $ra +/* 00314 80A57514 03E00008 */ jr $ra /* 00318 80A57518 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s index 4779098744..acd872fc34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s @@ -1,31 +1,31 @@ glabel func_80A57558 /* 00358 80A57558 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0035C 80A5755C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0035C 80A5755C AFBF0014 */ sw $ra, 0x0014($sp) /* 00360 80A57560 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00364 80A57564 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00368 80A57568 24A52F7C */ addiu $a1, $a1, 0x2F7C ## $a1 = 06002F7C -/* 0036C 80A5756C AFA70018 */ sw $a3, 0x0018($sp) +/* 0036C 80A5756C AFA70018 */ sw $a3, 0x0018($sp) /* 00370 80A57570 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00374 80A57574 0C0294D3 */ jal func_800A534C +/* 00374 80A57574 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00378 80A57578 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 0037C 80A5757C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0037C 80A5757C 8FA70018 */ lw $a3, 0x0018($sp) /* 00380 80A57580 3C0E80A5 */ lui $t6, %hi(func_80A57CA8) ## $t6 = 80A50000 /* 00384 80A57584 25CE7CA8 */ addiu $t6, $t6, %lo(func_80A57CA8) ## $t6 = 80A57CA8 /* 00388 80A57588 8CEF0190 */ lw $t7, 0x0190($a3) ## 00000190 /* 0038C 80A5758C 3C0880A5 */ lui $t0, %hi(func_80A57BE4) ## $t0 = 80A50000 /* 00390 80A57590 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00394 80A57594 15CF0004 */ bne $t6, $t7, .L80A575A8 +/* 00394 80A57594 15CF0004 */ bne $t6, $t7, .L80A575A8 /* 00398 80A57598 25087BE4 */ addiu $t0, $t0, %lo(func_80A57BE4) ## $t0 = 80A57BE4 /* 0039C 80A5759C 24181002 */ addiu $t8, $zero, 0x1002 ## $t8 = 00001002 -/* 003A0 80A575A0 10000002 */ beq $zero, $zero, .L80A575AC +/* 003A0 80A575A0 10000002 */ beq $zero, $zero, .L80A575AC /* 003A4 80A575A4 A4F80194 */ sh $t8, 0x0194($a3) ## 00000194 .L80A575A8: /* 003A8 80A575A8 A4F90194 */ sh $t9, 0x0194($a3) ## 00000194 .L80A575AC: /* 003AC 80A575AC ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -/* 003B0 80A575B0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003B0 80A575B0 8FBF0014 */ lw $ra, 0x0014($sp) /* 003B4 80A575B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003B8 80A575B8 03E00008 */ jr $ra +/* 003B8 80A575B8 03E00008 */ jr $ra /* 003BC 80A575BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s index 7111062ecd..b236070367 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s @@ -1,21 +1,21 @@ glabel func_80A576FC /* 004FC 80A576FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00500 80A57700 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00500 80A57700 AFBF0014 */ sw $ra, 0x0014($sp) /* 00504 80A57704 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00508 80A57708 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0050C 80A5770C 24A53128 */ addiu $a1, $a1, 0x3128 ## $a1 = 06003128 -/* 00510 80A57710 AFA60018 */ sw $a2, 0x0018($sp) -/* 00514 80A57714 0C0294BE */ jal func_800A52F8 +/* 00510 80A57710 AFA60018 */ sw $a2, 0x0018($sp) +/* 00514 80A57714 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00518 80A57718 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0051C 80A5771C 8FA60018 */ lw $a2, 0x0018($sp) +/* 0051C 80A5771C 8FA60018 */ lw $a2, 0x0018($sp) /* 00520 80A57720 3C0F80A6 */ lui $t7, %hi(func_80A58028) ## $t7 = 80A60000 /* 00524 80A57724 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00528 80A57728 25EF8028 */ addiu $t7, $t7, %lo(func_80A58028) ## $t7 = 80A58028 /* 0052C 80A5772C A4CE0194 */ sh $t6, 0x0194($a2) ## 00000194 /* 00530 80A57730 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 00534 80A57734 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00534 80A57734 8FBF0014 */ lw $ra, 0x0014($sp) /* 00538 80A57738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0053C 80A5773C 03E00008 */ jr $ra +/* 0053C 80A5773C 03E00008 */ jr $ra /* 00540 80A57740 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s index b9a9613159..77486665a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s @@ -1,22 +1,22 @@ glabel func_80A57744 /* 00544 80A57744 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00548 80A57748 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00548 80A57748 AFBF0014 */ sw $ra, 0x0014($sp) /* 0054C 80A5774C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00550 80A57750 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00554 80A57754 24A52E84 */ addiu $a1, $a1, 0x2E84 ## $a1 = 06002E84 -/* 00558 80A57758 AFA70018 */ sw $a3, 0x0018($sp) +/* 00558 80A57758 AFA70018 */ sw $a3, 0x0018($sp) /* 0055C 80A5775C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00560 80A57760 0C0294D3 */ jal func_800A534C +/* 00560 80A57760 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00564 80A57764 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00568 80A57768 8FA70018 */ lw $a3, 0x0018($sp) +/* 00568 80A57768 8FA70018 */ lw $a3, 0x0018($sp) /* 0056C 80A5776C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00570 80A57770 3C0E80A6 */ lui $t6, %hi(func_80A582B8) ## $t6 = 80A60000 /* 00574 80A57774 25CE82B8 */ addiu $t6, $t6, %lo(func_80A582B8) ## $t6 = 80A582B8 /* 00578 80A57778 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 0057C 80A5777C E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00580 80A57780 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00580 80A57780 8FBF0014 */ lw $ra, 0x0014($sp) /* 00584 80A57784 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00588 80A57788 03E00008 */ jr $ra +/* 00588 80A57788 03E00008 */ jr $ra /* 0058C 80A5778C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s index e3ab550bb8..bb9b4c8b82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s @@ -1,13 +1,13 @@ glabel func_80A57790 /* 00590 80A57790 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00594 80A57794 AFB00030 */ sw $s0, 0x0030($sp) -/* 00598 80A57798 AFA5003C */ sw $a1, 0x003C($sp) +/* 00594 80A57794 AFB00030 */ sw $s0, 0x0030($sp) +/* 00598 80A57798 AFA5003C */ sw $a1, 0x003C($sp) /* 0059C 80A5779C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005A0 80A577A0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 005A0 80A577A0 AFBF0034 */ sw $ra, 0x0034($sp) /* 005A4 80A577A4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005A8 80A577A8 24A53128 */ addiu $a1, $a1, 0x3128 ## $a1 = 06003128 /* 005AC 80A577AC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005B0 80A577B0 0C0294D3 */ jal func_800A534C +/* 005B0 80A577B0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 005B4 80A577B4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 005B8 80A577B8 92180226 */ lbu $t8, 0x0226($s0) ## 00000226 /* 005BC 80A577BC 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 @@ -24,30 +24,30 @@ glabel func_80A57790 /* 005E8 80A577E8 24053880 */ addiu $a1, $zero, 0x3880 ## $a1 = 00003880 /* 005EC 80A577EC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 005F0 80A577F0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 005F4 80A577F4 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 005F8 80A577F8 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 005FC 80A577FC 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00600 80A57800 8FA5003C */ lw $a1, 0x003C($sp) -/* 00604 80A57804 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00600 80A57800 8FA5003C */ lw $a1, 0x003C($sp) +/* 00604 80A57804 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00608 80A57808 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 0060C 80A5780C 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 00610 80A57810 AFAA0024 */ sw $t2, 0x0024($sp) -/* 00614 80A57814 AFA00020 */ sw $zero, 0x0020($sp) -/* 00618 80A57818 AFA0001C */ sw $zero, 0x001C($sp) -/* 0061C 80A5781C AFA00018 */ sw $zero, 0x0018($sp) +/* 00610 80A57810 AFAA0024 */ sw $t2, 0x0024($sp) +/* 00614 80A57814 AFA00020 */ sw $zero, 0x0020($sp) +/* 00618 80A57818 AFA0001C */ sw $zero, 0x001C($sp) +/* 0061C 80A5781C AFA00018 */ sw $zero, 0x0018($sp) /* 00620 80A57820 24060015 */ addiu $a2, $zero, 0x0015 ## $a2 = 00000015 /* 00624 80A57824 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 /* 00628 80A57828 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 0062C 80A5782C E7A80014 */ swc1 $f8, 0x0014($sp) +/* 0062C 80A5782C E7A80014 */ swc1 $f8, 0x0014($sp) /* 00630 80A57830 3C0B80A6 */ lui $t3, %hi(func_80A58320) ## $t3 = 80A60000 /* 00634 80A57834 256B8320 */ addiu $t3, $t3, %lo(func_80A58320) ## $t3 = 80A58320 /* 00638 80A57838 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 0063C 80A5783C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00640 80A57840 8FB00030 */ lw $s0, 0x0030($sp) +/* 0063C 80A5783C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00640 80A57840 8FB00030 */ lw $s0, 0x0030($sp) /* 00644 80A57844 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00648 80A57848 03E00008 */ jr $ra +/* 00648 80A57848 03E00008 */ jr $ra /* 0064C 80A5784C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s index 0ab612be35..89e412f76e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s @@ -1,48 +1,48 @@ glabel func_80A57850 /* 00650 80A57850 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00654 80A57854 AFB00020 */ sw $s0, 0x0020($sp) +/* 00654 80A57854 AFB00020 */ sw $s0, 0x0020($sp) /* 00658 80A57858 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0065C 80A5785C AFBF0024 */ sw $ra, 0x0024($sp) +/* 0065C 80A5785C AFBF0024 */ sw $ra, 0x0024($sp) /* 00660 80A57860 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00664 80A57864 24A529BC */ addiu $a1, $a1, 0x29BC ## $a1 = 060029BC -/* 00668 80A57868 0C0294BE */ jal func_800A52F8 +/* 00668 80A57868 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 0066C 80A5786C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00670 80A57870 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00674 80A57874 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00678 80A57878 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 0067C 80A5787C 01C17824 */ and $t7, $t6, $at +/* 0067C 80A5787C 01C17824 */ and $t7, $t6, $at /* 00680 80A57880 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00684 80A57884 AFB80010 */ sw $t8, 0x0010($sp) +/* 00684 80A57884 AFB80010 */ sw $t8, 0x0010($sp) /* 00688 80A57888 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0068C 80A5788C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00690 80A57890 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00694 80A57894 0C00D09B */ jal func_8003426C +/* 00694 80A57894 0C00D09B */ jal func_8003426C /* 00698 80A57898 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0069C 80A5789C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 006A0 80A578A0 A2190114 */ sb $t9, 0x0114($s0) ## 00000114 /* 006A4 80A578A4 A6000194 */ sh $zero, 0x0194($s0) ## 00000194 /* 006A8 80A578A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006AC 80A578AC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 006B0 80A578B0 24053882 */ addiu $a1, $zero, 0x3882 ## $a1 = 00003882 /* 006B4 80A578B4 3C0880A6 */ lui $t0, %hi(D_80A58A34) ## $t0 = 80A60000 -/* 006B8 80A578B8 85088A34 */ lh $t0, %lo(D_80A58A34)($t0) +/* 006B8 80A578B8 85088A34 */ lh $t0, %lo(D_80A58A34)($t0) /* 006BC 80A578BC 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD -/* 006C0 80A578C0 15010006 */ bne $t0, $at, .L80A578DC +/* 006C0 80A578C0 15010006 */ bne $t0, $at, .L80A578DC /* 006C4 80A578C4 00000000 */ nop -/* 006C8 80A578C8 0C01E221 */ jal func_80078884 +/* 006C8 80A578C8 0C01E221 */ jal func_80078884 /* 006CC 80A578CC 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 /* 006D0 80A578D0 2409FFFC */ addiu $t1, $zero, 0xFFFC ## $t1 = FFFFFFFC /* 006D4 80A578D4 3C0180A6 */ lui $at, %hi(D_80A58A34) ## $at = 80A60000 -/* 006D8 80A578D8 A4298A34 */ sh $t1, %lo(D_80A58A34)($at) +/* 006D8 80A578D8 A4298A34 */ sh $t1, %lo(D_80A58A34)($at) .L80A578DC: /* 006DC 80A578DC 3C0A80A6 */ lui $t2, %hi(func_80A584DC) ## $t2 = 80A60000 /* 006E0 80A578E0 254A84DC */ addiu $t2, $t2, %lo(func_80A584DC) ## $t2 = 80A584DC /* 006E4 80A578E4 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 006E8 80A578E8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006EC 80A578EC 8FB00020 */ lw $s0, 0x0020($sp) +/* 006E8 80A578E8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 006EC 80A578EC 8FB00020 */ lw $s0, 0x0020($sp) /* 006F0 80A578F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006F4 80A578F4 03E00008 */ jr $ra +/* 006F4 80A578F4 03E00008 */ jr $ra /* 006F8 80A578F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s index 3b65d5dd70..4067d107b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s @@ -1,14 +1,14 @@ glabel func_80A68AC4 /* 00464 80A68AC4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00468 80A68AC8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00468 80A68AC8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0046C 80A68ACC AC80014C */ sw $zero, 0x014C($a0) ## 0000014C /* 00470 80A68AD0 3C0580A7 */ lui $a1, %hi(D_80A691C0) ## $a1 = 80A70000 -/* 00474 80A68AD4 8CA591C0 */ lw $a1, %lo(D_80A691C0)($a1) -/* 00478 80A68AD8 0C0294BE */ jal func_800A52F8 +/* 00474 80A68AD4 8CA591C0 */ lw $a1, %lo(D_80A691C0)($a1) +/* 00478 80A68AD8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 0047C 80A68ADC 248401A0 */ addiu $a0, $a0, 0x01A0 ## $a0 = 000001A0 -/* 00480 80A68AE0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00480 80A68AE0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00484 80A68AE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00488 80A68AE8 03E00008 */ jr $ra +/* 00488 80A68AE8 03E00008 */ jr $ra /* 0048C 80A68AEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Draw.s index 1326b67946..766412bd50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Draw.s @@ -1,11 +1,11 @@ glabel EnHs_Draw /* 009B4 80A6ED54 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 009B8 80A6ED58 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009BC 80A6ED5C AFA40028 */ sw $a0, 0x0028($sp) -/* 009C0 80A6ED60 AFA5002C */ sw $a1, 0x002C($sp) -/* 009C4 80A6ED64 0C0250F2 */ jal func_800943C8 +/* 009B8 80A6ED58 AFBF0024 */ sw $ra, 0x0024($sp) +/* 009BC 80A6ED5C AFA40028 */ sw $a0, 0x0028($sp) +/* 009C0 80A6ED60 AFA5002C */ sw $a1, 0x002C($sp) +/* 009C4 80A6ED64 0C0250F2 */ jal func_800943C8 /* 009C8 80A6ED68 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 009CC 80A6ED6C 8FA20028 */ lw $v0, 0x0028($sp) +/* 009CC 80A6ED6C 8FA20028 */ lw $v0, 0x0028($sp) /* 009D0 80A6ED70 3C0F80A7 */ lui $t7, %hi(func_80A6EC58) ## $t7 = 80A70000 /* 009D4 80A6ED74 3C1880A7 */ lui $t8, %hi(func_80A6ED14) ## $t8 = 80A70000 /* 009D8 80A6ED78 8C45019C */ lw $a1, 0x019C($v0) ## 0000019C @@ -13,13 +13,13 @@ glabel EnHs_Draw /* 009E0 80A6ED80 9047019A */ lbu $a3, 0x019A($v0) ## 0000019A /* 009E4 80A6ED84 2718ED14 */ addiu $t8, $t8, %lo(func_80A6ED14) ## $t8 = 80A6ED14 /* 009E8 80A6ED88 25EFEC58 */ addiu $t7, $t7, %lo(func_80A6EC58) ## $t7 = 80A6EC58 -/* 009EC 80A6ED8C AFAF0010 */ sw $t7, 0x0010($sp) -/* 009F0 80A6ED90 AFB80014 */ sw $t8, 0x0014($sp) -/* 009F4 80A6ED94 8FA4002C */ lw $a0, 0x002C($sp) -/* 009F8 80A6ED98 0C0286B2 */ jal func_800A1AC8 -/* 009FC 80A6ED9C AFA20018 */ sw $v0, 0x0018($sp) -/* 00A00 80A6EDA0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 009EC 80A6ED8C AFAF0010 */ sw $t7, 0x0010($sp) +/* 009F0 80A6ED90 AFB80014 */ sw $t8, 0x0014($sp) +/* 009F4 80A6ED94 8FA4002C */ lw $a0, 0x002C($sp) +/* 009F8 80A6ED98 0C0286B2 */ jal SkelAnime_DrawSV +/* 009FC 80A6ED9C AFA20018 */ sw $v0, 0x0018($sp) +/* 00A00 80A6EDA0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A04 80A6EDA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A08 80A6EDA8 03E00008 */ jr $ra +/* 00A08 80A6EDA8 03E00008 */ jr $ra /* 00A0C 80A6EDAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s index 9f8fc25004..277e2bbfac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s @@ -1,15 +1,15 @@ glabel EnHs_Init /* 00008 80A6E3A8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0000C 80A6E3AC AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 80A6E3AC AFB00028 */ sw $s0, 0x0028($sp) /* 00010 80A6E3B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 80A6E3B4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 80A6E3B8 AFA50044 */ sw $a1, 0x0044($sp) +/* 00014 80A6E3B4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 80A6E3B8 AFA50044 */ sw $a1, 0x0044($sp) /* 0001C 80A6E3BC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00020 80A6E3C0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00024 80A6E3C4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00028 80A6E3C8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0002C 80A6E3CC 0C00AC78 */ jal ActorShape_Init - + /* 00030 80A6E3D0 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 00034 80A6E3D4 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00038 80A6E3D8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -17,89 +17,89 @@ glabel EnHs_Init /* 00040 80A6E3E0 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 00044 80A6E3E4 260F023C */ addiu $t7, $s0, 0x023C ## $t7 = 0000023C /* 00048 80A6E3E8 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 0004C 80A6E3EC AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 80A6E3F0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 80A6E3F4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0004C 80A6E3EC AFB80018 */ sw $t8, 0x0018($sp) +/* 00050 80A6E3F0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00054 80A6E3F4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00058 80A6E3F8 24E705C0 */ addiu $a3, $a3, 0x05C0 ## $a3 = 060005C0 /* 0005C 80A6E3FC 24C66260 */ addiu $a2, $a2, 0x6260 ## $a2 = 06006260 -/* 00060 80A6E400 AFA50034 */ sw $a1, 0x0034($sp) -/* 00064 80A6E404 0C0291BE */ jal func_800A46F8 -/* 00068 80A6E408 8FA40044 */ lw $a0, 0x0044($sp) +/* 00060 80A6E400 AFA50034 */ sw $a1, 0x0034($sp) +/* 00064 80A6E404 0C0291BE */ jal SkelAnime_InitSV +/* 00068 80A6E408 8FA40044 */ lw $a0, 0x0044($sp) /* 0006C 80A6E40C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00070 80A6E410 24A505C0 */ addiu $a1, $a1, 0x05C0 ## $a1 = 060005C0 -/* 00074 80A6E414 0C0294BE */ jal func_800A52F8 -/* 00078 80A6E418 8FA40034 */ lw $a0, 0x0034($sp) +/* 00074 80A6E414 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00078 80A6E418 8FA40034 */ lw $a0, 0x0034($sp) /* 0007C 80A6E41C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00080 80A6E420 AFA50034 */ sw $a1, 0x0034($sp) +/* 00080 80A6E420 AFA50034 */ sw $a1, 0x0034($sp) /* 00084 80A6E424 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00088 80A6E428 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00088 80A6E428 8FA40044 */ lw $a0, 0x0044($sp) /* 0008C 80A6E42C 3C0780A7 */ lui $a3, %hi(D_80A6EDD0) ## $a3 = 80A70000 -/* 00090 80A6E430 8FA50034 */ lw $a1, 0x0034($sp) +/* 00090 80A6E430 8FA50034 */ lw $a1, 0x0034($sp) /* 00094 80A6E434 24E7EDD0 */ addiu $a3, $a3, %lo(D_80A6EDD0) ## $a3 = 80A6EDD0 -/* 00098 80A6E438 8FA40044 */ lw $a0, 0x0044($sp) +/* 00098 80A6E438 8FA40044 */ lw $a0, 0x0044($sp) /* 0009C 80A6E43C 0C01712B */ jal ActorCollider_InitCylinder - + /* 000A0 80A6E440 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000A4 80A6E444 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 000A8 80A6E448 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000AC 80A6E44C A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 000B0 80A6E450 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000B4 80A6E454 0C00B58B */ jal Actor_SetScale - + /* 000B8 80A6E458 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000BC 80A6E45C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 000C0 80A6E460 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 /* 000C4 80A6E464 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 000C8 80A6E468 3C0480A7 */ lui $a0, %hi(D_80A6EE48) ## $a0 = 80A70000 -/* 000CC 80A6E46C 51000004 */ beql $t0, $zero, .L80A6E480 +/* 000CC 80A6E46C 51000004 */ beql $t0, $zero, .L80A6E480 /* 000D0 80A6E470 A609001C */ sh $t1, 0x001C($s0) ## 0000001C -/* 000D4 80A6E474 10000002 */ beq $zero, $zero, .L80A6E480 +/* 000D4 80A6E474 10000002 */ beq $zero, $zero, .L80A6E480 /* 000D8 80A6E478 A600001C */ sh $zero, 0x001C($s0) ## 0000001C /* 000DC 80A6E47C A609001C */ sh $t1, 0x001C($s0) ## 0000001C .L80A6E480: /* 000E0 80A6E480 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 000E4 80A6E484 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 000E8 80A6E488 15410014 */ bne $t2, $at, .L80A6E4DC +/* 000E8 80A6E488 15410014 */ bne $t2, $at, .L80A6E4DC /* 000EC 80A6E48C 00000000 */ nop /* 000F0 80A6E490 3C0480A7 */ lui $a0, %hi(D_80A6EE10) ## $a0 = 80A70000 /* 000F4 80A6E494 0C00084C */ jal osSyncPrintf - + /* 000F8 80A6E498 2484EE10 */ addiu $a0, $a0, %lo(D_80A6EE10) ## $a0 = 80A6EE10 /* 000FC 80A6E49C 3C0580A7 */ lui $a1, %hi(func_80A6E9AC) ## $a1 = 80A70000 /* 00100 80A6E4A0 24A5E9AC */ addiu $a1, $a1, %lo(func_80A6E9AC) ## $a1 = 80A6E9AC -/* 00104 80A6E4A4 0C29B8E8 */ jal func_80A6E3A0 +/* 00104 80A6E4A4 0C29B8E8 */ jal func_80A6E3A0 /* 00108 80A6E4A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0010C 80A6E4AC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 00110 80A6E4B0 956BF556 */ lhu $t3, -0x0AAA($t3) ## 8015F556 /* 00114 80A6E4B4 3C0480A7 */ lui $a0, %hi(D_80A6EE30) ## $a0 = 80A70000 /* 00118 80A6E4B8 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 0011C 80A6E4BC 5180000E */ beql $t4, $zero, .L80A6E4F8 +/* 0011C 80A6E4BC 5180000E */ beql $t4, $zero, .L80A6E4F8 /* 00120 80A6E4C0 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 /* 00124 80A6E4C4 0C00084C */ jal osSyncPrintf - + /* 00128 80A6E4C8 2484EE30 */ addiu $a0, $a0, %lo(D_80A6EE30) ## $a0 = 80A6EE30 /* 0012C 80A6E4CC 0C00B55C */ jal Actor_Kill - + /* 00130 80A6E4D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00134 80A6E4D4 10000008 */ beq $zero, $zero, .L80A6E4F8 +/* 00134 80A6E4D4 10000008 */ beq $zero, $zero, .L80A6E4F8 /* 00138 80A6E4D8 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 .L80A6E4DC: /* 0013C 80A6E4DC 0C00084C */ jal osSyncPrintf - + /* 00140 80A6E4E0 2484EE48 */ addiu $a0, $a0, %lo(D_80A6EE48) ## $a0 = FFFFEE48 /* 00144 80A6E4E4 3C0580A7 */ lui $a1, %hi(func_80A6E9AC) ## $a1 = 80A70000 /* 00148 80A6E4E8 24A5E9AC */ addiu $a1, $a1, %lo(func_80A6E9AC) ## $a1 = 80A6E9AC -/* 0014C 80A6E4EC 0C29B8E8 */ jal func_80A6E3A0 +/* 0014C 80A6E4EC 0C29B8E8 */ jal func_80A6E3A0 /* 00150 80A6E4F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00154 80A6E4F4 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 .L80A6E4F8: /* 00158 80A6E4F8 A60002A8 */ sh $zero, 0x02A8($s0) ## 000002A8 /* 0015C 80A6E4FC A20D001F */ sb $t5, 0x001F($s0) ## 0000001F -/* 00160 80A6E500 8FBF002C */ lw $ra, 0x002C($sp) -/* 00164 80A6E504 8FB00028 */ lw $s0, 0x0028($sp) +/* 00160 80A6E500 8FBF002C */ lw $ra, 0x002C($sp) +/* 00164 80A6E504 8FB00028 */ lw $s0, 0x0028($sp) /* 00168 80A6E508 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0016C 80A6E50C 03E00008 */ jr $ra +/* 0016C 80A6E50C 03E00008 */ jr $ra /* 00170 80A6E510 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s index 091298fd84..ce1dae7551 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s @@ -1,11 +1,11 @@ glabel EnHs2_Draw /* 00480 80A6F420 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00484 80A6F424 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00488 80A6F428 AFA40028 */ sw $a0, 0x0028($sp) -/* 0048C 80A6F42C AFA5002C */ sw $a1, 0x002C($sp) -/* 00490 80A6F430 0C0250F2 */ jal func_800943C8 +/* 00484 80A6F424 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00488 80A6F428 AFA40028 */ sw $a0, 0x0028($sp) +/* 0048C 80A6F42C AFA5002C */ sw $a1, 0x002C($sp) +/* 00490 80A6F430 0C0250F2 */ jal func_800943C8 /* 00494 80A6F434 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00498 80A6F438 8FA20028 */ lw $v0, 0x0028($sp) +/* 00498 80A6F438 8FA20028 */ lw $v0, 0x0028($sp) /* 0049C 80A6F43C 3C0F80A7 */ lui $t7, %hi(func_80A6F358) ## $t7 = 80A70000 /* 004A0 80A6F440 3C1880A7 */ lui $t8, %hi(func_80A6F3E0) ## $t8 = 80A70000 /* 004A4 80A6F444 8C45019C */ lw $a1, 0x019C($v0) ## 0000019C @@ -13,14 +13,14 @@ glabel EnHs2_Draw /* 004AC 80A6F44C 9047019A */ lbu $a3, 0x019A($v0) ## 0000019A /* 004B0 80A6F450 2718F3E0 */ addiu $t8, $t8, %lo(func_80A6F3E0) ## $t8 = 80A6F3E0 /* 004B4 80A6F454 25EFF358 */ addiu $t7, $t7, %lo(func_80A6F358) ## $t7 = 80A6F358 -/* 004B8 80A6F458 AFAF0010 */ sw $t7, 0x0010($sp) -/* 004BC 80A6F45C AFB80014 */ sw $t8, 0x0014($sp) -/* 004C0 80A6F460 8FA4002C */ lw $a0, 0x002C($sp) -/* 004C4 80A6F464 0C0286B2 */ jal func_800A1AC8 -/* 004C8 80A6F468 AFA20018 */ sw $v0, 0x0018($sp) -/* 004CC 80A6F46C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 004B8 80A6F458 AFAF0010 */ sw $t7, 0x0010($sp) +/* 004BC 80A6F45C AFB80014 */ sw $t8, 0x0014($sp) +/* 004C0 80A6F460 8FA4002C */ lw $a0, 0x002C($sp) +/* 004C4 80A6F464 0C0286B2 */ jal SkelAnime_DrawSV +/* 004C8 80A6F468 AFA20018 */ sw $v0, 0x0018($sp) +/* 004CC 80A6F46C 8FBF0024 */ lw $ra, 0x0024($sp) /* 004D0 80A6F470 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004D4 80A6F474 03E00008 */ jr $ra +/* 004D4 80A6F474 03E00008 */ jr $ra /* 004D8 80A6F478 00000000 */ nop /* 004DC 80A6F47C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s index f7a5a4d79b..d03943622b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s @@ -1,15 +1,15 @@ glabel EnHs2_Init /* 00000 80A6EFA0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80A6EFA4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80A6EFA4 AFB00028 */ sw $s0, 0x0028($sp) /* 00008 80A6EFA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80A6EFAC AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80A6EFB0 AFA50044 */ sw $a1, 0x0044($sp) +/* 0000C 80A6EFAC AFBF002C */ sw $ra, 0x002C($sp) +/* 00010 80A6EFB0 AFA50044 */ sw $a1, 0x0044($sp) /* 00014 80A6EFB4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00018 80A6EFB8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0001C 80A6EFBC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00020 80A6EFC0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00024 80A6EFC4 0C00AC78 */ jal ActorShape_Init - + /* 00028 80A6EFC8 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 0002C 80A6EFCC 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00030 80A6EFD0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -17,40 +17,40 @@ glabel EnHs2_Init /* 00038 80A6EFD8 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 0003C 80A6EFDC 260F023C */ addiu $t7, $s0, 0x023C ## $t7 = 0000023C /* 00040 80A6EFE0 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 00044 80A6EFE4 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 80A6EFE8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 80A6EFEC AFAE0010 */ sw $t6, 0x0010($sp) +/* 00044 80A6EFE4 AFB80018 */ sw $t8, 0x0018($sp) +/* 00048 80A6EFE8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0004C 80A6EFEC AFAE0010 */ sw $t6, 0x0010($sp) /* 00050 80A6EFF0 24E705C0 */ addiu $a3, $a3, 0x05C0 ## $a3 = 060005C0 /* 00054 80A6EFF4 24C66260 */ addiu $a2, $a2, 0x6260 ## $a2 = 06006260 -/* 00058 80A6EFF8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0005C 80A6EFFC 0C0291BE */ jal func_800A46F8 -/* 00060 80A6F000 8FA40044 */ lw $a0, 0x0044($sp) +/* 00058 80A6EFF8 AFA50034 */ sw $a1, 0x0034($sp) +/* 0005C 80A6EFFC 0C0291BE */ jal SkelAnime_InitSV +/* 00060 80A6F000 8FA40044 */ lw $a0, 0x0044($sp) /* 00064 80A6F004 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00068 80A6F008 24A505C0 */ addiu $a1, $a1, 0x05C0 ## $a1 = 060005C0 -/* 0006C 80A6F00C 0C0294BE */ jal func_800A52F8 -/* 00070 80A6F010 8FA40034 */ lw $a0, 0x0034($sp) +/* 0006C 80A6F00C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00070 80A6F010 8FA40034 */ lw $a0, 0x0034($sp) /* 00074 80A6F014 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00078 80A6F018 AFA50034 */ sw $a1, 0x0034($sp) +/* 00078 80A6F018 AFA50034 */ sw $a1, 0x0034($sp) /* 0007C 80A6F01C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00080 80A6F020 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00080 80A6F020 8FA40044 */ lw $a0, 0x0044($sp) /* 00084 80A6F024 3C0780A7 */ lui $a3, %hi(D_80A6F4A0) ## $a3 = 80A70000 -/* 00088 80A6F028 8FA50034 */ lw $a1, 0x0034($sp) +/* 00088 80A6F028 8FA50034 */ lw $a1, 0x0034($sp) /* 0008C 80A6F02C 24E7F4A0 */ addiu $a3, $a3, %lo(D_80A6F4A0) ## $a3 = 80A6F4A0 -/* 00090 80A6F030 8FA40044 */ lw $a0, 0x0044($sp) +/* 00090 80A6F030 8FA40044 */ lw $a0, 0x0044($sp) /* 00094 80A6F034 0C01712B */ jal ActorCollider_InitCylinder - + /* 00098 80A6F038 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0009C 80A6F03C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 000A0 80A6F040 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000A4 80A6F044 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 000A8 80A6F048 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000AC 80A6F04C 0C00B58B */ jal Actor_SetScale - + /* 000B0 80A6F050 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000B4 80A6F054 3C0480A7 */ lui $a0, %hi(D_80A6F4E0) ## $a0 = 80A70000 /* 000B8 80A6F058 0C00084C */ jal osSyncPrintf - + /* 000BC 80A6F05C 2484F4E0 */ addiu $a0, $a0, %lo(D_80A6F4E0) ## $a0 = 80A6F4E0 /* 000C0 80A6F060 3C0880A7 */ lui $t0, %hi(func_80A6F1A4) ## $t0 = 80A70000 /* 000C4 80A6F064 2508F1A4 */ addiu $t0, $t0, %lo(func_80A6F1A4) ## $t0 = 80A6F1A4 @@ -58,10 +58,10 @@ glabel EnHs2_Init /* 000CC 80A6F06C AE0802AC */ sw $t0, 0x02AC($s0) ## 000002AC /* 000D0 80A6F070 A60002A8 */ sh $zero, 0x02A8($s0) ## 000002A8 /* 000D4 80A6F074 A209001F */ sb $t1, 0x001F($s0) ## 0000001F -/* 000D8 80A6F078 8FBF002C */ lw $ra, 0x002C($sp) -/* 000DC 80A6F07C 8FB00028 */ lw $s0, 0x0028($sp) +/* 000D8 80A6F078 8FBF002C */ lw $ra, 0x002C($sp) +/* 000DC 80A6F07C 8FB00028 */ lw $s0, 0x0028($sp) /* 000E0 80A6F080 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 000E4 80A6F084 03E00008 */ jr $ra +/* 000E4 80A6F084 03E00008 */ jr $ra /* 000E8 80A6F088 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s index f08dd67a94..7d8218e606 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s @@ -1,139 +1,139 @@ glabel EnHy_Draw /* 02678 80A71C28 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 0267C 80A71C2C AFBF002C */ sw $ra, 0x002C($sp) -/* 02680 80A71C30 AFB00028 */ sw $s0, 0x0028($sp) -/* 02684 80A71C34 AFA5006C */ sw $a1, 0x006C($sp) +/* 0267C 80A71C2C AFBF002C */ sw $ra, 0x002C($sp) +/* 02680 80A71C30 AFB00028 */ sw $s0, 0x0028($sp) +/* 02684 80A71C34 AFA5006C */ sw $a1, 0x006C($sp) /* 02688 80A71C38 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0268C 80A71C3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02690 80A71C40 3C0680A7 */ lui $a2, %hi(D_80A72850) ## $a2 = 80A70000 /* 02694 80A71C44 24C62850 */ addiu $a2, $a2, %lo(D_80A72850) ## $a2 = 80A72850 /* 02698 80A71C48 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 0269C 80A71C4C 2407090E */ addiu $a3, $zero, 0x090E ## $a3 = 0000090E -/* 026A0 80A71C50 0C031AB1 */ jal func_800C6AC4 -/* 026A4 80A71C54 AFA50054 */ sw $a1, 0x0054($sp) +/* 026A0 80A71C50 0C031AB1 */ jal func_800C6AC4 +/* 026A4 80A71C54 AFA50054 */ sw $a1, 0x0054($sp) /* 026A8 80A71C58 8E180190 */ lw $t8, 0x0190($s0) ## 00000190 /* 026AC 80A71C5C 3C0F80A7 */ lui $t7, %hi(func_80A70E34) ## $t7 = 80A70000 /* 026B0 80A71C60 25EF0E34 */ addiu $t7, $t7, %lo(func_80A70E34) ## $t7 = 80A70E34 -/* 026B4 80A71C64 11F80080 */ beq $t7, $t8, .L80A71E68 -/* 026B8 80A71C68 8FB9006C */ lw $t9, 0x006C($sp) -/* 026BC 80A71C6C 0C024F46 */ jal func_80093D18 +/* 026B4 80A71C64 11F80080 */ beq $t7, $t8, .L80A71E68 +/* 026B8 80A71C68 8FB9006C */ lw $t9, 0x006C($sp) +/* 026BC 80A71C6C 0C024F46 */ jal func_80093D18 /* 026C0 80A71C70 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 026C4 80A71C74 C60C0264 */ lwc1 $f12, 0x0264($s0) ## 00000264 /* 026C8 80A71C78 C60E0268 */ lwc1 $f14, 0x0268($s0) ## 00000268 /* 026CC 80A71C7C 8E06026C */ lw $a2, 0x026C($s0) ## 0000026C -/* 026D0 80A71C80 0C034261 */ jal Matrix_Translate +/* 026D0 80A71C80 0C034261 */ jal Matrix_Translate /* 026D4 80A71C84 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 026D8 80A71C88 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 026DC 80A71C8C 2403000C */ addiu $v1, $zero, 0x000C ## $v1 = 0000000C /* 026E0 80A71C90 3C0280A7 */ lui $v0, %hi(D_80A722D8) ## $v0 = 80A70000 /* 026E4 80A71C94 314B007F */ andi $t3, $t2, 0x007F ## $t3 = 00000000 -/* 026E8 80A71C98 01630019 */ multu $t3, $v1 +/* 026E8 80A71C98 01630019 */ multu $t3, $v1 /* 026EC 80A71C9C 244222D8 */ addiu $v0, $v0, %lo(D_80A722D8) ## $v0 = 80A722D8 /* 026F0 80A71CA0 27A90060 */ addiu $t1, $sp, 0x0060 ## $t1 = FFFFFFF8 /* 026F4 80A71CA4 27B8005C */ addiu $t8, $sp, 0x005C ## $t8 = FFFFFFF4 -/* 026F8 80A71CA8 00006012 */ mflo $t4 -/* 026FC 80A71CAC 004C6821 */ addu $t5, $v0, $t4 +/* 026F8 80A71CA8 00006012 */ mflo $t4 +/* 026FC 80A71CAC 004C6821 */ addu $t5, $v0, $t4 /* 02700 80A71CB0 89AF0002 */ lwl $t7, 0x0002($t5) ## 00000002 /* 02704 80A71CB4 99AF0005 */ lwr $t7, 0x0005($t5) ## 00000005 /* 02708 80A71CB8 AD2F0000 */ sw $t7, 0x0000($t1) ## FFFFFFF8 /* 0270C 80A71CBC 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 02710 80A71CC0 332A007F */ andi $t2, $t9, 0x007F ## $t2 = 00000000 -/* 02714 80A71CC4 01430019 */ multu $t2, $v1 -/* 02718 80A71CC8 00005812 */ mflo $t3 -/* 0271C 80A71CCC 004B6021 */ addu $t4, $v0, $t3 +/* 02714 80A71CC4 01430019 */ multu $t2, $v1 +/* 02718 80A71CC8 00005812 */ mflo $t3 +/* 0271C 80A71CCC 004B6021 */ addu $t4, $v0, $t3 /* 02720 80A71CD0 898D0007 */ lwl $t5, 0x0007($t4) ## 00000007 /* 02724 80A71CD4 998D000A */ lwr $t5, 0x000A($t4) ## 0000000A /* 02728 80A71CD8 AF0D0000 */ sw $t5, 0x0000($t8) ## FFFFFFF4 /* 0272C 80A71CDC 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 02730 80A71CE0 31CF007F */ andi $t7, $t6, 0x007F ## $t7 = 00000000 /* 02734 80A71CE4 25F9FFFE */ addiu $t9, $t7, 0xFFFE ## $t9 = FFFFFFFE -/* 02738 80A71CE8 2F210013 */ sltiu $at, $t9, 0x0013 -/* 0273C 80A71CEC 10200052 */ beq $at, $zero, .L80A71E38 -/* 02740 80A71CF0 0019C880 */ sll $t9, $t9, 2 +/* 02738 80A71CE8 2F210013 */ sltiu $at, $t9, 0x0013 +/* 0273C 80A71CEC 10200052 */ beq $at, $zero, .L80A71E38 +/* 02740 80A71CF0 0019C880 */ sll $t9, $t9, 2 /* 02744 80A71CF4 3C0180A7 */ lui $at, %hi(jtbl_80A72AA0) ## $at = 80A70000 -/* 02748 80A71CF8 00390821 */ addu $at, $at, $t9 -/* 0274C 80A71CFC 8C392AA0 */ lw $t9, %lo(jtbl_80A72AA0)($at) -/* 02750 80A71D00 03200008 */ jr $t9 +/* 02748 80A71CF8 00390821 */ addu $at, $at, $t9 +/* 0274C 80A71CFC 8C392AA0 */ lw $t9, %lo(jtbl_80A72AA0)($at) +/* 02750 80A71D00 03200008 */ jr $t9 /* 02754 80A71D04 00000000 */ nop glabel L80A71D08 -/* 02758 80A71D08 8FA80054 */ lw $t0, 0x0054($sp) +/* 02758 80A71D08 8FA80054 */ lw $t0, 0x0054($sp) /* 0275C 80A71D0C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 02760 80A71D10 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 02764 80A71D14 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02768 80A71D18 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 80A722E0 /* 0276C 80A71D1C AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 /* 02770 80A71D20 AC4B0000 */ sw $t3, 0x0000($v0) ## 80A722D8 -/* 02774 80A71D24 8FB8006C */ lw $t8, 0x006C($sp) -/* 02778 80A71D28 93AC0063 */ lbu $t4, 0x0063($sp) -/* 0277C 80A71D2C 93A70062 */ lbu $a3, 0x0062($sp) +/* 02774 80A71D24 8FB8006C */ lw $t8, 0x006C($sp) +/* 02778 80A71D28 93AC0063 */ lbu $t4, 0x0063($sp) +/* 0277C 80A71D2C 93A70062 */ lbu $a3, 0x0062($sp) /* 02780 80A71D30 8F040000 */ lw $a0, 0x0000($t8) ## FFFFFFF4 -/* 02784 80A71D34 93A60061 */ lbu $a2, 0x0061($sp) -/* 02788 80A71D38 93A50060 */ lbu $a1, 0x0060($sp) -/* 0278C 80A71D3C AFA20040 */ sw $v0, 0x0040($sp) -/* 02790 80A71D40 0C29C6EF */ jal func_80A71BBC -/* 02794 80A71D44 AFAC0010 */ sw $t4, 0x0010($sp) -/* 02798 80A71D48 8FA30040 */ lw $v1, 0x0040($sp) +/* 02784 80A71D34 93A60061 */ lbu $a2, 0x0061($sp) +/* 02788 80A71D38 93A50060 */ lbu $a1, 0x0060($sp) +/* 0278C 80A71D3C AFA20040 */ sw $v0, 0x0040($sp) +/* 02790 80A71D40 0C29C6EF */ jal func_80A71BBC +/* 02794 80A71D44 AFAC0010 */ sw $t4, 0x0010($sp) +/* 02798 80A71D48 8FA30040 */ lw $v1, 0x0040($sp) /* 0279C 80A71D4C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 027A0 80A71D50 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 /* 027A4 80A71D54 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 027A8 80A71D58 8FA80054 */ lw $t0, 0x0054($sp) +/* 027A8 80A71D58 8FA80054 */ lw $t0, 0x0054($sp) /* 027AC 80A71D5C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 027B0 80A71D60 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 027B4 80A71D64 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 027B8 80A71D68 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 027BC 80A71D6C 8FAE006C */ lw $t6, 0x006C($sp) -/* 027C0 80A71D70 93AF005F */ lbu $t7, 0x005F($sp) -/* 027C4 80A71D74 93A7005E */ lbu $a3, 0x005E($sp) +/* 027BC 80A71D6C 8FAE006C */ lw $t6, 0x006C($sp) +/* 027C0 80A71D70 93AF005F */ lbu $t7, 0x005F($sp) +/* 027C4 80A71D74 93A7005E */ lbu $a3, 0x005E($sp) /* 027C8 80A71D78 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 027CC 80A71D7C 93A6005D */ lbu $a2, 0x005D($sp) -/* 027D0 80A71D80 93A5005C */ lbu $a1, 0x005C($sp) -/* 027D4 80A71D84 AFA2003C */ sw $v0, 0x003C($sp) -/* 027D8 80A71D88 0C29C6EF */ jal func_80A71BBC -/* 027DC 80A71D8C AFAF0010 */ sw $t7, 0x0010($sp) -/* 027E0 80A71D90 8FA3003C */ lw $v1, 0x003C($sp) +/* 027CC 80A71D7C 93A6005D */ lbu $a2, 0x005D($sp) +/* 027D0 80A71D80 93A5005C */ lbu $a1, 0x005C($sp) +/* 027D4 80A71D84 AFA2003C */ sw $v0, 0x003C($sp) +/* 027D8 80A71D88 0C29C6EF */ jal func_80A71BBC +/* 027DC 80A71D8C AFAF0010 */ sw $t7, 0x0010($sp) +/* 027E0 80A71D90 8FA3003C */ lw $v1, 0x003C($sp) /* 027E4 80A71D94 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B /* 027E8 80A71D98 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 027EC 80A71D9C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 027F0 80A71DA0 24030008 */ addiu $v1, $zero, 0x0008 ## $v1 = 00000008 /* 027F4 80A71DA4 3042007F */ andi $v0, $v0, 0x007F ## $v0 = 00000000 -/* 027F8 80A71DA8 10620003 */ beq $v1, $v0, .L80A71DB8 +/* 027F8 80A71DA8 10620003 */ beq $v1, $v0, .L80A71DB8 /* 027FC 80A71DAC 00000000 */ nop -/* 02800 80A71DB0 54410022 */ bnel $v0, $at, .L80A71E3C +/* 02800 80A71DB0 54410022 */ bnel $v0, $at, .L80A71E3C /* 02804 80A71DB4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 .L80A71DB8: -/* 02808 80A71DB8 14620005 */ bne $v1, $v0, .L80A71DD0 +/* 02808 80A71DB8 14620005 */ bne $v1, $v0, .L80A71DD0 /* 0280C 80A71DBC 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 02810 80A71DC0 8FB90060 */ lw $t9, 0x0060($sp) -/* 02814 80A71DC4 AFB90058 */ sw $t9, 0x0058($sp) +/* 02810 80A71DC0 8FB90060 */ lw $t9, 0x0060($sp) +/* 02814 80A71DC4 AFB90058 */ sw $t9, 0x0058($sp) /* 02818 80A71DC8 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 0281C 80A71DCC 3042007F */ andi $v0, $v0, 0x007F ## $v0 = 00000000 .L80A71DD0: -/* 02820 80A71DD0 14410007 */ bne $v0, $at, .L80A71DF0 +/* 02820 80A71DD0 14410007 */ bne $v0, $at, .L80A71DF0 /* 02824 80A71DD4 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF /* 02828 80A71DD8 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF /* 0282C 80A71DDC 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02830 80A71DE0 A3B80058 */ sb $t8, 0x0058($sp) -/* 02834 80A71DE4 A3AB0059 */ sb $t3, 0x0059($sp) -/* 02838 80A71DE8 A3AA005A */ sb $t2, 0x005A($sp) -/* 0283C 80A71DEC A3A0005B */ sb $zero, 0x005B($sp) +/* 02830 80A71DE0 A3B80058 */ sb $t8, 0x0058($sp) +/* 02834 80A71DE4 A3AB0059 */ sb $t3, 0x0059($sp) +/* 02838 80A71DE8 A3AA005A */ sb $t2, 0x005A($sp) +/* 0283C 80A71DEC A3A0005B */ sb $zero, 0x005B($sp) .L80A71DF0: -/* 02840 80A71DF0 8FAC0054 */ lw $t4, 0x0054($sp) +/* 02840 80A71DF0 8FAC0054 */ lw $t4, 0x0054($sp) /* 02844 80A71DF4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 02848 80A71DF8 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 /* 0284C 80A71DFC 8D8202C0 */ lw $v0, 0x02C0($t4) ## 000002C0 /* 02850 80A71E00 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 02854 80A71E04 AD8902C0 */ sw $t1, 0x02C0($t4) ## 000002C0 /* 02858 80A71E08 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 0285C 80A71E0C 8FAE006C */ lw $t6, 0x006C($sp) -/* 02860 80A71E10 93AF005B */ lbu $t7, 0x005B($sp) -/* 02864 80A71E14 93A7005A */ lbu $a3, 0x005A($sp) +/* 0285C 80A71E0C 8FAE006C */ lw $t6, 0x006C($sp) +/* 02860 80A71E10 93AF005B */ lbu $t7, 0x005B($sp) +/* 02864 80A71E14 93A7005A */ lbu $a3, 0x005A($sp) /* 02868 80A71E18 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 0286C 80A71E1C 93A60059 */ lbu $a2, 0x0059($sp) -/* 02870 80A71E20 93A50058 */ lbu $a1, 0x0058($sp) -/* 02874 80A71E24 AFA20038 */ sw $v0, 0x0038($sp) -/* 02878 80A71E28 0C29C6EF */ jal func_80A71BBC -/* 0287C 80A71E2C AFAF0010 */ sw $t7, 0x0010($sp) -/* 02880 80A71E30 8FA30038 */ lw $v1, 0x0038($sp) +/* 0286C 80A71E1C 93A60059 */ lbu $a2, 0x0059($sp) +/* 02870 80A71E20 93A50058 */ lbu $a1, 0x0058($sp) +/* 02874 80A71E24 AFA20038 */ sw $v0, 0x0038($sp) +/* 02878 80A71E28 0C29C6EF */ jal func_80A71BBC +/* 0287C 80A71E2C AFAF0010 */ sw $t7, 0x0010($sp) +/* 02880 80A71E30 8FA30038 */ lw $v1, 0x0038($sp) /* 02884 80A71E34 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 glabel L80A71E38 .L80A71E38: @@ -145,23 +145,23 @@ glabel L80A71E38 /* 02898 80A71E48 3C0A80A7 */ lui $t2, %hi(func_80A71A64) ## $t2 = 80A70000 /* 0289C 80A71E4C 254A1A64 */ addiu $t2, $t2, %lo(func_80A71A64) ## $t2 = 80A71A64 /* 028A0 80A71E50 273916B8 */ addiu $t9, $t9, %lo(func_80A716B8) ## $t9 = 80A716B8 -/* 028A4 80A71E54 AFB90010 */ sw $t9, 0x0010($sp) -/* 028A8 80A71E58 AFAA0014 */ sw $t2, 0x0014($sp) -/* 028AC 80A71E5C AFB00018 */ sw $s0, 0x0018($sp) -/* 028B0 80A71E60 0C0286B2 */ jal func_800A1AC8 -/* 028B4 80A71E64 8FA4006C */ lw $a0, 0x006C($sp) +/* 028A4 80A71E54 AFB90010 */ sw $t9, 0x0010($sp) +/* 028A8 80A71E58 AFAA0014 */ sw $t2, 0x0014($sp) +/* 028AC 80A71E5C AFB00018 */ sw $s0, 0x0018($sp) +/* 028B0 80A71E60 0C0286B2 */ jal SkelAnime_DrawSV +/* 028B4 80A71E64 8FA4006C */ lw $a0, 0x006C($sp) .L80A71E68: -/* 028B8 80A71E68 8FAB006C */ lw $t3, 0x006C($sp) +/* 028B8 80A71E68 8FAB006C */ lw $t3, 0x006C($sp) /* 028BC 80A71E6C 3C0680A7 */ lui $a2, %hi(D_80A72860) ## $a2 = 80A70000 /* 028C0 80A71E70 24C62860 */ addiu $a2, $a2, %lo(D_80A72860) ## $a2 = 80A72860 /* 028C4 80A71E74 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 028C8 80A71E78 24070954 */ addiu $a3, $zero, 0x0954 ## $a3 = 00000954 -/* 028CC 80A71E7C 0C031AD5 */ jal func_800C6B54 +/* 028CC 80A71E7C 0C031AD5 */ jal func_800C6B54 /* 028D0 80A71E80 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 028D4 80A71E84 8FBF002C */ lw $ra, 0x002C($sp) -/* 028D8 80A71E88 8FB00028 */ lw $s0, 0x0028($sp) +/* 028D4 80A71E84 8FBF002C */ lw $ra, 0x002C($sp) +/* 028D8 80A71E88 8FB00028 */ lw $s0, 0x0028($sp) /* 028DC 80A71E8C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 028E0 80A71E90 03E00008 */ jr $ra +/* 028E0 80A71E90 03E00008 */ jr $ra /* 028E4 80A71E94 00000000 */ nop /* 028E8 80A71E98 00000000 */ nop /* 028EC 80A71E9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s index 26e46582d5..db5fd7f007 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s @@ -1,16 +1,16 @@ glabel func_80A70E34 /* 01884 80A70E34 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01888 80A70E38 AFBF002C */ sw $ra, 0x002C($sp) -/* 0188C 80A70E3C AFB00028 */ sw $s0, 0x0028($sp) +/* 01888 80A70E38 AFBF002C */ sw $ra, 0x002C($sp) +/* 0188C 80A70E3C AFB00028 */ sw $s0, 0x0028($sp) /* 01890 80A70E40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01894 80A70E44 0C29BDE4 */ jal func_80A6F790 -/* 01898 80A70E48 AFA5003C */ sw $a1, 0x003C($sp) -/* 0189C 80A70E4C 104000A5 */ beq $v0, $zero, .L80A710E4 +/* 01894 80A70E44 0C29BDE4 */ jal func_80A6F790 +/* 01898 80A70E48 AFA5003C */ sw $a1, 0x003C($sp) +/* 0189C 80A70E4C 104000A5 */ beq $v0, $zero, .L80A710E4 /* 018A0 80A70E50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018A4 80A70E54 0C29BDB0 */ jal func_80A6F6C0 -/* 018A8 80A70E58 8FA5003C */ lw $a1, 0x003C($sp) -/* 018AC 80A70E5C 104000A1 */ beq $v0, $zero, .L80A710E4 -/* 018B0 80A70E60 8FA4003C */ lw $a0, 0x003C($sp) +/* 018A4 80A70E54 0C29BDB0 */ jal func_80A6F6C0 +/* 018A8 80A70E58 8FA5003C */ lw $a1, 0x003C($sp) +/* 018AC 80A70E5C 104000A1 */ beq $v0, $zero, .L80A710E4 +/* 018B0 80A70E60 8FA4003C */ lw $a0, 0x003C($sp) /* 018B4 80A70E64 820E0198 */ lb $t6, 0x0198($s0) ## 00000198 /* 018B8 80A70E68 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 /* 018BC 80A70E6C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -18,179 +18,179 @@ glabel func_80A70E34 /* 018C4 80A70E74 820F001E */ lb $t7, 0x001E($s0) ## 0000001E /* 018C8 80A70E78 3C0D80A7 */ lui $t5, %hi(D_80A722DE) ## $t5 = 80A70000 /* 018CC 80A70E7C 3C0680A7 */ lui $a2, %hi(D_80A72014) ## $a2 = 80A70000 -/* 018D0 80A70E80 000FC100 */ sll $t8, $t7, 4 -/* 018D4 80A70E84 030FC021 */ addu $t8, $t8, $t7 -/* 018D8 80A70E88 0018C080 */ sll $t8, $t8, 2 -/* 018DC 80A70E8C 0098C821 */ addu $t9, $a0, $t8 -/* 018E0 80A70E90 01194021 */ addu $t0, $t0, $t9 +/* 018D0 80A70E80 000FC100 */ sll $t8, $t7, 4 +/* 018D4 80A70E84 030FC021 */ addu $t8, $t8, $t7 +/* 018D8 80A70E88 0018C080 */ sll $t8, $t8, 2 +/* 018DC 80A70E8C 0098C821 */ addu $t9, $a0, $t8 +/* 018E0 80A70E90 01194021 */ addu $t0, $t0, $t9 /* 018E4 80A70E94 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 /* 018E8 80A70E98 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 /* 018EC 80A70E9C 261802D0 */ addiu $t8, $s0, 0x02D0 ## $t8 = 000002D0 -/* 018F0 80A70EA0 01014821 */ addu $t1, $t0, $at +/* 018F0 80A70EA0 01014821 */ addu $t1, $t0, $at /* 018F4 80A70EA4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 018F8 80A70EA8 AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 /* 018FC 80A70EAC 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 01900 80A70EB0 260F0270 */ addiu $t7, $s0, 0x0270 ## $t7 = 00000270 /* 01904 80A70EB4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 01908 80A70EB8 314B007F */ andi $t3, $t2, 0x007F ## $t3 = 00000000 -/* 0190C 80A70EBC 000B6080 */ sll $t4, $t3, 2 -/* 01910 80A70EC0 018B6023 */ subu $t4, $t4, $t3 -/* 01914 80A70EC4 000C6080 */ sll $t4, $t4, 2 -/* 01918 80A70EC8 01AC6821 */ addu $t5, $t5, $t4 -/* 0191C 80A70ECC 91AD22DE */ lbu $t5, %lo(D_80A722DE)($t5) -/* 01920 80A70ED0 AFA50034 */ sw $a1, 0x0034($sp) -/* 01924 80A70ED4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01928 80A70ED8 000D70C0 */ sll $t6, $t5, 3 -/* 0192C 80A70EDC 00CE3021 */ addu $a2, $a2, $t6 -/* 01930 80A70EE0 8CC62014 */ lw $a2, %lo(D_80A72014)($a2) -/* 01934 80A70EE4 AFB90018 */ sw $t9, 0x0018($sp) -/* 01938 80A70EE8 AFB80014 */ sw $t8, 0x0014($sp) -/* 0193C 80A70EEC 0C0291BE */ jal func_800A46F8 +/* 0190C 80A70EBC 000B6080 */ sll $t4, $t3, 2 +/* 01910 80A70EC0 018B6023 */ subu $t4, $t4, $t3 +/* 01914 80A70EC4 000C6080 */ sll $t4, $t4, 2 +/* 01918 80A70EC8 01AC6821 */ addu $t5, $t5, $t4 +/* 0191C 80A70ECC 91AD22DE */ lbu $t5, %lo(D_80A722DE)($t5) +/* 01920 80A70ED0 AFA50034 */ sw $a1, 0x0034($sp) +/* 01924 80A70ED4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 01928 80A70ED8 000D70C0 */ sll $t6, $t5, 3 +/* 0192C 80A70EDC 00CE3021 */ addu $a2, $a2, $t6 +/* 01930 80A70EE0 8CC62014 */ lw $a2, %lo(D_80A72014)($a2) +/* 01934 80A70EE4 AFB90018 */ sw $t9, 0x0018($sp) +/* 01938 80A70EE8 AFB80014 */ sw $t8, 0x0014($sp) +/* 0193C 80A70EEC 0C0291BE */ jal SkelAnime_InitSV /* 01940 80A70EF0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01944 80A70EF4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01948 80A70EF8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0194C 80A70EFC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 01950 80A70F00 44050000 */ mfc1 $a1, $f0 -/* 01954 80A70F04 44070000 */ mfc1 $a3, $f0 +/* 01950 80A70F00 44050000 */ mfc1 $a1, $f0 +/* 01954 80A70F04 44070000 */ mfc1 $a3, $f0 /* 01958 80A70F08 0C00AC78 */ jal ActorShape_Init - + /* 0195C 80A70F0C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01960 80A70F10 82080199 */ lb $t0, 0x0199($s0) ## 00000199 -/* 01964 80A70F14 8FA4003C */ lw $a0, 0x003C($sp) +/* 01964 80A70F14 8FA4003C */ lw $a0, 0x003C($sp) /* 01968 80A70F18 3C0B0001 */ lui $t3, 0x0001 ## $t3 = 00010000 -/* 0196C 80A70F1C 00084900 */ sll $t1, $t0, 4 -/* 01970 80A70F20 01284821 */ addu $t1, $t1, $t0 -/* 01974 80A70F24 00094880 */ sll $t1, $t1, 2 -/* 01978 80A70F28 00895021 */ addu $t2, $a0, $t1 -/* 0197C 80A70F2C 016A5821 */ addu $t3, $t3, $t2 +/* 0196C 80A70F1C 00084900 */ sll $t1, $t0, 4 +/* 01970 80A70F20 01284821 */ addu $t1, $t1, $t0 +/* 01974 80A70F24 00094880 */ sll $t1, $t1, 2 +/* 01978 80A70F28 00895021 */ addu $t2, $a0, $t1 +/* 0197C 80A70F2C 016A5821 */ addu $t3, $t3, $t2 /* 01980 80A70F30 8D6B17B4 */ lw $t3, 0x17B4($t3) ## 000117B4 /* 01984 80A70F34 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01988 80A70F38 2605019C */ addiu $a1, $s0, 0x019C ## $a1 = 0000019C -/* 0198C 80A70F3C 01616021 */ addu $t4, $t3, $at +/* 0198C 80A70F3C 01616021 */ addu $t4, $t3, $at /* 01990 80A70F40 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 01994 80A70F44 AC2C6FC0 */ sw $t4, 0x6FC0($at) ## 80166FC0 /* 01998 80A70F48 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 0199C 80A70F4C AFA50030 */ sw $a1, 0x0030($sp) + +/* 0199C 80A70F4C AFA50030 */ sw $a1, 0x0030($sp) /* 019A0 80A70F50 3C0780A7 */ lui $a3, %hi(D_80A71EC0) ## $a3 = 80A70000 -/* 019A4 80A70F54 8FA50030 */ lw $a1, 0x0030($sp) +/* 019A4 80A70F54 8FA50030 */ lw $a1, 0x0030($sp) /* 019A8 80A70F58 24E71EC0 */ addiu $a3, $a3, %lo(D_80A71EC0) ## $a3 = 80A71EC0 -/* 019AC 80A70F5C 8FA4003C */ lw $a0, 0x003C($sp) +/* 019AC 80A70F5C 8FA4003C */ lw $a0, 0x003C($sp) /* 019B0 80A70F60 0C01712B */ jal ActorCollider_InitCylinder - + /* 019B4 80A70F64 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 019B8 80A70F68 0C29C198 */ jal func_80A70660 +/* 019B8 80A70F68 0C29C198 */ jal func_80A70660 /* 019BC 80A70F6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 019C0 80A70F70 3C0680A7 */ lui $a2, %hi(D_80A71EEC) ## $a2 = 80A70000 /* 019C4 80A70F74 24C61EEC */ addiu $a2, $a2, %lo(D_80A71EEC) ## $a2 = 80A71EEC /* 019C8 80A70F78 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 019CC 80A70F7C 0C0187BF */ jal func_80061EFC +/* 019CC 80A70F7C 0C0187BF */ jal func_80061EFC /* 019D0 80A70F80 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 019D4 80A70F84 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 019D8 80A70F88 3C0680A7 */ lui $a2, %hi(D_80A722E3) ## $a2 = 80A70000 /* 019DC 80A70F8C 3C0580A7 */ lui $a1, %hi(D_80A72050) ## $a1 = 80A70000 /* 019E0 80A70F90 31AE007F */ andi $t6, $t5, 0x007F ## $t6 = 00000000 -/* 019E4 80A70F94 000E7880 */ sll $t7, $t6, 2 -/* 019E8 80A70F98 01EE7823 */ subu $t7, $t7, $t6 -/* 019EC 80A70F9C 000F7880 */ sll $t7, $t7, 2 -/* 019F0 80A70FA0 00CF3021 */ addu $a2, $a2, $t7 -/* 019F4 80A70FA4 90C622E3 */ lbu $a2, %lo(D_80A722E3)($a2) +/* 019E4 80A70F94 000E7880 */ sll $t7, $t6, 2 +/* 019E8 80A70F98 01EE7823 */ subu $t7, $t7, $t6 +/* 019EC 80A70F9C 000F7880 */ sll $t7, $t7, 2 +/* 019F0 80A70FA0 00CF3021 */ addu $a2, $a2, $t7 +/* 019F4 80A70FA4 90C622E3 */ lbu $a2, %lo(D_80A722E3)($a2) /* 019F8 80A70FA8 24A52050 */ addiu $a1, $a1, %lo(D_80A72050) ## $a1 = 80A72050 -/* 019FC 80A70FAC 0C00D3B0 */ jal func_80034EC0 -/* 01A00 80A70FB0 8FA40034 */ lw $a0, 0x0034($sp) -/* 01A04 80A70FB4 8FB8003C */ lw $t8, 0x003C($sp) +/* 019FC 80A70FAC 0C00D3B0 */ jal func_80034EC0 +/* 01A00 80A70FB0 8FA40034 */ lw $a0, 0x0034($sp) +/* 01A04 80A70FB4 8FB8003C */ lw $t8, 0x003C($sp) /* 01A08 80A70FB8 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 01A0C 80A70FBC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 01A10 80A70FC0 870200A4 */ lh $v0, 0x00A4($t8) ## 000000A4 -/* 01A14 80A70FC4 10410003 */ beq $v0, $at, .L80A70FD4 +/* 01A14 80A70FC4 10410003 */ beq $v0, $at, .L80A70FD4 /* 01A18 80A70FC8 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 01A1C 80A70FCC 5441000A */ bnel $v0, $at, .L80A70FF8 +/* 01A1C 80A70FCC 5441000A */ bnel $v0, $at, .L80A70FF8 /* 01A20 80A70FD0 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A .L80A70FD4: /* 01A24 80A70FD4 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 /* 01A28 80A70FD8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01A2C 80A70FDC 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 01A30 80A70FE0 03214024 */ and $t0, $t9, $at +/* 01A30 80A70FE0 03214024 */ and $t0, $t9, $at /* 01A34 80A70FE4 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 /* 01A38 80A70FE8 E60400F8 */ swc1 $f4, 0x00F8($s0) ## 000000F8 -/* 01A3C 80A70FEC 8FA9003C */ lw $t1, 0x003C($sp) +/* 01A3C 80A70FEC 8FA9003C */ lw $t1, 0x003C($sp) /* 01A40 80A70FF0 852200A4 */ lh $v0, 0x00A4($t1) ## 000000A4 /* 01A44 80A70FF4 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A .L80A70FF8: -/* 01A48 80A70FF8 14410003 */ bne $v0, $at, .L80A71008 +/* 01A48 80A70FF8 14410003 */ bne $v0, $at, .L80A71008 /* 01A4C 80A70FFC 00000000 */ nop /* 01A50 80A71000 954AF540 */ lhu $t2, -0x0AC0($t2) ## 8015F540 /* 01A54 80A71004 A60A0330 */ sh $t2, 0x0330($s0) ## 00000330 .L80A71008: -/* 01A58 80A71008 0C29C1A6 */ jal func_80A70698 +/* 01A58 80A71008 0C29C1A6 */ jal func_80A70698 /* 01A5C 80A7100C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01A60 80A71010 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 01A64 80A71014 8FA4003C */ lw $a0, 0x003C($sp) +/* 01A64 80A71014 8FA4003C */ lw $a0, 0x003C($sp) /* 01A68 80A71018 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F /* 01A6C 80A7101C 30A50780 */ andi $a1, $a1, 0x0780 ## $a1 = 00000000 -/* 01A70 80A71020 000529C3 */ sra $a1, $a1, 7 -/* 01A74 80A71024 00052C00 */ sll $a1, $a1, 16 -/* 01A78 80A71028 0C023938 */ jal func_8008E4E0 -/* 01A7C 80A7102C 00052C03 */ sra $a1, $a1, 16 +/* 01A70 80A71020 000529C3 */ sra $a1, $a1, 7 +/* 01A74 80A71024 00052C00 */ sll $a1, $a1, 16 +/* 01A78 80A71028 0C023938 */ jal func_8008E4E0 +/* 01A7C 80A7102C 00052C03 */ sra $a1, $a1, 16 /* 01A80 80A71030 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 01A84 80A71034 AE020210 */ sw $v0, 0x0210($s0) ## 00000210 /* 01A88 80A71038 316C007F */ andi $t4, $t3, 0x007F ## $t4 = 00000000 -/* 01A8C 80A7103C 2D810015 */ sltiu $at, $t4, 0x0015 -/* 01A90 80A71040 10200026 */ beq $at, $zero, .L80A710DC -/* 01A94 80A71044 000C6080 */ sll $t4, $t4, 2 +/* 01A8C 80A7103C 2D810015 */ sltiu $at, $t4, 0x0015 +/* 01A90 80A71040 10200026 */ beq $at, $zero, .L80A710DC +/* 01A94 80A71044 000C6080 */ sll $t4, $t4, 2 /* 01A98 80A71048 3C0180A7 */ lui $at, %hi(jtbl_80A72A34) ## $at = 80A70000 -/* 01A9C 80A7104C 002C0821 */ addu $at, $at, $t4 -/* 01AA0 80A71050 8C2C2A34 */ lw $t4, %lo(jtbl_80A72A34)($at) -/* 01AA4 80A71054 01800008 */ jr $t4 +/* 01A9C 80A7104C 002C0821 */ addu $at, $at, $t4 +/* 01AA0 80A71050 8C2C2A34 */ lw $t4, %lo(jtbl_80A72A34)($at) +/* 01AA4 80A71054 01800008 */ jr $t4 /* 01AA8 80A71058 00000000 */ nop glabel L80A7105C /* 01AAC 80A7105C 8E0D0210 */ lw $t5, 0x0210($s0) ## 00000210 /* 01AB0 80A71060 3C0E80A7 */ lui $t6, %hi(func_80A711B4) ## $t6 = 80A70000 /* 01AB4 80A71064 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 01AB8 80A71068 11A00004 */ beq $t5, $zero, .L80A7107C +/* 01AB8 80A71068 11A00004 */ beq $t5, $zero, .L80A7107C /* 01ABC 80A7106C 25CE11B4 */ addiu $t6, $t6, %lo(func_80A711B4) ## $t6 = 80A711B4 /* 01AC0 80A71070 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 /* 01AC4 80A71074 00000000 */ nop /* 01AC8 80A71078 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 .L80A7107C: -/* 01ACC 80A7107C 10000019 */ beq $zero, $zero, .L80A710E4 +/* 01ACC 80A7107C 10000019 */ beq $zero, $zero, .L80A710E4 /* 01AD0 80A71080 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 glabel L80A71084 /* 01AD4 80A71084 3C0F80A7 */ lui $t7, %hi(func_80A712C0) ## $t7 = 80A70000 /* 01AD8 80A71088 25EF12C0 */ addiu $t7, $t7, %lo(func_80A712C0) ## $t7 = 80A712C0 /* 01ADC 80A7108C A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -/* 01AE0 80A71090 10000014 */ beq $zero, $zero, .L80A710E4 +/* 01AE0 80A71090 10000014 */ beq $zero, $zero, .L80A710E4 /* 01AE4 80A71094 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 glabel L80A71098 -/* 01AE8 80A71098 8FB8003C */ lw $t8, 0x003C($sp) +/* 01AE8 80A71098 8FB8003C */ lw $t8, 0x003C($sp) /* 01AEC 80A7109C 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 /* 01AF0 80A710A0 3C0880A7 */ lui $t0, %hi(func_80A710F8) ## $t0 = 80A70000 /* 01AF4 80A710A4 871900A4 */ lh $t9, 0x00A4($t8) ## 000000A4 /* 01AF8 80A710A8 250810F8 */ addiu $t0, $t0, %lo(func_80A710F8) ## $t0 = 80A710F8 -/* 01AFC 80A710AC 17210003 */ bne $t9, $at, .L80A710BC +/* 01AFC 80A710AC 17210003 */ bne $t9, $at, .L80A710BC /* 01B00 80A710B0 00000000 */ nop -/* 01B04 80A710B4 1000000B */ beq $zero, $zero, .L80A710E4 +/* 01B04 80A710B4 1000000B */ beq $zero, $zero, .L80A710E4 /* 01B08 80A710B8 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 glabel L80A710BC .L80A710BC: /* 01B0C 80A710BC 3C0980A7 */ lui $t1, %hi(func_80A7127C) ## $t1 = 80A70000 /* 01B10 80A710C0 2529127C */ addiu $t1, $t1, %lo(func_80A7127C) ## $t1 = 80A7127C -/* 01B14 80A710C4 10000007 */ beq $zero, $zero, .L80A710E4 +/* 01B14 80A710C4 10000007 */ beq $zero, $zero, .L80A710E4 /* 01B18 80A710C8 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 glabel L80A710CC /* 01B1C 80A710CC 3C0A80A7 */ lui $t2, %hi(func_80A712B4) ## $t2 = 80A70000 /* 01B20 80A710D0 254A12B4 */ addiu $t2, $t2, %lo(func_80A712B4) ## $t2 = 80A712B4 -/* 01B24 80A710D4 10000003 */ beq $zero, $zero, .L80A710E4 +/* 01B24 80A710D4 10000003 */ beq $zero, $zero, .L80A710E4 /* 01B28 80A710D8 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 .L80A710DC: /* 01B2C 80A710DC 0C00B55C */ jal Actor_Kill - + /* 01B30 80A710E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A710E4: -/* 01B34 80A710E4 8FBF002C */ lw $ra, 0x002C($sp) -/* 01B38 80A710E8 8FB00028 */ lw $s0, 0x0028($sp) +/* 01B34 80A710E4 8FBF002C */ lw $ra, 0x002C($sp) +/* 01B38 80A710E8 8FB00028 */ lw $s0, 0x0028($sp) /* 01B3C 80A710EC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01B40 80A710F0 03E00008 */ jr $ra +/* 01B40 80A710F0 03E00008 */ jr $ra /* 01B44 80A710F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s index 915c601a53..9574b5d5b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s @@ -1,64 +1,64 @@ glabel EnIk_Init /* 03F50 80A78260 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03F54 80A78264 AFBF002C */ sw $ra, 0x002C($sp) -/* 03F58 80A78268 AFB00028 */ sw $s0, 0x0028($sp) -/* 03F5C 80A7826C AFA50034 */ sw $a1, 0x0034($sp) +/* 03F54 80A78264 AFBF002C */ sw $ra, 0x002C($sp) +/* 03F58 80A78268 AFB00028 */ sw $s0, 0x0028($sp) +/* 03F5C 80A7826C AFA50034 */ sw $a1, 0x0034($sp) /* 03F60 80A78270 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 03F64 80A78274 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 03F68 80A78278 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 03F6C 80A7827C 304E00FF */ andi $t6, $v0, 0x00FF ## $t6 = 00000000 -/* 03F70 80A78280 15C00005 */ bne $t6, $zero, .L80A78298 +/* 03F70 80A78280 15C00005 */ bne $t6, $zero, .L80A78298 /* 03F74 80A78284 3043FF00 */ andi $v1, $v0, 0xFF00 ## $v1 = 00000000 /* 03F78 80A78288 95EFF53A */ lhu $t7, -0x0AC6($t7) ## 8015F53A /* 03F7C 80A7828C 31F81000 */ andi $t8, $t7, 0x1000 ## $t8 = 00000000 -/* 03F80 80A78290 17000007 */ bne $t8, $zero, .L80A782B0 +/* 03F80 80A78290 17000007 */ bne $t8, $zero, .L80A782B0 /* 03F84 80A78294 00000000 */ nop .L80A78298: -/* 03F88 80A78298 10600009 */ beq $v1, $zero, .L80A782C0 -/* 03F8C 80A7829C 8FA40034 */ lw $a0, 0x0034($sp) +/* 03F88 80A78298 10600009 */ beq $v1, $zero, .L80A782C0 +/* 03F8C 80A7829C 8FA40034 */ lw $a0, 0x0034($sp) /* 03F90 80A782A0 0C00B2D0 */ jal Flags_GetSwitch - -/* 03F94 80A782A4 00032A03 */ sra $a1, $v1, 8 -/* 03F98 80A782A8 10400005 */ beq $v0, $zero, .L80A782C0 + +/* 03F94 80A782A4 00032A03 */ sra $a1, $v1, 8 +/* 03F98 80A782A8 10400005 */ beq $v0, $zero, .L80A782C0 /* 03F9C 80A782AC 00000000 */ nop .L80A782B0: /* 03FA0 80A782B0 0C00B55C */ jal Actor_Kill - + /* 03FA4 80A782B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FA8 80A782B8 1000001B */ beq $zero, $zero, .L80A78328 -/* 03FAC 80A782BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 03FA8 80A782B8 1000001B */ beq $zero, $zero, .L80A78328 +/* 03FAC 80A782BC 8FBF002C */ lw $ra, 0x002C($sp) .L80A782C0: /* 03FB0 80A782C0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 03FB4 80A782C4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 03FB8 80A782C8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 03FBC 80A782CC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03FC0 80A782D0 0C00AC78 */ jal ActorShape_Init - + /* 03FC4 80A782D4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 03FC8 80A782D8 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 03FCC 80A782DC 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 03FD0 80A782E0 26190190 */ addiu $t9, $s0, 0x0190 ## $t9 = 00000190 /* 03FD4 80A782E4 26080244 */ addiu $t0, $s0, 0x0244 ## $t0 = 00000244 /* 03FD8 80A782E8 2409001E */ addiu $t1, $zero, 0x001E ## $t1 = 0000001E -/* 03FDC 80A782EC AFA90018 */ sw $t1, 0x0018($sp) -/* 03FE0 80A782F0 AFA80014 */ sw $t0, 0x0014($sp) -/* 03FE4 80A782F4 AFB90010 */ sw $t9, 0x0010($sp) +/* 03FDC 80A782EC AFA90018 */ sw $t1, 0x0018($sp) +/* 03FE0 80A782F0 AFA80014 */ sw $t0, 0x0014($sp) +/* 03FE4 80A782F4 AFB90010 */ sw $t9, 0x0010($sp) /* 03FE8 80A782F8 24E7C114 */ addiu $a3, $a3, 0xC114 ## $a3 = 0600C114 /* 03FEC 80A782FC 24C6E178 */ addiu $a2, $a2, 0xE178 ## $a2 = 0601E178 -/* 03FF0 80A78300 8FA40034 */ lw $a0, 0x0034($sp) -/* 03FF4 80A78304 0C0291BE */ jal func_800A46F8 +/* 03FF0 80A78300 8FA40034 */ lw $a0, 0x0034($sp) +/* 03FF4 80A78304 0C0291BE */ jal SkelAnime_InitSV /* 03FF8 80A78308 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 03FFC 80A7830C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04000 80A78310 0C29D0E6 */ jal func_80A74398 -/* 04004 80A78314 8FA50034 */ lw $a1, 0x0034($sp) +/* 04000 80A78310 0C29D0E6 */ jal func_80A74398 +/* 04004 80A78314 8FA50034 */ lw $a1, 0x0034($sp) /* 04008 80A78318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0400C 80A7831C 0C29E034 */ jal func_80A780D0 -/* 04010 80A78320 8FA50034 */ lw $a1, 0x0034($sp) -/* 04014 80A78324 8FBF002C */ lw $ra, 0x002C($sp) +/* 0400C 80A7831C 0C29E034 */ jal func_80A780D0 +/* 04010 80A78320 8FA50034 */ lw $a1, 0x0034($sp) +/* 04014 80A78324 8FBF002C */ lw $ra, 0x002C($sp) .L80A78328: -/* 04018 80A78328 8FB00028 */ lw $s0, 0x0028($sp) +/* 04018 80A78328 8FB00028 */ lw $s0, 0x0028($sp) /* 0401C 80A7832C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04020 80A78330 03E00008 */ jr $ra +/* 04020 80A78330 03E00008 */ jr $ra /* 04024 80A78334 00000000 */ nop /* 04028 80A78338 00000000 */ nop /* 0402C 80A7833C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s index 1727c26274..855fe988aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s @@ -1,28 +1,28 @@ glabel func_80A76798 /* 02488 80A76798 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 0248C 80A7679C AFB10028 */ sw $s1, 0x0028($sp) +/* 0248C 80A7679C AFB10028 */ sw $s1, 0x0028($sp) /* 02490 80A767A0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02494 80A767A4 AFBF002C */ sw $ra, 0x002C($sp) -/* 02498 80A767A8 AFB00024 */ sw $s0, 0x0024($sp) -/* 0249C 80A767AC AFA40080 */ sw $a0, 0x0080($sp) +/* 02494 80A767A4 AFBF002C */ sw $ra, 0x002C($sp) +/* 02498 80A767A8 AFB00024 */ sw $s0, 0x0024($sp) +/* 0249C 80A767AC AFA40080 */ sw $a0, 0x0080($sp) /* 024A0 80A767B0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 024A4 80A767B4 3C0680A8 */ lui $a2, %hi(D_80A786F8) ## $a2 = 80A80000 /* 024A8 80A767B8 24C686F8 */ addiu $a2, $a2, %lo(D_80A786F8) ## $a2 = 80A786F8 /* 024AC 80A767BC 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE8 /* 024B0 80A767C0 2407051D */ addiu $a3, $zero, 0x051D ## $a3 = 0000051D -/* 024B4 80A767C4 0C031AB1 */ jal func_800C6AC4 +/* 024B4 80A767C4 0C031AB1 */ jal func_800C6AC4 /* 024B8 80A767C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 024BC 80A767CC 0C024F46 */ jal func_80093D18 +/* 024BC 80A767CC 0C024F46 */ jal func_80093D18 /* 024C0 80A767D0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 024C4 80A767D4 0C024F61 */ jal func_80093D84 +/* 024C4 80A767D4 0C024F61 */ jal func_80093D84 /* 024C8 80A767D8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 024CC 80A767DC 8FA80080 */ lw $t0, 0x0080($sp) +/* 024CC 80A767DC 8FA80080 */ lw $t0, 0x0080($sp) /* 024D0 80A767E0 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 024D4 80A767E4 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 024D8 80A767E8 8502001C */ lh $v0, 0x001C($t0) ## 0000001C /* 024DC 80A767EC 240500F5 */ addiu $a1, $zero, 0x00F5 ## $a1 = 000000F5 /* 024E0 80A767F0 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 -/* 024E4 80A767F4 14400037 */ bne $v0, $zero, .L80A768D4 +/* 024E4 80A767F4 14400037 */ bne $v0, $zero, .L80A768D4 /* 024E8 80A767F8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 024EC 80A767FC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 024F0 80A76800 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E @@ -31,13 +31,13 @@ glabel func_80A76798 /* 024FC 80A7680C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 02500 80A76810 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 02504 80A76814 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02508 80A76818 AFA00018 */ sw $zero, 0x0018($sp) -/* 0250C 80A7681C AFB90014 */ sw $t9, 0x0014($sp) -/* 02510 80A76820 AFB80010 */ sw $t8, 0x0010($sp) +/* 02508 80A76818 AFA00018 */ sw $zero, 0x0018($sp) +/* 0250C 80A7681C AFB90014 */ sw $t9, 0x0014($sp) +/* 02510 80A76820 AFB80010 */ sw $t8, 0x0010($sp) /* 02514 80A76824 2407009B */ addiu $a3, $zero, 0x009B ## $a3 = 0000009B -/* 02518 80A76828 0C29D86C */ jal func_80A761B0 -/* 0251C 80A7682C AFA20064 */ sw $v0, 0x0064($sp) -/* 02520 80A76830 8FA30064 */ lw $v1, 0x0064($sp) +/* 02518 80A76828 0C29D86C */ jal func_80A761B0 +/* 0251C 80A7682C AFA20064 */ sw $v0, 0x0064($sp) +/* 02520 80A76830 8FA30064 */ lw $v1, 0x0064($sp) /* 02524 80A76834 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 02528 80A76838 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 0252C 80A7683C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -48,14 +48,14 @@ glabel func_80A76798 /* 02540 80A76850 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 02544 80A76854 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 02548 80A76858 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0254C 80A7685C AFA00018 */ sw $zero, 0x0018($sp) -/* 02550 80A76860 AFA00014 */ sw $zero, 0x0014($sp) -/* 02554 80A76864 AFAB0010 */ sw $t3, 0x0010($sp) +/* 0254C 80A7685C AFA00018 */ sw $zero, 0x0018($sp) +/* 02550 80A76860 AFA00014 */ sw $zero, 0x0014($sp) +/* 02554 80A76864 AFAB0010 */ sw $t3, 0x0010($sp) /* 02558 80A76868 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 /* 0255C 80A7686C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02560 80A76870 0C29D86C */ jal func_80A761B0 -/* 02564 80A76874 AFA20060 */ sw $v0, 0x0060($sp) -/* 02568 80A76878 8FA30060 */ lw $v1, 0x0060($sp) +/* 02560 80A76870 0C29D86C */ jal func_80A761B0 +/* 02564 80A76874 AFA20060 */ sw $v0, 0x0060($sp) +/* 02568 80A76878 8FA30060 */ lw $v1, 0x0060($sp) /* 0256C 80A7687C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 02570 80A76880 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 /* 02574 80A76884 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -67,19 +67,19 @@ glabel func_80A76798 /* 0258C 80A7689C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 02590 80A768A0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 02594 80A768A4 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 02598 80A768A8 AFB80018 */ sw $t8, 0x0018($sp) -/* 0259C 80A768AC AFAF0014 */ sw $t7, 0x0014($sp) -/* 025A0 80A768B0 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02598 80A768A8 AFB80018 */ sw $t8, 0x0018($sp) +/* 0259C 80A768AC AFAF0014 */ sw $t7, 0x0014($sp) +/* 025A0 80A768B0 AFAE0010 */ sw $t6, 0x0010($sp) /* 025A4 80A768B4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 025A8 80A768B8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 025AC 80A768BC 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 025B0 80A768C0 0C29D86C */ jal func_80A761B0 -/* 025B4 80A768C4 AFA2005C */ sw $v0, 0x005C($sp) -/* 025B8 80A768C8 8FA3005C */ lw $v1, 0x005C($sp) -/* 025BC 80A768CC 100000B1 */ beq $zero, $zero, .L80A76B94 +/* 025B0 80A768C0 0C29D86C */ jal func_80A761B0 +/* 025B4 80A768C4 AFA2005C */ sw $v0, 0x005C($sp) +/* 025B8 80A768C8 8FA3005C */ lw $v1, 0x005C($sp) +/* 025BC 80A768CC 100000B1 */ beq $zero, $zero, .L80A76B94 /* 025C0 80A768D0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80A768D4: -/* 025C4 80A768D4 1441003B */ bne $v0, $at, .L80A769C4 +/* 025C4 80A768D4 1441003B */ bne $v0, $at, .L80A769C4 /* 025C8 80A768D8 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 025CC 80A768DC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 025D0 80A768E0 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 @@ -89,15 +89,15 @@ glabel func_80A76798 /* 025E0 80A768F0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 025E4 80A768F4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 025E8 80A768F8 240B0023 */ addiu $t3, $zero, 0x0023 ## $t3 = 00000023 -/* 025EC 80A768FC AFAB0014 */ sw $t3, 0x0014($sp) -/* 025F0 80A76900 AFA00018 */ sw $zero, 0x0018($sp) -/* 025F4 80A76904 AFAA0010 */ sw $t2, 0x0010($sp) +/* 025EC 80A768FC AFAB0014 */ sw $t3, 0x0014($sp) +/* 025F0 80A76900 AFA00018 */ sw $zero, 0x0018($sp) +/* 025F4 80A76904 AFAA0010 */ sw $t2, 0x0010($sp) /* 025F8 80A76908 240500F5 */ addiu $a1, $zero, 0x00F5 ## $a1 = 000000F5 /* 025FC 80A7690C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 02600 80A76910 240700CD */ addiu $a3, $zero, 0x00CD ## $a3 = 000000CD -/* 02604 80A76914 0C29D86C */ jal func_80A761B0 -/* 02608 80A76918 AFA20058 */ sw $v0, 0x0058($sp) -/* 0260C 80A7691C 8FA30058 */ lw $v1, 0x0058($sp) +/* 02604 80A76914 0C29D86C */ jal func_80A761B0 +/* 02608 80A76918 AFA20058 */ sw $v0, 0x0058($sp) +/* 0260C 80A7691C 8FA30058 */ lw $v1, 0x0058($sp) /* 02610 80A76920 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 02614 80A76924 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 /* 02618 80A76928 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -108,15 +108,15 @@ glabel func_80A76798 /* 0262C 80A7693C AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 02630 80A76940 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 02634 80A76944 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02638 80A76948 AFA00018 */ sw $zero, 0x0018($sp) -/* 0263C 80A7694C AFAF0014 */ sw $t7, 0x0014($sp) -/* 02640 80A76950 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02638 80A76948 AFA00018 */ sw $zero, 0x0018($sp) +/* 0263C 80A7694C AFAF0014 */ sw $t7, 0x0014($sp) +/* 02640 80A76950 AFAE0010 */ sw $t6, 0x0010($sp) /* 02644 80A76954 240500B9 */ addiu $a1, $zero, 0x00B9 ## $a1 = 000000B9 /* 02648 80A76958 24060087 */ addiu $a2, $zero, 0x0087 ## $a2 = 00000087 /* 0264C 80A7695C 24070019 */ addiu $a3, $zero, 0x0019 ## $a3 = 00000019 -/* 02650 80A76960 0C29D86C */ jal func_80A761B0 -/* 02654 80A76964 AFA20054 */ sw $v0, 0x0054($sp) -/* 02658 80A76968 8FA30054 */ lw $v1, 0x0054($sp) +/* 02650 80A76960 0C29D86C */ jal func_80A761B0 +/* 02654 80A76964 AFA20054 */ sw $v0, 0x0054($sp) +/* 02658 80A76968 8FA30054 */ lw $v1, 0x0054($sp) /* 0265C 80A7696C 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 02660 80A76970 37390028 */ ori $t9, $t9, 0x0028 ## $t9 = DB060028 /* 02664 80A76974 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -128,20 +128,20 @@ glabel func_80A76798 /* 0267C 80A7698C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 02680 80A76990 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 02684 80A76994 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 02688 80A76998 AFAB0018 */ sw $t3, 0x0018($sp) -/* 0268C 80A7699C AFAA0014 */ sw $t2, 0x0014($sp) -/* 02690 80A769A0 AFA90010 */ sw $t1, 0x0010($sp) +/* 02688 80A76998 AFAB0018 */ sw $t3, 0x0018($sp) +/* 0268C 80A7699C AFAA0014 */ sw $t2, 0x0014($sp) +/* 02690 80A769A0 AFA90010 */ sw $t1, 0x0010($sp) /* 02694 80A769A4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 02698 80A769A8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 0269C 80A769AC 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 026A0 80A769B0 0C29D86C */ jal func_80A761B0 -/* 026A4 80A769B4 AFA20050 */ sw $v0, 0x0050($sp) -/* 026A8 80A769B8 8FA30050 */ lw $v1, 0x0050($sp) -/* 026AC 80A769BC 10000075 */ beq $zero, $zero, .L80A76B94 +/* 026A0 80A769B0 0C29D86C */ jal func_80A761B0 +/* 026A4 80A769B4 AFA20050 */ sw $v0, 0x0050($sp) +/* 026A8 80A769B8 8FA30050 */ lw $v1, 0x0050($sp) +/* 026AC 80A769BC 10000075 */ beq $zero, $zero, .L80A76B94 /* 026B0 80A769C0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80A769C4: /* 026B4 80A769C4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 026B8 80A769C8 14410039 */ bne $v0, $at, .L80A76AB0 +/* 026B8 80A769C8 14410039 */ bne $v0, $at, .L80A76AB0 /* 026BC 80A769CC 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 026C0 80A769D0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 026C4 80A769D4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -150,15 +150,15 @@ glabel func_80A76798 /* 026D0 80A769E0 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 026D4 80A769E4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 026D8 80A769E8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 026DC 80A769EC AFA00018 */ sw $zero, 0x0018($sp) -/* 026E0 80A769F0 AFA00014 */ sw $zero, 0x0014($sp) -/* 026E4 80A769F4 AFA00010 */ sw $zero, 0x0010($sp) +/* 026DC 80A769EC AFA00018 */ sw $zero, 0x0018($sp) +/* 026E0 80A769F0 AFA00014 */ sw $zero, 0x0014($sp) +/* 026E4 80A769F4 AFA00010 */ sw $zero, 0x0010($sp) /* 026E8 80A769F8 24050037 */ addiu $a1, $zero, 0x0037 ## $a1 = 00000037 /* 026EC 80A769FC 24060041 */ addiu $a2, $zero, 0x0041 ## $a2 = 00000041 /* 026F0 80A76A00 24070037 */ addiu $a3, $zero, 0x0037 ## $a3 = 00000037 -/* 026F4 80A76A04 0C29D86C */ jal func_80A761B0 -/* 026F8 80A76A08 AFA2004C */ sw $v0, 0x004C($sp) -/* 026FC 80A76A0C 8FA3004C */ lw $v1, 0x004C($sp) +/* 026F4 80A76A04 0C29D86C */ jal func_80A761B0 +/* 026F8 80A76A08 AFA2004C */ sw $v0, 0x004C($sp) +/* 026FC 80A76A0C 8FA3004C */ lw $v1, 0x004C($sp) /* 02700 80A76A10 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 02704 80A76A14 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 /* 02708 80A76A18 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -169,15 +169,15 @@ glabel func_80A76798 /* 0271C 80A76A2C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 02720 80A76A30 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 02724 80A76A34 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02728 80A76A38 AFA00018 */ sw $zero, 0x0018($sp) -/* 0272C 80A76A3C AFB90014 */ sw $t9, 0x0014($sp) -/* 02730 80A76A40 AFB80010 */ sw $t8, 0x0010($sp) +/* 02728 80A76A38 AFA00018 */ sw $zero, 0x0018($sp) +/* 0272C 80A76A3C AFB90014 */ sw $t9, 0x0014($sp) +/* 02730 80A76A40 AFB80010 */ sw $t8, 0x0010($sp) /* 02734 80A76A44 240500CD */ addiu $a1, $zero, 0x00CD ## $a1 = 000000CD /* 02738 80A76A48 240600A5 */ addiu $a2, $zero, 0x00A5 ## $a2 = 000000A5 /* 0273C 80A76A4C 2407004B */ addiu $a3, $zero, 0x004B ## $a3 = 0000004B -/* 02740 80A76A50 0C29D86C */ jal func_80A761B0 -/* 02744 80A76A54 AFA20048 */ sw $v0, 0x0048($sp) -/* 02748 80A76A58 8FA30048 */ lw $v1, 0x0048($sp) +/* 02740 80A76A50 0C29D86C */ jal func_80A761B0 +/* 02744 80A76A54 AFA20048 */ sw $v0, 0x0048($sp) +/* 02748 80A76A58 8FA30048 */ lw $v1, 0x0048($sp) /* 0274C 80A76A5C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 02750 80A76A60 354A0028 */ ori $t2, $t2, 0x0028 ## $t2 = DB060028 /* 02754 80A76A64 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -188,16 +188,16 @@ glabel func_80A76798 /* 02768 80A76A78 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 0276C 80A76A7C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 02770 80A76A80 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02774 80A76A84 AFA00018 */ sw $zero, 0x0018($sp) -/* 02778 80A76A88 AFAC0014 */ sw $t4, 0x0014($sp) -/* 0277C 80A76A8C AFAB0010 */ sw $t3, 0x0010($sp) +/* 02774 80A76A84 AFA00018 */ sw $zero, 0x0018($sp) +/* 02778 80A76A88 AFAC0014 */ sw $t4, 0x0014($sp) +/* 0277C 80A76A8C AFAB0010 */ sw $t3, 0x0010($sp) /* 02780 80A76A90 240500CD */ addiu $a1, $zero, 0x00CD ## $a1 = 000000CD /* 02784 80A76A94 240600A5 */ addiu $a2, $zero, 0x00A5 ## $a2 = 000000A5 /* 02788 80A76A98 2407004B */ addiu $a3, $zero, 0x004B ## $a3 = 0000004B -/* 0278C 80A76A9C 0C29D86C */ jal func_80A761B0 -/* 02790 80A76AA0 AFA20044 */ sw $v0, 0x0044($sp) -/* 02794 80A76AA4 8FA30044 */ lw $v1, 0x0044($sp) -/* 02798 80A76AA8 1000003A */ beq $zero, $zero, .L80A76B94 +/* 0278C 80A76A9C 0C29D86C */ jal func_80A761B0 +/* 02790 80A76AA0 AFA20044 */ sw $v0, 0x0044($sp) +/* 02794 80A76AA4 8FA30044 */ lw $v1, 0x0044($sp) +/* 02798 80A76AA8 1000003A */ beq $zero, $zero, .L80A76B94 /* 0279C 80A76AAC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80A76AB0: /* 027A0 80A76AB0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -209,15 +209,15 @@ glabel func_80A76798 /* 027B8 80A76AC8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 027BC 80A76ACC 241800B4 */ addiu $t8, $zero, 0x00B4 ## $t8 = 000000B4 /* 027C0 80A76AD0 241900B4 */ addiu $t9, $zero, 0x00B4 ## $t9 = 000000B4 -/* 027C4 80A76AD4 AFB90018 */ sw $t9, 0x0018($sp) -/* 027C8 80A76AD8 AFB80014 */ sw $t8, 0x0014($sp) -/* 027CC 80A76ADC AFAF0010 */ sw $t7, 0x0010($sp) +/* 027C4 80A76AD4 AFB90018 */ sw $t9, 0x0018($sp) +/* 027C8 80A76AD8 AFB80014 */ sw $t8, 0x0014($sp) +/* 027CC 80A76ADC AFAF0010 */ sw $t7, 0x0010($sp) /* 027D0 80A76AE0 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 027D4 80A76AE4 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 027D8 80A76AE8 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 027DC 80A76AEC 0C29D86C */ jal func_80A761B0 -/* 027E0 80A76AF0 AFA20040 */ sw $v0, 0x0040($sp) -/* 027E4 80A76AF4 8FA30040 */ lw $v1, 0x0040($sp) +/* 027DC 80A76AEC 0C29D86C */ jal func_80A761B0 +/* 027E0 80A76AF0 AFA20040 */ sw $v0, 0x0040($sp) +/* 027E4 80A76AF4 8FA30040 */ lw $v1, 0x0040($sp) /* 027E8 80A76AF8 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 027EC 80A76AFC 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 027F0 80A76B00 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -228,15 +228,15 @@ glabel func_80A76798 /* 02804 80A76B14 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 02808 80A76B18 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 0280C 80A76B1C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02810 80A76B20 AFA00018 */ sw $zero, 0x0018($sp) -/* 02814 80A76B24 AFAC0014 */ sw $t4, 0x0014($sp) -/* 02818 80A76B28 AFAB0010 */ sw $t3, 0x0010($sp) +/* 02810 80A76B20 AFA00018 */ sw $zero, 0x0018($sp) +/* 02814 80A76B24 AFAC0014 */ sw $t4, 0x0014($sp) +/* 02818 80A76B28 AFAB0010 */ sw $t3, 0x0010($sp) /* 0281C 80A76B2C 240500E1 */ addiu $a1, $zero, 0x00E1 ## $a1 = 000000E1 /* 02820 80A76B30 240600CD */ addiu $a2, $zero, 0x00CD ## $a2 = 000000CD /* 02824 80A76B34 24070073 */ addiu $a3, $zero, 0x0073 ## $a3 = 00000073 -/* 02828 80A76B38 0C29D86C */ jal func_80A761B0 -/* 0282C 80A76B3C AFA2003C */ sw $v0, 0x003C($sp) -/* 02830 80A76B40 8FA3003C */ lw $v1, 0x003C($sp) +/* 02828 80A76B38 0C29D86C */ jal func_80A761B0 +/* 0282C 80A76B3C AFA2003C */ sw $v0, 0x003C($sp) +/* 02830 80A76B40 8FA3003C */ lw $v1, 0x003C($sp) /* 02834 80A76B44 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 02838 80A76B48 35CE0028 */ ori $t6, $t6, 0x0028 ## $t6 = DB060028 /* 0283C 80A76B4C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -247,18 +247,18 @@ glabel func_80A76798 /* 02850 80A76B60 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 02854 80A76B64 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 02858 80A76B68 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0285C 80A76B6C AFA00018 */ sw $zero, 0x0018($sp) -/* 02860 80A76B70 AFB80014 */ sw $t8, 0x0014($sp) -/* 02864 80A76B74 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0285C 80A76B6C AFA00018 */ sw $zero, 0x0018($sp) +/* 02860 80A76B70 AFB80014 */ sw $t8, 0x0014($sp) +/* 02864 80A76B74 AFAF0010 */ sw $t7, 0x0010($sp) /* 02868 80A76B78 240500E1 */ addiu $a1, $zero, 0x00E1 ## $a1 = 000000E1 /* 0286C 80A76B7C 240600CD */ addiu $a2, $zero, 0x00CD ## $a2 = 000000CD /* 02870 80A76B80 24070073 */ addiu $a3, $zero, 0x0073 ## $a3 = 00000073 -/* 02874 80A76B84 0C29D86C */ jal func_80A761B0 -/* 02878 80A76B88 AFA20038 */ sw $v0, 0x0038($sp) -/* 0287C 80A76B8C 8FA30038 */ lw $v1, 0x0038($sp) +/* 02874 80A76B84 0C29D86C */ jal func_80A761B0 +/* 02878 80A76B88 AFA20038 */ sw $v0, 0x0038($sp) +/* 0287C 80A76B8C 8FA30038 */ lw $v1, 0x0038($sp) /* 02880 80A76B90 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80A76B94: -/* 02884 80A76B94 8FB90080 */ lw $t9, 0x0080($sp) +/* 02884 80A76B94 8FB90080 */ lw $t9, 0x0080($sp) /* 02888 80A76B98 3C0980A7 */ lui $t1, %hi(func_80A7626C) ## $t1 = 80A70000 /* 0288C 80A76B9C 3C0A80A7 */ lui $t2, %hi(func_80A76330) ## $t2 = 80A70000 /* 02890 80A76BA0 8F250150 */ lw $a1, 0x0150($t9) ## 00000150 @@ -266,21 +266,21 @@ glabel func_80A76798 /* 02898 80A76BA8 9327014E */ lbu $a3, 0x014E($t9) ## 0000014E /* 0289C 80A76BAC 254A6330 */ addiu $t2, $t2, %lo(func_80A76330) ## $t2 = 80A76330 /* 028A0 80A76BB0 2529626C */ addiu $t1, $t1, %lo(func_80A7626C) ## $t1 = 80A7626C -/* 028A4 80A76BB4 AFA90010 */ sw $t1, 0x0010($sp) -/* 028A8 80A76BB8 AFAA0014 */ sw $t2, 0x0014($sp) +/* 028A4 80A76BB4 AFA90010 */ sw $t1, 0x0010($sp) +/* 028A8 80A76BB8 AFAA0014 */ sw $t2, 0x0014($sp) /* 028AC 80A76BBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 028B0 80A76BC0 0C0286B2 */ jal func_800A1AC8 -/* 028B4 80A76BC4 AFB90018 */ sw $t9, 0x0018($sp) +/* 028B0 80A76BC0 0C0286B2 */ jal SkelAnime_DrawSV +/* 028B4 80A76BC4 AFB90018 */ sw $t9, 0x0018($sp) /* 028B8 80A76BC8 3C0680A8 */ lui $a2, %hi(D_80A78710) ## $a2 = 80A80000 /* 028BC 80A76BCC 24C68710 */ addiu $a2, $a2, %lo(D_80A78710) ## $a2 = 80A78710 /* 028C0 80A76BD0 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE8 /* 028C4 80A76BD4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 028C8 80A76BD8 0C031AD5 */ jal func_800C6B54 +/* 028C8 80A76BD8 0C031AD5 */ jal func_800C6B54 /* 028CC 80A76BDC 24070547 */ addiu $a3, $zero, 0x0547 ## $a3 = 00000547 -/* 028D0 80A76BE0 8FBF002C */ lw $ra, 0x002C($sp) -/* 028D4 80A76BE4 8FB00024 */ lw $s0, 0x0024($sp) -/* 028D8 80A76BE8 8FB10028 */ lw $s1, 0x0028($sp) -/* 028DC 80A76BEC 03E00008 */ jr $ra +/* 028D0 80A76BE0 8FBF002C */ lw $ra, 0x002C($sp) +/* 028D4 80A76BE4 8FB00024 */ lw $s0, 0x0024($sp) +/* 028D8 80A76BE8 8FB10028 */ lw $s1, 0x0028($sp) +/* 028DC 80A76BEC 03E00008 */ jr $ra /* 028E0 80A76BF0 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7735C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7735C.s index 422b709fb0..7cd1495822 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7735C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7735C.s @@ -1,59 +1,59 @@ glabel func_80A7735C /* 0304C 80A7735C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 03050 80A77360 AFB00028 */ sw $s0, 0x0028($sp) +/* 03050 80A77360 AFB00028 */ sw $s0, 0x0028($sp) /* 03054 80A77364 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03058 80A77368 AFBF002C */ sw $ra, 0x002C($sp) +/* 03058 80A77368 AFBF002C */ sw $ra, 0x002C($sp) /* 0305C 80A7736C 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 03060 80A77370 AFA5004C */ sw $a1, 0x004C($sp) +/* 03060 80A77370 AFA5004C */ sw $a1, 0x004C($sp) /* 03064 80A77374 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03068 80A77378 248403D8 */ addiu $a0, $a0, 0x03D8 ## $a0 = 060203D8 /* 0306C 80A7737C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03070 80A77380 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 03074 80A77384 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 -/* 03078 80A77388 468021A0 */ cvt.s.w $f6, $f4 +/* 03078 80A77388 468021A0 */ cvt.s.w $f6, $f4 /* 0307C 80A7738C 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 03080 80A77390 260F0244 */ addiu $t7, $s0, 0x0244 ## $t7 = 00000244 /* 03084 80A77394 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 03088 80A77398 AFB80018 */ sw $t8, 0x0018($sp) -/* 0308C 80A7739C AFAF0014 */ sw $t7, 0x0014($sp) -/* 03090 80A773A0 E7A60038 */ swc1 $f6, 0x0038($sp) -/* 03094 80A773A4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 03088 80A77398 AFB80018 */ sw $t8, 0x0018($sp) +/* 0308C 80A7739C AFAF0014 */ sw $t7, 0x0014($sp) +/* 03090 80A773A0 E7A60038 */ swc1 $f6, 0x0038($sp) +/* 03094 80A773A4 AFAE0010 */ sw $t6, 0x0010($sp) /* 03098 80A773A8 24C605C0 */ addiu $a2, $a2, 0x05C0 ## $a2 = 060205C0 -/* 0309C 80A773AC AFA50034 */ sw $a1, 0x0034($sp) -/* 030A0 80A773B0 8FA4004C */ lw $a0, 0x004C($sp) -/* 030A4 80A773B4 0C0291BE */ jal func_800A46F8 +/* 0309C 80A773AC AFA50034 */ sw $a1, 0x0034($sp) +/* 030A0 80A773B0 8FA4004C */ lw $a0, 0x004C($sp) +/* 030A4 80A773B4 0C0291BE */ jal SkelAnime_InitSV /* 030A8 80A773B8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 030AC 80A773BC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 030B0 80A773C0 C7A80038 */ lwc1 $f8, 0x0038($sp) +/* 030B0 80A773C0 C7A80038 */ lwc1 $f8, 0x0038($sp) /* 030B4 80A773C4 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 030B8 80A773C8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 030BC 80A773CC 44070000 */ mfc1 $a3, $f0 -/* 030C0 80A773D0 AFB90014 */ sw $t9, 0x0014($sp) +/* 030BC 80A773CC 44070000 */ mfc1 $a3, $f0 +/* 030C0 80A773D0 AFB90014 */ sw $t9, 0x0014($sp) /* 030C4 80A773D4 24A503D8 */ addiu $a1, $a1, 0x03D8 ## $a1 = 060203D8 -/* 030C8 80A773D8 8FA40034 */ lw $a0, 0x0034($sp) +/* 030C8 80A773D8 8FA40034 */ lw $a0, 0x0034($sp) /* 030CC 80A773DC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 030D0 80A773E0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 030D0 80A773E0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 030D4 80A773E4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 030D8 80A773E8 E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 030D8 80A773E8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 030DC 80A773EC 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 030E0 80A773F0 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 030E4 80A773F4 AE0804C8 */ sw $t0, 0x04C8($s0) ## 000004C8 /* 030E8 80A773F8 AE0904CC */ sw $t1, 0x04CC($s0) ## 000004CC -/* 030EC 80A773FC 8FA5004C */ lw $a1, 0x004C($sp) +/* 030EC 80A773FC 8FA5004C */ lw $a1, 0x004C($sp) /* 030F0 80A77400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 030F4 80A77404 0C29DC30 */ jal func_80A770C0 +/* 030F4 80A77404 0C29DC30 */ jal func_80A770C0 /* 030F8 80A77408 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 030FC 80A7740C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03100 80A77410 0C29DCBB */ jal func_80A772EC -/* 03104 80A77414 8FA5004C */ lw $a1, 0x004C($sp) +/* 03100 80A77410 0C29DCBB */ jal func_80A772EC +/* 03104 80A77414 8FA5004C */ lw $a1, 0x004C($sp) /* 03108 80A77418 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF /* 0310C 80A7741C A20A00C8 */ sb $t2, 0x00C8($s0) ## 000000C8 -/* 03110 80A77420 8FBF002C */ lw $ra, 0x002C($sp) -/* 03114 80A77424 8FB00028 */ lw $s0, 0x0028($sp) +/* 03110 80A77420 8FBF002C */ lw $ra, 0x002C($sp) +/* 03114 80A77424 8FB00028 */ lw $s0, 0x0028($sp) /* 03118 80A77428 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0311C 80A7742C 03E00008 */ jr $ra +/* 0311C 80A7742C 03E00008 */ jr $ra /* 03120 80A77430 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s index 0ffd2f3da8..ef8cbdf336 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s @@ -1,23 +1,23 @@ glabel func_80A77844 /* 03534 80A77844 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 03538 80A77848 AFBF002C */ sw $ra, 0x002C($sp) -/* 0353C 80A7784C AFB00028 */ sw $s0, 0x0028($sp) -/* 03540 80A77850 AFA40068 */ sw $a0, 0x0068($sp) -/* 03544 80A77854 AFA5006C */ sw $a1, 0x006C($sp) +/* 03538 80A77848 AFBF002C */ sw $ra, 0x002C($sp) +/* 0353C 80A7784C AFB00028 */ sw $s0, 0x0028($sp) +/* 03540 80A77850 AFA40068 */ sw $a0, 0x0068($sp) +/* 03544 80A77854 AFA5006C */ sw $a1, 0x006C($sp) /* 03548 80A77858 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 0354C 80A7785C 3C0680A8 */ lui $a2, %hi(D_80A787D0) ## $a2 = 80A80000 /* 03550 80A77860 24C687D0 */ addiu $a2, $a2, %lo(D_80A787D0) ## $a2 = 80A787D0 /* 03554 80A77864 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 03558 80A77868 24070142 */ addiu $a3, $zero, 0x0142 ## $a3 = 00000142 -/* 0355C 80A7786C 0C031AB1 */ jal func_800C6AC4 +/* 0355C 80A7786C 0C031AB1 */ jal func_800C6AC4 /* 03560 80A77870 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03564 80A77874 8FA40068 */ lw $a0, 0x0068($sp) -/* 03568 80A77878 8FA5006C */ lw $a1, 0x006C($sp) -/* 0356C 80A7787C 0C00BAF3 */ jal func_8002EBCC +/* 03564 80A77874 8FA40068 */ lw $a0, 0x0068($sp) +/* 03568 80A77878 8FA5006C */ lw $a1, 0x006C($sp) +/* 0356C 80A7787C 0C00BAF3 */ jal func_8002EBCC /* 03570 80A77880 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03574 80A77884 0C024F46 */ jal func_80093D18 +/* 03574 80A77884 0C024F46 */ jal func_80093D18 /* 03578 80A77888 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0357C 80A7788C 0C024F61 */ jal func_80093D84 +/* 0357C 80A7788C 0C024F61 */ jal func_80093D84 /* 03580 80A77890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03584 80A77894 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03588 80A77898 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -27,16 +27,16 @@ glabel func_80A77844 /* 03598 80A778A8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 0359C 80A778AC 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 035A0 80A778B0 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 035A4 80A778B4 AFA80014 */ sw $t0, 0x0014($sp) -/* 035A8 80A778B8 AFB90010 */ sw $t9, 0x0010($sp) -/* 035AC 80A778BC AFA00018 */ sw $zero, 0x0018($sp) +/* 035A4 80A778B4 AFA80014 */ sw $t0, 0x0014($sp) +/* 035A8 80A778B8 AFB90010 */ sw $t9, 0x0010($sp) +/* 035AC 80A778BC AFA00018 */ sw $zero, 0x0018($sp) /* 035B0 80A778C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 035B4 80A778C4 240500F5 */ addiu $a1, $zero, 0x00F5 ## $a1 = 000000F5 /* 035B8 80A778C8 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 /* 035BC 80A778CC 2407009B */ addiu $a3, $zero, 0x009B ## $a3 = 0000009B -/* 035C0 80A778D0 0C29D86C */ jal func_80A761B0 -/* 035C4 80A778D4 AFA20040 */ sw $v0, 0x0040($sp) -/* 035C8 80A778D8 8FA30040 */ lw $v1, 0x0040($sp) +/* 035C0 80A778D0 0C29D86C */ jal func_80A761B0 +/* 035C4 80A778D4 AFA20040 */ sw $v0, 0x0040($sp) +/* 035C8 80A778D8 8FA30040 */ lw $v1, 0x0040($sp) /* 035CC 80A778DC 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 035D0 80A778E0 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 035D4 80A778E4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -46,15 +46,15 @@ glabel func_80A77844 /* 035E4 80A778F4 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 035E8 80A778F8 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 035EC 80A778FC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 035F0 80A77900 AFA00018 */ sw $zero, 0x0018($sp) -/* 035F4 80A77904 AFA00014 */ sw $zero, 0x0014($sp) -/* 035F8 80A77908 AFAB0010 */ sw $t3, 0x0010($sp) +/* 035F0 80A77900 AFA00018 */ sw $zero, 0x0018($sp) +/* 035F4 80A77904 AFA00014 */ sw $zero, 0x0014($sp) +/* 035F8 80A77908 AFAB0010 */ sw $t3, 0x0010($sp) /* 035FC 80A7790C 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 03600 80A77910 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 /* 03604 80A77914 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03608 80A77918 0C29D86C */ jal func_80A761B0 -/* 0360C 80A7791C AFA2003C */ sw $v0, 0x003C($sp) -/* 03610 80A77920 8FA3003C */ lw $v1, 0x003C($sp) +/* 03608 80A77918 0C29D86C */ jal func_80A761B0 +/* 0360C 80A7791C AFA2003C */ sw $v0, 0x003C($sp) +/* 03610 80A77920 8FA3003C */ lw $v1, 0x003C($sp) /* 03614 80A77924 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 03618 80A77928 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 /* 0361C 80A7792C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -65,41 +65,41 @@ glabel func_80A77844 /* 03630 80A77940 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 03634 80A77944 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 03638 80A77948 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 0363C 80A7794C AFB80018 */ sw $t8, 0x0018($sp) -/* 03640 80A77950 AFAF0014 */ sw $t7, 0x0014($sp) -/* 03644 80A77954 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0363C 80A7794C AFB80018 */ sw $t8, 0x0018($sp) +/* 03640 80A77950 AFAF0014 */ sw $t7, 0x0014($sp) +/* 03644 80A77954 AFAE0010 */ sw $t6, 0x0010($sp) /* 03648 80A77958 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0364C 80A7795C 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 03650 80A77960 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 03654 80A77964 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 03658 80A77968 0C29D86C */ jal func_80A761B0 -/* 0365C 80A7796C AFA20038 */ sw $v0, 0x0038($sp) -/* 03660 80A77970 8FA30038 */ lw $v1, 0x0038($sp) +/* 03658 80A77968 0C29D86C */ jal func_80A761B0 +/* 0365C 80A7796C AFA20038 */ sw $v0, 0x0038($sp) +/* 03660 80A77970 8FA30038 */ lw $v1, 0x0038($sp) /* 03664 80A77974 3C1980A7 */ lui $t9, %hi(func_80A77530) ## $t9 = 80A70000 /* 03668 80A77978 3C0880A7 */ lui $t0, %hi(func_80A7759C) ## $t0 = 80A70000 /* 0366C 80A7797C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03670 80A77980 8FA30068 */ lw $v1, 0x0068($sp) +/* 03670 80A77980 8FA30068 */ lw $v1, 0x0068($sp) /* 03674 80A77984 2508759C */ addiu $t0, $t0, %lo(func_80A7759C) ## $t0 = 80A7759C /* 03678 80A77988 27397530 */ addiu $t9, $t9, %lo(func_80A77530) ## $t9 = 80A77530 /* 0367C 80A7798C 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 03680 80A77990 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 03684 80A77994 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 03688 80A77998 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 0368C 80A7799C AFA80014 */ sw $t0, 0x0014($sp) -/* 03690 80A779A0 AFB90010 */ sw $t9, 0x0010($sp) -/* 03694 80A779A4 8FA4006C */ lw $a0, 0x006C($sp) -/* 03698 80A779A8 0C0286B2 */ jal func_800A1AC8 -/* 0369C 80A779AC AFA30018 */ sw $v1, 0x0018($sp) +/* 0368C 80A7799C AFA80014 */ sw $t0, 0x0014($sp) +/* 03690 80A779A0 AFB90010 */ sw $t9, 0x0010($sp) +/* 03694 80A779A4 8FA4006C */ lw $a0, 0x006C($sp) +/* 03698 80A779A8 0C0286B2 */ jal SkelAnime_DrawSV +/* 0369C 80A779AC AFA30018 */ sw $v1, 0x0018($sp) /* 036A0 80A779B0 3C0680A8 */ lui $a2, %hi(D_80A787E8) ## $a2 = 80A80000 /* 036A4 80A779B4 24C687E8 */ addiu $a2, $a2, %lo(D_80A787E8) ## $a2 = 80A787E8 /* 036A8 80A779B8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 036AC 80A779BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 036B0 80A779C0 0C031AD5 */ jal func_800C6B54 +/* 036B0 80A779C0 0C031AD5 */ jal func_800C6B54 /* 036B4 80A779C4 24070159 */ addiu $a3, $zero, 0x0159 ## $a3 = 00000159 -/* 036B8 80A779C8 8FBF002C */ lw $ra, 0x002C($sp) -/* 036BC 80A779CC 8FB00028 */ lw $s0, 0x0028($sp) +/* 036B8 80A779C8 8FBF002C */ lw $ra, 0x002C($sp) +/* 036BC 80A779CC 8FB00028 */ lw $s0, 0x0028($sp) /* 036C0 80A779D0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 036C4 80A779D4 03E00008 */ jr $ra +/* 036C4 80A779D4 03E00008 */ jr $ra /* 036C8 80A779D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s index 54bf18764f..3383a3f640 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s @@ -1,23 +1,23 @@ glabel func_80A77EDC /* 03BCC 80A77EDC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 03BD0 80A77EE0 AFBF002C */ sw $ra, 0x002C($sp) -/* 03BD4 80A77EE4 AFB00028 */ sw $s0, 0x0028($sp) -/* 03BD8 80A77EE8 AFA40068 */ sw $a0, 0x0068($sp) -/* 03BDC 80A77EEC AFA5006C */ sw $a1, 0x006C($sp) +/* 03BD0 80A77EE0 AFBF002C */ sw $ra, 0x002C($sp) +/* 03BD4 80A77EE4 AFB00028 */ sw $s0, 0x0028($sp) +/* 03BD8 80A77EE8 AFA40068 */ sw $a0, 0x0068($sp) +/* 03BDC 80A77EEC AFA5006C */ sw $a1, 0x006C($sp) /* 03BE0 80A77EF0 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 03BE4 80A77EF4 3C0680A8 */ lui $a2, %hi(D_80A78940) ## $a2 = 80A80000 /* 03BE8 80A77EF8 24C68940 */ addiu $a2, $a2, %lo(D_80A78940) ## $a2 = 80A78940 /* 03BEC 80A77EFC 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 03BF0 80A77F00 24070276 */ addiu $a3, $zero, 0x0276 ## $a3 = 00000276 -/* 03BF4 80A77F04 0C031AB1 */ jal func_800C6AC4 +/* 03BF4 80A77F04 0C031AB1 */ jal func_800C6AC4 /* 03BF8 80A77F08 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03BFC 80A77F0C 8FA40068 */ lw $a0, 0x0068($sp) -/* 03C00 80A77F10 8FA5006C */ lw $a1, 0x006C($sp) -/* 03C04 80A77F14 0C00BAF3 */ jal func_8002EBCC +/* 03BFC 80A77F0C 8FA40068 */ lw $a0, 0x0068($sp) +/* 03C00 80A77F10 8FA5006C */ lw $a1, 0x006C($sp) +/* 03C04 80A77F14 0C00BAF3 */ jal func_8002EBCC /* 03C08 80A77F18 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03C0C 80A77F1C 0C024F46 */ jal func_80093D18 +/* 03C0C 80A77F1C 0C024F46 */ jal func_80093D18 /* 03C10 80A77F20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C14 80A77F24 0C024F61 */ jal func_80093D84 +/* 03C14 80A77F24 0C024F61 */ jal func_80093D84 /* 03C18 80A77F28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03C1C 80A77F2C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03C20 80A77F30 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -27,16 +27,16 @@ glabel func_80A77EDC /* 03C30 80A77F40 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 03C34 80A77F44 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 03C38 80A77F48 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 03C3C 80A77F4C AFA80014 */ sw $t0, 0x0014($sp) -/* 03C40 80A77F50 AFB90010 */ sw $t9, 0x0010($sp) -/* 03C44 80A77F54 AFA00018 */ sw $zero, 0x0018($sp) +/* 03C3C 80A77F4C AFA80014 */ sw $t0, 0x0014($sp) +/* 03C40 80A77F50 AFB90010 */ sw $t9, 0x0010($sp) +/* 03C44 80A77F54 AFA00018 */ sw $zero, 0x0018($sp) /* 03C48 80A77F58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03C4C 80A77F5C 240500F5 */ addiu $a1, $zero, 0x00F5 ## $a1 = 000000F5 /* 03C50 80A77F60 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 /* 03C54 80A77F64 2407009B */ addiu $a3, $zero, 0x009B ## $a3 = 0000009B -/* 03C58 80A77F68 0C29D86C */ jal func_80A761B0 -/* 03C5C 80A77F6C AFA20040 */ sw $v0, 0x0040($sp) -/* 03C60 80A77F70 8FA30040 */ lw $v1, 0x0040($sp) +/* 03C58 80A77F68 0C29D86C */ jal func_80A761B0 +/* 03C5C 80A77F6C AFA20040 */ sw $v0, 0x0040($sp) +/* 03C60 80A77F70 8FA30040 */ lw $v1, 0x0040($sp) /* 03C64 80A77F74 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 03C68 80A77F78 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 03C6C 80A77F7C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -46,15 +46,15 @@ glabel func_80A77EDC /* 03C7C 80A77F8C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 03C80 80A77F90 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 03C84 80A77F94 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 03C88 80A77F98 AFA00018 */ sw $zero, 0x0018($sp) -/* 03C8C 80A77F9C AFA00014 */ sw $zero, 0x0014($sp) -/* 03C90 80A77FA0 AFAB0010 */ sw $t3, 0x0010($sp) +/* 03C88 80A77F98 AFA00018 */ sw $zero, 0x0018($sp) +/* 03C8C 80A77F9C AFA00014 */ sw $zero, 0x0014($sp) +/* 03C90 80A77FA0 AFAB0010 */ sw $t3, 0x0010($sp) /* 03C94 80A77FA4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 03C98 80A77FA8 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 /* 03C9C 80A77FAC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03CA0 80A77FB0 0C29D86C */ jal func_80A761B0 -/* 03CA4 80A77FB4 AFA2003C */ sw $v0, 0x003C($sp) -/* 03CA8 80A77FB8 8FA3003C */ lw $v1, 0x003C($sp) +/* 03CA0 80A77FB0 0C29D86C */ jal func_80A761B0 +/* 03CA4 80A77FB4 AFA2003C */ sw $v0, 0x003C($sp) +/* 03CA8 80A77FB8 8FA3003C */ lw $v1, 0x003C($sp) /* 03CAC 80A77FBC 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 03CB0 80A77FC0 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 /* 03CB4 80A77FC4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -65,41 +65,41 @@ glabel func_80A77EDC /* 03CC8 80A77FD8 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 03CCC 80A77FDC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 03CD0 80A77FE0 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 03CD4 80A77FE4 AFB80018 */ sw $t8, 0x0018($sp) -/* 03CD8 80A77FE8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 03CDC 80A77FEC AFAE0010 */ sw $t6, 0x0010($sp) +/* 03CD4 80A77FE4 AFB80018 */ sw $t8, 0x0018($sp) +/* 03CD8 80A77FE8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 03CDC 80A77FEC AFAE0010 */ sw $t6, 0x0010($sp) /* 03CE0 80A77FF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03CE4 80A77FF4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 03CE8 80A77FF8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 03CEC 80A77FFC 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 03CF0 80A78000 0C29D86C */ jal func_80A761B0 -/* 03CF4 80A78004 AFA20038 */ sw $v0, 0x0038($sp) -/* 03CF8 80A78008 8FA30038 */ lw $v1, 0x0038($sp) +/* 03CF0 80A78000 0C29D86C */ jal func_80A761B0 +/* 03CF4 80A78004 AFA20038 */ sw $v0, 0x0038($sp) +/* 03CF8 80A78008 8FA30038 */ lw $v1, 0x0038($sp) /* 03CFC 80A7800C 3C1980A7 */ lui $t9, %hi(func_80A77BF8) ## $t9 = 80A70000 /* 03D00 80A78010 3C0880A7 */ lui $t0, %hi(func_80A77C7C) ## $t0 = 80A70000 /* 03D04 80A78014 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03D08 80A78018 8FA30068 */ lw $v1, 0x0068($sp) +/* 03D08 80A78018 8FA30068 */ lw $v1, 0x0068($sp) /* 03D0C 80A7801C 25087C7C */ addiu $t0, $t0, %lo(func_80A77C7C) ## $t0 = 80A77C7C /* 03D10 80A78020 27397BF8 */ addiu $t9, $t9, %lo(func_80A77BF8) ## $t9 = 80A77BF8 /* 03D14 80A78024 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 03D18 80A78028 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 03D1C 80A7802C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 03D20 80A78030 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 03D24 80A78034 AFA80014 */ sw $t0, 0x0014($sp) -/* 03D28 80A78038 AFB90010 */ sw $t9, 0x0010($sp) -/* 03D2C 80A7803C 8FA4006C */ lw $a0, 0x006C($sp) -/* 03D30 80A78040 0C0286B2 */ jal func_800A1AC8 -/* 03D34 80A78044 AFA30018 */ sw $v1, 0x0018($sp) +/* 03D24 80A78034 AFA80014 */ sw $t0, 0x0014($sp) +/* 03D28 80A78038 AFB90010 */ sw $t9, 0x0010($sp) +/* 03D2C 80A7803C 8FA4006C */ lw $a0, 0x006C($sp) +/* 03D30 80A78040 0C0286B2 */ jal SkelAnime_DrawSV +/* 03D34 80A78044 AFA30018 */ sw $v1, 0x0018($sp) /* 03D38 80A78048 3C0680A8 */ lui $a2, %hi(D_80A7895C) ## $a2 = 80A80000 /* 03D3C 80A7804C 24C6895C */ addiu $a2, $a2, %lo(D_80A7895C) ## $a2 = 80A7895C /* 03D40 80A78050 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 03D44 80A78054 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03D48 80A78058 0C031AD5 */ jal func_800C6B54 +/* 03D48 80A78058 0C031AD5 */ jal func_800C6B54 /* 03D4C 80A7805C 2407028D */ addiu $a3, $zero, 0x028D ## $a3 = 0000028D -/* 03D50 80A78060 8FBF002C */ lw $ra, 0x002C($sp) -/* 03D54 80A78064 8FB00028 */ lw $s0, 0x0028($sp) +/* 03D50 80A78060 8FBF002C */ lw $ra, 0x002C($sp) +/* 03D54 80A78064 8FB00028 */ lw $s0, 0x0028($sp) /* 03D58 80A78068 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 03D5C 80A7806C 03E00008 */ jr $ra +/* 03D5C 80A7806C 03E00008 */ jr $ra /* 03D60 80A78070 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s index 6d9799724a..551ae6a6ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s @@ -1,26 +1,26 @@ glabel EnIn_Draw /* 02704 80A7B6B4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 02708 80A7B6B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0270C 80A7B6BC AFB00028 */ sw $s0, 0x0028($sp) -/* 02710 80A7B6C0 AFA5005C */ sw $a1, 0x005C($sp) +/* 02708 80A7B6B8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0270C 80A7B6BC AFB00028 */ sw $s0, 0x0028($sp) +/* 02710 80A7B6C0 AFA5005C */ sw $a1, 0x005C($sp) /* 02714 80A7B6C4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02718 80A7B6C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0271C 80A7B6CC 3C0680A8 */ lui $a2, %hi(D_80A7BA0C) ## $a2 = 80A80000 /* 02720 80A7B6D0 24C6BA0C */ addiu $a2, $a2, %lo(D_80A7BA0C) ## $a2 = 80A7BA0C /* 02724 80A7B6D4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02728 80A7B6D8 24070950 */ addiu $a3, $zero, 0x0950 ## $a3 = 00000950 -/* 0272C 80A7B6DC 0C031AB1 */ jal func_800C6AC4 -/* 02730 80A7B6E0 AFA50050 */ sw $a1, 0x0050($sp) +/* 0272C 80A7B6DC 0C031AB1 */ jal func_800C6AC4 +/* 02730 80A7B6E0 AFA50050 */ sw $a1, 0x0050($sp) /* 02734 80A7B6E4 8E180190 */ lw $t8, 0x0190($s0) ## 00000190 /* 02738 80A7B6E8 3C0F80A8 */ lui $t7, %hi(func_80A79FB0) ## $t7 = 80A80000 /* 0273C 80A7B6EC 25EF9FB0 */ addiu $t7, $t7, %lo(func_80A79FB0) ## $t7 = 80A79FB0 -/* 02740 80A7B6F0 11F8003C */ beq $t7, $t8, .L80A7B7E4 -/* 02744 80A7B6F4 8FA80050 */ lw $t0, 0x0050($sp) -/* 02748 80A7B6F8 8FB9005C */ lw $t9, 0x005C($sp) +/* 02740 80A7B6F0 11F8003C */ beq $t7, $t8, .L80A7B7E4 +/* 02744 80A7B6F4 8FA80050 */ lw $t0, 0x0050($sp) +/* 02748 80A7B6F8 8FB9005C */ lw $t9, 0x005C($sp) /* 0274C 80A7B6FC 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 02750 80A7B700 0C024F46 */ jal func_80093D18 -/* 02754 80A7B704 AFA80050 */ sw $t0, 0x0050($sp) -/* 02758 80A7B708 8FA80050 */ lw $t0, 0x0050($sp) +/* 02750 80A7B700 0C024F46 */ jal func_80093D18 +/* 02754 80A7B704 AFA80050 */ sw $t0, 0x0050($sp) +/* 02758 80A7B708 8FA80050 */ lw $t0, 0x0050($sp) /* 0275C 80A7B70C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 02760 80A7B710 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 /* 02764 80A7B714 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -32,37 +32,37 @@ glabel EnIn_Draw /* 0277C 80A7B72C 860B01EE */ lh $t3, 0x01EE($s0) ## 000001EE /* 02780 80A7B730 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 02784 80A7B734 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 02788 80A7B738 000B6080 */ sll $t4, $t3, 2 -/* 0278C 80A7B73C 008C2021 */ addu $a0, $a0, $t4 -/* 02790 80A7B740 8C84B9B4 */ lw $a0, %lo(D_80A7B9B4)($a0) +/* 02788 80A7B738 000B6080 */ sll $t4, $t3, 2 +/* 0278C 80A7B73C 008C2021 */ addu $a0, $a0, $t4 +/* 02790 80A7B740 8C84B9B4 */ lw $a0, %lo(D_80A7B9B4)($a0) /* 02794 80A7B744 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF /* 02798 80A7B748 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 0279C 80A7B74C 00047100 */ sll $t6, $a0, 4 -/* 027A0 80A7B750 000E7F02 */ srl $t7, $t6, 28 -/* 027A4 80A7B754 000FC080 */ sll $t8, $t7, 2 -/* 027A8 80A7B758 00D8C821 */ addu $t9, $a2, $t8 +/* 0279C 80A7B74C 00047100 */ sll $t6, $a0, 4 +/* 027A0 80A7B750 000E7F02 */ srl $t7, $t6, 28 +/* 027A4 80A7B754 000FC080 */ sll $t8, $t7, 2 +/* 027A8 80A7B758 00D8C821 */ addu $t9, $a2, $t8 /* 027AC 80A7B75C 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 -/* 027B0 80A7B760 00856824 */ and $t5, $a0, $a1 +/* 027B0 80A7B760 00856824 */ and $t5, $a0, $a1 /* 027B4 80A7B764 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 027B8 80A7B768 01A95021 */ addu $t2, $t5, $t1 -/* 027BC 80A7B76C 01475821 */ addu $t3, $t2, $a3 +/* 027B8 80A7B768 01A95021 */ addu $t2, $t5, $t1 +/* 027BC 80A7B76C 01475821 */ addu $t3, $t2, $a3 /* 027C0 80A7B770 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 /* 027C4 80A7B774 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 027C8 80A7B778 248434D0 */ addiu $a0, $a0, 0x34D0 ## $a0 = 060034D0 -/* 027CC 80A7B77C 00047900 */ sll $t7, $a0, 4 -/* 027D0 80A7B780 000FC702 */ srl $t8, $t7, 28 +/* 027CC 80A7B77C 00047900 */ sll $t7, $a0, 4 +/* 027D0 80A7B780 000FC702 */ srl $t8, $t7, 28 /* 027D4 80A7B784 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 027D8 80A7B788 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 /* 027DC 80A7B78C 35CE0024 */ ori $t6, $t6, 0x0024 ## $t6 = DB060024 -/* 027E0 80A7B790 0018C880 */ sll $t9, $t8, 2 +/* 027E0 80A7B790 0018C880 */ sll $t9, $t8, 2 /* 027E4 80A7B794 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 -/* 027E8 80A7B798 00D96821 */ addu $t5, $a2, $t9 +/* 027E8 80A7B798 00D96821 */ addu $t5, $a2, $t9 /* 027EC 80A7B79C AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 /* 027F0 80A7B7A0 8DA90000 */ lw $t1, 0x0000($t5) ## 00000000 -/* 027F4 80A7B7A4 00855024 */ and $t2, $a0, $a1 +/* 027F4 80A7B7A4 00855024 */ and $t2, $a0, $a1 /* 027F8 80A7B7A8 3C0E80A8 */ lui $t6, %hi(func_80A7B320) ## $t6 = 80A80000 -/* 027FC 80A7B7AC 012A5821 */ addu $t3, $t1, $t2 -/* 02800 80A7B7B0 01676021 */ addu $t4, $t3, $a3 +/* 027FC 80A7B7AC 012A5821 */ addu $t3, $t1, $t2 +/* 02800 80A7B7B0 01676021 */ addu $t4, $t3, $a3 /* 02804 80A7B7B4 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 /* 02808 80A7B7B8 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 0280C 80A7B7BC 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -70,23 +70,23 @@ glabel EnIn_Draw /* 02814 80A7B7C4 3C0F80A8 */ lui $t7, %hi(func_80A7B570) ## $t7 = 80A80000 /* 02818 80A7B7C8 25EFB570 */ addiu $t7, $t7, %lo(func_80A7B570) ## $t7 = 80A7B570 /* 0281C 80A7B7CC 25CEB320 */ addiu $t6, $t6, %lo(func_80A7B320) ## $t6 = 80A7B320 -/* 02820 80A7B7D0 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02824 80A7B7D4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 02828 80A7B7D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0282C 80A7B7DC 0C0286B2 */ jal func_800A1AC8 -/* 02830 80A7B7E0 8FA4005C */ lw $a0, 0x005C($sp) +/* 02820 80A7B7D0 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02824 80A7B7D4 AFAF0014 */ sw $t7, 0x0014($sp) +/* 02828 80A7B7D8 AFB00018 */ sw $s0, 0x0018($sp) +/* 0282C 80A7B7DC 0C0286B2 */ jal SkelAnime_DrawSV +/* 02830 80A7B7E0 8FA4005C */ lw $a0, 0x005C($sp) .L80A7B7E4: -/* 02834 80A7B7E4 8FB8005C */ lw $t8, 0x005C($sp) +/* 02834 80A7B7E4 8FB8005C */ lw $t8, 0x005C($sp) /* 02838 80A7B7E8 3C0680A8 */ lui $a2, %hi(D_80A7BA1C) ## $a2 = 80A80000 /* 0283C 80A7B7EC 24C6BA1C */ addiu $a2, $a2, %lo(D_80A7BA1C) ## $a2 = 80A7BA1C /* 02840 80A7B7F0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02844 80A7B7F4 24070970 */ addiu $a3, $zero, 0x0970 ## $a3 = 00000970 -/* 02848 80A7B7F8 0C031AD5 */ jal func_800C6B54 +/* 02848 80A7B7F8 0C031AD5 */ jal func_800C6B54 /* 0284C 80A7B7FC 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 02850 80A7B800 8FBF002C */ lw $ra, 0x002C($sp) -/* 02854 80A7B804 8FB00028 */ lw $s0, 0x0028($sp) +/* 02850 80A7B800 8FBF002C */ lw $ra, 0x002C($sp) +/* 02854 80A7B804 8FB00028 */ lw $s0, 0x0028($sp) /* 02858 80A7B808 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 0285C 80A7B80C 03E00008 */ jr $ra +/* 0285C 80A7B80C 03E00008 */ jr $ra /* 02860 80A7B810 00000000 */ nop /* 02864 80A7B814 00000000 */ nop /* 02868 80A7B818 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s index 28731cbcf3..19c5a5f90f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s @@ -1,74 +1,74 @@ glabel func_80A79FB0 /* 01000 80A79FB0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01004 80A79FB4 AFB00028 */ sw $s0, 0x0028($sp) +/* 01004 80A79FB4 AFB00028 */ sw $s0, 0x0028($sp) /* 01008 80A79FB8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0100C 80A79FBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01010 80A79FC0 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 01014 80A79FC4 AFBF002C */ sw $ra, 0x002C($sp) -/* 01018 80A79FC8 AFA50044 */ sw $a1, 0x0044($sp) -/* 0101C 80A79FCC AFA0003C */ sw $zero, 0x003C($sp) -/* 01020 80A79FD0 00A12021 */ addu $a0, $a1, $at +/* 01014 80A79FC4 AFBF002C */ sw $ra, 0x002C($sp) +/* 01018 80A79FC8 AFA50044 */ sw $a1, 0x0044($sp) +/* 0101C 80A79FCC AFA0003C */ sw $zero, 0x003C($sp) +/* 01020 80A79FD0 00A12021 */ addu $a0, $a1, $at /* 01024 80A79FD4 0C026062 */ jal Object_IsLoaded - + /* 01028 80A79FD8 820501E4 */ lb $a1, 0x01E4($s0) ## 000001E4 -/* 0102C 80A79FDC 14400003 */ bne $v0, $zero, .L80A79FEC +/* 0102C 80A79FDC 14400003 */ bne $v0, $zero, .L80A79FEC /* 01030 80A79FE0 00000000 */ nop /* 01034 80A79FE4 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 01038 80A79FE8 1DC000C1 */ bgtz $t6, .L80A7A2F0 +/* 01038 80A79FE8 1DC000C1 */ bgtz $t6, .L80A7A2F0 .L80A79FEC: /* 0103C 80A79FEC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 01040 80A79FF0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 01044 80A79FF4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01048 80A79FF8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0104C 80A79FFC 0C00AC78 */ jal ActorShape_Init - + /* 01050 80A7A000 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 01054 80A7A004 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 01058 80A7A008 260F01FE */ addiu $t7, $s0, 0x01FE ## $t7 = 000001FE /* 0105C 80A7A00C 26180276 */ addiu $t8, $s0, 0x0276 ## $t8 = 00000276 /* 01060 80A7A010 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 01064 80A7A014 AFB90018 */ sw $t9, 0x0018($sp) -/* 01068 80A7A018 AFB80014 */ sw $t8, 0x0014($sp) -/* 0106C 80A7A01C AFAF0010 */ sw $t7, 0x0010($sp) +/* 01064 80A7A014 AFB90018 */ sw $t9, 0x0018($sp) +/* 01068 80A7A018 AFB80014 */ sw $t8, 0x0014($sp) +/* 0106C 80A7A01C AFAF0010 */ sw $t7, 0x0010($sp) /* 01070 80A7A020 24C63B88 */ addiu $a2, $a2, 0x3B88 ## $a2 = 06013B88 -/* 01074 80A7A024 8FA40044 */ lw $a0, 0x0044($sp) +/* 01074 80A7A024 8FA40044 */ lw $a0, 0x0044($sp) /* 01078 80A7A028 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0107C 80A7A02C 0C0291BE */ jal func_800A46F8 +/* 0107C 80A7A02C 0C0291BE */ jal SkelAnime_InitSV /* 01080 80A7A030 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01084 80A7A034 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 01088 80A7A038 AFA50034 */ sw $a1, 0x0034($sp) +/* 01088 80A7A038 AFA50034 */ sw $a1, 0x0034($sp) /* 0108C 80A7A03C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 01090 80A7A040 8FA40044 */ lw $a0, 0x0044($sp) + +/* 01090 80A7A040 8FA40044 */ lw $a0, 0x0044($sp) /* 01094 80A7A044 3C0780A8 */ lui $a3, %hi(D_80A7B840) ## $a3 = 80A80000 -/* 01098 80A7A048 8FA50034 */ lw $a1, 0x0034($sp) +/* 01098 80A7A048 8FA50034 */ lw $a1, 0x0034($sp) /* 0109C 80A7A04C 24E7B840 */ addiu $a3, $a3, %lo(D_80A7B840) ## $a3 = 80A7B840 -/* 010A0 80A7A050 8FA40044 */ lw $a0, 0x0044($sp) +/* 010A0 80A7A050 8FA40044 */ lw $a0, 0x0044($sp) /* 010A4 80A7A054 0C01712B */ jal ActorCollider_InitCylinder - + /* 010A8 80A7A058 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 010AC 80A7A05C 3C0680A8 */ lui $a2, %hi(D_80A7B86C) ## $a2 = 80A80000 /* 010B0 80A7A060 24C6B86C */ addiu $a2, $a2, %lo(D_80A7B86C) ## $a2 = 80A7B86C /* 010B4 80A7A064 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 010B8 80A7A068 0C0187BF */ jal func_80061EFC +/* 010B8 80A7A068 0C0187BF */ jal func_80061EFC /* 010BC 80A7A06C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 010C0 80A7A070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010C4 80A7A074 0C29E5D7 */ jal func_80A7975C -/* 010C8 80A7A078 8FA50044 */ lw $a1, 0x0044($sp) -/* 010CC 80A7A07C 10400008 */ beq $v0, $zero, .L80A7A0A0 +/* 010C4 80A7A074 0C29E5D7 */ jal func_80A7975C +/* 010C8 80A7A078 8FA50044 */ lw $a1, 0x0044($sp) +/* 010CC 80A7A07C 10400008 */ beq $v0, $zero, .L80A7A0A0 /* 010D0 80A7A080 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 010D4 80A7A084 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 /* 010D8 80A7A088 94C813FA */ lhu $t0, 0x13FA($a2) ## 8015FA5A /* 010DC 80A7A08C 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 010E0 80A7A090 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 010E4 80A7A094 01014824 */ and $t1, $t0, $at -/* 010E8 80A7A098 10000095 */ beq $zero, $zero, .L80A7A2F0 +/* 010E4 80A7A094 01014824 */ and $t1, $t0, $at +/* 010E8 80A7A098 10000095 */ beq $zero, $zero, .L80A7A2F0 /* 010EC 80A7A09C A4C913FA */ sh $t1, 0x13FA($a2) ## 8015FA5A .L80A7A0A0: /* 010F0 80A7A0A0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 010F4 80A7A0A4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 010F8 80A7A0A8 0C00B58B */ jal Actor_SetScale - + /* 010FC 80A7A0AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01100 80A7A0B0 3C0280A8 */ lui $v0, %hi(func_80A7A4BC) ## $v0 = 80A80000 /* 01104 80A7A0B4 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 @@ -76,168 +76,168 @@ glabel func_80A79FB0 /* 0110C 80A7A0BC A20A001F */ sb $t2, 0x001F($s0) ## 0000001F /* 01110 80A7A0C0 A6000308 */ sh $zero, 0x0308($s0) ## 00000308 /* 01114 80A7A0C4 AE020190 */ sw $v0, 0x0190($s0) ## 00000190 -/* 01118 80A7A0C8 AFA20034 */ sw $v0, 0x0034($sp) -/* 0111C 80A7A0CC 8FA50044 */ lw $a1, 0x0044($sp) -/* 01120 80A7A0D0 0C29E60C */ jal func_80A79830 +/* 01118 80A7A0C8 AFA20034 */ sw $v0, 0x0034($sp) +/* 0111C 80A7A0CC 8FA50044 */ lw $a1, 0x0044($sp) +/* 01120 80A7A0D0 0C29E60C */ jal func_80A79830 /* 01124 80A7A0D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01128 80A7A0D8 1040002E */ beq $v0, $zero, .L80A7A194 +/* 01128 80A7A0D8 1040002E */ beq $v0, $zero, .L80A7A194 /* 0112C 80A7A0DC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01130 80A7A0E0 10450011 */ beq $v0, $a1, .L80A7A128 +/* 01130 80A7A0E0 10450011 */ beq $v0, $a1, .L80A7A128 /* 01134 80A7A0E4 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 01138 80A7A0E8 10430015 */ beq $v0, $v1, .L80A7A140 +/* 01138 80A7A0E8 10430015 */ beq $v0, $v1, .L80A7A140 /* 0113C 80A7A0EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01140 80A7A0F0 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 01144 80A7A0F4 1044001F */ beq $v0, $a0, .L80A7A174 +/* 01144 80A7A0F4 1044001F */ beq $v0, $a0, .L80A7A174 /* 01148 80A7A0F8 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 0114C 80A7A0FC 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 /* 01150 80A7A100 94C213FA */ lhu $v0, 0x13FA($a2) ## 8015FA5A /* 01154 80A7A104 3042000F */ andi $v0, $v0, 0x000F ## $v0 = 00000000 -/* 01158 80A7A108 2C410008 */ sltiu $at, $v0, 0x0008 -/* 0115C 80A7A10C 10200034 */ beq $at, $zero, .L80A7A1E0 -/* 01160 80A7A110 00025880 */ sll $t3, $v0, 2 +/* 01158 80A7A108 2C410008 */ sltiu $at, $v0, 0x0008 +/* 0115C 80A7A10C 10200034 */ beq $at, $zero, .L80A7A1E0 +/* 01160 80A7A110 00025880 */ sll $t3, $v0, 2 /* 01164 80A7A114 3C0180A8 */ lui $at, %hi(jtbl_80A7BA9C) ## $at = 80A80000 -/* 01168 80A7A118 002B0821 */ addu $at, $at, $t3 -/* 0116C 80A7A11C 8C2BBA9C */ lw $t3, %lo(jtbl_80A7BA9C)($at) -/* 01170 80A7A120 01600008 */ jr $t3 +/* 01168 80A7A118 002B0821 */ addu $at, $at, $t3 +/* 0116C 80A7A11C 8C2BBA9C */ lw $t3, %lo(jtbl_80A7BA9C)($at) +/* 01170 80A7A120 01600008 */ jr $t3 /* 01174 80A7A124 00000000 */ nop .L80A7A128: /* 01178 80A7A128 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0117C 80A7A12C 0C29E5BB */ jal func_80A796EC +/* 0117C 80A7A12C 0C29E5BB */ jal func_80A796EC /* 01180 80A7A130 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 01184 80A7A134 8FAC0034 */ lw $t4, 0x0034($sp) -/* 01188 80A7A138 1000006D */ beq $zero, $zero, .L80A7A2F0 +/* 01184 80A7A134 8FAC0034 */ lw $t4, 0x0034($sp) +/* 01188 80A7A138 1000006D */ beq $zero, $zero, .L80A7A2F0 /* 0118C 80A7A13C AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 .L80A7A140: -/* 01190 80A7A140 0C29E5BB */ jal func_80A796EC +/* 01190 80A7A140 0C29E5BB */ jal func_80A796EC /* 01194 80A7A144 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 01198 80A7A148 8FAD0034 */ lw $t5, 0x0034($sp) +/* 01198 80A7A148 8FAD0034 */ lw $t5, 0x0034($sp) /* 0119C 80A7A14C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 011A0 80A7A150 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 /* 011A4 80A7A154 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 /* 011A8 80A7A158 94CE0ED6 */ lhu $t6, 0x0ED6($a2) ## 8015F536 /* 011AC 80A7A15C 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 /* 011B0 80A7A160 31CF0100 */ andi $t7, $t6, 0x0100 ## $t7 = 00000000 -/* 011B4 80A7A164 55E00063 */ bnel $t7, $zero, .L80A7A2F4 -/* 011B8 80A7A168 8FBF002C */ lw $ra, 0x002C($sp) -/* 011BC 80A7A16C 10000060 */ beq $zero, $zero, .L80A7A2F0 +/* 011B4 80A7A164 55E00063 */ bnel $t7, $zero, .L80A7A2F4 +/* 011B8 80A7A168 8FBF002C */ lw $ra, 0x002C($sp) +/* 011BC 80A7A16C 10000060 */ beq $zero, $zero, .L80A7A2F0 /* 011C0 80A7A170 A618001C */ sh $t8, 0x001C($s0) ## 0000001C .L80A7A174: /* 011C4 80A7A174 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011C8 80A7A178 0C29E5BB */ jal func_80A796EC +/* 011C8 80A7A178 0C29E5BB */ jal func_80A796EC /* 011CC 80A7A17C 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 011D0 80A7A180 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 /* 011D4 80A7A184 A60301EE */ sh $v1, 0x01EE($s0) ## 000001EE -/* 011D8 80A7A188 8FB90034 */ lw $t9, 0x0034($sp) -/* 011DC 80A7A18C 10000058 */ beq $zero, $zero, .L80A7A2F0 +/* 011D8 80A7A188 8FB90034 */ lw $t9, 0x0034($sp) +/* 011DC 80A7A18C 10000058 */ beq $zero, $zero, .L80A7A2F0 /* 011E0 80A7A190 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 .L80A7A194: /* 011E4 80A7A194 0C00B55C */ jal Actor_Kill - + /* 011E8 80A7A198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011EC 80A7A19C 10000055 */ beq $zero, $zero, .L80A7A2F4 -/* 011F0 80A7A1A0 8FBF002C */ lw $ra, 0x002C($sp) +/* 011EC 80A7A19C 10000055 */ beq $zero, $zero, .L80A7A2F4 +/* 011F0 80A7A1A0 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A7A1A4 /* 011F4 80A7A1A4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 011F8 80A7A1A8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 011FC 80A7A1AC 5501000D */ bnel $t0, $at, .L80A7A1E4 -/* 01200 80A7A1B0 8FAB003C */ lw $t3, 0x003C($sp) -/* 01204 80A7A1B4 1000000A */ beq $zero, $zero, .L80A7A1E0 -/* 01208 80A7A1B8 AFA5003C */ sw $a1, 0x003C($sp) +/* 011FC 80A7A1AC 5501000D */ bnel $t0, $at, .L80A7A1E4 +/* 01200 80A7A1B0 8FAB003C */ lw $t3, 0x003C($sp) +/* 01204 80A7A1B4 1000000A */ beq $zero, $zero, .L80A7A1E0 +/* 01208 80A7A1B8 AFA5003C */ sw $a1, 0x003C($sp) glabel L80A7A1BC /* 0120C 80A7A1BC 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 01210 80A7A1C0 54690008 */ bnel $v1, $t1, .L80A7A1E4 -/* 01214 80A7A1C4 8FAB003C */ lw $t3, 0x003C($sp) -/* 01218 80A7A1C8 10000005 */ beq $zero, $zero, .L80A7A1E0 -/* 0121C 80A7A1CC AFA5003C */ sw $a1, 0x003C($sp) +/* 01210 80A7A1C0 54690008 */ bnel $v1, $t1, .L80A7A1E4 +/* 01214 80A7A1C4 8FAB003C */ lw $t3, 0x003C($sp) +/* 01218 80A7A1C8 10000005 */ beq $zero, $zero, .L80A7A1E0 +/* 0121C 80A7A1CC AFA5003C */ sw $a1, 0x003C($sp) glabel L80A7A1D0 /* 01220 80A7A1D0 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 01224 80A7A1D4 548A0003 */ bnel $a0, $t2, .L80A7A1E4 -/* 01228 80A7A1D8 8FAB003C */ lw $t3, 0x003C($sp) -/* 0122C 80A7A1DC AFA5003C */ sw $a1, 0x003C($sp) +/* 01224 80A7A1D4 548A0003 */ bnel $a0, $t2, .L80A7A1E4 +/* 01228 80A7A1D8 8FAB003C */ lw $t3, 0x003C($sp) +/* 0122C 80A7A1DC AFA5003C */ sw $a1, 0x003C($sp) .L80A7A1E0: -/* 01230 80A7A1E0 8FAB003C */ lw $t3, 0x003C($sp) +/* 01230 80A7A1E0 8FAB003C */ lw $t3, 0x003C($sp) .L80A7A1E4: -/* 01234 80A7A1E4 2C410008 */ sltiu $at, $v0, 0x0008 -/* 01238 80A7A1E8 11650005 */ beq $t3, $a1, .L80A7A200 +/* 01234 80A7A1E4 2C410008 */ sltiu $at, $v0, 0x0008 +/* 01238 80A7A1E8 11650005 */ beq $t3, $a1, .L80A7A200 /* 0123C 80A7A1EC 00000000 */ nop /* 01240 80A7A1F0 0C00B55C */ jal Actor_Kill - + /* 01244 80A7A1F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01248 80A7A1F8 1000003E */ beq $zero, $zero, .L80A7A2F4 -/* 0124C 80A7A1FC 8FBF002C */ lw $ra, 0x002C($sp) +/* 01248 80A7A1F8 1000003E */ beq $zero, $zero, .L80A7A2F4 +/* 0124C 80A7A1FC 8FBF002C */ lw $ra, 0x002C($sp) .L80A7A200: -/* 01250 80A7A200 1020003B */ beq $at, $zero, .L80A7A2F0 -/* 01254 80A7A204 00026080 */ sll $t4, $v0, 2 +/* 01250 80A7A200 1020003B */ beq $at, $zero, .L80A7A2F0 +/* 01254 80A7A204 00026080 */ sll $t4, $v0, 2 /* 01258 80A7A208 3C0180A8 */ lui $at, %hi(jtbl_80A7BABC) ## $at = 80A80000 -/* 0125C 80A7A20C 002C0821 */ addu $at, $at, $t4 -/* 01260 80A7A210 8C2CBABC */ lw $t4, %lo(jtbl_80A7BABC)($at) -/* 01264 80A7A214 01800008 */ jr $t4 +/* 0125C 80A7A20C 002C0821 */ addu $at, $at, $t4 +/* 01260 80A7A210 8C2CBABC */ lw $t4, %lo(jtbl_80A7BABC)($at) +/* 01264 80A7A214 01800008 */ jr $t4 /* 01268 80A7A218 00000000 */ nop glabel L80A7A21C /* 0126C 80A7A21C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01270 80A7A220 0C29E5BB */ jal func_80A796EC +/* 01270 80A7A220 0C29E5BB */ jal func_80A796EC /* 01274 80A7A224 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 01278 80A7A228 3C0D80A8 */ lui $t5, %hi(func_80A7A4C8) ## $t5 = 80A80000 /* 0127C 80A7A22C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 01280 80A7A230 25ADA4C8 */ addiu $t5, $t5, %lo(func_80A7A4C8) ## $t5 = 80A7A4C8 /* 01284 80A7A234 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 /* 01288 80A7A238 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 0128C 80A7A23C 1000002C */ beq $zero, $zero, .L80A7A2F0 +/* 0128C 80A7A23C 1000002C */ beq $zero, $zero, .L80A7A2F0 /* 01290 80A7A240 A4C013FA */ sh $zero, 0x13FA($a2) ## 8015FA5A glabel L80A7A244 /* 01294 80A7A244 A203001F */ sb $v1, 0x001F($s0) ## 0000001F /* 01298 80A7A248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0129C 80A7A24C 0C29E5BB */ jal func_80A796EC +/* 0129C 80A7A24C 0C29E5BB */ jal func_80A796EC /* 012A0 80A7A250 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 012A4 80A7A254 3C0E80A8 */ lui $t6, %hi(func_80A7A568) ## $t6 = 80A80000 /* 012A8 80A7A258 25CEA568 */ addiu $t6, $t6, %lo(func_80A7A568) ## $t6 = 80A7A568 /* 012AC 80A7A25C AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 012B0 80A7A260 0C0222CD */ jal func_80088B34 +/* 012B0 80A7A260 0C0222CD */ jal func_80088B34 /* 012B4 80A7A264 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 012B8 80A7A268 10000022 */ beq $zero, $zero, .L80A7A2F4 -/* 012BC 80A7A26C 8FBF002C */ lw $ra, 0x002C($sp) +/* 012B8 80A7A268 10000022 */ beq $zero, $zero, .L80A7A2F4 +/* 012BC 80A7A26C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A7A270 /* 012C0 80A7A270 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012C4 80A7A274 0C29E5BB */ jal func_80A796EC +/* 012C4 80A7A274 0C29E5BB */ jal func_80A796EC /* 012C8 80A7A278 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 012CC 80A7A27C 3C0F80A8 */ lui $t7, %hi(func_80A7A770) ## $t7 = 80A80000 /* 012D0 80A7A280 25EFA770 */ addiu $t7, $t7, %lo(func_80A7A770) ## $t7 = 80A7A770 -/* 012D4 80A7A284 1000001A */ beq $zero, $zero, .L80A7A2F0 +/* 012D4 80A7A284 1000001A */ beq $zero, $zero, .L80A7A2F0 /* 012D8 80A7A288 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 glabel L80A7A28C /* 012DC 80A7A28C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012E0 80A7A290 0C29E5BB */ jal func_80A796EC +/* 012E0 80A7A290 0C29E5BB */ jal func_80A796EC /* 012E4 80A7A294 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 /* 012E8 80A7A298 3C1980A8 */ lui $t9, %hi(func_80A7A940) ## $t9 = 80A80000 /* 012EC 80A7A29C 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 /* 012F0 80A7A2A0 2739A940 */ addiu $t9, $t9, %lo(func_80A7A940) ## $t9 = 80A7A940 /* 012F4 80A7A2A4 A61801EC */ sh $t8, 0x01EC($s0) ## 000001EC -/* 012F8 80A7A2A8 10000011 */ beq $zero, $zero, .L80A7A2F0 +/* 012F8 80A7A2A8 10000011 */ beq $zero, $zero, .L80A7A2F0 /* 012FC 80A7A2AC AE190190 */ sw $t9, 0x0190($s0) ## 00000190 glabel L80A7A2B0 /* 01300 80A7A2B0 A203001F */ sb $v1, 0x001F($s0) ## 0000001F /* 01304 80A7A2B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01308 80A7A2B8 0C29E5BB */ jal func_80A796EC +/* 01308 80A7A2B8 0C29E5BB */ jal func_80A796EC /* 0130C 80A7A2BC 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 /* 01310 80A7A2C0 3C0980A8 */ lui $t1, %hi(func_80A7AA40) ## $t1 = 80A80000 /* 01314 80A7A2C4 24080008 */ addiu $t0, $zero, 0x0008 ## $t0 = 00000008 /* 01318 80A7A2C8 2529AA40 */ addiu $t1, $t1, %lo(func_80A7AA40) ## $t1 = 80A7AA40 /* 0131C 80A7A2CC A60801EC */ sh $t0, 0x01EC($s0) ## 000001EC -/* 01320 80A7A2D0 10000007 */ beq $zero, $zero, .L80A7A2F0 +/* 01320 80A7A2D0 10000007 */ beq $zero, $zero, .L80A7A2F0 /* 01324 80A7A2D4 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 glabel L80A7A2D8 /* 01328 80A7A2D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0132C 80A7A2DC 0C29E5BB */ jal func_80A796EC +/* 0132C 80A7A2DC 0C29E5BB */ jal func_80A796EC /* 01330 80A7A2E0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 01334 80A7A2E4 3C0A80A8 */ lui $t2, %hi(func_80A7A848) ## $t2 = 80A80000 /* 01338 80A7A2E8 254AA848 */ addiu $t2, $t2, %lo(func_80A7A848) ## $t2 = 80A7A848 /* 0133C 80A7A2EC AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 .L80A7A2F0: -/* 01340 80A7A2F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 01340 80A7A2F0 8FBF002C */ lw $ra, 0x002C($sp) .L80A7A2F4: -/* 01344 80A7A2F4 8FB00028 */ lw $s0, 0x0028($sp) +/* 01344 80A7A2F4 8FB00028 */ lw $s0, 0x0028($sp) /* 01348 80A7A2F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0134C 80A7A2FC 03E00008 */ jr $ra +/* 0134C 80A7A2FC 03E00008 */ jr $ra /* 01350 80A7A300 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s index 5314ca752d..d373fb2883 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s @@ -1,41 +1,41 @@ glabel EnJj_Draw /* 00800 80A88000 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00804 80A88004 AFBF002C */ sw $ra, 0x002C($sp) -/* 00808 80A88008 AFB00028 */ sw $s0, 0x0028($sp) -/* 0080C 80A8800C AFA5005C */ sw $a1, 0x005C($sp) +/* 00804 80A88004 AFBF002C */ sw $ra, 0x002C($sp) +/* 00808 80A88008 AFB00028 */ sw $s0, 0x0028($sp) +/* 0080C 80A8800C AFA5005C */ sw $a1, 0x005C($sp) /* 00810 80A88010 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00814 80A88014 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00818 80A88018 3C0680A9 */ lui $a2, %hi(D_80A88D10) ## $a2 = 80A90000 /* 0081C 80A8801C 24C68D10 */ addiu $a2, $a2, %lo(D_80A88D10) ## $a2 = 80A88D10 /* 00820 80A88020 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00824 80A88024 2407036F */ addiu $a3, $zero, 0x036F ## $a3 = 0000036F -/* 00828 80A88028 0C031AB1 */ jal func_800C6AC4 -/* 0082C 80A8802C AFA5004C */ sw $a1, 0x004C($sp) -/* 00830 80A88030 8FAF005C */ lw $t7, 0x005C($sp) -/* 00834 80A88034 0C0250F2 */ jal func_800943C8 +/* 00828 80A88028 0C031AB1 */ jal func_800C6AC4 +/* 0082C 80A8802C AFA5004C */ sw $a1, 0x004C($sp) +/* 00830 80A88030 8FAF005C */ lw $t7, 0x005C($sp) +/* 00834 80A88034 0C0250F2 */ jal func_800943C8 /* 00838 80A88038 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 0083C 80A8803C 3C0180A9 */ lui $at, %hi(D_80A88D34) ## $at = 80A90000 -/* 00840 80A88040 C4268D34 */ lwc1 $f6, %lo(D_80A88D34)($at) +/* 00840 80A88040 C4268D34 */ lwc1 $f6, %lo(D_80A88D34)($at) /* 00844 80A88044 C604017C */ lwc1 $f4, 0x017C($s0) ## 0000017C -/* 00848 80A88048 46062302 */ mul.s $f12, $f4, $f6 +/* 00848 80A88048 46062302 */ mul.s $f12, $f4, $f6 /* 0084C 80A8804C 0C041184 */ jal cosf - + /* 00850 80A88050 00000000 */ nop /* 00854 80A88054 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00858 80A88058 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 /* 0085C 80A8805C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00860 80A88060 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00864 80A88064 46020202 */ mul.s $f8, $f0, $f2 -/* 00868 80A88068 44066000 */ mfc1 $a2, $f12 -/* 0086C 80A8806C 0C034261 */ jal Matrix_Translate -/* 00870 80A88070 46024381 */ sub.s $f14, $f8, $f2 +/* 00864 80A88064 46020202 */ mul.s $f8, $f0, $f2 +/* 00868 80A88068 44066000 */ mfc1 $a2, $f12 +/* 0086C 80A8806C 0C034261 */ jal Matrix_Translate +/* 00870 80A88070 46024381 */ sub.s $f14, $f8, $f2 /* 00874 80A88074 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00878 80A88078 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0087C 80A8807C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00880 80A88080 44066000 */ mfc1 $a2, $f12 -/* 00884 80A88084 0C0342A3 */ jal Matrix_Scale -/* 00888 80A88088 46006386 */ mov.s $f14, $f12 -/* 0088C 80A8808C 8FA5004C */ lw $a1, 0x004C($sp) +/* 00880 80A88080 44066000 */ mfc1 $a2, $f12 +/* 00884 80A88084 0C0342A3 */ jal Matrix_Scale +/* 00888 80A88088 46006386 */ mov.s $f14, $f12 +/* 0088C 80A8808C 8FA5004C */ lw $a1, 0x004C($sp) /* 00890 80A88090 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00894 80A88094 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00898 80A88098 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -47,37 +47,37 @@ glabel EnJj_Draw /* 008B0 80A880B0 9208030E */ lbu $t0, 0x030E($s0) ## 0000030E /* 008B4 80A880B4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 008B8 80A880B8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 008BC 80A880BC 00084880 */ sll $t1, $t0, 2 -/* 008C0 80A880C0 00892021 */ addu $a0, $a0, $t1 -/* 008C4 80A880C4 8C848CFC */ lw $a0, %lo(D_80A88CFC)($a0) -/* 008C8 80A880C8 00045900 */ sll $t3, $a0, 4 -/* 008CC 80A880CC 000B6702 */ srl $t4, $t3, 28 -/* 008D0 80A880D0 000C6880 */ sll $t5, $t4, 2 -/* 008D4 80A880D4 01CD7021 */ addu $t6, $t6, $t5 +/* 008BC 80A880BC 00084880 */ sll $t1, $t0, 2 +/* 008C0 80A880C0 00892021 */ addu $a0, $a0, $t1 +/* 008C4 80A880C4 8C848CFC */ lw $a0, %lo(D_80A88CFC)($a0) +/* 008C8 80A880C8 00045900 */ sll $t3, $a0, 4 +/* 008CC 80A880CC 000B6702 */ srl $t4, $t3, 28 +/* 008D0 80A880D0 000C6880 */ sll $t5, $t4, 2 +/* 008D4 80A880D4 01CD7021 */ addu $t6, $t6, $t5 /* 008D8 80A880D8 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 008DC 80A880DC 00815024 */ and $t2, $a0, $at +/* 008DC 80A880DC 00815024 */ and $t2, $a0, $at /* 008E0 80A880E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 008E4 80A880E4 014E7821 */ addu $t7, $t2, $t6 -/* 008E8 80A880E8 01E1C021 */ addu $t8, $t7, $at +/* 008E4 80A880E4 014E7821 */ addu $t7, $t2, $t6 +/* 008E8 80A880E8 01E1C021 */ addu $t8, $t7, $at /* 008EC 80A880EC AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 008F0 80A880F0 92070166 */ lbu $a3, 0x0166($s0) ## 00000166 /* 008F4 80A880F4 8E060184 */ lw $a2, 0x0184($s0) ## 00000184 /* 008F8 80A880F8 8E050168 */ lw $a1, 0x0168($s0) ## 00000168 -/* 008FC 80A880FC AFB00018 */ sw $s0, 0x0018($sp) -/* 00900 80A88100 AFA00014 */ sw $zero, 0x0014($sp) -/* 00904 80A88104 AFA00010 */ sw $zero, 0x0010($sp) -/* 00908 80A88108 0C0286B2 */ jal func_800A1AC8 -/* 0090C 80A8810C 8FA4005C */ lw $a0, 0x005C($sp) -/* 00910 80A88110 8FB9005C */ lw $t9, 0x005C($sp) +/* 008FC 80A880FC AFB00018 */ sw $s0, 0x0018($sp) +/* 00900 80A88100 AFA00014 */ sw $zero, 0x0014($sp) +/* 00904 80A88104 AFA00010 */ sw $zero, 0x0010($sp) +/* 00908 80A88108 0C0286B2 */ jal SkelAnime_DrawSV +/* 0090C 80A8810C 8FA4005C */ lw $a0, 0x005C($sp) +/* 00910 80A88110 8FB9005C */ lw $t9, 0x005C($sp) /* 00914 80A88114 3C0680A9 */ lui $a2, %hi(D_80A88D20) ## $a2 = 80A90000 /* 00918 80A88118 24C68D20 */ addiu $a2, $a2, %lo(D_80A88D20) ## $a2 = 80A88D20 /* 0091C 80A8811C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00920 80A88120 24070382 */ addiu $a3, $zero, 0x0382 ## $a3 = 00000382 -/* 00924 80A88124 0C031AD5 */ jal func_800C6B54 +/* 00924 80A88124 0C031AD5 */ jal func_800C6B54 /* 00928 80A88128 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -/* 0092C 80A8812C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00930 80A88130 8FB00028 */ lw $s0, 0x0028($sp) +/* 0092C 80A8812C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00930 80A88130 8FB00028 */ lw $s0, 0x0028($sp) /* 00934 80A88134 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00938 80A88138 03E00008 */ jr $ra +/* 00938 80A88138 03E00008 */ jr $ra /* 0093C 80A8813C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s index e476a3a127..88f1c11cac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s @@ -1,52 +1,52 @@ glabel EnJj_Init /* 00008 80A87808 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0000C 80A8780C AFB10038 */ sw $s1, 0x0038($sp) +/* 0000C 80A8780C AFB10038 */ sw $s1, 0x0038($sp) /* 00010 80A87810 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00014 80A87814 AFBF003C */ sw $ra, 0x003C($sp) -/* 00018 80A87818 AFB00034 */ sw $s0, 0x0034($sp) +/* 00014 80A87814 AFBF003C */ sw $ra, 0x003C($sp) +/* 00018 80A87818 AFB00034 */ sw $s0, 0x0034($sp) /* 0001C 80A8781C 3C0580A9 */ lui $a1, %hi(D_80A88CE0) ## $a1 = 80A90000 /* 00020 80A87820 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00024 80A87824 AFA0004C */ sw $zero, 0x004C($sp) +/* 00024 80A87824 AFA0004C */ sw $zero, 0x004C($sp) /* 00028 80A87828 0C01E037 */ jal Actor_ProcessInitChain - + /* 0002C 80A8782C 24A58CE0 */ addiu $a1, $a1, %lo(D_80A88CE0) ## $a1 = 80A88CE0 /* 00030 80A87830 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00034 80A87834 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00038 80A87838 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0003C 80A8783C 44050000 */ mfc1 $a1, $f0 -/* 00040 80A87840 44070000 */ mfc1 $a3, $f0 +/* 0003C 80A8783C 44050000 */ mfc1 $a1, $f0 +/* 00040 80A87840 44070000 */ mfc1 $a3, $f0 /* 00044 80A87844 0C00AC78 */ jal ActorShape_Init - + /* 00048 80A87848 00000000 */ nop /* 0004C 80A8784C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00050 80A87850 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 00054 80A87854 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00058 80A87858 10410008 */ beq $v0, $at, .L80A8787C +/* 00058 80A87858 10410008 */ beq $v0, $at, .L80A8787C /* 0005C 80A8785C 26050164 */ addiu $a1, $s0, 0x0164 ## $a1 = 00000164 -/* 00060 80A87860 10400058 */ beq $v0, $zero, .L80A879C4 +/* 00060 80A87860 10400058 */ beq $v0, $zero, .L80A879C4 /* 00064 80A87864 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00068 80A87868 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0006C 80A8786C 10410070 */ beq $v0, $at, .L80A87A30 +/* 0006C 80A8786C 10410070 */ beq $v0, $at, .L80A87A30 /* 00070 80A87870 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00074 80A87874 10000083 */ beq $zero, $zero, .L80A87A84 -/* 00078 80A87878 8FBF003C */ lw $ra, 0x003C($sp) +/* 00074 80A87874 10000083 */ beq $zero, $zero, .L80A87A84 +/* 00078 80A87878 8FBF003C */ lw $ra, 0x003C($sp) .L80A8787C: /* 0007C 80A8787C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00080 80A87880 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00084 80A87884 260E01A8 */ addiu $t6, $s0, 0x01A8 ## $t6 = 000001A8 /* 00088 80A87888 260F022C */ addiu $t7, $s0, 0x022C ## $t7 = 0000022C /* 0008C 80A8788C 24180016 */ addiu $t8, $zero, 0x0016 ## $t8 = 00000016 -/* 00090 80A87890 AFB80018 */ sw $t8, 0x0018($sp) -/* 00094 80A87894 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00098 80A87898 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00090 80A87890 AFB80018 */ sw $t8, 0x0018($sp) +/* 00094 80A87894 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00098 80A87898 AFAE0010 */ sw $t6, 0x0010($sp) /* 0009C 80A8789C 24E71F4C */ addiu $a3, $a3, 0x1F4C ## $a3 = 06001F4C /* 000A0 80A878A0 24C6B9A8 */ addiu $a2, $a2, 0xB9A8 ## $a2 = 0600B9A8 -/* 000A4 80A878A4 0C0291BE */ jal func_800A46F8 -/* 000A8 80A878A8 AFA50044 */ sw $a1, 0x0044($sp) +/* 000A4 80A878A4 0C0291BE */ jal SkelAnime_InitSV +/* 000A8 80A878A8 AFA50044 */ sw $a1, 0x0044($sp) /* 000AC 80A878AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 000B0 80A878B0 24A51F4C */ addiu $a1, $a1, 0x1F4C ## $a1 = 06001F4C -/* 000B4 80A878B4 0C0294BE */ jal func_800A52F8 -/* 000B8 80A878B8 8FA40044 */ lw $a0, 0x0044($sp) +/* 000B4 80A878B4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 000B8 80A878B8 8FA40044 */ lw $a0, 0x0044($sp) /* 000BC 80A878BC A600030A */ sh $zero, 0x030A($s0) ## 0000030A /* 000C0 80A878C0 A200030E */ sb $zero, 0x030E($s0) ## 0000030E /* 000C4 80A878C4 A200030F */ sb $zero, 0x030F($s0) ## 0000030F @@ -57,16 +57,16 @@ glabel EnJj_Init /* 000D8 80A878D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000DC 80A878DC 3C0580A8 */ lui $a1, %hi(func_80A87C30) ## $a1 = 80A80000 /* 000E0 80A878E0 33280400 */ andi $t0, $t9, 0x0400 ## $t0 = 00000000 -/* 000E4 80A878E4 11000007 */ beq $t0, $zero, .L80A87904 +/* 000E4 80A878E4 11000007 */ beq $t0, $zero, .L80A87904 /* 000E8 80A878E8 00000000 */ nop /* 000EC 80A878EC 3C0580A8 */ lui $a1, %hi(func_80A87BEC) ## $a1 = 80A80000 /* 000F0 80A878F0 24A57BEC */ addiu $a1, $a1, %lo(func_80A87BEC) ## $a1 = 80A87BEC -/* 000F4 80A878F4 0C2A1E00 */ jal func_80A87800 +/* 000F4 80A878F4 0C2A1E00 */ jal func_80A87800 /* 000F8 80A878F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000FC 80A878FC 10000004 */ beq $zero, $zero, .L80A87910 +/* 000FC 80A878FC 10000004 */ beq $zero, $zero, .L80A87910 /* 00100 80A87900 3C014120 */ lui $at, 0x4120 ## $at = 41200000 .L80A87904: -/* 00104 80A87904 0C2A1E00 */ jal func_80A87800 +/* 00104 80A87904 0C2A1E00 */ jal func_80A87800 /* 00108 80A87908 24A57C30 */ addiu $a1, $a1, %lo(func_80A87C30) ## $a1 = 00007C30 /* 0010C 80A8790C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 .L80A87910: @@ -74,73 +74,73 @@ glabel EnJj_Init /* 00114 80A87914 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 00118 80A87918 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 0011C 80A8791C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00120 80A87920 46062201 */ sub.s $f8, $f4, $f6 +/* 00120 80A87920 46062201 */ sub.s $f8, $f4, $f6 /* 00124 80A87924 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00128 80A87928 2407005A */ addiu $a3, $zero, 0x005A ## $a3 = 0000005A -/* 0012C 80A8792C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0012C 80A8792C E7A80010 */ swc1 $f8, 0x0010($sp) /* 00130 80A87930 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 00134 80A87934 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 00134 80A87934 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 00138 80A87938 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 0013C 80A8793C AFA0001C */ sw $zero, 0x001C($sp) -/* 00140 80A87940 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 0013C 80A8793C AFA0001C */ sw $zero, 0x001C($sp) +/* 00140 80A87940 E7B00018 */ swc1 $f16, 0x0018($sp) /* 00144 80A87944 86090032 */ lh $t1, 0x0032($s0) ## 00000032 -/* 00148 80A87948 AFA00028 */ sw $zero, 0x0028($sp) -/* 0014C 80A8794C AFA00024 */ sw $zero, 0x0024($sp) +/* 00148 80A87948 AFA00028 */ sw $zero, 0x0028($sp) +/* 0014C 80A8794C AFA00024 */ sw $zero, 0x0024($sp) /* 00150 80A87950 0C00C916 */ jal Actor_SpawnAttached - -/* 00154 80A87954 AFA90020 */ sw $t1, 0x0020($sp) + +/* 00154 80A87954 AFA90020 */ sw $t1, 0x0020($sp) /* 00158 80A87958 AE020300 */ sw $v0, 0x0300($s0) ## 00000300 /* 0015C 80A8795C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00160 80A87960 0C010D20 */ jal DynaPolyInfo_SetActorMove - + /* 00164 80A87964 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00168 80A87968 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0016C 80A8796C 24840A1C */ addiu $a0, $a0, 0x0A1C ## $a0 = 06000A1C /* 00170 80A87970 0C010620 */ jal DynaPolyInfo_Alloc - + /* 00174 80A87974 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFF4 /* 00178 80A87978 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0017C 80A8797C 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 /* 00180 80A87980 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00184 80A87984 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor -/* 00188 80A87988 8FA7004C */ lw $a3, 0x004C($sp) +/* 00188 80A87988 8FA7004C */ lw $a3, 0x004C($sp) /* 0018C 80A8798C AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 00190 80A87990 260502B0 */ addiu $a1, $s0, 0x02B0 ## $a1 = 000002B0 -/* 00194 80A87994 AFA50044 */ sw $a1, 0x0044($sp) +/* 00194 80A87994 AFA50044 */ sw $a1, 0x0044($sp) /* 00198 80A87998 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 0019C 80A8799C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001A0 80A879A0 3C0780A9 */ lui $a3, %hi(D_80A88CB4) ## $a3 = 80A90000 -/* 001A4 80A879A4 8FA50044 */ lw $a1, 0x0044($sp) +/* 001A4 80A879A4 8FA50044 */ lw $a1, 0x0044($sp) /* 001A8 80A879A8 24E78CB4 */ addiu $a3, $a3, %lo(D_80A88CB4) ## $a3 = 80A88CB4 /* 001AC 80A879AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001B0 80A879B0 0C01712B */ jal ActorCollider_InitCylinder - + /* 001B4 80A879B4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001B8 80A879B8 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 001BC 80A879BC 10000030 */ beq $zero, $zero, .L80A87A80 +/* 001BC 80A879BC 10000030 */ beq $zero, $zero, .L80A87A80 /* 001C0 80A879C0 A20A00AE */ sb $t2, 0x00AE($s0) ## 000000AE .L80A879C4: /* 001C4 80A879C4 0C010D20 */ jal DynaPolyInfo_SetActorMove - + /* 001C8 80A879C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 001CC 80A879CC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 001D0 80A879D0 24841830 */ addiu $a0, $a0, 0x1830 ## $a0 = 06001830 /* 001D4 80A879D4 0C010620 */ jal DynaPolyInfo_Alloc - + /* 001D8 80A879D8 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFF4 /* 001DC 80A879DC 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 -/* 001E0 80A879E0 AFA50044 */ sw $a1, 0x0044($sp) +/* 001E0 80A879E0 AFA50044 */ sw $a1, 0x0044($sp) /* 001E4 80A879E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001E8 80A879E8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001EC 80A879EC 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor -/* 001F0 80A879F0 8FA7004C */ lw $a3, 0x004C($sp) -/* 001F4 80A879F4 8FA50044 */ lw $a1, 0x0044($sp) +/* 001F0 80A879F0 8FA7004C */ lw $a3, 0x004C($sp) +/* 001F4 80A879F4 8FA50044 */ lw $a1, 0x0044($sp) /* 001F8 80A879F8 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 001FC 80A879FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00200 80A87A00 0C00FB2A */ jal func_8003ECA8 +/* 00200 80A87A00 0C00FB2A */ jal func_8003ECA8 /* 00204 80A87A04 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 /* 00208 80A87A08 3C0B80A8 */ lui $t3, %hi(func_80A87F44) ## $t3 = 80A80000 /* 0020C 80A87A0C 256B7F44 */ addiu $t3, $t3, %lo(func_80A87F44) ## $t3 = 80A87F44 @@ -149,25 +149,25 @@ glabel EnJj_Init /* 00218 80A87A18 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 /* 0021C 80A87A1C 34A52D0E */ ori $a1, $a1, 0x2D0E ## $a1 = 3DB22D0E /* 00220 80A87A20 0C00B58B */ jal Actor_SetScale - + /* 00224 80A87A24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00228 80A87A28 10000016 */ beq $zero, $zero, .L80A87A84 -/* 0022C 80A87A2C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00228 80A87A28 10000016 */ beq $zero, $zero, .L80A87A84 +/* 0022C 80A87A2C 8FBF003C */ lw $ra, 0x003C($sp) .L80A87A30: /* 00230 80A87A30 0C010D20 */ jal DynaPolyInfo_SetActorMove - + /* 00234 80A87A34 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00238 80A87A38 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0023C 80A87A3C 2484BA8C */ addiu $a0, $a0, 0xBA8C ## $a0 = 0600BA8C /* 00240 80A87A40 0C010620 */ jal DynaPolyInfo_Alloc - + /* 00244 80A87A44 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFF4 /* 00248 80A87A48 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0024C 80A87A4C 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 /* 00250 80A87A50 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00254 80A87A54 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor -/* 00258 80A87A58 8FA7004C */ lw $a3, 0x004C($sp) +/* 00258 80A87A58 8FA7004C */ lw $a3, 0x004C($sp) /* 0025C 80A87A5C 3C0C80A8 */ lui $t4, %hi(func_80A87F44) ## $t4 = 80A80000 /* 00260 80A87A60 258C7F44 */ addiu $t4, $t4, %lo(func_80A87F44) ## $t4 = 80A87F44 /* 00264 80A87A64 3C053DB2 */ lui $a1, 0x3DB2 ## $a1 = 3DB20000 @@ -176,14 +176,14 @@ glabel EnJj_Init /* 00270 80A87A70 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 /* 00274 80A87A74 34A52D0E */ ori $a1, $a1, 0x2D0E ## $a1 = 3DB22D0E /* 00278 80A87A78 0C00B58B */ jal Actor_SetScale - + /* 0027C 80A87A7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A87A80: -/* 00280 80A87A80 8FBF003C */ lw $ra, 0x003C($sp) +/* 00280 80A87A80 8FBF003C */ lw $ra, 0x003C($sp) .L80A87A84: -/* 00284 80A87A84 8FB00034 */ lw $s0, 0x0034($sp) -/* 00288 80A87A88 8FB10038 */ lw $s1, 0x0038($sp) -/* 0028C 80A87A8C 03E00008 */ jr $ra +/* 00284 80A87A84 8FB00034 */ lw $s0, 0x0034($sp) +/* 00288 80A87A88 8FB10038 */ lw $s1, 0x0038($sp) +/* 0028C 80A87A8C 03E00008 */ jr $ra /* 00290 80A87A90 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Draw.s index 062dd55afe..42654dda55 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Draw.s @@ -1,11 +1,11 @@ glabel EnJs_Draw /* 00824 80A89634 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00828 80A89638 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0082C 80A8963C AFA40028 */ sw $a0, 0x0028($sp) -/* 00830 80A89640 AFA5002C */ sw $a1, 0x002C($sp) -/* 00834 80A89644 0C0250F2 */ jal func_800943C8 +/* 00828 80A89638 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0082C 80A8963C AFA40028 */ sw $a0, 0x0028($sp) +/* 00830 80A89640 AFA5002C */ sw $a1, 0x002C($sp) +/* 00834 80A89644 0C0250F2 */ jal func_800943C8 /* 00838 80A89648 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 0083C 80A8964C 8FA20028 */ lw $v0, 0x0028($sp) +/* 0083C 80A8964C 8FA20028 */ lw $v0, 0x0028($sp) /* 00840 80A89650 3C0F80A9 */ lui $t7, %hi(func_80A895C0) ## $t7 = 80A90000 /* 00844 80A89654 3C1880A9 */ lui $t8, %hi(func_80A895F4) ## $t8 = 80A90000 /* 00848 80A89658 8C45019C */ lw $a1, 0x019C($v0) ## 0000019C @@ -13,13 +13,13 @@ glabel EnJs_Draw /* 00850 80A89660 9047019A */ lbu $a3, 0x019A($v0) ## 0000019A /* 00854 80A89664 271895F4 */ addiu $t8, $t8, %lo(func_80A895F4) ## $t8 = 80A895F4 /* 00858 80A89668 25EF95C0 */ addiu $t7, $t7, %lo(func_80A895C0) ## $t7 = 80A895C0 -/* 0085C 80A8966C AFAF0010 */ sw $t7, 0x0010($sp) -/* 00860 80A89670 AFB80014 */ sw $t8, 0x0014($sp) -/* 00864 80A89674 8FA4002C */ lw $a0, 0x002C($sp) -/* 00868 80A89678 0C0286B2 */ jal func_800A1AC8 -/* 0086C 80A8967C AFA20018 */ sw $v0, 0x0018($sp) -/* 00870 80A89680 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0085C 80A8966C AFAF0010 */ sw $t7, 0x0010($sp) +/* 00860 80A89670 AFB80014 */ sw $t8, 0x0014($sp) +/* 00864 80A89674 8FA4002C */ lw $a0, 0x002C($sp) +/* 00868 80A89678 0C0286B2 */ jal SkelAnime_DrawSV +/* 0086C 80A8967C AFA20018 */ sw $v0, 0x0018($sp) +/* 00870 80A89680 8FBF0024 */ lw $ra, 0x0024($sp) /* 00874 80A89684 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00878 80A89688 03E00008 */ jr $ra +/* 00878 80A89688 03E00008 */ jr $ra /* 0087C 80A8968C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s index ba76a569cf..701517328b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s @@ -1,15 +1,15 @@ glabel EnJs_Init /* 00008 80A88E18 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0000C 80A88E1C AFB10038 */ sw $s1, 0x0038($sp) -/* 00010 80A88E20 AFB00034 */ sw $s0, 0x0034($sp) +/* 0000C 80A88E1C AFB10038 */ sw $s1, 0x0038($sp) +/* 00010 80A88E20 AFB00034 */ sw $s0, 0x0034($sp) /* 00014 80A88E24 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 80A88E28 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0001C 80A88E2C AFBF003C */ sw $ra, 0x003C($sp) +/* 0001C 80A88E2C AFBF003C */ sw $ra, 0x003C($sp) /* 00020 80A88E30 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00024 80A88E34 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00028 80A88E38 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0002C 80A88E3C 0C00AC78 */ jal ActorShape_Init - + /* 00030 80A88E40 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 00034 80A88E44 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00038 80A88E48 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -17,65 +17,65 @@ glabel EnJs_Init /* 00040 80A88E50 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 00044 80A88E54 260F022A */ addiu $t7, $s0, 0x022A ## $t7 = 0000022A /* 00048 80A88E58 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 0004C 80A88E5C AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 80A88E60 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 80A88E64 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0004C 80A88E5C AFB80018 */ sw $t8, 0x0018($sp) +/* 00050 80A88E60 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00054 80A88E64 AFAE0010 */ sw $t6, 0x0010($sp) /* 00058 80A88E68 24E7045C */ addiu $a3, $a3, 0x045C ## $a3 = 0600045C /* 0005C 80A88E6C 24C65EA0 */ addiu $a2, $a2, 0x5EA0 ## $a2 = 06005EA0 -/* 00060 80A88E70 AFA50044 */ sw $a1, 0x0044($sp) -/* 00064 80A88E74 0C0291BE */ jal func_800A46F8 +/* 00060 80A88E70 AFA50044 */ sw $a1, 0x0044($sp) +/* 00064 80A88E74 0C0291BE */ jal SkelAnime_InitSV /* 00068 80A88E78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0006C 80A88E7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00070 80A88E80 24A5045C */ addiu $a1, $a1, 0x045C ## $a1 = 0600045C -/* 00074 80A88E84 0C02947A */ jal func_800A51E8 -/* 00078 80A88E88 8FA40044 */ lw $a0, 0x0044($sp) +/* 00074 80A88E84 0C02947A */ jal func_800A51E8 +/* 00078 80A88E88 8FA40044 */ lw $a0, 0x0044($sp) /* 0007C 80A88E8C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00080 80A88E90 AFA50044 */ sw $a1, 0x0044($sp) +/* 00080 80A88E90 AFA50044 */ sw $a1, 0x0044($sp) /* 00084 80A88E94 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00088 80A88E98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0008C 80A88E9C 3C0780A9 */ lui $a3, %hi(D_80A896B0) ## $a3 = 80A90000 -/* 00090 80A88EA0 8FA50044 */ lw $a1, 0x0044($sp) +/* 00090 80A88EA0 8FA50044 */ lw $a1, 0x0044($sp) /* 00094 80A88EA4 24E796B0 */ addiu $a3, $a3, %lo(D_80A896B0) ## $a3 = 80A896B0 /* 00098 80A88EA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0009C 80A88EAC 0C01712B */ jal ActorCollider_InitCylinder - + /* 000A0 80A88EB0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000A4 80A88EB4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 000A8 80A88EB8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000AC 80A88EBC A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 000B0 80A88EC0 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000B4 80A88EC4 0C00B58B */ jal Actor_SetScale - + /* 000B8 80A88EC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000BC 80A88ECC 3C0580A9 */ lui $a1, %hi(func_80A89304) ## $a1 = 80A90000 /* 000C0 80A88ED0 24A59304 */ addiu $a1, $a1, %lo(func_80A89304) ## $a1 = 80A89304 -/* 000C4 80A88ED4 0C2A2384 */ jal func_80A88E10 +/* 000C4 80A88ED4 0C2A2384 */ jal func_80A88E10 /* 000C8 80A88ED8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000CC 80A88EDC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 000D0 80A88EE0 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 /* 000D4 80A88EE4 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 000D8 80A88EE8 A6000284 */ sh $zero, 0x0284($s0) ## 00000284 /* 000DC 80A88EEC E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 000E0 80A88EF0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 000E0 80A88EF0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 000E4 80A88EF4 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 000E8 80A88EF8 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 000EC 80A88EFC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 000F0 80A88F00 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 000F0 80A88F00 E7A80014 */ swc1 $f8, 0x0014($sp) /* 000F4 80A88F04 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 000F8 80A88F08 AFA00028 */ sw $zero, 0x0028($sp) -/* 000FC 80A88F0C AFA00024 */ sw $zero, 0x0024($sp) -/* 00100 80A88F10 AFA00020 */ sw $zero, 0x0020($sp) -/* 00104 80A88F14 AFA0001C */ sw $zero, 0x001C($sp) +/* 000F8 80A88F08 AFA00028 */ sw $zero, 0x0028($sp) +/* 000FC 80A88F0C AFA00024 */ sw $zero, 0x0024($sp) +/* 00100 80A88F10 AFA00020 */ sw $zero, 0x0020($sp) +/* 00104 80A88F14 AFA0001C */ sw $zero, 0x001C($sp) /* 00108 80A88F18 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 0010C 80A88F1C 2407016B */ addiu $a3, $zero, 0x016B ## $a3 = 0000016B /* 00110 80A88F20 0C00C916 */ jal Actor_SpawnAttached - -/* 00114 80A88F24 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 00118 80A88F28 8FBF003C */ lw $ra, 0x003C($sp) -/* 0011C 80A88F2C 8FB00034 */ lw $s0, 0x0034($sp) -/* 00120 80A88F30 8FB10038 */ lw $s1, 0x0038($sp) -/* 00124 80A88F34 03E00008 */ jr $ra + +/* 00114 80A88F24 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00118 80A88F28 8FBF003C */ lw $ra, 0x003C($sp) +/* 0011C 80A88F2C 8FB00034 */ lw $s0, 0x0034($sp) +/* 00120 80A88F30 8FB10038 */ lw $s1, 0x0038($sp) +/* 00124 80A88F34 03E00008 */ jr $ra /* 00128 80A88F38 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s index 1d040ec222..26ee637b56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s @@ -2,38 +2,38 @@ glabel EnKakasi_Draw /* 00BE0 80A8FD50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00BE4 80A8FD54 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00BE8 80A8FD58 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 00BEC 80A8FD5C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00BF0 80A8FD60 AFA40028 */ sw $a0, 0x0028($sp) -/* 00BF4 80A8FD64 AFA5002C */ sw $a1, 0x002C($sp) +/* 00BEC 80A8FD5C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00BF0 80A8FD60 AFA40028 */ sw $a0, 0x0028($sp) +/* 00BF4 80A8FD64 AFA5002C */ sw $a1, 0x002C($sp) /* 00BF8 80A8FD68 85CF12DA */ lh $t7, 0x12DA($t6) ## 801612DA /* 00BFC 80A8FD6C 3C0480A9 */ lui $a0, %hi(D_80A8FEB8) ## $a0 = 80A90000 -/* 00C00 80A8FD70 51E00009 */ beql $t7, $zero, .L80A8FD98 -/* 00C04 80A8FD74 8FB8002C */ lw $t8, 0x002C($sp) +/* 00C00 80A8FD70 51E00009 */ beql $t7, $zero, .L80A8FD98 +/* 00C04 80A8FD74 8FB8002C */ lw $t8, 0x002C($sp) /* 00C08 80A8FD78 0C00084C */ jal osSyncPrintf - + /* 00C0C 80A8FD7C 2484FEB8 */ addiu $a0, $a0, %lo(D_80A8FEB8) ## $a0 = 80A8FEB8 /* 00C10 80A8FD80 3C0480A9 */ lui $a0, %hi(D_80A8FEBC) ## $a0 = 80A90000 /* 00C14 80A8FD84 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 00C18 80A8FD88 90A5F5A0 */ lbu $a1, -0x0A60($a1) ## 8015F5A0 /* 00C1C 80A8FD8C 0C00084C */ jal osSyncPrintf - + /* 00C20 80A8FD90 2484FEBC */ addiu $a0, $a0, %lo(D_80A8FEBC) ## $a0 = 80A8FEBC -/* 00C24 80A8FD94 8FB8002C */ lw $t8, 0x002C($sp) +/* 00C24 80A8FD94 8FB8002C */ lw $t8, 0x002C($sp) .L80A8FD98: -/* 00C28 80A8FD98 0C024F46 */ jal func_80093D18 +/* 00C28 80A8FD98 0C024F46 */ jal func_80093D18 /* 00C2C 80A8FD9C 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 00C30 80A8FDA0 8FA20028 */ lw $v0, 0x0028($sp) -/* 00C34 80A8FDA4 8FA4002C */ lw $a0, 0x002C($sp) +/* 00C30 80A8FDA0 8FA20028 */ lw $v0, 0x0028($sp) +/* 00C34 80A8FDA4 8FA4002C */ lw $a0, 0x002C($sp) /* 00C38 80A8FDA8 8C450154 */ lw $a1, 0x0154($v0) ## 00000154 /* 00C3C 80A8FDAC 8C460170 */ lw $a2, 0x0170($v0) ## 00000170 /* 00C40 80A8FDB0 90470152 */ lbu $a3, 0x0152($v0) ## 00000152 -/* 00C44 80A8FDB4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00C48 80A8FDB8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C4C 80A8FDBC 0C0286B2 */ jal func_800A1AC8 -/* 00C50 80A8FDC0 AFA20018 */ sw $v0, 0x0018($sp) -/* 00C54 80A8FDC4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00C44 80A8FDB4 AFA00014 */ sw $zero, 0x0014($sp) +/* 00C48 80A8FDB8 AFA00010 */ sw $zero, 0x0010($sp) +/* 00C4C 80A8FDBC 0C0286B2 */ jal SkelAnime_DrawSV +/* 00C50 80A8FDC0 AFA20018 */ sw $v0, 0x0018($sp) +/* 00C54 80A8FDC4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00C58 80A8FDC8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00C5C 80A8FDCC 03E00008 */ jr $ra +/* 00C5C 80A8FDCC 03E00008 */ jr $ra /* 00C60 80A8FDD0 00000000 */ nop /* 00C64 80A8FDD4 00000000 */ nop /* 00C68 80A8FDD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s index f343068f0b..5adf1af452 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s @@ -1,33 +1,33 @@ glabel EnKakasi_Init /* 00028 80A8F198 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0002C 80A8F19C AFB00028 */ sw $s0, 0x0028($sp) +/* 0002C 80A8F19C AFB00028 */ sw $s0, 0x0028($sp) /* 00030 80A8F1A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00034 80A8F1A4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00034 80A8F1A4 AFBF002C */ sw $ra, 0x002C($sp) /* 00038 80A8F1A8 3C0480A9 */ lui $a0, %hi(D_80A8FE30) ## $a0 = 80A90000 -/* 0003C 80A8F1AC AFA5003C */ sw $a1, 0x003C($sp) +/* 0003C 80A8F1AC AFA5003C */ sw $a1, 0x003C($sp) /* 00040 80A8F1B0 0C00084C */ jal osSyncPrintf - + /* 00044 80A8F1B4 2484FE30 */ addiu $a0, $a0, %lo(D_80A8FE30) ## $a0 = 80A8FE30 /* 00048 80A8F1B8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 0004C 80A8F1BC 3C0480A9 */ lui $a0, %hi(D_80A8FE34) ## $a0 = 80A90000 /* 00050 80A8F1C0 2484FE34 */ addiu $a0, $a0, %lo(D_80A8FE34) ## $a0 = 80A8FE34 -/* 00054 80A8F1C4 460021A1 */ cvt.d.s $f6, $f4 -/* 00058 80A8F1C8 44073000 */ mfc1 $a3, $f6 -/* 0005C 80A8F1CC 44063800 */ mfc1 $a2, $f7 +/* 00054 80A8F1C4 460021A1 */ cvt.d.s $f6, $f4 +/* 00058 80A8F1C8 44073000 */ mfc1 $a3, $f6 +/* 0005C 80A8F1CC 44063800 */ mfc1 $a2, $f7 /* 00060 80A8F1D0 0C00084C */ jal osSyncPrintf - + /* 00064 80A8F1D4 00000000 */ nop /* 00068 80A8F1D8 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC -/* 0006C 80A8F1DC AFA50030 */ sw $a1, 0x0030($sp) +/* 0006C 80A8F1DC AFA50030 */ sw $a1, 0x0030($sp) /* 00070 80A8F1E0 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00074 80A8F1E4 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00074 80A8F1E4 8FA4003C */ lw $a0, 0x003C($sp) /* 00078 80A8F1E8 3C0780A9 */ lui $a3, %hi(D_80A8FDE0) ## $a3 = 80A90000 -/* 0007C 80A8F1EC 8FA50030 */ lw $a1, 0x0030($sp) +/* 0007C 80A8F1EC 8FA50030 */ lw $a1, 0x0030($sp) /* 00080 80A8F1F0 24E7FDE0 */ addiu $a3, $a3, %lo(D_80A8FDE0) ## $a3 = 80A8FDE0 -/* 00084 80A8F1F4 8FA4003C */ lw $a0, 0x003C($sp) +/* 00084 80A8F1F4 8FA4003C */ lw $a0, 0x003C($sp) /* 00088 80A8F1F8 0C01712B */ jal ActorCollider_InitCylinder - + /* 0008C 80A8F1FC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00090 80A8F200 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 00094 80A8F204 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F @@ -35,11 +35,11 @@ glabel EnKakasi_Init /* 0009C 80A8F20C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 000A0 80A8F210 24E70214 */ addiu $a3, $a3, 0x0214 ## $a3 = 06000214 /* 000A4 80A8F214 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 -/* 000A8 80A8F218 AFA00018 */ sw $zero, 0x0018($sp) -/* 000AC 80A8F21C AFA00014 */ sw $zero, 0x0014($sp) -/* 000B0 80A8F220 AFA00010 */ sw $zero, 0x0010($sp) -/* 000B4 80A8F224 8FA4003C */ lw $a0, 0x003C($sp) -/* 000B8 80A8F228 0C0291BE */ jal func_800A46F8 +/* 000A8 80A8F218 AFA00018 */ sw $zero, 0x0018($sp) +/* 000AC 80A8F21C AFA00014 */ sw $zero, 0x0014($sp) +/* 000B0 80A8F220 AFA00010 */ sw $zero, 0x0010($sp) +/* 000B4 80A8F224 8FA4003C */ lw $a0, 0x003C($sp) +/* 000B8 80A8F228 0C0291BE */ jal SkelAnime_InitSV /* 000BC 80A8F22C 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 000C0 80A8F230 8A180030 */ lwl $t8, 0x0030($s0) ## 00000030 /* 000C4 80A8F234 9A180033 */ lwr $t8, 0x0033($s0) ## 00000033 @@ -55,15 +55,15 @@ glabel EnKakasi_Init /* 000EC 80A8F25C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000F0 80A8F260 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000F4 80A8F264 0C00B58B */ jal Actor_SetScale - + /* 000F8 80A8F268 A61801B2 */ sh $t8, 0x01B2($s0) ## 000001B2 /* 000FC 80A8F26C 3C0A80A9 */ lui $t2, %hi(func_80A8F660) ## $t2 = 80A90000 /* 00100 80A8F270 254AF660 */ addiu $t2, $t2, %lo(func_80A8F660) ## $t2 = 80A8F660 /* 00104 80A8F274 AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C -/* 00108 80A8F278 8FBF002C */ lw $ra, 0x002C($sp) -/* 0010C 80A8F27C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00108 80A8F278 8FBF002C */ lw $ra, 0x002C($sp) +/* 0010C 80A8F27C 8FB00028 */ lw $s0, 0x0028($sp) /* 00110 80A8F280 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00114 80A8F284 03E00008 */ jr $ra +/* 00114 80A8F284 03E00008 */ jr $ra /* 00118 80A8F288 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s index 7b679b6748..cb023daa97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s @@ -1,95 +1,95 @@ glabel EnKakasi2_Init /* 00000 80A90010 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00004 80A90014 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80A90014 AFB00028 */ sw $s0, 0x0028($sp) /* 00008 80A90018 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80A9001C AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 80A9001C AFBF002C */ sw $ra, 0x002C($sp) /* 00010 80A90020 3C0480A9 */ lui $a0, %hi(D_80A909F0) ## $a0 = 80A90000 -/* 00014 80A90024 AFA5004C */ sw $a1, 0x004C($sp) +/* 00014 80A90024 AFA5004C */ sw $a1, 0x004C($sp) /* 00018 80A90028 0C00084C */ jal osSyncPrintf - + /* 0001C 80A9002C 248409F0 */ addiu $a0, $a0, %lo(D_80A909F0) ## $a0 = 80A909F0 /* 00020 80A90030 3C0480A9 */ lui $a0, %hi(D_80A909F4) ## $a0 = 80A90000 /* 00024 80A90034 0C00084C */ jal osSyncPrintf - + /* 00028 80A90038 248409F4 */ addiu $a0, $a0, %lo(D_80A909F4) ## $a0 = 80A909F4 /* 0002C 80A9003C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00030 80A90040 86190034 */ lh $t9, 0x0034($s0) ## 00000034 /* 00034 80A90044 2401003F */ addiu $at, $zero, 0x003F ## $at = 0000003F /* 00038 80A90048 304E003F */ andi $t6, $v0, 0x003F ## $t6 = 00000000 /* 0003C 80A9004C A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 00040 80A90050 00027983 */ sra $t7, $v0, 6 +/* 00040 80A90050 00027983 */ sra $t7, $v0, 6 /* 00044 80A90054 86080196 */ lh $t0, 0x0196($s0) ## 00000196 /* 00048 80A90058 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 /* 0004C 80A9005C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 00050 80A90060 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 /* 00054 80A90064 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 00058 80A90068 468020A0 */ cvt.s.w $f2, $f4 -/* 0005C 80A9006C 15010002 */ bne $t0, $at, .L80A90078 -/* 00060 80A90070 46803320 */ cvt.s.w $f12, $f6 +/* 00058 80A90068 468020A0 */ cvt.s.w $f2, $f4 +/* 0005C 80A9006C 15010002 */ bne $t0, $at, .L80A90078 +/* 00060 80A90070 46803320 */ cvt.s.w $f12, $f6 /* 00064 80A90074 A6090196 */ sh $t1, 0x0196($s0) ## 00000196 .L80A90078: /* 00068 80A90078 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0006C 80A9007C 44810000 */ mtc1 $at, $f0 ## $f0 = 40.00 -/* 00070 80A90080 46001121 */ cvt.d.s $f4, $f2 +/* 00070 80A90080 46001121 */ cvt.d.s $f4, $f2 /* 00074 80A90084 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 00078 80A90088 46001202 */ mul.s $f8, $f2, $f0 +/* 00078 80A90088 46001202 */ mul.s $f8, $f2, $f0 /* 0007C 80A9008C A20A001F */ sb $t2, 0x001F($s0) ## 0000001F -/* 00080 80A90090 44072000 */ mfc1 $a3, $f4 -/* 00084 80A90094 46006402 */ mul.s $f16, $f12, $f0 -/* 00088 80A90098 44062800 */ mfc1 $a2, $f5 +/* 00080 80A90090 44072000 */ mfc1 $a3, $f4 +/* 00084 80A90094 46006402 */ mul.s $f16, $f12, $f0 +/* 00088 80A90098 44062800 */ mfc1 $a2, $f5 /* 0008C 80A9009C 3C0480A9 */ lui $a0, %hi(D_80A90A24) ## $a0 = 80A90000 /* 00090 80A900A0 24840A24 */ addiu $a0, $a0, %lo(D_80A90A24) ## $a0 = 80A90A24 -/* 00094 80A900A4 46004280 */ add.s $f10, $f8, $f0 -/* 00098 80A900A8 46008480 */ add.s $f18, $f16, $f0 +/* 00094 80A900A4 46004280 */ add.s $f10, $f8, $f0 +/* 00098 80A900A8 46008480 */ add.s $f18, $f16, $f0 /* 0009C 80A900AC E60A019C */ swc1 $f10, 0x019C($s0) ## 0000019C /* 000A0 80A900B0 E61201A0 */ swc1 $f18, 0x01A0($s0) ## 000001A0 /* 000A4 80A900B4 0C00084C */ jal osSyncPrintf - -/* 000A8 80A900B8 E7AC0038 */ swc1 $f12, 0x0038($sp) -/* 000AC 80A900BC C7AC0038 */ lwc1 $f12, 0x0038($sp) + +/* 000A8 80A900B8 E7AC0038 */ swc1 $f12, 0x0038($sp) +/* 000AC 80A900BC C7AC0038 */ lwc1 $f12, 0x0038($sp) /* 000B0 80A900C0 3C0480A9 */ lui $a0, %hi(D_80A90A54) ## $a0 = 80A90000 /* 000B4 80A900C4 24840A54 */ addiu $a0, $a0, %lo(D_80A90A54) ## $a0 = 80A90A54 -/* 000B8 80A900C8 460061A1 */ cvt.d.s $f6, $f12 -/* 000BC 80A900CC 44073000 */ mfc1 $a3, $f6 -/* 000C0 80A900D0 44063800 */ mfc1 $a2, $f7 +/* 000B8 80A900C8 460061A1 */ cvt.d.s $f6, $f12 +/* 000BC 80A900CC 44073000 */ mfc1 $a3, $f6 +/* 000C0 80A900D0 44063800 */ mfc1 $a2, $f7 /* 000C4 80A900D4 0C00084C */ jal osSyncPrintf - + /* 000C8 80A900D8 00000000 */ nop /* 000CC 80A900DC C608019C */ lwc1 $f8, 0x019C($s0) ## 0000019C /* 000D0 80A900E0 3C0480A9 */ lui $a0, %hi(D_80A90A84) ## $a0 = 80A90000 /* 000D4 80A900E4 24840A84 */ addiu $a0, $a0, %lo(D_80A90A84) ## $a0 = 80A90A84 -/* 000D8 80A900E8 460042A1 */ cvt.d.s $f10, $f8 -/* 000DC 80A900EC 44075000 */ mfc1 $a3, $f10 -/* 000E0 80A900F0 44065800 */ mfc1 $a2, $f11 +/* 000D8 80A900E8 460042A1 */ cvt.d.s $f10, $f8 +/* 000DC 80A900EC 44075000 */ mfc1 $a3, $f10 +/* 000E0 80A900F0 44065800 */ mfc1 $a2, $f11 /* 000E4 80A900F4 0C00084C */ jal osSyncPrintf - + /* 000E8 80A900F8 00000000 */ nop /* 000EC 80A900FC C61001A0 */ lwc1 $f16, 0x01A0($s0) ## 000001A0 /* 000F0 80A90100 3C0480A9 */ lui $a0, %hi(D_80A90AB4) ## $a0 = 80A90000 /* 000F4 80A90104 24840AB4 */ addiu $a0, $a0, %lo(D_80A90AB4) ## $a0 = 80A90AB4 -/* 000F8 80A90108 460084A1 */ cvt.d.s $f18, $f16 -/* 000FC 80A9010C 44079000 */ mfc1 $a3, $f18 -/* 00100 80A90110 44069800 */ mfc1 $a2, $f19 +/* 000F8 80A90108 460084A1 */ cvt.d.s $f18, $f16 +/* 000FC 80A9010C 44079000 */ mfc1 $a3, $f18 +/* 00100 80A90110 44069800 */ mfc1 $a2, $f19 /* 00104 80A90114 0C00084C */ jal osSyncPrintf - + /* 00108 80A90118 00000000 */ nop /* 0010C 80A9011C C60401A4 */ lwc1 $f4, 0x01A4($s0) ## 000001A4 /* 00110 80A90120 3C0480A9 */ lui $a0, %hi(D_80A90AE4) ## $a0 = 80A90000 /* 00114 80A90124 24840AE4 */ addiu $a0, $a0, %lo(D_80A90AE4) ## $a0 = 80A90AE4 -/* 00118 80A90128 460021A1 */ cvt.d.s $f6, $f4 -/* 0011C 80A9012C 44073000 */ mfc1 $a3, $f6 -/* 00120 80A90130 44063800 */ mfc1 $a2, $f7 +/* 00118 80A90128 460021A1 */ cvt.d.s $f6, $f4 +/* 0011C 80A9012C 44073000 */ mfc1 $a3, $f6 +/* 00120 80A90130 44063800 */ mfc1 $a2, $f7 /* 00124 80A90134 0C00084C */ jal osSyncPrintf - + /* 00128 80A90138 00000000 */ nop /* 0012C 80A9013C 3C0480A9 */ lui $a0, %hi(D_80A90B14) ## $a0 = 80A90000 /* 00130 80A90140 24840B14 */ addiu $a0, $a0, %lo(D_80A90B14) ## $a0 = 80A90B14 /* 00134 80A90144 0C00084C */ jal osSyncPrintf - + /* 00138 80A90148 86050196 */ lh $a1, 0x0196($s0) ## 00000196 /* 0013C 80A9014C 3C0480A9 */ lui $a0, %hi(D_80A90B44) ## $a0 = 80A90000 /* 00140 80A90150 0C00084C */ jal osSyncPrintf - + /* 00144 80A90154 24840B44 */ addiu $a0, $a0, %lo(D_80A90B44) ## $a0 = 80A90B44 /* 00148 80A90158 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0014C 80A9015C 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 @@ -99,47 +99,47 @@ glabel EnKakasi2_Init /* 0015C 80A9016C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00160 80A90170 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00164 80A90174 0C00B58B */ jal Actor_SetScale - + /* 00168 80A90178 E60801A8 */ swc1 $f8, 0x01A8($s0) ## 000001A8 /* 0016C 80A9017C 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 /* 00170 80A90180 86050196 */ lh $a1, 0x0196($s0) ## 00000196 /* 00174 80A90184 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 /* 00178 80A90188 358D0400 */ ori $t5, $t4, 0x0400 ## $t5 = 00000400 /* 0017C 80A9018C AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 00180 80A90190 04A0001F */ bltz $a1, .L80A90210 +/* 00180 80A90190 04A0001F */ bltz $a1, .L80A90210 /* 00184 80A90194 A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 /* 00188 80A90198 0C00B2D0 */ jal Flags_GetSwitch - -/* 0018C 80A9019C 8FA4004C */ lw $a0, 0x004C($sp) -/* 00190 80A901A0 1040001B */ beq $v0, $zero, .L80A90210 + +/* 0018C 80A9019C 8FA4004C */ lw $a0, 0x004C($sp) +/* 00190 80A901A0 1040001B */ beq $v0, $zero, .L80A90210 /* 00194 80A901A4 3C0F80A9 */ lui $t7, %hi(func_80A90948) ## $t7 = 80A90000 /* 00198 80A901A8 25EF0948 */ addiu $t7, $t7, %lo(func_80A90948) ## $t7 = 80A90948 /* 0019C 80A901AC AE0F0134 */ sw $t7, 0x0134($s0) ## 00000134 /* 001A0 80A901B0 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC -/* 001A4 80A901B4 AFA50034 */ sw $a1, 0x0034($sp) +/* 001A4 80A901B4 AFA50034 */ sw $a1, 0x0034($sp) /* 001A8 80A901B8 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 001AC 80A901BC 8FA4004C */ lw $a0, 0x004C($sp) + +/* 001AC 80A901BC 8FA4004C */ lw $a0, 0x004C($sp) /* 001B0 80A901C0 3C0780A9 */ lui $a3, %hi(D_80A909A0) ## $a3 = 80A90000 -/* 001B4 80A901C4 8FA50034 */ lw $a1, 0x0034($sp) +/* 001B4 80A901C4 8FA50034 */ lw $a1, 0x0034($sp) /* 001B8 80A901C8 24E709A0 */ addiu $a3, $a3, %lo(D_80A909A0) ## $a3 = 80A909A0 -/* 001BC 80A901CC 8FA4004C */ lw $a0, 0x004C($sp) +/* 001BC 80A901CC 8FA4004C */ lw $a0, 0x004C($sp) /* 001C0 80A901D0 0C01712B */ jal ActorCollider_InitCylinder - + /* 001C4 80A901D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001C8 80A901D8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 001CC 80A901DC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 001D0 80A901E0 24E70214 */ addiu $a3, $a3, 0x0214 ## $a3 = 06000214 /* 001D4 80A901E4 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 -/* 001D8 80A901E8 8FA4004C */ lw $a0, 0x004C($sp) +/* 001D8 80A901E8 8FA4004C */ lw $a0, 0x004C($sp) /* 001DC 80A901EC 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 001E0 80A901F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 001E4 80A901F4 AFA00014 */ sw $zero, 0x0014($sp) -/* 001E8 80A901F8 0C0291BE */ jal func_800A46F8 -/* 001EC 80A901FC AFA00018 */ sw $zero, 0x0018($sp) +/* 001E0 80A901F0 AFA00010 */ sw $zero, 0x0010($sp) +/* 001E4 80A901F4 AFA00014 */ sw $zero, 0x0014($sp) +/* 001E8 80A901F8 0C0291BE */ jal SkelAnime_InitSV +/* 001EC 80A901FC AFA00018 */ sw $zero, 0x0018($sp) /* 001F0 80A90200 3C1880A9 */ lui $t8, %hi(func_80A9062C) ## $t8 = 80A90000 /* 001F4 80A90204 2718062C */ addiu $t8, $t8, %lo(func_80A9062C) ## $t8 = 80A9062C -/* 001F8 80A90208 10000007 */ beq $zero, $zero, .L80A90228 +/* 001F8 80A90208 10000007 */ beq $zero, $zero, .L80A90228 /* 001FC 80A9020C AE18014C */ sw $t8, 0x014C($s0) ## 0000014C .L80A90210: /* 00200 80A90210 3C01C5FA */ lui $at, 0xC5FA ## $at = C5FA0000 @@ -149,10 +149,10 @@ glabel EnKakasi2_Init /* 00210 80A90220 AE19014C */ sw $t9, 0x014C($s0) ## 0000014C /* 00214 80A90224 E60A00BC */ swc1 $f10, 0x00BC($s0) ## 000000BC .L80A90228: -/* 00218 80A90228 8FBF002C */ lw $ra, 0x002C($sp) -/* 0021C 80A9022C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00218 80A90228 8FBF002C */ lw $ra, 0x002C($sp) +/* 0021C 80A9022C 8FB00028 */ lw $s0, 0x0028($sp) /* 00220 80A90230 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00224 80A90234 03E00008 */ jr $ra +/* 00224 80A90234 03E00008 */ jr $ra /* 00228 80A90238 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s index adee4d6f6d..bd455dddc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s @@ -1,8 +1,8 @@ glabel func_80A90264 /* 00254 80A90264 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00258 80A90268 AFBF002C */ sw $ra, 0x002C($sp) -/* 0025C 80A9026C AFB10028 */ sw $s1, 0x0028($sp) -/* 00260 80A90270 AFB00024 */ sw $s0, 0x0024($sp) +/* 00258 80A90268 AFBF002C */ sw $ra, 0x002C($sp) +/* 0025C 80A9026C AFB10028 */ sw $s1, 0x0028($sp) +/* 00260 80A90270 AFB00024 */ sw $s0, 0x0024($sp) /* 00264 80A90274 848E0194 */ lh $t6, 0x0194($a0) ## 00000194 /* 00268 80A90278 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 /* 0026C 80A9027C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 @@ -12,37 +12,37 @@ glabel func_80A90264 /* 0027C 80A9028C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00280 80A90290 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00284 80A90294 871912D6 */ lh $t9, 0x12D6($t8) ## 801612D6 -/* 00288 80A90298 5320003F */ beql $t9, $zero, .L80A90398 +/* 00288 80A90298 5320003F */ beql $t9, $zero, .L80A90398 /* 0028C 80A9029C C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 /* 00290 80A902A0 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 /* 00294 80A902A4 C486019C */ lwc1 $f6, 0x019C($a0) ## 0000019C -/* 00298 80A902A8 4606203C */ c.lt.s $f4, $f6 +/* 00298 80A902A8 4606203C */ c.lt.s $f4, $f6 /* 0029C 80A902AC 00000000 */ nop -/* 002A0 80A902B0 45020039 */ bc1fl .L80A90398 +/* 002A0 80A902B0 45020039 */ bc1fl .L80A90398 /* 002A4 80A902B4 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 /* 002A8 80A902B8 C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 /* 002AC 80A902BC C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 /* 002B0 80A902C0 C49001A0 */ lwc1 $f16, 0x01A0($a0) ## 000001A0 /* 002B4 80A902C4 3C0880A9 */ lui $t0, %hi(func_80A90948) ## $t0 = 80A90000 -/* 002B8 80A902C8 460A4001 */ sub.s $f0, $f8, $f10 +/* 002B8 80A902C8 460A4001 */ sub.s $f0, $f8, $f10 /* 002BC 80A902CC 25080948 */ addiu $t0, $t0, %lo(func_80A90948) ## $t0 = 80A90948 -/* 002C0 80A902D0 46000005 */ abs.s $f0, $f0 -/* 002C4 80A902D4 4610003C */ c.lt.s $f0, $f16 +/* 002C0 80A902D0 46000005 */ abs.s $f0, $f0 +/* 002C4 80A902D4 4610003C */ c.lt.s $f0, $f16 /* 002C8 80A902D8 00000000 */ nop -/* 002CC 80A902DC 4502002E */ bc1fl .L80A90398 +/* 002CC 80A902DC 4502002E */ bc1fl .L80A90398 /* 002D0 80A902E0 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 /* 002D4 80A902E4 AC880134 */ sw $t0, 0x0134($a0) ## 00000134 /* 002D8 80A902E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 002DC 80A902EC 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC /* 002E0 80A902F0 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 002E4 80A902F4 AFA50030 */ sw $a1, 0x0030($sp) + +/* 002E4 80A902F4 AFA50030 */ sw $a1, 0x0030($sp) /* 002E8 80A902F8 3C0780A9 */ lui $a3, %hi(D_80A909A0) ## $a3 = 80A90000 -/* 002EC 80A902FC 8FA50030 */ lw $a1, 0x0030($sp) +/* 002EC 80A902FC 8FA50030 */ lw $a1, 0x0030($sp) /* 002F0 80A90300 24E709A0 */ addiu $a3, $a3, %lo(D_80A909A0) ## $a3 = 80A909A0 /* 002F4 80A90304 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002F8 80A90308 0C01712B */ jal ActorCollider_InitCylinder - + /* 002FC 80A9030C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00300 80A90310 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00304 80A90314 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 @@ -50,94 +50,94 @@ glabel func_80A90264 /* 0030C 80A9031C 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 /* 00310 80A90320 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00314 80A90324 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00318 80A90328 AFA00010 */ sw $zero, 0x0010($sp) -/* 0031C 80A9032C AFA00014 */ sw $zero, 0x0014($sp) -/* 00320 80A90330 0C0291BE */ jal func_800A46F8 -/* 00324 80A90334 AFA00018 */ sw $zero, 0x0018($sp) +/* 00318 80A90328 AFA00010 */ sw $zero, 0x0010($sp) +/* 0031C 80A9032C AFA00014 */ sw $zero, 0x0014($sp) +/* 00320 80A90330 0C0291BE */ jal SkelAnime_InitSV +/* 00324 80A90334 AFA00018 */ sw $zero, 0x0018($sp) /* 00328 80A90338 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0032C 80A9033C 0C020120 */ jal func_80080480 +/* 0032C 80A9033C 0C020120 */ jal func_80080480 /* 00330 80A90340 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00334 80A90344 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 /* 00338 80A90348 3C010800 */ lui $at, 0x0800 ## $at = 08000000 /* 0033C 80A9034C 34210001 */ ori $at, $at, 0x0001 ## $at = 08000001 /* 00340 80A90350 01215025 */ or $t2, $t1, $at ## $t2 = 08000001 /* 00344 80A90354 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 00348 80A90358 0C01E221 */ jal func_80078884 +/* 00348 80A90358 0C01E221 */ jal func_80078884 /* 0034C 80A9035C 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 /* 00350 80A90360 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -/* 00354 80A90364 04A00004 */ bltz $a1, .L80A90378 +/* 00354 80A90364 04A00004 */ bltz $a1, .L80A90378 /* 00358 80A90368 00000000 */ nop /* 0035C 80A9036C 0C00B2DD */ jal Flags_SetSwitch - + /* 00360 80A90370 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00364 80A90374 86050196 */ lh $a1, 0x0196($s0) ## 00000196 .L80A90378: /* 00368 80A90378 3C0480A9 */ lui $a0, %hi(D_80A90B48) ## $a0 = 80A90000 /* 0036C 80A9037C 0C00084C */ jal osSyncPrintf - + /* 00370 80A90380 24840B48 */ addiu $a0, $a0, %lo(D_80A90B48) ## $a0 = 80A90B48 /* 00374 80A90384 3C0B80A9 */ lui $t3, %hi(func_80A904D8) ## $t3 = 80A90000 /* 00378 80A90388 256B04D8 */ addiu $t3, $t3, %lo(func_80A904D8) ## $t3 = 80A904D8 -/* 0037C 80A9038C 1000004D */ beq $zero, $zero, .L80A904C4 +/* 0037C 80A9038C 1000004D */ beq $zero, $zero, .L80A904C4 /* 00380 80A90390 AE0B014C */ sw $t3, 0x014C($s0) ## 0000014C /* 00384 80A90394 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 .L80A90398: /* 00388 80A90398 C604019C */ lwc1 $f4, 0x019C($s0) ## 0000019C -/* 0038C 80A9039C 4604903C */ c.lt.s $f18, $f4 +/* 0038C 80A9039C 4604903C */ c.lt.s $f18, $f4 /* 00390 80A903A0 00000000 */ nop -/* 00394 80A903A4 45020048 */ bc1fl .L80A904C8 -/* 00398 80A903A8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00394 80A903A4 45020048 */ bc1fl .L80A904C8 +/* 00398 80A903A8 8FBF002C */ lw $ra, 0x002C($sp) /* 0039C 80A903AC C4460028 */ lwc1 $f6, 0x0028($v0) ## 00000028 /* 003A0 80A903B0 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 003A4 80A903B4 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 /* 003A8 80A903B8 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 003AC 80A903BC 46083001 */ sub.s $f0, $f6, $f8 -/* 003B0 80A903C0 46000005 */ abs.s $f0, $f0 -/* 003B4 80A903C4 460A003C */ c.lt.s $f0, $f10 +/* 003AC 80A903BC 46083001 */ sub.s $f0, $f6, $f8 +/* 003B0 80A903C0 46000005 */ abs.s $f0, $f0 +/* 003B4 80A903C4 460A003C */ c.lt.s $f0, $f10 /* 003B8 80A903C8 00000000 */ nop -/* 003BC 80A903CC 4502003E */ bc1fl .L80A904C8 -/* 003C0 80A903D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 003BC 80A903CC 4502003E */ bc1fl .L80A904C8 +/* 003C0 80A903D0 8FBF002C */ lw $ra, 0x002C($sp) /* 003C4 80A903D4 958CF546 */ lhu $t4, -0x0ABA($t4) ## 8015F546 /* 003C8 80A903D8 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 003CC 80A903DC 01D17021 */ addu $t6, $t6, $s1 +/* 003CC 80A903DC 01D17021 */ addu $t6, $t6, $s1 /* 003D0 80A903E0 318D1000 */ andi $t5, $t4, 0x1000 ## $t5 = 00000000 -/* 003D4 80A903E4 51A00038 */ beql $t5, $zero, .L80A904C8 -/* 003D8 80A903E8 8FBF002C */ lw $ra, 0x002C($sp) +/* 003D4 80A903E4 51A00038 */ beql $t5, $zero, .L80A904C8 +/* 003D8 80A903E8 8FBF002C */ lw $ra, 0x002C($sp) /* 003DC 80A903EC A6000194 */ sh $zero, 0x0194($s0) ## 00000194 /* 003E0 80A903F0 95CE04C6 */ lhu $t6, 0x04C6($t6) ## 000104C6 /* 003E4 80A903F4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 003E8 80A903F8 55C10033 */ bnel $t6, $at, .L80A904C8 -/* 003EC 80A903FC 8FBF002C */ lw $ra, 0x002C($sp) +/* 003E8 80A903F8 55C10033 */ bnel $t6, $at, .L80A904C8 +/* 003EC 80A903FC 8FBF002C */ lw $ra, 0x002C($sp) /* 003F0 80A90400 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -/* 003F4 80A90404 04A00004 */ bltz $a1, .L80A90418 +/* 003F4 80A90404 04A00004 */ bltz $a1, .L80A90418 /* 003F8 80A90408 00000000 */ nop /* 003FC 80A9040C 0C00B2DD */ jal Flags_SetSwitch - + /* 00400 80A90410 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00404 80A90414 86050196 */ lh $a1, 0x0196($s0) ## 00000196 .L80A90418: /* 00408 80A90418 3C0480A9 */ lui $a0, %hi(D_80A90B74) ## $a0 = 80A90000 /* 0040C 80A9041C 0C00084C */ jal osSyncPrintf - + /* 00410 80A90420 24840B74 */ addiu $a0, $a0, %lo(D_80A90B74) ## $a0 = 80A90B74 /* 00414 80A90424 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00418 80A90428 00310821 */ addu $at, $at, $s1 +/* 00418 80A90428 00310821 */ addu $at, $at, $s1 /* 0041C 80A9042C 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 00420 80A90430 3C1880A9 */ lui $t8, %hi(func_80A90948) ## $t8 = 80A90000 /* 00424 80A90434 A42F04C6 */ sh $t7, 0x04C6($at) ## 000104C6 /* 00428 80A90438 27180948 */ addiu $t8, $t8, %lo(func_80A90948) ## $t8 = 80A90948 /* 0042C 80A9043C AE180134 */ sw $t8, 0x0134($s0) ## 00000134 /* 00430 80A90440 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC -/* 00434 80A90444 AFA50030 */ sw $a1, 0x0030($sp) +/* 00434 80A90444 AFA50030 */ sw $a1, 0x0030($sp) /* 00438 80A90448 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 0043C 80A9044C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00440 80A90450 3C0780A9 */ lui $a3, %hi(D_80A909A0) ## $a3 = 80A90000 -/* 00444 80A90454 8FA50030 */ lw $a1, 0x0030($sp) +/* 00444 80A90454 8FA50030 */ lw $a1, 0x0030($sp) /* 00448 80A90458 24E709A0 */ addiu $a3, $a3, %lo(D_80A909A0) ## $a3 = 80A909A0 /* 0044C 80A9045C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00450 80A90460 0C01712B */ jal ActorCollider_InitCylinder - + /* 00454 80A90464 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00458 80A90468 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0045C 80A9046C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 @@ -145,14 +145,14 @@ glabel func_80A90264 /* 00464 80A90474 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 /* 00468 80A90478 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0046C 80A9047C 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00470 80A90480 AFA00010 */ sw $zero, 0x0010($sp) -/* 00474 80A90484 AFA00014 */ sw $zero, 0x0014($sp) -/* 00478 80A90488 0C0291BE */ jal func_800A46F8 -/* 0047C 80A9048C AFA00018 */ sw $zero, 0x0018($sp) +/* 00470 80A90480 AFA00010 */ sw $zero, 0x0010($sp) +/* 00474 80A90484 AFA00014 */ sw $zero, 0x0014($sp) +/* 00478 80A90488 0C0291BE */ jal SkelAnime_InitSV +/* 0047C 80A9048C AFA00018 */ sw $zero, 0x0018($sp) /* 00480 80A90490 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00484 80A90494 0C020120 */ jal func_80080480 +/* 00484 80A90494 0C020120 */ jal func_80080480 /* 00488 80A90498 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0048C 80A9049C 0C01E221 */ jal func_80078884 +/* 0048C 80A9049C 0C01E221 */ jal func_80078884 /* 00490 80A904A0 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 /* 00494 80A904A4 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 /* 00498 80A904A8 3C010800 */ lui $at, 0x0800 ## $at = 08000000 @@ -163,11 +163,11 @@ glabel func_80A90264 /* 004AC 80A904BC AE080004 */ sw $t0, 0x0004($s0) ## 00000004 /* 004B0 80A904C0 AE09014C */ sw $t1, 0x014C($s0) ## 0000014C .L80A904C4: -/* 004B4 80A904C4 8FBF002C */ lw $ra, 0x002C($sp) +/* 004B4 80A904C4 8FBF002C */ lw $ra, 0x002C($sp) .L80A904C8: -/* 004B8 80A904C8 8FB00024 */ lw $s0, 0x0024($sp) -/* 004BC 80A904CC 8FB10028 */ lw $s1, 0x0028($sp) -/* 004C0 80A904D0 03E00008 */ jr $ra +/* 004B8 80A904C8 8FB00024 */ lw $s0, 0x0024($sp) +/* 004BC 80A904CC 8FB10028 */ lw $s1, 0x0028($sp) +/* 004C0 80A904D0 03E00008 */ jr $ra /* 004C4 80A904D4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s index dbd74b8c0f..f8576b8f91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s @@ -1,22 +1,22 @@ glabel func_80A90948 /* 00938 80A90948 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0093C 80A9094C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00940 80A90950 AFA40028 */ sw $a0, 0x0028($sp) -/* 00944 80A90954 AFA5002C */ sw $a1, 0x002C($sp) -/* 00948 80A90958 0C024F46 */ jal func_80093D18 +/* 0093C 80A9094C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00940 80A90950 AFA40028 */ sw $a0, 0x0028($sp) +/* 00944 80A90954 AFA5002C */ sw $a1, 0x002C($sp) +/* 00948 80A90958 0C024F46 */ jal func_80093D18 /* 0094C 80A9095C 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00950 80A90960 8FA20028 */ lw $v0, 0x0028($sp) -/* 00954 80A90964 8FA4002C */ lw $a0, 0x002C($sp) +/* 00950 80A90960 8FA20028 */ lw $v0, 0x0028($sp) +/* 00954 80A90964 8FA4002C */ lw $a0, 0x002C($sp) /* 00958 80A90968 8C450154 */ lw $a1, 0x0154($v0) ## 00000154 /* 0095C 80A9096C 8C460170 */ lw $a2, 0x0170($v0) ## 00000170 /* 00960 80A90970 90470152 */ lbu $a3, 0x0152($v0) ## 00000152 -/* 00964 80A90974 AFA00014 */ sw $zero, 0x0014($sp) -/* 00968 80A90978 AFA00010 */ sw $zero, 0x0010($sp) -/* 0096C 80A9097C 0C0286B2 */ jal func_800A1AC8 -/* 00970 80A90980 AFA20018 */ sw $v0, 0x0018($sp) -/* 00974 80A90984 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00964 80A90974 AFA00014 */ sw $zero, 0x0014($sp) +/* 00968 80A90978 AFA00010 */ sw $zero, 0x0010($sp) +/* 0096C 80A9097C 0C0286B2 */ jal SkelAnime_DrawSV +/* 00970 80A90980 AFA20018 */ sw $v0, 0x0018($sp) +/* 00974 80A90984 8FBF0024 */ lw $ra, 0x0024($sp) /* 00978 80A90988 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0097C 80A9098C 03E00008 */ jr $ra +/* 0097C 80A9098C 03E00008 */ jr $ra /* 00980 80A90990 00000000 */ nop /* 00984 80A90994 00000000 */ nop /* 00988 80A90998 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s index 823ea30917..f07a46d4c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s @@ -1,22 +1,22 @@ glabel EnKakasi3_Draw /* 00F98 80A91CB8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F9C 80A91CBC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00FA0 80A91CC0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00FA4 80A91CC4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00FA8 80A91CC8 0C024F46 */ jal func_80093D18 +/* 00F9C 80A91CBC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00FA0 80A91CC0 AFA40028 */ sw $a0, 0x0028($sp) +/* 00FA4 80A91CC4 AFA5002C */ sw $a1, 0x002C($sp) +/* 00FA8 80A91CC8 0C024F46 */ jal func_80093D18 /* 00FAC 80A91CCC 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00FB0 80A91CD0 8FA20028 */ lw $v0, 0x0028($sp) -/* 00FB4 80A91CD4 8FA4002C */ lw $a0, 0x002C($sp) +/* 00FB0 80A91CD0 8FA20028 */ lw $v0, 0x0028($sp) +/* 00FB4 80A91CD4 8FA4002C */ lw $a0, 0x002C($sp) /* 00FB8 80A91CD8 8C450154 */ lw $a1, 0x0154($v0) ## 00000154 /* 00FBC 80A91CDC 8C460170 */ lw $a2, 0x0170($v0) ## 00000170 /* 00FC0 80A91CE0 90470152 */ lbu $a3, 0x0152($v0) ## 00000152 -/* 00FC4 80A91CE4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00FC8 80A91CE8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FCC 80A91CEC 0C0286B2 */ jal func_800A1AC8 -/* 00FD0 80A91CF0 AFA20018 */ sw $v0, 0x0018($sp) -/* 00FD4 80A91CF4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00FC4 80A91CE4 AFA00014 */ sw $zero, 0x0014($sp) +/* 00FC8 80A91CE8 AFA00010 */ sw $zero, 0x0010($sp) +/* 00FCC 80A91CEC 0C0286B2 */ jal SkelAnime_DrawSV +/* 00FD0 80A91CF0 AFA20018 */ sw $v0, 0x0018($sp) +/* 00FD4 80A91CF4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00FD8 80A91CF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00FDC 80A91CFC 03E00008 */ jr $ra +/* 00FDC 80A91CFC 03E00008 */ jr $ra /* 00FE0 80A91D00 00000000 */ nop /* 00FE4 80A91D04 00000000 */ nop /* 00FE8 80A91D08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s index d39578841b..9fd612ab38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s @@ -1,41 +1,41 @@ glabel EnKakasi3_Init /* 00028 80A90D48 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0002C 80A90D4C AFB00028 */ sw $s0, 0x0028($sp) +/* 0002C 80A90D4C AFB00028 */ sw $s0, 0x0028($sp) /* 00030 80A90D50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00034 80A90D54 AFBF002C */ sw $ra, 0x002C($sp) +/* 00034 80A90D54 AFBF002C */ sw $ra, 0x002C($sp) /* 00038 80A90D58 3C0480A9 */ lui $a0, %hi(D_80A91D60) ## $a0 = 80A90000 -/* 0003C 80A90D5C AFA5003C */ sw $a1, 0x003C($sp) +/* 0003C 80A90D5C AFA5003C */ sw $a1, 0x003C($sp) /* 00040 80A90D60 0C00084C */ jal osSyncPrintf - + /* 00044 80A90D64 24841D60 */ addiu $a0, $a0, %lo(D_80A91D60) ## $a0 = 80A91D60 /* 00048 80A90D68 3C0480A9 */ lui $a0, %hi(D_80A91D64) ## $a0 = 80A90000 /* 0004C 80A90D6C 0C00084C */ jal osSyncPrintf - + /* 00050 80A90D70 24841D64 */ addiu $a0, $a0, %lo(D_80A91D64) ## $a0 = 80A91D64 /* 00054 80A90D74 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 00058 80A90D78 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F /* 0005C 80A90D7C 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC -/* 00060 80A90D80 AFA50030 */ sw $a1, 0x0030($sp) +/* 00060 80A90D80 AFA50030 */ sw $a1, 0x0030($sp) /* 00064 80A90D84 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00068 80A90D88 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00068 80A90D88 8FA4003C */ lw $a0, 0x003C($sp) /* 0006C 80A90D8C 3C0780A9 */ lui $a3, %hi(D_80A91D10) ## $a3 = 80A90000 -/* 00070 80A90D90 8FA50030 */ lw $a1, 0x0030($sp) +/* 00070 80A90D90 8FA50030 */ lw $a1, 0x0030($sp) /* 00074 80A90D94 24E71D10 */ addiu $a3, $a3, %lo(D_80A91D10) ## $a3 = 80A91D10 -/* 00078 80A90D98 8FA4003C */ lw $a0, 0x003C($sp) +/* 00078 80A90D98 8FA4003C */ lw $a0, 0x003C($sp) /* 0007C 80A90D9C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00080 80A90DA0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00084 80A90DA4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00088 80A90DA8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0008C 80A90DAC 24E70214 */ addiu $a3, $a3, 0x0214 ## $a3 = 06000214 /* 00090 80A90DB0 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 -/* 00094 80A90DB4 8FA4003C */ lw $a0, 0x003C($sp) +/* 00094 80A90DB4 8FA4003C */ lw $a0, 0x003C($sp) /* 00098 80A90DB8 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 0009C 80A90DBC AFA00010 */ sw $zero, 0x0010($sp) -/* 000A0 80A90DC0 AFA00014 */ sw $zero, 0x0014($sp) -/* 000A4 80A90DC4 0C0291BE */ jal func_800A46F8 -/* 000A8 80A90DC8 AFA00018 */ sw $zero, 0x0018($sp) +/* 0009C 80A90DBC AFA00010 */ sw $zero, 0x0010($sp) +/* 000A0 80A90DC0 AFA00014 */ sw $zero, 0x0014($sp) +/* 000A4 80A90DC4 0C0291BE */ jal SkelAnime_InitSV +/* 000A8 80A90DC8 AFA00018 */ sw $zero, 0x0018($sp) /* 000AC 80A90DCC 8A080030 */ lwl $t0, 0x0030($s0) ## 00000030 /* 000B0 80A90DD0 9A080033 */ lwr $t0, 0x0033($s0) ## 00000033 /* 000B4 80A90DD4 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 @@ -50,15 +50,15 @@ glabel EnKakasi3_Init /* 000D8 80A90DF8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000DC 80A90DFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000E0 80A90E00 0C00B58B */ jal Actor_SetScale - + /* 000E4 80A90E04 A60801B4 */ sh $t0, 0x01B4($s0) ## 000001B4 /* 000E8 80A90E08 3C0A80A9 */ lui $t2, %hi(func_80A911F0) ## $t2 = 80A90000 /* 000EC 80A90E0C 254A11F0 */ addiu $t2, $t2, %lo(func_80A911F0) ## $t2 = 80A911F0 /* 000F0 80A90E10 AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C -/* 000F4 80A90E14 8FBF002C */ lw $ra, 0x002C($sp) -/* 000F8 80A90E18 8FB00028 */ lw $s0, 0x0028($sp) +/* 000F4 80A90E14 8FBF002C */ lw $ra, 0x002C($sp) +/* 000F8 80A90E18 8FB00028 */ lw $s0, 0x0028($sp) /* 000FC 80A90E1C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00100 80A90E20 03E00008 */ jr $ra +/* 00100 80A90E20 03E00008 */ jr $ra /* 00104 80A90E24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s index 3fbfa68fe3..933a49358c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s @@ -1,226 +1,226 @@ glabel func_80A99048 /* 02298 80A99048 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0229C 80A9904C AFBF003C */ sw $ra, 0x003C($sp) -/* 022A0 80A99050 AFB10038 */ sw $s1, 0x0038($sp) -/* 022A4 80A99054 AFB00034 */ sw $s0, 0x0034($sp) +/* 0229C 80A9904C AFBF003C */ sw $ra, 0x003C($sp) +/* 022A0 80A99050 AFB10038 */ sw $s1, 0x0038($sp) +/* 022A4 80A99054 AFB00034 */ sw $s0, 0x0034($sp) /* 022A8 80A99058 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 022AC 80A9905C 0C2A5BE5 */ jal func_80A96F94 +/* 022AC 80A9905C 0C2A5BE5 */ jal func_80A96F94 /* 022B0 80A99060 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 022B4 80A99064 104000C2 */ beq $v0, $zero, .L80A99370 +/* 022B4 80A99064 104000C2 */ beq $v0, $zero, .L80A99370 /* 022B8 80A99068 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022BC 80A9906C 0C2A5BB1 */ jal func_80A96EC4 +/* 022BC 80A9906C 0C2A5BB1 */ jal func_80A96EC4 /* 022C0 80A99070 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 022C4 80A99074 104000BE */ beq $v0, $zero, .L80A99370 +/* 022C4 80A99074 104000BE */ beq $v0, $zero, .L80A99370 /* 022C8 80A99078 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 022CC 80A9907C 82180196 */ lb $t8, 0x0196($s0) ## 00000196 /* 022D0 80A99080 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 022D4 80A99084 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 /* 022D8 80A99088 A218001E */ sb $t8, 0x001E($s0) ## 0000001E /* 022DC 80A9908C 8219001E */ lb $t9, 0x001E($s0) ## 0000001E -/* 022E0 80A99090 01C17824 */ and $t7, $t6, $at +/* 022E0 80A99090 01C17824 */ and $t7, $t6, $at /* 022E4 80A99094 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 022E8 80A99098 00194100 */ sll $t0, $t9, 4 -/* 022EC 80A9909C 01194021 */ addu $t0, $t0, $t9 -/* 022F0 80A990A0 00084080 */ sll $t0, $t0, 2 -/* 022F4 80A990A4 02284821 */ addu $t1, $s1, $t0 -/* 022F8 80A990A8 01495021 */ addu $t2, $t2, $t1 +/* 022E8 80A99098 00194100 */ sll $t0, $t9, 4 +/* 022EC 80A9909C 01194021 */ addu $t0, $t0, $t9 +/* 022F0 80A990A0 00084080 */ sll $t0, $t0, 2 +/* 022F4 80A990A4 02284821 */ addu $t1, $s1, $t0 +/* 022F8 80A990A8 01495021 */ addu $t2, $t2, $t1 /* 022FC 80A990AC 8D4A17B4 */ lw $t2, 0x17B4($t2) ## 000117B4 /* 02300 80A990B0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02304 80A990B4 3C0F80AA */ lui $t7, %hi(D_80A9A506) ## $t7 = 80AA0000 -/* 02308 80A990B8 01415821 */ addu $t3, $t2, $at +/* 02308 80A990B8 01415821 */ addu $t3, $t2, $at /* 0230C 80A990BC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 02310 80A990C0 AC2B6FC0 */ sw $t3, 0x6FC0($at) ## 80166FC0 /* 02314 80A990C4 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 02318 80A990C8 3C0680AA */ lui $a2, %hi(D_80A9A180) ## $a2 = 80AA0000 /* 0231C 80A990CC 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 /* 02320 80A990D0 318D00FF */ andi $t5, $t4, 0x00FF ## $t5 = 00000000 -/* 02324 80A990D4 000D7080 */ sll $t6, $t5, 2 -/* 02328 80A990D8 01CD7023 */ subu $t6, $t6, $t5 -/* 0232C 80A990DC 000E7080 */ sll $t6, $t6, 2 -/* 02330 80A990E0 01CD7023 */ subu $t6, $t6, $t5 -/* 02334 80A990E4 01EE7821 */ addu $t7, $t7, $t6 -/* 02338 80A990E8 91EFA506 */ lbu $t7, %lo(D_80A9A506)($t7) +/* 02324 80A990D4 000D7080 */ sll $t6, $t5, 2 +/* 02328 80A990D8 01CD7023 */ subu $t6, $t6, $t5 +/* 0232C 80A990DC 000E7080 */ sll $t6, $t6, 2 +/* 02330 80A990E0 01CD7023 */ subu $t6, $t6, $t5 +/* 02334 80A990E4 01EE7821 */ addu $t7, $t7, $t6 +/* 02338 80A990E8 91EFA506 */ lbu $t7, %lo(D_80A9A506)($t7) /* 0233C 80A990EC 26080284 */ addiu $t0, $s0, 0x0284 ## $t0 = 00000284 /* 02340 80A990F0 26190224 */ addiu $t9, $s0, 0x0224 ## $t9 = 00000224 -/* 02344 80A990F4 000FC0C0 */ sll $t8, $t7, 3 -/* 02348 80A990F8 00D83021 */ addu $a2, $a2, $t8 +/* 02344 80A990F4 000FC0C0 */ sll $t8, $t7, 3 +/* 02348 80A990F8 00D83021 */ addu $a2, $a2, $t8 /* 0234C 80A990FC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 02350 80A99100 AFA50044 */ sw $a1, 0x0044($sp) -/* 02354 80A99104 8CC6A180 */ lw $a2, %lo(D_80A9A180)($a2) -/* 02358 80A99108 AFB90010 */ sw $t9, 0x0010($sp) -/* 0235C 80A9910C AFA80014 */ sw $t0, 0x0014($sp) -/* 02360 80A99110 AFA90018 */ sw $t1, 0x0018($sp) +/* 02350 80A99100 AFA50044 */ sw $a1, 0x0044($sp) +/* 02354 80A99104 8CC6A180 */ lw $a2, %lo(D_80A9A180)($a2) +/* 02358 80A99108 AFB90010 */ sw $t9, 0x0010($sp) +/* 0235C 80A9910C AFA80014 */ sw $t0, 0x0014($sp) +/* 02360 80A99110 AFA90018 */ sw $t1, 0x0018($sp) /* 02364 80A99114 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02368 80A99118 0C0291BE */ jal func_800A46F8 +/* 02368 80A99118 0C0291BE */ jal SkelAnime_InitSV /* 0236C 80A9911C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02370 80A99120 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 02374 80A99124 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 02378 80A99128 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0237C 80A9912C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02380 80A99130 0C00AC78 */ jal ActorShape_Init - + /* 02384 80A99134 3C074190 */ lui $a3, 0x4190 ## $a3 = 41900000 /* 02388 80A99138 820A0197 */ lb $t2, 0x0197($s0) ## 00000197 /* 0238C 80A9913C 3C0D0001 */ lui $t5, 0x0001 ## $t5 = 00010000 /* 02390 80A99140 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02394 80A99144 000A5900 */ sll $t3, $t2, 4 -/* 02398 80A99148 016A5821 */ addu $t3, $t3, $t2 -/* 0239C 80A9914C 000B5880 */ sll $t3, $t3, 2 -/* 023A0 80A99150 022B6021 */ addu $t4, $s1, $t3 -/* 023A4 80A99154 01AC6821 */ addu $t5, $t5, $t4 +/* 02394 80A99144 000A5900 */ sll $t3, $t2, 4 +/* 02398 80A99148 016A5821 */ addu $t3, $t3, $t2 +/* 0239C 80A9914C 000B5880 */ sll $t3, $t3, 2 +/* 023A0 80A99150 022B6021 */ addu $t4, $s1, $t3 +/* 023A4 80A99154 01AC6821 */ addu $t5, $t5, $t4 /* 023A8 80A99158 8DAD17B4 */ lw $t5, 0x17B4($t5) ## 000117B4 /* 023AC 80A9915C 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 -/* 023B0 80A99160 AFA50040 */ sw $a1, 0x0040($sp) -/* 023B4 80A99164 01A17021 */ addu $t6, $t5, $at +/* 023B0 80A99160 AFA50040 */ sw $a1, 0x0040($sp) +/* 023B4 80A99164 01A17021 */ addu $t6, $t5, $at /* 023B8 80A99168 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 023BC 80A9916C AC2E6FC0 */ sw $t6, 0x6FC0($at) ## 80166FC0 /* 023C0 80A99170 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 023C4 80A99174 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 023C8 80A99178 3C0780AA */ lui $a3, %hi(D_80A9A100) ## $a3 = 80AA0000 -/* 023CC 80A9917C 8FA50040 */ lw $a1, 0x0040($sp) +/* 023CC 80A9917C 8FA50040 */ lw $a1, 0x0040($sp) /* 023D0 80A99180 24E7A100 */ addiu $a3, $a3, %lo(D_80A9A100) ## $a3 = 80A9A100 /* 023D4 80A99184 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 023D8 80A99188 0C01712B */ jal ActorCollider_InitCylinder - + /* 023DC 80A9918C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 023E0 80A99190 3C0680AA */ lui $a2, %hi(D_80A9A12C) ## $a2 = 80AA0000 /* 023E4 80A99194 24C6A12C */ addiu $a2, $a2, %lo(D_80A9A12C) ## $a2 = 80A9A12C /* 023E8 80A99198 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 023EC 80A9919C 0C0187BF */ jal func_80061EFC +/* 023EC 80A9919C 0C0187BF */ jal func_80061EFC /* 023F0 80A991A0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 023F4 80A991A4 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 023F8 80A991A8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 023FC 80A991AC 3C0480AA */ lui $a0, %hi(D_80A9A780) ## $a0 = 80AA0000 /* 02400 80A991B0 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 02404 80A991B4 1701001D */ bne $t8, $at, .L80A9922C +/* 02404 80A991B4 1701001D */ bne $t8, $at, .L80A9922C /* 02408 80A991B8 2484A780 */ addiu $a0, $a0, %lo(D_80A9A780) ## $a0 = 80A9A780 /* 0240C 80A991BC 0C00084C */ jal osSyncPrintf - + /* 02410 80A991C0 860500B8 */ lh $a1, 0x00B8($s0) ## 000000B8 /* 02414 80A991C4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 02418 80A991C8 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 /* 0241C 80A991CC 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 /* 02420 80A991D0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 02424 80A991D4 5720000F */ bnel $t9, $zero, .L80A99214 +/* 02424 80A991D4 5720000F */ bnel $t9, $zero, .L80A99214 /* 02428 80A991D8 860C00B8 */ lh $t4, 0x00B8($s0) ## 000000B8 /* 0242C 80A991DC 8D087120 */ lw $t0, 0x7120($t0) ## 80127120 /* 02430 80A991E0 8D29E704 */ lw $t1, -0x18FC($t1) ## 8015E704 -/* 02434 80A991E4 01095024 */ and $t2, $t0, $t1 -/* 02438 80A991E8 5540000A */ bnel $t2, $zero, .L80A99214 +/* 02434 80A991E4 01095024 */ and $t2, $t0, $t1 +/* 02438 80A991E8 5540000A */ bnel $t2, $zero, .L80A99214 /* 0243C 80A991EC 860C00B8 */ lh $t4, 0x00B8($s0) ## 000000B8 /* 02440 80A991F0 860B00B8 */ lh $t3, 0x00B8($s0) ## 000000B8 /* 02444 80A991F4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02448 80A991F8 5161000D */ beql $t3, $at, .L80A99230 +/* 02448 80A991F8 5161000D */ beql $t3, $at, .L80A99230 /* 0244C 80A991FC 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 02450 80A99200 0C00B55C */ jal Actor_Kill - + /* 02454 80A99204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02458 80A99208 1000005A */ beq $zero, $zero, .L80A99374 -/* 0245C 80A9920C 8FBF003C */ lw $ra, 0x003C($sp) +/* 02458 80A99208 1000005A */ beq $zero, $zero, .L80A99374 +/* 0245C 80A9920C 8FBF003C */ lw $ra, 0x003C($sp) /* 02460 80A99210 860C00B8 */ lh $t4, 0x00B8($s0) ## 000000B8 .L80A99214: -/* 02464 80A99214 51800006 */ beql $t4, $zero, .L80A99230 +/* 02464 80A99214 51800006 */ beql $t4, $zero, .L80A99230 /* 02468 80A99218 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 0246C 80A9921C 0C00B55C */ jal Actor_Kill - + /* 02470 80A99220 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02474 80A99224 10000053 */ beq $zero, $zero, .L80A99374 -/* 02478 80A99228 8FBF003C */ lw $ra, 0x003C($sp) +/* 02474 80A99224 10000053 */ beq $zero, $zero, .L80A99374 +/* 02478 80A99228 8FBF003C */ lw $ra, 0x003C($sp) .L80A9922C: /* 0247C 80A9922C 860D001C */ lh $t5, 0x001C($s0) ## 0000001C .L80A99230: /* 02480 80A99230 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 02484 80A99234 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 02488 80A99238 15C10004 */ bne $t6, $at, .L80A9924C +/* 02488 80A99238 15C10004 */ bne $t6, $at, .L80A9924C /* 0248C 80A9923C 00000000 */ nop /* 02490 80A99240 920F01AA */ lbu $t7, 0x01AA($s0) ## 000001AA /* 02494 80A99244 35F80040 */ ori $t8, $t7, 0x0040 ## $t8 = 00000040 /* 02498 80A99248 A21801AA */ sb $t8, 0x01AA($s0) ## 000001AA .L80A9924C: -/* 0249C 80A9924C 0C2A634B */ jal func_80A98D2C +/* 0249C 80A9924C 0C2A634B */ jal func_80A98D2C /* 024A0 80A99250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 024A4 80A99254 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 024A8 80A99258 A6020212 */ sh $v0, 0x0212($s0) ## 00000212 /* 024AC 80A9925C 860A0212 */ lh $t2, 0x0212($s0) ## 00000212 /* 024B0 80A99260 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 024B4 80A99264 00084880 */ sll $t1, $t0, 2 -/* 024B8 80A99268 01284821 */ addu $t1, $t1, $t0 +/* 024B4 80A99264 00084880 */ sll $t1, $t0, 2 +/* 024B8 80A99268 01284821 */ addu $t1, $t1, $t0 /* 024BC 80A9926C 3C0680AA */ lui $a2, %hi(D_80A9A4BC) ## $a2 = 80AA0000 -/* 024C0 80A99270 012A5821 */ addu $t3, $t1, $t2 -/* 024C4 80A99274 00CB3021 */ addu $a2, $a2, $t3 +/* 024C0 80A99270 012A5821 */ addu $t3, $t1, $t2 +/* 024C4 80A99274 00CB3021 */ addu $a2, $a2, $t3 /* 024C8 80A99278 3C0580AA */ lui $a1, %hi(D_80A9A18C) ## $a1 = 80AA0000 /* 024CC 80A9927C 24A5A18C */ addiu $a1, $a1, %lo(D_80A9A18C) ## $a1 = 80A9A18C -/* 024D0 80A99280 90C6A4BC */ lbu $a2, %lo(D_80A9A4BC)($a2) -/* 024D4 80A99284 0C00D3B0 */ jal func_80034EC0 -/* 024D8 80A99288 8FA40044 */ lw $a0, 0x0044($sp) +/* 024D0 80A99280 90C6A4BC */ lbu $a2, %lo(D_80A9A4BC)($a2) +/* 024D4 80A99284 0C00D3B0 */ jal func_80034EC0 +/* 024D8 80A99288 8FA40044 */ lw $a0, 0x0044($sp) /* 024DC 80A9928C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 024E0 80A99290 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 024E4 80A99294 0C00B58B */ jal Actor_SetScale - + /* 024E8 80A99298 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024EC 80A9929C 0C2A6336 */ jal func_80A98CD8 +/* 024EC 80A9929C 0C2A6336 */ jal func_80A98CD8 /* 024F0 80A992A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 024F4 80A992A4 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 024F8 80A992A8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 024FC 80A992AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02500 80A992B0 30A5FF00 */ andi $a1, $a1, 0xFF00 ## $a1 = 00000000 -/* 02504 80A992B4 00052A03 */ sra $a1, $a1, 8 -/* 02508 80A992B8 00052C00 */ sll $a1, $a1, 16 -/* 0250C 80A992BC 00052C03 */ sra $a1, $a1, 16 +/* 02504 80A992B4 00052A03 */ sra $a1, $a1, 8 +/* 02508 80A992B8 00052C00 */ sll $a1, $a1, 16 +/* 0250C 80A992BC 00052C03 */ sra $a1, $a1, 16 /* 02510 80A992C0 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 02514 80A992C4 0C023938 */ jal func_8008E4E0 +/* 02514 80A992C4 0C023938 */ jal func_8008E4E0 /* 02518 80A992C8 E6040220 */ swc1 $f4, 0x0220($s0) ## 00000220 /* 0251C 80A992CC C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 02520 80A992D0 AE0201E4 */ sw $v0, 0x01E4($s0) ## 000001E4 /* 02524 80A992D4 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 02528 80A992D8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 02528 80A992D8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0252C 80A992DC C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 02530 80A992E0 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 02534 80A992E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02538 80A992E8 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 02538 80A992E8 E7A80014 */ swc1 $f8, 0x0014($sp) /* 0253C 80A992EC C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 02540 80A992F0 AFAC0028 */ sw $t4, 0x0028($sp) -/* 02544 80A992F4 AFA00024 */ sw $zero, 0x0024($sp) -/* 02548 80A992F8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0254C 80A992FC AFA0001C */ sw $zero, 0x001C($sp) +/* 02540 80A992F0 AFAC0028 */ sw $t4, 0x0028($sp) +/* 02544 80A992F4 AFA00024 */ sw $zero, 0x0024($sp) +/* 02548 80A992F8 AFA00020 */ sw $zero, 0x0020($sp) +/* 0254C 80A992FC AFA0001C */ sw $zero, 0x001C($sp) /* 02550 80A99300 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 02554 80A99304 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 /* 02558 80A99308 0C00C916 */ jal Actor_SpawnAttached - -/* 0255C 80A9930C E7AA0018 */ swc1 $f10, 0x0018($sp) + +/* 0255C 80A9930C E7AA0018 */ swc1 $f10, 0x0018($sp) /* 02560 80A99310 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 02564 80A99314 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 02568 80A99318 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 /* 0256C 80A9931C 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 02570 80A99320 15C10010 */ bne $t6, $at, .L80A99364 +/* 02570 80A99320 15C10010 */ bne $t6, $at, .L80A99364 /* 02574 80A99324 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 /* 02578 80A99328 8DEF7168 */ lw $t7, 0x7168($t7) ## 80127168 /* 0257C 80A9932C 8F18E704 */ lw $t8, -0x18FC($t8) ## 8015E704 /* 02580 80A99330 3C0A80AA */ lui $t2, %hi(func_80A995CC) ## $t2 = 80AA0000 /* 02584 80A99334 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 02588 80A99338 01F8C824 */ and $t9, $t7, $t8 -/* 0258C 80A9933C 17200007 */ bne $t9, $zero, .L80A9935C +/* 02588 80A99338 01F8C824 */ and $t9, $t7, $t8 +/* 0258C 80A9933C 17200007 */ bne $t9, $zero, .L80A9935C /* 02590 80A99340 00000000 */ nop /* 02594 80A99344 860801DA */ lh $t0, 0x01DA($s0) ## 000001DA /* 02598 80A99348 254A95CC */ addiu $t2, $t2, %lo(func_80A995CC) ## $t2 = 80A995CC /* 0259C 80A9934C AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 /* 025A0 80A99350 250900C8 */ addiu $t1, $t0, 0x00C8 ## $t1 = 000000C8 -/* 025A4 80A99354 10000006 */ beq $zero, $zero, .L80A99370 +/* 025A4 80A99354 10000006 */ beq $zero, $zero, .L80A99370 /* 025A8 80A99358 A60901DA */ sh $t1, 0x01DA($s0) ## 000001DA .L80A9935C: -/* 025AC 80A9935C 0C023983 */ jal func_8008E60C +/* 025AC 80A9935C 0C023983 */ jal func_8008E60C /* 025B0 80A99360 8E0401E4 */ lw $a0, 0x01E4($s0) ## 000001E4 .L80A99364: /* 025B4 80A99364 3C0B80AA */ lui $t3, %hi(func_80A99384) ## $t3 = 80AA0000 /* 025B8 80A99368 256B9384 */ addiu $t3, $t3, %lo(func_80A99384) ## $t3 = 80A99384 /* 025BC 80A9936C AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 .L80A99370: -/* 025C0 80A99370 8FBF003C */ lw $ra, 0x003C($sp) +/* 025C0 80A99370 8FBF003C */ lw $ra, 0x003C($sp) .L80A99374: -/* 025C4 80A99374 8FB00034 */ lw $s0, 0x0034($sp) -/* 025C8 80A99378 8FB10038 */ lw $s1, 0x0038($sp) -/* 025CC 80A9937C 03E00008 */ jr $ra +/* 025C4 80A99374 8FB00034 */ lw $s0, 0x0034($sp) +/* 025C8 80A99378 8FB10038 */ lw $s1, 0x0038($sp) +/* 025CC 80A9937C 03E00008 */ jr $ra /* 025D0 80A99380 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s index 37a96d2dc2..fada77405a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s @@ -1,17 +1,17 @@ glabel EnKz_Draw /* 01250 80A9D7A0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01254 80A9D7A4 AFBF002C */ sw $ra, 0x002C($sp) -/* 01258 80A9D7A8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0125C 80A9D7AC AFA50054 */ sw $a1, 0x0054($sp) +/* 01254 80A9D7A4 AFBF002C */ sw $ra, 0x002C($sp) +/* 01258 80A9D7A8 AFB00028 */ sw $s0, 0x0028($sp) +/* 0125C 80A9D7AC AFA50054 */ sw $a1, 0x0054($sp) /* 01260 80A9D7B0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01264 80A9D7B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01268 80A9D7B8 3C0680AA */ lui $a2, %hi(D_80A9D970) ## $a2 = 80AA0000 /* 0126C 80A9D7BC 24C6D970 */ addiu $a2, $a2, %lo(D_80A9D970) ## $a2 = 80A9D970 /* 01270 80A9D7C0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01274 80A9D7C4 240704EB */ addiu $a3, $zero, 0x04EB ## $a3 = 000004EB -/* 01278 80A9D7C8 0C031AB1 */ jal func_800C6AC4 -/* 0127C 80A9D7CC AFA50048 */ sw $a1, 0x0048($sp) -/* 01280 80A9D7D0 8FA80048 */ lw $t0, 0x0048($sp) +/* 01278 80A9D7C8 0C031AB1 */ jal func_800C6AC4 +/* 0127C 80A9D7CC AFA50048 */ sw $a1, 0x0048($sp) +/* 01280 80A9D7D0 8FA80048 */ lw $t0, 0x0048($sp) /* 01284 80A9D7D4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01288 80A9D7D8 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 0128C 80A9D7DC 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -23,21 +23,21 @@ glabel EnKz_Draw /* 012A4 80A9D7F4 86190210 */ lh $t9, 0x0210($s0) ## 00000210 /* 012A8 80A9D7F8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 012AC 80A9D7FC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 012B0 80A9D800 00194880 */ sll $t1, $t9, 2 -/* 012B4 80A9D804 00892021 */ addu $a0, $a0, $t1 -/* 012B8 80A9D808 8C84D964 */ lw $a0, %lo(D_80A9D964)($a0) -/* 012BC 80A9D80C 00045900 */ sll $t3, $a0, 4 -/* 012C0 80A9D810 000B6702 */ srl $t4, $t3, 28 -/* 012C4 80A9D814 000C6880 */ sll $t5, $t4, 2 -/* 012C8 80A9D818 01CD7021 */ addu $t6, $t6, $t5 +/* 012B0 80A9D800 00194880 */ sll $t1, $t9, 2 +/* 012B4 80A9D804 00892021 */ addu $a0, $a0, $t1 +/* 012B8 80A9D808 8C84D964 */ lw $a0, %lo(D_80A9D964)($a0) +/* 012BC 80A9D80C 00045900 */ sll $t3, $a0, 4 +/* 012C0 80A9D810 000B6702 */ srl $t4, $t3, 28 +/* 012C4 80A9D814 000C6880 */ sll $t5, $t4, 2 +/* 012C8 80A9D818 01CD7021 */ addu $t6, $t6, $t5 /* 012CC 80A9D81C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 012D0 80A9D820 00815024 */ and $t2, $a0, $at +/* 012D0 80A9D820 00815024 */ and $t2, $a0, $at /* 012D4 80A9D824 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 012D8 80A9D828 014E7821 */ addu $t7, $t2, $t6 -/* 012DC 80A9D82C 01E1C021 */ addu $t8, $t7, $at +/* 012D8 80A9D828 014E7821 */ addu $t7, $t2, $t6 +/* 012DC 80A9D82C 01E1C021 */ addu $t8, $t7, $at /* 012E0 80A9D830 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 012E4 80A9D834 8FB90054 */ lw $t9, 0x0054($sp) -/* 012E8 80A9D838 0C0250F2 */ jal func_800943C8 +/* 012E4 80A9D834 8FB90054 */ lw $t9, 0x0054($sp) +/* 012E8 80A9D838 0C0250F2 */ jal func_800943C8 /* 012EC 80A9D83C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 012F0 80A9D840 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 012F4 80A9D844 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -46,21 +46,21 @@ glabel EnKz_Draw /* 01300 80A9D850 3C0B80AA */ lui $t3, %hi(func_80A9D744) ## $t3 = 80AA0000 /* 01304 80A9D854 256BD744 */ addiu $t3, $t3, %lo(func_80A9D744) ## $t3 = 80A9D744 /* 01308 80A9D858 2529D670 */ addiu $t1, $t1, %lo(func_80A9D670) ## $t1 = 80A9D670 -/* 0130C 80A9D85C AFA90010 */ sw $t1, 0x0010($sp) -/* 01310 80A9D860 AFAB0014 */ sw $t3, 0x0014($sp) -/* 01314 80A9D864 AFB00018 */ sw $s0, 0x0018($sp) -/* 01318 80A9D868 0C0286B2 */ jal func_800A1AC8 -/* 0131C 80A9D86C 8FA40054 */ lw $a0, 0x0054($sp) -/* 01320 80A9D870 8FAC0054 */ lw $t4, 0x0054($sp) +/* 0130C 80A9D85C AFA90010 */ sw $t1, 0x0010($sp) +/* 01310 80A9D860 AFAB0014 */ sw $t3, 0x0014($sp) +/* 01314 80A9D864 AFB00018 */ sw $s0, 0x0018($sp) +/* 01318 80A9D868 0C0286B2 */ jal SkelAnime_DrawSV +/* 0131C 80A9D86C 8FA40054 */ lw $a0, 0x0054($sp) +/* 01320 80A9D870 8FAC0054 */ lw $t4, 0x0054($sp) /* 01324 80A9D874 3C0680AA */ lui $a2, %hi(D_80A9D980) ## $a2 = 80AA0000 /* 01328 80A9D878 24C6D980 */ addiu $a2, $a2, %lo(D_80A9D980) ## $a2 = 80A9D980 /* 0132C 80A9D87C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01330 80A9D880 24070501 */ addiu $a3, $zero, 0x0501 ## $a3 = 00000501 -/* 01334 80A9D884 0C031AD5 */ jal func_800C6B54 +/* 01334 80A9D884 0C031AD5 */ jal func_800C6B54 /* 01338 80A9D888 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 0133C 80A9D88C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01340 80A9D890 8FB00028 */ lw $s0, 0x0028($sp) +/* 0133C 80A9D88C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01340 80A9D890 8FB00028 */ lw $s0, 0x0028($sp) /* 01344 80A9D894 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01348 80A9D898 03E00008 */ jr $ra +/* 01348 80A9D898 03E00008 */ jr $ra /* 0134C 80A9D89C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s index aa54050b4a..9d26d9c488 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s @@ -1,69 +1,69 @@ glabel EnKz_Init /* 009BC 80A9CF0C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 009C0 80A9CF10 AFB00034 */ sw $s0, 0x0034($sp) +/* 009C0 80A9CF10 AFB00034 */ sw $s0, 0x0034($sp) /* 009C4 80A9CF14 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009C8 80A9CF18 AFB10038 */ sw $s1, 0x0038($sp) +/* 009C8 80A9CF18 AFB10038 */ sw $s1, 0x0038($sp) /* 009CC 80A9CF1C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 009D0 80A9CF20 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 009D4 80A9CF24 AFBF003C */ sw $ra, 0x003C($sp) +/* 009D4 80A9CF24 AFBF003C */ sw $ra, 0x003C($sp) /* 009D8 80A9CF28 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 009DC 80A9CF2C 260E0216 */ addiu $t6, $s0, 0x0216 ## $t6 = 00000216 /* 009E0 80A9CF30 260F025E */ addiu $t7, $s0, 0x025E ## $t7 = 0000025E /* 009E4 80A9CF34 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 009E8 80A9CF38 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C -/* 009EC 80A9CF3C AFB80018 */ sw $t8, 0x0018($sp) +/* 009EC 80A9CF3C AFB80018 */ sw $t8, 0x0018($sp) /* 009F0 80A9CF40 24C686D0 */ addiu $a2, $a2, 0x86D0 ## $a2 = 060086D0 -/* 009F4 80A9CF44 AFAF0014 */ sw $t7, 0x0014($sp) -/* 009F8 80A9CF48 AFAE0010 */ sw $t6, 0x0010($sp) -/* 009FC 80A9CF4C AFA50044 */ sw $a1, 0x0044($sp) -/* 00A00 80A9CF50 0C0291BE */ jal func_800A46F8 +/* 009F4 80A9CF44 AFAF0014 */ sw $t7, 0x0014($sp) +/* 009F8 80A9CF48 AFAE0010 */ sw $t6, 0x0010($sp) +/* 009FC 80A9CF4C AFA50044 */ sw $a1, 0x0044($sp) +/* 00A00 80A9CF50 0C0291BE */ jal SkelAnime_InitSV /* 00A04 80A9CF54 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00A08 80A9CF58 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00A0C 80A9CF5C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00A10 80A9CF60 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A14 80A9CF64 44050000 */ mfc1 $a1, $f0 -/* 00A18 80A9CF68 44070000 */ mfc1 $a3, $f0 +/* 00A14 80A9CF64 44050000 */ mfc1 $a1, $f0 +/* 00A18 80A9CF68 44070000 */ mfc1 $a3, $f0 /* 00A1C 80A9CF6C 0C00AC78 */ jal ActorShape_Init - + /* 00A20 80A9CF70 00000000 */ nop /* 00A24 80A9CF74 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00A28 80A9CF78 AFA50040 */ sw $a1, 0x0040($sp) +/* 00A28 80A9CF78 AFA50040 */ sw $a1, 0x0040($sp) /* 00A2C 80A9CF7C 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00A30 80A9CF80 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A34 80A9CF84 3C0780AA */ lui $a3, %hi(D_80A9D8C0) ## $a3 = 80AA0000 -/* 00A38 80A9CF88 8FA50040 */ lw $a1, 0x0040($sp) +/* 00A38 80A9CF88 8FA50040 */ lw $a1, 0x0040($sp) /* 00A3C 80A9CF8C 24E7D8C0 */ addiu $a3, $a3, %lo(D_80A9D8C0) ## $a3 = 80A9D8C0 /* 00A40 80A9CF90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A44 80A9CF94 0C01712B */ jal ActorCollider_InitCylinder - + /* 00A48 80A9CF98 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00A4C 80A9CF9C 3C0680AA */ lui $a2, %hi(D_80A9D8EC) ## $a2 = 80AA0000 /* 00A50 80A9CFA0 24C6D8EC */ addiu $a2, $a2, %lo(D_80A9D8EC) ## $a2 = 80A9D8EC /* 00A54 80A9CFA4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00A58 80A9CFA8 0C0187BF */ jal func_80061EFC +/* 00A58 80A9CFA8 0C0187BF */ jal func_80061EFC /* 00A5C 80A9CFAC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00A60 80A9CFB0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00A64 80A9CFB4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00A68 80A9CFB8 0C00B58B */ jal Actor_SetScale - + /* 00A6C 80A9CFBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A70 80A9CFC0 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 00A74 80A9CFC4 A219001F */ sb $t9, 0x001F($s0) ## 0000001F /* 00A78 80A9CFC8 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 /* 00A7C 80A9CFCC 3C0580AA */ lui $a1, %hi(D_80A9D8F8) ## $a1 = 80AA0000 /* 00A80 80A9CFD0 24A5D8F8 */ addiu $a1, $a1, %lo(D_80A9D8F8) ## $a1 = 80A9D8F8 -/* 00A84 80A9CFD4 8FA40044 */ lw $a0, 0x0044($sp) -/* 00A88 80A9CFD8 0C00D3B0 */ jal func_80034EC0 +/* 00A84 80A9CFD4 8FA40044 */ lw $a0, 0x0044($sp) +/* 00A88 80A9CFD8 0C00D3B0 */ jal func_80034EC0 /* 00A8C 80A9CFDC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00A90 80A9CFE0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00A94 80A9CFE4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 00A98 80A9CFE8 94480EDA */ lhu $t0, 0x0EDA($v0) ## 8015F53A /* 00A9C 80A9CFEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00AA0 80A9CFF0 31090008 */ andi $t1, $t0, 0x0008 ## $t1 = 00000000 -/* 00AA4 80A9CFF4 51200006 */ beql $t1, $zero, .L80A9D010 +/* 00AA4 80A9CFF4 51200006 */ beql $t1, $zero, .L80A9D010 /* 00AA8 80A9CFF8 8C4A0004 */ lw $t2, 0x0004($v0) ## 8015E664 -/* 00AAC 80A9CFFC 0C2A7391 */ jal func_80A9CE44 +/* 00AAC 80A9CFFC 0C2A7391 */ jal func_80A9CE44 /* 00AB0 80A9D000 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00AB4 80A9D004 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00AB8 80A9D008 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 @@ -71,40 +71,40 @@ glabel EnKz_Init .L80A9D010: /* 00AC0 80A9D010 3C0F80AA */ lui $t7, %hi(func_80A9D0C0) ## $t7 = 80AA0000 /* 00AC4 80A9D014 25EFD0C0 */ addiu $t7, $t7, %lo(func_80A9D0C0) ## $t7 = 80A9D0C0 -/* 00AC8 80A9D018 5540001A */ bnel $t2, $zero, .L80A9D084 +/* 00AC8 80A9D018 5540001A */ bnel $t2, $zero, .L80A9D084 /* 00ACC 80A9D01C AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 /* 00AD0 80A9D020 944B0F1E */ lhu $t3, 0x0F1E($v0) ## 8015F57E /* 00AD4 80A9D024 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 00AD8 80A9D028 316C0100 */ andi $t4, $t3, 0x0100 ## $t4 = 00000000 -/* 00ADC 80A9D02C 15800010 */ bne $t4, $zero, .L80A9D070 +/* 00ADC 80A9D02C 15800010 */ bne $t4, $zero, .L80A9D070 /* 00AE0 80A9D030 00000000 */ nop /* 00AE4 80A9D034 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 00AE8 80A9D038 240D04FF */ addiu $t5, $zero, 0x04FF ## $t5 = 000004FF /* 00AEC 80A9D03C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00AF0 80A9D040 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00AF0 80A9D040 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00AF4 80A9D044 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 00AF8 80A9D048 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00AFC 80A9D04C 240700EF */ addiu $a3, $zero, 0x00EF ## $a3 = 000000EF -/* 00B00 80A9D050 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00B00 80A9D050 E7A60014 */ swc1 $f6, 0x0014($sp) /* 00B04 80A9D054 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00B08 80A9D058 AFAD0028 */ sw $t5, 0x0028($sp) -/* 00B0C 80A9D05C AFA00024 */ sw $zero, 0x0024($sp) -/* 00B10 80A9D060 AFA00020 */ sw $zero, 0x0020($sp) -/* 00B14 80A9D064 AFA0001C */ sw $zero, 0x001C($sp) +/* 00B08 80A9D058 AFAD0028 */ sw $t5, 0x0028($sp) +/* 00B0C 80A9D05C AFA00024 */ sw $zero, 0x0024($sp) +/* 00B10 80A9D060 AFA00020 */ sw $zero, 0x0020($sp) +/* 00B14 80A9D064 AFA0001C */ sw $zero, 0x001C($sp) /* 00B18 80A9D068 0C00C916 */ jal Actor_SpawnAttached - -/* 00B1C 80A9D06C E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 00B1C 80A9D06C E7A80018 */ swc1 $f8, 0x0018($sp) .L80A9D070: /* 00B20 80A9D070 3C0E80AA */ lui $t6, %hi(func_80A9D42C) ## $t6 = 80AA0000 /* 00B24 80A9D074 25CED42C */ addiu $t6, $t6, %lo(func_80A9D42C) ## $t6 = 80A9D42C -/* 00B28 80A9D078 10000002 */ beq $zero, $zero, .L80A9D084 +/* 00B28 80A9D078 10000002 */ beq $zero, $zero, .L80A9D084 /* 00B2C 80A9D07C AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 /* 00B30 80A9D080 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 .L80A9D084: -/* 00B34 80A9D084 8FBF003C */ lw $ra, 0x003C($sp) -/* 00B38 80A9D088 8FB00034 */ lw $s0, 0x0034($sp) -/* 00B3C 80A9D08C 8FB10038 */ lw $s1, 0x0038($sp) -/* 00B40 80A9D090 03E00008 */ jr $ra +/* 00B34 80A9D084 8FBF003C */ lw $ra, 0x003C($sp) +/* 00B38 80A9D088 8FB00034 */ lw $s0, 0x0034($sp) +/* 00B3C 80A9D08C 8FB10038 */ lw $s1, 0x0038($sp) +/* 00B40 80A9D090 03E00008 */ jr $ra /* 00B44 80A9D094 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s index 166e7de057..34dd9fa10f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s @@ -1,18 +1,18 @@ glabel EnMa1_Destroy /* 006C0 80AA0D50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006C4 80AA0D54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006C8 80AA0D58 AFA40018 */ sw $a0, 0x0018($sp) -/* 006CC 80AA0D5C AFA5001C */ sw $a1, 0x001C($sp) -/* 006D0 80AA0D60 0C0295BC */ jal func_800A56F0 +/* 006C4 80AA0D54 AFBF0014 */ sw $ra, 0x0014($sp) +/* 006C8 80AA0D58 AFA40018 */ sw $a0, 0x0018($sp) +/* 006CC 80AA0D5C AFA5001C */ sw $a1, 0x001C($sp) +/* 006D0 80AA0D60 0C0295BC */ jal SkelAnime_Free /* 006D4 80AA0D64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006D8 80AA0D68 8FA50018 */ lw $a1, 0x0018($sp) -/* 006DC 80AA0D6C 8FA4001C */ lw $a0, 0x001C($sp) +/* 006D8 80AA0D68 8FA50018 */ lw $a1, 0x0018($sp) +/* 006DC 80AA0D6C 8FA4001C */ lw $a0, 0x001C($sp) /* 006E0 80AA0D70 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 006E4 80AA0D74 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 006E8 80AA0D78 8FBF0014 */ lw $ra, 0x0014($sp) +/* 006E8 80AA0D78 8FBF0014 */ lw $ra, 0x0014($sp) /* 006EC 80AA0D7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006F0 80AA0D80 03E00008 */ jr $ra +/* 006F0 80AA0D80 03E00008 */ jr $ra /* 006F4 80AA0D84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s index 8f7188e992..dcaeb34325 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s @@ -1,30 +1,30 @@ glabel EnMa1_Draw /* 00E14 80AA14A4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00E18 80AA14A8 AFB20030 */ sw $s2, 0x0030($sp) +/* 00E18 80AA14A8 AFB20030 */ sw $s2, 0x0030($sp) /* 00E1C 80AA14AC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00E20 80AA14B0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00E24 80AA14B4 AFB1002C */ sw $s1, 0x002C($sp) -/* 00E28 80AA14B8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00E20 80AA14B0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00E24 80AA14B4 AFB1002C */ sw $s1, 0x002C($sp) +/* 00E28 80AA14B8 AFB00028 */ sw $s0, 0x0028($sp) /* 00E2C 80AA14BC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00E30 80AA14C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00E34 80AA14C4 3C0680AA */ lui $a2, %hi(D_80AA16E0) ## $a2 = 80AA0000 /* 00E38 80AA14C8 24C616E0 */ addiu $a2, $a2, %lo(D_80AA16E0) ## $a2 = 80AA16E0 /* 00E3C 80AA14CC 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00E40 80AA14D0 240704CA */ addiu $a3, $zero, 0x04CA ## $a3 = 000004CA -/* 00E44 80AA14D4 0C031AB1 */ jal func_800C6AC4 +/* 00E44 80AA14D4 0C031AB1 */ jal func_800C6AC4 /* 00E48 80AA14D8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00E4C 80AA14DC 864E07A0 */ lh $t6, 0x07A0($s2) ## 000007A0 /* 00E50 80AA14E0 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00E54 80AA14E4 000E7880 */ sll $t7, $t6, 2 -/* 00E58 80AA14E8 024FC021 */ addu $t8, $s2, $t7 +/* 00E54 80AA14E4 000E7880 */ sll $t7, $t6, 2 +/* 00E58 80AA14E8 024FC021 */ addu $t8, $s2, $t7 /* 00E5C 80AA14EC 8F020790 */ lw $v0, 0x0790($t8) ## 00000790 /* 00E60 80AA14F0 0C01E00A */ jal Math_Vec3f_DistXZ - + /* 00E64 80AA14F4 2445005C */ addiu $a1, $v0, 0x005C ## $a1 = 0000005C -/* 00E68 80AA14F8 46000306 */ mov.s $f12, $f0 -/* 00E6C 80AA14FC 0C03D89A */ jal func_800F6268 +/* 00E68 80AA14F8 46000306 */ mov.s $f12, $f0 +/* 00E6C 80AA14FC 0C03D89A */ jal func_800F6268 /* 00E70 80AA1500 2405002F */ addiu $a1, $zero, 0x002F ## $a1 = 0000002F -/* 00E74 80AA1504 0C024F46 */ jal func_80093D18 +/* 00E74 80AA1504 0C024F46 */ jal func_80093D18 /* 00E78 80AA1508 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 00E7C 80AA150C 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00E80 80AA1510 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 @@ -35,21 +35,21 @@ glabel EnMa1_Draw /* 00E94 80AA1524 860901E6 */ lh $t1, 0x01E6($s0) ## 000001E6 /* 00E98 80AA1528 3C0480AA */ lui $a0, %hi(D_80AA16C4) ## $a0 = 80AA0000 /* 00E9C 80AA152C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 00EA0 80AA1530 00095080 */ sll $t2, $t1, 2 -/* 00EA4 80AA1534 008A2021 */ addu $a0, $a0, $t2 -/* 00EA8 80AA1538 8C8416C4 */ lw $a0, %lo(D_80AA16C4)($a0) +/* 00EA0 80AA1530 00095080 */ sll $t2, $t1, 2 +/* 00EA4 80AA1534 008A2021 */ addu $a0, $a0, $t2 +/* 00EA8 80AA1538 8C8416C4 */ lw $a0, %lo(D_80AA16C4)($a0) /* 00EAC 80AA153C 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 00EB0 80AA1540 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 00EB4 80AA1544 00046100 */ sll $t4, $a0, 4 -/* 00EB8 80AA1548 000C6F02 */ srl $t5, $t4, 28 -/* 00EBC 80AA154C 000D7080 */ sll $t6, $t5, 2 -/* 00EC0 80AA1550 00CE7821 */ addu $t7, $a2, $t6 +/* 00EB4 80AA1544 00046100 */ sll $t4, $a0, 4 +/* 00EB8 80AA1548 000C6F02 */ srl $t5, $t4, 28 +/* 00EBC 80AA154C 000D7080 */ sll $t6, $t5, 2 +/* 00EC0 80AA1550 00CE7821 */ addu $t7, $a2, $t6 /* 00EC4 80AA1554 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 /* 00EC8 80AA1558 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 00ECC 80AA155C 00855824 */ and $t3, $a0, $a1 +/* 00ECC 80AA155C 00855824 */ and $t3, $a0, $a1 /* 00ED0 80AA1560 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00ED4 80AA1564 0178C821 */ addu $t9, $t3, $t8 -/* 00ED8 80AA1568 03274021 */ addu $t0, $t9, $a3 +/* 00ED4 80AA1564 0178C821 */ addu $t9, $t3, $t8 +/* 00ED8 80AA1568 03274021 */ addu $t0, $t9, $a3 /* 00EDC 80AA156C AC680004 */ sw $t0, 0x0004($v1) ## 00000004 /* 00EE0 80AA1570 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00EE4 80AA1574 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 @@ -59,40 +59,40 @@ glabel EnMa1_Draw /* 00EF4 80AA1584 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 00EF8 80AA1588 860C01E4 */ lh $t4, 0x01E4($s0) ## 000001E4 /* 00EFC 80AA158C 3C0480AA */ lui $a0, %hi(D_80AA16D0) ## $a0 = 80AA0000 -/* 00F00 80AA1590 000C6880 */ sll $t5, $t4, 2 -/* 00F04 80AA1594 008D2021 */ addu $a0, $a0, $t5 -/* 00F08 80AA1598 8C8416D0 */ lw $a0, %lo(D_80AA16D0)($a0) +/* 00F00 80AA1590 000C6880 */ sll $t5, $t4, 2 +/* 00F04 80AA1594 008D2021 */ addu $a0, $a0, $t5 +/* 00F08 80AA1598 8C8416D0 */ lw $a0, %lo(D_80AA16D0)($a0) /* 00F0C 80AA159C 3C0D80AA */ lui $t5, %hi(func_80AA1448) ## $t5 = 80AA0000 /* 00F10 80AA15A0 3C0C80AA */ lui $t4, %hi(func_80AA12BC) ## $t4 = 80AA0000 -/* 00F14 80AA15A4 00047900 */ sll $t7, $a0, 4 -/* 00F18 80AA15A8 000F5F02 */ srl $t3, $t7, 28 -/* 00F1C 80AA15AC 000BC080 */ sll $t8, $t3, 2 -/* 00F20 80AA15B0 00D8C821 */ addu $t9, $a2, $t8 +/* 00F14 80AA15A4 00047900 */ sll $t7, $a0, 4 +/* 00F18 80AA15A8 000F5F02 */ srl $t3, $t7, 28 +/* 00F1C 80AA15AC 000BC080 */ sll $t8, $t3, 2 +/* 00F20 80AA15B0 00D8C821 */ addu $t9, $a2, $t8 /* 00F24 80AA15B4 8F280000 */ lw $t0, 0x0000($t9) ## 00000008 -/* 00F28 80AA15B8 00857024 */ and $t6, $a0, $a1 +/* 00F28 80AA15B8 00857024 */ and $t6, $a0, $a1 /* 00F2C 80AA15BC 258C12BC */ addiu $t4, $t4, %lo(func_80AA12BC) ## $t4 = 80AA12BC -/* 00F30 80AA15C0 01C84821 */ addu $t1, $t6, $t0 -/* 00F34 80AA15C4 01275021 */ addu $t2, $t1, $a3 +/* 00F30 80AA15C0 01C84821 */ addu $t1, $t6, $t0 +/* 00F34 80AA15C4 01275021 */ addu $t2, $t1, $a3 /* 00F38 80AA15C8 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 00F3C 80AA15CC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 00F40 80AA15D0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 00F44 80AA15D4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 00F48 80AA15D8 25AD1448 */ addiu $t5, $t5, %lo(func_80AA1448) ## $t5 = 80AA1448 -/* 00F4C 80AA15DC AFAD0014 */ sw $t5, 0x0014($sp) -/* 00F50 80AA15E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00F54 80AA15E4 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00F58 80AA15E8 0C0286B2 */ jal func_800A1AC8 +/* 00F4C 80AA15DC AFAD0014 */ sw $t5, 0x0014($sp) +/* 00F50 80AA15E0 AFB00018 */ sw $s0, 0x0018($sp) +/* 00F54 80AA15E4 AFAC0010 */ sw $t4, 0x0010($sp) +/* 00F58 80AA15E8 0C0286B2 */ jal SkelAnime_DrawSV /* 00F5C 80AA15EC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00F60 80AA15F0 3C0680AA */ lui $a2, %hi(D_80AA16F0) ## $a2 = 80AA0000 /* 00F64 80AA15F4 24C616F0 */ addiu $a2, $a2, %lo(D_80AA16F0) ## $a2 = 80AA16F0 /* 00F68 80AA15F8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00F6C 80AA15FC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00F70 80AA1600 0C031AD5 */ jal func_800C6B54 +/* 00F70 80AA1600 0C031AD5 */ jal func_800C6B54 /* 00F74 80AA1604 240704ED */ addiu $a3, $zero, 0x04ED ## $a3 = 000004ED -/* 00F78 80AA1608 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00F7C 80AA160C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00F80 80AA1610 8FB1002C */ lw $s1, 0x002C($sp) -/* 00F84 80AA1614 8FB20030 */ lw $s2, 0x0030($sp) -/* 00F88 80AA1618 03E00008 */ jr $ra +/* 00F78 80AA1608 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00F7C 80AA160C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00F80 80AA1610 8FB1002C */ lw $s1, 0x002C($sp) +/* 00F84 80AA1614 8FB20030 */ lw $s2, 0x0030($sp) +/* 00F88 80AA1618 03E00008 */ jr $ra /* 00F8C 80AA161C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s index af19f76f4d..6087e66e66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s @@ -1,68 +1,68 @@ glabel EnMa1_Init /* 00558 80AA0BE8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0055C 80AA0BEC AFB00028 */ sw $s0, 0x0028($sp) +/* 0055C 80AA0BEC AFB00028 */ sw $s0, 0x0028($sp) /* 00560 80AA0BF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00564 80AA0BF4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00568 80AA0BF8 AFA50044 */ sw $a1, 0x0044($sp) +/* 00564 80AA0BF4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00568 80AA0BF8 AFA50044 */ sw $a1, 0x0044($sp) /* 0056C 80AA0BFC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00570 80AA0C00 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00574 80AA0C04 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00578 80AA0C08 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0057C 80AA0C0C 0C00AC78 */ jal ActorShape_Init - + /* 00580 80AA0C10 3C074190 */ lui $a3, 0x4190 ## $a3 = 41900000 /* 00584 80AA0C14 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00588 80AA0C18 24C68460 */ addiu $a2, $a2, 0x8460 ## $a2 = 06008460 -/* 0058C 80AA0C1C 8FA40044 */ lw $a0, 0x0044($sp) +/* 0058C 80AA0C1C 8FA40044 */ lw $a0, 0x0044($sp) /* 00590 80AA0C20 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00594 80AA0C24 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00598 80AA0C28 AFA00010 */ sw $zero, 0x0010($sp) -/* 0059C 80AA0C2C AFA00014 */ sw $zero, 0x0014($sp) -/* 005A0 80AA0C30 0C0291BE */ jal func_800A46F8 -/* 005A4 80AA0C34 AFA00018 */ sw $zero, 0x0018($sp) +/* 00598 80AA0C28 AFA00010 */ sw $zero, 0x0010($sp) +/* 0059C 80AA0C2C AFA00014 */ sw $zero, 0x0014($sp) +/* 005A0 80AA0C30 0C0291BE */ jal SkelAnime_InitSV +/* 005A4 80AA0C34 AFA00018 */ sw $zero, 0x0018($sp) /* 005A8 80AA0C38 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 005AC 80AA0C3C AFA50030 */ sw $a1, 0x0030($sp) +/* 005AC 80AA0C3C AFA50030 */ sw $a1, 0x0030($sp) /* 005B0 80AA0C40 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 005B4 80AA0C44 8FA40044 */ lw $a0, 0x0044($sp) + +/* 005B4 80AA0C44 8FA40044 */ lw $a0, 0x0044($sp) /* 005B8 80AA0C48 3C0780AA */ lui $a3, %hi(D_80AA1640) ## $a3 = 80AA0000 -/* 005BC 80AA0C4C 8FA50030 */ lw $a1, 0x0030($sp) +/* 005BC 80AA0C4C 8FA50030 */ lw $a1, 0x0030($sp) /* 005C0 80AA0C50 24E71640 */ addiu $a3, $a3, %lo(D_80AA1640) ## $a3 = 80AA1640 -/* 005C4 80AA0C54 8FA40044 */ lw $a0, 0x0044($sp) +/* 005C4 80AA0C54 8FA40044 */ lw $a0, 0x0044($sp) /* 005C8 80AA0C58 0C01712B */ jal ActorCollider_InitCylinder - + /* 005CC 80AA0C5C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 005D0 80AA0C60 0C016C80 */ jal CollisionBtlTbl_Get - + /* 005D4 80AA0C64 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 005D8 80AA0C68 3C0680AA */ lui $a2, %hi(D_80AA166C) ## $a2 = 80AA0000 /* 005DC 80AA0C6C 24C6166C */ addiu $a2, $a2, %lo(D_80AA166C) ## $a2 = 80AA166C /* 005E0 80AA0C70 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 005E4 80AA0C74 0C0187BF */ jal func_80061EFC +/* 005E4 80AA0C74 0C0187BF */ jal func_80061EFC /* 005E8 80AA0C78 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 005EC 80AA0C7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005F0 80AA0C80 0C2A8231 */ jal func_80AA08C4 -/* 005F4 80AA0C84 8FA50044 */ lw $a1, 0x0044($sp) -/* 005F8 80AA0C88 14400005 */ bne $v0, $zero, .L80AA0CA0 -/* 005FC 80AA0C8C 8FA40044 */ lw $a0, 0x0044($sp) +/* 005F0 80AA0C80 0C2A8231 */ jal func_80AA08C4 +/* 005F4 80AA0C84 8FA50044 */ lw $a1, 0x0044($sp) +/* 005F8 80AA0C88 14400005 */ bne $v0, $zero, .L80AA0CA0 +/* 005FC 80AA0C8C 8FA40044 */ lw $a0, 0x0044($sp) /* 00600 80AA0C90 0C00B55C */ jal Actor_Kill - + /* 00604 80AA0C94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00608 80AA0C98 10000029 */ beq $zero, $zero, .L80AA0D40 -/* 0060C 80AA0C9C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00608 80AA0C98 10000029 */ beq $zero, $zero, .L80AA0D40 +/* 0060C 80AA0C9C 8FBF002C */ lw $ra, 0x002C($sp) .L80AA0CA0: /* 00610 80AA0CA0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00614 80AA0CA4 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00618 80AA0CA8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0061C 80AA0CAC 44060000 */ mfc1 $a2, $f0 -/* 00620 80AA0CB0 44070000 */ mfc1 $a3, $f0 +/* 00618 80AA0CA8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0061C 80AA0CAC 44060000 */ mfc1 $a2, $f0 +/* 00620 80AA0CB0 44070000 */ mfc1 $a3, $f0 /* 00624 80AA0CB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00628 80AA0CB8 0C00B92D */ jal func_8002E4B4 -/* 0062C 80AA0CBC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00628 80AA0CB8 0C00B92D */ jal func_8002E4B4 +/* 0062C 80AA0CBC E7A00010 */ swc1 $f0, 0x0010($sp) /* 00630 80AA0CC0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00634 80AA0CC4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00638 80AA0CC8 0C00B58B */ jal Actor_SetScale - + /* 0063C 80AA0CCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00640 80AA0CD0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00644 80AA0CD4 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 @@ -73,31 +73,31 @@ glabel EnMa1_Init /* 00658 80AA0CE8 3C0B80AA */ lui $t3, %hi(func_80AA0D88) ## $t3 = 80AA0000 /* 0065C 80AA0CEC 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 /* 00660 80AA0CF0 33190010 */ andi $t9, $t8, 0x0010 ## $t9 = 00000000 -/* 00664 80AA0CF4 13200008 */ beq $t9, $zero, .L80AA0D18 +/* 00664 80AA0CF4 13200008 */ beq $t9, $zero, .L80AA0D18 /* 00668 80AA0CF8 256B0D88 */ addiu $t3, $t3, %lo(func_80AA0D88) ## $t3 = 80AA0D88 /* 0066C 80AA0CFC 8D087154 */ lw $t0, 0x7154($t0) ## 80127154 /* 00670 80AA0D00 8C4900A4 */ lw $t1, 0x00A4($v0) ## 8015E704 /* 00674 80AA0D04 3C0C80AA */ lui $t4, %hi(func_80AA0F44) ## $t4 = 80AA0000 /* 00678 80AA0D08 258C0F44 */ addiu $t4, $t4, %lo(func_80AA0F44) ## $t4 = 80AA0F44 -/* 0067C 80AA0D0C 01095024 */ and $t2, $t0, $t1 -/* 00680 80AA0D10 11400007 */ beq $t2, $zero, .L80AA0D30 +/* 0067C 80AA0D0C 01095024 */ and $t2, $t0, $t1 +/* 00680 80AA0D10 11400007 */ beq $t2, $zero, .L80AA0D30 /* 00684 80AA0D14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AA0D18: /* 00688 80AA0D18 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 /* 0068C 80AA0D1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00690 80AA0D20 0C2A82A1 */ jal func_80AA0A84 +/* 00690 80AA0D20 0C2A82A1 */ jal func_80AA0A84 /* 00694 80AA0D24 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 00698 80AA0D28 10000005 */ beq $zero, $zero, .L80AA0D40 -/* 0069C 80AA0D2C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00698 80AA0D28 10000005 */ beq $zero, $zero, .L80AA0D40 +/* 0069C 80AA0D2C 8FBF002C */ lw $ra, 0x002C($sp) .L80AA0D30: /* 006A0 80AA0D30 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 006A4 80AA0D34 0C2A82A1 */ jal func_80AA0A84 +/* 006A4 80AA0D34 0C2A82A1 */ jal func_80AA0A84 /* 006A8 80AA0D38 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 006AC 80AA0D3C 8FBF002C */ lw $ra, 0x002C($sp) +/* 006AC 80AA0D3C 8FBF002C */ lw $ra, 0x002C($sp) .L80AA0D40: -/* 006B0 80AA0D40 8FB00028 */ lw $s0, 0x0028($sp) +/* 006B0 80AA0D40 8FB00028 */ lw $s0, 0x0028($sp) /* 006B4 80AA0D44 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 006B8 80AA0D48 03E00008 */ jr $ra +/* 006B8 80AA0D48 03E00008 */ jr $ra /* 006BC 80AA0D4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s index b15d1ef915..65e59c5c7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s @@ -1,18 +1,18 @@ glabel EnMa2_Destroy /* 00640 80AA1FE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00644 80AA1FE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00648 80AA1FE8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0064C 80AA1FEC AFA5001C */ sw $a1, 0x001C($sp) -/* 00650 80AA1FF0 0C0295BC */ jal func_800A56F0 +/* 00644 80AA1FE4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00648 80AA1FE8 AFA40018 */ sw $a0, 0x0018($sp) +/* 0064C 80AA1FEC AFA5001C */ sw $a1, 0x001C($sp) +/* 00650 80AA1FF0 0C0295BC */ jal SkelAnime_Free /* 00654 80AA1FF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00658 80AA1FF8 8FA50018 */ lw $a1, 0x0018($sp) -/* 0065C 80AA1FFC 8FA4001C */ lw $a0, 0x001C($sp) +/* 00658 80AA1FF8 8FA50018 */ lw $a1, 0x0018($sp) +/* 0065C 80AA1FFC 8FA4001C */ lw $a0, 0x001C($sp) /* 00660 80AA2000 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 00664 80AA2004 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 00668 80AA2008 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00668 80AA2008 8FBF0014 */ lw $ra, 0x0014($sp) /* 0066C 80AA200C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00670 80AA2010 03E00008 */ jr $ra +/* 00670 80AA2010 03E00008 */ jr $ra /* 00674 80AA2014 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s index 00dec59ef1..b578dfe044 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s @@ -1,30 +1,30 @@ glabel EnMa2_Draw /* 00CDC 80AA267C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00CE0 80AA2680 AFB20030 */ sw $s2, 0x0030($sp) +/* 00CE0 80AA2680 AFB20030 */ sw $s2, 0x0030($sp) /* 00CE4 80AA2684 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00CE8 80AA2688 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00CEC 80AA268C AFB1002C */ sw $s1, 0x002C($sp) -/* 00CF0 80AA2690 AFB00028 */ sw $s0, 0x0028($sp) +/* 00CE8 80AA2688 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00CEC 80AA268C AFB1002C */ sw $s1, 0x002C($sp) +/* 00CF0 80AA2690 AFB00028 */ sw $s0, 0x0028($sp) /* 00CF4 80AA2694 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00CF8 80AA2698 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00CFC 80AA269C 3C0680AA */ lui $a2, %hi(D_80AA28F0) ## $a2 = 80AA0000 /* 00D00 80AA26A0 24C628F0 */ addiu $a2, $a2, %lo(D_80AA28F0) ## $a2 = 80AA28F0 /* 00D04 80AA26A4 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00D08 80AA26A8 240703BB */ addiu $a3, $zero, 0x03BB ## $a3 = 000003BB -/* 00D0C 80AA26AC 0C031AB1 */ jal func_800C6AC4 +/* 00D0C 80AA26AC 0C031AB1 */ jal func_800C6AC4 /* 00D10 80AA26B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00D14 80AA26B4 864E07A0 */ lh $t6, 0x07A0($s2) ## 000007A0 /* 00D18 80AA26B8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00D1C 80AA26BC 000E7880 */ sll $t7, $t6, 2 -/* 00D20 80AA26C0 024FC021 */ addu $t8, $s2, $t7 +/* 00D1C 80AA26BC 000E7880 */ sll $t7, $t6, 2 +/* 00D20 80AA26C0 024FC021 */ addu $t8, $s2, $t7 /* 00D24 80AA26C4 8F020790 */ lw $v0, 0x0790($t8) ## 00000790 /* 00D28 80AA26C8 0C01E00A */ jal Math_Vec3f_DistXZ - + /* 00D2C 80AA26CC 2445005C */ addiu $a1, $v0, 0x005C ## $a1 = 0000005C -/* 00D30 80AA26D0 46000306 */ mov.s $f12, $f0 -/* 00D34 80AA26D4 0C03D89A */ jal func_800F6268 +/* 00D30 80AA26D0 46000306 */ mov.s $f12, $f0 +/* 00D34 80AA26D4 0C03D89A */ jal func_800F6268 /* 00D38 80AA26D8 2405002F */ addiu $a1, $zero, 0x002F ## $a1 = 0000002F -/* 00D3C 80AA26DC 0C024F46 */ jal func_80093D18 +/* 00D3C 80AA26DC 0C024F46 */ jal func_80093D18 /* 00D40 80AA26E0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 00D44 80AA26E4 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00D48 80AA26E8 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 @@ -35,21 +35,21 @@ glabel EnMa2_Draw /* 00D5C 80AA26FC 86090210 */ lh $t1, 0x0210($s0) ## 00000210 /* 00D60 80AA2700 3C0480AA */ lui $a0, %hi(D_80AA28B4) ## $a0 = 80AA0000 /* 00D64 80AA2704 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 00D68 80AA2708 00095080 */ sll $t2, $t1, 2 -/* 00D6C 80AA270C 008A2021 */ addu $a0, $a0, $t2 -/* 00D70 80AA2710 8C8428B4 */ lw $a0, %lo(D_80AA28B4)($a0) +/* 00D68 80AA2708 00095080 */ sll $t2, $t1, 2 +/* 00D6C 80AA270C 008A2021 */ addu $a0, $a0, $t2 +/* 00D70 80AA2710 8C8428B4 */ lw $a0, %lo(D_80AA28B4)($a0) /* 00D74 80AA2714 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 00D78 80AA2718 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 00D7C 80AA271C 00046100 */ sll $t4, $a0, 4 -/* 00D80 80AA2720 000C6F02 */ srl $t5, $t4, 28 -/* 00D84 80AA2724 000D7080 */ sll $t6, $t5, 2 -/* 00D88 80AA2728 00CE7821 */ addu $t7, $a2, $t6 +/* 00D7C 80AA271C 00046100 */ sll $t4, $a0, 4 +/* 00D80 80AA2720 000C6F02 */ srl $t5, $t4, 28 +/* 00D84 80AA2724 000D7080 */ sll $t6, $t5, 2 +/* 00D88 80AA2728 00CE7821 */ addu $t7, $a2, $t6 /* 00D8C 80AA272C 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 /* 00D90 80AA2730 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 00D94 80AA2734 00855824 */ and $t3, $a0, $a1 +/* 00D94 80AA2734 00855824 */ and $t3, $a0, $a1 /* 00D98 80AA2738 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00D9C 80AA273C 0178C821 */ addu $t9, $t3, $t8 -/* 00DA0 80AA2740 03274021 */ addu $t0, $t9, $a3 +/* 00D9C 80AA273C 0178C821 */ addu $t9, $t3, $t8 +/* 00DA0 80AA2740 03274021 */ addu $t0, $t9, $a3 /* 00DA4 80AA2744 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 /* 00DA8 80AA2748 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00DAC 80AA274C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 @@ -59,41 +59,41 @@ glabel EnMa2_Draw /* 00DBC 80AA275C AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 00DC0 80AA2760 860C020E */ lh $t4, 0x020E($s0) ## 0000020E /* 00DC4 80AA2764 3C0480AA */ lui $a0, %hi(D_80AA28C0) ## $a0 = 80AA0000 -/* 00DC8 80AA2768 000C6880 */ sll $t5, $t4, 2 -/* 00DCC 80AA276C 008D2021 */ addu $a0, $a0, $t5 -/* 00DD0 80AA2770 8C8428C0 */ lw $a0, %lo(D_80AA28C0)($a0) +/* 00DC8 80AA2768 000C6880 */ sll $t5, $t4, 2 +/* 00DCC 80AA276C 008D2021 */ addu $a0, $a0, $t5 +/* 00DD0 80AA2770 8C8428C0 */ lw $a0, %lo(D_80AA28C0)($a0) /* 00DD4 80AA2774 3C0D80AA */ lui $t5, %hi(func_80AA2590) ## $t5 = 80AA0000 /* 00DD8 80AA2778 3C0C80AA */ lui $t4, %hi(func_80AA2354) ## $t4 = 80AA0000 -/* 00DDC 80AA277C 00047900 */ sll $t7, $a0, 4 -/* 00DE0 80AA2780 000F5F02 */ srl $t3, $t7, 28 -/* 00DE4 80AA2784 000BC080 */ sll $t8, $t3, 2 -/* 00DE8 80AA2788 00D8C821 */ addu $t9, $a2, $t8 +/* 00DDC 80AA277C 00047900 */ sll $t7, $a0, 4 +/* 00DE0 80AA2780 000F5F02 */ srl $t3, $t7, 28 +/* 00DE4 80AA2784 000BC080 */ sll $t8, $t3, 2 +/* 00DE8 80AA2788 00D8C821 */ addu $t9, $a2, $t8 /* 00DEC 80AA278C 8F280000 */ lw $t0, 0x0000($t9) ## 00000008 -/* 00DF0 80AA2790 00857024 */ and $t6, $a0, $a1 +/* 00DF0 80AA2790 00857024 */ and $t6, $a0, $a1 /* 00DF4 80AA2794 258C2354 */ addiu $t4, $t4, %lo(func_80AA2354) ## $t4 = 80AA2354 -/* 00DF8 80AA2798 01C84821 */ addu $t1, $t6, $t0 -/* 00DFC 80AA279C 01275021 */ addu $t2, $t1, $a3 +/* 00DF8 80AA2798 01C84821 */ addu $t1, $t6, $t0 +/* 00DFC 80AA279C 01275021 */ addu $t2, $t1, $a3 /* 00E00 80AA27A0 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 00E04 80AA27A4 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 00E08 80AA27A8 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 00E0C 80AA27AC 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 00E10 80AA27B0 25AD2590 */ addiu $t5, $t5, %lo(func_80AA2590) ## $t5 = 80AA2590 -/* 00E14 80AA27B4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00E18 80AA27B8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00E1C 80AA27BC AFAC0010 */ sw $t4, 0x0010($sp) -/* 00E20 80AA27C0 0C0286B2 */ jal func_800A1AC8 +/* 00E14 80AA27B4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00E18 80AA27B8 AFB00018 */ sw $s0, 0x0018($sp) +/* 00E1C 80AA27BC AFAC0010 */ sw $t4, 0x0010($sp) +/* 00E20 80AA27C0 0C0286B2 */ jal SkelAnime_DrawSV /* 00E24 80AA27C4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00E28 80AA27C8 3C0680AA */ lui $a2, %hi(D_80AA2900) ## $a2 = 80AA0000 /* 00E2C 80AA27CC 24C62900 */ addiu $a2, $a2, %lo(D_80AA2900) ## $a2 = 80AA2900 /* 00E30 80AA27D0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00E34 80AA27D4 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00E38 80AA27D8 0C031AD5 */ jal func_800C6B54 +/* 00E38 80AA27D8 0C031AD5 */ jal func_800C6B54 /* 00E3C 80AA27DC 240703DE */ addiu $a3, $zero, 0x03DE ## $a3 = 000003DE -/* 00E40 80AA27E0 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00E44 80AA27E4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00E48 80AA27E8 8FB1002C */ lw $s1, 0x002C($sp) -/* 00E4C 80AA27EC 8FB20030 */ lw $s2, 0x0030($sp) -/* 00E50 80AA27F0 03E00008 */ jr $ra +/* 00E40 80AA27E0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00E44 80AA27E4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00E48 80AA27E8 8FB1002C */ lw $s1, 0x002C($sp) +/* 00E4C 80AA27EC 8FB20030 */ lw $s2, 0x0030($sp) +/* 00E50 80AA27F0 03E00008 */ jr $ra /* 00E54 80AA27F4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00E58 80AA27F8 00000000 */ nop /* 00E5C 80AA27FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s index b04c3041f1..d564306d4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s @@ -1,123 +1,123 @@ glabel EnMa2_Init /* 0049C 80AA1E3C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 004A0 80AA1E40 AFB00028 */ sw $s0, 0x0028($sp) +/* 004A0 80AA1E40 AFB00028 */ sw $s0, 0x0028($sp) /* 004A4 80AA1E44 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004A8 80AA1E48 AFBF002C */ sw $ra, 0x002C($sp) -/* 004AC 80AA1E4C AFA50044 */ sw $a1, 0x0044($sp) +/* 004A8 80AA1E48 AFBF002C */ sw $ra, 0x002C($sp) +/* 004AC 80AA1E4C AFA50044 */ sw $a1, 0x0044($sp) /* 004B0 80AA1E50 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 004B4 80AA1E54 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 004B8 80AA1E58 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 004BC 80AA1E5C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 004C0 80AA1E60 0C00AC78 */ jal ActorShape_Init - + /* 004C4 80AA1E64 3C074190 */ lui $a3, 0x4190 ## $a3 = 41900000 /* 004C8 80AA1E68 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 004CC 80AA1E6C 24C68D90 */ addiu $a2, $a2, 0x8D90 ## $a2 = 06008D90 -/* 004D0 80AA1E70 8FA40044 */ lw $a0, 0x0044($sp) +/* 004D0 80AA1E70 8FA40044 */ lw $a0, 0x0044($sp) /* 004D4 80AA1E74 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 004D8 80AA1E78 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 004DC 80AA1E7C AFA00010 */ sw $zero, 0x0010($sp) -/* 004E0 80AA1E80 AFA00014 */ sw $zero, 0x0014($sp) -/* 004E4 80AA1E84 0C0291BE */ jal func_800A46F8 -/* 004E8 80AA1E88 AFA00018 */ sw $zero, 0x0018($sp) +/* 004DC 80AA1E7C AFA00010 */ sw $zero, 0x0010($sp) +/* 004E0 80AA1E80 AFA00014 */ sw $zero, 0x0014($sp) +/* 004E4 80AA1E84 0C0291BE */ jal SkelAnime_InitSV +/* 004E8 80AA1E88 AFA00018 */ sw $zero, 0x0018($sp) /* 004EC 80AA1E8C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 004F0 80AA1E90 AFA50030 */ sw $a1, 0x0030($sp) +/* 004F0 80AA1E90 AFA50030 */ sw $a1, 0x0030($sp) /* 004F4 80AA1E94 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 004F8 80AA1E98 8FA40044 */ lw $a0, 0x0044($sp) + +/* 004F8 80AA1E98 8FA40044 */ lw $a0, 0x0044($sp) /* 004FC 80AA1E9C 3C0780AA */ lui $a3, %hi(D_80AA2820) ## $a3 = 80AA0000 -/* 00500 80AA1EA0 8FA50030 */ lw $a1, 0x0030($sp) +/* 00500 80AA1EA0 8FA50030 */ lw $a1, 0x0030($sp) /* 00504 80AA1EA4 24E72820 */ addiu $a3, $a3, %lo(D_80AA2820) ## $a3 = 80AA2820 -/* 00508 80AA1EA8 8FA40044 */ lw $a0, 0x0044($sp) +/* 00508 80AA1EA8 8FA40044 */ lw $a0, 0x0044($sp) /* 0050C 80AA1EAC 0C01712B */ jal ActorCollider_InitCylinder - + /* 00510 80AA1EB0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00514 80AA1EB4 0C016C80 */ jal CollisionBtlTbl_Get - + /* 00518 80AA1EB8 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 0051C 80AA1EBC 3C0680AA */ lui $a2, %hi(D_80AA284C) ## $a2 = 80AA0000 /* 00520 80AA1EC0 24C6284C */ addiu $a2, $a2, %lo(D_80AA284C) ## $a2 = 80AA284C /* 00524 80AA1EC4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00528 80AA1EC8 0C0187BF */ jal func_80061EFC +/* 00528 80AA1EC8 0C0187BF */ jal func_80061EFC /* 0052C 80AA1ECC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00530 80AA1ED0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00534 80AA1ED4 0C2A86D6 */ jal func_80AA1B58 -/* 00538 80AA1ED8 8FA50044 */ lw $a1, 0x0044($sp) -/* 0053C 80AA1EDC 10400027 */ beq $v0, $zero, .L80AA1F7C +/* 00534 80AA1ED4 0C2A86D6 */ jal func_80AA1B58 +/* 00538 80AA1ED8 8FA50044 */ lw $a1, 0x0044($sp) +/* 0053C 80AA1EDC 10400027 */ beq $v0, $zero, .L80AA1F7C /* 00540 80AA1EE0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00544 80AA1EE4 10410009 */ beq $v0, $at, .L80AA1F0C +/* 00544 80AA1EE4 10410009 */ beq $v0, $at, .L80AA1F0C /* 00548 80AA1EE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0054C 80AA1EEC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00550 80AA1EF0 1041000C */ beq $v0, $at, .L80AA1F24 +/* 00550 80AA1EF0 1041000C */ beq $v0, $at, .L80AA1F24 /* 00554 80AA1EF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00558 80AA1EF8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0055C 80AA1EFC 1041000F */ beq $v0, $at, .L80AA1F3C +/* 0055C 80AA1EFC 1041000F */ beq $v0, $at, .L80AA1F3C /* 00560 80AA1F00 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00564 80AA1F04 10000022 */ beq $zero, $zero, .L80AA1F90 +/* 00564 80AA1F04 10000022 */ beq $zero, $zero, .L80AA1F90 /* 00568 80AA1F08 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80AA1F0C: -/* 0056C 80AA1F0C 0C2A8751 */ jal func_80AA1D44 +/* 0056C 80AA1F0C 0C2A8751 */ jal func_80AA1D44 /* 00570 80AA1F10 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 00574 80AA1F14 3C0E80AA */ lui $t6, %hi(func_80AA2018) ## $t6 = 80AA0000 /* 00578 80AA1F18 25CE2018 */ addiu $t6, $t6, %lo(func_80AA2018) ## $t6 = 80AA2018 -/* 0057C 80AA1F1C 1000001B */ beq $zero, $zero, .L80AA1F8C +/* 0057C 80AA1F1C 1000001B */ beq $zero, $zero, .L80AA1F8C /* 00580 80AA1F20 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 .L80AA1F24: -/* 00584 80AA1F24 0C2A8751 */ jal func_80AA1D44 +/* 00584 80AA1F24 0C2A8751 */ jal func_80AA1D44 /* 00588 80AA1F28 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 0058C 80AA1F2C 3C0F80AA */ lui $t7, %hi(func_80AA204C) ## $t7 = 80AA0000 /* 00590 80AA1F30 25EF204C */ addiu $t7, $t7, %lo(func_80AA204C) ## $t7 = 80AA204C -/* 00594 80AA1F34 10000015 */ beq $zero, $zero, .L80AA1F8C +/* 00594 80AA1F34 10000015 */ beq $zero, $zero, .L80AA1F8C /* 00598 80AA1F38 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 .L80AA1F3C: /* 0059C 80AA1F3C 9718F568 */ lhu $t8, -0x0A98($t8) ## FFFFF568 /* 005A0 80AA1F40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 005A4 80AA1F44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005A8 80AA1F48 33192000 */ andi $t9, $t8, 0x2000 ## $t9 = 00000000 -/* 005AC 80AA1F4C 13200005 */ beq $t9, $zero, .L80AA1F64 +/* 005AC 80AA1F4C 13200005 */ beq $t9, $zero, .L80AA1F64 /* 005B0 80AA1F50 00000000 */ nop -/* 005B4 80AA1F54 0C2A8751 */ jal func_80AA1D44 +/* 005B4 80AA1F54 0C2A8751 */ jal func_80AA1D44 /* 005B8 80AA1F58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005BC 80AA1F5C 10000003 */ beq $zero, $zero, .L80AA1F6C +/* 005BC 80AA1F5C 10000003 */ beq $zero, $zero, .L80AA1F6C /* 005C0 80AA1F60 00000000 */ nop .L80AA1F64: -/* 005C4 80AA1F64 0C2A8751 */ jal func_80AA1D44 +/* 005C4 80AA1F64 0C2A8751 */ jal func_80AA1D44 /* 005C8 80AA1F68 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 .L80AA1F6C: /* 005CC 80AA1F6C 3C0880AA */ lui $t0, %hi(func_80AA2018) ## $t0 = 80AA0000 /* 005D0 80AA1F70 25082018 */ addiu $t0, $t0, %lo(func_80AA2018) ## $t0 = 80AA2018 -/* 005D4 80AA1F74 10000005 */ beq $zero, $zero, .L80AA1F8C +/* 005D4 80AA1F74 10000005 */ beq $zero, $zero, .L80AA1F8C /* 005D8 80AA1F78 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 .L80AA1F7C: /* 005DC 80AA1F7C 0C00B55C */ jal Actor_Kill - + /* 005E0 80AA1F80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005E4 80AA1F84 10000012 */ beq $zero, $zero, .L80AA1FD0 -/* 005E8 80AA1F88 8FBF002C */ lw $ra, 0x002C($sp) +/* 005E4 80AA1F84 10000012 */ beq $zero, $zero, .L80AA1FD0 +/* 005E8 80AA1F88 8FBF002C */ lw $ra, 0x002C($sp) .L80AA1F8C: /* 005EC 80AA1F8C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80AA1F90: /* 005F0 80AA1F90 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 005F4 80AA1F94 AFA90014 */ sw $t1, 0x0014($sp) -/* 005F8 80AA1F98 44060000 */ mfc1 $a2, $f0 -/* 005FC 80AA1F9C 44070000 */ mfc1 $a3, $f0 -/* 00600 80AA1FA0 8FA40044 */ lw $a0, 0x0044($sp) +/* 005F4 80AA1F94 AFA90014 */ sw $t1, 0x0014($sp) +/* 005F8 80AA1F98 44060000 */ mfc1 $a2, $f0 +/* 005FC 80AA1F9C 44070000 */ mfc1 $a3, $f0 +/* 00600 80AA1FA0 8FA40044 */ lw $a0, 0x0044($sp) /* 00604 80AA1FA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00608 80AA1FA8 0C00B92D */ jal func_8002E4B4 -/* 0060C 80AA1FAC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00608 80AA1FA8 0C00B92D */ jal func_8002E4B4 +/* 0060C 80AA1FAC E7A00010 */ swc1 $f0, 0x0010($sp) /* 00610 80AA1FB0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00614 80AA1FB4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00618 80AA1FB8 0C00B58B */ jal Actor_SetScale - + /* 0061C 80AA1FBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00620 80AA1FC0 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 /* 00624 80AA1FC4 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F /* 00628 80AA1FC8 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 0062C 80AA1FCC 8FBF002C */ lw $ra, 0x002C($sp) +/* 0062C 80AA1FCC 8FBF002C */ lw $ra, 0x002C($sp) .L80AA1FD0: -/* 00630 80AA1FD0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00630 80AA1FD0 8FB00028 */ lw $s0, 0x0028($sp) /* 00634 80AA1FD4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00638 80AA1FD8 03E00008 */ jr $ra +/* 00638 80AA1FD8 03E00008 */ jr $ra /* 0063C 80AA1FDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s index cffcb68aec..0f09415115 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s @@ -1,18 +1,18 @@ glabel EnMa3_Destroy /* 00728 80AA31C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0072C 80AA31CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00730 80AA31D0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00734 80AA31D4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00738 80AA31D8 0C0295BC */ jal func_800A56F0 +/* 0072C 80AA31CC AFBF0014 */ sw $ra, 0x0014($sp) +/* 00730 80AA31D0 AFA40018 */ sw $a0, 0x0018($sp) +/* 00734 80AA31D4 AFA5001C */ sw $a1, 0x001C($sp) +/* 00738 80AA31D8 0C0295BC */ jal SkelAnime_Free /* 0073C 80AA31DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00740 80AA31E0 8FA50018 */ lw $a1, 0x0018($sp) -/* 00744 80AA31E4 8FA4001C */ lw $a0, 0x001C($sp) +/* 00740 80AA31E0 8FA50018 */ lw $a1, 0x0018($sp) +/* 00744 80AA31E4 8FA4001C */ lw $a0, 0x001C($sp) /* 00748 80AA31E8 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 0074C 80AA31EC 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 00750 80AA31F0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00750 80AA31F0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00754 80AA31F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00758 80AA31F8 03E00008 */ jr $ra +/* 00758 80AA31F8 03E00008 */ jr $ra /* 0075C 80AA31FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s index e40265f4dc..58f01c55ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s @@ -1,30 +1,30 @@ glabel EnMa3_Draw /* 00BCC 80AA366C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00BD0 80AA3670 AFB20030 */ sw $s2, 0x0030($sp) +/* 00BD0 80AA3670 AFB20030 */ sw $s2, 0x0030($sp) /* 00BD4 80AA3674 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00BD8 80AA3678 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00BDC 80AA367C AFB1002C */ sw $s1, 0x002C($sp) -/* 00BE0 80AA3680 AFB00028 */ sw $s0, 0x0028($sp) +/* 00BD8 80AA3678 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00BDC 80AA367C AFB1002C */ sw $s1, 0x002C($sp) +/* 00BE0 80AA3680 AFB00028 */ sw $s0, 0x0028($sp) /* 00BE4 80AA3684 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00BE8 80AA3688 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00BEC 80AA368C 3C0680AA */ lui $a2, %hi(D_80AA38E0) ## $a2 = 80AA0000 /* 00BF0 80AA3690 24C638E0 */ addiu $a2, $a2, %lo(D_80AA38E0) ## $a2 = 80AA38E0 /* 00BF4 80AA3694 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00BF8 80AA3698 240703D2 */ addiu $a3, $zero, 0x03D2 ## $a3 = 000003D2 -/* 00BFC 80AA369C 0C031AB1 */ jal func_800C6AC4 +/* 00BFC 80AA369C 0C031AB1 */ jal func_800C6AC4 /* 00C00 80AA36A0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00C04 80AA36A4 864E07A0 */ lh $t6, 0x07A0($s2) ## 000007A0 /* 00C08 80AA36A8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00C0C 80AA36AC 000E7880 */ sll $t7, $t6, 2 -/* 00C10 80AA36B0 024FC021 */ addu $t8, $s2, $t7 +/* 00C0C 80AA36AC 000E7880 */ sll $t7, $t6, 2 +/* 00C10 80AA36B0 024FC021 */ addu $t8, $s2, $t7 /* 00C14 80AA36B4 8F020790 */ lw $v0, 0x0790($t8) ## 00000790 /* 00C18 80AA36B8 0C01E00A */ jal Math_Vec3f_DistXZ - + /* 00C1C 80AA36BC 2445005C */ addiu $a1, $v0, 0x005C ## $a1 = 0000005C -/* 00C20 80AA36C0 46000306 */ mov.s $f12, $f0 -/* 00C24 80AA36C4 0C03D89A */ jal func_800F6268 +/* 00C20 80AA36C0 46000306 */ mov.s $f12, $f0 +/* 00C24 80AA36C4 0C03D89A */ jal func_800F6268 /* 00C28 80AA36C8 2405002F */ addiu $a1, $zero, 0x002F ## $a1 = 0000002F -/* 00C2C 80AA36CC 0C024F46 */ jal func_80093D18 +/* 00C2C 80AA36CC 0C024F46 */ jal func_80093D18 /* 00C30 80AA36D0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 00C34 80AA36D4 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00C38 80AA36D8 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 @@ -35,21 +35,21 @@ glabel EnMa3_Draw /* 00C4C 80AA36EC 86090210 */ lh $t1, 0x0210($s0) ## 00000210 /* 00C50 80AA36F0 3C0480AA */ lui $a0, %hi(D_80AA38A4) ## $a0 = 80AA0000 /* 00C54 80AA36F4 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 00C58 80AA36F8 00095080 */ sll $t2, $t1, 2 -/* 00C5C 80AA36FC 008A2021 */ addu $a0, $a0, $t2 -/* 00C60 80AA3700 8C8438A4 */ lw $a0, %lo(D_80AA38A4)($a0) +/* 00C58 80AA36F8 00095080 */ sll $t2, $t1, 2 +/* 00C5C 80AA36FC 008A2021 */ addu $a0, $a0, $t2 +/* 00C60 80AA3700 8C8438A4 */ lw $a0, %lo(D_80AA38A4)($a0) /* 00C64 80AA3704 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 00C68 80AA3708 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 00C6C 80AA370C 00046100 */ sll $t4, $a0, 4 -/* 00C70 80AA3710 000C6F02 */ srl $t5, $t4, 28 -/* 00C74 80AA3714 000D7080 */ sll $t6, $t5, 2 -/* 00C78 80AA3718 00CE7821 */ addu $t7, $a2, $t6 +/* 00C6C 80AA370C 00046100 */ sll $t4, $a0, 4 +/* 00C70 80AA3710 000C6F02 */ srl $t5, $t4, 28 +/* 00C74 80AA3714 000D7080 */ sll $t6, $t5, 2 +/* 00C78 80AA3718 00CE7821 */ addu $t7, $a2, $t6 /* 00C7C 80AA371C 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 /* 00C80 80AA3720 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 00C84 80AA3724 00855824 */ and $t3, $a0, $a1 +/* 00C84 80AA3724 00855824 */ and $t3, $a0, $a1 /* 00C88 80AA3728 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00C8C 80AA372C 0178C821 */ addu $t9, $t3, $t8 -/* 00C90 80AA3730 03274021 */ addu $t0, $t9, $a3 +/* 00C8C 80AA372C 0178C821 */ addu $t9, $t3, $t8 +/* 00C90 80AA3730 03274021 */ addu $t0, $t9, $a3 /* 00C94 80AA3734 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 /* 00C98 80AA3738 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00C9C 80AA373C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 @@ -59,41 +59,41 @@ glabel EnMa3_Draw /* 00CAC 80AA374C AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 00CB0 80AA3750 860C020E */ lh $t4, 0x020E($s0) ## 0000020E /* 00CB4 80AA3754 3C0480AA */ lui $a0, %hi(D_80AA38B0) ## $a0 = 80AA0000 -/* 00CB8 80AA3758 000C6880 */ sll $t5, $t4, 2 -/* 00CBC 80AA375C 008D2021 */ addu $a0, $a0, $t5 -/* 00CC0 80AA3760 8C8438B0 */ lw $a0, %lo(D_80AA38B0)($a0) +/* 00CB8 80AA3758 000C6880 */ sll $t5, $t4, 2 +/* 00CBC 80AA375C 008D2021 */ addu $a0, $a0, $t5 +/* 00CC0 80AA3760 8C8438B0 */ lw $a0, %lo(D_80AA38B0)($a0) /* 00CC4 80AA3764 3C0D80AA */ lui $t5, %hi(func_80AA3580) ## $t5 = 80AA0000 /* 00CC8 80AA3768 3C0C80AA */ lui $t4, %hi(func_80AA3344) ## $t4 = 80AA0000 -/* 00CCC 80AA376C 00047900 */ sll $t7, $a0, 4 -/* 00CD0 80AA3770 000F5F02 */ srl $t3, $t7, 28 -/* 00CD4 80AA3774 000BC080 */ sll $t8, $t3, 2 -/* 00CD8 80AA3778 00D8C821 */ addu $t9, $a2, $t8 +/* 00CCC 80AA376C 00047900 */ sll $t7, $a0, 4 +/* 00CD0 80AA3770 000F5F02 */ srl $t3, $t7, 28 +/* 00CD4 80AA3774 000BC080 */ sll $t8, $t3, 2 +/* 00CD8 80AA3778 00D8C821 */ addu $t9, $a2, $t8 /* 00CDC 80AA377C 8F280000 */ lw $t0, 0x0000($t9) ## 00000008 -/* 00CE0 80AA3780 00857024 */ and $t6, $a0, $a1 +/* 00CE0 80AA3780 00857024 */ and $t6, $a0, $a1 /* 00CE4 80AA3784 258C3344 */ addiu $t4, $t4, %lo(func_80AA3344) ## $t4 = 80AA3344 -/* 00CE8 80AA3788 01C84821 */ addu $t1, $t6, $t0 -/* 00CEC 80AA378C 01275021 */ addu $t2, $t1, $a3 +/* 00CE8 80AA3788 01C84821 */ addu $t1, $t6, $t0 +/* 00CEC 80AA378C 01275021 */ addu $t2, $t1, $a3 /* 00CF0 80AA3790 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 00CF4 80AA3794 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 00CF8 80AA3798 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 00CFC 80AA379C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 00D00 80AA37A0 25AD3580 */ addiu $t5, $t5, %lo(func_80AA3580) ## $t5 = 80AA3580 -/* 00D04 80AA37A4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00D08 80AA37A8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00D0C 80AA37AC AFAC0010 */ sw $t4, 0x0010($sp) -/* 00D10 80AA37B0 0C0286B2 */ jal func_800A1AC8 +/* 00D04 80AA37A4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00D08 80AA37A8 AFB00018 */ sw $s0, 0x0018($sp) +/* 00D0C 80AA37AC AFAC0010 */ sw $t4, 0x0010($sp) +/* 00D10 80AA37B0 0C0286B2 */ jal SkelAnime_DrawSV /* 00D14 80AA37B4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00D18 80AA37B8 3C0680AA */ lui $a2, %hi(D_80AA38F0) ## $a2 = 80AA0000 /* 00D1C 80AA37BC 24C638F0 */ addiu $a2, $a2, %lo(D_80AA38F0) ## $a2 = 80AA38F0 /* 00D20 80AA37C0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00D24 80AA37C4 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00D28 80AA37C8 0C031AD5 */ jal func_800C6B54 +/* 00D28 80AA37C8 0C031AD5 */ jal func_800C6B54 /* 00D2C 80AA37CC 240703F5 */ addiu $a3, $zero, 0x03F5 ## $a3 = 000003F5 -/* 00D30 80AA37D0 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00D34 80AA37D4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00D38 80AA37D8 8FB1002C */ lw $s1, 0x002C($sp) -/* 00D3C 80AA37DC 8FB20030 */ lw $s2, 0x0030($sp) -/* 00D40 80AA37E0 03E00008 */ jr $ra +/* 00D30 80AA37D0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00D34 80AA37D4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00D38 80AA37D8 8FB1002C */ lw $s1, 0x002C($sp) +/* 00D3C 80AA37DC 8FB20030 */ lw $s2, 0x0030($sp) +/* 00D40 80AA37E0 03E00008 */ jr $ra /* 00D44 80AA37E4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00D48 80AA37E8 00000000 */ nop /* 00D4C 80AA37EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s index 21d11505b0..c7a11481a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s @@ -1,99 +1,99 @@ glabel EnMa3_Init /* 005D4 80AA3074 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 005D8 80AA3078 AFB00028 */ sw $s0, 0x0028($sp) +/* 005D8 80AA3078 AFB00028 */ sw $s0, 0x0028($sp) /* 005DC 80AA307C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005E0 80AA3080 AFBF002C */ sw $ra, 0x002C($sp) -/* 005E4 80AA3084 AFA50044 */ sw $a1, 0x0044($sp) +/* 005E0 80AA3080 AFBF002C */ sw $ra, 0x002C($sp) +/* 005E4 80AA3084 AFA50044 */ sw $a1, 0x0044($sp) /* 005E8 80AA3088 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 005EC 80AA308C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 005F0 80AA3090 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 005F4 80AA3094 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 005F8 80AA3098 0C00AC78 */ jal ActorShape_Init - + /* 005FC 80AA309C 3C074190 */ lui $a3, 0x4190 ## $a3 = 41900000 /* 00600 80AA30A0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00604 80AA30A4 24C68D90 */ addiu $a2, $a2, 0x8D90 ## $a2 = 06008D90 -/* 00608 80AA30A8 8FA40044 */ lw $a0, 0x0044($sp) +/* 00608 80AA30A8 8FA40044 */ lw $a0, 0x0044($sp) /* 0060C 80AA30AC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00610 80AA30B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00614 80AA30B4 AFA00010 */ sw $zero, 0x0010($sp) -/* 00618 80AA30B8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0061C 80AA30BC 0C0291BE */ jal func_800A46F8 -/* 00620 80AA30C0 AFA00018 */ sw $zero, 0x0018($sp) +/* 00614 80AA30B4 AFA00010 */ sw $zero, 0x0010($sp) +/* 00618 80AA30B8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0061C 80AA30BC 0C0291BE */ jal SkelAnime_InitSV +/* 00620 80AA30C0 AFA00018 */ sw $zero, 0x0018($sp) /* 00624 80AA30C4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00628 80AA30C8 AFA50030 */ sw $a1, 0x0030($sp) +/* 00628 80AA30C8 AFA50030 */ sw $a1, 0x0030($sp) /* 0062C 80AA30CC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00630 80AA30D0 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00630 80AA30D0 8FA40044 */ lw $a0, 0x0044($sp) /* 00634 80AA30D4 3C0780AA */ lui $a3, %hi(D_80AA3810) ## $a3 = 80AA0000 -/* 00638 80AA30D8 8FA50030 */ lw $a1, 0x0030($sp) +/* 00638 80AA30D8 8FA50030 */ lw $a1, 0x0030($sp) /* 0063C 80AA30DC 24E73810 */ addiu $a3, $a3, %lo(D_80AA3810) ## $a3 = 80AA3810 -/* 00640 80AA30E0 8FA40044 */ lw $a0, 0x0044($sp) +/* 00640 80AA30E0 8FA40044 */ lw $a0, 0x0044($sp) /* 00644 80AA30E4 0C01712B */ jal ActorCollider_InitCylinder - + /* 00648 80AA30E8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0064C 80AA30EC 0C016C80 */ jal CollisionBtlTbl_Get /* 00650 80AA30F0 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 00654 80AA30F4 3C0680AA */ lui $a2, %hi(D_80AA383C) ## $a2 = 80AA0000 /* 00658 80AA30F8 24C6383C */ addiu $a2, $a2, %lo(D_80AA383C) ## $a2 = 80AA383C /* 0065C 80AA30FC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00660 80AA3100 0C0187BF */ jal func_80061EFC +/* 00660 80AA3100 0C0187BF */ jal func_80061EFC /* 00664 80AA3104 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00668 80AA3108 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0066C 80AA310C 0C2A8BB2 */ jal func_80AA2EC8 -/* 00670 80AA3110 8FA50044 */ lw $a1, 0x0044($sp) -/* 00674 80AA3114 10400009 */ beq $v0, $zero, .L80AA313C +/* 0066C 80AA310C 0C2A8BB2 */ jal func_80AA2EC8 +/* 00670 80AA3110 8FA50044 */ lw $a1, 0x0044($sp) +/* 00674 80AA3114 10400009 */ beq $v0, $zero, .L80AA313C /* 00678 80AA3118 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0067C 80AA311C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00680 80AA3120 1041000C */ beq $v0, $at, .L80AA3154 +/* 00680 80AA3120 1041000C */ beq $v0, $at, .L80AA3154 /* 00684 80AA3124 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00688 80AA3128 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0068C 80AA312C 1041000F */ beq $v0, $at, .L80AA316C +/* 0068C 80AA312C 1041000F */ beq $v0, $at, .L80AA316C /* 00690 80AA3130 00000000 */ nop -/* 00694 80AA3134 10000012 */ beq $zero, $zero, .L80AA3180 +/* 00694 80AA3134 10000012 */ beq $zero, $zero, .L80AA3180 /* 00698 80AA3138 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80AA313C: -/* 0069C 80AA313C 0C2A8C01 */ jal func_80AA3004 +/* 0069C 80AA313C 0C2A8C01 */ jal func_80AA3004 /* 006A0 80AA3140 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 006A4 80AA3144 3C0E80AA */ lui $t6, %hi(func_80AA3200) ## $t6 = 80AA0000 /* 006A8 80AA3148 25CE3200 */ addiu $t6, $t6, %lo(func_80AA3200) ## $t6 = 80AA3200 -/* 006AC 80AA314C 1000000B */ beq $zero, $zero, .L80AA317C +/* 006AC 80AA314C 1000000B */ beq $zero, $zero, .L80AA317C /* 006B0 80AA3150 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 .L80AA3154: -/* 006B4 80AA3154 0C2A8C01 */ jal func_80AA3004 +/* 006B4 80AA3154 0C2A8C01 */ jal func_80AA3004 /* 006B8 80AA3158 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 006BC 80AA315C 3C0F80AA */ lui $t7, %hi(func_80AA3200) ## $t7 = 80AA0000 /* 006C0 80AA3160 25EF3200 */ addiu $t7, $t7, %lo(func_80AA3200) ## $t7 = 80AA3200 -/* 006C4 80AA3164 10000005 */ beq $zero, $zero, .L80AA317C +/* 006C4 80AA3164 10000005 */ beq $zero, $zero, .L80AA317C /* 006C8 80AA3168 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 .L80AA316C: /* 006CC 80AA316C 0C00B55C */ jal Actor_Kill - + /* 006D0 80AA3170 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006D4 80AA3174 10000010 */ beq $zero, $zero, .L80AA31B8 -/* 006D8 80AA3178 8FBF002C */ lw $ra, 0x002C($sp) +/* 006D4 80AA3174 10000010 */ beq $zero, $zero, .L80AA31B8 +/* 006D8 80AA3178 8FBF002C */ lw $ra, 0x002C($sp) .L80AA317C: /* 006DC 80AA317C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80AA3180: /* 006E0 80AA3180 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 006E4 80AA3184 AFB80014 */ sw $t8, 0x0014($sp) -/* 006E8 80AA3188 44060000 */ mfc1 $a2, $f0 -/* 006EC 80AA318C 44070000 */ mfc1 $a3, $f0 -/* 006F0 80AA3190 8FA40044 */ lw $a0, 0x0044($sp) +/* 006E4 80AA3184 AFB80014 */ sw $t8, 0x0014($sp) +/* 006E8 80AA3188 44060000 */ mfc1 $a2, $f0 +/* 006EC 80AA318C 44070000 */ mfc1 $a3, $f0 +/* 006F0 80AA3190 8FA40044 */ lw $a0, 0x0044($sp) /* 006F4 80AA3194 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 006F8 80AA3198 0C00B92D */ jal func_8002E4B4 -/* 006FC 80AA319C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 006F8 80AA3198 0C00B92D */ jal func_8002E4B4 +/* 006FC 80AA319C E7A00010 */ swc1 $f0, 0x0010($sp) /* 00700 80AA31A0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00704 80AA31A4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00708 80AA31A8 0C00B58B */ jal Actor_SetScale - + /* 0070C 80AA31AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00710 80AA31B0 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 00714 80AA31B4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00714 80AA31B4 8FBF002C */ lw $ra, 0x002C($sp) .L80AA31B8: -/* 00718 80AA31B8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00718 80AA31B8 8FB00028 */ lw $s0, 0x0028($sp) /* 0071C 80AA31BC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00720 80AA31C0 03E00008 */ jr $ra +/* 00720 80AA31C0 03E00008 */ jr $ra /* 00724 80AA31C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s index d846f9ef3c..4bb188cd02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s @@ -1,35 +1,35 @@ glabel EnMb_Draw /* 039B8 80AA9A08 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 -/* 039BC 80AA9A0C AFB50048 */ sw $s5, 0x0048($sp) +/* 039BC 80AA9A0C AFB50048 */ sw $s5, 0x0048($sp) /* 039C0 80AA9A10 0080A825 */ or $s5, $a0, $zero ## $s5 = 00000000 -/* 039C4 80AA9A14 AFBF004C */ sw $ra, 0x004C($sp) -/* 039C8 80AA9A18 AFB40044 */ sw $s4, 0x0044($sp) -/* 039CC 80AA9A1C AFB30040 */ sw $s3, 0x0040($sp) -/* 039D0 80AA9A20 AFB2003C */ sw $s2, 0x003C($sp) -/* 039D4 80AA9A24 AFB10038 */ sw $s1, 0x0038($sp) -/* 039D8 80AA9A28 AFB00034 */ sw $s0, 0x0034($sp) -/* 039DC 80AA9A2C AFA500BC */ sw $a1, 0x00BC($sp) -/* 039E0 80AA9A30 0C024F46 */ jal func_80093D18 +/* 039C4 80AA9A14 AFBF004C */ sw $ra, 0x004C($sp) +/* 039C8 80AA9A18 AFB40044 */ sw $s4, 0x0044($sp) +/* 039CC 80AA9A1C AFB30040 */ sw $s3, 0x0040($sp) +/* 039D0 80AA9A20 AFB2003C */ sw $s2, 0x003C($sp) +/* 039D4 80AA9A24 AFB10038 */ sw $s1, 0x0038($sp) +/* 039D8 80AA9A28 AFB00034 */ sw $s0, 0x0034($sp) +/* 039DC 80AA9A2C AFA500BC */ sw $a1, 0x00BC($sp) +/* 039E0 80AA9A30 0C024F46 */ jal func_80093D18 /* 039E4 80AA9A34 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 039E8 80AA9A38 8EA50190 */ lw $a1, 0x0190($s5) ## 00000190 /* 039EC 80AA9A3C 8EA601AC */ lw $a2, 0x01AC($s5) ## 000001AC /* 039F0 80AA9A40 92A7018E */ lbu $a3, 0x018E($s5) ## 0000018E /* 039F4 80AA9A44 3C0F80AB */ lui $t7, %hi(func_80AA9870) ## $t7 = 80AB0000 /* 039F8 80AA9A48 25EF9870 */ addiu $t7, $t7, %lo(func_80AA9870) ## $t7 = 80AA9870 -/* 039FC 80AA9A4C AFAF0014 */ sw $t7, 0x0014($sp) -/* 03A00 80AA9A50 AFB50018 */ sw $s5, 0x0018($sp) -/* 03A04 80AA9A54 AFA00010 */ sw $zero, 0x0010($sp) -/* 03A08 80AA9A58 0C0286B2 */ jal func_800A1AC8 -/* 03A0C 80AA9A5C 8FA400BC */ lw $a0, 0x00BC($sp) +/* 039FC 80AA9A4C AFAF0014 */ sw $t7, 0x0014($sp) +/* 03A00 80AA9A50 AFB50018 */ sw $s5, 0x0018($sp) +/* 03A04 80AA9A54 AFA00010 */ sw $zero, 0x0010($sp) +/* 03A08 80AA9A58 0C0286B2 */ jal SkelAnime_DrawSV +/* 03A0C 80AA9A5C 8FA400BC */ lw $a0, 0x00BC($sp) /* 03A10 80AA9A60 86B8001C */ lh $t8, 0x001C($s5) ## 0000001C -/* 03A14 80AA9A64 53000029 */ beql $t8, $zero, .L80AA9B0C +/* 03A14 80AA9A64 53000029 */ beql $t8, $zero, .L80AA9B0C /* 03A18 80AA9A68 86AA0328 */ lh $t2, 0x0328($s5) ## 00000328 /* 03A1C 80AA9A6C 86B90334 */ lh $t9, 0x0334($s5) ## 00000334 /* 03A20 80AA9A70 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 03A24 80AA9A74 1B200003 */ blez $t9, .L80AA9A84 +/* 03A24 80AA9A74 1B200003 */ blez $t9, .L80AA9A84 /* 03A28 80AA9A78 00000000 */ nop -/* 03A2C 80AA9A7C 0C2AA4AE */ jal func_80AA92B8 -/* 03A30 80AA9A80 8FA500BC */ lw $a1, 0x00BC($sp) +/* 03A2C 80AA9A7C 0C2AA4AE */ jal func_80AA92B8 +/* 03A30 80AA9A80 8FA500BC */ lw $a1, 0x00BC($sp) .L80AA9A84: /* 03A34 80AA9A84 3C1180AB */ lui $s1, %hi(D_80AA9E20) ## $s1 = 80AB0000 /* 03A38 80AA9A88 3C1380AB */ lui $s3, %hi(D_80AA9E44) ## $s3 = 80AB0000 @@ -40,87 +40,87 @@ glabel EnMb_Draw /* 03A4C 80AA9A9C 27B4008C */ addiu $s4, $sp, 0x008C ## $s4 = FFFFFFD4 .L80AA9AA0: /* 03A50 80AA9AA0 02202025 */ or $a0, $s1, $zero ## $a0 = 80AA9E20 -/* 03A54 80AA9AA4 0C0346BD */ jal Matrix_MultVec3f +/* 03A54 80AA9AA4 0C0346BD */ jal Matrix_MultVec3f /* 03A58 80AA9AA8 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFD4 /* 03A5C 80AA9AAC 02602025 */ or $a0, $s3, $zero ## $a0 = 80AA9E44 -/* 03A60 80AA9AB0 0C0346BD */ jal Matrix_MultVec3f +/* 03A60 80AA9AB0 0C0346BD */ jal Matrix_MultVec3f /* 03A64 80AA9AB4 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFFB0 /* 03A68 80AA9AB8 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = FFFFFFBC /* 03A6C 80AA9ABC 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 80AA9E2C /* 03A70 80AA9AC0 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = FFFFFFE0 -/* 03A74 80AA9AC4 1614FFF6 */ bne $s0, $s4, .L80AA9AA0 +/* 03A74 80AA9AC4 1614FFF6 */ bne $s0, $s4, .L80AA9AA0 /* 03A78 80AA9AC8 2673000C */ addiu $s3, $s3, 0x000C ## $s3 = 80AA9E50 /* 03A7C 80AA9ACC 26B00434 */ addiu $s0, $s5, 0x0434 ## $s0 = 00000434 /* 03A80 80AA9AD0 27A800A4 */ addiu $t0, $sp, 0x00A4 ## $t0 = FFFFFFEC -/* 03A84 80AA9AD4 AFA80010 */ sw $t0, 0x0010($sp) +/* 03A84 80AA9AD4 AFA80010 */ sw $t0, 0x0010($sp) /* 03A88 80AA9AD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000434 /* 03A8C 80AA9ADC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03A90 80AA9AE0 27A6008C */ addiu $a2, $sp, 0x008C ## $a2 = FFFFFFD4 -/* 03A94 80AA9AE4 0C0189E8 */ jal func_800627A0 +/* 03A94 80AA9AE4 0C0189E8 */ jal func_800627A0 /* 03A98 80AA9AE8 27A70098 */ addiu $a3, $sp, 0x0098 ## $a3 = FFFFFFE0 /* 03A9C 80AA9AEC 27A90080 */ addiu $t1, $sp, 0x0080 ## $t1 = FFFFFFC8 -/* 03AA0 80AA9AF0 AFA90010 */ sw $t1, 0x0010($sp) +/* 03AA0 80AA9AF0 AFA90010 */ sw $t1, 0x0010($sp) /* 03AA4 80AA9AF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000434 /* 03AA8 80AA9AF8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 03AAC 80AA9AFC 27A60068 */ addiu $a2, $sp, 0x0068 ## $a2 = FFFFFFB0 -/* 03AB0 80AA9B00 0C0189E8 */ jal func_800627A0 +/* 03AB0 80AA9B00 0C0189E8 */ jal func_800627A0 /* 03AB4 80AA9B04 27A70074 */ addiu $a3, $sp, 0x0074 ## $a3 = FFFFFFBC /* 03AB8 80AA9B08 86AA0328 */ lh $t2, 0x0328($s5) ## 00000328 .L80AA9B0C: -/* 03ABC 80AA9B0C 5140002A */ beql $t2, $zero, .L80AA9BB8 -/* 03AC0 80AA9B10 8FBF004C */ lw $ra, 0x004C($sp) +/* 03ABC 80AA9B0C 5140002A */ beql $t2, $zero, .L80AA9BB8 +/* 03AC0 80AA9B10 8FBF004C */ lw $ra, 0x004C($sp) /* 03AC4 80AA9B14 92AB0114 */ lbu $t3, 0x0114($s5) ## 00000114 /* 03AC8 80AA9B18 86A30328 */ lh $v1, 0x0328($s5) ## 00000328 /* 03ACC 80AA9B1C 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000000 /* 03AD0 80AA9B20 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 03AD4 80AA9B24 04600004 */ bltz $v1, .L80AA9B38 +/* 03AD4 80AA9B24 04600004 */ bltz $v1, .L80AA9B38 /* 03AD8 80AA9B28 A2AC0114 */ sb $t4, 0x0114($s5) ## 00000114 /* 03ADC 80AA9B2C 246DFFFF */ addiu $t5, $v1, 0xFFFF ## $t5 = FFFFFFFF /* 03AE0 80AA9B30 A6AD0328 */ sh $t5, 0x0328($s5) ## 00000328 /* 03AE4 80AA9B34 86A30328 */ lh $v1, 0x0328($s5) ## 00000328 .L80AA9B38: /* 03AE8 80AA9B38 306E0003 */ andi $t6, $v1, 0x0003 ## $t6 = 00000000 -/* 03AEC 80AA9B3C 15C0001D */ bne $t6, $zero, .L80AA9BB4 -/* 03AF0 80AA9B40 00031083 */ sra $v0, $v1, 2 +/* 03AEC 80AA9B3C 15C0001D */ bne $t6, $zero, .L80AA9BB4 +/* 03AF0 80AA9B40 00031083 */ sra $v0, $v1, 2 /* 03AF4 80AA9B44 86AF001C */ lh $t7, 0x001C($s5) ## 0000001C /* 03AF8 80AA9B48 3C014020 */ lui $at, 0x4020 ## $at = 40200000 /* 03AFC 80AA9B4C 44810000 */ mtc1 $at, $f0 ## $f0 = 2.50 -/* 03B00 80AA9B50 15E00004 */ bne $t7, $zero, .L80AA9B64 -/* 03B04 80AA9B54 8FA400BC */ lw $a0, 0x00BC($sp) +/* 03B00 80AA9B50 15E00004 */ bne $t7, $zero, .L80AA9B64 +/* 03B04 80AA9B54 8FA400BC */ lw $a0, 0x00BC($sp) /* 03B08 80AA9B58 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 03B0C 80AA9B5C 44810000 */ mtc1 $at, $f0 ## $f0 = 4.00 /* 03B10 80AA9B60 00000000 */ nop .L80AA9B64: -/* 03B14 80AA9B64 0002C080 */ sll $t8, $v0, 2 -/* 03B18 80AA9B68 0302C023 */ subu $t8, $t8, $v0 -/* 03B1C 80AA9B6C 0018C040 */ sll $t8, $t8, 1 -/* 03B20 80AA9B70 02B83021 */ addu $a2, $s5, $t8 +/* 03B14 80AA9B64 0002C080 */ sll $t8, $v0, 2 +/* 03B18 80AA9B68 0302C023 */ subu $t8, $t8, $v0 +/* 03B1C 80AA9B6C 0018C040 */ sll $t8, $t8, 1 +/* 03B20 80AA9B70 02B83021 */ addu $a2, $s5, $t8 /* 03B24 80AA9B74 24190096 */ addiu $t9, $zero, 0x0096 ## $t9 = 00000096 /* 03B28 80AA9B78 24080096 */ addiu $t0, $zero, 0x0096 ## $t0 = 00000096 /* 03B2C 80AA9B7C 240900FA */ addiu $t1, $zero, 0x00FA ## $t1 = 000000FA /* 03B30 80AA9B80 240A00EB */ addiu $t2, $zero, 0x00EB ## $t2 = 000000EB /* 03B34 80AA9B84 240B00F5 */ addiu $t3, $zero, 0x00F5 ## $t3 = 000000F5 /* 03B38 80AA9B88 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 03B3C 80AA9B8C AFAC0024 */ sw $t4, 0x0024($sp) -/* 03B40 80AA9B90 AFAB0020 */ sw $t3, 0x0020($sp) -/* 03B44 80AA9B94 AFAA001C */ sw $t2, 0x001C($sp) -/* 03B48 80AA9B98 AFA90018 */ sw $t1, 0x0018($sp) -/* 03B4C 80AA9B9C AFA80014 */ sw $t0, 0x0014($sp) -/* 03B50 80AA9BA0 AFB90010 */ sw $t9, 0x0010($sp) +/* 03B3C 80AA9B8C AFAC0024 */ sw $t4, 0x0024($sp) +/* 03B40 80AA9B90 AFAB0020 */ sw $t3, 0x0020($sp) +/* 03B44 80AA9B94 AFAA001C */ sw $t2, 0x001C($sp) +/* 03B48 80AA9B98 AFA90018 */ sw $t1, 0x0018($sp) +/* 03B4C 80AA9B9C AFA80014 */ sw $t0, 0x0014($sp) +/* 03B50 80AA9BA0 AFB90010 */ sw $t9, 0x0010($sp) /* 03B54 80AA9BA4 24C6014C */ addiu $a2, $a2, 0x014C ## $a2 = 0000014C /* 03B58 80AA9BA8 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 03B5C 80AA9BAC 0C00A877 */ jal func_8002A1DC -/* 03B60 80AA9BB0 E7A00028 */ swc1 $f0, 0x0028($sp) +/* 03B5C 80AA9BAC 0C00A877 */ jal func_8002A1DC +/* 03B60 80AA9BB0 E7A00028 */ swc1 $f0, 0x0028($sp) .L80AA9BB4: -/* 03B64 80AA9BB4 8FBF004C */ lw $ra, 0x004C($sp) +/* 03B64 80AA9BB4 8FBF004C */ lw $ra, 0x004C($sp) .L80AA9BB8: -/* 03B68 80AA9BB8 8FB00034 */ lw $s0, 0x0034($sp) -/* 03B6C 80AA9BBC 8FB10038 */ lw $s1, 0x0038($sp) -/* 03B70 80AA9BC0 8FB2003C */ lw $s2, 0x003C($sp) -/* 03B74 80AA9BC4 8FB30040 */ lw $s3, 0x0040($sp) -/* 03B78 80AA9BC8 8FB40044 */ lw $s4, 0x0044($sp) -/* 03B7C 80AA9BCC 8FB50048 */ lw $s5, 0x0048($sp) -/* 03B80 80AA9BD0 03E00008 */ jr $ra +/* 03B68 80AA9BB8 8FB00034 */ lw $s0, 0x0034($sp) +/* 03B6C 80AA9BBC 8FB10038 */ lw $s1, 0x0038($sp) +/* 03B70 80AA9BC0 8FB2003C */ lw $s2, 0x003C($sp) +/* 03B74 80AA9BC4 8FB30040 */ lw $s3, 0x0040($sp) +/* 03B78 80AA9BC8 8FB40044 */ lw $s4, 0x0044($sp) +/* 03B7C 80AA9BCC 8FB50048 */ lw $s5, 0x0048($sp) +/* 03B80 80AA9BD0 03E00008 */ jr $ra /* 03B84 80AA9BD4 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 /* 03B88 80AA9BD8 00000000 */ nop /* 03B8C 80AA9BDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s index f69180d9c6..6f19421168 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s @@ -1,23 +1,23 @@ glabel EnMb_Init /* 00008 80AA6058 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0000C 80AA605C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80AA6060 AFB10028 */ sw $s1, 0x0028($sp) -/* 00014 80AA6064 AFB00024 */ sw $s0, 0x0024($sp) +/* 0000C 80AA605C AFBF002C */ sw $ra, 0x002C($sp) +/* 00010 80AA6060 AFB10028 */ sw $s1, 0x0028($sp) +/* 00014 80AA6064 AFB00024 */ sw $s0, 0x0024($sp) /* 00018 80AA6068 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 0001C 80AA606C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00020 80AA6070 3C0580AB */ lui $a1, %hi(D_80AA9D44) ## $a1 = 80AB0000 /* 00024 80AA6074 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00028 80AA6078 24A59D44 */ addiu $a1, $a1, %lo(D_80AA9D44) ## $a1 = 80AA9D44 /* 0002C 80AA607C 0C01E037 */ jal Actor_ProcessInitChain - -/* 00030 80AA6080 AFAE0044 */ sw $t6, 0x0044($sp) + +/* 00030 80AA6080 AFAE0044 */ sw $t6, 0x0044($sp) /* 00034 80AA6084 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00038 80AA6088 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0003C 80AA608C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 00040 80AA6090 AFA40034 */ sw $a0, 0x0034($sp) +/* 00040 80AA6090 AFA40034 */ sw $a0, 0x0034($sp) /* 00044 80AA6094 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00048 80AA6098 0C00AC78 */ jal ActorShape_Init - + /* 0004C 80AA609C 3C074238 */ lui $a3, 0x4238 ## $a3 = 42380000 /* 00050 80AA60A0 3C1880AB */ lui $t8, %hi(D_80AA9D04) ## $t8 = 80AB0000 /* 00054 80AA60A4 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF @@ -25,47 +25,47 @@ glabel EnMb_Init /* 0005C 80AA60AC A20F00AE */ sb $t7, 0x00AE($s0) ## 000000AE /* 00060 80AA60B0 AE180098 */ sw $t8, 0x0098($s0) ## 00000098 /* 00064 80AA60B4 26050368 */ addiu $a1, $s0, 0x0368 ## $a1 = 00000368 -/* 00068 80AA60B8 AFA50038 */ sw $a1, 0x0038($sp) +/* 00068 80AA60B8 AFA50038 */ sw $a1, 0x0038($sp) /* 0006C 80AA60BC 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00070 80AA60C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00074 80AA60C4 3C0780AB */ lui $a3, %hi(D_80AA9C00) ## $a3 = 80AB0000 -/* 00078 80AA60C8 8FA50038 */ lw $a1, 0x0038($sp) +/* 00078 80AA60C8 8FA50038 */ lw $a1, 0x0038($sp) /* 0007C 80AA60CC 24E79C00 */ addiu $a3, $a3, %lo(D_80AA9C00) ## $a3 = 80AA9C00 /* 00080 80AA60D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00084 80AA60D4 0C01712B */ jal ActorCollider_InitCylinder - + /* 00088 80AA60D8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0008C 80AA60DC 26050434 */ addiu $a1, $s0, 0x0434 ## $a1 = 00000434 -/* 00090 80AA60E0 AFA50038 */ sw $a1, 0x0038($sp) -/* 00094 80AA60E4 0C0171F8 */ jal func_8005C7E0 +/* 00090 80AA60E0 AFA50038 */ sw $a1, 0x0038($sp) +/* 00094 80AA60E4 0C0171F8 */ jal func_8005C7E0 /* 00098 80AA60E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0009C 80AA60EC 3C0780AB */ lui $a3, %hi(D_80AA9CA4) ## $a3 = 80AB0000 /* 000A0 80AA60F0 26190454 */ addiu $t9, $s0, 0x0454 ## $t9 = 00000454 -/* 000A4 80AA60F4 8FA50038 */ lw $a1, 0x0038($sp) -/* 000A8 80AA60F8 AFB90010 */ sw $t9, 0x0010($sp) +/* 000A4 80AA60F4 8FA50038 */ lw $a1, 0x0038($sp) +/* 000A8 80AA60F8 AFB90010 */ sw $t9, 0x0010($sp) /* 000AC 80AA60FC 24E79CA4 */ addiu $a3, $a3, %lo(D_80AA9CA4) ## $a3 = 80AA9CA4 /* 000B0 80AA6100 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000B4 80AA6104 0C0172EB */ jal func_8005CBAC +/* 000B4 80AA6104 0C0172EB */ jal func_8005CBAC /* 000B8 80AA6108 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000BC 80AA610C 260503B4 */ addiu $a1, $s0, 0x03B4 ## $a1 = 000003B4 -/* 000C0 80AA6110 AFA50038 */ sw $a1, 0x0038($sp) -/* 000C4 80AA6114 0C017406 */ jal func_8005D018 +/* 000C0 80AA6110 AFA50038 */ sw $a1, 0x0038($sp) +/* 000C4 80AA6114 0C017406 */ jal func_8005D018 /* 000C8 80AA6118 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000CC 80AA611C 3C0780AB */ lui $a3, %hi(D_80AA9CB4) ## $a3 = 80AB0000 -/* 000D0 80AA6120 8FA50038 */ lw $a1, 0x0038($sp) +/* 000D0 80AA6120 8FA50038 */ lw $a1, 0x0038($sp) /* 000D4 80AA6124 24E79CB4 */ addiu $a3, $a3, %lo(D_80AA9CB4) ## $a3 = 80AA9CB4 /* 000D8 80AA6128 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000DC 80AA612C 0C017441 */ jal func_8005D104 +/* 000DC 80AA612C 0C017441 */ jal func_8005D104 /* 000E0 80AA6130 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000E4 80AA6134 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 000E8 80AA6138 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 000EC 80AA613C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000F0 80AA6140 10610005 */ beq $v1, $at, .L80AA6158 +/* 000F0 80AA6140 10610005 */ beq $v1, $at, .L80AA6158 /* 000F4 80AA6144 2605018C */ addiu $a1, $s0, 0x018C ## $a1 = 0000018C -/* 000F8 80AA6148 1060001C */ beq $v1, $zero, .L80AA61BC +/* 000F8 80AA6148 1060001C */ beq $v1, $zero, .L80AA61BC /* 000FC 80AA614C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00100 80AA6150 1000006C */ beq $zero, $zero, .L80AA6304 +/* 00100 80AA6150 1000006C */ beq $zero, $zero, .L80AA6304 /* 00104 80AA6154 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80AA6158: /* 00108 80AA6158 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -73,11 +73,11 @@ glabel EnMb_Init /* 00110 80AA6160 260801D0 */ addiu $t0, $s0, 0x01D0 ## $t0 = 000001D0 /* 00114 80AA6164 26090278 */ addiu $t1, $s0, 0x0278 ## $t1 = 00000278 /* 00118 80AA6168 240A001C */ addiu $t2, $zero, 0x001C ## $t2 = 0000001C -/* 0011C 80AA616C AFAA0018 */ sw $t2, 0x0018($sp) -/* 00120 80AA6170 AFA90014 */ sw $t1, 0x0014($sp) -/* 00124 80AA6174 AFA80010 */ sw $t0, 0x0010($sp) +/* 0011C 80AA616C AFAA0018 */ sw $t2, 0x0018($sp) +/* 00120 80AA6170 AFA90014 */ sw $t1, 0x0014($sp) +/* 00124 80AA6174 AFA80010 */ sw $t0, 0x0010($sp) /* 00128 80AA6178 24E728E0 */ addiu $a3, $a3, 0x28E0 ## $a3 = 060028E0 -/* 0012C 80AA617C 0C0291BE */ jal func_800A46F8 +/* 0012C 80AA617C 0C0291BE */ jal SkelAnime_InitSV /* 00130 80AA6180 24C68F38 */ addiu $a2, $a2, 0x8F38 ## $a2 = 06008F38 /* 00134 80AA6184 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 00138 80AA6188 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 @@ -87,24 +87,24 @@ glabel EnMb_Init /* 00148 80AA6198 A20C00AE */ sb $t4, 0x00AE($s0) ## 000000AE /* 0014C 80AA619C 3C0180AB */ lui $at, %hi(D_80AA9E70) ## $at = 80AB0000 /* 00150 80AA61A0 E6040360 */ swc1 $f4, 0x0360($s0) ## 00000360 -/* 00154 80AA61A4 C4269E70 */ lwc1 $f6, %lo(D_80AA9E70)($at) +/* 00154 80AA61A4 C4269E70 */ lwc1 $f6, %lo(D_80AA9E70)($at) /* 00158 80AA61A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0015C 80AA61AC 0C2A9A0C */ jal func_80AA6830 +/* 0015C 80AA61AC 0C2A9A0C */ jal func_80AA6830 /* 00160 80AA61B0 E6060364 */ swc1 $f6, 0x0364($s0) ## 00000364 -/* 00164 80AA61B4 1000007C */ beq $zero, $zero, .L80AA63A8 -/* 00168 80AA61B8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00164 80AA61B4 1000007C */ beq $zero, $zero, .L80AA63A8 +/* 00168 80AA61B8 8FBF002C */ lw $ra, 0x002C($sp) .L80AA61BC: /* 0016C 80AA61BC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00170 80AA61C0 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 00174 80AA61C4 260D01D0 */ addiu $t5, $s0, 0x01D0 ## $t5 = 000001D0 /* 00178 80AA61C8 260E0278 */ addiu $t6, $s0, 0x0278 ## $t6 = 00000278 /* 0017C 80AA61CC 240F001C */ addiu $t7, $zero, 0x001C ## $t7 = 0000001C -/* 00180 80AA61D0 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00184 80AA61D4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00188 80AA61D8 AFAD0010 */ sw $t5, 0x0010($sp) +/* 00180 80AA61D0 AFAF0018 */ sw $t7, 0x0018($sp) +/* 00184 80AA61D4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00188 80AA61D8 AFAD0010 */ sw $t5, 0x0010($sp) /* 0018C 80AA61DC 24E7EBE4 */ addiu $a3, $a3, 0xEBE4 ## $a3 = 0600EBE4 /* 00190 80AA61E0 24C64190 */ addiu $a2, $a2, 0x4190 ## $a2 = 06014190 -/* 00194 80AA61E4 0C0291BE */ jal func_800A46F8 +/* 00194 80AA61E4 0C0291BE */ jal SkelAnime_InitSV /* 00198 80AA61E8 2605018C */ addiu $a1, $s0, 0x018C ## $a1 = 0000018C /* 0019C 80AA61EC 3C0880AB */ lui $t0, %hi(D_80AA9D24) ## $t0 = 80AB0000 /* 001A0 80AA61F0 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 @@ -116,7 +116,7 @@ glabel EnMb_Init /* 001B8 80AA6208 AE080098 */ sw $t0, 0x0098($s0) ## 00000098 /* 001BC 80AA620C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3CA3D70A /* 001C0 80AA6210 0C00B58B */ jal Actor_SetScale - + /* 001C4 80AA6214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001C8 80AA6218 3C01457A */ lui $at, 0x457A ## $at = 457A0000 /* 001CC 80AA621C 44814000 */ mtc1 $at, $f8 ## $f8 = 4000.00 @@ -132,79 +132,79 @@ glabel EnMb_Init /* 001F4 80AA6244 E60800F4 */ swc1 $f8, 0x00F4($s0) ## 000000F4 /* 001F8 80AA6248 E60A00F8 */ swc1 $f10, 0x00F8($s0) ## 000000F8 /* 001FC 80AA624C E61000FC */ swc1 $f16, 0x00FC($s0) ## 000000FC -/* 00200 80AA6250 C4329E74 */ lwc1 $f18, %lo(D_80AA9E74)($at) +/* 00200 80AA6250 C4329E74 */ lwc1 $f18, %lo(D_80AA9E74)($at) /* 00204 80AA6254 3C0B2000 */ lui $t3, 0x2000 ## $t3 = 20000000 /* 00208 80AA6258 AE0B03CC */ sw $t3, 0x03CC($s0) ## 000003CC /* 0020C 80AA625C E6120364 */ swc1 $f18, 0x0364($s0) ## 00000364 -/* 00210 80AA6260 8FA50044 */ lw $a1, 0x0044($sp) +/* 00210 80AA6260 8FA50044 */ lw $a1, 0x0044($sp) /* 00214 80AA6264 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 00218 80AA6268 0C01E01A */ jal Math_Vec3f_Yaw - + /* 0021C 80AA626C 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 /* 00220 80AA6270 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 00224 80AA6274 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00228 80AA6278 24C6B8C4 */ addiu $a2, $a2, 0xB8C4 ## $a2 = 8002B8C4 -/* 0022C 80AA627C 00A22023 */ subu $a0, $a1, $v0 -/* 00230 80AA6280 00042400 */ sll $a0, $a0, 16 -/* 00234 80AA6284 00042403 */ sra $a0, $a0, 16 -/* 00238 80AA6288 04800003 */ bltz $a0, .L80AA6298 +/* 0022C 80AA627C 00A22023 */ subu $a0, $a1, $v0 +/* 00230 80AA6280 00042400 */ sll $a0, $a0, 16 +/* 00234 80AA6284 00042403 */ sra $a0, $a0, 16 +/* 00238 80AA6288 04800003 */ bltz $a0, .L80AA6298 /* 0023C 80AA628C 3C0742B4 */ lui $a3, 0x42B4 ## $a3 = 42B40000 -/* 00240 80AA6290 10000002 */ beq $zero, $zero, .L80AA629C +/* 00240 80AA6290 10000002 */ beq $zero, $zero, .L80AA629C /* 00244 80AA6294 00801825 */ or $v1, $a0, $zero ## $v1 = 00000000 .L80AA6298: -/* 00248 80AA6298 00041823 */ subu $v1, $zero, $a0 +/* 00248 80AA6298 00041823 */ subu $v1, $zero, $a0 .L80AA629C: -/* 0024C 80AA629C 28614001 */ slti $at, $v1, 0x4001 -/* 00250 80AA62A0 1420000A */ bne $at, $zero, .L80AA62CC +/* 0024C 80AA629C 28614001 */ slti $at, $v1, 0x4001 +/* 00250 80AA62A0 1420000A */ bne $at, $zero, .L80AA62CC /* 00254 80AA62A4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00258 80AA62A8 00A16021 */ addu $t4, $a1, $at +/* 00258 80AA62A8 00A16021 */ addu $t4, $a1, $at /* 0025C 80AA62AC 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 00260 80AA62B0 44813000 */ mtc1 $at, $f6 ## $f6 = 600.00 /* 00264 80AA62B4 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 00268 80AA62B8 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 /* 0026C 80AA62BC 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 -/* 00270 80AA62C0 46062200 */ add.s $f8, $f4, $f6 +/* 00270 80AA62C0 46062200 */ add.s $f8, $f4, $f6 /* 00274 80AA62C4 A60D00B6 */ sh $t5, 0x00B6($s0) ## 000000B6 /* 00278 80AA62C8 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C .L80AA62CC: -/* 0027C 80AA62CC 8FA40034 */ lw $a0, 0x0034($sp) +/* 0027C 80AA62CC 8FA40034 */ lw $a0, 0x0034($sp) /* 00280 80AA62D0 0C00AC78 */ jal ActorShape_Init - + /* 00284 80AA62D4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00288 80AA62D8 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 0028C 80AA62DC 92180117 */ lbu $t8, 0x0117($s0) ## 00000117 /* 00290 80AA62E0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00294 80AA62E4 01C17824 */ and $t7, $t6, $at +/* 00294 80AA62E4 01C17824 */ and $t7, $t6, $at /* 00298 80AA62E8 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 0029C 80AA62EC AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 002A0 80AA62F0 A2190117 */ sb $t9, 0x0117($s0) ## 00000117 -/* 002A4 80AA62F4 0C2A9A26 */ jal func_80AA6898 +/* 002A4 80AA62F4 0C2A9A26 */ jal func_80AA6898 /* 002A8 80AA62F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002AC 80AA62FC 1000002A */ beq $zero, $zero, .L80AA63A8 -/* 002B0 80AA6300 8FBF002C */ lw $ra, 0x002C($sp) +/* 002AC 80AA62FC 1000002A */ beq $zero, $zero, .L80AA63A8 +/* 002B0 80AA6300 8FBF002C */ lw $ra, 0x002C($sp) .L80AA6304: /* 002B4 80AA6304 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 002B8 80AA6308 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 002BC 80AA630C 260801D0 */ addiu $t0, $s0, 0x01D0 ## $t0 = 000001D0 /* 002C0 80AA6310 26090278 */ addiu $t1, $s0, 0x0278 ## $t1 = 00000278 /* 002C4 80AA6314 240A001C */ addiu $t2, $zero, 0x001C ## $t2 = 0000001C -/* 002C8 80AA6318 AFAA0018 */ sw $t2, 0x0018($sp) -/* 002CC 80AA631C AFA90014 */ sw $t1, 0x0014($sp) -/* 002D0 80AA6320 AFA80010 */ sw $t0, 0x0010($sp) +/* 002C8 80AA6318 AFAA0018 */ sw $t2, 0x0018($sp) +/* 002CC 80AA631C AFA90014 */ sw $t1, 0x0014($sp) +/* 002D0 80AA6320 AFA80010 */ sw $t0, 0x0010($sp) /* 002D4 80AA6324 24E728E0 */ addiu $a3, $a3, 0x28E0 ## $a3 = 060028E0 /* 002D8 80AA6328 24C68F38 */ addiu $a2, $a2, 0x8F38 ## $a2 = 06008F38 -/* 002DC 80AA632C 0C0291BE */ jal func_800A46F8 +/* 002DC 80AA632C 0C0291BE */ jal SkelAnime_InitSV /* 002E0 80AA6330 2605018C */ addiu $a1, $s0, 0x018C ## $a1 = 0000018C /* 002E4 80AA6334 3C053C65 */ lui $a1, 0x3C65 ## $a1 = 3C650000 /* 002E8 80AA6338 34A56042 */ ori $a1, $a1, 0x6042 ## $a1 = 3C656042 /* 002EC 80AA633C 0C00B58B */ jal Actor_SetScale - + /* 002F0 80AA6340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002F4 80AA6344 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 002F8 80AA6348 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 002FC 80AA634C 44815000 */ mtc1 $at, $f10 ## $f10 = 350.00 /* 00300 80AA6350 316CFF00 */ andi $t4, $t3, 0xFF00 ## $t4 = 00000000 -/* 00304 80AA6354 000C6A03 */ sra $t5, $t4, 8 +/* 00304 80AA6354 000C6A03 */ sra $t5, $t4, 8 /* 00308 80AA6358 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0030C 80AA635C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00310 80AA6360 241800FE */ addiu $t8, $zero, 0x00FE ## $t8 = 000000FE @@ -216,19 +216,19 @@ glabel EnMb_Init /* 00328 80AA6378 A21800AE */ sb $t8, 0x00AE($s0) ## 000000AE /* 0032C 80AA637C 3C0180AB */ lui $at, %hi(D_80AA9E78) ## $at = 80AB0000 /* 00330 80AA6380 E60A0360 */ swc1 $f10, 0x0360($s0) ## 00000360 -/* 00334 80AA6384 C4309E78 */ lwc1 $f16, %lo(D_80AA9E78)($at) +/* 00334 80AA6384 C4309E78 */ lwc1 $f16, %lo(D_80AA9E78)($at) /* 00338 80AA6388 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0033C 80AA638C 03214024 */ and $t0, $t9, $at +/* 0033C 80AA638C 03214024 */ and $t0, $t9, $at /* 00340 80AA6390 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 /* 00344 80AA6394 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00348 80AA6398 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0034C 80AA639C 0C2A9A3F */ jal func_80AA68FC +/* 0034C 80AA639C 0C2A9A3F */ jal func_80AA68FC /* 00350 80AA63A0 E6100364 */ swc1 $f16, 0x0364($s0) ## 00000364 -/* 00354 80AA63A4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00354 80AA63A4 8FBF002C */ lw $ra, 0x002C($sp) .L80AA63A8: -/* 00358 80AA63A8 8FB00024 */ lw $s0, 0x0024($sp) -/* 0035C 80AA63AC 8FB10028 */ lw $s1, 0x0028($sp) -/* 00360 80AA63B0 03E00008 */ jr $ra +/* 00358 80AA63A8 8FB00024 */ lw $s0, 0x0024($sp) +/* 0035C 80AA63AC 8FB10028 */ lw $s1, 0x0028($sp) +/* 00360 80AA63B0 03E00008 */ jr $ra /* 00364 80AA63B4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s index df84e71f1c..07f135400a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s @@ -1,30 +1,30 @@ glabel func_80AA6830 /* 007E0 80AA6830 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007E4 80AA6834 AFBF0014 */ sw $ra, 0x0014($sp) +/* 007E4 80AA6834 AFBF0014 */ sw $ra, 0x0014($sp) /* 007E8 80AA6838 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 007EC 80AA683C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007F0 80AA6840 24A541A8 */ addiu $a1, $a1, 0x41A8 ## $a1 = 060041A8 -/* 007F4 80AA6844 AFA70018 */ sw $a3, 0x0018($sp) +/* 007F4 80AA6844 AFA70018 */ sw $a3, 0x0018($sp) /* 007F8 80AA6848 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 007FC 80AA684C 0C0294D3 */ jal func_800A534C +/* 007FC 80AA684C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00800 80AA6850 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 00804 80AA6854 8FA70018 */ lw $a3, 0x0018($sp) +/* 00804 80AA6854 8FA70018 */ lw $a3, 0x0018($sp) /* 00808 80AA6858 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0080C 80AA685C 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E /* 00810 80AA6860 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 /* 00814 80AA6864 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00818 80AA6868 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 0081C 80AA686C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0081C 80AA686C 8FA40018 */ lw $a0, 0x0018($sp) /* 00820 80AA6870 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 00824 80AA6874 3C0580AA */ lui $a1, %hi(func_80AA7134) ## $a1 = 80AA0000 /* 00828 80AA6878 24A57134 */ addiu $a1, $a1, %lo(func_80AA7134) ## $a1 = 80AA7134 /* 0082C 80AA687C A482032A */ sh $v0, 0x032A($a0) ## 0000032A -/* 00830 80AA6880 0C2A9814 */ jal func_80AA6050 +/* 00830 80AA6880 0C2A9814 */ jal func_80AA6050 /* 00834 80AA6884 AC8E0320 */ sw $t6, 0x0320($a0) ## 00000320 -/* 00838 80AA6888 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00838 80AA6888 8FBF0014 */ lw $ra, 0x0014($sp) /* 0083C 80AA688C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00840 80AA6890 03E00008 */ jr $ra +/* 00840 80AA6890 03E00008 */ jr $ra /* 00844 80AA6894 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s index 8b16d79556..66e403993f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s @@ -1,29 +1,29 @@ glabel func_80AA6898 /* 00848 80AA6898 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0084C 80AA689C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0084C 80AA689C AFBF0014 */ sw $ra, 0x0014($sp) /* 00850 80AA68A0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00854 80AA68A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00858 80AA68A8 24A5EBE4 */ addiu $a1, $a1, 0xEBE4 ## $a1 = 0600EBE4 -/* 0085C 80AA68AC AFA60018 */ sw $a2, 0x0018($sp) -/* 00860 80AA68B0 0C0294BE */ jal func_800A52F8 +/* 0085C 80AA68AC AFA60018 */ sw $a2, 0x0018($sp) +/* 00860 80AA68B0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00864 80AA68B4 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 00868 80AA68B8 8FA60018 */ lw $a2, 0x0018($sp) +/* 00868 80AA68B8 8FA60018 */ lw $a2, 0x0018($sp) /* 0086C 80AA68BC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00870 80AA68C0 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E /* 00874 80AA68C4 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 /* 00878 80AA68C8 0C01DF64 */ jal Math_Rand_S16Offset - + /* 0087C 80AA68CC E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 00880 80AA68D0 8FA40018 */ lw $a0, 0x0018($sp) +/* 00880 80AA68D0 8FA40018 */ lw $a0, 0x0018($sp) /* 00884 80AA68D4 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 00888 80AA68D8 3C0580AB */ lui $a1, %hi(func_80AA8DD8) ## $a1 = 80AB0000 /* 0088C 80AA68DC 24A58DD8 */ addiu $a1, $a1, %lo(func_80AA8DD8) ## $a1 = 80AA8DD8 /* 00890 80AA68E0 A482032A */ sh $v0, 0x032A($a0) ## 0000032A -/* 00894 80AA68E4 0C2A9814 */ jal func_80AA6050 +/* 00894 80AA68E4 0C2A9814 */ jal func_80AA6050 /* 00898 80AA68E8 AC8E0320 */ sw $t6, 0x0320($a0) ## 00000320 -/* 0089C 80AA68EC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0089C 80AA68EC 8FBF0014 */ lw $ra, 0x0014($sp) /* 008A0 80AA68F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008A4 80AA68F4 03E00008 */ jr $ra +/* 008A4 80AA68F4 03E00008 */ jr $ra /* 008A8 80AA68F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s index 3916be2b09..0022229e87 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s @@ -1,34 +1,34 @@ glabel func_80AA68FC /* 008AC 80AA68FC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 008B0 80AA6900 AFB00018 */ sw $s0, 0x0018($sp) -/* 008B4 80AA6904 AFA50024 */ sw $a1, 0x0024($sp) +/* 008B0 80AA6900 AFB00018 */ sw $s0, 0x0018($sp) +/* 008B4 80AA6904 AFA50024 */ sw $a1, 0x0024($sp) /* 008B8 80AA6908 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008BC 80AA690C AFBF001C */ sw $ra, 0x001C($sp) +/* 008BC 80AA690C AFBF001C */ sw $ra, 0x001C($sp) /* 008C0 80AA6910 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008C4 80AA6914 24A541A8 */ addiu $a1, $a1, 0x41A8 ## $a1 = 060041A8 /* 008C8 80AA6918 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 008CC 80AA691C 0C0294D3 */ jal func_800A534C +/* 008CC 80AA691C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 008D0 80AA6920 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 008D4 80AA6924 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 008D8 80AA6928 24040028 */ addiu $a0, $zero, 0x0028 ## $a0 = 00000028 /* 008DC 80AA692C 24050050 */ addiu $a1, $zero, 0x0050 ## $a1 = 00000050 /* 008E0 80AA6930 0C01DF64 */ jal Math_Rand_S16Offset - + /* 008E4 80AA6934 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 008E8 80AA6938 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 008EC 80AA693C A602032A */ sh $v0, 0x032A($s0) ## 0000032A /* 008F0 80AA6940 AE0E0320 */ sw $t6, 0x0320($s0) ## 00000320 -/* 008F4 80AA6944 8FA50024 */ lw $a1, 0x0024($sp) -/* 008F8 80AA6948 0C2A9911 */ jal func_80AA6444 +/* 008F4 80AA6944 8FA50024 */ lw $a1, 0x0024($sp) +/* 008F8 80AA6948 0C2A9911 */ jal func_80AA6444 /* 008FC 80AA694C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00900 80AA6950 3C0580AA */ lui $a1, %hi(func_80AA71AC) ## $a1 = 80AA0000 /* 00904 80AA6954 24A571AC */ addiu $a1, $a1, %lo(func_80AA71AC) ## $a1 = 80AA71AC -/* 00908 80AA6958 0C2A9814 */ jal func_80AA6050 +/* 00908 80AA6958 0C2A9814 */ jal func_80AA6050 /* 0090C 80AA695C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00910 80AA6960 8FBF001C */ lw $ra, 0x001C($sp) -/* 00914 80AA6964 8FB00018 */ lw $s0, 0x0018($sp) +/* 00910 80AA6960 8FBF001C */ lw $ra, 0x001C($sp) +/* 00914 80AA6964 8FB00018 */ lw $s0, 0x0018($sp) /* 00918 80AA6968 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0091C 80AA696C 03E00008 */ jr $ra +/* 0091C 80AA696C 03E00008 */ jr $ra /* 00920 80AA6970 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s index 2fae4a469a..45f8de0dec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s @@ -1,17 +1,17 @@ glabel func_80AA6B80 /* 00B30 80AA6B80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B34 80AA6B84 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00B34 80AA6B84 AFBF0014 */ sw $ra, 0x0014($sp) /* 00B38 80AA6B88 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00B3C 80AA6B8C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B40 80AA6B90 24A52F10 */ addiu $a1, $a1, 0x2F10 ## $a1 = 06002F10 -/* 00B44 80AA6B94 AFA60018 */ sw $a2, 0x0018($sp) -/* 00B48 80AA6B98 0C0294BE */ jal func_800A52F8 +/* 00B44 80AA6B94 AFA60018 */ sw $a2, 0x0018($sp) +/* 00B48 80AA6B98 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00B4C 80AA6B9C 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 00B50 80AA6BA0 8FA40018 */ lw $a0, 0x0018($sp) +/* 00B50 80AA6BA0 8FA40018 */ lw $a0, 0x0018($sp) /* 00B54 80AA6BA4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00B58 80AA6BA8 240538BA */ addiu $a1, $zero, 0x38BA ## $a1 = 000038BA -/* 00B5C 80AA6BAC 8FA40018 */ lw $a0, 0x0018($sp) +/* 00B5C 80AA6BAC 8FA40018 */ lw $a0, 0x0018($sp) /* 00B60 80AA6BB0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00B64 80AA6BB4 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 00B68 80AA6BB8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -22,11 +22,11 @@ glabel func_80AA6B80 /* 00B7C 80AA6BCC A48E0334 */ sh $t6, 0x0334($a0) ## 00000334 /* 00B80 80AA6BD0 AC8F0320 */ sw $t7, 0x0320($a0) ## 00000320 /* 00B84 80AA6BD4 A498032E */ sh $t8, 0x032E($a0) ## 0000032E -/* 00B88 80AA6BD8 0C2A9814 */ jal func_80AA6050 +/* 00B88 80AA6BD8 0C2A9814 */ jal func_80AA6050 /* 00B8C 80AA6BDC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00B90 80AA6BE0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00B90 80AA6BE0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00B94 80AA6BE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B98 80AA6BE8 03E00008 */ jr $ra +/* 00B98 80AA6BE8 03E00008 */ jr $ra /* 00B9C 80AA6BEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s index 4b7189fab6..4ddede938c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s @@ -1,55 +1,55 @@ glabel func_80AA77D0 /* 01780 80AA77D0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01784 80AA77D4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01788 80AA77D8 AFB00030 */ sw $s0, 0x0030($sp) -/* 0178C 80AA77DC AFA5004C */ sw $a1, 0x004C($sp) +/* 01784 80AA77D4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 01788 80AA77D8 AFB00030 */ sw $s0, 0x0030($sp) +/* 0178C 80AA77DC AFA5004C */ sw $a1, 0x004C($sp) /* 01790 80AA77E0 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 /* 01794 80AA77E4 848E008A */ lh $t6, 0x008A($a0) ## 0000008A /* 01798 80AA77E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0179C 80AA77EC 01CF1023 */ subu $v0, $t6, $t7 -/* 017A0 80AA77F0 00021400 */ sll $v0, $v0, 16 -/* 017A4 80AA77F4 00021403 */ sra $v0, $v0, 16 -/* 017A8 80AA77F8 04430005 */ bgezl $v0, .L80AA7810 +/* 0179C 80AA77EC 01CF1023 */ subu $v0, $t6, $t7 +/* 017A0 80AA77F0 00021400 */ sll $v0, $v0, 16 +/* 017A4 80AA77F4 00021403 */ sra $v0, $v0, 16 +/* 017A8 80AA77F8 04430005 */ bgezl $v0, .L80AA7810 /* 017AC 80AA77FC C60401A4 */ lwc1 $f4, 0x01A4($s0) ## 000001A4 -/* 017B0 80AA7800 00021023 */ subu $v0, $zero, $v0 -/* 017B4 80AA7804 00021400 */ sll $v0, $v0, 16 -/* 017B8 80AA7808 00021403 */ sra $v0, $v0, 16 +/* 017B0 80AA7800 00021023 */ subu $v0, $zero, $v0 +/* 017B4 80AA7804 00021400 */ sll $v0, $v0, 16 +/* 017B8 80AA7808 00021403 */ sra $v0, $v0, 16 /* 017BC 80AA780C C60401A4 */ lwc1 $f4, 0x01A4($s0) ## 000001A4 .L80AA7810: /* 017C0 80AA7810 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 017C4 80AA7814 AFA4003C */ sw $a0, 0x003C($sp) -/* 017C8 80AA7818 4600218D */ trunc.w.s $f6, $f4 -/* 017CC 80AA781C A7A20042 */ sh $v0, 0x0042($sp) -/* 017D0 80AA7820 44193000 */ mfc1 $t9, $f6 +/* 017C4 80AA7814 AFA4003C */ sw $a0, 0x003C($sp) +/* 017C8 80AA7818 4600218D */ trunc.w.s $f6, $f4 +/* 017CC 80AA781C A7A20042 */ sh $v0, 0x0042($sp) +/* 017D0 80AA7820 44193000 */ mfc1 $t9, $f6 /* 017D4 80AA7824 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 017D8 80AA7828 AFB90044 */ sw $t9, 0x0044($sp) -/* 017DC 80AA782C 10400007 */ beq $v0, $zero, .L80AA784C -/* 017E0 80AA7830 8FA4003C */ lw $a0, 0x003C($sp) + +/* 017D8 80AA7828 AFB90044 */ sw $t9, 0x0044($sp) +/* 017DC 80AA782C 10400007 */ beq $v0, $zero, .L80AA784C +/* 017E0 80AA7830 8FA4003C */ lw $a0, 0x003C($sp) /* 017E4 80AA7834 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 017E8 80AA7838 0C0294BE */ jal func_800A52F8 +/* 017E8 80AA7838 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 017EC 80AA783C 24A52F10 */ addiu $a1, $a1, 0x2F10 ## $a1 = 06002F10 /* 017F0 80AA7840 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 017F4 80AA7844 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 017F8 80AA7848 240538BA */ addiu $a1, $zero, 0x38BA ## $a1 = 000038BA .L80AA784C: /* 017FC 80AA784C 8602032E */ lh $v0, 0x032E($s0) ## 0000032E /* 01800 80AA7850 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01804 80AA7854 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01808 80AA7858 1040000B */ beq $v0, $zero, .L80AA7888 +/* 01808 80AA7858 1040000B */ beq $v0, $zero, .L80AA7888 /* 0180C 80AA785C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01810 80AA7860 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF /* 01814 80AA7864 A608032E */ sh $t0, 0x032E($s0) ## 0000032E /* 01818 80AA7868 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 0181C 80AA786C AFA00010 */ sw $zero, 0x0010($sp) +/* 0181C 80AA786C AFA00010 */ sw $zero, 0x0010($sp) /* 01820 80AA7870 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 01824 80AA7874 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01828 80AA7878 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 0182C 80AA787C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 01830 80AA7880 10000022 */ beq $zero, $zero, .L80AA790C -/* 01834 80AA7884 87AF0042 */ lh $t7, 0x0042($sp) +/* 01830 80AA7880 10000022 */ beq $zero, $zero, .L80AA790C +/* 01834 80AA7884 87AF0042 */ lh $t7, 0x0042($sp) .L80AA7888: /* 01838 80AA7888 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 /* 0183C 80AA788C A6090334 */ sh $t1, 0x0334($s0) ## 00000334 @@ -59,45 +59,45 @@ glabel func_80AA77D0 /* 0184C 80AA789C 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 01850 80AA78A0 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 /* 01854 80AA78A4 240C000F */ addiu $t4, $zero, 0x000F ## $t4 = 0000000F -/* 01858 80AA78A8 AFAC001C */ sw $t4, 0x001C($sp) -/* 0185C 80AA78AC AFAB0018 */ sw $t3, 0x0018($sp) -/* 01860 80AA78B0 AFAA0010 */ sw $t2, 0x0010($sp) -/* 01864 80AA78B4 AFA00020 */ sw $zero, 0x0020($sp) -/* 01868 80AA78B8 8FA4004C */ lw $a0, 0x004C($sp) +/* 01858 80AA78A8 AFAC001C */ sw $t4, 0x001C($sp) +/* 0185C 80AA78AC AFAB0018 */ sw $t3, 0x0018($sp) +/* 01860 80AA78B0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 01864 80AA78B4 AFA00020 */ sw $zero, 0x0020($sp) +/* 01868 80AA78B8 8FA4004C */ lw $a0, 0x004C($sp) /* 0186C 80AA78BC 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 01870 80AA78C0 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 01874 80AA78C4 0C00CC98 */ jal func_80033260 -/* 01878 80AA78C8 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 01874 80AA78C4 0C00CC98 */ jal func_80033260 +/* 01878 80AA78C8 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 0187C 80AA78CC C61001A4 */ lwc1 $f16, 0x01A4($s0) ## 000001A4 -/* 01880 80AA78D0 8FAE0044 */ lw $t6, 0x0044($sp) +/* 01880 80AA78D0 8FAE0044 */ lw $t6, 0x0044($sp) /* 01884 80AA78D4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01888 80AA78D8 4600848D */ trunc.w.s $f18, $f16 -/* 0188C 80AA78DC 44029000 */ mfc1 $v0, $f18 +/* 01888 80AA78D8 4600848D */ trunc.w.s $f18, $f16 +/* 0188C 80AA78DC 44029000 */ mfc1 $v0, $f18 /* 01890 80AA78E0 00000000 */ nop -/* 01894 80AA78E4 51C20009 */ beql $t6, $v0, .L80AA790C -/* 01898 80AA78E8 87AF0042 */ lh $t7, 0x0042($sp) -/* 0189C 80AA78EC 10410004 */ beq $v0, $at, .L80AA7900 +/* 01894 80AA78E4 51C20009 */ beql $t6, $v0, .L80AA790C +/* 01898 80AA78E8 87AF0042 */ lh $t7, 0x0042($sp) +/* 0189C 80AA78EC 10410004 */ beq $v0, $at, .L80AA7900 /* 018A0 80AA78F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 018A4 80AA78F4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 018A8 80AA78F8 54410004 */ bnel $v0, $at, .L80AA790C -/* 018AC 80AA78FC 87AF0042 */ lh $t7, 0x0042($sp) +/* 018A8 80AA78F8 54410004 */ bnel $v0, $at, .L80AA790C +/* 018AC 80AA78FC 87AF0042 */ lh $t7, 0x0042($sp) .L80AA7900: /* 018B0 80AA7900 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 018B4 80AA7904 240538BF */ addiu $a1, $zero, 0x38BF ## $a1 = 000038BF -/* 018B8 80AA7908 87AF0042 */ lh $t7, 0x0042($sp) +/* 018B8 80AA7908 87AF0042 */ lh $t7, 0x0042($sp) .L80AA790C: /* 018BC 80AA790C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018C0 80AA7910 29E11389 */ slti $at, $t7, 0x1389 -/* 018C4 80AA7914 54200004 */ bnel $at, $zero, .L80AA7928 -/* 018C8 80AA7918 8FBF0034 */ lw $ra, 0x0034($sp) -/* 018CC 80AA791C 0C2A9B30 */ jal func_80AA6CC0 +/* 018C0 80AA7910 29E11389 */ slti $at, $t7, 0x1389 +/* 018C4 80AA7914 54200004 */ bnel $at, $zero, .L80AA7928 +/* 018C8 80AA7918 8FBF0034 */ lw $ra, 0x0034($sp) +/* 018CC 80AA791C 0C2A9B30 */ jal func_80AA6CC0 /* 018D0 80AA7920 A6000334 */ sh $zero, 0x0334($s0) ## 00000334 -/* 018D4 80AA7924 8FBF0034 */ lw $ra, 0x0034($sp) +/* 018D4 80AA7924 8FBF0034 */ lw $ra, 0x0034($sp) .L80AA7928: -/* 018D8 80AA7928 8FB00030 */ lw $s0, 0x0030($sp) +/* 018D8 80AA7928 8FB00030 */ lw $s0, 0x0030($sp) /* 018DC 80AA792C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 018E0 80AA7930 03E00008 */ jr $ra +/* 018E0 80AA7930 03E00008 */ jr $ra /* 018E4 80AA7934 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s index 2c06609fbf..f5fd701f9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s @@ -1,51 +1,51 @@ glabel func_80AA7CAC /* 01C5C 80AA7CAC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01C60 80AA7CB0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01C64 80AA7CB4 AFB10030 */ sw $s1, 0x0030($sp) -/* 01C68 80AA7CB8 AFB0002C */ sw $s0, 0x002C($sp) +/* 01C60 80AA7CB0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 01C64 80AA7CB4 AFB10030 */ sw $s1, 0x0030($sp) +/* 01C68 80AA7CB8 AFB0002C */ sw $s0, 0x002C($sp) /* 01C6C 80AA7CBC 8CB11C44 */ lw $s1, 0x1C44($a1) ## 00001C44 /* 01C70 80AA7CC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C74 80AA7CC4 AFA0004C */ sw $zero, 0x004C($sp) +/* 01C74 80AA7CC4 AFA0004C */ sw $zero, 0x004C($sp) /* 01C78 80AA7CC8 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 01C7C 80AA7CCC AFA5005C */ sw $a1, 0x005C($sp) -/* 01C80 80AA7CD0 0C00CE6E */ jal func_800339B8 +/* 01C7C 80AA7CCC AFA5005C */ sw $a1, 0x005C($sp) +/* 01C80 80AA7CD0 0C00CE6E */ jal func_800339B8 /* 01C84 80AA7CD4 3C0642DC */ lui $a2, 0x42DC ## $a2 = 42DC0000 -/* 01C88 80AA7CD8 2C4E0001 */ sltiu $t6, $v0, 0x0001 -/* 01C8C 80AA7CDC AFAE0048 */ sw $t6, 0x0048($sp) +/* 01C88 80AA7CD8 2C4E0001 */ sltiu $t6, $v0, 0x0001 +/* 01C8C 80AA7CDC AFAE0048 */ sw $t6, 0x0048($sp) /* 01C90 80AA7CE0 C60401A4 */ lwc1 $f4, 0x01A4($s0) ## 000001A4 /* 01C94 80AA7CE4 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 01C98 80AA7CE8 AFA4003C */ sw $a0, 0x003C($sp) -/* 01C9C 80AA7CEC 4600218D */ trunc.w.s $f6, $f4 -/* 01CA0 80AA7CF0 44183000 */ mfc1 $t8, $f6 +/* 01C98 80AA7CE8 AFA4003C */ sw $a0, 0x003C($sp) +/* 01C9C 80AA7CEC 4600218D */ trunc.w.s $f6, $f4 +/* 01CA0 80AA7CF0 44183000 */ mfc1 $t8, $f6 /* 01CA4 80AA7CF4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01CA8 80AA7CF8 AFB80050 */ sw $t8, 0x0050($sp) -/* 01CAC 80AA7CFC 10400007 */ beq $v0, $zero, .L80AA7D1C -/* 01CB0 80AA7D00 8FA4003C */ lw $a0, 0x003C($sp) + +/* 01CA8 80AA7CF8 AFB80050 */ sw $t8, 0x0050($sp) +/* 01CAC 80AA7CFC 10400007 */ beq $v0, $zero, .L80AA7D1C +/* 01CB0 80AA7D00 8FA4003C */ lw $a0, 0x003C($sp) /* 01CB4 80AA7D04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01CB8 80AA7D08 0C0294BE */ jal func_800A52F8 +/* 01CB8 80AA7D08 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 01CBC 80AA7D0C 24A52F10 */ addiu $a1, $a1, 0x2F10 ## $a1 = 06002F10 /* 01CC0 80AA7D10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01CC4 80AA7D14 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01CC8 80AA7D18 240538BA */ addiu $a1, $zero, 0x38BA ## $a1 = 000038BA .L80AA7D1C: /* 01CCC 80AA7D1C 8602032E */ lh $v0, 0x032E($s0) ## 0000032E /* 01CD0 80AA7D20 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01CD4 80AA7D24 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01CD8 80AA7D28 1040000B */ beq $v0, $zero, .L80AA7D58 +/* 01CD8 80AA7D28 1040000B */ beq $v0, $zero, .L80AA7D58 /* 01CDC 80AA7D2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01CE0 80AA7D30 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF /* 01CE4 80AA7D34 A619032E */ sh $t9, 0x032E($s0) ## 0000032E /* 01CE8 80AA7D38 86050032 */ lh $a1, 0x0032($s0) ## 00000032 -/* 01CEC 80AA7D3C AFA00010 */ sw $zero, 0x0010($sp) +/* 01CEC 80AA7D3C AFA00010 */ sw $zero, 0x0010($sp) /* 01CF0 80AA7D40 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 01CF4 80AA7D44 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01CF8 80AA7D48 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01CFC 80AA7D4C 24071F40 */ addiu $a3, $zero, 0x1F40 ## $a3 = 00001F40 -/* 01D00 80AA7D50 10000021 */ beq $zero, $zero, .L80AA7DD8 -/* 01D04 80AA7D54 AFA00048 */ sw $zero, 0x0048($sp) +/* 01D00 80AA7D50 10000021 */ beq $zero, $zero, .L80AA7DD8 +/* 01D04 80AA7D54 AFA00048 */ sw $zero, 0x0048($sp) .L80AA7D58: /* 01D08 80AA7D58 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 /* 01D0C 80AA7D5C A6080334 */ sh $t0, 0x0334($s0) ## 00000334 @@ -55,154 +55,154 @@ glabel func_80AA7CAC /* 01D1C 80AA7D6C 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 01D20 80AA7D70 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 /* 01D24 80AA7D74 240B000F */ addiu $t3, $zero, 0x000F ## $t3 = 0000000F -/* 01D28 80AA7D78 AFAB001C */ sw $t3, 0x001C($sp) -/* 01D2C 80AA7D7C AFAA0018 */ sw $t2, 0x0018($sp) -/* 01D30 80AA7D80 AFA90010 */ sw $t1, 0x0010($sp) -/* 01D34 80AA7D84 AFA00020 */ sw $zero, 0x0020($sp) -/* 01D38 80AA7D88 8FA4005C */ lw $a0, 0x005C($sp) +/* 01D28 80AA7D78 AFAB001C */ sw $t3, 0x001C($sp) +/* 01D2C 80AA7D7C AFAA0018 */ sw $t2, 0x0018($sp) +/* 01D30 80AA7D80 AFA90010 */ sw $t1, 0x0010($sp) +/* 01D34 80AA7D84 AFA00020 */ sw $zero, 0x0020($sp) +/* 01D38 80AA7D88 8FA4005C */ lw $a0, 0x005C($sp) /* 01D3C 80AA7D8C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 01D40 80AA7D90 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 01D44 80AA7D94 0C00CC98 */ jal func_80033260 -/* 01D48 80AA7D98 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 01D44 80AA7D94 0C00CC98 */ jal func_80033260 +/* 01D48 80AA7D98 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 01D4C 80AA7D9C C61001A4 */ lwc1 $f16, 0x01A4($s0) ## 000001A4 -/* 01D50 80AA7DA0 8FAD0050 */ lw $t5, 0x0050($sp) +/* 01D50 80AA7DA0 8FAD0050 */ lw $t5, 0x0050($sp) /* 01D54 80AA7DA4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01D58 80AA7DA8 4600848D */ trunc.w.s $f18, $f16 -/* 01D5C 80AA7DAC 44029000 */ mfc1 $v0, $f18 +/* 01D58 80AA7DA8 4600848D */ trunc.w.s $f18, $f16 +/* 01D5C 80AA7DAC 44029000 */ mfc1 $v0, $f18 /* 01D60 80AA7DB0 00000000 */ nop -/* 01D64 80AA7DB4 51A20009 */ beql $t5, $v0, .L80AA7DDC +/* 01D64 80AA7DB4 51A20009 */ beql $t5, $v0, .L80AA7DDC /* 01D68 80AA7DB8 920303C4 */ lbu $v1, 0x03C4($s0) ## 000003C4 -/* 01D6C 80AA7DBC 10410004 */ beq $v0, $at, .L80AA7DD0 +/* 01D6C 80AA7DBC 10410004 */ beq $v0, $at, .L80AA7DD0 /* 01D70 80AA7DC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D74 80AA7DC4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01D78 80AA7DC8 54410004 */ bnel $v0, $at, .L80AA7DDC +/* 01D78 80AA7DC8 54410004 */ bnel $v0, $at, .L80AA7DDC /* 01D7C 80AA7DCC 920303C4 */ lbu $v1, 0x03C4($s0) ## 000003C4 .L80AA7DD0: /* 01D80 80AA7DD0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01D84 80AA7DD4 240538BF */ addiu $a1, $zero, 0x38BF ## $a1 = 000038BF .L80AA7DD8: /* 01D88 80AA7DD8 920303C4 */ lbu $v1, 0x03C4($s0) ## 000003C4 .L80AA7DDC: /* 01D8C 80AA7DDC 306E0002 */ andi $t6, $v1, 0x0002 ## $t6 = 00000000 -/* 01D90 80AA7DE0 51C00034 */ beql $t6, $zero, .L80AA7EB4 +/* 01D90 80AA7DE0 51C00034 */ beql $t6, $zero, .L80AA7EB4 /* 01D94 80AA7DE4 8E2D0680 */ lw $t5, 0x0680($s1) ## 00000680 /* 01D98 80AA7DE8 8E0F03B8 */ lw $t7, 0x03B8($s0) ## 000003B8 -/* 01D9C 80AA7DEC 8FB80048 */ lw $t8, 0x0048($sp) +/* 01D9C 80AA7DEC 8FB80048 */ lw $t8, 0x0048($sp) /* 01DA0 80AA7DF0 306CFFFD */ andi $t4, $v1, 0xFFFD ## $t4 = 00000000 -/* 01DA4 80AA7DF4 562F002E */ bnel $s1, $t7, .L80AA7EB0 +/* 01DA4 80AA7DF4 562F002E */ bnel $s1, $t7, .L80AA7EB0 /* 01DA8 80AA7DF8 A20C03C4 */ sb $t4, 0x03C4($s0) ## 000003C4 -/* 01DAC 80AA7DFC 57000029 */ bnel $t8, $zero, .L80AA7EA4 +/* 01DAC 80AA7DFC 57000029 */ bnel $t8, $zero, .L80AA7EA4 /* 01DB0 80AA7E00 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01DB4 80AA7E04 8E390680 */ lw $t9, 0x0680($s1) ## 00000680 /* 01DB8 80AA7E08 33280080 */ andi $t0, $t9, 0x0080 ## $t0 = 00000000 -/* 01DBC 80AA7E0C 55000025 */ bnel $t0, $zero, .L80AA7EA4 +/* 01DBC 80AA7E0C 55000025 */ bnel $t0, $zero, .L80AA7EA4 /* 01DC0 80AA7E10 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01DC4 80AA7E14 82220A78 */ lb $v0, 0x0A78($s1) ## 00000A78 -/* 01DC8 80AA7E18 0441000F */ bgez $v0, .L80AA7E58 -/* 01DCC 80AA7E1C 2841FFD9 */ slti $at, $v0, 0xFFD9 -/* 01DD0 80AA7E20 50200005 */ beql $at, $zero, .L80AA7E38 +/* 01DC8 80AA7E18 0441000F */ bgez $v0, .L80AA7E58 +/* 01DCC 80AA7E1C 2841FFD9 */ slti $at, $v0, 0xFFD9 +/* 01DD0 80AA7E20 50200005 */ beql $at, $zero, .L80AA7E38 /* 01DD4 80AA7E24 A2200A78 */ sb $zero, 0x0A78($s1) ## 00000A78 /* 01DD8 80AA7E28 A2200A78 */ sb $zero, 0x0A78($s1) ## 00000A78 -/* 01DDC 80AA7E2C 1000000A */ beq $zero, $zero, .L80AA7E58 +/* 01DDC 80AA7E2C 1000000A */ beq $zero, $zero, .L80AA7E58 /* 01DE0 80AA7E30 920303C4 */ lbu $v1, 0x03C4($s0) ## 000003C4 /* 01DE4 80AA7E34 A2200A78 */ sb $zero, 0x0A78($s1) ## 00000A78 .L80AA7E38: -/* 01DE8 80AA7E38 8FA4005C */ lw $a0, 0x005C($sp) +/* 01DE8 80AA7E38 8FA4005C */ lw $a0, 0x005C($sp) /* 01DEC 80AA7E3C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 /* 01DF0 80AA7E40 2405FFF8 */ addiu $a1, $zero, 0xFFF8 ## $a1 = FFFFFFF8 -/* 01DF4 80AA7E44 0324C821 */ addu $t9, $t9, $a0 +/* 01DF4 80AA7E44 0324C821 */ addu $t9, $t9, $a0 /* 01DF8 80AA7E48 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 -/* 01DFC 80AA7E4C 0320F809 */ jalr $ra, $t9 +/* 01DFC 80AA7E4C 0320F809 */ jalr $ra, $t9 /* 01E00 80AA7E50 00000000 */ nop /* 01E04 80AA7E54 920303C4 */ lbu $v1, 0x03C4($s0) ## 000003C4 .L80AA7E58: -/* 01E08 80AA7E58 8FA2005C */ lw $v0, 0x005C($sp) +/* 01E08 80AA7E58 8FA2005C */ lw $v0, 0x005C($sp) /* 01E0C 80AA7E5C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01E10 80AA7E60 306A0004 */ andi $t2, $v1, 0x0004 ## $t2 = 00000000 -/* 01E14 80AA7E64 15400006 */ bne $t2, $zero, .L80AA7E80 -/* 01E18 80AA7E68 00411021 */ addu $v0, $v0, $at +/* 01E14 80AA7E64 15400006 */ bne $t2, $zero, .L80AA7E80 +/* 01E18 80AA7E68 00411021 */ addu $v0, $v0, $at /* 01E1C 80AA7E6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01E20 80AA7E70 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E /* 01E24 80AA7E74 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01E28 80AA7E78 AFA20038 */ sw $v0, 0x0038($sp) -/* 01E2C 80AA7E7C 8FA20038 */ lw $v0, 0x0038($sp) + +/* 01E28 80AA7E78 AFA20038 */ sw $v0, 0x0038($sp) +/* 01E2C 80AA7E7C 8FA20038 */ lw $v0, 0x0038($sp) .L80AA7E80: /* 01E30 80AA7E80 8C591D4C */ lw $t9, 0x1D4C($v0) ## 00001D4C -/* 01E34 80AA7E84 8FA4005C */ lw $a0, 0x005C($sp) +/* 01E34 80AA7E84 8FA4005C */ lw $a0, 0x005C($sp) /* 01E38 80AA7E88 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01E3C 80AA7E8C 0320F809 */ jalr $ra, $t9 +/* 01E3C 80AA7E8C 0320F809 */ jalr $ra, $t9 /* 01E40 80AA7E90 00000000 */ nop -/* 01E44 80AA7E94 50400003 */ beql $v0, $zero, .L80AA7EA4 +/* 01E44 80AA7E94 50400003 */ beql $v0, $zero, .L80AA7EA4 /* 01E48 80AA7E98 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01E4C 80AA7E9C AE300118 */ sw $s0, 0x0118($s1) ## 00000118 /* 01E50 80AA7EA0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 .L80AA7EA4: -/* 01E54 80AA7EA4 10000002 */ beq $zero, $zero, .L80AA7EB0 -/* 01E58 80AA7EA8 AFAB004C */ sw $t3, 0x004C($sp) +/* 01E54 80AA7EA4 10000002 */ beq $zero, $zero, .L80AA7EB0 +/* 01E58 80AA7EA8 AFAB004C */ sw $t3, 0x004C($sp) /* 01E5C 80AA7EAC A20C03C4 */ sb $t4, 0x03C4($s0) ## 000003C4 .L80AA7EB0: /* 01E60 80AA7EB0 8E2D0680 */ lw $t5, 0x0680($s1) ## 00000680 .L80AA7EB4: /* 01E64 80AA7EB4 31AE0080 */ andi $t6, $t5, 0x0080 ## $t6 = 00000000 -/* 01E68 80AA7EB8 51C0002B */ beql $t6, $zero, .L80AA7F68 -/* 01E6C 80AA7EBC 8FA80048 */ lw $t0, 0x0048($sp) +/* 01E68 80AA7EB8 51C0002B */ beql $t6, $zero, .L80AA7F68 +/* 01E6C 80AA7EBC 8FA80048 */ lw $t0, 0x0048($sp) /* 01E70 80AA7EC0 8E2F0118 */ lw $t7, 0x0118($s1) ## 00000118 /* 01E74 80AA7EC4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01E78 80AA7EC8 560F0027 */ bnel $s0, $t7, .L80AA7F68 -/* 01E7C 80AA7ECC 8FA80048 */ lw $t0, 0x0048($sp) +/* 01E78 80AA7EC8 560F0027 */ bnel $s0, $t7, .L80AA7F68 +/* 01E7C 80AA7ECC 8FA80048 */ lw $t0, 0x0048($sp) /* 01E80 80AA7ED0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01E84 80AA7ED4 0C01DE0D */ jal Math_Coss ## coss? -/* 01E88 80AA7ED8 AFB8004C */ sw $t8, 0x004C($sp) -/* 01E8C 80AA7EDC E7A00040 */ swc1 $f0, 0x0040($sp) +/* 01E88 80AA7ED8 AFB8004C */ sw $t8, 0x004C($sp) +/* 01E8C 80AA7EDC E7A00040 */ swc1 $f0, 0x0040($sp) /* 01E90 80AA7EE0 0C01DE1C */ jal Math_Sins ## sins? /* 01E94 80AA7EE4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01E98 80AA7EE8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01E9C 80AA7EEC 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 01EA0 80AA7EF0 C7A40040 */ lwc1 $f4, 0x0040($sp) +/* 01EA0 80AA7EF0 C7A40040 */ lwc1 $f4, 0x0040($sp) /* 01EA4 80AA7EF4 3C0142B2 */ lui $at, 0x42B2 ## $at = 42B20000 /* 01EA8 80AA7EF8 44819000 */ mtc1 $at, $f18 ## $f18 = 89.00 -/* 01EAC 80AA7EFC 46062202 */ mul.s $f8, $f4, $f6 +/* 01EAC 80AA7EFC 46062202 */ mul.s $f8, $f4, $f6 /* 01EB0 80AA7F00 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 01EB4 80AA7F04 46120102 */ mul.s $f4, $f0, $f18 -/* 01EB8 80AA7F08 46085400 */ add.s $f16, $f10, $f8 -/* 01EBC 80AA7F0C 46102180 */ add.s $f6, $f4, $f16 +/* 01EB4 80AA7F04 46120102 */ mul.s $f4, $f0, $f18 +/* 01EB8 80AA7F08 46085400 */ add.s $f16, $f10, $f8 +/* 01EBC 80AA7F0C 46102180 */ add.s $f6, $f4, $f16 /* 01EC0 80AA7F10 E6260024 */ swc1 $f6, 0x0024($s1) ## 00000024 /* 01EC4 80AA7F14 0C01DE1C */ jal Math_Sins ## sins? /* 01EC8 80AA7F18 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 01ECC 80AA7F1C E7A00040 */ swc1 $f0, 0x0040($sp) +/* 01ECC 80AA7F1C E7A00040 */ swc1 $f0, 0x0040($sp) /* 01ED0 80AA7F20 0C01DE0D */ jal Math_Coss ## coss? /* 01ED4 80AA7F24 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01ED8 80AA7F28 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01EDC 80AA7F2C 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 01EE0 80AA7F30 C7AA0040 */ lwc1 $f10, 0x0040($sp) +/* 01EE0 80AA7F30 C7AA0040 */ lwc1 $f10, 0x0040($sp) /* 01EE4 80AA7F34 3C0142B2 */ lui $at, 0x42B2 ## $at = 42B20000 /* 01EE8 80AA7F38 44813000 */ mtc1 $at, $f6 ## $f6 = 89.00 -/* 01EEC 80AA7F3C 46085482 */ mul.s $f18, $f10, $f8 +/* 01EEC 80AA7F3C 46085482 */ mul.s $f18, $f10, $f8 /* 01EF0 80AA7F40 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 01EF4 80AA7F44 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01EF8 80AA7F48 46060282 */ mul.s $f10, $f0, $f6 +/* 01EF8 80AA7F48 46060282 */ mul.s $f10, $f0, $f6 /* 01EFC 80AA7F4C A6200850 */ sh $zero, 0x0850($s1) ## 00000850 /* 01F00 80AA7F50 E6220068 */ swc1 $f2, 0x0068($s1) ## 00000068 /* 01F04 80AA7F54 E6220060 */ swc1 $f2, 0x0060($s1) ## 00000060 -/* 01F08 80AA7F58 46122400 */ add.s $f16, $f4, $f18 -/* 01F0C 80AA7F5C 46105200 */ add.s $f8, $f10, $f16 +/* 01F08 80AA7F58 46122400 */ add.s $f16, $f4, $f18 +/* 01F0C 80AA7F5C 46105200 */ add.s $f8, $f10, $f16 /* 01F10 80AA7F60 E628002C */ swc1 $f8, 0x002C($s1) ## 0000002C -/* 01F14 80AA7F64 8FA80048 */ lw $t0, 0x0048($sp) +/* 01F14 80AA7F64 8FA80048 */ lw $t0, 0x0048($sp) .L80AA7F68: -/* 01F18 80AA7F68 8FA9004C */ lw $t1, 0x004C($sp) -/* 01F1C 80AA7F6C 51000023 */ beql $t0, $zero, .L80AA7FFC -/* 01F20 80AA7F70 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01F24 80AA7F74 55200006 */ bnel $t1, $zero, .L80AA7F90 +/* 01F18 80AA7F68 8FA9004C */ lw $t1, 0x004C($sp) +/* 01F1C 80AA7F6C 51000023 */ beql $t0, $zero, .L80AA7FFC +/* 01F20 80AA7F70 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01F24 80AA7F74 55200006 */ bnel $t1, $zero, .L80AA7F90 /* 01F28 80AA7F78 920B03C4 */ lbu $t3, 0x03C4($s0) ## 000003C4 /* 01F2C 80AA7F7C 8E2A0680 */ lw $t2, 0x0680($s1) ## 00000680 /* 01F30 80AA7F80 31590080 */ andi $t9, $t2, 0x0080 ## $t9 = 00000000 -/* 01F34 80AA7F84 53200017 */ beql $t9, $zero, .L80AA7FE4 +/* 01F34 80AA7F84 53200017 */ beql $t9, $zero, .L80AA7FE4 /* 01F38 80AA7F88 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01F3C 80AA7F8C 920B03C4 */ lbu $t3, 0x03C4($s0) ## 000003C4 .L80AA7F90: @@ -213,31 +213,31 @@ glabel func_80AA7CAC /* 01F50 80AA7FA0 8E220680 */ lw $v0, 0x0680($s1) ## 00000680 /* 01F54 80AA7FA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01F58 80AA7FA8 304D0080 */ andi $t5, $v0, 0x0080 ## $t5 = 00000000 -/* 01F5C 80AA7FAC 51A0000D */ beql $t5, $zero, .L80AA7FE4 +/* 01F5C 80AA7FAC 51A0000D */ beql $t5, $zero, .L80AA7FE4 /* 01F60 80AA7FB0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01F64 80AA7FB4 44810000 */ mtc1 $at, $f0 ## $f0 = -10.00 /* 01F68 80AA7FB8 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 01F6C 80AA7FBC 00417024 */ and $t6, $v0, $at +/* 01F6C 80AA7FBC 00417024 */ and $t6, $v0, $at /* 01F70 80AA7FC0 AE2E0680 */ sw $t6, 0x0680($s1) ## 00000680 /* 01F74 80AA7FC4 AE200118 */ sw $zero, 0x0118($s1) ## 00000118 /* 01F78 80AA7FC8 A62F0850 */ sh $t7, 0x0850($s1) ## 00000850 /* 01F7C 80AA7FCC 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 01F80 80AA7FD0 44060000 */ mfc1 $a2, $f0 -/* 01F84 80AA7FD4 8FA4005C */ lw $a0, 0x005C($sp) -/* 01F88 80AA7FD8 0C00BDC7 */ jal func_8002F71C -/* 01F8C 80AA7FDC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01F80 80AA7FD0 44060000 */ mfc1 $a2, $f0 +/* 01F84 80AA7FD4 8FA4005C */ lw $a0, 0x005C($sp) +/* 01F88 80AA7FD8 0C00BDC7 */ jal func_8002F71C +/* 01F8C 80AA7FDC E7A00010 */ swc1 $f0, 0x0010($sp) /* 01F90 80AA7FE0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 .L80AA7FE4: /* 01F94 80AA7FE4 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 /* 01F98 80AA7FE8 A6000334 */ sh $zero, 0x0334($s0) ## 00000334 /* 01F9C 80AA7FEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FA0 80AA7FF0 0C2A9B48 */ jal func_80AA6D20 +/* 01FA0 80AA7FF0 0C2A9B48 */ jal func_80AA6D20 /* 01FA4 80AA7FF4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 01FA8 80AA7FF8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01FA8 80AA7FF8 8FBF0034 */ lw $ra, 0x0034($sp) .L80AA7FFC: -/* 01FAC 80AA7FFC 8FB0002C */ lw $s0, 0x002C($sp) -/* 01FB0 80AA8000 8FB10030 */ lw $s1, 0x0030($sp) -/* 01FB4 80AA8004 03E00008 */ jr $ra +/* 01FAC 80AA7FFC 8FB0002C */ lw $s0, 0x002C($sp) +/* 01FB0 80AA8000 8FB10030 */ lw $s1, 0x0030($sp) +/* 01FB4 80AA8004 03E00008 */ jr $ra /* 01FB8 80AA8008 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s index 44fb657ad4..799059906d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s @@ -1,117 +1,117 @@ glabel EnMd_Init /* 01400 80AAB650 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01404 80AAB654 AFB10038 */ sw $s1, 0x0038($sp) -/* 01408 80AAB658 AFB00034 */ sw $s0, 0x0034($sp) +/* 01404 80AAB654 AFB10038 */ sw $s1, 0x0038($sp) +/* 01408 80AAB658 AFB00034 */ sw $s0, 0x0034($sp) /* 0140C 80AAB65C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01410 80AAB660 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01414 80AAB664 AFBF003C */ sw $ra, 0x003C($sp) +/* 01414 80AAB664 AFBF003C */ sw $ra, 0x003C($sp) /* 01418 80AAB668 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0141C 80AAB66C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 01420 80AAB670 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01424 80AAB674 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 01428 80AAB678 0C00AC78 */ jal ActorShape_Init - + /* 0142C 80AAB67C 3C0741C0 */ lui $a3, 0x41C0 ## $a3 = 41C00000 /* 01430 80AAB680 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 01434 80AAB684 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 01438 80AAB688 260E0258 */ addiu $t6, $s0, 0x0258 ## $t6 = 00000258 /* 0143C 80AAB68C 260F02BE */ addiu $t7, $s0, 0x02BE ## $t7 = 000002BE /* 01440 80AAB690 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 01444 80AAB694 AFB80018 */ sw $t8, 0x0018($sp) -/* 01448 80AAB698 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0144C 80AAB69C AFAE0010 */ sw $t6, 0x0010($sp) +/* 01444 80AAB694 AFB80018 */ sw $t8, 0x0018($sp) +/* 01448 80AAB698 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0144C 80AAB69C AFAE0010 */ sw $t6, 0x0010($sp) /* 01450 80AAB6A0 24C67FB8 */ addiu $a2, $a2, 0x7FB8 ## $a2 = 06007FB8 -/* 01454 80AAB6A4 AFA50044 */ sw $a1, 0x0044($sp) +/* 01454 80AAB6A4 AFA50044 */ sw $a1, 0x0044($sp) /* 01458 80AAB6A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0145C 80AAB6AC 0C0291BE */ jal func_800A46F8 +/* 0145C 80AAB6AC 0C0291BE */ jal SkelAnime_InitSV /* 01460 80AAB6B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01464 80AAB6B4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 01468 80AAB6B8 AFA50040 */ sw $a1, 0x0040($sp) +/* 01468 80AAB6B8 AFA50040 */ sw $a1, 0x0040($sp) /* 0146C 80AAB6BC 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 01470 80AAB6C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01474 80AAB6C4 3C0780AB */ lui $a3, %hi(D_80AAC310) ## $a3 = 80AB0000 -/* 01478 80AAB6C8 8FA50040 */ lw $a1, 0x0040($sp) +/* 01478 80AAB6C8 8FA50040 */ lw $a1, 0x0040($sp) /* 0147C 80AAB6CC 24E7C310 */ addiu $a3, $a3, %lo(D_80AAC310) ## $a3 = 80AAC310 /* 01480 80AAB6D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01484 80AAB6D4 0C01712B */ jal ActorCollider_InitCylinder - + /* 01488 80AAB6D8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0148C 80AAB6DC 3C0680AB */ lui $a2, %hi(D_80AAC33C) ## $a2 = 80AB0000 /* 01490 80AAB6E0 24C6C33C */ addiu $a2, $a2, %lo(D_80AAC33C) ## $a2 = 80AAC33C /* 01494 80AAB6E4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 01498 80AAB6E8 0C0187BF */ jal func_80061EFC +/* 01498 80AAB6E8 0C0187BF */ jal func_80061EFC /* 0149C 80AAB6EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 014A0 80AAB6F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014A4 80AAB6F4 0C2AAC0F */ jal func_80AAB03C +/* 014A4 80AAB6F4 0C2AAC0F */ jal func_80AAB03C /* 014A8 80AAB6F8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 014AC 80AAB6FC 14400005 */ bne $v0, $zero, .L80AAB714 -/* 014B0 80AAB700 8FA40044 */ lw $a0, 0x0044($sp) +/* 014AC 80AAB6FC 14400005 */ bne $v0, $zero, .L80AAB714 +/* 014B0 80AAB700 8FA40044 */ lw $a0, 0x0044($sp) /* 014B4 80AAB704 0C00B55C */ jal Actor_Kill - + /* 014B8 80AAB708 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014BC 80AAB70C 1000004B */ beq $zero, $zero, .L80AAB83C -/* 014C0 80AAB710 8FBF003C */ lw $ra, 0x003C($sp) +/* 014BC 80AAB70C 1000004B */ beq $zero, $zero, .L80AAB83C +/* 014C0 80AAB710 8FBF003C */ lw $ra, 0x003C($sp) .L80AAB714: /* 014C4 80AAB714 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 /* 014C8 80AAB718 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 014CC 80AAB71C 0C00D3B0 */ jal func_80034EC0 +/* 014CC 80AAB71C 0C00D3B0 */ jal func_80034EC0 /* 014D0 80AAB720 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 014D4 80AAB724 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 014D8 80AAB728 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 014DC 80AAB72C 0C00B58B */ jal Actor_SetScale - + /* 014E0 80AAB730 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 014E4 80AAB734 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 014E8 80AAB738 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 /* 014EC 80AAB73C 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF /* 014F0 80AAB740 A219001F */ sb $t9, 0x001F($s0) ## 0000001F /* 014F4 80AAB744 A6080210 */ sh $t0, 0x0210($s0) ## 00000210 -/* 014F8 80AAB748 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 014F8 80AAB748 E7A40010 */ swc1 $f4, 0x0010($sp) /* 014FC 80AAB74C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01500 80AAB750 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 01504 80AAB754 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 01508 80AAB758 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 01508 80AAB758 E7A60014 */ swc1 $f6, 0x0014($sp) /* 0150C 80AAB75C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 01510 80AAB760 AFA90028 */ sw $t1, 0x0028($sp) -/* 01514 80AAB764 AFA00024 */ sw $zero, 0x0024($sp) -/* 01518 80AAB768 AFA00020 */ sw $zero, 0x0020($sp) -/* 0151C 80AAB76C AFA0001C */ sw $zero, 0x001C($sp) +/* 01510 80AAB760 AFA90028 */ sw $t1, 0x0028($sp) +/* 01514 80AAB764 AFA00024 */ sw $zero, 0x0024($sp) +/* 01518 80AAB768 AFA00020 */ sw $zero, 0x0020($sp) +/* 0151C 80AAB76C AFA0001C */ sw $zero, 0x001C($sp) /* 01520 80AAB770 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01524 80AAB774 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 01528 80AAB778 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 /* 0152C 80AAB77C 0C00C916 */ jal Actor_SpawnAttached - -/* 01530 80AAB780 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 01530 80AAB780 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01534 80AAB784 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 /* 01538 80AAB788 24040055 */ addiu $a0, $zero, 0x0055 ## $a0 = 00000055 /* 0153C 80AAB78C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01540 80AAB790 14830004 */ bne $a0, $v1, .L80AAB7A4 +/* 01540 80AAB790 14830004 */ bne $a0, $v1, .L80AAB7A4 /* 01544 80AAB794 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 01548 80AAB798 944A0ED4 */ lhu $t2, 0x0ED4($v0) ## 8015F534 /* 0154C 80AAB79C 314B0010 */ andi $t3, $t2, 0x0010 ## $t3 = 00000000 -/* 01550 80AAB7A0 11600013 */ beq $t3, $zero, .L80AAB7F0 +/* 01550 80AAB7A0 11600013 */ beq $t3, $zero, .L80AAB7F0 .L80AAB7A4: /* 01554 80AAB7A4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01558 80AAB7A8 1483000A */ bne $a0, $v1, .L80AAB7D4 +/* 01558 80AAB7A8 1483000A */ bne $a0, $v1, .L80AAB7D4 /* 0155C 80AAB7AC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 01560 80AAB7B0 944C0ED4 */ lhu $t4, 0x0ED4($v0) ## 8015F534 /* 01564 80AAB7B4 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 /* 01568 80AAB7B8 318D0010 */ andi $t5, $t4, 0x0010 ## $t5 = 00000000 -/* 0156C 80AAB7BC 51A00006 */ beql $t5, $zero, .L80AAB7D8 +/* 0156C 80AAB7BC 51A00006 */ beql $t5, $zero, .L80AAB7D8 /* 01570 80AAB7C0 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B /* 01574 80AAB7C4 8DCE7168 */ lw $t6, 0x7168($t6) ## 80127168 /* 01578 80AAB7C8 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 -/* 0157C 80AAB7CC 01CFC024 */ and $t8, $t6, $t7 -/* 01580 80AAB7D0 17000007 */ bne $t8, $zero, .L80AAB7F0 +/* 0157C 80AAB7CC 01CFC024 */ and $t8, $t6, $t7 +/* 01580 80AAB7D0 17000007 */ bne $t8, $zero, .L80AAB7F0 .L80AAB7D4: /* 01584 80AAB7D4 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B .L80AAB7D8: -/* 01588 80AAB7D8 54610010 */ bnel $v1, $at, .L80AAB81C +/* 01588 80AAB7D8 54610010 */ bnel $v1, $at, .L80AAB81C /* 0158C 80AAB7DC 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 /* 01590 80AAB7E0 94590ED4 */ lhu $t9, 0x0ED4($v0) ## 8015F534 /* 01594 80AAB7E4 33280400 */ andi $t0, $t9, 0x0400 ## $t0 = 00000000 -/* 01598 80AAB7E8 5500000C */ bnel $t0, $zero, .L80AAB81C +/* 01598 80AAB7E8 5500000C */ bnel $t0, $zero, .L80AAB81C /* 0159C 80AAB7EC 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 .L80AAB7F0: /* 015A0 80AAB7F0 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 @@ -122,24 +122,24 @@ glabel EnMd_Init /* 015B4 80AAB804 256BB948 */ addiu $t3, $t3, %lo(func_80AAB948) ## $t3 = 80AAB948 /* 015B8 80AAB808 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 /* 015BC 80AAB80C AE09000C */ sw $t1, 0x000C($s0) ## 0000000C -/* 015C0 80AAB810 10000009 */ beq $zero, $zero, .L80AAB838 +/* 015C0 80AAB810 10000009 */ beq $zero, $zero, .L80AAB838 /* 015C4 80AAB814 AE0A0010 */ sw $t2, 0x0010($s0) ## 00000010 /* 015C8 80AAB818 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 .L80AAB81C: -/* 015CC 80AAB81C 10610003 */ beq $v1, $at, .L80AAB82C +/* 015CC 80AAB81C 10610003 */ beq $v1, $at, .L80AAB82C /* 015D0 80AAB820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015D4 80AAB824 0C2AAD37 */ jal func_80AAB4DC +/* 015D4 80AAB824 0C2AAD37 */ jal func_80AAB4DC /* 015D8 80AAB828 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80AAB82C: /* 015DC 80AAB82C 3C0C80AB */ lui $t4, %hi(func_80AAB874) ## $t4 = 80AB0000 /* 015E0 80AAB830 258CB874 */ addiu $t4, $t4, %lo(func_80AAB874) ## $t4 = 80AAB874 /* 015E4 80AAB834 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 .L80AAB838: -/* 015E8 80AAB838 8FBF003C */ lw $ra, 0x003C($sp) +/* 015E8 80AAB838 8FBF003C */ lw $ra, 0x003C($sp) .L80AAB83C: -/* 015EC 80AAB83C 8FB00034 */ lw $s0, 0x0034($sp) -/* 015F0 80AAB840 8FB10038 */ lw $s1, 0x0038($sp) -/* 015F4 80AAB844 03E00008 */ jr $ra +/* 015EC 80AAB83C 8FB00034 */ lw $s0, 0x0034($sp) +/* 015F0 80AAB840 8FB10038 */ lw $s1, 0x0038($sp) +/* 015F4 80AAB844 03E00008 */ jr $ra /* 015F8 80AAB848 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s index 1194411c05..a1816b6003 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s @@ -1,11 +1,11 @@ glabel EnMk_Draw /* 00C9C 80AAD59C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00CA0 80AAD5A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00CA4 80AAD5A4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00CA8 80AAD5A8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00CAC 80AAD5AC 0C0250F2 */ jal func_800943C8 +/* 00CA0 80AAD5A0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00CA4 80AAD5A4 AFA40028 */ sw $a0, 0x0028($sp) +/* 00CA8 80AAD5A8 AFA5002C */ sw $a1, 0x002C($sp) +/* 00CAC 80AAD5AC 0C0250F2 */ jal func_800943C8 /* 00CB0 80AAD5B0 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00CB4 80AAD5B4 8FA20028 */ lw $v0, 0x0028($sp) +/* 00CB4 80AAD5B4 8FA20028 */ lw $v0, 0x0028($sp) /* 00CB8 80AAD5B8 3C0F80AB */ lui $t7, %hi(func_80AAD518) ## $t7 = 80AB0000 /* 00CBC 80AAD5BC 3C1880AB */ lui $t8, %hi(func_80AAD55C) ## $t8 = 80AB0000 /* 00CC0 80AAD5C0 8C45019C */ lw $a1, 0x019C($v0) ## 0000019C @@ -13,14 +13,14 @@ glabel EnMk_Draw /* 00CC8 80AAD5C8 9047019A */ lbu $a3, 0x019A($v0) ## 0000019A /* 00CCC 80AAD5CC 2718D55C */ addiu $t8, $t8, %lo(func_80AAD55C) ## $t8 = 80AAD55C /* 00CD0 80AAD5D0 25EFD518 */ addiu $t7, $t7, %lo(func_80AAD518) ## $t7 = 80AAD518 -/* 00CD4 80AAD5D4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00CD8 80AAD5D8 AFB80014 */ sw $t8, 0x0014($sp) -/* 00CDC 80AAD5DC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00CE0 80AAD5E0 0C0286B2 */ jal func_800A1AC8 -/* 00CE4 80AAD5E4 AFA20018 */ sw $v0, 0x0018($sp) -/* 00CE8 80AAD5E8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00CD4 80AAD5D4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00CD8 80AAD5D8 AFB80014 */ sw $t8, 0x0014($sp) +/* 00CDC 80AAD5DC 8FA4002C */ lw $a0, 0x002C($sp) +/* 00CE0 80AAD5E0 0C0286B2 */ jal SkelAnime_DrawSV +/* 00CE4 80AAD5E4 AFA20018 */ sw $v0, 0x0018($sp) +/* 00CE8 80AAD5E8 8FBF0024 */ lw $ra, 0x0024($sp) /* 00CEC 80AAD5EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00CF0 80AAD5F0 03E00008 */ jr $ra +/* 00CF0 80AAD5F0 03E00008 */ jr $ra /* 00CF4 80AAD5F4 00000000 */ nop /* 00CF8 80AAD5F8 00000000 */ nop /* 00CFC 80AAD5FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s index a5fb72ffaa..7b101908da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s @@ -4,9 +4,9 @@ glabel EnMk_Init /* 00008 80AAC908 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 /* 0000C 80AAC90C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00010 80AAC910 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 00014 80AAC914 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 80AAC918 AFB00028 */ sw $s0, 0x0028($sp) -/* 0001C 80AAC91C AFA50044 */ sw $a1, 0x0044($sp) +/* 00014 80AAC914 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 80AAC918 AFB00028 */ sw $s0, 0x0028($sp) +/* 0001C 80AAC91C AFA50044 */ sw $a1, 0x0044($sp) /* 00020 80AAC920 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00024 80AAC924 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00028 80AAC928 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC @@ -15,7 +15,7 @@ glabel EnMk_Init /* 00034 80AAC934 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 00038 80AAC938 E484FFBC */ swc1 $f4, -0x0044($a0) ## 00000070 /* 0003C 80AAC93C 0C00AC78 */ jal ActorShape_Init - + /* 00040 80AAC940 E486FFB8 */ swc1 $f6, -0x0048($a0) ## 0000006C /* 00044 80AAC944 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00048 80AAC948 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -23,36 +23,36 @@ glabel EnMk_Init /* 00050 80AAC950 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 00054 80AAC954 260F022A */ addiu $t7, $s0, 0x022A ## $t7 = 0000022A /* 00058 80AAC958 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 0005C 80AAC95C AFB80018 */ sw $t8, 0x0018($sp) -/* 00060 80AAC960 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00064 80AAC964 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0005C 80AAC95C AFB80018 */ sw $t8, 0x0018($sp) +/* 00060 80AAC960 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00064 80AAC964 AFAE0010 */ sw $t6, 0x0010($sp) /* 00068 80AAC968 24E70D88 */ addiu $a3, $a3, 0x0D88 ## $a3 = 06000D88 /* 0006C 80AAC96C 24C65DF0 */ addiu $a2, $a2, 0x5DF0 ## $a2 = 06005DF0 -/* 00070 80AAC970 AFA50034 */ sw $a1, 0x0034($sp) -/* 00074 80AAC974 0C0291BE */ jal func_800A46F8 -/* 00078 80AAC978 8FA40044 */ lw $a0, 0x0044($sp) +/* 00070 80AAC970 AFA50034 */ sw $a1, 0x0034($sp) +/* 00074 80AAC974 0C0291BE */ jal SkelAnime_InitSV +/* 00078 80AAC978 8FA40044 */ lw $a0, 0x0044($sp) /* 0007C 80AAC97C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00080 80AAC980 24A50D88 */ addiu $a1, $a1, 0x0D88 ## $a1 = 06000D88 -/* 00084 80AAC984 0C0294BE */ jal func_800A52F8 -/* 00088 80AAC988 8FA40034 */ lw $a0, 0x0034($sp) +/* 00084 80AAC984 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00088 80AAC988 8FA40034 */ lw $a0, 0x0034($sp) /* 0008C 80AAC98C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00090 80AAC990 AFA50034 */ sw $a1, 0x0034($sp) +/* 00090 80AAC990 AFA50034 */ sw $a1, 0x0034($sp) /* 00094 80AAC994 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00098 80AAC998 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00098 80AAC998 8FA40044 */ lw $a0, 0x0044($sp) /* 0009C 80AAC99C 3C0780AB */ lui $a3, %hi(D_80AAD620) ## $a3 = 80AB0000 -/* 000A0 80AAC9A0 8FA50034 */ lw $a1, 0x0034($sp) +/* 000A0 80AAC9A0 8FA50034 */ lw $a1, 0x0034($sp) /* 000A4 80AAC9A4 24E7D620 */ addiu $a3, $a3, %lo(D_80AAD620) ## $a3 = 80AAD620 -/* 000A8 80AAC9A8 8FA40044 */ lw $a0, 0x0044($sp) +/* 000A8 80AAC9A8 8FA40044 */ lw $a0, 0x0044($sp) /* 000AC 80AAC9AC 0C01712B */ jal ActorCollider_InitCylinder - + /* 000B0 80AAC9B0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B4 80AAC9B4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 000B8 80AAC9B8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000BC 80AAC9BC A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 000C0 80AAC9C0 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000C4 80AAC9C4 0C00B58B */ jal Actor_SetScale - + /* 000C8 80AAC9C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000CC 80AAC9CC 3C0880AB */ lui $t0, %hi(func_80AAD080) ## $t0 = 80AB0000 /* 000D0 80AAC9D0 2508D080 */ addiu $t0, $t0, %lo(func_80AAD080) ## $t0 = 80AAD080 @@ -65,14 +65,14 @@ glabel EnMk_Init /* 000EC 80AAC9EC 954AF552 */ lhu $t2, -0x0AAE($t2) ## 8015F552 /* 000F0 80AAC9F0 340D0004 */ ori $t5, $zero, 0x0004 ## $t5 = 00000004 /* 000F4 80AAC9F4 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 000F8 80AAC9F8 51600003 */ beql $t3, $zero, .L80AACA08 -/* 000FC 80AAC9FC 8FBF002C */ lw $ra, 0x002C($sp) +/* 000F8 80AAC9F8 51600003 */ beql $t3, $zero, .L80AACA08 +/* 000FC 80AAC9FC 8FBF002C */ lw $ra, 0x002C($sp) /* 00100 80AACA00 A60D027E */ sh $t5, 0x027E($s0) ## 0000027E -/* 00104 80AACA04 8FBF002C */ lw $ra, 0x002C($sp) +/* 00104 80AACA04 8FBF002C */ lw $ra, 0x002C($sp) .L80AACA08: -/* 00108 80AACA08 8FB00028 */ lw $s0, 0x0028($sp) +/* 00108 80AACA08 8FB00028 */ lw $s0, 0x0028($sp) /* 0010C 80AACA0C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00110 80AACA10 03E00008 */ jr $ra +/* 00110 80AACA10 03E00008 */ jr $ra /* 00114 80AACA14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s index 3c987ac158..dd1fe2866b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s @@ -1,21 +1,21 @@ glabel EnMm_Draw /* 00F3C 80AAE6AC 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00F40 80AAE6B0 AFB10028 */ sw $s1, 0x0028($sp) +/* 00F40 80AAE6B0 AFB10028 */ sw $s1, 0x0028($sp) /* 00F44 80AAE6B4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00F48 80AAE6B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 00F4C 80AAE6BC AFB00024 */ sw $s0, 0x0024($sp) -/* 00F50 80AAE6C0 AFA40080 */ sw $a0, 0x0080($sp) +/* 00F48 80AAE6B8 AFBF002C */ sw $ra, 0x002C($sp) +/* 00F4C 80AAE6BC AFB00024 */ sw $s0, 0x0024($sp) +/* 00F50 80AAE6C0 AFA40080 */ sw $a0, 0x0080($sp) /* 00F54 80AAE6C4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00F58 80AAE6C8 3C0680AB */ lui $a2, %hi(D_80AAEC00) ## $a2 = 80AB0000 /* 00F5C 80AAE6CC 24C6EC00 */ addiu $a2, $a2, %lo(D_80AAEC00) ## $a2 = 80AAEC00 /* 00F60 80AAE6D0 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 00F64 80AAE6D4 24070429 */ addiu $a3, $zero, 0x0429 ## $a3 = 00000429 -/* 00F68 80AAE6D8 0C031AB1 */ jal func_800C6AC4 +/* 00F68 80AAE6D8 0C031AB1 */ jal func_800C6AC4 /* 00F6C 80AAE6DC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00F70 80AAE6E0 0C024F46 */ jal func_80093D18 +/* 00F70 80AAE6E0 0C024F46 */ jal func_80093D18 /* 00F74 80AAE6E4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 00F78 80AAE6E8 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 00F7C 80AAE6EC 8FA80080 */ lw $t0, 0x0080($sp) +/* 00F7C 80AAE6EC 8FA80080 */ lw $t0, 0x0080($sp) /* 00F80 80AAE6F0 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 00F84 80AAE6F4 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 00F88 80AAE6F8 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 @@ -24,20 +24,20 @@ glabel EnMm_Draw /* 00F94 80AAE704 8D1801E4 */ lw $t8, 0x01E4($t0) ## 000001E4 /* 00F98 80AAE708 3C0480AB */ lui $a0, %hi(D_80AAEBEC) ## $a0 = 80AB0000 /* 00F9C 80AAE70C 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 00FA0 80AAE710 0018C880 */ sll $t9, $t8, 2 -/* 00FA4 80AAE714 00992021 */ addu $a0, $a0, $t9 -/* 00FA8 80AAE718 8C84EBEC */ lw $a0, %lo(D_80AAEBEC)($a0) +/* 00FA0 80AAE710 0018C880 */ sll $t9, $t8, 2 +/* 00FA4 80AAE714 00992021 */ addu $a0, $a0, $t9 +/* 00FA8 80AAE718 8C84EBEC */ lw $a0, %lo(D_80AAEBEC)($a0) /* 00FAC 80AAE71C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00FB0 80AAE720 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00FB4 80AAE724 00045100 */ sll $t2, $a0, 4 -/* 00FB8 80AAE728 000A5F02 */ srl $t3, $t2, 28 -/* 00FBC 80AAE72C 000B6080 */ sll $t4, $t3, 2 -/* 00FC0 80AAE730 01AC6821 */ addu $t5, $t5, $t4 +/* 00FB4 80AAE724 00045100 */ sll $t2, $a0, 4 +/* 00FB8 80AAE728 000A5F02 */ srl $t3, $t2, 28 +/* 00FBC 80AAE72C 000B6080 */ sll $t4, $t3, 2 +/* 00FC0 80AAE730 01AC6821 */ addu $t5, $t5, $t4 /* 00FC4 80AAE734 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 -/* 00FC8 80AAE738 00814824 */ and $t1, $a0, $at +/* 00FC8 80AAE738 00814824 */ and $t1, $a0, $at /* 00FCC 80AAE73C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00FD0 80AAE740 012D7021 */ addu $t6, $t1, $t5 -/* 00FD4 80AAE744 01C17821 */ addu $t7, $t6, $at +/* 00FD0 80AAE740 012D7021 */ addu $t6, $t1, $t5 +/* 00FD4 80AAE744 01C17821 */ addu $t7, $t6, $at /* 00FD8 80AAE748 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 /* 00FDC 80AAE74C 3C1980AB */ lui $t9, %hi(func_80AAEA10) ## $t9 = 80AB0000 /* 00FE0 80AAE750 3C1880AB */ lui $t8, %hi(func_80AAE97C) ## $t8 = 80AB0000 @@ -46,35 +46,35 @@ glabel EnMm_Draw /* 00FEC 80AAE75C 8D050150 */ lw $a1, 0x0150($t0) ## 00000150 /* 00FF0 80AAE760 2718E97C */ addiu $t8, $t8, %lo(func_80AAE97C) ## $t8 = 80AAE97C /* 00FF4 80AAE764 2739EA10 */ addiu $t9, $t9, %lo(func_80AAEA10) ## $t9 = 80AAEA10 -/* 00FF8 80AAE768 AFB90014 */ sw $t9, 0x0014($sp) -/* 00FFC 80AAE76C AFB80010 */ sw $t8, 0x0010($sp) +/* 00FF8 80AAE768 AFB90014 */ sw $t9, 0x0014($sp) +/* 00FFC 80AAE76C AFB80010 */ sw $t8, 0x0010($sp) /* 01000 80AAE770 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01004 80AAE774 0C0286B2 */ jal func_800A1AC8 -/* 01008 80AAE778 AFA80018 */ sw $t0, 0x0018($sp) +/* 01004 80AAE774 0C0286B2 */ jal SkelAnime_DrawSV +/* 01008 80AAE778 AFA80018 */ sw $t0, 0x0018($sp) /* 0100C 80AAE77C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 01010 80AAE780 954AF556 */ lhu $t2, -0x0AAA($t2) ## 8015F556 /* 01014 80AAE784 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01018 80AAE788 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 0101C 80AAE78C 314B0800 */ andi $t3, $t2, 0x0800 ## $t3 = 00000000 -/* 01020 80AAE790 1160006F */ beq $t3, $zero, .L80AAE950 -/* 01024 80AAE794 02212021 */ addu $a0, $s1, $at +/* 01020 80AAE790 1160006F */ beq $t3, $zero, .L80AAE950 +/* 01024 80AAE794 02212021 */ addu $a0, $s1, $at /* 01028 80AAE798 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 0102C 80AAE79C 24050015 */ addiu $a1, $zero, 0x0015 ## $a1 = 00000015 -/* 01030 80AAE7A0 0440006B */ bltz $v0, .L80AAE950 -/* 01034 80AAE7A4 AFA2005C */ sw $v0, 0x005C($sp) +/* 01030 80AAE7A0 0440006B */ bltz $v0, .L80AAE950 +/* 01034 80AAE7A4 AFA2005C */ sw $v0, 0x005C($sp) /* 01038 80AAE7A8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 0103C 80AAE7AC 0C031A73 */ jal Graph_Alloc - + /* 01040 80AAE7B0 24050080 */ addiu $a1, $zero, 0x0080 ## $a1 = 00000080 -/* 01044 80AAE7B4 8FA40080 */ lw $a0, 0x0080($sp) -/* 01048 80AAE7B8 AFA20058 */ sw $v0, 0x0058($sp) -/* 0104C 80AAE7BC 0C03423F */ jal Matrix_Put +/* 01044 80AAE7B4 8FA40080 */ lw $a0, 0x0080($sp) +/* 01048 80AAE7B8 AFA20058 */ sw $v0, 0x0058($sp) +/* 0104C 80AAE7BC 0C03423F */ jal Matrix_Put /* 01050 80AAE7C0 24840208 */ addiu $a0, $a0, 0x0208 ## $a0 = 00000208 /* 01054 80AAE7C4 3C0580AB */ lui $a1, %hi(D_80AAEC10) ## $a1 = 80AB0000 /* 01058 80AAE7C8 24A5EC10 */ addiu $a1, $a1, %lo(D_80AAEC10) ## $a1 = 80AAEC10 /* 0105C 80AAE7CC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01060 80AAE7D0 0C0346A2 */ jal Matrix_NewMtx +/* 01060 80AAE7D0 0C0346A2 */ jal Matrix_NewMtx /* 01064 80AAE7D4 24060457 */ addiu $a2, $zero, 0x0457 ## $a2 = 00000457 /* 01068 80AAE7D8 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 0106C 80AAE7DC 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -82,14 +82,14 @@ glabel EnMm_Draw /* 01074 80AAE7E4 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 /* 01078 80AAE7E8 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 0107C 80AAE7EC AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 01080 80AAE7F0 8FAD005C */ lw $t5, 0x005C($sp) +/* 01080 80AAE7F0 8FAD005C */ lw $t5, 0x005C($sp) /* 01084 80AAE7F4 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 /* 01088 80AAE7F8 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 0108C 80AAE7FC 000D7100 */ sll $t6, $t5, 4 -/* 01090 80AAE800 01CD7021 */ addu $t6, $t6, $t5 -/* 01094 80AAE804 000E7080 */ sll $t6, $t6, 2 -/* 01098 80AAE808 022E7821 */ addu $t7, $s1, $t6 -/* 0109C 80AAE80C 030FC021 */ addu $t8, $t8, $t7 +/* 0108C 80AAE7FC 000D7100 */ sll $t6, $t5, 4 +/* 01090 80AAE800 01CD7021 */ addu $t6, $t6, $t5 +/* 01094 80AAE804 000E7080 */ sll $t6, $t6, 2 +/* 01098 80AAE808 022E7821 */ addu $t7, $s1, $t6 +/* 0109C 80AAE80C 030FC021 */ addu $t8, $t8, $t7 /* 010A0 80AAE810 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 /* 010A4 80AAE814 354A002C */ ori $t2, $t2, 0x002C ## $t2 = DB06002C /* 010A8 80AAE818 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -100,7 +100,7 @@ glabel EnMm_Draw /* 010BC 80AAE82C 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 010C0 80AAE830 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 010C4 80AAE834 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 010C8 80AAE838 8FAB0058 */ lw $t3, 0x0058($sp) +/* 010C8 80AAE838 8FAB0058 */ lw $t3, 0x0058($sp) /* 010CC 80AAE83C 3C0142C2 */ lui $at, 0x42C2 ## $at = 42C20000 /* 010D0 80AAE840 44816000 */ mtc1 $at, $f12 ## $f12 = 97.00 /* 010D4 80AAE844 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 @@ -113,20 +113,20 @@ glabel EnMm_Draw /* 010F0 80AAE860 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 010F4 80AAE864 2418CB76 */ addiu $t8, $zero, 0xCB76 ## $t8 = FFFFCB76 /* 010F8 80AAE868 3C0180AB */ lui $at, %hi(D_80AAEC88) ## $at = 80AB0000 -/* 010FC 80AAE86C A7AE0050 */ sh $t6, 0x0050($sp) -/* 01100 80AAE870 A7AF0052 */ sh $t7, 0x0052($sp) -/* 01104 80AAE874 A7B80054 */ sh $t8, 0x0054($sp) -/* 01108 80AAE878 C42EEC88 */ lwc1 $f14, %lo(D_80AAEC88)($at) +/* 010FC 80AAE86C A7AE0050 */ sh $t6, 0x0050($sp) +/* 01100 80AAE870 A7AF0052 */ sh $t7, 0x0052($sp) +/* 01104 80AAE874 A7B80054 */ sh $t8, 0x0054($sp) +/* 01108 80AAE878 C42EEC88 */ lwc1 $f14, %lo(D_80AAEC88)($at) /* 0110C 80AAE87C 3C06C370 */ lui $a2, 0xC370 ## $a2 = C3700000 -/* 01110 80AAE880 0C0345A5 */ jal func_800D1694 +/* 01110 80AAE880 0C0345A5 */ jal func_800D1694 /* 01114 80AAE884 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFD0 -/* 01118 80AAE888 8FA20058 */ lw $v0, 0x0058($sp) +/* 01118 80AAE888 8FA20058 */ lw $v0, 0x0058($sp) /* 0111C 80AAE88C 3C0580AB */ lui $a1, %hi(D_80AAEC20) ## $a1 = 80AB0000 /* 01120 80AAE890 24A5EC20 */ addiu $a1, $a1, %lo(D_80AAEC20) ## $a1 = 80AAEC20 /* 01124 80AAE894 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 01128 80AAE898 24420040 */ addiu $v0, $v0, 0x0040 ## $v0 = 00000040 -/* 0112C 80AAE89C AFA20058 */ sw $v0, 0x0058($sp) -/* 01130 80AAE8A0 0C034695 */ jal Matrix_ToMtx +/* 0112C 80AAE89C AFA20058 */ sw $v0, 0x0058($sp) +/* 01130 80AAE8A0 0C034695 */ jal Matrix_ToMtx /* 01134 80AAE8A4 24060464 */ addiu $a2, $zero, 0x0464 ## $a2 = 00000464 /* 01138 80AAE8A8 3C0142C2 */ lui $at, 0x42C2 ## $at = 42C20000 /* 0113C 80AAE8AC 44816000 */ mtc1 $at, $f12 ## $f12 = 97.00 @@ -134,17 +134,17 @@ glabel EnMm_Draw /* 01144 80AAE8B4 240AF242 */ addiu $t2, $zero, 0xF242 ## $t2 = FFFFF242 /* 01148 80AAE8B8 240BCB76 */ addiu $t3, $zero, 0xCB76 ## $t3 = FFFFCB76 /* 0114C 80AAE8BC 3C0180AB */ lui $at, %hi(D_80AAEC8C) ## $at = 80AB0000 -/* 01150 80AAE8C0 A7B90050 */ sh $t9, 0x0050($sp) -/* 01154 80AAE8C4 A7AA0052 */ sh $t2, 0x0052($sp) -/* 01158 80AAE8C8 A7AB0054 */ sh $t3, 0x0054($sp) -/* 0115C 80AAE8CC C42EEC8C */ lwc1 $f14, %lo(D_80AAEC8C)($at) +/* 01150 80AAE8C0 A7B90050 */ sh $t9, 0x0050($sp) +/* 01154 80AAE8C4 A7AA0052 */ sh $t2, 0x0052($sp) +/* 01158 80AAE8C8 A7AB0054 */ sh $t3, 0x0054($sp) +/* 0115C 80AAE8CC C42EEC8C */ lwc1 $f14, %lo(D_80AAEC8C)($at) /* 01160 80AAE8D0 3C064370 */ lui $a2, 0x4370 ## $a2 = 43700000 -/* 01164 80AAE8D4 0C0345A5 */ jal func_800D1694 +/* 01164 80AAE8D4 0C0345A5 */ jal func_800D1694 /* 01168 80AAE8D8 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFD0 /* 0116C 80AAE8DC 3C0580AB */ lui $a1, %hi(D_80AAEC30) ## $a1 = 80AB0000 /* 01170 80AAE8E0 24A5EC30 */ addiu $a1, $a1, %lo(D_80AAEC30) ## $a1 = 80AAEC30 -/* 01174 80AAE8E4 8FA40058 */ lw $a0, 0x0058($sp) -/* 01178 80AAE8E8 0C034695 */ jal Matrix_ToMtx +/* 01174 80AAE8E4 8FA40058 */ lw $a0, 0x0058($sp) +/* 01178 80AAE8E8 0C034695 */ jal Matrix_ToMtx /* 0117C 80AAE8EC 2406046B */ addiu $a2, $zero, 0x046B ## $a2 = 0000046B /* 01180 80AAE8F0 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 01184 80AAE8F4 3C0D0603 */ lui $t5, 0x0603 ## $t5 = 06030000 @@ -160,14 +160,14 @@ glabel EnMm_Draw /* 011AC 80AAE91C 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 011B0 80AAE920 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 011B4 80AAE924 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 011B8 80AAE928 8FB80080 */ lw $t8, 0x0080($sp) +/* 011B8 80AAE928 8FB80080 */ lw $t8, 0x0080($sp) /* 011BC 80AAE92C 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 /* 011C0 80AAE930 8319001E */ lb $t9, 0x001E($t8) ## 0000001E -/* 011C4 80AAE934 00195100 */ sll $t2, $t9, 4 -/* 011C8 80AAE938 01595021 */ addu $t2, $t2, $t9 -/* 011CC 80AAE93C 000A5080 */ sll $t2, $t2, 2 -/* 011D0 80AAE940 022A5821 */ addu $t3, $s1, $t2 -/* 011D4 80AAE944 018B6021 */ addu $t4, $t4, $t3 +/* 011C4 80AAE934 00195100 */ sll $t2, $t9, 4 +/* 011C8 80AAE938 01595021 */ addu $t2, $t2, $t9 +/* 011CC 80AAE93C 000A5080 */ sll $t2, $t2, 2 +/* 011D0 80AAE940 022A5821 */ addu $t3, $s1, $t2 +/* 011D4 80AAE944 018B6021 */ addu $t4, $t4, $t3 /* 011D8 80AAE948 8D8C17B4 */ lw $t4, 0x17B4($t4) ## 000117B4 /* 011DC 80AAE94C AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 .L80AAE950: @@ -175,12 +175,12 @@ glabel EnMm_Draw /* 011E4 80AAE954 24C6EC40 */ addiu $a2, $a2, %lo(D_80AAEC40) ## $a2 = 80AAEC40 /* 011E8 80AAE958 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 011EC 80AAE95C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 011F0 80AAE960 0C031AD5 */ jal func_800C6B54 +/* 011F0 80AAE960 0C031AD5 */ jal func_800C6B54 /* 011F4 80AAE964 24070475 */ addiu $a3, $zero, 0x0475 ## $a3 = 00000475 -/* 011F8 80AAE968 8FBF002C */ lw $ra, 0x002C($sp) -/* 011FC 80AAE96C 8FB00024 */ lw $s0, 0x0024($sp) -/* 01200 80AAE970 8FB10028 */ lw $s1, 0x0028($sp) -/* 01204 80AAE974 03E00008 */ jr $ra +/* 011F8 80AAE968 8FBF002C */ lw $ra, 0x002C($sp) +/* 011FC 80AAE96C 8FB00024 */ lw $s0, 0x0024($sp) +/* 01200 80AAE970 8FB10028 */ lw $s1, 0x0028($sp) +/* 01204 80AAE974 03E00008 */ jr $ra /* 01208 80AAE978 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s index 8f25f1b993..08a90c218c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s @@ -1,80 +1,80 @@ glabel EnMm_Init /* 00120 80AAD890 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00124 80AAD894 AFA5004C */ sw $a1, 0x004C($sp) -/* 00128 80AAD898 AFBF002C */ sw $ra, 0x002C($sp) -/* 0012C 80AAD89C AFB00028 */ sw $s0, 0x0028($sp) +/* 00124 80AAD894 AFA5004C */ sw $a1, 0x004C($sp) +/* 00128 80AAD898 AFBF002C */ sw $ra, 0x002C($sp) +/* 0012C 80AAD89C AFB00028 */ sw $s0, 0x0028($sp) /* 00130 80AAD8A0 3C0580AB */ lui $a1, %hi(D_80AAEBE8) ## $a1 = 80AB0000 /* 00134 80AAD8A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00138 80AAD8A8 0C01E037 */ jal Actor_ProcessInitChain - + /* 0013C 80AAD8AC 24A5EBE8 */ addiu $a1, $a1, %lo(D_80AAEBE8) ## $a1 = 80AAEBE8 /* 00140 80AAD8B0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00144 80AAD8B4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00148 80AAD8B8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0014C 80AAD8BC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00150 80AAD8C0 0C00AC78 */ jal ActorShape_Init - + /* 00154 80AAD8C4 3C0741A8 */ lui $a3, 0x41A8 ## $a3 = 41A80000 /* 00158 80AAD8C8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0015C 80AAD8CC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00160 80AAD8D0 260E0260 */ addiu $t6, $s0, 0x0260 ## $t6 = 00000260 /* 00164 80AAD8D4 260F02C0 */ addiu $t7, $s0, 0x02C0 ## $t7 = 000002C0 /* 00168 80AAD8D8 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 0016C 80AAD8DC AFB80018 */ sw $t8, 0x0018($sp) -/* 00170 80AAD8E0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00174 80AAD8E4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0016C 80AAD8DC AFB80018 */ sw $t8, 0x0018($sp) +/* 00170 80AAD8E0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00174 80AAD8E4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00178 80AAD8E8 24C65E18 */ addiu $a2, $a2, 0x5E18 ## $a2 = 06005E18 -/* 0017C 80AAD8EC AFA50038 */ sw $a1, 0x0038($sp) -/* 00180 80AAD8F0 8FA4004C */ lw $a0, 0x004C($sp) -/* 00184 80AAD8F4 0C0291BE */ jal func_800A46F8 +/* 0017C 80AAD8EC AFA50038 */ sw $a1, 0x0038($sp) +/* 00180 80AAD8F0 8FA4004C */ lw $a0, 0x004C($sp) +/* 00184 80AAD8F4 0C0291BE */ jal SkelAnime_InitSV /* 00188 80AAD8F8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0018C 80AAD8FC 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00190 80AAD900 AFA50034 */ sw $a1, 0x0034($sp) +/* 00190 80AAD900 AFA50034 */ sw $a1, 0x0034($sp) /* 00194 80AAD904 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00198 80AAD908 8FA4004C */ lw $a0, 0x004C($sp) + +/* 00198 80AAD908 8FA4004C */ lw $a0, 0x004C($sp) /* 0019C 80AAD90C 3C0780AB */ lui $a3, %hi(D_80AAEAE0) ## $a3 = 80AB0000 -/* 001A0 80AAD910 8FA50034 */ lw $a1, 0x0034($sp) +/* 001A0 80AAD910 8FA50034 */ lw $a1, 0x0034($sp) /* 001A4 80AAD914 24E7EAE0 */ addiu $a3, $a3, %lo(D_80AAEAE0) ## $a3 = 80AAEAE0 -/* 001A8 80AAD918 8FA4004C */ lw $a0, 0x004C($sp) +/* 001A8 80AAD918 8FA4004C */ lw $a0, 0x004C($sp) /* 001AC 80AAD91C 0C01712B */ jal ActorCollider_InitCylinder - + /* 001B0 80AAD920 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001B4 80AAD924 3C0580AB */ lui $a1, %hi(D_80AAEB18) ## $a1 = 80AB0000 /* 001B8 80AAD928 3C0680AB */ lui $a2, %hi(D_80AAEB0C) ## $a2 = 80AB0000 /* 001BC 80AAD92C 24C6EB0C */ addiu $a2, $a2, %lo(D_80AAEB0C) ## $a2 = 80AAEB0C /* 001C0 80AAD930 24A5EB18 */ addiu $a1, $a1, %lo(D_80AAEB18) ## $a1 = 80AAEB18 -/* 001C4 80AAD934 0C0187BF */ jal func_80061EFC +/* 001C4 80AAD934 0C0187BF */ jal func_80061EFC /* 001C8 80AAD938 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 001CC 80AAD93C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001D0 80AAD940 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 001D4 80AAD944 AFB90014 */ sw $t9, 0x0014($sp) -/* 001D8 80AAD948 44060000 */ mfc1 $a2, $f0 -/* 001DC 80AAD94C 44070000 */ mfc1 $a3, $f0 -/* 001E0 80AAD950 8FA4004C */ lw $a0, 0x004C($sp) +/* 001D4 80AAD944 AFB90014 */ sw $t9, 0x0014($sp) +/* 001D8 80AAD948 44060000 */ mfc1 $a2, $f0 +/* 001DC 80AAD94C 44070000 */ mfc1 $a3, $f0 +/* 001E0 80AAD950 8FA4004C */ lw $a0, 0x004C($sp) /* 001E4 80AAD954 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001E8 80AAD958 0C00B92D */ jal func_8002E4B4 -/* 001EC 80AAD95C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 001E8 80AAD958 0C00B92D */ jal func_8002E4B4 +/* 001EC 80AAD95C E7A00010 */ swc1 $f0, 0x0010($sp) /* 001F0 80AAD960 3C0380AB */ lui $v1, %hi(D_80AAEB38) ## $v1 = 80AB0000 /* 001F4 80AAD964 2463EB38 */ addiu $v1, $v1, %lo(D_80AAEB38) ## $v1 = 80AAEB38 /* 001F8 80AAD968 0C028800 */ jal SkelAnime_GetFrameCount - + /* 001FC 80AAD96C 8C640000 */ lw $a0, 0x0000($v1) ## 80AAEB38 /* 00200 80AAD970 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00204 80AAD974 3C0380AB */ lui $v1, %hi(D_80AAEB38) ## $v1 = 80AB0000 /* 00208 80AAD978 2463EB38 */ addiu $v1, $v1, %lo(D_80AAEB38) ## $v1 = 80AAEB38 -/* 0020C 80AAD97C 468021A0 */ cvt.s.w $f6, $f4 +/* 0020C 80AAD97C 468021A0 */ cvt.s.w $f6, $f4 /* 00210 80AAD980 90680008 */ lbu $t0, 0x0008($v1) ## 80AAEB40 /* 00214 80AAD984 C468000C */ lwc1 $f8, 0x000C($v1) ## 80AAEB44 /* 00218 80AAD988 8C650000 */ lw $a1, 0x0000($v1) ## 80AAEB38 -/* 0021C 80AAD98C 8FA40038 */ lw $a0, 0x0038($sp) +/* 0021C 80AAD98C 8FA40038 */ lw $a0, 0x0038($sp) /* 00220 80AAD990 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00224 80AAD994 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00224 80AAD994 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00228 80AAD998 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0022C 80AAD99C AFA80014 */ sw $t0, 0x0014($sp) +/* 0022C 80AAD99C AFA80014 */ sw $t0, 0x0014($sp) /* 00230 80AAD9A0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00234 80AAD9A4 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 00234 80AAD9A4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00238 80AAD9A8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 0023C 80AAD9AC 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 00240 80AAD9B0 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 @@ -89,33 +89,33 @@ glabel EnMm_Init /* 00264 80AAD9D4 A202001F */ sb $v0, 0x001F($s0) ## 0000001F /* 00268 80AAD9D8 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 0026C 80AAD9DC E6100200 */ swc1 $f16, 0x0200($s0) ## 00000200 -/* 00270 80AAD9E0 0C2AB69C */ jal func_80AADA70 +/* 00270 80AAD9E0 0C2AB69C */ jal func_80AADA70 /* 00274 80AAD9E4 AE0B0204 */ sw $t3, 0x0204($s0) ## 00000204 /* 00278 80AAD9E8 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 0027C 80AAD9EC 1443000A */ bne $v0, $v1, .L80AADA18 +/* 0027C 80AAD9EC 1443000A */ bne $v0, $v1, .L80AADA18 /* 00280 80AAD9F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00284 80AAD9F4 AE0301E4 */ sw $v1, 0x01E4($s0) ## 000001E4 /* 00288 80AAD9F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0028C 80AAD9FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00290 80AADA00 0C2AB5DC */ jal func_80AAD770 +/* 00290 80AADA00 0C2AB5DC */ jal func_80AAD770 /* 00294 80AADA04 26060258 */ addiu $a2, $s0, 0x0258 ## $a2 = 00000258 /* 00298 80AADA08 3C0C80AB */ lui $t4, %hi(func_80AAE598) ## $t4 = 80AB0000 /* 0029C 80AADA0C 258CE598 */ addiu $t4, $t4, %lo(func_80AAE598) ## $t4 = 80AAE598 -/* 002A0 80AADA10 10000008 */ beq $zero, $zero, .L80AADA34 +/* 002A0 80AADA10 10000008 */ beq $zero, $zero, .L80AADA34 /* 002A4 80AADA14 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 .L80AADA18: /* 002A8 80AADA18 AE0001E4 */ sw $zero, 0x01E4($s0) ## 000001E4 /* 002AC 80AADA1C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 002B0 80AADA20 0C2AB5DC */ jal func_80AAD770 +/* 002B0 80AADA20 0C2AB5DC */ jal func_80AAD770 /* 002B4 80AADA24 26060258 */ addiu $a2, $s0, 0x0258 ## $a2 = 00000258 /* 002B8 80AADA28 3C0D80AB */ lui $t5, %hi(func_80AAE294) ## $t5 = 80AB0000 /* 002BC 80AADA2C 25ADE294 */ addiu $t5, $t5, %lo(func_80AAE294) ## $t5 = 80AAE294 /* 002C0 80AADA30 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 .L80AADA34: -/* 002C4 80AADA34 8FBF002C */ lw $ra, 0x002C($sp) -/* 002C8 80AADA38 8FB00028 */ lw $s0, 0x0028($sp) +/* 002C4 80AADA34 8FBF002C */ lw $ra, 0x002C($sp) +/* 002C8 80AADA38 8FB00028 */ lw $s0, 0x0028($sp) /* 002CC 80AADA3C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 002D0 80AADA40 03E00008 */ jr $ra +/* 002D0 80AADA40 03E00008 */ jr $ra /* 002D4 80AADA44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s index 921f0db573..fe7598ec10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s @@ -1,20 +1,20 @@ glabel EnMm2_Draw /* 00A88 80AAF8D8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00A8C 80AAF8DC AFBF002C */ sw $ra, 0x002C($sp) -/* 00A90 80AAF8E0 AFB00028 */ sw $s0, 0x0028($sp) -/* 00A94 80AAF8E4 AFA50054 */ sw $a1, 0x0054($sp) +/* 00A8C 80AAF8DC AFBF002C */ sw $ra, 0x002C($sp) +/* 00A90 80AAF8E0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00A94 80AAF8E4 AFA50054 */ sw $a1, 0x0054($sp) /* 00A98 80AAF8E8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00A9C 80AAF8EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00AA0 80AAF8F0 3C0680AB */ lui $a2, %hi(D_80AAFBE8) ## $a2 = 80AB0000 /* 00AA4 80AAF8F4 24C6FBE8 */ addiu $a2, $a2, %lo(D_80AAFBE8) ## $a2 = 80AAFBE8 /* 00AA8 80AAF8F8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00AAC 80AAF8FC 2407027A */ addiu $a3, $zero, 0x027A ## $a3 = 0000027A -/* 00AB0 80AAF900 0C031AB1 */ jal func_800C6AC4 -/* 00AB4 80AAF904 AFA50048 */ sw $a1, 0x0048($sp) -/* 00AB8 80AAF908 8FAF0054 */ lw $t7, 0x0054($sp) -/* 00ABC 80AAF90C 0C024F46 */ jal func_80093D18 +/* 00AB0 80AAF900 0C031AB1 */ jal func_800C6AC4 +/* 00AB4 80AAF904 AFA50048 */ sw $a1, 0x0048($sp) +/* 00AB8 80AAF908 8FAF0054 */ lw $t7, 0x0054($sp) +/* 00ABC 80AAF90C 0C024F46 */ jal func_80093D18 /* 00AC0 80AAF910 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00AC4 80AAF914 8FA50048 */ lw $a1, 0x0048($sp) +/* 00AC4 80AAF914 8FA50048 */ lw $a1, 0x0048($sp) /* 00AC8 80AAF918 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00ACC 80AAF91C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00AD0 80AAF920 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,42 +26,42 @@ glabel EnMm2_Draw /* 00AE8 80AAF938 8E0801E0 */ lw $t0, 0x01E0($s0) ## 000001E0 /* 00AEC 80AAF93C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00AF0 80AAF940 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00AF4 80AAF944 00084880 */ sll $t1, $t0, 2 -/* 00AF8 80AAF948 00892021 */ addu $a0, $a0, $t1 -/* 00AFC 80AAF94C 8C84FB60 */ lw $a0, %lo(D_80AAFB60)($a0) +/* 00AF4 80AAF944 00084880 */ sll $t1, $t0, 2 +/* 00AF8 80AAF948 00892021 */ addu $a0, $a0, $t1 +/* 00AFC 80AAF94C 8C84FB60 */ lw $a0, %lo(D_80AAFB60)($a0) /* 00B00 80AAF950 3C0880AB */ lui $t0, %hi(func_80AAFA60) ## $t0 = 80AB0000 /* 00B04 80AAF954 3C1980AB */ lui $t9, %hi(func_80AAF9D8) ## $t9 = 80AB0000 -/* 00B08 80AAF958 00045900 */ sll $t3, $a0, 4 -/* 00B0C 80AAF95C 000B6702 */ srl $t4, $t3, 28 -/* 00B10 80AAF960 000C6880 */ sll $t5, $t4, 2 -/* 00B14 80AAF964 01CD7021 */ addu $t6, $t6, $t5 +/* 00B08 80AAF958 00045900 */ sll $t3, $a0, 4 +/* 00B0C 80AAF95C 000B6702 */ srl $t4, $t3, 28 +/* 00B10 80AAF960 000C6880 */ sll $t5, $t4, 2 +/* 00B14 80AAF964 01CD7021 */ addu $t6, $t6, $t5 /* 00B18 80AAF968 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 00B1C 80AAF96C 00815024 */ and $t2, $a0, $at +/* 00B1C 80AAF96C 00815024 */ and $t2, $a0, $at /* 00B20 80AAF970 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00B24 80AAF974 014E7821 */ addu $t7, $t2, $t6 -/* 00B28 80AAF978 01E1C021 */ addu $t8, $t7, $at +/* 00B24 80AAF974 014E7821 */ addu $t7, $t2, $t6 +/* 00B28 80AAF978 01E1C021 */ addu $t8, $t7, $at /* 00B2C 80AAF97C AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 00B30 80AAF980 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 00B34 80AAF984 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 00B38 80AAF988 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 00B3C 80AAF98C 2739F9D8 */ addiu $t9, $t9, %lo(func_80AAF9D8) ## $t9 = 80AAF9D8 /* 00B40 80AAF990 2508FA60 */ addiu $t0, $t0, %lo(func_80AAFA60) ## $t0 = 80AAFA60 -/* 00B44 80AAF994 AFA80014 */ sw $t0, 0x0014($sp) -/* 00B48 80AAF998 AFB90010 */ sw $t9, 0x0010($sp) -/* 00B4C 80AAF99C AFB00018 */ sw $s0, 0x0018($sp) -/* 00B50 80AAF9A0 0C0286B2 */ jal func_800A1AC8 -/* 00B54 80AAF9A4 8FA40054 */ lw $a0, 0x0054($sp) -/* 00B58 80AAF9A8 8FA90054 */ lw $t1, 0x0054($sp) +/* 00B44 80AAF994 AFA80014 */ sw $t0, 0x0014($sp) +/* 00B48 80AAF998 AFB90010 */ sw $t9, 0x0010($sp) +/* 00B4C 80AAF99C AFB00018 */ sw $s0, 0x0018($sp) +/* 00B50 80AAF9A0 0C0286B2 */ jal SkelAnime_DrawSV +/* 00B54 80AAF9A4 8FA40054 */ lw $a0, 0x0054($sp) +/* 00B58 80AAF9A8 8FA90054 */ lw $t1, 0x0054($sp) /* 00B5C 80AAF9AC 3C0680AB */ lui $a2, %hi(D_80AAFBF8) ## $a2 = 80AB0000 /* 00B60 80AAF9B0 24C6FBF8 */ addiu $a2, $a2, %lo(D_80AAFBF8) ## $a2 = 80AAFBF8 /* 00B64 80AAF9B4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00B68 80AAF9B8 2407028E */ addiu $a3, $zero, 0x028E ## $a3 = 0000028E -/* 00B6C 80AAF9BC 0C031AD5 */ jal func_800C6B54 +/* 00B6C 80AAF9BC 0C031AD5 */ jal func_800C6B54 /* 00B70 80AAF9C0 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 00B74 80AAF9C4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B78 80AAF9C8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00B74 80AAF9C4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B78 80AAF9C8 8FB00028 */ lw $s0, 0x0028($sp) /* 00B7C 80AAF9CC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00B80 80AAF9D0 03E00008 */ jr $ra +/* 00B80 80AAF9D0 03E00008 */ jr $ra /* 00B84 80AAF9D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s index ddc3152ebc..a0be045d12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s @@ -1,66 +1,66 @@ glabel EnMm2_Init /* 001EC 80AAF03C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 001F0 80AAF040 AFA50044 */ sw $a1, 0x0044($sp) -/* 001F4 80AAF044 AFBF002C */ sw $ra, 0x002C($sp) -/* 001F8 80AAF048 AFB00028 */ sw $s0, 0x0028($sp) +/* 001F0 80AAF040 AFA50044 */ sw $a1, 0x0044($sp) +/* 001F4 80AAF044 AFBF002C */ sw $ra, 0x002C($sp) +/* 001F8 80AAF048 AFB00028 */ sw $s0, 0x0028($sp) /* 001FC 80AAF04C 3C0580AB */ lui $a1, %hi(D_80AAFB5C) ## $a1 = 80AB0000 /* 00200 80AAF050 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00204 80AAF054 0C01E037 */ jal Actor_ProcessInitChain - + /* 00208 80AAF058 24A5FB5C */ addiu $a1, $a1, %lo(D_80AAFB5C) ## $a1 = 80AAFB5C /* 0020C 80AAF05C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00210 80AAF060 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00214 80AAF064 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00218 80AAF068 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0021C 80AAF06C 0C00AC78 */ jal ActorShape_Init - + /* 00220 80AAF070 3C0741A8 */ lui $a3, 0x41A8 ## $a3 = 41A80000 /* 00224 80AAF074 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00228 80AAF078 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0022C 80AAF07C 260E01FC */ addiu $t6, $s0, 0x01FC ## $t6 = 000001FC /* 00230 80AAF080 260F025C */ addiu $t7, $s0, 0x025C ## $t7 = 0000025C /* 00234 80AAF084 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 00238 80AAF088 AFB80018 */ sw $t8, 0x0018($sp) -/* 0023C 80AAF08C AFAF0014 */ sw $t7, 0x0014($sp) -/* 00240 80AAF090 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00238 80AAF088 AFB80018 */ sw $t8, 0x0018($sp) +/* 0023C 80AAF08C AFAF0014 */ sw $t7, 0x0014($sp) +/* 00240 80AAF090 AFAE0010 */ sw $t6, 0x0010($sp) /* 00244 80AAF094 24C65E18 */ addiu $a2, $a2, 0x5E18 ## $a2 = 06005E18 -/* 00248 80AAF098 AFA50030 */ sw $a1, 0x0030($sp) -/* 0024C 80AAF09C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00250 80AAF0A0 0C0291BE */ jal func_800A46F8 +/* 00248 80AAF098 AFA50030 */ sw $a1, 0x0030($sp) +/* 0024C 80AAF09C 8FA40044 */ lw $a0, 0x0044($sp) +/* 00250 80AAF0A0 0C0291BE */ jal SkelAnime_InitSV /* 00254 80AAF0A4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00258 80AAF0A8 3C0380AB */ lui $v1, %hi(D_80AAFAEC) ## $v1 = 80AB0000 /* 0025C 80AAF0AC 2463FAEC */ addiu $v1, $v1, %lo(D_80AAFAEC) ## $v1 = 80AAFAEC /* 00260 80AAF0B0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00264 80AAF0B4 8C640020 */ lw $a0, 0x0020($v1) ## 80AAFB0C /* 00268 80AAF0B8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0026C 80AAF0BC 3C0380AB */ lui $v1, %hi(D_80AAFAEC) ## $v1 = 80AB0000 /* 00270 80AAF0C0 2463FAEC */ addiu $v1, $v1, %lo(D_80AAFAEC) ## $v1 = 80AAFAEC -/* 00274 80AAF0C4 468021A0 */ cvt.s.w $f6, $f4 +/* 00274 80AAF0C4 468021A0 */ cvt.s.w $f6, $f4 /* 00278 80AAF0C8 90790028 */ lbu $t9, 0x0028($v1) ## 80AAFB14 /* 0027C 80AAF0CC C468002C */ lwc1 $f8, 0x002C($v1) ## 80AAFB18 /* 00280 80AAF0D0 8C650020 */ lw $a1, 0x0020($v1) ## 80AAFB0C -/* 00284 80AAF0D4 8FA40030 */ lw $a0, 0x0030($sp) +/* 00284 80AAF0D4 8FA40030 */ lw $a0, 0x0030($sp) /* 00288 80AAF0D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0028C 80AAF0DC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0028C 80AAF0DC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00290 80AAF0E0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00294 80AAF0E4 AFB90014 */ sw $t9, 0x0014($sp) +/* 00294 80AAF0E4 AFB90014 */ sw $t9, 0x0014($sp) /* 00298 80AAF0E8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0029C 80AAF0EC E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 0029C 80AAF0EC E7A80018 */ swc1 $f8, 0x0018($sp) /* 002A0 80AAF0F0 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 002A4 80AAF0F4 AE0801F8 */ sw $t0, 0x01F8($s0) ## 000001F8 /* 002A8 80AAF0F8 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 002AC 80AAF0FC AFA50030 */ sw $a1, 0x0030($sp) +/* 002AC 80AAF0FC AFA50030 */ sw $a1, 0x0030($sp) /* 002B0 80AAF100 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 002B4 80AAF104 8FA40044 */ lw $a0, 0x0044($sp) + +/* 002B4 80AAF104 8FA40044 */ lw $a0, 0x0044($sp) /* 002B8 80AAF108 3C0780AB */ lui $a3, %hi(D_80AAFAC0) ## $a3 = 80AB0000 -/* 002BC 80AAF10C 8FA50030 */ lw $a1, 0x0030($sp) +/* 002BC 80AAF10C 8FA50030 */ lw $a1, 0x0030($sp) /* 002C0 80AAF110 24E7FAC0 */ addiu $a3, $a3, %lo(D_80AAFAC0) ## $a3 = 80AAFAC0 -/* 002C4 80AAF114 8FA40044 */ lw $a0, 0x0044($sp) +/* 002C4 80AAF114 8FA40044 */ lw $a0, 0x0044($sp) /* 002C8 80AAF118 0C01712B */ jal ActorCollider_InitCylinder - + /* 002CC 80AAF11C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002D0 80AAF120 960B01F4 */ lhu $t3, 0x01F4($s0) ## 000001F4 /* 002D4 80AAF124 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 @@ -74,16 +74,16 @@ glabel EnMm2_Init /* 002F4 80AAF144 AE0001E0 */ sw $zero, 0x01E0($s0) ## 000001E0 /* 002F8 80AAF148 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F /* 002FC 80AAF14C A60C01F4 */ sh $t4, 0x01F4($s0) ## 000001F4 -/* 00300 80AAF150 15A10005 */ bne $t5, $at, .L80AAF168 +/* 00300 80AAF150 15A10005 */ bne $t5, $at, .L80AAF168 /* 00304 80AAF154 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 00308 80AAF158 3C0E80AB */ lui $t6, %hi(func_80AAF668) ## $t6 = 80AB0000 /* 0030C 80AAF15C 25CEF668 */ addiu $t6, $t6, %lo(func_80AAF668) ## $t6 = 80AAF668 -/* 00310 80AAF160 10000007 */ beq $zero, $zero, .L80AAF180 +/* 00310 80AAF160 10000007 */ beq $zero, $zero, .L80AAF180 /* 00314 80AAF164 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 .L80AAF168: /* 00318 80AAF168 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0031C 80AAF16C 0C2ABBDC */ jal func_80AAEF70 -/* 00320 80AAF170 8FA50044 */ lw $a1, 0x0044($sp) +/* 0031C 80AAF16C 0C2ABBDC */ jal func_80AAEF70 +/* 00320 80AAF170 8FA50044 */ lw $a1, 0x0044($sp) /* 00324 80AAF174 3C0F80AB */ lui $t7, %hi(func_80AAF57C) ## $t7 = 80AB0000 /* 00328 80AAF178 25EFF57C */ addiu $t7, $t7, %lo(func_80AAF57C) ## $t7 = 80AAF57C /* 0032C 80AAF17C AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 @@ -91,39 +91,39 @@ glabel EnMm2_Init /* 00330 80AAF180 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00334 80AAF184 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 00338 80AAF188 8C580004 */ lw $t8, 0x0004($v0) ## 8015E664 -/* 0033C 80AAF18C 53000006 */ beql $t8, $zero, .L80AAF1A8 +/* 0033C 80AAF18C 53000006 */ beql $t8, $zero, .L80AAF1A8 /* 00340 80AAF190 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 00344 80AAF194 0C00B55C */ jal Actor_Kill - + /* 00348 80AAF198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0034C 80AAF19C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00350 80AAF1A0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 00354 80AAF1A4 8619001C */ lh $t9, 0x001C($s0) ## 0000001C .L80AAF1A8: /* 00358 80AAF1A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0035C 80AAF1AC 5721000F */ bnel $t9, $at, .L80AAF1EC -/* 00360 80AAF1B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0035C 80AAF1AC 5721000F */ bnel $t9, $at, .L80AAF1EC +/* 00360 80AAF1B0 8FBF002C */ lw $ra, 0x002C($sp) /* 00364 80AAF1B4 94480F26 */ lhu $t0, 0x0F26($v0) ## 8015F586 /* 00368 80AAF1B8 3C0480AB */ lui $a0, %hi(D_80AAFB80) ## $a0 = 80AB0000 /* 0036C 80AAF1BC 31098000 */ andi $t1, $t0, 0x8000 ## $t1 = 00000000 -/* 00370 80AAF1C0 11200005 */ beq $t1, $zero, .L80AAF1D8 +/* 00370 80AAF1C0 11200005 */ beq $t1, $zero, .L80AAF1D8 /* 00374 80AAF1C4 00000000 */ nop /* 00378 80AAF1C8 944A13FC */ lhu $t2, 0x13FC($v0) ## 8015FA5C /* 0037C 80AAF1CC 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 00380 80AAF1D0 55600006 */ bnel $t3, $zero, .L80AAF1EC -/* 00384 80AAF1D4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00380 80AAF1D0 55600006 */ bnel $t3, $zero, .L80AAF1EC +/* 00384 80AAF1D4 8FBF002C */ lw $ra, 0x002C($sp) .L80AAF1D8: /* 00388 80AAF1D8 0C00084C */ jal osSyncPrintf - + /* 0038C 80AAF1DC 2484FB80 */ addiu $a0, $a0, %lo(D_80AAFB80) ## $a0 = 80AAFB80 /* 00390 80AAF1E0 0C00B55C */ jal Actor_Kill - + /* 00394 80AAF1E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00398 80AAF1E8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00398 80AAF1E8 8FBF002C */ lw $ra, 0x002C($sp) .L80AAF1EC: -/* 0039C 80AAF1EC 8FB00028 */ lw $s0, 0x0028($sp) +/* 0039C 80AAF1EC 8FB00028 */ lw $s0, 0x0028($sp) /* 003A0 80AAF1F0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 003A4 80AAF1F4 03E00008 */ jr $ra +/* 003A4 80AAF1F4 03E00008 */ jr $ra /* 003A8 80AAF1F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Destroy.s index ae2949c948..dec17fc631 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Destroy.s @@ -1,11 +1,11 @@ glabel EnMu_Destroy /* 002E4 80AB0704 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002E8 80AB0708 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002EC 80AB070C 0C0295BC */ jal func_800A56F0 +/* 002E8 80AB0708 AFBF0014 */ sw $ra, 0x0014($sp) +/* 002EC 80AB070C 0C0295BC */ jal SkelAnime_Free /* 002F0 80AB0710 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002F4 80AB0714 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002F4 80AB0714 8FBF0014 */ lw $ra, 0x0014($sp) /* 002F8 80AB0718 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002FC 80AB071C 03E00008 */ jr $ra +/* 002FC 80AB071C 03E00008 */ jr $ra /* 00300 80AB0720 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s index 2688e83804..d59f000feb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s @@ -1,20 +1,20 @@ glabel EnMu_Draw /* 005F4 80AB0A14 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 -/* 005F8 80AB0A18 AFB70044 */ sw $s7, 0x0044($sp) +/* 005F8 80AB0A18 AFB70044 */ sw $s7, 0x0044($sp) /* 005FC 80AB0A1C 3C0E80AB */ lui $t6, %hi(D_80AB0C38) ## $t6 = 80AB0000 /* 00600 80AB0A20 27B70084 */ addiu $s7, $sp, 0x0084 ## $s7 = FFFFFFD4 -/* 00604 80AB0A24 AFBE0048 */ sw $s8, 0x0048($sp) -/* 00608 80AB0A28 AFB60040 */ sw $s6, 0x0040($sp) +/* 00604 80AB0A24 AFBE0048 */ sw $s8, 0x0048($sp) +/* 00608 80AB0A28 AFB60040 */ sw $s6, 0x0040($sp) /* 0060C 80AB0A2C 25CE0C38 */ addiu $t6, $t6, %lo(D_80AB0C38) ## $t6 = 80AB0C38 /* 00610 80AB0A30 0080B025 */ or $s6, $a0, $zero ## $s6 = 00000000 /* 00614 80AB0A34 00A0F025 */ or $s8, $a1, $zero ## $s8 = 00000000 -/* 00618 80AB0A38 AFBF004C */ sw $ra, 0x004C($sp) -/* 0061C 80AB0A3C AFB5003C */ sw $s5, 0x003C($sp) -/* 00620 80AB0A40 AFB40038 */ sw $s4, 0x0038($sp) -/* 00624 80AB0A44 AFB30034 */ sw $s3, 0x0034($sp) -/* 00628 80AB0A48 AFB20030 */ sw $s2, 0x0030($sp) -/* 0062C 80AB0A4C AFB1002C */ sw $s1, 0x002C($sp) -/* 00630 80AB0A50 AFB00028 */ sw $s0, 0x0028($sp) +/* 00618 80AB0A38 AFBF004C */ sw $ra, 0x004C($sp) +/* 0061C 80AB0A3C AFB5003C */ sw $s5, 0x003C($sp) +/* 00620 80AB0A40 AFB40038 */ sw $s4, 0x0038($sp) +/* 00624 80AB0A44 AFB30034 */ sw $s3, 0x0034($sp) +/* 00628 80AB0A48 AFB20030 */ sw $s2, 0x0030($sp) +/* 0062C 80AB0A4C AFB1002C */ sw $s1, 0x002C($sp) +/* 00630 80AB0A50 AFB00028 */ sw $s0, 0x0028($sp) /* 00634 80AB0A54 25C80024 */ addiu $t0, $t6, 0x0024 ## $t0 = 80AB0C5C /* 00638 80AB0A58 02E0C825 */ or $t9, $s7, $zero ## $t9 = FFFFFFD4 .L80AB0A5C: @@ -25,7 +25,7 @@ glabel EnMu_Draw /* 0064C 80AB0A6C 8DCFFFF8 */ lw $t7, -0x0008($t6) ## 80AB0C3C /* 00650 80AB0A70 AF2FFFF8 */ sw $t7, -0x0008($t9) ## FFFFFFD8 /* 00654 80AB0A74 8DD8FFFC */ lw $t8, -0x0004($t6) ## 80AB0C40 -/* 00658 80AB0A78 15C8FFF8 */ bne $t6, $t0, .L80AB0A5C +/* 00658 80AB0A78 15C8FFF8 */ bne $t6, $t0, .L80AB0A5C /* 0065C 80AB0A7C AF38FFFC */ sw $t8, -0x0004($t9) ## FFFFFFDC /* 00660 80AB0A80 8DD80000 */ lw $t8, 0x0000($t6) ## 80AB0C44 /* 00664 80AB0A84 3C0A80AB */ lui $t2, %hi(D_80AB0C60) ## $t2 = 80AB0000 @@ -41,13 +41,13 @@ glabel EnMu_Draw /* 0068C 80AB0AAC A12C0004 */ sb $t4, 0x0004($t1) ## FFFFFFD0 /* 00690 80AB0AB0 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 /* 00694 80AB0AB4 24070202 */ addiu $a3, $zero, 0x0202 ## $a3 = 00000202 -/* 00698 80AB0AB8 0C031AB1 */ jal func_800C6AC4 +/* 00698 80AB0AB8 0C031AB1 */ jal func_800C6AC4 /* 0069C 80AB0ABC 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 006A0 80AB0AC0 3C01C496 */ lui $at, 0xC496 ## $at = C4960000 /* 006A4 80AB0AC4 44816000 */ mtc1 $at, $f12 ## $f12 = -1200.00 /* 006A8 80AB0AC8 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 /* 006AC 80AB0ACC 3C06C4AF */ lui $a2, 0xC4AF ## $a2 = C4AF0000 -/* 006B0 80AB0AD0 0C034261 */ jal Matrix_Translate +/* 006B0 80AB0AD0 0C034261 */ jal Matrix_Translate /* 006B4 80AB0AD4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 006B8 80AB0AD8 27B1007C */ addiu $s1, $sp, 0x007C ## $s1 = FFFFFFCC /* 006BC 80AB0ADC 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 @@ -58,26 +58,26 @@ glabel EnMu_Draw /* 006CC 80AB0AEC 264D0008 */ addiu $t5, $s2, 0x0008 ## $t5 = 00000008 /* 006D0 80AB0AF0 AE6D02C0 */ sw $t5, 0x02C0($s3) ## 000002C0 /* 006D4 80AB0AF4 92280000 */ lbu $t0, 0x0000($s1) ## FFFFFFCC -/* 006D8 80AB0AF8 00087080 */ sll $t6, $t0, 2 +/* 006D8 80AB0AF8 00087080 */ sll $t6, $t0, 2 /* 006DC 80AB0AFC 31D9FFFF */ andi $t9, $t6, 0xFFFF ## $t9 = 00000000 /* 006E0 80AB0B00 03347825 */ or $t7, $t9, $s4 ## $t7 = DB060000 /* 006E4 80AB0B04 AE4F0000 */ sw $t7, 0x0000($s2) ## 00000000 /* 006E8 80AB0B08 86D8001C */ lh $t8, 0x001C($s6) ## 0000001C /* 006EC 80AB0B0C 8FC40000 */ lw $a0, 0x0000($s8) ## 00000000 -/* 006F0 80AB0B10 00184880 */ sll $t1, $t8, 2 -/* 006F4 80AB0B14 01384821 */ addu $t1, $t1, $t8 -/* 006F8 80AB0B18 00094880 */ sll $t1, $t1, 2 -/* 006FC 80AB0B1C 02E95021 */ addu $t2, $s7, $t1 -/* 00700 80AB0B20 01501021 */ addu $v0, $t2, $s0 +/* 006F0 80AB0B10 00184880 */ sll $t1, $t8, 2 +/* 006F4 80AB0B14 01384821 */ addu $t1, $t1, $t8 +/* 006F8 80AB0B18 00094880 */ sll $t1, $t1, 2 +/* 006FC 80AB0B1C 02E95021 */ addu $t2, $s7, $t1 +/* 00700 80AB0B20 01501021 */ addu $v0, $t2, $s0 /* 00704 80AB0B24 904B0003 */ lbu $t3, 0x0003($v0) ## 00000003 /* 00708 80AB0B28 90450000 */ lbu $a1, 0x0000($v0) ## 00000000 /* 0070C 80AB0B2C 90460001 */ lbu $a2, 0x0001($v0) ## 00000001 /* 00710 80AB0B30 90470002 */ lbu $a3, 0x0002($v0) ## 00000002 -/* 00714 80AB0B34 0C2AC26A */ jal func_80AB09A8 -/* 00718 80AB0B38 AFAB0010 */ sw $t3, 0x0010($sp) +/* 00714 80AB0B34 0C2AC26A */ jal func_80AB09A8 +/* 00718 80AB0B38 AFAB0010 */ sw $t3, 0x0010($sp) /* 0071C 80AB0B3C 26100004 */ addiu $s0, $s0, 0x0004 ## $s0 = 00000004 /* 00720 80AB0B40 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = FFFFFFCD -/* 00724 80AB0B44 1615FFE8 */ bne $s0, $s5, .L80AB0AE8 +/* 00724 80AB0B44 1615FFE8 */ bne $s0, $s5, .L80AB0AE8 /* 00728 80AB0B48 AE420004 */ sw $v0, 0x0004($s2) ## 00000004 /* 0072C 80AB0B4C 8EC50150 */ lw $a1, 0x0150($s6) ## 00000150 /* 00730 80AB0B50 8EC6016C */ lw $a2, 0x016C($s6) ## 0000016C @@ -86,28 +86,28 @@ glabel EnMu_Draw /* 0073C 80AB0B5C 3C0D80AB */ lui $t5, %hi(func_80AB0994) ## $t5 = 80AB0000 /* 00740 80AB0B60 25AD0994 */ addiu $t5, $t5, %lo(func_80AB0994) ## $t5 = 80AB0994 /* 00744 80AB0B64 258C08A4 */ addiu $t4, $t4, %lo(func_80AB08A4) ## $t4 = 80AB08A4 -/* 00748 80AB0B68 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0074C 80AB0B6C AFAD0014 */ sw $t5, 0x0014($sp) -/* 00750 80AB0B70 AFB60018 */ sw $s6, 0x0018($sp) -/* 00754 80AB0B74 0C0286B2 */ jal func_800A1AC8 +/* 00748 80AB0B68 AFAC0010 */ sw $t4, 0x0010($sp) +/* 0074C 80AB0B6C AFAD0014 */ sw $t5, 0x0014($sp) +/* 00750 80AB0B70 AFB60018 */ sw $s6, 0x0018($sp) +/* 00754 80AB0B74 0C0286B2 */ jal SkelAnime_DrawSV /* 00758 80AB0B78 03C02025 */ or $a0, $s8, $zero ## $a0 = 00000000 /* 0075C 80AB0B7C 3C0680AB */ lui $a2, %hi(D_80AB0C80) ## $a2 = 80AB0000 /* 00760 80AB0B80 24C60C80 */ addiu $a2, $a2, %lo(D_80AB0C80) ## $a2 = 80AB0C80 /* 00764 80AB0B84 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFB4 /* 00768 80AB0B88 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 0076C 80AB0B8C 0C031AD5 */ jal func_800C6B54 +/* 0076C 80AB0B8C 0C031AD5 */ jal func_800C6B54 /* 00770 80AB0B90 24070216 */ addiu $a3, $zero, 0x0216 ## $a3 = 00000216 -/* 00774 80AB0B94 8FBF004C */ lw $ra, 0x004C($sp) -/* 00778 80AB0B98 8FB00028 */ lw $s0, 0x0028($sp) -/* 0077C 80AB0B9C 8FB1002C */ lw $s1, 0x002C($sp) -/* 00780 80AB0BA0 8FB20030 */ lw $s2, 0x0030($sp) -/* 00784 80AB0BA4 8FB30034 */ lw $s3, 0x0034($sp) -/* 00788 80AB0BA8 8FB40038 */ lw $s4, 0x0038($sp) -/* 0078C 80AB0BAC 8FB5003C */ lw $s5, 0x003C($sp) -/* 00790 80AB0BB0 8FB60040 */ lw $s6, 0x0040($sp) -/* 00794 80AB0BB4 8FB70044 */ lw $s7, 0x0044($sp) -/* 00798 80AB0BB8 8FBE0048 */ lw $s8, 0x0048($sp) -/* 0079C 80AB0BBC 03E00008 */ jr $ra +/* 00774 80AB0B94 8FBF004C */ lw $ra, 0x004C($sp) +/* 00778 80AB0B98 8FB00028 */ lw $s0, 0x0028($sp) +/* 0077C 80AB0B9C 8FB1002C */ lw $s1, 0x002C($sp) +/* 00780 80AB0BA0 8FB20030 */ lw $s2, 0x0030($sp) +/* 00784 80AB0BA4 8FB30034 */ lw $s3, 0x0034($sp) +/* 00788 80AB0BA8 8FB40038 */ lw $s4, 0x0038($sp) +/* 0078C 80AB0BAC 8FB5003C */ lw $s5, 0x003C($sp) +/* 00790 80AB0BB0 8FB60040 */ lw $s6, 0x0040($sp) +/* 00794 80AB0BB4 8FB70044 */ lw $s7, 0x0044($sp) +/* 00798 80AB0BB8 8FBE0048 */ lw $s8, 0x0048($sp) +/* 0079C 80AB0BBC 03E00008 */ jr $ra /* 007A0 80AB0BC0 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 /* 007A4 80AB0BC4 00000000 */ nop /* 007A8 80AB0BC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s index b3f5fa28f0..bb06fb3f36 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s @@ -1,61 +1,61 @@ glabel EnMu_Init /* 0020C 80AB062C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00210 80AB0630 AFB00028 */ sw $s0, 0x0028($sp) +/* 00210 80AB0630 AFB00028 */ sw $s0, 0x0028($sp) /* 00214 80AB0634 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00218 80AB0638 AFBF002C */ sw $ra, 0x002C($sp) -/* 0021C 80AB063C AFA50044 */ sw $a1, 0x0044($sp) +/* 00218 80AB0638 AFBF002C */ sw $ra, 0x002C($sp) +/* 0021C 80AB063C AFA50044 */ sw $a1, 0x0044($sp) /* 00220 80AB0640 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00224 80AB0644 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00228 80AB0648 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0022C 80AB064C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00230 80AB0650 0C00AC78 */ jal ActorShape_Init - + /* 00234 80AB0654 3C074320 */ lui $a3, 0x4320 ## $a3 = 43200000 /* 00238 80AB0658 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0023C 80AB065C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00240 80AB0660 24E703F4 */ addiu $a3, $a3, 0x03F4 ## $a3 = 060003F4 /* 00244 80AB0664 24C64F70 */ addiu $a2, $a2, 0x4F70 ## $a2 = 06004F70 -/* 00248 80AB0668 8FA40044 */ lw $a0, 0x0044($sp) +/* 00248 80AB0668 8FA40044 */ lw $a0, 0x0044($sp) /* 0024C 80AB066C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00250 80AB0670 AFA00010 */ sw $zero, 0x0010($sp) -/* 00254 80AB0674 AFA00014 */ sw $zero, 0x0014($sp) -/* 00258 80AB0678 0C0291BE */ jal func_800A46F8 -/* 0025C 80AB067C AFA00018 */ sw $zero, 0x0018($sp) +/* 00250 80AB0670 AFA00010 */ sw $zero, 0x0010($sp) +/* 00254 80AB0674 AFA00014 */ sw $zero, 0x0014($sp) +/* 00258 80AB0678 0C0291BE */ jal SkelAnime_InitSV +/* 0025C 80AB067C AFA00018 */ sw $zero, 0x0018($sp) /* 00260 80AB0680 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00264 80AB0684 AFA50034 */ sw $a1, 0x0034($sp) +/* 00264 80AB0684 AFA50034 */ sw $a1, 0x0034($sp) /* 00268 80AB0688 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 0026C 80AB068C 8FA40044 */ lw $a0, 0x0044($sp) + +/* 0026C 80AB068C 8FA40044 */ lw $a0, 0x0044($sp) /* 00270 80AB0690 3C0780AB */ lui $a3, %hi(D_80AB0BD0) ## $a3 = 80AB0000 -/* 00274 80AB0694 8FA50034 */ lw $a1, 0x0034($sp) +/* 00274 80AB0694 8FA50034 */ lw $a1, 0x0034($sp) /* 00278 80AB0698 24E70BD0 */ addiu $a3, $a3, %lo(D_80AB0BD0) ## $a3 = 80AB0BD0 -/* 0027C 80AB069C 8FA40044 */ lw $a0, 0x0044($sp) +/* 0027C 80AB069C 8FA40044 */ lw $a0, 0x0044($sp) /* 00280 80AB06A0 0C01712B */ jal ActorCollider_InitCylinder - + /* 00284 80AB06A4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00288 80AB06A8 3C0680AB */ lui $a2, %hi(D_80AB0BFC) ## $a2 = 80AB0000 /* 0028C 80AB06AC 24C60BFC */ addiu $a2, $a2, %lo(D_80AB0BFC) ## $a2 = 80AB0BFC /* 00290 80AB06B0 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00294 80AB06B4 0C0187BF */ jal func_80061EFC +/* 00294 80AB06B4 0C0187BF */ jal func_80061EFC /* 00298 80AB06B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0029C 80AB06BC 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 002A0 80AB06C0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 002A4 80AB06C4 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F /* 002A8 80AB06C8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 002AC 80AB06CC 0C00B58B */ jal Actor_SetScale - + /* 002B0 80AB06D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002B4 80AB06D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002B8 80AB06D8 0C2AC10A */ jal func_80AB0428 -/* 002BC 80AB06DC 8FA50044 */ lw $a1, 0x0044($sp) +/* 002B8 80AB06D8 0C2AC10A */ jal func_80AB0428 +/* 002BC 80AB06DC 8FA50044 */ lw $a1, 0x0044($sp) /* 002C0 80AB06E0 3C0580AB */ lui $a1, %hi(func_80AB0724) ## $a1 = 80AB0000 /* 002C4 80AB06E4 24A50724 */ addiu $a1, $a1, %lo(func_80AB0724) ## $a1 = 80AB0724 -/* 002C8 80AB06E8 0C2AC108 */ jal func_80AB0420 +/* 002C8 80AB06E8 0C2AC108 */ jal func_80AB0420 /* 002CC 80AB06EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002D0 80AB06F0 8FBF002C */ lw $ra, 0x002C($sp) -/* 002D4 80AB06F4 8FB00028 */ lw $s0, 0x0028($sp) +/* 002D0 80AB06F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 002D4 80AB06F4 8FB00028 */ lw $s0, 0x0028($sp) /* 002D8 80AB06F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 002DC 80AB06FC 03E00008 */ jr $ra +/* 002DC 80AB06FC 03E00008 */ jr $ra /* 002E0 80AB0700 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s index c4f3998024..2d82452039 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s @@ -1,82 +1,82 @@ glabel EnNb_Init /* 0313C 80AB3ECC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03140 80AB3ED0 AFB10028 */ sw $s1, 0x0028($sp) -/* 03144 80AB3ED4 AFB00024 */ sw $s0, 0x0024($sp) +/* 03140 80AB3ED0 AFB10028 */ sw $s1, 0x0028($sp) +/* 03144 80AB3ED4 AFB00024 */ sw $s0, 0x0024($sp) /* 03148 80AB3ED8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0314C 80AB3EDC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03150 80AB3EE0 AFBF002C */ sw $ra, 0x002C($sp) +/* 03150 80AB3EE0 AFBF002C */ sw $ra, 0x002C($sp) /* 03154 80AB3EE4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 03158 80AB3EE8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0315C 80AB3EEC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03160 80AB3EF0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 03164 80AB3EF4 0C00AC78 */ jal ActorShape_Init - + /* 03168 80AB3EF8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 0316C 80AB3EFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03170 80AB3F00 0C2AC3C1 */ jal func_80AB0F04 +/* 03170 80AB3F00 0C2AC3C1 */ jal func_80AB0F04 /* 03174 80AB3F04 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 03178 80AB3F08 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 0317C 80AB3F0C 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 03180 80AB3F10 260F0202 */ addiu $t7, $s0, 0x0202 ## $t7 = 00000202 /* 03184 80AB3F14 24180013 */ addiu $t8, $zero, 0x0013 ## $t8 = 00000013 -/* 03188 80AB3F18 AFB80018 */ sw $t8, 0x0018($sp) -/* 0318C 80AB3F1C AFAF0014 */ sw $t7, 0x0014($sp) -/* 03190 80AB3F20 AFAE0010 */ sw $t6, 0x0010($sp) +/* 03188 80AB3F18 AFB80018 */ sw $t8, 0x0018($sp) +/* 0318C 80AB3F1C AFAF0014 */ sw $t7, 0x0014($sp) +/* 03190 80AB3F20 AFAE0010 */ sw $t6, 0x0010($sp) /* 03194 80AB3F24 24C681C8 */ addiu $a2, $a2, 0x81C8 ## $a2 = 060181C8 /* 03198 80AB3F28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0319C 80AB3F2C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 031A0 80AB3F30 0C0291BE */ jal func_800A46F8 +/* 031A0 80AB3F30 0C0291BE */ jal SkelAnime_InitSV /* 031A4 80AB3F34 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 031A8 80AB3F38 0C2AC368 */ jal func_80AB0DA0 +/* 031A8 80AB3F38 0C2AC368 */ jal func_80AB0DA0 /* 031AC 80AB3F3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 031B0 80AB3F40 2459FFFE */ addiu $t9, $v0, 0xFFFE ## $t9 = FFFFFFFE -/* 031B4 80AB3F44 2F210005 */ sltiu $at, $t9, 0x0005 -/* 031B8 80AB3F48 1020001F */ beq $at, $zero, .L80AB3FC8 -/* 031BC 80AB3F4C 0019C880 */ sll $t9, $t9, 2 +/* 031B4 80AB3F44 2F210005 */ sltiu $at, $t9, 0x0005 +/* 031B8 80AB3F48 1020001F */ beq $at, $zero, .L80AB3FC8 +/* 031BC 80AB3F4C 0019C880 */ sll $t9, $t9, 2 /* 031C0 80AB3F50 3C0180AB */ lui $at, %hi(jtbl_80AB5244) ## $at = 80AB0000 -/* 031C4 80AB3F54 00390821 */ addu $at, $at, $t9 -/* 031C8 80AB3F58 8C395244 */ lw $t9, %lo(jtbl_80AB5244)($at) -/* 031CC 80AB3F5C 03200008 */ jr $t9 +/* 031C4 80AB3F54 00390821 */ addu $at, $at, $t9 +/* 031C8 80AB3F58 8C395244 */ lw $t9, %lo(jtbl_80AB5244)($at) +/* 031CC 80AB3F5C 03200008 */ jr $t9 /* 031D0 80AB3F60 00000000 */ nop glabel L80AB3F64 /* 031D4 80AB3F64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031D8 80AB3F68 0C2AC68B */ jal func_80AB1A2C +/* 031D8 80AB3F68 0C2AC68B */ jal func_80AB1A2C /* 031DC 80AB3F6C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 031E0 80AB3F70 10000019 */ beq $zero, $zero, .L80AB3FD8 -/* 031E4 80AB3F74 8FBF002C */ lw $ra, 0x002C($sp) +/* 031E0 80AB3F70 10000019 */ beq $zero, $zero, .L80AB3FD8 +/* 031E4 80AB3F74 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AB3F78 /* 031E8 80AB3F78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031EC 80AB3F7C 0C2AC7E9 */ jal func_80AB1FA4 +/* 031EC 80AB3F7C 0C2AC7E9 */ jal func_80AB1FA4 /* 031F0 80AB3F80 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 031F4 80AB3F84 10000014 */ beq $zero, $zero, .L80AB3FD8 -/* 031F8 80AB3F88 8FBF002C */ lw $ra, 0x002C($sp) +/* 031F4 80AB3F84 10000014 */ beq $zero, $zero, .L80AB3FD8 +/* 031F8 80AB3F88 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AB3F8C /* 031FC 80AB3F8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03200 80AB3F90 0C2AC921 */ jal func_80AB2484 +/* 03200 80AB3F90 0C2AC921 */ jal func_80AB2484 /* 03204 80AB3F94 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03208 80AB3F98 1000000F */ beq $zero, $zero, .L80AB3FD8 -/* 0320C 80AB3F9C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03208 80AB3F98 1000000F */ beq $zero, $zero, .L80AB3FD8 +/* 0320C 80AB3F9C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AB3FA0 /* 03210 80AB3FA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03214 80AB3FA4 0C2ACC54 */ jal func_80AB3150 +/* 03214 80AB3FA4 0C2ACC54 */ jal func_80AB3150 /* 03218 80AB3FA8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0321C 80AB3FAC 1000000A */ beq $zero, $zero, .L80AB3FD8 -/* 03220 80AB3FB0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0321C 80AB3FAC 1000000A */ beq $zero, $zero, .L80AB3FD8 +/* 03220 80AB3FB0 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AB3FB4 /* 03224 80AB3FB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03228 80AB3FB8 0C2ACD2A */ jal func_80AB34A8 +/* 03228 80AB3FB8 0C2ACD2A */ jal func_80AB34A8 /* 0322C 80AB3FBC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03230 80AB3FC0 10000005 */ beq $zero, $zero, .L80AB3FD8 -/* 03234 80AB3FC4 8FBF002C */ lw $ra, 0x002C($sp) +/* 03230 80AB3FC0 10000005 */ beq $zero, $zero, .L80AB3FD8 +/* 03234 80AB3FC4 8FBF002C */ lw $ra, 0x002C($sp) .L80AB3FC8: /* 03238 80AB3FC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0323C 80AB3FCC 0C2AC54C */ jal func_80AB1530 +/* 0323C 80AB3FCC 0C2AC54C */ jal func_80AB1530 /* 03240 80AB3FD0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03244 80AB3FD4 8FBF002C */ lw $ra, 0x002C($sp) +/* 03244 80AB3FD4 8FBF002C */ lw $ra, 0x002C($sp) .L80AB3FD8: -/* 03248 80AB3FD8 8FB00024 */ lw $s0, 0x0024($sp) -/* 0324C 80AB3FDC 8FB10028 */ lw $s1, 0x0028($sp) -/* 03250 80AB3FE0 03E00008 */ jr $ra +/* 03248 80AB3FD8 8FB00024 */ lw $s0, 0x0024($sp) +/* 0324C 80AB3FDC 8FB10028 */ lw $s1, 0x0028($sp) +/* 03250 80AB3FE0 03E00008 */ jr $ra /* 03254 80AB3FE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s index 6436871088..6201d6ebe9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s @@ -1,45 +1,45 @@ glabel func_80AB1E2C /* 0109C 80AB1E2C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 010A0 80AB1E30 AFBF002C */ sw $ra, 0x002C($sp) -/* 010A4 80AB1E34 AFB00028 */ sw $s0, 0x0028($sp) -/* 010A8 80AB1E38 AFA40078 */ sw $a0, 0x0078($sp) -/* 010AC 80AB1E3C AFA5007C */ sw $a1, 0x007C($sp) +/* 010A0 80AB1E30 AFBF002C */ sw $ra, 0x002C($sp) +/* 010A4 80AB1E34 AFB00028 */ sw $s0, 0x0028($sp) +/* 010A8 80AB1E38 AFA40078 */ sw $a0, 0x0078($sp) +/* 010AC 80AB1E3C AFA5007C */ sw $a1, 0x007C($sp) /* 010B0 80AB1E40 84820274 */ lh $v0, 0x0274($a0) ## 00000274 /* 010B4 80AB1E44 3C1880AB */ lui $t8, %hi(D_80AB430C) ## $t8 = 80AB0000 /* 010B8 80AB1E48 3C0680AB */ lui $a2, %hi(D_80AB5010) ## $a2 = 80AB0000 -/* 010BC 80AB1E4C 00027880 */ sll $t7, $v0, 2 -/* 010C0 80AB1E50 030FC021 */ addu $t8, $t8, $t7 -/* 010C4 80AB1E54 8F18430C */ lw $t8, %lo(D_80AB430C)($t8) +/* 010BC 80AB1E4C 00027880 */ sll $t7, $v0, 2 +/* 010C0 80AB1E50 030FC021 */ addu $t8, $t8, $t7 +/* 010C4 80AB1E54 8F18430C */ lw $t8, %lo(D_80AB430C)($t8) /* 010C8 80AB1E58 24C65010 */ addiu $a2, $a2, %lo(D_80AB5010) ## $a2 = 80AB5010 /* 010CC 80AB1E5C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 010D0 80AB1E60 AFB80068 */ sw $t8, 0x0068($sp) +/* 010D0 80AB1E60 AFB80068 */ sw $t8, 0x0068($sp) /* 010D4 80AB1E64 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 010D8 80AB1E68 24070107 */ addiu $a3, $zero, 0x0107 ## $a3 = 00000107 -/* 010DC 80AB1E6C 0C031AB1 */ jal func_800C6AC4 +/* 010DC 80AB1E6C 0C031AB1 */ jal func_800C6AC4 /* 010E0 80AB1E70 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 010E4 80AB1E74 8FA9007C */ lw $t1, 0x007C($sp) -/* 010E8 80AB1E78 0C024F61 */ jal func_80093D84 +/* 010E4 80AB1E74 8FA9007C */ lw $t1, 0x007C($sp) +/* 010E8 80AB1E78 0C024F61 */ jal func_80093D84 /* 010EC 80AB1E7C 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 010F0 80AB1E80 8FA70068 */ lw $a3, 0x0068($sp) +/* 010F0 80AB1E80 8FA70068 */ lw $a3, 0x0068($sp) /* 010F4 80AB1E84 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 010F8 80AB1E88 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 010FC 80AB1E8C 00076100 */ sll $t4, $a3, 4 -/* 01100 80AB1E90 000C6F02 */ srl $t5, $t4, 28 +/* 010FC 80AB1E8C 00076100 */ sll $t4, $a3, 4 +/* 01100 80AB1E90 000C6F02 */ srl $t5, $t4, 28 /* 01104 80AB1E94 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 01108 80AB1E98 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 0110C 80AB1E9C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 01110 80AB1EA0 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 01114 80AB1EA4 000D7080 */ sll $t6, $t5, 2 +/* 01114 80AB1EA4 000D7080 */ sll $t6, $t5, 2 /* 01118 80AB1EA8 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 0111C 80AB1EAC 01CF2021 */ addu $a0, $t6, $t7 +/* 0111C 80AB1EAC 01CF2021 */ addu $a0, $t6, $t7 /* 01120 80AB1EB0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 01124 80AB1EB4 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 01128 80AB1EB8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0112C 80AB1EBC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01130 80AB1EC0 00E12824 */ and $a1, $a3, $at +/* 01130 80AB1EC0 00E12824 */ and $a1, $a3, $at /* 01134 80AB1EC4 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 01138 80AB1EC8 0305C821 */ addu $t9, $t8, $a1 -/* 0113C 80AB1ECC 03264821 */ addu $t1, $t9, $a2 +/* 01138 80AB1EC8 0305C821 */ addu $t9, $t8, $a1 +/* 0113C 80AB1ECC 03264821 */ addu $t1, $t9, $a2 /* 01140 80AB1ED0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 01144 80AB1ED4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01148 80AB1ED8 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,11 +50,11 @@ glabel func_80AB1E2C /* 0115C 80AB1EEC 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 01160 80AB1EF0 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 /* 01164 80AB1EF4 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01168 80AB1EF8 01856821 */ addu $t5, $t4, $a1 -/* 0116C 80AB1EFC 01A67021 */ addu $t6, $t5, $a2 +/* 01168 80AB1EF8 01856821 */ addu $t5, $t4, $a1 +/* 0116C 80AB1EFC 01A67021 */ addu $t6, $t5, $a2 /* 01170 80AB1F00 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01174 80AB1F04 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01178 80AB1F08 8FA80078 */ lw $t0, 0x0078($sp) +/* 01178 80AB1F08 8FA80078 */ lw $t0, 0x0078($sp) /* 0117C 80AB1F0C 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 /* 01180 80AB1F10 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01184 80AB1F14 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 @@ -73,25 +73,25 @@ glabel func_80AB1E2C /* 011B8 80AB1F48 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 011BC 80AB1F4C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 011C0 80AB1F50 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 011C4 80AB1F54 AFA00018 */ sw $zero, 0x0018($sp) -/* 011C8 80AB1F58 AFA00014 */ sw $zero, 0x0014($sp) -/* 011CC 80AB1F5C AFA00010 */ sw $zero, 0x0010($sp) +/* 011C4 80AB1F54 AFA00018 */ sw $zero, 0x0018($sp) +/* 011C8 80AB1F58 AFA00014 */ sw $zero, 0x0014($sp) +/* 011CC 80AB1F5C AFA00010 */ sw $zero, 0x0010($sp) /* 011D0 80AB1F60 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 011D4 80AB1F64 8FA4007C */ lw $a0, 0x007C($sp) -/* 011D8 80AB1F68 0C0289CF */ jal func_800A273C -/* 011DC 80AB1F6C AFAD001C */ sw $t5, 0x001C($sp) +/* 011D4 80AB1F64 8FA4007C */ lw $a0, 0x007C($sp) +/* 011D8 80AB1F68 0C0289CF */ jal SkelAnime_DrawSV2 +/* 011DC 80AB1F6C AFAD001C */ sw $t5, 0x001C($sp) /* 011E0 80AB1F70 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 011E4 80AB1F74 8FAE007C */ lw $t6, 0x007C($sp) +/* 011E4 80AB1F74 8FAE007C */ lw $t6, 0x007C($sp) /* 011E8 80AB1F78 3C0680AB */ lui $a2, %hi(D_80AB5030) ## $a2 = 80AB0000 /* 011EC 80AB1F7C 24C65030 */ addiu $a2, $a2, %lo(D_80AB5030) ## $a2 = 80AB5030 /* 011F0 80AB1F80 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 011F4 80AB1F84 24070122 */ addiu $a3, $zero, 0x0122 ## $a3 = 00000122 -/* 011F8 80AB1F88 0C031AD5 */ jal func_800C6B54 +/* 011F8 80AB1F88 0C031AD5 */ jal func_800C6B54 /* 011FC 80AB1F8C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 01200 80AB1F90 8FBF002C */ lw $ra, 0x002C($sp) -/* 01204 80AB1F94 8FB00028 */ lw $s0, 0x0028($sp) +/* 01200 80AB1F90 8FBF002C */ lw $ra, 0x002C($sp) +/* 01204 80AB1F94 8FB00028 */ lw $s0, 0x0028($sp) /* 01208 80AB1F98 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 0120C 80AB1F9C 03E00008 */ jr $ra +/* 0120C 80AB1F9C 03E00008 */ jr $ra /* 01210 80AB1FA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s index dfbada4e54..a8fe5ce658 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s @@ -1,40 +1,40 @@ glabel func_80AB2E70 /* 020E0 80AB2E70 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 020E4 80AB2E74 AFBF0024 */ sw $ra, 0x0024($sp) -/* 020E8 80AB2E78 AFA40060 */ sw $a0, 0x0060($sp) -/* 020EC 80AB2E7C AFA50064 */ sw $a1, 0x0064($sp) +/* 020E4 80AB2E74 AFBF0024 */ sw $ra, 0x0024($sp) +/* 020E8 80AB2E78 AFA40060 */ sw $a0, 0x0060($sp) +/* 020EC 80AB2E7C AFA50064 */ sw $a1, 0x0064($sp) /* 020F0 80AB2E80 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 020F4 80AB2E84 3C0680AB */ lui $a2, %hi(D_80AB50C4) ## $a2 = 80AB0000 /* 020F8 80AB2E88 24C650C4 */ addiu $a2, $a2, %lo(D_80AB50C4) ## $a2 = 80AB50C4 /* 020FC 80AB2E8C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 02100 80AB2E90 2407023C */ addiu $a3, $zero, 0x023C ## $a3 = 0000023C -/* 02104 80AB2E94 0C031AB1 */ jal func_800C6AC4 -/* 02108 80AB2E98 AFA50054 */ sw $a1, 0x0054($sp) -/* 0210C 80AB2E9C 8FAF0064 */ lw $t7, 0x0064($sp) -/* 02110 80AB2EA0 0C024F46 */ jal func_80093D18 +/* 02104 80AB2E94 0C031AB1 */ jal func_800C6AC4 +/* 02108 80AB2E98 AFA50054 */ sw $a1, 0x0054($sp) +/* 0210C 80AB2E9C 8FAF0064 */ lw $t7, 0x0064($sp) +/* 02110 80AB2EA0 0C024F46 */ jal func_80093D18 /* 02114 80AB2EA4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 02118 80AB2EA8 8FA80054 */ lw $t0, 0x0054($sp) +/* 02118 80AB2EA8 8FA80054 */ lw $t0, 0x0054($sp) /* 0211C 80AB2EAC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02120 80AB2EB0 2484D8E8 */ addiu $a0, $a0, 0xD8E8 ## $a0 = 0600D8E8 /* 02124 80AB2EB4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02128 80AB2EB8 00044900 */ sll $t1, $a0, 4 -/* 0212C 80AB2EBC 00095702 */ srl $t2, $t1, 28 +/* 02128 80AB2EB8 00044900 */ sll $t1, $a0, 4 +/* 0212C 80AB2EBC 00095702 */ srl $t2, $t1, 28 /* 02130 80AB2EC0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 02134 80AB2EC4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 02138 80AB2EC8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 0213C 80AB2ECC 258C6FA8 */ addiu $t4, $t4, 0x6FA8 ## $t4 = 80166FA8 /* 02140 80AB2ED0 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 02144 80AB2ED4 000A5880 */ sll $t3, $t2, 2 +/* 02144 80AB2ED4 000A5880 */ sll $t3, $t2, 2 /* 02148 80AB2ED8 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 0214C 80AB2EDC 016C2821 */ addu $a1, $t3, $t4 +/* 0214C 80AB2EDC 016C2821 */ addu $a1, $t3, $t4 /* 02150 80AB2EE0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 02154 80AB2EE4 8CAD0000 */ lw $t5, 0x0000($a1) ## 00000000 /* 02158 80AB2EE8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0215C 80AB2EEC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02160 80AB2EF0 00813024 */ and $a2, $a0, $at +/* 02160 80AB2EF0 00813024 */ and $a2, $a0, $at /* 02164 80AB2EF4 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 02168 80AB2EF8 01A67021 */ addu $t6, $t5, $a2 -/* 0216C 80AB2EFC 01C77821 */ addu $t7, $t6, $a3 +/* 02168 80AB2EF8 01A67021 */ addu $t6, $t5, $a2 +/* 0216C 80AB2EFC 01C77821 */ addu $t7, $t6, $a3 /* 02170 80AB2F00 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 02174 80AB2F04 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02178 80AB2F08 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -45,8 +45,8 @@ glabel func_80AB2E70 /* 0218C 80AB2F1C 8CA90000 */ lw $t1, 0x0000($a1) ## 00000000 /* 02190 80AB2F20 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 02194 80AB2F24 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 02198 80AB2F28 01265021 */ addu $t2, $t1, $a2 -/* 0219C 80AB2F2C 01475821 */ addu $t3, $t2, $a3 +/* 02198 80AB2F28 01265021 */ addu $t2, $t1, $a2 +/* 0219C 80AB2F2C 01475821 */ addu $t3, $t2, $a3 /* 021A0 80AB2F30 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 021A4 80AB2F34 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 021A8 80AB2F38 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 @@ -62,26 +62,26 @@ glabel func_80AB2E70 /* 021D0 80AB2F60 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 021D4 80AB2F64 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 021D8 80AB2F68 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 021DC 80AB2F6C 8FA30060 */ lw $v1, 0x0060($sp) -/* 021E0 80AB2F70 8FA40064 */ lw $a0, 0x0064($sp) +/* 021DC 80AB2F6C 8FA30060 */ lw $v1, 0x0060($sp) +/* 021E0 80AB2F70 8FA40064 */ lw $a0, 0x0064($sp) /* 021E4 80AB2F74 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 021E8 80AB2F78 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 021EC 80AB2F7C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 021F0 80AB2F80 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 021F4 80AB2F84 AFA00014 */ sw $zero, 0x0014($sp) -/* 021F8 80AB2F88 AFA00010 */ sw $zero, 0x0010($sp) -/* 021FC 80AB2F8C 0C0286B2 */ jal func_800A1AC8 -/* 02200 80AB2F90 AFA30018 */ sw $v1, 0x0018($sp) -/* 02204 80AB2F94 8FA90064 */ lw $t1, 0x0064($sp) +/* 021F4 80AB2F84 AFA00014 */ sw $zero, 0x0014($sp) +/* 021F8 80AB2F88 AFA00010 */ sw $zero, 0x0010($sp) +/* 021FC 80AB2F8C 0C0286B2 */ jal SkelAnime_DrawSV +/* 02200 80AB2F90 AFA30018 */ sw $v1, 0x0018($sp) +/* 02204 80AB2F94 8FA90064 */ lw $t1, 0x0064($sp) /* 02208 80AB2F98 3C0680AB */ lui $a2, %hi(D_80AB50E0) ## $a2 = 80AB0000 /* 0220C 80AB2F9C 24C650E0 */ addiu $a2, $a2, %lo(D_80AB50E0) ## $a2 = 80AB50E0 /* 02210 80AB2FA0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 02214 80AB2FA4 24070251 */ addiu $a3, $zero, 0x0251 ## $a3 = 00000251 -/* 02218 80AB2FA8 0C031AD5 */ jal func_800C6B54 +/* 02218 80AB2FA8 0C031AD5 */ jal func_800C6B54 /* 0221C 80AB2FAC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 02220 80AB2FB0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02220 80AB2FB0 8FBF0024 */ lw $ra, 0x0024($sp) /* 02224 80AB2FB4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 02228 80AB2FB8 03E00008 */ jr $ra +/* 02228 80AB2FB8 03E00008 */ jr $ra /* 0222C 80AB2FBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s index 461958e0ce..3db4ea8ca9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s @@ -1,45 +1,45 @@ glabel func_80AB2FE4 /* 02254 80AB2FE4 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 02258 80AB2FE8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0225C 80AB2FEC AFA40070 */ sw $a0, 0x0070($sp) -/* 02260 80AB2FF0 AFA50074 */ sw $a1, 0x0074($sp) +/* 02258 80AB2FE8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0225C 80AB2FEC AFA40070 */ sw $a0, 0x0070($sp) +/* 02260 80AB2FF0 AFA50074 */ sw $a1, 0x0074($sp) /* 02264 80AB2FF4 84820274 */ lh $v0, 0x0274($a0) ## 00000274 /* 02268 80AB2FF8 3C1880AB */ lui $t8, %hi(D_80AB430C) ## $t8 = 80AB0000 /* 0226C 80AB2FFC 3C0680AB */ lui $a2, %hi(D_80AB50FC) ## $a2 = 80AB0000 -/* 02270 80AB3000 00027880 */ sll $t7, $v0, 2 -/* 02274 80AB3004 030FC021 */ addu $t8, $t8, $t7 -/* 02278 80AB3008 8F18430C */ lw $t8, %lo(D_80AB430C)($t8) +/* 02270 80AB3000 00027880 */ sll $t7, $v0, 2 +/* 02274 80AB3004 030FC021 */ addu $t8, $t8, $t7 +/* 02278 80AB3008 8F18430C */ lw $t8, %lo(D_80AB430C)($t8) /* 0227C 80AB300C 24C650FC */ addiu $a2, $a2, %lo(D_80AB50FC) ## $a2 = 80AB50FC /* 02280 80AB3010 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 02284 80AB3014 AFB80060 */ sw $t8, 0x0060($sp) +/* 02284 80AB3014 AFB80060 */ sw $t8, 0x0060($sp) /* 02288 80AB3018 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0228C 80AB301C 2407026F */ addiu $a3, $zero, 0x026F ## $a3 = 0000026F -/* 02290 80AB3020 0C031AB1 */ jal func_800C6AC4 -/* 02294 80AB3024 AFA50058 */ sw $a1, 0x0058($sp) -/* 02298 80AB3028 8FA90074 */ lw $t1, 0x0074($sp) -/* 0229C 80AB302C 0C024F46 */ jal func_80093D18 +/* 02290 80AB3020 0C031AB1 */ jal func_800C6AC4 +/* 02294 80AB3024 AFA50058 */ sw $a1, 0x0058($sp) +/* 02298 80AB3028 8FA90074 */ lw $t1, 0x0074($sp) +/* 0229C 80AB302C 0C024F46 */ jal func_80093D18 /* 022A0 80AB3030 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 022A4 80AB3034 8FA80058 */ lw $t0, 0x0058($sp) -/* 022A8 80AB3038 8FA70060 */ lw $a3, 0x0060($sp) +/* 022A4 80AB3034 8FA80058 */ lw $t0, 0x0058($sp) +/* 022A8 80AB3038 8FA70060 */ lw $a3, 0x0060($sp) /* 022AC 80AB303C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 022B0 80AB3040 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 022B4 80AB3044 00076100 */ sll $t4, $a3, 4 -/* 022B8 80AB3048 000C6F02 */ srl $t5, $t4, 28 +/* 022B4 80AB3044 00076100 */ sll $t4, $a3, 4 +/* 022B8 80AB3048 000C6F02 */ srl $t5, $t4, 28 /* 022BC 80AB304C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 022C0 80AB3050 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 022C4 80AB3054 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 022C8 80AB3058 000D7080 */ sll $t6, $t5, 2 +/* 022C8 80AB3058 000D7080 */ sll $t6, $t5, 2 /* 022CC 80AB305C 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 022D0 80AB3060 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 022D4 80AB3064 01CF2021 */ addu $a0, $t6, $t7 +/* 022D4 80AB3064 01CF2021 */ addu $a0, $t6, $t7 /* 022D8 80AB3068 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 022DC 80AB306C 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 022E0 80AB3070 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 022E4 80AB3074 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 022E8 80AB3078 00E12824 */ and $a1, $a3, $at +/* 022E8 80AB3078 00E12824 */ and $a1, $a3, $at /* 022EC 80AB307C 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 022F0 80AB3080 0305C821 */ addu $t9, $t8, $a1 -/* 022F4 80AB3084 03264821 */ addu $t1, $t9, $a2 +/* 022F0 80AB3080 0305C821 */ addu $t9, $t8, $a1 +/* 022F4 80AB3084 03264821 */ addu $t1, $t9, $a2 /* 022F8 80AB3088 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 022FC 80AB308C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02300 80AB3090 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,8 +50,8 @@ glabel func_80AB2FE4 /* 02314 80AB30A4 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 02318 80AB30A8 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 0231C 80AB30AC 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 02320 80AB30B0 01856821 */ addu $t5, $t4, $a1 -/* 02324 80AB30B4 01A67021 */ addu $t6, $t5, $a2 +/* 02320 80AB30B0 01856821 */ addu $t5, $t4, $a1 +/* 02324 80AB30B4 01A67021 */ addu $t6, $t5, $a2 /* 02328 80AB30B8 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 0232C 80AB30BC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02330 80AB30C0 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 @@ -67,28 +67,28 @@ glabel func_80AB2FE4 /* 02358 80AB30E8 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 0235C 80AB30EC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 02360 80AB30F0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 02364 80AB30F4 8FA30070 */ lw $v1, 0x0070($sp) +/* 02364 80AB30F4 8FA30070 */ lw $v1, 0x0070($sp) /* 02368 80AB30F8 3C0C80AB */ lui $t4, %hi(func_80AB2FC0) ## $t4 = 80AB0000 /* 0236C 80AB30FC 258C2FC0 */ addiu $t4, $t4, %lo(func_80AB2FC0) ## $t4 = 80AB2FC0 /* 02370 80AB3100 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 02374 80AB3104 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 02378 80AB3108 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 0237C 80AB310C 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 02380 80AB3110 AFA00014 */ sw $zero, 0x0014($sp) -/* 02384 80AB3114 AFAC0010 */ sw $t4, 0x0010($sp) -/* 02388 80AB3118 8FA40074 */ lw $a0, 0x0074($sp) -/* 0238C 80AB311C 0C0286B2 */ jal func_800A1AC8 -/* 02390 80AB3120 AFA30018 */ sw $v1, 0x0018($sp) -/* 02394 80AB3124 8FAD0074 */ lw $t5, 0x0074($sp) +/* 02380 80AB3110 AFA00014 */ sw $zero, 0x0014($sp) +/* 02384 80AB3114 AFAC0010 */ sw $t4, 0x0010($sp) +/* 02388 80AB3118 8FA40074 */ lw $a0, 0x0074($sp) +/* 0238C 80AB311C 0C0286B2 */ jal SkelAnime_DrawSV +/* 02390 80AB3120 AFA30018 */ sw $v1, 0x0018($sp) +/* 02394 80AB3124 8FAD0074 */ lw $t5, 0x0074($sp) /* 02398 80AB3128 3C0680AB */ lui $a2, %hi(D_80AB5118) ## $a2 = 80AB0000 /* 0239C 80AB312C 24C65118 */ addiu $a2, $a2, %lo(D_80AB5118) ## $a2 = 80AB5118 /* 023A0 80AB3130 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 023A4 80AB3134 24070284 */ addiu $a3, $zero, 0x0284 ## $a3 = 00000284 -/* 023A8 80AB3138 0C031AD5 */ jal func_800C6B54 +/* 023A8 80AB3138 0C031AD5 */ jal func_800C6B54 /* 023AC 80AB313C 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 023B0 80AB3140 8FBF0024 */ lw $ra, 0x0024($sp) +/* 023B0 80AB3140 8FBF0024 */ lw $ra, 0x0024($sp) /* 023B4 80AB3144 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 023B8 80AB3148 03E00008 */ jr $ra +/* 023B8 80AB3148 03E00008 */ jr $ra /* 023BC 80AB314C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s index 983e6e6ee3..b5971356f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s @@ -1,45 +1,45 @@ glabel func_80AB410C /* 0337C 80AB410C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 03380 80AB4110 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03384 80AB4114 AFA40070 */ sw $a0, 0x0070($sp) -/* 03388 80AB4118 AFA50074 */ sw $a1, 0x0074($sp) +/* 03380 80AB4110 AFBF0024 */ sw $ra, 0x0024($sp) +/* 03384 80AB4114 AFA40070 */ sw $a0, 0x0070($sp) +/* 03388 80AB4118 AFA50074 */ sw $a1, 0x0074($sp) /* 0338C 80AB411C 84820274 */ lh $v0, 0x0274($a0) ## 00000274 /* 03390 80AB4120 3C1880AB */ lui $t8, %hi(D_80AB430C) ## $t8 = 80AB0000 /* 03394 80AB4124 3C0680AB */ lui $a2, %hi(D_80AB51A8) ## $a2 = 80AB0000 -/* 03398 80AB4128 00027880 */ sll $t7, $v0, 2 -/* 0339C 80AB412C 030FC021 */ addu $t8, $t8, $t7 -/* 033A0 80AB4130 8F18430C */ lw $t8, %lo(D_80AB430C)($t8) +/* 03398 80AB4128 00027880 */ sll $t7, $v0, 2 +/* 0339C 80AB412C 030FC021 */ addu $t8, $t8, $t7 +/* 033A0 80AB4130 8F18430C */ lw $t8, %lo(D_80AB430C)($t8) /* 033A4 80AB4134 24C651A8 */ addiu $a2, $a2, %lo(D_80AB51A8) ## $a2 = 80AB51A8 /* 033A8 80AB4138 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 033AC 80AB413C AFB80060 */ sw $t8, 0x0060($sp) +/* 033AC 80AB413C AFB80060 */ sw $t8, 0x0060($sp) /* 033B0 80AB4140 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 033B4 80AB4144 240703E0 */ addiu $a3, $zero, 0x03E0 ## $a3 = 000003E0 -/* 033B8 80AB4148 0C031AB1 */ jal func_800C6AC4 -/* 033BC 80AB414C AFA50058 */ sw $a1, 0x0058($sp) -/* 033C0 80AB4150 8FA90074 */ lw $t1, 0x0074($sp) -/* 033C4 80AB4154 0C024F46 */ jal func_80093D18 +/* 033B8 80AB4148 0C031AB1 */ jal func_800C6AC4 +/* 033BC 80AB414C AFA50058 */ sw $a1, 0x0058($sp) +/* 033C0 80AB4150 8FA90074 */ lw $t1, 0x0074($sp) +/* 033C4 80AB4154 0C024F46 */ jal func_80093D18 /* 033C8 80AB4158 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 033CC 80AB415C 8FA80058 */ lw $t0, 0x0058($sp) -/* 033D0 80AB4160 8FA70060 */ lw $a3, 0x0060($sp) +/* 033CC 80AB415C 8FA80058 */ lw $t0, 0x0058($sp) +/* 033D0 80AB4160 8FA70060 */ lw $a3, 0x0060($sp) /* 033D4 80AB4164 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 033D8 80AB4168 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 033DC 80AB416C 00076100 */ sll $t4, $a3, 4 -/* 033E0 80AB4170 000C6F02 */ srl $t5, $t4, 28 +/* 033DC 80AB416C 00076100 */ sll $t4, $a3, 4 +/* 033E0 80AB4170 000C6F02 */ srl $t5, $t4, 28 /* 033E4 80AB4174 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 033E8 80AB4178 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 033EC 80AB417C 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 033F0 80AB4180 000D7080 */ sll $t6, $t5, 2 +/* 033F0 80AB4180 000D7080 */ sll $t6, $t5, 2 /* 033F4 80AB4184 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 033F8 80AB4188 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 033FC 80AB418C 01CF2021 */ addu $a0, $t6, $t7 +/* 033FC 80AB418C 01CF2021 */ addu $a0, $t6, $t7 /* 03400 80AB4190 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 03404 80AB4194 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 03408 80AB4198 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0340C 80AB419C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 03410 80AB41A0 00E12824 */ and $a1, $a3, $at +/* 03410 80AB41A0 00E12824 */ and $a1, $a3, $at /* 03414 80AB41A4 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 03418 80AB41A8 0305C821 */ addu $t9, $t8, $a1 -/* 0341C 80AB41AC 03264821 */ addu $t1, $t9, $a2 +/* 03418 80AB41A8 0305C821 */ addu $t9, $t8, $a1 +/* 0341C 80AB41AC 03264821 */ addu $t1, $t9, $a2 /* 03420 80AB41B0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 03424 80AB41B4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 03428 80AB41B8 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,8 +50,8 @@ glabel func_80AB410C /* 0343C 80AB41CC 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 03440 80AB41D0 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 03444 80AB41D4 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 03448 80AB41D8 01856821 */ addu $t5, $t4, $a1 -/* 0344C 80AB41DC 01A67021 */ addu $t6, $t5, $a2 +/* 03448 80AB41D8 01856821 */ addu $t5, $t4, $a1 +/* 0344C 80AB41DC 01A67021 */ addu $t6, $t5, $a2 /* 03450 80AB41E0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 03454 80AB41E4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 03458 80AB41E8 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 @@ -67,7 +67,7 @@ glabel func_80AB410C /* 03480 80AB4210 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 03484 80AB4214 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 03488 80AB4218 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0348C 80AB421C 8FA30070 */ lw $v1, 0x0070($sp) +/* 0348C 80AB421C 8FA30070 */ lw $v1, 0x0070($sp) /* 03490 80AB4220 3C0D80AB */ lui $t5, %hi(func_80AB4074) ## $t5 = 80AB0000 /* 03494 80AB4224 3C0C80AB */ lui $t4, %hi(func_80AB3FE8) ## $t4 = 80AB0000 /* 03498 80AB4228 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C @@ -76,21 +76,21 @@ glabel func_80AB410C /* 034A4 80AB4234 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E /* 034A8 80AB4238 258C3FE8 */ addiu $t4, $t4, %lo(func_80AB3FE8) ## $t4 = 80AB3FE8 /* 034AC 80AB423C 25AD4074 */ addiu $t5, $t5, %lo(func_80AB4074) ## $t5 = 80AB4074 -/* 034B0 80AB4240 AFAD0014 */ sw $t5, 0x0014($sp) -/* 034B4 80AB4244 AFAC0010 */ sw $t4, 0x0010($sp) -/* 034B8 80AB4248 8FA40074 */ lw $a0, 0x0074($sp) -/* 034BC 80AB424C 0C0286B2 */ jal func_800A1AC8 -/* 034C0 80AB4250 AFA30018 */ sw $v1, 0x0018($sp) -/* 034C4 80AB4254 8FAE0074 */ lw $t6, 0x0074($sp) +/* 034B0 80AB4240 AFAD0014 */ sw $t5, 0x0014($sp) +/* 034B4 80AB4244 AFAC0010 */ sw $t4, 0x0010($sp) +/* 034B8 80AB4248 8FA40074 */ lw $a0, 0x0074($sp) +/* 034BC 80AB424C 0C0286B2 */ jal SkelAnime_DrawSV +/* 034C0 80AB4250 AFA30018 */ sw $v1, 0x0018($sp) +/* 034C4 80AB4254 8FAE0074 */ lw $t6, 0x0074($sp) /* 034C8 80AB4258 3C0680AB */ lui $a2, %hi(D_80AB51B8) ## $a2 = 80AB0000 /* 034CC 80AB425C 24C651B8 */ addiu $a2, $a2, %lo(D_80AB51B8) ## $a2 = 80AB51B8 /* 034D0 80AB4260 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 034D4 80AB4264 240703F5 */ addiu $a3, $zero, 0x03F5 ## $a3 = 000003F5 -/* 034D8 80AB4268 0C031AD5 */ jal func_800C6B54 +/* 034D8 80AB4268 0C031AD5 */ jal func_800C6B54 /* 034DC 80AB426C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 034E0 80AB4270 8FBF0024 */ lw $ra, 0x0024($sp) +/* 034E0 80AB4270 8FBF0024 */ lw $ra, 0x0024($sp) /* 034E4 80AB4274 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 034E8 80AB4278 03E00008 */ jr $ra +/* 034E8 80AB4278 03E00008 */ jr $ra /* 034EC 80AB427C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s index 1f022044ca..74830c28ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s @@ -1,9 +1,9 @@ glabel EnNiw_Draw /* 02938 80AB80B8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0293C 80AB80BC 3C0F80AC */ lui $t7, %hi(D_80AB870C) ## $t7 = 80AC0000 -/* 02940 80AB80C0 AFBF002C */ sw $ra, 0x002C($sp) -/* 02944 80AB80C4 AFB00028 */ sw $s0, 0x0028($sp) -/* 02948 80AB80C8 AFA5004C */ sw $a1, 0x004C($sp) +/* 02940 80AB80C0 AFBF002C */ sw $ra, 0x002C($sp) +/* 02944 80AB80C4 AFB00028 */ sw $s0, 0x0028($sp) +/* 02948 80AB80C8 AFA5004C */ sw $a1, 0x004C($sp) /* 0294C 80AB80CC 25EF870C */ addiu $t7, $t7, %lo(D_80AB870C) ## $t7 = 80AB870C /* 02950 80AB80D0 8DF90000 */ lw $t9, 0x0000($t7) ## 80AB870C /* 02954 80AB80D4 27AE0038 */ addiu $t6, $sp, 0x0038 ## $t6 = FFFFFFF0 @@ -13,36 +13,36 @@ glabel EnNiw_Draw /* 02964 80AB80E4 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF4 /* 02968 80AB80E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0296C 80AB80EC ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF8 -/* 02970 80AB80F0 8FA8004C */ lw $t0, 0x004C($sp) -/* 02974 80AB80F4 0C024F46 */ jal func_80093D18 +/* 02970 80AB80F0 8FA8004C */ lw $t0, 0x004C($sp) +/* 02974 80AB80F4 0C024F46 */ jal func_80093D18 /* 02978 80AB80F8 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 /* 0297C 80AB80FC 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 02980 80AB8100 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 02984 80AB8104 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 02988 80AB8108 3C0980AB */ lui $t1, %hi(func_80AB7F60) ## $t1 = 80AB0000 /* 0298C 80AB810C 25297F60 */ addiu $t1, $t1, %lo(func_80AB7F60) ## $t1 = 80AB7F60 -/* 02990 80AB8110 AFA90010 */ sw $t1, 0x0010($sp) -/* 02994 80AB8114 AFB00018 */ sw $s0, 0x0018($sp) -/* 02998 80AB8118 AFA00014 */ sw $zero, 0x0014($sp) -/* 0299C 80AB811C 0C0286B2 */ jal func_800A1AC8 -/* 029A0 80AB8120 8FA4004C */ lw $a0, 0x004C($sp) +/* 02990 80AB8110 AFA90010 */ sw $t1, 0x0010($sp) +/* 02994 80AB8114 AFB00018 */ sw $s0, 0x0018($sp) +/* 02998 80AB8118 AFA00014 */ sw $zero, 0x0014($sp) +/* 0299C 80AB811C 0C0286B2 */ jal SkelAnime_DrawSV +/* 029A0 80AB8120 8FA4004C */ lw $a0, 0x004C($sp) /* 029A4 80AB8124 8E0B0250 */ lw $t3, 0x0250($s0) ## 00000250 /* 029A8 80AB8128 3C0A80AB */ lui $t2, %hi(func_80AB6450) ## $t2 = 80AB0000 /* 029AC 80AB812C 254A6450 */ addiu $t2, $t2, %lo(func_80AB6450) ## $t2 = 80AB6450 -/* 029B0 80AB8130 154B0005 */ bne $t2, $t3, .L80AB8148 +/* 029B0 80AB8130 154B0005 */ bne $t2, $t3, .L80AB8148 /* 029B4 80AB8134 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 029B8 80AB8138 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFF0 /* 029BC 80AB813C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 029C0 80AB8140 0C00CF0C */ jal func_80033C30 -/* 029C4 80AB8144 8FA7004C */ lw $a3, 0x004C($sp) +/* 029C0 80AB8140 0C00CF0C */ jal func_80033C30 +/* 029C4 80AB8144 8FA7004C */ lw $a3, 0x004C($sp) .L80AB8148: /* 029C8 80AB8148 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029CC 80AB814C 0C2AE103 */ jal func_80AB840C -/* 029D0 80AB8150 8FA5004C */ lw $a1, 0x004C($sp) -/* 029D4 80AB8154 8FBF002C */ lw $ra, 0x002C($sp) -/* 029D8 80AB8158 8FB00028 */ lw $s0, 0x0028($sp) +/* 029CC 80AB814C 0C2AE103 */ jal func_80AB840C +/* 029D0 80AB8150 8FA5004C */ lw $a1, 0x004C($sp) +/* 029D4 80AB8154 8FBF002C */ lw $ra, 0x002C($sp) +/* 029D8 80AB8158 8FB00028 */ lw $s0, 0x0028($sp) /* 029DC 80AB815C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 029E0 80AB8160 03E00008 */ jr $ra +/* 029E0 80AB8160 03E00008 */ jr $ra /* 029E4 80AB8164 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s index b5848d3d6f..2907ab0578 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s @@ -1,65 +1,65 @@ glabel EnNiw_Init /* 00000 80AB5780 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 80AB5784 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00008 80AB5788 AFB20030 */ sw $s2, 0x0030($sp) -/* 0000C 80AB578C AFB1002C */ sw $s1, 0x002C($sp) -/* 00010 80AB5790 AFB00028 */ sw $s0, 0x0028($sp) -/* 00014 80AB5794 AFA50054 */ sw $a1, 0x0054($sp) +/* 00004 80AB5784 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00008 80AB5788 AFB20030 */ sw $s2, 0x0030($sp) +/* 0000C 80AB578C AFB1002C */ sw $s1, 0x002C($sp) +/* 00010 80AB5790 AFB00028 */ sw $s0, 0x0028($sp) +/* 00014 80AB5794 AFA50054 */ sw $a1, 0x0054($sp) /* 00018 80AB5798 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 0001C 80AB579C 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 00020 80AB57A0 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00024 80AB57A4 04410003 */ bgez $v0, .L80AB57B4 +/* 00024 80AB57A4 04410003 */ bgez $v0, .L80AB57B4 /* 00028 80AB57A8 3C0580AC */ lui $a1, %hi(D_80AB86DC) ## $a1 = 80AC0000 /* 0002C 80AB57AC A480001C */ sh $zero, 0x001C($a0) ## 0000001C /* 00030 80AB57B0 8482001C */ lh $v0, 0x001C($a0) ## 0000001C .L80AB57B4: -/* 00034 80AB57B4 14410012 */ bne $v0, $at, .L80AB5800 +/* 00034 80AB57B4 14410012 */ bne $v0, $at, .L80AB5800 /* 00038 80AB57B8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0003C 80AB57BC 3C0380AC */ lui $v1, %hi(D_80AB867C) ## $v1 = 80AC0000 /* 00040 80AB57C0 2463867C */ addiu $v1, $v1, %lo(D_80AB867C) ## $v1 = 80AB867C /* 00044 80AB57C4 906E0000 */ lbu $t6, 0x0000($v1) ## 80AB867C /* 00048 80AB57C8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 0004C 80AB57CC 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 00050 80AB57D0 51C00009 */ beql $t6, $zero, .L80AB57F8 +/* 00050 80AB57D0 51C00009 */ beql $t6, $zero, .L80AB57F8 /* 00054 80AB57D4 A06F0000 */ sb $t7, 0x0000($v1) ## 80AB867C /* 00058 80AB57D8 0C00B55C */ jal Actor_Kill - + /* 0005C 80AB57DC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00060 80AB57E0 3C0480AC */ lui $a0, %hi(D_80AB8720) ## $a0 = 80AC0000 /* 00064 80AB57E4 0C00084C */ jal osSyncPrintf - + /* 00068 80AB57E8 24848720 */ addiu $a0, $a0, %lo(D_80AB8720) ## $a0 = 80AB8720 -/* 0006C 80AB57EC 100000F3 */ beq $zero, $zero, .L80AB5BBC -/* 00070 80AB57F0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0006C 80AB57EC 100000F3 */ beq $zero, $zero, .L80AB5BBC +/* 00070 80AB57F0 8FBF0034 */ lw $ra, 0x0034($sp) /* 00074 80AB57F4 A06F0000 */ sb $t7, 0x0000($v1) ## 00000000 .L80AB57F8: /* 00078 80AB57F8 8642001C */ lh $v0, 0x001C($s2) ## 0000001C /* 0007C 80AB57FC A2580003 */ sb $t8, 0x0003($s2) ## 00000003 .L80AB5800: /* 00080 80AB5800 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 00084 80AB5804 14410010 */ bne $v0, $at, .L80AB5848 +/* 00084 80AB5804 14410010 */ bne $v0, $at, .L80AB5848 /* 00088 80AB5808 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 0008C 80AB580C 3C0280AC */ lui $v0, %hi(D_80AB8680) ## $v0 = 80AC0000 /* 00090 80AB5810 24428680 */ addiu $v0, $v0, %lo(D_80AB8680) ## $v0 = 80AB8680 /* 00094 80AB5814 90590000 */ lbu $t9, 0x0000($v0) ## 80AB8680 /* 00098 80AB5818 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 0009C 80AB581C 53200009 */ beql $t9, $zero, .L80AB5844 +/* 0009C 80AB581C 53200009 */ beql $t9, $zero, .L80AB5844 /* 000A0 80AB5820 A0480000 */ sb $t0, 0x0000($v0) ## 80AB8680 /* 000A4 80AB5824 0C00B55C */ jal Actor_Kill - + /* 000A8 80AB5828 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 000AC 80AB582C 3C0480AC */ lui $a0, %hi(D_80AB8754) ## $a0 = 80AC0000 /* 000B0 80AB5830 0C00084C */ jal osSyncPrintf - + /* 000B4 80AB5834 24848754 */ addiu $a0, $a0, %lo(D_80AB8754) ## $a0 = 80AB8754 -/* 000B8 80AB5838 100000E0 */ beq $zero, $zero, .L80AB5BBC -/* 000BC 80AB583C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 000B8 80AB5838 100000E0 */ beq $zero, $zero, .L80AB5BBC +/* 000BC 80AB583C 8FBF0034 */ lw $ra, 0x0034($sp) /* 000C0 80AB5840 A0480000 */ sb $t0, 0x0000($v0) ## 00000000 .L80AB5844: /* 000C4 80AB5844 A2490003 */ sb $t1, 0x0003($s2) ## 00000003 .L80AB5848: /* 000C8 80AB5848 0C01E037 */ jal Actor_ProcessInitChain - + /* 000CC 80AB584C 24A586DC */ addiu $a1, $a1, %lo(D_80AB86DC) ## $a1 = FFFF86DC /* 000D0 80AB5850 8E4A0004 */ lw $t2, 0x0004($s2) ## 00000004 /* 000D4 80AB5854 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 @@ -69,66 +69,66 @@ glabel EnNiw_Init /* 000E4 80AB5864 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 /* 000E8 80AB5868 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 000EC 80AB586C 0C00AC78 */ jal ActorShape_Init - + /* 000F0 80AB5870 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 /* 000F4 80AB5874 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 000F8 80AB5878 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 000FC 80AB587C 264C0190 */ addiu $t4, $s2, 0x0190 ## $t4 = 00000190 /* 00100 80AB5880 264D01F0 */ addiu $t5, $s2, 0x01F0 ## $t5 = 000001F0 /* 00104 80AB5884 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 00108 80AB5888 AFAE0018 */ sw $t6, 0x0018($sp) -/* 0010C 80AB588C AFAD0014 */ sw $t5, 0x0014($sp) -/* 00110 80AB5890 AFAC0010 */ sw $t4, 0x0010($sp) +/* 00108 80AB5888 AFAE0018 */ sw $t6, 0x0018($sp) +/* 0010C 80AB588C AFAD0014 */ sw $t5, 0x0014($sp) +/* 00110 80AB5890 AFAC0010 */ sw $t4, 0x0010($sp) /* 00114 80AB5894 24E700E8 */ addiu $a3, $a3, 0x00E8 ## $a3 = 060000E8 /* 00118 80AB5898 24C62530 */ addiu $a2, $a2, 0x2530 ## $a2 = 06002530 -/* 0011C 80AB589C 8FA40054 */ lw $a0, 0x0054($sp) -/* 00120 80AB58A0 0C0291BE */ jal func_800A46F8 +/* 0011C 80AB589C 8FA40054 */ lw $a0, 0x0054($sp) +/* 00120 80AB58A0 0C0291BE */ jal SkelAnime_InitSV /* 00124 80AB58A4 2645014C */ addiu $a1, $s2, 0x014C ## $a1 = 0000014C -/* 00128 80AB58A8 8FAF0054 */ lw $t7, 0x0054($sp) +/* 00128 80AB58A8 8FAF0054 */ lw $t7, 0x0054($sp) /* 0012C 80AB58AC 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 /* 00130 80AB58B0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 00134 80AB58B4 85F800A4 */ lh $t8, 0x00A4($t7) ## 000000A4 /* 00138 80AB58B8 3C0280AC */ lui $v0, %hi(D_80AB8618) ## $v0 = 80AC0000 -/* 0013C 80AB58BC 17010033 */ bne $t8, $at, .L80AB598C +/* 0013C 80AB58BC 17010033 */ bne $t8, $at, .L80AB598C /* 00140 80AB58C0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00144 80AB58C4 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 /* 00148 80AB58C8 24428618 */ addiu $v0, $v0, %lo(D_80AB8618) ## $v0 = 80AB8618 .L80AB58CC: /* 0014C 80AB58CC C6440024 */ lwc1 $f4, 0x0024($s2) ## 00000024 /* 00150 80AB58D0 C4460000 */ lwc1 $f6, 0x0000($v0) ## 80AB8618 -/* 00154 80AB58D4 46062001 */ sub.s $f0, $f4, $f6 -/* 00158 80AB58D8 46000005 */ abs.s $f0, $f0 -/* 0015C 80AB58DC 4602003C */ c.lt.s $f0, $f2 +/* 00154 80AB58D4 46062001 */ sub.s $f0, $f4, $f6 +/* 00158 80AB58D8 46000005 */ abs.s $f0, $f0 +/* 0015C 80AB58DC 4602003C */ c.lt.s $f0, $f2 /* 00160 80AB58E0 00000000 */ nop -/* 00164 80AB58E4 45020026 */ bc1fl .L80AB5980 +/* 00164 80AB58E4 45020026 */ bc1fl .L80AB5980 /* 00168 80AB58E8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 0016C 80AB58EC C648002C */ lwc1 $f8, 0x002C($s2) ## 0000002C /* 00170 80AB58F0 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80AB8620 /* 00174 80AB58F4 3C0880AC */ lui $t0, %hi(D_80AB866C) ## $t0 = 80AC0000 /* 00178 80AB58F8 2508866C */ addiu $t0, $t0, %lo(D_80AB866C) ## $t0 = 80AB866C -/* 0017C 80AB58FC 460A4001 */ sub.s $f0, $f8, $f10 +/* 0017C 80AB58FC 460A4001 */ sub.s $f0, $f8, $f10 /* 00180 80AB5900 3C0480AC */ lui $a0, %hi(D_80AB8788) ## $a0 = 80AC0000 -/* 00184 80AB5904 0010C840 */ sll $t9, $s0, 1 -/* 00188 80AB5908 03288821 */ addu $s1, $t9, $t0 -/* 0018C 80AB590C 46000005 */ abs.s $f0, $f0 +/* 00184 80AB5904 0010C840 */ sll $t9, $s0, 1 +/* 00188 80AB5908 03288821 */ addu $s1, $t9, $t0 +/* 0018C 80AB590C 46000005 */ abs.s $f0, $f0 /* 00190 80AB5910 24848788 */ addiu $a0, $a0, %lo(D_80AB8788) ## $a0 = 80AB8788 -/* 00194 80AB5914 4602003C */ c.lt.s $f0, $f2 +/* 00194 80AB5914 4602003C */ c.lt.s $f0, $f2 /* 00198 80AB5918 00000000 */ nop -/* 0019C 80AB591C 45020018 */ bc1fl .L80AB5980 +/* 0019C 80AB591C 45020018 */ bc1fl .L80AB5980 /* 001A0 80AB5920 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000002 /* 001A4 80AB5924 A65002AA */ sh $s0, 0x02AA($s2) ## 000002AA /* 001A8 80AB5928 864502AA */ lh $a1, 0x02AA($s2) ## 000002AA /* 001AC 80AB592C 0C00084C */ jal osSyncPrintf - -/* 001B0 80AB5930 AFA2003C */ sw $v0, 0x003C($sp) + +/* 001B0 80AB5930 AFA2003C */ sw $v0, 0x003C($sp) /* 001B4 80AB5934 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 001B8 80AB5938 954AF58A */ lhu $t2, -0x0A76($t2) ## 8015F58A /* 001BC 80AB593C 86290000 */ lh $t1, 0x0000($s1) ## 00000000 /* 001C0 80AB5940 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 001C4 80AB5944 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 -/* 001C8 80AB5948 012A5824 */ and $t3, $t1, $t2 -/* 001CC 80AB594C 1160000B */ beq $t3, $zero, .L80AB597C -/* 001D0 80AB5950 8FA2003C */ lw $v0, 0x003C($sp) +/* 001C8 80AB5948 012A5824 */ and $t3, $t1, $t2 +/* 001CC 80AB594C 1160000B */ beq $t3, $zero, .L80AB597C +/* 001D0 80AB5950 8FA2003C */ lw $v0, 0x003C($sp) /* 001D4 80AB5954 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 001D8 80AB5958 44818000 */ mtc1 $at, $f16 ## $f16 = 300.00 /* 001DC 80AB595C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -136,14 +136,14 @@ glabel EnNiw_Init /* 001E4 80AB5964 3C0180AC */ lui $at, %hi(D_80AB8A50) ## $at = 80AC0000 /* 001E8 80AB5968 E6500024 */ swc1 $f16, 0x0024($s2) ## 00000024 /* 001EC 80AB596C E6520028 */ swc1 $f18, 0x0028($s2) ## 00000028 -/* 001F0 80AB5970 C4248A50 */ lwc1 $f4, %lo(D_80AB8A50)($at) +/* 001F0 80AB5970 C4248A50 */ lwc1 $f4, %lo(D_80AB8A50)($at) /* 001F4 80AB5974 A640001C */ sh $zero, 0x001C($s2) ## 0000001C /* 001F8 80AB5978 E644002C */ swc1 $f4, 0x002C($s2) ## 0000002C .L80AB597C: /* 001FC 80AB597C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000003 .L80AB5980: /* 00200 80AB5980 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00204 80AB5984 1601FFD1 */ bne $s0, $at, .L80AB58CC +/* 00204 80AB5984 1601FFD1 */ bne $s0, $at, .L80AB58CC /* 00208 80AB5988 2442000C */ addiu $v0, $v0, 0x000C ## $v0 = 0000000C .L80AB598C: /* 0020C 80AB598C 26500024 */ addiu $s0, $s2, 0x0024 ## $s0 = 00000024 @@ -163,81 +163,81 @@ glabel EnNiw_Init /* 0023C 80AB59BC 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00240 80AB59C0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00244 80AB59C4 0C00B58B */ jal Actor_SetScale - + /* 00248 80AB59C8 E6460304 */ swc1 $f6, 0x0304($s2) ## 00000304 /* 0024C 80AB59CC 3C0180AC */ lui $at, %hi(D_80AB8A54) ## $at = 80AC0000 /* 00250 80AB59D0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00254 80AB59D4 C42C8A54 */ lwc1 $f12, %lo(D_80AB8A54)($at) -/* 00258 80AB59D8 4600020D */ trunc.w.s $f8, $f0 + +/* 00254 80AB59D4 C42C8A54 */ lwc1 $f12, %lo(D_80AB8A54)($at) +/* 00258 80AB59D8 4600020D */ trunc.w.s $f8, $f0 /* 0025C 80AB59DC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00260 80AB59E0 440F4000 */ mfc1 $t7, $f8 +/* 00260 80AB59E0 440F4000 */ mfc1 $t7, $f8 /* 00264 80AB59E4 00000000 */ nop /* 00268 80AB59E8 25F80005 */ addiu $t8, $t7, 0x0005 ## $t8 = 00000005 /* 0026C 80AB59EC A65802A4 */ sh $t8, 0x02A4($s2) ## 000002A4 /* 00270 80AB59F0 865902A4 */ lh $t9, 0x02A4($s2) ## 000002A4 -/* 00274 80AB59F4 07230003 */ bgezl $t9, .L80AB5A04 +/* 00274 80AB59F4 07230003 */ bgezl $t9, .L80AB5A04 /* 00278 80AB59F8 8649001C */ lh $t1, 0x001C($s2) ## 0000001C /* 0027C 80AB59FC A64802A4 */ sh $t0, 0x02A4($s2) ## 000002A4 /* 00280 80AB5A00 8649001C */ lh $t1, 0x001C($s2) ## 0000001C .L80AB5A04: /* 00284 80AB5A04 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 00288 80AB5A08 2D41000E */ sltiu $at, $t2, 0x000E -/* 0028C 80AB5A0C 10200039 */ beq $at, $zero, .L80AB5AF4 -/* 00290 80AB5A10 000A5080 */ sll $t2, $t2, 2 +/* 00288 80AB5A08 2D41000E */ sltiu $at, $t2, 0x000E +/* 0028C 80AB5A0C 10200039 */ beq $at, $zero, .L80AB5AF4 +/* 00290 80AB5A10 000A5080 */ sll $t2, $t2, 2 /* 00294 80AB5A14 3C0180AC */ lui $at, %hi(jtbl_80AB8A58) ## $at = 80AC0000 -/* 00298 80AB5A18 002A0821 */ addu $at, $at, $t2 -/* 0029C 80AB5A1C 8C2A8A58 */ lw $t2, %lo(jtbl_80AB8A58)($at) -/* 002A0 80AB5A20 01400008 */ jr $t2 +/* 00298 80AB5A18 002A0821 */ addu $at, $at, $t2 +/* 0029C 80AB5A1C 8C2A8A58 */ lw $t2, %lo(jtbl_80AB8A58)($at) +/* 002A0 80AB5A20 01400008 */ jr $t2 /* 002A4 80AB5A24 00000000 */ nop glabel L80AB5A28 /* 002A8 80AB5A28 8E2B0010 */ lw $t3, 0x0010($s1) ## 8015E670 -/* 002AC 80AB5A2C 55600032 */ bnel $t3, $zero, .L80AB5AF8 +/* 002AC 80AB5A2C 55600032 */ bnel $t3, $zero, .L80AB5AF8 /* 002B0 80AB5A30 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C /* 002B4 80AB5A34 0C00B55C */ jal Actor_Kill - + /* 002B8 80AB5A38 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 002BC 80AB5A3C 1000002E */ beq $zero, $zero, .L80AB5AF8 +/* 002BC 80AB5A3C 1000002E */ beq $zero, $zero, .L80AB5AF8 /* 002C0 80AB5A40 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C glabel L80AB5A44 /* 002C4 80AB5A44 962C0ED6 */ lhu $t4, 0x0ED6($s1) ## 8015F536 /* 002C8 80AB5A48 318D0010 */ andi $t5, $t4, 0x0010 ## $t5 = 00000000 -/* 002CC 80AB5A4C 51A0002A */ beql $t5, $zero, .L80AB5AF8 +/* 002CC 80AB5A4C 51A0002A */ beql $t5, $zero, .L80AB5AF8 /* 002D0 80AB5A50 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C /* 002D4 80AB5A54 0C00B55C */ jal Actor_Kill - + /* 002D8 80AB5A58 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 002DC 80AB5A5C 10000026 */ beq $zero, $zero, .L80AB5AF8 +/* 002DC 80AB5A5C 10000026 */ beq $zero, $zero, .L80AB5AF8 /* 002E0 80AB5A60 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C glabel L80AB5A64 /* 002E4 80AB5A64 962E0ED6 */ lhu $t6, 0x0ED6($s1) ## 8015F536 /* 002E8 80AB5A68 31CF0010 */ andi $t7, $t6, 0x0010 ## $t7 = 00000000 -/* 002EC 80AB5A6C 55E00022 */ bnel $t7, $zero, .L80AB5AF8 +/* 002EC 80AB5A6C 55E00022 */ bnel $t7, $zero, .L80AB5AF8 /* 002F0 80AB5A70 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C /* 002F4 80AB5A74 0C00B55C */ jal Actor_Kill - + /* 002F8 80AB5A78 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 002FC 80AB5A7C 1000001E */ beq $zero, $zero, .L80AB5AF8 +/* 002FC 80AB5A7C 1000001E */ beq $zero, $zero, .L80AB5AF8 /* 00300 80AB5A80 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C glabel L80AB5A84 /* 00304 80AB5A84 96380ED6 */ lhu $t8, 0x0ED6($s1) ## 8015F536 /* 00308 80AB5A88 33190100 */ andi $t9, $t8, 0x0100 ## $t9 = 00000000 -/* 0030C 80AB5A8C 5320001A */ beql $t9, $zero, .L80AB5AF8 +/* 0030C 80AB5A8C 5320001A */ beql $t9, $zero, .L80AB5AF8 /* 00310 80AB5A90 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C /* 00314 80AB5A94 0C00B55C */ jal Actor_Kill - + /* 00318 80AB5A98 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0031C 80AB5A9C 10000016 */ beq $zero, $zero, .L80AB5AF8 +/* 0031C 80AB5A9C 10000016 */ beq $zero, $zero, .L80AB5AF8 /* 00320 80AB5AA0 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C glabel L80AB5AA4 /* 00324 80AB5AA4 96280ED6 */ lhu $t0, 0x0ED6($s1) ## 8015F536 /* 00328 80AB5AA8 31090100 */ andi $t1, $t0, 0x0100 ## $t1 = 00000000 -/* 0032C 80AB5AAC 55200012 */ bnel $t1, $zero, .L80AB5AF8 +/* 0032C 80AB5AAC 55200012 */ bnel $t1, $zero, .L80AB5AF8 /* 00330 80AB5AB0 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C /* 00334 80AB5AB4 0C00B55C */ jal Actor_Kill - + /* 00338 80AB5AB8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0033C 80AB5ABC 1000000E */ beq $zero, $zero, .L80AB5AF8 +/* 0033C 80AB5ABC 1000000E */ beq $zero, $zero, .L80AB5AF8 /* 00340 80AB5AC0 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C glabel L80AB5AC4 /* 00344 80AB5AC4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -247,8 +247,8 @@ glabel L80AB5AD0 /* 00350 80AB5AD0 8E4A0004 */ lw $t2, 0x0004($s2) ## 00000004 /* 00354 80AB5AD4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00358 80AB5AD8 A24000AE */ sb $zero, 0x00AE($s2) ## 000000AE -/* 0035C 80AB5ADC 01415824 */ and $t3, $t2, $at -/* 00360 80AB5AE0 10000004 */ beq $zero, $zero, .L80AB5AF4 +/* 0035C 80AB5ADC 01415824 */ and $t3, $t2, $at +/* 00360 80AB5AE0 10000004 */ beq $zero, $zero, .L80AB5AF4 /* 00364 80AB5AE4 AE4B0004 */ sw $t3, 0x0004($s2) ## 00000004 glabel L80AB5AE8 /* 00368 80AB5AE8 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 @@ -260,19 +260,19 @@ glabel L80AB5AF4 .L80AB5AF8: /* 00378 80AB5AF8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000030C /* 0037C 80AB5AFC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00380 80AB5B00 8FA40054 */ lw $a0, 0x0054($sp) + +/* 00380 80AB5B00 8FA40054 */ lw $a0, 0x0054($sp) /* 00384 80AB5B04 8642001C */ lh $v0, 0x001C($s2) ## 0000001C /* 00388 80AB5B08 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 0038C 80AB5B0C 02002825 */ or $a1, $s0, $zero ## $a1 = 0000030C -/* 00390 80AB5B10 10410008 */ beq $v0, $at, .L80AB5B34 +/* 00390 80AB5B10 10410008 */ beq $v0, $at, .L80AB5B34 /* 00394 80AB5B14 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00398 80AB5B18 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 0039C 80AB5B1C 10410007 */ beq $v0, $at, .L80AB5B3C +/* 0039C 80AB5B1C 10410007 */ beq $v0, $at, .L80AB5B3C /* 003A0 80AB5B20 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 003A4 80AB5B24 10410005 */ beq $v0, $at, .L80AB5B3C -/* 003A8 80AB5B28 8FA40054 */ lw $a0, 0x0054($sp) -/* 003AC 80AB5B2C 10000014 */ beq $zero, $zero, .L80AB5B80 +/* 003A4 80AB5B24 10410005 */ beq $v0, $at, .L80AB5B3C +/* 003A8 80AB5B28 8FA40054 */ lw $a0, 0x0054($sp) +/* 003AC 80AB5B2C 10000014 */ beq $zero, $zero, .L80AB5B80 /* 003B0 80AB5B30 02002825 */ or $a1, $s0, $zero ## $a1 = 0000030C .L80AB5B34: /* 003B4 80AB5B34 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF @@ -281,47 +281,47 @@ glabel L80AB5AF4 /* 003BC 80AB5B3C 3C0780AC */ lui $a3, %hi(D_80AB86B0) ## $a3 = 80AC0000 /* 003C0 80AB5B40 24E786B0 */ addiu $a3, $a3, %lo(D_80AB86B0) ## $a3 = 80AB86B0 /* 003C4 80AB5B44 0C01712B */ jal ActorCollider_InitCylinder - -/* 003C8 80AB5B48 8FA40054 */ lw $a0, 0x0054($sp) -/* 003CC 80AB5B4C 8FAD0054 */ lw $t5, 0x0054($sp) + +/* 003C8 80AB5B48 8FA40054 */ lw $a0, 0x0054($sp) +/* 003CC 80AB5B4C 8FAD0054 */ lw $t5, 0x0054($sp) /* 003D0 80AB5B50 24010034 */ addiu $at, $zero, 0x0034 ## $at = 00000034 /* 003D4 80AB5B54 85AE00A4 */ lh $t6, 0x00A4($t5) ## 000000A4 -/* 003D8 80AB5B58 15C1000D */ bne $t6, $at, .L80AB5B90 +/* 003D8 80AB5B58 15C1000D */ bne $t6, $at, .L80AB5B90 /* 003DC 80AB5B5C 00000000 */ nop /* 003E0 80AB5B60 962F0ED6 */ lhu $t7, 0x0ED6($s1) ## 8015F536 /* 003E4 80AB5B64 31F84000 */ andi $t8, $t7, 0x4000 ## $t8 = 00000000 -/* 003E8 80AB5B68 17000009 */ bne $t8, $zero, .L80AB5B90 +/* 003E8 80AB5B68 17000009 */ bne $t8, $zero, .L80AB5B90 /* 003EC 80AB5B6C 00000000 */ nop /* 003F0 80AB5B70 0C00B55C */ jal Actor_Kill - + /* 003F4 80AB5B74 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 003F8 80AB5B78 10000005 */ beq $zero, $zero, .L80AB5B90 +/* 003F8 80AB5B78 10000005 */ beq $zero, $zero, .L80AB5B90 /* 003FC 80AB5B7C 00000000 */ nop .L80AB5B80: /* 00400 80AB5B80 3C0780AC */ lui $a3, %hi(D_80AB8684) ## $a3 = 80AC0000 /* 00404 80AB5B84 24E78684 */ addiu $a3, $a3, %lo(D_80AB8684) ## $a3 = 80AB8684 /* 00408 80AB5B88 0C01712B */ jal ActorCollider_InitCylinder - + /* 0040C 80AB5B8C 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 .L80AB5B90: /* 00410 80AB5B90 3C0480AC */ lui $a0, %hi(D_80AB87A4) ## $a0 = 80AC0000 /* 00414 80AB5B94 248487A4 */ addiu $a0, $a0, %lo(D_80AB87A4) ## $a0 = 80AB87A4 /* 00418 80AB5B98 0C00084C */ jal osSyncPrintf - + /* 0041C 80AB5B9C 8645001C */ lh $a1, 0x001C($s2) ## 0000001C /* 00420 80AB5BA0 3C0480AC */ lui $a0, %hi(D_80AB87D4) ## $a0 = 80AC0000 /* 00424 80AB5BA4 0C00084C */ jal osSyncPrintf - + /* 00428 80AB5BA8 248487D4 */ addiu $a0, $a0, %lo(D_80AB87D4) ## $a0 = 80AB87D4 /* 0042C 80AB5BAC 3C1980AB */ lui $t9, %hi(func_80AB627C) ## $t9 = 80AB0000 /* 00430 80AB5BB0 2739627C */ addiu $t9, $t9, %lo(func_80AB627C) ## $t9 = 80AB627C /* 00434 80AB5BB4 AE590250 */ sw $t9, 0x0250($s2) ## 00000250 -/* 00438 80AB5BB8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00438 80AB5BB8 8FBF0034 */ lw $ra, 0x0034($sp) .L80AB5BBC: -/* 0043C 80AB5BBC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00440 80AB5BC0 8FB1002C */ lw $s1, 0x002C($sp) -/* 00444 80AB5BC4 8FB20030 */ lw $s2, 0x0030($sp) -/* 00448 80AB5BC8 03E00008 */ jr $ra +/* 0043C 80AB5BBC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00440 80AB5BC0 8FB1002C */ lw $s1, 0x002C($sp) +/* 00444 80AB5BC4 8FB20030 */ lw $s2, 0x0030($sp) +/* 00448 80AB5BC8 03E00008 */ jr $ra /* 0044C 80AB5BCC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s index a7c26a443a..b3a7eb0b91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s @@ -1,9 +1,9 @@ glabel EnNiwGirl_Draw /* 008C8 80AB9848 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 008CC 80AB984C 3C0F80AC */ lui $t7, %hi(D_80AB99CC) ## $t7 = 80AC0000 -/* 008D0 80AB9850 AFBF002C */ sw $ra, 0x002C($sp) -/* 008D4 80AB9854 AFB10028 */ sw $s1, 0x0028($sp) -/* 008D8 80AB9858 AFB00024 */ sw $s0, 0x0024($sp) +/* 008D0 80AB9850 AFBF002C */ sw $ra, 0x002C($sp) +/* 008D4 80AB9854 AFB10028 */ sw $s1, 0x0028($sp) +/* 008D8 80AB9858 AFB00024 */ sw $s0, 0x0024($sp) /* 008DC 80AB985C 25EF99CC */ addiu $t7, $t7, %lo(D_80AB99CC) ## $t7 = 80AB99CC /* 008E0 80AB9860 8DF90000 */ lw $t9, 0x0000($t7) ## 80AB99CC /* 008E4 80AB9864 27AE004C */ addiu $t6, $sp, 0x004C ## $t6 = FFFFFFEC @@ -19,11 +19,11 @@ glabel EnNiwGirl_Draw /* 0090C 80AB988C 24C69AEC */ addiu $a2, $a2, %lo(D_80AB9AEC) ## $a2 = 80AB9AEC /* 00910 80AB9890 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 /* 00914 80AB9894 2407023D */ addiu $a3, $zero, 0x023D ## $a3 = 0000023D -/* 00918 80AB9898 0C031AB1 */ jal func_800C6AC4 -/* 0091C 80AB989C AFA50048 */ sw $a1, 0x0048($sp) -/* 00920 80AB98A0 0C024F46 */ jal func_80093D18 +/* 00918 80AB9898 0C031AB1 */ jal func_800C6AC4 +/* 0091C 80AB989C AFA50048 */ sw $a1, 0x0048($sp) +/* 00920 80AB98A0 0C024F46 */ jal func_80093D18 /* 00924 80AB98A4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00928 80AB98A8 8FA50048 */ lw $a1, 0x0048($sp) +/* 00928 80AB98A8 8FA50048 */ lw $a1, 0x0048($sp) /* 0092C 80AB98AC 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 00930 80AB98B0 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 /* 00934 80AB98B4 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -35,44 +35,44 @@ glabel EnNiwGirl_Draw /* 0094C 80AB98CC 860A0272 */ lh $t2, 0x0272($s0) ## 00000272 /* 00950 80AB98D0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00954 80AB98D4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00958 80AB98D8 000A5880 */ sll $t3, $t2, 2 -/* 0095C 80AB98DC 008B2021 */ addu $a0, $a0, $t3 -/* 00960 80AB98E0 8C8499D8 */ lw $a0, %lo(D_80AB99D8)($a0) +/* 00958 80AB98D8 000A5880 */ sll $t3, $t2, 2 +/* 0095C 80AB98DC 008B2021 */ addu $a0, $a0, $t3 +/* 00960 80AB98E0 8C8499D8 */ lw $a0, %lo(D_80AB99D8)($a0) /* 00964 80AB98E4 3C0980AC */ lui $t1, %hi(func_80AB97E4) ## $t1 = 80AC0000 /* 00968 80AB98E8 252997E4 */ addiu $t1, $t1, %lo(func_80AB97E4) ## $t1 = 80AB97E4 -/* 0096C 80AB98EC 00046900 */ sll $t5, $a0, 4 -/* 00970 80AB98F0 000D7702 */ srl $t6, $t5, 28 -/* 00974 80AB98F4 000E7880 */ sll $t7, $t6, 2 -/* 00978 80AB98F8 030FC021 */ addu $t8, $t8, $t7 +/* 0096C 80AB98EC 00046900 */ sll $t5, $a0, 4 +/* 00970 80AB98F0 000D7702 */ srl $t6, $t5, 28 +/* 00974 80AB98F4 000E7880 */ sll $t7, $t6, 2 +/* 00978 80AB98F8 030FC021 */ addu $t8, $t8, $t7 /* 0097C 80AB98FC 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 -/* 00980 80AB9900 00816024 */ and $t4, $a0, $at +/* 00980 80AB9900 00816024 */ and $t4, $a0, $at /* 00984 80AB9904 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00988 80AB9908 0198C821 */ addu $t9, $t4, $t8 -/* 0098C 80AB990C 03214021 */ addu $t0, $t9, $at +/* 00988 80AB9908 0198C821 */ addu $t9, $t4, $t8 +/* 0098C 80AB990C 03214021 */ addu $t0, $t9, $at /* 00990 80AB9910 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 /* 00994 80AB9914 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 00998 80AB9918 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 0099C 80AB991C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 009A0 80AB9920 AFB00018 */ sw $s0, 0x0018($sp) -/* 009A4 80AB9924 AFA00014 */ sw $zero, 0x0014($sp) -/* 009A8 80AB9928 AFA90010 */ sw $t1, 0x0010($sp) -/* 009AC 80AB992C 0C0286B2 */ jal func_800A1AC8 +/* 009A0 80AB9920 AFB00018 */ sw $s0, 0x0018($sp) +/* 009A4 80AB9924 AFA00014 */ sw $zero, 0x0014($sp) +/* 009A8 80AB9928 AFA90010 */ sw $t1, 0x0010($sp) +/* 009AC 80AB992C 0C0286B2 */ jal SkelAnime_DrawSV /* 009B0 80AB9930 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 009B4 80AB9934 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 009B8 80AB9938 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFEC /* 009BC 80AB993C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 009C0 80AB9940 0C00CF0C */ jal func_80033C30 +/* 009C0 80AB9940 0C00CF0C */ jal func_80033C30 /* 009C4 80AB9944 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 /* 009C8 80AB9948 3C0680AC */ lui $a2, %hi(D_80AB9B00) ## $a2 = 80AC0000 /* 009CC 80AB994C 24C69B00 */ addiu $a2, $a2, %lo(D_80AB9B00) ## $a2 = 80AB9B00 /* 009D0 80AB9950 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 /* 009D4 80AB9954 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 009D8 80AB9958 0C031AD5 */ jal func_800C6B54 +/* 009D8 80AB9958 0C031AD5 */ jal func_800C6B54 /* 009DC 80AB995C 24070250 */ addiu $a3, $zero, 0x0250 ## $a3 = 00000250 -/* 009E0 80AB9960 8FBF002C */ lw $ra, 0x002C($sp) -/* 009E4 80AB9964 8FB00024 */ lw $s0, 0x0024($sp) -/* 009E8 80AB9968 8FB10028 */ lw $s1, 0x0028($sp) -/* 009EC 80AB996C 03E00008 */ jr $ra +/* 009E0 80AB9960 8FBF002C */ lw $ra, 0x002C($sp) +/* 009E4 80AB9964 8FB00024 */ lw $s0, 0x0024($sp) +/* 009E8 80AB9968 8FB10028 */ lw $s1, 0x0028($sp) +/* 009EC 80AB996C 03E00008 */ jr $ra /* 009F0 80AB9970 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 009F4 80AB9974 00000000 */ nop /* 009F8 80AB9978 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s index 349c7aa77f..5920760c84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s @@ -1,38 +1,38 @@ glabel EnNiwGirl_Init /* 00000 80AB8F80 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00004 80AB8F84 AFB00038 */ sw $s0, 0x0038($sp) +/* 00004 80AB8F84 AFB00038 */ sw $s0, 0x0038($sp) /* 00008 80AB8F88 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80AB8F8C AFBF003C */ sw $ra, 0x003C($sp) -/* 00010 80AB8F90 AFA5006C */ sw $a1, 0x006C($sp) +/* 0000C 80AB8F8C AFBF003C */ sw $ra, 0x003C($sp) +/* 00010 80AB8F90 AFA5006C */ sw $a1, 0x006C($sp) /* 00014 80AB8F94 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 00018 80AB8F98 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 /* 0001C 80AB8F9C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00020 80AB8FA0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00024 80AB8FA4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00028 80AB8FA8 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 0002C 80AB8FAC AFB80018 */ sw $t8, 0x0018($sp) +/* 0002C 80AB8FAC AFB80018 */ sw $t8, 0x0018($sp) /* 00030 80AB8FB0 24E70378 */ addiu $a3, $a3, 0x0378 ## $a3 = 06000378 /* 00034 80AB8FB4 24C69948 */ addiu $a2, $a2, 0x9948 ## $a2 = 06009948 /* 00038 80AB8FB8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0003C 80AB8FBC AFAF0014 */ sw $t7, 0x0014($sp) -/* 00040 80AB8FC0 0C0291BE */ jal func_800A46F8 -/* 00044 80AB8FC4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0003C 80AB8FBC AFAF0014 */ sw $t7, 0x0014($sp) +/* 00040 80AB8FC0 0C0291BE */ jal SkelAnime_InitSV +/* 00044 80AB8FC4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00048 80AB8FC8 26050288 */ addiu $a1, $s0, 0x0288 ## $a1 = 00000288 -/* 0004C 80AB8FCC AFA50040 */ sw $a1, 0x0040($sp) +/* 0004C 80AB8FCC AFA50040 */ sw $a1, 0x0040($sp) /* 00050 80AB8FD0 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00054 80AB8FD4 8FA4006C */ lw $a0, 0x006C($sp) + +/* 00054 80AB8FD4 8FA4006C */ lw $a0, 0x006C($sp) /* 00058 80AB8FD8 3C0780AC */ lui $a3, %hi(D_80AB99A0) ## $a3 = 80AC0000 -/* 0005C 80AB8FDC 8FA50040 */ lw $a1, 0x0040($sp) +/* 0005C 80AB8FDC 8FA50040 */ lw $a1, 0x0040($sp) /* 00060 80AB8FE0 24E799A0 */ addiu $a3, $a3, %lo(D_80AB99A0) ## $a3 = 80AB99A0 -/* 00064 80AB8FE4 8FA4006C */ lw $a0, 0x006C($sp) +/* 00064 80AB8FE4 8FA4006C */ lw $a0, 0x006C($sp) /* 00068 80AB8FE8 0C01712B */ jal ActorCollider_InitCylinder - + /* 0006C 80AB8FEC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00070 80AB8FF0 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 00074 80AB8FF4 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 /* 00078 80AB8FF8 A219001F */ sb $t9, 0x001F($s0) ## 0000001F -/* 0007C 80AB8FFC 04630004 */ bgezl $v1, .L80AB9010 +/* 0007C 80AB8FFC 04630004 */ bgezl $v1, .L80AB9010 /* 00080 80AB9000 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 /* 00084 80AB9004 A600001C */ sh $zero, 0x001C($s0) ## 0000001C /* 00088 80AB9008 8603001C */ lh $v1, 0x001C($s0) ## 0000001C @@ -43,103 +43,103 @@ glabel EnNiwGirl_Init /* 00098 80AB9018 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 /* 0009C 80AB901C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 000A0 80AB9020 44815000 */ mtc1 $at, $f10 ## $f10 = 32768.00 -/* 000A4 80AB9024 46803220 */ cvt.s.w $f8, $f6 -/* 000A8 80AB9028 00034203 */ sra $t0, $v1, 8 +/* 000A4 80AB9024 46803220 */ cvt.s.w $f8, $f6 +/* 000A8 80AB9028 00034203 */ sra $t0, $v1, 8 /* 000AC 80AB902C 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 00000000 /* 000B0 80AB9030 A6090276 */ sh $t1, 0x0276($s0) ## 00000276 /* 000B4 80AB9034 3C0180AC */ lui $at, %hi(D_80AB9B14) ## $at = 80AC0000 /* 000B8 80AB9038 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 000BC 80AB903C 460A4403 */ div.s $f16, $f8, $f10 -/* 000C0 80AB9040 C4329B14 */ lwc1 $f18, %lo(D_80AB9B14)($at) +/* 000BC 80AB903C 460A4403 */ div.s $f16, $f8, $f10 +/* 000C0 80AB9040 C4329B14 */ lwc1 $f18, %lo(D_80AB9B14)($at) /* 000C4 80AB9044 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 000C8 80AB9048 46128302 */ mul.s $f12, $f16, $f18 -/* 000CC 80AB904C 0C034348 */ jal Matrix_RotateY +/* 000C8 80AB9048 46128302 */ mul.s $f12, $f16, $f18 +/* 000CC 80AB904C 0C034348 */ jal Matrix_RotateY /* 000D0 80AB9050 00000000 */ nop /* 000D4 80AB9054 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 000D8 80AB9058 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 000DC 80AB905C 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 /* 000E0 80AB9060 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFEC /* 000E4 80AB9064 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFE0 -/* 000E8 80AB9068 E7A00050 */ swc1 $f0, 0x0050($sp) -/* 000EC 80AB906C E7A0004C */ swc1 $f0, 0x004C($sp) -/* 000F0 80AB9070 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 000F4 80AB9074 E7A00058 */ swc1 $f0, 0x0058($sp) -/* 000F8 80AB9078 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 000FC 80AB907C 0C0346BD */ jal Matrix_MultVec3f -/* 00100 80AB9080 E7A4005C */ swc1 $f4, 0x005C($sp) +/* 000E8 80AB9068 E7A00050 */ swc1 $f0, 0x0050($sp) +/* 000EC 80AB906C E7A0004C */ swc1 $f0, 0x004C($sp) +/* 000F0 80AB9070 E7A00048 */ swc1 $f0, 0x0048($sp) +/* 000F4 80AB9074 E7A00058 */ swc1 $f0, 0x0058($sp) +/* 000F8 80AB9078 E7A00054 */ swc1 $f0, 0x0054($sp) +/* 000FC 80AB907C 0C0346BD */ jal Matrix_MultVec3f +/* 00100 80AB9080 E7A4005C */ swc1 $f4, 0x005C($sp) /* 00104 80AB9084 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00108 80AB9088 C7A80048 */ lwc1 $f8, 0x0048($sp) -/* 0010C 80AB908C C7B2004C */ lwc1 $f18, 0x004C($sp) -/* 00110 80AB9090 8FA6006C */ lw $a2, 0x006C($sp) -/* 00114 80AB9094 46083280 */ add.s $f10, $f6, $f8 -/* 00118 80AB9098 C7A80050 */ lwc1 $f8, 0x0050($sp) +/* 00108 80AB9088 C7A80048 */ lwc1 $f8, 0x0048($sp) +/* 0010C 80AB908C C7B2004C */ lwc1 $f18, 0x004C($sp) +/* 00110 80AB9090 8FA6006C */ lw $a2, 0x006C($sp) +/* 00114 80AB9094 46083280 */ add.s $f10, $f6, $f8 +/* 00118 80AB9098 C7A80050 */ lwc1 $f8, 0x0050($sp) /* 0011C 80AB909C 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A /* 00120 80AB90A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00124 80AB90A4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00124 80AB90A4 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00128 80AB90A8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 0012C 80AB90AC 24070019 */ addiu $a3, $zero, 0x0019 ## $a3 = 00000019 /* 00130 80AB90B0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00134 80AB90B4 46128100 */ add.s $f4, $f16, $f18 -/* 00138 80AB90B8 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 00134 80AB90B4 46128100 */ add.s $f4, $f16, $f18 +/* 00138 80AB90B8 E7A40014 */ swc1 $f4, 0x0014($sp) /* 0013C 80AB90BC C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00140 80AB90C0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00144 80AB90C4 46083280 */ add.s $f10, $f6, $f8 -/* 00148 80AB90C8 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00140 80AB90C0 AFA0001C */ sw $zero, 0x001C($sp) +/* 00144 80AB90C4 46083280 */ add.s $f10, $f6, $f8 +/* 00148 80AB90C8 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 0014C 80AB90CC 860B0032 */ lh $t3, 0x0032($s0) ## 00000032 -/* 00150 80AB90D0 AFAC0028 */ sw $t4, 0x0028($sp) -/* 00154 80AB90D4 AFA00024 */ sw $zero, 0x0024($sp) +/* 00150 80AB90D0 AFAC0028 */ sw $t4, 0x0028($sp) +/* 00154 80AB90D4 AFA00024 */ sw $zero, 0x0024($sp) /* 00158 80AB90D8 0C00C916 */ jal Actor_SpawnAttached - -/* 0015C 80AB90DC AFAB0020 */ sw $t3, 0x0020($sp) -/* 00160 80AB90E0 10400012 */ beq $v0, $zero, .L80AB912C + +/* 0015C 80AB90DC AFAB0020 */ sw $t3, 0x0020($sp) +/* 00160 80AB90E0 10400012 */ beq $v0, $zero, .L80AB912C /* 00164 80AB90E4 AE020284 */ sw $v0, 0x0284($s0) ## 00000284 /* 00168 80AB90E8 3C0480AC */ lui $a0, %hi(D_80AB99F0) ## $a0 = 80AC0000 /* 0016C 80AB90EC 248499F0 */ addiu $a0, $a0, %lo(D_80AB99F0) ## $a0 = 80AB99F0 /* 00170 80AB90F0 0C00084C */ jal osSyncPrintf - + /* 00174 80AB90F4 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 00178 80AB90F8 3C0480AC */ lui $a0, %hi(D_80AB9A34) ## $a0 = 80AC0000 /* 0017C 80AB90FC 24849A34 */ addiu $a0, $a0, %lo(D_80AB9A34) ## $a0 = 80AB9A34 /* 00180 80AB9100 0C00084C */ jal osSyncPrintf - + /* 00184 80AB9104 86050276 */ lh $a1, 0x0276($s0) ## 00000276 /* 00188 80AB9108 3C0480AC */ lui $a0, %hi(D_80AB9A70) ## $a0 = 80AC0000 /* 0018C 80AB910C 0C00084C */ jal osSyncPrintf - + /* 00190 80AB9110 24849A70 */ addiu $a0, $a0, %lo(D_80AB9A70) ## $a0 = 80AB9A70 /* 00194 80AB9114 3C0E80AC */ lui $t6, %hi(func_80AB93C0) ## $t6 = 80AC0000 /* 00198 80AB9118 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF /* 0019C 80AB911C 25CE93C0 */ addiu $t6, $t6, %lo(func_80AB93C0) ## $t6 = 80AB93C0 /* 001A0 80AB9120 A20D00AE */ sb $t5, 0x00AE($s0) ## 000000AE -/* 001A4 80AB9124 10000011 */ beq $zero, $zero, .L80AB916C +/* 001A4 80AB9124 10000011 */ beq $zero, $zero, .L80AB916C /* 001A8 80AB9128 AE0E025C */ sw $t6, 0x025C($s0) ## 0000025C .L80AB912C: /* 001AC 80AB912C 3C0480AC */ lui $a0, %hi(D_80AB9A74) ## $a0 = 80AC0000 /* 001B0 80AB9130 0C00084C */ jal osSyncPrintf - + /* 001B4 80AB9134 24849A74 */ addiu $a0, $a0, %lo(D_80AB9A74) ## $a0 = 80AB9A74 /* 001B8 80AB9138 3C0480AC */ lui $a0, %hi(D_80AB9A78) ## $a0 = 80AC0000 /* 001BC 80AB913C 24849A78 */ addiu $a0, $a0, %lo(D_80AB9A78) ## $a0 = 80AB9A78 /* 001C0 80AB9140 0C00084C */ jal osSyncPrintf - + /* 001C4 80AB9144 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 001C8 80AB9148 3C0480AC */ lui $a0, %hi(D_80AB9AB8) ## $a0 = 80AC0000 /* 001CC 80AB914C 24849AB8 */ addiu $a0, $a0, %lo(D_80AB9AB8) ## $a0 = 80AB9AB8 /* 001D0 80AB9150 0C00084C */ jal osSyncPrintf - + /* 001D4 80AB9154 86050276 */ lh $a1, 0x0276($s0) ## 00000276 /* 001D8 80AB9158 3C0480AC */ lui $a0, %hi(D_80AB9AE8) ## $a0 = 80AC0000 /* 001DC 80AB915C 0C00084C */ jal osSyncPrintf - + /* 001E0 80AB9160 24849AE8 */ addiu $a0, $a0, %lo(D_80AB9AE8) ## $a0 = 80AB9AE8 /* 001E4 80AB9164 0C00B55C */ jal Actor_Kill - + /* 001E8 80AB9168 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AB916C: -/* 001EC 80AB916C 8FBF003C */ lw $ra, 0x003C($sp) -/* 001F0 80AB9170 8FB00038 */ lw $s0, 0x0038($sp) +/* 001EC 80AB916C 8FBF003C */ lw $ra, 0x003C($sp) +/* 001F0 80AB9170 8FB00038 */ lw $s0, 0x0038($sp) /* 001F4 80AB9174 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 001F8 80AB9178 03E00008 */ jr $ra +/* 001F8 80AB9178 03E00008 */ jr $ra /* 001FC 80AB917C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s index 2d53d65714..b2e848380f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s @@ -1,59 +1,59 @@ glabel func_80AB9F24 /* 002E4 80AB9F24 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 002E8 80AB9F28 AFB00028 */ sw $s0, 0x0028($sp) +/* 002E8 80AB9F28 AFB00028 */ sw $s0, 0x0028($sp) /* 002EC 80AB9F2C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 002F0 80AB9F30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 002F4 80AB9F34 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 002F8 80AB9F38 AFBF002C */ sw $ra, 0x002C($sp) -/* 002FC 80AB9F3C AFA5004C */ sw $a1, 0x004C($sp) -/* 00300 80AB9F40 00A12021 */ addu $a0, $a1, $at +/* 002F8 80AB9F38 AFBF002C */ sw $ra, 0x002C($sp) +/* 002FC 80AB9F3C AFA5004C */ sw $a1, 0x004C($sp) +/* 00300 80AB9F40 00A12021 */ addu $a0, $a1, $at /* 00304 80AB9F44 82050280 */ lb $a1, 0x0280($s0) ## 00000280 /* 00308 80AB9F48 0C026062 */ jal Object_IsLoaded - -/* 0030C 80AB9F4C AFA40038 */ sw $a0, 0x0038($sp) -/* 00310 80AB9F50 104000AD */ beq $v0, $zero, .L80ABA208 -/* 00314 80AB9F54 8FA40038 */ lw $a0, 0x0038($sp) + +/* 0030C 80AB9F4C AFA40038 */ sw $a0, 0x0038($sp) +/* 00310 80AB9F50 104000AD */ beq $v0, $zero, .L80ABA208 +/* 00314 80AB9F54 8FA40038 */ lw $a0, 0x0038($sp) /* 00318 80AB9F58 0C026062 */ jal Object_IsLoaded - + /* 0031C 80AB9F5C 82050281 */ lb $a1, 0x0281($s0) ## 00000281 -/* 00320 80AB9F60 104000A9 */ beq $v0, $zero, .L80ABA208 -/* 00324 80AB9F64 8FA4004C */ lw $a0, 0x004C($sp) +/* 00320 80AB9F60 104000A9 */ beq $v0, $zero, .L80ABA208 +/* 00324 80AB9F64 8FA4004C */ lw $a0, 0x004C($sp) /* 00328 80AB9F68 820E0280 */ lb $t6, 0x0280($s0) ## 00000280 /* 0032C 80AB9F6C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 /* 00330 80AB9F70 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00334 80AB9F74 000E7900 */ sll $t7, $t6, 4 -/* 00338 80AB9F78 01EE7821 */ addu $t7, $t7, $t6 -/* 0033C 80AB9F7C 000F7880 */ sll $t7, $t7, 2 -/* 00340 80AB9F80 008FC021 */ addu $t8, $a0, $t7 -/* 00344 80AB9F84 0338C821 */ addu $t9, $t9, $t8 +/* 00334 80AB9F74 000E7900 */ sll $t7, $t6, 4 +/* 00338 80AB9F78 01EE7821 */ addu $t7, $t7, $t6 +/* 0033C 80AB9F7C 000F7880 */ sll $t7, $t7, 2 +/* 00340 80AB9F80 008FC021 */ addu $t8, $a0, $t7 +/* 00344 80AB9F84 0338C821 */ addu $t9, $t9, $t8 /* 00348 80AB9F88 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 /* 0034C 80AB9F8C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00350 80AB9F90 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00354 80AB9F94 03214021 */ addu $t0, $t9, $at +/* 00354 80AB9F94 03214021 */ addu $t0, $t9, $at /* 00358 80AB9F98 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 0035C 80AB9F9C 26090190 */ addiu $t1, $s0, 0x0190 ## $t1 = 00000190 /* 00360 80AB9FA0 260A01F0 */ addiu $t2, $s0, 0x01F0 ## $t2 = 000001F0 /* 00364 80AB9FA4 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 /* 00368 80AB9FA8 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 -/* 0036C 80AB9FAC AFAB0018 */ sw $t3, 0x0018($sp) -/* 00370 80AB9FB0 AFAA0014 */ sw $t2, 0x0014($sp) -/* 00374 80AB9FB4 AFA90010 */ sw $t1, 0x0010($sp) +/* 0036C 80AB9FAC AFAB0018 */ sw $t3, 0x0018($sp) +/* 00370 80AB9FB0 AFAA0014 */ sw $t2, 0x0014($sp) +/* 00374 80AB9FB4 AFA90010 */ sw $t1, 0x0010($sp) /* 00378 80AB9FB8 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 0037C 80AB9FBC AFA50038 */ sw $a1, 0x0038($sp) -/* 00380 80AB9FC0 0C0291BE */ jal func_800A46F8 +/* 0037C 80AB9FBC AFA50038 */ sw $a1, 0x0038($sp) +/* 00380 80AB9FC0 0C0291BE */ jal SkelAnime_InitSV /* 00384 80AB9FC4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00388 80AB9FC8 820D0281 */ lb $t5, 0x0281($s0) ## 00000281 -/* 0038C 80AB9FCC 8FAC004C */ lw $t4, 0x004C($sp) +/* 0038C 80AB9FCC 8FAC004C */ lw $t4, 0x004C($sp) /* 00390 80AB9FD0 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 00394 80AB9FD4 000D7100 */ sll $t6, $t5, 4 -/* 00398 80AB9FD8 01CD7021 */ addu $t6, $t6, $t5 -/* 0039C 80AB9FDC 000E7080 */ sll $t6, $t6, 2 -/* 003A0 80AB9FE0 018E7821 */ addu $t7, $t4, $t6 -/* 003A4 80AB9FE4 030FC021 */ addu $t8, $t8, $t7 +/* 00394 80AB9FD4 000D7100 */ sll $t6, $t5, 4 +/* 00398 80AB9FD8 01CD7021 */ addu $t6, $t6, $t5 +/* 0039C 80AB9FDC 000E7080 */ sll $t6, $t6, 2 +/* 003A0 80AB9FE0 018E7821 */ addu $t7, $t4, $t6 +/* 003A4 80AB9FE4 030FC021 */ addu $t8, $t8, $t7 /* 003A8 80AB9FE8 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 /* 003AC 80AB9FEC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 003B0 80AB9FF0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 003B4 80AB9FF4 0301C821 */ addu $t9, $t8, $at +/* 003B4 80AB9FF4 0301C821 */ addu $t9, $t8, $at /* 003B8 80AB9FF8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 003BC 80AB9FFC AC396FC0 */ sw $t9, 0x6FC0($at) ## 80166FC0 /* 003C0 80ABA000 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 @@ -63,26 +63,26 @@ glabel func_80AB9F24 /* 003D0 80ABA010 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 003D4 80ABA014 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 003D8 80ABA018 0C00B58B */ jal Actor_SetScale - + /* 003DC 80ABA01C E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 003E0 80ABA020 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 003E4 80ABA024 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 003E8 80ABA028 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 003EC 80ABA02C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 003F0 80ABA030 0C00AC78 */ jal ActorShape_Init - + /* 003F4 80ABA034 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 003F8 80ABA038 260502B0 */ addiu $a1, $s0, 0x02B0 ## $a1 = 000002B0 -/* 003FC 80ABA03C AFA50034 */ sw $a1, 0x0034($sp) +/* 003FC 80ABA03C AFA50034 */ sw $a1, 0x0034($sp) /* 00400 80ABA040 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00404 80ABA044 8FA4004C */ lw $a0, 0x004C($sp) + +/* 00404 80ABA044 8FA4004C */ lw $a0, 0x004C($sp) /* 00408 80ABA048 3C0780AC */ lui $a3, %hi(D_80ABB3C4) ## $a3 = 80AC0000 -/* 0040C 80ABA04C 8FA50034 */ lw $a1, 0x0034($sp) +/* 0040C 80ABA04C 8FA50034 */ lw $a1, 0x0034($sp) /* 00410 80ABA050 24E7B3C4 */ addiu $a3, $a3, %lo(D_80ABB3C4) ## $a3 = 80ABB3C4 -/* 00414 80ABA054 8FA4004C */ lw $a0, 0x004C($sp) +/* 00414 80ABA054 8FA4004C */ lw $a0, 0x004C($sp) /* 00418 80ABA058 0C01712B */ jal ActorCollider_InitCylinder - + /* 0041C 80ABA05C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00420 80ABA060 86030278 */ lh $v1, 0x0278($s0) ## 00000278 /* 00424 80ABA064 3C0A80AC */ lui $t2, %hi(func_80ABB228) ## $t2 = 80AC0000 @@ -90,123 +90,123 @@ glabel func_80AB9F24 /* 0042C 80ABA06C 254AB228 */ addiu $t2, $t2, %lo(func_80ABB228) ## $t2 = 80ABB228 /* 00430 80ABA070 A2000272 */ sb $zero, 0x0272($s0) ## 00000272 /* 00434 80ABA074 A209001F */ sb $t1, 0x001F($s0) ## 0000001F -/* 00438 80ABA078 10600006 */ beq $v1, $zero, .L80ABA094 +/* 00438 80ABA078 10600006 */ beq $v1, $zero, .L80ABA094 /* 0043C 80ABA07C AE0A0134 */ sw $t2, 0x0134($s0) ## 00000134 /* 00440 80ABA080 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00444 80ABA084 10610047 */ beq $v1, $at, .L80ABA1A4 +/* 00444 80ABA084 10610047 */ beq $v1, $at, .L80ABA1A4 /* 00448 80ABA088 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0044C 80ABA08C 1000005F */ beq $zero, $zero, .L80ABA20C -/* 00450 80ABA090 8FBF002C */ lw $ra, 0x002C($sp) +/* 0044C 80ABA08C 1000005F */ beq $zero, $zero, .L80ABA20C +/* 00450 80ABA090 8FBF002C */ lw $ra, 0x002C($sp) .L80ABA094: /* 00454 80ABA094 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00458 80ABA098 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 0045C 80ABA09C 944B0EF0 */ lhu $t3, 0x0EF0($v0) ## 8015F550 /* 00460 80ABA0A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00464 80ABA0A4 316D1000 */ andi $t5, $t3, 0x1000 ## $t5 = 00000000 -/* 00468 80ABA0A8 15A0001D */ bne $t5, $zero, .L80ABA120 +/* 00468 80ABA0A8 15A0001D */ bne $t5, $zero, .L80ABA120 /* 0046C 80ABA0AC 00000000 */ nop /* 00470 80ABA0B0 8C4C0004 */ lw $t4, 0x0004($v0) ## 8015E664 -/* 00474 80ABA0B4 1180001A */ beq $t4, $zero, .L80ABA120 +/* 00474 80ABA0B4 1180001A */ beq $t4, $zero, .L80ABA120 /* 00478 80ABA0B8 00000000 */ nop /* 0047C 80ABA0BC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00480 80ABA0C0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00484 80ABA0C4 2484A630 */ addiu $a0, $a0, 0xA630 ## $a0 = 0600A630 /* 00488 80ABA0C8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0048C 80ABA0CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00490 80ABA0D0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00494 80ABA0D4 46803220 */ cvt.s.w $f8, $f6 -/* 00498 80ABA0D8 44070000 */ mfc1 $a3, $f0 +/* 00494 80ABA0D4 46803220 */ cvt.s.w $f8, $f6 +/* 00498 80ABA0D8 44070000 */ mfc1 $a3, $f0 /* 0049C 80ABA0DC 24A5A630 */ addiu $a1, $a1, 0xA630 ## $a1 = 0600A630 -/* 004A0 80ABA0E0 8FA40038 */ lw $a0, 0x0038($sp) +/* 004A0 80ABA0E0 8FA40038 */ lw $a0, 0x0038($sp) /* 004A4 80ABA0E4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 004A8 80ABA0E8 AFA00014 */ sw $zero, 0x0014($sp) -/* 004AC 80ABA0EC 4600428D */ trunc.w.s $f10, $f8 -/* 004B0 80ABA0F0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 004B4 80ABA0F4 440F5000 */ mfc1 $t7, $f10 +/* 004A8 80ABA0E8 AFA00014 */ sw $zero, 0x0014($sp) +/* 004AC 80ABA0EC 4600428D */ trunc.w.s $f10, $f8 +/* 004B0 80ABA0F0 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 004B4 80ABA0F4 440F5000 */ mfc1 $t7, $f10 /* 004B8 80ABA0F8 00000000 */ nop -/* 004BC 80ABA0FC 000FC400 */ sll $t8, $t7, 16 -/* 004C0 80ABA100 0018CC03 */ sra $t9, $t8, 16 +/* 004BC 80ABA0FC 000FC400 */ sll $t8, $t7, 16 +/* 004C0 80ABA100 0018CC03 */ sra $t9, $t8, 16 /* 004C4 80ABA104 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 /* 004C8 80ABA108 00000000 */ nop -/* 004CC 80ABA10C 468084A0 */ cvt.s.w $f18, $f16 +/* 004CC 80ABA10C 468084A0 */ cvt.s.w $f18, $f16 /* 004D0 80ABA110 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 004D4 80ABA114 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 004D8 80ABA118 10000017 */ beq $zero, $zero, .L80ABA178 + +/* 004D4 80ABA114 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 004D8 80ABA118 10000017 */ beq $zero, $zero, .L80ABA178 /* 004DC 80ABA11C 00000000 */ nop .L80ABA120: /* 004E0 80ABA120 0C028800 */ jal SkelAnime_GetFrameCount - + /* 004E4 80ABA124 248407D0 */ addiu $a0, $a0, 0x07D0 ## $a0 = 000007D0 /* 004E8 80ABA128 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 004EC 80ABA12C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 004F0 80ABA130 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004F4 80ABA134 468021A0 */ cvt.s.w $f6, $f4 -/* 004F8 80ABA138 44070000 */ mfc1 $a3, $f0 +/* 004F4 80ABA134 468021A0 */ cvt.s.w $f6, $f4 +/* 004F8 80ABA138 44070000 */ mfc1 $a3, $f0 /* 004FC 80ABA13C 24A507D0 */ addiu $a1, $a1, 0x07D0 ## $a1 = 060007D0 -/* 00500 80ABA140 8FA40038 */ lw $a0, 0x0038($sp) +/* 00500 80ABA140 8FA40038 */ lw $a0, 0x0038($sp) /* 00504 80ABA144 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00508 80ABA148 AFA00014 */ sw $zero, 0x0014($sp) -/* 0050C 80ABA14C 4600320D */ trunc.w.s $f8, $f6 -/* 00510 80ABA150 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00514 80ABA154 44094000 */ mfc1 $t1, $f8 +/* 00508 80ABA148 AFA00014 */ sw $zero, 0x0014($sp) +/* 0050C 80ABA14C 4600320D */ trunc.w.s $f8, $f6 +/* 00510 80ABA150 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00514 80ABA154 44094000 */ mfc1 $t1, $f8 /* 00518 80ABA158 00000000 */ nop -/* 0051C 80ABA15C 00095400 */ sll $t2, $t1, 16 -/* 00520 80ABA160 000A5C03 */ sra $t3, $t2, 16 +/* 0051C 80ABA15C 00095400 */ sll $t2, $t1, 16 +/* 00520 80ABA160 000A5C03 */ sra $t3, $t2, 16 /* 00524 80ABA164 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 /* 00528 80ABA168 00000000 */ nop -/* 0052C 80ABA16C 46805420 */ cvt.s.w $f16, $f10 +/* 0052C 80ABA16C 46805420 */ cvt.s.w $f16, $f10 /* 00530 80ABA170 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00534 80ABA174 E7B00010 */ swc1 $f16, 0x0010($sp) + +/* 00534 80ABA174 E7B00010 */ swc1 $f16, 0x0010($sp) .L80ABA178: /* 00538 80ABA178 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 0053C 80ABA17C 8DADE664 */ lw $t5, -0x199C($t5) ## 8015E664 /* 00540 80ABA180 3C0E80AC */ lui $t6, %hi(func_80ABA21C) ## $t6 = 80AC0000 /* 00544 80ABA184 3C0C80AC */ lui $t4, %hi(func_80ABA778) ## $t4 = 80AC0000 -/* 00548 80ABA188 15A00004 */ bne $t5, $zero, .L80ABA19C +/* 00548 80ABA188 15A00004 */ bne $t5, $zero, .L80ABA19C /* 0054C 80ABA18C 25CEA21C */ addiu $t6, $t6, %lo(func_80ABA21C) ## $t6 = 80ABA21C /* 00550 80ABA190 258CA778 */ addiu $t4, $t4, %lo(func_80ABA778) ## $t4 = 80ABA778 -/* 00554 80ABA194 1000001C */ beq $zero, $zero, .L80ABA208 +/* 00554 80ABA194 1000001C */ beq $zero, $zero, .L80ABA208 /* 00558 80ABA198 AE0C0250 */ sw $t4, 0x0250($s0) ## 00000250 .L80ABA19C: -/* 0055C 80ABA19C 1000001A */ beq $zero, $zero, .L80ABA208 +/* 0055C 80ABA19C 1000001A */ beq $zero, $zero, .L80ABA208 /* 00560 80ABA1A0 AE0E0250 */ sw $t6, 0x0250($s0) ## 00000250 .L80ABA1A4: /* 00564 80ABA1A4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00568 80ABA1A8 248407D0 */ addiu $a0, $a0, 0x07D0 ## $a0 = 000007D0 /* 0056C 80ABA1AC 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 00570 80ABA1B0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00574 80ABA1B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00578 80ABA1B8 46809120 */ cvt.s.w $f4, $f18 -/* 0057C 80ABA1BC 44070000 */ mfc1 $a3, $f0 +/* 00578 80ABA1B8 46809120 */ cvt.s.w $f4, $f18 +/* 0057C 80ABA1BC 44070000 */ mfc1 $a3, $f0 /* 00580 80ABA1C0 24A507D0 */ addiu $a1, $a1, 0x07D0 ## $a1 = 060007D0 -/* 00584 80ABA1C4 8FA40038 */ lw $a0, 0x0038($sp) +/* 00584 80ABA1C4 8FA40038 */ lw $a0, 0x0038($sp) /* 00588 80ABA1C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0058C 80ABA1CC AFA00014 */ sw $zero, 0x0014($sp) -/* 00590 80ABA1D0 4600218D */ trunc.w.s $f6, $f4 -/* 00594 80ABA1D4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00598 80ABA1D8 44183000 */ mfc1 $t8, $f6 +/* 0058C 80ABA1CC AFA00014 */ sw $zero, 0x0014($sp) +/* 00590 80ABA1D0 4600218D */ trunc.w.s $f6, $f4 +/* 00594 80ABA1D4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00598 80ABA1D8 44183000 */ mfc1 $t8, $f6 /* 0059C 80ABA1DC 00000000 */ nop -/* 005A0 80ABA1E0 0018CC00 */ sll $t9, $t8, 16 -/* 005A4 80ABA1E4 00194403 */ sra $t0, $t9, 16 +/* 005A0 80ABA1E0 0018CC00 */ sll $t9, $t8, 16 +/* 005A4 80ABA1E4 00194403 */ sra $t0, $t9, 16 /* 005A8 80ABA1E8 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 /* 005AC 80ABA1EC 00000000 */ nop -/* 005B0 80ABA1F0 468042A0 */ cvt.s.w $f10, $f8 +/* 005B0 80ABA1F0 468042A0 */ cvt.s.w $f10, $f8 /* 005B4 80ABA1F4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005B8 80ABA1F8 E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 005B8 80ABA1F8 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 005BC 80ABA1FC 3C0980AC */ lui $t1, %hi(func_80ABAD38) ## $t1 = 80AC0000 /* 005C0 80ABA200 2529AD38 */ addiu $t1, $t1, %lo(func_80ABAD38) ## $t1 = 80ABAD38 /* 005C4 80ABA204 AE090250 */ sw $t1, 0x0250($s0) ## 00000250 .L80ABA208: -/* 005C8 80ABA208 8FBF002C */ lw $ra, 0x002C($sp) +/* 005C8 80ABA208 8FBF002C */ lw $ra, 0x002C($sp) .L80ABA20C: -/* 005CC 80ABA20C 8FB00028 */ lw $s0, 0x0028($sp) +/* 005CC 80ABA20C 8FB00028 */ lw $s0, 0x0028($sp) /* 005D0 80ABA210 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 005D4 80ABA214 03E00008 */ jr $ra +/* 005D4 80ABA214 03E00008 */ jr $ra /* 005D8 80ABA218 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s index 6dd94663bc..f8383e4f3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s @@ -1,25 +1,25 @@ glabel func_80ABB228 /* 015E8 80ABB228 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 015EC 80ABB22C AFB10028 */ sw $s1, 0x0028($sp) +/* 015EC 80ABB22C AFB10028 */ sw $s1, 0x0028($sp) /* 015F0 80ABB230 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 015F4 80ABB234 AFBF002C */ sw $ra, 0x002C($sp) -/* 015F8 80ABB238 AFB00024 */ sw $s0, 0x0024($sp) +/* 015F4 80ABB234 AFBF002C */ sw $ra, 0x002C($sp) +/* 015F8 80ABB238 AFB00024 */ sw $s0, 0x0024($sp) /* 015FC 80ABB23C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01600 80ABB240 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01604 80ABB244 3C0680AC */ lui $a2, %hi(D_80ABB71C) ## $a2 = 80AC0000 /* 01608 80ABB248 24C6B71C */ addiu $a2, $a2, %lo(D_80ABB71C) ## $a2 = 80ABB71C /* 0160C 80ABB24C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 01610 80ABB250 24070543 */ addiu $a3, $zero, 0x0543 ## $a3 = 00000543 -/* 01614 80ABB254 0C031AB1 */ jal func_800C6AC4 -/* 01618 80ABB258 AFA50054 */ sw $a1, 0x0054($sp) +/* 01614 80ABB254 0C031AB1 */ jal func_800C6AC4 +/* 01618 80ABB258 AFA50054 */ sw $a1, 0x0054($sp) /* 0161C 80ABB25C 860E027E */ lh $t6, 0x027E($s0) ## 0000027E -/* 01620 80ABB260 8FA80054 */ lw $t0, 0x0054($sp) -/* 01624 80ABB264 11C00039 */ beq $t6, $zero, .L80ABB34C +/* 01620 80ABB260 8FA80054 */ lw $t0, 0x0054($sp) +/* 01624 80ABB264 11C00039 */ beq $t6, $zero, .L80ABB34C /* 01628 80ABB268 00000000 */ nop /* 0162C 80ABB26C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01630 80ABB270 0C024F46 */ jal func_80093D18 -/* 01634 80ABB274 AFA80054 */ sw $t0, 0x0054($sp) -/* 01638 80ABB278 8FA80054 */ lw $t0, 0x0054($sp) +/* 01630 80ABB270 0C024F46 */ jal func_80093D18 +/* 01634 80ABB274 AFA80054 */ sw $t0, 0x0054($sp) +/* 01638 80ABB278 8FA80054 */ lw $t0, 0x0054($sp) /* 0163C 80ABB27C 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 /* 01640 80ABB280 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 01644 80ABB284 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 @@ -38,51 +38,51 @@ glabel func_80ABB228 /* 01678 80ABB2B8 860B027C */ lh $t3, 0x027C($s0) ## 0000027C /* 0167C 80ABB2BC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01680 80ABB2C0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01684 80ABB2C4 000B6080 */ sll $t4, $t3, 2 -/* 01688 80ABB2C8 008C2021 */ addu $a0, $a0, $t4 -/* 0168C 80ABB2CC 8C84B408 */ lw $a0, %lo(D_80ABB408)($a0) +/* 01684 80ABB2C4 000B6080 */ sll $t4, $t3, 2 +/* 01688 80ABB2C8 008C2021 */ addu $a0, $a0, $t4 +/* 0168C 80ABB2CC 8C84B408 */ lw $a0, %lo(D_80ABB408)($a0) /* 01690 80ABB2D0 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 01694 80ABB2D4 358C0030 */ ori $t4, $t4, 0x0030 ## $t4 = DB060030 -/* 01698 80ABB2D8 00047100 */ sll $t6, $a0, 4 -/* 0169C 80ABB2DC 000E7F02 */ srl $t7, $t6, 28 -/* 016A0 80ABB2E0 000FC080 */ sll $t8, $t7, 2 -/* 016A4 80ABB2E4 0338C821 */ addu $t9, $t9, $t8 +/* 01698 80ABB2D8 00047100 */ sll $t6, $a0, 4 +/* 0169C 80ABB2DC 000E7F02 */ srl $t7, $t6, 28 +/* 016A0 80ABB2E0 000FC080 */ sll $t8, $t7, 2 +/* 016A4 80ABB2E4 0338C821 */ addu $t9, $t9, $t8 /* 016A8 80ABB2E8 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 -/* 016AC 80ABB2EC 00816824 */ and $t5, $a0, $at +/* 016AC 80ABB2EC 00816824 */ and $t5, $a0, $at /* 016B0 80ABB2F0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 016B4 80ABB2F4 01B94821 */ addu $t1, $t5, $t9 -/* 016B8 80ABB2F8 01215021 */ addu $t2, $t1, $at +/* 016B4 80ABB2F4 01B94821 */ addu $t1, $t5, $t9 +/* 016B8 80ABB2F8 01215021 */ addu $t2, $t1, $at /* 016BC 80ABB2FC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 016C0 80ABB300 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 016C4 80ABB304 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 016C8 80ABB308 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 016CC 80ABB30C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 016D0 80ABB310 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 016D4 80ABB314 0C2AEC28 */ jal func_80ABB0A0 -/* 016D8 80ABB318 AFA20038 */ sw $v0, 0x0038($sp) -/* 016DC 80ABB31C 8FA30038 */ lw $v1, 0x0038($sp) +/* 016D4 80ABB314 0C2AEC28 */ jal func_80ABB0A0 +/* 016D8 80ABB318 AFA20038 */ sw $v0, 0x0038($sp) +/* 016DC 80ABB31C 8FA30038 */ lw $v1, 0x0038($sp) /* 016E0 80ABB320 3C0E80AC */ lui $t6, %hi(func_80ABB0CC) ## $t6 = 80AC0000 /* 016E4 80ABB324 25CEB0CC */ addiu $t6, $t6, %lo(func_80ABB0CC) ## $t6 = 80ABB0CC /* 016E8 80ABB328 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 016EC 80ABB32C 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 016F0 80ABB330 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 016F4 80ABB334 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 016F8 80ABB338 AFB00018 */ sw $s0, 0x0018($sp) -/* 016FC 80ABB33C AFA00014 */ sw $zero, 0x0014($sp) -/* 01700 80ABB340 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01704 80ABB344 0C0286B2 */ jal func_800A1AC8 +/* 016F8 80ABB338 AFB00018 */ sw $s0, 0x0018($sp) +/* 016FC 80ABB33C AFA00014 */ sw $zero, 0x0014($sp) +/* 01700 80ABB340 AFAE0010 */ sw $t6, 0x0010($sp) +/* 01704 80ABB344 0C0286B2 */ jal SkelAnime_DrawSV /* 01708 80ABB348 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80ABB34C: /* 0170C 80ABB34C 3C0680AC */ lui $a2, %hi(D_80ABB730) ## $a2 = 80AC0000 /* 01710 80ABB350 24C6B730 */ addiu $a2, $a2, %lo(D_80ABB730) ## $a2 = 80ABB730 /* 01714 80ABB354 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 01718 80ABB358 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0171C 80ABB35C 0C031AD5 */ jal func_800C6B54 +/* 0171C 80ABB35C 0C031AD5 */ jal func_800C6B54 /* 01720 80ABB360 2407055A */ addiu $a3, $zero, 0x055A ## $a3 = 0000055A -/* 01724 80ABB364 8FBF002C */ lw $ra, 0x002C($sp) -/* 01728 80ABB368 8FB00024 */ lw $s0, 0x0024($sp) -/* 0172C 80ABB36C 8FB10028 */ lw $s1, 0x0028($sp) -/* 01730 80ABB370 03E00008 */ jr $ra +/* 01724 80ABB364 8FBF002C */ lw $ra, 0x002C($sp) +/* 01728 80ABB368 8FB00024 */ lw $s0, 0x0024($sp) +/* 0172C 80ABB36C 8FB10028 */ lw $s1, 0x0028($sp) +/* 01730 80ABB370 03E00008 */ jr $ra /* 01734 80ABB374 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 01738 80ABB378 00000000 */ nop /* 0173C 80ABB37C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s index b62da0f51d..32effd58b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s @@ -1,29 +1,29 @@ glabel func_80AC0B60 /* 00500 80AC0B60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00504 80AC0B64 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00504 80AC0B64 AFBF0014 */ sw $ra, 0x0014($sp) /* 00508 80AC0B68 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0050C 80AC0B6C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00510 80AC0B70 24A50DDC */ addiu $a1, $a1, 0x0DDC ## $a1 = 06000DDC -/* 00514 80AC0B74 AFA60018 */ sw $a2, 0x0018($sp) -/* 00518 80AC0B78 0C0294BE */ jal func_800A52F8 +/* 00514 80AC0B74 AFA60018 */ sw $a2, 0x0018($sp) +/* 00518 80AC0B78 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 0051C 80AC0B7C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00520 80AC0B80 8FA60018 */ lw $a2, 0x0018($sp) +/* 00520 80AC0B80 8FA60018 */ lw $a2, 0x0018($sp) /* 00524 80AC0B84 3C0E80AC */ lui $t6, %hi(func_80AC12D8) ## $t6 = 80AC0000 /* 00528 80AC0B88 25CE12D8 */ addiu $t6, $t6, %lo(func_80AC12D8) ## $t6 = 80AC12D8 /* 0052C 80AC0B8C 8CCF0190 */ lw $t7, 0x0190($a2) ## 00000190 /* 00530 80AC0B90 3C1980AC */ lui $t9, %hi(func_80AC11A8) ## $t9 = 80AC0000 /* 00534 80AC0B94 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00538 80AC0B98 15CF0003 */ bne $t6, $t7, .L80AC0BA8 +/* 00538 80AC0B98 15CF0003 */ bne $t6, $t7, .L80AC0BA8 /* 0053C 80AC0B9C 273911A8 */ addiu $t9, $t9, %lo(func_80AC11A8) ## $t9 = 80AC11A8 -/* 00540 80AC0BA0 10000002 */ beq $zero, $zero, .L80AC0BAC +/* 00540 80AC0BA0 10000002 */ beq $zero, $zero, .L80AC0BAC /* 00544 80AC0BA4 A4D80194 */ sh $t8, 0x0194($a2) ## 00000194 .L80AC0BA8: /* 00548 80AC0BA8 A4C00194 */ sh $zero, 0x0194($a2) ## 00000194 .L80AC0BAC: /* 0054C 80AC0BAC ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 -/* 00550 80AC0BB0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00550 80AC0BB0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00554 80AC0BB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00558 80AC0BB8 03E00008 */ jr $ra +/* 00558 80AC0BB8 03E00008 */ jr $ra /* 0055C 80AC0BBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s index ababcb0017..28c68c06ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s @@ -1,18 +1,18 @@ glabel EnOssan_Destroy /* 00A6C 80AC370C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A70 80AC3710 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A74 80AC3714 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A78 80AC3718 AFA5001C */ sw $a1, 0x001C($sp) -/* 00A7C 80AC371C 0C0295BC */ jal func_800A56F0 +/* 00A70 80AC3710 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00A74 80AC3714 AFA40018 */ sw $a0, 0x0018($sp) +/* 00A78 80AC3718 AFA5001C */ sw $a1, 0x001C($sp) +/* 00A7C 80AC371C 0C0295BC */ jal SkelAnime_Free /* 00A80 80AC3720 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A84 80AC3724 8FA50018 */ lw $a1, 0x0018($sp) -/* 00A88 80AC3728 8FA4001C */ lw $a0, 0x001C($sp) +/* 00A84 80AC3724 8FA50018 */ lw $a1, 0x0018($sp) +/* 00A88 80AC3728 8FA4001C */ lw $a0, 0x001C($sp) /* 00A8C 80AC372C 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 00A90 80AC3730 24A50198 */ addiu $a1, $a1, 0x0198 ## $a1 = 00000198 -/* 00A94 80AC3734 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00A94 80AC3734 8FBF0014 */ lw $ra, 0x0014($sp) /* 00A98 80AC3738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A9C 80AC373C 03E00008 */ jr $ra +/* 00A9C 80AC373C 03E00008 */ jr $ra /* 00AA0 80AC3740 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s index 82dc81487c..831c206390 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s @@ -1,27 +1,27 @@ glabel func_80AC6ADC /* 03E3C 80AC6ADC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03E40 80AC6AE0 AFA40028 */ sw $a0, 0x0028($sp) -/* 03E44 80AC6AE4 AFA5002C */ sw $a1, 0x002C($sp) +/* 03E40 80AC6AE0 AFA40028 */ sw $a0, 0x0028($sp) +/* 03E44 80AC6AE4 AFA5002C */ sw $a1, 0x002C($sp) /* 03E48 80AC6AE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03E4C 80AC6AEC 8FA50028 */ lw $a1, 0x0028($sp) -/* 03E50 80AC6AF0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 03E4C 80AC6AEC 8FA50028 */ lw $a1, 0x0028($sp) +/* 03E50 80AC6AF0 AFBF0024 */ sw $ra, 0x0024($sp) /* 03E54 80AC6AF4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 03E58 80AC6AF8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 03E5C 80AC6AFC 24E70338 */ addiu $a3, $a3, 0x0338 ## $a3 = 06000338 /* 03E60 80AC6B00 24C69B38 */ addiu $a2, $a2, 0x9B38 ## $a2 = 06009B38 -/* 03E64 80AC6B04 AFA00010 */ sw $zero, 0x0010($sp) -/* 03E68 80AC6B08 AFA00014 */ sw $zero, 0x0014($sp) -/* 03E6C 80AC6B0C AFA00018 */ sw $zero, 0x0018($sp) -/* 03E70 80AC6B10 0C0291BE */ jal func_800A46F8 +/* 03E64 80AC6B04 AFA00010 */ sw $zero, 0x0010($sp) +/* 03E68 80AC6B08 AFA00014 */ sw $zero, 0x0014($sp) +/* 03E6C 80AC6B0C AFA00018 */ sw $zero, 0x0018($sp) +/* 03E70 80AC6B10 0C0291BE */ jal SkelAnime_InitSV /* 03E74 80AC6B14 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 03E78 80AC6B18 8FA20028 */ lw $v0, 0x0028($sp) +/* 03E78 80AC6B18 8FA20028 */ lw $v0, 0x0028($sp) /* 03E7C 80AC6B1C 3C0E80AC */ lui $t6, %hi(func_80AC7DAC) ## $t6 = 80AC0000 /* 03E80 80AC6B20 25CE7DAC */ addiu $t6, $t6, %lo(func_80AC7DAC) ## $t6 = 80AC7DAC /* 03E84 80AC6B24 AC4E0134 */ sw $t6, 0x0134($v0) ## 00000134 /* 03E88 80AC6B28 AC400194 */ sw $zero, 0x0194($v0) ## 00000194 -/* 03E8C 80AC6B2C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03E8C 80AC6B2C 8FBF0024 */ lw $ra, 0x0024($sp) /* 03E90 80AC6B30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03E94 80AC6B34 03E00008 */ jr $ra +/* 03E94 80AC6B34 03E00008 */ jr $ra /* 03E98 80AC6B38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s index b14262d76a..15a2190529 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s @@ -1,50 +1,50 @@ glabel func_80AC6B3C /* 03E9C 80AC6B3C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 03EA0 80AC6B40 AFB00038 */ sw $s0, 0x0038($sp) +/* 03EA0 80AC6B40 AFB00038 */ sw $s0, 0x0038($sp) /* 03EA4 80AC6B44 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03EA8 80AC6B48 AFA5004C */ sw $a1, 0x004C($sp) +/* 03EA8 80AC6B48 AFA5004C */ sw $a1, 0x004C($sp) /* 03EAC 80AC6B4C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03EB0 80AC6B50 AFBF003C */ sw $ra, 0x003C($sp) +/* 03EB0 80AC6B50 AFBF003C */ sw $ra, 0x003C($sp) /* 03EB4 80AC6B54 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 03EB8 80AC6B58 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 03EBC 80AC6B5C 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 03EC0 80AC6B60 AFA50040 */ sw $a1, 0x0040($sp) -/* 03EC4 80AC6B64 AFA00010 */ sw $zero, 0x0010($sp) -/* 03EC8 80AC6B68 AFA00014 */ sw $zero, 0x0014($sp) -/* 03ECC 80AC6B6C AFA00018 */ sw $zero, 0x0018($sp) -/* 03ED0 80AC6B70 0C0291BE */ jal func_800A46F8 +/* 03EC0 80AC6B60 AFA50040 */ sw $a1, 0x0040($sp) +/* 03EC4 80AC6B64 AFA00010 */ sw $zero, 0x0010($sp) +/* 03EC8 80AC6B68 AFA00014 */ sw $zero, 0x0014($sp) +/* 03ECC 80AC6B6C AFA00018 */ sw $zero, 0x0018($sp) +/* 03ED0 80AC6B70 0C0291BE */ jal SkelAnime_InitSV /* 03ED4 80AC6B74 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 03ED8 80AC6B78 820F01EA */ lb $t7, 0x01EA($s0) ## 000001EA -/* 03EDC 80AC6B7C 8FAE004C */ lw $t6, 0x004C($sp) +/* 03EDC 80AC6B7C 8FAE004C */ lw $t6, 0x004C($sp) /* 03EE0 80AC6B80 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 03EE4 80AC6B84 000FC100 */ sll $t8, $t7, 4 -/* 03EE8 80AC6B88 030FC021 */ addu $t8, $t8, $t7 -/* 03EEC 80AC6B8C 0018C080 */ sll $t8, $t8, 2 -/* 03EF0 80AC6B90 01D8C821 */ addu $t9, $t6, $t8 -/* 03EF4 80AC6B94 01194021 */ addu $t0, $t0, $t9 +/* 03EE4 80AC6B84 000FC100 */ sll $t8, $t7, 4 +/* 03EE8 80AC6B88 030FC021 */ addu $t8, $t8, $t7 +/* 03EEC 80AC6B8C 0018C080 */ sll $t8, $t8, 2 +/* 03EF0 80AC6B90 01D8C821 */ addu $t9, $t6, $t8 +/* 03EF4 80AC6B94 01194021 */ addu $t0, $t0, $t9 /* 03EF8 80AC6B98 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 /* 03EFC 80AC6B9C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 03F00 80AC6BA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 03F04 80AC6BA4 01014821 */ addu $t1, $t0, $at +/* 03F04 80AC6BA4 01014821 */ addu $t1, $t0, $at /* 03F08 80AC6BA8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 03F0C 80AC6BAC AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 /* 03F10 80AC6BB0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03F14 80AC6BB4 248404A8 */ addiu $a0, $a0, 0x04A8 ## $a0 = 060004A8 /* 03F18 80AC6BB8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03F1C 80AC6BBC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 03F20 80AC6BC0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 03F24 80AC6BC4 468021A0 */ cvt.s.w $f6, $f4 -/* 03F28 80AC6BC8 44070000 */ mfc1 $a3, $f0 +/* 03F24 80AC6BC4 468021A0 */ cvt.s.w $f6, $f4 +/* 03F28 80AC6BC8 44070000 */ mfc1 $a3, $f0 /* 03F2C 80AC6BCC 24A504A8 */ addiu $a1, $a1, 0x04A8 ## $a1 = 060004A8 -/* 03F30 80AC6BD0 8FA40040 */ lw $a0, 0x0040($sp) +/* 03F30 80AC6BD0 8FA40040 */ lw $a0, 0x0040($sp) /* 03F34 80AC6BD4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03F38 80AC6BD8 AFA00014 */ sw $zero, 0x0014($sp) -/* 03F3C 80AC6BDC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 03F38 80AC6BD8 AFA00014 */ sw $zero, 0x0014($sp) +/* 03F3C 80AC6BDC E7A60010 */ swc1 $f6, 0x0010($sp) /* 03F40 80AC6BE0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03F44 80AC6BE4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 03F48 80AC6BE8 8FA6004C */ lw $a2, 0x004C($sp) + +/* 03F44 80AC6BE4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 03F48 80AC6BE8 8FA6004C */ lw $a2, 0x004C($sp) /* 03F4C 80AC6BEC C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 03F50 80AC6BF0 3C0A80AD */ lui $t2, %hi(func_80AC80B4) ## $t2 = 80AD0000 /* 03F54 80AC6BF4 3C0B80AC */ lui $t3, %hi(func_80AC7380) ## $t3 = 80AC0000 @@ -52,25 +52,25 @@ glabel func_80AC6B3C /* 03F5C 80AC6BFC 256B7380 */ addiu $t3, $t3, %lo(func_80AC7380) ## $t3 = 80AC7380 /* 03F60 80AC6C00 AE0A0134 */ sw $t2, 0x0134($s0) ## 00000134 /* 03F64 80AC6C04 AE0B0194 */ sw $t3, 0x0194($s0) ## 00000194 -/* 03F68 80AC6C08 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 03F68 80AC6C08 E7A80010 */ swc1 $f8, 0x0010($sp) /* 03F6C 80AC6C0C C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 03F70 80AC6C10 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 /* 03F74 80AC6C14 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03F78 80AC6C18 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 03F78 80AC6C18 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 03F7C 80AC6C1C C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 03F80 80AC6C20 AFAC0028 */ sw $t4, 0x0028($sp) -/* 03F84 80AC6C24 AFA00024 */ sw $zero, 0x0024($sp) -/* 03F88 80AC6C28 AFA00020 */ sw $zero, 0x0020($sp) -/* 03F8C 80AC6C2C AFA0001C */ sw $zero, 0x001C($sp) +/* 03F80 80AC6C20 AFAC0028 */ sw $t4, 0x0028($sp) +/* 03F84 80AC6C24 AFA00024 */ sw $zero, 0x0024($sp) +/* 03F88 80AC6C28 AFA00020 */ sw $zero, 0x0020($sp) +/* 03F8C 80AC6C2C AFA0001C */ sw $zero, 0x001C($sp) /* 03F90 80AC6C30 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 /* 03F94 80AC6C34 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 03F98 80AC6C38 0C00C916 */ jal Actor_SpawnAttached - -/* 03F9C 80AC6C3C E7B00018 */ swc1 $f16, 0x0018($sp) -/* 03FA0 80AC6C40 8FBF003C */ lw $ra, 0x003C($sp) -/* 03FA4 80AC6C44 8FB00038 */ lw $s0, 0x0038($sp) + +/* 03F9C 80AC6C3C E7B00018 */ swc1 $f16, 0x0018($sp) +/* 03FA0 80AC6C40 8FBF003C */ lw $ra, 0x003C($sp) +/* 03FA4 80AC6C44 8FB00038 */ lw $s0, 0x0038($sp) /* 03FA8 80AC6C48 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 03FAC 80AC6C4C 03E00008 */ jr $ra +/* 03FAC 80AC6C4C 03E00008 */ jr $ra /* 03FB0 80AC6C50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s index d0545ba4cd..cd84cb31aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s @@ -1,60 +1,60 @@ glabel func_80AC6C54 /* 03FB4 80AC6C54 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03FB8 80AC6C58 AFA40030 */ sw $a0, 0x0030($sp) -/* 03FBC 80AC6C5C AFA50034 */ sw $a1, 0x0034($sp) +/* 03FB8 80AC6C58 AFA40030 */ sw $a0, 0x0030($sp) +/* 03FBC 80AC6C5C AFA50034 */ sw $a1, 0x0034($sp) /* 03FC0 80AC6C60 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03FC4 80AC6C64 8FA50030 */ lw $a1, 0x0030($sp) -/* 03FC8 80AC6C68 AFBF0024 */ sw $ra, 0x0024($sp) +/* 03FC4 80AC6C64 8FA50030 */ lw $a1, 0x0030($sp) +/* 03FC8 80AC6C68 AFBF0024 */ sw $ra, 0x0024($sp) /* 03FCC 80AC6C6C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 03FD0 80AC6C70 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 03FD4 80AC6C74 AFA50028 */ sw $a1, 0x0028($sp) +/* 03FD4 80AC6C74 AFA50028 */ sw $a1, 0x0028($sp) /* 03FD8 80AC6C78 24C6FEF0 */ addiu $a2, $a2, 0xFEF0 ## $a2 = 0600FEF0 -/* 03FDC 80AC6C7C AFA00010 */ sw $zero, 0x0010($sp) -/* 03FE0 80AC6C80 AFA00014 */ sw $zero, 0x0014($sp) -/* 03FE4 80AC6C84 AFA00018 */ sw $zero, 0x0018($sp) -/* 03FE8 80AC6C88 0C0291BE */ jal func_800A46F8 +/* 03FDC 80AC6C7C AFA00010 */ sw $zero, 0x0010($sp) +/* 03FE0 80AC6C80 AFA00014 */ sw $zero, 0x0014($sp) +/* 03FE4 80AC6C84 AFA00018 */ sw $zero, 0x0018($sp) +/* 03FE8 80AC6C88 0C0291BE */ jal SkelAnime_InitSV /* 03FEC 80AC6C8C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03FF0 80AC6C90 8FAF0030 */ lw $t7, 0x0030($sp) -/* 03FF4 80AC6C94 8FAE0034 */ lw $t6, 0x0034($sp) +/* 03FF0 80AC6C90 8FAF0030 */ lw $t7, 0x0030($sp) +/* 03FF4 80AC6C94 8FAE0034 */ lw $t6, 0x0034($sp) /* 03FF8 80AC6C98 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 03FFC 80AC6C9C 81F801EA */ lb $t8, 0x01EA($t7) ## 000001EA /* 04000 80AC6CA0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 04004 80AC6CA4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 04008 80AC6CA8 0018C900 */ sll $t9, $t8, 4 -/* 0400C 80AC6CAC 0338C821 */ addu $t9, $t9, $t8 -/* 04010 80AC6CB0 0019C880 */ sll $t9, $t9, 2 -/* 04014 80AC6CB4 01D94021 */ addu $t0, $t6, $t9 -/* 04018 80AC6CB8 01284821 */ addu $t1, $t1, $t0 +/* 04008 80AC6CA8 0018C900 */ sll $t9, $t8, 4 +/* 0400C 80AC6CAC 0338C821 */ addu $t9, $t9, $t8 +/* 04010 80AC6CB0 0019C880 */ sll $t9, $t9, 2 +/* 04014 80AC6CB4 01D94021 */ addu $t0, $t6, $t9 +/* 04018 80AC6CB8 01284821 */ addu $t1, $t1, $t0 /* 0401C 80AC6CBC 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 04020 80AC6CC0 248400FC */ addiu $a0, $a0, 0x00FC ## $a0 = 060000FC -/* 04024 80AC6CC4 01215021 */ addu $t2, $t1, $at +/* 04024 80AC6CC4 01215021 */ addu $t2, $t1, $at /* 04028 80AC6CC8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 0402C 80AC6CCC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04030 80AC6CD0 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 /* 04034 80AC6CD4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04038 80AC6CD8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0403C 80AC6CDC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04040 80AC6CE0 468021A0 */ cvt.s.w $f6, $f4 -/* 04044 80AC6CE4 44070000 */ mfc1 $a3, $f0 +/* 04040 80AC6CE0 468021A0 */ cvt.s.w $f6, $f4 +/* 04044 80AC6CE4 44070000 */ mfc1 $a3, $f0 /* 04048 80AC6CE8 24A500FC */ addiu $a1, $a1, 0x00FC ## $a1 = 060000FC -/* 0404C 80AC6CEC 8FA40028 */ lw $a0, 0x0028($sp) +/* 0404C 80AC6CEC 8FA40028 */ lw $a0, 0x0028($sp) /* 04050 80AC6CF0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04054 80AC6CF4 AFA00014 */ sw $zero, 0x0014($sp) -/* 04058 80AC6CF8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04054 80AC6CF4 AFA00014 */ sw $zero, 0x0014($sp) +/* 04058 80AC6CF8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0405C 80AC6CFC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04060 80AC6D00 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04064 80AC6D04 8FA20030 */ lw $v0, 0x0030($sp) + +/* 04060 80AC6D00 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04064 80AC6D04 8FA20030 */ lw $v0, 0x0030($sp) /* 04068 80AC6D08 3C0B80AD */ lui $t3, %hi(func_80AC8244) ## $t3 = 80AD0000 /* 0406C 80AC6D0C 3C0C80AC */ lui $t4, %hi(func_80AC7380) ## $t4 = 80AC0000 /* 04070 80AC6D10 256B8244 */ addiu $t3, $t3, %lo(func_80AC8244) ## $t3 = 80AC8244 /* 04074 80AC6D14 258C7380 */ addiu $t4, $t4, %lo(func_80AC7380) ## $t4 = 80AC7380 /* 04078 80AC6D18 AC4B0134 */ sw $t3, 0x0134($v0) ## 00000134 /* 0407C 80AC6D1C AC4C0194 */ sw $t4, 0x0194($v0) ## 00000194 -/* 04080 80AC6D20 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04080 80AC6D20 8FBF0024 */ lw $ra, 0x0024($sp) /* 04084 80AC6D24 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04088 80AC6D28 03E00008 */ jr $ra +/* 04088 80AC6D28 03E00008 */ jr $ra /* 0408C 80AC6D2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s index fa924092aa..dcbeb0f7a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s @@ -1,60 +1,60 @@ glabel func_80AC6D30 /* 04090 80AC6D30 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 04094 80AC6D34 AFA40030 */ sw $a0, 0x0030($sp) -/* 04098 80AC6D38 AFA50034 */ sw $a1, 0x0034($sp) +/* 04094 80AC6D34 AFA40030 */ sw $a0, 0x0030($sp) +/* 04098 80AC6D38 AFA50034 */ sw $a1, 0x0034($sp) /* 0409C 80AC6D3C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 040A0 80AC6D40 8FA50030 */ lw $a1, 0x0030($sp) -/* 040A4 80AC6D44 AFBF0024 */ sw $ra, 0x0024($sp) +/* 040A0 80AC6D40 8FA50030 */ lw $a1, 0x0030($sp) +/* 040A4 80AC6D44 AFBF0024 */ sw $ra, 0x0024($sp) /* 040A8 80AC6D48 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 040AC 80AC6D4C 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 040B0 80AC6D50 AFA50028 */ sw $a1, 0x0028($sp) +/* 040B0 80AC6D50 AFA50028 */ sw $a1, 0x0028($sp) /* 040B4 80AC6D54 24C6BFA8 */ addiu $a2, $a2, 0xBFA8 ## $a2 = 0600BFA8 -/* 040B8 80AC6D58 AFA00010 */ sw $zero, 0x0010($sp) -/* 040BC 80AC6D5C AFA00014 */ sw $zero, 0x0014($sp) -/* 040C0 80AC6D60 AFA00018 */ sw $zero, 0x0018($sp) -/* 040C4 80AC6D64 0C0291BE */ jal func_800A46F8 +/* 040B8 80AC6D58 AFA00010 */ sw $zero, 0x0010($sp) +/* 040BC 80AC6D5C AFA00014 */ sw $zero, 0x0014($sp) +/* 040C0 80AC6D60 AFA00018 */ sw $zero, 0x0018($sp) +/* 040C4 80AC6D64 0C0291BE */ jal SkelAnime_InitSV /* 040C8 80AC6D68 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 040CC 80AC6D6C 8FAF0030 */ lw $t7, 0x0030($sp) -/* 040D0 80AC6D70 8FAE0034 */ lw $t6, 0x0034($sp) +/* 040CC 80AC6D6C 8FAF0030 */ lw $t7, 0x0030($sp) +/* 040D0 80AC6D70 8FAE0034 */ lw $t6, 0x0034($sp) /* 040D4 80AC6D74 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 040D8 80AC6D78 81F801EA */ lb $t8, 0x01EA($t7) ## 000001EA /* 040DC 80AC6D7C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 040E0 80AC6D80 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 040E4 80AC6D84 0018C900 */ sll $t9, $t8, 4 -/* 040E8 80AC6D88 0338C821 */ addu $t9, $t9, $t8 -/* 040EC 80AC6D8C 0019C880 */ sll $t9, $t9, 2 -/* 040F0 80AC6D90 01D94021 */ addu $t0, $t6, $t9 -/* 040F4 80AC6D94 01284821 */ addu $t1, $t1, $t0 +/* 040E4 80AC6D84 0018C900 */ sll $t9, $t8, 4 +/* 040E8 80AC6D88 0338C821 */ addu $t9, $t9, $t8 +/* 040EC 80AC6D8C 0019C880 */ sll $t9, $t9, 2 +/* 040F0 80AC6D90 01D94021 */ addu $t0, $t6, $t9 +/* 040F4 80AC6D94 01284821 */ addu $t1, $t1, $t0 /* 040F8 80AC6D98 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 040FC 80AC6D9C 2484078C */ addiu $a0, $a0, 0x078C ## $a0 = 0600078C -/* 04100 80AC6DA0 01215021 */ addu $t2, $t1, $at +/* 04100 80AC6DA0 01215021 */ addu $t2, $t1, $at /* 04104 80AC6DA4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 04108 80AC6DA8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0410C 80AC6DAC AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 /* 04110 80AC6DB0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04114 80AC6DB4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04118 80AC6DB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0411C 80AC6DBC 468021A0 */ cvt.s.w $f6, $f4 -/* 04120 80AC6DC0 44070000 */ mfc1 $a3, $f0 +/* 0411C 80AC6DBC 468021A0 */ cvt.s.w $f6, $f4 +/* 04120 80AC6DC0 44070000 */ mfc1 $a3, $f0 /* 04124 80AC6DC4 24A5078C */ addiu $a1, $a1, 0x078C ## $a1 = 0600078C -/* 04128 80AC6DC8 8FA40028 */ lw $a0, 0x0028($sp) +/* 04128 80AC6DC8 8FA40028 */ lw $a0, 0x0028($sp) /* 0412C 80AC6DCC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04130 80AC6DD0 AFA00014 */ sw $zero, 0x0014($sp) -/* 04134 80AC6DD4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04130 80AC6DD0 AFA00014 */ sw $zero, 0x0014($sp) +/* 04134 80AC6DD4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 04138 80AC6DD8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0413C 80AC6DDC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04140 80AC6DE0 8FA20030 */ lw $v0, 0x0030($sp) + +/* 0413C 80AC6DDC E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04140 80AC6DE0 8FA20030 */ lw $v0, 0x0030($sp) /* 04144 80AC6DE4 3C0B80AD */ lui $t3, %hi(func_80AC83DC) ## $t3 = 80AD0000 /* 04148 80AC6DE8 3C0C80AC */ lui $t4, %hi(func_80AC7380) ## $t4 = 80AC0000 /* 0414C 80AC6DEC 256B83DC */ addiu $t3, $t3, %lo(func_80AC83DC) ## $t3 = 80AC83DC /* 04150 80AC6DF0 258C7380 */ addiu $t4, $t4, %lo(func_80AC7380) ## $t4 = 80AC7380 /* 04154 80AC6DF4 AC4B0134 */ sw $t3, 0x0134($v0) ## 00000134 /* 04158 80AC6DF8 AC4C0194 */ sw $t4, 0x0194($v0) ## 00000194 -/* 0415C 80AC6DFC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0415C 80AC6DFC 8FBF0024 */ lw $ra, 0x0024($sp) /* 04160 80AC6E00 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04164 80AC6E04 03E00008 */ jr $ra +/* 04164 80AC6E04 03E00008 */ jr $ra /* 04168 80AC6E08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s index 44d092acc5..3f0a50c1da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s @@ -1,27 +1,27 @@ glabel func_80AC6E0C /* 0416C 80AC6E0C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04170 80AC6E10 AFA40028 */ sw $a0, 0x0028($sp) -/* 04174 80AC6E14 AFA5002C */ sw $a1, 0x002C($sp) +/* 04170 80AC6E10 AFA40028 */ sw $a0, 0x0028($sp) +/* 04174 80AC6E14 AFA5002C */ sw $a1, 0x002C($sp) /* 04178 80AC6E18 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0417C 80AC6E1C 8FA50028 */ lw $a1, 0x0028($sp) -/* 04180 80AC6E20 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0417C 80AC6E1C 8FA50028 */ lw $a1, 0x0028($sp) +/* 04180 80AC6E20 AFBF0024 */ sw $ra, 0x0024($sp) /* 04184 80AC6E24 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 04188 80AC6E28 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0418C 80AC6E2C 24E702E4 */ addiu $a3, $a3, 0x02E4 ## $a3 = 060002E4 /* 04190 80AC6E30 24C64258 */ addiu $a2, $a2, 0x4258 ## $a2 = 06004258 -/* 04194 80AC6E34 AFA00010 */ sw $zero, 0x0010($sp) -/* 04198 80AC6E38 AFA00014 */ sw $zero, 0x0014($sp) -/* 0419C 80AC6E3C AFA00018 */ sw $zero, 0x0018($sp) -/* 041A0 80AC6E40 0C0291BE */ jal func_800A46F8 +/* 04194 80AC6E34 AFA00010 */ sw $zero, 0x0010($sp) +/* 04198 80AC6E38 AFA00014 */ sw $zero, 0x0014($sp) +/* 0419C 80AC6E3C AFA00018 */ sw $zero, 0x0018($sp) +/* 041A0 80AC6E40 0C0291BE */ jal SkelAnime_InitSV /* 041A4 80AC6E44 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 041A8 80AC6E48 8FA20028 */ lw $v0, 0x0028($sp) +/* 041A8 80AC6E48 8FA20028 */ lw $v0, 0x0028($sp) /* 041AC 80AC6E4C 3C0E80AD */ lui $t6, %hi(func_80AC854C) ## $t6 = 80AD0000 /* 041B0 80AC6E50 25CE854C */ addiu $t6, $t6, %lo(func_80AC854C) ## $t6 = 80AC854C /* 041B4 80AC6E54 AC4E0134 */ sw $t6, 0x0134($v0) ## 00000134 /* 041B8 80AC6E58 AC400194 */ sw $zero, 0x0194($v0) ## 00000194 -/* 041BC 80AC6E5C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 041BC 80AC6E5C 8FBF0024 */ lw $ra, 0x0024($sp) /* 041C0 80AC6E60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 041C4 80AC6E64 03E00008 */ jr $ra +/* 041C4 80AC6E64 03E00008 */ jr $ra /* 041C8 80AC6E68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s index 5c46bc5820..8dae64f0e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s @@ -1,27 +1,27 @@ glabel func_80AC6E6C /* 041CC 80AC6E6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 041D0 80AC6E70 AFA40028 */ sw $a0, 0x0028($sp) -/* 041D4 80AC6E74 AFA5002C */ sw $a1, 0x002C($sp) +/* 041D0 80AC6E70 AFA40028 */ sw $a0, 0x0028($sp) +/* 041D4 80AC6E74 AFA5002C */ sw $a1, 0x002C($sp) /* 041D8 80AC6E78 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 041DC 80AC6E7C 8FA50028 */ lw $a1, 0x0028($sp) -/* 041E0 80AC6E80 AFBF0024 */ sw $ra, 0x0024($sp) +/* 041DC 80AC6E7C 8FA50028 */ lw $a1, 0x0028($sp) +/* 041E0 80AC6E80 AFBF0024 */ sw $ra, 0x0024($sp) /* 041E4 80AC6E84 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 041E8 80AC6E88 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 041EC 80AC6E8C 24E702E4 */ addiu $a3, $a3, 0x02E4 ## $a3 = 060002E4 /* 041F0 80AC6E90 24C64658 */ addiu $a2, $a2, 0x4658 ## $a2 = 06004658 -/* 041F4 80AC6E94 AFA00010 */ sw $zero, 0x0010($sp) -/* 041F8 80AC6E98 AFA00014 */ sw $zero, 0x0014($sp) -/* 041FC 80AC6E9C AFA00018 */ sw $zero, 0x0018($sp) -/* 04200 80AC6EA0 0C0291BE */ jal func_800A46F8 +/* 041F4 80AC6E94 AFA00010 */ sw $zero, 0x0010($sp) +/* 041F8 80AC6E98 AFA00014 */ sw $zero, 0x0014($sp) +/* 041FC 80AC6E9C AFA00018 */ sw $zero, 0x0018($sp) +/* 04200 80AC6EA0 0C0291BE */ jal SkelAnime_InitSV /* 04204 80AC6EA4 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 04208 80AC6EA8 8FA20028 */ lw $v0, 0x0028($sp) +/* 04208 80AC6EA8 8FA20028 */ lw $v0, 0x0028($sp) /* 0420C 80AC6EAC 3C0E80AD */ lui $t6, %hi(func_80AC8668) ## $t6 = 80AD0000 /* 04210 80AC6EB0 25CE8668 */ addiu $t6, $t6, %lo(func_80AC8668) ## $t6 = 80AC8668 /* 04214 80AC6EB4 AC4E0134 */ sw $t6, 0x0134($v0) ## 00000134 /* 04218 80AC6EB8 AC400194 */ sw $zero, 0x0194($v0) ## 00000194 -/* 0421C 80AC6EBC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0421C 80AC6EBC 8FBF0024 */ lw $ra, 0x0024($sp) /* 04220 80AC6EC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04224 80AC6EC4 03E00008 */ jr $ra +/* 04224 80AC6EC4 03E00008 */ jr $ra /* 04228 80AC6EC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s index e60149f540..036ba230d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s @@ -1,27 +1,27 @@ glabel func_80AC6ECC /* 0422C 80AC6ECC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04230 80AC6ED0 AFA40028 */ sw $a0, 0x0028($sp) -/* 04234 80AC6ED4 AFA5002C */ sw $a1, 0x002C($sp) +/* 04230 80AC6ED0 AFA40028 */ sw $a0, 0x0028($sp) +/* 04234 80AC6ED4 AFA5002C */ sw $a1, 0x002C($sp) /* 04238 80AC6ED8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0423C 80AC6EDC 8FA50028 */ lw $a1, 0x0028($sp) -/* 04240 80AC6EE0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0423C 80AC6EDC 8FA50028 */ lw $a1, 0x0028($sp) +/* 04240 80AC6EE0 AFBF0024 */ sw $ra, 0x0024($sp) /* 04244 80AC6EE4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 04248 80AC6EE8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0424C 80AC6EEC 24E7065C */ addiu $a3, $a3, 0x065C ## $a3 = 0600065C /* 04250 80AC6EF0 24C64868 */ addiu $a2, $a2, 0x4868 ## $a2 = 06004868 -/* 04254 80AC6EF4 AFA00010 */ sw $zero, 0x0010($sp) -/* 04258 80AC6EF8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0425C 80AC6EFC AFA00018 */ sw $zero, 0x0018($sp) -/* 04260 80AC6F00 0C0291BE */ jal func_800A46F8 +/* 04254 80AC6EF4 AFA00010 */ sw $zero, 0x0010($sp) +/* 04258 80AC6EF8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0425C 80AC6EFC AFA00018 */ sw $zero, 0x0018($sp) +/* 04260 80AC6F00 0C0291BE */ jal SkelAnime_InitSV /* 04264 80AC6F04 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 04268 80AC6F08 8FA20028 */ lw $v0, 0x0028($sp) +/* 04268 80AC6F08 8FA20028 */ lw $v0, 0x0028($sp) /* 0426C 80AC6F0C 3C0E80AD */ lui $t6, %hi(func_80AC8784) ## $t6 = 80AD0000 /* 04270 80AC6F10 25CE8784 */ addiu $t6, $t6, %lo(func_80AC8784) ## $t6 = 80AC8784 /* 04274 80AC6F14 AC4E0134 */ sw $t6, 0x0134($v0) ## 00000134 /* 04278 80AC6F18 AC400194 */ sw $zero, 0x0194($v0) ## 00000194 -/* 0427C 80AC6F1C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0427C 80AC6F1C 8FBF0024 */ lw $ra, 0x0024($sp) /* 04280 80AC6F20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04284 80AC6F24 03E00008 */ jr $ra +/* 04284 80AC6F24 03E00008 */ jr $ra /* 04288 80AC6F28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s index 6d33a3d2e3..f8645e2974 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s @@ -1,20 +1,20 @@ glabel func_80AC7DAC /* 0510C 80AC7DAC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 05110 80AC7DB0 AFB10028 */ sw $s1, 0x0028($sp) +/* 05110 80AC7DB0 AFB10028 */ sw $s1, 0x0028($sp) /* 05114 80AC7DB4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05118 80AC7DB8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0511C 80AC7DBC AFB00024 */ sw $s0, 0x0024($sp) +/* 05118 80AC7DB8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0511C 80AC7DBC AFB00024 */ sw $s0, 0x0024($sp) /* 05120 80AC7DC0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 05124 80AC7DC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05128 80AC7DC8 3C0680AD */ lui $a2, %hi(D_80AC93FC) ## $a2 = 80AD0000 /* 0512C 80AC7DCC 24C693FC */ addiu $a2, $a2, %lo(D_80AC93FC) ## $a2 = 80AC93FC /* 05130 80AC7DD0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05134 80AC7DD4 240710E0 */ addiu $a3, $zero, 0x10E0 ## $a3 = 000010E0 -/* 05138 80AC7DD8 0C031AB1 */ jal func_800C6AC4 -/* 0513C 80AC7DDC AFA5004C */ sw $a1, 0x004C($sp) -/* 05140 80AC7DE0 0C024F46 */ jal func_80093D18 +/* 05138 80AC7DD8 0C031AB1 */ jal func_800C6AC4 +/* 0513C 80AC7DDC AFA5004C */ sw $a1, 0x004C($sp) +/* 05140 80AC7DE0 0C024F46 */ jal func_80093D18 /* 05144 80AC7DE4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 05148 80AC7DE8 8FA5004C */ lw $a1, 0x004C($sp) +/* 05148 80AC7DE8 8FA5004C */ lw $a1, 0x004C($sp) /* 0514C 80AC7DEC 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 05150 80AC7DF0 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 05154 80AC7DF4 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,51 +26,51 @@ glabel func_80AC7DAC /* 0516C 80AC7E0C 861801F2 */ lh $t8, 0x01F2($s0) ## 000001F2 /* 05170 80AC7E10 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 05174 80AC7E14 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05178 80AC7E18 0018C880 */ sll $t9, $t8, 2 -/* 0517C 80AC7E1C 00992021 */ addu $a0, $a0, $t9 -/* 05180 80AC7E20 8C848EA0 */ lw $a0, %lo(D_80AC8EA0)($a0) +/* 05178 80AC7E18 0018C880 */ sll $t9, $t8, 2 +/* 0517C 80AC7E1C 00992021 */ addu $a0, $a0, $t9 +/* 05180 80AC7E20 8C848EA0 */ lw $a0, %lo(D_80AC8EA0)($a0) /* 05184 80AC7E24 3C0F80AC */ lui $t7, %hi(func_80AC74F4) ## $t7 = 80AC0000 /* 05188 80AC7E28 25EF74F4 */ addiu $t7, $t7, %lo(func_80AC74F4) ## $t7 = 80AC74F4 -/* 0518C 80AC7E2C 00044900 */ sll $t1, $a0, 4 -/* 05190 80AC7E30 00095702 */ srl $t2, $t1, 28 -/* 05194 80AC7E34 000A5880 */ sll $t3, $t2, 2 -/* 05198 80AC7E38 018B6021 */ addu $t4, $t4, $t3 +/* 0518C 80AC7E2C 00044900 */ sll $t1, $a0, 4 +/* 05190 80AC7E30 00095702 */ srl $t2, $t1, 28 +/* 05194 80AC7E34 000A5880 */ sll $t3, $t2, 2 +/* 05198 80AC7E38 018B6021 */ addu $t4, $t4, $t3 /* 0519C 80AC7E3C 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 051A0 80AC7E40 00814024 */ and $t0, $a0, $at +/* 051A0 80AC7E40 00814024 */ and $t0, $a0, $at /* 051A4 80AC7E44 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 051A8 80AC7E48 010C6821 */ addu $t5, $t0, $t4 -/* 051AC 80AC7E4C 01A17021 */ addu $t6, $t5, $at +/* 051A8 80AC7E48 010C6821 */ addu $t5, $t0, $t4 +/* 051AC 80AC7E4C 01A17021 */ addu $t6, $t5, $at /* 051B0 80AC7E50 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 051B4 80AC7E54 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 051B8 80AC7E58 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 051BC 80AC7E5C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 051C0 80AC7E60 AFB00018 */ sw $s0, 0x0018($sp) -/* 051C4 80AC7E64 AFA00014 */ sw $zero, 0x0014($sp) -/* 051C8 80AC7E68 AFAF0010 */ sw $t7, 0x0010($sp) -/* 051CC 80AC7E6C 0C0286B2 */ jal func_800A1AC8 +/* 051C0 80AC7E60 AFB00018 */ sw $s0, 0x0018($sp) +/* 051C4 80AC7E64 AFA00014 */ sw $zero, 0x0014($sp) +/* 051C8 80AC7E68 AFAF0010 */ sw $t7, 0x0010($sp) +/* 051CC 80AC7E6C 0C0286B2 */ jal SkelAnime_DrawSV /* 051D0 80AC7E70 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 051D4 80AC7E74 C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 /* 051D8 80AC7E78 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 /* 051DC 80AC7E7C 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 051E0 80AC7E80 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 051E0 80AC7E80 E7A40010 */ swc1 $f4, 0x0010($sp) /* 051E4 80AC7E84 92180251 */ lbu $t8, 0x0251($s0) ## 00000251 /* 051E8 80AC7E88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 051EC 80AC7E8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 051F0 80AC7E90 0C2B1D4A */ jal func_80AC7528 -/* 051F4 80AC7E94 AFB80014 */ sw $t8, 0x0014($sp) +/* 051F0 80AC7E90 0C2B1D4A */ jal func_80AC7528 +/* 051F4 80AC7E94 AFB80014 */ sw $t8, 0x0014($sp) /* 051F8 80AC7E98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 051FC 80AC7E9C 0C2B1E72 */ jal func_80AC79C8 +/* 051FC 80AC7E9C 0C2B1E72 */ jal func_80AC79C8 /* 05200 80AC7EA0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 05204 80AC7EA4 3C0680AD */ lui $a2, %hi(D_80AC940C) ## $a2 = 80AD0000 /* 05208 80AC7EA8 24C6940C */ addiu $a2, $a2, %lo(D_80AC940C) ## $a2 = 80AC940C /* 0520C 80AC7EAC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05210 80AC7EB0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 05214 80AC7EB4 0C031AD5 */ jal func_800C6B54 +/* 05214 80AC7EB4 0C031AD5 */ jal func_800C6B54 /* 05218 80AC7EB8 240710F4 */ addiu $a3, $zero, 0x10F4 ## $a3 = 000010F4 -/* 0521C 80AC7EBC 8FBF002C */ lw $ra, 0x002C($sp) -/* 05220 80AC7EC0 8FB00024 */ lw $s0, 0x0024($sp) -/* 05224 80AC7EC4 8FB10028 */ lw $s1, 0x0028($sp) -/* 05228 80AC7EC8 03E00008 */ jr $ra +/* 0521C 80AC7EBC 8FBF002C */ lw $ra, 0x002C($sp) +/* 05220 80AC7EC0 8FB00024 */ lw $s0, 0x0024($sp) +/* 05224 80AC7EC4 8FB10028 */ lw $s1, 0x0028($sp) +/* 05228 80AC7EC8 03E00008 */ jr $ra /* 0522C 80AC7ECC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s index d66ddadb79..c243d203be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s @@ -1,19 +1,19 @@ glabel func_80AC80B4 /* 05414 80AC80B4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 05418 80AC80B8 AFB20030 */ sw $s2, 0x0030($sp) +/* 05418 80AC80B8 AFB20030 */ sw $s2, 0x0030($sp) /* 0541C 80AC80BC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 05420 80AC80C0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 05424 80AC80C4 AFB1002C */ sw $s1, 0x002C($sp) -/* 05428 80AC80C8 AFB00028 */ sw $s0, 0x0028($sp) +/* 05420 80AC80C0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 05424 80AC80C4 AFB1002C */ sw $s1, 0x002C($sp) +/* 05428 80AC80C8 AFB00028 */ sw $s0, 0x0028($sp) /* 0542C 80AC80CC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 05430 80AC80D0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 05434 80AC80D4 3C0680AD */ lui $a2, %hi(D_80AC943C) ## $a2 = 80AD0000 /* 05438 80AC80D8 24C6943C */ addiu $a2, $a2, %lo(D_80AC943C) ## $a2 = 80AC943C /* 0543C 80AC80DC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 05440 80AC80E0 24071139 */ addiu $a3, $zero, 0x1139 ## $a3 = 00001139 -/* 05444 80AC80E4 0C031AB1 */ jal func_800C6AC4 +/* 05444 80AC80E4 0C031AB1 */ jal func_800C6AC4 /* 05448 80AC80E8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0544C 80AC80EC 0C024F46 */ jal func_80093D18 +/* 0544C 80AC80EC 0C024F46 */ jal func_80093D18 /* 05450 80AC80F0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 05454 80AC80F4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 05458 80AC80F8 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 @@ -30,13 +30,13 @@ glabel func_80AC80B4 /* 05484 80AC8124 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 05488 80AC8128 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 0548C 80AC812C 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 05490 80AC8130 AFA90010 */ sw $t1, 0x0010($sp) +/* 05490 80AC8130 AFA90010 */ sw $t1, 0x0010($sp) /* 05494 80AC8134 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05498 80AC8138 24060082 */ addiu $a2, $zero, 0x0082 ## $a2 = 00000082 /* 0549C 80AC813C 24070046 */ addiu $a3, $zero, 0x0046 ## $a3 = 00000046 -/* 054A0 80AC8140 0C2B2012 */ jal func_80AC8048 -/* 054A4 80AC8144 AFA20044 */ sw $v0, 0x0044($sp) -/* 054A8 80AC8148 8FA30044 */ lw $v1, 0x0044($sp) +/* 054A0 80AC8140 0C2B2012 */ jal func_80AC8048 +/* 054A4 80AC8144 AFA20044 */ sw $v0, 0x0044($sp) +/* 054A8 80AC8148 8FA30044 */ lw $v1, 0x0044($sp) /* 054AC 80AC814C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 054B0 80AC8150 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 /* 054B4 80AC8154 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -47,12 +47,12 @@ glabel func_80AC80B4 /* 054C8 80AC8168 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 /* 054CC 80AC816C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 054D0 80AC8170 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 054D4 80AC8174 AFAC0010 */ sw $t4, 0x0010($sp) +/* 054D4 80AC8174 AFAC0010 */ sw $t4, 0x0010($sp) /* 054D8 80AC8178 240600AA */ addiu $a2, $zero, 0x00AA ## $a2 = 000000AA /* 054DC 80AC817C 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 054E0 80AC8180 0C2B2012 */ jal func_80AC8048 -/* 054E4 80AC8184 AFA20040 */ sw $v0, 0x0040($sp) -/* 054E8 80AC8188 8FA30040 */ lw $v1, 0x0040($sp) +/* 054E0 80AC8180 0C2B2012 */ jal func_80AC8048 +/* 054E4 80AC8184 AFA20040 */ sw $v0, 0x0040($sp) +/* 054E8 80AC8188 8FA30040 */ lw $v1, 0x0040($sp) /* 054EC 80AC818C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 054F0 80AC8190 35CE0030 */ ori $t6, $t6, 0x0030 ## $t6 = DB060030 /* 054F4 80AC8194 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -61,43 +61,43 @@ glabel func_80AC80B4 /* 05500 80AC81A0 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 05504 80AC81A4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 05508 80AC81A8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0550C 80AC81AC 0C2B2007 */ jal func_80AC801C -/* 05510 80AC81B0 AFA2003C */ sw $v0, 0x003C($sp) -/* 05514 80AC81B4 8FA3003C */ lw $v1, 0x003C($sp) +/* 0550C 80AC81AC 0C2B2007 */ jal func_80AC801C +/* 05510 80AC81B0 AFA2003C */ sw $v0, 0x003C($sp) +/* 05514 80AC81B4 8FA3003C */ lw $v1, 0x003C($sp) /* 05518 80AC81B8 3C0F80AC */ lui $t7, %hi(func_80AC7ED0) ## $t7 = 80AC0000 /* 0551C 80AC81BC 25EF7ED0 */ addiu $t7, $t7, %lo(func_80AC7ED0) ## $t7 = 80AC7ED0 /* 05520 80AC81C0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 05524 80AC81C4 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E /* 05528 80AC81C8 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 0552C 80AC81CC 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 05530 80AC81D0 AFB10018 */ sw $s1, 0x0018($sp) -/* 05534 80AC81D4 AFA00014 */ sw $zero, 0x0014($sp) -/* 05538 80AC81D8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0553C 80AC81DC 0C0286B2 */ jal func_800A1AC8 +/* 05530 80AC81D0 AFB10018 */ sw $s1, 0x0018($sp) +/* 05534 80AC81D4 AFA00014 */ sw $zero, 0x0014($sp) +/* 05538 80AC81D8 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0553C 80AC81DC 0C0286B2 */ jal SkelAnime_DrawSV /* 05540 80AC81E0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05544 80AC81E4 C6240238 */ lwc1 $f4, 0x0238($s1) ## 00000238 /* 05548 80AC81E8 8E260230 */ lw $a2, 0x0230($s1) ## 00000230 /* 0554C 80AC81EC 8E270234 */ lw $a3, 0x0234($s1) ## 00000234 -/* 05550 80AC81F0 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 05550 80AC81F0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05554 80AC81F4 92380251 */ lbu $t8, 0x0251($s1) ## 00000251 /* 05558 80AC81F8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0555C 80AC81FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05560 80AC8200 0C2B1D4A */ jal func_80AC7528 -/* 05564 80AC8204 AFB80014 */ sw $t8, 0x0014($sp) +/* 05560 80AC8200 0C2B1D4A */ jal func_80AC7528 +/* 05564 80AC8204 AFB80014 */ sw $t8, 0x0014($sp) /* 05568 80AC8208 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0556C 80AC820C 0C2B1E72 */ jal func_80AC79C8 +/* 0556C 80AC820C 0C2B1E72 */ jal func_80AC79C8 /* 05570 80AC8210 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 05574 80AC8214 3C0680AD */ lui $a2, %hi(D_80AC944C) ## $a2 = 80AD0000 /* 05578 80AC8218 24C6944C */ addiu $a2, $a2, %lo(D_80AC944C) ## $a2 = 80AC944C /* 0557C 80AC821C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 05580 80AC8220 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 05584 80AC8224 0C031AD5 */ jal func_800C6B54 +/* 05584 80AC8224 0C031AD5 */ jal func_800C6B54 /* 05588 80AC8228 24071152 */ addiu $a3, $zero, 0x1152 ## $a3 = 00001152 -/* 0558C 80AC822C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 05590 80AC8230 8FB00028 */ lw $s0, 0x0028($sp) -/* 05594 80AC8234 8FB1002C */ lw $s1, 0x002C($sp) -/* 05598 80AC8238 8FB20030 */ lw $s2, 0x0030($sp) -/* 0559C 80AC823C 03E00008 */ jr $ra +/* 0558C 80AC822C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 05590 80AC8230 8FB00028 */ lw $s0, 0x0028($sp) +/* 05594 80AC8234 8FB1002C */ lw $s1, 0x002C($sp) +/* 05598 80AC8238 8FB20030 */ lw $s2, 0x0030($sp) +/* 0559C 80AC823C 03E00008 */ jr $ra /* 055A0 80AC8240 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s index 8515155835..a8a445139b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s @@ -1,20 +1,20 @@ glabel func_80AC8244 /* 055A4 80AC8244 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 055A8 80AC8248 AFB10028 */ sw $s1, 0x0028($sp) +/* 055A8 80AC8248 AFB10028 */ sw $s1, 0x0028($sp) /* 055AC 80AC824C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 055B0 80AC8250 AFBF002C */ sw $ra, 0x002C($sp) -/* 055B4 80AC8254 AFB00024 */ sw $s0, 0x0024($sp) +/* 055B0 80AC8250 AFBF002C */ sw $ra, 0x002C($sp) +/* 055B4 80AC8254 AFB00024 */ sw $s0, 0x0024($sp) /* 055B8 80AC8258 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 055BC 80AC825C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 055C0 80AC8260 3C0680AD */ lui $a2, %hi(D_80AC945C) ## $a2 = 80AD0000 /* 055C4 80AC8264 24C6945C */ addiu $a2, $a2, %lo(D_80AC945C) ## $a2 = 80AC945C /* 055C8 80AC8268 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 055CC 80AC826C 24071167 */ addiu $a3, $zero, 0x1167 ## $a3 = 00001167 -/* 055D0 80AC8270 0C031AB1 */ jal func_800C6AC4 -/* 055D4 80AC8274 AFA5004C */ sw $a1, 0x004C($sp) -/* 055D8 80AC8278 0C024F46 */ jal func_80093D18 +/* 055D0 80AC8270 0C031AB1 */ jal func_800C6AC4 +/* 055D4 80AC8274 AFA5004C */ sw $a1, 0x004C($sp) +/* 055D8 80AC8278 0C024F46 */ jal func_80093D18 /* 055DC 80AC827C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 055E0 80AC8280 8FA8004C */ lw $t0, 0x004C($sp) +/* 055E0 80AC8280 8FA8004C */ lw $t0, 0x004C($sp) /* 055E4 80AC8284 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 055E8 80AC8288 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 055EC 80AC828C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -26,67 +26,67 @@ glabel func_80AC8244 /* 05604 80AC82A4 861801F2 */ lh $t8, 0x01F2($s0) ## 000001F2 /* 05608 80AC82A8 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 0560C 80AC82AC 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 05610 80AC82B0 0018C880 */ sll $t9, $t8, 2 -/* 05614 80AC82B4 00992021 */ addu $a0, $a0, $t9 -/* 05618 80AC82B8 8C848EB8 */ lw $a0, %lo(D_80AC8EB8)($a0) +/* 05610 80AC82B0 0018C880 */ sll $t9, $t8, 2 +/* 05614 80AC82B4 00992021 */ addu $a0, $a0, $t9 +/* 05618 80AC82B8 8C848EB8 */ lw $a0, %lo(D_80AC8EB8)($a0) /* 0561C 80AC82BC 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF /* 05620 80AC82C0 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 05624 80AC82C4 00045100 */ sll $t2, $a0, 4 -/* 05628 80AC82C8 000A5F02 */ srl $t3, $t2, 28 -/* 0562C 80AC82CC 000B6080 */ sll $t4, $t3, 2 -/* 05630 80AC82D0 00CC6821 */ addu $t5, $a2, $t4 +/* 05624 80AC82C4 00045100 */ sll $t2, $a0, 4 +/* 05628 80AC82C8 000A5F02 */ srl $t3, $t2, 28 +/* 0562C 80AC82CC 000B6080 */ sll $t4, $t3, 2 +/* 05630 80AC82D0 00CC6821 */ addu $t5, $a2, $t4 /* 05634 80AC82D4 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 -/* 05638 80AC82D8 00854824 */ and $t1, $a0, $a1 +/* 05638 80AC82D8 00854824 */ and $t1, $a0, $a1 /* 0563C 80AC82DC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 05640 80AC82E0 012E7821 */ addu $t7, $t1, $t6 -/* 05644 80AC82E4 01E7C021 */ addu $t8, $t7, $a3 +/* 05640 80AC82E0 012E7821 */ addu $t7, $t1, $t6 +/* 05644 80AC82E4 01E7C021 */ addu $t8, $t7, $a3 /* 05648 80AC82E8 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 0564C 80AC82EC 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 05650 80AC82F0 2484DE80 */ addiu $a0, $a0, 0xDE80 ## $a0 = 0600DE80 -/* 05654 80AC82F4 00045900 */ sll $t3, $a0, 4 -/* 05658 80AC82F8 000B6702 */ srl $t4, $t3, 28 +/* 05654 80AC82F4 00045900 */ sll $t3, $a0, 4 +/* 05658 80AC82F8 000B6702 */ srl $t4, $t3, 28 /* 0565C 80AC82FC 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 05660 80AC8300 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 05664 80AC8304 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 -/* 05668 80AC8308 000C6880 */ sll $t5, $t4, 2 +/* 05668 80AC8308 000C6880 */ sll $t5, $t4, 2 /* 0566C 80AC830C AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 05670 80AC8310 00CD4821 */ addu $t1, $a2, $t5 +/* 05670 80AC8310 00CD4821 */ addu $t1, $a2, $t5 /* 05674 80AC8314 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 05678 80AC8318 8D2E0000 */ lw $t6, 0x0000($t1) ## 00000000 -/* 0567C 80AC831C 00857824 */ and $t7, $a0, $a1 +/* 0567C 80AC831C 00857824 */ and $t7, $a0, $a1 /* 05680 80AC8320 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05684 80AC8324 01CFC021 */ addu $t8, $t6, $t7 -/* 05688 80AC8328 0307C821 */ addu $t9, $t8, $a3 +/* 05684 80AC8324 01CFC021 */ addu $t8, $t6, $t7 +/* 05688 80AC8328 0307C821 */ addu $t9, $t8, $a3 /* 0568C 80AC832C AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 05690 80AC8330 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 05694 80AC8334 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05698 80AC8338 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 0569C 80AC833C AFB00018 */ sw $s0, 0x0018($sp) -/* 056A0 80AC8340 AFA00014 */ sw $zero, 0x0014($sp) -/* 056A4 80AC8344 0C0286B2 */ jal func_800A1AC8 -/* 056A8 80AC8348 AFA00010 */ sw $zero, 0x0010($sp) +/* 0569C 80AC833C AFB00018 */ sw $s0, 0x0018($sp) +/* 056A0 80AC8340 AFA00014 */ sw $zero, 0x0014($sp) +/* 056A4 80AC8344 0C0286B2 */ jal SkelAnime_DrawSV +/* 056A8 80AC8348 AFA00010 */ sw $zero, 0x0010($sp) /* 056AC 80AC834C C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 /* 056B0 80AC8350 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 /* 056B4 80AC8354 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 056B8 80AC8358 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 056B8 80AC8358 E7A40010 */ swc1 $f4, 0x0010($sp) /* 056BC 80AC835C 920A0251 */ lbu $t2, 0x0251($s0) ## 00000251 /* 056C0 80AC8360 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 056C4 80AC8364 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 056C8 80AC8368 0C2B1D4A */ jal func_80AC7528 -/* 056CC 80AC836C AFAA0014 */ sw $t2, 0x0014($sp) +/* 056C8 80AC8368 0C2B1D4A */ jal func_80AC7528 +/* 056CC 80AC836C AFAA0014 */ sw $t2, 0x0014($sp) /* 056D0 80AC8370 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 056D4 80AC8374 0C2B1E72 */ jal func_80AC79C8 +/* 056D4 80AC8374 0C2B1E72 */ jal func_80AC79C8 /* 056D8 80AC8378 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 056DC 80AC837C 3C0680AD */ lui $a2, %hi(D_80AC946C) ## $a2 = 80AD0000 /* 056E0 80AC8380 24C6946C */ addiu $a2, $a2, %lo(D_80AC946C) ## $a2 = 80AC946C /* 056E4 80AC8384 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 056E8 80AC8388 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 056EC 80AC838C 0C031AD5 */ jal func_800C6B54 +/* 056EC 80AC838C 0C031AD5 */ jal func_800C6B54 /* 056F0 80AC8390 2407117C */ addiu $a3, $zero, 0x117C ## $a3 = 0000117C -/* 056F4 80AC8394 8FBF002C */ lw $ra, 0x002C($sp) -/* 056F8 80AC8398 8FB00024 */ lw $s0, 0x0024($sp) -/* 056FC 80AC839C 8FB10028 */ lw $s1, 0x0028($sp) -/* 05700 80AC83A0 03E00008 */ jr $ra +/* 056F4 80AC8394 8FBF002C */ lw $ra, 0x002C($sp) +/* 056F8 80AC8398 8FB00024 */ lw $s0, 0x0024($sp) +/* 056FC 80AC839C 8FB10028 */ lw $s1, 0x0028($sp) +/* 05700 80AC83A0 03E00008 */ jr $ra /* 05704 80AC83A4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s index ec40e4be8a..45f1ecd22b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s @@ -1,19 +1,19 @@ glabel func_80AC83DC /* 0573C 80AC83DC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 05740 80AC83E0 AFB20030 */ sw $s2, 0x0030($sp) +/* 05740 80AC83E0 AFB20030 */ sw $s2, 0x0030($sp) /* 05744 80AC83E4 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 05748 80AC83E8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0574C 80AC83EC AFB1002C */ sw $s1, 0x002C($sp) -/* 05750 80AC83F0 AFB00028 */ sw $s0, 0x0028($sp) +/* 05748 80AC83E8 AFBF0034 */ sw $ra, 0x0034($sp) +/* 0574C 80AC83EC AFB1002C */ sw $s1, 0x002C($sp) +/* 05750 80AC83F0 AFB00028 */ sw $s0, 0x0028($sp) /* 05754 80AC83F4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 05758 80AC83F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0575C 80AC83FC 3C0680AD */ lui $a2, %hi(D_80AC947C) ## $a2 = 80AD0000 /* 05760 80AC8400 24C6947C */ addiu $a2, $a2, %lo(D_80AC947C) ## $a2 = 80AC947C /* 05764 80AC8404 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 05768 80AC8408 2407119A */ addiu $a3, $zero, 0x119A ## $a3 = 0000119A -/* 0576C 80AC840C 0C031AB1 */ jal func_800C6AC4 +/* 0576C 80AC840C 0C031AB1 */ jal func_800C6AC4 /* 05770 80AC8410 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05774 80AC8414 0C024F46 */ jal func_80093D18 +/* 05774 80AC8414 0C024F46 */ jal func_80093D18 /* 05778 80AC8418 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 0577C 80AC841C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 05780 80AC8420 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 @@ -29,9 +29,9 @@ glabel func_80AC83DC /* 057A8 80AC8448 AE3902C0 */ sw $t9, 0x02C0($s1) ## 000002C0 /* 057AC 80AC844C AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 057B0 80AC8450 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 057B4 80AC8454 0C2B2007 */ jal func_80AC801C -/* 057B8 80AC8458 AFA20044 */ sw $v0, 0x0044($sp) -/* 057BC 80AC845C 8FA30044 */ lw $v1, 0x0044($sp) +/* 057B4 80AC8454 0C2B2007 */ jal func_80AC801C +/* 057B8 80AC8458 AFA20044 */ sw $v0, 0x0044($sp) +/* 057BC 80AC845C 8FA30044 */ lw $v1, 0x0044($sp) /* 057C0 80AC8460 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 057C4 80AC8464 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 /* 057C8 80AC8468 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -44,52 +44,52 @@ glabel func_80AC83DC /* 057E4 80AC8484 860B01F2 */ lh $t3, 0x01F2($s0) ## 000001F2 /* 057E8 80AC8488 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 057EC 80AC848C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 057F0 80AC8490 000B6080 */ sll $t4, $t3, 2 -/* 057F4 80AC8494 008C2021 */ addu $a0, $a0, $t4 -/* 057F8 80AC8498 8C848EC4 */ lw $a0, %lo(D_80AC8EC4)($a0) +/* 057F0 80AC8490 000B6080 */ sll $t4, $t3, 2 +/* 057F4 80AC8494 008C2021 */ addu $a0, $a0, $t4 +/* 057F8 80AC8498 8C848EC4 */ lw $a0, %lo(D_80AC8EC4)($a0) /* 057FC 80AC849C 3C0A80AD */ lui $t2, %hi(func_80AC83A8) ## $t2 = 80AD0000 /* 05800 80AC84A0 254A83A8 */ addiu $t2, $t2, %lo(func_80AC83A8) ## $t2 = 80AC83A8 -/* 05804 80AC84A4 00047100 */ sll $t6, $a0, 4 -/* 05808 80AC84A8 000E7F02 */ srl $t7, $t6, 28 -/* 0580C 80AC84AC 000FC080 */ sll $t8, $t7, 2 -/* 05810 80AC84B0 0338C821 */ addu $t9, $t9, $t8 +/* 05804 80AC84A4 00047100 */ sll $t6, $a0, 4 +/* 05808 80AC84A8 000E7F02 */ srl $t7, $t6, 28 +/* 0580C 80AC84AC 000FC080 */ sll $t8, $t7, 2 +/* 05810 80AC84B0 0338C821 */ addu $t9, $t9, $t8 /* 05814 80AC84B4 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 -/* 05818 80AC84B8 00816824 */ and $t5, $a0, $at +/* 05818 80AC84B8 00816824 */ and $t5, $a0, $at /* 0581C 80AC84BC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05820 80AC84C0 01B94021 */ addu $t0, $t5, $t9 -/* 05824 80AC84C4 01014821 */ addu $t1, $t0, $at +/* 05820 80AC84C0 01B94021 */ addu $t0, $t5, $t9 +/* 05824 80AC84C4 01014821 */ addu $t1, $t0, $at /* 05828 80AC84C8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 0582C 80AC84CC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 05830 80AC84D0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05834 80AC84D4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05838 80AC84D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0583C 80AC84DC AFA00014 */ sw $zero, 0x0014($sp) -/* 05840 80AC84E0 AFAA0010 */ sw $t2, 0x0010($sp) -/* 05844 80AC84E4 0C0286B2 */ jal func_800A1AC8 +/* 05838 80AC84D8 AFB00018 */ sw $s0, 0x0018($sp) +/* 0583C 80AC84DC AFA00014 */ sw $zero, 0x0014($sp) +/* 05840 80AC84E0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 05844 80AC84E4 0C0286B2 */ jal SkelAnime_DrawSV /* 05848 80AC84E8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0584C 80AC84EC C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 /* 05850 80AC84F0 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 /* 05854 80AC84F4 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 05858 80AC84F8 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 05858 80AC84F8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0585C 80AC84FC 920B0251 */ lbu $t3, 0x0251($s0) ## 00000251 /* 05860 80AC8500 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05864 80AC8504 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05868 80AC8508 0C2B1D4A */ jal func_80AC7528 -/* 0586C 80AC850C AFAB0014 */ sw $t3, 0x0014($sp) +/* 05868 80AC8508 0C2B1D4A */ jal func_80AC7528 +/* 0586C 80AC850C AFAB0014 */ sw $t3, 0x0014($sp) /* 05870 80AC8510 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 05874 80AC8514 0C2B1E72 */ jal func_80AC79C8 +/* 05874 80AC8514 0C2B1E72 */ jal func_80AC79C8 /* 05878 80AC8518 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0587C 80AC851C 3C0680AD */ lui $a2, %hi(D_80AC948C) ## $a2 = 80AD0000 /* 05880 80AC8520 24C6948C */ addiu $a2, $a2, %lo(D_80AC948C) ## $a2 = 80AC948C /* 05884 80AC8524 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 05888 80AC8528 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0588C 80AC852C 0C031AD5 */ jal func_800C6B54 +/* 0588C 80AC852C 0C031AD5 */ jal func_800C6B54 /* 05890 80AC8530 240711B3 */ addiu $a3, $zero, 0x11B3 ## $a3 = 000011B3 -/* 05894 80AC8534 8FBF0034 */ lw $ra, 0x0034($sp) -/* 05898 80AC8538 8FB00028 */ lw $s0, 0x0028($sp) -/* 0589C 80AC853C 8FB1002C */ lw $s1, 0x002C($sp) -/* 058A0 80AC8540 8FB20030 */ lw $s2, 0x0030($sp) -/* 058A4 80AC8544 03E00008 */ jr $ra +/* 05894 80AC8534 8FBF0034 */ lw $ra, 0x0034($sp) +/* 05898 80AC8538 8FB00028 */ lw $s0, 0x0028($sp) +/* 0589C 80AC853C 8FB1002C */ lw $s1, 0x002C($sp) +/* 058A0 80AC8540 8FB20030 */ lw $s2, 0x0030($sp) +/* 058A4 80AC8544 03E00008 */ jr $ra /* 058A8 80AC8548 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s index d93200a5f7..af5a2ab9da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s @@ -1,20 +1,20 @@ glabel func_80AC854C /* 058AC 80AC854C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 058B0 80AC8550 AFB10028 */ sw $s1, 0x0028($sp) +/* 058B0 80AC8550 AFB10028 */ sw $s1, 0x0028($sp) /* 058B4 80AC8554 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 058B8 80AC8558 AFBF002C */ sw $ra, 0x002C($sp) -/* 058BC 80AC855C AFB00024 */ sw $s0, 0x0024($sp) +/* 058B8 80AC8558 AFBF002C */ sw $ra, 0x002C($sp) +/* 058BC 80AC855C AFB00024 */ sw $s0, 0x0024($sp) /* 058C0 80AC8560 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 058C4 80AC8564 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 058C8 80AC8568 3C0680AD */ lui $a2, %hi(D_80AC949C) ## $a2 = 80AD0000 /* 058CC 80AC856C 24C6949C */ addiu $a2, $a2, %lo(D_80AC949C) ## $a2 = 80AC949C /* 058D0 80AC8570 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 058D4 80AC8574 240711C0 */ addiu $a3, $zero, 0x11C0 ## $a3 = 000011C0 -/* 058D8 80AC8578 0C031AB1 */ jal func_800C6AC4 -/* 058DC 80AC857C AFA5004C */ sw $a1, 0x004C($sp) -/* 058E0 80AC8580 0C024F46 */ jal func_80093D18 +/* 058D8 80AC8578 0C031AB1 */ jal func_800C6AC4 +/* 058DC 80AC857C AFA5004C */ sw $a1, 0x004C($sp) +/* 058E0 80AC8580 0C024F46 */ jal func_80093D18 /* 058E4 80AC8584 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 058E8 80AC8588 8FA5004C */ lw $a1, 0x004C($sp) +/* 058E8 80AC8588 8FA5004C */ lw $a1, 0x004C($sp) /* 058EC 80AC858C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 058F0 80AC8590 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 058F4 80AC8594 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,49 +26,49 @@ glabel func_80AC854C /* 0590C 80AC85AC 861801F2 */ lh $t8, 0x01F2($s0) ## 000001F2 /* 05910 80AC85B0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 05914 80AC85B4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05918 80AC85B8 0018C880 */ sll $t9, $t8, 2 -/* 0591C 80AC85BC 00992021 */ addu $a0, $a0, $t9 -/* 05920 80AC85C0 8C848ED0 */ lw $a0, %lo(D_80AC8ED0)($a0) -/* 05924 80AC85C4 00044900 */ sll $t1, $a0, 4 -/* 05928 80AC85C8 00095702 */ srl $t2, $t1, 28 -/* 0592C 80AC85CC 000A5880 */ sll $t3, $t2, 2 -/* 05930 80AC85D0 018B6021 */ addu $t4, $t4, $t3 +/* 05918 80AC85B8 0018C880 */ sll $t9, $t8, 2 +/* 0591C 80AC85BC 00992021 */ addu $a0, $a0, $t9 +/* 05920 80AC85C0 8C848ED0 */ lw $a0, %lo(D_80AC8ED0)($a0) +/* 05924 80AC85C4 00044900 */ sll $t1, $a0, 4 +/* 05928 80AC85C8 00095702 */ srl $t2, $t1, 28 +/* 0592C 80AC85CC 000A5880 */ sll $t3, $t2, 2 +/* 05930 80AC85D0 018B6021 */ addu $t4, $t4, $t3 /* 05934 80AC85D4 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 05938 80AC85D8 00814024 */ and $t0, $a0, $at +/* 05938 80AC85D8 00814024 */ and $t0, $a0, $at /* 0593C 80AC85DC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05940 80AC85E0 010C6821 */ addu $t5, $t0, $t4 -/* 05944 80AC85E4 01A17021 */ addu $t6, $t5, $at +/* 05940 80AC85E0 010C6821 */ addu $t5, $t0, $t4 +/* 05944 80AC85E4 01A17021 */ addu $t6, $t5, $at /* 05948 80AC85E8 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 0594C 80AC85EC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 05950 80AC85F0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05954 80AC85F4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05958 80AC85F8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0595C 80AC85FC AFA00014 */ sw $zero, 0x0014($sp) -/* 05960 80AC8600 AFA00010 */ sw $zero, 0x0010($sp) -/* 05964 80AC8604 0C0286B2 */ jal func_800A1AC8 +/* 05958 80AC85F8 AFB00018 */ sw $s0, 0x0018($sp) +/* 0595C 80AC85FC AFA00014 */ sw $zero, 0x0014($sp) +/* 05960 80AC8600 AFA00010 */ sw $zero, 0x0010($sp) +/* 05964 80AC8604 0C0286B2 */ jal SkelAnime_DrawSV /* 05968 80AC8608 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0596C 80AC860C C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 /* 05970 80AC8610 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 /* 05974 80AC8614 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 05978 80AC8618 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 05978 80AC8618 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0597C 80AC861C 920F0251 */ lbu $t7, 0x0251($s0) ## 00000251 /* 05980 80AC8620 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05984 80AC8624 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05988 80AC8628 0C2B1D4A */ jal func_80AC7528 -/* 0598C 80AC862C AFAF0014 */ sw $t7, 0x0014($sp) +/* 05988 80AC8628 0C2B1D4A */ jal func_80AC7528 +/* 0598C 80AC862C AFAF0014 */ sw $t7, 0x0014($sp) /* 05990 80AC8630 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05994 80AC8634 0C2B1E72 */ jal func_80AC79C8 +/* 05994 80AC8634 0C2B1E72 */ jal func_80AC79C8 /* 05998 80AC8638 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0599C 80AC863C 3C0680AD */ lui $a2, %hi(D_80AC94AC) ## $a2 = 80AD0000 /* 059A0 80AC8640 24C694AC */ addiu $a2, $a2, %lo(D_80AC94AC) ## $a2 = 80AC94AC /* 059A4 80AC8644 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 059A8 80AC8648 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 059AC 80AC864C 0C031AD5 */ jal func_800C6B54 +/* 059AC 80AC864C 0C031AD5 */ jal func_800C6B54 /* 059B0 80AC8650 240711D4 */ addiu $a3, $zero, 0x11D4 ## $a3 = 000011D4 -/* 059B4 80AC8654 8FBF002C */ lw $ra, 0x002C($sp) -/* 059B8 80AC8658 8FB00024 */ lw $s0, 0x0024($sp) -/* 059BC 80AC865C 8FB10028 */ lw $s1, 0x0028($sp) -/* 059C0 80AC8660 03E00008 */ jr $ra +/* 059B4 80AC8654 8FBF002C */ lw $ra, 0x002C($sp) +/* 059B8 80AC8658 8FB00024 */ lw $s0, 0x0024($sp) +/* 059BC 80AC865C 8FB10028 */ lw $s1, 0x0028($sp) +/* 059C0 80AC8660 03E00008 */ jr $ra /* 059C4 80AC8664 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s index 647e7a63db..505ac6b48e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s @@ -1,20 +1,20 @@ glabel func_80AC8668 /* 059C8 80AC8668 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 059CC 80AC866C AFB10028 */ sw $s1, 0x0028($sp) +/* 059CC 80AC866C AFB10028 */ sw $s1, 0x0028($sp) /* 059D0 80AC8670 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 059D4 80AC8674 AFBF002C */ sw $ra, 0x002C($sp) -/* 059D8 80AC8678 AFB00024 */ sw $s0, 0x0024($sp) +/* 059D4 80AC8674 AFBF002C */ sw $ra, 0x002C($sp) +/* 059D8 80AC8678 AFB00024 */ sw $s0, 0x0024($sp) /* 059DC 80AC867C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 059E0 80AC8680 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 059E4 80AC8684 3C0680AD */ lui $a2, %hi(D_80AC94BC) ## $a2 = 80AD0000 /* 059E8 80AC8688 24C694BC */ addiu $a2, $a2, %lo(D_80AC94BC) ## $a2 = 80AC94BC /* 059EC 80AC868C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 059F0 80AC8690 240711E2 */ addiu $a3, $zero, 0x11E2 ## $a3 = 000011E2 -/* 059F4 80AC8694 0C031AB1 */ jal func_800C6AC4 -/* 059F8 80AC8698 AFA5004C */ sw $a1, 0x004C($sp) -/* 059FC 80AC869C 0C024F46 */ jal func_80093D18 +/* 059F4 80AC8694 0C031AB1 */ jal func_800C6AC4 +/* 059F8 80AC8698 AFA5004C */ sw $a1, 0x004C($sp) +/* 059FC 80AC869C 0C024F46 */ jal func_80093D18 /* 05A00 80AC86A0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 05A04 80AC86A4 8FA5004C */ lw $a1, 0x004C($sp) +/* 05A04 80AC86A4 8FA5004C */ lw $a1, 0x004C($sp) /* 05A08 80AC86A8 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 05A0C 80AC86AC 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 05A10 80AC86B0 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,49 +26,49 @@ glabel func_80AC8668 /* 05A28 80AC86C8 921801EC */ lbu $t8, 0x01EC($s0) ## 000001EC /* 05A2C 80AC86CC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 05A30 80AC86D0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05A34 80AC86D4 0018C880 */ sll $t9, $t8, 2 -/* 05A38 80AC86D8 00992021 */ addu $a0, $a0, $t9 -/* 05A3C 80AC86DC 8C848EDC */ lw $a0, %lo(D_80AC8EDC)($a0) -/* 05A40 80AC86E0 00044900 */ sll $t1, $a0, 4 -/* 05A44 80AC86E4 00095702 */ srl $t2, $t1, 28 -/* 05A48 80AC86E8 000A5880 */ sll $t3, $t2, 2 -/* 05A4C 80AC86EC 018B6021 */ addu $t4, $t4, $t3 +/* 05A34 80AC86D4 0018C880 */ sll $t9, $t8, 2 +/* 05A38 80AC86D8 00992021 */ addu $a0, $a0, $t9 +/* 05A3C 80AC86DC 8C848EDC */ lw $a0, %lo(D_80AC8EDC)($a0) +/* 05A40 80AC86E0 00044900 */ sll $t1, $a0, 4 +/* 05A44 80AC86E4 00095702 */ srl $t2, $t1, 28 +/* 05A48 80AC86E8 000A5880 */ sll $t3, $t2, 2 +/* 05A4C 80AC86EC 018B6021 */ addu $t4, $t4, $t3 /* 05A50 80AC86F0 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 05A54 80AC86F4 00814024 */ and $t0, $a0, $at +/* 05A54 80AC86F4 00814024 */ and $t0, $a0, $at /* 05A58 80AC86F8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05A5C 80AC86FC 010C6821 */ addu $t5, $t0, $t4 -/* 05A60 80AC8700 01A17021 */ addu $t6, $t5, $at +/* 05A5C 80AC86FC 010C6821 */ addu $t5, $t0, $t4 +/* 05A60 80AC8700 01A17021 */ addu $t6, $t5, $at /* 05A64 80AC8704 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 05A68 80AC8708 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 05A6C 80AC870C 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05A70 80AC8710 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05A74 80AC8714 AFB00018 */ sw $s0, 0x0018($sp) -/* 05A78 80AC8718 AFA00014 */ sw $zero, 0x0014($sp) -/* 05A7C 80AC871C AFA00010 */ sw $zero, 0x0010($sp) -/* 05A80 80AC8720 0C0286B2 */ jal func_800A1AC8 +/* 05A74 80AC8714 AFB00018 */ sw $s0, 0x0018($sp) +/* 05A78 80AC8718 AFA00014 */ sw $zero, 0x0014($sp) +/* 05A7C 80AC871C AFA00010 */ sw $zero, 0x0010($sp) +/* 05A80 80AC8720 0C0286B2 */ jal SkelAnime_DrawSV /* 05A84 80AC8724 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05A88 80AC8728 C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 /* 05A8C 80AC872C 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 /* 05A90 80AC8730 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 05A94 80AC8734 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 05A94 80AC8734 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05A98 80AC8738 920F0251 */ lbu $t7, 0x0251($s0) ## 00000251 /* 05A9C 80AC873C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05AA0 80AC8740 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05AA4 80AC8744 0C2B1D4A */ jal func_80AC7528 -/* 05AA8 80AC8748 AFAF0014 */ sw $t7, 0x0014($sp) +/* 05AA4 80AC8744 0C2B1D4A */ jal func_80AC7528 +/* 05AA8 80AC8748 AFAF0014 */ sw $t7, 0x0014($sp) /* 05AAC 80AC874C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05AB0 80AC8750 0C2B1E72 */ jal func_80AC79C8 +/* 05AB0 80AC8750 0C2B1E72 */ jal func_80AC79C8 /* 05AB4 80AC8754 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 05AB8 80AC8758 3C0680AD */ lui $a2, %hi(D_80AC94CC) ## $a2 = 80AD0000 /* 05ABC 80AC875C 24C694CC */ addiu $a2, $a2, %lo(D_80AC94CC) ## $a2 = 80AC94CC /* 05AC0 80AC8760 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05AC4 80AC8764 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 05AC8 80AC8768 0C031AD5 */ jal func_800C6B54 +/* 05AC8 80AC8768 0C031AD5 */ jal func_800C6B54 /* 05ACC 80AC876C 240711F6 */ addiu $a3, $zero, 0x11F6 ## $a3 = 000011F6 -/* 05AD0 80AC8770 8FBF002C */ lw $ra, 0x002C($sp) -/* 05AD4 80AC8774 8FB00024 */ lw $s0, 0x0024($sp) -/* 05AD8 80AC8778 8FB10028 */ lw $s1, 0x0028($sp) -/* 05ADC 80AC877C 03E00008 */ jr $ra +/* 05AD0 80AC8770 8FBF002C */ lw $ra, 0x002C($sp) +/* 05AD4 80AC8774 8FB00024 */ lw $s0, 0x0024($sp) +/* 05AD8 80AC8778 8FB10028 */ lw $s1, 0x0028($sp) +/* 05ADC 80AC877C 03E00008 */ jr $ra /* 05AE0 80AC8780 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s index a50c55968e..657bd298fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s @@ -1,20 +1,20 @@ glabel func_80AC8784 /* 05AE4 80AC8784 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 05AE8 80AC8788 AFB10028 */ sw $s1, 0x0028($sp) +/* 05AE8 80AC8788 AFB10028 */ sw $s1, 0x0028($sp) /* 05AEC 80AC878C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05AF0 80AC8790 AFBF002C */ sw $ra, 0x002C($sp) -/* 05AF4 80AC8794 AFB00024 */ sw $s0, 0x0024($sp) +/* 05AF0 80AC8790 AFBF002C */ sw $ra, 0x002C($sp) +/* 05AF4 80AC8794 AFB00024 */ sw $s0, 0x0024($sp) /* 05AF8 80AC8798 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 05AFC 80AC879C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05B00 80AC87A0 3C0680AD */ lui $a2, %hi(D_80AC94DC) ## $a2 = 80AD0000 /* 05B04 80AC87A4 24C694DC */ addiu $a2, $a2, %lo(D_80AC94DC) ## $a2 = 80AC94DC /* 05B08 80AC87A8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05B0C 80AC87AC 24071203 */ addiu $a3, $zero, 0x1203 ## $a3 = 00001203 -/* 05B10 80AC87B0 0C031AB1 */ jal func_800C6AC4 -/* 05B14 80AC87B4 AFA5004C */ sw $a1, 0x004C($sp) -/* 05B18 80AC87B8 0C024F46 */ jal func_80093D18 +/* 05B10 80AC87B0 0C031AB1 */ jal func_800C6AC4 +/* 05B14 80AC87B4 AFA5004C */ sw $a1, 0x004C($sp) +/* 05B18 80AC87B8 0C024F46 */ jal func_80093D18 /* 05B1C 80AC87BC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 05B20 80AC87C0 8FA5004C */ lw $a1, 0x004C($sp) +/* 05B20 80AC87C0 8FA5004C */ lw $a1, 0x004C($sp) /* 05B24 80AC87C4 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 05B28 80AC87C8 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 05B2C 80AC87CC 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,48 +26,48 @@ glabel func_80AC8784 /* 05B44 80AC87E4 861801F2 */ lh $t8, 0x01F2($s0) ## 000001F2 /* 05B48 80AC87E8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 05B4C 80AC87EC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05B50 80AC87F0 0018C880 */ sll $t9, $t8, 2 -/* 05B54 80AC87F4 00992021 */ addu $a0, $a0, $t9 -/* 05B58 80AC87F8 8C848EE4 */ lw $a0, %lo(D_80AC8EE4)($a0) -/* 05B5C 80AC87FC 00044900 */ sll $t1, $a0, 4 -/* 05B60 80AC8800 00095702 */ srl $t2, $t1, 28 -/* 05B64 80AC8804 000A5880 */ sll $t3, $t2, 2 -/* 05B68 80AC8808 018B6021 */ addu $t4, $t4, $t3 +/* 05B50 80AC87F0 0018C880 */ sll $t9, $t8, 2 +/* 05B54 80AC87F4 00992021 */ addu $a0, $a0, $t9 +/* 05B58 80AC87F8 8C848EE4 */ lw $a0, %lo(D_80AC8EE4)($a0) +/* 05B5C 80AC87FC 00044900 */ sll $t1, $a0, 4 +/* 05B60 80AC8800 00095702 */ srl $t2, $t1, 28 +/* 05B64 80AC8804 000A5880 */ sll $t3, $t2, 2 +/* 05B68 80AC8808 018B6021 */ addu $t4, $t4, $t3 /* 05B6C 80AC880C 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 05B70 80AC8810 00814024 */ and $t0, $a0, $at +/* 05B70 80AC8810 00814024 */ and $t0, $a0, $at /* 05B74 80AC8814 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05B78 80AC8818 010C6821 */ addu $t5, $t0, $t4 -/* 05B7C 80AC881C 01A17021 */ addu $t6, $t5, $at +/* 05B78 80AC8818 010C6821 */ addu $t5, $t0, $t4 +/* 05B7C 80AC881C 01A17021 */ addu $t6, $t5, $at /* 05B80 80AC8820 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 05B84 80AC8824 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 05B88 80AC8828 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05B8C 80AC882C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05B90 80AC8830 AFB00018 */ sw $s0, 0x0018($sp) -/* 05B94 80AC8834 AFA00014 */ sw $zero, 0x0014($sp) -/* 05B98 80AC8838 AFA00010 */ sw $zero, 0x0010($sp) -/* 05B9C 80AC883C 0C0286B2 */ jal func_800A1AC8 +/* 05B90 80AC8830 AFB00018 */ sw $s0, 0x0018($sp) +/* 05B94 80AC8834 AFA00014 */ sw $zero, 0x0014($sp) +/* 05B98 80AC8838 AFA00010 */ sw $zero, 0x0010($sp) +/* 05B9C 80AC883C 0C0286B2 */ jal SkelAnime_DrawSV /* 05BA0 80AC8840 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05BA4 80AC8844 C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 /* 05BA8 80AC8848 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 /* 05BAC 80AC884C 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 05BB0 80AC8850 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 05BB0 80AC8850 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05BB4 80AC8854 920F0251 */ lbu $t7, 0x0251($s0) ## 00000251 /* 05BB8 80AC8858 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05BBC 80AC885C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05BC0 80AC8860 0C2B1D4A */ jal func_80AC7528 -/* 05BC4 80AC8864 AFAF0014 */ sw $t7, 0x0014($sp) +/* 05BC0 80AC8860 0C2B1D4A */ jal func_80AC7528 +/* 05BC4 80AC8864 AFAF0014 */ sw $t7, 0x0014($sp) /* 05BC8 80AC8868 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05BCC 80AC886C 0C2B1E72 */ jal func_80AC79C8 +/* 05BCC 80AC886C 0C2B1E72 */ jal func_80AC79C8 /* 05BD0 80AC8870 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 05BD4 80AC8874 3C0680AD */ lui $a2, %hi(D_80AC94EC) ## $a2 = 80AD0000 /* 05BD8 80AC8878 24C694EC */ addiu $a2, $a2, %lo(D_80AC94EC) ## $a2 = 80AC94EC /* 05BDC 80AC887C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05BE0 80AC8880 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 05BE4 80AC8884 0C031AD5 */ jal func_800C6B54 +/* 05BE4 80AC8884 0C031AD5 */ jal func_800C6B54 /* 05BE8 80AC8888 24071217 */ addiu $a3, $zero, 0x1217 ## $a3 = 00001217 -/* 05BEC 80AC888C 8FBF002C */ lw $ra, 0x002C($sp) -/* 05BF0 80AC8890 8FB00024 */ lw $s0, 0x0024($sp) -/* 05BF4 80AC8894 8FB10028 */ lw $s1, 0x0028($sp) -/* 05BF8 80AC8898 03E00008 */ jr $ra +/* 05BEC 80AC888C 8FBF002C */ lw $ra, 0x002C($sp) +/* 05BF0 80AC8890 8FB00024 */ lw $s0, 0x0024($sp) +/* 05BF4 80AC8894 8FB10028 */ lw $s1, 0x0028($sp) +/* 05BF8 80AC8898 03E00008 */ jr $ra /* 05BFC 80AC889C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s index 383210e5ca..79d6df8f3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s @@ -1,20 +1,20 @@ glabel EnOwl_Draw /* 03098 80ACCFB8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0309C 80ACCFBC AFBF0024 */ sw $ra, 0x0024($sp) -/* 030A0 80ACCFC0 AFA40050 */ sw $a0, 0x0050($sp) -/* 030A4 80ACCFC4 AFA50054 */ sw $a1, 0x0054($sp) +/* 0309C 80ACCFBC AFBF0024 */ sw $ra, 0x0024($sp) +/* 030A0 80ACCFC0 AFA40050 */ sw $a0, 0x0050($sp) +/* 030A4 80ACCFC4 AFA50054 */ sw $a1, 0x0054($sp) /* 030A8 80ACCFC8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 030AC 80ACCFCC 3C0680AD */ lui $a2, %hi(D_80ACD7DC) ## $a2 = 80AD0000 /* 030B0 80ACCFD0 24C6D7DC */ addiu $a2, $a2, %lo(D_80ACD7DC) ## $a2 = 80ACD7DC /* 030B4 80ACCFD4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 030B8 80ACCFD8 240708C7 */ addiu $a3, $zero, 0x08C7 ## $a3 = 000008C7 -/* 030BC 80ACCFDC 0C031AB1 */ jal func_800C6AC4 -/* 030C0 80ACCFE0 AFA50044 */ sw $a1, 0x0044($sp) -/* 030C4 80ACCFE4 8FAF0054 */ lw $t7, 0x0054($sp) -/* 030C8 80ACCFE8 0C0250F2 */ jal func_800943C8 +/* 030BC 80ACCFDC 0C031AB1 */ jal func_800C6AC4 +/* 030C0 80ACCFE0 AFA50044 */ sw $a1, 0x0044($sp) +/* 030C4 80ACCFE4 8FAF0054 */ lw $t7, 0x0054($sp) +/* 030C8 80ACCFE8 0C0250F2 */ jal func_800943C8 /* 030CC 80ACCFEC 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 030D0 80ACCFF0 8FA50044 */ lw $a1, 0x0044($sp) -/* 030D4 80ACCFF4 8FA80050 */ lw $t0, 0x0050($sp) +/* 030D0 80ACCFF0 8FA50044 */ lw $a1, 0x0044($sp) +/* 030D4 80ACCFF4 8FA80050 */ lw $t0, 0x0050($sp) /* 030D8 80ACCFF8 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 030DC 80ACCFFC 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 030E0 80ACD000 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 @@ -25,20 +25,20 @@ glabel EnOwl_Draw /* 030F4 80ACD014 850903F4 */ lh $t1, 0x03F4($t0) ## 000003F4 /* 030F8 80ACD018 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 030FC 80ACD01C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 03100 80ACD020 00095080 */ sll $t2, $t1, 2 -/* 03104 80ACD024 008A2021 */ addu $a0, $a0, $t2 -/* 03108 80ACD028 8C84D638 */ lw $a0, %lo(D_80ACD638)($a0) +/* 03100 80ACD020 00095080 */ sll $t2, $t1, 2 +/* 03104 80ACD024 008A2021 */ addu $a0, $a0, $t2 +/* 03108 80ACD028 8C84D638 */ lw $a0, %lo(D_80ACD638)($a0) /* 0310C 80ACD02C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 03110 80ACD030 3C0A80AD */ lui $t2, %hi(func_80ACCF34) ## $t2 = 80AD0000 -/* 03114 80ACD034 00046100 */ sll $t4, $a0, 4 -/* 03118 80ACD038 000C6F02 */ srl $t5, $t4, 28 -/* 0311C 80ACD03C 000D7080 */ sll $t6, $t5, 2 -/* 03120 80ACD040 01EE7821 */ addu $t7, $t7, $t6 +/* 03114 80ACD034 00046100 */ sll $t4, $a0, 4 +/* 03118 80ACD038 000C6F02 */ srl $t5, $t4, 28 +/* 0311C 80ACD03C 000D7080 */ sll $t6, $t5, 2 +/* 03120 80ACD040 01EE7821 */ addu $t7, $t7, $t6 /* 03124 80ACD044 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 -/* 03128 80ACD048 00815824 */ and $t3, $a0, $at +/* 03128 80ACD048 00815824 */ and $t3, $a0, $at /* 0312C 80ACD04C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03130 80ACD050 016FC021 */ addu $t8, $t3, $t7 -/* 03134 80ACD054 0301C821 */ addu $t9, $t8, $at +/* 03130 80ACD050 016FC021 */ addu $t8, $t3, $t7 +/* 03134 80ACD054 0301C821 */ addu $t9, $t8, $at /* 03138 80ACD058 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 0313C 80ACD05C 8D0203DC */ lw $v0, 0x03DC($t0) ## 000003DC /* 03140 80ACD060 3C0980AD */ lui $t1, %hi(func_80ACCE00) ## $t1 = 80AD0000 @@ -47,21 +47,21 @@ glabel EnOwl_Draw /* 0314C 80ACD06C 8C460020 */ lw $a2, 0x0020($v0) ## 00000020 /* 03150 80ACD070 90470002 */ lbu $a3, 0x0002($v0) ## 00000002 /* 03154 80ACD074 254ACF34 */ addiu $t2, $t2, %lo(func_80ACCF34) ## $t2 = 80ACCF34 -/* 03158 80ACD078 AFAA0014 */ sw $t2, 0x0014($sp) -/* 0315C 80ACD07C AFA90010 */ sw $t1, 0x0010($sp) -/* 03160 80ACD080 8FA40054 */ lw $a0, 0x0054($sp) -/* 03164 80ACD084 0C0286B2 */ jal func_800A1AC8 -/* 03168 80ACD088 AFA80018 */ sw $t0, 0x0018($sp) -/* 0316C 80ACD08C 8FAC0054 */ lw $t4, 0x0054($sp) +/* 03158 80ACD078 AFAA0014 */ sw $t2, 0x0014($sp) +/* 0315C 80ACD07C AFA90010 */ sw $t1, 0x0010($sp) +/* 03160 80ACD080 8FA40054 */ lw $a0, 0x0054($sp) +/* 03164 80ACD084 0C0286B2 */ jal SkelAnime_DrawSV +/* 03168 80ACD088 AFA80018 */ sw $t0, 0x0018($sp) +/* 0316C 80ACD08C 8FAC0054 */ lw $t4, 0x0054($sp) /* 03170 80ACD090 3C0680AD */ lui $a2, %hi(D_80ACD7EC) ## $a2 = 80AD0000 /* 03174 80ACD094 24C6D7EC */ addiu $a2, $a2, %lo(D_80ACD7EC) ## $a2 = 80ACD7EC /* 03178 80ACD098 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 0317C 80ACD09C 240708D8 */ addiu $a3, $zero, 0x08D8 ## $a3 = 000008D8 -/* 03180 80ACD0A0 0C031AD5 */ jal func_800C6B54 +/* 03180 80ACD0A0 0C031AD5 */ jal func_800C6B54 /* 03184 80ACD0A4 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 03188 80ACD0A8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03188 80ACD0A8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0318C 80ACD0AC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 03190 80ACD0B0 03E00008 */ jr $ra +/* 03190 80ACD0B0 03E00008 */ jr $ra /* 03194 80ACD0B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s index ce08814c9b..2c55735c7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s @@ -1,32 +1,32 @@ glabel EnOwl_Init /* 00000 80AC9F20 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 80AC9F24 AFA50054 */ sw $a1, 0x0054($sp) -/* 00008 80AC9F28 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 80AC9F2C AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80AC9F24 AFA50054 */ sw $a1, 0x0054($sp) +/* 00008 80AC9F28 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 80AC9F2C AFB00028 */ sw $s0, 0x0028($sp) /* 00010 80AC9F30 3C0580AD */ lui $a1, %hi(D_80ACD61C) ## $a1 = 80AD0000 /* 00014 80AC9F34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 80AC9F38 0C01E037 */ jal Actor_ProcessInitChain - + /* 0001C 80AC9F3C 24A5D61C */ addiu $a1, $a1, %lo(D_80ACD61C) ## $a1 = 80ACD61C /* 00020 80AC9F40 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00024 80AC9F44 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00028 80AC9F48 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0002C 80AC9F4C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00030 80AC9F50 0C00AC78 */ jal ActorShape_Init - + /* 00034 80AC9F54 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 00038 80AC9F58 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 0003C 80AC9F5C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00040 80AC9F60 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 00044 80AC9F64 260F025A */ addiu $t7, $s0, 0x025A ## $t7 = 0000025A /* 00048 80AC9F68 24180015 */ addiu $t8, $zero, 0x0015 ## $t8 = 00000015 -/* 0004C 80AC9F6C AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 80AC9F70 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 80AC9F74 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0004C 80AC9F6C AFB80018 */ sw $t8, 0x0018($sp) +/* 00050 80AC9F70 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00054 80AC9F74 AFAE0010 */ sw $t6, 0x0010($sp) /* 00058 80AC9F78 24E715CC */ addiu $a3, $a3, 0x15CC ## $a3 = 060015CC /* 0005C 80AC9F7C 24C6C0E8 */ addiu $a2, $a2, 0xC0E8 ## $a2 = 0600C0E8 -/* 00060 80AC9F80 8FA40054 */ lw $a0, 0x0054($sp) -/* 00064 80AC9F84 0C0291BE */ jal func_800A46F8 +/* 00060 80AC9F80 8FA40054 */ lw $a0, 0x0054($sp) +/* 00064 80AC9F84 0C0291BE */ jal SkelAnime_InitSV /* 00068 80AC9F88 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 0006C 80AC9F8C 260502D8 */ addiu $a1, $s0, 0x02D8 ## $a1 = 000002D8 /* 00070 80AC9F90 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -34,25 +34,25 @@ glabel EnOwl_Init /* 00078 80AC9F98 2619031C */ addiu $t9, $s0, 0x031C ## $t9 = 0000031C /* 0007C 80AC9F9C 2608037C */ addiu $t0, $s0, 0x037C ## $t0 = 0000037C /* 00080 80AC9FA0 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 -/* 00084 80AC9FA4 AFA90018 */ sw $t1, 0x0018($sp) -/* 00088 80AC9FA8 AFA80014 */ sw $t0, 0x0014($sp) -/* 0008C 80AC9FAC AFB90010 */ sw $t9, 0x0010($sp) +/* 00084 80AC9FA4 AFA90018 */ sw $t1, 0x0018($sp) +/* 00088 80AC9FA8 AFA80014 */ sw $t0, 0x0014($sp) +/* 0008C 80AC9FAC AFB90010 */ sw $t9, 0x0010($sp) /* 00090 80AC9FB0 24E7C8A0 */ addiu $a3, $a3, 0xC8A0 ## $a3 = 0600C8A0 /* 00094 80AC9FB4 24C600B0 */ addiu $a2, $a2, 0x00B0 ## $a2 = 060100B0 -/* 00098 80AC9FB8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0009C 80AC9FBC 0C0291BE */ jal func_800A46F8 -/* 000A0 80AC9FC0 8FA40054 */ lw $a0, 0x0054($sp) +/* 00098 80AC9FB8 AFA50034 */ sw $a1, 0x0034($sp) +/* 0009C 80AC9FBC 0C0291BE */ jal SkelAnime_InitSV +/* 000A0 80AC9FC0 8FA40054 */ lw $a0, 0x0054($sp) /* 000A4 80AC9FC4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 000A8 80AC9FC8 AFA50038 */ sw $a1, 0x0038($sp) +/* 000A8 80AC9FC8 AFA50038 */ sw $a1, 0x0038($sp) /* 000AC 80AC9FCC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 000B0 80AC9FD0 8FA40054 */ lw $a0, 0x0054($sp) + +/* 000B0 80AC9FD0 8FA40054 */ lw $a0, 0x0054($sp) /* 000B4 80AC9FD4 3C0780AD */ lui $a3, %hi(D_80ACD5F0) ## $a3 = 80AD0000 -/* 000B8 80AC9FD8 8FA50038 */ lw $a1, 0x0038($sp) +/* 000B8 80AC9FD8 8FA50038 */ lw $a1, 0x0038($sp) /* 000BC 80AC9FDC 24E7D5F0 */ addiu $a3, $a3, %lo(D_80ACD5F0) ## $a3 = 80ACD5F0 -/* 000C0 80AC9FE0 8FA40054 */ lw $a0, 0x0054($sp) +/* 000C0 80AC9FE0 8FA40054 */ lw $a0, 0x0054($sp) /* 000C4 80AC9FE4 0C01712B */ jal ActorCollider_InitCylinder - + /* 000C8 80AC9FE8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000CC 80AC9FEC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 000D0 80AC9FF0 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 @@ -69,12 +69,12 @@ glabel EnOwl_Init /* 000FC 80ACA01C 24A5BA24 */ addiu $a1, $a1, %lo(func_80ACBA24) ## $a1 = 80ACBA24 /* 00100 80ACA020 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 /* 00104 80ACA024 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 -/* 00108 80ACA028 AFA50038 */ sw $a1, 0x0038($sp) -/* 0010C 80ACA02C AFAB0010 */ sw $t3, 0x0010($sp) -/* 00110 80ACA030 8FA70034 */ lw $a3, 0x0034($sp) +/* 00108 80ACA028 AFA50038 */ sw $a1, 0x0038($sp) +/* 0010C 80ACA02C AFAB0010 */ sw $t3, 0x0010($sp) +/* 00110 80ACA030 8FA70034 */ lw $a3, 0x0034($sp) /* 00114 80ACA034 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00118 80ACA038 0C2B342E */ jal func_80ACD0B8 -/* 0011C 80ACA03C E7A80014 */ swc1 $f8, 0x0014($sp) +/* 00118 80ACA038 0C2B342E */ jal func_80ACD0B8 +/* 0011C 80ACA03C E7A80014 */ swc1 $f8, 0x0014($sp) /* 00120 80ACA040 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 00124 80ACA044 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 /* 00128 80ACA048 300200FF */ andi $v0, $zero, 0x00FF ## $v0 = 00000000 @@ -87,65 +87,65 @@ glabel EnOwl_Init /* 00144 80ACA064 A2000407 */ sb $zero, 0x0407($s0) ## 00000407 /* 00148 80ACA068 A2000404 */ sb $zero, 0x0404($s0) ## 00000404 /* 0014C 80ACA06C A2030408 */ sb $v1, 0x0408($s0) ## 00000408 -/* 00150 80ACA070 00063183 */ sra $a2, $a2, 6 -/* 00154 80ACA074 14A10003 */ bne $a1, $at, .L80ACA084 +/* 00150 80ACA070 00063183 */ sra $a2, $a2, 6 +/* 00154 80ACA074 14A10003 */ bne $a1, $at, .L80ACA084 /* 00158 80ACA078 30A7003F */ andi $a3, $a1, 0x003F ## $a3 = 00000000 /* 0015C 80ACA07C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00160 80ACA080 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 .L80ACA084: /* 00164 80ACA084 3C0480AD */ lui $a0, %hi(D_80ACD650) ## $a0 = 80AD0000 /* 00168 80ACA088 2484D650 */ addiu $a0, $a0, %lo(D_80ACD650) ## $a0 = 80ACD650 -/* 0016C 80ACA08C AFA60044 */ sw $a2, 0x0044($sp) +/* 0016C 80ACA08C AFA60044 */ sw $a2, 0x0044($sp) /* 00170 80ACA090 0C00084C */ jal osSyncPrintf - -/* 00174 80ACA094 AFA70040 */ sw $a3, 0x0040($sp) -/* 00178 80ACA098 8FA60044 */ lw $a2, 0x0044($sp) -/* 0017C 80ACA09C 8FA70040 */ lw $a3, 0x0040($sp) -/* 00180 80ACA0A0 10C00010 */ beq $a2, $zero, .L80ACA0E4 -/* 00184 80ACA0A4 28E10020 */ slti $at, $a3, 0x0020 -/* 00188 80ACA0A8 5020000F */ beql $at, $zero, .L80ACA0E8 + +/* 00174 80ACA094 AFA70040 */ sw $a3, 0x0040($sp) +/* 00178 80ACA098 8FA60044 */ lw $a2, 0x0044($sp) +/* 0017C 80ACA09C 8FA70040 */ lw $a3, 0x0040($sp) +/* 00180 80ACA0A0 10C00010 */ beq $a2, $zero, .L80ACA0E4 +/* 00184 80ACA0A4 28E10020 */ slti $at, $a3, 0x0020 +/* 00188 80ACA0A8 5020000F */ beql $at, $zero, .L80ACA0E8 /* 0018C 80ACA0AC 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 -/* 00190 80ACA0B0 8FA40054 */ lw $a0, 0x0054($sp) +/* 00190 80ACA0B0 8FA40054 */ lw $a0, 0x0054($sp) /* 00194 80ACA0B4 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 /* 00198 80ACA0B8 0C00B2D0 */ jal Flags_GetSwitch - -/* 0019C 80ACA0BC AFA60044 */ sw $a2, 0x0044($sp) -/* 001A0 80ACA0C0 10400008 */ beq $v0, $zero, .L80ACA0E4 -/* 001A4 80ACA0C4 8FA60044 */ lw $a2, 0x0044($sp) + +/* 0019C 80ACA0BC AFA60044 */ sw $a2, 0x0044($sp) +/* 001A0 80ACA0C0 10400008 */ beq $v0, $zero, .L80ACA0E4 +/* 001A4 80ACA0C4 8FA60044 */ lw $a2, 0x0044($sp) /* 001A8 80ACA0C8 3C0480AD */ lui $a0, %hi(D_80ACD67C) ## $a0 = 80AD0000 /* 001AC 80ACA0CC 0C00084C */ jal osSyncPrintf - + /* 001B0 80ACA0D0 2484D67C */ addiu $a0, $a0, %lo(D_80ACD67C) ## $a0 = 80ACD67C /* 001B4 80ACA0D4 0C00B55C */ jal Actor_Kill - + /* 001B8 80ACA0D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001BC 80ACA0DC 100000A8 */ beq $zero, $zero, .L80ACA380 -/* 001C0 80ACA0E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 001BC 80ACA0DC 100000A8 */ beq $zero, $zero, .L80ACA380 +/* 001C0 80ACA0E0 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA0E4: /* 001C4 80ACA0E4 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 .L80ACA0E8: -/* 001C8 80ACA0E8 2CC1000D */ sltiu $at, $a2, 0x000D +/* 001C8 80ACA0E8 2CC1000D */ sltiu $at, $a2, 0x000D /* 001CC 80ACA0EC A60003EE */ sh $zero, 0x03EE($s0) ## 000003EE -/* 001D0 80ACA0F0 1020008C */ beq $at, $zero, .L80ACA324 +/* 001D0 80ACA0F0 1020008C */ beq $at, $zero, .L80ACA324 /* 001D4 80ACA0F4 A60D0400 */ sh $t5, 0x0400($s0) ## 00000400 -/* 001D8 80ACA0F8 00067080 */ sll $t6, $a2, 2 +/* 001D8 80ACA0F8 00067080 */ sll $t6, $a2, 2 /* 001DC 80ACA0FC 3C0180AD */ lui $at, %hi(jtbl_80ACD7FC) ## $at = 80AD0000 -/* 001E0 80ACA100 002E0821 */ addu $at, $at, $t6 -/* 001E4 80ACA104 8C2ED7FC */ lw $t6, %lo(jtbl_80ACD7FC)($at) -/* 001E8 80ACA108 01C00008 */ jr $t6 +/* 001E0 80ACA100 002E0821 */ addu $at, $at, $t6 +/* 001E4 80ACA104 8C2ED7FC */ lw $t6, %lo(jtbl_80ACD7FC)($at) +/* 001E8 80ACA108 01C00008 */ jr $t6 /* 001EC 80ACA10C 00000000 */ nop glabel L80ACA110 /* 001F0 80ACA110 3C01457A */ lui $at, 0x457A ## $at = 457A0000 -/* 001F4 80ACA114 8FAF0038 */ lw $t7, 0x0038($sp) +/* 001F4 80ACA114 8FAF0038 */ lw $t7, 0x0038($sp) /* 001F8 80ACA118 44815000 */ mtc1 $at, $f10 ## $f10 = 4000.00 /* 001FC 80ACA11C A200040A */ sb $zero, 0x040A($s0) ## 0000040A /* 00200 80ACA120 AE0F040C */ sw $t7, 0x040C($s0) ## 0000040C -/* 00204 80ACA124 10000095 */ beq $zero, $zero, .L80ACA37C +/* 00204 80ACA124 10000095 */ beq $zero, $zero, .L80ACA37C /* 00208 80ACA128 E60A00F4 */ swc1 $f10, 0x00F4($s0) ## 000000F4 glabel L80ACA12C /* 0020C 80ACA12C 3C1880AD */ lui $t8, %hi(func_80ACA928) ## $t8 = 80AD0000 /* 00210 80ACA130 2718A928 */ addiu $t8, $t8, %lo(func_80ACA928) ## $t8 = 80ACA928 -/* 00214 80ACA134 10000091 */ beq $zero, $zero, .L80ACA37C +/* 00214 80ACA134 10000091 */ beq $zero, $zero, .L80ACA37C /* 00218 80ACA138 AE18040C */ sw $t8, 0x040C($s0) ## 0000040C glabel L80ACA13C /* 0021C 80ACA13C 961903FC */ lhu $t9, 0x03FC($s0) ## 000003FC @@ -155,7 +155,7 @@ glabel L80ACA13C /* 0022C 80ACA14C 37280002 */ ori $t0, $t9, 0x0002 ## $t0 = 00000002 /* 00230 80ACA150 A60803FC */ sh $t0, 0x03FC($s0) ## 000003FC /* 00234 80ACA154 A60903EE */ sh $t1, 0x03EE($s0) ## 000003EE -/* 00238 80ACA158 10000088 */ beq $zero, $zero, .L80ACA37C +/* 00238 80ACA158 10000088 */ beq $zero, $zero, .L80ACA37C /* 0023C 80ACA15C AE0A040C */ sw $t2, 0x040C($s0) ## 0000040C glabel L80ACA160 /* 00240 80ACA160 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -164,18 +164,18 @@ glabel L80ACA160 /* 0024C 80ACA16C 3C0D80AD */ lui $t5, %hi(func_80ACACD8) ## $t5 = 80AD0000 /* 00250 80ACA170 3C0480AD */ lui $a0, %hi(D_80ACD694) ## $a0 = 80AD0000 /* 00254 80ACA174 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 00258 80ACA178 11800007 */ beq $t4, $zero, .L80ACA198 +/* 00258 80ACA178 11800007 */ beq $t4, $zero, .L80ACA198 /* 0025C 80ACA17C 25ADACD8 */ addiu $t5, $t5, %lo(func_80ACACD8) ## $t5 = 80ACACD8 /* 00260 80ACA180 0C00084C */ jal osSyncPrintf - + /* 00264 80ACA184 2484D694 */ addiu $a0, $a0, %lo(D_80ACD694) ## $a0 = 80ACD694 /* 00268 80ACA188 0C00B55C */ jal Actor_Kill - + /* 0026C 80ACA18C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00270 80ACA190 1000007B */ beq $zero, $zero, .L80ACA380 -/* 00274 80ACA194 8FBF002C */ lw $ra, 0x002C($sp) +/* 00270 80ACA190 1000007B */ beq $zero, $zero, .L80ACA380 +/* 00274 80ACA194 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA198: -/* 00278 80ACA198 10000078 */ beq $zero, $zero, .L80ACA37C +/* 00278 80ACA198 10000078 */ beq $zero, $zero, .L80ACA37C /* 0027C 80ACA19C AE0D040C */ sw $t5, 0x040C($s0) ## 0000040C glabel L80ACA1A0 /* 00280 80ACA1A0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -184,23 +184,23 @@ glabel L80ACA1A0 /* 0028C 80ACA1AC 3C1880AD */ lui $t8, %hi(func_80ACAE5C) ## $t8 = 80AD0000 /* 00290 80ACA1B0 3C0480AD */ lui $a0, %hi(D_80ACD6A4) ## $a0 = 80AD0000 /* 00294 80ACA1B4 31CF0008 */ andi $t7, $t6, 0x0008 ## $t7 = 00000000 -/* 00298 80ACA1B8 11E00007 */ beq $t7, $zero, .L80ACA1D8 +/* 00298 80ACA1B8 11E00007 */ beq $t7, $zero, .L80ACA1D8 /* 0029C 80ACA1BC 2718AE5C */ addiu $t8, $t8, %lo(func_80ACAE5C) ## $t8 = 80ACAE5C /* 002A0 80ACA1C0 0C00084C */ jal osSyncPrintf - + /* 002A4 80ACA1C4 2484D6A4 */ addiu $a0, $a0, %lo(D_80ACD6A4) ## $a0 = 80ACD6A4 /* 002A8 80ACA1C8 0C00B55C */ jal Actor_Kill - + /* 002AC 80ACA1CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002B0 80ACA1D0 1000006B */ beq $zero, $zero, .L80ACA380 -/* 002B4 80ACA1D4 8FBF002C */ lw $ra, 0x002C($sp) +/* 002B0 80ACA1D0 1000006B */ beq $zero, $zero, .L80ACA380 +/* 002B4 80ACA1D4 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA1D8: -/* 002B8 80ACA1D8 10000068 */ beq $zero, $zero, .L80ACA37C +/* 002B8 80ACA1D8 10000068 */ beq $zero, $zero, .L80ACA37C /* 002BC 80ACA1DC AE18040C */ sw $t8, 0x040C($s0) ## 0000040C glabel L80ACA1E0 /* 002C0 80ACA1E0 3C1980AD */ lui $t9, %hi(func_80ACAFE0) ## $t9 = 80AD0000 /* 002C4 80ACA1E4 2739AFE0 */ addiu $t9, $t9, %lo(func_80ACAFE0) ## $t9 = 80ACAFE0 -/* 002C8 80ACA1E8 10000064 */ beq $zero, $zero, .L80ACA37C +/* 002C8 80ACA1E8 10000064 */ beq $zero, $zero, .L80ACA37C /* 002CC 80ACA1EC AE19040C */ sw $t9, 0x040C($s0) ## 0000040C glabel L80ACA1F0 /* 002D0 80ACA1F0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -208,50 +208,50 @@ glabel L80ACA1F0 /* 002D8 80ACA1F8 94480EDA */ lhu $t0, 0x0EDA($v0) ## 8015F53A /* 002DC 80ACA1FC 3C0480AD */ lui $a0, %hi(D_80ACD6B4) ## $a0 = 80AD0000 /* 002E0 80ACA200 31090200 */ andi $t1, $t0, 0x0200 ## $t1 = 00000000 -/* 002E4 80ACA204 15200007 */ bne $t1, $zero, .L80ACA224 +/* 002E4 80ACA204 15200007 */ bne $t1, $zero, .L80ACA224 /* 002E8 80ACA208 00000000 */ nop /* 002EC 80ACA20C 944A0EDC */ lhu $t2, 0x0EDC($v0) ## 8015F53C /* 002F0 80ACA210 3C0C80AD */ lui $t4, %hi(func_80ACB0B0) ## $t4 = 80AD0000 /* 002F4 80ACA214 258CB0B0 */ addiu $t4, $t4, %lo(func_80ACB0B0) ## $t4 = 80ACB0B0 /* 002F8 80ACA218 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 002FC 80ACA21C 15600007 */ bne $t3, $zero, .L80ACA23C +/* 002FC 80ACA21C 15600007 */ bne $t3, $zero, .L80ACA23C /* 00300 80ACA220 00000000 */ nop .L80ACA224: /* 00304 80ACA224 0C00084C */ jal osSyncPrintf - + /* 00308 80ACA228 2484D6B4 */ addiu $a0, $a0, %lo(D_80ACD6B4) ## $a0 = 80ACD6B4 /* 0030C 80ACA22C 0C00B55C */ jal Actor_Kill - + /* 00310 80ACA230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00314 80ACA234 10000052 */ beq $zero, $zero, .L80ACA380 -/* 00318 80ACA238 8FBF002C */ lw $ra, 0x002C($sp) +/* 00314 80ACA234 10000052 */ beq $zero, $zero, .L80ACA380 +/* 00318 80ACA238 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA23C: -/* 0031C 80ACA23C 1000004F */ beq $zero, $zero, .L80ACA37C +/* 0031C 80ACA23C 1000004F */ beq $zero, $zero, .L80ACA37C /* 00320 80ACA240 AE0C040C */ sw $t4, 0x040C($s0) ## 0000040C glabel L80ACA244 /* 00324 80ACA244 3C0D80AD */ lui $t5, %hi(func_80ACB1A0) ## $t5 = 80AD0000 /* 00328 80ACA248 25ADB1A0 */ addiu $t5, $t5, %lo(func_80ACB1A0) ## $t5 = 80ACB1A0 /* 0032C 80ACA24C AE0D040C */ sw $t5, 0x040C($s0) ## 0000040C -/* 00330 80ACA250 8FA40054 */ lw $a0, 0x0054($sp) +/* 00330 80ACA250 8FA40054 */ lw $a0, 0x0054($sp) /* 00334 80ACA254 0C00B2ED */ jal Flags_UnsetSwitch - + /* 00338 80ACA258 24050023 */ addiu $a1, $zero, 0x0023 ## $a1 = 00000023 -/* 0033C 80ACA25C 10000048 */ beq $zero, $zero, .L80ACA380 -/* 00340 80ACA260 8FBF002C */ lw $ra, 0x002C($sp) +/* 0033C 80ACA25C 10000048 */ beq $zero, $zero, .L80ACA380 +/* 00340 80ACA260 8FBF002C */ lw $ra, 0x002C($sp) glabel L80ACA264 /* 00344 80ACA264 3C0E80AD */ lui $t6, %hi(func_80ACB2B4) ## $t6 = 80AD0000 /* 00348 80ACA268 25CEB2B4 */ addiu $t6, $t6, %lo(func_80ACB2B4) ## $t6 = 80ACB2B4 -/* 0034C 80ACA26C 10000043 */ beq $zero, $zero, .L80ACA37C +/* 0034C 80ACA26C 10000043 */ beq $zero, $zero, .L80ACA37C /* 00350 80ACA270 AE0E040C */ sw $t6, 0x040C($s0) ## 0000040C glabel L80ACA274 /* 00354 80ACA274 3C0F80AD */ lui $t7, %hi(func_80ACB2B4) ## $t7 = 80AD0000 /* 00358 80ACA278 25EFB2B4 */ addiu $t7, $t7, %lo(func_80ACB2B4) ## $t7 = 80ACB2B4 -/* 0035C 80ACA27C 1000003F */ beq $zero, $zero, .L80ACA37C +/* 0035C 80ACA27C 1000003F */ beq $zero, $zero, .L80ACA37C /* 00360 80ACA280 AE0F040C */ sw $t7, 0x040C($s0) ## 0000040C glabel L80ACA284 /* 00364 80ACA284 3C1880AD */ lui $t8, %hi(func_80ACB3E0) ## $t8 = 80AD0000 /* 00368 80ACA288 2718B3E0 */ addiu $t8, $t8, %lo(func_80ACB3E0) ## $t8 = 80ACB3E0 -/* 0036C 80ACA28C 1000003B */ beq $zero, $zero, .L80ACA37C +/* 0036C 80ACA28C 1000003B */ beq $zero, $zero, .L80ACA37C /* 00370 80ACA290 AE18040C */ sw $t8, 0x040C($s0) ## 0000040C glabel L80ACA294 /* 00374 80ACA294 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -261,19 +261,19 @@ glabel L80ACA294 /* 00384 80ACA2A4 8C4800A4 */ lw $t0, 0x00A4($v0) ## 8015E704 /* 00388 80ACA2A8 3C0A80AD */ lui $t2, %hi(func_80ACB568) ## $t2 = 80AD0000 /* 0038C 80ACA2AC 3C0480AD */ lui $a0, %hi(D_80ACD6C4) ## $a0 = 80AD0000 -/* 00390 80ACA2B0 03284824 */ and $t1, $t9, $t0 -/* 00394 80ACA2B4 15200007 */ bne $t1, $zero, .L80ACA2D4 +/* 00390 80ACA2B0 03284824 */ and $t1, $t9, $t0 +/* 00394 80ACA2B4 15200007 */ bne $t1, $zero, .L80ACA2D4 /* 00398 80ACA2B8 254AB568 */ addiu $t2, $t2, %lo(func_80ACB568) ## $t2 = 80ACB568 /* 0039C 80ACA2BC 0C00084C */ jal osSyncPrintf - + /* 003A0 80ACA2C0 2484D6C4 */ addiu $a0, $a0, %lo(D_80ACD6C4) ## $a0 = 80ACD6C4 /* 003A4 80ACA2C4 0C00B55C */ jal Actor_Kill - + /* 003A8 80ACA2C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003AC 80ACA2CC 1000002C */ beq $zero, $zero, .L80ACA380 -/* 003B0 80ACA2D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 003AC 80ACA2CC 1000002C */ beq $zero, $zero, .L80ACA380 +/* 003B0 80ACA2D0 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA2D4: -/* 003B4 80ACA2D4 10000029 */ beq $zero, $zero, .L80ACA37C +/* 003B4 80ACA2D4 10000029 */ beq $zero, $zero, .L80ACA37C /* 003B8 80ACA2D8 AE0A040C */ sw $t2, 0x040C($s0) ## 0000040C glabel L80ACA2DC /* 003BC 80ACA2DC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -283,38 +283,38 @@ glabel L80ACA2DC /* 003CC 80ACA2EC 8C4C00A4 */ lw $t4, 0x00A4($v0) ## 8015E704 /* 003D0 80ACA2F0 3C0E80AD */ lui $t6, %hi(func_80ACB6EC) ## $t6 = 80AD0000 /* 003D4 80ACA2F4 3C0480AD */ lui $a0, %hi(D_80ACD6D4) ## $a0 = 80AD0000 -/* 003D8 80ACA2F8 016C6824 */ and $t5, $t3, $t4 -/* 003DC 80ACA2FC 15A00007 */ bne $t5, $zero, .L80ACA31C +/* 003D8 80ACA2F8 016C6824 */ and $t5, $t3, $t4 +/* 003DC 80ACA2FC 15A00007 */ bne $t5, $zero, .L80ACA31C /* 003E0 80ACA300 25CEB6EC */ addiu $t6, $t6, %lo(func_80ACB6EC) ## $t6 = 80ACB6EC /* 003E4 80ACA304 0C00084C */ jal osSyncPrintf - + /* 003E8 80ACA308 2484D6D4 */ addiu $a0, $a0, %lo(D_80ACD6D4) ## $a0 = 80ACD6D4 /* 003EC 80ACA30C 0C00B55C */ jal Actor_Kill - + /* 003F0 80ACA310 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003F4 80ACA314 1000001A */ beq $zero, $zero, .L80ACA380 -/* 003F8 80ACA318 8FBF002C */ lw $ra, 0x002C($sp) +/* 003F4 80ACA314 1000001A */ beq $zero, $zero, .L80ACA380 +/* 003F8 80ACA318 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA31C: -/* 003FC 80ACA31C 10000017 */ beq $zero, $zero, .L80ACA37C +/* 003FC 80ACA31C 10000017 */ beq $zero, $zero, .L80ACA37C /* 00400 80ACA320 AE0E040C */ sw $t6, 0x040C($s0) ## 0000040C .L80ACA324: /* 00404 80ACA324 3C0480AD */ lui $a0, %hi(D_80ACD6E4) ## $a0 = 80AD0000 /* 00408 80ACA328 2484D6E4 */ addiu $a0, $a0, %lo(D_80ACD6E4) ## $a0 = 80ACD6E4 /* 0040C 80ACA32C 0C00084C */ jal osSyncPrintf - -/* 00410 80ACA330 AFA60044 */ sw $a2, 0x0044($sp) + +/* 00410 80ACA330 AFA60044 */ sw $a2, 0x0044($sp) /* 00414 80ACA334 3C0480AD */ lui $a0, %hi(D_80ACD6EC) ## $a0 = 80AD0000 -/* 00418 80ACA338 8FA50044 */ lw $a1, 0x0044($sp) +/* 00418 80ACA338 8FA50044 */ lw $a1, 0x0044($sp) /* 0041C 80ACA33C 0C00084C */ jal osSyncPrintf - + /* 00420 80ACA340 2484D6EC */ addiu $a0, $a0, %lo(D_80ACD6EC) ## $a0 = 80ACD6EC /* 00424 80ACA344 3C0480AD */ lui $a0, %hi(D_80ACD6F8) ## $a0 = 80AD0000 /* 00428 80ACA348 0C00084C */ jal osSyncPrintf - + /* 0042C 80ACA34C 2484D6F8 */ addiu $a0, $a0, %lo(D_80ACD6F8) ## $a0 = 80ACD6F8 /* 00430 80ACA350 3C0480AD */ lui $a0, %hi(D_80ACD72C) ## $a0 = 80AD0000 /* 00434 80ACA354 0C00084C */ jal osSyncPrintf - + /* 00438 80ACA358 2484D72C */ addiu $a0, $a0, %lo(D_80ACD72C) ## $a0 = 80ACD72C /* 0043C 80ACA35C 960F03FC */ lhu $t7, 0x03FC($s0) ## 000003FC /* 00440 80ACA360 3C0880AD */ lui $t0, %hi(func_80ACA928) ## $t0 = 80AD0000 @@ -325,11 +325,11 @@ glabel L80ACA2DC /* 00454 80ACA374 A61903EE */ sh $t9, 0x03EE($s0) ## 000003EE /* 00458 80ACA378 AE08040C */ sw $t0, 0x040C($s0) ## 0000040C .L80ACA37C: -/* 0045C 80ACA37C 8FBF002C */ lw $ra, 0x002C($sp) +/* 0045C 80ACA37C 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA380: -/* 00460 80ACA380 8FB00028 */ lw $s0, 0x0028($sp) +/* 00460 80ACA380 8FB00028 */ lw $s0, 0x0028($sp) /* 00464 80ACA384 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00468 80ACA388 03E00008 */ jr $ra +/* 00468 80ACA388 03E00008 */ jr $ra /* 0046C 80ACA38C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s index e437176023..563905e637 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s @@ -1,21 +1,21 @@ glabel func_80ACFEB0 /* 00A10 80ACFEB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A14 80ACFEB4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00A14 80ACFEB4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00A18 80ACFEB8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00A1C 80ACFEBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A20 80ACFEC0 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 -/* 00A24 80ACFEC4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00A28 80ACFEC8 0C0294BE */ jal func_800A52F8 +/* 00A24 80ACFEC4 AFA60018 */ sw $a2, 0x0018($sp) +/* 00A28 80ACFEC8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00A2C 80ACFECC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A30 80ACFED0 8FA40018 */ lw $a0, 0x0018($sp) +/* 00A30 80ACFED0 8FA40018 */ lw $a0, 0x0018($sp) /* 00A34 80ACFED4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00A38 80ACFED8 3C0580AD */ lui $a1, %hi(func_80ACFEF8) ## $a1 = 80AD0000 /* 00A3C 80ACFEDC 24A5FEF8 */ addiu $a1, $a1, %lo(func_80ACFEF8) ## $a1 = 80ACFEF8 -/* 00A40 80ACFEE0 0C2B3D28 */ jal func_80ACF4A0 +/* 00A40 80ACFEE0 0C2B3D28 */ jal func_80ACF4A0 /* 00A44 80ACFEE4 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 00A48 80ACFEE8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00A48 80ACFEE8 8FBF0014 */ lw $ra, 0x0014($sp) /* 00A4C 80ACFEEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A50 80ACFEF0 03E00008 */ jr $ra +/* 00A50 80ACFEF0 03E00008 */ jr $ra /* 00A54 80ACFEF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s index a3ee9c0692..75d4b68dca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s @@ -1,23 +1,23 @@ glabel func_80AD0558 /* 010B8 80AD0558 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010BC 80AD055C AFBF0014 */ sw $ra, 0x0014($sp) +/* 010BC 80AD055C AFBF0014 */ sw $ra, 0x0014($sp) /* 010C0 80AD0560 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 010C4 80AD0564 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 010C8 80AD0568 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 -/* 010CC 80AD056C AFA60018 */ sw $a2, 0x0018($sp) -/* 010D0 80AD0570 0C0294BE */ jal func_800A52F8 +/* 010CC 80AD056C AFA60018 */ sw $a2, 0x0018($sp) +/* 010D0 80AD0570 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 010D4 80AD0574 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010D8 80AD0578 8FA40018 */ lw $a0, 0x0018($sp) +/* 010D8 80AD0578 8FA40018 */ lw $a0, 0x0018($sp) /* 010DC 80AD057C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 010E0 80AD0580 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E /* 010E4 80AD0584 3C0580AD */ lui $a1, %hi(func_80AD05A8) ## $a1 = 80AD0000 /* 010E8 80AD0588 24A505A8 */ addiu $a1, $a1, %lo(func_80AD05A8) ## $a1 = 80AD05A8 /* 010EC 80AD058C AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 010F0 80AD0590 0C2B3D28 */ jal func_80ACF4A0 +/* 010F0 80AD0590 0C2B3D28 */ jal func_80ACF4A0 /* 010F4 80AD0594 E48402E0 */ swc1 $f4, 0x02E0($a0) ## 000002E0 -/* 010F8 80AD0598 8FBF0014 */ lw $ra, 0x0014($sp) +/* 010F8 80AD0598 8FBF0014 */ lw $ra, 0x0014($sp) /* 010FC 80AD059C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01100 80AD05A0 03E00008 */ jr $ra +/* 01100 80AD05A0 03E00008 */ jr $ra /* 01104 80AD05A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s index c5888ec0ed..f203bf00d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s @@ -1,22 +1,22 @@ glabel func_80AD0720 /* 01280 80AD0720 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01284 80AD0724 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01284 80AD0724 AFBF0014 */ sw $ra, 0x0014($sp) /* 01288 80AD0728 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0128C 80AD072C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01290 80AD0730 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 -/* 01294 80AD0734 AFA60018 */ sw $a2, 0x0018($sp) -/* 01298 80AD0738 0C0294BE */ jal func_800A52F8 +/* 01294 80AD0734 AFA60018 */ sw $a2, 0x0018($sp) +/* 01298 80AD0738 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 0129C 80AD073C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 012A0 80AD0740 8FA40018 */ lw $a0, 0x0018($sp) +/* 012A0 80AD0740 8FA40018 */ lw $a0, 0x0018($sp) /* 012A4 80AD0744 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E /* 012A8 80AD0748 3C0580AD */ lui $a1, %hi(func_80AD076C) ## $a1 = 80AD0000 /* 012AC 80AD074C 24A5076C */ addiu $a1, $a1, %lo(func_80AD076C) ## $a1 = 80AD076C /* 012B0 80AD0750 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 012B4 80AD0754 0C2B3D28 */ jal func_80ACF4A0 +/* 012B4 80AD0754 0C2B3D28 */ jal func_80ACF4A0 /* 012B8 80AD0758 AC8002D4 */ sw $zero, 0x02D4($a0) ## 000002D4 -/* 012BC 80AD075C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 012BC 80AD075C 8FBF0014 */ lw $ra, 0x0014($sp) /* 012C0 80AD0760 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012C4 80AD0764 03E00008 */ jr $ra +/* 012C4 80AD0764 03E00008 */ jr $ra /* 012C8 80AD0768 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s index 8ebcb18546..914f05ae42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s @@ -1,11 +1,11 @@ glabel func_80AD0F38 /* 01A98 80AD0F38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01A9C 80AD0F3C AFB00018 */ sw $s0, 0x0018($sp) +/* 01A9C 80AD0F3C AFB00018 */ sw $s0, 0x0018($sp) /* 01AA0 80AD0F40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01AA4 80AD0F44 AFBF001C */ sw $ra, 0x001C($sp) +/* 01AA4 80AD0F44 AFBF001C */ sw $ra, 0x001C($sp) /* 01AA8 80AD0F48 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01AAC 80AD0F4C 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 -/* 01AB0 80AD0F50 0C0294BE */ jal func_800A52F8 +/* 01AB0 80AD0F50 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 01AB4 80AD0F54 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01AB8 80AD0F58 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -14,8 +14,8 @@ glabel func_80AD0F38 /* 01AC4 80AD0F64 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 01AC8 80AD0F68 3C014020 */ lui $at, 0x4020 ## $at = 40200000 /* 01ACC 80AD0F6C 44814000 */ mtc1 $at, $f8 ## $f8 = 2.50 -/* 01AD0 80AD0F70 46040182 */ mul.s $f6, $f0, $f4 -/* 01AD4 80AD0F74 46083280 */ add.s $f10, $f6, $f8 +/* 01AD0 80AD0F70 46040182 */ mul.s $f6, $f0, $f4 +/* 01AD4 80AD0F74 46083280 */ add.s $f10, $f6, $f8 /* 01AD8 80AD0F78 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 01ADC 80AD0F7C E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 @@ -23,19 +23,19 @@ glabel func_80AD0F38 /* 01AE4 80AD0F84 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 /* 01AE8 80AD0F88 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F /* 01AEC 80AD0F8C 3C0580AD */ lui $a1, %hi(func_80AD0FC8) ## $a1 = 80AD0000 -/* 01AF0 80AD0F90 46020402 */ mul.s $f16, $f0, $f2 +/* 01AF0 80AD0F90 46020402 */ mul.s $f16, $f0, $f2 /* 01AF4 80AD0F94 AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 /* 01AF8 80AD0F98 24A50FC8 */ addiu $a1, $a1, %lo(func_80AD0FC8) ## $a1 = 80AD0FC8 /* 01AFC 80AD0F9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B00 80AD0FA0 46028480 */ add.s $f18, $f16, $f2 -/* 01B04 80AD0FA4 4600910D */ trunc.w.s $f4, $f18 -/* 01B08 80AD0FA8 440F2000 */ mfc1 $t7, $f4 -/* 01B0C 80AD0FAC 0C2B3D28 */ jal func_80ACF4A0 +/* 01B00 80AD0FA0 46028480 */ add.s $f18, $f16, $f2 +/* 01B04 80AD0FA4 4600910D */ trunc.w.s $f4, $f18 +/* 01B08 80AD0FA8 440F2000 */ mfc1 $t7, $f4 +/* 01B0C 80AD0FAC 0C2B3D28 */ jal func_80ACF4A0 /* 01B10 80AD0FB0 AE0F02D4 */ sw $t7, 0x02D4($s0) ## 000002D4 -/* 01B14 80AD0FB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01B18 80AD0FB8 8FB00018 */ lw $s0, 0x0018($sp) +/* 01B14 80AD0FB4 8FBF001C */ lw $ra, 0x001C($sp) +/* 01B18 80AD0FB8 8FB00018 */ lw $s0, 0x0018($sp) /* 01B1C 80AD0FBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01B20 80AD0FC0 03E00008 */ jr $ra +/* 01B20 80AD0FC0 03E00008 */ jr $ra /* 01B24 80AD0FC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s index 9b8ac6be2b..2ff10dfba6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s @@ -1,13 +1,13 @@ glabel func_80AD1AA8 /* 02608 80AD1AA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0260C 80AD1AAC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0260C 80AD1AAC AFBF0014 */ sw $ra, 0x0014($sp) /* 02610 80AD1AB0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 02614 80AD1AB4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02618 80AD1AB8 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 -/* 0261C 80AD1ABC AFA60018 */ sw $a2, 0x0018($sp) -/* 02620 80AD1AC0 0C0294BE */ jal func_800A52F8 +/* 0261C 80AD1ABC AFA60018 */ sw $a2, 0x0018($sp) +/* 02620 80AD1AC0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 02624 80AD1AC4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02628 80AD1AC8 8FA40018 */ lw $a0, 0x0018($sp) +/* 02628 80AD1AC8 8FA40018 */ lw $a0, 0x0018($sp) /* 0262C 80AD1ACC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 02630 80AD1AD0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 02634 80AD1AD4 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 @@ -15,11 +15,11 @@ glabel func_80AD1AA8 /* 0263C 80AD1ADC 24A51B00 */ addiu $a1, $a1, %lo(func_80AD1B00) ## $a1 = 80AD1B00 /* 02640 80AD1AE0 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 /* 02644 80AD1AE4 A48F02FC */ sh $t7, 0x02FC($a0) ## 000002FC -/* 02648 80AD1AE8 0C2B3D28 */ jal func_80ACF4A0 +/* 02648 80AD1AE8 0C2B3D28 */ jal func_80ACF4A0 /* 0264C 80AD1AEC E48402E0 */ swc1 $f4, 0x02E0($a0) ## 000002E0 -/* 02650 80AD1AF0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02650 80AD1AF0 8FBF0014 */ lw $ra, 0x0014($sp) /* 02654 80AD1AF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02658 80AD1AF8 03E00008 */ jr $ra +/* 02658 80AD1AF8 03E00008 */ jr $ra /* 0265C 80AD1AFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s index b7a61a6614..ebe54a27a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s @@ -1,19 +1,19 @@ glabel EnPoDesert_Draw /* 00B44 80AD37F4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00B48 80AD37F8 AFB20030 */ sw $s2, 0x0030($sp) +/* 00B48 80AD37F8 AFB20030 */ sw $s2, 0x0030($sp) /* 00B4C 80AD37FC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00B50 80AD3800 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00B54 80AD3804 AFB1002C */ sw $s1, 0x002C($sp) -/* 00B58 80AD3808 AFB00028 */ sw $s0, 0x0028($sp) +/* 00B50 80AD3800 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00B54 80AD3804 AFB1002C */ sw $s1, 0x002C($sp) +/* 00B58 80AD3808 AFB00028 */ sw $s0, 0x0028($sp) /* 00B5C 80AD380C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00B60 80AD3810 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 00B64 80AD3814 3C0680AD */ lui $a2, %hi(D_80AD3A04) ## $a2 = 80AD0000 /* 00B68 80AD3818 24C63A04 */ addiu $a2, $a2, %lo(D_80AD3A04) ## $a2 = 80AD3A04 /* 00B6C 80AD381C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 00B70 80AD3820 2407022F */ addiu $a3, $zero, 0x022F ## $a3 = 0000022F -/* 00B74 80AD3824 0C031AB1 */ jal func_800C6AC4 +/* 00B74 80AD3824 0C031AB1 */ jal func_800C6AC4 /* 00B78 80AD3828 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00B7C 80AD382C 0C024F61 */ jal func_80093D84 +/* 00B7C 80AD382C 0C024F61 */ jal func_80093D84 /* 00B80 80AD3830 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 00B84 80AD3834 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00B88 80AD3838 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -23,13 +23,13 @@ glabel EnPoDesert_Draw /* 00B98 80AD3848 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 00B9C 80AD384C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 00BA0 80AD3850 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00BA4 80AD3854 AFB80010 */ sw $t8, 0x0010($sp) +/* 00BA4 80AD3854 AFB80010 */ sw $t8, 0x0010($sp) /* 00BA8 80AD3858 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 00BAC 80AD385C 24060055 */ addiu $a2, $zero, 0x0055 ## $a2 = 00000055 /* 00BB0 80AD3860 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00BB4 80AD3864 0C025474 */ jal func_800951D0 -/* 00BB8 80AD3868 AFA2004C */ sw $v0, 0x004C($sp) -/* 00BBC 80AD386C 8FA3004C */ lw $v1, 0x004C($sp) +/* 00BB4 80AD3864 0C025474 */ jal func_800951D0 +/* 00BB8 80AD3868 AFA2004C */ sw $v0, 0x004C($sp) +/* 00BBC 80AD386C 8FA3004C */ lw $v1, 0x004C($sp) /* 00BC0 80AD3870 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 /* 00BC4 80AD3874 35080020 */ ori $t0, $t0, 0x0020 ## $t0 = DB060020 /* 00BC8 80AD3878 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -42,17 +42,17 @@ glabel EnPoDesert_Draw /* 00BE4 80AD3894 92260221 */ lbu $a2, 0x0221($s1) ## 00000221 /* 00BE8 80AD3898 92250220 */ lbu $a1, 0x0220($s1) ## 00000220 /* 00BEC 80AD389C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 00BF0 80AD38A0 AFA20048 */ sw $v0, 0x0048($sp) -/* 00BF4 80AD38A4 0C025474 */ jal func_800951D0 -/* 00BF8 80AD38A8 AFA90010 */ sw $t1, 0x0010($sp) -/* 00BFC 80AD38AC 8FA30048 */ lw $v1, 0x0048($sp) +/* 00BF0 80AD38A0 AFA20048 */ sw $v0, 0x0048($sp) +/* 00BF4 80AD38A4 0C025474 */ jal func_800951D0 +/* 00BF8 80AD38A8 AFA90010 */ sw $t1, 0x0010($sp) +/* 00BFC 80AD38AC 8FA30048 */ lw $v1, 0x0048($sp) /* 00C00 80AD38B0 3C0A80AD */ lui $t2, %hi(func_80AD3328) ## $t2 = 80AD0000 /* 00C04 80AD38B4 254A3328 */ addiu $t2, $t2, %lo(func_80AD3328) ## $t2 = 80AD3328 /* 00C08 80AD38B8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00C0C 80AD38BC 8E2B0190 */ lw $t3, 0x0190($s1) ## 00000190 /* 00C10 80AD38C0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00C14 80AD38C4 3C0780AD */ lui $a3, %hi(func_80AD3504) ## $a3 = 80AD0000 -/* 00C18 80AD38C8 154B000B */ bne $t2, $t3, .L80AD38F8 +/* 00C18 80AD38C8 154B000B */ bne $t2, $t3, .L80AD38F8 /* 00C1C 80AD38CC 3C0880AD */ lui $t0, %hi(func_80AD3594) ## $t0 = 80AD0000 /* 00C20 80AD38D0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00C24 80AD38D4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -62,7 +62,7 @@ glabel EnPoDesert_Draw /* 00C34 80AD38E4 25CE6280 */ addiu $t6, $t6, 0x6280 ## $t6 = 80116280 /* 00C38 80AD38E8 35AD0030 */ ori $t5, $t5, 0x0030 ## $t5 = DB060030 /* 00C3C 80AD38EC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00C40 80AD38F0 1000000A */ beq $zero, $zero, .L80AD391C +/* 00C40 80AD38F0 1000000A */ beq $zero, $zero, .L80AD391C /* 00C44 80AD38F4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 .L80AD38F8: /* 00C48 80AD38F8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -78,24 +78,24 @@ glabel EnPoDesert_Draw /* 00C6C 80AD391C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 00C70 80AD3920 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 00C74 80AD3924 25083594 */ addiu $t0, $t0, %lo(func_80AD3594) ## $t0 = 80AD3594 -/* 00C78 80AD3928 AFA80010 */ sw $t0, 0x0010($sp) -/* 00C7C 80AD392C AFB10014 */ sw $s1, 0x0014($sp) +/* 00C78 80AD3928 AFA80010 */ sw $t0, 0x0010($sp) +/* 00C7C 80AD392C AFB10014 */ sw $s1, 0x0014($sp) /* 00C80 80AD3930 8E0902D0 */ lw $t1, 0x02D0($s0) ## 000002D0 /* 00C84 80AD3934 24E73504 */ addiu $a3, $a3, %lo(func_80AD3504) ## $a3 = 80AD3504 -/* 00C88 80AD3938 0C0288A2 */ jal func_800A2288 -/* 00C8C 80AD393C AFA90018 */ sw $t1, 0x0018($sp) +/* 00C88 80AD3938 0C0288A2 */ jal SkelAnime_Draw2 +/* 00C8C 80AD393C AFA90018 */ sw $t1, 0x0018($sp) /* 00C90 80AD3940 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 00C94 80AD3944 3C0680AD */ lui $a2, %hi(D_80AD3A18) ## $a2 = 80AD0000 /* 00C98 80AD3948 24C63A18 */ addiu $a2, $a2, %lo(D_80AD3A18) ## $a2 = 80AD3A18 /* 00C9C 80AD394C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 00CA0 80AD3950 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 -/* 00CA4 80AD3954 0C031AD5 */ jal func_800C6B54 +/* 00CA4 80AD3954 0C031AD5 */ jal func_800C6B54 /* 00CA8 80AD3958 24070255 */ addiu $a3, $zero, 0x0255 ## $a3 = 00000255 -/* 00CAC 80AD395C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00CB0 80AD3960 8FB00028 */ lw $s0, 0x0028($sp) -/* 00CB4 80AD3964 8FB1002C */ lw $s1, 0x002C($sp) -/* 00CB8 80AD3968 8FB20030 */ lw $s2, 0x0030($sp) -/* 00CBC 80AD396C 03E00008 */ jr $ra +/* 00CAC 80AD395C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00CB0 80AD3960 8FB00028 */ lw $s0, 0x0028($sp) +/* 00CB4 80AD3964 8FB1002C */ lw $s1, 0x002C($sp) +/* 00CB8 80AD3968 8FB20030 */ lw $s2, 0x0030($sp) +/* 00CBC 80AD396C 03E00008 */ jr $ra /* 00CC0 80AD3970 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00CC4 80AD3974 00000000 */ nop /* 00CC8 80AD3978 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s index b28e9db3a1..67ea56f782 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s @@ -1,68 +1,68 @@ glabel func_80AD2E64 /* 001B4 80AD2E64 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001B8 80AD2E68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001BC 80AD2E6C AFA50024 */ sw $a1, 0x0024($sp) +/* 001B8 80AD2E68 AFBF0014 */ sw $ra, 0x0014($sp) +/* 001BC 80AD2E6C AFA50024 */ sw $a1, 0x0024($sp) /* 001C0 80AD2E70 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 /* 001C4 80AD2E74 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 001C8 80AD2E78 01E57821 */ addu $t7, $t7, $a1 +/* 001C8 80AD2E78 01E57821 */ addu $t7, $t7, $a1 /* 001CC 80AD2E7C 8DEF1E08 */ lw $t7, 0x1E08($t7) ## 00011E08 -/* 001D0 80AD2E80 0018C8C0 */ sll $t9, $t8, 3 +/* 001D0 80AD2E80 0018C8C0 */ sll $t9, $t8, 3 /* 001D4 80AD2E84 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 001D8 80AD2E88 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001DC 80AD2E8C 01F94021 */ addu $t0, $t7, $t9 -/* 001E0 80AD2E90 AFA8001C */ sw $t0, 0x001C($sp) +/* 001DC 80AD2E8C 01F94021 */ addu $t0, $t7, $t9 +/* 001E0 80AD2E90 AFA8001C */ sw $t0, 0x001C($sp) /* 001E4 80AD2E94 24A51360 */ addiu $a1, $a1, 0x1360 ## $a1 = 06001360 -/* 001E8 80AD2E98 AFA70020 */ sw $a3, 0x0020($sp) +/* 001E8 80AD2E98 AFA70020 */ sw $a3, 0x0020($sp) /* 001EC 80AD2E9C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001F0 80AD2EA0 0C0294D3 */ jal func_800A534C +/* 001F0 80AD2EA0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 001F4 80AD2EA4 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 001F8 80AD2EA8 8FA9001C */ lw $t1, 0x001C($sp) -/* 001FC 80AD2EAC 8FA40020 */ lw $a0, 0x0020($sp) +/* 001F8 80AD2EA8 8FA9001C */ lw $t1, 0x001C($sp) +/* 001FC 80AD2EAC 8FA40020 */ lw $a0, 0x0020($sp) /* 00200 80AD2EB0 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 00204 80AD2EB4 8D230004 */ lw $v1, 0x0004($t1) ## 00000004 /* 00208 80AD2EB8 8C8F0198 */ lw $t7, 0x0198($a0) ## 00000198 /* 0020C 80AD2EBC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00210 80AD2EC0 00035100 */ sll $t2, $v1, 4 -/* 00214 80AD2EC4 000A5F02 */ srl $t3, $t2, 28 -/* 00218 80AD2EC8 000B6080 */ sll $t4, $t3, 2 -/* 0021C 80AD2ECC 01AC6821 */ addu $t5, $t5, $t4 +/* 00210 80AD2EC0 00035100 */ sll $t2, $v1, 4 +/* 00214 80AD2EC4 000A5F02 */ srl $t3, $t2, 28 +/* 00218 80AD2EC8 000B6080 */ sll $t4, $t3, 2 +/* 0021C 80AD2ECC 01AC6821 */ addu $t5, $t5, $t4 /* 00220 80AD2ED0 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 /* 00224 80AD2ED4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00228 80AD2ED8 000FC880 */ sll $t9, $t7, 2 -/* 0022C 80AD2EDC 00617024 */ and $t6, $v1, $at -/* 00230 80AD2EE0 032FC823 */ subu $t9, $t9, $t7 -/* 00234 80AD2EE4 0019C840 */ sll $t9, $t9, 1 -/* 00238 80AD2EE8 01AEC021 */ addu $t8, $t5, $t6 -/* 0023C 80AD2EEC 03191021 */ addu $v0, $t8, $t9 +/* 00228 80AD2ED8 000FC880 */ sll $t9, $t7, 2 +/* 0022C 80AD2EDC 00617024 */ and $t6, $v1, $at +/* 00230 80AD2EE0 032FC823 */ subu $t9, $t9, $t7 +/* 00234 80AD2EE4 0019C840 */ sll $t9, $t9, 1 +/* 00238 80AD2EE8 01AEC021 */ addu $t8, $t5, $t6 +/* 0023C 80AD2EEC 03191021 */ addu $v0, $t8, $t9 /* 00240 80AD2EF0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00244 80AD2EF4 00411021 */ addu $v0, $v0, $at +/* 00244 80AD2EF4 00411021 */ addu $v0, $v0, $at /* 00248 80AD2EF8 84480000 */ lh $t0, 0x0000($v0) ## 00000000 /* 0024C 80AD2EFC 24850008 */ addiu $a1, $a0, 0x0008 ## $a1 = 00000008 /* 00250 80AD2F00 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 /* 00254 80AD2F04 00000000 */ nop -/* 00258 80AD2F08 468021A0 */ cvt.s.w $f6, $f4 +/* 00258 80AD2F08 468021A0 */ cvt.s.w $f6, $f4 /* 0025C 80AD2F0C E4860008 */ swc1 $f6, 0x0008($a0) ## 00000008 /* 00260 80AD2F10 84490002 */ lh $t1, 0x0002($v0) ## 00000002 /* 00264 80AD2F14 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 /* 00268 80AD2F18 00000000 */ nop -/* 0026C 80AD2F1C 468042A0 */ cvt.s.w $f10, $f8 +/* 0026C 80AD2F1C 468042A0 */ cvt.s.w $f10, $f8 /* 00270 80AD2F20 E48A000C */ swc1 $f10, 0x000C($a0) ## 0000000C /* 00274 80AD2F24 844A0004 */ lh $t2, 0x0004($v0) ## 00000004 /* 00278 80AD2F28 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 /* 0027C 80AD2F2C 00000000 */ nop -/* 00280 80AD2F30 468084A0 */ cvt.s.w $f18, $f16 -/* 00284 80AD2F34 0C00B6EC */ jal func_8002DBB0 +/* 00280 80AD2F30 468084A0 */ cvt.s.w $f18, $f16 +/* 00284 80AD2F34 0C00B6EC */ jal func_8002DBB0 /* 00288 80AD2F38 E4920010 */ swc1 $f18, 0x0010($a0) ## 00000010 /* 0028C 80AD2F3C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00290 80AD2F40 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00294 80AD2F44 8FA70020 */ lw $a3, 0x0020($sp) +/* 00294 80AD2F44 8FA70020 */ lw $a3, 0x0020($sp) /* 00298 80AD2F48 3C1880AD */ lui $t8, %hi(func_80AD30D0) ## $t8 = 80AD0000 -/* 0029C 80AD2F4C 4602003C */ c.lt.s $f0, $f2 +/* 0029C 80AD2F4C 4602003C */ c.lt.s $f0, $f2 /* 002A0 80AD2F50 271830D0 */ addiu $t8, $t8, %lo(func_80AD30D0) ## $t8 = 80AD30D0 /* 002A4 80AD2F54 E4E0019C */ swc1 $f0, 0x019C($a3) ## 0000019C -/* 002A8 80AD2F58 45020004 */ bc1fl .L80AD2F6C +/* 002A8 80AD2F58 45020004 */ bc1fl .L80AD2F6C /* 002AC 80AD2F5C C4E4019C */ lwc1 $f4, 0x019C($a3) ## 0000019C -/* 002B0 80AD2F60 10000003 */ beq $zero, $zero, .L80AD2F70 +/* 002B0 80AD2F60 10000003 */ beq $zero, $zero, .L80AD2F70 /* 002B4 80AD2F64 E4E2019C */ swc1 $f2, 0x019C($a3) ## 0000019C /* 002B8 80AD2F68 C4E4019C */ lwc1 $f4, 0x019C($a3) ## 0000019C .L80AD2F6C: @@ -72,21 +72,21 @@ glabel func_80AD2E64 /* 002C4 80AD2F74 C4E80028 */ lwc1 $f8, 0x0028($a3) ## 00000028 /* 002C8 80AD2F78 8CEB0198 */ lw $t3, 0x0198($a3) ## 00000198 /* 002CC 80AD2F7C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 002D0 80AD2F80 46083281 */ sub.s $f10, $f6, $f8 +/* 002D0 80AD2F80 46083281 */ sub.s $f10, $f6, $f8 /* 002D4 80AD2F84 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 /* 002D8 80AD2F88 ACEC0198 */ sw $t4, 0x0198($a3) ## 00000198 /* 002DC 80AD2F8C E4F00068 */ swc1 $f16, 0x0068($a3) ## 00000068 /* 002E0 80AD2F90 E4EA01A0 */ swc1 $f10, 0x01A0($a3) ## 000001A0 -/* 002E4 80AD2F94 8FAE001C */ lw $t6, 0x001C($sp) +/* 002E4 80AD2F94 8FAE001C */ lw $t6, 0x001C($sp) /* 002E8 80AD2F98 91CF0000 */ lbu $t7, 0x0000($t6) ## 00000000 -/* 002EC 80AD2F9C 558F0003 */ bnel $t4, $t7, .L80AD2FAC +/* 002EC 80AD2F9C 558F0003 */ bnel $t4, $t7, .L80AD2FAC /* 002F0 80AD2FA0 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 002F4 80AD2FA4 ACE00198 */ sw $zero, 0x0198($a3) ## 00000198 /* 002F8 80AD2FA8 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 .L80AD2FAC: -/* 002FC 80AD2FAC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002FC 80AD2FAC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00300 80AD2FB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00304 80AD2FB4 03E00008 */ jr $ra +/* 00304 80AD2FB4 03E00008 */ jr $ra /* 00308 80AD2FB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s index 2ccb629528..70885b066b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s @@ -1,19 +1,19 @@ glabel func_80AD2FBC /* 0030C 80AD2FBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00310 80AD2FC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00314 80AD2FC4 AFA40018 */ sw $a0, 0x0018($sp) +/* 00310 80AD2FC0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00314 80AD2FC4 AFA40018 */ sw $a0, 0x0018($sp) /* 00318 80AD2FC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0031C 80AD2FCC 24A50924 */ addiu $a1, $a1, 0x0924 ## $a1 = 06000924 /* 00320 80AD2FD0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00324 80AD2FD4 0C0294D3 */ jal func_800A534C +/* 00324 80AD2FD4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00328 80AD2FD8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 0032C 80AD2FDC 8FAF0018 */ lw $t7, 0x0018($sp) +/* 0032C 80AD2FDC 8FAF0018 */ lw $t7, 0x0018($sp) /* 00330 80AD2FE0 3C0E80AD */ lui $t6, %hi(func_80AD3194) ## $t6 = 80AD0000 /* 00334 80AD2FE4 25CE3194 */ addiu $t6, $t6, %lo(func_80AD3194) ## $t6 = 80AD3194 /* 00338 80AD2FE8 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 0033C 80AD2FEC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0033C 80AD2FEC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00340 80AD2FF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00344 80AD2FF4 03E00008 */ jr $ra +/* 00344 80AD2FF4 03E00008 */ jr $ra /* 00348 80AD2FF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s index 7dbc46474a..cf00b5a998 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s @@ -1,34 +1,34 @@ glabel EnPoField_Draw /* 02DE4 80AD68E4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 02DE8 80AD68E8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 02DEC 80AD68EC AFB20030 */ sw $s2, 0x0030($sp) -/* 02DF0 80AD68F0 AFB1002C */ sw $s1, 0x002C($sp) -/* 02DF4 80AD68F4 AFB00028 */ sw $s0, 0x0028($sp) +/* 02DE8 80AD68E8 AFBF0034 */ sw $ra, 0x0034($sp) +/* 02DEC 80AD68EC AFB20030 */ sw $s2, 0x0030($sp) +/* 02DF0 80AD68F0 AFB1002C */ sw $s1, 0x002C($sp) +/* 02DF4 80AD68F4 AFB00028 */ sw $s0, 0x0028($sp) /* 02DF8 80AD68F8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 02DFC 80AD68FC 8C890190 */ lw $t1, 0x0190($a0) ## 00000190 /* 02E00 80AD6900 3C1880AD */ lui $t8, %hi(D_80AD712C) ## $t8 = 80AD0000 /* 02E04 80AD6904 3C1980AD */ lui $t9, %hi(func_80AD4664) ## $t9 = 80AD0000 /* 02E08 80AD6908 2718712C */ addiu $t8, $t8, %lo(D_80AD712C) ## $t8 = 80AD712C /* 02E0C 80AD690C 27394664 */ addiu $t9, $t9, %lo(func_80AD4664) ## $t9 = 80AD4664 -/* 02E10 80AD6910 000E7900 */ sll $t7, $t6, 4 +/* 02E10 80AD6910 000E7900 */ sll $t7, $t6, 4 /* 02E14 80AD6914 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 02E18 80AD6918 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 02E1C 80AD691C 132900AC */ beq $t9, $t1, .L80AD6BD0 -/* 02E20 80AD6920 01F84021 */ addu $t0, $t7, $t8 +/* 02E1C 80AD691C 132900AC */ beq $t9, $t1, .L80AD6BD0 +/* 02E20 80AD6920 01F84021 */ addu $t0, $t7, $t8 /* 02E24 80AD6924 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02E28 80AD6928 3C0680AD */ lui $a2, %hi(D_80AD71B0) ## $a2 = 80AD0000 /* 02E2C 80AD692C 24C671B0 */ addiu $a2, $a2, %lo(D_80AD71B0) ## $a2 = 80AD71B0 -/* 02E30 80AD6930 AFA80078 */ sw $t0, 0x0078($sp) +/* 02E30 80AD6930 AFA80078 */ sw $t0, 0x0078($sp) /* 02E34 80AD6934 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 02E38 80AD6938 240707B8 */ addiu $a3, $zero, 0x07B8 ## $a3 = 000007B8 -/* 02E3C 80AD693C 0C031AB1 */ jal func_800C6AC4 +/* 02E3C 80AD693C 0C031AB1 */ jal func_800C6AC4 /* 02E40 80AD6940 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02E44 80AD6944 0C024F46 */ jal func_80093D18 +/* 02E44 80AD6944 0C024F46 */ jal func_80093D18 /* 02E48 80AD6948 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02E4C 80AD694C 0C024F61 */ jal func_80093D84 +/* 02E4C 80AD694C 0C024F61 */ jal func_80093D84 /* 02E50 80AD6950 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 02E54 80AD6954 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02E58 80AD6958 8FA80078 */ lw $t0, 0x0078($sp) +/* 02E58 80AD6958 8FA80078 */ lw $t0, 0x0078($sp) /* 02E5C 80AD695C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 02E60 80AD6960 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 02E64 80AD6964 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 @@ -39,16 +39,16 @@ glabel EnPoField_Draw /* 02E78 80AD6978 91070008 */ lbu $a3, 0x0008($t0) ## 00000008 /* 02E7C 80AD697C 91060007 */ lbu $a2, 0x0007($t0) ## 00000007 /* 02E80 80AD6980 91050006 */ lbu $a1, 0x0006($t0) ## 00000006 -/* 02E84 80AD6984 AFAC0010 */ sw $t4, 0x0010($sp) -/* 02E88 80AD6988 0C025474 */ jal func_800951D0 -/* 02E8C 80AD698C AFA20060 */ sw $v0, 0x0060($sp) -/* 02E90 80AD6990 8FA30060 */ lw $v1, 0x0060($sp) +/* 02E84 80AD6984 AFAC0010 */ sw $t4, 0x0010($sp) +/* 02E88 80AD6988 0C025474 */ jal func_800951D0 +/* 02E8C 80AD698C AFA20060 */ sw $v0, 0x0060($sp) +/* 02E90 80AD6990 8FA30060 */ lw $v1, 0x0060($sp) /* 02E94 80AD6994 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 02E98 80AD6998 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 02E9C 80AD699C 92220217 */ lbu $v0, 0x0217($s1) ## 00000217 -/* 02EA0 80AD69A0 50410004 */ beql $v0, $at, .L80AD69B4 +/* 02EA0 80AD69A0 50410004 */ beql $v0, $at, .L80AD69B4 /* 02EA4 80AD69A4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02EA8 80AD69A8 54400029 */ bnel $v0, $zero, .L80AD6A50 +/* 02EA8 80AD69A8 54400029 */ bnel $v0, $zero, .L80AD6A50 /* 02EAC 80AD69AC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 02EB0 80AD69B0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L80AD69B4: @@ -62,10 +62,10 @@ glabel EnPoField_Draw /* 02ED0 80AD69D0 92260215 */ lbu $a2, 0x0215($s1) ## 00000215 /* 02ED4 80AD69D4 92250214 */ lbu $a1, 0x0214($s1) ## 00000214 /* 02ED8 80AD69D8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02EDC 80AD69DC AFA2005C */ sw $v0, 0x005C($sp) -/* 02EE0 80AD69E0 0C025474 */ jal func_800951D0 -/* 02EE4 80AD69E4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02EE8 80AD69E8 8FA3005C */ lw $v1, 0x005C($sp) +/* 02EDC 80AD69DC AFA2005C */ sw $v0, 0x005C($sp) +/* 02EE0 80AD69E0 0C025474 */ jal func_800951D0 +/* 02EE4 80AD69E4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 02EE8 80AD69E8 8FA3005C */ lw $v1, 0x005C($sp) /* 02EEC 80AD69EC 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 02EF0 80AD69F0 3C098011 */ lui $t1, 0x8011 ## $t1 = 80110000 /* 02EF4 80AD69F4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -80,15 +80,15 @@ glabel EnPoField_Draw /* 02F18 80AD6A18 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 02F1C 80AD6A1C 3C0A80AD */ lui $t2, %hi(func_80AD66D0) ## $t2 = 80AD0000 /* 02F20 80AD6A20 254A66D0 */ addiu $t2, $t2, %lo(func_80AD66D0) ## $t2 = 80AD66D0 -/* 02F24 80AD6A24 AFAA0010 */ sw $t2, 0x0010($sp) -/* 02F28 80AD6A28 AFB10014 */ sw $s1, 0x0014($sp) +/* 02F24 80AD6A24 AFAA0010 */ sw $t2, 0x0010($sp) +/* 02F28 80AD6A28 AFB10014 */ sw $s1, 0x0014($sp) /* 02F2C 80AD6A2C 8E0B02C0 */ lw $t3, 0x02C0($s0) ## 000002C0 /* 02F30 80AD6A30 3C0780AD */ lui $a3, %hi(func_80AD65C8) ## $a3 = 80AD0000 /* 02F34 80AD6A34 24E765C8 */ addiu $a3, $a3, %lo(func_80AD65C8) ## $a3 = 80AD65C8 /* 02F38 80AD6A38 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02F3C 80AD6A3C 0C0288A2 */ jal func_800A2288 -/* 02F40 80AD6A40 AFAB0018 */ sw $t3, 0x0018($sp) -/* 02F44 80AD6A44 10000027 */ beq $zero, $zero, .L80AD6AE4 +/* 02F3C 80AD6A3C 0C0288A2 */ jal SkelAnime_Draw2 +/* 02F40 80AD6A40 AFAB0018 */ sw $t3, 0x0018($sp) +/* 02F44 80AD6A44 10000027 */ beq $zero, $zero, .L80AD6AE4 /* 02F48 80AD6A48 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 /* 02F4C 80AD6A4C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 .L80AD6A50: @@ -102,10 +102,10 @@ glabel EnPoField_Draw /* 02F6C 80AD6A6C 92260215 */ lbu $a2, 0x0215($s1) ## 00000215 /* 02F70 80AD6A70 92250214 */ lbu $a1, 0x0214($s1) ## 00000214 /* 02F74 80AD6A74 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02F78 80AD6A78 AFA20054 */ sw $v0, 0x0054($sp) -/* 02F7C 80AD6A7C 0C025474 */ jal func_800951D0 -/* 02F80 80AD6A80 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02F84 80AD6A84 8FA30054 */ lw $v1, 0x0054($sp) +/* 02F78 80AD6A78 AFA20054 */ sw $v0, 0x0054($sp) +/* 02F7C 80AD6A7C 0C025474 */ jal func_800951D0 +/* 02F80 80AD6A80 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02F84 80AD6A84 8FA30054 */ lw $v1, 0x0054($sp) /* 02F88 80AD6A88 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 02F8C 80AD6A8C 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 /* 02F90 80AD6A90 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -120,14 +120,14 @@ glabel EnPoField_Draw /* 02FB4 80AD6AB4 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 02FB8 80AD6AB8 3C0980AD */ lui $t1, %hi(func_80AD66D0) ## $t1 = 80AD0000 /* 02FBC 80AD6ABC 252966D0 */ addiu $t1, $t1, %lo(func_80AD66D0) ## $t1 = 80AD66D0 -/* 02FC0 80AD6AC0 AFA90010 */ sw $t1, 0x0010($sp) -/* 02FC4 80AD6AC4 AFB10014 */ sw $s1, 0x0014($sp) +/* 02FC0 80AD6AC0 AFA90010 */ sw $t1, 0x0010($sp) +/* 02FC4 80AD6AC4 AFB10014 */ sw $s1, 0x0014($sp) /* 02FC8 80AD6AC8 8E0A02D0 */ lw $t2, 0x02D0($s0) ## 000002D0 /* 02FCC 80AD6ACC 3C0780AD */ lui $a3, %hi(func_80AD65C8) ## $a3 = 80AD0000 /* 02FD0 80AD6AD0 24E765C8 */ addiu $a3, $a3, %lo(func_80AD65C8) ## $a3 = 80AD65C8 /* 02FD4 80AD6AD4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02FD8 80AD6AD8 0C0288A2 */ jal func_800A2288 -/* 02FDC 80AD6ADC AFAA0018 */ sw $t2, 0x0018($sp) +/* 02FD8 80AD6AD8 0C0288A2 */ jal SkelAnime_Draw2 +/* 02FDC 80AD6ADC AFAA0018 */ sw $t2, 0x0018($sp) /* 02FE0 80AD6AE0 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80AD6AE4: /* 02FE4 80AD6AE4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -146,13 +146,13 @@ glabel EnPoField_Draw /* 03018 80AD6B18 922A0219 */ lbu $t2, 0x0219($s1) ## 00000219 /* 0301C 80AD6B1C 92380218 */ lbu $t8, 0x0218($s1) ## 00000218 /* 03020 80AD6B20 922E021A */ lbu $t6, 0x021A($s1) ## 0000021A -/* 03024 80AD6B24 000A5C00 */ sll $t3, $t2, 16 -/* 03028 80AD6B28 0018CE00 */ sll $t9, $t8, 24 +/* 03024 80AD6B24 000A5C00 */ sll $t3, $t2, 16 +/* 03028 80AD6B28 0018CE00 */ sll $t9, $t8, 24 /* 0302C 80AD6B2C 032B6025 */ or $t4, $t9, $t3 ## $t4 = 00000008 -/* 03030 80AD6B30 000E7A00 */ sll $t7, $t6, 8 +/* 03030 80AD6B30 000E7A00 */ sll $t7, $t6, 8 /* 03034 80AD6B34 018FC025 */ or $t8, $t4, $t7 ## $t8 = 00000008 /* 03038 80AD6B38 370900FF */ ori $t1, $t8, 0x00FF ## $t1 = 000000FF -/* 0303C 80AD6B3C 0C03423F */ jal Matrix_Put +/* 0303C 80AD6B3C 0C03423F */ jal Matrix_Put /* 03040 80AD6B40 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 03044 80AD6B44 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03048 80AD6B48 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 @@ -164,9 +164,9 @@ glabel EnPoField_Draw /* 03060 80AD6B60 3C0580AD */ lui $a1, %hi(D_80AD71C4) ## $a1 = 80AD0000 /* 03064 80AD6B64 24A571C4 */ addiu $a1, $a1, %lo(D_80AD71C4) ## $a1 = 80AD71C4 /* 03068 80AD6B68 240607F1 */ addiu $a2, $zero, 0x07F1 ## $a2 = 000007F1 -/* 0306C 80AD6B6C 0C0346A2 */ jal Matrix_NewMtx -/* 03070 80AD6B70 AFA20044 */ sw $v0, 0x0044($sp) -/* 03074 80AD6B74 8FA30044 */ lw $v1, 0x0044($sp) +/* 0306C 80AD6B6C 0C0346A2 */ jal Matrix_NewMtx +/* 03070 80AD6B70 AFA20044 */ sw $v0, 0x0044($sp) +/* 03074 80AD6B74 8FA30044 */ lw $v1, 0x0044($sp) /* 03078 80AD6B78 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 /* 0307C 80AD6B7C 25AD4BA0 */ addiu $t5, $t5, 0x4BA0 ## $t5 = 06004BA0 /* 03080 80AD6B80 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -187,17 +187,17 @@ glabel EnPoField_Draw /* 030BC 80AD6BBC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 030C0 80AD6BC0 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 030C4 80AD6BC4 24C671D8 */ addiu $a2, $a2, %lo(D_80AD71D8) ## $a2 = 80AD71D8 -/* 030C8 80AD6BC8 0C031AD5 */ jal func_800C6B54 +/* 030C8 80AD6BC8 0C031AD5 */ jal func_800C6B54 /* 030CC 80AD6BCC 240707F7 */ addiu $a3, $zero, 0x07F7 ## $a3 = 000007F7 .L80AD6BD0: /* 030D0 80AD6BD0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 030D4 80AD6BD4 0C2B57A3 */ jal func_80AD5E8C +/* 030D4 80AD6BD4 0C2B57A3 */ jal func_80AD5E8C /* 030D8 80AD6BD8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 030DC 80AD6BDC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 030E0 80AD6BE0 8FB00028 */ lw $s0, 0x0028($sp) -/* 030E4 80AD6BE4 8FB1002C */ lw $s1, 0x002C($sp) -/* 030E8 80AD6BE8 8FB20030 */ lw $s2, 0x0030($sp) -/* 030EC 80AD6BEC 03E00008 */ jr $ra +/* 030DC 80AD6BDC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 030E0 80AD6BE0 8FB00028 */ lw $s0, 0x0028($sp) +/* 030E4 80AD6BE4 8FB1002C */ lw $s1, 0x002C($sp) +/* 030E8 80AD6BE8 8FB20030 */ lw $s2, 0x0030($sp) +/* 030EC 80AD6BEC 03E00008 */ jr $ra /* 030F0 80AD6BF0 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s index c83d81b3f6..7dadf32356 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s @@ -1,32 +1,32 @@ glabel func_80AD3F4C /* 0044C 80AD3F4C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00450 80AD3F50 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00450 80AD3F50 AFBF0014 */ sw $ra, 0x0014($sp) /* 00454 80AD3F54 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 00458 80AD3F58 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0045C 80AD3F5C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00460 80AD3F60 24A50924 */ addiu $a1, $a1, 0x0924 ## $a1 = 06000924 -/* 00464 80AD3F64 AFA60020 */ sw $a2, 0x0020($sp) +/* 00464 80AD3F64 AFA60020 */ sw $a2, 0x0020($sp) /* 00468 80AD3F68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0046C 80AD3F6C 0C0294BE */ jal func_800A52F8 -/* 00470 80AD3F70 AFAE001C */ sw $t6, 0x001C($sp) -/* 00474 80AD3F74 8FA60020 */ lw $a2, 0x0020($sp) +/* 0046C 80AD3F6C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00470 80AD3F70 AFAE001C */ sw $t6, 0x001C($sp) +/* 00474 80AD3F74 8FA60020 */ lw $a2, 0x0020($sp) /* 00478 80AD3F78 90CF0255 */ lbu $t7, 0x0255($a2) ## 00000255 /* 0047C 80AD3F7C C4C40090 */ lwc1 $f4, 0x0090($a2) ## 00000090 /* 00480 80AD3F80 24C40008 */ addiu $a0, $a2, 0x0008 ## $a0 = 00000008 /* 00484 80AD3F84 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 /* 00488 80AD3F88 A0D80255 */ sb $t8, 0x0255($a2) ## 00000255 /* 0048C 80AD3F8C E4C4021C */ swc1 $f4, 0x021C($a2) ## 0000021C -/* 00490 80AD3F90 8FA5001C */ lw $a1, 0x001C($sp) +/* 00490 80AD3F90 8FA5001C */ lw $a1, 0x001C($sp) /* 00494 80AD3F94 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 00498 80AD3F98 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 0049C 80AD3F9C 8FA60020 */ lw $a2, 0x0020($sp) +/* 0049C 80AD3F9C 8FA60020 */ lw $a2, 0x0020($sp) /* 004A0 80AD3FA0 3C0880AD */ lui $t0, %hi(func_80AD4E48) ## $t0 = 80AD0000 /* 004A4 80AD3FA4 25084E48 */ addiu $t0, $t0, %lo(func_80AD4E48) ## $t0 = 80AD4E48 /* 004A8 80AD3FA8 8CC90190 */ lw $t1, 0x0190($a2) ## 00000190 /* 004AC 80AD3FAC 84D9008A */ lh $t9, 0x008A($a2) ## 0000008A /* 004B0 80AD3FB0 3C0E80AD */ lui $t6, %hi(func_80AD4A68) ## $t6 = 80AD0000 -/* 004B4 80AD3FB4 11090008 */ beq $t0, $t1, .L80AD3FD8 +/* 004B4 80AD3FB4 11090008 */ beq $t0, $t1, .L80AD3FD8 /* 004B8 80AD3FB8 A4D90032 */ sh $t9, 0x0032($a2) ## 00000032 /* 004BC 80AD3FBC 8CCA0004 */ lw $t2, 0x0004($a2) ## 00000004 /* 004C0 80AD3FC0 240C0258 */ addiu $t4, $zero, 0x0258 ## $t4 = 00000258 @@ -38,9 +38,9 @@ glabel func_80AD3F4C .L80AD3FD8: /* 004D8 80AD3FD8 25CE4A68 */ addiu $t6, $t6, %lo(func_80AD4A68) ## $t6 = 80AD4A68 /* 004DC 80AD3FDC ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 -/* 004E0 80AD3FE0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 004E0 80AD3FE0 8FBF0014 */ lw $ra, 0x0014($sp) /* 004E4 80AD3FE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 004E8 80AD3FE8 03E00008 */ jr $ra +/* 004E8 80AD3FE8 03E00008 */ jr $ra /* 004EC 80AD3FEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s index a93fb32c8e..13beff3544 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s @@ -1,14 +1,14 @@ glabel func_80AD3FF0 /* 004F0 80AD3FF0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004F4 80AD3FF4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 004F4 80AD3FF4 AFBF0014 */ sw $ra, 0x0014($sp) /* 004F8 80AD3FF8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 004FC 80AD3FFC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00500 80AD4000 24A50608 */ addiu $a1, $a1, 0x0608 ## $a1 = 06000608 -/* 00504 80AD4004 AFA70018 */ sw $a3, 0x0018($sp) +/* 00504 80AD4004 AFA70018 */ sw $a3, 0x0018($sp) /* 00508 80AD4008 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0050C 80AD400C 0C0294D3 */ jal func_800A534C +/* 0050C 80AD400C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00510 80AD4010 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00514 80AD4014 8FA70018 */ lw $a3, 0x0018($sp) +/* 00514 80AD4014 8FA70018 */ lw $a3, 0x0018($sp) /* 00518 80AD4018 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 0051C 80AD401C 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 /* 00520 80AD4020 90EE0255 */ lbu $t6, 0x0255($a3) ## 00000255 @@ -19,7 +19,7 @@ glabel func_80AD3FF0 /* 00534 80AD4034 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 00538 80AD4038 A0EF0255 */ sb $t7, 0x0255($a3) ## 00000255 /* 0053C 80AD403C ACE20190 */ sw $v0, 0x0190($a3) ## 00000190 -/* 00540 80AD4040 1302000C */ beq $t8, $v0, .L80AD4074 +/* 00540 80AD4040 1302000C */ beq $t8, $v0, .L80AD4074 /* 00544 80AD4044 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 /* 00548 80AD4048 8CF90004 */ lw $t9, 0x0004($a3) ## 00000004 /* 0054C 80AD404C 84E900B6 */ lh $t1, 0x00B6($a3) ## 000000B6 @@ -27,15 +27,15 @@ glabel func_80AD3FF0 /* 00554 80AD4054 240B07D0 */ addiu $t3, $zero, 0x07D0 ## $t3 = 000007D0 /* 00558 80AD4058 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 /* 0055C 80AD405C 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 00560 80AD4060 01215021 */ addu $t2, $t1, $at +/* 00560 80AD4060 01215021 */ addu $t2, $t1, $at /* 00564 80AD4064 ACE80004 */ sw $t0, 0x0004($a3) ## 00000004 /* 00568 80AD4068 A4EA0032 */ sh $t2, 0x0032($a3) ## 00000032 /* 0056C 80AD406C A4EB0196 */ sh $t3, 0x0196($a3) ## 00000196 /* 00570 80AD4070 A0EC0194 */ sb $t4, 0x0194($a3) ## 00000194 .L80AD4074: -/* 00574 80AD4074 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00574 80AD4074 8FBF0014 */ lw $ra, 0x0014($sp) /* 00578 80AD4078 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0057C 80AD407C 03E00008 */ jr $ra +/* 0057C 80AD407C 03E00008 */ jr $ra /* 00580 80AD4080 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s index 1631e42571..e5b1c13f06 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s @@ -1,12 +1,12 @@ glabel func_80AD4190 /* 00690 80AD4190 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00694 80AD4194 AFB00018 */ sw $s0, 0x0018($sp) +/* 00694 80AD4194 AFB00018 */ sw $s0, 0x0018($sp) /* 00698 80AD4198 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0069C 80AD419C AFBF001C */ sw $ra, 0x001C($sp) +/* 0069C 80AD419C AFBF001C */ sw $ra, 0x001C($sp) /* 006A0 80AD41A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006A4 80AD41A4 24A51360 */ addiu $a1, $a1, 0x1360 ## $a1 = 06001360 /* 006A8 80AD41A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006AC 80AD41AC 0C0294D3 */ jal func_800A534C +/* 006AC 80AD41AC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 006B0 80AD41B0 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 006B4 80AD41B4 920F0255 */ lbu $t7, 0x0255($s0) ## 00000255 /* 006B8 80AD41B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -17,19 +17,19 @@ glabel func_80AD4190 /* 006CC 80AD41CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006D0 80AD41D0 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC /* 006D4 80AD41D4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 006D8 80AD41D8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 006DC 80AD41DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006E0 80AD41E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 006E4 80AD41E4 24053874 */ addiu $a1, $zero, 0x3874 ## $a1 = 00003874 /* 006E8 80AD41E8 3C1980AD */ lui $t9, %hi(func_80AD52F0) ## $t9 = 80AD0000 /* 006EC 80AD41EC 273952F0 */ addiu $t9, $t9, %lo(func_80AD52F0) ## $t9 = 80AD52F0 /* 006F0 80AD41F0 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 006F4 80AD41F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 006F8 80AD41F8 8FB00018 */ lw $s0, 0x0018($sp) +/* 006F4 80AD41F4 8FBF001C */ lw $ra, 0x001C($sp) +/* 006F8 80AD41F8 8FB00018 */ lw $s0, 0x0018($sp) /* 006FC 80AD41FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00700 80AD4200 03E00008 */ jr $ra +/* 00700 80AD4200 03E00008 */ jr $ra /* 00704 80AD4204 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s index 21402c3556..664e8e65b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s @@ -1,20 +1,20 @@ glabel EnPoRelay_Draw /* 013F8 80AD8B38 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 013FC 80AD8B3C AFBF002C */ sw $ra, 0x002C($sp) -/* 01400 80AD8B40 AFB00028 */ sw $s0, 0x0028($sp) -/* 01404 80AD8B44 AFA50054 */ sw $a1, 0x0054($sp) +/* 013FC 80AD8B3C AFBF002C */ sw $ra, 0x002C($sp) +/* 01400 80AD8B40 AFB00028 */ sw $s0, 0x0028($sp) +/* 01404 80AD8B44 AFA50054 */ sw $a1, 0x0054($sp) /* 01408 80AD8B48 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0140C 80AD8B4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01410 80AD8B50 3C0680AE */ lui $a2, %hi(D_80AD8DC4) ## $a2 = 80AE0000 /* 01414 80AD8B54 24C68DC4 */ addiu $a2, $a2, %lo(D_80AD8DC4) ## $a2 = 80AD8DC4 /* 01418 80AD8B58 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 0141C 80AD8B5C 240703AC */ addiu $a3, $zero, 0x03AC ## $a3 = 000003AC -/* 01420 80AD8B60 0C031AB1 */ jal func_800C6AC4 -/* 01424 80AD8B64 AFA50048 */ sw $a1, 0x0048($sp) -/* 01428 80AD8B68 8FAF0054 */ lw $t7, 0x0054($sp) -/* 0142C 80AD8B6C 0C024F46 */ jal func_80093D18 +/* 01420 80AD8B60 0C031AB1 */ jal func_800C6AC4 +/* 01424 80AD8B64 AFA50048 */ sw $a1, 0x0048($sp) +/* 01428 80AD8B68 8FAF0054 */ lw $t7, 0x0054($sp) +/* 0142C 80AD8B6C 0C024F46 */ jal func_80093D18 /* 01430 80AD8B70 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01434 80AD8B74 8FA50048 */ lw $a1, 0x0048($sp) +/* 01434 80AD8B74 8FA50048 */ lw $a1, 0x0048($sp) /* 01438 80AD8B78 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 0143C 80AD8B7C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 01440 80AD8B80 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,39 +26,39 @@ glabel EnPoRelay_Draw /* 01458 80AD8B98 9608019E */ lhu $t0, 0x019E($s0) ## 0000019E /* 0145C 80AD8B9C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01460 80AD8BA0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01464 80AD8BA4 00084880 */ sll $t1, $t0, 2 -/* 01468 80AD8BA8 00892021 */ addu $a0, $a0, $t1 -/* 0146C 80AD8BAC 8C848D54 */ lw $a0, %lo(D_80AD8D54)($a0) +/* 01464 80AD8BA4 00084880 */ sll $t1, $t0, 2 +/* 01468 80AD8BA8 00892021 */ addu $a0, $a0, $t1 +/* 0146C 80AD8BAC 8C848D54 */ lw $a0, %lo(D_80AD8D54)($a0) /* 01470 80AD8BB0 3C1980AE */ lui $t9, %hi(func_80AD88D0) ## $t9 = 80AE0000 /* 01474 80AD8BB4 273988D0 */ addiu $t9, $t9, %lo(func_80AD88D0) ## $t9 = 80AD88D0 -/* 01478 80AD8BB8 00045900 */ sll $t3, $a0, 4 -/* 0147C 80AD8BBC 000B6702 */ srl $t4, $t3, 28 -/* 01480 80AD8BC0 000C6880 */ sll $t5, $t4, 2 -/* 01484 80AD8BC4 01CD7021 */ addu $t6, $t6, $t5 +/* 01478 80AD8BB8 00045900 */ sll $t3, $a0, 4 +/* 0147C 80AD8BBC 000B6702 */ srl $t4, $t3, 28 +/* 01480 80AD8BC0 000C6880 */ sll $t5, $t4, 2 +/* 01484 80AD8BC4 01CD7021 */ addu $t6, $t6, $t5 /* 01488 80AD8BC8 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 0148C 80AD8BCC 00815024 */ and $t2, $a0, $at +/* 0148C 80AD8BCC 00815024 */ and $t2, $a0, $at /* 01490 80AD8BD0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01494 80AD8BD4 014E7821 */ addu $t7, $t2, $t6 -/* 01498 80AD8BD8 01E1C021 */ addu $t8, $t7, $at +/* 01494 80AD8BD4 014E7821 */ addu $t7, $t2, $t6 +/* 01498 80AD8BD8 01E1C021 */ addu $t8, $t7, $at /* 0149C 80AD8BDC AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 014A0 80AD8BE0 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 014A4 80AD8BE4 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 014A8 80AD8BE8 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 014AC 80AD8BEC AFB00018 */ sw $s0, 0x0018($sp) -/* 014B0 80AD8BF0 AFB90014 */ sw $t9, 0x0014($sp) -/* 014B4 80AD8BF4 AFA00010 */ sw $zero, 0x0010($sp) -/* 014B8 80AD8BF8 0C0286B2 */ jal func_800A1AC8 -/* 014BC 80AD8BFC 8FA40054 */ lw $a0, 0x0054($sp) -/* 014C0 80AD8C00 8FA80054 */ lw $t0, 0x0054($sp) +/* 014AC 80AD8BEC AFB00018 */ sw $s0, 0x0018($sp) +/* 014B0 80AD8BF0 AFB90014 */ sw $t9, 0x0014($sp) +/* 014B4 80AD8BF4 AFA00010 */ sw $zero, 0x0010($sp) +/* 014B8 80AD8BF8 0C0286B2 */ jal SkelAnime_DrawSV +/* 014BC 80AD8BFC 8FA40054 */ lw $a0, 0x0054($sp) +/* 014C0 80AD8C00 8FA80054 */ lw $t0, 0x0054($sp) /* 014C4 80AD8C04 3C0680AE */ lui $a2, %hi(D_80AD8DD8) ## $a2 = 80AE0000 /* 014C8 80AD8C08 24C68DD8 */ addiu $a2, $a2, %lo(D_80AD8DD8) ## $a2 = 80AD8DD8 /* 014CC 80AD8C0C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 014D0 80AD8C10 240703BA */ addiu $a3, $zero, 0x03BA ## $a3 = 000003BA -/* 014D4 80AD8C14 0C031AD5 */ jal func_800C6B54 +/* 014D4 80AD8C14 0C031AD5 */ jal func_800C6B54 /* 014D8 80AD8C18 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 014DC 80AD8C1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 014E0 80AD8C20 8FB00028 */ lw $s0, 0x0028($sp) +/* 014DC 80AD8C1C 8FBF002C */ lw $ra, 0x002C($sp) +/* 014E0 80AD8C20 8FB00028 */ lw $s0, 0x0028($sp) /* 014E4 80AD8C24 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 014E8 80AD8C28 03E00008 */ jr $ra +/* 014E8 80AD8C28 03E00008 */ jr $ra /* 014EC 80AD8C2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s index 2c61845c19..0c500754c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s @@ -1,110 +1,110 @@ glabel EnPoRelay_Init /* 00000 80AD7740 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80AD7744 AFB10028 */ sw $s1, 0x0028($sp) +/* 00004 80AD7744 AFB10028 */ sw $s1, 0x0028($sp) /* 00008 80AD7748 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 80AD774C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80AD7750 AFB00024 */ sw $s0, 0x0024($sp) +/* 0000C 80AD774C AFBF002C */ sw $ra, 0x002C($sp) +/* 00010 80AD7750 AFB00024 */ sw $s0, 0x0024($sp) /* 00014 80AD7754 3C0580AE */ lui $a1, %hi(D_80AD8D28) ## $a1 = 80AE0000 /* 00018 80AD7758 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0001C 80AD775C 0C01E037 */ jal Actor_ProcessInitChain - + /* 00020 80AD7760 24A58D28 */ addiu $a1, $a1, %lo(D_80AD8D28) ## $a1 = 80AD8D28 /* 00024 80AD7764 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00028 80AD7768 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0002C 80AD776C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00030 80AD7770 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00034 80AD7774 0C00AC78 */ jal ActorShape_Init - + /* 00038 80AD7778 3C074228 */ lui $a3, 0x4228 ## $a3 = 42280000 /* 0003C 80AD777C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00040 80AD7780 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00044 80AD7784 260E01A0 */ addiu $t6, $s0, 0x01A0 ## $t6 = 000001A0 /* 00048 80AD7788 260F020C */ addiu $t7, $s0, 0x020C ## $t7 = 0000020C /* 0004C 80AD778C 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 00050 80AD7790 AFB80018 */ sw $t8, 0x0018($sp) -/* 00054 80AD7794 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00058 80AD7798 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00050 80AD7790 AFB80018 */ sw $t8, 0x0018($sp) +/* 00054 80AD7794 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00058 80AD7798 AFAE0010 */ sw $t6, 0x0010($sp) /* 0005C 80AD779C 24E73768 */ addiu $a3, $a3, 0x3768 ## $a3 = 06003768 /* 00060 80AD77A0 24C6BE40 */ addiu $a2, $a2, 0xBE40 ## $a2 = 0600BE40 /* 00064 80AD77A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00068 80AD77A8 0C0291BE */ jal func_800A46F8 +/* 00068 80AD77A8 0C0291BE */ jal SkelAnime_InitSV /* 0006C 80AD77AC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00070 80AD77B0 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 -/* 00074 80AD77B4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00074 80AD77B4 AFA50034 */ sw $a1, 0x0034($sp) /* 00078 80AD77B8 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 0007C 80AD77BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00080 80AD77C0 3C0780AE */ lui $a3, %hi(D_80AD8CF8) ## $a3 = 80AE0000 -/* 00084 80AD77C4 8FA50034 */ lw $a1, 0x0034($sp) +/* 00084 80AD77C4 8FA50034 */ lw $a1, 0x0034($sp) /* 00088 80AD77C8 24E78CF8 */ addiu $a3, $a3, %lo(D_80AD8CF8) ## $a3 = 80AD8CF8 /* 0008C 80AD77CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00090 80AD77D0 0C01712B */ jal ActorCollider_InitCylinder - + /* 00094 80AD77D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00098 80AD77D8 26060280 */ addiu $a2, $s0, 0x0280 ## $a2 = 00000280 -/* 0009C 80AD77DC AFA60034 */ sw $a2, 0x0034($sp) +/* 0009C 80AD77DC AFA60034 */ sw $a2, 0x0034($sp) /* 000A0 80AD77E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000A4 80AD77E4 0C01E9D9 */ jal Lights_Insert - + /* 000A8 80AD77E8 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 /* 000AC 80AD77EC C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 /* 000B0 80AD77F0 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C /* 000B4 80AD77F4 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 000B8 80AD77F8 4600218D */ trunc.w.s $f6, $f4 +/* 000B8 80AD77F8 4600218D */ trunc.w.s $f6, $f4 /* 000BC 80AD77FC AE02027C */ sw $v0, 0x027C($s0) ## 0000027C /* 000C0 80AD7800 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 000C4 80AD7804 4600428D */ trunc.w.s $f10, $f8 -/* 000C8 80AD7808 44053000 */ mfc1 $a1, $f6 +/* 000C4 80AD7804 4600428D */ trunc.w.s $f10, $f8 +/* 000C8 80AD7808 44053000 */ mfc1 $a1, $f6 /* 000CC 80AD780C 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 000D0 80AD7810 4600848D */ trunc.w.s $f18, $f16 -/* 000D4 80AD7814 44065000 */ mfc1 $a2, $f10 +/* 000D0 80AD7810 4600848D */ trunc.w.s $f18, $f16 +/* 000D4 80AD7814 44065000 */ mfc1 $a2, $f10 /* 000D8 80AD7818 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 000DC 80AD781C 240D00C8 */ addiu $t5, $zero, 0x00C8 ## $t5 = 000000C8 -/* 000E0 80AD7820 44079000 */ mfc1 $a3, $f18 -/* 000E4 80AD7824 00052C00 */ sll $a1, $a1, 16 -/* 000E8 80AD7828 00063400 */ sll $a2, $a2, 16 -/* 000EC 80AD782C 00073C00 */ sll $a3, $a3, 16 -/* 000F0 80AD7830 00073C03 */ sra $a3, $a3, 16 -/* 000F4 80AD7834 00063403 */ sra $a2, $a2, 16 -/* 000F8 80AD7838 00052C03 */ sra $a1, $a1, 16 -/* 000FC 80AD783C AFAD001C */ sw $t5, 0x001C($sp) -/* 00100 80AD7840 AFAC0018 */ sw $t4, 0x0018($sp) -/* 00104 80AD7844 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00108 80AD7848 AFAA0010 */ sw $t2, 0x0010($sp) +/* 000E0 80AD7820 44079000 */ mfc1 $a3, $f18 +/* 000E4 80AD7824 00052C00 */ sll $a1, $a1, 16 +/* 000E8 80AD7828 00063400 */ sll $a2, $a2, 16 +/* 000EC 80AD782C 00073C00 */ sll $a3, $a3, 16 +/* 000F0 80AD7830 00073C03 */ sra $a3, $a3, 16 +/* 000F4 80AD7834 00063403 */ sra $a2, $a2, 16 +/* 000F8 80AD7838 00052C03 */ sra $a1, $a1, 16 +/* 000FC 80AD783C AFAD001C */ sw $t5, 0x001C($sp) +/* 00100 80AD7840 AFAC0018 */ sw $t4, 0x0018($sp) +/* 00104 80AD7844 AFAB0014 */ sw $t3, 0x0014($sp) +/* 00108 80AD7848 AFAA0010 */ sw $t2, 0x0010($sp) /* 0010C 80AD784C 0C01E763 */ jal Lights_InitType0PositionalLight - -/* 00110 80AD7850 8FA40034 */ lw $a0, 0x0034($sp) + +/* 00110 80AD7850 8FA40034 */ lw $a0, 0x0034($sp) /* 00114 80AD7854 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 00118 80AD7858 A20E027B */ sb $t6, 0x027B($s0) ## 0000027B /* 0011C 80AD785C 3C0F80AE */ lui $t7, %hi(D_80AD8D24) ## $t7 = 80AE0000 -/* 00120 80AD7860 8DEF8D24 */ lw $t7, %lo(D_80AD8D24)($t7) +/* 00120 80AD7860 8DEF8D24 */ lw $t7, %lo(D_80AD8D24)($t7) /* 00124 80AD7864 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00128 80AD7868 3C0180AE */ lui $at, %hi(D_80AD8D24) ## $at = 80AE0000 -/* 0012C 80AD786C 11E00005 */ beq $t7, $zero, .L80AD7884 +/* 0012C 80AD786C 11E00005 */ beq $t7, $zero, .L80AD7884 /* 00130 80AD7870 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00134 80AD7874 0C00B55C */ jal Actor_Kill - + /* 00138 80AD7878 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0013C 80AD787C 1000000A */ beq $zero, $zero, .L80AD78A8 +/* 0013C 80AD787C 1000000A */ beq $zero, $zero, .L80AD78A8 /* 00140 80AD7880 8608001C */ lh $t0, 0x001C($s0) ## 0000001C .L80AD7884: -/* 00144 80AD7884 AC388D24 */ sw $t8, %lo(D_80AD8D24)($at) +/* 00144 80AD7884 AC388D24 */ sw $t8, %lo(D_80AD8D24)($at) /* 00148 80AD7888 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0014C 80AD788C 0C00CE50 */ jal Actor_SetTextWithPrefix - + /* 00150 80AD7890 24060041 */ addiu $a2, $zero, 0x0041 ## $a2 = 00000041 /* 00154 80AD7894 9619010E */ lhu $t9, 0x010E($s0) ## 0000010E /* 00158 80AD7898 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0015C 80AD789C 0C2B5E43 */ jal func_80AD790C +/* 0015C 80AD789C 0C2B5E43 */ jal func_80AD790C /* 00160 80AD78A0 A619019C */ sh $t9, 0x019C($s0) ## 0000019C /* 00164 80AD78A4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C .L80AD78A8: /* 00168 80AD78A8 3109003F */ andi $t1, $t0, 0x003F ## $t1 = 00000000 /* 0016C 80AD78AC A609001C */ sh $t1, 0x001C($s0) ## 0000001C -/* 00170 80AD78B0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00174 80AD78B4 8FB10028 */ lw $s1, 0x0028($sp) -/* 00178 80AD78B8 8FB00024 */ lw $s0, 0x0024($sp) -/* 0017C 80AD78BC 03E00008 */ jr $ra +/* 00170 80AD78B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00174 80AD78B4 8FB10028 */ lw $s1, 0x0028($sp) +/* 00178 80AD78B8 8FB00024 */ lw $s0, 0x0024($sp) +/* 0017C 80AD78BC 03E00008 */ jr $ra /* 00180 80AD78C0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s index e968af38cf..d467c63cec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s @@ -77,7 +77,7 @@ glabel EnPoSisters_Draw /* 041DC 80ADD16C 8E6D02C0 */ lw $t5, 0x02C0($s3) ## 000002C0 /* 041E0 80ADD170 24E7C77C */ addiu $a3, $a3, %lo(func_80ADC77C) ## $a3 = 80ADC77C /* 041E4 80ADD174 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 041E8 80ADD178 0C0288A2 */ jal func_800A2288 +/* 041E8 80ADD178 0C0288A2 */ jal SkelAnime_Draw2 /* 041EC 80ADD17C AFAD0018 */ sw $t5, 0x0018($sp) /* 041F0 80ADD180 1000001F */ beq $zero, $zero, .L80ADD200 /* 041F4 80ADD184 AE6202C0 */ sw $v0, 0x02C0($s3) ## 000002C0 @@ -109,7 +109,7 @@ glabel EnPoSisters_Draw /* 04258 80ADD1E8 3C0780AE */ lui $a3, %hi(func_80ADC77C) ## $a3 = 80AE0000 /* 0425C 80ADD1EC 24E7C77C */ addiu $a3, $a3, %lo(func_80ADC77C) ## $a3 = 80ADC77C /* 04260 80ADD1F0 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 04264 80ADD1F4 0C0288A2 */ jal func_800A2288 +/* 04264 80ADD1F4 0C0288A2 */ jal SkelAnime_Draw2 /* 04268 80ADD1F8 AFAF0018 */ sw $t7, 0x0018($sp) /* 0426C 80ADD1FC AE6202D0 */ sw $v0, 0x02D0($s3) ## 000002D0 .L80ADD200: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s index 6679a67309..fcbc56939e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s @@ -1,27 +1,27 @@ glabel func_80AD9368 /* 003D8 80AD9368 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003DC 80AD936C AFBF0014 */ sw $ra, 0x0014($sp) +/* 003DC 80AD936C AFBF0014 */ sw $ra, 0x0014($sp) /* 003E0 80AD9370 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 003E4 80AD9374 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003E8 80AD9378 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC -/* 003EC 80AD937C AFA70018 */ sw $a3, 0x0018($sp) +/* 003EC 80AD937C AFA70018 */ sw $a3, 0x0018($sp) /* 003F0 80AD9380 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003F4 80AD9384 0C0294D3 */ jal func_800A534C +/* 003F4 80AD9384 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 003F8 80AD9388 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 003FC 80AD938C 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 /* 00400 80AD9390 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00404 80AD9394 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00408 80AD9398 8FA70018 */ lw $a3, 0x0018($sp) +/* 00408 80AD9398 8FA70018 */ lw $a3, 0x0018($sp) /* 0040C 80AD939C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00410 80AD93A0 3C0E80AE */ lui $t6, %hi(func_80ADA4A8) ## $t6 = 80AE0000 /* 00414 80AD93A4 25CEA4A8 */ addiu $t6, $t6, %lo(func_80ADA4A8) ## $t6 = 80ADA4A8 /* 00418 80AD93A8 A4E2019A */ sh $v0, 0x019A($a3) ## 0000019A /* 0041C 80AD93AC ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 00420 80AD93B0 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00424 80AD93B4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00424 80AD93B4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00428 80AD93B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0042C 80AD93BC 03E00008 */ jr $ra +/* 0042C 80AD93BC 03E00008 */ jr $ra /* 00430 80AD93C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s index 84b351913c..b92be2bd44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s @@ -1,25 +1,25 @@ glabel func_80AD93C4 /* 00434 80AD93C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00438 80AD93C8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00438 80AD93C8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0043C 80AD93CC 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 /* 00440 80AD93D0 3C0E80AE */ lui $t6, %hi(func_80ADA6A0) ## $t6 = 80AE0000 /* 00444 80AD93D4 25CEA6A0 */ addiu $t6, $t6, %lo(func_80ADA6A0) ## $t6 = 80ADA6A0 -/* 00448 80AD93D8 11CF0008 */ beq $t6, $t7, .L80AD93FC +/* 00448 80AD93D8 11CF0008 */ beq $t6, $t7, .L80AD93FC /* 0044C 80AD93DC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00450 80AD93E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00454 80AD93E4 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 /* 00458 80AD93E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0045C 80AD93EC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00460 80AD93F0 0C0294D3 */ jal func_800A534C -/* 00464 80AD93F4 AFA70018 */ sw $a3, 0x0018($sp) -/* 00468 80AD93F8 8FA70018 */ lw $a3, 0x0018($sp) +/* 00460 80AD93F0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00464 80AD93F4 AFA70018 */ sw $a3, 0x0018($sp) +/* 00468 80AD93F8 8FA70018 */ lw $a3, 0x0018($sp) .L80AD93FC: /* 0046C 80AD93FC 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F /* 00470 80AD9400 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 00474 80AD9404 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00478 80AD9408 AFA70018 */ sw $a3, 0x0018($sp) -/* 0047C 80AD940C 8FA70018 */ lw $a3, 0x0018($sp) + +/* 00478 80AD9408 AFA70018 */ sw $a3, 0x0018($sp) +/* 0047C 80AD940C 8FA70018 */ lw $a3, 0x0018($sp) /* 00480 80AD9410 3C0880AE */ lui $t0, %hi(func_80ADA530) ## $t0 = 80AE0000 /* 00484 80AD9414 2508A530 */ addiu $t0, $t0, %lo(func_80ADA530) ## $t0 = 80ADA530 /* 00488 80AD9418 90F80199 */ lbu $t8, 0x0199($a3) ## 00000199 @@ -27,9 +27,9 @@ glabel func_80AD93C4 /* 00490 80AD9420 ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 /* 00494 80AD9424 37190007 */ ori $t9, $t8, 0x0007 ## $t9 = 00000007 /* 00498 80AD9428 A0F90199 */ sb $t9, 0x0199($a3) ## 00000199 -/* 0049C 80AD942C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0049C 80AD942C 8FBF0014 */ lw $ra, 0x0014($sp) /* 004A0 80AD9430 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004A4 80AD9434 03E00008 */ jr $ra +/* 004A4 80AD9434 03E00008 */ jr $ra /* 004A8 80AD9438 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s index b64446b71d..426b34a668 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s @@ -1,10 +1,10 @@ glabel func_80AD944C /* 004BC 80AD944C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004C0 80AD9450 AFBF0014 */ sw $ra, 0x0014($sp) +/* 004C0 80AD9450 AFBF0014 */ sw $ra, 0x0014($sp) /* 004C4 80AD9454 908E0231 */ lbu $t6, 0x0231($a0) ## 00000231 /* 004C8 80AD9458 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004CC 80AD945C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 004D0 80AD9460 11C00006 */ beq $t6, $zero, .L80AD947C +/* 004D0 80AD9460 11C00006 */ beq $t6, $zero, .L80AD947C /* 004D4 80AD9464 24A50114 */ addiu $a1, $a1, 0x0114 ## $a1 = 06000114 /* 004D8 80AD9468 909802BD */ lbu $t8, 0x02BD($a0) ## 000002BD /* 004DC 80AD946C 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 @@ -14,18 +14,18 @@ glabel func_80AD944C .L80AD947C: /* 004EC 80AD947C 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C /* 004F0 80AD9480 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 004F4 80AD9484 0C0294D3 */ jal func_800A534C -/* 004F8 80AD9488 AFA70018 */ sw $a3, 0x0018($sp) -/* 004FC 80AD948C 8FA70018 */ lw $a3, 0x0018($sp) +/* 004F4 80AD9484 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 004F8 80AD9488 AFA70018 */ sw $a3, 0x0018($sp) +/* 004FC 80AD948C 8FA70018 */ lw $a3, 0x0018($sp) /* 00500 80AD9490 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00504 80AD9494 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00508 80AD9498 24840114 */ addiu $a0, $a0, 0x0114 ## $a0 = 06000114 /* 0050C 80AD949C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00510 80AD94A0 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00514 80AD94A4 8FA70018 */ lw $a3, 0x0018($sp) -/* 00518 80AD94A8 00024080 */ sll $t0, $v0, 2 -/* 0051C 80AD94AC 01024023 */ subu $t0, $t0, $v0 +/* 00514 80AD94A4 8FA70018 */ lw $a3, 0x0018($sp) +/* 00518 80AD94A8 00024080 */ sll $t0, $v0, 2 +/* 0051C 80AD94AC 01024023 */ subu $t0, $t0, $v0 /* 00520 80AD94B0 90EA0199 */ lbu $t2, 0x0199($a3) ## 00000199 /* 00524 80AD94B4 3C0C80AE */ lui $t4, %hi(func_80ADA7F0) ## $t4 = 80AE0000 /* 00528 80AD94B8 25090003 */ addiu $t1, $t0, 0x0003 ## $t1 = 00000003 @@ -34,9 +34,9 @@ glabel func_80AD944C /* 00534 80AD94C4 A4E9019A */ sh $t1, 0x019A($a3) ## 0000019A /* 00538 80AD94C8 A0EB0199 */ sb $t3, 0x0199($a3) ## 00000199 /* 0053C 80AD94CC ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 -/* 00540 80AD94D0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00540 80AD94D0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00544 80AD94D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00548 80AD94D8 03E00008 */ jr $ra +/* 00548 80AD94D8 03E00008 */ jr $ra /* 0054C 80AD94DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s index c57d02c94f..69bf91dc2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s @@ -1,11 +1,11 @@ glabel func_80AD94E0 /* 00550 80AD94E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00554 80AD94E4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00554 80AD94E4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00558 80AD94E8 908E0194 */ lbu $t6, 0x0194($a0) ## 00000194 /* 0055C 80AD94EC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00560 80AD94F0 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 00564 80AD94F4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00568 80AD94F8 15C0000D */ bne $t6, $zero, .L80AD9530 +/* 00568 80AD94F8 15C0000D */ bne $t6, $zero, .L80AD9530 /* 0056C 80AD94FC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 00570 80AD9500 909802BD */ lbu $t8, 0x02BD($a0) ## 000002BD /* 00574 80AD9504 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 @@ -14,11 +14,11 @@ glabel func_80AD94E0 /* 00580 80AD9510 A09902BD */ sb $t9, 0x02BD($a0) ## 000002BD /* 00584 80AD9514 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00588 80AD9518 24A50114 */ addiu $a1, $a1, 0x0114 ## $a1 = 06000114 -/* 0058C 80AD951C AFA70018 */ sw $a3, 0x0018($sp) +/* 0058C 80AD951C AFA70018 */ sw $a3, 0x0018($sp) /* 00590 80AD9520 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00594 80AD9524 0C0294D3 */ jal func_800A534C +/* 00594 80AD9524 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00598 80AD9528 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 0059C 80AD952C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0059C 80AD952C 8FA70018 */ lw $a3, 0x0018($sp) .L80AD9530: /* 005A0 80AD9530 90EA0199 */ lbu $t2, 0x0199($a3) ## 00000199 /* 005A4 80AD9534 84E9008A */ lh $t1, 0x008A($a3) ## 0000008A @@ -30,9 +30,9 @@ glabel func_80AD94E0 /* 005BC 80AD954C A0EB0199 */ sb $t3, 0x0199($a3) ## 00000199 /* 005C0 80AD9550 ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 /* 005C4 80AD9554 A4E90032 */ sh $t1, 0x0032($a3) ## 00000032 -/* 005C8 80AD9558 8FBF0014 */ lw $ra, 0x0014($sp) +/* 005C8 80AD9558 8FBF0014 */ lw $ra, 0x0014($sp) /* 005CC 80AD955C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005D0 80AD9560 03E00008 */ jr $ra +/* 005D0 80AD9560 03E00008 */ jr $ra /* 005D4 80AD9564 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s index 49b3514497..69a4462cbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s @@ -1,21 +1,21 @@ glabel func_80AD9568 /* 005D8 80AD9568 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005DC 80AD956C AFBF0014 */ sw $ra, 0x0014($sp) +/* 005DC 80AD956C AFBF0014 */ sw $ra, 0x0014($sp) /* 005E0 80AD9570 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 005E4 80AD9574 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005E8 80AD9578 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 -/* 005EC 80AD957C AFA70018 */ sw $a3, 0x0018($sp) +/* 005EC 80AD957C AFA70018 */ sw $a3, 0x0018($sp) /* 005F0 80AD9580 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005F4 80AD9584 0C0294D3 */ jal func_800A534C +/* 005F4 80AD9584 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 005F8 80AD9588 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 005FC 80AD958C 8FA70018 */ lw $a3, 0x0018($sp) +/* 005FC 80AD958C 8FA70018 */ lw $a3, 0x0018($sp) /* 00600 80AD9590 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 00604 80AD9594 3C0A80AE */ lui $t2, %hi(func_80ADA9E8) ## $t2 = 80AE0000 /* 00608 80AD9598 84EE008A */ lh $t6, 0x008A($a3) ## 0000008A /* 0060C 80AD959C 90F80194 */ lbu $t8, 0x0194($a3) ## 00000194 /* 00610 80AD95A0 254AA9E8 */ addiu $t2, $t2, %lo(func_80ADA9E8) ## $t2 = 80ADA9E8 -/* 00614 80AD95A4 01C17821 */ addu $t7, $t6, $at -/* 00618 80AD95A8 13000006 */ beq $t8, $zero, .L80AD95C4 +/* 00614 80AD95A4 01C17821 */ addu $t7, $t6, $at +/* 00618 80AD95A8 13000006 */ beq $t8, $zero, .L80AD95C4 /* 0061C 80AD95AC A4EF0032 */ sh $t7, 0x0032($a3) ## 00000032 /* 00620 80AD95B0 90E802BD */ lbu $t0, 0x02BD($a3) ## 000002BD /* 00624 80AD95B4 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 @@ -24,9 +24,9 @@ glabel func_80AD9568 /* 00630 80AD95C0 A0E902BD */ sb $t1, 0x02BD($a3) ## 000002BD .L80AD95C4: /* 00634 80AD95C4 ACEA0190 */ sw $t2, 0x0190($a3) ## 00000190 -/* 00638 80AD95C8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00638 80AD95C8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0063C 80AD95CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00640 80AD95D0 03E00008 */ jr $ra +/* 00640 80AD95D0 03E00008 */ jr $ra /* 00644 80AD95D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s index 3850513a93..2cbf07fa74 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s @@ -1,20 +1,20 @@ glabel func_80AD96A4 /* 00714 80AD96A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00718 80AD96A8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00718 80AD96A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0071C 80AD96AC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00720 80AD96B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00724 80AD96B4 24A50A54 */ addiu $a1, $a1, 0x0A54 ## $a1 = 06000A54 -/* 00728 80AD96B8 AFA70018 */ sw $a3, 0x0018($sp) +/* 00728 80AD96B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0072C 80AD96BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00730 80AD96C0 0C0294D3 */ jal func_800A534C +/* 00730 80AD96C0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00734 80AD96C4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00738 80AD96C8 8FA70018 */ lw $a3, 0x0018($sp) +/* 00738 80AD96C8 8FA70018 */ lw $a3, 0x0018($sp) /* 0073C 80AD96CC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 00740 80AD96D0 3C0980AE */ lui $t1, %hi(func_80ADAC70) ## $t1 = 80AE0000 /* 00744 80AD96D4 84EE00B6 */ lh $t6, 0x00B6($a3) ## 000000B6 /* 00748 80AD96D8 90F90199 */ lbu $t9, 0x0199($a3) ## 00000199 /* 0074C 80AD96DC 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00750 80AD96E0 01C17821 */ addu $t7, $t6, $at +/* 00750 80AD96E0 01C17821 */ addu $t7, $t6, $at /* 00754 80AD96E4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00758 80AD96E8 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 0075C 80AD96EC 2529AC70 */ addiu $t1, $t1, %lo(func_80ADAC70) ## $t1 = 80ADAC70 @@ -24,9 +24,9 @@ glabel func_80AD96A4 /* 0076C 80AD96FC A0E80199 */ sb $t0, 0x0199($a3) ## 00000199 /* 00770 80AD9700 ACE90190 */ sw $t1, 0x0190($a3) ## 00000190 /* 00774 80AD9704 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00778 80AD9708 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00778 80AD9708 8FBF0014 */ lw $ra, 0x0014($sp) /* 0077C 80AD970C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00780 80AD9710 03E00008 */ jr $ra +/* 00780 80AD9710 03E00008 */ jr $ra /* 00784 80AD9714 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s index b79bff36b9..1e3e59cb16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s @@ -1,99 +1,99 @@ glabel func_80AD9AA8 /* 00B18 80AD9AA8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00B1C 80AD9AAC AFB00030 */ sw $s0, 0x0030($sp) +/* 00B1C 80AD9AAC AFB00030 */ sw $s0, 0x0030($sp) /* 00B20 80AD9AB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B24 80AD9AB4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00B24 80AD9AB4 AFBF0034 */ sw $ra, 0x0034($sp) /* 00B28 80AD9AB8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 00B2C 80AD9ABC 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 /* 00B30 80AD9AC0 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 00B34 80AD9AC4 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00B34 80AD9AC4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00B38 80AD9AC8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 00B3C 80AD9ACC 240E0400 */ addiu $t6, $zero, 0x0400 ## $t6 = 00000400 -/* 00B40 80AD9AD0 AFAE0024 */ sw $t6, 0x0024($sp) -/* 00B44 80AD9AD4 AFA50054 */ sw $a1, 0x0054($sp) -/* 00B48 80AD9AD8 AFA40038 */ sw $a0, 0x0038($sp) -/* 00B4C 80AD9ADC AFA00020 */ sw $zero, 0x0020($sp) -/* 00B50 80AD9AE0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00B54 80AD9AE4 AFA00018 */ sw $zero, 0x0018($sp) +/* 00B40 80AD9AD0 AFAE0024 */ sw $t6, 0x0024($sp) +/* 00B44 80AD9AD4 AFA50054 */ sw $a1, 0x0054($sp) +/* 00B48 80AD9AD8 AFA40038 */ sw $a0, 0x0038($sp) +/* 00B4C 80AD9ADC AFA00020 */ sw $zero, 0x0020($sp) +/* 00B50 80AD9AE0 AFA0001C */ sw $zero, 0x001C($sp) +/* 00B54 80AD9AE4 AFA00018 */ sw $zero, 0x0018($sp) /* 00B58 80AD9AE8 24060091 */ addiu $a2, $zero, 0x0091 ## $a2 = 00000091 /* 00B5C 80AD9AEC 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00B60 80AD9AF0 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00B64 80AD9AF4 AFA2004C */ sw $v0, 0x004C($sp) +/* 00B60 80AD9AF0 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00B64 80AD9AF4 AFA2004C */ sw $v0, 0x004C($sp) /* 00B68 80AD9AF8 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 00B6C 80AD9AFC 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 /* 00B70 80AD9B00 240F0800 */ addiu $t7, $zero, 0x0800 ## $t7 = 00000800 -/* 00B74 80AD9B04 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00B74 80AD9B04 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00B78 80AD9B08 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00B7C 80AD9B0C AFAF0024 */ sw $t7, 0x0024($sp) -/* 00B80 80AD9B10 AFA00020 */ sw $zero, 0x0020($sp) -/* 00B84 80AD9B14 AFA0001C */ sw $zero, 0x001C($sp) -/* 00B88 80AD9B18 AFA00018 */ sw $zero, 0x0018($sp) -/* 00B8C 80AD9B1C 8FA40038 */ lw $a0, 0x0038($sp) -/* 00B90 80AD9B20 8FA50054 */ lw $a1, 0x0054($sp) +/* 00B7C 80AD9B0C AFAF0024 */ sw $t7, 0x0024($sp) +/* 00B80 80AD9B10 AFA00020 */ sw $zero, 0x0020($sp) +/* 00B84 80AD9B14 AFA0001C */ sw $zero, 0x001C($sp) +/* 00B88 80AD9B18 AFA00018 */ sw $zero, 0x0018($sp) +/* 00B8C 80AD9B1C 8FA40038 */ lw $a0, 0x0038($sp) +/* 00B90 80AD9B20 8FA50054 */ lw $a1, 0x0054($sp) /* 00B94 80AD9B24 24060091 */ addiu $a2, $zero, 0x0091 ## $a2 = 00000091 /* 00B98 80AD9B28 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00B9C 80AD9B2C E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 00BA0 80AD9B30 AFA20048 */ sw $v0, 0x0048($sp) +/* 00B9C 80AD9B2C E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 00BA0 80AD9B30 AFA20048 */ sw $v0, 0x0048($sp) /* 00BA4 80AD9B34 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 00BA8 80AD9B38 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 /* 00BAC 80AD9B3C 24180C00 */ addiu $t8, $zero, 0x0C00 ## $t8 = 00000C00 -/* 00BB0 80AD9B40 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00BB0 80AD9B40 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00BB4 80AD9B44 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00BB8 80AD9B48 AFB80024 */ sw $t8, 0x0024($sp) -/* 00BBC 80AD9B4C AFA00020 */ sw $zero, 0x0020($sp) -/* 00BC0 80AD9B50 AFA0001C */ sw $zero, 0x001C($sp) -/* 00BC4 80AD9B54 AFA00018 */ sw $zero, 0x0018($sp) -/* 00BC8 80AD9B58 8FA40038 */ lw $a0, 0x0038($sp) -/* 00BCC 80AD9B5C 8FA50054 */ lw $a1, 0x0054($sp) +/* 00BB8 80AD9B48 AFB80024 */ sw $t8, 0x0024($sp) +/* 00BBC 80AD9B4C AFA00020 */ sw $zero, 0x0020($sp) +/* 00BC0 80AD9B50 AFA0001C */ sw $zero, 0x001C($sp) +/* 00BC4 80AD9B54 AFA00018 */ sw $zero, 0x0018($sp) +/* 00BC8 80AD9B58 8FA40038 */ lw $a0, 0x0038($sp) +/* 00BCC 80AD9B5C 8FA50054 */ lw $a1, 0x0054($sp) /* 00BD0 80AD9B60 24060091 */ addiu $a2, $zero, 0x0091 ## $a2 = 00000091 /* 00BD4 80AD9B64 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00BD8 80AD9B68 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 00BDC 80AD9B6C 8FA7004C */ lw $a3, 0x004C($sp) +/* 00BD8 80AD9B68 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 00BDC 80AD9B6C 8FA7004C */ lw $a3, 0x004C($sp) /* 00BE0 80AD9B70 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 00BE4 80AD9B74 8FB90048 */ lw $t9, 0x0048($sp) -/* 00BE8 80AD9B78 10E00005 */ beq $a3, $zero, .L80AD9B90 +/* 00BE4 80AD9B74 8FB90048 */ lw $t9, 0x0048($sp) +/* 00BE8 80AD9B78 10E00005 */ beq $a3, $zero, .L80AD9B90 /* 00BEC 80AD9B7C 00000000 */ nop -/* 00BF0 80AD9B80 13200003 */ beq $t9, $zero, .L80AD9B90 +/* 00BF0 80AD9B80 13200003 */ beq $t9, $zero, .L80AD9B90 /* 00BF4 80AD9B84 00000000 */ nop -/* 00BF8 80AD9B88 14400014 */ bne $v0, $zero, .L80AD9BDC +/* 00BF8 80AD9B88 14400014 */ bne $v0, $zero, .L80AD9BDC /* 00BFC 80AD9B8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L80AD9B90: -/* 00C00 80AD9B90 10E00004 */ beq $a3, $zero, .L80AD9BA4 +/* 00C00 80AD9B90 10E00004 */ beq $a3, $zero, .L80AD9BA4 /* 00C04 80AD9B94 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00C08 80AD9B98 0C00B55C */ jal Actor_Kill - -/* 00C0C 80AD9B9C AFA60044 */ sw $a2, 0x0044($sp) -/* 00C10 80AD9BA0 8FA60044 */ lw $a2, 0x0044($sp) + +/* 00C0C 80AD9B9C AFA60044 */ sw $a2, 0x0044($sp) +/* 00C10 80AD9BA0 8FA60044 */ lw $a2, 0x0044($sp) .L80AD9BA4: -/* 00C14 80AD9BA4 8FA80048 */ lw $t0, 0x0048($sp) -/* 00C18 80AD9BA8 11000004 */ beq $t0, $zero, .L80AD9BBC +/* 00C14 80AD9BA4 8FA80048 */ lw $t0, 0x0048($sp) +/* 00C18 80AD9BA8 11000004 */ beq $t0, $zero, .L80AD9BBC /* 00C1C 80AD9BAC 01002025 */ or $a0, $t0, $zero ## $a0 = 00000000 /* 00C20 80AD9BB0 0C00B55C */ jal Actor_Kill - -/* 00C24 80AD9BB4 AFA60044 */ sw $a2, 0x0044($sp) -/* 00C28 80AD9BB8 8FA60044 */ lw $a2, 0x0044($sp) + +/* 00C24 80AD9BB4 AFA60044 */ sw $a2, 0x0044($sp) +/* 00C28 80AD9BB8 8FA60044 */ lw $a2, 0x0044($sp) .L80AD9BBC: -/* 00C2C 80AD9BBC 10C00003 */ beq $a2, $zero, .L80AD9BCC +/* 00C2C 80AD9BBC 10C00003 */ beq $a2, $zero, .L80AD9BCC /* 00C30 80AD9BC0 00000000 */ nop /* 00C34 80AD9BC4 0C00B55C */ jal Actor_Kill - + /* 00C38 80AD9BC8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 .L80AD9BCC: /* 00C3C 80AD9BCC 0C00B55C */ jal Actor_Kill - + /* 00C40 80AD9BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C44 80AD9BD4 1000000F */ beq $zero, $zero, .L80AD9C14 -/* 00C48 80AD9BD8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00C44 80AD9BD4 1000000F */ beq $zero, $zero, .L80AD9C14 +/* 00C48 80AD9BD8 8FBF0034 */ lw $ra, 0x0034($sp) .L80AD9BDC: /* 00C4C 80AD9BDC ACD00118 */ sw $s0, 0x0118($a2) ## 00000118 -/* 00C50 80AD9BE0 8FA90048 */ lw $t1, 0x0048($sp) +/* 00C50 80AD9BE0 8FA90048 */ lw $t1, 0x0048($sp) /* 00C54 80AD9BE4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00C58 80AD9BE8 24A50680 */ addiu $a1, $a1, 0x0680 ## $a1 = 06000680 /* 00C5C 80AD9BEC AD300118 */ sw $s0, 0x0118($t1) ## 00000118 -/* 00C60 80AD9BF0 0C0294BE */ jal func_800A52F8 +/* 00C60 80AD9BF0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00C64 80AD9BF4 ACF00118 */ sw $s0, 0x0118($a3) ## 00000118 /* 00C68 80AD9BF8 3C0B80AE */ lui $t3, %hi(func_80ADB2B8) ## $t3 = 80AE0000 /* 00C6C 80AD9BFC 240A00A0 */ addiu $t2, $zero, 0x00A0 ## $t2 = 000000A0 @@ -101,11 +101,11 @@ glabel func_80AD9AA8 /* 00C74 80AD9C04 A2000198 */ sb $zero, 0x0198($s0) ## 00000198 /* 00C78 80AD9C08 A20A0199 */ sb $t2, 0x0199($s0) ## 00000199 /* 00C7C 80AD9C0C AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 00C80 80AD9C10 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00C80 80AD9C10 8FBF0034 */ lw $ra, 0x0034($sp) .L80AD9C14: -/* 00C84 80AD9C14 8FB00030 */ lw $s0, 0x0030($sp) +/* 00C84 80AD9C14 8FB00030 */ lw $s0, 0x0030($sp) /* 00C88 80AD9C18 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00C8C 80AD9C1C 03E00008 */ jr $ra +/* 00C8C 80AD9C1C 03E00008 */ jr $ra /* 00C90 80AD9C20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s index 2c71b11903..bbd5604414 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s @@ -1,22 +1,22 @@ glabel func_80AD9E60 /* 00ED0 80AD9E60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00ED4 80AD9E64 AFB00018 */ sw $s0, 0x0018($sp) +/* 00ED4 80AD9E64 AFB00018 */ sw $s0, 0x0018($sp) /* 00ED8 80AD9E68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EDC 80AD9E6C AFBF001C */ sw $ra, 0x001C($sp) +/* 00EDC 80AD9E6C AFBF001C */ sw $ra, 0x001C($sp) /* 00EE0 80AD9E70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00EE4 80AD9E74 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 /* 00EE8 80AD9E78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00EEC 80AD9E7C 0C0294D3 */ jal func_800A534C +/* 00EEC 80AD9E7C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00EF0 80AD9E80 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00EF4 80AD9E84 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00EF8 80AD9E88 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00EFC 80AD9E8C 24840D40 */ addiu $a0, $a0, 0x0D40 ## $a0 = 06000D40 /* 00F00 80AD9E90 8E030118 */ lw $v1, 0x0118($s0) ## 00000118 -/* 00F04 80AD9E94 000270C0 */ sll $t6, $v0, 3 -/* 00F08 80AD9E98 01C27023 */ subu $t6, $t6, $v0 +/* 00F04 80AD9E94 000270C0 */ sll $t6, $v0, 3 +/* 00F08 80AD9E98 01C27023 */ subu $t6, $t6, $v0 /* 00F0C 80AD9E9C 25CF0007 */ addiu $t7, $t6, 0x0007 ## $t7 = 00000007 -/* 00F10 80AD9EA0 1060000B */ beq $v1, $zero, .L80AD9ED0 +/* 00F10 80AD9EA0 1060000B */ beq $v1, $zero, .L80AD9ED0 /* 00F14 80AD9EA4 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A /* 00F18 80AD9EA8 8C790024 */ lw $t9, 0x0024($v1) ## 00000024 /* 00F1C 80AD9EAC 8E080118 */ lw $t0, 0x0118($s0) ## 00000118 @@ -26,7 +26,7 @@ glabel func_80AD9E60 /* 00F2C 80AD9EBC 8C79002C */ lw $t9, 0x002C($v1) ## 0000002C /* 00F30 80AD9EC0 AE19002C */ sw $t9, 0x002C($s0) ## 0000002C /* 00F34 80AD9EC4 850900B6 */ lh $t1, 0x00B6($t0) ## 000000B6 -/* 00F38 80AD9EC8 10000006 */ beq $zero, $zero, .L80AD9EE4 +/* 00F38 80AD9EC8 10000006 */ beq $zero, $zero, .L80AD9EE4 /* 00F3C 80AD9ECC A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 .L80AD9ED0: /* 00F40 80AD9ED0 860B019A */ lh $t3, 0x019A($s0) ## 0000019A @@ -37,19 +37,19 @@ glabel func_80AD9E60 .L80AD9EE4: /* 00F54 80AD9EE4 920D0195 */ lbu $t5, 0x0195($s0) ## 00000195 /* 00F58 80AD9EE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F5C 80AD9EEC 15A00003 */ bne $t5, $zero, .L80AD9EFC +/* 00F5C 80AD9EEC 15A00003 */ bne $t5, $zero, .L80AD9EFC /* 00F60 80AD9EF0 00000000 */ nop /* 00F64 80AD9EF4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00F68 80AD9EF8 240538EF */ addiu $a1, $zero, 0x38EF ## $a1 = 000038EF .L80AD9EFC: /* 00F6C 80AD9EFC 3C0E80AE */ lui $t6, %hi(func_80ADB51C) ## $t6 = 80AE0000 /* 00F70 80AD9F00 25CEB51C */ addiu $t6, $t6, %lo(func_80ADB51C) ## $t6 = 80ADB51C /* 00F74 80AD9F04 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 00F78 80AD9F08 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F7C 80AD9F0C 8FB00018 */ lw $s0, 0x0018($sp) +/* 00F78 80AD9F08 8FBF001C */ lw $ra, 0x001C($sp) +/* 00F7C 80AD9F0C 8FB00018 */ lw $s0, 0x0018($sp) /* 00F80 80AD9F10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00F84 80AD9F14 03E00008 */ jr $ra +/* 00F84 80AD9F14 03E00008 */ jr $ra /* 00F88 80AD9F18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s index 3922059036..a5a8f3a393 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s @@ -1,14 +1,14 @@ glabel func_80AD9F1C /* 00F8C 80AD9F1C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F90 80AD9F20 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00F90 80AD9F20 AFBF0014 */ sw $ra, 0x0014($sp) /* 00F94 80AD9F24 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00F98 80AD9F28 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F9C 80AD9F2C 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 -/* 00FA0 80AD9F30 AFA70018 */ sw $a3, 0x0018($sp) +/* 00FA0 80AD9F30 AFA70018 */ sw $a3, 0x0018($sp) /* 00FA4 80AD9F34 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FA8 80AD9F38 0C0294D3 */ jal func_800A534C +/* 00FA8 80AD9F38 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00FAC 80AD9F3C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00FB0 80AD9F40 8FA70018 */ lw $a3, 0x0018($sp) +/* 00FB0 80AD9F40 8FA70018 */ lw $a3, 0x0018($sp) /* 00FB4 80AD9F44 3C0B80AE */ lui $t3, %hi(func_80ADB770) ## $t3 = 80AE0000 /* 00FB8 80AD9F48 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 00FBC 80AD9F4C 90F90199 */ lbu $t9, 0x0199($a3) ## 00000199 @@ -24,9 +24,9 @@ glabel func_80AD9F1C /* 00FE4 80AD9F74 A0E80199 */ sb $t0, 0x0199($a3) ## 00000199 /* 00FE8 80AD9F78 ACEA0004 */ sw $t2, 0x0004($a3) ## 00000004 /* 00FEC 80AD9F7C ACEB0190 */ sw $t3, 0x0190($a3) ## 00000190 -/* 00FF0 80AD9F80 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00FF0 80AD9F80 8FBF0014 */ lw $ra, 0x0014($sp) /* 00FF4 80AD9F84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00FF8 80AD9F88 03E00008 */ jr $ra +/* 00FF8 80AD9F88 03E00008 */ jr $ra /* 00FFC 80AD9F8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s index cb6a27042e..2491bdccdc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s @@ -1,17 +1,17 @@ glabel func_80AD9F90 /* 01000 80AD9F90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01004 80AD9F94 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01004 80AD9F94 AFBF0014 */ sw $ra, 0x0014($sp) /* 01008 80AD9F98 908E0194 */ lbu $t6, 0x0194($a0) ## 00000194 /* 0100C 80AD9F9C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01010 80AD9FA0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01014 80AD9FA4 15C10008 */ bne $t6, $at, .L80AD9FC8 +/* 01014 80AD9FA4 15C10008 */ bne $t6, $at, .L80AD9FC8 /* 01018 80AD9FA8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0101C 80AD9FAC 3C01C41E */ lui $at, 0xC41E ## $at = C41E0000 /* 01020 80AD9FB0 44812000 */ mtc1 $at, $f4 ## $f4 = -632.00 /* 01024 80AD9FB4 3C01C557 */ lui $at, 0xC557 ## $at = C5570000 /* 01028 80AD9FB8 44813000 */ mtc1 $at, $f6 ## $f6 = -3440.00 /* 0102C 80AD9FBC E4840008 */ swc1 $f4, 0x0008($a0) ## 00000008 -/* 01030 80AD9FC0 10000007 */ beq $zero, $zero, .L80AD9FE0 +/* 01030 80AD9FC0 10000007 */ beq $zero, $zero, .L80AD9FE0 /* 01034 80AD9FC4 E4860010 */ swc1 $f6, 0x0010($a0) ## 00000010 .L80AD9FC8: /* 01038 80AD9FC8 3C01443C */ lui $at, 0x443C ## $at = 443C0000 @@ -23,9 +23,9 @@ glabel func_80AD9F90 .L80AD9FE0: /* 01050 80AD9FE0 24C4014C */ addiu $a0, $a2, 0x014C ## $a0 = 0000014C /* 01054 80AD9FE4 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 -/* 01058 80AD9FE8 0C0294BE */ jal func_800A52F8 -/* 0105C 80AD9FEC AFA60018 */ sw $a2, 0x0018($sp) -/* 01060 80AD9FF0 8FA60018 */ lw $a2, 0x0018($sp) +/* 01058 80AD9FE8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 0105C 80AD9FEC AFA60018 */ sw $a2, 0x0018($sp) +/* 01060 80AD9FF0 8FA60018 */ lw $a2, 0x0018($sp) /* 01064 80AD9FF4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01068 80AD9FF8 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 0106C 80AD9FFC 90CF0199 */ lbu $t7, 0x0199($a2) ## 00000199 @@ -35,9 +35,9 @@ glabel func_80AD9F90 /* 0107C 80ADA00C A0D80199 */ sb $t8, 0x0199($a2) ## 00000199 /* 01080 80ADA010 ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 /* 01084 80ADA014 E4D00068 */ swc1 $f16, 0x0068($a2) ## 00000068 -/* 01088 80ADA018 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01088 80ADA018 8FBF0014 */ lw $ra, 0x0014($sp) /* 0108C 80ADA01C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01090 80ADA020 03E00008 */ jr $ra +/* 01090 80ADA020 03E00008 */ jr $ra /* 01094 80ADA024 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s index 51ce21be70..ca857f145e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s @@ -1,14 +1,14 @@ glabel func_80ADA028 /* 01098 80ADA028 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0109C 80ADA02C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0109C 80ADA02C AFBF0014 */ sw $ra, 0x0014($sp) /* 010A0 80ADA030 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 010A4 80ADA034 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 010A8 80ADA038 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC -/* 010AC 80ADA03C AFA70018 */ sw $a3, 0x0018($sp) +/* 010AC 80ADA03C AFA70018 */ sw $a3, 0x0018($sp) /* 010B0 80ADA040 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010B4 80ADA044 0C0294D3 */ jal func_800A534C +/* 010B4 80ADA044 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 010B8 80ADA048 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 010BC 80ADA04C 8FA70018 */ lw $a3, 0x0018($sp) +/* 010BC 80ADA04C 8FA70018 */ lw $a3, 0x0018($sp) /* 010C0 80ADA050 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 010C4 80ADA054 3C0980AE */ lui $t1, %hi(func_80ADBBF4) ## $t1 = 80AE0000 /* 010C8 80ADA058 90EF0199 */ lbu $t7, 0x0199($a3) ## 00000199 @@ -22,9 +22,9 @@ glabel func_80ADA028 /* 010E8 80ADA078 ACE80004 */ sw $t0, 0x0004($a3) ## 00000004 /* 010EC 80ADA07C ACE90190 */ sw $t1, 0x0190($a3) ## 00000190 /* 010F0 80ADA080 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 010F4 80ADA084 8FBF0014 */ lw $ra, 0x0014($sp) +/* 010F4 80ADA084 8FBF0014 */ lw $ra, 0x0014($sp) /* 010F8 80ADA088 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010FC 80ADA08C 03E00008 */ jr $ra +/* 010FC 80ADA08C 03E00008 */ jr $ra /* 01100 80ADA090 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s index 65c40aa6e9..44f6ddaec7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s @@ -1,27 +1,27 @@ glabel func_80ADA25C /* 012CC 80ADA25C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012D0 80ADA260 AFBF0014 */ sw $ra, 0x0014($sp) +/* 012D0 80ADA260 AFBF0014 */ sw $ra, 0x0014($sp) /* 012D4 80ADA264 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 012D8 80ADA268 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 012DC 80ADA26C 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC -/* 012E0 80ADA270 AFA70018 */ sw $a3, 0x0018($sp) -/* 012E4 80ADA274 0C0294BE */ jal func_800A52F8 +/* 012E0 80ADA270 AFA70018 */ sw $a3, 0x0018($sp) +/* 012E4 80ADA274 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 012E8 80ADA278 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 012EC 80ADA27C 8FA40018 */ lw $a0, 0x0018($sp) +/* 012EC 80ADA27C 8FA40018 */ lw $a0, 0x0018($sp) /* 012F0 80ADA280 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 /* 012F4 80ADA284 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 /* 012F8 80ADA288 A48F019A */ sh $t7, 0x019A($a0) ## 0000019A /* 012FC 80ADA28C A08E0198 */ sb $t6, 0x0198($a0) ## 00000198 /* 01300 80ADA290 8485019A */ lh $a1, 0x019A($a0) ## 0000019A -/* 01304 80ADA294 0C2B6490 */ jal func_80AD9240 +/* 01304 80ADA294 0C2B6490 */ jal func_80AD9240 /* 01308 80ADA298 24860008 */ addiu $a2, $a0, 0x0008 ## $a2 = 00000008 -/* 0130C 80ADA29C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0130C 80ADA29C 8FA70018 */ lw $a3, 0x0018($sp) /* 01310 80ADA2A0 3C1880AE */ lui $t8, %hi(func_80ADBEE8) ## $t8 = 80AE0000 /* 01314 80ADA2A4 2718BEE8 */ addiu $t8, $t8, %lo(func_80ADBEE8) ## $t8 = 80ADBEE8 /* 01318 80ADA2A8 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 0131C 80ADA2AC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0131C 80ADA2AC 8FBF0014 */ lw $ra, 0x0014($sp) /* 01320 80ADA2B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01324 80ADA2B4 03E00008 */ jr $ra +/* 01324 80ADA2B4 03E00008 */ jr $ra /* 01328 80ADA2B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s index d3b739d969..61cb945e46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s @@ -1,46 +1,46 @@ glabel func_80ADA2BC /* 0132C 80ADA2BC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01330 80ADA2C0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01334 80ADA2C4 AFA50024 */ sw $a1, 0x0024($sp) +/* 01330 80ADA2C0 AFB00018 */ sw $s0, 0x0018($sp) +/* 01334 80ADA2C4 AFA50024 */ sw $a1, 0x0024($sp) /* 01338 80ADA2C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0133C 80ADA2CC AFBF001C */ sw $ra, 0x001C($sp) +/* 0133C 80ADA2CC AFBF001C */ sw $ra, 0x001C($sp) /* 01340 80ADA2D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01344 80ADA2D4 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 /* 01348 80ADA2D8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0134C 80ADA2DC 0C0294D3 */ jal func_800A534C +/* 0134C 80ADA2DC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01350 80ADA2E0 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 01354 80ADA2E4 92020194 */ lbu $v0, 0x0194($s0) ## 00000194 /* 01358 80ADA2E8 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 /* 0135C 80ADA2EC 240F005A */ addiu $t7, $zero, 0x005A ## $t7 = 0000005A /* 01360 80ADA2F0 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 /* 01364 80ADA2F4 3C0880AE */ lui $t0, %hi(D_80ADD79C) ## $t0 = 80AE0000 -/* 01368 80ADA2F8 0002C840 */ sll $t9, $v0, 1 +/* 01368 80ADA2F8 0002C840 */ sll $t9, $v0, 1 /* 0136C 80ADA2FC A2000198 */ sb $zero, 0x0198($s0) ## 00000198 /* 01370 80ADA300 A20E0199 */ sb $t6, 0x0199($s0) ## 00000199 /* 01374 80ADA304 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A /* 01378 80ADA308 A2180196 */ sb $t8, 0x0196($s0) ## 00000196 -/* 0137C 80ADA30C 01194021 */ addu $t0, $t0, $t9 -/* 01380 80ADA310 8508D79C */ lh $t0, %lo(D_80ADD79C)($t0) +/* 0137C 80ADA30C 01194021 */ addu $t0, $t0, $t9 +/* 01380 80ADA310 8508D79C */ lh $t0, %lo(D_80ADD79C)($t0) /* 01384 80ADA314 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 01388 80ADA318 2405001B */ addiu $a1, $zero, 0x001B ## $a1 = 0000001B /* 0138C 80ADA31C A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -/* 01390 80ADA320 14400003 */ bne $v0, $zero, .L80ADA330 +/* 01390 80ADA320 14400003 */ bne $v0, $zero, .L80ADA330 /* 01394 80ADA324 E604000C */ swc1 $f4, 0x000C($s0) ## 0000000C /* 01398 80ADA328 0C00B2DD */ jal Flags_SetSwitch - -/* 0139C 80ADA32C 8FA40024 */ lw $a0, 0x0024($sp) + +/* 0139C 80ADA32C 8FA40024 */ lw $a0, 0x0024($sp) .L80ADA330: /* 013A0 80ADA330 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 013A4 80ADA334 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 013A8 80ADA338 24052822 */ addiu $a1, $zero, 0x2822 ## $a1 = 00002822 /* 013AC 80ADA33C 3C0980AE */ lui $t1, %hi(func_80ADBF58) ## $t1 = 80AE0000 /* 013B0 80ADA340 2529BF58 */ addiu $t1, $t1, %lo(func_80ADBF58) ## $t1 = 80ADBF58 /* 013B4 80ADA344 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 013B8 80ADA348 8FBF001C */ lw $ra, 0x001C($sp) -/* 013BC 80ADA34C 8FB00018 */ lw $s0, 0x0018($sp) +/* 013B8 80ADA348 8FBF001C */ lw $ra, 0x001C($sp) +/* 013BC 80ADA34C 8FB00018 */ lw $s0, 0x0018($sp) /* 013C0 80ADA350 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 013C4 80ADA354 03E00008 */ jr $ra +/* 013C4 80ADA354 03E00008 */ jr $ra /* 013C8 80ADA358 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s index 3a2d64e53f..aacad92c1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s @@ -1,58 +1,58 @@ glabel EnPoh_Update /* 027E4 80AE0534 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 027E8 80AE0538 AFB00028 */ sw $s0, 0x0028($sp) +/* 027E8 80AE0538 AFB00028 */ sw $s0, 0x0028($sp) /* 027EC 80AE053C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 027F0 80AE0540 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 027F4 80AE0544 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 027F8 80AE0548 AFBF002C */ sw $ra, 0x002C($sp) -/* 027FC 80AE054C AFA50034 */ sw $a1, 0x0034($sp) -/* 02800 80AE0550 00A12021 */ addu $a0, $a1, $at +/* 027F8 80AE0548 AFBF002C */ sw $ra, 0x002C($sp) +/* 027FC 80AE054C AFA50034 */ sw $a1, 0x0034($sp) +/* 02800 80AE0550 00A12021 */ addu $a0, $a1, $at /* 02804 80AE0554 0C026062 */ jal Object_IsLoaded - + /* 02808 80AE0558 82050196 */ lb $a1, 0x0196($s0) ## 00000196 -/* 0280C 80AE055C 10400042 */ beq $v0, $zero, .L80AE0668 +/* 0280C 80AE055C 10400042 */ beq $v0, $zero, .L80AE0668 /* 02810 80AE0560 3C0F80AE */ lui $t7, %hi(func_80AE0A1C) ## $t7 = 80AE0000 /* 02814 80AE0564 820E0196 */ lb $t6, 0x0196($s0) ## 00000196 /* 02818 80AE0568 25EF0A1C */ addiu $t7, $t7, %lo(func_80AE0A1C) ## $t7 = 80AE0A1C /* 0281C 80AE056C AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 /* 02820 80AE0570 A20E001E */ sb $t6, 0x001E($s0) ## 0000001E -/* 02824 80AE0574 8FA40034 */ lw $a0, 0x0034($sp) +/* 02824 80AE0574 8FA40034 */ lw $a0, 0x0034($sp) /* 02828 80AE0578 0C00B591 */ jal Actor_SetObjectDependency - + /* 0282C 80AE057C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02830 80AE0580 92180197 */ lbu $t8, 0x0197($s0) ## 00000197 -/* 02834 80AE0584 8FA40034 */ lw $a0, 0x0034($sp) +/* 02834 80AE0584 8FA40034 */ lw $a0, 0x0034($sp) /* 02838 80AE0588 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0283C 80AE058C 17000012 */ bne $t8, $zero, .L80AE05D8 +/* 0283C 80AE058C 17000012 */ bne $t8, $zero, .L80AE05D8 /* 02840 80AE0590 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 02844 80AE0594 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 02848 80AE0598 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0284C 80AE059C 2619019E */ addiu $t9, $s0, 0x019E ## $t9 = 0000019E /* 02850 80AE05A0 2608021C */ addiu $t0, $s0, 0x021C ## $t0 = 0000021C /* 02854 80AE05A4 24090015 */ addiu $t1, $zero, 0x0015 ## $t1 = 00000015 -/* 02858 80AE05A8 AFA90018 */ sw $t1, 0x0018($sp) -/* 0285C 80AE05AC AFA80014 */ sw $t0, 0x0014($sp) -/* 02860 80AE05B0 AFB90010 */ sw $t9, 0x0010($sp) +/* 02858 80AE05A8 AFA90018 */ sw $t1, 0x0018($sp) +/* 0285C 80AE05AC AFA80014 */ sw $t0, 0x0014($sp) +/* 02860 80AE05B0 AFB90010 */ sw $t9, 0x0010($sp) /* 02864 80AE05B4 24E70A60 */ addiu $a3, $a3, 0x0A60 ## $a3 = 06000A60 /* 02868 80AE05B8 24C650D0 */ addiu $a2, $a2, 0x50D0 ## $a2 = 060050D0 -/* 0286C 80AE05BC 8FA40034 */ lw $a0, 0x0034($sp) +/* 0286C 80AE05BC 8FA40034 */ lw $a0, 0x0034($sp) /* 02870 80AE05C0 0C02915F */ jal SkelAnime_Init - + /* 02874 80AE05C4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 02878 80AE05C8 3C0A80AE */ lui $t2, %hi(func_80AE0EE4) ## $t2 = 80AE0000 /* 0287C 80AE05CC 254A0EE4 */ addiu $t2, $t2, %lo(func_80AE0EE4) ## $t2 = 80AE0EE4 -/* 02880 80AE05D0 1000001F */ beq $zero, $zero, .L80AE0650 +/* 02880 80AE05D0 1000001F */ beq $zero, $zero, .L80AE0650 /* 02884 80AE05D4 AE0A0134 */ sw $t2, 0x0134($s0) ## 00000134 .L80AE05D8: /* 02888 80AE05D8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0288C 80AE05DC 260B019E */ addiu $t3, $s0, 0x019E ## $t3 = 0000019E /* 02890 80AE05E0 260C021C */ addiu $t4, $s0, 0x021C ## $t4 = 0000021C /* 02894 80AE05E4 240D000C */ addiu $t5, $zero, 0x000C ## $t5 = 0000000C -/* 02898 80AE05E8 AFAD0018 */ sw $t5, 0x0018($sp) -/* 0289C 80AE05EC AFAC0014 */ sw $t4, 0x0014($sp) -/* 028A0 80AE05F0 AFAB0010 */ sw $t3, 0x0010($sp) +/* 02898 80AE05E8 AFAD0018 */ sw $t5, 0x0018($sp) +/* 0289C 80AE05EC AFAC0014 */ sw $t4, 0x0014($sp) +/* 028A0 80AE05F0 AFAB0010 */ sw $t3, 0x0010($sp) /* 028A4 80AE05F4 24E709DC */ addiu $a3, $a3, 0x09DC ## $a3 = 060009DC -/* 028A8 80AE05F8 0C0291BE */ jal func_800A46F8 +/* 028A8 80AE05F8 0C0291BE */ jal SkelAnime_InitSV /* 028AC 80AE05FC 24C66F90 */ addiu $a2, $a2, 0x6F90 ## $a2 = 00006F90 /* 028B0 80AE0600 8E180324 */ lw $t8, 0x0324($s0) ## 00000324 /* 028B4 80AE0604 3C0E80AE */ lui $t6, %hi(func_80AE1148) ## $t6 = 80AE0000 @@ -66,7 +66,7 @@ glabel EnPoh_Update /* 028D4 80AE0624 8479002A */ lh $t9, 0x002A($v1) ## 0000002A /* 028D8 80AE0628 240C0037 */ addiu $t4, $zero, 0x0037 ## $t4 = 00000037 /* 028DC 80AE062C 240D000F */ addiu $t5, $zero, 0x000F ## $t5 = 0000000F -/* 028E0 80AE0630 00194023 */ subu $t0, $zero, $t9 +/* 028E0 80AE0630 00194023 */ subu $t0, $zero, $t9 /* 028E4 80AE0634 A468002A */ sh $t0, 0x002A($v1) ## 0000002A /* 028E8 80AE0638 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 /* 028EC 80AE063C 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 @@ -78,14 +78,14 @@ glabel EnPoh_Update /* 02900 80AE0650 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 02904 80AE0654 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 02908 80AE0658 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0290C 80AE065C 01C17824 */ and $t7, $t6, $at -/* 02910 80AE0660 0C2B78F7 */ jal func_80ADE3DC +/* 0290C 80AE065C 01C17824 */ and $t7, $t6, $at +/* 02910 80AE0660 0C2B78F7 */ jal func_80ADE3DC /* 02914 80AE0664 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 .L80AE0668: -/* 02918 80AE0668 8FBF002C */ lw $ra, 0x002C($sp) -/* 0291C 80AE066C 8FB00028 */ lw $s0, 0x0028($sp) +/* 02918 80AE0668 8FBF002C */ lw $ra, 0x002C($sp) +/* 0291C 80AE066C 8FB00028 */ lw $s0, 0x0028($sp) /* 02920 80AE0670 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02924 80AE0674 03E00008 */ jr $ra +/* 02924 80AE0674 03E00008 */ jr $ra /* 02928 80AE0678 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s index dcf8def04f..4082cbfab9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s @@ -1,26 +1,26 @@ glabel func_80ADE114 /* 003C4 80ADE114 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003C8 80ADE118 AFBF0014 */ sw $ra, 0x0014($sp) +/* 003C8 80ADE118 AFBF0014 */ sw $ra, 0x0014($sp) /* 003CC 80ADE11C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 003D0 80ADE120 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 003D4 80ADE124 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 003D8 80ADE128 8DC5000C */ lw $a1, 0x000C($t6) ## 0000000C -/* 003DC 80ADE12C 0C0294BE */ jal func_800A52F8 -/* 003E0 80ADE130 AFA60018 */ sw $a2, 0x0018($sp) +/* 003DC 80ADE12C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 003E0 80ADE130 AFA60018 */ sw $a2, 0x0018($sp) /* 003E4 80ADE134 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 /* 003E8 80ADE138 0C01DF64 */ jal Math_Rand_S16Offset - + /* 003EC 80ADE13C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 003F0 80ADE140 8FA60018 */ lw $a2, 0x0018($sp) +/* 003F0 80ADE140 8FA60018 */ lw $a2, 0x0018($sp) /* 003F4 80ADE144 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 003F8 80ADE148 3C0F80AE */ lui $t7, %hi(func_80ADEAC4) ## $t7 = 80AE0000 /* 003FC 80ADE14C 25EFEAC4 */ addiu $t7, $t7, %lo(func_80ADEAC4) ## $t7 = 80ADEAC4 /* 00400 80ADE150 A4C20198 */ sh $v0, 0x0198($a2) ## 00000198 /* 00404 80ADE154 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 /* 00408 80ADE158 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 0040C 80ADE15C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0040C 80ADE15C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00410 80ADE160 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00414 80ADE164 03E00008 */ jr $ra +/* 00414 80ADE164 03E00008 */ jr $ra /* 00418 80ADE168 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s index 3160157ff6..4f9e3ab8b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s @@ -1,24 +1,24 @@ glabel func_80ADE16C /* 0041C 80ADE16C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00420 80ADE170 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00420 80ADE170 AFBF0014 */ sw $ra, 0x0014($sp) /* 00424 80ADE174 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00428 80ADE178 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 0042C 80ADE17C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00430 80ADE180 8DC50010 */ lw $a1, 0x0010($t6) ## 00000010 -/* 00434 80ADE184 0C0294BE */ jal func_800A52F8 -/* 00438 80ADE188 AFA60018 */ sw $a2, 0x0018($sp) +/* 00434 80ADE184 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00438 80ADE188 AFA60018 */ sw $a2, 0x0018($sp) /* 0043C 80ADE18C 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F /* 00440 80ADE190 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00444 80ADE194 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00448 80ADE198 8FA60018 */ lw $a2, 0x0018($sp) +/* 00448 80ADE198 8FA60018 */ lw $a2, 0x0018($sp) /* 0044C 80ADE19C 3C0F80AE */ lui $t7, %hi(func_80ADEB80) ## $t7 = 80AE0000 /* 00450 80ADE1A0 25EFEB80 */ addiu $t7, $t7, %lo(func_80ADEB80) ## $t7 = 80ADEB80 /* 00454 80ADE1A4 A4C20198 */ sh $v0, 0x0198($a2) ## 00000198 /* 00458 80ADE1A8 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 0045C 80ADE1AC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0045C 80ADE1AC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00460 80ADE1B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00464 80ADE1B4 03E00008 */ jr $ra +/* 00464 80ADE1B4 03E00008 */ jr $ra /* 00468 80ADE1B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s index 4310ebadff..298cfbf62e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s @@ -1,13 +1,13 @@ glabel func_80ADE1BC /* 0046C 80ADE1BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00470 80ADE1C0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00470 80ADE1C0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00474 80ADE1C4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00478 80ADE1C8 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 0047C 80ADE1CC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00480 80ADE1D0 8DC50010 */ lw $a1, 0x0010($t6) ## 00000010 -/* 00484 80ADE1D4 0C0294BE */ jal func_800A52F8 -/* 00488 80ADE1D8 AFA60018 */ sw $a2, 0x0018($sp) -/* 0048C 80ADE1DC 8FA60018 */ lw $a2, 0x0018($sp) +/* 00484 80ADE1D4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00488 80ADE1D8 AFA60018 */ sw $a2, 0x0018($sp) +/* 0048C 80ADE1DC 8FA60018 */ lw $a2, 0x0018($sp) /* 00490 80ADE1E0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 00494 80ADE1E4 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 /* 00498 80ADE1E8 3C0F80AE */ lui $t7, %hi(func_80ADEC9C) ## $t7 = 80AE0000 @@ -15,9 +15,9 @@ glabel func_80ADE1BC /* 004A0 80ADE1F0 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 /* 004A4 80ADE1F4 A4C00198 */ sh $zero, 0x0198($a2) ## 00000198 /* 004A8 80ADE1F8 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 004AC 80ADE1FC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 004AC 80ADE1FC 8FBF0014 */ lw $ra, 0x0014($sp) /* 004B0 80ADE200 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004B4 80ADE204 03E00008 */ jr $ra +/* 004B4 80ADE204 03E00008 */ jr $ra /* 004B8 80ADE208 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s index 68e4fdb7f6..1d520d24e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s @@ -1,21 +1,21 @@ glabel func_80ADE20C /* 004BC 80ADE20C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 004C0 80ADE210 AFBF001C */ sw $ra, 0x001C($sp) -/* 004C4 80ADE214 AFB00018 */ sw $s0, 0x0018($sp) +/* 004C0 80ADE210 AFBF001C */ sw $ra, 0x001C($sp) +/* 004C4 80ADE214 AFB00018 */ sw $s0, 0x0018($sp) /* 004C8 80ADE218 908E0197 */ lbu $t6, 0x0197($a0) ## 00000197 /* 004CC 80ADE21C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004D0 80ADE220 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004D4 80ADE224 15C00008 */ bne $t6, $zero, .L80ADE248 +/* 004D4 80ADE224 15C00008 */ bne $t6, $zero, .L80ADE248 /* 004D8 80ADE228 24A5020C */ addiu $a1, $a1, 0x020C ## $a1 = 0600020C /* 004DC 80ADE22C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004E0 80ADE230 24A501A8 */ addiu $a1, $a1, 0x01A8 ## $a1 = 060001A8 /* 004E4 80ADE234 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004E8 80ADE238 0C0294D3 */ jal func_800A534C +/* 004E8 80ADE238 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 004EC 80ADE23C 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 004F0 80ADE240 10000004 */ beq $zero, $zero, .L80ADE254 +/* 004F0 80ADE240 10000004 */ beq $zero, $zero, .L80ADE254 /* 004F4 80ADE244 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80ADE248: -/* 004F8 80ADE248 0C0294BE */ jal func_800A52F8 +/* 004F8 80ADE248 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 004FC 80ADE24C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00500 80ADE250 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80ADE254: @@ -24,15 +24,15 @@ glabel func_80ADE20C /* 0050C 80ADE25C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00510 80ADE260 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC /* 00514 80ADE264 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00518 80ADE268 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 0051C 80ADE26C 3C1880AE */ lui $t8, %hi(func_80ADEDFC) ## $t8 = 80AE0000 /* 00520 80ADE270 2718EDFC */ addiu $t8, $t8, %lo(func_80ADEDFC) ## $t8 = 80ADEDFC /* 00524 80ADE274 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 00528 80ADE278 8FBF001C */ lw $ra, 0x001C($sp) -/* 0052C 80ADE27C 8FB00018 */ lw $s0, 0x0018($sp) +/* 00528 80ADE278 8FBF001C */ lw $ra, 0x001C($sp) +/* 0052C 80ADE27C 8FB00018 */ lw $s0, 0x0018($sp) /* 00530 80ADE280 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00534 80ADE284 03E00008 */ jr $ra +/* 00534 80ADE284 03E00008 */ jr $ra /* 00538 80ADE288 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s index 6510bc129e..825ceadcc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s @@ -1,14 +1,14 @@ glabel func_80ADE368 /* 00618 80ADE368 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0061C 80ADE36C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0061C 80ADE36C AFBF0014 */ sw $ra, 0x0014($sp) /* 00620 80ADE370 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00624 80ADE374 8CEE02A4 */ lw $t6, 0x02A4($a3) ## 000002A4 /* 00628 80ADE378 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0062C 80ADE37C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00630 80ADE380 8DC50018 */ lw $a1, 0x0018($t6) ## 00000018 -/* 00634 80ADE384 0C0294D3 */ jal func_800A534C -/* 00638 80ADE388 AFA70018 */ sw $a3, 0x0018($sp) -/* 0063C 80ADE38C 8FA70018 */ lw $a3, 0x0018($sp) +/* 00634 80ADE384 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00638 80ADE388 AFA70018 */ sw $a3, 0x0018($sp) +/* 0063C 80ADE38C 8FA70018 */ lw $a3, 0x0018($sp) /* 00640 80ADE390 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00644 80ADE394 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 00648 80ADE398 84EF00B6 */ lh $t7, 0x00B6($a3) ## 000000B6 @@ -17,16 +17,16 @@ glabel func_80ADE368 /* 00654 80ADE3A4 3C0A80AE */ lui $t2, %hi(func_80ADF894) ## $t2 = 80AE0000 /* 00658 80ADE3A8 240900C8 */ addiu $t1, $zero, 0x00C8 ## $t1 = 000000C8 /* 0065C 80ADE3AC 254AF894 */ addiu $t2, $t2, %lo(func_80ADF894) ## $t2 = 80ADF894 -/* 00660 80ADE3B0 01E1C021 */ addu $t8, $t7, $at +/* 00660 80ADE3B0 01E1C021 */ addu $t8, $t7, $at /* 00664 80ADE3B4 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 /* 00668 80ADE3B8 A4F80032 */ sh $t8, 0x0032($a3) ## 00000032 /* 0066C 80ADE3BC A0E802CD */ sb $t0, 0x02CD($a3) ## 000002CD /* 00670 80ADE3C0 A4E90198 */ sh $t1, 0x0198($a3) ## 00000198 /* 00674 80ADE3C4 ACEA0190 */ sw $t2, 0x0190($a3) ## 00000190 /* 00678 80ADE3C8 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 0067C 80ADE3CC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0067C 80ADE3CC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00680 80ADE3D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00684 80ADE3D4 03E00008 */ jr $ra +/* 00684 80ADE3D4 03E00008 */ jr $ra /* 00688 80ADE3D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s index 7467ce6c71..a87c7e8d7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s @@ -1,25 +1,25 @@ glabel func_80ADE514 /* 007C4 80ADE514 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007C8 80ADE518 AFBF0014 */ sw $ra, 0x0014($sp) +/* 007C8 80ADE518 AFBF0014 */ sw $ra, 0x0014($sp) /* 007CC 80ADE51C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 007D0 80ADE520 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 007D4 80ADE524 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 007D8 80ADE528 8DC5000C */ lw $a1, 0x000C($t6) ## 0000000C -/* 007DC 80ADE52C 0C0294BE */ jal func_800A52F8 -/* 007E0 80ADE530 AFA60018 */ sw $a2, 0x0018($sp) -/* 007E4 80ADE534 8FA60018 */ lw $a2, 0x0018($sp) +/* 007DC 80ADE52C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 007E0 80ADE530 AFA60018 */ sw $a2, 0x0018($sp) +/* 007E4 80ADE534 8FA60018 */ lw $a2, 0x0018($sp) /* 007E8 80ADE538 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 007EC 80ADE53C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 007F0 80ADE540 84CF0032 */ lh $t7, 0x0032($a2) ## 00000032 /* 007F4 80ADE544 3C1980AE */ lui $t9, %hi(func_80ADF5E0) ## $t9 = 80AE0000 /* 007F8 80ADE548 2739F5E0 */ addiu $t9, $t9, %lo(func_80ADF5E0) ## $t9 = 80ADF5E0 -/* 007FC 80ADE54C 01E1C021 */ addu $t8, $t7, $at +/* 007FC 80ADE54C 01E1C021 */ addu $t8, $t7, $at /* 00800 80ADE550 A4D8019C */ sh $t8, 0x019C($a2) ## 0000019C /* 00804 80ADE554 ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 /* 00808 80ADE558 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 0080C 80ADE55C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0080C 80ADE55C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00810 80ADE560 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00814 80ADE564 03E00008 */ jr $ra +/* 00814 80ADE564 03E00008 */ jr $ra /* 00818 80ADE568 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s index 471079e69b..0f45b74ffd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s @@ -1,31 +1,31 @@ glabel func_80AE0EE4 /* 03194 80AE0EE4 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 03198 80AE0EE8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0319C 80AE0EEC AFB10028 */ sw $s1, 0x0028($sp) -/* 031A0 80AE0EF0 AFB00024 */ sw $s0, 0x0024($sp) -/* 031A4 80AE0EF4 AFA50074 */ sw $a1, 0x0074($sp) +/* 03198 80AE0EE8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0319C 80AE0EEC AFB10028 */ sw $s1, 0x0028($sp) +/* 031A0 80AE0EF0 AFB00024 */ sw $s0, 0x0024($sp) +/* 031A4 80AE0EF4 AFA50074 */ sw $a1, 0x0074($sp) /* 031A8 80AE0EF8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 031AC 80AE0EFC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 031B0 80AE0F00 3C0680AE */ lui $a2, %hi(D_80AE1B90) ## $a2 = 80AE0000 /* 031B4 80AE0F04 24C61B90 */ addiu $a2, $a2, %lo(D_80AE1B90) ## $a2 = 80AE1B90 /* 031B8 80AE0F08 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 031BC 80AE0F0C 24070A45 */ addiu $a3, $zero, 0x0A45 ## $a3 = 00000A45 -/* 031C0 80AE0F10 0C031AB1 */ jal func_800C6AC4 +/* 031C0 80AE0F10 0C031AB1 */ jal func_800C6AC4 /* 031C4 80AE0F14 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 031C8 80AE0F18 0C2B819F */ jal func_80AE067C +/* 031C8 80AE0F18 0C2B819F */ jal func_80AE067C /* 031CC 80AE0F1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 031D0 80AE0F20 8FAF0074 */ lw $t7, 0x0074($sp) -/* 031D4 80AE0F24 0C024F46 */ jal func_80093D18 +/* 031D0 80AE0F20 8FAF0074 */ lw $t7, 0x0074($sp) +/* 031D4 80AE0F24 0C024F46 */ jal func_80093D18 /* 031D8 80AE0F28 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 031DC 80AE0F2C 8FB80074 */ lw $t8, 0x0074($sp) -/* 031E0 80AE0F30 0C024F61 */ jal func_80093D84 +/* 031DC 80AE0F2C 8FB80074 */ lw $t8, 0x0074($sp) +/* 031E0 80AE0F30 0C024F61 */ jal func_80093D84 /* 031E4 80AE0F34 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 031E8 80AE0F38 9222029D */ lbu $v0, 0x029D($s1) ## 0000029D /* 031EC 80AE0F3C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 031F0 80AE0F40 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 -/* 031F4 80AE0F44 10410003 */ beq $v0, $at, .L80AE0F54 +/* 031F4 80AE0F44 10410003 */ beq $v0, $at, .L80AE0F54 /* 031F8 80AE0F48 3C188011 */ lui $t8, 0x8011 ## $t8 = 80110000 -/* 031FC 80AE0F4C 14400026 */ bne $v0, $zero, .L80AE0FE8 +/* 031FC 80AE0F4C 14400026 */ bne $v0, $zero, .L80AE0FE8 /* 03200 80AE0F50 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 .L80AE0F54: /* 03204 80AE0F54 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -38,10 +38,10 @@ glabel func_80AE0EE4 /* 03220 80AE0F70 922A029A */ lbu $t2, 0x029A($s1) ## 0000029A /* 03224 80AE0F74 9239029C */ lbu $t9, 0x029C($s1) ## 0000029C /* 03228 80AE0F78 922C029D */ lbu $t4, 0x029D($s1) ## 0000029D -/* 0322C 80AE0F7C 000D7400 */ sll $t6, $t5, 16 -/* 03230 80AE0F80 000A5E00 */ sll $t3, $t2, 24 +/* 0322C 80AE0F7C 000D7400 */ sll $t6, $t5, 16 +/* 03230 80AE0F80 000A5E00 */ sll $t3, $t2, 24 /* 03234 80AE0F84 016E7825 */ or $t7, $t3, $t6 ## $t7 = 00000000 -/* 03238 80AE0F88 00194200 */ sll $t0, $t9, 8 +/* 03238 80AE0F88 00194200 */ sll $t0, $t9, 8 /* 0323C 80AE0F8C 01E84825 */ or $t1, $t7, $t0 ## $t1 = FB000000 /* 03240 80AE0F90 012C6825 */ or $t5, $t1, $t4 ## $t5 = FB000000 /* 03244 80AE0F94 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 @@ -56,14 +56,14 @@ glabel func_80AE0EE4 /* 03268 80AE0FB8 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 0326C 80AE0FBC 3C1980AE */ lui $t9, %hi(func_80AE0CE8) ## $t9 = 80AE0000 /* 03270 80AE0FC0 27390CE8 */ addiu $t9, $t9, %lo(func_80AE0CE8) ## $t9 = 80AE0CE8 -/* 03274 80AE0FC4 AFB90010 */ sw $t9, 0x0010($sp) -/* 03278 80AE0FC8 AFB10014 */ sw $s1, 0x0014($sp) +/* 03274 80AE0FC4 AFB90010 */ sw $t9, 0x0010($sp) +/* 03278 80AE0FC8 AFB10014 */ sw $s1, 0x0014($sp) /* 0327C 80AE0FCC 8E0F02C0 */ lw $t7, 0x02C0($s0) ## 000002C0 -/* 03280 80AE0FD0 8FA40074 */ lw $a0, 0x0074($sp) +/* 03280 80AE0FD0 8FA40074 */ lw $a0, 0x0074($sp) /* 03284 80AE0FD4 24E70BF8 */ addiu $a3, $a3, %lo(func_80AE0BF8) ## $a3 = 80AE0BF8 -/* 03288 80AE0FD8 0C0288A2 */ jal func_800A2288 -/* 0328C 80AE0FDC AFAF0018 */ sw $t7, 0x0018($sp) -/* 03290 80AE0FE0 1000001F */ beq $zero, $zero, .L80AE1060 +/* 03288 80AE0FD8 0C0288A2 */ jal SkelAnime_Draw2 +/* 0328C 80AE0FDC AFAF0018 */ sw $t7, 0x0018($sp) +/* 03290 80AE0FE0 1000001F */ beq $zero, $zero, .L80AE1060 /* 03294 80AE0FE4 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L80AE0FE8: /* 03298 80AE0FE8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 @@ -87,14 +87,14 @@ glabel func_80AE0EE4 /* 032E0 80AE1030 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 032E4 80AE1034 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 032E8 80AE1038 27390CE8 */ addiu $t9, $t9, %lo(func_80AE0CE8) ## $t9 = 80AE0CE8 -/* 032EC 80AE103C AFB90010 */ sw $t9, 0x0010($sp) -/* 032F0 80AE1040 AFB10014 */ sw $s1, 0x0014($sp) +/* 032EC 80AE103C AFB90010 */ sw $t9, 0x0010($sp) +/* 032F0 80AE1040 AFB10014 */ sw $s1, 0x0014($sp) /* 032F4 80AE1044 8E0F02D0 */ lw $t7, 0x02D0($s0) ## 000002D0 /* 032F8 80AE1048 3C0780AE */ lui $a3, %hi(func_80AE0BF8) ## $a3 = 80AE0000 /* 032FC 80AE104C 24E70BF8 */ addiu $a3, $a3, %lo(func_80AE0BF8) ## $a3 = 80AE0BF8 -/* 03300 80AE1050 8FA40074 */ lw $a0, 0x0074($sp) -/* 03304 80AE1054 0C0288A2 */ jal func_800A2288 -/* 03308 80AE1058 AFAF0018 */ sw $t7, 0x0018($sp) +/* 03300 80AE1050 8FA40074 */ lw $a0, 0x0074($sp) +/* 03304 80AE1054 0C0288A2 */ jal SkelAnime_Draw2 +/* 03308 80AE1058 AFAF0018 */ sw $t7, 0x0018($sp) /* 0330C 80AE105C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80AE1060: /* 03310 80AE1060 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -112,13 +112,13 @@ glabel func_80AE0EE4 /* 03340 80AE1090 9239029F */ lbu $t9, 0x029F($s1) ## 0000029F /* 03344 80AE1094 922B029E */ lbu $t3, 0x029E($s1) ## 0000029E /* 03348 80AE1098 922902A0 */ lbu $t1, 0x02A0($s1) ## 000002A0 -/* 0334C 80AE109C 00197C00 */ sll $t7, $t9, 16 -/* 03350 80AE10A0 000B7600 */ sll $t6, $t3, 24 +/* 0334C 80AE109C 00197C00 */ sll $t7, $t9, 16 +/* 03350 80AE10A0 000B7600 */ sll $t6, $t3, 24 /* 03354 80AE10A4 01CF4025 */ or $t0, $t6, $t7 ## $t0 = 00000000 -/* 03358 80AE10A8 00096200 */ sll $t4, $t1, 8 +/* 03358 80AE10A8 00096200 */ sll $t4, $t1, 8 /* 0335C 80AE10AC 010C6825 */ or $t5, $t0, $t4 ## $t5 = FB000000 /* 03360 80AE10B0 35AB00FF */ ori $t3, $t5, 0x00FF ## $t3 = FB0000FF -/* 03364 80AE10B4 0C03423F */ jal Matrix_Put +/* 03364 80AE10B4 0C03423F */ jal Matrix_Put /* 03368 80AE10B8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 0336C 80AE10BC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03370 80AE10C0 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 @@ -126,14 +126,14 @@ glabel func_80AE0EE4 /* 03378 80AE10C8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 0337C 80AE10CC AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 03380 80AE10D0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 03384 80AE10D4 8FAE0074 */ lw $t6, 0x0074($sp) +/* 03384 80AE10D4 8FAE0074 */ lw $t6, 0x0074($sp) /* 03388 80AE10D8 3C0580AE */ lui $a1, %hi(D_80AE1BA0) ## $a1 = 80AE0000 /* 0338C 80AE10DC 24A51BA0 */ addiu $a1, $a1, %lo(D_80AE1BA0) ## $a1 = 80AE1BA0 /* 03390 80AE10E0 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 /* 03394 80AE10E4 24060A74 */ addiu $a2, $zero, 0x0A74 ## $a2 = 00000A74 -/* 03398 80AE10E8 0C0346A2 */ jal Matrix_NewMtx -/* 0339C 80AE10EC AFA2003C */ sw $v0, 0x003C($sp) -/* 033A0 80AE10F0 8FA3003C */ lw $v1, 0x003C($sp) +/* 03398 80AE10E8 0C0346A2 */ jal Matrix_NewMtx +/* 0339C 80AE10EC AFA2003C */ sw $v0, 0x003C($sp) +/* 033A0 80AE10F0 8FA3003C */ lw $v1, 0x003C($sp) /* 033A4 80AE10F4 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 /* 033A8 80AE10F8 3C0680AE */ lui $a2, %hi(D_80AE1BB0) ## $a2 = 80AE0000 /* 033AC 80AE10FC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -147,13 +147,13 @@ glabel func_80AE0EE4 /* 033CC 80AE111C 24070A79 */ addiu $a3, $zero, 0x0A79 ## $a3 = 00000A79 /* 033D0 80AE1120 8D28001C */ lw $t0, 0x001C($t1) ## 0000001C /* 033D4 80AE1124 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 033D8 80AE1128 8FAC0074 */ lw $t4, 0x0074($sp) -/* 033DC 80AE112C 0C031AD5 */ jal func_800C6B54 +/* 033D8 80AE1128 8FAC0074 */ lw $t4, 0x0074($sp) +/* 033DC 80AE112C 0C031AD5 */ jal func_800C6B54 /* 033E0 80AE1130 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 033E4 80AE1134 8FBF002C */ lw $ra, 0x002C($sp) -/* 033E8 80AE1138 8FB00024 */ lw $s0, 0x0024($sp) -/* 033EC 80AE113C 8FB10028 */ lw $s1, 0x0028($sp) -/* 033F0 80AE1140 03E00008 */ jr $ra +/* 033E4 80AE1134 8FBF002C */ lw $ra, 0x002C($sp) +/* 033E8 80AE1138 8FB00024 */ lw $s0, 0x0024($sp) +/* 033EC 80AE113C 8FB10028 */ lw $s1, 0x0028($sp) +/* 033F0 80AE1140 03E00008 */ jr $ra /* 033F4 80AE1144 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s index 7037de46d8..a0839f9535 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s @@ -1,85 +1,85 @@ glabel func_80AE1148 /* 033F8 80AE1148 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 033FC 80AE114C AFBF002C */ sw $ra, 0x002C($sp) -/* 03400 80AE1150 AFB10028 */ sw $s1, 0x0028($sp) -/* 03404 80AE1154 AFB00024 */ sw $s0, 0x0024($sp) -/* 03408 80AE1158 AFA5009C */ sw $a1, 0x009C($sp) +/* 033FC 80AE114C AFBF002C */ sw $ra, 0x002C($sp) +/* 03400 80AE1150 AFB10028 */ sw $s1, 0x0028($sp) +/* 03404 80AE1154 AFB00024 */ sw $s0, 0x0024($sp) +/* 03408 80AE1158 AFA5009C */ sw $a1, 0x009C($sp) /* 0340C 80AE115C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 03410 80AE1160 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 03414 80AE1164 3C0680AE */ lui $a2, %hi(D_80AE1BC0) ## $a2 = 80AE0000 /* 03418 80AE1168 24C61BC0 */ addiu $a2, $a2, %lo(D_80AE1BC0) ## $a2 = 80AE1BC0 /* 0341C 80AE116C 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 03420 80AE1170 24070A86 */ addiu $a3, $zero, 0x0A86 ## $a3 = 00000A86 -/* 03424 80AE1174 0C031AB1 */ jal func_800C6AC4 +/* 03424 80AE1174 0C031AB1 */ jal func_800C6AC4 /* 03428 80AE1178 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0342C 80AE117C 0C2B819F */ jal func_80AE067C +/* 0342C 80AE117C 0C2B819F */ jal func_80AE067C /* 03430 80AE1180 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03434 80AE1184 862F001C */ lh $t7, 0x001C($s1) ## 0000001C /* 03438 80AE1188 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 0343C 80AE118C 3C1980AE */ lui $t9, %hi(D_80AE1B50) ## $t9 = 80AE0000 -/* 03440 80AE1190 15E10007 */ bne $t7, $at, .L80AE11B0 +/* 03440 80AE1190 15E10007 */ bne $t7, $at, .L80AE11B0 /* 03444 80AE1194 27391B50 */ addiu $t9, $t9, %lo(D_80AE1B50) ## $t9 = 80AE1B50 /* 03448 80AE1198 3C1880AE */ lui $t8, %hi(D_80AE1B4C) ## $t8 = 80AE0000 /* 0344C 80AE119C 27181B4C */ addiu $t8, $t8, %lo(D_80AE1B4C) ## $t8 = 80AE1B4C /* 03450 80AE11A0 3C0880AE */ lui $t0, %hi(D_80AE1B54) ## $t0 = 80AE0000 -/* 03454 80AE11A4 AFB80090 */ sw $t8, 0x0090($sp) -/* 03458 80AE11A8 10000004 */ beq $zero, $zero, .L80AE11BC +/* 03454 80AE11A4 AFB80090 */ sw $t8, 0x0090($sp) +/* 03458 80AE11A8 10000004 */ beq $zero, $zero, .L80AE11BC /* 0345C 80AE11AC 25081B54 */ addiu $t0, $t0, %lo(D_80AE1B54) ## $t0 = 80AE1B54 .L80AE11B0: /* 03460 80AE11B0 3C0880AE */ lui $t0, %hi(D_80AE1B58) ## $t0 = 80AE0000 -/* 03464 80AE11B4 AFB90090 */ sw $t9, 0x0090($sp) +/* 03464 80AE11B4 AFB90090 */ sw $t9, 0x0090($sp) /* 03468 80AE11B8 25081B58 */ addiu $t0, $t0, %lo(D_80AE1B58) ## $t0 = 80AE1B58 .L80AE11BC: /* 0346C 80AE11BC 9222029D */ lbu $v0, 0x029D($s1) ## 0000029D /* 03470 80AE11C0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 03474 80AE11C4 8FAA009C */ lw $t2, 0x009C($sp) -/* 03478 80AE11C8 50410004 */ beql $v0, $at, .L80AE11DC +/* 03474 80AE11C4 8FAA009C */ lw $t2, 0x009C($sp) +/* 03478 80AE11C8 50410004 */ beql $v0, $at, .L80AE11DC /* 0347C 80AE11CC 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 03480 80AE11D0 14400056 */ bne $v0, $zero, .L80AE132C -/* 03484 80AE11D4 8FAD009C */ lw $t5, 0x009C($sp) +/* 03480 80AE11D0 14400056 */ bne $v0, $zero, .L80AE132C +/* 03484 80AE11D4 8FAD009C */ lw $t5, 0x009C($sp) /* 03488 80AE11D8 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 .L80AE11DC: -/* 0348C 80AE11DC 0C024F46 */ jal func_80093D18 -/* 03490 80AE11E0 AFA8008C */ sw $t0, 0x008C($sp) +/* 0348C 80AE11DC 0C024F46 */ jal func_80093D18 +/* 03490 80AE11E0 AFA8008C */ sw $t0, 0x008C($sp) /* 03494 80AE11E4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03498 80AE11E8 8FA8008C */ lw $t0, 0x008C($sp) +/* 03498 80AE11E8 8FA8008C */ lw $t0, 0x008C($sp) /* 0349C 80AE11EC 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 034A0 80AE11F0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 034A4 80AE11F4 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 034A8 80AE11F8 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 /* 034AC 80AE11FC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 034B0 80AE1200 8FAD009C */ lw $t5, 0x009C($sp) +/* 034B0 80AE1200 8FAD009C */ lw $t5, 0x009C($sp) /* 034B4 80AE1204 922E029D */ lbu $t6, 0x029D($s1) ## 0000029D /* 034B8 80AE1208 9227029C */ lbu $a3, 0x029C($s1) ## 0000029C /* 034BC 80AE120C 9226029B */ lbu $a2, 0x029B($s1) ## 0000029B /* 034C0 80AE1210 9225029A */ lbu $a1, 0x029A($s1) ## 0000029A /* 034C4 80AE1214 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 034C8 80AE1218 AFA20074 */ sw $v0, 0x0074($sp) -/* 034CC 80AE121C AFA8008C */ sw $t0, 0x008C($sp) -/* 034D0 80AE1220 0C025474 */ jal func_800951D0 -/* 034D4 80AE1224 AFAE0010 */ sw $t6, 0x0010($sp) -/* 034D8 80AE1228 8FA30074 */ lw $v1, 0x0074($sp) -/* 034DC 80AE122C 8FA8008C */ lw $t0, 0x008C($sp) +/* 034C8 80AE1218 AFA20074 */ sw $v0, 0x0074($sp) +/* 034CC 80AE121C AFA8008C */ sw $t0, 0x008C($sp) +/* 034D0 80AE1220 0C025474 */ jal func_800951D0 +/* 034D4 80AE1224 AFAE0010 */ sw $t6, 0x0010($sp) +/* 034D8 80AE1228 8FA30074 */ lw $v1, 0x0074($sp) +/* 034DC 80AE122C 8FA8008C */ lw $t0, 0x008C($sp) /* 034E0 80AE1230 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 034E4 80AE1234 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 034E8 80AE1238 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 034EC 80AE123C 8FA90090 */ lw $t1, 0x0090($sp) +/* 034EC 80AE123C 8FA90090 */ lw $t1, 0x0090($sp) /* 034F0 80AE1240 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 /* 034F4 80AE1244 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 034F8 80AE1248 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 034FC 80AE124C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03500 80AE1250 8FB9009C */ lw $t9, 0x009C($sp) +/* 03500 80AE1250 8FB9009C */ lw $t9, 0x009C($sp) /* 03504 80AE1254 922A029D */ lbu $t2, 0x029D($s1) ## 0000029D /* 03508 80AE1258 91270002 */ lbu $a3, 0x0002($t1) ## 00000002 /* 0350C 80AE125C 91260001 */ lbu $a2, 0x0001($t1) ## 00000001 /* 03510 80AE1260 91250000 */ lbu $a1, 0x0000($t1) ## 00000000 /* 03514 80AE1264 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 03518 80AE1268 AFA8008C */ sw $t0, 0x008C($sp) -/* 0351C 80AE126C AFA20070 */ sw $v0, 0x0070($sp) -/* 03520 80AE1270 0C025474 */ jal func_800951D0 -/* 03524 80AE1274 AFAA0010 */ sw $t2, 0x0010($sp) -/* 03528 80AE1278 8FA30070 */ lw $v1, 0x0070($sp) -/* 0352C 80AE127C 8FA8008C */ lw $t0, 0x008C($sp) +/* 03518 80AE1268 AFA8008C */ sw $t0, 0x008C($sp) +/* 0351C 80AE126C AFA20070 */ sw $v0, 0x0070($sp) +/* 03520 80AE1270 0C025474 */ jal func_800951D0 +/* 03524 80AE1274 AFAA0010 */ sw $t2, 0x0010($sp) +/* 03528 80AE1278 8FA30070 */ lw $v1, 0x0070($sp) +/* 0352C 80AE127C 8FA8008C */ lw $t0, 0x008C($sp) /* 03530 80AE1280 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 03534 80AE1284 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 03538 80AE1288 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -87,16 +87,16 @@ glabel func_80AE1148 /* 03540 80AE1290 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 03544 80AE1294 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 03548 80AE1298 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0354C 80AE129C 8FAD009C */ lw $t5, 0x009C($sp) +/* 0354C 80AE129C 8FAD009C */ lw $t5, 0x009C($sp) /* 03550 80AE12A0 922E029D */ lbu $t6, 0x029D($s1) ## 0000029D /* 03554 80AE12A4 91070002 */ lbu $a3, 0x0002($t0) ## 00000002 /* 03558 80AE12A8 91060001 */ lbu $a2, 0x0001($t0) ## 00000001 /* 0355C 80AE12AC 91050000 */ lbu $a1, 0x0000($t0) ## 00000000 /* 03560 80AE12B0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 03564 80AE12B4 AFA2006C */ sw $v0, 0x006C($sp) -/* 03568 80AE12B8 0C025474 */ jal func_800951D0 -/* 0356C 80AE12BC AFAE0010 */ sw $t6, 0x0010($sp) -/* 03570 80AE12C0 8FA3006C */ lw $v1, 0x006C($sp) +/* 03564 80AE12B4 AFA2006C */ sw $v0, 0x006C($sp) +/* 03568 80AE12B8 0C025474 */ jal func_800951D0 +/* 0356C 80AE12BC AFAE0010 */ sw $t6, 0x0010($sp) +/* 03570 80AE12C0 8FA3006C */ lw $v1, 0x006C($sp) /* 03574 80AE12C4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 03578 80AE12C8 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 /* 0357C 80AE12CC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -114,41 +114,41 @@ glabel func_80AE1148 /* 035AC 80AE12FC 3C0B80AE */ lui $t3, %hi(func_80AE0CE8) ## $t3 = 80AE0000 /* 035B0 80AE1300 256B0CE8 */ addiu $t3, $t3, %lo(func_80AE0CE8) ## $t3 = 80AE0CE8 /* 035B4 80AE1304 254A0BF8 */ addiu $t2, $t2, %lo(func_80AE0BF8) ## $t2 = 80AE0BF8 -/* 035B8 80AE1308 AFAA0010 */ sw $t2, 0x0010($sp) -/* 035BC 80AE130C AFAB0014 */ sw $t3, 0x0014($sp) -/* 035C0 80AE1310 AFB10018 */ sw $s1, 0x0018($sp) +/* 035B8 80AE1308 AFAA0010 */ sw $t2, 0x0010($sp) +/* 035BC 80AE130C AFAB0014 */ sw $t3, 0x0014($sp) +/* 035C0 80AE1310 AFB10018 */ sw $s1, 0x0018($sp) /* 035C4 80AE1314 8E0C02C0 */ lw $t4, 0x02C0($s0) ## 000002C0 -/* 035C8 80AE1318 8FA4009C */ lw $a0, 0x009C($sp) -/* 035CC 80AE131C 0C0289CF */ jal func_800A273C -/* 035D0 80AE1320 AFAC001C */ sw $t4, 0x001C($sp) -/* 035D4 80AE1324 10000058 */ beq $zero, $zero, .L80AE1488 +/* 035C8 80AE1318 8FA4009C */ lw $a0, 0x009C($sp) +/* 035CC 80AE131C 0C0289CF */ jal SkelAnime_DrawSV2 +/* 035D0 80AE1320 AFAC001C */ sw $t4, 0x001C($sp) +/* 035D4 80AE1324 10000058 */ beq $zero, $zero, .L80AE1488 /* 035D8 80AE1328 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L80AE132C: /* 035DC 80AE132C 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 035E0 80AE1330 0C024F46 */ jal func_80093D18 -/* 035E4 80AE1334 AFA8008C */ sw $t0, 0x008C($sp) -/* 035E8 80AE1338 8FAE009C */ lw $t6, 0x009C($sp) -/* 035EC 80AE133C 0C024F61 */ jal func_80093D84 +/* 035E0 80AE1330 0C024F46 */ jal func_80093D18 +/* 035E4 80AE1334 AFA8008C */ sw $t0, 0x008C($sp) +/* 035E8 80AE1338 8FAE009C */ lw $t6, 0x009C($sp) +/* 035EC 80AE133C 0C024F61 */ jal func_80093D84 /* 035F0 80AE1340 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 /* 035F4 80AE1344 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 035F8 80AE1348 8FA8008C */ lw $t0, 0x008C($sp) +/* 035F8 80AE1348 8FA8008C */ lw $t0, 0x008C($sp) /* 035FC 80AE134C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 03600 80AE1350 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 03604 80AE1354 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 03608 80AE1358 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 0360C 80AE135C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03610 80AE1360 8FB9009C */ lw $t9, 0x009C($sp) +/* 03610 80AE1360 8FB9009C */ lw $t9, 0x009C($sp) /* 03614 80AE1364 922A029D */ lbu $t2, 0x029D($s1) ## 0000029D /* 03618 80AE1368 9227029C */ lbu $a3, 0x029C($s1) ## 0000029C /* 0361C 80AE136C 9226029B */ lbu $a2, 0x029B($s1) ## 0000029B /* 03620 80AE1370 9225029A */ lbu $a1, 0x029A($s1) ## 0000029A /* 03624 80AE1374 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 03628 80AE1378 AFA20064 */ sw $v0, 0x0064($sp) -/* 0362C 80AE137C AFA8008C */ sw $t0, 0x008C($sp) -/* 03630 80AE1380 0C025474 */ jal func_800951D0 -/* 03634 80AE1384 AFAA0010 */ sw $t2, 0x0010($sp) -/* 03638 80AE1388 8FA30064 */ lw $v1, 0x0064($sp) -/* 0363C 80AE138C 8FA8008C */ lw $t0, 0x008C($sp) +/* 03628 80AE1378 AFA20064 */ sw $v0, 0x0064($sp) +/* 0362C 80AE137C AFA8008C */ sw $t0, 0x008C($sp) +/* 03630 80AE1380 0C025474 */ jal func_800951D0 +/* 03634 80AE1384 AFAA0010 */ sw $t2, 0x0010($sp) +/* 03638 80AE1388 8FA30064 */ lw $v1, 0x0064($sp) +/* 0363C 80AE138C 8FA8008C */ lw $t0, 0x008C($sp) /* 03640 80AE1390 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 03644 80AE1394 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 03648 80AE1398 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -156,19 +156,19 @@ glabel func_80AE1148 /* 03650 80AE13A0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 03654 80AE13A4 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 03658 80AE13A8 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0365C 80AE13AC 8FAE0090 */ lw $t6, 0x0090($sp) -/* 03660 80AE13B0 8FAD009C */ lw $t5, 0x009C($sp) +/* 0365C 80AE13AC 8FAE0090 */ lw $t6, 0x0090($sp) +/* 03660 80AE13B0 8FAD009C */ lw $t5, 0x009C($sp) /* 03664 80AE13B4 922F029D */ lbu $t7, 0x029D($s1) ## 0000029D /* 03668 80AE13B8 91C50000 */ lbu $a1, 0x0000($t6) ## 00000000 /* 0366C 80AE13BC 91C60001 */ lbu $a2, 0x0001($t6) ## 00000001 /* 03670 80AE13C0 91C70002 */ lbu $a3, 0x0002($t6) ## 00000002 /* 03674 80AE13C4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 03678 80AE13C8 AFA8008C */ sw $t0, 0x008C($sp) -/* 0367C 80AE13CC AFA20060 */ sw $v0, 0x0060($sp) -/* 03680 80AE13D0 0C025474 */ jal func_800951D0 -/* 03684 80AE13D4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 03688 80AE13D8 8FA30060 */ lw $v1, 0x0060($sp) -/* 0368C 80AE13DC 8FA8008C */ lw $t0, 0x008C($sp) +/* 03678 80AE13C8 AFA8008C */ sw $t0, 0x008C($sp) +/* 0367C 80AE13CC AFA20060 */ sw $v0, 0x0060($sp) +/* 03680 80AE13D0 0C025474 */ jal func_800951D0 +/* 03684 80AE13D4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 03688 80AE13D8 8FA30060 */ lw $v1, 0x0060($sp) +/* 0368C 80AE13DC 8FA8008C */ lw $t0, 0x008C($sp) /* 03690 80AE13E0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 03694 80AE13E4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 03698 80AE13E8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -176,16 +176,16 @@ glabel func_80AE1148 /* 036A0 80AE13F0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 036A4 80AE13F4 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 036A8 80AE13F8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 036AC 80AE13FC 8FAA009C */ lw $t2, 0x009C($sp) +/* 036AC 80AE13FC 8FAA009C */ lw $t2, 0x009C($sp) /* 036B0 80AE1400 922B029D */ lbu $t3, 0x029D($s1) ## 0000029D /* 036B4 80AE1404 91070002 */ lbu $a3, 0x0002($t0) ## 00000002 /* 036B8 80AE1408 91060001 */ lbu $a2, 0x0001($t0) ## 00000001 /* 036BC 80AE140C 91050000 */ lbu $a1, 0x0000($t0) ## 00000000 /* 036C0 80AE1410 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 036C4 80AE1414 AFA2005C */ sw $v0, 0x005C($sp) -/* 036C8 80AE1418 0C025474 */ jal func_800951D0 -/* 036CC 80AE141C AFAB0010 */ sw $t3, 0x0010($sp) -/* 036D0 80AE1420 8FA3005C */ lw $v1, 0x005C($sp) +/* 036C4 80AE1414 AFA2005C */ sw $v0, 0x005C($sp) +/* 036C8 80AE1418 0C025474 */ jal func_800951D0 +/* 036CC 80AE141C AFAB0010 */ sw $t3, 0x0010($sp) +/* 036D0 80AE1420 8FA3005C */ lw $v1, 0x005C($sp) /* 036D4 80AE1424 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 036D8 80AE1428 3C0E8011 */ lui $t6, 0x8011 ## $t6 = 80110000 /* 036DC 80AE142C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -203,13 +203,13 @@ glabel func_80AE1148 /* 0370C 80AE145C 3C1880AE */ lui $t8, %hi(func_80AE0CE8) ## $t8 = 80AE0000 /* 03710 80AE1460 27180CE8 */ addiu $t8, $t8, %lo(func_80AE0CE8) ## $t8 = 80AE0CE8 /* 03714 80AE1464 25EF0BF8 */ addiu $t7, $t7, %lo(func_80AE0BF8) ## $t7 = 80AE0BF8 -/* 03718 80AE1468 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0371C 80AE146C AFB80014 */ sw $t8, 0x0014($sp) -/* 03720 80AE1470 AFB10018 */ sw $s1, 0x0018($sp) +/* 03718 80AE1468 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0371C 80AE146C AFB80014 */ sw $t8, 0x0014($sp) +/* 03720 80AE1470 AFB10018 */ sw $s1, 0x0018($sp) /* 03724 80AE1474 8E1902D0 */ lw $t9, 0x02D0($s0) ## 000002D0 -/* 03728 80AE1478 8FA4009C */ lw $a0, 0x009C($sp) -/* 0372C 80AE147C 0C0289CF */ jal func_800A273C -/* 03730 80AE1480 AFB9001C */ sw $t9, 0x001C($sp) +/* 03728 80AE1478 8FA4009C */ lw $a0, 0x009C($sp) +/* 0372C 80AE147C 0C0289CF */ jal SkelAnime_DrawSV2 +/* 03730 80AE1480 AFB9001C */ sw $t9, 0x001C($sp) /* 03734 80AE1484 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80AE1488: /* 03738 80AE1488 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -227,13 +227,13 @@ glabel func_80AE1148 /* 03768 80AE14B8 922F029E */ lbu $t7, 0x029E($s1) ## 0000029E /* 0376C 80AE14BC 922A029F */ lbu $t2, 0x029F($s1) ## 0000029F /* 03770 80AE14C0 922E02A0 */ lbu $t6, 0x02A0($s1) ## 000002A0 -/* 03774 80AE14C4 000FC600 */ sll $t8, $t7, 24 -/* 03778 80AE14C8 000A5C00 */ sll $t3, $t2, 16 +/* 03774 80AE14C4 000FC600 */ sll $t8, $t7, 24 +/* 03778 80AE14C8 000A5C00 */ sll $t3, $t2, 16 /* 0377C 80AE14CC 030B6025 */ or $t4, $t8, $t3 ## $t4 = E7000000 -/* 03780 80AE14D0 000E7A00 */ sll $t7, $t6, 8 +/* 03780 80AE14D0 000E7A00 */ sll $t7, $t6, 8 /* 03784 80AE14D4 018FC825 */ or $t9, $t4, $t7 ## $t9 = E7000000 /* 03788 80AE14D8 372A00FF */ ori $t2, $t9, 0x00FF ## $t2 = E70000FF -/* 0378C 80AE14DC 0C03423F */ jal Matrix_Put +/* 0378C 80AE14DC 0C03423F */ jal Matrix_Put /* 03790 80AE14E0 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 03794 80AE14E4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03798 80AE14E8 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 @@ -241,14 +241,14 @@ glabel func_80AE1148 /* 037A0 80AE14F0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 037A4 80AE14F4 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 037A8 80AE14F8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 037AC 80AE14FC 8FAD009C */ lw $t5, 0x009C($sp) +/* 037AC 80AE14FC 8FAD009C */ lw $t5, 0x009C($sp) /* 037B0 80AE1500 3C0580AE */ lui $a1, %hi(D_80AE1BD0) ## $a1 = 80AE0000 /* 037B4 80AE1504 24A51BD0 */ addiu $a1, $a1, %lo(D_80AE1BD0) ## $a1 = 80AE1BD0 /* 037B8 80AE1508 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 037BC 80AE150C 24060AE3 */ addiu $a2, $zero, 0x0AE3 ## $a2 = 00000AE3 -/* 037C0 80AE1510 0C0346A2 */ jal Matrix_NewMtx -/* 037C4 80AE1514 AFA2004C */ sw $v0, 0x004C($sp) -/* 037C8 80AE1518 8FA3004C */ lw $v1, 0x004C($sp) +/* 037C0 80AE1510 0C0346A2 */ jal Matrix_NewMtx +/* 037C4 80AE1514 AFA2004C */ sw $v0, 0x004C($sp) +/* 037C8 80AE1518 8FA3004C */ lw $v1, 0x004C($sp) /* 037CC 80AE151C 3C04DE00 */ lui $a0, 0xDE00 ## $a0 = DE000000 /* 037D0 80AE1520 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 /* 037D4 80AE1524 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -276,17 +276,17 @@ glabel func_80AE1148 /* 0382C 80AE157C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 03830 80AE1580 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 03834 80AE1584 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03838 80AE1588 8FA50090 */ lw $a1, 0x0090($sp) +/* 03838 80AE1588 8FA50090 */ lw $a1, 0x0090($sp) /* 0383C 80AE158C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 03840 80AE1590 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 03844 80AE1594 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 03848 80AE1598 90AF0000 */ lbu $t7, 0x0000($a1) ## 00000000 /* 0384C 80AE159C 90B80001 */ lbu $t8, 0x0001($a1) ## 00000001 /* 03850 80AE15A0 90AC0002 */ lbu $t4, 0x0002($a1) ## 00000002 -/* 03854 80AE15A4 000FCE00 */ sll $t9, $t7, 24 -/* 03858 80AE15A8 00185C00 */ sll $t3, $t8, 16 +/* 03854 80AE15A4 000FCE00 */ sll $t9, $t7, 24 +/* 03858 80AE15A8 00185C00 */ sll $t3, $t8, 16 /* 0385C 80AE15AC 032B6825 */ or $t5, $t9, $t3 ## $t5 = E7000008 -/* 03860 80AE15B0 000C7A00 */ sll $t7, $t4, 8 +/* 03860 80AE15B0 000C7A00 */ sll $t7, $t4, 8 /* 03864 80AE15B4 01AF5025 */ or $t2, $t5, $t7 ## $t2 = E7000008 /* 03868 80AE15B8 355800FF */ ori $t8, $t2, 0x00FF ## $t8 = E70000FF /* 0386C 80AE15BC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 @@ -297,14 +297,14 @@ glabel func_80AE1148 /* 03880 80AE15D0 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 03884 80AE15D4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 03888 80AE15D8 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 0388C 80AE15DC 8FAE009C */ lw $t6, 0x009C($sp) +/* 0388C 80AE15DC 8FAE009C */ lw $t6, 0x009C($sp) /* 03890 80AE15E0 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 -/* 03894 80AE15E4 0C031AD5 */ jal func_800C6B54 +/* 03894 80AE15E4 0C031AD5 */ jal func_800C6B54 /* 03898 80AE15E8 8DC50000 */ lw $a1, 0x0000($t6) ## FB000000 -/* 0389C 80AE15EC 8FBF002C */ lw $ra, 0x002C($sp) -/* 038A0 80AE15F0 8FB00024 */ lw $s0, 0x0024($sp) -/* 038A4 80AE15F4 8FB10028 */ lw $s1, 0x0028($sp) -/* 038A8 80AE15F8 03E00008 */ jr $ra +/* 0389C 80AE15EC 8FBF002C */ lw $ra, 0x002C($sp) +/* 038A0 80AE15F0 8FB00024 */ lw $s0, 0x0024($sp) +/* 038A4 80AE15F4 8FB10028 */ lw $s1, 0x0028($sp) +/* 038A8 80AE15F8 03E00008 */ jr $ra /* 038AC 80AE15FC 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s index 20672aefad..8a5d18026e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s @@ -1,9 +1,9 @@ glabel EnRd_Draw /* 02268 80AE4668 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 0226C 80AE466C AFBF0034 */ sw $ra, 0x0034($sp) -/* 02270 80AE4670 AFB20030 */ sw $s2, 0x0030($sp) -/* 02274 80AE4674 AFB1002C */ sw $s1, 0x002C($sp) -/* 02278 80AE4678 AFB00028 */ sw $s0, 0x0028($sp) +/* 0226C 80AE466C AFBF0034 */ sw $ra, 0x0034($sp) +/* 02270 80AE4670 AFB20030 */ sw $s2, 0x0030($sp) +/* 02274 80AE4674 AFB1002C */ sw $s1, 0x002C($sp) +/* 02278 80AE4678 AFB00028 */ sw $s0, 0x0028($sp) /* 0227C 80AE467C 8C980024 */ lw $t8, 0x0024($a0) ## 00000024 /* 02280 80AE4680 27AE0064 */ addiu $t6, $sp, 0x0064 ## $t6 = FFFFFFEC /* 02284 80AE4684 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 @@ -18,13 +18,13 @@ glabel EnRd_Draw /* 022A8 80AE46A8 ADD80008 */ sw $t8, 0x0008($t6) ## FFFFFFF4 /* 022AC 80AE46AC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 022B0 80AE46B0 2407068F */ addiu $a3, $zero, 0x068F ## $a3 = 0000068F -/* 022B4 80AE46B4 0C031AB1 */ jal func_800C6AC4 +/* 022B4 80AE46B4 0C031AB1 */ jal func_800C6AC4 /* 022B8 80AE46B8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 022BC 80AE46BC 86190314 */ lh $t9, 0x0314($s0) ## 00000314 /* 022C0 80AE46C0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 022C4 80AE46C4 17210044 */ bne $t9, $at, .L80AE47D8 +/* 022C4 80AE46C4 17210044 */ bne $t9, $at, .L80AE47D8 /* 022C8 80AE46C8 00000000 */ nop -/* 022CC 80AE46CC 0C024F46 */ jal func_80093D18 +/* 022CC 80AE46CC 0C024F46 */ jal func_80093D18 /* 022D0 80AE46D0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 022D4 80AE46D4 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 022D8 80AE46D8 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 @@ -50,22 +50,22 @@ glabel EnRd_Draw /* 02328 80AE4728 3C1880AE */ lui $t8, %hi(func_80AE4520) ## $t8 = 80AE0000 /* 0232C 80AE472C 27184520 */ addiu $t8, $t8, %lo(func_80AE4520) ## $t8 = 80AE4520 /* 02330 80AE4730 25EF44C4 */ addiu $t7, $t7, %lo(func_80AE44C4) ## $t7 = 80AE44C4 -/* 02334 80AE4734 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02338 80AE4738 AFB80014 */ sw $t8, 0x0014($sp) -/* 0233C 80AE473C AFB00018 */ sw $s0, 0x0018($sp) +/* 02334 80AE4734 AFAF0010 */ sw $t7, 0x0010($sp) +/* 02338 80AE4738 AFB80014 */ sw $t8, 0x0014($sp) +/* 0233C 80AE473C AFB00018 */ sw $s0, 0x0018($sp) /* 02340 80AE4740 8E3902C0 */ lw $t9, 0x02C0($s1) ## 000002C0 /* 02344 80AE4744 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02348 80AE4748 0C0289CF */ jal func_800A273C -/* 0234C 80AE474C AFB9001C */ sw $t9, 0x001C($sp) +/* 02348 80AE4748 0C0289CF */ jal SkelAnime_DrawSV2 +/* 0234C 80AE474C AFB9001C */ sw $t9, 0x001C($sp) /* 02350 80AE4750 3C0580AE */ lui $a1, %hi(D_80AE4958) ## $a1 = 80AE0000 /* 02354 80AE4754 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 /* 02358 80AE4758 24A54958 */ addiu $a1, $a1, %lo(D_80AE4958) ## $a1 = 80AE4958 /* 0235C 80AE475C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFEC /* 02360 80AE4760 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 02364 80AE4764 0C00CF0C */ jal func_80033C30 +/* 02364 80AE4764 0C00CF0C */ jal func_80033C30 /* 02368 80AE4768 02403825 */ or $a3, $s2, $zero ## $a3 = 00000000 /* 0236C 80AE476C 9208031A */ lbu $t0, 0x031A($s0) ## 0000031A -/* 02370 80AE4770 1100003F */ beq $t0, $zero, .L80AE4870 +/* 02370 80AE4770 1100003F */ beq $t0, $zero, .L80AE4870 /* 02374 80AE4774 00000000 */ nop /* 02378 80AE4778 920B031A */ lbu $t3, 0x031A($s0) ## 0000031A /* 0237C 80AE477C 92090114 */ lbu $t1, 0x0114($s0) ## 00000114 @@ -75,24 +75,24 @@ glabel EnRd_Draw /* 0238C 80AE478C 306D0003 */ andi $t5, $v1, 0x0003 ## $t5 = 00000003 /* 02390 80AE4790 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 /* 02394 80AE4794 A20A0114 */ sb $t2, 0x0114($s0) ## 00000114 -/* 02398 80AE4798 15A00035 */ bne $t5, $zero, .L80AE4870 +/* 02398 80AE4798 15A00035 */ bne $t5, $zero, .L80AE4870 /* 0239C 80AE479C A20C031A */ sb $t4, 0x031A($s0) ## 0000031A -/* 023A0 80AE47A0 00031083 */ sra $v0, $v1, 2 -/* 023A4 80AE47A4 00027080 */ sll $t6, $v0, 2 -/* 023A8 80AE47A8 01C27023 */ subu $t6, $t6, $v0 -/* 023AC 80AE47AC 000E7040 */ sll $t6, $t6, 1 -/* 023B0 80AE47B0 020E3021 */ addu $a2, $s0, $t6 +/* 023A0 80AE47A0 00031083 */ sra $v0, $v1, 2 +/* 023A4 80AE47A4 00027080 */ sll $t6, $v0, 2 +/* 023A8 80AE47A8 01C27023 */ subu $t6, $t6, $v0 +/* 023AC 80AE47AC 000E7040 */ sll $t6, $t6, 1 +/* 023B0 80AE47B0 020E3021 */ addu $a2, $s0, $t6 /* 023B4 80AE47B4 24C6014C */ addiu $a2, $a2, 0x014C ## $a2 = 0000014C -/* 023B8 80AE47B8 AFA20018 */ sw $v0, 0x0018($sp) +/* 023B8 80AE47B8 AFA20018 */ sw $v0, 0x0018($sp) /* 023BC 80AE47BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 023C0 80AE47C0 2407004B */ addiu $a3, $zero, 0x004B ## $a3 = 0000004B -/* 023C4 80AE47C4 AFA00010 */ sw $zero, 0x0010($sp) -/* 023C8 80AE47C8 0C00A953 */ jal func_8002A54C -/* 023CC 80AE47CC AFA00014 */ sw $zero, 0x0014($sp) -/* 023D0 80AE47D0 10000027 */ beq $zero, $zero, .L80AE4870 +/* 023C4 80AE47C4 AFA00010 */ sw $zero, 0x0010($sp) +/* 023C8 80AE47C8 0C00A953 */ jal func_8002A54C +/* 023CC 80AE47CC AFA00014 */ sw $zero, 0x0014($sp) +/* 023D0 80AE47D0 10000027 */ beq $zero, $zero, .L80AE4870 /* 023D4 80AE47D4 00000000 */ nop .L80AE47D8: -/* 023D8 80AE47D8 0C024F61 */ jal func_80093D84 +/* 023D8 80AE47D8 0C024F61 */ jal func_80093D84 /* 023DC 80AE47DC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 023E0 80AE47E0 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 /* 023E4 80AE47E4 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 @@ -116,31 +116,31 @@ glabel EnRd_Draw /* 0242C 80AE482C 8E0601A8 */ lw $a2, 0x01A8($s0) ## 000001A8 /* 02430 80AE4830 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C /* 02434 80AE4834 258C44C4 */ addiu $t4, $t4, %lo(func_80AE44C4) ## $t4 = 80AE44C4 -/* 02438 80AE4838 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0243C 80AE483C AFB00018 */ sw $s0, 0x0018($sp) -/* 02440 80AE4840 AFA00014 */ sw $zero, 0x0014($sp) +/* 02438 80AE4838 AFAC0010 */ sw $t4, 0x0010($sp) +/* 0243C 80AE483C AFB00018 */ sw $s0, 0x0018($sp) +/* 02440 80AE4840 AFA00014 */ sw $zero, 0x0014($sp) /* 02444 80AE4844 8E2D02D0 */ lw $t5, 0x02D0($s1) ## 000002D0 /* 02448 80AE4848 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0244C 80AE484C 0C0289CF */ jal func_800A273C -/* 02450 80AE4850 AFAD001C */ sw $t5, 0x001C($sp) +/* 0244C 80AE484C 0C0289CF */ jal SkelAnime_DrawSV2 +/* 02450 80AE4850 AFAD001C */ sw $t5, 0x001C($sp) /* 02454 80AE4854 AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0 /* 02458 80AE4858 3C0580AE */ lui $a1, %hi(D_80AE4958) ## $a1 = 80AE0000 /* 0245C 80AE485C 24A54958 */ addiu $a1, $a1, %lo(D_80AE4958) ## $a1 = 80AE4958 /* 02460 80AE4860 92060315 */ lbu $a2, 0x0315($s0) ## 00000315 /* 02464 80AE4864 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFEC -/* 02468 80AE4868 0C00CF0C */ jal func_80033C30 +/* 02468 80AE4868 0C00CF0C */ jal func_80033C30 /* 0246C 80AE486C 02403825 */ or $a3, $s2, $zero ## $a3 = 00000000 .L80AE4870: /* 02470 80AE4870 3C0680AE */ lui $a2, %hi(D_80AE4980) ## $a2 = 80AE0000 /* 02474 80AE4874 24C64980 */ addiu $a2, $a2, %lo(D_80AE4980) ## $a2 = 80AE4980 /* 02478 80AE4878 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 0247C 80AE487C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 02480 80AE4880 0C031AD5 */ jal func_800C6B54 +/* 02480 80AE4880 0C031AD5 */ jal func_800C6B54 /* 02484 80AE4884 240706C7 */ addiu $a3, $zero, 0x06C7 ## $a3 = 000006C7 -/* 02488 80AE4888 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0248C 80AE488C 8FB00028 */ lw $s0, 0x0028($sp) -/* 02490 80AE4890 8FB1002C */ lw $s1, 0x002C($sp) -/* 02494 80AE4894 8FB20030 */ lw $s2, 0x0030($sp) -/* 02498 80AE4898 03E00008 */ jr $ra +/* 02488 80AE4888 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0248C 80AE488C 8FB00028 */ lw $s0, 0x0028($sp) +/* 02490 80AE4890 8FB1002C */ lw $s1, 0x002C($sp) +/* 02494 80AE4894 8FB20030 */ lw $s2, 0x0030($sp) +/* 02498 80AE4898 03E00008 */ jr $ra /* 0249C 80AE489C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s index 1bab2dbf39..f53348ce62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s @@ -1,23 +1,23 @@ glabel EnRd_Init /* 00008 80AE2408 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0000C 80AE240C AFA50044 */ sw $a1, 0x0044($sp) -/* 00010 80AE2410 AFBF002C */ sw $ra, 0x002C($sp) -/* 00014 80AE2414 AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 80AE240C AFA50044 */ sw $a1, 0x0044($sp) +/* 00010 80AE2410 AFBF002C */ sw $ra, 0x002C($sp) +/* 00014 80AE2414 AFB00028 */ sw $s0, 0x0028($sp) /* 00018 80AE2418 3C0580AE */ lui $a1, %hi(D_80AE490C) ## $a1 = 80AE0000 /* 0001C 80AE241C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00020 80AE2420 0C01E037 */ jal Actor_ProcessInitChain - + /* 00024 80AE2424 24A5490C */ addiu $a1, $a1, %lo(D_80AE490C) ## $a1 = 80AE490C /* 00028 80AE2428 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0002C 80AE242C 3C0E80AE */ lui $t6, %hi(D_80AE48EC) ## $t6 = 80AE0000 /* 00030 80AE2430 25CE48EC */ addiu $t6, $t6, %lo(D_80AE48EC) ## $t6 = 80AE48EC -/* 00034 80AE2434 44050000 */ mfc1 $a1, $f0 -/* 00038 80AE2438 44070000 */ mfc1 $a3, $f0 +/* 00034 80AE2434 44050000 */ mfc1 $a1, $f0 +/* 00038 80AE2438 44070000 */ mfc1 $a3, $f0 /* 0003C 80AE243C A200001F */ sb $zero, 0x001F($s0) ## 0000001F /* 00040 80AE2440 AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 /* 00044 80AE2444 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00048 80AE2448 0C00AC78 */ jal ActorShape_Init - + /* 0004C 80AE244C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00050 80AE2450 8E180028 */ lw $t8, 0x0028($s0) ## 00000028 /* 00054 80AE2454 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -29,7 +29,7 @@ glabel EnRd_Init /* 0006C 80AE246C 860F030E */ lh $t7, 0x030E($s0) ## 0000030E /* 00070 80AE2470 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 00074 80AE2474 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00078 80AE2478 46062200 */ add.s $f8, $f4, $f6 +/* 00078 80AE2478 46062200 */ add.s $f8, $f4, $f6 /* 0007C 80AE247C AE190038 */ sw $t9, 0x0038($s0) ## 00000038 /* 00080 80AE2480 8E19002C */ lw $t9, 0x002C($s0) ## 0000002C /* 00084 80AE2484 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF @@ -38,7 +38,7 @@ glabel EnRd_Init /* 00090 80AE2490 240800FE */ addiu $t0, $zero, 0x00FE ## $t0 = 000000FE /* 00094 80AE2494 24090008 */ addiu $t1, $zero, 0x0008 ## $t1 = 00000008 /* 00098 80AE2498 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 000000FF -/* 0009C 80AE249C 000D7203 */ sra $t6, $t5, 8 +/* 0009C 80AE249C 000D7203 */ sra $t6, $t5, 8 /* 000A0 80AE24A0 304F0080 */ andi $t7, $v0, 0x0080 ## $t7 = 00000000 /* 000A4 80AE24A4 E608003C */ swc1 $f8, 0x003C($s0) ## 0000003C /* 000A8 80AE24A8 A20800AE */ sb $t0, 0x00AE($s0) ## 000000AE @@ -46,20 +46,20 @@ glabel EnRd_Init /* 000B0 80AE24B0 A60B0314 */ sh $t3, 0x0314($s0) ## 00000314 /* 000B4 80AE24B4 A20A031D */ sb $t2, 0x031D($s0) ## 0000031D /* 000B8 80AE24B8 A60E0312 */ sh $t6, 0x0312($s0) ## 00000312 -/* 000BC 80AE24BC 11E00004 */ beq $t7, $zero, .L80AE24D0 +/* 000BC 80AE24BC 11E00004 */ beq $t7, $zero, .L80AE24D0 /* 000C0 80AE24C0 AE190040 */ sw $t9, 0x0040($s0) ## 00000040 /* 000C4 80AE24C4 3458FF00 */ ori $t8, $v0, 0xFF00 ## $t8 = 0000FF00 -/* 000C8 80AE24C8 10000003 */ beq $zero, $zero, .L80AE24D8 +/* 000C8 80AE24C8 10000003 */ beq $zero, $zero, .L80AE24D8 /* 000CC 80AE24CC A618001C */ sh $t8, 0x001C($s0) ## 0000001C .L80AE24D0: /* 000D0 80AE24D0 305900FF */ andi $t9, $v0, 0x00FF ## $t9 = 00000000 /* 000D4 80AE24D4 A619001C */ sh $t9, 0x001C($s0) ## 0000001C .L80AE24D8: /* 000D8 80AE24D8 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 000DC 80AE24DC 8FA40044 */ lw $a0, 0x0044($sp) +/* 000DC 80AE24DC 8FA40044 */ lw $a0, 0x0044($sp) /* 000E0 80AE24E0 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 -/* 000E4 80AE24E4 2901FFFF */ slti $at, $t0, 0xFFFF -/* 000E8 80AE24E8 14200012 */ bne $at, $zero, .L80AE2534 +/* 000E4 80AE24E4 2901FFFF */ slti $at, $t0, 0xFFFF +/* 000E8 80AE24E8 14200012 */ bne $at, $zero, .L80AE2534 /* 000EC 80AE24EC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 000F0 80AE24F0 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 /* 000F4 80AE24F4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -67,71 +67,71 @@ glabel EnRd_Init /* 000FC 80AE24FC 260901CC */ addiu $t1, $s0, 0x01CC ## $t1 = 000001CC /* 00100 80AE2500 260A0268 */ addiu $t2, $s0, 0x0268 ## $t2 = 00000268 /* 00104 80AE2504 240B001A */ addiu $t3, $zero, 0x001A ## $t3 = 0000001A -/* 00108 80AE2508 AFAB0018 */ sw $t3, 0x0018($sp) -/* 0010C 80AE250C AFAA0014 */ sw $t2, 0x0014($sp) -/* 00110 80AE2510 AFA90010 */ sw $t1, 0x0010($sp) +/* 00108 80AE2508 AFAB0018 */ sw $t3, 0x0018($sp) +/* 0010C 80AE250C AFAA0014 */ sw $t2, 0x0014($sp) +/* 00110 80AE2510 AFA90010 */ sw $t1, 0x0010($sp) /* 00114 80AE2514 24E787D0 */ addiu $a3, $a3, 0x87D0 ## $a3 = 060087D0 /* 00118 80AE2518 24C6E778 */ addiu $a2, $a2, 0xE778 ## $a2 = 0600E778 -/* 0011C 80AE251C AFA50038 */ sw $a1, 0x0038($sp) -/* 00120 80AE2520 0C0291BE */ jal func_800A46F8 -/* 00124 80AE2524 8FA40044 */ lw $a0, 0x0044($sp) +/* 0011C 80AE251C AFA50038 */ sw $a1, 0x0038($sp) +/* 00120 80AE2520 0C0291BE */ jal SkelAnime_InitSV +/* 00124 80AE2524 8FA40044 */ lw $a0, 0x0044($sp) /* 00128 80AE2528 240C002A */ addiu $t4, $zero, 0x002A ## $t4 = 0000002A -/* 0012C 80AE252C 1000000E */ beq $zero, $zero, .L80AE2568 +/* 0012C 80AE252C 1000000E */ beq $zero, $zero, .L80AE2568 /* 00130 80AE2530 A20C0117 */ sb $t4, 0x0117($s0) ## 00000117 .L80AE2534: /* 00134 80AE2534 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 00138 80AE2538 260D01CC */ addiu $t5, $s0, 0x01CC ## $t5 = 000001CC /* 0013C 80AE253C 260E0268 */ addiu $t6, $s0, 0x0268 ## $t6 = 00000268 /* 00140 80AE2540 240F001A */ addiu $t7, $zero, 0x001A ## $t7 = 0000001A -/* 00144 80AE2544 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00148 80AE2548 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0014C 80AE254C AFAD0010 */ sw $t5, 0x0010($sp) +/* 00144 80AE2544 AFAF0018 */ sw $t7, 0x0018($sp) +/* 00148 80AE2548 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0014C 80AE254C AFAD0010 */ sw $t5, 0x0010($sp) /* 00150 80AE2550 24E787D0 */ addiu $a3, $a3, 0x87D0 ## $a3 = 060087D0 /* 00154 80AE2554 24C63DD8 */ addiu $a2, $a2, 0x3DD8 ## $a2 = 00003DD8 -/* 00158 80AE2558 0C0291BE */ jal func_800A46F8 -/* 0015C 80AE255C AFA50038 */ sw $a1, 0x0038($sp) +/* 00158 80AE2558 0C0291BE */ jal SkelAnime_InitSV +/* 0015C 80AE255C AFA50038 */ sw $a1, 0x0038($sp) /* 00160 80AE2560 2418002D */ addiu $t8, $zero, 0x002D ## $t8 = 0000002D /* 00164 80AE2564 A2180117 */ sb $t8, 0x0117($s0) ## 00000117 .L80AE2568: /* 00168 80AE2568 26050320 */ addiu $a1, $s0, 0x0320 ## $a1 = 00000320 -/* 0016C 80AE256C AFA50034 */ sw $a1, 0x0034($sp) +/* 0016C 80AE256C AFA50034 */ sw $a1, 0x0034($sp) /* 00170 80AE2570 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00174 80AE2574 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00174 80AE2574 8FA40044 */ lw $a0, 0x0044($sp) /* 00178 80AE2578 3C0780AE */ lui $a3, %hi(D_80AE48C0) ## $a3 = 80AE0000 -/* 0017C 80AE257C 8FA50034 */ lw $a1, 0x0034($sp) +/* 0017C 80AE257C 8FA50034 */ lw $a1, 0x0034($sp) /* 00180 80AE2580 24E748C0 */ addiu $a3, $a3, %lo(D_80AE48C0) ## $a3 = 80AE48C0 -/* 00184 80AE2584 8FA40044 */ lw $a0, 0x0044($sp) +/* 00184 80AE2584 8FA40044 */ lw $a0, 0x0044($sp) /* 00188 80AE2588 0C01712B */ jal ActorCollider_InitCylinder - + /* 0018C 80AE258C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00190 80AE2590 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 00194 80AE2594 2B21FFFE */ slti $at, $t9, 0xFFFE -/* 00198 80AE2598 14200005 */ bne $at, $zero, .L80AE25B0 +/* 00194 80AE2594 2B21FFFE */ slti $at, $t9, 0xFFFE +/* 00198 80AE2598 14200005 */ bne $at, $zero, .L80AE25B0 /* 0019C 80AE259C 00000000 */ nop -/* 001A0 80AE25A0 0C2B89A7 */ jal func_80AE269C +/* 001A0 80AE25A0 0C2B89A7 */ jal func_80AE269C /* 001A4 80AE25A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001A8 80AE25A8 10000003 */ beq $zero, $zero, .L80AE25B8 +/* 001A8 80AE25A8 10000003 */ beq $zero, $zero, .L80AE25B8 /* 001AC 80AE25AC 00000000 */ nop .L80AE25B0: -/* 001B0 80AE25B0 0C2B8A5C */ jal func_80AE2970 +/* 001B0 80AE25B0 0C2B8A5C */ jal func_80AE2970 /* 001B4 80AE25B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AE25B8: /* 001B8 80AE25B8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 001BC 80AE25BC 8FA40038 */ lw $a0, 0x0038($sp) + +/* 001BC 80AE25BC 8FA40038 */ lw $a0, 0x0038($sp) /* 001C0 80AE25C0 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 001C4 80AE25C4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 001C8 80AE25C8 55010005 */ bnel $t0, $at, .L80AE25E0 -/* 001CC 80AE25CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 001C8 80AE25C8 55010005 */ bnel $t0, $at, .L80AE25E0 +/* 001CC 80AE25CC 8FBF002C */ lw $ra, 0x002C($sp) /* 001D0 80AE25D0 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 /* 001D4 80AE25D4 352A0080 */ ori $t2, $t1, 0x0080 ## $t2 = 00000080 /* 001D8 80AE25D8 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 001DC 80AE25DC 8FBF002C */ lw $ra, 0x002C($sp) +/* 001DC 80AE25DC 8FBF002C */ lw $ra, 0x002C($sp) .L80AE25E0: -/* 001E0 80AE25E0 8FB00028 */ lw $s0, 0x0028($sp) +/* 001E0 80AE25E0 8FB00028 */ lw $s0, 0x0028($sp) /* 001E4 80AE25E4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 001E8 80AE25E8 03E00008 */ jr $ra +/* 001E8 80AE25E8 03E00008 */ jr $ra /* 001EC 80AE25EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s index 71109f2802..7391a0f501 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s @@ -1,22 +1,22 @@ glabel func_80AE269C /* 0029C 80AE269C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 002A0 80AE26A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 002A4 80AE26A4 AFB00018 */ sw $s0, 0x0018($sp) +/* 002A0 80AE26A0 AFBF001C */ sw $ra, 0x001C($sp) +/* 002A4 80AE26A4 AFB00018 */ sw $s0, 0x0018($sp) /* 002A8 80AE26A8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 002AC 80AE26AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 002B0 80AE26B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002B4 80AE26B4 11C10008 */ beq $t6, $at, .L80AE26D8 +/* 002B4 80AE26B4 11C10008 */ beq $t6, $at, .L80AE26D8 /* 002B8 80AE26B8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002BC 80AE26BC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 002C0 80AE26C0 24A587D0 */ addiu $a1, $a1, 0x87D0 ## $a1 = 060087D0 /* 002C4 80AE26C4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 002C8 80AE26C8 0C0294D3 */ jal func_800A534C +/* 002C8 80AE26C8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 002CC 80AE26CC 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 002D0 80AE26D0 10000004 */ beq $zero, $zero, .L80AE26E4 +/* 002D0 80AE26D0 10000004 */ beq $zero, $zero, .L80AE26E4 /* 002D4 80AE26D4 00000000 */ nop .L80AE26D8: /* 002D8 80AE26D8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 002DC 80AE26DC 0C0294BE */ jal func_800A52F8 +/* 002DC 80AE26DC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 002E0 80AE26E0 24A55D98 */ addiu $a1, $a1, 0x5D98 ## $a1 = 00005D98 .L80AE26E4: /* 002E4 80AE26E4 0C03F66B */ jal Math_Rand_ZeroOne @@ -26,23 +26,23 @@ glabel func_80AE269C /* 002F0 80AE26F0 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 002F4 80AE26F4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 002F8 80AE26F8 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 002FC 80AE26FC 46040182 */ mul.s $f6, $f0, $f4 +/* 002FC 80AE26FC 46040182 */ mul.s $f6, $f0, $f4 /* 00300 80AE2700 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00304 80AE2704 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 00308 80AE2708 3C0580AE */ lui $a1, %hi(func_80AE2744) ## $a1 = 80AE0000 /* 0030C 80AE270C 24A52744 */ addiu $a1, $a1, %lo(func_80AE2744) ## $a1 = 80AE2744 /* 00310 80AE2710 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00314 80AE2714 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 00318 80AE2718 46083280 */ add.s $f10, $f6, $f8 +/* 00318 80AE2718 46083280 */ add.s $f10, $f6, $f8 /* 0031C 80AE271C A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 00320 80AE2720 4600540D */ trunc.w.s $f16, $f10 -/* 00324 80AE2724 44188000 */ mfc1 $t8, $f16 -/* 00328 80AE2728 0C2B8900 */ jal func_80AE2400 +/* 00320 80AE2720 4600540D */ trunc.w.s $f16, $f10 +/* 00324 80AE2724 44188000 */ mfc1 $t8, $f16 +/* 00328 80AE2728 0C2B8900 */ jal func_80AE2400 /* 0032C 80AE272C A618030C */ sh $t8, 0x030C($s0) ## 0000030C -/* 00330 80AE2730 8FBF001C */ lw $ra, 0x001C($sp) -/* 00334 80AE2734 8FB00018 */ lw $s0, 0x0018($sp) +/* 00330 80AE2730 8FBF001C */ lw $ra, 0x001C($sp) +/* 00334 80AE2734 8FB00018 */ lw $s0, 0x0018($sp) /* 00338 80AE2738 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0033C 80AE273C 03E00008 */ jr $ra +/* 0033C 80AE273C 03E00008 */ jr $ra /* 00340 80AE2740 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s index d72021e0df..95e0cf8fe0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s @@ -1,65 +1,65 @@ glabel func_80AE2744 /* 00344 80AE2744 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00348 80AE2748 AFB00020 */ sw $s0, 0x0020($sp) +/* 00348 80AE2748 AFB00020 */ sw $s0, 0x0020($sp) /* 0034C 80AE274C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00350 80AE2750 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00350 80AE2750 AFBF0024 */ sw $ra, 0x0024($sp) /* 00354 80AE2754 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00358 80AE2758 AFA50034 */ sw $a1, 0x0034($sp) +/* 00358 80AE2758 AFA50034 */ sw $a1, 0x0034($sp) /* 0035C 80AE275C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00360 80AE2760 AFA4002C */ sw $a0, 0x002C($sp) + +/* 00360 80AE2760 AFA4002C */ sw $a0, 0x002C($sp) /* 00364 80AE2764 2604030E */ addiu $a0, $s0, 0x030E ## $a0 = 0000030E /* 00368 80AE2768 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0036C 80AE276C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00370 80AE2770 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 00374 80AE2774 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00378 80AE2778 AFA00010 */ sw $zero, 0x0010($sp) + +/* 00378 80AE2778 AFA00010 */ sw $zero, 0x0010($sp) /* 0037C 80AE277C 26040310 */ addiu $a0, $s0, 0x0310 ## $a0 = 00000310 /* 00380 80AE2780 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00384 80AE2784 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00388 80AE2788 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 0038C 80AE278C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00390 80AE2790 AFA00010 */ sw $zero, 0x0010($sp) + +/* 00390 80AE2790 AFA00010 */ sw $zero, 0x0010($sp) /* 00394 80AE2794 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00398 80AE2798 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0039C 80AE279C 55C1001C */ bnel $t6, $at, .L80AE2810 +/* 0039C 80AE279C 55C1001C */ bnel $t6, $at, .L80AE2810 /* 003A0 80AE27A0 860F030C */ lh $t7, 0x030C($s0) ## 0000030C /* 003A4 80AE27A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 003A8 80AE27A8 C60601A0 */ lwc1 $f6, 0x01A0($s0) ## 000001A0 -/* 003AC 80AE27AC 46062032 */ c.eq.s $f4, $f6 +/* 003AC 80AE27AC 46062032 */ c.eq.s $f4, $f6 /* 003B0 80AE27B0 00000000 */ nop -/* 003B4 80AE27B4 45020016 */ bc1fl .L80AE2810 +/* 003B4 80AE27B4 45020016 */ bc1fl .L80AE2810 /* 003B8 80AE27B8 860F030C */ lh $t7, 0x030C($s0) ## 0000030C /* 003BC 80AE27BC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 003C0 80AE27C0 00000000 */ nop /* 003C4 80AE27C4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 003C8 80AE27C8 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 003CC 80AE27CC 8FA4002C */ lw $a0, 0x002C($sp) +/* 003CC 80AE27CC 8FA4002C */ lw $a0, 0x002C($sp) /* 003D0 80AE27D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003D4 80AE27D4 4600403E */ c.le.s $f8, $f0 +/* 003D4 80AE27D4 4600403E */ c.le.s $f8, $f0 /* 003D8 80AE27D8 00000000 */ nop -/* 003DC 80AE27DC 45000007 */ bc1f .L80AE27FC +/* 003DC 80AE27DC 45000007 */ bc1f .L80AE27FC /* 003E0 80AE27E0 00000000 */ nop /* 003E4 80AE27E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003E8 80AE27E8 24A55D98 */ addiu $a1, $a1, 0x5D98 ## $a1 = 06005D98 -/* 003EC 80AE27EC 0C0294BE */ jal func_800A52F8 -/* 003F0 80AE27F0 8FA4002C */ lw $a0, 0x002C($sp) -/* 003F4 80AE27F4 10000018 */ beq $zero, $zero, .L80AE2858 +/* 003EC 80AE27EC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 003F0 80AE27F0 8FA4002C */ lw $a0, 0x002C($sp) +/* 003F4 80AE27F4 10000018 */ beq $zero, $zero, .L80AE2858 /* 003F8 80AE27F8 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 .L80AE27FC: -/* 003FC 80AE27FC 0C0294BE */ jal func_800A52F8 +/* 003FC 80AE27FC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00400 80AE2800 24A557AC */ addiu $a1, $a1, 0x57AC ## $a1 = 000057AC -/* 00404 80AE2804 10000014 */ beq $zero, $zero, .L80AE2858 +/* 00404 80AE2804 10000014 */ beq $zero, $zero, .L80AE2858 /* 00408 80AE2808 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 /* 0040C 80AE280C 860F030C */ lh $t7, 0x030C($s0) ## 0000030C .L80AE2810: /* 00410 80AE2810 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF /* 00414 80AE2814 A618030C */ sh $t8, 0x030C($s0) ## 0000030C /* 00418 80AE2818 8619030C */ lh $t9, 0x030C($s0) ## 0000030C -/* 0041C 80AE281C 5720000E */ bnel $t9, $zero, .L80AE2858 +/* 0041C 80AE281C 5720000E */ bnel $t9, $zero, .L80AE2858 /* 00420 80AE2820 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 /* 00424 80AE2824 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -67,92 +67,92 @@ glabel func_80AE2744 /* 0042C 80AE282C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00430 80AE2830 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 /* 00434 80AE2834 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00438 80AE2838 46020282 */ mul.s $f10, $f0, $f2 +/* 00438 80AE2838 46020282 */ mul.s $f10, $f0, $f2 /* 0043C 80AE283C E60401A0 */ swc1 $f4, 0x01A0($s0) ## 000001A0 -/* 00440 80AE2840 46025400 */ add.s $f16, $f10, $f2 -/* 00444 80AE2844 4600848D */ trunc.w.s $f18, $f16 -/* 00448 80AE2848 44099000 */ mfc1 $t1, $f18 +/* 00440 80AE2840 46025400 */ add.s $f16, $f10, $f2 +/* 00444 80AE2844 4600848D */ trunc.w.s $f18, $f16 +/* 00448 80AE2848 44099000 */ mfc1 $t1, $f18 /* 0044C 80AE284C 00000000 */ nop /* 00450 80AE2850 A609030C */ sh $t1, 0x030C($s0) ## 0000030C /* 00454 80AE2854 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 .L80AE2858: -/* 00458 80AE2858 51400011 */ beql $t2, $zero, .L80AE28A0 +/* 00458 80AE2858 51400011 */ beql $t2, $zero, .L80AE28A0 /* 0045C 80AE285C 920D0305 */ lbu $t5, 0x0305($s0) ## 00000305 /* 00460 80AE2860 920B0305 */ lbu $t3, 0x0305($s0) ## 00000305 -/* 00464 80AE2864 55600034 */ bnel $t3, $zero, .L80AE2938 -/* 00468 80AE2868 8FB90034 */ lw $t9, 0x0034($sp) +/* 00464 80AE2864 55600034 */ bnel $t3, $zero, .L80AE2938 +/* 00468 80AE2868 8FB90034 */ lw $t9, 0x0034($sp) /* 0046C 80AE286C 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 00470 80AE2870 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00474 80AE2874 11810005 */ beq $t4, $at, .L80AE288C +/* 00474 80AE2874 11810005 */ beq $t4, $at, .L80AE288C /* 00478 80AE2878 00000000 */ nop -/* 0047C 80AE287C 0C2B8C77 */ jal func_80AE31DC +/* 0047C 80AE287C 0C2B8C77 */ jal func_80AE31DC /* 00480 80AE2880 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00484 80AE2884 1000002C */ beq $zero, $zero, .L80AE2938 -/* 00488 80AE2888 8FB90034 */ lw $t9, 0x0034($sp) +/* 00484 80AE2884 1000002C */ beq $zero, $zero, .L80AE2938 +/* 00488 80AE2888 8FB90034 */ lw $t9, 0x0034($sp) .L80AE288C: -/* 0048C 80AE288C 0C2B8E4B */ jal func_80AE392C +/* 0048C 80AE288C 0C2B8E4B */ jal func_80AE392C /* 00490 80AE2890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00494 80AE2894 10000028 */ beq $zero, $zero, .L80AE2938 -/* 00498 80AE2898 8FB90034 */ lw $t9, 0x0034($sp) +/* 00494 80AE2894 10000028 */ beq $zero, $zero, .L80AE2938 +/* 00498 80AE2898 8FB90034 */ lw $t9, 0x0034($sp) /* 0049C 80AE289C 920D0305 */ lbu $t5, 0x0305($s0) ## 00000305 .L80AE28A0: -/* 004A0 80AE28A0 51A0000C */ beql $t5, $zero, .L80AE28D4 +/* 004A0 80AE28A0 51A0000C */ beql $t5, $zero, .L80AE28D4 /* 004A4 80AE28A4 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 004A8 80AE28A8 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 004AC 80AE28AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 004B0 80AE28B0 11C10005 */ beq $t6, $at, .L80AE28C8 +/* 004B0 80AE28B0 11C10005 */ beq $t6, $at, .L80AE28C8 /* 004B4 80AE28B4 00000000 */ nop -/* 004B8 80AE28B8 0C2B8DEF */ jal func_80AE37BC +/* 004B8 80AE28B8 0C2B8DEF */ jal func_80AE37BC /* 004BC 80AE28BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004C0 80AE28C0 10000004 */ beq $zero, $zero, .L80AE28D4 +/* 004C0 80AE28C0 10000004 */ beq $zero, $zero, .L80AE28D4 /* 004C4 80AE28C4 3C014316 */ lui $at, 0x4316 ## $at = 43160000 .L80AE28C8: -/* 004C8 80AE28C8 0C2B8E4B */ jal func_80AE392C +/* 004C8 80AE28C8 0C2B8E4B */ jal func_80AE392C /* 004CC 80AE28CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004D0 80AE28D0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 .L80AE28D4: /* 004D4 80AE28D4 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 /* 004D8 80AE28D8 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 /* 004DC 80AE28DC A2000305 */ sb $zero, 0x0305($s0) ## 00000305 -/* 004E0 80AE28E0 4606403E */ c.le.s $f8, $f6 +/* 004E0 80AE28E0 4606403E */ c.le.s $f8, $f6 /* 004E4 80AE28E4 00000000 */ nop -/* 004E8 80AE28E8 45020013 */ bc1fl .L80AE2938 -/* 004EC 80AE28EC 8FB90034 */ lw $t9, 0x0034($sp) -/* 004F0 80AE28F0 0C00B779 */ jal func_8002DDE4 -/* 004F4 80AE28F4 8FA40034 */ lw $a0, 0x0034($sp) -/* 004F8 80AE28F8 5040000F */ beql $v0, $zero, .L80AE2938 -/* 004FC 80AE28FC 8FB90034 */ lw $t9, 0x0034($sp) +/* 004E8 80AE28E8 45020013 */ bc1fl .L80AE2938 +/* 004EC 80AE28EC 8FB90034 */ lw $t9, 0x0034($sp) +/* 004F0 80AE28F0 0C00B779 */ jal func_8002DDE4 +/* 004F4 80AE28F4 8FA40034 */ lw $a0, 0x0034($sp) +/* 004F8 80AE28F8 5040000F */ beql $v0, $zero, .L80AE2938 +/* 004FC 80AE28FC 8FB90034 */ lw $t9, 0x0034($sp) /* 00500 80AE2900 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 00504 80AE2904 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00508 80AE2908 11E10008 */ beq $t7, $at, .L80AE292C +/* 00508 80AE2908 11E10008 */ beq $t7, $at, .L80AE292C /* 0050C 80AE290C 00000000 */ nop /* 00510 80AE2910 92180305 */ lbu $t8, 0x0305($s0) ## 00000305 -/* 00514 80AE2914 17000005 */ bne $t8, $zero, .L80AE292C +/* 00514 80AE2914 17000005 */ bne $t8, $zero, .L80AE292C /* 00518 80AE2918 00000000 */ nop -/* 0051C 80AE291C 0C2B8DEF */ jal func_80AE37BC +/* 0051C 80AE291C 0C2B8DEF */ jal func_80AE37BC /* 00520 80AE2920 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00524 80AE2924 10000004 */ beq $zero, $zero, .L80AE2938 -/* 00528 80AE2928 8FB90034 */ lw $t9, 0x0034($sp) +/* 00524 80AE2924 10000004 */ beq $zero, $zero, .L80AE2938 +/* 00528 80AE2928 8FB90034 */ lw $t9, 0x0034($sp) .L80AE292C: -/* 0052C 80AE292C 0C2B8E4B */ jal func_80AE392C +/* 0052C 80AE292C 0C2B8E4B */ jal func_80AE392C /* 00530 80AE2930 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00534 80AE2934 8FB90034 */ lw $t9, 0x0034($sp) +/* 00534 80AE2934 8FB90034 */ lw $t9, 0x0034($sp) .L80AE2938: /* 00538 80AE2938 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 /* 0053C 80AE293C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00540 80AE2940 01194021 */ addu $t0, $t0, $t9 +/* 00540 80AE2940 01194021 */ addu $t0, $t0, $t9 /* 00544 80AE2944 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 /* 00548 80AE2948 3109005F */ andi $t1, $t0, 0x005F ## $t1 = 00000000 -/* 0054C 80AE294C 55200004 */ bnel $t1, $zero, .L80AE2960 -/* 00550 80AE2950 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0054C 80AE294C 55200004 */ bnel $t1, $zero, .L80AE2960 +/* 00550 80AE2950 8FBF0024 */ lw $ra, 0x0024($sp) /* 00554 80AE2954 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00558 80AE2958 240538E4 */ addiu $a1, $zero, 0x38E4 ## $a1 = 000038E4 -/* 0055C 80AE295C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0055C 80AE295C 8FBF0024 */ lw $ra, 0x0024($sp) .L80AE2960: -/* 00560 80AE2960 8FB00020 */ lw $s0, 0x0020($sp) +/* 00560 80AE2960 8FB00020 */ lw $s0, 0x0020($sp) /* 00564 80AE2964 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00568 80AE2968 03E00008 */ jr $ra +/* 00568 80AE2968 03E00008 */ jr $ra /* 0056C 80AE296C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s index 299c4849b7..fc24bc2ccf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s @@ -1,49 +1,49 @@ glabel func_80AE3454 /* 01054 80AE3454 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01058 80AE3458 AFB00028 */ sw $s0, 0x0028($sp) -/* 0105C 80AE345C AFBF002C */ sw $ra, 0x002C($sp) -/* 01060 80AE3460 AFA5004C */ sw $a1, 0x004C($sp) +/* 01058 80AE3458 AFB00028 */ sw $s0, 0x0028($sp) +/* 0105C 80AE345C AFBF002C */ sw $ra, 0x002C($sp) +/* 01060 80AE3460 AFA5004C */ sw $a1, 0x004C($sp) /* 01064 80AE3464 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 01068 80AE3468 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0106C 80AE346C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01070 80AE3470 AFA40034 */ sw $a0, 0x0034($sp) +/* 01070 80AE3470 AFA40034 */ sw $a0, 0x0034($sp) /* 01074 80AE3474 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01078 80AE3478 AFAF0040 */ sw $t7, 0x0040($sp) -/* 0107C 80AE347C 50400005 */ beql $v0, $zero, .L80AE3494 + +/* 01078 80AE3478 AFAF0040 */ sw $t7, 0x0040($sp) +/* 0107C 80AE347C 50400005 */ beql $v0, $zero, .L80AE3494 /* 01080 80AE3480 92080304 */ lbu $t0, 0x0304($s0) ## 00000304 /* 01084 80AE3484 92180304 */ lbu $t8, 0x0304($s0) ## 00000304 /* 01088 80AE3488 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 0108C 80AE348C A2190304 */ sb $t9, 0x0304($s0) ## 00000304 /* 01090 80AE3490 92080304 */ lbu $t0, 0x0304($s0) ## 00000304 .L80AE3494: -/* 01094 80AE3494 2D010005 */ sltiu $at, $t0, 0x0005 -/* 01098 80AE3498 102000C3 */ beq $at, $zero, .L80AE37A8 -/* 0109C 80AE349C 00084080 */ sll $t0, $t0, 2 +/* 01094 80AE3494 2D010005 */ sltiu $at, $t0, 0x0005 +/* 01098 80AE3498 102000C3 */ beq $at, $zero, .L80AE37A8 +/* 0109C 80AE349C 00084080 */ sll $t0, $t0, 2 /* 010A0 80AE34A0 3C0180AE */ lui $at, %hi(jtbl_80AE49A4) ## $at = 80AE0000 -/* 010A4 80AE34A4 00280821 */ addu $at, $at, $t0 -/* 010A8 80AE34A8 8C2849A4 */ lw $t0, %lo(jtbl_80AE49A4)($at) -/* 010AC 80AE34AC 01000008 */ jr $t0 +/* 010A4 80AE34A4 00280821 */ addu $at, $at, $t0 +/* 010A8 80AE34A8 8C2849A4 */ lw $t0, %lo(jtbl_80AE49A4)($at) +/* 010AC 80AE34AC 01000008 */ jr $t0 /* 010B0 80AE34B0 00000000 */ nop glabel L80AE34B4 /* 010B4 80AE34B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 010B8 80AE34B8 24A54268 */ addiu $a1, $a1, 0x4268 ## $a1 = 06004268 -/* 010BC 80AE34BC 0C0294BE */ jal func_800A52F8 -/* 010C0 80AE34C0 8FA40034 */ lw $a0, 0x0034($sp) +/* 010BC 80AE34BC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 010C0 80AE34C0 8FA40034 */ lw $a0, 0x0034($sp) /* 010C4 80AE34C4 92090304 */ lbu $t1, 0x0304($s0) ## 00000304 -/* 010C8 80AE34C8 8FA4004C */ lw $a0, 0x004C($sp) +/* 010C8 80AE34C8 8FA4004C */ lw $a0, 0x004C($sp) /* 010CC 80AE34CC 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 /* 010D0 80AE34D0 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 /* 010D4 80AE34D4 A20A0304 */ sb $t2, 0x0304($s0) ## 00000304 -/* 010D8 80AE34D8 0324C821 */ addu $t9, $t9, $a0 +/* 010D8 80AE34D8 0324C821 */ addu $t9, $t9, $a0 /* 010DC 80AE34DC 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 /* 010E0 80AE34E0 2405FFF8 */ addiu $a1, $zero, 0xFFF8 ## $a1 = FFFFFFF8 -/* 010E4 80AE34E4 0320F809 */ jalr $ra, $t9 +/* 010E4 80AE34E4 0320F809 */ jalr $ra, $t9 /* 010E8 80AE34E8 00000000 */ nop /* 010EC 80AE34EC C60C0090 */ lwc1 $f12, 0x0090($s0) ## 00000090 /* 010F0 80AE34F0 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 010F4 80AE34F4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 010F8 80AE34F8 0C02A800 */ jal func_800AA000 +/* 010F8 80AE34F8 0C02A800 */ jal func_800AA000 /* 010FC 80AE34FC 2407000C */ addiu $a3, $zero, 0x000C ## $a3 = 0000000C /* 01100 80AE3500 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 /* 01104 80AE3504 A20B0319 */ sb $t3, 0x0319($s0) ## 00000319 @@ -53,178 +53,178 @@ glabel L80AE3508 /* 01110 80AE3510 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01114 80AE3514 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC /* 01118 80AE3518 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0111C 80AE351C AFA00010 */ sw $zero, 0x0010($sp) + +/* 0111C 80AE351C AFA00010 */ sw $zero, 0x0010($sp) /* 01120 80AE3520 26040310 */ addiu $a0, $s0, 0x0310 ## $a0 = 00000310 /* 01124 80AE3524 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01128 80AE3528 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0112C 80AE352C 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC /* 01130 80AE3530 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01134 80AE3534 AFA00010 */ sw $zero, 0x0010($sp) + +/* 01134 80AE3534 AFA00010 */ sw $zero, 0x0010($sp) glabel L80AE3538 -/* 01138 80AE3538 8FAC0040 */ lw $t4, 0x0040($sp) +/* 01138 80AE3538 8FAC0040 */ lw $t4, 0x0040($sp) /* 0113C 80AE353C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01140 80AE3540 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 01144 80AE3544 8D8D0680 */ lw $t5, 0x0680($t4) ## 00000680 /* 01148 80AE3548 31AE0080 */ andi $t6, $t5, 0x0080 ## $t6 = 00000000 -/* 0114C 80AE354C 15C00016 */ bne $t6, $zero, .L80AE35A8 +/* 0114C 80AE354C 15C00016 */ bne $t6, $zero, .L80AE35A8 /* 01150 80AE3550 00000000 */ nop /* 01154 80AE3554 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01158 80AE3558 248446F8 */ addiu $a0, $a0, 0x46F8 ## $a0 = 060046F8 /* 0115C 80AE355C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01160 80AE3560 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01164 80AE3564 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01168 80AE3568 468021A0 */ cvt.s.w $f6, $f4 +/* 01168 80AE3568 468021A0 */ cvt.s.w $f6, $f4 /* 0116C 80AE356C 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 01170 80AE3570 44070000 */ mfc1 $a3, $f0 -/* 01174 80AE3574 AFAF0014 */ sw $t7, 0x0014($sp) +/* 01170 80AE3570 44070000 */ mfc1 $a3, $f0 +/* 01174 80AE3574 AFAF0014 */ sw $t7, 0x0014($sp) /* 01178 80AE3578 24A546F8 */ addiu $a1, $a1, 0x46F8 ## $a1 = 060046F8 -/* 0117C 80AE357C 8FA40034 */ lw $a0, 0x0034($sp) -/* 01180 80AE3580 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0117C 80AE357C 8FA40034 */ lw $a0, 0x0034($sp) +/* 01180 80AE3580 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01184 80AE3584 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01188 80AE3588 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0118C 80AE358C E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 0118C 80AE358C E7A00018 */ swc1 $f0, 0x0018($sp) /* 01190 80AE3590 92180304 */ lbu $t8, 0x0304($s0) ## 00000304 /* 01194 80AE3594 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 01198 80AE3598 A209031B */ sb $t1, 0x031B($s0) ## 0000031B /* 0119C 80AE359C 27080001 */ addiu $t0, $t8, 0x0001 ## $t0 = 00000001 -/* 011A0 80AE35A0 10000081 */ beq $zero, $zero, .L80AE37A8 +/* 011A0 80AE35A0 10000081 */ beq $zero, $zero, .L80AE37A8 /* 011A4 80AE35A4 A2080304 */ sb $t0, 0x0304($s0) ## 00000304 .L80AE35A8: /* 011A8 80AE35A8 8D4AE664 */ lw $t2, -0x199C($t2) ## FFFFE664 /* 011AC 80AE35AC 3C05C4BB */ lui $a1, 0xC4BB ## $a1 = C4BB0000 /* 011B0 80AE35B0 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = C4BB8000 -/* 011B4 80AE35B4 11400006 */ beq $t2, $zero, .L80AE35D0 +/* 011B4 80AE35B4 11400006 */ beq $t2, $zero, .L80AE35D0 /* 011B8 80AE35B8 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC /* 011BC 80AE35BC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 011C0 80AE35C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 011C4 80AE35C4 3C074316 */ lui $a3, 0x4316 ## $a3 = 43160000 /* 011C8 80AE35C8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 011CC 80AE35CC E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 011CC 80AE35CC E7A80010 */ swc1 $f8, 0x0010($sp) .L80AE35D0: -/* 011D0 80AE35D0 8FB90040 */ lw $t9, 0x0040($sp) +/* 011D0 80AE35D0 8FB90040 */ lw $t9, 0x0040($sp) /* 011D4 80AE35D4 0C01DE1C */ jal Math_Sins ## sins? /* 011D8 80AE35D8 872400B6 */ lh $a0, 0x00B6($t9) ## 000000B6 /* 011DC 80AE35DC 3C01C1C8 */ lui $at, 0xC1C8 ## $at = C1C80000 /* 011E0 80AE35E0 44815000 */ mtc1 $at, $f10 ## $f10 = -25.00 -/* 011E4 80AE35E4 8FAB0040 */ lw $t3, 0x0040($sp) +/* 011E4 80AE35E4 8FAB0040 */ lw $t3, 0x0040($sp) /* 011E8 80AE35E8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 011EC 80AE35EC 460A0402 */ mul.s $f16, $f0, $f10 +/* 011EC 80AE35EC 460A0402 */ mul.s $f16, $f0, $f10 /* 011F0 80AE35F0 C5720024 */ lwc1 $f18, 0x0024($t3) ## 00000024 /* 011F4 80AE35F4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 011F8 80AE35F8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 011FC 80AE35FC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01200 80AE3600 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01204 80AE3604 46128100 */ add.s $f4, $f16, $f18 -/* 01208 80AE3608 44052000 */ mfc1 $a1, $f4 +/* 01200 80AE3600 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01204 80AE3604 46128100 */ add.s $f4, $f16, $f18 +/* 01208 80AE3608 44052000 */ mfc1 $a1, $f4 /* 0120C 80AE360C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 01210 80AE3610 00000000 */ nop -/* 01214 80AE3614 8FAC0040 */ lw $t4, 0x0040($sp) +/* 01214 80AE3614 8FAC0040 */ lw $t4, 0x0040($sp) /* 01218 80AE3618 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0121C 80AE361C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 01220 80AE3620 8D850028 */ lw $a1, 0x0028($t4) ## 00000028 /* 01224 80AE3624 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01228 80AE3628 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 0122C 80AE362C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01230 80AE3630 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01234 80AE3634 8FAD0040 */ lw $t5, 0x0040($sp) + +/* 01230 80AE3630 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01234 80AE3634 8FAD0040 */ lw $t5, 0x0040($sp) /* 01238 80AE3638 0C01DE0D */ jal Math_Coss ## coss? /* 0123C 80AE363C 85A400B6 */ lh $a0, 0x00B6($t5) ## 000000B6 /* 01240 80AE3640 3C01C1C8 */ lui $at, 0xC1C8 ## $at = C1C80000 /* 01244 80AE3644 44815000 */ mtc1 $at, $f10 ## $f10 = -25.00 -/* 01248 80AE3648 8FAE0040 */ lw $t6, 0x0040($sp) +/* 01248 80AE3648 8FAE0040 */ lw $t6, 0x0040($sp) /* 0124C 80AE364C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01250 80AE3650 460A0402 */ mul.s $f16, $f0, $f10 +/* 01250 80AE3650 460A0402 */ mul.s $f16, $f0, $f10 /* 01254 80AE3654 C5D2002C */ lwc1 $f18, 0x002C($t6) ## 0000002C /* 01258 80AE3658 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 0125C 80AE365C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01260 80AE3660 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01264 80AE3664 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01268 80AE3668 46128100 */ add.s $f4, $f16, $f18 -/* 0126C 80AE366C 44052000 */ mfc1 $a1, $f4 +/* 01264 80AE3664 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01268 80AE3668 46128100 */ add.s $f4, $f16, $f18 +/* 0126C 80AE366C 44052000 */ mfc1 $a1, $f4 /* 01270 80AE3670 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 01274 80AE3674 00000000 */ nop -/* 01278 80AE3678 8FAF0040 */ lw $t7, 0x0040($sp) +/* 01278 80AE3678 8FAF0040 */ lw $t7, 0x0040($sp) /* 0127C 80AE367C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 01280 80AE3680 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01284 80AE3684 85E500B6 */ lh $a1, 0x00B6($t7) ## 000000B6 -/* 01288 80AE3688 AFA00010 */ sw $zero, 0x0010($sp) +/* 01288 80AE3688 AFA00010 */ sw $zero, 0x0010($sp) /* 0128C 80AE368C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01290 80AE3690 24071770 */ addiu $a3, $zero, 0x1770 ## $a3 = 00001770 /* 01294 80AE3694 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01298 80AE3698 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 /* 0129C 80AE369C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012A0 80AE36A0 460A4032 */ c.eq.s $f8, $f10 +/* 012A0 80AE36A0 460A4032 */ c.eq.s $f8, $f10 /* 012A4 80AE36A4 00000000 */ nop -/* 012A8 80AE36A8 45020004 */ bc1fl .L80AE36BC +/* 012A8 80AE36A8 45020004 */ bc1fl .L80AE36BC /* 012AC 80AE36AC 92180319 */ lbu $t8, 0x0319($s0) ## 00000319 /* 012B0 80AE36B0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 012B4 80AE36B4 240538E8 */ addiu $a1, $zero, 0x38E8 ## $a1 = 000038E8 /* 012B8 80AE36B8 92180319 */ lbu $t8, 0x0319($s0) ## 00000319 .L80AE36BC: /* 012BC 80AE36BC 2708FFFF */ addiu $t0, $t8, 0xFFFF ## $t0 = FFFFFFFF /* 012C0 80AE36C0 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 000000FF -/* 012C4 80AE36C4 15200038 */ bne $t1, $zero, .L80AE37A8 +/* 012C4 80AE36C4 15200038 */ bne $t1, $zero, .L80AE37A8 /* 012C8 80AE36C8 A2080319 */ sb $t0, 0x0319($s0) ## 00000319 -/* 012CC 80AE36CC 8FA4004C */ lw $a0, 0x004C($sp) +/* 012CC 80AE36CC 8FA4004C */ lw $a0, 0x004C($sp) /* 012D0 80AE36D0 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 /* 012D4 80AE36D4 2405FFF8 */ addiu $a1, $zero, 0xFFF8 ## $a1 = FFFFFFF8 -/* 012D8 80AE36D8 0324C821 */ addu $t9, $t9, $a0 +/* 012D8 80AE36D8 0324C821 */ addu $t9, $t9, $a0 /* 012DC 80AE36DC 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 -/* 012E0 80AE36E0 0320F809 */ jalr $ra, $t9 +/* 012E0 80AE36E0 0320F809 */ jalr $ra, $t9 /* 012E4 80AE36E4 00000000 */ nop /* 012E8 80AE36E8 C60C0090 */ lwc1 $f12, 0x0090($s0) ## 00000090 /* 012EC 80AE36EC 240500F0 */ addiu $a1, $zero, 0x00F0 ## $a1 = 000000F0 /* 012F0 80AE36F0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 012F4 80AE36F4 0C02A800 */ jal func_800AA000 +/* 012F4 80AE36F4 0C02A800 */ jal func_800AA000 /* 012F8 80AE36F8 2407000C */ addiu $a3, $zero, 0x000C ## $a3 = 0000000C /* 012FC 80AE36FC 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 /* 01300 80AE3700 A20A0319 */ sb $t2, 0x0319($s0) ## 00000319 -/* 01304 80AE3704 8FA40040 */ lw $a0, 0x0040($sp) +/* 01304 80AE3704 8FA40040 */ lw $a0, 0x0040($sp) /* 01308 80AE3708 8C8C0678 */ lw $t4, 0x0678($a0) ## 00000678 /* 0130C 80AE370C 95850092 */ lhu $a1, 0x0092($t4) ## 00000092 /* 01310 80AE3710 24A56805 */ addiu $a1, $a1, 0x6805 ## $a1 = 00006805 -/* 01314 80AE3714 0C00BDF7 */ jal func_8002F7DC +/* 01314 80AE3714 0C00BDF7 */ jal func_8002F7DC /* 01318 80AE3718 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00006805 -/* 0131C 80AE371C 10000023 */ beq $zero, $zero, .L80AE37AC -/* 01320 80AE3720 8FBF002C */ lw $ra, 0x002C($sp) +/* 0131C 80AE371C 10000023 */ beq $zero, $zero, .L80AE37AC +/* 01320 80AE3720 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AE3724 /* 01324 80AE3724 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 01328 80AE3728 8DADE664 */ lw $t5, -0x199C($t5) ## 8015E664 /* 0132C 80AE372C 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC /* 01330 80AE3730 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01334 80AE3734 11A0001C */ beq $t5, $zero, .L80AE37A8 +/* 01334 80AE3734 11A0001C */ beq $t5, $zero, .L80AE37A8 /* 01338 80AE3738 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0133C 80AE373C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 01340 80AE3740 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 01344 80AE3744 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01348 80AE3748 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0134C 80AE374C 10000017 */ beq $zero, $zero, .L80AE37AC -/* 01350 80AE3750 8FBF002C */ lw $ra, 0x002C($sp) + +/* 01348 80AE3748 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 0134C 80AE374C 10000017 */ beq $zero, $zero, .L80AE37AC +/* 01350 80AE3750 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AE3754 /* 01354 80AE3754 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 01358 80AE3758 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 /* 0135C 80AE375C 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC /* 01360 80AE3760 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01364 80AE3764 11C00005 */ beq $t6, $zero, .L80AE377C +/* 01364 80AE3764 11C00005 */ beq $t6, $zero, .L80AE377C /* 01368 80AE3768 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0136C 80AE376C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 01370 80AE3770 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 01374 80AE3774 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01378 80AE3778 E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 01378 80AE3778 E7B20010 */ swc1 $f18, 0x0010($sp) .L80AE377C: /* 0137C 80AE377C 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 01380 80AE3780 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A @@ -234,15 +234,15 @@ glabel L80AE3754 /* 01390 80AE3790 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 /* 01394 80AE3794 A2080306 */ sb $t0, 0x0306($s0) ## 00000306 /* 01398 80AE3798 A2090307 */ sb $t1, 0x0307($s0) ## 00000307 -/* 0139C 80AE379C 8FA5004C */ lw $a1, 0x004C($sp) -/* 013A0 80AE37A0 0C2B8AE4 */ jal func_80AE2B90 +/* 0139C 80AE379C 8FA5004C */ lw $a1, 0x004C($sp) +/* 013A0 80AE37A0 0C2B8AE4 */ jal func_80AE2B90 /* 013A4 80AE37A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AE37A8: -/* 013A8 80AE37A8 8FBF002C */ lw $ra, 0x002C($sp) +/* 013A8 80AE37A8 8FBF002C */ lw $ra, 0x002C($sp) .L80AE37AC: -/* 013AC 80AE37AC 8FB00028 */ lw $s0, 0x0028($sp) +/* 013AC 80AE37AC 8FB00028 */ lw $s0, 0x0028($sp) /* 013B0 80AE37B0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 013B4 80AE37B4 03E00008 */ jr $ra +/* 013B4 80AE37B4 03E00008 */ jr $ra /* 013B8 80AE37B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s index a96db310b8..f3a1f799ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s @@ -1,11 +1,11 @@ glabel EnRl_Destroy /* 00000 80AE72B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80AE72B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80AE72B8 0C0295BC */ jal func_800A56F0 +/* 00004 80AE72B4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00008 80AE72B8 0C0295BC */ jal SkelAnime_Free /* 0000C 80AE72BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 80AE72C0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00010 80AE72C0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00014 80AE72C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 80AE72C8 03E00008 */ jr $ra +/* 00018 80AE72C8 03E00008 */ jr $ra /* 0001C 80AE72CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s index 90c0de8a21..d03b16266c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s @@ -1,22 +1,22 @@ glabel func_80AE7544 /* 00294 80AE7544 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00298 80AE7548 AFA40028 */ sw $a0, 0x0028($sp) -/* 0029C 80AE754C AFA5002C */ sw $a1, 0x002C($sp) +/* 00298 80AE7548 AFA40028 */ sw $a0, 0x0028($sp) +/* 0029C 80AE754C AFA5002C */ sw $a1, 0x002C($sp) /* 002A0 80AE7550 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002A4 80AE7554 8FA50028 */ lw $a1, 0x0028($sp) -/* 002A8 80AE7558 AFBF0024 */ sw $ra, 0x0024($sp) +/* 002A4 80AE7554 8FA50028 */ lw $a1, 0x0028($sp) +/* 002A8 80AE7558 AFBF0024 */ sw $ra, 0x0024($sp) /* 002AC 80AE755C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 002B0 80AE7560 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 002B4 80AE7564 24E70A3C */ addiu $a3, $a3, 0x0A3C ## $a3 = 06000A3C /* 002B8 80AE7568 24C67B38 */ addiu $a2, $a2, 0x7B38 ## $a2 = 06007B38 -/* 002BC 80AE756C AFA00010 */ sw $zero, 0x0010($sp) -/* 002C0 80AE7570 AFA00014 */ sw $zero, 0x0014($sp) -/* 002C4 80AE7574 AFA00018 */ sw $zero, 0x0018($sp) -/* 002C8 80AE7578 0C0291BE */ jal func_800A46F8 +/* 002BC 80AE756C AFA00010 */ sw $zero, 0x0010($sp) +/* 002C0 80AE7570 AFA00014 */ sw $zero, 0x0014($sp) +/* 002C4 80AE7574 AFA00018 */ sw $zero, 0x0018($sp) +/* 002C8 80AE7578 0C0291BE */ jal SkelAnime_InitSV /* 002CC 80AE757C 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 002D0 80AE7580 8FBF0024 */ lw $ra, 0x0024($sp) +/* 002D0 80AE7580 8FBF0024 */ lw $ra, 0x0024($sp) /* 002D4 80AE7584 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002D8 80AE7588 03E00008 */ jr $ra +/* 002D8 80AE7588 03E00008 */ jr $ra /* 002DC 80AE758C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s index 2ab8a54728..f017e1be1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s @@ -1,26 +1,26 @@ glabel func_80AE7878 /* 005C8 80AE7878 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 005CC 80AE787C AFA40028 */ sw $a0, 0x0028($sp) -/* 005D0 80AE7880 AFA5002C */ sw $a1, 0x002C($sp) +/* 005CC 80AE787C AFA40028 */ sw $a0, 0x0028($sp) +/* 005D0 80AE7880 AFA5002C */ sw $a1, 0x002C($sp) /* 005D4 80AE7884 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005D8 80AE7888 8FA50028 */ lw $a1, 0x0028($sp) -/* 005DC 80AE788C AFBF0024 */ sw $ra, 0x0024($sp) +/* 005D8 80AE7888 8FA50028 */ lw $a1, 0x0028($sp) +/* 005DC 80AE788C AFBF0024 */ sw $ra, 0x0024($sp) /* 005E0 80AE7890 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 005E4 80AE7894 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 005E8 80AE7898 24E70A3C */ addiu $a3, $a3, 0x0A3C ## $a3 = 06000A3C /* 005EC 80AE789C 24C67B38 */ addiu $a2, $a2, 0x7B38 ## $a2 = 06007B38 -/* 005F0 80AE78A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 005F4 80AE78A4 AFA00014 */ sw $zero, 0x0014($sp) -/* 005F8 80AE78A8 AFA00018 */ sw $zero, 0x0018($sp) -/* 005FC 80AE78AC 0C0291BE */ jal func_800A46F8 +/* 005F0 80AE78A0 AFA00010 */ sw $zero, 0x0010($sp) +/* 005F4 80AE78A4 AFA00014 */ sw $zero, 0x0014($sp) +/* 005F8 80AE78A8 AFA00018 */ sw $zero, 0x0018($sp) +/* 005FC 80AE78AC 0C0291BE */ jal SkelAnime_InitSV /* 00600 80AE78B0 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00604 80AE78B4 8FA20028 */ lw $v0, 0x0028($sp) +/* 00604 80AE78B4 8FA20028 */ lw $v0, 0x0028($sp) /* 00608 80AE78B8 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 0060C 80AE78BC AC4E0194 */ sw $t6, 0x0194($v0) ## 00000194 /* 00610 80AE78C0 A04000C8 */ sb $zero, 0x00C8($v0) ## 000000C8 -/* 00614 80AE78C4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00614 80AE78C4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00618 80AE78C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0061C 80AE78CC 03E00008 */ jr $ra +/* 0061C 80AE78CC 03E00008 */ jr $ra /* 00620 80AE78D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s index 7ca496ea41..6b56a2e16a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s @@ -1,45 +1,45 @@ glabel func_80AE7D94 /* 00AE4 80AE7D94 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00AE8 80AE7D98 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AEC 80AE7D9C AFB00028 */ sw $s0, 0x0028($sp) -/* 00AF0 80AE7DA0 AFA40078 */ sw $a0, 0x0078($sp) -/* 00AF4 80AE7DA4 AFA5007C */ sw $a1, 0x007C($sp) +/* 00AE8 80AE7D98 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AEC 80AE7D9C AFB00028 */ sw $s0, 0x0028($sp) +/* 00AF0 80AE7DA0 AFA40078 */ sw $a0, 0x0078($sp) +/* 00AF4 80AE7DA4 AFA5007C */ sw $a1, 0x007C($sp) /* 00AF8 80AE7DA8 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 00AFC 80AE7DAC 3C1880AF */ lui $t8, %hi(D_80AE81A0) ## $t8 = 80AF0000 /* 00B00 80AE7DB0 3C0680AF */ lui $a2, %hi(D_80AE8200) ## $a2 = 80AF0000 -/* 00B04 80AE7DB4 00027880 */ sll $t7, $v0, 2 -/* 00B08 80AE7DB8 030FC021 */ addu $t8, $t8, $t7 -/* 00B0C 80AE7DBC 8F1881A0 */ lw $t8, %lo(D_80AE81A0)($t8) +/* 00B04 80AE7DB4 00027880 */ sll $t7, $v0, 2 +/* 00B08 80AE7DB8 030FC021 */ addu $t8, $t8, $t7 +/* 00B0C 80AE7DBC 8F1881A0 */ lw $t8, %lo(D_80AE81A0)($t8) /* 00B10 80AE7DC0 24C68200 */ addiu $a2, $a2, %lo(D_80AE8200) ## $a2 = 80AE8200 /* 00B14 80AE7DC4 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 00B18 80AE7DC8 AFB80068 */ sw $t8, 0x0068($sp) +/* 00B18 80AE7DC8 AFB80068 */ sw $t8, 0x0068($sp) /* 00B1C 80AE7DCC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00B20 80AE7DD0 24070130 */ addiu $a3, $zero, 0x0130 ## $a3 = 00000130 -/* 00B24 80AE7DD4 0C031AB1 */ jal func_800C6AC4 +/* 00B24 80AE7DD4 0C031AB1 */ jal func_800C6AC4 /* 00B28 80AE7DD8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00B2C 80AE7DDC 8FA9007C */ lw $t1, 0x007C($sp) -/* 00B30 80AE7DE0 0C024F61 */ jal func_80093D84 +/* 00B2C 80AE7DDC 8FA9007C */ lw $t1, 0x007C($sp) +/* 00B30 80AE7DE0 0C024F61 */ jal func_80093D84 /* 00B34 80AE7DE4 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 00B38 80AE7DE8 8FA70068 */ lw $a3, 0x0068($sp) +/* 00B38 80AE7DE8 8FA70068 */ lw $a3, 0x0068($sp) /* 00B3C 80AE7DEC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00B40 80AE7DF0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00B44 80AE7DF4 00076100 */ sll $t4, $a3, 4 -/* 00B48 80AE7DF8 000C6F02 */ srl $t5, $t4, 28 +/* 00B44 80AE7DF4 00076100 */ sll $t4, $a3, 4 +/* 00B48 80AE7DF8 000C6F02 */ srl $t5, $t4, 28 /* 00B4C 80AE7DFC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00B50 80AE7E00 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 00B54 80AE7E04 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 00B58 80AE7E08 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 00B5C 80AE7E0C 000D7080 */ sll $t6, $t5, 2 +/* 00B5C 80AE7E0C 000D7080 */ sll $t6, $t5, 2 /* 00B60 80AE7E10 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 00B64 80AE7E14 01CF2021 */ addu $a0, $t6, $t7 +/* 00B64 80AE7E14 01CF2021 */ addu $a0, $t6, $t7 /* 00B68 80AE7E18 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 00B6C 80AE7E1C 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 00B70 80AE7E20 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00B74 80AE7E24 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00B78 80AE7E28 00E12824 */ and $a1, $a3, $at +/* 00B78 80AE7E28 00E12824 */ and $a1, $a3, $at /* 00B7C 80AE7E2C 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00B80 80AE7E30 0305C821 */ addu $t9, $t8, $a1 -/* 00B84 80AE7E34 03264821 */ addu $t1, $t9, $a2 +/* 00B80 80AE7E30 0305C821 */ addu $t9, $t8, $a1 +/* 00B84 80AE7E34 03264821 */ addu $t1, $t9, $a2 /* 00B88 80AE7E38 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 00B8C 80AE7E3C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00B90 80AE7E40 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,11 +50,11 @@ glabel func_80AE7D94 /* 00BA4 80AE7E54 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 00BA8 80AE7E58 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 /* 00BAC 80AE7E5C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00BB0 80AE7E60 01856821 */ addu $t5, $t4, $a1 -/* 00BB4 80AE7E64 01A67021 */ addu $t6, $t5, $a2 +/* 00BB0 80AE7E60 01856821 */ addu $t5, $t4, $a1 +/* 00BB4 80AE7E64 01A67021 */ addu $t6, $t5, $a2 /* 00BB8 80AE7E68 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 00BBC 80AE7E6C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00BC0 80AE7E70 8FA80078 */ lw $t0, 0x0078($sp) +/* 00BC0 80AE7E70 8FA80078 */ lw $t0, 0x0078($sp) /* 00BC4 80AE7E74 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 /* 00BC8 80AE7E78 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00BCC 80AE7E7C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 @@ -73,25 +73,25 @@ glabel func_80AE7D94 /* 00C00 80AE7EB0 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 00C04 80AE7EB4 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 00C08 80AE7EB8 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00C0C 80AE7EBC AFA00018 */ sw $zero, 0x0018($sp) -/* 00C10 80AE7EC0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00C14 80AE7EC4 AFA00010 */ sw $zero, 0x0010($sp) +/* 00C0C 80AE7EBC AFA00018 */ sw $zero, 0x0018($sp) +/* 00C10 80AE7EC0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00C14 80AE7EC4 AFA00010 */ sw $zero, 0x0010($sp) /* 00C18 80AE7EC8 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 00C1C 80AE7ECC 8FA4007C */ lw $a0, 0x007C($sp) -/* 00C20 80AE7ED0 0C0289CF */ jal func_800A273C -/* 00C24 80AE7ED4 AFAD001C */ sw $t5, 0x001C($sp) +/* 00C1C 80AE7ECC 8FA4007C */ lw $a0, 0x007C($sp) +/* 00C20 80AE7ED0 0C0289CF */ jal SkelAnime_DrawSV2 +/* 00C24 80AE7ED4 AFAD001C */ sw $t5, 0x001C($sp) /* 00C28 80AE7ED8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00C2C 80AE7EDC 8FAE007C */ lw $t6, 0x007C($sp) +/* 00C2C 80AE7EDC 8FAE007C */ lw $t6, 0x007C($sp) /* 00C30 80AE7EE0 3C0680AF */ lui $a2, %hi(D_80AE8220) ## $a2 = 80AF0000 /* 00C34 80AE7EE4 24C68220 */ addiu $a2, $a2, %lo(D_80AE8220) ## $a2 = 80AE8220 /* 00C38 80AE7EE8 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 00C3C 80AE7EEC 2407014B */ addiu $a3, $zero, 0x014B ## $a3 = 0000014B -/* 00C40 80AE7EF0 0C031AD5 */ jal func_800C6B54 +/* 00C40 80AE7EF0 0C031AD5 */ jal func_800C6B54 /* 00C44 80AE7EF4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 00C48 80AE7EF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C4C 80AE7EFC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00C48 80AE7EF8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C4C 80AE7EFC 8FB00028 */ lw $s0, 0x0028($sp) /* 00C50 80AE7F00 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 00C54 80AE7F04 03E00008 */ jr $ra +/* 00C54 80AE7F04 03E00008 */ jr $ra /* 00C58 80AE7F08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s index 431d1f4bb5..6a39a058a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s @@ -1,45 +1,45 @@ glabel func_80AE7FDC /* 00D2C 80AE7FDC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00D30 80AE7FE0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D34 80AE7FE4 AFA40070 */ sw $a0, 0x0070($sp) -/* 00D38 80AE7FE8 AFA50074 */ sw $a1, 0x0074($sp) +/* 00D30 80AE7FE0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00D34 80AE7FE4 AFA40070 */ sw $a0, 0x0070($sp) +/* 00D38 80AE7FE8 AFA50074 */ sw $a1, 0x0074($sp) /* 00D3C 80AE7FEC 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 00D40 80AE7FF0 3C1880AF */ lui $t8, %hi(D_80AE81A0) ## $t8 = 80AF0000 /* 00D44 80AE7FF4 3C0680AF */ lui $a2, %hi(D_80AE827C) ## $a2 = 80AF0000 -/* 00D48 80AE7FF8 00027880 */ sll $t7, $v0, 2 -/* 00D4C 80AE7FFC 030FC021 */ addu $t8, $t8, $t7 -/* 00D50 80AE8000 8F1881A0 */ lw $t8, %lo(D_80AE81A0)($t8) +/* 00D48 80AE7FF8 00027880 */ sll $t7, $v0, 2 +/* 00D4C 80AE7FFC 030FC021 */ addu $t8, $t8, $t7 +/* 00D50 80AE8000 8F1881A0 */ lw $t8, %lo(D_80AE81A0)($t8) /* 00D54 80AE8004 24C6827C */ addiu $a2, $a2, %lo(D_80AE827C) ## $a2 = 80AE827C /* 00D58 80AE8008 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 00D5C 80AE800C AFB80060 */ sw $t8, 0x0060($sp) +/* 00D5C 80AE800C AFB80060 */ sw $t8, 0x0060($sp) /* 00D60 80AE8010 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00D64 80AE8014 240701A0 */ addiu $a3, $zero, 0x01A0 ## $a3 = 000001A0 -/* 00D68 80AE8018 0C031AB1 */ jal func_800C6AC4 -/* 00D6C 80AE801C AFA50058 */ sw $a1, 0x0058($sp) -/* 00D70 80AE8020 8FA90074 */ lw $t1, 0x0074($sp) -/* 00D74 80AE8024 0C024F46 */ jal func_80093D18 +/* 00D68 80AE8018 0C031AB1 */ jal func_800C6AC4 +/* 00D6C 80AE801C AFA50058 */ sw $a1, 0x0058($sp) +/* 00D70 80AE8020 8FA90074 */ lw $t1, 0x0074($sp) +/* 00D74 80AE8024 0C024F46 */ jal func_80093D18 /* 00D78 80AE8028 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 00D7C 80AE802C 8FA80058 */ lw $t0, 0x0058($sp) -/* 00D80 80AE8030 8FA70060 */ lw $a3, 0x0060($sp) +/* 00D7C 80AE802C 8FA80058 */ lw $t0, 0x0058($sp) +/* 00D80 80AE8030 8FA70060 */ lw $a3, 0x0060($sp) /* 00D84 80AE8034 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 00D88 80AE8038 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00D8C 80AE803C 00076100 */ sll $t4, $a3, 4 -/* 00D90 80AE8040 000C6F02 */ srl $t5, $t4, 28 +/* 00D8C 80AE803C 00076100 */ sll $t4, $a3, 4 +/* 00D90 80AE8040 000C6F02 */ srl $t5, $t4, 28 /* 00D94 80AE8044 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00D98 80AE8048 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 00D9C 80AE804C 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 00DA0 80AE8050 000D7080 */ sll $t6, $t5, 2 +/* 00DA0 80AE8050 000D7080 */ sll $t6, $t5, 2 /* 00DA4 80AE8054 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 00DA8 80AE8058 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 00DAC 80AE805C 01CF2021 */ addu $a0, $t6, $t7 +/* 00DAC 80AE805C 01CF2021 */ addu $a0, $t6, $t7 /* 00DB0 80AE8060 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 00DB4 80AE8064 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 00DB8 80AE8068 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00DBC 80AE806C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00DC0 80AE8070 00E12824 */ and $a1, $a3, $at +/* 00DC0 80AE8070 00E12824 */ and $a1, $a3, $at /* 00DC4 80AE8074 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00DC8 80AE8078 0305C821 */ addu $t9, $t8, $a1 -/* 00DCC 80AE807C 03264821 */ addu $t1, $t9, $a2 +/* 00DC8 80AE8078 0305C821 */ addu $t9, $t8, $a1 +/* 00DCC 80AE807C 03264821 */ addu $t1, $t9, $a2 /* 00DD0 80AE8080 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 00DD4 80AE8084 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 00DD8 80AE8088 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,8 +50,8 @@ glabel func_80AE7FDC /* 00DEC 80AE809C 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 00DF0 80AE80A0 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 00DF4 80AE80A4 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 00DF8 80AE80A8 01856821 */ addu $t5, $t4, $a1 -/* 00DFC 80AE80AC 01A67021 */ addu $t6, $t5, $a2 +/* 00DF8 80AE80A8 01856821 */ addu $t5, $t4, $a1 +/* 00DFC 80AE80AC 01A67021 */ addu $t6, $t5, $a2 /* 00E00 80AE80B0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 00E04 80AE80B4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 00E08 80AE80B8 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 @@ -67,26 +67,26 @@ glabel func_80AE7FDC /* 00E30 80AE80E0 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 00E34 80AE80E4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 00E38 80AE80E8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00E3C 80AE80EC 8FA30070 */ lw $v1, 0x0070($sp) -/* 00E40 80AE80F0 8FA40074 */ lw $a0, 0x0074($sp) +/* 00E3C 80AE80EC 8FA30070 */ lw $v1, 0x0070($sp) +/* 00E40 80AE80F0 8FA40074 */ lw $a0, 0x0074($sp) /* 00E44 80AE80F4 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 00E48 80AE80F8 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 00E4C 80AE80FC 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 00E50 80AE8100 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00E54 80AE8104 AFA00014 */ sw $zero, 0x0014($sp) -/* 00E58 80AE8108 AFA00010 */ sw $zero, 0x0010($sp) -/* 00E5C 80AE810C 0C0286B2 */ jal func_800A1AC8 -/* 00E60 80AE8110 AFA30018 */ sw $v1, 0x0018($sp) -/* 00E64 80AE8114 8FAC0074 */ lw $t4, 0x0074($sp) +/* 00E54 80AE8104 AFA00014 */ sw $zero, 0x0014($sp) +/* 00E58 80AE8108 AFA00010 */ sw $zero, 0x0010($sp) +/* 00E5C 80AE810C 0C0286B2 */ jal SkelAnime_DrawSV +/* 00E60 80AE8110 AFA30018 */ sw $v1, 0x0018($sp) +/* 00E64 80AE8114 8FAC0074 */ lw $t4, 0x0074($sp) /* 00E68 80AE8118 3C0680AF */ lui $a2, %hi(D_80AE828C) ## $a2 = 80AF0000 /* 00E6C 80AE811C 24C6828C */ addiu $a2, $a2, %lo(D_80AE828C) ## $a2 = 80AE828C /* 00E70 80AE8120 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 00E74 80AE8124 240701B5 */ addiu $a3, $zero, 0x01B5 ## $a3 = 000001B5 -/* 00E78 80AE8128 0C031AD5 */ jal func_800C6B54 +/* 00E78 80AE8128 0C031AD5 */ jal func_800C6B54 /* 00E7C 80AE812C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00E80 80AE8130 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00E80 80AE8130 8FBF0024 */ lw $ra, 0x0024($sp) /* 00E84 80AE8134 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 00E88 80AE8138 03E00008 */ jr $ra +/* 00E88 80AE8138 03E00008 */ jr $ra /* 00E8C 80AE813C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s index 38cce2b63e..87d2c6f68b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s @@ -1,107 +1,107 @@ glabel EnRu1_Init /* 05500 80AF0110 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 05504 80AF0114 AFB10028 */ sw $s1, 0x0028($sp) -/* 05508 80AF0118 AFB00024 */ sw $s0, 0x0024($sp) +/* 05504 80AF0114 AFB10028 */ sw $s1, 0x0028($sp) +/* 05508 80AF0118 AFB00024 */ sw $s0, 0x0024($sp) /* 0550C 80AF011C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05510 80AF0120 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05514 80AF0124 AFBF002C */ sw $ra, 0x002C($sp) +/* 05514 80AF0124 AFBF002C */ sw $ra, 0x002C($sp) /* 05518 80AF0128 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0551C 80AF012C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 05520 80AF0130 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 05524 80AF0134 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 05528 80AF0138 0C00AC78 */ jal ActorShape_Init - + /* 0552C 80AF013C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 05530 80AF0140 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 05534 80AF0144 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 05538 80AF0148 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 /* 0553C 80AF014C 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 05540 80AF0150 AFB80018 */ sw $t8, 0x0018($sp) -/* 05544 80AF0154 AFAF0014 */ sw $t7, 0x0014($sp) -/* 05548 80AF0158 AFAE0010 */ sw $t6, 0x0010($sp) +/* 05540 80AF0150 AFB80018 */ sw $t8, 0x0018($sp) +/* 05544 80AF0154 AFAF0014 */ sw $t7, 0x0014($sp) +/* 05548 80AF0158 AFAE0010 */ sw $t6, 0x0010($sp) /* 0554C 80AF015C 24C62700 */ addiu $a2, $a2, 0x2700 ## $a2 = 06012700 /* 05550 80AF0160 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05554 80AF0164 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 05558 80AF0168 0C0291BE */ jal func_800A46F8 +/* 05558 80AF0168 0C0291BE */ jal SkelAnime_InitSV /* 0555C 80AF016C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 05560 80AF0170 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05564 80AF0174 0C2BAB48 */ jal func_80AEAD20 +/* 05564 80AF0174 0C2BAB48 */ jal func_80AEAD20 /* 05568 80AF0178 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0556C 80AF017C 0C2BAB7C */ jal func_80AEADF0 +/* 0556C 80AF017C 0C2BAB7C */ jal func_80AEADF0 /* 05570 80AF0180 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05574 80AF0184 2C41000B */ sltiu $at, $v0, 0x000B -/* 05578 80AF0188 1020002E */ beq $at, $zero, .L80AF0244 -/* 0557C 80AF018C 0002C880 */ sll $t9, $v0, 2 +/* 05574 80AF0184 2C41000B */ sltiu $at, $v0, 0x000B +/* 05578 80AF0188 1020002E */ beq $at, $zero, .L80AF0244 +/* 0557C 80AF018C 0002C880 */ sll $t9, $v0, 2 /* 05580 80AF0190 3C0180AF */ lui $at, %hi(jtbl_80AF1C60) ## $at = 80AF0000 -/* 05584 80AF0194 00390821 */ addu $at, $at, $t9 -/* 05588 80AF0198 8C391C60 */ lw $t9, %lo(jtbl_80AF1C60)($at) -/* 0558C 80AF019C 03200008 */ jr $t9 +/* 05584 80AF0194 00390821 */ addu $at, $at, $t9 +/* 05588 80AF0198 8C391C60 */ lw $t9, %lo(jtbl_80AF1C60)($at) +/* 0558C 80AF019C 03200008 */ jr $t9 /* 05590 80AF01A0 00000000 */ nop glabel L80AF01A4 /* 05594 80AF01A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05598 80AF01A8 0C2BB368 */ jal func_80AECDA0 +/* 05598 80AF01A8 0C2BB368 */ jal func_80AECDA0 /* 0559C 80AF01AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055A0 80AF01B0 1000002D */ beq $zero, $zero, .L80AF0268 -/* 055A4 80AF01B4 8FBF002C */ lw $ra, 0x002C($sp) +/* 055A0 80AF01B0 1000002D */ beq $zero, $zero, .L80AF0268 +/* 055A4 80AF01B4 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF01B8 /* 055A8 80AF01B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055AC 80AF01BC 0C2BACF7 */ jal func_80AEB3DC +/* 055AC 80AF01BC 0C2BACF7 */ jal func_80AEB3DC /* 055B0 80AF01C0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055B4 80AF01C4 10000028 */ beq $zero, $zero, .L80AF0268 -/* 055B8 80AF01C8 8FBF002C */ lw $ra, 0x002C($sp) +/* 055B4 80AF01C4 10000028 */ beq $zero, $zero, .L80AF0268 +/* 055B8 80AF01C8 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF01CC /* 055BC 80AF01CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055C0 80AF01D0 0C2BB0C8 */ jal func_80AEC320 +/* 055C0 80AF01D0 0C2BB0C8 */ jal func_80AEC320 /* 055C4 80AF01D4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055C8 80AF01D8 10000023 */ beq $zero, $zero, .L80AF0268 -/* 055CC 80AF01DC 8FBF002C */ lw $ra, 0x002C($sp) +/* 055C8 80AF01D8 10000023 */ beq $zero, $zero, .L80AF0268 +/* 055CC 80AF01DC 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF01E0 /* 055D0 80AF01E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055D4 80AF01E4 0C2BB513 */ jal func_80AED44C +/* 055D4 80AF01E4 0C2BB513 */ jal func_80AED44C /* 055D8 80AF01E8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055DC 80AF01EC 1000001E */ beq $zero, $zero, .L80AF0268 -/* 055E0 80AF01F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 055DC 80AF01EC 1000001E */ beq $zero, $zero, .L80AF0268 +/* 055E0 80AF01F0 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF01F4 /* 055E4 80AF01F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055E8 80AF01F8 0C2BBF15 */ jal func_80AEFC54 +/* 055E8 80AF01F8 0C2BBF15 */ jal func_80AEFC54 /* 055EC 80AF01FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055F0 80AF0200 10000019 */ beq $zero, $zero, .L80AF0268 -/* 055F4 80AF0204 8FBF002C */ lw $ra, 0x002C($sp) +/* 055F0 80AF0200 10000019 */ beq $zero, $zero, .L80AF0268 +/* 055F4 80AF0204 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF0208 /* 055F8 80AF0208 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055FC 80AF020C 0C2BBF4E */ jal func_80AEFD38 +/* 055FC 80AF020C 0C2BBF4E */ jal func_80AEFD38 /* 05600 80AF0210 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05604 80AF0214 10000014 */ beq $zero, $zero, .L80AF0268 -/* 05608 80AF0218 8FBF002C */ lw $ra, 0x002C($sp) +/* 05604 80AF0214 10000014 */ beq $zero, $zero, .L80AF0268 +/* 05608 80AF0218 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF021C /* 0560C 80AF021C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05610 80AF0220 0C2BBFE5 */ jal func_80AEFF94 +/* 05610 80AF0220 0C2BBFE5 */ jal func_80AEFF94 /* 05614 80AF0224 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05618 80AF0228 1000000F */ beq $zero, $zero, .L80AF0268 -/* 0561C 80AF022C 8FBF002C */ lw $ra, 0x002C($sp) +/* 05618 80AF0228 1000000F */ beq $zero, $zero, .L80AF0268 +/* 0561C 80AF022C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF0230 /* 05620 80AF0230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05624 80AF0234 0C2BC014 */ jal func_80AF0050 +/* 05624 80AF0234 0C2BC014 */ jal func_80AF0050 /* 05628 80AF0238 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0562C 80AF023C 1000000A */ beq $zero, $zero, .L80AF0268 -/* 05630 80AF0240 8FBF002C */ lw $ra, 0x002C($sp) +/* 0562C 80AF023C 1000000A */ beq $zero, $zero, .L80AF0268 +/* 05630 80AF0240 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF0244 .L80AF0244: /* 05634 80AF0244 0C00B55C */ jal Actor_Kill - + /* 05638 80AF0248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0563C 80AF024C 0C2BAB7C */ jal func_80AEADF0 +/* 0563C 80AF024C 0C2BAB7C */ jal func_80AEADF0 /* 05640 80AF0250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05644 80AF0254 3C0480AF */ lui $a0, %hi(D_80AF1AFC) ## $a0 = 80AF0000 /* 05648 80AF0258 24841AFC */ addiu $a0, $a0, %lo(D_80AF1AFC) ## $a0 = 80AF1AFC /* 0564C 80AF025C 0C00084C */ jal osSyncPrintf - + /* 05650 80AF0260 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 05654 80AF0264 8FBF002C */ lw $ra, 0x002C($sp) +/* 05654 80AF0264 8FBF002C */ lw $ra, 0x002C($sp) .L80AF0268: -/* 05658 80AF0268 8FB00024 */ lw $s0, 0x0024($sp) -/* 0565C 80AF026C 8FB10028 */ lw $s1, 0x0028($sp) -/* 05660 80AF0270 03E00008 */ jr $ra +/* 05658 80AF0268 8FB00024 */ lw $s0, 0x0024($sp) +/* 0565C 80AF026C 8FB10028 */ lw $s1, 0x0028($sp) +/* 05660 80AF0270 03E00008 */ jr $ra /* 05664 80AF0274 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s index aa5a780532..287701edfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s @@ -1,51 +1,51 @@ glabel func_80AF0400 /* 057F0 80AF0400 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 057F4 80AF0404 AFBF002C */ sw $ra, 0x002C($sp) -/* 057F8 80AF0408 AFB00028 */ sw $s0, 0x0028($sp) -/* 057FC 80AF040C AFA40088 */ sw $a0, 0x0088($sp) -/* 05800 80AF0410 AFA5008C */ sw $a1, 0x008C($sp) +/* 057F4 80AF0404 AFBF002C */ sw $ra, 0x002C($sp) +/* 057F8 80AF0408 AFB00028 */ sw $s0, 0x0028($sp) +/* 057FC 80AF040C AFA40088 */ sw $a0, 0x0088($sp) +/* 05800 80AF0410 AFA5008C */ sw $a1, 0x008C($sp) /* 05804 80AF0414 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 05808 80AF0418 3C1880AF */ lui $t8, %hi(D_80AF0858) ## $t8 = 80AF0000 /* 0580C 80AF041C 3C0A80AF */ lui $t2, %hi(D_80AF0870) ## $t2 = 80AF0000 -/* 05810 80AF0420 00027880 */ sll $t7, $v0, 2 -/* 05814 80AF0424 030FC021 */ addu $t8, $t8, $t7 -/* 05818 80AF0428 8F180858 */ lw $t8, %lo(D_80AF0858)($t8) +/* 05810 80AF0420 00027880 */ sll $t7, $v0, 2 +/* 05814 80AF0424 030FC021 */ addu $t8, $t8, $t7 +/* 05818 80AF0428 8F180858 */ lw $t8, %lo(D_80AF0858)($t8) /* 0581C 80AF042C 3C0680AF */ lui $a2, %hi(D_80AF1B54) ## $a2 = 80AF0000 /* 05820 80AF0430 24C61B54 */ addiu $a2, $a2, %lo(D_80AF1B54) ## $a2 = 80AF1B54 -/* 05824 80AF0434 AFB80078 */ sw $t8, 0x0078($sp) +/* 05824 80AF0434 AFB80078 */ sw $t8, 0x0078($sp) /* 05828 80AF0438 84830260 */ lh $v1, 0x0260($a0) ## 00000260 /* 0582C 80AF043C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 05830 80AF0440 24070502 */ addiu $a3, $zero, 0x0502 ## $a3 = 00000502 -/* 05834 80AF0444 0003C880 */ sll $t9, $v1, 2 -/* 05838 80AF0448 01595021 */ addu $t2, $t2, $t9 -/* 0583C 80AF044C 8D4A0870 */ lw $t2, %lo(D_80AF0870)($t2) -/* 05840 80AF0450 AFAA006C */ sw $t2, 0x006C($sp) +/* 05834 80AF0444 0003C880 */ sll $t9, $v1, 2 +/* 05838 80AF0448 01595021 */ addu $t2, $t2, $t9 +/* 0583C 80AF044C 8D4A0870 */ lw $t2, %lo(D_80AF0870)($t2) +/* 05840 80AF0450 AFAA006C */ sw $t2, 0x006C($sp) /* 05844 80AF0454 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 05848 80AF0458 0C031AB1 */ jal func_800C6AC4 +/* 05848 80AF0458 0C031AB1 */ jal func_800C6AC4 /* 0584C 80AF045C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 05850 80AF0460 8FAC008C */ lw $t4, 0x008C($sp) -/* 05854 80AF0464 0C024F46 */ jal func_80093D18 +/* 05850 80AF0460 8FAC008C */ lw $t4, 0x008C($sp) +/* 05854 80AF0464 0C024F46 */ jal func_80093D18 /* 05858 80AF0468 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 0585C 80AF046C 8FA90078 */ lw $t1, 0x0078($sp) +/* 0585C 80AF046C 8FA90078 */ lw $t1, 0x0078($sp) /* 05860 80AF0470 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 05864 80AF0474 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 05868 80AF0478 0009C100 */ sll $t8, $t1, 4 -/* 0586C 80AF047C 00187702 */ srl $t6, $t8, 28 +/* 05868 80AF0478 0009C100 */ sll $t8, $t1, 4 +/* 0586C 80AF047C 00187702 */ srl $t6, $t8, 28 /* 05870 80AF0480 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 05874 80AF0484 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 05878 80AF0488 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 0587C 80AF048C 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 05880 80AF0490 000EC880 */ sll $t9, $t6, 2 +/* 05880 80AF0490 000EC880 */ sll $t9, $t6, 2 /* 05884 80AF0494 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 05888 80AF0498 00F92021 */ addu $a0, $a3, $t9 +/* 05888 80AF0498 00F92021 */ addu $a0, $a3, $t9 /* 0588C 80AF049C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 05890 80AF04A0 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 /* 05894 80AF04A4 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 /* 05898 80AF04A8 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 0589C 80AF04AC 01282824 */ and $a1, $t1, $t0 +/* 0589C 80AF04AC 01282824 */ and $a1, $t1, $t0 /* 058A0 80AF04B0 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 058A4 80AF04B4 01455821 */ addu $t3, $t2, $a1 -/* 058A8 80AF04B8 01666021 */ addu $t4, $t3, $a2 +/* 058A4 80AF04B4 01455821 */ addu $t3, $t2, $a1 +/* 058A8 80AF04B8 01666021 */ addu $t4, $t3, $a2 /* 058AC 80AF04BC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 058B0 80AF04C0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 058B4 80AF04C4 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -54,23 +54,23 @@ glabel func_80AF0400 /* 058C0 80AF04D0 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 058C4 80AF04D4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 058C8 80AF04D8 8C8F0000 */ lw $t7, 0x0000($a0) ## 00000000 -/* 058CC 80AF04DC 01E5C021 */ addu $t8, $t7, $a1 -/* 058D0 80AF04E0 03067021 */ addu $t6, $t8, $a2 +/* 058CC 80AF04DC 01E5C021 */ addu $t8, $t7, $a1 +/* 058D0 80AF04E0 03067021 */ addu $t6, $t8, $a2 /* 058D4 80AF04E4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 058D8 80AF04E8 8FA4006C */ lw $a0, 0x006C($sp) +/* 058D8 80AF04E8 8FA4006C */ lw $a0, 0x006C($sp) /* 058DC 80AF04EC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 058E0 80AF04F0 00045100 */ sll $t2, $a0, 4 -/* 058E4 80AF04F4 000A5F02 */ srl $t3, $t2, 28 +/* 058E0 80AF04F0 00045100 */ sll $t2, $a0, 4 +/* 058E4 80AF04F4 000A5F02 */ srl $t3, $t2, 28 /* 058E8 80AF04F8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 058EC 80AF04FC AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 058F0 80AF0500 000B6080 */ sll $t4, $t3, 2 -/* 058F4 80AF0504 00EC6821 */ addu $t5, $a3, $t4 +/* 058F0 80AF0500 000B6080 */ sll $t4, $t3, 2 +/* 058F4 80AF0504 00EC6821 */ addu $t5, $a3, $t4 /* 058F8 80AF0508 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 058FC 80AF050C 8DAF0000 */ lw $t7, 0x0000($t5) ## 00000008 -/* 05900 80AF0510 0088C024 */ and $t8, $a0, $t0 +/* 05900 80AF0510 0088C024 */ and $t8, $a0, $t0 /* 05904 80AF0514 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 05908 80AF0518 01F87021 */ addu $t6, $t7, $t8 -/* 0590C 80AF051C 01C6C821 */ addu $t9, $t6, $a2 +/* 05908 80AF0518 01F87021 */ addu $t6, $t7, $t8 +/* 0590C 80AF051C 01C6C821 */ addu $t9, $t6, $a2 /* 05910 80AF0520 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 05914 80AF0524 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 05918 80AF0528 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 @@ -87,7 +87,7 @@ glabel func_80AF0400 /* 05944 80AF0554 27186290 */ addiu $t8, $t8, 0x6290 ## $t8 = 80116290 /* 05948 80AF0558 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 0594C 80AF055C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 05950 80AF0560 8FA30088 */ lw $v1, 0x0088($sp) +/* 05950 80AF0560 8FA30088 */ lw $v1, 0x0088($sp) /* 05954 80AF0564 3C1980AF */ lui $t9, %hi(func_80AF0368) ## $t9 = 80AF0000 /* 05958 80AF0568 3C0E80AF */ lui $t6, %hi(func_80AF02E8) ## $t6 = 80AF0000 /* 0595C 80AF056C 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C @@ -96,25 +96,25 @@ glabel func_80AF0400 /* 05968 80AF0578 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E /* 0596C 80AF057C 25CE02E8 */ addiu $t6, $t6, %lo(func_80AF02E8) ## $t6 = 80AF02E8 /* 05970 80AF0580 27390368 */ addiu $t9, $t9, %lo(func_80AF0368) ## $t9 = 80AF0368 -/* 05974 80AF0584 AFB90014 */ sw $t9, 0x0014($sp) -/* 05978 80AF0588 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0597C 80AF058C AFA30018 */ sw $v1, 0x0018($sp) +/* 05974 80AF0584 AFB90014 */ sw $t9, 0x0014($sp) +/* 05978 80AF0588 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0597C 80AF058C AFA30018 */ sw $v1, 0x0018($sp) /* 05980 80AF0590 8E0A02C0 */ lw $t2, 0x02C0($s0) ## 000002C0 -/* 05984 80AF0594 8FA4008C */ lw $a0, 0x008C($sp) -/* 05988 80AF0598 0C0289CF */ jal func_800A273C -/* 0598C 80AF059C AFAA001C */ sw $t2, 0x001C($sp) +/* 05984 80AF0594 8FA4008C */ lw $a0, 0x008C($sp) +/* 05988 80AF0598 0C0289CF */ jal SkelAnime_DrawSV2 +/* 0598C 80AF059C AFAA001C */ sw $t2, 0x001C($sp) /* 05990 80AF05A0 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 05994 80AF05A4 8FAB008C */ lw $t3, 0x008C($sp) +/* 05994 80AF05A4 8FAB008C */ lw $t3, 0x008C($sp) /* 05998 80AF05A8 3C0680AF */ lui $a2, %hi(D_80AF1B64) ## $a2 = 80AF0000 /* 0599C 80AF05AC 24C61B64 */ addiu $a2, $a2, %lo(D_80AF1B64) ## $a2 = 80AF1B64 /* 059A0 80AF05B0 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 059A4 80AF05B4 2407051D */ addiu $a3, $zero, 0x051D ## $a3 = 0000051D -/* 059A8 80AF05B8 0C031AD5 */ jal func_800C6B54 +/* 059A8 80AF05B8 0C031AD5 */ jal func_800C6B54 /* 059AC 80AF05BC 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 059B0 80AF05C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 059B4 80AF05C4 8FB00028 */ lw $s0, 0x0028($sp) +/* 059B0 80AF05C0 8FBF002C */ lw $ra, 0x002C($sp) +/* 059B4 80AF05C4 8FB00028 */ lw $s0, 0x0028($sp) /* 059B8 80AF05C8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 059BC 80AF05CC 03E00008 */ jr $ra +/* 059BC 80AF05CC 03E00008 */ jr $ra /* 059C0 80AF05D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s index 9a2c3bf76b..6489c7fbf8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s @@ -1,52 +1,52 @@ glabel func_80AF05D4 /* 059C4 80AF05D4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 059C8 80AF05D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 059CC 80AF05DC AFB10028 */ sw $s1, 0x0028($sp) -/* 059D0 80AF05E0 AFB00024 */ sw $s0, 0x0024($sp) -/* 059D4 80AF05E4 AFA5008C */ sw $a1, 0x008C($sp) +/* 059C8 80AF05D8 AFBF002C */ sw $ra, 0x002C($sp) +/* 059CC 80AF05DC AFB10028 */ sw $s1, 0x0028($sp) +/* 059D0 80AF05E0 AFB00024 */ sw $s0, 0x0024($sp) +/* 059D4 80AF05E4 AFA5008C */ sw $a1, 0x008C($sp) /* 059D8 80AF05E8 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 059DC 80AF05EC 3C0F80AF */ lui $t7, %hi(D_80AF0858) ## $t7 = 80AF0000 /* 059E0 80AF05F0 3C1980AF */ lui $t9, %hi(D_80AF0870) ## $t9 = 80AF0000 -/* 059E4 80AF05F4 00027080 */ sll $t6, $v0, 2 -/* 059E8 80AF05F8 01EE7821 */ addu $t7, $t7, $t6 -/* 059EC 80AF05FC 8DEF0858 */ lw $t7, %lo(D_80AF0858)($t7) +/* 059E4 80AF05F4 00027080 */ sll $t6, $v0, 2 +/* 059E8 80AF05F8 01EE7821 */ addu $t7, $t7, $t6 +/* 059EC 80AF05FC 8DEF0858 */ lw $t7, %lo(D_80AF0858)($t7) /* 059F0 80AF0600 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 059F4 80AF0604 3C0680AF */ lui $a2, %hi(D_80AF1B74) ## $a2 = 80AF0000 -/* 059F8 80AF0608 AFAF0078 */ sw $t7, 0x0078($sp) +/* 059F8 80AF0608 AFAF0078 */ sw $t7, 0x0078($sp) /* 059FC 80AF060C 84830260 */ lh $v1, 0x0260($a0) ## 00000260 /* 05A00 80AF0610 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 05A04 80AF0614 24C61B74 */ addiu $a2, $a2, %lo(D_80AF1B74) ## $a2 = 80AF1B74 -/* 05A08 80AF0618 0003C080 */ sll $t8, $v1, 2 -/* 05A0C 80AF061C 0338C821 */ addu $t9, $t9, $t8 -/* 05A10 80AF0620 8F390870 */ lw $t9, %lo(D_80AF0870)($t9) +/* 05A08 80AF0618 0003C080 */ sll $t8, $v1, 2 +/* 05A0C 80AF061C 0338C821 */ addu $t9, $t9, $t8 +/* 05A10 80AF0620 8F390870 */ lw $t9, %lo(D_80AF0870)($t9) /* 05A14 80AF0624 2407052C */ addiu $a3, $zero, 0x052C ## $a3 = 0000052C -/* 05A18 80AF0628 AFB9006C */ sw $t9, 0x006C($sp) +/* 05A18 80AF0628 AFB9006C */ sw $t9, 0x006C($sp) /* 05A1C 80AF062C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 05A20 80AF0630 0C031AB1 */ jal func_800C6AC4 +/* 05A20 80AF0630 0C031AB1 */ jal func_800C6AC4 /* 05A24 80AF0634 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 05A28 80AF0638 8FAB008C */ lw $t3, 0x008C($sp) -/* 05A2C 80AF063C 0C024F61 */ jal func_80093D84 +/* 05A28 80AF0638 8FAB008C */ lw $t3, 0x008C($sp) +/* 05A2C 80AF063C 0C024F61 */ jal func_80093D84 /* 05A30 80AF0640 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 05A34 80AF0644 8FA90078 */ lw $t1, 0x0078($sp) +/* 05A34 80AF0644 8FA90078 */ lw $t1, 0x0078($sp) /* 05A38 80AF0648 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 05A3C 80AF064C 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 05A40 80AF0650 00097100 */ sll $t6, $t1, 4 -/* 05A44 80AF0654 000E7F02 */ srl $t7, $t6, 28 +/* 05A40 80AF0650 00097100 */ sll $t6, $t1, 4 +/* 05A44 80AF0654 000E7F02 */ srl $t7, $t6, 28 /* 05A48 80AF0658 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 05A4C 80AF065C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 05A50 80AF0660 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 05A54 80AF0664 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 05A58 80AF0668 000FC080 */ sll $t8, $t7, 2 +/* 05A58 80AF0668 000FC080 */ sll $t8, $t7, 2 /* 05A5C 80AF066C 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 05A60 80AF0670 00F82021 */ addu $a0, $a3, $t8 +/* 05A60 80AF0670 00F82021 */ addu $a0, $a3, $t8 /* 05A64 80AF0674 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 05A68 80AF0678 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 /* 05A6C 80AF067C 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 /* 05A70 80AF0680 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 05A74 80AF0684 01282824 */ and $a1, $t1, $t0 +/* 05A74 80AF0684 01282824 */ and $a1, $t1, $t0 /* 05A78 80AF0688 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 05A7C 80AF068C 03255021 */ addu $t2, $t9, $a1 -/* 05A80 80AF0690 01465821 */ addu $t3, $t2, $a2 +/* 05A7C 80AF068C 03255021 */ addu $t2, $t9, $a1 +/* 05A80 80AF0690 01465821 */ addu $t3, $t2, $a2 /* 05A84 80AF0694 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 05A88 80AF0698 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 05A8C 80AF069C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -55,23 +55,23 @@ glabel func_80AF05D4 /* 05A98 80AF06A8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 05A9C 80AF06AC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 05AA0 80AF06B0 8C8D0000 */ lw $t5, 0x0000($a0) ## 00000000 -/* 05AA4 80AF06B4 01A57021 */ addu $t6, $t5, $a1 -/* 05AA8 80AF06B8 01C67821 */ addu $t7, $t6, $a2 +/* 05AA4 80AF06B4 01A57021 */ addu $t6, $t5, $a1 +/* 05AA8 80AF06B8 01C67821 */ addu $t7, $t6, $a2 /* 05AAC 80AF06BC AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 05AB0 80AF06C0 8FA4006C */ lw $a0, 0x006C($sp) +/* 05AB0 80AF06C0 8FA4006C */ lw $a0, 0x006C($sp) /* 05AB4 80AF06C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 05AB8 80AF06C8 0004C900 */ sll $t9, $a0, 4 -/* 05ABC 80AF06CC 00195702 */ srl $t2, $t9, 28 +/* 05AB8 80AF06C8 0004C900 */ sll $t9, $a0, 4 +/* 05ABC 80AF06CC 00195702 */ srl $t2, $t9, 28 /* 05AC0 80AF06D0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 05AC4 80AF06D4 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 05AC8 80AF06D8 000A5880 */ sll $t3, $t2, 2 -/* 05ACC 80AF06DC 00EB6021 */ addu $t4, $a3, $t3 +/* 05AC8 80AF06D8 000A5880 */ sll $t3, $t2, 2 +/* 05ACC 80AF06DC 00EB6021 */ addu $t4, $a3, $t3 /* 05AD0 80AF06E0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 05AD4 80AF06E4 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000008 -/* 05AD8 80AF06E8 00887024 */ and $t6, $a0, $t0 +/* 05AD8 80AF06E8 00887024 */ and $t6, $a0, $t0 /* 05ADC 80AF06EC 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 05AE0 80AF06F0 01AE7821 */ addu $t7, $t5, $t6 -/* 05AE4 80AF06F4 01E6C021 */ addu $t8, $t7, $a2 +/* 05AE0 80AF06F0 01AE7821 */ addu $t7, $t5, $t6 +/* 05AE4 80AF06F4 01E6C021 */ addu $t8, $t7, $a2 /* 05AE8 80AF06F8 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 05AEC 80AF06FC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 05AF0 80AF0700 3C0F8011 */ lui $t7, 0x8011 ## $t7 = 80110000 @@ -95,25 +95,25 @@ glabel func_80AF05D4 /* 05B38 80AF0748 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 05B3C 80AF074C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 05B40 80AF0750 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 05B44 80AF0754 AFB10018 */ sw $s1, 0x0018($sp) -/* 05B48 80AF0758 AFA00014 */ sw $zero, 0x0014($sp) -/* 05B4C 80AF075C AFB80010 */ sw $t8, 0x0010($sp) +/* 05B44 80AF0754 AFB10018 */ sw $s1, 0x0018($sp) +/* 05B48 80AF0758 AFA00014 */ sw $zero, 0x0014($sp) +/* 05B4C 80AF075C AFB80010 */ sw $t8, 0x0010($sp) /* 05B50 80AF0760 8E1902D0 */ lw $t9, 0x02D0($s0) ## 000002D0 -/* 05B54 80AF0764 8FA4008C */ lw $a0, 0x008C($sp) -/* 05B58 80AF0768 0C0289CF */ jal func_800A273C -/* 05B5C 80AF076C AFB9001C */ sw $t9, 0x001C($sp) +/* 05B54 80AF0764 8FA4008C */ lw $a0, 0x008C($sp) +/* 05B58 80AF0768 0C0289CF */ jal SkelAnime_DrawSV2 +/* 05B5C 80AF076C AFB9001C */ sw $t9, 0x001C($sp) /* 05B60 80AF0770 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 05B64 80AF0774 8FAA008C */ lw $t2, 0x008C($sp) +/* 05B64 80AF0774 8FAA008C */ lw $t2, 0x008C($sp) /* 05B68 80AF0778 3C0680AF */ lui $a2, %hi(D_80AF1B84) ## $a2 = 80AF0000 /* 05B6C 80AF077C 24C61B84 */ addiu $a2, $a2, %lo(D_80AF1B84) ## $a2 = 80AF1B84 /* 05B70 80AF0780 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 05B74 80AF0784 24070549 */ addiu $a3, $zero, 0x0549 ## $a3 = 00000549 -/* 05B78 80AF0788 0C031AD5 */ jal func_800C6B54 +/* 05B78 80AF0788 0C031AD5 */ jal func_800C6B54 /* 05B7C 80AF078C 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 05B80 80AF0790 8FBF002C */ lw $ra, 0x002C($sp) -/* 05B84 80AF0794 8FB00024 */ lw $s0, 0x0024($sp) -/* 05B88 80AF0798 8FB10028 */ lw $s1, 0x0028($sp) -/* 05B8C 80AF079C 03E00008 */ jr $ra +/* 05B80 80AF0790 8FBF002C */ lw $ra, 0x002C($sp) +/* 05B84 80AF0794 8FB00024 */ lw $s0, 0x0024($sp) +/* 05B88 80AF0798 8FB10028 */ lw $s1, 0x0028($sp) +/* 05B8C 80AF079C 03E00008 */ jr $ra /* 05B90 80AF07A0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s index 2aa966820b..49f5582a9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s @@ -1,71 +1,71 @@ glabel EnRu2_Init /* 018CC 80AF3E1C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 018D0 80AF3E20 AFB10028 */ sw $s1, 0x0028($sp) -/* 018D4 80AF3E24 AFB00024 */ sw $s0, 0x0024($sp) +/* 018D0 80AF3E20 AFB10028 */ sw $s1, 0x0028($sp) +/* 018D4 80AF3E24 AFB00024 */ sw $s0, 0x0024($sp) /* 018D8 80AF3E28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 018DC 80AF3E2C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 018E0 80AF3E30 AFBF002C */ sw $ra, 0x002C($sp) +/* 018E0 80AF3E30 AFBF002C */ sw $ra, 0x002C($sp) /* 018E4 80AF3E34 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 018E8 80AF3E38 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 018EC 80AF3E3C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 018F0 80AF3E40 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 018F4 80AF3E44 0C00AC78 */ jal ActorShape_Init - + /* 018F8 80AF3E48 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 018FC 80AF3E4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01900 80AF3E50 0C2BC954 */ jal func_80AF2550 +/* 01900 80AF3E50 0C2BC954 */ jal func_80AF2550 /* 01904 80AF3E54 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01908 80AF3E58 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 0190C 80AF3E5C 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 01910 80AF3E60 260F021A */ addiu $t7, $s0, 0x021A ## $t7 = 0000021A /* 01914 80AF3E64 24180017 */ addiu $t8, $zero, 0x0017 ## $t8 = 00000017 -/* 01918 80AF3E68 AFB80018 */ sw $t8, 0x0018($sp) -/* 0191C 80AF3E6C AFAF0014 */ sw $t7, 0x0014($sp) -/* 01920 80AF3E70 AFAE0010 */ sw $t6, 0x0010($sp) +/* 01918 80AF3E68 AFB80018 */ sw $t8, 0x0018($sp) +/* 0191C 80AF3E6C AFAF0014 */ sw $t7, 0x0014($sp) +/* 01920 80AF3E70 AFAE0010 */ sw $t6, 0x0010($sp) /* 01924 80AF3E74 24C6C700 */ addiu $a2, $a2, 0xC700 ## $a2 = 0600C700 /* 01928 80AF3E78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0192C 80AF3E7C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01930 80AF3E80 0C0291BE */ jal func_800A46F8 +/* 01930 80AF3E80 0C0291BE */ jal SkelAnime_InitSV /* 01934 80AF3E84 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01938 80AF3E88 0C2BC9A8 */ jal func_80AF26A0 +/* 01938 80AF3E88 0C2BC9A8 */ jal func_80AF26A0 /* 0193C 80AF3E8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01940 80AF3E90 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01944 80AF3E94 10410009 */ beq $v0, $at, .L80AF3EBC +/* 01944 80AF3E94 10410009 */ beq $v0, $at, .L80AF3EBC /* 01948 80AF3E98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0194C 80AF3E9C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01950 80AF3EA0 1041000A */ beq $v0, $at, .L80AF3ECC +/* 01950 80AF3EA0 1041000A */ beq $v0, $at, .L80AF3ECC /* 01954 80AF3EA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01958 80AF3EA8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0195C 80AF3EAC 1041000B */ beq $v0, $at, .L80AF3EDC +/* 0195C 80AF3EAC 1041000B */ beq $v0, $at, .L80AF3EDC /* 01960 80AF3EB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01964 80AF3EB4 1000000D */ beq $zero, $zero, .L80AF3EEC +/* 01964 80AF3EB4 1000000D */ beq $zero, $zero, .L80AF3EEC /* 01968 80AF3EB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AF3EBC: -/* 0196C 80AF3EBC 0C2BCB87 */ jal func_80AF2E1C +/* 0196C 80AF3EBC 0C2BCB87 */ jal func_80AF2E1C /* 01970 80AF3EC0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01974 80AF3EC4 1000000C */ beq $zero, $zero, .L80AF3EF8 +/* 01974 80AF3EC4 1000000C */ beq $zero, $zero, .L80AF3EF8 /* 01978 80AF3EC8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 .L80AF3ECC: -/* 0197C 80AF3ECC 0C2BCCE5 */ jal func_80AF3394 +/* 0197C 80AF3ECC 0C2BCCE5 */ jal func_80AF3394 /* 01980 80AF3ED0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01984 80AF3ED4 10000008 */ beq $zero, $zero, .L80AF3EF8 +/* 01984 80AF3ED4 10000008 */ beq $zero, $zero, .L80AF3EF8 /* 01988 80AF3ED8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 .L80AF3EDC: -/* 0198C 80AF3EDC 0C2BCDD1 */ jal func_80AF3744 +/* 0198C 80AF3EDC 0C2BCDD1 */ jal func_80AF3744 /* 01990 80AF3EE0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01994 80AF3EE4 10000004 */ beq $zero, $zero, .L80AF3EF8 +/* 01994 80AF3EE4 10000004 */ beq $zero, $zero, .L80AF3EF8 /* 01998 80AF3EE8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 .L80AF3EEC: -/* 0199C 80AF3EEC 0C2BCA65 */ jal func_80AF2994 +/* 0199C 80AF3EEC 0C2BCA65 */ jal func_80AF2994 /* 019A0 80AF3EF0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 019A4 80AF3EF4 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 .L80AF3EF8: /* 019A8 80AF3EF8 A20002C2 */ sb $zero, 0x02C2($s0) ## 000002C2 /* 019AC 80AF3EFC A21902C3 */ sb $t9, 0x02C3($s0) ## 000002C3 -/* 019B0 80AF3F00 8FBF002C */ lw $ra, 0x002C($sp) -/* 019B4 80AF3F04 8FB10028 */ lw $s1, 0x0028($sp) -/* 019B8 80AF3F08 8FB00024 */ lw $s0, 0x0024($sp) -/* 019BC 80AF3F0C 03E00008 */ jr $ra +/* 019B0 80AF3F00 8FBF002C */ lw $ra, 0x002C($sp) +/* 019B4 80AF3F04 8FB10028 */ lw $s1, 0x0028($sp) +/* 019B8 80AF3F08 8FB00024 */ lw $s0, 0x0024($sp) +/* 019BC 80AF3F0C 03E00008 */ jr $ra /* 019C0 80AF3F10 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s index f91d4c693c..8c78114c54 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s @@ -1,45 +1,45 @@ glabel func_80AF321C /* 00CCC 80AF321C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00CD0 80AF3220 AFBF002C */ sw $ra, 0x002C($sp) -/* 00CD4 80AF3224 AFB00028 */ sw $s0, 0x0028($sp) -/* 00CD8 80AF3228 AFA40078 */ sw $a0, 0x0078($sp) -/* 00CDC 80AF322C AFA5007C */ sw $a1, 0x007C($sp) +/* 00CD0 80AF3220 AFBF002C */ sw $ra, 0x002C($sp) +/* 00CD4 80AF3224 AFB00028 */ sw $s0, 0x0028($sp) +/* 00CD8 80AF3228 AFA40078 */ sw $a0, 0x0078($sp) +/* 00CDC 80AF322C AFA5007C */ sw $a1, 0x007C($sp) /* 00CE0 80AF3230 848202A4 */ lh $v0, 0x02A4($a0) ## 000002A4 /* 00CE4 80AF3234 3C1880AF */ lui $t8, %hi(D_80AF410C) ## $t8 = 80AF0000 /* 00CE8 80AF3238 3C0680AF */ lui $a2, %hi(D_80AF5140) ## $a2 = 80AF0000 -/* 00CEC 80AF323C 00027880 */ sll $t7, $v0, 2 -/* 00CF0 80AF3240 030FC021 */ addu $t8, $t8, $t7 -/* 00CF4 80AF3244 8F18410C */ lw $t8, %lo(D_80AF410C)($t8) +/* 00CEC 80AF323C 00027880 */ sll $t7, $v0, 2 +/* 00CF0 80AF3240 030FC021 */ addu $t8, $t8, $t7 +/* 00CF4 80AF3244 8F18410C */ lw $t8, %lo(D_80AF410C)($t8) /* 00CF8 80AF3248 24C65140 */ addiu $a2, $a2, %lo(D_80AF5140) ## $a2 = 80AF5140 /* 00CFC 80AF324C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 00D00 80AF3250 AFB80068 */ sw $t8, 0x0068($sp) +/* 00D00 80AF3250 AFB80068 */ sw $t8, 0x0068($sp) /* 00D04 80AF3254 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00D08 80AF3258 24070108 */ addiu $a3, $zero, 0x0108 ## $a3 = 00000108 -/* 00D0C 80AF325C 0C031AB1 */ jal func_800C6AC4 +/* 00D0C 80AF325C 0C031AB1 */ jal func_800C6AC4 /* 00D10 80AF3260 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00D14 80AF3264 8FA9007C */ lw $t1, 0x007C($sp) -/* 00D18 80AF3268 0C024F61 */ jal func_80093D84 +/* 00D14 80AF3264 8FA9007C */ lw $t1, 0x007C($sp) +/* 00D18 80AF3268 0C024F61 */ jal func_80093D84 /* 00D1C 80AF326C 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 00D20 80AF3270 8FA70068 */ lw $a3, 0x0068($sp) +/* 00D20 80AF3270 8FA70068 */ lw $a3, 0x0068($sp) /* 00D24 80AF3274 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00D28 80AF3278 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00D2C 80AF327C 00076100 */ sll $t4, $a3, 4 -/* 00D30 80AF3280 000C6F02 */ srl $t5, $t4, 28 +/* 00D2C 80AF327C 00076100 */ sll $t4, $a3, 4 +/* 00D30 80AF3280 000C6F02 */ srl $t5, $t4, 28 /* 00D34 80AF3284 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00D38 80AF3288 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 00D3C 80AF328C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 00D40 80AF3290 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 00D44 80AF3294 000D7080 */ sll $t6, $t5, 2 +/* 00D44 80AF3294 000D7080 */ sll $t6, $t5, 2 /* 00D48 80AF3298 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 00D4C 80AF329C 01CF2021 */ addu $a0, $t6, $t7 +/* 00D4C 80AF329C 01CF2021 */ addu $a0, $t6, $t7 /* 00D50 80AF32A0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 00D54 80AF32A4 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 00D58 80AF32A8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00D5C 80AF32AC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00D60 80AF32B0 00E12824 */ and $a1, $a3, $at +/* 00D60 80AF32B0 00E12824 */ and $a1, $a3, $at /* 00D64 80AF32B4 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00D68 80AF32B8 0305C821 */ addu $t9, $t8, $a1 -/* 00D6C 80AF32BC 03264821 */ addu $t1, $t9, $a2 +/* 00D68 80AF32B8 0305C821 */ addu $t9, $t8, $a1 +/* 00D6C 80AF32BC 03264821 */ addu $t1, $t9, $a2 /* 00D70 80AF32C0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 00D74 80AF32C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00D78 80AF32C8 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,11 +50,11 @@ glabel func_80AF321C /* 00D8C 80AF32DC 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 00D90 80AF32E0 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 /* 00D94 80AF32E4 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00D98 80AF32E8 01856821 */ addu $t5, $t4, $a1 -/* 00D9C 80AF32EC 01A67021 */ addu $t6, $t5, $a2 +/* 00D98 80AF32E8 01856821 */ addu $t5, $t4, $a1 +/* 00D9C 80AF32EC 01A67021 */ addu $t6, $t5, $a2 /* 00DA0 80AF32F0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 00DA4 80AF32F4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00DA8 80AF32F8 8FA80078 */ lw $t0, 0x0078($sp) +/* 00DA8 80AF32F8 8FA80078 */ lw $t0, 0x0078($sp) /* 00DAC 80AF32FC 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 /* 00DB0 80AF3300 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00DB4 80AF3304 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 @@ -73,25 +73,25 @@ glabel func_80AF321C /* 00DE8 80AF3338 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 00DEC 80AF333C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 00DF0 80AF3340 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00DF4 80AF3344 AFA00018 */ sw $zero, 0x0018($sp) -/* 00DF8 80AF3348 AFA00014 */ sw $zero, 0x0014($sp) -/* 00DFC 80AF334C AFA00010 */ sw $zero, 0x0010($sp) +/* 00DF4 80AF3344 AFA00018 */ sw $zero, 0x0018($sp) +/* 00DF8 80AF3348 AFA00014 */ sw $zero, 0x0014($sp) +/* 00DFC 80AF334C AFA00010 */ sw $zero, 0x0010($sp) /* 00E00 80AF3350 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 00E04 80AF3354 8FA4007C */ lw $a0, 0x007C($sp) -/* 00E08 80AF3358 0C0289CF */ jal func_800A273C -/* 00E0C 80AF335C AFAD001C */ sw $t5, 0x001C($sp) +/* 00E04 80AF3354 8FA4007C */ lw $a0, 0x007C($sp) +/* 00E08 80AF3358 0C0289CF */ jal SkelAnime_DrawSV2 +/* 00E0C 80AF335C AFAD001C */ sw $t5, 0x001C($sp) /* 00E10 80AF3360 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00E14 80AF3364 8FAE007C */ lw $t6, 0x007C($sp) +/* 00E14 80AF3364 8FAE007C */ lw $t6, 0x007C($sp) /* 00E18 80AF3368 3C0680AF */ lui $a2, %hi(D_80AF5164) ## $a2 = 80AF0000 /* 00E1C 80AF336C 24C65164 */ addiu $a2, $a2, %lo(D_80AF5164) ## $a2 = 80AF5164 /* 00E20 80AF3370 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 00E24 80AF3374 24070123 */ addiu $a3, $zero, 0x0123 ## $a3 = 00000123 -/* 00E28 80AF3378 0C031AD5 */ jal func_800C6B54 +/* 00E28 80AF3378 0C031AD5 */ jal func_800C6B54 /* 00E2C 80AF337C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 00E30 80AF3380 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E34 80AF3384 8FB00028 */ lw $s0, 0x0028($sp) +/* 00E30 80AF3380 8FBF002C */ lw $ra, 0x002C($sp) +/* 00E34 80AF3384 8FB00028 */ lw $s0, 0x0028($sp) /* 00E38 80AF3388 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 00E3C 80AF338C 03E00008 */ jr $ra +/* 00E3C 80AF338C 03E00008 */ jr $ra /* 00E40 80AF3390 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s index 7ca19dd01f..940c453b94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s @@ -1,45 +1,45 @@ glabel func_80AF3F20 /* 019D0 80AF3F20 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 019D4 80AF3F24 AFBF0024 */ sw $ra, 0x0024($sp) -/* 019D8 80AF3F28 AFA40070 */ sw $a0, 0x0070($sp) -/* 019DC 80AF3F2C AFA50074 */ sw $a1, 0x0074($sp) +/* 019D4 80AF3F24 AFBF0024 */ sw $ra, 0x0024($sp) +/* 019D8 80AF3F28 AFA40070 */ sw $a0, 0x0070($sp) +/* 019DC 80AF3F2C AFA50074 */ sw $a1, 0x0074($sp) /* 019E0 80AF3F30 848202A4 */ lh $v0, 0x02A4($a0) ## 000002A4 /* 019E4 80AF3F34 3C1880AF */ lui $t8, %hi(D_80AF410C) ## $t8 = 80AF0000 /* 019E8 80AF3F38 3C0680AF */ lui $a2, %hi(D_80AF5224) ## $a2 = 80AF0000 -/* 019EC 80AF3F3C 00027880 */ sll $t7, $v0, 2 -/* 019F0 80AF3F40 030FC021 */ addu $t8, $t8, $t7 -/* 019F4 80AF3F44 8F18410C */ lw $t8, %lo(D_80AF410C)($t8) +/* 019EC 80AF3F3C 00027880 */ sll $t7, $v0, 2 +/* 019F0 80AF3F40 030FC021 */ addu $t8, $t8, $t7 +/* 019F4 80AF3F44 8F18410C */ lw $t8, %lo(D_80AF410C)($t8) /* 019F8 80AF3F48 24C65224 */ addiu $a2, $a2, %lo(D_80AF5224) ## $a2 = 80AF5224 /* 019FC 80AF3F4C 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 01A00 80AF3F50 AFB80060 */ sw $t8, 0x0060($sp) +/* 01A00 80AF3F50 AFB80060 */ sw $t8, 0x0060($sp) /* 01A04 80AF3F54 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01A08 80AF3F58 24070282 */ addiu $a3, $zero, 0x0282 ## $a3 = 00000282 -/* 01A0C 80AF3F5C 0C031AB1 */ jal func_800C6AC4 -/* 01A10 80AF3F60 AFA50058 */ sw $a1, 0x0058($sp) -/* 01A14 80AF3F64 8FA90074 */ lw $t1, 0x0074($sp) -/* 01A18 80AF3F68 0C024F46 */ jal func_80093D18 +/* 01A0C 80AF3F5C 0C031AB1 */ jal func_800C6AC4 +/* 01A10 80AF3F60 AFA50058 */ sw $a1, 0x0058($sp) +/* 01A14 80AF3F64 8FA90074 */ lw $t1, 0x0074($sp) +/* 01A18 80AF3F68 0C024F46 */ jal func_80093D18 /* 01A1C 80AF3F6C 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 01A20 80AF3F70 8FA80058 */ lw $t0, 0x0058($sp) -/* 01A24 80AF3F74 8FA70060 */ lw $a3, 0x0060($sp) +/* 01A20 80AF3F70 8FA80058 */ lw $t0, 0x0058($sp) +/* 01A24 80AF3F74 8FA70060 */ lw $a3, 0x0060($sp) /* 01A28 80AF3F78 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 01A2C 80AF3F7C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01A30 80AF3F80 00076100 */ sll $t4, $a3, 4 -/* 01A34 80AF3F84 000C6F02 */ srl $t5, $t4, 28 +/* 01A30 80AF3F80 00076100 */ sll $t4, $a3, 4 +/* 01A34 80AF3F84 000C6F02 */ srl $t5, $t4, 28 /* 01A38 80AF3F88 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 01A3C 80AF3F8C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 01A40 80AF3F90 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 01A44 80AF3F94 000D7080 */ sll $t6, $t5, 2 +/* 01A44 80AF3F94 000D7080 */ sll $t6, $t5, 2 /* 01A48 80AF3F98 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 01A4C 80AF3F9C AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 01A50 80AF3FA0 01CF2021 */ addu $a0, $t6, $t7 +/* 01A50 80AF3FA0 01CF2021 */ addu $a0, $t6, $t7 /* 01A54 80AF3FA4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 01A58 80AF3FA8 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 01A5C 80AF3FAC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01A60 80AF3FB0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01A64 80AF3FB4 00E12824 */ and $a1, $a3, $at +/* 01A64 80AF3FB4 00E12824 */ and $a1, $a3, $at /* 01A68 80AF3FB8 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 01A6C 80AF3FBC 0305C821 */ addu $t9, $t8, $a1 -/* 01A70 80AF3FC0 03264821 */ addu $t1, $t9, $a2 +/* 01A6C 80AF3FBC 0305C821 */ addu $t9, $t8, $a1 +/* 01A70 80AF3FC0 03264821 */ addu $t1, $t9, $a2 /* 01A74 80AF3FC4 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 01A78 80AF3FC8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01A7C 80AF3FCC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,8 +50,8 @@ glabel func_80AF3F20 /* 01A90 80AF3FE0 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 01A94 80AF3FE4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 01A98 80AF3FE8 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 01A9C 80AF3FEC 01856821 */ addu $t5, $t4, $a1 -/* 01AA0 80AF3FF0 01A67021 */ addu $t6, $t5, $a2 +/* 01A9C 80AF3FEC 01856821 */ addu $t5, $t4, $a1 +/* 01AA0 80AF3FF0 01A67021 */ addu $t6, $t5, $a2 /* 01AA4 80AF3FF4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01AA8 80AF3FF8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01AAC 80AF3FFC 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 @@ -67,26 +67,26 @@ glabel func_80AF3F20 /* 01AD4 80AF4024 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 01AD8 80AF4028 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 01ADC 80AF402C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01AE0 80AF4030 8FA30070 */ lw $v1, 0x0070($sp) -/* 01AE4 80AF4034 8FA40074 */ lw $a0, 0x0074($sp) +/* 01AE0 80AF4030 8FA30070 */ lw $v1, 0x0070($sp) +/* 01AE4 80AF4034 8FA40074 */ lw $a0, 0x0074($sp) /* 01AE8 80AF4038 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 01AEC 80AF403C 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 01AF0 80AF4040 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 01AF4 80AF4044 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01AF8 80AF4048 AFA00014 */ sw $zero, 0x0014($sp) -/* 01AFC 80AF404C AFA00010 */ sw $zero, 0x0010($sp) -/* 01B00 80AF4050 0C0286B2 */ jal func_800A1AC8 -/* 01B04 80AF4054 AFA30018 */ sw $v1, 0x0018($sp) -/* 01B08 80AF4058 8FAC0074 */ lw $t4, 0x0074($sp) +/* 01AF8 80AF4048 AFA00014 */ sw $zero, 0x0014($sp) +/* 01AFC 80AF404C AFA00010 */ sw $zero, 0x0010($sp) +/* 01B00 80AF4050 0C0286B2 */ jal SkelAnime_DrawSV +/* 01B04 80AF4054 AFA30018 */ sw $v1, 0x0018($sp) +/* 01B08 80AF4058 8FAC0074 */ lw $t4, 0x0074($sp) /* 01B0C 80AF405C 3C0680AF */ lui $a2, %hi(D_80AF5234) ## $a2 = 80AF0000 /* 01B10 80AF4060 24C65234 */ addiu $a2, $a2, %lo(D_80AF5234) ## $a2 = 80AF5234 /* 01B14 80AF4064 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 01B18 80AF4068 24070297 */ addiu $a3, $zero, 0x0297 ## $a3 = 00000297 -/* 01B1C 80AF406C 0C031AD5 */ jal func_800C6B54 +/* 01B1C 80AF406C 0C031AD5 */ jal func_800C6B54 /* 01B20 80AF4070 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 01B24 80AF4074 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01B24 80AF4074 8FBF0024 */ lw $ra, 0x0024($sp) /* 01B28 80AF4078 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 01B2C 80AF407C 03E00008 */ jr $ra +/* 01B2C 80AF407C 03E00008 */ jr $ra /* 01B30 80AF4080 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s index 2b2bbcfef7..f9db9f2edc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s @@ -1,114 +1,114 @@ glabel EnSa_Init /* 00C50 80AF61B0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00C54 80AF61B4 AFB00034 */ sw $s0, 0x0034($sp) +/* 00C54 80AF61B4 AFB00034 */ sw $s0, 0x0034($sp) /* 00C58 80AF61B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C5C 80AF61BC AFB10038 */ sw $s1, 0x0038($sp) +/* 00C5C 80AF61BC AFB10038 */ sw $s1, 0x0038($sp) /* 00C60 80AF61C0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00C64 80AF61C4 AFBF003C */ sw $ra, 0x003C($sp) +/* 00C64 80AF61C4 AFBF003C */ sw $ra, 0x003C($sp) /* 00C68 80AF61C8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00C6C 80AF61CC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00C70 80AF61D0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 00C74 80AF61D4 AFA40044 */ sw $a0, 0x0044($sp) +/* 00C74 80AF61D4 AFA40044 */ sw $a0, 0x0044($sp) /* 00C78 80AF61D8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00C7C 80AF61DC 0C00AC78 */ jal ActorShape_Init - + /* 00C80 80AF61E0 3C074140 */ lui $a3, 0x4140 ## $a3 = 41400000 /* 00C84 80AF61E4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00C88 80AF61E8 260E0220 */ addiu $t6, $s0, 0x0220 ## $t6 = 00000220 /* 00C8C 80AF61EC 260F0286 */ addiu $t7, $s0, 0x0286 ## $t7 = 00000286 /* 00C90 80AF61F0 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 00C94 80AF61F4 AFB80018 */ sw $t8, 0x0018($sp) -/* 00C98 80AF61F8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00C9C 80AF61FC AFAE0010 */ sw $t6, 0x0010($sp) +/* 00C94 80AF61F4 AFB80018 */ sw $t8, 0x0018($sp) +/* 00C98 80AF61F8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00C9C 80AF61FC AFAE0010 */ sw $t6, 0x0010($sp) /* 00CA0 80AF6200 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 /* 00CA4 80AF6204 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00CA8 80AF6208 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00CAC 80AF620C 0C0291BE */ jal func_800A46F8 +/* 00CAC 80AF620C 0C0291BE */ jal SkelAnime_InitSV /* 00CB0 80AF6210 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00CB4 80AF6214 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00CB8 80AF6218 AFA50040 */ sw $a1, 0x0040($sp) +/* 00CB8 80AF6218 AFA50040 */ sw $a1, 0x0040($sp) /* 00CBC 80AF621C 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00CC0 80AF6220 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00CC4 80AF6224 3C0780AF */ lui $a3, %hi(D_80AF7260) ## $a3 = 80AF0000 -/* 00CC8 80AF6228 8FA50040 */ lw $a1, 0x0040($sp) +/* 00CC8 80AF6228 8FA50040 */ lw $a1, 0x0040($sp) /* 00CCC 80AF622C 24E77260 */ addiu $a3, $a3, %lo(D_80AF7260) ## $a3 = 80AF7260 /* 00CD0 80AF6230 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00CD4 80AF6234 0C01712B */ jal ActorCollider_InitCylinder - + /* 00CD8 80AF6238 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00CDC 80AF623C 3C0680AF */ lui $a2, %hi(D_80AF728C) ## $a2 = 80AF0000 /* 00CE0 80AF6240 24C6728C */ addiu $a2, $a2, %lo(D_80AF728C) ## $a2 = 80AF728C /* 00CE4 80AF6244 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00CE8 80AF6248 0C0187BF */ jal func_80061EFC +/* 00CE8 80AF6248 0C0187BF */ jal func_80061EFC /* 00CEC 80AF624C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00CF0 80AF6250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CF4 80AF6254 0C2BD77F */ jal func_80AF5DFC +/* 00CF4 80AF6254 0C2BD77F */ jal func_80AF5DFC /* 00CF8 80AF6258 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00CFC 80AF625C 2C410006 */ sltiu $at, $v0, 0x0006 -/* 00D00 80AF6260 1020004A */ beq $at, $zero, .L80AF638C -/* 00D04 80AF6264 0002C880 */ sll $t9, $v0, 2 +/* 00CFC 80AF625C 2C410006 */ sltiu $at, $v0, 0x0006 +/* 00D00 80AF6260 1020004A */ beq $at, $zero, .L80AF638C +/* 00D04 80AF6264 0002C880 */ sll $t9, $v0, 2 /* 00D08 80AF6268 3C0180AF */ lui $at, %hi(jtbl_80AF74F4) ## $at = 80AF0000 -/* 00D0C 80AF626C 00390821 */ addu $at, $at, $t9 -/* 00D10 80AF6270 8C3974F4 */ lw $t9, %lo(jtbl_80AF74F4)($at) -/* 00D14 80AF6274 03200008 */ jr $t9 +/* 00D0C 80AF626C 00390821 */ addu $at, $at, $t9 +/* 00D10 80AF6270 8C3974F4 */ lw $t9, %lo(jtbl_80AF74F4)($at) +/* 00D14 80AF6274 03200008 */ jr $t9 /* 00D18 80AF6278 00000000 */ nop glabel L80AF627C /* 00D1C 80AF627C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D20 80AF6280 0C2BD763 */ jal func_80AF5D8C +/* 00D20 80AF6280 0C2BD763 */ jal func_80AF5D8C /* 00D24 80AF6284 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B /* 00D28 80AF6288 3C0880AF */ lui $t0, %hi(func_80AF6448) ## $t0 = 80AF0000 /* 00D2C 80AF628C 25086448 */ addiu $t0, $t0, %lo(func_80AF6448) ## $t0 = 80AF6448 -/* 00D30 80AF6290 1000003E */ beq $zero, $zero, .L80AF638C +/* 00D30 80AF6290 1000003E */ beq $zero, $zero, .L80AF638C /* 00D34 80AF6294 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 glabel L80AF6298 /* 00D38 80AF6298 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D3C 80AF629C 0C2BD763 */ jal func_80AF5D8C +/* 00D3C 80AF629C 0C2BD763 */ jal func_80AF5D8C /* 00D40 80AF62A0 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B /* 00D44 80AF62A4 3C0980AF */ lui $t1, %hi(func_80AF683C) ## $t1 = 80AF0000 /* 00D48 80AF62A8 2529683C */ addiu $t1, $t1, %lo(func_80AF683C) ## $t1 = 80AF683C -/* 00D4C 80AF62AC 10000037 */ beq $zero, $zero, .L80AF638C +/* 00D4C 80AF62AC 10000037 */ beq $zero, $zero, .L80AF638C /* 00D50 80AF62B0 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 glabel L80AF62B4 /* 00D54 80AF62B4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00D58 80AF62B8 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 /* 00D5C 80AF62BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00D60 80AF62C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00D64 80AF62C4 0C2BD763 */ jal func_80AF5D8C +/* 00D64 80AF62C4 0C2BD763 */ jal func_80AF5D8C /* 00D68 80AF62C8 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 00D6C 80AF62CC 3C0A80AF */ lui $t2, %hi(func_80AF6448) ## $t2 = 80AF0000 /* 00D70 80AF62D0 254A6448 */ addiu $t2, $t2, %lo(func_80AF6448) ## $t2 = 80AF6448 -/* 00D74 80AF62D4 1000002D */ beq $zero, $zero, .L80AF638C +/* 00D74 80AF62D4 1000002D */ beq $zero, $zero, .L80AF638C /* 00D78 80AF62D8 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 glabel L80AF62DC /* 00D7C 80AF62DC 3C020201 */ lui $v0, 0x0201 ## $v0 = 02010000 /* 00D80 80AF62E0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00D84 80AF62E4 24420E20 */ addiu $v0, $v0, 0x0E20 ## $v0 = 02010E20 /* 00D88 80AF62E8 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 00D8C 80AF62EC 00025900 */ sll $t3, $v0, 4 -/* 00D90 80AF62F0 000B6702 */ srl $t4, $t3, 28 -/* 00D94 80AF62F4 000C6880 */ sll $t5, $t4, 2 +/* 00D8C 80AF62EC 00025900 */ sll $t3, $v0, 4 +/* 00D90 80AF62F0 000B6702 */ srl $t4, $t3, 28 +/* 00D94 80AF62F4 000C6880 */ sll $t5, $t4, 2 /* 00D98 80AF62F8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00D9C 80AF62FC A6000210 */ sh $zero, 0x0210($s0) ## 00000210 -/* 00DA0 80AF6300 01CD7021 */ addu $t6, $t6, $t5 +/* 00DA0 80AF6300 01CD7021 */ addu $t6, $t6, $t5 /* 00DA4 80AF6304 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00DA8 80AF6308 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C /* 00DAC 80AF630C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 /* 00DB0 80AF6310 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00DB4 80AF6314 00417824 */ and $t7, $v0, $at +/* 00DB4 80AF6314 00417824 */ and $t7, $v0, $at /* 00DB8 80AF6318 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00DBC 80AF631C 01CFC021 */ addu $t8, $t6, $t7 -/* 00DC0 80AF6320 0301C821 */ addu $t9, $t8, $at +/* 00DBC 80AF631C 01CFC021 */ addu $t8, $t6, $t7 +/* 00DC0 80AF6320 0301C821 */ addu $t9, $t8, $at /* 00DC4 80AF6324 AE391D68 */ sw $t9, 0x1D68($s1) ## 00001D68 /* 00DC8 80AF6328 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00DCC 80AF632C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00DD0 80AF6330 A028FA74 */ sb $t0, -0x058C($at) ## 8015FA74 /* 00DD4 80AF6334 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DD8 80AF6338 0C2BD763 */ jal func_80AF5D8C +/* 00DD8 80AF6338 0C2BD763 */ jal func_80AF5D8C /* 00DDC 80AF633C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 00DE0 80AF6340 3C0980AF */ lui $t1, %hi(func_80AF68E4) ## $t1 = 80AF0000 /* 00DE4 80AF6344 252968E4 */ addiu $t1, $t1, %lo(func_80AF68E4) ## $t1 = 80AF68E4 -/* 00DE8 80AF6348 10000010 */ beq $zero, $zero, .L80AF638C +/* 00DE8 80AF6348 10000010 */ beq $zero, $zero, .L80AF638C /* 00DEC 80AF634C AE090190 */ sw $t1, 0x0190($s0) ## 00000190 glabel L80AF6350 /* 00DF0 80AF6350 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 @@ -116,30 +116,30 @@ glabel L80AF6350 /* 00DF8 80AF6358 A6000210 */ sh $zero, 0x0210($s0) ## 00000210 /* 00DFC 80AF635C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E00 80AF6360 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00E04 80AF6364 0C2BD763 */ jal func_80AF5D8C +/* 00E04 80AF6364 0C2BD763 */ jal func_80AF5D8C /* 00E08 80AF6368 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C /* 00E0C 80AF636C 3C0A80AF */ lui $t2, %hi(func_80AF68E4) ## $t2 = 80AF0000 /* 00E10 80AF6370 254A68E4 */ addiu $t2, $t2, %lo(func_80AF68E4) ## $t2 = 80AF68E4 -/* 00E14 80AF6374 10000005 */ beq $zero, $zero, .L80AF638C +/* 00E14 80AF6374 10000005 */ beq $zero, $zero, .L80AF638C /* 00E18 80AF6378 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 glabel L80AF637C /* 00E1C 80AF637C 0C00B55C */ jal Actor_Kill - + /* 00E20 80AF6380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E24 80AF6384 10000022 */ beq $zero, $zero, .L80AF6410 -/* 00E28 80AF6388 8FBF003C */ lw $ra, 0x003C($sp) +/* 00E24 80AF6384 10000022 */ beq $zero, $zero, .L80AF6410 +/* 00E28 80AF6388 8FBF003C */ lw $ra, 0x003C($sp) .L80AF638C: /* 00E2C 80AF638C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00E30 80AF6390 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00E34 80AF6394 0C00B58B */ jal Actor_SetScale - + /* 00E38 80AF6398 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E3C 80AF639C 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 /* 00E40 80AF63A0 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 00E44 80AF63A4 A20B001F */ sb $t3, 0x001F($s0) ## 0000001F /* 00E48 80AF63A8 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 /* 00E4C 80AF63AC A60C0218 */ sh $t4, 0x0218($s0) ## 00000218 -/* 00E50 80AF63B0 8FAD0044 */ lw $t5, 0x0044($sp) +/* 00E50 80AF63B0 8FAD0044 */ lw $t5, 0x0044($sp) /* 00E54 80AF63B4 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 /* 00E58 80AF63B8 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 00E5C 80AF63BC 89AF0000 */ lwl $t7, 0x0000($t5) ## 00000000 @@ -152,22 +152,22 @@ glabel L80AF637C /* 00E78 80AF63D8 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00E7C 80AF63DC 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 /* 00E80 80AF63E0 A60F021E */ sh $t7, 0x021E($s0) ## 0000021E -/* 00E84 80AF63E4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00E84 80AF63E4 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00E88 80AF63E8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00E8C 80AF63EC E7B00014 */ swc1 $f16, 0x0014($sp) +/* 00E8C 80AF63EC E7B00014 */ swc1 $f16, 0x0014($sp) /* 00E90 80AF63F0 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00E94 80AF63F4 AFB80028 */ sw $t8, 0x0028($sp) -/* 00E98 80AF63F8 AFA00024 */ sw $zero, 0x0024($sp) -/* 00E9C 80AF63FC AFA00020 */ sw $zero, 0x0020($sp) -/* 00EA0 80AF6400 AFA0001C */ sw $zero, 0x001C($sp) +/* 00E94 80AF63F4 AFB80028 */ sw $t8, 0x0028($sp) +/* 00E98 80AF63F8 AFA00024 */ sw $zero, 0x0024($sp) +/* 00E9C 80AF63FC AFA00020 */ sw $zero, 0x0020($sp) +/* 00EA0 80AF6400 AFA0001C */ sw $zero, 0x001C($sp) /* 00EA4 80AF6404 0C00C916 */ jal Actor_SpawnAttached - -/* 00EA8 80AF6408 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00EAC 80AF640C 8FBF003C */ lw $ra, 0x003C($sp) + +/* 00EA8 80AF6408 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00EAC 80AF640C 8FBF003C */ lw $ra, 0x003C($sp) .L80AF6410: -/* 00EB0 80AF6410 8FB00034 */ lw $s0, 0x0034($sp) -/* 00EB4 80AF6414 8FB10038 */ lw $s1, 0x0038($sp) -/* 00EB8 80AF6418 03E00008 */ jr $ra +/* 00EB0 80AF6410 8FB00034 */ lw $s0, 0x0034($sp) +/* 00EB4 80AF6414 8FB10038 */ lw $s1, 0x0038($sp) +/* 00EB8 80AF6418 03E00008 */ jr $ra /* 00EBC 80AF641C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s index 4f8c746795..3c3ae9719a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s @@ -1,18 +1,18 @@ glabel EnSb_Destroy /* 000E4 80AF78D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000E8 80AF78D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000EC 80AF78DC AFA40018 */ sw $a0, 0x0018($sp) -/* 000F0 80AF78E0 AFA5001C */ sw $a1, 0x001C($sp) -/* 000F4 80AF78E4 0C0295BC */ jal func_800A56F0 +/* 000E8 80AF78D8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 000EC 80AF78DC AFA40018 */ sw $a0, 0x0018($sp) +/* 000F0 80AF78E0 AFA5001C */ sw $a1, 0x001C($sp) +/* 000F4 80AF78E4 0C0295BC */ jal SkelAnime_Free /* 000F8 80AF78E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 000FC 80AF78EC 8FA50018 */ lw $a1, 0x0018($sp) -/* 00100 80AF78F0 8FA4001C */ lw $a0, 0x001C($sp) +/* 000FC 80AF78EC 8FA50018 */ lw $a1, 0x0018($sp) +/* 00100 80AF78F0 8FA4001C */ lw $a0, 0x001C($sp) /* 00104 80AF78F4 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 00108 80AF78F8 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 0010C 80AF78FC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0010C 80AF78FC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00110 80AF7900 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00114 80AF7904 03E00008 */ jr $ra +/* 00114 80AF7904 03E00008 */ jr $ra /* 00118 80AF7908 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Draw.s index c5c4c39187..34d48074b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Draw.s @@ -1,84 +1,84 @@ glabel EnSb_Draw /* 01088 80AF8878 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0108C 80AF887C AFBF002C */ sw $ra, 0x002C($sp) -/* 01090 80AF8880 AFB00028 */ sw $s0, 0x0028($sp) +/* 0108C 80AF887C AFBF002C */ sw $ra, 0x002C($sp) +/* 01090 80AF8880 AFB00028 */ sw $s0, 0x0028($sp) /* 01094 80AF8884 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01098 80AF8888 AFA50054 */ sw $a1, 0x0054($sp) -/* 0109C 80AF888C 0C00BAF3 */ jal func_8002EBCC +/* 01098 80AF8888 AFA50054 */ sw $a1, 0x0054($sp) +/* 0109C 80AF888C 0C00BAF3 */ jal func_8002EBCC /* 010A0 80AF8890 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 010A4 80AF8894 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 010A8 80AF8898 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 010AC 80AF889C 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 010B0 80AF88A0 3C0E80B0 */ lui $t6, %hi(func_80AF8828) ## $t6 = 80B00000 /* 010B4 80AF88A4 25CE8828 */ addiu $t6, $t6, %lo(func_80AF8828) ## $t6 = 80AF8828 -/* 010B8 80AF88A8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 010BC 80AF88AC AFB00018 */ sw $s0, 0x0018($sp) -/* 010C0 80AF88B0 AFA00010 */ sw $zero, 0x0010($sp) -/* 010C4 80AF88B4 0C0286B2 */ jal func_800A1AC8 -/* 010C8 80AF88B8 8FA40054 */ lw $a0, 0x0054($sp) +/* 010B8 80AF88A8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 010BC 80AF88AC AFB00018 */ sw $s0, 0x0018($sp) +/* 010C0 80AF88B0 AFA00010 */ sw $zero, 0x0010($sp) +/* 010C4 80AF88B4 0C0286B2 */ jal SkelAnime_DrawSV +/* 010C8 80AF88B8 8FA40054 */ lw $a0, 0x0054($sp) /* 010CC 80AF88BC 860301F8 */ lh $v1, 0x01F8($s0) ## 000001F8 -/* 010D0 80AF88C0 10600035 */ beq $v1, $zero, .L80AF8998 +/* 010D0 80AF88C0 10600035 */ beq $v1, $zero, .L80AF8998 /* 010D4 80AF88C4 2462FFFF */ addiu $v0, $v1, 0xFFFF ## $v0 = FFFFFFFF /* 010D8 80AF88C8 920F0114 */ lbu $t7, 0x0114($s0) ## 00000114 -/* 010DC 80AF88CC 00021400 */ sll $v0, $v0, 16 -/* 010E0 80AF88D0 00021403 */ sra $v0, $v0, 16 +/* 010DC 80AF88CC 00021400 */ sll $v0, $v0, 16 +/* 010E0 80AF88D0 00021403 */ sra $v0, $v0, 16 /* 010E4 80AF88D4 30590001 */ andi $t9, $v0, 0x0001 ## $t9 = 00000001 /* 010E8 80AF88D8 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 010EC 80AF88DC 1720002E */ bne $t9, $zero, .L80AF8998 +/* 010EC 80AF88DC 1720002E */ bne $t9, $zero, .L80AF8998 /* 010F0 80AF88E0 A2180114 */ sb $t8, 0x0114($s0) ## 00000114 /* 010F4 80AF88E4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 010F8 80AF88E8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 010FC 80AF88EC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01100 80AF88F0 A7A2003A */ sh $v0, 0x003A($sp) -/* 01104 80AF88F4 87A2003A */ lh $v0, 0x003A($sp) + +/* 01100 80AF88F0 A7A2003A */ sh $v0, 0x003A($sp) +/* 01104 80AF88F4 87A2003A */ lh $v0, 0x003A($sp) /* 01108 80AF88F8 3C0A80B0 */ lui $t2, %hi(D_80AF8A28) ## $t2 = 80B00000 /* 0110C 80AF88FC 254A8A28 */ addiu $t2, $t2, %lo(D_80AF8A28) ## $t2 = 80AF8A28 /* 01110 80AF8900 30480003 */ andi $t0, $v0, 0x0003 ## $t0 = 00000000 -/* 01114 80AF8904 00084880 */ sll $t1, $t0, 2 -/* 01118 80AF8908 01284823 */ subu $t1, $t1, $t0 -/* 0111C 80AF890C 00094880 */ sll $t1, $t1, 2 -/* 01120 80AF8910 012A1821 */ addu $v1, $t1, $t2 +/* 01114 80AF8904 00084880 */ sll $t1, $t0, 2 +/* 01118 80AF8908 01284823 */ subu $t1, $t1, $t0 +/* 0111C 80AF890C 00094880 */ sll $t1, $t1, 2 +/* 01120 80AF8910 012A1821 */ addu $v1, $t1, $t2 /* 01124 80AF8914 C4660000 */ lwc1 $f6, 0x0000($v1) ## 00000000 /* 01128 80AF8918 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 0112C 80AF891C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01130 80AF8920 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 01134 80AF8924 46062200 */ add.s $f8, $f4, $f6 -/* 01138 80AF8928 AFA30034 */ sw $v1, 0x0034($sp) -/* 0113C 80AF892C 46080280 */ add.s $f10, $f0, $f8 +/* 01134 80AF8924 46062200 */ add.s $f8, $f4, $f6 +/* 01138 80AF8928 AFA30034 */ sw $v1, 0x0034($sp) +/* 0113C 80AF892C 46080280 */ add.s $f10, $f0, $f8 /* 01140 80AF8930 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01144 80AF8934 E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 01148 80AF8938 8FAB0034 */ lw $t3, 0x0034($sp) + +/* 01144 80AF8934 E7AA0040 */ swc1 $f10, 0x0040($sp) +/* 01148 80AF8938 8FAB0034 */ lw $t3, 0x0034($sp) /* 0114C 80AF893C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 01150 80AF8940 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01154 80AF8944 C5720004 */ lwc1 $f18, 0x0004($t3) ## 00000004 /* 01158 80AF8948 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 0115C 80AF894C 46128100 */ add.s $f4, $f16, $f18 -/* 01160 80AF8950 46040180 */ add.s $f6, $f0, $f4 +/* 0115C 80AF894C 46128100 */ add.s $f4, $f16, $f18 +/* 01160 80AF8950 46040180 */ add.s $f6, $f0, $f4 /* 01164 80AF8954 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01168 80AF8958 E7A60044 */ swc1 $f6, 0x0044($sp) -/* 0116C 80AF895C 8FAC0034 */ lw $t4, 0x0034($sp) + +/* 01168 80AF8958 E7A60044 */ swc1 $f6, 0x0044($sp) +/* 0116C 80AF895C 8FAC0034 */ lw $t4, 0x0034($sp) /* 01170 80AF8960 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 01174 80AF8964 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF /* 01178 80AF8968 C58A0008 */ lwc1 $f10, 0x0008($t4) ## 00000008 -/* 0117C 80AF896C AFAD0018 */ sw $t5, 0x0018($sp) -/* 01180 80AF8970 AFA00014 */ sw $zero, 0x0014($sp) -/* 01184 80AF8974 460A4400 */ add.s $f16, $f8, $f10 -/* 01188 80AF8978 AFA00010 */ sw $zero, 0x0010($sp) -/* 0118C 80AF897C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0117C 80AF896C AFAD0018 */ sw $t5, 0x0018($sp) +/* 01180 80AF8970 AFA00014 */ sw $zero, 0x0014($sp) +/* 01184 80AF8974 460A4400 */ add.s $f16, $f8, $f10 +/* 01188 80AF8978 AFA00010 */ sw $zero, 0x0010($sp) +/* 0118C 80AF897C 8FA40054 */ lw $a0, 0x0054($sp) /* 01190 80AF8980 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01194 80AF8984 46100480 */ add.s $f18, $f0, $f16 +/* 01194 80AF8984 46100480 */ add.s $f18, $f0, $f16 /* 01198 80AF8988 27A60040 */ addiu $a2, $sp, 0x0040 ## $a2 = FFFFFFF0 /* 0119C 80AF898C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 011A0 80AF8990 0C00A935 */ jal func_8002A4D4 -/* 011A4 80AF8994 E7B20048 */ swc1 $f18, 0x0048($sp) +/* 011A0 80AF8990 0C00A935 */ jal func_8002A4D4 +/* 011A4 80AF8994 E7B20048 */ swc1 $f18, 0x0048($sp) .L80AF8998: -/* 011A8 80AF8998 8FBF002C */ lw $ra, 0x002C($sp) -/* 011AC 80AF899C 8FB00028 */ lw $s0, 0x0028($sp) +/* 011A8 80AF8998 8FBF002C */ lw $ra, 0x002C($sp) +/* 011AC 80AF899C 8FB00028 */ lw $s0, 0x0028($sp) /* 011B0 80AF89A0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 011B4 80AF89A4 03E00008 */ jr $ra +/* 011B4 80AF89A4 03E00008 */ jr $ra /* 011B8 80AF89A8 00000000 */ nop /* 011BC 80AF89AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s index fc341b74f8..3cf512b9d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s @@ -1,12 +1,12 @@ glabel EnSb_Init /* 00000 80AF77F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 80AF77F4 AFA5003C */ sw $a1, 0x003C($sp) -/* 00008 80AF77F8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 80AF77FC AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80AF77F4 AFA5003C */ sw $a1, 0x003C($sp) +/* 00008 80AF77F8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 80AF77FC AFB00028 */ sw $s0, 0x0028($sp) /* 00010 80AF7800 3C0580B0 */ lui $a1, %hi(D_80AF8A1C) ## $a1 = 80B00000 /* 00014 80AF7804 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 80AF7808 0C01E037 */ jal Actor_ProcessInitChain - + /* 0001C 80AF780C 24A58A1C */ addiu $a1, $a1, %lo(D_80AF8A1C) ## $a1 = 80AF8A1C /* 00020 80AF7810 3C0E80B0 */ lui $t6, %hi(D_80AF89FC) ## $t6 = 80B00000 /* 00024 80AF7814 25CE89FC */ addiu $t6, $t6, %lo(D_80AF89FC) ## $t6 = 80AF89FC @@ -17,47 +17,47 @@ glabel EnSb_Init /* 00038 80AF7828 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0003C 80AF782C 24E70194 */ addiu $a3, $a3, 0x0194 ## $a3 = 06000194 /* 00040 80AF7830 24C62BF0 */ addiu $a2, $a2, 0x2BF0 ## $a2 = 06002BF0 -/* 00044 80AF7834 AFA00018 */ sw $zero, 0x0018($sp) -/* 00048 80AF7838 AFA00014 */ sw $zero, 0x0014($sp) -/* 0004C 80AF783C AFA00010 */ sw $zero, 0x0010($sp) -/* 00050 80AF7840 8FA4003C */ lw $a0, 0x003C($sp) -/* 00054 80AF7844 0C0291BE */ jal func_800A46F8 +/* 00044 80AF7834 AFA00018 */ sw $zero, 0x0018($sp) +/* 00048 80AF7838 AFA00014 */ sw $zero, 0x0014($sp) +/* 0004C 80AF783C AFA00010 */ sw $zero, 0x0010($sp) +/* 00050 80AF7840 8FA4003C */ lw $a0, 0x003C($sp) +/* 00054 80AF7844 0C0291BE */ jal SkelAnime_InitSV /* 00058 80AF7848 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0005C 80AF784C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00060 80AF7850 AFA50030 */ sw $a1, 0x0030($sp) +/* 00060 80AF7850 AFA50030 */ sw $a1, 0x0030($sp) /* 00064 80AF7854 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00068 80AF7858 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00068 80AF7858 8FA4003C */ lw $a0, 0x003C($sp) /* 0006C 80AF785C 3C0780B0 */ lui $a3, %hi(D_80AF89D0) ## $a3 = 80B00000 -/* 00070 80AF7860 8FA50030 */ lw $a1, 0x0030($sp) +/* 00070 80AF7860 8FA50030 */ lw $a1, 0x0030($sp) /* 00074 80AF7864 24E789D0 */ addiu $a3, $a3, %lo(D_80AF89D0) ## $a3 = 80AF89D0 -/* 00078 80AF7868 8FA4003C */ lw $a0, 0x003C($sp) -/* 0007C 80AF786C 0C017114 */ jal func_8005C450 +/* 00078 80AF7868 8FA4003C */ lw $a0, 0x003C($sp) +/* 0007C 80AF786C 0C017114 */ jal func_8005C450 /* 00080 80AF7870 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00084 80AF7874 3C053BC4 */ lui $a1, 0x3BC4 ## $a1 = 3BC40000 /* 00088 80AF7878 A60001FC */ sh $zero, 0x01FC($s0) ## 000001FC /* 0008C 80AF787C A20000AE */ sb $zero, 0x00AE($s0) ## 000000AE /* 00090 80AF7880 34A59BA6 */ ori $a1, $a1, 0x9BA6 ## $a1 = 3BC49BA6 /* 00094 80AF7884 0C00B58B */ jal Actor_SetScale - + /* 00098 80AF7888 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0009C 80AF788C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 000A0 80AF7890 A60000B6 */ sh $zero, 0x00B6($s0) ## 000000B6 /* 000A4 80AF7894 3C0180B0 */ lui $at, %hi(D_80AF8A8C) ## $at = 80B00000 /* 000A8 80AF7898 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 000AC 80AF789C C4268A8C */ lwc1 $f6, %lo(D_80AF8A8C)($at) +/* 000AC 80AF789C C4268A8C */ lwc1 $f6, %lo(D_80AF8A8C)($at) /* 000B0 80AF78A0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 000B4 80AF78A4 44814000 */ mtc1 $at, $f8 ## $f8 = -1.00 /* 000B8 80AF78A8 A60001F8 */ sh $zero, 0x01F8($s0) ## 000001F8 /* 000BC 80AF78AC A2000204 */ sb $zero, 0x0204($s0) ## 00000204 /* 000C0 80AF78B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000C4 80AF78B4 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 000C8 80AF78B8 0C2BDE6F */ jal func_80AF79BC +/* 000C8 80AF78B8 0C2BDE6F */ jal func_80AF79BC /* 000CC 80AF78BC E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 000D0 80AF78C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 000D4 80AF78C4 8FB00028 */ lw $s0, 0x0028($sp) +/* 000D0 80AF78C0 8FBF002C */ lw $ra, 0x002C($sp) +/* 000D4 80AF78C4 8FB00028 */ lw $s0, 0x0028($sp) /* 000D8 80AF78C8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000DC 80AF78CC 03E00008 */ jr $ra +/* 000DC 80AF78CC 03E00008 */ jr $ra /* 000E0 80AF78D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Draw.s index 7a62f38adf..9ec7f74db1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Draw.s @@ -1,9 +1,9 @@ glabel EnShopnuts_Draw /* 00D4C 80AFB46C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D50 80AFB470 AFA40028 */ sw $a0, 0x0028($sp) -/* 00D54 80AFB474 8FAE0028 */ lw $t6, 0x0028($sp) -/* 00D58 80AFB478 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D5C 80AFB47C AFA5002C */ sw $a1, 0x002C($sp) +/* 00D50 80AFB470 AFA40028 */ sw $a0, 0x0028($sp) +/* 00D54 80AFB474 8FAE0028 */ lw $t6, 0x0028($sp) +/* 00D58 80AFB478 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00D5C 80AFB47C AFA5002C */ sw $a1, 0x002C($sp) /* 00D60 80AFB480 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00D64 80AFB484 3C0F80B0 */ lui $t7, %hi(func_80AFB25C) ## $t7 = 80B00000 /* 00D68 80AFB488 3C1880B0 */ lui $t8, %hi(func_80AFB290) ## $t8 = 80B00000 @@ -12,12 +12,12 @@ glabel EnShopnuts_Draw /* 00D74 80AFB494 8DC6016C */ lw $a2, 0x016C($t6) ## 0000016C /* 00D78 80AFB498 2718B290 */ addiu $t8, $t8, %lo(func_80AFB290) ## $t8 = 80AFB290 /* 00D7C 80AFB49C 25EFB25C */ addiu $t7, $t7, %lo(func_80AFB25C) ## $t7 = 80AFB25C -/* 00D80 80AFB4A0 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00D84 80AFB4A4 AFB80014 */ sw $t8, 0x0014($sp) -/* 00D88 80AFB4A8 0C0286B2 */ jal func_800A1AC8 -/* 00D8C 80AFB4AC AFAE0018 */ sw $t6, 0x0018($sp) -/* 00D90 80AFB4B0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00D80 80AFB4A0 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00D84 80AFB4A4 AFB80014 */ sw $t8, 0x0014($sp) +/* 00D88 80AFB4A8 0C0286B2 */ jal SkelAnime_DrawSV +/* 00D8C 80AFB4AC AFAE0018 */ sw $t6, 0x0018($sp) +/* 00D90 80AFB4B0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00D94 80AFB4B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00D98 80AFB4B8 03E00008 */ jr $ra +/* 00D98 80AFB4B8 03E00008 */ jr $ra /* 00D9C 80AFB4BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s index a0237d0216..dc0da2b734 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s @@ -1,92 +1,92 @@ glabel EnShopnuts_Init /* 00000 80AFA720 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 80AFA724 AFA5003C */ sw $a1, 0x003C($sp) -/* 00008 80AFA728 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 80AFA72C AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80AFA724 AFA5003C */ sw $a1, 0x003C($sp) +/* 00008 80AFA728 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 80AFA72C AFB00028 */ sw $s0, 0x0028($sp) /* 00010 80AFA730 3C0580B0 */ lui $a1, %hi(D_80AFB514) ## $a1 = 80B00000 /* 00014 80AFA734 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 80AFA738 0C01E037 */ jal Actor_ProcessInitChain - + /* 0001C 80AFA73C 24A5B514 */ addiu $a1, $a1, %lo(D_80AFB514) ## $a1 = 80AFB514 /* 00020 80AFA740 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00024 80AFA744 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00028 80AFA748 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0002C 80AFA74C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00030 80AFA750 0C00AC78 */ jal ActorShape_Init - + /* 00034 80AFA754 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 /* 00038 80AFA758 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0003C 80AFA75C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00040 80AFA760 260E0196 */ addiu $t6, $s0, 0x0196 ## $t6 = 00000196 /* 00044 80AFA764 260F0202 */ addiu $t7, $s0, 0x0202 ## $t7 = 00000202 /* 00048 80AFA768 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 0004C 80AFA76C AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 80AFA770 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 80AFA774 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0004C 80AFA76C AFB80018 */ sw $t8, 0x0018($sp) +/* 00050 80AFA770 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00054 80AFA774 AFAE0010 */ sw $t6, 0x0010($sp) /* 00058 80AFA778 24E74574 */ addiu $a3, $a3, 0x4574 ## $a3 = 06004574 /* 0005C 80AFA77C 24C641A8 */ addiu $a2, $a2, 0x41A8 ## $a2 = 060041A8 -/* 00060 80AFA780 8FA4003C */ lw $a0, 0x003C($sp) -/* 00064 80AFA784 0C0291BE */ jal func_800A46F8 +/* 00060 80AFA780 8FA4003C */ lw $a0, 0x003C($sp) +/* 00064 80AFA784 0C0291BE */ jal SkelAnime_InitSV /* 00068 80AFA788 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0006C 80AFA78C 26050270 */ addiu $a1, $s0, 0x0270 ## $a1 = 00000270 -/* 00070 80AFA790 AFA50030 */ sw $a1, 0x0030($sp) +/* 00070 80AFA790 AFA50030 */ sw $a1, 0x0030($sp) /* 00074 80AFA794 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00078 80AFA798 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00078 80AFA798 8FA4003C */ lw $a0, 0x003C($sp) /* 0007C 80AFA79C 3C0780B0 */ lui $a3, %hi(D_80AFB4E0) ## $a3 = 80B00000 /* 00080 80AFA7A0 24E7B4E0 */ addiu $a3, $a3, %lo(D_80AFB4E0) ## $a3 = 80AFB4E0 -/* 00084 80AFA7A4 8FA4003C */ lw $a0, 0x003C($sp) -/* 00088 80AFA7A8 8FA50030 */ lw $a1, 0x0030($sp) +/* 00084 80AFA7A4 8FA4003C */ lw $a0, 0x003C($sp) +/* 00088 80AFA7A8 8FA50030 */ lw $a1, 0x0030($sp) /* 0008C 80AFA7AC 0C01712B */ jal ActorCollider_InitCylinder - + /* 00090 80AFA7B0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00094 80AFA7B4 3C0680B0 */ lui $a2, %hi(D_80AFB50C) ## $a2 = 80B00000 /* 00098 80AFA7B8 24C6B50C */ addiu $a2, $a2, %lo(D_80AFB50C) ## $a2 = 80AFB50C /* 0009C 80AFA7BC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 000A0 80AFA7C0 0C0187B5 */ jal func_80061ED4 +/* 000A0 80AFA7C0 0C0187B5 */ jal func_80061ED4 /* 000A4 80AFA7C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 000A8 80AFA7C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000AC 80AFA7CC 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 000B0 80AFA7D0 8FA50030 */ lw $a1, 0x0030($sp) + +/* 000B0 80AFA7D0 8FA50030 */ lw $a1, 0x0030($sp) /* 000B4 80AFA7D4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 000B8 80AFA7D8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 000BC 80AFA7DC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 000C0 80AFA7E0 14410004 */ bne $v0, $at, .L80AFA7F4 +/* 000C0 80AFA7E0 14410004 */ bne $v0, $at, .L80AFA7F4 /* 000C4 80AFA7E4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 000C8 80AFA7E8 94790EF0 */ lhu $t9, 0x0EF0($v1) ## 8015F550 /* 000CC 80AFA7EC 33280800 */ andi $t0, $t9, 0x0800 ## $t0 = 00000000 -/* 000D0 80AFA7F0 1500000E */ bne $t0, $zero, .L80AFA82C +/* 000D0 80AFA7F0 1500000E */ bne $t0, $zero, .L80AFA82C .L80AFA7F4: /* 000D4 80AFA7F4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 000D8 80AFA7F8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 000DC 80AFA7FC 14410004 */ bne $v0, $at, .L80AFA810 +/* 000DC 80AFA7FC 14410004 */ bne $v0, $at, .L80AFA810 /* 000E0 80AFA800 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 000E4 80AFA804 94690F2A */ lhu $t1, 0x0F2A($v1) ## 8015F58A /* 000E8 80AFA808 312A0004 */ andi $t2, $t1, 0x0004 ## $t2 = 00000000 -/* 000EC 80AFA80C 15400007 */ bne $t2, $zero, .L80AFA82C +/* 000EC 80AFA80C 15400007 */ bne $t2, $zero, .L80AFA82C .L80AFA810: /* 000F0 80AFA810 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 000F4 80AFA814 14410009 */ bne $v0, $at, .L80AFA83C +/* 000F4 80AFA814 14410009 */ bne $v0, $at, .L80AFA83C /* 000F8 80AFA818 00000000 */ nop /* 000FC 80AFA81C 946B0F2A */ lhu $t3, 0x0F2A($v1) ## 8015F58A /* 00100 80AFA820 316C0008 */ andi $t4, $t3, 0x0008 ## $t4 = 00000000 -/* 00104 80AFA824 11800005 */ beq $t4, $zero, .L80AFA83C +/* 00104 80AFA824 11800005 */ beq $t4, $zero, .L80AFA83C /* 00108 80AFA828 00000000 */ nop .L80AFA82C: /* 0010C 80AFA82C 0C00B55C */ jal Actor_Kill - + /* 00110 80AFA830 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00114 80AFA834 10000004 */ beq $zero, $zero, .L80AFA848 -/* 00118 80AFA838 8FBF002C */ lw $ra, 0x002C($sp) +/* 00114 80AFA834 10000004 */ beq $zero, $zero, .L80AFA848 +/* 00118 80AFA838 8FBF002C */ lw $ra, 0x002C($sp) .L80AFA83C: -/* 0011C 80AFA83C 0C2BEA20 */ jal func_80AFA880 +/* 0011C 80AFA83C 0C2BEA20 */ jal func_80AFA880 /* 00120 80AFA840 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00124 80AFA844 8FBF002C */ lw $ra, 0x002C($sp) +/* 00124 80AFA844 8FBF002C */ lw $ra, 0x002C($sp) .L80AFA848: -/* 00128 80AFA848 8FB00028 */ lw $s0, 0x0028($sp) +/* 00128 80AFA848 8FB00028 */ lw $s0, 0x0028($sp) /* 0012C 80AFA84C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00130 80AFA850 03E00008 */ jr $ra +/* 00130 80AFA850 03E00008 */ jr $ra /* 00134 80AFA854 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s index a4a25159d7..ff4217e4d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s @@ -1,21 +1,21 @@ glabel func_80AFA8E8 /* 001C8 80AFA8E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001CC 80AFA8EC AFBF0014 */ sw $ra, 0x0014($sp) +/* 001CC 80AFA8EC AFBF0014 */ sw $ra, 0x0014($sp) /* 001D0 80AFA8F0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 001D4 80AFA8F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001D8 80AFA8F8 24A50BA0 */ addiu $a1, $a1, 0x0BA0 ## $a1 = 06000BA0 -/* 001DC 80AFA8FC AFA60018 */ sw $a2, 0x0018($sp) -/* 001E0 80AFA900 0C0294BE */ jal func_800A52F8 +/* 001DC 80AFA8FC AFA60018 */ sw $a2, 0x0018($sp) +/* 001E0 80AFA900 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 001E4 80AFA904 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001E8 80AFA908 8FA60018 */ lw $a2, 0x0018($sp) +/* 001E8 80AFA908 8FA60018 */ lw $a2, 0x0018($sp) /* 001EC 80AFA90C 3C0F80B0 */ lui $t7, %hi(func_80AFACE0) ## $t7 = 80B00000 /* 001F0 80AFA910 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 001F4 80AFA914 25EFACE0 */ addiu $t7, $t7, %lo(func_80AFACE0) ## $t7 = 80AFACE0 /* 001F8 80AFA918 A4CE0194 */ sh $t6, 0x0194($a2) ## 00000194 /* 001FC 80AFA91C ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 00200 80AFA920 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00200 80AFA920 8FBF0014 */ lw $ra, 0x0014($sp) /* 00204 80AFA924 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00208 80AFA928 03E00008 */ jr $ra +/* 00208 80AFA928 03E00008 */ jr $ra /* 0020C 80AFA92C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s index e19d8ea23f..c4e3a01a1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s @@ -1,31 +1,31 @@ glabel func_80AFA96C /* 0024C 80AFA96C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00250 80AFA970 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00250 80AFA970 AFBF0014 */ sw $ra, 0x0014($sp) /* 00254 80AFA974 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00258 80AFA978 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0025C 80AFA97C 24A54574 */ addiu $a1, $a1, 0x4574 ## $a1 = 06004574 -/* 00260 80AFA980 AFA70018 */ sw $a3, 0x0018($sp) +/* 00260 80AFA980 AFA70018 */ sw $a3, 0x0018($sp) /* 00264 80AFA984 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00268 80AFA988 0C0294D3 */ jal func_800A534C +/* 00268 80AFA988 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0026C 80AFA98C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00270 80AFA990 8FA70018 */ lw $a3, 0x0018($sp) +/* 00270 80AFA990 8FA70018 */ lw $a3, 0x0018($sp) /* 00274 80AFA994 3C0E80B0 */ lui $t6, %hi(func_80AFAE28) ## $t6 = 80B00000 /* 00278 80AFA998 25CEAE28 */ addiu $t6, $t6, %lo(func_80AFAE28) ## $t6 = 80AFAE28 /* 0027C 80AFA99C 8CEF0190 */ lw $t7, 0x0190($a3) ## 00000190 /* 00280 80AFA9A0 3C0880B0 */ lui $t0, %hi(func_80AFAD64) ## $t0 = 80B00000 /* 00284 80AFA9A4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00288 80AFA9A8 15CF0004 */ bne $t6, $t7, .L80AFA9BC +/* 00288 80AFA9A8 15CF0004 */ bne $t6, $t7, .L80AFA9BC /* 0028C 80AFA9AC 2508AD64 */ addiu $t0, $t0, %lo(func_80AFAD64) ## $t0 = 80AFAD64 /* 00290 80AFA9B0 24181002 */ addiu $t8, $zero, 0x1002 ## $t8 = 00001002 -/* 00294 80AFA9B4 10000002 */ beq $zero, $zero, .L80AFA9C0 +/* 00294 80AFA9B4 10000002 */ beq $zero, $zero, .L80AFA9C0 /* 00298 80AFA9B8 A4F80194 */ sh $t8, 0x0194($a3) ## 00000194 .L80AFA9BC: /* 0029C 80AFA9BC A4F90194 */ sh $t9, 0x0194($a3) ## 00000194 .L80AFA9C0: /* 002A0 80AFA9C0 ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -/* 002A4 80AFA9C4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002A4 80AFA9C4 8FBF0014 */ lw $ra, 0x0014($sp) /* 002A8 80AFA9C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002AC 80AFA9CC 03E00008 */ jr $ra +/* 002AC 80AFA9CC 03E00008 */ jr $ra /* 002B0 80AFA9D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s index 48a3feac1f..d2b7afb6df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s @@ -1,23 +1,23 @@ glabel EnSkj_Draw /* 03280 80B01530 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 03284 80B01534 AFB10028 */ sw $s1, 0x0028($sp) +/* 03284 80B01534 AFB10028 */ sw $s1, 0x0028($sp) /* 03288 80B01538 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0328C 80B0153C AFBF002C */ sw $ra, 0x002C($sp) -/* 03290 80B01540 AFB00024 */ sw $s0, 0x0024($sp) +/* 0328C 80B0153C AFBF002C */ sw $ra, 0x002C($sp) +/* 03290 80B01540 AFB00024 */ sw $s0, 0x0024($sp) /* 03294 80B01544 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 03298 80B01548 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0329C 80B0154C 3C0680B0 */ lui $a2, %hi(D_80B01860) ## $a2 = 80B00000 /* 032A0 80B01550 24C61860 */ addiu $a2, $a2, %lo(D_80B01860) ## $a2 = 80B01860 /* 032A4 80B01554 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 032A8 80B01558 240709AB */ addiu $a3, $zero, 0x09AB ## $a3 = 000009AB -/* 032AC 80B0155C 0C031AB1 */ jal func_800C6AC4 -/* 032B0 80B01560 AFA5004C */ sw $a1, 0x004C($sp) -/* 032B4 80B01564 0C024F46 */ jal func_80093D18 +/* 032AC 80B0155C 0C031AB1 */ jal func_800C6AC4 +/* 032B0 80B01560 AFA5004C */ sw $a1, 0x004C($sp) +/* 032B4 80B01564 0C024F46 */ jal func_80093D18 /* 032B8 80B01568 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 032BC 80B0156C 8E0E02DC */ lw $t6, 0x02DC($s0) ## 000002DC -/* 032C0 80B01570 8FA3004C */ lw $v1, 0x004C($sp) -/* 032C4 80B01574 2DC100FF */ sltiu $at, $t6, 0x00FF -/* 032C8 80B01578 5020000F */ beql $at, $zero, .L80B015B8 +/* 032C0 80B01570 8FA3004C */ lw $v1, 0x004C($sp) +/* 032C4 80B01574 2DC100FF */ sltiu $at, $t6, 0x00FF +/* 032C8 80B01578 5020000F */ beql $at, $zero, .L80B015B8 /* 032CC 80B0157C 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 /* 032D0 80B01580 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 /* 032D4 80B01584 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -27,10 +27,10 @@ glabel EnSkj_Draw /* 032E4 80B01594 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 032E8 80B01598 8E0502DC */ lw $a1, 0x02DC($s0) ## 000002DC /* 032EC 80B0159C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 032F0 80B015A0 0C2C051D */ jal func_80B01474 -/* 032F4 80B015A4 AFA20038 */ sw $v0, 0x0038($sp) -/* 032F8 80B015A8 8FA60038 */ lw $a2, 0x0038($sp) -/* 032FC 80B015AC 1000000D */ beq $zero, $zero, .L80B015E4 +/* 032F0 80B015A0 0C2C051D */ jal func_80B01474 +/* 032F4 80B015A4 AFA20038 */ sw $v0, 0x0038($sp) +/* 032F8 80B015A8 8FA60038 */ lw $a2, 0x0038($sp) +/* 032FC 80B015AC 1000000D */ beq $zero, $zero, .L80B015E4 /* 03300 80B015B0 ACC20004 */ sw $v0, 0x0004($a2) ## 00000004 /* 03304 80B015B4 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 .L80B015B8: @@ -41,9 +41,9 @@ glabel EnSkj_Draw /* 03318 80B015C8 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 0331C 80B015CC 8E0502DC */ lw $a1, 0x02DC($s0) ## 000002DC /* 03320 80B015D0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 03324 80B015D4 0C2C0539 */ jal func_80B014E4 -/* 03328 80B015D8 AFA20034 */ sw $v0, 0x0034($sp) -/* 0332C 80B015DC 8FA60034 */ lw $a2, 0x0034($sp) +/* 03324 80B015D4 0C2C0539 */ jal func_80B014E4 +/* 03328 80B015D8 AFA20034 */ sw $v0, 0x0034($sp) +/* 0332C 80B015DC 8FA60034 */ lw $a2, 0x0034($sp) /* 03330 80B015E0 ACC20004 */ sw $v0, 0x0004($a2) ## 00000004 .L80B015E4: /* 03334 80B015E4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 @@ -53,20 +53,20 @@ glabel EnSkj_Draw /* 03344 80B015F4 3C0A80B0 */ lui $t2, %hi(func_80B01360) ## $t2 = 80B00000 /* 03348 80B015F8 254A1360 */ addiu $t2, $t2, %lo(func_80B01360) ## $t2 = 80B01360 /* 0334C 80B015FC 25291348 */ addiu $t1, $t1, %lo(func_80B01348) ## $t1 = 80B01348 -/* 03350 80B01600 AFA90010 */ sw $t1, 0x0010($sp) -/* 03354 80B01604 AFAA0014 */ sw $t2, 0x0014($sp) -/* 03358 80B01608 AFB00018 */ sw $s0, 0x0018($sp) -/* 0335C 80B0160C 0C0286B2 */ jal func_800A1AC8 +/* 03350 80B01600 AFA90010 */ sw $t1, 0x0010($sp) +/* 03354 80B01604 AFAA0014 */ sw $t2, 0x0014($sp) +/* 03358 80B01608 AFB00018 */ sw $s0, 0x0018($sp) +/* 0335C 80B0160C 0C0286B2 */ jal SkelAnime_DrawSV /* 03360 80B01610 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03364 80B01614 3C0680B0 */ lui $a2, %hi(D_80B01870) ## $a2 = 80B00000 /* 03368 80B01618 24C61870 */ addiu $a2, $a2, %lo(D_80B01870) ## $a2 = 80B01870 /* 0336C 80B0161C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 03370 80B01620 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 03374 80B01624 0C031AD5 */ jal func_800C6B54 +/* 03374 80B01624 0C031AD5 */ jal func_800C6B54 /* 03378 80B01628 240709BF */ addiu $a3, $zero, 0x09BF ## $a3 = 000009BF -/* 0337C 80B0162C 8FBF002C */ lw $ra, 0x002C($sp) -/* 03380 80B01630 8FB00024 */ lw $s0, 0x0024($sp) -/* 03384 80B01634 8FB10028 */ lw $s1, 0x0028($sp) -/* 03388 80B01638 03E00008 */ jr $ra +/* 0337C 80B0162C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03380 80B01630 8FB00024 */ lw $s0, 0x0024($sp) +/* 03384 80B01634 8FB10028 */ lw $s1, 0x0028($sp) +/* 03388 80B01638 03E00008 */ jr $ra /* 0338C 80B0163C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s index 02538ed01b..fcb390afd2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s @@ -1,28 +1,28 @@ glabel EnSkj_Init /* 001FC 80AFE4AC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00200 80AFE4B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00204 80AFE4B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00208 80AFE4B8 AFA50054 */ sw $a1, 0x0054($sp) +/* 00200 80AFE4B0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00204 80AFE4B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00208 80AFE4B8 AFA50054 */ sw $a1, 0x0054($sp) /* 0020C 80AFE4BC 8483001C */ lh $v1, 0x001C($a0) ## 0000001C /* 00210 80AFE4C0 3C0580B0 */ lui $a1, %hi(D_80B017C0) ## $a1 = 80B00000 /* 00214 80AFE4C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00218 80AFE4C8 00031A83 */ sra $v1, $v1, 10 +/* 00218 80AFE4C8 00031A83 */ sra $v1, $v1, 10 /* 0021C 80AFE4CC 3063003F */ andi $v1, $v1, 0x003F ## $v1 = 00000000 -/* 00220 80AFE4D0 00031C00 */ sll $v1, $v1, 16 -/* 00224 80AFE4D4 00031C03 */ sra $v1, $v1, 16 -/* 00228 80AFE4D8 A7A3004E */ sh $v1, 0x004E($sp) +/* 00220 80AFE4D0 00031C00 */ sll $v1, $v1, 16 +/* 00224 80AFE4D4 00031C03 */ sra $v1, $v1, 16 +/* 00228 80AFE4D8 A7A3004E */ sh $v1, 0x004E($sp) /* 0022C 80AFE4DC 0C01E037 */ jal Actor_ProcessInitChain - + /* 00230 80AFE4E0 24A517C0 */ addiu $a1, $a1, %lo(D_80B017C0) ## $a1 = 80B017C0 -/* 00234 80AFE4E4 87A3004E */ lh $v1, 0x004E($sp) +/* 00234 80AFE4E4 87A3004E */ lh $v1, 0x004E($sp) /* 00238 80AFE4E8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 0023C 80AFE4EC 3C0280B0 */ lui $v0, %hi(D_80B01640) ## $v0 = 80B00000 -/* 00240 80AFE4F0 10610006 */ beq $v1, $at, .L80AFE50C +/* 00240 80AFE4F0 10610006 */ beq $v1, $at, .L80AFE50C /* 00244 80AFE4F4 24421640 */ addiu $v0, $v0, %lo(D_80B01640) ## $v0 = 80B01640 /* 00248 80AFE4F8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0024C 80AFE4FC 10610017 */ beq $v1, $at, .L80AFE55C +/* 0024C 80AFE4FC 10610017 */ beq $v1, $at, .L80AFE55C /* 00250 80AFE500 3C0280B0 */ lui $v0, %hi(D_80B01640) ## $v0 = 80B00000 -/* 00254 80AFE504 10000035 */ beq $zero, $zero, .L80AFE5DC +/* 00254 80AFE504 10000035 */ beq $zero, $zero, .L80AFE5DC /* 00258 80AFE508 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L80AFE50C: /* 0025C 80AFE50C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -31,21 +31,21 @@ glabel EnSkj_Init /* 00268 80AFE518 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 0026C 80AFE51C 2401FFFA */ addiu $at, $zero, 0xFFFA ## $at = FFFFFFFA /* 00270 80AFE520 3C0F80B0 */ lui $t7, %hi(func_80B00964) ## $t7 = 80B00000 -/* 00274 80AFE524 0301C824 */ and $t9, $t8, $at +/* 00274 80AFE524 0301C824 */ and $t9, $t8, $at /* 00278 80AFE528 25EF0964 */ addiu $t7, $t7, %lo(func_80B00964) ## $t7 = 80B00964 /* 0027C 80AFE52C AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 00280 80AFE530 AE00012C */ sw $zero, 0x012C($s0) ## 0000012C /* 00284 80AFE534 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 /* 00288 80AFE538 AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 /* 0028C 80AFE53C AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 00290 80AFE540 8FA40054 */ lw $a0, 0x0054($sp) +/* 00290 80AFE540 8FA40054 */ lw $a0, 0x0054($sp) /* 00294 80AFE544 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00298 80AFE548 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 /* 0029C 80AFE54C 0C00CDD2 */ jal Actor_ChangeType - + /* 002A0 80AFE550 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 002A4 80AFE554 100000D7 */ beq $zero, $zero, .L80AFE8B4 -/* 002A8 80AFE558 8FBF002C */ lw $ra, 0x002C($sp) +/* 002A4 80AFE554 100000D7 */ beq $zero, $zero, .L80AFE8B4 +/* 002A8 80AFE558 8FBF002C */ lw $ra, 0x002C($sp) .L80AFE55C: /* 002AC 80AFE55C 24421640 */ addiu $v0, $v0, %lo(D_80B01640) ## $v0 = 00001640 /* 002B0 80AFE560 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 @@ -54,21 +54,21 @@ glabel EnSkj_Init /* 002BC 80AFE56C 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 /* 002C0 80AFE570 2401FFFA */ addiu $at, $zero, 0xFFFA ## $at = FFFFFFFA /* 002C4 80AFE574 3C0B80B0 */ lui $t3, %hi(func_80B01244) ## $t3 = 80B00000 -/* 002C8 80AFE578 01816824 */ and $t5, $t4, $at +/* 002C8 80AFE578 01816824 */ and $t5, $t4, $at /* 002CC 80AFE57C 256B1244 */ addiu $t3, $t3, %lo(func_80B01244) ## $t3 = 80B01244 /* 002D0 80AFE580 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 /* 002D4 80AFE584 AE00012C */ sw $zero, 0x012C($s0) ## 0000012C /* 002D8 80AFE588 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 /* 002DC 80AFE58C AE0B0130 */ sw $t3, 0x0130($s0) ## 00000130 /* 002E0 80AFE590 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 002E4 80AFE594 8FA40054 */ lw $a0, 0x0054($sp) +/* 002E4 80AFE594 8FA40054 */ lw $a0, 0x0054($sp) /* 002E8 80AFE598 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002EC 80AFE59C 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 /* 002F0 80AFE5A0 0C00CDD2 */ jal Actor_ChangeType - + /* 002F4 80AFE5A4 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 /* 002F8 80AFE5A8 3C0180B0 */ lui $at, %hi(D_80B018F8) ## $at = 80B00000 -/* 002FC 80AFE5AC C42418F8 */ lwc1 $f4, %lo(D_80B018F8)($at) +/* 002FC 80AFE5AC C42418F8 */ lwc1 $f4, %lo(D_80B018F8)($at) /* 00300 80AFE5B0 3C01C2B4 */ lui $at, 0xC2B4 ## $at = C2B40000 /* 00304 80AFE5B4 44813000 */ mtc1 $at, $f6 ## $f6 = -90.00 /* 00308 80AFE5B8 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 @@ -78,79 +78,79 @@ glabel EnSkj_Init /* 00318 80AFE5C8 AE180274 */ sw $t8, 0x0274($s0) ## 00000274 /* 0031C 80AFE5CC E6040038 */ swc1 $f4, 0x0038($s0) ## 00000038 /* 00320 80AFE5D0 E606003C */ swc1 $f6, 0x003C($s0) ## 0000003C -/* 00324 80AFE5D4 100000B6 */ beq $zero, $zero, .L80AFE8B0 +/* 00324 80AFE5D4 100000B6 */ beq $zero, $zero, .L80AFE8B0 /* 00328 80AFE5D8 E6080040 */ swc1 $f8, 0x0040($s0) ## 00000040 .L80AFE5DC: /* 0032C 80AFE5DC A603001C */ sh $v1, 0x001C($s0) ## 0000001C /* 00330 80AFE5E0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00334 80AFE5E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00338 80AFE5E8 10400010 */ beq $v0, $zero, .L80AFE62C +/* 00338 80AFE5E8 10400010 */ beq $v0, $zero, .L80AFE62C /* 0033C 80AFE5EC 00000000 */ nop -/* 00340 80AFE5F0 1041000E */ beq $v0, $at, .L80AFE62C +/* 00340 80AFE5F0 1041000E */ beq $v0, $at, .L80AFE62C /* 00344 80AFE5F4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00348 80AFE5F8 1041000C */ beq $v0, $at, .L80AFE62C +/* 00348 80AFE5F8 1041000C */ beq $v0, $at, .L80AFE62C /* 0034C 80AFE5FC 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 /* 00350 80AFE600 93397491 */ lbu $t9, 0x7491($t9) ## 80127491 /* 00354 80AFE604 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00358 80AFE608 01194021 */ addu $t0, $t0, $t9 +/* 00358 80AFE608 01194021 */ addu $t0, $t0, $t9 /* 0035C 80AFE60C 9108E6D4 */ lbu $t0, -0x192C($t0) ## 8015E6D4 -/* 00360 80AFE610 29010032 */ slti $at, $t0, 0x0032 -/* 00364 80AFE614 10200005 */ beq $at, $zero, .L80AFE62C +/* 00360 80AFE610 29010032 */ slti $at, $t0, 0x0032 +/* 00364 80AFE614 10200005 */ beq $at, $zero, .L80AFE62C /* 00368 80AFE618 00000000 */ nop /* 0036C 80AFE61C 0C00B55C */ jal Actor_Kill - + /* 00370 80AFE620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00374 80AFE624 100000A3 */ beq $zero, $zero, .L80AFE8B4 -/* 00378 80AFE628 8FBF002C */ lw $ra, 0x002C($sp) +/* 00374 80AFE624 100000A3 */ beq $zero, $zero, .L80AFE8B4 +/* 00378 80AFE628 8FBF002C */ lw $ra, 0x002C($sp) .L80AFE62C: -/* 0037C 80AFE62C 0C2BF90A */ jal func_80AFE428 -/* 00380 80AFE630 A7A3004E */ sh $v1, 0x004E($sp) +/* 0037C 80AFE62C 0C2BF90A */ jal func_80AFE428 +/* 00380 80AFE630 A7A3004E */ sh $v1, 0x004E($sp) /* 00384 80AFE634 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00388 80AFE638 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0038C 80AFE63C 26090190 */ addiu $t1, $s0, 0x0190 ## $t1 = 00000190 /* 00390 80AFE640 260A0202 */ addiu $t2, $s0, 0x0202 ## $t2 = 00000202 /* 00394 80AFE644 240B0013 */ addiu $t3, $zero, 0x0013 ## $t3 = 00000013 -/* 00398 80AFE648 AFAB0018 */ sw $t3, 0x0018($sp) -/* 0039C 80AFE64C AFAA0014 */ sw $t2, 0x0014($sp) -/* 003A0 80AFE650 AFA90010 */ sw $t1, 0x0010($sp) +/* 00398 80AFE648 AFAB0018 */ sw $t3, 0x0018($sp) +/* 0039C 80AFE64C AFAA0014 */ sw $t2, 0x0014($sp) +/* 003A0 80AFE650 AFA90010 */ sw $t1, 0x0010($sp) /* 003A4 80AFE654 24E70E10 */ addiu $a3, $a3, 0x0E10 ## $a3 = 06000E10 /* 003A8 80AFE658 24C65F40 */ addiu $a2, $a2, 0x5F40 ## $a2 = 06005F40 -/* 003AC 80AFE65C 8FA40054 */ lw $a0, 0x0054($sp) -/* 003B0 80AFE660 0C0291BE */ jal func_800A46F8 +/* 003AC 80AFE65C 8FA40054 */ lw $a0, 0x0054($sp) +/* 003B0 80AFE660 0C0291BE */ jal SkelAnime_InitSV /* 003B4 80AFE664 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 003B8 80AFE668 87A3004E */ lh $v1, 0x004E($sp) -/* 003BC 80AFE66C 0460000F */ bltz $v1, .L80AFE6AC -/* 003C0 80AFE670 28610003 */ slti $at, $v1, 0x0003 -/* 003C4 80AFE674 1020000D */ beq $at, $zero, .L80AFE6AC -/* 003C8 80AFE678 8FA40054 */ lw $a0, 0x0054($sp) +/* 003B8 80AFE668 87A3004E */ lh $v1, 0x004E($sp) +/* 003BC 80AFE66C 0460000F */ bltz $v1, .L80AFE6AC +/* 003C0 80AFE670 28610003 */ slti $at, $v1, 0x0003 +/* 003C4 80AFE674 1020000D */ beq $at, $zero, .L80AFE6AC +/* 003C8 80AFE678 8FA40054 */ lw $a0, 0x0054($sp) /* 003CC 80AFE67C 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 /* 003D0 80AFE680 2401FFFA */ addiu $at, $zero, 0xFFFA ## $at = FFFFFFFA /* 003D4 80AFE684 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 003D8 80AFE688 01816824 */ and $t5, $t4, $at +/* 003D8 80AFE688 01816824 */ and $t5, $t4, $at /* 003DC 80AFE68C AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 /* 003E0 80AFE690 35AF0009 */ ori $t7, $t5, 0x0009 ## $t7 = 00000009 /* 003E4 80AFE694 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 003E8 80AFE698 A7A3004E */ sh $v1, 0x004E($sp) +/* 003E8 80AFE698 A7A3004E */ sh $v1, 0x004E($sp) /* 003EC 80AFE69C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 003F0 80AFE6A0 0C00CDD2 */ jal Actor_ChangeType - + /* 003F4 80AFE6A4 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 003F8 80AFE6A8 87A3004E */ lh $v1, 0x004E($sp) +/* 003F8 80AFE6A8 87A3004E */ lh $v1, 0x004E($sp) .L80AFE6AC: -/* 003FC 80AFE6AC 04600003 */ bltz $v1, .L80AFE6BC -/* 00400 80AFE6B0 28610007 */ slti $at, $v1, 0x0007 -/* 00404 80AFE6B4 14200006 */ bne $at, $zero, .L80AFE6D0 +/* 003FC 80AFE6AC 04600003 */ bltz $v1, .L80AFE6BC +/* 00400 80AFE6B0 28610007 */ slti $at, $v1, 0x0007 +/* 00404 80AFE6B4 14200006 */ bne $at, $zero, .L80AFE6D0 /* 00408 80AFE6B8 00000000 */ nop .L80AFE6BC: /* 0040C 80AFE6BC 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 00410 80AFE6C0 3C01FDFF */ lui $at, 0xFDFF ## $at = FDFF0000 /* 00414 80AFE6C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FDFFFFFF -/* 00418 80AFE6C8 0301C824 */ and $t9, $t8, $at +/* 00418 80AFE6C8 0301C824 */ and $t9, $t8, $at /* 0041C 80AFE6CC AE190004 */ sw $t9, 0x0004($s0) ## 00000004 .L80AFE6D0: -/* 00420 80AFE6D0 18600017 */ blez $v1, .L80AFE730 -/* 00424 80AFE6D4 28610003 */ slti $at, $v1, 0x0003 -/* 00428 80AFE6D8 10200015 */ beq $at, $zero, .L80AFE730 +/* 00420 80AFE6D0 18600017 */ blez $v1, .L80AFE730 +/* 00424 80AFE6D4 28610003 */ slti $at, $v1, 0x0003 +/* 00428 80AFE6D8 10200015 */ beq $at, $zero, .L80AFE730 /* 0042C 80AFE6DC 24080007 */ addiu $t0, $zero, 0x0007 ## $t0 = 00000007 /* 00430 80AFE6E0 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 /* 00434 80AFE6E4 8E090028 */ lw $t1, 0x0028($s0) ## 00000028 @@ -158,9 +158,9 @@ glabel EnSkj_Init /* 0043C 80AFE6EC AE0A02F4 */ sw $t2, 0x02F4($s0) ## 000002F4 /* 00440 80AFE6F0 8E0A002C */ lw $t2, 0x002C($s0) ## 0000002C /* 00444 80AFE6F4 258C1648 */ addiu $t4, $t4, %lo(D_80B01648) ## $t4 = 80B01648 -/* 00448 80AFE6F8 000358C0 */ sll $t3, $v1, 3 +/* 00448 80AFE6F8 000358C0 */ sll $t3, $v1, 3 /* 0044C 80AFE6FC A208001F */ sb $t0, 0x001F($s0) ## 0000001F -/* 00450 80AFE700 016C1021 */ addu $v0, $t3, $t4 +/* 00450 80AFE700 016C1021 */ addu $v0, $t3, $t4 /* 00454 80AFE704 AE0902F8 */ sw $t1, 0x02F8($s0) ## 000002F8 /* 00458 80AFE708 AE0A02FC */ sw $t2, 0x02FC($s0) ## 000002FC /* 0045C 80AFE70C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 @@ -168,14 +168,14 @@ glabel EnSkj_Init /* 00464 80AFE714 AC50FFFC */ sw $s0, -0x0004($v0) ## FFFFFFFC /* 00468 80AFE718 A20002D8 */ sb $zero, 0x02D8($s0) ## 000002D8 /* 0046C 80AFE71C AE0002DC */ sw $zero, 0x02DC($s0) ## 000002DC -/* 00470 80AFE720 0C2C0145 */ jal func_80B00514 +/* 00470 80AFE720 0C2C0145 */ jal func_80B00514 /* 00474 80AFE724 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00478 80AFE728 10000005 */ beq $zero, $zero, .L80AFE740 +/* 00478 80AFE728 10000005 */ beq $zero, $zero, .L80AFE740 /* 0047C 80AFE72C 00000000 */ nop .L80AFE730: /* 00480 80AFE730 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 00484 80AFE734 AE0E02DC */ sw $t6, 0x02DC($s0) ## 000002DC -/* 00488 80AFE738 0C2BFC0E */ jal func_80AFF038 +/* 00488 80AFE738 0C2BFC0E */ jal func_80AFF038 /* 0048C 80AFE73C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AFE740: /* 00490 80AFE740 3C0F80B0 */ lui $t7, %hi(D_80B016A4) ## $t7 = 80B00000 @@ -184,27 +184,27 @@ glabel EnSkj_Init /* 0049C 80AFE74C AE0F0098 */ sw $t7, 0x0098($s0) ## 00000098 /* 004A0 80AFE750 A21800AF */ sb $t8, 0x00AF($s0) ## 000000AF /* 004A4 80AFE754 26050278 */ addiu $a1, $s0, 0x0278 ## $a1 = 00000278 -/* 004A8 80AFE758 AFA50034 */ sw $a1, 0x0034($sp) +/* 004A8 80AFE758 AFA50034 */ sw $a1, 0x0034($sp) /* 004AC 80AFE75C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 004B0 80AFE760 8FA40054 */ lw $a0, 0x0054($sp) + +/* 004B0 80AFE760 8FA40054 */ lw $a0, 0x0054($sp) /* 004B4 80AFE764 3C0780B0 */ lui $a3, %hi(D_80B01678) ## $a3 = 80B00000 -/* 004B8 80AFE768 8FA50034 */ lw $a1, 0x0034($sp) +/* 004B8 80AFE768 8FA50034 */ lw $a1, 0x0034($sp) /* 004BC 80AFE76C 24E71678 */ addiu $a3, $a3, %lo(D_80B01678) ## $a3 = 80B01678 -/* 004C0 80AFE770 8FA40054 */ lw $a0, 0x0054($sp) -/* 004C4 80AFE774 0C017114 */ jal func_8005C450 +/* 004C0 80AFE770 8FA40054 */ lw $a0, 0x0054($sp) +/* 004C4 80AFE774 0C017114 */ jal func_8005C450 /* 004C8 80AFE778 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 004CC 80AFE77C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 004D0 80AFE780 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 004D4 80AFE784 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 004D8 80AFE788 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 004DC 80AFE78C 0C00AC78 */ jal ActorShape_Init - + /* 004E0 80AFE790 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 004E4 80AFE794 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 004E8 80AFE798 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 004EC 80AFE79C 0C00B58B */ jal Actor_SetScale - + /* 004F0 80AFE7A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004F4 80AFE7A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 004F8 80AFE7A8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 @@ -219,72 +219,72 @@ glabel EnSkj_Init /* 0051C 80AFE7CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00520 80AFE7D0 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 00524 80AFE7D4 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 00528 80AFE7D8 0C2BF8E4 */ jal func_80AFE390 +/* 00528 80AFE7D8 0C2BF8E4 */ jal func_80AFE390 /* 0052C 80AFE7DC E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 00530 80AFE7E0 8FA80054 */ lw $t0, 0x0054($sp) +/* 00530 80AFE7E0 8FA80054 */ lw $t0, 0x0054($sp) /* 00534 80AFE7E4 3C0480B0 */ lui $a0, %hi(D_80B017D0) ## $a0 = 80B00000 /* 00538 80AFE7E8 248417D0 */ addiu $a0, $a0, %lo(D_80B017D0) ## $a0 = 80B017D0 /* 0053C 80AFE7EC 8D021C44 */ lw $v0, 0x1C44($t0) ## 00001C44 /* 00540 80AFE7F0 C4500024 */ lwc1 $f16, 0x0024($v0) ## 00000024 -/* 00544 80AFE7F4 AFA2003C */ sw $v0, 0x003C($sp) -/* 00548 80AFE7F8 460084A1 */ cvt.d.s $f18, $f16 -/* 0054C 80AFE7FC 44079000 */ mfc1 $a3, $f18 -/* 00550 80AFE800 44069800 */ mfc1 $a2, $f19 +/* 00544 80AFE7F4 AFA2003C */ sw $v0, 0x003C($sp) +/* 00548 80AFE7F8 460084A1 */ cvt.d.s $f18, $f16 +/* 0054C 80AFE7FC 44079000 */ mfc1 $a3, $f18 +/* 00550 80AFE800 44069800 */ mfc1 $a2, $f19 /* 00554 80AFE804 0C00084C */ jal osSyncPrintf - + /* 00558 80AFE808 00000000 */ nop -/* 0055C 80AFE80C 8FA2003C */ lw $v0, 0x003C($sp) +/* 0055C 80AFE80C 8FA2003C */ lw $v0, 0x003C($sp) /* 00560 80AFE810 3C0480B0 */ lui $a0, %hi(D_80B017E0) ## $a0 = 80B00000 /* 00564 80AFE814 248417E0 */ addiu $a0, $a0, %lo(D_80B017E0) ## $a0 = 80B017E0 /* 00568 80AFE818 C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C -/* 0056C 80AFE81C 460021A1 */ cvt.d.s $f6, $f4 -/* 00570 80AFE820 44073000 */ mfc1 $a3, $f6 -/* 00574 80AFE824 44063800 */ mfc1 $a2, $f7 +/* 0056C 80AFE81C 460021A1 */ cvt.d.s $f6, $f4 +/* 00570 80AFE820 44073000 */ mfc1 $a3, $f6 +/* 00574 80AFE824 44063800 */ mfc1 $a2, $f7 /* 00578 80AFE828 0C00084C */ jal osSyncPrintf - + /* 0057C 80AFE82C 00000000 */ nop /* 00580 80AFE830 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 00584 80AFE834 3C0480B0 */ lui $a0, %hi(D_80B017F0) ## $a0 = 80B00000 /* 00588 80AFE838 248417F0 */ addiu $a0, $a0, %lo(D_80B017F0) ## $a0 = 80B017F0 -/* 0058C 80AFE83C 460042A1 */ cvt.d.s $f10, $f8 -/* 00590 80AFE840 44075000 */ mfc1 $a3, $f10 -/* 00594 80AFE844 44065800 */ mfc1 $a2, $f11 +/* 0058C 80AFE83C 460042A1 */ cvt.d.s $f10, $f8 +/* 00590 80AFE840 44075000 */ mfc1 $a3, $f10 +/* 00594 80AFE844 44065800 */ mfc1 $a2, $f11 /* 00598 80AFE848 0C00084C */ jal osSyncPrintf - + /* 0059C 80AFE84C 00000000 */ nop /* 005A0 80AFE850 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C /* 005A4 80AFE854 3C0480B0 */ lui $a0, %hi(D_80B01800) ## $a0 = 80B00000 /* 005A8 80AFE858 24841800 */ addiu $a0, $a0, %lo(D_80B01800) ## $a0 = 80B01800 -/* 005AC 80AFE85C 460084A1 */ cvt.d.s $f18, $f16 -/* 005B0 80AFE860 44079000 */ mfc1 $a3, $f18 -/* 005B4 80AFE864 44069800 */ mfc1 $a2, $f19 +/* 005AC 80AFE85C 460084A1 */ cvt.d.s $f18, $f16 +/* 005B0 80AFE860 44079000 */ mfc1 $a3, $f18 +/* 005B4 80AFE864 44069800 */ mfc1 $a2, $f19 /* 005B8 80AFE868 0C00084C */ jal osSyncPrintf - + /* 005BC 80AFE86C 00000000 */ nop /* 005C0 80AFE870 C60402E0 */ lwc1 $f4, 0x02E0($s0) ## 000002E0 /* 005C4 80AFE874 3C0480B0 */ lui $a0, %hi(D_80B01810) ## $a0 = 80B00000 /* 005C8 80AFE878 24841810 */ addiu $a0, $a0, %lo(D_80B01810) ## $a0 = 80B01810 -/* 005CC 80AFE87C 460021A1 */ cvt.d.s $f6, $f4 -/* 005D0 80AFE880 44073000 */ mfc1 $a3, $f6 -/* 005D4 80AFE884 44063800 */ mfc1 $a2, $f7 +/* 005CC 80AFE87C 460021A1 */ cvt.d.s $f6, $f4 +/* 005D0 80AFE880 44073000 */ mfc1 $a3, $f6 +/* 005D4 80AFE884 44063800 */ mfc1 $a2, $f7 /* 005D8 80AFE888 0C00084C */ jal osSyncPrintf - + /* 005DC 80AFE88C 00000000 */ nop /* 005E0 80AFE890 C60802E8 */ lwc1 $f8, 0x02E8($s0) ## 000002E8 /* 005E4 80AFE894 3C0480B0 */ lui $a0, %hi(D_80B01820) ## $a0 = 80B00000 /* 005E8 80AFE898 24841820 */ addiu $a0, $a0, %lo(D_80B01820) ## $a0 = 80B01820 -/* 005EC 80AFE89C 460042A1 */ cvt.d.s $f10, $f8 -/* 005F0 80AFE8A0 44075000 */ mfc1 $a3, $f10 -/* 005F4 80AFE8A4 44065800 */ mfc1 $a2, $f11 +/* 005EC 80AFE89C 460042A1 */ cvt.d.s $f10, $f8 +/* 005F0 80AFE8A0 44075000 */ mfc1 $a3, $f10 +/* 005F4 80AFE8A4 44065800 */ mfc1 $a2, $f11 /* 005F8 80AFE8A8 0C00084C */ jal osSyncPrintf - + /* 005FC 80AFE8AC 00000000 */ nop .L80AFE8B0: -/* 00600 80AFE8B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00600 80AFE8B0 8FBF002C */ lw $ra, 0x002C($sp) .L80AFE8B4: -/* 00604 80AFE8B4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00604 80AFE8B4 8FB00028 */ lw $s0, 0x0028($sp) /* 00608 80AFE8B8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 0060C 80AFE8BC 03E00008 */ jr $ra +/* 0060C 80AFE8BC 03E00008 */ jr $ra /* 00610 80AFE8C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s index d0e9ef9742..fe58b3b9c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s @@ -1,76 +1,76 @@ glabel func_80B07734 /* 001F4 80B07734 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 001F8 80B07738 AFBF002C */ sw $ra, 0x002C($sp) -/* 001FC 80B0773C AFB00028 */ sw $s0, 0x0028($sp) +/* 001F8 80B07738 AFBF002C */ sw $ra, 0x002C($sp) +/* 001FC 80B0773C AFB00028 */ sw $s0, 0x0028($sp) /* 00200 80B07740 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00204 80B07744 0C2C1DAC */ jal func_80B076B0 -/* 00208 80B07748 AFA50044 */ sw $a1, 0x0044($sp) +/* 00204 80B07744 0C2C1DAC */ jal func_80B076B0 +/* 00208 80B07748 AFA50044 */ sw $a1, 0x0044($sp) /* 0020C 80B0774C 920E02A4 */ lbu $t6, 0x02A4($s0) ## 000002A4 -/* 00210 80B07750 8FA40044 */ lw $a0, 0x0044($sp) +/* 00210 80B07750 8FA40044 */ lw $a0, 0x0044($sp) /* 00214 80B07754 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 00218 80B07758 000E7900 */ sll $t7, $t6, 4 -/* 0021C 80B0775C 01EE7821 */ addu $t7, $t7, $t6 -/* 00220 80B07760 000F7880 */ sll $t7, $t7, 2 -/* 00224 80B07764 008FC021 */ addu $t8, $a0, $t7 -/* 00228 80B07768 0338C821 */ addu $t9, $t9, $t8 +/* 00218 80B07758 000E7900 */ sll $t7, $t6, 4 +/* 0021C 80B0775C 01EE7821 */ addu $t7, $t7, $t6 +/* 00220 80B07760 000F7880 */ sll $t7, $t7, 2 +/* 00224 80B07764 008FC021 */ addu $t8, $a0, $t7 +/* 00228 80B07768 0338C821 */ addu $t9, $t9, $t8 /* 0022C 80B0776C 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 /* 00230 80B07770 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00234 80B07774 3C0680B1 */ lui $a2, %hi(D_80B0B43C) ## $a2 = 80B10000 -/* 00238 80B07778 03214021 */ addu $t0, $t9, $at +/* 00238 80B07778 03214021 */ addu $t0, $t9, $at /* 0023C 80B0777C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00240 80B07780 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 /* 00244 80B07784 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 00248 80B07788 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 0024C 80B0778C 260B01DC */ addiu $t3, $s0, 0x01DC ## $t3 = 000001DC -/* 00250 80B07790 00095080 */ sll $t2, $t1, 2 -/* 00254 80B07794 00CA3021 */ addu $a2, $a2, $t2 +/* 00250 80B07790 00095080 */ sll $t2, $t1, 2 +/* 00254 80B07794 00CA3021 */ addu $a2, $a2, $t2 /* 00258 80B07798 260C023C */ addiu $t4, $s0, 0x023C ## $t4 = 0000023C /* 0025C 80B0779C 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 -/* 00260 80B077A0 AFAD0018 */ sw $t5, 0x0018($sp) -/* 00264 80B077A4 AFAC0014 */ sw $t4, 0x0014($sp) -/* 00268 80B077A8 8CC6B43C */ lw $a2, %lo(D_80B0B43C)($a2) -/* 0026C 80B077AC AFAB0010 */ sw $t3, 0x0010($sp) -/* 00270 80B077B0 AFA50034 */ sw $a1, 0x0034($sp) -/* 00274 80B077B4 0C0291BE */ jal func_800A46F8 +/* 00260 80B077A0 AFAD0018 */ sw $t5, 0x0018($sp) +/* 00264 80B077A4 AFAC0014 */ sw $t4, 0x0014($sp) +/* 00268 80B077A8 8CC6B43C */ lw $a2, %lo(D_80B0B43C)($a2) +/* 0026C 80B077AC AFAB0010 */ sw $t3, 0x0010($sp) +/* 00270 80B077B0 AFA50034 */ sw $a1, 0x0034($sp) +/* 00274 80B077B4 0C0291BE */ jal SkelAnime_InitSV /* 00278 80B077B8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0027C 80B077BC 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00280 80B077C0 3C0580B1 */ lui $a1, %hi(D_80B0B454) ## $a1 = 80B10000 -/* 00284 80B077C4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00288 80B077C8 000E7880 */ sll $t7, $t6, 2 -/* 0028C 80B077CC 00AF2821 */ addu $a1, $a1, $t7 -/* 00290 80B077D0 0C0294BE */ jal func_800A52F8 -/* 00294 80B077D4 8CA5B454 */ lw $a1, %lo(D_80B0B454)($a1) +/* 00284 80B077C4 8FA40034 */ lw $a0, 0x0034($sp) +/* 00288 80B077C8 000E7880 */ sll $t7, $t6, 2 +/* 0028C 80B077CC 00AF2821 */ addu $a1, $a1, $t7 +/* 00290 80B077D0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00294 80B077D4 8CA5B454 */ lw $a1, %lo(D_80B0B454)($a1) /* 00298 80B077D8 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 0029C 80B077DC 3C0880B1 */ lui $t0, %hi(D_80B0B484) ## $t0 = 80B10000 /* 002A0 80B077E0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 002A4 80B077E4 0018C840 */ sll $t9, $t8, 1 -/* 002A8 80B077E8 01194021 */ addu $t0, $t0, $t9 -/* 002AC 80B077EC 9508B484 */ lhu $t0, %lo(D_80B0B484)($t0) +/* 002A4 80B077E4 0018C840 */ sll $t9, $t8, 1 +/* 002A8 80B077E8 01194021 */ addu $t0, $t0, $t9 +/* 002AC 80B077EC 9508B484 */ lhu $t0, %lo(D_80B0B484)($t0) /* 002B0 80B077F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002B4 80B077F4 3C0580B0 */ lui $a1, %hi(func_80B07D7C) ## $a1 = 80B00000 /* 002B8 80B077F8 A608029C */ sh $t0, 0x029C($s0) ## 0000029C /* 002BC 80B077FC 9529F54E */ lhu $t1, -0x0AB2($t1) ## 8015F54E /* 002C0 80B07800 310AFFFF */ andi $t2, $t0, 0xFFFF ## $t2 = 00000000 -/* 002C4 80B07804 012A5824 */ and $t3, $t1, $t2 -/* 002C8 80B07808 1160000A */ beq $t3, $zero, .L80B07834 +/* 002C4 80B07804 012A5824 */ and $t3, $t1, $t2 +/* 002C8 80B07808 1160000A */ beq $t3, $zero, .L80B07834 /* 002CC 80B0780C 00000000 */ nop /* 002D0 80B07810 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 002D4 80B07814 3C0580B1 */ lui $a1, %hi(D_80B0B46C) ## $a1 = 80B10000 /* 002D8 80B07818 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002DC 80B0781C 000C6880 */ sll $t5, $t4, 2 -/* 002E0 80B07820 00AD2821 */ addu $a1, $a1, $t5 -/* 002E4 80B07824 0C2C1D50 */ jal func_80B07540 -/* 002E8 80B07828 8CA5B46C */ lw $a1, %lo(D_80B0B46C)($a1) -/* 002EC 80B0782C 10000004 */ beq $zero, $zero, .L80B07840 -/* 002F0 80B07830 8FBF002C */ lw $ra, 0x002C($sp) +/* 002DC 80B0781C 000C6880 */ sll $t5, $t4, 2 +/* 002E0 80B07820 00AD2821 */ addu $a1, $a1, $t5 +/* 002E4 80B07824 0C2C1D50 */ jal func_80B07540 +/* 002E8 80B07828 8CA5B46C */ lw $a1, %lo(D_80B0B46C)($a1) +/* 002EC 80B0782C 10000004 */ beq $zero, $zero, .L80B07840 +/* 002F0 80B07830 8FBF002C */ lw $ra, 0x002C($sp) .L80B07834: -/* 002F4 80B07834 0C2C1D50 */ jal func_80B07540 +/* 002F4 80B07834 0C2C1D50 */ jal func_80B07540 /* 002F8 80B07838 24A57D7C */ addiu $a1, $a1, %lo(func_80B07D7C) ## $a1 = 00007D7C -/* 002FC 80B0783C 8FBF002C */ lw $ra, 0x002C($sp) +/* 002FC 80B0783C 8FBF002C */ lw $ra, 0x002C($sp) .L80B07840: -/* 00300 80B07840 8FB00028 */ lw $s0, 0x0028($sp) +/* 00300 80B07840 8FB00028 */ lw $s0, 0x0028($sp) /* 00304 80B07844 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00308 80B07848 03E00008 */ jr $ra +/* 00308 80B07848 03E00008 */ jr $ra /* 0030C 80B0784C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s index a92d1a6b66..b70a5c7f0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s @@ -1,31 +1,31 @@ glabel func_80B08258 /* 00D18 80B08258 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00D1C 80B0825C AFB1002C */ sw $s1, 0x002C($sp) +/* 00D1C 80B0825C AFB1002C */ sw $s1, 0x002C($sp) /* 00D20 80B08260 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00D24 80B08264 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00D28 80B08268 AFB20030 */ sw $s2, 0x0030($sp) -/* 00D2C 80B0826C AFB00028 */ sw $s0, 0x0028($sp) +/* 00D24 80B08264 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00D28 80B08268 AFB20030 */ sw $s2, 0x0030($sp) +/* 00D2C 80B0826C AFB00028 */ sw $s0, 0x0028($sp) /* 00D30 80B08270 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00D34 80B08274 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 00D38 80B08278 3C0680B1 */ lui $a2, %hi(D_80B0B570) ## $a2 = 80B10000 /* 00D3C 80B0827C 24C6B570 */ addiu $a2, $a2, %lo(D_80B0B570) ## $a2 = 80B0B570 /* 00D40 80B08280 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 00D44 80B08284 24070855 */ addiu $a3, $zero, 0x0855 ## $a3 = 00000855 -/* 00D48 80B08288 0C031AB1 */ jal func_800C6AC4 +/* 00D48 80B08288 0C031AB1 */ jal func_800C6AC4 /* 00D4C 80B0828C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00D50 80B08290 924E02A4 */ lbu $t6, 0x02A4($s2) ## 000002A4 /* 00D54 80B08294 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 /* 00D58 80B08298 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00D5C 80B0829C 000E7900 */ sll $t7, $t6, 4 -/* 00D60 80B082A0 01EE7821 */ addu $t7, $t7, $t6 -/* 00D64 80B082A4 000F7880 */ sll $t7, $t7, 2 -/* 00D68 80B082A8 022FC021 */ addu $t8, $s1, $t7 -/* 00D6C 80B082AC 0338C821 */ addu $t9, $t9, $t8 +/* 00D5C 80B0829C 000E7900 */ sll $t7, $t6, 4 +/* 00D60 80B082A0 01EE7821 */ addu $t7, $t7, $t6 +/* 00D64 80B082A4 000F7880 */ sll $t7, $t7, 2 +/* 00D68 80B082A8 022FC021 */ addu $t8, $s1, $t7 +/* 00D6C 80B082AC 0338C821 */ addu $t9, $t9, $t8 /* 00D70 80B082B0 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 -/* 00D74 80B082B4 03214821 */ addu $t1, $t9, $at +/* 00D74 80B082B4 03214821 */ addu $t1, $t9, $at /* 00D78 80B082B8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00D7C 80B082BC AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 -/* 00D80 80B082C0 0C0250F2 */ jal func_800943C8 +/* 00D80 80B082C0 0C0250F2 */ jal func_800943C8 /* 00D84 80B082C4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 00D88 80B082C8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00D8C 80B082CC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -36,25 +36,25 @@ glabel func_80B08258 /* 00DA0 80B082E0 864C001C */ lh $t4, 0x001C($s2) ## 0000001C /* 00DA4 80B082E4 3C0E80B1 */ lui $t6, %hi(D_80B0B4A8) ## $t6 = 80B10000 /* 00DA8 80B082E8 25CEB4A8 */ addiu $t6, $t6, %lo(D_80B0B4A8) ## $t6 = 80B0B4A8 -/* 00DAC 80B082EC 000C6880 */ sll $t5, $t4, 2 -/* 00DB0 80B082F0 01AC6823 */ subu $t5, $t5, $t4 -/* 00DB4 80B082F4 01AE1821 */ addu $v1, $t5, $t6 +/* 00DAC 80B082EC 000C6880 */ sll $t5, $t4, 2 +/* 00DB0 80B082F0 01AC6823 */ subu $t5, $t5, $t4 +/* 00DB4 80B082F4 01AE1821 */ addu $v1, $t5, $t6 /* 00DB8 80B082F8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 00DBC 80B082FC 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00DC0 80B08300 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00DC0 80B08300 AFAF0010 */ sw $t7, 0x0010($sp) /* 00DC4 80B08304 90650000 */ lbu $a1, 0x0000($v1) ## 00000000 /* 00DC8 80B08308 90660001 */ lbu $a2, 0x0001($v1) ## 00000001 /* 00DCC 80B0830C 90670002 */ lbu $a3, 0x0002($v1) ## 00000002 -/* 00DD0 80B08310 0C2C207B */ jal func_80B081EC -/* 00DD4 80B08314 AFA20048 */ sw $v0, 0x0048($sp) -/* 00DD8 80B08318 8FA80048 */ lw $t0, 0x0048($sp) +/* 00DD0 80B08310 0C2C207B */ jal func_80B081EC +/* 00DD4 80B08314 AFA20048 */ sw $v0, 0x0048($sp) +/* 00DD8 80B08318 8FA80048 */ lw $t0, 0x0048($sp) /* 00DDC 80B0831C 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 00DE0 80B08320 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 00DE4 80B08324 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 /* 00DE8 80B08328 8658001C */ lh $t8, 0x001C($s2) ## 0000001C /* 00DEC 80B0832C 358C0024 */ ori $t4, $t4, 0x0024 ## $t4 = DB060024 /* 00DF0 80B08330 2405005A */ addiu $a1, $zero, 0x005A ## $a1 = 0000005A -/* 00DF4 80B08334 17000011 */ bne $t8, $zero, .L80B0837C +/* 00DF4 80B08334 17000011 */ bne $t8, $zero, .L80B0837C /* 00DF8 80B08338 2406006E */ addiu $a2, $zero, 0x006E ## $a2 = 0000006E /* 00DFC 80B0833C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00E00 80B08340 35290024 */ ori $t1, $t1, 0x0024 ## $t1 = DB060024 @@ -63,14 +63,14 @@ glabel func_80B08258 /* 00E0C 80B0834C AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 00E10 80B08350 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 00E14 80B08354 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00E18 80B08358 AFAA0010 */ sw $t2, 0x0010($sp) +/* 00E18 80B08358 AFAA0010 */ sw $t2, 0x0010($sp) /* 00E1C 80B0835C 240500BE */ addiu $a1, $zero, 0x00BE ## $a1 = 000000BE /* 00E20 80B08360 2406006E */ addiu $a2, $zero, 0x006E ## $a2 = 0000006E /* 00E24 80B08364 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00E28 80B08368 0C2C207B */ jal func_80B081EC -/* 00E2C 80B0836C AFA20044 */ sw $v0, 0x0044($sp) -/* 00E30 80B08370 8FA30044 */ lw $v1, 0x0044($sp) -/* 00E34 80B08374 1000000D */ beq $zero, $zero, .L80B083AC +/* 00E28 80B08368 0C2C207B */ jal func_80B081EC +/* 00E2C 80B0836C AFA20044 */ sw $v0, 0x0044($sp) +/* 00E30 80B08370 8FA30044 */ lw $v1, 0x0044($sp) +/* 00E34 80B08374 1000000D */ beq $zero, $zero, .L80B083AC /* 00E38 80B08378 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80B0837C: /* 00E3C 80B0837C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -80,10 +80,10 @@ glabel func_80B08258 /* 00E4C 80B0838C AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 00E50 80B08390 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 00E54 80B08394 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00E58 80B08398 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00E5C 80B0839C 0C2C207B */ jal func_80B081EC -/* 00E60 80B083A0 AFA20040 */ sw $v0, 0x0040($sp) -/* 00E64 80B083A4 8FA30040 */ lw $v1, 0x0040($sp) +/* 00E58 80B08398 AFAD0010 */ sw $t5, 0x0010($sp) +/* 00E5C 80B0839C 0C2C207B */ jal func_80B081EC +/* 00E60 80B083A0 AFA20040 */ sw $v0, 0x0040($sp) +/* 00E64 80B083A4 8FA30040 */ lw $v1, 0x0040($sp) /* 00E68 80B083A8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80B083AC: /* 00E6C 80B083AC 8E45019C */ lw $a1, 0x019C($s2) ## 0000019C @@ -93,22 +93,22 @@ glabel func_80B08258 /* 00E7C 80B083BC 3C0F80B1 */ lui $t7, %hi(func_80B0813C) ## $t7 = 80B10000 /* 00E80 80B083C0 25EF813C */ addiu $t7, $t7, %lo(func_80B0813C) ## $t7 = 80B0813C /* 00E84 80B083C4 25CE7FE0 */ addiu $t6, $t6, %lo(func_80B07FE0) ## $t6 = 80B07FE0 -/* 00E88 80B083C8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00E8C 80B083CC AFAF0014 */ sw $t7, 0x0014($sp) -/* 00E90 80B083D0 AFB20018 */ sw $s2, 0x0018($sp) -/* 00E94 80B083D4 0C0286B2 */ jal func_800A1AC8 +/* 00E88 80B083C8 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00E8C 80B083CC AFAF0014 */ sw $t7, 0x0014($sp) +/* 00E90 80B083D0 AFB20018 */ sw $s2, 0x0018($sp) +/* 00E94 80B083D4 0C0286B2 */ jal SkelAnime_DrawSV /* 00E98 80B083D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E9C 80B083DC 3C0680B1 */ lui $a2, %hi(D_80B0B580) ## $a2 = 80B10000 /* 00EA0 80B083E0 24C6B580 */ addiu $a2, $a2, %lo(D_80B0B580) ## $a2 = 80B0B580 /* 00EA4 80B083E4 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 00EA8 80B083E8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00EAC 80B083EC 0C031AD5 */ jal func_800C6B54 +/* 00EAC 80B083EC 0C031AD5 */ jal func_800C6B54 /* 00EB0 80B083F0 24070880 */ addiu $a3, $zero, 0x0880 ## $a3 = 00000880 -/* 00EB4 80B083F4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00EB8 80B083F8 8FB00028 */ lw $s0, 0x0028($sp) -/* 00EBC 80B083FC 8FB1002C */ lw $s1, 0x002C($sp) -/* 00EC0 80B08400 8FB20030 */ lw $s2, 0x0030($sp) -/* 00EC4 80B08404 03E00008 */ jr $ra +/* 00EB4 80B083F4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00EB8 80B083F8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00EBC 80B083FC 8FB1002C */ lw $s1, 0x002C($sp) +/* 00EC0 80B08400 8FB20030 */ lw $s2, 0x0030($sp) +/* 00EC4 80B08404 03E00008 */ jr $ra /* 00EC8 80B08408 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00ECC 80B0840C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Draw.s index eb757e895c..6de4144394 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Draw.s @@ -1,24 +1,24 @@ glabel EnSyatekiMan_Draw /* 00CA8 80B11518 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00CAC 80B1151C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00CB0 80B11520 AFA40028 */ sw $a0, 0x0028($sp) -/* 00CB4 80B11524 AFA5002C */ sw $a1, 0x002C($sp) -/* 00CB8 80B11528 0C024F46 */ jal func_80093D18 +/* 00CAC 80B1151C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00CB0 80B11520 AFA40028 */ sw $a0, 0x0028($sp) +/* 00CB4 80B11524 AFA5002C */ sw $a1, 0x002C($sp) +/* 00CB8 80B11528 0C024F46 */ jal func_80093D18 /* 00CBC 80B1152C 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00CC0 80B11530 8FA20028 */ lw $v0, 0x0028($sp) +/* 00CC0 80B11530 8FA20028 */ lw $v0, 0x0028($sp) /* 00CC4 80B11534 3C0F80B1 */ lui $t7, %hi(func_80B1148C) ## $t7 = 80B10000 /* 00CC8 80B11538 25EF148C */ addiu $t7, $t7, %lo(func_80B1148C) ## $t7 = 80B1148C /* 00CCC 80B1153C 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 /* 00CD0 80B11540 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C /* 00CD4 80B11544 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E -/* 00CD8 80B11548 AFA00014 */ sw $zero, 0x0014($sp) -/* 00CDC 80B1154C AFAF0010 */ sw $t7, 0x0010($sp) -/* 00CE0 80B11550 8FA4002C */ lw $a0, 0x002C($sp) -/* 00CE4 80B11554 0C0286B2 */ jal func_800A1AC8 -/* 00CE8 80B11558 AFA20018 */ sw $v0, 0x0018($sp) -/* 00CEC 80B1155C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00CD8 80B11548 AFA00014 */ sw $zero, 0x0014($sp) +/* 00CDC 80B1154C AFAF0010 */ sw $t7, 0x0010($sp) +/* 00CE0 80B11550 8FA4002C */ lw $a0, 0x002C($sp) +/* 00CE4 80B11554 0C0286B2 */ jal SkelAnime_DrawSV +/* 00CE8 80B11558 AFA20018 */ sw $v0, 0x0018($sp) +/* 00CEC 80B1155C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00CF0 80B11560 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00CF4 80B11564 03E00008 */ jr $ra +/* 00CF4 80B11564 03E00008 */ jr $ra /* 00CF8 80B11568 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s index 35d8b39f81..d5331fe24b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s @@ -1,42 +1,42 @@ glabel EnSyatekiMan_Init /* 00000 80B10870 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 80B10874 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80B10874 AFB00028 */ sw $s0, 0x0028($sp) /* 00008 80B10878 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80B1087C AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 80B1087C AFBF002C */ sw $ra, 0x002C($sp) /* 00010 80B10880 3C0480B1 */ lui $a0, %hi(D_80B116A0) ## $a0 = 80B10000 -/* 00014 80B10884 AFA50034 */ sw $a1, 0x0034($sp) +/* 00014 80B10884 AFA50034 */ sw $a1, 0x0034($sp) /* 00018 80B10888 0C00084C */ jal osSyncPrintf - + /* 0001C 80B1088C 248416A0 */ addiu $a0, $a0, %lo(D_80B116A0) ## $a0 = 80B116A0 /* 00020 80B10890 3C0480B1 */ lui $a0, %hi(D_80B116A4) ## $a0 = 80B10000 /* 00024 80B10894 0C00084C */ jal osSyncPrintf - + /* 00028 80B10898 248416A4 */ addiu $a0, $a0, %lo(D_80B116A4) ## $a0 = 80B116A4 /* 0002C 80B1089C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00030 80B108A0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00034 80B108A4 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F /* 00038 80B108A8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 0003C 80B108AC 0C00B58B */ jal Actor_SetScale - + /* 00040 80B108B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00044 80B108B4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00048 80B108B8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0004C 80B108BC 260F0190 */ addiu $t7, $s0, 0x0190 ## $t7 = 00000190 /* 00050 80B108C0 261801C6 */ addiu $t8, $s0, 0x01C6 ## $t8 = 000001C6 /* 00054 80B108C4 24190009 */ addiu $t9, $zero, 0x0009 ## $t9 = 00000009 -/* 00058 80B108C8 AFB90018 */ sw $t9, 0x0018($sp) -/* 0005C 80B108CC AFB80014 */ sw $t8, 0x0014($sp) -/* 00060 80B108D0 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00058 80B108C8 AFB90018 */ sw $t9, 0x0018($sp) +/* 0005C 80B108CC AFB80014 */ sw $t8, 0x0014($sp) +/* 00060 80B108D0 AFAF0010 */ sw $t7, 0x0010($sp) /* 00064 80B108D4 24E70338 */ addiu $a3, $a3, 0x0338 ## $a3 = 06000338 /* 00068 80B108D8 24C69B38 */ addiu $a2, $a2, 0x9B38 ## $a2 = 06009B38 -/* 0006C 80B108DC 8FA40034 */ lw $a0, 0x0034($sp) -/* 00070 80B108E0 0C0291BE */ jal func_800A46F8 +/* 0006C 80B108DC 8FA40034 */ lw $a0, 0x0034($sp) +/* 00070 80B108E0 0C0291BE */ jal SkelAnime_InitSV /* 00074 80B108E4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00078 80B108E8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 0007C 80B108EC 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 /* 00080 80B108F0 3C0B80B1 */ lui $t3, %hi(func_80B11310) ## $t3 = 80B10000 /* 00084 80B108F4 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 00088 80B108F8 11000003 */ beq $t0, $zero, .L80B10908 +/* 00088 80B108F8 11000003 */ beq $t0, $zero, .L80B10908 /* 0008C 80B108FC 256B1310 */ addiu $t3, $t3, %lo(func_80B11310) ## $t3 = 80B11310 /* 00090 80B10900 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 /* 00094 80B10904 A6090204 */ sh $t1, 0x0204($s0) ## 00000204 @@ -49,10 +49,10 @@ glabel EnSyatekiMan_Init /* 000AC 80B1091C AE0B0224 */ sw $t3, 0x0224($s0) ## 00000224 /* 000B0 80B10920 A60C00A8 */ sh $t4, 0x00A8($s0) ## 000000A8 /* 000B4 80B10924 AE0D01FC */ sw $t5, 0x01FC($s0) ## 000001FC -/* 000B8 80B10928 8FBF002C */ lw $ra, 0x002C($sp) -/* 000BC 80B1092C 8FB00028 */ lw $s0, 0x0028($sp) +/* 000B8 80B10928 8FBF002C */ lw $ra, 0x002C($sp) +/* 000BC 80B1092C 8FB00028 */ lw $s0, 0x0028($sp) /* 000C0 80B10930 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 000C4 80B10934 03E00008 */ jr $ra +/* 000C4 80B10934 03E00008 */ jr $ra /* 000C8 80B10938 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s index 5332f227cf..131532dee4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s @@ -1,25 +1,25 @@ glabel EnSyatekiNiw_Draw /* 01820 80B13110 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01824 80B13114 3C0E80B1 */ lui $t6, %hi(D_80B136DC) ## $t6 = 80B10000 -/* 01828 80B13118 8DCE36DC */ lw $t6, %lo(D_80B136DC)($t6) -/* 0182C 80B1311C AFBF002C */ sw $ra, 0x002C($sp) -/* 01830 80B13120 AFB10028 */ sw $s1, 0x0028($sp) -/* 01834 80B13124 AFB00024 */ sw $s0, 0x0024($sp) -/* 01838 80B13128 AFAE0030 */ sw $t6, 0x0030($sp) +/* 01828 80B13118 8DCE36DC */ lw $t6, %lo(D_80B136DC)($t6) +/* 0182C 80B1311C AFBF002C */ sw $ra, 0x002C($sp) +/* 01830 80B13120 AFB10028 */ sw $s1, 0x0028($sp) +/* 01834 80B13124 AFB00024 */ sw $s0, 0x0024($sp) +/* 01838 80B13128 AFAE0030 */ sw $t6, 0x0030($sp) /* 0183C 80B1312C 8C980250 */ lw $t8, 0x0250($a0) ## 00000250 /* 01840 80B13130 3C0F80B1 */ lui $t7, %hi(func_80B128F8) ## $t7 = 80B10000 /* 01844 80B13134 25EF28F8 */ addiu $t7, $t7, %lo(func_80B128F8) ## $t7 = 80B128F8 /* 01848 80B13138 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0184C 80B1313C 11F80019 */ beq $t7, $t8, .L80B131A4 +/* 0184C 80B1313C 11F80019 */ beq $t7, $t8, .L80B131A4 /* 01850 80B13140 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01854 80B13144 0C024F46 */ jal func_80093D18 +/* 01854 80B13144 0C024F46 */ jal func_80093D18 /* 01858 80B13148 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 0185C 80B1314C 86190260 */ lh $t9, 0x0260($s0) ## 00000260 /* 01860 80B13150 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01864 80B13154 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 01868 80B13158 13200003 */ beq $t9, $zero, .L80B13168 +/* 01868 80B13158 13200003 */ beq $t9, $zero, .L80B13168 /* 0186C 80B1315C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01870 80B13160 0C00988C */ jal func_80026230 +/* 01870 80B13160 0C00988C */ jal func_80026230 /* 01874 80B13164 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 .L80B13168: /* 01878 80B13168 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 @@ -27,21 +27,21 @@ glabel EnSyatekiNiw_Draw /* 01880 80B13170 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 01884 80B13174 3C0880B1 */ lui $t0, %hi(func_80B12FE0) ## $t0 = 80B10000 /* 01888 80B13178 25082FE0 */ addiu $t0, $t0, %lo(func_80B12FE0) ## $t0 = 80B12FE0 -/* 0188C 80B1317C AFA80010 */ sw $t0, 0x0010($sp) -/* 01890 80B13180 AFB00018 */ sw $s0, 0x0018($sp) -/* 01894 80B13184 AFA00014 */ sw $zero, 0x0014($sp) -/* 01898 80B13188 0C0286B2 */ jal func_800A1AC8 +/* 0188C 80B1317C AFA80010 */ sw $t0, 0x0010($sp) +/* 01890 80B13180 AFB00018 */ sw $s0, 0x0018($sp) +/* 01894 80B13184 AFA00014 */ sw $zero, 0x0014($sp) +/* 01898 80B13188 0C0286B2 */ jal SkelAnime_DrawSV /* 0189C 80B1318C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 018A0 80B13190 0C009982 */ jal func_80026608 +/* 018A0 80B13190 0C009982 */ jal func_80026608 /* 018A4 80B13194 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 018A8 80B13198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018AC 80B1319C 0C2C4D19 */ jal func_80B13464 +/* 018AC 80B1319C 0C2C4D19 */ jal func_80B13464 /* 018B0 80B131A0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80B131A4: -/* 018B4 80B131A4 8FBF002C */ lw $ra, 0x002C($sp) -/* 018B8 80B131A8 8FB00024 */ lw $s0, 0x0024($sp) -/* 018BC 80B131AC 8FB10028 */ lw $s1, 0x0028($sp) -/* 018C0 80B131B0 03E00008 */ jr $ra +/* 018B4 80B131A4 8FBF002C */ lw $ra, 0x002C($sp) +/* 018B8 80B131A8 8FB00024 */ lw $s0, 0x0024($sp) +/* 018BC 80B131AC 8FB10028 */ lw $s1, 0x0028($sp) +/* 018C0 80B131B0 03E00008 */ jr $ra /* 018C4 80B131B4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s index a13ba64513..36595f9ce3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s @@ -1,89 +1,89 @@ glabel EnSyatekiNiw_Init /* 00000 80B118F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 80B118F4 AFA5003C */ sw $a1, 0x003C($sp) -/* 00008 80B118F8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 80B118FC AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80B118F4 AFA5003C */ sw $a1, 0x003C($sp) +/* 00008 80B118F8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 80B118FC AFB00028 */ sw $s0, 0x0028($sp) /* 00010 80B11900 3C0580B1 */ lui $a1, %hi(D_80B1368C) ## $a1 = 80B10000 /* 00014 80B11904 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 80B11908 0C01E037 */ jal Actor_ProcessInitChain - + /* 0001C 80B1190C 24A5368C */ addiu $a1, $a1, %lo(D_80B1368C) ## $a1 = 80B1368C /* 00020 80B11910 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00024 80B11914 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00028 80B11918 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0002C 80B1191C 01C17824 */ and $t7, $t6, $at +/* 0002C 80B1191C 01C17824 */ and $t7, $t6, $at /* 00030 80B11920 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 00034 80B11924 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00038 80B11928 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0003C 80B1192C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00040 80B11930 0C00AC78 */ jal ActorShape_Init - + /* 00044 80B11934 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 /* 00048 80B11938 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0004C 80B1193C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00050 80B11940 26180190 */ addiu $t8, $s0, 0x0190 ## $t8 = 00000190 /* 00054 80B11944 261901F0 */ addiu $t9, $s0, 0x01F0 ## $t9 = 000001F0 /* 00058 80B11948 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 -/* 0005C 80B1194C AFA80018 */ sw $t0, 0x0018($sp) -/* 00060 80B11950 AFB90014 */ sw $t9, 0x0014($sp) -/* 00064 80B11954 AFB80010 */ sw $t8, 0x0010($sp) +/* 0005C 80B1194C AFA80018 */ sw $t0, 0x0018($sp) +/* 00060 80B11950 AFB90014 */ sw $t9, 0x0014($sp) +/* 00064 80B11954 AFB80010 */ sw $t8, 0x0010($sp) /* 00068 80B11958 24E700E8 */ addiu $a3, $a3, 0x00E8 ## $a3 = 060000E8 /* 0006C 80B1195C 24C62530 */ addiu $a2, $a2, 0x2530 ## $a2 = 06002530 -/* 00070 80B11960 8FA4003C */ lw $a0, 0x003C($sp) -/* 00074 80B11964 0C0291BE */ jal func_800A46F8 +/* 00070 80B11960 8FA4003C */ lw $a0, 0x003C($sp) +/* 00074 80B11964 0C0291BE */ jal SkelAnime_InitSV /* 00078 80B11968 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0007C 80B1196C 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 00080 80B11970 260502FC */ addiu $a1, $s0, 0x02FC ## $a1 = 000002FC /* 00084 80B11974 A609029E */ sh $t1, 0x029E($s0) ## 0000029E /* 00088 80B11978 860A029E */ lh $t2, 0x029E($s0) ## 0000029E -/* 0008C 80B1197C 05430003 */ bgezl $t2, .L80B1198C -/* 00090 80B11980 8FA4003C */ lw $a0, 0x003C($sp) +/* 0008C 80B1197C 05430003 */ bgezl $t2, .L80B1198C +/* 00090 80B11980 8FA4003C */ lw $a0, 0x003C($sp) /* 00094 80B11984 A600029E */ sh $zero, 0x029E($s0) ## 0000029E -/* 00098 80B11988 8FA4003C */ lw $a0, 0x003C($sp) +/* 00098 80B11988 8FA4003C */ lw $a0, 0x003C($sp) .L80B1198C: /* 0009C 80B1198C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 000A0 80B11990 AFA50030 */ sw $a1, 0x0030($sp) + +/* 000A0 80B11990 AFA50030 */ sw $a1, 0x0030($sp) /* 000A4 80B11994 3C0780B1 */ lui $a3, %hi(D_80B13660) ## $a3 = 80B10000 -/* 000A8 80B11998 8FA50030 */ lw $a1, 0x0030($sp) +/* 000A8 80B11998 8FA50030 */ lw $a1, 0x0030($sp) /* 000AC 80B1199C 24E73660 */ addiu $a3, $a3, %lo(D_80B13660) ## $a3 = 80B13660 -/* 000B0 80B119A0 8FA4003C */ lw $a0, 0x003C($sp) +/* 000B0 80B119A0 8FA4003C */ lw $a0, 0x003C($sp) /* 000B4 80B119A4 0C01712B */ jal ActorCollider_InitCylinder - + /* 000B8 80B119A8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000BC 80B119AC 860B029E */ lh $t3, 0x029E($s0) ## 0000029E /* 000C0 80B119B0 3C0480B1 */ lui $a0, %hi(D_80B13710) ## $a0 = 80B10000 -/* 000C4 80B119B4 1560000D */ bne $t3, $zero, .L80B119EC +/* 000C4 80B119B4 1560000D */ bne $t3, $zero, .L80B119EC /* 000C8 80B119B8 00000000 */ nop /* 000CC 80B119BC 3C0480B1 */ lui $a0, %hi(D_80B136E0) ## $a0 = 80B10000 /* 000D0 80B119C0 0C00084C */ jal osSyncPrintf - + /* 000D4 80B119C4 248436E0 */ addiu $a0, $a0, %lo(D_80B136E0) ## $a0 = 80B136E0 /* 000D8 80B119C8 3C0480B1 */ lui $a0, %hi(D_80B136E4) ## $a0 = 80B10000 /* 000DC 80B119CC 0C00084C */ jal osSyncPrintf - + /* 000E0 80B119D0 248436E4 */ addiu $a0, $a0, %lo(D_80B136E4) ## $a0 = 80B136E4 /* 000E4 80B119D4 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000E8 80B119D8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000EC 80B119DC 0C00B58B */ jal Actor_SetScale - + /* 000F0 80B119E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000F4 80B119E4 1000000D */ beq $zero, $zero, .L80B11A1C +/* 000F4 80B119E4 1000000D */ beq $zero, $zero, .L80B11A1C /* 000F8 80B119E8 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 .L80B119EC: /* 000FC 80B119EC 0C00084C */ jal osSyncPrintf - + /* 00100 80B119F0 24843710 */ addiu $a0, $a0, %lo(D_80B13710) ## $a0 = 00003710 /* 00104 80B119F4 3C0480B1 */ lui $a0, %hi(D_80B13714) ## $a0 = 80B10000 /* 00108 80B119F8 0C00084C */ jal osSyncPrintf - + /* 0010C 80B119FC 24843714 */ addiu $a0, $a0, %lo(D_80B13714) ## $a0 = 80B13714 /* 00110 80B11A00 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 00114 80B11A04 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00118 80B11A08 A20C00AE */ sb $t4, 0x00AE($s0) ## 000000AE /* 0011C 80B11A0C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00120 80B11A10 0C00B58B */ jal Actor_SetScale - + /* 00124 80B11A14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00128 80B11A18 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 .L80B11A1C: @@ -102,10 +102,10 @@ glabel EnSyatekiNiw_Init /* 0015C 80B11A4C 8C580008 */ lw $t8, 0x0008($v0) ## 0000002C /* 00160 80B11A50 AE190250 */ sw $t9, 0x0250($s0) ## 00000250 /* 00164 80B11A54 AE1802F0 */ sw $t8, 0x02F0($s0) ## 000002F0 -/* 00168 80B11A58 8FBF002C */ lw $ra, 0x002C($sp) -/* 0016C 80B11A5C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00168 80B11A58 8FBF002C */ lw $ra, 0x002C($sp) +/* 0016C 80B11A5C 8FB00028 */ lw $s0, 0x0028($sp) /* 00170 80B11A60 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00174 80B11A64 03E00008 */ jr $ra +/* 00174 80B11A64 03E00008 */ jr $ra /* 00178 80B11A68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s index 3110328800..90cf9c8025 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s @@ -1,20 +1,20 @@ glabel EnTa_Draw /* 03240 80B16CE0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 03244 80B16CE4 AFBF002C */ sw $ra, 0x002C($sp) -/* 03248 80B16CE8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0324C 80B16CEC AFA5005C */ sw $a1, 0x005C($sp) +/* 03244 80B16CE4 AFBF002C */ sw $ra, 0x002C($sp) +/* 03248 80B16CE8 AFB00028 */ sw $s0, 0x0028($sp) +/* 0324C 80B16CEC AFA5005C */ sw $a1, 0x005C($sp) /* 03250 80B16CF0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 03254 80B16CF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 03258 80B16CF8 3C0680B1 */ lui $a2, %hi(D_80B16F2C) ## $a2 = 80B10000 /* 0325C 80B16CFC 24C66F2C */ addiu $a2, $a2, %lo(D_80B16F2C) ## $a2 = 80B16F2C /* 03260 80B16D00 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 03264 80B16D04 2407094D */ addiu $a3, $zero, 0x094D ## $a3 = 0000094D -/* 03268 80B16D08 0C031AB1 */ jal func_800C6AC4 -/* 0326C 80B16D0C AFA5004C */ sw $a1, 0x004C($sp) -/* 03270 80B16D10 8FAF005C */ lw $t7, 0x005C($sp) -/* 03274 80B16D14 0C0250F2 */ jal func_800943C8 +/* 03268 80B16D08 0C031AB1 */ jal func_800C6AC4 +/* 0326C 80B16D0C AFA5004C */ sw $a1, 0x004C($sp) +/* 03270 80B16D10 8FAF005C */ lw $t7, 0x005C($sp) +/* 03274 80B16D14 0C0250F2 */ jal func_800943C8 /* 03278 80B16D18 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 0327C 80B16D1C 8FA8004C */ lw $t0, 0x004C($sp) +/* 0327C 80B16D1C 8FA8004C */ lw $t0, 0x004C($sp) /* 03280 80B16D20 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 03284 80B16D24 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 03288 80B16D28 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -26,37 +26,37 @@ glabel EnTa_Draw /* 032A0 80B16D40 860902B4 */ lh $t1, 0x02B4($s0) ## 000002B4 /* 032A4 80B16D44 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 032A8 80B16D48 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 032AC 80B16D4C 00095080 */ sll $t2, $t1, 2 -/* 032B0 80B16D50 008A2021 */ addu $a0, $a0, $t2 -/* 032B4 80B16D54 8C846E88 */ lw $a0, %lo(D_80B16E88)($a0) +/* 032AC 80B16D4C 00095080 */ sll $t2, $t1, 2 +/* 032B0 80B16D50 008A2021 */ addu $a0, $a0, $t2 +/* 032B4 80B16D54 8C846E88 */ lw $a0, %lo(D_80B16E88)($a0) /* 032B8 80B16D58 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF /* 032BC 80B16D5C 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 032C0 80B16D60 00046100 */ sll $t4, $a0, 4 -/* 032C4 80B16D64 000C6F02 */ srl $t5, $t4, 28 -/* 032C8 80B16D68 000D7080 */ sll $t6, $t5, 2 -/* 032CC 80B16D6C 00CE7821 */ addu $t7, $a2, $t6 +/* 032C0 80B16D60 00046100 */ sll $t4, $a0, 4 +/* 032C4 80B16D64 000C6F02 */ srl $t5, $t4, 28 +/* 032C8 80B16D68 000D7080 */ sll $t6, $t5, 2 +/* 032CC 80B16D6C 00CE7821 */ addu $t7, $a2, $t6 /* 032D0 80B16D70 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 032D4 80B16D74 00855824 */ and $t3, $a0, $a1 +/* 032D4 80B16D74 00855824 */ and $t3, $a0, $a1 /* 032D8 80B16D78 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 032DC 80B16D7C 0178C821 */ addu $t9, $t3, $t8 -/* 032E0 80B16D80 03274821 */ addu $t1, $t9, $a3 +/* 032DC 80B16D7C 0178C821 */ addu $t9, $t3, $t8 +/* 032E0 80B16D80 03274821 */ addu $t1, $t9, $a3 /* 032E4 80B16D84 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 /* 032E8 80B16D88 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 032EC 80B16D8C 24846DC0 */ addiu $a0, $a0, 0x6DC0 ## $a0 = 06006DC0 -/* 032F0 80B16D90 00046900 */ sll $t5, $a0, 4 -/* 032F4 80B16D94 000D7702 */ srl $t6, $t5, 28 +/* 032F0 80B16D90 00046900 */ sll $t5, $a0, 4 +/* 032F4 80B16D94 000D7702 */ srl $t6, $t5, 28 /* 032F8 80B16D98 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 032FC 80B16D9C 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 03300 80B16DA0 358C0024 */ ori $t4, $t4, 0x0024 ## $t4 = DB060024 -/* 03304 80B16DA4 000E7880 */ sll $t7, $t6, 2 +/* 03304 80B16DA4 000E7880 */ sll $t7, $t6, 2 /* 03308 80B16DA8 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 0330C 80B16DAC 00CF5821 */ addu $t3, $a2, $t7 +/* 0330C 80B16DAC 00CF5821 */ addu $t3, $a2, $t7 /* 03310 80B16DB0 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 /* 03314 80B16DB4 8D780000 */ lw $t8, 0x0000($t3) ## 00000000 -/* 03318 80B16DB8 0085C824 */ and $t9, $a0, $a1 +/* 03318 80B16DB8 0085C824 */ and $t9, $a0, $a1 /* 0331C 80B16DBC 3C0C80B1 */ lui $t4, %hi(func_80B16B1C) ## $t4 = 80B10000 -/* 03320 80B16DC0 03194821 */ addu $t1, $t8, $t9 -/* 03324 80B16DC4 01275021 */ addu $t2, $t1, $a3 +/* 03320 80B16DC0 03194821 */ addu $t1, $t8, $t9 +/* 03324 80B16DC4 01275021 */ addu $t2, $t1, $a3 /* 03328 80B16DC8 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 0332C 80B16DCC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 03330 80B16DD0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -64,22 +64,22 @@ glabel EnTa_Draw /* 03338 80B16DD8 3C0D80B1 */ lui $t5, %hi(func_80B16CA0) ## $t5 = 80B10000 /* 0333C 80B16DDC 25AD6CA0 */ addiu $t5, $t5, %lo(func_80B16CA0) ## $t5 = 80B16CA0 /* 03340 80B16DE0 258C6B1C */ addiu $t4, $t4, %lo(func_80B16B1C) ## $t4 = 80B16B1C -/* 03344 80B16DE4 AFAC0010 */ sw $t4, 0x0010($sp) -/* 03348 80B16DE8 AFAD0014 */ sw $t5, 0x0014($sp) -/* 0334C 80B16DEC AFB00018 */ sw $s0, 0x0018($sp) -/* 03350 80B16DF0 0C0286B2 */ jal func_800A1AC8 -/* 03354 80B16DF4 8FA4005C */ lw $a0, 0x005C($sp) -/* 03358 80B16DF8 8FAE005C */ lw $t6, 0x005C($sp) +/* 03344 80B16DE4 AFAC0010 */ sw $t4, 0x0010($sp) +/* 03348 80B16DE8 AFAD0014 */ sw $t5, 0x0014($sp) +/* 0334C 80B16DEC AFB00018 */ sw $s0, 0x0018($sp) +/* 03350 80B16DF0 0C0286B2 */ jal SkelAnime_DrawSV +/* 03354 80B16DF4 8FA4005C */ lw $a0, 0x005C($sp) +/* 03358 80B16DF8 8FAE005C */ lw $t6, 0x005C($sp) /* 0335C 80B16DFC 3C0680B1 */ lui $a2, %hi(D_80B16F3C) ## $a2 = 80B10000 /* 03360 80B16E00 24C66F3C */ addiu $a2, $a2, %lo(D_80B16F3C) ## $a2 = 80B16F3C /* 03364 80B16E04 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 03368 80B16E08 24070960 */ addiu $a3, $zero, 0x0960 ## $a3 = 00000960 -/* 0336C 80B16E0C 0C031AD5 */ jal func_800C6B54 +/* 0336C 80B16E0C 0C031AD5 */ jal func_800C6B54 /* 03370 80B16E10 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 03374 80B16E14 8FBF002C */ lw $ra, 0x002C($sp) -/* 03378 80B16E18 8FB00028 */ lw $s0, 0x0028($sp) +/* 03374 80B16E14 8FBF002C */ lw $ra, 0x002C($sp) +/* 03378 80B16E18 8FB00028 */ lw $s0, 0x0028($sp) /* 0337C 80B16E1C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 03380 80B16E20 03E00008 */ jr $ra +/* 03380 80B16E20 03E00008 */ jr $ra /* 03384 80B16E24 00000000 */ nop /* 03388 80B16E28 00000000 */ nop /* 0338C 80B16E2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s index daa3796143..9999e226a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s @@ -1,15 +1,15 @@ glabel EnTa_Init /* 000E8 80B13B88 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 000EC 80B13B8C AFB00030 */ sw $s0, 0x0030($sp) +/* 000EC 80B13B8C AFB00030 */ sw $s0, 0x0030($sp) /* 000F0 80B13B90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000F4 80B13B94 AFBF0034 */ sw $ra, 0x0034($sp) -/* 000F8 80B13B98 AFA50054 */ sw $a1, 0x0054($sp) +/* 000F4 80B13B94 AFBF0034 */ sw $ra, 0x0034($sp) +/* 000F8 80B13B98 AFA50054 */ sw $a1, 0x0054($sp) /* 000FC 80B13B9C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00100 80B13BA0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00104 80B13BA4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00108 80B13BA8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0010C 80B13BAC 0C00AC78 */ jal ActorShape_Init - + /* 00110 80B13BB0 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 00114 80B13BB4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00118 80B13BB8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -17,25 +17,25 @@ glabel EnTa_Init /* 00120 80B13BC0 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 00124 80B13BC4 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 /* 00128 80B13BC8 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 0012C 80B13BCC AFB80018 */ sw $t8, 0x0018($sp) -/* 00130 80B13BD0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00134 80B13BD4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0012C 80B13BCC AFB80018 */ sw $t8, 0x0018($sp) +/* 00130 80B13BD0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00134 80B13BD4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00138 80B13BD8 24E71C94 */ addiu $a3, $a3, 0x1C94 ## $a3 = 06001C94 /* 0013C 80B13BDC 24C6B7B8 */ addiu $a2, $a2, 0xB7B8 ## $a2 = 0600B7B8 -/* 00140 80B13BE0 AFA50038 */ sw $a1, 0x0038($sp) -/* 00144 80B13BE4 0C0291BE */ jal func_800A46F8 -/* 00148 80B13BE8 8FA40054 */ lw $a0, 0x0054($sp) +/* 00140 80B13BE0 AFA50038 */ sw $a1, 0x0038($sp) +/* 00144 80B13BE4 0C0291BE */ jal SkelAnime_InitSV +/* 00148 80B13BE8 8FA40054 */ lw $a0, 0x0054($sp) /* 0014C 80B13BEC 26050264 */ addiu $a1, $s0, 0x0264 ## $a1 = 00000264 -/* 00150 80B13BF0 AFA5003C */ sw $a1, 0x003C($sp) +/* 00150 80B13BF0 AFA5003C */ sw $a1, 0x003C($sp) /* 00154 80B13BF4 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00158 80B13BF8 8FA40054 */ lw $a0, 0x0054($sp) + +/* 00158 80B13BF8 8FA40054 */ lw $a0, 0x0054($sp) /* 0015C 80B13BFC 3C0780B1 */ lui $a3, %hi(D_80B16E50) ## $a3 = 80B10000 -/* 00160 80B13C00 8FA5003C */ lw $a1, 0x003C($sp) +/* 00160 80B13C00 8FA5003C */ lw $a1, 0x003C($sp) /* 00164 80B13C04 24E76E50 */ addiu $a3, $a3, %lo(D_80B16E50) ## $a3 = 80B16E50 -/* 00168 80B13C08 8FA40054 */ lw $a0, 0x0054($sp) +/* 00168 80B13C08 8FA40054 */ lw $a0, 0x0054($sp) /* 0016C 80B13C0C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00170 80B13C10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00174 80B13C14 3C0980B1 */ lui $t1, %hi(func_80B166CC) ## $t1 = 80B10000 /* 00178 80B13C18 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF @@ -50,7 +50,7 @@ glabel EnTa_Init /* 0019C 80B13C3C AE0902B0 */ sw $t1, 0x02B0($s0) ## 000002B0 /* 001A0 80B13C40 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 001A4 80B13C44 0C00B58B */ jal Actor_SetScale - + /* 001A8 80B13C48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001AC 80B13C4C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 001B0 80B13C50 44810000 */ mtc1 $at, $f0 ## $f0 = -4.00 @@ -62,227 +62,227 @@ glabel EnTa_Init /* 001C8 80B13C68 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F /* 001CC 80B13C6C E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 001D0 80B13C70 E6000070 */ swc1 $f0, 0x0070($s0) ## 00000070 -/* 001D4 80B13C74 10410006 */ beq $v0, $at, .L80B13C90 +/* 001D4 80B13C74 10410006 */ beq $v0, $at, .L80B13C90 /* 001D8 80B13C78 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 001DC 80B13C7C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 001E0 80B13C80 1041003B */ beq $v0, $at, .L80B13D70 +/* 001E0 80B13C80 1041003B */ beq $v0, $at, .L80B13D70 /* 001E4 80B13C84 3C0480B1 */ lui $a0, %hi(D_80B16EB8) ## $a0 = 80B10000 -/* 001E8 80B13C88 10000069 */ beq $zero, $zero, .L80B13E30 +/* 001E8 80B13C88 10000069 */ beq $zero, $zero, .L80B13E30 /* 001EC 80B13C8C 3C0480B1 */ lui $a0, %hi(D_80B16EE8) ## $a0 = 80B10000 .L80B13C90: /* 001F0 80B13C90 3C0480B1 */ lui $a0, %hi(D_80B16EA0) ## $a0 = 80B10000 /* 001F4 80B13C94 0C00084C */ jal osSyncPrintf - + /* 001F8 80B13C98 24846EA0 */ addiu $a0, $a0, %lo(D_80B16EA0) ## $a0 = 80B16EA0 /* 001FC 80B13C9C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00200 80B13CA0 9442F540 */ lhu $v0, -0x0AC0($v0) ## 8015F540 /* 00204 80B13CA4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 00208 80B13CA8 304B0800 */ andi $t3, $v0, 0x0800 ## $t3 = 00000000 -/* 0020C 80B13CAC 11600005 */ beq $t3, $zero, .L80B13CC4 +/* 0020C 80B13CAC 11600005 */ beq $t3, $zero, .L80B13CC4 /* 00210 80B13CB0 00000000 */ nop /* 00214 80B13CB4 0C00B55C */ jal Actor_Kill - + /* 00218 80B13CB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0021C 80B13CBC 1000015E */ beq $zero, $zero, .L80B14238 -/* 00220 80B13CC0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0021C 80B13CBC 1000015E */ beq $zero, $zero, .L80B14238 +/* 00220 80B13CC0 8FBF0034 */ lw $ra, 0x0034($sp) .L80B13CC4: /* 00224 80B13CC4 8D8CE664 */ lw $t4, -0x199C($t4) ## FFFFE664 /* 00228 80B13CC8 304D0400 */ andi $t5, $v0, 0x0400 ## $t5 = 00000000 -/* 0022C 80B13CCC 11800005 */ beq $t4, $zero, .L80B13CE4 +/* 0022C 80B13CCC 11800005 */ beq $t4, $zero, .L80B13CE4 /* 00230 80B13CD0 00000000 */ nop /* 00234 80B13CD4 0C00B55C */ jal Actor_Kill - + /* 00238 80B13CD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0023C 80B13CDC 10000156 */ beq $zero, $zero, .L80B14238 -/* 00240 80B13CE0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0023C 80B13CDC 10000156 */ beq $zero, $zero, .L80B14238 +/* 00240 80B13CE0 8FBF0034 */ lw $ra, 0x0034($sp) .L80B13CE4: -/* 00244 80B13CE4 11A00010 */ beq $t5, $zero, .L80B13D28 +/* 00244 80B13CE4 11A00010 */ beq $t5, $zero, .L80B13D28 /* 00248 80B13CE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0024C 80B13CEC 3C0580B1 */ lui $a1, %hi(func_80B14CAC) ## $a1 = 80B10000 /* 00250 80B13CF0 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 /* 00254 80B13CF4 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 /* 00258 80B13CF8 24A54CAC */ addiu $a1, $a1, %lo(func_80B14CAC) ## $a1 = 80B14CAC -/* 0025C 80B13CFC 0C2C4EA8 */ jal func_80B13AA0 +/* 0025C 80B13CFC 0C2C4EA8 */ jal func_80B13AA0 /* 00260 80B13D00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00264 80B13D04 A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 /* 00268 80B13D08 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0026C 80B13D0C 24A51C94 */ addiu $a1, $a1, 0x1C94 ## $a1 = 06001C94 -/* 00270 80B13D10 0C02947A */ jal func_800A51E8 -/* 00274 80B13D14 8FA40038 */ lw $a0, 0x0038($sp) +/* 00270 80B13D10 0C02947A */ jal func_800A51E8 +/* 00274 80B13D14 8FA40038 */ lw $a0, 0x0038($sp) /* 00278 80B13D18 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 /* 0027C 80B13D1C 25CE1C94 */ addiu $t6, $t6, 0x1C94 ## $t6 = 06001C94 -/* 00280 80B13D20 10000144 */ beq $zero, $zero, .L80B14234 +/* 00280 80B13D20 10000144 */ beq $zero, $zero, .L80B14234 /* 00284 80B13D24 AE0E02E4 */ sw $t6, 0x02E4($s0) ## 000002E4 .L80B13D28: /* 00288 80B13D28 3C0580B1 */ lui $a1, %hi(func_80B14754) ## $a1 = 80B10000 /* 0028C 80B13D2C 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 /* 00290 80B13D30 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 00294 80B13D34 0C2C4EA8 */ jal func_80B13AA0 +/* 00294 80B13D34 0C2C4EA8 */ jal func_80B13AA0 /* 00298 80B13D38 24A54754 */ addiu $a1, $a1, %lo(func_80B14754) ## $a1 = 80B14754 /* 0029C 80B13D3C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 002A0 80B13D40 A60F02B4 */ sh $t7, 0x02B4($s0) ## 000002B4 /* 002A4 80B13D44 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 002A8 80B13D48 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 002AC 80B13D4C 0C02947A */ jal func_800A51E8 -/* 002B0 80B13D50 8FA40038 */ lw $a0, 0x0038($sp) +/* 002AC 80B13D4C 0C02947A */ jal func_800A51E8 +/* 002B0 80B13D50 8FA40038 */ lw $a0, 0x0038($sp) /* 002B4 80B13D54 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 002B8 80B13D58 44813000 */ mtc1 $at, $f6 ## $f6 = 54.00 /* 002BC 80B13D5C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 /* 002C0 80B13D60 2718CD50 */ addiu $t8, $t8, 0xCD50 ## $t8 = 0600CD50 /* 002C4 80B13D64 AE1802E4 */ sw $t8, 0x02E4($s0) ## 000002E4 -/* 002C8 80B13D68 10000132 */ beq $zero, $zero, .L80B14234 +/* 002C8 80B13D68 10000132 */ beq $zero, $zero, .L80B14234 /* 002CC 80B13D6C E60600C4 */ swc1 $f6, 0x00C4($s0) ## 000000C4 .L80B13D70: /* 002D0 80B13D70 0C00084C */ jal osSyncPrintf - + /* 002D4 80B13D74 24846EB8 */ addiu $a0, $a0, %lo(D_80B16EB8) ## $a0 = 00006EB8 /* 002D8 80B13D78 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 002DC 80B13D7C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 002E0 80B13D80 94590EE0 */ lhu $t9, 0x0EE0($v0) ## 8015F540 /* 002E4 80B13D84 33280800 */ andi $t0, $t9, 0x0800 ## $t0 = 00000000 -/* 002E8 80B13D88 55000006 */ bnel $t0, $zero, .L80B13DA4 +/* 002E8 80B13D88 55000006 */ bnel $t0, $zero, .L80B13DA4 /* 002EC 80B13D8C 8C490004 */ lw $t1, 0x0004($v0) ## 8015E664 /* 002F0 80B13D90 0C00B55C */ jal Actor_Kill - + /* 002F4 80B13D94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002F8 80B13D98 10000127 */ beq $zero, $zero, .L80B14238 -/* 002FC 80B13D9C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 002F8 80B13D98 10000127 */ beq $zero, $zero, .L80B14238 +/* 002FC 80B13D9C 8FBF0034 */ lw $ra, 0x0034($sp) /* 00300 80B13DA0 8C490004 */ lw $t1, 0x0004($v0) ## 00000004 .L80B13DA4: -/* 00304 80B13DA4 8FAA0054 */ lw $t2, 0x0054($sp) -/* 00308 80B13DA8 51200006 */ beql $t1, $zero, .L80B13DC4 +/* 00304 80B13DA4 8FAA0054 */ lw $t2, 0x0054($sp) +/* 00308 80B13DA8 51200006 */ beql $t1, $zero, .L80B13DC4 /* 0030C 80B13DAC 854B00A4 */ lh $t3, 0x00A4($t2) ## 000000A4 /* 00310 80B13DB0 0C00B55C */ jal Actor_Kill - + /* 00314 80B13DB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00318 80B13DB8 1000011F */ beq $zero, $zero, .L80B14238 -/* 0031C 80B13DBC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00318 80B13DB8 1000011F */ beq $zero, $zero, .L80B14238 +/* 0031C 80B13DBC 8FBF0034 */ lw $ra, 0x0034($sp) /* 00320 80B13DC0 854B00A4 */ lh $t3, 0x00A4($t2) ## 000000A4 .L80B13DC4: /* 00324 80B13DC4 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 /* 00328 80B13DC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0032C 80B13DCC 1561000B */ bne $t3, $at, .L80B13DFC +/* 0032C 80B13DCC 1561000B */ bne $t3, $at, .L80B13DFC /* 00330 80B13DD0 3C0580B1 */ lui $a1, %hi(func_80B14D98) ## $a1 = 80B10000 /* 00334 80B13DD4 8C4C0010 */ lw $t4, 0x0010($v0) ## 00000010 -/* 00338 80B13DD8 11800008 */ beq $t4, $zero, .L80B13DFC +/* 00338 80B13DD8 11800008 */ beq $t4, $zero, .L80B13DFC /* 0033C 80B13DDC 00000000 */ nop /* 00340 80B13DE0 0C00B55C */ jal Actor_Kill - + /* 00344 80B13DE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00348 80B13DE8 3C0480B1 */ lui $a0, %hi(D_80B16ED0) ## $a0 = 80B10000 /* 0034C 80B13DEC 0C00084C */ jal osSyncPrintf - + /* 00350 80B13DF0 24846ED0 */ addiu $a0, $a0, %lo(D_80B16ED0) ## $a0 = 80B16ED0 -/* 00354 80B13DF4 10000110 */ beq $zero, $zero, .L80B14238 -/* 00358 80B13DF8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00354 80B13DF4 10000110 */ beq $zero, $zero, .L80B14238 +/* 00358 80B13DF8 8FBF0034 */ lw $ra, 0x0034($sp) .L80B13DFC: /* 0035C 80B13DFC 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 /* 00360 80B13E00 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 00364 80B13E04 0C2C4EA8 */ jal func_80B13AA0 +/* 00364 80B13E04 0C2C4EA8 */ jal func_80B13AA0 /* 00368 80B13E08 24A54D98 */ addiu $a1, $a1, %lo(func_80B14D98) ## $a1 = 00004D98 /* 0036C 80B13E0C A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 /* 00370 80B13E10 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00374 80B13E14 24A51C94 */ addiu $a1, $a1, 0x1C94 ## $a1 = 06001C94 -/* 00378 80B13E18 0C02947A */ jal func_800A51E8 -/* 0037C 80B13E1C 8FA40038 */ lw $a0, 0x0038($sp) +/* 00378 80B13E18 0C02947A */ jal func_800A51E8 +/* 0037C 80B13E1C 8FA40038 */ lw $a0, 0x0038($sp) /* 00380 80B13E20 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 /* 00384 80B13E24 25AD1C94 */ addiu $t5, $t5, 0x1C94 ## $t5 = 06001C94 -/* 00388 80B13E28 10000102 */ beq $zero, $zero, .L80B14234 +/* 00388 80B13E28 10000102 */ beq $zero, $zero, .L80B14234 /* 0038C 80B13E2C AE0D02E4 */ sw $t5, 0x02E4($s0) ## 000002E4 .L80B13E30: /* 00390 80B13E30 0C00084C */ jal osSyncPrintf - + /* 00394 80B13E34 24846EE8 */ addiu $a0, $a0, %lo(D_80B16EE8) ## $a0 = 00006EE8 -/* 00398 80B13E38 8FA30054 */ lw $v1, 0x0054($sp) +/* 00398 80B13E38 8FA30054 */ lw $v1, 0x0054($sp) /* 0039C 80B13E3C 2401005F */ addiu $at, $zero, 0x005F ## $at = 0000005F /* 003A0 80B13E40 846200A4 */ lh $v0, 0x00A4($v1) ## 000000A4 -/* 003A4 80B13E44 5441002E */ bnel $v0, $at, .L80B13F00 +/* 003A4 80B13E44 5441002E */ bnel $v0, $at, .L80B13F00 /* 003A8 80B13E48 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C /* 003AC 80B13E4C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 003B0 80B13E50 9442F536 */ lhu $v0, -0x0ACA($v0) ## 8015F536 /* 003B4 80B13E54 304E0010 */ andi $t6, $v0, 0x0010 ## $t6 = 00000000 -/* 003B8 80B13E58 11C00005 */ beq $t6, $zero, .L80B13E70 +/* 003B8 80B13E58 11C00005 */ beq $t6, $zero, .L80B13E70 /* 003BC 80B13E5C 304F0008 */ andi $t7, $v0, 0x0008 ## $t7 = 00000000 /* 003C0 80B13E60 0C00B55C */ jal Actor_Kill - + /* 003C4 80B13E64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003C8 80B13E68 100000F3 */ beq $zero, $zero, .L80B14238 -/* 003CC 80B13E6C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 003C8 80B13E68 100000F3 */ beq $zero, $zero, .L80B14238 +/* 003CC 80B13E6C 8FBF0034 */ lw $ra, 0x0034($sp) .L80B13E70: -/* 003D0 80B13E70 11E00010 */ beq $t7, $zero, .L80B13EB4 +/* 003D0 80B13E70 11E00010 */ beq $t7, $zero, .L80B13EB4 /* 003D4 80B13E74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 003D8 80B13E78 3C0580B1 */ lui $a1, %hi(func_80B14C18) ## $a1 = 80B10000 /* 003DC 80B13E7C 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 /* 003E0 80B13E80 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 /* 003E4 80B13E84 24A54C18 */ addiu $a1, $a1, %lo(func_80B14C18) ## $a1 = 80B14C18 -/* 003E8 80B13E88 0C2C4EA8 */ jal func_80B13AA0 +/* 003E8 80B13E88 0C2C4EA8 */ jal func_80B13AA0 /* 003EC 80B13E8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 003F0 80B13E90 A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 /* 003F4 80B13E94 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003F8 80B13E98 24A51C94 */ addiu $a1, $a1, 0x1C94 ## $a1 = 06001C94 -/* 003FC 80B13E9C 0C02947A */ jal func_800A51E8 -/* 00400 80B13EA0 8FA40038 */ lw $a0, 0x0038($sp) +/* 003FC 80B13E9C 0C02947A */ jal func_800A51E8 +/* 00400 80B13EA0 8FA40038 */ lw $a0, 0x0038($sp) /* 00404 80B13EA4 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 /* 00408 80B13EA8 27181C94 */ addiu $t8, $t8, 0x1C94 ## $t8 = 06001C94 -/* 0040C 80B13EAC 100000E1 */ beq $zero, $zero, .L80B14234 +/* 0040C 80B13EAC 100000E1 */ beq $zero, $zero, .L80B14234 /* 00410 80B13EB0 AE1802E4 */ sw $t8, 0x02E4($s0) ## 000002E4 .L80B13EB4: /* 00414 80B13EB4 3C0580B1 */ lui $a1, %hi(func_80B14634) ## $a1 = 80B10000 /* 00418 80B13EB8 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 /* 0041C 80B13EBC 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 00420 80B13EC0 0C2C4EA8 */ jal func_80B13AA0 +/* 00420 80B13EC0 0C2C4EA8 */ jal func_80B13AA0 /* 00424 80B13EC4 24A54634 */ addiu $a1, $a1, %lo(func_80B14634) ## $a1 = 80B14634 /* 00428 80B13EC8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 0042C 80B13ECC A61902B4 */ sh $t9, 0x02B4($s0) ## 000002B4 /* 00430 80B13ED0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00434 80B13ED4 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 00438 80B13ED8 0C02947A */ jal func_800A51E8 -/* 0043C 80B13EDC 8FA40038 */ lw $a0, 0x0038($sp) +/* 00438 80B13ED8 0C02947A */ jal func_800A51E8 +/* 0043C 80B13EDC 8FA40038 */ lw $a0, 0x0038($sp) /* 00440 80B13EE0 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 00444 80B13EE4 44814000 */ mtc1 $at, $f8 ## $f8 = 54.00 /* 00448 80B13EE8 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 /* 0044C 80B13EEC 2508CD50 */ addiu $t0, $t0, 0xCD50 ## $t0 = 0600CD50 /* 00450 80B13EF0 AE0802E4 */ sw $t0, 0x02E4($s0) ## 000002E4 -/* 00454 80B13EF4 100000CF */ beq $zero, $zero, .L80B14234 +/* 00454 80B13EF4 100000CF */ beq $zero, $zero, .L80B14234 /* 00458 80B13EF8 E60800C4 */ swc1 $f8, 0x00C4($s0) ## 000000C4 /* 0045C 80B13EFC 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C .L80B13F00: -/* 00460 80B13F00 144100BB */ bne $v0, $at, .L80B141F0 +/* 00460 80B13F00 144100BB */ bne $v0, $at, .L80B141F0 /* 00464 80B13F04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00468 80B13F08 3C0480B1 */ lui $a0, %hi(D_80B16F04) ## $a0 = 80B10000 /* 0046C 80B13F0C 0C00084C */ jal osSyncPrintf - + /* 00470 80B13F10 24846F04 */ addiu $a0, $a0, %lo(D_80B16F04) ## $a0 = 80B16F04 /* 00474 80B13F14 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 00478 80B13F18 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 0047C 80B13F1C 94690ED6 */ lhu $t1, 0x0ED6($v1) ## 8015F536 /* 00480 80B13F20 312A0010 */ andi $t2, $t1, 0x0010 ## $t2 = 00000000 -/* 00484 80B13F24 55400006 */ bnel $t2, $zero, .L80B13F40 +/* 00484 80B13F24 55400006 */ bnel $t2, $zero, .L80B13F40 /* 00488 80B13F28 8C6B0004 */ lw $t3, 0x0004($v1) ## 8015E664 /* 0048C 80B13F2C 0C00B55C */ jal Actor_Kill - + /* 00490 80B13F30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00494 80B13F34 100000C0 */ beq $zero, $zero, .L80B14238 -/* 00498 80B13F38 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00494 80B13F34 100000C0 */ beq $zero, $zero, .L80B14238 +/* 00498 80B13F38 8FBF0034 */ lw $ra, 0x0034($sp) /* 0049C 80B13F3C 8C6B0004 */ lw $t3, 0x0004($v1) ## 00000004 .L80B13F40: -/* 004A0 80B13F40 55600006 */ bnel $t3, $zero, .L80B13F5C +/* 004A0 80B13F40 55600006 */ bnel $t3, $zero, .L80B13F5C /* 004A4 80B13F44 8C6C0010 */ lw $t4, 0x0010($v1) ## 00000010 /* 004A8 80B13F48 0C00B55C */ jal Actor_Kill - + /* 004AC 80B13F4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004B0 80B13F50 100000B9 */ beq $zero, $zero, .L80B14238 -/* 004B4 80B13F54 8FBF0034 */ lw $ra, 0x0034($sp) +/* 004B0 80B13F50 100000B9 */ beq $zero, $zero, .L80B14238 +/* 004B4 80B13F54 8FBF0034 */ lw $ra, 0x0034($sp) /* 004B8 80B13F58 8C6C0010 */ lw $t4, 0x0010($v1) ## 00000010 .L80B13F5C: /* 004BC 80B13F5C 3C0580B1 */ lui $a1, %hi(func_80B146F8) ## $a1 = 80B10000 /* 004C0 80B13F60 24A546F8 */ addiu $a1, $a1, %lo(func_80B146F8) ## $a1 = 80B146F8 -/* 004C4 80B13F64 15800092 */ bne $t4, $zero, .L80B141B0 +/* 004C4 80B13F64 15800092 */ bne $t4, $zero, .L80B141B0 /* 004C8 80B13F68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004CC 80B13F6C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 004D0 80B13F70 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 004D4 80B13F74 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 004D8 80B13F78 8FA50054 */ lw $a1, 0x0054($sp) +/* 004D8 80B13F78 8FA50054 */ lw $a1, 0x0054($sp) /* 004DC 80B13F7C 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 /* 004E0 80B13F80 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 004E4 80B13F84 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 @@ -290,26 +290,26 @@ glabel EnTa_Init /* 004EC 80B13F8C 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 /* 004F0 80B13F90 860202C8 */ lh $v0, 0x02C8($s0) ## 000002C8 /* 004F4 80B13F94 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 004F8 80B13F98 46062200 */ add.s $f8, $f4, $f6 +/* 004F8 80B13F98 46062200 */ add.s $f8, $f4, $f6 /* 004FC 80B13F9C 35AE0010 */ ori $t6, $t5, 0x0010 ## $t6 = 00000010 /* 00500 80B13FA0 AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 -/* 00504 80B13FA4 46105480 */ add.s $f18, $f10, $f16 +/* 00504 80B13FA4 46105480 */ add.s $f18, $f10, $f16 /* 00508 80B13FA8 A60202C6 */ sh $v0, 0x02C6($s0) ## 000002C6 /* 0050C 80B13FAC A60202C4 */ sh $v0, 0x02C4($s0) ## 000002C4 -/* 00510 80B13FB0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00510 80B13FB0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00514 80B13FB4 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 /* 00518 80B13FB8 44818000 */ mtc1 $at, $f16 ## $f16 = 26.00 /* 0051C 80B13FBC C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00520 80B13FC0 44079000 */ mfc1 $a3, $f18 +/* 00520 80B13FC0 44079000 */ mfc1 $a3, $f18 /* 00524 80B13FC4 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 00528 80B13FC8 46105480 */ add.s $f18, $f10, $f16 +/* 00528 80B13FC8 46105480 */ add.s $f18, $f10, $f16 /* 0052C 80B13FCC 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 80B1631C -/* 00530 80B13FD0 AFA4003C */ sw $a0, 0x003C($sp) -/* 00534 80B13FD4 AFB80024 */ sw $t8, 0x0024($sp) -/* 00538 80B13FD8 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 0053C 80B13FDC AFA00020 */ sw $zero, 0x0020($sp) -/* 00540 80B13FE0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00544 80B13FE4 AFA00018 */ sw $zero, 0x0018($sp) +/* 00530 80B13FD0 AFA4003C */ sw $a0, 0x003C($sp) +/* 00534 80B13FD4 AFB80024 */ sw $t8, 0x0024($sp) +/* 00538 80B13FD8 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 0053C 80B13FDC AFA00020 */ sw $zero, 0x0020($sp) +/* 00540 80B13FE0 AFA0001C */ sw $zero, 0x001C($sp) +/* 00544 80B13FE4 AFA00018 */ sw $zero, 0x0018($sp) /* 00548 80B13FE8 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn /* 0054C 80B13FEC 24060019 */ addiu $a2, $zero, 0x0019 ## $a2 = 00000019 @@ -319,23 +319,23 @@ glabel EnTa_Init /* 0055C 80B13FFC 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 /* 00560 80B14000 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 00564 80B14004 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00568 80B14008 8FA50054 */ lw $a1, 0x0054($sp) -/* 0056C 80B1400C 46105480 */ add.s $f18, $f10, $f16 +/* 00568 80B14008 8FA50054 */ lw $a1, 0x0054($sp) +/* 0056C 80B1400C 46105480 */ add.s $f18, $f10, $f16 /* 00570 80B14010 AE0202B8 */ sw $v0, 0x02B8($s0) ## 000002B8 /* 00574 80B14014 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00578 80B14018 46062201 */ sub.s $f8, $f4, $f6 -/* 0057C 80B1401C E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00578 80B14018 46062201 */ sub.s $f8, $f4, $f6 +/* 0057C 80B1401C E7B20010 */ swc1 $f18, 0x0010($sp) /* 00580 80B14020 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 00584 80B14024 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 00588 80B14028 44074000 */ mfc1 $a3, $f8 +/* 00588 80B14028 44074000 */ mfc1 $a3, $f8 /* 0058C 80B1402C 2419000D */ addiu $t9, $zero, 0x000D ## $t9 = 0000000D -/* 00590 80B14030 46062201 */ sub.s $f8, $f4, $f6 -/* 00594 80B14034 AFB90024 */ sw $t9, 0x0024($sp) -/* 00598 80B14038 AFA00020 */ sw $zero, 0x0020($sp) -/* 0059C 80B1403C AFA0001C */ sw $zero, 0x001C($sp) -/* 005A0 80B14040 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 005A4 80B14044 AFA00018 */ sw $zero, 0x0018($sp) -/* 005A8 80B14048 8FA4003C */ lw $a0, 0x003C($sp) +/* 00590 80B14030 46062201 */ sub.s $f8, $f4, $f6 +/* 00594 80B14034 AFB90024 */ sw $t9, 0x0024($sp) +/* 00598 80B14038 AFA00020 */ sw $zero, 0x0020($sp) +/* 0059C 80B1403C AFA0001C */ sw $zero, 0x001C($sp) +/* 005A0 80B14040 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 005A4 80B14044 AFA00018 */ sw $zero, 0x0018($sp) +/* 005A8 80B14048 8FA4003C */ lw $a0, 0x003C($sp) /* 005AC 80B1404C 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn /* 005B0 80B14050 24060019 */ addiu $a2, $zero, 0x0019 ## $a2 = 00000019 @@ -345,121 +345,121 @@ glabel EnTa_Init /* 005C0 80B14060 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 /* 005C4 80B14064 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 005C8 80B14068 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 005CC 80B1406C 8FA50054 */ lw $a1, 0x0054($sp) -/* 005D0 80B14070 46062200 */ add.s $f8, $f4, $f6 +/* 005CC 80B1406C 8FA50054 */ lw $a1, 0x0054($sp) +/* 005D0 80B14070 46062200 */ add.s $f8, $f4, $f6 /* 005D4 80B14074 AE0202BC */ sw $v0, 0x02BC($s0) ## 000002BC /* 005D8 80B14078 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 005DC 80B1407C 46105480 */ add.s $f18, $f10, $f16 -/* 005E0 80B14080 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 005DC 80B1407C 46105480 */ add.s $f18, $f10, $f16 +/* 005E0 80B14080 E7A80010 */ swc1 $f8, 0x0010($sp) /* 005E4 80B14084 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 005E8 80B14088 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 -/* 005EC 80B1408C 44079000 */ mfc1 $a3, $f18 +/* 005EC 80B1408C 44079000 */ mfc1 $a3, $f18 /* 005F0 80B14090 2408000D */ addiu $t0, $zero, 0x000D ## $t0 = 0000000D -/* 005F4 80B14094 46105481 */ sub.s $f18, $f10, $f16 -/* 005F8 80B14098 AFA80024 */ sw $t0, 0x0024($sp) -/* 005FC 80B1409C AFA00020 */ sw $zero, 0x0020($sp) -/* 00600 80B140A0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00604 80B140A4 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 00608 80B140A8 AFA00018 */ sw $zero, 0x0018($sp) -/* 0060C 80B140AC 8FA4003C */ lw $a0, 0x003C($sp) +/* 005F4 80B14094 46105481 */ sub.s $f18, $f10, $f16 +/* 005F8 80B14098 AFA80024 */ sw $t0, 0x0024($sp) +/* 005FC 80B1409C AFA00020 */ sw $zero, 0x0020($sp) +/* 00600 80B140A0 AFA0001C */ sw $zero, 0x001C($sp) +/* 00604 80B140A4 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 00608 80B140A8 AFA00018 */ sw $zero, 0x0018($sp) +/* 0060C 80B140AC 8FA4003C */ lw $a0, 0x003C($sp) /* 00610 80B140B0 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn /* 00614 80B140B4 24060019 */ addiu $a2, $zero, 0x0019 ## $a2 = 00000019 /* 00618 80B140B8 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 0061C 80B140BC 8FA50054 */ lw $a1, 0x0054($sp) -/* 00620 80B140C0 0C2C4EAB */ jal func_80B13AAC +/* 0061C 80B140BC 8FA50054 */ lw $a1, 0x0054($sp) +/* 00620 80B140C0 0C2C4EAB */ jal func_80B13AAC /* 00624 80B140C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00628 80B140C8 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 0062C 80B140CC 9529FA5A */ lhu $t1, -0x05A6($t1) ## 8015FA5A /* 00630 80B140D0 3C0580B1 */ lui $a1, %hi(func_80B16608) ## $a1 = 80B10000 /* 00634 80B140D4 24A56608 */ addiu $a1, $a1, %lo(func_80B16608) ## $a1 = 80B16608 /* 00638 80B140D8 312A0400 */ andi $t2, $t1, 0x0400 ## $t2 = 00000000 -/* 0063C 80B140DC 11400025 */ beq $t2, $zero, .L80B14174 +/* 0063C 80B140DC 11400025 */ beq $t2, $zero, .L80B14174 /* 00640 80B140E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00644 80B140E4 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 00648 80B140E8 0C2C4EA8 */ jal func_80B13AA0 +/* 00648 80B140E8 0C2C4EA8 */ jal func_80B13AA0 /* 0064C 80B140EC 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 /* 00650 80B140F0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00654 80B140F4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00658 80B140F8 2484C48C */ addiu $a0, $a0, 0xC48C ## $a0 = 0600C48C /* 0065C 80B140FC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00660 80B14100 2484C48C */ addiu $a0, $a0, 0xC48C ## $a0 = 0600C48C /* 00664 80B14104 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00668 80B14108 A7A20040 */ sh $v0, 0x0040($sp) -/* 0066C 80B1410C 87AB0040 */ lh $t3, 0x0040($sp) + +/* 00668 80B14108 A7A20040 */ sh $v0, 0x0040($sp) +/* 0066C 80B1410C 87AB0040 */ lh $t3, 0x0040($sp) /* 00670 80B14110 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00674 80B14114 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 00678 80B14118 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 /* 0067C 80B1411C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00680 80B14120 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00684 80B14124 468021A0 */ cvt.s.w $f6, $f4 +/* 00684 80B14124 468021A0 */ cvt.s.w $f6, $f4 /* 00688 80B14128 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0068C 80B1412C 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 00690 80B14130 44060000 */ mfc1 $a2, $f0 -/* 00694 80B14134 AFAC0014 */ sw $t4, 0x0014($sp) -/* 00698 80B14138 46805420 */ cvt.s.w $f16, $f10 +/* 00690 80B14130 44060000 */ mfc1 $a2, $f0 +/* 00694 80B14134 AFAC0014 */ sw $t4, 0x0014($sp) +/* 00698 80B14138 46805420 */ cvt.s.w $f16, $f10 /* 0069C 80B1413C 24A5C48C */ addiu $a1, $a1, 0xC48C ## $a1 = 0600C48C -/* 006A0 80B14140 8FA40038 */ lw $a0, 0x0038($sp) -/* 006A4 80B14144 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 006A8 80B14148 46003201 */ sub.s $f8, $f6, $f0 -/* 006AC 80B1414C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 006B0 80B14150 44074000 */ mfc1 $a3, $f8 +/* 006A0 80B14140 8FA40038 */ lw $a0, 0x0038($sp) +/* 006A4 80B14144 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 006A8 80B14148 46003201 */ sub.s $f8, $f6, $f0 +/* 006AC 80B1414C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 006B0 80B14150 44074000 */ mfc1 $a3, $f8 /* 006B4 80B14154 0C029468 */ jal SkelAnime_ChangeAnimation - + /* 006B8 80B14158 00000000 */ nop /* 006BC 80B1415C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 006C0 80B14160 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 006C4 80B14164 944D13FA */ lhu $t5, 0x13FA($v0) ## 8015FA5A /* 006C8 80B14168 31AEFBFF */ andi $t6, $t5, 0xFBFF ## $t6 = 00000000 -/* 006CC 80B1416C 10000031 */ beq $zero, $zero, .L80B14234 +/* 006CC 80B1416C 10000031 */ beq $zero, $zero, .L80B14234 /* 006D0 80B14170 A44E13FA */ sh $t6, 0x13FA($v0) ## 8015FA5A .L80B14174: /* 006D4 80B14174 3C0580B1 */ lui $a1, %hi(func_80B16504) ## $a1 = 80B10000 /* 006D8 80B14178 3C0680B1 */ lui $a2, %hi(func_80B16854) ## $a2 = 80B10000 /* 006DC 80B1417C 24C66854 */ addiu $a2, $a2, %lo(func_80B16854) ## $a2 = 80B16854 /* 006E0 80B14180 24A56504 */ addiu $a1, $a1, %lo(func_80B16504) ## $a1 = 80B16504 -/* 006E4 80B14184 0C2C4EA8 */ jal func_80B13AA0 +/* 006E4 80B14184 0C2C4EA8 */ jal func_80B13AA0 /* 006E8 80B14188 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006EC 80B1418C A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 /* 006F0 80B14190 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006F4 80B14194 24A517E8 */ addiu $a1, $a1, 0x17E8 ## $a1 = 060017E8 -/* 006F8 80B14198 0C02947A */ jal func_800A51E8 -/* 006FC 80B1419C 8FA40038 */ lw $a0, 0x0038($sp) +/* 006F8 80B14198 0C02947A */ jal func_800A51E8 +/* 006FC 80B1419C 8FA40038 */ lw $a0, 0x0038($sp) /* 00700 80B141A0 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 /* 00704 80B141A4 25EF17E8 */ addiu $t7, $t7, 0x17E8 ## $t7 = 060017E8 -/* 00708 80B141A8 10000022 */ beq $zero, $zero, .L80B14234 +/* 00708 80B141A8 10000022 */ beq $zero, $zero, .L80B14234 /* 0070C 80B141AC AE0F02E4 */ sw $t7, 0x02E4($s0) ## 000002E4 .L80B141B0: /* 00710 80B141B0 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 -/* 00714 80B141B4 0C2C4EA8 */ jal func_80B13AA0 +/* 00714 80B141B4 0C2C4EA8 */ jal func_80B13AA0 /* 00718 80B141B8 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC /* 0071C 80B141BC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 00720 80B141C0 A61802B4 */ sh $t8, 0x02B4($s0) ## 000002B4 /* 00724 80B141C4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00728 80B141C8 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 0072C 80B141CC 0C02947A */ jal func_800A51E8 -/* 00730 80B141D0 8FA40038 */ lw $a0, 0x0038($sp) +/* 0072C 80B141CC 0C02947A */ jal func_800A51E8 +/* 00730 80B141D0 8FA40038 */ lw $a0, 0x0038($sp) /* 00734 80B141D4 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 00738 80B141D8 44812000 */ mtc1 $at, $f4 ## $f4 = 54.00 /* 0073C 80B141DC 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 /* 00740 80B141E0 2739CD50 */ addiu $t9, $t9, 0xCD50 ## $t9 = 0600CD50 /* 00744 80B141E4 AE1902E4 */ sw $t9, 0x02E4($s0) ## 000002E4 -/* 00748 80B141E8 10000012 */ beq $zero, $zero, .L80B14234 +/* 00748 80B141E8 10000012 */ beq $zero, $zero, .L80B14234 /* 0074C 80B141EC E60400C4 */ swc1 $f4, 0x00C4($s0) ## 000000C4 .L80B141F0: /* 00750 80B141F0 3C0580B1 */ lui $a1, %hi(func_80B14634) ## $a1 = 80B10000 /* 00754 80B141F4 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 /* 00758 80B141F8 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 0075C 80B141FC 0C2C4EA8 */ jal func_80B13AA0 +/* 0075C 80B141FC 0C2C4EA8 */ jal func_80B13AA0 /* 00760 80B14200 24A54634 */ addiu $a1, $a1, %lo(func_80B14634) ## $a1 = 80B14634 /* 00764 80B14204 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 00768 80B14208 A60802B4 */ sh $t0, 0x02B4($s0) ## 000002B4 /* 0076C 80B1420C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00770 80B14210 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 00774 80B14214 0C02947A */ jal func_800A51E8 -/* 00778 80B14218 8FA40038 */ lw $a0, 0x0038($sp) +/* 00774 80B14214 0C02947A */ jal func_800A51E8 +/* 00778 80B14218 8FA40038 */ lw $a0, 0x0038($sp) /* 0077C 80B1421C 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 00780 80B14220 44813000 */ mtc1 $at, $f6 ## $f6 = 54.00 /* 00784 80B14224 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 @@ -467,11 +467,11 @@ glabel EnTa_Init /* 0078C 80B1422C AE0902E4 */ sw $t1, 0x02E4($s0) ## 000002E4 /* 00790 80B14230 E60600C4 */ swc1 $f6, 0x00C4($s0) ## 000000C4 .L80B14234: -/* 00794 80B14234 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00794 80B14234 8FBF0034 */ lw $ra, 0x0034($sp) .L80B14238: -/* 00798 80B14238 8FB00030 */ lw $s0, 0x0030($sp) +/* 00798 80B14238 8FB00030 */ lw $s0, 0x0030($sp) /* 0079C 80B1423C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 007A0 80B14240 03E00008 */ jr $ra +/* 007A0 80B14240 03E00008 */ jr $ra /* 007A4 80B14244 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s index 92781e9120..1689009bba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s @@ -1,20 +1,20 @@ glabel EnTakaraMan_Draw /* 00750 80B17CB0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00754 80B17CB4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00758 80B17CB8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0075C 80B17CBC AFA50054 */ sw $a1, 0x0054($sp) +/* 00754 80B17CB4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00758 80B17CB8 AFB00028 */ sw $s0, 0x0028($sp) +/* 0075C 80B17CBC AFA50054 */ sw $a1, 0x0054($sp) /* 00760 80B17CC0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00764 80B17CC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00768 80B17CC8 3C0680B1 */ lui $a2, %hi(D_80B17E40) ## $a2 = 80B10000 /* 0076C 80B17CCC 24C67E40 */ addiu $a2, $a2, %lo(D_80B17E40) ## $a2 = 80B17E40 /* 00770 80B17CD0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00774 80B17CD4 24070210 */ addiu $a3, $zero, 0x0210 ## $a3 = 00000210 -/* 00778 80B17CD8 0C031AB1 */ jal func_800C6AC4 -/* 0077C 80B17CDC AFA50048 */ sw $a1, 0x0048($sp) -/* 00780 80B17CE0 8FAF0054 */ lw $t7, 0x0054($sp) -/* 00784 80B17CE4 0C024F46 */ jal func_80093D18 +/* 00778 80B17CD8 0C031AB1 */ jal func_800C6AC4 +/* 0077C 80B17CDC AFA50048 */ sw $a1, 0x0048($sp) +/* 00780 80B17CE0 8FAF0054 */ lw $t7, 0x0054($sp) +/* 00784 80B17CE4 0C024F46 */ jal func_80093D18 /* 00788 80B17CE8 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 0078C 80B17CEC 8FA50048 */ lw $a1, 0x0048($sp) +/* 0078C 80B17CEC 8FA50048 */ lw $a1, 0x0048($sp) /* 00790 80B17CF0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00794 80B17CF4 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00798 80B17CF8 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,40 +26,40 @@ glabel EnTakaraMan_Draw /* 007B0 80B17D10 8608020E */ lh $t0, 0x020E($s0) ## 0000020E /* 007B4 80B17D14 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 007B8 80B17D18 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 007BC 80B17D1C 00084880 */ sll $t1, $t0, 2 -/* 007C0 80B17D20 00892021 */ addu $a0, $a0, $t1 -/* 007C4 80B17D24 8C847DD4 */ lw $a0, %lo(D_80B17DD4)($a0) +/* 007BC 80B17D1C 00084880 */ sll $t1, $t0, 2 +/* 007C0 80B17D20 00892021 */ addu $a0, $a0, $t1 +/* 007C4 80B17D24 8C847DD4 */ lw $a0, %lo(D_80B17DD4)($a0) /* 007C8 80B17D28 3C1980B1 */ lui $t9, %hi(func_80B17C4C) ## $t9 = 80B10000 /* 007CC 80B17D2C 27397C4C */ addiu $t9, $t9, %lo(func_80B17C4C) ## $t9 = 80B17C4C -/* 007D0 80B17D30 00045900 */ sll $t3, $a0, 4 -/* 007D4 80B17D34 000B6702 */ srl $t4, $t3, 28 -/* 007D8 80B17D38 000C6880 */ sll $t5, $t4, 2 -/* 007DC 80B17D3C 01CD7021 */ addu $t6, $t6, $t5 +/* 007D0 80B17D30 00045900 */ sll $t3, $a0, 4 +/* 007D4 80B17D34 000B6702 */ srl $t4, $t3, 28 +/* 007D8 80B17D38 000C6880 */ sll $t5, $t4, 2 +/* 007DC 80B17D3C 01CD7021 */ addu $t6, $t6, $t5 /* 007E0 80B17D40 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 007E4 80B17D44 00815024 */ and $t2, $a0, $at +/* 007E4 80B17D44 00815024 */ and $t2, $a0, $at /* 007E8 80B17D48 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 007EC 80B17D4C 014E7821 */ addu $t7, $t2, $t6 -/* 007F0 80B17D50 01E1C021 */ addu $t8, $t7, $at +/* 007EC 80B17D4C 014E7821 */ addu $t7, $t2, $t6 +/* 007F0 80B17D50 01E1C021 */ addu $t8, $t7, $at /* 007F4 80B17D54 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 007F8 80B17D58 92070152 */ lbu $a3, 0x0152($s0) ## 00000152 /* 007FC 80B17D5C 8E060170 */ lw $a2, 0x0170($s0) ## 00000170 /* 00800 80B17D60 8E050154 */ lw $a1, 0x0154($s0) ## 00000154 -/* 00804 80B17D64 AFB00018 */ sw $s0, 0x0018($sp) -/* 00808 80B17D68 AFA00014 */ sw $zero, 0x0014($sp) -/* 0080C 80B17D6C AFB90010 */ sw $t9, 0x0010($sp) -/* 00810 80B17D70 0C0286B2 */ jal func_800A1AC8 -/* 00814 80B17D74 8FA40054 */ lw $a0, 0x0054($sp) -/* 00818 80B17D78 8FA80054 */ lw $t0, 0x0054($sp) +/* 00804 80B17D64 AFB00018 */ sw $s0, 0x0018($sp) +/* 00808 80B17D68 AFA00014 */ sw $zero, 0x0014($sp) +/* 0080C 80B17D6C AFB90010 */ sw $t9, 0x0010($sp) +/* 00810 80B17D70 0C0286B2 */ jal SkelAnime_DrawSV +/* 00814 80B17D74 8FA40054 */ lw $a0, 0x0054($sp) +/* 00818 80B17D78 8FA80054 */ lw $t0, 0x0054($sp) /* 0081C 80B17D7C 3C0680B1 */ lui $a2, %hi(D_80B17E58) ## $a2 = 80B10000 /* 00820 80B17D80 24C67E58 */ addiu $a2, $a2, %lo(D_80B17E58) ## $a2 = 80B17E58 /* 00824 80B17D84 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00828 80B17D88 24070220 */ addiu $a3, $zero, 0x0220 ## $a3 = 00000220 -/* 0082C 80B17D8C 0C031AD5 */ jal func_800C6B54 +/* 0082C 80B17D8C 0C031AD5 */ jal func_800C6B54 /* 00830 80B17D90 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 00834 80B17D94 8FBF002C */ lw $ra, 0x002C($sp) -/* 00838 80B17D98 8FB00028 */ lw $s0, 0x0028($sp) +/* 00834 80B17D94 8FBF002C */ lw $ra, 0x002C($sp) +/* 00838 80B17D98 8FB00028 */ lw $s0, 0x0028($sp) /* 0083C 80B17D9C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00840 80B17DA0 03E00008 */ jr $ra +/* 00840 80B17DA0 03E00008 */ jr $ra /* 00844 80B17DA4 00000000 */ nop /* 00848 80B17DA8 00000000 */ nop /* 0084C 80B17DAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s index a822bd5151..87e98a82b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s @@ -3,52 +3,52 @@ glabel EnTakaraMan_Init /* 00010 80B17570 24427DD0 */ addiu $v0, $v0, %lo(D_80B17DD0) ## $v0 = 80B17DD0 /* 00014 80B17574 904E0000 */ lbu $t6, 0x0000($v0) ## 80B17DD0 /* 00018 80B17578 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0001C 80B1757C AFB00028 */ sw $s0, 0x0028($sp) +/* 0001C 80B1757C AFB00028 */ sw $s0, 0x0028($sp) /* 00020 80B17580 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00024 80B17584 AFBF002C */ sw $ra, 0x002C($sp) -/* 00028 80B17588 11C00008 */ beq $t6, $zero, .L80B175AC -/* 0002C 80B1758C AFA50034 */ sw $a1, 0x0034($sp) +/* 00024 80B17584 AFBF002C */ sw $ra, 0x002C($sp) +/* 00028 80B17588 11C00008 */ beq $t6, $zero, .L80B175AC +/* 0002C 80B1758C AFA50034 */ sw $a1, 0x0034($sp) /* 00030 80B17590 0C00B55C */ jal Actor_Kill - + /* 00034 80B17594 00000000 */ nop /* 00038 80B17598 3C0480B1 */ lui $a0, %hi(D_80B17DE0) ## $a0 = 80B10000 /* 0003C 80B1759C 0C00084C */ jal osSyncPrintf - + /* 00040 80B175A0 24847DE0 */ addiu $a0, $a0, %lo(D_80B17DE0) ## $a0 = 80B17DE0 -/* 00044 80B175A4 1000004A */ beq $zero, $zero, .L80B176D0 -/* 00048 80B175A8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00044 80B175A4 1000004A */ beq $zero, $zero, .L80B176D0 +/* 00048 80B175A8 8FBF002C */ lw $ra, 0x002C($sp) .L80B175AC: /* 0004C 80B175AC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00050 80B175B0 3C0480B1 */ lui $a0, %hi(D_80B17E10) ## $a0 = 80B10000 /* 00054 80B175B4 A04F0000 */ sb $t7, 0x0000($v0) ## 00000000 /* 00058 80B175B8 0C00084C */ jal osSyncPrintf - + /* 0005C 80B175BC 24847E10 */ addiu $a0, $a0, %lo(D_80B17E10) ## $a0 = 80B17E10 -/* 00060 80B175C0 8FB80034 */ lw $t8, 0x0034($sp) +/* 00060 80B175C0 8FB80034 */ lw $t8, 0x0034($sp) /* 00064 80B175C4 3C0480B1 */ lui $a0, %hi(D_80B17E14) ## $a0 = 80B10000 /* 00068 80B175C8 24847E14 */ addiu $a0, $a0, %lo(D_80B17E14) ## $a0 = 80B17E14 /* 0006C 80B175CC 0C00084C */ jal osSyncPrintf - + /* 00070 80B175D0 8F051D38 */ lw $a1, 0x1D38($t8) ## 00001D38 -/* 00074 80B175D4 8FA40034 */ lw $a0, 0x0034($sp) +/* 00074 80B175D4 8FA40034 */ lw $a0, 0x0034($sp) /* 00078 80B175D8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 0007C 80B175DC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 00080 80B175E0 AC801D38 */ sw $zero, 0x1D38($a0) ## 00001D38 /* 00084 80B175E4 94481402 */ lhu $t0, 0x1402($v0) ## 8015FA62 /* 00088 80B175E8 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF /* 0008C 80B175EC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00090 80B175F0 00484821 */ addu $t1, $v0, $t0 +/* 00090 80B175F0 00484821 */ addu $t1, $v0, $t0 /* 00094 80B175F4 A13900BC */ sb $t9, 0x00BC($t1) ## 000000BC /* 00098 80B175F8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0009C 80B175FC 260A0194 */ addiu $t2, $s0, 0x0194 ## $t2 = 00000194 /* 000A0 80B17600 260B01D0 */ addiu $t3, $s0, 0x01D0 ## $t3 = 000001D0 /* 000A4 80B17604 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 000A8 80B17608 AFAC0018 */ sw $t4, 0x0018($sp) -/* 000AC 80B1760C AFAB0014 */ sw $t3, 0x0014($sp) -/* 000B0 80B17610 AFAA0010 */ sw $t2, 0x0010($sp) +/* 000A8 80B17608 AFAC0018 */ sw $t4, 0x0018($sp) +/* 000AC 80B1760C AFAB0014 */ sw $t3, 0x0014($sp) +/* 000B0 80B17610 AFAA0010 */ sw $t2, 0x0010($sp) /* 000B4 80B17614 24E70498 */ addiu $a3, $a3, 0x0498 ## $a3 = 06000498 /* 000B8 80B17618 24C64FE0 */ addiu $a2, $a2, 0x4FE0 ## $a2 = 06004FE0 -/* 000BC 80B1761C 0C0291BE */ jal func_800A46F8 +/* 000BC 80B1761C 0C0291BE */ jal SkelAnime_InitSV /* 000C0 80B17620 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 000C4 80B17624 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 /* 000C8 80B17628 8C4E0000 */ lw $t6, 0x0000($v0) ## 00000024 @@ -75,7 +75,7 @@ glabel EnTakaraMan_Init /* 0011C 80B1767C E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 00120 80B17680 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C /* 00124 80B17684 0C00B58B */ jal Actor_SetScale - + /* 00128 80B17688 AE180228 */ sw $t8, 0x0228($s0) ## 00000228 /* 0012C 80B1768C 2409B1E0 */ addiu $t1, $zero, 0xB1E0 ## $t1 = FFFFB1E0 /* 00130 80B17690 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 @@ -93,11 +93,11 @@ glabel EnTakaraMan_Init /* 00160 80B176C0 E60A021C */ swc1 $f10, 0x021C($s0) ## 0000021C /* 00164 80B176C4 A6080216 */ sh $t0, 0x0216($s0) ## 00000216 /* 00168 80B176C8 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 -/* 0016C 80B176CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 0016C 80B176CC 8FBF002C */ lw $ra, 0x002C($sp) .L80B176D0: -/* 00170 80B176D0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00170 80B176D0 8FB00028 */ lw $s0, 0x0028($sp) /* 00174 80B176D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00178 80B176D8 03E00008 */ jr $ra +/* 00178 80B176D8 03E00008 */ jr $ra /* 0017C 80B176DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s index be2709ac88..4d4f685f4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s @@ -1,33 +1,33 @@ glabel func_8085FDD0 /* 00780 8085FDD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00784 8085FDD4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00784 8085FDD4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00788 8085FDD8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0078C 8085FDDC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00790 8085FDE0 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C -/* 00794 8085FDE4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00798 8085FDE8 0C0294BE */ jal func_800A52F8 +/* 00794 8085FDE4 AFA60018 */ sw $a2, 0x0018($sp) +/* 00798 8085FDE8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 0079C 8085FDEC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 007A0 8085FDF0 8FA40018 */ lw $a0, 0x0018($sp) +/* 007A0 8085FDF0 8FA40018 */ lw $a0, 0x0018($sp) /* 007A4 8085FDF4 3C014060 */ lui $at, 0x4060 ## $at = 40600000 /* 007A8 8085FDF8 44814000 */ mtc1 $at, $f8 ## $f8 = 3.50 /* 007AC 8085FDFC C486000C */ lwc1 $f6, 0x000C($a0) ## 0000000C /* 007B0 8085FE00 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 /* 007B4 8085FE04 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 007B8 8085FE08 46083281 */ sub.s $f10, $f6, $f8 +/* 007B8 8085FE08 46083281 */ sub.s $f10, $f6, $f8 /* 007BC 8085FE0C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 007C0 8085FE10 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F /* 007C4 8085FE14 3C058086 */ lui $a1, %hi(func_8085FE48) ## $a1 = 80860000 -/* 007C8 8085FE18 01E1C024 */ and $t8, $t7, $at +/* 007C8 8085FE18 01E1C024 */ and $t8, $t7, $at /* 007CC 8085FE1C 24A5FE48 */ addiu $a1, $a1, %lo(func_8085FE48) ## $a1 = 8085FE48 /* 007D0 8085FE20 A08007C8 */ sb $zero, 0x07C8($a0) ## 000007C8 /* 007D4 8085FE24 AC8E07E8 */ sw $t6, 0x07E8($a0) ## 000007E8 /* 007D8 8085FE28 E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 /* 007DC 8085FE2C AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 007E0 8085FE30 0C217D94 */ jal func_8085F650 +/* 007E0 8085FE30 0C217D94 */ jal func_8085F650 /* 007E4 8085FE34 E4840054 */ swc1 $f4, 0x0054($a0) ## 00000054 -/* 007E8 8085FE38 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007E8 8085FE38 8FBF0014 */ lw $ra, 0x0014($sp) /* 007EC 8085FE3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F0 8085FE40 03E00008 */ jr $ra +/* 007F0 8085FE40 03E00008 */ jr $ra /* 007F4 8085FE44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s index 1355327f9b..c62561092d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s @@ -1,33 +1,33 @@ glabel func_8085FF28 /* 008D8 8085FF28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008DC 8085FF2C AFBF0014 */ sw $ra, 0x0014($sp) +/* 008DC 8085FF2C AFBF0014 */ sw $ra, 0x0014($sp) /* 008E0 8085FF30 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 008E4 8085FF34 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008E8 8085FF38 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C -/* 008EC 8085FF3C AFA60018 */ sw $a2, 0x0018($sp) -/* 008F0 8085FF40 0C0294BE */ jal func_800A52F8 +/* 008EC 8085FF3C AFA60018 */ sw $a2, 0x0018($sp) +/* 008F0 8085FF40 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 008F4 8085FF44 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 008F8 8085FF48 8FA40018 */ lw $a0, 0x0018($sp) +/* 008F8 8085FF48 8FA40018 */ lw $a0, 0x0018($sp) /* 008FC 8085FF4C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00900 8085FF50 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 /* 00904 8085FF54 C484000C */ lwc1 $f4, 0x000C($a0) ## 0000000C /* 00908 8085FF58 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0090C 8085FF5C A08007C8 */ sb $zero, 0x07C8($a0) ## 000007C8 -/* 00910 8085FF60 46062200 */ add.s $f8, $f4, $f6 +/* 00910 8085FF60 46062200 */ add.s $f8, $f4, $f6 /* 00914 8085FF64 0C00B58B */ jal Actor_SetScale - + /* 00918 8085FF68 E4880028 */ swc1 $f8, 0x0028($a0) ## 00000028 -/* 0091C 8085FF6C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0091C 8085FF6C 8FA40018 */ lw $a0, 0x0018($sp) /* 00920 8085FF70 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00924 8085FF74 3C058086 */ lui $a1, %hi(func_8085FF9C) ## $a1 = 80860000 /* 00928 8085FF78 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 /* 0092C 8085FF7C 24A5FF9C */ addiu $a1, $a1, %lo(func_8085FF9C) ## $a1 = 8085FF9C -/* 00930 8085FF80 01C17824 */ and $t7, $t6, $at -/* 00934 8085FF84 0C217D94 */ jal func_8085F650 +/* 00930 8085FF80 01C17824 */ and $t7, $t6, $at +/* 00934 8085FF84 0C217D94 */ jal func_8085F650 /* 00938 8085FF88 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 0093C 8085FF8C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0093C 8085FF8C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00940 8085FF90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00944 8085FF94 03E00008 */ jr $ra +/* 00944 8085FF94 03E00008 */ jr $ra /* 00948 8085FF98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s index 40f023eed1..972d24f43d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s @@ -1,13 +1,13 @@ glabel func_80860068 /* 00A18 80860068 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A1C 8086006C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00A1C 8086006C AFBF0014 */ sw $ra, 0x0014($sp) /* 00A20 80860070 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00A24 80860074 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A28 80860078 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C -/* 00A2C 8086007C AFA60018 */ sw $a2, 0x0018($sp) -/* 00A30 80860080 0C0294BE */ jal func_800A52F8 +/* 00A2C 8086007C AFA60018 */ sw $a2, 0x0018($sp) +/* 00A30 80860080 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00A34 80860084 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00A38 80860088 8FA60018 */ lw $a2, 0x0018($sp) +/* 00A38 80860088 8FA60018 */ lw $a2, 0x0018($sp) /* 00A3C 8086008C 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 00A40 80860090 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -16,22 +16,22 @@ glabel func_80860068 /* 00A4C 8086009C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 00A50 808600A0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00A54 808600A4 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 00A58 808600A8 46040182 */ mul.s $f6, $f0, $f4 -/* 00A5C 808600AC 8FA40018 */ lw $a0, 0x0018($sp) +/* 00A58 808600A8 46040182 */ mul.s $f6, $f0, $f4 +/* 00A5C 808600AC 8FA40018 */ lw $a0, 0x0018($sp) /* 00A60 808600B0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00A64 808600B4 3C058086 */ lui $a1, %hi(func_808600EC) ## $a1 = 80860000 /* 00A68 808600B8 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 /* 00A6C 808600BC 24A500EC */ addiu $a1, $a1, %lo(func_808600EC) ## $a1 = 808600EC /* 00A70 808600C0 E4920068 */ swc1 $f18, 0x0068($a0) ## 00000068 -/* 00A74 808600C4 46083280 */ add.s $f10, $f6, $f8 +/* 00A74 808600C4 46083280 */ add.s $f10, $f6, $f8 /* 00A78 808600C8 A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 00A7C 808600CC 4600540D */ trunc.w.s $f16, $f10 -/* 00A80 808600D0 44188000 */ mfc1 $t8, $f16 -/* 00A84 808600D4 0C217D94 */ jal func_8085F650 +/* 00A7C 808600CC 4600540D */ trunc.w.s $f16, $f10 +/* 00A80 808600D0 44188000 */ mfc1 $t8, $f16 +/* 00A84 808600D4 0C217D94 */ jal func_8085F650 /* 00A88 808600D8 AC9807E8 */ sw $t8, 0x07E8($a0) ## 000007E8 -/* 00A8C 808600DC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00A8C 808600DC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00A90 808600E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A94 808600E4 03E00008 */ jr $ra +/* 00A94 808600E4 03E00008 */ jr $ra /* 00A98 808600E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s index 42ae59c86c..75d46a7ea1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s @@ -1,30 +1,30 @@ glabel func_80860438 /* 00DE8 80860438 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00DEC 8086043C AFB00028 */ sw $s0, 0x0028($sp) +/* 00DEC 8086043C AFB00028 */ sw $s0, 0x0028($sp) /* 00DF0 80860440 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DF4 80860444 AFBF002C */ sw $ra, 0x002C($sp) +/* 00DF4 80860444 AFBF002C */ sw $ra, 0x002C($sp) /* 00DF8 80860448 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00DFC 8086044C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00E00 80860450 24841C20 */ addiu $a0, $a0, 0x1C20 ## $a0 = 06001C20 /* 00E04 80860454 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00E08 80860458 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 00E0C 8086045C 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 -/* 00E10 80860460 468021A0 */ cvt.s.w $f6, $f4 +/* 00E10 80860460 468021A0 */ cvt.s.w $f6, $f4 /* 00E14 80860464 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E18 80860468 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00E1C 8086046C 44060000 */ mfc1 $a2, $f0 -/* 00E20 80860470 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00E1C 8086046C 44060000 */ mfc1 $a2, $f0 +/* 00E20 80860470 AFAE0014 */ sw $t6, 0x0014($sp) /* 00E24 80860474 24A51C20 */ addiu $a1, $a1, 0x1C20 ## $a1 = 06001C20 -/* 00E28 80860478 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00E28 80860478 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00E2C 8086047C 260404A8 */ addiu $a0, $s0, 0x04A8 ## $a0 = 000004A8 /* 00E30 80860480 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00E34 80860484 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00E38 80860488 E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 00E38 80860488 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00E3C 8086048C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00E40 80860490 24A581B4 */ addiu $a1, $a1, 0x81B4 ## $a1 = 060081B4 -/* 00E44 80860494 0C0294BE */ jal func_800A52F8 +/* 00E44 80860494 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00E48 80860498 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 00E4C 8086049C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -33,23 +33,23 @@ glabel func_80860438 /* 00E58 808604A8 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 00E5C 808604AC 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 /* 00E60 808604B0 2409000D */ addiu $t1, $zero, 0x000D ## $t1 = 0000000D -/* 00E64 808604B4 46080282 */ mul.s $f10, $f0, $f8 +/* 00E64 808604B4 46080282 */ mul.s $f10, $f0, $f8 /* 00E68 808604B8 3C058086 */ lui $a1, %hi(func_808604FC) ## $a1 = 80860000 /* 00E6C 808604BC A20907C8 */ sb $t1, 0x07C8($s0) ## 000007C8 /* 00E70 808604C0 24A504FC */ addiu $a1, $a1, %lo(func_808604FC) ## $a1 = 808604FC /* 00E74 808604C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E78 808604C8 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 -/* 00E7C 808604CC 4600540D */ trunc.w.s $f16, $f10 -/* 00E80 808604D0 44188000 */ mfc1 $t8, $f16 +/* 00E7C 808604CC 4600540D */ trunc.w.s $f16, $f10 +/* 00E80 808604D0 44188000 */ mfc1 $t8, $f16 /* 00E84 808604D4 00000000 */ nop -/* 00E88 808604D8 0018CC00 */ sll $t9, $t8, 16 -/* 00E8C 808604DC 00194403 */ sra $t0, $t9, 16 -/* 00E90 808604E0 0C217D94 */ jal func_8085F650 +/* 00E88 808604D8 0018CC00 */ sll $t9, $t8, 16 +/* 00E8C 808604DC 00194403 */ sra $t0, $t9, 16 +/* 00E90 808604E0 0C217D94 */ jal func_8085F650 /* 00E94 808604E4 AE0807E8 */ sw $t0, 0x07E8($s0) ## 000007E8 -/* 00E98 808604E8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E9C 808604EC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00E98 808604E8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00E9C 808604EC 8FB00028 */ lw $s0, 0x0028($sp) /* 00EA0 808604F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00EA4 808604F4 03E00008 */ jr $ra +/* 00EA4 808604F4 03E00008 */ jr $ra /* 00EA8 808604F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s index a475908877..7e393fd06c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s @@ -1,21 +1,21 @@ glabel func_80860BDC /* 0158C 80860BDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01590 80860BE0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01590 80860BE0 AFBF0014 */ sw $ra, 0x0014($sp) /* 01594 80860BE4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 01598 80860BE8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0159C 80860BEC 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 -/* 015A0 80860BF0 AFA60018 */ sw $a2, 0x0018($sp) -/* 015A4 80860BF4 0C0294BE */ jal func_800A52F8 +/* 015A0 80860BF0 AFA60018 */ sw $a2, 0x0018($sp) +/* 015A4 80860BF4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 015A8 80860BF8 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 015AC 80860BFC 8FA40018 */ lw $a0, 0x0018($sp) +/* 015AC 80860BFC 8FA40018 */ lw $a0, 0x0018($sp) /* 015B0 80860C00 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E /* 015B4 80860C04 3C058086 */ lui $a1, %hi(func_80860C24) ## $a1 = 80860000 /* 015B8 80860C08 24A50C24 */ addiu $a1, $a1, %lo(func_80860C24) ## $a1 = 80860C24 -/* 015BC 80860C0C 0C217D94 */ jal func_8085F650 +/* 015BC 80860C0C 0C217D94 */ jal func_8085F650 /* 015C0 80860C10 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 -/* 015C4 80860C14 8FBF0014 */ lw $ra, 0x0014($sp) +/* 015C4 80860C14 8FBF0014 */ lw $ra, 0x0014($sp) /* 015C8 80860C18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 015CC 80860C1C 03E00008 */ jr $ra +/* 015CC 80860C1C 03E00008 */ jr $ra /* 015D0 80860C20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s index a0341b07a9..5151d34318 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s @@ -1,11 +1,11 @@ glabel func_80860EC0 /* 01870 80860EC0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01874 80860EC4 AFB00018 */ sw $s0, 0x0018($sp) +/* 01874 80860EC4 AFB00018 */ sw $s0, 0x0018($sp) /* 01878 80860EC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0187C 80860ECC AFBF001C */ sw $ra, 0x001C($sp) +/* 0187C 80860ECC AFBF001C */ sw $ra, 0x001C($sp) /* 01880 80860ED0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01884 80860ED4 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 -/* 01888 80860ED8 0C0294BE */ jal func_800A52F8 +/* 01888 80860ED8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 0188C 80860EDC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 01890 80860EE0 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F /* 01894 80860EE4 0C03F66B */ jal Math_Rand_ZeroOne @@ -14,12 +14,12 @@ glabel func_80860EC0 /* 0189C 80860EEC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 018A0 80860EF0 44811000 */ mtc1 $at, $f2 ## $f2 = 0.50 /* 018A4 80860EF4 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 018A8 80860EF8 4600103C */ c.lt.s $f2, $f0 +/* 018A8 80860EF8 4600103C */ c.lt.s $f2, $f0 /* 018AC 80860EFC 00000000 */ nop -/* 018B0 80860F00 45020005 */ bc1fl .L80860F18 +/* 018B0 80860F00 45020005 */ bc1fl .L80860F18 /* 018B4 80860F04 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 /* 018B8 80860F08 44812000 */ mtc1 $at, $f4 ## $f4 = -0.50 -/* 018BC 80860F0C 10000002 */ beq $zero, $zero, .L80860F18 +/* 018BC 80860F0C 10000002 */ beq $zero, $zero, .L80860F18 /* 018C0 80860F10 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 018C4 80860F14 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 .L80860F18: @@ -30,26 +30,26 @@ glabel func_80860EC0 /* 018D4 80860F24 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 /* 018D8 80860F28 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 018DC 80860F2C 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 -/* 018E0 80860F30 46060202 */ mul.s $f8, $f0, $f6 +/* 018E0 80860F30 46060202 */ mul.s $f8, $f0, $f6 /* 018E4 80860F34 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 018E8 80860F38 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 /* 018EC 80860F3C 3C058086 */ lui $a1, %hi(func_80860F84) ## $a1 = 80860000 /* 018F0 80860F40 24A50F84 */ addiu $a1, $a1, %lo(func_80860F84) ## $a1 = 80860F84 /* 018F4 80860F44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 018F8 80860F48 E60407EC */ swc1 $f4, 0x07EC($s0) ## 000007EC -/* 018FC 80860F4C 460A4400 */ add.s $f16, $f8, $f10 +/* 018FC 80860F4C 460A4400 */ add.s $f16, $f8, $f10 /* 01900 80860F50 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -/* 01904 80860F54 4600848D */ trunc.w.s $f18, $f16 -/* 01908 80860F58 44189000 */ mfc1 $t8, $f18 +/* 01904 80860F54 4600848D */ trunc.w.s $f18, $f16 +/* 01908 80860F58 44189000 */ mfc1 $t8, $f18 /* 0190C 80860F5C 00000000 */ nop -/* 01910 80860F60 0018CC00 */ sll $t9, $t8, 16 -/* 01914 80860F64 00194403 */ sra $t0, $t9, 16 -/* 01918 80860F68 0C217D94 */ jal func_8085F650 +/* 01910 80860F60 0018CC00 */ sll $t9, $t8, 16 +/* 01914 80860F64 00194403 */ sra $t0, $t9, 16 +/* 01918 80860F68 0C217D94 */ jal func_8085F650 /* 0191C 80860F6C AE0807E8 */ sw $t0, 0x07E8($s0) ## 000007E8 -/* 01920 80860F70 8FBF001C */ lw $ra, 0x001C($sp) -/* 01924 80860F74 8FB00018 */ lw $s0, 0x0018($sp) +/* 01920 80860F70 8FBF001C */ lw $ra, 0x001C($sp) +/* 01924 80860F74 8FB00018 */ lw $s0, 0x0018($sp) /* 01928 80860F78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0192C 80860F7C 03E00008 */ jr $ra +/* 0192C 80860F7C 03E00008 */ jr $ra /* 01930 80860F80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s index 6741abe5d0..a0c2e4f81d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s @@ -1,22 +1,22 @@ glabel func_80862050 /* 02A00 80862050 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A04 80862054 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02A04 80862054 AFBF0014 */ sw $ra, 0x0014($sp) /* 02A08 80862058 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 02A0C 8086205C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02A10 80862060 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C -/* 02A14 80862064 AFA70018 */ sw $a3, 0x0018($sp) +/* 02A14 80862064 AFA70018 */ sw $a3, 0x0018($sp) /* 02A18 80862068 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02A1C 8086206C 0C0294D3 */ jal func_800A534C +/* 02A1C 8086206C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 02A20 80862070 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 02A24 80862074 8FA40018 */ lw $a0, 0x0018($sp) +/* 02A24 80862074 8FA40018 */ lw $a0, 0x0018($sp) /* 02A28 80862078 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 /* 02A2C 8086207C 3C058086 */ lui $a1, %hi(func_8086209C) ## $a1 = 80860000 /* 02A30 80862080 24A5209C */ addiu $a1, $a1, %lo(func_8086209C) ## $a1 = 8086209C -/* 02A34 80862084 0C217D94 */ jal func_8085F650 +/* 02A34 80862084 0C217D94 */ jal func_8085F650 /* 02A38 80862088 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 -/* 02A3C 8086208C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02A3C 8086208C 8FBF0014 */ lw $ra, 0x0014($sp) /* 02A40 80862090 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02A44 80862094 03E00008 */ jr $ra +/* 02A44 80862094 03E00008 */ jr $ra /* 02A48 80862098 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s index 507857cf98..09d1df6519 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s @@ -1,42 +1,42 @@ glabel func_808627C4 /* 03174 808627C4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03178 808627C8 AFB00020 */ sw $s0, 0x0020($sp) +/* 03178 808627C8 AFB00020 */ sw $s0, 0x0020($sp) /* 0317C 808627CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03180 808627D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03184 808627D4 AFA5002C */ sw $a1, 0x002C($sp) +/* 03180 808627D0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 03184 808627D4 AFA5002C */ sw $a1, 0x002C($sp) /* 03188 808627D8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0318C 808627DC 0C00CEAE */ jal func_80033AB8 +/* 0318C 808627DC 0C00CEAE */ jal func_80033AB8 /* 03190 808627E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03194 808627E4 10400005 */ beq $v0, $zero, .L808627FC +/* 03194 808627E4 10400005 */ beq $v0, $zero, .L808627FC /* 03198 808627E8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 0319C 808627EC 0C2183B0 */ jal func_80860EC0 +/* 0319C 808627EC 0C2183B0 */ jal func_80860EC0 /* 031A0 808627F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031A4 808627F4 10000030 */ beq $zero, $zero, .L808628B8 -/* 031A8 808627F8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 031A4 808627F4 10000030 */ beq $zero, $zero, .L808628B8 +/* 031A8 808627F8 8FBF0024 */ lw $ra, 0x0024($sp) .L808627FC: /* 031AC 808627FC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 031B0 80862800 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 -/* 031B4 80862804 0C0294D3 */ jal func_800A534C +/* 031B4 80862804 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 031B8 80862808 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 031BC 8086280C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 031C0 80862810 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 031C4 80862814 AFAE0010 */ sw $t6, 0x0010($sp) +/* 031C4 80862814 AFAE0010 */ sw $t6, 0x0010($sp) /* 031C8 80862818 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 031CC 8086281C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 031D0 80862820 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 031D4 80862824 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 031D8 80862828 8FAF002C */ lw $t7, 0x002C($sp) +/* 031D8 80862828 8FAF002C */ lw $t7, 0x002C($sp) /* 031DC 8086282C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 /* 031E0 80862830 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 031E4 80862834 030FC021 */ addu $t8, $t8, $t7 +/* 031E4 80862834 030FC021 */ addu $t8, $t8, $t7 /* 031E8 80862838 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 /* 031EC 8086283C 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 031F0 80862840 53200006 */ beql $t9, $zero, .L8086285C +/* 031F0 80862840 53200006 */ beql $t9, $zero, .L8086285C /* 031F4 80862844 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 /* 031F8 80862848 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 031FC 8086284C 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 -/* 03200 80862850 10000004 */ beq $zero, $zero, .L80862864 +/* 03200 80862850 10000004 */ beq $zero, $zero, .L80862864 /* 03204 80862854 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 03208 80862858 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 .L8086285C: @@ -52,23 +52,23 @@ glabel func_808627C4 /* 03228 80862878 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 /* 0322C 8086287C 240C0018 */ addiu $t4, $zero, 0x0018 ## $t4 = 00000018 /* 03230 80862880 3C058086 */ lui $a1, %hi(func_808628C8) ## $a1 = 80860000 -/* 03234 80862884 46020202 */ mul.s $f8, $f0, $f2 +/* 03234 80862884 46020202 */ mul.s $f8, $f0, $f2 /* 03238 80862888 A20C07C8 */ sb $t4, 0x07C8($s0) ## 000007C8 /* 0323C 8086288C 24A528C8 */ addiu $a1, $a1, %lo(func_808628C8) ## $a1 = 808628C8 /* 03240 80862890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03244 80862894 46024280 */ add.s $f10, $f8, $f2 -/* 03248 80862898 4600540D */ trunc.w.s $f16, $f10 -/* 0324C 8086289C 440B8000 */ mfc1 $t3, $f16 -/* 03250 808628A0 0C217D94 */ jal func_8085F650 +/* 03244 80862894 46024280 */ add.s $f10, $f8, $f2 +/* 03248 80862898 4600540D */ trunc.w.s $f16, $f10 +/* 0324C 8086289C 440B8000 */ mfc1 $t3, $f16 +/* 03250 808628A0 0C217D94 */ jal func_8085F650 /* 03254 808628A4 AE0B07E8 */ sw $t3, 0x07E8($s0) ## 000007E8 /* 03258 808628A8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 0325C 808628AC 00000000 */ nop /* 03260 808628B0 E61207EC */ swc1 $f18, 0x07EC($s0) ## 000007EC -/* 03264 808628B4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03264 808628B4 8FBF0024 */ lw $ra, 0x0024($sp) .L808628B8: -/* 03268 808628B8 8FB00020 */ lw $s0, 0x0020($sp) +/* 03268 808628B8 8FB00020 */ lw $s0, 0x0020($sp) /* 0326C 808628BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03270 808628C0 03E00008 */ jr $ra +/* 03270 808628C0 03E00008 */ jr $ra /* 03274 808628C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s index 81df415ce4..ed0d469333 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s @@ -1,16 +1,16 @@ glabel func_80864158 /* 04B08 80864158 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04B0C 8086415C AFA5001C */ sw $a1, 0x001C($sp) -/* 04B10 80864160 AFBF0014 */ sw $ra, 0x0014($sp) +/* 04B0C 8086415C AFA5001C */ sw $a1, 0x001C($sp) +/* 04B10 80864160 AFBF0014 */ sw $ra, 0x0014($sp) /* 04B14 80864164 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 04B18 80864168 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 04B1C 8086416C 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 -/* 04B20 80864170 AFA70018 */ sw $a3, 0x0018($sp) +/* 04B20 80864170 AFA70018 */ sw $a3, 0x0018($sp) /* 04B24 80864174 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 04B28 80864178 0C0294D3 */ jal func_800A534C +/* 04B28 80864178 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 04B2C 8086417C 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 04B30 80864180 8FA70018 */ lw $a3, 0x0018($sp) -/* 04B34 80864184 C7A4001C */ lwc1 $f4, 0x001C($sp) +/* 04B30 80864180 8FA70018 */ lw $a3, 0x0018($sp) +/* 04B34 80864184 C7A4001C */ lwc1 $f4, 0x001C($sp) /* 04B38 80864188 84EE00B6 */ lh $t6, 0x00B6($a3) ## 000000B6 /* 04B3C 8086418C E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 /* 04B40 80864190 25CF3FFF */ addiu $t7, $t6, 0x3FFF ## $t7 = 00003FFF @@ -21,20 +21,20 @@ glabel func_80864158 /* 04B50 808641A0 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 04B54 808641A4 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 04B58 808641A8 44815000 */ mtc1 $at, $f10 ## $f10 = 15.00 -/* 04B5C 808641AC 46060202 */ mul.s $f8, $f0, $f6 -/* 04B60 808641B0 8FA40018 */ lw $a0, 0x0018($sp) +/* 04B5C 808641AC 46060202 */ mul.s $f8, $f0, $f6 +/* 04B60 808641B0 8FA40018 */ lw $a0, 0x0018($sp) /* 04B64 808641B4 24080018 */ addiu $t0, $zero, 0x0018 ## $t0 = 00000018 /* 04B68 808641B8 3C058086 */ lui $a1, %hi(func_808628C8) ## $a1 = 80860000 /* 04B6C 808641BC 24A528C8 */ addiu $a1, $a1, %lo(func_808628C8) ## $a1 = 808628C8 /* 04B70 808641C0 A08807C8 */ sb $t0, 0x07C8($a0) ## 000007C8 -/* 04B74 808641C4 460A4400 */ add.s $f16, $f8, $f10 -/* 04B78 808641C8 4600848D */ trunc.w.s $f18, $f16 -/* 04B7C 808641CC 44199000 */ mfc1 $t9, $f18 -/* 04B80 808641D0 0C217D94 */ jal func_8085F650 +/* 04B74 808641C4 460A4400 */ add.s $f16, $f8, $f10 +/* 04B78 808641C8 4600848D */ trunc.w.s $f18, $f16 +/* 04B7C 808641CC 44199000 */ mfc1 $t9, $f18 +/* 04B80 808641D0 0C217D94 */ jal func_8085F650 /* 04B84 808641D4 AC9907E8 */ sw $t9, 0x07E8($a0) ## 000007E8 -/* 04B88 808641D8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 04B88 808641D8 8FBF0014 */ lw $ra, 0x0014($sp) /* 04B8C 808641DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04B90 808641E0 03E00008 */ jr $ra +/* 04B90 808641E0 03E00008 */ jr $ra /* 04B94 808641E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s index e378a99b20..e1ef14c334 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s @@ -1,18 +1,18 @@ glabel EnTg_Destroy /* 00228 80B18588 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0022C 80B1858C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00230 80B18590 AFA40018 */ sw $a0, 0x0018($sp) -/* 00234 80B18594 AFA5001C */ sw $a1, 0x001C($sp) -/* 00238 80B18598 0C0295BC */ jal func_800A56F0 +/* 0022C 80B1858C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00230 80B18590 AFA40018 */ sw $a0, 0x0018($sp) +/* 00234 80B18594 AFA5001C */ sw $a1, 0x001C($sp) +/* 00238 80B18598 0C0295BC */ jal SkelAnime_Free /* 0023C 80B1859C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00240 80B185A0 8FA50018 */ lw $a1, 0x0018($sp) -/* 00244 80B185A4 8FA4001C */ lw $a0, 0x001C($sp) +/* 00240 80B185A0 8FA50018 */ lw $a1, 0x0018($sp) +/* 00244 80B185A4 8FA4001C */ lw $a0, 0x001C($sp) /* 00248 80B185A8 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 0024C 80B185AC 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 00250 80B185B0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00250 80B185B0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00254 80B185B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00258 80B185B8 03E00008 */ jr $ra +/* 00258 80B185B8 03E00008 */ jr $ra /* 0025C 80B185BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s index cfe59de8dc..9fbd2d0c9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s @@ -1,22 +1,22 @@ glabel EnTg_Draw /* 00484 80B187E4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00488 80B187E8 AFB10028 */ sw $s1, 0x0028($sp) +/* 00488 80B187E8 AFB10028 */ sw $s1, 0x0028($sp) /* 0048C 80B187EC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00490 80B187F0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00494 80B187F4 AFB00024 */ sw $s0, 0x0024($sp) -/* 00498 80B187F8 AFA40058 */ sw $a0, 0x0058($sp) +/* 00490 80B187F0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00494 80B187F4 AFB00024 */ sw $s0, 0x0024($sp) +/* 00498 80B187F8 AFA40058 */ sw $a0, 0x0058($sp) /* 0049C 80B187FC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 004A0 80B18800 3C0680B2 */ lui $a2, %hi(D_80B18980) ## $a2 = 80B20000 /* 004A4 80B18804 24C68980 */ addiu $a2, $a2, %lo(D_80B18980) ## $a2 = 80B18980 /* 004A8 80B18808 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 004AC 80B1880C 240701CE */ addiu $a3, $zero, 0x01CE ## $a3 = 000001CE -/* 004B0 80B18810 0C031AB1 */ jal func_800C6AC4 +/* 004B0 80B18810 0C031AB1 */ jal func_800C6AC4 /* 004B4 80B18814 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 004B8 80B18818 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 004BC 80B1881C 3C06C40C */ lui $a2, 0xC40C ## $a2 = C40C0000 /* 004C0 80B18820 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 004C4 80B18824 0C034261 */ jal Matrix_Translate -/* 004C8 80B18828 46006386 */ mov.s $f14, $f12 +/* 004C4 80B18824 0C034261 */ jal Matrix_Translate +/* 004C8 80B18828 46006386 */ mov.s $f14, $f12 /* 004CC 80B1882C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 004D0 80B18830 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 004D4 80B18834 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 @@ -24,13 +24,13 @@ glabel EnTg_Draw /* 004DC 80B1883C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 004E0 80B18840 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 004E4 80B18844 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 004E8 80B18848 AFA00010 */ sw $zero, 0x0010($sp) +/* 004E8 80B18848 AFA00010 */ sw $zero, 0x0010($sp) /* 004EC 80B1884C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 004F0 80B18850 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 /* 004F4 80B18854 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 -/* 004F8 80B18858 0C2C61DE */ jal func_80B18778 -/* 004FC 80B1885C AFA2003C */ sw $v0, 0x003C($sp) -/* 00500 80B18860 8FA3003C */ lw $v1, 0x003C($sp) +/* 004F8 80B18858 0C2C61DE */ jal func_80B18778 +/* 004FC 80B1885C AFA2003C */ sw $v0, 0x003C($sp) +/* 00500 80B18860 8FA3003C */ lw $v1, 0x003C($sp) /* 00504 80B18864 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00508 80B18868 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 /* 0050C 80B1886C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -41,35 +41,35 @@ glabel EnTg_Draw /* 00520 80B18880 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 00524 80B18884 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 00528 80B18888 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0052C 80B1888C AFA00010 */ sw $zero, 0x0010($sp) +/* 0052C 80B1888C AFA00010 */ sw $zero, 0x0010($sp) /* 00530 80B18890 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 00534 80B18894 0C2C61DE */ jal func_80B18778 -/* 00538 80B18898 AFA20038 */ sw $v0, 0x0038($sp) -/* 0053C 80B1889C 8FA30038 */ lw $v1, 0x0038($sp) +/* 00534 80B18894 0C2C61DE */ jal func_80B18778 +/* 00538 80B18898 AFA20038 */ sw $v0, 0x0038($sp) +/* 0053C 80B1889C 8FA30038 */ lw $v1, 0x0038($sp) /* 00540 80B188A0 3C0880B2 */ lui $t0, %hi(func_80B18704) ## $t0 = 80B20000 /* 00544 80B188A4 3C0980B2 */ lui $t1, %hi(func_80B1871C) ## $t1 = 80B20000 /* 00548 80B188A8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0054C 80B188AC 8FA20058 */ lw $v0, 0x0058($sp) +/* 0054C 80B188AC 8FA20058 */ lw $v0, 0x0058($sp) /* 00550 80B188B0 2529871C */ addiu $t1, $t1, %lo(func_80B1871C) ## $t1 = 80B1871C /* 00554 80B188B4 25088704 */ addiu $t0, $t0, %lo(func_80B18704) ## $t0 = 80B18704 /* 00558 80B188B8 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 /* 0055C 80B188BC 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C /* 00560 80B188C0 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E -/* 00564 80B188C4 AFA90014 */ sw $t1, 0x0014($sp) -/* 00568 80B188C8 AFA80010 */ sw $t0, 0x0010($sp) +/* 00564 80B188C4 AFA90014 */ sw $t1, 0x0014($sp) +/* 00568 80B188C8 AFA80010 */ sw $t0, 0x0010($sp) /* 0056C 80B188CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00570 80B188D0 0C0286B2 */ jal func_800A1AC8 -/* 00574 80B188D4 AFA20018 */ sw $v0, 0x0018($sp) +/* 00570 80B188D0 0C0286B2 */ jal SkelAnime_DrawSV +/* 00574 80B188D4 AFA20018 */ sw $v0, 0x0018($sp) /* 00578 80B188D8 3C0680B2 */ lui $a2, %hi(D_80B18990) ## $a2 = 80B20000 /* 0057C 80B188DC 24C68990 */ addiu $a2, $a2, %lo(D_80B18990) ## $a2 = 80B18990 /* 00580 80B188E0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 00584 80B188E4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00588 80B188E8 0C031AD5 */ jal func_800C6B54 +/* 00588 80B188E8 0C031AD5 */ jal func_800C6B54 /* 0058C 80B188EC 240701E0 */ addiu $a3, $zero, 0x01E0 ## $a3 = 000001E0 -/* 00590 80B188F0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00594 80B188F4 8FB00024 */ lw $s0, 0x0024($sp) -/* 00598 80B188F8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0059C 80B188FC 03E00008 */ jr $ra +/* 00590 80B188F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00594 80B188F4 8FB00024 */ lw $s0, 0x0024($sp) +/* 00598 80B188F8 8FB10028 */ lw $s1, 0x0028($sp) +/* 0059C 80B188FC 03E00008 */ jr $ra /* 005A0 80B18900 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 005A4 80B18904 00000000 */ nop /* 005A8 80B18908 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s index 7e635a0bcb..781f64064f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s @@ -1,61 +1,61 @@ glabel EnTg_Init /* 00150 80B184B0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00154 80B184B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00154 80B184B4 AFB00028 */ sw $s0, 0x0028($sp) /* 00158 80B184B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0015C 80B184BC AFBF002C */ sw $ra, 0x002C($sp) -/* 00160 80B184C0 AFA5003C */ sw $a1, 0x003C($sp) +/* 0015C 80B184BC AFBF002C */ sw $ra, 0x002C($sp) +/* 00160 80B184C0 AFA5003C */ sw $a1, 0x003C($sp) /* 00164 80B184C4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00168 80B184C8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0016C 80B184CC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00170 80B184D0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00174 80B184D4 0C00AC78 */ jal ActorShape_Init - + /* 00178 80B184D8 3C0741E0 */ lui $a3, 0x41E0 ## $a3 = 41E00000 /* 0017C 80B184DC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00180 80B184E0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00184 80B184E4 24E75040 */ addiu $a3, $a3, 0x5040 ## $a3 = 06005040 /* 00188 80B184E8 24C6AE40 */ addiu $a2, $a2, 0xAE40 ## $a2 = 0600AE40 -/* 0018C 80B184EC 8FA4003C */ lw $a0, 0x003C($sp) +/* 0018C 80B184EC 8FA4003C */ lw $a0, 0x003C($sp) /* 00190 80B184F0 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00194 80B184F4 AFA00010 */ sw $zero, 0x0010($sp) -/* 00198 80B184F8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0019C 80B184FC 0C0291BE */ jal func_800A46F8 -/* 001A0 80B18500 AFA00018 */ sw $zero, 0x0018($sp) +/* 00194 80B184F4 AFA00010 */ sw $zero, 0x0010($sp) +/* 00198 80B184F8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0019C 80B184FC 0C0291BE */ jal SkelAnime_InitSV +/* 001A0 80B18500 AFA00018 */ sw $zero, 0x0018($sp) /* 001A4 80B18504 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 001A8 80B18508 AFA50030 */ sw $a1, 0x0030($sp) +/* 001A8 80B18508 AFA50030 */ sw $a1, 0x0030($sp) /* 001AC 80B1850C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 001B0 80B18510 8FA4003C */ lw $a0, 0x003C($sp) + +/* 001B0 80B18510 8FA4003C */ lw $a0, 0x003C($sp) /* 001B4 80B18514 3C0780B2 */ lui $a3, %hi(D_80B18910) ## $a3 = 80B20000 -/* 001B8 80B18518 8FA50030 */ lw $a1, 0x0030($sp) +/* 001B8 80B18518 8FA50030 */ lw $a1, 0x0030($sp) /* 001BC 80B1851C 24E78910 */ addiu $a3, $a3, %lo(D_80B18910) ## $a3 = 80B18910 -/* 001C0 80B18520 8FA4003C */ lw $a0, 0x003C($sp) +/* 001C0 80B18520 8FA4003C */ lw $a0, 0x003C($sp) /* 001C4 80B18524 0C01712B */ jal ActorCollider_InitCylinder - + /* 001C8 80B18528 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001CC 80B1852C 3C0680B2 */ lui $a2, %hi(D_80B1893C) ## $a2 = 80B20000 /* 001D0 80B18530 24C6893C */ addiu $a2, $a2, %lo(D_80B1893C) ## $a2 = 80B1893C /* 001D4 80B18534 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 001D8 80B18538 0C0187BF */ jal func_80061EFC +/* 001D8 80B18538 0C0187BF */ jal func_80061EFC /* 001DC 80B1853C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 001E0 80B18540 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 001E4 80B18544 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 001E8 80B18548 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F /* 001EC 80B1854C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 001F0 80B18550 0C00B58B */ jal Actor_SetScale - + /* 001F4 80B18554 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001F8 80B18558 8FAF003C */ lw $t7, 0x003C($sp) +/* 001F8 80B18558 8FAF003C */ lw $t7, 0x003C($sp) /* 001FC 80B1855C 3C0880B2 */ lui $t0, %hi(func_80B185C0) ## $t0 = 80B20000 /* 00200 80B18560 250885C0 */ addiu $t0, $t0, %lo(func_80B185C0) ## $t0 = 80B185C0 /* 00204 80B18564 8DF8009C */ lw $t8, 0x009C($t7) ## 0000009C /* 00208 80B18568 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 /* 0020C 80B1856C 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 /* 00210 80B18570 A2190208 */ sb $t9, 0x0208($s0) ## 00000208 -/* 00214 80B18574 8FBF002C */ lw $ra, 0x002C($sp) -/* 00218 80B18578 8FB00028 */ lw $s0, 0x0028($sp) +/* 00214 80B18574 8FBF002C */ lw $ra, 0x002C($sp) +/* 00218 80B18578 8FB00028 */ lw $s0, 0x0028($sp) /* 0021C 80B1857C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00220 80B18580 03E00008 */ jr $ra +/* 00220 80B18580 03E00008 */ jr $ra /* 00224 80B18584 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s index d823405368..7bec3646d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s @@ -1,30 +1,30 @@ glabel func_80B18C5C /* 001DC 80B18C5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001E0 80B18C60 AFBF0014 */ sw $ra, 0x0014($sp) +/* 001E0 80B18C60 AFBF0014 */ sw $ra, 0x0014($sp) /* 001E4 80B18C64 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 001E8 80B18C68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001EC 80B18C6C 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 060012E4 -/* 001F0 80B18C70 AFA70018 */ sw $a3, 0x0018($sp) +/* 001F0 80B18C70 AFA70018 */ sw $a3, 0x0018($sp) /* 001F4 80B18C74 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001F8 80B18C78 0C0294D3 */ jal func_800A534C +/* 001F8 80B18C78 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 001FC 80B18C7C 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 00200 80B18C80 8FA70018 */ lw $a3, 0x0018($sp) +/* 00200 80B18C80 8FA70018 */ lw $a3, 0x0018($sp) /* 00204 80B18C84 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 00208 80B18C88 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F /* 0020C 80B18C8C 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E /* 00210 80B18C90 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00214 80B18C94 A0EE02BC */ sb $t6, 0x02BC($a3) ## 000002BC -/* 00218 80B18C98 8FA40018 */ lw $a0, 0x0018($sp) +/* 00218 80B18C98 8FA40018 */ lw $a0, 0x0018($sp) /* 0021C 80B18C9C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00220 80B18CA0 3C0580B2 */ lui $a1, %hi(func_80B18CC4) ## $a1 = 80B20000 /* 00224 80B18CA4 24A58CC4 */ addiu $a1, $a1, %lo(func_80B18CC4) ## $a1 = 80B18CC4 /* 00228 80B18CA8 A48202E0 */ sh $v0, 0x02E0($a0) ## 000002E0 -/* 0022C 80B18CAC 0C2C62A0 */ jal func_80B18A80 +/* 0022C 80B18CAC 0C2C62A0 */ jal func_80B18A80 /* 00230 80B18CB0 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00234 80B18CB4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00234 80B18CB4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00238 80B18CB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0023C 80B18CBC 03E00008 */ jr $ra +/* 0023C 80B18CBC 03E00008 */ jr $ra /* 00240 80B18CC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s index 60de583da3..94a1656b1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s @@ -1,60 +1,60 @@ glabel func_80B18E7C /* 003FC 80B18E7C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00400 80B18E80 AFB00028 */ sw $s0, 0x0028($sp) +/* 00400 80B18E80 AFB00028 */ sw $s0, 0x0028($sp) /* 00404 80B18E84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00408 80B18E88 AFBF002C */ sw $ra, 0x002C($sp) +/* 00408 80B18E88 AFBF002C */ sw $ra, 0x002C($sp) /* 0040C 80B18E8C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00410 80B18E90 AFA5005C */ sw $a1, 0x005C($sp) +/* 00410 80B18E90 AFA5005C */ sw $a1, 0x005C($sp) /* 00414 80B18E94 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00418 80B18E98 AFA40038 */ sw $a0, 0x0038($sp) -/* 0041C 80B18E9C 504000AA */ beql $v0, $zero, .L80B19148 + +/* 00418 80B18E98 AFA40038 */ sw $a0, 0x0038($sp) +/* 0041C 80B18E9C 504000AA */ beql $v0, $zero, .L80B19148 /* 00420 80B18EA0 860202E0 */ lh $v0, 0x02E0($s0) ## 000002E0 /* 00424 80B18EA4 860302E0 */ lh $v1, 0x02E0($s0) ## 000002E0 /* 00428 80B18EA8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0042C 80B18EAC 10600009 */ beq $v1, $zero, .L80B18ED4 -/* 00430 80B18EB0 AFA30050 */ sw $v1, 0x0050($sp) -/* 00434 80B18EB4 1061002E */ beq $v1, $at, .L80B18F70 +/* 0042C 80B18EAC 10600009 */ beq $v1, $zero, .L80B18ED4 +/* 00430 80B18EB0 AFA30050 */ sw $v1, 0x0050($sp) +/* 00434 80B18EB4 1061002E */ beq $v1, $at, .L80B18F70 /* 00438 80B18EB8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0043C 80B18EBC 10610082 */ beq $v1, $at, .L80B190C8 +/* 0043C 80B18EBC 10610082 */ beq $v1, $at, .L80B190C8 /* 00440 80B18EC0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00444 80B18EC4 5061008E */ beql $v1, $at, .L80B19100 +/* 00444 80B18EC4 5061008E */ beql $v1, $at, .L80B19100 /* 00448 80B18EC8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 0044C 80B18ECC 10000096 */ beq $zero, $zero, .L80B19128 -/* 00450 80B18ED0 8FB90050 */ lw $t9, 0x0050($sp) +/* 0044C 80B18ECC 10000096 */ beq $zero, $zero, .L80B19128 +/* 00450 80B18ED0 8FB90050 */ lw $t9, 0x0050($sp) .L80B18ED4: /* 00454 80B18ED4 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 00458 80B18ED8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0045C 80B18EDC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00460 80B18EE0 15E10004 */ bne $t7, $at, .L80B18EF4 +/* 00460 80B18EE0 15E10004 */ bne $t7, $at, .L80B18EF4 /* 00464 80B18EE4 A60E02E0 */ sh $t6, 0x02E0($s0) ## 000002E0 /* 00468 80B18EE8 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 /* 0046C 80B18EEC 33190020 */ andi $t9, $t8, 0x0020 ## $t9 = 00000000 -/* 00470 80B18EF0 1720000D */ bne $t9, $zero, .L80B18F28 +/* 00470 80B18EF0 1720000D */ bne $t9, $zero, .L80B18F28 .L80B18EF4: /* 00474 80B18EF4 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 /* 00478 80B18EF8 44812000 */ mtc1 $at, $f4 ## $f4 = -32000.00 /* 0047C 80B18EFC C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 /* 00480 80B18F00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00484 80B18F04 4600203C */ c.lt.s $f4, $f0 +/* 00484 80B18F04 4600203C */ c.lt.s $f4, $f0 /* 00488 80B18F08 00000000 */ nop -/* 0048C 80B18F0C 45000002 */ bc1f .L80B18F18 +/* 0048C 80B18F0C 45000002 */ bc1f .L80B18F18 /* 00490 80B18F10 00000000 */ nop /* 00494 80B18F14 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 .L80B18F18: /* 00498 80B18F18 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0049C 80B18F1C 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C -/* 004A0 80B18F20 10000009 */ beq $zero, $zero, .L80B18F48 +/* 004A0 80B18F20 10000009 */ beq $zero, $zero, .L80B18F48 /* 004A4 80B18F24 3C014100 */ lui $at, 0x4100 ## $at = 41000000 .L80B18F28: /* 004A8 80B18F28 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 004AC 80B18F2C C6080084 */ lwc1 $f8, 0x0084($s0) ## 00000084 /* 004B0 80B18F30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004B4 80B18F34 2405388E */ addiu $a1, $zero, 0x388E ## $a1 = 0000388E -/* 004B8 80B18F38 46083280 */ add.s $f10, $f6, $f8 +/* 004B8 80B18F38 46083280 */ add.s $f10, $f6, $f8 /* 004BC 80B18F3C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 004C0 80B18F40 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 004C4 80B18F44 3C014100 */ lui $at, 0x4100 ## $at = 41000000 .L80B18F48: @@ -66,7 +66,7 @@ glabel func_80B18E7C /* 004DC 80B18F5C 860302E0 */ lh $v1, 0x02E0($s0) ## 000002E0 /* 004E0 80B18F60 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 /* 004E4 80B18F64 E612006C */ swc1 $f18, 0x006C($s0) ## 0000006C -/* 004E8 80B18F68 1000006E */ beq $zero, $zero, .L80B19124 +/* 004E8 80B18F68 1000006E */ beq $zero, $zero, .L80B19124 /* 004EC 80B18F6C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 .L80B18F70: /* 004F0 80B18F70 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 @@ -74,31 +74,31 @@ glabel func_80B18E7C /* 004F8 80B18F78 3C010100 */ lui $at, 0x0100 ## $at = 01000000 /* 004FC 80B18F7C 01014825 */ or $t1, $t0, $at ## $t1 = 01000000 /* 00500 80B18F80 306A0003 */ andi $t2, $v1, 0x0003 ## $t2 = 00000000 -/* 00504 80B18F84 15400008 */ bne $t2, $zero, .L80B18FA8 +/* 00504 80B18F84 15400008 */ bne $t2, $zero, .L80B18FA8 /* 00508 80B18F88 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 /* 0050C 80B18F8C 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 00510 80B18F90 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00514 80B18F94 306C0020 */ andi $t4, $v1, 0x0020 ## $t4 = 00000000 -/* 00518 80B18F98 15610049 */ bne $t3, $at, .L80B190C0 +/* 00518 80B18F98 15610049 */ bne $t3, $at, .L80B190C0 /* 0051C 80B18F9C 00000000 */ nop -/* 00520 80B18FA0 11800047 */ beq $t4, $zero, .L80B190C0 +/* 00520 80B18FA0 11800047 */ beq $t4, $zero, .L80B190C0 /* 00524 80B18FA4 00000000 */ nop .L80B18FA8: /* 00528 80B18FA8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 0052C 80B18FAC C6080060 */ lwc1 $f8, 0x0060($s0) ## 00000060 -/* 00530 80B18FB0 4606403E */ c.le.s $f8, $f6 +/* 00530 80B18FB0 4606403E */ c.le.s $f8, $f6 /* 00534 80B18FB4 00000000 */ nop -/* 00538 80B18FB8 45000041 */ bc1f .L80B190C0 +/* 00538 80B18FB8 45000041 */ bc1f .L80B190C0 /* 0053C 80B18FBC 00000000 */ nop /* 00540 80B18FC0 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00544 80B18FC4 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 00548 80B18FC8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0054C 80B18FCC 15C10006 */ bne $t6, $at, .L80B18FE8 +/* 0054C 80B18FCC 15C10006 */ bne $t6, $at, .L80B18FE8 /* 00550 80B18FD0 A60D02E0 */ sh $t5, 0x02E0($s0) ## 000002E0 /* 00554 80B18FD4 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 /* 00558 80B18FD8 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 0055C 80B18FDC 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 -/* 00560 80B18FE0 5700000F */ bnel $t8, $zero, .L80B19020 +/* 00560 80B18FE0 5700000F */ bnel $t8, $zero, .L80B19020 /* 00564 80B18FE4 C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 .L80B18FE8: /* 00568 80B18FE8 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 @@ -106,22 +106,22 @@ glabel func_80B18E7C /* 00570 80B18FF0 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 /* 00574 80B18FF4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 00578 80B18FF8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 0057C 80B18FFC 4600503C */ c.lt.s $f10, $f0 +/* 0057C 80B18FFC 4600503C */ c.lt.s $f10, $f0 /* 00580 80B19000 00000000 */ nop -/* 00584 80B19004 45020003 */ bc1fl .L80B19014 +/* 00584 80B19004 45020003 */ bc1fl .L80B19014 /* 00588 80B19008 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 /* 0058C 80B1900C E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 /* 00590 80B19010 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 .L80B19014: -/* 00594 80B19014 10000028 */ beq $zero, $zero, .L80B190B8 +/* 00594 80B19014 10000028 */ beq $zero, $zero, .L80B190B8 /* 00598 80B19018 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 /* 0059C 80B1901C C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 .L80B19020: /* 005A0 80B19020 44814000 */ mtc1 $at, $f8 ## $f8 = -32000.00 /* 005A4 80B19024 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 005A8 80B19028 4608303C */ c.lt.s $f6, $f8 +/* 005A8 80B19028 4608303C */ c.lt.s $f6, $f8 /* 005AC 80B1902C E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 005B0 80B19030 4502001E */ bc1fl .L80B190AC +/* 005B0 80B19030 4502001E */ bc1fl .L80B190AC /* 005B4 80B19034 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 005B8 80B19038 8E080024 */ lw $t0, 0x0024($s0) ## 00000024 /* 005BC 80B1903C 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFEC @@ -134,22 +134,22 @@ glabel func_80B18E7C /* 005D8 80B19058 8E08002C */ lw $t0, 0x002C($s0) ## 0000002C /* 005DC 80B1905C 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 005E0 80B19060 ACA80008 */ sw $t0, 0x0008($a1) ## FFFFFFF4 -/* 005E4 80B19064 C7AA0048 */ lwc1 $f10, 0x0048($sp) +/* 005E4 80B19064 C7AA0048 */ lwc1 $f10, 0x0048($sp) /* 005E8 80B19068 C6100084 */ lwc1 $f16, 0x0084($s0) ## 00000084 -/* 005EC 80B1906C 46105480 */ add.s $f18, $f10, $f16 -/* 005F0 80B19070 E7B20048 */ swc1 $f18, 0x0048($sp) +/* 005EC 80B1906C 46105480 */ add.s $f18, $f10, $f16 +/* 005F0 80B19070 E7B20048 */ swc1 $f18, 0x0048($sp) /* 005F4 80B19074 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 /* 005F8 80B19078 860902E0 */ lh $t1, 0x02E0($s0) ## 000002E0 -/* 005FC 80B1907C 46062202 */ mul.s $f8, $f4, $f6 +/* 005FC 80B1907C 46062202 */ mul.s $f8, $f4, $f6 /* 00600 80B19080 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 01000001 /* 00604 80B19084 A60A02E0 */ sh $t2, 0x02E0($s0) ## 000002E0 /* 00608 80B19088 860B02E0 */ lh $t3, 0x02E0($s0) ## 000002E0 /* 0060C 80B1908C E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 00610 80B19090 AFA00010 */ sw $zero, 0x0010($sp) -/* 00614 80B19094 8FA4005C */ lw $a0, 0x005C($sp) -/* 00618 80B19098 0C00A511 */ jal func_80029444 -/* 0061C 80B1909C AFAB0050 */ sw $t3, 0x0050($sp) -/* 00620 80B190A0 10000006 */ beq $zero, $zero, .L80B190BC +/* 00610 80B19090 AFA00010 */ sw $zero, 0x0010($sp) +/* 00614 80B19094 8FA4005C */ lw $a0, 0x005C($sp) +/* 00618 80B19098 0C00A511 */ jal func_80029444 +/* 0061C 80B1909C AFAB0050 */ sw $t3, 0x0050($sp) +/* 00620 80B190A0 10000006 */ beq $zero, $zero, .L80B190BC /* 00624 80B190A4 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 /* 00628 80B190A8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 .L80B190AC: @@ -161,67 +161,67 @@ glabel func_80B18E7C .L80B190BC: /* 0063C 80B190BC A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 .L80B190C0: -/* 00640 80B190C0 10000018 */ beq $zero, $zero, .L80B19124 +/* 00640 80B190C0 10000018 */ beq $zero, $zero, .L80B19124 /* 00644 80B190C4 860302E0 */ lh $v1, 0x02E0($s0) ## 000002E0 .L80B190C8: /* 00648 80B190C8 920202E2 */ lbu $v0, 0x02E2($s0) ## 000002E2 -/* 0064C 80B190CC 10400007 */ beq $v0, $zero, .L80B190EC +/* 0064C 80B190CC 10400007 */ beq $v0, $zero, .L80B190EC /* 00650 80B190D0 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF /* 00654 80B190D4 920E02F8 */ lbu $t6, 0x02F8($s0) ## 000002F8 /* 00658 80B190D8 A20D02E2 */ sb $t5, 0x02E2($s0) ## 000002E2 /* 0065C 80B190DC A60002E0 */ sh $zero, 0x02E0($s0) ## 000002E0 /* 00660 80B190E0 31CFFFFD */ andi $t7, $t6, 0xFFFD ## $t7 = 00000000 -/* 00664 80B190E4 10000003 */ beq $zero, $zero, .L80B190F4 +/* 00664 80B190E4 10000003 */ beq $zero, $zero, .L80B190F4 /* 00668 80B190E8 A20F02F8 */ sb $t7, 0x02F8($s0) ## 000002F8 .L80B190EC: -/* 0066C 80B190EC 0C2C6549 */ jal func_80B19524 +/* 0066C 80B190EC 0C2C6549 */ jal func_80B19524 /* 00670 80B190F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B190F4: -/* 00674 80B190F4 1000000B */ beq $zero, $zero, .L80B19124 +/* 00674 80B190F4 1000000B */ beq $zero, $zero, .L80B19124 /* 00678 80B190F8 860302E0 */ lh $v1, 0x02E0($s0) ## 000002E0 /* 0067C 80B190FC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 .L80B19100: /* 00680 80B19100 C6040084 */ lwc1 $f4, 0x0084($s0) ## 00000084 /* 00684 80B19104 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00688 80B19108 46049032 */ c.eq.s $f18, $f4 +/* 00688 80B19108 46049032 */ c.eq.s $f18, $f4 /* 0068C 80B1910C 00000000 */ nop -/* 00690 80B19110 45020005 */ bc1fl .L80B19128 -/* 00694 80B19114 8FB90050 */ lw $t9, 0x0050($sp) +/* 00690 80B19110 45020005 */ bc1fl .L80B19128 +/* 00694 80B19114 8FB90050 */ lw $t9, 0x0050($sp) /* 00698 80B19118 A61802E0 */ sh $t8, 0x02E0($s0) ## 000002E0 /* 0069C 80B1911C 860302E0 */ lh $v1, 0x02E0($s0) ## 000002E0 -/* 006A0 80B19120 AFA30050 */ sw $v1, 0x0050($sp) +/* 006A0 80B19120 AFA30050 */ sw $v1, 0x0050($sp) .L80B19124: -/* 006A4 80B19124 8FB90050 */ lw $t9, 0x0050($sp) +/* 006A4 80B19124 8FB90050 */ lw $t9, 0x0050($sp) .L80B19128: -/* 006A8 80B19128 8FA40038 */ lw $a0, 0x0038($sp) -/* 006AC 80B1912C 00034080 */ sll $t0, $v1, 2 -/* 006B0 80B19130 13230004 */ beq $t9, $v1, .L80B19144 +/* 006A8 80B19128 8FA40038 */ lw $a0, 0x0038($sp) +/* 006AC 80B1912C 00034080 */ sll $t0, $v1, 2 +/* 006B0 80B19130 13230004 */ beq $t9, $v1, .L80B19144 /* 006B4 80B19134 3C0580B2 */ lui $a1, %hi(D_80B1B634) ## $a1 = 80B20000 -/* 006B8 80B19138 00A82821 */ addu $a1, $a1, $t0 -/* 006BC 80B1913C 0C02947A */ jal func_800A51E8 -/* 006C0 80B19140 8CA5B634 */ lw $a1, %lo(D_80B1B634)($a1) +/* 006B8 80B19138 00A82821 */ addu $a1, $a1, $t0 +/* 006BC 80B1913C 0C02947A */ jal func_800A51E8 +/* 006C0 80B19140 8CA5B634 */ lw $a1, %lo(D_80B1B634)($a1) .L80B19144: /* 006C4 80B19144 860202E0 */ lh $v0, 0x02E0($s0) ## 000002E0 .L80B19148: /* 006C8 80B19148 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 006CC 80B1914C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 006D0 80B19150 1040000B */ beq $v0, $zero, .L80B19180 +/* 006D0 80B19150 1040000B */ beq $v0, $zero, .L80B19180 /* 006D4 80B19154 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 006D8 80B19158 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 006DC 80B1915C 1041002D */ beq $v0, $at, .L80B19214 +/* 006DC 80B1915C 1041002D */ beq $v0, $at, .L80B19214 /* 006E0 80B19160 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 006E4 80B19164 1041006F */ beq $v0, $at, .L80B19324 +/* 006E4 80B19164 1041006F */ beq $v0, $at, .L80B19324 /* 006E8 80B19168 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 006EC 80B1916C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 006F0 80B19170 10410073 */ beq $v0, $at, .L80B19340 +/* 006F0 80B19170 10410073 */ beq $v0, $at, .L80B19340 /* 006F4 80B19174 26040060 */ addiu $a0, $s0, 0x0060 ## $a0 = 00000060 -/* 006F8 80B19178 1000008A */ beq $zero, $zero, .L80B193A4 +/* 006F8 80B19178 1000008A */ beq $zero, $zero, .L80B193A4 /* 006FC 80B1917C 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 .L80B19180: /* 00700 80B19180 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00704 80B19184 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00708 80B19188 AFA00010 */ sw $zero, 0x0010($sp) + +/* 00708 80B19188 AFA00010 */ sw $zero, 0x0010($sp) /* 0070C 80B1918C 86090032 */ lh $t1, 0x0032($s0) ## 00000032 /* 00710 80B19190 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 00714 80B19194 44813000 */ mtc1 $at, $f6 ## $f6 = 300.00 @@ -229,256 +229,256 @@ glabel func_80B18E7C /* 0071C 80B1919C A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 /* 00720 80B191A0 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 /* 00724 80B191A4 860A008A */ lh $t2, 0x008A($s0) ## 0000008A -/* 00728 80B191A8 4608303C */ c.lt.s $f6, $f8 +/* 00728 80B191A8 4608303C */ c.lt.s $f6, $f8 /* 0072C 80B191AC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00730 80B191B0 014B1823 */ subu $v1, $t2, $t3 -/* 00734 80B191B4 00031C00 */ sll $v1, $v1, 16 -/* 00738 80B191B8 4500000B */ bc1f .L80B191E8 -/* 0073C 80B191BC 00031C03 */ sra $v1, $v1, 16 +/* 00730 80B191B0 014B1823 */ subu $v1, $t2, $t3 +/* 00734 80B191B4 00031C00 */ sll $v1, $v1, 16 +/* 00738 80B191B8 4500000B */ bc1f .L80B191E8 +/* 0073C 80B191BC 00031C03 */ sra $v1, $v1, 16 /* 00740 80B191C0 44815000 */ mtc1 $at, $f10 ## $f10 = 80.00 /* 00744 80B191C4 C6100094 */ lwc1 $f16, 0x0094($s0) ## 00000094 -/* 00748 80B191C8 4610503C */ c.lt.s $f10, $f16 +/* 00748 80B191C8 4610503C */ c.lt.s $f10, $f16 /* 0074C 80B191CC 00000000 */ nop -/* 00750 80B191D0 45000005 */ bc1f .L80B191E8 +/* 00750 80B191D0 45000005 */ bc1f .L80B191E8 /* 00754 80B191D4 00000000 */ nop -/* 00758 80B191D8 0C2C6317 */ jal func_80B18C5C +/* 00758 80B191D8 0C2C6317 */ jal func_80B18C5C /* 0075C 80B191DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00760 80B191E0 1000000A */ beq $zero, $zero, .L80B1920C +/* 00760 80B191E0 1000000A */ beq $zero, $zero, .L80B1920C /* 00764 80B191E4 00000000 */ nop .L80B191E8: -/* 00768 80B191E8 04600003 */ bltz $v1, .L80B191F8 -/* 0076C 80B191EC 00031023 */ subu $v0, $zero, $v1 -/* 00770 80B191F0 10000001 */ beq $zero, $zero, .L80B191F8 +/* 00768 80B191E8 04600003 */ bltz $v1, .L80B191F8 +/* 0076C 80B191EC 00031023 */ subu $v0, $zero, $v1 +/* 00770 80B191F0 10000001 */ beq $zero, $zero, .L80B191F8 /* 00774 80B191F4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80B191F8: -/* 00778 80B191F8 28412328 */ slti $at, $v0, 0x2328 -/* 0077C 80B191FC 14200003 */ bne $at, $zero, .L80B1920C +/* 00778 80B191F8 28412328 */ slti $at, $v0, 0x2328 +/* 0077C 80B191FC 14200003 */ bne $at, $zero, .L80B1920C /* 00780 80B19200 00000000 */ nop -/* 00784 80B19204 0C2C6549 */ jal func_80B19524 +/* 00784 80B19204 0C2C6549 */ jal func_80B19524 /* 00788 80B19208 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B1920C: -/* 0078C 80B1920C 10000065 */ beq $zero, $zero, .L80B193A4 +/* 0078C 80B1920C 10000065 */ beq $zero, $zero, .L80B193A4 /* 00790 80B19210 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 .L80B19214: /* 00794 80B19214 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00798 80B19218 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 0079C 80B1921C C6120060 */ lwc1 $f18, 0x0060($s0) ## 00000060 -/* 007A0 80B19220 4612203E */ c.le.s $f4, $f18 +/* 007A0 80B19220 4612203E */ c.le.s $f4, $f18 /* 007A4 80B19224 00000000 */ nop -/* 007A8 80B19228 45020012 */ bc1fl .L80B19274 +/* 007A8 80B19228 45020012 */ bc1fl .L80B19274 /* 007AC 80B1922C 920202F8 */ lbu $v0, 0x02F8($s0) ## 000002F8 /* 007B0 80B19230 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 007B4 80B19234 8FA4005C */ lw $a0, 0x005C($sp) +/* 007B4 80B19234 8FA4005C */ lw $a0, 0x005C($sp) /* 007B8 80B19238 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 007BC 80B1923C 51A0000D */ beql $t5, $zero, .L80B19274 +/* 007BC 80B1923C 51A0000D */ beql $t5, $zero, .L80B19274 /* 007C0 80B19240 920202F8 */ lbu $v0, 0x02F8($s0) ## 000002F8 -/* 007C4 80B19244 0C00D56E */ jal func_800355B8 +/* 007C4 80B19244 0C00D56E */ jal func_800355B8 /* 007C8 80B19248 26050348 */ addiu $a1, $s0, 0x0348 ## $a1 = 00000348 -/* 007CC 80B1924C 8FA4005C */ lw $a0, 0x005C($sp) -/* 007D0 80B19250 0C00D56E */ jal func_800355B8 +/* 007CC 80B1924C 8FA4005C */ lw $a0, 0x005C($sp) +/* 007D0 80B19250 0C00D56E */ jal func_800355B8 /* 007D4 80B19254 26050354 */ addiu $a1, $s0, 0x0354 ## $a1 = 00000354 -/* 007D8 80B19258 8FA4005C */ lw $a0, 0x005C($sp) -/* 007DC 80B1925C 0C00D56E */ jal func_800355B8 +/* 007D8 80B19258 8FA4005C */ lw $a0, 0x005C($sp) +/* 007DC 80B1925C 0C00D56E */ jal func_800355B8 /* 007E0 80B19260 26050360 */ addiu $a1, $s0, 0x0360 ## $a1 = 00000360 -/* 007E4 80B19264 8FA4005C */ lw $a0, 0x005C($sp) -/* 007E8 80B19268 0C00D56E */ jal func_800355B8 +/* 007E4 80B19264 8FA4005C */ lw $a0, 0x005C($sp) +/* 007E8 80B19268 0C00D56E */ jal func_800355B8 /* 007EC 80B1926C 2605036C */ addiu $a1, $s0, 0x036C ## $a1 = 0000036C /* 007F0 80B19270 920202F8 */ lbu $v0, 0x02F8($s0) ## 000002F8 .L80B19274: -/* 007F4 80B19274 8FB9005C */ lw $t9, 0x005C($sp) +/* 007F4 80B19274 8FB9005C */ lw $t9, 0x005C($sp) /* 007F8 80B19278 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007FC 80B1927C 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 00800 80B19280 15C0000C */ bne $t6, $zero, .L80B192B4 +/* 00800 80B19280 15C0000C */ bne $t6, $zero, .L80B192B4 /* 00804 80B19284 3048FFFD */ andi $t0, $v0, 0xFFFD ## $t0 = 00000000 /* 00808 80B19288 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 0080C 80B1928C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00810 80B19290 8FA4005C */ lw $a0, 0x005C($sp) +/* 00810 80B19290 8FA4005C */ lw $a0, 0x005C($sp) /* 00814 80B19294 31F80040 */ andi $t8, $t7, 0x0040 ## $t8 = 00000000 -/* 00818 80B19298 13000006 */ beq $t8, $zero, .L80B192B4 +/* 00818 80B19298 13000006 */ beq $t8, $zero, .L80B192B4 /* 0081C 80B1929C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00820 80B192A0 00812821 */ addu $a1, $a0, $at +/* 00820 80B192A0 00812821 */ addu $a1, $a0, $at /* 00824 80B192A4 0C0175E7 */ jal Actor_CollisionCheck_SetAT ## CollisionCheck_setAT /* 00828 80B192A8 260602E8 */ addiu $a2, $s0, 0x02E8 ## $a2 = 000002E8 -/* 0082C 80B192AC 1000001B */ beq $zero, $zero, .L80B1931C +/* 0082C 80B192AC 1000001B */ beq $zero, $zero, .L80B1931C /* 00830 80B192B0 00000000 */ nop .L80B192B4: /* 00834 80B192B4 8F271C44 */ lw $a3, 0x1C44($t9) ## 00001C44 /* 00838 80B192B8 A20802F8 */ sb $t0, 0x02F8($s0) ## 000002F8 -/* 0083C 80B192BC 8FA40038 */ lw $a0, 0x0038($sp) +/* 0083C 80B192BC 8FA40038 */ lw $a0, 0x0038($sp) /* 00840 80B192C0 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 000012E4 /* 00844 80B192C4 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 00848 80B192C8 0C0294D3 */ jal func_800A534C -/* 0084C 80B192CC AFA70040 */ sw $a3, 0x0040($sp) -/* 00850 80B192D0 8FA70040 */ lw $a3, 0x0040($sp) +/* 00848 80B192C8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0084C 80B192CC AFA70040 */ sw $a3, 0x0040($sp) +/* 00850 80B192D0 8FA70040 */ lw $a3, 0x0040($sp) /* 00854 80B192D4 8E0A02EC */ lw $t2, 0x02EC($s0) ## 000002EC /* 00858 80B192D8 8609008A */ lh $t1, 0x008A($s0) ## 0000008A /* 0085C 80B192DC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 00860 80B192E0 44819000 */ mtc1 $at, $f18 ## $f18 = -6.00 /* 00864 80B192E4 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -/* 00868 80B192E8 14EA0008 */ bne $a3, $t2, .L80B1930C +/* 00868 80B192E8 14EA0008 */ bne $a3, $t2, .L80B1930C /* 0086C 80B192EC E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 /* 00870 80B192F0 920B02F8 */ lbu $t3, 0x02F8($s0) ## 000002F8 /* 00874 80B192F4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00878 80B192F8 316C0004 */ andi $t4, $t3, 0x0004 ## $t4 = 00000000 -/* 0087C 80B192FC 15800003 */ bne $t4, $zero, .L80B1930C +/* 0087C 80B192FC 15800003 */ bne $t4, $zero, .L80B1930C /* 00880 80B19300 00000000 */ nop /* 00884 80B19304 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00888 80B19308 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E .L80B1930C: /* 0088C 80B1930C 3C0580B2 */ lui $a1, %hi(func_80B19E94) ## $a1 = 80B20000 /* 00890 80B19310 24A59E94 */ addiu $a1, $a1, %lo(func_80B19E94) ## $a1 = 80B19E94 -/* 00894 80B19314 0C2C62A0 */ jal func_80B18A80 +/* 00894 80B19314 0C2C62A0 */ jal func_80B18A80 /* 00898 80B19318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B1931C: -/* 0089C 80B1931C 10000021 */ beq $zero, $zero, .L80B193A4 +/* 0089C 80B1931C 10000021 */ beq $zero, $zero, .L80B193A4 /* 008A0 80B19320 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 .L80B19324: /* 008A4 80B19324 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 008A8 80B19328 AFA00010 */ sw $zero, 0x0010($sp) +/* 008A8 80B19328 AFA00010 */ sw $zero, 0x0010($sp) /* 008AC 80B1932C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 008B0 80B19330 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 008B4 80B19334 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC -/* 008B8 80B19338 1000001A */ beq $zero, $zero, .L80B193A4 +/* 008B8 80B19338 1000001A */ beq $zero, $zero, .L80B193A4 /* 008BC 80B1933C 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 .L80B19340: /* 008C0 80B19340 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008C4 80B19344 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008C8 80B19348 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 008CC 80B1934C 44050000 */ mfc1 $a1, $f0 +/* 008CC 80B1934C 44050000 */ mfc1 $a1, $f0 /* 008D0 80B19350 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 008D4 80B19354 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 008D4 80B19354 E7A00010 */ swc1 $f0, 0x0010($sp) /* 008D8 80B19358 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008DC 80B1935C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 008E0 80B19360 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008E4 80B19364 44050000 */ mfc1 $a1, $f0 +/* 008E4 80B19364 44050000 */ mfc1 $a1, $f0 /* 008E8 80B19368 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 008EC 80B1936C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 008F0 80B19370 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 008F0 80B19370 E7A00010 */ swc1 $f0, 0x0010($sp) /* 008F4 80B19374 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 008F8 80B19378 C60A0084 */ lwc1 $f10, 0x0084($s0) ## 00000084 /* 008FC 80B1937C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00900 80B19380 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 00904 80B19384 460A4400 */ add.s $f16, $f8, $f10 +/* 00904 80B19384 460A4400 */ add.s $f16, $f8, $f10 /* 00908 80B19388 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0090C 80B1938C 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 00910 80B19390 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00914 80B19394 44058000 */ mfc1 $a1, $f16 +/* 00910 80B19390 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00914 80B19394 44058000 */ mfc1 $a1, $f16 /* 00918 80B19398 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 0091C 80B1939C 00000000 */ nop /* 00920 80B193A0 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 .L80B193A4: /* 00924 80B193A4 306D0002 */ andi $t5, $v1, 0x0002 ## $t5 = 00000000 -/* 00928 80B193A8 11A00035 */ beq $t5, $zero, .L80B19480 +/* 00928 80B193A8 11A00035 */ beq $t5, $zero, .L80B19480 /* 0092C 80B193AC 306E0020 */ andi $t6, $v1, 0x0020 ## $t6 = 00000000 -/* 00930 80B193B0 15C00033 */ bne $t6, $zero, .L80B19480 -/* 00934 80B193B4 8FA4005C */ lw $a0, 0x005C($sp) +/* 00930 80B193B0 15C00033 */ bne $t6, $zero, .L80B19480 +/* 00934 80B193B4 8FA4005C */ lw $a0, 0x005C($sp) /* 00938 80B193B8 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 /* 0093C 80B193BC 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F /* 00940 80B193C0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00944 80B193C4 26080354 */ addiu $t0, $s0, 0x0354 ## $t0 = 00000354 /* 00948 80B193C8 26090360 */ addiu $t1, $s0, 0x0360 ## $t1 = 00000360 /* 0094C 80B193CC 260A036C */ addiu $t2, $s0, 0x036C ## $t2 = 0000036C -/* 00950 80B193D0 AFAA0030 */ sw $t2, 0x0030($sp) -/* 00954 80B193D4 AFA90034 */ sw $t1, 0x0034($sp) -/* 00958 80B193D8 AFA80038 */ sw $t0, 0x0038($sp) -/* 0095C 80B193DC AFB90018 */ sw $t9, 0x0018($sp) -/* 00960 80B193E0 AFB80014 */ sw $t8, 0x0014($sp) -/* 00964 80B193E4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00950 80B193D0 AFAA0030 */ sw $t2, 0x0030($sp) +/* 00954 80B193D4 AFA90034 */ sw $t1, 0x0034($sp) +/* 00958 80B193D8 AFA80038 */ sw $t0, 0x0038($sp) +/* 0095C 80B193DC AFB90018 */ sw $t9, 0x0018($sp) +/* 00960 80B193E0 AFB80014 */ sw $t8, 0x0014($sp) +/* 00964 80B193E4 AFAF0010 */ sw $t7, 0x0010($sp) /* 00968 80B193E8 26050348 */ addiu $a1, $s0, 0x0348 ## $a1 = 00000348 /* 0096C 80B193EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00970 80B193F0 0C00CD20 */ jal func_80033480 +/* 00970 80B193F0 0C00CD20 */ jal func_80033480 /* 00974 80B193F4 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 00978 80B193F8 240B0050 */ addiu $t3, $zero, 0x0050 ## $t3 = 00000050 /* 0097C 80B193FC 240C000F */ addiu $t4, $zero, 0x000F ## $t4 = 0000000F /* 00980 80B19400 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00984 80B19404 AFAD0018 */ sw $t5, 0x0018($sp) -/* 00988 80B19408 AFAC0014 */ sw $t4, 0x0014($sp) -/* 0098C 80B1940C AFAB0010 */ sw $t3, 0x0010($sp) -/* 00990 80B19410 8FA4005C */ lw $a0, 0x005C($sp) -/* 00994 80B19414 8FA50038 */ lw $a1, 0x0038($sp) +/* 00984 80B19404 AFAD0018 */ sw $t5, 0x0018($sp) +/* 00988 80B19408 AFAC0014 */ sw $t4, 0x0014($sp) +/* 0098C 80B1940C AFAB0010 */ sw $t3, 0x0010($sp) +/* 00990 80B19410 8FA4005C */ lw $a0, 0x005C($sp) +/* 00994 80B19414 8FA50038 */ lw $a1, 0x0038($sp) /* 00998 80B19418 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0099C 80B1941C 0C00CD20 */ jal func_80033480 +/* 0099C 80B1941C 0C00CD20 */ jal func_80033480 /* 009A0 80B19420 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 009A4 80B19424 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 /* 009A8 80B19428 240F000F */ addiu $t7, $zero, 0x000F ## $t7 = 0000000F /* 009AC 80B1942C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 009B0 80B19430 AFB80018 */ sw $t8, 0x0018($sp) -/* 009B4 80B19434 AFAF0014 */ sw $t7, 0x0014($sp) -/* 009B8 80B19438 AFAE0010 */ sw $t6, 0x0010($sp) -/* 009BC 80B1943C 8FA4005C */ lw $a0, 0x005C($sp) -/* 009C0 80B19440 8FA50034 */ lw $a1, 0x0034($sp) +/* 009B0 80B19430 AFB80018 */ sw $t8, 0x0018($sp) +/* 009B4 80B19434 AFAF0014 */ sw $t7, 0x0014($sp) +/* 009B8 80B19438 AFAE0010 */ sw $t6, 0x0010($sp) +/* 009BC 80B1943C 8FA4005C */ lw $a0, 0x005C($sp) +/* 009C0 80B19440 8FA50034 */ lw $a1, 0x0034($sp) /* 009C4 80B19444 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 009C8 80B19448 0C00CD20 */ jal func_80033480 +/* 009C8 80B19448 0C00CD20 */ jal func_80033480 /* 009CC 80B1944C 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 009D0 80B19450 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 /* 009D4 80B19454 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F /* 009D8 80B19458 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 009DC 80B1945C AFA90018 */ sw $t1, 0x0018($sp) -/* 009E0 80B19460 AFA80014 */ sw $t0, 0x0014($sp) -/* 009E4 80B19464 AFB90010 */ sw $t9, 0x0010($sp) -/* 009E8 80B19468 8FA4005C */ lw $a0, 0x005C($sp) -/* 009EC 80B1946C 8FA50030 */ lw $a1, 0x0030($sp) +/* 009DC 80B1945C AFA90018 */ sw $t1, 0x0018($sp) +/* 009E0 80B19460 AFA80014 */ sw $t0, 0x0014($sp) +/* 009E4 80B19464 AFB90010 */ sw $t9, 0x0010($sp) +/* 009E8 80B19468 8FA4005C */ lw $a0, 0x005C($sp) +/* 009EC 80B1946C 8FA50030 */ lw $a1, 0x0030($sp) /* 009F0 80B19470 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 009F4 80B19474 0C00CD20 */ jal func_80033480 +/* 009F4 80B19474 0C00CD20 */ jal func_80033480 /* 009F8 80B19478 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 009FC 80B1947C 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 .L80B19480: /* 00A00 80B19480 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 00A04 80B19484 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00A08 80B19488 306B0040 */ andi $t3, $v1, 0x0040 ## $t3 = 00000000 -/* 00A0C 80B1948C 1541001A */ bne $t2, $at, .L80B194F8 +/* 00A0C 80B1948C 1541001A */ bne $t2, $at, .L80B194F8 /* 00A10 80B19490 30780002 */ andi $t8, $v1, 0x0002 ## $t8 = 00000000 -/* 00A14 80B19494 11600012 */ beq $t3, $zero, .L80B194E0 +/* 00A14 80B19494 11600012 */ beq $t3, $zero, .L80B194E0 /* 00A18 80B19498 306F0002 */ andi $t7, $v1, 0x0002 ## $t7 = 00000000 /* 00A1C 80B1949C 860C02E0 */ lh $t4, 0x02E0($s0) ## 000002E0 /* 00A20 80B194A0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00A24 80B194A4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00A28 80B194A8 15810006 */ bne $t4, $at, .L80B194C4 +/* 00A28 80B194A8 15810006 */ bne $t4, $at, .L80B194C4 /* 00A2C 80B194AC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 00A30 80B194B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A34 80B194B4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A38 80B194B8 2405388A */ addiu $a1, $zero, 0x388A ## $a1 = 0000388A -/* 00A3C 80B194BC 10000005 */ beq $zero, $zero, .L80B194D4 +/* 00A3C 80B194BC 10000005 */ beq $zero, $zero, .L80B194D4 /* 00A40 80B194C0 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 .L80B194C4: /* 00A44 80B194C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A48 80B194C8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A4C 80B194CC 2405388F */ addiu $a1, $zero, 0x388F ## $a1 = 0000388F /* 00A50 80B194D0 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 .L80B194D4: /* 00A54 80B194D4 31AEFFBF */ andi $t6, $t5, 0xFFBF ## $t6 = 00000000 -/* 00A58 80B194D8 1000000D */ beq $zero, $zero, .L80B19510 +/* 00A58 80B194D8 1000000D */ beq $zero, $zero, .L80B19510 /* 00A5C 80B194DC A60E0088 */ sh $t6, 0x0088($s0) ## 00000088 .L80B194E0: -/* 00A60 80B194E0 11E0000B */ beq $t7, $zero, .L80B19510 +/* 00A60 80B194E0 11E0000B */ beq $t7, $zero, .L80B19510 /* 00A64 80B194E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A68 80B194E8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A6C 80B194EC 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B -/* 00A70 80B194F0 10000008 */ beq $zero, $zero, .L80B19514 -/* 00A74 80B194F4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A70 80B194F0 10000008 */ beq $zero, $zero, .L80B19514 +/* 00A74 80B194F4 8FBF002C */ lw $ra, 0x002C($sp) .L80B194F8: -/* 00A78 80B194F8 13000005 */ beq $t8, $zero, .L80B19510 +/* 00A78 80B194F8 13000005 */ beq $t8, $zero, .L80B19510 /* 00A7C 80B194FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A80 80B19500 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00A84 80B19504 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B /* 00A88 80B19508 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A8C 80B1950C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 .L80B19510: -/* 00A90 80B19510 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A90 80B19510 8FBF002C */ lw $ra, 0x002C($sp) .L80B19514: -/* 00A94 80B19514 8FB00028 */ lw $s0, 0x0028($sp) +/* 00A94 80B19514 8FB00028 */ lw $s0, 0x0028($sp) /* 00A98 80B19518 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00A9C 80B1951C 03E00008 */ jr $ra +/* 00A9C 80B1951C 03E00008 */ jr $ra /* 00AA0 80B19520 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s index 8196567032..e5d0a5ef10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s @@ -1,44 +1,44 @@ glabel func_80B19524 /* 00AA4 80B19524 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AA8 80B19528 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00AA8 80B19528 AFBF0014 */ sw $ra, 0x0014($sp) /* 00AAC 80B1952C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00AB0 80B19530 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00AB4 80B19534 24A50A14 */ addiu $a1, $a1, 0x0A14 ## $a1 = 06000A14 -/* 00AB8 80B19538 AFA60018 */ sw $a2, 0x0018($sp) -/* 00ABC 80B1953C 0C0294BE */ jal func_800A52F8 +/* 00AB8 80B19538 AFA60018 */ sw $a2, 0x0018($sp) +/* 00ABC 80B1953C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00AC0 80B19540 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00AC4 80B19544 8FA60018 */ lw $a2, 0x0018($sp) +/* 00AC4 80B19544 8FA60018 */ lw $a2, 0x0018($sp) /* 00AC8 80B19548 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 00ACC 80B1954C 3C0580B2 */ lui $a1, %hi(func_80B195C0) ## $a1 = 80B20000 /* 00AD0 80B19550 94C20088 */ lhu $v0, 0x0088($a2) ## 00000088 /* 00AD4 80B19554 A0CE02BC */ sb $t6, 0x02BC($a2) ## 000002BC /* 00AD8 80B19558 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 00ADC 80B1955C 304F0003 */ andi $t7, $v0, 0x0003 ## $t7 = 00000000 -/* 00AE0 80B19560 55E00009 */ bnel $t7, $zero, .L80B19588 +/* 00AE0 80B19560 55E00009 */ bnel $t7, $zero, .L80B19588 /* 00AE4 80B19564 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00AE8 80B19568 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C /* 00AEC 80B1956C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00AF0 80B19570 30590020 */ andi $t9, $v0, 0x0020 ## $t9 = 00000000 -/* 00AF4 80B19574 1701000C */ bne $t8, $at, .L80B195A8 +/* 00AF4 80B19574 1701000C */ bne $t8, $at, .L80B195A8 /* 00AF8 80B19578 00000000 */ nop -/* 00AFC 80B1957C 1320000A */ beq $t9, $zero, .L80B195A8 +/* 00AFC 80B1957C 1320000A */ beq $t9, $zero, .L80B195A8 /* 00B00 80B19580 00000000 */ nop /* 00B04 80B19584 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80B19588: /* 00B08 80B19588 C4C40060 */ lwc1 $f4, 0x0060($a2) ## 00000060 -/* 00B0C 80B1958C 4600203E */ c.le.s $f4, $f0 +/* 00B0C 80B1958C 4600203E */ c.le.s $f4, $f0 /* 00B10 80B19590 00000000 */ nop -/* 00B14 80B19594 45000004 */ bc1f .L80B195A8 +/* 00B14 80B19594 45000004 */ bc1f .L80B195A8 /* 00B18 80B19598 00000000 */ nop /* 00B1C 80B1959C E4C0006C */ swc1 $f0, 0x006C($a2) ## 0000006C /* 00B20 80B195A0 E4C00060 */ swc1 $f0, 0x0060($a2) ## 00000060 /* 00B24 80B195A4 E4C00068 */ swc1 $f0, 0x0068($a2) ## 00000068 .L80B195A8: -/* 00B28 80B195A8 0C2C62A0 */ jal func_80B18A80 +/* 00B28 80B195A8 0C2C62A0 */ jal func_80B18A80 /* 00B2C 80B195AC 24A595C0 */ addiu $a1, $a1, %lo(func_80B195C0) ## $a1 = 80B195C0 -/* 00B30 80B195B0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00B30 80B195B0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00B34 80B195B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B38 80B195B8 03E00008 */ jr $ra +/* 00B38 80B195B8 03E00008 */ jr $ra /* 00B3C 80B195BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s index 6c70cf9c12..46aef46900 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s @@ -1,11 +1,11 @@ glabel func_80B1985C /* 00DDC 80B1985C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00DE0 80B19860 AFB00018 */ sw $s0, 0x0018($sp) +/* 00DE0 80B19860 AFB00018 */ sw $s0, 0x0018($sp) /* 00DE4 80B19864 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DE8 80B19868 AFBF001C */ sw $ra, 0x001C($sp) +/* 00DE8 80B19868 AFBF001C */ sw $ra, 0x001C($sp) /* 00DEC 80B1986C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DF0 80B19870 24A50C70 */ addiu $a1, $a1, 0x0C70 ## $a1 = 06000C70 -/* 00DF4 80B19874 0C0294BE */ jal func_800A52F8 +/* 00DF4 80B19874 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00DF8 80B19878 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00DFC 80B1987C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00E00 80B19880 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 @@ -20,36 +20,36 @@ glabel func_80B1985C /* 00E24 80B198A4 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 00E28 80B198A8 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C /* 00E2C 80B198AC 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00E30 80B198B0 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 00E34 80B198B4 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 00E38 80B198B8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00E3C 80B198BC A20202E2 */ sb $v0, 0x02E2($s0) ## 000002E2 -/* 00E40 80B198C0 15E1000A */ bne $t7, $at, .L80B198EC +/* 00E40 80B198C0 15E1000A */ bne $t7, $at, .L80B198EC /* 00E44 80B198C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E48 80B198C8 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 /* 00E4C 80B198CC 2405388E */ addiu $a1, $zero, 0x388E ## $a1 = 0000388E /* 00E50 80B198D0 33190020 */ andi $t9, $t8, 0x0020 ## $t9 = 00000000 -/* 00E54 80B198D4 13200005 */ beq $t9, $zero, .L80B198EC +/* 00E54 80B198D4 13200005 */ beq $t9, $zero, .L80B198EC /* 00E58 80B198D8 00000000 */ nop /* 00E5C 80B198DC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00E60 80B198E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E64 80B198E4 10000003 */ beq $zero, $zero, .L80B198F4 +/* 00E64 80B198E4 10000003 */ beq $zero, $zero, .L80B198F4 /* 00E68 80B198E8 00000000 */ nop .L80B198EC: /* 00E6C 80B198EC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00E70 80B198F0 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C .L80B198F4: /* 00E74 80B198F4 3C0580B2 */ lui $a1, %hi(func_80B19918) ## $a1 = 80B20000 /* 00E78 80B198F8 24A59918 */ addiu $a1, $a1, %lo(func_80B19918) ## $a1 = 80B19918 -/* 00E7C 80B198FC 0C2C62A0 */ jal func_80B18A80 +/* 00E7C 80B198FC 0C2C62A0 */ jal func_80B18A80 /* 00E80 80B19900 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E84 80B19904 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E88 80B19908 8FB00018 */ lw $s0, 0x0018($sp) +/* 00E84 80B19904 8FBF001C */ lw $ra, 0x001C($sp) +/* 00E88 80B19908 8FB00018 */ lw $s0, 0x0018($sp) /* 00E8C 80B1990C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E90 80B19910 03E00008 */ jr $ra +/* 00E90 80B19910 03E00008 */ jr $ra /* 00E94 80B19914 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s index 787b444e71..eb3cd0919c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s @@ -1,16 +1,16 @@ glabel func_80B19E28 /* 013A8 80B19E28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 013AC 80B19E2C AFBF0014 */ sw $ra, 0x0014($sp) +/* 013AC 80B19E2C AFBF0014 */ sw $ra, 0x0014($sp) /* 013B0 80B19E30 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 013B4 80B19E34 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 013B8 80B19E38 A08E02BC */ sb $t6, 0x02BC($a0) ## 000002BC /* 013BC 80B19E3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 013C0 80B19E40 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 060012E4 -/* 013C4 80B19E44 AFA70018 */ sw $a3, 0x0018($sp) +/* 013C4 80B19E44 AFA70018 */ sw $a3, 0x0018($sp) /* 013C8 80B19E48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 013CC 80B19E4C 0C0294D3 */ jal func_800A534C +/* 013CC 80B19E4C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 013D0 80B19E50 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 013D4 80B19E54 8FA40018 */ lw $a0, 0x0018($sp) +/* 013D4 80B19E54 8FA40018 */ lw $a0, 0x0018($sp) /* 013D8 80B19E58 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 013DC 80B19E5C 44812000 */ mtc1 $at, $f4 ## $f4 = -6.00 /* 013E0 80B19E60 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 @@ -20,11 +20,11 @@ glabel func_80B19E28 /* 013F0 80B19E70 24A59E94 */ addiu $a1, $a1, %lo(func_80B19E94) ## $a1 = 80B19E94 /* 013F4 80B19E74 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 013F8 80B19E78 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 013FC 80B19E7C 0C2C62A0 */ jal func_80B18A80 +/* 013FC 80B19E7C 0C2C62A0 */ jal func_80B18A80 /* 01400 80B19E80 E486006C */ swc1 $f6, 0x006C($a0) ## 0000006C -/* 01404 80B19E84 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01404 80B19E84 8FBF0014 */ lw $ra, 0x0014($sp) /* 01408 80B19E88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0140C 80B19E8C 03E00008 */ jr $ra +/* 0140C 80B19E8C 03E00008 */ jr $ra /* 01410 80B19E90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s index 4def67601b..b80a03a9a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s @@ -1,16 +1,16 @@ glabel func_80B1A76C /* 01CEC 80B1A76C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01CF0 80B1A770 AFB00018 */ sw $s0, 0x0018($sp) +/* 01CF0 80B1A770 AFB00018 */ sw $s0, 0x0018($sp) /* 01CF4 80B1A774 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01CF8 80B1A778 AFBF001C */ sw $ra, 0x001C($sp) +/* 01CF8 80B1A778 AFBF001C */ sw $ra, 0x001C($sp) /* 01CFC 80B1A77C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01D00 80B1A780 24A50A14 */ addiu $a1, $a1, 0x0A14 ## $a1 = 06000A14 /* 01D04 80B1A784 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D08 80B1A788 0C0294E1 */ jal func_800A5384 +/* 01D08 80B1A788 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 01D0C 80B1A78C 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 01D10 80B1A790 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D14 80B1A794 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01D18 80B1A798 24053888 */ addiu $a1, $zero, 0x3888 ## $a1 = 00003888 /* 01D1C 80B1A79C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 01D20 80B1A7A0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -27,53 +27,53 @@ glabel func_80B1A76C /* 01D48 80B1A7C8 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 01D4C 80B1A7CC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 01D50 80B1A7D0 3C0580B2 */ lui $a1, %hi(func_80B1A888) ## $a1 = 80B20000 -/* 01D54 80B1A7D4 46080282 */ mul.s $f10, $f0, $f8 +/* 01D54 80B1A7D4 46080282 */ mul.s $f10, $f0, $f8 /* 01D58 80B1A7D8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 01D5C 80B1A7DC 24A5A888 */ addiu $a1, $a1, %lo(func_80B1A888) ## $a1 = 80B1A888 /* 01D60 80B1A7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D64 80B1A7E4 4458F800 */ cfc1 $t8, $31 /* 01D68 80B1A7E8 44D9F800 */ ctc1 $t9, $31 /* 01D6C 80B1A7EC 00000000 */ nop -/* 01D70 80B1A7F0 46005424 */ cvt.w.s $f16, $f10 +/* 01D70 80B1A7F0 46005424 */ cvt.w.s $f16, $f10 /* 01D74 80B1A7F4 4459F800 */ cfc1 $t9, $31 /* 01D78 80B1A7F8 00000000 */ nop /* 01D7C 80B1A7FC 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 01D80 80B1A800 53200013 */ beql $t9, $zero, .L80B1A850 -/* 01D84 80B1A804 44198000 */ mfc1 $t9, $f16 +/* 01D80 80B1A800 53200013 */ beql $t9, $zero, .L80B1A850 +/* 01D84 80B1A804 44198000 */ mfc1 $t9, $f16 /* 01D88 80B1A808 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 /* 01D8C 80B1A80C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01D90 80B1A810 46105401 */ sub.s $f16, $f10, $f16 +/* 01D90 80B1A810 46105401 */ sub.s $f16, $f10, $f16 /* 01D94 80B1A814 44D9F800 */ ctc1 $t9, $31 /* 01D98 80B1A818 00000000 */ nop -/* 01D9C 80B1A81C 46008424 */ cvt.w.s $f16, $f16 +/* 01D9C 80B1A81C 46008424 */ cvt.w.s $f16, $f16 /* 01DA0 80B1A820 4459F800 */ cfc1 $t9, $31 /* 01DA4 80B1A824 00000000 */ nop /* 01DA8 80B1A828 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 01DAC 80B1A82C 17200005 */ bne $t9, $zero, .L80B1A844 +/* 01DAC 80B1A82C 17200005 */ bne $t9, $zero, .L80B1A844 /* 01DB0 80B1A830 00000000 */ nop -/* 01DB4 80B1A834 44198000 */ mfc1 $t9, $f16 +/* 01DB4 80B1A834 44198000 */ mfc1 $t9, $f16 /* 01DB8 80B1A838 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01DBC 80B1A83C 10000007 */ beq $zero, $zero, .L80B1A85C +/* 01DBC 80B1A83C 10000007 */ beq $zero, $zero, .L80B1A85C /* 01DC0 80B1A840 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L80B1A844: -/* 01DC4 80B1A844 10000005 */ beq $zero, $zero, .L80B1A85C +/* 01DC4 80B1A844 10000005 */ beq $zero, $zero, .L80B1A85C /* 01DC8 80B1A848 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 01DCC 80B1A84C 44198000 */ mfc1 $t9, $f16 +/* 01DCC 80B1A84C 44198000 */ mfc1 $t9, $f16 .L80B1A850: /* 01DD0 80B1A850 00000000 */ nop -/* 01DD4 80B1A854 0720FFFB */ bltz $t9, .L80B1A844 +/* 01DD4 80B1A854 0720FFFB */ bltz $t9, .L80B1A844 /* 01DD8 80B1A858 00000000 */ nop .L80B1A85C: /* 01DDC 80B1A85C 3C014130 */ lui $at, 0x4130 ## $at = 41300000 /* 01DE0 80B1A860 44819000 */ mtc1 $at, $f18 ## $f18 = 11.00 /* 01DE4 80B1A864 44D8F800 */ ctc1 $t8, $31 /* 01DE8 80B1A868 A21902E2 */ sb $t9, 0x02E2($s0) ## 000002E2 -/* 01DEC 80B1A86C 0C2C62A0 */ jal func_80B18A80 +/* 01DEC 80B1A86C 0C2C62A0 */ jal func_80B18A80 /* 01DF0 80B1A870 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -/* 01DF4 80B1A874 8FBF001C */ lw $ra, 0x001C($sp) -/* 01DF8 80B1A878 8FB00018 */ lw $s0, 0x0018($sp) +/* 01DF4 80B1A874 8FBF001C */ lw $ra, 0x001C($sp) +/* 01DF8 80B1A878 8FB00018 */ lw $s0, 0x0018($sp) /* 01DFC 80B1A87C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01E00 80B1A880 03E00008 */ jr $ra +/* 01E00 80B1A880 03E00008 */ jr $ra /* 01E04 80B1A884 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s index d78ad77d3a..2e6b237106 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s @@ -1,28 +1,28 @@ glabel EnTorch2_Draw /* 01E78 80B1F7F8 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 01E7C 80B1F7FC AFB20030 */ sw $s2, 0x0030($sp) +/* 01E7C 80B1F7FC AFB20030 */ sw $s2, 0x0030($sp) /* 01E80 80B1F800 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 01E84 80B1F804 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01E88 80B1F808 AFB1002C */ sw $s1, 0x002C($sp) -/* 01E8C 80B1F80C AFB00028 */ sw $s0, 0x0028($sp) +/* 01E84 80B1F804 AFBF0034 */ sw $ra, 0x0034($sp) +/* 01E88 80B1F808 AFB1002C */ sw $s1, 0x002C($sp) +/* 01E8C 80B1F80C AFB00028 */ sw $s0, 0x0028($sp) /* 01E90 80B1F810 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01E94 80B1F814 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 01E98 80B1F818 3C0680B2 */ lui $a2, %hi(D_80B1FA30) ## $a2 = 80B20000 /* 01E9C 80B1F81C 24C6FA30 */ addiu $a2, $a2, %lo(D_80B1FA30) ## $a2 = 80B1FA30 /* 01EA0 80B1F820 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 01EA4 80B1F824 2407041A */ addiu $a3, $zero, 0x041A ## $a3 = 0000041A -/* 01EA8 80B1F828 0C031AB1 */ jal func_800C6AC4 +/* 01EA8 80B1F828 0C031AB1 */ jal func_800C6AC4 /* 01EAC 80B1F82C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01EB0 80B1F830 0C024F20 */ jal func_80093C80 +/* 01EB0 80B1F830 0C024F20 */ jal func_80093C80 /* 01EB4 80B1F834 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01EB8 80B1F838 0C024F61 */ jal func_80093D84 +/* 01EB8 80B1F838 0C024F61 */ jal func_80093D84 /* 01EBC 80B1F83C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01EC0 80B1F840 3C0480B2 */ lui $a0, %hi(D_80B20165) ## $a0 = 80B20000 /* 01EC4 80B1F844 24840165 */ addiu $a0, $a0, %lo(D_80B20165) ## $a0 = 80B20165 /* 01EC8 80B1F848 908E0000 */ lbu $t6, 0x0000($a0) ## 80B20165 /* 01ECC 80B1F84C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 01ED0 80B1F850 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 01ED4 80B1F854 15C1002B */ bne $t6, $at, .L80B1F904 +/* 01ED4 80B1F854 15C1002B */ bne $t6, $at, .L80B1F904 /* 01ED8 80B1F858 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 01EDC 80B1F85C 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 01EE0 80B1F860 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 @@ -44,11 +44,11 @@ glabel EnTorch2_Draw /* 01F20 80B1F8A0 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01F24 80B1F8A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01F28 80B1F8A8 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 01F2C 80B1F8AC 0C00BAF3 */ jal func_8002EBCC +/* 01F2C 80B1F8AC 0C00BAF3 */ jal func_8002EBCC /* 01F30 80B1F8B0 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 /* 01F34 80B1F8B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01F38 80B1F8B8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01F3C 80B1F8BC 0C00BB60 */ jal func_8002ED80 +/* 01F3C 80B1F8BC 0C00BB60 */ jal func_8002ED80 /* 01F40 80B1F8C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01F44 80B1F8C4 8E2501B8 */ lw $a1, 0x01B8($s1) ## 000001B8 /* 01F48 80B1F8C8 8E2601D4 */ lw $a2, 0x01D4($s1) ## 000001D4 @@ -57,14 +57,14 @@ glabel EnTorch2_Draw /* 01F54 80B1F8D4 3C0E80B2 */ lui $t6, %hi(func_80B1F7D4) ## $t6 = 80B20000 /* 01F58 80B1F8D8 25CEF7D4 */ addiu $t6, $t6, %lo(func_80B1F7D4) ## $t6 = 80B1F7D4 /* 01F5C 80B1F8DC 25ADF7A8 */ addiu $t5, $t5, %lo(func_80B1F7A8) ## $t5 = 80B1F7A8 -/* 01F60 80B1F8E0 AFAD0010 */ sw $t5, 0x0010($sp) -/* 01F64 80B1F8E4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01F68 80B1F8E8 AFB10018 */ sw $s1, 0x0018($sp) +/* 01F60 80B1F8E0 AFAD0010 */ sw $t5, 0x0010($sp) +/* 01F64 80B1F8E4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01F68 80B1F8E8 AFB10018 */ sw $s1, 0x0018($sp) /* 01F6C 80B1F8EC 8E0F02C0 */ lw $t7, 0x02C0($s0) ## 000002C0 /* 01F70 80B1F8F0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01F74 80B1F8F4 0C0289CF */ jal func_800A273C -/* 01F78 80B1F8F8 AFAF001C */ sw $t7, 0x001C($sp) -/* 01F7C 80B1F8FC 10000028 */ beq $zero, $zero, .L80B1F9A0 +/* 01F74 80B1F8F4 0C0289CF */ jal SkelAnime_DrawSV2 +/* 01F78 80B1F8F8 AFAF001C */ sw $t7, 0x001C($sp) +/* 01F7C 80B1F8FC 10000028 */ beq $zero, $zero, .L80B1F9A0 /* 01F80 80B1F900 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L80B1F904: /* 01F84 80B1F904 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 @@ -85,11 +85,11 @@ glabel EnTorch2_Draw /* 01FC0 80B1F940 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 01FC4 80B1F944 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01FC8 80B1F948 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 -/* 01FCC 80B1F94C 0C00BAF3 */ jal func_8002EBCC +/* 01FCC 80B1F94C 0C00BAF3 */ jal func_8002EBCC /* 01FD0 80B1F950 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 /* 01FD4 80B1F954 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01FD8 80B1F958 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01FDC 80B1F95C 0C00BB60 */ jal func_8002ED80 +/* 01FDC 80B1F95C 0C00BB60 */ jal func_8002ED80 /* 01FE0 80B1F960 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01FE4 80B1F964 8E2501B8 */ lw $a1, 0x01B8($s1) ## 000001B8 /* 01FE8 80B1F968 8E2601D4 */ lw $a2, 0x01D4($s1) ## 000001D4 @@ -98,25 +98,25 @@ glabel EnTorch2_Draw /* 01FF4 80B1F974 3C0F80B2 */ lui $t7, %hi(func_80B1F7D4) ## $t7 = 80B20000 /* 01FF8 80B1F978 25EFF7D4 */ addiu $t7, $t7, %lo(func_80B1F7D4) ## $t7 = 80B1F7D4 /* 01FFC 80B1F97C 25CEF7A8 */ addiu $t6, $t6, %lo(func_80B1F7A8) ## $t6 = 80B1F7A8 -/* 02000 80B1F980 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02004 80B1F984 AFAF0014 */ sw $t7, 0x0014($sp) -/* 02008 80B1F988 AFB10018 */ sw $s1, 0x0018($sp) +/* 02000 80B1F980 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02004 80B1F984 AFAF0014 */ sw $t7, 0x0014($sp) +/* 02008 80B1F988 AFB10018 */ sw $s1, 0x0018($sp) /* 0200C 80B1F98C 8E1802D0 */ lw $t8, 0x02D0($s0) ## 000002D0 /* 02010 80B1F990 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02014 80B1F994 0C0289CF */ jal func_800A273C -/* 02018 80B1F998 AFB8001C */ sw $t8, 0x001C($sp) +/* 02014 80B1F994 0C0289CF */ jal SkelAnime_DrawSV2 +/* 02018 80B1F998 AFB8001C */ sw $t8, 0x001C($sp) /* 0201C 80B1F99C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80B1F9A0: /* 02020 80B1F9A0 3C0680B2 */ lui $a2, %hi(D_80B1FA44) ## $a2 = 80B20000 /* 02024 80B1F9A4 24C6FA44 */ addiu $a2, $a2, %lo(D_80B1FA44) ## $a2 = 80B1FA44 /* 02028 80B1F9A8 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 0202C 80B1F9AC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 02030 80B1F9B0 0C031AD5 */ jal func_800C6B54 +/* 02030 80B1F9B0 0C031AD5 */ jal func_800C6B54 /* 02034 80B1F9B4 2407045A */ addiu $a3, $zero, 0x045A ## $a3 = 0000045A -/* 02038 80B1F9B8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0203C 80B1F9BC 8FB00028 */ lw $s0, 0x0028($sp) -/* 02040 80B1F9C0 8FB1002C */ lw $s1, 0x002C($sp) -/* 02044 80B1F9C4 8FB20030 */ lw $s2, 0x0030($sp) -/* 02048 80B1F9C8 03E00008 */ jr $ra +/* 02038 80B1F9B8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0203C 80B1F9BC 8FB00028 */ lw $s0, 0x0028($sp) +/* 02040 80B1F9C0 8FB1002C */ lw $s1, 0x002C($sp) +/* 02044 80B1F9C4 8FB20030 */ lw $s2, 0x0030($sp) +/* 02048 80B1F9C8 03E00008 */ jr $ra /* 0204C 80B1F9CC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Draw.s index bb8f78b498..641488f651 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Draw.s @@ -1,11 +1,11 @@ glabel EnToryo_Draw /* 00938 80B20AA8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0093C 80B20AAC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00940 80B20AB0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00944 80B20AB4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00948 80B20AB8 0C024F46 */ jal func_80093D18 +/* 0093C 80B20AAC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00940 80B20AB0 AFA40028 */ sw $a0, 0x0028($sp) +/* 00944 80B20AB4 AFA5002C */ sw $a1, 0x002C($sp) +/* 00948 80B20AB8 0C024F46 */ jal func_80093D18 /* 0094C 80B20ABC 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00950 80B20AC0 8FA20028 */ lw $v0, 0x0028($sp) +/* 00950 80B20AC0 8FA20028 */ lw $v0, 0x0028($sp) /* 00954 80B20AC4 3C0F80B2 */ lui $t7, %hi(func_80B20B04) ## $t7 = 80B20000 /* 00958 80B20AC8 3C1880B2 */ lui $t8, %hi(func_80B20B94) ## $t8 = 80B20000 /* 0095C 80B20ACC 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 @@ -13,14 +13,14 @@ glabel EnToryo_Draw /* 00964 80B20AD4 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E /* 00968 80B20AD8 27180B94 */ addiu $t8, $t8, %lo(func_80B20B94) ## $t8 = 80B20B94 /* 0096C 80B20ADC 25EF0B04 */ addiu $t7, $t7, %lo(func_80B20B04) ## $t7 = 80B20B04 -/* 00970 80B20AE0 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00974 80B20AE4 AFB80014 */ sw $t8, 0x0014($sp) -/* 00978 80B20AE8 8FA4002C */ lw $a0, 0x002C($sp) -/* 0097C 80B20AEC 0C0286B2 */ jal func_800A1AC8 -/* 00980 80B20AF0 AFA20018 */ sw $v0, 0x0018($sp) -/* 00984 80B20AF4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00970 80B20AE0 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00974 80B20AE4 AFB80014 */ sw $t8, 0x0014($sp) +/* 00978 80B20AE8 8FA4002C */ lw $a0, 0x002C($sp) +/* 0097C 80B20AEC 0C0286B2 */ jal SkelAnime_DrawSV +/* 00980 80B20AF0 AFA20018 */ sw $v0, 0x0018($sp) +/* 00984 80B20AF4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00988 80B20AF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0098C 80B20AFC 03E00008 */ jr $ra +/* 0098C 80B20AFC 03E00008 */ jr $ra /* 00990 80B20B00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s index 37ec56c4a9..e2a10d1670 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s @@ -1,68 +1,68 @@ glabel EnToryo_Init /* 00000 80B20170 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 80B20174 AFBF002C */ sw $ra, 0x002C($sp) -/* 00008 80B20178 AFB00028 */ sw $s0, 0x0028($sp) -/* 0000C 80B2017C AFA50054 */ sw $a1, 0x0054($sp) +/* 00004 80B20174 AFBF002C */ sw $ra, 0x002C($sp) +/* 00008 80B20178 AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 80B2017C AFA50054 */ sw $a1, 0x0054($sp) /* 00010 80B20180 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 /* 00014 80B20184 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A /* 00018 80B20188 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 80B2018C 10410026 */ beq $v0, $at, .L80B20228 +/* 0001C 80B2018C 10410026 */ beq $v0, $at, .L80B20228 /* 00020 80B20190 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 00024 80B20194 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 -/* 00028 80B20198 10410012 */ beq $v0, $at, .L80B201E4 +/* 00028 80B20198 10410012 */ beq $v0, $at, .L80B201E4 /* 0002C 80B2019C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 00030 80B201A0 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 00034 80B201A4 14410031 */ bne $v0, $at, .L80B2026C +/* 00034 80B201A4 14410031 */ bne $v0, $at, .L80B2026C /* 00038 80B201A8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 0003C 80B201AC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 00040 80B201B0 8C6F0004 */ lw $t7, 0x0004($v1) ## 8015E664 /* 00044 80B201B4 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 /* 00048 80B201B8 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 0004C 80B201BC 11E00003 */ beq $t7, $zero, .L80B201CC +/* 0004C 80B201BC 11E00003 */ beq $t7, $zero, .L80B201CC /* 00050 80B201C0 00000000 */ nop -/* 00054 80B201C4 10000001 */ beq $zero, $zero, .L80B201CC +/* 00054 80B201C4 10000001 */ beq $zero, $zero, .L80B201CC /* 00058 80B201C8 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L80B201CC: -/* 0005C 80B201CC 54410028 */ bnel $v0, $at, .L80B20270 +/* 0005C 80B201CC 54410028 */ bnel $v0, $at, .L80B20270 /* 00060 80B201D0 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 /* 00064 80B201D4 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 /* 00068 80B201D8 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 0006C 80B201DC 10000023 */ beq $zero, $zero, .L80B2026C +/* 0006C 80B201DC 10000023 */ beq $zero, $zero, .L80B2026C /* 00070 80B201E0 A61901E8 */ sh $t9, 0x01E8($s0) ## 000001E8 .L80B201E4: /* 00074 80B201E4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015CCC0 /* 00078 80B201E8 8C680004 */ lw $t0, 0x0004($v1) ## 8015CCC4 /* 0007C 80B201EC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00080 80B201F0 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 00084 80B201F4 11000003 */ beq $t0, $zero, .L80B20204 +/* 00084 80B201F4 11000003 */ beq $t0, $zero, .L80B20204 /* 00088 80B201F8 00000000 */ nop -/* 0008C 80B201FC 10000001 */ beq $zero, $zero, .L80B20204 +/* 0008C 80B201FC 10000001 */ beq $zero, $zero, .L80B20204 /* 00090 80B20200 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L80B20204: -/* 00094 80B20204 5441001A */ bnel $v0, $at, .L80B20270 +/* 00094 80B20204 5441001A */ bnel $v0, $at, .L80B20270 /* 00098 80B20208 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 /* 0009C 80B2020C 8C690010 */ lw $t1, 0x0010($v1) ## 8015CCD0 -/* 000A0 80B20210 55200017 */ bnel $t1, $zero, .L80B20270 +/* 000A0 80B20210 55200017 */ bnel $t1, $zero, .L80B20270 /* 000A4 80B20214 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 /* 000A8 80B20218 960A01E8 */ lhu $t2, 0x01E8($s0) ## 000001E8 /* 000AC 80B2021C 354B0002 */ ori $t3, $t2, 0x0002 ## $t3 = 00000002 -/* 000B0 80B20220 10000012 */ beq $zero, $zero, .L80B2026C +/* 000B0 80B20220 10000012 */ beq $zero, $zero, .L80B2026C /* 000B4 80B20224 A60B01E8 */ sh $t3, 0x01E8($s0) ## 000001E8 .L80B20228: /* 000B8 80B20228 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015B320 /* 000BC 80B2022C 8C6C0004 */ lw $t4, 0x0004($v1) ## 8015B324 /* 000C0 80B20230 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 000C4 80B20234 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 000C8 80B20238 11800003 */ beq $t4, $zero, .L80B20248 +/* 000C8 80B20238 11800003 */ beq $t4, $zero, .L80B20248 /* 000CC 80B2023C 00000000 */ nop -/* 000D0 80B20240 10000001 */ beq $zero, $zero, .L80B20248 +/* 000D0 80B20240 10000001 */ beq $zero, $zero, .L80B20248 /* 000D4 80B20244 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L80B20248: -/* 000D8 80B20248 54410009 */ bnel $v0, $at, .L80B20270 +/* 000D8 80B20248 54410009 */ bnel $v0, $at, .L80B20270 /* 000DC 80B2024C 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 /* 000E0 80B20250 8C6D0010 */ lw $t5, 0x0010($v1) ## 8015B330 /* 000E4 80B20254 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 000E8 80B20258 55A10005 */ bnel $t5, $at, .L80B20270 +/* 000E8 80B20258 55A10005 */ bnel $t5, $at, .L80B20270 /* 000EC 80B2025C 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 /* 000F0 80B20260 960E01E8 */ lhu $t6, 0x01E8($s0) ## 000001E8 /* 000F4 80B20264 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 @@ -71,10 +71,10 @@ glabel EnToryo_Init /* 000FC 80B2026C 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 .L80B20270: /* 00100 80B20270 33190007 */ andi $t9, $t8, 0x0007 ## $t9 = 00000000 -/* 00104 80B20274 17200003 */ bne $t9, $zero, .L80B20284 +/* 00104 80B20274 17200003 */ bne $t9, $zero, .L80B20284 /* 00108 80B20278 00000000 */ nop /* 0010C 80B2027C 0C00B55C */ jal Actor_Kill - + /* 00110 80B20280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B20284: /* 00114 80B20284 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 @@ -82,68 +82,68 @@ glabel EnToryo_Init /* 0011C 80B2028C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00120 80B20290 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00124 80B20294 0C00AC78 */ jal ActorShape_Init - + /* 00128 80B20298 3C074228 */ lui $a3, 0x4228 ## $a3 = 42280000 /* 0012C 80B2029C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00130 80B202A0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00134 80B202A4 26080214 */ addiu $t0, $s0, 0x0214 ## $t0 = 00000214 /* 00138 80B202A8 2609027A */ addiu $t1, $s0, 0x027A ## $t1 = 0000027A /* 0013C 80B202AC 240A0011 */ addiu $t2, $zero, 0x0011 ## $t2 = 00000011 -/* 00140 80B202B0 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00144 80B202B4 AFA90014 */ sw $t1, 0x0014($sp) -/* 00148 80B202B8 AFA80010 */ sw $t0, 0x0010($sp) +/* 00140 80B202B0 AFAA0018 */ sw $t2, 0x0018($sp) +/* 00144 80B202B4 AFA90014 */ sw $t1, 0x0014($sp) +/* 00148 80B202B8 AFA80010 */ sw $t0, 0x0010($sp) /* 0014C 80B202BC 24C67150 */ addiu $a2, $a2, 0x7150 ## $a2 = 06007150 -/* 00150 80B202C0 AFA50038 */ sw $a1, 0x0038($sp) -/* 00154 80B202C4 8FA40054 */ lw $a0, 0x0054($sp) -/* 00158 80B202C8 0C0291BE */ jal func_800A46F8 +/* 00150 80B202C0 AFA50038 */ sw $a1, 0x0038($sp) +/* 00154 80B202C4 8FA40054 */ lw $a0, 0x0054($sp) +/* 00158 80B202C8 0C0291BE */ jal SkelAnime_InitSV /* 0015C 80B202CC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00160 80B202D0 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00164 80B202D4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00164 80B202D4 AFA50034 */ sw $a1, 0x0034($sp) /* 00168 80B202D8 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 0016C 80B202DC 8FA40054 */ lw $a0, 0x0054($sp) + +/* 0016C 80B202DC 8FA40054 */ lw $a0, 0x0054($sp) /* 00170 80B202E0 3C0780B2 */ lui $a3, %hi(D_80B20C00) ## $a3 = 80B20000 -/* 00174 80B202E4 8FA50034 */ lw $a1, 0x0034($sp) +/* 00174 80B202E4 8FA50034 */ lw $a1, 0x0034($sp) /* 00178 80B202E8 24E70C00 */ addiu $a3, $a3, %lo(D_80B20C00) ## $a3 = 80B20C00 -/* 0017C 80B202EC 8FA40054 */ lw $a0, 0x0054($sp) +/* 0017C 80B202EC 8FA40054 */ lw $a0, 0x0054($sp) /* 00180 80B202F0 0C01712B */ jal ActorCollider_InitCylinder - + /* 00184 80B202F4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00188 80B202F8 3C0580B2 */ lui $a1, %hi(D_80B20C38) ## $a1 = 80B20000 /* 0018C 80B202FC 3C0680B2 */ lui $a2, %hi(D_80B20C2C) ## $a2 = 80B20000 /* 00190 80B20300 24C60C2C */ addiu $a2, $a2, %lo(D_80B20C2C) ## $a2 = 80B20C2C /* 00194 80B20304 24A50C38 */ addiu $a1, $a1, %lo(D_80B20C38) ## $a1 = 80B20C38 -/* 00198 80B20308 0C0187BF */ jal func_80061EFC +/* 00198 80B20308 0C0187BF */ jal func_80061EFC /* 0019C 80B2030C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 001A0 80B20310 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001A4 80B20314 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 -/* 001A8 80B20318 AFAB0014 */ sw $t3, 0x0014($sp) -/* 001AC 80B2031C 44060000 */ mfc1 $a2, $f0 -/* 001B0 80B20320 44070000 */ mfc1 $a3, $f0 -/* 001B4 80B20324 8FA40054 */ lw $a0, 0x0054($sp) +/* 001A8 80B20318 AFAB0014 */ sw $t3, 0x0014($sp) +/* 001AC 80B2031C 44060000 */ mfc1 $a2, $f0 +/* 001B0 80B20320 44070000 */ mfc1 $a3, $f0 +/* 001B4 80B20324 8FA40054 */ lw $a0, 0x0054($sp) /* 001B8 80B20328 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001BC 80B2032C 0C00B92D */ jal func_8002E4B4 -/* 001C0 80B20330 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 001BC 80B2032C 0C00B92D */ jal func_8002E4B4 +/* 001C0 80B20330 E7A00010 */ swc1 $f0, 0x0010($sp) /* 001C4 80B20334 3C0380B2 */ lui $v1, %hi(D_80B20C58) ## $v1 = 80B20000 /* 001C8 80B20338 24630C58 */ addiu $v1, $v1, %lo(D_80B20C58) ## $v1 = 80B20C58 /* 001CC 80B2033C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 001D0 80B20340 8C640000 */ lw $a0, 0x0000($v1) ## 80B20C58 /* 001D4 80B20344 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 001D8 80B20348 3C0380B2 */ lui $v1, %hi(D_80B20C58) ## $v1 = 80B20000 /* 001DC 80B2034C 24630C58 */ addiu $v1, $v1, %lo(D_80B20C58) ## $v1 = 80B20C58 -/* 001E0 80B20350 468021A0 */ cvt.s.w $f6, $f4 +/* 001E0 80B20350 468021A0 */ cvt.s.w $f6, $f4 /* 001E4 80B20354 906C0008 */ lbu $t4, 0x0008($v1) ## 80B20C60 /* 001E8 80B20358 C468000C */ lwc1 $f8, 0x000C($v1) ## 80B20C64 /* 001EC 80B2035C 8C650000 */ lw $a1, 0x0000($v1) ## 80B20C58 -/* 001F0 80B20360 8FA40038 */ lw $a0, 0x0038($sp) +/* 001F0 80B20360 8FA40038 */ lw $a0, 0x0038($sp) /* 001F4 80B20364 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 001F8 80B20368 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 001F8 80B20368 E7A60010 */ swc1 $f6, 0x0010($sp) /* 001FC 80B2036C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00200 80B20370 AFAC0014 */ sw $t4, 0x0014($sp) +/* 00200 80B20370 AFAC0014 */ sw $t4, 0x0014($sp) /* 00204 80B20374 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00208 80B20378 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 00208 80B20378 E7A80018 */ swc1 $f8, 0x0018($sp) /* 0020C 80B2037C 960D01E8 */ lhu $t5, 0x01E8($s0) ## 000001E8 /* 00210 80B20380 3C1880B2 */ lui $t8, %hi(func_80B20914) ## $t8 = 80B20000 /* 00214 80B20384 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 @@ -152,10 +152,10 @@ glabel EnToryo_Init /* 00220 80B20390 A60E01E8 */ sh $t6, 0x01E8($s0) ## 000001E8 /* 00224 80B20394 A20F001F */ sb $t7, 0x001F($s0) ## 0000001F /* 00228 80B20398 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 0022C 80B2039C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00230 80B203A0 8FB00028 */ lw $s0, 0x0028($sp) +/* 0022C 80B2039C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00230 80B203A0 8FB00028 */ lw $s0, 0x0028($sp) /* 00234 80B203A4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00238 80B203A8 03E00008 */ jr $ra +/* 00238 80B203A8 03E00008 */ jr $ra /* 0023C 80B203AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s index b448ab9814..1d89391cf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s @@ -1,35 +1,35 @@ glabel EnTr_Draw /* 011B4 80B23EA4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 011B8 80B23EA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 011BC 80B23EAC AFB10028 */ sw $s1, 0x0028($sp) -/* 011C0 80B23EB0 AFB00024 */ sw $s0, 0x0024($sp) +/* 011B8 80B23EA8 AFBF002C */ sw $ra, 0x002C($sp) +/* 011BC 80B23EAC AFB10028 */ sw $s1, 0x0028($sp) +/* 011C0 80B23EB0 AFB00024 */ sw $s0, 0x0024($sp) /* 011C4 80B23EB4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C /* 011C8 80B23EB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 011CC 80B23EBC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 011D0 80B23EC0 11C0000B */ beq $t6, $zero, .L80B23EF0 +/* 011D0 80B23EC0 11C0000B */ beq $t6, $zero, .L80B23EF0 /* 011D4 80B23EC4 00000000 */ nop /* 011D8 80B23EC8 848F02D8 */ lh $t7, 0x02D8($a0) ## 000002D8 /* 011DC 80B23ECC 3C098003 */ lui $t1, 0x8003 ## $t1 = 80030000 /* 011E0 80B23ED0 3C0680B2 */ lui $a2, %hi(D_80B24414) ## $a2 = 80B20000 -/* 011E4 80B23ED4 000FC080 */ sll $t8, $t7, 2 -/* 011E8 80B23ED8 00B8C821 */ addu $t9, $a1, $t8 +/* 011E4 80B23ED4 000FC080 */ sll $t8, $t7, 2 +/* 011E8 80B23ED8 00B8C821 */ addu $t9, $a1, $t8 /* 011EC 80B23EDC 8F281D8C */ lw $t0, 0x1D8C($t9) ## 00001D8C /* 011F0 80B23EE0 2529B5EC */ addiu $t1, $t1, 0xB5EC ## $t1 = 8002B5EC /* 011F4 80B23EE4 24C64414 */ addiu $a2, $a2, %lo(D_80B24414) ## $a2 = 80B24414 -/* 011F8 80B23EE8 15000003 */ bne $t0, $zero, .L80B23EF8 +/* 011F8 80B23EE8 15000003 */ bne $t0, $zero, .L80B23EF8 /* 011FC 80B23EEC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 .L80B23EF0: -/* 01200 80B23EF0 10000035 */ beq $zero, $zero, .L80B23FC8 +/* 01200 80B23EF0 10000035 */ beq $zero, $zero, .L80B23FC8 /* 01204 80B23EF4 AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 .L80B23EF8: /* 01208 80B23EF8 AE0900C0 */ sw $t1, 0x00C0($s0) ## 000000C0 /* 0120C 80B23EFC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 01210 80B23F00 24070348 */ addiu $a3, $zero, 0x0348 ## $a3 = 00000348 -/* 01214 80B23F04 0C031AB1 */ jal func_800C6AC4 -/* 01218 80B23F08 AFA5004C */ sw $a1, 0x004C($sp) -/* 0121C 80B23F0C 0C0250F2 */ jal func_800943C8 +/* 01214 80B23F04 0C031AB1 */ jal func_800C6AC4 +/* 01218 80B23F08 AFA5004C */ sw $a1, 0x004C($sp) +/* 0121C 80B23F0C 0C0250F2 */ jal func_800943C8 /* 01220 80B23F10 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01224 80B23F14 8FA5004C */ lw $a1, 0x004C($sp) +/* 01224 80B23F14 8FA5004C */ lw $a1, 0x004C($sp) /* 01228 80B23F18 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 0122C 80B23F1C 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 01230 80B23F20 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -41,44 +41,44 @@ glabel EnTr_Draw /* 01248 80B23F38 860C02E0 */ lh $t4, 0x02E0($s0) ## 000002E0 /* 0124C 80B23F3C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01250 80B23F40 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01254 80B23F44 000C6880 */ sll $t5, $t4, 2 -/* 01258 80B23F48 008D2021 */ addu $a0, $a0, $t5 -/* 0125C 80B23F4C 8C8443D0 */ lw $a0, %lo(D_80B243D0)($a0) +/* 01254 80B23F44 000C6880 */ sll $t5, $t4, 2 +/* 01258 80B23F48 008D2021 */ addu $a0, $a0, $t5 +/* 0125C 80B23F4C 8C8443D0 */ lw $a0, %lo(D_80B243D0)($a0) /* 01260 80B23F50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01264 80B23F54 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01268 80B23F58 00047900 */ sll $t7, $a0, 4 -/* 0126C 80B23F5C 000FC702 */ srl $t8, $t7, 28 -/* 01270 80B23F60 0018C880 */ sll $t9, $t8, 2 -/* 01274 80B23F64 01194021 */ addu $t0, $t0, $t9 +/* 01268 80B23F58 00047900 */ sll $t7, $a0, 4 +/* 0126C 80B23F5C 000FC702 */ srl $t8, $t7, 28 +/* 01270 80B23F60 0018C880 */ sll $t9, $t8, 2 +/* 01274 80B23F64 01194021 */ addu $t0, $t0, $t9 /* 01278 80B23F68 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 0127C 80B23F6C 00817024 */ and $t6, $a0, $at +/* 0127C 80B23F6C 00817024 */ and $t6, $a0, $at /* 01280 80B23F70 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01284 80B23F74 01C84821 */ addu $t1, $t6, $t0 -/* 01288 80B23F78 01215021 */ addu $t2, $t1, $at +/* 01284 80B23F74 01C84821 */ addu $t1, $t6, $t0 +/* 01288 80B23F78 01215021 */ addu $t2, $t1, $at /* 0128C 80B23F7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01290 80B23F80 0C00BAF3 */ jal func_8002EBCC +/* 01290 80B23F80 0C00BAF3 */ jal func_8002EBCC /* 01294 80B23F84 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 01298 80B23F88 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 0129C 80B23F8C 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 012A0 80B23F90 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 012A4 80B23F94 3C0B80B2 */ lui $t3, %hi(func_80B23D74) ## $t3 = 80B20000 /* 012A8 80B23F98 256B3D74 */ addiu $t3, $t3, %lo(func_80B23D74) ## $t3 = 80B23D74 -/* 012AC 80B23F9C AFAB0010 */ sw $t3, 0x0010($sp) -/* 012B0 80B23FA0 AFB00018 */ sw $s0, 0x0018($sp) -/* 012B4 80B23FA4 AFA00014 */ sw $zero, 0x0014($sp) -/* 012B8 80B23FA8 0C0286B2 */ jal func_800A1AC8 +/* 012AC 80B23F9C AFAB0010 */ sw $t3, 0x0010($sp) +/* 012B0 80B23FA0 AFB00018 */ sw $s0, 0x0018($sp) +/* 012B4 80B23FA4 AFA00014 */ sw $zero, 0x0014($sp) +/* 012B8 80B23FA8 0C0286B2 */ jal SkelAnime_DrawSV /* 012BC 80B23FAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 012C0 80B23FB0 3C0680B2 */ lui $a2, %hi(D_80B24424) ## $a2 = 80B20000 /* 012C4 80B23FB4 24C64424 */ addiu $a2, $a2, %lo(D_80B24424) ## $a2 = 80B24424 /* 012C8 80B23FB8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 012CC 80B23FBC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 012D0 80B23FC0 0C031AD5 */ jal func_800C6B54 +/* 012D0 80B23FC0 0C031AD5 */ jal func_800C6B54 /* 012D4 80B23FC4 24070356 */ addiu $a3, $zero, 0x0356 ## $a3 = 00000356 .L80B23FC8: -/* 012D8 80B23FC8 8FBF002C */ lw $ra, 0x002C($sp) -/* 012DC 80B23FCC 8FB00024 */ lw $s0, 0x0024($sp) -/* 012E0 80B23FD0 8FB10028 */ lw $s1, 0x0028($sp) -/* 012E4 80B23FD4 03E00008 */ jr $ra +/* 012D8 80B23FC8 8FBF002C */ lw $ra, 0x002C($sp) +/* 012DC 80B23FCC 8FB00024 */ lw $s0, 0x0024($sp) +/* 012E0 80B23FD0 8FB10028 */ lw $s1, 0x0028($sp) +/* 012E4 80B23FD4 03E00008 */ jr $ra /* 012E8 80B23FD8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s index 2168ec601d..27c13e901c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s @@ -1,37 +1,37 @@ glabel EnTr_Init /* 00008 80B22CF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0000C 80B22CFC AFB00024 */ sw $s0, 0x0024($sp) +/* 0000C 80B22CFC AFB00024 */ sw $s0, 0x0024($sp) /* 00010 80B22D00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 80B22D04 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 80B22D08 AFA50034 */ sw $a1, 0x0034($sp) +/* 00014 80B22D04 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 80B22D08 AFA50034 */ sw $a1, 0x0034($sp) /* 0001C 80B22D0C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00020 80B22D10 AFB10028 */ sw $s1, 0x0028($sp) +/* 00020 80B22D10 AFB10028 */ sw $s1, 0x0028($sp) /* 00024 80B22D14 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00028 80B22D18 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0002C 80B22D1C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00030 80B22D20 0C00AC78 */ jal ActorShape_Init - + /* 00034 80B22D24 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 00038 80B22D28 3C0580B2 */ lui $a1, %hi(func_80B22F1C) ## $a1 = 80B20000 /* 0003C 80B22D2C 24A52F1C */ addiu $a1, $a1, %lo(func_80B22F1C) ## $a1 = 80B22F1C -/* 00040 80B22D30 0C2C8B3C */ jal func_80B22CF0 +/* 00040 80B22D30 0C2C8B3C */ jal func_80B22CF0 /* 00044 80B22D34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00048 80B22D38 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 0004C 80B22D3C A60002D4 */ sh $zero, 0x02D4($s0) ## 000002D4 /* 00050 80B22D40 AE00011C */ sw $zero, 0x011C($s0) ## 0000011C /* 00054 80B22D44 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00058 80B22D48 0C00B58B */ jal Actor_SetScale - + /* 0005C 80B22D4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00060 80B22D50 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00064 80B22D54 2611014C */ addiu $s1, $s0, 0x014C ## $s1 = 0000014C /* 00068 80B22D58 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C -/* 0006C 80B22D5C 10400006 */ beq $v0, $zero, .L80B22D78 -/* 00070 80B22D60 8FA40034 */ lw $a0, 0x0034($sp) +/* 0006C 80B22D5C 10400006 */ beq $v0, $zero, .L80B22D78 +/* 00070 80B22D60 8FA40034 */ lw $a0, 0x0034($sp) /* 00074 80B22D64 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00078 80B22D68 1041001A */ beq $v0, $at, .L80B22DD4 -/* 0007C 80B22D6C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00080 80B22D70 10000031 */ beq $zero, $zero, .L80B22E38 +/* 00078 80B22D68 1041001A */ beq $v0, $at, .L80B22DD4 +/* 0007C 80B22D6C 8FA40034 */ lw $a0, 0x0034($sp) +/* 00080 80B22D70 10000031 */ beq $zero, $zero, .L80B22E38 /* 00084 80B22D74 3C0480B2 */ lui $a0, %hi(D_80B24400) ## $a0 = 80B20000 .L80B22D78: /* 00088 80B22D78 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -39,23 +39,23 @@ glabel EnTr_Init /* 00090 80B22D80 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 00094 80B22D84 260F0232 */ addiu $t7, $s0, 0x0232 ## $t7 = 00000232 /* 00098 80B22D88 2418001B */ addiu $t8, $zero, 0x001B ## $t8 = 0000001B -/* 0009C 80B22D8C AFB80018 */ sw $t8, 0x0018($sp) -/* 000A0 80B22D90 AFAF0014 */ sw $t7, 0x0014($sp) -/* 000A4 80B22D94 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0009C 80B22D8C AFB80018 */ sw $t8, 0x0018($sp) +/* 000A0 80B22D90 AFAF0014 */ sw $t7, 0x0014($sp) +/* 000A4 80B22D94 AFAE0010 */ sw $t6, 0x0010($sp) /* 000A8 80B22D98 24E73FC8 */ addiu $a3, $a3, 0x3FC8 ## $a3 = 06003FC8 -/* 000AC 80B22D9C 0C0291BE */ jal func_800A46F8 +/* 000AC 80B22D9C 0C0291BE */ jal SkelAnime_InitSV /* 000B0 80B22DA0 24C61688 */ addiu $a2, $a2, 0x1688 ## $a2 = 06011688 /* 000B4 80B22DA4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 000B8 80B22DA8 24A53FC8 */ addiu $a1, $a1, 0x3FC8 ## $a1 = 06003FC8 -/* 000BC 80B22DAC 0C02947A */ jal func_800A51E8 +/* 000BC 80B22DAC 0C02947A */ jal func_800A51E8 /* 000C0 80B22DB0 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 000C4 80B22DB4 3C0580B2 */ lui $a1, %hi(func_80B23A88) ## $a1 = 80B20000 /* 000C8 80B22DB8 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 /* 000CC 80B22DBC 24A53A88 */ addiu $a1, $a1, %lo(func_80B23A88) ## $a1 = 80B23A88 -/* 000D0 80B22DC0 0C2C8B3C */ jal func_80B22CF0 +/* 000D0 80B22DC0 0C2C8B3C */ jal func_80B22CF0 /* 000D4 80B22DC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000D8 80B22DC8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 000DC 80B22DCC 1000001F */ beq $zero, $zero, .L80B22E4C +/* 000DC 80B22DCC 1000001F */ beq $zero, $zero, .L80B22E4C /* 000E0 80B22DD0 A61902D8 */ sh $t9, 0x02D8($s0) ## 000002D8 .L80B22DD4: /* 000E4 80B22DD4 2611014C */ addiu $s1, $s0, 0x014C ## $s1 = 0000014C @@ -64,37 +64,37 @@ glabel EnTr_Init /* 000F0 80B22DE0 26080190 */ addiu $t0, $s0, 0x0190 ## $t0 = 00000190 /* 000F4 80B22DE4 26090232 */ addiu $t1, $s0, 0x0232 ## $t1 = 00000232 /* 000F8 80B22DE8 240A001B */ addiu $t2, $zero, 0x001B ## $t2 = 0000001B -/* 000FC 80B22DEC AFAA0018 */ sw $t2, 0x0018($sp) -/* 00100 80B22DF0 AFA90014 */ sw $t1, 0x0014($sp) -/* 00104 80B22DF4 AFA80010 */ sw $t0, 0x0010($sp) +/* 000FC 80B22DEC AFAA0018 */ sw $t2, 0x0018($sp) +/* 00100 80B22DF0 AFA90014 */ sw $t1, 0x0014($sp) +/* 00104 80B22DF4 AFA80010 */ sw $t0, 0x0010($sp) /* 00108 80B22DF8 24E71CDC */ addiu $a3, $a3, 0x1CDC ## $a3 = 06001CDC /* 0010C 80B22DFC 24C6C530 */ addiu $a2, $a2, 0xC530 ## $a2 = 0600C530 -/* 00110 80B22E00 0C0291BE */ jal func_800A46F8 +/* 00110 80B22E00 0C0291BE */ jal SkelAnime_InitSV /* 00114 80B22E04 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C /* 00118 80B22E08 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0011C 80B22E0C 24A51CDC */ addiu $a1, $a1, 0x1CDC ## $a1 = 06001CDC -/* 00120 80B22E10 0C02947A */ jal func_800A51E8 +/* 00120 80B22E10 0C02947A */ jal func_800A51E8 /* 00124 80B22E14 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00128 80B22E18 3C0580B2 */ lui $a1, %hi(func_80B23A88) ## $a1 = 80B20000 /* 0012C 80B22E1C AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 /* 00130 80B22E20 24A53A88 */ addiu $a1, $a1, %lo(func_80B23A88) ## $a1 = 80B23A88 -/* 00134 80B22E24 0C2C8B3C */ jal func_80B22CF0 +/* 00134 80B22E24 0C2C8B3C */ jal func_80B22CF0 /* 00138 80B22E28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0013C 80B22E2C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 00140 80B22E30 10000006 */ beq $zero, $zero, .L80B22E4C +/* 00140 80B22E30 10000006 */ beq $zero, $zero, .L80B22E4C /* 00144 80B22E34 A60B02D8 */ sh $t3, 0x02D8($s0) ## 000002D8 .L80B22E38: /* 00148 80B22E38 3C0580B2 */ lui $a1, %hi(D_80B24404) ## $a1 = 80B20000 /* 0014C 80B22E3C 24A54404 */ addiu $a1, $a1, %lo(D_80B24404) ## $a1 = 80B24404 /* 00150 80B22E40 24844400 */ addiu $a0, $a0, %lo(D_80B24400) ## $a0 = 00004400 /* 00154 80B22E44 0C0007FC */ jal __assert - + /* 00158 80B22E48 24060115 */ addiu $a2, $zero, 0x0115 ## $a2 = 00000115 .L80B22E4C: -/* 0015C 80B22E4C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00160 80B22E50 8FB00024 */ lw $s0, 0x0024($sp) -/* 00164 80B22E54 8FB10028 */ lw $s1, 0x0028($sp) -/* 00168 80B22E58 03E00008 */ jr $ra +/* 0015C 80B22E4C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00160 80B22E50 8FB00024 */ lw $s0, 0x0024($sp) +/* 00164 80B22E54 8FB10028 */ lw $s1, 0x0028($sp) +/* 00168 80B22E58 03E00008 */ jr $ra /* 0016C 80B22E5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s index 9ed678ec85..b545ee13ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s @@ -1,92 +1,92 @@ glabel EnTr_Update /* 00ECC 80B23BBC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00ED0 80B23BC0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00ED4 80B23BC4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00ED4 80B23BC4 AFB00028 */ sw $s0, 0x0028($sp) /* 00ED8 80B23BC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EDC 80B23BCC AFBF002C */ sw $ra, 0x002C($sp) -/* 00EE0 80B23BD0 AFA5004C */ sw $a1, 0x004C($sp) +/* 00EDC 80B23BCC AFBF002C */ sw $ra, 0x002C($sp) +/* 00EE0 80B23BD0 AFA5004C */ sw $a1, 0x004C($sp) /* 00EE4 80B23BD4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00EE8 80B23BD8 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00EEC 80B23BDC 44060000 */ mfc1 $a2, $f0 -/* 00EF0 80B23BE0 44070000 */ mfc1 $a3, $f0 -/* 00EF4 80B23BE4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00EEC 80B23BDC 44060000 */ mfc1 $a2, $f0 +/* 00EF0 80B23BE0 44070000 */ mfc1 $a3, $f0 +/* 00EF4 80B23BE4 AFAE0014 */ sw $t6, 0x0014($sp) /* 00EF8 80B23BE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00EFC 80B23BEC 0C00B92D */ jal func_8002E4B4 -/* 00F00 80B23BF0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00EFC 80B23BEC 0C00B92D */ jal func_8002E4B4 +/* 00F00 80B23BF0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00F04 80B23BF4 8E1902DC */ lw $t9, 0x02DC($s0) ## 000002DC /* 00F08 80B23BF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F0C 80B23BFC 8FA5004C */ lw $a1, 0x004C($sp) -/* 00F10 80B23C00 0320F809 */ jalr $ra, $t9 +/* 00F0C 80B23BFC 8FA5004C */ lw $a1, 0x004C($sp) +/* 00F10 80B23C00 0320F809 */ jalr $ra, $t9 /* 00F14 80B23C04 00000000 */ nop /* 00F18 80B23C08 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00F1C 80B23C0C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00F20 80B23C10 AFA40034 */ sw $a0, 0x0034($sp) -/* 00F24 80B23C14 5040003B */ beql $v0, $zero, .L80B23D04 + +/* 00F20 80B23C10 AFA40034 */ sw $a0, 0x0034($sp) +/* 00F24 80B23C14 5040003B */ beql $v0, $zero, .L80B23D04 /* 00F28 80B23C18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F2C 80B23C1C 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 /* 00F30 80B23C20 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 /* 00F34 80B23C24 25EF35CC */ addiu $t7, $t7, 0x35CC ## $t7 = 060035CC -/* 00F38 80B23C28 50A00033 */ beql $a1, $zero, .L80B23CF8 +/* 00F38 80B23C28 50A00033 */ beql $a1, $zero, .L80B23CF8 /* 00F3C 80B23C2C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00F40 80B23C30 11E50004 */ beq $t7, $a1, .L80B23C44 +/* 00F40 80B23C30 11E50004 */ beq $t7, $a1, .L80B23C44 /* 00F44 80B23C34 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 /* 00F48 80B23C38 271813CC */ addiu $t8, $t8, 0x13CC ## $t8 = 060013CC -/* 00F4C 80B23C3C 17050011 */ bne $t8, $a1, .L80B23C84 +/* 00F4C 80B23C3C 17050011 */ bne $t8, $a1, .L80B23C84 /* 00F50 80B23C40 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 .L80B23C44: /* 00F54 80B23C44 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 00F58 80B23C48 240539B1 */ addiu $a1, $zero, 0x39B1 ## $a1 = 000039B1 /* 00F5C 80B23C4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F60 80B23C50 11000005 */ beq $t0, $zero, .L80B23C68 +/* 00F60 80B23C50 11000005 */ beq $t0, $zero, .L80B23C68 /* 00F64 80B23C54 00000000 */ nop /* 00F68 80B23C58 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00F6C 80B23C5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F70 80B23C60 10000004 */ beq $zero, $zero, .L80B23C74 -/* 00F74 80B23C64 8FA40034 */ lw $a0, 0x0034($sp) +/* 00F70 80B23C60 10000004 */ beq $zero, $zero, .L80B23C74 +/* 00F74 80B23C64 8FA40034 */ lw $a0, 0x0034($sp) .L80B23C68: /* 00F78 80B23C68 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00F7C 80B23C6C 240539B0 */ addiu $a1, $zero, 0x39B0 ## $a1 = 000039B0 -/* 00F80 80B23C70 8FA40034 */ lw $a0, 0x0034($sp) +/* 00F80 80B23C70 8FA40034 */ lw $a0, 0x0034($sp) .L80B23C74: -/* 00F84 80B23C74 0C0294BE */ jal func_800A52F8 +/* 00F84 80B23C74 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00F88 80B23C78 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 -/* 00F8C 80B23C7C 1000001B */ beq $zero, $zero, .L80B23CEC +/* 00F8C 80B23C7C 1000001B */ beq $zero, $zero, .L80B23CEC /* 00F90 80B23C80 00000000 */ nop .L80B23C84: /* 00F94 80B23C84 252949C8 */ addiu $t1, $t1, 0x49C8 ## $t1 = 000049C8 -/* 00F98 80B23C88 15250016 */ bne $t1, $a1, .L80B23CE4 +/* 00F98 80B23C88 15250016 */ bne $t1, $a1, .L80B23CE4 /* 00F9C 80B23C8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00FA0 80B23C90 3C0580B2 */ lui $a1, %hi(func_80B22F28) ## $a1 = 80B20000 -/* 00FA4 80B23C94 0C2C8B3C */ jal func_80B22CF0 +/* 00FA4 80B23C94 0C2C8B3C */ jal func_80B22CF0 /* 00FA8 80B23C98 24A52F28 */ addiu $a1, $a1, %lo(func_80B22F28) ## $a1 = 80B22F28 /* 00FAC 80B23C9C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00FB0 80B23CA0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00FB4 80B23CA4 248449C8 */ addiu $a0, $a0, 0x49C8 ## $a0 = 060049C8 /* 00FB8 80B23CA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00FBC 80B23CAC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00FC0 80B23CB0 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 00FC4 80B23CB4 468021A0 */ cvt.s.w $f6, $f4 +/* 00FC4 80B23CB4 468021A0 */ cvt.s.w $f6, $f4 /* 00FC8 80B23CB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00FCC 80B23CBC 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 -/* 00FD0 80B23CC0 8FA40034 */ lw $a0, 0x0034($sp) +/* 00FD0 80B23CC0 8FA40034 */ lw $a0, 0x0034($sp) /* 00FD4 80B23CC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FD8 80B23CC8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FDC 80B23CCC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00FE0 80B23CD0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00FDC 80B23CCC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00FE0 80B23CD0 AFA00014 */ sw $zero, 0x0014($sp) /* 00FE4 80B23CD4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00FE8 80B23CD8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00FEC 80B23CDC 10000003 */ beq $zero, $zero, .L80B23CEC + +/* 00FE8 80B23CD8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00FEC 80B23CDC 10000003 */ beq $zero, $zero, .L80B23CEC /* 00FF0 80B23CE0 00000000 */ nop .L80B23CE4: -/* 00FF4 80B23CE4 0C0294BE */ jal func_800A52F8 -/* 00FF8 80B23CE8 8FA40034 */ lw $a0, 0x0034($sp) +/* 00FF4 80B23CE4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00FF8 80B23CE8 8FA40034 */ lw $a0, 0x0034($sp) .L80B23CEC: -/* 00FFC 80B23CEC 10000004 */ beq $zero, $zero, .L80B23D00 +/* 00FFC 80B23CEC 10000004 */ beq $zero, $zero, .L80B23D00 /* 01000 80B23CF0 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 /* 01004 80B23CF4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 .L80B23CF8: @@ -96,38 +96,38 @@ glabel EnTr_Update /* 01010 80B23D00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B23D04: /* 01014 80B23D04 0C00B56E */ jal Actor_SetHeight - + /* 01018 80B23D08 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0101C 80B23D0C 860302E2 */ lh $v1, 0x02E2($s0) ## 000002E2 /* 01020 80B23D10 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 01024 80B23D14 14600003 */ bne $v1, $zero, .L80B23D24 +/* 01024 80B23D14 14600003 */ bne $v1, $zero, .L80B23D24 /* 01028 80B23D18 246AFFFF */ addiu $t2, $v1, 0xFFFF ## $t2 = FFFFFFFF -/* 0102C 80B23D1C 10000004 */ beq $zero, $zero, .L80B23D30 +/* 0102C 80B23D1C 10000004 */ beq $zero, $zero, .L80B23D30 /* 01030 80B23D20 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80B23D24: /* 01034 80B23D24 A60A02E2 */ sh $t2, 0x02E2($s0) ## 000002E2 /* 01038 80B23D28 860302E2 */ lh $v1, 0x02E2($s0) ## 000002E2 /* 0103C 80B23D2C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80B23D30: -/* 01040 80B23D30 54400006 */ bnel $v0, $zero, .L80B23D4C +/* 01040 80B23D30 54400006 */ bnel $v0, $zero, .L80B23D4C /* 01044 80B23D34 A60302E0 */ sh $v1, 0x02E0($s0) ## 000002E0 /* 01048 80B23D38 0C01DF64 */ jal Math_Rand_S16Offset - + /* 0104C 80B23D3C 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C /* 01050 80B23D40 A60202E2 */ sh $v0, 0x02E2($s0) ## 000002E2 /* 01054 80B23D44 860302E2 */ lh $v1, 0x02E2($s0) ## 000002E2 /* 01058 80B23D48 A60302E0 */ sh $v1, 0x02E0($s0) ## 000002E0 .L80B23D4C: /* 0105C 80B23D4C 860B02E0 */ lh $t3, 0x02E0($s0) ## 000002E0 -/* 01060 80B23D50 29610003 */ slti $at, $t3, 0x0003 -/* 01064 80B23D54 54200003 */ bnel $at, $zero, .L80B23D64 -/* 01068 80B23D58 8FBF002C */ lw $ra, 0x002C($sp) +/* 01060 80B23D50 29610003 */ slti $at, $t3, 0x0003 +/* 01064 80B23D54 54200003 */ bnel $at, $zero, .L80B23D64 +/* 01068 80B23D58 8FBF002C */ lw $ra, 0x002C($sp) /* 0106C 80B23D5C A60002E0 */ sh $zero, 0x02E0($s0) ## 000002E0 -/* 01070 80B23D60 8FBF002C */ lw $ra, 0x002C($sp) +/* 01070 80B23D60 8FBF002C */ lw $ra, 0x002C($sp) .L80B23D64: -/* 01074 80B23D64 8FB00028 */ lw $s0, 0x0028($sp) +/* 01074 80B23D64 8FB00028 */ lw $s0, 0x0028($sp) /* 01078 80B23D68 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0107C 80B23D6C 03E00008 */ jr $ra +/* 0107C 80B23D6C 03E00008 */ jr $ra /* 01080 80B23D70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s index b58a075999..2d44891c69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s @@ -1,55 +1,55 @@ glabel func_80B23820 /* 00B30 80B23820 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B34 80B23824 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B38 80B23828 AFB00018 */ sw $s0, 0x0018($sp) +/* 00B34 80B23824 AFBF001C */ sw $ra, 0x001C($sp) +/* 00B38 80B23828 AFB00018 */ sw $s0, 0x0018($sp) /* 00B3C 80B2382C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C /* 00B40 80B23830 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00B44 80B23834 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00B48 80B23838 51C00025 */ beql $t6, $zero, .L80B238D0 -/* 00B4C 80B2383C 8FBF001C */ lw $ra, 0x001C($sp) +/* 00B48 80B23838 51C00025 */ beql $t6, $zero, .L80B238D0 +/* 00B4C 80B2383C 8FBF001C */ lw $ra, 0x001C($sp) /* 00B50 80B23840 848F02D8 */ lh $t7, 0x02D8($a0) ## 000002D8 -/* 00B54 80B23844 000FC080 */ sll $t8, $t7, 2 -/* 00B58 80B23848 00B8C821 */ addu $t9, $a1, $t8 +/* 00B54 80B23844 000FC080 */ sll $t8, $t7, 2 +/* 00B58 80B23848 00B8C821 */ addu $t9, $a1, $t8 /* 00B5C 80B2384C 8F221D8C */ lw $v0, 0x1D8C($t9) ## 00001D8C -/* 00B60 80B23850 5040001F */ beql $v0, $zero, .L80B238D0 -/* 00B64 80B23854 8FBF001C */ lw $ra, 0x001C($sp) +/* 00B60 80B23850 5040001F */ beql $v0, $zero, .L80B238D0 +/* 00B64 80B23854 8FBF001C */ lw $ra, 0x001C($sp) /* 00B68 80B23858 94430000 */ lhu $v1, 0x0000($v0) ## 00000000 /* 00B6C 80B2385C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00B70 80B23860 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B74 80B23864 10610004 */ beq $v1, $at, .L80B23878 +/* 00B74 80B23864 10610004 */ beq $v1, $at, .L80B23878 /* 00B78 80B23868 2405390D */ addiu $a1, $zero, 0x390D ## $a1 = 0000390D /* 00B7C 80B2386C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B80 80B23870 54610017 */ bnel $v1, $at, .L80B238D0 -/* 00B84 80B23874 8FBF001C */ lw $ra, 0x001C($sp) +/* 00B80 80B23870 54610017 */ bnel $v1, $at, .L80B238D0 +/* 00B84 80B23874 8FBF001C */ lw $ra, 0x001C($sp) .L80B23878: /* 00B88 80B23878 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00B8C 80B2387C AFA70024 */ sw $a3, 0x0024($sp) -/* 00B90 80B23880 8FA50024 */ lw $a1, 0x0024($sp) + +/* 00B8C 80B2387C AFA70024 */ sw $a3, 0x0024($sp) +/* 00B90 80B23880 8FA50024 */ lw $a1, 0x0024($sp) /* 00B94 80B23884 24080022 */ addiu $t0, $zero, 0x0022 ## $t0 = 00000022 /* 00B98 80B23888 A60802D6 */ sh $t0, 0x02D6($s0) ## 000002D6 /* 00B9C 80B2388C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BA0 80B23890 0C2C90AD */ jal func_80B242B4 +/* 00BA0 80B23890 0C2C90AD */ jal func_80B242B4 /* 00BA4 80B23894 860602D8 */ lh $a2, 0x02D8($s0) ## 000002D8 /* 00BA8 80B23898 3C0580B2 */ lui $a1, %hi(func_80B23690) ## $a1 = 80B20000 /* 00BAC 80B2389C 24A53690 */ addiu $a1, $a1, %lo(func_80B23690) ## $a1 = 80B23690 -/* 00BB0 80B238A0 0C2C8B3C */ jal func_80B22CF0 +/* 00BB0 80B238A0 0C2C8B3C */ jal func_80B22CF0 /* 00BB4 80B238A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00BB8 80B238A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00BBC 80B238AC 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 -/* 00BC0 80B238B0 0C0294BE */ jal func_800A52F8 +/* 00BC0 80B238B0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00BC4 80B238B4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00BC8 80B238B8 3C053B44 */ lui $a1, 0x3B44 ## $a1 = 3B440000 /* 00BCC 80B238BC AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 /* 00BD0 80B238C0 34A59BA6 */ ori $a1, $a1, 0x9BA6 ## $a1 = 3B449BA6 /* 00BD4 80B238C4 0C00B58B */ jal Actor_SetScale - + /* 00BD8 80B238C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BDC 80B238CC 8FBF001C */ lw $ra, 0x001C($sp) +/* 00BDC 80B238CC 8FBF001C */ lw $ra, 0x001C($sp) .L80B238D0: -/* 00BE0 80B238D0 8FB00018 */ lw $s0, 0x0018($sp) +/* 00BE0 80B238D0 8FB00018 */ lw $s0, 0x0018($sp) /* 00BE4 80B238D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00BE8 80B238D8 03E00008 */ jr $ra +/* 00BE8 80B238D8 03E00008 */ jr $ra /* 00BEC 80B238DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s index 2f66b56758..3063fdfd2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s @@ -1,87 +1,87 @@ glabel func_80B23A88 /* 00D98 80B23A88 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D9C 80B23A8C AFBF001C */ sw $ra, 0x001C($sp) -/* 00DA0 80B23A90 AFB00018 */ sw $s0, 0x0018($sp) +/* 00D9C 80B23A8C AFBF001C */ sw $ra, 0x001C($sp) +/* 00DA0 80B23A90 AFB00018 */ sw $s0, 0x0018($sp) /* 00DA4 80B23A94 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C /* 00DA8 80B23A98 3C070001 */ lui $a3, 0x0001 ## $a3 = 00010000 -/* 00DAC 80B23A9C 00E53821 */ addu $a3, $a3, $a1 +/* 00DAC 80B23A9C 00E53821 */ addu $a3, $a3, $a1 /* 00DB0 80B23AA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DB4 80B23AA4 11C00040 */ beq $t6, $zero, .L80B23BA8 +/* 00DB4 80B23AA4 11C00040 */ beq $t6, $zero, .L80B23BA8 /* 00DB8 80B23AA8 8CE71DE4 */ lw $a3, 0x1DE4($a3) ## 00011DE4 /* 00DBC 80B23AAC 848602D8 */ lh $a2, 0x02D8($a0) ## 000002D8 -/* 00DC0 80B23AB0 00067880 */ sll $t7, $a2, 2 -/* 00DC4 80B23AB4 00AFC021 */ addu $t8, $a1, $t7 +/* 00DC0 80B23AB0 00067880 */ sll $t7, $a2, 2 +/* 00DC4 80B23AB4 00AFC021 */ addu $t8, $a1, $t7 /* 00DC8 80B23AB8 8F031D8C */ lw $v1, 0x1D8C($t8) ## 00001D8C -/* 00DCC 80B23ABC 5060003B */ beql $v1, $zero, .L80B23BAC -/* 00DD0 80B23AC0 8FBF001C */ lw $ra, 0x001C($sp) +/* 00DCC 80B23ABC 5060003B */ beql $v1, $zero, .L80B23BAC +/* 00DD0 80B23AC0 8FBF001C */ lw $ra, 0x001C($sp) /* 00DD4 80B23AC4 94620000 */ lhu $v0, 0x0000($v1) ## 00000000 /* 00DD8 80B23AC8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00DDC 80B23ACC 1041000A */ beq $v0, $at, .L80B23AF8 +/* 00DDC 80B23ACC 1041000A */ beq $v0, $at, .L80B23AF8 /* 00DE0 80B23AD0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00DE4 80B23AD4 10410010 */ beq $v0, $at, .L80B23B18 +/* 00DE4 80B23AD4 10410010 */ beq $v0, $at, .L80B23B18 /* 00DE8 80B23AD8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00DEC 80B23ADC 1041001A */ beq $v0, $at, .L80B23B48 +/* 00DEC 80B23ADC 1041001A */ beq $v0, $at, .L80B23B48 /* 00DF0 80B23AE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DF4 80B23AE4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00DF8 80B23AE8 1041001C */ beq $v0, $at, .L80B23B5C +/* 00DF8 80B23AE8 1041001C */ beq $v0, $at, .L80B23B5C /* 00DFC 80B23AEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E00 80B23AF0 1000002E */ beq $zero, $zero, .L80B23BAC -/* 00E04 80B23AF4 8FBF001C */ lw $ra, 0x001C($sp) +/* 00E00 80B23AF0 1000002E */ beq $zero, $zero, .L80B23BAC +/* 00E04 80B23AF4 8FBF001C */ lw $ra, 0x001C($sp) .L80B23AF8: -/* 00E08 80B23AF8 0C2C90AD */ jal func_80B242B4 +/* 00E08 80B23AF8 0C2C90AD */ jal func_80B242B4 /* 00E0C 80B23AFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E10 80B23B00 3C0580B2 */ lui $a1, %hi(func_80B239A8) ## $a1 = 80B20000 /* 00E14 80B23B04 24A539A8 */ addiu $a1, $a1, %lo(func_80B239A8) ## $a1 = 80B239A8 -/* 00E18 80B23B08 0C2C8B3C */ jal func_80B22CF0 +/* 00E18 80B23B08 0C2C8B3C */ jal func_80B22CF0 /* 00E1C 80B23B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E20 80B23B10 10000026 */ beq $zero, $zero, .L80B23BAC -/* 00E24 80B23B14 8FBF001C */ lw $ra, 0x001C($sp) +/* 00E20 80B23B10 10000026 */ beq $zero, $zero, .L80B23BAC +/* 00E24 80B23B14 8FBF001C */ lw $ra, 0x001C($sp) .L80B23B18: -/* 00E28 80B23B18 0C2C90AD */ jal func_80B242B4 +/* 00E28 80B23B18 0C2C90AD */ jal func_80B242B4 /* 00E2C 80B23B1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E30 80B23B20 3C0580B2 */ lui $a1, %hi(func_80B22F28) ## $a1 = 80B20000 /* 00E34 80B23B24 24A52F28 */ addiu $a1, $a1, %lo(func_80B22F28) ## $a1 = 80B22F28 -/* 00E38 80B23B28 0C2C8B3C */ jal func_80B22CF0 +/* 00E38 80B23B28 0C2C8B3C */ jal func_80B22CF0 /* 00E3C 80B23B2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E40 80B23B30 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E44 80B23B34 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 -/* 00E48 80B23B38 0C0294BE */ jal func_800A52F8 +/* 00E48 80B23B38 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00E4C 80B23B3C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00E50 80B23B40 10000019 */ beq $zero, $zero, .L80B23BA8 +/* 00E50 80B23B40 10000019 */ beq $zero, $zero, .L80B23BA8 /* 00E54 80B23B44 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 .L80B23B48: /* 00E58 80B23B48 3C0580B2 */ lui $a1, %hi(func_80B23820) ## $a1 = 80B20000 -/* 00E5C 80B23B4C 0C2C8B3C */ jal func_80B22CF0 +/* 00E5C 80B23B4C 0C2C8B3C */ jal func_80B22CF0 /* 00E60 80B23B50 24A53820 */ addiu $a1, $a1, %lo(func_80B23820) ## $a1 = 80B23820 -/* 00E64 80B23B54 10000014 */ beq $zero, $zero, .L80B23BA8 +/* 00E64 80B23B54 10000014 */ beq $zero, $zero, .L80B23BA8 /* 00E68 80B23B58 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 .L80B23B5C: /* 00E6C 80B23B5C 3C0580B2 */ lui $a1, %hi(func_80B230D8) ## $a1 = 80B20000 /* 00E70 80B23B60 24A530D8 */ addiu $a1, $a1, %lo(func_80B230D8) ## $a1 = 80B230D8 -/* 00E74 80B23B64 0C2C8B3C */ jal func_80B22CF0 -/* 00E78 80B23B68 AFA70024 */ sw $a3, 0x0024($sp) +/* 00E74 80B23B64 0C2C8B3C */ jal func_80B22CF0 +/* 00E78 80B23B68 AFA70024 */ sw $a3, 0x0024($sp) /* 00E7C 80B23B6C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E80 80B23B70 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 -/* 00E84 80B23B74 0C0294BE */ jal func_800A52F8 +/* 00E84 80B23B74 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00E88 80B23B78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00E8C 80B23B7C 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 00E90 80B23B80 8FA70024 */ lw $a3, 0x0024($sp) +/* 00E90 80B23B80 8FA70024 */ lw $a3, 0x0024($sp) /* 00E94 80B23B84 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 -/* 00E98 80B23B88 13200006 */ beq $t9, $zero, .L80B23BA4 -/* 00E9C 80B23B8C 00076280 */ sll $t4, $a3, 10 -/* 00EA0 80B23B90 00074A80 */ sll $t1, $a3, 10 +/* 00E98 80B23B88 13200006 */ beq $t9, $zero, .L80B23BA4 +/* 00E9C 80B23B8C 00076280 */ sll $t4, $a3, 10 +/* 00EA0 80B23B90 00074A80 */ sll $t1, $a3, 10 /* 00EA4 80B23B94 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00EA8 80B23B98 01215021 */ addu $t2, $t1, $at -/* 00EAC 80B23B9C 10000002 */ beq $zero, $zero, .L80B23BA8 +/* 00EA8 80B23B98 01215021 */ addu $t2, $t1, $at +/* 00EAC 80B23B9C 10000002 */ beq $zero, $zero, .L80B23BA8 /* 00EB0 80B23BA0 A60A02D6 */ sh $t2, 0x02D6($s0) ## 000002D6 .L80B23BA4: /* 00EB4 80B23BA4 A60C02D6 */ sh $t4, 0x02D6($s0) ## 000002D6 .L80B23BA8: -/* 00EB8 80B23BA8 8FBF001C */ lw $ra, 0x001C($sp) +/* 00EB8 80B23BA8 8FBF001C */ lw $ra, 0x001C($sp) .L80B23BAC: -/* 00EBC 80B23BAC 8FB00018 */ lw $s0, 0x0018($sp) +/* 00EBC 80B23BAC 8FB00018 */ lw $s0, 0x0018($sp) /* 00EC0 80B23BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00EC4 80B23BB4 03E00008 */ jr $ra +/* 00EC4 80B23BB4 03E00008 */ jr $ra /* 00EC8 80B23BB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s index 9ac1eb62ec..237b379f2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s @@ -1,19 +1,19 @@ glabel EnVali_Draw /* 02068 80B28718 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 0206C 80B2871C AFB1002C */ sw $s1, 0x002C($sp) +/* 0206C 80B2871C AFB1002C */ sw $s1, 0x002C($sp) /* 02070 80B28720 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02074 80B28724 AFBF0034 */ sw $ra, 0x0034($sp) -/* 02078 80B28728 AFB20030 */ sw $s2, 0x0030($sp) -/* 0207C 80B2872C AFB00028 */ sw $s0, 0x0028($sp) +/* 02074 80B28724 AFBF0034 */ sw $ra, 0x0034($sp) +/* 02078 80B28728 AFB20030 */ sw $s2, 0x0030($sp) +/* 0207C 80B2872C AFB00028 */ sw $s0, 0x0028($sp) /* 02080 80B28730 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02084 80B28734 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 02088 80B28738 3C0680B3 */ lui $a2, %hi(D_80B28A30) ## $a2 = 80B30000 /* 0208C 80B2873C 24C68A30 */ addiu $a2, $a2, %lo(D_80B28A30) ## $a2 = 80B28A30 /* 02090 80B28740 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 02094 80B28744 240705E1 */ addiu $a3, $zero, 0x05E1 ## $a3 = 000005E1 -/* 02098 80B28748 0C031AB1 */ jal func_800C6AC4 +/* 02098 80B28748 0C031AB1 */ jal func_800C6AC4 /* 0209C 80B2874C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 020A0 80B28750 0C024F61 */ jal func_80093D84 +/* 020A0 80B28750 0C024F61 */ jal func_80093D84 /* 020A4 80B28754 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 020A8 80B28758 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 020AC 80B2875C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -21,23 +21,23 @@ glabel EnVali_Draw /* 020B4 80B28764 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 020B8 80B28768 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 020BC 80B2876C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 020C0 80B28770 0311C021 */ addu $t8, $t8, $s1 +/* 020C0 80B28770 0311C021 */ addu $t8, $t8, $s1 /* 020C4 80B28774 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 020C8 80B28778 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 /* 020CC 80B2877C 2408007F */ addiu $t0, $zero, 0x007F ## $t0 = 0000007F /* 020D0 80B28780 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 020D4 80B28784 0018C880 */ sll $t9, $t8, 2 -/* 020D8 80B28788 0338C823 */ subu $t9, $t9, $t8 -/* 020DC 80B2878C 0019C880 */ sll $t9, $t9, 2 -/* 020E0 80B28790 01193023 */ subu $a2, $t0, $t9 +/* 020D4 80B28784 0018C880 */ sll $t9, $t8, 2 +/* 020D8 80B28788 0338C823 */ subu $t9, $t9, $t8 +/* 020DC 80B2878C 0019C880 */ sll $t9, $t9, 2 +/* 020E0 80B28790 01193023 */ subu $a2, $t0, $t9 /* 020E4 80B28794 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 020E8 80B28798 AFA90010 */ sw $t1, 0x0010($sp) +/* 020E8 80B28798 AFA90010 */ sw $t1, 0x0010($sp) /* 020EC 80B2879C 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 /* 020F0 80B287A0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 020F4 80B287A4 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 020F8 80B287A8 0C0253A7 */ jal Draw_TexScroll -/* 020FC 80B287AC AFA20048 */ sw $v0, 0x0048($sp) -/* 02100 80B287B0 8FA30048 */ lw $v1, 0x0048($sp) +/* 020F8 80B287A8 0C0253A7 */ jal Draw_TexScroll +/* 020FC 80B287AC AFA20048 */ sw $v0, 0x0048($sp) +/* 02100 80B287B0 8FA30048 */ lw $v1, 0x0048($sp) /* 02104 80B287B4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 02108 80B287B8 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 0210C 80B287BC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -45,7 +45,7 @@ glabel EnVali_Draw /* 02114 80B287C4 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 /* 02118 80B287C8 37180024 */ ori $t8, $t8, 0x0024 ## $t8 = DB060024 /* 0211C 80B287CC 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 02120 80B287D0 11600009 */ beq $t3, $zero, .L80B287F8 +/* 02120 80B287D0 11600009 */ beq $t3, $zero, .L80B287F8 /* 02124 80B287D4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 02128 80B287D8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0212C 80B287DC 3C0E80B3 */ lui $t6, %hi(D_80B28998) ## $t6 = 80B30000 @@ -53,7 +53,7 @@ glabel EnVali_Draw /* 02134 80B287E4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 02138 80B287E8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 0213C 80B287EC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 02140 80B287F0 10000008 */ beq $zero, $zero, .L80B28814 +/* 02140 80B287F0 10000008 */ beq $zero, $zero, .L80B28814 /* 02144 80B287F4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 .L80B287F8: /* 02148 80B287F8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -64,31 +64,31 @@ glabel EnVali_Draw /* 0215C 80B2880C AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 02160 80B28810 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 .L80B28814: -/* 02164 80B28814 0C2CA0D1 */ jal func_80B28344 +/* 02164 80B28814 0C2CA0D1 */ jal func_80B28344 /* 02168 80B28818 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0216C 80B2881C 8E450150 */ lw $a1, 0x0150($s2) ## 00000150 /* 02170 80B28820 8E46016C */ lw $a2, 0x016C($s2) ## 0000016C /* 02174 80B28824 3C1980B3 */ lui $t9, %hi(func_80B28280) ## $t9 = 80B30000 /* 02178 80B28828 27398280 */ addiu $t9, $t9, %lo(func_80B28280) ## $t9 = 80B28280 -/* 0217C 80B2882C AFB90010 */ sw $t9, 0x0010($sp) -/* 02180 80B28830 AFB20014 */ sw $s2, 0x0014($sp) +/* 0217C 80B2882C AFB90010 */ sw $t9, 0x0010($sp) +/* 02180 80B28830 AFB20014 */ sw $s2, 0x0014($sp) /* 02184 80B28834 8E0902D0 */ lw $t1, 0x02D0($s0) ## 000002D0 /* 02188 80B28838 3C0780B3 */ lui $a3, %hi(func_80B281F0) ## $a3 = 80B30000 /* 0218C 80B2883C 24E781F0 */ addiu $a3, $a3, %lo(func_80B281F0) ## $a3 = 80B281F0 /* 02190 80B28840 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02194 80B28844 0C0288A2 */ jal func_800A2288 -/* 02198 80B28848 AFA90018 */ sw $t1, 0x0018($sp) +/* 02194 80B28844 0C0288A2 */ jal SkelAnime_Draw2 +/* 02198 80B28848 AFA90018 */ sw $t1, 0x0018($sp) /* 0219C 80B2884C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 021A0 80B28850 3C0680B3 */ lui $a2, %hi(D_80B28A40) ## $a2 = 80B30000 /* 021A4 80B28854 24C68A40 */ addiu $a2, $a2, %lo(D_80B28A40) ## $a2 = 80B28A40 /* 021A8 80B28858 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 021AC 80B2885C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 -/* 021B0 80B28860 0C031AD5 */ jal func_800C6B54 +/* 021B0 80B28860 0C031AD5 */ jal func_800C6B54 /* 021B4 80B28864 24070602 */ addiu $a3, $zero, 0x0602 ## $a3 = 00000602 -/* 021B8 80B28868 8FBF0034 */ lw $ra, 0x0034($sp) -/* 021BC 80B2886C 8FB00028 */ lw $s0, 0x0028($sp) -/* 021C0 80B28870 8FB1002C */ lw $s1, 0x002C($sp) -/* 021C4 80B28874 8FB20030 */ lw $s2, 0x0030($sp) -/* 021C8 80B28878 03E00008 */ jr $ra +/* 021B8 80B28868 8FBF0034 */ lw $ra, 0x0034($sp) +/* 021BC 80B2886C 8FB00028 */ lw $s0, 0x0028($sp) +/* 021C0 80B28870 8FB1002C */ lw $s1, 0x002C($sp) +/* 021C4 80B28874 8FB20030 */ lw $s2, 0x0030($sp) +/* 021C8 80B28878 03E00008 */ jr $ra /* 021CC 80B2887C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s index 169b64dcd0..848b71cc8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s @@ -1,13 +1,13 @@ glabel func_80B26878 /* 001C8 80B26878 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001CC 80B2687C AFBF0014 */ sw $ra, 0x0014($sp) +/* 001CC 80B2687C AFBF0014 */ sw $ra, 0x0014($sp) /* 001D0 80B26880 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 001D4 80B26884 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001D8 80B26888 24A514AC */ addiu $a1, $a1, 0x14AC ## $a1 = 060014AC -/* 001DC 80B2688C AFA60018 */ sw $a2, 0x0018($sp) -/* 001E0 80B26890 0C0294BE */ jal func_800A52F8 +/* 001DC 80B2688C AFA60018 */ sw $a2, 0x0018($sp) +/* 001E0 80B26890 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 001E4 80B26894 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001E8 80B26898 8FA60018 */ lw $a2, 0x0018($sp) +/* 001E8 80B26898 8FA60018 */ lw $a2, 0x0018($sp) /* 001EC 80B2689C 3C1880B2 */ lui $t8, %hi(func_80B27098) ## $t8 = 80B20000 /* 001F0 80B268A0 27187098 */ addiu $t8, $t8, %lo(func_80B27098) ## $t8 = 80B27098 /* 001F4 80B268A4 90CE040D */ lbu $t6, 0x040D($a2) ## 0000040D @@ -15,9 +15,9 @@ glabel func_80B26878 /* 001FC 80B268AC ACD80190 */ sw $t8, 0x0190($a2) ## 00000190 /* 00200 80B268B0 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 /* 00204 80B268B4 A0CF040D */ sb $t7, 0x040D($a2) ## 0000040D -/* 00208 80B268B8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00208 80B268B8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0020C 80B268BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00210 80B268C0 03E00008 */ jr $ra +/* 00210 80B268C0 03E00008 */ jr $ra /* 00214 80B268C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s index 3f1eb347ea..2e421fca59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s @@ -1,14 +1,14 @@ glabel func_80B268FC /* 0024C 80B268FC 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 00250 80B26900 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00250 80B26900 AFBF0014 */ sw $ra, 0x0014($sp) /* 00254 80B26904 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00258 80B26908 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0025C 80B2690C 24A50710 */ addiu $a1, $a1, 0x0710 ## $a1 = 06000710 -/* 00260 80B26910 AFA70090 */ sw $a3, 0x0090($sp) +/* 00260 80B26910 AFA70090 */ sw $a3, 0x0090($sp) /* 00264 80B26914 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00268 80B26918 0C0294D3 */ jal func_800A534C +/* 00268 80B26918 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0026C 80B2691C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00270 80B26920 8FA70090 */ lw $a3, 0x0090($sp) +/* 00270 80B26920 8FA70090 */ lw $a3, 0x0090($sp) /* 00274 80B26924 27A2003C */ addiu $v0, $sp, 0x003C ## $v0 = FFFFFFAC /* 00278 80B26928 27A30048 */ addiu $v1, $sp, 0x0048 ## $v1 = FFFFFFB8 /* 0027C 80B2692C 8CEF0024 */ lw $t7, 0x0024($a3) ## 00000024 @@ -104,7 +104,7 @@ glabel func_80B268FC /* 003E4 80B26A94 8CEC0004 */ lw $t4, 0x0004($a3) ## 00000004 /* 003E8 80B26A98 ACF80364 */ sw $t8, 0x0364($a3) ## 00000364 /* 003EC 80B26A9C 8D390008 */ lw $t9, 0x0008($t1) ## FFFFFFFC -/* 003F0 80B26AA0 46041001 */ sub.s $f0, $f2, $f4 +/* 003F0 80B26AA0 46041001 */ sub.s $f0, $f2, $f4 /* 003F4 80B26AA4 90EE040D */ lbu $t6, 0x040D($a3) ## 0000040D /* 003F8 80B26AA8 ACF90368 */ sw $t9, 0x0368($a3) ## 00000368 /* 003FC 80B26AAC 8D2B0000 */ lw $t3, 0x0000($t1) ## FFFFFFF4 @@ -112,7 +112,7 @@ glabel func_80B268FC /* 00404 80B26AB4 2718716C */ addiu $t8, $t8, %lo(func_80B2716C) ## $t8 = 80B2716C /* 00408 80B26AB8 ACEB0354 */ sw $t3, 0x0354($a3) ## 00000354 /* 0040C 80B26ABC 8D2A0004 */ lw $t2, 0x0004($t1) ## FFFFFFF8 -/* 00410 80B26AC0 01816824 */ and $t5, $t4, $at +/* 00410 80B26AC0 01816824 */ and $t5, $t4, $at /* 00414 80B26AC4 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 00418 80B26AC8 ACEA0358 */ sw $t2, 0x0358($a3) ## 00000358 /* 0041C 80B26ACC 8D2B0008 */ lw $t3, 0x0008($t1) ## FFFFFFFC @@ -130,9 +130,9 @@ glabel func_80B268FC /* 0044C 80B26AFC ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 00450 80B26B00 E4E202F8 */ swc1 $f2, 0x02F8($a3) ## 000002F8 /* 00454 80B26B04 ACEB035C */ sw $t3, 0x035C($a3) ## 0000035C -/* 00458 80B26B08 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00458 80B26B08 8FBF0014 */ lw $ra, 0x0014($sp) /* 0045C 80B26B0C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 -/* 00460 80B26B10 03E00008 */ jr $ra +/* 00460 80B26B10 03E00008 */ jr $ra /* 00464 80B26B14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s index 5f09dd9c31..3ed8e03846 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s @@ -1,92 +1,92 @@ glabel func_80B2A300 /* 00100 80B2A300 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00104 80B2A304 AFBF002C */ sw $ra, 0x002C($sp) -/* 00108 80B2A308 AFB00028 */ sw $s0, 0x0028($sp) -/* 0010C 80B2A30C AFA40038 */ sw $a0, 0x0038($sp) -/* 00110 80B2A310 AFA5003C */ sw $a1, 0x003C($sp) -/* 00114 80B2A314 AFA70044 */ sw $a3, 0x0044($sp) +/* 00104 80B2A304 AFBF002C */ sw $ra, 0x002C($sp) +/* 00108 80B2A308 AFB00028 */ sw $s0, 0x0028($sp) +/* 0010C 80B2A30C AFA40038 */ sw $a0, 0x0038($sp) +/* 00110 80B2A310 AFA5003C */ sw $a1, 0x003C($sp) +/* 00114 80B2A314 AFA70044 */ sw $a3, 0x0044($sp) /* 00118 80B2A318 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 0011C 80B2A31C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00120 80B2A320 8FA4003C */ lw $a0, 0x003C($sp) -/* 00124 80B2A324 00021203 */ sra $v0, $v0, 8 -/* 00128 80B2A328 00021400 */ sll $v0, $v0, 16 -/* 0012C 80B2A32C 00021403 */ sra $v0, $v0, 16 -/* 00130 80B2A330 1041000C */ beq $v0, $at, .L80B2A364 -/* 00134 80B2A334 8FB00038 */ lw $s0, 0x0038($sp) +/* 00120 80B2A320 8FA4003C */ lw $a0, 0x003C($sp) +/* 00124 80B2A324 00021203 */ sra $v0, $v0, 8 +/* 00128 80B2A328 00021400 */ sll $v0, $v0, 16 +/* 0012C 80B2A32C 00021403 */ sra $v0, $v0, 16 +/* 00130 80B2A330 1041000C */ beq $v0, $at, .L80B2A364 +/* 00134 80B2A334 8FB00038 */ lw $s0, 0x0038($sp) /* 00138 80B2A338 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0013C 80B2A33C 10410009 */ beq $v0, $at, .L80B2A364 +/* 0013C 80B2A33C 10410009 */ beq $v0, $at, .L80B2A364 /* 00140 80B2A340 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00144 80B2A344 10410007 */ beq $v0, $at, .L80B2A364 +/* 00144 80B2A344 10410007 */ beq $v0, $at, .L80B2A364 /* 00148 80B2A348 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0014C 80B2A34C 10410005 */ beq $v0, $at, .L80B2A364 +/* 0014C 80B2A34C 10410005 */ beq $v0, $at, .L80B2A364 /* 00150 80B2A350 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00154 80B2A354 10410003 */ beq $v0, $at, .L80B2A364 +/* 00154 80B2A354 10410003 */ beq $v0, $at, .L80B2A364 /* 00158 80B2A358 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0015C 80B2A35C 1441000B */ bne $v0, $at, .L80B2A38C +/* 0015C 80B2A35C 1441000B */ bne $v0, $at, .L80B2A38C /* 00160 80B2A360 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 .L80B2A364: /* 00164 80B2A364 26100198 */ addiu $s0, $s0, 0x0198 ## $s0 = 00000198 /* 00168 80B2A368 02002825 */ or $a1, $s0, $zero ## $a1 = 00000198 /* 0016C 80B2A36C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00170 80B2A370 AFA00010 */ sw $zero, 0x0010($sp) -/* 00174 80B2A374 AFA00014 */ sw $zero, 0x0014($sp) -/* 00178 80B2A378 AFA00018 */ sw $zero, 0x0018($sp) -/* 0017C 80B2A37C 0C0291BE */ jal func_800A46F8 -/* 00180 80B2A380 A7A20036 */ sh $v0, 0x0036($sp) -/* 00184 80B2A384 1000000B */ beq $zero, $zero, .L80B2A3B4 -/* 00188 80B2A388 87A20036 */ lh $v0, 0x0036($sp) +/* 00170 80B2A370 AFA00010 */ sw $zero, 0x0010($sp) +/* 00174 80B2A374 AFA00014 */ sw $zero, 0x0014($sp) +/* 00178 80B2A378 AFA00018 */ sw $zero, 0x0018($sp) +/* 0017C 80B2A37C 0C0291BE */ jal SkelAnime_InitSV +/* 00180 80B2A380 A7A20036 */ sh $v0, 0x0036($sp) +/* 00184 80B2A384 1000000B */ beq $zero, $zero, .L80B2A3B4 +/* 00188 80B2A388 87A20036 */ lh $v0, 0x0036($sp) .L80B2A38C: -/* 0018C 80B2A38C 8FB00038 */ lw $s0, 0x0038($sp) -/* 00190 80B2A390 8FA4003C */ lw $a0, 0x003C($sp) -/* 00194 80B2A394 AFA00010 */ sw $zero, 0x0010($sp) +/* 0018C 80B2A38C 8FB00038 */ lw $s0, 0x0038($sp) +/* 00190 80B2A390 8FA4003C */ lw $a0, 0x003C($sp) +/* 00194 80B2A394 AFA00010 */ sw $zero, 0x0010($sp) /* 00198 80B2A398 26100198 */ addiu $s0, $s0, 0x0198 ## $s0 = 00000330 /* 0019C 80B2A39C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000330 -/* 001A0 80B2A3A0 AFA00014 */ sw $zero, 0x0014($sp) -/* 001A4 80B2A3A4 AFA00018 */ sw $zero, 0x0018($sp) +/* 001A0 80B2A3A0 AFA00014 */ sw $zero, 0x0014($sp) +/* 001A4 80B2A3A4 AFA00018 */ sw $zero, 0x0018($sp) /* 001A8 80B2A3A8 0C02915F */ jal SkelAnime_Init - -/* 001AC 80B2A3AC A7A20036 */ sh $v0, 0x0036($sp) -/* 001B0 80B2A3B0 87A20036 */ lh $v0, 0x0036($sp) + +/* 001AC 80B2A3AC A7A20036 */ sh $v0, 0x0036($sp) +/* 001B0 80B2A3B0 87A20036 */ lh $v0, 0x0036($sp) .L80B2A3B4: -/* 001B4 80B2A3B4 8FB80038 */ lw $t8, 0x0038($sp) -/* 001B8 80B2A3B8 8FAF003C */ lw $t7, 0x003C($sp) +/* 001B4 80B2A3B4 8FB80038 */ lw $t8, 0x0038($sp) +/* 001B8 80B2A3B8 8FAF003C */ lw $t7, 0x003C($sp) /* 001BC 80B2A3BC 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 /* 001C0 80B2A3C0 831901DC */ lb $t9, 0x01DC($t8) ## 000001DC /* 001C4 80B2A3C4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 001C8 80B2A3C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000330 -/* 001CC 80B2A3CC 00194100 */ sll $t0, $t9, 4 -/* 001D0 80B2A3D0 01194021 */ addu $t0, $t0, $t9 -/* 001D4 80B2A3D4 00084080 */ sll $t0, $t0, 2 -/* 001D8 80B2A3D8 01E84821 */ addu $t1, $t7, $t0 -/* 001DC 80B2A3DC 01495021 */ addu $t2, $t2, $t1 +/* 001CC 80B2A3CC 00194100 */ sll $t0, $t9, 4 +/* 001D0 80B2A3D0 01194021 */ addu $t0, $t0, $t9 +/* 001D4 80B2A3D4 00084080 */ sll $t0, $t0, 2 +/* 001D8 80B2A3D8 01E84821 */ addu $t1, $t7, $t0 +/* 001DC 80B2A3DC 01495021 */ addu $t2, $t2, $t1 /* 001E0 80B2A3E0 8D4A17B4 */ lw $t2, 0x17B4($t2) ## 000117B4 -/* 001E4 80B2A3E4 8FA50044 */ lw $a1, 0x0044($sp) -/* 001E8 80B2A3E8 01415821 */ addu $t3, $t2, $at +/* 001E4 80B2A3E4 8FA50044 */ lw $a1, 0x0044($sp) +/* 001E8 80B2A3E8 01415821 */ addu $t3, $t2, $at /* 001EC 80B2A3EC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 001F0 80B2A3F0 AC2B6FC0 */ sw $t3, 0x6FC0($at) ## 80166FC0 /* 001F4 80B2A3F4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 001F8 80B2A3F8 10410007 */ beq $v0, $at, .L80B2A418 +/* 001F8 80B2A3F8 10410007 */ beq $v0, $at, .L80B2A418 /* 001FC 80B2A3FC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00200 80B2A400 10410005 */ beq $v0, $at, .L80B2A418 +/* 00200 80B2A400 10410005 */ beq $v0, $at, .L80B2A418 /* 00204 80B2A404 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00208 80B2A408 10410003 */ beq $v0, $at, .L80B2A418 +/* 00208 80B2A408 10410003 */ beq $v0, $at, .L80B2A418 /* 0020C 80B2A40C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 00210 80B2A410 14410005 */ bne $v0, $at, .L80B2A428 +/* 00210 80B2A410 14410005 */ bne $v0, $at, .L80B2A428 /* 00214 80B2A414 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 .L80B2A418: -/* 00218 80B2A418 0C0294E1 */ jal func_800A5384 +/* 00218 80B2A418 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 0021C 80B2A41C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00220 80B2A420 10000005 */ beq $zero, $zero, .L80B2A438 -/* 00224 80B2A424 8FBF002C */ lw $ra, 0x002C($sp) +/* 00220 80B2A420 10000005 */ beq $zero, $zero, .L80B2A438 +/* 00224 80B2A424 8FBF002C */ lw $ra, 0x002C($sp) .L80B2A428: /* 00228 80B2A428 02002025 */ or $a0, $s0, $zero ## $a0 = 00000330 -/* 0022C 80B2A42C 0C0294E1 */ jal func_800A5384 -/* 00230 80B2A430 8FA50044 */ lw $a1, 0x0044($sp) -/* 00234 80B2A434 8FBF002C */ lw $ra, 0x002C($sp) +/* 0022C 80B2A42C 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00230 80B2A430 8FA50044 */ lw $a1, 0x0044($sp) +/* 00234 80B2A434 8FBF002C */ lw $ra, 0x002C($sp) .L80B2A438: -/* 00238 80B2A438 8FB00028 */ lw $s0, 0x0028($sp) +/* 00238 80B2A438 8FB00028 */ lw $s0, 0x0028($sp) /* 0023C 80B2A43C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00240 80B2A440 03E00008 */ jr $ra +/* 00240 80B2A440 03E00008 */ jr $ra /* 00244 80B2A444 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s index eac3447e2d..95b6471018 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s @@ -1,39 +1,39 @@ glabel func_80B2A448 /* 00248 80B2A448 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0024C 80B2A44C AFA40030 */ sw $a0, 0x0030($sp) -/* 00250 80B2A450 AFA50034 */ sw $a1, 0x0034($sp) +/* 0024C 80B2A44C AFA40030 */ sw $a0, 0x0030($sp) +/* 00250 80B2A450 AFA50034 */ sw $a1, 0x0034($sp) /* 00254 80B2A454 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00258 80B2A458 8FA50030 */ lw $a1, 0x0030($sp) -/* 0025C 80B2A45C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00260 80B2A460 AFA7003C */ sw $a3, 0x003C($sp) +/* 00258 80B2A458 8FA50030 */ lw $a1, 0x0030($sp) +/* 0025C 80B2A45C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00260 80B2A460 AFA7003C */ sw $a3, 0x003C($sp) /* 00264 80B2A464 24A50198 */ addiu $a1, $a1, 0x0198 ## $a1 = 00000198 -/* 00268 80B2A468 AFA5002C */ sw $a1, 0x002C($sp) +/* 00268 80B2A468 AFA5002C */ sw $a1, 0x002C($sp) /* 0026C 80B2A46C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00270 80B2A470 AFA00010 */ sw $zero, 0x0010($sp) -/* 00274 80B2A474 AFA00014 */ sw $zero, 0x0014($sp) -/* 00278 80B2A478 0C0291BE */ jal func_800A46F8 -/* 0027C 80B2A47C AFA00018 */ sw $zero, 0x0018($sp) -/* 00280 80B2A480 8FAF0030 */ lw $t7, 0x0030($sp) -/* 00284 80B2A484 8FAE0034 */ lw $t6, 0x0034($sp) +/* 00270 80B2A470 AFA00010 */ sw $zero, 0x0010($sp) +/* 00274 80B2A474 AFA00014 */ sw $zero, 0x0014($sp) +/* 00278 80B2A478 0C0291BE */ jal SkelAnime_InitSV +/* 0027C 80B2A47C AFA00018 */ sw $zero, 0x0018($sp) +/* 00280 80B2A480 8FAF0030 */ lw $t7, 0x0030($sp) +/* 00284 80B2A484 8FAE0034 */ lw $t6, 0x0034($sp) /* 00288 80B2A488 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 0028C 80B2A48C 81F801DC */ lb $t8, 0x01DC($t7) ## 000001DC /* 00290 80B2A490 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00294 80B2A494 8FA4002C */ lw $a0, 0x002C($sp) -/* 00298 80B2A498 0018C900 */ sll $t9, $t8, 4 -/* 0029C 80B2A49C 0338C821 */ addu $t9, $t9, $t8 -/* 002A0 80B2A4A0 0019C880 */ sll $t9, $t9, 2 -/* 002A4 80B2A4A4 01D94021 */ addu $t0, $t6, $t9 -/* 002A8 80B2A4A8 01284821 */ addu $t1, $t1, $t0 +/* 00294 80B2A494 8FA4002C */ lw $a0, 0x002C($sp) +/* 00298 80B2A498 0018C900 */ sll $t9, $t8, 4 +/* 0029C 80B2A49C 0338C821 */ addu $t9, $t9, $t8 +/* 002A0 80B2A4A0 0019C880 */ sll $t9, $t9, 2 +/* 002A4 80B2A4A4 01D94021 */ addu $t0, $t6, $t9 +/* 002A8 80B2A4A8 01284821 */ addu $t1, $t1, $t0 /* 002AC 80B2A4AC 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 -/* 002B0 80B2A4B0 8FA5003C */ lw $a1, 0x003C($sp) +/* 002B0 80B2A4B0 8FA5003C */ lw $a1, 0x003C($sp) /* 002B4 80B2A4B4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 002B8 80B2A4B8 01215021 */ addu $t2, $t1, $at +/* 002B8 80B2A4B8 01215021 */ addu $t2, $t1, $at /* 002BC 80B2A4BC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 002C0 80B2A4C0 0C0294E1 */ jal func_800A5384 +/* 002C0 80B2A4C0 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 002C4 80B2A4C4 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 -/* 002C8 80B2A4C8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 002C8 80B2A4C8 8FBF0024 */ lw $ra, 0x0024($sp) /* 002CC 80B2A4CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 002D0 80B2A4D0 03E00008 */ jr $ra +/* 002D0 80B2A4D0 03E00008 */ jr $ra /* 002D4 80B2A4D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s index 36c0a0df07..5d7c9ea554 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s @@ -1,43 +1,43 @@ glabel func_80B2A4D8 /* 002D8 80B2A4D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002DC 80B2A4DC AFA40018 */ sw $a0, 0x0018($sp) -/* 002E0 80B2A4E0 AFA5001C */ sw $a1, 0x001C($sp) +/* 002DC 80B2A4DC AFA40018 */ sw $a0, 0x0018($sp) +/* 002E0 80B2A4E0 AFA5001C */ sw $a1, 0x001C($sp) /* 002E4 80B2A4E4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002E8 80B2A4E8 8FA50018 */ lw $a1, 0x0018($sp) -/* 002EC 80B2A4EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 002F0 80B2A4F0 AFA70024 */ sw $a3, 0x0024($sp) -/* 002F4 80B2A4F4 0C02998F */ jal func_800A663C +/* 002E8 80B2A4E8 8FA50018 */ lw $a1, 0x0018($sp) +/* 002EC 80B2A4EC AFBF0014 */ sw $ra, 0x0014($sp) +/* 002F0 80B2A4F0 AFA70024 */ sw $a3, 0x0024($sp) +/* 002F4 80B2A4F4 0C02998F */ jal func_800A663C /* 002F8 80B2A4F8 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 002FC 80B2A4FC 8FA80018 */ lw $t0, 0x0018($sp) -/* 00300 80B2A500 8FA70024 */ lw $a3, 0x0024($sp) +/* 002FC 80B2A4FC 8FA80018 */ lw $t0, 0x0018($sp) +/* 00300 80B2A500 8FA70024 */ lw $a3, 0x0024($sp) /* 00304 80B2A504 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00308 80B2A508 8503001C */ lh $v1, 0x001C($t0) ## 0000001C /* 0030C 80B2A50C 25040198 */ addiu $a0, $t0, 0x0198 ## $a0 = 00000198 /* 00310 80B2A510 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00314 80B2A514 00031A03 */ sra $v1, $v1, 8 +/* 00314 80B2A514 00031A03 */ sra $v1, $v1, 8 /* 00318 80B2A518 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 00000000 -/* 0031C 80B2A51C 1061000E */ beq $v1, $at, .L80B2A558 +/* 0031C 80B2A51C 1061000E */ beq $v1, $at, .L80B2A558 /* 00320 80B2A520 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00324 80B2A524 1061000C */ beq $v1, $at, .L80B2A558 +/* 00324 80B2A524 1061000C */ beq $v1, $at, .L80B2A558 /* 00328 80B2A528 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0032C 80B2A52C 1061000A */ beq $v1, $at, .L80B2A558 +/* 0032C 80B2A52C 1061000A */ beq $v1, $at, .L80B2A558 /* 00330 80B2A530 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00334 80B2A534 10610008 */ beq $v1, $at, .L80B2A558 +/* 00334 80B2A534 10610008 */ beq $v1, $at, .L80B2A558 /* 00338 80B2A538 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0033C 80B2A53C 10610006 */ beq $v1, $at, .L80B2A558 +/* 0033C 80B2A53C 10610006 */ beq $v1, $at, .L80B2A558 /* 00340 80B2A540 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00344 80B2A544 25040198 */ addiu $a0, $t0, 0x0198 ## $a0 = 00000198 -/* 00348 80B2A548 0C0294E1 */ jal func_800A5384 +/* 00348 80B2A548 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 0034C 80B2A54C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00350 80B2A550 10000004 */ beq $zero, $zero, .L80B2A564 -/* 00354 80B2A554 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00350 80B2A550 10000004 */ beq $zero, $zero, .L80B2A564 +/* 00354 80B2A554 8FBF0014 */ lw $ra, 0x0014($sp) .L80B2A558: -/* 00358 80B2A558 0C0294A7 */ jal func_800A529C +/* 00358 80B2A558 0C0294A7 */ jal func_800A529C /* 0035C 80B2A55C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00360 80B2A560 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00360 80B2A560 8FBF0014 */ lw $ra, 0x0014($sp) .L80B2A564: /* 00364 80B2A564 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00368 80B2A568 03E00008 */ jr $ra +/* 00368 80B2A568 03E00008 */ jr $ra /* 0036C 80B2A56C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s index c590ab68cb..d9e2d23b96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s @@ -1,92 +1,92 @@ glabel func_80B2A75C /* 0055C 80B2A75C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00560 80B2A760 AFBF003C */ sw $ra, 0x003C($sp) -/* 00564 80B2A764 AFB00038 */ sw $s0, 0x0038($sp) -/* 00568 80B2A768 AFA5005C */ sw $a1, 0x005C($sp) +/* 00560 80B2A760 AFBF003C */ sw $ra, 0x003C($sp) +/* 00564 80B2A764 AFB00038 */ sw $s0, 0x0038($sp) +/* 00568 80B2A768 AFA5005C */ sw $a1, 0x005C($sp) /* 0056C 80B2A76C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 00570 80B2A770 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00574 80B2A774 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00578 80B2A778 00021203 */ sra $v0, $v0, 8 +/* 00578 80B2A778 00021203 */ sra $v0, $v0, 8 /* 0057C 80B2A77C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 00580 80B2A780 14410015 */ bne $v0, $at, .L80B2A7D8 -/* 00584 80B2A784 AFA20044 */ sw $v0, 0x0044($sp) +/* 00580 80B2A780 14410015 */ bne $v0, $at, .L80B2A7D8 +/* 00584 80B2A784 AFA20044 */ sw $v0, 0x0044($sp) /* 00588 80B2A788 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 0058C 80B2A78C 8DEFF9C0 */ lw $t7, -0x0640($t7) ## 8015F9C0 /* 00590 80B2A790 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00594 80B2A794 15E100C0 */ bne $t7, $at, .L80B2AA98 +/* 00594 80B2A794 15E100C0 */ bne $t7, $at, .L80B2AA98 /* 00598 80B2A798 00000000 */ nop /* 0059C 80B2A79C 94A31D74 */ lhu $v1, 0x1D74($a1) ## 00001D74 /* 005A0 80B2A7A0 24010318 */ addiu $at, $zero, 0x0318 ## $at = 00000318 -/* 005A4 80B2A7A4 54610006 */ bnel $v1, $at, .L80B2A7C0 +/* 005A4 80B2A7A4 54610006 */ bnel $v1, $at, .L80B2A7C0 /* 005A8 80B2A7A8 2401034D */ addiu $at, $zero, 0x034D ## $at = 0000034D /* 005AC 80B2A7AC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 005B0 80B2A7B0 2405686E */ addiu $a1, $zero, 0x686E ## $a1 = 0000686E -/* 005B4 80B2A7B4 100000B8 */ beq $zero, $zero, .L80B2AA98 +/* 005B4 80B2A7B4 100000B8 */ beq $zero, $zero, .L80B2AA98 /* 005B8 80B2A7B8 00000000 */ nop /* 005BC 80B2A7BC 2401034D */ addiu $at, $zero, 0x034D ## $at = 0000034D .L80B2A7C0: -/* 005C0 80B2A7C0 146100B5 */ bne $v1, $at, .L80B2AA98 +/* 005C0 80B2A7C0 146100B5 */ bne $v1, $at, .L80B2AA98 /* 005C4 80B2A7C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005C8 80B2A7C8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 005CC 80B2A7CC 2405686F */ addiu $a1, $zero, 0x686F ## $a1 = 0000686F -/* 005D0 80B2A7D0 100000B1 */ beq $zero, $zero, .L80B2AA98 +/* 005D0 80B2A7D0 100000B1 */ beq $zero, $zero, .L80B2AA98 /* 005D4 80B2A7D4 00000000 */ nop .L80B2A7D8: -/* 005D8 80B2A7D8 8FB90044 */ lw $t9, 0x0044($sp) +/* 005D8 80B2A7D8 8FB90044 */ lw $t9, 0x0044($sp) /* 005DC 80B2A7DC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 005E0 80B2A7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005E4 80B2A7E4 1721000A */ bne $t9, $at, .L80B2A810 -/* 005E8 80B2A7E8 8FAA0044 */ lw $t2, 0x0044($sp) +/* 005E4 80B2A7E4 1721000A */ bne $t9, $at, .L80B2A810 +/* 005E8 80B2A7E8 8FAA0044 */ lw $t2, 0x0044($sp) /* 005EC 80B2A7EC 3C053E99 */ lui $a1, 0x3E99 ## $a1 = 3E990000 /* 005F0 80B2A7F0 0C00B58B */ jal Actor_SetScale - + /* 005F4 80B2A7F4 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E99999A /* 005F8 80B2A7F8 3C0180B3 */ lui $at, %hi(D_80B2D184) ## $at = 80B30000 -/* 005FC 80B2A7FC C420D184 */ lwc1 $f0, %lo(D_80B2D184)($at) +/* 005FC 80B2A7FC C420D184 */ lwc1 $f0, %lo(D_80B2D184)($at) /* 00600 80B2A800 E60000F4 */ swc1 $f0, 0x00F4($s0) ## 000000F4 /* 00604 80B2A804 E60000F8 */ swc1 $f0, 0x00F8($s0) ## 000000F8 -/* 00608 80B2A808 100000A3 */ beq $zero, $zero, .L80B2AA98 +/* 00608 80B2A808 100000A3 */ beq $zero, $zero, .L80B2AA98 /* 0060C 80B2A80C E60000FC */ swc1 $f0, 0x00FC($s0) ## 000000FC .L80B2A810: /* 00610 80B2A810 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00614 80B2A814 15410066 */ bne $t2, $at, .L80B2A9B0 +/* 00614 80B2A814 15410066 */ bne $t2, $at, .L80B2A9B0 /* 00618 80B2A818 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 0061C 80B2A81C 8C42F9C0 */ lw $v0, -0x0640($v0) ## 8015F9C0 /* 00620 80B2A820 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00624 80B2A824 8FAB005C */ lw $t3, 0x005C($sp) -/* 00628 80B2A828 5441002B */ bnel $v0, $at, .L80B2A8D8 -/* 0062C 80B2A82C 8FAE005C */ lw $t6, 0x005C($sp) +/* 00624 80B2A824 8FAB005C */ lw $t3, 0x005C($sp) +/* 00628 80B2A828 5441002B */ bnel $v0, $at, .L80B2A8D8 +/* 0062C 80B2A82C 8FAE005C */ lw $t6, 0x005C($sp) /* 00630 80B2A830 95631D74 */ lhu $v1, 0x1D74($t3) ## 00001D74 -/* 00634 80B2A834 286100DC */ slti $at, $v1, 0x00DC -/* 00638 80B2A838 1420000D */ bne $at, $zero, .L80B2A870 +/* 00634 80B2A834 286100DC */ slti $at, $v1, 0x00DC +/* 00638 80B2A838 1420000D */ bne $at, $zero, .L80B2A870 /* 0063C 80B2A83C 24010118 */ addiu $at, $zero, 0x0118 ## $at = 00000118 -/* 00640 80B2A840 10610017 */ beq $v1, $at, .L80B2A8A0 +/* 00640 80B2A840 10610017 */ beq $v1, $at, .L80B2A8A0 /* 00644 80B2A844 24010140 */ addiu $at, $zero, 0x0140 ## $at = 00000140 -/* 00648 80B2A848 10610015 */ beq $v1, $at, .L80B2A8A0 +/* 00648 80B2A848 10610015 */ beq $v1, $at, .L80B2A8A0 /* 0064C 80B2A84C 2401017C */ addiu $at, $zero, 0x017C ## $at = 0000017C -/* 00650 80B2A850 10610013 */ beq $v1, $at, .L80B2A8A0 +/* 00650 80B2A850 10610013 */ beq $v1, $at, .L80B2A8A0 /* 00654 80B2A854 24010199 */ addiu $at, $zero, 0x0199 ## $at = 00000199 -/* 00658 80B2A858 10610011 */ beq $v1, $at, .L80B2A8A0 +/* 00658 80B2A858 10610011 */ beq $v1, $at, .L80B2A8A0 /* 0065C 80B2A85C 240101B6 */ addiu $at, $zero, 0x01B6 ## $at = 000001B6 -/* 00660 80B2A860 1061000F */ beq $v1, $at, .L80B2A8A0 +/* 00660 80B2A860 1061000F */ beq $v1, $at, .L80B2A8A0 /* 00664 80B2A864 00000000 */ nop -/* 00668 80B2A868 1000001B */ beq $zero, $zero, .L80B2A8D8 -/* 0066C 80B2A86C 8FAE005C */ lw $t6, 0x005C($sp) +/* 00668 80B2A868 1000001B */ beq $zero, $zero, .L80B2A8D8 +/* 0066C 80B2A86C 8FAE005C */ lw $t6, 0x005C($sp) .L80B2A870: /* 00670 80B2A870 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00674 80B2A874 1061000A */ beq $v1, $at, .L80B2A8A0 +/* 00674 80B2A874 1061000A */ beq $v1, $at, .L80B2A8A0 /* 00678 80B2A878 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 0067C 80B2A87C 10610008 */ beq $v1, $at, .L80B2A8A0 +/* 0067C 80B2A87C 10610008 */ beq $v1, $at, .L80B2A8A0 /* 00680 80B2A880 24010047 */ addiu $at, $zero, 0x0047 ## $at = 00000047 -/* 00684 80B2A884 10610006 */ beq $v1, $at, .L80B2A8A0 +/* 00684 80B2A884 10610006 */ beq $v1, $at, .L80B2A8A0 /* 00688 80B2A888 24010081 */ addiu $at, $zero, 0x0081 ## $at = 00000081 -/* 0068C 80B2A88C 10610004 */ beq $v1, $at, .L80B2A8A0 +/* 0068C 80B2A88C 10610004 */ beq $v1, $at, .L80B2A8A0 /* 00690 80B2A890 2401008C */ addiu $at, $zero, 0x008C ## $at = 0000008C -/* 00694 80B2A894 10610002 */ beq $v1, $at, .L80B2A8A0 +/* 00694 80B2A894 10610002 */ beq $v1, $at, .L80B2A8A0 /* 00698 80B2A898 240100DB */ addiu $at, $zero, 0x00DB ## $at = 000000DB -/* 0069C 80B2A89C 1461000D */ bne $v1, $at, .L80B2A8D4 +/* 0069C 80B2A89C 1461000D */ bne $v1, $at, .L80B2A8D4 .L80B2A8A0: /* 006A0 80B2A8A0 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 /* 006A4 80B2A8A4 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 @@ -94,545 +94,545 @@ glabel func_80B2A75C /* 006AC 80B2A8AC 258733E0 */ addiu $a3, $t4, 0x33E0 ## $a3 = 801333E0 /* 006B0 80B2A8B0 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 /* 006B4 80B2A8B4 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 -/* 006B8 80B2A8B8 AFA70010 */ sw $a3, 0x0010($sp) -/* 006BC 80B2A8BC AFAD0014 */ sw $t5, 0x0014($sp) +/* 006B8 80B2A8B8 AFA70010 */ sw $a3, 0x0010($sp) +/* 006BC 80B2A8BC AFAD0014 */ sw $t5, 0x0014($sp) /* 006C0 80B2A8C0 2404481D */ addiu $a0, $zero, 0x481D ## $a0 = 0000481D /* 006C4 80B2A8C4 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 006C8 80B2A8C8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 006CC 80B2A8CC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 006D0 80B2A8D0 8C42F9C0 */ lw $v0, -0x0640($v0) ## 8015F9C0 .L80B2A8D4: -/* 006D4 80B2A8D4 8FAE005C */ lw $t6, 0x005C($sp) +/* 006D4 80B2A8D4 8FAE005C */ lw $t6, 0x005C($sp) .L80B2A8D8: /* 006D8 80B2A8D8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 006DC 80B2A8DC 1441001F */ bne $v0, $at, .L80B2A95C +/* 006DC 80B2A8DC 1441001F */ bne $v0, $at, .L80B2A95C /* 006E0 80B2A8E0 95C31D74 */ lhu $v1, 0x1D74($t6) ## 00001D74 /* 006E4 80B2A8E4 240105E4 */ addiu $at, $zero, 0x05E4 ## $at = 000005E4 -/* 006E8 80B2A8E8 14610005 */ bne $v1, $at, .L80B2A900 +/* 006E8 80B2A8E8 14610005 */ bne $v1, $at, .L80B2A900 /* 006EC 80B2A8EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006F0 80B2A8F0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 006F4 80B2A8F4 240539D6 */ addiu $a1, $zero, 0x39D6 ## $a1 = 000039D6 -/* 006F8 80B2A8F8 8FA6005C */ lw $a2, 0x005C($sp) +/* 006F8 80B2A8F8 8FA6005C */ lw $a2, 0x005C($sp) /* 006FC 80B2A8FC 94C31D74 */ lhu $v1, 0x1D74($a2) ## 00001D74 .L80B2A900: /* 00700 80B2A900 24010609 */ addiu $at, $zero, 0x0609 ## $at = 00000609 -/* 00704 80B2A904 14610015 */ bne $v1, $at, .L80B2A95C -/* 00708 80B2A908 8FA6005C */ lw $a2, 0x005C($sp) +/* 00704 80B2A904 14610015 */ bne $v1, $at, .L80B2A95C +/* 00708 80B2A908 8FA6005C */ lw $a2, 0x005C($sp) /* 0070C 80B2A90C 3C014200 */ lui $at, 0x4200 ## $at = 42000000 /* 00710 80B2A910 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 /* 00714 80B2A914 3C0142CA */ lui $at, 0x42CA ## $at = 42CA0000 /* 00718 80B2A918 44813000 */ mtc1 $at, $f6 ## $f6 = 101.00 /* 0071C 80B2A91C 3C0180B3 */ lui $at, %hi(D_80B2D188) ## $at = 80B30000 -/* 00720 80B2A920 C428D188 */ lwc1 $f8, %lo(D_80B2D188)($at) +/* 00720 80B2A920 C428D188 */ lwc1 $f8, %lo(D_80B2D188)($at) /* 00724 80B2A924 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C -/* 00728 80B2A928 AFB80028 */ sw $t8, 0x0028($sp) +/* 00728 80B2A928 AFB80028 */ sw $t8, 0x0028($sp) /* 0072C 80B2A92C 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 00730 80B2A930 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00734 80B2A934 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 00738 80B2A938 AFA0001C */ sw $zero, 0x001C($sp) -/* 0073C 80B2A93C AFA00020 */ sw $zero, 0x0020($sp) -/* 00740 80B2A940 AFA00024 */ sw $zero, 0x0024($sp) -/* 00744 80B2A944 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00748 80B2A948 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00738 80B2A938 AFA0001C */ sw $zero, 0x001C($sp) +/* 0073C 80B2A93C AFA00020 */ sw $zero, 0x0020($sp) +/* 00740 80B2A940 AFA00024 */ sw $zero, 0x0024($sp) +/* 00744 80B2A944 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00748 80B2A948 E7A60014 */ swc1 $f6, 0x0014($sp) /* 0074C 80B2A94C 0C00C916 */ jal Actor_SpawnAttached - -/* 00750 80B2A950 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00754 80B2A954 8FA6005C */ lw $a2, 0x005C($sp) + +/* 00750 80B2A950 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00754 80B2A954 8FA6005C */ lw $a2, 0x005C($sp) /* 00758 80B2A958 94C31D74 */ lhu $v1, 0x1D74($a2) ## 00001D74 .L80B2A95C: /* 0075C 80B2A95C 240103FC */ addiu $at, $zero, 0x03FC ## $at = 000003FC -/* 00760 80B2A960 14610005 */ bne $v1, $at, .L80B2A978 +/* 00760 80B2A960 14610005 */ bne $v1, $at, .L80B2A978 /* 00764 80B2A964 3C040100 */ lui $a0, 0x0100 ## $a0 = 01000000 /* 00768 80B2A968 0C03E803 */ jal Audio_SetBGM - + /* 0076C 80B2A96C 34840023 */ ori $a0, $a0, 0x0023 ## $a0 = 01000023 -/* 00770 80B2A970 8FA6005C */ lw $a2, 0x005C($sp) +/* 00770 80B2A970 8FA6005C */ lw $a2, 0x005C($sp) /* 00774 80B2A974 94C31D74 */ lhu $v1, 0x1D74($a2) ## 00001D74 .L80B2A978: /* 00778 80B2A978 240103C0 */ addiu $at, $zero, 0x03C0 ## $at = 000003C0 -/* 0077C 80B2A97C 14610046 */ bne $v1, $at, .L80B2AA98 +/* 0077C 80B2A97C 14610046 */ bne $v1, $at, .L80B2AA98 /* 00780 80B2A980 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 00784 80B2A984 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 /* 00788 80B2A988 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 0078C 80B2A98C 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 00790 80B2A990 AFB90014 */ sw $t9, 0x0014($sp) -/* 00794 80B2A994 AFA70010 */ sw $a3, 0x0010($sp) +/* 00790 80B2A990 AFB90014 */ sw $t9, 0x0014($sp) +/* 00794 80B2A994 AFA70010 */ sw $a3, 0x0010($sp) /* 00798 80B2A998 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 /* 0079C 80B2A99C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 007A0 80B2A9A0 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 007A4 80B2A9A4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 007A8 80B2A9A8 1000003B */ beq $zero, $zero, .L80B2AA98 +/* 007A8 80B2A9A8 1000003B */ beq $zero, $zero, .L80B2AA98 /* 007AC 80B2A9AC 00000000 */ nop .L80B2A9B0: -/* 007B0 80B2A9B0 8FAA0044 */ lw $t2, 0x0044($sp) +/* 007B0 80B2A9B0 8FAA0044 */ lw $t2, 0x0044($sp) /* 007B4 80B2A9B4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 007B8 80B2A9B8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 007BC 80B2A9BC 1541000C */ bne $t2, $at, .L80B2A9F0 -/* 007C0 80B2A9C0 8FAB0044 */ lw $t3, 0x0044($sp) +/* 007BC 80B2A9BC 1541000C */ bne $t2, $at, .L80B2A9F0 +/* 007C0 80B2A9C0 8FAB0044 */ lw $t3, 0x0044($sp) /* 007C4 80B2A9C4 8C42F9C0 */ lw $v0, -0x0640($v0) ## 8015F9C0 /* 007C8 80B2A9C8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 007CC 80B2A9CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007D0 80B2A9D0 10410003 */ beq $v0, $at, .L80B2A9E0 +/* 007D0 80B2A9D0 10410003 */ beq $v0, $at, .L80B2A9E0 /* 007D4 80B2A9D4 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 007D8 80B2A9D8 1441002F */ bne $v0, $at, .L80B2AA98 +/* 007D8 80B2A9D8 1441002F */ bne $v0, $at, .L80B2AA98 /* 007DC 80B2A9DC 00000000 */ nop .L80B2A9E0: /* 007E0 80B2A9E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 007E4 80B2A9E4 24052078 */ addiu $a1, $zero, 0x2078 ## $a1 = 00002078 -/* 007E8 80B2A9E8 1000002B */ beq $zero, $zero, .L80B2AA98 +/* 007E8 80B2A9E8 1000002B */ beq $zero, $zero, .L80B2AA98 /* 007EC 80B2A9EC 00000000 */ nop .L80B2A9F0: /* 007F0 80B2A9F0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 007F4 80B2A9F4 15610028 */ bne $t3, $at, .L80B2AA98 +/* 007F4 80B2A9F4 15610028 */ bne $t3, $at, .L80B2AA98 /* 007F8 80B2A9F8 00000000 */ nop /* 007FC 80B2A9FC C60A01B0 */ lwc1 $f10, 0x01B0($s0) ## 000001B0 /* 00800 80B2AA00 8E0201A0 */ lw $v0, 0x01A0($s0) ## 000001A0 /* 00804 80B2AA04 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 00808 80B2AA08 4600540D */ trunc.w.s $f16, $f10 +/* 00808 80B2AA08 4600540D */ trunc.w.s $f16, $f10 /* 0080C 80B2AA0C 25AD3858 */ addiu $t5, $t5, 0x3858 ## $t5 = 06003858 /* 00810 80B2AA10 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 /* 00814 80B2AA14 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00818 80B2AA18 44038000 */ mfc1 $v1, $f16 +/* 00818 80B2AA18 44038000 */ mfc1 $v1, $f16 /* 0081C 80B2AA1C 25CE4AA4 */ addiu $t6, $t6, 0x4AA4 ## $t6 = 06004AA4 -/* 00820 80B2AA20 00031C00 */ sll $v1, $v1, 16 -/* 00824 80B2AA24 15A2000E */ bne $t5, $v0, .L80B2AA60 -/* 00828 80B2AA28 00031C03 */ sra $v1, $v1, 16 -/* 0082C 80B2AA2C 14610005 */ bne $v1, $at, .L80B2AA44 +/* 00820 80B2AA20 00031C00 */ sll $v1, $v1, 16 +/* 00824 80B2AA24 15A2000E */ bne $t5, $v0, .L80B2AA60 +/* 00828 80B2AA28 00031C03 */ sra $v1, $v1, 16 +/* 0082C 80B2AA2C 14610005 */ bne $v1, $at, .L80B2AA44 /* 00830 80B2AA30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00834 80B2AA34 2405283D */ addiu $a1, $zero, 0x283D ## $a1 = 0000283D /* 00838 80B2AA38 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0083C 80B2AA3C A7A3004E */ sh $v1, 0x004E($sp) -/* 00840 80B2AA40 87A3004E */ lh $v1, 0x004E($sp) + +/* 0083C 80B2AA3C A7A3004E */ sh $v1, 0x004E($sp) +/* 00840 80B2AA40 87A3004E */ lh $v1, 0x004E($sp) .L80B2AA44: /* 00844 80B2AA44 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 00848 80B2AA48 14610013 */ bne $v1, $at, .L80B2AA98 +/* 00848 80B2AA48 14610013 */ bne $v1, $at, .L80B2AA98 /* 0084C 80B2AA4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00850 80B2AA50 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00854 80B2AA54 2405282B */ addiu $a1, $zero, 0x282B ## $a1 = 0000282B -/* 00858 80B2AA58 1000000F */ beq $zero, $zero, .L80B2AA98 +/* 00858 80B2AA58 1000000F */ beq $zero, $zero, .L80B2AA98 /* 0085C 80B2AA5C 00000000 */ nop .L80B2AA60: -/* 00860 80B2AA60 15C20008 */ bne $t6, $v0, .L80B2AA84 +/* 00860 80B2AA60 15C20008 */ bne $t6, $v0, .L80B2AA84 /* 00864 80B2AA64 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 /* 00868 80B2AA68 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 0086C 80B2AA6C 1461000A */ bne $v1, $at, .L80B2AA98 +/* 0086C 80B2AA6C 1461000A */ bne $v1, $at, .L80B2AA98 /* 00870 80B2AA70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00874 80B2AA74 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00878 80B2AA78 2405282C */ addiu $a1, $zero, 0x282C ## $a1 = 0000282C -/* 0087C 80B2AA7C 10000006 */ beq $zero, $zero, .L80B2AA98 +/* 0087C 80B2AA7C 10000006 */ beq $zero, $zero, .L80B2AA98 /* 00880 80B2AA80 00000000 */ nop .L80B2AA84: /* 00884 80B2AA84 25EF2650 */ addiu $t7, $t7, 0x2650 ## $t7 = 00002650 -/* 00888 80B2AA88 15E20003 */ bne $t7, $v0, .L80B2AA98 +/* 00888 80B2AA88 15E20003 */ bne $t7, $v0, .L80B2AA98 /* 0088C 80B2AA8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00890 80B2AA90 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00894 80B2AA94 24052078 */ addiu $a1, $zero, 0x2078 ## $a1 = 00002078 .L80B2AA98: /* 00898 80B2AA98 3C0380B3 */ lui $v1, %hi(D_80B2CFCC) ## $v1 = 80B30000 /* 0089C 80B2AA9C 2463CFCC */ addiu $v1, $v1, %lo(D_80B2CFCC) ## $v1 = 80B2CFCC /* 008A0 80B2AAA0 84620000 */ lh $v0, 0x0000($v1) ## 80B2CFCC /* 008A4 80B2AAA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008A8 80B2AAA8 10400002 */ beq $v0, $zero, .L80B2AAB4 +/* 008A8 80B2AAA8 10400002 */ beq $v0, $zero, .L80B2AAB4 /* 008AC 80B2AAAC 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF /* 008B0 80B2AAB0 A4780000 */ sh $t8, 0x0000($v1) ## 80B2CFCC .L80B2AAB4: -/* 008B4 80B2AAB4 0C2CB0E6 */ jal func_80B2C398 -/* 008B8 80B2AAB8 8FA5005C */ lw $a1, 0x005C($sp) +/* 008B4 80B2AAB4 0C2CB0E6 */ jal func_80B2C398 +/* 008B8 80B2AAB8 8FA5005C */ lw $a1, 0x005C($sp) /* 008BC 80B2AABC 0C00B638 */ jal Actor_MoveForward - + /* 008C0 80B2AAC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 008C4 80B2AAC4 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 008C8 80B2AAC8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 008CC 80B2AACC AFA40040 */ sw $a0, 0x0040($sp) -/* 008D0 80B2AAD0 8FB90044 */ lw $t9, 0x0044($sp) + +/* 008CC 80B2AACC AFA40040 */ sw $a0, 0x0040($sp) +/* 008D0 80B2AAD0 8FB90044 */ lw $t9, 0x0044($sp) /* 008D4 80B2AAD4 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 008D8 80B2AAD8 8FA6005C */ lw $a2, 0x005C($sp) -/* 008DC 80B2AADC 10F90004 */ beq $a3, $t9, .L80B2AAF0 +/* 008D8 80B2AAD8 8FA6005C */ lw $a2, 0x005C($sp) +/* 008DC 80B2AADC 10F90004 */ beq $a3, $t9, .L80B2AAF0 /* 008E0 80B2AAE0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 008E4 80B2AAE4 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 008E8 80B2AAE8 553900A4 */ bnel $t1, $t9, .L80B2AD7C -/* 008EC 80B2AAEC 8FAC0044 */ lw $t4, 0x0044($sp) +/* 008E8 80B2AAE8 553900A4 */ bnel $t1, $t9, .L80B2AD7C +/* 008EC 80B2AAEC 8FAC0044 */ lw $t4, 0x0044($sp) .L80B2AAF0: /* 008F0 80B2AAF0 90CA1D6C */ lbu $t2, 0x1D6C($a2) ## 00001D6C /* 008F4 80B2AAF4 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 008F8 80B2AAF8 3C0B80B3 */ lui $t3, %hi(D_80B2CFCC) ## $t3 = 80B30000 -/* 008FC 80B2AAFC 114001E3 */ beq $t2, $zero, .L80B2B28C +/* 008FC 80B2AAFC 114001E3 */ beq $t2, $zero, .L80B2B28C /* 00900 80B2AB00 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00904 80B2AB04 8CC31D90 */ lw $v1, 0x1D90($a2) ## 00001D90 -/* 00908 80B2AB08 506001E1 */ beql $v1, $zero, .L80B2B290 -/* 0090C 80B2AB0C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00908 80B2AB08 506001E1 */ beql $v1, $zero, .L80B2B290 +/* 0090C 80B2AB0C 8FBF003C */ lw $ra, 0x003C($sp) /* 00910 80B2AB10 94640000 */ lhu $a0, 0x0000($v1) ## 00000000 /* 00914 80B2AB14 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00918 80B2AB18 14810019 */ bne $a0, $at, .L80B2AB80 +/* 00918 80B2AB18 14810019 */ bne $a0, $at, .L80B2AB80 /* 0091C 80B2AB1C 00000000 */ nop -/* 00920 80B2AB20 856BCFCC */ lh $t3, %lo(D_80B2CFCC)($t3) -/* 00924 80B2AB24 15600016 */ bne $t3, $zero, .L80B2AB80 +/* 00920 80B2AB20 856BCFCC */ lh $t3, %lo(D_80B2CFCC)($t3) +/* 00924 80B2AB24 15600016 */ bne $t3, $zero, .L80B2AB80 /* 00928 80B2AB28 00000000 */ nop -/* 0092C 80B2AB2C 8FAC0044 */ lw $t4, 0x0044($sp) -/* 00930 80B2AB30 54EC000B */ bnel $a3, $t4, .L80B2AB60 +/* 0092C 80B2AB2C 8FAC0044 */ lw $t4, 0x0044($sp) +/* 00930 80B2AB30 54EC000B */ bnel $a3, $t4, .L80B2AB60 /* 00934 80B2AB34 8E0E01A0 */ lw $t6, 0x01A0($s0) ## 000001A0 /* 00938 80B2AB38 8E0D01A0 */ lw $t5, 0x01A0($s0) ## 000001A0 /* 0093C 80B2AB3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00940 80B2AB40 24A52928 */ addiu $a1, $a1, 0x2928 ## $a1 = 06002928 -/* 00944 80B2AB44 10AD01D1 */ beq $a1, $t5, .L80B2B28C -/* 00948 80B2AB48 8FA40040 */ lw $a0, 0x0040($sp) -/* 0094C 80B2AB4C 0C0294E1 */ jal func_800A5384 +/* 00944 80B2AB44 10AD01D1 */ beq $a1, $t5, .L80B2B28C +/* 00948 80B2AB48 8FA40040 */ lw $a0, 0x0040($sp) +/* 0094C 80B2AB4C 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 00950 80B2AB50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00954 80B2AB54 100001CE */ beq $zero, $zero, .L80B2B290 -/* 00958 80B2AB58 8FBF003C */ lw $ra, 0x003C($sp) +/* 00954 80B2AB54 100001CE */ beq $zero, $zero, .L80B2B290 +/* 00958 80B2AB58 8FBF003C */ lw $ra, 0x003C($sp) /* 0095C 80B2AB5C 8E0E01A0 */ lw $t6, 0x01A0($s0) ## 000001A0 .L80B2AB60: /* 00960 80B2AB60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00964 80B2AB64 24A54AA4 */ addiu $a1, $a1, 0x4AA4 ## $a1 = 06004AA4 -/* 00968 80B2AB68 10AE01C8 */ beq $a1, $t6, .L80B2B28C -/* 0096C 80B2AB6C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00970 80B2AB70 0C0294E1 */ jal func_800A5384 +/* 00968 80B2AB68 10AE01C8 */ beq $a1, $t6, .L80B2B28C +/* 0096C 80B2AB6C 8FA40040 */ lw $a0, 0x0040($sp) +/* 00970 80B2AB70 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 00974 80B2AB74 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00978 80B2AB78 100001C5 */ beq $zero, $zero, .L80B2B290 -/* 0097C 80B2AB7C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00978 80B2AB78 100001C5 */ beq $zero, $zero, .L80B2B290 +/* 0097C 80B2AB7C 8FBF003C */ lw $ra, 0x003C($sp) .L80B2AB80: -/* 00980 80B2AB80 15040018 */ bne $t0, $a0, .L80B2ABE4 -/* 00984 80B2AB84 8FAB0044 */ lw $t3, 0x0044($sp) -/* 00988 80B2AB88 8FB80044 */ lw $t8, 0x0044($sp) +/* 00980 80B2AB80 15040018 */ bne $t0, $a0, .L80B2ABE4 +/* 00984 80B2AB84 8FAB0044 */ lw $t3, 0x0044($sp) +/* 00988 80B2AB88 8FB80044 */ lw $t8, 0x0044($sp) /* 0098C 80B2AB8C 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 /* 00990 80B2AB90 3C0180B3 */ lui $at, %hi(D_80B2CFCC) ## $at = 80B30000 -/* 00994 80B2AB94 14F8000A */ bne $a3, $t8, .L80B2ABC0 -/* 00998 80B2AB98 A42FCFCC */ sh $t7, %lo(D_80B2CFCC)($at) +/* 00994 80B2AB94 14F8000A */ bne $a3, $t8, .L80B2ABC0 +/* 00998 80B2AB98 A42FCFCC */ sh $t7, %lo(D_80B2CFCC)($at) /* 0099C 80B2AB9C 8E1901A0 */ lw $t9, 0x01A0($s0) ## 000001A0 /* 009A0 80B2ABA0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009A4 80B2ABA4 24A51D28 */ addiu $a1, $a1, 0x1D28 ## $a1 = 06001D28 -/* 009A8 80B2ABA8 10B901B8 */ beq $a1, $t9, .L80B2B28C -/* 009AC 80B2ABAC 8FA40040 */ lw $a0, 0x0040($sp) -/* 009B0 80B2ABB0 0C0294E1 */ jal func_800A5384 +/* 009A8 80B2ABA8 10B901B8 */ beq $a1, $t9, .L80B2B28C +/* 009AC 80B2ABAC 8FA40040 */ lw $a0, 0x0040($sp) +/* 009B0 80B2ABB0 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 009B4 80B2ABB4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 009B8 80B2ABB8 100001B5 */ beq $zero, $zero, .L80B2B290 -/* 009BC 80B2ABBC 8FBF003C */ lw $ra, 0x003C($sp) +/* 009B8 80B2ABB8 100001B5 */ beq $zero, $zero, .L80B2B290 +/* 009BC 80B2ABBC 8FBF003C */ lw $ra, 0x003C($sp) .L80B2ABC0: /* 009C0 80B2ABC0 8E0A01A0 */ lw $t2, 0x01A0($s0) ## 000001A0 /* 009C4 80B2ABC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009C8 80B2ABC8 24A53858 */ addiu $a1, $a1, 0x3858 ## $a1 = 06003858 -/* 009CC 80B2ABCC 10AA01AF */ beq $a1, $t2, .L80B2B28C -/* 009D0 80B2ABD0 8FA40040 */ lw $a0, 0x0040($sp) -/* 009D4 80B2ABD4 0C0294E1 */ jal func_800A5384 +/* 009CC 80B2ABCC 10AA01AF */ beq $a1, $t2, .L80B2B28C +/* 009D0 80B2ABD0 8FA40040 */ lw $a0, 0x0040($sp) +/* 009D4 80B2ABD4 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 009D8 80B2ABD8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 009DC 80B2ABDC 100001AC */ beq $zero, $zero, .L80B2B290 -/* 009E0 80B2ABE0 8FBF003C */ lw $ra, 0x003C($sp) +/* 009DC 80B2ABDC 100001AC */ beq $zero, $zero, .L80B2B290 +/* 009E0 80B2ABE0 8FBF003C */ lw $ra, 0x003C($sp) .L80B2ABE4: -/* 009E4 80B2ABE4 54EB005A */ bnel $a3, $t3, .L80B2AD50 +/* 009E4 80B2ABE4 54EB005A */ bnel $a3, $t3, .L80B2AD50 /* 009E8 80B2ABE8 8E0B01A0 */ lw $t3, 0x01A0($s0) ## 000001A0 /* 009EC 80B2ABEC 920C01E5 */ lbu $t4, 0x01E5($s0) ## 000001E5 -/* 009F0 80B2ABF0 2D810008 */ sltiu $at, $t4, 0x0008 -/* 009F4 80B2ABF4 102001A5 */ beq $at, $zero, .L80B2B28C -/* 009F8 80B2ABF8 000C6080 */ sll $t4, $t4, 2 +/* 009F0 80B2ABF0 2D810008 */ sltiu $at, $t4, 0x0008 +/* 009F4 80B2ABF4 102001A5 */ beq $at, $zero, .L80B2B28C +/* 009F8 80B2ABF8 000C6080 */ sll $t4, $t4, 2 /* 009FC 80B2ABFC 3C0180B3 */ lui $at, %hi(jtbl_80B2D18C) ## $at = 80B30000 -/* 00A00 80B2AC00 002C0821 */ addu $at, $at, $t4 -/* 00A04 80B2AC04 8C2CD18C */ lw $t4, %lo(jtbl_80B2D18C)($at) -/* 00A08 80B2AC08 01800008 */ jr $t4 +/* 00A00 80B2AC00 002C0821 */ addu $at, $at, $t4 +/* 00A04 80B2AC04 8C2CD18C */ lw $t4, %lo(jtbl_80B2D18C)($at) +/* 00A08 80B2AC08 01800008 */ jr $t4 /* 00A0C 80B2AC0C 00000000 */ nop glabel L80B2AC10 -/* 00A10 80B2AC10 1524019E */ bne $t1, $a0, .L80B2B28C +/* 00A10 80B2AC10 1524019E */ bne $t1, $a0, .L80B2B28C /* 00A14 80B2AC14 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A18 80B2AC18 8FA40040 */ lw $a0, 0x0040($sp) +/* 00A18 80B2AC18 8FA40040 */ lw $a0, 0x0040($sp) /* 00A1C 80B2AC1C 24A50F54 */ addiu $a1, $a1, 0x0F54 ## $a1 = 06000F54 -/* 00A20 80B2AC20 0C029490 */ jal func_800A5240 +/* 00A20 80B2AC20 0C029490 */ jal func_800A5240 /* 00A24 80B2AC24 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00A28 80B2AC28 920D01E5 */ lbu $t5, 0x01E5($s0) ## 000001E5 /* 00A2C 80B2AC2C 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 00A30 80B2AC30 10000196 */ beq $zero, $zero, .L80B2B28C +/* 00A30 80B2AC30 10000196 */ beq $zero, $zero, .L80B2B28C /* 00A34 80B2AC34 A20E01E5 */ sb $t6, 0x01E5($s0) ## 000001E5 glabel L80B2AC38 -/* 00A38 80B2AC38 10400194 */ beq $v0, $zero, .L80B2B28C -/* 00A3C 80B2AC3C 8FA40040 */ lw $a0, 0x0040($sp) +/* 00A38 80B2AC38 10400194 */ beq $v0, $zero, .L80B2B28C +/* 00A3C 80B2AC3C 8FA40040 */ lw $a0, 0x0040($sp) /* 00A40 80B2AC40 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A44 80B2AC44 24A514F4 */ addiu $a1, $a1, 0x14F4 ## $a1 = 060014F4 -/* 00A48 80B2AC48 0C0294D3 */ jal func_800A534C +/* 00A48 80B2AC48 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00A4C 80B2AC4C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00A50 80B2AC50 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 /* 00A54 80B2AC54 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00A58 80B2AC58 1000018C */ beq $zero, $zero, .L80B2B28C +/* 00A58 80B2AC58 1000018C */ beq $zero, $zero, .L80B2B28C /* 00A5C 80B2AC5C A21801E5 */ sb $t8, 0x01E5($s0) ## 000001E5 glabel L80B2AC60 /* 00A60 80B2AC60 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00A64 80B2AC64 14810189 */ bne $a0, $at, .L80B2B28C +/* 00A64 80B2AC64 14810189 */ bne $a0, $at, .L80B2B28C /* 00A68 80B2AC68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A6C 80B2AC6C 8FA40040 */ lw $a0, 0x0040($sp) +/* 00A6C 80B2AC6C 8FA40040 */ lw $a0, 0x0040($sp) /* 00A70 80B2AC70 24A508A0 */ addiu $a1, $a1, 0x08A0 ## $a1 = 060008A0 -/* 00A74 80B2AC74 0C029490 */ jal func_800A5240 +/* 00A74 80B2AC74 0C029490 */ jal func_800A5240 /* 00A78 80B2AC78 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00A7C 80B2AC7C 921901E5 */ lbu $t9, 0x01E5($s0) ## 000001E5 /* 00A80 80B2AC80 272A0001 */ addiu $t2, $t9, 0x0001 ## $t2 = 00000001 -/* 00A84 80B2AC84 10000181 */ beq $zero, $zero, .L80B2B28C +/* 00A84 80B2AC84 10000181 */ beq $zero, $zero, .L80B2B28C /* 00A88 80B2AC88 A20A01E5 */ sb $t2, 0x01E5($s0) ## 000001E5 glabel L80B2AC8C -/* 00A8C 80B2AC8C 1040017F */ beq $v0, $zero, .L80B2B28C -/* 00A90 80B2AC90 8FA40040 */ lw $a0, 0x0040($sp) +/* 00A8C 80B2AC8C 1040017F */ beq $v0, $zero, .L80B2B28C +/* 00A90 80B2AC90 8FA40040 */ lw $a0, 0x0040($sp) /* 00A94 80B2AC94 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A98 80B2AC98 24A50BC8 */ addiu $a1, $a1, 0x0BC8 ## $a1 = 06000BC8 -/* 00A9C 80B2AC9C 0C0294D3 */ jal func_800A534C +/* 00A9C 80B2AC9C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00AA0 80B2ACA0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00AA4 80B2ACA4 920B01E5 */ lbu $t3, 0x01E5($s0) ## 000001E5 /* 00AA8 80B2ACA8 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 00AAC 80B2ACAC 10000177 */ beq $zero, $zero, .L80B2B28C +/* 00AAC 80B2ACAC 10000177 */ beq $zero, $zero, .L80B2B28C /* 00AB0 80B2ACB0 A20C01E5 */ sb $t4, 0x01E5($s0) ## 000001E5 glabel L80B2ACB4 /* 00AB4 80B2ACB4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00AB8 80B2ACB8 14810174 */ bne $a0, $at, .L80B2B28C +/* 00AB8 80B2ACB8 14810174 */ bne $a0, $at, .L80B2B28C /* 00ABC 80B2ACBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00AC0 80B2ACC0 8FA40040 */ lw $a0, 0x0040($sp) +/* 00AC0 80B2ACC0 8FA40040 */ lw $a0, 0x0040($sp) /* 00AC4 80B2ACC4 24A514F4 */ addiu $a1, $a1, 0x14F4 ## $a1 = 060014F4 -/* 00AC8 80B2ACC8 0C0294D3 */ jal func_800A534C +/* 00AC8 80B2ACC8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00ACC 80B2ACCC 3C06C1A0 */ lui $a2, 0xC1A0 ## $a2 = C1A00000 /* 00AD0 80B2ACD0 920D01E5 */ lbu $t5, 0x01E5($s0) ## 000001E5 /* 00AD4 80B2ACD4 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 00AD8 80B2ACD8 1000016C */ beq $zero, $zero, .L80B2B28C +/* 00AD8 80B2ACD8 1000016C */ beq $zero, $zero, .L80B2B28C /* 00ADC 80B2ACDC A20E01E5 */ sb $t6, 0x01E5($s0) ## 000001E5 glabel L80B2ACE0 /* 00AE0 80B2ACE0 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00AE4 80B2ACE4 14810169 */ bne $a0, $at, .L80B2B28C +/* 00AE4 80B2ACE4 14810169 */ bne $a0, $at, .L80B2B28C /* 00AE8 80B2ACE8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00AEC 80B2ACEC 24A52928 */ addiu $a1, $a1, 0x2928 ## $a1 = 06002928 -/* 00AF0 80B2ACF0 8FA40040 */ lw $a0, 0x0040($sp) -/* 00AF4 80B2ACF4 0C0294D3 */ jal func_800A534C +/* 00AF0 80B2ACF0 8FA40040 */ lw $a0, 0x0040($sp) +/* 00AF4 80B2ACF4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00AF8 80B2ACF8 3C06C170 */ lui $a2, 0xC170 ## $a2 = C1700000 /* 00AFC 80B2ACFC 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 /* 00B00 80B2AD00 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00B04 80B2AD04 10000161 */ beq $zero, $zero, .L80B2B28C +/* 00B04 80B2AD04 10000161 */ beq $zero, $zero, .L80B2B28C /* 00B08 80B2AD08 A21801E5 */ sb $t8, 0x01E5($s0) ## 000001E5 glabel L80B2AD0C /* 00B0C 80B2AD0C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 00B10 80B2AD10 1481015E */ bne $a0, $at, .L80B2B28C +/* 00B10 80B2AD10 1481015E */ bne $a0, $at, .L80B2B28C /* 00B14 80B2AD14 240539C8 */ addiu $a1, $zero, 0x39C8 ## $a1 = 000039C8 /* 00B18 80B2AD18 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00B1C 80B2AD1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00B20 80B2AD20 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B24 80B2AD24 24A505B4 */ addiu $a1, $a1, 0x05B4 ## $a1 = 060005B4 -/* 00B28 80B2AD28 8FA40040 */ lw $a0, 0x0040($sp) -/* 00B2C 80B2AD2C 0C0294E1 */ jal func_800A5384 +/* 00B28 80B2AD28 8FA40040 */ lw $a0, 0x0040($sp) +/* 00B2C 80B2AD2C 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 00B30 80B2AD30 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00B34 80B2AD34 921901E5 */ lbu $t9, 0x01E5($s0) ## 000001E5 /* 00B38 80B2AD38 272A0001 */ addiu $t2, $t9, 0x0001 ## $t2 = 00000001 -/* 00B3C 80B2AD3C 10000153 */ beq $zero, $zero, .L80B2B28C +/* 00B3C 80B2AD3C 10000153 */ beq $zero, $zero, .L80B2B28C /* 00B40 80B2AD40 A20A01E5 */ sb $t2, 0x01E5($s0) ## 000001E5 glabel L80B2AD44 -/* 00B44 80B2AD44 10000151 */ beq $zero, $zero, .L80B2B28C +/* 00B44 80B2AD44 10000151 */ beq $zero, $zero, .L80B2B28C /* 00B48 80B2AD48 A20001E5 */ sb $zero, 0x01E5($s0) ## 000001E5 /* 00B4C 80B2AD4C 8E0B01A0 */ lw $t3, 0x01A0($s0) ## 000001A0 .L80B2AD50: /* 00B50 80B2AD50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B54 80B2AD54 24A52650 */ addiu $a1, $a1, 0x2650 ## $a1 = 06002650 -/* 00B58 80B2AD58 10AB014C */ beq $a1, $t3, .L80B2B28C +/* 00B58 80B2AD58 10AB014C */ beq $a1, $t3, .L80B2B28C /* 00B5C 80B2AD5C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 00B60 80B2AD60 1481014A */ bne $a0, $at, .L80B2B28C +/* 00B60 80B2AD60 1481014A */ bne $a0, $at, .L80B2B28C /* 00B64 80B2AD64 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 00B68 80B2AD68 0C0294E1 */ jal func_800A5384 -/* 00B6C 80B2AD6C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00B70 80B2AD70 10000147 */ beq $zero, $zero, .L80B2B290 -/* 00B74 80B2AD74 8FBF003C */ lw $ra, 0x003C($sp) -/* 00B78 80B2AD78 8FAC0044 */ lw $t4, 0x0044($sp) +/* 00B68 80B2AD68 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00B6C 80B2AD6C 8FA40040 */ lw $a0, 0x0040($sp) +/* 00B70 80B2AD70 10000147 */ beq $zero, $zero, .L80B2B290 +/* 00B74 80B2AD74 8FBF003C */ lw $ra, 0x003C($sp) +/* 00B78 80B2AD78 8FAC0044 */ lw $t4, 0x0044($sp) .L80B2AD7C: /* 00B7C 80B2AD7C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00B80 80B2AD80 8FAA0044 */ lw $t2, 0x0044($sp) -/* 00B84 80B2AD84 150C0064 */ bne $t0, $t4, .L80B2AF18 +/* 00B80 80B2AD80 8FAA0044 */ lw $t2, 0x0044($sp) +/* 00B84 80B2AD84 150C0064 */ bne $t0, $t4, .L80B2AF18 /* 00B88 80B2AD88 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00B8C 80B2AD8C 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 00B90 80B2AD90 8DADF9C0 */ lw $t5, -0x0640($t5) ## 8015F9C0 /* 00B94 80B2AD94 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B98 80B2AD98 55A10019 */ bnel $t5, $at, .L80B2AE00 +/* 00B98 80B2AD98 55A10019 */ bnel $t5, $at, .L80B2AE00 /* 00B9C 80B2AD9C 94CF1D74 */ lhu $t7, 0x1D74($a2) ## 00001D74 /* 00BA0 80B2ADA0 94CE1D74 */ lhu $t6, 0x1D74($a2) ## 00001D74 /* 00BA4 80B2ADA4 2401034D */ addiu $at, $zero, 0x034D ## $at = 0000034D /* 00BA8 80B2ADA8 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00BAC 80B2ADAC 15C10029 */ bne $t6, $at, .L80B2AE54 +/* 00BAC 80B2ADAC 15C10029 */ bne $t6, $at, .L80B2AE54 /* 00BB0 80B2ADB0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00BB4 80B2ADB4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00BB8 80B2ADB8 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 /* 00BBC 80B2ADBC 3C0142A2 */ lui $at, 0x42A2 ## $at = 42A20000 /* 00BC0 80B2ADC0 44812000 */ mtc1 $at, $f4 ## $f4 = 81.00 /* 00BC4 80B2ADC4 3C0180B3 */ lui $at, %hi(D_80B2D1AC) ## $at = 80B30000 -/* 00BC8 80B2ADC8 C426D1AC */ lwc1 $f6, %lo(D_80B2D1AC)($at) +/* 00BC8 80B2ADC8 C426D1AC */ lwc1 $f6, %lo(D_80B2D1AC)($at) /* 00BCC 80B2ADCC 240700F1 */ addiu $a3, $zero, 0x00F1 ## $a3 = 000000F1 -/* 00BD0 80B2ADD0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00BD4 80B2ADD4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00BD8 80B2ADD8 AFA00024 */ sw $zero, 0x0024($sp) -/* 00BDC 80B2ADDC AFA00028 */ sw $zero, 0x0028($sp) -/* 00BE0 80B2ADE0 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00BE4 80B2ADE4 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 00BD0 80B2ADD0 AFA0001C */ sw $zero, 0x001C($sp) +/* 00BD4 80B2ADD4 AFA00020 */ sw $zero, 0x0020($sp) +/* 00BD8 80B2ADD8 AFA00024 */ sw $zero, 0x0024($sp) +/* 00BDC 80B2ADDC AFA00028 */ sw $zero, 0x0028($sp) +/* 00BE0 80B2ADE0 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00BE4 80B2ADE4 E7A40014 */ swc1 $f4, 0x0014($sp) /* 00BE8 80B2ADE8 0C00C916 */ jal Actor_SpawnAttached - -/* 00BEC 80B2ADEC E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00BF0 80B2ADF0 8FA6005C */ lw $a2, 0x005C($sp) -/* 00BF4 80B2ADF4 10000017 */ beq $zero, $zero, .L80B2AE54 + +/* 00BEC 80B2ADEC E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00BF0 80B2ADF0 8FA6005C */ lw $a2, 0x005C($sp) +/* 00BF4 80B2ADF4 10000017 */ beq $zero, $zero, .L80B2AE54 /* 00BF8 80B2ADF8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00BFC 80B2ADFC 94CF1D74 */ lhu $t7, 0x1D74($a2) ## 00001D74 .L80B2AE00: /* 00C00 80B2AE00 240100C3 */ addiu $at, $zero, 0x00C3 ## $at = 000000C3 /* 00C04 80B2AE04 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00C08 80B2AE08 15E10012 */ bne $t7, $at, .L80B2AE54 +/* 00C08 80B2AE08 15E10012 */ bne $t7, $at, .L80B2AE54 /* 00C0C 80B2AE0C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00C10 80B2AE10 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00C14 80B2AE14 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 /* 00C18 80B2AE18 3C0142A2 */ lui $at, 0x42A2 ## $at = 42A20000 /* 00C1C 80B2AE1C 44815000 */ mtc1 $at, $f10 ## $f10 = 81.00 /* 00C20 80B2AE20 3C0180B3 */ lui $at, %hi(D_80B2D1B0) ## $at = 80B30000 -/* 00C24 80B2AE24 C430D1B0 */ lwc1 $f16, %lo(D_80B2D1B0)($at) +/* 00C24 80B2AE24 C430D1B0 */ lwc1 $f16, %lo(D_80B2D1B0)($at) /* 00C28 80B2AE28 240700F1 */ addiu $a3, $zero, 0x00F1 ## $a3 = 000000F1 -/* 00C2C 80B2AE2C AFA0001C */ sw $zero, 0x001C($sp) -/* 00C30 80B2AE30 AFA00020 */ sw $zero, 0x0020($sp) -/* 00C34 80B2AE34 AFA00024 */ sw $zero, 0x0024($sp) -/* 00C38 80B2AE38 AFA80028 */ sw $t0, 0x0028($sp) -/* 00C3C 80B2AE3C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00C40 80B2AE40 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 00C2C 80B2AE2C AFA0001C */ sw $zero, 0x001C($sp) +/* 00C30 80B2AE30 AFA00020 */ sw $zero, 0x0020($sp) +/* 00C34 80B2AE34 AFA00024 */ sw $zero, 0x0024($sp) +/* 00C38 80B2AE38 AFA80028 */ sw $t0, 0x0028($sp) +/* 00C3C 80B2AE3C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00C40 80B2AE40 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 00C44 80B2AE44 0C00C916 */ jal Actor_SpawnAttached - -/* 00C48 80B2AE48 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 00C4C 80B2AE4C 8FA6005C */ lw $a2, 0x005C($sp) + +/* 00C48 80B2AE48 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 00C4C 80B2AE4C 8FA6005C */ lw $a2, 0x005C($sp) /* 00C50 80B2AE50 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 .L80B2AE54: /* 00C54 80B2AE54 920301E5 */ lbu $v1, 0x01E5($s0) ## 000001E5 -/* 00C58 80B2AE58 50600006 */ beql $v1, $zero, .L80B2AE74 +/* 00C58 80B2AE58 50600006 */ beql $v1, $zero, .L80B2AE74 /* 00C5C 80B2AE5C 90D81D6C */ lbu $t8, 0x1D6C($a2) ## 00001D6C -/* 00C60 80B2AE60 50680019 */ beql $v1, $t0, .L80B2AEC8 +/* 00C60 80B2AE60 50680019 */ beql $v1, $t0, .L80B2AEC8 /* 00C64 80B2AE64 90CD1D6C */ lbu $t5, 0x1D6C($a2) ## 00001D6C -/* 00C68 80B2AE68 10000109 */ beq $zero, $zero, .L80B2B290 -/* 00C6C 80B2AE6C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00C68 80B2AE68 10000109 */ beq $zero, $zero, .L80B2B290 +/* 00C6C 80B2AE6C 8FBF003C */ lw $ra, 0x003C($sp) /* 00C70 80B2AE70 90D81D6C */ lbu $t8, 0x1D6C($a2) ## 00001D6C .L80B2AE74: -/* 00C74 80B2AE74 53000106 */ beql $t8, $zero, .L80B2B290 -/* 00C78 80B2AE78 8FBF003C */ lw $ra, 0x003C($sp) +/* 00C74 80B2AE74 53000106 */ beql $t8, $zero, .L80B2B290 +/* 00C78 80B2AE78 8FBF003C */ lw $ra, 0x003C($sp) /* 00C7C 80B2AE7C 8CC21D8C */ lw $v0, 0x1D8C($a2) ## 00001D8C -/* 00C80 80B2AE80 50400103 */ beql $v0, $zero, .L80B2B290 -/* 00C84 80B2AE84 8FBF003C */ lw $ra, 0x003C($sp) +/* 00C80 80B2AE80 50400103 */ beql $v0, $zero, .L80B2B290 +/* 00C84 80B2AE84 8FBF003C */ lw $ra, 0x003C($sp) /* 00C88 80B2AE88 94590000 */ lhu $t9, 0x0000($v0) ## 00000000 /* 00C8C 80B2AE8C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00C90 80B2AE90 572100FF */ bnel $t9, $at, .L80B2B290 -/* 00C94 80B2AE94 8FBF003C */ lw $ra, 0x003C($sp) +/* 00C90 80B2AE90 572100FF */ bnel $t9, $at, .L80B2B290 +/* 00C94 80B2AE94 8FBF003C */ lw $ra, 0x003C($sp) /* 00C98 80B2AE98 8E0A01A0 */ lw $t2, 0x01A0($s0) ## 000001A0 /* 00C9C 80B2AE9C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00CA0 80B2AEA0 24A52574 */ addiu $a1, $a1, 0x2574 ## $a1 = 06002574 -/* 00CA4 80B2AEA4 10AA00F9 */ beq $a1, $t2, .L80B2B28C -/* 00CA8 80B2AEA8 8FA40040 */ lw $a0, 0x0040($sp) -/* 00CAC 80B2AEAC 0C0294E1 */ jal func_800A5384 +/* 00CA4 80B2AEA4 10AA00F9 */ beq $a1, $t2, .L80B2B28C +/* 00CA8 80B2AEA8 8FA40040 */ lw $a0, 0x0040($sp) +/* 00CAC 80B2AEAC 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 00CB0 80B2AEB0 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 00CB4 80B2AEB4 920B01E5 */ lbu $t3, 0x01E5($s0) ## 000001E5 /* 00CB8 80B2AEB8 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 00CBC 80B2AEBC 100000F3 */ beq $zero, $zero, .L80B2B28C +/* 00CBC 80B2AEBC 100000F3 */ beq $zero, $zero, .L80B2B28C /* 00CC0 80B2AEC0 A20C01E5 */ sb $t4, 0x01E5($s0) ## 000001E5 /* 00CC4 80B2AEC4 90CD1D6C */ lbu $t5, 0x1D6C($a2) ## 00001D6C .L80B2AEC8: -/* 00CC8 80B2AEC8 51A000F1 */ beql $t5, $zero, .L80B2B290 -/* 00CCC 80B2AECC 8FBF003C */ lw $ra, 0x003C($sp) +/* 00CC8 80B2AEC8 51A000F1 */ beql $t5, $zero, .L80B2B290 +/* 00CCC 80B2AECC 8FBF003C */ lw $ra, 0x003C($sp) /* 00CD0 80B2AED0 8CC21D8C */ lw $v0, 0x1D8C($a2) ## 00001D8C -/* 00CD4 80B2AED4 504000EE */ beql $v0, $zero, .L80B2B290 -/* 00CD8 80B2AED8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00CD4 80B2AED4 504000EE */ beql $v0, $zero, .L80B2B290 +/* 00CD8 80B2AED8 8FBF003C */ lw $ra, 0x003C($sp) /* 00CDC 80B2AEDC 944E0000 */ lhu $t6, 0x0000($v0) ## 00000000 /* 00CE0 80B2AEE0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00CE4 80B2AEE4 55C100EA */ bnel $t6, $at, .L80B2B290 -/* 00CE8 80B2AEE8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00CE4 80B2AEE4 55C100EA */ bnel $t6, $at, .L80B2B290 +/* 00CE8 80B2AEE8 8FBF003C */ lw $ra, 0x003C($sp) /* 00CEC 80B2AEEC 8E0F01A0 */ lw $t7, 0x01A0($s0) ## 000001A0 /* 00CF0 80B2AEF0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00CF4 80B2AEF4 24A529CC */ addiu $a1, $a1, 0x29CC ## $a1 = 060029CC -/* 00CF8 80B2AEF8 10AF00E4 */ beq $a1, $t7, .L80B2B28C -/* 00CFC 80B2AEFC 8FA40040 */ lw $a0, 0x0040($sp) -/* 00D00 80B2AF00 0C0294E1 */ jal func_800A5384 +/* 00CF8 80B2AEF8 10AF00E4 */ beq $a1, $t7, .L80B2B28C +/* 00CFC 80B2AEFC 8FA40040 */ lw $a0, 0x0040($sp) +/* 00D00 80B2AF00 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 00D04 80B2AF04 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00D08 80B2AF08 921801E5 */ lbu $t8, 0x01E5($s0) ## 000001E5 /* 00D0C 80B2AF0C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00D10 80B2AF10 100000DE */ beq $zero, $zero, .L80B2B28C +/* 00D10 80B2AF10 100000DE */ beq $zero, $zero, .L80B2B28C /* 00D14 80B2AF14 A21901E5 */ sb $t9, 0x01E5($s0) ## 000001E5 .L80B2AF18: -/* 00D18 80B2AF18 15410067 */ bne $t2, $at, .L80B2B0B8 -/* 00D1C 80B2AF1C 8FAE0044 */ lw $t6, 0x0044($sp) +/* 00D18 80B2AF18 15410067 */ bne $t2, $at, .L80B2B0B8 +/* 00D1C 80B2AF1C 8FAE0044 */ lw $t6, 0x0044($sp) /* 00D20 80B2AF20 84CB00A4 */ lh $t3, 0x00A4($a2) ## 000000A4 /* 00D24 80B2AF24 24010051 */ addiu $at, $zero, 0x0051 ## $at = 00000051 /* 00D28 80B2AF28 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 00D2C 80B2AF2C 15610032 */ bne $t3, $at, .L80B2AFF8 +/* 00D2C 80B2AF2C 15610032 */ bne $t3, $at, .L80B2AFF8 /* 00D30 80B2AF30 00000000 */ nop /* 00D34 80B2AF34 920301E5 */ lbu $v1, 0x01E5($s0) ## 000001E5 -/* 00D38 80B2AF38 50600006 */ beql $v1, $zero, .L80B2AF54 +/* 00D38 80B2AF38 50600006 */ beql $v1, $zero, .L80B2AF54 /* 00D3C 80B2AF3C 90CC1D6C */ lbu $t4, 0x1D6C($a2) ## 00001D6C -/* 00D40 80B2AF40 50680019 */ beql $v1, $t0, .L80B2AFA8 +/* 00D40 80B2AF40 50680019 */ beql $v1, $t0, .L80B2AFA8 /* 00D44 80B2AF44 90D91D6C */ lbu $t9, 0x1D6C($a2) ## 00001D6C -/* 00D48 80B2AF48 100000D1 */ beq $zero, $zero, .L80B2B290 -/* 00D4C 80B2AF4C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00D48 80B2AF48 100000D1 */ beq $zero, $zero, .L80B2B290 +/* 00D4C 80B2AF4C 8FBF003C */ lw $ra, 0x003C($sp) /* 00D50 80B2AF50 90CC1D6C */ lbu $t4, 0x1D6C($a2) ## 00001D6C .L80B2AF54: -/* 00D54 80B2AF54 518000CE */ beql $t4, $zero, .L80B2B290 -/* 00D58 80B2AF58 8FBF003C */ lw $ra, 0x003C($sp) +/* 00D54 80B2AF54 518000CE */ beql $t4, $zero, .L80B2B290 +/* 00D58 80B2AF58 8FBF003C */ lw $ra, 0x003C($sp) /* 00D5C 80B2AF5C 8CC21D8C */ lw $v0, 0x1D8C($a2) ## 00001D8C -/* 00D60 80B2AF60 504000CB */ beql $v0, $zero, .L80B2B290 -/* 00D64 80B2AF64 8FBF003C */ lw $ra, 0x003C($sp) +/* 00D60 80B2AF60 504000CB */ beql $v0, $zero, .L80B2B290 +/* 00D64 80B2AF64 8FBF003C */ lw $ra, 0x003C($sp) /* 00D68 80B2AF68 944D0000 */ lhu $t5, 0x0000($v0) ## 00000000 /* 00D6C 80B2AF6C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00D70 80B2AF70 55A100C7 */ bnel $t5, $at, .L80B2B290 -/* 00D74 80B2AF74 8FBF003C */ lw $ra, 0x003C($sp) +/* 00D70 80B2AF70 55A100C7 */ bnel $t5, $at, .L80B2B290 +/* 00D74 80B2AF74 8FBF003C */ lw $ra, 0x003C($sp) /* 00D78 80B2AF78 8E0E01A0 */ lw $t6, 0x01A0($s0) ## 000001A0 /* 00D7C 80B2AF7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00D80 80B2AF80 24A51410 */ addiu $a1, $a1, 0x1410 ## $a1 = 06001410 -/* 00D84 80B2AF84 10AE00C1 */ beq $a1, $t6, .L80B2B28C -/* 00D88 80B2AF88 8FA40040 */ lw $a0, 0x0040($sp) -/* 00D8C 80B2AF8C 0C0294E1 */ jal func_800A5384 +/* 00D84 80B2AF84 10AE00C1 */ beq $a1, $t6, .L80B2B28C +/* 00D88 80B2AF88 8FA40040 */ lw $a0, 0x0040($sp) +/* 00D8C 80B2AF8C 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 00D90 80B2AF90 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 00D94 80B2AF94 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 /* 00D98 80B2AF98 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00D9C 80B2AF9C 100000BB */ beq $zero, $zero, .L80B2B28C +/* 00D9C 80B2AF9C 100000BB */ beq $zero, $zero, .L80B2B28C /* 00DA0 80B2AFA0 A21801E5 */ sb $t8, 0x01E5($s0) ## 000001E5 /* 00DA4 80B2AFA4 90D91D6C */ lbu $t9, 0x1D6C($a2) ## 00001D6C .L80B2AFA8: -/* 00DA8 80B2AFA8 532000B9 */ beql $t9, $zero, .L80B2B290 -/* 00DAC 80B2AFAC 8FBF003C */ lw $ra, 0x003C($sp) +/* 00DA8 80B2AFA8 532000B9 */ beql $t9, $zero, .L80B2B290 +/* 00DAC 80B2AFAC 8FBF003C */ lw $ra, 0x003C($sp) /* 00DB0 80B2AFB0 8CC21D8C */ lw $v0, 0x1D8C($a2) ## 00001D8C -/* 00DB4 80B2AFB4 504000B6 */ beql $v0, $zero, .L80B2B290 -/* 00DB8 80B2AFB8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00DB4 80B2AFB4 504000B6 */ beql $v0, $zero, .L80B2B290 +/* 00DB8 80B2AFB8 8FBF003C */ lw $ra, 0x003C($sp) /* 00DBC 80B2AFBC 944A0000 */ lhu $t2, 0x0000($v0) ## 00000000 /* 00DC0 80B2AFC0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00DC4 80B2AFC4 554100B2 */ bnel $t2, $at, .L80B2B290 -/* 00DC8 80B2AFC8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00DC4 80B2AFC4 554100B2 */ bnel $t2, $at, .L80B2B290 +/* 00DC8 80B2AFC8 8FBF003C */ lw $ra, 0x003C($sp) /* 00DCC 80B2AFCC 8E0B01A0 */ lw $t3, 0x01A0($s0) ## 000001A0 /* 00DD0 80B2AFD0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DD4 80B2AFD4 24A50450 */ addiu $a1, $a1, 0x0450 ## $a1 = 06000450 -/* 00DD8 80B2AFD8 10AB00AC */ beq $a1, $t3, .L80B2B28C -/* 00DDC 80B2AFDC 8FA40040 */ lw $a0, 0x0040($sp) -/* 00DE0 80B2AFE0 0C0294E1 */ jal func_800A5384 +/* 00DD8 80B2AFD8 10AB00AC */ beq $a1, $t3, .L80B2B28C +/* 00DDC 80B2AFDC 8FA40040 */ lw $a0, 0x0040($sp) +/* 00DE0 80B2AFE0 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 00DE4 80B2AFE4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00DE8 80B2AFE8 920C01E5 */ lbu $t4, 0x01E5($s0) ## 000001E5 /* 00DEC 80B2AFEC 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00DF0 80B2AFF0 100000A6 */ beq $zero, $zero, .L80B2B28C +/* 00DF0 80B2AFF0 100000A6 */ beq $zero, $zero, .L80B2B28C /* 00DF4 80B2AFF4 A20D01E5 */ sb $t5, 0x01E5($s0) ## 000001E5 .L80B2AFF8: -/* 00DF8 80B2AFF8 0C03D9E8 */ jal func_800F67A0 -/* 00DFC 80B2AFFC AFA50050 */ sw $a1, 0x0050($sp) +/* 00DF8 80B2AFF8 0C03D9E8 */ jal func_800F67A0 +/* 00DFC 80B2AFFC AFA50050 */ sw $a1, 0x0050($sp) /* 00E00 80B2B000 920301E5 */ lbu $v1, 0x01E5($s0) ## 000001E5 -/* 00E04 80B2B004 8FA50050 */ lw $a1, 0x0050($sp) -/* 00E08 80B2B008 8FA6005C */ lw $a2, 0x005C($sp) -/* 00E0C 80B2B00C 10600009 */ beq $v1, $zero, .L80B2B034 +/* 00E04 80B2B004 8FA50050 */ lw $a1, 0x0050($sp) +/* 00E08 80B2B008 8FA6005C */ lw $a2, 0x005C($sp) +/* 00E0C 80B2B00C 10600009 */ beq $v1, $zero, .L80B2B034 /* 00E10 80B2B010 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00E14 80B2B014 10680010 */ beq $v1, $t0, .L80B2B058 +/* 00E14 80B2B014 10680010 */ beq $v1, $t0, .L80B2B058 /* 00E18 80B2B018 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00E1C 80B2B01C 1061001C */ beq $v1, $at, .L80B2B090 +/* 00E1C 80B2B01C 1061001C */ beq $v1, $at, .L80B2B090 /* 00E20 80B2B020 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00E24 80B2B024 5061009A */ beql $v1, $at, .L80B2B290 -/* 00E28 80B2B028 8FBF003C */ lw $ra, 0x003C($sp) -/* 00E2C 80B2B02C 10000098 */ beq $zero, $zero, .L80B2B290 -/* 00E30 80B2B030 8FBF003C */ lw $ra, 0x003C($sp) +/* 00E24 80B2B024 5061009A */ beql $v1, $at, .L80B2B290 +/* 00E28 80B2B028 8FBF003C */ lw $ra, 0x003C($sp) +/* 00E2C 80B2B02C 10000098 */ beq $zero, $zero, .L80B2B290 +/* 00E30 80B2B030 8FBF003C */ lw $ra, 0x003C($sp) .L80B2B034: /* 00E34 80B2B034 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E38 80B2B038 24A5504C */ addiu $a1, $a1, 0x504C ## $a1 = 0600504C -/* 00E3C 80B2B03C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00E40 80B2B040 0C0294E1 */ jal func_800A5384 +/* 00E3C 80B2B03C 8FA40040 */ lw $a0, 0x0040($sp) +/* 00E40 80B2B040 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 00E44 80B2B044 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E48 80B2B048 920E01E5 */ lbu $t6, 0x01E5($s0) ## 000001E5 /* 00E4C 80B2B04C 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00E50 80B2B050 1000008E */ beq $zero, $zero, .L80B2B28C +/* 00E50 80B2B050 1000008E */ beq $zero, $zero, .L80B2B28C /* 00E54 80B2B054 A20F01E5 */ sb $t7, 0x01E5($s0) ## 000001E5 .L80B2B058: /* 00E58 80B2B058 8CD81D8C */ lw $t8, 0x1D8C($a2) ## 00001D8C @@ -640,112 +640,112 @@ glabel L80B2AD44 /* 00E60 80B2B060 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E64 80B2B064 97190000 */ lhu $t9, 0x0000($t8) ## 00000000 /* 00E68 80B2B068 24A5420C */ addiu $a1, $a1, 0x420C ## $a1 = 0600420C -/* 00E6C 80B2B06C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00E70 80B2B070 57210087 */ bnel $t9, $at, .L80B2B290 -/* 00E74 80B2B074 8FBF003C */ lw $ra, 0x003C($sp) -/* 00E78 80B2B078 0C029490 */ jal func_800A5240 +/* 00E6C 80B2B06C 8FA40040 */ lw $a0, 0x0040($sp) +/* 00E70 80B2B070 57210087 */ bnel $t9, $at, .L80B2B290 +/* 00E74 80B2B074 8FBF003C */ lw $ra, 0x003C($sp) +/* 00E78 80B2B078 0C029490 */ jal func_800A5240 /* 00E7C 80B2B07C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00E80 80B2B080 920A01E5 */ lbu $t2, 0x01E5($s0) ## 000001E5 /* 00E84 80B2B084 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00E88 80B2B088 10000080 */ beq $zero, $zero, .L80B2B28C +/* 00E88 80B2B088 10000080 */ beq $zero, $zero, .L80B2B28C /* 00E8C 80B2B08C A20B01E5 */ sb $t3, 0x01E5($s0) ## 000001E5 .L80B2B090: -/* 00E90 80B2B090 10A0007E */ beq $a1, $zero, .L80B2B28C -/* 00E94 80B2B094 8FA40040 */ lw $a0, 0x0040($sp) +/* 00E90 80B2B090 10A0007E */ beq $a1, $zero, .L80B2B28C +/* 00E94 80B2B094 8FA40040 */ lw $a0, 0x0040($sp) /* 00E98 80B2B098 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E9C 80B2B09C 24A548FC */ addiu $a1, $a1, 0x48FC ## $a1 = 060048FC -/* 00EA0 80B2B0A0 0C0294D3 */ jal func_800A534C +/* 00EA0 80B2B0A0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00EA4 80B2B0A4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00EA8 80B2B0A8 920C01E5 */ lbu $t4, 0x01E5($s0) ## 000001E5 /* 00EAC 80B2B0AC 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00EB0 80B2B0B0 10000076 */ beq $zero, $zero, .L80B2B28C +/* 00EB0 80B2B0B0 10000076 */ beq $zero, $zero, .L80B2B28C /* 00EB4 80B2B0B4 A20D01E5 */ sb $t5, 0x01E5($s0) ## 000001E5 .L80B2B0B8: /* 00EB8 80B2B0B8 24040007 */ addiu $a0, $zero, 0x0007 ## $a0 = 00000007 -/* 00EBC 80B2B0BC 548E002F */ bnel $a0, $t6, .L80B2B17C -/* 00EC0 80B2B0C0 8FAE0044 */ lw $t6, 0x0044($sp) +/* 00EBC 80B2B0BC 548E002F */ bnel $a0, $t6, .L80B2B17C +/* 00EC0 80B2B0C0 8FAE0044 */ lw $t6, 0x0044($sp) /* 00EC4 80B2B0C4 920301E5 */ lbu $v1, 0x01E5($s0) ## 000001E5 -/* 00EC8 80B2B0C8 50600006 */ beql $v1, $zero, .L80B2B0E4 +/* 00EC8 80B2B0C8 50600006 */ beql $v1, $zero, .L80B2B0E4 /* 00ECC 80B2B0CC 90CF1D6C */ lbu $t7, 0x1D6C($a2) ## 00001D6C -/* 00ED0 80B2B0D0 1068001F */ beq $v1, $t0, .L80B2B150 +/* 00ED0 80B2B0D0 1068001F */ beq $v1, $t0, .L80B2B150 /* 00ED4 80B2B0D4 00000000 */ nop -/* 00ED8 80B2B0D8 1000006D */ beq $zero, $zero, .L80B2B290 -/* 00EDC 80B2B0DC 8FBF003C */ lw $ra, 0x003C($sp) +/* 00ED8 80B2B0D8 1000006D */ beq $zero, $zero, .L80B2B290 +/* 00EDC 80B2B0DC 8FBF003C */ lw $ra, 0x003C($sp) /* 00EE0 80B2B0E0 90CF1D6C */ lbu $t7, 0x1D6C($a2) ## 00001D6C .L80B2B0E4: -/* 00EE4 80B2B0E4 51E0006A */ beql $t7, $zero, .L80B2B290 -/* 00EE8 80B2B0E8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00EE4 80B2B0E4 51E0006A */ beql $t7, $zero, .L80B2B290 +/* 00EE8 80B2B0E8 8FBF003C */ lw $ra, 0x003C($sp) /* 00EEC 80B2B0EC 8CC31D90 */ lw $v1, 0x1D90($a2) ## 00001D90 -/* 00EF0 80B2B0F0 50600067 */ beql $v1, $zero, .L80B2B290 -/* 00EF4 80B2B0F4 8FBF003C */ lw $ra, 0x003C($sp) +/* 00EF0 80B2B0F0 50600067 */ beql $v1, $zero, .L80B2B290 +/* 00EF4 80B2B0F4 8FBF003C */ lw $ra, 0x003C($sp) /* 00EF8 80B2B0F8 94780000 */ lhu $t8, 0x0000($v1) ## 00000000 /* 00EFC 80B2B0FC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 00F00 80B2B100 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00F04 80B2B104 14980061 */ bne $a0, $t8, .L80B2B28C +/* 00F04 80B2B104 14980061 */ bne $a0, $t8, .L80B2B28C /* 00F08 80B2B108 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 /* 00F0C 80B2B10C 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 /* 00F10 80B2B110 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 00F14 80B2B114 AFB90014 */ sw $t9, 0x0014($sp) +/* 00F14 80B2B114 AFB90014 */ sw $t9, 0x0014($sp) /* 00F18 80B2B118 240439C7 */ addiu $a0, $zero, 0x39C7 ## $a0 = 000039C7 /* 00F1C 80B2B11C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 /* 00F20 80B2B120 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00F24 80B2B124 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00F28 80B2B128 AFA70010 */ sw $a3, 0x0010($sp) + +/* 00F28 80B2B128 AFA70010 */ sw $a3, 0x0010($sp) /* 00F2C 80B2B12C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F30 80B2B130 24A54534 */ addiu $a1, $a1, 0x4534 ## $a1 = 06004534 -/* 00F34 80B2B134 8FA40040 */ lw $a0, 0x0040($sp) -/* 00F38 80B2B138 0C029490 */ jal func_800A5240 +/* 00F34 80B2B134 8FA40040 */ lw $a0, 0x0040($sp) +/* 00F38 80B2B138 0C029490 */ jal func_800A5240 /* 00F3C 80B2B13C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00F40 80B2B140 920A01E5 */ lbu $t2, 0x01E5($s0) ## 000001E5 /* 00F44 80B2B144 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00F48 80B2B148 10000050 */ beq $zero, $zero, .L80B2B28C +/* 00F48 80B2B148 10000050 */ beq $zero, $zero, .L80B2B28C /* 00F4C 80B2B14C A20B01E5 */ sb $t3, 0x01E5($s0) ## 000001E5 .L80B2B150: -/* 00F50 80B2B150 1040004E */ beq $v0, $zero, .L80B2B28C -/* 00F54 80B2B154 8FA40040 */ lw $a0, 0x0040($sp) +/* 00F50 80B2B150 1040004E */ beq $v0, $zero, .L80B2B28C +/* 00F54 80B2B154 8FA40040 */ lw $a0, 0x0040($sp) /* 00F58 80B2B158 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F5C 80B2B15C 24A548B0 */ addiu $a1, $a1, 0x48B0 ## $a1 = 060048B0 -/* 00F60 80B2B160 0C0294D3 */ jal func_800A534C +/* 00F60 80B2B160 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00F64 80B2B164 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00F68 80B2B168 920C01E5 */ lbu $t4, 0x01E5($s0) ## 000001E5 /* 00F6C 80B2B16C 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00F70 80B2B170 10000046 */ beq $zero, $zero, .L80B2B28C +/* 00F70 80B2B170 10000046 */ beq $zero, $zero, .L80B2B28C /* 00F74 80B2B174 A20D01E5 */ sb $t5, 0x01E5($s0) ## 000001E5 -/* 00F78 80B2B178 8FAE0044 */ lw $t6, 0x0044($sp) +/* 00F78 80B2B178 8FAE0044 */ lw $t6, 0x0044($sp) .L80B2B17C: /* 00F7C 80B2B17C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00F80 80B2B180 55C10043 */ bnel $t6, $at, .L80B2B290 -/* 00F84 80B2B184 8FBF003C */ lw $ra, 0x003C($sp) +/* 00F80 80B2B180 55C10043 */ bnel $t6, $at, .L80B2B290 +/* 00F84 80B2B184 8FBF003C */ lw $ra, 0x003C($sp) /* 00F88 80B2B188 920301E5 */ lbu $v1, 0x01E5($s0) ## 000001E5 -/* 00F8C 80B2B18C 5060000A */ beql $v1, $zero, .L80B2B1B8 +/* 00F8C 80B2B18C 5060000A */ beql $v1, $zero, .L80B2B1B8 /* 00F90 80B2B190 90CF1D6C */ lbu $t7, 0x1D6C($a2) ## 00001D6C -/* 00F94 80B2B194 10680019 */ beq $v1, $t0, .L80B2B1FC +/* 00F94 80B2B194 10680019 */ beq $v1, $t0, .L80B2B1FC /* 00F98 80B2B198 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00F9C 80B2B19C 10610025 */ beq $v1, $at, .L80B2B234 +/* 00F9C 80B2B19C 10610025 */ beq $v1, $at, .L80B2B234 /* 00FA0 80B2B1A0 00000000 */ nop -/* 00FA4 80B2B1A4 5067002E */ beql $v1, $a3, .L80B2B260 +/* 00FA4 80B2B1A4 5067002E */ beql $v1, $a3, .L80B2B260 /* 00FA8 80B2B1A8 8CD91D90 */ lw $t9, 0x1D90($a2) ## 00001D90 -/* 00FAC 80B2B1AC 10000037 */ beq $zero, $zero, .L80B2B28C +/* 00FAC 80B2B1AC 10000037 */ beq $zero, $zero, .L80B2B28C /* 00FB0 80B2B1B0 A20001E5 */ sb $zero, 0x01E5($s0) ## 000001E5 /* 00FB4 80B2B1B4 90CF1D6C */ lbu $t7, 0x1D6C($a2) ## 00001D6C .L80B2B1B8: -/* 00FB8 80B2B1B8 51E00035 */ beql $t7, $zero, .L80B2B290 -/* 00FBC 80B2B1BC 8FBF003C */ lw $ra, 0x003C($sp) +/* 00FB8 80B2B1B8 51E00035 */ beql $t7, $zero, .L80B2B290 +/* 00FBC 80B2B1BC 8FBF003C */ lw $ra, 0x003C($sp) /* 00FC0 80B2B1C0 8CC31D90 */ lw $v1, 0x1D90($a2) ## 00001D90 -/* 00FC4 80B2B1C4 50600032 */ beql $v1, $zero, .L80B2B290 -/* 00FC8 80B2B1C8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00FC4 80B2B1C4 50600032 */ beql $v1, $zero, .L80B2B290 +/* 00FC8 80B2B1C8 8FBF003C */ lw $ra, 0x003C($sp) /* 00FCC 80B2B1CC 94780000 */ lhu $t8, 0x0000($v1) ## 00000000 /* 00FD0 80B2B1D0 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 00FD4 80B2B1D4 8FA40040 */ lw $a0, 0x0040($sp) -/* 00FD8 80B2B1D8 1701002C */ bne $t8, $at, .L80B2B28C +/* 00FD4 80B2B1D4 8FA40040 */ lw $a0, 0x0040($sp) +/* 00FD8 80B2B1D8 1701002C */ bne $t8, $at, .L80B2B28C /* 00FDC 80B2B1DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00FE0 80B2B1E0 24A550A8 */ addiu $a1, $a1, 0x50A8 ## $a1 = 060050A8 -/* 00FE4 80B2B1E4 0C0294E1 */ jal func_800A5384 +/* 00FE4 80B2B1E4 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed /* 00FE8 80B2B1E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FEC 80B2B1EC 921901E5 */ lbu $t9, 0x01E5($s0) ## 000001E5 /* 00FF0 80B2B1F0 272A0001 */ addiu $t2, $t9, 0x0001 ## $t2 = 00000001 -/* 00FF4 80B2B1F4 10000025 */ beq $zero, $zero, .L80B2B28C +/* 00FF4 80B2B1F4 10000025 */ beq $zero, $zero, .L80B2B28C /* 00FF8 80B2B1F8 A20A01E5 */ sb $t2, 0x01E5($s0) ## 000001E5 .L80B2B1FC: /* 00FFC 80B2B1FC 8CCB1D90 */ lw $t3, 0x1D90($a2) ## 00001D90 @@ -753,45 +753,45 @@ glabel L80B2AD44 /* 01004 80B2B204 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01008 80B2B208 956C0000 */ lhu $t4, 0x0000($t3) ## 00000000 /* 0100C 80B2B20C 24A53284 */ addiu $a1, $a1, 0x3284 ## $a1 = 06003284 -/* 01010 80B2B210 8FA40040 */ lw $a0, 0x0040($sp) -/* 01014 80B2B214 5581001E */ bnel $t4, $at, .L80B2B290 -/* 01018 80B2B218 8FBF003C */ lw $ra, 0x003C($sp) -/* 0101C 80B2B21C 0C029490 */ jal func_800A5240 +/* 01010 80B2B210 8FA40040 */ lw $a0, 0x0040($sp) +/* 01014 80B2B214 5581001E */ bnel $t4, $at, .L80B2B290 +/* 01018 80B2B218 8FBF003C */ lw $ra, 0x003C($sp) +/* 0101C 80B2B21C 0C029490 */ jal func_800A5240 /* 01020 80B2B220 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 01024 80B2B224 920D01E5 */ lbu $t5, 0x01E5($s0) ## 000001E5 /* 01028 80B2B228 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 0102C 80B2B22C 10000017 */ beq $zero, $zero, .L80B2B28C +/* 0102C 80B2B22C 10000017 */ beq $zero, $zero, .L80B2B28C /* 01030 80B2B230 A20E01E5 */ sb $t6, 0x01E5($s0) ## 000001E5 .L80B2B234: -/* 01034 80B2B234 10400015 */ beq $v0, $zero, .L80B2B28C -/* 01038 80B2B238 8FA40040 */ lw $a0, 0x0040($sp) +/* 01034 80B2B234 10400015 */ beq $v0, $zero, .L80B2B28C +/* 01038 80B2B238 8FA40040 */ lw $a0, 0x0040($sp) /* 0103C 80B2B23C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01040 80B2B240 24A53D84 */ addiu $a1, $a1, 0x3D84 ## $a1 = 06003D84 -/* 01044 80B2B244 0C0294D3 */ jal func_800A534C +/* 01044 80B2B244 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01048 80B2B248 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0104C 80B2B24C 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 /* 01050 80B2B250 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 01054 80B2B254 1000000D */ beq $zero, $zero, .L80B2B28C +/* 01054 80B2B254 1000000D */ beq $zero, $zero, .L80B2B28C /* 01058 80B2B258 A21801E5 */ sb $t8, 0x01E5($s0) ## 000001E5 /* 0105C 80B2B25C 8CD91D90 */ lw $t9, 0x1D90($a2) ## 00001D90 .L80B2B260: /* 01060 80B2B260 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01064 80B2B264 24A53428 */ addiu $a1, $a1, 0x3428 ## $a1 = 06003428 /* 01068 80B2B268 972A0000 */ lhu $t2, 0x0000($t9) ## 00000000 -/* 0106C 80B2B26C 8FA40040 */ lw $a0, 0x0040($sp) -/* 01070 80B2B270 552A0007 */ bnel $t1, $t2, .L80B2B290 -/* 01074 80B2B274 8FBF003C */ lw $ra, 0x003C($sp) -/* 01078 80B2B278 0C029490 */ jal func_800A5240 +/* 0106C 80B2B26C 8FA40040 */ lw $a0, 0x0040($sp) +/* 01070 80B2B270 552A0007 */ bnel $t1, $t2, .L80B2B290 +/* 01074 80B2B274 8FBF003C */ lw $ra, 0x003C($sp) +/* 01078 80B2B278 0C029490 */ jal func_800A5240 /* 0107C 80B2B27C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01080 80B2B280 920B01E5 */ lbu $t3, 0x01E5($s0) ## 000001E5 /* 01084 80B2B284 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 /* 01088 80B2B288 A20C01E5 */ sb $t4, 0x01E5($s0) ## 000001E5 .L80B2B28C: -/* 0108C 80B2B28C 8FBF003C */ lw $ra, 0x003C($sp) +/* 0108C 80B2B28C 8FBF003C */ lw $ra, 0x003C($sp) .L80B2B290: -/* 01090 80B2B290 8FB00038 */ lw $s0, 0x0038($sp) +/* 01090 80B2B290 8FB00038 */ lw $s0, 0x0038($sp) /* 01094 80B2B294 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01098 80B2B298 03E00008 */ jr $ra +/* 01098 80B2B298 03E00008 */ jr $ra /* 0109C 80B2B29C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s index b2ee7e8f25..d72e45251d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s @@ -1,65 +1,65 @@ glabel func_80B2B4A8 /* 012A8 80B2B4A8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 012AC 80B2B4AC AFBF002C */ sw $ra, 0x002C($sp) -/* 012B0 80B2B4B0 AFB00028 */ sw $s0, 0x0028($sp) -/* 012B4 80B2B4B4 AFA5007C */ sw $a1, 0x007C($sp) +/* 012AC 80B2B4AC AFBF002C */ sw $ra, 0x002C($sp) +/* 012B0 80B2B4B0 AFB00028 */ sw $s0, 0x0028($sp) +/* 012B4 80B2B4B4 AFA5007C */ sw $a1, 0x007C($sp) /* 012B8 80B2B4B8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 012BC 80B2B4BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 012C0 80B2B4C0 3C0680B3 */ lui $a2, %hi(D_80B2D080) ## $a2 = 80B30000 /* 012C4 80B2B4C4 24C6D080 */ addiu $a2, $a2, %lo(D_80B2D080) ## $a2 = 80B2D080 /* 012C8 80B2B4C8 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 -/* 012CC 80B2B4CC A7A00076 */ sh $zero, 0x0076($sp) +/* 012CC 80B2B4CC A7A00076 */ sh $zero, 0x0076($sp) /* 012D0 80B2B4D0 2407057D */ addiu $a3, $zero, 0x057D ## $a3 = 0000057D -/* 012D4 80B2B4D4 0C031AB1 */ jal func_800C6AC4 -/* 012D8 80B2B4D8 AFA50070 */ sw $a1, 0x0070($sp) +/* 012D4 80B2B4D4 0C031AB1 */ jal func_800C6AC4 +/* 012D8 80B2B4D8 AFA50070 */ sw $a1, 0x0070($sp) /* 012DC 80B2B4DC 8607001C */ lh $a3, 0x001C($s0) ## 0000001C /* 012E0 80B2B4E0 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 012E4 80B2B4E4 87A30076 */ lh $v1, 0x0076($sp) -/* 012E8 80B2B4E8 00073A03 */ sra $a3, $a3, 8 -/* 012EC 80B2B4EC 00073C00 */ sll $a3, $a3, 16 -/* 012F0 80B2B4F0 00073C03 */ sra $a3, $a3, 16 -/* 012F4 80B2B4F4 10EA0007 */ beq $a3, $t2, .L80B2B514 -/* 012F8 80B2B4F8 8FA80070 */ lw $t0, 0x0070($sp) +/* 012E4 80B2B4E4 87A30076 */ lh $v1, 0x0076($sp) +/* 012E8 80B2B4E8 00073A03 */ sra $a3, $a3, 8 +/* 012EC 80B2B4EC 00073C00 */ sll $a3, $a3, 16 +/* 012F0 80B2B4F0 00073C03 */ sra $a3, $a3, 16 +/* 012F4 80B2B4F4 10EA0007 */ beq $a3, $t2, .L80B2B514 +/* 012F8 80B2B4F8 8FA80070 */ lw $t0, 0x0070($sp) /* 012FC 80B2B4FC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01300 80B2B500 10E10004 */ beq $a3, $at, .L80B2B514 +/* 01300 80B2B500 10E10004 */ beq $a3, $at, .L80B2B514 /* 01304 80B2B504 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01308 80B2B508 10E10002 */ beq $a3, $at, .L80B2B514 +/* 01308 80B2B508 10E10002 */ beq $a3, $at, .L80B2B514 /* 0130C 80B2B50C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01310 80B2B510 14E10094 */ bne $a3, $at, .L80B2B764 +/* 01310 80B2B510 14E10094 */ bne $a3, $at, .L80B2B764 .L80B2B514: /* 01314 80B2B514 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 01318 80B2B518 8DEFF9C0 */ lw $t7, -0x0640($t7) ## 8015F9C0 /* 0131C 80B2B51C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01320 80B2B520 8FB8007C */ lw $t8, 0x007C($sp) -/* 01324 80B2B524 11E10002 */ beq $t7, $at, .L80B2B530 +/* 01320 80B2B520 8FB8007C */ lw $t8, 0x007C($sp) +/* 01324 80B2B524 11E10002 */ beq $t7, $at, .L80B2B530 /* 01328 80B2B528 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 /* 0132C 80B2B52C 24030095 */ addiu $v1, $zero, 0x0095 ## $v1 = 00000095 .L80B2B530: /* 01330 80B2B530 97021D74 */ lhu $v0, 0x1D74($t8) ## 00001D74 /* 01334 80B2B534 24790467 */ addiu $t9, $v1, 0x0467 ## $t9 = 000004FC /* 01338 80B2B538 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 0133C 80B2B53C 0322082A */ slt $at, $t9, $v0 -/* 01340 80B2B540 14200020 */ bne $at, $zero, .L80B2B5C4 +/* 0133C 80B2B53C 0322082A */ slt $at, $t9, $v0 +/* 01340 80B2B540 14200020 */ bne $at, $zero, .L80B2B5C4 /* 01344 80B2B544 246B0468 */ addiu $t3, $v1, 0x0468 ## $t3 = 000004FD /* 01348 80B2B548 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0134C 80B2B54C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01350 80B2B550 2484F178 */ addiu $a0, $a0, 0xF178 ## $a0 = 0600F178 -/* 01354 80B2B554 00046900 */ sll $t5, $a0, 4 -/* 01358 80B2B558 000D7702 */ srl $t6, $t5, 28 +/* 01354 80B2B554 00046900 */ sll $t5, $a0, 4 +/* 01358 80B2B558 000D7702 */ srl $t6, $t5, 28 /* 0135C 80B2B55C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 /* 01360 80B2B560 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 01364 80B2B564 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 01368 80B2B568 27186FA8 */ addiu $t8, $t8, 0x6FA8 ## $t8 = 80166FA8 -/* 0136C 80B2B56C 000E7880 */ sll $t7, $t6, 2 +/* 0136C 80B2B56C 000E7880 */ sll $t7, $t6, 2 /* 01370 80B2B570 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 01374 80B2B574 01F82821 */ addu $a1, $t7, $t8 +/* 01374 80B2B574 01F82821 */ addu $a1, $t7, $t8 /* 01378 80B2B578 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 0137C 80B2B57C 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 /* 01380 80B2B580 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01384 80B2B584 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01388 80B2B588 00813024 */ and $a2, $a0, $at -/* 0138C 80B2B58C 03265821 */ addu $t3, $t9, $a2 -/* 01390 80B2B590 01696021 */ addu $t4, $t3, $t1 +/* 01388 80B2B588 00813024 */ and $a2, $a0, $at +/* 0138C 80B2B58C 03265821 */ addu $t3, $t9, $a2 +/* 01390 80B2B590 01696021 */ addu $t4, $t3, $t1 /* 01394 80B2B594 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 01398 80B2B598 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0139C 80B2B59C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -68,35 +68,35 @@ glabel func_80B2B4A8 /* 013A8 80B2B5A8 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 013AC 80B2B5AC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 013B0 80B2B5B0 8CAF0000 */ lw $t7, 0x0000($a1) ## 00000000 -/* 013B4 80B2B5B4 01E6C021 */ addu $t8, $t7, $a2 -/* 013B8 80B2B5B8 0309C821 */ addu $t9, $t8, $t1 -/* 013BC 80B2B5BC 10000080 */ beq $zero, $zero, .L80B2B7C0 +/* 013B4 80B2B5B4 01E6C021 */ addu $t8, $t7, $a2 +/* 013B8 80B2B5B8 0309C821 */ addu $t9, $t8, $t1 +/* 013BC 80B2B5BC 10000080 */ beq $zero, $zero, .L80B2B7C0 /* 013C0 80B2B5C0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 .L80B2B5C4: -/* 013C4 80B2B5C4 0162082A */ slt $at, $t3, $v0 -/* 013C8 80B2B5C8 14200022 */ bne $at, $zero, .L80B2B654 +/* 013C4 80B2B5C4 0162082A */ slt $at, $t3, $v0 +/* 013C8 80B2B5C8 14200022 */ bne $at, $zero, .L80B2B654 /* 013CC 80B2B5CC 246C0469 */ addiu $t4, $v1, 0x0469 ## $t4 = 000004FE /* 013D0 80B2B5D0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 013D4 80B2B5D4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 013D8 80B2B5D8 2484F378 */ addiu $a0, $a0, 0xF378 ## $a0 = 0600F378 -/* 013DC 80B2B5DC 00047100 */ sll $t6, $a0, 4 -/* 013E0 80B2B5E0 000E7F02 */ srl $t7, $t6, 28 +/* 013DC 80B2B5DC 00047100 */ sll $t6, $a0, 4 +/* 013E0 80B2B5E0 000E7F02 */ srl $t7, $t6, 28 /* 013E4 80B2B5E4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 013E8 80B2B5E8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 013EC 80B2B5EC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 013F0 80B2B5F0 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 /* 013F4 80B2B5F4 27396FA8 */ addiu $t9, $t9, 0x6FA8 ## $t9 = 80166FA8 /* 013F8 80B2B5F8 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 013FC 80B2B5FC 000FC080 */ sll $t8, $t7, 2 -/* 01400 80B2B600 03192821 */ addu $a1, $t8, $t9 +/* 013FC 80B2B5FC 000FC080 */ sll $t8, $t7, 2 +/* 01400 80B2B600 03192821 */ addu $a1, $t8, $t9 /* 01404 80B2B604 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01408 80B2B608 8CAB0000 */ lw $t3, 0x0000($a1) ## 00000000 /* 0140C 80B2B60C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01410 80B2B610 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01414 80B2B614 00813024 */ and $a2, $a0, $at +/* 01414 80B2B614 00813024 */ and $a2, $a0, $at /* 01418 80B2B618 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 -/* 0141C 80B2B61C 01666021 */ addu $t4, $t3, $a2 -/* 01420 80B2B620 01896821 */ addu $t5, $t4, $t1 +/* 0141C 80B2B61C 01666021 */ addu $t4, $t3, $a2 +/* 01420 80B2B620 01896821 */ addu $t5, $t4, $t1 /* 01424 80B2B624 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 01428 80B2B628 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0142C 80B2B62C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -105,35 +105,35 @@ glabel func_80B2B4A8 /* 01438 80B2B638 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 0143C 80B2B63C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 01440 80B2B640 8CB80000 */ lw $t8, 0x0000($a1) ## 00000000 -/* 01444 80B2B644 0306C821 */ addu $t9, $t8, $a2 -/* 01448 80B2B648 03295821 */ addu $t3, $t9, $t1 -/* 0144C 80B2B64C 1000005C */ beq $zero, $zero, .L80B2B7C0 +/* 01444 80B2B644 0306C821 */ addu $t9, $t8, $a2 +/* 01448 80B2B648 03295821 */ addu $t3, $t9, $t1 +/* 0144C 80B2B64C 1000005C */ beq $zero, $zero, .L80B2B7C0 /* 01450 80B2B650 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 .L80B2B654: -/* 01454 80B2B654 0182082A */ slt $at, $t4, $v0 -/* 01458 80B2B658 14200022 */ bne $at, $zero, .L80B2B6E4 +/* 01454 80B2B654 0182082A */ slt $at, $t4, $v0 +/* 01458 80B2B658 14200022 */ bne $at, $zero, .L80B2B6E4 /* 0145C 80B2B65C 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 /* 01460 80B2B660 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01464 80B2B664 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01468 80B2B668 2484F578 */ addiu $a0, $a0, 0xF578 ## $a0 = 0600F578 -/* 0146C 80B2B66C 00047900 */ sll $t7, $a0, 4 -/* 01470 80B2B670 000FC702 */ srl $t8, $t7, 28 +/* 0146C 80B2B66C 00047900 */ sll $t7, $a0, 4 +/* 01470 80B2B670 000FC702 */ srl $t8, $t7, 28 /* 01474 80B2B674 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 01478 80B2B678 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 0147C 80B2B67C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01480 80B2B680 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 01484 80B2B684 256B6FA8 */ addiu $t3, $t3, 0x6FA8 ## $t3 = 80166FA8 /* 01488 80B2B688 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 0148C 80B2B68C 0018C880 */ sll $t9, $t8, 2 -/* 01490 80B2B690 032B2821 */ addu $a1, $t9, $t3 +/* 0148C 80B2B68C 0018C880 */ sll $t9, $t8, 2 +/* 01490 80B2B690 032B2821 */ addu $a1, $t9, $t3 /* 01494 80B2B694 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 01498 80B2B698 8CAC0000 */ lw $t4, 0x0000($a1) ## 00000000 /* 0149C 80B2B69C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 014A0 80B2B6A0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 014A4 80B2B6A4 00813024 */ and $a2, $a0, $at +/* 014A4 80B2B6A4 00813024 */ and $a2, $a0, $at /* 014A8 80B2B6A8 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 -/* 014AC 80B2B6AC 01866821 */ addu $t5, $t4, $a2 -/* 014B0 80B2B6B0 01A97021 */ addu $t6, $t5, $t1 +/* 014AC 80B2B6AC 01866821 */ addu $t5, $t4, $a2 +/* 014B0 80B2B6B0 01A97021 */ addu $t6, $t5, $t1 /* 014B4 80B2B6B4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 014B8 80B2B6B8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 014BC 80B2B6BC 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -142,31 +142,31 @@ glabel func_80B2B4A8 /* 014C8 80B2B6C8 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 014CC 80B2B6CC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 014D0 80B2B6D0 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 -/* 014D4 80B2B6D4 03265821 */ addu $t3, $t9, $a2 -/* 014D8 80B2B6D8 01696021 */ addu $t4, $t3, $t1 -/* 014DC 80B2B6DC 10000038 */ beq $zero, $zero, .L80B2B7C0 +/* 014D4 80B2B6D4 03265821 */ addu $t3, $t9, $a2 +/* 014D8 80B2B6D8 01696021 */ addu $t4, $t3, $t1 +/* 014DC 80B2B6DC 10000038 */ beq $zero, $zero, .L80B2B7C0 /* 014E0 80B2B6E0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 .L80B2B6E4: /* 014E4 80B2B6E4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 014E8 80B2B6E8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 014EC 80B2B6EC 2484F778 */ addiu $a0, $a0, 0xF778 ## $a0 = 0600F778 -/* 014F0 80B2B6F0 00047900 */ sll $t7, $a0, 4 -/* 014F4 80B2B6F4 000FC702 */ srl $t8, $t7, 28 +/* 014F0 80B2B6F0 00047900 */ sll $t7, $a0, 4 +/* 014F4 80B2B6F4 000FC702 */ srl $t8, $t7, 28 /* 014F8 80B2B6F8 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 014FC 80B2B6FC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 01500 80B2B700 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01504 80B2B704 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 01508 80B2B708 256B6FA8 */ addiu $t3, $t3, 0x6FA8 ## $t3 = 80166FA8 /* 0150C 80B2B70C 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 01510 80B2B710 0018C880 */ sll $t9, $t8, 2 -/* 01514 80B2B714 032B2821 */ addu $a1, $t9, $t3 +/* 01510 80B2B710 0018C880 */ sll $t9, $t8, 2 +/* 01514 80B2B714 032B2821 */ addu $a1, $t9, $t3 /* 01518 80B2B718 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 0151C 80B2B71C 8CAC0000 */ lw $t4, 0x0000($a1) ## 00000000 /* 01520 80B2B720 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01524 80B2B724 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01528 80B2B728 00813024 */ and $a2, $a0, $at -/* 0152C 80B2B72C 01866821 */ addu $t5, $t4, $a2 -/* 01530 80B2B730 01A97021 */ addu $t6, $t5, $t1 +/* 01528 80B2B728 00813024 */ and $a2, $a0, $at +/* 0152C 80B2B72C 01866821 */ addu $t5, $t4, $a2 +/* 01530 80B2B730 01A97021 */ addu $t6, $t5, $t1 /* 01534 80B2B734 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01538 80B2B738 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0153C 80B2B73C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -175,52 +175,52 @@ glabel func_80B2B4A8 /* 01548 80B2B748 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 0154C 80B2B74C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01550 80B2B750 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 -/* 01554 80B2B754 03265821 */ addu $t3, $t9, $a2 -/* 01558 80B2B758 01696021 */ addu $t4, $t3, $t1 -/* 0155C 80B2B75C 10000018 */ beq $zero, $zero, .L80B2B7C0 +/* 01554 80B2B754 03265821 */ addu $t3, $t9, $a2 +/* 01558 80B2B758 01696021 */ addu $t4, $t3, $t1 +/* 0155C 80B2B75C 10000018 */ beq $zero, $zero, .L80B2B7C0 /* 01560 80B2B760 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 .L80B2B764: /* 01564 80B2B764 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01568 80B2B768 14E10015 */ bne $a3, $at, .L80B2B7C0 +/* 01568 80B2B768 14E10015 */ bne $a3, $at, .L80B2B7C0 /* 0156C 80B2B76C 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 /* 01570 80B2B770 8D0302D0 */ lw $v1, 0x02D0($t0) ## 000002D0 /* 01574 80B2B774 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01578 80B2B778 2484A4E0 */ addiu $a0, $a0, 0xA4E0 ## $a0 = 0600A4E0 -/* 0157C 80B2B77C 00047900 */ sll $t7, $a0, 4 -/* 01580 80B2B780 000FC702 */ srl $t8, $t7, 28 +/* 0157C 80B2B77C 00047900 */ sll $t7, $a0, 4 +/* 01580 80B2B780 000FC702 */ srl $t8, $t7, 28 /* 01584 80B2B784 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 01588 80B2B788 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 0000009D /* 0158C 80B2B78C AD0D02D0 */ sw $t5, 0x02D0($t0) ## 000002D0 /* 01590 80B2B790 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 01594 80B2B794 0018C880 */ sll $t9, $t8, 2 +/* 01594 80B2B794 0018C880 */ sll $t9, $t8, 2 /* 01598 80B2B798 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 0159C 80B2B79C 01795821 */ addu $t3, $t3, $t9 +/* 0159C 80B2B79C 01795821 */ addu $t3, $t3, $t9 /* 015A0 80B2B7A0 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000095 /* 015A4 80B2B7A4 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 /* 015A8 80B2B7A8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 015AC 80B2B7AC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 015B0 80B2B7B0 00816024 */ and $t4, $a0, $at -/* 015B4 80B2B7B4 016C6821 */ addu $t5, $t3, $t4 -/* 015B8 80B2B7B8 01A97021 */ addu $t6, $t5, $t1 +/* 015B0 80B2B7B0 00816024 */ and $t4, $a0, $at +/* 015B4 80B2B7B4 016C6821 */ addu $t5, $t3, $t4 +/* 015B8 80B2B7B8 01A97021 */ addu $t6, $t5, $t1 /* 015BC 80B2B7BC AC6E0004 */ sw $t6, 0x0004($v1) ## 00000099 .L80B2B7C0: /* 015C0 80B2B7C0 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 015C4 80B2B7C4 14E1000C */ bne $a3, $at, .L80B2B7F8 -/* 015C8 80B2B7C8 8FA4007C */ lw $a0, 0x007C($sp) +/* 015C4 80B2B7C4 14E1000C */ bne $a3, $at, .L80B2B7F8 +/* 015C8 80B2B7C8 8FA4007C */ lw $a0, 0x007C($sp) /* 015CC 80B2B7CC 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 015D0 80B2B7D0 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 /* 015D4 80B2B7D4 9207019A */ lbu $a3, 0x019A($s0) ## 0000019A /* 015D8 80B2B7D8 3C0F80B3 */ lui $t7, %hi(func_80B2B364) ## $t7 = 80B30000 /* 015DC 80B2B7DC 25EFB364 */ addiu $t7, $t7, %lo(func_80B2B364) ## $t7 = 80B2B364 -/* 015E0 80B2B7E0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 015E4 80B2B7E4 AFB00018 */ sw $s0, 0x0018($sp) -/* 015E8 80B2B7E8 0C0286B2 */ jal func_800A1AC8 -/* 015EC 80B2B7EC AFA00010 */ sw $zero, 0x0010($sp) -/* 015F0 80B2B7F0 10000037 */ beq $zero, $zero, .L80B2B8D0 -/* 015F4 80B2B7F4 8FAF007C */ lw $t7, 0x007C($sp) +/* 015E0 80B2B7E0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 015E4 80B2B7E4 AFB00018 */ sw $s0, 0x0018($sp) +/* 015E8 80B2B7E8 0C0286B2 */ jal SkelAnime_DrawSV +/* 015EC 80B2B7EC AFA00010 */ sw $zero, 0x0010($sp) +/* 015F0 80B2B7F0 10000037 */ beq $zero, $zero, .L80B2B8D0 +/* 015F4 80B2B7F4 8FAF007C */ lw $t7, 0x007C($sp) .L80B2B7F8: -/* 015F8 80B2B7F8 14EA0011 */ bne $a3, $t2, .L80B2B840 -/* 015FC 80B2B7FC 8FA4007C */ lw $a0, 0x007C($sp) +/* 015F8 80B2B7F8 14EA0011 */ bne $a3, $t2, .L80B2B840 +/* 015FC 80B2B7FC 8FA4007C */ lw $a0, 0x007C($sp) /* 01600 80B2B800 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 01604 80B2B804 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 /* 01608 80B2B808 9207019A */ lbu $a3, 0x019A($s0) ## 0000019A @@ -228,67 +228,67 @@ glabel func_80B2B4A8 /* 01610 80B2B810 3C1980B3 */ lui $t9, %hi(func_80B2B468) ## $t9 = 80B30000 /* 01614 80B2B814 2739B468 */ addiu $t9, $t9, %lo(func_80B2B468) ## $t9 = 80B2B468 /* 01618 80B2B818 2718B2F4 */ addiu $t8, $t8, %lo(func_80B2B2F4) ## $t8 = 80B2B2F4 -/* 0161C 80B2B81C AFB80010 */ sw $t8, 0x0010($sp) -/* 01620 80B2B820 AFB90014 */ sw $t9, 0x0014($sp) -/* 01624 80B2B824 0C0286B2 */ jal func_800A1AC8 -/* 01628 80B2B828 AFB00018 */ sw $s0, 0x0018($sp) -/* 0162C 80B2B82C 8FA4007C */ lw $a0, 0x007C($sp) -/* 01630 80B2B830 0C2CB307 */ jal func_80B2CC1C +/* 0161C 80B2B81C AFB80010 */ sw $t8, 0x0010($sp) +/* 01620 80B2B820 AFB90014 */ sw $t9, 0x0014($sp) +/* 01624 80B2B824 0C0286B2 */ jal SkelAnime_DrawSV +/* 01628 80B2B828 AFB00018 */ sw $s0, 0x0018($sp) +/* 0162C 80B2B82C 8FA4007C */ lw $a0, 0x007C($sp) +/* 01630 80B2B830 0C2CB307 */ jal func_80B2CC1C /* 01634 80B2B834 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01638 80B2B838 10000025 */ beq $zero, $zero, .L80B2B8D0 -/* 0163C 80B2B83C 8FAF007C */ lw $t7, 0x007C($sp) +/* 01638 80B2B838 10000025 */ beq $zero, $zero, .L80B2B8D0 +/* 0163C 80B2B83C 8FAF007C */ lw $t7, 0x007C($sp) .L80B2B840: -/* 01640 80B2B840 10EA0007 */ beq $a3, $t2, .L80B2B860 +/* 01640 80B2B840 10EA0007 */ beq $a3, $t2, .L80B2B860 /* 01644 80B2B844 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01648 80B2B848 10E10005 */ beq $a3, $at, .L80B2B860 +/* 01648 80B2B848 10E10005 */ beq $a3, $at, .L80B2B860 /* 0164C 80B2B84C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01650 80B2B850 10E10003 */ beq $a3, $at, .L80B2B860 +/* 01650 80B2B850 10E10003 */ beq $a3, $at, .L80B2B860 /* 01654 80B2B854 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01658 80B2B858 14E10016 */ bne $a3, $at, .L80B2B8B4 -/* 0165C 80B2B85C 8FA4007C */ lw $a0, 0x007C($sp) +/* 01658 80B2B858 14E10016 */ bne $a3, $at, .L80B2B8B4 +/* 0165C 80B2B85C 8FA4007C */ lw $a0, 0x007C($sp) .L80B2B860: -/* 01660 80B2B860 8FAB007C */ lw $t3, 0x007C($sp) +/* 01660 80B2B860 8FAB007C */ lw $t3, 0x007C($sp) /* 01664 80B2B864 916C1D6C */ lbu $t4, 0x1D6C($t3) ## 00001D6C -/* 01668 80B2B868 51800019 */ beql $t4, $zero, .L80B2B8D0 -/* 0166C 80B2B86C 8FAF007C */ lw $t7, 0x007C($sp) +/* 01668 80B2B868 51800019 */ beql $t4, $zero, .L80B2B8D0 +/* 0166C 80B2B86C 8FAF007C */ lw $t7, 0x007C($sp) /* 01670 80B2B870 8D6D1D90 */ lw $t5, 0x1D90($t3) ## 00001D90 /* 01674 80B2B874 3C0E80B3 */ lui $t6, %hi(func_80B2B468) ## $t6 = 80B30000 /* 01678 80B2B878 25CEB468 */ addiu $t6, $t6, %lo(func_80B2B468) ## $t6 = 80B2B468 -/* 0167C 80B2B87C 11A00013 */ beq $t5, $zero, .L80B2B8CC +/* 0167C 80B2B87C 11A00013 */ beq $t5, $zero, .L80B2B8CC /* 01680 80B2B880 01602025 */ or $a0, $t3, $zero ## $a0 = 00000000 /* 01684 80B2B884 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 01688 80B2B888 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 /* 0168C 80B2B88C 9207019A */ lbu $a3, 0x019A($s0) ## 0000019A -/* 01690 80B2B890 AFB00018 */ sw $s0, 0x0018($sp) -/* 01694 80B2B894 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01698 80B2B898 0C0286B2 */ jal func_800A1AC8 -/* 0169C 80B2B89C AFA00010 */ sw $zero, 0x0010($sp) -/* 016A0 80B2B8A0 8FA4007C */ lw $a0, 0x007C($sp) -/* 016A4 80B2B8A4 0C2CB307 */ jal func_80B2CC1C +/* 01690 80B2B890 AFB00018 */ sw $s0, 0x0018($sp) +/* 01694 80B2B894 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01698 80B2B898 0C0286B2 */ jal SkelAnime_DrawSV +/* 0169C 80B2B89C AFA00010 */ sw $zero, 0x0010($sp) +/* 016A0 80B2B8A0 8FA4007C */ lw $a0, 0x007C($sp) +/* 016A4 80B2B8A4 0C2CB307 */ jal func_80B2CC1C /* 016A8 80B2B8A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 016AC 80B2B8AC 10000008 */ beq $zero, $zero, .L80B2B8D0 -/* 016B0 80B2B8B0 8FAF007C */ lw $t7, 0x007C($sp) +/* 016AC 80B2B8AC 10000008 */ beq $zero, $zero, .L80B2B8D0 +/* 016B0 80B2B8B0 8FAF007C */ lw $t7, 0x007C($sp) .L80B2B8B4: /* 016B4 80B2B8B4 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 016B8 80B2B8B8 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 -/* 016BC 80B2B8BC AFB00014 */ sw $s0, 0x0014($sp) -/* 016C0 80B2B8C0 AFA00010 */ sw $zero, 0x0010($sp) +/* 016BC 80B2B8BC AFB00014 */ sw $s0, 0x0014($sp) +/* 016C0 80B2B8C0 AFA00010 */ sw $zero, 0x0010($sp) /* 016C4 80B2B8C4 0C028572 */ jal SkelAnime_Draw - + /* 016C8 80B2B8C8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 .L80B2B8CC: -/* 016CC 80B2B8CC 8FAF007C */ lw $t7, 0x007C($sp) +/* 016CC 80B2B8CC 8FAF007C */ lw $t7, 0x007C($sp) .L80B2B8D0: /* 016D0 80B2B8D0 3C0680B3 */ lui $a2, %hi(D_80B2D094) ## $a2 = 80B30000 /* 016D4 80B2B8D4 24C6D094 */ addiu $a2, $a2, %lo(D_80B2D094) ## $a2 = 80B2D094 /* 016D8 80B2B8D8 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 016DC 80B2B8DC 240705E7 */ addiu $a3, $zero, 0x05E7 ## $a3 = 000005E7 -/* 016E0 80B2B8E0 0C031AD5 */ jal func_800C6B54 +/* 016E0 80B2B8E0 0C031AD5 */ jal func_800C6B54 /* 016E4 80B2B8E4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 016E8 80B2B8E8 8FBF002C */ lw $ra, 0x002C($sp) -/* 016EC 80B2B8EC 8FB00028 */ lw $s0, 0x0028($sp) +/* 016E8 80B2B8E8 8FBF002C */ lw $ra, 0x002C($sp) +/* 016EC 80B2B8EC 8FB00028 */ lw $s0, 0x0028($sp) /* 016F0 80B2B8F0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 016F4 80B2B8F4 03E00008 */ jr $ra +/* 016F4 80B2B8F4 03E00008 */ jr $ra /* 016F8 80B2B8F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s index 8196dad589..0cc3b826c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s @@ -1,91 +1,91 @@ glabel func_80B2BA38 /* 01838 80B2BA38 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 0183C 80B2BA3C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01840 80B2BA40 AFA400A0 */ sw $a0, 0x00A0($sp) -/* 01844 80B2BA44 AFA500A4 */ sw $a1, 0x00A4($sp) +/* 0183C 80B2BA3C AFBF0024 */ sw $ra, 0x0024($sp) +/* 01840 80B2BA40 AFA400A0 */ sw $a0, 0x00A0($sp) +/* 01844 80B2BA44 AFA500A4 */ sw $a1, 0x00A4($sp) /* 01848 80B2BA48 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0184C 80B2BA4C 3C0680B3 */ lui $a2, %hi(D_80B2D0D0) ## $a2 = 80B30000 /* 01850 80B2BA50 24C6D0D0 */ addiu $a2, $a2, %lo(D_80B2D0D0) ## $a2 = 80B2D0D0 /* 01854 80B2BA54 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFEC /* 01858 80B2BA58 2407062F */ addiu $a3, $zero, 0x062F ## $a3 = 0000062F -/* 0185C 80B2BA5C 0C031AB1 */ jal func_800C6AC4 -/* 01860 80B2BA60 AFA5009C */ sw $a1, 0x009C($sp) -/* 01864 80B2BA64 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 0185C 80B2BA5C 0C031AB1 */ jal func_800C6AC4 +/* 01860 80B2BA60 AFA5009C */ sw $a1, 0x009C($sp) +/* 01864 80B2BA64 8FAC00A4 */ lw $t4, 0x00A4($sp) /* 01868 80B2BA68 24010051 */ addiu $at, $zero, 0x0051 ## $at = 00000051 -/* 0186C 80B2BA6C 8FA8009C */ lw $t0, 0x009C($sp) +/* 0186C 80B2BA6C 8FA8009C */ lw $t0, 0x009C($sp) /* 01870 80B2BA70 858F00A4 */ lh $t7, 0x00A4($t4) ## 000000A4 -/* 01874 80B2BA74 8FAB00A0 */ lw $t3, 0x00A0($sp) +/* 01874 80B2BA74 8FAB00A0 */ lw $t3, 0x00A0($sp) /* 01878 80B2BA78 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 0187C 80B2BA7C 15E1015D */ bne $t7, $at, .L80B2BFF4 +/* 0187C 80B2BA7C 15E1015D */ bne $t7, $at, .L80B2BFF4 /* 01880 80B2BA80 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01884 80B2BA84 95821D74 */ lhu $v0, 0x1D74($t4) ## 00001D74 /* 01888 80B2BA88 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 0188C 80B2BA8C 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 01890 80B2BA90 28410303 */ slti $at, $v0, 0x0303 -/* 01894 80B2BA94 10200026 */ beq $at, $zero, .L80B2BB30 +/* 01890 80B2BA90 28410303 */ slti $at, $v0, 0x0303 +/* 01894 80B2BA94 10200026 */ beq $at, $zero, .L80B2BB30 /* 01898 80B2BA98 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 /* 0189C 80B2BA9C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 018A0 80B2BAA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 018A4 80B2BAA4 248442F0 */ addiu $a0, $a0, 0x42F0 ## $a0 = 060042F0 -/* 018A8 80B2BAA8 00046900 */ sll $t5, $a0, 4 +/* 018A8 80B2BAA8 00046900 */ sll $t5, $a0, 4 /* 018AC 80B2BAAC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 018B0 80B2BAB0 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 018B4 80B2BAB4 000D7702 */ srl $t6, $t5, 28 +/* 018B4 80B2BAB4 000D7702 */ srl $t6, $t5, 28 /* 018B8 80B2BAB8 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 018BC 80B2BABC 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 018C0 80B2BAC0 000E7880 */ sll $t7, $t6, 2 -/* 018C4 80B2BAC4 012FC021 */ addu $t8, $t1, $t7 +/* 018C0 80B2BAC0 000E7880 */ sll $t7, $t6, 2 +/* 018C4 80B2BAC4 012FC021 */ addu $t8, $t1, $t7 /* 018C8 80B2BAC8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 018CC 80B2BACC 8F190000 */ lw $t9, 0x0000($t8) ## 00000008 /* 018D0 80B2BAD0 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 018D4 80B2BAD4 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 018D8 80B2BAD8 008A6824 */ and $t5, $a0, $t2 -/* 018DC 80B2BADC 032D7021 */ addu $t6, $t9, $t5 -/* 018E0 80B2BAE0 01C77821 */ addu $t7, $t6, $a3 +/* 018D8 80B2BAD8 008A6824 */ and $t5, $a0, $t2 +/* 018DC 80B2BADC 032D7021 */ addu $t6, $t9, $t5 +/* 018E0 80B2BAE0 01C77821 */ addu $t7, $t6, $a3 /* 018E4 80B2BAE4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 018E8 80B2BAE8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 018EC 80B2BAEC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 018F0 80B2BAF0 24843EF0 */ addiu $a0, $a0, 0x3EF0 ## $a0 = 06003EF0 -/* 018F4 80B2BAF4 00046900 */ sll $t5, $a0, 4 +/* 018F4 80B2BAF4 00046900 */ sll $t5, $a0, 4 /* 018F8 80B2BAF8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 018FC 80B2BAFC AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 01900 80B2BB00 000D7702 */ srl $t6, $t5, 28 +/* 01900 80B2BB00 000D7702 */ srl $t6, $t5, 28 /* 01904 80B2BB04 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01908 80B2BB08 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 -/* 0190C 80B2BB0C 000E7880 */ sll $t7, $t6, 2 -/* 01910 80B2BB10 012FC021 */ addu $t8, $t1, $t7 +/* 0190C 80B2BB0C 000E7880 */ sll $t7, $t6, 2 +/* 01910 80B2BB10 012FC021 */ addu $t8, $t1, $t7 /* 01914 80B2BB14 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 01918 80B2BB18 8F190000 */ lw $t9, 0x0000($t8) ## 00000008 -/* 0191C 80B2BB1C 008A6824 */ and $t5, $a0, $t2 -/* 01920 80B2BB20 032D7021 */ addu $t6, $t9, $t5 -/* 01924 80B2BB24 01C77821 */ addu $t7, $t6, $a3 -/* 01928 80B2BB28 100000E0 */ beq $zero, $zero, .L80B2BEAC +/* 0191C 80B2BB1C 008A6824 */ and $t5, $a0, $t2 +/* 01920 80B2BB20 032D7021 */ addu $t6, $t9, $t5 +/* 01924 80B2BB24 01C77821 */ addu $t7, $t6, $a3 +/* 01928 80B2BB28 100000E0 */ beq $zero, $zero, .L80B2BEAC /* 0192C 80B2BB2C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 .L80B2BB30: -/* 01930 80B2BB30 28410304 */ slti $at, $v0, 0x0304 -/* 01934 80B2BB34 50200023 */ beql $at, $zero, .L80B2BBC4 -/* 01938 80B2BB38 28410305 */ slti $at, $v0, 0x0305 +/* 01930 80B2BB30 28410304 */ slti $at, $v0, 0x0304 +/* 01934 80B2BB34 50200023 */ beql $at, $zero, .L80B2BBC4 +/* 01938 80B2BB38 28410305 */ slti $at, $v0, 0x0305 /* 0193C 80B2BB3C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01940 80B2BB40 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01944 80B2BB44 24842EF0 */ addiu $a0, $a0, 0x2EF0 ## $a0 = 06002EF0 -/* 01948 80B2BB48 00046900 */ sll $t5, $a0, 4 -/* 0194C 80B2BB4C 000D7702 */ srl $t6, $t5, 28 +/* 01948 80B2BB48 00046900 */ sll $t5, $a0, 4 +/* 0194C 80B2BB4C 000D7702 */ srl $t6, $t5, 28 /* 01950 80B2BB50 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01954 80B2BB54 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01958 80B2BB58 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 0195C 80B2BB5C AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 01960 80B2BB60 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 01964 80B2BB64 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 01968 80B2BB68 000E7880 */ sll $t7, $t6, 2 -/* 0196C 80B2BB6C 012F2821 */ addu $a1, $t1, $t7 +/* 01968 80B2BB68 000E7880 */ sll $t7, $t6, 2 +/* 0196C 80B2BB6C 012F2821 */ addu $a1, $t1, $t7 /* 01970 80B2BB70 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 01974 80B2BB74 8CB80000 */ lw $t8, 0x0000($a1) ## 00000000 /* 01978 80B2BB78 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 0197C 80B2BB7C 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01980 80B2BB80 008A3024 */ and $a2, $a0, $t2 +/* 01980 80B2BB80 008A3024 */ and $a2, $a0, $t2 /* 01984 80B2BB84 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01988 80B2BB88 0306C821 */ addu $t9, $t8, $a2 -/* 0198C 80B2BB8C 03276821 */ addu $t5, $t9, $a3 +/* 01988 80B2BB88 0306C821 */ addu $t9, $t8, $a2 +/* 0198C 80B2BB8C 03276821 */ addu $t5, $t9, $a3 /* 01990 80B2BB90 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 01994 80B2BB94 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01998 80B2BB98 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -94,35 +94,35 @@ glabel func_80B2BA38 /* 019A4 80B2BBA4 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 019A8 80B2BBA8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 019AC 80B2BBAC 8CB80000 */ lw $t8, 0x0000($a1) ## 00000000 -/* 019B0 80B2BBB0 0306C821 */ addu $t9, $t8, $a2 -/* 019B4 80B2BBB4 03276821 */ addu $t5, $t9, $a3 -/* 019B8 80B2BBB8 100000BC */ beq $zero, $zero, .L80B2BEAC +/* 019B0 80B2BBB0 0306C821 */ addu $t9, $t8, $a2 +/* 019B4 80B2BBB4 03276821 */ addu $t5, $t9, $a3 +/* 019B8 80B2BBB8 100000BC */ beq $zero, $zero, .L80B2BEAC /* 019BC 80B2BBBC AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 019C0 80B2BBC0 28410305 */ slti $at, $v0, 0x0305 +/* 019C0 80B2BBC0 28410305 */ slti $at, $v0, 0x0305 .L80B2BBC4: -/* 019C4 80B2BBC4 50200023 */ beql $at, $zero, .L80B2BC54 -/* 019C8 80B2BBC8 28410317 */ slti $at, $v0, 0x0317 +/* 019C4 80B2BBC4 50200023 */ beql $at, $zero, .L80B2BC54 +/* 019C8 80B2BBC8 28410317 */ slti $at, $v0, 0x0317 /* 019CC 80B2BBCC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 019D0 80B2BBD0 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 019D4 80B2BBD4 246332F0 */ addiu $v1, $v1, 0x32F0 ## $v1 = 060032F0 -/* 019D8 80B2BBD8 0003C100 */ sll $t8, $v1, 4 -/* 019DC 80B2BBDC 0018CF02 */ srl $t9, $t8, 28 +/* 019D8 80B2BBD8 0003C100 */ sll $t8, $v1, 4 +/* 019DC 80B2BBDC 0018CF02 */ srl $t9, $t8, 28 /* 019E0 80B2BBE0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 019E4 80B2BBE4 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 019E8 80B2BBE8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 019EC 80B2BBEC AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 019F0 80B2BBF0 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 019F4 80B2BBF4 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 019F8 80B2BBF8 00196880 */ sll $t5, $t9, 2 -/* 019FC 80B2BBFC 012D2821 */ addu $a1, $t1, $t5 +/* 019F8 80B2BBF8 00196880 */ sll $t5, $t9, 2 +/* 019FC 80B2BBFC 012D2821 */ addu $a1, $t1, $t5 /* 01A00 80B2BC00 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 01A04 80B2BC04 8CAE0000 */ lw $t6, 0x0000($a1) ## 00000000 /* 01A08 80B2BC08 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 01A0C 80B2BC0C 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01A10 80B2BC10 006A3024 */ and $a2, $v1, $t2 +/* 01A10 80B2BC10 006A3024 */ and $a2, $v1, $t2 /* 01A14 80B2BC14 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01A18 80B2BC18 01C67821 */ addu $t7, $t6, $a2 -/* 01A1C 80B2BC1C 01E7C021 */ addu $t8, $t7, $a3 +/* 01A18 80B2BC18 01C67821 */ addu $t7, $t6, $a2 +/* 01A1C 80B2BC1C 01E7C021 */ addu $t8, $t7, $a3 /* 01A20 80B2BC20 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 01A24 80B2BC24 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01A28 80B2BC28 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -131,35 +131,35 @@ glabel func_80B2BA38 /* 01A34 80B2BC34 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 /* 01A38 80B2BC38 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01A3C 80B2BC3C 8CAE0000 */ lw $t6, 0x0000($a1) ## 00000000 -/* 01A40 80B2BC40 01C67821 */ addu $t7, $t6, $a2 -/* 01A44 80B2BC44 01E7C021 */ addu $t8, $t7, $a3 -/* 01A48 80B2BC48 10000098 */ beq $zero, $zero, .L80B2BEAC +/* 01A40 80B2BC40 01C67821 */ addu $t7, $t6, $a2 +/* 01A44 80B2BC44 01E7C021 */ addu $t8, $t7, $a3 +/* 01A48 80B2BC48 10000098 */ beq $zero, $zero, .L80B2BEAC /* 01A4C 80B2BC4C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 01A50 80B2BC50 28410317 */ slti $at, $v0, 0x0317 +/* 01A50 80B2BC50 28410317 */ slti $at, $v0, 0x0317 .L80B2BC54: -/* 01A54 80B2BC54 50200024 */ beql $at, $zero, .L80B2BCE8 -/* 01A58 80B2BC58 28410318 */ slti $at, $v0, 0x0318 +/* 01A54 80B2BC54 50200024 */ beql $at, $zero, .L80B2BCE8 +/* 01A58 80B2BC58 28410318 */ slti $at, $v0, 0x0318 /* 01A5C 80B2BC5C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01A60 80B2BC60 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01A64 80B2BC64 248436F0 */ addiu $a0, $a0, 0x36F0 ## $a0 = 060036F0 -/* 01A68 80B2BC68 00047100 */ sll $t6, $a0, 4 -/* 01A6C 80B2BC6C 000E7F02 */ srl $t7, $t6, 28 +/* 01A68 80B2BC68 00047100 */ sll $t6, $a0, 4 +/* 01A6C 80B2BC6C 000E7F02 */ srl $t7, $t6, 28 /* 01A70 80B2BC70 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01A74 80B2BC74 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01A78 80B2BC78 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01A7C 80B2BC7C AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 /* 01A80 80B2BC80 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 /* 01A84 80B2BC84 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 01A88 80B2BC88 000FC080 */ sll $t8, $t7, 2 -/* 01A8C 80B2BC8C 01382821 */ addu $a1, $t1, $t8 +/* 01A88 80B2BC88 000FC080 */ sll $t8, $t7, 2 +/* 01A8C 80B2BC8C 01382821 */ addu $a1, $t1, $t8 /* 01A90 80B2BC90 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01A94 80B2BC94 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 /* 01A98 80B2BC98 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 01A9C 80B2BC9C 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01AA0 80B2BCA0 008A3024 */ and $a2, $a0, $t2 +/* 01AA0 80B2BCA0 008A3024 */ and $a2, $a0, $t2 /* 01AA4 80B2BCA4 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01AA8 80B2BCA8 03266821 */ addu $t5, $t9, $a2 -/* 01AAC 80B2BCAC 01A77021 */ addu $t6, $t5, $a3 +/* 01AA8 80B2BCA8 03266821 */ addu $t5, $t9, $a2 +/* 01AAC 80B2BCAC 01A77021 */ addu $t6, $t5, $a3 /* 01AB0 80B2BCB0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01AB4 80B2BCB4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01AB8 80B2BCB8 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -168,36 +168,36 @@ glabel func_80B2BA38 /* 01AC4 80B2BCC4 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 01AC8 80B2BCC8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01ACC 80B2BCCC 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 -/* 01AD0 80B2BCD0 03266821 */ addu $t5, $t9, $a2 -/* 01AD4 80B2BCD4 01A77021 */ addu $t6, $t5, $a3 +/* 01AD0 80B2BCD0 03266821 */ addu $t5, $t9, $a2 +/* 01AD4 80B2BCD4 01A77021 */ addu $t6, $t5, $a3 /* 01AD8 80B2BCD8 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 01ADC 80B2BCDC 10000073 */ beq $zero, $zero, .L80B2BEAC -/* 01AE0 80B2BCE0 8FAC00A4 */ lw $t4, 0x00A4($sp) -/* 01AE4 80B2BCE4 28410318 */ slti $at, $v0, 0x0318 +/* 01ADC 80B2BCDC 10000073 */ beq $zero, $zero, .L80B2BEAC +/* 01AE0 80B2BCE0 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 01AE4 80B2BCE4 28410318 */ slti $at, $v0, 0x0318 .L80B2BCE8: -/* 01AE8 80B2BCE8 50200024 */ beql $at, $zero, .L80B2BD7C -/* 01AEC 80B2BCEC 28410319 */ slti $at, $v0, 0x0319 +/* 01AE8 80B2BCE8 50200024 */ beql $at, $zero, .L80B2BD7C +/* 01AEC 80B2BCEC 28410319 */ slti $at, $v0, 0x0319 /* 01AF0 80B2BCF0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01AF4 80B2BCF4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01AF8 80B2BCF8 24842EF0 */ addiu $a0, $a0, 0x2EF0 ## $a0 = 06002EF0 -/* 01AFC 80B2BCFC 0004C900 */ sll $t9, $a0, 4 -/* 01B00 80B2BD00 00196F02 */ srl $t5, $t9, 28 +/* 01AFC 80B2BCFC 0004C900 */ sll $t9, $a0, 4 +/* 01B00 80B2BD00 00196F02 */ srl $t5, $t9, 28 /* 01B04 80B2BD04 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01B08 80B2BD08 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01B0C 80B2BD0C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01B10 80B2BD10 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 01B14 80B2BD14 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 01B18 80B2BD18 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 01B1C 80B2BD1C 000D7080 */ sll $t6, $t5, 2 -/* 01B20 80B2BD20 012E2821 */ addu $a1, $t1, $t6 +/* 01B1C 80B2BD1C 000D7080 */ sll $t6, $t5, 2 +/* 01B20 80B2BD20 012E2821 */ addu $a1, $t1, $t6 /* 01B24 80B2BD24 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01B28 80B2BD28 8CAF0000 */ lw $t7, 0x0000($a1) ## 00000000 /* 01B2C 80B2BD2C 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 01B30 80B2BD30 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01B34 80B2BD34 008A3024 */ and $a2, $a0, $t2 +/* 01B34 80B2BD34 008A3024 */ and $a2, $a0, $t2 /* 01B38 80B2BD38 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01B3C 80B2BD3C 01E6C021 */ addu $t8, $t7, $a2 -/* 01B40 80B2BD40 0307C821 */ addu $t9, $t8, $a3 +/* 01B3C 80B2BD3C 01E6C021 */ addu $t8, $t7, $a2 +/* 01B40 80B2BD40 0307C821 */ addu $t9, $t8, $a3 /* 01B44 80B2BD44 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 01B48 80B2BD48 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01B4C 80B2BD4C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -206,36 +206,36 @@ glabel func_80B2BA38 /* 01B58 80B2BD58 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 01B5C 80B2BD5C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 01B60 80B2BD60 8CAF0000 */ lw $t7, 0x0000($a1) ## 00000000 -/* 01B64 80B2BD64 01E6C021 */ addu $t8, $t7, $a2 -/* 01B68 80B2BD68 0307C821 */ addu $t9, $t8, $a3 +/* 01B64 80B2BD64 01E6C021 */ addu $t8, $t7, $a2 +/* 01B68 80B2BD68 0307C821 */ addu $t9, $t8, $a3 /* 01B6C 80B2BD6C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01B70 80B2BD70 1000004E */ beq $zero, $zero, .L80B2BEAC -/* 01B74 80B2BD74 8FAC00A4 */ lw $t4, 0x00A4($sp) -/* 01B78 80B2BD78 28410319 */ slti $at, $v0, 0x0319 +/* 01B70 80B2BD70 1000004E */ beq $zero, $zero, .L80B2BEAC +/* 01B74 80B2BD74 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 01B78 80B2BD78 28410319 */ slti $at, $v0, 0x0319 .L80B2BD7C: -/* 01B7C 80B2BD7C 50200024 */ beql $at, $zero, .L80B2BE10 +/* 01B7C 80B2BD7C 50200024 */ beql $at, $zero, .L80B2BE10 /* 01B80 80B2BD80 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01B84 80B2BD84 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01B88 80B2BD88 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 01B8C 80B2BD8C 246332F0 */ addiu $v1, $v1, 0x32F0 ## $v1 = 060032F0 -/* 01B90 80B2BD90 00037900 */ sll $t7, $v1, 4 -/* 01B94 80B2BD94 000FC702 */ srl $t8, $t7, 28 +/* 01B90 80B2BD90 00037900 */ sll $t7, $v1, 4 +/* 01B94 80B2BD94 000FC702 */ srl $t8, $t7, 28 /* 01B98 80B2BD98 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01B9C 80B2BD9C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 01BA0 80B2BDA0 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01BA4 80B2BDA4 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 01BA8 80B2BDA8 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 /* 01BAC 80B2BDAC 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 01BB0 80B2BDB0 0018C880 */ sll $t9, $t8, 2 -/* 01BB4 80B2BDB4 01392821 */ addu $a1, $t1, $t9 +/* 01BB0 80B2BDB0 0018C880 */ sll $t9, $t8, 2 +/* 01BB4 80B2BDB4 01392821 */ addu $a1, $t1, $t9 /* 01BB8 80B2BDB8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 01BBC 80B2BDBC 8CAD0000 */ lw $t5, 0x0000($a1) ## 00000000 /* 01BC0 80B2BDC0 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 01BC4 80B2BDC4 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01BC8 80B2BDC8 006A3024 */ and $a2, $v1, $t2 +/* 01BC8 80B2BDC8 006A3024 */ and $a2, $v1, $t2 /* 01BCC 80B2BDCC 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01BD0 80B2BDD0 01A67021 */ addu $t6, $t5, $a2 -/* 01BD4 80B2BDD4 01C77821 */ addu $t7, $t6, $a3 +/* 01BD0 80B2BDD0 01A67021 */ addu $t6, $t5, $a2 +/* 01BD4 80B2BDD4 01C77821 */ addu $t7, $t6, $a3 /* 01BD8 80B2BDD8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01BDC 80B2BDDC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01BE0 80B2BDE0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -244,158 +244,158 @@ glabel func_80B2BA38 /* 01BEC 80B2BDEC AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 01BF0 80B2BDF0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 01BF4 80B2BDF4 8CAD0000 */ lw $t5, 0x0000($a1) ## 00000000 -/* 01BF8 80B2BDF8 01A67021 */ addu $t6, $t5, $a2 -/* 01BFC 80B2BDFC 01C77821 */ addu $t7, $t6, $a3 +/* 01BF8 80B2BDF8 01A67021 */ addu $t6, $t5, $a2 +/* 01BFC 80B2BDFC 01C77821 */ addu $t7, $t6, $a3 /* 01C00 80B2BE00 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01C04 80B2BE04 10000029 */ beq $zero, $zero, .L80B2BEAC -/* 01C08 80B2BE08 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 01C04 80B2BE04 10000029 */ beq $zero, $zero, .L80B2BEAC +/* 01C08 80B2BE08 8FAC00A4 */ lw $t4, 0x00A4($sp) /* 01C0C 80B2BE0C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 .L80B2BE10: /* 01C10 80B2BE10 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01C14 80B2BE14 248442F0 */ addiu $a0, $a0, 0x42F0 ## $a0 = 060042F0 -/* 01C18 80B2BE18 00046900 */ sll $t5, $a0, 4 +/* 01C18 80B2BE18 00046900 */ sll $t5, $a0, 4 /* 01C1C 80B2BE1C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01C20 80B2BE20 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01C24 80B2BE24 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 01C28 80B2BE28 000D7702 */ srl $t6, $t5, 28 +/* 01C28 80B2BE28 000D7702 */ srl $t6, $t5, 28 /* 01C2C 80B2BE2C 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01C30 80B2BE30 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 /* 01C34 80B2BE34 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 01C38 80B2BE38 000E7880 */ sll $t7, $t6, 2 -/* 01C3C 80B2BE3C 012FC021 */ addu $t8, $t1, $t7 +/* 01C38 80B2BE38 000E7880 */ sll $t7, $t6, 2 +/* 01C3C 80B2BE3C 012FC021 */ addu $t8, $t1, $t7 /* 01C40 80B2BE40 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 01C44 80B2BE44 8F190000 */ lw $t9, 0x0000($t8) ## 00000008 /* 01C48 80B2BE48 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 01C4C 80B2BE4C 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01C50 80B2BE50 008A6824 */ and $t5, $a0, $t2 +/* 01C50 80B2BE50 008A6824 */ and $t5, $a0, $t2 /* 01C54 80B2BE54 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01C58 80B2BE58 032D7021 */ addu $t6, $t9, $t5 -/* 01C5C 80B2BE5C 01C77821 */ addu $t7, $t6, $a3 +/* 01C58 80B2BE58 032D7021 */ addu $t6, $t9, $t5 +/* 01C5C 80B2BE5C 01C77821 */ addu $t7, $t6, $a3 /* 01C60 80B2BE60 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01C64 80B2BE64 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01C68 80B2BE68 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01C6C 80B2BE6C 24843EF0 */ addiu $a0, $a0, 0x3EF0 ## $a0 = 06003EF0 -/* 01C70 80B2BE70 00046900 */ sll $t5, $a0, 4 +/* 01C70 80B2BE70 00046900 */ sll $t5, $a0, 4 /* 01C74 80B2BE74 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01C78 80B2BE78 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 01C7C 80B2BE7C 000D7702 */ srl $t6, $t5, 28 +/* 01C7C 80B2BE7C 000D7702 */ srl $t6, $t5, 28 /* 01C80 80B2BE80 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01C84 80B2BE84 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 -/* 01C88 80B2BE88 000E7880 */ sll $t7, $t6, 2 -/* 01C8C 80B2BE8C 012FC021 */ addu $t8, $t1, $t7 +/* 01C88 80B2BE88 000E7880 */ sll $t7, $t6, 2 +/* 01C8C 80B2BE8C 012FC021 */ addu $t8, $t1, $t7 /* 01C90 80B2BE90 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 01C94 80B2BE94 8F190000 */ lw $t9, 0x0000($t8) ## 00000008 -/* 01C98 80B2BE98 008A6824 */ and $t5, $a0, $t2 -/* 01C9C 80B2BE9C 032D7021 */ addu $t6, $t9, $t5 -/* 01CA0 80B2BEA0 01C77821 */ addu $t7, $t6, $a3 +/* 01C98 80B2BE98 008A6824 */ and $t5, $a0, $t2 +/* 01C9C 80B2BE9C 032D7021 */ addu $t6, $t9, $t5 +/* 01CA0 80B2BEA0 01C77821 */ addu $t7, $t6, $a3 /* 01CA4 80B2BEA4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01CA8 80B2BEA8 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 01CA8 80B2BEA8 8FAC00A4 */ lw $t4, 0x00A4($sp) .L80B2BEAC: /* 01CAC 80B2BEAC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 /* 01CB0 80B2BEB0 8F18F9C0 */ lw $t8, -0x0640($t8) ## 8015F9C0 /* 01CB4 80B2BEB4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01CB8 80B2BEB8 57010014 */ bnel $t8, $at, .L80B2BF0C +/* 01CB8 80B2BEB8 57010014 */ bnel $t8, $at, .L80B2BF0C /* 01CBC 80B2BEBC 95821D74 */ lhu $v0, 0x1D74($t4) ## 00001D74 /* 01CC0 80B2BEC0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01CC4 80B2BEC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01CC8 80B2BEC8 248452F0 */ addiu $a0, $a0, 0x52F0 ## $a0 = 060052F0 -/* 01CCC 80B2BECC 00047100 */ sll $t6, $a0, 4 +/* 01CCC 80B2BECC 00047100 */ sll $t6, $a0, 4 /* 01CD0 80B2BED0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01CD4 80B2BED4 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 01CD8 80B2BED8 000E7F02 */ srl $t7, $t6, 28 +/* 01CD8 80B2BED8 000E7F02 */ srl $t7, $t6, 28 /* 01CDC 80B2BEDC 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01CE0 80B2BEE0 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 01CE4 80B2BEE4 000FC080 */ sll $t8, $t7, 2 -/* 01CE8 80B2BEE8 0138C821 */ addu $t9, $t1, $t8 +/* 01CE4 80B2BEE4 000FC080 */ sll $t8, $t7, 2 +/* 01CE8 80B2BEE8 0138C821 */ addu $t9, $t1, $t8 /* 01CEC 80B2BEEC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01CF0 80B2BEF0 8F2D0000 */ lw $t5, 0x0000($t9) ## 00000008 -/* 01CF4 80B2BEF4 008A7024 */ and $t6, $a0, $t2 -/* 01CF8 80B2BEF8 01AE7821 */ addu $t7, $t5, $t6 -/* 01CFC 80B2BEFC 01E7C021 */ addu $t8, $t7, $a3 -/* 01D00 80B2BF00 1000006B */ beq $zero, $zero, .L80B2C0B0 +/* 01CF4 80B2BEF4 008A7024 */ and $t6, $a0, $t2 +/* 01CF8 80B2BEF8 01AE7821 */ addu $t7, $t5, $t6 +/* 01CFC 80B2BEFC 01E7C021 */ addu $t8, $t7, $a3 +/* 01D00 80B2BF00 1000006B */ beq $zero, $zero, .L80B2C0B0 /* 01D04 80B2BF04 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 01D08 80B2BF08 95821D74 */ lhu $v0, 0x1D74($t4) ## 00001D74 .L80B2BF0C: /* 01D0C 80B2BF0C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01D10 80B2BF10 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 01D14 80B2BF14 284102F6 */ slti $at, $v0, 0x02F6 -/* 01D18 80B2BF18 10200010 */ beq $at, $zero, .L80B2BF5C +/* 01D14 80B2BF14 284102F6 */ slti $at, $v0, 0x02F6 +/* 01D18 80B2BF18 10200010 */ beq $at, $zero, .L80B2BF5C /* 01D1C 80B2BF1C 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 01D20 80B2BF20 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01D24 80B2BF24 24634EF0 */ addiu $v1, $v1, 0x4EF0 ## $v1 = 06004EF0 -/* 01D28 80B2BF28 00037100 */ sll $t6, $v1, 4 +/* 01D28 80B2BF28 00037100 */ sll $t6, $v1, 4 /* 01D2C 80B2BF2C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01D30 80B2BF30 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 01D34 80B2BF34 000E7F02 */ srl $t7, $t6, 28 -/* 01D38 80B2BF38 000FC080 */ sll $t8, $t7, 2 -/* 01D3C 80B2BF3C 0138C821 */ addu $t9, $t1, $t8 +/* 01D34 80B2BF34 000E7F02 */ srl $t7, $t6, 28 +/* 01D38 80B2BF38 000FC080 */ sll $t8, $t7, 2 +/* 01D3C 80B2BF3C 0138C821 */ addu $t9, $t1, $t8 /* 01D40 80B2BF40 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01D44 80B2BF44 8F2D0000 */ lw $t5, 0x0000($t9) ## 00000008 -/* 01D48 80B2BF48 006A7024 */ and $t6, $v1, $t2 -/* 01D4C 80B2BF4C 01AE7821 */ addu $t7, $t5, $t6 -/* 01D50 80B2BF50 01E7C021 */ addu $t8, $t7, $a3 -/* 01D54 80B2BF54 10000056 */ beq $zero, $zero, .L80B2C0B0 +/* 01D48 80B2BF48 006A7024 */ and $t6, $v1, $t2 +/* 01D4C 80B2BF4C 01AE7821 */ addu $t7, $t5, $t6 +/* 01D50 80B2BF50 01E7C021 */ addu $t8, $t7, $a3 +/* 01D54 80B2BF54 10000056 */ beq $zero, $zero, .L80B2C0B0 /* 01D58 80B2BF58 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 .L80B2BF5C: -/* 01D5C 80B2BF5C 28410350 */ slti $at, $v0, 0x0350 -/* 01D60 80B2BF60 10200013 */ beq $at, $zero, .L80B2BFB0 +/* 01D5C 80B2BF5C 28410350 */ slti $at, $v0, 0x0350 +/* 01D60 80B2BF60 10200013 */ beq $at, $zero, .L80B2BFB0 /* 01D64 80B2BF64 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01D68 80B2BF68 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01D6C 80B2BF6C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01D70 80B2BF70 248452F0 */ addiu $a0, $a0, 0x52F0 ## $a0 = 060052F0 -/* 01D74 80B2BF74 00047100 */ sll $t6, $a0, 4 +/* 01D74 80B2BF74 00047100 */ sll $t6, $a0, 4 /* 01D78 80B2BF78 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01D7C 80B2BF7C AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 01D80 80B2BF80 000E7F02 */ srl $t7, $t6, 28 +/* 01D80 80B2BF80 000E7F02 */ srl $t7, $t6, 28 /* 01D84 80B2BF84 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01D88 80B2BF88 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 01D8C 80B2BF8C 000FC080 */ sll $t8, $t7, 2 -/* 01D90 80B2BF90 0138C821 */ addu $t9, $t1, $t8 +/* 01D8C 80B2BF8C 000FC080 */ sll $t8, $t7, 2 +/* 01D90 80B2BF90 0138C821 */ addu $t9, $t1, $t8 /* 01D94 80B2BF94 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01D98 80B2BF98 8F2D0000 */ lw $t5, 0x0000($t9) ## 00000008 -/* 01D9C 80B2BF9C 008A7024 */ and $t6, $a0, $t2 -/* 01DA0 80B2BFA0 01AE7821 */ addu $t7, $t5, $t6 -/* 01DA4 80B2BFA4 01E7C021 */ addu $t8, $t7, $a3 -/* 01DA8 80B2BFA8 10000041 */ beq $zero, $zero, .L80B2C0B0 +/* 01D9C 80B2BF9C 008A7024 */ and $t6, $a0, $t2 +/* 01DA0 80B2BFA0 01AE7821 */ addu $t7, $t5, $t6 +/* 01DA4 80B2BFA4 01E7C021 */ addu $t8, $t7, $a3 +/* 01DA8 80B2BFA8 10000041 */ beq $zero, $zero, .L80B2C0B0 /* 01DAC 80B2BFAC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 .L80B2BFB0: /* 01DB0 80B2BFB0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01DB4 80B2BFB4 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 01DB8 80B2BFB8 24634EF0 */ addiu $v1, $v1, 0x4EF0 ## $v1 = 06004EF0 -/* 01DBC 80B2BFBC 00037100 */ sll $t6, $v1, 4 +/* 01DBC 80B2BFBC 00037100 */ sll $t6, $v1, 4 /* 01DC0 80B2BFC0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01DC4 80B2BFC4 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 01DC8 80B2BFC8 000E7F02 */ srl $t7, $t6, 28 -/* 01DCC 80B2BFCC 000FC080 */ sll $t8, $t7, 2 +/* 01DC8 80B2BFC8 000E7F02 */ srl $t7, $t6, 28 +/* 01DCC 80B2BFCC 000FC080 */ sll $t8, $t7, 2 /* 01DD0 80B2BFD0 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 01DD4 80B2BFD4 0138C821 */ addu $t9, $t1, $t8 +/* 01DD4 80B2BFD4 0138C821 */ addu $t9, $t1, $t8 /* 01DD8 80B2BFD8 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01DDC 80B2BFDC 8F2D0000 */ lw $t5, 0x0000($t9) ## 00000008 -/* 01DE0 80B2BFE0 006A7024 */ and $t6, $v1, $t2 -/* 01DE4 80B2BFE4 01AE7821 */ addu $t7, $t5, $t6 -/* 01DE8 80B2BFE8 01E7C021 */ addu $t8, $t7, $a3 -/* 01DEC 80B2BFEC 10000030 */ beq $zero, $zero, .L80B2C0B0 +/* 01DE0 80B2BFE0 006A7024 */ and $t6, $v1, $t2 +/* 01DE4 80B2BFE4 01AE7821 */ addu $t7, $t5, $t6 +/* 01DE8 80B2BFE8 01E7C021 */ addu $t8, $t7, $a3 +/* 01DEC 80B2BFEC 10000030 */ beq $zero, $zero, .L80B2C0B0 /* 01DF0 80B2BFF0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 .L80B2BFF4: /* 01DF4 80B2BFF4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01DF8 80B2BFF8 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 01DFC 80B2BFFC 246332F0 */ addiu $v1, $v1, 0x32F0 ## $v1 = 060032F0 -/* 01E00 80B2C000 00037100 */ sll $t6, $v1, 4 -/* 01E04 80B2C004 000E7F02 */ srl $t7, $t6, 28 +/* 01E00 80B2C000 00037100 */ sll $t6, $v1, 4 +/* 01E04 80B2C004 000E7F02 */ srl $t7, $t6, 28 /* 01E08 80B2C008 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01E0C 80B2C00C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01E10 80B2C010 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 8016DF50 /* 01E14 80B2C014 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 /* 01E18 80B2C018 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 01E1C 80B2C01C 000FC080 */ sll $t8, $t7, 2 -/* 01E20 80B2C020 01382821 */ addu $a1, $t1, $t8 +/* 01E1C 80B2C01C 000FC080 */ sll $t8, $t7, 2 +/* 01E20 80B2C020 01382821 */ addu $a1, $t1, $t8 /* 01E24 80B2C024 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01E28 80B2C028 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 /* 01E2C 80B2C02C 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 01E30 80B2C030 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01E34 80B2C034 006A3024 */ and $a2, $v1, $t2 -/* 01E38 80B2C038 03266821 */ addu $t5, $t9, $a2 -/* 01E3C 80B2C03C 01A77021 */ addu $t6, $t5, $a3 +/* 01E34 80B2C034 006A3024 */ and $a2, $v1, $t2 +/* 01E38 80B2C038 03266821 */ addu $t5, $t9, $a2 +/* 01E3C 80B2C03C 01A77021 */ addu $t6, $t5, $a3 /* 01E40 80B2C040 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01E44 80B2C044 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01E48 80B2C048 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -406,23 +406,23 @@ glabel func_80B2BA38 /* 01E5C 80B2C05C 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 /* 01E60 80B2C060 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 01E64 80B2C064 24634EF0 */ addiu $v1, $v1, 0x4EF0 ## $v1 = 06004EF0 -/* 01E68 80B2C068 03266821 */ addu $t5, $t9, $a2 -/* 01E6C 80B2C06C 01A77021 */ addu $t6, $t5, $a3 +/* 01E68 80B2C068 03266821 */ addu $t5, $t9, $a2 +/* 01E6C 80B2C06C 01A77021 */ addu $t6, $t5, $a3 /* 01E70 80B2C070 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01E74 80B2C074 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01E78 80B2C078 0003C900 */ sll $t9, $v1, 4 -/* 01E7C 80B2C07C 00196F02 */ srl $t5, $t9, 28 +/* 01E78 80B2C078 0003C900 */ sll $t9, $v1, 4 +/* 01E7C 80B2C07C 00196F02 */ srl $t5, $t9, 28 /* 01E80 80B2C080 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01E84 80B2C084 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 01E88 80B2C088 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01E8C 80B2C08C 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 01E90 80B2C090 000D7080 */ sll $t6, $t5, 2 -/* 01E94 80B2C094 012E7821 */ addu $t7, $t1, $t6 +/* 01E90 80B2C090 000D7080 */ sll $t6, $t5, 2 +/* 01E94 80B2C094 012E7821 */ addu $t7, $t1, $t6 /* 01E98 80B2C098 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01E9C 80B2C09C 8DF80000 */ lw $t8, 0x0000($t7) ## 00000008 -/* 01EA0 80B2C0A0 006AC824 */ and $t9, $v1, $t2 -/* 01EA4 80B2C0A4 03196821 */ addu $t5, $t8, $t9 -/* 01EA8 80B2C0A8 01A77021 */ addu $t6, $t5, $a3 +/* 01EA0 80B2C0A0 006AC824 */ and $t9, $v1, $t2 +/* 01EA4 80B2C0A4 03196821 */ addu $t5, $t8, $t9 +/* 01EA8 80B2C0A8 01A77021 */ addu $t6, $t5, $a3 /* 01EAC 80B2C0AC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 .L80B2C0B0: /* 01EB0 80B2C0B0 8D65019C */ lw $a1, 0x019C($t3) ## 0000019C @@ -432,21 +432,21 @@ glabel func_80B2BA38 /* 01EC0 80B2C0C0 3C1880B3 */ lui $t8, %hi(func_80B2B9A4) ## $t8 = 80B30000 /* 01EC4 80B2C0C4 2718B9A4 */ addiu $t8, $t8, %lo(func_80B2B9A4) ## $t8 = 80B2B9A4 /* 01EC8 80B2C0C8 25EFB928 */ addiu $t7, $t7, %lo(func_80B2B928) ## $t7 = 80B2B928 -/* 01ECC 80B2C0CC AFAF0010 */ sw $t7, 0x0010($sp) -/* 01ED0 80B2C0D0 AFB80014 */ sw $t8, 0x0014($sp) -/* 01ED4 80B2C0D4 AFAB0018 */ sw $t3, 0x0018($sp) -/* 01ED8 80B2C0D8 0C0286B2 */ jal func_800A1AC8 -/* 01EDC 80B2C0DC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01EE0 80B2C0E0 8FB900A4 */ lw $t9, 0x00A4($sp) +/* 01ECC 80B2C0CC AFAF0010 */ sw $t7, 0x0010($sp) +/* 01ED0 80B2C0D0 AFB80014 */ sw $t8, 0x0014($sp) +/* 01ED4 80B2C0D4 AFAB0018 */ sw $t3, 0x0018($sp) +/* 01ED8 80B2C0D8 0C0286B2 */ jal SkelAnime_DrawSV +/* 01EDC 80B2C0DC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01EE0 80B2C0E0 8FB900A4 */ lw $t9, 0x00A4($sp) /* 01EE4 80B2C0E4 3C0680B3 */ lui $a2, %hi(D_80B2D0E4) ## $a2 = 80B30000 /* 01EE8 80B2C0E8 24C6D0E4 */ addiu $a2, $a2, %lo(D_80B2D0E4) ## $a2 = 80B2D0E4 /* 01EEC 80B2C0EC 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFEC /* 01EF0 80B2C0F0 2407069A */ addiu $a3, $zero, 0x069A ## $a3 = 0000069A -/* 01EF4 80B2C0F4 0C031AD5 */ jal func_800C6B54 +/* 01EF4 80B2C0F4 0C031AD5 */ jal func_800C6B54 /* 01EF8 80B2C0F8 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -/* 01EFC 80B2C0FC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01EFC 80B2C0FC 8FBF0024 */ lw $ra, 0x0024($sp) /* 01F00 80B2C100 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 -/* 01F04 80B2C104 03E00008 */ jr $ra +/* 01F04 80B2C104 03E00008 */ jr $ra /* 01F08 80B2C108 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s index b34ef1858b..02ec5fa5ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s @@ -1,38 +1,38 @@ glabel func_80B2C130 /* 01F30 80B2C130 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01F34 80B2C134 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01F38 80B2C138 AFA40058 */ sw $a0, 0x0058($sp) -/* 01F3C 80B2C13C AFA5005C */ sw $a1, 0x005C($sp) +/* 01F34 80B2C134 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01F38 80B2C138 AFA40058 */ sw $a0, 0x0058($sp) +/* 01F3C 80B2C13C AFA5005C */ sw $a1, 0x005C($sp) /* 01F40 80B2C140 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01F44 80B2C144 3C0680B3 */ lui $a2, %hi(D_80B2D0F8) ## $a2 = 80B30000 /* 01F48 80B2C148 24C6D0F8 */ addiu $a2, $a2, %lo(D_80B2D0F8) ## $a2 = 80B2D0F8 /* 01F4C 80B2C14C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFEC /* 01F50 80B2C150 240706B5 */ addiu $a3, $zero, 0x06B5 ## $a3 = 000006B5 -/* 01F54 80B2C154 0C031AB1 */ jal func_800C6AC4 -/* 01F58 80B2C158 AFA50054 */ sw $a1, 0x0054($sp) -/* 01F5C 80B2C15C 8FA30054 */ lw $v1, 0x0054($sp) +/* 01F54 80B2C154 0C031AB1 */ jal func_800C6AC4 +/* 01F58 80B2C158 AFA50054 */ sw $a1, 0x0054($sp) +/* 01F5C 80B2C15C 8FA30054 */ lw $v1, 0x0054($sp) /* 01F60 80B2C160 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01F64 80B2C164 24A57210 */ addiu $a1, $a1, 0x7210 ## $a1 = 06007210 /* 01F68 80B2C168 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 -/* 01F6C 80B2C16C 0005C900 */ sll $t9, $a1, 4 -/* 01F70 80B2C170 8FA80058 */ lw $t0, 0x0058($sp) -/* 01F74 80B2C174 00195702 */ srl $t2, $t9, 28 +/* 01F6C 80B2C16C 0005C900 */ sll $t9, $a1, 4 +/* 01F70 80B2C170 8FA80058 */ lw $t0, 0x0058($sp) +/* 01F74 80B2C174 00195702 */ srl $t2, $t9, 28 /* 01F78 80B2C178 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01F7C 80B2C17C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 01F80 80B2C180 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01F84 80B2C184 258C6FA8 */ addiu $t4, $t4, 0x6FA8 ## $t4 = 80166FA8 /* 01F88 80B2C188 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 01F8C 80B2C18C 000A5880 */ sll $t3, $t2, 2 +/* 01F8C 80B2C18C 000A5880 */ sll $t3, $t2, 2 /* 01F90 80B2C190 AC6F02C0 */ sw $t7, 0x02C0($v1) ## 000002C0 -/* 01F94 80B2C194 016C3021 */ addu $a2, $t3, $t4 +/* 01F94 80B2C194 016C3021 */ addu $a2, $t3, $t4 /* 01F98 80B2C198 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01F9C 80B2C19C 8CCD0000 */ lw $t5, 0x0000($a2) ## 00000000 /* 01FA0 80B2C1A0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01FA4 80B2C1A4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01FA8 80B2C1A8 00A13824 */ and $a3, $a1, $at +/* 01FA8 80B2C1A8 00A13824 */ and $a3, $a1, $at /* 01FAC 80B2C1AC 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 -/* 01FB0 80B2C1B0 01A77021 */ addu $t6, $t5, $a3 -/* 01FB4 80B2C1B4 01C97821 */ addu $t7, $t6, $t1 +/* 01FB0 80B2C1B0 01A77021 */ addu $t6, $t5, $a3 +/* 01FB4 80B2C1B4 01C97821 */ addu $t7, $t6, $t1 /* 01FB8 80B2C1B8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01FBC 80B2C1BC 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 /* 01FC0 80B2C1C0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -43,8 +43,8 @@ glabel func_80B2C130 /* 01FD4 80B2C1D4 8CCA0000 */ lw $t2, 0x0000($a2) ## 00000000 /* 01FD8 80B2C1D8 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF /* 01FDC 80B2C1DC 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 01FE0 80B2C1E0 01475821 */ addu $t3, $t2, $a3 -/* 01FE4 80B2C1E4 01696021 */ addu $t4, $t3, $t1 +/* 01FE0 80B2C1E0 01475821 */ addu $t3, $t2, $a3 +/* 01FE4 80B2C1E4 01696021 */ addu $t4, $t3, $t1 /* 01FE8 80B2C1E8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 01FEC 80B2C1EC 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 /* 01FF0 80B2C1F0 3C0A8011 */ lui $t2, 0x8011 ## $t2 = 80110000 @@ -65,21 +65,21 @@ glabel func_80B2C130 /* 0202C 80B2C22C 8D0601B8 */ lw $a2, 0x01B8($t0) ## 000001B8 /* 02030 80B2C230 8D05019C */ lw $a1, 0x019C($t0) ## 0000019C /* 02034 80B2C234 256BC10C */ addiu $t3, $t3, %lo(func_80B2C10C) ## $t3 = 80B2C10C -/* 02038 80B2C238 AFAB0010 */ sw $t3, 0x0010($sp) -/* 0203C 80B2C23C AFA00014 */ sw $zero, 0x0014($sp) -/* 02040 80B2C240 8FA4005C */ lw $a0, 0x005C($sp) -/* 02044 80B2C244 0C0286B2 */ jal func_800A1AC8 -/* 02048 80B2C248 AFA80018 */ sw $t0, 0x0018($sp) -/* 0204C 80B2C24C 8FAC005C */ lw $t4, 0x005C($sp) +/* 02038 80B2C238 AFAB0010 */ sw $t3, 0x0010($sp) +/* 0203C 80B2C23C AFA00014 */ sw $zero, 0x0014($sp) +/* 02040 80B2C240 8FA4005C */ lw $a0, 0x005C($sp) +/* 02044 80B2C244 0C0286B2 */ jal SkelAnime_DrawSV +/* 02048 80B2C248 AFA80018 */ sw $t0, 0x0018($sp) +/* 0204C 80B2C24C 8FAC005C */ lw $t4, 0x005C($sp) /* 02050 80B2C250 3C0680B3 */ lui $a2, %hi(D_80B2D10C) ## $a2 = 80B30000 /* 02054 80B2C254 24C6D10C */ addiu $a2, $a2, %lo(D_80B2D10C) ## $a2 = 80B2D10C /* 02058 80B2C258 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFEC /* 0205C 80B2C25C 240706CC */ addiu $a3, $zero, 0x06CC ## $a3 = 000006CC -/* 02060 80B2C260 0C031AD5 */ jal func_800C6B54 +/* 02060 80B2C260 0C031AD5 */ jal func_800C6B54 /* 02064 80B2C264 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 02068 80B2C268 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02068 80B2C268 8FBF0024 */ lw $ra, 0x0024($sp) /* 0206C 80B2C26C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 02070 80B2C270 03E00008 */ jr $ra +/* 02070 80B2C270 03E00008 */ jr $ra /* 02074 80B2C274 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s index 664f47ee4b..be49e7f95c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s @@ -1,24 +1,24 @@ glabel EnWeiyer_Draw /* 01670 80B33900 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 01674 80B33904 AFB20030 */ sw $s2, 0x0030($sp) +/* 01674 80B33904 AFB20030 */ sw $s2, 0x0030($sp) /* 01678 80B33908 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 0167C 80B3390C AFBF0034 */ sw $ra, 0x0034($sp) -/* 01680 80B33910 AFB1002C */ sw $s1, 0x002C($sp) -/* 01684 80B33914 AFB00028 */ sw $s0, 0x0028($sp) +/* 0167C 80B3390C AFBF0034 */ sw $ra, 0x0034($sp) +/* 01680 80B33910 AFB1002C */ sw $s1, 0x002C($sp) +/* 01684 80B33914 AFB00028 */ sw $s0, 0x0028($sp) /* 01688 80B33918 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0168C 80B3391C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 01690 80B33920 3C0680B3 */ lui $a2, %hi(D_80B33AF0) ## $a2 = 80B30000 /* 01694 80B33924 24C63AF0 */ addiu $a2, $a2, %lo(D_80B33AF0) ## $a2 = 80B33AF0 /* 01698 80B33928 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 0169C 80B3392C 240704A9 */ addiu $a3, $zero, 0x04A9 ## $a3 = 000004A9 -/* 016A0 80B33930 0C031AB1 */ jal func_800C6AC4 +/* 016A0 80B33930 0C031AB1 */ jal func_800C6AC4 /* 016A4 80B33934 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 016A8 80B33938 8E2F0190 */ lw $t7, 0x0190($s1) ## 00000190 /* 016AC 80B3393C 3C0E80B3 */ lui $t6, %hi(func_80B33338) ## $t6 = 80B30000 /* 016B0 80B33940 25CE3338 */ addiu $t6, $t6, %lo(func_80B33338) ## $t6 = 80B33338 -/* 016B4 80B33944 11CF001F */ beq $t6, $t7, .L80B339C4 +/* 016B4 80B33944 11CF001F */ beq $t6, $t7, .L80B339C4 /* 016B8 80B33948 00000000 */ nop -/* 016BC 80B3394C 0C024F46 */ jal func_80093D18 +/* 016BC 80B3394C 0C024F46 */ jal func_80093D18 /* 016C0 80B33950 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 016C4 80B33954 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 016C8 80B33958 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -38,18 +38,18 @@ glabel EnWeiyer_Draw /* 01700 80B33990 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 01704 80B33994 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 01708 80B33998 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 0170C 80B3399C AFB10014 */ sw $s1, 0x0014($sp) -/* 01710 80B339A0 AFA00010 */ sw $zero, 0x0010($sp) +/* 0170C 80B3399C AFB10014 */ sw $s1, 0x0014($sp) +/* 01710 80B339A0 AFA00010 */ sw $zero, 0x0010($sp) /* 01714 80B339A4 8E0C02C0 */ lw $t4, 0x02C0($s0) ## 000002C0 /* 01718 80B339A8 3C0780B3 */ lui $a3, %hi(func_80B338D4) ## $a3 = 80B30000 /* 0171C 80B339AC 24E738D4 */ addiu $a3, $a3, %lo(func_80B338D4) ## $a3 = 80B338D4 /* 01720 80B339B0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01724 80B339B4 0C0288A2 */ jal func_800A2288 -/* 01728 80B339B8 AFAC0018 */ sw $t4, 0x0018($sp) -/* 0172C 80B339BC 10000020 */ beq $zero, $zero, .L80B33A40 +/* 01724 80B339B4 0C0288A2 */ jal SkelAnime_Draw2 +/* 01728 80B339B8 AFAC0018 */ sw $t4, 0x0018($sp) +/* 0172C 80B339BC 10000020 */ beq $zero, $zero, .L80B33A40 /* 01730 80B339C0 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L80B339C4: -/* 01734 80B339C4 0C024F61 */ jal func_80093D84 +/* 01734 80B339C4 0C024F61 */ jal func_80093D84 /* 01738 80B339C8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 0173C 80B339CC 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 01740 80B339D0 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -73,24 +73,24 @@ glabel EnWeiyer_Draw /* 01788 80B33A18 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 0178C 80B33A1C 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 01790 80B33A20 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 01794 80B33A24 AFB10014 */ sw $s1, 0x0014($sp) -/* 01798 80B33A28 AFA00010 */ sw $zero, 0x0010($sp) +/* 01794 80B33A24 AFB10014 */ sw $s1, 0x0014($sp) +/* 01798 80B33A28 AFA00010 */ sw $zero, 0x0010($sp) /* 0179C 80B33A2C 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 /* 017A0 80B33A30 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 017A4 80B33A34 0C0288A2 */ jal func_800A2288 -/* 017A8 80B33A38 AFAB0018 */ sw $t3, 0x0018($sp) +/* 017A4 80B33A34 0C0288A2 */ jal SkelAnime_Draw2 +/* 017A8 80B33A38 AFAB0018 */ sw $t3, 0x0018($sp) /* 017AC 80B33A3C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80B33A40: /* 017B0 80B33A40 3C0680B3 */ lui $a2, %hi(D_80B33B04) ## $a2 = 80B30000 /* 017B4 80B33A44 24C63B04 */ addiu $a2, $a2, %lo(D_80B33B04) ## $a2 = 80B33B04 /* 017B8 80B33A48 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 017BC 80B33A4C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 017C0 80B33A50 0C031AD5 */ jal func_800C6B54 +/* 017C0 80B33A50 0C031AD5 */ jal func_800C6B54 /* 017C4 80B33A54 240704D8 */ addiu $a3, $zero, 0x04D8 ## $a3 = 000004D8 -/* 017C8 80B33A58 8FBF0034 */ lw $ra, 0x0034($sp) -/* 017CC 80B33A5C 8FB00028 */ lw $s0, 0x0028($sp) -/* 017D0 80B33A60 8FB1002C */ lw $s1, 0x002C($sp) -/* 017D4 80B33A64 8FB20030 */ lw $s2, 0x0030($sp) -/* 017D8 80B33A68 03E00008 */ jr $ra +/* 017C8 80B33A58 8FBF0034 */ lw $ra, 0x0034($sp) +/* 017CC 80B33A5C 8FB00028 */ lw $s0, 0x0028($sp) +/* 017D0 80B33A60 8FB1002C */ lw $s1, 0x002C($sp) +/* 017D4 80B33A64 8FB20030 */ lw $s2, 0x0030($sp) +/* 017D8 80B33A68 03E00008 */ jr $ra /* 017DC 80B33A6C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s index 12c83a012b..4e9ba388b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s @@ -1,37 +1,37 @@ glabel func_80B32384 /* 000F4 80B32384 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000F8 80B32388 AFBF0014 */ sw $ra, 0x0014($sp) +/* 000F8 80B32388 AFBF0014 */ sw $ra, 0x0014($sp) /* 000FC 80B3238C 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 /* 00100 80B32390 3C0180B3 */ lui $at, %hi(D_80B33B18) ## $at = 80B30000 /* 00104 80B32394 A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -/* 00108 80B32398 AFA40018 */ sw $a0, 0x0018($sp) +/* 00108 80B32398 AFA40018 */ sw $a0, 0x0018($sp) /* 0010C 80B3239C 0C041184 */ jal cosf - -/* 00110 80B323A0 C42C3B18 */ lwc1 $f12, %lo(D_80B33B18)($at) + +/* 00110 80B323A0 C42C3B18 */ lwc1 $f12, %lo(D_80B33B18)($at) /* 00114 80B323A4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 00118 80B323A8 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 0011C 80B323AC 8FA70018 */ lw $a3, 0x0018($sp) +/* 0011C 80B323AC 8FA70018 */ lw $a3, 0x0018($sp) /* 00120 80B323B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00124 80B323B4 46040182 */ mul.s $f6, $f0, $f4 +/* 00124 80B323B4 46040182 */ mul.s $f6, $f0, $f4 /* 00128 80B323B8 C4E80028 */ lwc1 $f8, 0x0028($a3) ## 00000028 /* 0012C 80B323BC 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 00130 80B323C0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00134 80B323C4 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 00138 80B323C8 46083280 */ add.s $f10, $f6, $f8 -/* 0013C 80B323CC 0C0294D3 */ jal func_800A534C +/* 00138 80B323C8 46083280 */ add.s $f10, $f6, $f8 +/* 0013C 80B323CC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00140 80B323D0 E4EA027C */ swc1 $f10, 0x027C($a3) ## 0000027C -/* 00144 80B323D4 8FA70018 */ lw $a3, 0x0018($sp) +/* 00144 80B323D4 8FA70018 */ lw $a3, 0x0018($sp) /* 00148 80B323D8 3C014020 */ lui $at, 0x4020 ## $at = 40200000 /* 0014C 80B323DC 44811000 */ mtc1 $at, $f2 ## $f2 = 2.50 /* 00150 80B323E0 C4E00068 */ lwc1 $f0, 0x0068($a3) ## 00000068 /* 00154 80B323E4 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E /* 00158 80B323E8 3C0880B3 */ lui $t0, %hi(func_80B328E8) ## $t0 = 80B30000 -/* 0015C 80B323EC 4600103C */ c.lt.s $f2, $f0 +/* 0015C 80B323EC 4600103C */ c.lt.s $f2, $f0 /* 00160 80B323F0 250828E8 */ addiu $t0, $t0, %lo(func_80B328E8) ## $t0 = 80B328E8 /* 00164 80B323F4 A4EF0194 */ sh $t7, 0x0194($a3) ## 00000194 -/* 00168 80B323F8 45020004 */ bc1fl .L80B3240C +/* 00168 80B323F8 45020004 */ bc1fl .L80B3240C /* 0016C 80B323FC E4E00068 */ swc1 $f0, 0x0068($a3) ## 00000068 -/* 00170 80B32400 10000002 */ beq $zero, $zero, .L80B3240C +/* 00170 80B32400 10000002 */ beq $zero, $zero, .L80B3240C /* 00174 80B32404 E4E20068 */ swc1 $f2, 0x0068($a3) ## 00000068 /* 00178 80B32408 E4E00068 */ swc1 $f0, 0x0068($a3) ## 00000068 .L80B3240C: @@ -41,9 +41,9 @@ glabel func_80B32384 /* 00188 80B32418 3319FFFE */ andi $t9, $t8, 0xFFFE ## $t9 = 00000000 /* 0018C 80B3241C A0F90294 */ sb $t9, 0x0294($a3) ## 00000294 /* 00190 80B32420 E4F00280 */ swc1 $f16, 0x0280($a3) ## 00000280 -/* 00194 80B32424 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00194 80B32424 8FBF0014 */ lw $ra, 0x0014($sp) /* 00198 80B32428 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0019C 80B3242C 03E00008 */ jr $ra +/* 0019C 80B3242C 03E00008 */ jr $ra /* 001A0 80B32430 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s index 3fd19ca762..3e0ca38788 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s @@ -1,14 +1,14 @@ glabel func_80B32434 /* 001A4 80B32434 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001A8 80B32438 AFBF0014 */ sw $ra, 0x0014($sp) +/* 001A8 80B32438 AFBF0014 */ sw $ra, 0x0014($sp) /* 001AC 80B3243C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 001B0 80B32440 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001B4 80B32444 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 -/* 001B8 80B32448 AFA70018 */ sw $a3, 0x0018($sp) +/* 001B8 80B32448 AFA70018 */ sw $a3, 0x0018($sp) /* 001BC 80B3244C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001C0 80B32450 0C0294D3 */ jal func_800A534C +/* 001C0 80B32450 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 001C4 80B32454 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 001C8 80B32458 8FA70018 */ lw $a3, 0x0018($sp) +/* 001C8 80B32458 8FA70018 */ lw $a3, 0x0018($sp) /* 001CC 80B3245C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 001D0 80B32460 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 001D4 80B32464 90EE0294 */ lbu $t6, 0x0294($a3) ## 00000294 @@ -19,9 +19,9 @@ glabel func_80B32434 /* 001E8 80B32478 A4E00194 */ sh $zero, 0x0194($a3) ## 00000194 /* 001EC 80B3247C ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 001F0 80B32480 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 001F4 80B32484 8FBF0014 */ lw $ra, 0x0014($sp) +/* 001F4 80B32484 8FBF0014 */ lw $ra, 0x0014($sp) /* 001F8 80B32488 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001FC 80B3248C 03E00008 */ jr $ra +/* 001FC 80B3248C 03E00008 */ jr $ra /* 00200 80B32490 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s index 6efdaaca89..12a6532829 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s @@ -1,21 +1,21 @@ glabel func_80B32724 /* 00494 80B32724 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00498 80B32728 AFB00020 */ sw $s0, 0x0020($sp) +/* 00498 80B32728 AFB00020 */ sw $s0, 0x0020($sp) /* 0049C 80B3272C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004A0 80B32730 AFBF0024 */ sw $ra, 0x0024($sp) +/* 004A0 80B32730 AFBF0024 */ sw $ra, 0x0024($sp) /* 004A4 80B32734 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004A8 80B32738 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 004AC 80B3273C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004B0 80B32740 0C0294D3 */ jal func_800A534C +/* 004B0 80B32740 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 004B4 80B32744 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 004B8 80B32748 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 /* 004BC 80B3274C A60E0194 */ sh $t6, 0x0194($s0) ## 00000194 /* 004C0 80B32750 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 004C4 80B32754 AFAF0010 */ sw $t7, 0x0010($sp) +/* 004C4 80B32754 AFAF0010 */ sw $t7, 0x0010($sp) /* 004C8 80B32758 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004CC 80B3275C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 004D0 80B32760 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 004D4 80B32764 0C00D09B */ jal func_8003426C +/* 004D4 80B32764 0C00D09B */ jal func_8003426C /* 004D8 80B32768 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004DC 80B3276C 92180294 */ lbu $t8, 0x0294($s0) ## 00000294 /* 004E0 80B32770 92080295 */ lbu $t0, 0x0295($s0) ## 00000295 @@ -29,10 +29,10 @@ glabel func_80B32724 /* 00500 80B32790 A2090295 */ sb $t1, 0x0295($s0) ## 00000295 /* 00504 80B32794 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 /* 00508 80B32798 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 0050C 80B3279C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00510 80B327A0 8FB00020 */ lw $s0, 0x0020($sp) +/* 0050C 80B3279C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00510 80B327A0 8FB00020 */ lw $s0, 0x0020($sp) /* 00514 80B327A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00518 80B327A8 03E00008 */ jr $ra +/* 00518 80B327A8 03E00008 */ jr $ra /* 0051C 80B327AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s index a1bf678145..d9d00fdc10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s @@ -1,31 +1,31 @@ glabel EnWf_Draw /* 0398C 80B3763C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 03990 80B37640 AFBF002C */ sw $ra, 0x002C($sp) -/* 03994 80B37644 AFB00028 */ sw $s0, 0x0028($sp) -/* 03998 80B37648 AFA5005C */ sw $a1, 0x005C($sp) +/* 03990 80B37640 AFBF002C */ sw $ra, 0x002C($sp) +/* 03994 80B37644 AFB00028 */ sw $s0, 0x0028($sp) +/* 03998 80B37648 AFA5005C */ sw $a1, 0x005C($sp) /* 0399C 80B3764C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 039A0 80B37650 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 039A4 80B37654 3C0680B3 */ lui $a2, %hi(D_80B37B54) ## $a2 = 80B30000 /* 039A8 80B37658 24C67B54 */ addiu $a2, $a2, %lo(D_80B37B54) ## $a2 = 80B37B54 /* 039AC 80B3765C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 039B0 80B37660 2407086D */ addiu $a3, $zero, 0x086D ## $a3 = 0000086D -/* 039B4 80B37664 0C031AB1 */ jal func_800C6AC4 -/* 039B8 80B37668 AFA50050 */ sw $a1, 0x0050($sp) +/* 039B4 80B37664 0C031AB1 */ jal func_800C6AC4 +/* 039B8 80B37668 AFA50050 */ sw $a1, 0x0050($sp) /* 039BC 80B3766C 8E0F02D4 */ lw $t7, 0x02D4($s0) ## 000002D4 -/* 039C0 80B37670 8FA80050 */ lw $t0, 0x0050($sp) -/* 039C4 80B37674 8FB9005C */ lw $t9, 0x005C($sp) -/* 039C8 80B37678 55E00005 */ bnel $t7, $zero, .L80B37690 +/* 039C0 80B37670 8FA80050 */ lw $t0, 0x0050($sp) +/* 039C4 80B37674 8FB9005C */ lw $t9, 0x005C($sp) +/* 039C8 80B37678 55E00005 */ bnel $t7, $zero, .L80B37690 /* 039CC 80B3767C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 039D0 80B37680 86180300 */ lh $t8, 0x0300($s0) ## 00000300 -/* 039D4 80B37684 5700005F */ bnel $t8, $zero, .L80B37804 -/* 039D8 80B37688 8FAF005C */ lw $t7, 0x005C($sp) +/* 039D4 80B37684 5700005F */ bnel $t8, $zero, .L80B37804 +/* 039D8 80B37688 8FAF005C */ lw $t7, 0x005C($sp) /* 039DC 80B3768C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 .L80B37690: -/* 039E0 80B37690 0C024F46 */ jal func_80093D18 -/* 039E4 80B37694 AFA80050 */ sw $t0, 0x0050($sp) +/* 039E0 80B37690 0C024F46 */ jal func_80093D18 +/* 039E4 80B37694 AFA80050 */ sw $t0, 0x0050($sp) /* 039E8 80B37698 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 039EC 80B3769C 8FA80050 */ lw $t0, 0x0050($sp) -/* 039F0 80B376A0 5520001B */ bnel $t1, $zero, .L80B37710 +/* 039EC 80B3769C 8FA80050 */ lw $t0, 0x0050($sp) +/* 039F0 80B376A0 5520001B */ bnel $t1, $zero, .L80B37710 /* 039F4 80B376A4 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 039F8 80B376A8 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 039FC 80B376AC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -36,21 +36,21 @@ glabel EnWf_Draw /* 03A10 80B376C0 920C0302 */ lbu $t4, 0x0302($s0) ## 00000302 /* 03A14 80B376C4 3C0480B3 */ lui $a0, %hi(D_80B37AF4) ## $a0 = 80B30000 /* 03A18 80B376C8 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 03A1C 80B376CC 000C6880 */ sll $t5, $t4, 2 -/* 03A20 80B376D0 008D2021 */ addu $a0, $a0, $t5 -/* 03A24 80B376D4 8C847AF4 */ lw $a0, %lo(D_80B37AF4)($a0) +/* 03A1C 80B376CC 000C6880 */ sll $t5, $t4, 2 +/* 03A20 80B376D0 008D2021 */ addu $a0, $a0, $t5 +/* 03A24 80B376D4 8C847AF4 */ lw $a0, %lo(D_80B37AF4)($a0) /* 03A28 80B376D8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 03A2C 80B376DC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 03A30 80B376E0 00047900 */ sll $t7, $a0, 4 -/* 03A34 80B376E4 000FC702 */ srl $t8, $t7, 28 -/* 03A38 80B376E8 0018C880 */ sll $t9, $t8, 2 -/* 03A3C 80B376EC 01394821 */ addu $t1, $t1, $t9 +/* 03A30 80B376E0 00047900 */ sll $t7, $a0, 4 +/* 03A34 80B376E4 000FC702 */ srl $t8, $t7, 28 +/* 03A38 80B376E8 0018C880 */ sll $t9, $t8, 2 +/* 03A3C 80B376EC 01394821 */ addu $t1, $t1, $t9 /* 03A40 80B376F0 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 -/* 03A44 80B376F4 00817024 */ and $t6, $a0, $at +/* 03A44 80B376F4 00817024 */ and $t6, $a0, $at /* 03A48 80B376F8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03A4C 80B376FC 01C95021 */ addu $t2, $t6, $t1 -/* 03A50 80B37700 01415821 */ addu $t3, $t2, $at -/* 03A54 80B37704 10000019 */ beq $zero, $zero, .L80B3776C +/* 03A4C 80B376FC 01C95021 */ addu $t2, $t6, $t1 +/* 03A50 80B37700 01415821 */ addu $t3, $t2, $at +/* 03A54 80B37704 10000019 */ beq $zero, $zero, .L80B3776C /* 03A58 80B37708 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 /* 03A5C 80B3770C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 .L80B37710: @@ -62,20 +62,20 @@ glabel EnWf_Draw /* 03A74 80B37724 920F0302 */ lbu $t7, 0x0302($s0) ## 00000302 /* 03A78 80B37728 3C0480B3 */ lui $a0, %hi(D_80B37B04) ## $a0 = 80B30000 /* 03A7C 80B3772C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 03A80 80B37730 000FC080 */ sll $t8, $t7, 2 -/* 03A84 80B37734 00982021 */ addu $a0, $a0, $t8 -/* 03A88 80B37738 8C847B04 */ lw $a0, %lo(D_80B37B04)($a0) +/* 03A80 80B37730 000FC080 */ sll $t8, $t7, 2 +/* 03A84 80B37734 00982021 */ addu $a0, $a0, $t8 +/* 03A88 80B37738 8C847B04 */ lw $a0, %lo(D_80B37B04)($a0) /* 03A8C 80B3773C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 03A90 80B37740 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 03A94 80B37744 00047100 */ sll $t6, $a0, 4 -/* 03A98 80B37748 000E4F02 */ srl $t1, $t6, 28 -/* 03A9C 80B3774C 00095080 */ sll $t2, $t1, 2 -/* 03AA0 80B37750 016A5821 */ addu $t3, $t3, $t2 +/* 03A94 80B37744 00047100 */ sll $t6, $a0, 4 +/* 03A98 80B37748 000E4F02 */ srl $t1, $t6, 28 +/* 03A9C 80B3774C 00095080 */ sll $t2, $t1, 2 +/* 03AA0 80B37750 016A5821 */ addu $t3, $t3, $t2 /* 03AA4 80B37754 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 -/* 03AA8 80B37758 0081C824 */ and $t9, $a0, $at +/* 03AA8 80B37758 0081C824 */ and $t9, $a0, $at /* 03AAC 80B3775C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03AB0 80B37760 032B6021 */ addu $t4, $t9, $t3 -/* 03AB4 80B37764 01816821 */ addu $t5, $t4, $at +/* 03AB0 80B37760 032B6021 */ addu $t4, $t9, $t3 +/* 03AB4 80B37764 01816821 */ addu $t5, $t4, $at /* 03AB8 80B37768 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 .L80B3776C: /* 03ABC 80B3776C 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C @@ -85,14 +85,14 @@ glabel EnWf_Draw /* 03ACC 80B3777C 3C1880B3 */ lui $t8, %hi(func_80B37494) ## $t8 = 80B30000 /* 03AD0 80B37780 27187494 */ addiu $t8, $t8, %lo(func_80B37494) ## $t8 = 80B37494 /* 03AD4 80B37784 25EF7454 */ addiu $t7, $t7, %lo(func_80B37454) ## $t7 = 80B37454 -/* 03AD8 80B37788 AFAF0010 */ sw $t7, 0x0010($sp) -/* 03ADC 80B3778C AFB80014 */ sw $t8, 0x0014($sp) -/* 03AE0 80B37790 AFB00018 */ sw $s0, 0x0018($sp) -/* 03AE4 80B37794 0C0286B2 */ jal func_800A1AC8 -/* 03AE8 80B37798 8FA4005C */ lw $a0, 0x005C($sp) +/* 03AD8 80B37788 AFAF0010 */ sw $t7, 0x0010($sp) +/* 03ADC 80B3778C AFB80014 */ sw $t8, 0x0014($sp) +/* 03AE0 80B37790 AFB00018 */ sw $s0, 0x0018($sp) +/* 03AE4 80B37794 0C0286B2 */ jal SkelAnime_DrawSV +/* 03AE8 80B37798 8FA4005C */ lw $a0, 0x005C($sp) /* 03AEC 80B3779C 860E02E4 */ lh $t6, 0x02E4($s0) ## 000002E4 -/* 03AF0 80B377A0 51C00018 */ beql $t6, $zero, .L80B37804 -/* 03AF4 80B377A4 8FAF005C */ lw $t7, 0x005C($sp) +/* 03AF0 80B377A0 51C00018 */ beql $t6, $zero, .L80B37804 +/* 03AF4 80B377A4 8FAF005C */ lw $t7, 0x005C($sp) /* 03AF8 80B377A8 861902E4 */ lh $t9, 0x02E4($s0) ## 000002E4 /* 03AFC 80B377AC 92090114 */ lbu $t1, 0x0114($s0) ## 00000114 /* 03B00 80B377B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 @@ -102,32 +102,32 @@ glabel EnWf_Draw /* 03B10 80B377C0 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 /* 03B14 80B377C4 A20A0114 */ sb $t2, 0x0114($s0) ## 00000114 /* 03B18 80B377C8 306C0003 */ andi $t4, $v1, 0x0003 ## $t4 = 00000000 -/* 03B1C 80B377CC 1580000C */ bne $t4, $zero, .L80B37800 -/* 03B20 80B377D0 00031083 */ sra $v0, $v1, 2 -/* 03B24 80B377D4 00026880 */ sll $t5, $v0, 2 -/* 03B28 80B377D8 01A26823 */ subu $t5, $t5, $v0 -/* 03B2C 80B377DC 000D6840 */ sll $t5, $t5, 1 -/* 03B30 80B377E0 020D3021 */ addu $a2, $s0, $t5 +/* 03B1C 80B377CC 1580000C */ bne $t4, $zero, .L80B37800 +/* 03B20 80B377D0 00031083 */ sra $v0, $v1, 2 +/* 03B24 80B377D4 00026880 */ sll $t5, $v0, 2 +/* 03B28 80B377D8 01A26823 */ subu $t5, $t5, $v0 +/* 03B2C 80B377DC 000D6840 */ sll $t5, $t5, 1 +/* 03B30 80B377E0 020D3021 */ addu $a2, $s0, $t5 /* 03B34 80B377E4 24C6014C */ addiu $a2, $a2, 0x014C ## $a2 = 0000014C -/* 03B38 80B377E8 8FA4005C */ lw $a0, 0x005C($sp) +/* 03B38 80B377E8 8FA4005C */ lw $a0, 0x005C($sp) /* 03B3C 80B377EC 2407004B */ addiu $a3, $zero, 0x004B ## $a3 = 0000004B -/* 03B40 80B377F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 03B44 80B377F4 AFA00014 */ sw $zero, 0x0014($sp) -/* 03B48 80B377F8 0C00A953 */ jal func_8002A54C -/* 03B4C 80B377FC AFA20018 */ sw $v0, 0x0018($sp) +/* 03B40 80B377F0 AFA00010 */ sw $zero, 0x0010($sp) +/* 03B44 80B377F4 AFA00014 */ sw $zero, 0x0014($sp) +/* 03B48 80B377F8 0C00A953 */ jal func_8002A54C +/* 03B4C 80B377FC AFA20018 */ sw $v0, 0x0018($sp) .L80B37800: -/* 03B50 80B37800 8FAF005C */ lw $t7, 0x005C($sp) +/* 03B50 80B37800 8FAF005C */ lw $t7, 0x005C($sp) .L80B37804: /* 03B54 80B37804 3C0680B3 */ lui $a2, %hi(D_80B37B64) ## $a2 = 80B30000 /* 03B58 80B37808 24C67B64 */ addiu $a2, $a2, %lo(D_80B37B64) ## $a2 = 80B37B64 /* 03B5C 80B3780C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 03B60 80B37810 2407088E */ addiu $a3, $zero, 0x088E ## $a3 = 0000088E -/* 03B64 80B37814 0C031AD5 */ jal func_800C6B54 +/* 03B64 80B37814 0C031AD5 */ jal func_800C6B54 /* 03B68 80B37818 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 03B6C 80B3781C 8FBF002C */ lw $ra, 0x002C($sp) -/* 03B70 80B37820 8FB00028 */ lw $s0, 0x0028($sp) +/* 03B6C 80B3781C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03B70 80B37820 8FB00028 */ lw $s0, 0x0028($sp) /* 03B74 80B37824 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 03B78 80B37828 03E00008 */ jr $ra +/* 03B78 80B37828 03E00008 */ jr $ra /* 03B7C 80B3782C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s index 5b4a1c36bf..f0d9af85a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s @@ -1,24 +1,24 @@ glabel EnWf_Init /* 00008 80B33CB8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0000C 80B33CBC AFB10028 */ sw $s1, 0x0028($sp) +/* 0000C 80B33CBC AFB10028 */ sw $s1, 0x0028($sp) /* 00010 80B33CC0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00014 80B33CC4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 80B33CC8 AFB00024 */ sw $s0, 0x0024($sp) +/* 00014 80B33CC4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 80B33CC8 AFB00024 */ sw $s0, 0x0024($sp) /* 0001C 80B33CCC 3C0580B3 */ lui $a1, %hi(D_80B37AC8) ## $a1 = 80B30000 /* 00020 80B33CD0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00024 80B33CD4 0C01E037 */ jal Actor_ProcessInitChain - + /* 00028 80B33CD8 24A57AC8 */ addiu $a1, $a1, %lo(D_80B37AC8) ## $a1 = 80B37AC8 /* 0002C 80B33CDC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00030 80B33CE0 3C0E80B3 */ lui $t6, %hi(D_80B37A88) ## $t6 = 80B30000 /* 00034 80B33CE4 25CE7A88 */ addiu $t6, $t6, %lo(D_80B37A88) ## $t6 = 80B37A88 /* 00038 80B33CE8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0003C 80B33CEC 44050000 */ mfc1 $a1, $f0 -/* 00040 80B33CF0 44070000 */ mfc1 $a3, $f0 +/* 0003C 80B33CEC 44050000 */ mfc1 $a1, $f0 +/* 00040 80B33CF0 44070000 */ mfc1 $a3, $f0 /* 00044 80B33CF4 AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 /* 00048 80B33CF8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0004C 80B33CFC 0C00AC78 */ jal ActorShape_Init - + /* 00050 80B33D00 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00054 80B33D04 8E180024 */ lw $t8, 0x0024($s0) ## 00000024 /* 00058 80B33D08 8E0F0028 */ lw $t7, 0x0028($s0) ## 00000028 @@ -29,7 +29,7 @@ glabel EnWf_Init /* 0006C 80B33D1C 8E18002C */ lw $t8, 0x002C($s0) ## 0000002C /* 00070 80B33D20 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 00074 80B33D24 AE0F003C */ sw $t7, 0x003C($s0) ## 0000003C -/* 00078 80B33D28 000B6203 */ sra $t4, $t3, 8 +/* 00078 80B33D28 000B6203 */ sra $t4, $t3, 8 /* 0007C 80B33D2C 241900FE */ addiu $t9, $zero, 0x00FE ## $t9 = 000000FE /* 00080 80B33D30 24080008 */ addiu $t0, $zero, 0x0008 ## $t0 = 00000008 /* 00084 80B33D34 24090032 */ addiu $t1, $zero, 0x0032 ## $t1 = 00000032 @@ -46,82 +46,82 @@ glabel EnWf_Init /* 000B0 80B33D60 26050304 */ addiu $a1, $s0, 0x0304 ## $a1 = 00000304 /* 000B4 80B33D64 AE180040 */ sw $t8, 0x0040($s0) ## 00000040 /* 000B8 80B33D68 E60402F4 */ swc1 $f4, 0x02F4($s0) ## 000002F4 -/* 000BC 80B33D6C AFA50034 */ sw $a1, 0x0034($sp) -/* 000C0 80B33D70 0C016EFE */ jal func_8005BBF8 +/* 000BC 80B33D6C AFA50034 */ sw $a1, 0x0034($sp) +/* 000C0 80B33D70 0C016EFE */ jal func_8005BBF8 /* 000C4 80B33D74 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000C8 80B33D78 3C0780B3 */ lui $a3, %hi(D_80B37A20) ## $a3 = 80B30000 /* 000CC 80B33D7C 26180324 */ addiu $t8, $s0, 0x0324 ## $t8 = 00000324 -/* 000D0 80B33D80 8FA50034 */ lw $a1, 0x0034($sp) -/* 000D4 80B33D84 AFB80010 */ sw $t8, 0x0010($sp) +/* 000D0 80B33D80 8FA50034 */ lw $a1, 0x0034($sp) +/* 000D4 80B33D84 AFB80010 */ sw $t8, 0x0010($sp) /* 000D8 80B33D88 24E77A20 */ addiu $a3, $a3, %lo(D_80B37A20) ## $a3 = 80B37A20 /* 000DC 80B33D8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000E0 80B33D90 0C017014 */ jal func_8005C050 +/* 000E0 80B33D90 0C017014 */ jal func_8005C050 /* 000E4 80B33D94 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000E8 80B33D98 26050424 */ addiu $a1, $s0, 0x0424 ## $a1 = 00000424 -/* 000EC 80B33D9C AFA50034 */ sw $a1, 0x0034($sp) +/* 000EC 80B33D9C AFA50034 */ sw $a1, 0x0034($sp) /* 000F0 80B33DA0 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 000F4 80B33DA4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000F8 80B33DA8 3C0780B3 */ lui $a3, %hi(D_80B37A30) ## $a3 = 80B30000 -/* 000FC 80B33DAC 8FA50034 */ lw $a1, 0x0034($sp) +/* 000FC 80B33DAC 8FA50034 */ lw $a1, 0x0034($sp) /* 00100 80B33DB0 24E77A30 */ addiu $a3, $a3, %lo(D_80B37A30) ## $a3 = 80B37A30 /* 00104 80B33DB4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00108 80B33DB8 0C01712B */ jal ActorCollider_InitCylinder - + /* 0010C 80B33DBC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00110 80B33DC0 26050470 */ addiu $a1, $s0, 0x0470 ## $a1 = 00000470 -/* 00114 80B33DC4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00114 80B33DC4 AFA50034 */ sw $a1, 0x0034($sp) /* 00118 80B33DC8 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 0011C 80B33DCC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00120 80B33DD0 3C0780B3 */ lui $a3, %hi(D_80B37A5C) ## $a3 = 80B30000 -/* 00124 80B33DD4 8FA50034 */ lw $a1, 0x0034($sp) +/* 00124 80B33DD4 8FA50034 */ lw $a1, 0x0034($sp) /* 00128 80B33DD8 24E77A5C */ addiu $a3, $a3, %lo(D_80B37A5C) ## $a3 = 80B37A5C /* 0012C 80B33DDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00130 80B33DE0 0C01712B */ jal ActorCollider_InitCylinder - + /* 00134 80B33DE4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00138 80B33DE8 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 0013C 80B33DEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00140 80B33DF0 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 -/* 00144 80B33DF4 17200015 */ bne $t9, $zero, .L80B33E4C +/* 00144 80B33DF4 17200015 */ bne $t9, $zero, .L80B33E4C /* 00148 80B33DF8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0014C 80B33DFC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00150 80B33E00 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 00154 80B33E04 260801CC */ addiu $t0, $s0, 0x01CC ## $t0 = 000001CC /* 00158 80B33E08 26090250 */ addiu $t1, $s0, 0x0250 ## $t1 = 00000250 /* 0015C 80B33E0C 240A0016 */ addiu $t2, $zero, 0x0016 ## $t2 = 00000016 -/* 00160 80B33E10 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00164 80B33E14 AFA90014 */ sw $t1, 0x0014($sp) -/* 00168 80B33E18 AFA80010 */ sw $t0, 0x0010($sp) +/* 00160 80B33E10 AFAA0018 */ sw $t2, 0x0018($sp) +/* 00164 80B33E14 AFA90014 */ sw $t1, 0x0014($sp) +/* 00168 80B33E18 AFA80010 */ sw $t0, 0x0010($sp) /* 0016C 80B33E1C 24E7A4AC */ addiu $a3, $a3, 0xA4AC ## $a3 = 0600A4AC /* 00170 80B33E20 24C69690 */ addiu $a2, $a2, 0x9690 ## $a2 = 06009690 /* 00174 80B33E24 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00178 80B33E28 0C0291BE */ jal func_800A46F8 +/* 00178 80B33E28 0C0291BE */ jal SkelAnime_InitSV /* 0017C 80B33E2C 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 /* 00180 80B33E30 3C053BF5 */ lui $a1, 0x3BF5 ## $a1 = 3BF50000 /* 00184 80B33E34 34A5C28F */ ori $a1, $a1, 0xC28F ## $a1 = 3BF5C28F /* 00188 80B33E38 0C00B58B */ jal Actor_SetScale - + /* 0018C 80B33E3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00190 80B33E40 240B004C */ addiu $t3, $zero, 0x004C ## $t3 = 0000004C -/* 00194 80B33E44 10000017 */ beq $zero, $zero, .L80B33EA4 +/* 00194 80B33E44 10000017 */ beq $zero, $zero, .L80B33EA4 /* 00198 80B33E48 A20B0117 */ sb $t3, 0x0117($s0) ## 00000117 .L80B33E4C: /* 0019C 80B33E4C 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 001A0 80B33E50 260C01CC */ addiu $t4, $s0, 0x01CC ## $t4 = 000001CC /* 001A4 80B33E54 260D0250 */ addiu $t5, $s0, 0x0250 ## $t5 = 00000250 /* 001A8 80B33E58 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 -/* 001AC 80B33E5C AFAE0018 */ sw $t6, 0x0018($sp) -/* 001B0 80B33E60 AFAD0014 */ sw $t5, 0x0014($sp) -/* 001B4 80B33E64 AFAC0010 */ sw $t4, 0x0010($sp) +/* 001AC 80B33E5C AFAE0018 */ sw $t6, 0x0018($sp) +/* 001B0 80B33E60 AFAD0014 */ sw $t5, 0x0014($sp) +/* 001B4 80B33E64 AFAC0010 */ sw $t4, 0x0010($sp) /* 001B8 80B33E68 24E7A4AC */ addiu $a3, $a3, 0xA4AC ## $a3 = 0600A4AC -/* 001BC 80B33E6C 0C0291BE */ jal func_800A46F8 +/* 001BC 80B33E6C 0C0291BE */ jal SkelAnime_InitSV /* 001C0 80B33E70 24C63BC0 */ addiu $a2, $a2, 0x3BC0 ## $a2 = 00003BC0 /* 001C4 80B33E74 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 001C8 80B33E78 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 001CC 80B33E7C 0C00B58B */ jal Actor_SetScale - + /* 001D0 80B33E80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001D4 80B33E84 8E180320 */ lw $t8, 0x0320($s0) ## 00000320 /* 001D8 80B33E88 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 @@ -132,25 +132,25 @@ glabel EnWf_Init /* 001EC 80B33E9C A0590005 */ sb $t9, 0x0005($v0) ## 00000005 /* 001F0 80B33EA0 A2080117 */ sb $t0, 0x0117($s0) ## 00000117 .L80B33EA4: -/* 001F4 80B33EA4 0C2CD0E0 */ jal func_80B34380 +/* 001F4 80B33EA4 0C2CD0E0 */ jal func_80B34380 /* 001F8 80B33EA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001FC 80B33EAC 860502FC */ lh $a1, 0x02FC($s0) ## 000002FC /* 00200 80B33EB0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00204 80B33EB4 50A10008 */ beql $a1, $at, .L80B33ED8 -/* 00208 80B33EB8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00204 80B33EB4 50A10008 */ beql $a1, $at, .L80B33ED8 +/* 00208 80B33EB8 8FBF002C */ lw $ra, 0x002C($sp) /* 0020C 80B33EBC 0C00B2D0 */ jal Flags_GetSwitch - + /* 00210 80B33EC0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00214 80B33EC4 50400004 */ beql $v0, $zero, .L80B33ED8 -/* 00218 80B33EC8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00214 80B33EC4 50400004 */ beql $v0, $zero, .L80B33ED8 +/* 00218 80B33EC8 8FBF002C */ lw $ra, 0x002C($sp) /* 0021C 80B33ECC 0C00B55C */ jal Actor_Kill - + /* 00220 80B33ED0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00224 80B33ED4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00224 80B33ED4 8FBF002C */ lw $ra, 0x002C($sp) .L80B33ED8: -/* 00228 80B33ED8 8FB00024 */ lw $s0, 0x0024($sp) -/* 0022C 80B33EDC 8FB10028 */ lw $s1, 0x0028($sp) -/* 00230 80B33EE0 03E00008 */ jr $ra +/* 00228 80B33ED8 8FB00024 */ lw $s0, 0x0024($sp) +/* 0022C 80B33EDC 8FB10028 */ lw $s1, 0x0028($sp) +/* 00230 80B33EE0 03E00008 */ jr $ra /* 00234 80B33EE4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s index 3e6ac1e5fc..3f8c435bbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s @@ -1,14 +1,14 @@ glabel func_80B3455C /* 008AC 80B3455C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008B0 80B34560 AFBF0014 */ sw $ra, 0x0014($sp) +/* 008B0 80B34560 AFBF0014 */ sw $ra, 0x0014($sp) /* 008B4 80B34564 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 008B8 80B34568 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 008BC 80B3456C 24A5A4AC */ addiu $a1, $a1, 0xA4AC ## $a1 = 0600A4AC -/* 008C0 80B34570 AFA70018 */ sw $a3, 0x0018($sp) +/* 008C0 80B34570 AFA70018 */ sw $a3, 0x0018($sp) /* 008C4 80B34574 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 008C8 80B34578 0C0294D3 */ jal func_800A534C +/* 008C8 80B34578 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 008CC 80B3457C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 008D0 80B34580 8FA70018 */ lw $a3, 0x0018($sp) +/* 008D0 80B34580 8FA70018 */ lw $a3, 0x0018($sp) /* 008D4 80B34584 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 008D8 80B34588 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -17,22 +17,22 @@ glabel func_80B3455C /* 008E4 80B34594 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 008E8 80B34598 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 008EC 80B3459C 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 008F0 80B345A0 46040182 */ mul.s $f6, $f0, $f4 -/* 008F4 80B345A4 8FA40018 */ lw $a0, 0x0018($sp) +/* 008F0 80B345A0 46040182 */ mul.s $f6, $f0, $f4 +/* 008F4 80B345A4 8FA40018 */ lw $a0, 0x0018($sp) /* 008F8 80B345A8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 008FC 80B345AC 3C0580B3 */ lui $a1, %hi(func_80B345E4) ## $a1 = 80B30000 /* 00900 80B345B0 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 /* 00904 80B345B4 24A545E4 */ addiu $a1, $a1, %lo(func_80B345E4) ## $a1 = 80B345E4 /* 00908 80B345B8 E4920068 */ swc1 $f18, 0x0068($a0) ## 00000068 -/* 0090C 80B345BC 46083280 */ add.s $f10, $f6, $f8 +/* 0090C 80B345BC 46083280 */ add.s $f10, $f6, $f8 /* 00910 80B345C0 A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 00914 80B345C4 4600540D */ trunc.w.s $f16, $f10 -/* 00918 80B345C8 44188000 */ mfc1 $t8, $f16 -/* 0091C 80B345CC 0C2CCF2C */ jal func_80B33CB0 +/* 00914 80B345C4 4600540D */ trunc.w.s $f16, $f10 +/* 00918 80B345C8 44188000 */ mfc1 $t8, $f16 +/* 0091C 80B345CC 0C2CCF2C */ jal func_80B33CB0 /* 00920 80B345D0 AC9802E8 */ sw $t8, 0x02E8($a0) ## 000002E8 -/* 00924 80B345D4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00924 80B345D4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00928 80B345D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0092C 80B345DC 03E00008 */ jr $ra +/* 0092C 80B345DC 03E00008 */ jr $ra /* 00930 80B345E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s index 87f4f8344a..eb1a0c31f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s @@ -1,22 +1,22 @@ glabel func_80B34CFC /* 0104C 80B34CFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01050 80B34D00 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01050 80B34D00 AFBF0014 */ sw $ra, 0x0014($sp) /* 01054 80B34D04 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01058 80B34D08 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0105C 80B34D0C 24A598C8 */ addiu $a1, $a1, 0x98C8 ## $a1 = 060098C8 -/* 01060 80B34D10 AFA70018 */ sw $a3, 0x0018($sp) +/* 01060 80B34D10 AFA70018 */ sw $a3, 0x0018($sp) /* 01064 80B34D14 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01068 80B34D18 0C0294D3 */ jal func_800A534C +/* 01068 80B34D18 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0106C 80B34D1C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 01070 80B34D20 8FA40018 */ lw $a0, 0x0018($sp) +/* 01070 80B34D20 8FA40018 */ lw $a0, 0x0018($sp) /* 01074 80B34D24 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 01078 80B34D28 3C0580B3 */ lui $a1, %hi(func_80B34D48) ## $a1 = 80B30000 /* 0107C 80B34D2C 24A54D48 */ addiu $a1, $a1, %lo(func_80B34D48) ## $a1 = 80B34D48 -/* 01080 80B34D30 0C2CCF2C */ jal func_80B33CB0 +/* 01080 80B34D30 0C2CCF2C */ jal func_80B33CB0 /* 01084 80B34D34 AC8E02D4 */ sw $t6, 0x02D4($a0) ## 000002D4 -/* 01088 80B34D38 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01088 80B34D38 8FBF0014 */ lw $ra, 0x0014($sp) /* 0108C 80B34D3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01090 80B34D40 03E00008 */ jr $ra +/* 01090 80B34D40 03E00008 */ jr $ra /* 01094 80B34D44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s index 2f37986278..5282ad6efc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s @@ -1,115 +1,115 @@ glabel EnXc_Init /* 05720 80B41900 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 05724 80B41904 AFB10028 */ sw $s1, 0x0028($sp) -/* 05728 80B41908 AFB00024 */ sw $s0, 0x0024($sp) +/* 05724 80B41904 AFB10028 */ sw $s1, 0x0028($sp) +/* 05728 80B41908 AFB00024 */ sw $s0, 0x0024($sp) /* 0572C 80B4190C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05730 80B41910 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05734 80B41914 AFBF002C */ sw $ra, 0x002C($sp) +/* 05734 80B41914 AFBF002C */ sw $ra, 0x002C($sp) /* 05738 80B41918 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0573C 80B4191C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 05740 80B41920 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 05744 80B41924 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 05748 80B41928 0C00AC78 */ jal ActorShape_Init - + /* 0574C 80B4192C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 05750 80B41930 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 05754 80B41934 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 05758 80B41938 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 0575C 80B4193C 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 /* 05760 80B41940 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 05764 80B41944 AFB80018 */ sw $t8, 0x0018($sp) -/* 05768 80B41948 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0576C 80B4194C AFAE0010 */ sw $t6, 0x0010($sp) +/* 05764 80B41944 AFB80018 */ sw $t8, 0x0018($sp) +/* 05768 80B41948 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0576C 80B4194C AFAE0010 */ sw $t6, 0x0010($sp) /* 05770 80B41950 24E74828 */ addiu $a3, $a3, 0x4828 ## $a3 = 06004828 /* 05774 80B41954 24C62AF0 */ addiu $a2, $a2, 0x2AF0 ## $a2 = 06012AF0 /* 05778 80B41958 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0577C 80B4195C 0C0291BE */ jal func_800A46F8 +/* 0577C 80B4195C 0C0291BE */ jal SkelAnime_InitSV /* 05780 80B41960 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 05784 80B41964 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05788 80B41968 0C2CF078 */ jal func_80B3C1E0 +/* 05788 80B41968 0C2CF078 */ jal func_80B3C1E0 /* 0578C 80B4196C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 05790 80B41970 9619001C */ lhu $t9, 0x001C($s0) ## 0000001C -/* 05794 80B41974 2F21000A */ sltiu $at, $t9, 0x000A -/* 05798 80B41978 10200038 */ beq $at, $zero, .L80B41A5C -/* 0579C 80B4197C 0019C880 */ sll $t9, $t9, 2 +/* 05794 80B41974 2F21000A */ sltiu $at, $t9, 0x000A +/* 05798 80B41978 10200038 */ beq $at, $zero, .L80B41A5C +/* 0579C 80B4197C 0019C880 */ sll $t9, $t9, 2 /* 057A0 80B41980 3C0180B4 */ lui $at, %hi(jtbl_80B422B0) ## $at = 80B40000 -/* 057A4 80B41984 00390821 */ addu $at, $at, $t9 -/* 057A8 80B41988 8C3922B0 */ lw $t9, %lo(jtbl_80B422B0)($at) -/* 057AC 80B4198C 03200008 */ jr $t9 +/* 057A4 80B41984 00390821 */ addu $at, $at, $t9 +/* 057A8 80B41988 8C3922B0 */ lw $t9, %lo(jtbl_80B422B0)($at) +/* 057AC 80B4198C 03200008 */ jr $t9 /* 057B0 80B41990 00000000 */ nop glabel L80B41994 /* 057B4 80B41994 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057B8 80B41998 0C2CFAFC */ jal func_80B3EBF0 +/* 057B8 80B41998 0C2CFAFC */ jal func_80B3EBF0 /* 057BC 80B4199C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 057C0 80B419A0 10000035 */ beq $zero, $zero, .L80B41A78 -/* 057C4 80B419A4 8FBF002C */ lw $ra, 0x002C($sp) +/* 057C0 80B419A0 10000035 */ beq $zero, $zero, .L80B41A78 +/* 057C4 80B419A4 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B419A8 /* 057C8 80B419A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057CC 80B419AC 0C2CFB99 */ jal func_80B3EE64 +/* 057CC 80B419AC 0C2CFB99 */ jal func_80B3EE64 /* 057D0 80B419B0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 057D4 80B419B4 10000030 */ beq $zero, $zero, .L80B41A78 -/* 057D8 80B419B8 8FBF002C */ lw $ra, 0x002C($sp) +/* 057D4 80B419B4 10000030 */ beq $zero, $zero, .L80B41A78 +/* 057D8 80B419B8 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B419BC /* 057DC 80B419BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057E0 80B419C0 0C2CFCF2 */ jal func_80B3F3C8 +/* 057E0 80B419C0 0C2CFCF2 */ jal func_80B3F3C8 /* 057E4 80B419C4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 057E8 80B419C8 1000002B */ beq $zero, $zero, .L80B41A78 -/* 057EC 80B419CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 057E8 80B419C8 1000002B */ beq $zero, $zero, .L80B41A78 +/* 057EC 80B419CC 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B419D0 /* 057F0 80B419D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057F4 80B419D4 0C2CFE82 */ jal func_80B3FA08 +/* 057F4 80B419D4 0C2CFE82 */ jal func_80B3FA08 /* 057F8 80B419D8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 057FC 80B419DC 10000026 */ beq $zero, $zero, .L80B41A78 -/* 05800 80B419E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 057FC 80B419DC 10000026 */ beq $zero, $zero, .L80B41A78 +/* 05800 80B419E0 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B419E4 /* 05804 80B419E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05808 80B419E8 0C2D0164 */ jal func_80B40590 +/* 05808 80B419E8 0C2D0164 */ jal func_80B40590 /* 0580C 80B419EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05810 80B419F0 10000021 */ beq $zero, $zero, .L80B41A78 -/* 05814 80B419F4 8FBF002C */ lw $ra, 0x002C($sp) +/* 05810 80B419F0 10000021 */ beq $zero, $zero, .L80B41A78 +/* 05814 80B419F4 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B419F8 /* 05818 80B419F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0581C 80B419FC 0C2CF28E */ jal func_80B3CA38 +/* 0581C 80B419FC 0C2CF28E */ jal func_80B3CA38 /* 05820 80B41A00 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05824 80B41A04 1000001C */ beq $zero, $zero, .L80B41A78 -/* 05828 80B41A08 8FBF002C */ lw $ra, 0x002C($sp) +/* 05824 80B41A04 1000001C */ beq $zero, $zero, .L80B41A78 +/* 05828 80B41A08 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B41A0C /* 0582C 80B41A0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05830 80B41A10 0C2CF2D6 */ jal func_80B3CB58 +/* 05830 80B41A10 0C2CF2D6 */ jal func_80B3CB58 /* 05834 80B41A14 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05838 80B41A18 10000017 */ beq $zero, $zero, .L80B41A78 -/* 0583C 80B41A1C 8FBF002C */ lw $ra, 0x002C($sp) +/* 05838 80B41A18 10000017 */ beq $zero, $zero, .L80B41A78 +/* 0583C 80B41A1C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B41A20 /* 05840 80B41A20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05844 80B41A24 0C2CF340 */ jal func_80B3CD00 +/* 05844 80B41A24 0C2CF340 */ jal func_80B3CD00 /* 05848 80B41A28 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0584C 80B41A2C 10000012 */ beq $zero, $zero, .L80B41A78 -/* 05850 80B41A30 8FBF002C */ lw $ra, 0x002C($sp) +/* 0584C 80B41A2C 10000012 */ beq $zero, $zero, .L80B41A78 +/* 05850 80B41A30 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B41A34 /* 05854 80B41A34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05858 80B41A38 0C2D056E */ jal func_80B415B8 +/* 05858 80B41A38 0C2D056E */ jal func_80B415B8 /* 0585C 80B41A3C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05860 80B41A40 1000000D */ beq $zero, $zero, .L80B41A78 -/* 05864 80B41A44 8FBF002C */ lw $ra, 0x002C($sp) +/* 05860 80B41A40 1000000D */ beq $zero, $zero, .L80B41A78 +/* 05864 80B41A44 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B41A48 /* 05868 80B41A48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0586C 80B41A4C 0C2CF39E */ jal func_80B3CE78 +/* 0586C 80B41A4C 0C2CF39E */ jal func_80B3CE78 /* 05870 80B41A50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05874 80B41A54 10000008 */ beq $zero, $zero, .L80B41A78 -/* 05878 80B41A58 8FBF002C */ lw $ra, 0x002C($sp) +/* 05874 80B41A54 10000008 */ beq $zero, $zero, .L80B41A78 +/* 05878 80B41A58 8FBF002C */ lw $ra, 0x002C($sp) .L80B41A5C: /* 0587C 80B41A5C 3C0480B4 */ lui $a0, %hi(D_80B4215C) ## $a0 = 80B40000 /* 05880 80B41A60 0C00084C */ jal osSyncPrintf - + /* 05884 80B41A64 2484215C */ addiu $a0, $a0, %lo(D_80B4215C) ## $a0 = 80B4215C /* 05888 80B41A68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0588C 80B41A6C 0C2CF39E */ jal func_80B3CE78 +/* 0588C 80B41A6C 0C2CF39E */ jal func_80B3CE78 /* 05890 80B41A70 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05894 80B41A74 8FBF002C */ lw $ra, 0x002C($sp) +/* 05894 80B41A74 8FBF002C */ lw $ra, 0x002C($sp) .L80B41A78: -/* 05898 80B41A78 8FB00024 */ lw $s0, 0x0024($sp) -/* 0589C 80B41A7C 8FB10028 */ lw $s1, 0x0028($sp) -/* 058A0 80B41A80 03E00008 */ jr $ra +/* 05898 80B41A78 8FB00024 */ lw $s0, 0x0024($sp) +/* 0589C 80B41A7C 8FB10028 */ lw $s1, 0x0028($sp) +/* 058A0 80B41A80 03E00008 */ jr $ra /* 058A4 80B41A84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s index cec35d275a..5990e6a7a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s @@ -1,42 +1,42 @@ glabel func_80B3E908 /* 02728 80B3E908 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 0272C 80B3E90C AFBF002C */ sw $ra, 0x002C($sp) -/* 02730 80B3E910 AFB00028 */ sw $s0, 0x0028($sp) -/* 02734 80B3E914 AFA40080 */ sw $a0, 0x0080($sp) -/* 02738 80B3E918 AFA50084 */ sw $a1, 0x0084($sp) +/* 0272C 80B3E90C AFBF002C */ sw $ra, 0x002C($sp) +/* 02730 80B3E910 AFB00028 */ sw $s0, 0x0028($sp) +/* 02734 80B3E914 AFA40080 */ sw $a0, 0x0080($sp) +/* 02738 80B3E918 AFA50084 */ sw $a1, 0x0084($sp) /* 0273C 80B3E91C 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 02740 80B3E920 3C0880B4 */ lui $t0, %hi(D_80B41D6C) ## $t0 = 80B40000 /* 02744 80B3E924 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 02748 80B3E928 00027880 */ sll $t7, $v0, 2 -/* 0274C 80B3E92C 010F4021 */ addu $t0, $t0, $t7 -/* 02750 80B3E930 8D081D6C */ lw $t0, %lo(D_80B41D6C)($t0) +/* 02748 80B3E928 00027880 */ sll $t7, $v0, 2 +/* 0274C 80B3E92C 010F4021 */ addu $t0, $t0, $t7 +/* 02750 80B3E930 8D081D6C */ lw $t0, %lo(D_80B41D6C)($t0) /* 02754 80B3E934 3C0680B4 */ lui $a2, %hi(D_80B42010) ## $a2 = 80B40000 /* 02758 80B3E938 24C62010 */ addiu $a2, $a2, %lo(D_80B42010) ## $a2 = 80B42010 /* 0275C 80B3E93C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 02760 80B3E940 240705A4 */ addiu $a3, $zero, 0x05A4 ## $a3 = 000005A4 /* 02764 80B3E944 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02768 80B3E948 0C031AB1 */ jal func_800C6AC4 -/* 0276C 80B3E94C AFA80070 */ sw $t0, 0x0070($sp) -/* 02770 80B3E950 8FA80070 */ lw $t0, 0x0070($sp) +/* 02768 80B3E948 0C031AB1 */ jal func_800C6AC4 +/* 0276C 80B3E94C AFA80070 */ sw $t0, 0x0070($sp) +/* 02770 80B3E950 8FA80070 */ lw $t0, 0x0070($sp) /* 02774 80B3E954 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 02778 80B3E958 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 0277C 80B3E95C 00085100 */ sll $t2, $t0, 4 -/* 02780 80B3E960 000A5F02 */ srl $t3, $t2, 28 +/* 0277C 80B3E95C 00085100 */ sll $t2, $t0, 4 +/* 02780 80B3E960 000A5F02 */ srl $t3, $t2, 28 /* 02784 80B3E964 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 02788 80B3E968 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 0278C 80B3E96C AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 02790 80B3E970 25AD6FA8 */ addiu $t5, $t5, 0x6FA8 ## $t5 = 80166FA8 -/* 02794 80B3E974 000B6080 */ sll $t4, $t3, 2 +/* 02794 80B3E974 000B6080 */ sll $t4, $t3, 2 /* 02798 80B3E978 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 0279C 80B3E97C 018D2021 */ addu $a0, $t4, $t5 +/* 0279C 80B3E97C 018D2021 */ addu $a0, $t4, $t5 /* 027A0 80B3E980 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 027A4 80B3E984 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 /* 027A8 80B3E988 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 027AC 80B3E98C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 027B0 80B3E990 01012824 */ and $a1, $t0, $at +/* 027B0 80B3E990 01012824 */ and $a1, $t0, $at /* 027B4 80B3E994 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 027B8 80B3E998 01C57821 */ addu $t7, $t6, $a1 -/* 027BC 80B3E99C 01E6C021 */ addu $t8, $t7, $a2 +/* 027B8 80B3E998 01C57821 */ addu $t7, $t6, $a1 +/* 027BC 80B3E99C 01E6C021 */ addu $t8, $t7, $a2 /* 027C0 80B3E9A0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 027C4 80B3E9A4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 027C8 80B3E9A8 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -47,8 +47,8 @@ glabel func_80B3E908 /* 027DC 80B3E9BC 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 /* 027E0 80B3E9C0 3C0FFFFF */ lui $t7, 0xFFFF ## $t7 = FFFF0000 /* 027E4 80B3E9C4 35EF1400 */ ori $t7, $t7, 0x1400 ## $t7 = FFFF1400 -/* 027E8 80B3E9C8 01455821 */ addu $t3, $t2, $a1 -/* 027EC 80B3E9CC 01666021 */ addu $t4, $t3, $a2 +/* 027E8 80B3E9C8 01455821 */ addu $t3, $t2, $a1 +/* 027EC 80B3E9CC 01666021 */ addu $t4, $t3, $a2 /* 027F0 80B3E9D0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 027F4 80B3E9D4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 027F8 80B3E9D8 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 @@ -63,34 +63,34 @@ glabel func_80B3E908 /* 0281C 80B3E9FC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 02820 80B3EA00 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 02824 80B3EA04 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 02828 80B3EA08 0C024F46 */ jal func_80093D18 +/* 02828 80B3EA08 0C024F46 */ jal func_80093D18 /* 0282C 80B3EA0C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02830 80B3EA10 8FA40080 */ lw $a0, 0x0080($sp) -/* 02834 80B3EA14 8FA50084 */ lw $a1, 0x0084($sp) -/* 02838 80B3EA18 0C00BAF3 */ jal func_8002EBCC +/* 02830 80B3EA10 8FA40080 */ lw $a0, 0x0080($sp) +/* 02834 80B3EA14 8FA50084 */ lw $a1, 0x0084($sp) +/* 02838 80B3EA18 0C00BAF3 */ jal func_8002EBCC /* 0283C 80B3EA1C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02840 80B3EA20 8FAA0080 */ lw $t2, 0x0080($sp) +/* 02840 80B3EA20 8FAA0080 */ lw $t2, 0x0080($sp) /* 02844 80B3EA24 3C0B80B4 */ lui $t3, %hi(func_80B3E8AC) ## $t3 = 80B40000 /* 02848 80B3EA28 256BE8AC */ addiu $t3, $t3, %lo(func_80B3E8AC) ## $t3 = 80B3E8AC /* 0284C 80B3EA2C 2542014C */ addiu $v0, $t2, 0x014C ## $v0 = 0000014C /* 02850 80B3EA30 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 02854 80B3EA34 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 02858 80B3EA38 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 0285C 80B3EA3C AFA00014 */ sw $zero, 0x0014($sp) -/* 02860 80B3EA40 AFAB0010 */ sw $t3, 0x0010($sp) -/* 02864 80B3EA44 8FA40084 */ lw $a0, 0x0084($sp) -/* 02868 80B3EA48 0C0286B2 */ jal func_800A1AC8 -/* 0286C 80B3EA4C AFAA0018 */ sw $t2, 0x0018($sp) +/* 0285C 80B3EA3C AFA00014 */ sw $zero, 0x0014($sp) +/* 02860 80B3EA40 AFAB0010 */ sw $t3, 0x0010($sp) +/* 02864 80B3EA44 8FA40084 */ lw $a0, 0x0084($sp) +/* 02868 80B3EA48 0C0286B2 */ jal SkelAnime_DrawSV +/* 0286C 80B3EA4C AFAA0018 */ sw $t2, 0x0018($sp) /* 02870 80B3EA50 3C0680B4 */ lui $a2, %hi(D_80B42028) ## $a2 = 80B40000 /* 02874 80B3EA54 24C62028 */ addiu $a2, $a2, %lo(D_80B42028) ## $a2 = 80B42028 /* 02878 80B3EA58 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 0287C 80B3EA5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02880 80B3EA60 0C031AD5 */ jal func_800C6B54 +/* 02880 80B3EA60 0C031AD5 */ jal func_800C6B54 /* 02884 80B3EA64 240705D9 */ addiu $a3, $zero, 0x05D9 ## $a3 = 000005D9 -/* 02888 80B3EA68 8FBF002C */ lw $ra, 0x002C($sp) -/* 0288C 80B3EA6C 8FB00028 */ lw $s0, 0x0028($sp) +/* 02888 80B3EA68 8FBF002C */ lw $ra, 0x002C($sp) +/* 0288C 80B3EA6C 8FB00028 */ lw $s0, 0x0028($sp) /* 02890 80B3EA70 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 02894 80B3EA74 03E00008 */ jr $ra +/* 02894 80B3EA74 03E00008 */ jr $ra /* 02898 80B3EA78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s index fac7c54296..ec8041639f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s @@ -1,42 +1,42 @@ glabel func_80B3EA7C /* 0289C 80B3EA7C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 028A0 80B3EA80 AFBF002C */ sw $ra, 0x002C($sp) -/* 028A4 80B3EA84 AFB00028 */ sw $s0, 0x0028($sp) -/* 028A8 80B3EA88 AFA40080 */ sw $a0, 0x0080($sp) -/* 028AC 80B3EA8C AFA50084 */ sw $a1, 0x0084($sp) +/* 028A0 80B3EA80 AFBF002C */ sw $ra, 0x002C($sp) +/* 028A4 80B3EA84 AFB00028 */ sw $s0, 0x0028($sp) +/* 028A8 80B3EA88 AFA40080 */ sw $a0, 0x0080($sp) +/* 028AC 80B3EA8C AFA50084 */ sw $a1, 0x0084($sp) /* 028B0 80B3EA90 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 028B4 80B3EA94 3C0880B4 */ lui $t0, %hi(D_80B41D6C) ## $t0 = 80B40000 /* 028B8 80B3EA98 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 028BC 80B3EA9C 00027880 */ sll $t7, $v0, 2 -/* 028C0 80B3EAA0 010F4021 */ addu $t0, $t0, $t7 -/* 028C4 80B3EAA4 8D081D6C */ lw $t0, %lo(D_80B41D6C)($t0) +/* 028BC 80B3EA9C 00027880 */ sll $t7, $v0, 2 +/* 028C0 80B3EAA0 010F4021 */ addu $t0, $t0, $t7 +/* 028C4 80B3EAA4 8D081D6C */ lw $t0, %lo(D_80B41D6C)($t0) /* 028C8 80B3EAA8 3C0680B4 */ lui $a2, %hi(D_80B42040) ## $a2 = 80B40000 /* 028CC 80B3EAAC 24C62040 */ addiu $a2, $a2, %lo(D_80B42040) ## $a2 = 80B42040 /* 028D0 80B3EAB0 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 028D4 80B3EAB4 240705E7 */ addiu $a3, $zero, 0x05E7 ## $a3 = 000005E7 /* 028D8 80B3EAB8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 028DC 80B3EABC 0C031AB1 */ jal func_800C6AC4 -/* 028E0 80B3EAC0 AFA80070 */ sw $t0, 0x0070($sp) -/* 028E4 80B3EAC4 8FA80070 */ lw $t0, 0x0070($sp) +/* 028DC 80B3EABC 0C031AB1 */ jal func_800C6AC4 +/* 028E0 80B3EAC0 AFA80070 */ sw $t0, 0x0070($sp) +/* 028E4 80B3EAC4 8FA80070 */ lw $t0, 0x0070($sp) /* 028E8 80B3EAC8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 028EC 80B3EACC 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 028F0 80B3EAD0 00085100 */ sll $t2, $t0, 4 -/* 028F4 80B3EAD4 000A5F02 */ srl $t3, $t2, 28 +/* 028F0 80B3EAD0 00085100 */ sll $t2, $t0, 4 +/* 028F4 80B3EAD4 000A5F02 */ srl $t3, $t2, 28 /* 028F8 80B3EAD8 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 028FC 80B3EADC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 02900 80B3EAE0 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 02904 80B3EAE4 25AD6FA8 */ addiu $t5, $t5, 0x6FA8 ## $t5 = 80166FA8 -/* 02908 80B3EAE8 000B6080 */ sll $t4, $t3, 2 +/* 02908 80B3EAE8 000B6080 */ sll $t4, $t3, 2 /* 0290C 80B3EAEC 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 02910 80B3EAF0 018D2021 */ addu $a0, $t4, $t5 +/* 02910 80B3EAF0 018D2021 */ addu $a0, $t4, $t5 /* 02914 80B3EAF4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 02918 80B3EAF8 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 /* 0291C 80B3EAFC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 02920 80B3EB00 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02924 80B3EB04 01012824 */ and $a1, $t0, $at +/* 02924 80B3EB04 01012824 */ and $a1, $t0, $at /* 02928 80B3EB08 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 0292C 80B3EB0C 01C57821 */ addu $t7, $t6, $a1 -/* 02930 80B3EB10 01E6C021 */ addu $t8, $t7, $a2 +/* 0292C 80B3EB0C 01C57821 */ addu $t7, $t6, $a1 +/* 02930 80B3EB10 01E6C021 */ addu $t8, $t7, $a2 /* 02934 80B3EB14 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 02938 80B3EB18 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0293C 80B3EB1C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -47,8 +47,8 @@ glabel func_80B3EA7C /* 02950 80B3EB30 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 /* 02954 80B3EB34 3C0FFFFF */ lui $t7, 0xFFFF ## $t7 = FFFF0000 /* 02958 80B3EB38 35EF1400 */ ori $t7, $t7, 0x1400 ## $t7 = FFFF1400 -/* 0295C 80B3EB3C 01455821 */ addu $t3, $t2, $a1 -/* 02960 80B3EB40 01666021 */ addu $t4, $t3, $a2 +/* 0295C 80B3EB3C 01455821 */ addu $t3, $t2, $a1 +/* 02960 80B3EB40 01666021 */ addu $t4, $t3, $a2 /* 02964 80B3EB44 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 02968 80B3EB48 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0296C 80B3EB4C 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 @@ -63,34 +63,34 @@ glabel func_80B3EA7C /* 02990 80B3EB70 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 02994 80B3EB74 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 02998 80B3EB78 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 0299C 80B3EB7C 0C024F46 */ jal func_80093D18 +/* 0299C 80B3EB7C 0C024F46 */ jal func_80093D18 /* 029A0 80B3EB80 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 029A4 80B3EB84 8FA40080 */ lw $a0, 0x0080($sp) -/* 029A8 80B3EB88 8FA50084 */ lw $a1, 0x0084($sp) -/* 029AC 80B3EB8C 0C00BAF3 */ jal func_8002EBCC +/* 029A4 80B3EB84 8FA40080 */ lw $a0, 0x0080($sp) +/* 029A8 80B3EB88 8FA50084 */ lw $a1, 0x0084($sp) +/* 029AC 80B3EB8C 0C00BAF3 */ jal func_8002EBCC /* 029B0 80B3EB90 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 029B4 80B3EB94 8FAA0080 */ lw $t2, 0x0080($sp) +/* 029B4 80B3EB94 8FAA0080 */ lw $t2, 0x0080($sp) /* 029B8 80B3EB98 3C0B80B4 */ lui $t3, %hi(func_80B3E8E4) ## $t3 = 80B40000 /* 029BC 80B3EB9C 256BE8E4 */ addiu $t3, $t3, %lo(func_80B3E8E4) ## $t3 = 80B3E8E4 /* 029C0 80B3EBA0 2542014C */ addiu $v0, $t2, 0x014C ## $v0 = 0000014C /* 029C4 80B3EBA4 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 029C8 80B3EBA8 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 029CC 80B3EBAC 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 029D0 80B3EBB0 AFA00014 */ sw $zero, 0x0014($sp) -/* 029D4 80B3EBB4 AFAB0010 */ sw $t3, 0x0010($sp) -/* 029D8 80B3EBB8 8FA40084 */ lw $a0, 0x0084($sp) -/* 029DC 80B3EBBC 0C0286B2 */ jal func_800A1AC8 -/* 029E0 80B3EBC0 AFAA0018 */ sw $t2, 0x0018($sp) +/* 029D0 80B3EBB0 AFA00014 */ sw $zero, 0x0014($sp) +/* 029D4 80B3EBB4 AFAB0010 */ sw $t3, 0x0010($sp) +/* 029D8 80B3EBB8 8FA40084 */ lw $a0, 0x0084($sp) +/* 029DC 80B3EBBC 0C0286B2 */ jal SkelAnime_DrawSV +/* 029E0 80B3EBC0 AFAA0018 */ sw $t2, 0x0018($sp) /* 029E4 80B3EBC4 3C0680B4 */ lui $a2, %hi(D_80B42058) ## $a2 = 80B40000 /* 029E8 80B3EBC8 24C62058 */ addiu $a2, $a2, %lo(D_80B42058) ## $a2 = 80B42058 /* 029EC 80B3EBCC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 029F0 80B3EBD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 029F4 80B3EBD4 0C031AD5 */ jal func_800C6B54 +/* 029F4 80B3EBD4 0C031AD5 */ jal func_800C6B54 /* 029F8 80B3EBD8 2407061C */ addiu $a3, $zero, 0x061C ## $a3 = 0000061C -/* 029FC 80B3EBDC 8FBF002C */ lw $ra, 0x002C($sp) -/* 02A00 80B3EBE0 8FB00028 */ lw $s0, 0x0028($sp) +/* 029FC 80B3EBDC 8FBF002C */ lw $ra, 0x002C($sp) +/* 02A00 80B3EBE0 8FB00028 */ lw $s0, 0x0028($sp) /* 02A04 80B3EBE4 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 02A08 80B3EBE8 03E00008 */ jr $ra +/* 02A08 80B3EBE8 03E00008 */ jr $ra /* 02A0C 80B3EBEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s index 83eae285b0..6a22bd70ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s @@ -167,7 +167,7 @@ glabel func_80B402C4 /* 04370 80B40550 AFA90014 */ sw $t1, 0x0014($sp) /* 04374 80B40554 AFA80010 */ sw $t0, 0x0010($sp) /* 04378 80B40558 AFB10018 */ sw $s1, 0x0018($sp) -/* 0437C 80B4055C 0C0286B2 */ jal func_800A1AC8 +/* 0437C 80B4055C 0C0286B2 */ jal SkelAnime_DrawSV /* 04380 80B40560 8FA4009C */ lw $a0, 0x009C($sp) /* 04384 80B40564 3C0680B4 */ lui $a2, %hi(D_80B420A0) ## $a2 = 80B40000 /* 04388 80B40568 24C620A0 */ addiu $a2, $a2, %lo(D_80B420A0) ## $a2 = 80B420A0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s index 30f8e7f843..4235b035ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s @@ -1,39 +1,39 @@ glabel func_80B414AC /* 052CC 80B414AC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 052D0 80B414B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 052D4 80B414B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 052D8 80B414B8 AFA40068 */ sw $a0, 0x0068($sp) -/* 052DC 80B414BC AFA5006C */ sw $a1, 0x006C($sp) +/* 052D0 80B414B0 AFBF002C */ sw $ra, 0x002C($sp) +/* 052D4 80B414B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 052D8 80B414B8 AFA40068 */ sw $a0, 0x0068($sp) +/* 052DC 80B414BC AFA5006C */ sw $a1, 0x006C($sp) /* 052E0 80B414C0 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 052E4 80B414C4 3C0680B4 */ lui $a2, %hi(D_80B420F0) ## $a2 = 80B40000 /* 052E8 80B414C8 24C620F0 */ addiu $a2, $a2, %lo(D_80B420F0) ## $a2 = 80B420F0 /* 052EC 80B414CC 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 052F0 80B414D0 24070347 */ addiu $a3, $zero, 0x0347 ## $a3 = 00000347 -/* 052F4 80B414D4 0C031AB1 */ jal func_800C6AC4 +/* 052F4 80B414D4 0C031AB1 */ jal func_800C6AC4 /* 052F8 80B414D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 052FC 80B414DC 0C024F46 */ jal func_80093D18 +/* 052FC 80B414DC 0C024F46 */ jal func_80093D18 /* 05300 80B414E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05304 80B414E4 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 05308 80B414E8 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 0530C 80B414EC 246358C0 */ addiu $v1, $v1, 0x58C0 ## $v1 = 060058C0 -/* 05310 80B414F0 0003C900 */ sll $t9, $v1, 4 -/* 05314 80B414F4 00194702 */ srl $t0, $t9, 28 +/* 05310 80B414F0 0003C900 */ sll $t9, $v1, 4 +/* 05314 80B414F4 00194702 */ srl $t0, $t9, 28 /* 05318 80B414F8 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 0531C 80B414FC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 05320 80B41500 248F0008 */ addiu $t7, $a0, 0x0008 ## $t7 = 00000008 /* 05324 80B41504 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 05328 80B41508 254A6FA8 */ addiu $t2, $t2, 0x6FA8 ## $t2 = 80166FA8 /* 0532C 80B4150C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 05330 80B41510 00084880 */ sll $t1, $t0, 2 -/* 05334 80B41514 012A2821 */ addu $a1, $t1, $t2 +/* 05330 80B41510 00084880 */ sll $t1, $t0, 2 +/* 05334 80B41514 012A2821 */ addu $a1, $t1, $t2 /* 05338 80B41518 AC980000 */ sw $t8, 0x0000($a0) ## 00000000 /* 0533C 80B4151C 8CAB0000 */ lw $t3, 0x0000($a1) ## 00000000 /* 05340 80B41520 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 05344 80B41524 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05348 80B41528 00613024 */ and $a2, $v1, $at +/* 05348 80B41528 00613024 */ and $a2, $v1, $at /* 0534C 80B4152C 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 05350 80B41530 01666021 */ addu $t4, $t3, $a2 -/* 05354 80B41534 01876821 */ addu $t5, $t4, $a3 +/* 05350 80B41530 01666021 */ addu $t4, $t3, $a2 +/* 05354 80B41534 01876821 */ addu $t5, $t4, $a3 /* 05358 80B41538 AC8D0004 */ sw $t5, 0x0004($a0) ## 00000004 /* 0535C 80B4153C 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 05360 80B41540 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -42,29 +42,29 @@ glabel func_80B414AC /* 0536C 80B4154C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 05370 80B41550 AC8F0000 */ sw $t7, 0x0000($a0) ## 00000000 /* 05374 80B41554 8CB80000 */ lw $t8, 0x0000($a1) ## 00000000 -/* 05378 80B41558 0306C821 */ addu $t9, $t8, $a2 -/* 0537C 80B4155C 03274021 */ addu $t0, $t9, $a3 +/* 05378 80B41558 0306C821 */ addu $t9, $t8, $a2 +/* 0537C 80B4155C 03274021 */ addu $t0, $t9, $a3 /* 05380 80B41560 AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 05384 80B41564 8FA20068 */ lw $v0, 0x0068($sp) -/* 05388 80B41568 8FA4006C */ lw $a0, 0x006C($sp) +/* 05384 80B41564 8FA20068 */ lw $v0, 0x0068($sp) +/* 05388 80B41568 8FA4006C */ lw $a0, 0x006C($sp) /* 0538C 80B4156C 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E /* 05390 80B41570 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C /* 05394 80B41574 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 -/* 05398 80B41578 AFA00018 */ sw $zero, 0x0018($sp) -/* 0539C 80B4157C AFA00014 */ sw $zero, 0x0014($sp) -/* 053A0 80B41580 AFA00010 */ sw $zero, 0x0010($sp) -/* 053A4 80B41584 0C0286B2 */ jal func_800A1AC8 +/* 05398 80B41578 AFA00018 */ sw $zero, 0x0018($sp) +/* 0539C 80B4157C AFA00014 */ sw $zero, 0x0014($sp) +/* 053A0 80B41580 AFA00010 */ sw $zero, 0x0010($sp) +/* 053A4 80B41584 0C0286B2 */ jal SkelAnime_DrawSV /* 053A8 80B41588 2442014C */ addiu $v0, $v0, 0x014C ## $v0 = 0000014C /* 053AC 80B4158C 3C0680B4 */ lui $a2, %hi(D_80B42108) ## $a2 = 80B40000 /* 053B0 80B41590 24C62108 */ addiu $a2, $a2, %lo(D_80B42108) ## $a2 = 80B42108 /* 053B4 80B41594 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 053B8 80B41598 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 053BC 80B4159C 0C031AD5 */ jal func_800C6B54 +/* 053BC 80B4159C 0C031AD5 */ jal func_800C6B54 /* 053C0 80B415A0 24070356 */ addiu $a3, $zero, 0x0356 ## $a3 = 00000356 -/* 053C4 80B415A4 8FBF002C */ lw $ra, 0x002C($sp) -/* 053C8 80B415A8 8FB00028 */ lw $s0, 0x0028($sp) +/* 053C4 80B415A4 8FBF002C */ lw $ra, 0x002C($sp) +/* 053C8 80B415A8 8FB00028 */ lw $s0, 0x0028($sp) /* 053CC 80B415AC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 053D0 80B415B0 03E00008 */ jr $ra +/* 053D0 80B415B0 03E00008 */ jr $ra /* 053D4 80B415B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s index 61c190e026..fcff30de40 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s @@ -1,48 +1,48 @@ glabel func_80B41BA4 /* 059C4 80B41BA4 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 059C8 80B41BA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 059CC 80B41BAC AFB00028 */ sw $s0, 0x0028($sp) -/* 059D0 80B41BB0 AFA40078 */ sw $a0, 0x0078($sp) -/* 059D4 80B41BB4 AFA5007C */ sw $a1, 0x007C($sp) +/* 059C8 80B41BA8 AFBF002C */ sw $ra, 0x002C($sp) +/* 059CC 80B41BAC AFB00028 */ sw $s0, 0x0028($sp) +/* 059D0 80B41BB0 AFA40078 */ sw $a0, 0x0078($sp) +/* 059D4 80B41BB4 AFA5007C */ sw $a1, 0x007C($sp) /* 059D8 80B41BB8 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 059DC 80B41BBC 3C1880B4 */ lui $t8, %hi(D_80B41D6C) ## $t8 = 80B40000 /* 059E0 80B41BC0 3C0680B4 */ lui $a2, %hi(D_80B421A0) ## $a2 = 80B40000 -/* 059E4 80B41BC4 00027880 */ sll $t7, $v0, 2 -/* 059E8 80B41BC8 030FC021 */ addu $t8, $t8, $t7 -/* 059EC 80B41BCC 8F181D6C */ lw $t8, %lo(D_80B41D6C)($t8) +/* 059E4 80B41BC4 00027880 */ sll $t7, $v0, 2 +/* 059E8 80B41BC8 030FC021 */ addu $t8, $t8, $t7 +/* 059EC 80B41BCC 8F181D6C */ lw $t8, %lo(D_80B41D6C)($t8) /* 059F0 80B41BD0 24C621A0 */ addiu $a2, $a2, %lo(D_80B421A0) ## $a2 = 80B421A0 /* 059F4 80B41BD4 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD0 -/* 059F8 80B41BD8 AFB80068 */ sw $t8, 0x0068($sp) +/* 059F8 80B41BD8 AFB80068 */ sw $t8, 0x0068($sp) /* 059FC 80B41BDC 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 05A00 80B41BE0 2407048C */ addiu $a3, $zero, 0x048C ## $a3 = 0000048C -/* 05A04 80B41BE4 0C031AB1 */ jal func_800C6AC4 +/* 05A04 80B41BE4 0C031AB1 */ jal func_800C6AC4 /* 05A08 80B41BE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05A0C 80B41BEC 8FA40078 */ lw $a0, 0x0078($sp) -/* 05A10 80B41BF0 8FA5007C */ lw $a1, 0x007C($sp) -/* 05A14 80B41BF4 0C00BAF3 */ jal func_8002EBCC +/* 05A0C 80B41BEC 8FA40078 */ lw $a0, 0x0078($sp) +/* 05A10 80B41BF0 8FA5007C */ lw $a1, 0x007C($sp) +/* 05A14 80B41BF4 0C00BAF3 */ jal func_8002EBCC /* 05A18 80B41BF8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05A1C 80B41BFC 0C024F46 */ jal func_80093D18 +/* 05A1C 80B41BFC 0C024F46 */ jal func_80093D18 /* 05A20 80B41C00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A24 80B41C04 8FA70068 */ lw $a3, 0x0068($sp) +/* 05A24 80B41C04 8FA70068 */ lw $a3, 0x0068($sp) /* 05A28 80B41C08 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 05A2C 80B41C0C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 05A30 80B41C10 00075100 */ sll $t2, $a3, 4 -/* 05A34 80B41C14 000A5F02 */ srl $t3, $t2, 28 +/* 05A30 80B41C10 00075100 */ sll $t2, $a3, 4 +/* 05A34 80B41C14 000A5F02 */ srl $t3, $t2, 28 /* 05A38 80B41C18 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 05A3C 80B41C1C 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 /* 05A40 80B41C20 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 05A44 80B41C24 25AD6FA8 */ addiu $t5, $t5, 0x6FA8 ## $t5 = 80166FA8 -/* 05A48 80B41C28 000B6080 */ sll $t4, $t3, 2 +/* 05A48 80B41C28 000B6080 */ sll $t4, $t3, 2 /* 05A4C 80B41C2C 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 05A50 80B41C30 018D2021 */ addu $a0, $t4, $t5 +/* 05A50 80B41C30 018D2021 */ addu $a0, $t4, $t5 /* 05A54 80B41C34 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 05A58 80B41C38 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 /* 05A5C 80B41C3C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 05A60 80B41C40 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05A64 80B41C44 00E12824 */ and $a1, $a3, $at +/* 05A64 80B41C44 00E12824 */ and $a1, $a3, $at /* 05A68 80B41C48 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 05A6C 80B41C4C 01C57821 */ addu $t7, $t6, $a1 -/* 05A70 80B41C50 01E6C021 */ addu $t8, $t7, $a2 +/* 05A6C 80B41C4C 01C57821 */ addu $t7, $t6, $a1 +/* 05A70 80B41C50 01E6C021 */ addu $t8, $t7, $a2 /* 05A74 80B41C54 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 05A78 80B41C58 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 05A7C 80B41C5C 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 @@ -53,31 +53,31 @@ glabel func_80B41BA4 /* 05A90 80B41C70 8C890000 */ lw $t1, 0x0000($a0) ## 00000000 /* 05A94 80B41C74 3C0D80B4 */ lui $t5, %hi(func_80B41B0C) ## $t5 = 80B40000 /* 05A98 80B41C78 3C0C80B4 */ lui $t4, %hi(func_80B41A88) ## $t4 = 80B40000 -/* 05A9C 80B41C7C 01255021 */ addu $t2, $t1, $a1 -/* 05AA0 80B41C80 01465821 */ addu $t3, $t2, $a2 +/* 05A9C 80B41C7C 01255021 */ addu $t2, $t1, $a1 +/* 05AA0 80B41C80 01465821 */ addu $t3, $t2, $a2 /* 05AA4 80B41C84 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 05AA8 80B41C88 8FA30078 */ lw $v1, 0x0078($sp) +/* 05AA8 80B41C88 8FA30078 */ lw $v1, 0x0078($sp) /* 05AAC 80B41C8C 258C1A88 */ addiu $t4, $t4, %lo(func_80B41A88) ## $t4 = 80B41A88 /* 05AB0 80B41C90 25AD1B0C */ addiu $t5, $t5, %lo(func_80B41B0C) ## $t5 = 80B41B0C /* 05AB4 80B41C94 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 05AB8 80B41C98 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 05ABC 80B41C9C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 05AC0 80B41CA0 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 05AC4 80B41CA4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 05AC8 80B41CA8 AFAC0010 */ sw $t4, 0x0010($sp) -/* 05ACC 80B41CAC 8FA4007C */ lw $a0, 0x007C($sp) -/* 05AD0 80B41CB0 0C0286B2 */ jal func_800A1AC8 -/* 05AD4 80B41CB4 AFA30018 */ sw $v1, 0x0018($sp) +/* 05AC4 80B41CA4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 05AC8 80B41CA8 AFAC0010 */ sw $t4, 0x0010($sp) +/* 05ACC 80B41CAC 8FA4007C */ lw $a0, 0x007C($sp) +/* 05AD0 80B41CB0 0C0286B2 */ jal SkelAnime_DrawSV +/* 05AD4 80B41CB4 AFA30018 */ sw $v1, 0x0018($sp) /* 05AD8 80B41CB8 3C0680B4 */ lui $a2, %hi(D_80B421B0) ## $a2 = 80B40000 /* 05ADC 80B41CBC 24C621B0 */ addiu $a2, $a2, %lo(D_80B421B0) ## $a2 = 80B421B0 /* 05AE0 80B41CC0 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD0 /* 05AE4 80B41CC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05AE8 80B41CC8 0C031AD5 */ jal func_800C6B54 +/* 05AE8 80B41CC8 0C031AD5 */ jal func_800C6B54 /* 05AEC 80B41CCC 240704B7 */ addiu $a3, $zero, 0x04B7 ## $a3 = 000004B7 -/* 05AF0 80B41CD0 8FBF002C */ lw $ra, 0x002C($sp) -/* 05AF4 80B41CD4 8FB00028 */ lw $s0, 0x0028($sp) +/* 05AF0 80B41CD0 8FBF002C */ lw $ra, 0x002C($sp) +/* 05AF4 80B41CD4 8FB00028 */ lw $s0, 0x0028($sp) /* 05AF8 80B41CD8 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 05AFC 80B41CDC 03E00008 */ jr $ra +/* 05AFC 80B41CDC 03E00008 */ jr $ra /* 05B00 80B41CE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s index 6d31919576..8fcda63aa5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s @@ -1,20 +1,20 @@ glabel EnZf_Draw /* 05888 80B498D8 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 0588C 80B498DC AFBF003C */ sw $ra, 0x003C($sp) -/* 05890 80B498E0 AFB10038 */ sw $s1, 0x0038($sp) -/* 05894 80B498E4 AFB00034 */ sw $s0, 0x0034($sp) -/* 05898 80B498E8 AFA50084 */ sw $a1, 0x0084($sp) +/* 0588C 80B498DC AFBF003C */ sw $ra, 0x003C($sp) +/* 05890 80B498E0 AFB10038 */ sw $s1, 0x0038($sp) +/* 05894 80B498E4 AFB00034 */ sw $s0, 0x0034($sp) +/* 05898 80B498E8 AFA50084 */ sw $a1, 0x0084($sp) /* 0589C 80B498EC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 058A0 80B498F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 058A4 80B498F4 3C0680B5 */ lui $a2, %hi(D_80B4A310) ## $a2 = 80B50000 /* 058A8 80B498F8 24C6A310 */ addiu $a2, $a2, %lo(D_80B4A310) ## $a2 = 80B4A310 /* 058AC 80B498FC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 058B0 80B49900 24070DCD */ addiu $a3, $zero, 0x0DCD ## $a3 = 00000DCD -/* 058B4 80B49904 0C031AB1 */ jal func_800C6AC4 +/* 058B4 80B49904 0C031AB1 */ jal func_800C6AC4 /* 058B8 80B49908 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 058BC 80B4990C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 058C0 80B49910 8FA50084 */ lw $a1, 0x0084($sp) -/* 058C4 80B49914 0C00BAF3 */ jal func_8002EBCC +/* 058C0 80B49910 8FA50084 */ lw $a1, 0x0084($sp) +/* 058C4 80B49914 0C00BAF3 */ jal func_8002EBCC /* 058C8 80B49918 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 058CC 80B4991C 3C0480B5 */ lui $a0, %hi(D_80B4A2F8) ## $a0 = 80B50000 /* 058D0 80B49920 3C0FD700 */ lui $t7, 0xD700 ## $t7 = D7000000 @@ -29,7 +29,7 @@ glabel EnZf_Draw /* 058F4 80B49944 844906D4 */ lh $t1, 0x06D4($v0) ## 801606D4 /* 058F8 80B49948 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 058FC 80B4994C 3319FFFF */ andi $t9, $t8, 0xFFFF ## $t9 = 00000000 -/* 05900 80B49950 00095400 */ sll $t2, $t1, 16 +/* 05900 80B49950 00095400 */ sll $t2, $t1, 16 /* 05904 80B49954 032A5825 */ or $t3, $t9, $t2 ## $t3 = 00000000 /* 05908 80B49958 AC8B0004 */ sw $t3, 0x0004($a0) ## 80B4A2FC /* 0590C 80B4995C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 @@ -38,11 +38,11 @@ glabel EnZf_Draw /* 05918 80B49968 AC440004 */ sw $a0, 0x0004($v0) ## 80160004 /* 0591C 80B4996C AC4D0000 */ sw $t5, 0x0000($v0) ## 80160000 /* 05920 80B49970 920E0404 */ lbu $t6, 0x0404($s0) ## 00000404 -/* 05924 80B49974 8FAF0084 */ lw $t7, 0x0084($sp) -/* 05928 80B49978 8FA90084 */ lw $t1, 0x0084($sp) -/* 0592C 80B4997C 15C10047 */ bne $t6, $at, .L80B49A9C +/* 05924 80B49974 8FAF0084 */ lw $t7, 0x0084($sp) +/* 05928 80B49978 8FA90084 */ lw $t1, 0x0084($sp) +/* 0592C 80B4997C 15C10047 */ bne $t6, $at, .L80B49A9C /* 05930 80B49980 00000000 */ nop -/* 05934 80B49984 0C024F46 */ jal func_80093D18 +/* 05934 80B49984 0C024F46 */ jal func_80093D18 /* 05938 80B49988 8DE40000 */ lw $a0, 0x0000($t7) ## D7000002 /* 0593C 80B4998C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 05940 80B49990 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 @@ -64,18 +64,18 @@ glabel EnZf_Draw /* 05980 80B499D0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05984 80B499D4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 05988 80B499D8 25AD9688 */ addiu $t5, $t5, %lo(func_80B49688) ## $t5 = 80B49688 -/* 0598C 80B499DC AFAD0010 */ sw $t5, 0x0010($sp) -/* 05990 80B499E0 AFB00014 */ sw $s0, 0x0014($sp) +/* 0598C 80B499DC AFAD0010 */ sw $t5, 0x0010($sp) +/* 05990 80B499E0 AFB00014 */ sw $s0, 0x0014($sp) /* 05994 80B499E4 8E2E02C0 */ lw $t6, 0x02C0($s1) ## 000002C0 /* 05998 80B499E8 3C0780B5 */ lui $a3, %hi(func_80B495FC) ## $a3 = 80B50000 /* 0599C 80B499EC 24E795FC */ addiu $a3, $a3, %lo(func_80B495FC) ## $a3 = 80B495FC -/* 059A0 80B499F0 8FA40084 */ lw $a0, 0x0084($sp) -/* 059A4 80B499F4 0C0288A2 */ jal func_800A2288 -/* 059A8 80B499F8 AFAE0018 */ sw $t6, 0x0018($sp) +/* 059A0 80B499F0 8FA40084 */ lw $a0, 0x0084($sp) +/* 059A4 80B499F4 0C0288A2 */ jal SkelAnime_Draw2 +/* 059A8 80B499F8 AFAE0018 */ sw $t6, 0x0018($sp) /* 059AC 80B499FC AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 /* 059B0 80B49A00 860F03F6 */ lh $t7, 0x03F6($s0) ## 000003F6 -/* 059B4 80B49A04 51E0004B */ beql $t7, $zero, .L80B49B34 -/* 059B8 80B49A08 8FAA0084 */ lw $t2, 0x0084($sp) +/* 059B4 80B49A04 51E0004B */ beql $t7, $zero, .L80B49B34 +/* 059B8 80B49A08 8FAA0084 */ lw $t2, 0x0084($sp) /* 059BC 80B49A0C 860903F6 */ lh $t1, 0x03F6($s0) ## 000003F6 /* 059C0 80B49A10 92180114 */ lbu $t8, 0x0114($s0) ## 00000114 /* 059C4 80B49A14 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 @@ -85,35 +85,35 @@ glabel EnZf_Draw /* 059D4 80B49A24 27080001 */ addiu $t0, $t8, 0x0001 ## $t0 = 00000001 /* 059D8 80B49A28 A2080114 */ sb $t0, 0x0114($s0) ## 00000114 /* 059DC 80B49A2C 306A0003 */ andi $t2, $v1, 0x0003 ## $t2 = 00000000 -/* 059E0 80B49A30 1540003F */ bne $t2, $zero, .L80B49B30 -/* 059E4 80B49A34 00031083 */ sra $v0, $v1, 2 -/* 059E8 80B49A38 00025880 */ sll $t3, $v0, 2 -/* 059EC 80B49A3C 01625823 */ subu $t3, $t3, $v0 +/* 059E0 80B49A30 1540003F */ bne $t2, $zero, .L80B49B30 +/* 059E4 80B49A34 00031083 */ sra $v0, $v1, 2 +/* 059E8 80B49A38 00025880 */ sll $t3, $v0, 2 +/* 059EC 80B49A3C 01625823 */ subu $t3, $t3, $v0 /* 059F0 80B49A40 3C0180B5 */ lui $at, %hi(D_80B4A444) ## $at = 80B50000 -/* 059F4 80B49A44 C424A444 */ lwc1 $f4, %lo(D_80B4A444)($at) -/* 059F8 80B49A48 000B5880 */ sll $t3, $t3, 2 -/* 059FC 80B49A4C 020B3021 */ addu $a2, $s0, $t3 +/* 059F4 80B49A44 C424A444 */ lwc1 $f4, %lo(D_80B4A444)($at) +/* 059F8 80B49A48 000B5880 */ sll $t3, $t3, 2 +/* 059FC 80B49A4C 020B3021 */ addu $a2, $s0, $t3 /* 05A00 80B49A50 240C0096 */ addiu $t4, $zero, 0x0096 ## $t4 = 00000096 /* 05A04 80B49A54 240D0096 */ addiu $t5, $zero, 0x0096 ## $t5 = 00000096 /* 05A08 80B49A58 240E00FA */ addiu $t6, $zero, 0x00FA ## $t6 = 000000FA /* 05A0C 80B49A5C 240F00EB */ addiu $t7, $zero, 0x00EB ## $t7 = 000000EB /* 05A10 80B49A60 241800F5 */ addiu $t8, $zero, 0x00F5 ## $t8 = 000000F5 /* 05A14 80B49A64 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 05A18 80B49A68 AFA80024 */ sw $t0, 0x0024($sp) -/* 05A1C 80B49A6C AFB80020 */ sw $t8, 0x0020($sp) -/* 05A20 80B49A70 AFAF001C */ sw $t7, 0x001C($sp) -/* 05A24 80B49A74 AFAE0018 */ sw $t6, 0x0018($sp) -/* 05A28 80B49A78 AFAD0014 */ sw $t5, 0x0014($sp) -/* 05A2C 80B49A7C AFAC0010 */ sw $t4, 0x0010($sp) +/* 05A18 80B49A68 AFA80024 */ sw $t0, 0x0024($sp) +/* 05A1C 80B49A6C AFB80020 */ sw $t8, 0x0020($sp) +/* 05A20 80B49A70 AFAF001C */ sw $t7, 0x001C($sp) +/* 05A24 80B49A74 AFAE0018 */ sw $t6, 0x0018($sp) +/* 05A28 80B49A78 AFAD0014 */ sw $t5, 0x0014($sp) +/* 05A2C 80B49A7C AFAC0010 */ sw $t4, 0x0010($sp) /* 05A30 80B49A80 24C604FC */ addiu $a2, $a2, 0x04FC ## $a2 = 000004FC -/* 05A34 80B49A84 8FA40084 */ lw $a0, 0x0084($sp) +/* 05A34 80B49A84 8FA40084 */ lw $a0, 0x0084($sp) /* 05A38 80B49A88 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 05A3C 80B49A8C 0C00A850 */ jal func_8002A140 -/* 05A40 80B49A90 E7A40028 */ swc1 $f4, 0x0028($sp) -/* 05A44 80B49A94 10000027 */ beq $zero, $zero, .L80B49B34 -/* 05A48 80B49A98 8FAA0084 */ lw $t2, 0x0084($sp) +/* 05A3C 80B49A8C 0C00A850 */ jal func_8002A140 +/* 05A40 80B49A90 E7A40028 */ swc1 $f4, 0x0028($sp) +/* 05A44 80B49A94 10000027 */ beq $zero, $zero, .L80B49B34 +/* 05A48 80B49A98 8FAA0084 */ lw $t2, 0x0084($sp) .L80B49A9C: -/* 05A4C 80B49A9C 0C024F61 */ jal func_80093D84 +/* 05A4C 80B49A9C 0C024F61 */ jal func_80093D84 /* 05A50 80B49AA0 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 /* 05A54 80B49AA4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 05A58 80B49AA8 3C0AE700 */ lui $t2, 0xE700 ## $t2 = E7000000 @@ -141,28 +141,28 @@ glabel EnZf_Draw /* 05AB0 80B49B00 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 05AB4 80B49B04 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05AB8 80B49B08 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05ABC 80B49B0C AFB00014 */ sw $s0, 0x0014($sp) -/* 05AC0 80B49B10 AFA90010 */ sw $t1, 0x0010($sp) +/* 05ABC 80B49B0C AFB00014 */ sw $s0, 0x0014($sp) +/* 05AC0 80B49B10 AFA90010 */ sw $t1, 0x0010($sp) /* 05AC4 80B49B14 8E3902D0 */ lw $t9, 0x02D0($s1) ## 000002D0 /* 05AC8 80B49B18 3C0780B5 */ lui $a3, %hi(func_80B495FC) ## $a3 = 80B50000 /* 05ACC 80B49B1C 24E795FC */ addiu $a3, $a3, %lo(func_80B495FC) ## $a3 = 80B495FC -/* 05AD0 80B49B20 8FA40084 */ lw $a0, 0x0084($sp) -/* 05AD4 80B49B24 0C0288A2 */ jal func_800A2288 -/* 05AD8 80B49B28 AFB90018 */ sw $t9, 0x0018($sp) +/* 05AD0 80B49B20 8FA40084 */ lw $a0, 0x0084($sp) +/* 05AD4 80B49B24 0C0288A2 */ jal SkelAnime_Draw2 +/* 05AD8 80B49B28 AFB90018 */ sw $t9, 0x0018($sp) /* 05ADC 80B49B2C AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0 .L80B49B30: -/* 05AE0 80B49B30 8FAA0084 */ lw $t2, 0x0084($sp) +/* 05AE0 80B49B30 8FAA0084 */ lw $t2, 0x0084($sp) .L80B49B34: /* 05AE4 80B49B34 3C0680B5 */ lui $a2, %hi(D_80B4A320) ## $a2 = 80B50000 /* 05AE8 80B49B38 24C6A320 */ addiu $a2, $a2, %lo(D_80B4A320) ## $a2 = 80B4A320 /* 05AEC 80B49B3C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 05AF0 80B49B40 24070E11 */ addiu $a3, $zero, 0x0E11 ## $a3 = 00000E11 -/* 05AF4 80B49B44 0C031AD5 */ jal func_800C6B54 +/* 05AF4 80B49B44 0C031AD5 */ jal func_800C6B54 /* 05AF8 80B49B48 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 05AFC 80B49B4C 8FBF003C */ lw $ra, 0x003C($sp) -/* 05B00 80B49B50 8FB00034 */ lw $s0, 0x0034($sp) -/* 05B04 80B49B54 8FB10038 */ lw $s1, 0x0038($sp) -/* 05B08 80B49B58 03E00008 */ jr $ra +/* 05AFC 80B49B4C 8FBF003C */ lw $ra, 0x003C($sp) +/* 05B00 80B49B50 8FB00034 */ lw $s0, 0x0034($sp) +/* 05B04 80B49B54 8FB10038 */ lw $s1, 0x0038($sp) +/* 05B08 80B49B58 03E00008 */ jr $ra /* 05B0C 80B49B5C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s index 666bbc6068..3a2f6eaf6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s @@ -1,27 +1,27 @@ glabel func_80B456B4 /* 01664 80B456B4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01668 80B456B8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0166C 80B456BC AFA5002C */ sw $a1, 0x002C($sp) +/* 01668 80B456B8 AFB00018 */ sw $s0, 0x0018($sp) +/* 0166C 80B456BC AFA5002C */ sw $a1, 0x002C($sp) /* 01670 80B456C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01674 80B456C4 AFBF001C */ sw $ra, 0x001C($sp) +/* 01674 80B456C4 AFBF001C */ sw $ra, 0x001C($sp) /* 01678 80B456C8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0167C 80B456CC 24A58138 */ addiu $a1, $a1, 0x8138 ## $a1 = 06008138 /* 01680 80B456D0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01684 80B456D4 0C0294D3 */ jal func_800A534C +/* 01684 80B456D4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01688 80B456D8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 0168C 80B456DC 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 01690 80B456E0 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 01694 80B456E4 AE0E03DC */ sw $t6, 0x03DC($s0) ## 000003DC -/* 01698 80B456E8 05E0000C */ bltz $t7, .L80B4571C +/* 01698 80B456E8 05E0000C */ bltz $t7, .L80B4571C /* 0169C 80B456EC 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 016A0 80B456F0 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE -/* 016A4 80B456F4 0C2D11AA */ jal func_80B446A8 -/* 016A8 80B456F8 AFA40024 */ sw $a0, 0x0024($sp) -/* 016AC 80B456FC 8FA40024 */ lw $a0, 0x0024($sp) +/* 016A4 80B456F4 0C2D11AA */ jal func_80B446A8 +/* 016A8 80B456F8 AFA40024 */ sw $a0, 0x0024($sp) +/* 016AC 80B456FC 8FA40024 */ lw $a0, 0x0024($sp) /* 016B0 80B45700 A60203FE */ sh $v0, 0x03FE($s0) ## 000003FE -/* 016B4 80B45704 8FA7002C */ lw $a3, 0x002C($sp) +/* 016B4 80B45704 8FA7002C */ lw $a3, 0x002C($sp) /* 016B8 80B45708 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE -/* 016BC 80B4570C 0C2D12C5 */ jal func_80B44B14 +/* 016BC 80B4570C 0C2D12C5 */ jal func_80B44B14 /* 016C0 80B45710 86060400 */ lh $a2, 0x0400($s0) ## 00000400 /* 016C4 80B45714 A6020402 */ sh $v0, 0x0402($s0) ## 00000402 /* 016C8 80B45718 AE0003E4 */ sw $zero, 0x03E4($s0) ## 000003E4 @@ -30,12 +30,12 @@ glabel func_80B456B4 /* 016D0 80B45720 3C0580B4 */ lui $a1, %hi(func_80B45748) ## $a1 = 80B40000 /* 016D4 80B45724 24A55748 */ addiu $a1, $a1, %lo(func_80B45748) ## $a1 = 80B45748 /* 016D8 80B45728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016DC 80B4572C 0C2D1014 */ jal func_80B44050 +/* 016DC 80B4572C 0C2D1014 */ jal func_80B44050 /* 016E0 80B45730 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 016E4 80B45734 8FBF001C */ lw $ra, 0x001C($sp) -/* 016E8 80B45738 8FB00018 */ lw $s0, 0x0018($sp) +/* 016E4 80B45734 8FBF001C */ lw $ra, 0x001C($sp) +/* 016E8 80B45738 8FB00018 */ lw $s0, 0x0018($sp) /* 016EC 80B4573C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 016F0 80B45740 03E00008 */ jr $ra +/* 016F0 80B45740 03E00008 */ jr $ra /* 016F4 80B45744 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s index 2972edb0e0..cd8fae9d21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s @@ -1,22 +1,22 @@ glabel func_80B4604C /* 01FFC 80B4604C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02000 80B46050 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02000 80B46050 AFBF0014 */ sw $ra, 0x0014($sp) /* 02004 80B46054 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 02008 80B46058 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0200C 80B4605C 24A58138 */ addiu $a1, $a1, 0x8138 ## $a1 = 06008138 -/* 02010 80B46060 AFA70018 */ sw $a3, 0x0018($sp) +/* 02010 80B46060 AFA70018 */ sw $a3, 0x0018($sp) /* 02014 80B46064 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02018 80B46068 0C0294D3 */ jal func_800A534C +/* 02018 80B46068 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0201C 80B4606C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 02020 80B46070 8FA40018 */ lw $a0, 0x0018($sp) +/* 02020 80B46070 8FA40018 */ lw $a0, 0x0018($sp) /* 02024 80B46074 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 02028 80B46078 3C0580B4 */ lui $a1, %hi(func_80B46098) ## $a1 = 80B40000 /* 0202C 80B4607C 24A56098 */ addiu $a1, $a1, %lo(func_80B46098) ## $a1 = 80B46098 -/* 02030 80B46080 0C2D1014 */ jal func_80B44050 +/* 02030 80B46080 0C2D1014 */ jal func_80B44050 /* 02034 80B46084 AC8E03DC */ sw $t6, 0x03DC($a0) ## 000003DC -/* 02038 80B46088 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02038 80B46088 8FBF0014 */ lw $ra, 0x0014($sp) /* 0203C 80B4608C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02040 80B46090 03E00008 */ jr $ra +/* 02040 80B46090 03E00008 */ jr $ra /* 02044 80B46094 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s index 70ac7a49a7..99f753eb3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s @@ -1,38 +1,38 @@ glabel func_80B462E4 /* 02294 80B462E4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02298 80B462E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0229C 80B462EC AFB00018 */ sw $s0, 0x0018($sp) -/* 022A0 80B462F0 AFA50024 */ sw $a1, 0x0024($sp) +/* 02298 80B462E8 AFBF001C */ sw $ra, 0x001C($sp) +/* 0229C 80B462EC AFB00018 */ sw $s0, 0x0018($sp) +/* 022A0 80B462F0 AFA50024 */ sw $a1, 0x0024($sp) /* 022A4 80B462F4 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 022A8 80B462F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 022AC 80B462FC 05C00012 */ bltz $t6, .L80B46348 +/* 022AC 80B462FC 05C00012 */ bltz $t6, .L80B46348 /* 022B0 80B46300 00000000 */ nop /* 022B4 80B46304 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 /* 022B8 80B46308 3C064220 */ lui $a2, 0x4220 ## $a2 = 42200000 /* 022BC 80B4630C 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF -/* 022C0 80B46310 00073C00 */ sll $a3, $a3, 16 -/* 022C4 80B46314 0C00CE6E */ jal func_800339B8 -/* 022C8 80B46318 00073C03 */ sra $a3, $a3, 16 -/* 022CC 80B4631C 1440000A */ bne $v0, $zero, .L80B46348 +/* 022C0 80B46310 00073C00 */ sll $a3, $a3, 16 +/* 022C4 80B46314 0C00CE6E */ jal func_800339B8 +/* 022C8 80B46318 00073C03 */ sra $a3, $a3, 16 +/* 022CC 80B4631C 1440000A */ bne $v0, $zero, .L80B46348 /* 022D0 80B46320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 022D4 80B46324 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 022D8 80B46328 8FA50024 */ lw $a1, 0x0024($sp) +/* 022D8 80B46328 8FA50024 */ lw $a1, 0x0024($sp) /* 022DC 80B4632C 3C06C220 */ lui $a2, 0xC220 ## $a2 = C2200000 /* 022E0 80B46330 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF -/* 022E4 80B46334 00073C00 */ sll $a3, $a3, 16 -/* 022E8 80B46338 0C00CE6E */ jal func_800339B8 -/* 022EC 80B4633C 00073C03 */ sra $a3, $a3, 16 -/* 022F0 80B46340 10400021 */ beq $v0, $zero, .L80B463C8 +/* 022E4 80B46334 00073C00 */ sll $a3, $a3, 16 +/* 022E8 80B46338 0C00CE6E */ jal func_800339B8 +/* 022EC 80B4633C 00073C03 */ sra $a3, $a3, 16 +/* 022F0 80B46340 10400021 */ beq $v0, $zero, .L80B463C8 /* 022F4 80B46344 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B46348: /* 022F8 80B46348 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 022FC 80B4634C 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 -/* 02300 80B46350 0C0294BE */ jal func_800A52F8 +/* 02300 80B46350 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 02304 80B46354 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02308 80B46358 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 0230C 80B4635C 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 /* 02310 80B46360 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 02314 80B46364 00000000 */ nop /* 02318 80B46368 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 /* 0231C 80B4636C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 @@ -43,30 +43,30 @@ glabel func_80B462E4 /* 0232C 80B4637C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 02330 80B46380 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 02334 80B46384 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 02338 80B46388 46040182 */ mul.s $f6, $f0, $f4 +/* 02338 80B46388 46040182 */ mul.s $f6, $f0, $f4 /* 0233C 80B4638C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 02340 80B46390 24080007 */ addiu $t0, $zero, 0x0007 ## $t0 = 00000007 /* 02344 80B46394 3C0580B4 */ lui $a1, %hi(func_80B463E4) ## $a1 = 80B40000 /* 02348 80B46398 AE0003E4 */ sw $zero, 0x03E4($s0) ## 000003E4 /* 0234C 80B4639C AE0803DC */ sw $t0, 0x03DC($s0) ## 000003DC /* 02350 80B463A0 24A563E4 */ addiu $a1, $a1, %lo(func_80B463E4) ## $a1 = 80B463E4 -/* 02354 80B463A4 46083280 */ add.s $f10, $f6, $f8 +/* 02354 80B463A4 46083280 */ add.s $f10, $f6, $f8 /* 02358 80B463A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0235C 80B463AC E6120408 */ swc1 $f18, 0x0408($s0) ## 00000408 -/* 02360 80B463B0 4600540D */ trunc.w.s $f16, $f10 -/* 02364 80B463B4 44198000 */ mfc1 $t9, $f16 -/* 02368 80B463B8 0C2D1014 */ jal func_80B44050 +/* 02360 80B463B0 4600540D */ trunc.w.s $f16, $f10 +/* 02364 80B463B4 44198000 */ mfc1 $t9, $f16 +/* 02368 80B463B8 0C2D1014 */ jal func_80B44050 /* 0236C 80B463BC AE1903F0 */ sw $t9, 0x03F0($s0) ## 000003F0 -/* 02370 80B463C0 10000004 */ beq $zero, $zero, .L80B463D4 -/* 02374 80B463C4 8FBF001C */ lw $ra, 0x001C($sp) +/* 02370 80B463C0 10000004 */ beq $zero, $zero, .L80B463D4 +/* 02374 80B463C4 8FBF001C */ lw $ra, 0x001C($sp) .L80B463C8: -/* 02378 80B463C8 0C2D15AD */ jal func_80B456B4 -/* 0237C 80B463CC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02380 80B463D0 8FBF001C */ lw $ra, 0x001C($sp) +/* 02378 80B463C8 0C2D15AD */ jal func_80B456B4 +/* 0237C 80B463CC 8FA50024 */ lw $a1, 0x0024($sp) +/* 02380 80B463D0 8FBF001C */ lw $ra, 0x001C($sp) .L80B463D4: -/* 02384 80B463D4 8FB00018 */ lw $s0, 0x0018($sp) +/* 02384 80B463D4 8FB00018 */ lw $s0, 0x0018($sp) /* 02388 80B463D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0238C 80B463DC 03E00008 */ jr $ra +/* 0238C 80B463DC 03E00008 */ jr $ra /* 02390 80B463E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s index 400f8bcbbb..c9ce1b34ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s @@ -1,76 +1,76 @@ glabel func_80B483E4 /* 04394 80B483E4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 04398 80B483E8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0439C 80B483EC AFB00020 */ sw $s0, 0x0020($sp) -/* 043A0 80B483F0 AFA50034 */ sw $a1, 0x0034($sp) +/* 04398 80B483E8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0439C 80B483EC AFB00020 */ sw $s0, 0x0020($sp) +/* 043A0 80B483F0 AFA50034 */ sw $a1, 0x0034($sp) /* 043A4 80B483F4 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 043A8 80B483F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 043AC 80B483FC 05C00012 */ bltz $t6, .L80B48448 +/* 043AC 80B483FC 05C00012 */ bltz $t6, .L80B48448 /* 043B0 80B48400 00000000 */ nop /* 043B4 80B48404 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 /* 043B8 80B48408 3C064220 */ lui $a2, 0x4220 ## $a2 = 42200000 /* 043BC 80B4840C 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF -/* 043C0 80B48410 00073C00 */ sll $a3, $a3, 16 -/* 043C4 80B48414 0C00CE6E */ jal func_800339B8 -/* 043C8 80B48418 00073C03 */ sra $a3, $a3, 16 -/* 043CC 80B4841C 1440000A */ bne $v0, $zero, .L80B48448 +/* 043C0 80B48410 00073C00 */ sll $a3, $a3, 16 +/* 043C4 80B48414 0C00CE6E */ jal func_800339B8 +/* 043C8 80B48418 00073C03 */ sra $a3, $a3, 16 +/* 043CC 80B4841C 1440000A */ bne $v0, $zero, .L80B48448 /* 043D0 80B48420 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 043D4 80B48424 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 043D8 80B48428 8FA50034 */ lw $a1, 0x0034($sp) +/* 043D8 80B48428 8FA50034 */ lw $a1, 0x0034($sp) /* 043DC 80B4842C 3C06C220 */ lui $a2, 0xC220 ## $a2 = C2200000 /* 043E0 80B48430 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF -/* 043E4 80B48434 00073C00 */ sll $a3, $a3, 16 -/* 043E8 80B48438 0C00CE6E */ jal func_800339B8 -/* 043EC 80B4843C 00073C03 */ sra $a3, $a3, 16 -/* 043F0 80B48440 10400046 */ beq $v0, $zero, .L80B4855C +/* 043E4 80B48434 00073C00 */ sll $a3, $a3, 16 +/* 043E8 80B48438 0C00CE6E */ jal func_800339B8 +/* 043EC 80B4843C 00073C03 */ sra $a3, $a3, 16 +/* 043F0 80B48440 10400046 */ beq $v0, $zero, .L80B4855C /* 043F4 80B48444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B48448: /* 043F8 80B48448 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 043FC 80B4844C 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 -/* 04400 80B48450 0C0294BE */ jal func_800A52F8 +/* 04400 80B48450 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 04404 80B48454 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04408 80B48458 8FAF0034 */ lw $t7, 0x0034($sp) +/* 04408 80B48458 8FAF0034 */ lw $t7, 0x0034($sp) /* 0440C 80B4845C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 04410 80B48460 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 04414 80B48464 8DF81C44 */ lw $t8, 0x1C44($t7) ## 00001C44 /* 04418 80B48468 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0441C 80B4846C 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 04420 80B48470 AFB80028 */ sw $t8, 0x0028($sp) +/* 04420 80B48470 AFB80028 */ sw $t8, 0x0028($sp) /* 04424 80B48474 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 04428 80B48478 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0442C 80B4847C AFB90010 */ sw $t9, 0x0010($sp) -/* 04430 80B48480 8FA80028 */ lw $t0, 0x0028($sp) + +/* 0442C 80B4847C AFB90010 */ sw $t9, 0x0010($sp) +/* 04430 80B48480 8FA80028 */ lw $t0, 0x0028($sp) /* 04434 80B48484 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 /* 04438 80B48488 850300B6 */ lh $v1, 0x00B6($t0) ## 000000B6 -/* 0443C 80B4848C 00692023 */ subu $a0, $v1, $t1 -/* 04440 80B48490 00042400 */ sll $a0, $a0, 16 -/* 04444 80B48494 00042403 */ sra $a0, $a0, 16 +/* 0443C 80B4848C 00692023 */ subu $a0, $v1, $t1 +/* 04440 80B48490 00042400 */ sll $a0, $a0, 16 +/* 04444 80B48494 00042403 */ sra $a0, $a0, 16 /* 04448 80B48498 0C01DE1C */ jal Math_Sins ## sins? -/* 0444C 80B4849C A7A3002E */ sh $v1, 0x002E($sp) +/* 0444C 80B4849C A7A3002E */ sh $v1, 0x002E($sp) /* 04450 80B484A0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 04454 80B484A4 87A3002E */ lh $v1, 0x002E($sp) +/* 04454 80B484A4 87A3002E */ lh $v1, 0x002E($sp) /* 04458 80B484A8 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 0445C 80B484AC 4600103E */ c.le.s $f2, $f0 +/* 0445C 80B484AC 4600103E */ c.le.s $f2, $f0 /* 04460 80B484B0 00000000 */ nop -/* 04464 80B484B4 45020005 */ bc1fl .L80B484CC +/* 04464 80B484B4 45020005 */ bc1fl .L80B484CC /* 04468 80B484B8 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 /* 0446C 80B484BC 44812000 */ mtc1 $at, $f4 ## $f4 = -6.00 -/* 04470 80B484C0 1000000F */ beq $zero, $zero, .L80B48500 +/* 04470 80B484C0 1000000F */ beq $zero, $zero, .L80B48500 /* 04474 80B484C4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 04478 80B484C8 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 .L80B484CC: -/* 0447C 80B484CC 006A2023 */ subu $a0, $v1, $t2 -/* 04480 80B484D0 00042400 */ sll $a0, $a0, 16 +/* 0447C 80B484CC 006A2023 */ subu $a0, $v1, $t2 +/* 04480 80B484D0 00042400 */ sll $a0, $a0, 16 /* 04484 80B484D4 0C01DE1C */ jal Math_Sins ## sins? -/* 04488 80B484D8 00042403 */ sra $a0, $a0, 16 +/* 04488 80B484D8 00042403 */ sra $a0, $a0, 16 /* 0448C 80B484DC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 04490 80B484E0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 04494 80B484E4 4602003C */ c.lt.s $f0, $f2 +/* 04494 80B484E4 4602003C */ c.lt.s $f0, $f2 /* 04498 80B484E8 00000000 */ nop -/* 0449C 80B484EC 45020005 */ bc1fl .L80B48504 +/* 0449C 80B484EC 45020005 */ bc1fl .L80B48504 /* 044A0 80B484F0 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 /* 044A4 80B484F4 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 /* 044A8 80B484F8 00000000 */ nop @@ -88,27 +88,27 @@ glabel func_80B483E4 /* 044CC 80B4851C 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 /* 044D0 80B48520 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 044D4 80B48524 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 044D8 80B48528 46080282 */ mul.s $f10, $f0, $f8 +/* 044D8 80B48528 46080282 */ mul.s $f10, $f0, $f8 /* 044DC 80B4852C 240F000C */ addiu $t7, $zero, 0x000C ## $t7 = 0000000C /* 044E0 80B48530 3C0580B5 */ lui $a1, %hi(func_80B48578) ## $a1 = 80B50000 /* 044E4 80B48534 AE0F03DC */ sw $t7, 0x03DC($s0) ## 000003DC /* 044E8 80B48538 24A58578 */ addiu $a1, $a1, %lo(func_80B48578) ## $a1 = 80B48578 /* 044EC 80B4853C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 044F0 80B48540 46105480 */ add.s $f18, $f10, $f16 -/* 044F4 80B48544 4600910D */ trunc.w.s $f4, $f18 -/* 044F8 80B48548 440E2000 */ mfc1 $t6, $f4 -/* 044FC 80B4854C 0C2D1014 */ jal func_80B44050 +/* 044F0 80B48540 46105480 */ add.s $f18, $f10, $f16 +/* 044F4 80B48544 4600910D */ trunc.w.s $f4, $f18 +/* 044F8 80B48548 440E2000 */ mfc1 $t6, $f4 +/* 044FC 80B4854C 0C2D1014 */ jal func_80B44050 /* 04500 80B48550 AE0E03F0 */ sw $t6, 0x03F0($s0) ## 000003F0 -/* 04504 80B48554 10000004 */ beq $zero, $zero, .L80B48568 -/* 04508 80B48558 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04504 80B48554 10000004 */ beq $zero, $zero, .L80B48568 +/* 04508 80B48558 8FBF0024 */ lw $ra, 0x0024($sp) .L80B4855C: -/* 0450C 80B4855C 0C2D15AD */ jal func_80B456B4 -/* 04510 80B48560 8FA50034 */ lw $a1, 0x0034($sp) -/* 04514 80B48564 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0450C 80B4855C 0C2D15AD */ jal func_80B456B4 +/* 04510 80B48560 8FA50034 */ lw $a1, 0x0034($sp) +/* 04514 80B48564 8FBF0024 */ lw $ra, 0x0024($sp) .L80B48568: -/* 04518 80B48568 8FB00020 */ lw $s0, 0x0020($sp) +/* 04518 80B48568 8FB00020 */ lw $s0, 0x0020($sp) /* 0451C 80B4856C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04520 80B48570 03E00008 */ jr $ra +/* 04520 80B48570 03E00008 */ jr $ra /* 04524 80B48574 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s index 6657869bc9..ea5802dcf9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s @@ -1,13 +1,13 @@ glabel func_80B49B60 /* 05B10 80B49B60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05B14 80B49B64 AFA5001C */ sw $a1, 0x001C($sp) -/* 05B18 80B49B68 AFBF0014 */ sw $ra, 0x0014($sp) +/* 05B14 80B49B64 AFA5001C */ sw $a1, 0x001C($sp) +/* 05B18 80B49B68 AFBF0014 */ sw $ra, 0x0014($sp) /* 05B1C 80B49B6C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 05B20 80B49B70 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 05B24 80B49B74 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 -/* 05B28 80B49B78 AFA70018 */ sw $a3, 0x0018($sp) +/* 05B28 80B49B78 AFA70018 */ sw $a3, 0x0018($sp) /* 05B2C 80B49B7C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05B30 80B49B80 0C0294D3 */ jal func_800A534C +/* 05B30 80B49B80 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 05B34 80B49B84 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 05B38 80B49B88 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -16,43 +16,43 @@ glabel func_80B49B60 /* 05B44 80B49B94 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 05B48 80B49B98 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 05B4C 80B49B9C 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 -/* 05B50 80B49BA0 46040182 */ mul.s $f6, $f0, $f4 -/* 05B54 80B49BA4 8FA70018 */ lw $a3, 0x0018($sp) +/* 05B50 80B49BA0 46040182 */ mul.s $f6, $f0, $f4 +/* 05B54 80B49BA4 8FA70018 */ lw $a3, 0x0018($sp) /* 05B58 80B49BA8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 05B5C 80B49BAC 3C0580B5 */ lui $a1, %hi(func_80B48578) ## $a1 = 80B50000 /* 05B60 80B49BB0 84F8001C */ lh $t8, 0x001C($a3) ## 0000001C /* 05B64 80B49BB4 240B000C */ addiu $t3, $zero, 0x000C ## $t3 = 0000000C /* 05B68 80B49BB8 24A58578 */ addiu $a1, $a1, %lo(func_80B48578) ## $a1 = 80B48578 -/* 05B6C 80B49BBC 46083280 */ add.s $f10, $f6, $f8 +/* 05B6C 80B49BBC 46083280 */ add.s $f10, $f6, $f8 /* 05B70 80B49BC0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 05B74 80B49BC4 4600540D */ trunc.w.s $f16, $f10 -/* 05B78 80B49BC8 440F8000 */ mfc1 $t7, $f16 -/* 05B7C 80B49BCC 1701000B */ bne $t8, $at, .L80B49BFC +/* 05B74 80B49BC4 4600540D */ trunc.w.s $f16, $f10 +/* 05B78 80B49BC8 440F8000 */ mfc1 $t7, $f16 +/* 05B7C 80B49BCC 1701000B */ bne $t8, $at, .L80B49BFC /* 05B80 80B49BD0 ACEF03F0 */ sw $t7, 0x03F0($a3) ## 000003F0 -/* 05B84 80B49BD4 C7A0001C */ lwc1 $f0, 0x001C($sp) +/* 05B84 80B49BD4 C7A0001C */ lwc1 $f0, 0x001C($sp) /* 05B88 80B49BD8 01E0C825 */ or $t9, $t7, $zero ## $t9 = 00000000 -/* 05B8C 80B49BDC 46000480 */ add.s $f18, $f0, $f0 +/* 05B8C 80B49BDC 46000480 */ add.s $f18, $f0, $f0 /* 05B90 80B49BE0 E4F20068 */ swc1 $f18, 0x0068($a3) ## 00000068 -/* 05B94 80B49BE4 07210003 */ bgez $t9, .L80B49BF4 -/* 05B98 80B49BE8 00194043 */ sra $t0, $t9, 1 +/* 05B94 80B49BE4 07210003 */ bgez $t9, .L80B49BF4 +/* 05B98 80B49BE8 00194043 */ sra $t0, $t9, 1 /* 05B9C 80B49BEC 27210001 */ addiu $at, $t9, 0x0001 ## $at = 00000001 -/* 05BA0 80B49BF0 00014043 */ sra $t0, $at, 1 +/* 05BA0 80B49BF0 00014043 */ sra $t0, $at, 1 .L80B49BF4: -/* 05BA4 80B49BF4 10000003 */ beq $zero, $zero, .L80B49C04 +/* 05BA4 80B49BF4 10000003 */ beq $zero, $zero, .L80B49C04 /* 05BA8 80B49BF8 ACE803F0 */ sw $t0, 0x03F0($a3) ## 000003F0 .L80B49BFC: -/* 05BAC 80B49BFC C7A4001C */ lwc1 $f4, 0x001C($sp) +/* 05BAC 80B49BFC C7A4001C */ lwc1 $f4, 0x001C($sp) /* 05BB0 80B49C00 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 .L80B49C04: /* 05BB4 80B49C04 84E900B6 */ lh $t1, 0x00B6($a3) ## 000000B6 /* 05BB8 80B49C08 ACE003E4 */ sw $zero, 0x03E4($a3) ## 000003E4 /* 05BBC 80B49C0C ACEB03DC */ sw $t3, 0x03DC($a3) ## 000003DC /* 05BC0 80B49C10 252A3FFF */ addiu $t2, $t1, 0x3FFF ## $t2 = 00003FFF -/* 05BC4 80B49C14 0C2D1014 */ jal func_80B44050 +/* 05BC4 80B49C14 0C2D1014 */ jal func_80B44050 /* 05BC8 80B49C18 A4EA0032 */ sh $t2, 0x0032($a3) ## 00000032 -/* 05BCC 80B49C1C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 05BCC 80B49C1C 8FBF0014 */ lw $ra, 0x0014($sp) /* 05BD0 80B49C20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05BD4 80B49C24 03E00008 */ jr $ra +/* 05BD4 80B49C24 03E00008 */ jr $ra /* 05BD8 80B49C28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s index 08c0b72015..73d37901fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s @@ -1,18 +1,18 @@ glabel EnZl1_Destroy /* 002A0 80B4ADE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002A4 80B4ADE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002A8 80B4ADE8 AFA40018 */ sw $a0, 0x0018($sp) -/* 002AC 80B4ADEC AFA5001C */ sw $a1, 0x001C($sp) -/* 002B0 80B4ADF0 0C0295BC */ jal func_800A56F0 +/* 002A4 80B4ADE4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 002A8 80B4ADE8 AFA40018 */ sw $a0, 0x0018($sp) +/* 002AC 80B4ADEC AFA5001C */ sw $a1, 0x001C($sp) +/* 002B0 80B4ADF0 0C0295BC */ jal SkelAnime_Free /* 002B4 80B4ADF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002B8 80B4ADF8 8FA50018 */ lw $a1, 0x0018($sp) -/* 002BC 80B4ADFC 8FA4001C */ lw $a0, 0x001C($sp) +/* 002B8 80B4ADF8 8FA50018 */ lw $a1, 0x0018($sp) +/* 002BC 80B4ADFC 8FA4001C */ lw $a0, 0x001C($sp) /* 002C0 80B4AE00 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 002C4 80B4AE04 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 002C8 80B4AE08 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002C8 80B4AE08 8FBF0014 */ lw $ra, 0x0014($sp) /* 002CC 80B4AE0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002D0 80B4AE10 03E00008 */ jr $ra +/* 002D0 80B4AE10 03E00008 */ jr $ra /* 002D4 80B4AE14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s index 31daec48e9..783e04ef71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s @@ -1,17 +1,17 @@ glabel EnZl1_Draw /* 0191C 80B4C45C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01920 80B4C460 AFBF002C */ sw $ra, 0x002C($sp) -/* 01924 80B4C464 AFB00028 */ sw $s0, 0x0028($sp) -/* 01928 80B4C468 AFA5005C */ sw $a1, 0x005C($sp) +/* 01920 80B4C460 AFBF002C */ sw $ra, 0x002C($sp) +/* 01924 80B4C464 AFB00028 */ sw $s0, 0x0028($sp) +/* 01928 80B4C468 AFA5005C */ sw $a1, 0x005C($sp) /* 0192C 80B4C46C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01930 80B4C470 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01934 80B4C474 3C0680B5 */ lui $a2, %hi(D_80B4E720) ## $a2 = 80B50000 /* 01938 80B4C478 24C6E720 */ addiu $a2, $a2, %lo(D_80B4E720) ## $a2 = 80B4E720 /* 0193C 80B4C47C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01940 80B4C480 240707DB */ addiu $a3, $zero, 0x07DB ## $a3 = 000007DB -/* 01944 80B4C484 0C031AB1 */ jal func_800C6AC4 -/* 01948 80B4C488 AFA50050 */ sw $a1, 0x0050($sp) -/* 0194C 80B4C48C 8FA80050 */ lw $t0, 0x0050($sp) +/* 01944 80B4C484 0C031AB1 */ jal func_800C6AC4 +/* 01948 80B4C488 AFA50050 */ sw $a1, 0x0050($sp) +/* 0194C 80B4C48C 8FA80050 */ lw $t0, 0x0050($sp) /* 01950 80B4C490 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01954 80B4C494 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 01958 80B4C498 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 @@ -23,15 +23,15 @@ glabel EnZl1_Draw /* 01970 80B4C4B0 8E0401F4 */ lw $a0, 0x01F4($s0) ## 000001F4 /* 01974 80B4C4B4 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 /* 01978 80B4C4B8 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 0197C 80B4C4BC 0004C900 */ sll $t9, $a0, 4 -/* 01980 80B4C4C0 00194F02 */ srl $t1, $t9, 28 -/* 01984 80B4C4C4 00095080 */ sll $t2, $t1, 2 -/* 01988 80B4C4C8 00AA5821 */ addu $t3, $a1, $t2 +/* 0197C 80B4C4BC 0004C900 */ sll $t9, $a0, 4 +/* 01980 80B4C4C0 00194F02 */ srl $t1, $t9, 28 +/* 01984 80B4C4C4 00095080 */ sll $t2, $t1, 2 +/* 01988 80B4C4C8 00AA5821 */ addu $t3, $a1, $t2 /* 0198C 80B4C4CC 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000000 -/* 01990 80B4C4D0 00866824 */ and $t5, $a0, $a2 +/* 01990 80B4C4D0 00866824 */ and $t5, $a0, $a2 /* 01994 80B4C4D4 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01998 80B4C4D8 018D7021 */ addu $t6, $t4, $t5 -/* 0199C 80B4C4DC 01C77821 */ addu $t7, $t6, $a3 +/* 01998 80B4C4D8 018D7021 */ addu $t6, $t4, $t5 +/* 0199C 80B4C4DC 01C77821 */ addu $t7, $t6, $a3 /* 019A0 80B4C4E0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 019A4 80B4C4E4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 019A8 80B4C4E8 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -40,15 +40,15 @@ glabel EnZl1_Draw /* 019B4 80B4C4F4 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 019B8 80B4C4F8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 019BC 80B4C4FC 8E0401F8 */ lw $a0, 0x01F8($s0) ## 000001F8 -/* 019C0 80B4C500 00044900 */ sll $t1, $a0, 4 -/* 019C4 80B4C504 00095702 */ srl $t2, $t1, 28 -/* 019C8 80B4C508 000A5880 */ sll $t3, $t2, 2 -/* 019CC 80B4C50C 00AB6021 */ addu $t4, $a1, $t3 +/* 019C0 80B4C500 00044900 */ sll $t1, $a0, 4 +/* 019C4 80B4C504 00095702 */ srl $t2, $t1, 28 +/* 019C8 80B4C508 000A5880 */ sll $t3, $t2, 2 +/* 019CC 80B4C50C 00AB6021 */ addu $t4, $a1, $t3 /* 019D0 80B4C510 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000000 -/* 019D4 80B4C514 00867024 */ and $t6, $a0, $a2 +/* 019D4 80B4C514 00867024 */ and $t6, $a0, $a2 /* 019D8 80B4C518 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 019DC 80B4C51C 01AE7821 */ addu $t7, $t5, $t6 -/* 019E0 80B4C520 01E7C021 */ addu $t8, $t7, $a3 +/* 019DC 80B4C51C 01AE7821 */ addu $t7, $t5, $t6 +/* 019E0 80B4C520 01E7C021 */ addu $t8, $t7, $a3 /* 019E4 80B4C524 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 019E8 80B4C528 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 019EC 80B4C52C 35290028 */ ori $t1, $t1, 0x0028 ## $t1 = DB060028 @@ -56,17 +56,17 @@ glabel EnZl1_Draw /* 019F4 80B4C534 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 /* 019F8 80B4C538 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 019FC 80B4C53C 8E0401EC */ lw $a0, 0x01EC($s0) ## 000001EC -/* 01A00 80B4C540 00045100 */ sll $t2, $a0, 4 -/* 01A04 80B4C544 000A5F02 */ srl $t3, $t2, 28 -/* 01A08 80B4C548 000B6080 */ sll $t4, $t3, 2 -/* 01A0C 80B4C54C 00AC6821 */ addu $t5, $a1, $t4 +/* 01A00 80B4C540 00045100 */ sll $t2, $a0, 4 +/* 01A04 80B4C544 000A5F02 */ srl $t3, $t2, 28 +/* 01A08 80B4C548 000B6080 */ sll $t4, $t3, 2 +/* 01A0C 80B4C54C 00AC6821 */ addu $t5, $a1, $t4 /* 01A10 80B4C550 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 -/* 01A14 80B4C554 00867824 */ and $t7, $a0, $a2 -/* 01A18 80B4C558 01CFC021 */ addu $t8, $t6, $t7 -/* 01A1C 80B4C55C 0307C821 */ addu $t9, $t8, $a3 +/* 01A14 80B4C554 00867824 */ and $t7, $a0, $a2 +/* 01A18 80B4C558 01CFC021 */ addu $t8, $t6, $t7 +/* 01A1C 80B4C55C 0307C821 */ addu $t9, $t8, $a3 /* 01A20 80B4C560 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01A24 80B4C564 8FA9005C */ lw $t1, 0x005C($sp) -/* 01A28 80B4C568 0C024F46 */ jal func_80093D18 +/* 01A24 80B4C564 8FA9005C */ lw $t1, 0x005C($sp) +/* 01A28 80B4C568 0C024F46 */ jal func_80093D18 /* 01A2C 80B4C56C 8D240000 */ lw $a0, 0x0000($t1) ## DB060028 /* 01A30 80B4C570 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 01A34 80B4C574 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -75,21 +75,21 @@ glabel EnZl1_Draw /* 01A40 80B4C580 3C0B80B5 */ lui $t3, %hi(func_80B4C400) ## $t3 = 80B50000 /* 01A44 80B4C584 256BC400 */ addiu $t3, $t3, %lo(func_80B4C400) ## $t3 = 80B4C400 /* 01A48 80B4C588 254AC340 */ addiu $t2, $t2, %lo(func_80B4C340) ## $t2 = 80B4C340 -/* 01A4C 80B4C58C AFAA0010 */ sw $t2, 0x0010($sp) -/* 01A50 80B4C590 AFAB0014 */ sw $t3, 0x0014($sp) -/* 01A54 80B4C594 AFB00018 */ sw $s0, 0x0018($sp) -/* 01A58 80B4C598 0C0286B2 */ jal func_800A1AC8 -/* 01A5C 80B4C59C 8FA4005C */ lw $a0, 0x005C($sp) -/* 01A60 80B4C5A0 8FAC005C */ lw $t4, 0x005C($sp) +/* 01A4C 80B4C58C AFAA0010 */ sw $t2, 0x0010($sp) +/* 01A50 80B4C590 AFAB0014 */ sw $t3, 0x0014($sp) +/* 01A54 80B4C594 AFB00018 */ sw $s0, 0x0018($sp) +/* 01A58 80B4C598 0C0286B2 */ jal SkelAnime_DrawSV +/* 01A5C 80B4C59C 8FA4005C */ lw $a0, 0x005C($sp) +/* 01A60 80B4C5A0 8FAC005C */ lw $t4, 0x005C($sp) /* 01A64 80B4C5A4 3C0680B5 */ lui $a2, %hi(D_80B4E730) ## $a2 = 80B50000 /* 01A68 80B4C5A8 24C6E730 */ addiu $a2, $a2, %lo(D_80B4E730) ## $a2 = 80B4E730 /* 01A6C 80B4C5AC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01A70 80B4C5B0 240707FE */ addiu $a3, $zero, 0x07FE ## $a3 = 000007FE -/* 01A74 80B4C5B4 0C031AD5 */ jal func_800C6B54 +/* 01A74 80B4C5B4 0C031AD5 */ jal func_800C6B54 /* 01A78 80B4C5B8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 01A7C 80B4C5BC 8FBF002C */ lw $ra, 0x002C($sp) -/* 01A80 80B4C5C0 8FB00028 */ lw $s0, 0x0028($sp) +/* 01A7C 80B4C5BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 01A80 80B4C5C0 8FB00028 */ lw $s0, 0x0028($sp) /* 01A84 80B4C5C4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01A88 80B4C5C8 03E00008 */ jr $ra +/* 01A88 80B4C5C8 03E00008 */ jr $ra /* 01A8C 80B4C5CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s index 5320a49788..883f82f316 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s @@ -1,184 +1,184 @@ glabel EnZl1_Init /* 00010 80B4AB50 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00014 80B4AB54 AFB00028 */ sw $s0, 0x0028($sp) +/* 00014 80B4AB54 AFB00028 */ sw $s0, 0x0028($sp) /* 00018 80B4AB58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 80B4AB5C AFBF002C */ sw $ra, 0x002C($sp) +/* 0001C 80B4AB5C AFBF002C */ sw $ra, 0x002C($sp) /* 00020 80B4AB60 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00024 80B4AB64 AFA50044 */ sw $a1, 0x0044($sp) +/* 00024 80B4AB64 AFA50044 */ sw $a1, 0x0044($sp) /* 00028 80B4AB68 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0002C 80B4AB6C 24842118 */ addiu $a0, $a0, 0x2118 ## $a0 = 06012118 /* 00030 80B4AB70 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00034 80B4AB74 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00038 80B4AB78 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0003C 80B4AB7C 468021A0 */ cvt.s.w $f6, $f4 +/* 0003C 80B4AB7C 468021A0 */ cvt.s.w $f6, $f4 /* 00040 80B4AB80 24C6F5D8 */ addiu $a2, $a2, 0xF5D8 ## $a2 = 0600F5D8 -/* 00044 80B4AB84 AFA50034 */ sw $a1, 0x0034($sp) -/* 00048 80B4AB88 8FA40044 */ lw $a0, 0x0044($sp) +/* 00044 80B4AB84 AFA50034 */ sw $a1, 0x0034($sp) +/* 00048 80B4AB88 8FA40044 */ lw $a0, 0x0044($sp) /* 0004C 80B4AB8C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00050 80B4AB90 AFA00010 */ sw $zero, 0x0010($sp) -/* 00054 80B4AB94 E7A6003C */ swc1 $f6, 0x003C($sp) -/* 00058 80B4AB98 AFA00014 */ sw $zero, 0x0014($sp) -/* 0005C 80B4AB9C 0C0291BE */ jal func_800A46F8 -/* 00060 80B4ABA0 AFA00018 */ sw $zero, 0x0018($sp) +/* 00050 80B4AB90 AFA00010 */ sw $zero, 0x0010($sp) +/* 00054 80B4AB94 E7A6003C */ swc1 $f6, 0x003C($sp) +/* 00058 80B4AB98 AFA00014 */ sw $zero, 0x0014($sp) +/* 0005C 80B4AB9C 0C0291BE */ jal SkelAnime_InitSV +/* 00060 80B4ABA0 AFA00018 */ sw $zero, 0x0018($sp) /* 00064 80B4ABA4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00068 80B4ABA8 C7A8003C */ lwc1 $f8, 0x003C($sp) +/* 00068 80B4ABA8 C7A8003C */ lwc1 $f8, 0x003C($sp) /* 0006C 80B4ABAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00070 80B4ABB0 44070000 */ mfc1 $a3, $f0 +/* 00070 80B4ABB0 44070000 */ mfc1 $a3, $f0 /* 00074 80B4ABB4 24A52118 */ addiu $a1, $a1, 0x2118 ## $a1 = 06012118 -/* 00078 80B4ABB8 8FA40034 */ lw $a0, 0x0034($sp) +/* 00078 80B4ABB8 8FA40034 */ lw $a0, 0x0034($sp) /* 0007C 80B4ABBC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00080 80B4ABC0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00084 80B4ABC4 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00080 80B4ABC0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00084 80B4ABC4 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00088 80B4ABC8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0008C 80B4ABCC E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 0008C 80B4ABCC E7A00018 */ swc1 $f0, 0x0018($sp) /* 00090 80B4ABD0 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00094 80B4ABD4 AFA50030 */ sw $a1, 0x0030($sp) +/* 00094 80B4ABD4 AFA50030 */ sw $a1, 0x0030($sp) /* 00098 80B4ABD8 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 0009C 80B4ABDC 8FA40044 */ lw $a0, 0x0044($sp) + +/* 0009C 80B4ABDC 8FA40044 */ lw $a0, 0x0044($sp) /* 000A0 80B4ABE0 3C0780B5 */ lui $a3, %hi(D_80B4E5F0) ## $a3 = 80B50000 -/* 000A4 80B4ABE4 8FA50030 */ lw $a1, 0x0030($sp) +/* 000A4 80B4ABE4 8FA50030 */ lw $a1, 0x0030($sp) /* 000A8 80B4ABE8 24E7E5F0 */ addiu $a3, $a3, %lo(D_80B4E5F0) ## $a3 = 80B4E5F0 -/* 000AC 80B4ABEC 8FA40044 */ lw $a0, 0x0044($sp) +/* 000AC 80B4ABEC 8FA40044 */ lw $a0, 0x0044($sp) /* 000B0 80B4ABF0 0C01712B */ jal ActorCollider_InitCylinder - + /* 000B4 80B4ABF4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B8 80B4ABF8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000BC 80B4ABFC 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000C0 80B4AC00 0C00B58B */ jal Actor_SetScale - + /* 000C4 80B4AC04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000C8 80B4AC08 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 000CC 80B4AC0C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 000D0 80B4AC10 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 000D4 80B4AC14 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 000D8 80B4AC18 0C00AC78 */ jal ActorShape_Init - + /* 000DC 80B4AC1C 3C0741C0 */ lui $a3, 0x41C0 ## $a3 = 41C00000 /* 000E0 80B4AC20 A200001F */ sb $zero, 0x001F($s0) ## 0000001F /* 000E4 80B4AC24 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 000E8 80B4AC28 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 /* 000EC 80B4AC2C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 000F0 80B4AC30 29C10004 */ slti $at, $t6, 0x0004 -/* 000F4 80B4AC34 14200014 */ bne $at, $zero, .L80B4AC88 +/* 000F0 80B4AC30 29C10004 */ slti $at, $t6, 0x0004 +/* 000F4 80B4AC34 14200014 */ bne $at, $zero, .L80B4AC88 /* 000F8 80B4AC38 00000000 */ nop /* 000FC 80B4AC3C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00100 80B4AC40 24840438 */ addiu $a0, $a0, 0x0438 ## $a0 = 06000438 /* 00104 80B4AC44 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00108 80B4AC48 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0010C 80B4AC4C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00110 80B4AC50 46805420 */ cvt.s.w $f16, $f10 -/* 00114 80B4AC54 44070000 */ mfc1 $a3, $f0 +/* 00110 80B4AC50 46805420 */ cvt.s.w $f16, $f10 +/* 00114 80B4AC54 44070000 */ mfc1 $a3, $f0 /* 00118 80B4AC58 24A50438 */ addiu $a1, $a1, 0x0438 ## $a1 = 06000438 -/* 0011C 80B4AC5C 8FA40034 */ lw $a0, 0x0034($sp) +/* 0011C 80B4AC5C 8FA40034 */ lw $a0, 0x0034($sp) /* 00120 80B4AC60 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00124 80B4AC64 AFA00014 */ sw $zero, 0x0014($sp) -/* 00128 80B4AC68 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00124 80B4AC64 AFA00014 */ sw $zero, 0x0014($sp) +/* 00128 80B4AC68 E7B00010 */ swc1 $f16, 0x0010($sp) /* 0012C 80B4AC6C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00130 80B4AC70 E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 00130 80B4AC70 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00134 80B4AC74 3C0F80B5 */ lui $t7, %hi(func_80B4BC78) ## $t7 = 80B50000 /* 00138 80B4AC78 25EFBC78 */ addiu $t7, $t7, %lo(func_80B4BC78) ## $t7 = 80B4BC78 /* 0013C 80B4AC7C A60001E6 */ sh $zero, 0x01E6($s0) ## 000001E6 -/* 00140 80B4AC80 10000052 */ beq $zero, $zero, .L80B4ADCC +/* 00140 80B4AC80 10000052 */ beq $zero, $zero, .L80B4ADCC /* 00144 80B4AC84 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 .L80B4AC88: /* 00148 80B4AC88 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0014C 80B4AC8C 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 00150 80B4AC90 1040000D */ beq $v0, $zero, .L80B4ACC8 +/* 00150 80B4AC90 1040000D */ beq $v0, $zero, .L80B4ACC8 /* 00154 80B4AC94 00000000 */ nop /* 00158 80B4AC98 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0015C 80B4AC9C 24040025 */ addiu $a0, $zero, 0x0025 ## $a0 = 00000025 -/* 00160 80B4ACA0 10400009 */ beq $v0, $zero, .L80B4ACC8 +/* 00160 80B4ACA0 10400009 */ beq $v0, $zero, .L80B4ACC8 /* 00164 80B4ACA4 00000000 */ nop /* 00168 80B4ACA8 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0016C 80B4ACAC 24040037 */ addiu $a0, $zero, 0x0037 ## $a0 = 00000037 -/* 00170 80B4ACB0 10400005 */ beq $v0, $zero, .L80B4ACC8 +/* 00170 80B4ACB0 10400005 */ beq $v0, $zero, .L80B4ACC8 /* 00174 80B4ACB4 00000000 */ nop /* 00178 80B4ACB8 0C00B55C */ jal Actor_Kill - + /* 0017C 80B4ACBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00180 80B4ACC0 10000043 */ beq $zero, $zero, .L80B4ADD0 -/* 00184 80B4ACC4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00180 80B4ACC0 10000043 */ beq $zero, $zero, .L80B4ADD0 +/* 00184 80B4ACC4 8FBF002C */ lw $ra, 0x002C($sp) .L80B4ACC8: /* 00188 80B4ACC8 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0018C 80B4ACCC 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 00190 80B4ACD0 10400005 */ beq $v0, $zero, .L80B4ACE8 +/* 00190 80B4ACD0 10400005 */ beq $v0, $zero, .L80B4ACE8 /* 00194 80B4ACD4 00000000 */ nop /* 00198 80B4ACD8 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0019C 80B4ACDC 24040025 */ addiu $a0, $zero, 0x0025 ## $a0 = 00000025 -/* 001A0 80B4ACE0 14400008 */ bne $v0, $zero, .L80B4AD04 +/* 001A0 80B4ACE0 14400008 */ bne $v0, $zero, .L80B4AD04 /* 001A4 80B4ACE4 00000000 */ nop .L80B4ACE8: /* 001A8 80B4ACE8 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 001AC 80B4ACEC 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 001B0 80B4ACF0 10400019 */ beq $v0, $zero, .L80B4AD58 +/* 001B0 80B4ACF0 10400019 */ beq $v0, $zero, .L80B4AD58 /* 001B4 80B4ACF4 00000000 */ nop /* 001B8 80B4ACF8 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 001BC 80B4ACFC 24040037 */ addiu $a0, $zero, 0x0037 ## $a0 = 00000037 -/* 001C0 80B4AD00 10400015 */ beq $v0, $zero, .L80B4AD58 +/* 001C0 80B4AD00 10400015 */ beq $v0, $zero, .L80B4AD58 .L80B4AD04: /* 001C4 80B4AD04 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 001C8 80B4AD08 0C028800 */ jal SkelAnime_GetFrameCount - + /* 001CC 80B4AD0C 24840438 */ addiu $a0, $a0, 0x0438 ## $a0 = 06000438 /* 001D0 80B4AD10 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 001D4 80B4AD14 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001D8 80B4AD18 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001DC 80B4AD1C 46809120 */ cvt.s.w $f4, $f18 -/* 001E0 80B4AD20 44070000 */ mfc1 $a3, $f0 +/* 001DC 80B4AD1C 46809120 */ cvt.s.w $f4, $f18 +/* 001E0 80B4AD20 44070000 */ mfc1 $a3, $f0 /* 001E4 80B4AD24 24A50438 */ addiu $a1, $a1, 0x0438 ## $a1 = 06000438 -/* 001E8 80B4AD28 8FA40034 */ lw $a0, 0x0034($sp) +/* 001E8 80B4AD28 8FA40034 */ lw $a0, 0x0034($sp) /* 001EC 80B4AD2C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 001F0 80B4AD30 AFA00014 */ sw $zero, 0x0014($sp) -/* 001F4 80B4AD34 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 001F0 80B4AD30 AFA00014 */ sw $zero, 0x0014($sp) +/* 001F4 80B4AD34 E7A40010 */ swc1 $f4, 0x0010($sp) /* 001F8 80B4AD38 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 001FC 80B4AD3C E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 001FC 80B4AD3C E7A00018 */ swc1 $f0, 0x0018($sp) /* 00200 80B4AD40 3C1980B5 */ lui $t9, %hi(func_80B4AF18) ## $t9 = 80B50000 /* 00204 80B4AD44 2418703D */ addiu $t8, $zero, 0x703D ## $t8 = 0000703D /* 00208 80B4AD48 2739AF18 */ addiu $t9, $t9, %lo(func_80B4AF18) ## $t9 = 80B4AF18 /* 0020C 80B4AD4C A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 00210 80B4AD50 1000001E */ beq $zero, $zero, .L80B4ADCC +/* 00210 80B4AD50 1000001E */ beq $zero, $zero, .L80B4ADCC /* 00214 80B4AD54 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 .L80B4AD58: /* 00218 80B4AD58 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0021C 80B4AD5C 24040040 */ addiu $a0, $zero, 0x0040 ## $a0 = 00000040 -/* 00220 80B4AD60 10400016 */ beq $v0, $zero, .L80B4ADBC +/* 00220 80B4AD60 10400016 */ beq $v0, $zero, .L80B4ADBC /* 00224 80B4AD64 340AFFFF */ ori $t2, $zero, 0xFFFF ## $t2 = 0000FFFF /* 00228 80B4AD68 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0022C 80B4AD6C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00230 80B4AD70 24840438 */ addiu $a0, $a0, 0x0438 ## $a0 = 06000438 /* 00234 80B4AD74 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00238 80B4AD78 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0023C 80B4AD7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00240 80B4AD80 46803220 */ cvt.s.w $f8, $f6 +/* 00240 80B4AD80 46803220 */ cvt.s.w $f8, $f6 /* 00244 80B4AD84 24A50438 */ addiu $a1, $a1, 0x0438 ## $a1 = 06000438 -/* 00248 80B4AD88 8FA40034 */ lw $a0, 0x0034($sp) +/* 00248 80B4AD88 8FA40034 */ lw $a0, 0x0034($sp) /* 0024C 80B4AD8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00250 80B4AD90 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00254 80B4AD94 AFA00014 */ sw $zero, 0x0014($sp) -/* 00258 80B4AD98 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00254 80B4AD94 AFA00014 */ sw $zero, 0x0014($sp) +/* 00258 80B4AD98 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0025C 80B4AD9C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00260 80B4ADA0 E7AA0018 */ swc1 $f10, 0x0018($sp) + +/* 00260 80B4ADA0 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00264 80B4ADA4 3C0980B5 */ lui $t1, %hi(func_80B4AF18) ## $t1 = 80B50000 /* 00268 80B4ADA8 2408703C */ addiu $t0, $zero, 0x703C ## $t0 = 0000703C /* 0026C 80B4ADAC 2529AF18 */ addiu $t1, $t1, %lo(func_80B4AF18) ## $t1 = 80B4AF18 /* 00270 80B4ADB0 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -/* 00274 80B4ADB4 10000005 */ beq $zero, $zero, .L80B4ADCC +/* 00274 80B4ADB4 10000005 */ beq $zero, $zero, .L80B4ADCC /* 00278 80B4ADB8 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 .L80B4ADBC: /* 0027C 80B4ADBC 3C0B80B5 */ lui $t3, %hi(func_80B4B010) ## $t3 = 80B50000 @@ -186,11 +186,11 @@ glabel EnZl1_Init /* 00284 80B4ADC4 A60A010E */ sh $t2, 0x010E($s0) ## 0000010E /* 00288 80B4ADC8 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 .L80B4ADCC: -/* 0028C 80B4ADCC 8FBF002C */ lw $ra, 0x002C($sp) +/* 0028C 80B4ADCC 8FBF002C */ lw $ra, 0x002C($sp) .L80B4ADD0: -/* 00290 80B4ADD0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00290 80B4ADD0 8FB00028 */ lw $s0, 0x0028($sp) /* 00294 80B4ADD4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00298 80B4ADD8 03E00008 */ jr $ra +/* 00298 80B4ADD8 03E00008 */ jr $ra /* 0029C 80B4ADDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s index e9dcb06a4e..6a7dbc1057 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s @@ -1,11 +1,11 @@ glabel EnZl2_Destroy /* 00000 80B4E990 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80B4E994 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80B4E998 0C0295BC */ jal func_800A56F0 +/* 00004 80B4E994 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00008 80B4E998 0C0295BC */ jal SkelAnime_Free /* 0000C 80B4E99C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 80B4E9A0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00010 80B4E9A0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00014 80B4E9A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 80B4E9A8 03E00008 */ jr $ra +/* 00018 80B4E9A8 03E00008 */ jr $ra /* 0001C 80B4E9AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s index facabb93cb..170663d066 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s @@ -1,49 +1,49 @@ glabel EnZl2_Init /* 03910 80B522A0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03914 80B522A4 AFA40040 */ sw $a0, 0x0040($sp) -/* 03918 80B522A8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0391C 80B522AC AFA50044 */ sw $a1, 0x0044($sp) +/* 03914 80B522A4 AFA40040 */ sw $a0, 0x0040($sp) +/* 03918 80B522A8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0391C 80B522AC AFA50044 */ sw $a1, 0x0044($sp) /* 03920 80B522B0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 03924 80B522B4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 03928 80B522B8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 0392C 80B522BC AFA4002C */ sw $a0, 0x002C($sp) +/* 0392C 80B522BC AFA4002C */ sw $a0, 0x002C($sp) /* 03930 80B522C0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03934 80B522C4 0C00AC78 */ jal ActorShape_Init - + /* 03938 80B522C8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0393C 80B522CC 8FAE002C */ lw $t6, 0x002C($sp) +/* 0393C 80B522CC 8FAE002C */ lw $t6, 0x002C($sp) /* 03940 80B522D0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 03944 80B522D4 24C60D70 */ addiu $a2, $a2, 0x0D70 ## $a2 = 06010D70 /* 03948 80B522D8 A1C00014 */ sb $zero, 0x0014($t6) ## 00000014 -/* 0394C 80B522DC 8FA50040 */ lw $a1, 0x0040($sp) -/* 03950 80B522E0 AFA00018 */ sw $zero, 0x0018($sp) -/* 03954 80B522E4 AFA00014 */ sw $zero, 0x0014($sp) -/* 03958 80B522E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0395C 80B522EC 8FA40044 */ lw $a0, 0x0044($sp) +/* 0394C 80B522DC 8FA50040 */ lw $a1, 0x0040($sp) +/* 03950 80B522E0 AFA00018 */ sw $zero, 0x0018($sp) +/* 03954 80B522E4 AFA00014 */ sw $zero, 0x0014($sp) +/* 03958 80B522E8 AFA00010 */ sw $zero, 0x0010($sp) +/* 0395C 80B522EC 8FA40044 */ lw $a0, 0x0044($sp) /* 03960 80B522F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03964 80B522F4 0C0291BE */ jal func_800A46F8 +/* 03964 80B522F4 0C0291BE */ jal SkelAnime_InitSV /* 03968 80B522F8 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 0396C 80B522FC 8FAF0040 */ lw $t7, 0x0040($sp) +/* 0396C 80B522FC 8FAF0040 */ lw $t7, 0x0040($sp) /* 03970 80B52300 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 03974 80B52304 85E2001C */ lh $v0, 0x001C($t7) ## 0000001C -/* 03978 80B52308 10410005 */ beq $v0, $at, .L80B52320 +/* 03978 80B52308 10410005 */ beq $v0, $at, .L80B52320 /* 0397C 80B5230C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 03980 80B52310 10410007 */ beq $v0, $at, .L80B52330 +/* 03980 80B52310 10410007 */ beq $v0, $at, .L80B52330 /* 03984 80B52314 00000000 */ nop -/* 03988 80B52318 10000008 */ beq $zero, $zero, .L80B5233C -/* 0398C 80B5231C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03988 80B52318 10000008 */ beq $zero, $zero, .L80B5233C +/* 0398C 80B5231C 8FBF0024 */ lw $ra, 0x0024($sp) .L80B52320: -/* 03990 80B52320 0C03DC98 */ jal func_800F7260 +/* 03990 80B52320 0C03DC98 */ jal func_800F7260 /* 03994 80B52324 2404006F */ addiu $a0, $zero, 0x006F ## $a0 = 0000006F -/* 03998 80B52328 10000004 */ beq $zero, $zero, .L80B5233C -/* 0399C 80B5232C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03998 80B52328 10000004 */ beq $zero, $zero, .L80B5233C +/* 0399C 80B5232C 8FBF0024 */ lw $ra, 0x0024($sp) .L80B52330: /* 039A0 80B52330 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 039A4 80B52334 A420FA32 */ sh $zero, -0x05CE($at) ## 8015FA32 -/* 039A8 80B52338 8FBF0024 */ lw $ra, 0x0024($sp) +/* 039A8 80B52338 8FBF0024 */ lw $ra, 0x0024($sp) .L80B5233C: /* 039AC 80B5233C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 039B0 80B52340 03E00008 */ jr $ra +/* 039B0 80B52340 03E00008 */ jr $ra /* 039B4 80B52344 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s index e5237a859f..569c8ba316 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s @@ -1,91 +1,91 @@ glabel func_80B523C8 /* 03A38 80B523C8 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 03A3C 80B523CC AFBF002C */ sw $ra, 0x002C($sp) -/* 03A40 80B523D0 AFB10028 */ sw $s1, 0x0028($sp) -/* 03A44 80B523D4 AFB00024 */ sw $s0, 0x0024($sp) -/* 03A48 80B523D8 AFA5008C */ sw $a1, 0x008C($sp) +/* 03A3C 80B523CC AFBF002C */ sw $ra, 0x002C($sp) +/* 03A40 80B523D0 AFB10028 */ sw $s1, 0x0028($sp) +/* 03A44 80B523D4 AFB00024 */ sw $s0, 0x0024($sp) +/* 03A48 80B523D8 AFA5008C */ sw $a1, 0x008C($sp) /* 03A4C 80B523DC 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 03A50 80B523E0 84830194 */ lh $v1, 0x0194($a0) ## 00000194 /* 03A54 80B523E4 3C0980B5 */ lui $t1, %hi(D_80B52810) ## $t1 = 80B50000 /* 03A58 80B523E8 25292810 */ addiu $t1, $t1, %lo(D_80B52810) ## $t1 = 80B52810 -/* 03A5C 80B523EC 00027080 */ sll $t6, $v0, 2 -/* 03A60 80B523F0 0003C880 */ sll $t9, $v1, 2 -/* 03A64 80B523F4 012E7821 */ addu $t7, $t1, $t6 -/* 03A68 80B523F8 01395021 */ addu $t2, $t1, $t9 +/* 03A5C 80B523EC 00027080 */ sll $t6, $v0, 2 +/* 03A60 80B523F0 0003C880 */ sll $t9, $v1, 2 +/* 03A64 80B523F4 012E7821 */ addu $t7, $t1, $t6 +/* 03A68 80B523F8 01395021 */ addu $t2, $t1, $t9 /* 03A6C 80B523FC 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 /* 03A70 80B52400 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 /* 03A74 80B52404 3C0D80B5 */ lui $t5, %hi(D_80B52834) ## $t5 = 80B50000 -/* 03A78 80B52408 AFB80074 */ sw $t8, 0x0074($sp) -/* 03A7C 80B5240C AFAB0070 */ sw $t3, 0x0070($sp) +/* 03A78 80B52408 AFB80074 */ sw $t8, 0x0074($sp) +/* 03A7C 80B5240C AFAB0070 */ sw $t3, 0x0070($sp) /* 03A80 80B52410 84880198 */ lh $t0, 0x0198($a0) ## 00000198 /* 03A84 80B52414 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 03A88 80B52418 3C0680B5 */ lui $a2, %hi(D_80B52B38) ## $a2 = 80B50000 -/* 03A8C 80B5241C 00086080 */ sll $t4, $t0, 2 -/* 03A90 80B52420 01AC6821 */ addu $t5, $t5, $t4 -/* 03A94 80B52424 8DAD2834 */ lw $t5, %lo(D_80B52834)($t5) +/* 03A8C 80B5241C 00086080 */ sll $t4, $t0, 2 +/* 03A90 80B52420 01AC6821 */ addu $t5, $t5, $t4 +/* 03A94 80B52424 8DAD2834 */ lw $t5, %lo(D_80B52834)($t5) /* 03A98 80B52428 24C62B38 */ addiu $a2, $a2, %lo(D_80B52B38) ## $a2 = 80B52B38 /* 03A9C 80B5242C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFC4 -/* 03AA0 80B52430 AFAD0064 */ sw $t5, 0x0064($sp) +/* 03AA0 80B52430 AFAD0064 */ sw $t5, 0x0064($sp) /* 03AA4 80B52434 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 03AA8 80B52438 24070657 */ addiu $a3, $zero, 0x0657 ## $a3 = 00000657 -/* 03AAC 80B5243C 0C031AB1 */ jal func_800C6AC4 +/* 03AAC 80B5243C 0C031AB1 */ jal func_800C6AC4 /* 03AB0 80B52440 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03AB4 80B52444 8FAF008C */ lw $t7, 0x008C($sp) -/* 03AB8 80B52448 0C024F46 */ jal func_80093D18 +/* 03AB4 80B52444 8FAF008C */ lw $t7, 0x008C($sp) +/* 03AB8 80B52448 0C024F46 */ jal func_80093D18 /* 03ABC 80B5244C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 03AC0 80B52450 8FA70074 */ lw $a3, 0x0074($sp) +/* 03AC0 80B52450 8FA70074 */ lw $a3, 0x0074($sp) /* 03AC4 80B52454 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03AC8 80B52458 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 03ACC 80B5245C 00075100 */ sll $t2, $a3, 4 -/* 03AD0 80B52460 000A5F02 */ srl $t3, $t2, 28 +/* 03ACC 80B5245C 00075100 */ sll $t2, $a3, 4 +/* 03AD0 80B52460 000A5F02 */ srl $t3, $t2, 28 /* 03AD4 80B52464 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 03AD8 80B52468 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 03ADC 80B5246C AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 03AE0 80B52470 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 03AE4 80B52474 000B6080 */ sll $t4, $t3, 2 +/* 03AE4 80B52474 000B6080 */ sll $t4, $t3, 2 /* 03AE8 80B52478 24846FA8 */ addiu $a0, $a0, 0x6FA8 ## $a0 = 80166FA8 -/* 03AEC 80B5247C 008C6821 */ addu $t5, $a0, $t4 +/* 03AEC 80B5247C 008C6821 */ addu $t5, $a0, $t4 /* 03AF0 80B52480 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 03AF4 80B52484 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 /* 03AF8 80B52488 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 03AFC 80B5248C 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 03B00 80B52490 00E57824 */ and $t7, $a3, $a1 +/* 03B00 80B52490 00E57824 */ and $t7, $a3, $a1 /* 03B04 80B52494 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 03B08 80B52498 01CFC021 */ addu $t8, $t6, $t7 -/* 03B0C 80B5249C 0306C821 */ addu $t9, $t8, $a2 +/* 03B08 80B52498 01CFC021 */ addu $t8, $t6, $t7 +/* 03B0C 80B5249C 0306C821 */ addu $t9, $t8, $a2 /* 03B10 80B524A0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03B14 80B524A4 8FA70070 */ lw $a3, 0x0070($sp) +/* 03B14 80B524A4 8FA70070 */ lw $a3, 0x0070($sp) /* 03B18 80B524A8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03B1C 80B524AC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 03B20 80B524B0 00076100 */ sll $t4, $a3, 4 -/* 03B24 80B524B4 000C6F02 */ srl $t5, $t4, 28 +/* 03B20 80B524B0 00076100 */ sll $t4, $a3, 4 +/* 03B24 80B524B4 000C6F02 */ srl $t5, $t4, 28 /* 03B28 80B524B8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 03B2C 80B524BC AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 03B30 80B524C0 000D7080 */ sll $t6, $t5, 2 +/* 03B30 80B524C0 000D7080 */ sll $t6, $t5, 2 /* 03B34 80B524C4 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 03B38 80B524C8 008E7821 */ addu $t7, $a0, $t6 +/* 03B38 80B524C8 008E7821 */ addu $t7, $a0, $t6 /* 03B3C 80B524CC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 03B40 80B524D0 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 03B44 80B524D4 00E5C824 */ and $t9, $a3, $a1 +/* 03B44 80B524D4 00E5C824 */ and $t9, $a3, $a1 /* 03B48 80B524D8 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 03B4C 80B524DC 03195021 */ addu $t2, $t8, $t9 -/* 03B50 80B524E0 01465821 */ addu $t3, $t2, $a2 +/* 03B4C 80B524DC 03195021 */ addu $t2, $t8, $t9 +/* 03B50 80B524E0 01465821 */ addu $t3, $t2, $a2 /* 03B54 80B524E4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 03B58 80B524E8 8FA70064 */ lw $a3, 0x0064($sp) +/* 03B58 80B524E8 8FA70064 */ lw $a3, 0x0064($sp) /* 03B5C 80B524EC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03B60 80B524F0 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 03B64 80B524F4 00077100 */ sll $t6, $a3, 4 -/* 03B68 80B524F8 000E7F02 */ srl $t7, $t6, 28 +/* 03B64 80B524F4 00077100 */ sll $t6, $a3, 4 +/* 03B68 80B524F8 000E7F02 */ srl $t7, $t6, 28 /* 03B6C 80B524FC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 03B70 80B52500 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 03B74 80B52504 000FC080 */ sll $t8, $t7, 2 -/* 03B78 80B52508 0098C821 */ addu $t9, $a0, $t8 +/* 03B74 80B52504 000FC080 */ sll $t8, $t7, 2 +/* 03B78 80B52508 0098C821 */ addu $t9, $a0, $t8 /* 03B7C 80B5250C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 03B80 80B52510 8F2A0000 */ lw $t2, 0x0000($t9) ## DB060020 -/* 03B84 80B52514 00E55824 */ and $t3, $a3, $a1 +/* 03B84 80B52514 00E55824 */ and $t3, $a3, $a1 /* 03B88 80B52518 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 03B8C 80B5251C 014B6021 */ addu $t4, $t2, $t3 -/* 03B90 80B52520 01866821 */ addu $t5, $t4, $a2 +/* 03B8C 80B5251C 014B6021 */ addu $t4, $t2, $t3 +/* 03B90 80B52520 01866821 */ addu $t5, $t4, $a2 /* 03B94 80B52524 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 03B98 80B52528 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03B9C 80B5252C 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 @@ -110,25 +110,25 @@ glabel func_80B523C8 /* 03BE8 80B52578 3C0C80B5 */ lui $t4, %hi(func_80B52348) ## $t4 = 80B50000 /* 03BEC 80B5257C 258C2348 */ addiu $t4, $t4, %lo(func_80B52348) ## $t4 = 80B52348 /* 03BF0 80B52580 25ADFB74 */ addiu $t5, $t5, %lo(func_80B4FB74) ## $t5 = 80B4FB74 -/* 03BF4 80B52584 AFAD0014 */ sw $t5, 0x0014($sp) -/* 03BF8 80B52588 AFAC0010 */ sw $t4, 0x0010($sp) -/* 03BFC 80B5258C AFB10018 */ sw $s1, 0x0018($sp) +/* 03BF4 80B52584 AFAD0014 */ sw $t5, 0x0014($sp) +/* 03BF8 80B52588 AFAC0010 */ sw $t4, 0x0010($sp) +/* 03BFC 80B5258C AFB10018 */ sw $s1, 0x0018($sp) /* 03C00 80B52590 8E0E02C0 */ lw $t6, 0x02C0($s0) ## 000002C0 -/* 03C04 80B52594 8FA4008C */ lw $a0, 0x008C($sp) -/* 03C08 80B52598 0C0289CF */ jal func_800A273C -/* 03C0C 80B5259C AFAE001C */ sw $t6, 0x001C($sp) +/* 03C04 80B52594 8FA4008C */ lw $a0, 0x008C($sp) +/* 03C08 80B52598 0C0289CF */ jal SkelAnime_DrawSV2 +/* 03C0C 80B5259C AFAE001C */ sw $t6, 0x001C($sp) /* 03C10 80B525A0 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 03C14 80B525A4 8FAF008C */ lw $t7, 0x008C($sp) +/* 03C14 80B525A4 8FAF008C */ lw $t7, 0x008C($sp) /* 03C18 80B525A8 3C0680B5 */ lui $a2, %hi(D_80B52B48) ## $a2 = 80B50000 /* 03C1C 80B525AC 24C62B48 */ addiu $a2, $a2, %lo(D_80B52B48) ## $a2 = 80B52B48 /* 03C20 80B525B0 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFC4 /* 03C24 80B525B4 24070670 */ addiu $a3, $zero, 0x0670 ## $a3 = 00000670 -/* 03C28 80B525B8 0C031AD5 */ jal func_800C6B54 +/* 03C28 80B525B8 0C031AD5 */ jal func_800C6B54 /* 03C2C 80B525BC 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 03C30 80B525C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 03C34 80B525C4 8FB00024 */ lw $s0, 0x0024($sp) -/* 03C38 80B525C8 8FB10028 */ lw $s1, 0x0028($sp) -/* 03C3C 80B525CC 03E00008 */ jr $ra +/* 03C30 80B525C0 8FBF002C */ lw $ra, 0x002C($sp) +/* 03C34 80B525C4 8FB00024 */ lw $s0, 0x0024($sp) +/* 03C38 80B525C8 8FB10028 */ lw $s1, 0x0028($sp) +/* 03C3C 80B525CC 03E00008 */ jr $ra /* 03C40 80B525D0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s index 345a56565f..62050f19a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s @@ -1,52 +1,52 @@ glabel func_80B525D4 /* 03C44 80B525D4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 03C48 80B525D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 03C4C 80B525DC AFB10028 */ sw $s1, 0x0028($sp) -/* 03C50 80B525E0 AFB00024 */ sw $s0, 0x0024($sp) -/* 03C54 80B525E4 AFA5008C */ sw $a1, 0x008C($sp) +/* 03C48 80B525D8 AFBF002C */ sw $ra, 0x002C($sp) +/* 03C4C 80B525DC AFB10028 */ sw $s1, 0x0028($sp) +/* 03C50 80B525E0 AFB00024 */ sw $s0, 0x0024($sp) +/* 03C54 80B525E4 AFA5008C */ sw $a1, 0x008C($sp) /* 03C58 80B525E8 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 03C5C 80B525EC 3C0F80B5 */ lui $t7, %hi(D_80B52810) ## $t7 = 80B50000 /* 03C60 80B525F0 3C1980B5 */ lui $t9, %hi(D_80B52834) ## $t9 = 80B50000 -/* 03C64 80B525F4 00027080 */ sll $t6, $v0, 2 -/* 03C68 80B525F8 01EE7821 */ addu $t7, $t7, $t6 -/* 03C6C 80B525FC 8DEF2810 */ lw $t7, %lo(D_80B52810)($t7) +/* 03C64 80B525F4 00027080 */ sll $t6, $v0, 2 +/* 03C68 80B525F8 01EE7821 */ addu $t7, $t7, $t6 +/* 03C6C 80B525FC 8DEF2810 */ lw $t7, %lo(D_80B52810)($t7) /* 03C70 80B52600 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 03C74 80B52604 3C0680B5 */ lui $a2, %hi(D_80B52B58) ## $a2 = 80B50000 -/* 03C78 80B52608 AFAF0078 */ sw $t7, 0x0078($sp) +/* 03C78 80B52608 AFAF0078 */ sw $t7, 0x0078($sp) /* 03C7C 80B5260C 84830198 */ lh $v1, 0x0198($a0) ## 00000198 /* 03C80 80B52610 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 03C84 80B52614 24C62B58 */ addiu $a2, $a2, %lo(D_80B52B58) ## $a2 = 80B52B58 -/* 03C88 80B52618 0003C080 */ sll $t8, $v1, 2 -/* 03C8C 80B5261C 0338C821 */ addu $t9, $t9, $t8 -/* 03C90 80B52620 8F392834 */ lw $t9, %lo(D_80B52834)($t9) +/* 03C88 80B52618 0003C080 */ sll $t8, $v1, 2 +/* 03C8C 80B5261C 0338C821 */ addu $t9, $t9, $t8 +/* 03C90 80B52620 8F392834 */ lw $t9, %lo(D_80B52834)($t9) /* 03C94 80B52624 2407067F */ addiu $a3, $zero, 0x067F ## $a3 = 0000067F -/* 03C98 80B52628 AFB9006C */ sw $t9, 0x006C($sp) +/* 03C98 80B52628 AFB9006C */ sw $t9, 0x006C($sp) /* 03C9C 80B5262C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 03CA0 80B52630 0C031AB1 */ jal func_800C6AC4 +/* 03CA0 80B52630 0C031AB1 */ jal func_800C6AC4 /* 03CA4 80B52634 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03CA8 80B52638 8FAB008C */ lw $t3, 0x008C($sp) -/* 03CAC 80B5263C 0C024F61 */ jal func_80093D84 +/* 03CA8 80B52638 8FAB008C */ lw $t3, 0x008C($sp) +/* 03CAC 80B5263C 0C024F61 */ jal func_80093D84 /* 03CB0 80B52640 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 03CB4 80B52644 8FA90078 */ lw $t1, 0x0078($sp) +/* 03CB4 80B52644 8FA90078 */ lw $t1, 0x0078($sp) /* 03CB8 80B52648 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 03CBC 80B5264C 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 03CC0 80B52650 00097100 */ sll $t6, $t1, 4 -/* 03CC4 80B52654 000E7F02 */ srl $t7, $t6, 28 +/* 03CC0 80B52650 00097100 */ sll $t6, $t1, 4 +/* 03CC4 80B52654 000E7F02 */ srl $t7, $t6, 28 /* 03CC8 80B52658 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 03CCC 80B5265C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 03CD0 80B52660 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 03CD4 80B52664 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 03CD8 80B52668 000FC080 */ sll $t8, $t7, 2 +/* 03CD8 80B52668 000FC080 */ sll $t8, $t7, 2 /* 03CDC 80B5266C 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 03CE0 80B52670 00F82021 */ addu $a0, $a3, $t8 +/* 03CE0 80B52670 00F82021 */ addu $a0, $a3, $t8 /* 03CE4 80B52674 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 03CE8 80B52678 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 /* 03CEC 80B5267C 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 /* 03CF0 80B52680 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 03CF4 80B52684 01282824 */ and $a1, $t1, $t0 +/* 03CF4 80B52684 01282824 */ and $a1, $t1, $t0 /* 03CF8 80B52688 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 03CFC 80B5268C 03255021 */ addu $t2, $t9, $a1 -/* 03D00 80B52690 01465821 */ addu $t3, $t2, $a2 +/* 03CFC 80B5268C 03255021 */ addu $t2, $t9, $a1 +/* 03D00 80B52690 01465821 */ addu $t3, $t2, $a2 /* 03D04 80B52694 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 03D08 80B52698 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 03D0C 80B5269C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -57,23 +57,23 @@ glabel func_80B525D4 /* 03D20 80B526B0 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 /* 03D24 80B526B4 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 03D28 80B526B8 354A0028 */ ori $t2, $t2, 0x0028 ## $t2 = DB060028 -/* 03D2C 80B526BC 01C57821 */ addu $t7, $t6, $a1 -/* 03D30 80B526C0 01E6C021 */ addu $t8, $t7, $a2 +/* 03D2C 80B526BC 01C57821 */ addu $t7, $t6, $a1 +/* 03D30 80B526C0 01E6C021 */ addu $t8, $t7, $a2 /* 03D34 80B526C4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 03D38 80B526C8 8FA4006C */ lw $a0, 0x006C($sp) +/* 03D38 80B526C8 8FA4006C */ lw $a0, 0x006C($sp) /* 03D3C 80B526CC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03D40 80B526D0 00045900 */ sll $t3, $a0, 4 -/* 03D44 80B526D4 000B6702 */ srl $t4, $t3, 28 +/* 03D40 80B526D0 00045900 */ sll $t3, $a0, 4 +/* 03D44 80B526D4 000B6702 */ srl $t4, $t3, 28 /* 03D48 80B526D8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 03D4C 80B526DC AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 03D50 80B526E0 000C6880 */ sll $t5, $t4, 2 -/* 03D54 80B526E4 00ED7021 */ addu $t6, $a3, $t5 +/* 03D50 80B526E0 000C6880 */ sll $t5, $t4, 2 +/* 03D54 80B526E4 00ED7021 */ addu $t6, $a3, $t5 /* 03D58 80B526E8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 03D5C 80B526EC 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 03D60 80B526F0 0088C024 */ and $t8, $a0, $t0 +/* 03D60 80B526F0 0088C024 */ and $t8, $a0, $t0 /* 03D64 80B526F4 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 03D68 80B526F8 01F8C821 */ addu $t9, $t7, $t8 -/* 03D6C 80B526FC 03265021 */ addu $t2, $t9, $a2 +/* 03D68 80B526F8 01F8C821 */ addu $t9, $t7, $t8 +/* 03D6C 80B526FC 03265021 */ addu $t2, $t9, $a2 /* 03D70 80B52700 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 03D74 80B52704 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 03D78 80B52708 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 @@ -97,25 +97,25 @@ glabel func_80B525D4 /* 03DC0 80B52750 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 03DC4 80B52754 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 03DC8 80B52758 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 03DCC 80B5275C AFB10018 */ sw $s1, 0x0018($sp) -/* 03DD0 80B52760 AFA00014 */ sw $zero, 0x0014($sp) -/* 03DD4 80B52764 AFAA0010 */ sw $t2, 0x0010($sp) +/* 03DCC 80B5275C AFB10018 */ sw $s1, 0x0018($sp) +/* 03DD0 80B52760 AFA00014 */ sw $zero, 0x0014($sp) +/* 03DD4 80B52764 AFAA0010 */ sw $t2, 0x0010($sp) /* 03DD8 80B52768 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 -/* 03DDC 80B5276C 8FA4008C */ lw $a0, 0x008C($sp) -/* 03DE0 80B52770 0C0289CF */ jal func_800A273C -/* 03DE4 80B52774 AFAB001C */ sw $t3, 0x001C($sp) +/* 03DDC 80B5276C 8FA4008C */ lw $a0, 0x008C($sp) +/* 03DE0 80B52770 0C0289CF */ jal SkelAnime_DrawSV2 +/* 03DE4 80B52774 AFAB001C */ sw $t3, 0x001C($sp) /* 03DE8 80B52778 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 03DEC 80B5277C 8FAC008C */ lw $t4, 0x008C($sp) +/* 03DEC 80B5277C 8FAC008C */ lw $t4, 0x008C($sp) /* 03DF0 80B52780 3C0680B5 */ lui $a2, %hi(D_80B52B68) ## $a2 = 80B50000 /* 03DF4 80B52784 24C62B68 */ addiu $a2, $a2, %lo(D_80B52B68) ## $a2 = 80B52B68 /* 03DF8 80B52788 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 03DFC 80B5278C 2407069C */ addiu $a3, $zero, 0x069C ## $a3 = 0000069C -/* 03E00 80B52790 0C031AD5 */ jal func_800C6B54 +/* 03E00 80B52790 0C031AD5 */ jal func_800C6B54 /* 03E04 80B52794 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 03E08 80B52798 8FBF002C */ lw $ra, 0x002C($sp) -/* 03E0C 80B5279C 8FB00024 */ lw $s0, 0x0024($sp) -/* 03E10 80B527A0 8FB10028 */ lw $s1, 0x0028($sp) -/* 03E14 80B527A4 03E00008 */ jr $ra +/* 03E08 80B52798 8FBF002C */ lw $ra, 0x002C($sp) +/* 03E0C 80B5279C 8FB00024 */ lw $s0, 0x0024($sp) +/* 03E10 80B527A0 8FB10028 */ lw $s1, 0x0028($sp) +/* 03E14 80B527A4 03E00008 */ jr $ra /* 03E18 80B527A8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s index 33b419a2e6..0c4959fc67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s @@ -1,63 +1,63 @@ glabel EnZl3_Init /* 06AEC 80B59E9C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 06AF0 80B59EA0 AFB00028 */ sw $s0, 0x0028($sp) +/* 06AF0 80B59EA0 AFB00028 */ sw $s0, 0x0028($sp) /* 06AF4 80B59EA4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06AF8 80B59EA8 AFBF002C */ sw $ra, 0x002C($sp) +/* 06AF8 80B59EA8 AFBF002C */ sw $ra, 0x002C($sp) /* 06AFC 80B59EAC 3C0480B6 */ lui $a0, %hi(D_80B5A994) ## $a0 = 80B60000 -/* 06B00 80B59EB0 AFA5004C */ sw $a1, 0x004C($sp) +/* 06B00 80B59EB0 AFA5004C */ sw $a1, 0x004C($sp) /* 06B04 80B59EB4 0C00084C */ jal osSyncPrintf - + /* 06B08 80B59EB8 2484A994 */ addiu $a0, $a0, %lo(D_80B5A994) ## $a0 = 80B5A994 /* 06B0C 80B59EBC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 06B10 80B59EC0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 06B14 80B59EC4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 06B18 80B59EC8 AFA40034 */ sw $a0, 0x0034($sp) +/* 06B18 80B59EC8 AFA40034 */ sw $a0, 0x0034($sp) /* 06B1C 80B59ECC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 06B20 80B59ED0 0C00AC78 */ jal ActorShape_Init - + /* 06B24 80B59ED4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 06B28 80B59ED8 8FAE0034 */ lw $t6, 0x0034($sp) +/* 06B28 80B59ED8 8FAE0034 */ lw $t6, 0x0034($sp) /* 06B2C 80B59EDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06B30 80B59EE0 A1C00014 */ sb $zero, 0x0014($t6) ## 00000014 -/* 06B34 80B59EE4 0C2D4CEC */ jal func_80B533B0 -/* 06B38 80B59EE8 8FA5004C */ lw $a1, 0x004C($sp) +/* 06B34 80B59EE4 0C2D4CEC */ jal func_80B533B0 +/* 06B38 80B59EE8 8FA5004C */ lw $a1, 0x004C($sp) /* 06B3C 80B59EEC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 06B40 80B59EF0 260F0190 */ addiu $t7, $s0, 0x0190 ## $t7 = 00000190 /* 06B44 80B59EF4 261801EA */ addiu $t8, $s0, 0x01EA ## $t8 = 000001EA /* 06B48 80B59EF8 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F -/* 06B4C 80B59EFC AFB90018 */ sw $t9, 0x0018($sp) -/* 06B50 80B59F00 AFB80014 */ sw $t8, 0x0014($sp) -/* 06B54 80B59F04 AFAF0010 */ sw $t7, 0x0010($sp) +/* 06B4C 80B59EFC AFB90018 */ sw $t9, 0x0018($sp) +/* 06B50 80B59F00 AFB80014 */ sw $t8, 0x0014($sp) +/* 06B54 80B59F04 AFAF0010 */ sw $t7, 0x0010($sp) /* 06B58 80B59F08 24C60D70 */ addiu $a2, $a2, 0x0D70 ## $a2 = 06010D70 -/* 06B5C 80B59F0C 8FA4004C */ lw $a0, 0x004C($sp) +/* 06B5C 80B59F0C 8FA4004C */ lw $a0, 0x004C($sp) /* 06B60 80B59F10 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 06B64 80B59F14 0C0291BE */ jal func_800A46F8 +/* 06B64 80B59F14 0C0291BE */ jal SkelAnime_InitSV /* 06B68 80B59F18 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 06B6C 80B59F1C 0C2D5375 */ jal func_80B54DD4 +/* 06B6C 80B59F1C 0C2D5375 */ jal func_80B54DD4 /* 06B70 80B59F20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06B74 80B59F24 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06B78 80B59F28 10410005 */ beq $v0, $at, .L80B59F40 +/* 06B78 80B59F28 10410005 */ beq $v0, $at, .L80B59F40 /* 06B7C 80B59F2C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 06B80 80B59F30 10410006 */ beq $v0, $at, .L80B59F4C +/* 06B80 80B59F30 10410006 */ beq $v0, $at, .L80B59F4C /* 06B84 80B59F34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06B88 80B59F38 10000006 */ beq $zero, $zero, .L80B59F54 +/* 06B88 80B59F38 10000006 */ beq $zero, $zero, .L80B59F54 /* 06B8C 80B59F3C 00000000 */ nop .L80B59F40: /* 06B90 80B59F40 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 06B94 80B59F44 10000003 */ beq $zero, $zero, .L80B59F54 +/* 06B94 80B59F44 10000003 */ beq $zero, $zero, .L80B59F54 /* 06B98 80B59F48 A420FA32 */ sh $zero, -0x05CE($at) ## 8015FA32 .L80B59F4C: -/* 06B9C 80B59F4C 0C2D66A0 */ jal func_80B59A80 -/* 06BA0 80B59F50 8FA5004C */ lw $a1, 0x004C($sp) +/* 06B9C 80B59F4C 0C2D66A0 */ jal func_80B59A80 +/* 06BA0 80B59F50 8FA5004C */ lw $a1, 0x004C($sp) .L80B59F54: /* 06BA4 80B59F54 3C0480B6 */ lui $a0, %hi(D_80B5A9D0) ## $a0 = 80B60000 /* 06BA8 80B59F58 0C00084C */ jal osSyncPrintf - + /* 06BAC 80B59F5C 2484A9D0 */ addiu $a0, $a0, %lo(D_80B5A9D0) ## $a0 = 80B5A9D0 -/* 06BB0 80B59F60 8FBF002C */ lw $ra, 0x002C($sp) -/* 06BB4 80B59F64 8FB00028 */ lw $s0, 0x0028($sp) +/* 06BB0 80B59F60 8FBF002C */ lw $ra, 0x002C($sp) +/* 06BB4 80B59F64 8FB00028 */ lw $s0, 0x0028($sp) /* 06BB8 80B59F68 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 06BBC 80B59F6C 03E00008 */ jr $ra +/* 06BBC 80B59F6C 03E00008 */ jr $ra /* 06BC0 80B59F70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s index 0250498e14..354cd27b51 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s @@ -1,51 +1,51 @@ glabel func_80B59FF4 /* 06C44 80B59FF4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 06C48 80B59FF8 AFBF002C */ sw $ra, 0x002C($sp) -/* 06C4C 80B59FFC AFB00028 */ sw $s0, 0x0028($sp) -/* 06C50 80B5A000 AFA40088 */ sw $a0, 0x0088($sp) -/* 06C54 80B5A004 AFA5008C */ sw $a1, 0x008C($sp) +/* 06C48 80B59FF8 AFBF002C */ sw $ra, 0x002C($sp) +/* 06C4C 80B59FFC AFB00028 */ sw $s0, 0x0028($sp) +/* 06C50 80B5A000 AFA40088 */ sw $a0, 0x0088($sp) +/* 06C54 80B5A004 AFA5008C */ sw $a1, 0x008C($sp) /* 06C58 80B5A008 84820244 */ lh $v0, 0x0244($a0) ## 00000244 /* 06C5C 80B5A00C 3C1880B6 */ lui $t8, %hi(D_80B5A43C) ## $t8 = 80B60000 /* 06C60 80B5A010 3C0A80B6 */ lui $t2, %hi(D_80B5A45C) ## $t2 = 80B60000 -/* 06C64 80B5A014 00027880 */ sll $t7, $v0, 2 -/* 06C68 80B5A018 030FC021 */ addu $t8, $t8, $t7 -/* 06C6C 80B5A01C 8F18A43C */ lw $t8, %lo(D_80B5A43C)($t8) +/* 06C64 80B5A014 00027880 */ sll $t7, $v0, 2 +/* 06C68 80B5A018 030FC021 */ addu $t8, $t8, $t7 +/* 06C6C 80B5A01C 8F18A43C */ lw $t8, %lo(D_80B5A43C)($t8) /* 06C70 80B5A020 3C0680B6 */ lui $a2, %hi(D_80B5AA4C) ## $a2 = 80B60000 /* 06C74 80B5A024 24C6AA4C */ addiu $a2, $a2, %lo(D_80B5AA4C) ## $a2 = 80B5AA4C -/* 06C78 80B5A028 AFB80078 */ sw $t8, 0x0078($sp) +/* 06C78 80B5A028 AFB80078 */ sw $t8, 0x0078($sp) /* 06C7C 80B5A02C 84830248 */ lh $v1, 0x0248($a0) ## 00000248 /* 06C80 80B5A030 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 06C84 80B5A034 24070875 */ addiu $a3, $zero, 0x0875 ## $a3 = 00000875 -/* 06C88 80B5A038 0003C880 */ sll $t9, $v1, 2 -/* 06C8C 80B5A03C 01595021 */ addu $t2, $t2, $t9 -/* 06C90 80B5A040 8D4AA45C */ lw $t2, %lo(D_80B5A45C)($t2) -/* 06C94 80B5A044 AFAA006C */ sw $t2, 0x006C($sp) +/* 06C88 80B5A038 0003C880 */ sll $t9, $v1, 2 +/* 06C8C 80B5A03C 01595021 */ addu $t2, $t2, $t9 +/* 06C90 80B5A040 8D4AA45C */ lw $t2, %lo(D_80B5A45C)($t2) +/* 06C94 80B5A044 AFAA006C */ sw $t2, 0x006C($sp) /* 06C98 80B5A048 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 06C9C 80B5A04C 0C031AB1 */ jal func_800C6AC4 +/* 06C9C 80B5A04C 0C031AB1 */ jal func_800C6AC4 /* 06CA0 80B5A050 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 06CA4 80B5A054 8FAC008C */ lw $t4, 0x008C($sp) -/* 06CA8 80B5A058 0C024F46 */ jal func_80093D18 +/* 06CA4 80B5A054 8FAC008C */ lw $t4, 0x008C($sp) +/* 06CA8 80B5A058 0C024F46 */ jal func_80093D18 /* 06CAC 80B5A05C 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 06CB0 80B5A060 8FA90078 */ lw $t1, 0x0078($sp) +/* 06CB0 80B5A060 8FA90078 */ lw $t1, 0x0078($sp) /* 06CB4 80B5A064 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 06CB8 80B5A068 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 06CBC 80B5A06C 0009C100 */ sll $t8, $t1, 4 -/* 06CC0 80B5A070 00187702 */ srl $t6, $t8, 28 +/* 06CBC 80B5A06C 0009C100 */ sll $t8, $t1, 4 +/* 06CC0 80B5A070 00187702 */ srl $t6, $t8, 28 /* 06CC4 80B5A074 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 06CC8 80B5A078 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 06CCC 80B5A07C AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 06CD0 80B5A080 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 06CD4 80B5A084 000EC880 */ sll $t9, $t6, 2 +/* 06CD4 80B5A084 000EC880 */ sll $t9, $t6, 2 /* 06CD8 80B5A088 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 06CDC 80B5A08C 00F92021 */ addu $a0, $a3, $t9 +/* 06CDC 80B5A08C 00F92021 */ addu $a0, $a3, $t9 /* 06CE0 80B5A090 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 06CE4 80B5A094 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 /* 06CE8 80B5A098 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 /* 06CEC 80B5A09C 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 06CF0 80B5A0A0 01282824 */ and $a1, $t1, $t0 +/* 06CF0 80B5A0A0 01282824 */ and $a1, $t1, $t0 /* 06CF4 80B5A0A4 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 06CF8 80B5A0A8 01455821 */ addu $t3, $t2, $a1 -/* 06CFC 80B5A0AC 01666021 */ addu $t4, $t3, $a2 +/* 06CF8 80B5A0A8 01455821 */ addu $t3, $t2, $a1 +/* 06CFC 80B5A0AC 01666021 */ addu $t4, $t3, $a2 /* 06D00 80B5A0B0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 06D04 80B5A0B4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 06D08 80B5A0B8 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -56,23 +56,23 @@ glabel func_80B59FF4 /* 06D1C 80B5A0CC 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 06D20 80B5A0D0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 06D24 80B5A0D4 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 -/* 06D28 80B5A0D8 03057021 */ addu $t6, $t8, $a1 -/* 06D2C 80B5A0DC 01C6C821 */ addu $t9, $t6, $a2 +/* 06D28 80B5A0D8 03057021 */ addu $t6, $t8, $a1 +/* 06D2C 80B5A0DC 01C6C821 */ addu $t9, $t6, $a2 /* 06D30 80B5A0E0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 06D34 80B5A0E4 8FA4006C */ lw $a0, 0x006C($sp) +/* 06D34 80B5A0E4 8FA4006C */ lw $a0, 0x006C($sp) /* 06D38 80B5A0E8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 06D3C 80B5A0EC 00046100 */ sll $t4, $a0, 4 -/* 06D40 80B5A0F0 000C6F02 */ srl $t5, $t4, 28 +/* 06D3C 80B5A0EC 00046100 */ sll $t4, $a0, 4 +/* 06D40 80B5A0F0 000C6F02 */ srl $t5, $t4, 28 /* 06D44 80B5A0F4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 06D48 80B5A0F8 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 06D4C 80B5A0FC 000D7880 */ sll $t7, $t5, 2 -/* 06D50 80B5A100 00EFC021 */ addu $t8, $a3, $t7 +/* 06D4C 80B5A0FC 000D7880 */ sll $t7, $t5, 2 +/* 06D50 80B5A100 00EFC021 */ addu $t8, $a3, $t7 /* 06D54 80B5A104 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 06D58 80B5A108 8F0E0000 */ lw $t6, 0x0000($t8) ## 00000000 -/* 06D5C 80B5A10C 0088C824 */ and $t9, $a0, $t0 +/* 06D5C 80B5A10C 0088C824 */ and $t9, $a0, $t0 /* 06D60 80B5A110 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 06D64 80B5A114 01D95021 */ addu $t2, $t6, $t9 -/* 06D68 80B5A118 01465821 */ addu $t3, $t2, $a2 +/* 06D64 80B5A114 01D95021 */ addu $t2, $t6, $t9 +/* 06D68 80B5A118 01465821 */ addu $t3, $t2, $a2 /* 06D6C 80B5A11C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 06D70 80B5A120 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 06D74 80B5A124 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 @@ -89,7 +89,7 @@ glabel func_80B59FF4 /* 06DA0 80B5A150 27396290 */ addiu $t9, $t9, 0x6290 ## $t9 = 80116290 /* 06DA4 80B5A154 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 06DA8 80B5A158 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 06DAC 80B5A15C 8FA30088 */ lw $v1, 0x0088($sp) +/* 06DAC 80B5A15C 8FA30088 */ lw $v1, 0x0088($sp) /* 06DB0 80B5A160 3C0B80B5 */ lui $t3, %hi(func_80B54CE8) ## $t3 = 80B50000 /* 06DB4 80B5A164 3C0A80B6 */ lui $t2, %hi(func_80B59F74) ## $t2 = 80B60000 /* 06DB8 80B5A168 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C @@ -98,25 +98,25 @@ glabel func_80B59FF4 /* 06DC4 80B5A174 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E /* 06DC8 80B5A178 254A9F74 */ addiu $t2, $t2, %lo(func_80B59F74) ## $t2 = 80B59F74 /* 06DCC 80B5A17C 256B4CE8 */ addiu $t3, $t3, %lo(func_80B54CE8) ## $t3 = 80B54CE8 -/* 06DD0 80B5A180 AFAB0014 */ sw $t3, 0x0014($sp) -/* 06DD4 80B5A184 AFAA0010 */ sw $t2, 0x0010($sp) -/* 06DD8 80B5A188 AFA30018 */ sw $v1, 0x0018($sp) +/* 06DD0 80B5A180 AFAB0014 */ sw $t3, 0x0014($sp) +/* 06DD4 80B5A184 AFAA0010 */ sw $t2, 0x0010($sp) +/* 06DD8 80B5A188 AFA30018 */ sw $v1, 0x0018($sp) /* 06DDC 80B5A18C 8E0C02C0 */ lw $t4, 0x02C0($s0) ## 000002C0 -/* 06DE0 80B5A190 8FA4008C */ lw $a0, 0x008C($sp) -/* 06DE4 80B5A194 0C0289CF */ jal func_800A273C -/* 06DE8 80B5A198 AFAC001C */ sw $t4, 0x001C($sp) +/* 06DE0 80B5A190 8FA4008C */ lw $a0, 0x008C($sp) +/* 06DE4 80B5A194 0C0289CF */ jal SkelAnime_DrawSV2 +/* 06DE8 80B5A198 AFAC001C */ sw $t4, 0x001C($sp) /* 06DEC 80B5A19C AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 06DF0 80B5A1A0 8FAD008C */ lw $t5, 0x008C($sp) +/* 06DF0 80B5A1A0 8FAD008C */ lw $t5, 0x008C($sp) /* 06DF4 80B5A1A4 3C0680B6 */ lui $a2, %hi(D_80B5AA5C) ## $a2 = 80B60000 /* 06DF8 80B5A1A8 24C6AA5C */ addiu $a2, $a2, %lo(D_80B5AA5C) ## $a2 = 80B5AA5C /* 06DFC 80B5A1AC 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 06E00 80B5A1B0 2407088E */ addiu $a3, $zero, 0x088E ## $a3 = 0000088E -/* 06E04 80B5A1B4 0C031AD5 */ jal func_800C6B54 +/* 06E04 80B5A1B4 0C031AD5 */ jal func_800C6B54 /* 06E08 80B5A1B8 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 06E0C 80B5A1BC 8FBF002C */ lw $ra, 0x002C($sp) -/* 06E10 80B5A1C0 8FB00028 */ lw $s0, 0x0028($sp) +/* 06E0C 80B5A1BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 06E10 80B5A1C0 8FB00028 */ lw $s0, 0x0028($sp) /* 06E14 80B5A1C4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 06E18 80B5A1C8 03E00008 */ jr $ra +/* 06E18 80B5A1C8 03E00008 */ jr $ra /* 06E1C 80B5A1CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s index e38c4942ca..6dcefcad7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s @@ -1,52 +1,52 @@ glabel func_80B5A1D0 /* 06E20 80B5A1D0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 06E24 80B5A1D4 AFBF002C */ sw $ra, 0x002C($sp) -/* 06E28 80B5A1D8 AFB10028 */ sw $s1, 0x0028($sp) -/* 06E2C 80B5A1DC AFB00024 */ sw $s0, 0x0024($sp) -/* 06E30 80B5A1E0 AFA5008C */ sw $a1, 0x008C($sp) +/* 06E24 80B5A1D4 AFBF002C */ sw $ra, 0x002C($sp) +/* 06E28 80B5A1D8 AFB10028 */ sw $s1, 0x0028($sp) +/* 06E2C 80B5A1DC AFB00024 */ sw $s0, 0x0024($sp) +/* 06E30 80B5A1E0 AFA5008C */ sw $a1, 0x008C($sp) /* 06E34 80B5A1E4 84820244 */ lh $v0, 0x0244($a0) ## 00000244 /* 06E38 80B5A1E8 3C0F80B6 */ lui $t7, %hi(D_80B5A43C) ## $t7 = 80B60000 /* 06E3C 80B5A1EC 3C1980B6 */ lui $t9, %hi(D_80B5A45C) ## $t9 = 80B60000 -/* 06E40 80B5A1F0 00027080 */ sll $t6, $v0, 2 -/* 06E44 80B5A1F4 01EE7821 */ addu $t7, $t7, $t6 -/* 06E48 80B5A1F8 8DEFA43C */ lw $t7, %lo(D_80B5A43C)($t7) +/* 06E40 80B5A1F0 00027080 */ sll $t6, $v0, 2 +/* 06E44 80B5A1F4 01EE7821 */ addu $t7, $t7, $t6 +/* 06E48 80B5A1F8 8DEFA43C */ lw $t7, %lo(D_80B5A43C)($t7) /* 06E4C 80B5A1FC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 06E50 80B5A200 3C0680B6 */ lui $a2, %hi(D_80B5AA6C) ## $a2 = 80B60000 -/* 06E54 80B5A204 AFAF0078 */ sw $t7, 0x0078($sp) +/* 06E54 80B5A204 AFAF0078 */ sw $t7, 0x0078($sp) /* 06E58 80B5A208 84830248 */ lh $v1, 0x0248($a0) ## 00000248 /* 06E5C 80B5A20C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 06E60 80B5A210 24C6AA6C */ addiu $a2, $a2, %lo(D_80B5AA6C) ## $a2 = 80B5AA6C -/* 06E64 80B5A214 0003C080 */ sll $t8, $v1, 2 -/* 06E68 80B5A218 0338C821 */ addu $t9, $t9, $t8 -/* 06E6C 80B5A21C 8F39A45C */ lw $t9, %lo(D_80B5A45C)($t9) +/* 06E64 80B5A214 0003C080 */ sll $t8, $v1, 2 +/* 06E68 80B5A218 0338C821 */ addu $t9, $t9, $t8 +/* 06E6C 80B5A21C 8F39A45C */ lw $t9, %lo(D_80B5A45C)($t9) /* 06E70 80B5A220 2407089D */ addiu $a3, $zero, 0x089D ## $a3 = 0000089D -/* 06E74 80B5A224 AFB9006C */ sw $t9, 0x006C($sp) +/* 06E74 80B5A224 AFB9006C */ sw $t9, 0x006C($sp) /* 06E78 80B5A228 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 06E7C 80B5A22C 0C031AB1 */ jal func_800C6AC4 +/* 06E7C 80B5A22C 0C031AB1 */ jal func_800C6AC4 /* 06E80 80B5A230 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 06E84 80B5A234 8FAB008C */ lw $t3, 0x008C($sp) -/* 06E88 80B5A238 0C024F61 */ jal func_80093D84 +/* 06E84 80B5A234 8FAB008C */ lw $t3, 0x008C($sp) +/* 06E88 80B5A238 0C024F61 */ jal func_80093D84 /* 06E8C 80B5A23C 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 06E90 80B5A240 8FA90078 */ lw $t1, 0x0078($sp) +/* 06E90 80B5A240 8FA90078 */ lw $t1, 0x0078($sp) /* 06E94 80B5A244 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 06E98 80B5A248 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 06E9C 80B5A24C 00097100 */ sll $t6, $t1, 4 -/* 06EA0 80B5A250 000E7F02 */ srl $t7, $t6, 28 +/* 06E9C 80B5A24C 00097100 */ sll $t6, $t1, 4 +/* 06EA0 80B5A250 000E7F02 */ srl $t7, $t6, 28 /* 06EA4 80B5A254 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 06EA8 80B5A258 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 06EAC 80B5A25C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 06EB0 80B5A260 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 06EB4 80B5A264 000FC080 */ sll $t8, $t7, 2 +/* 06EB4 80B5A264 000FC080 */ sll $t8, $t7, 2 /* 06EB8 80B5A268 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 06EBC 80B5A26C 00F82021 */ addu $a0, $a3, $t8 +/* 06EBC 80B5A26C 00F82021 */ addu $a0, $a3, $t8 /* 06EC0 80B5A270 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 06EC4 80B5A274 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 /* 06EC8 80B5A278 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 /* 06ECC 80B5A27C 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 06ED0 80B5A280 01282824 */ and $a1, $t1, $t0 +/* 06ED0 80B5A280 01282824 */ and $a1, $t1, $t0 /* 06ED4 80B5A284 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 06ED8 80B5A288 03255021 */ addu $t2, $t9, $a1 -/* 06EDC 80B5A28C 01465821 */ addu $t3, $t2, $a2 +/* 06ED8 80B5A288 03255021 */ addu $t2, $t9, $a1 +/* 06EDC 80B5A28C 01465821 */ addu $t3, $t2, $a2 /* 06EE0 80B5A290 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 06EE4 80B5A294 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 06EE8 80B5A298 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -57,23 +57,23 @@ glabel func_80B5A1D0 /* 06EFC 80B5A2AC 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 /* 06F00 80B5A2B0 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 06F04 80B5A2B4 354A0028 */ ori $t2, $t2, 0x0028 ## $t2 = DB060028 -/* 06F08 80B5A2B8 01C57821 */ addu $t7, $t6, $a1 -/* 06F0C 80B5A2BC 01E6C021 */ addu $t8, $t7, $a2 +/* 06F08 80B5A2B8 01C57821 */ addu $t7, $t6, $a1 +/* 06F0C 80B5A2BC 01E6C021 */ addu $t8, $t7, $a2 /* 06F10 80B5A2C0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 06F14 80B5A2C4 8FA4006C */ lw $a0, 0x006C($sp) +/* 06F14 80B5A2C4 8FA4006C */ lw $a0, 0x006C($sp) /* 06F18 80B5A2C8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 06F1C 80B5A2CC 00045900 */ sll $t3, $a0, 4 -/* 06F20 80B5A2D0 000B6702 */ srl $t4, $t3, 28 +/* 06F1C 80B5A2CC 00045900 */ sll $t3, $a0, 4 +/* 06F20 80B5A2D0 000B6702 */ srl $t4, $t3, 28 /* 06F24 80B5A2D4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 06F28 80B5A2D8 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 06F2C 80B5A2DC 000C6880 */ sll $t5, $t4, 2 -/* 06F30 80B5A2E0 00ED7021 */ addu $t6, $a3, $t5 +/* 06F2C 80B5A2DC 000C6880 */ sll $t5, $t4, 2 +/* 06F30 80B5A2E0 00ED7021 */ addu $t6, $a3, $t5 /* 06F34 80B5A2E4 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 06F38 80B5A2E8 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 06F3C 80B5A2EC 0088C024 */ and $t8, $a0, $t0 +/* 06F3C 80B5A2EC 0088C024 */ and $t8, $a0, $t0 /* 06F40 80B5A2F0 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 06F44 80B5A2F4 01F8C821 */ addu $t9, $t7, $t8 -/* 06F48 80B5A2F8 03265021 */ addu $t2, $t9, $a2 +/* 06F44 80B5A2F4 01F8C821 */ addu $t9, $t7, $t8 +/* 06F48 80B5A2F8 03265021 */ addu $t2, $t9, $a2 /* 06F4C 80B5A2FC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 06F50 80B5A300 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 06F54 80B5A304 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 @@ -97,25 +97,25 @@ glabel func_80B5A1D0 /* 06F9C 80B5A34C 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 06FA0 80B5A350 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 06FA4 80B5A354 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 06FA8 80B5A358 AFB10018 */ sw $s1, 0x0018($sp) -/* 06FAC 80B5A35C AFA00014 */ sw $zero, 0x0014($sp) -/* 06FB0 80B5A360 AFAA0010 */ sw $t2, 0x0010($sp) +/* 06FA8 80B5A358 AFB10018 */ sw $s1, 0x0018($sp) +/* 06FAC 80B5A35C AFA00014 */ sw $zero, 0x0014($sp) +/* 06FB0 80B5A360 AFAA0010 */ sw $t2, 0x0010($sp) /* 06FB4 80B5A364 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 -/* 06FB8 80B5A368 8FA4008C */ lw $a0, 0x008C($sp) -/* 06FBC 80B5A36C 0C0289CF */ jal func_800A273C -/* 06FC0 80B5A370 AFAB001C */ sw $t3, 0x001C($sp) +/* 06FB8 80B5A368 8FA4008C */ lw $a0, 0x008C($sp) +/* 06FBC 80B5A36C 0C0289CF */ jal SkelAnime_DrawSV2 +/* 06FC0 80B5A370 AFAB001C */ sw $t3, 0x001C($sp) /* 06FC4 80B5A374 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 06FC8 80B5A378 8FAC008C */ lw $t4, 0x008C($sp) +/* 06FC8 80B5A378 8FAC008C */ lw $t4, 0x008C($sp) /* 06FCC 80B5A37C 3C0680B6 */ lui $a2, %hi(D_80B5AA7C) ## $a2 = 80B60000 /* 06FD0 80B5A380 24C6AA7C */ addiu $a2, $a2, %lo(D_80B5AA7C) ## $a2 = 80B5AA7C /* 06FD4 80B5A384 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 06FD8 80B5A388 240708BA */ addiu $a3, $zero, 0x08BA ## $a3 = 000008BA -/* 06FDC 80B5A38C 0C031AD5 */ jal func_800C6B54 +/* 06FDC 80B5A38C 0C031AD5 */ jal func_800C6B54 /* 06FE0 80B5A390 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 06FE4 80B5A394 8FBF002C */ lw $ra, 0x002C($sp) -/* 06FE8 80B5A398 8FB00024 */ lw $s0, 0x0024($sp) -/* 06FEC 80B5A39C 8FB10028 */ lw $s1, 0x0028($sp) -/* 06FF0 80B5A3A0 03E00008 */ jr $ra +/* 06FE4 80B5A394 8FBF002C */ lw $ra, 0x002C($sp) +/* 06FE8 80B5A398 8FB00024 */ lw $s0, 0x0024($sp) +/* 06FEC 80B5A39C 8FB10028 */ lw $s1, 0x0028($sp) +/* 06FF0 80B5A3A0 03E00008 */ jr $ra /* 06FF4 80B5A3A4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s index 94e048a3ac..d1a4ecc2c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s @@ -1,9 +1,9 @@ glabel EnZl4_Draw /* 02D9C 80B5E54C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 02DA0 80B5E550 3C0F80B6 */ lui $t7, %hi(D_80B5FB48) ## $t7 = 80B60000 -/* 02DA4 80B5E554 AFBF002C */ sw $ra, 0x002C($sp) -/* 02DA8 80B5E558 AFB00028 */ sw $s0, 0x0028($sp) -/* 02DAC 80B5E55C AFA5008C */ sw $a1, 0x008C($sp) +/* 02DA4 80B5E554 AFBF002C */ sw $ra, 0x002C($sp) +/* 02DA8 80B5E558 AFB00028 */ sw $s0, 0x0028($sp) +/* 02DAC 80B5E55C AFA5008C */ sw $a1, 0x008C($sp) /* 02DB0 80B5E560 25EFFB48 */ addiu $t7, $t7, %lo(D_80B5FB48) ## $t7 = 80B5FB48 /* 02DB4 80B5E564 8DF90000 */ lw $t9, 0x0000($t7) ## 80B5FB48 /* 02DB8 80B5E568 8DF80004 */ lw $t8, 0x0004($t7) ## 80B5FB4C @@ -32,15 +32,15 @@ glabel EnZl4_Draw /* 02E14 80B5E5C4 AD4C0014 */ sw $t4, 0x0014($t2) ## FFFFFFE4 /* 02E18 80B5E5C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02E1C 80B5E5CC AD4D0018 */ sw $t5, 0x0018($t2) ## FFFFFFE8 -/* 02E20 80B5E5D0 8FAE008C */ lw $t6, 0x008C($sp) +/* 02E20 80B5E5D0 8FAE008C */ lw $t6, 0x008C($sp) /* 02E24 80B5E5D4 3C0680B6 */ lui $a2, %hi(D_80B5FB80) ## $a2 = 80B60000 /* 02E28 80B5E5D8 24C6FB80 */ addiu $a2, $a2, %lo(D_80B5FB80) ## $a2 = 80B5FB80 /* 02E2C 80B5E5DC 8DC50000 */ lw $a1, 0x0000($t6) ## FFFFFFEC /* 02E30 80B5E5E0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFBC /* 02E34 80B5E5E4 240707DC */ addiu $a3, $zero, 0x07DC ## $a3 = 000007DC -/* 02E38 80B5E5E8 0C031AB1 */ jal func_800C6AC4 -/* 02E3C 80B5E5EC AFA50054 */ sw $a1, 0x0054($sp) -/* 02E40 80B5E5F0 8FA80054 */ lw $t0, 0x0054($sp) +/* 02E38 80B5E5E8 0C031AB1 */ jal func_800C6AC4 +/* 02E3C 80B5E5EC AFA50054 */ sw $a1, 0x0054($sp) +/* 02E40 80B5E5F0 8FA80054 */ lw $t0, 0x0054($sp) /* 02E44 80B5E5F4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 02E48 80B5E5F8 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 02E4C 80B5E5FC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 @@ -52,20 +52,20 @@ glabel EnZl4_Draw /* 02E64 80B5E614 9219020B */ lbu $t9, 0x020B($s0) ## 0000020B /* 02E68 80B5E618 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 02E6C 80B5E61C 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 02E70 80B5E620 00195080 */ sll $t2, $t9, 2 -/* 02E74 80B5E624 012A5821 */ addu $t3, $t1, $t2 +/* 02E70 80B5E620 00195080 */ sll $t2, $t9, 2 +/* 02E74 80B5E624 012A5821 */ addu $t3, $t1, $t2 /* 02E78 80B5E628 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 02E7C 80B5E62C 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF /* 02E80 80B5E630 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 02E84 80B5E634 00046900 */ sll $t5, $a0, 4 -/* 02E88 80B5E638 000D7702 */ srl $t6, $t5, 28 -/* 02E8C 80B5E63C 000E7880 */ sll $t7, $t6, 2 -/* 02E90 80B5E640 00CFC021 */ addu $t8, $a2, $t7 +/* 02E84 80B5E634 00046900 */ sll $t5, $a0, 4 +/* 02E88 80B5E638 000D7702 */ srl $t6, $t5, 28 +/* 02E8C 80B5E63C 000E7880 */ sll $t7, $t6, 2 +/* 02E90 80B5E640 00CFC021 */ addu $t8, $a2, $t7 /* 02E94 80B5E644 8F190000 */ lw $t9, 0x0000($t8) ## DB060020 -/* 02E98 80B5E648 00856024 */ and $t4, $a0, $a1 +/* 02E98 80B5E648 00856024 */ and $t4, $a0, $a1 /* 02E9C 80B5E64C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 02EA0 80B5E650 01995021 */ addu $t2, $t4, $t9 -/* 02EA4 80B5E654 01475821 */ addu $t3, $t2, $a3 +/* 02EA0 80B5E650 01995021 */ addu $t2, $t4, $t9 +/* 02EA4 80B5E654 01475821 */ addu $t3, $t2, $a3 /* 02EA8 80B5E658 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 02EAC 80B5E65C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02EB0 80B5E660 35CE0024 */ ori $t6, $t6, 0x0024 ## $t6 = DB060024 @@ -73,18 +73,18 @@ glabel EnZl4_Draw /* 02EB8 80B5E668 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 02EBC 80B5E66C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 02EC0 80B5E670 920F020A */ lbu $t7, 0x020A($s0) ## 0000020A -/* 02EC4 80B5E674 000FC080 */ sll $t8, $t7, 2 -/* 02EC8 80B5E678 01386021 */ addu $t4, $t1, $t8 +/* 02EC4 80B5E674 000FC080 */ sll $t8, $t7, 2 +/* 02EC8 80B5E678 01386021 */ addu $t4, $t1, $t8 /* 02ECC 80B5E67C 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 02ED0 80B5E680 00045100 */ sll $t2, $a0, 4 -/* 02ED4 80B5E684 000A5F02 */ srl $t3, $t2, 28 -/* 02ED8 80B5E688 000B6880 */ sll $t5, $t3, 2 -/* 02EDC 80B5E68C 00CD7021 */ addu $t6, $a2, $t5 +/* 02ED0 80B5E680 00045100 */ sll $t2, $a0, 4 +/* 02ED4 80B5E684 000A5F02 */ srl $t3, $t2, 28 +/* 02ED8 80B5E688 000B6880 */ sll $t5, $t3, 2 +/* 02EDC 80B5E68C 00CD7021 */ addu $t6, $a2, $t5 /* 02EE0 80B5E690 8DCF0000 */ lw $t7, 0x0000($t6) ## DB060024 -/* 02EE4 80B5E694 0085C824 */ and $t9, $a0, $a1 +/* 02EE4 80B5E694 0085C824 */ and $t9, $a0, $a1 /* 02EE8 80B5E698 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 02EEC 80B5E69C 032FC021 */ addu $t8, $t9, $t7 -/* 02EF0 80B5E6A0 03076021 */ addu $t4, $t8, $a3 +/* 02EEC 80B5E69C 032FC021 */ addu $t8, $t9, $t7 +/* 02EF0 80B5E6A0 03076021 */ addu $t4, $t8, $a3 /* 02EF4 80B5E6A4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 02EF8 80B5E6A8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02EFC 80B5E6AC 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 @@ -92,20 +92,20 @@ glabel EnZl4_Draw /* 02F04 80B5E6B4 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 /* 02F08 80B5E6B8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 02F0C 80B5E6BC 920D020C */ lbu $t5, 0x020C($s0) ## 0000020C -/* 02F10 80B5E6C0 000D7080 */ sll $t6, $t5, 2 -/* 02F14 80B5E6C4 03AE2021 */ addu $a0, $sp, $t6 +/* 02F10 80B5E6C0 000D7080 */ sll $t6, $t5, 2 +/* 02F14 80B5E6C4 03AE2021 */ addu $a0, $sp, $t6 /* 02F18 80B5E6C8 8C840074 */ lw $a0, 0x0074($a0) ## 00000074 -/* 02F1C 80B5E6CC 00047900 */ sll $t7, $a0, 4 -/* 02F20 80B5E6D0 000FC702 */ srl $t8, $t7, 28 -/* 02F24 80B5E6D4 00186080 */ sll $t4, $t8, 2 -/* 02F28 80B5E6D8 00CC5021 */ addu $t2, $a2, $t4 +/* 02F1C 80B5E6CC 00047900 */ sll $t7, $a0, 4 +/* 02F20 80B5E6D0 000FC702 */ srl $t8, $t7, 28 +/* 02F24 80B5E6D4 00186080 */ sll $t4, $t8, 2 +/* 02F28 80B5E6D8 00CC5021 */ addu $t2, $a2, $t4 /* 02F2C 80B5E6DC 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000008 -/* 02F30 80B5E6E0 0085C824 */ and $t9, $a0, $a1 -/* 02F34 80B5E6E4 032B6821 */ addu $t5, $t9, $t3 -/* 02F38 80B5E6E8 01A77021 */ addu $t6, $t5, $a3 +/* 02F30 80B5E6E0 0085C824 */ and $t9, $a0, $a1 +/* 02F34 80B5E6E4 032B6821 */ addu $t5, $t9, $t3 +/* 02F38 80B5E6E8 01A77021 */ addu $t6, $t5, $a3 /* 02F3C 80B5E6EC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 02F40 80B5E6F0 8FAF008C */ lw $t7, 0x008C($sp) -/* 02F44 80B5E6F4 0C024F46 */ jal func_80093D18 +/* 02F40 80B5E6F0 8FAF008C */ lw $t7, 0x008C($sp) +/* 02F44 80B5E6F4 0C024F46 */ jal func_80093D18 /* 02F48 80B5E6F8 8DE40000 */ lw $a0, 0x0000($t7) ## 00000008 /* 02F4C 80B5E6FC 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 02F50 80B5E700 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -114,22 +114,22 @@ glabel EnZl4_Draw /* 02F5C 80B5E70C 3C0C80B6 */ lui $t4, %hi(func_80B5E4F0) ## $t4 = 80B60000 /* 02F60 80B5E710 258CE4F0 */ addiu $t4, $t4, %lo(func_80B5E4F0) ## $t4 = 80B5E4F0 /* 02F64 80B5E714 2718E364 */ addiu $t8, $t8, %lo(func_80B5E364) ## $t8 = 80B5E364 -/* 02F68 80B5E718 AFB80010 */ sw $t8, 0x0010($sp) -/* 02F6C 80B5E71C AFAC0014 */ sw $t4, 0x0014($sp) -/* 02F70 80B5E720 AFB00018 */ sw $s0, 0x0018($sp) -/* 02F74 80B5E724 0C0286B2 */ jal func_800A1AC8 -/* 02F78 80B5E728 8FA4008C */ lw $a0, 0x008C($sp) -/* 02F7C 80B5E72C 8FAA008C */ lw $t2, 0x008C($sp) +/* 02F68 80B5E718 AFB80010 */ sw $t8, 0x0010($sp) +/* 02F6C 80B5E71C AFAC0014 */ sw $t4, 0x0014($sp) +/* 02F70 80B5E720 AFB00018 */ sw $s0, 0x0018($sp) +/* 02F74 80B5E724 0C0286B2 */ jal SkelAnime_DrawSV +/* 02F78 80B5E728 8FA4008C */ lw $a0, 0x008C($sp) +/* 02F7C 80B5E72C 8FAA008C */ lw $t2, 0x008C($sp) /* 02F80 80B5E730 3C0680B6 */ lui $a2, %hi(D_80B5FB90) ## $a2 = 80B60000 /* 02F84 80B5E734 24C6FB90 */ addiu $a2, $a2, %lo(D_80B5FB90) ## $a2 = 80B5FB90 /* 02F88 80B5E738 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFBC /* 02F8C 80B5E73C 240707FB */ addiu $a3, $zero, 0x07FB ## $a3 = 000007FB -/* 02F90 80B5E740 0C031AD5 */ jal func_800C6B54 +/* 02F90 80B5E740 0C031AD5 */ jal func_800C6B54 /* 02F94 80B5E744 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 02F98 80B5E748 8FBF002C */ lw $ra, 0x002C($sp) -/* 02F9C 80B5E74C 8FB00028 */ lw $s0, 0x0028($sp) +/* 02F98 80B5E748 8FBF002C */ lw $ra, 0x002C($sp) +/* 02F9C 80B5E74C 8FB00028 */ lw $s0, 0x0028($sp) /* 02FA0 80B5E750 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 02FA4 80B5E754 03E00008 */ jr $ra +/* 02FA4 80B5E754 03E00008 */ jr $ra /* 02FA8 80B5E758 00000000 */ nop /* 02FAC 80B5E75C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s index 6406f1e156..296ba4bbf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s @@ -1,56 +1,56 @@ glabel EnZl4_Init /* 005FC 80B5BDAC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00600 80B5BDB0 AFB00024 */ sw $s0, 0x0024($sp) +/* 00600 80B5BDB0 AFB00024 */ sw $s0, 0x0024($sp) /* 00604 80B5BDB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00608 80B5BDB8 AFB10028 */ sw $s1, 0x0028($sp) -/* 0060C 80B5BDBC AFBF002C */ sw $ra, 0x002C($sp) -/* 00610 80B5BDC0 AFA50044 */ sw $a1, 0x0044($sp) +/* 00608 80B5BDB8 AFB10028 */ sw $s1, 0x0028($sp) +/* 0060C 80B5BDBC AFBF002C */ sw $ra, 0x002C($sp) +/* 00610 80B5BDC0 AFA50044 */ sw $a1, 0x0044($sp) /* 00614 80B5BDC4 2611014C */ addiu $s1, $s0, 0x014C ## $s1 = 0000014C /* 00618 80B5BDC8 260E0218 */ addiu $t6, $s0, 0x0218 ## $t6 = 00000218 /* 0061C 80B5BDCC 260F0284 */ addiu $t7, $s0, 0x0284 ## $t7 = 00000284 /* 00620 80B5BDD0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00624 80B5BDD4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00628 80B5BDD8 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 0062C 80B5BDDC AFB80018 */ sw $t8, 0x0018($sp) +/* 0062C 80B5BDDC AFB80018 */ sw $t8, 0x0018($sp) /* 00630 80B5BDE0 24C6E038 */ addiu $a2, $a2, 0xE038 ## $a2 = 0600E038 /* 00634 80B5BDE4 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C -/* 00638 80B5BDE8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0063C 80B5BDEC AFAE0010 */ sw $t6, 0x0010($sp) -/* 00640 80B5BDF0 0C0291BE */ jal func_800A46F8 +/* 00638 80B5BDE8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0063C 80B5BDEC AFAE0010 */ sw $t6, 0x0010($sp) +/* 00640 80B5BDF0 0C0291BE */ jal SkelAnime_InitSV /* 00644 80B5BDF4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00648 80B5BDF8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0064C 80B5BDFC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00650 80B5BE00 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00654 80B5BE04 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00658 80B5BE08 0C00AC78 */ jal ActorShape_Init - + /* 0065C 80B5BE0C 3C074190 */ lui $a3, 0x4190 ## $a3 = 41900000 /* 00660 80B5BE10 3C0580B6 */ lui $a1, %hi(D_80B5E7B8) ## $a1 = 80B60000 /* 00664 80B5BE14 24A5E7B8 */ addiu $a1, $a1, %lo(D_80B5E7B8) ## $a1 = 80B5E7B8 /* 00668 80B5BE18 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 0066C 80B5BE1C 0C00D3B0 */ jal func_80034EC0 +/* 0066C 80B5BE1C 0C00D3B0 */ jal func_80034EC0 /* 00670 80B5BE20 24060015 */ addiu $a2, $zero, 0x0015 ## $a2 = 00000015 /* 00674 80B5BE24 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00678 80B5BE28 AFA50030 */ sw $a1, 0x0030($sp) +/* 00678 80B5BE28 AFA50030 */ sw $a1, 0x0030($sp) /* 0067C 80B5BE2C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00680 80B5BE30 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00680 80B5BE30 8FA40044 */ lw $a0, 0x0044($sp) /* 00684 80B5BE34 3C0780B6 */ lui $a3, %hi(D_80B5E780) ## $a3 = 80B60000 -/* 00688 80B5BE38 8FA50030 */ lw $a1, 0x0030($sp) +/* 00688 80B5BE38 8FA50030 */ lw $a1, 0x0030($sp) /* 0068C 80B5BE3C 24E7E780 */ addiu $a3, $a3, %lo(D_80B5E780) ## $a3 = 80B5E780 -/* 00690 80B5BE40 8FA40044 */ lw $a0, 0x0044($sp) +/* 00690 80B5BE40 8FA40044 */ lw $a0, 0x0044($sp) /* 00694 80B5BE44 0C01712B */ jal ActorCollider_InitCylinder - + /* 00698 80B5BE48 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0069C 80B5BE4C 3C0680B6 */ lui $a2, %hi(D_80B5E7AC) ## $a2 = 80B60000 /* 006A0 80B5BE50 24C6E7AC */ addiu $a2, $a2, %lo(D_80B5E7AC) ## $a2 = 80B5E7AC /* 006A4 80B5BE54 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 006A8 80B5BE58 0C0187BF */ jal func_80061EFC +/* 006A8 80B5BE58 0C0187BF */ jal func_80061EFC /* 006AC 80B5BE5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 006B0 80B5BE60 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 006B4 80B5BE64 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 006B8 80B5BE68 0C00B58B */ jal Actor_SetScale - + /* 006BC 80B5BE6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006C0 80B5BE70 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 006C4 80B5BE74 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 @@ -63,48 +63,48 @@ glabel EnZl4_Init /* 006E0 80B5BE90 8C4A1360 */ lw $t2, 0x1360($v0) ## 8015F9C0 /* 006E4 80B5BE94 3C0580B6 */ lui $a1, %hi(D_80B5E7B8) ## $a1 = 80B60000 /* 006E8 80B5BE98 24A5E7B8 */ addiu $a1, $a1, %lo(D_80B5E7B8) ## $a1 = 80B5E7B8 -/* 006EC 80B5BE9C 29410004 */ slti $at, $t2, 0x0004 -/* 006F0 80B5BEA0 14200007 */ bne $at, $zero, .L80B5BEC0 +/* 006EC 80B5BE9C 29410004 */ slti $at, $t2, 0x0004 +/* 006F0 80B5BEA0 14200007 */ bne $at, $zero, .L80B5BEC0 /* 006F4 80B5BEA4 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 006F8 80B5BEA8 0C00D3B0 */ jal func_80034EC0 +/* 006F8 80B5BEA8 0C00D3B0 */ jal func_80034EC0 /* 006FC 80B5BEAC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00700 80B5BEB0 3C0B80B6 */ lui $t3, %hi(func_80B5E108) ## $t3 = 80B60000 /* 00704 80B5BEB4 256BE108 */ addiu $t3, $t3, %lo(func_80B5E108) ## $t3 = 80B5E108 -/* 00708 80B5BEB8 10000026 */ beq $zero, $zero, .L80B5BF54 +/* 00708 80B5BEB8 10000026 */ beq $zero, $zero, .L80B5BF54 /* 0070C 80B5BEBC AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 .L80B5BEC0: /* 00710 80B5BEC0 944C0EDC */ lhu $t4, 0x0EDC($v0) ## 00000EDC /* 00714 80B5BEC4 3C0580B6 */ lui $a1, %hi(D_80B5E7B8) ## $a1 = 80B60000 /* 00718 80B5BEC8 24A5E7B8 */ addiu $a1, $a1, %lo(D_80B5E7B8) ## $a1 = 80B5E7B8 /* 0071C 80B5BECC 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 00720 80B5BED0 11A00007 */ beq $t5, $zero, .L80B5BEF0 +/* 00720 80B5BED0 11A00007 */ beq $t5, $zero, .L80B5BEF0 /* 00724 80B5BED4 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 00728 80B5BED8 0C00D3B0 */ jal func_80034EC0 +/* 00728 80B5BED8 0C00D3B0 */ jal func_80034EC0 /* 0072C 80B5BEDC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00730 80B5BEE0 3C0E80B6 */ lui $t6, %hi(func_80B5E090) ## $t6 = 80B60000 /* 00734 80B5BEE4 25CEE090 */ addiu $t6, $t6, %lo(func_80B5E090) ## $t6 = 80B5E090 -/* 00738 80B5BEE8 1000001A */ beq $zero, $zero, .L80B5BF54 +/* 00738 80B5BEE8 1000001A */ beq $zero, $zero, .L80B5BF54 /* 0073C 80B5BEEC AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 .L80B5BEF0: /* 00740 80B5BEF0 8C4F0000 */ lw $t7, 0x0000($v0) ## 00000000 /* 00744 80B5BEF4 240105F0 */ addiu $at, $zero, 0x05F0 ## $at = 000005F0 /* 00748 80B5BEF8 3C0580B6 */ lui $a1, %hi(D_80B5E7B8) ## $a1 = 80B60000 -/* 0074C 80B5BEFC 11E10008 */ beq $t7, $at, .L80B5BF20 +/* 0074C 80B5BEFC 11E10008 */ beq $t7, $at, .L80B5BF20 /* 00750 80B5BF00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00754 80B5BF04 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00758 80B5BF08 24A5E7B8 */ addiu $a1, $a1, %lo(D_80B5E7B8) ## $a1 = 80B5E7B8 -/* 0075C 80B5BF0C 0C00D3B0 */ jal func_80034EC0 +/* 0075C 80B5BF0C 0C00D3B0 */ jal func_80034EC0 /* 00760 80B5BF10 24060015 */ addiu $a2, $zero, 0x0015 ## $a2 = 00000015 /* 00764 80B5BF14 A2000209 */ sb $zero, 0x0209($s0) ## 00000209 -/* 00768 80B5BF18 1000000B */ beq $zero, $zero, .L80B5BF48 +/* 00768 80B5BF18 1000000B */ beq $zero, $zero, .L80B5BF48 /* 0076C 80B5BF1C A2000208 */ sb $zero, 0x0208($s0) ## 00000208 .L80B5BF20: -/* 00770 80B5BF20 0C2D6F00 */ jal func_80B5BC00 -/* 00774 80B5BF24 8FA50044 */ lw $a1, 0x0044($sp) +/* 00770 80B5BF20 0C2D6F00 */ jal func_80B5BC00 +/* 00774 80B5BF24 8FA50044 */ lw $a1, 0x0044($sp) /* 00778 80B5BF28 3C0580B6 */ lui $a1, %hi(D_80B5E7B8) ## $a1 = 80B60000 /* 0077C 80B5BF2C 24A5E7B8 */ addiu $a1, $a1, %lo(D_80B5E7B8) ## $a1 = 80B5E7B8 /* 00780 80B5BF30 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 00784 80B5BF34 0C00D3B0 */ jal func_80034EC0 +/* 00784 80B5BF34 0C00D3B0 */ jal func_80034EC0 /* 00788 80B5BF38 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0078C 80B5BF3C 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 /* 00790 80B5BF40 A2180209 */ sb $t8, 0x0209($s0) ## 00000209 @@ -114,10 +114,10 @@ glabel EnZl4_Init /* 0079C 80B5BF4C 2739DE1C */ addiu $t9, $t9, %lo(func_80B5DE1C) ## $t9 = 80B5DE1C /* 007A0 80B5BF50 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 .L80B5BF54: -/* 007A4 80B5BF54 8FBF002C */ lw $ra, 0x002C($sp) -/* 007A8 80B5BF58 8FB00024 */ lw $s0, 0x0024($sp) -/* 007AC 80B5BF5C 8FB10028 */ lw $s1, 0x0028($sp) -/* 007B0 80B5BF60 03E00008 */ jr $ra +/* 007A4 80B5BF54 8FBF002C */ lw $ra, 0x002C($sp) +/* 007A8 80B5BF58 8FB00024 */ lw $s0, 0x0024($sp) +/* 007AC 80B5BF5C 8FB10028 */ lw $s1, 0x0028($sp) +/* 007B0 80B5BF60 03E00008 */ jr $ra /* 007B4 80B5BF64 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s index 03f40ad879..7827fdf0b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s @@ -1,69 +1,69 @@ glabel EnZo_Init /* 014BC 80B616DC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 014C0 80B616E0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 014C4 80B616E4 AFB00028 */ sw $s0, 0x0028($sp) -/* 014C8 80B616E8 AFA50044 */ sw $a1, 0x0044($sp) +/* 014C4 80B616E4 AFB00028 */ sw $s0, 0x0028($sp) +/* 014C8 80B616E8 AFA50044 */ sw $a1, 0x0044($sp) /* 014CC 80B616EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 014D0 80B616F0 AFBF002C */ sw $ra, 0x002C($sp) -/* 014D4 80B616F4 44050000 */ mfc1 $a1, $f0 -/* 014D8 80B616F8 44070000 */ mfc1 $a3, $f0 +/* 014D0 80B616F0 AFBF002C */ sw $ra, 0x002C($sp) +/* 014D4 80B616F4 44050000 */ mfc1 $a1, $f0 +/* 014D8 80B616F8 44070000 */ mfc1 $a3, $f0 /* 014DC 80B616FC 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 014E0 80B61700 0C00AC78 */ jal ActorShape_Init - + /* 014E4 80B61704 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 014E8 80B61708 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 014EC 80B6170C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 014F0 80B61710 260E020A */ addiu $t6, $s0, 0x020A ## $t6 = 0000020A /* 014F4 80B61714 260F0282 */ addiu $t7, $s0, 0x0282 ## $t7 = 00000282 /* 014F8 80B61718 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 014FC 80B6171C AFB80018 */ sw $t8, 0x0018($sp) -/* 01500 80B61720 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01504 80B61724 AFAE0010 */ sw $t6, 0x0010($sp) +/* 014FC 80B6171C AFB80018 */ sw $t8, 0x0018($sp) +/* 01500 80B61720 AFAF0014 */ sw $t7, 0x0014($sp) +/* 01504 80B61724 AFAE0010 */ sw $t6, 0x0010($sp) /* 01508 80B61728 24C6BFA8 */ addiu $a2, $a2, 0xBFA8 ## $a2 = 0600BFA8 -/* 0150C 80B6172C AFA50038 */ sw $a1, 0x0038($sp) -/* 01510 80B61730 8FA40044 */ lw $a0, 0x0044($sp) -/* 01514 80B61734 0C0291BE */ jal func_800A46F8 +/* 0150C 80B6172C AFA50038 */ sw $a1, 0x0038($sp) +/* 01510 80B61730 8FA40044 */ lw $a0, 0x0044($sp) +/* 01514 80B61734 0C0291BE */ jal SkelAnime_InitSV /* 01518 80B61738 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0151C 80B6173C 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC -/* 01520 80B61740 AFA50034 */ sw $a1, 0x0034($sp) +/* 01520 80B61740 AFA50034 */ sw $a1, 0x0034($sp) /* 01524 80B61744 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 01528 80B61748 8FA40044 */ lw $a0, 0x0044($sp) + +/* 01528 80B61748 8FA40044 */ lw $a0, 0x0044($sp) /* 0152C 80B6174C 3C0780B6 */ lui $a3, %hi(D_80B6248C) ## $a3 = 80B60000 -/* 01530 80B61750 8FA50034 */ lw $a1, 0x0034($sp) +/* 01530 80B61750 8FA50034 */ lw $a1, 0x0034($sp) /* 01534 80B61754 24E7248C */ addiu $a3, $a3, %lo(D_80B6248C) ## $a3 = 80B6248C -/* 01538 80B61758 8FA40044 */ lw $a0, 0x0044($sp) +/* 01538 80B61758 8FA40044 */ lw $a0, 0x0044($sp) /* 0153C 80B6175C 0C01712B */ jal ActorCollider_InitCylinder - + /* 01540 80B61760 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 01544 80B61764 3C0680B6 */ lui $a2, %hi(D_80B624B8) ## $a2 = 80B60000 /* 01548 80B61768 24C624B8 */ addiu $a2, $a2, %lo(D_80B624B8) ## $a2 = 80B624B8 /* 0154C 80B6176C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 01550 80B61770 0C0187BF */ jal func_80061EFC +/* 01550 80B61770 0C0187BF */ jal func_80061EFC /* 01554 80B61774 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01558 80B61778 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 0155C 80B6177C 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 /* 01560 80B61780 3C0580B6 */ lui $a1, %hi(D_80B624E4) ## $a1 = 80B60000 /* 01564 80B61784 24A524E4 */ addiu $a1, $a1, %lo(D_80B624E4) ## $a1 = 80B624E4 -/* 01568 80B61788 1720000A */ bne $t9, $zero, .L80B617B4 -/* 0156C 80B6178C 8FA40038 */ lw $a0, 0x0038($sp) +/* 01568 80B61788 1720000A */ bne $t9, $zero, .L80B617B4 +/* 0156C 80B6178C 8FA40038 */ lw $a0, 0x0038($sp) /* 01570 80B61790 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 01574 80B61794 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 01578 80B61798 3109003F */ andi $t1, $t0, 0x003F ## $t1 = 00000000 -/* 0157C 80B6179C 15210005 */ bne $t1, $at, .L80B617B4 +/* 0157C 80B6179C 15210005 */ bne $t1, $at, .L80B617B4 /* 01580 80B617A0 00000000 */ nop /* 01584 80B617A4 0C00B55C */ jal Actor_Kill - + /* 01588 80B617A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0158C 80B617AC 10000049 */ beq $zero, $zero, .L80B618D4 -/* 01590 80B617B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0158C 80B617AC 10000049 */ beq $zero, $zero, .L80B618D4 +/* 01590 80B617B0 8FBF002C */ lw $ra, 0x002C($sp) .L80B617B4: -/* 01594 80B617B4 0C00D3B0 */ jal func_80034EC0 +/* 01594 80B617B4 0C00D3B0 */ jal func_80034EC0 /* 01598 80B617B8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0159C 80B617BC 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 015A0 80B617C0 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 015A4 80B617C4 0C00B58B */ jal Actor_SetScale - + /* 015A8 80B617C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 015AC 80B617CC 860D01FE */ lh $t5, 0x01FE($s0) ## 000001FE /* 015B0 80B617D0 860B01FC */ lh $t3, 0x01FC($s0) ## 000001FC @@ -71,43 +71,43 @@ glabel EnZo_Init /* 015B8 80B617D8 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 /* 015BC 80B617DC 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 /* 015C0 80B617E0 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 015C4 80B617E4 46805420 */ cvt.s.w $f16, $f10 +/* 015C4 80B617E4 46805420 */ cvt.s.w $f16, $f10 /* 015C8 80B617E8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 015CC 80B617EC 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 /* 015D0 80B617F0 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 /* 015D4 80B617F4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 015D8 80B617F8 46802020 */ cvt.s.w $f0, $f4 -/* 015DC 80B617FC 46128102 */ mul.s $f4, $f16, $f18 +/* 015D8 80B617F8 46802020 */ cvt.s.w $f0, $f4 +/* 015DC 80B617FC 46128102 */ mul.s $f4, $f16, $f18 /* 015E0 80B61800 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F /* 015E4 80B61804 A60C064C */ sh $t4, 0x064C($s0) ## 0000064C /* 015E8 80B61808 A2000208 */ sb $zero, 0x0208($s0) ## 00000208 /* 015EC 80B6180C A6000194 */ sh $zero, 0x0194($s0) ## 00000194 -/* 015F0 80B61810 46060200 */ add.s $f8, $f0, $f6 +/* 015F0 80B61810 46060200 */ add.s $f8, $f0, $f6 /* 015F4 80B61814 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 015F8 80B61818 44062000 */ mfc1 $a2, $f4 -/* 015FC 80B6181C 44070000 */ mfc1 $a3, $f0 +/* 015F8 80B61818 44062000 */ mfc1 $a2, $f4 +/* 015FC 80B6181C 44070000 */ mfc1 $a3, $f0 /* 01600 80B61820 E6080644 */ swc1 $f8, 0x0644($s0) ## 00000644 /* 01604 80B61824 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 01608 80B61828 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0160C 80B6182C 8FA40044 */ lw $a0, 0x0044($sp) +/* 01608 80B61828 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0160C 80B6182C 8FA40044 */ lw $a0, 0x0044($sp) /* 01610 80B61830 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01614 80B61834 0C00B92D */ jal func_8002E4B4 -/* 01618 80B61838 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01614 80B61834 0C00B92D */ jal func_8002E4B4 +/* 01618 80B61838 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0161C 80B6183C 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 01620 80B61840 44815000 */ mtc1 $at, $f10 ## $f10 = 54.00 /* 01624 80B61844 C6080084 */ lwc1 $f8, 0x0084($s0) ## 00000084 /* 01628 80B61848 3C198003 */ lui $t9, 0x8003 ## $t9 = 80030000 /* 0162C 80B6184C 3C0580B6 */ lui $a1, %hi(D_80B624E4) ## $a1 = 80B60000 -/* 01630 80B61850 460A403C */ c.lt.s $f8, $f10 +/* 01630 80B61850 460A403C */ c.lt.s $f8, $f10 /* 01634 80B61854 2739B5EC */ addiu $t9, $t9, 0xB5EC ## $t9 = 8002B5EC /* 01638 80B61858 24A524E4 */ addiu $a1, $a1, %lo(D_80B624E4) ## $a1 = 80B624E4 -/* 0163C 80B6185C 45030008 */ bc1tl .L80B61880 +/* 0163C 80B6185C 45030008 */ bc1tl .L80B61880 /* 01640 80B61860 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 /* 01644 80B61864 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 01648 80B61868 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 0164C 80B6186C 3C0C80B6 */ lui $t4, %hi(func_80B619D4) ## $t4 = 80B60000 /* 01650 80B61870 31F8003F */ andi $t8, $t7, 0x003F ## $t8 = 00000000 -/* 01654 80B61874 17010011 */ bne $t8, $at, .L80B618BC +/* 01654 80B61874 17010011 */ bne $t8, $at, .L80B618BC /* 01658 80B61878 258C19D4 */ addiu $t4, $t4, %lo(func_80B619D4) ## $t4 = 80B619D4 /* 0165C 80B6187C 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 .L80B61880: @@ -115,8 +115,8 @@ glabel EnZo_Init /* 01664 80B61884 AE1900C0 */ sw $t9, 0x00C0($s0) ## 000000C0 /* 01668 80B61888 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0166C 80B6188C E61000C4 */ swc1 $f16, 0x00C4($s0) ## 000000C4 -/* 01670 80B61890 0C00D3B0 */ jal func_80034EC0 -/* 01674 80B61894 8FA40038 */ lw $a0, 0x0038($sp) +/* 01670 80B61890 0C00D3B0 */ jal func_80034EC0 +/* 01674 80B61894 8FA40038 */ lw $a0, 0x0038($sp) /* 01678 80B61898 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 0167C 80B6189C 44819000 */ mtc1 $at, $f18 ## $f18 = 255.00 /* 01680 80B618A0 3C0980B6 */ lui $t1, %hi(func_80B618F0) ## $t1 = 80B60000 @@ -124,20 +124,20 @@ glabel EnZo_Init /* 01688 80B618A8 252918F0 */ addiu $t1, $t1, %lo(func_80B618F0) ## $t1 = 80B618F0 /* 0168C 80B618AC A2080208 */ sb $t0, 0x0208($s0) ## 00000208 /* 01690 80B618B0 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 01694 80B618B4 10000006 */ beq $zero, $zero, .L80B618D0 +/* 01694 80B618B4 10000006 */ beq $zero, $zero, .L80B618D0 /* 01698 80B618B8 E6120648 */ swc1 $f18, 0x0648($s0) ## 00000648 .L80B618BC: /* 0169C 80B618BC 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 016A0 80B618C0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 016A4 80B618C4 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 016A8 80B618C8 01415824 */ and $t3, $t2, $at +/* 016A8 80B618C8 01415824 */ and $t3, $t2, $at /* 016AC 80B618CC AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 .L80B618D0: -/* 016B0 80B618D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 016B0 80B618D0 8FBF002C */ lw $ra, 0x002C($sp) .L80B618D4: -/* 016B4 80B618D4 8FB00028 */ lw $s0, 0x0028($sp) +/* 016B4 80B618D4 8FB00028 */ lw $s0, 0x0028($sp) /* 016B8 80B618D8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 016BC 80B618DC 03E00008 */ jr $ra +/* 016BC 80B618DC 03E00008 */ jr $ra /* 016C0 80B618E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s index 57ec86d45b..66d4c336fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s @@ -1,15 +1,15 @@ glabel func_80B62B04 /* 00144 80B62B04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00148 80B62B08 AFA5001C */ sw $a1, 0x001C($sp) -/* 0014C 80B62B0C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00148 80B62B08 AFA5001C */ sw $a1, 0x001C($sp) +/* 0014C 80B62B0C AFBF0014 */ sw $ra, 0x0014($sp) /* 00150 80B62B10 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00154 80B62B14 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00158 80B62B18 24A5E8A0 */ addiu $a1, $a1, 0xE8A0 ## $a1 = 0600E8A0 -/* 0015C 80B62B1C AFA60018 */ sw $a2, 0x0018($sp) -/* 00160 80B62B20 0C0294BE */ jal func_800A52F8 +/* 0015C 80B62B1C AFA60018 */ sw $a2, 0x0018($sp) +/* 00160 80B62B20 0C0294BE */ jal SkelAnime_ChangeAnimationDefault /* 00164 80B62B24 24840250 */ addiu $a0, $a0, 0x0250 ## $a0 = 00000250 /* 00168 80B62B28 3C014160 */ lui $at, 0x4160 ## $at = 41600000 -/* 0016C 80B62B2C 8FA60018 */ lw $a2, 0x0018($sp) +/* 0016C 80B62B2C 8FA60018 */ lw $a2, 0x0018($sp) /* 00170 80B62B30 44812000 */ mtc1 $at, $f4 ## $f4 = 14.00 /* 00174 80B62B34 3C01C396 */ lui $at, 0xC396 ## $at = C3960000 /* 00178 80B62B38 44813000 */ mtc1 $at, $f6 ## $f6 = -300.00 @@ -19,11 +19,11 @@ glabel func_80B62B04 /* 00188 80B62B48 ACCE01FC */ sw $t6, 0x01FC($a2) ## 000001FC /* 0018C 80B62B4C E4C40024 */ swc1 $f4, 0x0024($a2) ## 00000024 /* 00190 80B62B50 E4C60028 */ swc1 $f6, 0x0028($a2) ## 00000028 -/* 00194 80B62B54 C4285398 */ lwc1 $f8, %lo(D_80B65398)($at) +/* 00194 80B62B54 C4285398 */ lwc1 $f8, %lo(D_80B65398)($at) /* 00198 80B62B58 E4C8002C */ swc1 $f8, 0x002C($a2) ## 0000002C -/* 0019C 80B62B5C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0019C 80B62B5C 8FBF0014 */ lw $ra, 0x0014($sp) /* 001A0 80B62B60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001A4 80B62B64 03E00008 */ jr $ra +/* 001A4 80B62B64 03E00008 */ jr $ra /* 001A8 80B62B68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s index d1efacd203..7643494135 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s @@ -1,30 +1,30 @@ glabel func_80B62B6C /* 001AC 80B62B6C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 001B0 80B62B70 AFBF003C */ sw $ra, 0x003C($sp) -/* 001B4 80B62B74 AFB00038 */ sw $s0, 0x0038($sp) -/* 001B8 80B62B78 AFA5006C */ sw $a1, 0x006C($sp) +/* 001B0 80B62B70 AFBF003C */ sw $ra, 0x003C($sp) +/* 001B4 80B62B74 AFB00038 */ sw $s0, 0x0038($sp) +/* 001B8 80B62B78 AFA5006C */ sw $a1, 0x006C($sp) /* 001BC 80B62B7C 8C8F0118 */ lw $t7, 0x0118($a0) ## 00000118 /* 001C0 80B62B80 8CA71C44 */ lw $a3, 0x1C44($a1) ## 00001C44 /* 001C4 80B62B84 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 001C8 80B62B88 AFAF005C */ sw $t7, 0x005C($sp) +/* 001C8 80B62B88 AFAF005C */ sw $t7, 0x005C($sp) /* 001CC 80B62B8C 848301CA */ lh $v1, 0x01CA($a0) ## 000001CA /* 001D0 80B62B90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001D4 80B62B94 50610007 */ beql $v1, $at, .L80B62BB4 -/* 001D8 80B62B98 2C610010 */ sltiu $at, $v1, 0x0010 +/* 001D4 80B62B94 50610007 */ beql $v1, $at, .L80B62BB4 +/* 001D8 80B62B98 2C610010 */ sltiu $at, $v1, 0x0010 /* 001DC 80B62B9C 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 /* 001E0 80B62BA0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 001E4 80B62BA4 AFA70060 */ sw $a3, 0x0060($sp) -/* 001E8 80B62BA8 8FA70060 */ lw $a3, 0x0060($sp) + +/* 001E4 80B62BA4 AFA70060 */ sw $a3, 0x0060($sp) +/* 001E8 80B62BA8 8FA70060 */ lw $a3, 0x0060($sp) /* 001EC 80B62BAC 860301CA */ lh $v1, 0x01CA($s0) ## 000001CA -/* 001F0 80B62BB0 2C610010 */ sltiu $at, $v1, 0x0010 +/* 001F0 80B62BB0 2C610010 */ sltiu $at, $v1, 0x0010 .L80B62BB4: -/* 001F4 80B62BB4 10200467 */ beq $at, $zero, .L80B63D54 -/* 001F8 80B62BB8 0003C080 */ sll $t8, $v1, 2 +/* 001F4 80B62BB4 10200467 */ beq $at, $zero, .L80B63D54 +/* 001F8 80B62BB8 0003C080 */ sll $t8, $v1, 2 /* 001FC 80B62BBC 3C0180B6 */ lui $at, %hi(jtbl_80B6539C) ## $at = 80B60000 -/* 00200 80B62BC0 00380821 */ addu $at, $at, $t8 -/* 00204 80B62BC4 8C38539C */ lw $t8, %lo(jtbl_80B6539C)($at) -/* 00208 80B62BC8 03000008 */ jr $t8 +/* 00200 80B62BC0 00380821 */ addu $at, $at, $t8 +/* 00204 80B62BC4 8C38539C */ lw $t8, %lo(jtbl_80B6539C)($at) +/* 00208 80B62BC8 03000008 */ jr $t8 /* 0020C 80B62BCC 00000000 */ nop glabel L80B62BD0 /* 00210 80B62BD0 3C014160 */ lui $at, 0x4160 ## $at = 41600000 @@ -32,23 +32,23 @@ glabel L80B62BD0 /* 00218 80B62BD8 C4E40024 */ lwc1 $f4, 0x0024($a3) ## 00000024 /* 0021C 80B62BDC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00220 80B62BE0 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 -/* 00224 80B62BE4 46022001 */ sub.s $f0, $f4, $f2 +/* 00224 80B62BE4 46022001 */ sub.s $f0, $f4, $f2 /* 00228 80B62BE8 3C0180B6 */ lui $at, %hi(D_80B653DC) ## $at = 80B60000 -/* 0022C 80B62BEC 46000005 */ abs.s $f0, $f0 -/* 00230 80B62BF0 460C003C */ c.lt.s $f0, $f12 +/* 0022C 80B62BEC 46000005 */ abs.s $f0, $f0 +/* 00230 80B62BF0 460C003C */ c.lt.s $f0, $f12 /* 00234 80B62BF4 00000000 */ nop -/* 00238 80B62BF8 45020457 */ bc1fl .L80B63D58 +/* 00238 80B62BF8 45020457 */ bc1fl .L80B63D58 /* 0023C 80B62BFC 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC /* 00240 80B62C00 C4E6002C */ lwc1 $f6, 0x002C($a3) ## 0000002C -/* 00244 80B62C04 C42853DC */ lwc1 $f8, %lo(D_80B653DC)($at) +/* 00244 80B62C04 C42853DC */ lwc1 $f8, %lo(D_80B653DC)($at) /* 00248 80B62C08 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F -/* 0024C 80B62C0C 46083001 */ sub.s $f0, $f6, $f8 -/* 00250 80B62C10 46000005 */ abs.s $f0, $f0 -/* 00254 80B62C14 460C003C */ c.lt.s $f0, $f12 +/* 0024C 80B62C0C 46083001 */ sub.s $f0, $f6, $f8 +/* 00250 80B62C10 46000005 */ abs.s $f0, $f0 +/* 00254 80B62C14 460C003C */ c.lt.s $f0, $f12 /* 00258 80B62C18 00000000 */ nop -/* 0025C 80B62C1C 4502044E */ bc1fl .L80B63D58 +/* 0025C 80B62C1C 4502044E */ bc1fl .L80B63D58 /* 00260 80B62C20 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 00264 80B62C24 1000044B */ beq $zero, $zero, .L80B63D54 +/* 00264 80B62C24 1000044B */ beq $zero, $zero, .L80B63D54 /* 00268 80B62C28 A61901CA */ sh $t9, 0x01CA($s0) ## 000001CA glabel L80B62C2C /* 0026C 80B62C2C 3C014160 */ lui $at, 0x4160 ## $at = 41600000 @@ -56,110 +56,110 @@ glabel L80B62C2C /* 00274 80B62C34 C4EA0024 */ lwc1 $f10, 0x0024($a3) ## 00000024 /* 00278 80B62C38 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0027C 80B62C3C 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 00280 80B62C40 46025001 */ sub.s $f0, $f10, $f2 +/* 00280 80B62C40 46025001 */ sub.s $f0, $f10, $f2 /* 00284 80B62C44 3C0180B6 */ lui $at, %hi(D_80B653E0) ## $at = 80B60000 -/* 00288 80B62C48 46000005 */ abs.s $f0, $f0 -/* 0028C 80B62C4C 460C003C */ c.lt.s $f0, $f12 +/* 00288 80B62C48 46000005 */ abs.s $f0, $f0 +/* 0028C 80B62C4C 460C003C */ c.lt.s $f0, $f12 /* 00290 80B62C50 00000000 */ nop -/* 00294 80B62C54 45020440 */ bc1fl .L80B63D58 +/* 00294 80B62C54 45020440 */ bc1fl .L80B63D58 /* 00298 80B62C58 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC /* 0029C 80B62C5C C4F2002C */ lwc1 $f18, 0x002C($a3) ## 0000002C -/* 002A0 80B62C60 C42453E0 */ lwc1 $f4, %lo(D_80B653E0)($at) +/* 002A0 80B62C60 C42453E0 */ lwc1 $f4, %lo(D_80B653E0)($at) /* 002A4 80B62C64 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 002A8 80B62C68 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 002AC 80B62C6C 46049001 */ sub.s $f0, $f18, $f4 -/* 002B0 80B62C70 46000005 */ abs.s $f0, $f0 -/* 002B4 80B62C74 460C003C */ c.lt.s $f0, $f12 +/* 002AC 80B62C6C 46049001 */ sub.s $f0, $f18, $f4 +/* 002B0 80B62C70 46000005 */ abs.s $f0, $f0 +/* 002B4 80B62C74 460C003C */ c.lt.s $f0, $f12 /* 002B8 80B62C78 00000000 */ nop -/* 002BC 80B62C7C 45020436 */ bc1fl .L80B63D58 +/* 002BC 80B62C7C 45020436 */ bc1fl .L80B63D58 /* 002C0 80B62C80 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC /* 002C4 80B62C84 A60801CA */ sh $t0, 0x01CA($s0) ## 000001CA /* 002C8 80B62C88 9529F542 */ lhu $t1, -0x0ABE($t1) ## 8015F542 /* 002CC 80B62C8C 240B0039 */ addiu $t3, $zero, 0x0039 ## $t3 = 00000039 /* 002D0 80B62C90 312A0004 */ andi $t2, $t1, 0x0004 ## $t2 = 00000000 -/* 002D4 80B62C94 51400430 */ beql $t2, $zero, .L80B63D58 +/* 002D4 80B62C94 51400430 */ beql $t2, $zero, .L80B63D58 /* 002D8 80B62C98 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 002DC 80B62C9C 1000042D */ beq $zero, $zero, .L80B63D54 +/* 002DC 80B62C9C 1000042D */ beq $zero, $zero, .L80B63D54 /* 002E0 80B62CA0 A60B01D4 */ sh $t3, 0x01D4($s0) ## 000001D4 glabel L80B62CA4 /* 002E4 80B62CA4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 002E8 80B62CA8 958CF542 */ lhu $t4, -0x0ABE($t4) ## 8015F542 -/* 002EC 80B62CAC 8FA4006C */ lw $a0, 0x006C($sp) +/* 002EC 80B62CAC 8FA4006C */ lw $a0, 0x006C($sp) /* 002F0 80B62CB0 318D0004 */ andi $t5, $t4, 0x0004 ## $t5 = 00000000 -/* 002F4 80B62CB4 11A00032 */ beq $t5, $zero, .L80B62D80 +/* 002F4 80B62CB4 11A00032 */ beq $t5, $zero, .L80B62D80 /* 002F8 80B62CB8 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 /* 002FC 80B62CBC 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 -/* 00300 80B62CC0 8FA6006C */ lw $a2, 0x006C($sp) +/* 00300 80B62CC0 8FA6006C */ lw $a2, 0x006C($sp) /* 00304 80B62CC4 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 00308 80B62CC8 14610013 */ bne $v1, $at, .L80B62D18 +/* 00308 80B62CC8 14610013 */ bne $v1, $at, .L80B62D18 /* 0030C 80B62CCC 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 00310 80B62CD0 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 00314 80B62CD4 44811000 */ mtc1 $at, $f2 ## $f2 = 14.00 /* 00318 80B62CD8 3C01C302 */ lui $at, 0xC302 ## $at = C3020000 /* 0031C 80B62CDC 44813000 */ mtc1 $at, $f6 ## $f6 = -130.00 /* 00320 80B62CE0 3C0180B6 */ lui $at, %hi(D_80B653E4) ## $at = 80B60000 -/* 00324 80B62CE4 C42853E4 */ lwc1 $f8, %lo(D_80B653E4)($at) +/* 00324 80B62CE4 C42853E4 */ lwc1 $f8, %lo(D_80B653E4)($at) /* 00328 80B62CE8 240F0100 */ addiu $t7, $zero, 0x0100 ## $t7 = 00000100 -/* 0032C 80B62CEC AFAF0028 */ sw $t7, 0x0028($sp) +/* 0032C 80B62CEC AFAF0028 */ sw $t7, 0x0028($sp) /* 00330 80B62CF0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00334 80B62CF4 2407002E */ addiu $a3, $zero, 0x002E ## $a3 = 0000002E -/* 00338 80B62CF8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0033C 80B62CFC AFA00020 */ sw $zero, 0x0020($sp) -/* 00340 80B62D00 AFA00024 */ sw $zero, 0x0024($sp) -/* 00344 80B62D04 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00348 80B62D08 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00338 80B62CF8 AFA0001C */ sw $zero, 0x001C($sp) +/* 0033C 80B62CFC AFA00020 */ sw $zero, 0x0020($sp) +/* 00340 80B62D00 AFA00024 */ sw $zero, 0x0024($sp) +/* 00344 80B62D04 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 00348 80B62D08 E7A60014 */ swc1 $f6, 0x0014($sp) /* 0034C 80B62D0C 0C00C916 */ jal Actor_SpawnAttached - -/* 00350 80B62D10 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 00350 80B62D10 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00354 80B62D14 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B62D18: /* 00358 80B62D18 24010033 */ addiu $at, $zero, 0x0033 ## $at = 00000033 -/* 0035C 80B62D1C 14610006 */ bne $v1, $at, .L80B62D38 +/* 0035C 80B62D1C 14610006 */ bne $v1, $at, .L80B62D38 /* 00360 80B62D20 2405283C */ addiu $a1, $zero, 0x283C ## $a1 = 0000283C /* 00364 80B62D24 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00368 80B62D28 8E04011C */ lw $a0, 0x011C($s0) ## 0000011C /* 0036C 80B62D2C 0C03E803 */ jal Audio_SetBGM - + /* 00370 80B62D30 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 00374 80B62D34 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B62D38: -/* 00378 80B62D38 54600407 */ bnel $v1, $zero, .L80B63D58 +/* 00378 80B62D38 54600407 */ bnel $v1, $zero, .L80B63D58 /* 0037C 80B62D3C 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC /* 00380 80B62D40 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00384 80B62D44 00000000 */ nop /* 00388 80B62D48 3C0180B6 */ lui $at, %hi(D_80B653E8) ## $at = 80B60000 -/* 0038C 80B62D4C C42A53E8 */ lwc1 $f10, %lo(D_80B653E8)($at) +/* 0038C 80B62D4C C42A53E8 */ lwc1 $f10, %lo(D_80B653E8)($at) /* 00390 80B62D50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00394 80B62D54 8FA5006C */ lw $a1, 0x006C($sp) -/* 00398 80B62D58 460A0482 */ mul.s $f18, $f0, $f10 -/* 0039C 80B62D5C 4600910D */ trunc.w.s $f4, $f18 -/* 003A0 80B62D60 44062000 */ mfc1 $a2, $f4 +/* 00394 80B62D54 8FA5006C */ lw $a1, 0x006C($sp) +/* 00398 80B62D58 460A0482 */ mul.s $f18, $f0, $f10 +/* 0039C 80B62D5C 4600910D */ trunc.w.s $f4, $f18 +/* 003A0 80B62D60 44062000 */ mfc1 $a2, $f4 /* 003A4 80B62D64 00000000 */ nop -/* 003A8 80B62D68 00063400 */ sll $a2, $a2, 16 -/* 003AC 80B62D6C 0C2D8F61 */ jal func_80B63D84 -/* 003B0 80B62D70 00063403 */ sra $a2, $a2, 16 +/* 003A8 80B62D68 00063400 */ sll $a2, $a2, 16 +/* 003AC 80B62D6C 0C2D8F61 */ jal func_80B63D84 +/* 003B0 80B62D70 00063403 */ sra $a2, $a2, 16 /* 003B4 80B62D74 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 003B8 80B62D78 100003F6 */ beq $zero, $zero, .L80B63D54 +/* 003B8 80B62D78 100003F6 */ beq $zero, $zero, .L80B63D54 /* 003BC 80B62D7C A219014C */ sb $t9, 0x014C($s0) ## 0000014C .L80B62D80: -/* 003C0 80B62D80 0C019148 */ jal func_80064520 -/* 003C4 80B62D84 AFA70060 */ sw $a3, 0x0060($sp) -/* 003C8 80B62D88 8FA4006C */ lw $a0, 0x006C($sp) +/* 003C0 80B62D80 0C019148 */ jal func_80064520 +/* 003C4 80B62D84 AFA70060 */ sw $a3, 0x0060($sp) +/* 003C8 80B62D88 8FA4006C */ lw $a0, 0x006C($sp) /* 003CC 80B62D8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 003D0 80B62D90 0C00B7D5 */ jal func_8002DF54 +/* 003D0 80B62D90 0C00B7D5 */ jal func_8002DF54 /* 003D4 80B62D94 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 003D8 80B62D98 0C03008C */ jal func_800C0230 -/* 003DC 80B62D9C 8FA4006C */ lw $a0, 0x006C($sp) +/* 003D8 80B62D98 0C03008C */ jal func_800C0230 +/* 003DC 80B62D9C 8FA4006C */ lw $a0, 0x006C($sp) /* 003E0 80B62DA0 A60201CC */ sh $v0, 0x01CC($s0) ## 000001CC -/* 003E4 80B62DA4 8FA4006C */ lw $a0, 0x006C($sp) +/* 003E4 80B62DA4 8FA4006C */ lw $a0, 0x006C($sp) /* 003E8 80B62DA8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003EC 80B62DAC 0C0300C5 */ jal func_800C0314 +/* 003EC 80B62DAC 0C0300C5 */ jal func_800C0314 /* 003F0 80B62DB0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 003F4 80B62DB4 8FA4006C */ lw $a0, 0x006C($sp) +/* 003F4 80B62DB4 8FA4006C */ lw $a0, 0x006C($sp) /* 003F8 80B62DB8 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 003FC 80B62DBC 0C0300C5 */ jal func_800C0314 +/* 003FC 80B62DBC 0C0300C5 */ jal func_800C0314 /* 00400 80B62DC0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00404 80B62DC4 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 /* 00408 80B62DC8 44813000 */ mtc1 $at, $f6 ## $f6 = -40.00 @@ -170,18 +170,18 @@ glabel L80B62CA4 /* 0041C 80B62DDC A60A01D4 */ sh $t2, 0x01D4($s0) ## 000001D4 /* 00420 80B62DE0 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 00424 80B62DE4 0C03E803 */ jal Audio_SetBGM - + /* 00428 80B62DE8 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 0042C 80B62DEC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00430 80B62DF0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 00434 80B62DF4 944B0EE2 */ lhu $t3, 0x0EE2($v0) ## 8015F542 -/* 00438 80B62DF8 8FA4006C */ lw $a0, 0x006C($sp) +/* 00438 80B62DF8 8FA4006C */ lw $a0, 0x006C($sp) /* 0043C 80B62DFC 24050023 */ addiu $a1, $zero, 0x0023 ## $a1 = 00000023 /* 00440 80B62E00 356C0004 */ ori $t4, $t3, 0x0004 ## $t4 = 00000004 /* 00444 80B62E04 0C00B2DD */ jal Flags_SetSwitch - + /* 00448 80B62E08 A44C0EE2 */ sh $t4, 0x0EE2($v0) ## 8015F542 -/* 0044C 80B62E0C 8FA70060 */ lw $a3, 0x0060($sp) +/* 0044C 80B62E0C 8FA70060 */ lw $a3, 0x0060($sp) glabel L80B62E10 /* 00450 80B62E10 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 00454 80B62E14 44811000 */ mtc1 $at, $f2 ## $f2 = 14.00 @@ -190,7 +190,7 @@ glabel L80B62E10 /* 00460 80B62E20 3C0180B6 */ lui $at, %hi(D_80B653EC) ## $at = 80B60000 /* 00464 80B62E24 E4E20024 */ swc1 $f2, 0x0024($a3) ## 00000024 /* 00468 80B62E28 E4E80028 */ swc1 $f8, 0x0028($a3) ## 00000028 -/* 0046C 80B62E2C C42A53EC */ lwc1 $f10, %lo(D_80B653EC)($at) +/* 0046C 80B62E2C C42A53EC */ lwc1 $f10, %lo(D_80B653EC)($at) /* 00470 80B62E30 A4E000B6 */ sh $zero, 0x00B6($a3) ## 000000B6 /* 00474 80B62E34 84ED00B6 */ lh $t5, 0x00B6($a3) ## 000000B6 /* 00478 80B62E38 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 @@ -202,74 +202,74 @@ glabel L80B62E10 /* 00490 80B62E50 3C0180B6 */ lui $at, %hi(D_80B653F0) ## $at = 80B60000 /* 00494 80B62E54 E6020150 */ swc1 $f2, 0x0150($s0) ## 00000150 /* 00498 80B62E58 E6040154 */ swc1 $f4, 0x0154($s0) ## 00000154 -/* 0049C 80B62E5C C42653F0 */ lwc1 $f6, %lo(D_80B653F0)($at) +/* 0049C 80B62E5C C42653F0 */ lwc1 $f6, %lo(D_80B653F0)($at) /* 004A0 80B62E60 3C0180B6 */ lui $at, %hi(D_80B653F4) ## $at = 80B60000 /* 004A4 80B62E64 E602015C */ swc1 $f2, 0x015C($s0) ## 0000015C /* 004A8 80B62E68 E6020160 */ swc1 $f2, 0x0160($s0) ## 00000160 /* 004AC 80B62E6C E6060158 */ swc1 $f6, 0x0158($s0) ## 00000158 -/* 004B0 80B62E70 C42853F4 */ lwc1 $f8, %lo(D_80B653F4)($at) +/* 004B0 80B62E70 C42853F4 */ lwc1 $f8, %lo(D_80B653F4)($at) /* 004B4 80B62E74 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 004B8 80B62E78 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 004BC 80B62E7C E6080164 */ swc1 $f8, 0x0164($s0) ## 00000164 -/* 004C0 80B62E80 14610012 */ bne $v1, $at, .L80B62ECC -/* 004C4 80B62E84 8FA6006C */ lw $a2, 0x006C($sp) +/* 004C0 80B62E80 14610012 */ bne $v1, $at, .L80B62ECC +/* 004C4 80B62E84 8FA6006C */ lw $a2, 0x006C($sp) /* 004C8 80B62E88 3C01C302 */ lui $at, 0xC302 ## $at = C3020000 /* 004CC 80B62E8C 44815000 */ mtc1 $at, $f10 ## $f10 = -130.00 /* 004D0 80B62E90 3C0180B6 */ lui $at, %hi(D_80B653F8) ## $at = 80B60000 -/* 004D4 80B62E94 C43253F8 */ lwc1 $f18, %lo(D_80B653F8)($at) +/* 004D4 80B62E94 C43253F8 */ lwc1 $f18, %lo(D_80B653F8)($at) /* 004D8 80B62E98 240F0100 */ addiu $t7, $zero, 0x0100 ## $t7 = 00000100 -/* 004DC 80B62E9C AFAF0028 */ sw $t7, 0x0028($sp) +/* 004DC 80B62E9C AFAF0028 */ sw $t7, 0x0028($sp) /* 004E0 80B62EA0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 004E4 80B62EA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 004E8 80B62EA8 2407002E */ addiu $a3, $zero, 0x002E ## $a3 = 0000002E -/* 004EC 80B62EAC E7A20010 */ swc1 $f2, 0x0010($sp) -/* 004F0 80B62EB0 AFA0001C */ sw $zero, 0x001C($sp) -/* 004F4 80B62EB4 AFA00020 */ sw $zero, 0x0020($sp) -/* 004F8 80B62EB8 AFA00024 */ sw $zero, 0x0024($sp) -/* 004FC 80B62EBC E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 004EC 80B62EAC E7A20010 */ swc1 $f2, 0x0010($sp) +/* 004F0 80B62EB0 AFA0001C */ sw $zero, 0x001C($sp) +/* 004F4 80B62EB4 AFA00020 */ sw $zero, 0x0020($sp) +/* 004F8 80B62EB8 AFA00024 */ sw $zero, 0x0024($sp) +/* 004FC 80B62EBC E7AA0014 */ swc1 $f10, 0x0014($sp) /* 00500 80B62EC0 0C00C916 */ jal Actor_SpawnAttached - -/* 00504 80B62EC4 E7B20018 */ swc1 $f18, 0x0018($sp) + +/* 00504 80B62EC4 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00508 80B62EC8 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B62ECC: /* 0050C 80B62ECC 24010015 */ addiu $at, $zero, 0x0015 ## $at = 00000015 -/* 00510 80B62ED0 14610004 */ bne $v1, $at, .L80B62EE4 +/* 00510 80B62ED0 14610004 */ bne $v1, $at, .L80B62EE4 /* 00514 80B62ED4 2405283C */ addiu $a1, $zero, 0x283C ## $a1 = 0000283C /* 00518 80B62ED8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0051C 80B62EDC 8E04011C */ lw $a0, 0x011C($s0) ## 0000011C /* 00520 80B62EE0 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B62EE4: -/* 00524 80B62EE4 1460039B */ bne $v1, $zero, .L80B63D54 +/* 00524 80B62EE4 1460039B */ bne $v1, $zero, .L80B63D54 /* 00528 80B62EE8 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 0052C 80B62EEC 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 /* 00530 80B62EF0 A61801CA */ sh $t8, 0x01CA($s0) ## 000001CA -/* 00534 80B62EF4 10000397 */ beq $zero, $zero, .L80B63D54 +/* 00534 80B62EF4 10000397 */ beq $zero, $zero, .L80B63D54 /* 00538 80B62EF8 A61901D4 */ sh $t9, 0x01D4($s0) ## 000001D4 glabel L80B62EFC /* 0053C 80B62EFC 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 00540 80B62F00 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 00544 80B62F04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00548 80B62F08 54610005 */ bnel $v1, $at, .L80B62F20 +/* 00548 80B62F08 54610005 */ bnel $v1, $at, .L80B62F20 /* 0054C 80B62F0C 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 00550 80B62F10 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00554 80B62F14 2405283E */ addiu $a1, $zero, 0x283E ## $a1 = 0000283E /* 00558 80B62F18 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 0055C 80B62F1C 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 .L80B62F20: -/* 00560 80B62F20 14610005 */ bne $v1, $at, .L80B62F38 -/* 00564 80B62F24 8FA4006C */ lw $a0, 0x006C($sp) +/* 00560 80B62F20 14610005 */ bne $v1, $at, .L80B62F38 +/* 00564 80B62F24 8FA4006C */ lw $a0, 0x006C($sp) /* 00568 80B62F28 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0056C 80B62F2C 0C00B7D5 */ jal func_8002DF54 +/* 0056C 80B62F2C 0C00B7D5 */ jal func_8002DF54 /* 00570 80B62F30 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 /* 00574 80B62F34 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B62F38: /* 00578 80B62F38 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0057C 80B62F3C 54610004 */ bnel $v1, $at, .L80B62F50 +/* 0057C 80B62F3C 54610004 */ bnel $v1, $at, .L80B62F50 /* 00580 80B62F40 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00584 80B62F44 0C03E803 */ jal Audio_SetBGM - + /* 00588 80B62F48 24040023 */ addiu $a0, $zero, 0x0023 ## $a0 = 00000023 /* 0058C 80B62F4C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 .L80B62F50: @@ -277,49 +277,49 @@ glabel L80B62EFC /* 00594 80B62F54 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 00598 80B62F58 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 0059C 80B62F5C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 005A0 80B62F60 46062202 */ mul.s $f8, $f4, $f6 +/* 005A0 80B62F60 46062202 */ mul.s $f8, $f4, $f6 /* 005A4 80B62F64 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 005A8 80B62F68 3C054258 */ lui $a1, 0x4258 ## $a1 = 42580000 -/* 005AC 80B62F6C 44074000 */ mfc1 $a3, $f8 +/* 005AC 80B62F6C 44074000 */ mfc1 $a3, $f8 /* 005B0 80B62F70 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 005B4 80B62F74 00000000 */ nop /* 005B8 80B62F78 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 005BC 80B62F7C 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 /* 005C0 80B62F80 C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 /* 005C4 80B62F84 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 005C8 80B62F88 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 005CC 80B62F8C 46125102 */ mul.s $f4, $f10, $f18 +/* 005CC 80B62F8C 46125102 */ mul.s $f4, $f10, $f18 /* 005D0 80B62F90 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 /* 005D4 80B62F94 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 -/* 005D8 80B62F98 44072000 */ mfc1 $a3, $f4 +/* 005D8 80B62F98 44072000 */ mfc1 $a3, $f4 /* 005DC 80B62F9C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 005E0 80B62FA0 00000000 */ nop /* 005E4 80B62FA4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 005E8 80B62FA8 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 005EC 80B62FAC C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 /* 005F0 80B62FB0 3C05C54A */ lui $a1, 0xC54A ## $a1 = C54A0000 /* 005F4 80B62FB4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 005F8 80B62FB8 46083282 */ mul.s $f10, $f6, $f8 +/* 005F8 80B62FB8 46083282 */ mul.s $f10, $f6, $f8 /* 005FC 80B62FBC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 00600 80B62FC0 34A53000 */ ori $a1, $a1, 0x3000 ## $a1 = C54A3000 /* 00604 80B62FC4 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 -/* 00608 80B62FC8 44075000 */ mfc1 $a3, $f10 +/* 00608 80B62FC8 44075000 */ mfc1 $a3, $f10 /* 0060C 80B62FCC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00610 80B62FD0 00000000 */ nop /* 00614 80B62FD4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00618 80B62FD8 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 0061C 80B62FDC C61201A8 */ lwc1 $f18, 0x01A8($s0) ## 000001A8 /* 00620 80B62FE0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 00624 80B62FE4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 00628 80B62FE8 46049182 */ mul.s $f6, $f18, $f4 +/* 00628 80B62FE8 46049182 */ mul.s $f6, $f18, $f4 /* 0062C 80B62FEC 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 00630 80B62FF0 3C05C2AC */ lui $a1, 0xC2AC ## $a1 = C2AC0000 -/* 00634 80B62FF4 44073000 */ mfc1 $a3, $f6 +/* 00634 80B62FF4 44073000 */ mfc1 $a3, $f6 /* 00638 80B62FF8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0063C 80B62FFC 00000000 */ nop /* 00640 80B63000 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 00644 80B63004 44811000 */ mtc1 $at, $f2 ## $f2 = 14.00 @@ -327,43 +327,43 @@ glabel L80B62EFC /* 0064C 80B6300C 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 00650 80B63010 C60801A8 */ lwc1 $f8, 0x01A8($s0) ## 000001A8 /* 00654 80B63014 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 00658 80B63018 44051000 */ mfc1 $a1, $f2 -/* 0065C 80B6301C 460A4482 */ mul.s $f18, $f8, $f10 +/* 00658 80B63018 44051000 */ mfc1 $a1, $f2 +/* 0065C 80B6301C 460A4482 */ mul.s $f18, $f8, $f10 /* 00660 80B63020 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 00664 80B63024 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 -/* 00668 80B63028 44079000 */ mfc1 $a3, $f18 +/* 00668 80B63028 44079000 */ mfc1 $a3, $f18 /* 0066C 80B6302C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00670 80B63030 00000000 */ nop /* 00674 80B63034 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00678 80B63038 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 0067C 80B6303C C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 00680 80B63040 3C05C53A */ lui $a1, 0xC53A ## $a1 = C53A0000 /* 00684 80B63044 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 00688 80B63048 46062202 */ mul.s $f8, $f4, $f6 +/* 00688 80B63048 46062202 */ mul.s $f8, $f4, $f6 /* 0068C 80B6304C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 00690 80B63050 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = C53A4000 /* 00694 80B63054 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 -/* 00698 80B63058 44074000 */ mfc1 $a3, $f8 +/* 00698 80B63058 44074000 */ mfc1 $a3, $f8 /* 0069C 80B6305C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 006A0 80B63060 00000000 */ nop /* 006A4 80B63064 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 006A8 80B63068 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 006AC 80B6306C 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 006B0 80B63070 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 006B4 80B63074 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 006B8 80B63078 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 006BC 80B6307C 860801D4 */ lh $t0, 0x01D4($s0) ## 000001D4 /* 006C0 80B63080 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 006C4 80B63084 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 -/* 006C8 80B63088 55000333 */ bnel $t0, $zero, .L80B63D58 +/* 006C8 80B63088 55000333 */ bnel $t0, $zero, .L80B63D58 /* 006CC 80B6308C 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC /* 006D0 80B63090 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 006D4 80B63094 A60901CA */ sh $t1, 0x01CA($s0) ## 000001CA /* 006D8 80B63098 A60A01D4 */ sh $t2, 0x01D4($s0) ## 000001D4 -/* 006DC 80B6309C 1000032D */ beq $zero, $zero, .L80B63D54 +/* 006DC 80B6309C 1000032D */ beq $zero, $zero, .L80B63D54 /* 006E0 80B630A0 E60A01A8 */ swc1 $f10, 0x01A8($s0) ## 000001A8 glabel L80B630A4 /* 006E4 80B630A4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -371,99 +371,99 @@ glabel L80B630A4 /* 006EC 80B630AC C61201A8 */ lwc1 $f18, 0x01A8($s0) ## 000001A8 /* 006F0 80B630B0 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 006F4 80B630B4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 006F8 80B630B8 46049182 */ mul.s $f6, $f18, $f4 +/* 006F8 80B630B8 46049182 */ mul.s $f6, $f18, $f4 /* 006FC 80B630BC 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00700 80B630C0 3C0542A8 */ lui $a1, 0x42A8 ## $a1 = 42A80000 -/* 00704 80B630C4 44073000 */ mfc1 $a3, $f6 +/* 00704 80B630C4 44073000 */ mfc1 $a3, $f6 /* 00708 80B630C8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0070C 80B630CC 00000000 */ nop /* 00710 80B630D0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00714 80B630D4 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 00718 80B630D8 C60801A8 */ lwc1 $f8, 0x01A8($s0) ## 000001A8 /* 0071C 80B630DC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00720 80B630E0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00724 80B630E4 460A4482 */ mul.s $f18, $f8, $f10 +/* 00724 80B630E4 460A4482 */ mul.s $f18, $f8, $f10 /* 00728 80B630E8 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 /* 0072C 80B630EC 3C05C1D0 */ lui $a1, 0xC1D0 ## $a1 = C1D00000 -/* 00730 80B630F0 44079000 */ mfc1 $a3, $f18 +/* 00730 80B630F0 44079000 */ mfc1 $a3, $f18 /* 00734 80B630F4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00738 80B630F8 00000000 */ nop /* 0073C 80B630FC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00740 80B63100 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 00744 80B63104 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 00748 80B63108 3C05C542 */ lui $a1, 0xC542 ## $a1 = C5420000 /* 0074C 80B6310C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00750 80B63110 46062202 */ mul.s $f8, $f4, $f6 +/* 00750 80B63110 46062202 */ mul.s $f8, $f4, $f6 /* 00754 80B63114 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00758 80B63118 34A5B000 */ ori $a1, $a1, 0xB000 ## $a1 = C542B000 /* 0075C 80B6311C 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 -/* 00760 80B63120 44074000 */ mfc1 $a3, $f8 +/* 00760 80B63120 44074000 */ mfc1 $a3, $f8 /* 00764 80B63124 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00768 80B63128 00000000 */ nop /* 0076C 80B6312C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00770 80B63130 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 /* 00774 80B63134 C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 /* 00778 80B63138 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 0077C 80B6313C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00780 80B63140 46125102 */ mul.s $f4, $f10, $f18 +/* 00780 80B63140 46125102 */ mul.s $f4, $f10, $f18 /* 00784 80B63144 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 00788 80B63148 3C05C308 */ lui $a1, 0xC308 ## $a1 = C3080000 -/* 0078C 80B6314C 44072000 */ mfc1 $a3, $f4 +/* 0078C 80B6314C 44072000 */ mfc1 $a3, $f4 /* 00790 80B63150 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00794 80B63154 00000000 */ nop /* 00798 80B63158 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0079C 80B6315C 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 007A0 80B63160 C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 /* 007A4 80B63164 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 007A8 80B63168 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 007AC 80B6316C 46083282 */ mul.s $f10, $f6, $f8 +/* 007AC 80B6316C 46083282 */ mul.s $f10, $f6, $f8 /* 007B0 80B63170 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 /* 007B4 80B63174 3C054294 */ lui $a1, 0x4294 ## $a1 = 42940000 -/* 007B8 80B63178 44075000 */ mfc1 $a3, $f10 +/* 007B8 80B63178 44075000 */ mfc1 $a3, $f10 /* 007BC 80B6317C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 007C0 80B63180 00000000 */ nop /* 007C4 80B63184 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 007C8 80B63188 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 /* 007CC 80B6318C C61201A8 */ lwc1 $f18, 0x01A8($s0) ## 000001A8 /* 007D0 80B63190 3C05C553 */ lui $a1, 0xC553 ## $a1 = C5530000 /* 007D4 80B63194 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 007D8 80B63198 46049182 */ mul.s $f6, $f18, $f4 +/* 007D8 80B63198 46049182 */ mul.s $f6, $f18, $f4 /* 007DC 80B6319C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 007E0 80B631A0 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = C5534000 /* 007E4 80B631A4 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 -/* 007E8 80B631A8 44073000 */ mfc1 $a3, $f6 +/* 007E8 80B631A8 44073000 */ mfc1 $a3, $f6 /* 007EC 80B631AC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 007F0 80B631B0 00000000 */ nop /* 007F4 80B631B4 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 007F8 80B631B8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 007FC 80B631BC 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 00800 80B631C0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 00804 80B631C4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00808 80B631C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0080C 80B631CC 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 00810 80B631D0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00814 80B631D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00818 80B631D8 14610004 */ bne $v1, $at, .L80B631EC +/* 00818 80B631D8 14610004 */ bne $v1, $at, .L80B631EC /* 0081C 80B631DC 00000000 */ nop /* 00820 80B631E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00824 80B631E4 2405282C */ addiu $a1, $zero, 0x282C ## $a1 = 0000282C /* 00828 80B631E8 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B631EC: -/* 0082C 80B631EC 146002D9 */ bne $v1, $zero, .L80B63D54 +/* 0082C 80B631EC 146002D9 */ bne $v1, $zero, .L80B63D54 /* 00830 80B631F0 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 /* 00834 80B631F4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00838 80B631F8 240C0032 */ addiu $t4, $zero, 0x0032 ## $t4 = 00000032 /* 0083C 80B631FC A60B01CA */ sh $t3, 0x01CA($s0) ## 000001CA /* 00840 80B63200 A60C01D4 */ sh $t4, 0x01D4($s0) ## 000001D4 -/* 00844 80B63204 100002D3 */ beq $zero, $zero, .L80B63D54 +/* 00844 80B63204 100002D3 */ beq $zero, $zero, .L80B63D54 /* 00848 80B63208 E60801A8 */ swc1 $f8, 0x01A8($s0) ## 000001A8 glabel L80B6320C /* 0084C 80B6320C 3C014280 */ lui $at, 0x4280 ## $at = 42800000 @@ -471,7 +471,7 @@ glabel L80B6320C /* 00854 80B63214 3C01C180 */ lui $at, 0xC180 ## $at = C1800000 /* 00858 80B63218 44816000 */ mtc1 $at, $f12 ## $f12 = -16.00 /* 0085C 80B6321C 3C0180B6 */ lui $at, %hi(D_80B653FC) ## $at = 80B60000 -/* 00860 80B63220 C42E53FC */ lwc1 $f14, %lo(D_80B653FC)($at) +/* 00860 80B63220 C42E53FC */ lwc1 $f14, %lo(D_80B653FC)($at) /* 00864 80B63224 3C01432E */ lui $at, 0x432E ## $at = 432E0000 /* 00868 80B63228 44818000 */ mtc1 $at, $f16 ## $f16 = 174.00 /* 0086C 80B6322C 3C01C308 */ lui $at, 0xC308 ## $at = C3080000 @@ -484,108 +484,108 @@ glabel L80B6320C /* 00888 80B63248 E60E0158 */ swc1 $f14, 0x0158($s0) ## 00000158 /* 0088C 80B6324C E6100160 */ swc1 $f16, 0x0160($s0) ## 00000160 /* 00890 80B63250 E60A015C */ swc1 $f10, 0x015C($s0) ## 0000015C -/* 00894 80B63254 C4325400 */ lwc1 $f18, %lo(D_80B65400)($at) +/* 00894 80B63254 C4325400 */ lwc1 $f18, %lo(D_80B65400)($at) /* 00898 80B63258 3C014208 */ lui $at, 0x4208 ## $at = 42080000 /* 0089C 80B6325C 44812000 */ mtc1 $at, $f4 ## $f4 = 34.00 /* 008A0 80B63260 3C01428A */ lui $at, 0x428A ## $at = 428A0000 /* 008A4 80B63264 44813000 */ mtc1 $at, $f6 ## $f6 = 69.00 -/* 008A8 80B63268 46041001 */ sub.s $f0, $f2, $f4 +/* 008A8 80B63268 46041001 */ sub.s $f0, $f2, $f4 /* 008AC 80B6326C 3C0180B6 */ lui $at, %hi(D_80B65404) ## $at = 80B60000 /* 008B0 80B63270 E6120164 */ swc1 $f18, 0x0164($s0) ## 00000164 /* 008B4 80B63274 C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 -/* 008B8 80B63278 46000005 */ abs.s $f0, $f0 +/* 008B8 80B63278 46000005 */ abs.s $f0, $f0 /* 008BC 80B6327C 240E00FA */ addiu $t6, $zero, 0x00FA ## $t6 = 000000FA /* 008C0 80B63280 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 008C4 80B63284 46066001 */ sub.s $f0, $f12, $f6 -/* 008C8 80B63288 46000005 */ abs.s $f0, $f0 +/* 008C4 80B63284 46066001 */ sub.s $f0, $f12, $f6 +/* 008C8 80B63288 46000005 */ abs.s $f0, $f0 /* 008CC 80B6328C E600016C */ swc1 $f0, 0x016C($s0) ## 0000016C -/* 008D0 80B63290 C4285404 */ lwc1 $f8, %lo(D_80B65404)($at) +/* 008D0 80B63290 C4285404 */ lwc1 $f8, %lo(D_80B65404)($at) /* 008D4 80B63294 3C014324 */ lui $at, 0x4324 ## $at = 43240000 /* 008D8 80B63298 44815000 */ mtc1 $at, $f10 ## $f10 = 164.00 -/* 008DC 80B6329C 46087001 */ sub.s $f0, $f14, $f8 +/* 008DC 80B6329C 46087001 */ sub.s $f0, $f14, $f8 /* 008E0 80B632A0 3C0180B6 */ lui $at, %hi(D_80B65408) ## $at = 80B60000 -/* 008E4 80B632A4 46000005 */ abs.s $f0, $f0 +/* 008E4 80B632A4 46000005 */ abs.s $f0, $f0 /* 008E8 80B632A8 E6000170 */ swc1 $f0, 0x0170($s0) ## 00000170 /* 008EC 80B632AC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008F0 80B632B0 00000000 */ nop -/* 008F4 80B632B4 46000005 */ abs.s $f0, $f0 +/* 008F4 80B632B4 46000005 */ abs.s $f0, $f0 /* 008F8 80B632B8 E6000174 */ swc1 $f0, 0x0174($s0) ## 00000174 -/* 008FC 80B632BC 460A8001 */ sub.s $f0, $f16, $f10 -/* 00900 80B632C0 46000005 */ abs.s $f0, $f0 +/* 008FC 80B632BC 460A8001 */ sub.s $f0, $f16, $f10 +/* 00900 80B632C0 46000005 */ abs.s $f0, $f0 /* 00904 80B632C4 E6000178 */ swc1 $f0, 0x0178($s0) ## 00000178 -/* 00908 80B632C8 C4245408 */ lwc1 $f4, %lo(D_80B65408)($at) +/* 00908 80B632C8 C4245408 */ lwc1 $f4, %lo(D_80B65408)($at) /* 0090C 80B632CC A60E01D4 */ sh $t6, 0x01D4($s0) ## 000001D4 -/* 00910 80B632D0 46049001 */ sub.s $f0, $f18, $f4 -/* 00914 80B632D4 46000005 */ abs.s $f0, $f0 +/* 00910 80B632D0 46049001 */ sub.s $f0, $f18, $f4 +/* 00914 80B632D4 46000005 */ abs.s $f0, $f0 /* 00918 80B632D8 E600017C */ swc1 $f0, 0x017C($s0) ## 0000017C glabel L80B632DC /* 0091C 80B632DC C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 /* 00920 80B632E0 C6080168 */ lwc1 $f8, 0x0168($s0) ## 00000168 /* 00924 80B632E4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 00928 80B632E8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 0092C 80B632EC 46083282 */ mul.s $f10, $f6, $f8 +/* 0092C 80B632EC 46083282 */ mul.s $f10, $f6, $f8 /* 00930 80B632F0 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00934 80B632F4 3C054208 */ lui $a1, 0x4208 ## $a1 = 42080000 -/* 00938 80B632F8 44075000 */ mfc1 $a3, $f10 +/* 00938 80B632F8 44075000 */ mfc1 $a3, $f10 /* 0093C 80B632FC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00940 80B63300 00000000 */ nop /* 00944 80B63304 C61201A8 */ lwc1 $f18, 0x01A8($s0) ## 000001A8 /* 00948 80B63308 C604016C */ lwc1 $f4, 0x016C($s0) ## 0000016C /* 0094C 80B6330C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 00950 80B63310 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 00954 80B63314 46049182 */ mul.s $f6, $f18, $f4 +/* 00954 80B63314 46049182 */ mul.s $f6, $f18, $f4 /* 00958 80B63318 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 /* 0095C 80B6331C 3C05428A */ lui $a1, 0x428A ## $a1 = 428A0000 -/* 00960 80B63320 44073000 */ mfc1 $a3, $f6 +/* 00960 80B63320 44073000 */ mfc1 $a3, $f6 /* 00964 80B63324 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00968 80B63328 00000000 */ nop /* 0096C 80B6332C C60801A8 */ lwc1 $f8, 0x01A8($s0) ## 000001A8 /* 00970 80B63330 C60A0170 */ lwc1 $f10, 0x0170($s0) ## 00000170 /* 00974 80B63334 3C05C54D */ lui $a1, 0xC54D ## $a1 = C54D0000 /* 00978 80B63338 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 0097C 80B6333C 460A4482 */ mul.s $f18, $f8, $f10 +/* 0097C 80B6333C 460A4482 */ mul.s $f18, $f8, $f10 /* 00980 80B63340 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 00984 80B63344 34A5A000 */ ori $a1, $a1, 0xA000 ## $a1 = C54DA000 /* 00988 80B63348 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 -/* 0098C 80B6334C 44079000 */ mfc1 $a3, $f18 +/* 0098C 80B6334C 44079000 */ mfc1 $a3, $f18 /* 00990 80B63350 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00994 80B63354 00000000 */ nop /* 00998 80B63358 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 0099C 80B6335C C6060174 */ lwc1 $f6, 0x0174($s0) ## 00000174 /* 009A0 80B63360 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 009A4 80B63364 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 009A8 80B63368 46062202 */ mul.s $f8, $f4, $f6 +/* 009A8 80B63368 46062202 */ mul.s $f8, $f4, $f6 /* 009AC 80B6336C 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 009B0 80B63370 3C05C308 */ lui $a1, 0xC308 ## $a1 = C3080000 -/* 009B4 80B63374 44074000 */ mfc1 $a3, $f8 +/* 009B4 80B63374 44074000 */ mfc1 $a3, $f8 /* 009B8 80B63378 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 009BC 80B6337C 00000000 */ nop /* 009C0 80B63380 C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 /* 009C4 80B63384 C6120178 */ lwc1 $f18, 0x0178($s0) ## 00000178 /* 009C8 80B63388 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 009CC 80B6338C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 009D0 80B63390 46125102 */ mul.s $f4, $f10, $f18 +/* 009D0 80B63390 46125102 */ mul.s $f4, $f10, $f18 /* 009D4 80B63394 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 /* 009D8 80B63398 3C054324 */ lui $a1, 0x4324 ## $a1 = 43240000 -/* 009DC 80B6339C 44072000 */ mfc1 $a3, $f4 +/* 009DC 80B6339C 44072000 */ mfc1 $a3, $f4 /* 009E0 80B633A0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 009E4 80B633A4 00000000 */ nop /* 009E8 80B633A8 C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 /* 009EC 80B633AC C608017C */ lwc1 $f8, 0x017C($s0) ## 0000017C /* 009F0 80B633B0 3C05C553 */ lui $a1, 0xC553 ## $a1 = C5530000 /* 009F4 80B633B4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 009F8 80B633B8 46083282 */ mul.s $f10, $f6, $f8 +/* 009F8 80B633B8 46083282 */ mul.s $f10, $f6, $f8 /* 009FC 80B633BC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 00A00 80B633C0 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = C5534000 /* 00A04 80B633C4 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 -/* 00A08 80B633C8 44075000 */ mfc1 $a3, $f10 +/* 00A08 80B633C8 44075000 */ mfc1 $a3, $f10 /* 00A0C 80B633CC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00A10 80B633D0 00000000 */ nop /* 00A14 80B633D4 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00A18 80B633D8 3C073A83 */ lui $a3, 0x3A83 ## $a3 = 3A830000 @@ -593,51 +593,51 @@ glabel L80B632DC /* 00A20 80B633E0 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00A24 80B633E4 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 00A28 80B633E8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00A2C 80B633EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00A30 80B633F0 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 00A34 80B633F4 240100F5 */ addiu $at, $zero, 0x00F5 ## $at = 000000F5 -/* 00A38 80B633F8 10610002 */ beq $v1, $at, .L80B63404 +/* 00A38 80B633F8 10610002 */ beq $v1, $at, .L80B63404 /* 00A3C 80B633FC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00A40 80B63400 14610012 */ bne $v1, $at, .L80B6344C +/* 00A40 80B63400 14610012 */ bne $v1, $at, .L80B6344C .L80B63404: /* 00A44 80B63404 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00A48 80B63408 24A5DDB8 */ addiu $a1, $a1, 0xDDB8 ## $a1 = 0600DDB8 /* 00A4C 80B6340C 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 -/* 00A50 80B63410 0C029490 */ jal func_800A5240 +/* 00A50 80B63410 0C029490 */ jal func_800A5240 /* 00A54 80B63414 3C06C100 */ lui $a2, 0xC100 ## $a2 = C1000000 /* 00A58 80B63418 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00A5C 80B6341C A20F014C */ sb $t7, 0x014C($s0) ## 0000014C /* 00A60 80B63420 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A64 80B63424 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A68 80B63428 2405283D */ addiu $a1, $zero, 0x283D ## $a1 = 0000283D /* 00A6C 80B6342C 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 00A70 80B63430 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00A74 80B63434 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A78 80B63438 54610005 */ bnel $v1, $at, .L80B63450 +/* 00A78 80B63438 54610005 */ bnel $v1, $at, .L80B63450 /* 00A7C 80B6343C 240100C0 */ addiu $at, $zero, 0x00C0 ## $at = 000000C0 /* 00A80 80B63440 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A84 80B63444 240538B2 */ addiu $a1, $zero, 0x38B2 ## $a1 = 000038B2 /* 00A88 80B63448 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B6344C: /* 00A8C 80B6344C 240100C0 */ addiu $at, $zero, 0x00C0 ## $at = 000000C0 .L80B63450: -/* 00A90 80B63450 14610004 */ bne $v1, $at, .L80B63464 +/* 00A90 80B63450 14610004 */ bne $v1, $at, .L80B63464 /* 00A94 80B63454 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A98 80B63458 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A9C 80B6345C 2405282C */ addiu $a1, $zero, 0x282C ## $a1 = 0000282C /* 00AA0 80B63460 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B63464: /* 00AA4 80B63464 240100D4 */ addiu $at, $zero, 0x00D4 ## $at = 000000D4 -/* 00AA8 80B63468 14610015 */ bne $v1, $at, .L80B634C0 +/* 00AA8 80B63468 14610015 */ bne $v1, $at, .L80B634C0 /* 00AAC 80B6346C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00AB0 80B63470 26180250 */ addiu $t8, $s0, 0x0250 ## $t8 = 00000250 -/* 00AB4 80B63474 AFB80044 */ sw $t8, 0x0044($sp) +/* 00AB4 80B63474 AFB80044 */ sw $t8, 0x0044($sp) /* 00AB8 80B63478 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00ABC 80B6347C 2405282B */ addiu $a1, $zero, 0x282B ## $a1 = 0000282B /* 00AC0 80B63480 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00AC4 80B63484 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 @@ -646,312 +646,312 @@ glabel L80B632DC /* 00AD0 80B63490 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00AD4 80B63494 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 00AD8 80B63498 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00ADC 80B6349C AFB90014 */ sw $t9, 0x0014($sp) +/* 00ADC 80B6349C AFB90014 */ sw $t9, 0x0014($sp) /* 00AE0 80B634A0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 00AE4 80B634A4 24A5E8A0 */ addiu $a1, $a1, 0xE8A0 ## $a1 = 0600E8A0 -/* 00AE8 80B634A8 8FA40044 */ lw $a0, 0x0044($sp) +/* 00AE8 80B634A8 8FA40044 */ lw $a0, 0x0044($sp) /* 00AEC 80B634AC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00AF0 80B634B0 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00AF0 80B634B0 E7B20010 */ swc1 $f18, 0x0010($sp) /* 00AF4 80B634B4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00AF8 80B634B8 E7A40018 */ swc1 $f4, 0x0018($sp) + +/* 00AF8 80B634B8 E7A40018 */ swc1 $f4, 0x0018($sp) /* 00AFC 80B634BC 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B634C0: /* 00B00 80B634C0 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 00B04 80B634C4 1461000B */ bne $v1, $at, .L80B634F4 -/* 00B08 80B634C8 8FA9006C */ lw $t1, 0x006C($sp) +/* 00B04 80B634C4 1461000B */ bne $v1, $at, .L80B634F4 +/* 00B08 80B634C8 8FA9006C */ lw $t1, 0x006C($sp) /* 00B0C 80B634CC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B10 80B634D0 00290821 */ addu $at, $at, $t1 +/* 00B10 80B634D0 00290821 */ addu $at, $at, $t1 /* 00B14 80B634D4 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 00B18 80B634D8 A0280AE3 */ sb $t0, 0x0AE3($at) ## 00010AE3 -/* 00B1C 80B634DC 8FAB006C */ lw $t3, 0x006C($sp) +/* 00B1C 80B634DC 8FAB006C */ lw $t3, 0x006C($sp) /* 00B20 80B634E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00B24 80B634E4 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 00B28 80B634E8 002B0821 */ addu $at, $at, $t3 +/* 00B28 80B634E8 002B0821 */ addu $at, $at, $t3 /* 00B2C 80B634EC A42A0AFA */ sh $t2, 0x0AFA($at) ## 00010AFA /* 00B30 80B634F0 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B634F4: /* 00B34 80B634F4 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 00B38 80B634F8 14610003 */ bne $v1, $at, .L80B63508 +/* 00B38 80B634F8 14610003 */ bne $v1, $at, .L80B63508 /* 00B3C 80B634FC 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 /* 00B40 80B63500 A20C014C */ sb $t4, 0x014C($s0) ## 0000014C /* 00B44 80B63504 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B63508: /* 00B48 80B63508 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 00B4C 80B6350C 14610003 */ bne $v1, $at, .L80B6351C +/* 00B4C 80B6350C 14610003 */ bne $v1, $at, .L80B6351C /* 00B50 80B63510 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 /* 00B54 80B63514 A20D014C */ sb $t5, 0x014C($s0) ## 0000014C /* 00B58 80B63518 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B6351C: /* 00B5C 80B6351C 24010082 */ addiu $at, $zero, 0x0082 ## $at = 00000082 -/* 00B60 80B63520 14610004 */ bne $v1, $at, .L80B63534 +/* 00B60 80B63520 14610004 */ bne $v1, $at, .L80B63534 /* 00B64 80B63524 3C041050 */ lui $a0, 0x1050 ## $a0 = 10500000 /* 00B68 80B63528 0C03E803 */ jal Audio_SetBGM - + /* 00B6C 80B6352C 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 105000FF /* 00B70 80B63530 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B63534: /* 00B74 80B63534 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 00B78 80B63538 14610004 */ bne $v1, $at, .L80B6354C -/* 00B7C 80B6353C 8FAF005C */ lw $t7, 0x005C($sp) +/* 00B78 80B63538 14610004 */ bne $v1, $at, .L80B6354C +/* 00B7C 80B6353C 8FAF005C */ lw $t7, 0x005C($sp) /* 00B80 80B63540 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00B84 80B63544 A5EE01AA */ sh $t6, 0x01AA($t7) ## 000001AA /* 00B88 80B63548 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B6354C: /* 00B8C 80B6354C 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 00B90 80B63550 14610005 */ bne $v1, $at, .L80B63568 +/* 00B90 80B63550 14610005 */ bne $v1, $at, .L80B63568 /* 00B94 80B63554 3C0480B6 */ lui $a0, %hi(D_80B651F8) ## $a0 = 80B60000 /* 00B98 80B63558 248451F8 */ addiu $a0, $a0, %lo(D_80B651F8) ## $a0 = 80B651F8 -/* 00B9C 80B6355C 0C01E245 */ jal func_80078914 +/* 00B9C 80B6355C 0C01E245 */ jal func_80078914 /* 00BA0 80B63560 240538AB */ addiu $a1, $zero, 0x38AB ## $a1 = 000038AB /* 00BA4 80B63564 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B63568: /* 00BA8 80B63568 24010082 */ addiu $at, $zero, 0x0082 ## $at = 00000082 -/* 00BAC 80B6356C 14610008 */ bne $v1, $at, .L80B63590 +/* 00BAC 80B6356C 14610008 */ bne $v1, $at, .L80B63590 /* 00BB0 80B63570 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00BB4 80B63574 8FB9005C */ lw $t9, 0x005C($sp) +/* 00BB4 80B63574 8FB9005C */ lw $t9, 0x005C($sp) /* 00BB8 80B63578 3C0480B6 */ lui $a0, %hi(D_80B651F8) ## $a0 = 80B60000 /* 00BBC 80B6357C 248451F8 */ addiu $a0, $a0, %lo(D_80B651F8) ## $a0 = 80B651F8 /* 00BC0 80B63580 240539D6 */ addiu $a1, $zero, 0x39D6 ## $a1 = 000039D6 -/* 00BC4 80B63584 0C01E245 */ jal func_80078914 +/* 00BC4 80B63584 0C01E245 */ jal func_80078914 /* 00BC8 80B63588 A73801AA */ sh $t8, 0x01AA($t9) ## 000001AA /* 00BCC 80B6358C 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B63590: /* 00BD0 80B63590 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00BD4 80B63594 54610005 */ bnel $v1, $at, .L80B635AC +/* 00BD4 80B63594 54610005 */ bnel $v1, $at, .L80B635AC /* 00BD8 80B63598 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00BDC 80B6359C 0C03E803 */ jal Audio_SetBGM - + /* 00BE0 80B635A0 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 00BE4 80B635A4 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 00BE8 80B635A8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L80B635AC: -/* 00BEC 80B635AC 146101E9 */ bne $v1, $at, .L80B63D54 +/* 00BEC 80B635AC 146101E9 */ bne $v1, $at, .L80B63D54 /* 00BF0 80B635B0 3C014342 */ lui $at, 0x4342 ## $at = 43420000 /* 00BF4 80B635B4 44815000 */ mtc1 $at, $f10 ## $f10 = 194.00 /* 00BF8 80B635B8 C6080150 */ lwc1 $f8, 0x0150($s0) ## 00000150 /* 00BFC 80B635BC 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 /* 00C00 80B635C0 44812000 */ mtc1 $at, $f4 ## $f4 = -26.00 -/* 00C04 80B635C4 460A4001 */ sub.s $f0, $f8, $f10 +/* 00C04 80B635C4 460A4001 */ sub.s $f0, $f8, $f10 /* 00C08 80B635C8 C6120154 */ lwc1 $f18, 0x0154($s0) ## 00000154 /* 00C0C 80B635CC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00C10 80B635D0 24080007 */ addiu $t0, $zero, 0x0007 ## $t0 = 00000007 -/* 00C14 80B635D4 46000005 */ abs.s $f0, $f0 +/* 00C14 80B635D4 46000005 */ abs.s $f0, $f0 /* 00C18 80B635D8 E60601A8 */ swc1 $f6, 0x01A8($s0) ## 000001A8 /* 00C1C 80B635DC E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 00C20 80B635E0 46049001 */ sub.s $f0, $f18, $f4 +/* 00C20 80B635E0 46049001 */ sub.s $f0, $f18, $f4 /* 00C24 80B635E4 A60801CA */ sh $t0, 0x01CA($s0) ## 000001CA /* 00C28 80B635E8 3C0180B6 */ lui $at, %hi(D_80B6540C) ## $at = 80B60000 /* 00C2C 80B635EC C6060158 */ lwc1 $f6, 0x0158($s0) ## 00000158 -/* 00C30 80B635F0 46000005 */ abs.s $f0, $f0 +/* 00C30 80B635F0 46000005 */ abs.s $f0, $f0 /* 00C34 80B635F4 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 /* 00C38 80B635F8 E600016C */ swc1 $f0, 0x016C($s0) ## 0000016C -/* 00C3C 80B635FC C428540C */ lwc1 $f8, %lo(D_80B6540C)($at) +/* 00C3C 80B635FC C428540C */ lwc1 $f8, %lo(D_80B6540C)($at) /* 00C40 80B63600 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 00C44 80B63604 C60A015C */ lwc1 $f10, 0x015C($s0) ## 0000015C -/* 00C48 80B63608 46083001 */ sub.s $f0, $f6, $f8 +/* 00C48 80B63608 46083001 */ sub.s $f0, $f6, $f8 /* 00C4C 80B6360C 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 /* 00C50 80B63610 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 00C54 80B63614 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00C58 80B63618 46000005 */ abs.s $f0, $f0 -/* 00C5C 80B6361C 46062200 */ add.s $f8, $f4, $f6 +/* 00C58 80B63618 46000005 */ abs.s $f0, $f0 +/* 00C5C 80B6361C 46062200 */ add.s $f8, $f4, $f6 /* 00C60 80B63620 E6000170 */ swc1 $f0, 0x0170($s0) ## 00000170 /* 00C64 80B63624 C6040160 */ lwc1 $f4, 0x0160($s0) ## 00000160 -/* 00C68 80B63628 46125001 */ sub.s $f0, $f10, $f18 +/* 00C68 80B63628 46125001 */ sub.s $f0, $f10, $f18 /* 00C6C 80B6362C 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 00C70 80B63630 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 /* 00C74 80B63634 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 -/* 00C78 80B63638 460A4481 */ sub.s $f18, $f8, $f10 +/* 00C78 80B63638 460A4481 */ sub.s $f18, $f8, $f10 /* 00C7C 80B6363C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 00C80 80B63640 240A0022 */ addiu $t2, $zero, 0x0022 ## $t2 = 00000022 -/* 00C84 80B63644 46000005 */ abs.s $f0, $f0 +/* 00C84 80B63644 46000005 */ abs.s $f0, $f0 /* 00C88 80B63648 A60901D4 */ sh $t1, 0x01D4($s0) ## 000001D4 /* 00C8C 80B6364C E6000174 */ swc1 $f0, 0x0174($s0) ## 00000174 -/* 00C90 80B63650 46122001 */ sub.s $f0, $f4, $f18 +/* 00C90 80B63650 46122001 */ sub.s $f0, $f4, $f18 /* 00C94 80B63654 A60A01D6 */ sh $t2, 0x01D6($s0) ## 000001D6 -/* 00C98 80B63658 46000005 */ abs.s $f0, $f0 +/* 00C98 80B63658 46000005 */ abs.s $f0, $f0 /* 00C9C 80B6365C E6000178 */ swc1 $f0, 0x0178($s0) ## 00000178 -/* 00CA0 80B63660 46083001 */ sub.s $f0, $f6, $f8 -/* 00CA4 80B63664 46000005 */ abs.s $f0, $f0 -/* 00CA8 80B63668 100001BA */ beq $zero, $zero, .L80B63D54 +/* 00CA0 80B63660 46083001 */ sub.s $f0, $f6, $f8 +/* 00CA4 80B63664 46000005 */ abs.s $f0, $f0 +/* 00CA8 80B63668 100001BA */ beq $zero, $zero, .L80B63D54 /* 00CAC 80B6366C E600017C */ swc1 $f0, 0x017C($s0) ## 0000017C glabel L80B63670 /* 00CB0 80B63670 860B01D6 */ lh $t3, 0x01D6($s0) ## 000001D6 /* 00CB4 80B63674 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00CB8 80B63678 15610013 */ bne $t3, $at, .L80B636C8 +/* 00CB8 80B63678 15610013 */ bne $t3, $at, .L80B636C8 /* 00CBC 80B6367C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00CC0 80B63680 260C0250 */ addiu $t4, $s0, 0x0250 ## $t4 = 00000250 -/* 00CC4 80B63684 AFAC0044 */ sw $t4, 0x0044($sp) +/* 00CC4 80B63684 AFAC0044 */ sw $t4, 0x0044($sp) /* 00CC8 80B63688 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00CCC 80B6368C 2484E8A0 */ addiu $a0, $a0, 0xE8A0 ## $a0 = 0600E8A0 /* 00CD0 80B63690 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00CD4 80B63694 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00CD8 80B63698 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 -/* 00CDC 80B6369C 46805120 */ cvt.s.w $f4, $f10 +/* 00CDC 80B6369C 46805120 */ cvt.s.w $f4, $f10 /* 00CE0 80B636A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00CE4 80B636A4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00CE8 80B636A8 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00CE8 80B636A8 AFAD0014 */ sw $t5, 0x0014($sp) /* 00CEC 80B636AC 24A5E8A0 */ addiu $a1, $a1, 0xE8A0 ## $a1 = 0600E8A0 -/* 00CF0 80B636B0 8FA40044 */ lw $a0, 0x0044($sp) -/* 00CF4 80B636B4 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00CF0 80B636B0 8FA40044 */ lw $a0, 0x0044($sp) +/* 00CF4 80B636B4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00CF8 80B636B8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 00CFC 80B636BC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00D00 80B636C0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00D04 80B636C4 E7B20018 */ swc1 $f18, 0x0018($sp) + +/* 00D04 80B636C4 E7B20018 */ swc1 $f18, 0x0018($sp) .L80B636C8: /* 00D08 80B636C8 C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 /* 00D0C 80B636CC C6080168 */ lwc1 $f8, 0x0168($s0) ## 00000168 /* 00D10 80B636D0 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00D14 80B636D4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00D18 80B636D8 46083282 */ mul.s $f10, $f6, $f8 +/* 00D18 80B636D8 46083282 */ mul.s $f10, $f6, $f8 /* 00D1C 80B636DC 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00D20 80B636E0 3C054342 */ lui $a1, 0x4342 ## $a1 = 43420000 -/* 00D24 80B636E4 44075000 */ mfc1 $a3, $f10 +/* 00D24 80B636E4 44075000 */ mfc1 $a3, $f10 /* 00D28 80B636E8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00D2C 80B636EC 00000000 */ nop /* 00D30 80B636F0 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 00D34 80B636F4 C612016C */ lwc1 $f18, 0x016C($s0) ## 0000016C /* 00D38 80B636F8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00D3C 80B636FC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00D40 80B63700 46122182 */ mul.s $f6, $f4, $f18 +/* 00D40 80B63700 46122182 */ mul.s $f6, $f4, $f18 /* 00D44 80B63704 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 /* 00D48 80B63708 3C05C1D0 */ lui $a1, 0xC1D0 ## $a1 = C1D00000 -/* 00D4C 80B6370C 44073000 */ mfc1 $a3, $f6 +/* 00D4C 80B6370C 44073000 */ mfc1 $a3, $f6 /* 00D50 80B63710 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00D54 80B63714 00000000 */ nop /* 00D58 80B63718 3C0180B6 */ lui $at, %hi(D_80B65410) ## $at = 80B60000 -/* 00D5C 80B6371C C42A5410 */ lwc1 $f10, %lo(D_80B65410)($at) +/* 00D5C 80B6371C C42A5410 */ lwc1 $f10, %lo(D_80B65410)($at) /* 00D60 80B63720 C60801AC */ lwc1 $f8, 0x01AC($s0) ## 000001AC /* 00D64 80B63724 C61201A8 */ lwc1 $f18, 0x01A8($s0) ## 000001A8 /* 00D68 80B63728 C6060170 */ lwc1 $f6, 0x0170($s0) ## 00000170 -/* 00D6C 80B6372C 460A4100 */ add.s $f4, $f8, $f10 +/* 00D6C 80B6372C 460A4100 */ add.s $f4, $f8, $f10 /* 00D70 80B63730 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00D74 80B63734 46069202 */ mul.s $f8, $f18, $f6 +/* 00D74 80B63734 46069202 */ mul.s $f8, $f18, $f6 /* 00D78 80B63738 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00D7C 80B6373C 44052000 */ mfc1 $a1, $f4 +/* 00D7C 80B6373C 44052000 */ mfc1 $a1, $f4 /* 00D80 80B63740 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 -/* 00D84 80B63744 44074000 */ mfc1 $a3, $f8 +/* 00D84 80B63744 44074000 */ mfc1 $a3, $f8 /* 00D88 80B63748 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00D8C 80B6374C 00000000 */ nop /* 00D90 80B63750 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00D94 80B63754 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00D98 80B63758 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 00D9C 80B6375C 3C05C2C8 */ lui $a1, 0xC2C8 ## $a1 = C2C80000 /* 00DA0 80B63760 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00DA4 80B63764 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00DA8 80B63768 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00DAC 80B6376C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 00DB0 80B63770 C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 /* 00DB4 80B63774 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00DB8 80B63778 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00DBC 80B6377C 46045482 */ mul.s $f18, $f10, $f4 +/* 00DBC 80B6377C 46045482 */ mul.s $f18, $f10, $f4 /* 00DC0 80B63780 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 00DC4 80B63784 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 -/* 00DC8 80B63788 44079000 */ mfc1 $a3, $f18 +/* 00DC8 80B63788 44079000 */ mfc1 $a3, $f18 /* 00DCC 80B6378C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00DD0 80B63790 00000000 */ nop /* 00DD4 80B63794 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 00DD8 80B63798 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 /* 00DDC 80B6379C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 00DE0 80B637A0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00DE4 80B637A4 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 00DE8 80B637A8 46083280 */ add.s $f10, $f6, $f8 +/* 00DE8 80B637A8 46083280 */ add.s $f10, $f6, $f8 /* 00DEC 80B637AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00DF0 80B637B0 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 /* 00DF4 80B637B4 C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 -/* 00DF8 80B637B8 46045481 */ sub.s $f18, $f10, $f4 +/* 00DF8 80B637B8 46045481 */ sub.s $f18, $f10, $f4 /* 00DFC 80B637BC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00E00 80B637C0 46083282 */ mul.s $f10, $f6, $f8 +/* 00E00 80B637C0 46083282 */ mul.s $f10, $f6, $f8 /* 00E04 80B637C4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00E08 80B637C8 44059000 */ mfc1 $a1, $f18 +/* 00E08 80B637C8 44059000 */ mfc1 $a1, $f18 /* 00E0C 80B637CC 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 -/* 00E10 80B637D0 44075000 */ mfc1 $a3, $f10 +/* 00E10 80B637D0 44075000 */ mfc1 $a3, $f10 /* 00E14 80B637D4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00E18 80B637D8 00000000 */ nop /* 00E1C 80B637DC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00E20 80B637E0 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 00E24 80B637E4 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 00E28 80B637E8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00E2C 80B637EC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00E30 80B637F0 46122182 */ mul.s $f6, $f4, $f18 +/* 00E30 80B637F0 46122182 */ mul.s $f6, $f4, $f18 /* 00E34 80B637F4 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 00E38 80B637F8 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C -/* 00E3C 80B637FC 44073000 */ mfc1 $a3, $f6 +/* 00E3C 80B637FC 44073000 */ mfc1 $a3, $f6 /* 00E40 80B63800 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00E44 80B63804 00000000 */ nop /* 00E48 80B63808 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00E4C 80B6380C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00E50 80B63810 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 00E54 80B63814 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 /* 00E58 80B63818 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00E5C 80B6381C 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 00E60 80B63820 860401C0 */ lh $a0, 0x01C0($s0) ## 000001C0 -/* 00E64 80B63824 00800821 */ addu $at, $a0, $zero -/* 00E68 80B63828 00042080 */ sll $a0, $a0, 2 -/* 00E6C 80B6382C 00812023 */ subu $a0, $a0, $at -/* 00E70 80B63830 00042100 */ sll $a0, $a0, 4 -/* 00E74 80B63834 00812023 */ subu $a0, $a0, $at -/* 00E78 80B63838 000420C0 */ sll $a0, $a0, 3 -/* 00E7C 80B6383C 00812023 */ subu $a0, $a0, $at -/* 00E80 80B63840 00042080 */ sll $a0, $a0, 2 -/* 00E84 80B63844 00042400 */ sll $a0, $a0, 16 +/* 00E64 80B63824 00800821 */ addu $at, $a0, $zero +/* 00E68 80B63828 00042080 */ sll $a0, $a0, 2 +/* 00E6C 80B6382C 00812023 */ subu $a0, $a0, $at +/* 00E70 80B63830 00042100 */ sll $a0, $a0, 4 +/* 00E74 80B63834 00812023 */ subu $a0, $a0, $at +/* 00E78 80B63838 000420C0 */ sll $a0, $a0, 3 +/* 00E7C 80B6383C 00812023 */ subu $a0, $a0, $at +/* 00E80 80B63840 00042080 */ sll $a0, $a0, 2 +/* 00E84 80B63844 00042400 */ sll $a0, $a0, 16 /* 00E88 80B63848 0C01DE1C */ jal Math_Sins ## sins? -/* 00E8C 80B6384C 00042403 */ sra $a0, $a0, 16 -/* 00E90 80B63850 46000280 */ add.s $f10, $f0, $f0 +/* 00E8C 80B6384C 00042403 */ sra $a0, $a0, 16 +/* 00E90 80B63850 46000280 */ add.s $f10, $f0, $f0 /* 00E94 80B63854 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 00E98 80B63858 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00E9C 80B6385C 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00EA0 80B63860 460A4100 */ add.s $f4, $f8, $f10 +/* 00EA0 80B63860 460A4100 */ add.s $f4, $f8, $f10 /* 00EA4 80B63864 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 -/* 00EA8 80B63868 44051000 */ mfc1 $a1, $f2 -/* 00EAC 80B6386C 44061000 */ mfc1 $a2, $f2 +/* 00EA8 80B63868 44051000 */ mfc1 $a1, $f2 +/* 00EAC 80B6386C 44061000 */ mfc1 $a2, $f2 /* 00EB0 80B63870 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 /* 00EB4 80B63874 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 00EB8 80B63878 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00EBC 80B6387C 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 00EC0 80B63880 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 -/* 00EC4 80B63884 8FA4006C */ lw $a0, 0x006C($sp) +/* 00EC4 80B63884 8FA4006C */ lw $a0, 0x006C($sp) /* 00EC8 80B63888 2401004B */ addiu $at, $zero, 0x004B ## $at = 0000004B -/* 00ECC 80B6388C 14610018 */ bne $v1, $at, .L80B638F0 +/* 00ECC 80B6388C 14610018 */ bne $v1, $at, .L80B638F0 /* 00ED0 80B63890 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 00001D4C /* 00ED4 80B63894 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 /* 00ED8 80B63898 244259A0 */ addiu $v0, $v0, 0x59A0 ## $v0 = 060059A0 -/* 00EDC 80B6389C 00027900 */ sll $t7, $v0, 4 -/* 00EE0 80B638A0 000FC702 */ srl $t8, $t7, 28 -/* 00EE4 80B638A4 0018C880 */ sll $t9, $t8, 2 +/* 00EDC 80B6389C 00027900 */ sll $t7, $v0, 4 +/* 00EE0 80B638A0 000FC702 */ srl $t8, $t7, 28 +/* 00EE4 80B638A4 0018C880 */ sll $t9, $t8, 2 /* 00EE8 80B638A8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00EEC 80B638AC 01194021 */ addu $t0, $t0, $t9 +/* 00EEC 80B638AC 01194021 */ addu $t0, $t0, $t9 /* 00EF0 80B638B0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00EF4 80B638B4 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 /* 00EF8 80B638B8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00EFC 80B638BC 00414824 */ and $t1, $v0, $at +/* 00EFC 80B638BC 00414824 */ and $t1, $v0, $at /* 00F00 80B638C0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00F04 80B638C4 240A00B4 */ addiu $t2, $zero, 0x00B4 ## $t2 = 000000B4 /* 00F08 80B638C8 240B0080 */ addiu $t3, $zero, 0x0080 ## $t3 = 00000080 /* 00F0C 80B638CC 240C0028 */ addiu $t4, $zero, 0x0028 ## $t4 = 00000028 -/* 00F10 80B638D0 01093021 */ addu $a2, $t0, $t1 -/* 00F14 80B638D4 00C13021 */ addu $a2, $a2, $at -/* 00F18 80B638D8 AFAC0018 */ sw $t4, 0x0018($sp) -/* 00F1C 80B638DC AFAB0014 */ sw $t3, 0x0014($sp) -/* 00F20 80B638E0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 00F10 80B638D0 01093021 */ addu $a2, $t0, $t1 +/* 00F14 80B638D4 00C13021 */ addu $a2, $a2, $at +/* 00F18 80B638D8 AFAC0018 */ sw $t4, 0x0018($sp) +/* 00F1C 80B638DC AFAB0014 */ sw $t3, 0x0014($sp) +/* 00F20 80B638E0 AFAA0010 */ sw $t2, 0x0010($sp) /* 00F24 80B638E4 0C00B380 */ jal TitleCard_InitBossName - + /* 00F28 80B638E8 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 /* 00F2C 80B638EC 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B638F0: -/* 00F30 80B638F0 14600118 */ bne $v1, $zero, .L80B63D54 +/* 00F30 80B638F0 14600118 */ bne $v1, $zero, .L80B63D54 /* 00F34 80B638F4 240D0008 */ addiu $t5, $zero, 0x0008 ## $t5 = 00000008 /* 00F38 80B638F8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00F3C 80B638FC 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 @@ -962,159 +962,159 @@ glabel L80B63670 /* 00F50 80B63910 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00F54 80B63914 26180250 */ addiu $t8, $s0, 0x0250 ## $t8 = 00000250 /* 00F58 80B63918 E61201A8 */ swc1 $f18, 0x01A8($s0) ## 000001A8 -/* 00F5C 80B6391C AFB80044 */ sw $t8, 0x0044($sp) +/* 00F5C 80B6391C AFB80044 */ sw $t8, 0x0044($sp) /* 00F60 80B63920 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00F64 80B63924 2484C65C */ addiu $a0, $a0, 0xC65C ## $a0 = 0600C65C /* 00F68 80B63928 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00F6C 80B6392C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00F70 80B63930 44815000 */ mtc1 $at, $f10 ## $f10 = -4.00 -/* 00F74 80B63934 46803220 */ cvt.s.w $f8, $f6 +/* 00F74 80B63934 46803220 */ cvt.s.w $f8, $f6 /* 00F78 80B63938 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00F7C 80B6393C 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 00F80 80B63940 AFB90014 */ sw $t9, 0x0014($sp) +/* 00F80 80B63940 AFB90014 */ sw $t9, 0x0014($sp) /* 00F84 80B63944 24A5C65C */ addiu $a1, $a1, 0xC65C ## $a1 = 0600C65C -/* 00F88 80B63948 8FA40044 */ lw $a0, 0x0044($sp) -/* 00F8C 80B6394C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00F88 80B63948 8FA40044 */ lw $a0, 0x0044($sp) +/* 00F8C 80B6394C E7A80010 */ swc1 $f8, 0x0010($sp) /* 00F90 80B63950 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00F94 80B63954 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00F98 80B63958 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00F9C 80B6395C E7AA0018 */ swc1 $f10, 0x0018($sp) + +/* 00F9C 80B6395C E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00FA0 80B63960 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A /* 00FA4 80B63964 A208014C */ sb $t0, 0x014C($s0) ## 0000014C /* 00FA8 80B63968 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00FAC 80B6396C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00FB0 80B63970 240538B2 */ addiu $a1, $zero, 0x38B2 ## $a1 = 000038B2 /* 00FB4 80B63974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00FB8 80B63978 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00FBC 80B6397C 2405283D */ addiu $a1, $zero, 0x283D ## $a1 = 0000283D -/* 00FC0 80B63980 100000F5 */ beq $zero, $zero, .L80B63D58 +/* 00FC0 80B63980 100000F5 */ beq $zero, $zero, .L80B63D58 /* 00FC4 80B63984 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC glabel L80B63988 /* 00FC8 80B63988 860901D6 */ lh $t1, 0x01D6($s0) ## 000001D6 /* 00FCC 80B6398C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00FD0 80B63990 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00FD4 80B63994 15210014 */ bne $t1, $at, .L80B639E8 +/* 00FD4 80B63994 15210014 */ bne $t1, $at, .L80B639E8 /* 00FD8 80B63998 2484CB1C */ addiu $a0, $a0, 0xCB1C ## $a0 = 0600CB1C /* 00FDC 80B6399C 260A0250 */ addiu $t2, $s0, 0x0250 ## $t2 = 00000250 /* 00FE0 80B639A0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00FE4 80B639A4 AFAA0044 */ sw $t2, 0x0044($sp) + +/* 00FE4 80B639A4 AFAA0044 */ sw $t2, 0x0044($sp) /* 00FE8 80B639A8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00FEC 80B639AC 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00FF0 80B639B0 44813000 */ mtc1 $at, $f6 ## $f6 = -3.00 -/* 00FF4 80B639B4 468024A0 */ cvt.s.w $f18, $f4 +/* 00FF4 80B639B4 468024A0 */ cvt.s.w $f18, $f4 /* 00FF8 80B639B8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00FFC 80B639BC 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 -/* 01000 80B639C0 AFAB0014 */ sw $t3, 0x0014($sp) +/* 01000 80B639C0 AFAB0014 */ sw $t3, 0x0014($sp) /* 01004 80B639C4 24A5CB1C */ addiu $a1, $a1, 0xCB1C ## $a1 = 0600CB1C -/* 01008 80B639C8 8FA40044 */ lw $a0, 0x0044($sp) -/* 0100C 80B639CC E7B20010 */ swc1 $f18, 0x0010($sp) +/* 01008 80B639C8 8FA40044 */ lw $a0, 0x0044($sp) +/* 0100C 80B639CC E7B20010 */ swc1 $f18, 0x0010($sp) /* 01010 80B639D0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01014 80B639D4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01018 80B639D8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0101C 80B639DC E7A60018 */ swc1 $f6, 0x0018($sp) + +/* 0101C 80B639DC E7A60018 */ swc1 $f6, 0x0018($sp) /* 01020 80B639E0 240C000B */ addiu $t4, $zero, 0x000B ## $t4 = 0000000B /* 01024 80B639E4 A20C014C */ sb $t4, 0x014C($s0) ## 0000014C .L80B639E8: /* 01028 80B639E8 860D01D4 */ lh $t5, 0x01D4($s0) ## 000001D4 /* 0102C 80B639EC 240100AA */ addiu $at, $zero, 0x00AA ## $at = 000000AA -/* 01030 80B639F0 8FA4006C */ lw $a0, 0x006C($sp) -/* 01034 80B639F4 15A10006 */ bne $t5, $at, .L80B63A10 +/* 01030 80B639F0 8FA4006C */ lw $a0, 0x006C($sp) +/* 01034 80B639F4 15A10006 */ bne $t5, $at, .L80B63A10 /* 01038 80B639F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0103C 80B639FC 0C00B7D5 */ jal func_8002DF54 +/* 0103C 80B639FC 0C00B7D5 */ jal func_8002DF54 /* 01040 80B63A00 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 /* 01044 80B63A04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01048 80B63A08 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0104C 80B63A0C 240538A6 */ addiu $a1, $zero, 0x38A6 ## $a1 = 000038A6 .L80B63A10: /* 01050 80B63A10 3C0180B6 */ lui $at, %hi(D_80B65414) ## $at = 80B60000 -/* 01054 80B63A14 C42A5414 */ lwc1 $f10, %lo(D_80B65414)($at) +/* 01054 80B63A14 C42A5414 */ lwc1 $f10, %lo(D_80B65414)($at) /* 01058 80B63A18 C60801AC */ lwc1 $f8, 0x01AC($s0) ## 000001AC /* 0105C 80B63A1C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 01060 80B63A20 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 /* 01064 80B63A24 C61201A8 */ lwc1 $f18, 0x01A8($s0) ## 000001A8 -/* 01068 80B63A28 460A4100 */ add.s $f4, $f8, $f10 +/* 01068 80B63A28 460A4100 */ add.s $f4, $f8, $f10 /* 0106C 80B63A2C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01070 80B63A30 46069202 */ mul.s $f8, $f18, $f6 +/* 01070 80B63A30 46069202 */ mul.s $f8, $f18, $f6 /* 01074 80B63A34 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01078 80B63A38 44052000 */ mfc1 $a1, $f4 +/* 01078 80B63A38 44052000 */ mfc1 $a1, $f4 /* 0107C 80B63A3C 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 -/* 01080 80B63A40 44074000 */ mfc1 $a3, $f8 +/* 01080 80B63A40 44074000 */ mfc1 $a3, $f8 /* 01084 80B63A44 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01088 80B63A48 00000000 */ nop /* 0108C 80B63A4C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01090 80B63A50 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01094 80B63A54 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 01098 80B63A58 3C05C2C8 */ lui $a1, 0xC2C8 ## $a1 = C2C80000 /* 0109C 80B63A5C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 010A0 80B63A60 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 010A4 80B63A64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 010A8 80B63A68 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 010AC 80B63A6C C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 /* 010B0 80B63A70 3C05C536 */ lui $a1, 0xC536 ## $a1 = C5360000 /* 010B4 80B63A74 34A53800 */ ori $a1, $a1, 0x3800 ## $a1 = C5363800 -/* 010B8 80B63A78 46045482 */ mul.s $f18, $f10, $f4 +/* 010B8 80B63A78 46045482 */ mul.s $f18, $f10, $f4 /* 010BC 80B63A7C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 010C0 80B63A80 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 010C4 80B63A84 44079000 */ mfc1 $a3, $f18 +/* 010C4 80B63A84 44079000 */ mfc1 $a3, $f18 /* 010C8 80B63A88 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 010CC 80B63A8C 00000000 */ nop /* 010D0 80B63A90 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 010D4 80B63A94 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 010D8 80B63A98 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 010DC 80B63A9C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 010E0 80B63AA0 44050000 */ mfc1 $a1, $f0 -/* 010E4 80B63AA4 44060000 */ mfc1 $a2, $f0 +/* 010E0 80B63AA0 44050000 */ mfc1 $a1, $f0 +/* 010E4 80B63AA4 44060000 */ mfc1 $a2, $f0 /* 010E8 80B63AA8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 010EC 80B63AAC 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 010F0 80B63AB0 3C0180B6 */ lui $at, %hi(D_80B65418) ## $at = 80B60000 -/* 010F4 80B63AB4 C4285418 */ lwc1 $f8, %lo(D_80B65418)($at) +/* 010F4 80B63AB4 C4285418 */ lwc1 $f8, %lo(D_80B65418)($at) /* 010F8 80B63AB8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 010FC 80B63ABC 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 01100 80B63AC0 44815000 */ mtc1 $at, $f10 ## $f10 = 300.00 -/* 01104 80B63AC4 46083001 */ sub.s $f0, $f6, $f8 -/* 01108 80B63AC8 46000005 */ abs.s $f0, $f0 -/* 0110C 80B63ACC 460A003C */ c.lt.s $f0, $f10 +/* 01104 80B63AC4 46083001 */ sub.s $f0, $f6, $f8 +/* 01108 80B63AC8 46000005 */ abs.s $f0, $f0 +/* 0110C 80B63ACC 460A003C */ c.lt.s $f0, $f10 /* 01110 80B63AD0 00000000 */ nop -/* 01114 80B63AD4 4502001E */ bc1fl .L80B63B50 +/* 01114 80B63AD4 4502001E */ bc1fl .L80B63B50 /* 01118 80B63AD8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0111C 80B63ADC 860E01C8 */ lh $t6, 0x01C8($s0) ## 000001C8 /* 01120 80B63AE0 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 01124 80B63AE4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01128 80B63AE8 15C00018 */ bne $t6, $zero, .L80B63B4C +/* 01128 80B63AE8 15C00018 */ bne $t6, $zero, .L80B63B4C /* 0112C 80B63AEC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01130 80B63AF0 44811000 */ mtc1 $at, $f2 ## $f2 = 14.00 /* 01134 80B63AF4 A60F01C8 */ sh $t7, 0x01C8($s0) ## 000001C8 /* 01138 80B63AF8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0113C 80B63AFC E7A20010 */ swc1 $f2, 0x0010($sp) +/* 0113C 80B63AFC E7A20010 */ swc1 $f2, 0x0010($sp) /* 01140 80B63B00 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 01144 80B63B04 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 /* 01148 80B63B08 3C0180B6 */ lui $at, %hi(D_80B6541C) ## $at = 80B60000 -/* 0114C 80B63B0C C428541C */ lwc1 $f8, %lo(D_80B6541C)($at) -/* 01150 80B63B10 46122180 */ add.s $f6, $f4, $f18 -/* 01154 80B63B14 AFA0001C */ sw $zero, 0x001C($sp) -/* 01158 80B63B18 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0115C 80B63B1C 8FA6006C */ lw $a2, 0x006C($sp) -/* 01160 80B63B20 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 0114C 80B63B0C C428541C */ lwc1 $f8, %lo(D_80B6541C)($at) +/* 01150 80B63B10 46122180 */ add.s $f6, $f4, $f18 +/* 01154 80B63B14 AFA0001C */ sw $zero, 0x001C($sp) +/* 01158 80B63B18 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0115C 80B63B1C 8FA6006C */ lw $a2, 0x006C($sp) +/* 01160 80B63B20 E7A60014 */ swc1 $f6, 0x0014($sp) /* 01164 80B63B24 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 01168 80B63B28 24080028 */ addiu $t0, $zero, 0x0028 ## $t0 = 00000028 -/* 0116C 80B63B2C AFA80028 */ sw $t0, 0x0028($sp) -/* 01170 80B63B30 AFA00024 */ sw $zero, 0x0024($sp) +/* 0116C 80B63B2C AFA80028 */ sw $t0, 0x0028($sp) +/* 01170 80B63B30 AFA00024 */ sw $zero, 0x0024($sp) /* 01174 80B63B34 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 01178 80B63B38 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 3E4C1C24 /* 0117C 80B63B3C 0C00C916 */ jal Actor_SpawnAttached - -/* 01180 80B63B40 AFB90020 */ sw $t9, 0x0020($sp) + +/* 01180 80B63B40 AFB90020 */ sw $t9, 0x0020($sp) /* 01184 80B63B44 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 01188 80B63B48 A209014F */ sb $t1, 0x014F($s0) ## 0000014F .L80B63B4C: @@ -1124,103 +1124,103 @@ glabel L80B63988 /* 01194 80B63B54 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 01198 80B63B58 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 /* 0119C 80B63B5C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 011A0 80B63B60 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 011A4 80B63B64 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 011A8 80B63B68 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 011AC 80B63B6C 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 011B0 80B63B70 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C /* 011B4 80B63B74 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 011B8 80B63B78 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 011BC 80B63B7C 3C0480B6 */ lui $a0, %hi(D_80B65220) ## $a0 = 80B60000 /* 011C0 80B63B80 24845220 */ addiu $a0, $a0, %lo(D_80B65220) ## $a0 = 80B65220 /* 011C4 80B63B84 0C00084C */ jal osSyncPrintf - + /* 011C8 80B63B88 860501D4 */ lh $a1, 0x01D4($s0) ## 000001D4 /* 011CC 80B63B8C 3C0180B6 */ lui $at, %hi(D_80B65420) ## $at = 80B60000 -/* 011D0 80B63B90 C4245420 */ lwc1 $f4, %lo(D_80B65420)($at) +/* 011D0 80B63B90 C4245420 */ lwc1 $f4, %lo(D_80B65420)($at) /* 011D4 80B63B94 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 011D8 80B63B98 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 011DC 80B63B9C 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 011E0 80B63BA0 46045001 */ sub.s $f0, $f10, $f4 -/* 011E4 80B63BA4 8FAA006C */ lw $t2, 0x006C($sp) +/* 011E0 80B63BA0 46045001 */ sub.s $f0, $f10, $f4 +/* 011E4 80B63BA4 8FAA006C */ lw $t2, 0x006C($sp) /* 011E8 80B63BA8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 011EC 80B63BAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 011F0 80B63BB0 46000005 */ abs.s $f0, $f0 +/* 011F0 80B63BB0 46000005 */ abs.s $f0, $f0 /* 011F4 80B63BB4 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 011F8 80B63BB8 4612003C */ c.lt.s $f0, $f18 +/* 011F8 80B63BB8 4612003C */ c.lt.s $f0, $f18 /* 011FC 80B63BBC 240D0009 */ addiu $t5, $zero, 0x0009 ## $t5 = 00000009 /* 01200 80B63BC0 24A5B4C8 */ addiu $a1, $a1, 0xB4C8 ## $a1 = 0600B4C8 /* 01204 80B63BC4 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 -/* 01208 80B63BC8 45000062 */ bc1f .L80B63D54 -/* 0120C 80B63BCC 002A0821 */ addu $at, $at, $t2 +/* 01208 80B63BC8 45000062 */ bc1f .L80B63D54 +/* 0120C 80B63BCC 002A0821 */ addu $at, $at, $t2 /* 01210 80B63BD0 A0200AE3 */ sb $zero, 0x0AE3($at) ## 00010AE3 -/* 01214 80B63BD4 8FAC006C */ lw $t4, 0x006C($sp) +/* 01214 80B63BD4 8FAC006C */ lw $t4, 0x006C($sp) /* 01218 80B63BD8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0121C 80B63BDC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 01220 80B63BE0 002C0821 */ addu $at, $at, $t4 +/* 01220 80B63BE0 002C0821 */ addu $at, $at, $t4 /* 01224 80B63BE4 A42B0AFA */ sh $t3, 0x0AFA($at) ## 00010AFA -/* 01228 80B63BE8 0C0294D3 */ jal func_800A534C +/* 01228 80B63BE8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0122C 80B63BEC A60D01CA */ sh $t5, 0x01CA($s0) ## 000001CA /* 01230 80B63BF0 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 01234 80B63BF4 240F004B */ addiu $t7, $zero, 0x004B ## $t7 = 0000004B /* 01238 80B63BF8 2418008C */ addiu $t8, $zero, 0x008C ## $t8 = 0000008C /* 0123C 80B63BFC A20E014C */ sb $t6, 0x014C($s0) ## 0000014C /* 01240 80B63C00 A60F01D6 */ sh $t7, 0x01D6($s0) ## 000001D6 -/* 01244 80B63C04 10000053 */ beq $zero, $zero, .L80B63D54 +/* 01244 80B63C04 10000053 */ beq $zero, $zero, .L80B63D54 /* 01248 80B63C08 A61801D4 */ sh $t8, 0x01D4($s0) ## 000001D4 glabel L80B63C0C /* 0124C 80B63C0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01250 80B63C10 0C2D92AA */ jal func_80B64AA8 -/* 01254 80B63C14 8FA5006C */ lw $a1, 0x006C($sp) +/* 01250 80B63C10 0C2D92AA */ jal func_80B64AA8 +/* 01254 80B63C14 8FA5006C */ lw $a1, 0x006C($sp) /* 01258 80B63C18 3C0180B6 */ lui $at, %hi(D_80B65424) ## $at = 80B60000 -/* 0125C 80B63C1C C4285424 */ lwc1 $f8, %lo(D_80B65424)($at) +/* 0125C 80B63C1C C4285424 */ lwc1 $f8, %lo(D_80B65424)($at) /* 01260 80B63C20 C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 01264 80B63C24 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 01268 80B63C28 44819000 */ mtc1 $at, $f18 ## $f18 = 1.50 /* 0126C 80B63C2C C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 -/* 01270 80B63C30 46083280 */ add.s $f10, $f6, $f8 +/* 01270 80B63C30 46083280 */ add.s $f10, $f6, $f8 /* 01274 80B63C34 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01278 80B63C38 46122182 */ mul.s $f6, $f4, $f18 +/* 01278 80B63C38 46122182 */ mul.s $f6, $f4, $f18 /* 0127C 80B63C3C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01280 80B63C40 44055000 */ mfc1 $a1, $f10 +/* 01280 80B63C40 44055000 */ mfc1 $a1, $f10 /* 01284 80B63C44 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 -/* 01288 80B63C48 44073000 */ mfc1 $a3, $f6 +/* 01288 80B63C48 44073000 */ mfc1 $a3, $f6 /* 0128C 80B63C4C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01290 80B63C50 00000000 */ nop /* 01294 80B63C54 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01298 80B63C58 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0129C 80B63C5C 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 012A0 80B63C60 3C05C2C8 */ lui $a1, 0xC2C8 ## $a1 = C2C80000 /* 012A4 80B63C64 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 012A8 80B63C68 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 012AC 80B63C6C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 012B0 80B63C70 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 012B4 80B63C74 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 012B8 80B63C78 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 012BC 80B63C7C 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 012C0 80B63C80 460A4100 */ add.s $f4, $f8, $f10 +/* 012C0 80B63C80 460A4100 */ add.s $f4, $f8, $f10 /* 012C4 80B63C84 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 012C8 80B63C88 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 012CC 80B63C8C C60801A8 */ lwc1 $f8, 0x01A8($s0) ## 000001A8 -/* 012D0 80B63C90 46122181 */ sub.s $f6, $f4, $f18 +/* 012D0 80B63C90 46122181 */ sub.s $f6, $f4, $f18 /* 012D4 80B63C94 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 012D8 80B63C98 460A4102 */ mul.s $f4, $f8, $f10 +/* 012D8 80B63C98 460A4102 */ mul.s $f4, $f8, $f10 /* 012DC 80B63C9C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 012E0 80B63CA0 44053000 */ mfc1 $a1, $f6 +/* 012E0 80B63CA0 44053000 */ mfc1 $a1, $f6 /* 012E4 80B63CA4 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 -/* 012E8 80B63CA8 44072000 */ mfc1 $a3, $f4 +/* 012E8 80B63CA8 44072000 */ mfc1 $a3, $f4 /* 012EC 80B63CAC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 012F0 80B63CB0 00000000 */ nop /* 012F4 80B63CB4 861901D6 */ lh $t9, 0x01D6($s0) ## 000001D6 -/* 012F8 80B63CB8 8FA4006C */ lw $a0, 0x006C($sp) -/* 012FC 80B63CBC 57200026 */ bnel $t9, $zero, .L80B63D58 +/* 012F8 80B63CB8 8FA4006C */ lw $a0, 0x006C($sp) +/* 012FC 80B63CBC 57200026 */ bnel $t9, $zero, .L80B63D58 /* 01300 80B63CC0 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 01304 80B63CC4 0C030129 */ jal func_800C04A4 +/* 01304 80B63CC4 0C030129 */ jal func_800C04A4 /* 01308 80B63CC8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0130C 80B63CCC 26030150 */ addiu $v1, $s0, 0x0150 ## $v1 = 00000150 /* 01310 80B63CD0 8C690000 */ lw $t1, 0x0000($v1) ## 00000150 @@ -1243,15 +1243,15 @@ glabel L80B63C0C /* 01354 80B63D14 8E0D0164 */ lw $t5, 0x0164($s0) ## 00000164 /* 01358 80B63D18 AC4D0058 */ sw $t5, 0x0058($v0) ## 00000058 /* 0135C 80B63D1C 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 01360 80B63D20 0C03022B */ jal func_800C08AC -/* 01364 80B63D24 8FA4006C */ lw $a0, 0x006C($sp) +/* 01360 80B63D20 0C03022B */ jal func_800C08AC +/* 01364 80B63D24 8FA4006C */ lw $a0, 0x006C($sp) /* 01368 80B63D28 A60001CC */ sh $zero, 0x01CC($s0) ## 000001CC -/* 0136C 80B63D2C 8FA4006C */ lw $a0, 0x006C($sp) -/* 01370 80B63D30 0C01914D */ jal func_80064534 +/* 0136C 80B63D2C 8FA4006C */ lw $a0, 0x006C($sp) +/* 01370 80B63D30 0C01914D */ jal func_80064534 /* 01374 80B63D34 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 01378 80B63D38 8FA4006C */ lw $a0, 0x006C($sp) +/* 01378 80B63D38 8FA4006C */ lw $a0, 0x006C($sp) /* 0137C 80B63D3C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01380 80B63D40 0C00B7D5 */ jal func_8002DF54 +/* 01380 80B63D40 0C00B7D5 */ jal func_8002DF54 /* 01384 80B63D44 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01388 80B63D48 3C0F80B6 */ lui $t7, %hi(func_80B64AA8) ## $t7 = 80B60000 /* 0138C 80B63D4C 25EF4AA8 */ addiu $t7, $t7, %lo(func_80B64AA8) ## $t7 = 80B64AA8 @@ -1260,17 +1260,17 @@ glabel L80B63D54 .L80B63D54: /* 01394 80B63D54 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC .L80B63D58: -/* 01398 80B63D58 8FA4006C */ lw $a0, 0x006C($sp) +/* 01398 80B63D58 8FA4006C */ lw $a0, 0x006C($sp) /* 0139C 80B63D5C 2606015C */ addiu $a2, $s0, 0x015C ## $a2 = 0000015C -/* 013A0 80B63D60 50A00004 */ beql $a1, $zero, .L80B63D74 -/* 013A4 80B63D64 8FBF003C */ lw $ra, 0x003C($sp) -/* 013A8 80B63D68 0C030136 */ jal func_800C04D8 +/* 013A0 80B63D60 50A00004 */ beql $a1, $zero, .L80B63D74 +/* 013A4 80B63D64 8FBF003C */ lw $ra, 0x003C($sp) +/* 013A8 80B63D68 0C030136 */ jal func_800C04D8 /* 013AC 80B63D6C 26070150 */ addiu $a3, $s0, 0x0150 ## $a3 = 00000150 -/* 013B0 80B63D70 8FBF003C */ lw $ra, 0x003C($sp) +/* 013B0 80B63D70 8FBF003C */ lw $ra, 0x003C($sp) .L80B63D74: -/* 013B4 80B63D74 8FB00038 */ lw $s0, 0x0038($sp) +/* 013B4 80B63D74 8FB00038 */ lw $s0, 0x0038($sp) /* 013B8 80B63D78 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 013BC 80B63D7C 03E00008 */ jr $ra +/* 013BC 80B63D7C 03E00008 */ jr $ra /* 013C0 80B63D80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s index 268f007e4e..1dfaa9d4b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s @@ -1,10 +1,10 @@ glabel func_80B63D84 /* 013C4 80B63D84 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 013C8 80B63D88 3C0F80B6 */ lui $t7, %hi(D_80B65204) ## $t7 = 80B60000 -/* 013CC 80B63D8C AFBF001C */ sw $ra, 0x001C($sp) -/* 013D0 80B63D90 AFB00018 */ sw $s0, 0x0018($sp) -/* 013D4 80B63D94 AFA50034 */ sw $a1, 0x0034($sp) -/* 013D8 80B63D98 AFA60038 */ sw $a2, 0x0038($sp) +/* 013CC 80B63D8C AFBF001C */ sw $ra, 0x001C($sp) +/* 013D0 80B63D90 AFB00018 */ sw $s0, 0x0018($sp) +/* 013D4 80B63D94 AFA50034 */ sw $a1, 0x0034($sp) +/* 013D8 80B63D98 AFA60038 */ sw $a2, 0x0038($sp) /* 013DC 80B63D9C 25EF5204 */ addiu $t7, $t7, %lo(D_80B65204) ## $t7 = 80B65204 /* 013E0 80B63DA0 8DF90000 */ lw $t9, 0x0000($t7) ## 80B65204 /* 013E4 80B63DA4 27AE0024 */ addiu $t6, $sp, 0x0024 ## $t6 = FFFFFFF4 @@ -17,69 +17,69 @@ glabel func_80B63D84 /* 01400 80B63DC0 24840250 */ addiu $a0, $a0, 0x0250 ## $a0 = 00000250 /* 01404 80B63DC4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01408 80B63DC8 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 0140C 80B63DCC 0C0294D3 */ jal func_800A534C +/* 0140C 80B63DCC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01410 80B63DD0 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC /* 01414 80B63DD4 3C0880B6 */ lui $t0, %hi(func_80B6404C) ## $t0 = 80B60000 /* 01418 80B63DD8 2508404C */ addiu $t0, $t0, %lo(func_80B6404C) ## $t0 = 80B6404C /* 0141C 80B63DDC AE0801FC */ sw $t0, 0x01FC($s0) ## 000001FC -/* 01420 80B63DE0 87A9003A */ lh $t1, 0x003A($sp) +/* 01420 80B63DE0 87A9003A */ lh $t1, 0x003A($sp) /* 01424 80B63DE4 3C0480B6 */ lui $a0, %hi(D_80B6525C) ## $a0 = 80B60000 /* 01428 80B63DE8 2484525C */ addiu $a0, $a0, %lo(D_80B6525C) ## $a0 = 80B6525C /* 0142C 80B63DEC A60901C2 */ sh $t1, 0x01C2($s0) ## 000001C2 /* 01430 80B63DF0 860501C2 */ lh $a1, 0x01C2($s0) ## 000001C2 -/* 01434 80B63DF4 00055040 */ sll $t2, $a1, 1 -/* 01438 80B63DF8 03AA5821 */ addu $t3, $sp, $t2 +/* 01434 80B63DF4 00055040 */ sll $t2, $a1, 1 +/* 01438 80B63DF8 03AA5821 */ addu $t3, $sp, $t2 /* 0143C 80B63DFC 856B0024 */ lh $t3, 0x0024($t3) ## 00000024 /* 01440 80B63E00 0C00084C */ jal osSyncPrintf - + /* 01444 80B63E04 A60B01C4 */ sh $t3, 0x01C4($s0) ## 000001C4 /* 01448 80B63E08 3C0480B6 */ lui $a0, %hi(D_80B6526C) ## $a0 = 80B60000 /* 0144C 80B63E0C 2484526C */ addiu $a0, $a0, %lo(D_80B6526C) ## $a0 = 80B6526C /* 01450 80B63E10 0C00084C */ jal osSyncPrintf - + /* 01454 80B63E14 860501C4 */ lh $a1, 0x01C4($s0) ## 000001C4 /* 01458 80B63E18 860C01C2 */ lh $t4, 0x01C2($s0) ## 000001C2 /* 0145C 80B63E1C 3C0E80B6 */ lui $t6, %hi(D_80B65190) ## $t6 = 80B60000 /* 01460 80B63E20 25CE5190 */ addiu $t6, $t6, %lo(D_80B65190) ## $t6 = 80B65190 -/* 01464 80B63E24 000C6900 */ sll $t5, $t4, 4 +/* 01464 80B63E24 000C6900 */ sll $t5, $t4, 4 /* 01468 80B63E28 3C0180B6 */ lui $at, %hi(D_80B65428) ## $at = 80B60000 -/* 0146C 80B63E2C 01AE1021 */ addu $v0, $t5, $t6 -/* 01470 80B63E30 C4205428 */ lwc1 $f0, %lo(D_80B65428)($at) +/* 0146C 80B63E2C 01AE1021 */ addu $v0, $t5, $t6 +/* 01470 80B63E30 C4205428 */ lwc1 $f0, %lo(D_80B65428)($at) /* 01474 80B63E34 C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000000 /* 01478 80B63E38 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0147C 80B63E3C 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 01480 80B63E40 46002182 */ mul.s $f6, $f4, $f0 +/* 01480 80B63E40 46002182 */ mul.s $f6, $f4, $f0 /* 01484 80B63E44 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 01488 80B63E48 3C0480B6 */ lui $a0, %hi(D_80B6527C) ## $a0 = 80B60000 /* 0148C 80B63E4C 2484527C */ addiu $a0, $a0, %lo(D_80B6527C) ## $a0 = 80B6527C -/* 01490 80B63E50 46083280 */ add.s $f10, $f6, $f8 +/* 01490 80B63E50 46083280 */ add.s $f10, $f6, $f8 /* 01494 80B63E54 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 /* 01498 80B63E58 3C0180B6 */ lui $at, %hi(D_80B6542C) ## $at = 80B60000 /* 0149C 80B63E5C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 014A0 80B63E60 C4440004 */ lwc1 $f4, 0x0004($v0) ## 00000004 -/* 014A4 80B63E64 46062200 */ add.s $f8, $f4, $f6 +/* 014A4 80B63E64 46062200 */ add.s $f8, $f4, $f6 /* 014A8 80B63E68 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 014AC 80B63E6C C44A0008 */ lwc1 $f10, 0x0008($v0) ## 00000008 -/* 014B0 80B63E70 C426542C */ lwc1 $f6, %lo(D_80B6542C)($at) -/* 014B4 80B63E74 46005102 */ mul.s $f4, $f10, $f0 +/* 014B0 80B63E70 C426542C */ lwc1 $f6, %lo(D_80B6542C)($at) +/* 014B4 80B63E74 46005102 */ mul.s $f4, $f10, $f0 /* 014B8 80B63E78 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 014BC 80B63E7C 46062201 */ sub.s $f8, $f4, $f6 -/* 014C0 80B63E80 46005121 */ cvt.d.s $f4, $f10 +/* 014BC 80B63E7C 46062201 */ sub.s $f8, $f4, $f6 +/* 014C0 80B63E80 46005121 */ cvt.d.s $f4, $f10 /* 014C4 80B63E84 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C /* 014C8 80B63E88 844F000C */ lh $t7, 0x000C($v0) ## 0000000C -/* 014CC 80B63E8C 44072000 */ mfc1 $a3, $f4 -/* 014D0 80B63E90 44062800 */ mfc1 $a2, $f5 +/* 014CC 80B63E8C 44072000 */ mfc1 $a3, $f4 +/* 014D0 80B63E90 44062800 */ mfc1 $a2, $f5 /* 014D4 80B63E94 0C00084C */ jal osSyncPrintf - + /* 014D8 80B63E98 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 014DC 80B63E9C C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 014E0 80B63EA0 3C0480B6 */ lui $a0, %hi(D_80B65288) ## $a0 = 80B60000 /* 014E4 80B63EA4 24845288 */ addiu $a0, $a0, %lo(D_80B65288) ## $a0 = 80B65288 -/* 014E8 80B63EA8 46003221 */ cvt.d.s $f8, $f6 -/* 014EC 80B63EAC 44074000 */ mfc1 $a3, $f8 -/* 014F0 80B63EB0 44064800 */ mfc1 $a2, $f9 +/* 014E8 80B63EA8 46003221 */ cvt.d.s $f8, $f6 +/* 014EC 80B63EAC 44074000 */ mfc1 $a3, $f8 +/* 014F0 80B63EB0 44064800 */ mfc1 $a2, $f9 /* 014F4 80B63EB4 0C00084C */ jal osSyncPrintf - + /* 014F8 80B63EB8 00000000 */ nop /* 014FC 80B63EBC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01500 80B63EC0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 @@ -88,92 +88,92 @@ glabel func_80B63D84 /* 0150C 80B63ECC 44817000 */ mtc1 $at, $f14 ## $f14 = 2.00 /* 01510 80B63ED0 3C0180B6 */ lui $at, %hi(D_80B65430) ## $at = 80B60000 /* 01514 80B63ED4 3C0880B6 */ lui $t0, %hi(D_80B65190) ## $t0 = 80B60000 -/* 01518 80B63ED8 C4305430 */ lwc1 $f16, %lo(D_80B65430)($at) +/* 01518 80B63ED8 C4305430 */ lwc1 $f16, %lo(D_80B65430)($at) /* 0151C 80B63EDC 25085190 */ addiu $t0, $t0, %lo(D_80B65190) ## $t0 = 80B65190 -/* 01520 80B63EE0 0018C900 */ sll $t9, $t8, 4 +/* 01520 80B63EE0 0018C900 */ sll $t9, $t8, 4 /* 01524 80B63EE4 3C0180B6 */ lui $at, %hi(D_80B65434) ## $at = 80B60000 -/* 01528 80B63EE8 03281021 */ addu $v0, $t9, $t0 -/* 0152C 80B63EEC C4325434 */ lwc1 $f18, %lo(D_80B65434)($at) +/* 01528 80B63EE8 03281021 */ addu $v0, $t9, $t0 +/* 0152C 80B63EEC C4325434 */ lwc1 $f18, %lo(D_80B65434)($at) /* 01530 80B63EF0 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 00000000 /* 01534 80B63EF4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01538 80B63EF8 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 0153C 80B63EFC 46125102 */ mul.s $f4, $f10, $f18 +/* 0153C 80B63EFC 46125102 */ mul.s $f4, $f10, $f18 /* 01540 80B63F00 3C0180B6 */ lui $at, %hi(D_80B65438) ## $at = 80B60000 /* 01544 80B63F04 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 -/* 01548 80B63F08 46062200 */ add.s $f8, $f4, $f6 +/* 01548 80B63F08 46062200 */ add.s $f8, $f4, $f6 /* 0154C 80B63F0C E608018C */ swc1 $f8, 0x018C($s0) ## 0000018C /* 01550 80B63F10 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 00000004 /* 01554 80B63F14 E60A0190 */ swc1 $f10, 0x0190($s0) ## 00000190 /* 01558 80B63F18 C4440008 */ lwc1 $f4, 0x0008($v0) ## 00000008 -/* 0155C 80B63F1C C4285438 */ lwc1 $f8, %lo(D_80B65438)($at) +/* 0155C 80B63F1C C4285438 */ lwc1 $f8, %lo(D_80B65438)($at) /* 01560 80B63F20 3C0180B6 */ lui $at, %hi(D_80B6543C) ## $at = 80B60000 -/* 01564 80B63F24 46122182 */ mul.s $f6, $f4, $f18 +/* 01564 80B63F24 46122182 */ mul.s $f6, $f4, $f18 /* 01568 80B63F28 C604018C */ lwc1 $f4, 0x018C($s0) ## 0000018C -/* 0156C 80B63F2C 46083281 */ sub.s $f10, $f6, $f8 +/* 0156C 80B63F2C 46083281 */ sub.s $f10, $f6, $f8 /* 01570 80B63F30 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 01574 80B63F34 46062001 */ sub.s $f0, $f4, $f6 +/* 01574 80B63F34 46062001 */ sub.s $f0, $f4, $f6 /* 01578 80B63F38 E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 -/* 0157C 80B63F3C 46000005 */ abs.s $f0, $f0 -/* 01580 80B63F40 460E0202 */ mul.s $f8, $f0, $f14 +/* 0157C 80B63F3C 46000005 */ abs.s $f0, $f0 +/* 01580 80B63F40 460E0202 */ mul.s $f8, $f0, $f14 /* 01584 80B63F44 00000000 */ nop -/* 01588 80B63F48 46104082 */ mul.s $f2, $f8, $f16 -/* 0158C 80B63F4C 460C103C */ c.lt.s $f2, $f12 +/* 01588 80B63F48 46104082 */ mul.s $f2, $f8, $f16 +/* 0158C 80B63F4C 460C103C */ c.lt.s $f2, $f12 /* 01590 80B63F50 E6020198 */ swc1 $f2, 0x0198($s0) ## 00000198 -/* 01594 80B63F54 45000002 */ bc1f .L80B63F60 +/* 01594 80B63F54 45000002 */ bc1f .L80B63F60 /* 01598 80B63F58 00000000 */ nop /* 0159C 80B63F5C E60C0198 */ swc1 $f12, 0x0198($s0) ## 00000198 .L80B63F60: /* 015A0 80B63F60 C60A0194 */ lwc1 $f10, 0x0194($s0) ## 00000194 /* 015A4 80B63F64 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 015A8 80B63F68 46045001 */ sub.s $f0, $f10, $f4 -/* 015AC 80B63F6C 46000005 */ abs.s $f0, $f0 -/* 015B0 80B63F70 460E0182 */ mul.s $f6, $f0, $f14 +/* 015A8 80B63F68 46045001 */ sub.s $f0, $f10, $f4 +/* 015AC 80B63F6C 46000005 */ abs.s $f0, $f0 +/* 015B0 80B63F70 460E0182 */ mul.s $f6, $f0, $f14 /* 015B4 80B63F74 00000000 */ nop -/* 015B8 80B63F78 46103082 */ mul.s $f2, $f6, $f16 -/* 015BC 80B63F7C 460C103C */ c.lt.s $f2, $f12 +/* 015B8 80B63F78 46103082 */ mul.s $f2, $f6, $f16 +/* 015BC 80B63F7C 460C103C */ c.lt.s $f2, $f12 /* 015C0 80B63F80 E602019C */ swc1 $f2, 0x019C($s0) ## 0000019C /* 015C4 80B63F84 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 015C8 80B63F88 45000002 */ bc1f .L80B63F94 +/* 015C8 80B63F88 45000002 */ bc1f .L80B63F94 /* 015CC 80B63F8C 00000000 */ nop /* 015D0 80B63F90 E60C019C */ swc1 $f12, 0x019C($s0) ## 0000019C .L80B63F94: -/* 015D4 80B63F94 C420543C */ lwc1 $f0, %lo(D_80B6543C)($at) -/* 015D8 80B63F98 8FA20034 */ lw $v0, 0x0034($sp) +/* 015D4 80B63F94 C420543C */ lwc1 $f0, %lo(D_80B6543C)($at) +/* 015D8 80B63F98 8FA20034 */ lw $v0, 0x0034($sp) /* 015DC 80B63F9C A60901D4 */ sh $t1, 0x01D4($s0) ## 000001D4 /* 015E0 80B63FA0 3C0180B6 */ lui $at, %hi(D_80B65440) ## $at = 80B60000 /* 015E4 80B63FA4 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 /* 015E8 80B63FA8 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 015EC 80B63FAC C4285440 */ lwc1 $f8, %lo(D_80B65440)($at) +/* 015EC 80B63FAC C4285440 */ lwc1 $f8, %lo(D_80B65440)($at) /* 015F0 80B63FB0 E60201A4 */ swc1 $f2, 0x01A4($s0) ## 000001A4 /* 015F4 80B63FB4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 015F8 80B63FB8 E6080058 */ swc1 $f8, 0x0058($s0) ## 00000058 /* 015FC 80B63FBC 904A07AF */ lbu $t2, 0x07AF($v0) ## 000007AF /* 01600 80B63FC0 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 01604 80B63FC4 05410004 */ bgez $t2, .L80B63FD8 -/* 01608 80B63FC8 46805120 */ cvt.s.w $f4, $f10 +/* 01604 80B63FC4 05410004 */ bgez $t2, .L80B63FD8 +/* 01608 80B63FC8 46805120 */ cvt.s.w $f4, $f10 /* 0160C 80B63FCC 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 01610 80B63FD0 00000000 */ nop -/* 01614 80B63FD4 46062100 */ add.s $f4, $f4, $f6 +/* 01614 80B63FD4 46062100 */ add.s $f4, $f4, $f6 .L80B63FD8: /* 01618 80B63FD8 E60401E8 */ swc1 $f4, 0x01E8($s0) ## 000001E8 /* 0161C 80B63FDC 904B07B0 */ lbu $t3, 0x07B0($v0) ## 000007B0 /* 01620 80B63FE0 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01624 80B63FE4 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 01628 80B63FE8 05610004 */ bgez $t3, .L80B63FFC -/* 0162C 80B63FEC 468042A0 */ cvt.s.w $f10, $f8 +/* 01628 80B63FE8 05610004 */ bgez $t3, .L80B63FFC +/* 0162C 80B63FEC 468042A0 */ cvt.s.w $f10, $f8 /* 01630 80B63FF0 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 01634 80B63FF4 00000000 */ nop -/* 01638 80B63FF8 46065280 */ add.s $f10, $f10, $f6 +/* 01638 80B63FF8 46065280 */ add.s $f10, $f10, $f6 .L80B63FFC: /* 0163C 80B63FFC E60A01EC */ swc1 $f10, 0x01EC($s0) ## 000001EC /* 01640 80B64000 904C07B1 */ lbu $t4, 0x07B1($v0) ## 000007B1 /* 01644 80B64004 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01648 80B64008 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 0164C 80B6400C 05810004 */ bgez $t4, .L80B64020 -/* 01650 80B64010 46802220 */ cvt.s.w $f8, $f4 +/* 0164C 80B6400C 05810004 */ bgez $t4, .L80B64020 +/* 01650 80B64010 46802220 */ cvt.s.w $f8, $f4 /* 01654 80B64014 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 01658 80B64018 00000000 */ nop -/* 0165C 80B6401C 46064200 */ add.s $f8, $f8, $f6 +/* 0165C 80B6401C 46064200 */ add.s $f8, $f8, $f6 .L80B64020: /* 01660 80B64020 E60801F0 */ swc1 $f8, 0x01F0($s0) ## 000001F0 /* 01664 80B64024 E60201F4 */ swc1 $f2, 0x01F4($s0) ## 000001F4 @@ -181,10 +181,10 @@ glabel func_80B63D84 /* 0166C 80B6402C A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 /* 01670 80B64030 A60001C6 */ sh $zero, 0x01C6($s0) ## 000001C6 /* 01674 80B64034 A60001C8 */ sh $zero, 0x01C8($s0) ## 000001C8 -/* 01678 80B64038 8FBF001C */ lw $ra, 0x001C($sp) -/* 0167C 80B6403C 8FB00018 */ lw $s0, 0x0018($sp) +/* 01678 80B64038 8FBF001C */ lw $ra, 0x001C($sp) +/* 0167C 80B6403C 8FB00018 */ lw $s0, 0x0018($sp) /* 01680 80B64040 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01684 80B64044 03E00008 */ jr $ra +/* 01684 80B64044 03E00008 */ jr $ra /* 01688 80B64048 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s index 0a56b7a03b..0997f1bdd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s @@ -1,64 +1,64 @@ glabel func_80B6404C /* 0168C 80B6404C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01690 80B64050 AFB00038 */ sw $s0, 0x0038($sp) +/* 01690 80B64050 AFB00038 */ sw $s0, 0x0038($sp) /* 01694 80B64054 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01698 80B64058 AFBF003C */ sw $ra, 0x003C($sp) +/* 01698 80B64058 AFBF003C */ sw $ra, 0x003C($sp) /* 0169C 80B6405C 3C0480B6 */ lui $a0, %hi(D_80B65294) ## $a0 = 80B60000 -/* 016A0 80B64060 AFA5004C */ sw $a1, 0x004C($sp) +/* 016A0 80B64060 AFA5004C */ sw $a1, 0x004C($sp) /* 016A4 80B64064 0C00084C */ jal osSyncPrintf - + /* 016A8 80B64068 24845294 */ addiu $a0, $a0, %lo(D_80B65294) ## $a0 = 80B65294 /* 016AC 80B6406C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 016B0 80B64070 3C0480B6 */ lui $a0, %hi(D_80B652A0) ## $a0 = 80B60000 /* 016B4 80B64074 248452A0 */ addiu $a0, $a0, %lo(D_80B652A0) ## $a0 = 80B652A0 -/* 016B8 80B64078 460021A1 */ cvt.d.s $f6, $f4 -/* 016BC 80B6407C 44073000 */ mfc1 $a3, $f6 -/* 016C0 80B64080 44063800 */ mfc1 $a2, $f7 +/* 016B8 80B64078 460021A1 */ cvt.d.s $f6, $f4 +/* 016BC 80B6407C 44073000 */ mfc1 $a3, $f6 +/* 016C0 80B64080 44063800 */ mfc1 $a2, $f7 /* 016C4 80B64084 0C00084C */ jal osSyncPrintf - + /* 016C8 80B64088 00000000 */ nop /* 016CC 80B6408C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 016D0 80B64090 3C0480B6 */ lui $a0, %hi(D_80B652AC) ## $a0 = 80B60000 /* 016D4 80B64094 248452AC */ addiu $a0, $a0, %lo(D_80B652AC) ## $a0 = 80B652AC -/* 016D8 80B64098 460042A1 */ cvt.d.s $f10, $f8 -/* 016DC 80B6409C 44075000 */ mfc1 $a3, $f10 -/* 016E0 80B640A0 44065800 */ mfc1 $a2, $f11 +/* 016D8 80B64098 460042A1 */ cvt.d.s $f10, $f8 +/* 016DC 80B6409C 44075000 */ mfc1 $a3, $f10 +/* 016E0 80B640A0 44065800 */ mfc1 $a2, $f11 /* 016E4 80B640A4 0C00084C */ jal osSyncPrintf - + /* 016E8 80B640A8 00000000 */ nop /* 016EC 80B640AC 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 016F0 80B640B0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 016F4 80B640B4 15C10013 */ bne $t6, $at, .L80B64104 +/* 016F4 80B640B4 15C10013 */ bne $t6, $at, .L80B64104 /* 016F8 80B640B8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 016FC 80B640BC 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 /* 01700 80B640C0 C6100050 */ lwc1 $f16, 0x0050($s0) ## 00000050 /* 01704 80B640C4 C60400E4 */ lwc1 $f4, 0x00E4($s0) ## 000000E4 /* 01708 80B640C8 C60800E8 */ lwc1 $f8, 0x00E8($s0) ## 000000E8 -/* 0170C 80B640CC 46128002 */ mul.s $f0, $f16, $f18 +/* 0170C 80B640CC 46128002 */ mul.s $f0, $f16, $f18 /* 01710 80B640D0 C61000EC */ lwc1 $f16, 0x00EC($s0) ## 000000EC /* 01714 80B640D4 860F01C0 */ lh $t7, 0x01C0($s0) ## 000001C0 /* 01718 80B640D8 26040180 */ addiu $a0, $s0, 0x0180 ## $a0 = 00000180 /* 0171C 80B640DC 31F80007 */ andi $t8, $t7, 0x0007 ## $t8 = 00000000 -/* 01720 80B640E0 46002183 */ div.s $f6, $f4, $f0 -/* 01724 80B640E4 46004283 */ div.s $f10, $f8, $f0 +/* 01720 80B640E0 46002183 */ div.s $f6, $f4, $f0 +/* 01724 80B640E4 46004283 */ div.s $f10, $f8, $f0 /* 01728 80B640E8 E6060180 */ swc1 $f6, 0x0180($s0) ## 00000180 -/* 0172C 80B640EC 46008483 */ div.s $f18, $f16, $f0 +/* 0172C 80B640EC 46008483 */ div.s $f18, $f16, $f0 /* 01730 80B640F0 E60A0184 */ swc1 $f10, 0x0184($s0) ## 00000184 -/* 01734 80B640F4 17000003 */ bne $t8, $zero, .L80B64104 +/* 01734 80B640F4 17000003 */ bne $t8, $zero, .L80B64104 /* 01738 80B640F8 E6120188 */ swc1 $f18, 0x0188($s0) ## 00000188 -/* 0173C 80B640FC 0C01E245 */ jal func_80078914 +/* 0173C 80B640FC 0C01E245 */ jal func_80078914 /* 01740 80B64100 24052804 */ addiu $a1, $zero, 0x2804 ## $a1 = 00002804 .L80B64104: /* 01744 80B64104 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 /* 01748 80B64108 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0174C 80B6410C AFA40044 */ sw $a0, 0x0044($sp) + +/* 0174C 80B6410C AFA40044 */ sw $a0, 0x0044($sp) /* 01750 80B64110 3C053C3C */ lui $a1, 0x3C3C ## $a1 = 3C3C0000 /* 01754 80B64114 34A56A7E */ ori $a1, $a1, 0x6A7E ## $a1 = 3C3C6A7E /* 01758 80B64118 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 /* 0175C 80B6411C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01760 80B64120 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01764 80B64124 8E0701A4 */ lw $a3, 0x01A4($s0) ## 000001A4 /* 01768 80B64128 3C053951 */ lui $a1, 0x3951 ## $a1 = 39510000 /* 0176C 80B6412C 3C0735C9 */ lui $a3, 0x35C9 ## $a3 = 35C90000 @@ -66,28 +66,28 @@ glabel func_80B6404C /* 01774 80B64134 34A5B717 */ ori $a1, $a1, 0xB717 ## $a1 = 3951B717 /* 01778 80B64138 260401A4 */ addiu $a0, $s0, 0x01A4 ## $a0 = 000001A4 /* 0177C 80B6413C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01780 80B64140 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01784 80B64144 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01788 80B64148 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0178C 80B6414C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 01790 80B64150 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 /* 01794 80B64154 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01798 80B64158 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 0179C 80B6415C 861901D4 */ lh $t9, 0x01D4($s0) ## 000001D4 /* 017A0 80B64160 C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 /* 017A4 80B64164 3C0480B6 */ lui $a0, %hi(D_80B652B8) ## $a0 = 80B60000 -/* 017A8 80B64168 17200033 */ bne $t9, $zero, .L80B64238 +/* 017A8 80B64168 17200033 */ bne $t9, $zero, .L80B64238 /* 017AC 80B6416C E6040054 */ swc1 $f4, 0x0054($s0) ## 00000054 /* 017B0 80B64170 248452B8 */ addiu $a0, $a0, %lo(D_80B652B8) ## $a0 = 80B652B8 /* 017B4 80B64174 0C00084C */ jal osSyncPrintf - + /* 017B8 80B64178 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 017BC 80B6417C 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 017C0 80B64180 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 017C4 80B64184 3C0C80B6 */ lui $t4, %hi(func_80B6424C) ## $t4 = 80B60000 -/* 017C8 80B64188 1101000E */ beq $t0, $at, .L80B641C4 +/* 017C8 80B64188 1101000E */ beq $t0, $at, .L80B641C4 /* 017CC 80B6418C 258C424C */ addiu $t4, $t4, %lo(func_80B6424C) ## $t4 = 80B6424C /* 017D0 80B64190 3C0A80B6 */ lui $t2, %hi(func_80B64AA8) ## $t2 = 80B60000 /* 017D4 80B64194 2409008C */ addiu $t1, $zero, 0x008C ## $t1 = 0000008C @@ -96,49 +96,49 @@ glabel func_80B6404C /* 017E0 80B641A0 AE0A01FC */ sw $t2, 0x01FC($s0) ## 000001FC /* 017E4 80B641A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 017E8 80B641A8 24A5B4C8 */ addiu $a1, $a1, 0xB4C8 ## $a1 = 0600B4C8 -/* 017EC 80B641AC 8FA40044 */ lw $a0, 0x0044($sp) -/* 017F0 80B641B0 0C0294D3 */ jal func_800A534C +/* 017EC 80B641AC 8FA40044 */ lw $a0, 0x0044($sp) +/* 017F0 80B641B0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 017F4 80B641B4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 017F8 80B641B8 240B8000 */ addiu $t3, $zero, 0x8000 ## $t3 = FFFF8000 -/* 017FC 80B641BC 1000001E */ beq $zero, $zero, .L80B64238 +/* 017FC 80B641BC 1000001E */ beq $zero, $zero, .L80B64238 /* 01800 80B641C0 A60B01C6 */ sh $t3, 0x01C6($s0) ## 000001C6 .L80B641C4: /* 01804 80B641C4 AE0C01FC */ sw $t4, 0x01FC($s0) ## 000001FC /* 01808 80B641C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0180C 80B641CC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01810 80B641D0 2405283D */ addiu $a1, $zero, 0x283D ## $a1 = 0000283D /* 01814 80B641D4 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 01818 80B641D8 8FA6004C */ lw $a2, 0x004C($sp) +/* 01818 80B641D8 8FA6004C */ lw $a2, 0x004C($sp) /* 0181C 80B641DC 240D0028 */ addiu $t5, $zero, 0x0028 ## $t5 = 00000028 /* 01820 80B641E0 A60D01D4 */ sh $t5, 0x01D4($s0) ## 000001D4 /* 01824 80B641E4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 01828 80B641E8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01828 80B641E8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0182C 80B641EC C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 01830 80B641F0 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 01834 80B641F4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 01838 80B641F8 24180027 */ addiu $t8, $zero, 0x0027 ## $t8 = 00000027 -/* 0183C 80B641FC 460A4400 */ add.s $f16, $f8, $f10 +/* 0183C 80B641FC 460A4400 */ add.s $f16, $f8, $f10 /* 01840 80B64200 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01844 80B64204 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 01848 80B64208 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 0184C 80B6420C E7B00014 */ swc1 $f16, 0x0014($sp) +/* 0184C 80B6420C E7B00014 */ swc1 $f16, 0x0014($sp) /* 01850 80B64210 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 01854 80B64214 AFA0001C */ sw $zero, 0x001C($sp) -/* 01858 80B64218 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 01854 80B64214 AFA0001C */ sw $zero, 0x001C($sp) +/* 01858 80B64218 E7B20018 */ swc1 $f18, 0x0018($sp) /* 0185C 80B6421C 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 01860 80B64220 AFB80028 */ sw $t8, 0x0028($sp) -/* 01864 80B64224 AFA00024 */ sw $zero, 0x0024($sp) -/* 01868 80B64228 01C17821 */ addu $t7, $t6, $at +/* 01860 80B64220 AFB80028 */ sw $t8, 0x0028($sp) +/* 01864 80B64224 AFA00024 */ sw $zero, 0x0024($sp) +/* 01868 80B64228 01C17821 */ addu $t7, $t6, $at /* 0186C 80B6422C 0C00C916 */ jal Actor_SpawnAttached - -/* 01870 80B64230 AFAF0020 */ sw $t7, 0x0020($sp) + +/* 01870 80B64230 AFAF0020 */ sw $t7, 0x0020($sp) /* 01874 80B64234 A200014F */ sb $zero, 0x014F($s0) ## 0000014F .L80B64238: -/* 01878 80B64238 8FBF003C */ lw $ra, 0x003C($sp) -/* 0187C 80B6423C 8FB00038 */ lw $s0, 0x0038($sp) +/* 01878 80B64238 8FBF003C */ lw $ra, 0x003C($sp) +/* 0187C 80B6423C 8FB00038 */ lw $s0, 0x0038($sp) /* 01880 80B64240 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 01884 80B64244 03E00008 */ jr $ra +/* 01884 80B64244 03E00008 */ jr $ra /* 01888 80B64248 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s index 6cfc08e309..023c87d9d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s @@ -1,188 +1,188 @@ glabel func_80B6424C /* 0188C 80B6424C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01890 80B64250 AFB00038 */ sw $s0, 0x0038($sp) +/* 01890 80B64250 AFB00038 */ sw $s0, 0x0038($sp) /* 01894 80B64254 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01898 80B64258 AFBF003C */ sw $ra, 0x003C($sp) +/* 01898 80B64258 AFBF003C */ sw $ra, 0x003C($sp) /* 0189C 80B6425C 3C0480B6 */ lui $a0, %hi(D_80B652EC) ## $a0 = 80B60000 -/* 018A0 80B64260 AFA5005C */ sw $a1, 0x005C($sp) +/* 018A0 80B64260 AFA5005C */ sw $a1, 0x005C($sp) /* 018A4 80B64264 0C00084C */ jal osSyncPrintf - + /* 018A8 80B64268 248452EC */ addiu $a0, $a0, %lo(D_80B652EC) ## $a0 = 80B652EC /* 018AC 80B6426C A200014D */ sb $zero, 0x014D($s0) ## 0000014D /* 018B0 80B64270 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 /* 018B4 80B64274 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 018B8 80B64278 AFA40044 */ sw $a0, 0x0044($sp) + +/* 018B8 80B64278 AFA40044 */ sw $a0, 0x0044($sp) /* 018BC 80B6427C 860E01D4 */ lh $t6, 0x01D4($s0) ## 000001D4 -/* 018C0 80B64280 8FA8005C */ lw $t0, 0x005C($sp) +/* 018C0 80B64280 8FA8005C */ lw $t0, 0x005C($sp) /* 018C4 80B64284 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 018C8 80B64288 11C00029 */ beq $t6, $zero, .L80B64330 +/* 018C8 80B64288 11C00029 */ beq $t6, $zero, .L80B64330 /* 018CC 80B6428C 3C053C3C */ lui $a1, 0x3C3C ## $a1 = 3C3C0000 /* 018D0 80B64290 3C073951 */ lui $a3, 0x3951 ## $a3 = 39510000 /* 018D4 80B64294 34E7B717 */ ori $a3, $a3, 0xB717 ## $a3 = 3951B717 /* 018D8 80B64298 34A56A7E */ ori $a1, $a1, 0x6A7E ## $a1 = 3C3C6A7E /* 018DC 80B6429C 26040058 */ addiu $a0, $s0, 0x0058 ## $a0 = 00000058 /* 018E0 80B642A0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 018E4 80B642A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 018E8 80B642A8 860F01D4 */ lh $t7, 0x01D4($s0) ## 000001D4 /* 018EC 80B642AC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 018F0 80B642B0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 018F4 80B642B4 15E10008 */ bne $t7, $at, .L80B642D8 +/* 018F4 80B642B4 15E10008 */ bne $t7, $at, .L80B642D8 /* 018F8 80B642B8 24190032 */ addiu $t9, $zero, 0x0032 ## $t9 = 00000032 /* 018FC 80B642BC A218014C */ sb $t8, 0x014C($s0) ## 0000014C /* 01900 80B642C0 A61901D6 */ sh $t9, 0x01D6($s0) ## 000001D6 /* 01904 80B642C4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01908 80B642C8 24A5C65C */ addiu $a1, $a1, 0xC65C ## $a1 = 0600C65C -/* 0190C 80B642CC 8FA40044 */ lw $a0, 0x0044($sp) -/* 01910 80B642D0 0C029490 */ jal func_800A5240 +/* 0190C 80B642CC 8FA40044 */ lw $a0, 0x0044($sp) +/* 01910 80B642D0 0C029490 */ jal func_800A5240 /* 01914 80B642D4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L80B642D8: /* 01918 80B642D8 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 /* 0191C 80B642DC 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01920 80B642E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01924 80B642E4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01928 80B642E8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 0192C 80B642EC 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC /* 01930 80B642F0 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01934 80B642F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01938 80B642F8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0193C 80B642FC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01940 80B64300 260401F0 */ addiu $a0, $s0, 0x01F0 ## $a0 = 000001F0 /* 01944 80B64304 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01948 80B64308 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0194C 80B6430C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01950 80B64310 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01954 80B64314 260401F4 */ addiu $a0, $s0, 0x01F4 ## $a0 = 000001F4 /* 01958 80B64318 3C05C270 */ lui $a1, 0xC270 ## $a1 = C2700000 /* 0195C 80B6431C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01960 80B64320 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01964 80B64324 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 01968 80B64328 10000084 */ beq $zero, $zero, .L80B6453C +/* 01968 80B64328 10000084 */ beq $zero, $zero, .L80B6453C /* 0196C 80B6432C 860A01DE */ lh $t2, 0x01DE($s0) ## 000001DE .L80B64330: /* 01970 80B64330 910907AF */ lbu $t1, 0x07AF($t0) ## 000007AF /* 01974 80B64334 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 /* 01978 80B64338 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 0197C 80B6433C 05210005 */ bgez $t1, .L80B64354 -/* 01980 80B64340 46802120 */ cvt.s.w $f4, $f4 +/* 0197C 80B6433C 05210005 */ bgez $t1, .L80B64354 +/* 01980 80B64340 46802120 */ cvt.s.w $f4, $f4 /* 01984 80B64344 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01988 80B64348 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 0198C 80B6434C 00000000 */ nop -/* 01990 80B64350 46062100 */ add.s $f4, $f4, $f6 +/* 01990 80B64350 46062100 */ add.s $f4, $f4, $f6 .L80B64354: -/* 01994 80B64354 44052000 */ mfc1 $a1, $f4 +/* 01994 80B64354 44052000 */ mfc1 $a1, $f4 /* 01998 80B64358 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0199C 80B6435C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 019A0 80B64360 8FAA005C */ lw $t2, 0x005C($sp) +/* 019A0 80B64360 8FAA005C */ lw $t2, 0x005C($sp) /* 019A4 80B64364 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC /* 019A8 80B64368 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 019AC 80B6436C 914B07AF */ lbu $t3, 0x07AF($t2) ## 000007AF /* 019B0 80B64370 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 019B4 80B64374 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 019B8 80B64378 05610004 */ bgez $t3, .L80B6438C -/* 019BC 80B6437C 46804220 */ cvt.s.w $f8, $f8 +/* 019B8 80B64378 05610004 */ bgez $t3, .L80B6438C +/* 019BC 80B6437C 46804220 */ cvt.s.w $f8, $f8 /* 019C0 80B64380 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 /* 019C4 80B64384 00000000 */ nop -/* 019C8 80B64388 460A4200 */ add.s $f8, $f8, $f10 +/* 019C8 80B64388 460A4200 */ add.s $f8, $f8, $f10 .L80B6438C: -/* 019CC 80B6438C 44054000 */ mfc1 $a1, $f8 +/* 019CC 80B6438C 44054000 */ mfc1 $a1, $f8 /* 019D0 80B64390 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 019D4 80B64394 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 019D8 80B64398 8FAC005C */ lw $t4, 0x005C($sp) +/* 019D8 80B64398 8FAC005C */ lw $t4, 0x005C($sp) /* 019DC 80B6439C 260401F0 */ addiu $a0, $s0, 0x01F0 ## $a0 = 000001F0 /* 019E0 80B643A0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 019E4 80B643A4 918D07AF */ lbu $t5, 0x07AF($t4) ## 000007AF /* 019E8 80B643A8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 019EC 80B643AC 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 -/* 019F0 80B643B0 05A10004 */ bgez $t5, .L80B643C4 -/* 019F4 80B643B4 46808420 */ cvt.s.w $f16, $f16 +/* 019F0 80B643B0 05A10004 */ bgez $t5, .L80B643C4 +/* 019F4 80B643B4 46808420 */ cvt.s.w $f16, $f16 /* 019F8 80B643B8 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00 /* 019FC 80B643BC 00000000 */ nop -/* 01A00 80B643C0 46128400 */ add.s $f16, $f16, $f18 +/* 01A00 80B643C0 46128400 */ add.s $f16, $f16, $f18 .L80B643C4: -/* 01A04 80B643C4 44058000 */ mfc1 $a1, $f16 +/* 01A04 80B643C4 44058000 */ mfc1 $a1, $f16 /* 01A08 80B643C8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01A0C 80B643CC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01A10 80B643D0 260401F4 */ addiu $a0, $s0, 0x01F4 ## $a0 = 000001F4 /* 01A14 80B643D4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01A18 80B643D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01A1C 80B643DC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01A20 80B643E0 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 01A24 80B643E4 860E01D6 */ lh $t6, 0x01D6($s0) ## 000001D6 /* 01A28 80B643E8 2401001D */ addiu $at, $zero, 0x001D ## $at = 0000001D /* 01A2C 80B643EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A30 80B643F0 55C10007 */ bnel $t6, $at, .L80B64410 +/* 01A30 80B643F0 55C10007 */ bnel $t6, $at, .L80B64410 /* 01A34 80B643F4 860F01DE */ lh $t7, 0x01DE($s0) ## 000001DE /* 01A38 80B643F8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01A3C 80B643FC 240538A6 */ addiu $a1, $zero, 0x38A6 ## $a1 = 000038A6 /* 01A40 80B64400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01A44 80B64404 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01A48 80B64408 240538B2 */ addiu $a1, $zero, 0x38B2 ## $a1 = 000038B2 /* 01A4C 80B6440C 860F01DE */ lh $t7, 0x01DE($s0) ## 000001DE .L80B64410: -/* 01A50 80B64410 55E00033 */ bnel $t7, $zero, .L80B644E0 +/* 01A50 80B64410 55E00033 */ bnel $t7, $zero, .L80B644E0 /* 01A54 80B64414 3C053C3C */ lui $a1, 0x3C3C ## $a1 = 3C3C0000 /* 01A58 80B64418 860301D6 */ lh $v1, 0x01D6($s0) ## 000001D6 /* 01A5C 80B6441C 24010018 */ addiu $at, $zero, 0x0018 ## $at = 00000018 -/* 01A60 80B64420 54610019 */ bnel $v1, $at, .L80B64488 +/* 01A60 80B64420 54610019 */ bnel $v1, $at, .L80B64488 /* 01A64 80B64424 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D /* 01A68 80B64428 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 01A6C 80B6442C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 01A70 80B64430 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 01A74 80B64434 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01A74 80B64434 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01A78 80B64438 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01A7C 80B6443C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 01A80 80B64440 44818000 */ mtc1 $at, $f16 ## $f16 = 25.00 -/* 01A84 80B64444 46083280 */ add.s $f10, $f6, $f8 -/* 01A88 80B64448 8FA6005C */ lw $a2, 0x005C($sp) +/* 01A84 80B64444 46083280 */ add.s $f10, $f6, $f8 +/* 01A88 80B64448 8FA6005C */ lw $a2, 0x005C($sp) /* 01A8C 80B6444C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 01A90 80B64450 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01A94 80B64454 46105480 */ add.s $f18, $f10, $f16 +/* 01A94 80B64454 46105480 */ add.s $f18, $f10, $f16 /* 01A98 80B64458 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 01A9C 80B6445C 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 01AA0 80B64460 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 01AA0 80B64460 E7B20014 */ swc1 $f18, 0x0014($sp) /* 01AA4 80B64464 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 01AA8 80B64468 AFB90028 */ sw $t9, 0x0028($sp) -/* 01AAC 80B6446C AFA00024 */ sw $zero, 0x0024($sp) -/* 01AB0 80B64470 AFA00020 */ sw $zero, 0x0020($sp) -/* 01AB4 80B64474 AFA0001C */ sw $zero, 0x001C($sp) +/* 01AA8 80B64468 AFB90028 */ sw $t9, 0x0028($sp) +/* 01AAC 80B6446C AFA00024 */ sw $zero, 0x0024($sp) +/* 01AB0 80B64470 AFA00020 */ sw $zero, 0x0020($sp) +/* 01AB4 80B64474 AFA0001C */ sw $zero, 0x001C($sp) /* 01AB8 80B64478 0C00C916 */ jal Actor_SpawnAttached - -/* 01ABC 80B6447C E7A40018 */ swc1 $f4, 0x0018($sp) + +/* 01ABC 80B6447C E7A40018 */ swc1 $f4, 0x0018($sp) /* 01AC0 80B64480 860301D6 */ lh $v1, 0x01D6($s0) ## 000001D6 /* 01AC4 80B64484 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D .L80B64488: -/* 01AC8 80B64488 14610006 */ bne $v1, $at, .L80B644A4 -/* 01ACC 80B6448C 8FA40044 */ lw $a0, 0x0044($sp) +/* 01AC8 80B64488 14610006 */ bne $v1, $at, .L80B644A4 +/* 01ACC 80B6448C 8FA40044 */ lw $a0, 0x0044($sp) /* 01AD0 80B64490 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01AD4 80B64494 24A5B9D0 */ addiu $a1, $a1, 0xB9D0 ## $a1 = 0600B9D0 -/* 01AD8 80B64498 0C0294D3 */ jal func_800A534C +/* 01AD8 80B64498 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01ADC 80B6449C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01AE0 80B644A0 860301D6 */ lh $v1, 0x01D6($s0) ## 000001D6 .L80B644A4: /* 01AE4 80B644A4 24010026 */ addiu $at, $zero, 0x0026 ## $at = 00000026 -/* 01AE8 80B644A8 14610003 */ bne $v1, $at, .L80B644B8 +/* 01AE8 80B644A8 14610003 */ bne $v1, $at, .L80B644B8 /* 01AEC 80B644AC 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 01AF0 80B644B0 A208014C */ sb $t0, 0x014C($s0) ## 0000014C /* 01AF4 80B644B4 860301D6 */ lh $v1, 0x01D6($s0) ## 000001D6 .L80B644B8: /* 01AF8 80B644B8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01AFC 80B644BC 14610007 */ bne $v1, $at, .L80B644DC -/* 01B00 80B644C0 8FA40044 */ lw $a0, 0x0044($sp) +/* 01AFC 80B644BC 14610007 */ bne $v1, $at, .L80B644DC +/* 01B00 80B644C0 8FA40044 */ lw $a0, 0x0044($sp) /* 01B04 80B644C4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01B08 80B644C8 24A5CB1C */ addiu $a1, $a1, 0xCB1C ## $a1 = 0600CB1C -/* 01B0C 80B644CC 0C029490 */ jal func_800A5240 +/* 01B0C 80B644CC 0C029490 */ jal func_800A5240 /* 01B10 80B644D0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01B14 80B644D4 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 01B18 80B644D8 A209014C */ sb $t1, 0x014C($s0) ## 0000014C @@ -194,117 +194,117 @@ glabel func_80B6424C /* 01B28 80B644E8 34A56A7E */ ori $a1, $a1, 0x6A7E ## $a1 = 3C3C6A7E /* 01B2C 80B644EC 26040058 */ addiu $a0, $s0, 0x0058 ## $a0 = 00000058 /* 01B30 80B644F0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B34 80B644F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01B38 80B644F8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 01B3C 80B644FC 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C /* 01B40 80B64500 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01B44 80B64504 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B48 80B64508 8E070198 */ lw $a3, 0x0198($s0) ## 00000198 /* 01B4C 80B6450C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01B50 80B64510 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01B54 80B64514 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 01B58 80B64518 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 /* 01B5C 80B6451C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B60 80B64520 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 01B64 80B64524 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 01B68 80B64528 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 /* 01B6C 80B6452C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01B70 80B64530 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B74 80B64534 8E07019C */ lw $a3, 0x019C($s0) ## 0000019C /* 01B78 80B64538 860A01DE */ lh $t2, 0x01DE($s0) ## 000001DE .L80B6453C: /* 01B7C 80B6453C 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 01B80 80B64540 3C0B80B6 */ lui $t3, %hi(func_80B6476C) ## $t3 = 80B60000 -/* 01B84 80B64544 1541001C */ bne $t2, $at, .L80B645B8 +/* 01B84 80B64544 1541001C */ bne $t2, $at, .L80B645B8 /* 01B88 80B64548 256B476C */ addiu $t3, $t3, %lo(func_80B6476C) ## $t3 = 80B6476C /* 01B8C 80B6454C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01B90 80B64550 AE0B01FC */ sw $t3, 0x01FC($s0) ## 000001FC /* 01B94 80B64554 A60001C8 */ sh $zero, 0x01C8($s0) ## 000001C8 /* 01B98 80B64558 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01B9C 80B6455C 2484CB1C */ addiu $a0, $a0, 0xCB1C ## $a0 = 0600CB1C /* 01BA0 80B64560 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 01BA4 80B64564 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01BA8 80B64568 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 -/* 01BAC 80B6456C 46803220 */ cvt.s.w $f8, $f6 +/* 01BAC 80B6456C 46803220 */ cvt.s.w $f8, $f6 /* 01BB0 80B64570 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01BB4 80B64574 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 01BB8 80B64578 AFAC0014 */ sw $t4, 0x0014($sp) +/* 01BB8 80B64578 AFAC0014 */ sw $t4, 0x0014($sp) /* 01BBC 80B6457C 24A5CB1C */ addiu $a1, $a1, 0xCB1C ## $a1 = 0600CB1C -/* 01BC0 80B64580 8FA40044 */ lw $a0, 0x0044($sp) -/* 01BC4 80B64584 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01BC0 80B64580 8FA40044 */ lw $a0, 0x0044($sp) +/* 01BC4 80B64584 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01BC8 80B64588 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 01BCC 80B6458C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01BD0 80B64590 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01BD4 80B64594 E7AA0018 */ swc1 $f10, 0x0018($sp) + +/* 01BD4 80B64594 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 01BD8 80B64598 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01BDC 80B6459C 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 /* 01BE0 80B645A0 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A /* 01BE4 80B645A4 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 01BE8 80B645A8 A60D01D4 */ sh $t5, 0x01D4($s0) ## 000001D4 /* 01BEC 80B645AC A20E014C */ sb $t6, 0x014C($s0) ## 0000014C -/* 01BF0 80B645B0 10000069 */ beq $zero, $zero, .L80B64758 +/* 01BF0 80B645B0 10000069 */ beq $zero, $zero, .L80B64758 /* 01BF4 80B645B4 E61001A0 */ swc1 $f16, 0x01A0($s0) ## 000001A0 .L80B645B8: /* 01BF8 80B645B8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 01BFC 80B645BC C6080194 */ lwc1 $f8, 0x0194($s0) ## 00000194 /* 01C00 80B645C0 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 /* 01C04 80B645C4 C604018C */ lwc1 $f4, 0x018C($s0) ## 0000018C -/* 01C08 80B645C8 46083281 */ sub.s $f10, $f6, $f8 +/* 01C08 80B645C8 46083281 */ sub.s $f10, $f6, $f8 /* 01C0C 80B645CC 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 01C10 80B645D0 44813000 */ mtc1 $at, $f6 ## $f6 = 350.00 -/* 01C14 80B645D4 46049081 */ sub.s $f2, $f18, $f4 -/* 01C18 80B645D8 E7AA0050 */ swc1 $f10, 0x0050($sp) -/* 01C1C 80B645DC C7B00050 */ lwc1 $f16, 0x0050($sp) +/* 01C14 80B645D4 46049081 */ sub.s $f2, $f18, $f4 +/* 01C18 80B645D8 E7AA0050 */ swc1 $f10, 0x0050($sp) +/* 01C1C 80B645DC C7B00050 */ lwc1 $f16, 0x0050($sp) /* 01C20 80B645E0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 01C24 80B645E4 44814000 */ mtc1 $at, $f8 ## $f8 = 300.00 -/* 01C28 80B645E8 46108482 */ mul.s $f18, $f16, $f16 +/* 01C28 80B645E8 46108482 */ mul.s $f18, $f16, $f16 /* 01C2C 80B645EC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01C30 80B645F0 46021102 */ mul.s $f4, $f2, $f2 -/* 01C34 80B645F4 46122000 */ add.s $f0, $f4, $f18 -/* 01C38 80B645F8 46000004 */ sqrt.s $f0, $f0 -/* 01C3C 80B645FC 4606003C */ c.lt.s $f0, $f6 -/* 01C40 80B64600 E7A0004C */ swc1 $f0, 0x004C($sp) -/* 01C44 80B64604 45020003 */ bc1fl .L80B64614 -/* 01C48 80B64608 4608003C */ c.lt.s $f0, $f8 +/* 01C30 80B645F0 46021102 */ mul.s $f4, $f2, $f2 +/* 01C34 80B645F4 46122000 */ add.s $f0, $f4, $f18 +/* 01C38 80B645F8 46000004 */ sqrt.s $f0, $f0 +/* 01C3C 80B645FC 4606003C */ c.lt.s $f0, $f6 +/* 01C40 80B64600 E7A0004C */ swc1 $f0, 0x004C($sp) +/* 01C44 80B64604 45020003 */ bc1fl .L80B64614 +/* 01C48 80B64608 4608003C */ c.lt.s $f0, $f8 /* 01C4C 80B6460C A20F014D */ sb $t7, 0x014D($s0) ## 0000014D -/* 01C50 80B64610 4608003C */ c.lt.s $f0, $f8 +/* 01C50 80B64610 4608003C */ c.lt.s $f0, $f8 .L80B64614: /* 01C54 80B64614 00000000 */ nop -/* 01C58 80B64618 4502001E */ bc1fl .L80B64694 +/* 01C58 80B64618 4502001E */ bc1fl .L80B64694 /* 01C5C 80B6461C C6080198 */ lwc1 $f8, 0x0198($s0) ## 00000198 /* 01C60 80B64620 861801C8 */ lh $t8, 0x01C8($s0) ## 000001C8 -/* 01C64 80B64624 8FA6005C */ lw $a2, 0x005C($sp) +/* 01C64 80B64624 8FA6005C */ lw $a2, 0x005C($sp) /* 01C68 80B64628 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01C6C 80B6462C 17000018 */ bne $t8, $zero, .L80B64690 +/* 01C6C 80B6462C 17000018 */ bne $t8, $zero, .L80B64690 /* 01C70 80B64630 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 01C74 80B64634 C60A018C */ lwc1 $f10, 0x018C($s0) ## 0000018C /* 01C78 80B64638 A61901C8 */ sh $t9, 0x01C8($s0) ## 000001C8 /* 01C7C 80B6463C 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 01C80 80B64640 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01C80 80B64640 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 01C84 80B64644 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 01C88 80B64648 24090028 */ addiu $t1, $zero, 0x0028 ## $t1 = 00000028 /* 01C8C 80B6464C 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 01C90 80B64650 46048480 */ add.s $f18, $f16, $f4 +/* 01C90 80B64650 46048480 */ add.s $f18, $f16, $f4 /* 01C94 80B64654 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01C98 80B64658 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D -/* 01C9C 80B6465C E7B20014 */ swc1 $f18, 0x0014($sp) +/* 01C9C 80B6465C E7B20014 */ swc1 $f18, 0x0014($sp) /* 01CA0 80B64660 C6060194 */ lwc1 $f6, 0x0194($s0) ## 00000194 -/* 01CA4 80B64664 AFA0001C */ sw $zero, 0x001C($sp) -/* 01CA8 80B64668 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 01CA4 80B64664 AFA0001C */ sw $zero, 0x001C($sp) +/* 01CA8 80B64668 E7A60018 */ swc1 $f6, 0x0018($sp) /* 01CAC 80B6466C 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 01CB0 80B64670 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 01CB4 80B64674 AFA90028 */ sw $t1, 0x0028($sp) -/* 01CB8 80B64678 AFA00024 */ sw $zero, 0x0024($sp) +/* 01CB0 80B64670 E7A20054 */ swc1 $f2, 0x0054($sp) +/* 01CB4 80B64674 AFA90028 */ sw $t1, 0x0028($sp) +/* 01CB8 80B64678 AFA00024 */ sw $zero, 0x0024($sp) /* 01CBC 80B6467C 0C00C916 */ jal Actor_SpawnAttached - -/* 01CC0 80B64680 AFA80020 */ sw $t0, 0x0020($sp) -/* 01CC4 80B64684 C7A20054 */ lwc1 $f2, 0x0054($sp) + +/* 01CC0 80B64680 AFA80020 */ sw $t0, 0x0020($sp) +/* 01CC4 80B64684 C7A20054 */ lwc1 $f2, 0x0054($sp) /* 01CC8 80B64688 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 01CCC 80B6468C A20A014F */ sb $t2, 0x014F($s0) ## 0000014F .L80B64690: @@ -312,63 +312,63 @@ glabel func_80B6424C .L80B64694: /* 01CD4 80B64694 3C0480B6 */ lui $a0, %hi(D_80B652FC) ## $a0 = 80B60000 /* 01CD8 80B64698 248452FC */ addiu $a0, $a0, %lo(D_80B652FC) ## $a0 = 80B652FC -/* 01CDC 80B6469C 460042A1 */ cvt.d.s $f10, $f8 -/* 01CE0 80B646A0 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 01CE4 80B646A4 44075000 */ mfc1 $a3, $f10 -/* 01CE8 80B646A8 44065800 */ mfc1 $a2, $f11 +/* 01CDC 80B6469C 460042A1 */ cvt.d.s $f10, $f8 +/* 01CE0 80B646A0 E7A20054 */ swc1 $f2, 0x0054($sp) +/* 01CE4 80B646A4 44075000 */ mfc1 $a3, $f10 +/* 01CE8 80B646A8 44065800 */ mfc1 $a2, $f11 /* 01CEC 80B646AC 0C00084C */ jal osSyncPrintf - + /* 01CF0 80B646B0 00000000 */ nop /* 01CF4 80B646B4 C610019C */ lwc1 $f16, 0x019C($s0) ## 0000019C /* 01CF8 80B646B8 3C0480B6 */ lui $a0, %hi(D_80B65308) ## $a0 = 80B60000 /* 01CFC 80B646BC 24845308 */ addiu $a0, $a0, %lo(D_80B65308) ## $a0 = 80B65308 -/* 01D00 80B646C0 46008121 */ cvt.d.s $f4, $f16 -/* 01D04 80B646C4 44072000 */ mfc1 $a3, $f4 -/* 01D08 80B646C8 44062800 */ mfc1 $a2, $f5 +/* 01D00 80B646C0 46008121 */ cvt.d.s $f4, $f16 +/* 01D04 80B646C4 44072000 */ mfc1 $a3, $f4 +/* 01D08 80B646C8 44062800 */ mfc1 $a2, $f5 /* 01D0C 80B646CC 0C00084C */ jal osSyncPrintf - + /* 01D10 80B646D0 00000000 */ nop -/* 01D14 80B646D4 C7A20054 */ lwc1 $f2, 0x0054($sp) +/* 01D14 80B646D4 C7A20054 */ lwc1 $f2, 0x0054($sp) /* 01D18 80B646D8 3C0480B6 */ lui $a0, %hi(D_80B65314) ## $a0 = 80B60000 /* 01D1C 80B646DC 24845314 */ addiu $a0, $a0, %lo(D_80B65314) ## $a0 = 80B65314 -/* 01D20 80B646E0 460014A1 */ cvt.d.s $f18, $f2 -/* 01D24 80B646E4 44079000 */ mfc1 $a3, $f18 -/* 01D28 80B646E8 44069800 */ mfc1 $a2, $f19 +/* 01D20 80B646E0 460014A1 */ cvt.d.s $f18, $f2 +/* 01D24 80B646E4 44079000 */ mfc1 $a3, $f18 +/* 01D28 80B646E8 44069800 */ mfc1 $a2, $f19 /* 01D2C 80B646EC 0C00084C */ jal osSyncPrintf - + /* 01D30 80B646F0 00000000 */ nop -/* 01D34 80B646F4 C7A60050 */ lwc1 $f6, 0x0050($sp) +/* 01D34 80B646F4 C7A60050 */ lwc1 $f6, 0x0050($sp) /* 01D38 80B646F8 3C0480B6 */ lui $a0, %hi(D_80B6531C) ## $a0 = 80B60000 /* 01D3C 80B646FC 2484531C */ addiu $a0, $a0, %lo(D_80B6531C) ## $a0 = 80B6531C -/* 01D40 80B64700 46003221 */ cvt.d.s $f8, $f6 -/* 01D44 80B64704 44074000 */ mfc1 $a3, $f8 -/* 01D48 80B64708 44064800 */ mfc1 $a2, $f9 +/* 01D40 80B64700 46003221 */ cvt.d.s $f8, $f6 +/* 01D44 80B64704 44074000 */ mfc1 $a3, $f8 +/* 01D48 80B64708 44064800 */ mfc1 $a2, $f9 /* 01D4C 80B6470C 0C00084C */ jal osSyncPrintf - + /* 01D50 80B64710 00000000 */ nop /* 01D54 80B64714 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01D58 80B64718 C7AA004C */ lwc1 $f10, 0x004C($sp) +/* 01D58 80B64718 C7AA004C */ lwc1 $f10, 0x004C($sp) /* 01D5C 80B6471C 3C0C80B6 */ lui $t4, %hi(func_80B64AA8) ## $t4 = 80B60000 /* 01D60 80B64720 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01D64 80B64724 46005032 */ c.eq.s $f10, $f0 +/* 01D64 80B64724 46005032 */ c.eq.s $f10, $f0 /* 01D68 80B64728 240B008C */ addiu $t3, $zero, 0x008C ## $t3 = 0000008C /* 01D6C 80B6472C 258C4AA8 */ addiu $t4, $t4, %lo(func_80B64AA8) ## $t4 = 80B64AA8 /* 01D70 80B64730 24A5B4C8 */ addiu $a1, $a1, 0xB4C8 ## $a1 = 0600B4C8 -/* 01D74 80B64734 45020009 */ bc1fl .L80B6475C -/* 01D78 80B64738 8FBF003C */ lw $ra, 0x003C($sp) +/* 01D74 80B64734 45020009 */ bc1fl .L80B6475C +/* 01D78 80B64738 8FBF003C */ lw $ra, 0x003C($sp) /* 01D7C 80B6473C A60B01D4 */ sh $t3, 0x01D4($s0) ## 000001D4 /* 01D80 80B64740 AE0C01FC */ sw $t4, 0x01FC($s0) ## 000001FC -/* 01D84 80B64744 44060000 */ mfc1 $a2, $f0 -/* 01D88 80B64748 0C0294D3 */ jal func_800A534C -/* 01D8C 80B6474C 8FA40044 */ lw $a0, 0x0044($sp) +/* 01D84 80B64744 44060000 */ mfc1 $a2, $f0 +/* 01D88 80B64748 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01D8C 80B6474C 8FA40044 */ lw $a0, 0x0044($sp) /* 01D90 80B64750 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 /* 01D94 80B64754 A20D014C */ sb $t5, 0x014C($s0) ## 0000014C .L80B64758: -/* 01D98 80B64758 8FBF003C */ lw $ra, 0x003C($sp) +/* 01D98 80B64758 8FBF003C */ lw $ra, 0x003C($sp) .L80B6475C: -/* 01D9C 80B6475C 8FB00038 */ lw $s0, 0x0038($sp) +/* 01D9C 80B6475C 8FB00038 */ lw $s0, 0x0038($sp) /* 01DA0 80B64760 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01DA4 80B64764 03E00008 */ jr $ra +/* 01DA4 80B64764 03E00008 */ jr $ra /* 01DA8 80B64768 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s index 122ed688b1..b90b47e405 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s @@ -1,232 +1,232 @@ glabel func_80B6476C /* 01DAC 80B6476C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 01DB0 80B64770 AFB00040 */ sw $s0, 0x0040($sp) +/* 01DB0 80B64770 AFB00040 */ sw $s0, 0x0040($sp) /* 01DB4 80B64774 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01DB8 80B64778 AFBF0044 */ sw $ra, 0x0044($sp) +/* 01DB8 80B64778 AFBF0044 */ sw $ra, 0x0044($sp) /* 01DBC 80B6477C 3C0480B6 */ lui $a0, %hi(D_80B65324) ## $a0 = 80B60000 -/* 01DC0 80B64780 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 01DC4 80B64784 AFA50064 */ sw $a1, 0x0064($sp) +/* 01DC0 80B64780 F7B40038 */ sdc1 $f20, 0x0038($sp) +/* 01DC4 80B64784 AFA50064 */ sw $a1, 0x0064($sp) /* 01DC8 80B64788 0C00084C */ jal osSyncPrintf - + /* 01DCC 80B6478C 24845324 */ addiu $a0, $a0, %lo(D_80B65324) ## $a0 = 80B65324 /* 01DD0 80B64790 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 /* 01DD4 80B64794 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01DD8 80B64798 AFA4004C */ sw $a0, 0x004C($sp) -/* 01DDC 80B6479C 8FAE0064 */ lw $t6, 0x0064($sp) + +/* 01DD8 80B64798 AFA4004C */ sw $a0, 0x004C($sp) +/* 01DDC 80B6479C 8FAE0064 */ lw $t6, 0x0064($sp) /* 01DE0 80B647A0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01DE4 80B647A4 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 /* 01DE8 80B647A8 91CF07AF */ lbu $t7, 0x07AF($t6) ## 000007AF /* 01DEC 80B647AC 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 -/* 01DF0 80B647B0 4406A000 */ mfc1 $a2, $f20 +/* 01DF0 80B647B0 4406A000 */ mfc1 $a2, $f20 /* 01DF4 80B647B4 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 01DF8 80B647B8 05E10005 */ bgez $t7, .L80B647D0 -/* 01DFC 80B647BC 46802120 */ cvt.s.w $f4, $f4 +/* 01DF8 80B647B8 05E10005 */ bgez $t7, .L80B647D0 +/* 01DFC 80B647BC 46802120 */ cvt.s.w $f4, $f4 /* 01E00 80B647C0 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01E04 80B647C4 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 01E08 80B647C8 00000000 */ nop -/* 01E0C 80B647CC 46062100 */ add.s $f4, $f4, $f6 +/* 01E0C 80B647CC 46062100 */ add.s $f4, $f4, $f6 .L80B647D0: -/* 01E10 80B647D0 44052000 */ mfc1 $a1, $f4 +/* 01E10 80B647D0 44052000 */ mfc1 $a1, $f4 /* 01E14 80B647D4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01E18 80B647D8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01E1C 80B647DC 8FB80064 */ lw $t8, 0x0064($sp) -/* 01E20 80B647E0 4406A000 */ mfc1 $a2, $f20 +/* 01E1C 80B647DC 8FB80064 */ lw $t8, 0x0064($sp) +/* 01E20 80B647E0 4406A000 */ mfc1 $a2, $f20 /* 01E24 80B647E4 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC /* 01E28 80B647E8 931907AF */ lbu $t9, 0x07AF($t8) ## 000007AF /* 01E2C 80B647EC 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 01E30 80B647F0 07210005 */ bgez $t9, .L80B64808 -/* 01E34 80B647F4 46804220 */ cvt.s.w $f8, $f8 +/* 01E30 80B647F0 07210005 */ bgez $t9, .L80B64808 +/* 01E34 80B647F4 46804220 */ cvt.s.w $f8, $f8 /* 01E38 80B647F8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01E3C 80B647FC 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 /* 01E40 80B64800 00000000 */ nop -/* 01E44 80B64804 460A4200 */ add.s $f8, $f8, $f10 +/* 01E44 80B64804 460A4200 */ add.s $f8, $f8, $f10 .L80B64808: -/* 01E48 80B64808 44054000 */ mfc1 $a1, $f8 +/* 01E48 80B64808 44054000 */ mfc1 $a1, $f8 /* 01E4C 80B6480C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01E50 80B64810 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01E54 80B64814 8FA80064 */ lw $t0, 0x0064($sp) -/* 01E58 80B64818 4406A000 */ mfc1 $a2, $f20 +/* 01E54 80B64814 8FA80064 */ lw $t0, 0x0064($sp) +/* 01E58 80B64818 4406A000 */ mfc1 $a2, $f20 /* 01E5C 80B6481C 260401F0 */ addiu $a0, $s0, 0x01F0 ## $a0 = 000001F0 /* 01E60 80B64820 910907AF */ lbu $t1, 0x07AF($t0) ## 000007AF /* 01E64 80B64824 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01E68 80B64828 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 01E6C 80B6482C 05210004 */ bgez $t1, .L80B64840 -/* 01E70 80B64830 468094A0 */ cvt.s.w $f18, $f18 +/* 01E6C 80B6482C 05210004 */ bgez $t1, .L80B64840 +/* 01E70 80B64830 468094A0 */ cvt.s.w $f18, $f18 /* 01E74 80B64834 44812000 */ mtc1 $at, $f4 ## $f4 = 4294967296.00 /* 01E78 80B64838 00000000 */ nop -/* 01E7C 80B6483C 46049480 */ add.s $f18, $f18, $f4 +/* 01E7C 80B6483C 46049480 */ add.s $f18, $f18, $f4 .L80B64840: -/* 01E80 80B64840 44059000 */ mfc1 $a1, $f18 +/* 01E80 80B64840 44059000 */ mfc1 $a1, $f18 /* 01E84 80B64844 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01E88 80B64848 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01E8C 80B6484C 4406A000 */ mfc1 $a2, $f20 +/* 01E8C 80B6484C 4406A000 */ mfc1 $a2, $f20 /* 01E90 80B64850 260401F4 */ addiu $a0, $s0, 0x01F4 ## $a0 = 000001F4 /* 01E94 80B64854 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01E98 80B64858 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01E9C 80B6485C 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 01EA0 80B64860 3C053C3C */ lui $a1, 0x3C3C ## $a1 = 3C3C0000 -/* 01EA4 80B64864 4406A000 */ mfc1 $a2, $f20 +/* 01EA4 80B64864 4406A000 */ mfc1 $a2, $f20 /* 01EA8 80B64868 3C073B03 */ lui $a3, 0x3B03 ## $a3 = 3B030000 /* 01EAC 80B6486C 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3B03126F /* 01EB0 80B64870 34A56A7E */ ori $a1, $a1, 0x6A7E ## $a1 = 3C3C6A7E /* 01EB4 80B64874 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01EB8 80B64878 26040058 */ addiu $a0, $s0, 0x0058 ## $a0 = 00000058 /* 01EBC 80B6487C 860A01D4 */ lh $t2, 0x01D4($s0) ## 000001D4 /* 01EC0 80B64880 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01EC4 80B64884 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 01EC8 80B64888 11400021 */ beq $t2, $zero, .L80B64910 +/* 01EC8 80B64888 11400021 */ beq $t2, $zero, .L80B64910 /* 01ECC 80B6488C 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 01ED0 80B64890 4405A000 */ mfc1 $a1, $f20 +/* 01ED0 80B64890 4405A000 */ mfc1 $a1, $f20 /* 01ED4 80B64894 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 01ED8 80B64898 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 01EDC 80B6489C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01EE0 80B648A0 860B01D4 */ lh $t3, 0x01D4($s0) ## 000001D4 /* 01EE4 80B648A4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01EE8 80B648A8 5561001E */ bnel $t3, $at, .L80B64924 +/* 01EE8 80B648A8 5561001E */ bnel $t3, $at, .L80B64924 /* 01EEC 80B648AC C60401A0 */ lwc1 $f4, 0x01A0($s0) ## 000001A0 /* 01EF0 80B648B0 860C01C2 */ lh $t4, 0x01C2($s0) ## 000001C2 /* 01EF4 80B648B4 3C0180B6 */ lui $at, %hi(D_80B65444) ## $at = 80B60000 -/* 01EF8 80B648B8 C4205444 */ lwc1 $f0, %lo(D_80B65444)($at) +/* 01EF8 80B648B8 C4205444 */ lwc1 $f0, %lo(D_80B65444)($at) /* 01EFC 80B648BC A60C01C4 */ sh $t4, 0x01C4($s0) ## 000001C4 /* 01F00 80B648C0 860D01C4 */ lh $t5, 0x01C4($s0) ## 000001C4 /* 01F04 80B648C4 3C0F80B6 */ lui $t7, %hi(D_80B65190) ## $t7 = 80B60000 /* 01F08 80B648C8 25EF5190 */ addiu $t7, $t7, %lo(D_80B65190) ## $t7 = 80B65190 -/* 01F0C 80B648CC 000D7100 */ sll $t6, $t5, 4 -/* 01F10 80B648D0 01CF1021 */ addu $v0, $t6, $t7 +/* 01F0C 80B648CC 000D7100 */ sll $t6, $t5, 4 +/* 01F10 80B648D0 01CF1021 */ addu $v0, $t6, $t7 /* 01F14 80B648D4 C4460000 */ lwc1 $f6, 0x0000($v0) ## 00000000 /* 01F18 80B648D8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01F1C 80B648DC 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 01F20 80B648E0 46003202 */ mul.s $f8, $f6, $f0 +/* 01F20 80B648E0 46003202 */ mul.s $f8, $f6, $f0 /* 01F24 80B648E4 3C0180B6 */ lui $at, %hi(D_80B65448) ## $at = 80B60000 -/* 01F28 80B648E8 460A4480 */ add.s $f18, $f8, $f10 +/* 01F28 80B648E8 460A4480 */ add.s $f18, $f8, $f10 /* 01F2C 80B648EC E612018C */ swc1 $f18, 0x018C($s0) ## 0000018C /* 01F30 80B648F0 C4440004 */ lwc1 $f4, 0x0004($v0) ## 00000004 /* 01F34 80B648F4 E6040190 */ swc1 $f4, 0x0190($s0) ## 00000190 /* 01F38 80B648F8 C4460008 */ lwc1 $f6, 0x0008($v0) ## 00000008 -/* 01F3C 80B648FC C42A5448 */ lwc1 $f10, %lo(D_80B65448)($at) -/* 01F40 80B64900 46003202 */ mul.s $f8, $f6, $f0 -/* 01F44 80B64904 460A4481 */ sub.s $f18, $f8, $f10 -/* 01F48 80B64908 10000005 */ beq $zero, $zero, .L80B64920 +/* 01F3C 80B648FC C42A5448 */ lwc1 $f10, %lo(D_80B65448)($at) +/* 01F40 80B64900 46003202 */ mul.s $f8, $f6, $f0 +/* 01F44 80B64904 460A4481 */ sub.s $f18, $f8, $f10 +/* 01F48 80B64908 10000005 */ beq $zero, $zero, .L80B64920 /* 01F4C 80B6490C E6120194 */ swc1 $f18, 0x0194($s0) ## 00000194 .L80B64910: -/* 01F50 80B64910 4405A000 */ mfc1 $a1, $f20 -/* 01F54 80B64914 4406A000 */ mfc1 $a2, $f20 +/* 01F50 80B64910 4405A000 */ mfc1 $a1, $f20 +/* 01F54 80B64914 4406A000 */ mfc1 $a2, $f20 /* 01F58 80B64918 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F5C 80B6491C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD .L80B64920: /* 01F60 80B64920 C60401A0 */ lwc1 $f4, 0x01A0($s0) ## 000001A0 .L80B64924: /* 01F64 80B64924 C6060198 */ lwc1 $f6, 0x0198($s0) ## 00000198 -/* 01F68 80B64928 4406A000 */ mfc1 $a2, $f20 +/* 01F68 80B64928 4406A000 */ mfc1 $a2, $f20 /* 01F6C 80B6492C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 01F70 80B64930 46062202 */ mul.s $f8, $f4, $f6 +/* 01F70 80B64930 46062202 */ mul.s $f8, $f4, $f6 /* 01F74 80B64934 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C -/* 01F78 80B64938 44074000 */ mfc1 $a3, $f8 +/* 01F78 80B64938 44074000 */ mfc1 $a3, $f8 /* 01F7C 80B6493C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F80 80B64940 00000000 */ nop /* 01F84 80B64944 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01F88 80B64948 4407A000 */ mfc1 $a3, $f20 +/* 01F88 80B64948 4407A000 */ mfc1 $a3, $f20 /* 01F8C 80B6494C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01F90 80B64950 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 01F94 80B64954 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F98 80B64958 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 /* 01F9C 80B6495C C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 /* 01FA0 80B64960 C612019C */ lwc1 $f18, 0x019C($s0) ## 0000019C -/* 01FA4 80B64964 4406A000 */ mfc1 $a2, $f20 +/* 01FA4 80B64964 4406A000 */ mfc1 $a2, $f20 /* 01FA8 80B64968 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 01FAC 80B6496C 46125102 */ mul.s $f4, $f10, $f18 +/* 01FAC 80B6496C 46125102 */ mul.s $f4, $f10, $f18 /* 01FB0 80B64970 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 01FB4 80B64974 44072000 */ mfc1 $a3, $f4 +/* 01FB4 80B64974 44072000 */ mfc1 $a3, $f4 /* 01FB8 80B64978 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01FBC 80B6497C 00000000 */ nop /* 01FC0 80B64980 C60E018C */ lwc1 $f14, 0x018C($s0) ## 0000018C /* 01FC4 80B64984 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 01FC8 80B64988 C6100194 */ lwc1 $f16, 0x0194($s0) ## 00000194 /* 01FCC 80B6498C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 01FD0 80B64990 460E3081 */ sub.s $f2, $f6, $f14 +/* 01FD0 80B64990 460E3081 */ sub.s $f2, $f6, $f14 /* 01FD4 80B64994 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 01FD8 80B64998 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 -/* 01FDC 80B6499C 46104301 */ sub.s $f12, $f8, $f16 -/* 01FE0 80B649A0 46021282 */ mul.s $f10, $f2, $f2 +/* 01FDC 80B6499C 46104301 */ sub.s $f12, $f8, $f16 +/* 01FE0 80B649A0 46021282 */ mul.s $f10, $f2, $f2 /* 01FE4 80B649A4 00000000 */ nop -/* 01FE8 80B649A8 460C6482 */ mul.s $f18, $f12, $f12 -/* 01FEC 80B649AC 46125000 */ add.s $f0, $f10, $f18 -/* 01FF0 80B649B0 46000504 */ sqrt.s $f20, $f0 -/* 01FF4 80B649B4 4604A03C */ c.lt.s $f20, $f4 +/* 01FE8 80B649A8 460C6482 */ mul.s $f18, $f12, $f12 +/* 01FEC 80B649AC 46125000 */ add.s $f0, $f10, $f18 +/* 01FF0 80B649B0 46000504 */ sqrt.s $f20, $f0 +/* 01FF4 80B649B4 4604A03C */ c.lt.s $f20, $f4 /* 01FF8 80B649B8 00000000 */ nop -/* 01FFC 80B649BC 45000019 */ bc1f .L80B64A24 +/* 01FFC 80B649BC 45000019 */ bc1f .L80B64A24 /* 02000 80B649C0 00000000 */ nop /* 02004 80B649C4 861801C8 */ lh $t8, 0x01C8($s0) ## 000001C8 /* 02008 80B649C8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 0200C 80B649CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02010 80B649D0 17000014 */ bne $t8, $zero, .L80B64A24 +/* 02010 80B649D0 17000014 */ bne $t8, $zero, .L80B64A24 /* 02014 80B649D4 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 02018 80B649D8 A61901C8 */ sh $t9, 0x01C8($s0) ## 000001C8 -/* 0201C 80B649DC E7AE0010 */ swc1 $f14, 0x0010($sp) +/* 0201C 80B649DC E7AE0010 */ swc1 $f14, 0x0010($sp) /* 02020 80B649E0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02024 80B649E4 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 02028 80B649E8 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 0202C 80B649EC AFA0001C */ sw $zero, 0x001C($sp) -/* 02030 80B649F0 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 02034 80B649F4 46083280 */ add.s $f10, $f6, $f8 -/* 02038 80B649F8 8FA60064 */ lw $a2, 0x0064($sp) +/* 0202C 80B649EC AFA0001C */ sw $zero, 0x001C($sp) +/* 02030 80B649F0 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 02034 80B649F4 46083280 */ add.s $f10, $f6, $f8 +/* 02038 80B649F8 8FA60064 */ lw $a2, 0x0064($sp) /* 0203C 80B649FC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 02040 80B64A00 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 -/* 02044 80B64A04 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 02044 80B64A04 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 02048 80B64A08 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 0204C 80B64A0C AFAB0028 */ sw $t3, 0x0028($sp) -/* 02050 80B64A10 AFA00024 */ sw $zero, 0x0024($sp) -/* 02054 80B64A14 01215021 */ addu $t2, $t1, $at -/* 02058 80B64A18 AFAA0020 */ sw $t2, 0x0020($sp) +/* 0204C 80B64A0C AFAB0028 */ sw $t3, 0x0028($sp) +/* 02050 80B64A10 AFA00024 */ sw $zero, 0x0024($sp) +/* 02054 80B64A14 01215021 */ addu $t2, $t1, $at +/* 02058 80B64A18 AFAA0020 */ sw $t2, 0x0020($sp) /* 0205C 80B64A1C 0C00C916 */ jal Actor_SpawnAttached - + /* 02060 80B64A20 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 .L80B64A24: /* 02064 80B64A24 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 02068 80B64A28 3C0D80B6 */ lui $t5, %hi(func_80B64AA8) ## $t5 = 80B60000 /* 0206C 80B64A2C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02070 80B64A30 4600A032 */ c.eq.s $f20, $f0 +/* 02070 80B64A30 4600A032 */ c.eq.s $f20, $f0 /* 02074 80B64A34 240C008C */ addiu $t4, $zero, 0x008C ## $t4 = 0000008C /* 02078 80B64A38 25AD4AA8 */ addiu $t5, $t5, %lo(func_80B64AA8) ## $t5 = 80B64AA8 /* 0207C 80B64A3C 24A5B4C8 */ addiu $a1, $a1, 0xB4C8 ## $a1 = 0600B4C8 -/* 02080 80B64A40 45020015 */ bc1fl .L80B64A98 -/* 02084 80B64A44 8FBF0044 */ lw $ra, 0x0044($sp) +/* 02080 80B64A40 45020015 */ bc1fl .L80B64A98 +/* 02084 80B64A44 8FBF0044 */ lw $ra, 0x0044($sp) /* 02088 80B64A48 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 /* 0208C 80B64A4C A60C01D4 */ sh $t4, 0x01D4($s0) ## 000001D4 /* 02090 80B64A50 AE0D01FC */ sw $t5, 0x01FC($s0) ## 000001FC -/* 02094 80B64A54 44060000 */ mfc1 $a2, $f0 -/* 02098 80B64A58 8FA4004C */ lw $a0, 0x004C($sp) -/* 0209C 80B64A5C 0C0294D3 */ jal func_800A534C -/* 020A0 80B64A60 AFA20050 */ sw $v0, 0x0050($sp) -/* 020A4 80B64A64 8FA20050 */ lw $v0, 0x0050($sp) +/* 02094 80B64A54 44060000 */ mfc1 $a2, $f0 +/* 02098 80B64A58 8FA4004C */ lw $a0, 0x004C($sp) +/* 0209C 80B64A5C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 020A0 80B64A60 AFA20050 */ sw $v0, 0x0050($sp) +/* 020A4 80B64A64 8FA20050 */ lw $v0, 0x0050($sp) /* 020A8 80B64A68 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 /* 020AC 80B64A6C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 020B0 80B64A70 904E00AF */ lbu $t6, 0x00AF($v0) ## 000000AF /* 020B4 80B64A74 24198000 */ addiu $t9, $zero, 0x8000 ## $t9 = FFFF8000 -/* 020B8 80B64A78 29C10019 */ slti $at, $t6, 0x0019 -/* 020BC 80B64A7C 54200004 */ bnel $at, $zero, .L80B64A90 +/* 020B8 80B64A78 29C10019 */ slti $at, $t6, 0x0019 +/* 020BC 80B64A7C 54200004 */ bnel $at, $zero, .L80B64A90 /* 020C0 80B64A80 A05801C9 */ sb $t8, 0x01C9($v0) ## 000001C9 -/* 020C4 80B64A84 10000002 */ beq $zero, $zero, .L80B64A90 +/* 020C4 80B64A84 10000002 */ beq $zero, $zero, .L80B64A90 /* 020C8 80B64A88 A20F014C */ sb $t7, 0x014C($s0) ## 0000014C /* 020CC 80B64A8C A05801C9 */ sb $t8, 0x01C9($v0) ## 000001C9 .L80B64A90: /* 020D0 80B64A90 A61901C6 */ sh $t9, 0x01C6($s0) ## 000001C6 -/* 020D4 80B64A94 8FBF0044 */ lw $ra, 0x0044($sp) +/* 020D4 80B64A94 8FBF0044 */ lw $ra, 0x0044($sp) .L80B64A98: -/* 020D8 80B64A98 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 020DC 80B64A9C 8FB00040 */ lw $s0, 0x0040($sp) -/* 020E0 80B64AA0 03E00008 */ jr $ra +/* 020D8 80B64A98 D7B40038 */ ldc1 $f20, 0x0038($sp) +/* 020DC 80B64A9C 8FB00040 */ lw $s0, 0x0040($sp) +/* 020E0 80B64AA0 03E00008 */ jr $ra /* 020E4 80B64AA4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s index 79fb174d82..333fcfe39e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s @@ -1,34 +1,34 @@ glabel Fishing_Destroy /* 0151C 80B6AEBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01520 80B6AEC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01524 80B6AEC4 AFA40018 */ sw $a0, 0x0018($sp) +/* 01520 80B6AEC0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01524 80B6AEC4 AFA40018 */ sw $a0, 0x0018($sp) /* 01528 80B6AEC8 248401D8 */ addiu $a0, $a0, 0x01D8 ## $a0 = 000001D8 -/* 0152C 80B6AECC 0C0295BC */ jal func_800A56F0 -/* 01530 80B6AED0 AFA5001C */ sw $a1, 0x001C($sp) -/* 01534 80B6AED4 8FA30018 */ lw $v1, 0x0018($sp) -/* 01538 80B6AED8 8FA7001C */ lw $a3, 0x001C($sp) +/* 0152C 80B6AECC 0C0295BC */ jal SkelAnime_Free +/* 01530 80B6AED0 AFA5001C */ sw $a1, 0x001C($sp) +/* 01534 80B6AED4 8FA30018 */ lw $v1, 0x0018($sp) +/* 01538 80B6AED8 8FA7001C */ lw $a3, 0x001C($sp) /* 0153C 80B6AEDC 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 /* 01540 80B6AEE0 8462001C */ lh $v0, 0x001C($v1) ## 0000001C /* 01544 80B6AEE4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 01548 80B6AEE8 24E507A8 */ addiu $a1, $a3, 0x07A8 ## $a1 = 000007A8 -/* 0154C 80B6AEEC 54410006 */ bnel $v0, $at, .L80B6AF08 +/* 0154C 80B6AEEC 54410006 */ bnel $v0, $at, .L80B6AF08 /* 01550 80B6AEF0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01554 80B6AEF4 0C01E9F1 */ jal Lights_Remove - + /* 01558 80B6AEF8 8C66021C */ lw $a2, 0x021C($v1) ## 0000021C -/* 0155C 80B6AEFC 10000007 */ beq $zero, $zero, .L80B6AF1C -/* 01560 80B6AF00 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0155C 80B6AEFC 10000007 */ beq $zero, $zero, .L80B6AF1C +/* 01560 80B6AF00 8FBF0014 */ lw $ra, 0x0014($sp) /* 01564 80B6AF04 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L80B6AF08: -/* 01568 80B6AF08 14410003 */ bne $v0, $at, .L80B6AF18 +/* 01568 80B6AF08 14410003 */ bne $v0, $at, .L80B6AF18 /* 0156C 80B6AF0C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01570 80B6AF10 0C016F32 */ jal func_8005BCC8 +/* 01570 80B6AF10 0C016F32 */ jal func_8005BCC8 /* 01574 80B6AF14 24650230 */ addiu $a1, $v1, 0x0230 ## $a1 = 00000230 .L80B6AF18: -/* 01578 80B6AF18 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01578 80B6AF18 8FBF0014 */ lw $ra, 0x0014($sp) .L80B6AF1C: /* 0157C 80B6AF1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01580 80B6AF20 03E00008 */ jr $ra +/* 01580 80B6AF20 03E00008 */ jr $ra /* 01584 80B6AF24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Draw.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Draw.s index 88e491a108..5c84781036 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Draw.s @@ -1,94 +1,94 @@ glabel Fishing_Draw /* 0C444 80B75DE4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0C448 80B75DE8 AFB00028 */ sw $s0, 0x0028($sp) +/* 0C448 80B75DE8 AFB00028 */ sw $s0, 0x0028($sp) /* 0C44C 80B75DEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0C450 80B75DF0 AFBF002C */ sw $ra, 0x002C($sp) -/* 0C454 80B75DF4 AFA50034 */ sw $a1, 0x0034($sp) -/* 0C458 80B75DF8 0C024F46 */ jal func_80093D18 +/* 0C450 80B75DF0 AFBF002C */ sw $ra, 0x002C($sp) +/* 0C454 80B75DF4 AFA50034 */ sw $a1, 0x0034($sp) +/* 0C458 80B75DF8 0C024F46 */ jal func_80093D18 /* 0C45C 80B75DFC 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 0C460 80B75E00 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 /* 0C464 80B75E04 C60E0028 */ lwc1 $f14, 0x0028($s0) ## 00000028 /* 0C468 80B75E08 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 0C46C 80B75E0C 0C034261 */ jal Matrix_Translate +/* 0C46C 80B75E0C 0C034261 */ jal Matrix_Translate /* 0C470 80B75E10 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0C474 80B75E14 860F0162 */ lh $t7, 0x0162($s0) ## 00000162 /* 0C478 80B75E18 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 /* 0C47C 80B75E1C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0C480 80B75E20 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 -/* 0C484 80B75E24 01F8C821 */ addu $t9, $t7, $t8 +/* 0C484 80B75E24 01F8C821 */ addu $t9, $t7, $t8 /* 0C488 80B75E28 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 /* 0C48C 80B75E2C 3C0180B8 */ lui $at, %hi(D_80B7B758) ## $at = 80B80000 -/* 0C490 80B75E30 C430B758 */ lwc1 $f16, %lo(D_80B7B758)($at) -/* 0C494 80B75E34 468021A0 */ cvt.s.w $f6, $f4 +/* 0C490 80B75E30 C430B758 */ lwc1 $f16, %lo(D_80B7B758)($at) +/* 0C494 80B75E34 468021A0 */ cvt.s.w $f6, $f4 /* 0C498 80B75E38 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0C49C 80B75E3C 46083283 */ div.s $f10, $f6, $f8 -/* 0C4A0 80B75E40 46105302 */ mul.s $f12, $f10, $f16 -/* 0C4A4 80B75E44 0C034348 */ jal Matrix_RotateY +/* 0C49C 80B75E3C 46083283 */ div.s $f10, $f6, $f8 +/* 0C4A0 80B75E40 46105302 */ mul.s $f12, $f10, $f16 +/* 0C4A4 80B75E44 0C034348 */ jal Matrix_RotateY /* 0C4A8 80B75E48 00000000 */ nop /* 0C4AC 80B75E4C 86080160 */ lh $t0, 0x0160($s0) ## 00000160 /* 0C4B0 80B75E50 860900B4 */ lh $t1, 0x00B4($s0) ## 000000B4 /* 0C4B4 80B75E54 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0C4B8 80B75E58 44813000 */ mtc1 $at, $f6 ## $f6 = 32768.00 -/* 0C4BC 80B75E5C 01095021 */ addu $t2, $t0, $t1 +/* 0C4BC 80B75E5C 01095021 */ addu $t2, $t0, $t1 /* 0C4C0 80B75E60 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 /* 0C4C4 80B75E64 3C0180B8 */ lui $at, %hi(D_80B7B75C) ## $at = 80B80000 -/* 0C4C8 80B75E68 C42AB75C */ lwc1 $f10, %lo(D_80B7B75C)($at) -/* 0C4CC 80B75E6C 46809120 */ cvt.s.w $f4, $f18 +/* 0C4C8 80B75E68 C42AB75C */ lwc1 $f10, %lo(D_80B7B75C)($at) +/* 0C4CC 80B75E6C 46809120 */ cvt.s.w $f4, $f18 /* 0C4D0 80B75E70 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0C4D4 80B75E74 46062203 */ div.s $f8, $f4, $f6 -/* 0C4D8 80B75E78 460A4302 */ mul.s $f12, $f8, $f10 -/* 0C4DC 80B75E7C 0C0342DC */ jal Matrix_RotateX +/* 0C4D4 80B75E74 46062203 */ div.s $f8, $f4, $f6 +/* 0C4D8 80B75E78 460A4302 */ mul.s $f12, $f8, $f10 +/* 0C4DC 80B75E7C 0C0342DC */ jal Matrix_RotateX /* 0C4E0 80B75E80 00000000 */ nop /* 0C4E4 80B75E84 860B0164 */ lh $t3, 0x0164($s0) ## 00000164 /* 0C4E8 80B75E88 860C00B8 */ lh $t4, 0x00B8($s0) ## 000000B8 /* 0C4EC 80B75E8C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0C4F0 80B75E90 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 0C4F4 80B75E94 016C6821 */ addu $t5, $t3, $t4 +/* 0C4F4 80B75E94 016C6821 */ addu $t5, $t3, $t4 /* 0C4F8 80B75E98 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 /* 0C4FC 80B75E9C 3C0180B8 */ lui $at, %hi(D_80B7B760) ## $at = 80B80000 -/* 0C500 80B75EA0 C428B760 */ lwc1 $f8, %lo(D_80B7B760)($at) -/* 0C504 80B75EA4 468084A0 */ cvt.s.w $f18, $f16 +/* 0C500 80B75EA0 C428B760 */ lwc1 $f8, %lo(D_80B7B760)($at) +/* 0C504 80B75EA4 468084A0 */ cvt.s.w $f18, $f16 /* 0C508 80B75EA8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0C50C 80B75EAC 46049183 */ div.s $f6, $f18, $f4 -/* 0C510 80B75EB0 46083302 */ mul.s $f12, $f6, $f8 -/* 0C514 80B75EB4 0C0343B5 */ jal Matrix_RotateZ +/* 0C50C 80B75EAC 46049183 */ div.s $f6, $f18, $f4 +/* 0C510 80B75EB0 46083302 */ mul.s $f12, $f6, $f8 +/* 0C514 80B75EB4 0C0343B5 */ jal Matrix_RotateZ /* 0C518 80B75EB8 00000000 */ nop /* 0C51C 80B75EBC C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 /* 0C520 80B75EC0 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 /* 0C524 80B75EC4 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 0C528 80B75EC8 0C0342A3 */ jal Matrix_Scale +/* 0C528 80B75EC8 0C0342A3 */ jal Matrix_Scale /* 0C52C 80B75ECC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0C530 80B75ED0 920E0150 */ lbu $t6, 0x0150($s0) ## 00000150 /* 0C534 80B75ED4 3C06453B */ lui $a2, 0x453B ## $a2 = 453B0000 /* 0C538 80B75ED8 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 453B8000 -/* 0C53C 80B75EDC 55C0002B */ bnel $t6, $zero, .L80B75F8C +/* 0C53C 80B75EDC 55C0002B */ bnel $t6, $zero, .L80B75F8C /* 0C540 80B75EE0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0C544 80B75EE4 860F016C */ lh $t7, 0x016C($s0) ## 0000016C /* 0C548 80B75EE8 3C0180B8 */ lui $at, %hi(D_80B7B764) ## $at = 80B80000 -/* 0C54C 80B75EEC C432B764 */ lwc1 $f18, %lo(D_80B7B764)($at) +/* 0C54C 80B75EEC C432B764 */ lwc1 $f18, %lo(D_80B7B764)($at) /* 0C550 80B75EF0 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 /* 0C554 80B75EF4 3C0180B8 */ lui $at, %hi(D_80B7B768) ## $at = 80B80000 -/* 0C558 80B75EF8 C426B768 */ lwc1 $f6, %lo(D_80B7B768)($at) -/* 0C55C 80B75EFC 46805420 */ cvt.s.w $f16, $f10 +/* 0C558 80B75EF8 C426B768 */ lwc1 $f6, %lo(D_80B7B768)($at) +/* 0C55C 80B75EFC 46805420 */ cvt.s.w $f16, $f10 /* 0C560 80B75F00 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0C564 80B75F04 46128102 */ mul.s $f4, $f16, $f18 -/* 0C568 80B75F08 0C034348 */ jal Matrix_RotateY -/* 0C56C 80B75F0C 46062301 */ sub.s $f12, $f4, $f6 +/* 0C564 80B75F04 46128102 */ mul.s $f4, $f16, $f18 +/* 0C568 80B75F08 0C034348 */ jal Matrix_RotateY +/* 0C56C 80B75F0C 46062301 */ sub.s $f12, $f4, $f6 /* 0C570 80B75F10 8618016C */ lh $t8, 0x016C($s0) ## 0000016C /* 0C574 80B75F14 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0C578 80B75F18 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 /* 0C57C 80B75F1C 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 /* 0C580 80B75F20 3C0180B8 */ lui $at, %hi(D_80B7B76C) ## $at = 80B80000 -/* 0C584 80B75F24 C424B76C */ lwc1 $f4, %lo(D_80B7B76C)($at) -/* 0C588 80B75F28 468042A0 */ cvt.s.w $f10, $f8 +/* 0C584 80B75F24 C424B76C */ lwc1 $f4, %lo(D_80B7B76C)($at) +/* 0C588 80B75F28 468042A0 */ cvt.s.w $f10, $f8 /* 0C58C 80B75F2C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0C590 80B75F30 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0C594 80B75F34 46006386 */ mov.s $f14, $f12 -/* 0C598 80B75F38 46105482 */ mul.s $f18, $f10, $f16 +/* 0C594 80B75F34 46006386 */ mov.s $f14, $f12 +/* 0C598 80B75F38 46105482 */ mul.s $f18, $f10, $f16 /* 0C59C 80B75F3C 00000000 */ nop -/* 0C5A0 80B75F40 46049182 */ mul.s $f6, $f18, $f4 -/* 0C5A4 80B75F44 44063000 */ mfc1 $a2, $f6 -/* 0C5A8 80B75F48 0C034261 */ jal Matrix_Translate +/* 0C5A0 80B75F40 46049182 */ mul.s $f6, $f18, $f4 +/* 0C5A4 80B75F44 44063000 */ mfc1 $a2, $f6 +/* 0C5A8 80B75F48 0C034261 */ jal Matrix_Translate /* 0C5AC 80B75F4C 00000000 */ nop /* 0C5B0 80B75F50 8E0501DC */ lw $a1, 0x01DC($s0) ## 000001DC /* 0C5B4 80B75F54 8E0601F8 */ lw $a2, 0x01F8($s0) ## 000001F8 @@ -97,36 +97,36 @@ glabel Fishing_Draw /* 0C5C0 80B75F60 3C0880B7 */ lui $t0, %hi(func_80B75CE0) ## $t0 = 80B70000 /* 0C5C4 80B75F64 25085CE0 */ addiu $t0, $t0, %lo(func_80B75CE0) ## $t0 = 80B75CE0 /* 0C5C8 80B75F68 27395BAC */ addiu $t9, $t9, %lo(func_80B75BAC) ## $t9 = 80B75BAC -/* 0C5CC 80B75F6C AFB90010 */ sw $t9, 0x0010($sp) -/* 0C5D0 80B75F70 AFA80014 */ sw $t0, 0x0014($sp) -/* 0C5D4 80B75F74 AFB00018 */ sw $s0, 0x0018($sp) -/* 0C5D8 80B75F78 0C0286B2 */ jal func_800A1AC8 -/* 0C5DC 80B75F7C 8FA40034 */ lw $a0, 0x0034($sp) -/* 0C5E0 80B75F80 10000025 */ beq $zero, $zero, .L80B76018 -/* 0C5E4 80B75F84 8FBF002C */ lw $ra, 0x002C($sp) +/* 0C5CC 80B75F6C AFB90010 */ sw $t9, 0x0010($sp) +/* 0C5D0 80B75F70 AFA80014 */ sw $t0, 0x0014($sp) +/* 0C5D4 80B75F74 AFB00018 */ sw $s0, 0x0018($sp) +/* 0C5D8 80B75F78 0C0286B2 */ jal SkelAnime_DrawSV +/* 0C5DC 80B75F7C 8FA40034 */ lw $a0, 0x0034($sp) +/* 0C5E0 80B75F80 10000025 */ beq $zero, $zero, .L80B76018 +/* 0C5E4 80B75F84 8FBF002C */ lw $ra, 0x002C($sp) /* 0C5E8 80B75F88 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 .L80B75F8C: /* 0C5EC 80B75F8C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0C5F0 80B75F90 0C034261 */ jal Matrix_Translate -/* 0C5F4 80B75F94 46006386 */ mov.s $f14, $f12 +/* 0C5F0 80B75F90 0C034261 */ jal Matrix_Translate +/* 0C5F4 80B75F94 46006386 */ mov.s $f14, $f12 /* 0C5F8 80B75F98 8609016C */ lh $t1, 0x016C($s0) ## 0000016C /* 0C5FC 80B75F9C 3C0180B8 */ lui $at, %hi(D_80B7B770) ## $at = 80B80000 -/* 0C600 80B75FA0 C430B770 */ lwc1 $f16, %lo(D_80B7B770)($at) +/* 0C600 80B75FA0 C430B770 */ lwc1 $f16, %lo(D_80B7B770)($at) /* 0C604 80B75FA4 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 /* 0C608 80B75FA8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0C60C 80B75FAC 468042A0 */ cvt.s.w $f10, $f8 -/* 0C610 80B75FB0 46105302 */ mul.s $f12, $f10, $f16 -/* 0C614 80B75FB4 0C034348 */ jal Matrix_RotateY +/* 0C60C 80B75FAC 468042A0 */ cvt.s.w $f10, $f8 +/* 0C610 80B75FB0 46105302 */ mul.s $f12, $f10, $f16 +/* 0C614 80B75FB4 0C034348 */ jal Matrix_RotateY /* 0C618 80B75FB8 00000000 */ nop /* 0C61C 80B75FBC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0C620 80B75FC0 3C06C53B */ lui $a2, 0xC53B ## $a2 = C53B0000 /* 0C624 80B75FC4 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C53B8000 /* 0C628 80B75FC8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0C62C 80B75FCC 0C034261 */ jal Matrix_Translate -/* 0C630 80B75FD0 46006386 */ mov.s $f14, $f12 +/* 0C62C 80B75FCC 0C034261 */ jal Matrix_Translate +/* 0C630 80B75FD0 46006386 */ mov.s $f14, $f12 /* 0C634 80B75FD4 3C0180B8 */ lui $at, %hi(D_80B7B774) ## $at = 80B80000 -/* 0C638 80B75FD8 C42CB774 */ lwc1 $f12, %lo(D_80B7B774)($at) -/* 0C63C 80B75FDC 0C034348 */ jal Matrix_RotateY +/* 0C638 80B75FD8 C42CB774 */ lwc1 $f12, %lo(D_80B7B774)($at) +/* 0C63C 80B75FDC 0C034348 */ jal Matrix_RotateY /* 0C640 80B75FE0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0C644 80B75FE4 8E0501DC */ lw $a1, 0x01DC($s0) ## 000001DC /* 0C648 80B75FE8 8E0601F8 */ lw $a2, 0x01F8($s0) ## 000001F8 @@ -135,16 +135,16 @@ glabel Fishing_Draw /* 0C654 80B75FF4 3C0B80B7 */ lui $t3, %hi(func_80B75DA4) ## $t3 = 80B70000 /* 0C658 80B75FF8 256B5DA4 */ addiu $t3, $t3, %lo(func_80B75DA4) ## $t3 = 80B75DA4 /* 0C65C 80B75FFC 254A5D20 */ addiu $t2, $t2, %lo(func_80B75D20) ## $t2 = 80B75D20 -/* 0C660 80B76000 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0C664 80B76004 AFAB0014 */ sw $t3, 0x0014($sp) -/* 0C668 80B76008 AFB00018 */ sw $s0, 0x0018($sp) -/* 0C66C 80B7600C 0C0286B2 */ jal func_800A1AC8 -/* 0C670 80B76010 8FA40034 */ lw $a0, 0x0034($sp) -/* 0C674 80B76014 8FBF002C */ lw $ra, 0x002C($sp) +/* 0C660 80B76000 AFAA0010 */ sw $t2, 0x0010($sp) +/* 0C664 80B76004 AFAB0014 */ sw $t3, 0x0014($sp) +/* 0C668 80B76008 AFB00018 */ sw $s0, 0x0018($sp) +/* 0C66C 80B7600C 0C0286B2 */ jal SkelAnime_DrawSV +/* 0C670 80B76010 8FA40034 */ lw $a0, 0x0034($sp) +/* 0C674 80B76014 8FBF002C */ lw $ra, 0x002C($sp) .L80B76018: -/* 0C678 80B76018 8FB00028 */ lw $s0, 0x0028($sp) +/* 0C678 80B76018 8FB00028 */ lw $s0, 0x0028($sp) /* 0C67C 80B7601C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0C680 80B76020 03E00008 */ jr $ra +/* 0C680 80B76020 03E00008 */ jr $ra /* 0C684 80B76024 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s index cd306fd65c..1a26a72311 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s @@ -1,25 +1,25 @@ glabel Fishing_Init /* 00BA0 80B6A540 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00BA4 80B6A544 AFB30050 */ sw $s3, 0x0050($sp) +/* 00BA4 80B6A544 AFB30050 */ sw $s3, 0x0050($sp) /* 00BA8 80B6A548 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 00BAC 80B6A54C AFBF0054 */ sw $ra, 0x0054($sp) -/* 00BB0 80B6A550 AFB2004C */ sw $s2, 0x004C($sp) +/* 00BAC 80B6A54C AFBF0054 */ sw $ra, 0x0054($sp) +/* 00BB0 80B6A550 AFB2004C */ sw $s2, 0x004C($sp) /* 00BB4 80B6A554 3C0580B8 */ lui $a1, %hi(D_80B7AE50) ## $a1 = 80B80000 /* 00BB8 80B6A558 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 00BBC 80B6A55C AFB10048 */ sw $s1, 0x0048($sp) -/* 00BC0 80B6A560 AFB00044 */ sw $s0, 0x0044($sp) -/* 00BC4 80B6A564 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 00BC8 80B6A568 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 00BBC 80B6A55C AFB10048 */ sw $s1, 0x0048($sp) +/* 00BC0 80B6A560 AFB00044 */ sw $s0, 0x0044($sp) +/* 00BC4 80B6A564 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 00BC8 80B6A568 F7B40030 */ sdc1 $f20, 0x0030($sp) /* 00BCC 80B6A56C 0C01E037 */ jal Actor_ProcessInitChain - + /* 00BD0 80B6A570 24A5AE50 */ addiu $a1, $a1, %lo(D_80B7AE50) ## $a1 = 80B7AE50 /* 00BD4 80B6A574 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00BD8 80B6A578 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 /* 00BDC 80B6A57C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00BE0 80B6A580 44050000 */ mfc1 $a1, $f0 -/* 00BE4 80B6A584 44070000 */ mfc1 $a3, $f0 +/* 00BE0 80B6A580 44050000 */ mfc1 $a1, $f0 +/* 00BE4 80B6A584 44070000 */ mfc1 $a3, $f0 /* 00BE8 80B6A588 0C00AC78 */ jal ActorShape_Init - + /* 00BEC 80B6A58C 00000000 */ nop /* 00BF0 80B6A590 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00BF4 80B6A594 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 @@ -28,37 +28,37 @@ glabel Fishing_Init /* 00C00 80B6A5A0 85CF09DE */ lh $t7, 0x09DE($t6) ## 801609DE /* 00C04 80B6A5A4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00C08 80B6A5A8 3C0180B8 */ lui $at, %hi(D_80B7E075) ## $at = 80B80000 -/* 00C0C 80B6A5AC 11E00005 */ beq $t7, $zero, .L80B6A5C4 +/* 00C0C 80B6A5AC 11E00005 */ beq $t7, $zero, .L80B6A5C4 /* 00C10 80B6A5B0 3C1080B8 */ lui $s0, %hi(D_80B7E070) ## $s0 = 80B80000 /* 00C14 80B6A5B4 3C118016 */ lui $s1, 0x8016 ## $s1 = 80160000 /* 00C18 80B6A5B8 2631E660 */ addiu $s1, $s1, 0xE660 ## $s1 = 8015E660 -/* 00C1C 80B6A5BC 10000004 */ beq $zero, $zero, .L80B6A5D0 -/* 00C20 80B6A5C0 A038E075 */ sb $t8, %lo(D_80B7E075)($at) +/* 00C1C 80B6A5BC 10000004 */ beq $zero, $zero, .L80B6A5D0 +/* 00C20 80B6A5C0 A038E075 */ sb $t8, %lo(D_80B7E075)($at) .L80B6A5C4: /* 00C24 80B6A5C4 8E390004 */ lw $t9, 0x0004($s1) ## 8015E664 /* 00C28 80B6A5C8 3C0180B8 */ lui $at, %hi(D_80B7E075) ## $at = 80B80000 -/* 00C2C 80B6A5CC A039E075 */ sb $t9, %lo(D_80B7E075)($at) +/* 00C2C 80B6A5CC A039E075 */ sb $t9, %lo(D_80B7E075)($at) .L80B6A5D0: /* 00C30 80B6A5D0 8642001C */ lh $v0, 0x001C($s2) ## 0000001C /* 00C34 80B6A5D4 2610E070 */ addiu $s0, $s0, %lo(D_80B7E070) ## $s0 = 80B7E070 -/* 00C38 80B6A5D8 28410064 */ slti $at, $v0, 0x0064 -/* 00C3C 80B6A5DC 102001A7 */ beq $at, $zero, .L80B6AC7C +/* 00C38 80B6A5D8 28410064 */ slti $at, $v0, 0x0064 +/* 00C3C 80B6A5DC 102001A7 */ beq $at, $zero, .L80B6AC7C /* 00C40 80B6A5E0 3C0180B8 */ lui $at, %hi(D_80B7E074) ## $at = 80B80000 -/* 00C44 80B6A5E4 A020E074 */ sb $zero, %lo(D_80B7E074)($at) +/* 00C44 80B6A5E4 A020E074 */ sb $zero, %lo(D_80B7E074)($at) /* 00C48 80B6A5E8 3C0180B8 */ lui $at, %hi(D_80B7E070) ## $at = 80B80000 -/* 00C4C 80B6A5EC AC32E070 */ sw $s2, %lo(D_80B7E070)($at) +/* 00C4C 80B6A5EC AC32E070 */ sw $s2, %lo(D_80B7E070)($at) /* 00C50 80B6A5F0 8E050000 */ lw $a1, 0x0000($s0) ## 80B7E070 /* 00C54 80B6A5F4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00C58 80B6A5F8 0C016EFE */ jal func_8005BBF8 +/* 00C58 80B6A5F8 0C016EFE */ jal func_8005BBF8 /* 00C5C 80B6A5FC 24A50230 */ addiu $a1, $a1, 0x0230 ## $a1 = 00000230 /* 00C60 80B6A600 8E030000 */ lw $v1, 0x0000($s0) ## 80B7E070 /* 00C64 80B6A604 3C0780B8 */ lui $a3, %hi(D_80B7A888) ## $a3 = 80B80000 /* 00C68 80B6A608 24E7A888 */ addiu $a3, $a3, %lo(D_80B7A888) ## $a3 = 80B7A888 /* 00C6C 80B6A60C 24680250 */ addiu $t0, $v1, 0x0250 ## $t0 = 00000250 -/* 00C70 80B6A610 AFA80010 */ sw $t0, 0x0010($sp) +/* 00C70 80B6A610 AFA80010 */ sw $t0, 0x0010($sp) /* 00C74 80B6A614 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00C78 80B6A618 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -/* 00C7C 80B6A61C 0C017014 */ jal func_8005C050 +/* 00C7C 80B6A61C 0C017014 */ jal func_8005C050 /* 00C80 80B6A620 24650230 */ addiu $a1, $v1, 0x0230 ## $a1 = 00000230 /* 00C84 80B6A624 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 00C88 80B6A628 A649001C */ sh $t1, 0x001C($s2) ## 0000001C @@ -68,15 +68,15 @@ glabel Fishing_Init /* 00C98 80B6A638 24E7453C */ addiu $a3, $a3, 0x453C ## $a3 = 0600453C /* 00C9C 80B6A63C 24C685F8 */ addiu $a2, $a2, 0x85F8 ## $a2 = 060085F8 /* 00CA0 80B6A640 02002825 */ or $a1, $s0, $zero ## $a1 = 000001D8 -/* 00CA4 80B6A644 AFA00018 */ sw $zero, 0x0018($sp) -/* 00CA8 80B6A648 AFA00014 */ sw $zero, 0x0014($sp) -/* 00CAC 80B6A64C AFA00010 */ sw $zero, 0x0010($sp) -/* 00CB0 80B6A650 0C0291BE */ jal func_800A46F8 +/* 00CA4 80B6A644 AFA00018 */ sw $zero, 0x0018($sp) +/* 00CA8 80B6A648 AFA00014 */ sw $zero, 0x0014($sp) +/* 00CAC 80B6A64C AFA00010 */ sw $zero, 0x0010($sp) +/* 00CB0 80B6A650 0C0291BE */ jal SkelAnime_InitSV /* 00CB4 80B6A654 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00CB8 80B6A658 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00CBC 80B6A65C 24A5453C */ addiu $a1, $a1, 0x453C ## $a1 = 0600453C /* 00CC0 80B6A660 02002025 */ or $a0, $s0, $zero ## $a0 = 000001D8 -/* 00CC4 80B6A664 0C0294D3 */ jal func_800A534C +/* 00CC4 80B6A664 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 00CC8 80B6A668 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00CCC 80B6A66C 3C014320 */ lui $at, 0x4320 ## $at = 43200000 /* 00CD0 80B6A670 44812000 */ mtc1 $at, $f4 ## $f4 = 160.00 @@ -98,7 +98,7 @@ glabel Fishing_Init /* 00D10 80B6A6B0 E6440024 */ swc1 $f4, 0x0024($s2) ## 00000024 /* 00D14 80B6A6B4 E6460028 */ swc1 $f6, 0x0028($s2) ## 00000028 /* 00D18 80B6A6B8 0C00B58B */ jal Actor_SetScale - + /* 00D1C 80B6A6BC E648002C */ swc1 $f8, 0x002C($s2) ## 0000002C /* 00D20 80B6A6C0 8E4D0028 */ lw $t5, 0x0028($s2) ## 00000028 /* 00D24 80B6A6C4 3C014296 */ lui $at, 0x4296 ## $at = 42960000 @@ -108,248 +108,248 @@ glabel Fishing_Init /* 00D34 80B6A6D4 44818000 */ mtc1 $at, $f16 ## $f16 = 75.00 /* 00D38 80B6A6D8 8E4F0004 */ lw $t7, 0x0004($s2) ## 00000004 /* 00D3C 80B6A6DC AE4E0038 */ sw $t6, 0x0038($s2) ## 00000038 -/* 00D40 80B6A6E0 46105480 */ add.s $f18, $f10, $f16 +/* 00D40 80B6A6E0 46105480 */ add.s $f18, $f10, $f16 /* 00D44 80B6A6E4 8E4E002C */ lw $t6, 0x002C($s2) ## 0000002C /* 00D48 80B6A6E8 35F80009 */ ori $t8, $t7, 0x0009 ## $t8 = 00000009 /* 00D4C 80B6A6EC AE580004 */ sw $t8, 0x0004($s2) ## 00000004 /* 00D50 80B6A6F0 E652003C */ swc1 $f18, 0x003C($s2) ## 0000003C /* 00D54 80B6A6F4 3C1980B8 */ lui $t9, %hi(D_80B7E075) ## $t9 = 80B80000 /* 00D58 80B6A6F8 AE4E0040 */ sw $t6, 0x0040($s2) ## 00000040 -/* 00D5C 80B6A6FC 9339E075 */ lbu $t9, %lo(D_80B7E075)($t9) +/* 00D5C 80B6A6FC 9339E075 */ lbu $t9, %lo(D_80B7E075)($t9) /* 00D60 80B6A700 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00D64 80B6A704 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A -/* 00D68 80B6A708 1321000C */ beq $t9, $at, .L80B6A73C +/* 00D68 80B6A708 1321000C */ beq $t9, $at, .L80B6A73C /* 00D6C 80B6A70C 3C1080B8 */ lui $s0, %hi(D_80B830B8) ## $s0 = 80B80000 /* 00D70 80B6A710 8E280EC0 */ lw $t0, 0x0EC0($s1) ## 8015F520 /* 00D74 80B6A714 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 00D78 80B6A718 3C0180B8 */ lui $at, %hi(D_80B7A688) ## $at = 80B80000 /* 00D7C 80B6A71C 31091000 */ andi $t1, $t0, 0x1000 ## $t1 = 00000000 -/* 00D80 80B6A720 11200004 */ beq $t1, $zero, .L80B6A734 +/* 00D80 80B6A720 11200004 */ beq $t1, $zero, .L80B6A734 /* 00D84 80B6A724 00000000 */ nop /* 00D88 80B6A728 3C0180B8 */ lui $at, %hi(D_80B7A688) ## $at = 80B80000 -/* 00D8C 80B6A72C 10000006 */ beq $zero, $zero, .L80B6A748 -/* 00D90 80B6A730 A020A688 */ sb $zero, %lo(D_80B7A688)($at) +/* 00D8C 80B6A72C 10000006 */ beq $zero, $zero, .L80B6A748 +/* 00D90 80B6A730 A020A688 */ sb $zero, %lo(D_80B7A688)($at) .L80B6A734: -/* 00D94 80B6A734 10000004 */ beq $zero, $zero, .L80B6A748 -/* 00D98 80B6A738 A02AA688 */ sb $t2, %lo(D_80B7A688)($at) +/* 00D94 80B6A734 10000004 */ beq $zero, $zero, .L80B6A748 +/* 00D98 80B6A738 A02AA688 */ sb $t2, %lo(D_80B7A688)($at) .L80B6A73C: /* 00D9C 80B6A73C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 00DA0 80B6A740 3C0180B8 */ lui $at, %hi(D_80B7A688) ## $at = 80B80000 -/* 00DA4 80B6A744 A02BA688 */ sb $t3, %lo(D_80B7A688)($at) +/* 00DA4 80B6A744 A02BA688 */ sb $t3, %lo(D_80B7A688)($at) .L80B6A748: /* 00DA8 80B6A748 240C0014 */ addiu $t4, $zero, 0x0014 ## $t4 = 00000014 /* 00DAC 80B6A74C 3C0180B8 */ lui $at, %hi(D_80B7A684) ## $at = 80B80000 -/* 00DB0 80B6A750 A42CA684 */ sh $t4, %lo(D_80B7A684)($at) +/* 00DB0 80B6A750 A42CA684 */ sh $t4, %lo(D_80B7A684)($at) /* 00DB4 80B6A754 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00DB8 80B6A758 261030B8 */ addiu $s0, $s0, %lo(D_80B830B8) ## $s0 = 80B830B8 -/* 00DBC 80B6A75C 00330821 */ addu $at, $at, $s3 +/* 00DBC 80B6A75C 00330821 */ addu $at, $at, $s3 /* 00DC0 80B6A760 AC301E10 */ sw $s0, 0x1E10($at) ## 00011E10 /* 00DC4 80B6A764 3C018012 */ lui $at, 0x8012 ## $at = 80120000 /* 00DC8 80B6A768 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 00DCC 80B6A76C A42DFB40 */ sh $t5, -0x04C0($at) ## 8011FB40 /* 00DD0 80B6A770 3C0180B8 */ lui $at, %hi(D_80B7E0AC) ## $at = 80B80000 -/* 00DD4 80B6A774 A420E0AC */ sh $zero, %lo(D_80B7E0AC)($at) +/* 00DD4 80B6A774 A420E0AC */ sh $zero, %lo(D_80B7E0AC)($at) /* 00DD8 80B6A778 3C0180B8 */ lui $at, %hi(D_80B7E0A6) ## $at = 80B80000 /* 00DDC 80B6A77C 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 -/* 00DE0 80B6A780 A422E0A6 */ sh $v0, %lo(D_80B7E0A6)($at) +/* 00DE0 80B6A780 A422E0A6 */ sh $v0, %lo(D_80B7E0A6)($at) /* 00DE4 80B6A784 0C03E803 */ jal Audio_SetBGM - + /* 00DE8 80B6A788 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 00DEC 80B6A78C 3C0E80B8 */ lui $t6, %hi(D_80B7E075) ## $t6 = 80B80000 -/* 00DF0 80B6A790 91CEE075 */ lbu $t6, %lo(D_80B7E075)($t6) +/* 00DF0 80B6A790 91CEE075 */ lbu $t6, %lo(D_80B7E075)($t6) /* 00DF4 80B6A794 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00DF8 80B6A798 3C0680B8 */ lui $a2, %hi(D_80B7E07D) ## $a2 = 80B80000 -/* 00DFC 80B6A79C 15C1000F */ bne $t6, $at, .L80B6A7DC +/* 00DFC 80B6A79C 15C1000F */ bne $t6, $at, .L80B6A7DC /* 00E00 80B6A7A0 24C6E07D */ addiu $a2, $a2, %lo(D_80B7E07D) ## $a2 = 80B7E07D /* 00E04 80B6A7A4 8E220EC0 */ lw $v0, 0x0EC0($s1) ## 8015F520 /* 00E08 80B6A7A8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00E0C 80B6A7AC 3043007F */ andi $v1, $v0, 0x007F ## $v1 = 00000000 -/* 00E10 80B6A7B0 50600007 */ beql $v1, $zero, .L80B6A7D0 +/* 00E10 80B6A7B0 50600007 */ beql $v1, $zero, .L80B6A7D0 /* 00E14 80B6A7B4 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 /* 00E18 80B6A7B8 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 /* 00E1C 80B6A7BC 3C0180B8 */ lui $at, %hi(D_80B7E078) ## $at = 80B80000 -/* 00E20 80B6A7C0 468021A0 */ cvt.s.w $f6, $f4 -/* 00E24 80B6A7C4 10000013 */ beq $zero, $zero, .L80B6A814 -/* 00E28 80B6A7C8 E426E078 */ swc1 $f6, %lo(D_80B7E078)($at) +/* 00E20 80B6A7C0 468021A0 */ cvt.s.w $f6, $f4 +/* 00E24 80B6A7C4 10000013 */ beq $zero, $zero, .L80B6A814 +/* 00E28 80B6A7C8 E426E078 */ swc1 $f6, %lo(D_80B7E078)($at) /* 00E2C 80B6A7CC 44814000 */ mtc1 $at, $f8 ## $f8 = -0.00 .L80B6A7D0: /* 00E30 80B6A7D0 3C0180B8 */ lui $at, %hi(D_80B7E078) ## $at = 80B80000 -/* 00E34 80B6A7D4 1000000F */ beq $zero, $zero, .L80B6A814 -/* 00E38 80B6A7D8 E428E078 */ swc1 $f8, %lo(D_80B7E078)($at) +/* 00E34 80B6A7D4 1000000F */ beq $zero, $zero, .L80B6A814 +/* 00E38 80B6A7D8 E428E078 */ swc1 $f8, %lo(D_80B7E078)($at) .L80B6A7DC: /* 00E3C 80B6A7DC 8E220EC0 */ lw $v0, 0x0EC0($s1) ## 8015F520 /* 00E40 80B6A7E0 3C017F00 */ lui $at, 0x7F00 ## $at = 7F000000 -/* 00E44 80B6A7E4 00411824 */ and $v1, $v0, $at -/* 00E48 80B6A7E8 10600007 */ beq $v1, $zero, .L80B6A808 +/* 00E44 80B6A7E4 00411824 */ and $v1, $v0, $at +/* 00E48 80B6A7E8 10600007 */ beq $v1, $zero, .L80B6A808 /* 00E4C 80B6A7EC 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 00E50 80B6A7F0 00037E03 */ sra $t7, $v1, 24 +/* 00E50 80B6A7F0 00037E03 */ sra $t7, $v1, 24 /* 00E54 80B6A7F4 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 /* 00E58 80B6A7F8 3C0180B8 */ lui $at, %hi(D_80B7E078) ## $at = 80B80000 -/* 00E5C 80B6A7FC 46805420 */ cvt.s.w $f16, $f10 -/* 00E60 80B6A800 10000004 */ beq $zero, $zero, .L80B6A814 -/* 00E64 80B6A804 E430E078 */ swc1 $f16, %lo(D_80B7E078)($at) +/* 00E5C 80B6A7FC 46805420 */ cvt.s.w $f16, $f10 +/* 00E60 80B6A800 10000004 */ beq $zero, $zero, .L80B6A814 +/* 00E64 80B6A804 E430E078 */ swc1 $f16, %lo(D_80B7E078)($at) .L80B6A808: /* 00E68 80B6A808 44819000 */ mtc1 $at, $f18 ## $f18 = -0.00 /* 00E6C 80B6A80C 3C0180B8 */ lui $at, %hi(D_80B7E078) ## $at = 80B80000 -/* 00E70 80B6A810 E432E078 */ swc1 $f18, %lo(D_80B7E078)($at) +/* 00E70 80B6A810 E432E078 */ swc1 $f18, %lo(D_80B7E078)($at) .L80B6A814: /* 00E74 80B6A814 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00E78 80B6A818 0041C024 */ and $t8, $v0, $at -/* 00E7C 80B6A81C 00184403 */ sra $t0, $t8, 16 +/* 00E78 80B6A818 0041C024 */ and $t8, $v0, $at +/* 00E7C 80B6A81C 00184403 */ sra $t0, $t8, 16 /* 00E80 80B6A820 31090007 */ andi $t1, $t0, 0x0007 ## $t1 = 00000000 /* 00E84 80B6A824 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00E88 80B6A828 15210009 */ bne $t1, $at, .L80B6A850 +/* 00E88 80B6A828 15210009 */ bne $t1, $at, .L80B6A850 /* 00E8C 80B6A82C A0C80000 */ sb $t0, 0x0000($a2) ## 80B7E07D /* 00E90 80B6A830 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00E94 80B6A834 00330821 */ addu $at, $at, $s3 +/* 00E94 80B6A834 00330821 */ addu $at, $at, $s3 /* 00E98 80B6A838 240A005A */ addiu $t2, $zero, 0x005A ## $t2 = 0000005A /* 00E9C 80B6A83C A42A1D30 */ sh $t2, 0x1D30($at) ## 00011D30 /* 00EA0 80B6A840 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00EA4 80B6A844 3C0180B8 */ lui $at, %hi(D_80B7E076) ## $at = 80B80000 -/* 00EA8 80B6A848 10000007 */ beq $zero, $zero, .L80B6A868 -/* 00EAC 80B6A84C A025E076 */ sb $a1, %lo(D_80B7E076)($at) +/* 00EA8 80B6A848 10000007 */ beq $zero, $zero, .L80B6A868 +/* 00EAC 80B6A84C A025E076 */ sb $a1, %lo(D_80B7E076)($at) .L80B6A850: /* 00EB0 80B6A850 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00EB4 80B6A854 00330821 */ addu $at, $at, $s3 +/* 00EB4 80B6A854 00330821 */ addu $at, $at, $s3 /* 00EB8 80B6A858 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 /* 00EBC 80B6A85C A42B1D30 */ sh $t3, 0x1D30($at) ## 00011D30 /* 00EC0 80B6A860 3C0180B8 */ lui $at, %hi(D_80B7E076) ## $at = 80B80000 -/* 00EC4 80B6A864 A020E076 */ sb $zero, %lo(D_80B7E076)($at) +/* 00EC4 80B6A864 A020E076 */ sb $zero, %lo(D_80B7E076)($at) .L80B6A868: /* 00EC8 80B6A868 90CC0000 */ lbu $t4, 0x0000($a2) ## 80B7E07D /* 00ECC 80B6A86C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 00ED0 80B6A870 2403003C */ addiu $v1, $zero, 0x003C ## $v1 = 0000003C /* 00ED4 80B6A874 318D0007 */ andi $t5, $t4, 0x0007 ## $t5 = 00000000 -/* 00ED8 80B6A878 11A10006 */ beq $t5, $at, .L80B6A894 +/* 00ED8 80B6A878 11A10006 */ beq $t5, $at, .L80B6A894 /* 00EDC 80B6A87C 3C0480B8 */ lui $a0, %hi(D_80B830B0) ## $a0 = 80B80000 /* 00EE0 80B6A880 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00EE4 80B6A884 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 /* 00EE8 80B6A888 3C0180B8 */ lui $at, %hi(D_80B7E077) ## $at = 80B80000 /* 00EEC 80B6A88C 85CF09DA */ lh $t7, 0x09DA($t6) ## 801609DA -/* 00EF0 80B6A890 11E00012 */ beq $t7, $zero, .L80B6A8DC +/* 00EF0 80B6A890 11E00012 */ beq $t7, $zero, .L80B6A8DC .L80B6A894: /* 00EF4 80B6A894 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00EF8 80B6A898 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00EFC 80B6A89C 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 /* 00F00 80B6A8A0 3C0180B8 */ lui $at, %hi(D_80B7E077) ## $at = 80B80000 -/* 00F04 80B6A8A4 A038E077 */ sb $t8, %lo(D_80B7E077)($at) +/* 00F04 80B6A8A4 A038E077 */ sb $t8, %lo(D_80B7E077)($at) /* 00F08 80B6A8A8 845909DA */ lh $t9, 0x09DA($v0) ## 801609DA -/* 00F0C 80B6A8AC 5320000D */ beql $t9, $zero, .L80B6A8E4 +/* 00F0C 80B6A8AC 5320000D */ beql $t9, $zero, .L80B6A8E4 /* 00F10 80B6A8B0 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 00F14 80B6A8B4 A44009DA */ sh $zero, 0x09DA($v0) ## 801609DA /* 00F18 80B6A8B8 8E280EC0 */ lw $t0, 0x0EC0($s1) ## 00000EC0 /* 00F1C 80B6A8BC 3C01FF00 */ lui $at, 0xFF00 ## $at = FF000000 /* 00F20 80B6A8C0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FF00FFFF -/* 00F24 80B6A8C4 01014824 */ and $t1, $t0, $at +/* 00F24 80B6A8C4 01014824 */ and $t1, $t0, $at /* 00F28 80B6A8C8 3C010006 */ lui $at, 0x0006 ## $at = 00060000 /* 00F2C 80B6A8CC AE290EC0 */ sw $t1, 0x0EC0($s1) ## 00000EC0 /* 00F30 80B6A8D0 01215825 */ or $t3, $t1, $at ## $t3 = 00060000 -/* 00F34 80B6A8D4 10000002 */ beq $zero, $zero, .L80B6A8E0 +/* 00F34 80B6A8D4 10000002 */ beq $zero, $zero, .L80B6A8E0 /* 00F38 80B6A8D8 AE2B0EC0 */ sw $t3, 0x0EC0($s1) ## 00000EC0 .L80B6A8DC: -/* 00F3C 80B6A8DC A020E077 */ sb $zero, %lo(D_80B7E077)($at) +/* 00F3C 80B6A8DC A020E077 */ sb $zero, %lo(D_80B7E077)($at) .L80B6A8E0: /* 00F40 80B6A8E0 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 .L80B6A8E4: -/* 00F44 80B6A8E4 00116180 */ sll $t4, $s1, 6 +/* 00F44 80B6A8E4 00116180 */ sll $t4, $s1, 6 /* 00F48 80B6A8E8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00F4C 80B6A8EC 00118C00 */ sll $s1, $s1, 16 -/* 00F50 80B6A8F0 00118C03 */ sra $s1, $s1, 16 -/* 00F54 80B6A8F4 2A210082 */ slti $at, $s1, 0x0082 -/* 00F58 80B6A8F8 020C6821 */ addu $t5, $s0, $t4 -/* 00F5C 80B6A8FC 1420FFF9 */ bne $at, $zero, .L80B6A8E4 +/* 00F4C 80B6A8EC 00118C00 */ sll $s1, $s1, 16 +/* 00F50 80B6A8F0 00118C03 */ sra $s1, $s1, 16 +/* 00F54 80B6A8F4 2A210082 */ slti $at, $s1, 0x0082 +/* 00F58 80B6A8F8 020C6821 */ addu $t5, $s0, $t4 +/* 00F5C 80B6A8FC 1420FFF9 */ bne $at, $zero, .L80B6A8E4 /* 00F60 80B6A900 A1A00024 */ sb $zero, 0x0024($t5) ## 00000024 /* 00F64 80B6A904 3C0280B8 */ lui $v0, %hi(D_80B7FEF8) ## $v0 = 80B80000 /* 00F68 80B6A908 2442FEF8 */ addiu $v0, $v0, %lo(D_80B7FEF8) ## $v0 = 80B7FEF8 /* 00F6C 80B6A90C 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 .L80B6A910: -/* 00F70 80B6A910 02230019 */ multu $s1, $v1 +/* 00F70 80B6A910 02230019 */ multu $s1, $v1 /* 00F74 80B6A914 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00F78 80B6A918 00118C00 */ sll $s1, $s1, 16 -/* 00F7C 80B6A91C 00118C03 */ sra $s1, $s1, 16 -/* 00F80 80B6A920 2A21008C */ slti $at, $s1, 0x008C -/* 00F84 80B6A924 00007012 */ mflo $t6 -/* 00F88 80B6A928 004E7821 */ addu $t7, $v0, $t6 -/* 00F8C 80B6A92C 1420FFF8 */ bne $at, $zero, .L80B6A910 +/* 00F78 80B6A918 00118C00 */ sll $s1, $s1, 16 +/* 00F7C 80B6A91C 00118C03 */ sra $s1, $s1, 16 +/* 00F80 80B6A920 2A21008C */ slti $at, $s1, 0x008C +/* 00F84 80B6A924 00007012 */ mflo $t6 +/* 00F88 80B6A928 004E7821 */ addu $t7, $v0, $t6 +/* 00F8C 80B6A92C 1420FFF8 */ bne $at, $zero, .L80B6A910 /* 00F90 80B6A930 A1E00030 */ sb $zero, 0x0030($t7) ## 00000030 /* 00F94 80B6A934 3C0180B8 */ lui $at, %hi(D_80B7B374) ## $at = 80B80000 -/* 00F98 80B6A938 C424B374 */ lwc1 $f4, %lo(D_80B7B374)($at) +/* 00F98 80B6A938 C424B374 */ lwc1 $f4, %lo(D_80B7B374)($at) /* 00F9C 80B6A93C 3C0280B8 */ lui $v0, %hi(D_80B830A8) ## $v0 = 80B80000 /* 00FA0 80B6A940 244230A8 */ addiu $v0, $v0, %lo(D_80B830A8) ## $v0 = 80B830A8 /* 00FA4 80B6A944 3C0180B8 */ lui $at, %hi(D_80B7B378) ## $at = 80B80000 /* 00FA8 80B6A948 E4440000 */ swc1 $f4, 0x0000($v0) ## 80B830A8 -/* 00FAC 80B6A94C C426B378 */ lwc1 $f6, %lo(D_80B7B378)($at) +/* 00FAC 80B6A94C C426B378 */ lwc1 $f6, %lo(D_80B7B378)($at) /* 00FB0 80B6A950 3C0380B8 */ lui $v1, %hi(D_80B830AC) ## $v1 = 80B80000 /* 00FB4 80B6A954 246330AC */ addiu $v1, $v1, %lo(D_80B830AC) ## $v1 = 80B830AC /* 00FB8 80B6A958 3C0180B8 */ lui $at, %hi(D_80B7B37C) ## $at = 80B80000 /* 00FBC 80B6A95C E4660000 */ swc1 $f6, 0x0000($v1) ## 80B830AC -/* 00FC0 80B6A960 C428B37C */ lwc1 $f8, %lo(D_80B7B37C)($at) +/* 00FC0 80B6A960 C428B37C */ lwc1 $f8, %lo(D_80B7B37C)($at) /* 00FC4 80B6A964 3C014434 */ lui $at, 0x4434 ## $at = 44340000 /* 00FC8 80B6A968 248430B0 */ addiu $a0, $a0, %lo(D_80B830B0) ## $a0 = 80B830B0 /* 00FCC 80B6A96C 4481B000 */ mtc1 $at, $f22 ## $f22 = 720.00 /* 00FD0 80B6A970 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 00FD4 80B6A974 E4880000 */ swc1 $f8, 0x0000($a0) ## 80B830B0 -/* 00FD8 80B6A978 0011C0C0 */ sll $t8, $s1, 3 +/* 00FD8 80B6A978 0011C0C0 */ sll $t8, $s1, 3 .L80B6A97C: -/* 00FDC 80B6A97C 0311C021 */ addu $t8, $t8, $s1 +/* 00FDC 80B6A97C 0311C021 */ addu $t8, $t8, $s1 /* 00FE0 80B6A980 3C1980B8 */ lui $t9, %hi(D_80B81FC8) ## $t9 = 80B80000 /* 00FE4 80B6A984 27391FC8 */ addiu $t9, $t9, %lo(D_80B81FC8) ## $t9 = 80B81FC8 -/* 00FE8 80B6A988 0018C0C0 */ sll $t8, $t8, 3 +/* 00FE8 80B6A988 0018C0C0 */ sll $t8, $t8, 3 /* 00FEC 80B6A98C 3C0280B8 */ lui $v0, %hi(D_80B830A8) ## $v0 = 80B80000 /* 00FF0 80B6A990 3C0380B8 */ lui $v1, %hi(D_80B830AC) ## $v1 = 80B80000 /* 00FF4 80B6A994 3C0480B8 */ lui $a0, %hi(D_80B830B0) ## $a0 = 80B80000 /* 00FF8 80B6A998 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00FFC 80B6A99C 03198021 */ addu $s0, $t8, $t9 -/* 01000 80B6A9A0 2A210015 */ slti $at, $s1, 0x0015 +/* 00FFC 80B6A99C 03198021 */ addu $s0, $t8, $t9 +/* 01000 80B6A9A0 2A210015 */ slti $at, $s1, 0x0015 /* 01004 80B6A9A4 248430B0 */ addiu $a0, $a0, %lo(D_80B830B0) ## $a0 = 80B830B0 /* 01008 80B6A9A8 246330AC */ addiu $v1, $v1, %lo(D_80B830AC) ## $v1 = 80B830AC /* 0100C 80B6A9AC 244230A8 */ addiu $v0, $v0, %lo(D_80B830A8) ## $v0 = 80B830A8 -/* 01010 80B6A9B0 1020000D */ beq $at, $zero, .L80B6A9E8 +/* 01010 80B6A9B0 1020000D */ beq $at, $zero, .L80B6A9E8 /* 01014 80B6A9B4 A2050000 */ sb $a1, 0x0000($s0) ## 80B830B8 /* 01018 80B6A9B8 0C0400A4 */ jal sinf - + /* 0101C 80B6A9BC C44C0000 */ lwc1 $f12, 0x0000($v0) ## 80B830A8 -/* 01020 80B6A9C0 46160502 */ mul.s $f20, $f0, $f22 +/* 01020 80B6A9C0 46160502 */ mul.s $f20, $f0, $f22 /* 01024 80B6A9C4 3C0180B8 */ lui $at, %hi(D_80B830A8) ## $at = 80B80000 /* 01028 80B6A9C8 E6140004 */ swc1 $f20, 0x0004($s0) ## 80B830BC /* 0102C 80B6A9CC E6140010 */ swc1 $f20, 0x0010($s0) ## 80B830C8 /* 01030 80B6A9D0 0C041184 */ jal cosf - -/* 01034 80B6A9D4 C42C30A8 */ lwc1 $f12, %lo(D_80B830A8)($at) -/* 01038 80B6A9D8 46160502 */ mul.s $f20, $f0, $f22 + +/* 01034 80B6A9D4 C42C30A8 */ lwc1 $f12, %lo(D_80B830A8)($at) +/* 01038 80B6A9D8 46160502 */ mul.s $f20, $f0, $f22 /* 0103C 80B6A9DC E614000C */ swc1 $f20, 0x000C($s0) ## 80B830C4 -/* 01040 80B6A9E0 1000001B */ beq $zero, $zero, .L80B6AA50 +/* 01040 80B6A9E0 1000001B */ beq $zero, $zero, .L80B6AA50 /* 01044 80B6A9E4 E6140018 */ swc1 $f20, 0x0018($s0) ## 80B830D0 .L80B6A9E8: -/* 01048 80B6A9E8 2A210029 */ slti $at, $s1, 0x0029 -/* 0104C 80B6A9EC 1020000D */ beq $at, $zero, .L80B6AA24 +/* 01048 80B6A9E8 2A210029 */ slti $at, $s1, 0x0029 +/* 0104C 80B6A9EC 1020000D */ beq $at, $zero, .L80B6AA24 /* 01050 80B6A9F0 00000000 */ nop /* 01054 80B6A9F4 0C0400A4 */ jal sinf - + /* 01058 80B6A9F8 C46C0000 */ lwc1 $f12, 0x0000($v1) ## 00000000 -/* 0105C 80B6A9FC 46160502 */ mul.s $f20, $f0, $f22 +/* 0105C 80B6A9FC 46160502 */ mul.s $f20, $f0, $f22 /* 01060 80B6AA00 3C0180B8 */ lui $at, %hi(D_80B830AC) ## $at = 80B80000 /* 01064 80B6AA04 E6140004 */ swc1 $f20, 0x0004($s0) ## 80B830BC /* 01068 80B6AA08 E6140010 */ swc1 $f20, 0x0010($s0) ## 80B830C8 /* 0106C 80B6AA0C 0C041184 */ jal cosf - -/* 01070 80B6AA10 C42C30AC */ lwc1 $f12, %lo(D_80B830AC)($at) -/* 01074 80B6AA14 46160502 */ mul.s $f20, $f0, $f22 + +/* 01070 80B6AA10 C42C30AC */ lwc1 $f12, %lo(D_80B830AC)($at) +/* 01074 80B6AA14 46160502 */ mul.s $f20, $f0, $f22 /* 01078 80B6AA18 E614000C */ swc1 $f20, 0x000C($s0) ## 80B830C4 -/* 0107C 80B6AA1C 1000000C */ beq $zero, $zero, .L80B6AA50 +/* 0107C 80B6AA1C 1000000C */ beq $zero, $zero, .L80B6AA50 /* 01080 80B6AA20 E6140018 */ swc1 $f20, 0x0018($s0) ## 80B830D0 .L80B6AA24: /* 01084 80B6AA24 0C0400A4 */ jal sinf - + /* 01088 80B6AA28 C48C0000 */ lwc1 $f12, 0x0000($a0) ## 00000000 -/* 0108C 80B6AA2C 46160502 */ mul.s $f20, $f0, $f22 +/* 0108C 80B6AA2C 46160502 */ mul.s $f20, $f0, $f22 /* 01090 80B6AA30 3C0180B8 */ lui $at, %hi(D_80B830B0) ## $at = 80B80000 /* 01094 80B6AA34 E6140004 */ swc1 $f20, 0x0004($s0) ## 80B830BC /* 01098 80B6AA38 E6140010 */ swc1 $f20, 0x0010($s0) ## 80B830C8 /* 0109C 80B6AA3C 0C041184 */ jal cosf - -/* 010A0 80B6AA40 C42C30B0 */ lwc1 $f12, %lo(D_80B830B0)($at) -/* 010A4 80B6AA44 46160502 */ mul.s $f20, $f0, $f22 + +/* 010A0 80B6AA40 C42C30B0 */ lwc1 $f12, %lo(D_80B830B0)($at) +/* 010A4 80B6AA44 46160502 */ mul.s $f20, $f0, $f22 /* 010A8 80B6AA48 E614000C */ swc1 $f20, 0x000C($s0) ## 80B830C4 /* 010AC 80B6AA4C E6140018 */ swc1 $f20, 0x0018($s0) ## 80B830D0 .L80B6AA50: @@ -359,82 +359,82 @@ glabel Fishing_Init /* 010BC 80B6AA5C 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 010C0 80B6AA60 E6000008 */ swc1 $f0, 0x0008($s0) ## 80B830C0 /* 010C4 80B6AA64 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 010C8 80B6AA68 E6000014 */ swc1 $f0, 0x0014($s0) ## 80B830CC -/* 010CC 80B6AA6C 4600028D */ trunc.w.s $f10, $f0 +/* 010CC 80B6AA6C 4600028D */ trunc.w.s $f10, $f0 /* 010D0 80B6AA70 A600003C */ sh $zero, 0x003C($s0) ## 80B830F4 /* 010D4 80B6AA74 A600003E */ sh $zero, 0x003E($s0) ## 80B830F6 /* 010D8 80B6AA78 A6000040 */ sh $zero, 0x0040($s0) ## 80B830F8 -/* 010DC 80B6AA7C 44095000 */ mfc1 $t1, $f10 +/* 010DC 80B6AA7C 44095000 */ mfc1 $t1, $f10 /* 010E0 80B6AA80 3C0A80B8 */ lui $t2, %hi(D_80B7E075) ## $t2 = 80B80000 /* 010E4 80B6AA84 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 010E8 80B6AA88 A6090002 */ sh $t1, 0x0002($s0) ## 80B830BA -/* 010EC 80B6AA8C 914AE075 */ lbu $t2, %lo(D_80B7E075)($t2) -/* 010F0 80B6AA90 1141000E */ beq $t2, $at, .L80B6AACC -/* 010F4 80B6AA94 2A21000F */ slti $at, $s1, 0x000F -/* 010F8 80B6AA98 14200002 */ bne $at, $zero, .L80B6AAA4 -/* 010FC 80B6AA9C 2A210014 */ slti $at, $s1, 0x0014 -/* 01100 80B6AAA0 14200009 */ bne $at, $zero, .L80B6AAC8 +/* 010EC 80B6AA8C 914AE075 */ lbu $t2, %lo(D_80B7E075)($t2) +/* 010F0 80B6AA90 1141000E */ beq $t2, $at, .L80B6AACC +/* 010F4 80B6AA94 2A21000F */ slti $at, $s1, 0x000F +/* 010F8 80B6AA98 14200002 */ bne $at, $zero, .L80B6AAA4 +/* 010FC 80B6AA9C 2A210014 */ slti $at, $s1, 0x0014 +/* 01100 80B6AAA0 14200009 */ bne $at, $zero, .L80B6AAC8 .L80B6AAA4: -/* 01104 80B6AAA4 2A210023 */ slti $at, $s1, 0x0023 -/* 01108 80B6AAA8 14200002 */ bne $at, $zero, .L80B6AAB4 -/* 0110C 80B6AAAC 2A210028 */ slti $at, $s1, 0x0028 -/* 01110 80B6AAB0 14200005 */ bne $at, $zero, .L80B6AAC8 +/* 01104 80B6AAA4 2A210023 */ slti $at, $s1, 0x0023 +/* 01108 80B6AAA8 14200002 */ bne $at, $zero, .L80B6AAB4 +/* 0110C 80B6AAAC 2A210028 */ slti $at, $s1, 0x0028 +/* 01110 80B6AAB0 14200005 */ bne $at, $zero, .L80B6AAC8 .L80B6AAB4: -/* 01114 80B6AAB4 2A210037 */ slti $at, $s1, 0x0037 -/* 01118 80B6AAB8 14200004 */ bne $at, $zero, .L80B6AACC -/* 0111C 80B6AABC 2A21003C */ slti $at, $s1, 0x003C -/* 01120 80B6AAC0 50200003 */ beql $at, $zero, .L80B6AAD0 +/* 01114 80B6AAB4 2A210037 */ slti $at, $s1, 0x0037 +/* 01118 80B6AAB8 14200004 */ bne $at, $zero, .L80B6AACC +/* 0111C 80B6AABC 2A21003C */ slti $at, $s1, 0x003C +/* 01120 80B6AAC0 50200003 */ beql $at, $zero, .L80B6AAD0 /* 01124 80B6AAC4 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 .L80B6AAC8: /* 01128 80B6AAC8 A2000000 */ sb $zero, 0x0000($s0) ## 80B830B8 .L80B6AACC: /* 0112C 80B6AACC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 .L80B6AAD0: -/* 01130 80B6AAD0 00118C00 */ sll $s1, $s1, 16 -/* 01134 80B6AAD4 00118C03 */ sra $s1, $s1, 16 -/* 01138 80B6AAD8 2A21003C */ slti $at, $s1, 0x003C -/* 0113C 80B6AADC 5420FFA7 */ bnel $at, $zero, .L80B6A97C -/* 01140 80B6AAE0 0011C0C0 */ sll $t8, $s1, 3 +/* 01130 80B6AAD0 00118C00 */ sll $s1, $s1, 16 +/* 01134 80B6AAD4 00118C03 */ sra $s1, $s1, 16 +/* 01138 80B6AAD8 2A21003C */ slti $at, $s1, 0x003C +/* 0113C 80B6AADC 5420FFA7 */ bnel $at, $zero, .L80B6A97C +/* 01140 80B6AAE0 0011C0C0 */ sll $t8, $s1, 3 /* 01144 80B6AAE4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01148 80B6AAE8 0C2DA88B */ jal func_80B6A22C +/* 01148 80B6AAE8 0C2DA88B */ jal func_80B6A22C /* 0114C 80B6AAEC 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 01150 80B6AAF0 3C014254 */ lui $at, 0x4254 ## $at = 42540000 /* 01154 80B6AAF4 44818000 */ mtc1 $at, $f16 ## $f16 = 53.00 /* 01158 80B6AAF8 3C01C188 */ lui $at, 0xC188 ## $at = C1880000 /* 0115C 80B6AAFC 44819000 */ mtc1 $at, $f18 ## $f18 = -17.00 /* 01160 80B6AB00 3C0180B8 */ lui $at, %hi(D_80B7B380) ## $at = 80B80000 -/* 01164 80B6AB04 C424B380 */ lwc1 $f4, %lo(D_80B7B380)($at) +/* 01164 80B6AB04 C424B380 */ lwc1 $f4, %lo(D_80B7B380)($at) /* 01168 80B6AB08 26641C24 */ addiu $a0, $s3, 0x1C24 ## $a0 = 00001C24 /* 0116C 80B6AB0C 240B0300 */ addiu $t3, $zero, 0x0300 ## $t3 = 00000300 -/* 01170 80B6AB10 AFAB0028 */ sw $t3, 0x0028($sp) -/* 01174 80B6AB14 AFA4005C */ sw $a0, 0x005C($sp) +/* 01170 80B6AB10 AFAB0028 */ sw $t3, 0x0028($sp) +/* 01174 80B6AB14 AFA4005C */ sw $a0, 0x005C($sp) /* 01178 80B6AB18 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 0117C 80B6AB1C 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 01180 80B6AB20 24070141 */ addiu $a3, $zero, 0x0141 ## $a3 = 00000141 -/* 01184 80B6AB24 AFA0001C */ sw $zero, 0x001C($sp) -/* 01188 80B6AB28 AFA00020 */ sw $zero, 0x0020($sp) -/* 0118C 80B6AB2C AFA00024 */ sw $zero, 0x0024($sp) -/* 01190 80B6AB30 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01194 80B6AB34 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 01184 80B6AB24 AFA0001C */ sw $zero, 0x001C($sp) +/* 01188 80B6AB28 AFA00020 */ sw $zero, 0x0020($sp) +/* 0118C 80B6AB2C AFA00024 */ sw $zero, 0x0024($sp) +/* 01190 80B6AB30 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01194 80B6AB34 E7B20014 */ swc1 $f18, 0x0014($sp) /* 01198 80B6AB38 0C00C916 */ jal Actor_SpawnAttached - -/* 0119C 80B6AB3C E7A40018 */ swc1 $f4, 0x0018($sp) + +/* 0119C 80B6AB3C E7A40018 */ swc1 $f4, 0x0018($sp) /* 011A0 80B6AB40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 011A4 80B6AB44 8FB2005C */ lw $s2, 0x005C($sp) +/* 011A4 80B6AB44 8FB2005C */ lw $s2, 0x005C($sp) /* 011A8 80B6AB48 240C00C8 */ addiu $t4, $zero, 0x00C8 ## $t4 = 000000C8 -/* 011AC 80B6AB4C 44070000 */ mfc1 $a3, $f0 -/* 011B0 80B6AB50 AFAC0024 */ sw $t4, 0x0024($sp) +/* 011AC 80B6AB4C 44070000 */ mfc1 $a3, $f0 +/* 011B0 80B6AB50 AFAC0024 */ sw $t4, 0x0024($sp) /* 011B4 80B6AB54 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 011B8 80B6AB58 240600FE */ addiu $a2, $zero, 0x00FE ## $a2 = 000000FE -/* 011BC 80B6AB5C AFA00018 */ sw $zero, 0x0018($sp) -/* 011C0 80B6AB60 AFA0001C */ sw $zero, 0x001C($sp) -/* 011C4 80B6AB64 AFA00020 */ sw $zero, 0x0020($sp) +/* 011BC 80B6AB5C AFA00018 */ sw $zero, 0x0018($sp) +/* 011C0 80B6AB60 AFA0001C */ sw $zero, 0x001C($sp) +/* 011C4 80B6AB64 AFA00020 */ sw $zero, 0x0020($sp) /* 011C8 80B6AB68 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 011CC 80B6AB6C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 011CC 80B6AB6C E7A00010 */ swc1 $f0, 0x0010($sp) /* 011D0 80B6AB70 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 011D4 80B6AB74 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 011D4 80B6AB74 E7A00014 */ swc1 $f0, 0x0014($sp) /* 011D8 80B6AB78 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 011DC 80B6AB7C 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 /* 011E0 80B6AB80 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -442,76 +442,76 @@ glabel Fishing_Init /* 011E8 80B6AB88 85AE09D6 */ lh $t6, 0x09D6($t5) ## 801609D6 /* 011EC 80B6AB8C 3C1980B8 */ lui $t9, %hi(D_80B7E075) ## $t9 = 80B80000 /* 011F0 80B6AB90 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 011F4 80B6AB94 11C10007 */ beq $t6, $at, .L80B6ABB4 +/* 011F4 80B6AB94 11C10007 */ beq $t6, $at, .L80B6ABB4 /* 011F8 80B6AB98 00000000 */ nop -/* 011FC 80B6AB9C 91EFE07D */ lbu $t7, %lo(D_80B7E07D)($t7) +/* 011FC 80B6AB9C 91EFE07D */ lbu $t7, %lo(D_80B7E07D)($t7) /* 01200 80B6ABA0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 01204 80B6ABA4 2402000F */ addiu $v0, $zero, 0x000F ## $v0 = 0000000F /* 01208 80B6ABA8 31F80003 */ andi $t8, $t7, 0x0003 ## $t8 = 00000000 -/* 0120C 80B6ABAC 17010009 */ bne $t8, $at, .L80B6ABD4 +/* 0120C 80B6ABAC 17010009 */ bne $t8, $at, .L80B6ABD4 /* 01210 80B6ABB0 00000000 */ nop .L80B6ABB4: -/* 01214 80B6ABB4 9339E075 */ lbu $t9, %lo(D_80B7E075)($t9) +/* 01214 80B6ABB4 9339E075 */ lbu $t9, %lo(D_80B7E075)($t9) /* 01218 80B6ABB8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0121C 80B6ABBC 13210003 */ beq $t9, $at, .L80B6ABCC +/* 0121C 80B6ABBC 13210003 */ beq $t9, $at, .L80B6ABCC /* 01220 80B6ABC0 00000000 */ nop -/* 01224 80B6ABC4 10000003 */ beq $zero, $zero, .L80B6ABD4 +/* 01224 80B6ABC4 10000003 */ beq $zero, $zero, .L80B6ABD4 /* 01228 80B6ABC8 24020010 */ addiu $v0, $zero, 0x0010 ## $v0 = 00000010 .L80B6ABCC: -/* 0122C 80B6ABCC 10000001 */ beq $zero, $zero, .L80B6ABD4 +/* 0122C 80B6ABCC 10000001 */ beq $zero, $zero, .L80B6ABD4 /* 01230 80B6ABD0 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 .L80B6ABD4: -/* 01234 80B6ABD4 184000B0 */ blez $v0, .L80B6AE98 +/* 01234 80B6ABD4 184000B0 */ blez $v0, .L80B6AE98 /* 01238 80B6ABD8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000011 /* 0123C 80B6ABDC 3C014780 */ lui $at, 0x4780 ## $at = 47800000 /* 01240 80B6ABE0 4481A000 */ mtc1 $at, $f20 ## $f20 = 65536.00 /* 01244 80B6ABE4 00000000 */ nop .L80B6ABE8: /* 01248 80B6ABE8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0124C 80B6ABEC 4600A306 */ mov.s $f12, $f20 + +/* 0124C 80B6ABEC 4600A306 */ mov.s $f12, $f20 /* 01250 80B6ABF0 3C0980B8 */ lui $t1, %hi(D_80B7AD40) ## $t1 = 80B80000 /* 01254 80B6ABF4 2529AD40 */ addiu $t1, $t1, %lo(D_80B7AD40) ## $t1 = 80B7AD40 -/* 01258 80B6ABF8 00114100 */ sll $t0, $s1, 4 -/* 0125C 80B6ABFC 01091021 */ addu $v0, $t0, $t1 +/* 01258 80B6ABF8 00114100 */ sll $t0, $s1, 4 +/* 0125C 80B6ABFC 01091021 */ addu $v0, $t0, $t1 /* 01260 80B6AC00 844A0002 */ lh $t2, 0x0002($v0) ## 00000002 /* 01264 80B6AC04 844B0004 */ lh $t3, 0x0004($v0) ## 00000004 /* 01268 80B6AC08 844C0006 */ lh $t4, 0x0006($v0) ## 00000006 /* 0126C 80B6AC0C 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 /* 01270 80B6AC10 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 /* 01274 80B6AC14 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 -/* 01278 80B6AC18 468031A0 */ cvt.s.w $f6, $f6 +/* 01278 80B6AC18 468031A0 */ cvt.s.w $f6, $f6 /* 0127C 80B6AC1C 262F0064 */ addiu $t7, $s1, 0x0064 ## $t7 = 00000064 -/* 01280 80B6AC20 AFAF0024 */ sw $t7, 0x0024($sp) +/* 01280 80B6AC20 AFAF0024 */ sw $t7, 0x0024($sp) /* 01284 80B6AC24 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01288 80B6AC28 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 0128C 80B6AC2C 4600010D */ trunc.w.s $f4, $f0 -/* 01290 80B6AC30 44073000 */ mfc1 $a3, $f6 +/* 0128C 80B6AC2C 4600010D */ trunc.w.s $f4, $f0 +/* 01290 80B6AC30 44073000 */ mfc1 $a3, $f6 /* 01294 80B6AC34 240600FE */ addiu $a2, $zero, 0x00FE ## $a2 = 000000FE -/* 01298 80B6AC38 468042A0 */ cvt.s.w $f10, $f8 -/* 0129C 80B6AC3C 440E2000 */ mfc1 $t6, $f4 -/* 012A0 80B6AC40 AFA00018 */ sw $zero, 0x0018($sp) -/* 012A4 80B6AC44 AFA00020 */ sw $zero, 0x0020($sp) -/* 012A8 80B6AC48 AFAE001C */ sw $t6, 0x001C($sp) -/* 012AC 80B6AC4C 468084A0 */ cvt.s.w $f18, $f16 -/* 012B0 80B6AC50 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01298 80B6AC38 468042A0 */ cvt.s.w $f10, $f8 +/* 0129C 80B6AC3C 440E2000 */ mfc1 $t6, $f4 +/* 012A0 80B6AC40 AFA00018 */ sw $zero, 0x0018($sp) +/* 012A4 80B6AC44 AFA00020 */ sw $zero, 0x0020($sp) +/* 012A8 80B6AC48 AFAE001C */ sw $t6, 0x001C($sp) +/* 012AC 80B6AC4C 468084A0 */ cvt.s.w $f18, $f16 +/* 012B0 80B6AC50 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 012B4 80B6AC54 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 012B8 80B6AC58 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 012B8 80B6AC58 E7B20014 */ swc1 $f18, 0x0014($sp) /* 012BC 80B6AC5C 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 012C0 80B6AC60 00118C00 */ sll $s1, $s1, 16 -/* 012C4 80B6AC64 00118C03 */ sra $s1, $s1, 16 -/* 012C8 80B6AC68 0230082A */ slt $at, $s1, $s0 -/* 012CC 80B6AC6C 1420FFDE */ bne $at, $zero, .L80B6ABE8 +/* 012C0 80B6AC60 00118C00 */ sll $s1, $s1, 16 +/* 012C4 80B6AC64 00118C03 */ sra $s1, $s1, 16 +/* 012C8 80B6AC68 0230082A */ slt $at, $s1, $s0 +/* 012CC 80B6AC6C 1420FFDE */ bne $at, $zero, .L80B6ABE8 /* 012D0 80B6AC70 00000000 */ nop -/* 012D4 80B6AC74 10000089 */ beq $zero, $zero, .L80B6AE9C -/* 012D8 80B6AC78 8FBF0054 */ lw $ra, 0x0054($sp) +/* 012D4 80B6AC74 10000089 */ beq $zero, $zero, .L80B6AE9C +/* 012D8 80B6AC78 8FBF0054 */ lw $ra, 0x0054($sp) .L80B6AC7C: -/* 012DC 80B6AC7C 28410073 */ slti $at, $v0, 0x0073 -/* 012E0 80B6AC80 14200004 */ bne $at, $zero, .L80B6AC94 +/* 012DC 80B6AC7C 28410073 */ slti $at, $v0, 0x0073 +/* 012E0 80B6AC80 14200004 */ bne $at, $zero, .L80B6AC94 /* 012E4 80B6AC84 3C110600 */ lui $s1, 0x0600 ## $s1 = 06000000 /* 012E8 80B6AC88 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 -/* 012EC 80B6AC8C 14410012 */ bne $v0, $at, .L80B6ACD8 +/* 012EC 80B6AC8C 14410012 */ bne $v0, $at, .L80B6ACD8 /* 012F0 80B6AC90 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 .L80B6AC94: /* 012F4 80B6AC94 2631007C */ addiu $s1, $s1, 0x007C ## $s1 = 0600007C @@ -521,15 +521,15 @@ glabel Fishing_Init /* 01304 80B6ACA4 02002825 */ or $a1, $s0, $zero ## $a1 = 000001D8 /* 01308 80B6ACA8 02203825 */ or $a3, $s1, $zero ## $a3 = 0600007C /* 0130C 80B6ACAC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01310 80B6ACB0 AFA00010 */ sw $zero, 0x0010($sp) -/* 01314 80B6ACB4 AFA00014 */ sw $zero, 0x0014($sp) -/* 01318 80B6ACB8 0C0291BE */ jal func_800A46F8 -/* 0131C 80B6ACBC AFA00018 */ sw $zero, 0x0018($sp) +/* 01310 80B6ACB0 AFA00010 */ sw $zero, 0x0010($sp) +/* 01314 80B6ACB4 AFA00014 */ sw $zero, 0x0014($sp) +/* 01318 80B6ACB8 0C0291BE */ jal SkelAnime_InitSV +/* 0131C 80B6ACBC AFA00018 */ sw $zero, 0x0018($sp) /* 01320 80B6ACC0 02002025 */ or $a0, $s0, $zero ## $a0 = 000001D8 /* 01324 80B6ACC4 02202825 */ or $a1, $s1, $zero ## $a1 = 0600007C -/* 01328 80B6ACC8 0C0294D3 */ jal func_800A534C +/* 01328 80B6ACC8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0132C 80B6ACCC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01330 80B6ACD0 10000010 */ beq $zero, $zero, .L80B6AD14 +/* 01330 80B6ACD0 10000010 */ beq $zero, $zero, .L80B6AD14 /* 01334 80B6ACD4 00000000 */ nop .L80B6ACD8: /* 01338 80B6ACD8 3C110601 */ lui $s1, 0x0601 ## $s1 = 06010000 @@ -539,22 +539,22 @@ glabel Fishing_Init /* 01348 80B6ACE8 24C61058 */ addiu $a2, $a2, 0x1058 ## $a2 = 06011058 /* 0134C 80B6ACEC 02002825 */ or $a1, $s0, $zero ## $a1 = 000001D8 /* 01350 80B6ACF0 02203825 */ or $a3, $s1, $zero ## $a3 = 0600CFE0 -/* 01354 80B6ACF4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01358 80B6ACF8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0135C 80B6ACFC 0C0291BE */ jal func_800A46F8 -/* 01360 80B6AD00 AFA00018 */ sw $zero, 0x0018($sp) +/* 01354 80B6ACF4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01358 80B6ACF8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0135C 80B6ACFC 0C0291BE */ jal SkelAnime_InitSV +/* 01360 80B6AD00 AFA00018 */ sw $zero, 0x0018($sp) /* 01364 80B6AD04 02002025 */ or $a0, $s0, $zero ## $a0 = 000001D8 /* 01368 80B6AD08 02202825 */ or $a1, $s1, $zero ## $a1 = 0600CFE0 -/* 0136C 80B6AD0C 0C0294D3 */ jal func_800A534C +/* 0136C 80B6AD0C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 01370 80B6AD10 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L80B6AD14: /* 01374 80B6AD14 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 01378 80B6AD18 02002025 */ or $a0, $s0, $zero ## $a0 = 000001D8 /* 0137C 80B6AD1C 8658001C */ lh $t8, 0x001C($s2) ## 0000001C /* 01380 80B6AD20 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 /* 01384 80B6AD24 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A -/* 01388 80B6AD28 17010012 */ bne $t8, $at, .L80B6AD74 +/* 01388 80B6AD28 17010012 */ bne $t8, $at, .L80B6AD74 /* 0138C 80B6AD2C 3C0C80B8 */ lui $t4, %hi(D_80B7A700) ## $t4 = 80B80000 /* 01390 80B6AD30 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 /* 01394 80B6AD34 A6590158 */ sh $t9, 0x0158($s2) ## 00000158 @@ -562,7 +562,7 @@ glabel Fishing_Init /* 0139C 80B6AD3C 26651C24 */ addiu $a1, $s3, 0x1C24 ## $a1 = 00001C24 /* 013A0 80B6AD40 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 013A4 80B6AD44 0C00CDD2 */ jal Actor_ChangeType - + /* 013A8 80B6AD48 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 /* 013AC 80B6AD4C 8E480004 */ lw $t0, 0x0004($s2) ## 00000004 /* 013B0 80B6AD50 A240001F */ sb $zero, 0x001F($s2) ## 0000001F @@ -571,100 +571,100 @@ glabel Fishing_Init /* 013BC 80B6AD5C AE490004 */ sw $t1, 0x0004($s2) ## 00000004 /* 013C0 80B6AD60 266507A8 */ addiu $a1, $s3, 0x07A8 ## $a1 = 000007A8 /* 013C4 80B6AD64 0C01E9D9 */ jal Lights_Insert - + /* 013C8 80B6AD68 26460220 */ addiu $a2, $s2, 0x0220 ## $a2 = 00000220 -/* 013CC 80B6AD6C 1000004A */ beq $zero, $zero, .L80B6AE98 +/* 013CC 80B6AD6C 1000004A */ beq $zero, $zero, .L80B6AE98 /* 013D0 80B6AD70 AE42021C */ sw $v0, 0x021C($s2) ## 0000021C .L80B6AD74: /* 013D4 80B6AD74 864A001C */ lh $t2, 0x001C($s2) ## 0000001C /* 013D8 80B6AD78 864D001C */ lh $t5, 0x001C($s2) ## 0000001C /* 013DC 80B6AD7C A6420158 */ sh $v0, 0x0158($s2) ## 00000158 -/* 013E0 80B6AD80 000A5900 */ sll $t3, $t2, 4 +/* 013E0 80B6AD80 000A5900 */ sll $t3, $t2, 4 /* 013E4 80B6AD84 A642015A */ sh $v0, 0x015A($s2) ## 0000015A -/* 013E8 80B6AD88 018B6021 */ addu $t4, $t4, $t3 -/* 013EC 80B6AD8C 918CA700 */ lbu $t4, %lo(D_80B7A700)($t4) +/* 013E8 80B6AD88 018B6021 */ addu $t4, $t4, $t3 +/* 013EC 80B6AD8C 918CA700 */ lbu $t4, %lo(D_80B7A700)($t4) /* 013F0 80B6AD90 3C0180B8 */ lui $at, %hi(D_80B7A70C) ## $at = 80B80000 -/* 013F4 80B6AD94 000D7100 */ sll $t6, $t5, 4 +/* 013F4 80B6AD94 000D7100 */ sll $t6, $t5, 4 /* 013F8 80B6AD98 864F001C */ lh $t7, 0x001C($s2) ## 0000001C -/* 013FC 80B6AD9C 002E0821 */ addu $at, $at, $t6 +/* 013FC 80B6AD9C 002E0821 */ addu $at, $at, $t6 /* 01400 80B6ADA0 A24C0150 */ sb $t4, 0x0150($s2) ## 00000150 -/* 01404 80B6ADA4 C426A70C */ lwc1 $f6, %lo(D_80B7A70C)($at) +/* 01404 80B6ADA4 C426A70C */ lwc1 $f6, %lo(D_80B7A70C)($at) /* 01408 80B6ADA8 3C1980B8 */ lui $t9, %hi(D_80B7A708) ## $t9 = 80B80000 -/* 0140C 80B6ADAC 000FC100 */ sll $t8, $t7, 4 -/* 01410 80B6ADB0 0338C821 */ addu $t9, $t9, $t8 +/* 0140C 80B6ADAC 000FC100 */ sll $t8, $t7, 4 +/* 01410 80B6ADB0 0338C821 */ addu $t9, $t9, $t8 /* 01414 80B6ADB4 E64601A8 */ swc1 $f6, 0x01A8($s2) ## 000001A8 -/* 01418 80B6ADB8 9339A708 */ lbu $t9, %lo(D_80B7A708)($t9) +/* 01418 80B6ADB8 9339A708 */ lbu $t9, %lo(D_80B7A708)($t9) /* 0141C 80B6ADBC 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01420 80B6ADC0 44994000 */ mtc1 $t9, $f8 ## $f8 = -0.00 -/* 01424 80B6ADC4 07210004 */ bgez $t9, .L80B6ADD8 -/* 01428 80B6ADC8 468042A0 */ cvt.s.w $f10, $f8 +/* 01424 80B6ADC4 07210004 */ bgez $t9, .L80B6ADD8 +/* 01428 80B6ADC8 468042A0 */ cvt.s.w $f10, $f8 /* 0142C 80B6ADCC 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 /* 01430 80B6ADD0 00000000 */ nop -/* 01434 80B6ADD4 46105280 */ add.s $f10, $f10, $f16 +/* 01434 80B6ADD4 46105280 */ add.s $f10, $f10, $f16 .L80B6ADD8: /* 01438 80B6ADD8 E64A01AC */ swc1 $f10, 0x01AC($s2) ## 000001AC /* 0143C 80B6ADDC 3C0180B8 */ lui $at, %hi(D_80B7B384) ## $at = 80B80000 /* 01440 80B6ADE0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01444 80B6ADE4 C42CB384 */ lwc1 $f12, %lo(D_80B7B384)($at) + +/* 01444 80B6ADE4 C42CB384 */ lwc1 $f12, %lo(D_80B7B384)($at) /* 01448 80B6ADE8 C65201AC */ lwc1 $f18, 0x01AC($s2) ## 000001AC /* 0144C 80B6ADEC 3C014282 */ lui $at, 0x4282 ## $at = 42820000 /* 01450 80B6ADF0 44814000 */ mtc1 $at, $f8 ## $f8 = 65.00 -/* 01454 80B6ADF4 46009100 */ add.s $f4, $f18, $f0 +/* 01454 80B6ADF4 46009100 */ add.s $f4, $f18, $f0 /* 01458 80B6ADF8 E64401AC */ swc1 $f4, 0x01AC($s2) ## 000001AC /* 0145C 80B6ADFC C64601AC */ lwc1 $f6, 0x01AC($s2) ## 000001AC -/* 01460 80B6AE00 4606403E */ c.le.s $f8, $f6 +/* 01460 80B6AE00 4606403E */ c.le.s $f8, $f6 /* 01464 80B6AE04 00000000 */ nop -/* 01468 80B6AE08 4500000F */ bc1f .L80B6AE48 +/* 01468 80B6AE08 4500000F */ bc1f .L80B6AE48 /* 0146C 80B6AE0C 00000000 */ nop /* 01470 80B6AE10 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 01474 80B6AE14 00000000 */ nop /* 01478 80B6AE18 3C0180B8 */ lui $at, %hi(D_80B7B388) ## $at = 80B80000 -/* 0147C 80B6AE1C C430B388 */ lwc1 $f16, %lo(D_80B7B388)($at) +/* 0147C 80B6AE1C C430B388 */ lwc1 $f16, %lo(D_80B7B388)($at) /* 01480 80B6AE20 3C0180B8 */ lui $at, %hi(D_80B7B38C) ## $at = 80B80000 -/* 01484 80B6AE24 4610003C */ c.lt.s $f0, $f16 +/* 01484 80B6AE24 4610003C */ c.lt.s $f0, $f16 /* 01488 80B6AE28 00000000 */ nop -/* 0148C 80B6AE2C 45000006 */ bc1f .L80B6AE48 +/* 0148C 80B6AE2C 45000006 */ bc1f .L80B6AE48 /* 01490 80B6AE30 00000000 */ nop /* 01494 80B6AE34 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01498 80B6AE38 C42CB38C */ lwc1 $f12, %lo(D_80B7B38C)($at) + +/* 01498 80B6AE38 C42CB38C */ lwc1 $f12, %lo(D_80B7B38C)($at) /* 0149C 80B6AE3C C64A01AC */ lwc1 $f10, 0x01AC($s2) ## 000001AC -/* 014A0 80B6AE40 46005480 */ add.s $f18, $f10, $f0 +/* 014A0 80B6AE40 46005480 */ add.s $f18, $f10, $f0 /* 014A4 80B6AE44 E65201AC */ swc1 $f18, 0x01AC($s2) ## 000001AC .L80B6AE48: /* 014A8 80B6AE48 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 014AC 80B6AE4C 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 /* 014B0 80B6AE50 3C0980B8 */ lui $t1, %hi(D_80B7E075) ## $t1 = 80B80000 /* 014B4 80B6AE54 850209E0 */ lh $v0, 0x09E0($t0) ## 801609E0 -/* 014B8 80B6AE58 10400007 */ beq $v0, $zero, .L80B6AE78 +/* 014B8 80B6AE58 10400007 */ beq $v0, $zero, .L80B6AE78 /* 014BC 80B6AE5C 00000000 */ nop /* 014C0 80B6AE60 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 014C4 80B6AE64 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 014C8 80B6AE68 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 -/* 014CC 80B6AE6C 468021A0 */ cvt.s.w $f6, $f4 -/* 014D0 80B6AE70 46083400 */ add.s $f16, $f6, $f8 +/* 014CC 80B6AE6C 468021A0 */ cvt.s.w $f6, $f4 +/* 014D0 80B6AE70 46083400 */ add.s $f16, $f6, $f8 /* 014D4 80B6AE74 E65001AC */ swc1 $f16, 0x01AC($s2) ## 000001AC .L80B6AE78: -/* 014D8 80B6AE78 9129E075 */ lbu $t1, %lo(D_80B7E075)($t1) +/* 014D8 80B6AE78 9129E075 */ lbu $t1, %lo(D_80B7E075)($t1) /* 014DC 80B6AE7C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 014E0 80B6AE80 15210005 */ bne $t1, $at, .L80B6AE98 +/* 014E0 80B6AE80 15210005 */ bne $t1, $at, .L80B6AE98 /* 014E4 80B6AE84 3C0180B8 */ lui $at, %hi(D_80B7B390) ## $at = 80B80000 -/* 014E8 80B6AE88 C432B390 */ lwc1 $f18, %lo(D_80B7B390)($at) +/* 014E8 80B6AE88 C432B390 */ lwc1 $f18, %lo(D_80B7B390)($at) /* 014EC 80B6AE8C C64A01AC */ lwc1 $f10, 0x01AC($s2) ## 000001AC -/* 014F0 80B6AE90 46125102 */ mul.s $f4, $f10, $f18 +/* 014F0 80B6AE90 46125102 */ mul.s $f4, $f10, $f18 /* 014F4 80B6AE94 E64401AC */ swc1 $f4, 0x01AC($s2) ## 000001AC .L80B6AE98: -/* 014F8 80B6AE98 8FBF0054 */ lw $ra, 0x0054($sp) +/* 014F8 80B6AE98 8FBF0054 */ lw $ra, 0x0054($sp) .L80B6AE9C: -/* 014FC 80B6AE9C D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 01500 80B6AEA0 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 01504 80B6AEA4 8FB00044 */ lw $s0, 0x0044($sp) -/* 01508 80B6AEA8 8FB10048 */ lw $s1, 0x0048($sp) -/* 0150C 80B6AEAC 8FB2004C */ lw $s2, 0x004C($sp) -/* 01510 80B6AEB0 8FB30050 */ lw $s3, 0x0050($sp) -/* 01514 80B6AEB4 03E00008 */ jr $ra +/* 014FC 80B6AE9C D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 01500 80B6AEA0 D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 01504 80B6AEA4 8FB00044 */ lw $s0, 0x0044($sp) +/* 01508 80B6AEA8 8FB10048 */ lw $s1, 0x0048($sp) +/* 0150C 80B6AEAC 8FB2004C */ lw $s2, 0x004C($sp) +/* 01510 80B6AEB0 8FB30050 */ lw $s3, 0x0050($sp) +/* 01514 80B6AEB4 03E00008 */ jr $ra /* 01518 80B6AEB8 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s index eaf33fed11..695aa5c295 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s @@ -3,11 +3,11 @@ glabel Fishing_Update /* 07C58 80B715F8 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 07C5C 80B715FC 3C01442F */ lui $at, 0x442F ## $at = 442F0000 /* 07C60 80B71600 44812000 */ mtc1 $at, $f4 ## $f4 = 700.00 -/* 07C64 80B71604 AFBF0034 */ sw $ra, 0x0034($sp) -/* 07C68 80B71608 AFB10030 */ sw $s1, 0x0030($sp) -/* 07C6C 80B7160C AFB0002C */ sw $s0, 0x002C($sp) -/* 07C70 80B71610 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 07C74 80B71614 A7AE0134 */ sh $t6, 0x0134($sp) +/* 07C64 80B71604 AFBF0034 */ sw $ra, 0x0034($sp) +/* 07C68 80B71608 AFB10030 */ sw $s1, 0x0030($sp) +/* 07C6C 80B7160C AFB0002C */ sw $s0, 0x002C($sp) +/* 07C70 80B71610 F7B40020 */ sdc1 $f20, 0x0020($sp) +/* 07C74 80B71614 A7AE0134 */ sh $t6, 0x0134($sp) /* 07C78 80B71618 908F0150 */ lbu $t7, 0x0150($a0) ## 00000150 /* 07C7C 80B7161C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 07C80 80B71620 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 @@ -15,60 +15,60 @@ glabel Fishing_Update /* 07C88 80B71628 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 07C8C 80B7162C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 07C90 80B71630 E48400F4 */ swc1 $f4, 0x00F4($a0) ## 000000F4 -/* 07C94 80B71634 15E0000A */ bne $t7, $zero, .L80B71660 +/* 07C94 80B71634 15E0000A */ bne $t7, $zero, .L80B71660 /* 07C98 80B71638 E48600F8 */ swc1 $f6, 0x00F8($a0) ## 000000F8 /* 07C9C 80B7163C 3C0180B8 */ lui $at, %hi(D_80B7B564) ## $at = 80B80000 -/* 07CA0 80B71640 C42AB564 */ lwc1 $f10, %lo(D_80B7B564)($at) +/* 07CA0 80B71640 C42AB564 */ lwc1 $f10, %lo(D_80B7B564)($at) /* 07CA4 80B71644 C5080068 */ lwc1 $f8, 0x0068($t0) ## 00000068 /* 07CA8 80B71648 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 07CAC 80B7164C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 -/* 07CB0 80B71650 460A4102 */ mul.s $f4, $f8, $f10 -/* 07CB4 80B71654 46062200 */ add.s $f8, $f4, $f6 -/* 07CB8 80B71658 10000009 */ beq $zero, $zero, .L80B71680 -/* 07CBC 80B7165C E7A80118 */ swc1 $f8, 0x0118($sp) +/* 07CB0 80B71650 460A4102 */ mul.s $f4, $f8, $f10 +/* 07CB4 80B71654 46062200 */ add.s $f8, $f4, $f6 +/* 07CB8 80B71658 10000009 */ beq $zero, $zero, .L80B71680 +/* 07CBC 80B7165C E7A80118 */ swc1 $f8, 0x0118($sp) .L80B71660: /* 07CC0 80B71660 3C0180B8 */ lui $at, %hi(D_80B7B568) ## $at = 80B80000 -/* 07CC4 80B71664 C424B568 */ lwc1 $f4, %lo(D_80B7B568)($at) +/* 07CC4 80B71664 C424B568 */ lwc1 $f4, %lo(D_80B7B568)($at) /* 07CC8 80B71668 C50A0068 */ lwc1 $f10, 0x0068($t0) ## 00000068 /* 07CCC 80B7166C 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 07CD0 80B71670 44814000 */ mtc1 $at, $f8 ## $f8 = 0.25 -/* 07CD4 80B71674 46045182 */ mul.s $f6, $f10, $f4 -/* 07CD8 80B71678 46083280 */ add.s $f10, $f6, $f8 -/* 07CDC 80B7167C E7AA0118 */ swc1 $f10, 0x0118($sp) +/* 07CD4 80B71674 46045182 */ mul.s $f6, $f10, $f4 +/* 07CD8 80B71678 46083280 */ add.s $f10, $f6, $f8 +/* 07CDC 80B7167C E7AA0118 */ swc1 $f10, 0x0118($sp) .L80B71680: /* 07CE0 80B71680 3C1880B8 */ lui $t8, %hi(D_80B7E0B0) ## $t8 = 80B80000 -/* 07CE4 80B71684 8718E0B0 */ lh $t8, %lo(D_80B7E0B0)($t8) -/* 07CE8 80B71688 1700000E */ bne $t8, $zero, .L80B716C4 +/* 07CE4 80B71684 8718E0B0 */ lh $t8, %lo(D_80B7E0B0)($t8) +/* 07CE8 80B71688 1700000E */ bne $t8, $zero, .L80B716C4 /* 07CEC 80B7168C 3C1980B8 */ lui $t9, %hi(D_80B7FEC4) ## $t9 = 80B80000 -/* 07CF0 80B71690 8739FEC4 */ lh $t9, %lo(D_80B7FEC4)($t9) -/* 07CF4 80B71694 1720000B */ bne $t9, $zero, .L80B716C4 +/* 07CF0 80B71690 8739FEC4 */ lh $t9, %lo(D_80B7FEC4)($t9) +/* 07CF4 80B71694 1720000B */ bne $t9, $zero, .L80B716C4 /* 07CF8 80B71698 3C0180B8 */ lui $at, %hi(D_80B7B56C) ## $at = 80B80000 -/* 07CFC 80B7169C C424B56C */ lwc1 $f4, %lo(D_80B7B56C)($at) +/* 07CFC 80B7169C C424B56C */ lwc1 $f4, %lo(D_80B7B56C)($at) /* 07D00 80B716A0 C506002C */ lwc1 $f6, 0x002C($t0) ## 0000002C -/* 07D04 80B716A4 4606203C */ c.lt.s $f4, $f6 +/* 07D04 80B716A4 4606203C */ c.lt.s $f4, $f6 /* 07D08 80B716A8 00000000 */ nop -/* 07D0C 80B716AC 4502000B */ bc1fl .L80B716DC +/* 07D0C 80B716AC 4502000B */ bc1fl .L80B716DC /* 07D10 80B716B0 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 /* 07D14 80B716B4 86090158 */ lh $t1, 0x0158($s0) ## 00000158 /* 07D18 80B716B8 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 07D1C 80B716BC 51210007 */ beql $t1, $at, .L80B716DC +/* 07D1C 80B716BC 51210007 */ beql $t1, $at, .L80B716DC /* 07D20 80B716C0 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 .L80B716C4: /* 07D24 80B716C4 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 07D28 80B716C8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 07D2C 80B716CC 01415824 */ and $t3, $t2, $at -/* 07D30 80B716D0 10000025 */ beq $zero, $zero, .L80B71768 +/* 07D2C 80B716CC 01415824 */ and $t3, $t2, $at +/* 07D30 80B716D0 10000025 */ beq $zero, $zero, .L80B71768 /* 07D34 80B716D4 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 /* 07D38 80B716D8 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 .L80B716DC: /* 07D3C 80B716DC 3C0E80B8 */ lui $t6, %hi(D_80B7A694) ## $t6 = 80B80000 /* 07D40 80B716E0 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 /* 07D44 80B716E4 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 07D48 80B716E8 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) -/* 07D4C 80B716EC 11C00018 */ beq $t6, $zero, .L80B71750 +/* 07D48 80B716E8 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) +/* 07D4C 80B716EC 11C00018 */ beq $t6, $zero, .L80B71750 /* 07D50 80B716F0 3C0280B8 */ lui $v0, %hi(D_80B7E0B2) ## $v0 = 80B80000 -/* 07D54 80B716F4 8442E0B2 */ lh $v0, %lo(D_80B7E0B2)($v0) -/* 07D58 80B716F8 14400009 */ bne $v0, $zero, .L80B71720 +/* 07D54 80B716F4 8442E0B2 */ lh $v0, %lo(D_80B7E0B2)($v0) +/* 07D58 80B716F8 14400009 */ bne $v0, $zero, .L80B71720 /* 07D5C 80B716FC 3C0F80B8 */ lui $t7, %hi(D_80B7E0B8) ## $t7 = 80B80000 /* 07D60 80B71700 25EFE0B8 */ addiu $t7, $t7, %lo(D_80B7E0B8) ## $t7 = 80B7E0B8 /* 07D64 80B71704 8DF90000 */ lw $t9, 0x0000($t7) ## 80B7E0B8 @@ -76,21 +76,21 @@ glabel Fishing_Update /* 07D6C 80B7170C 8DF80004 */ lw $t8, 0x0004($t7) ## 80B7E0BC /* 07D70 80B71710 AE18003C */ sw $t8, 0x003C($s0) ## 0000003C /* 07D74 80B71714 8DF90008 */ lw $t9, 0x0008($t7) ## 80B7E0C0 -/* 07D78 80B71718 1000000D */ beq $zero, $zero, .L80B71750 +/* 07D78 80B71718 1000000D */ beq $zero, $zero, .L80B71750 /* 07D7C 80B7171C AE190040 */ sw $t9, 0x0040($s0) ## 00000040 .L80B71720: /* 07D80 80B71720 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 07D84 80B71724 5441000B */ bnel $v0, $at, .L80B71754 +/* 07D84 80B71724 5441000B */ bnel $v0, $at, .L80B71754 /* 07D88 80B71728 8E0C0024 */ lw $t4, 0x0024($s0) ## 00000024 /* 07D8C 80B7172C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 07D90 80B71730 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 07D94 80B71734 3C0180B8 */ lui $at, %hi(D_80B7A6CC) ## $at = 80B80000 -/* 07D98 80B71738 A029A6CC */ sb $t1, %lo(D_80B7A6CC)($at) +/* 07D98 80B71738 A029A6CC */ sb $t1, %lo(D_80B7A6CC)($at) /* 07D9C 80B7173C 3C0180B8 */ lui $at, %hi(D_80B7FED0) ## $at = 80B80000 -/* 07DA0 80B71740 E428FED0 */ swc1 $f8, %lo(D_80B7FED0)($at) +/* 07DA0 80B71740 E428FED0 */ swc1 $f8, %lo(D_80B7FED0)($at) /* 07DA4 80B71744 3C0180B8 */ lui $at, %hi(D_80B7E088) ## $at = 80B80000 /* 07DA8 80B71748 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 07DAC 80B7174C A02AE088 */ sb $t2, %lo(D_80B7E088)($at) +/* 07DAC 80B7174C A02AE088 */ sb $t2, %lo(D_80B7E088)($at) .L80B71750: /* 07DB0 80B71750 8E0C0024 */ lw $t4, 0x0024($s0) ## 00000024 .L80B71754: @@ -104,37 +104,37 @@ glabel Fishing_Update /* 07DCC 80B7176C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 07DD0 80B71770 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000002 /* 07DD4 80B71774 A60E015C */ sh $t6, 0x015C($s0) ## 0000015C -/* 07DD8 80B71778 00027840 */ sll $t7, $v0, 1 +/* 07DD8 80B71778 00027840 */ sll $t7, $v0, 1 .L80B7177C: -/* 07DDC 80B7177C 020F1821 */ addu $v1, $s0, $t7 +/* 07DDC 80B7177C 020F1821 */ addu $v1, $s0, $t7 /* 07DE0 80B71780 8464017A */ lh $a0, 0x017A($v1) ## 0000017A -/* 07DE4 80B71784 10800002 */ beq $a0, $zero, .L80B71790 +/* 07DE4 80B71784 10800002 */ beq $a0, $zero, .L80B71790 /* 07DE8 80B71788 2498FFFF */ addiu $t8, $a0, 0xFFFF ## $t8 = FFFFFFFF /* 07DEC 80B7178C A478017A */ sh $t8, 0x017A($v1) ## 0000017A .L80B71790: /* 07DF0 80B71790 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 07DF4 80B71794 00021400 */ sll $v0, $v0, 16 -/* 07DF8 80B71798 00021403 */ sra $v0, $v0, 16 -/* 07DFC 80B7179C 28410004 */ slti $at, $v0, 0x0004 -/* 07E00 80B717A0 5420FFF6 */ bnel $at, $zero, .L80B7177C -/* 07E04 80B717A4 00027840 */ sll $t7, $v0, 1 +/* 07DF4 80B71794 00021400 */ sll $v0, $v0, 16 +/* 07DF8 80B71798 00021403 */ sra $v0, $v0, 16 +/* 07DFC 80B7179C 28410004 */ slti $at, $v0, 0x0004 +/* 07E00 80B717A0 5420FFF6 */ bnel $at, $zero, .L80B7177C +/* 07E04 80B717A4 00027840 */ sll $t7, $v0, 1 /* 07E08 80B717A8 860201A4 */ lh $v0, 0x01A4($s0) ## 000001A4 -/* 07E0C 80B717AC 10400002 */ beq $v0, $zero, .L80B717B8 +/* 07E0C 80B717AC 10400002 */ beq $v0, $zero, .L80B717B8 /* 07E10 80B717B0 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = 00000000 /* 07E14 80B717B4 A61901A4 */ sh $t9, 0x01A4($s0) ## 000001A4 .L80B717B8: /* 07E18 80B717B8 860201A2 */ lh $v0, 0x01A2($s0) ## 000001A2 -/* 07E1C 80B717BC 10400002 */ beq $v0, $zero, .L80B717C8 +/* 07E1C 80B717BC 10400002 */ beq $v0, $zero, .L80B717C8 /* 07E20 80B717C0 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = 00000000 /* 07E24 80B717C4 A60901A2 */ sh $t1, 0x01A2($s0) ## 000001A2 .L80B717C8: /* 07E28 80B717C8 860201A0 */ lh $v0, 0x01A0($s0) ## 000001A0 -/* 07E2C 80B717CC 10400002 */ beq $v0, $zero, .L80B717D8 +/* 07E2C 80B717CC 10400002 */ beq $v0, $zero, .L80B717D8 /* 07E30 80B717D0 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = 00000000 /* 07E34 80B717D4 A60A01A0 */ sh $t2, 0x01A0($s0) ## 000001A0 .L80B717D8: /* 07E38 80B717D8 92020151 */ lbu $v0, 0x0151($s0) ## 00000151 -/* 07E3C 80B717DC 10400002 */ beq $v0, $zero, .L80B717E8 +/* 07E3C 80B717DC 10400002 */ beq $v0, $zero, .L80B717E8 /* 07E40 80B717E0 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = 00000000 /* 07E44 80B717E4 A20B0151 */ sb $t3, 0x0151($s0) ## 00000151 .L80B717E8: @@ -142,188 +142,188 @@ glabel Fishing_Update /* 07E4C 80B717EC 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 /* 07E50 80B717F0 8E050190 */ lw $a1, 0x0190($s0) ## 00000190 /* 07E54 80B717F4 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 -/* 07E58 80B717F8 4406A000 */ mfc1 $a2, $f20 +/* 07E58 80B717F8 4406A000 */ mfc1 $a2, $f20 /* 07E5C 80B717FC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 07E60 80B71800 AFA800E0 */ sw $t0, 0x00E0($sp) +/* 07E60 80B71800 AFA800E0 */ sw $t0, 0x00E0($sp) /* 07E64 80B71804 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07E68 80B71808 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 07E6C 80B7180C 860C0158 */ lh $t4, 0x0158($s0) ## 00000158 /* 07E70 80B71810 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 07E74 80B71814 15810008 */ bne $t4, $at, .L80B71838 +/* 07E74 80B71814 15810008 */ bne $t4, $at, .L80B71838 /* 07E78 80B71818 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 07E7C 80B7181C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 07E80 80B71820 2604019C */ addiu $a0, $s0, 0x019C ## $a0 = 0000019C /* 07E84 80B71824 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 /* 07E88 80B71828 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07E8C 80B7182C 3C074348 */ lui $a3, 0x4348 ## $a3 = 43480000 -/* 07E90 80B71830 10000027 */ beq $zero, $zero, .L80B718D0 +/* 07E90 80B71830 10000027 */ beq $zero, $zero, .L80B718D0 /* 07E94 80B71834 26040170 */ addiu $a0, $s0, 0x0170 ## $a0 = 00000170 .L80B71838: /* 07E98 80B71838 8E2D07C0 */ lw $t5, 0x07C0($s1) ## 000007C0 /* 07E9C 80B7183C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 07EA0 80B71840 4600A006 */ mov.s $f0, $f20 +/* 07EA0 80B71840 4600A006 */ mov.s $f0, $f20 /* 07EA4 80B71844 8DAE0028 */ lw $t6, 0x0028($t5) ## 00000028 -/* 07EA8 80B71848 4600A086 */ mov.s $f2, $f20 +/* 07EA8 80B71848 4600A086 */ mov.s $f2, $f20 /* 07EAC 80B7184C 85CF0002 */ lh $t7, 0x0002($t6) ## 00000002 /* 07EB0 80B71850 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 /* 07EB4 80B71854 00000000 */ nop -/* 07EB8 80B71858 46805120 */ cvt.s.w $f4, $f10 -/* 07EBC 80B7185C 4606203C */ c.lt.s $f4, $f6 +/* 07EB8 80B71858 46805120 */ cvt.s.w $f4, $f10 +/* 07EBC 80B7185C 4606203C */ c.lt.s $f4, $f6 /* 07EC0 80B71860 00000000 */ nop -/* 07EC4 80B71864 4500000E */ bc1f .L80B718A0 +/* 07EC4 80B71864 4500000E */ bc1f .L80B718A0 /* 07EC8 80B71868 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 /* 07ECC 80B7186C 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 /* 07ED0 80B71870 3C0180B8 */ lui $at, %hi(D_80B7B570) ## $at = 80B80000 -/* 07ED4 80B71874 C424B570 */ lwc1 $f4, %lo(D_80B7B570)($at) +/* 07ED4 80B71874 C424B570 */ lwc1 $f4, %lo(D_80B7B570)($at) /* 07ED8 80B71878 87190A54 */ lh $t9, 0x0A54($t8) ## 80160A54 /* 07EDC 80B7187C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 07EE0 80B71880 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 /* 07EE4 80B71884 00000000 */ nop -/* 07EE8 80B71888 468042A0 */ cvt.s.w $f10, $f8 +/* 07EE8 80B71888 468042A0 */ cvt.s.w $f10, $f8 /* 07EEC 80B7188C 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 /* 07EF0 80B71890 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 07EF4 80B71894 44811000 */ mtc1 $at, $f2 ## $f2 = 3.00 -/* 07EF8 80B71898 46045182 */ mul.s $f6, $f10, $f4 -/* 07EFC 80B7189C 46083000 */ add.s $f0, $f6, $f8 +/* 07EF8 80B71898 46045182 */ mul.s $f6, $f10, $f4 +/* 07EFC 80B7189C 46083000 */ add.s $f0, $f6, $f8 .L80B718A0: /* 07F00 80B718A0 C60A0194 */ lwc1 $f10, 0x0194($s0) ## 00000194 /* 07F04 80B718A4 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 07F08 80B718A8 44813000 */ mtc1 $at, $f6 ## $f6 = 500.00 -/* 07F0C 80B718AC 46005102 */ mul.s $f4, $f10, $f0 -/* 07F10 80B718B0 4406A000 */ mfc1 $a2, $f20 +/* 07F0C 80B718AC 46005102 */ mul.s $f4, $f10, $f0 +/* 07F10 80B718B0 4406A000 */ mfc1 $a2, $f20 /* 07F14 80B718B4 2604019C */ addiu $a0, $s0, 0x019C ## $a0 = 0000019C -/* 07F18 80B718B8 46023202 */ mul.s $f8, $f6, $f2 -/* 07F1C 80B718BC 44052000 */ mfc1 $a1, $f4 -/* 07F20 80B718C0 44074000 */ mfc1 $a3, $f8 +/* 07F18 80B718B8 46023202 */ mul.s $f8, $f6, $f2 +/* 07F1C 80B718BC 44052000 */ mfc1 $a1, $f4 +/* 07F20 80B718C0 44074000 */ mfc1 $a3, $f8 /* 07F24 80B718C4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07F28 80B718C8 00000000 */ nop /* 07F2C 80B718CC 26040170 */ addiu $a0, $s0, 0x0170 ## $a0 = 00000170 .L80B718D0: -/* 07F30 80B718D0 AFA40040 */ sw $a0, 0x0040($sp) +/* 07F30 80B718D0 AFA40040 */ sw $a0, 0x0040($sp) /* 07F34 80B718D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 07F38 80B718D8 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 07F3C 80B718DC 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 07F40 80B718E0 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 07F44 80B718E4 92090150 */ lbu $t1, 0x0150($s0) ## 00000150 -/* 07F48 80B718E8 1520002A */ bne $t1, $zero, .L80B71994 +/* 07F48 80B718E8 1520002A */ bne $t1, $zero, .L80B71994 /* 07F4C 80B718EC 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 07F50 80B718F0 44812000 */ mtc1 $at, $f4 ## $f4 = 15.00 /* 07F54 80B718F4 C60A01AC */ lwc1 $f10, 0x01AC($s0) ## 000001AC /* 07F58 80B718F8 3C0180B8 */ lui $at, %hi(D_80B7B574) ## $at = 80B80000 -/* 07F5C 80B718FC C428B574 */ lwc1 $f8, %lo(D_80B7B574)($at) -/* 07F60 80B71900 46045182 */ mul.s $f6, $f10, $f4 +/* 07F5C 80B718FC C428B574 */ lwc1 $f8, %lo(D_80B7B574)($at) +/* 07F60 80B71900 46045182 */ mul.s $f6, $f10, $f4 /* 07F64 80B71904 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07F68 80B71908 46083282 */ mul.s $f10, $f6, $f8 -/* 07F6C 80B7190C 44055000 */ mfc1 $a1, $f10 +/* 07F68 80B71908 46083282 */ mul.s $f10, $f6, $f8 +/* 07F6C 80B7190C 44055000 */ mfc1 $a1, $f10 /* 07F70 80B71910 0C00B58B */ jal Actor_SetScale - + /* 07F74 80B71914 00000000 */ nop /* 07F78 80B71918 C604018C */ lwc1 $f4, 0x018C($s0) ## 0000018C /* 07F7C 80B7191C C6060198 */ lwc1 $f6, 0x0198($s0) ## 00000198 -/* 07F80 80B71920 46062200 */ add.s $f8, $f4, $f6 +/* 07F80 80B71920 46062200 */ add.s $f8, $f4, $f6 /* 07F84 80B71924 E608018C */ swc1 $f8, 0x018C($s0) ## 0000018C /* 07F88 80B71928 0C041184 */ jal cosf - + /* 07F8C 80B7192C C60C018C */ lwc1 $f12, 0x018C($s0) ## 0000018C /* 07F90 80B71930 C60A019C */ lwc1 $f10, 0x019C($s0) ## 0000019C /* 07F94 80B71934 860A016E */ lh $t2, 0x016E($s0) ## 0000016E /* 07F98 80B71938 3C0180B8 */ lui $at, %hi(D_80B7B578) ## $at = 80B80000 -/* 07F9C 80B7193C 460A0102 */ mul.s $f4, $f0, $f10 +/* 07F9C 80B7193C 460A0102 */ mul.s $f4, $f0, $f10 /* 07FA0 80B71940 C608018C */ lwc1 $f8, 0x018C($s0) ## 0000018C -/* 07FA4 80B71944 4600218D */ trunc.w.s $f6, $f4 -/* 07FA8 80B71948 440E3000 */ mfc1 $t6, $f6 +/* 07FA4 80B71944 4600218D */ trunc.w.s $f6, $f4 +/* 07FA8 80B71948 440E3000 */ mfc1 $t6, $f6 /* 07FAC 80B7194C 00000000 */ nop -/* 07FB0 80B71950 014E7821 */ addu $t7, $t2, $t6 +/* 07FB0 80B71950 014E7821 */ addu $t7, $t2, $t6 /* 07FB4 80B71954 A60F016C */ sh $t7, 0x016C($s0) ## 0000016C -/* 07FB8 80B71958 C42AB578 */ lwc1 $f10, %lo(D_80B7B578)($at) +/* 07FB8 80B71958 C42AB578 */ lwc1 $f10, %lo(D_80B7B578)($at) /* 07FBC 80B7195C 0C041184 */ jal cosf - -/* 07FC0 80B71960 460A4300 */ add.s $f12, $f8, $f10 + +/* 07FC0 80B71960 460A4300 */ add.s $f12, $f8, $f10 /* 07FC4 80B71964 C604019C */ lwc1 $f4, 0x019C($s0) ## 0000019C /* 07FC8 80B71968 3C0180B8 */ lui $at, %hi(D_80B7B57C) ## $at = 80B80000 -/* 07FCC 80B7196C C428B57C */ lwc1 $f8, %lo(D_80B7B57C)($at) -/* 07FD0 80B71970 46040182 */ mul.s $f6, $f0, $f4 +/* 07FCC 80B7196C C428B57C */ lwc1 $f8, %lo(D_80B7B57C)($at) +/* 07FD0 80B71970 46040182 */ mul.s $f6, $f0, $f4 /* 07FD4 80B71974 860C016E */ lh $t4, 0x016E($s0) ## 0000016E -/* 07FD8 80B71978 46083282 */ mul.s $f10, $f6, $f8 -/* 07FDC 80B7197C 4600510D */ trunc.w.s $f4, $f10 -/* 07FE0 80B71980 440B2000 */ mfc1 $t3, $f4 +/* 07FD8 80B71978 46083282 */ mul.s $f10, $f6, $f8 +/* 07FDC 80B7197C 4600510D */ trunc.w.s $f4, $f10 +/* 07FE0 80B71980 440B2000 */ mfc1 $t3, $f4 /* 07FE4 80B71984 00000000 */ nop -/* 07FE8 80B71988 018B6821 */ addu $t5, $t4, $t3 -/* 07FEC 80B7198C 10000043 */ beq $zero, $zero, .L80B71A9C +/* 07FE8 80B71988 018B6821 */ addu $t5, $t4, $t3 +/* 07FEC 80B7198C 10000043 */ beq $zero, $zero, .L80B71A9C /* 07FF0 80B71990 A60D0176 */ sh $t5, 0x0176($s0) ## 00000176 .L80B71994: /* 07FF4 80B71994 3C014282 */ lui $at, 0x4282 ## $at = 42820000 /* 07FF8 80B71998 44814000 */ mtc1 $at, $f8 ## $f8 = 65.00 /* 07FFC 80B7199C C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 08000 80B719A0 3C0180B8 */ lui $at, %hi(D_80B7B580) ## $at = 80B80000 -/* 08004 80B719A4 C424B580 */ lwc1 $f4, %lo(D_80B7B580)($at) -/* 08008 80B719A8 46083282 */ mul.s $f10, $f6, $f8 +/* 08004 80B719A4 C424B580 */ lwc1 $f4, %lo(D_80B7B580)($at) +/* 08008 80B719A8 46083282 */ mul.s $f10, $f6, $f8 /* 0800C 80B719AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08010 80B719B0 46045182 */ mul.s $f6, $f10, $f4 -/* 08014 80B719B4 44053000 */ mfc1 $a1, $f6 +/* 08010 80B719B0 46045182 */ mul.s $f6, $f10, $f4 +/* 08014 80B719B4 44053000 */ mfc1 $a1, $f6 /* 08018 80B719B8 0C00B58B */ jal Actor_SetScale - + /* 0801C 80B719BC 00000000 */ nop /* 08020 80B719C0 3C0180B8 */ lui $at, %hi(D_80B7B584) ## $at = 80B80000 -/* 08024 80B719C4 C42AB584 */ lwc1 $f10, %lo(D_80B7B584)($at) +/* 08024 80B719C4 C42AB584 */ lwc1 $f10, %lo(D_80B7B584)($at) /* 08028 80B719C8 C6080058 */ lwc1 $f8, 0x0058($s0) ## 00000058 /* 0802C 80B719CC 3C0180B8 */ lui $at, %hi(D_80B7B588) ## $at = 80B80000 /* 08030 80B719D0 C6040198 */ lwc1 $f4, 0x0198($s0) ## 00000198 -/* 08034 80B719D4 460A4002 */ mul.s $f0, $f8, $f10 +/* 08034 80B719D4 460A4002 */ mul.s $f0, $f8, $f10 /* 08038 80B719D8 C60A018C */ lwc1 $f10, 0x018C($s0) ## 0000018C /* 0803C 80B719DC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 08040 80B719E0 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 /* 08044 80B719E4 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 08048 80B719E8 C426B588 */ lwc1 $f6, %lo(D_80B7B588)($at) -/* 0804C 80B719EC 46062202 */ mul.s $f8, $f4, $f6 -/* 08050 80B719F0 46085100 */ add.s $f4, $f10, $f8 +/* 08048 80B719E8 C426B588 */ lwc1 $f6, %lo(D_80B7B588)($at) +/* 0804C 80B719EC 46062202 */ mul.s $f8, $f4, $f6 +/* 08050 80B719F0 46085100 */ add.s $f4, $f10, $f8 /* 08054 80B719F4 E604018C */ swc1 $f4, 0x018C($s0) ## 0000018C .L80B719F8: /* 08058 80B719F8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0805C 80B719FC 3C0180B8 */ lui $at, %hi(D_80B7B58C) ## $at = 80B80000 -/* 08060 80B71A00 C428B58C */ lwc1 $f8, %lo(D_80B7B58C)($at) -/* 08064 80B71A04 468032A0 */ cvt.s.w $f10, $f6 +/* 08060 80B71A00 C428B58C */ lwc1 $f8, %lo(D_80B7B58C)($at) +/* 08064 80B71A04 468032A0 */ cvt.s.w $f10, $f6 /* 08068 80B71A08 C606018C */ lwc1 $f6, 0x018C($s0) ## 0000018C -/* 0806C 80B71A0C A7A20136 */ sh $v0, 0x0136($sp) -/* 08070 80B71A10 46085102 */ mul.s $f4, $f10, $f8 +/* 0806C 80B71A0C A7A20136 */ sh $v0, 0x0136($sp) +/* 08070 80B71A10 46085102 */ mul.s $f4, $f10, $f8 /* 08074 80B71A14 0C041184 */ jal cosf - -/* 08078 80B71A18 46043300 */ add.s $f12, $f6, $f4 + +/* 08078 80B71A18 46043300 */ add.s $f12, $f6, $f4 /* 0807C 80B71A1C C60A019C */ lwc1 $f10, 0x019C($s0) ## 0000019C -/* 08080 80B71A20 87A20136 */ lh $v0, 0x0136($sp) +/* 08080 80B71A20 87A20136 */ lh $v0, 0x0136($sp) /* 08084 80B71A24 860A016E */ lh $t2, 0x016E($s0) ## 0000016E -/* 08088 80B71A28 460A0082 */ mul.s $f2, $f0, $f10 -/* 0808C 80B71A2C 00026040 */ sll $t4, $v0, 1 +/* 08088 80B71A28 460A0082 */ mul.s $f2, $f0, $f10 +/* 0808C 80B71A2C 00026040 */ sll $t4, $v0, 1 /* 08090 80B71A30 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 08094 80B71A34 00021400 */ sll $v0, $v0, 16 -/* 08098 80B71A38 00021403 */ sra $v0, $v0, 16 -/* 0809C 80B71A3C 28410003 */ slti $at, $v0, 0x0003 -/* 080A0 80B71A40 020C5821 */ addu $t3, $s0, $t4 -/* 080A4 80B71A44 46021200 */ add.s $f8, $f2, $f2 -/* 080A8 80B71A48 4600418D */ trunc.w.s $f6, $f8 -/* 080AC 80B71A4C 44193000 */ mfc1 $t9, $f6 +/* 08094 80B71A34 00021400 */ sll $v0, $v0, 16 +/* 08098 80B71A38 00021403 */ sra $v0, $v0, 16 +/* 0809C 80B71A3C 28410003 */ slti $at, $v0, 0x0003 +/* 080A0 80B71A40 020C5821 */ addu $t3, $s0, $t4 +/* 080A4 80B71A44 46021200 */ add.s $f8, $f2, $f2 +/* 080A8 80B71A48 4600418D */ trunc.w.s $f6, $f8 +/* 080AC 80B71A4C 44193000 */ mfc1 $t9, $f6 /* 080B0 80B71A50 00000000 */ nop -/* 080B4 80B71A54 01594821 */ addu $t1, $t2, $t9 -/* 080B8 80B71A58 1420FFE7 */ bne $at, $zero, .L80B719F8 +/* 080B4 80B71A54 01594821 */ addu $t1, $t2, $t9 +/* 080B8 80B71A58 1420FFE7 */ bne $at, $zero, .L80B719F8 /* 080BC 80B71A5C A56901CC */ sh $t1, 0x01CC($t3) ## 000001CC /* 080C0 80B71A60 3C0180B8 */ lui $at, %hi(D_80B7B590) ## $at = 80B80000 -/* 080C4 80B71A64 C42AB590 */ lwc1 $f10, %lo(D_80B7B590)($at) +/* 080C4 80B71A64 C42AB590 */ lwc1 $f10, %lo(D_80B7B590)($at) /* 080C8 80B71A68 C604018C */ lwc1 $f4, 0x018C($s0) ## 0000018C /* 080CC 80B71A6C 0C041184 */ jal cosf - -/* 080D0 80B71A70 460A2300 */ add.s $f12, $f4, $f10 + +/* 080D0 80B71A70 460A2300 */ add.s $f12, $f4, $f10 /* 080D4 80B71A74 C608019C */ lwc1 $f8, 0x019C($s0) ## 0000019C /* 080D8 80B71A78 3C0180B8 */ lui $at, %hi(D_80B7B594) ## $at = 80B80000 -/* 080DC 80B71A7C C424B594 */ lwc1 $f4, %lo(D_80B7B594)($at) -/* 080E0 80B71A80 46004082 */ mul.s $f2, $f8, $f0 -/* 080E4 80B71A84 46021180 */ add.s $f6, $f2, $f2 -/* 080E8 80B71A88 46043282 */ mul.s $f10, $f6, $f4 -/* 080EC 80B71A8C 4600520D */ trunc.w.s $f8, $f10 -/* 080F0 80B71A90 440E4000 */ mfc1 $t6, $f8 +/* 080DC 80B71A7C C424B594 */ lwc1 $f4, %lo(D_80B7B594)($at) +/* 080E0 80B71A80 46004082 */ mul.s $f2, $f8, $f0 +/* 080E4 80B71A84 46021180 */ add.s $f6, $f2, $f2 +/* 080E8 80B71A88 46043282 */ mul.s $f10, $f6, $f4 +/* 080EC 80B71A8C 4600520D */ trunc.w.s $f8, $f10 +/* 080F0 80B71A90 440E4000 */ mfc1 $t6, $f8 /* 080F4 80B71A94 00000000 */ nop /* 080F8 80B71A98 A60E016C */ sh $t6, 0x016C($s0) ## 0000016C .L80B71A9C: @@ -331,90 +331,90 @@ glabel Fishing_Update /* 08100 80B71AA0 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 08104 80B71AA4 C60A01B8 */ lwc1 $f10, 0x01B8($s0) ## 000001B8 /* 08108 80B71AA8 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 0810C 80B71AAC 46043381 */ sub.s $f14, $f6, $f4 -/* 08110 80B71AB0 46085181 */ sub.s $f6, $f10, $f8 -/* 08114 80B71AB4 E7A6012C */ swc1 $f6, 0x012C($sp) +/* 0810C 80B71AAC 46043381 */ sub.s $f14, $f6, $f4 +/* 08110 80B71AB0 46085181 */ sub.s $f6, $f10, $f8 +/* 08114 80B71AB4 E7A6012C */ swc1 $f6, 0x012C($sp) /* 08118 80B71AB8 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 0811C 80B71ABC C60401BC */ lwc1 $f4, 0x01BC($s0) ## 000001BC -/* 08120 80B71AC0 E7AE0130 */ swc1 $f14, 0x0130($sp) -/* 08124 80B71AC4 460A2301 */ sub.s $f12, $f4, $f10 +/* 08120 80B71AC0 E7AE0130 */ swc1 $f14, 0x0130($sp) +/* 08124 80B71AC4 460A2301 */ sub.s $f12, $f4, $f10 /* 08128 80B71AC8 0C034199 */ jal atan2s - -/* 0812C 80B71ACC E7AC0128 */ swc1 $f12, 0x0128($sp) -/* 08130 80B71AD0 C7B00130 */ lwc1 $f16, 0x0130($sp) -/* 08134 80B71AD4 C7B20128 */ lwc1 $f18, 0x0128($sp) -/* 08138 80B71AD8 A7A200FC */ sh $v0, 0x00FC($sp) -/* 0813C 80B71ADC 46108202 */ mul.s $f8, $f16, $f16 -/* 08140 80B71AE0 C7AE012C */ lwc1 $f14, 0x012C($sp) -/* 08144 80B71AE4 46129182 */ mul.s $f6, $f18, $f18 -/* 08148 80B71AE8 46064080 */ add.s $f2, $f8, $f6 -/* 0814C 80B71AEC 46001304 */ sqrt.s $f12, $f2 + +/* 0812C 80B71ACC E7AC0128 */ swc1 $f12, 0x0128($sp) +/* 08130 80B71AD0 C7B00130 */ lwc1 $f16, 0x0130($sp) +/* 08134 80B71AD4 C7B20128 */ lwc1 $f18, 0x0128($sp) +/* 08138 80B71AD8 A7A200FC */ sh $v0, 0x00FC($sp) +/* 0813C 80B71ADC 46108202 */ mul.s $f8, $f16, $f16 +/* 08140 80B71AE0 C7AE012C */ lwc1 $f14, 0x012C($sp) +/* 08144 80B71AE4 46129182 */ mul.s $f6, $f18, $f18 +/* 08148 80B71AE8 46064080 */ add.s $f2, $f8, $f6 +/* 0814C 80B71AEC 46001304 */ sqrt.s $f12, $f2 /* 08150 80B71AF0 0C034199 */ jal atan2s - -/* 08154 80B71AF4 E7A2004C */ swc1 $f2, 0x004C($sp) -/* 08158 80B71AF8 C7AC012C */ lwc1 $f12, 0x012C($sp) -/* 0815C 80B71AFC C7A2004C */ lwc1 $f2, 0x004C($sp) -/* 08160 80B71B00 A7A200FE */ sh $v0, 0x00FE($sp) -/* 08164 80B71B04 460C6102 */ mul.s $f4, $f12, $f12 -/* 08168 80B71B08 46041000 */ add.s $f0, $f2, $f4 -/* 0816C 80B71B0C 46000004 */ sqrt.s $f0, $f0 -/* 08170 80B71B10 E7A00124 */ swc1 $f0, 0x0124($sp) + +/* 08154 80B71AF4 E7A2004C */ swc1 $f2, 0x004C($sp) +/* 08158 80B71AF8 C7AC012C */ lwc1 $f12, 0x012C($sp) +/* 0815C 80B71AFC C7A2004C */ lwc1 $f2, 0x004C($sp) +/* 08160 80B71B00 A7A200FE */ sh $v0, 0x00FE($sp) +/* 08164 80B71B04 460C6102 */ mul.s $f4, $f12, $f12 +/* 08168 80B71B08 46041000 */ add.s $f0, $f2, $f4 +/* 0816C 80B71B0C 46000004 */ sqrt.s $f0, $f0 +/* 08170 80B71B10 E7A00124 */ swc1 $f0, 0x0124($sp) /* 08174 80B71B14 860F01A0 */ lh $t7, 0x01A0($s0) ## 000001A0 -/* 08178 80B71B18 51E0001D */ beql $t7, $zero, .L80B71B90 +/* 08178 80B71B18 51E0001D */ beql $t7, $zero, .L80B71B90 /* 0817C 80B71B1C 86020158 */ lh $v0, 0x0158($s0) ## 00000158 /* 08180 80B71B20 86030158 */ lh $v1, 0x0158($s0) ## 00000158 /* 08184 80B71B24 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 08188 80B71B28 10610018 */ beq $v1, $at, .L80B71B8C +/* 08188 80B71B28 10610018 */ beq $v1, $at, .L80B71B8C /* 0818C 80B71B2C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 08190 80B71B30 10610016 */ beq $v1, $at, .L80B71B8C +/* 08190 80B71B30 10610016 */ beq $v1, $at, .L80B71B8C /* 08194 80B71B34 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 08198 80B71B38 50610015 */ beql $v1, $at, .L80B71B90 +/* 08198 80B71B38 50610015 */ beql $v1, $at, .L80B71B90 /* 0819C 80B71B3C 86020158 */ lh $v0, 0x0158($s0) ## 00000158 /* 081A0 80B71B40 8603015C */ lh $v1, 0x015C($s0) ## 0000015C /* 081A4 80B71B44 30780040 */ andi $t8, $v1, 0x0040 ## $t8 = 00000000 -/* 081A8 80B71B48 53000006 */ beql $t8, $zero, .L80B71B64 -/* 081AC 80B71B4C 87AC00FC */ lh $t4, 0x00FC($sp) -/* 081B0 80B71B50 87AA00FC */ lh $t2, 0x00FC($sp) +/* 081A8 80B71B48 53000006 */ beql $t8, $zero, .L80B71B64 +/* 081AC 80B71B4C 87AC00FC */ lh $t4, 0x00FC($sp) +/* 081B0 80B71B50 87AA00FC */ lh $t2, 0x00FC($sp) /* 081B4 80B71B54 25594000 */ addiu $t9, $t2, 0x4000 ## $t9 = 00004000 -/* 081B8 80B71B58 10000004 */ beq $zero, $zero, .L80B71B6C -/* 081BC 80B71B5C A7B900FC */ sh $t9, 0x00FC($sp) -/* 081C0 80B71B60 87AC00FC */ lh $t4, 0x00FC($sp) +/* 081B8 80B71B58 10000004 */ beq $zero, $zero, .L80B71B6C +/* 081BC 80B71B5C A7B900FC */ sh $t9, 0x00FC($sp) +/* 081C0 80B71B60 87AC00FC */ lh $t4, 0x00FC($sp) .L80B71B64: /* 081C4 80B71B64 2589C000 */ addiu $t1, $t4, 0xC000 ## $t1 = FFFFC000 -/* 081C8 80B71B68 A7A900FC */ sh $t1, 0x00FC($sp) +/* 081C8 80B71B68 A7A900FC */ sh $t1, 0x00FC($sp) .L80B71B6C: /* 081CC 80B71B6C 246B0020 */ addiu $t3, $v1, 0x0020 ## $t3 = 00000020 /* 081D0 80B71B70 316D0040 */ andi $t5, $t3, 0x0040 ## $t5 = 00000000 -/* 081D4 80B71B74 11A00003 */ beq $t5, $zero, .L80B71B84 +/* 081D4 80B71B74 11A00003 */ beq $t5, $zero, .L80B71B84 /* 081D8 80B71B78 244E2000 */ addiu $t6, $v0, 0x2000 ## $t6 = 00002000 -/* 081DC 80B71B7C 10000003 */ beq $zero, $zero, .L80B71B8C -/* 081E0 80B71B80 A7AE00FE */ sh $t6, 0x00FE($sp) +/* 081DC 80B71B7C 10000003 */ beq $zero, $zero, .L80B71B8C +/* 081E0 80B71B80 A7AE00FE */ sh $t6, 0x00FE($sp) .L80B71B84: /* 081E4 80B71B84 244FE000 */ addiu $t7, $v0, 0xE000 ## $t7 = FFFFE000 -/* 081E8 80B71B88 A7AF00FE */ sh $t7, 0x00FE($sp) +/* 081E8 80B71B88 A7AF00FE */ sh $t7, 0x00FE($sp) .L80B71B8C: /* 081EC 80B71B8C 86020158 */ lh $v0, 0x0158($s0) ## 00000158 .L80B71B90: -/* 081F0 80B71B90 2841000C */ slti $at, $v0, 0x000C -/* 081F4 80B71B94 14200005 */ bne $at, $zero, .L80B71BAC +/* 081F0 80B71B90 2841000C */ slti $at, $v0, 0x000C +/* 081F4 80B71B94 14200005 */ bne $at, $zero, .L80B71BAC /* 081F8 80B71B98 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 081FC 80B71B9C 5041000D */ beql $v0, $at, .L80B71BD4 +/* 081FC 80B71B9C 5041000D */ beql $v0, $at, .L80B71BD4 /* 08200 80B71BA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08204 80B71BA4 10000DB5 */ beq $zero, $zero, .L80B7527C +/* 08204 80B71BA4 10000DB5 */ beq $zero, $zero, .L80B7527C /* 08208 80B71BA8 8604015C */ lh $a0, 0x015C($s0) ## 0000015C .L80B71BAC: /* 0820C 80B71BAC 24580019 */ addiu $t8, $v0, 0x0019 ## $t8 = 00000019 -/* 08210 80B71BB0 2F010025 */ sltiu $at, $t8, 0x0025 -/* 08214 80B71BB4 10200DB0 */ beq $at, $zero, .L80B75278 -/* 08218 80B71BB8 0018C080 */ sll $t8, $t8, 2 +/* 08210 80B71BB0 2F010025 */ sltiu $at, $t8, 0x0025 +/* 08214 80B71BB4 10200DB0 */ beq $at, $zero, .L80B75278 +/* 08218 80B71BB8 0018C080 */ sll $t8, $t8, 2 /* 0821C 80B71BBC 3C0180B8 */ lui $at, %hi(jtbl_80B7B598) ## $at = 80B80000 -/* 08220 80B71BC0 00380821 */ addu $at, $at, $t8 -/* 08224 80B71BC4 8C38B598 */ lw $t8, %lo(jtbl_80B7B598)($at) -/* 08228 80B71BC8 03000008 */ jr $t8 +/* 08220 80B71BC0 00380821 */ addu $at, $at, $t8 +/* 08224 80B71BC4 8C38B598 */ lw $t8, %lo(jtbl_80B7B598)($at) +/* 08228 80B71BC8 03000008 */ jr $t8 /* 0822C 80B71BCC 00000000 */ nop /* 08230 80B71BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B71BD4: -/* 08234 80B71BD4 0C2DC50E */ jal func_80B71438 +/* 08234 80B71BD4 0C2DC50E */ jal func_80B71438 /* 08238 80B71BD8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0823C 80B71BDC 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 08240 80B71BE0 44815000 */ mtc1 $at, $f10 ## $f10 = 500.00 @@ -424,204 +424,204 @@ glabel Fishing_Update /* 08250 80B71BF0 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 08254 80B71BF4 E60800F8 */ swc1 $f8, 0x00F8($s0) ## 000000F8 /* 08258 80B71BF8 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 0825C 80B71BFC 4600520D */ trunc.w.s $f8, $f10 +/* 0825C 80B71BFC 4600520D */ trunc.w.s $f8, $f10 /* 08260 80B71C00 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 08264 80B71C04 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 08268 80B71C08 4600310D */ trunc.w.s $f4, $f6 -/* 0826C 80B71C0C 440C4000 */ mfc1 $t4, $f8 +/* 08268 80B71C08 4600310D */ trunc.w.s $f4, $f6 +/* 0826C 80B71C0C 440C4000 */ mfc1 $t4, $f8 /* 08270 80B71C10 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 08274 80B71C14 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 08278 80B71C18 000C4C00 */ sll $t1, $t4, 16 -/* 0827C 80B71C1C 00095C03 */ sra $t3, $t1, 16 +/* 08278 80B71C18 000C4C00 */ sll $t1, $t4, 16 +/* 0827C 80B71C1C 00095C03 */ sra $t3, $t1, 16 /* 08280 80B71C20 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 08284 80B71C24 44052000 */ mfc1 $a1, $f4 +/* 08284 80B71C24 44052000 */ mfc1 $a1, $f4 /* 08288 80B71C28 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 0828C 80B71C2C 46803120 */ cvt.s.w $f4, $f6 +/* 0828C 80B71C2C 46803120 */ cvt.s.w $f4, $f6 /* 08290 80B71C30 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF /* 08294 80B71C34 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 08298 80B71C38 00052C00 */ sll $a1, $a1, 16 -/* 0829C 80B71C3C 00052C03 */ sra $a1, $a1, 16 +/* 08298 80B71C38 00052C00 */ sll $a1, $a1, 16 +/* 0829C 80B71C3C 00052C03 */ sra $a1, $a1, 16 /* 082A0 80B71C40 26040220 */ addiu $a0, $s0, 0x0220 ## $a0 = 00000220 -/* 082A4 80B71C44 460A2200 */ add.s $f8, $f4, $f10 +/* 082A4 80B71C44 460A2200 */ add.s $f8, $f4, $f10 /* 082A8 80B71C48 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 082AC 80B71C4C AFAD001C */ sw $t5, 0x001C($sp) -/* 082B0 80B71C50 AFAB0018 */ sw $t3, 0x0018($sp) -/* 082B4 80B71C54 4600228D */ trunc.w.s $f10, $f4 +/* 082AC 80B71C4C AFAD001C */ sw $t5, 0x001C($sp) +/* 082B0 80B71C50 AFAB0018 */ sw $t3, 0x0018($sp) +/* 082B4 80B71C54 4600228D */ trunc.w.s $f10, $f4 /* 082B8 80B71C58 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 082BC 80B71C5C AFA90014 */ sw $t1, 0x0014($sp) -/* 082C0 80B71C60 4600418D */ trunc.w.s $f6, $f8 -/* 082C4 80B71C64 440F5000 */ mfc1 $t7, $f10 -/* 082C8 80B71C68 AFAC0010 */ sw $t4, 0x0010($sp) -/* 082CC 80B71C6C 000FC400 */ sll $t8, $t7, 16 -/* 082D0 80B71C70 00185403 */ sra $t2, $t8, 16 +/* 082BC 80B71C5C AFA90014 */ sw $t1, 0x0014($sp) +/* 082C0 80B71C60 4600418D */ trunc.w.s $f6, $f8 +/* 082C4 80B71C64 440F5000 */ mfc1 $t7, $f10 +/* 082C8 80B71C68 AFAC0010 */ sw $t4, 0x0010($sp) +/* 082CC 80B71C6C 000FC400 */ sll $t8, $t7, 16 +/* 082D0 80B71C70 00185403 */ sra $t2, $t8, 16 /* 082D4 80B71C74 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 082D8 80B71C78 44063000 */ mfc1 $a2, $f6 -/* 082DC 80B71C7C 468041A0 */ cvt.s.w $f6, $f8 -/* 082E0 80B71C80 00063400 */ sll $a2, $a2, 16 -/* 082E4 80B71C84 00063403 */ sra $a2, $a2, 16 -/* 082E8 80B71C88 46043281 */ sub.s $f10, $f6, $f4 -/* 082EC 80B71C8C 4600520D */ trunc.w.s $f8, $f10 -/* 082F0 80B71C90 44074000 */ mfc1 $a3, $f8 +/* 082D8 80B71C78 44063000 */ mfc1 $a2, $f6 +/* 082DC 80B71C7C 468041A0 */ cvt.s.w $f6, $f8 +/* 082E0 80B71C80 00063400 */ sll $a2, $a2, 16 +/* 082E4 80B71C84 00063403 */ sra $a2, $a2, 16 +/* 082E8 80B71C88 46043281 */ sub.s $f10, $f6, $f4 +/* 082EC 80B71C8C 4600520D */ trunc.w.s $f8, $f10 +/* 082F0 80B71C90 44074000 */ mfc1 $a3, $f8 /* 082F4 80B71C94 00000000 */ nop -/* 082F8 80B71C98 00073C00 */ sll $a3, $a3, 16 +/* 082F8 80B71C98 00073C00 */ sll $a3, $a3, 16 /* 082FC 80B71C9C 0C01E763 */ jal Lights_InitType0PositionalLight - -/* 08300 80B71CA0 00073C03 */ sra $a3, $a3, 16 + +/* 08300 80B71CA0 00073C03 */ sra $a3, $a3, 16 /* 08304 80B71CA4 3C0180B8 */ lui $at, %hi(D_80B7E078) ## $at = 80B80000 -/* 08308 80B71CA8 C426E078 */ lwc1 $f6, %lo(D_80B7E078)($at) +/* 08308 80B71CA8 C426E078 */ lwc1 $f6, %lo(D_80B7E078)($at) /* 0830C 80B71CAC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 08310 80B71CB0 02217021 */ addu $t6, $s1, $at +/* 08310 80B71CB0 02217021 */ addu $t6, $s1, $at /* 08314 80B71CB4 E60601AC */ swc1 $f6, 0x01AC($s0) ## 000001AC -/* 08318 80B71CB8 AFAE0048 */ sw $t6, 0x0048($sp) +/* 08318 80B71CB8 AFAE0048 */ sw $t6, 0x0048($sp) /* 0831C 80B71CBC 8DC41DE4 */ lw $a0, 0x1DE4($t6) ## 00001DE4 -/* 08320 80B71CC0 00800821 */ addu $at, $a0, $zero -/* 08324 80B71CC4 00042080 */ sll $a0, $a0, 2 -/* 08328 80B71CC8 00812021 */ addu $a0, $a0, $at -/* 0832C 80B71CCC 00042080 */ sll $a0, $a0, 2 -/* 08330 80B71CD0 00812023 */ subu $a0, $a0, $at -/* 08334 80B71CD4 00042080 */ sll $a0, $a0, 2 -/* 08338 80B71CD8 00812023 */ subu $a0, $a0, $at -/* 0833C 80B71CDC 00042080 */ sll $a0, $a0, 2 -/* 08340 80B71CE0 00042400 */ sll $a0, $a0, 16 +/* 08320 80B71CC0 00800821 */ addu $at, $a0, $zero +/* 08324 80B71CC4 00042080 */ sll $a0, $a0, 2 +/* 08328 80B71CC8 00812021 */ addu $a0, $a0, $at +/* 0832C 80B71CCC 00042080 */ sll $a0, $a0, 2 +/* 08330 80B71CD0 00812023 */ subu $a0, $a0, $at +/* 08334 80B71CD4 00042080 */ sll $a0, $a0, 2 +/* 08338 80B71CD8 00812023 */ subu $a0, $a0, $at +/* 0833C 80B71CDC 00042080 */ sll $a0, $a0, 2 +/* 08340 80B71CE0 00042400 */ sll $a0, $a0, 16 /* 08344 80B71CE4 0C01DE1C */ jal Math_Sins ## sins? -/* 08348 80B71CE8 00042403 */ sra $a0, $a0, 16 +/* 08348 80B71CE8 00042403 */ sra $a0, $a0, 16 /* 0834C 80B71CEC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 08350 80B71CF0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 08354 80B71CF4 8FB80048 */ lw $t8, 0x0048($sp) -/* 08358 80B71CF8 46040282 */ mul.s $f10, $f0, $f4 -/* 0835C 80B71CFC E7AA0104 */ swc1 $f10, 0x0104($sp) +/* 08354 80B71CF4 8FB80048 */ lw $t8, 0x0048($sp) +/* 08358 80B71CF8 46040282 */ mul.s $f10, $f0, $f4 +/* 0835C 80B71CFC E7AA0104 */ swc1 $f10, 0x0104($sp) /* 08360 80B71D00 8F041DE4 */ lw $a0, 0x1DE4($t8) ## 00001DE4 -/* 08364 80B71D04 00800821 */ addu $at, $a0, $zero -/* 08368 80B71D08 000420C0 */ sll $a0, $a0, 3 -/* 0836C 80B71D0C 00812023 */ subu $a0, $a0, $at -/* 08370 80B71D10 00042080 */ sll $a0, $a0, 2 -/* 08374 80B71D14 00812021 */ addu $a0, $a0, $at -/* 08378 80B71D18 00042080 */ sll $a0, $a0, 2 -/* 0837C 80B71D1C 00812023 */ subu $a0, $a0, $at -/* 08380 80B71D20 00042040 */ sll $a0, $a0, 1 -/* 08384 80B71D24 00042400 */ sll $a0, $a0, 16 +/* 08364 80B71D04 00800821 */ addu $at, $a0, $zero +/* 08368 80B71D08 000420C0 */ sll $a0, $a0, 3 +/* 0836C 80B71D0C 00812023 */ subu $a0, $a0, $at +/* 08370 80B71D10 00042080 */ sll $a0, $a0, 2 +/* 08374 80B71D14 00812021 */ addu $a0, $a0, $at +/* 08378 80B71D18 00042080 */ sll $a0, $a0, 2 +/* 0837C 80B71D1C 00812023 */ subu $a0, $a0, $at +/* 08380 80B71D20 00042040 */ sll $a0, $a0, 1 +/* 08384 80B71D24 00042400 */ sll $a0, $a0, 16 /* 08388 80B71D28 0C01DE1C */ jal Math_Sins ## sins? -/* 0838C 80B71D2C 00042403 */ sra $a0, $a0, 16 +/* 0838C 80B71D2C 00042403 */ sra $a0, $a0, 16 /* 08390 80B71D30 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 08394 80B71D34 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 /* 08398 80B71D38 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 0839C 80B71D3C 44812000 */ mtc1 $at, $f4 ## $f4 = 130.00 -/* 083A0 80B71D40 46080182 */ mul.s $f6, $f0, $f8 +/* 083A0 80B71D40 46080182 */ mul.s $f6, $f0, $f8 /* 083A4 80B71D44 3C01425C */ lui $at, 0x425C ## $at = 425C0000 /* 083A8 80B71D48 44815000 */ mtc1 $at, $f10 ## $f10 = 55.00 /* 083AC 80B71D4C 3C0180B8 */ lui $at, %hi(D_80B7B62C) ## $at = 80B80000 /* 083B0 80B71D50 240A8000 */ addiu $t2, $zero, 0x8000 ## $t2 = FFFF8000 -/* 083B4 80B71D54 E7A60108 */ swc1 $f6, 0x0108($sp) +/* 083B4 80B71D54 E7A60108 */ swc1 $f6, 0x0108($sp) /* 083B8 80B71D58 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 083BC 80B71D5C C7A80104 */ lwc1 $f8, 0x0104($sp) +/* 083BC 80B71D5C C7A80104 */ lwc1 $f8, 0x0104($sp) /* 083C0 80B71D60 C60200EC */ lwc1 $f2, 0x00EC($s0) ## 000000EC -/* 083C4 80B71D64 46085180 */ add.s $f6, $f10, $f8 +/* 083C4 80B71D64 46085180 */ add.s $f6, $f10, $f8 /* 083C8 80B71D68 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 083CC 80B71D6C C424B62C */ lwc1 $f4, %lo(D_80B7B62C)($at) +/* 083CC 80B71D6C C424B62C */ lwc1 $f4, %lo(D_80B7B62C)($at) /* 083D0 80B71D70 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 083D4 80B71D74 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 083D8 80B71D78 C7AA0108 */ lwc1 $f10, 0x0108($sp) +/* 083D8 80B71D78 C7AA0108 */ lwc1 $f10, 0x0108($sp) /* 083DC 80B71D7C A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 -/* 083E0 80B71D80 4606103C */ c.lt.s $f2, $f6 -/* 083E4 80B71D84 460A2200 */ add.s $f8, $f4, $f10 -/* 083E8 80B71D88 45000026 */ bc1f .L80B71E24 +/* 083E0 80B71D80 4606103C */ c.lt.s $f2, $f6 +/* 083E4 80B71D84 460A2200 */ add.s $f8, $f4, $f10 +/* 083E8 80B71D88 45000026 */ bc1f .L80B71E24 /* 083EC 80B71D8C E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C /* 083F0 80B71D90 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 083F4 80B71D94 00000000 */ nop -/* 083F8 80B71D98 4602203C */ c.lt.s $f4, $f2 +/* 083F8 80B71D98 4602203C */ c.lt.s $f4, $f2 /* 083FC 80B71D9C 00000000 */ nop -/* 08400 80B71DA0 45000020 */ bc1f .L80B71E24 +/* 08400 80B71DA0 45000020 */ bc1f .L80B71E24 /* 08404 80B71DA4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 08408 80B71DA8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 0840C 80B71DAC 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 08410 80B71DB0 00000000 */ nop /* 08414 80B71DB4 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 08418 80B71DB8 44815000 */ mtc1 $at, $f10 ## $f10 = 130.00 /* 0841C 80B71DBC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 08420 80B71DC0 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 08424 80B71DC4 460A0200 */ add.s $f8, $f0, $f10 +/* 08424 80B71DC4 460A0200 */ add.s $f8, $f0, $f10 /* 08428 80B71DC8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0842C 80B71DCC 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 08430 80B71DD0 E7A600C8 */ swc1 $f6, 0x00C8($sp) +/* 08430 80B71DD0 E7A600C8 */ swc1 $f6, 0x00C8($sp) /* 08434 80B71DD4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 08438 80B71DD8 E7A800C4 */ swc1 $f8, 0x00C4($sp) + +/* 08438 80B71DD8 E7A800C4 */ swc1 $f8, 0x00C4($sp) /* 0843C 80B71DDC 3C0144A0 */ lui $at, 0x44A0 ## $at = 44A00000 /* 08440 80B71DE0 44812000 */ mtc1 $at, $f4 ## $f4 = 1280.00 /* 08444 80B71DE4 3C0180B8 */ lui $at, %hi(D_80B7B630) ## $at = 80B80000 -/* 08448 80B71DE8 C42CB630 */ lwc1 $f12, %lo(D_80B7B630)($at) -/* 0844C 80B71DEC 46040280 */ add.s $f10, $f0, $f4 +/* 08448 80B71DE8 C42CB630 */ lwc1 $f12, %lo(D_80B7B630)($at) +/* 0844C 80B71DEC 46040280 */ add.s $f10, $f0, $f4 /* 08450 80B71DF0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 08454 80B71DF4 E7AA00CC */ swc1 $f10, 0x00CC($sp) + +/* 08454 80B71DF4 E7AA00CC */ swc1 $f10, 0x00CC($sp) /* 08458 80B71DF8 3C0180B8 */ lui $at, %hi(D_80B7B634) ## $at = 80B80000 -/* 0845C 80B71DFC C428B634 */ lwc1 $f8, %lo(D_80B7B634)($at) -/* 08460 80B71E00 8FB90048 */ lw $t9, 0x0048($sp) +/* 0845C 80B71DFC C428B634 */ lwc1 $f8, %lo(D_80B7B634)($at) +/* 08460 80B71E00 8FB90048 */ lw $t9, 0x0048($sp) /* 08464 80B71E04 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 08468 80B71E08 46080180 */ add.s $f6, $f0, $f8 +/* 08468 80B71E08 46080180 */ add.s $f6, $f0, $f8 /* 0846C 80B71E0C 8F251E10 */ lw $a1, 0x1E10($t9) ## 00001E10 -/* 08470 80B71E10 AFAC0010 */ sw $t4, 0x0010($sp) +/* 08470 80B71E10 AFAC0010 */ sw $t4, 0x0010($sp) /* 08474 80B71E14 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 08478 80B71E18 44073000 */ mfc1 $a3, $f6 -/* 0847C 80B71E1C 0C2DA802 */ jal func_80B6A008 +/* 08478 80B71E18 44073000 */ mfc1 $a3, $f6 +/* 0847C 80B71E1C 0C2DA802 */ jal func_80B6A008 /* 08480 80B71E20 27A600C4 */ addiu $a2, $sp, 0x00C4 ## $a2 = FFFFFF8C .L80B71E24: /* 08484 80B71E24 8604015C */ lh $a0, 0x015C($s0) ## 0000015C -/* 08488 80B71E28 000422C0 */ sll $a0, $a0, 11 -/* 0848C 80B71E2C 00042400 */ sll $a0, $a0, 16 +/* 08488 80B71E28 000422C0 */ sll $a0, $a0, 11 +/* 0848C 80B71E2C 00042400 */ sll $a0, $a0, 16 /* 08490 80B71E30 0C01DE1C */ jal Math_Sins ## sins? -/* 08494 80B71E34 00042403 */ sra $a0, $a0, 16 +/* 08494 80B71E34 00042403 */ sra $a0, $a0, 16 /* 08498 80B71E38 3C0180B8 */ lui $at, %hi(D_80B7B638) ## $at = 80B80000 -/* 0849C 80B71E3C C422B638 */ lwc1 $f2, %lo(D_80B7B638)($at) +/* 0849C 80B71E3C C422B638 */ lwc1 $f2, %lo(D_80B7B638)($at) /* 084A0 80B71E40 26040172 */ addiu $a0, $s0, 0x0172 ## $a0 = 00000172 /* 084A4 80B71E44 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 084A8 80B71E48 46020102 */ mul.s $f4, $f0, $f2 +/* 084A8 80B71E48 46020102 */ mul.s $f4, $f0, $f2 /* 084AC 80B71E4C 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 084B0 80B71E50 46022280 */ add.s $f10, $f4, $f2 -/* 084B4 80B71E54 4600520D */ trunc.w.s $f8, $f10 -/* 084B8 80B71E58 44054000 */ mfc1 $a1, $f8 +/* 084B0 80B71E50 46022280 */ add.s $f10, $f4, $f2 +/* 084B4 80B71E54 4600520D */ trunc.w.s $f8, $f10 +/* 084B8 80B71E58 44054000 */ mfc1 $a1, $f8 /* 084BC 80B71E5C 00000000 */ nop -/* 084C0 80B71E60 00052C00 */ sll $a1, $a1, 16 +/* 084C0 80B71E60 00052C00 */ sll $a1, $a1, 16 /* 084C4 80B71E64 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 084C8 80B71E68 00052C03 */ sra $a1, $a1, 16 + +/* 084C8 80B71E68 00052C03 */ sra $a1, $a1, 16 /* 084CC 80B71E6C 8604015C */ lh $a0, 0x015C($s0) ## 0000015C -/* 084D0 80B71E70 00800821 */ addu $at, $a0, $zero -/* 084D4 80B71E74 00042080 */ sll $a0, $a0, 2 -/* 084D8 80B71E78 00812021 */ addu $a0, $a0, $at -/* 084DC 80B71E7C 00042240 */ sll $a0, $a0, 9 -/* 084E0 80B71E80 00042400 */ sll $a0, $a0, 16 +/* 084D0 80B71E70 00800821 */ addu $at, $a0, $zero +/* 084D4 80B71E74 00042080 */ sll $a0, $a0, 2 +/* 084D8 80B71E78 00812021 */ addu $a0, $a0, $at +/* 084DC 80B71E7C 00042240 */ sll $a0, $a0, 9 +/* 084E0 80B71E80 00042400 */ sll $a0, $a0, 16 /* 084E4 80B71E84 0C01DE1C */ jal Math_Sins ## sins? -/* 084E8 80B71E88 00042403 */ sra $a0, $a0, 16 +/* 084E8 80B71E88 00042403 */ sra $a0, $a0, 16 /* 084EC 80B71E8C 3C0180B8 */ lui $at, %hi(D_80B7B63C) ## $at = 80B80000 -/* 084F0 80B71E90 C426B63C */ lwc1 $f6, %lo(D_80B7B63C)($at) +/* 084F0 80B71E90 C426B63C */ lwc1 $f6, %lo(D_80B7B63C)($at) /* 084F4 80B71E94 26040174 */ addiu $a0, $s0, 0x0174 ## $a0 = 00000174 /* 084F8 80B71E98 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 084FC 80B71E9C 46060102 */ mul.s $f4, $f0, $f6 +/* 084FC 80B71E9C 46060102 */ mul.s $f4, $f0, $f6 /* 08500 80B71EA0 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 08504 80B71EA4 4600228D */ trunc.w.s $f10, $f4 -/* 08508 80B71EA8 44055000 */ mfc1 $a1, $f10 +/* 08504 80B71EA4 4600228D */ trunc.w.s $f10, $f4 +/* 08508 80B71EA8 44055000 */ mfc1 $a1, $f10 /* 0850C 80B71EAC 00000000 */ nop -/* 08510 80B71EB0 00052C00 */ sll $a1, $a1, 16 +/* 08510 80B71EB0 00052C00 */ sll $a1, $a1, 16 /* 08514 80B71EB4 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 08518 80B71EB8 00052C03 */ sra $a1, $a1, 16 + +/* 08518 80B71EB8 00052C03 */ sra $a1, $a1, 16 /* 0851C 80B71EBC 3C0180B8 */ lui $at, %hi(D_80B7B640) ## $at = 80B80000 -/* 08520 80B71EC0 C428B640 */ lwc1 $f8, %lo(D_80B7B640)($at) +/* 08520 80B71EC0 C428B640 */ lwc1 $f8, %lo(D_80B7B640)($at) /* 08524 80B71EC4 3C0180B8 */ lui $at, %hi(D_80B7B644) ## $at = 80B80000 /* 08528 80B71EC8 E6080190 */ swc1 $f8, 0x0190($s0) ## 00000190 -/* 0852C 80B71ECC C426B644 */ lwc1 $f6, %lo(D_80B7B644)($at) -/* 08530 80B71ED0 10000F30 */ beq $zero, $zero, .L80B75B94 +/* 0852C 80B71ECC C426B644 */ lwc1 $f6, %lo(D_80B7B644)($at) +/* 08530 80B71ED0 10000F30 */ beq $zero, $zero, .L80B75B94 /* 08534 80B71ED4 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 glabel L80B71ED8 /* 08538 80B71ED8 8E0E0008 */ lw $t6, 0x0008($s0) ## 00000008 /* 0853C 80B71EDC 8E0D000C */ lw $t5, 0x000C($s0) ## 0000000C -/* 08540 80B71EE0 4406A000 */ mfc1 $a2, $f20 +/* 08540 80B71EE0 4406A000 */ mfc1 $a2, $f20 /* 08544 80B71EE4 AE0E01B4 */ sw $t6, 0x01B4($s0) ## 000001B4 /* 08548 80B71EE8 8E0E0010 */ lw $t6, 0x0010($s0) ## 00000010 /* 0854C 80B71EEC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 @@ -629,40 +629,40 @@ glabel L80B71ED8 /* 08554 80B71EF4 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 08558 80B71EF8 AE0D01B8 */ sw $t5, 0x01B8($s0) ## 000001B8 /* 0855C 80B71EFC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08560 80B71F00 AE0E01BC */ sw $t6, 0x01BC($s0) ## 000001BC -/* 08564 80B71F04 4406A000 */ mfc1 $a2, $f20 +/* 08564 80B71F04 4406A000 */ mfc1 $a2, $f20 /* 08568 80B71F08 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 0856C 80B71F0C 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 /* 08570 80B71F10 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08574 80B71F14 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 08578 80B71F18 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0857C 80B71F1C 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 08580 80B71F20 C7A40124 */ lwc1 $f4, 0x0124($sp) -/* 08584 80B71F24 460A203C */ c.lt.s $f4, $f10 +/* 08580 80B71F20 C7A40124 */ lwc1 $f4, 0x0124($sp) +/* 08584 80B71F24 460A203C */ c.lt.s $f4, $f10 /* 08588 80B71F28 00000000 */ nop -/* 0858C 80B71F2C 45000008 */ bc1f .L80B71F50 +/* 0858C 80B71F2C 45000008 */ bc1f .L80B71F50 /* 08590 80B71F30 240F000B */ addiu $t7, $zero, 0x000B ## $t7 = 0000000B /* 08594 80B71F34 A60F0158 */ sh $t7, 0x0158($s0) ## 00000158 /* 08598 80B71F38 3C0180B8 */ lui $at, %hi(D_80B7B648) ## $at = 80B80000 -/* 0859C 80B71F3C C428B648 */ lwc1 $f8, %lo(D_80B7B648)($at) +/* 0859C 80B71F3C C428B648 */ lwc1 $f8, %lo(D_80B7B648)($at) /* 085A0 80B71F40 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 085A4 80B71F44 44813000 */ mtc1 $at, $f6 ## $f6 = 500.00 /* 085A8 80B71F48 E6080190 */ swc1 $f8, 0x0190($s0) ## 00000190 /* 085AC 80B71F4C E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 .L80B71F50: /* 085B0 80B71F50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 085B4 80B71F54 0C2DC3B5 */ jal func_80B70ED4 +/* 085B4 80B71F54 0C2DC3B5 */ jal func_80B70ED4 /* 085B8 80B71F58 26250014 */ addiu $a1, $s1, 0x0014 ## $a1 = 00000014 /* 085BC 80B71F5C 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 085C0 80B71F60 44815000 */ mtc1 $at, $f10 ## $f10 = 250.00 -/* 085C4 80B71F64 C7A80118 */ lwc1 $f8, 0x0118($sp) +/* 085C4 80B71F64 C7A80118 */ lwc1 $f8, 0x0118($sp) /* 085C8 80B71F68 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 085CC 80B71F6C 46085182 */ mul.s $f6, $f10, $f8 -/* 085D0 80B71F70 4606203C */ c.lt.s $f4, $f6 +/* 085CC 80B71F6C 46085182 */ mul.s $f6, $f10, $f8 +/* 085D0 80B71F70 4606203C */ c.lt.s $f4, $f6 /* 085D4 80B71F74 00000000 */ nop -/* 085D8 80B71F78 45020CC0 */ bc1fl .L80B7527C +/* 085D8 80B71F78 45020CC0 */ bc1fl .L80B7527C /* 085DC 80B71F7C 8604015C */ lh $a0, 0x015C($s0) ## 0000015C /* 085E0 80B71F80 A6000158 */ sh $zero, 0x0158($s0) ## 00000158 /* 085E4 80B71F84 86180158 */ lh $t8, 0x0158($s0) ## 00000158 @@ -672,12 +672,12 @@ glabel L80B71ED8 /* 085F4 80B71F94 A60A01A4 */ sh $t2, 0x01A4($s0) ## 000001A4 /* 085F8 80B71F98 A61901A2 */ sh $t9, 0x01A2($s0) ## 000001A2 /* 085FC 80B71F9C A602017C */ sh $v0, 0x017C($s0) ## 0000017C -/* 08600 80B71FA0 10000CB5 */ beq $zero, $zero, .L80B75278 +/* 08600 80B71FA0 10000CB5 */ beq $zero, $zero, .L80B75278 /* 08604 80B71FA4 A618015A */ sh $t8, 0x015A($s0) ## 0000015A glabel L80B71FA8 /* 08608 80B71FA8 8E090008 */ lw $t1, 0x0008($s0) ## 00000008 /* 0860C 80B71FAC 8E0C000C */ lw $t4, 0x000C($s0) ## 0000000C -/* 08610 80B71FB0 4406A000 */ mfc1 $a2, $f20 +/* 08610 80B71FB0 4406A000 */ mfc1 $a2, $f20 /* 08614 80B71FB4 AE0901B4 */ sw $t1, 0x01B4($s0) ## 000001B4 /* 08618 80B71FB8 8E090010 */ lw $t1, 0x0010($s0) ## 00000010 /* 0861C 80B71FBC 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 @@ -686,20 +686,20 @@ glabel L80B71FA8 /* 08628 80B71FC8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0862C 80B71FCC AE0C01B8 */ sw $t4, 0x01B8($s0) ## 000001B8 /* 08630 80B71FD0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08634 80B71FD4 AE0901BC */ sw $t1, 0x01BC($s0) ## 000001BC -/* 08638 80B71FD8 4406A000 */ mfc1 $a2, $f20 +/* 08638 80B71FD8 4406A000 */ mfc1 $a2, $f20 /* 0863C 80B71FDC 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08640 80B71FE0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 08644 80B71FE4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08648 80B71FE8 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 0864C 80B71FEC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 08650 80B71FF0 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 08654 80B71FF4 C7AA0124 */ lwc1 $f10, 0x0124($sp) -/* 08658 80B71FF8 460A403E */ c.le.s $f8, $f10 +/* 08654 80B71FF4 C7AA0124 */ lwc1 $f10, 0x0124($sp) +/* 08658 80B71FF8 460A403E */ c.le.s $f8, $f10 /* 0865C 80B71FFC 00000000 */ nop -/* 08660 80B72000 45000006 */ bc1f .L80B7201C +/* 08660 80B72000 45000006 */ bc1f .L80B7201C /* 08664 80B72004 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 08668 80B72008 44812000 */ mtc1 $at, $f4 ## $f4 = 2000.00 /* 0866C 80B7200C 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A @@ -708,16 +708,16 @@ glabel L80B71FA8 /* 08678 80B72018 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 .L80B7201C: /* 0867C 80B7201C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08680 80B72020 0C2DC3B5 */ jal func_80B70ED4 +/* 08680 80B72020 0C2DC3B5 */ jal func_80B70ED4 /* 08684 80B72024 26250014 */ addiu $a1, $s1, 0x0014 ## $a1 = 00000014 /* 08688 80B72028 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 0868C 80B7202C 44815000 */ mtc1 $at, $f10 ## $f10 = 250.00 -/* 08690 80B72030 C7A80118 */ lwc1 $f8, 0x0118($sp) +/* 08690 80B72030 C7A80118 */ lwc1 $f8, 0x0118($sp) /* 08694 80B72034 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 08698 80B72038 46085102 */ mul.s $f4, $f10, $f8 -/* 0869C 80B7203C 4604303C */ c.lt.s $f6, $f4 +/* 08698 80B72038 46085102 */ mul.s $f4, $f10, $f8 +/* 0869C 80B7203C 4604303C */ c.lt.s $f6, $f4 /* 086A0 80B72040 00000000 */ nop -/* 086A4 80B72044 4500000A */ bc1f .L80B72070 +/* 086A4 80B72044 4500000A */ bc1f .L80B72070 /* 086A8 80B72048 00000000 */ nop /* 086AC 80B7204C A6000158 */ sh $zero, 0x0158($s0) ## 00000158 /* 086B0 80B72050 860B0158 */ lh $t3, 0x0158($s0) ## 00000158 @@ -729,43 +729,43 @@ glabel L80B71FA8 /* 086C8 80B72068 A602017C */ sh $v0, 0x017C($s0) ## 0000017C /* 086CC 80B7206C A60B015A */ sh $t3, 0x015A($s0) ## 0000015A .L80B72070: -/* 086D0 80B72070 0C042F6F */ jal func_8010BDBC +/* 086D0 80B72070 0C042F6F */ jal func_8010BDBC /* 086D4 80B72074 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 086D8 80B72078 14400022 */ bne $v0, $zero, .L80B72104 +/* 086D8 80B72078 14400022 */ bne $v0, $zero, .L80B72104 /* 086DC 80B7207C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 086E0 80B72080 9442E66C */ lhu $v0, -0x1994($v0) ## 8015E66C /* 086E4 80B72084 3401C000 */ ori $at, $zero, 0xC000 ## $at = 0000C000 -/* 086E8 80B72088 0041082A */ slt $at, $v0, $at -/* 086EC 80B7208C 1420000F */ bne $at, $zero, .L80B720CC +/* 086E8 80B72088 0041082A */ slt $at, $v0, $at +/* 086EC 80B7208C 1420000F */ bne $at, $zero, .L80B720CC /* 086F0 80B72090 3401C01C */ ori $at, $zero, 0xC01C ## $at = 0000C01C -/* 086F4 80B72094 0041082A */ slt $at, $v0, $at -/* 086F8 80B72098 1020000C */ beq $at, $zero, .L80B720CC +/* 086F4 80B72094 0041082A */ slt $at, $v0, $at +/* 086F8 80B72098 1020000C */ beq $at, $zero, .L80B720CC /* 086FC 80B7209C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 08700 80B720A0 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 /* 08704 80B720A4 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 /* 08708 80B720A8 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0870C 80B720AC A60F0158 */ sh $t7, 0x0158($s0) ## 00000158 -/* 08710 80B720B0 4600028D */ trunc.w.s $f10, $f0 +/* 08710 80B720B0 4600028D */ trunc.w.s $f10, $f0 /* 08714 80B720B4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 08718 80B720B8 440C5000 */ mfc1 $t4, $f10 +/* 08718 80B720B8 440C5000 */ mfc1 $t4, $f10 /* 0871C 80B720BC 00000000 */ nop /* 08720 80B720C0 258900C8 */ addiu $t1, $t4, 0x00C8 ## $t1 = 000000C8 /* 08724 80B720C4 A6090180 */ sh $t1, 0x0180($s0) ## 00000180 /* 08728 80B720C8 9442E66C */ lhu $v0, -0x1994($v0) ## 8015E66C .L80B720CC: -/* 0872C 80B720CC 28413AAA */ slti $at, $v0, 0x3AAA -/* 08730 80B720D0 1420000C */ bne $at, $zero, .L80B72104 -/* 08734 80B720D4 28413AC6 */ slti $at, $v0, 0x3AC6 -/* 08738 80B720D8 1020000A */ beq $at, $zero, .L80B72104 +/* 0872C 80B720CC 28413AAA */ slti $at, $v0, 0x3AAA +/* 08730 80B720D0 1420000C */ bne $at, $zero, .L80B72104 +/* 08734 80B720D4 28413AC6 */ slti $at, $v0, 0x3AC6 +/* 08738 80B720D8 1020000A */ beq $at, $zero, .L80B72104 /* 0873C 80B720DC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 08740 80B720E0 240B0007 */ addiu $t3, $zero, 0x0007 ## $t3 = 00000007 /* 08744 80B720E4 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 /* 08748 80B720E8 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0874C 80B720EC A60B0158 */ sh $t3, 0x0158($s0) ## 00000158 -/* 08750 80B720F0 4600020D */ trunc.w.s $f8, $f0 -/* 08754 80B720F4 44184000 */ mfc1 $t8, $f8 +/* 08750 80B720F0 4600020D */ trunc.w.s $f8, $f0 +/* 08754 80B720F4 44184000 */ mfc1 $t8, $f8 /* 08758 80B720F8 00000000 */ nop /* 0875C 80B720FC 270A00C8 */ addiu $t2, $t8, 0x00C8 ## $t2 = 000000C8 /* 08760 80B72100 A60A0180 */ sh $t2, 0x0180($s0) ## 00000180 @@ -773,64 +773,64 @@ glabel L80B71FA8 /* 08764 80B72104 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 08768 80B72108 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 /* 0876C 80B7210C 847909F2 */ lh $t9, 0x09F2($v1) ## 801609F2 -/* 08770 80B72110 13200C59 */ beq $t9, $zero, .L80B75278 +/* 08770 80B72110 13200C59 */ beq $t9, $zero, .L80B75278 /* 08774 80B72114 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 08778 80B72118 A46009F2 */ sh $zero, 0x09F2($v1) ## 801609F2 /* 0877C 80B7211C 240C0007 */ addiu $t4, $zero, 0x0007 ## $t4 = 00000007 /* 08780 80B72120 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 /* 08784 80B72124 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08788 80B72128 A60C0158 */ sh $t4, 0x0158($s0) ## 00000158 -/* 0878C 80B7212C 4600018D */ trunc.w.s $f6, $f0 -/* 08790 80B72130 440E3000 */ mfc1 $t6, $f6 +/* 0878C 80B7212C 4600018D */ trunc.w.s $f6, $f0 +/* 08790 80B72130 440E3000 */ mfc1 $t6, $f6 /* 08794 80B72134 00000000 */ nop /* 08798 80B72138 25CF07D0 */ addiu $t7, $t6, 0x07D0 ## $t7 = 000007D0 -/* 0879C 80B7213C 10000C4E */ beq $zero, $zero, .L80B75278 +/* 0879C 80B7213C 10000C4E */ beq $zero, $zero, .L80B75278 /* 087A0 80B72140 A60F0180 */ sh $t7, 0x0180($s0) ## 00000180 glabel L80B72144 -/* 087A4 80B72144 4405A000 */ mfc1 $a1, $f20 -/* 087A8 80B72148 4406A000 */ mfc1 $a2, $f20 +/* 087A4 80B72144 4405A000 */ mfc1 $a1, $f20 +/* 087A8 80B72148 4406A000 */ mfc1 $a2, $f20 /* 087AC 80B7214C 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 087B0 80B72150 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 087B4 80B72154 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 087B8 80B72158 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 087BC 80B7215C 4406A000 */ mfc1 $a2, $f20 +/* 087BC 80B7215C 4406A000 */ mfc1 $a2, $f20 /* 087C0 80B72160 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 087C4 80B72164 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 087C8 80B72168 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 087CC 80B7216C 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 087D0 80B72170 8618017A */ lh $t8, 0x017A($s0) ## 0000017A -/* 087D4 80B72174 1700002C */ bne $t8, $zero, .L80B72228 +/* 087D4 80B72174 1700002C */ bne $t8, $zero, .L80B72228 /* 087D8 80B72178 00000000 */ nop /* 087DC 80B7217C 860A01A4 */ lh $t2, 0x01A4($s0) ## 000001A4 -/* 087E0 80B72180 15400005 */ bne $t2, $zero, .L80B72198 +/* 087E0 80B72180 15400005 */ bne $t2, $zero, .L80B72198 /* 087E4 80B72184 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A /* 087E8 80B72188 A602015A */ sh $v0, 0x015A($s0) ## 0000015A /* 087EC 80B7218C 8619015A */ lh $t9, 0x015A($s0) ## 0000015A -/* 087F0 80B72190 10000025 */ beq $zero, $zero, .L80B72228 +/* 087F0 80B72190 10000025 */ beq $zero, $zero, .L80B72228 /* 087F4 80B72194 A6190158 */ sh $t9, 0x0158($s0) ## 00000158 .L80B72198: /* 087F8 80B72198 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 087FC 80B7219C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 08800 80B721A0 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 08804 80B721A4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08808 80B721A8 A60C0158 */ sh $t4, 0x0158($s0) ## 00000158 -/* 0880C 80B721AC 4600010D */ trunc.w.s $f4, $f0 +/* 0880C 80B721AC 4600010D */ trunc.w.s $f4, $f0 /* 08810 80B721B0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 08814 80B721B4 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 08818 80B721B8 440E2000 */ mfc1 $t6, $f4 +/* 08818 80B721B8 440E2000 */ mfc1 $t6, $f4 /* 0881C 80B721BC 00000000 */ nop /* 08820 80B721C0 25CF000A */ addiu $t7, $t6, 0x000A ## $t7 = 0000000A /* 08824 80B721C4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 08828 80B721C8 A60F017A */ sh $t7, 0x017A($s0) ## 0000017A /* 0882C 80B721CC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 08830 80B721D0 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 08834 80B721D4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08838 80B721D8 E60001B4 */ swc1 $f0, 0x01B4($s0) ## 000001B4 /* 0883C 80B721DC 8E3807C0 */ lw $t8, 0x07C0($s1) ## 000007C0 /* 08840 80B721E0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -841,11 +841,11 @@ glabel L80B72144 /* 08854 80B721F4 85590002 */ lh $t9, 0x0002($t2) ## 00000002 /* 08858 80B721F8 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 0885C 80B721FC 00000000 */ nop -/* 08860 80B72200 46805220 */ cvt.s.w $f8, $f10 -/* 08864 80B72204 46064101 */ sub.s $f4, $f8, $f6 -/* 08868 80B72208 46002281 */ sub.s $f10, $f4, $f0 +/* 08860 80B72200 46805220 */ cvt.s.w $f8, $f10 +/* 08864 80B72204 46064101 */ sub.s $f4, $f8, $f6 +/* 08868 80B72208 46002281 */ sub.s $f10, $f4, $f0 /* 0886C 80B7220C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 08870 80B72210 E60A01B8 */ swc1 $f10, 0x01B8($s0) ## 000001B8 /* 08874 80B72214 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 08878 80B72218 44814000 */ mtc1 $at, $f8 ## $f8 = 2000.00 @@ -854,24 +854,24 @@ glabel L80B72144 /* 08884 80B72224 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 .L80B72228: /* 08888 80B72228 3C0C80B8 */ lui $t4, %hi(D_80B7E0B6) ## $t4 = 80B80000 -/* 0888C 80B7222C 918CE0B6 */ lbu $t4, %lo(D_80B7E0B6)($t4) +/* 0888C 80B7222C 918CE0B6 */ lbu $t4, %lo(D_80B7E0B6)($t4) /* 08890 80B72230 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 08894 80B72234 15810005 */ bne $t4, $at, .L80B7224C +/* 08894 80B72234 15810005 */ bne $t4, $at, .L80B7224C /* 08898 80B72238 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0889C 80B7223C 0C2DC3B5 */ jal func_80B70ED4 +/* 0889C 80B7223C 0C2DC3B5 */ jal func_80B70ED4 /* 088A0 80B72240 26250014 */ addiu $a1, $s1, 0x0014 ## $a1 = 00000014 -/* 088A4 80B72244 10000C0D */ beq $zero, $zero, .L80B7527C +/* 088A4 80B72244 10000C0D */ beq $zero, $zero, .L80B7527C /* 088A8 80B72248 8604015C */ lh $a0, 0x015C($s0) ## 0000015C .L80B7224C: /* 088AC 80B7224C 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 /* 088B0 80B72250 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 088B4 80B72254 01215824 */ and $t3, $t1, $at -/* 088B8 80B72258 10000C07 */ beq $zero, $zero, .L80B75278 +/* 088B4 80B72254 01215824 */ and $t3, $t1, $at +/* 088B8 80B72258 10000C07 */ beq $zero, $zero, .L80B75278 /* 088BC 80B7225C AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 glabel L80B72260 /* 088C0 80B72260 920D0150 */ lbu $t5, 0x0150($s0) ## 00000150 /* 088C4 80B72264 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 088C8 80B72268 15A1000D */ bne $t5, $at, .L80B722A0 +/* 088C8 80B72268 15A1000D */ bne $t5, $at, .L80B722A0 /* 088CC 80B7226C 3C01C30C */ lui $at, 0xC30C ## $at = C30C0000 /* 088D0 80B72270 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 088D4 80B72274 44812000 */ mtc1 $at, $f4 ## $f4 = -140.00 @@ -883,225 +883,225 @@ glabel L80B72260 /* 088EC 80B7228C A60201A2 */ sh $v0, 0x01A2($s0) ## 000001A2 /* 088F0 80B72290 E60601B4 */ swc1 $f6, 0x01B4($s0) ## 000001B4 /* 088F4 80B72294 E60401B8 */ swc1 $f4, 0x01B8($s0) ## 000001B8 -/* 088F8 80B72298 10000BF7 */ beq $zero, $zero, .L80B75278 +/* 088F8 80B72298 10000BF7 */ beq $zero, $zero, .L80B75278 /* 088FC 80B7229C E60A01BC */ swc1 $f10, 0x01BC($s0) ## 000001BC .L80B722A0: /* 08900 80B722A0 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 -/* 08904 80B722A4 4406A000 */ mfc1 $a2, $f20 -/* 08908 80B722A8 AFA4004C */ sw $a0, 0x004C($sp) +/* 08904 80B722A4 4406A000 */ mfc1 $a2, $f20 +/* 08908 80B722A8 AFA4004C */ sw $a0, 0x004C($sp) /* 0890C 80B722AC 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 /* 08910 80B722B0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08914 80B722B4 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 08918 80B722B8 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 0891C 80B722BC 44813000 */ mtc1 $at, $f6 ## $f6 = 250.00 -/* 08920 80B722C0 C7A40118 */ lwc1 $f4, 0x0118($sp) +/* 08920 80B722C0 C7A40118 */ lwc1 $f4, 0x0118($sp) /* 08924 80B722C4 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 08928 80B722C8 8FA4004C */ lw $a0, 0x004C($sp) -/* 0892C 80B722CC 46043282 */ mul.s $f10, $f6, $f4 -/* 08930 80B722D0 460A403C */ c.lt.s $f8, $f10 +/* 08928 80B722C8 8FA4004C */ lw $a0, 0x004C($sp) +/* 0892C 80B722CC 46043282 */ mul.s $f10, $f6, $f4 +/* 08930 80B722D0 460A403C */ c.lt.s $f8, $f10 /* 08934 80B722D4 00000000 */ nop -/* 08938 80B722D8 45030005 */ bc1tl .L80B722F0 -/* 0893C 80B722DC 4406A000 */ mfc1 $a2, $f20 +/* 08938 80B722D8 45030005 */ bc1tl .L80B722F0 +/* 0893C 80B722DC 4406A000 */ mfc1 $a2, $f20 /* 08940 80B722E0 860F017C */ lh $t7, 0x017C($s0) ## 0000017C -/* 08944 80B722E4 51E00015 */ beql $t7, $zero, .L80B7233C +/* 08944 80B722E4 51E00015 */ beql $t7, $zero, .L80B7233C /* 08948 80B722E8 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 -/* 0894C 80B722EC 4406A000 */ mfc1 $a2, $f20 +/* 0894C 80B722EC 4406A000 */ mfc1 $a2, $f20 .L80B722F0: /* 08950 80B722F0 3C054600 */ lui $a1, 0x4600 ## $a1 = 46000000 /* 08954 80B722F4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08958 80B722F8 3C074440 */ lui $a3, 0x4440 ## $a3 = 44400000 /* 0895C 80B722FC 3C054086 */ lui $a1, 0x4086 ## $a1 = 40860000 -/* 08960 80B72300 4406A000 */ mfc1 $a2, $f20 +/* 08960 80B72300 4406A000 */ mfc1 $a2, $f20 /* 08964 80B72304 34A56666 */ ori $a1, $a1, 0x6666 ## $a1 = 40866666 /* 08968 80B72308 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0896C 80B7230C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08970 80B72310 3C073F40 */ lui $a3, 0x3F40 ## $a3 = 3F400000 /* 08974 80B72314 3C0180B8 */ lui $at, %hi(D_80B7B64C) ## $at = 80B80000 -/* 08978 80B72318 C426B64C */ lwc1 $f6, %lo(D_80B7B64C)($at) +/* 08978 80B72318 C426B64C */ lwc1 $f6, %lo(D_80B7B64C)($at) /* 0897C 80B7231C 3C01457A */ lui $at, 0x457A ## $at = 457A0000 /* 08980 80B72320 44812000 */ mtc1 $at, $f4 ## $f4 = 4000.00 /* 08984 80B72324 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 /* 08988 80B72328 A618017A */ sh $t8, 0x017A($s0) ## 0000017A /* 0898C 80B7232C E6060190 */ swc1 $f6, 0x0190($s0) ## 00000190 -/* 08990 80B72330 1000000B */ beq $zero, $zero, .L80B72360 +/* 08990 80B72330 1000000B */ beq $zero, $zero, .L80B72360 /* 08994 80B72334 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 /* 08998 80B72338 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 .L80B7233C: /* 0899C 80B7233C 44814000 */ mtc1 $at, $f8 ## $f8 = 2000.00 -/* 089A0 80B72340 4406A000 */ mfc1 $a2, $f20 +/* 089A0 80B72340 4406A000 */ mfc1 $a2, $f20 /* 089A4 80B72344 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 089A8 80B72348 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 089AC 80B7234C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 089B0 80B72350 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 089B4 80B72354 3C053FC0 */ lui $a1, 0x3FC0 ## $a1 = 3FC00000 /* 089B8 80B72358 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 089BC 80B7235C E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 .L80B72360: /* 089C0 80B72360 860A017A */ lh $t2, 0x017A($s0) ## 0000017A -/* 089C4 80B72364 11400006 */ beq $t2, $zero, .L80B72380 +/* 089C4 80B72364 11400006 */ beq $t2, $zero, .L80B72380 /* 089C8 80B72368 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 089CC 80B7236C 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 089D0 80B72370 C7AA0124 */ lwc1 $f10, 0x0124($sp) -/* 089D4 80B72374 4606503C */ c.lt.s $f10, $f6 +/* 089D0 80B72370 C7AA0124 */ lwc1 $f10, 0x0124($sp) +/* 089D4 80B72374 4606503C */ c.lt.s $f10, $f6 /* 089D8 80B72378 00000000 */ nop -/* 089DC 80B7237C 4500000C */ bc1f .L80B723B0 +/* 089DC 80B7237C 4500000C */ bc1f .L80B723B0 .L80B72380: /* 089E0 80B72380 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 089E4 80B72384 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 089E8 80B72388 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 089EC 80B7238C A6000158 */ sh $zero, 0x0158($s0) ## 00000158 -/* 089F0 80B72390 4600010D */ trunc.w.s $f4, $f0 +/* 089F0 80B72390 4600010D */ trunc.w.s $f4, $f0 /* 089F4 80B72394 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 089F8 80B72398 44814000 */ mtc1 $at, $f8 ## $f8 = 500.00 /* 089FC 80B7239C E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 -/* 08A00 80B723A0 440B2000 */ mfc1 $t3, $f4 +/* 08A00 80B723A0 440B2000 */ mfc1 $t3, $f4 /* 08A04 80B723A4 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 /* 08A08 80B723A8 256D0003 */ addiu $t5, $t3, 0x0003 ## $t5 = 00000003 /* 08A0C 80B723AC A60D017A */ sh $t5, 0x017A($s0) ## 0000017A .L80B723B0: /* 08A10 80B723B0 3C0E80B8 */ lui $t6, %hi(D_80B7E0B6) ## $t6 = 80B80000 -/* 08A14 80B723B4 91CEE0B6 */ lbu $t6, %lo(D_80B7E0B6)($t6) +/* 08A14 80B723B4 91CEE0B6 */ lbu $t6, %lo(D_80B7E0B6)($t6) /* 08A18 80B723B8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 08A1C 80B723BC 15C10005 */ bne $t6, $at, .L80B723D4 +/* 08A1C 80B723BC 15C10005 */ bne $t6, $at, .L80B723D4 /* 08A20 80B723C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08A24 80B723C4 0C2DC3B5 */ jal func_80B70ED4 +/* 08A24 80B723C4 0C2DC3B5 */ jal func_80B70ED4 /* 08A28 80B723C8 26250014 */ addiu $a1, $s1, 0x0014 ## $a1 = 00000014 -/* 08A2C 80B723CC 10000BAB */ beq $zero, $zero, .L80B7527C +/* 08A2C 80B723CC 10000BAB */ beq $zero, $zero, .L80B7527C /* 08A30 80B723D0 8604015C */ lh $a0, 0x015C($s0) ## 0000015C .L80B723D4: /* 08A34 80B723D4 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 08A38 80B723D8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 08A3C 80B723DC 01E1C024 */ and $t8, $t7, $at -/* 08A40 80B723E0 10000BA5 */ beq $zero, $zero, .L80B75278 +/* 08A3C 80B723DC 01E1C024 */ and $t8, $t7, $at +/* 08A40 80B723E0 10000BA5 */ beq $zero, $zero, .L80B75278 /* 08A44 80B723E4 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 glabel L80B723E8 /* 08A48 80B723E8 26040166 */ addiu $a0, $s0, 0x0166 ## $a0 = 00000166 /* 08A4C 80B723EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 08A50 80B723F0 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 08A54 80B723F4 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 08A58 80B723F8 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 /* 08A5C 80B723FC 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 08A60 80B72400 44813000 */ mtc1 $at, $f6 ## $f6 = 250.00 -/* 08A64 80B72404 C7A40118 */ lwc1 $f4, 0x0118($sp) +/* 08A64 80B72404 C7A40118 */ lwc1 $f4, 0x0118($sp) /* 08A68 80B72408 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 -/* 08A6C 80B7240C 46043202 */ mul.s $f8, $f6, $f4 -/* 08A70 80B72410 4608503C */ c.lt.s $f10, $f8 +/* 08A6C 80B7240C 46043202 */ mul.s $f8, $f6, $f4 +/* 08A70 80B72410 4608503C */ c.lt.s $f10, $f8 /* 08A74 80B72414 00000000 */ nop -/* 08A78 80B72418 45030005 */ bc1tl .L80B72430 -/* 08A7C 80B7241C 4406A000 */ mfc1 $a2, $f20 +/* 08A78 80B72418 45030005 */ bc1tl .L80B72430 +/* 08A7C 80B7241C 4406A000 */ mfc1 $a2, $f20 /* 08A80 80B72420 860A017C */ lh $t2, 0x017C($s0) ## 0000017C -/* 08A84 80B72424 51400024 */ beql $t2, $zero, .L80B724B8 +/* 08A84 80B72424 51400024 */ beql $t2, $zero, .L80B724B8 /* 08A88 80B72428 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 08A8C 80B7242C 4406A000 */ mfc1 $a2, $f20 +/* 08A8C 80B7242C 4406A000 */ mfc1 $a2, $f20 .L80B72430: /* 08A90 80B72430 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08A94 80B72434 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 /* 08A98 80B72438 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08A9C 80B7243C 3C073F40 */ lui $a3, 0x3F40 ## $a3 = 3F400000 /* 08AA0 80B72440 3C01457A */ lui $at, 0x457A ## $at = 457A0000 /* 08AA4 80B72444 44813000 */ mtc1 $at, $f6 ## $f6 = 4000.00 /* 08AA8 80B72448 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 08AAC 80B7244C 4406A000 */ mfc1 $a2, $f20 +/* 08AAC 80B7244C 4406A000 */ mfc1 $a2, $f20 /* 08AB0 80B72450 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 08AB4 80B72454 A619017A */ sh $t9, 0x017A($s0) ## 0000017A /* 08AB8 80B72458 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08ABC 80B7245C 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 /* 08AC0 80B72460 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 08AC4 80B72464 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08AC8 80B72468 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 /* 08ACC 80B7246C 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 08AD0 80B72470 01916021 */ addu $t4, $t4, $s1 +/* 08AD0 80B72470 01916021 */ addu $t4, $t4, $s1 /* 08AD4 80B72474 8D8C1DE4 */ lw $t4, 0x1DE4($t4) ## 00011DE4 /* 08AD8 80B72478 3189001F */ andi $t1, $t4, 0x001F ## $t1 = 00000000 -/* 08ADC 80B7247C 15200036 */ bne $t1, $zero, .L80B72558 +/* 08ADC 80B7247C 15200036 */ bne $t1, $zero, .L80B72558 /* 08AE0 80B72480 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 08AE4 80B72484 44816000 */ mtc1 $at, $f12 ## $f12 = 600.00 /* 08AE8 80B72488 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 08AEC 80B7248C 00000000 */ nop /* 08AF0 80B72490 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 08AF4 80B72494 44816000 */ mtc1 $at, $f12 ## $f12 = 600.00 /* 08AF8 80B72498 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 08AFC 80B7249C E60001B4 */ swc1 $f0, 0x01B4($s0) ## 000001B4 /* 08B00 80B724A0 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 /* 08B04 80B724A4 44812000 */ mtc1 $at, $f4 ## $f4 = -120.00 /* 08B08 80B724A8 E60001BC */ swc1 $f0, 0x01BC($s0) ## 000001BC -/* 08B0C 80B724AC 1000002A */ beq $zero, $zero, .L80B72558 +/* 08B0C 80B724AC 1000002A */ beq $zero, $zero, .L80B72558 /* 08B10 80B724B0 E60401B8 */ swc1 $f4, 0x01B8($s0) ## 000001B8 /* 08B14 80B724B4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L80B724B8: /* 08B18 80B724B8 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 08B1C 80B724BC C7A80124 */ lwc1 $f8, 0x0124($sp) -/* 08B20 80B724C0 4608503C */ c.lt.s $f10, $f8 +/* 08B1C 80B724BC C7A80124 */ lwc1 $f8, 0x0124($sp) +/* 08B20 80B724C0 4608503C */ c.lt.s $f10, $f8 /* 08B24 80B724C4 00000000 */ nop -/* 08B28 80B724C8 45000013 */ bc1f .L80B72518 +/* 08B28 80B724C8 45000013 */ bc1f .L80B72518 /* 08B2C 80B724CC 3C0180B8 */ lui $at, %hi(D_80B7B650) ## $at = 80B80000 -/* 08B30 80B724D0 C426B650 */ lwc1 $f6, %lo(D_80B7B650)($at) +/* 08B30 80B724D0 C426B650 */ lwc1 $f6, %lo(D_80B7B650)($at) /* 08B34 80B724D4 3C0180B8 */ lui $at, %hi(D_80B7B654) ## $at = 80B80000 -/* 08B38 80B724D8 4405A000 */ mfc1 $a1, $f20 +/* 08B38 80B724D8 4405A000 */ mfc1 $a1, $f20 /* 08B3C 80B724DC E6060190 */ swc1 $f6, 0x0190($s0) ## 00000190 -/* 08B40 80B724E0 C424B654 */ lwc1 $f4, %lo(D_80B7B654)($at) -/* 08B44 80B724E4 4406A000 */ mfc1 $a2, $f20 +/* 08B40 80B724E0 C424B654 */ lwc1 $f4, %lo(D_80B7B654)($at) +/* 08B44 80B724E4 4406A000 */ mfc1 $a2, $f20 /* 08B48 80B724E8 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 08B4C 80B724EC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 08B50 80B724F0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08B54 80B724F4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08B58 80B724F8 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 -/* 08B5C 80B724FC 4406A000 */ mfc1 $a2, $f20 +/* 08B5C 80B724FC 4406A000 */ mfc1 $a2, $f20 /* 08B60 80B72500 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08B64 80B72504 3C054500 */ lui $a1, 0x4500 ## $a1 = 45000000 /* 08B68 80B72508 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08B6C 80B7250C 3C074300 */ lui $a3, 0x4300 ## $a3 = 43000000 -/* 08B70 80B72510 10000012 */ beq $zero, $zero, .L80B7255C +/* 08B70 80B72510 10000012 */ beq $zero, $zero, .L80B7255C /* 08B74 80B72514 860201A4 */ lh $v0, 0x01A4($s0) ## 000001A4 .L80B72518: /* 08B78 80B72518 3C0180B8 */ lui $at, %hi(D_80B7B658) ## $at = 80B80000 -/* 08B7C 80B7251C C42AB658 */ lwc1 $f10, %lo(D_80B7B658)($at) +/* 08B7C 80B7251C C42AB658 */ lwc1 $f10, %lo(D_80B7B658)($at) /* 08B80 80B72520 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 08B84 80B72524 44814000 */ mtc1 $at, $f8 ## $f8 = 500.00 -/* 08B88 80B72528 4405A000 */ mfc1 $a1, $f20 +/* 08B88 80B72528 4405A000 */ mfc1 $a1, $f20 /* 08B8C 80B7252C 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 /* 08B90 80B72530 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 08B94 80B72534 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08B98 80B72538 E60A0190 */ swc1 $f10, 0x0190($s0) ## 00000190 /* 08B9C 80B7253C 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 08BA0 80B72540 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 -/* 08BA4 80B72544 4406A000 */ mfc1 $a2, $f20 +/* 08BA4 80B72544 4406A000 */ mfc1 $a2, $f20 /* 08BA8 80B72548 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08BAC 80B7254C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 08BB0 80B72550 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08BB4 80B72554 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 .L80B72558: /* 08BB8 80B72558 860201A4 */ lh $v0, 0x01A4($s0) ## 000001A4 .L80B7255C: -/* 08BBC 80B7255C 14400005 */ bne $v0, $zero, .L80B72574 +/* 08BBC 80B7255C 14400005 */ bne $v0, $zero, .L80B72574 /* 08BC0 80B72560 00000000 */ nop /* 08BC4 80B72564 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A /* 08BC8 80B72568 A6020158 */ sh $v0, 0x0158($s0) ## 00000158 -/* 08BCC 80B7256C 10000022 */ beq $zero, $zero, .L80B725F8 +/* 08BCC 80B7256C 10000022 */ beq $zero, $zero, .L80B725F8 /* 08BD0 80B72570 A602015A */ sh $v0, 0x015A($s0) ## 0000015A .L80B72574: /* 08BD4 80B72574 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 08BD8 80B72578 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 /* 08BDC 80B7257C 846B09D8 */ lh $t3, 0x09D8($v1) ## 801609D8 -/* 08BE0 80B72580 15600005 */ bne $t3, $zero, .L80B72598 +/* 08BE0 80B72580 15600005 */ bne $t3, $zero, .L80B72598 /* 08BE4 80B72584 304D07FF */ andi $t5, $v0, 0x07FF ## $t5 = 0000000A -/* 08BE8 80B72588 15A0001B */ bne $t5, $zero, .L80B725F8 -/* 08BEC 80B7258C 28413A98 */ slti $at, $v0, 0x3A98 -/* 08BF0 80B72590 5020001A */ beql $at, $zero, .L80B725FC +/* 08BE8 80B72588 15A0001B */ bne $t5, $zero, .L80B725F8 +/* 08BEC 80B7258C 28413A98 */ slti $at, $v0, 0x3A98 +/* 08BF0 80B72590 5020001A */ beql $at, $zero, .L80B725FC /* 08BF4 80B72594 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 .L80B72598: /* 08BF8 80B72598 A46009D8 */ sh $zero, 0x09D8($v1) ## 801609D8 @@ -1119,46 +1119,46 @@ glabel L80B723E8 /* 08C28 80B725C8 85590002 */ lh $t9, 0x0002($t2) ## 00000002 /* 08C2C 80B725CC 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 /* 08C30 80B725D0 00000000 */ nop -/* 08C34 80B725D4 46803120 */ cvt.s.w $f4, $f6 -/* 08C38 80B725D8 460A2200 */ add.s $f8, $f4, $f10 +/* 08C34 80B725D4 46803120 */ cvt.s.w $f4, $f6 +/* 08C38 80B725D8 460A2200 */ add.s $f8, $f4, $f10 /* 08C3C 80B725DC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08C40 80B725E0 E60801B8 */ swc1 $f8, 0x01B8($s0) ## 000001B8 /* 08C44 80B725E4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 08C48 80B725E8 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 08C4C 80B725EC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08C50 80B725F0 E60001B4 */ swc1 $f0, 0x01B4($s0) ## 000001B4 /* 08C54 80B725F4 E60001BC */ swc1 $f0, 0x01BC($s0) ## 000001BC .L80B725F8: /* 08C58 80B725F8 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 .L80B725FC: /* 08C5C 80B725FC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 08C60 80B72600 01814824 */ and $t1, $t4, $at -/* 08C64 80B72604 10000B1C */ beq $zero, $zero, .L80B75278 +/* 08C60 80B72600 01814824 */ and $t1, $t4, $at +/* 08C64 80B72604 10000B1C */ beq $zero, $zero, .L80B75278 /* 08C68 80B72608 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 glabel L80B7260C /* 08C6C 80B7260C 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 08C70 80B72610 44812000 */ mtc1 $at, $f4 ## $f4 = 250.00 -/* 08C74 80B72614 C7AA0118 */ lwc1 $f10, 0x0118($sp) +/* 08C74 80B72614 C7AA0118 */ lwc1 $f10, 0x0118($sp) /* 08C78 80B72618 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 08C7C 80B7261C 460A2202 */ mul.s $f8, $f4, $f10 -/* 08C80 80B72620 4608303C */ c.lt.s $f6, $f8 +/* 08C7C 80B7261C 460A2202 */ mul.s $f8, $f4, $f10 +/* 08C80 80B72620 4608303C */ c.lt.s $f6, $f8 /* 08C84 80B72624 00000000 */ nop -/* 08C88 80B72628 45030004 */ bc1tl .L80B7263C +/* 08C88 80B72628 45030004 */ bc1tl .L80B7263C /* 08C8C 80B7262C 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 /* 08C90 80B72630 860B017C */ lh $t3, 0x017C($s0) ## 0000017C -/* 08C94 80B72634 11600006 */ beq $t3, $zero, .L80B72650 +/* 08C94 80B72634 11600006 */ beq $t3, $zero, .L80B72650 /* 08C98 80B72638 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 .L80B7263C: /* 08C9C 80B7263C 44812000 */ mtc1 $at, $f4 ## $f4 = -120.00 /* 08CA0 80B72640 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF /* 08CA4 80B72644 A60D0158 */ sh $t5, 0x0158($s0) ## 00000158 -/* 08CA8 80B72648 10000B0B */ beq $zero, $zero, .L80B75278 +/* 08CA8 80B72648 10000B0B */ beq $zero, $zero, .L80B75278 /* 08CAC 80B7264C E60401B8 */ swc1 $f4, 0x01B8($s0) ## 000001B8 .L80B72650: /* 08CB0 80B72650 3C0180B8 */ lui $at, %hi(D_80B7B65C) ## $at = 80B80000 -/* 08CB4 80B72654 C42AB65C */ lwc1 $f10, %lo(D_80B7B65C)($at) +/* 08CB4 80B72654 C42AB65C */ lwc1 $f10, %lo(D_80B7B65C)($at) /* 08CB8 80B72658 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 08CBC 80B7265C 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 /* 08CC0 80B72660 26040166 */ addiu $a0, $s0, 0x0166 ## $a0 = 00000166 @@ -1167,7 +1167,7 @@ glabel L80B7260C /* 08CCC 80B7266C 24070100 */ addiu $a3, $zero, 0x0100 ## $a3 = 00000100 /* 08CD0 80B72670 E60A0190 */ swc1 $f10, 0x0190($s0) ## 00000190 /* 08CD4 80B72674 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 08CD8 80B72678 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 /* 08CDC 80B7267C 8E2E07C0 */ lw $t6, 0x07C0($s1) ## 000007C0 /* 08CE0 80B72680 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -1177,33 +1177,33 @@ glabel L80B7260C /* 08CF0 80B72690 85F80002 */ lh $t8, 0x0002($t7) ## 00000002 /* 08CF4 80B72694 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 08CF8 80B72698 00000000 */ nop -/* 08CFC 80B7269C 468022A0 */ cvt.s.w $f10, $f4 -/* 08D00 80B726A0 46065101 */ sub.s $f4, $f10, $f6 -/* 08D04 80B726A4 4604403C */ c.lt.s $f8, $f4 +/* 08CFC 80B7269C 468022A0 */ cvt.s.w $f10, $f4 +/* 08D00 80B726A0 46065101 */ sub.s $f4, $f10, $f6 +/* 08D04 80B726A4 4604403C */ c.lt.s $f8, $f4 /* 08D08 80B726A8 00000000 */ nop -/* 08D0C 80B726AC 4502000A */ bc1fl .L80B726D8 -/* 08D10 80B726B0 4405A000 */ mfc1 $a1, $f20 -/* 08D14 80B726B4 4406A000 */ mfc1 $a2, $f20 +/* 08D0C 80B726AC 4502000A */ bc1fl .L80B726D8 +/* 08D10 80B726B0 4405A000 */ mfc1 $a1, $f20 +/* 08D14 80B726B4 4406A000 */ mfc1 $a2, $f20 /* 08D18 80B726B8 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 08D1C 80B726BC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 08D20 80B726C0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08D24 80B726C4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08D28 80B726C8 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 08D2C 80B726CC 1000005B */ beq $zero, $zero, .L80B7283C -/* 08D30 80B726D0 4406A000 */ mfc1 $a2, $f20 -/* 08D34 80B726D4 4405A000 */ mfc1 $a1, $f20 +/* 08D2C 80B726CC 1000005B */ beq $zero, $zero, .L80B7283C +/* 08D30 80B726D0 4406A000 */ mfc1 $a2, $f20 +/* 08D34 80B726D4 4405A000 */ mfc1 $a1, $f20 .L80B726D8: /* 08D38 80B726D8 3C063C23 */ lui $a2, 0x3C23 ## $a2 = 3C230000 /* 08D3C 80B726DC 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3C23D70A /* 08D40 80B726E0 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 08D44 80B726E4 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08D48 80B726E8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 08D4C 80B726EC C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 08D50 80B726F0 46065032 */ c.eq.s $f10, $f6 +/* 08D50 80B726F0 46065032 */ c.eq.s $f10, $f6 /* 08D54 80B726F4 00000000 */ nop -/* 08D58 80B726F8 4503000F */ bc1tl .L80B72738 +/* 08D58 80B726F8 4503000F */ bc1tl .L80B72738 /* 08D5C 80B726FC 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 08D60 80B72700 8E2A07C0 */ lw $t2, 0x07C0($s1) ## 000007C0 /* 08D64 80B72704 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -1212,29 +1212,29 @@ glabel L80B7260C /* 08D70 80B72710 872C0002 */ lh $t4, 0x0002($t9) ## 00000002 /* 08D74 80B72714 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 /* 08D78 80B72718 00000000 */ nop -/* 08D7C 80B7271C 46804120 */ cvt.s.w $f4, $f8 +/* 08D7C 80B7271C 46804120 */ cvt.s.w $f4, $f8 /* 08D80 80B72720 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 08D84 80B72724 460A2181 */ sub.s $f6, $f4, $f10 -/* 08D88 80B72728 4608303C */ c.lt.s $f6, $f8 +/* 08D84 80B72724 460A2181 */ sub.s $f6, $f4, $f10 +/* 08D88 80B72728 4608303C */ c.lt.s $f6, $f8 /* 08D8C 80B7272C 00000000 */ nop -/* 08D90 80B72730 45000041 */ bc1f .L80B72838 +/* 08D90 80B72730 45000041 */ bc1f .L80B72838 /* 08D94 80B72734 3C014396 */ lui $at, 0x4396 ## $at = 43960000 .L80B72738: /* 08D98 80B72738 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 /* 08D9C 80B7273C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08DA0 80B72740 00000000 */ nop /* 08DA4 80B72744 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 08DA8 80B72748 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 /* 08DAC 80B7274C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08DB0 80B72750 E60001B4 */ swc1 $f0, 0x01B4($s0) ## 000001B4 /* 08DB4 80B72754 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 08DB8 80B72758 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 08DBC 80B7275C C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 /* 08DC0 80B72760 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 08DC4 80B72764 8E0D01C0 */ lw $t5, 0x01C0($s0) ## 000001C0 -/* 08DC8 80B72768 460A2180 */ add.s $f6, $f4, $f10 +/* 08DC8 80B72768 460A2180 */ add.s $f6, $f4, $f10 /* 08DCC 80B7276C 2409FFE7 */ addiu $t1, $zero, 0xFFE7 ## $t1 = FFFFFFE7 /* 08DD0 80B72770 27A600B8 */ addiu $a2, $sp, 0x00B8 ## $a2 = FFFFFF80 /* 08DD4 80B72774 E60001BC */ swc1 $f0, 0x01BC($s0) ## 000001BC @@ -1244,7 +1244,7 @@ glabel L80B7260C /* 08DE4 80B72784 ACCD0000 */ sw $t5, 0x0000($a2) ## FFFFFF80 /* 08DE8 80B72788 8E0B01C4 */ lw $t3, 0x01C4($s0) ## 000001C4 /* 08DEC 80B7278C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 08DF0 80B72790 0221C821 */ addu $t9, $s1, $at +/* 08DF0 80B72790 0221C821 */ addu $t9, $s1, $at /* 08DF4 80B72794 ACCB0004 */ sw $t3, 0x0004($a2) ## FFFFFF84 /* 08DF8 80B72798 8E0D01C8 */ lw $t5, 0x01C8($s0) ## 000001C8 /* 08DFC 80B7279C 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 @@ -1257,201 +1257,201 @@ glabel L80B7260C /* 08E18 80B727B8 24090096 */ addiu $t1, $zero, 0x0096 ## $t1 = 00000096 /* 08E1C 80B727BC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 08E20 80B727C0 85F80002 */ lh $t8, 0x0002($t7) ## 00000002 -/* 08E24 80B727C4 AFB90048 */ sw $t9, 0x0048($sp) -/* 08E28 80B727C8 AFA4004C */ sw $a0, 0x004C($sp) +/* 08E24 80B727C4 AFB90048 */ sw $t9, 0x0048($sp) +/* 08E28 80B727C8 AFA4004C */ sw $a0, 0x004C($sp) /* 08E2C 80B727CC 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 08E30 80B727D0 00000000 */ nop -/* 08E34 80B727D4 468022A0 */ cvt.s.w $f10, $f4 -/* 08E38 80B727D8 E7AA00BC */ swc1 $f10, 0x00BC($sp) +/* 08E34 80B727D4 468022A0 */ cvt.s.w $f10, $f4 +/* 08E38 80B727D8 E7AA00BC */ swc1 $f10, 0x00BC($sp) /* 08E3C 80B727DC 8F251E10 */ lw $a1, 0x1E10($t9) ## 00001E10 -/* 08E40 80B727E0 AFAB0018 */ sw $t3, 0x0018($sp) -/* 08E44 80B727E4 AFA90014 */ sw $t1, 0x0014($sp) -/* 08E48 80B727E8 0C2DA70B */ jal func_80B69C2C -/* 08E4C 80B727EC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 08E50 80B727F0 8FAD0048 */ lw $t5, 0x0048($sp) +/* 08E40 80B727E0 AFAB0018 */ sw $t3, 0x0018($sp) +/* 08E44 80B727E4 AFA90014 */ sw $t1, 0x0014($sp) +/* 08E48 80B727E8 0C2DA70B */ jal func_80B69C2C +/* 08E4C 80B727EC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 08E50 80B727F0 8FAD0048 */ lw $t5, 0x0048($sp) /* 08E54 80B727F4 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 08E58 80B727F8 44814000 */ mtc1 $at, $f8 ## $f8 = 400.00 /* 08E5C 80B727FC 8DA51E10 */ lw $a1, 0x1E10($t5) ## 00001E10 /* 08E60 80B72800 240E0096 */ addiu $t6, $zero, 0x0096 ## $t6 = 00000096 /* 08E64 80B72804 240F005A */ addiu $t7, $zero, 0x005A ## $t7 = 0000005A -/* 08E68 80B72808 AFAF0018 */ sw $t7, 0x0018($sp) -/* 08E6C 80B7280C AFAE0014 */ sw $t6, 0x0014($sp) -/* 08E70 80B72810 8FA4004C */ lw $a0, 0x004C($sp) +/* 08E68 80B72808 AFAF0018 */ sw $t7, 0x0018($sp) +/* 08E6C 80B7280C AFAE0014 */ sw $t6, 0x0014($sp) +/* 08E70 80B72810 8FA4004C */ lw $a0, 0x004C($sp) /* 08E74 80B72814 27A600B8 */ addiu $a2, $sp, 0x00B8 ## $a2 = FFFFFF80 /* 08E78 80B72818 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 08E7C 80B7281C 0C2DA70B */ jal func_80B69C2C -/* 08E80 80B72820 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 08E7C 80B7281C 0C2DA70B */ jal func_80B69C2C +/* 08E80 80B72820 E7A80010 */ swc1 $f8, 0x0010($sp) /* 08E84 80B72824 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08E88 80B72828 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 08E8C 80B7282C 24050836 */ addiu $a1, $zero, 0x0836 ## $a1 = 00000836 -/* 08E90 80B72830 10000A92 */ beq $zero, $zero, .L80B7527C +/* 08E90 80B72830 10000A92 */ beq $zero, $zero, .L80B7527C /* 08E94 80B72834 8604015C */ lh $a0, 0x015C($s0) ## 0000015C .L80B72838: -/* 08E98 80B72838 4406A000 */ mfc1 $a2, $f20 +/* 08E98 80B72838 4406A000 */ mfc1 $a2, $f20 .L80B7283C: /* 08E9C 80B7283C 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08EA0 80B72840 3C054500 */ lui $a1, 0x4500 ## $a1 = 45000000 /* 08EA4 80B72844 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08EA8 80B72848 3C074300 */ lui $a3, 0x4300 ## $a3 = 43000000 /* 08EAC 80B7284C 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 08EB0 80B72850 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 08EB4 80B72854 03015024 */ and $t2, $t8, $at -/* 08EB8 80B72858 10000A87 */ beq $zero, $zero, .L80B75278 +/* 08EB4 80B72854 03015024 */ and $t2, $t8, $at +/* 08EB8 80B72858 10000A87 */ beq $zero, $zero, .L80B75278 /* 08EBC 80B7285C AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 glabel L80B72860 /* 08EC0 80B72860 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 08EC4 80B72864 44815000 */ mtc1 $at, $f10 ## $f10 = 250.00 -/* 08EC8 80B72868 C7A60118 */ lwc1 $f6, 0x0118($sp) +/* 08EC8 80B72868 C7A60118 */ lwc1 $f6, 0x0118($sp) /* 08ECC 80B7286C C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 08ED0 80B72870 46065202 */ mul.s $f8, $f10, $f6 -/* 08ED4 80B72874 4608203C */ c.lt.s $f4, $f8 +/* 08ED0 80B72870 46065202 */ mul.s $f8, $f10, $f6 +/* 08ED4 80B72874 4608203C */ c.lt.s $f4, $f8 /* 08ED8 80B72878 00000000 */ nop -/* 08EDC 80B7287C 45030004 */ bc1tl .L80B72890 +/* 08EDC 80B7287C 45030004 */ bc1tl .L80B72890 /* 08EE0 80B72880 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 /* 08EE4 80B72884 8619017C */ lh $t9, 0x017C($s0) ## 0000017C -/* 08EE8 80B72888 13200006 */ beq $t9, $zero, .L80B728A4 +/* 08EE8 80B72888 13200006 */ beq $t9, $zero, .L80B728A4 /* 08EEC 80B7288C 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 .L80B72890: /* 08EF0 80B72890 44815000 */ mtc1 $at, $f10 ## $f10 = -120.00 /* 08EF4 80B72894 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF /* 08EF8 80B72898 A60C0158 */ sh $t4, 0x0158($s0) ## 00000158 -/* 08EFC 80B7289C 10000A76 */ beq $zero, $zero, .L80B75278 +/* 08EFC 80B7289C 10000A76 */ beq $zero, $zero, .L80B75278 /* 08F00 80B728A0 E60A01B8 */ swc1 $f10, 0x01B8($s0) ## 000001B8 .L80B728A4: /* 08F04 80B728A4 26040166 */ addiu $a0, $s0, 0x0166 ## $a0 = 00000166 /* 08F08 80B728A8 24051000 */ addiu $a1, $zero, 0x1000 ## $a1 = 00001000 /* 08F0C 80B728AC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 08F10 80B728B0 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 08F14 80B728B4 2407006A */ addiu $a3, $zero, 0x006A ## $a3 = 0000006A /* 08F18 80B728B8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 08F1C 80B728BC 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 08F20 80B728C0 C7A40124 */ lwc1 $f4, 0x0124($sp) -/* 08F24 80B728C4 4604303C */ c.lt.s $f6, $f4 +/* 08F20 80B728C0 C7A40124 */ lwc1 $f4, 0x0124($sp) +/* 08F24 80B728C4 4604303C */ c.lt.s $f6, $f4 /* 08F28 80B728C8 00000000 */ nop -/* 08F2C 80B728CC 45000013 */ bc1f .L80B7291C +/* 08F2C 80B728CC 45000013 */ bc1f .L80B7291C /* 08F30 80B728D0 3C0180B8 */ lui $at, %hi(D_80B7B660) ## $at = 80B80000 -/* 08F34 80B728D4 C428B660 */ lwc1 $f8, %lo(D_80B7B660)($at) +/* 08F34 80B728D4 C428B660 */ lwc1 $f8, %lo(D_80B7B660)($at) /* 08F38 80B728D8 3C014496 */ lui $at, 0x4496 ## $at = 44960000 /* 08F3C 80B728DC 44815000 */ mtc1 $at, $f10 ## $f10 = 1200.00 -/* 08F40 80B728E0 4406A000 */ mfc1 $a2, $f20 +/* 08F40 80B728E0 4406A000 */ mfc1 $a2, $f20 /* 08F44 80B728E4 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 08F48 80B728E8 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 08F4C 80B728EC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08F50 80B728F0 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 08F54 80B728F4 E6080190 */ swc1 $f8, 0x0190($s0) ## 00000190 /* 08F58 80B728F8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08F5C 80B728FC E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 -/* 08F60 80B72900 4406A000 */ mfc1 $a2, $f20 +/* 08F60 80B72900 4406A000 */ mfc1 $a2, $f20 /* 08F64 80B72904 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08F68 80B72908 3C054500 */ lui $a1, 0x4500 ## $a1 = 45000000 /* 08F6C 80B7290C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08F70 80B72910 3C074300 */ lui $a3, 0x4300 ## $a3 = 43000000 -/* 08F74 80B72914 10000A59 */ beq $zero, $zero, .L80B7527C +/* 08F74 80B72914 10000A59 */ beq $zero, $zero, .L80B7527C /* 08F78 80B72918 8604015C */ lh $a0, 0x015C($s0) ## 0000015C .L80B7291C: /* 08F7C 80B7291C 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 08F80 80B72920 10000A55 */ beq $zero, $zero, .L80B75278 +/* 08F80 80B72920 10000A55 */ beq $zero, $zero, .L80B75278 /* 08F84 80B72924 A6090158 */ sh $t1, 0x0158($s0) ## 00000158 glabel L80B72928 /* 08F88 80B72928 3C0D80B8 */ lui $t5, %hi(D_80B7E118) ## $t5 = 80B80000 -/* 08F8C 80B7292C 91ADE118 */ lbu $t5, %lo(D_80B7E118)($t5) +/* 08F8C 80B7292C 91ADE118 */ lbu $t5, %lo(D_80B7E118)($t5) /* 08F90 80B72930 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 08F94 80B72934 016D7021 */ addu $t6, $t3, $t5 +/* 08F94 80B72934 016D7021 */ addu $t6, $t3, $t5 /* 08F98 80B72938 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 08F9C 80B7293C 11E00004 */ beq $t7, $zero, .L80B72950 +/* 08F9C 80B7293C 11E00004 */ beq $t7, $zero, .L80B72950 /* 08FA0 80B72940 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 08FA4 80B72944 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 08FA8 80B72948 10000005 */ beq $zero, $zero, .L80B72960 -/* 08FAC 80B7294C E7A6010C */ swc1 $f6, 0x010C($sp) +/* 08FA8 80B72948 10000005 */ beq $zero, $zero, .L80B72960 +/* 08FAC 80B7294C E7A6010C */ swc1 $f6, 0x010C($sp) .L80B72950: /* 08FB0 80B72950 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 08FB4 80B72954 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 /* 08FB8 80B72958 00000000 */ nop -/* 08FBC 80B7295C E7A4010C */ swc1 $f4, 0x010C($sp) +/* 08FBC 80B7295C E7A4010C */ swc1 $f4, 0x010C($sp) .L80B72960: /* 08FC0 80B72960 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 08FC4 80B72964 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 08FC8 80B72968 3C0180B8 */ lui $at, %hi(D_80B7E0DC) ## $at = 80B80000 -/* 08FCC 80B7296C C42CE0DC */ lwc1 $f12, %lo(D_80B7E0DC)($at) +/* 08FCC 80B7296C C42CE0DC */ lwc1 $f12, %lo(D_80B7E0DC)($at) /* 08FD0 80B72970 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 08FD4 80B72974 E7A80110 */ swc1 $f8, 0x0110($sp) -/* 08FD8 80B72978 0C034348 */ jal Matrix_RotateY -/* 08FDC 80B7297C E7AA0114 */ swc1 $f10, 0x0114($sp) +/* 08FD4 80B72974 E7A80110 */ swc1 $f8, 0x0110($sp) +/* 08FD8 80B72978 0C034348 */ jal Matrix_RotateY +/* 08FDC 80B7297C E7AA0114 */ swc1 $f10, 0x0114($sp) /* 08FE0 80B72980 27A4010C */ addiu $a0, $sp, 0x010C ## $a0 = FFFFFFD4 -/* 08FE4 80B72984 0C0346BD */ jal Matrix_MultVec3f +/* 08FE4 80B72984 0C0346BD */ jal Matrix_MultVec3f /* 08FE8 80B72988 27A50100 */ addiu $a1, $sp, 0x0100 ## $a1 = FFFFFFC8 /* 08FEC 80B7298C 3C0280B8 */ lui $v0, %hi(D_80B7E0B8) ## $v0 = 80B80000 /* 08FF0 80B72990 2442E0B8 */ addiu $v0, $v0, %lo(D_80B7E0B8) ## $v0 = 80B7E0B8 /* 08FF4 80B72994 C4460000 */ lwc1 $f6, 0x0000($v0) ## 80B7E0B8 -/* 08FF8 80B72998 C7A40100 */ lwc1 $f4, 0x0100($sp) +/* 08FF8 80B72998 C7A40100 */ lwc1 $f4, 0x0100($sp) /* 08FFC 80B7299C 3C1880B8 */ lui $t8, %hi(D_80B7E0B6) ## $t8 = 80B80000 /* 09000 80B729A0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 09004 80B729A4 46043200 */ add.s $f8, $f6, $f4 +/* 09004 80B729A4 46043200 */ add.s $f8, $f6, $f4 /* 09008 80B729A8 E60801B4 */ swc1 $f8, 0x01B4($s0) ## 000001B4 -/* 0900C 80B729AC C7A60108 */ lwc1 $f6, 0x0108($sp) +/* 0900C 80B729AC C7A60108 */ lwc1 $f6, 0x0108($sp) /* 09010 80B729B0 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80B7E0C0 -/* 09014 80B729B4 46065100 */ add.s $f4, $f10, $f6 +/* 09014 80B729B4 46065100 */ add.s $f4, $f10, $f6 /* 09018 80B729B8 E60401BC */ swc1 $f4, 0x01BC($s0) ## 000001BC -/* 0901C 80B729BC 9318E0B6 */ lbu $t8, %lo(D_80B7E0B6)($t8) -/* 09020 80B729C0 57010005 */ bnel $t8, $at, .L80B729D8 +/* 0901C 80B729BC 9318E0B6 */ lbu $t8, %lo(D_80B7E0B6)($t8) +/* 09020 80B729C0 57010005 */ bnel $t8, $at, .L80B729D8 /* 09024 80B729C4 920A0150 */ lbu $t2, 0x0150($s0) ## 00000150 /* 09028 80B729C8 C4480004 */ lwc1 $f8, 0x0004($v0) ## 80B7E0BC -/* 0902C 80B729CC 1000000E */ beq $zero, $zero, .L80B72A08 +/* 0902C 80B729CC 1000000E */ beq $zero, $zero, .L80B72A08 /* 09030 80B729D0 E60801B8 */ swc1 $f8, 0x01B8($s0) ## 000001B8 /* 09034 80B729D4 920A0150 */ lbu $t2, 0x0150($s0) ## 00000150 .L80B729D8: -/* 09038 80B729D8 15400006 */ bne $t2, $zero, .L80B729F4 +/* 09038 80B729D8 15400006 */ bne $t2, $zero, .L80B729F4 /* 0903C 80B729DC 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 09040 80B729E0 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 /* 09044 80B729E4 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 80B7E0BC -/* 09048 80B729E8 46065101 */ sub.s $f4, $f10, $f6 -/* 0904C 80B729EC 10000006 */ beq $zero, $zero, .L80B72A08 +/* 09048 80B729E8 46065101 */ sub.s $f4, $f10, $f6 +/* 0904C 80B729EC 10000006 */ beq $zero, $zero, .L80B72A08 /* 09050 80B729F0 E60401B8 */ swc1 $f4, 0x01B8($s0) ## 000001B8 .L80B729F4: /* 09054 80B729F4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09058 80B729F8 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 /* 0905C 80B729FC C4480004 */ lwc1 $f8, 0x0004($v0) ## 80B7E0BC -/* 09060 80B72A00 460A4181 */ sub.s $f6, $f8, $f10 +/* 09060 80B72A00 460A4181 */ sub.s $f6, $f8, $f10 /* 09064 80B72A04 E60601B8 */ swc1 $f6, 0x01B8($s0) ## 000001B8 .L80B72A08: /* 09068 80B72A08 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 /* 0906C 80B72A0C C60401B8 */ lwc1 $f4, 0x01B8($s0) ## 000001B8 -/* 09070 80B72A10 4600203E */ c.le.s $f4, $f0 +/* 09070 80B72A10 4600203E */ c.le.s $f4, $f0 /* 09074 80B72A14 00000000 */ nop -/* 09078 80B72A18 45000005 */ bc1f .L80B72A30 +/* 09078 80B72A18 45000005 */ bc1f .L80B72A30 /* 0907C 80B72A1C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 09080 80B72A20 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 /* 09084 80B72A24 00000000 */ nop -/* 09088 80B72A28 46080280 */ add.s $f10, $f0, $f8 +/* 09088 80B72A28 46080280 */ add.s $f10, $f0, $f8 /* 0908C 80B72A2C E60A01B8 */ swc1 $f10, 0x01B8($s0) ## 000001B8 .L80B72A30: /* 09090 80B72A30 3C1980B8 */ lui $t9, %hi(D_80B7E0B6) ## $t9 = 80B80000 -/* 09094 80B72A34 9339E0B6 */ lbu $t9, %lo(D_80B7E0B6)($t9) +/* 09094 80B72A34 9339E0B6 */ lbu $t9, %lo(D_80B7E0B6)($t9) /* 09098 80B72A38 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0909C 80B72A3C 13210012 */ beq $t9, $at, .L80B72A88 +/* 0909C 80B72A3C 13210012 */ beq $t9, $at, .L80B72A88 /* 090A0 80B72A40 00000000 */ nop /* 090A4 80B72A44 C60201B8 */ lwc1 $f2, 0x01B8($s0) ## 000001B8 /* 090A8 80B72A48 C6000028 */ lwc1 $f0, 0x0028($s0) ## 00000028 -/* 090AC 80B72A4C 4600103C */ c.lt.s $f2, $f0 +/* 090AC 80B72A4C 4600103C */ c.lt.s $f2, $f0 /* 090B0 80B72A50 00000000 */ nop -/* 090B4 80B72A54 4500000C */ bc1f .L80B72A88 +/* 090B4 80B72A54 4500000C */ bc1f .L80B72A88 /* 090B8 80B72A58 00000000 */ nop -/* 090BC 80B72A5C 46020181 */ sub.s $f6, $f0, $f2 +/* 090BC 80B72A5C 46020181 */ sub.s $f6, $f0, $f2 /* 090C0 80B72A60 3C0180B8 */ lui $at, %hi(D_80B7B664) ## $at = 80B80000 -/* 090C4 80B72A64 C424B664 */ lwc1 $f4, %lo(D_80B7B664)($at) -/* 090C8 80B72A68 44051000 */ mfc1 $a1, $f2 +/* 090C4 80B72A64 C424B664 */ lwc1 $f4, %lo(D_80B7B664)($at) +/* 090C8 80B72A68 44051000 */ mfc1 $a1, $f2 /* 090CC 80B72A6C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 090D0 80B72A70 46043202 */ mul.s $f8, $f6, $f4 +/* 090D0 80B72A70 46043202 */ mul.s $f8, $f6, $f4 /* 090D4 80B72A74 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 090D8 80B72A78 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 090DC 80B72A7C 44074000 */ mfc1 $a3, $f8 +/* 090DC 80B72A7C 44074000 */ mfc1 $a3, $f8 /* 090E0 80B72A80 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 090E4 80B72A84 00000000 */ nop .L80B72A88: /* 090E8 80B72A88 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 @@ -1459,366 +1459,366 @@ glabel L80B72928 /* 090F0 80B72A90 3C0143C0 */ lui $at, 0x43C0 ## $at = 43C00000 /* 090F4 80B72A94 44812000 */ mtc1 $at, $f4 ## $f4 = 384.00 /* 090F8 80B72A98 858909F4 */ lh $t1, 0x09F4($t4) ## 801609F4 -/* 090FC 80B72A9C 4406A000 */ mfc1 $a2, $f20 +/* 090FC 80B72A9C 4406A000 */ mfc1 $a2, $f20 /* 09100 80B72AA0 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 -/* 09104 80B72AA4 000959C0 */ sll $t3, $t1, 7 +/* 09104 80B72AA4 000959C0 */ sll $t3, $t1, 7 /* 09108 80B72AA8 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 /* 0910C 80B72AAC 3C054600 */ lui $a1, 0x4600 ## $a1 = 46000000 -/* 09110 80B72AB0 468051A0 */ cvt.s.w $f6, $f10 -/* 09114 80B72AB4 46043200 */ add.s $f8, $f6, $f4 -/* 09118 80B72AB8 44074000 */ mfc1 $a3, $f8 +/* 09110 80B72AB0 468051A0 */ cvt.s.w $f6, $f10 +/* 09114 80B72AB4 46043200 */ add.s $f8, $f6, $f4 +/* 09118 80B72AB8 44074000 */ mfc1 $a3, $f8 /* 0911C 80B72ABC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 09120 80B72AC0 00000000 */ nop /* 09124 80B72AC4 262D0014 */ addiu $t5, $s1, 0x0014 ## $t5 = 00000014 -/* 09128 80B72AC8 AFAD004C */ sw $t5, 0x004C($sp) +/* 09128 80B72AC8 AFAD004C */ sw $t5, 0x004C($sp) /* 0912C 80B72ACC 95AF000C */ lhu $t7, 0x000C($t5) ## 00000020 /* 09130 80B72AD0 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 09134 80B72AD4 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 09138 80B72AD8 01E1C027 */ nor $t8, $t7, $at -/* 0913C 80B72ADC 17000005 */ bne $t8, $zero, .L80B72AF4 +/* 09138 80B72AD8 01E1C027 */ nor $t8, $t7, $at +/* 0913C 80B72ADC 17000005 */ bne $t8, $zero, .L80B72AF4 /* 09140 80B72AE0 3C0180B8 */ lui $at, %hi(D_80B7B668) ## $at = 80B80000 -/* 09144 80B72AE4 C426B668 */ lwc1 $f6, %lo(D_80B7B668)($at) +/* 09144 80B72AE4 C426B668 */ lwc1 $f6, %lo(D_80B7B668)($at) /* 09148 80B72AE8 C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 -/* 0914C 80B72AEC 46065100 */ add.s $f4, $f10, $f6 +/* 0914C 80B72AEC 46065100 */ add.s $f4, $f10, $f6 /* 09150 80B72AF0 E60401A8 */ swc1 $f4, 0x01A8($s0) ## 000001A8 .L80B72AF4: /* 09154 80B72AF4 3C0380B8 */ lui $v1, %hi(D_80B7E120) ## $v1 = 80B80000 /* 09158 80B72AF8 2463E120 */ addiu $v1, $v1, %lo(D_80B7E120) ## $v1 = 80B7E120 /* 0915C 80B72AFC 90620000 */ lbu $v0, 0x0000($v1) ## 80B7E120 -/* 09160 80B72B00 1040000E */ beq $v0, $zero, .L80B72B3C +/* 09160 80B72B00 1040000E */ beq $v0, $zero, .L80B72B3C /* 09164 80B72B04 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09168 80B72B08 14410006 */ bne $v0, $at, .L80B72B24 +/* 09168 80B72B08 14410006 */ bne $v0, $at, .L80B72B24 /* 0916C 80B72B0C 3C0180B8 */ lui $at, %hi(D_80B7B66C) ## $at = 80B80000 -/* 09170 80B72B10 C42AB66C */ lwc1 $f10, %lo(D_80B7B66C)($at) +/* 09170 80B72B10 C42AB66C */ lwc1 $f10, %lo(D_80B7B66C)($at) /* 09174 80B72B14 C60801A8 */ lwc1 $f8, 0x01A8($s0) ## 000001A8 -/* 09178 80B72B18 460A4180 */ add.s $f6, $f8, $f10 -/* 0917C 80B72B1C 10000006 */ beq $zero, $zero, .L80B72B38 +/* 09178 80B72B18 460A4180 */ add.s $f6, $f8, $f10 +/* 0917C 80B72B1C 10000006 */ beq $zero, $zero, .L80B72B38 /* 09180 80B72B20 E60601A8 */ swc1 $f6, 0x01A8($s0) ## 000001A8 .L80B72B24: /* 09184 80B72B24 3C0180B8 */ lui $at, %hi(D_80B7B670) ## $at = 80B80000 -/* 09188 80B72B28 C428B670 */ lwc1 $f8, %lo(D_80B7B670)($at) +/* 09188 80B72B28 C428B670 */ lwc1 $f8, %lo(D_80B7B670)($at) /* 0918C 80B72B2C C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 -/* 09190 80B72B30 46082280 */ add.s $f10, $f4, $f8 +/* 09190 80B72B30 46082280 */ add.s $f10, $f4, $f8 /* 09194 80B72B34 E60A01A8 */ swc1 $f10, 0x01A8($s0) ## 000001A8 .L80B72B38: /* 09198 80B72B38 A0600000 */ sb $zero, 0x0000($v1) ## 80B7E120 .L80B72B3C: -/* 0919C 80B72B3C 8FAA004C */ lw $t2, 0x004C($sp) +/* 0919C 80B72B3C 8FAA004C */ lw $t2, 0x004C($sp) /* 091A0 80B72B40 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF /* 091A4 80B72B44 9559000C */ lhu $t9, 0x000C($t2) ## 0000000C -/* 091A8 80B72B48 03216027 */ nor $t4, $t9, $at -/* 091AC 80B72B4C 15800005 */ bne $t4, $zero, .L80B72B64 +/* 091A8 80B72B48 03216027 */ nor $t4, $t9, $at +/* 091AC 80B72B4C 15800005 */ bne $t4, $zero, .L80B72B64 /* 091B0 80B72B50 3C0180B8 */ lui $at, %hi(D_80B7B674) ## $at = 80B80000 -/* 091B4 80B72B54 C424B674 */ lwc1 $f4, %lo(D_80B7B674)($at) +/* 091B4 80B72B54 C424B674 */ lwc1 $f4, %lo(D_80B7B674)($at) /* 091B8 80B72B58 C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 -/* 091BC 80B72B5C 46043200 */ add.s $f8, $f6, $f4 +/* 091BC 80B72B5C 46043200 */ add.s $f8, $f6, $f4 /* 091C0 80B72B60 E60801A8 */ swc1 $f8, 0x01A8($s0) ## 000001A8 .L80B72B64: /* 091C4 80B72B64 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 091C8 80B72B68 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 091CC 80B72B6C C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 091D0 80B72B70 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 091D4 80B72B74 C7AA0124 */ lwc1 $f10, 0x0124($sp) -/* 091D8 80B72B78 46043202 */ mul.s $f8, $f6, $f4 +/* 091D4 80B72B74 C7AA0124 */ lwc1 $f10, 0x0124($sp) +/* 091D8 80B72B78 46043202 */ mul.s $f8, $f6, $f4 /* 091DC 80B72B7C 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 091E0 80B72B80 00000000 */ nop -/* 091E4 80B72B84 46064100 */ add.s $f4, $f8, $f6 -/* 091E8 80B72B88 4604503C */ c.lt.s $f10, $f4 +/* 091E4 80B72B84 46064100 */ add.s $f4, $f8, $f6 +/* 091E8 80B72B88 4604503C */ c.lt.s $f10, $f4 /* 091EC 80B72B8C 00000000 */ nop -/* 091F0 80B72B90 4502001A */ bc1fl .L80B72BFC +/* 091F0 80B72B90 4502001A */ bc1fl .L80B72BFC /* 091F4 80B72B94 8619015E */ lh $t9, 0x015E($s0) ## 0000015E /* 091F8 80B72B98 8609015E */ lh $t1, 0x015E($s0) ## 0000015E -/* 091FC 80B72B9C 1520000C */ bne $t1, $zero, .L80B72BD0 +/* 091FC 80B72B9C 1520000C */ bne $t1, $zero, .L80B72BD0 /* 09200 80B72BA0 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 09204 80B72BA4 44814000 */ mtc1 $at, $f8 ## $f8 = 500.00 /* 09208 80B72BA8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0920C 80B72BAC 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 09210 80B72BB0 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 09214 80B72BB4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09218 80B72BB8 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 -/* 0921C 80B72BBC 4600018D */ trunc.w.s $f6, $f0 -/* 09220 80B72BC0 440F3000 */ mfc1 $t7, $f6 +/* 0921C 80B72BBC 4600018D */ trunc.w.s $f6, $f0 +/* 09220 80B72BC0 440F3000 */ mfc1 $t7, $f6 /* 09224 80B72BC4 00000000 */ nop /* 09228 80B72BC8 25F80002 */ addiu $t8, $t7, 0x0002 ## $t8 = 00000002 /* 0922C 80B72BCC A618017A */ sh $t8, 0x017A($s0) ## 0000017A .L80B72BD0: /* 09230 80B72BD0 3C05BE4C */ lui $a1, 0xBE4C ## $a1 = BE4C0000 -/* 09234 80B72BD4 4406A000 */ mfc1 $a2, $f20 +/* 09234 80B72BD4 4406A000 */ mfc1 $a2, $f20 /* 09238 80B72BD8 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 0923C 80B72BDC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 09240 80B72BE0 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = BE4CCCCD /* 09244 80B72BE4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 09248 80B72BE8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0924C 80B72BEC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 09250 80B72BF0 10000011 */ beq $zero, $zero, .L80B72C38 +/* 09250 80B72BF0 10000011 */ beq $zero, $zero, .L80B72C38 /* 09254 80B72BF4 A60A015E */ sh $t2, 0x015E($s0) ## 0000015E /* 09258 80B72BF8 8619015E */ lh $t9, 0x015E($s0) ## 0000015E .L80B72BFC: -/* 0925C 80B72BFC 53200008 */ beql $t9, $zero, .L80B72C20 -/* 09260 80B72C00 4406A000 */ mfc1 $a2, $f20 +/* 0925C 80B72BFC 53200008 */ beql $t9, $zero, .L80B72C20 +/* 09260 80B72C00 4406A000 */ mfc1 $a2, $f20 /* 09264 80B72C04 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 09268 80B72C08 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 0926C 80B72C0C 3C0180B8 */ lui $at, %hi(D_80B7B678) ## $at = 80B80000 /* 09270 80B72C10 E60A01B0 */ swc1 $f10, 0x01B0($s0) ## 000001B0 -/* 09274 80B72C14 C424B678 */ lwc1 $f4, %lo(D_80B7B678)($at) +/* 09274 80B72C14 C424B678 */ lwc1 $f4, %lo(D_80B7B678)($at) /* 09278 80B72C18 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 -/* 0927C 80B72C1C 4406A000 */ mfc1 $a2, $f20 +/* 0927C 80B72C1C 4406A000 */ mfc1 $a2, $f20 .L80B72C20: /* 09280 80B72C20 3C073E19 */ lui $a3, 0x3E19 ## $a3 = 3E190000 /* 09284 80B72C24 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A /* 09288 80B72C28 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0928C 80B72C2C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 09290 80B72C30 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 /* 09294 80B72C34 A600015E */ sh $zero, 0x015E($s0) ## 0000015E .L80B72C38: /* 09298 80B72C38 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0929C 80B72C3C 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 /* 092A0 80B72C40 C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC -/* 092A4 80B72C44 4600403E */ c.le.s $f8, $f0 +/* 092A4 80B72C44 4600403E */ c.le.s $f8, $f0 /* 092A8 80B72C48 00000000 */ nop -/* 092AC 80B72C4C 45000003 */ bc1f .L80B72C5C +/* 092AC 80B72C4C 45000003 */ bc1f .L80B72C5C /* 092B0 80B72C50 3C0180B8 */ lui $at, %hi(D_80B7B67C) ## $at = 80B80000 -/* 092B4 80B72C54 1000000B */ beq $zero, $zero, .L80B72C84 -/* 092B8 80B72C58 C422B67C */ lwc1 $f2, %lo(D_80B7B67C)($at) +/* 092B4 80B72C54 1000000B */ beq $zero, $zero, .L80B72C84 +/* 092B8 80B72C58 C422B67C */ lwc1 $f2, %lo(D_80B7B67C)($at) .L80B72C5C: /* 092BC 80B72C5C 3C014234 */ lui $at, 0x4234 ## $at = 42340000 /* 092C0 80B72C60 44813000 */ mtc1 $at, $f6 ## $f6 = 45.00 /* 092C4 80B72C64 00000000 */ nop -/* 092C8 80B72C68 4600303E */ c.le.s $f6, $f0 +/* 092C8 80B72C68 4600303E */ c.le.s $f6, $f0 /* 092CC 80B72C6C 00000000 */ nop -/* 092D0 80B72C70 45000003 */ bc1f .L80B72C80 +/* 092D0 80B72C70 45000003 */ bc1f .L80B72C80 /* 092D4 80B72C74 3C0180B8 */ lui $at, %hi(D_80B7B680) ## $at = 80B80000 -/* 092D8 80B72C78 10000002 */ beq $zero, $zero, .L80B72C84 -/* 092DC 80B72C7C C422B680 */ lwc1 $f2, %lo(D_80B7B680)($at) +/* 092D8 80B72C78 10000002 */ beq $zero, $zero, .L80B72C84 +/* 092DC 80B72C7C C422B680 */ lwc1 $f2, %lo(D_80B7B680)($at) .L80B72C80: -/* 092E0 80B72C80 4600A086 */ mov.s $f2, $f20 +/* 092E0 80B72C80 4600A086 */ mov.s $f2, $f20 .L80B72C84: /* 092E4 80B72C84 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 092E8 80B72C88 9442E66C */ lhu $v0, -0x1994($v0) ## 8015E66C /* 092EC 80B72C8C 3401B555 */ ori $at, $zero, 0xB555 ## $at = 0000B555 -/* 092F0 80B72C90 0041082A */ slt $at, $v0, $at -/* 092F4 80B72C94 14200009 */ bne $at, $zero, .L80B72CBC +/* 092F0 80B72C90 0041082A */ slt $at, $v0, $at +/* 092F4 80B72C94 14200009 */ bne $at, $zero, .L80B72CBC /* 092F8 80B72C98 3401CAAB */ ori $at, $zero, 0xCAAB ## $at = 0000CAAB -/* 092FC 80B72C9C 0041082A */ slt $at, $v0, $at -/* 09300 80B72CA0 10200006 */ beq $at, $zero, .L80B72CBC +/* 092FC 80B72C9C 0041082A */ slt $at, $v0, $at +/* 09300 80B72CA0 10200006 */ beq $at, $zero, .L80B72CBC /* 09304 80B72CA4 3C013FE0 */ lui $at, 0x3FE0 ## $at = 3FE00000 /* 09308 80B72CA8 44815000 */ mtc1 $at, $f10 ## $f10 = 1.75 /* 0930C 80B72CAC 00000000 */ nop -/* 09310 80B72CB0 460A1082 */ mul.s $f2, $f2, $f10 -/* 09314 80B72CB4 1000003C */ beq $zero, $zero, .L80B72DA8 +/* 09310 80B72CB0 460A1082 */ mul.s $f2, $f2, $f10 +/* 09314 80B72CB4 1000003C */ beq $zero, $zero, .L80B72DA8 /* 09318 80B72CB8 00000000 */ nop .L80B72CBC: -/* 0931C 80B72CBC 28413555 */ slti $at, $v0, 0x3555 -/* 09320 80B72CC0 14200008 */ bne $at, $zero, .L80B72CE4 -/* 09324 80B72CC4 28414AAB */ slti $at, $v0, 0x4AAB -/* 09328 80B72CC8 10200006 */ beq $at, $zero, .L80B72CE4 +/* 0931C 80B72CBC 28413555 */ slti $at, $v0, 0x3555 +/* 09320 80B72CC0 14200008 */ bne $at, $zero, .L80B72CE4 +/* 09324 80B72CC4 28414AAB */ slti $at, $v0, 0x4AAB +/* 09328 80B72CC8 10200006 */ beq $at, $zero, .L80B72CE4 /* 0932C 80B72CCC 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 09330 80B72CD0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 /* 09334 80B72CD4 00000000 */ nop -/* 09338 80B72CD8 46041082 */ mul.s $f2, $f2, $f4 -/* 0933C 80B72CDC 10000032 */ beq $zero, $zero, .L80B72DA8 +/* 09338 80B72CD8 46041082 */ mul.s $f2, $f2, $f4 +/* 0933C 80B72CDC 10000032 */ beq $zero, $zero, .L80B72DA8 /* 09340 80B72CE0 00000000 */ nop .L80B72CE4: /* 09344 80B72CE4 3C0C80B8 */ lui $t4, %hi(D_80B7E076) ## $t4 = 80B80000 -/* 09348 80B72CE8 918CE076 */ lbu $t4, %lo(D_80B7E076)($t4) -/* 0934C 80B72CEC 11800006 */ beq $t4, $zero, .L80B72D08 +/* 09348 80B72CE8 918CE076 */ lbu $t4, %lo(D_80B7E076)($t4) +/* 0934C 80B72CEC 11800006 */ beq $t4, $zero, .L80B72D08 /* 09350 80B72CF0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 09354 80B72CF4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 /* 09358 80B72CF8 00000000 */ nop -/* 0935C 80B72CFC 46081082 */ mul.s $f2, $f2, $f8 -/* 09360 80B72D00 10000029 */ beq $zero, $zero, .L80B72DA8 +/* 0935C 80B72CFC 46081082 */ mul.s $f2, $f2, $f8 +/* 09360 80B72D00 10000029 */ beq $zero, $zero, .L80B72DA8 /* 09364 80B72D04 00000000 */ nop .L80B72D08: /* 09368 80B72D08 3C0180B8 */ lui $at, %hi(D_80B7A650) ## $at = 80B80000 /* 0936C 80B72D0C 4449F800 */ cfc1 $t1, $31 /* 09370 80B72D10 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 09374 80B72D14 44CBF800 */ ctc1 $t3, $31 -/* 09378 80B72D18 C426A650 */ lwc1 $f6, %lo(D_80B7A650)($at) -/* 0937C 80B72D1C 460032A4 */ cvt.w.s $f10, $f6 +/* 09378 80B72D18 C426A650 */ lwc1 $f6, %lo(D_80B7A650)($at) +/* 0937C 80B72D1C 460032A4 */ cvt.w.s $f10, $f6 /* 09380 80B72D20 444BF800 */ cfc1 $t3, $31 /* 09384 80B72D24 00000000 */ nop /* 09388 80B72D28 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 0938C 80B72D2C 11600012 */ beq $t3, $zero, .L80B72D78 +/* 0938C 80B72D2C 11600012 */ beq $t3, $zero, .L80B72D78 /* 09390 80B72D30 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 09394 80B72D34 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 09398 80B72D38 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0939C 80B72D3C 460A3281 */ sub.s $f10, $f6, $f10 +/* 0939C 80B72D3C 460A3281 */ sub.s $f10, $f6, $f10 /* 093A0 80B72D40 44CBF800 */ ctc1 $t3, $31 /* 093A4 80B72D44 00000000 */ nop -/* 093A8 80B72D48 460052A4 */ cvt.w.s $f10, $f10 +/* 093A8 80B72D48 460052A4 */ cvt.w.s $f10, $f10 /* 093AC 80B72D4C 444BF800 */ cfc1 $t3, $31 /* 093B0 80B72D50 00000000 */ nop /* 093B4 80B72D54 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 093B8 80B72D58 15600005 */ bne $t3, $zero, .L80B72D70 +/* 093B8 80B72D58 15600005 */ bne $t3, $zero, .L80B72D70 /* 093BC 80B72D5C 00000000 */ nop -/* 093C0 80B72D60 440B5000 */ mfc1 $t3, $f10 +/* 093C0 80B72D60 440B5000 */ mfc1 $t3, $f10 /* 093C4 80B72D64 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 093C8 80B72D68 10000007 */ beq $zero, $zero, .L80B72D88 +/* 093C8 80B72D68 10000007 */ beq $zero, $zero, .L80B72D88 /* 093CC 80B72D6C 01615825 */ or $t3, $t3, $at ## $t3 = 80000000 .L80B72D70: -/* 093D0 80B72D70 10000005 */ beq $zero, $zero, .L80B72D88 +/* 093D0 80B72D70 10000005 */ beq $zero, $zero, .L80B72D88 /* 093D4 80B72D74 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF .L80B72D78: -/* 093D8 80B72D78 440B5000 */ mfc1 $t3, $f10 +/* 093D8 80B72D78 440B5000 */ mfc1 $t3, $f10 /* 093DC 80B72D7C 00000000 */ nop -/* 093E0 80B72D80 0560FFFB */ bltz $t3, .L80B72D70 +/* 093E0 80B72D80 0560FFFB */ bltz $t3, .L80B72D70 /* 093E4 80B72D84 00000000 */ nop .L80B72D88: /* 093E8 80B72D88 44C9F800 */ ctc1 $t1, $31 /* 093EC 80B72D8C 316D00FF */ andi $t5, $t3, 0x00FF ## $t5 = 000000FF -/* 093F0 80B72D90 11A00005 */ beq $t5, $zero, .L80B72DA8 +/* 093F0 80B72D90 11A00005 */ beq $t5, $zero, .L80B72DA8 /* 093F4 80B72D94 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 093F8 80B72D98 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 093FC 80B72D9C 00000000 */ nop -/* 09400 80B72DA0 46041082 */ mul.s $f2, $f2, $f4 +/* 09400 80B72DA0 46041082 */ mul.s $f2, $f2, $f4 /* 09404 80B72DA4 00000000 */ nop .L80B72DA8: /* 09408 80B72DA8 3C0180B8 */ lui $at, %hi(D_80B7B684) ## $at = 80B80000 -/* 0940C 80B72DAC C428B684 */ lwc1 $f8, %lo(D_80B7B684)($at) +/* 0940C 80B72DAC C428B684 */ lwc1 $f8, %lo(D_80B7B684)($at) /* 09410 80B72DB0 3C0E80B8 */ lui $t6, %hi(D_80B7E0B6) ## $t6 = 80B80000 -/* 09414 80B72DB4 91CEE0B6 */ lbu $t6, %lo(D_80B7E0B6)($t6) -/* 09418 80B72DB8 46024002 */ mul.s $f0, $f8, $f2 +/* 09414 80B72DB4 91CEE0B6 */ lbu $t6, %lo(D_80B7E0B6)($t6) +/* 09418 80B72DB8 46024002 */ mul.s $f0, $f8, $f2 /* 0941C 80B72DBC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 09420 80B72DC0 15C10006 */ bne $t6, $at, .L80B72DDC -/* 09424 80B72DC4 46000306 */ mov.s $f12, $f0 +/* 09420 80B72DC0 15C10006 */ bne $t6, $at, .L80B72DDC +/* 09424 80B72DC4 46000306 */ mov.s $f12, $f0 /* 09428 80B72DC8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0942C 80B72DCC 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 /* 09430 80B72DD0 00000000 */ nop -/* 09434 80B72DD4 46060302 */ mul.s $f12, $f0, $f6 +/* 09434 80B72DD4 46060302 */ mul.s $f12, $f0, $f6 /* 09438 80B72DD8 00000000 */ nop .L80B72DDC: /* 0943C 80B72DDC 860F017A */ lh $t7, 0x017A($s0) ## 0000017A /* 09440 80B72DE0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09444 80B72DE4 11E1000A */ beq $t7, $at, .L80B72E10 +/* 09444 80B72DE4 11E1000A */ beq $t7, $at, .L80B72E10 /* 09448 80B72DE8 00000000 */ nop -/* 0944C 80B72DEC E7A20120 */ swc1 $f2, 0x0120($sp) +/* 0944C 80B72DEC E7A20120 */ swc1 $f2, 0x0120($sp) /* 09450 80B72DF0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 09454 80B72DF4 E7AC011C */ swc1 $f12, 0x011C($sp) -/* 09458 80B72DF8 C7AC011C */ lwc1 $f12, 0x011C($sp) -/* 0945C 80B72DFC C7A20120 */ lwc1 $f2, 0x0120($sp) -/* 09460 80B72E00 460C003C */ c.lt.s $f0, $f12 +/* 09454 80B72DF4 E7AC011C */ swc1 $f12, 0x011C($sp) +/* 09458 80B72DF8 C7AC011C */ lwc1 $f12, 0x011C($sp) +/* 0945C 80B72DFC C7A20120 */ lwc1 $f2, 0x0120($sp) +/* 09460 80B72E00 460C003C */ c.lt.s $f0, $f12 /* 09464 80B72E04 00000000 */ nop -/* 09468 80B72E08 45000040 */ bc1f .L80B72F0C +/* 09468 80B72E08 45000040 */ bc1f .L80B72F0C /* 0946C 80B72E0C 00000000 */ nop .L80B72E10: /* 09470 80B72E10 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 09474 80B72E14 E7A20120 */ swc1 $f2, 0x0120($sp) -/* 09478 80B72E18 C7A20120 */ lwc1 $f2, 0x0120($sp) +/* 09474 80B72E14 E7A20120 */ swc1 $f2, 0x0120($sp) +/* 09478 80B72E18 C7A20120 */ lwc1 $f2, 0x0120($sp) /* 0947C 80B72E1C C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 -/* 09480 80B72E20 46025102 */ mul.s $f4, $f10, $f2 -/* 09484 80B72E24 4604003C */ c.lt.s $f0, $f4 +/* 09480 80B72E20 46025102 */ mul.s $f4, $f10, $f2 +/* 09484 80B72E24 4604003C */ c.lt.s $f0, $f4 /* 09488 80B72E28 00000000 */ nop -/* 0948C 80B72E2C 45010007 */ bc1t .L80B72E4C +/* 0948C 80B72E2C 45010007 */ bc1t .L80B72E4C /* 09490 80B72E30 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 09494 80B72E34 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 /* 09498 80B72E38 92180150 */ lbu $t8, 0x0150($s0) ## 00000150 /* 0949C 80B72E3C 872C0A5E */ lh $t4, 0x0A5E($t9) ## 80160A5E /* 094A0 80B72E40 270A0001 */ addiu $t2, $t8, 0x0001 ## $t2 = 00000001 -/* 094A4 80B72E44 154C0031 */ bne $t2, $t4, .L80B72F0C +/* 094A4 80B72E44 154C0031 */ bne $t2, $t4, .L80B72F0C /* 094A8 80B72E48 00000000 */ nop .L80B72E4C: /* 094AC 80B72E4C 92090150 */ lbu $t1, 0x0150($s0) ## 00000150 -/* 094B0 80B72E50 1520000F */ bne $t1, $zero, .L80B72E90 +/* 094B0 80B72E50 1520000F */ bne $t1, $zero, .L80B72E90 /* 094B4 80B72E54 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 /* 094B8 80B72E58 A60B0158 */ sh $t3, 0x0158($s0) ## 00000158 /* 094BC 80B72E5C 3C0180B8 */ lui $at, %hi(D_80B7B688) ## $at = 80B80000 -/* 094C0 80B72E60 C428B688 */ lwc1 $f8, %lo(D_80B7B688)($at) +/* 094C0 80B72E60 C428B688 */ lwc1 $f8, %lo(D_80B7B688)($at) /* 094C4 80B72E64 3C0180B8 */ lui $at, %hi(D_80B7B68C) ## $at = 80B80000 /* 094C8 80B72E68 E6080190 */ swc1 $f8, 0x0190($s0) ## 00000190 -/* 094CC 80B72E6C C426B68C */ lwc1 $f6, %lo(D_80B7B68C)($at) +/* 094CC 80B72E6C C426B68C */ lwc1 $f6, %lo(D_80B7B68C)($at) /* 094D0 80B72E70 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 094D4 80B72E74 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 094D8 80B72E78 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 094DC 80B72E7C E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 -/* 094E0 80B72E80 4600028D */ trunc.w.s $f10, $f0 -/* 094E4 80B72E84 440E5000 */ mfc1 $t6, $f10 -/* 094E8 80B72E88 10000009 */ beq $zero, $zero, .L80B72EB0 +/* 094E0 80B72E80 4600028D */ trunc.w.s $f10, $f0 +/* 094E4 80B72E84 440E5000 */ mfc1 $t6, $f10 +/* 094E8 80B72E88 10000009 */ beq $zero, $zero, .L80B72EB0 /* 094EC 80B72E8C A60E017A */ sh $t6, 0x017A($s0) ## 0000017A .L80B72E90: /* 094F0 80B72E90 240FFFFD */ addiu $t7, $zero, 0xFFFD ## $t7 = FFFFFFFD /* 094F4 80B72E94 A60F0158 */ sh $t7, 0x0158($s0) ## 00000158 /* 094F8 80B72E98 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 094FC 80B72E9C 3C0180B8 */ lui $at, %hi(D_80B7B690) ## $at = 80B80000 -/* 09500 80B72EA0 C424B690 */ lwc1 $f4, %lo(D_80B7B690)($at) +/* 09500 80B72EA0 C424B690 */ lwc1 $f4, %lo(D_80B7B690)($at) /* 09504 80B72EA4 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 /* 09508 80B72EA8 A618017A */ sh $t8, 0x017A($s0) ## 0000017A /* 0950C 80B72EAC E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 .L80B72EB0: /* 09510 80B72EB0 3C1980B8 */ lui $t9, %hi(D_80B7E0B6) ## $t9 = 80B80000 -/* 09514 80B72EB4 9339E0B6 */ lbu $t9, %lo(D_80B7E0B6)($t9) +/* 09514 80B72EB4 9339E0B6 */ lbu $t9, %lo(D_80B7E0B6)($t9) /* 09518 80B72EB8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0951C 80B72EBC 1721000A */ bne $t9, $at, .L80B72EE8 +/* 0951C 80B72EBC 1721000A */ bne $t9, $at, .L80B72EE8 /* 09520 80B72EC0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 09524 80B72EC4 44816000 */ mtc1 $at, $f12 ## $f12 = 1.50 /* 09528 80B72EC8 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0952C 80B72ECC 00000000 */ nop /* 09530 80B72ED0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 09534 80B72ED4 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 /* 09538 80B72ED8 00000000 */ nop -/* 0953C 80B72EDC 46080180 */ add.s $f6, $f0, $f8 -/* 09540 80B72EE0 1000000A */ beq $zero, $zero, .L80B72F0C +/* 0953C 80B72EDC 46080180 */ add.s $f6, $f0, $f8 +/* 09540 80B72EE0 1000000A */ beq $zero, $zero, .L80B72F0C /* 09544 80B72EE4 E6060188 */ swc1 $f6, 0x0188($s0) ## 00000188 .L80B72EE8: /* 09548 80B72EE8 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0954C 80B72EEC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.50 /* 09550 80B72EF0 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09554 80B72EF4 00000000 */ nop /* 09558 80B72EF8 3C014090 */ lui $at, 0x4090 ## $at = 40900000 /* 0955C 80B72EFC 44815000 */ mtc1 $at, $f10 ## $f10 = 4.50 /* 09560 80B72F00 00000000 */ nop -/* 09564 80B72F04 460A0100 */ add.s $f4, $f0, $f10 +/* 09564 80B72F04 460A0100 */ add.s $f4, $f0, $f10 /* 09568 80B72F08 E6040188 */ swc1 $f4, 0x0188($s0) ## 00000188 .L80B72F0C: /* 0956C 80B72F0C 3C0A80B8 */ lui $t2, %hi(D_80B7A694) ## $t2 = 80B80000 -/* 09570 80B72F10 854AA694 */ lh $t2, %lo(D_80B7A694)($t2) +/* 09570 80B72F10 854AA694 */ lh $t2, %lo(D_80B7A694)($t2) /* 09574 80B72F14 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 09578 80B72F18 55410011 */ bnel $t2, $at, .L80B72F60 +/* 09578 80B72F18 55410011 */ bnel $t2, $at, .L80B72F60 /* 0957C 80B72F1C 8609015A */ lh $t1, 0x015A($s0) ## 0000015A /* 09580 80B72F20 860C017E */ lh $t4, 0x017E($s0) ## 0000017E -/* 09584 80B72F24 5180000E */ beql $t4, $zero, .L80B72F60 +/* 09584 80B72F24 5180000E */ beql $t4, $zero, .L80B72F60 /* 09588 80B72F28 8609015A */ lh $t1, 0x015A($s0) ## 0000015A /* 0958C 80B72F2C C6020024 */ lwc1 $f2, 0x0024($s0) ## 00000024 /* 09590 80B72F30 C60C002C */ lwc1 $f12, 0x002C($s0) ## 0000002C /* 09594 80B72F34 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 09598 80B72F38 46021202 */ mul.s $f8, $f2, $f2 +/* 09598 80B72F38 46021202 */ mul.s $f8, $f2, $f2 /* 0959C 80B72F3C 44815000 */ mtc1 $at, $f10 ## $f10 = 800.00 -/* 095A0 80B72F40 460C6182 */ mul.s $f6, $f12, $f12 -/* 095A4 80B72F44 46064000 */ add.s $f0, $f8, $f6 -/* 095A8 80B72F48 46000004 */ sqrt.s $f0, $f0 -/* 095AC 80B72F4C 4600503C */ c.lt.s $f10, $f0 +/* 095A0 80B72F40 460C6182 */ mul.s $f6, $f12, $f12 +/* 095A4 80B72F44 46064000 */ add.s $f0, $f8, $f6 +/* 095A8 80B72F48 46000004 */ sqrt.s $f0, $f0 +/* 095AC 80B72F4C 4600503C */ c.lt.s $f10, $f0 /* 095B0 80B72F50 00000000 */ nop -/* 095B4 80B72F54 45020019 */ bc1fl .L80B72FBC +/* 095B4 80B72F54 45020019 */ bc1fl .L80B72FBC /* 095B8 80B72F58 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 095BC 80B72F5C 8609015A */ lh $t1, 0x015A($s0) ## 0000015A .L80B72F60: /* 095C0 80B72F60 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 095C4 80B72F64 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 095C8 80B72F68 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 095CC 80B72F6C A6090158 */ sh $t1, 0x0158($s0) ## 00000158 -/* 095D0 80B72F70 4600010D */ trunc.w.s $f4, $f0 +/* 095D0 80B72F70 4600010D */ trunc.w.s $f4, $f0 /* 095D4 80B72F74 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 095D8 80B72F78 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 095DC 80B72F7C 440F2000 */ mfc1 $t7, $f4 +/* 095DC 80B72F7C 440F2000 */ mfc1 $t7, $f4 /* 095E0 80B72F80 00000000 */ nop /* 095E4 80B72F84 25F80032 */ addiu $t8, $t7, 0x0032 ## $t8 = 00000032 /* 095E8 80B72F88 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 095EC 80B72F8C A618017C */ sh $t8, 0x017C($s0) ## 0000017C -/* 095F0 80B72F90 4600020D */ trunc.w.s $f8, $f0 +/* 095F0 80B72F90 4600020D */ trunc.w.s $f8, $f0 /* 095F4 80B72F94 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 095F8 80B72F98 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 095FC 80B72F9C 44815000 */ mtc1 $at, $f10 ## $f10 = 2000.00 -/* 09600 80B72FA0 44094000 */ mfc1 $t1, $f8 +/* 09600 80B72FA0 44094000 */ mfc1 $t1, $f8 /* 09604 80B72FA4 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 09608 80B72FA8 E60601B0 */ swc1 $f6, 0x01B0($s0) ## 000001B0 /* 0960C 80B72FAC 252B0005 */ addiu $t3, $t1, 0x0005 ## $t3 = 00000005 @@ -1827,12 +1827,12 @@ glabel L80B72928 /* 09618 80B72FB8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 .L80B72FBC: /* 0961C 80B72FBC 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 09620 80B72FC0 C7A60118 */ lwc1 $f6, 0x0118($sp) +/* 09620 80B72FC0 C7A60118 */ lwc1 $f6, 0x0118($sp) /* 09624 80B72FC4 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 09628 80B72FC8 46064282 */ mul.s $f10, $f8, $f6 -/* 0962C 80B72FCC 460A203C */ c.lt.s $f4, $f10 +/* 09628 80B72FC8 46064282 */ mul.s $f10, $f8, $f6 +/* 0962C 80B72FCC 460A203C */ c.lt.s $f4, $f10 /* 09630 80B72FD0 00000000 */ nop -/* 09634 80B72FD4 450208A9 */ bc1fl .L80B7527C +/* 09634 80B72FD4 450208A9 */ bc1fl .L80B7527C /* 09638 80B72FD8 8604015C */ lh $a0, 0x015C($s0) ## 0000015C /* 0963C 80B72FDC A6000158 */ sh $zero, 0x0158($s0) ## 00000158 /* 09640 80B72FE0 860D0158 */ lh $t5, 0x0158($s0) ## 00000158 @@ -1842,78 +1842,78 @@ glabel L80B72928 /* 09650 80B72FF0 A60E01A4 */ sh $t6, 0x01A4($s0) ## 000001A4 /* 09654 80B72FF4 A60F01A2 */ sh $t7, 0x01A2($s0) ## 000001A2 /* 09658 80B72FF8 A602017C */ sh $v0, 0x017C($s0) ## 0000017C -/* 0965C 80B72FFC 1000089E */ beq $zero, $zero, .L80B75278 +/* 0965C 80B72FFC 1000089E */ beq $zero, $zero, .L80B75278 /* 09660 80B73000 A60D015A */ sh $t5, 0x015A($s0) ## 0000015A glabel L80B73004 /* 09664 80B73004 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 /* 09668 80B73008 A2180151 */ sb $t8, 0x0151($s0) ## 00000151 -/* 0966C 80B7300C 8FAA00E0 */ lw $t2, 0x00E0($sp) +/* 0966C 80B7300C 8FAA00E0 */ lw $t2, 0x00E0($sp) /* 09670 80B73010 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 09674 80B73014 A7B90134 */ sh $t9, 0x0134($sp) +/* 09674 80B73014 A7B90134 */ sh $t9, 0x0134($sp) /* 09678 80B73018 C5480024 */ lwc1 $f8, 0x0024($t2) ## 00000024 /* 0967C 80B7301C 3C0E80B8 */ lui $t6, %hi(D_80B7E118) ## $t6 = 80B80000 -/* 09680 80B73020 91CEE118 */ lbu $t6, %lo(D_80B7E118)($t6) -/* 09684 80B73024 4600418D */ trunc.w.s $f6, $f8 -/* 09688 80B73028 440D3000 */ mfc1 $t5, $f6 +/* 09680 80B73020 91CEE118 */ lbu $t6, %lo(D_80B7E118)($t6) +/* 09684 80B73024 4600418D */ trunc.w.s $f6, $f8 +/* 09688 80B73028 440D3000 */ mfc1 $t5, $f6 /* 0968C 80B7302C 00000000 */ nop -/* 09690 80B73030 01AE7821 */ addu $t7, $t5, $t6 +/* 09690 80B73030 01AE7821 */ addu $t7, $t5, $t6 /* 09694 80B73034 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 09698 80B73038 13000004 */ beq $t8, $zero, .L80B7304C +/* 09698 80B73038 13000004 */ beq $t8, $zero, .L80B7304C /* 0969C 80B7303C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 096A0 80B73040 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 096A4 80B73044 10000005 */ beq $zero, $zero, .L80B7305C -/* 096A8 80B73048 E7A4010C */ swc1 $f4, 0x010C($sp) +/* 096A4 80B73044 10000005 */ beq $zero, $zero, .L80B7305C +/* 096A8 80B73048 E7A4010C */ swc1 $f4, 0x010C($sp) .L80B7304C: /* 096AC 80B7304C 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 /* 096B0 80B73050 44815000 */ mtc1 $at, $f10 ## $f10 = -30.00 /* 096B4 80B73054 00000000 */ nop -/* 096B8 80B73058 E7AA010C */ swc1 $f10, 0x010C($sp) +/* 096B8 80B73058 E7AA010C */ swc1 $f10, 0x010C($sp) .L80B7305C: /* 096BC 80B7305C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 096C0 80B73060 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 096C4 80B73064 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 096C8 80B73068 3C0180B8 */ lui $at, %hi(D_80B7E0DC) ## $at = 80B80000 -/* 096CC 80B7306C C42CE0DC */ lwc1 $f12, %lo(D_80B7E0DC)($at) +/* 096CC 80B7306C C42CE0DC */ lwc1 $f12, %lo(D_80B7E0DC)($at) /* 096D0 80B73070 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 096D4 80B73074 E7A60114 */ swc1 $f6, 0x0114($sp) -/* 096D8 80B73078 0C034348 */ jal Matrix_RotateY -/* 096DC 80B7307C E7A80110 */ swc1 $f8, 0x0110($sp) +/* 096D4 80B73074 E7A60114 */ swc1 $f6, 0x0114($sp) +/* 096D8 80B73078 0C034348 */ jal Matrix_RotateY +/* 096DC 80B7307C E7A80110 */ swc1 $f8, 0x0110($sp) /* 096E0 80B73080 27A4010C */ addiu $a0, $sp, 0x010C ## $a0 = FFFFFFD4 -/* 096E4 80B73084 0C0346BD */ jal Matrix_MultVec3f +/* 096E4 80B73084 0C0346BD */ jal Matrix_MultVec3f /* 096E8 80B73088 27A50100 */ addiu $a1, $sp, 0x0100 ## $a1 = FFFFFFC8 /* 096EC 80B7308C 3C0280B8 */ lui $v0, %hi(D_80B7E0B8) ## $v0 = 80B80000 /* 096F0 80B73090 2442E0B8 */ addiu $v0, $v0, %lo(D_80B7E0B8) ## $v0 = 80B7E0B8 /* 096F4 80B73094 C4440000 */ lwc1 $f4, 0x0000($v0) ## 80B7E0B8 -/* 096F8 80B73098 C7AA0100 */ lwc1 $f10, 0x0100($sp) +/* 096F8 80B73098 C7AA0100 */ lwc1 $f10, 0x0100($sp) /* 096FC 80B7309C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 09700 80B730A0 4406A000 */ mfc1 $a2, $f20 -/* 09704 80B730A4 460A2200 */ add.s $f8, $f4, $f10 -/* 09708 80B730A8 4407A000 */ mfc1 $a3, $f20 +/* 09700 80B730A0 4406A000 */ mfc1 $a2, $f20 +/* 09704 80B730A4 460A2200 */ add.s $f8, $f4, $f10 +/* 09708 80B730A8 4407A000 */ mfc1 $a3, $f20 /* 0970C 80B730AC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 09710 80B730B0 E60801B4 */ swc1 $f8, 0x01B4($s0) ## 000001B4 -/* 09714 80B730B4 C7A40108 */ lwc1 $f4, 0x0108($sp) +/* 09714 80B730B4 C7A40108 */ lwc1 $f4, 0x0108($sp) /* 09718 80B730B8 C4460008 */ lwc1 $f6, 0x0008($v0) ## 80B7E0C0 -/* 0971C 80B730BC 46043280 */ add.s $f10, $f6, $f4 +/* 0971C 80B730BC 46043280 */ add.s $f10, $f6, $f4 /* 09720 80B730C0 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 09724 80B730C4 3C014580 */ lui $at, 0x4580 ## $at = 45800000 /* 09728 80B730C8 E60A01BC */ swc1 $f10, 0x01BC($s0) ## 000001BC /* 0972C 80B730CC C4480004 */ lwc1 $f8, 0x0004($v0) ## 80B7E0BC /* 09730 80B730D0 44815000 */ mtc1 $at, $f10 ## $f10 = 4096.00 /* 09734 80B730D4 3C0180B8 */ lui $at, %hi(D_80B7B694) ## $at = 80B80000 -/* 09738 80B730D8 46064101 */ sub.s $f4, $f8, $f6 +/* 09738 80B730D8 46064101 */ sub.s $f4, $f8, $f6 /* 0973C 80B730DC E60A01B0 */ swc1 $f10, 0x01B0($s0) ## 000001B0 /* 09740 80B730E0 C6080188 */ lwc1 $f8, 0x0188($s0) ## 00000188 /* 09744 80B730E4 E60401B8 */ swc1 $f4, 0x01B8($s0) ## 000001B8 -/* 09748 80B730E8 C426B694 */ lwc1 $f6, %lo(D_80B7B694)($at) -/* 0974C 80B730EC 46064102 */ mul.s $f4, $f8, $f6 -/* 09750 80B730F0 44052000 */ mfc1 $a1, $f4 +/* 09748 80B730E8 C426B694 */ lwc1 $f6, %lo(D_80B7B694)($at) +/* 0974C 80B730EC 46064102 */ mul.s $f4, $f8, $f6 +/* 09750 80B730F0 44052000 */ mfc1 $a1, $f4 /* 09754 80B730F4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 09758 80B730F8 00000000 */ nop /* 0975C 80B730FC 3C1980B8 */ lui $t9, %hi(D_80B7A694) ## $t9 = 80B80000 -/* 09760 80B73100 8739A694 */ lh $t9, %lo(D_80B7A694)($t9) +/* 09760 80B73100 8739A694 */ lh $t9, %lo(D_80B7A694)($t9) /* 09764 80B73104 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 09768 80B73108 5721001D */ bnel $t9, $at, .L80B73180 +/* 09768 80B73108 5721001D */ bnel $t9, $at, .L80B73180 /* 0976C 80B7310C 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 09770 80B73110 8E2A07C0 */ lw $t2, 0x07C0($s1) ## 000007C0 /* 09774 80B73114 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -1924,24 +1924,24 @@ glabel L80B73004 /* 09788 80B73128 85890002 */ lh $t1, 0x0002($t4) ## 00000002 /* 0978C 80B7312C 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 /* 09790 80B73130 00000000 */ nop -/* 09794 80B73134 46805220 */ cvt.s.w $f8, $f10 +/* 09794 80B73134 46805220 */ cvt.s.w $f8, $f10 /* 09798 80B73138 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 80B7E0BC -/* 0979C 80B7313C 46064100 */ add.s $f4, $f8, $f6 -/* 097A0 80B73140 460A203C */ c.lt.s $f4, $f10 +/* 0979C 80B7313C 46064100 */ add.s $f4, $f8, $f6 +/* 097A0 80B73140 460A203C */ c.lt.s $f4, $f10 /* 097A4 80B73144 00000000 */ nop -/* 097A8 80B73148 4503000D */ bc1tl .L80B73180 +/* 097A8 80B73148 4503000D */ bc1tl .L80B73180 /* 097AC 80B7314C 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 097B0 80B73150 C4420000 */ lwc1 $f2, 0x0000($v0) ## 80B7E0B8 /* 097B4 80B73154 C44C0008 */ lwc1 $f12, 0x0008($v0) ## 80B7E0C0 /* 097B8 80B73158 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 097BC 80B7315C 46021202 */ mul.s $f8, $f2, $f2 +/* 097BC 80B7315C 46021202 */ mul.s $f8, $f2, $f2 /* 097C0 80B73160 44812000 */ mtc1 $at, $f4 ## $f4 = 800.00 -/* 097C4 80B73164 460C6182 */ mul.s $f6, $f12, $f12 -/* 097C8 80B73168 46064000 */ add.s $f0, $f8, $f6 -/* 097CC 80B7316C 46000004 */ sqrt.s $f0, $f0 -/* 097D0 80B73170 4600203C */ c.lt.s $f4, $f0 +/* 097C4 80B73164 460C6182 */ mul.s $f6, $f12, $f12 +/* 097C8 80B73168 46064000 */ add.s $f0, $f8, $f6 +/* 097CC 80B7316C 46000004 */ sqrt.s $f0, $f0 +/* 097D0 80B73170 4600203C */ c.lt.s $f4, $f0 /* 097D4 80B73174 00000000 */ nop -/* 097D8 80B73178 45000008 */ bc1f .L80B7319C +/* 097D8 80B73178 45000008 */ bc1f .L80B7319C /* 097DC 80B7317C 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 .L80B73180: /* 097E0 80B73180 860B015A */ lh $t3, 0x015A($s0) ## 0000015A @@ -1949,17 +1949,17 @@ glabel L80B73004 /* 097E8 80B73188 A600017A */ sh $zero, 0x017A($s0) ## 0000017A /* 097EC 80B7318C E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 097F0 80B73190 A60B0158 */ sh $t3, 0x0158($s0) ## 00000158 -/* 097F4 80B73194 10000838 */ beq $zero, $zero, .L80B75278 +/* 097F4 80B73194 10000838 */ beq $zero, $zero, .L80B75278 /* 097F8 80B73198 E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 .L80B7319C: /* 097FC 80B7319C 860D017A */ lh $t5, 0x017A($s0) ## 0000017A -/* 09800 80B731A0 11A00006 */ beq $t5, $zero, .L80B731BC +/* 09800 80B731A0 11A00006 */ beq $t5, $zero, .L80B731BC /* 09804 80B731A4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 09808 80B731A8 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 0980C 80B731AC C7A80124 */ lwc1 $f8, 0x0124($sp) -/* 09810 80B731B0 4606403C */ c.lt.s $f8, $f6 +/* 0980C 80B731AC C7A80124 */ lwc1 $f8, 0x0124($sp) +/* 09810 80B731B0 4606403C */ c.lt.s $f8, $f6 /* 09814 80B731B4 00000000 */ nop -/* 09818 80B731B8 4500082F */ bc1f .L80B75278 +/* 09818 80B731B8 4500082F */ bc1f .L80B75278 .L80B731BC: /* 0981C 80B731BC 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 09820 80B731C0 A60E0158 */ sh $t6, 0x0158($s0) ## 00000158 @@ -1974,35 +1974,35 @@ glabel L80B73004 /* 09844 80B731E4 8C580008 */ lw $t8, 0x0008($v0) ## 80B7E0C0 /* 09848 80B731E8 E60401B0 */ swc1 $f4, 0x01B0($s0) ## 000001B0 /* 0984C 80B731EC AE1801BC */ sw $t8, 0x01BC($s0) ## 000001BC -/* 09850 80B731F0 C42AB698 */ lwc1 $f10, %lo(D_80B7B698)($at) +/* 09850 80B731F0 C42AB698 */ lwc1 $f10, %lo(D_80B7B698)($at) /* 09854 80B731F4 3C0180B8 */ lui $at, %hi(D_80B7B69C) ## $at = 80B80000 /* 09858 80B731F8 E60A0190 */ swc1 $f10, 0x0190($s0) ## 00000190 -/* 0985C 80B731FC C428B69C */ lwc1 $f8, %lo(D_80B7B69C)($at) +/* 0985C 80B731FC C428B69C */ lwc1 $f8, %lo(D_80B7B69C)($at) /* 09860 80B73200 A619017A */ sh $t9, 0x017A($s0) ## 0000017A -/* 09864 80B73204 1000081C */ beq $zero, $zero, .L80B75278 +/* 09864 80B73204 1000081C */ beq $zero, $zero, .L80B75278 /* 09868 80B73208 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 glabel L80B7320C -/* 0986C 80B7320C 4406A000 */ mfc1 $a2, $f20 +/* 0986C 80B7320C 4406A000 */ mfc1 $a2, $f20 /* 09870 80B73210 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 09874 80B73214 3C054680 */ lui $a1, 0x4680 ## $a1 = 46800000 /* 09878 80B73218 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0987C 80B7321C 3C074580 */ lui $a3, 0x4580 ## $a3 = 45800000 -/* 09880 80B73220 8FA40040 */ lw $a0, 0x0040($sp) +/* 09880 80B73220 8FA40040 */ lw $a0, 0x0040($sp) /* 09884 80B73224 24054E20 */ addiu $a1, $zero, 0x4E20 ## $a1 = 00004E20 /* 09888 80B73228 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0988C 80B7322C 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 09890 80B73230 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 09894 80B73234 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 /* 09898 80B73238 A20A0151 */ sb $t2, 0x0151($s0) ## 00000151 /* 0989C 80B7323C 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 /* 098A0 80B73240 3C0980B8 */ lui $t1, %hi(D_80B7E0B8) ## $t1 = 80B80000 -/* 098A4 80B73244 A7AC0134 */ sh $t4, 0x0134($sp) +/* 098A4 80B73244 A7AC0134 */ sh $t4, 0x0134($sp) /* 098A8 80B73248 2529E0B8 */ addiu $t1, $t1, %lo(D_80B7E0B8) ## $t1 = 80B7E0B8 /* 098AC 80B7324C 8D2D0000 */ lw $t5, 0x0000($t1) ## 80B7E0B8 -/* 098B0 80B73250 4406A000 */ mfc1 $a2, $f20 -/* 098B4 80B73254 4407A000 */ mfc1 $a3, $f20 +/* 098B0 80B73250 4406A000 */ mfc1 $a2, $f20 +/* 098B4 80B73254 4407A000 */ mfc1 $a3, $f20 /* 098B8 80B73258 AE0D01B4 */ sw $t5, 0x01B4($s0) ## 000001B4 /* 098BC 80B7325C 8D2B0004 */ lw $t3, 0x0004($t1) ## 80B7E0BC /* 098C0 80B73260 8E050188 */ lw $a1, 0x0188($s0) ## 00000188 @@ -2010,15 +2010,15 @@ glabel L80B7320C /* 098C8 80B73268 AE0B01B8 */ sw $t3, 0x01B8($s0) ## 000001B8 /* 098CC 80B7326C 8D2D0008 */ lw $t5, 0x0008($t1) ## 80B7E0C0 /* 098D0 80B73270 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 098D4 80B73274 AE0D01BC */ sw $t5, 0x01BC($s0) ## 000001BC /* 098D8 80B73278 3C0E80B8 */ lui $t6, %hi(D_80B7A694) ## $t6 = 80B80000 -/* 098DC 80B7327C 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) +/* 098DC 80B7327C 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) /* 098E0 80B73280 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 098E4 80B73284 55C10020 */ bnel $t6, $at, .L80B73308 +/* 098E4 80B73284 55C10020 */ bnel $t6, $at, .L80B73308 /* 098E8 80B73288 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 098EC 80B7328C 860F017A */ lh $t7, 0x017A($s0) ## 0000017A -/* 098F0 80B73290 51E0001D */ beql $t7, $zero, .L80B73308 +/* 098F0 80B73290 51E0001D */ beql $t7, $zero, .L80B73308 /* 098F4 80B73294 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 098F8 80B73298 8E3807C0 */ lw $t8, 0x07C0($s1) ## 000007C0 /* 098FC 80B7329C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -2029,24 +2029,24 @@ glabel L80B7320C /* 09910 80B732B0 872A0002 */ lh $t2, 0x0002($t9) ## 00000002 /* 09914 80B732B4 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 /* 09918 80B732B8 00000000 */ nop -/* 0991C 80B732BC 46803120 */ cvt.s.w $f4, $f6 +/* 0991C 80B732BC 46803120 */ cvt.s.w $f4, $f6 /* 09920 80B732C0 C4460004 */ lwc1 $f6, 0x0004($v0) ## 80B7E0BC -/* 09924 80B732C4 460A2200 */ add.s $f8, $f4, $f10 -/* 09928 80B732C8 4606403C */ c.lt.s $f8, $f6 +/* 09924 80B732C4 460A2200 */ add.s $f8, $f4, $f10 +/* 09928 80B732C8 4606403C */ c.lt.s $f8, $f6 /* 0992C 80B732CC 00000000 */ nop -/* 09930 80B732D0 4503000D */ bc1tl .L80B73308 +/* 09930 80B732D0 4503000D */ bc1tl .L80B73308 /* 09934 80B732D4 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 09938 80B732D8 C4420000 */ lwc1 $f2, 0x0000($v0) ## 80B7E0B8 /* 0993C 80B732DC C44C0008 */ lwc1 $f12, 0x0008($v0) ## 80B7E0C0 /* 09940 80B732E0 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 09944 80B732E4 46021102 */ mul.s $f4, $f2, $f2 +/* 09944 80B732E4 46021102 */ mul.s $f4, $f2, $f2 /* 09948 80B732E8 44814000 */ mtc1 $at, $f8 ## $f8 = 800.00 -/* 0994C 80B732EC 460C6282 */ mul.s $f10, $f12, $f12 -/* 09950 80B732F0 460A2000 */ add.s $f0, $f4, $f10 -/* 09954 80B732F4 46000004 */ sqrt.s $f0, $f0 -/* 09958 80B732F8 4600403C */ c.lt.s $f8, $f0 +/* 0994C 80B732EC 460C6282 */ mul.s $f10, $f12, $f12 +/* 09950 80B732F0 460A2000 */ add.s $f0, $f4, $f10 +/* 09954 80B732F4 46000004 */ sqrt.s $f0, $f0 +/* 09958 80B732F8 4600403C */ c.lt.s $f8, $f0 /* 0995C 80B732FC 00000000 */ nop -/* 09960 80B73300 45000008 */ bc1f .L80B73324 +/* 09960 80B73300 45000008 */ bc1f .L80B73324 /* 09964 80B73304 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 .L80B73308: /* 09968 80B73308 860C015A */ lh $t4, 0x015A($s0) ## 0000015A @@ -2054,32 +2054,32 @@ glabel L80B7320C /* 09970 80B73310 A600017A */ sh $zero, 0x017A($s0) ## 0000017A /* 09974 80B73314 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 09978 80B73318 A60C0158 */ sh $t4, 0x0158($s0) ## 00000158 -/* 0997C 80B7331C 100007D6 */ beq $zero, $zero, .L80B75278 +/* 0997C 80B7331C 100007D6 */ beq $zero, $zero, .L80B75278 /* 09980 80B73320 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 .L80B73324: /* 09984 80B73324 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 09988 80B73328 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 0998C 80B7332C C7A40124 */ lwc1 $f4, 0x0124($sp) -/* 09990 80B73330 460A203C */ c.lt.s $f4, $f10 +/* 0998C 80B7332C C7A40124 */ lwc1 $f4, 0x0124($sp) +/* 09990 80B73330 460A203C */ c.lt.s $f4, $f10 /* 09994 80B73334 00000000 */ nop -/* 09998 80B73338 450007CF */ bc1f .L80B75278 +/* 09998 80B73338 450007CF */ bc1f .L80B75278 /* 0999C 80B7333C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 099A0 80B73340 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 099A4 80B73344 0C2DC28B */ jal func_80B70A2C +/* 099A4 80B73344 0C2DC28B */ jal func_80B70A2C /* 099A8 80B73348 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 099AC 80B7334C 10400003 */ beq $v0, $zero, .L80B7335C +/* 099AC 80B7334C 10400003 */ beq $v0, $zero, .L80B7335C /* 099B0 80B73350 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 099B4 80B73354 0C2DC49E */ jal func_80B71278 +/* 099B4 80B73354 0C2DC49E */ jal func_80B71278 /* 099B8 80B73358 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 .L80B7335C: /* 099BC 80B7335C 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 /* 099C0 80B73360 A6090158 */ sh $t1, 0x0158($s0) ## 00000158 /* 099C4 80B73364 3C0180B8 */ lui $at, %hi(D_80B7B6A0) ## $at = 80B80000 -/* 099C8 80B73368 C428B6A0 */ lwc1 $f8, %lo(D_80B7B6A0)($at) +/* 099C8 80B73368 C428B6A0 */ lwc1 $f8, %lo(D_80B7B6A0)($at) /* 099CC 80B7336C 3C0180B8 */ lui $at, %hi(D_80B7B6A4) ## $at = 80B80000 /* 099D0 80B73370 240B0096 */ addiu $t3, $zero, 0x0096 ## $t3 = 00000096 /* 099D4 80B73374 E6080190 */ swc1 $f8, 0x0190($s0) ## 00000190 -/* 099D8 80B73378 C426B6A4 */ lwc1 $f6, %lo(D_80B7B6A4)($at) +/* 099D8 80B73378 C426B6A4 */ lwc1 $f6, %lo(D_80B7B6A4)($at) /* 099DC 80B7337C 240D0078 */ addiu $t5, $zero, 0x0078 ## $t5 = 00000078 /* 099E0 80B73380 A60B017C */ sh $t3, 0x017C($s0) ## 0000017C /* 099E4 80B73384 A600017A */ sh $zero, 0x017A($s0) ## 0000017A @@ -2088,219 +2088,219 @@ glabel L80B7320C /* 099F0 80B73390 3C0180B8 */ lui $at, %hi(D_80B7A694) ## $at = 80B80000 /* 099F4 80B73394 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 099F8 80B73398 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 -/* 099FC 80B7339C A42EA694 */ sh $t6, %lo(D_80B7A694)($at) +/* 099FC 80B7339C A42EA694 */ sh $t6, %lo(D_80B7A694)($at) /* 09A00 80B733A0 3C0180B8 */ lui $at, %hi(D_80B7E0A8) ## $at = 80B80000 -/* 09A04 80B733A4 AC30E0A8 */ sw $s0, %lo(D_80B7E0A8)($at) +/* 09A04 80B733A4 AC30E0A8 */ sw $s0, %lo(D_80B7E0A8)($at) /* 09A08 80B733A8 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 09A0C 80B733AC 44816000 */ mtc1 $at, $f12 ## $f12 = 400.00 /* 09A10 80B733B0 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09A14 80B733B4 00000000 */ nop /* 09A18 80B733B8 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 09A1C 80B733BC 44812000 */ mtc1 $at, $f4 ## $f4 = 500.00 /* 09A20 80B733C0 3C0F80B8 */ lui $t7, %hi(D_80B7E0B6) ## $t7 = 80B80000 -/* 09A24 80B733C4 91EFE0B6 */ lbu $t7, %lo(D_80B7E0B6)($t7) -/* 09A28 80B733C8 46002281 */ sub.s $f10, $f4, $f0 +/* 09A24 80B733C4 91EFE0B6 */ lbu $t7, %lo(D_80B7E0B6)($t7) +/* 09A28 80B733C8 46002281 */ sub.s $f10, $f4, $f0 /* 09A2C 80B733CC 3C0180B8 */ lui $at, %hi(D_80B7A69C) ## $at = 80B80000 -/* 09A30 80B733D0 E42AA69C */ swc1 $f10, %lo(D_80B7A69C)($at) +/* 09A30 80B733D0 E42AA69C */ swc1 $f10, %lo(D_80B7A69C)($at) /* 09A34 80B733D4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 09A38 80B733D8 15E10052 */ bne $t7, $at, .L80B73524 +/* 09A38 80B733D8 15E10052 */ bne $t7, $at, .L80B73524 /* 09A3C 80B733DC 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 09A40 80B733E0 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 /* 09A44 80B733E4 C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC -/* 09A48 80B733E8 4600403C */ c.lt.s $f8, $f0 +/* 09A48 80B733E8 4600403C */ c.lt.s $f8, $f0 /* 09A4C 80B733EC 00000000 */ nop -/* 09A50 80B733F0 4500000D */ bc1f .L80B73428 +/* 09A50 80B733F0 4500000D */ bc1f .L80B73428 /* 09A54 80B733F4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 09A58 80B733F8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 09A5C 80B733FC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09A60 80B73400 00000000 */ nop -/* 09A64 80B73404 4600018D */ trunc.w.s $f6, $f0 -/* 09A68 80B73408 44023000 */ mfc1 $v0, $f6 +/* 09A64 80B73404 4600018D */ trunc.w.s $f6, $f0 +/* 09A68 80B73408 44023000 */ mfc1 $v0, $f6 /* 09A6C 80B7340C 00000000 */ nop -/* 09A70 80B73410 00021400 */ sll $v0, $v0, 16 -/* 09A74 80B73414 00021403 */ sra $v0, $v0, 16 +/* 09A70 80B73410 00021400 */ sll $v0, $v0, 16 +/* 09A74 80B73414 00021403 */ sra $v0, $v0, 16 /* 09A78 80B73418 2442000A */ addiu $v0, $v0, 0x000A ## $v0 = 0000000A -/* 09A7C 80B7341C 00021400 */ sll $v0, $v0, 16 -/* 09A80 80B73420 10000033 */ beq $zero, $zero, .L80B734F0 -/* 09A84 80B73424 00021403 */ sra $v0, $v0, 16 +/* 09A7C 80B7341C 00021400 */ sll $v0, $v0, 16 +/* 09A80 80B73420 10000033 */ beq $zero, $zero, .L80B734F0 +/* 09A84 80B73424 00021403 */ sra $v0, $v0, 16 .L80B73428: /* 09A88 80B73428 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 09A8C 80B7342C 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 /* 09A90 80B73430 00000000 */ nop -/* 09A94 80B73434 4600203C */ c.lt.s $f4, $f0 +/* 09A94 80B73434 4600203C */ c.lt.s $f4, $f0 /* 09A98 80B73438 00000000 */ nop -/* 09A9C 80B7343C 4500000D */ bc1f .L80B73474 +/* 09A9C 80B7343C 4500000D */ bc1f .L80B73474 /* 09AA0 80B73440 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 09AA4 80B73444 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 09AA8 80B73448 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09AAC 80B7344C 00000000 */ nop -/* 09AB0 80B73450 4600028D */ trunc.w.s $f10, $f0 -/* 09AB4 80B73454 44025000 */ mfc1 $v0, $f10 +/* 09AB0 80B73450 4600028D */ trunc.w.s $f10, $f0 +/* 09AB4 80B73454 44025000 */ mfc1 $v0, $f10 /* 09AB8 80B73458 00000000 */ nop -/* 09ABC 80B7345C 00021400 */ sll $v0, $v0, 16 -/* 09AC0 80B73460 00021403 */ sra $v0, $v0, 16 +/* 09ABC 80B7345C 00021400 */ sll $v0, $v0, 16 +/* 09AC0 80B73460 00021403 */ sra $v0, $v0, 16 /* 09AC4 80B73464 24420014 */ addiu $v0, $v0, 0x0014 ## $v0 = 00000014 -/* 09AC8 80B73468 00021400 */ sll $v0, $v0, 16 -/* 09ACC 80B7346C 10000020 */ beq $zero, $zero, .L80B734F0 -/* 09AD0 80B73470 00021403 */ sra $v0, $v0, 16 +/* 09AC8 80B73468 00021400 */ sll $v0, $v0, 16 +/* 09ACC 80B7346C 10000020 */ beq $zero, $zero, .L80B734F0 +/* 09AD0 80B73470 00021403 */ sra $v0, $v0, 16 .L80B73474: /* 09AD4 80B73474 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 09AD8 80B73478 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 09ADC 80B7347C 00000000 */ nop -/* 09AE0 80B73480 4600403C */ c.lt.s $f8, $f0 +/* 09AE0 80B73480 4600403C */ c.lt.s $f8, $f0 /* 09AE4 80B73484 00000000 */ nop -/* 09AE8 80B73488 4500000D */ bc1f .L80B734C0 +/* 09AE8 80B73488 4500000D */ bc1f .L80B734C0 /* 09AEC 80B7348C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 09AF0 80B73490 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 09AF4 80B73494 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09AF8 80B73498 00000000 */ nop -/* 09AFC 80B7349C 4600018D */ trunc.w.s $f6, $f0 -/* 09B00 80B734A0 44023000 */ mfc1 $v0, $f6 +/* 09AFC 80B7349C 4600018D */ trunc.w.s $f6, $f0 +/* 09B00 80B734A0 44023000 */ mfc1 $v0, $f6 /* 09B04 80B734A4 00000000 */ nop -/* 09B08 80B734A8 00021400 */ sll $v0, $v0, 16 -/* 09B0C 80B734AC 00021403 */ sra $v0, $v0, 16 +/* 09B08 80B734A8 00021400 */ sll $v0, $v0, 16 +/* 09B0C 80B734AC 00021403 */ sra $v0, $v0, 16 /* 09B10 80B734B0 2442001E */ addiu $v0, $v0, 0x001E ## $v0 = 0000001E -/* 09B14 80B734B4 00021400 */ sll $v0, $v0, 16 -/* 09B18 80B734B8 1000000D */ beq $zero, $zero, .L80B734F0 -/* 09B1C 80B734BC 00021403 */ sra $v0, $v0, 16 +/* 09B14 80B734B4 00021400 */ sll $v0, $v0, 16 +/* 09B18 80B734B8 1000000D */ beq $zero, $zero, .L80B734F0 +/* 09B1C 80B734BC 00021403 */ sra $v0, $v0, 16 .L80B734C0: /* 09B20 80B734C0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 09B24 80B734C4 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 09B28 80B734C8 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09B2C 80B734CC 00000000 */ nop -/* 09B30 80B734D0 4600010D */ trunc.w.s $f4, $f0 -/* 09B34 80B734D4 44022000 */ mfc1 $v0, $f4 +/* 09B30 80B734D0 4600010D */ trunc.w.s $f4, $f0 +/* 09B34 80B734D4 44022000 */ mfc1 $v0, $f4 /* 09B38 80B734D8 00000000 */ nop -/* 09B3C 80B734DC 00021400 */ sll $v0, $v0, 16 -/* 09B40 80B734E0 00021403 */ sra $v0, $v0, 16 +/* 09B3C 80B734DC 00021400 */ sll $v0, $v0, 16 +/* 09B40 80B734E0 00021403 */ sra $v0, $v0, 16 /* 09B44 80B734E4 24420028 */ addiu $v0, $v0, 0x0028 ## $v0 = 00000028 -/* 09B48 80B734E8 00021400 */ sll $v0, $v0, 16 -/* 09B4C 80B734EC 00021403 */ sra $v0, $v0, 16 +/* 09B48 80B734E8 00021400 */ sll $v0, $v0, 16 +/* 09B4C 80B734EC 00021403 */ sra $v0, $v0, 16 .L80B734F0: /* 09B50 80B734F0 3C0180B8 */ lui $at, %hi(D_80B7E122) ## $at = 80B80000 -/* 09B54 80B734F4 A422E122 */ sh $v0, %lo(D_80B7E122)($at) -/* 09B58 80B734F8 00023080 */ sll $a2, $v0, 2 +/* 09B54 80B734F4 A422E122 */ sh $v0, %lo(D_80B7E122)($at) +/* 09B58 80B734F8 00023080 */ sll $a2, $v0, 2 /* 09B5C 80B734FC 3C0180B8 */ lui $at, %hi(D_80B7E0A4) ## $at = 80B80000 -/* 09B60 80B73500 00C23023 */ subu $a2, $a2, $v0 +/* 09B60 80B73500 00C23023 */ subu $a2, $a2, $v0 /* 09B64 80B73504 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 09B68 80B73508 A422E0A4 */ sh $v0, %lo(D_80B7E0A4)($at) +/* 09B68 80B73508 A422E0A4 */ sh $v0, %lo(D_80B7E0A4)($at) /* 09B6C 80B7350C 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 /* 09B70 80B73510 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 09B74 80B73514 0C02A7DB */ jal func_800A9F6C +/* 09B74 80B73514 0C02A7DB */ jal func_800A9F6C /* 09B78 80B73518 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 09B7C 80B7351C 10000051 */ beq $zero, $zero, .L80B73664 +/* 09B7C 80B7351C 10000051 */ beq $zero, $zero, .L80B73664 /* 09B80 80B73520 00000000 */ nop .L80B73524: /* 09B84 80B73524 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 09B88 80B73528 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 09B8C 80B7352C C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC -/* 09B90 80B73530 4600503C */ c.lt.s $f10, $f0 +/* 09B90 80B73530 4600503C */ c.lt.s $f10, $f0 /* 09B94 80B73534 00000000 */ nop -/* 09B98 80B73538 4500000D */ bc1f .L80B73570 +/* 09B98 80B73538 4500000D */ bc1f .L80B73570 /* 09B9C 80B7353C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09BA0 80B73540 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 09BA4 80B73544 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09BA8 80B73548 00000000 */ nop -/* 09BAC 80B7354C 4600020D */ trunc.w.s $f8, $f0 -/* 09BB0 80B73550 44024000 */ mfc1 $v0, $f8 +/* 09BAC 80B7354C 4600020D */ trunc.w.s $f8, $f0 +/* 09BB0 80B73550 44024000 */ mfc1 $v0, $f8 /* 09BB4 80B73554 00000000 */ nop -/* 09BB8 80B73558 00021400 */ sll $v0, $v0, 16 -/* 09BBC 80B7355C 00021403 */ sra $v0, $v0, 16 +/* 09BB8 80B73558 00021400 */ sll $v0, $v0, 16 +/* 09BBC 80B7355C 00021403 */ sra $v0, $v0, 16 /* 09BC0 80B73560 2442000A */ addiu $v0, $v0, 0x000A ## $v0 = 0000000A -/* 09BC4 80B73564 00021400 */ sll $v0, $v0, 16 -/* 09BC8 80B73568 10000033 */ beq $zero, $zero, .L80B73638 -/* 09BCC 80B7356C 00021403 */ sra $v0, $v0, 16 +/* 09BC4 80B73564 00021400 */ sll $v0, $v0, 16 +/* 09BC8 80B73568 10000033 */ beq $zero, $zero, .L80B73638 +/* 09BCC 80B7356C 00021403 */ sra $v0, $v0, 16 .L80B73570: /* 09BD0 80B73570 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 09BD4 80B73574 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 09BD8 80B73578 00000000 */ nop -/* 09BDC 80B7357C 4600303C */ c.lt.s $f6, $f0 +/* 09BDC 80B7357C 4600303C */ c.lt.s $f6, $f0 /* 09BE0 80B73580 00000000 */ nop -/* 09BE4 80B73584 4500000D */ bc1f .L80B735BC +/* 09BE4 80B73584 4500000D */ bc1f .L80B735BC /* 09BE8 80B73588 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09BEC 80B7358C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 09BF0 80B73590 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09BF4 80B73594 00000000 */ nop -/* 09BF8 80B73598 4600010D */ trunc.w.s $f4, $f0 -/* 09BFC 80B7359C 44022000 */ mfc1 $v0, $f4 +/* 09BF8 80B73598 4600010D */ trunc.w.s $f4, $f0 +/* 09BFC 80B7359C 44022000 */ mfc1 $v0, $f4 /* 09C00 80B735A0 00000000 */ nop -/* 09C04 80B735A4 00021400 */ sll $v0, $v0, 16 -/* 09C08 80B735A8 00021403 */ sra $v0, $v0, 16 +/* 09C04 80B735A4 00021400 */ sll $v0, $v0, 16 +/* 09C08 80B735A8 00021403 */ sra $v0, $v0, 16 /* 09C0C 80B735AC 2442000F */ addiu $v0, $v0, 0x000F ## $v0 = 0000000F -/* 09C10 80B735B0 00021400 */ sll $v0, $v0, 16 -/* 09C14 80B735B4 10000020 */ beq $zero, $zero, .L80B73638 -/* 09C18 80B735B8 00021403 */ sra $v0, $v0, 16 +/* 09C10 80B735B0 00021400 */ sll $v0, $v0, 16 +/* 09C14 80B735B4 10000020 */ beq $zero, $zero, .L80B73638 +/* 09C18 80B735B8 00021403 */ sra $v0, $v0, 16 .L80B735BC: /* 09C1C 80B735BC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 09C20 80B735C0 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 09C24 80B735C4 00000000 */ nop -/* 09C28 80B735C8 4600503C */ c.lt.s $f10, $f0 +/* 09C28 80B735C8 4600503C */ c.lt.s $f10, $f0 /* 09C2C 80B735CC 00000000 */ nop -/* 09C30 80B735D0 4500000D */ bc1f .L80B73608 +/* 09C30 80B735D0 4500000D */ bc1f .L80B73608 /* 09C34 80B735D4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09C38 80B735D8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 09C3C 80B735DC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09C40 80B735E0 00000000 */ nop -/* 09C44 80B735E4 4600020D */ trunc.w.s $f8, $f0 -/* 09C48 80B735E8 44024000 */ mfc1 $v0, $f8 +/* 09C44 80B735E4 4600020D */ trunc.w.s $f8, $f0 +/* 09C48 80B735E8 44024000 */ mfc1 $v0, $f8 /* 09C4C 80B735EC 00000000 */ nop -/* 09C50 80B735F0 00021400 */ sll $v0, $v0, 16 -/* 09C54 80B735F4 00021403 */ sra $v0, $v0, 16 +/* 09C50 80B735F0 00021400 */ sll $v0, $v0, 16 +/* 09C54 80B735F4 00021403 */ sra $v0, $v0, 16 /* 09C58 80B735F8 24420011 */ addiu $v0, $v0, 0x0011 ## $v0 = 00000011 -/* 09C5C 80B735FC 00021400 */ sll $v0, $v0, 16 -/* 09C60 80B73600 1000000D */ beq $zero, $zero, .L80B73638 -/* 09C64 80B73604 00021403 */ sra $v0, $v0, 16 +/* 09C5C 80B735FC 00021400 */ sll $v0, $v0, 16 +/* 09C60 80B73600 1000000D */ beq $zero, $zero, .L80B73638 +/* 09C64 80B73604 00021403 */ sra $v0, $v0, 16 .L80B73608: /* 09C68 80B73608 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09C6C 80B7360C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 09C70 80B73610 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09C74 80B73614 00000000 */ nop -/* 09C78 80B73618 4600018D */ trunc.w.s $f6, $f0 -/* 09C7C 80B7361C 44023000 */ mfc1 $v0, $f6 +/* 09C78 80B73618 4600018D */ trunc.w.s $f6, $f0 +/* 09C7C 80B7361C 44023000 */ mfc1 $v0, $f6 /* 09C80 80B73620 00000000 */ nop -/* 09C84 80B73624 00021400 */ sll $v0, $v0, 16 -/* 09C88 80B73628 00021403 */ sra $v0, $v0, 16 +/* 09C84 80B73624 00021400 */ sll $v0, $v0, 16 +/* 09C88 80B73628 00021403 */ sra $v0, $v0, 16 /* 09C8C 80B7362C 24420019 */ addiu $v0, $v0, 0x0019 ## $v0 = 00000019 -/* 09C90 80B73630 00021400 */ sll $v0, $v0, 16 -/* 09C94 80B73634 00021403 */ sra $v0, $v0, 16 +/* 09C90 80B73630 00021400 */ sll $v0, $v0, 16 +/* 09C94 80B73634 00021403 */ sra $v0, $v0, 16 .L80B73638: /* 09C98 80B73638 3C0180B8 */ lui $at, %hi(D_80B7E122) ## $at = 80B80000 -/* 09C9C 80B7363C A422E122 */ sh $v0, %lo(D_80B7E122)($at) -/* 09CA0 80B73640 00023080 */ sll $a2, $v0, 2 +/* 09C9C 80B7363C A422E122 */ sh $v0, %lo(D_80B7E122)($at) +/* 09CA0 80B73640 00023080 */ sll $a2, $v0, 2 /* 09CA4 80B73644 3C0180B8 */ lui $at, %hi(D_80B7E0A4) ## $at = 80B80000 -/* 09CA8 80B73648 00C23023 */ subu $a2, $a2, $v0 +/* 09CA8 80B73648 00C23023 */ subu $a2, $a2, $v0 /* 09CAC 80B7364C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 09CB0 80B73650 A422E0A4 */ sh $v0, %lo(D_80B7E0A4)($at) +/* 09CB0 80B73650 A422E0A4 */ sh $v0, %lo(D_80B7E0A4)($at) /* 09CB4 80B73654 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 /* 09CB8 80B73658 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 09CBC 80B7365C 0C02A7DB */ jal func_800A9F6C +/* 09CBC 80B7365C 0C02A7DB */ jal func_800A9F6C /* 09CC0 80B73660 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A .L80B73664: /* 09CC4 80B73664 3C0180B8 */ lui $at, %hi(D_80B7E124) ## $at = 80B80000 -/* 09CC8 80B73668 A020E124 */ sb $zero, %lo(D_80B7E124)($at) +/* 09CC8 80B73668 A020E124 */ sb $zero, %lo(D_80B7E124)($at) /* 09CCC 80B7366C 3C0180B8 */ lui $at, %hi(D_80B7E116) ## $at = 80B80000 /* 09CD0 80B73670 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 09CD4 80B73674 A42FE116 */ sh $t7, %lo(D_80B7E116)($at) +/* 09CD4 80B73674 A42FE116 */ sh $t7, %lo(D_80B7E116)($at) /* 09CD8 80B73678 3C0180B8 */ lui $at, %hi(D_80B7E080) ## $at = 80B80000 -/* 09CDC 80B7367C 100006FE */ beq $zero, $zero, .L80B75278 -/* 09CE0 80B73680 A420E080 */ sh $zero, %lo(D_80B7E080)($at) +/* 09CDC 80B7367C 100006FE */ beq $zero, $zero, .L80B75278 +/* 09CE0 80B73680 A420E080 */ sh $zero, %lo(D_80B7E080)($at) glabel L80B73684 /* 09CE4 80B73684 24180032 */ addiu $t8, $zero, 0x0032 ## $t8 = 00000032 /* 09CE8 80B73688 3C1980B8 */ lui $t9, %hi(D_80B7E0B8) ## $t9 = 80B80000 /* 09CEC 80B7368C A2180151 */ sb $t8, 0x0151($s0) ## 00000151 /* 09CF0 80B73690 2739E0B8 */ addiu $t9, $t9, %lo(D_80B7E0B8) ## $t9 = 80B7E0B8 /* 09CF4 80B73694 8F2C0000 */ lw $t4, 0x0000($t9) ## 80B7E0B8 -/* 09CF8 80B73698 4406A000 */ mfc1 $a2, $f20 -/* 09CFC 80B7369C 4407A000 */ mfc1 $a3, $f20 +/* 09CF8 80B73698 4406A000 */ mfc1 $a2, $f20 +/* 09CFC 80B7369C 4407A000 */ mfc1 $a3, $f20 /* 09D00 80B736A0 AE0C01B4 */ sw $t4, 0x01B4($s0) ## 000001B4 /* 09D04 80B736A4 8F2A0004 */ lw $t2, 0x0004($t9) ## 80B7E0BC /* 09D08 80B736A8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 @@ -2308,43 +2308,43 @@ glabel L80B73684 /* 09D10 80B736B0 AE0A01B8 */ sw $t2, 0x01B8($s0) ## 000001B8 /* 09D14 80B736B4 8F2C0008 */ lw $t4, 0x0008($t9) ## 80B7E0C0 /* 09D18 80B736B8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 09D1C 80B736BC AE0C01BC */ sw $t4, 0x01BC($s0) ## 000001BC /* 09D20 80B736C0 3C0980B8 */ lui $t1, %hi(D_80B7A694) ## $t1 = 80B80000 -/* 09D24 80B736C4 8529A694 */ lh $t1, %lo(D_80B7A694)($t1) +/* 09D24 80B736C4 8529A694 */ lh $t1, %lo(D_80B7A694)($t1) /* 09D28 80B736C8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 09D2C 80B736CC 55210020 */ bnel $t1, $at, .L80B73750 +/* 09D2C 80B736CC 55210020 */ bnel $t1, $at, .L80B73750 /* 09D30 80B736D0 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 09D34 80B736D4 860B017A */ lh $t3, 0x017A($s0) ## 0000017A -/* 09D38 80B736D8 5160001D */ beql $t3, $zero, .L80B73750 +/* 09D38 80B736D8 5160001D */ beql $t3, $zero, .L80B73750 /* 09D3C 80B736DC 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 09D40 80B736E0 8E2D07C0 */ lw $t5, 0x07C0($s1) ## 000007C0 /* 09D44 80B736E4 3C0180B8 */ lui $at, %hi(D_80B7E0BC) ## $at = 80B80000 -/* 09D48 80B736E8 C430E0BC */ lwc1 $f16, %lo(D_80B7E0BC)($at) +/* 09D48 80B736E8 C430E0BC */ lwc1 $f16, %lo(D_80B7E0BC)($at) /* 09D4C 80B736EC 8DAE0028 */ lw $t6, 0x0028($t5) ## 00000028 /* 09D50 80B736F0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09D54 80B736F4 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 /* 09D58 80B736F8 85CF0002 */ lh $t7, 0x0002($t6) ## 00000002 /* 09D5C 80B736FC 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 /* 09D60 80B73700 00000000 */ nop -/* 09D64 80B73704 468023A0 */ cvt.s.w $f14, $f4 -/* 09D68 80B73708 460A7200 */ add.s $f8, $f14, $f10 -/* 09D6C 80B7370C 4610403C */ c.lt.s $f8, $f16 +/* 09D64 80B73704 468023A0 */ cvt.s.w $f14, $f4 +/* 09D68 80B73708 460A7200 */ add.s $f8, $f14, $f10 +/* 09D6C 80B7370C 4610403C */ c.lt.s $f8, $f16 /* 09D70 80B73710 00000000 */ nop -/* 09D74 80B73714 4501000D */ bc1t .L80B7374C +/* 09D74 80B73714 4501000D */ bc1t .L80B7374C /* 09D78 80B73718 3C0180B8 */ lui $at, %hi(D_80B7E0B8) ## $at = 80B80000 -/* 09D7C 80B7371C C422E0B8 */ lwc1 $f2, %lo(D_80B7E0B8)($at) +/* 09D7C 80B7371C C422E0B8 */ lwc1 $f2, %lo(D_80B7E0B8)($at) /* 09D80 80B73720 3C0180B8 */ lui $at, %hi(D_80B7E0C0) ## $at = 80B80000 -/* 09D84 80B73724 C42CE0C0 */ lwc1 $f12, %lo(D_80B7E0C0)($at) -/* 09D88 80B73728 46021182 */ mul.s $f6, $f2, $f2 +/* 09D84 80B73724 C42CE0C0 */ lwc1 $f12, %lo(D_80B7E0C0)($at) +/* 09D88 80B73728 46021182 */ mul.s $f6, $f2, $f2 /* 09D8C 80B7372C 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 09D90 80B73730 44815000 */ mtc1 $at, $f10 ## $f10 = 800.00 -/* 09D94 80B73734 460C6102 */ mul.s $f4, $f12, $f12 -/* 09D98 80B73738 46043000 */ add.s $f0, $f6, $f4 -/* 09D9C 80B7373C 46000004 */ sqrt.s $f0, $f0 -/* 09DA0 80B73740 4600503C */ c.lt.s $f10, $f0 +/* 09D94 80B73734 460C6102 */ mul.s $f4, $f12, $f12 +/* 09D98 80B73738 46043000 */ add.s $f0, $f6, $f4 +/* 09D9C 80B7373C 46000004 */ sqrt.s $f0, $f0 +/* 09DA0 80B73740 4600503C */ c.lt.s $f10, $f0 /* 09DA4 80B73744 00000000 */ nop -/* 09DA8 80B73748 45000008 */ bc1f .L80B7376C +/* 09DA8 80B73748 45000008 */ bc1f .L80B7376C .L80B7374C: /* 09DAC 80B7374C 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 .L80B73750: @@ -2353,41 +2353,41 @@ glabel L80B73684 /* 09DB8 80B73758 A600017A */ sh $zero, 0x017A($s0) ## 0000017A /* 09DBC 80B7375C E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 09DC0 80B73760 A6180158 */ sh $t8, 0x0158($s0) ## 00000158 -/* 09DC4 80B73764 100006C4 */ beq $zero, $zero, .L80B75278 +/* 09DC4 80B73764 100006C4 */ beq $zero, $zero, .L80B75278 /* 09DC8 80B73768 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 .L80B7376C: /* 09DCC 80B7376C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 09DD0 80B73770 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 09DD4 80B73774 C7A60124 */ lwc1 $f6, 0x0124($sp) -/* 09DD8 80B73778 4604303C */ c.lt.s $f6, $f4 +/* 09DD4 80B73774 C7A60124 */ lwc1 $f6, 0x0124($sp) +/* 09DD8 80B73778 4604303C */ c.lt.s $f6, $f4 /* 09DDC 80B7377C 00000000 */ nop -/* 09DE0 80B73780 450006BD */ bc1f .L80B75278 +/* 09DE0 80B73780 450006BD */ bc1f .L80B75278 /* 09DE4 80B73784 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 09DE8 80B73788 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 09DEC 80B7378C 00000000 */ nop -/* 09DF0 80B73790 460A7201 */ sub.s $f8, $f14, $f10 -/* 09DF4 80B73794 4610403C */ c.lt.s $f8, $f16 +/* 09DF0 80B73790 460A7201 */ sub.s $f8, $f14, $f10 +/* 09DF4 80B73794 4610403C */ c.lt.s $f8, $f16 /* 09DF8 80B73798 00000000 */ nop -/* 09DFC 80B7379C 45000005 */ bc1f .L80B737B4 +/* 09DFC 80B7379C 45000005 */ bc1f .L80B737B4 /* 09E00 80B737A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 09E04 80B737A4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 09E08 80B737A8 2405288A */ addiu $a1, $zero, 0x288A ## $a1 = 0000288A -/* 09E0C 80B737AC 0C01E221 */ jal func_80078884 +/* 09E0C 80B737AC 0C01E221 */ jal func_80078884 /* 09E10 80B737B0 24040836 */ addiu $a0, $zero, 0x0836 ## $a0 = 00000836 .L80B737B4: /* 09E14 80B737B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 09E18 80B737B8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 09E1C 80B737BC 0C2DC28B */ jal func_80B70A2C +/* 09E1C 80B737BC 0C2DC28B */ jal func_80B70A2C /* 09E20 80B737C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 09E24 80B737C4 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 /* 09E28 80B737C8 A6190158 */ sh $t9, 0x0158($s0) ## 00000158 /* 09E2C 80B737CC 3C0180B8 */ lui $at, %hi(D_80B7B6A8) ## $at = 80B80000 -/* 09E30 80B737D0 C426B6A8 */ lwc1 $f6, %lo(D_80B7B6A8)($at) +/* 09E30 80B737D0 C426B6A8 */ lwc1 $f6, %lo(D_80B7B6A8)($at) /* 09E34 80B737D4 3C0180B8 */ lui $at, %hi(D_80B7B6AC) ## $at = 80B80000 /* 09E38 80B737D8 240A0096 */ addiu $t2, $zero, 0x0096 ## $t2 = 00000096 /* 09E3C 80B737DC E6060190 */ swc1 $f6, 0x0190($s0) ## 00000190 -/* 09E40 80B737E0 C424B6AC */ lwc1 $f4, %lo(D_80B7B6AC)($at) +/* 09E40 80B737E0 C424B6AC */ lwc1 $f4, %lo(D_80B7B6AC)($at) /* 09E44 80B737E4 240C0078 */ addiu $t4, $zero, 0x0078 ## $t4 = 00000078 /* 09E48 80B737E8 A60A017C */ sh $t2, 0x017C($s0) ## 0000017C /* 09E4C 80B737EC A600017A */ sh $zero, 0x017A($s0) ## 0000017A @@ -2396,47 +2396,47 @@ glabel L80B73684 /* 09E58 80B737F8 3C0180B8 */ lui $at, %hi(D_80B7A694) ## $at = 80B80000 /* 09E5C 80B737FC 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 09E60 80B73800 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 -/* 09E64 80B73804 A429A694 */ sh $t1, %lo(D_80B7A694)($at) +/* 09E64 80B73804 A429A694 */ sh $t1, %lo(D_80B7A694)($at) /* 09E68 80B73808 3C0B80B8 */ lui $t3, %hi(D_80B7E0B6) ## $t3 = 80B80000 -/* 09E6C 80B7380C 916BE0B6 */ lbu $t3, %lo(D_80B7E0B6)($t3) +/* 09E6C 80B7380C 916BE0B6 */ lbu $t3, %lo(D_80B7E0B6)($t3) /* 09E70 80B73810 3C0180B8 */ lui $at, %hi(D_80B7E0A8) ## $at = 80B80000 -/* 09E74 80B73814 AC30E0A8 */ sw $s0, %lo(D_80B7E0A8)($at) +/* 09E74 80B73814 AC30E0A8 */ sw $s0, %lo(D_80B7E0A8)($at) /* 09E78 80B73818 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 09E7C 80B7381C 1561000D */ bne $t3, $at, .L80B73854 +/* 09E7C 80B7381C 1561000D */ bne $t3, $at, .L80B73854 /* 09E80 80B73820 240D001E */ addiu $t5, $zero, 0x001E ## $t5 = 0000001E /* 09E84 80B73824 3C0180B8 */ lui $at, %hi(D_80B7E122) ## $at = 80B80000 -/* 09E88 80B73828 A42DE122 */ sh $t5, %lo(D_80B7E122)($at) +/* 09E88 80B73828 A42DE122 */ sh $t5, %lo(D_80B7E122)($at) /* 09E8C 80B7382C 3C0180B8 */ lui $at, %hi(D_80B7E0A4) ## $at = 80B80000 /* 09E90 80B73830 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 /* 09E94 80B73834 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 09E98 80B73838 A42EE0A4 */ sh $t6, %lo(D_80B7E0A4)($at) +/* 09E98 80B73838 A42EE0A4 */ sh $t6, %lo(D_80B7E0A4)($at) /* 09E9C 80B7383C 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C /* 09EA0 80B73840 2406005A */ addiu $a2, $zero, 0x005A ## $a2 = 0000005A -/* 09EA4 80B73844 0C02A7DB */ jal func_800A9F6C +/* 09EA4 80B73844 0C02A7DB */ jal func_800A9F6C /* 09EA8 80B73848 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 09EAC 80B7384C 1000000C */ beq $zero, $zero, .L80B73880 +/* 09EAC 80B7384C 1000000C */ beq $zero, $zero, .L80B73880 /* 09EB0 80B73850 00000000 */ nop .L80B73854: /* 09EB4 80B73854 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E /* 09EB8 80B73858 3C0180B8 */ lui $at, %hi(D_80B7E122) ## $at = 80B80000 -/* 09EBC 80B7385C A42FE122 */ sh $t7, %lo(D_80B7E122)($at) +/* 09EBC 80B7385C A42FE122 */ sh $t7, %lo(D_80B7E122)($at) /* 09EC0 80B73860 3C0180B8 */ lui $at, %hi(D_80B7E0A4) ## $at = 80B80000 /* 09EC4 80B73864 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 /* 09EC8 80B73868 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 09ECC 80B7386C A438E0A4 */ sh $t8, %lo(D_80B7E0A4)($at) +/* 09ECC 80B7386C A438E0A4 */ sh $t8, %lo(D_80B7E0A4)($at) /* 09ED0 80B73870 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 /* 09ED4 80B73874 2406005A */ addiu $a2, $zero, 0x005A ## $a2 = 0000005A -/* 09ED8 80B73878 0C02A7DB */ jal func_800A9F6C +/* 09ED8 80B73878 0C02A7DB */ jal func_800A9F6C /* 09EDC 80B7387C 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A .L80B73880: /* 09EE0 80B73880 3C0180B8 */ lui $at, %hi(D_80B7E124) ## $at = 80B80000 -/* 09EE4 80B73884 A020E124 */ sb $zero, %lo(D_80B7E124)($at) +/* 09EE4 80B73884 A020E124 */ sb $zero, %lo(D_80B7E124)($at) /* 09EE8 80B73888 3C0180B8 */ lui $at, %hi(D_80B7E116) ## $at = 80B80000 /* 09EEC 80B7388C 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 09EF0 80B73890 A439E116 */ sh $t9, %lo(D_80B7E116)($at) +/* 09EF0 80B73890 A439E116 */ sh $t9, %lo(D_80B7E116)($at) /* 09EF4 80B73894 3C0180B8 */ lui $at, %hi(D_80B7E080) ## $at = 80B80000 -/* 09EF8 80B73898 10000677 */ beq $zero, $zero, .L80B75278 -/* 09EFC 80B7389C A420E080 */ sh $zero, %lo(D_80B7E080)($at) +/* 09EF8 80B73898 10000677 */ beq $zero, $zero, .L80B75278 +/* 09EFC 80B7389C A420E080 */ sh $zero, %lo(D_80B7E080)($at) glabel L80B738A0 /* 09F00 80B738A0 3C014496 */ lui $at, 0x4496 ## $at = 44960000 /* 09F04 80B738A4 44815000 */ mtc1 $at, $f10 ## $f10 = 1200.00 @@ -2455,324 +2455,324 @@ glabel L80B738A0 /* 09F38 80B738D8 C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 09F3C 80B738DC 3C0480B8 */ lui $a0, %hi(D_80B7B1F0) ## $a0 = 80B80000 /* 09F40 80B738E0 2484B1F0 */ addiu $a0, $a0, %lo(D_80B7B1F0) ## $a0 = 80B7B1F0 -/* 09F44 80B738E4 46003124 */ cvt.w.s $f4, $f6 +/* 09F44 80B738E4 46003124 */ cvt.w.s $f4, $f6 /* 09F48 80B738E8 4445F800 */ cfc1 $a1, $31 /* 09F4C 80B738EC 00000000 */ nop /* 09F50 80B738F0 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 09F54 80B738F4 10A00012 */ beq $a1, $zero, .L80B73940 +/* 09F54 80B738F4 10A00012 */ beq $a1, $zero, .L80B73940 /* 09F58 80B738F8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 09F5C 80B738FC 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 09F60 80B73900 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 09F64 80B73904 46043101 */ sub.s $f4, $f6, $f4 +/* 09F64 80B73904 46043101 */ sub.s $f4, $f6, $f4 /* 09F68 80B73908 44C5F800 */ ctc1 $a1, $31 /* 09F6C 80B7390C 00000000 */ nop -/* 09F70 80B73910 46002124 */ cvt.w.s $f4, $f4 +/* 09F70 80B73910 46002124 */ cvt.w.s $f4, $f4 /* 09F74 80B73914 4445F800 */ cfc1 $a1, $31 /* 09F78 80B73918 00000000 */ nop /* 09F7C 80B7391C 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 09F80 80B73920 14A00005 */ bne $a1, $zero, .L80B73938 +/* 09F80 80B73920 14A00005 */ bne $a1, $zero, .L80B73938 /* 09F84 80B73924 00000000 */ nop -/* 09F88 80B73928 44052000 */ mfc1 $a1, $f4 +/* 09F88 80B73928 44052000 */ mfc1 $a1, $f4 /* 09F8C 80B7392C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 09F90 80B73930 10000007 */ beq $zero, $zero, .L80B73950 +/* 09F90 80B73930 10000007 */ beq $zero, $zero, .L80B73950 /* 09F94 80B73934 00A12825 */ or $a1, $a1, $at ## $a1 = 80000000 .L80B73938: -/* 09F98 80B73938 10000005 */ beq $zero, $zero, .L80B73950 +/* 09F98 80B73938 10000005 */ beq $zero, $zero, .L80B73950 /* 09F9C 80B7393C 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF .L80B73940: -/* 09FA0 80B73940 44052000 */ mfc1 $a1, $f4 +/* 09FA0 80B73940 44052000 */ mfc1 $a1, $f4 /* 09FA4 80B73944 00000000 */ nop -/* 09FA8 80B73948 04A0FFFB */ bltz $a1, .L80B73938 +/* 09FA8 80B73948 04A0FFFB */ bltz $a1, .L80B73938 /* 09FAC 80B7394C 00000000 */ nop .L80B73950: /* 09FB0 80B73950 44C9F800 */ ctc1 $t1, $31 /* 09FB4 80B73954 0C00084C */ jal osSyncPrintf - + /* 09FB8 80B73958 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 000000FF -/* 09FBC 80B7395C 8FA40040 */ lw $a0, 0x0040($sp) +/* 09FBC 80B7395C 8FA40040 */ lw $a0, 0x0040($sp) /* 09FC0 80B73960 24052AF8 */ addiu $a1, $zero, 0x2AF8 ## $a1 = 00002AF8 /* 09FC4 80B73964 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 09FC8 80B73968 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 09FCC 80B7396C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 09FD0 80B73970 3C0180B8 */ lui $at, %hi(D_80B7E0A8) ## $at = 80B80000 -/* 09FD4 80B73974 AC30E0A8 */ sw $s0, %lo(D_80B7E0A8)($at) +/* 09FD4 80B73974 AC30E0A8 */ sw $s0, %lo(D_80B7E0A8)($at) /* 09FD8 80B73978 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 09FDC 80B7397C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 09FE0 80B73980 8FA400E0 */ lw $a0, 0x00E0($sp) -/* 09FE4 80B73984 00A12821 */ addu $a1, $a1, $at -/* 09FE8 80B73988 00052C00 */ sll $a1, $a1, 16 -/* 09FEC 80B7398C 00052C03 */ sra $a1, $a1, 16 +/* 09FE0 80B73980 8FA400E0 */ lw $a0, 0x00E0($sp) +/* 09FE4 80B73984 00A12821 */ addu $a1, $a1, $at +/* 09FE8 80B73988 00052C00 */ sll $a1, $a1, 16 +/* 09FEC 80B7398C 00052C03 */ sra $a1, $a1, 16 /* 09FF0 80B73990 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 09FF4 80B73994 24070500 */ addiu $a3, $zero, 0x0500 ## $a3 = 00000500 /* 09FF8 80B73998 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 09FFC 80B7399C 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 0A000 80B739A0 3C0380B8 */ lui $v1, %hi(D_80B7E124) ## $v1 = 80B80000 -/* 0A004 80B739A4 9063E124 */ lbu $v1, %lo(D_80B7E124)($v1) -/* 0A008 80B739A8 1460000B */ bne $v1, $zero, .L80B739D8 +/* 0A004 80B739A4 9063E124 */ lbu $v1, %lo(D_80B7E124)($v1) +/* 0A008 80B739A8 1460000B */ bne $v1, $zero, .L80B739D8 /* 0A00C 80B739AC 3C0480B8 */ lui $a0, %hi(D_80B7FEA0) ## $a0 = 80B80000 /* 0A010 80B739B0 2484FEA0 */ addiu $a0, $a0, %lo(D_80B7FEA0) ## $a0 = 80B7FEA0 /* 0A014 80B739B4 84820000 */ lh $v0, 0x0000($a0) ## 80B7FEA0 -/* 0A018 80B739B8 28410014 */ slti $at, $v0, 0x0014 -/* 0A01C 80B739BC 10200006 */ beq $at, $zero, .L80B739D8 +/* 0A018 80B739B8 28410014 */ slti $at, $v0, 0x0014 +/* 0A01C 80B739BC 10200006 */ beq $at, $zero, .L80B739D8 /* 0A020 80B739C0 3C0B80B8 */ lui $t3, %hi(D_80B7E0AE) ## $t3 = 80B80000 -/* 0A024 80B739C4 856BE0AE */ lh $t3, %lo(D_80B7E0AE)($t3) +/* 0A024 80B739C4 856BE0AE */ lh $t3, %lo(D_80B7E0AE)($t3) /* 0A028 80B739C8 316D0003 */ andi $t5, $t3, 0x0003 ## $t5 = 00000000 -/* 0A02C 80B739CC 15A00002 */ bne $t5, $zero, .L80B739D8 +/* 0A02C 80B739CC 15A00002 */ bne $t5, $zero, .L80B739D8 /* 0A030 80B739D0 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 /* 0A034 80B739D4 A48E0000 */ sh $t6, 0x0000($a0) ## 80B7FEA0 .L80B739D8: /* 0A038 80B739D8 3C0F80B8 */ lui $t7, %hi(D_80B7E122) ## $t7 = 80B80000 -/* 0A03C 80B739DC 85EFE122 */ lh $t7, %lo(D_80B7E122)($t7) -/* 0A040 80B739E0 51E0009A */ beql $t7, $zero, .L80B73C4C +/* 0A03C 80B739DC 85EFE122 */ lh $t7, %lo(D_80B7E122)($t7) +/* 0A040 80B739E0 51E0009A */ beql $t7, $zero, .L80B73C4C /* 0A044 80B739E4 262B0014 */ addiu $t3, $s1, 0x0014 ## $t3 = 00000014 -/* 0A048 80B739E8 14600097 */ bne $v1, $zero, .L80B73C48 +/* 0A048 80B739E8 14600097 */ bne $v1, $zero, .L80B73C48 /* 0A04C 80B739EC 26230014 */ addiu $v1, $s1, 0x0014 ## $v1 = 00000014 /* 0A050 80B739F0 80620015 */ lb $v0, 0x0015($v1) ## 00000029 -/* 0A054 80B739F4 2841FFCE */ slti $at, $v0, 0xFFCE -/* 0A058 80B739F8 10200005 */ beq $at, $zero, .L80B73A10 +/* 0A054 80B739F4 2841FFCE */ slti $at, $v0, 0xFFCE +/* 0A058 80B739F8 10200005 */ beq $at, $zero, .L80B73A10 /* 0A05C 80B739FC 3C1880B8 */ lui $t8, %hi(D_80B7A6C8) ## $t8 = 80B80000 -/* 0A060 80B73A00 8718A6C8 */ lh $t8, %lo(D_80B7A6C8)($t8) -/* 0A064 80B73A04 2B01FFD9 */ slti $at, $t8, 0xFFD9 -/* 0A068 80B73A08 50200007 */ beql $at, $zero, .L80B73A28 -/* 0A06C 80B73A0C 2841FFCE */ slti $at, $v0, 0xFFCE +/* 0A060 80B73A00 8718A6C8 */ lh $t8, %lo(D_80B7A6C8)($t8) +/* 0A064 80B73A04 2B01FFD9 */ slti $at, $t8, 0xFFD9 +/* 0A068 80B73A08 50200007 */ beql $at, $zero, .L80B73A28 +/* 0A06C 80B73A0C 2841FFCE */ slti $at, $v0, 0xFFCE .L80B73A10: /* 0A070 80B73A10 9479000C */ lhu $t9, 0x000C($v1) ## 00000020 /* 0A074 80B73A14 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 0A078 80B73A18 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 0A07C 80B73A1C 03215027 */ nor $t2, $t9, $at -/* 0A080 80B73A20 15400089 */ bne $t2, $zero, .L80B73C48 -/* 0A084 80B73A24 2841FFCE */ slti $at, $v0, 0xFFCE +/* 0A07C 80B73A1C 03215027 */ nor $t2, $t9, $at +/* 0A080 80B73A20 15400089 */ bne $t2, $zero, .L80B73C48 +/* 0A084 80B73A24 2841FFCE */ slti $at, $v0, 0xFFCE .L80B73A28: -/* 0A088 80B73A28 10200036 */ beq $at, $zero, .L80B73B04 +/* 0A088 80B73A28 10200036 */ beq $at, $zero, .L80B73B04 /* 0A08C 80B73A2C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0A090 80B73A30 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 0A094 80B73A34 C60A01AC */ lwc1 $f10, 0x01AC($s0) ## 000001AC /* 0A098 80B73A38 3C0180B8 */ lui $at, %hi(D_80B7B6B0) ## $at = 80B80000 -/* 0A09C 80B73A3C C424B6B0 */ lwc1 $f4, %lo(D_80B7B6B0)($at) -/* 0A0A0 80B73A40 46085181 */ sub.s $f6, $f10, $f8 +/* 0A09C 80B73A3C C424B6B0 */ lwc1 $f4, %lo(D_80B7B6B0)($at) +/* 0A0A0 80B73A40 46085181 */ sub.s $f6, $f10, $f8 /* 0A0A4 80B73A44 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0A0A8 80B73A48 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 0A0AC 80B73A4C 46043282 */ mul.s $f10, $f6, $f4 +/* 0A0AC 80B73A4C 46043282 */ mul.s $f10, $f6, $f4 /* 0A0B0 80B73A50 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0A0B4 80B73A54 460A4001 */ sub.s $f0, $f8, $f10 -/* 0A0B8 80B73A58 4600303C */ c.lt.s $f6, $f0 +/* 0A0B4 80B73A54 460A4001 */ sub.s $f0, $f8, $f10 +/* 0A0B8 80B73A58 4600303C */ c.lt.s $f6, $f0 /* 0A0BC 80B73A5C 00000000 */ nop -/* 0A0C0 80B73A60 45000028 */ bc1f .L80B73B04 +/* 0A0C0 80B73A60 45000028 */ bc1f .L80B73B04 /* 0A0C4 80B73A64 00000000 */ nop /* 0A0C8 80B73A68 444CF800 */ cfc1 $t4, $31 /* 0A0CC 80B73A6C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 0A0D0 80B73A70 44C9F800 */ ctc1 $t1, $31 /* 0A0D4 80B73A74 00000000 */ nop -/* 0A0D8 80B73A78 46000124 */ cvt.w.s $f4, $f0 +/* 0A0D8 80B73A78 46000124 */ cvt.w.s $f4, $f0 /* 0A0DC 80B73A7C 4449F800 */ cfc1 $t1, $31 /* 0A0E0 80B73A80 00000000 */ nop /* 0A0E4 80B73A84 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 0A0E8 80B73A88 11200012 */ beq $t1, $zero, .L80B73AD4 +/* 0A0E8 80B73A88 11200012 */ beq $t1, $zero, .L80B73AD4 /* 0A0EC 80B73A8C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 0A0F0 80B73A90 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 0A0F4 80B73A94 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0A0F8 80B73A98 46040101 */ sub.s $f4, $f0, $f4 +/* 0A0F8 80B73A98 46040101 */ sub.s $f4, $f0, $f4 /* 0A0FC 80B73A9C 44C9F800 */ ctc1 $t1, $31 /* 0A100 80B73AA0 00000000 */ nop -/* 0A104 80B73AA4 46002124 */ cvt.w.s $f4, $f4 +/* 0A104 80B73AA4 46002124 */ cvt.w.s $f4, $f4 /* 0A108 80B73AA8 4449F800 */ cfc1 $t1, $31 /* 0A10C 80B73AAC 00000000 */ nop /* 0A110 80B73AB0 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 0A114 80B73AB4 15200005 */ bne $t1, $zero, .L80B73ACC +/* 0A114 80B73AB4 15200005 */ bne $t1, $zero, .L80B73ACC /* 0A118 80B73AB8 00000000 */ nop -/* 0A11C 80B73ABC 44092000 */ mfc1 $t1, $f4 +/* 0A11C 80B73ABC 44092000 */ mfc1 $t1, $f4 /* 0A120 80B73AC0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0A124 80B73AC4 10000007 */ beq $zero, $zero, .L80B73AE4 +/* 0A124 80B73AC4 10000007 */ beq $zero, $zero, .L80B73AE4 /* 0A128 80B73AC8 01214825 */ or $t1, $t1, $at ## $t1 = 80000000 .L80B73ACC: -/* 0A12C 80B73ACC 10000005 */ beq $zero, $zero, .L80B73AE4 +/* 0A12C 80B73ACC 10000005 */ beq $zero, $zero, .L80B73AE4 /* 0A130 80B73AD0 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF .L80B73AD4: -/* 0A134 80B73AD4 44092000 */ mfc1 $t1, $f4 +/* 0A134 80B73AD4 44092000 */ mfc1 $t1, $f4 /* 0A138 80B73AD8 00000000 */ nop -/* 0A13C 80B73ADC 0520FFFB */ bltz $t1, .L80B73ACC +/* 0A13C 80B73ADC 0520FFFB */ bltz $t1, .L80B73ACC /* 0A140 80B73AE0 00000000 */ nop .L80B73AE4: /* 0A144 80B73AE4 860B008A */ lh $t3, 0x008A($s0) ## 0000008A /* 0A148 80B73AE8 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 /* 0A14C 80B73AEC 44CCF800 */ ctc1 $t4, $31 /* 0A150 80B73AF0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0A154 80B73AF4 016D7023 */ subu $t6, $t3, $t5 +/* 0A154 80B73AF4 016D7023 */ subu $t6, $t3, $t5 /* 0A158 80B73AF8 A2090152 */ sb $t1, 0x0152($s0) ## 00000152 /* 0A15C 80B73AFC A60E0154 */ sh $t6, 0x0154($s0) ## 00000154 /* 0A160 80B73B00 A20F0156 */ sb $t7, 0x0156($s0) ## 00000156 .L80B73B04: /* 0A164 80B73B04 3C0180B8 */ lui $at, %hi(D_80B7B6B4) ## $at = 80B80000 -/* 0A168 80B73B08 C428B6B4 */ lwc1 $f8, %lo(D_80B7B6B4)($at) +/* 0A168 80B73B08 C428B6B4 */ lwc1 $f8, %lo(D_80B7B6B4)($at) /* 0A16C 80B73B0C 3C0180B8 */ lui $at, %hi(D_80B7B6B8) ## $at = 80B80000 /* 0A170 80B73B10 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 0A174 80B73B14 E6080198 */ swc1 $f8, 0x0198($s0) ## 00000198 -/* 0A178 80B73B18 C42AB6B8 */ lwc1 $f10, %lo(D_80B7B6B8)($at) +/* 0A178 80B73B18 C42AB6B8 */ lwc1 $f10, %lo(D_80B7B6B8)($at) /* 0A17C 80B73B1C 3C0180B8 */ lui $at, %hi(D_80B7E124) ## $at = 80B80000 /* 0A180 80B73B20 2404081A */ addiu $a0, $zero, 0x081A ## $a0 = 0000081A /* 0A184 80B73B24 E60A019C */ swc1 $f10, 0x019C($s0) ## 0000019C /* 0A188 80B73B28 0C03E803 */ jal Audio_SetBGM - -/* 0A18C 80B73B2C A038E124 */ sb $t8, %lo(D_80B7E124)($at) + +/* 0A18C 80B73B2C A038E124 */ sb $t8, %lo(D_80B7E124)($at) /* 0A190 80B73B30 3C0180B8 */ lui $at, %hi(D_80B7E0A6) ## $at = 80B80000 -/* 0A194 80B73B34 A420E0A6 */ sh $zero, %lo(D_80B7E0A6)($at) +/* 0A194 80B73B34 A420E0A6 */ sh $zero, %lo(D_80B7E0A6)($at) /* 0A198 80B73B38 92190150 */ lbu $t9, 0x0150($s0) ## 00000150 /* 0A19C 80B73B3C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0A1A0 80B73B40 17210008 */ bne $t9, $at, .L80B73B64 +/* 0A1A0 80B73B40 17210008 */ bne $t9, $at, .L80B73B64 /* 0A1A4 80B73B44 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0A1A8 80B73B48 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 0A1AC 80B73B4C C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 0A1B0 80B73B50 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 0A1B4 80B73B54 44815000 */ mtc1 $at, $f10 ## $f10 = 120.00 -/* 0A1B8 80B73B58 46043202 */ mul.s $f8, $f6, $f4 -/* 0A1BC 80B73B5C 10000006 */ beq $zero, $zero, .L80B73B78 -/* 0A1C0 80B73B60 460A4080 */ add.s $f2, $f8, $f10 +/* 0A1B8 80B73B58 46043202 */ mul.s $f8, $f6, $f4 +/* 0A1BC 80B73B5C 10000006 */ beq $zero, $zero, .L80B73B78 +/* 0A1C0 80B73B60 460A4080 */ add.s $f2, $f8, $f10 .L80B73B64: /* 0A1C4 80B73B64 C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC /* 0A1C8 80B73B68 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 0A1CC 80B73B6C 44812000 */ mtc1 $at, $f4 ## $f4 = 120.00 -/* 0A1D0 80B73B70 46000180 */ add.s $f6, $f0, $f0 -/* 0A1D4 80B73B74 46043080 */ add.s $f2, $f6, $f4 +/* 0A1D0 80B73B70 46000180 */ add.s $f6, $f0, $f0 +/* 0A1D4 80B73B74 46043080 */ add.s $f2, $f6, $f4 .L80B73B78: /* 0A1D8 80B73B78 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 0A1DC 80B73B7C 44810000 */ mtc1 $at, $f0 ## $f0 = 255.00 /* 0A1E0 80B73B80 00000000 */ nop -/* 0A1E4 80B73B84 4602003C */ c.lt.s $f0, $f2 +/* 0A1E4 80B73B84 4602003C */ c.lt.s $f0, $f2 /* 0A1E8 80B73B88 00000000 */ nop -/* 0A1EC 80B73B8C 45020003 */ bc1fl .L80B73B9C +/* 0A1EC 80B73B8C 45020003 */ bc1fl .L80B73B9C /* 0A1F0 80B73B90 444AF800 */ cfc1 $t2, $31 -/* 0A1F4 80B73B94 46000086 */ mov.s $f2, $f0 +/* 0A1F4 80B73B94 46000086 */ mov.s $f2, $f0 /* 0A1F8 80B73B98 444AF800 */ cfc1 $t2, $31 .L80B73B9C: /* 0A1FC 80B73B9C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0A200 80B73BA0 44C5F800 */ ctc1 $a1, $31 /* 0A204 80B73BA4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 0A208 80B73BA8 46001224 */ cvt.w.s $f8, $f2 +/* 0A208 80B73BA8 46001224 */ cvt.w.s $f8, $f2 /* 0A20C 80B73BAC 4445F800 */ cfc1 $a1, $31 /* 0A210 80B73BB0 00000000 */ nop /* 0A214 80B73BB4 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0A218 80B73BB8 10A00012 */ beq $a1, $zero, .L80B73C04 +/* 0A218 80B73BB8 10A00012 */ beq $a1, $zero, .L80B73C04 /* 0A21C 80B73BBC 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 0A220 80B73BC0 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 /* 0A224 80B73BC4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0A228 80B73BC8 46081201 */ sub.s $f8, $f2, $f8 +/* 0A228 80B73BC8 46081201 */ sub.s $f8, $f2, $f8 /* 0A22C 80B73BCC 44C5F800 */ ctc1 $a1, $31 /* 0A230 80B73BD0 00000000 */ nop -/* 0A234 80B73BD4 46004224 */ cvt.w.s $f8, $f8 +/* 0A234 80B73BD4 46004224 */ cvt.w.s $f8, $f8 /* 0A238 80B73BD8 4445F800 */ cfc1 $a1, $31 /* 0A23C 80B73BDC 00000000 */ nop /* 0A240 80B73BE0 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0A244 80B73BE4 14A00005 */ bne $a1, $zero, .L80B73BFC +/* 0A244 80B73BE4 14A00005 */ bne $a1, $zero, .L80B73BFC /* 0A248 80B73BE8 00000000 */ nop -/* 0A24C 80B73BEC 44054000 */ mfc1 $a1, $f8 +/* 0A24C 80B73BEC 44054000 */ mfc1 $a1, $f8 /* 0A250 80B73BF0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0A254 80B73BF4 10000007 */ beq $zero, $zero, .L80B73C14 +/* 0A254 80B73BF4 10000007 */ beq $zero, $zero, .L80B73C14 /* 0A258 80B73BF8 00A12825 */ or $a1, $a1, $at ## $a1 = 80000000 .L80B73BFC: -/* 0A25C 80B73BFC 10000005 */ beq $zero, $zero, .L80B73C14 +/* 0A25C 80B73BFC 10000005 */ beq $zero, $zero, .L80B73C14 /* 0A260 80B73C00 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF .L80B73C04: -/* 0A264 80B73C04 44054000 */ mfc1 $a1, $f8 +/* 0A264 80B73C04 44054000 */ mfc1 $a1, $f8 /* 0A268 80B73C08 00000000 */ nop -/* 0A26C 80B73C0C 04A0FFFB */ bltz $a1, .L80B73BFC +/* 0A26C 80B73C0C 04A0FFFB */ bltz $a1, .L80B73BFC /* 0A270 80B73C10 00000000 */ nop .L80B73C14: /* 0A274 80B73C14 44CAF800 */ ctc1 $t2, $31 /* 0A278 80B73C18 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 000000FF /* 0A27C 80B73C1C 24060078 */ addiu $a2, $zero, 0x0078 ## $a2 = 00000078 -/* 0A280 80B73C20 0C02A7DB */ jal func_800A9F6C +/* 0A280 80B73C20 0C02A7DB */ jal func_800A9F6C /* 0A284 80B73C24 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 /* 0A288 80B73C28 240C0028 */ addiu $t4, $zero, 0x0028 ## $t4 = 00000028 /* 0A28C 80B73C2C 3C0180B8 */ lui $at, %hi(D_80B7E0A4) ## $at = 80B80000 -/* 0A290 80B73C30 A42CE0A4 */ sh $t4, %lo(D_80B7E0A4)($at) +/* 0A290 80B73C30 A42CE0A4 */ sh $t4, %lo(D_80B7E0A4)($at) /* 0A294 80B73C34 3C0180B8 */ lui $at, %hi(D_80B7FDA8) ## $at = 80B80000 /* 0A298 80B73C38 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 0A29C 80B73C3C A029FDA8 */ sb $t1, %lo(D_80B7FDA8)($at) -/* 0A2A0 80B73C40 0C01E221 */ jal func_80078884 +/* 0A29C 80B73C3C A029FDA8 */ sb $t1, %lo(D_80B7FDA8)($at) +/* 0A2A0 80B73C40 0C01E221 */ jal func_80078884 /* 0A2A4 80B73C44 2404184A */ addiu $a0, $zero, 0x184A ## $a0 = 0000184A .L80B73C48: /* 0A2A8 80B73C48 262B0014 */ addiu $t3, $s1, 0x0014 ## $t3 = 00000014 .L80B73C4C: -/* 0A2AC 80B73C4C AFAB004C */ sw $t3, 0x004C($sp) +/* 0A2AC 80B73C4C AFAB004C */ sw $t3, 0x004C($sp) /* 0A2B0 80B73C50 8E2D07C0 */ lw $t5, 0x07C0($s1) ## 000007C0 /* 0A2B4 80B73C54 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 0A2B8 80B73C58 8DAE0028 */ lw $t6, 0x0028($t5) ## 00000028 /* 0A2BC 80B73C5C 85CF0002 */ lh $t7, 0x0002($t6) ## 00000002 /* 0A2C0 80B73C60 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 /* 0A2C4 80B73C64 00000000 */ nop -/* 0A2C8 80B73C68 46803120 */ cvt.s.w $f4, $f6 -/* 0A2CC 80B73C6C 4604503C */ c.lt.s $f10, $f4 +/* 0A2C8 80B73C68 46803120 */ cvt.s.w $f4, $f6 +/* 0A2CC 80B73C6C 4604503C */ c.lt.s $f10, $f4 /* 0A2D0 80B73C70 00000000 */ nop -/* 0A2D4 80B73C74 450001B0 */ bc1f .L80B74338 +/* 0A2D4 80B73C74 450001B0 */ bc1f .L80B74338 /* 0A2D8 80B73C78 00000000 */ nop /* 0A2DC 80B73C7C 8618017C */ lh $t8, 0x017C($s0) ## 0000017C -/* 0A2E0 80B73C80 2B01001F */ slti $at, $t8, 0x001F -/* 0A2E4 80B73C84 54200004 */ bnel $at, $zero, .L80B73C98 +/* 0A2E0 80B73C80 2B01001F */ slti $at, $t8, 0x001F +/* 0A2E4 80B73C84 54200004 */ bnel $at, $zero, .L80B73C98 /* 0A2E8 80B73C88 2402000F */ addiu $v0, $zero, 0x000F ## $v0 = 0000000F -/* 0A2EC 80B73C8C 10000002 */ beq $zero, $zero, .L80B73C98 +/* 0A2EC 80B73C8C 10000002 */ beq $zero, $zero, .L80B73C98 /* 0A2F0 80B73C90 24020007 */ addiu $v0, $zero, 0x0007 ## $v0 = 00000007 /* 0A2F4 80B73C94 2402000F */ addiu $v0, $zero, 0x000F ## $v0 = 0000000F .L80B73C98: /* 0A2F8 80B73C98 8619015C */ lh $t9, 0x015C($s0) ## 0000015C -/* 0A2FC 80B73C9C 03225024 */ and $t2, $t9, $v0 -/* 0A300 80B73CA0 5540006E */ bnel $t2, $zero, .L80B73E5C +/* 0A2FC 80B73C9C 03225024 */ and $t2, $t9, $v0 +/* 0A300 80B73CA0 5540006E */ bnel $t2, $zero, .L80B73E5C /* 0A304 80B73CA4 8602017C */ lh $v0, 0x017C($s0) ## 0000017C /* 0A308 80B73CA8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 0A30C 80B73CAC AFA20048 */ sw $v0, 0x0048($sp) +/* 0A30C 80B73CAC AFA20048 */ sw $v0, 0x0048($sp) /* 0A310 80B73CB0 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 0A314 80B73CB4 44814000 */ mtc1 $at, $f8 ## $f8 = 0.75 -/* 0A318 80B73CB8 8FA30048 */ lw $v1, 0x0048($sp) -/* 0A31C 80B73CBC 4608003C */ c.lt.s $f0, $f8 +/* 0A318 80B73CB8 8FA30048 */ lw $v1, 0x0048($sp) +/* 0A31C 80B73CBC 4608003C */ c.lt.s $f0, $f8 /* 0A320 80B73CC0 00000000 */ nop -/* 0A324 80B73CC4 45000064 */ bc1f .L80B73E58 +/* 0A324 80B73CC4 45000064 */ bc1f .L80B73E58 /* 0A328 80B73CC8 3C0C80B8 */ lui $t4, %hi(D_80B7E0A4) ## $t4 = 80B80000 -/* 0A32C 80B73CCC 858CE0A4 */ lh $t4, %lo(D_80B7E0A4)($t4) -/* 0A330 80B73CD0 15800061 */ bne $t4, $zero, .L80B73E58 +/* 0A32C 80B73CCC 858CE0A4 */ lh $t4, %lo(D_80B7E0A4)($t4) +/* 0A330 80B73CD0 15800061 */ bne $t4, $zero, .L80B73E58 /* 0A334 80B73CD4 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 0A338 80B73CD8 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 /* 0A33C 80B73CDC C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC -/* 0A340 80B73CE0 4600303E */ c.le.s $f6, $f0 +/* 0A340 80B73CE0 4600303E */ c.le.s $f6, $f0 /* 0A344 80B73CE4 00000000 */ nop -/* 0A348 80B73CE8 45000004 */ bc1f .L80B73CFC +/* 0A348 80B73CE8 45000004 */ bc1f .L80B73CFC /* 0A34C 80B73CEC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 0A350 80B73CF0 44811000 */ mtc1 $at, $f2 ## $f2 = 255.00 -/* 0A354 80B73CF4 10000023 */ beq $zero, $zero, .L80B73D84 +/* 0A354 80B73CF4 10000023 */ beq $zero, $zero, .L80B73D84 /* 0A358 80B73CF8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F .L80B73CFC: /* 0A35C 80B73CFC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0A360 80B73D00 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 /* 0A364 80B73D04 00000000 */ nop -/* 0A368 80B73D08 4600503E */ c.le.s $f10, $f0 +/* 0A368 80B73D08 4600503E */ c.le.s $f10, $f0 /* 0A36C 80B73D0C 00000000 */ nop -/* 0A370 80B73D10 45000004 */ bc1f .L80B73D24 +/* 0A370 80B73D10 45000004 */ bc1f .L80B73D24 /* 0A374 80B73D14 3C014366 */ lui $at, 0x4366 ## $at = 43660000 /* 0A378 80B73D18 44811000 */ mtc1 $at, $f2 ## $f2 = 230.00 -/* 0A37C 80B73D1C 10000019 */ beq $zero, $zero, .L80B73D84 +/* 0A37C 80B73D1C 10000019 */ beq $zero, $zero, .L80B73D84 /* 0A380 80B73D20 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F .L80B73D24: /* 0A384 80B73D24 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0A388 80B73D28 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 /* 0A38C 80B73D2C 00000000 */ nop -/* 0A390 80B73D30 4600203E */ c.le.s $f4, $f0 +/* 0A390 80B73D30 4600203E */ c.le.s $f4, $f0 /* 0A394 80B73D34 00000000 */ nop -/* 0A398 80B73D38 45000004 */ bc1f .L80B73D4C +/* 0A398 80B73D38 45000004 */ bc1f .L80B73D4C /* 0A39C 80B73D3C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0A3A0 80B73D40 44811000 */ mtc1 $at, $f2 ## $f2 = 200.00 -/* 0A3A4 80B73D44 1000000F */ beq $zero, $zero, .L80B73D84 +/* 0A3A4 80B73D44 1000000F */ beq $zero, $zero, .L80B73D84 /* 0A3A8 80B73D48 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F .L80B73D4C: /* 0A3AC 80B73D4C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0A3B0 80B73D50 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 /* 0A3B4 80B73D54 00000000 */ nop -/* 0A3B8 80B73D58 4600403E */ c.le.s $f8, $f0 +/* 0A3B8 80B73D58 4600403E */ c.le.s $f8, $f0 /* 0A3BC 80B73D5C 00000000 */ nop -/* 0A3C0 80B73D60 45000004 */ bc1f .L80B73D74 +/* 0A3C0 80B73D60 45000004 */ bc1f .L80B73D74 /* 0A3C4 80B73D64 3C01432A */ lui $at, 0x432A ## $at = 432A0000 /* 0A3C8 80B73D68 44811000 */ mtc1 $at, $f2 ## $f2 = 170.00 -/* 0A3CC 80B73D6C 10000005 */ beq $zero, $zero, .L80B73D84 +/* 0A3CC 80B73D6C 10000005 */ beq $zero, $zero, .L80B73D84 /* 0A3D0 80B73D70 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F .L80B73D74: /* 0A3D4 80B73D74 3C01430C */ lui $at, 0x430C ## $at = 430C0000 @@ -2780,163 +2780,163 @@ glabel L80B738A0 /* 0A3DC 80B73D7C 00000000 */ nop /* 0A3E0 80B73D80 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F .L80B73D84: -/* 0A3E4 80B73D84 14610005 */ bne $v1, $at, .L80B73D9C +/* 0A3E4 80B73D84 14610005 */ bne $v1, $at, .L80B73D9C /* 0A3E8 80B73D88 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 0A3EC 80B73D8C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.75 /* 0A3F0 80B73D90 00000000 */ nop -/* 0A3F4 80B73D94 46061082 */ mul.s $f2, $f2, $f6 +/* 0A3F4 80B73D94 46061082 */ mul.s $f2, $f2, $f6 /* 0A3F8 80B73D98 00000000 */ nop .L80B73D9C: /* 0A3FC 80B73D9C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0A400 80B73DA0 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 0A404 80B73DA4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0A408 80B73DA8 E7A200A4 */ swc1 $f2, 0x00A4($sp) + +/* 0A408 80B73DA8 E7A200A4 */ swc1 $f2, 0x00A4($sp) /* 0A40C 80B73DAC 4449F800 */ cfc1 $t1, $31 /* 0A410 80B73DB0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0A414 80B73DB4 44C5F800 */ ctc1 $a1, $31 -/* 0A418 80B73DB8 C7A200A4 */ lwc1 $f2, 0x00A4($sp) +/* 0A418 80B73DB8 C7A200A4 */ lwc1 $f2, 0x00A4($sp) /* 0A41C 80B73DBC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 0A420 80B73DC0 460012A4 */ cvt.w.s $f10, $f2 +/* 0A420 80B73DC0 460012A4 */ cvt.w.s $f10, $f2 /* 0A424 80B73DC4 4445F800 */ cfc1 $a1, $31 /* 0A428 80B73DC8 00000000 */ nop /* 0A42C 80B73DCC 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0A430 80B73DD0 10A00012 */ beq $a1, $zero, .L80B73E1C +/* 0A430 80B73DD0 10A00012 */ beq $a1, $zero, .L80B73E1C /* 0A434 80B73DD4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 0A438 80B73DD8 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 0A43C 80B73DDC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0A440 80B73DE0 460A1281 */ sub.s $f10, $f2, $f10 +/* 0A440 80B73DE0 460A1281 */ sub.s $f10, $f2, $f10 /* 0A444 80B73DE4 44C5F800 */ ctc1 $a1, $31 /* 0A448 80B73DE8 00000000 */ nop -/* 0A44C 80B73DEC 460052A4 */ cvt.w.s $f10, $f10 +/* 0A44C 80B73DEC 460052A4 */ cvt.w.s $f10, $f10 /* 0A450 80B73DF0 4445F800 */ cfc1 $a1, $31 /* 0A454 80B73DF4 00000000 */ nop /* 0A458 80B73DF8 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0A45C 80B73DFC 14A00005 */ bne $a1, $zero, .L80B73E14 +/* 0A45C 80B73DFC 14A00005 */ bne $a1, $zero, .L80B73E14 /* 0A460 80B73E00 00000000 */ nop -/* 0A464 80B73E04 44055000 */ mfc1 $a1, $f10 +/* 0A464 80B73E04 44055000 */ mfc1 $a1, $f10 /* 0A468 80B73E08 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0A46C 80B73E0C 10000007 */ beq $zero, $zero, .L80B73E2C +/* 0A46C 80B73E0C 10000007 */ beq $zero, $zero, .L80B73E2C /* 0A470 80B73E10 00A12825 */ or $a1, $a1, $at ## $a1 = 80000000 .L80B73E14: -/* 0A474 80B73E14 10000005 */ beq $zero, $zero, .L80B73E2C +/* 0A474 80B73E14 10000005 */ beq $zero, $zero, .L80B73E2C /* 0A478 80B73E18 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF .L80B73E1C: -/* 0A47C 80B73E1C 44055000 */ mfc1 $a1, $f10 +/* 0A47C 80B73E1C 44055000 */ mfc1 $a1, $f10 /* 0A480 80B73E20 00000000 */ nop -/* 0A484 80B73E24 04A0FFFB */ bltz $a1, .L80B73E14 +/* 0A484 80B73E24 04A0FFFB */ bltz $a1, .L80B73E14 /* 0A488 80B73E28 00000000 */ nop .L80B73E2C: /* 0A48C 80B73E2C 44C9F800 */ ctc1 $t1, $31 /* 0A490 80B73E30 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 000000FF /* 0A494 80B73E34 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 0A498 80B73E38 4600010D */ trunc.w.s $f4, $f0 -/* 0A49C 80B73E3C 44062000 */ mfc1 $a2, $f4 +/* 0A498 80B73E38 4600010D */ trunc.w.s $f4, $f0 +/* 0A49C 80B73E3C 44062000 */ mfc1 $a2, $f4 /* 0A4A0 80B73E40 00000000 */ nop -/* 0A4A4 80B73E44 00063400 */ sll $a2, $a2, 16 -/* 0A4A8 80B73E48 00063403 */ sra $a2, $a2, 16 +/* 0A4A4 80B73E44 00063400 */ sll $a2, $a2, 16 +/* 0A4A8 80B73E48 00063403 */ sra $a2, $a2, 16 /* 0A4AC 80B73E4C 24C6000A */ addiu $a2, $a2, 0x000A ## $a2 = 0000000A -/* 0A4B0 80B73E50 0C02A7DB */ jal func_800A9F6C +/* 0A4B0 80B73E50 0C02A7DB */ jal func_800A9F6C /* 0A4B4 80B73E54 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 0000000A .L80B73E58: /* 0A4B8 80B73E58 8602017C */ lh $v0, 0x017C($s0) ## 0000017C .L80B73E5C: -/* 0A4BC 80B73E5C 2841001F */ slti $at, $v0, 0x001F -/* 0A4C0 80B73E60 542000CF */ bnel $at, $zero, .L80B741A0 +/* 0A4BC 80B73E5C 2841001F */ slti $at, $v0, 0x001F +/* 0A4C0 80B73E60 542000CF */ bnel $at, $zero, .L80B741A0 /* 0A4C4 80B73E64 3058000F */ andi $t8, $v0, 0x000F ## $t8 = 00000000 /* 0A4C8 80B73E68 860D017A */ lh $t5, 0x017A($s0) ## 0000017A -/* 0A4CC 80B73E6C 55A00081 */ bnel $t5, $zero, .L80B74074 +/* 0A4CC 80B73E6C 55A00081 */ bnel $t5, $zero, .L80B74074 /* 0A4D0 80B73E70 860B017E */ lh $t3, 0x017E($s0) ## 0000017E /* 0A4D4 80B73E74 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0A4D8 80B73E78 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0A4DC 80B73E7C 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 /* 0A4E0 80B73E80 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A4E4 80B73E84 E7A0010C */ swc1 $f0, 0x010C($sp) -/* 0A4E8 80B73E88 E7A00110 */ swc1 $f0, 0x0110($sp) -/* 0A4EC 80B73E8C E7A80114 */ swc1 $f8, 0x0114($sp) +/* 0A4E4 80B73E84 E7A0010C */ swc1 $f0, 0x010C($sp) +/* 0A4E8 80B73E88 E7A00110 */ swc1 $f0, 0x0110($sp) +/* 0A4EC 80B73E8C E7A80114 */ swc1 $f8, 0x0114($sp) .L80B73E90: /* 0A4F0 80B73E90 3C0180B8 */ lui $at, %hi(D_80B7B6BC) ## $at = 80B80000 -/* 0A4F4 80B73E94 C42CB6BC */ lwc1 $f12, %lo(D_80B7B6BC)($at) +/* 0A4F4 80B73E94 C42CB6BC */ lwc1 $f12, %lo(D_80B7B6BC)($at) /* 0A4F8 80B73E98 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0A4FC 80B73E9C A7A200A2 */ sh $v0, 0x00A2($sp) + +/* 0A4FC 80B73E9C A7A200A2 */ sh $v0, 0x00A2($sp) /* 0A500 80B73EA0 860E008A */ lh $t6, 0x008A($s0) ## 0000008A /* 0A504 80B73EA4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 0A508 80B73EA8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0A50C 80B73EAC 01C17821 */ addu $t7, $t6, $at +/* 0A50C 80B73EAC 01C17821 */ addu $t7, $t6, $at /* 0A510 80B73EB0 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 /* 0A514 80B73EB4 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0A518 80B73EB8 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 0A51C 80B73EBC 468032A0 */ cvt.s.w $f10, $f6 +/* 0A51C 80B73EBC 468032A0 */ cvt.s.w $f10, $f6 /* 0A520 80B73EC0 3C0180B8 */ lui $at, %hi(D_80B7B6C0) ## $at = 80B80000 -/* 0A524 80B73EC4 C426B6C0 */ lwc1 $f6, %lo(D_80B7B6C0)($at) -/* 0A528 80B73EC8 46045203 */ div.s $f8, $f10, $f4 -/* 0A52C 80B73ECC 46064282 */ mul.s $f10, $f8, $f6 -/* 0A530 80B73ED0 0C034348 */ jal Matrix_RotateY -/* 0A534 80B73ED4 460A0300 */ add.s $f12, $f0, $f10 +/* 0A524 80B73EC4 C426B6C0 */ lwc1 $f6, %lo(D_80B7B6C0)($at) +/* 0A528 80B73EC8 46045203 */ div.s $f8, $f10, $f4 +/* 0A52C 80B73ECC 46064282 */ mul.s $f10, $f8, $f6 +/* 0A530 80B73ED0 0C034348 */ jal Matrix_RotateY +/* 0A534 80B73ED4 460A0300 */ add.s $f12, $f0, $f10 /* 0A538 80B73ED8 27A4010C */ addiu $a0, $sp, 0x010C ## $a0 = FFFFFFD4 -/* 0A53C 80B73EDC 0C0346BD */ jal Matrix_MultVec3f +/* 0A53C 80B73EDC 0C0346BD */ jal Matrix_MultVec3f /* 0A540 80B73EE0 27A50100 */ addiu $a1, $sp, 0x0100 ## $a1 = FFFFFFC8 /* 0A544 80B73EE4 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 0A548 80B73EE8 C7A80100 */ lwc1 $f8, 0x0100($sp) -/* 0A54C 80B73EEC 97A200A2 */ lhu $v0, 0x00A2($sp) +/* 0A548 80B73EE8 C7A80100 */ lwc1 $f8, 0x0100($sp) +/* 0A54C 80B73EEC 97A200A2 */ lhu $v0, 0x00A2($sp) /* 0A550 80B73EF0 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 0A554 80B73EF4 46082180 */ add.s $f6, $f4, $f8 +/* 0A554 80B73EF4 46082180 */ add.s $f6, $f4, $f8 /* 0A558 80B73EF8 3C0180B8 */ lui $at, %hi(D_80B7B6C4) ## $at = 80B80000 /* 0A55C 80B73EFC E60601B4 */ swc1 $f6, 0x01B4($s0) ## 000001B4 -/* 0A560 80B73F00 C7A40108 */ lwc1 $f4, 0x0108($sp) +/* 0A560 80B73F00 C7A40108 */ lwc1 $f4, 0x0108($sp) /* 0A564 80B73F04 C60001B4 */ lwc1 $f0, 0x01B4($s0) ## 000001B4 -/* 0A568 80B73F08 46045200 */ add.s $f8, $f10, $f4 -/* 0A56C 80B73F0C 46000182 */ mul.s $f6, $f0, $f0 +/* 0A568 80B73F08 46045200 */ add.s $f8, $f10, $f4 +/* 0A56C 80B73F0C 46000182 */ mul.s $f6, $f0, $f0 /* 0A570 80B73F10 E60801BC */ swc1 $f8, 0x01BC($s0) ## 000001BC /* 0A574 80B73F14 C60201BC */ lwc1 $f2, 0x01BC($s0) ## 000001BC -/* 0A578 80B73F18 C428B6C4 */ lwc1 $f8, %lo(D_80B7B6C4)($at) -/* 0A57C 80B73F1C 46021282 */ mul.s $f10, $f2, $f2 -/* 0A580 80B73F20 460A3100 */ add.s $f4, $f6, $f10 -/* 0A584 80B73F24 4608203C */ c.lt.s $f4, $f8 +/* 0A578 80B73F18 C428B6C4 */ lwc1 $f8, %lo(D_80B7B6C4)($at) +/* 0A57C 80B73F1C 46021282 */ mul.s $f10, $f2, $f2 +/* 0A580 80B73F20 460A3100 */ add.s $f4, $f6, $f10 +/* 0A584 80B73F24 4608203C */ c.lt.s $f4, $f8 /* 0A588 80B73F28 00000000 */ nop -/* 0A58C 80B73F2C 45010005 */ bc1t .L80B73F44 +/* 0A58C 80B73F2C 45010005 */ bc1t .L80B73F44 /* 0A590 80B73F30 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 /* 0A594 80B73F34 3042FFFF */ andi $v0, $v0, 0xFFFF ## $v0 = 00000001 -/* 0A598 80B73F38 28410064 */ slti $at, $v0, 0x0064 -/* 0A59C 80B73F3C 1420FFD4 */ bne $at, $zero, .L80B73E90 +/* 0A598 80B73F38 28410064 */ slti $at, $v0, 0x0064 +/* 0A59C 80B73F3C 1420FFD4 */ bne $at, $zero, .L80B73E90 /* 0A5A0 80B73F40 00000000 */ nop .L80B73F44: /* 0A5A4 80B73F44 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 0A5A8 80B73F48 00000000 */ nop /* 0A5AC 80B73F4C 3C0180B8 */ lui $at, %hi(D_80B7B6C8) ## $at = 80B80000 -/* 0A5B0 80B73F50 C426B6C8 */ lwc1 $f6, %lo(D_80B7B6C8)($at) -/* 0A5B4 80B73F54 4606003C */ c.lt.s $f0, $f6 +/* 0A5B0 80B73F50 C426B6C8 */ lwc1 $f6, %lo(D_80B7B6C8)($at) +/* 0A5B4 80B73F54 4606003C */ c.lt.s $f0, $f6 /* 0A5B8 80B73F58 00000000 */ nop -/* 0A5BC 80B73F5C 45020033 */ bc1fl .L80B7402C +/* 0A5BC 80B73F5C 45020033 */ bc1fl .L80B7402C /* 0A5C0 80B73F60 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0A5C4 80B73F64 86180180 */ lh $t8, 0x0180($s0) ## 00000180 -/* 0A5C8 80B73F68 1700002F */ bne $t8, $zero, .L80B74028 +/* 0A5C8 80B73F68 1700002F */ bne $t8, $zero, .L80B74028 /* 0A5CC 80B73F6C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0A5D0 80B73F70 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 /* 0A5D4 80B73F74 C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC -/* 0A5D8 80B73F78 4600503E */ c.le.s $f10, $f0 +/* 0A5D8 80B73F78 4600503E */ c.le.s $f10, $f0 /* 0A5DC 80B73F7C 00000000 */ nop -/* 0A5E0 80B73F80 45020004 */ bc1fl .L80B73F94 +/* 0A5E0 80B73F80 45020004 */ bc1fl .L80B73F94 /* 0A5E4 80B73F84 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0A5E8 80B73F88 1000000B */ beq $zero, $zero, .L80B73FB8 +/* 0A5E8 80B73F88 1000000B */ beq $zero, $zero, .L80B73FB8 /* 0A5EC 80B73F8C 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 0A5F0 80B73F90 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L80B73F94: /* 0A5F4 80B73F94 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 /* 0A5F8 80B73F98 00000000 */ nop -/* 0A5FC 80B73F9C 4600203E */ c.le.s $f4, $f0 +/* 0A5FC 80B73F9C 4600203E */ c.le.s $f4, $f0 /* 0A600 80B73FA0 00000000 */ nop -/* 0A604 80B73FA4 45020004 */ bc1fl .L80B73FB8 +/* 0A604 80B73FA4 45020004 */ bc1fl .L80B73FB8 /* 0A608 80B73FA8 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 0A60C 80B73FAC 10000002 */ beq $zero, $zero, .L80B73FB8 +/* 0A60C 80B73FAC 10000002 */ beq $zero, $zero, .L80B73FB8 /* 0A610 80B73FB0 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 /* 0A614 80B73FB4 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 .L80B73FB8: /* 0A618 80B73FB8 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0A61C 80B73FBC 2406005A */ addiu $a2, $zero, 0x005A ## $a2 = 0000005A -/* 0A620 80B73FC0 0C02A7DB */ jal func_800A9F6C +/* 0A620 80B73FC0 0C02A7DB */ jal func_800A9F6C /* 0A624 80B73FC4 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 0A628 80B73FC8 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 0A62C 80B73FCC 44814000 */ mtc1 $at, $f8 ## $f8 = 300.00 @@ -2950,157 +2950,157 @@ glabel L80B738A0 /* 0A64C 80B73FEC 3C0180B8 */ lui $at, %hi(D_80B7E0A4) ## $at = 80B80000 /* 0A650 80B73FF0 240C0028 */ addiu $t4, $zero, 0x0028 ## $t4 = 00000028 /* 0A654 80B73FF4 E60801B8 */ swc1 $f8, 0x01B8($s0) ## 000001B8 -/* 0A658 80B73FF8 A42CE0A4 */ sh $t4, %lo(D_80B7E0A4)($at) +/* 0A658 80B73FF8 A42CE0A4 */ sh $t4, %lo(D_80B7E0A4)($at) /* 0A65C 80B73FFC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0A660 80B74000 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 0A664 80B74004 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A668 80B74008 00000000 */ nop -/* 0A66C 80B7400C 4600018D */ trunc.w.s $f6, $f0 +/* 0A66C 80B7400C 4600018D */ trunc.w.s $f6, $f0 /* 0A670 80B74010 3C0180B8 */ lui $at, %hi(D_80B7E116) ## $at = 80B80000 -/* 0A674 80B74014 440E3000 */ mfc1 $t6, $f6 +/* 0A674 80B74014 440E3000 */ mfc1 $t6, $f6 /* 0A678 80B74018 00000000 */ nop /* 0A67C 80B7401C 25CF0014 */ addiu $t7, $t6, 0x0014 ## $t7 = 00000014 -/* 0A680 80B74020 10000013 */ beq $zero, $zero, .L80B74070 -/* 0A684 80B74024 A42FE116 */ sh $t7, %lo(D_80B7E116)($at) +/* 0A680 80B74020 10000013 */ beq $zero, $zero, .L80B74070 +/* 0A684 80B74024 A42FE116 */ sh $t7, %lo(D_80B7E116)($at) .L80B74028: /* 0A688 80B74028 3C014120 */ lui $at, 0x4120 ## $at = 41200000 .L80B7402C: /* 0A68C 80B7402C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0A690 80B74030 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A694 80B74034 00000000 */ nop -/* 0A698 80B74038 4600028D */ trunc.w.s $f10, $f0 +/* 0A698 80B74038 4600028D */ trunc.w.s $f10, $f0 /* 0A69C 80B7403C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 0A6A0 80B74040 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 /* 0A6A4 80B74044 A600017E */ sh $zero, 0x017E($s0) ## 0000017E -/* 0A6A8 80B74048 440C5000 */ mfc1 $t4, $f10 +/* 0A6A8 80B74048 440C5000 */ mfc1 $t4, $f10 /* 0A6AC 80B7404C 00000000 */ nop /* 0A6B0 80B74050 25890003 */ addiu $t1, $t4, 0x0003 ## $t1 = 00000003 /* 0A6B4 80B74054 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A6B8 80B74058 A609017A */ sh $t1, 0x017A($s0) ## 0000017A /* 0A6BC 80B7405C 3C01C28C */ lui $at, 0xC28C ## $at = C28C0000 /* 0A6C0 80B74060 44812000 */ mtc1 $at, $f4 ## $f4 = -70.00 /* 0A6C4 80B74064 00000000 */ nop -/* 0A6C8 80B74068 46002201 */ sub.s $f8, $f4, $f0 +/* 0A6C8 80B74068 46002201 */ sub.s $f8, $f4, $f0 /* 0A6CC 80B7406C E60801B8 */ swc1 $f8, 0x01B8($s0) ## 000001B8 .L80B74070: /* 0A6D0 80B74070 860B017E */ lh $t3, 0x017E($s0) ## 0000017E .L80B74074: -/* 0A6D4 80B74074 11600016 */ beq $t3, $zero, .L80B740D0 +/* 0A6D4 80B74074 11600016 */ beq $t3, $zero, .L80B740D0 /* 0A6D8 80B74078 00000000 */ nop /* 0A6DC 80B7407C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 0A6E0 80B74080 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0A6E4 80B74084 4406A000 */ mfc1 $a2, $f20 -/* 0A6E8 80B74088 E426E11C */ swc1 $f6, %lo(D_80B7E11C)($at) +/* 0A6E4 80B74084 4406A000 */ mfc1 $a2, $f20 +/* 0A6E8 80B74088 E426E11C */ swc1 $f6, %lo(D_80B7E11C)($at) /* 0A6EC 80B7408C 3C0180B8 */ lui $at, %hi(D_80B7B6CC) ## $at = 80B80000 -/* 0A6F0 80B74090 C42AB6CC */ lwc1 $f10, %lo(D_80B7B6CC)($at) +/* 0A6F0 80B74090 C42AB6CC */ lwc1 $f10, %lo(D_80B7B6CC)($at) /* 0A6F4 80B74094 3C0180B8 */ lui $at, %hi(D_80B7B6D0) ## $at = 80B80000 -/* 0A6F8 80B74098 4407A000 */ mfc1 $a3, $f20 +/* 0A6F8 80B74098 4407A000 */ mfc1 $a3, $f20 /* 0A6FC 80B7409C E60A0190 */ swc1 $f10, 0x0190($s0) ## 00000190 -/* 0A700 80B740A0 C424B6D0 */ lwc1 $f4, %lo(D_80B7B6D0)($at) +/* 0A700 80B740A0 C424B6D0 */ lwc1 $f4, %lo(D_80B7B6D0)($at) /* 0A704 80B740A4 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0A708 80B740A8 3C0540F0 */ lui $a1, 0x40F0 ## $a1 = 40F00000 /* 0A70C 80B740AC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0A710 80B740B0 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 -/* 0A714 80B740B4 8FA40040 */ lw $a0, 0x0040($sp) +/* 0A714 80B740B4 8FA40040 */ lw $a0, 0x0040($sp) /* 0A718 80B740B8 24054E20 */ addiu $a1, $zero, 0x4E20 ## $a1 = 00004E20 /* 0A71C 80B740BC 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0A720 80B740C0 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0A724 80B740C4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 0A728 80B740C8 1000009B */ beq $zero, $zero, .L80B74338 +/* 0A728 80B740C8 1000009B */ beq $zero, $zero, .L80B74338 /* 0A72C 80B740CC 00000000 */ nop .L80B740D0: /* 0A730 80B740D0 3C0D80B8 */ lui $t5, %hi(D_80B7E124) ## $t5 = 80B80000 -/* 0A734 80B740D4 91ADE124 */ lbu $t5, %lo(D_80B7E124)($t5) -/* 0A738 80B740D8 15A00010 */ bne $t5, $zero, .L80B7411C +/* 0A734 80B740D4 91ADE124 */ lbu $t5, %lo(D_80B7E124)($t5) +/* 0A738 80B740D8 15A00010 */ bne $t5, $zero, .L80B7411C /* 0A73C 80B740DC 3C0E80B8 */ lui $t6, %hi(D_80B7E0B6) ## $t6 = 80B80000 -/* 0A740 80B740E0 91CEE0B6 */ lbu $t6, %lo(D_80B7E0B6)($t6) +/* 0A740 80B740E0 91CEE0B6 */ lbu $t6, %lo(D_80B7E0B6)($t6) /* 0A744 80B740E4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0A748 80B740E8 15C1000C */ bne $t6, $at, .L80B7411C +/* 0A748 80B740E8 15C1000C */ bne $t6, $at, .L80B7411C /* 0A74C 80B740EC 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 0A750 80B740F0 44814000 */ mtc1 $at, $f8 ## $f8 = 2000.00 -/* 0A754 80B740F4 4406A000 */ mfc1 $a2, $f20 +/* 0A754 80B740F4 4406A000 */ mfc1 $a2, $f20 /* 0A758 80B740F8 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 /* 0A75C 80B740FC E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 0A760 80B74100 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 0A764 80B74104 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0A768 80B74108 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 /* 0A76C 80B7410C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0A770 80B74110 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 -/* 0A774 80B74114 1000000D */ beq $zero, $zero, .L80B7414C +/* 0A774 80B74114 1000000D */ beq $zero, $zero, .L80B7414C /* 0A778 80B74118 920F0150 */ lbu $t7, 0x0150($s0) ## 00000150 .L80B7411C: /* 0A77C 80B7411C 3C0180B8 */ lui $at, %hi(D_80B7B6D4) ## $at = 80B80000 -/* 0A780 80B74120 C426B6D4 */ lwc1 $f6, %lo(D_80B7B6D4)($at) +/* 0A780 80B74120 C426B6D4 */ lwc1 $f6, %lo(D_80B7B6D4)($at) /* 0A784 80B74124 3C0180B8 */ lui $at, %hi(D_80B7B6D8) ## $at = 80B80000 -/* 0A788 80B74128 4406A000 */ mfc1 $a2, $f20 +/* 0A788 80B74128 4406A000 */ mfc1 $a2, $f20 /* 0A78C 80B7412C E6060190 */ swc1 $f6, 0x0190($s0) ## 00000190 -/* 0A790 80B74130 C42AB6D8 */ lwc1 $f10, %lo(D_80B7B6D8)($at) +/* 0A790 80B74130 C42AB6D8 */ lwc1 $f10, %lo(D_80B7B6D8)($at) /* 0A794 80B74134 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0A798 80B74138 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 0A79C 80B7413C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 0A7A0 80B74140 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0A7A4 80B74144 E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 /* 0A7A8 80B74148 920F0150 */ lbu $t7, 0x0150($s0) ## 00000150 .L80B7414C: -/* 0A7AC 80B7414C 15E00008 */ bne $t7, $zero, .L80B74170 +/* 0A7AC 80B7414C 15E00008 */ bne $t7, $zero, .L80B74170 /* 0A7B0 80B74150 3C0180B8 */ lui $at, %hi(D_80B7B6DC) ## $at = 80B80000 -/* 0A7B4 80B74154 C428B6DC */ lwc1 $f8, %lo(D_80B7B6DC)($at) +/* 0A7B4 80B74154 C428B6DC */ lwc1 $f8, %lo(D_80B7B6DC)($at) /* 0A7B8 80B74158 C60401AC */ lwc1 $f4, 0x01AC($s0) ## 000001AC /* 0A7BC 80B7415C 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0A7C0 80B74160 46082182 */ mul.s $f6, $f4, $f8 -/* 0A7C4 80B74164 4606A281 */ sub.s $f10, $f20, $f6 -/* 0A7C8 80B74168 10000073 */ beq $zero, $zero, .L80B74338 -/* 0A7CC 80B7416C E42AE11C */ swc1 $f10, %lo(D_80B7E11C)($at) +/* 0A7C0 80B74160 46082182 */ mul.s $f6, $f4, $f8 +/* 0A7C4 80B74164 4606A281 */ sub.s $f10, $f20, $f6 +/* 0A7C8 80B74168 10000073 */ beq $zero, $zero, .L80B74338 +/* 0A7CC 80B7416C E42AE11C */ swc1 $f10, %lo(D_80B7E11C)($at) .L80B74170: /* 0A7D0 80B74170 3C0180B8 */ lui $at, %hi(D_80B7B6E0) ## $at = 80B80000 -/* 0A7D4 80B74174 C428B6E0 */ lwc1 $f8, %lo(D_80B7B6E0)($at) +/* 0A7D4 80B74174 C428B6E0 */ lwc1 $f8, %lo(D_80B7B6E0)($at) /* 0A7D8 80B74178 C60401AC */ lwc1 $f4, 0x01AC($s0) ## 000001AC /* 0A7DC 80B7417C 3C0180B8 */ lui $at, %hi(D_80B7B6E4) ## $at = 80B80000 -/* 0A7E0 80B74180 C42AB6E4 */ lwc1 $f10, %lo(D_80B7B6E4)($at) -/* 0A7E4 80B74184 46082182 */ mul.s $f6, $f4, $f8 +/* 0A7E0 80B74180 C42AB6E4 */ lwc1 $f10, %lo(D_80B7B6E4)($at) +/* 0A7E4 80B74184 46082182 */ mul.s $f6, $f4, $f8 /* 0A7E8 80B74188 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0A7EC 80B7418C 460A3102 */ mul.s $f4, $f6, $f10 -/* 0A7F0 80B74190 4604A201 */ sub.s $f8, $f20, $f4 -/* 0A7F4 80B74194 10000068 */ beq $zero, $zero, .L80B74338 -/* 0A7F8 80B74198 E428E11C */ swc1 $f8, %lo(D_80B7E11C)($at) +/* 0A7EC 80B7418C 460A3102 */ mul.s $f4, $f6, $f10 +/* 0A7F0 80B74190 4604A201 */ sub.s $f8, $f20, $f4 +/* 0A7F4 80B74194 10000068 */ beq $zero, $zero, .L80B74338 +/* 0A7F8 80B74198 E428E11C */ swc1 $f8, %lo(D_80B7E11C)($at) /* 0A7FC 80B7419C 3058000F */ andi $t8, $v0, 0x000F ## $t8 = 00000000 .L80B741A0: -/* 0A800 80B741A0 5700001E */ bnel $t8, $zero, .L80B7421C +/* 0A800 80B741A0 5700001E */ bnel $t8, $zero, .L80B7421C /* 0A804 80B741A4 92090150 */ lbu $t1, 0x0150($s0) ## 00000150 -/* 0A808 80B741A8 8FB9004C */ lw $t9, 0x004C($sp) +/* 0A808 80B741A8 8FB9004C */ lw $t9, 0x004C($sp) /* 0A80C 80B741AC 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 0A810 80B741B0 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF /* 0A814 80B741B4 972A0000 */ lhu $t2, 0x0000($t9) ## 00000000 -/* 0A818 80B741B8 01416027 */ nor $t4, $t2, $at -/* 0A81C 80B741BC 15800016 */ bne $t4, $zero, .L80B74218 +/* 0A818 80B741B8 01416027 */ nor $t4, $t2, $at +/* 0A81C 80B741BC 15800016 */ bne $t4, $zero, .L80B74218 /* 0A820 80B741C0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0A824 80B741C4 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 /* 0A828 80B741C8 C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC -/* 0A82C 80B741CC 4606503E */ c.le.s $f10, $f6 +/* 0A82C 80B741CC 4606503E */ c.le.s $f10, $f6 /* 0A830 80B741D0 00000000 */ nop -/* 0A834 80B741D4 45000004 */ bc1f .L80B741E8 +/* 0A834 80B741D4 45000004 */ bc1f .L80B741E8 /* 0A838 80B741D8 3C0980B8 */ lui $t1, %hi(D_80B7E080) ## $t1 = 80B80000 -/* 0A83C 80B741DC 8529E080 */ lh $t1, %lo(D_80B7E080)($t1) -/* 0A840 80B741E0 292107D0 */ slti $at, $t1, 0x07D0 -/* 0A844 80B741E4 1420000C */ bne $at, $zero, .L80B74218 +/* 0A83C 80B741DC 8529E080 */ lh $t1, %lo(D_80B7E080)($t1) +/* 0A840 80B741E0 292107D0 */ slti $at, $t1, 0x07D0 +/* 0A844 80B741E4 1420000C */ bne $at, $zero, .L80B74218 .L80B741E8: /* 0A848 80B741E8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0A84C 80B741EC 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 0A850 80B741F0 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A854 80B741F4 00000000 */ nop -/* 0A858 80B741F8 4600010D */ trunc.w.s $f4, $f0 +/* 0A858 80B741F8 4600010D */ trunc.w.s $f4, $f0 /* 0A85C 80B741FC 8619008A */ lh $t9, 0x008A($s0) ## 0000008A /* 0A860 80B74200 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 0A864 80B74204 440F2000 */ mfc1 $t7, $f4 -/* 0A868 80B74208 032A6023 */ subu $t4, $t9, $t2 +/* 0A864 80B74204 440F2000 */ mfc1 $t7, $f4 +/* 0A868 80B74208 032A6023 */ subu $t4, $t9, $t2 /* 0A86C 80B7420C A60C0154 */ sh $t4, 0x0154($s0) ## 00000154 /* 0A870 80B74210 25F8000F */ addiu $t8, $t7, 0x000F ## $t8 = 0000000F /* 0A874 80B74214 A2180152 */ sb $t8, 0x0152($s0) ## 00000152 @@ -3109,130 +3109,130 @@ glabel L80B738A0 .L80B7421C: /* 0A87C 80B7421C E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 0A880 80B74220 3C0180B8 */ lui $at, %hi(D_80B7B6E8) ## $at = 80B80000 -/* 0A884 80B74224 C428B6E8 */ lwc1 $f8, %lo(D_80B7B6E8)($at) -/* 0A888 80B74228 1520000B */ bne $t1, $zero, .L80B74258 +/* 0A884 80B74224 C428B6E8 */ lwc1 $f8, %lo(D_80B7B6E8)($at) +/* 0A888 80B74228 1520000B */ bne $t1, $zero, .L80B74258 /* 0A88C 80B7422C E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 /* 0A890 80B74230 3C0180B8 */ lui $at, %hi(D_80B7B6EC) ## $at = 80B80000 -/* 0A894 80B74234 C42AB6EC */ lwc1 $f10, %lo(D_80B7B6EC)($at) +/* 0A894 80B74234 C42AB6EC */ lwc1 $f10, %lo(D_80B7B6EC)($at) /* 0A898 80B74238 C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 0A89C 80B7423C 3C0180B8 */ lui $at, %hi(D_80B7B6F0) ## $at = 80B80000 -/* 0A8A0 80B74240 C428B6F0 */ lwc1 $f8, %lo(D_80B7B6F0)($at) -/* 0A8A4 80B74244 460A3102 */ mul.s $f4, $f6, $f10 +/* 0A8A0 80B74240 C428B6F0 */ lwc1 $f8, %lo(D_80B7B6F0)($at) +/* 0A8A4 80B74244 460A3102 */ mul.s $f4, $f6, $f10 /* 0A8A8 80B74248 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0A8AC 80B7424C 46044181 */ sub.s $f6, $f8, $f4 -/* 0A8B0 80B74250 1000000D */ beq $zero, $zero, .L80B74288 -/* 0A8B4 80B74254 E426E11C */ swc1 $f6, %lo(D_80B7E11C)($at) +/* 0A8AC 80B7424C 46044181 */ sub.s $f6, $f8, $f4 +/* 0A8B0 80B74250 1000000D */ beq $zero, $zero, .L80B74288 +/* 0A8B4 80B74254 E426E11C */ swc1 $f6, %lo(D_80B7E11C)($at) .L80B74258: /* 0A8B8 80B74258 3C0180B8 */ lui $at, %hi(D_80B7B6F4) ## $at = 80B80000 -/* 0A8BC 80B7425C C428B6F4 */ lwc1 $f8, %lo(D_80B7B6F4)($at) +/* 0A8BC 80B7425C C428B6F4 */ lwc1 $f8, %lo(D_80B7B6F4)($at) /* 0A8C0 80B74260 C60A01AC */ lwc1 $f10, 0x01AC($s0) ## 000001AC /* 0A8C4 80B74264 3C0180B8 */ lui $at, %hi(D_80B7B6F8) ## $at = 80B80000 -/* 0A8C8 80B74268 C426B6F8 */ lwc1 $f6, %lo(D_80B7B6F8)($at) -/* 0A8CC 80B7426C 46085102 */ mul.s $f4, $f10, $f8 +/* 0A8C8 80B74268 C426B6F8 */ lwc1 $f6, %lo(D_80B7B6F8)($at) +/* 0A8CC 80B7426C 46085102 */ mul.s $f4, $f10, $f8 /* 0A8D0 80B74270 3C0180B8 */ lui $at, %hi(D_80B7B6FC) ## $at = 80B80000 -/* 0A8D4 80B74274 C428B6FC */ lwc1 $f8, %lo(D_80B7B6FC)($at) +/* 0A8D4 80B74274 C428B6FC */ lwc1 $f8, %lo(D_80B7B6FC)($at) /* 0A8D8 80B74278 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0A8DC 80B7427C 46062282 */ mul.s $f10, $f4, $f6 -/* 0A8E0 80B74280 460A4101 */ sub.s $f4, $f8, $f10 -/* 0A8E4 80B74284 E424E11C */ swc1 $f4, %lo(D_80B7E11C)($at) +/* 0A8DC 80B7427C 46062282 */ mul.s $f10, $f4, $f6 +/* 0A8E0 80B74280 460A4101 */ sub.s $f4, $f8, $f10 +/* 0A8E4 80B74284 E424E11C */ swc1 $f4, %lo(D_80B7E11C)($at) .L80B74288: -/* 0A8E8 80B74288 4406A000 */ mfc1 $a2, $f20 +/* 0A8E8 80B74288 4406A000 */ mfc1 $a2, $f20 /* 0A8EC 80B7428C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0A8F0 80B74290 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 /* 0A8F4 80B74294 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0A8F8 80B74298 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 0A8FC 80B7429C 860B017C */ lh $t3, 0x017C($s0) ## 0000017C -/* 0A900 80B742A0 15600025 */ bne $t3, $zero, .L80B74338 +/* 0A900 80B742A0 15600025 */ bne $t3, $zero, .L80B74338 /* 0A904 80B742A4 00000000 */ nop /* 0A908 80B742A8 A2000152 */ sb $zero, 0x0152($s0) ## 00000152 /* 0A90C 80B742AC 3C0280B8 */ lui $v0, %hi(D_80B7E080) ## $v0 = 80B80000 -/* 0A910 80B742B0 8442E080 */ lh $v0, %lo(D_80B7E080)($v0) -/* 0A914 80B742B4 284107D0 */ slti $at, $v0, 0x07D0 -/* 0A918 80B742B8 1020000A */ beq $at, $zero, .L80B742E4 +/* 0A910 80B742B0 8442E080 */ lh $v0, %lo(D_80B7E080)($v0) +/* 0A914 80B742B4 284107D0 */ slti $at, $v0, 0x07D0 +/* 0A918 80B742B8 1020000A */ beq $at, $zero, .L80B742E4 /* 0A91C 80B742BC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0A920 80B742C0 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0A924 80B742C4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A928 80B742C8 00000000 */ nop -/* 0A92C 80B742CC 4600018D */ trunc.w.s $f6, $f0 -/* 0A930 80B742D0 44183000 */ mfc1 $t8, $f6 +/* 0A92C 80B742CC 4600018D */ trunc.w.s $f6, $f0 +/* 0A930 80B742D0 44183000 */ mfc1 $t8, $f6 /* 0A934 80B742D4 00000000 */ nop /* 0A938 80B742D8 27190032 */ addiu $t9, $t8, 0x0032 ## $t9 = 00000032 -/* 0A93C 80B742DC 10000016 */ beq $zero, $zero, .L80B74338 +/* 0A93C 80B742DC 10000016 */ beq $zero, $zero, .L80B74338 /* 0A940 80B742E0 A619017C */ sh $t9, 0x017C($s0) ## 0000017C .L80B742E4: -/* 0A944 80B742E4 28410BB8 */ slti $at, $v0, 0x0BB8 -/* 0A948 80B742E8 1020000A */ beq $at, $zero, .L80B74314 +/* 0A944 80B742E4 28410BB8 */ slti $at, $v0, 0x0BB8 +/* 0A948 80B742E8 1020000A */ beq $at, $zero, .L80B74314 /* 0A94C 80B742EC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0A950 80B742F0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 0A954 80B742F4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A958 80B742F8 00000000 */ nop -/* 0A95C 80B742FC 4600020D */ trunc.w.s $f8, $f0 -/* 0A960 80B74300 440B4000 */ mfc1 $t3, $f8 +/* 0A95C 80B742FC 4600020D */ trunc.w.s $f8, $f0 +/* 0A960 80B74300 440B4000 */ mfc1 $t3, $f8 /* 0A964 80B74304 00000000 */ nop /* 0A968 80B74308 256D001E */ addiu $t5, $t3, 0x001E ## $t5 = 0000001E -/* 0A96C 80B7430C 1000000A */ beq $zero, $zero, .L80B74338 +/* 0A96C 80B7430C 1000000A */ beq $zero, $zero, .L80B74338 /* 0A970 80B74310 A60D017C */ sh $t5, 0x017C($s0) ## 0000017C .L80B74314: /* 0A974 80B74314 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0A978 80B74318 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0A97C 80B7431C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A980 80B74320 00000000 */ nop -/* 0A984 80B74324 4600028D */ trunc.w.s $f10, $f0 -/* 0A988 80B74328 44195000 */ mfc1 $t9, $f10 +/* 0A984 80B74324 4600028D */ trunc.w.s $f10, $f0 +/* 0A988 80B74328 44195000 */ mfc1 $t9, $f10 /* 0A98C 80B7432C 00000000 */ nop /* 0A990 80B74330 272A0019 */ addiu $t2, $t9, 0x0019 ## $t2 = 00000019 /* 0A994 80B74334 A60A017C */ sh $t2, 0x017C($s0) ## 0000017C .L80B74338: /* 0A998 80B74338 3C0C80B8 */ lui $t4, %hi(D_80B7E074) ## $t4 = 80B80000 -/* 0A99C 80B7433C 918CE074 */ lbu $t4, %lo(D_80B7E074)($t4) +/* 0A99C 80B7433C 918CE074 */ lbu $t4, %lo(D_80B7E074)($t4) /* 0A9A0 80B74340 3C0280B8 */ lui $v0, %hi(D_80B7E124) ## $v0 = 80B80000 -/* 0A9A4 80B74344 9042E124 */ lbu $v0, %lo(D_80B7E124)($v0) -/* 0A9A8 80B74348 11800004 */ beq $t4, $zero, .L80B7435C +/* 0A9A4 80B74344 9042E124 */ lbu $v0, %lo(D_80B7E124)($v0) +/* 0A9A8 80B74348 11800004 */ beq $t4, $zero, .L80B7435C /* 0A9AC 80B7434C 00000000 */ nop /* 0A9B0 80B74350 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0A9B4 80B74354 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0A9B8 80B74358 E424E11C */ swc1 $f4, %lo(D_80B7E11C)($at) +/* 0A9B8 80B74358 E424E11C */ swc1 $f4, %lo(D_80B7E11C)($at) .L80B7435C: -/* 0A9BC 80B7435C 14400004 */ bne $v0, $zero, .L80B74370 +/* 0A9BC 80B7435C 14400004 */ bne $v0, $zero, .L80B74370 /* 0A9C0 80B74360 3C0980B8 */ lui $t1, %hi(D_80B7E0B6) ## $t1 = 80B80000 -/* 0A9C4 80B74364 9129E0B6 */ lbu $t1, %lo(D_80B7E0B6)($t1) +/* 0A9C4 80B74364 9129E0B6 */ lbu $t1, %lo(D_80B7E0B6)($t1) /* 0A9C8 80B74368 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0A9CC 80B7436C 1121002A */ beq $t1, $at, .L80B74418 +/* 0A9CC 80B7436C 1121002A */ beq $t1, $at, .L80B74418 .L80B74370: /* 0A9D0 80B74370 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0A9D4 80B74374 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 /* 0A9D8 80B74378 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 /* 0A9DC 80B7437C 3C0280B8 */ lui $v0, %hi(D_80B7E0AE) ## $v0 = 80B80000 -/* 0A9E0 80B74380 8442E0AE */ lh $v0, %lo(D_80B7E0AE)($v0) -/* 0A9E4 80B74384 4608303C */ c.lt.s $f6, $f8 +/* 0A9E0 80B74380 8442E0AE */ lh $v0, %lo(D_80B7E0AE)($v0) +/* 0A9E4 80B74384 4608303C */ c.lt.s $f6, $f8 /* 0A9E8 80B74388 00000000 */ nop -/* 0A9EC 80B7438C 4500000A */ bc1f .L80B743B8 +/* 0A9EC 80B7438C 4500000A */ bc1f .L80B743B8 /* 0A9F0 80B74390 304B0008 */ andi $t3, $v0, 0x0008 ## $t3 = 00000000 -/* 0A9F4 80B74394 11600004 */ beq $t3, $zero, .L80B743A8 +/* 0A9F4 80B74394 11600004 */ beq $t3, $zero, .L80B743A8 /* 0A9F8 80B74398 3C0180B8 */ lui $at, %hi(D_80B7B700) ## $at = 80B80000 -/* 0A9FC 80B7439C C42AB700 */ lwc1 $f10, %lo(D_80B7B700)($at) -/* 0AA00 80B743A0 1000000E */ beq $zero, $zero, .L80B743DC -/* 0AA04 80B743A4 E7AA0100 */ swc1 $f10, 0x0100($sp) +/* 0A9FC 80B7439C C42AB700 */ lwc1 $f10, %lo(D_80B7B700)($at) +/* 0AA00 80B743A0 1000000E */ beq $zero, $zero, .L80B743DC +/* 0AA04 80B743A4 E7AA0100 */ swc1 $f10, 0x0100($sp) .L80B743A8: /* 0AA08 80B743A8 3C01BF40 */ lui $at, 0xBF40 ## $at = BF400000 /* 0AA0C 80B743AC 44812000 */ mtc1 $at, $f4 ## $f4 = -0.75 -/* 0AA10 80B743B0 1000000A */ beq $zero, $zero, .L80B743DC -/* 0AA14 80B743B4 E7A40100 */ swc1 $f4, 0x0100($sp) +/* 0AA10 80B743B0 1000000A */ beq $zero, $zero, .L80B743DC +/* 0AA14 80B743B4 E7A40100 */ swc1 $f4, 0x0100($sp) .L80B743B8: /* 0AA18 80B743B8 304D0004 */ andi $t5, $v0, 0x0004 ## $t5 = 00000000 -/* 0AA1C 80B743BC 11A00004 */ beq $t5, $zero, .L80B743D0 +/* 0AA1C 80B743BC 11A00004 */ beq $t5, $zero, .L80B743D0 /* 0AA20 80B743C0 3C0180B8 */ lui $at, %hi(D_80B7B704) ## $at = 80B80000 -/* 0AA24 80B743C4 C426B704 */ lwc1 $f6, %lo(D_80B7B704)($at) -/* 0AA28 80B743C8 10000004 */ beq $zero, $zero, .L80B743DC -/* 0AA2C 80B743CC E7A60100 */ swc1 $f6, 0x0100($sp) +/* 0AA24 80B743C4 C426B704 */ lwc1 $f6, %lo(D_80B7B704)($at) +/* 0AA28 80B743C8 10000004 */ beq $zero, $zero, .L80B743DC +/* 0AA2C 80B743CC E7A60100 */ swc1 $f6, 0x0100($sp) .L80B743D0: /* 0AA30 80B743D0 3C0180B8 */ lui $at, %hi(D_80B7B708) ## $at = 80B80000 -/* 0AA34 80B743D4 C428B708 */ lwc1 $f8, %lo(D_80B7B708)($at) -/* 0AA38 80B743D8 E7A80100 */ swc1 $f8, 0x0100($sp) +/* 0AA34 80B743D4 C428B708 */ lwc1 $f8, %lo(D_80B7B708)($at) +/* 0AA38 80B743D8 E7A80100 */ swc1 $f8, 0x0100($sp) .L80B743DC: /* 0AA3C 80B743DC 3C0480B8 */ lui $a0, %hi(D_80B7A6C0) ## $a0 = 80B80000 /* 0AA40 80B743E0 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 @@ -3240,7 +3240,7 @@ glabel L80B738A0 /* 0AA48 80B743E8 2484A6C0 */ addiu $a0, $a0, %lo(D_80B7A6C0) ## $a0 = 80B7A6C0 /* 0AA4C 80B743EC 3C05420C */ lui $a1, 0x420C ## $a1 = 420C0000 /* 0AA50 80B743F0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0AA54 80B743F4 3C074060 */ lui $a3, 0x4060 ## $a3 = 40600000 /* 0AA58 80B743F8 3C0480B8 */ lui $a0, %hi(D_80B7A6BC) ## $a0 = 80B80000 /* 0AA5C 80B743FC 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 @@ -3249,8 +3249,8 @@ glabel L80B738A0 /* 0AA68 80B74408 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 0AA6C 80B7440C 2484A6BC */ addiu $a0, $a0, %lo(D_80B7A6BC) ## $a0 = 80B7A6BC /* 0AA70 80B74410 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 0AA74 80B74414 8FA50100 */ lw $a1, 0x0100($sp) + +/* 0AA74 80B74414 8FA50100 */ lw $a1, 0x0100($sp) .L80B74418: /* 0AA78 80B74418 8E1801C0 */ lw $t8, 0x01C0($s0) ## 000001C0 /* 0AA7C 80B7441C 3C0E80B8 */ lui $t6, %hi(D_80B7EABC) ## $t6 = 80B80000 @@ -3267,199 +3267,199 @@ glabel L80B738A0 /* 0AAA8 80B74448 C4420948 */ lwc1 $f2, 0x0948($v0) ## 80B7EAB0 /* 0AAAC 80B7444C C448094C */ lwc1 $f8, 0x094C($v0) ## 80B7EAB4 /* 0AAB0 80B74450 C4460958 */ lwc1 $f6, 0x0958($v0) ## 80B7EAC0 -/* 0AAB4 80B74454 46025101 */ sub.s $f4, $f10, $f2 -/* 0AAB8 80B74458 46083281 */ sub.s $f10, $f6, $f8 -/* 0AABC 80B7445C E7A4010C */ swc1 $f4, 0x010C($sp) +/* 0AAB4 80B74454 46025101 */ sub.s $f4, $f10, $f2 +/* 0AAB8 80B74458 46083281 */ sub.s $f10, $f6, $f8 +/* 0AABC 80B7445C E7A4010C */ swc1 $f4, 0x010C($sp) /* 0AAC0 80B74460 C444095C */ lwc1 $f4, 0x095C($v0) ## 80B7EAC4 /* 0AAC4 80B74464 C4460950 */ lwc1 $f6, 0x0950($v0) ## 80B7EAB8 -/* 0AAC8 80B74468 E7AA0110 */ swc1 $f10, 0x0110($sp) +/* 0AAC8 80B74468 E7AA0110 */ swc1 $f10, 0x0110($sp) /* 0AACC 80B7446C 44815000 */ mtc1 $at, $f10 ## $f10 = 400.00 -/* 0AAD0 80B74470 46062201 */ sub.s $f8, $f4, $f6 -/* 0AAD4 80B74474 C7A4010C */ lwc1 $f4, 0x010C($sp) -/* 0AAD8 80B74478 E7A80114 */ swc1 $f8, 0x0114($sp) -/* 0AADC 80B7447C 46042182 */ mul.s $f6, $f4, $f4 -/* 0AAE0 80B74480 C7A80110 */ lwc1 $f8, 0x0110($sp) -/* 0AAE4 80B74484 46084102 */ mul.s $f4, $f8, $f8 -/* 0AAE8 80B74488 46043200 */ add.s $f8, $f6, $f4 -/* 0AAEC 80B7448C C7A60114 */ lwc1 $f6, 0x0114($sp) -/* 0AAF0 80B74490 46063102 */ mul.s $f4, $f6, $f6 -/* 0AAF4 80B74494 46044180 */ add.s $f6, $f8, $f4 -/* 0AAF8 80B74498 4606503C */ c.lt.s $f10, $f6 +/* 0AAD0 80B74470 46062201 */ sub.s $f8, $f4, $f6 +/* 0AAD4 80B74474 C7A4010C */ lwc1 $f4, 0x010C($sp) +/* 0AAD8 80B74478 E7A80114 */ swc1 $f8, 0x0114($sp) +/* 0AADC 80B7447C 46042182 */ mul.s $f6, $f4, $f4 +/* 0AAE0 80B74480 C7A80110 */ lwc1 $f8, 0x0110($sp) +/* 0AAE4 80B74484 46084102 */ mul.s $f4, $f8, $f8 +/* 0AAE8 80B74488 46043200 */ add.s $f8, $f6, $f4 +/* 0AAEC 80B7448C C7A60114 */ lwc1 $f6, 0x0114($sp) +/* 0AAF0 80B74490 46063102 */ mul.s $f4, $f6, $f6 +/* 0AAF4 80B74494 46044180 */ add.s $f6, $f8, $f4 +/* 0AAF8 80B74498 4606503C */ c.lt.s $f10, $f6 /* 0AAFC 80B7449C 00000000 */ nop -/* 0AB00 80B744A0 4500002F */ bc1f .L80B74560 +/* 0AB00 80B744A0 4500002F */ bc1f .L80B74560 /* 0AB04 80B744A4 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0AB08 80B744A8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 /* 0AB0C 80B744AC C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 0AB10 80B744B0 44051000 */ mfc1 $a1, $f2 +/* 0AB10 80B744B0 44051000 */ mfc1 $a1, $f2 /* 0AB14 80B744B4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 0AB18 80B744B8 46044002 */ mul.s $f0, $f8, $f4 +/* 0AB18 80B744B8 46044002 */ mul.s $f0, $f8, $f4 /* 0AB1C 80B744BC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0AB20 80B744C0 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 0AB24 80B744C4 46000280 */ add.s $f10, $f0, $f0 -/* 0AB28 80B744C8 44075000 */ mfc1 $a3, $f10 +/* 0AB24 80B744C4 46000280 */ add.s $f10, $f0, $f0 +/* 0AB28 80B744C8 44075000 */ mfc1 $a3, $f10 /* 0AB2C 80B744CC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0AB30 80B744D0 00000000 */ nop /* 0AB34 80B744D4 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0AB38 80B744D8 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 /* 0AB3C 80B744DC C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 /* 0AB40 80B744E0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0AB44 80B744E4 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 0AB48 80B744E8 46083002 */ mul.s $f0, $f6, $f8 +/* 0AB48 80B744E8 46083002 */ mul.s $f0, $f6, $f8 /* 0AB4C 80B744EC 3C0180B8 */ lui $at, %hi(D_80B7B70C) ## $at = 80B80000 -/* 0AB50 80B744F0 C428B70C */ lwc1 $f8, %lo(D_80B7B70C)($at) +/* 0AB50 80B744F0 C428B70C */ lwc1 $f8, %lo(D_80B7B70C)($at) /* 0AB54 80B744F4 3C0280B8 */ lui $v0, %hi(D_80B7E168) ## $v0 = 80B80000 /* 0AB58 80B744F8 2442E168 */ addiu $v0, $v0, %lo(D_80B7E168) ## $v0 = 80B7E168 /* 0AB5C 80B744FC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0AB60 80B74500 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 0AB64 80B74504 46000100 */ add.s $f4, $f0, $f0 +/* 0AB64 80B74504 46000100 */ add.s $f4, $f0, $f0 /* 0AB68 80B74508 8C45094C */ lw $a1, 0x094C($v0) ## 80B7EAB4 /* 0AB6C 80B7450C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 0AB70 80B74510 460A2182 */ mul.s $f6, $f4, $f10 +/* 0AB70 80B74510 460A2182 */ mul.s $f6, $f4, $f10 /* 0AB74 80B74514 00000000 */ nop -/* 0AB78 80B74518 46083102 */ mul.s $f4, $f6, $f8 -/* 0AB7C 80B7451C 44072000 */ mfc1 $a3, $f4 +/* 0AB78 80B74518 46083102 */ mul.s $f4, $f6, $f8 +/* 0AB7C 80B7451C 44072000 */ mfc1 $a3, $f4 /* 0AB80 80B74520 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0AB84 80B74524 00000000 */ nop /* 0AB88 80B74528 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0AB8C 80B7452C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 /* 0AB90 80B74530 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 /* 0AB94 80B74534 3C0280B8 */ lui $v0, %hi(D_80B7E168) ## $v0 = 80B80000 /* 0AB98 80B74538 2442E168 */ addiu $v0, $v0, %lo(D_80B7E168) ## $v0 = 80B7E168 -/* 0AB9C 80B7453C 46065002 */ mul.s $f0, $f10, $f6 +/* 0AB9C 80B7453C 46065002 */ mul.s $f0, $f10, $f6 /* 0ABA0 80B74540 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0ABA4 80B74544 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0ABA8 80B74548 8C450950 */ lw $a1, 0x0950($v0) ## 80B7EAB8 /* 0ABAC 80B7454C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 0ABB0 80B74550 46000200 */ add.s $f8, $f0, $f0 -/* 0ABB4 80B74554 44074000 */ mfc1 $a3, $f8 +/* 0ABB0 80B74550 46000200 */ add.s $f8, $f0, $f0 +/* 0ABB4 80B74554 44074000 */ mfc1 $a3, $f8 /* 0ABB8 80B74558 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0ABBC 80B7455C 00000000 */ nop .L80B74560: -/* 0ABC0 80B74560 8FB9004C */ lw $t9, 0x004C($sp) +/* 0ABC0 80B74560 8FB9004C */ lw $t9, 0x004C($sp) /* 0ABC4 80B74564 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 0ABC8 80B74568 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF /* 0ABCC 80B7456C 972A0000 */ lhu $t2, 0x0000($t9) ## 00000000 /* 0ABD0 80B74570 3C0380B8 */ lui $v1, %hi(D_80B7E122) ## $v1 = 80B80000 -/* 0ABD4 80B74574 8463E122 */ lh $v1, %lo(D_80B7E122)($v1) -/* 0ABD8 80B74578 01416027 */ nor $t4, $t2, $at -/* 0ABDC 80B7457C 11800004 */ beq $t4, $zero, .L80B74590 +/* 0ABD4 80B74574 8463E122 */ lh $v1, %lo(D_80B7E122)($v1) +/* 0ABD8 80B74578 01416027 */ nor $t4, $t2, $at +/* 0ABDC 80B7457C 11800004 */ beq $t4, $zero, .L80B74590 /* 0ABE0 80B74580 00000000 */ nop /* 0ABE4 80B74584 83290015 */ lb $t1, 0x0015($t9) ## 00000015 -/* 0ABE8 80B74588 2921FFE2 */ slti $at, $t1, 0xFFE2 -/* 0ABEC 80B7458C 10200008 */ beq $at, $zero, .L80B745B0 +/* 0ABE8 80B74588 2921FFE2 */ slti $at, $t1, 0xFFE2 +/* 0ABEC 80B7458C 10200008 */ beq $at, $zero, .L80B745B0 .L80B74590: /* 0ABF0 80B74590 3C0480B8 */ lui $a0, %hi(D_80B7E116) ## $a0 = 80B80000 /* 0ABF4 80B74594 2484E116 */ addiu $a0, $a0, %lo(D_80B7E116) ## $a0 = 80B7E116 /* 0ABF8 80B74598 84820000 */ lh $v0, 0x0000($a0) ## 80B7E116 -/* 0ABFC 80B7459C 28410064 */ slti $at, $v0, 0x0064 -/* 0AC00 80B745A0 10200009 */ beq $at, $zero, .L80B745C8 +/* 0ABFC 80B7459C 28410064 */ slti $at, $v0, 0x0064 +/* 0AC00 80B745A0 10200009 */ beq $at, $zero, .L80B745C8 /* 0AC04 80B745A4 244B0001 */ addiu $t3, $v0, 0x0001 ## $t3 = 00000001 -/* 0AC08 80B745A8 10000007 */ beq $zero, $zero, .L80B745C8 +/* 0AC08 80B745A8 10000007 */ beq $zero, $zero, .L80B745C8 /* 0AC0C 80B745AC A48B0000 */ sh $t3, 0x0000($a0) ## 80B7E116 .L80B745B0: /* 0AC10 80B745B0 3C0280B8 */ lui $v0, %hi(D_80B7E116) ## $v0 = 80B80000 -/* 0AC14 80B745B4 8442E116 */ lh $v0, %lo(D_80B7E116)($v0) -/* 0AC18 80B745B8 10400003 */ beq $v0, $zero, .L80B745C8 +/* 0AC14 80B745B4 8442E116 */ lh $v0, %lo(D_80B7E116)($v0) +/* 0AC18 80B745B8 10400003 */ beq $v0, $zero, .L80B745C8 /* 0AC1C 80B745BC 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = 80B7FFFF /* 0AC20 80B745C0 3C0180B8 */ lui $at, %hi(D_80B7E116) ## $at = 80B80000 -/* 0AC24 80B745C4 A42DE116 */ sh $t5, %lo(D_80B7E116)($at) +/* 0AC24 80B745C4 A42DE116 */ sh $t5, %lo(D_80B7E116)($at) .L80B745C8: /* 0AC28 80B745C8 3C0E80B8 */ lui $t6, %hi(D_80B7A694) ## $t6 = 80B80000 -/* 0AC2C 80B745CC 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) +/* 0AC2C 80B745CC 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) /* 0AC30 80B745D0 3C0480B8 */ lui $a0, %hi(D_80B7E116) ## $a0 = 80B80000 /* 0AC34 80B745D4 2484E116 */ addiu $a0, $a0, %lo(D_80B7E116) ## $a0 = 80B7E116 -/* 0AC38 80B745D8 29C10003 */ slti $at, $t6, 0x0003 -/* 0AC3C 80B745DC 14200029 */ bne $at, $zero, .L80B74684 +/* 0AC38 80B745D8 29C10003 */ slti $at, $t6, 0x0003 +/* 0AC3C 80B745DC 14200029 */ bne $at, $zero, .L80B74684 /* 0AC40 80B745E0 3C0F80B8 */ lui $t7, %hi(D_80B7E074) ## $t7 = 80B80000 -/* 0AC44 80B745E4 91EFE074 */ lbu $t7, %lo(D_80B7E074)($t7) -/* 0AC48 80B745E8 11E00004 */ beq $t7, $zero, .L80B745FC +/* 0AC44 80B745E4 91EFE074 */ lbu $t7, %lo(D_80B7E074)($t7) +/* 0AC48 80B745E8 11E00004 */ beq $t7, $zero, .L80B745FC /* 0AC4C 80B745EC 3C1880B8 */ lui $t8, %hi(D_80B7E080) ## $t8 = 80B80000 -/* 0AC50 80B745F0 8718E080 */ lh $t8, %lo(D_80B7E080)($t8) -/* 0AC54 80B745F4 2B010033 */ slti $at, $t8, 0x0033 -/* 0AC58 80B745F8 10200022 */ beq $at, $zero, .L80B74684 +/* 0AC50 80B745F0 8718E080 */ lh $t8, %lo(D_80B7E080)($t8) +/* 0AC54 80B745F4 2B010033 */ slti $at, $t8, 0x0033 +/* 0AC58 80B745F8 10200022 */ beq $at, $zero, .L80B74684 .L80B745FC: /* 0AC5C 80B745FC 3C0A80B8 */ lui $t2, %hi(D_80B7E080) ## $t2 = 80B80000 -/* 0AC60 80B74600 854AE080 */ lh $t2, %lo(D_80B7E080)($t2) -/* 0AC64 80B74604 29411770 */ slti $at, $t2, 0x1770 -/* 0AC68 80B74608 1020001E */ beq $at, $zero, .L80B74684 +/* 0AC60 80B74600 854AE080 */ lh $t2, %lo(D_80B7E080)($t2) +/* 0AC64 80B74604 29411770 */ slti $at, $t2, 0x1770 +/* 0AC68 80B74608 1020001E */ beq $at, $zero, .L80B74684 /* 0AC6C 80B7460C 00000000 */ nop -/* 0AC70 80B74610 14600004 */ bne $v1, $zero, .L80B74624 +/* 0AC70 80B74610 14600004 */ bne $v1, $zero, .L80B74624 /* 0AC74 80B74614 3C0C80B8 */ lui $t4, %hi(D_80B7E124) ## $t4 = 80B80000 -/* 0AC78 80B74618 918CE124 */ lbu $t4, %lo(D_80B7E124)($t4) -/* 0AC7C 80B7461C 11800019 */ beq $t4, $zero, .L80B74684 +/* 0AC78 80B74618 918CE124 */ lbu $t4, %lo(D_80B7E124)($t4) +/* 0AC7C 80B7461C 11800019 */ beq $t4, $zero, .L80B74684 /* 0AC80 80B74620 00000000 */ nop .L80B74624: /* 0AC84 80B74624 84990000 */ lh $t9, 0x0000($a0) ## 80B7E116 -/* 0AC88 80B74628 13200016 */ beq $t9, $zero, .L80B74684 +/* 0AC88 80B74628 13200016 */ beq $t9, $zero, .L80B74684 /* 0AC8C 80B7462C 3C0980B8 */ lui $t1, %hi(D_80B7E0AE) ## $t1 = 80B80000 -/* 0AC90 80B74630 8529E0AE */ lh $t1, %lo(D_80B7E0AE)($t1) +/* 0AC90 80B74630 8529E0AE */ lh $t1, %lo(D_80B7E0AE)($t1) /* 0AC94 80B74634 312B007F */ andi $t3, $t1, 0x007F ## $t3 = 00000000 -/* 0AC98 80B74638 15600056 */ bne $t3, $zero, .L80B74794 +/* 0AC98 80B74638 15600056 */ bne $t3, $zero, .L80B74794 /* 0AC9C 80B7463C 00000000 */ nop /* 0ACA0 80B74640 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 0ACA4 80B74644 00000000 */ nop /* 0ACA8 80B74648 3C0180B8 */ lui $at, %hi(D_80B7B710) ## $at = 80B80000 -/* 0ACAC 80B7464C C424B710 */ lwc1 $f4, %lo(D_80B7B710)($at) -/* 0ACB0 80B74650 4604003C */ c.lt.s $f0, $f4 +/* 0ACAC 80B7464C C424B710 */ lwc1 $f4, %lo(D_80B7B710)($at) +/* 0ACB0 80B74650 4604003C */ c.lt.s $f0, $f4 /* 0ACB4 80B74654 00000000 */ nop -/* 0ACB8 80B74658 4500004E */ bc1f .L80B74794 +/* 0ACB8 80B74658 4500004E */ bc1f .L80B74794 /* 0ACBC 80B7465C 3C0D80B8 */ lui $t5, %hi(D_80B7E0B6) ## $t5 = 80B80000 -/* 0ACC0 80B74660 91ADE0B6 */ lbu $t5, %lo(D_80B7E0B6)($t5) +/* 0ACC0 80B74660 91ADE0B6 */ lbu $t5, %lo(D_80B7E0B6)($t5) /* 0ACC4 80B74664 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0ACC8 80B74668 11A1004A */ beq $t5, $at, .L80B74794 +/* 0ACC8 80B74668 11A1004A */ beq $t5, $at, .L80B74794 /* 0ACCC 80B7466C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 0ACD0 80B74670 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 /* 0ACD4 80B74674 85CF0A5E */ lh $t7, 0x0A5E($t6) ## 80160A5E -/* 0ACD8 80B74678 15E00046 */ bne $t7, $zero, .L80B74794 +/* 0ACD8 80B74678 15E00046 */ bne $t7, $zero, .L80B74794 /* 0ACDC 80B7467C 3C0380B8 */ lui $v1, %hi(D_80B7E122) ## $v1 = 80B80000 -/* 0ACE0 80B74680 8463E122 */ lh $v1, %lo(D_80B7E122)($v1) +/* 0ACE0 80B74680 8463E122 */ lh $v1, %lo(D_80B7E122)($v1) .L80B74684: /* 0ACE4 80B74684 3C0480B8 */ lui $a0, %hi(D_80B7A67C) ## $a0 = 80B80000 /* 0ACE8 80B74688 2484A67C */ addiu $a0, $a0, %lo(D_80B7A67C) ## $a0 = 80B7A67C /* 0ACEC 80B7468C 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 0ACF0 80B74690 14600018 */ bne $v1, $zero, .L80B746F4 +/* 0ACF0 80B74690 14600018 */ bne $v1, $zero, .L80B746F4 /* 0ACF4 80B74694 A0980000 */ sb $t8, 0x0000($a0) ## 80B7A67C /* 0ACF8 80B74698 3C0A80B8 */ lui $t2, %hi(D_80B7E124) ## $t2 = 80B80000 -/* 0ACFC 80B7469C 914AE124 */ lbu $t2, %lo(D_80B7E124)($t2) -/* 0AD00 80B746A0 15400014 */ bne $t2, $zero, .L80B746F4 +/* 0ACFC 80B7469C 914AE124 */ lbu $t2, %lo(D_80B7E124)($t2) +/* 0AD00 80B746A0 15400014 */ bne $t2, $zero, .L80B746F4 /* 0AD04 80B746A4 3C0280B8 */ lui $v0, %hi(D_80B7E075) ## $v0 = 80B80000 -/* 0AD08 80B746A8 9042E075 */ lbu $v0, %lo(D_80B7E075)($v0) +/* 0AD08 80B746A8 9042E075 */ lbu $v0, %lo(D_80B7E075)($v0) /* 0AD0C 80B746AC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 0AD10 80B746B0 240C4081 */ addiu $t4, $zero, 0x4081 ## $t4 = 00004081 /* 0AD14 80B746B4 3C0180B8 */ lui $at, %hi(D_80B7E086) ## $at = 80B80000 -/* 0AD18 80B746B8 14620006 */ bne $v1, $v0, .L80B746D4 -/* 0AD1C 80B746BC A42CE086 */ sh $t4, %lo(D_80B7E086)($at) +/* 0AD18 80B746B8 14620006 */ bne $v1, $v0, .L80B746D4 +/* 0AD1C 80B746BC A42CE086 */ sh $t4, %lo(D_80B7E086)($at) /* 0AD20 80B746C0 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 0AD24 80B746C4 8F39F520 */ lw $t9, -0x0AE0($t9) ## 8015F520 /* 0AD28 80B746C8 33290400 */ andi $t1, $t9, 0x0400 ## $t1 = 00000000 -/* 0AD2C 80B746CC 15200007 */ bne $t1, $zero, .L80B746EC +/* 0AD2C 80B746CC 15200007 */ bne $t1, $zero, .L80B746EC /* 0AD30 80B746D0 00000000 */ nop .L80B746D4: -/* 0AD34 80B746D4 10620012 */ beq $v1, $v0, .L80B74720 +/* 0AD34 80B746D4 10620012 */ beq $v1, $v0, .L80B74720 /* 0AD38 80B746D8 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 0AD3C 80B746DC 8D6BF520 */ lw $t3, -0x0AE0($t3) ## 8015F520 /* 0AD40 80B746E0 316D0800 */ andi $t5, $t3, 0x0800 ## $t5 = 00000000 -/* 0AD44 80B746E4 51A0000F */ beql $t5, $zero, .L80B74724 +/* 0AD44 80B746E4 51A0000F */ beql $t5, $zero, .L80B74724 /* 0AD48 80B746E8 A600015A */ sh $zero, 0x015A($s0) ## 0000015A .L80B746EC: -/* 0AD4C 80B746EC 1000000C */ beq $zero, $zero, .L80B74720 +/* 0AD4C 80B746EC 1000000C */ beq $zero, $zero, .L80B74720 /* 0AD50 80B746F0 A0800000 */ sb $zero, 0x0000($a0) ## 80B7A67C .L80B746F4: /* 0AD54 80B746F4 240E4082 */ addiu $t6, $zero, 0x4082 ## $t6 = 00004082 /* 0AD58 80B746F8 3C0180B8 */ lui $at, %hi(D_80B7E086) ## $at = 80B80000 /* 0AD5C 80B746FC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 0AD60 80B74700 A42EE086 */ sh $t6, %lo(D_80B7E086)($at) +/* 0AD60 80B74700 A42EE086 */ sh $t6, %lo(D_80B7E086)($at) /* 0AD64 80B74704 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0AD68 80B74708 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 0AD6C 80B7470C 0C02A7DB */ jal func_800A9F6C +/* 0AD6C 80B7470C 0C02A7DB */ jal func_800A9F6C /* 0AD70 80B74710 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0AD74 80B74714 3C04100A */ lui $a0, 0x100A ## $a0 = 100A0000 /* 0AD78 80B74718 0C03E803 */ jal Audio_SetBGM - + /* 0AD7C 80B7471C 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100A00FF .L80B74720: /* 0AD80 80B74720 A600015A */ sh $zero, 0x015A($s0) ## 0000015A @@ -3475,23 +3475,23 @@ glabel L80B738A0 /* 0ADA4 80B74744 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 0ADA8 80B74748 3C0180B8 */ lui $at, %hi(D_80B7B714) ## $at = 80B80000 /* 0ADAC 80B7474C A60F0158 */ sh $t7, 0x0158($s0) ## 00000158 -/* 0ADB0 80B74750 C42AB714 */ lwc1 $f10, %lo(D_80B7B714)($at) +/* 0ADB0 80B74750 C42AB714 */ lwc1 $f10, %lo(D_80B7B714)($at) /* 0ADB4 80B74754 3C0C80B8 */ lui $t4, %hi(D_80B7A694) ## $t4 = 80B80000 /* 0ADB8 80B74758 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 0ADBC 80B7475C E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 -/* 0ADC0 80B74760 858CA694 */ lh $t4, %lo(D_80B7A694)($t4) -/* 0ADC4 80B74764 15810003 */ bne $t4, $at, .L80B74774 +/* 0ADC0 80B74760 858CA694 */ lh $t4, %lo(D_80B7A694)($t4) +/* 0ADC4 80B74764 15810003 */ bne $t4, $at, .L80B74774 /* 0ADC8 80B74768 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 0ADCC 80B7476C 3C0180B8 */ lui $at, %hi(D_80B7A694) ## $at = 80B80000 -/* 0ADD0 80B74770 A439A694 */ sh $t9, %lo(D_80B7A694)($at) +/* 0ADD0 80B74770 A439A694 */ sh $t9, %lo(D_80B7A694)($at) .L80B74774: /* 0ADD4 80B74774 3C0180B8 */ lui $at, %hi(D_80B7E0A6) ## $at = 80B80000 -/* 0ADD8 80B74778 A422E0A6 */ sh $v0, %lo(D_80B7E0A6)($at) +/* 0ADD8 80B74778 A422E0A6 */ sh $v0, %lo(D_80B7E0A6)($at) /* 0ADDC 80B7477C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0ADE0 80B74780 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 0ADE4 80B74784 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0ADE8 80B74788 E426E11C */ swc1 $f6, %lo(D_80B7E11C)($at) -/* 0ADEC 80B7478C 100002BA */ beq $zero, $zero, .L80B75278 +/* 0ADE8 80B74788 E426E11C */ swc1 $f6, %lo(D_80B7E11C)($at) +/* 0ADEC 80B7478C 100002BA */ beq $zero, $zero, .L80B75278 /* 0ADF0 80B74790 A2000152 */ sb $zero, 0x0152($s0) ## 00000152 .L80B74794: /* 0ADF4 80B74794 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 @@ -3502,22 +3502,22 @@ glabel L80B738A0 /* 0AE08 80B747A8 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 /* 0AE0C 80B747AC 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 /* 0AE10 80B747B0 00000000 */ nop -/* 0AE14 80B747B4 468022A0 */ cvt.s.w $f10, $f4 -/* 0AE18 80B747B8 46065100 */ add.s $f4, $f10, $f6 -/* 0AE1C 80B747BC 4604403C */ c.lt.s $f8, $f4 +/* 0AE14 80B747B4 468022A0 */ cvt.s.w $f10, $f4 +/* 0AE18 80B747B8 46065100 */ add.s $f4, $f10, $f6 +/* 0AE1C 80B747BC 4604403C */ c.lt.s $f8, $f4 /* 0AE20 80B747C0 00000000 */ nop -/* 0AE24 80B747C4 450002AC */ bc1f .L80B75278 +/* 0AE24 80B747C4 450002AC */ bc1f .L80B75278 /* 0AE28 80B747C8 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 /* 0AE2C 80B747CC 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 /* 0AE30 80B747D0 A60D0158 */ sh $t5, 0x0158($s0) ## 00000158 /* 0AE34 80B747D4 A60E017A */ sh $t6, 0x017A($s0) ## 0000017A -/* 0AE38 80B747D8 8FB800E0 */ lw $t8, 0x00E0($sp) +/* 0AE38 80B747D8 8FB800E0 */ lw $t8, 0x00E0($sp) /* 0AE3C 80B747DC 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 0AE40 80B747E0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0AE44 80B747E4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0AE48 80B747E8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 0AE4C 80B747EC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0AE50 80B747F0 0C02A7DB */ jal func_800A9F6C +/* 0AE50 80B747F0 0C02A7DB */ jal func_800A9F6C /* 0AE54 80B747F4 A70F0860 */ sh $t7, 0x0860($t8) ## 00002F70 /* 0AE58 80B747F8 3C0280B8 */ lui $v0, %hi(D_80B7E084) ## $v0 = 80B80000 /* 0AE5C 80B747FC 2442E084 */ addiu $v0, $v0, %lo(D_80B7E084) ## $v0 = 80B7E084 @@ -3525,24 +3525,24 @@ glabel L80B738A0 /* 0AE64 80B74804 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0AE68 80B74808 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 /* 0AE6C 80B7480C 254C0001 */ addiu $t4, $t2, 0x0001 ## $t4 = 00000001 -/* 0AE70 80B74810 0C019148 */ jal func_80064520 +/* 0AE70 80B74810 0C019148 */ jal func_80064520 /* 0AE74 80B74814 A44C0000 */ sh $t4, 0x0000($v0) ## 80B7E084 /* 0AE78 80B74818 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 /* 0AE7C 80B7481C 3C0180B8 */ lui $at, %hi(D_80B7A6CC) ## $at = 80B80000 -/* 0AE80 80B74820 A039A6CC */ sb $t9, %lo(D_80B7A6CC)($at) +/* 0AE80 80B74820 A039A6CC */ sb $t9, %lo(D_80B7A6CC)($at) /* 0AE84 80B74824 3C014234 */ lui $at, 0x4234 ## $at = 42340000 /* 0AE88 80B74828 44815000 */ mtc1 $at, $f10 ## $f10 = 45.00 /* 0AE8C 80B7482C 3C0180B8 */ lui $at, %hi(D_80B7FEC8) ## $at = 80B80000 /* 0AE90 80B74830 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 0AE94 80B74834 E42AFEC8 */ swc1 $f10, %lo(D_80B7FEC8)($at) +/* 0AE94 80B74834 E42AFEC8 */ swc1 $f10, %lo(D_80B7FEC8)($at) /* 0AE98 80B74838 3C0180B8 */ lui $at, %hi(D_80B7A694) ## $at = 80B80000 -/* 0AE9C 80B7483C A429A694 */ sh $t1, %lo(D_80B7A694)($at) +/* 0AE9C 80B7483C A429A694 */ sh $t1, %lo(D_80B7A694)($at) /* 0AEA0 80B74840 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 0AEA4 80B74844 44813000 */ mtc1 $at, $f6 ## $f6 = 500.00 /* 0AEA8 80B74848 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 0AEAC 80B7484C 3C0180B8 */ lui $at, %hi(D_80B7B718) ## $at = 80B80000 /* 0AEB0 80B74850 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 -/* 0AEB4 80B74854 C428B718 */ lwc1 $f8, %lo(D_80B7B718)($at) +/* 0AEB4 80B74854 C428B718 */ lwc1 $f8, %lo(D_80B7B718)($at) /* 0AEB8 80B74858 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 0AEBC 80B7485C E608019C */ swc1 $f8, 0x019C($s0) ## 0000019C /* 0AEC0 80B74860 8E2B07C0 */ lw $t3, 0x07C0($s1) ## 000007C0 @@ -3550,30 +3550,30 @@ glabel L80B738A0 /* 0AEC8 80B74868 85AE0002 */ lh $t6, 0x0002($t5) ## 00000002 /* 0AECC 80B7486C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 0AED0 80B74870 00000000 */ nop -/* 0AED4 80B74874 468022A0 */ cvt.s.w $f10, $f4 -/* 0AED8 80B74878 460A303E */ c.le.s $f6, $f10 +/* 0AED4 80B74874 468022A0 */ cvt.s.w $f10, $f4 +/* 0AED8 80B74878 460A303E */ c.le.s $f6, $f10 /* 0AEDC 80B7487C 00000000 */ nop -/* 0AEE0 80B74880 45000007 */ bc1f .L80B748A0 +/* 0AEE0 80B74880 45000007 */ bc1f .L80B748A0 /* 0AEE4 80B74884 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AEE8 80B74888 0C2DC49E */ jal func_80B71278 +/* 0AEE8 80B74888 0C2DC49E */ jal func_80B71278 /* 0AEEC 80B7488C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0AEF0 80B74890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0AEF4 80B74894 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0AEF8 80B74898 0C2DC28B */ jal func_80B70A2C +/* 0AEF8 80B74898 0C2DC28B */ jal func_80B70A2C /* 0AEFC 80B7489C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 glabel L80B748A0 .L80B748A0: /* 0AF00 80B748A0 260F0024 */ addiu $t7, $s0, 0x0024 ## $t7 = 00000024 /* 0AF04 80B748A4 26180028 */ addiu $t8, $s0, 0x0028 ## $t8 = 00000028 /* 0AF08 80B748A8 260A002C */ addiu $t2, $s0, 0x002C ## $t2 = 0000002C -/* 0AF0C 80B748AC AFAA003C */ sw $t2, 0x003C($sp) -/* 0AF10 80B748B0 AFB80044 */ sw $t8, 0x0044($sp) -/* 0AF14 80B748B4 AFAF0048 */ sw $t7, 0x0048($sp) -/* 0AF18 80B748B8 8FA40040 */ lw $a0, 0x0040($sp) +/* 0AF0C 80B748AC AFAA003C */ sw $t2, 0x003C($sp) +/* 0AF10 80B748B0 AFB80044 */ sw $t8, 0x0044($sp) +/* 0AF14 80B748B4 AFAF0048 */ sw $t7, 0x0048($sp) +/* 0AF18 80B748B8 8FA40040 */ lw $a0, 0x0040($sp) /* 0AF1C 80B748BC 24052AF8 */ addiu $a1, $zero, 0x2AF8 ## $a1 = 00002AF8 /* 0AF20 80B748C0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0AF24 80B748C4 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0AF28 80B748C8 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 0AF2C 80B748CC 3C0480B8 */ lui $a0, %hi(D_80B7FEC8) ## $a0 = 80B80000 /* 0AF30 80B748D0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -3581,31 +3581,31 @@ glabel L80B748A0 /* 0AF38 80B748D8 2484FEC8 */ addiu $a0, $a0, %lo(D_80B7FEC8) ## $a0 = 80B7FEC8 /* 0AF3C 80B748DC 3C054170 */ lui $a1, 0x4170 ## $a1 = 41700000 /* 0AF40 80B748E0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0AF44 80B748E4 3C073F40 */ lui $a3, 0x3F40 ## $a3 = 3F400000 /* 0AF48 80B748E8 3C0180B8 */ lui $at, %hi(D_80B7FEC8) ## $at = 80B80000 /* 0AF4C 80B748EC 3C0C80B8 */ lui $t4, %hi(D_80B7E075) ## $t4 = 80B80000 -/* 0AF50 80B748F0 C428FEC8 */ lwc1 $f8, %lo(D_80B7FEC8)($at) -/* 0AF54 80B748F4 918CE075 */ lbu $t4, %lo(D_80B7E075)($t4) +/* 0AF50 80B748F0 C428FEC8 */ lwc1 $f8, %lo(D_80B7FEC8)($at) +/* 0AF54 80B748F4 918CE075 */ lbu $t4, %lo(D_80B7E075)($t4) /* 0AF58 80B748F8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0AF5C 80B748FC E7A8010C */ swc1 $f8, 0x010C($sp) -/* 0AF60 80B74900 11810007 */ beq $t4, $at, .L80B74920 +/* 0AF5C 80B748FC E7A8010C */ swc1 $f8, 0x010C($sp) +/* 0AF60 80B74900 11810007 */ beq $t4, $at, .L80B74920 /* 0AF64 80B74904 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0AF68 80B74908 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 0AF6C 80B7490C 3C01425C */ lui $at, 0x425C ## $at = 425C0000 /* 0AF70 80B74910 44815000 */ mtc1 $at, $f10 ## $f10 = 55.00 -/* 0AF74 80B74914 E7A40110 */ swc1 $f4, 0x0110($sp) -/* 0AF78 80B74918 10000007 */ beq $zero, $zero, .L80B74938 -/* 0AF7C 80B7491C E7AA0114 */ swc1 $f10, 0x0114($sp) +/* 0AF74 80B74914 E7A40110 */ swc1 $f4, 0x0110($sp) +/* 0AF78 80B74918 10000007 */ beq $zero, $zero, .L80B74938 +/* 0AF7C 80B7491C E7AA0114 */ swc1 $f10, 0x0114($sp) .L80B74920: /* 0AF80 80B74920 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0AF84 80B74924 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 0AF88 80B74928 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0AF8C 80B7492C 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 0AF90 80B74930 E7A60110 */ swc1 $f6, 0x0110($sp) -/* 0AF94 80B74934 E7A80114 */ swc1 $f8, 0x0114($sp) +/* 0AF90 80B74930 E7A60110 */ swc1 $f6, 0x0110($sp) +/* 0AF94 80B74934 E7A80114 */ swc1 $f8, 0x0114($sp) .L80B74938: -/* 0AF98 80B74938 8FB900E0 */ lw $t9, 0x00E0($sp) +/* 0AF98 80B74938 8FB900E0 */ lw $t9, 0x00E0($sp) /* 0AF9C 80B7493C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0AFA0 80B74940 44813000 */ mtc1 $at, $f6 ## $f6 = 32768.00 /* 0AFA4 80B74944 872900B6 */ lh $t1, 0x00B6($t9) ## 000000B6 @@ -3613,34 +3613,34 @@ glabel L80B748A0 /* 0AFAC 80B7494C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0AFB0 80B74950 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 /* 0AFB4 80B74954 00000000 */ nop -/* 0AFB8 80B74958 468022A0 */ cvt.s.w $f10, $f4 -/* 0AFBC 80B7495C C424B71C */ lwc1 $f4, %lo(D_80B7B71C)($at) -/* 0AFC0 80B74960 46065203 */ div.s $f8, $f10, $f6 -/* 0AFC4 80B74964 46044302 */ mul.s $f12, $f8, $f4 -/* 0AFC8 80B74968 0C034348 */ jal Matrix_RotateY +/* 0AFB8 80B74958 468022A0 */ cvt.s.w $f10, $f4 +/* 0AFBC 80B7495C C424B71C */ lwc1 $f4, %lo(D_80B7B71C)($at) +/* 0AFC0 80B74960 46065203 */ div.s $f8, $f10, $f6 +/* 0AFC4 80B74964 46044302 */ mul.s $f12, $f8, $f4 +/* 0AFC8 80B74968 0C034348 */ jal Matrix_RotateY /* 0AFCC 80B7496C 00000000 */ nop /* 0AFD0 80B74970 3C0580B8 */ lui $a1, %hi(D_80B7FEA8) ## $a1 = 80B80000 /* 0AFD4 80B74974 24A5FEA8 */ addiu $a1, $a1, %lo(D_80B7FEA8) ## $a1 = 80B7FEA8 -/* 0AFD8 80B74978 0C0346BD */ jal Matrix_MultVec3f +/* 0AFD8 80B74978 0C0346BD */ jal Matrix_MultVec3f /* 0AFDC 80B7497C 27A4010C */ addiu $a0, $sp, 0x010C ## $a0 = FFFFFFD4 -/* 0AFE0 80B74980 8FA300E0 */ lw $v1, 0x00E0($sp) +/* 0AFE0 80B74980 8FA300E0 */ lw $v1, 0x00E0($sp) /* 0AFE4 80B74984 3C0580B8 */ lui $a1, %hi(D_80B7FEA8) ## $a1 = 80B80000 /* 0AFE8 80B74988 24A5FEA8 */ addiu $a1, $a1, %lo(D_80B7FEA8) ## $a1 = 80B7FEA8 /* 0AFEC 80B7498C C4AA0000 */ lwc1 $f10, 0x0000($a1) ## 80B7FEA8 /* 0AFF0 80B74990 C4660024 */ lwc1 $f6, 0x0024($v1) ## 00000024 /* 0AFF4 80B74994 C4A40004 */ lwc1 $f4, 0x0004($a1) ## 80B7FEAC /* 0AFF8 80B74998 3C0280B8 */ lui $v0, %hi(D_80B7FEB8) ## $v0 = 80B80000 -/* 0AFFC 80B7499C 46065200 */ add.s $f8, $f10, $f6 +/* 0AFFC 80B7499C 46065200 */ add.s $f8, $f10, $f6 /* 0B000 80B749A0 2442FEB8 */ addiu $v0, $v0, %lo(D_80B7FEB8) ## $v0 = 80B7FEB8 /* 0B004 80B749A4 3C0E80B8 */ lui $t6, %hi(D_80B7E075) ## $t6 = 80B80000 /* 0B008 80B749A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0B00C 80B749AC E4A80000 */ swc1 $f8, 0x0000($a1) ## 80B7FEA8 /* 0B010 80B749B0 C46A0028 */ lwc1 $f10, 0x0028($v1) ## 00000028 /* 0B014 80B749B4 C4A80008 */ lwc1 $f8, 0x0008($a1) ## 80B7FEB0 -/* 0B018 80B749B8 460A2180 */ add.s $f6, $f4, $f10 +/* 0B018 80B749B8 460A2180 */ add.s $f6, $f4, $f10 /* 0B01C 80B749BC E4A60004 */ swc1 $f6, 0x0004($a1) ## 80B7FEAC /* 0B020 80B749C0 C464002C */ lwc1 $f4, 0x002C($v1) ## 0000002C -/* 0B024 80B749C4 46044280 */ add.s $f10, $f8, $f4 +/* 0B024 80B749C4 46044280 */ add.s $f10, $f8, $f4 /* 0B028 80B749C8 E4AA0008 */ swc1 $f10, 0x0008($a1) ## 80B7FEB0 /* 0B02C 80B749CC 8C6D0024 */ lw $t5, 0x0024($v1) ## 00000024 /* 0B030 80B749D0 AC4D0000 */ sw $t5, 0x0000($v0) ## 80B7FEB8 @@ -3648,138 +3648,138 @@ glabel L80B748A0 /* 0B038 80B749D8 AC4B0004 */ sw $t3, 0x0004($v0) ## 80B7FEBC /* 0B03C 80B749DC 8C6D002C */ lw $t5, 0x002C($v1) ## 0000002C /* 0B040 80B749E0 AC4D0008 */ sw $t5, 0x0008($v0) ## 80B7FEC0 -/* 0B044 80B749E4 91CEE075 */ lbu $t6, %lo(D_80B7E075)($t6) -/* 0B048 80B749E8 11C10006 */ beq $t6, $at, .L80B74A04 +/* 0B044 80B749E4 91CEE075 */ lbu $t6, %lo(D_80B7E075)($t6) +/* 0B048 80B749E8 11C10006 */ beq $t6, $at, .L80B74A04 /* 0B04C 80B749EC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0B050 80B749F0 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 /* 0B054 80B749F4 C4460004 */ lwc1 $f6, 0x0004($v0) ## 80B7FEBC -/* 0B058 80B749F8 46083100 */ add.s $f4, $f6, $f8 -/* 0B05C 80B749FC 10000006 */ beq $zero, $zero, .L80B74A18 +/* 0B058 80B749F8 46083100 */ add.s $f4, $f6, $f8 +/* 0B05C 80B749FC 10000006 */ beq $zero, $zero, .L80B74A18 /* 0B060 80B74A00 E4440004 */ swc1 $f4, 0x0004($v0) ## 80B7FEBC .L80B74A04: /* 0B064 80B74A04 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 0B068 80B74A08 44813000 */ mtc1 $at, $f6 ## $f6 = 25.00 /* 0B06C 80B74A0C C44A0004 */ lwc1 $f10, 0x0004($v0) ## 80B7FEBC -/* 0B070 80B74A10 46065200 */ add.s $f8, $f10, $f6 +/* 0B070 80B74A10 46065200 */ add.s $f8, $f10, $f6 /* 0B074 80B74A14 E4480004 */ swc1 $f8, 0x0004($v0) ## 80B7FEBC .L80B74A18: /* 0B078 80B74A18 860F017A */ lh $t7, 0x017A($s0) ## 0000017A /* 0B07C 80B74A1C 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 0B080 80B74A20 55E10068 */ bnel $t7, $at, .L80B74BC4 +/* 0B080 80B74A20 55E10068 */ bnel $t7, $at, .L80B74BC4 /* 0B084 80B74A24 240AC000 */ addiu $t2, $zero, 0xC000 ## $t2 = FFFFC000 /* 0B088 80B74A28 0C03E803 */ jal Audio_SetBGM - + /* 0B08C 80B74A2C 24040924 */ addiu $a0, $zero, 0x0924 ## $a0 = 00000924 /* 0B090 80B74A30 3C0480B8 */ lui $a0, %hi(D_80B7A67C) ## $a0 = 80B80000 /* 0B094 80B74A34 2484A67C */ addiu $a0, $a0, %lo(D_80B7A67C) ## $a0 = 80B7A67C /* 0B098 80B74A38 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 /* 0B09C 80B74A3C A0980000 */ sb $t8, 0x0000($a0) ## 80B7A67C /* 0B0A0 80B74A40 920A0150 */ lbu $t2, 0x0150($s0) ## 00000150 -/* 0B0A4 80B74A44 55400036 */ bnel $t2, $zero, .L80B74B20 +/* 0B0A4 80B74A44 55400036 */ bnel $t2, $zero, .L80B74B20 /* 0B0A8 80B74A48 C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC /* 0B0AC 80B74A4C 444CF800 */ cfc1 $t4, $31 /* 0B0B0 80B74A50 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 0B0B4 80B74A54 44D9F800 */ ctc1 $t9, $31 /* 0B0B8 80B74A58 C60401AC */ lwc1 $f4, 0x01AC($s0) ## 000001AC -/* 0B0BC 80B74A5C 460022A4 */ cvt.w.s $f10, $f4 +/* 0B0BC 80B74A5C 460022A4 */ cvt.w.s $f10, $f4 /* 0B0C0 80B74A60 4459F800 */ cfc1 $t9, $31 /* 0B0C4 80B74A64 00000000 */ nop /* 0B0C8 80B74A68 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 0B0CC 80B74A6C 13200012 */ beq $t9, $zero, .L80B74AB8 +/* 0B0CC 80B74A6C 13200012 */ beq $t9, $zero, .L80B74AB8 /* 0B0D0 80B74A70 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 0B0D4 80B74A74 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 0B0D8 80B74A78 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0B0DC 80B74A7C 460A2281 */ sub.s $f10, $f4, $f10 +/* 0B0DC 80B74A7C 460A2281 */ sub.s $f10, $f4, $f10 /* 0B0E0 80B74A80 44D9F800 */ ctc1 $t9, $31 /* 0B0E4 80B74A84 00000000 */ nop -/* 0B0E8 80B74A88 460052A4 */ cvt.w.s $f10, $f10 +/* 0B0E8 80B74A88 460052A4 */ cvt.w.s $f10, $f10 /* 0B0EC 80B74A8C 4459F800 */ cfc1 $t9, $31 /* 0B0F0 80B74A90 00000000 */ nop /* 0B0F4 80B74A94 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 0B0F8 80B74A98 17200005 */ bne $t9, $zero, .L80B74AB0 +/* 0B0F8 80B74A98 17200005 */ bne $t9, $zero, .L80B74AB0 /* 0B0FC 80B74A9C 00000000 */ nop -/* 0B100 80B74AA0 44195000 */ mfc1 $t9, $f10 +/* 0B100 80B74AA0 44195000 */ mfc1 $t9, $f10 /* 0B104 80B74AA4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0B108 80B74AA8 10000007 */ beq $zero, $zero, .L80B74AC8 +/* 0B108 80B74AA8 10000007 */ beq $zero, $zero, .L80B74AC8 /* 0B10C 80B74AAC 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L80B74AB0: -/* 0B110 80B74AB0 10000005 */ beq $zero, $zero, .L80B74AC8 +/* 0B110 80B74AB0 10000005 */ beq $zero, $zero, .L80B74AC8 /* 0B114 80B74AB4 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF .L80B74AB8: -/* 0B118 80B74AB8 44195000 */ mfc1 $t9, $f10 +/* 0B118 80B74AB8 44195000 */ mfc1 $t9, $f10 /* 0B11C 80B74ABC 00000000 */ nop -/* 0B120 80B74AC0 0720FFFB */ bltz $t9, .L80B74AB0 +/* 0B120 80B74AC0 0720FFFB */ bltz $t9, .L80B74AB0 /* 0B124 80B74AC4 00000000 */ nop .L80B74AC8: /* 0B128 80B74AC8 3C0180B8 */ lui $at, %hi(D_80B7A678) ## $at = 80B80000 -/* 0B12C 80B74ACC A439A678 */ sh $t9, %lo(D_80B7A678)($at) +/* 0B12C 80B74ACC A439A678 */ sh $t9, %lo(D_80B7A678)($at) /* 0B130 80B74AD0 3C0280B8 */ lui $v0, %hi(D_80B7A678) ## $v0 = 80B80000 -/* 0B134 80B74AD4 9442A678 */ lhu $v0, %lo(D_80B7A678)($v0) +/* 0B134 80B74AD4 9442A678 */ lhu $v0, %lo(D_80B7A678)($v0) /* 0B138 80B74AD8 44CCF800 */ ctc1 $t4, $31 -/* 0B13C 80B74ADC 2841004B */ slti $at, $v0, 0x004B -/* 0B140 80B74AE0 14200004 */ bne $at, $zero, .L80B74AF4 +/* 0B13C 80B74ADC 2841004B */ slti $at, $v0, 0x004B +/* 0B140 80B74AE0 14200004 */ bne $at, $zero, .L80B74AF4 /* 0B144 80B74AE4 2409409F */ addiu $t1, $zero, 0x409F ## $t1 = 0000409F /* 0B148 80B74AE8 3C0180B8 */ lui $at, %hi(D_80B7E086) ## $at = 80B80000 -/* 0B14C 80B74AEC 10000032 */ beq $zero, $zero, .L80B74BB8 -/* 0B150 80B74AF0 A429E086 */ sh $t1, %lo(D_80B7E086)($at) +/* 0B14C 80B74AEC 10000032 */ beq $zero, $zero, .L80B74BB8 +/* 0B150 80B74AF0 A429E086 */ sh $t1, %lo(D_80B7E086)($at) .L80B74AF4: -/* 0B154 80B74AF4 28410032 */ slti $at, $v0, 0x0032 -/* 0B158 80B74AF8 14200004 */ bne $at, $zero, .L80B74B0C +/* 0B154 80B74AF4 28410032 */ slti $at, $v0, 0x0032 +/* 0B158 80B74AF8 14200004 */ bne $at, $zero, .L80B74B0C /* 0B15C 80B74AFC 240B4091 */ addiu $t3, $zero, 0x4091 ## $t3 = 00004091 /* 0B160 80B74B00 3C0180B8 */ lui $at, %hi(D_80B7E086) ## $at = 80B80000 -/* 0B164 80B74B04 1000002C */ beq $zero, $zero, .L80B74BB8 -/* 0B168 80B74B08 A42BE086 */ sh $t3, %lo(D_80B7E086)($at) +/* 0B164 80B74B04 1000002C */ beq $zero, $zero, .L80B74BB8 +/* 0B168 80B74B08 A42BE086 */ sh $t3, %lo(D_80B7E086)($at) .L80B74B0C: /* 0B16C 80B74B0C 240D4083 */ addiu $t5, $zero, 0x4083 ## $t5 = 00004083 /* 0B170 80B74B10 3C0180B8 */ lui $at, %hi(D_80B7E086) ## $at = 80B80000 -/* 0B174 80B74B14 10000028 */ beq $zero, $zero, .L80B74BB8 -/* 0B178 80B74B18 A42DE086 */ sh $t5, %lo(D_80B7E086)($at) +/* 0B174 80B74B14 10000028 */ beq $zero, $zero, .L80B74BB8 +/* 0B178 80B74B18 A42DE086 */ sh $t5, %lo(D_80B7E086)($at) /* 0B17C 80B74B1C C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC .L80B74B20: /* 0B180 80B74B20 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0B184 80B74B24 46000180 */ add.s $f6, $f0, $f0 +/* 0B184 80B74B24 46000180 */ add.s $f6, $f0, $f0 /* 0B188 80B74B28 444EF800 */ cfc1 $t6, $31 /* 0B18C 80B74B2C 44CFF800 */ ctc1 $t7, $31 /* 0B190 80B74B30 00000000 */ nop -/* 0B194 80B74B34 46003224 */ cvt.w.s $f8, $f6 +/* 0B194 80B74B34 46003224 */ cvt.w.s $f8, $f6 /* 0B198 80B74B38 444FF800 */ cfc1 $t7, $31 /* 0B19C 80B74B3C 00000000 */ nop /* 0B1A0 80B74B40 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 0B1A4 80B74B44 11E00012 */ beq $t7, $zero, .L80B74B90 +/* 0B1A4 80B74B44 11E00012 */ beq $t7, $zero, .L80B74B90 /* 0B1A8 80B74B48 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 0B1AC 80B74B4C 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 /* 0B1B0 80B74B50 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0B1B4 80B74B54 46083201 */ sub.s $f8, $f6, $f8 +/* 0B1B4 80B74B54 46083201 */ sub.s $f8, $f6, $f8 /* 0B1B8 80B74B58 44CFF800 */ ctc1 $t7, $31 /* 0B1BC 80B74B5C 00000000 */ nop -/* 0B1C0 80B74B60 46004224 */ cvt.w.s $f8, $f8 +/* 0B1C0 80B74B60 46004224 */ cvt.w.s $f8, $f8 /* 0B1C4 80B74B64 444FF800 */ cfc1 $t7, $31 /* 0B1C8 80B74B68 00000000 */ nop /* 0B1CC 80B74B6C 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 0B1D0 80B74B70 15E00005 */ bne $t7, $zero, .L80B74B88 +/* 0B1D0 80B74B70 15E00005 */ bne $t7, $zero, .L80B74B88 /* 0B1D4 80B74B74 00000000 */ nop -/* 0B1D8 80B74B78 440F4000 */ mfc1 $t7, $f8 +/* 0B1D8 80B74B78 440F4000 */ mfc1 $t7, $f8 /* 0B1DC 80B74B7C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0B1E0 80B74B80 10000007 */ beq $zero, $zero, .L80B74BA0 +/* 0B1E0 80B74B80 10000007 */ beq $zero, $zero, .L80B74BA0 /* 0B1E4 80B74B84 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 .L80B74B88: -/* 0B1E8 80B74B88 10000005 */ beq $zero, $zero, .L80B74BA0 +/* 0B1E8 80B74B88 10000005 */ beq $zero, $zero, .L80B74BA0 /* 0B1EC 80B74B8C 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF .L80B74B90: -/* 0B1F0 80B74B90 440F4000 */ mfc1 $t7, $f8 +/* 0B1F0 80B74B90 440F4000 */ mfc1 $t7, $f8 /* 0B1F4 80B74B94 00000000 */ nop -/* 0B1F8 80B74B98 05E0FFFB */ bltz $t7, .L80B74B88 +/* 0B1F8 80B74B98 05E0FFFB */ bltz $t7, .L80B74B88 /* 0B1FC 80B74B9C 00000000 */ nop .L80B74BA0: /* 0B200 80B74BA0 3C0180B8 */ lui $at, %hi(D_80B7A678) ## $at = 80B80000 -/* 0B204 80B74BA4 A42FA678 */ sh $t7, %lo(D_80B7A678)($at) +/* 0B204 80B74BA4 A42FA678 */ sh $t7, %lo(D_80B7A678)($at) /* 0B208 80B74BA8 44CEF800 */ ctc1 $t6, $31 /* 0B20C 80B74BAC 3C0180B8 */ lui $at, %hi(D_80B7E086) ## $at = 80B80000 /* 0B210 80B74BB0 24184099 */ addiu $t8, $zero, 0x4099 ## $t8 = 00004099 -/* 0B214 80B74BB4 A438E086 */ sh $t8, %lo(D_80B7E086)($at) +/* 0B214 80B74BB4 A438E086 */ sh $t8, %lo(D_80B7E086)($at) .L80B74BB8: /* 0B218 80B74BB8 A20001D5 */ sb $zero, 0x01D5($s0) ## 000001D5 -/* 0B21C 80B74BBC 8FA300E0 */ lw $v1, 0x00E0($sp) +/* 0B21C 80B74BBC 8FA300E0 */ lw $v1, 0x00E0($sp) /* 0B220 80B74BC0 240AC000 */ addiu $t2, $zero, 0xC000 ## $t2 = FFFFC000 .L80B74BC4: /* 0B224 80B74BC4 A60A0160 */ sh $t2, 0x0160($s0) ## 00000160 @@ -3800,199 +3800,199 @@ glabel L80B748A0 /* 0B260 80B74C00 A60200B4 */ sh $v0, 0x00B4($s0) ## 000000B4 /* 0B264 80B74C04 27A4010C */ addiu $a0, $sp, 0x010C ## $a0 = FFFFFFD4 /* 0B268 80B74C08 27A50100 */ addiu $a1, $sp, 0x0100 ## $a1 = FFFFFFC8 -/* 0B26C 80B74C0C E7A4010C */ swc1 $f4, 0x010C($sp) -/* 0B270 80B74C10 E7AA0110 */ swc1 $f10, 0x0110($sp) -/* 0B274 80B74C14 0C0346BD */ jal Matrix_MultVec3f -/* 0B278 80B74C18 E7A60114 */ swc1 $f6, 0x0114($sp) -/* 0B27C 80B74C1C 8FA900E0 */ lw $t1, 0x00E0($sp) -/* 0B280 80B74C20 C7A40100 */ lwc1 $f4, 0x0100($sp) -/* 0B284 80B74C24 4406A000 */ mfc1 $a2, $f20 +/* 0B26C 80B74C0C E7A4010C */ swc1 $f4, 0x010C($sp) +/* 0B270 80B74C10 E7AA0110 */ swc1 $f10, 0x0110($sp) +/* 0B274 80B74C14 0C0346BD */ jal Matrix_MultVec3f +/* 0B278 80B74C18 E7A60114 */ swc1 $f6, 0x0114($sp) +/* 0B27C 80B74C1C 8FA900E0 */ lw $t1, 0x00E0($sp) +/* 0B280 80B74C20 C7A40100 */ lwc1 $f4, 0x0100($sp) +/* 0B284 80B74C24 4406A000 */ mfc1 $a2, $f20 /* 0B288 80B74C28 C52809BC */ lwc1 $f8, 0x09BC($t1) ## 000009BC -/* 0B28C 80B74C2C 8FA40048 */ lw $a0, 0x0048($sp) +/* 0B28C 80B74C2C 8FA40048 */ lw $a0, 0x0048($sp) /* 0B290 80B74C30 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 0B294 80B74C34 46044280 */ add.s $f10, $f8, $f4 -/* 0B298 80B74C38 44055000 */ mfc1 $a1, $f10 +/* 0B294 80B74C34 46044280 */ add.s $f10, $f8, $f4 +/* 0B298 80B74C38 44055000 */ mfc1 $a1, $f10 /* 0B29C 80B74C3C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0B2A0 80B74C40 00000000 */ nop -/* 0B2A4 80B74C44 8FAB00E0 */ lw $t3, 0x00E0($sp) -/* 0B2A8 80B74C48 C7A80104 */ lwc1 $f8, 0x0104($sp) -/* 0B2AC 80B74C4C 4406A000 */ mfc1 $a2, $f20 +/* 0B2A4 80B74C44 8FAB00E0 */ lw $t3, 0x00E0($sp) +/* 0B2A8 80B74C48 C7A80104 */ lwc1 $f8, 0x0104($sp) +/* 0B2AC 80B74C4C 4406A000 */ mfc1 $a2, $f20 /* 0B2B0 80B74C50 C56609C0 */ lwc1 $f6, 0x09C0($t3) ## 000009C0 -/* 0B2B4 80B74C54 8FA40044 */ lw $a0, 0x0044($sp) +/* 0B2B4 80B74C54 8FA40044 */ lw $a0, 0x0044($sp) /* 0B2B8 80B74C58 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 0B2BC 80B74C5C 46083100 */ add.s $f4, $f6, $f8 -/* 0B2C0 80B74C60 44052000 */ mfc1 $a1, $f4 +/* 0B2BC 80B74C5C 46083100 */ add.s $f4, $f6, $f8 +/* 0B2C0 80B74C60 44052000 */ mfc1 $a1, $f4 /* 0B2C4 80B74C64 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0B2C8 80B74C68 00000000 */ nop -/* 0B2CC 80B74C6C 8FAD00E0 */ lw $t5, 0x00E0($sp) -/* 0B2D0 80B74C70 C7A60108 */ lwc1 $f6, 0x0108($sp) -/* 0B2D4 80B74C74 4406A000 */ mfc1 $a2, $f20 +/* 0B2CC 80B74C6C 8FAD00E0 */ lw $t5, 0x00E0($sp) +/* 0B2D0 80B74C70 C7A60108 */ lwc1 $f6, 0x0108($sp) +/* 0B2D4 80B74C74 4406A000 */ mfc1 $a2, $f20 /* 0B2D8 80B74C78 C5AA09C4 */ lwc1 $f10, 0x09C4($t5) ## 000009C4 -/* 0B2DC 80B74C7C 8FA4003C */ lw $a0, 0x003C($sp) +/* 0B2DC 80B74C7C 8FA4003C */ lw $a0, 0x003C($sp) /* 0B2E0 80B74C80 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 0B2E4 80B74C84 46065200 */ add.s $f8, $f10, $f6 -/* 0B2E8 80B74C88 44054000 */ mfc1 $a1, $f8 +/* 0B2E4 80B74C84 46065200 */ add.s $f8, $f10, $f6 +/* 0B2E8 80B74C88 44054000 */ mfc1 $a1, $f8 /* 0B2EC 80B74C8C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0B2F0 80B74C90 00000000 */ nop /* 0B2F4 80B74C94 3C01433C */ lui $at, 0x433C ## $at = 433C0000 /* 0B2F8 80B74C98 44812000 */ mtc1 $at, $f4 ## $f4 = 188.00 /* 0B2FC 80B74C9C 3C0180B8 */ lui $at, %hi(D_80B7E144) ## $at = 80B80000 -/* 0B300 80B74CA0 E424E144 */ swc1 $f4, %lo(D_80B7E144)($at) +/* 0B300 80B74CA0 E424E144 */ swc1 $f4, %lo(D_80B7E144)($at) /* 0B304 80B74CA4 860E017A */ lh $t6, 0x017A($s0) ## 0000017A -/* 0B308 80B74CA8 29C10033 */ slti $at, $t6, 0x0033 -/* 0B30C 80B74CAC 10200083 */ beq $at, $zero, .L80B74EBC +/* 0B308 80B74CA8 29C10033 */ slti $at, $t6, 0x0033 +/* 0B30C 80B74CAC 10200083 */ beq $at, $zero, .L80B74EBC /* 0B310 80B74CB0 00000000 */ nop /* 0B314 80B74CB4 920201D5 */ lbu $v0, 0x01D5($s0) ## 000001D5 -/* 0B318 80B74CB8 10400005 */ beq $v0, $zero, .L80B74CD0 +/* 0B318 80B74CB8 10400005 */ beq $v0, $zero, .L80B74CD0 /* 0B31C 80B74CBC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0B320 80B74CC0 5041005C */ beql $v0, $at, .L80B74E34 +/* 0B320 80B74CC0 5041005C */ beql $v0, $at, .L80B74E34 /* 0B324 80B74CC4 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 0B328 80B74CC8 1000007C */ beq $zero, $zero, .L80B74EBC +/* 0B328 80B74CC8 1000007C */ beq $zero, $zero, .L80B74EBC /* 0B32C 80B74CCC 00000000 */ nop .L80B74CD0: /* 0B330 80B74CD0 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 0B334 80B74CD4 0C042F6F */ jal func_8010BDBC -/* 0B338 80B74CD8 AFA4004C */ sw $a0, 0x004C($sp) +/* 0B334 80B74CD4 0C042F6F */ jal func_8010BDBC +/* 0B338 80B74CD8 AFA4004C */ sw $a0, 0x004C($sp) /* 0B33C 80B74CDC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0B340 80B74CE0 10410005 */ beq $v0, $at, .L80B74CF8 -/* 0B344 80B74CE4 8FA4004C */ lw $a0, 0x004C($sp) -/* 0B348 80B74CE8 0C042F6F */ jal func_8010BDBC +/* 0B340 80B74CE0 10410005 */ beq $v0, $at, .L80B74CF8 +/* 0B344 80B74CE4 8FA4004C */ lw $a0, 0x004C($sp) +/* 0B348 80B74CE8 0C042F6F */ jal func_8010BDBC /* 0B34C 80B74CEC 00000000 */ nop -/* 0B350 80B74CF0 14400072 */ bne $v0, $zero, .L80B74EBC +/* 0B350 80B74CF0 14400072 */ bne $v0, $zero, .L80B74EBC /* 0B354 80B74CF4 00000000 */ nop .L80B74CF8: -/* 0B358 80B74CF8 0C041AF2 */ jal func_80106BC8 +/* 0B358 80B74CF8 0C041AF2 */ jal func_80106BC8 /* 0B35C 80B74CFC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0B360 80B74D00 1040006E */ beq $v0, $zero, .L80B74EBC +/* 0B360 80B74D00 1040006E */ beq $v0, $zero, .L80B74EBC /* 0B364 80B74D04 00000000 */ nop -/* 0B368 80B74D08 0C041B33 */ jal func_80106CCC +/* 0B368 80B74D08 0C041B33 */ jal func_80106CCC /* 0B36C 80B74D0C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B370 80B74D10 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 0B374 80B74D14 01F17821 */ addu $t7, $t7, $s1 +/* 0B374 80B74D14 01F17821 */ addu $t7, $t7, $s1 /* 0B378 80B74D18 91EF04BD */ lbu $t7, 0x04BD($t7) ## 000104BD -/* 0B37C 80B74D1C 15E0003F */ bne $t7, $zero, .L80B74E1C +/* 0B37C 80B74D1C 15E0003F */ bne $t7, $zero, .L80B74E1C /* 0B380 80B74D20 3C0180B8 */ lui $at, %hi(D_80B7A670) ## $at = 80B80000 -/* 0B384 80B74D24 C420A670 */ lwc1 $f0, %lo(D_80B7A670)($at) +/* 0B384 80B74D24 C420A670 */ lwc1 $f0, %lo(D_80B7A670)($at) /* 0B388 80B74D28 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0B38C 80B74D2C 00000000 */ nop -/* 0B390 80B74D30 46005032 */ c.eq.s $f10, $f0 +/* 0B390 80B74D30 46005032 */ c.eq.s $f10, $f0 /* 0B394 80B74D34 00000000 */ nop -/* 0B398 80B74D38 45020010 */ bc1fl .L80B74D7C +/* 0B398 80B74D38 45020010 */ bc1fl .L80B74D7C /* 0B39C 80B74D3C 920C0150 */ lbu $t4, 0x0150($s0) ## 00000150 /* 0B3A0 80B74D40 C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 0B3A4 80B74D44 3C0180B8 */ lui $at, %hi(D_80B7A670) ## $at = 80B80000 /* 0B3A8 80B74D48 3C0A80B8 */ lui $t2, %hi(D_80B7E0B6) ## $t2 = 80B80000 -/* 0B3AC 80B74D4C E426A670 */ swc1 $f6, %lo(D_80B7A670)($at) +/* 0B3AC 80B74D4C E426A670 */ swc1 $f6, %lo(D_80B7A670)($at) /* 0B3B0 80B74D50 92180150 */ lbu $t8, 0x0150($s0) ## 00000150 /* 0B3B4 80B74D54 3C0180B8 */ lui $at, %hi(D_80B7E07C) ## $at = 80B80000 -/* 0B3B8 80B74D58 914AE0B6 */ lbu $t2, %lo(D_80B7E0B6)($t2) -/* 0B3BC 80B74D5C A038E07C */ sb $t8, %lo(D_80B7E07C)($at) +/* 0B3B8 80B74D58 914AE0B6 */ lbu $t2, %lo(D_80B7E0B6)($t2) +/* 0B3BC 80B74D5C A038E07C */ sb $t8, %lo(D_80B7E07C)($at) /* 0B3C0 80B74D60 3C0180B8 */ lui $at, %hi(D_80B7E07E) ## $at = 80B80000 /* 0B3C4 80B74D64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0B3C8 80B74D68 0C00B55C */ jal Actor_Kill - -/* 0B3CC 80B74D6C A02AE07E */ sb $t2, %lo(D_80B7E07E)($at) -/* 0B3D0 80B74D70 1000002B */ beq $zero, $zero, .L80B74E20 + +/* 0B3CC 80B74D6C A02AE07E */ sb $t2, %lo(D_80B7E07E)($at) +/* 0B3D0 80B74D70 1000002B */ beq $zero, $zero, .L80B74E20 /* 0B3D4 80B74D74 920F01D5 */ lbu $t7, 0x01D5($s0) ## 000001D5 /* 0B3D8 80B74D78 920C0150 */ lbu $t4, 0x0150($s0) ## 00000150 .L80B74D7C: -/* 0B3DC 80B74D7C 15800019 */ bne $t4, $zero, .L80B74DE4 +/* 0B3DC 80B74D7C 15800019 */ bne $t4, $zero, .L80B74DE4 /* 0B3E0 80B74D80 3C1980B8 */ lui $t9, %hi(D_80B7E07C) ## $t9 = 80B80000 -/* 0B3E4 80B74D84 9339E07C */ lbu $t9, %lo(D_80B7E07C)($t9) -/* 0B3E8 80B74D88 57200017 */ bnel $t9, $zero, .L80B74DE8 +/* 0B3E4 80B74D84 9339E07C */ lbu $t9, %lo(D_80B7E07C)($t9) +/* 0B3E8 80B74D88 57200017 */ bnel $t9, $zero, .L80B74DE8 /* 0B3EC 80B74D8C C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 0B3F0 80B74D90 C60801AC */ lwc1 $f8, 0x01AC($s0) ## 000001AC -/* 0B3F4 80B74D94 4600028D */ trunc.w.s $f10, $f0 -/* 0B3F8 80B74D98 4600410D */ trunc.w.s $f4, $f8 -/* 0B3FC 80B74D9C 44185000 */ mfc1 $t8, $f10 -/* 0B400 80B74DA0 440B2000 */ mfc1 $t3, $f4 -/* 0B404 80B74DA4 00185400 */ sll $t2, $t8, 16 -/* 0B408 80B74DA8 000A6403 */ sra $t4, $t2, 16 -/* 0B40C 80B74DAC 000B6C00 */ sll $t5, $t3, 16 -/* 0B410 80B74DB0 000D7403 */ sra $t6, $t5, 16 -/* 0B414 80B74DB4 01CC082A */ slt $at, $t6, $t4 -/* 0B418 80B74DB8 1020000A */ beq $at, $zero, .L80B74DE4 +/* 0B3F4 80B74D94 4600028D */ trunc.w.s $f10, $f0 +/* 0B3F8 80B74D98 4600410D */ trunc.w.s $f4, $f8 +/* 0B3FC 80B74D9C 44185000 */ mfc1 $t8, $f10 +/* 0B400 80B74DA0 440B2000 */ mfc1 $t3, $f4 +/* 0B404 80B74DA4 00185400 */ sll $t2, $t8, 16 +/* 0B408 80B74DA8 000A6403 */ sra $t4, $t2, 16 +/* 0B40C 80B74DAC 000B6C00 */ sll $t5, $t3, 16 +/* 0B410 80B74DB0 000D7403 */ sra $t6, $t5, 16 +/* 0B414 80B74DB4 01CC082A */ slt $at, $t6, $t4 +/* 0B418 80B74DB8 1020000A */ beq $at, $zero, .L80B74DE4 /* 0B41C 80B74DBC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 0B420 80B74DC0 2409003C */ addiu $t1, $zero, 0x003C ## $t1 = 0000003C /* 0B424 80B74DC4 A21901D5 */ sb $t9, 0x01D5($s0) ## 000001D5 /* 0B428 80B74DC8 A609017A */ sh $t1, 0x017A($s0) ## 0000017A /* 0B42C 80B74DCC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B430 80B74DD0 24054098 */ addiu $a1, $zero, 0x4098 ## $a1 = 00004098 -/* 0B434 80B74DD4 0C042DA0 */ jal func_8010B680 +/* 0B434 80B74DD4 0C042DA0 */ jal func_8010B680 /* 0B438 80B74DD8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0B43C 80B74DDC 10000010 */ beq $zero, $zero, .L80B74E20 +/* 0B43C 80B74DDC 10000010 */ beq $zero, $zero, .L80B74E20 /* 0B440 80B74DE0 920F01D5 */ lbu $t7, 0x01D5($s0) ## 000001D5 .L80B74DE4: /* 0B444 80B74DE4 C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC .L80B74DE8: /* 0B448 80B74DE8 3C0180B8 */ lui $at, %hi(D_80B7A670) ## $at = 80B80000 /* 0B44C 80B74DEC 3C0280B8 */ lui $v0, %hi(D_80B7E07C) ## $v0 = 80B80000 -/* 0B450 80B74DF0 E426A670 */ swc1 $f6, %lo(D_80B7A670)($at) +/* 0B450 80B74DF0 E426A670 */ swc1 $f6, %lo(D_80B7A670)($at) /* 0B454 80B74DF4 920B0150 */ lbu $t3, 0x0150($s0) ## 00000150 /* 0B458 80B74DF8 3C0D80B8 */ lui $t5, %hi(D_80B7E0B6) ## $t5 = 80B80000 -/* 0B45C 80B74DFC 9042E07C */ lbu $v0, %lo(D_80B7E07C)($v0) -/* 0B460 80B74E00 91ADE0B6 */ lbu $t5, %lo(D_80B7E0B6)($t5) +/* 0B45C 80B74DFC 9042E07C */ lbu $v0, %lo(D_80B7E07C)($v0) +/* 0B460 80B74E00 91ADE0B6 */ lbu $t5, %lo(D_80B7E0B6)($t5) /* 0B464 80B74E04 3C0180B8 */ lui $at, %hi(D_80B7E07C) ## $at = 80B80000 -/* 0B468 80B74E08 A02BE07C */ sb $t3, %lo(D_80B7E07C)($at) +/* 0B468 80B74E08 A02BE07C */ sb $t3, %lo(D_80B7E07C)($at) /* 0B46C 80B74E0C 3C0180B8 */ lui $at, %hi(D_80B7E07E) ## $at = 80B80000 -/* 0B470 80B74E10 A02DE07E */ sb $t5, %lo(D_80B7E07E)($at) +/* 0B470 80B74E10 A02DE07E */ sb $t5, %lo(D_80B7E07E)($at) /* 0B474 80B74E14 E60001AC */ swc1 $f0, 0x01AC($s0) ## 000001AC /* 0B478 80B74E18 A2020150 */ sb $v0, 0x0150($s0) ## 00000150 .L80B74E1C: /* 0B47C 80B74E1C 920F01D5 */ lbu $t7, 0x01D5($s0) ## 000001D5 .L80B74E20: -/* 0B480 80B74E20 15E00026 */ bne $t7, $zero, .L80B74EBC +/* 0B480 80B74E20 15E00026 */ bne $t7, $zero, .L80B74EBC /* 0B484 80B74E24 3C0180B8 */ lui $at, %hi(D_80B7A694) ## $at = 80B80000 -/* 0B488 80B74E28 10000024 */ beq $zero, $zero, .L80B74EBC -/* 0B48C 80B74E2C A420A694 */ sh $zero, %lo(D_80B7A694)($at) +/* 0B488 80B74E28 10000024 */ beq $zero, $zero, .L80B74EBC +/* 0B48C 80B74E2C A420A694 */ sh $zero, %lo(D_80B7A694)($at) /* 0B490 80B74E30 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 .L80B74E34: -/* 0B494 80B74E34 0C042F6F */ jal func_8010BDBC -/* 0B498 80B74E38 AFA4004C */ sw $a0, 0x004C($sp) +/* 0B494 80B74E34 0C042F6F */ jal func_8010BDBC +/* 0B498 80B74E38 AFA4004C */ sw $a0, 0x004C($sp) /* 0B49C 80B74E3C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0B4A0 80B74E40 10410005 */ beq $v0, $at, .L80B74E58 -/* 0B4A4 80B74E44 8FA4004C */ lw $a0, 0x004C($sp) -/* 0B4A8 80B74E48 0C042F6F */ jal func_8010BDBC +/* 0B4A0 80B74E40 10410005 */ beq $v0, $at, .L80B74E58 +/* 0B4A4 80B74E44 8FA4004C */ lw $a0, 0x004C($sp) +/* 0B4A8 80B74E48 0C042F6F */ jal func_8010BDBC /* 0B4AC 80B74E4C 00000000 */ nop -/* 0B4B0 80B74E50 1440001A */ bne $v0, $zero, .L80B74EBC +/* 0B4B0 80B74E50 1440001A */ bne $v0, $zero, .L80B74EBC /* 0B4B4 80B74E54 00000000 */ nop .L80B74E58: -/* 0B4B8 80B74E58 0C041AF2 */ jal func_80106BC8 +/* 0B4B8 80B74E58 0C041AF2 */ jal func_80106BC8 /* 0B4BC 80B74E5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0B4C0 80B74E60 10400016 */ beq $v0, $zero, .L80B74EBC +/* 0B4C0 80B74E60 10400016 */ beq $v0, $zero, .L80B74EBC /* 0B4C4 80B74E64 00000000 */ nop -/* 0B4C8 80B74E68 0C041B33 */ jal func_80106CCC +/* 0B4C8 80B74E68 0C041B33 */ jal func_80106CCC /* 0B4CC 80B74E6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B4D0 80B74E70 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 0B4D4 80B74E74 0311C021 */ addu $t8, $t8, $s1 +/* 0B4D4 80B74E74 0311C021 */ addu $t8, $t8, $s1 /* 0B4D8 80B74E78 931804BD */ lbu $t8, 0x04BD($t8) ## 000104BD -/* 0B4DC 80B74E7C 1300000D */ beq $t8, $zero, .L80B74EB4 +/* 0B4DC 80B74E7C 1300000D */ beq $t8, $zero, .L80B74EB4 /* 0B4E0 80B74E80 00000000 */ nop /* 0B4E4 80B74E84 C60801AC */ lwc1 $f8, 0x01AC($s0) ## 000001AC /* 0B4E8 80B74E88 3C0180B8 */ lui $at, %hi(D_80B7A670) ## $at = 80B80000 /* 0B4EC 80B74E8C 3C0A80B8 */ lui $t2, %hi(D_80B7E0B6) ## $t2 = 80B80000 -/* 0B4F0 80B74E90 C420A670 */ lwc1 $f0, %lo(D_80B7A670)($at) -/* 0B4F4 80B74E94 914AE0B6 */ lbu $t2, %lo(D_80B7E0B6)($t2) +/* 0B4F0 80B74E90 C420A670 */ lwc1 $f0, %lo(D_80B7A670)($at) +/* 0B4F4 80B74E94 914AE0B6 */ lbu $t2, %lo(D_80B7E0B6)($t2) /* 0B4F8 80B74E98 3C0280B8 */ lui $v0, %hi(D_80B7E07C) ## $v0 = 80B80000 -/* 0B4FC 80B74E9C E428A670 */ swc1 $f8, %lo(D_80B7A670)($at) -/* 0B500 80B74EA0 9042E07C */ lbu $v0, %lo(D_80B7E07C)($v0) +/* 0B4FC 80B74E9C E428A670 */ swc1 $f8, %lo(D_80B7A670)($at) +/* 0B500 80B74EA0 9042E07C */ lbu $v0, %lo(D_80B7E07C)($v0) /* 0B504 80B74EA4 3C0180B8 */ lui $at, %hi(D_80B7E07E) ## $at = 80B80000 -/* 0B508 80B74EA8 A02AE07E */ sb $t2, %lo(D_80B7E07E)($at) +/* 0B508 80B74EA8 A02AE07E */ sb $t2, %lo(D_80B7E07E)($at) /* 0B50C 80B74EAC E60001AC */ swc1 $f0, 0x01AC($s0) ## 000001AC /* 0B510 80B74EB0 A2020150 */ sb $v0, 0x0150($s0) ## 00000150 .L80B74EB4: /* 0B514 80B74EB4 3C0180B8 */ lui $at, %hi(D_80B7A694) ## $at = 80B80000 -/* 0B518 80B74EB8 A420A694 */ sh $zero, %lo(D_80B7A694)($at) +/* 0B518 80B74EB8 A420A694 */ sh $zero, %lo(D_80B7A694)($at) .L80B74EBC: /* 0B51C 80B74EBC 3C0E80B8 */ lui $t6, %hi(D_80B7A694) ## $t6 = 80B80000 -/* 0B520 80B74EC0 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) -/* 0B524 80B74EC4 55C000ED */ bnel $t6, $zero, .L80B7527C +/* 0B520 80B74EC0 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) +/* 0B524 80B74EC4 55C000ED */ bnel $t6, $zero, .L80B7527C /* 0B528 80B74EC8 8604015C */ lh $a0, 0x015C($s0) ## 0000015C /* 0B52C 80B74ECC 8E0C0130 */ lw $t4, 0x0130($s0) ## 00000130 -/* 0B530 80B74ED0 51800036 */ beql $t4, $zero, .L80B74FAC +/* 0B530 80B74ED0 51800036 */ beql $t4, $zero, .L80B74FAC /* 0B534 80B74ED4 3C014402 */ lui $at, 0x4402 ## $at = 44020000 /* 0B538 80B74ED8 A600015A */ sh $zero, 0x015A($s0) ## 0000015A /* 0B53C 80B74EDC 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 @@ -4009,27 +4009,27 @@ glabel L80B748A0 /* 0B568 80B74F08 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 /* 0B56C 80B74F0C A6190158 */ sh $t9, 0x0158($s0) ## 00000158 /* 0B570 80B74F10 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 -/* 0B574 80B74F14 AFA4004C */ sw $a0, 0x004C($sp) -/* 0B578 80B74F18 0C0295BC */ jal func_800A56F0 +/* 0B574 80B74F14 AFA4004C */ sw $a0, 0x004C($sp) +/* 0B578 80B74F18 0C0295BC */ jal SkelAnime_Free /* 0B57C 80B74F1C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0B580 80B74F20 920D0150 */ lbu $t5, 0x0150($s0) ## 00000150 -/* 0B584 80B74F24 15A00011 */ bne $t5, $zero, .L80B74F6C +/* 0B584 80B74F24 15A00011 */ bne $t5, $zero, .L80B74F6C /* 0B588 80B74F28 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0B58C 80B74F2C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0B590 80B74F30 24E7007C */ addiu $a3, $a3, 0x007C ## $a3 = 0600007C /* 0B594 80B74F34 24C629C0 */ addiu $a2, $a2, 0x29C0 ## $a2 = 060029C0 /* 0B598 80B74F38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0B59C 80B74F3C 8FA5004C */ lw $a1, 0x004C($sp) -/* 0B5A0 80B74F40 AFA00010 */ sw $zero, 0x0010($sp) -/* 0B5A4 80B74F44 AFA00014 */ sw $zero, 0x0014($sp) -/* 0B5A8 80B74F48 0C0291BE */ jal func_800A46F8 -/* 0B5AC 80B74F4C AFA00018 */ sw $zero, 0x0018($sp) +/* 0B59C 80B74F3C 8FA5004C */ lw $a1, 0x004C($sp) +/* 0B5A0 80B74F40 AFA00010 */ sw $zero, 0x0010($sp) +/* 0B5A4 80B74F44 AFA00014 */ sw $zero, 0x0014($sp) +/* 0B5A8 80B74F48 0C0291BE */ jal SkelAnime_InitSV +/* 0B5AC 80B74F4C AFA00018 */ sw $zero, 0x0018($sp) /* 0B5B0 80B74F50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0B5B4 80B74F54 24A5007C */ addiu $a1, $a1, 0x007C ## $a1 = 0600007C -/* 0B5B8 80B74F58 8FA4004C */ lw $a0, 0x004C($sp) -/* 0B5BC 80B74F5C 0C0294D3 */ jal func_800A534C +/* 0B5B8 80B74F58 8FA4004C */ lw $a0, 0x004C($sp) +/* 0B5BC 80B74F5C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0B5C0 80B74F60 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 0B5C4 80B74F64 10000011 */ beq $zero, $zero, .L80B74FAC +/* 0B5C4 80B74F64 10000011 */ beq $zero, $zero, .L80B74FAC /* 0B5C8 80B74F68 3C014402 */ lui $at, 0x4402 ## $at = 44020000 .L80B74F6C: /* 0B5CC 80B74F6C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -4037,54 +4037,54 @@ glabel L80B748A0 /* 0B5D4 80B74F74 24E7CFE0 */ addiu $a3, $a3, 0xCFE0 ## $a3 = 0600CFE0 /* 0B5D8 80B74F78 24C61058 */ addiu $a2, $a2, 0x1058 ## $a2 = 06011058 /* 0B5DC 80B74F7C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0B5E0 80B74F80 8FA5004C */ lw $a1, 0x004C($sp) -/* 0B5E4 80B74F84 AFA00010 */ sw $zero, 0x0010($sp) -/* 0B5E8 80B74F88 AFA00014 */ sw $zero, 0x0014($sp) -/* 0B5EC 80B74F8C 0C0291BE */ jal func_800A46F8 -/* 0B5F0 80B74F90 AFA00018 */ sw $zero, 0x0018($sp) +/* 0B5E0 80B74F80 8FA5004C */ lw $a1, 0x004C($sp) +/* 0B5E4 80B74F84 AFA00010 */ sw $zero, 0x0010($sp) +/* 0B5E8 80B74F88 AFA00014 */ sw $zero, 0x0014($sp) +/* 0B5EC 80B74F8C 0C0291BE */ jal SkelAnime_InitSV +/* 0B5F0 80B74F90 AFA00018 */ sw $zero, 0x0018($sp) /* 0B5F4 80B74F94 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0B5F8 80B74F98 24A5CFE0 */ addiu $a1, $a1, 0xCFE0 ## $a1 = 0600CFE0 -/* 0B5FC 80B74F9C 8FA4004C */ lw $a0, 0x004C($sp) -/* 0B600 80B74FA0 0C0294D3 */ jal func_800A534C +/* 0B5FC 80B74F9C 8FA4004C */ lw $a0, 0x004C($sp) +/* 0B600 80B74FA0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate /* 0B604 80B74FA4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0B608 80B74FA8 3C014402 */ lui $at, 0x4402 ## $at = 44020000 .L80B74FAC: /* 0B60C 80B74FAC 44815000 */ mtc1 $at, $f10 ## $f10 = 520.00 /* 0B610 80B74FB0 3C0180B8 */ lui $at, %hi(D_80B7E148) ## $at = 80B80000 /* 0B614 80B74FB4 3C04100A */ lui $a0, 0x100A ## $a0 = 100A0000 -/* 0B618 80B74FB8 E42AE148 */ swc1 $f10, %lo(D_80B7E148)($at) +/* 0B618 80B74FB8 E42AE148 */ swc1 $f10, %lo(D_80B7E148)($at) /* 0B61C 80B74FBC 3C014343 */ lui $at, 0x4343 ## $at = 43430000 /* 0B620 80B74FC0 44813000 */ mtc1 $at, $f6 ## $f6 = 195.00 /* 0B624 80B74FC4 3C0180B8 */ lui $at, %hi(D_80B7E144) ## $at = 80B80000 /* 0B628 80B74FC8 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100A00FF /* 0B62C 80B74FCC 0C03E803 */ jal Audio_SetBGM - -/* 0B630 80B74FD0 E426E144 */ swc1 $f6, %lo(D_80B7E144)($at) + +/* 0B630 80B74FD0 E426E144 */ swc1 $f6, %lo(D_80B7E144)($at) /* 0B634 80B74FD4 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 0B638 80B74FD8 3C0180B8 */ lui $at, %hi(D_80B7E0A6) ## $at = 80B80000 -/* 0B63C 80B74FDC A42FE0A6 */ sh $t7, %lo(D_80B7E0A6)($at) +/* 0B63C 80B74FDC A42FE0A6 */ sh $t7, %lo(D_80B7E0A6)($at) /* 0B640 80B74FE0 3C0180B8 */ lui $at, %hi(D_80B7A6CC) ## $at = 80B80000 /* 0B644 80B74FE4 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 0B648 80B74FE8 100000A3 */ beq $zero, $zero, .L80B75278 -/* 0B64C 80B74FEC A038A6CC */ sb $t8, %lo(D_80B7A6CC)($at) +/* 0B648 80B74FE8 100000A3 */ beq $zero, $zero, .L80B75278 +/* 0B64C 80B74FEC A038A6CC */ sb $t8, %lo(D_80B7A6CC)($at) glabel L80B74FF0 /* 0B650 80B74FF0 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 /* 0B654 80B74FF4 A20A0151 */ sb $t2, 0x0151($s0) ## 00000151 /* 0B658 80B74FF8 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 0B65C 80B74FFC A7AE0134 */ sh $t6, 0x0134($sp) +/* 0B65C 80B74FFC A7AE0134 */ sh $t6, 0x0134($sp) /* 0B660 80B75000 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 0B664 80B75004 3C014640 */ lui $at, 0x4640 ## $at = 46400000 /* 0B668 80B75008 44814000 */ mtc1 $at, $f8 ## $f8 = 12288.00 -/* 0B66C 80B7500C 28410068 */ slti $at, $v0, 0x0068 -/* 0B670 80B75010 10200013 */ beq $at, $zero, .L80B75060 +/* 0B66C 80B7500C 28410068 */ slti $at, $v0, 0x0068 +/* 0B670 80B75010 10200013 */ beq $at, $zero, .L80B75060 /* 0B674 80B75014 E60801B0 */ swc1 $f8, 0x01B0($s0) ## 000001B0 -/* 0B678 80B75018 000260C0 */ sll $t4, $v0, 3 -/* 0B67C 80B7501C 01826021 */ addu $t4, $t4, $v0 -/* 0B680 80B75020 000C60C0 */ sll $t4, $t4, 3 +/* 0B678 80B75018 000260C0 */ sll $t4, $v0, 3 +/* 0B67C 80B7501C 01826021 */ addu $t4, $t4, $v0 +/* 0B680 80B75020 000C60C0 */ sll $t4, $t4, 3 /* 0B684 80B75024 3C0980B8 */ lui $t1, %hi(D_80B81FC8) ## $t1 = 80B80000 /* 0B688 80B75028 25291FC8 */ addiu $t1, $t1, %lo(D_80B81FC8) ## $t1 = 80B81FC8 /* 0B68C 80B7502C 2599E3E4 */ addiu $t9, $t4, 0xE3E4 ## $t9 = FFFFE3E4 -/* 0B690 80B75030 03295821 */ addu $t3, $t9, $t1 +/* 0B690 80B75030 03295821 */ addu $t3, $t9, $t1 /* 0B694 80B75034 8D6F0000 */ lw $t7, 0x0000($t3) ## 00000000 /* 0B698 80B75038 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0B69C 80B7503C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 @@ -4094,18 +4094,18 @@ glabel L80B74FF0 /* 0B6AC 80B7504C AE0D01B8 */ sw $t5, 0x01B8($s0) ## 000001B8 /* 0B6B0 80B75050 8D6F0008 */ lw $t7, 0x0008($t3) ## 00000008 /* 0B6B4 80B75054 AE0F01BC */ sw $t7, 0x01BC($s0) ## 000001BC -/* 0B6B8 80B75058 10000026 */ beq $zero, $zero, .L80B750F4 -/* 0B6BC 80B7505C E424A898 */ swc1 $f4, %lo(D_80B7A898)($at) +/* 0B6B8 80B75058 10000026 */ beq $zero, $zero, .L80B750F4 +/* 0B6BC 80B7505C E424A898 */ swc1 $f4, %lo(D_80B7A898)($at) .L80B75060: -/* 0B6C0 80B75060 2841006C */ slti $at, $v0, 0x006C -/* 0B6C4 80B75064 10200012 */ beq $at, $zero, .L80B750B0 -/* 0B6C8 80B75068 0002C0C0 */ sll $t8, $v0, 3 -/* 0B6CC 80B7506C 0302C021 */ addu $t8, $t8, $v0 -/* 0B6D0 80B75070 0018C0C0 */ sll $t8, $t8, 3 +/* 0B6C0 80B75060 2841006C */ slti $at, $v0, 0x006C +/* 0B6C4 80B75064 10200012 */ beq $at, $zero, .L80B750B0 +/* 0B6C8 80B75068 0002C0C0 */ sll $t8, $v0, 3 +/* 0B6CC 80B7506C 0302C021 */ addu $t8, $t8, $v0 +/* 0B6D0 80B75070 0018C0C0 */ sll $t8, $t8, 3 /* 0B6D4 80B75074 3C0E80B8 */ lui $t6, %hi(D_80B81FC8) ## $t6 = 80B80000 /* 0B6D8 80B75078 25CE1FC8 */ addiu $t6, $t6, %lo(D_80B81FC8) ## $t6 = 80B81FC8 /* 0B6DC 80B7507C 270AE864 */ addiu $t2, $t8, 0xE864 ## $t2 = FFFFE867 -/* 0B6E0 80B75080 014E6021 */ addu $t4, $t2, $t6 +/* 0B6E0 80B75080 014E6021 */ addu $t4, $t2, $t6 /* 0B6E4 80B75084 8D890000 */ lw $t1, 0x0000($t4) ## 00000000 /* 0B6E8 80B75088 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 0B6EC 80B7508C 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 @@ -4115,16 +4115,16 @@ glabel L80B74FF0 /* 0B6FC 80B7509C AE1901B8 */ sw $t9, 0x01B8($s0) ## 000001B8 /* 0B700 80B750A0 8D890008 */ lw $t1, 0x0008($t4) ## 00000008 /* 0B704 80B750A4 AE0901BC */ sw $t1, 0x01BC($s0) ## 000001BC -/* 0B708 80B750A8 10000012 */ beq $zero, $zero, .L80B750F4 -/* 0B70C 80B750AC E42AA898 */ swc1 $f10, %lo(D_80B7A898)($at) +/* 0B708 80B750A8 10000012 */ beq $zero, $zero, .L80B750F4 +/* 0B70C 80B750AC E42AA898 */ swc1 $f10, %lo(D_80B7A898)($at) .L80B750B0: -/* 0B710 80B750B0 000258C0 */ sll $t3, $v0, 3 -/* 0B714 80B750B4 01625821 */ addu $t3, $t3, $v0 -/* 0B718 80B750B8 000B58C0 */ sll $t3, $t3, 3 +/* 0B710 80B750B0 000258C0 */ sll $t3, $v0, 3 +/* 0B714 80B750B4 01625821 */ addu $t3, $t3, $v0 +/* 0B718 80B750B8 000B58C0 */ sll $t3, $t3, 3 /* 0B71C 80B750BC 3C0F80B8 */ lui $t7, %hi(D_80B81FC8) ## $t7 = 80B80000 /* 0B720 80B750C0 25EF1FC8 */ addiu $t7, $t7, %lo(D_80B81FC8) ## $t7 = 80B81FC8 /* 0B724 80B750C4 256DECE4 */ addiu $t5, $t3, 0xECE4 ## $t5 = FFFFECE4 -/* 0B728 80B750C8 01AFC021 */ addu $t8, $t5, $t7 +/* 0B728 80B750C8 01AFC021 */ addu $t8, $t5, $t7 /* 0B72C 80B750CC 8F0E0000 */ lw $t6, 0x0000($t8) ## 00000003 /* 0B730 80B750D0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0B734 80B750D4 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 @@ -4134,105 +4134,105 @@ glabel L80B74FF0 /* 0B744 80B750E4 AE0A01B8 */ sw $t2, 0x01B8($s0) ## 000001B8 /* 0B748 80B750E8 8F0E0008 */ lw $t6, 0x0008($t8) ## 0000000B /* 0B74C 80B750EC AE0E01BC */ sw $t6, 0x01BC($s0) ## 000001BC -/* 0B750 80B750F0 E426A898 */ swc1 $f6, %lo(D_80B7A898)($at) +/* 0B750 80B750F0 E426A898 */ swc1 $f6, %lo(D_80B7A898)($at) .L80B750F4: -/* 0B754 80B750F4 4406A000 */ mfc1 $a2, $f20 -/* 0B758 80B750F8 4407A000 */ mfc1 $a3, $f20 +/* 0B754 80B750F4 4406A000 */ mfc1 $a2, $f20 +/* 0B758 80B750F8 4407A000 */ mfc1 $a3, $f20 /* 0B75C 80B750FC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0B760 80B75100 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0B764 80B75104 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 0B768 80B75108 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0B76C 80B7510C 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 0B770 80B75110 C7A80124 */ lwc1 $f8, 0x0124($sp) -/* 0B774 80B75114 4604403C */ c.lt.s $f8, $f4 +/* 0B770 80B75110 C7A80124 */ lwc1 $f8, 0x0124($sp) +/* 0B774 80B75114 4604403C */ c.lt.s $f8, $f4 /* 0B778 80B75118 00000000 */ nop -/* 0B77C 80B7511C 4502003C */ bc1fl .L80B75210 +/* 0B77C 80B7511C 4502003C */ bc1fl .L80B75210 /* 0B780 80B75120 860A0180 */ lh $t2, 0x0180($s0) ## 00000180 -/* 0B784 80B75124 8FA40040 */ lw $a0, 0x0040($sp) +/* 0B784 80B75124 8FA40040 */ lw $a0, 0x0040($sp) /* 0B788 80B75128 24054E20 */ addiu $a1, $zero, 0x4E20 ## $a1 = 00004E20 /* 0B78C 80B7512C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0B790 80B75130 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0B794 80B75134 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 0B798 80B75138 860C017E */ lh $t4, 0x017E($s0) ## 0000017E -/* 0B79C 80B7513C 15800033 */ bne $t4, $zero, .L80B7520C +/* 0B79C 80B7513C 15800033 */ bne $t4, $zero, .L80B7520C /* 0B7A0 80B75140 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0B7A4 80B75144 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0B7A8 80B75148 0C2DC28B */ jal func_80B70A2C +/* 0B7A8 80B75148 0C2DC28B */ jal func_80B70A2C /* 0B7AC 80B7514C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0B7B0 80B75150 1040002E */ beq $v0, $zero, .L80B7520C +/* 0B7B0 80B75150 1040002E */ beq $v0, $zero, .L80B7520C /* 0B7B4 80B75154 3C0180B8 */ lui $at, %hi(D_80B7B720) ## $at = 80B80000 /* 0B7B8 80B75158 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0B7BC 80B7515C C42CB720 */ lwc1 $f12, %lo(D_80B7B720)($at) + +/* 0B7BC 80B7515C C42CB720 */ lwc1 $f12, %lo(D_80B7B720)($at) /* 0B7C0 80B75160 4459F800 */ cfc1 $t9, $31 /* 0B7C4 80B75164 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0B7C8 80B75168 44C5F800 */ ctc1 $a1, $31 /* 0B7CC 80B7516C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0B7D0 80B75170 460002A4 */ cvt.w.s $f10, $f0 +/* 0B7D0 80B75170 460002A4 */ cvt.w.s $f10, $f0 /* 0B7D4 80B75174 4445F800 */ cfc1 $a1, $31 /* 0B7D8 80B75178 00000000 */ nop /* 0B7DC 80B7517C 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0B7E0 80B75180 10A00012 */ beq $a1, $zero, .L80B751CC +/* 0B7E0 80B75180 10A00012 */ beq $a1, $zero, .L80B751CC /* 0B7E4 80B75184 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 0B7E8 80B75188 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 0B7EC 80B7518C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B7F0 80B75190 460A0281 */ sub.s $f10, $f0, $f10 +/* 0B7F0 80B75190 460A0281 */ sub.s $f10, $f0, $f10 /* 0B7F4 80B75194 44C5F800 */ ctc1 $a1, $31 /* 0B7F8 80B75198 00000000 */ nop -/* 0B7FC 80B7519C 460052A4 */ cvt.w.s $f10, $f10 +/* 0B7FC 80B7519C 460052A4 */ cvt.w.s $f10, $f10 /* 0B800 80B751A0 4445F800 */ cfc1 $a1, $31 /* 0B804 80B751A4 00000000 */ nop /* 0B808 80B751A8 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0B80C 80B751AC 14A00005 */ bne $a1, $zero, .L80B751C4 +/* 0B80C 80B751AC 14A00005 */ bne $a1, $zero, .L80B751C4 /* 0B810 80B751B0 00000000 */ nop -/* 0B814 80B751B4 44055000 */ mfc1 $a1, $f10 +/* 0B814 80B751B4 44055000 */ mfc1 $a1, $f10 /* 0B818 80B751B8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0B81C 80B751BC 10000007 */ beq $zero, $zero, .L80B751DC +/* 0B81C 80B751BC 10000007 */ beq $zero, $zero, .L80B751DC /* 0B820 80B751C0 00A12825 */ or $a1, $a1, $at ## $a1 = 80000000 .L80B751C4: -/* 0B824 80B751C4 10000005 */ beq $zero, $zero, .L80B751DC +/* 0B824 80B751C4 10000005 */ beq $zero, $zero, .L80B751DC /* 0B828 80B751C8 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF .L80B751CC: -/* 0B82C 80B751CC 44055000 */ mfc1 $a1, $f10 +/* 0B82C 80B751CC 44055000 */ mfc1 $a1, $f10 /* 0B830 80B751D0 00000000 */ nop -/* 0B834 80B751D4 04A0FFFB */ bltz $a1, .L80B751C4 +/* 0B834 80B751D4 04A0FFFB */ bltz $a1, .L80B751C4 /* 0B838 80B751D8 00000000 */ nop .L80B751DC: /* 0B83C 80B751DC 44D9F800 */ ctc1 $t9, $31 -/* 0B840 80B751E0 0C2DC49E */ jal func_80B71278 +/* 0B840 80B751E0 0C2DC49E */ jal func_80B71278 /* 0B844 80B751E4 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 000000FF /* 0B848 80B751E8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0B84C 80B751EC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 0B850 80B751F0 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0B854 80B751F4 00000000 */ nop -/* 0B858 80B751F8 4600018D */ trunc.w.s $f6, $f0 -/* 0B85C 80B751FC 440F3000 */ mfc1 $t7, $f6 +/* 0B858 80B751F8 4600018D */ trunc.w.s $f6, $f0 +/* 0B85C 80B751FC 440F3000 */ mfc1 $t7, $f6 /* 0B860 80B75200 00000000 */ nop /* 0B864 80B75204 25F80014 */ addiu $t8, $t7, 0x0014 ## $t8 = 00000014 /* 0B868 80B75208 A618017E */ sh $t8, 0x017E($s0) ## 0000017E .L80B7520C: /* 0B86C 80B7520C 860A0180 */ lh $t2, 0x0180($s0) ## 00000180 .L80B75210: -/* 0B870 80B75210 15400004 */ bne $t2, $zero, .L80B75224 +/* 0B870 80B75210 15400004 */ bne $t2, $zero, .L80B75224 /* 0B874 80B75214 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A /* 0B878 80B75218 A6020158 */ sh $v0, 0x0158($s0) ## 00000158 -/* 0B87C 80B7521C 10000016 */ beq $zero, $zero, .L80B75278 +/* 0B87C 80B7521C 10000016 */ beq $zero, $zero, .L80B75278 /* 0B880 80B75220 A602015A */ sh $v0, 0x015A($s0) ## 0000015A .L80B75224: /* 0B884 80B75224 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0B888 80B75228 0C2DC3B5 */ jal func_80B70ED4 +/* 0B888 80B75228 0C2DC3B5 */ jal func_80B70ED4 /* 0B88C 80B7522C 26250014 */ addiu $a1, $s1, 0x0014 ## $a1 = 00000014 /* 0B890 80B75230 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0B894 80B75234 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 0B898 80B75238 C7AA0118 */ lwc1 $f10, 0x0118($sp) +/* 0B898 80B75238 C7AA0118 */ lwc1 $f10, 0x0118($sp) /* 0B89C 80B7523C C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 0B8A0 80B75240 460A2182 */ mul.s $f6, $f4, $f10 -/* 0B8A4 80B75244 4606403C */ c.lt.s $f8, $f6 +/* 0B8A0 80B75240 460A2182 */ mul.s $f6, $f4, $f10 +/* 0B8A4 80B75244 4606403C */ c.lt.s $f8, $f6 /* 0B8A8 80B75248 00000000 */ nop -/* 0B8AC 80B7524C 4502000B */ bc1fl .L80B7527C +/* 0B8AC 80B7524C 4502000B */ bc1fl .L80B7527C /* 0B8B0 80B75250 8604015C */ lh $a0, 0x015C($s0) ## 0000015C /* 0B8B4 80B75254 A6000158 */ sh $zero, 0x0158($s0) ## 00000158 /* 0B8B8 80B75258 860E0158 */ lh $t6, 0x0158($s0) ## 00000158 @@ -4247,30 +4247,30 @@ glabel L80B75278 .L80B75278: /* 0B8D8 80B75278 8604015C */ lh $a0, 0x015C($s0) ## 0000015C .L80B7527C: -/* 0B8DC 80B7527C 00042300 */ sll $a0, $a0, 12 -/* 0B8E0 80B75280 00042400 */ sll $a0, $a0, 16 +/* 0B8DC 80B7527C 00042300 */ sll $a0, $a0, 12 +/* 0B8E0 80B75280 00042400 */ sll $a0, $a0, 16 /* 0B8E4 80B75284 0C01DE1C */ jal Math_Sins ## sins? -/* 0B8E8 80B75288 00042403 */ sra $a0, $a0, 16 +/* 0B8E8 80B75288 00042403 */ sra $a0, $a0, 16 /* 0B8EC 80B7528C 3C0180B8 */ lui $at, %hi(D_80B7B724) ## $at = 80B80000 -/* 0B8F0 80B75290 C424B724 */ lwc1 $f4, %lo(D_80B7B724)($at) +/* 0B8F0 80B75290 C424B724 */ lwc1 $f4, %lo(D_80B7B724)($at) /* 0B8F4 80B75294 3C0180B8 */ lui $at, %hi(D_80B7B728) ## $at = 80B80000 -/* 0B8F8 80B75298 C428B728 */ lwc1 $f8, %lo(D_80B7B728)($at) -/* 0B8FC 80B7529C 46040282 */ mul.s $f10, $f0, $f4 +/* 0B8F8 80B75298 C428B728 */ lwc1 $f8, %lo(D_80B7B728)($at) +/* 0B8FC 80B7529C 46040282 */ mul.s $f10, $f0, $f4 /* 0B900 80B752A0 26040172 */ addiu $a0, $s0, 0x0172 ## $a0 = 00000172 /* 0B904 80B752A4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0B908 80B752A8 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 0B90C 80B752AC 46085180 */ add.s $f6, $f10, $f8 -/* 0B910 80B752B0 4600310D */ trunc.w.s $f4, $f6 -/* 0B914 80B752B4 44052000 */ mfc1 $a1, $f4 +/* 0B90C 80B752AC 46085180 */ add.s $f6, $f10, $f8 +/* 0B910 80B752B0 4600310D */ trunc.w.s $f4, $f6 +/* 0B914 80B752B4 44052000 */ mfc1 $a1, $f4 /* 0B918 80B752B8 00000000 */ nop -/* 0B91C 80B752BC 00052C00 */ sll $a1, $a1, 16 +/* 0B91C 80B752BC 00052C00 */ sll $a1, $a1, 16 /* 0B920 80B752C0 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 0B924 80B752C4 00052C03 */ sra $a1, $a1, 16 + +/* 0B924 80B752C4 00052C03 */ sra $a1, $a1, 16 /* 0B928 80B752C8 860B0158 */ lh $t3, 0x0158($s0) ## 00000158 /* 0B92C 80B752CC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0B930 80B752D0 516101FB */ beql $t3, $at, .L80B75AC0 +/* 0B930 80B752D0 516101FB */ beql $t3, $at, .L80B75AC0 /* 0B934 80B752D4 920201D2 */ lbu $v0, 0x01D2($s0) ## 000001D2 /* 0B938 80B752D8 8E2D07C0 */ lw $t5, 0x07C0($s1) ## 000007C0 /* 0B93C 80B752DC C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 @@ -4278,50 +4278,50 @@ glabel L80B75278 /* 0B944 80B752E4 85F80002 */ lh $t8, 0x0002($t7) ## 00000002 /* 0B948 80B752E8 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 0B94C 80B752EC 00000000 */ nop -/* 0B950 80B752F0 46805220 */ cvt.s.w $f8, $f10 -/* 0B954 80B752F4 4606403C */ c.lt.s $f8, $f6 +/* 0B950 80B752F0 46805220 */ cvt.s.w $f8, $f10 +/* 0B954 80B752F4 4606403C */ c.lt.s $f8, $f6 /* 0B958 80B752F8 00000000 */ nop -/* 0B95C 80B752FC 4500001A */ bc1f .L80B75368 +/* 0B95C 80B752FC 4500001A */ bc1f .L80B75368 /* 0B960 80B75300 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0B964 80B75304 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 /* 0B968 80B75308 3C0180B8 */ lui $at, %hi(D_80B7B72C) ## $at = 80B80000 /* 0B96C 80B7530C 2604016E */ addiu $a0, $s0, 0x016E ## $a0 = 0000016E /* 0B970 80B75310 E6040190 */ swc1 $f4, 0x0190($s0) ## 00000190 -/* 0B974 80B75314 C42AB72C */ lwc1 $f10, %lo(D_80B7B72C)($at) +/* 0B974 80B75314 C42AB72C */ lwc1 $f10, %lo(D_80B7B72C)($at) /* 0B978 80B75318 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0B97C 80B7531C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 0B980 80B75320 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 0B984 80B75324 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0B988 80B75328 E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 /* 0B98C 80B7532C 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 0B990 80B75330 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 0B994 80B75334 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 /* 0B998 80B75338 24192000 */ addiu $t9, $zero, 0x2000 ## $t9 = 00002000 /* 0B99C 80B7533C 24092000 */ addiu $t1, $zero, 0x2000 ## $t1 = 00002000 -/* 0B9A0 80B75340 A7AC00F4 */ sh $t4, 0x00F4($sp) -/* 0B9A4 80B75344 A7AE00F0 */ sh $t6, 0x00F0($sp) -/* 0B9A8 80B75348 A7AA00FA */ sh $t2, 0x00FA($sp) -/* 0B9AC 80B7534C A7A900F2 */ sh $t1, 0x00F2($sp) -/* 0B9B0 80B75350 A7B900EE */ sh $t9, 0x00EE($sp) +/* 0B9A0 80B75340 A7AC00F4 */ sh $t4, 0x00F4($sp) +/* 0B9A4 80B75344 A7AE00F0 */ sh $t6, 0x00F0($sp) +/* 0B9A8 80B75348 A7AA00FA */ sh $t2, 0x00FA($sp) +/* 0B9AC 80B7534C A7A900F2 */ sh $t1, 0x00F2($sp) +/* 0B9B0 80B75350 A7B900EE */ sh $t9, 0x00EE($sp) /* 0B9B4 80B75354 C6080184 */ lwc1 $f8, 0x0184($s0) ## 00000184 /* 0B9B8 80B75358 A600017E */ sh $zero, 0x017E($s0) ## 0000017E -/* 0B9BC 80B7535C 46144181 */ sub.s $f6, $f8, $f20 -/* 0B9C0 80B75360 10000057 */ beq $zero, $zero, .L80B754C0 +/* 0B9BC 80B7535C 46144181 */ sub.s $f6, $f8, $f20 +/* 0B9C0 80B75360 10000057 */ beq $zero, $zero, .L80B754C0 /* 0B9C4 80B75364 E6060184 */ swc1 $f6, 0x0184($s0) ## 00000184 .L80B75368: -/* 0B9C8 80B75368 4405A000 */ mfc1 $a1, $f20 +/* 0B9C8 80B75368 4405A000 */ mfc1 $a1, $f20 /* 0B9CC 80B7536C 26040184 */ addiu $a0, $s0, 0x0184 ## $a0 = 00000184 /* 0B9D0 80B75370 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 0B9D4 80B75374 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 0B9D8 80B75378 86030158 */ lh $v1, 0x0158($s0) ## 00000158 /* 0B9DC 80B7537C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 0B9E0 80B75380 10610006 */ beq $v1, $at, .L80B7539C +/* 0B9E0 80B75380 10610006 */ beq $v1, $at, .L80B7539C /* 0B9E4 80B75384 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0B9E8 80B75388 10610004 */ beq $v1, $at, .L80B7539C +/* 0B9E8 80B75388 10610004 */ beq $v1, $at, .L80B7539C /* 0B9EC 80B7538C 2401FFE7 */ addiu $at, $zero, 0xFFE7 ## $at = FFFFFFE7 -/* 0B9F0 80B75390 50610003 */ beql $v1, $at, .L80B753A0 +/* 0B9F0 80B75390 50610003 */ beql $v1, $at, .L80B753A0 /* 0B9F4 80B75394 A600016A */ sh $zero, 0x016A($s0) ## 0000016A /* 0B9F8 80B75398 A6000166 */ sh $zero, 0x0166($s0) ## 00000166 .L80B7539C: @@ -4334,178 +4334,178 @@ glabel L80B75278 /* 0BA10 80B753B0 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 /* 0BA14 80B753B4 240A2000 */ addiu $t2, $zero, 0x2000 ## $t2 = 00002000 /* 0BA18 80B753B8 240E2000 */ addiu $t6, $zero, 0x2000 ## $t6 = 00002000 -/* 0BA1C 80B753BC A7B800F4 */ sh $t8, 0x00F4($sp) -/* 0BA20 80B753C0 A7AF00F0 */ sh $t7, 0x00F0($sp) -/* 0BA24 80B753C4 A7AD00FA */ sh $t5, 0x00FA($sp) -/* 0BA28 80B753C8 A7AE00F2 */ sh $t6, 0x00F2($sp) -/* 0BA2C 80B753CC A7AA00EE */ sh $t2, 0x00EE($sp) +/* 0BA1C 80B753BC A7B800F4 */ sh $t8, 0x00F4($sp) +/* 0BA20 80B753C0 A7AF00F0 */ sh $t7, 0x00F0($sp) +/* 0BA24 80B753C4 A7AD00FA */ sh $t5, 0x00FA($sp) +/* 0BA28 80B753C8 A7AE00F2 */ sh $t6, 0x00F2($sp) +/* 0BA2C 80B753CC A7AA00EE */ sh $t2, 0x00EE($sp) /* 0BA30 80B753D0 C60401B0 */ lwc1 $f4, 0x01B0($s0) ## 000001B0 -/* 0BA34 80B753D4 87A60134 */ lh $a2, 0x0134($sp) -/* 0BA38 80B753D8 87A500FC */ lh $a1, 0x00FC($sp) -/* 0BA3C 80B753DC 4600228D */ trunc.w.s $f10, $f4 +/* 0BA34 80B753D4 87A60134 */ lh $a2, 0x0134($sp) +/* 0BA38 80B753D8 87A500FC */ lh $a1, 0x00FC($sp) +/* 0BA3C 80B753DC 4600228D */ trunc.w.s $f10, $f4 /* 0BA40 80B753E0 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 0BA44 80B753E4 44075000 */ mfc1 $a3, $f10 +/* 0BA44 80B753E4 44075000 */ mfc1 $a3, $f10 /* 0BA48 80B753E8 00000000 */ nop -/* 0BA4C 80B753EC 00073C00 */ sll $a3, $a3, 16 -/* 0BA50 80B753F0 0C2DA6E1 */ jal func_80B69B84 -/* 0BA54 80B753F4 00073C03 */ sra $a3, $a3, 16 +/* 0BA4C 80B753EC 00073C00 */ sll $a3, $a3, 16 +/* 0BA50 80B753F0 0C2DA6E1 */ jal func_80B69B84 +/* 0BA54 80B753F4 00073C03 */ sra $a3, $a3, 16 /* 0BA58 80B753F8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 0BA5C 80B753FC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0BA60 80B75400 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 0BA64 80B75404 468041A0 */ cvt.s.w $f6, $f8 +/* 0BA64 80B75404 468041A0 */ cvt.s.w $f6, $f8 /* 0BA68 80B75408 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0BA6C 80B7540C 26040030 */ addiu $a0, $s0, 0x0030 ## $a0 = 00000030 -/* 0BA70 80B75410 87A500FE */ lh $a1, 0x00FE($sp) -/* 0BA74 80B75414 87A60134 */ lh $a2, 0x0134($sp) -/* 0BA78 80B75418 46043282 */ mul.s $f10, $f6, $f4 +/* 0BA70 80B75410 87A500FE */ lh $a1, 0x00FE($sp) +/* 0BA74 80B75414 87A60134 */ lh $a2, 0x0134($sp) +/* 0BA78 80B75418 46043282 */ mul.s $f10, $f6, $f4 /* 0BA7C 80B7541C 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 0BA80 80B75420 4600520D */ trunc.w.s $f8, $f10 -/* 0BA84 80B75424 44094000 */ mfc1 $t1, $f8 +/* 0BA80 80B75420 4600520D */ trunc.w.s $f8, $f10 +/* 0BA84 80B75424 44094000 */ mfc1 $t1, $f8 /* 0BA88 80B75428 00000000 */ nop -/* 0BA8C 80B7542C A7A900F6 */ sh $t1, 0x00F6($sp) +/* 0BA8C 80B7542C A7A900F6 */ sh $t1, 0x00F6($sp) /* 0BA90 80B75430 C60601B0 */ lwc1 $f6, 0x01B0($s0) ## 000001B0 -/* 0BA94 80B75434 46043282 */ mul.s $f10, $f6, $f4 -/* 0BA98 80B75438 4600520D */ trunc.w.s $f8, $f10 -/* 0BA9C 80B7543C 44074000 */ mfc1 $a3, $f8 +/* 0BA94 80B75434 46043282 */ mul.s $f10, $f6, $f4 +/* 0BA98 80B75438 4600520D */ trunc.w.s $f8, $f10 +/* 0BA9C 80B7543C 44074000 */ mfc1 $a3, $f8 /* 0BAA0 80B75440 00000000 */ nop -/* 0BAA4 80B75444 00073C00 */ sll $a3, $a3, 16 +/* 0BAA4 80B75444 00073C00 */ sll $a3, $a3, 16 /* 0BAA8 80B75448 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 0BAAC 80B7544C 00073C03 */ sra $a3, $a3, 16 -/* 0BAB0 80B75450 87A500F6 */ lh $a1, 0x00F6($sp) -/* 0BAB4 80B75454 28A11F41 */ slti $at, $a1, 0x1F41 -/* 0BAB8 80B75458 54200004 */ bnel $at, $zero, .L80B7546C -/* 0BABC 80B7545C 28A1E0C0 */ slti $at, $a1, 0xE0C0 -/* 0BAC0 80B75460 10000005 */ beq $zero, $zero, .L80B75478 + +/* 0BAAC 80B7544C 00073C03 */ sra $a3, $a3, 16 +/* 0BAB0 80B75450 87A500F6 */ lh $a1, 0x00F6($sp) +/* 0BAB4 80B75454 28A11F41 */ slti $at, $a1, 0x1F41 +/* 0BAB8 80B75458 54200004 */ bnel $at, $zero, .L80B7546C +/* 0BABC 80B7545C 28A1E0C0 */ slti $at, $a1, 0xE0C0 +/* 0BAC0 80B75460 10000005 */ beq $zero, $zero, .L80B75478 /* 0BAC4 80B75464 24051F40 */ addiu $a1, $zero, 0x1F40 ## $a1 = 00001F40 -/* 0BAC8 80B75468 28A1E0C0 */ slti $at, $a1, 0xE0C0 +/* 0BAC8 80B75468 28A1E0C0 */ slti $at, $a1, 0xE0C0 .L80B7546C: -/* 0BACC 80B7546C 10200002 */ beq $at, $zero, .L80B75478 +/* 0BACC 80B7546C 10200002 */ beq $at, $zero, .L80B75478 /* 0BAD0 80B75470 00000000 */ nop /* 0BAD4 80B75474 2405E0C0 */ addiu $a1, $zero, 0xE0C0 ## $a1 = FFFFE0C0 .L80B75478: /* 0BAD8 80B75478 3C0180B8 */ lui $at, %hi(D_80B7B730) ## $at = 80B80000 -/* 0BADC 80B7547C C424B730 */ lwc1 $f4, %lo(D_80B7B730)($at) +/* 0BADC 80B7547C C424B730 */ lwc1 $f4, %lo(D_80B7B730)($at) /* 0BAE0 80B75480 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 0BAE4 80B75484 4606203E */ c.le.s $f4, $f6 +/* 0BAE4 80B75484 4606203E */ c.le.s $f4, $f6 /* 0BAE8 80B75488 00000000 */ nop -/* 0BAEC 80B7548C 45000006 */ bc1f .L80B754A8 +/* 0BAEC 80B7548C 45000006 */ bc1f .L80B754A8 /* 0BAF0 80B75490 2604016E */ addiu $a0, $s0, 0x016E ## $a0 = 0000016E /* 0BAF4 80B75494 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0BAF8 80B75498 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0BAFC 80B7549C 24074E20 */ addiu $a3, $zero, 0x4E20 ## $a3 = 00004E20 -/* 0BB00 80B754A0 10000005 */ beq $zero, $zero, .L80B754B8 +/* 0BB00 80B754A0 10000005 */ beq $zero, $zero, .L80B754B8 /* 0BB04 80B754A4 00000000 */ nop .L80B754A8: /* 0BB08 80B754A8 2604016E */ addiu $a0, $s0, 0x016E ## $a0 = 0000016E /* 0BB0C 80B754AC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 0BB10 80B754B0 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0BB14 80B754B4 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 .L80B754B8: -/* 0BB18 80B754B8 0C00B642 */ jal func_8002D908 +/* 0BB18 80B754B8 0C00B642 */ jal func_8002D908 /* 0BB1C 80B754BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B754C0: -/* 0BB20 80B754C0 0C00B5FB */ jal func_8002D7EC +/* 0BB20 80B754C0 0C00B5FB */ jal func_8002D7EC /* 0BB24 80B754C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0BB28 80B754C8 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0BB2C 80B754CC 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 /* 0BB30 80B754D0 C60A0184 */ lwc1 $f10, 0x0184($s0) ## 00000184 /* 0BB34 80B754D4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 0BB38 80B754D8 92020152 */ lbu $v0, 0x0152($s0) ## 00000152 -/* 0BB3C 80B754DC 46085182 */ mul.s $f6, $f10, $f8 -/* 0BB40 80B754E0 46062280 */ add.s $f10, $f4, $f6 -/* 0BB44 80B754E4 10400019 */ beq $v0, $zero, .L80B7554C +/* 0BB3C 80B754DC 46085182 */ mul.s $f6, $f10, $f8 +/* 0BB40 80B754E0 46062280 */ add.s $f10, $f4, $f6 +/* 0BB44 80B754E4 10400019 */ beq $v0, $zero, .L80B7554C /* 0BB48 80B754E8 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 0BB4C 80B754EC 92180156 */ lbu $t8, 0x0156($s0) ## 00000156 /* 0BB50 80B754F0 860D0154 */ lh $t5, 0x0154($s0) ## 00000154 /* 0BB54 80B754F4 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 0BB58 80B754F8 A20F0152 */ sb $t7, 0x0152($s0) ## 00000152 -/* 0BB5C 80B754FC 13000006 */ beq $t8, $zero, .L80B75518 +/* 0BB5C 80B754FC 13000006 */ beq $t8, $zero, .L80B75518 /* 0BB60 80B75500 A60D0168 */ sh $t5, 0x0168($s0) ## 00000168 /* 0BB64 80B75504 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 /* 0BB68 80B75508 240E4000 */ addiu $t6, $zero, 0x4000 ## $t6 = 00004000 -/* 0BB6C 80B7550C A7AA00F0 */ sh $t2, 0x00F0($sp) -/* 0BB70 80B75510 10000005 */ beq $zero, $zero, .L80B75528 -/* 0BB74 80B75514 A7AE00EE */ sh $t6, 0x00EE($sp) +/* 0BB6C 80B7550C A7AA00F0 */ sh $t2, 0x00F0($sp) +/* 0BB70 80B75510 10000005 */ beq $zero, $zero, .L80B75528 +/* 0BB74 80B75514 A7AE00EE */ sh $t6, 0x00EE($sp) .L80B75518: /* 0BB78 80B75518 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A /* 0BB7C 80B7551C 24190800 */ addiu $t9, $zero, 0x0800 ## $t9 = 00000800 -/* 0BB80 80B75520 A7AC00F0 */ sh $t4, 0x00F0($sp) -/* 0BB84 80B75524 A7B900EE */ sh $t9, 0x00EE($sp) +/* 0BB80 80B75520 A7AC00F0 */ sh $t4, 0x00F0($sp) +/* 0BB84 80B75524 A7B900EE */ sh $t9, 0x00EE($sp) .L80B75528: /* 0BB88 80B75528 860900B4 */ lh $t1, 0x00B4($s0) ## 000000B4 /* 0BB8C 80B7552C 240BFB00 */ addiu $t3, $zero, 0xFB00 ## $t3 = FFFFFB00 /* 0BB90 80B75530 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 0BB94 80B75534 01696823 */ subu $t5, $t3, $t1 +/* 0BB94 80B75534 01696823 */ subu $t5, $t3, $t1 /* 0BB98 80B75538 A60D0166 */ sh $t5, 0x0166($s0) ## 00000166 /* 0BB9C 80B7553C 24184000 */ addiu $t8, $zero, 0x4000 ## $t8 = 00004000 -/* 0BBA0 80B75540 A7AF00F4 */ sh $t7, 0x00F4($sp) -/* 0BBA4 80B75544 10000002 */ beq $zero, $zero, .L80B75550 -/* 0BBA8 80B75548 A7B800F2 */ sh $t8, 0x00F2($sp) +/* 0BBA0 80B75540 A7AF00F4 */ sh $t7, 0x00F4($sp) +/* 0BBA4 80B75544 10000002 */ beq $zero, $zero, .L80B75550 +/* 0BBA8 80B75548 A7B800F2 */ sh $t8, 0x00F2($sp) .L80B7554C: /* 0BBAC 80B7554C A2000156 */ sb $zero, 0x0156($s0) ## 00000156 .L80B75550: /* 0BBB0 80B75550 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 /* 0BBB4 80B75554 86050166 */ lh $a1, 0x0166($s0) ## 00000166 -/* 0BBB8 80B75558 87A600F4 */ lh $a2, 0x00F4($sp) +/* 0BBB8 80B75558 87A600F4 */ lh $a2, 0x00F4($sp) /* 0BBBC 80B7555C 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 0BBC0 80B75560 87A700F2 */ lh $a3, 0x00F2($sp) + +/* 0BBC0 80B75560 87A700F2 */ lh $a3, 0x00F2($sp) /* 0BBC4 80B75564 26040162 */ addiu $a0, $s0, 0x0162 ## $a0 = 00000162 /* 0BBC8 80B75568 86050168 */ lh $a1, 0x0168($s0) ## 00000168 -/* 0BBCC 80B7556C 87A600F0 */ lh $a2, 0x00F0($sp) +/* 0BBCC 80B7556C 87A600F0 */ lh $a2, 0x00F0($sp) /* 0BBD0 80B75570 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 0BBD4 80B75574 87A700EE */ lh $a3, 0x00EE($sp) + +/* 0BBD4 80B75574 87A700EE */ lh $a3, 0x00EE($sp) /* 0BBD8 80B75578 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 0BBDC 80B7557C 8605016A */ lh $a1, 0x016A($s0) ## 0000016A -/* 0BBE0 80B75580 87A600FA */ lh $a2, 0x00FA($sp) +/* 0BBE0 80B75580 87A600FA */ lh $a2, 0x00FA($sp) /* 0BBE4 80B75584 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0BBE8 80B75588 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 0BBEC 80B7558C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0BBF0 80B75590 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 /* 0BBF4 80B75594 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 0BBF8 80B75598 4608203E */ c.le.s $f4, $f8 +/* 0BBF8 80B75598 4608203E */ c.le.s $f4, $f8 /* 0BBFC 80B7559C 00000000 */ nop -/* 0BC00 80B755A0 4500000C */ bc1f .L80B755D4 +/* 0BC00 80B755A0 4500000C */ bc1f .L80B755D4 /* 0BC04 80B755A4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0BC08 80B755A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0BC0C 80B755AC 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 0BC10 80B755B0 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0BC14 80B755B4 86070178 */ lh $a3, 0x0178($s0) ## 00000178 /* 0BC18 80B755B8 26040178 */ addiu $a0, $s0, 0x0178 ## $a0 = 00000178 /* 0BC1C 80B755BC 24050500 */ addiu $a1, $zero, 0x0500 ## $a1 = 00000500 /* 0BC20 80B755C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0BC24 80B755C4 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0BC28 80B755C8 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 0BC2C 80B755CC 1000000B */ beq $zero, $zero, .L80B755FC +/* 0BC2C 80B755CC 1000000B */ beq $zero, $zero, .L80B755FC /* 0BC30 80B755D0 86030158 */ lh $v1, 0x0158($s0) ## 00000158 .L80B755D4: /* 0BC34 80B755D4 86050030 */ lh $a1, 0x0030($s0) ## 00000030 /* 0BC38 80B755D8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0BC3C 80B755DC 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0BC40 80B755E0 00052823 */ subu $a1, $zero, $a1 -/* 0BC44 80B755E4 00052C00 */ sll $a1, $a1, 16 -/* 0BC48 80B755E8 00052C03 */ sra $a1, $a1, 16 +/* 0BC40 80B755E0 00052823 */ subu $a1, $zero, $a1 +/* 0BC44 80B755E4 00052C00 */ sll $a1, $a1, 16 +/* 0BC48 80B755E8 00052C03 */ sra $a1, $a1, 16 /* 0BC4C 80B755EC 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0BC50 80B755F0 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 /* 0BC54 80B755F4 A6000178 */ sh $zero, 0x0178($s0) ## 00000178 /* 0BC58 80B755F8 86030158 */ lh $v1, 0x0158($s0) ## 00000158 .L80B755FC: /* 0BC5C 80B755FC 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 /* 0BC60 80B75600 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 0BC64 80B75604 10610042 */ beq $v1, $at, .L80B75710 +/* 0BC64 80B75604 10610042 */ beq $v1, $at, .L80B75710 /* 0BC68 80B75608 A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 /* 0BC6C 80B7560C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0BC70 80B75610 1061003F */ beq $v1, $at, .L80B75710 +/* 0BC70 80B75610 1061003F */ beq $v1, $at, .L80B75710 /* 0BC74 80B75614 2401FFE7 */ addiu $at, $zero, 0xFFE7 ## $at = FFFFFFE7 -/* 0BC78 80B75618 5061003E */ beql $v1, $at, .L80B75714 +/* 0BC78 80B75618 5061003E */ beql $v1, $at, .L80B75714 /* 0BC7C 80B7561C 8E3807C0 */ lw $t8, 0x07C0($s1) ## 000007C0 /* 0BC80 80B75620 8E2E07C0 */ lw $t6, 0x07C0($s1) ## 000007C0 /* 0BC84 80B75624 C6000028 */ lwc1 $f0, 0x0028($s0) ## 00000028 @@ -4513,21 +4513,21 @@ glabel L80B75278 /* 0BC8C 80B7562C 85990002 */ lh $t9, 0x0002($t4) ## 00000002 /* 0BC90 80B75630 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 /* 0BC94 80B75634 00000000 */ nop -/* 0BC98 80B75638 468033A0 */ cvt.s.w $f14, $f6 -/* 0BC9C 80B7563C 4600703C */ c.lt.s $f14, $f0 +/* 0BC98 80B75638 468033A0 */ cvt.s.w $f14, $f6 +/* 0BC9C 80B7563C 4600703C */ c.lt.s $f14, $f0 /* 0BCA0 80B75640 00000000 */ nop -/* 0BCA4 80B75644 45020018 */ bc1fl .L80B756A8 -/* 0BCA8 80B75648 460E003C */ c.lt.s $f0, $f14 +/* 0BCA4 80B75644 45020018 */ bc1fl .L80B756A8 +/* 0BCA8 80B75648 460E003C */ c.lt.s $f0, $f14 /* 0BCAC 80B7564C C60A0104 */ lwc1 $f10, 0x0104($s0) ## 00000104 -/* 0BCB0 80B75650 460E503E */ c.le.s $f10, $f14 +/* 0BCB0 80B75650 460E503E */ c.le.s $f10, $f14 /* 0BCB4 80B75654 00000000 */ nop -/* 0BCB8 80B75658 45000012 */ bc1f .L80B756A4 +/* 0BCB8 80B75658 45000012 */ bc1f .L80B756A4 /* 0BCBC 80B7565C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0BCC0 80B75660 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0BCC4 80B75664 0C2DC28B */ jal func_80B70A2C +/* 0BCC4 80B75664 0C2DC28B */ jal func_80B70A2C /* 0BCC8 80B75668 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0BCCC 80B7566C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BCD0 80B75670 0C2DC49E */ jal func_80B71278 +/* 0BCD0 80B75670 0C2DC49E */ jal func_80B71278 /* 0BCD4 80B75674 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0BCD8 80B75678 C6080060 */ lwc1 $f8, 0x0060($s0) ## 00000060 /* 0BCDC 80B7567C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -4535,28 +4535,28 @@ glabel L80B75278 /* 0BCE4 80B75684 44816000 */ mtc1 $at, $f12 ## $f12 = 32768.00 /* 0BCE8 80B75688 E6080184 */ swc1 $f8, 0x0184($s0) ## 00000184 /* 0BCEC 80B7568C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0BCF0 80B75690 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 0BCF4 80B75694 4600018D */ trunc.w.s $f6, $f0 -/* 0BCF8 80B75698 44093000 */ mfc1 $t1, $f6 -/* 0BCFC 80B7569C 1000001C */ beq $zero, $zero, .L80B75710 +/* 0BCF4 80B75694 4600018D */ trunc.w.s $f6, $f0 +/* 0BCF8 80B75698 44093000 */ mfc1 $t1, $f6 +/* 0BCFC 80B7569C 1000001C */ beq $zero, $zero, .L80B75710 /* 0BD00 80B756A0 A609016A */ sh $t1, 0x016A($s0) ## 0000016A .L80B756A4: -/* 0BD04 80B756A4 460E003C */ c.lt.s $f0, $f14 +/* 0BD04 80B756A4 460E003C */ c.lt.s $f0, $f14 .L80B756A8: /* 0BD08 80B756A8 00000000 */ nop -/* 0BD0C 80B756AC 45020019 */ bc1fl .L80B75714 +/* 0BD0C 80B756AC 45020019 */ bc1fl .L80B75714 /* 0BD10 80B756B0 8E3807C0 */ lw $t8, 0x07C0($s1) ## 000007C0 /* 0BD14 80B756B4 C60A0104 */ lwc1 $f10, 0x0104($s0) ## 00000104 -/* 0BD18 80B756B8 460A703E */ c.le.s $f14, $f10 +/* 0BD18 80B756B8 460A703E */ c.le.s $f14, $f10 /* 0BD1C 80B756BC 00000000 */ nop -/* 0BD20 80B756C0 45000013 */ bc1f .L80B75710 +/* 0BD20 80B756C0 45000013 */ bc1f .L80B75710 /* 0BD24 80B756C4 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 0BD28 80B756C8 44810000 */ mtc1 $at, $f0 ## $f0 = -5.00 /* 0BD2C 80B756CC C6080184 */ lwc1 $f8, 0x0184($s0) ## 00000184 -/* 0BD30 80B756D0 4600403C */ c.lt.s $f8, $f0 +/* 0BD30 80B756D0 4600403C */ c.lt.s $f8, $f0 /* 0BD34 80B756D4 00000000 */ nop -/* 0BD38 80B756D8 45020003 */ bc1fl .L80B756E8 +/* 0BD38 80B756D8 45020003 */ bc1fl .L80B756E8 /* 0BD3C 80B756DC 240DF060 */ addiu $t5, $zero, 0xF060 ## $t5 = FFFFF060 /* 0BD40 80B756E0 E6000184 */ swc1 $f0, 0x0184($s0) ## 00000184 /* 0BD44 80B756E4 240DF060 */ addiu $t5, $zero, 0xF060 ## $t5 = FFFFF060 @@ -4564,12 +4564,12 @@ glabel L80B75278 /* 0BD48 80B756E8 A60D0030 */ sh $t5, 0x0030($s0) ## 00000030 /* 0BD4C 80B756EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0BD50 80B756F0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0BD54 80B756F4 0C2DC28B */ jal func_80B70A2C +/* 0BD54 80B756F4 0C2DC28B */ jal func_80B70A2C /* 0BD58 80B756F8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0BD5C 80B756FC 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 0BD60 80B75700 A20F01D2 */ sb $t7, 0x01D2($s0) ## 000001D2 /* 0BD64 80B75704 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BD68 80B75708 0C2DC49E */ jal func_80B71278 +/* 0BD68 80B75708 0C2DC49E */ jal func_80B71278 /* 0BD6C 80B7570C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 .L80B75710: /* 0BD70 80B75710 8E3807C0 */ lw $t8, 0x07C0($s1) ## 000007C0 @@ -4579,34 +4579,34 @@ glabel L80B75278 /* 0BD7C 80B7571C 854E0002 */ lh $t6, 0x0002($t2) ## 00000002 /* 0BD80 80B75720 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 0BD84 80B75724 00000000 */ nop -/* 0BD88 80B75728 468023A0 */ cvt.s.w $f14, $f4 -/* 0BD8C 80B7572C 460E003C */ c.lt.s $f0, $f14 +/* 0BD88 80B75728 468023A0 */ cvt.s.w $f14, $f4 +/* 0BD8C 80B7572C 460E003C */ c.lt.s $f0, $f14 /* 0BD90 80B75730 00000000 */ nop -/* 0BD94 80B75734 4500002D */ bc1f .L80B757EC +/* 0BD94 80B75734 4500002D */ bc1f .L80B757EC /* 0BD98 80B75738 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0BD9C 80B7573C 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 0BDA0 80B75740 00000000 */ nop -/* 0BDA4 80B75744 46067281 */ sub.s $f10, $f14, $f6 -/* 0BDA8 80B75748 4600503C */ c.lt.s $f10, $f0 +/* 0BDA4 80B75744 46067281 */ sub.s $f10, $f14, $f6 +/* 0BDA8 80B75748 4600503C */ c.lt.s $f10, $f0 /* 0BDAC 80B7574C 00000000 */ nop -/* 0BDB0 80B75750 45020027 */ bc1fl .L80B757F0 +/* 0BDB0 80B75750 45020027 */ bc1fl .L80B757F0 /* 0BDB4 80B75754 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0BDB8 80B75758 860C015C */ lh $t4, 0x015C($s0) ## 0000015C /* 0BDBC 80B7575C 31990001 */ andi $t9, $t4, 0x0001 ## $t9 = 00000000 -/* 0BDC0 80B75760 57200023 */ bnel $t9, $zero, .L80B757F0 +/* 0BDC0 80B75760 57200023 */ bnel $t9, $zero, .L80B757F0 /* 0BDC4 80B75764 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0BDC8 80B75768 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0BDCC 80B7576C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 0BDD0 80B75770 4604403C */ c.lt.s $f8, $f4 +/* 0BDD0 80B75770 4604403C */ c.lt.s $f8, $f4 /* 0BDD4 80B75774 00000000 */ nop -/* 0BDD8 80B75778 4502001D */ bc1fl .L80B757F0 +/* 0BDD8 80B75778 4502001D */ bc1fl .L80B757F0 /* 0BDDC 80B7577C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0BDE0 80B75780 8E090024 */ lw $t1, 0x0024($s0) ## 00000024 /* 0BDE4 80B75784 27A60084 */ addiu $a2, $sp, 0x0084 ## $a2 = FFFFFF4C /* 0BDE8 80B75788 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 /* 0BDEC 80B7578C ACC90000 */ sw $t1, 0x0000($a2) ## FFFFFF4C /* 0BDF0 80B75790 8E0B0028 */ lw $t3, 0x0028($s0) ## 00000028 -/* 0BDF4 80B75794 00B12821 */ addu $a1, $a1, $s1 +/* 0BDF4 80B75794 00B12821 */ addu $a1, $a1, $s1 /* 0BDF8 80B75798 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 0BDFC 80B7579C ACCB0004 */ sw $t3, 0x0004($a2) ## FFFFFF50 /* 0BE00 80B757A0 8E09002C */ lw $t1, 0x002C($s0) ## 0000002C @@ -4621,70 +4621,70 @@ glabel L80B75278 /* 0BE24 80B757C4 85F80002 */ lh $t8, 0x0002($t7) ## 00000002 /* 0BE28 80B757C8 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 /* 0BE2C 80B757CC 00000000 */ nop -/* 0BE30 80B757D0 468032A0 */ cvt.s.w $f10, $f6 -/* 0BE34 80B757D4 E7AA0088 */ swc1 $f10, 0x0088($sp) +/* 0BE30 80B757D0 468032A0 */ cvt.s.w $f10, $f6 +/* 0BE34 80B757D4 E7AA0088 */ swc1 $f10, 0x0088($sp) /* 0BE38 80B757D8 8CA51E10 */ lw $a1, 0x1E10($a1) ## 00011E10 -/* 0BE3C 80B757DC AFAE0018 */ sw $t6, 0x0018($sp) -/* 0BE40 80B757E0 AFAA0014 */ sw $t2, 0x0014($sp) -/* 0BE44 80B757E4 0C2DA70B */ jal func_80B69C2C -/* 0BE48 80B757E8 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0BE3C 80B757DC AFAE0018 */ sw $t6, 0x0018($sp) +/* 0BE40 80B757E0 AFAA0014 */ sw $t2, 0x0014($sp) +/* 0BE44 80B757E4 0C2DA70B */ jal func_80B69C2C +/* 0BE48 80B757E8 E7A80010 */ swc1 $f8, 0x0010($sp) .L80B757EC: /* 0BE4C 80B757EC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80B757F0: /* 0BE50 80B757F0 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 0BE54 80B757F4 4606203C */ c.lt.s $f4, $f6 +/* 0BE54 80B757F4 4606203C */ c.lt.s $f4, $f6 /* 0BE58 80B757F8 00000000 */ nop -/* 0BE5C 80B757FC 45030006 */ bc1tl .L80B75818 +/* 0BE5C 80B757FC 45030006 */ bc1tl .L80B75818 /* 0BE60 80B75800 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 /* 0BE64 80B75804 860C0158 */ lh $t4, 0x0158($s0) ## 00000158 /* 0BE68 80B75808 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0BE6C 80B7580C 558100AC */ bnel $t4, $at, .L80B75AC0 +/* 0BE6C 80B7580C 558100AC */ bnel $t4, $at, .L80B75AC0 /* 0BE70 80B75810 920201D2 */ lbu $v0, 0x01D2($s0) ## 000001D2 /* 0BE74 80B75814 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 .L80B75818: /* 0BE78 80B75818 3C0180B8 */ lui $at, %hi(D_80B7B734) ## $at = 80B80000 -/* 0BE7C 80B7581C C424B734 */ lwc1 $f4, %lo(D_80B7B734)($at) -/* 0BE80 80B75820 E7AA0080 */ swc1 $f10, 0x0080($sp) +/* 0BE7C 80B7581C C424B734 */ lwc1 $f4, %lo(D_80B7B734)($at) +/* 0BE80 80B75820 E7AA0080 */ swc1 $f10, 0x0080($sp) /* 0BE84 80B75824 C60801AC */ lwc1 $f8, 0x01AC($s0) ## 000001AC /* 0BE88 80B75828 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 0BE8C 80B7582C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 0BE90 80B75830 46044002 */ mul.s $f0, $f8, $f4 +/* 0BE90 80B75830 46044002 */ mul.s $f0, $f8, $f4 /* 0BE94 80B75834 C6080104 */ lwc1 $f8, 0x0104($s0) ## 00000104 /* 0BE98 80B75838 24190045 */ addiu $t9, $zero, 0x0045 ## $t9 = 00000045 /* 0BE9C 80B7583C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0BEA0 80B75840 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0BEA4 80B75844 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 /* 0BEA8 80B75848 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0BEAC 80B7584C 46003281 */ sub.s $f10, $f6, $f0 +/* 0BEAC 80B7584C 46003281 */ sub.s $f10, $f6, $f0 /* 0BEB0 80B75850 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 /* 0BEB4 80B75854 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0BEB8 80B75858 46004101 */ sub.s $f4, $f8, $f0 +/* 0BEB8 80B75858 46004101 */ sub.s $f4, $f8, $f0 /* 0BEBC 80B7585C E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 0BEC0 80B75860 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 /* 0BEC4 80B75864 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 /* 0BEC8 80B75868 E6040104 */ swc1 $f4, 0x0104($s0) ## 00000104 -/* 0BECC 80B7586C E7A000D8 */ swc1 $f0, 0x00D8($sp) -/* 0BED0 80B75870 AFB90014 */ sw $t9, 0x0014($sp) -/* 0BED4 80B75874 0C00B92D */ jal func_8002E4B4 -/* 0BED8 80B75878 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0BEDC 80B7587C C7A000D8 */ lwc1 $f0, 0x00D8($sp) +/* 0BECC 80B7586C E7A000D8 */ swc1 $f0, 0x00D8($sp) +/* 0BED0 80B75870 AFB90014 */ sw $t9, 0x0014($sp) +/* 0BED4 80B75874 0C00B92D */ jal func_8002E4B4 +/* 0BED8 80B75878 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 0BEDC 80B7587C C7A000D8 */ lwc1 $f0, 0x00D8($sp) /* 0BEE0 80B75880 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 0BEE4 80B75884 C6060104 */ lwc1 $f6, 0x0104($s0) ## 00000104 /* 0BEE8 80B75888 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 0BEEC 80B7588C 46004100 */ add.s $f4, $f8, $f0 +/* 0BEEC 80B7588C 46004100 */ add.s $f4, $f8, $f0 /* 0BEF0 80B75890 304B0008 */ andi $t3, $v0, 0x0008 ## $t3 = 00000000 -/* 0BEF4 80B75894 46003280 */ add.s $f10, $f6, $f0 +/* 0BEF4 80B75894 46003280 */ add.s $f10, $f6, $f0 /* 0BEF8 80B75898 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 /* 0BEFC 80B7589C E60A0104 */ swc1 $f10, 0x0104($s0) ## 00000104 -/* 0BF00 80B758A0 C7A80080 */ lwc1 $f8, 0x0080($sp) -/* 0BF04 80B758A4 11600004 */ beq $t3, $zero, .L80B758B8 +/* 0BF00 80B758A0 C7A80080 */ lwc1 $f8, 0x0080($sp) +/* 0BF04 80B758A4 11600004 */ beq $t3, $zero, .L80B758B8 /* 0BF08 80B758A8 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 0BF0C 80B758AC 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 /* 0BF10 80B758B0 A60901A0 */ sh $t1, 0x01A0($s0) ## 000001A0 /* 0BF14 80B758B4 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 .L80B758B8: /* 0BF18 80B758B8 304D0001 */ andi $t5, $v0, 0x0001 ## $t5 = 00000000 -/* 0BF1C 80B758BC 51A00080 */ beql $t5, $zero, .L80B75AC0 +/* 0BF1C 80B758BC 51A00080 */ beql $t5, $zero, .L80B75AC0 /* 0BF20 80B758C0 920201D2 */ lbu $v0, 0x01D2($s0) ## 000001D2 /* 0BF24 80B758C4 8E2F07C0 */ lw $t7, 0x07C0($s1) ## 000007C0 /* 0BF28 80B758C8 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 @@ -4692,33 +4692,33 @@ glabel L80B75278 /* 0BF30 80B758D0 870A0002 */ lh $t2, 0x0002($t8) ## 00000002 /* 0BF34 80B758D4 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 /* 0BF38 80B758D8 00000000 */ nop -/* 0BF3C 80B758DC 468021A0 */ cvt.s.w $f6, $f4 -/* 0BF40 80B758E0 460A303C */ c.lt.s $f6, $f10 +/* 0BF3C 80B758DC 468021A0 */ cvt.s.w $f6, $f4 +/* 0BF40 80B758E0 460A303C */ c.lt.s $f6, $f10 /* 0BF44 80B758E4 00000000 */ nop -/* 0BF48 80B758E8 45000048 */ bc1f .L80B75A0C +/* 0BF48 80B758E8 45000048 */ bc1f .L80B75A0C /* 0BF4C 80B758EC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0BF50 80B758F0 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 /* 0BF54 80B758F4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0BF58 80B758F8 00000000 */ nop /* 0BF5C 80B758FC 3C0180B8 */ lui $at, %hi(D_80B7B738) ## $at = 80B80000 -/* 0BF60 80B75900 C422B738 */ lwc1 $f2, %lo(D_80B7B738)($at) +/* 0BF60 80B75900 C422B738 */ lwc1 $f2, %lo(D_80B7B738)($at) /* 0BF64 80B75904 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0BF68 80B75908 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 /* 0BF6C 80B7590C C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 0BF70 80B75910 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BF74 80B75914 46080100 */ add.s $f4, $f0, $f8 -/* 0BF78 80B75918 46023282 */ mul.s $f10, $f6, $f2 +/* 0BF74 80B75914 46080100 */ add.s $f4, $f0, $f8 +/* 0BF78 80B75918 46023282 */ mul.s $f10, $f6, $f2 /* 0BF7C 80B7591C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 0BF80 80B75920 24052869 */ addiu $a1, $zero, 0x2869 ## $a1 = 00002869 /* 0BF84 80B75924 E6040184 */ swc1 $f4, 0x0184($s0) ## 00000184 -/* 0BF88 80B75928 46024102 */ mul.s $f4, $f8, $f2 +/* 0BF88 80B75928 46024102 */ mul.s $f4, $f8, $f2 /* 0BF8C 80B7592C E60A005C */ swc1 $f10, 0x005C($s0) ## 0000005C /* 0BF90 80B75930 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0BF94 80B75934 E6040064 */ swc1 $f4, 0x0064($s0) ## 00000064 /* 0BF98 80B75938 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BF9C 80B7593C 0C2DC33C */ jal func_80B70CF0 +/* 0BF9C 80B7593C 0C2DC33C */ jal func_80B70CF0 /* 0BFA0 80B75940 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0BFA4 80B75944 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -4726,11 +4726,11 @@ glabel L80B75278 /* 0BFAC 80B7594C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0BFB0 80B75950 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 0BFB4 80B75954 00000000 */ nop -/* 0BFB8 80B75958 4606003C */ c.lt.s $f0, $f6 +/* 0BFB8 80B75958 4606003C */ c.lt.s $f0, $f6 /* 0BFBC 80B7595C 00000000 */ nop -/* 0BFC0 80B75960 45000003 */ bc1f .L80B75970 +/* 0BFC0 80B75960 45000003 */ bc1f .L80B75970 /* 0BFC4 80B75964 240E4000 */ addiu $t6, $zero, 0x4000 ## $t6 = 00004000 -/* 0BFC8 80B75968 10000003 */ beq $zero, $zero, .L80B75978 +/* 0BFC8 80B75968 10000003 */ beq $zero, $zero, .L80B75978 /* 0BFCC 80B7596C A60E016A */ sh $t6, 0x016A($s0) ## 0000016A .L80B75970: /* 0BFD0 80B75970 240CC000 */ addiu $t4, $zero, 0xC000 ## $t4 = FFFFC000 @@ -4742,156 +4742,156 @@ glabel L80B75278 /* 0BFE0 80B75980 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0BFE4 80B75984 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 /* 0BFE8 80B75988 00000000 */ nop -/* 0BFEC 80B7598C 460A003C */ c.lt.s $f0, $f10 +/* 0BFEC 80B7598C 460A003C */ c.lt.s $f0, $f10 /* 0BFF0 80B75990 00000000 */ nop -/* 0BFF4 80B75994 45020004 */ bc1fl .L80B759A8 +/* 0BFF4 80B75994 45020004 */ bc1fl .L80B759A8 /* 0BFF8 80B75998 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 0BFFC 80B7599C 1000000B */ beq $zero, $zero, .L80B759CC +/* 0BFFC 80B7599C 1000000B */ beq $zero, $zero, .L80B759CC /* 0C000 80B759A0 A6000166 */ sh $zero, 0x0166($s0) ## 00000166 /* 0C004 80B759A4 3C014200 */ lui $at, 0x4200 ## $at = 42000000 .L80B759A8: /* 0C008 80B759A8 44816000 */ mtc1 $at, $f12 ## $f12 = 32.00 /* 0C00C 80B759AC 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0C010 80B759B0 00000000 */ nop -/* 0C014 80B759B4 4600020D */ trunc.w.s $f8, $f0 +/* 0C014 80B759B4 4600020D */ trunc.w.s $f8, $f0 /* 0C018 80B759B8 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0C01C 80B759BC 440D4000 */ mfc1 $t5, $f8 +/* 0C01C 80B759BC 440D4000 */ mfc1 $t5, $f8 /* 0C020 80B759C0 00000000 */ nop -/* 0C024 80B759C4 01A17821 */ addu $t7, $t5, $at +/* 0C024 80B759C4 01A17821 */ addu $t7, $t5, $at /* 0C028 80B759C8 A60F0166 */ sh $t7, 0x0166($s0) ## 00000166 .L80B759CC: /* 0C02C 80B759CC 3C014680 */ lui $at, 0x4680 ## $at = 46800000 /* 0C030 80B759D0 44816000 */ mtc1 $at, $f12 ## $f12 = 16384.00 /* 0C034 80B759D4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0C038 80B759D8 00000000 */ nop -/* 0C03C 80B759DC 4600010D */ trunc.w.s $f4, $f0 +/* 0C03C 80B759DC 4600010D */ trunc.w.s $f4, $f0 /* 0C040 80B759E0 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 0C044 80B759E4 3C0180B8 */ lui $at, %hi(D_80B7B73C) ## $at = 80B80000 -/* 0C048 80B759E8 440A2000 */ mfc1 $t2, $f4 +/* 0C048 80B759E8 440A2000 */ mfc1 $t2, $f4 /* 0C04C 80B759EC 00000000 */ nop /* 0C050 80B759F0 A60A0168 */ sh $t2, 0x0168($s0) ## 00000168 -/* 0C054 80B759F4 C426B73C */ lwc1 $f6, %lo(D_80B7B73C)($at) +/* 0C054 80B759F4 C426B73C */ lwc1 $f6, %lo(D_80B7B73C)($at) /* 0C058 80B759F8 3C0180B8 */ lui $at, %hi(D_80B7B740) ## $at = 80B80000 /* 0C05C 80B759FC E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 -/* 0C060 80B75A00 C42AB740 */ lwc1 $f10, %lo(D_80B7B740)($at) -/* 0C064 80B75A04 1000002D */ beq $zero, $zero, .L80B75ABC +/* 0C060 80B75A00 C42AB740 */ lwc1 $f10, %lo(D_80B7B740)($at) +/* 0C064 80B75A04 1000002D */ beq $zero, $zero, .L80B75ABC /* 0C068 80B75A08 E60A019C */ swc1 $f10, 0x019C($s0) ## 0000019C .L80B75A0C: /* 0C06C 80B75A0C 860E0158 */ lh $t6, 0x0158($s0) ## 00000158 /* 0C070 80B75A10 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0C074 80B75A14 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0C078 80B75A18 15C10028 */ bne $t6, $at, .L80B75ABC +/* 0C078 80B75A18 15C10028 */ bne $t6, $at, .L80B75ABC /* 0C07C 80B75A1C E6080184 */ swc1 $f8, 0x0184($s0) ## 00000184 /* 0C080 80B75A20 860C015C */ lh $t4, 0x015C($s0) ## 0000015C /* 0C084 80B75A24 31990001 */ andi $t9, $t4, 0x0001 ## $t9 = 00000000 -/* 0C088 80B75A28 17200024 */ bne $t9, $zero, .L80B75ABC +/* 0C088 80B75A28 17200024 */ bne $t9, $zero, .L80B75ABC /* 0C08C 80B75A2C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0C090 80B75A30 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0C094 80B75A34 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0C098 80B75A38 02214821 */ addu $t1, $s1, $at +/* 0C098 80B75A38 02214821 */ addu $t1, $s1, $at /* 0C09C 80B75A3C 260B00E4 */ addiu $t3, $s0, 0x00E4 ## $t3 = 000000E4 -/* 0C0A0 80B75A40 AFAB004C */ sw $t3, 0x004C($sp) +/* 0C0A0 80B75A40 AFAB004C */ sw $t3, 0x004C($sp) /* 0C0A4 80B75A44 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0C0A8 80B75A48 AFA90048 */ sw $t1, 0x0048($sp) + +/* 0C0A8 80B75A48 AFA90048 */ sw $t1, 0x0048($sp) /* 0C0AC 80B75A4C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 0C0B0 80B75A50 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0C0B4 80B75A54 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 0C0B8 80B75A58 46040180 */ add.s $f6, $f0, $f4 +/* 0C0B8 80B75A58 46040180 */ add.s $f6, $f0, $f4 /* 0C0BC 80B75A5C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0C0C0 80B75A60 E7A60074 */ swc1 $f6, 0x0074($sp) + +/* 0C0C0 80B75A60 E7A60074 */ swc1 $f6, 0x0074($sp) /* 0C0C4 80B75A64 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 0C0C8 80B75A68 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0C0CC 80B75A6C 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 0C0D0 80B75A70 460A0200 */ add.s $f8, $f0, $f10 +/* 0C0D0 80B75A70 460A0200 */ add.s $f8, $f0, $f10 /* 0C0D4 80B75A74 3C0180B8 */ lui $at, %hi(D_80B7B744) ## $at = 80B80000 -/* 0C0D8 80B75A78 8FAD0048 */ lw $t5, 0x0048($sp) -/* 0C0DC 80B75A7C 8FA4004C */ lw $a0, 0x004C($sp) -/* 0C0E0 80B75A80 E7A8007C */ swc1 $f8, 0x007C($sp) +/* 0C0D8 80B75A78 8FAD0048 */ lw $t5, 0x0048($sp) +/* 0C0DC 80B75A7C 8FA4004C */ lw $a0, 0x004C($sp) +/* 0C0E0 80B75A80 E7A8007C */ swc1 $f8, 0x007C($sp) /* 0C0E4 80B75A84 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 /* 0C0E8 80B75A88 27A60074 */ addiu $a2, $sp, 0x0074 ## $a2 = FFFFFF3C -/* 0C0EC 80B75A8C 46062280 */ add.s $f10, $f4, $f6 -/* 0C0F0 80B75A90 C424B744 */ lwc1 $f4, %lo(D_80B7B744)($at) +/* 0C0EC 80B75A8C 46062280 */ add.s $f10, $f4, $f6 +/* 0C0F0 80B75A90 C424B744 */ lwc1 $f4, %lo(D_80B7B744)($at) /* 0C0F4 80B75A94 3C0180B8 */ lui $at, %hi(D_80B7B748) ## $at = 80B80000 -/* 0C0F8 80B75A98 E7AA0078 */ swc1 $f10, 0x0078($sp) +/* 0C0F8 80B75A98 E7AA0078 */ swc1 $f10, 0x0078($sp) /* 0C0FC 80B75A9C C60801AC */ lwc1 $f8, 0x01AC($s0) ## 000001AC -/* 0C100 80B75AA0 C42AB748 */ lwc1 $f10, %lo(D_80B7B748)($at) +/* 0C100 80B75AA0 C42AB748 */ lwc1 $f10, %lo(D_80B7B748)($at) /* 0C104 80B75AA4 8DA51E10 */ lw $a1, 0x1E10($t5) ## 00001E10 -/* 0C108 80B75AA8 46044182 */ mul.s $f6, $f8, $f4 -/* 0C10C 80B75AAC 460A3200 */ add.s $f8, $f6, $f10 -/* 0C110 80B75AB0 44074000 */ mfc1 $a3, $f8 -/* 0C114 80B75AB4 0C2DA7B4 */ jal func_80B69ED0 +/* 0C108 80B75AA8 46044182 */ mul.s $f6, $f8, $f4 +/* 0C10C 80B75AAC 460A3200 */ add.s $f8, $f6, $f10 +/* 0C110 80B75AB0 44074000 */ mfc1 $a3, $f8 +/* 0C114 80B75AB4 0C2DA7B4 */ jal func_80B69ED0 /* 0C118 80B75AB8 00000000 */ nop .L80B75ABC: /* 0C11C 80B75ABC 920201D2 */ lbu $v0, 0x01D2($s0) ## 000001D2 .L80B75AC0: -/* 0C120 80B75AC0 10400034 */ beq $v0, $zero, .L80B75B94 +/* 0C120 80B75AC0 10400034 */ beq $v0, $zero, .L80B75B94 /* 0C124 80B75AC4 3C0180B8 */ lui $at, %hi(D_80B7B74C) ## $at = 80B80000 -/* 0C128 80B75AC8 C426B74C */ lwc1 $f6, %lo(D_80B7B74C)($at) +/* 0C128 80B75AC8 C426B74C */ lwc1 $f6, %lo(D_80B7B74C)($at) /* 0C12C 80B75ACC C60401AC */ lwc1 $f4, 0x01AC($s0) ## 000001AC /* 0C130 80B75AD0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0C134 80B75AD4 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 0C138 80B75AD8 46062282 */ mul.s $f10, $f4, $f6 +/* 0C138 80B75AD8 46062282 */ mul.s $f10, $f4, $f6 /* 0C13C 80B75ADC 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 0C140 80B75AE0 A20F01D2 */ sb $t7, 0x01D2($s0) ## 000001D2 /* 0C144 80B75AE4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0C148 80B75AE8 02215021 */ addu $t2, $s1, $at +/* 0C148 80B75AE8 02215021 */ addu $t2, $s1, $at /* 0C14C 80B75AEC 261800E4 */ addiu $t8, $s0, 0x00E4 ## $t8 = 000000E4 -/* 0C150 80B75AF0 AFB8004C */ sw $t8, 0x004C($sp) -/* 0C154 80B75AF4 46085300 */ add.s $f12, $f10, $f8 -/* 0C158 80B75AF8 AFAA0048 */ sw $t2, 0x0048($sp) -/* 0C15C 80B75AFC A7A00072 */ sh $zero, 0x0072($sp) -/* 0C160 80B75B00 E7AC0060 */ swc1 $f12, 0x0060($sp) +/* 0C150 80B75AF0 AFB8004C */ sw $t8, 0x004C($sp) +/* 0C154 80B75AF4 46085300 */ add.s $f12, $f10, $f8 +/* 0C158 80B75AF8 AFAA0048 */ sw $t2, 0x0048($sp) +/* 0C15C 80B75AFC A7A00072 */ sh $zero, 0x0072($sp) +/* 0C160 80B75B00 E7AC0060 */ swc1 $f12, 0x0060($sp) .L80B75B04: /* 0C164 80B75B04 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0C168 80B75B08 C7AC0060 */ lwc1 $f12, 0x0060($sp) + +/* 0C168 80B75B08 C7AC0060 */ lwc1 $f12, 0x0060($sp) /* 0C16C 80B75B0C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 0C170 80B75B10 C7AC0060 */ lwc1 $f12, 0x0060($sp) -/* 0C174 80B75B14 46040180 */ add.s $f6, $f0, $f4 +/* 0C170 80B75B10 C7AC0060 */ lwc1 $f12, 0x0060($sp) +/* 0C174 80B75B14 46040180 */ add.s $f6, $f0, $f4 /* 0C178 80B75B18 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0C17C 80B75B1C E7A60064 */ swc1 $f6, 0x0064($sp) + +/* 0C17C 80B75B1C E7A60064 */ swc1 $f6, 0x0064($sp) /* 0C180 80B75B20 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 0C184 80B75B24 C7AC0060 */ lwc1 $f12, 0x0060($sp) -/* 0C188 80B75B28 460A0200 */ add.s $f8, $f0, $f10 +/* 0C184 80B75B24 C7AC0060 */ lwc1 $f12, 0x0060($sp) +/* 0C188 80B75B28 460A0200 */ add.s $f8, $f0, $f10 /* 0C18C 80B75B2C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0C190 80B75B30 E7A80068 */ swc1 $f8, 0x0068($sp) + +/* 0C190 80B75B30 E7A80068 */ swc1 $f8, 0x0068($sp) /* 0C194 80B75B34 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 0C198 80B75B38 3C0180B8 */ lui $at, %hi(D_80B7B750) ## $at = 80B80000 -/* 0C19C 80B75B3C C42CB750 */ lwc1 $f12, %lo(D_80B7B750)($at) -/* 0C1A0 80B75B40 46040180 */ add.s $f6, $f0, $f4 +/* 0C19C 80B75B3C C42CB750 */ lwc1 $f12, %lo(D_80B7B750)($at) +/* 0C1A0 80B75B40 46040180 */ add.s $f6, $f0, $f4 /* 0C1A4 80B75B44 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0C1A8 80B75B48 E7A6006C */ swc1 $f6, 0x006C($sp) + +/* 0C1A8 80B75B48 E7A6006C */ swc1 $f6, 0x006C($sp) /* 0C1AC 80B75B4C 3C0180B8 */ lui $at, %hi(D_80B7B754) ## $at = 80B80000 -/* 0C1B0 80B75B50 C42AB754 */ lwc1 $f10, %lo(D_80B7B754)($at) -/* 0C1B4 80B75B54 8FAE0048 */ lw $t6, 0x0048($sp) -/* 0C1B8 80B75B58 8FA4004C */ lw $a0, 0x004C($sp) -/* 0C1BC 80B75B5C 460A0200 */ add.s $f8, $f0, $f10 +/* 0C1B0 80B75B50 C42AB754 */ lwc1 $f10, %lo(D_80B7B754)($at) +/* 0C1B4 80B75B54 8FAE0048 */ lw $t6, 0x0048($sp) +/* 0C1B8 80B75B58 8FA4004C */ lw $a0, 0x004C($sp) +/* 0C1BC 80B75B5C 460A0200 */ add.s $f8, $f0, $f10 /* 0C1C0 80B75B60 8DC51E10 */ lw $a1, 0x1E10($t6) ## 00001E10 -/* 0C1C4 80B75B64 AFA00010 */ sw $zero, 0x0010($sp) +/* 0C1C4 80B75B64 AFA00010 */ sw $zero, 0x0010($sp) /* 0C1C8 80B75B68 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFF2C -/* 0C1CC 80B75B6C 44074000 */ mfc1 $a3, $f8 -/* 0C1D0 80B75B70 0C2DA802 */ jal func_80B6A008 +/* 0C1CC 80B75B6C 44074000 */ mfc1 $a3, $f8 +/* 0C1D0 80B75B70 0C2DA802 */ jal func_80B6A008 /* 0C1D4 80B75B74 00000000 */ nop -/* 0C1D8 80B75B78 87A20072 */ lh $v0, 0x0072($sp) +/* 0C1D8 80B75B78 87A20072 */ lh $v0, 0x0072($sp) /* 0C1DC 80B75B7C 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 0C1E0 80B75B80 00021400 */ sll $v0, $v0, 16 -/* 0C1E4 80B75B84 00021403 */ sra $v0, $v0, 16 -/* 0C1E8 80B75B88 28410002 */ slti $at, $v0, 0x0002 -/* 0C1EC 80B75B8C 1420FFDD */ bne $at, $zero, .L80B75B04 -/* 0C1F0 80B75B90 A7A20072 */ sh $v0, 0x0072($sp) +/* 0C1E0 80B75B80 00021400 */ sll $v0, $v0, 16 +/* 0C1E4 80B75B84 00021403 */ sra $v0, $v0, 16 +/* 0C1E8 80B75B88 28410002 */ slti $at, $v0, 0x0002 +/* 0C1EC 80B75B8C 1420FFDD */ bne $at, $zero, .L80B75B04 +/* 0C1F0 80B75B90 A7A20072 */ sh $v0, 0x0072($sp) .L80B75B94: -/* 0C1F4 80B75B94 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0C1F8 80B75B98 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 0C1FC 80B75B9C 8FB0002C */ lw $s0, 0x002C($sp) -/* 0C200 80B75BA0 8FB10030 */ lw $s1, 0x0030($sp) -/* 0C204 80B75BA4 03E00008 */ jr $ra +/* 0C1F4 80B75B94 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0C1F8 80B75B98 D7B40020 */ ldc1 $f20, 0x0020($sp) +/* 0C1FC 80B75B9C 8FB0002C */ lw $s0, 0x002C($sp) +/* 0C200 80B75BA0 8FB10030 */ lw $s1, 0x0030($sp) +/* 0C204 80B75BA4 03E00008 */ jr $ra /* 0C208 80B75BA8 27BD0138 */ addiu $sp, $sp, 0x0138 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s index 63de1884d4..28b56cd950 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s @@ -1,38 +1,38 @@ glabel func_80B7A278 /* 108D8 80B7A278 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 108DC 80B7A27C AFB00028 */ sw $s0, 0x0028($sp) +/* 108DC 80B7A27C AFB00028 */ sw $s0, 0x0028($sp) /* 108E0 80B7A280 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 108E4 80B7A284 AFBF002C */ sw $ra, 0x002C($sp) -/* 108E8 80B7A288 AFA40068 */ sw $a0, 0x0068($sp) +/* 108E4 80B7A284 AFBF002C */ sw $ra, 0x002C($sp) +/* 108E8 80B7A288 AFA40068 */ sw $a0, 0x0068($sp) /* 108EC 80B7A28C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 108F0 80B7A290 3C0680B8 */ lui $a2, %hi(D_80B7B304) ## $a2 = 80B80000 /* 108F4 80B7A294 24C6B304 */ addiu $a2, $a2, %lo(D_80B7B304) ## $a2 = 80B7B304 /* 108F8 80B7A298 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 108FC 80B7A29C 240723C4 */ addiu $a3, $zero, 0x23C4 ## $a3 = 000023C4 -/* 10900 80B7A2A0 0C031AB1 */ jal func_800C6AC4 -/* 10904 80B7A2A4 AFA50058 */ sw $a1, 0x0058($sp) -/* 10908 80B7A2A8 0C024F46 */ jal func_80093D18 +/* 10900 80B7A2A0 0C031AB1 */ jal func_800C6AC4 +/* 10904 80B7A2A4 AFA50058 */ sw $a1, 0x0058($sp) +/* 10908 80B7A2A8 0C024F46 */ jal func_80093D18 /* 1090C 80B7A2AC 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 10910 80B7A2B0 0C024F61 */ jal func_80093D84 +/* 10910 80B7A2B0 0C024F61 */ jal func_80093D84 /* 10914 80B7A2B4 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 10918 80B7A2B8 8FA80068 */ lw $t0, 0x0068($sp) +/* 10918 80B7A2B8 8FA80068 */ lw $t0, 0x0068($sp) /* 1091C 80B7A2BC 3C0180B8 */ lui $at, %hi(D_80B7B8E4) ## $at = 80B80000 -/* 10920 80B7A2C0 C424B8E4 */ lwc1 $f4, %lo(D_80B7B8E4)($at) +/* 10920 80B7A2C0 C424B8E4 */ lwc1 $f4, %lo(D_80B7B8E4)($at) /* 10924 80B7A2C4 C50200EC */ lwc1 $f2, 0x00EC($t0) ## 000000EC -/* 10928 80B7A2C8 4604103C */ c.lt.s $f2, $f4 +/* 10928 80B7A2C8 4604103C */ c.lt.s $f2, $f4 /* 1092C 80B7A2CC 00000000 */ nop -/* 10930 80B7A2D0 4500002E */ bc1f .L80B7A38C +/* 10930 80B7A2D0 4500002E */ bc1f .L80B7A38C /* 10934 80B7A2D4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 10938 80B7A2D8 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 1093C 80B7A2DC C50000E4 */ lwc1 $f0, 0x00E4($t0) ## 000000E4 /* 10940 80B7A2E0 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 10944 80B7A2E4 46023200 */ add.s $f8, $f6, $f2 +/* 10944 80B7A2E4 46023200 */ add.s $f8, $f6, $f2 /* 10948 80B7A2E8 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 1094C 80B7A2EC 8FA90058 */ lw $t1, 0x0058($sp) -/* 10950 80B7A2F0 46000005 */ abs.s $f0, $f0 -/* 10954 80B7A2F4 4608003C */ c.lt.s $f0, $f8 +/* 1094C 80B7A2EC 8FA90058 */ lw $t1, 0x0058($sp) +/* 10950 80B7A2F0 46000005 */ abs.s $f0, $f0 +/* 10954 80B7A2F4 4608003C */ c.lt.s $f0, $f8 /* 10958 80B7A2F8 00000000 */ nop -/* 1095C 80B7A2FC 45000023 */ bc1f .L80B7A38C +/* 1095C 80B7A2FC 45000023 */ bc1f .L80B7A38C /* 10960 80B7A300 00000000 */ nop /* 10964 80B7A304 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 10968 80B7A308 3C0480B8 */ lui $a0, %hi(D_80B7AFF4) ## $a0 = 80B80000 @@ -43,94 +43,94 @@ glabel func_80B7A278 /* 1097C 80B7A31C 85180160 */ lh $t8, 0x0160($t0) ## 00000160 /* 10980 80B7A320 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 10984 80B7A324 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 10988 80B7A328 0018C880 */ sll $t9, $t8, 2 -/* 1098C 80B7A32C 00992021 */ addu $a0, $a0, $t9 -/* 10990 80B7A330 8C84AFF4 */ lw $a0, %lo(D_80B7AFF4)($a0) +/* 10988 80B7A328 0018C880 */ sll $t9, $t8, 2 +/* 1098C 80B7A32C 00992021 */ addu $a0, $a0, $t9 +/* 10990 80B7A330 8C84AFF4 */ lw $a0, %lo(D_80B7AFF4)($a0) /* 10994 80B7A334 3C1980B8 */ lui $t9, %hi(func_80B7A10C) ## $t9 = 80B80000 /* 10998 80B7A338 2739A10C */ addiu $t9, $t9, %lo(func_80B7A10C) ## $t9 = 80B7A10C -/* 1099C 80B7A33C 00045900 */ sll $t3, $a0, 4 -/* 109A0 80B7A340 000B6702 */ srl $t4, $t3, 28 -/* 109A4 80B7A344 000C6880 */ sll $t5, $t4, 2 -/* 109A8 80B7A348 01CD7021 */ addu $t6, $t6, $t5 +/* 1099C 80B7A33C 00045900 */ sll $t3, $a0, 4 +/* 109A0 80B7A340 000B6702 */ srl $t4, $t3, 28 +/* 109A4 80B7A344 000C6880 */ sll $t5, $t4, 2 +/* 109A8 80B7A348 01CD7021 */ addu $t6, $t6, $t5 /* 109AC 80B7A34C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 109B0 80B7A350 00815024 */ and $t2, $a0, $at +/* 109B0 80B7A350 00815024 */ and $t2, $a0, $at /* 109B4 80B7A354 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 109B8 80B7A358 014E7821 */ addu $t7, $t2, $t6 -/* 109BC 80B7A35C 01E1C021 */ addu $t8, $t7, $at +/* 109B8 80B7A358 014E7821 */ addu $t7, $t2, $t6 +/* 109BC 80B7A35C 01E1C021 */ addu $t8, $t7, $at /* 109C0 80B7A360 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 109C4 80B7A364 910701DA */ lbu $a3, 0x01DA($t0) ## 000001DA /* 109C8 80B7A368 8D0601F8 */ lw $a2, 0x01F8($t0) ## 000001F8 /* 109CC 80B7A36C 8D0501DC */ lw $a1, 0x01DC($t0) ## 000001DC /* 109D0 80B7A370 3C0B80B8 */ lui $t3, %hi(func_80B7A140) ## $t3 = 80B80000 /* 109D4 80B7A374 256BA140 */ addiu $t3, $t3, %lo(func_80B7A140) ## $t3 = 80B7A140 -/* 109D8 80B7A378 AFAB0014 */ sw $t3, 0x0014($sp) -/* 109DC 80B7A37C AFA80018 */ sw $t0, 0x0018($sp) -/* 109E0 80B7A380 AFB90010 */ sw $t9, 0x0010($sp) -/* 109E4 80B7A384 0C0286B2 */ jal func_800A1AC8 +/* 109D8 80B7A378 AFAB0014 */ sw $t3, 0x0014($sp) +/* 109DC 80B7A37C AFA80018 */ sw $t0, 0x0018($sp) +/* 109E0 80B7A380 AFB90010 */ sw $t9, 0x0010($sp) +/* 109E4 80B7A384 0C0286B2 */ jal SkelAnime_DrawSV /* 109E8 80B7A388 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B7A38C: -/* 109EC 80B7A38C 0C2DD91D */ jal func_80B76474 +/* 109EC 80B7A38C 0C2DD91D */ jal func_80B76474 /* 109F0 80B7A390 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 109F4 80B7A394 3C040001 */ lui $a0, 0x0001 ## $a0 = 00010000 -/* 109F8 80B7A398 00902021 */ addu $a0, $a0, $s0 +/* 109F8 80B7A398 00902021 */ addu $a0, $a0, $s0 /* 109FC 80B7A39C 8C841E10 */ lw $a0, 0x1E10($a0) ## 00011E10 -/* 10A00 80B7A3A0 0C2DAD9D */ jal func_80B6B674 +/* 10A00 80B7A3A0 0C2DAD9D */ jal func_80B6B674 /* 10A04 80B7A3A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10A08 80B7A3A8 0C2DDC73 */ jal func_80B771CC +/* 10A08 80B7A3A8 0C2DDC73 */ jal func_80B771CC /* 10A0C 80B7A3AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10A10 80B7A3B0 0C2DB04D */ jal func_80B6C134 +/* 10A10 80B7A3B0 0C2DB04D */ jal func_80B6C134 /* 10A14 80B7A3B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 10A18 80B7A3B8 3C0380B8 */ lui $v1, %hi(D_80B7E0A6) ## $v1 = 80B80000 /* 10A1C 80B7A3BC 2463E0A6 */ addiu $v1, $v1, %lo(D_80B7E0A6) ## $v1 = 80B7E0A6 /* 10A20 80B7A3C0 84620000 */ lh $v0, 0x0000($v1) ## 80B7E0A6 -/* 10A24 80B7A3C4 1040001B */ beq $v0, $zero, .L80B7A434 +/* 10A24 80B7A3C4 1040001B */ beq $v0, $zero, .L80B7A434 /* 10A28 80B7A3C8 244CFFFF */ addiu $t4, $v0, 0xFFFF ## $t4 = FFFFFFFF /* 10A2C 80B7A3CC A46C0000 */ sh $t4, 0x0000($v1) ## 80B7E0A6 /* 10A30 80B7A3D0 846D0000 */ lh $t5, 0x0000($v1) ## 80B7E0A6 /* 10A34 80B7A3D4 3C0A80B8 */ lui $t2, %hi(D_80B7E075) ## $t2 = 80B80000 -/* 10A38 80B7A3D8 15A00016 */ bne $t5, $zero, .L80B7A434 +/* 10A38 80B7A3D8 15A00016 */ bne $t5, $zero, .L80B7A434 /* 10A3C 80B7A3DC 00000000 */ nop -/* 10A40 80B7A3E0 914AE075 */ lbu $t2, %lo(D_80B7E075)($t2) +/* 10A40 80B7A3E0 914AE075 */ lbu $t2, %lo(D_80B7E075)($t2) /* 10A44 80B7A3E4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 10A48 80B7A3E8 11410005 */ beq $t2, $at, .L80B7A400 +/* 10A48 80B7A3E8 11410005 */ beq $t2, $at, .L80B7A400 /* 10A4C 80B7A3EC 00000000 */ nop /* 10A50 80B7A3F0 0C03E803 */ jal Audio_SetBGM - + /* 10A54 80B7A3F4 24040019 */ addiu $a0, $zero, 0x0019 ## $a0 = 00000019 -/* 10A58 80B7A3F8 10000003 */ beq $zero, $zero, .L80B7A408 +/* 10A58 80B7A3F8 10000003 */ beq $zero, $zero, .L80B7A408 /* 10A5C 80B7A3FC 00000000 */ nop .L80B7A400: /* 10A60 80B7A400 0C03E803 */ jal Audio_SetBGM - + /* 10A64 80B7A404 24040027 */ addiu $a0, $zero, 0x0027 ## $a0 = 00000027 .L80B7A408: /* 10A68 80B7A408 3C0E80B8 */ lui $t6, %hi(D_80B7E075) ## $t6 = 80B80000 -/* 10A6C 80B7A40C 91CEE075 */ lbu $t6, %lo(D_80B7E075)($t6) +/* 10A6C 80B7A40C 91CEE075 */ lbu $t6, %lo(D_80B7E075)($t6) /* 10A70 80B7A410 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 10A74 80B7A414 11C10005 */ beq $t6, $at, .L80B7A42C +/* 10A74 80B7A414 11C10005 */ beq $t6, $at, .L80B7A42C /* 10A78 80B7A418 00000000 */ nop /* 10A7C 80B7A41C 0C03E803 */ jal Audio_SetBGM - + /* 10A80 80B7A420 24040019 */ addiu $a0, $zero, 0x0019 ## $a0 = 00000019 -/* 10A84 80B7A424 10000003 */ beq $zero, $zero, .L80B7A434 +/* 10A84 80B7A424 10000003 */ beq $zero, $zero, .L80B7A434 /* 10A88 80B7A428 00000000 */ nop .L80B7A42C: /* 10A8C 80B7A42C 0C03E803 */ jal Audio_SetBGM - + /* 10A90 80B7A430 24040027 */ addiu $a0, $zero, 0x0027 ## $a0 = 00000027 .L80B7A434: /* 10A94 80B7A434 3C0F80B8 */ lui $t7, %hi(D_80B7E0AC) ## $t7 = 80B80000 -/* 10A98 80B7A438 85EFE0AC */ lh $t7, %lo(D_80B7E0AC)($t7) +/* 10A98 80B7A438 85EFE0AC */ lh $t7, %lo(D_80B7E0AC)($t7) /* 10A9C 80B7A43C 3C1880B8 */ lui $t8, %hi(D_80B7A674) ## $t8 = 80B80000 -/* 10AA0 80B7A440 51E00022 */ beql $t7, $zero, .L80B7A4CC +/* 10AA0 80B7A440 51E00022 */ beql $t7, $zero, .L80B7A4CC /* 10AA4 80B7A444 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 10AA8 80B7A448 9318A674 */ lbu $t8, %lo(D_80B7A674)($t8) -/* 10AAC 80B7A44C 5300001F */ beql $t8, $zero, .L80B7A4CC +/* 10AA8 80B7A448 9318A674 */ lbu $t8, %lo(D_80B7A674)($t8) +/* 10AAC 80B7A44C 5300001F */ beql $t8, $zero, .L80B7A4CC /* 10AB0 80B7A450 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 10AB4 80B7A454 0C2DB7CC */ jal func_80B6DF30 +/* 10AB4 80B7A454 0C2DB7CC */ jal func_80B6DF30 /* 10AB8 80B7A458 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 10ABC 80B7A45C 3C0480B8 */ lui $a0, %hi(D_80B7E168) ## $a0 = 80B80000 -/* 10AC0 80B7A460 0C2DB258 */ jal func_80B6C960 +/* 10AC0 80B7A460 0C2DB258 */ jal func_80B6C960 /* 10AC4 80B7A464 2484E168 */ addiu $a0, $a0, %lo(D_80B7E168) ## $a0 = 80B7E168 /* 10AC8 80B7A468 3C1980B8 */ lui $t9, %hi(D_80B7F428) ## $t9 = 80B80000 /* 10ACC 80B7A46C 2739F428 */ addiu $t9, $t9, %lo(D_80B7F428) ## $t9 = 80B7F428 @@ -140,43 +140,43 @@ glabel func_80B7A278 /* 10ADC 80B7A47C 24E7EAC8 */ addiu $a3, $a3, %lo(D_80B7EAC8) ## $a3 = 80B7EAC8 /* 10AE0 80B7A480 24C6E168 */ addiu $a2, $a2, %lo(D_80B7E168) ## $a2 = 80B7E168 /* 10AE4 80B7A484 24A5E158 */ addiu $a1, $a1, %lo(D_80B7E158) ## $a1 = 80B7E158 -/* 10AE8 80B7A488 AFB90010 */ sw $t9, 0x0010($sp) -/* 10AEC 80B7A48C 0C2DB0F8 */ jal func_80B6C3E0 +/* 10AE8 80B7A488 AFB90010 */ sw $t9, 0x0010($sp) +/* 10AEC 80B7A48C 0C2DB0F8 */ jal func_80B6C3E0 /* 10AF0 80B7A490 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 10AF4 80B7A494 3C0580B8 */ lui $a1, %hi(D_80B7E168) ## $a1 = 80B80000 /* 10AF8 80B7A498 3C0680B8 */ lui $a2, %hi(D_80B7EAC8) ## $a2 = 80B80000 /* 10AFC 80B7A49C 24C6EAC8 */ addiu $a2, $a2, %lo(D_80B7EAC8) ## $a2 = 80B7EAC8 /* 10B00 80B7A4A0 24A5E168 */ addiu $a1, $a1, %lo(D_80B7E168) ## $a1 = 80B7E168 -/* 10B04 80B7A4A4 0C2DB5A2 */ jal func_80B6D688 +/* 10B04 80B7A4A4 0C2DB5A2 */ jal func_80B6D688 /* 10B08 80B7A4A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 10B0C 80B7A4AC 26020014 */ addiu $v0, $s0, 0x0014 ## $v0 = 00000014 /* 10B10 80B7A4B0 804B0014 */ lb $t3, 0x0014($v0) ## 00000028 /* 10B14 80B7A4B4 3C0180B8 */ lui $at, %hi(D_80B7A6C4) ## $at = 80B80000 -/* 10B18 80B7A4B8 A42BA6C4 */ sh $t3, %lo(D_80B7A6C4)($at) +/* 10B18 80B7A4B8 A42BA6C4 */ sh $t3, %lo(D_80B7A6C4)($at) /* 10B1C 80B7A4BC 804C0015 */ lb $t4, 0x0015($v0) ## 00000029 /* 10B20 80B7A4C0 3C0180B8 */ lui $at, %hi(D_80B7A6C8) ## $at = 80B80000 -/* 10B24 80B7A4C4 A42CA6C8 */ sh $t4, %lo(D_80B7A6C8)($at) +/* 10B24 80B7A4C4 A42CA6C8 */ sh $t4, %lo(D_80B7A6C8)($at) /* 10B28 80B7A4C8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 .L80B7A4CC: /* 10B2C 80B7A4CC 3C0180B8 */ lui $at, %hi(D_80B7A674) ## $at = 80B80000 -/* 10B30 80B7A4D0 A02DA674 */ sb $t5, %lo(D_80B7A674)($at) +/* 10B30 80B7A4D0 A02DA674 */ sb $t5, %lo(D_80B7A674)($at) /* 10B34 80B7A4D4 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 10B38 80B7A4D8 44816000 */ mtc1 $at, $f12 ## $f12 = 130.00 /* 10B3C 80B7A4DC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 10B40 80B7A4E0 44817000 */ mtc1 $at, $f14 ## $f14 = 40.00 /* 10B44 80B7A4E4 3C0644A2 */ lui $a2, 0x44A2 ## $a2 = 44A20000 /* 10B48 80B7A4E8 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 44A28000 -/* 10B4C 80B7A4EC 0C034261 */ jal Matrix_Translate +/* 10B4C 80B7A4EC 0C034261 */ jal Matrix_Translate /* 10B50 80B7A4F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 10B54 80B7A4F4 3C0180B8 */ lui $at, %hi(D_80B7B8E8) ## $at = 80B80000 -/* 10B58 80B7A4F8 C42CB8E8 */ lwc1 $f12, %lo(D_80B7B8E8)($at) +/* 10B58 80B7A4F8 C42CB8E8 */ lwc1 $f12, %lo(D_80B7B8E8)($at) /* 10B5C 80B7A4FC 3C0180B8 */ lui $at, %hi(D_80B7B8EC) ## $at = 80B80000 /* 10B60 80B7A500 3C063E0F */ lui $a2, 0x3E0F ## $a2 = 3E0F0000 /* 10B64 80B7A504 34C65C29 */ ori $a2, $a2, 0x5C29 ## $a2 = 3E0F5C29 -/* 10B68 80B7A508 C42EB8EC */ lwc1 $f14, %lo(D_80B7B8EC)($at) -/* 10B6C 80B7A50C 0C0342A3 */ jal Matrix_Scale +/* 10B68 80B7A508 C42EB8EC */ lwc1 $f14, %lo(D_80B7B8EC)($at) +/* 10B6C 80B7A50C 0C0342A3 */ jal Matrix_Scale /* 10B70 80B7A510 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 10B74 80B7A514 8FA70058 */ lw $a3, 0x0058($sp) +/* 10B74 80B7A514 8FA70058 */ lw $a3, 0x0058($sp) /* 10B78 80B7A518 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 10B7C 80B7A51C 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 /* 10B80 80B7A520 8CE202C0 */ lw $v0, 0x02C0($a3) ## 000002C0 @@ -187,13 +187,13 @@ glabel func_80B7A278 /* 10B94 80B7A534 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 10B98 80B7A538 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 /* 10B9C 80B7A53C 24062451 */ addiu $a2, $zero, 0x2451 ## $a2 = 00002451 -/* 10BA0 80B7A540 0C0346A2 */ jal Matrix_NewMtx -/* 10BA4 80B7A544 AFA20040 */ sw $v0, 0x0040($sp) -/* 10BA8 80B7A548 8FA30040 */ lw $v1, 0x0040($sp) +/* 10BA0 80B7A540 0C0346A2 */ jal Matrix_NewMtx +/* 10BA4 80B7A544 AFA20040 */ sw $v0, 0x0040($sp) +/* 10BA8 80B7A548 8FA30040 */ lw $v1, 0x0040($sp) /* 10BAC 80B7A54C 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 /* 10BB0 80B7A550 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 /* 10BB4 80B7A554 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 10BB8 80B7A558 8FA70058 */ lw $a3, 0x0058($sp) +/* 10BB8 80B7A558 8FA70058 */ lw $a3, 0x0058($sp) /* 10BBC 80B7A55C 3C0580B8 */ lui $a1, %hi(D_80B7B324) ## $a1 = 80B80000 /* 10BC0 80B7A560 24A5B324 */ addiu $a1, $a1, %lo(D_80B7B324) ## $a1 = 80B7B324 /* 10BC4 80B7A564 8CE202D0 */ lw $v0, 0x02D0($a3) ## 000002D0 @@ -202,13 +202,13 @@ glabel func_80B7A278 /* 10BD0 80B7A570 ACEF02D0 */ sw $t7, 0x02D0($a3) ## 000002D0 /* 10BD4 80B7A574 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 10BD8 80B7A578 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 10BDC 80B7A57C 0C0346A2 */ jal Matrix_NewMtx -/* 10BE0 80B7A580 AFA2003C */ sw $v0, 0x003C($sp) -/* 10BE4 80B7A584 8FA3003C */ lw $v1, 0x003C($sp) +/* 10BDC 80B7A57C 0C0346A2 */ jal Matrix_NewMtx +/* 10BE0 80B7A580 AFA2003C */ sw $v0, 0x003C($sp) +/* 10BE4 80B7A584 8FA3003C */ lw $v1, 0x003C($sp) /* 10BE8 80B7A588 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 /* 10BEC 80B7A58C 258C53D0 */ addiu $t4, $t4, 0x53D0 ## $t4 = 060153D0 /* 10BF0 80B7A590 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 10BF4 80B7A594 8FB90058 */ lw $t9, 0x0058($sp) +/* 10BF4 80B7A594 8FB90058 */ lw $t9, 0x0058($sp) /* 10BF8 80B7A598 3C04DE00 */ lui $a0, 0xDE00 ## $a0 = DE000000 /* 10BFC 80B7A59C 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 /* 10C00 80B7A5A0 8F2202C0 */ lw $v0, 0x02C0($t9) ## 000002C0 @@ -218,33 +218,33 @@ glabel func_80B7A278 /* 10C10 80B7A5B0 AF2B02C0 */ sw $t3, 0x02C0($t9) ## 000002C0 /* 10C14 80B7A5B4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 10C18 80B7A5B8 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 10C1C 80B7A5BC 8FAD0058 */ lw $t5, 0x0058($sp) +/* 10C1C 80B7A5BC 8FAD0058 */ lw $t5, 0x0058($sp) /* 10C20 80B7A5C0 3C1880B8 */ lui $t8, %hi(D_80B7E0B6) ## $t8 = 80B80000 /* 10C24 80B7A5C4 8DA202D0 */ lw $v0, 0x02D0($t5) ## 000002D0 /* 10C28 80B7A5C8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 10C2C 80B7A5CC ADAA02D0 */ sw $t2, 0x02D0($t5) ## 000002D0 /* 10C30 80B7A5D0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 10C34 80B7A5D4 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 10C38 80B7A5D8 85EFE0AC */ lh $t7, %lo(D_80B7E0AC)($t7) -/* 10C3C 80B7A5DC 11E00007 */ beq $t7, $zero, .L80B7A5FC +/* 10C38 80B7A5D8 85EFE0AC */ lh $t7, %lo(D_80B7E0AC)($t7) +/* 10C3C 80B7A5DC 11E00007 */ beq $t7, $zero, .L80B7A5FC /* 10C40 80B7A5E0 00000000 */ nop -/* 10C44 80B7A5E4 9318E0B6 */ lbu $t8, %lo(D_80B7E0B6)($t8) +/* 10C44 80B7A5E4 9318E0B6 */ lbu $t8, %lo(D_80B7E0B6)($t8) /* 10C48 80B7A5E8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 10C4C 80B7A5EC 17010003 */ bne $t8, $at, .L80B7A5FC +/* 10C4C 80B7A5EC 17010003 */ bne $t8, $at, .L80B7A5FC /* 10C50 80B7A5F0 00000000 */ nop -/* 10C54 80B7A5F4 0C2DB4D5 */ jal func_80B6D354 +/* 10C54 80B7A5F4 0C2DB4D5 */ jal func_80B6D354 /* 10C58 80B7A5F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B7A5FC: /* 10C5C 80B7A5FC 3C0680B8 */ lui $a2, %hi(D_80B7B334) ## $a2 = 80B80000 /* 10C60 80B7A600 24C6B334 */ addiu $a2, $a2, %lo(D_80B7B334) ## $a2 = 80B7B334 /* 10C64 80B7A604 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 10C68 80B7A608 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 10C6C 80B7A60C 0C031AD5 */ jal func_800C6B54 +/* 10C6C 80B7A60C 0C031AD5 */ jal func_800C6B54 /* 10C70 80B7A610 24072459 */ addiu $a3, $zero, 0x2459 ## $a3 = 00002459 -/* 10C74 80B7A614 8FBF002C */ lw $ra, 0x002C($sp) -/* 10C78 80B7A618 8FB00028 */ lw $s0, 0x0028($sp) +/* 10C74 80B7A614 8FBF002C */ lw $ra, 0x002C($sp) +/* 10C78 80B7A618 8FB00028 */ lw $s0, 0x0028($sp) /* 10C7C 80B7A61C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 10C80 80B7A620 03E00008 */ jr $ra +/* 10C80 80B7A620 03E00008 */ jr $ra /* 10C84 80B7A624 00000000 */ nop /* 10C88 80B7A628 00000000 */ nop /* 10C8C 80B7A62C 00000000 */ nop diff --git a/include/functions.h b/include/functions.h index 11b24b3dc1..1d0668aea3 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1129,61 +1129,83 @@ s32 Scene_ExecuteCommands(GlobalContext* globalCtx, SceneCmd* sceneCmd); void func_80098CBC(GlobalContext* globalCtx, u8* nbTransitionActors); void func_800994A0(GlobalContext* globalCtx); void Scene_Draw(GlobalContext* globalCtx); -// ? func_800A08A0(?); -// ? func_800A0D94(?); -// ? func_800A106C(?); -// ? func_800A1344(?); +void SkelAnime_LodDraw(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, s32 dListIndex); +void SkelAnime_LodDrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, s32 limbCount, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, s32 dListIndex); void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor); -// ? func_800A180C(?); -void func_800A1AC8(GlobalContext* globalCtx, u32 limbIndex, u32 actorDrawTbl, u32 dListCount, void* posUpdateFunc, +void SkelAnime_DrawSV(GlobalContext* globalCtx, u32 limbIndex, u32 actorDrawTbl, u32 dListCount, void* posUpdateFunc, void* drawFunc, Actor* actor); -// ? func_800A1D8C(?); -// ? func_800A1FC8(?); s32 SkelAnime_GetFrameCount(u32 animation); -// ? func_800A2044(?); -// ? func_800A24A0(?); -Gfx* func_800A273C(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, s32 dListCount, +Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, + Actor* actor, Gfx* gfx); +Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, s32 dListCount, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Gfx* gfx); -// ? func_800A2E70(?); -// ? func_800A32EC(?); -// ? func_800A3334(?); -// ? func_800A336C(?); -// ? func_800A3478(?); -// ? func_800A34DC(?); -// ? func_800A390C(?); -// ? func_800A39AC(?); -// ? func_800A3B8C(?); -// ? func_800A3BE4(?); -// ? func_800A3C9C(?); -// ? func_800A3F08(?); -// ? func_800A3D70(?); -// ? func_800A4478(?); -void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 skelAnimeInitSeg, u32 animation, Vec3s* actorDrawTable, - s32 arg5, s32 limbCount); -void func_800A46F8(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 skelAnimeInitSeg, u32 animation, Vec3s* actorDrawTable, - s32 arg5, s32 limbCount); -// ? func_800A4A20(?); -// ? func_800A4AD8(?); -// ? func_800A4D9C(?); -// ? func_800A4EE0(?); -// ? func_800A487C(?); -// ? func_800A49B0(?); +void func_800A2E70(u8,Vec3s*,Vec3s*,Vec3s*,f32); +void func_800A32EC(u16* arg0); +void func_800A32F4(s32 arg0); +void func_800A3310(void* arg0); +void func_800A336C(GlobalContext* globalCtx, u32 linkAnimetionSeg, s32 frame, s32 limbCount, void* ram); +void func_800A3478(GlobalContext* globalCtx, s32 vecCount, + Vec3s* dst, Vec3s* src); +void func_800A34DC(GlobalContext* globalCtx, s32 arg1, + Vec3s* arg2, Vec3s* arg3, f32 arg4); +void func_800A3548(GlobalContext* globalCtx, s32 vecCount, + s32 dst, s32 src, s32 index); +void func_800A35B4(GlobalContext* globalCtx, s32 vecCount, + Vec3s* dst, Vec3s* src, u8* index); +void func_800A3620(GlobalContext* globalCtx, Actor* actor, + SkelAnime* skelAnime, f32 arg3); +void func_800A390C(GlobalContext* globalCtx, AnimationContext* animationCtx); +void func_800A39AC(GlobalContext* globalCtx, SkelAnime *skelAnime, u32 limbHeaderSeg, u32* animation, + s32 flags, Vec3s* actorDrawTbl, Vec3s* arg6, s32 limbBufCount); +void func_800A3B8C(SkelAnime* skelAnime); +void func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime); +void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime); +void func_800A3EE8(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2); +void func_800A3F08(GlobalContext* globalCtx, SkelAnime* skelAnime, u32* animation, f32 playbackSpeed, + f32 arg4, f32 frameCount, u8 arg6, f32 arg7); +void func_800A407C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation); +void func_800A40DC(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 playbackSpeed); +void func_800A4140(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation); +void func_800A419C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 playbackSpeed); +void func_800A41FC(GlobalContext* globalCtx, SkelAnime* skelAnime); +void func_800A425C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 frame); +void func_800A42A0(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 frame); +void func_800A42E4(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 frame); +void func_800A431C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animationSeg, + f32 frame, s32 arg4, f32 arg5, f32 arg6, s32 arg7); +void func_800A43B8(GlobalContext* globalCtx, SkelAnime *skelAnime, u32 animation, + f32 frame, s32 arg4, f32 arg5, f32 arg6, s32 arg7); +s32 func_800A4530(SkelAnime* skelAnime, f32 arg1); +void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, + u32 animation, Vec3s* actorDrawTable, s32 arg5, s32 limbCount); +void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, + u32 animation, Vec3s* actorDrawTable, s32 arg5, s32 limbCount); +void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime *skelAnime, + u32 limbHeaderSeg, u32 animation); s32 SkelAnime_FrameUpdateMatrix(SkelAnime* skelAnime); -// ? func_800A4C58(?); -// ? func_800A4FE4(?); -void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 unk0, f32 frameCount, - u8 unk1, f32 transitionRate); -void func_800A51E8(SkelAnime *skelAnime, u32 animation); -void func_800A5240(SkelAnime *skelAnime, u32 animation, f32 unk0); -void func_800A529C(SkelAnime *skelAnime, u32 animation, f32 unk0); -// ? func_800A52F8(?); -// ? func_800A54FC(?); +void SkelAnime_ChangeAnimationImpl(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, + f32 unk0, f32 frameCount, u8 unk1, f32 transitionRate, s8 unk2); +void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, + f32 unk0, f32 frameCount, u8 unk1, f32 transitionRate); +void func_800A51E8(SkelAnime* skelAnime, u32 animation); +void func_800A5240(SkelAnime* skelAnime, u32 animation, f32 transitionRate); +void func_800A529C(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed); +void SkelAnime_ChangeAnimationDefault(SkelAnime* skelAnime, u32 animation); +void SkelAnime_ChangeAnimationTransitionRate(SkelAnime* skelAnime, u32 animation, f32 transitionRate); +void SkelAnime_ChangeAnimationPlaybackSpeed(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed); +void func_800A5408(SkelAnime* skelAnime); +void func_800A5428(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* index); +void func_800A54FC(SkelAnime* skelAnime, Vec3f* pos, s16 angle); s32 func_800A56C8(SkelAnime* skelAnime, f32 arg1); -// ? func_800A56F0(?); -// ? func_800A5774(?); +void SkelAnime_Free(SkelAnime* skelAnime, GlobalContext* globalCtx); // ? func_800A57C0(?); // ? func_800A598C(?); // ? func_800A5E28(?); diff --git a/include/z64animation.h b/include/z64animation.h index 47720bc4ac..7f9b047ef1 100755 --- a/include/z64animation.h +++ b/include/z64animation.h @@ -5,6 +5,9 @@ #include #include +#define LINK_ANIMETION_OFFSET(addr,offset) (((u32)&_link_animetionSegmentRomStart)+((u32)addr)-((u32)&link_animetion_segment)+((u32)offset)) +#define LIMB_DONE 0xFF + struct GlobalContext; struct Actor; @@ -23,11 +26,11 @@ typedef struct typedef struct { - u32 limbIndexSeg; // Segment address of SkelLimbIndex. - u8 limbCount; // Number of limbs in the model. - char pad[3]; // Padding. - u8 dListCount; // Number of display lists in the model. - char pad2[3]; // Padding. + /* 0x000 */ u32 limbIndexSeg; // Segment address of SkelLimbIndex. + /* 0x004 */ u8 limbCount; // Number of limbs in the model. + /* 0x005 */ char pad[3]; // Padding. + /* 0x008 */ u8 dListCount; // Number of display lists in the model. + /* 0x009 */ char pad2[3]; // Padding. } SkelAnimeLimbHeader; // Size = 0xC typedef struct SkelAnime @@ -63,19 +66,19 @@ typedef s16 AnimationRotationValue; typedef struct { - u16 x; - u16 y; - u16 z; -} AnimationRotationIndex; + /* 0x000 */ u16 x; + /* 0x002 */ u16 y; + /* 0x004 */ u16 z; +} AnimationRotationIndex; // size = 0x06 typedef struct { /* 0x000 */ s16 frameCount; - /* 0x002 */ char pad[2]; - /* 0x004 */ u32 rotationValueSeg; // tbl - /* 0x008 */ u32 rotationIndexSeg; //ref_tbl + /* 0x002 */ s16 unk_02; + /* 0x004 */ u32 rotationValueSeg; // referenced as tbl + /* 0x008 */ u32 rotationIndexSeg; // referenced as ref_tbl /* 0x00C */ u16 limit; - /* 0x00E */ char pad2[2]; + /* 0x00E */ char pad[2]; } AnimationHeader; // size = 0x10 typedef enum { @@ -89,65 +92,65 @@ typedef enum { typedef struct { - DmaRequest req; - OSMesgQueue msgQueue; - OSMesg msg; + /* 0x000 */ DmaRequest req; + /* 0x020 */ OSMesgQueue msgQueue; + /* 0x038 */ OSMesg msg; } AnimationEntryType0; typedef struct { - u8 unk_00; - u8 vecCount; - char pad[2]; - Vec3s* dst; - Vec3s* src; - char unk_0C[0x30]; + /* 0x000 */ u8 unk_00; + /* 0x001 */ u8 vecCount; + /* 0x002 */ char pad[2]; + /* 0x004 */ Vec3s* dst; + /* 0x008 */ Vec3s* src; + /* 0x00C */ char unk_0C[0x30]; } AnimationEntryType1; typedef struct { - u8 unk_00; - u8 unk_01; - char pad[2]; - Vec3s* unk_04; - Vec3s* unk_08; - f32 unk_0C; - char unk_10[0x2C]; + /* 0x000 */ u8 unk_00; + /* 0x001 */ u8 unk_01; + /* 0x002 */ char pad[2]; + /* 0x004 */ Vec3s* unk_04; + /* 0x008 */ Vec3s* unk_08; + /* 0x00C */ f32 unk_0C; + /* 0x010 */ char unk_10[0x2C]; } AnimationEntryType2; typedef struct { - u8 unk_00; - u8 vecCount; - char pad[2]; - Vec3s* dst; - Vec3s* src; - u8* index; - char unk_10[0x2C]; + /* 0x000 */ u8 unk_00; + /* 0x001 */ u8 vecCount; + /* 0x002 */ char pad[2]; + /* 0x004 */ Vec3s* dst; + /* 0x008 */ Vec3s* src; + /* 0x00C */ u8* index; + /* 0x010 */ char unk_10[0x2C]; } AnimationEntryType3; typedef struct { - u8 unk_00; - u8 vecCount; - char unk_02[0x2]; - Vec3s* dst; - Vec3s* src; - u8* index; - char unk_10[0x2C]; + /* 0x000 */ u8 unk_00; + /* 0x001 */ u8 vecCount; + /* 0x002 */ char unk_02[0x2]; + /* 0x004 */ Vec3s* dst; + /* 0x008 */ Vec3s* src; + /* 0x00C */ u8* index; + /* 0x010 */ char unk_10[0x2C]; } AnimationEntryType4; typedef struct { - struct Actor* actor; - SkelAnime* skelAnime; - f32 unk_08; - char unk_0C[0x30]; + /* 0x000 */ struct Actor* actor; + /* 0x004 */ SkelAnime* skelAnime; + /* 0x008 */ f32 unk_08; + /* 0x00C */ char unk_0C[0x30]; } AnimationEntryType5; typedef struct { - u8 raw[0x3C]; + /* 0x000 */ u8 raw[0x3C]; } AnimationEntryRaw; typedef union @@ -198,11 +201,6 @@ typedef void (*SkelAnime_LimbAppendDlist2)(struct GlobalContext* globalCtx, s32 typedef void (*AnimationEntryCallback)(struct GlobalContext*, AnimationEntryType*); -extern u32 link_animetion_segment; // 0x07000000 -#define LINK_ANIMETION_OFFSET(addr,offset) (((u32)&_link_animetionSegmentRomStart)+((u32)addr)-((u32)&link_animetion_segment)+((u32)offset)) - -#define LIMB_DONE 0xFF - -#define LOG(file,line,msg,arg) LogUtils_LogThreadId(file, line); osSyncPrintf(msg, arg) +extern u32 link_animetion_segment; #endif diff --git a/src/code/z_actor.c b/src/code/z_actor.c index be598da4a1..01ff7ed32a 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -910,7 +910,7 @@ void func_8002D9A4(Actor* actor, f32 arg1) { void func_8002D9F8(Actor* actor, UNK_PTR arg1) { Vec3f sp1C; - func_800A54FC(arg1, &sp1C, actor->shape.rot.y, actor); + func_800A54FC(arg1, &sp1C, actor->shape.rot.y); actor->posRot.pos.x += sp1C.x * actor->scale.x; actor->posRot.pos.y += sp1C.y * actor->scale.y; actor->posRot.pos.z += sp1C.z * actor->scale.z; @@ -3887,7 +3887,7 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc gDPPipeSync(gfxCtx->polyOpa.p++); gSPSegment(gfxCtx->polyOpa.p++, 0x0C, func_80034B28(globalCtx->state.gfxCtx)); - gfxCtx->polyOpa.p = func_800A273C(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount, + gfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount, unkFunc1, unkFunc2, actor, gfxCtx->polyOpa.p); func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8860); @@ -3906,7 +3906,7 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, alpha); gSPSegment(gfxCtx->polyXlu.p++, 0x0C, func_80034B54(globalCtx->state.gfxCtx)); - gfxCtx->polyXlu.p = func_800A273C(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount, + gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount, unkFunc1, unkFunc2, actor, gfxCtx->polyXlu.p); func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8904); diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 97dd3fb9e5..9066a226cd 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -1,40 +1,37 @@ #include #include -s32 func_800A4478(SkelAnime*,f32,f32); -void func_800A52F8(SkelAnime* skelAnime, u32 animation); -void func_800A54FC(SkelAnime*,Vec3f*,s16); s32 func_800A3D70(GlobalContext*,SkelAnime*); s32 func_800A3E0C(GlobalContext*,SkelAnime*); -void func_800A34DC(GlobalContext*,s32,Vec3s*,Vec3s*,f32); -void func_800A336C(GlobalContext* globalCtx, u32 linkAnimetionSeg, s32 frame, s32 limbCount, void* ram); s32 func_800A4D9C(SkelAnime* skelAnime); s32 func_800A4EE0(SkelAnime* skelAnime); s32 func_800A4E38(SkelAnime* skelAnime); -void func_800A1D8C(u32 animation, s32 currentFrame, s32 limbCount, Vec3s *arg3); -void func_800A2E70(u8,Vec3s*,Vec3s*,Vec3s*,f32); -void func_800A49B0(SkelAnime*); -void func_800A3478(GlobalContext*,s32,Vec3s*,Vec3s*); -void func_800A3F08(GlobalContext* globalCtx, SkelAnime* skelAnime, u32* animation, f32 playbackSpeed, f32 arg4, f32 frameCount, u8 arg6, f32 arg7); -void func_800A4FE4(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 unk0, f32 frameCount, u8 unk1, f32 transitionRate, s8 unk2); +void SkelAnime_CopyVec3s(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src); +void func_800A3678(GlobalContext* globalCtx, AnimationEntryType0* entry); +void func_800A36A4(GlobalContext* globalCtx, AnimationEntryType1* entry); +void func_800A3714(GlobalContext* globalCtx, AnimationEntryType2* entry); +void func_800A3770(GlobalContext* globalCtx, AnimationEntryType3* entry); +void func_800A37F0(GlobalContext* globalCtx, AnimationEntryType4* entry); +void func_800A3874(GlobalContext* globalCtx, AnimationEntryType5* entry); //.data u32 D_8012A480 = 0; static AnimationEntryCallback D_8012A484[] = { - (AnimationEntryCallback)0x800A3678, - (AnimationEntryCallback)0x800A36A4, - (AnimationEntryCallback)0x800A3714, - (AnimationEntryCallback)0x800A3770, - (AnimationEntryCallback)0x800A37F0, - (AnimationEntryCallback)0x800A3874, + (AnimationEntryCallback)&func_800A3678, + (AnimationEntryCallback)&func_800A36A4, + (AnimationEntryCallback)&func_800A3714, + (AnimationEntryCallback)&func_800A3770, + (AnimationEntryCallback)&func_800A37F0, + (AnimationEntryCallback)&func_800A3874, }; //.bss u32 D_801600B0; -// SkelAnime_LodDrawLimb -void func_800A08A0(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable , Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, s32 dListIndex) +void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable , Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, s32 dListIndex) { SkelLimbEntry* limbEntry; Gfx* dList; @@ -64,7 +61,10 @@ void func_800A08A0(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable , Vec { if(1) { - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 0x325), G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, + Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 0x325), + G_MTX_LOAD); + gSPDisplayList(gfxCtx->polyOpa.p++, dList); } } while(0); @@ -78,20 +78,24 @@ void func_800A08A0(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable , Vec if (limbEntry->firstChildIndex != LIMB_DONE) { - func_800A08A0(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex); + SkelAnime_LodDrawLimb(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, + updateMtxFunc, appendDlistFunc, actor, dListIndex); } Matrix_Pull(); if (limbEntry->nextLimbIndex != LIMB_DONE) { - func_800A08A0(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex); + SkelAnime_LodDrawLimb(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, + updateMtxFunc, appendDlistFunc, actor, dListIndex); } + func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 0x335); } -// SkelAnime_LodDraw -void func_800A0B40(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, s32 dListIndex) +void SkelAnime_LodDraw(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, s32 dListIndex) { SkelLimbEntry* limbEntry; char pad[4]; @@ -125,7 +129,10 @@ void func_800A0B40(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDrawTab Matrix_TranslateThenRotateZYX(&pos, &rot); if (dList != NULL) { - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 0x371), G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, + Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 0x371), + G_MTX_LOAD); + gSPDisplayList(gfxCtx->polyOpa.p++, dList); } } @@ -133,19 +140,20 @@ void func_800A0B40(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDrawTab { appendDlistFunc(globalCtx, 1, &dList, &rot, actor); } + if (limbEntry->firstChildIndex != 0xFF) { - func_800A08A0(globalCtx, limbEntry->firstChildIndex, limbIndex, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex); + SkelAnime_LodDrawLimb(globalCtx, limbEntry->firstChildIndex, limbIndex, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex); } + Matrix_Pull(); func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 0x37E); } #ifdef NON_MATCHING -// SkelAnime_LodDrawLimbSV -void func_800A0D94(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, - SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, - Actor* actor, s32 dListIndex, Mtx** mtx) +void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, s32 dListIndex, Mtx** mtx) { SkelLimbEntry* limbEntry; Gfx* dList[2]; @@ -190,7 +198,7 @@ void func_800A0D94(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3 } if (limbEntry->firstChildIndex != LIMB_DONE) { - func_800A0D94(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, + SkelAnime_LodDrawLimbSV(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex, mtx); } @@ -198,20 +206,18 @@ void func_800A0D94(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3 if (limbEntry->nextLimbIndex != LIMB_DONE) { - func_800A0D94(globalCtx, limbEntry->nextLimbIndex, limbTable, + SkelAnime_LodDrawLimbSV(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex, mtx); } } #else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A0D94.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawLimbSV.s") #endif #ifdef NON_MATCHING -// SkelAnime_LodDrawSV -// func_800A106C -void func_800A106C(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, s32 limbCount, - SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, - Actor* actor, s32 dListIndex) +void SkelAnime_LodDrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, s32 limbCount, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, s32 dListIndex) { SkelLimbEntry *limbEntry; Gfx* dList[2]; @@ -277,7 +283,7 @@ void func_800A106C(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTab } if (limbEntry->firstChildIndex != LIMB_DONE) { - func_800A0D94(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex, &mtx); + SkelAnime_LodDrawLimbSV(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex, &mtx); } Matrix_Pull(); @@ -285,12 +291,12 @@ void func_800A106C(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTab func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1053); } #else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A106C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawSV.s") #endif -// SkelAnime_DrawLimb -// func_800A1344 -void func_800A1344(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor) +void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor) { SkelLimbEntry* limbEntry; Gfx* dList; @@ -335,7 +341,7 @@ void func_800A1344(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3 if (limbEntry->firstChildIndex != LIMB_DONE) { - func_800A1344(globalCtx, limbEntry->firstChildIndex, limbTable, + SkelAnime_DrawLimb(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor); } @@ -343,14 +349,16 @@ void func_800A1344(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3 if (limbEntry->nextLimbIndex != LIMB_DONE) { - func_800A1344(globalCtx, limbEntry->nextLimbIndex, limbTable, + SkelAnime_DrawLimb(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor); } func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1121); } -void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor) +void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor) { SkelLimbEntry* rootLimb; char pad[4]; @@ -398,7 +406,7 @@ void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTa if (rootLimb->firstChildIndex != LIMB_DONE) { - func_800A1344(globalCtx, rootLimb->firstChildIndex, limbTable, + SkelAnime_DrawLimb(globalCtx, rootLimb->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor); } @@ -408,8 +416,9 @@ void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTa } #ifdef NON_MATCHING -// SkelAnime_Draw2Limb -void func_800A180C(GlobalContext *globalCtx, u32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, Mtx** limbMatricies) +void SkelAnime_DrawLimbSV(GlobalContext *globalCtx, u32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, Mtx** limbMatricies) { Gfx* limbDlist[2]; Vec3f limbPos; @@ -458,26 +467,27 @@ void func_800A180C(GlobalContext *globalCtx, u32 limbIndex, u32* limbTable, Vec3 if (limbEntry->firstChildIndex != LIMB_DONE) { - func_800A180C(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, limbMatricies); + SkelAnime_DrawLimbSV(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, limbMatricies); } Matrix_Pull(); if (limbEntry->nextLimbIndex != LIMB_DONE) { - func_800A180C(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, + SkelAnime_DrawLimbSV(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, limbMatricies); } func_800C6B54(sp34, globalCtx->state.gfxCtx, "../z_skelanime.c", 0x4F1); } #else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A180C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_DrawLimbSV.s") #endif #ifdef NON_MATCHING -// SkelAnime_Draw2 -void func_800A1AC8(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, u32 dListCount, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor) +void SkelAnime_DrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, u32 dListCount, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor) { SkelLimbEntry *rootLimb; Gfx* skelDlist[2]; @@ -540,7 +550,7 @@ void func_800A1AC8(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTab if (rootLimb->firstChildIndex != LIMB_DONE) { - func_800A180C(globalCtx, rootLimb->firstChildIndex, limbTable, actorDrawTable, + SkelAnime_DrawLimbSV(globalCtx, rootLimb->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, &limbMatricies); } @@ -548,16 +558,16 @@ void func_800A1AC8(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTab func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1347); } #else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A1AC8.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_DrawSV.s") #endif #undef NON_MATCHING -/* SkelAnime_AnimateFrame +/* * Copies the rotation values from the rotation value table, indexed by the rotation index table * When a rotation index is >= the animation limit, the output rotation value is copied from the frame's * rotation value list, otherwise it is copied from the initial rotation value list */ -void func_800A1D8C(u32 animation, s32 currentFrame, s32 limbCount, Vec3s *dst) +void SkelAnime_AnimateFrame(u32 animation, s32 currentFrame, s32 limbCount, Vec3s *dst) { AnimationRotationIndex* index; AnimationRotationValue* rotationValueTable; @@ -580,10 +590,10 @@ void func_800A1D8C(u32 animation, s32 currentFrame, s32 limbCount, Vec3s *dst) (rotationValueTable == NULL)) { if(1) { } // Necessary to match. - LOG("../z_skelanime.c", 0x570, "out = %08x\n", dst); - LOG("../z_skelanime.c", 0x571, "ref_tbl = %08x\n", index); - LOG("../z_skelanime.c", 0x572, "frame_tbl = %08x\n", frameRotationValueTable); - LOG("../z_skelanime.c", 0x573, "tbl = %08x\n", rotationValueTable); + LogUtils_LogThreadId("../z_skelanime.c", 1392); osSyncPrintf("out = %08x\n", dst); + LogUtils_LogThreadId("../z_skelanime.c", 1393); osSyncPrintf("ref_tbl = %08x\n", index); + LogUtils_LogThreadId("../z_skelanime.c", 1394); osSyncPrintf("frame_tbl = %08x\n", frameRotationValueTable); + LogUtils_LogThreadId("../z_skelanime.c", 1395); osSyncPrintf("tbl = %08x\n", rotationValueTable); } dst->x = index->x >= limit ? frameRotationValueTable[index->x] : rotationValueTable[index->x]; @@ -592,21 +602,22 @@ void func_800A1D8C(u32 animation, s32 currentFrame, s32 limbCount, Vec3s *dst) } } -s32 func_800A1FC8(s32 arg0) +s16 func_800A1FC8(u32 animationSeg) { - u16* virt = (u16*)SEGMENTED_TO_VIRTUAL(arg0); - return (s16)(*virt); + AnimationHeader* animation = (u16*)SEGMENTED_TO_VIRTUAL(animationSeg); + return animation->frameCount; } -s32 SkelAnime_GetFrameCount(u32 animation) +s32 SkelAnime_GetFrameCount(u32 animationSeg) { - u16* virt = (u16*)SEGMENTED_TO_VIRTUAL(animation); + AnimationHeader* animation = (u16*)SEGMENTED_TO_VIRTUAL(animationSeg); - return (s16)(*virt - 1); + return (s16)((u16)animation->frameCount - 1); } -// SkelAnime_DrawLimb2 -Gfx* func_800A2044(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Gfx* gfx) +Gfx* SkelAnime_Draw2Limb(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, + Actor* actor, Gfx* gfx) { SkelLimbEntry* limbEntry; Gfx* dList; @@ -643,14 +654,16 @@ Gfx* func_800A2044(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3 if (limbEntry->firstChildIndex != LIMB_DONE) { - gfx = func_800A2044(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, gfx); + gfx = SkelAnime_Draw2Limb(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, + updateMtxFunc, appendDlistFunc, actor, gfx); } Matrix_Pull(); if (limbEntry->nextLimbIndex != LIMB_DONE) { - gfx = func_800A2044(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, gfx); + gfx = SkelAnime_Draw2Limb(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, + updateMtxFunc, appendDlistFunc, actor, gfx); } return gfx; @@ -658,8 +671,9 @@ Gfx* func_800A2044(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3 #ifdef NON_MATCHING // Some regalloc, and nonmatching stack usage -// SkelAnime_Draw2 -Gfx* func_800A2288(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Gfx* gfx) +Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, + Actor* actor, Gfx* gfx) { SkelLimbEntry* limbEntry; Vec3f pos; @@ -703,7 +717,8 @@ Gfx* func_800A2288(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTab if (limbEntry->firstChildIndex != LIMB_DONE) { - gfx = func_800A2044(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, gfx); + gfx = SkelAnime_Draw2Limb(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, + updateMtxFunc, appendDlistFunc, actor, gfx); } Matrix_Pull(); @@ -711,11 +726,12 @@ Gfx* func_800A2288(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTab return gfx; } #else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A2288.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_Draw2.s") #endif -// SkelAnime_DrawLimbSV2 -Gfx* func_800A24A0(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Mtx** mtx, Gfx* gfx) +Gfx* SkelAnime_DrawLimbSV2(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, + Actor* actor, Mtx** mtx, Gfx* gfx) { SkelLimbEntry* limbEntry; Gfx* dList1; @@ -760,20 +776,22 @@ Gfx* func_800A24A0(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3 } if (limbEntry->firstChildIndex != LIMB_DONE) { - gfx = func_800A24A0(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, mtx, gfx); + gfx = SkelAnime_DrawLimbSV2(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, mtx, gfx); } Matrix_Pull(); if (limbEntry->nextLimbIndex != LIMB_DONE) { - gfx = func_800A24A0(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, mtx, gfx); + gfx = SkelAnime_DrawLimbSV2(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, mtx, gfx); } + return gfx; } -// SkelAnime_DrawSV2 -Gfx* func_800A273C(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, s32 dListCount, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Gfx* gfx) +Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, s32 dListCount, + SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, + Actor* actor, Gfx* gfx) { SkelLimbEntry* limbEntry; char pad[4]; @@ -791,6 +809,7 @@ Gfx* func_800A273C(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTab osSyncPrintf("\x1b[m"); return NULL; } + gSPSegment(gfx++, 0xD, mtx); Matrix_Push(); limbEntry = SEGMENTED_TO_VIRTUAL(*limbTable); @@ -828,35 +847,40 @@ Gfx* func_800A273C(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTab } if (limbEntry->firstChildIndex != LIMB_DONE) { - gfx = func_800A24A0(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, &mtx, gfx); + gfx = SkelAnime_DrawLimbSV2(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, &mtx, gfx); } + Matrix_Pull(); + return gfx; } +// Seems to be some kind of rotations update, somewhat large. #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A29BC.s") -s16 func_800A2DBC(s32 arg0) +s16 func_800A2DBC(u32 animationSeg) { - u16* virt = SEGMENTED_TO_VIRTUAL(arg0); + AnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); - return virt[1]; + return animation->unk_02; } -s16 func_800A2DF4(s32 arg0) +s16 func_800A2DF4(u32 animationSeg) { - u16* virt = SEGMENTED_TO_VIRTUAL(arg0); + AnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); - return *virt; + return animation->frameCount; } -s32 func_800A2E2C(s32 arg0){ - s16* virt = SEGMENTED_TO_VIRTUAL(arg0); +s16 func_800A2E2C(u32 animationSeg) +{ + AnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); - return (s16)(*virt - 1); + return (s16)(animation->frameCount - 1); } -// Big boi function +// Very large update function #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A2E70.s") void func_800A32EC(u16* arg0) @@ -876,8 +900,8 @@ void func_800A3310(void* arg0) *D_8012A480Ptr |= D_801600B0; } -// SkelAnime_NextEntry -AnimationEntry* func_800A3334(AnimationContext* animationCtx, AnimationType type) + +AnimationEntry* SkelAnime_NextEntry(AnimationContext* animationCtx, AnimationType type) { AnimationEntry *entry; s16 index = animationCtx->animationCount; @@ -893,18 +917,17 @@ AnimationEntry* func_800A3334(AnimationContext* animationCtx, AnimationType type } /* - * These next 6 functions seem to inialize an entry in the global context's - * animation context. + * The next 6 functions are coordinate with the AnimationType enum */ -// SkelAnime_LinkAnimetionDma void func_800A336C(GlobalContext* globalCtx, u32 linkAnimetionSeg, s32 frame, s32 limbCount, void* ram) { AnimationEntry* entry; LinkAnimetionEntry *linkAnimetionEntry; char pad[4]; - entry = func_800A3334(&globalCtx->animationCtx, 0); + entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE0); + if (entry != NULL) { linkAnimetionEntry = SEGMENTED_TO_VIRTUAL(linkAnimetionSeg); @@ -914,11 +937,11 @@ void func_800A336C(GlobalContext* globalCtx, u32 linkAnimetionSeg, s32 frame, s3 "../z_skelanime.c" , 0x7D4); } } -//SkelAnime_AnimationEntryType1Init + void func_800A3478(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src) { - AnimationEntry* entry = func_800A3334(&globalCtx->animationCtx, 1); + AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE1); if (entry != NULL) { entry->types.type1.unk_00 = D_801600B0; @@ -927,11 +950,11 @@ void func_800A3478(GlobalContext* globalCtx, s32 vecCount, entry->types.type1.src = src; } } -//SkelAnime_AnimationEntryType2Init + void func_800A34DC(GlobalContext* globalCtx, s32 arg1, Vec3s* arg2, Vec3s* arg3, f32 arg4) { - AnimationEntry* entry = func_800A3334(&globalCtx->animationCtx, 2); + AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE2); if (entry != NULL) { entry->types.type2.unk_00 = D_801600B0; @@ -941,11 +964,11 @@ void func_800A34DC(GlobalContext* globalCtx, s32 arg1, entry->types.type2.unk_0C = arg4; } } -//SkelAnime_AnimationEntryType3Init + void func_800A3548(GlobalContext* globalCtx, s32 vecCount, s32 dst, s32 src, s32 index) { - AnimationEntry* entry = func_800A3334(&globalCtx->animationCtx, 3); + AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE3); if (entry != NULL) { entry->types.type3.unk_00 = D_801600B0; @@ -955,11 +978,11 @@ void func_800A3548(GlobalContext* globalCtx, s32 vecCount, entry->types.type3.index = index; } } -//SkelAnime_AnimationEntryType4Init + void func_800A35B4(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src, u8* index) { - AnimationEntry* entry = func_800A3334(&globalCtx->animationCtx, 4); + AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE4); if (entry != NULL) { entry->types.type4.unk_00 = D_801600B0; @@ -969,11 +992,11 @@ void func_800A35B4(GlobalContext* globalCtx, s32 vecCount, entry->types.type4.index = index; } } -//SkelAnime_AnimationEntryType4Init + void func_800A3620(GlobalContext* globalCtx, Actor* actor, SkelAnime* skelAnime, f32 arg3) { - AnimationEntry* entry = func_800A3334(&globalCtx->animationCtx, 5); + AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE5); if (entry != NULL) { entry->types.type5.actor = actor; @@ -1084,7 +1107,8 @@ void func_800A390C(GlobalContext* globalCtx, AnimationContext* animationCtx) D_8012A480 = 0; } -void func_800A39AC(GlobalContext* globalCtx, SkelAnime *skelAnime, u32 limbHeaderSeg, u32* animation, s32 flags, Vec3s* actorDrawTbl, Vec3s* arg6, s32 limbBufCount) +void func_800A39AC(GlobalContext* globalCtx, SkelAnime *skelAnime, u32 limbHeaderSeg, u32* animation, + s32 flags, Vec3s* actorDrawTbl, Vec3s* arg6, s32 limbBufCount) { char pad[8]; SkelAnimeLimbHeader *limbHeader; @@ -1143,7 +1167,6 @@ void func_800A39AC(GlobalContext* globalCtx, SkelAnime *skelAnime, u32 limbHeade func_800A3F08(globalCtx, skelAnime, animation, 1.0f, 0.0f, 0.0f, 0, 0.0f); } -// SkelAnime_SetUpdateFunc void func_800A3B8C(SkelAnime* skelAnime) { if (skelAnime->unk_01 < 2) @@ -1157,7 +1180,6 @@ void func_800A3B8C(SkelAnime* skelAnime) skelAnime->unk_28 = 0.0f; } -//SkelAnime_FrameUpdateMatrixGlobalCtx void func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime) { skelAnime->animUpdate(globalCtx, skelAnime); @@ -1216,7 +1238,6 @@ s32 func_800A3D70(GlobalContext* globalCtx, SkelAnime* skelAnime) return 0; } -// returns 1 if animation is done? s32 func_800A3E0C(GlobalContext* globalCtx, SkelAnime* skelAnime) { f32 updateRate = R_UPDATE_RATE * 0.5f; @@ -1257,7 +1278,8 @@ void func_800A3EE8(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2) } #ifdef NON_MATCHING -void func_800A3F08(GlobalContext* globalCtx, SkelAnime* skelAnime, u32* animation, f32 playbackSpeed, f32 arg4, f32 frameCount, u8 arg6, f32 arg7) +void func_800A3F08(GlobalContext* globalCtx, SkelAnime* skelAnime, u32* animation, f32 playbackSpeed, + f32 arg4, f32 frameCount, u8 arg6, f32 arg7) { skelAnime->unk_01 = arg6; @@ -1267,7 +1289,7 @@ void func_800A3F08(GlobalContext* globalCtx, SkelAnime* skelAnime, u32* animatio if(arg7 < 0.0f) { func_800A3B8C(skelAnime); - func_800A5774(skelAnime, skelAnime->unk_24, skelAnime->actorDrawTbl); + SkelAnime_CopyVec3s(skelAnime, skelAnime->unk_24, skelAnime->actorDrawTbl); arg7 = -arg7; } else @@ -1313,7 +1335,7 @@ void func_800A4140(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation void func_800A419C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 playbackSpeed) { - func_800A3F08(globalCtx, skelAnime, animation, playbackSpeed, 0.0f, (f32) SkelAnime_GetFrameCount(animation), 0, 0.0f); + func_800A3F08(globalCtx, skelAnime, animation, playbackSpeed, 0.0f, (f32)SkelAnime_GetFrameCount(animation), 0, 0.0f); } void func_800A41FC(GlobalContext* globalCtx, SkelAnime* skelAnime) @@ -1326,14 +1348,14 @@ void func_800A422C(GlobalContext* globalCtx, SkelAnime* skelAnime) func_800A3478(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24); } -void func_800A425C(GlobalContext* globalCtx, SkelAnime* skelAnime, s32 arg2, f32 arg3) +void func_800A425C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 frame) { - func_800A336C(globalCtx, arg2, (s32) arg3, skelAnime->limbCount, skelAnime->unk_24); + func_800A336C(globalCtx, animation, (s32)frame, skelAnime->limbCount, skelAnime->unk_24); } -void func_800A42A0(GlobalContext* globalCtx, SkelAnime* skelAnime, s32 arg2, f32 arg3) +void func_800A42A0(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 frame) { - func_800A336C(globalCtx, arg2, (s32) arg3, skelAnime->limbCount, skelAnime->actorDrawTbl); + func_800A336C(globalCtx, animation, (s32)frame, skelAnime->limbCount, skelAnime->actorDrawTbl); } void func_800A42E4(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2) @@ -1341,18 +1363,20 @@ void func_800A42E4(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2) func_800A34DC(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24, arg2); } -void func_800A431C(GlobalContext* globalCtx, SkelAnime* skelAnime, s32 arg2, f32 arg3, s32 arg4, f32 arg5, f32 arg6, s32 arg7) +void func_800A431C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animationSeg, + f32 frame, s32 arg4, f32 arg5, f32 arg6, s32 arg7) { s32 alignedAddr; - func_800A336C(globalCtx, arg2, (s32) arg3, skelAnime->limbCount, skelAnime->actorDrawTbl); + func_800A336C(globalCtx, animationSeg, (s32)frame, skelAnime->limbCount, skelAnime->actorDrawTbl); alignedAddr = ALIGN16(arg7); - func_800A336C(globalCtx, arg4, (s32) arg5, skelAnime->limbCount, alignedAddr); + func_800A336C(globalCtx, arg4, (s32)arg5, skelAnime->limbCount, alignedAddr); func_800A34DC(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, alignedAddr, arg6); } -void func_800A43B8(GlobalContext* globalCtx, SkelAnime *skelAnime, u32 animation, f32 frame, s32 arg4, f32 arg5, f32 arg6, s32 arg7) +void func_800A43B8(GlobalContext* globalCtx, SkelAnime *skelAnime, u32 animation, + f32 frame, s32 arg4, f32 arg5, f32 arg6, s32 arg7) { s32 alignedAddr; @@ -1414,7 +1438,8 @@ s32 func_800A4530(SkelAnime* skelAnime, f32 arg1) return func_800A4478(skelAnime, arg1, updateRate); } -void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, u32 animation, Vec3s* actorDrawTable, s32 arg5, s32 limbCount) +void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, + u32 animation, Vec3s* actorDrawTable, s32 arg5, s32 limbCount) { SkelAnimeLimbHeader* limbHeader; @@ -1444,11 +1469,12 @@ void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHead if (animation != 0) { - func_800A52F8(skelAnime, animation); + SkelAnime_ChangeAnimationDefault(skelAnime, animation); } } -// SkelAnime_InitSV -void func_800A46F8(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, u32 animation, Vec3s* actorDrawTable, s32 arg5, s32 limbCount) + +void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, + u32 animation, Vec3s* actorDrawTable, s32 arg5, s32 limbCount) { SkelAnimeLimbHeader *limbHeader; @@ -1459,8 +1485,11 @@ void func_800A46F8(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeade if (actorDrawTable == NULL) { - skelAnime->actorDrawTbl = ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->actorDrawTbl), "../z_skelanime.c", 3047); - skelAnime->unk_24 = ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->unk_24), "../z_skelanime.c", 3048); + skelAnime->actorDrawTbl = ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->actorDrawTbl), + "../z_skelanime.c", 3047); + + skelAnime->unk_24 = ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->unk_24), + "../z_skelanime.c", 3048); } else { @@ -1480,11 +1509,12 @@ void func_800A46F8(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeade if (animation != 0) { - func_800A52F8(skelAnime, animation); + SkelAnime_ChangeAnimationDefault(skelAnime, animation); } } -// SkelAnime_InitSkin -void func_800A487C(GlobalContext* globalCtx, SkelAnime *skelAnime, u32 limbHeaderSeg, u32 animation) + +void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime *skelAnime, + u32 limbHeaderSeg, u32 animation) { SkelAnimeLimbHeader *limbHeader; @@ -1502,7 +1532,7 @@ void func_800A487C(GlobalContext* globalCtx, SkelAnime *skelAnime, u32 limbHeade if (animation != 0) { - func_800A52F8(skelAnime, animation); + SkelAnime_ChangeAnimationDefault(skelAnime, animation); } } @@ -1592,7 +1622,6 @@ s32 func_800A4AD8(SkelAnime* skelAnime) #endif #ifdef NON_MATCHING -// close void func_800A4C58(SkelAnime* skelAnime) { char pad[6]; @@ -1602,7 +1631,7 @@ void func_800A4C58(SkelAnime* skelAnime) s32 temp_f8; f32 temp_f2; - func_800A1D8C(skelAnime->animCurrent, (s32) skelAnime->animCurrentFrame, skelAnime->limbCount, skelAnime->actorDrawTbl); + SkelAnime_AnimateFrame(skelAnime->animCurrent, (s32) skelAnime->animCurrentFrame, skelAnime->limbCount, skelAnime->actorDrawTbl); if ((skelAnime->unk_01 & 1) != 0) { temp_f8 = (s32) skelAnime->animCurrentFrame; @@ -1613,7 +1642,7 @@ void func_800A4C58(SkelAnime* skelAnime) { temp_f8 = 0; } - func_800A1D8C(skelAnime->animCurrent, temp_f8, skelAnime->limbCount, sp38); + SkelAnime_AnimateFrame(skelAnime->animCurrent, temp_f8, skelAnime->limbCount, sp38); func_800A2E70(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, sp38, temp_f2); } if (skelAnime->unk_28 != 0) @@ -1634,7 +1663,6 @@ void func_800A4C58(SkelAnime* skelAnime) #undef NON_MATCHING #ifdef NON_MATCHING -//reg alloc s32 func_800A4D9C(SkelAnime* skelAnime) { skelAnime->animCurrentFrame += (R_UPDATE_RATE * 0.33333334f) + skelAnime->animPlaybackSpeed; @@ -1655,7 +1683,6 @@ s32 func_800A4D9C(SkelAnime* skelAnime) #undef NON_MATCHING #ifdef NON_MATCHING -//reg alloc s32 func_800A4E38(SkelAnime* skelAnime) { skelAnime->animCurrentFrame += skelAnime->animPlaybackSpeed * (R_UPDATE_RATE * 0.33333334f); @@ -1686,7 +1713,7 @@ s32 func_800A4EE0(SkelAnime *skelAnime) if (skelAnime->animCurrentFrame == skelAnime->animFrameCount) { - func_800A1D8C(skelAnime->animCurrent, (s32)skelAnime->animCurrentFrame, skelAnime->limbCount, skelAnime->actorDrawTbl); + SkelAnime_AnimateFrame(skelAnime->animCurrent, (s32)skelAnime->animCurrentFrame, skelAnime->limbCount, skelAnime->actorDrawTbl); func_800A4C58(skelAnime); return 1; } @@ -1714,11 +1741,8 @@ s32 func_800A4EE0(SkelAnime *skelAnime) } #ifdef NON_MATCHING -// close some regalloc, missing move zero fpr -s32 func_800A4AD8(SkelAnime* skelAnime); -s32 func_800A4A20(SkelAnime* skelAnime); -void func_800A1D8C(u32,s32,u8,Vec3s*); -void func_800A4FE4(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 unk0, f32 frameCount, u8 unk1, f32 transitionRate, s8 unk2) +void SkelAnime_ChangeAnimationImpl(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, + f32 unk0, f32 frameCount, u8 unk1, f32 transitionRate, s8 unk2) { skelAnime->unk_01 = unk1; if ((transitionRate != 0.0f) && @@ -1727,7 +1751,7 @@ void func_800A4FE4(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 u if (transitionRate < 0.0f) { func_800A49B0(skelAnime); - func_800A5774(skelAnime, skelAnime->unk_24, skelAnime->actorDrawTbl); + SkelAnime_CopyVec3s(skelAnime, skelAnime->unk_24, skelAnime->actorDrawTbl); transitionRate = -transitionRate; } else @@ -1741,7 +1765,7 @@ void func_800A4FE4(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 u { skelAnime->mtxUpdate = (void*)&func_800A4A20; } - func_800A1D8C(animation, (s32)unk0, skelAnime->limbCount, skelAnime->actorDrawTbl); + SkelAnime_AnimateFrame(animation, (s32)unk0, skelAnime->limbCount, skelAnime->actorDrawTbl); } skelAnime->unk_28 = 1.0f; skelAnime->unk_2C = 1.0f / transitionRate; @@ -1749,7 +1773,7 @@ void func_800A4FE4(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 u else { func_800A49B0(skelAnime); - func_800A1D8C(animation, (s32)unk0, skelAnime->limbCount, skelAnime->actorDrawTbl); + SkelAnime_AnimateFrame(animation, (s32)unk0, skelAnime->limbCount, skelAnime->actorDrawTbl); skelAnime->unk_28 = 0.0f; } @@ -1772,44 +1796,44 @@ void func_800A4FE4(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 u skelAnime->animPlaybackSpeed = playbackSpeed; } #else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4FE4.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimationImpl.s") #endif #undef NON_MATCHING -void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 unk0, /* 0x10 */ f32 frameCount, /* 0x14 */ u8 unk1, /* 0x18 */ f32 transitionRate) +void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, + f32 unk0, f32 frameCount, u8 unk1, f32 transitionRate) { - func_800A4FE4(skelAnime, animation, playbackSpeed, unk0, frameCount, unk1, transitionRate, 0); + SkelAnime_ChangeAnimationImpl(skelAnime, animation, playbackSpeed, unk0, frameCount, unk1, transitionRate, 0); } void func_800A51E8(SkelAnime* skelAnime, u32 animation) { - SkelAnime_ChangeAnimation(skelAnime, animation, 1.0f, 0.0f, (f32) SkelAnime_GetFrameCount(animation), 2, 0.0f); + SkelAnime_ChangeAnimation(skelAnime, animation, 1.0f, 0.0f, (f32)SkelAnime_GetFrameCount(animation), 2, 0.0f); } void func_800A5240(SkelAnime* skelAnime, u32 animation, f32 transitionRate) { - SkelAnime_ChangeAnimation(skelAnime, animation, 1.0f, 0, (f32) SkelAnime_GetFrameCount(animation), 2, transitionRate); + SkelAnime_ChangeAnimation(skelAnime, animation, 1.0f, 0, + (f32)SkelAnime_GetFrameCount(animation), 2, transitionRate); } void func_800A529C(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed) { - SkelAnime_ChangeAnimation(skelAnime, animation, playbackSpeed, 0.0f, (f32) SkelAnime_GetFrameCount(animation), 2, 0.0f); + SkelAnime_ChangeAnimation(skelAnime, animation, playbackSpeed, 0.0f, + (f32)SkelAnime_GetFrameCount(animation), 2, 0.0f); } -// SkelAnime_ChangeAnimationDefault -void func_800A52F8(SkelAnime* skelAnime, u32 animation) +void SkelAnime_ChangeAnimationDefault(SkelAnime* skelAnime, u32 animation) { SkelAnime_ChangeAnimation(skelAnime, animation, 1.0f, 0.0f, (f32) SkelAnime_GetFrameCount(animation), 0, 0.0f); } -// SkelAnime_ChangeAnimationTransitionRate -void func_800A534C(SkelAnime* skelAnime, u32 animation, f32 transitionRate) +void SkelAnime_ChangeAnimationTransitionRate(SkelAnime* skelAnime, u32 animation, f32 transitionRate) { SkelAnime_ChangeAnimation(skelAnime, animation, 1.0f, 0.0f, 0.0f, 0, transitionRate); } -//SkelAnime_ChangeAnimationPlaybackSpeed -void func_800A5384(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed) +void SkelAnime_ChangeAnimationPlaybackSpeed(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed) { SkelAnime_ChangeAnimation(skelAnime, animation, playbackSpeed, 0.0f, (f32) SkelAnime_GetFrameCount(animation), 0, 0.0f); } @@ -1837,12 +1861,12 @@ void func_800A5408(SkelAnime* skelAnime) #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A5408.s") #endif -void func_800A5428(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* arg3) +void func_800A5428(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* index) { s32 i; for(i = 0; i < skelAnime->limbCount; i++, dst++, src++) { - if(*arg3++) + if(*index++) { *dst = *src; } @@ -1919,8 +1943,7 @@ s32 func_800A56C8(SkelAnime *skelAnime, f32 arg1) return func_800A4478(skelAnime, arg1, 1.0f); } -// SkelAnime_Free -void func_800A56F0(SkelAnime *skelAnime, s32 arg1) +void SkelAnime_Free(SkelAnime *skelAnime, GlobalContext* globalCtx) { if (skelAnime->actorDrawTbl != NULL) { @@ -1938,8 +1961,7 @@ void func_800A56F0(SkelAnime *skelAnime, s32 arg1) osSyncPrintf("morf_joint あきまへん！！\n"); // "morf_joint Akimane !!" } -// SkelAnime_CopyVec3s -void func_800A5774(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src) +void SkelAnime_CopyVec3s(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src) { s32 i; for(i = 0; i < skelAnime->limbCount; i++) diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index 8ff5464e9e..f4cd5301e0 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -87,7 +87,7 @@ void func_8097C8A8(DemoGo* this, GlobalContext* globalCtx) { } void DemoGo_Destroy(DemoGo* this, GlobalContext* globalCtx) { - func_800A56F0(&this->skelAnime, globalCtx); + SkelAnime_Free(&this->skelAnime, globalCtx); } void func_8097C930(DemoGo* this) { @@ -320,7 +320,7 @@ void DemoGo_Init(DemoGo* this, GlobalContext* globalCtx) { s16 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); - func_800A46F8(globalCtx, &this->skelAnime, &D_0600FEF0, 0, 0, 0, 0); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600FEF0, 0, 0, 0, 0); SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 2, 0.0f); this->action = 0; } @@ -343,7 +343,7 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(srcSegment8)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(srcSegment9)); - func_800A1AC8(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, + SkelAnime_DrawSV(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, &this->actor); func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 746); diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index c9e1d06c25..f97e5f8d71 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -242,7 +242,7 @@ static void EnDog_Init(EnDog* this, GlobalContext* globalCtx) { collider = &this->collider; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 24.0f); skelAnime = &this->skelAnime; - func_800A46F8(globalCtx, skelAnime, &D_06007290, 0, &this->unk_1F4, &this->unk_242, 13); + SkelAnime_InitSV(globalCtx, skelAnime, &D_06007290, 0, &this->unk_1F4, &this->unk_242, 13); func_80034EC0(skelAnime, animations, 0); if ((this->actor.params & 0x8000) == 0) { @@ -479,7 +479,7 @@ static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) { gDPSetEnvColor(gfxCtx->polyOpa.p++, colors[this->actor.params & 0xF].r, colors[this->actor.params & 0xF].g, colors[this->actor.params & 0xF].b, colors[this->actor.params & 0xF].a); - func_800A1AC8(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, + SkelAnime_DrawSV(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, EnDog_Callback1, EnDog_Callback2, &this->actor); func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 994); } diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index b8c98d0557..32de3bd7a3 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -86,7 +86,7 @@ static void EnMs_Init(EnMs* this, GlobalContext* globalCtx) { return; } Actor_ProcessInitChain(&this->actor, initChain); - func_800A46F8(globalCtx, &this->skelAnime, &D_06003DC0, &D_060005EC, &this->unkSkelAnimeStruct, &this->unk_1C6, + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06003DC0, &D_060005EC, &this->unkSkelAnimeStruct, &this->unk_1C6, 9); // skelanime_mtx_init ActorCollider_AllocCylinder(globalCtx, &this->collider); func_8005C450(globalCtx, &this->collider, this, &unk_col_80AB0320); @@ -191,6 +191,6 @@ static void EnMs_Update(EnMs* this, GlobalContext* globalCtx) { void EnMs_Draw(EnMs* this, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - func_800A1AC8(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, 0, 0, + SkelAnime_DrawSV(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, 0, 0, &this->actor); } diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 954447e626..7c9c40e4ff 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -508,7 +508,7 @@ void EnTk_Init(EnTk* this, GlobalContext* globalCtx) { ActorShape_Init(&thisAgain->actor.shape, 0, ActorShadow_DrawFunc_Circle, 24.f); - func_800A46F8(globalCtx, &thisAgain->skelAnim, (u32)&D_0600BE40, 0, thisAgain->hz_22A, thisAgain->hz_296, 18); + SkelAnime_InitSV(globalCtx, &thisAgain->skelAnim, (u32)&D_0600BE40, 0, thisAgain->hz_22A, thisAgain->hz_296, 18); SkelAnime_ChangeAnimation(&thisAgain->skelAnim, (u32)anim, 1.f, 0.f, SkelAnime_GetFrameCount((u32)&D_06002F84), 0, 0.f); @@ -769,7 +769,7 @@ void EnTk_Draw(EnTk* this, GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(eyeImages[thisAgain->eyeImageIdx])); - func_800A1AC8(globalCtx, thisAgain->skelAnim.limbIndex, thisAgain->skelAnim.actorDrawTbl, + SkelAnime_DrawSV(globalCtx, thisAgain->skelAnim.limbIndex, thisAgain->skelAnim.actorDrawTbl, thisAgain->skelAnim.dListCount, func_80B1D278, func_80B1D2E4, &thisAgain->actor); func_800C6B54(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1312); diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 630a054739..c90558f893 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -94,7 +94,7 @@ static void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, initChain); ActorShape_Init(&this->actor.shape, 0, NULL, 0.5f); - func_800A46F8(globalCtx, &this->skelAnime, &D_06008FB0, &D_06009DB0, &this->unkSkelAnimeStruct, &this->unk_22e, + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06008FB0, &D_06009DB0, &this->unkSkelAnimeStruct, &this->unk_22e, 0x19); ActorCollider_AllocCylinder(globalCtx, &this->colCylinder); @@ -630,7 +630,7 @@ static void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 arg1, s32 arg2, s32 static void EnWallmas_Draw(EnWallmas* this, GlobalContext* globalCtx) { if (this->actionFunc != (ActorFunc)&EnWallmas_WaitToDrop) { func_80093D18(globalCtx->state.gfxCtx); - func_800A1AC8(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, + SkelAnime_DrawSV(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, &EnWallMas_UpdatePos, &EnWallmas_DrawOpa, &this->actor); }