From 5f7bce6e2e87cdb772ab3da92212f860f428d72d Mon Sep 17 00:00:00 2001 From: fig02 Date: Sun, 19 Jul 2020 09:54:24 -0400 Subject: [PATCH] Bg_Heavy_Block and Eff_Ss_Dust (#258) * heavy_rock progress * heavy block progress, 2 functions left * progress * progress * heavy_block OK * comments * heavy block done * eff ss dust ok * naming * done i think * comment * clean up dust usages * remove docs * remove reloc * move enum and rename flag * effect enum --- .../func_800281E8.s | 47 -- .../func_8002829C.s | 28 - .../func_80028304.s | 28 - .../func_8002836C.s | 28 - .../func_800283D4.s | 28 - .../func_8002843C.s | 28 - .../func_800284A4.s | 29 - .../func_80028510.s | 29 - .../func_8002857C.s | 30 - .../func_800285EC.s | 30 - .../func_8002865C.s | 30 - .../func_800286CC.s | 30 - .../func_8002873C.s | 30 - .../func_800287AC.s | 30 - .../func_8002881C.s | 17 - .../func_80028858.s | 17 - .../func_80028894.s | 65 --- .../func_80028990.s | 52 -- .../func_80028A54.s | 52 -- .../ovl_Bg_Heavy_Block/BgHeavyBlock_Destroy.s | 21 - .../ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s | 123 ----- .../ovl_Bg_Heavy_Block/BgHeavyBlock_Init.s | 176 ------ .../ovl_Bg_Heavy_Block/BgHeavyBlock_Update.s | 10 - .../actors/ovl_Bg_Heavy_Block/func_80883790.s | 40 -- .../actors/ovl_Bg_Heavy_Block/func_80883820.s | 114 ---- .../actors/ovl_Bg_Heavy_Block/func_80883998.s | 32 -- .../actors/ovl_Bg_Heavy_Block/func_80883C90.s | 128 ----- .../actors/ovl_Bg_Heavy_Block/func_80883E54.s | 239 -------- .../actors/ovl_Bg_Heavy_Block/func_808841B8.s | 135 ----- .../actors/ovl_Bg_Heavy_Block/func_808843B0.s | 78 --- .../actors/ovl_Bg_Heavy_Block/func_808844D0.s | 123 ----- .../actors/ovl_Bg_Heavy_Block/func_80884658.s | 213 -------- .../actors/ovl_Bg_Heavy_Block/func_8088496C.s | 4 - .../actors/ovl_Bg_Heavy_Block/func_80884978.s | 188 ------- .../actors/ovl_Bg_Heavy_Block/func_80884DB4.s | 45 -- .../ovl_Effect_Ss_Dust/func_809A22D0.s | 115 ---- .../ovl_Effect_Ss_Dust/func_809A2480.s | 239 -------- .../ovl_Effect_Ss_Dust/func_809A27F0.s | 86 --- .../ovl_Effect_Ss_Dust/func_809A28EC.s | 109 ---- data/overlays/actors/z_bg_heavy_block.data.s | 30 - data/overlays/actors/z_bg_heavy_block.reloc.s | 13 - data/overlays/effects/z_eff_ss_dust.data.s | 20 - data/overlays/effects/z_eff_ss_dust.reloc.s | 13 - include/functions.h | 62 +-- include/z64actor.h | 3 +- include/z64effect.h | 2 +- spec | 6 +- src/code/z_actor.c | 52 +- src/code/z_effect_soft_sprite.c | 2 +- src/code/z_effect_soft_sprite_old_init.c | 145 ++++- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 515 +++++++++++++++++- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.h | 17 +- src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 1 + .../actors/ovl_En_Floormas/z_en_floormas.c | 52 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 3 +- .../ovl_Effect_Ss_Dust/z_eff_ss_dust.c | 199 ++++++- .../ovl_Effect_Ss_Dust/z_eff_ss_dust.h | 20 + undefined_syms.txt | 9 + 58 files changed, 938 insertions(+), 3072 deletions(-) delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800281E8.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002829C.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028304.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002836C.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800283D4.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002843C.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800284A4.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028510.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002857C.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800285EC.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002865C.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800286CC.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002873C.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800287AC.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002881C.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028858.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028894.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028990.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028A54.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883790.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883820.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883998.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883C90.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883E54.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808841B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808844D0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_8088496C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884978.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s delete mode 100644 asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A22D0.s delete mode 100644 asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s delete mode 100644 asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s delete mode 100644 asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s delete mode 100644 data/overlays/actors/z_bg_heavy_block.data.s delete mode 100644 data/overlays/actors/z_bg_heavy_block.reloc.s delete mode 100644 data/overlays/effects/z_eff_ss_dust.data.s delete mode 100644 data/overlays/effects/z_eff_ss_dust.reloc.s create mode 100644 src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800281E8.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800281E8.s deleted file mode 100644 index a884248d97..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800281E8.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_800281E8 -/* A9F388 800281E8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A9F38C 800281EC AFBF0014 */ sw $ra, 0x14($sp) -/* A9F390 800281F0 AFA40050 */ sw $a0, 0x50($sp) -/* A9F394 800281F4 AFA50054 */ sw $a1, 0x54($sp) -/* A9F398 800281F8 AFA7005C */ sw $a3, 0x5c($sp) -/* A9F39C 800281FC 00C02825 */ move $a1, $a2 -/* A9F3A0 80028200 0C01DF90 */ jal Math_Vec3f_Copy -/* A9F3A4 80028204 27A40018 */ addiu $a0, $sp, 0x18 -/* A9F3A8 80028208 27A40024 */ addiu $a0, $sp, 0x24 -/* A9F3AC 8002820C 0C01DF90 */ jal Math_Vec3f_Copy -/* A9F3B0 80028210 8FA5005C */ lw $a1, 0x5c($sp) -/* A9F3B4 80028214 27A40030 */ addiu $a0, $sp, 0x30 -/* A9F3B8 80028218 0C01DF90 */ jal Math_Vec3f_Copy -/* A9F3BC 8002821C 8FA50060 */ lw $a1, 0x60($sp) -/* A9F3C0 80028220 8FAF0064 */ lw $t7, 0x64($sp) -/* A9F3C4 80028224 27AE003C */ addiu $t6, $sp, 0x3c -/* A9F3C8 80028228 27A80040 */ addiu $t0, $sp, 0x40 -/* A9F3CC 8002822C 89F90000 */ lwl $t9, ($t7) -/* A9F3D0 80028230 99F90003 */ lwr $t9, 3($t7) -/* A9F3D4 80028234 00002825 */ move $a1, $zero -/* A9F3D8 80028238 24060080 */ li $a2, 128 -/* A9F3DC 8002823C A9D90000 */ swl $t9, ($t6) -/* A9F3E0 80028240 B9D90003 */ swr $t9, 3($t6) -/* A9F3E4 80028244 8FA90068 */ lw $t1, 0x68($sp) -/* A9F3E8 80028248 27A70018 */ addiu $a3, $sp, 0x18 -/* A9F3EC 8002824C 892B0000 */ lwl $t3, ($t1) -/* A9F3F0 80028250 992B0003 */ lwr $t3, 3($t1) -/* A9F3F4 80028254 A90B0000 */ swl $t3, ($t0) -/* A9F3F8 80028258 B90B0003 */ swr $t3, 3($t0) -/* A9F3FC 8002825C 97AC0056 */ lhu $t4, 0x56($sp) -/* A9F400 80028260 87AD006E */ lh $t5, 0x6e($sp) -/* A9F404 80028264 87AE0072 */ lh $t6, 0x72($sp) -/* A9F408 80028268 87AF0076 */ lh $t7, 0x76($sp) -/* A9F40C 8002826C 93B8007B */ lbu $t8, 0x7b($sp) -/* A9F410 80028270 8FA40050 */ lw $a0, 0x50($sp) -/* A9F414 80028274 A7AC004A */ sh $t4, 0x4a($sp) -/* A9F418 80028278 A7AD0044 */ sh $t5, 0x44($sp) -/* A9F41C 8002827C A7AE0046 */ sh $t6, 0x46($sp) -/* A9F420 80028280 A7AF0048 */ sh $t7, 0x48($sp) -/* A9F424 80028284 0C009DE6 */ jal EffectSs_Spawn -/* A9F428 80028288 A3B8004C */ sb $t8, 0x4c($sp) -/* A9F42C 8002828C 8FBF0014 */ lw $ra, 0x14($sp) -/* A9F430 80028290 27BD0050 */ addiu $sp, $sp, 0x50 -/* A9F434 80028294 03E00008 */ jr $ra -/* A9F438 80028298 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002829C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002829C.s deleted file mode 100644 index 1e4ecc72e8..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002829C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8002829C -/* A9F43C 8002829C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9F440 800282A0 AFA70044 */ sw $a3, 0x44($sp) -/* A9F444 800282A4 8FAE0044 */ lw $t6, 0x44($sp) -/* A9F448 800282A8 8FAF0048 */ lw $t7, 0x48($sp) -/* A9F44C 800282AC 8FB8004C */ lw $t8, 0x4c($sp) -/* A9F450 800282B0 87B90052 */ lh $t9, 0x52($sp) -/* A9F454 800282B4 87A80056 */ lh $t0, 0x56($sp) -/* A9F458 800282B8 AFA60040 */ sw $a2, 0x40($sp) -/* A9F45C 800282BC 00A03025 */ move $a2, $a1 -/* A9F460 800282C0 AFBF0034 */ sw $ra, 0x34($sp) -/* A9F464 800282C4 AFA5003C */ sw $a1, 0x3c($sp) -/* A9F468 800282C8 2409000A */ li $t1, 10 -/* A9F46C 800282CC 8FA70040 */ lw $a3, 0x40($sp) -/* A9F470 800282D0 AFA90024 */ sw $t1, 0x24($sp) -/* A9F474 800282D4 00002825 */ move $a1, $zero -/* A9F478 800282D8 AFA00028 */ sw $zero, 0x28($sp) -/* A9F47C 800282DC AFAE0010 */ sw $t6, 0x10($sp) -/* A9F480 800282E0 AFAF0014 */ sw $t7, 0x14($sp) -/* A9F484 800282E4 AFB80018 */ sw $t8, 0x18($sp) -/* A9F488 800282E8 AFB9001C */ sw $t9, 0x1c($sp) -/* A9F48C 800282EC 0C00A07A */ jal func_800281E8 -/* A9F490 800282F0 AFA80020 */ sw $t0, 0x20($sp) -/* A9F494 800282F4 8FBF0034 */ lw $ra, 0x34($sp) -/* A9F498 800282F8 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9F49C 800282FC 03E00008 */ jr $ra -/* A9F4A0 80028300 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028304.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028304.s deleted file mode 100644 index 2f18194a31..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028304.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80028304 -/* A9F4A4 80028304 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9F4A8 80028308 AFA70044 */ sw $a3, 0x44($sp) -/* A9F4AC 8002830C 8FAE0044 */ lw $t6, 0x44($sp) -/* A9F4B0 80028310 8FAF0048 */ lw $t7, 0x48($sp) -/* A9F4B4 80028314 8FB8004C */ lw $t8, 0x4c($sp) -/* A9F4B8 80028318 87B90052 */ lh $t9, 0x52($sp) -/* A9F4BC 8002831C 87A80056 */ lh $t0, 0x56($sp) -/* A9F4C0 80028320 AFA60040 */ sw $a2, 0x40($sp) -/* A9F4C4 80028324 00A03025 */ move $a2, $a1 -/* A9F4C8 80028328 AFBF0034 */ sw $ra, 0x34($sp) -/* A9F4CC 8002832C AFA5003C */ sw $a1, 0x3c($sp) -/* A9F4D0 80028330 2409000A */ li $t1, 10 -/* A9F4D4 80028334 8FA70040 */ lw $a3, 0x40($sp) -/* A9F4D8 80028338 AFA90024 */ sw $t1, 0x24($sp) -/* A9F4DC 8002833C 24050001 */ li $a1, 1 -/* A9F4E0 80028340 AFA00028 */ sw $zero, 0x28($sp) -/* A9F4E4 80028344 AFAE0010 */ sw $t6, 0x10($sp) -/* A9F4E8 80028348 AFAF0014 */ sw $t7, 0x14($sp) -/* A9F4EC 8002834C AFB80018 */ sw $t8, 0x18($sp) -/* A9F4F0 80028350 AFB9001C */ sw $t9, 0x1c($sp) -/* A9F4F4 80028354 0C00A07A */ jal func_800281E8 -/* A9F4F8 80028358 AFA80020 */ sw $t0, 0x20($sp) -/* A9F4FC 8002835C 8FBF0034 */ lw $ra, 0x34($sp) -/* A9F500 80028360 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9F504 80028364 03E00008 */ jr $ra -/* A9F508 80028368 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002836C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002836C.s deleted file mode 100644 index 1df78d89ce..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002836C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8002836C -/* A9F50C 8002836C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9F510 80028370 AFA70044 */ sw $a3, 0x44($sp) -/* A9F514 80028374 8FAE0044 */ lw $t6, 0x44($sp) -/* A9F518 80028378 8FAF0048 */ lw $t7, 0x48($sp) -/* A9F51C 8002837C 8FB8004C */ lw $t8, 0x4c($sp) -/* A9F520 80028380 87B90052 */ lh $t9, 0x52($sp) -/* A9F524 80028384 87A80056 */ lh $t0, 0x56($sp) -/* A9F528 80028388 87A9005A */ lh $t1, 0x5a($sp) -/* A9F52C 8002838C AFA60040 */ sw $a2, 0x40($sp) -/* A9F530 80028390 00A03025 */ move $a2, $a1 -/* A9F534 80028394 AFBF0034 */ sw $ra, 0x34($sp) -/* A9F538 80028398 AFA5003C */ sw $a1, 0x3c($sp) -/* A9F53C 8002839C 8FA70040 */ lw $a3, 0x40($sp) -/* A9F540 800283A0 00002825 */ move $a1, $zero -/* A9F544 800283A4 AFA00028 */ sw $zero, 0x28($sp) -/* A9F548 800283A8 AFAE0010 */ sw $t6, 0x10($sp) -/* A9F54C 800283AC AFAF0014 */ sw $t7, 0x14($sp) -/* A9F550 800283B0 AFB80018 */ sw $t8, 0x18($sp) -/* A9F554 800283B4 AFB9001C */ sw $t9, 0x1c($sp) -/* A9F558 800283B8 AFA80020 */ sw $t0, 0x20($sp) -/* A9F55C 800283BC 0C00A07A */ jal func_800281E8 -/* A9F560 800283C0 AFA90024 */ sw $t1, 0x24($sp) -/* A9F564 800283C4 8FBF0034 */ lw $ra, 0x34($sp) -/* A9F568 800283C8 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9F56C 800283CC 03E00008 */ jr $ra -/* A9F570 800283D0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800283D4.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800283D4.s deleted file mode 100644 index d056d28127..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800283D4.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_800283D4 -/* A9F574 800283D4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9F578 800283D8 AFA70044 */ sw $a3, 0x44($sp) -/* A9F57C 800283DC 8FAE0044 */ lw $t6, 0x44($sp) -/* A9F580 800283E0 8FAF0048 */ lw $t7, 0x48($sp) -/* A9F584 800283E4 8FB8004C */ lw $t8, 0x4c($sp) -/* A9F588 800283E8 87B90052 */ lh $t9, 0x52($sp) -/* A9F58C 800283EC 87A80056 */ lh $t0, 0x56($sp) -/* A9F590 800283F0 87A9005A */ lh $t1, 0x5a($sp) -/* A9F594 800283F4 AFA60040 */ sw $a2, 0x40($sp) -/* A9F598 800283F8 00A03025 */ move $a2, $a1 -/* A9F59C 800283FC AFBF0034 */ sw $ra, 0x34($sp) -/* A9F5A0 80028400 AFA5003C */ sw $a1, 0x3c($sp) -/* A9F5A4 80028404 8FA70040 */ lw $a3, 0x40($sp) -/* A9F5A8 80028408 24050001 */ li $a1, 1 -/* A9F5AC 8002840C AFA00028 */ sw $zero, 0x28($sp) -/* A9F5B0 80028410 AFAE0010 */ sw $t6, 0x10($sp) -/* A9F5B4 80028414 AFAF0014 */ sw $t7, 0x14($sp) -/* A9F5B8 80028418 AFB80018 */ sw $t8, 0x18($sp) -/* A9F5BC 8002841C AFB9001C */ sw $t9, 0x1c($sp) -/* A9F5C0 80028420 AFA80020 */ sw $t0, 0x20($sp) -/* A9F5C4 80028424 0C00A07A */ jal func_800281E8 -/* A9F5C8 80028428 AFA90024 */ sw $t1, 0x24($sp) -/* A9F5CC 8002842C 8FBF0034 */ lw $ra, 0x34($sp) -/* A9F5D0 80028430 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9F5D4 80028434 03E00008 */ jr $ra -/* A9F5D8 80028438 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002843C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002843C.s deleted file mode 100644 index 4dc20f6be2..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002843C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8002843C -/* A9F5DC 8002843C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9F5E0 80028440 AFA70044 */ sw $a3, 0x44($sp) -/* A9F5E4 80028444 8FAE0044 */ lw $t6, 0x44($sp) -/* A9F5E8 80028448 8FAF0048 */ lw $t7, 0x48($sp) -/* A9F5EC 8002844C 8FB8004C */ lw $t8, 0x4c($sp) -/* A9F5F0 80028450 87B90052 */ lh $t9, 0x52($sp) -/* A9F5F4 80028454 87A80056 */ lh $t0, 0x56($sp) -/* A9F5F8 80028458 87A9005A */ lh $t1, 0x5a($sp) -/* A9F5FC 8002845C AFA60040 */ sw $a2, 0x40($sp) -/* A9F600 80028460 00A03025 */ move $a2, $a1 -/* A9F604 80028464 AFBF0034 */ sw $ra, 0x34($sp) -/* A9F608 80028468 AFA5003C */ sw $a1, 0x3c($sp) -/* A9F60C 8002846C 8FA70040 */ lw $a3, 0x40($sp) -/* A9F610 80028470 24050002 */ li $a1, 2 -/* A9F614 80028474 AFA00028 */ sw $zero, 0x28($sp) -/* A9F618 80028478 AFAE0010 */ sw $t6, 0x10($sp) -/* A9F61C 8002847C AFAF0014 */ sw $t7, 0x14($sp) -/* A9F620 80028480 AFB80018 */ sw $t8, 0x18($sp) -/* A9F624 80028484 AFB9001C */ sw $t9, 0x1c($sp) -/* A9F628 80028488 AFA80020 */ sw $t0, 0x20($sp) -/* A9F62C 8002848C 0C00A07A */ jal func_800281E8 -/* A9F630 80028490 AFA90024 */ sw $t1, 0x24($sp) -/* A9F634 80028494 8FBF0034 */ lw $ra, 0x34($sp) -/* A9F638 80028498 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9F63C 8002849C 03E00008 */ jr $ra -/* A9F640 800284A0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800284A4.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800284A4.s deleted file mode 100644 index edbb76a25c..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800284A4.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_800284A4 -/* A9F644 800284A4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9F648 800284A8 AFA70044 */ sw $a3, 0x44($sp) -/* A9F64C 800284AC 8FAE0044 */ lw $t6, 0x44($sp) -/* A9F650 800284B0 8FAF0048 */ lw $t7, 0x48($sp) -/* A9F654 800284B4 8FB8004C */ lw $t8, 0x4c($sp) -/* A9F658 800284B8 87B90052 */ lh $t9, 0x52($sp) -/* A9F65C 800284BC 87A80056 */ lh $t0, 0x56($sp) -/* A9F660 800284C0 AFA60040 */ sw $a2, 0x40($sp) -/* A9F664 800284C4 00A03025 */ move $a2, $a1 -/* A9F668 800284C8 AFBF0034 */ sw $ra, 0x34($sp) -/* A9F66C 800284CC AFA5003C */ sw $a1, 0x3c($sp) -/* A9F670 800284D0 2409000A */ li $t1, 10 -/* A9F674 800284D4 240A0001 */ li $t2, 1 -/* A9F678 800284D8 8FA70040 */ lw $a3, 0x40($sp) -/* A9F67C 800284DC AFAA0028 */ sw $t2, 0x28($sp) -/* A9F680 800284E0 AFA90024 */ sw $t1, 0x24($sp) -/* A9F684 800284E4 00002825 */ move $a1, $zero -/* A9F688 800284E8 AFAE0010 */ sw $t6, 0x10($sp) -/* A9F68C 800284EC AFAF0014 */ sw $t7, 0x14($sp) -/* A9F690 800284F0 AFB80018 */ sw $t8, 0x18($sp) -/* A9F694 800284F4 AFB9001C */ sw $t9, 0x1c($sp) -/* A9F698 800284F8 0C00A07A */ jal func_800281E8 -/* A9F69C 800284FC AFA80020 */ sw $t0, 0x20($sp) -/* A9F6A0 80028500 8FBF0034 */ lw $ra, 0x34($sp) -/* A9F6A4 80028504 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9F6A8 80028508 03E00008 */ jr $ra -/* A9F6AC 8002850C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028510.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028510.s deleted file mode 100644 index ca58886633..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028510.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80028510 -/* A9F6B0 80028510 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9F6B4 80028514 AFA70044 */ sw $a3, 0x44($sp) -/* A9F6B8 80028518 8FAE0044 */ lw $t6, 0x44($sp) -/* A9F6BC 8002851C 8FAF0048 */ lw $t7, 0x48($sp) -/* A9F6C0 80028520 8FB8004C */ lw $t8, 0x4c($sp) -/* A9F6C4 80028524 87B90052 */ lh $t9, 0x52($sp) -/* A9F6C8 80028528 87A80056 */ lh $t0, 0x56($sp) -/* A9F6CC 8002852C AFA60040 */ sw $a2, 0x40($sp) -/* A9F6D0 80028530 00A03025 */ move $a2, $a1 -/* A9F6D4 80028534 AFBF0034 */ sw $ra, 0x34($sp) -/* A9F6D8 80028538 AFA5003C */ sw $a1, 0x3c($sp) -/* A9F6DC 8002853C 2409000A */ li $t1, 10 -/* A9F6E0 80028540 240A0001 */ li $t2, 1 -/* A9F6E4 80028544 8FA70040 */ lw $a3, 0x40($sp) -/* A9F6E8 80028548 AFAA0028 */ sw $t2, 0x28($sp) -/* A9F6EC 8002854C AFA90024 */ sw $t1, 0x24($sp) -/* A9F6F0 80028550 24050001 */ li $a1, 1 -/* A9F6F4 80028554 AFAE0010 */ sw $t6, 0x10($sp) -/* A9F6F8 80028558 AFAF0014 */ sw $t7, 0x14($sp) -/* A9F6FC 8002855C AFB80018 */ sw $t8, 0x18($sp) -/* A9F700 80028560 AFB9001C */ sw $t9, 0x1c($sp) -/* A9F704 80028564 0C00A07A */ jal func_800281E8 -/* A9F708 80028568 AFA80020 */ sw $t0, 0x20($sp) -/* A9F70C 8002856C 8FBF0034 */ lw $ra, 0x34($sp) -/* A9F710 80028570 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9F714 80028574 03E00008 */ jr $ra -/* A9F718 80028578 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002857C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002857C.s deleted file mode 100644 index 6a98ebd7a9..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002857C.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_8002857C -/* A9F71C 8002857C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9F720 80028580 AFA70044 */ sw $a3, 0x44($sp) -/* A9F724 80028584 8FAE0044 */ lw $t6, 0x44($sp) -/* A9F728 80028588 AFA60040 */ sw $a2, 0x40($sp) -/* A9F72C 8002858C 3C0F8011 */ lui $t7, %hi(D_801158CC) # $t7, 0x8011 -/* A9F730 80028590 3C188011 */ lui $t8, %hi(D_801158D0) # $t8, 0x8011 -/* A9F734 80028594 00A03025 */ move $a2, $a1 -/* A9F738 80028598 AFBF0034 */ sw $ra, 0x34($sp) -/* A9F73C 8002859C AFA5003C */ sw $a1, 0x3c($sp) -/* A9F740 800285A0 271858D0 */ addiu $t8, %lo(D_801158D0) # addiu $t8, $t8, 0x58d0 -/* A9F744 800285A4 25EF58CC */ addiu $t7, %lo(D_801158CC) # addiu $t7, $t7, 0x58cc -/* A9F748 800285A8 24190064 */ li $t9, 100 -/* A9F74C 800285AC 24080005 */ li $t0, 5 -/* A9F750 800285B0 2409000A */ li $t1, 10 -/* A9F754 800285B4 8FA70040 */ lw $a3, 0x40($sp) -/* A9F758 800285B8 AFA90024 */ sw $t1, 0x24($sp) -/* A9F75C 800285BC AFA80020 */ sw $t0, 0x20($sp) -/* A9F760 800285C0 AFB9001C */ sw $t9, 0x1c($sp) -/* A9F764 800285C4 AFAF0014 */ sw $t7, 0x14($sp) -/* A9F768 800285C8 AFB80018 */ sw $t8, 0x18($sp) -/* A9F76C 800285CC 24050004 */ li $a1, 4 -/* A9F770 800285D0 AFA00028 */ sw $zero, 0x28($sp) -/* A9F774 800285D4 0C00A07A */ jal func_800281E8 -/* A9F778 800285D8 AFAE0010 */ sw $t6, 0x10($sp) -/* A9F77C 800285DC 8FBF0034 */ lw $ra, 0x34($sp) -/* A9F780 800285E0 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9F784 800285E4 03E00008 */ jr $ra -/* A9F788 800285E8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800285EC.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800285EC.s deleted file mode 100644 index 58b6c9844d..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800285EC.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800285EC -/* A9F78C 800285EC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9F790 800285F0 AFA70044 */ sw $a3, 0x44($sp) -/* A9F794 800285F4 8FAE0044 */ lw $t6, 0x44($sp) -/* A9F798 800285F8 AFA60040 */ sw $a2, 0x40($sp) -/* A9F79C 800285FC 3C0F8011 */ lui $t7, %hi(D_801158CC) # $t7, 0x8011 -/* A9F7A0 80028600 3C188011 */ lui $t8, %hi(D_801158D0) # $t8, 0x8011 -/* A9F7A4 80028604 00A03025 */ move $a2, $a1 -/* A9F7A8 80028608 AFBF0034 */ sw $ra, 0x34($sp) -/* A9F7AC 8002860C AFA5003C */ sw $a1, 0x3c($sp) -/* A9F7B0 80028610 271858D0 */ addiu $t8, %lo(D_801158D0) # addiu $t8, $t8, 0x58d0 -/* A9F7B4 80028614 25EF58CC */ addiu $t7, %lo(D_801158CC) # addiu $t7, $t7, 0x58cc -/* A9F7B8 80028618 24190064 */ li $t9, 100 -/* A9F7BC 8002861C 24080005 */ li $t0, 5 -/* A9F7C0 80028620 2409000A */ li $t1, 10 -/* A9F7C4 80028624 8FA70040 */ lw $a3, 0x40($sp) -/* A9F7C8 80028628 AFA90024 */ sw $t1, 0x24($sp) -/* A9F7CC 8002862C AFA80020 */ sw $t0, 0x20($sp) -/* A9F7D0 80028630 AFB9001C */ sw $t9, 0x1c($sp) -/* A9F7D4 80028634 AFAF0014 */ sw $t7, 0x14($sp) -/* A9F7D8 80028638 AFB80018 */ sw $t8, 0x18($sp) -/* A9F7DC 8002863C 24050005 */ li $a1, 5 -/* A9F7E0 80028640 AFA00028 */ sw $zero, 0x28($sp) -/* A9F7E4 80028644 0C00A07A */ jal func_800281E8 -/* A9F7E8 80028648 AFAE0010 */ sw $t6, 0x10($sp) -/* A9F7EC 8002864C 8FBF0034 */ lw $ra, 0x34($sp) -/* A9F7F0 80028650 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9F7F4 80028654 03E00008 */ jr $ra -/* A9F7F8 80028658 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002865C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002865C.s deleted file mode 100644 index b24deeb68e..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002865C.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_8002865C -/* A9F7FC 8002865C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9F800 80028660 AFA70044 */ sw $a3, 0x44($sp) -/* A9F804 80028664 8FAE0044 */ lw $t6, 0x44($sp) -/* A9F808 80028668 87B9004A */ lh $t9, 0x4a($sp) -/* A9F80C 8002866C 87A8004E */ lh $t0, 0x4e($sp) -/* A9F810 80028670 AFA60040 */ sw $a2, 0x40($sp) -/* A9F814 80028674 3C0F8011 */ lui $t7, %hi(D_801158CC) # $t7, 0x8011 -/* A9F818 80028678 3C188011 */ lui $t8, %hi(D_801158D0) # $t8, 0x8011 -/* A9F81C 8002867C 00A03025 */ move $a2, $a1 -/* A9F820 80028680 AFBF0034 */ sw $ra, 0x34($sp) -/* A9F824 80028684 AFA5003C */ sw $a1, 0x3c($sp) -/* A9F828 80028688 271858D0 */ addiu $t8, %lo(D_801158D0) # addiu $t8, $t8, 0x58d0 -/* A9F82C 8002868C 25EF58CC */ addiu $t7, %lo(D_801158CC) # addiu $t7, $t7, 0x58cc -/* A9F830 80028690 2409000A */ li $t1, 10 -/* A9F834 80028694 8FA70040 */ lw $a3, 0x40($sp) -/* A9F838 80028698 AFA90024 */ sw $t1, 0x24($sp) -/* A9F83C 8002869C AFAF0014 */ sw $t7, 0x14($sp) -/* A9F840 800286A0 AFB80018 */ sw $t8, 0x18($sp) -/* A9F844 800286A4 24050004 */ li $a1, 4 -/* A9F848 800286A8 AFA00028 */ sw $zero, 0x28($sp) -/* A9F84C 800286AC AFAE0010 */ sw $t6, 0x10($sp) -/* A9F850 800286B0 AFB9001C */ sw $t9, 0x1c($sp) -/* A9F854 800286B4 0C00A07A */ jal func_800281E8 -/* A9F858 800286B8 AFA80020 */ sw $t0, 0x20($sp) -/* A9F85C 800286BC 8FBF0034 */ lw $ra, 0x34($sp) -/* A9F860 800286C0 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9F864 800286C4 03E00008 */ jr $ra -/* A9F868 800286C8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800286CC.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800286CC.s deleted file mode 100644 index 8edc918d62..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800286CC.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800286CC -/* A9F86C 800286CC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9F870 800286D0 AFA70044 */ sw $a3, 0x44($sp) -/* A9F874 800286D4 8FAE0044 */ lw $t6, 0x44($sp) -/* A9F878 800286D8 87B9004A */ lh $t9, 0x4a($sp) -/* A9F87C 800286DC 87A8004E */ lh $t0, 0x4e($sp) -/* A9F880 800286E0 AFA60040 */ sw $a2, 0x40($sp) -/* A9F884 800286E4 3C0F8011 */ lui $t7, %hi(D_801158CC) # $t7, 0x8011 -/* A9F888 800286E8 3C188011 */ lui $t8, %hi(D_801158D0) # $t8, 0x8011 -/* A9F88C 800286EC 00A03025 */ move $a2, $a1 -/* A9F890 800286F0 AFBF0034 */ sw $ra, 0x34($sp) -/* A9F894 800286F4 AFA5003C */ sw $a1, 0x3c($sp) -/* A9F898 800286F8 271858D0 */ addiu $t8, %lo(D_801158D0) # addiu $t8, $t8, 0x58d0 -/* A9F89C 800286FC 25EF58CC */ addiu $t7, %lo(D_801158CC) # addiu $t7, $t7, 0x58cc -/* A9F8A0 80028700 2409000A */ li $t1, 10 -/* A9F8A4 80028704 8FA70040 */ lw $a3, 0x40($sp) -/* A9F8A8 80028708 AFA90024 */ sw $t1, 0x24($sp) -/* A9F8AC 8002870C AFAF0014 */ sw $t7, 0x14($sp) -/* A9F8B0 80028710 AFB80018 */ sw $t8, 0x18($sp) -/* A9F8B4 80028714 24050005 */ li $a1, 5 -/* A9F8B8 80028718 AFA00028 */ sw $zero, 0x28($sp) -/* A9F8BC 8002871C AFAE0010 */ sw $t6, 0x10($sp) -/* A9F8C0 80028720 AFB9001C */ sw $t9, 0x1c($sp) -/* A9F8C4 80028724 0C00A07A */ jal func_800281E8 -/* A9F8C8 80028728 AFA80020 */ sw $t0, 0x20($sp) -/* A9F8CC 8002872C 8FBF0034 */ lw $ra, 0x34($sp) -/* A9F8D0 80028730 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9F8D4 80028734 03E00008 */ jr $ra -/* A9F8D8 80028738 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002873C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002873C.s deleted file mode 100644 index dde04c6f9e..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002873C.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_8002873C -/* A9F8DC 8002873C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9F8E0 80028740 AFA70044 */ sw $a3, 0x44($sp) -/* A9F8E4 80028744 8FAE0044 */ lw $t6, 0x44($sp) -/* A9F8E8 80028748 87B9004A */ lh $t9, 0x4a($sp) -/* A9F8EC 8002874C 87A8004E */ lh $t0, 0x4e($sp) -/* A9F8F0 80028750 87A90052 */ lh $t1, 0x52($sp) -/* A9F8F4 80028754 AFA60040 */ sw $a2, 0x40($sp) -/* A9F8F8 80028758 3C0F8011 */ lui $t7, %hi(D_801158CC) # $t7, 0x8011 -/* A9F8FC 8002875C 3C188011 */ lui $t8, %hi(D_801158D0) # $t8, 0x8011 -/* A9F900 80028760 00A03025 */ move $a2, $a1 -/* A9F904 80028764 AFBF0034 */ sw $ra, 0x34($sp) -/* A9F908 80028768 AFA5003C */ sw $a1, 0x3c($sp) -/* A9F90C 8002876C 271858D0 */ addiu $t8, %lo(D_801158D0) # addiu $t8, $t8, 0x58d0 -/* A9F910 80028770 25EF58CC */ addiu $t7, %lo(D_801158CC) # addiu $t7, $t7, 0x58cc -/* A9F914 80028774 8FA70040 */ lw $a3, 0x40($sp) -/* A9F918 80028778 AFAF0014 */ sw $t7, 0x14($sp) -/* A9F91C 8002877C AFB80018 */ sw $t8, 0x18($sp) -/* A9F920 80028780 24050004 */ li $a1, 4 -/* A9F924 80028784 AFA00028 */ sw $zero, 0x28($sp) -/* A9F928 80028788 AFAE0010 */ sw $t6, 0x10($sp) -/* A9F92C 8002878C AFB9001C */ sw $t9, 0x1c($sp) -/* A9F930 80028790 AFA80020 */ sw $t0, 0x20($sp) -/* A9F934 80028794 0C00A07A */ jal func_800281E8 -/* A9F938 80028798 AFA90024 */ sw $t1, 0x24($sp) -/* A9F93C 8002879C 8FBF0034 */ lw $ra, 0x34($sp) -/* A9F940 800287A0 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9F944 800287A4 03E00008 */ jr $ra -/* A9F948 800287A8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800287AC.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800287AC.s deleted file mode 100644 index 4f68041249..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800287AC.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800287AC -/* A9F94C 800287AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9F950 800287B0 AFA70044 */ sw $a3, 0x44($sp) -/* A9F954 800287B4 8FAE0044 */ lw $t6, 0x44($sp) -/* A9F958 800287B8 87B9004A */ lh $t9, 0x4a($sp) -/* A9F95C 800287BC 87A8004E */ lh $t0, 0x4e($sp) -/* A9F960 800287C0 87A90052 */ lh $t1, 0x52($sp) -/* A9F964 800287C4 AFA60040 */ sw $a2, 0x40($sp) -/* A9F968 800287C8 3C0F8011 */ lui $t7, %hi(D_801158CC) # $t7, 0x8011 -/* A9F96C 800287CC 3C188011 */ lui $t8, %hi(D_801158D0) # $t8, 0x8011 -/* A9F970 800287D0 00A03025 */ move $a2, $a1 -/* A9F974 800287D4 AFBF0034 */ sw $ra, 0x34($sp) -/* A9F978 800287D8 AFA5003C */ sw $a1, 0x3c($sp) -/* A9F97C 800287DC 271858D0 */ addiu $t8, %lo(D_801158D0) # addiu $t8, $t8, 0x58d0 -/* A9F980 800287E0 25EF58CC */ addiu $t7, %lo(D_801158CC) # addiu $t7, $t7, 0x58cc -/* A9F984 800287E4 8FA70040 */ lw $a3, 0x40($sp) -/* A9F988 800287E8 AFAF0014 */ sw $t7, 0x14($sp) -/* A9F98C 800287EC AFB80018 */ sw $t8, 0x18($sp) -/* A9F990 800287F0 24050005 */ li $a1, 5 -/* A9F994 800287F4 AFA00028 */ sw $zero, 0x28($sp) -/* A9F998 800287F8 AFAE0010 */ sw $t6, 0x10($sp) -/* A9F99C 800287FC AFB9001C */ sw $t9, 0x1c($sp) -/* A9F9A0 80028800 AFA80020 */ sw $t0, 0x20($sp) -/* A9F9A4 80028804 0C00A07A */ jal func_800281E8 -/* A9F9A8 80028808 AFA90024 */ sw $t1, 0x24($sp) -/* A9F9AC 8002880C 8FBF0034 */ lw $ra, 0x34($sp) -/* A9F9B0 80028810 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9F9B4 80028814 03E00008 */ jr $ra -/* A9F9B8 80028818 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002881C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002881C.s deleted file mode 100644 index ace854ed03..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002881C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8002881C -/* A9F9BC 8002881C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A9F9C0 80028820 8FAE0038 */ lw $t6, 0x38($sp) -/* A9F9C4 80028824 8FAF003C */ lw $t7, 0x3c($sp) -/* A9F9C8 80028828 AFBF0024 */ sw $ra, 0x24($sp) -/* A9F9CC 8002882C 24180064 */ li $t8, 100 -/* A9F9D0 80028830 24190005 */ li $t9, 5 -/* A9F9D4 80028834 AFB9001C */ sw $t9, 0x1c($sp) -/* A9F9D8 80028838 AFB80018 */ sw $t8, 0x18($sp) -/* A9F9DC 8002883C AFAE0010 */ sw $t6, 0x10($sp) -/* A9F9E0 80028840 0C00A0A7 */ jal func_8002829C -/* A9F9E4 80028844 AFAF0014 */ sw $t7, 0x14($sp) -/* A9F9E8 80028848 8FBF0024 */ lw $ra, 0x24($sp) -/* A9F9EC 8002884C 27BD0028 */ addiu $sp, $sp, 0x28 -/* A9F9F0 80028850 03E00008 */ jr $ra -/* A9F9F4 80028854 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028858.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028858.s deleted file mode 100644 index a175307e4a..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028858.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80028858 -/* A9F9F8 80028858 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A9F9FC 8002885C 8FAE0038 */ lw $t6, 0x38($sp) -/* A9FA00 80028860 8FAF003C */ lw $t7, 0x3c($sp) -/* A9FA04 80028864 AFBF0024 */ sw $ra, 0x24($sp) -/* A9FA08 80028868 24180064 */ li $t8, 100 -/* A9FA0C 8002886C 24190005 */ li $t9, 5 -/* A9FA10 80028870 AFB9001C */ sw $t9, 0x1c($sp) -/* A9FA14 80028874 AFB80018 */ sw $t8, 0x18($sp) -/* A9FA18 80028878 AFAE0010 */ sw $t6, 0x10($sp) -/* A9FA1C 8002887C 0C00A0C1 */ jal func_80028304 -/* A9FA20 80028880 AFAF0014 */ sw $t7, 0x14($sp) -/* A9FA24 80028884 8FBF0024 */ lw $ra, 0x24($sp) -/* A9FA28 80028888 27BD0028 */ addiu $sp, $sp, 0x28 -/* A9FA2C 8002888C 03E00008 */ jr $ra -/* A9FA30 80028890 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028894.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028894.s deleted file mode 100644 index fe603b10a8..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028894.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_80028894 -/* A9FA34 80028894 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A9FA38 80028898 AFBF001C */ sw $ra, 0x1c($sp) -/* A9FA3C 8002889C AFB00018 */ sw $s0, 0x18($sp) -/* A9FA40 800288A0 00C08025 */ move $s0, $a2 -/* A9FA44 800288A4 AFA40028 */ sw $a0, 0x28($sp) -/* A9FA48 800288A8 AFA5002C */ sw $a1, 0x2c($sp) -/* A9FA4C 800288AC 0C03F66B */ jal Math_Rand_ZeroOne -/* A9FA50 800288B0 AFA70034 */ sw $a3, 0x34($sp) -/* A9FA54 800288B4 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* A9FA58 800288B8 46040182 */ mul.s $f6, $f0, $f4 -/* A9FA5C 800288BC 0C03F66B */ jal Math_Rand_ZeroOne -/* A9FA60 800288C0 E7A60020 */ swc1 $f6, 0x20($sp) -/* A9FA64 800288C4 3C014780 */ li $at, 0x47800000 # 0.000000 -/* A9FA68 800288C8 44814000 */ mtc1 $at, $f8 -/* A9FA6C 800288CC 8FAF0028 */ lw $t7, 0x28($sp) -/* A9FA70 800288D0 46080282 */ mul.s $f10, $f0, $f8 -/* A9FA74 800288D4 4600540D */ trunc.w.s $f16, $f10 -/* A9FA78 800288D8 44028000 */ mfc1 $v0, $f16 -/* A9FA7C 800288DC 00000000 */ nop -/* A9FA80 800288E0 A7A20026 */ sh $v0, 0x26($sp) -/* A9FA84 800288E4 8DF90000 */ lw $t9, ($t7) -/* A9FA88 800288E8 00022400 */ sll $a0, $v0, 0x10 -/* A9FA8C 800288EC 00042403 */ sra $a0, $a0, 0x10 -/* A9FA90 800288F0 AE190000 */ sw $t9, ($s0) -/* A9FA94 800288F4 8DF80004 */ lw $t8, 4($t7) -/* A9FA98 800288F8 AE180004 */ sw $t8, 4($s0) -/* A9FA9C 800288FC 8DF90008 */ lw $t9, 8($t7) -/* A9FAA0 80028900 0C01DE1C */ jal Math_Sins -/* A9FAA4 80028904 AE190008 */ sw $t9, 8($s0) -/* A9FAA8 80028908 C7A40020 */ lwc1 $f4, 0x20($sp) -/* A9FAAC 8002890C C6120000 */ lwc1 $f18, ($s0) -/* A9FAB0 80028910 46040182 */ mul.s $f6, $f0, $f4 -/* A9FAB4 80028914 46069200 */ add.s $f8, $f18, $f6 -/* A9FAB8 80028918 E6080000 */ swc1 $f8, ($s0) -/* A9FABC 8002891C 0C01DE0D */ jal Math_Coss -/* A9FAC0 80028920 87A40026 */ lh $a0, 0x26($sp) -/* A9FAC4 80028924 C7B00020 */ lwc1 $f16, 0x20($sp) -/* A9FAC8 80028928 C60A0008 */ lwc1 $f10, 8($s0) -/* A9FACC 8002892C 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* A9FAD0 80028930 46100102 */ mul.s $f4, $f0, $f16 -/* A9FAD4 80028934 44813000 */ mtc1 $at, $f6 -/* A9FAD8 80028938 46045480 */ add.s $f18, $f10, $f4 -/* A9FADC 8002893C E6120008 */ swc1 $f18, 8($s0) -/* A9FAE0 80028940 8FA80034 */ lw $t0, 0x34($sp) -/* A9FAE4 80028944 E5060004 */ swc1 $f6, 4($t0) -/* A9FAE8 80028948 0C01DE1C */ jal Math_Sins -/* A9FAEC 8002894C 87A40026 */ lh $a0, 0x26($sp) -/* A9FAF0 80028950 8FA90034 */ lw $t1, 0x34($sp) -/* A9FAF4 80028954 E5200000 */ swc1 $f0, ($t1) -/* A9FAF8 80028958 0C01DE0D */ jal Math_Coss -/* A9FAFC 8002895C 87A40026 */ lh $a0, 0x26($sp) -/* A9FB00 80028960 8FA20038 */ lw $v0, 0x38($sp) -/* A9FB04 80028964 8FAA0034 */ lw $t2, 0x34($sp) -/* A9FB08 80028968 44801000 */ mtc1 $zero, $f2 -/* A9FB0C 8002896C E5400008 */ swc1 $f0, 8($t2) -/* A9FB10 80028970 E4420000 */ swc1 $f2, ($v0) -/* A9FB14 80028974 E4420004 */ swc1 $f2, 4($v0) -/* A9FB18 80028978 E4420008 */ swc1 $f2, 8($v0) -/* A9FB1C 8002897C 8FBF001C */ lw $ra, 0x1c($sp) -/* A9FB20 80028980 8FB00018 */ lw $s0, 0x18($sp) -/* A9FB24 80028984 27BD0028 */ addiu $sp, $sp, 0x28 -/* A9FB28 80028988 03E00008 */ jr $ra -/* A9FB2C 8002898C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028990.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028990.s deleted file mode 100644 index 945dff806d..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028990.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80028990 -/* A9FB30 80028990 27BDFF88 */ addiu $sp, $sp, -0x78 -/* A9FB34 80028994 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A9FB38 80028998 AFB60048 */ sw $s6, 0x48($sp) -/* A9FB3C 8002899C AFB50044 */ sw $s5, 0x44($sp) -/* A9FB40 800289A0 AFB40040 */ sw $s4, 0x40($sp) -/* A9FB44 800289A4 AFB3003C */ sw $s3, 0x3c($sp) -/* A9FB48 800289A8 AFB20038 */ sw $s2, 0x38($sp) -/* A9FB4C 800289AC AFB10034 */ sw $s1, 0x34($sp) -/* A9FB50 800289B0 AFB00030 */ sw $s0, 0x30($sp) -/* A9FB54 800289B4 4485A000 */ mtc1 $a1, $f20 -/* A9FB58 800289B8 00C0A025 */ move $s4, $a2 -/* A9FB5C 800289BC 0080A825 */ move $s5, $a0 -/* A9FB60 800289C0 AFBF004C */ sw $ra, 0x4c($sp) -/* A9FB64 800289C4 00008025 */ move $s0, $zero -/* A9FB68 800289C8 27B10068 */ addiu $s1, $sp, 0x68 -/* A9FB6C 800289CC 27B2005C */ addiu $s2, $sp, 0x5c -/* A9FB70 800289D0 27B30050 */ addiu $s3, $sp, 0x50 -/* A9FB74 800289D4 24160014 */ li $s6, 20 -/* A9FB78 800289D8 4405A000 */ mfc1 $a1, $f20 -.L800289DC: -/* A9FB7C 800289DC 02802025 */ move $a0, $s4 -/* A9FB80 800289E0 02203025 */ move $a2, $s1 -/* A9FB84 800289E4 02403825 */ move $a3, $s2 -/* A9FB88 800289E8 0C00A225 */ jal func_80028894 -/* A9FB8C 800289EC AFB30010 */ sw $s3, 0x10($sp) -/* A9FB90 800289F0 240E0064 */ li $t6, 100 -/* A9FB94 800289F4 240F001E */ li $t7, 30 -/* A9FB98 800289F8 24180007 */ li $t8, 7 -/* A9FB9C 800289FC AFB80018 */ sw $t8, 0x18($sp) -/* A9FBA0 80028A00 AFAF0014 */ sw $t7, 0x14($sp) -/* A9FBA4 80028A04 AFAE0010 */ sw $t6, 0x10($sp) -/* A9FBA8 80028A08 02A02025 */ move $a0, $s5 -/* A9FBAC 80028A0C 02202825 */ move $a1, $s1 -/* A9FBB0 80028A10 02403025 */ move $a2, $s2 -/* A9FBB4 80028A14 0C00A1CF */ jal func_8002873C -/* A9FBB8 80028A18 02603825 */ move $a3, $s3 -/* A9FBBC 80028A1C 26100001 */ addiu $s0, $s0, 1 -/* A9FBC0 80028A20 5616FFEE */ bnel $s0, $s6, .L800289DC -/* A9FBC4 80028A24 4405A000 */ mfc1 $a1, $f20 -/* A9FBC8 80028A28 8FBF004C */ lw $ra, 0x4c($sp) -/* A9FBCC 80028A2C D7B40028 */ ldc1 $f20, 0x28($sp) -/* A9FBD0 80028A30 8FB00030 */ lw $s0, 0x30($sp) -/* A9FBD4 80028A34 8FB10034 */ lw $s1, 0x34($sp) -/* A9FBD8 80028A38 8FB20038 */ lw $s2, 0x38($sp) -/* A9FBDC 80028A3C 8FB3003C */ lw $s3, 0x3c($sp) -/* A9FBE0 80028A40 8FB40040 */ lw $s4, 0x40($sp) -/* A9FBE4 80028A44 8FB50044 */ lw $s5, 0x44($sp) -/* A9FBE8 80028A48 8FB60048 */ lw $s6, 0x48($sp) -/* A9FBEC 80028A4C 03E00008 */ jr $ra -/* A9FBF0 80028A50 27BD0078 */ addiu $sp, $sp, 0x78 - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028A54.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028A54.s deleted file mode 100644 index 81e412fb5a..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028A54.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80028A54 -/* A9FBF4 80028A54 27BDFF88 */ addiu $sp, $sp, -0x78 -/* A9FBF8 80028A58 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A9FBFC 80028A5C AFB60048 */ sw $s6, 0x48($sp) -/* A9FC00 80028A60 AFB50044 */ sw $s5, 0x44($sp) -/* A9FC04 80028A64 AFB40040 */ sw $s4, 0x40($sp) -/* A9FC08 80028A68 AFB3003C */ sw $s3, 0x3c($sp) -/* A9FC0C 80028A6C AFB20038 */ sw $s2, 0x38($sp) -/* A9FC10 80028A70 AFB10034 */ sw $s1, 0x34($sp) -/* A9FC14 80028A74 AFB00030 */ sw $s0, 0x30($sp) -/* A9FC18 80028A78 4485A000 */ mtc1 $a1, $f20 -/* A9FC1C 80028A7C 00C0A025 */ move $s4, $a2 -/* A9FC20 80028A80 0080A825 */ move $s5, $a0 -/* A9FC24 80028A84 AFBF004C */ sw $ra, 0x4c($sp) -/* A9FC28 80028A88 00008025 */ move $s0, $zero -/* A9FC2C 80028A8C 27B10068 */ addiu $s1, $sp, 0x68 -/* A9FC30 80028A90 27B2005C */ addiu $s2, $sp, 0x5c -/* A9FC34 80028A94 27B30050 */ addiu $s3, $sp, 0x50 -/* A9FC38 80028A98 24160014 */ li $s6, 20 -/* A9FC3C 80028A9C 4405A000 */ mfc1 $a1, $f20 -.L80028AA0: -/* A9FC40 80028AA0 02802025 */ move $a0, $s4 -/* A9FC44 80028AA4 02203025 */ move $a2, $s1 -/* A9FC48 80028AA8 02403825 */ move $a3, $s2 -/* A9FC4C 80028AAC 0C00A225 */ jal func_80028894 -/* A9FC50 80028AB0 AFB30010 */ sw $s3, 0x10($sp) -/* A9FC54 80028AB4 240E0064 */ li $t6, 100 -/* A9FC58 80028AB8 240F001E */ li $t7, 30 -/* A9FC5C 80028ABC 24180007 */ li $t8, 7 -/* A9FC60 80028AC0 AFB80018 */ sw $t8, 0x18($sp) -/* A9FC64 80028AC4 AFAF0014 */ sw $t7, 0x14($sp) -/* A9FC68 80028AC8 AFAE0010 */ sw $t6, 0x10($sp) -/* A9FC6C 80028ACC 02A02025 */ move $a0, $s5 -/* A9FC70 80028AD0 02202825 */ move $a1, $s1 -/* A9FC74 80028AD4 02403025 */ move $a2, $s2 -/* A9FC78 80028AD8 0C00A1EB */ jal func_800287AC -/* A9FC7C 80028ADC 02603825 */ move $a3, $s3 -/* A9FC80 80028AE0 26100001 */ addiu $s0, $s0, 1 -/* A9FC84 80028AE4 5616FFEE */ bnel $s0, $s6, .L80028AA0 -/* A9FC88 80028AE8 4405A000 */ mfc1 $a1, $f20 -/* A9FC8C 80028AEC 8FBF004C */ lw $ra, 0x4c($sp) -/* A9FC90 80028AF0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A9FC94 80028AF4 8FB00030 */ lw $s0, 0x30($sp) -/* A9FC98 80028AF8 8FB10034 */ lw $s1, 0x34($sp) -/* A9FC9C 80028AFC 8FB20038 */ lw $s2, 0x38($sp) -/* A9FCA0 80028B00 8FB3003C */ lw $s3, 0x3c($sp) -/* A9FCA4 80028B04 8FB40040 */ lw $s4, 0x40($sp) -/* A9FCA8 80028B08 8FB50044 */ lw $s5, 0x44($sp) -/* A9FCAC 80028B0C 8FB60048 */ lw $s6, 0x48($sp) -/* A9FCB0 80028B10 03E00008 */ jr $ra -/* A9FCB4 80028B14 27BD0078 */ addiu $sp, $sp, 0x78 - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Destroy.s deleted file mode 100644 index 90c5f1f8cf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Destroy.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel BgHeavyBlock_Destroy -/* 004B8 80883C48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004BC 80883C4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 004C0 80883C50 AFA5001C */ sw $a1, 0x001C($sp) -/* 004C4 80883C54 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 004C8 80883C58 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 004CC 80883C5C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 004D0 80883C60 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 004D4 80883C64 10410006 */ beq $v0, $at, .L80883C80 -/* 004D8 80883C68 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 004DC 80883C6C 10410004 */ beq $v0, $at, .L80883C80 -/* 004E0 80883C70 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 004E4 80883C74 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 004E8 80883C78 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 004EC 80883C7C 8CE6014C */ lw $a2, 0x014C($a3) ## 0000014C -.L80883C80: -/* 004F0 80883C80 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004F4 80883C84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004F8 80883C88 03E00008 */ jr $ra -/* 004FC 80883C8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s deleted file mode 100644 index 2fd9bba910..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s +++ /dev/null @@ -1,123 +0,0 @@ -.rdata -glabel D_80884F60 - .asciz "../z_bg_heavy_block.c" - .balign 4 - -glabel D_80884F78 - .asciz "../z_bg_heavy_block.c" - .balign 4 - -glabel D_80884F90 - .asciz "../z_bg_heavy_block.c" - .balign 4 - -.text -glabel BgHeavyBlock_Draw -/* 0147C 80884C0C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01480 80884C10 AFBF001C */ sw $ra, 0x001C($sp) -/* 01484 80884C14 AFB00018 */ sw $s0, 0x0018($sp) -/* 01488 80884C18 AFA50054 */ sw $a1, 0x0054($sp) -/* 0148C 80884C1C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 01490 80884C20 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01494 80884C24 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01498 80884C28 3C068088 */ lui $a2, %hi(D_80884F60) ## $a2 = 80880000 -/* 0149C 80884C2C 24C64F60 */ addiu $a2, $a2, %lo(D_80884F60) ## $a2 = 80884F60 -/* 014A0 80884C30 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 014A4 80884C34 24070388 */ addiu $a3, $zero, 0x0388 ## $a3 = 00000388 -/* 014A8 80884C38 AFA20044 */ sw $v0, 0x0044($sp) -/* 014AC 80884C3C 0C031AB1 */ jal Graph_OpenDisps -/* 014B0 80884C40 AFA50040 */ sw $a1, 0x0040($sp) -/* 014B4 80884C44 8E030174 */ lw $v1, 0x0174($s0) ## 00000174 -/* 014B8 80884C48 3C0F8088 */ lui $t7, %hi(func_808844D0) ## $t7 = 80880000 -/* 014BC 80884C4C 25EF44D0 */ addiu $t7, $t7, %lo(func_808844D0) ## $t7 = 808844D0 -/* 014C0 80884C50 146F0011 */ bne $v1, $t7, .L80884C98 -/* 014C4 80884C54 8FA20044 */ lw $v0, 0x0044($sp) -/* 014C8 80884C58 C44C03B0 */ lwc1 $f12, 0x03B0($v0) ## 000003B0 -/* 014CC 80884C5C C44E03B4 */ lwc1 $f14, 0x03B4($v0) ## 000003B4 -/* 014D0 80884C60 8C4603B8 */ lw $a2, 0x03B8($v0) ## 000003B8 -/* 014D4 80884C64 0C0345A5 */ jal func_800D1694 -/* 014D8 80884C68 260700B4 */ addiu $a3, $s0, 0x00B4 ## $a3 = 000000B4 -/* 014DC 80884C6C C604016C */ lwc1 $f4, 0x016C($s0) ## 0000016C -/* 014E0 80884C70 C60C0164 */ lwc1 $f12, 0x0164($s0) ## 00000164 -/* 014E4 80884C74 C60E0168 */ lwc1 $f14, 0x0168($s0) ## 00000168 -/* 014E8 80884C78 46002187 */ neg.s $f6, $f4 -/* 014EC 80884C7C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 014F0 80884C80 44063000 */ mfc1 $a2, $f6 -/* 014F4 80884C84 46006307 */ neg.s $f12, $f12 -/* 014F8 80884C88 0C034261 */ jal Matrix_Translate -/* 014FC 80884C8C 46007387 */ neg.s $f14, $f14 -/* 01500 80884C90 10000019 */ beq $zero, $zero, .L80884CF8 -/* 01504 80884C94 00000000 */ nop -.L80884C98: -/* 01508 80884C98 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0150C 80884C9C C60A006C */ lwc1 $f10, 0x006C($s0) ## 0000006C -/* 01510 80884CA0 3C188088 */ lui $t8, %hi(func_80884978) ## $t8 = 80880000 -/* 01514 80884CA4 27184978 */ addiu $t8, $t8, %lo(func_80884978) ## $t8 = 80884978 -/* 01518 80884CA8 460A4032 */ c.eq.s $f8, $f10 -/* 0151C 80884CAC 00000000 */ nop -/* 01520 80884CB0 45000011 */ bc1f .L80884CF8 -/* 01524 80884CB4 00000000 */ nop -/* 01528 80884CB8 1478000F */ bne $v1, $t8, .L80884CF8 -/* 0152C 80884CBC 260700B4 */ addiu $a3, $s0, 0x00B4 ## $a3 = 000000B4 -/* 01530 80884CC0 C60C0008 */ lwc1 $f12, 0x0008($s0) ## 00000008 -/* 01534 80884CC4 C60E000C */ lwc1 $f14, 0x000C($s0) ## 0000000C -/* 01538 80884CC8 0C0345A5 */ jal func_800D1694 -/* 0153C 80884CCC 8E060010 */ lw $a2, 0x0010($s0) ## 00000010 -/* 01540 80884CD0 3C018088 */ lui $at, %hi(D_80884ED4) ## $at = 80880000 -/* 01544 80884CD4 C4304EDC */ lwc1 $f16, %lo(D_80884EDC)($at) -/* 01548 80884CD8 C42C4ED4 */ lwc1 $f12, %lo(D_80884ED4)($at) -/* 0154C 80884CDC C42E4ED8 */ lwc1 $f14, %lo(D_80884ED8)($at) -/* 01550 80884CE0 46008487 */ neg.s $f18, $f16 -/* 01554 80884CE4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01558 80884CE8 44069000 */ mfc1 $a2, $f18 -/* 0155C 80884CEC 46006307 */ neg.s $f12, $f12 -/* 01560 80884CF0 0C034261 */ jal Matrix_Translate -/* 01564 80884CF4 46007387 */ neg.s $f14, $f14 -.L80884CF8: -/* 01568 80884CF8 3C048088 */ lui $a0, %hi(D_80884EC8) ## $a0 = 80880000 -/* 0156C 80884CFC 24844EC8 */ addiu $a0, $a0, %lo(D_80884EC8) ## $a0 = 80884EC8 -/* 01570 80884D00 0C0346BD */ jal Matrix_MultVec3f -/* 01574 80884D04 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 01578 80884D08 3C048088 */ lui $a0, %hi(D_80884ED4) ## $a0 = 80880000 -/* 0157C 80884D0C 24844ED4 */ addiu $a0, $a0, %lo(D_80884ED4) ## $a0 = 80884ED4 -/* 01580 80884D10 0C0346BD */ jal Matrix_MultVec3f -/* 01584 80884D14 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 01588 80884D18 8FB90054 */ lw $t9, 0x0054($sp) -/* 0158C 80884D1C 0C024F46 */ jal func_80093D18 -/* 01590 80884D20 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 01594 80884D24 8FA30040 */ lw $v1, 0x0040($sp) -/* 01598 80884D28 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 0159C 80884D2C 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 015A0 80884D30 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 -/* 015A4 80884D34 3C058088 */ lui $a1, %hi(D_80884F78) ## $a1 = 80880000 -/* 015A8 80884D38 24A54F78 */ addiu $a1, $a1, %lo(D_80884F78) ## $a1 = 80884F78 -/* 015AC 80884D3C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 015B0 80884D40 AC6802C0 */ sw $t0, 0x02C0($v1) ## 000002C0 -/* 015B4 80884D44 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 015B8 80884D48 8FAA0054 */ lw $t2, 0x0054($sp) -/* 015BC 80884D4C 240603A3 */ addiu $a2, $zero, 0x03A3 ## $a2 = 000003A3 -/* 015C0 80884D50 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 015C4 80884D54 0C0346A2 */ jal Matrix_NewMtx -/* 015C8 80884D58 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 015CC 80884D5C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 015D0 80884D60 8FAB0040 */ lw $t3, 0x0040($sp) -/* 015D4 80884D64 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 015D8 80884D68 25CE13C0 */ addiu $t6, $t6, 0x13C0 ## $t6 = 060013C0 -/* 015DC 80884D6C 8D6202C0 */ lw $v0, 0x02C0($t3) ## 000002C0 -/* 015E0 80884D70 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 015E4 80884D74 3C068088 */ lui $a2, %hi(D_80884F90) ## $a2 = 80880000 -/* 015E8 80884D78 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 015EC 80884D7C AD6C02C0 */ sw $t4, 0x02C0($t3) ## 000002C0 -/* 015F0 80884D80 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 015F4 80884D84 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 015F8 80884D88 8FAF0054 */ lw $t7, 0x0054($sp) -/* 015FC 80884D8C 24C64F90 */ addiu $a2, $a2, %lo(D_80884F90) ## $a2 = 80884F90 -/* 01600 80884D90 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 01604 80884D94 240703A7 */ addiu $a3, $zero, 0x03A7 ## $a3 = 000003A7 -/* 01608 80884D98 0C031AD5 */ jal Graph_CloseDisps -/* 0160C 80884D9C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 01610 80884DA0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01614 80884DA4 8FB00018 */ lw $s0, 0x0018($sp) -/* 01618 80884DA8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 0161C 80884DAC 03E00008 */ jr $ra -/* 01620 80884DB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Init.s deleted file mode 100644 index f2129eab6b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Init.s +++ /dev/null @@ -1,176 +0,0 @@ -.rdata -glabel D_80884EE0 - .asciz " 最大 ブロック セーブビット %x\n" - .balign 4 - -.late_rodata -glabel jtbl_80884FB0 -.word L80883BF8 -.word L80883B2C -.word L80883A9C -.word L80883AE4 -.word L80883B6C - -.text -glabel BgHeavyBlock_Init -/* 00278 80883A08 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0027C 80883A0C AFA50024 */ sw $a1, 0x0024($sp) -/* 00280 80883A10 AFBF001C */ sw $ra, 0x001C($sp) -/* 00284 80883A14 AFB00018 */ sw $s0, 0x0018($sp) -/* 00288 80883A18 3C058088 */ lui $a1, %hi(D_80884E70) ## $a1 = 80880000 -/* 0028C 80883A1C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00290 80883A20 0C01E037 */ jal Actor_ProcessInitChain - -/* 00294 80883A24 24A54E70 */ addiu $a1, $a1, %lo(D_80884E70) ## $a1 = 80884E70 -/* 00298 80883A28 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0029C 80883A2C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 002A0 80883A30 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 002A4 80883A34 44050000 */ mfc1 $a1, $f0 -/* 002A8 80883A38 44070000 */ mfc1 $a3, $f0 -/* 002AC 80883A3C 0C00AC78 */ jal ActorShape_Init - -/* 002B0 80883A40 00000000 */ nop -/* 002B4 80883A44 8FA50024 */ lw $a1, 0x0024($sp) -/* 002B8 80883A48 A6000172 */ sh $zero, 0x0172($s0) ## 00000172 -/* 002BC 80883A4C 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 002C0 80883A50 84AE00A4 */ lh $t6, 0x00A4($a1) ## 000000A4 -/* 002C4 80883A54 55C10008 */ bnel $t6, $at, .L80883A78 -/* 002C8 80883A58 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 002CC 80883A5C 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 002D0 80883A60 31F8FF00 */ andi $t8, $t7, 0xFF00 ## $t8 = 00000000 -/* 002D4 80883A64 A618001C */ sh $t8, 0x001C($s0) ## 0000001C -/* 002D8 80883A68 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 002DC 80883A6C 37280004 */ ori $t0, $t9, 0x0004 ## $t0 = 00000004 -/* 002E0 80883A70 A608001C */ sh $t0, 0x001C($s0) ## 0000001C -/* 002E4 80883A74 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -.L80883A78: -/* 002E8 80883A78 312A00FF */ andi $t2, $t1, 0x00FF ## $t2 = 00000000 -/* 002EC 80883A7C 2D410005 */ sltiu $at, $t2, 0x0005 -/* 002F0 80883A80 10200063 */ beq $at, $zero, .L80883C10 -/* 002F4 80883A84 000A5080 */ sll $t2, $t2, 2 -/* 002F8 80883A88 3C018088 */ lui $at, %hi(jtbl_80884FB0) ## $at = 80880000 -/* 002FC 80883A8C 002A0821 */ addu $at, $at, $t2 -/* 00300 80883A90 8C2A4FB0 */ lw $t2, %lo(jtbl_80884FB0)($at) -/* 00304 80883A94 01400008 */ jr $t2 -/* 00308 80883A98 00000000 */ nop -glabel L80883A9C -/* 0030C 80883A9C 3C0B8088 */ lui $t3, %hi(func_80884DB4) ## $t3 = 80880000 -/* 00310 80883AA0 3C0C8088 */ lui $t4, %hi(func_80883C90) ## $t4 = 80880000 -/* 00314 80883AA4 256B4DB4 */ addiu $t3, $t3, %lo(func_80884DB4) ## $t3 = 80884DB4 -/* 00318 80883AA8 258C3C90 */ addiu $t4, $t4, %lo(func_80883C90) ## $t4 = 80883C90 -/* 0031C 80883AAC AE0B0134 */ sw $t3, 0x0134($s0) ## 00000134 -/* 00320 80883AB0 AE0C0174 */ sw $t4, 0x0174($s0) ## 00000174 -/* 00324 80883AB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00328 80883AB8 0C220E08 */ jal func_80883820 -/* 0032C 80883ABC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00330 80883AC0 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 00334 80883AC4 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 -/* 00338 80883AC8 44812000 */ mtc1 $at, $f4 ## $f4 = -50.00 -/* 0033C 80883ACC 240D0078 */ addiu $t5, $zero, 0x0078 ## $t5 = 00000078 -/* 00340 80883AD0 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 -/* 00344 80883AD4 A60D0170 */ sh $t5, 0x0170($s0) ## 00000170 -/* 00348 80883AD8 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 0034C 80883ADC 10000051 */ beq $zero, $zero, .L80883C24 -/* 00350 80883AE0 E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 -glabel L80883AE4 -/* 00354 80883AE4 3C188088 */ lui $t8, %hi(func_80884DB4) ## $t8 = 80880000 -/* 00358 80883AE8 3C198088 */ lui $t9, %hi(func_80883C90) ## $t9 = 80880000 -/* 0035C 80883AEC 27184DB4 */ addiu $t8, $t8, %lo(func_80884DB4) ## $t8 = 80884DB4 -/* 00360 80883AF0 27393C90 */ addiu $t9, $t9, %lo(func_80883C90) ## $t9 = 80883C90 -/* 00364 80883AF4 AE180134 */ sw $t8, 0x0134($s0) ## 00000134 -/* 00368 80883AF8 AE190174 */ sw $t9, 0x0174($s0) ## 00000174 -/* 0036C 80883AFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00370 80883B00 0C220E08 */ jal func_80883820 -/* 00374 80883B04 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 -/* 00378 80883B08 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 0037C 80883B0C 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 -/* 00380 80883B10 44813000 */ mtc1 $at, $f6 ## $f6 = -20.00 -/* 00384 80883B14 24080078 */ addiu $t0, $zero, 0x0078 ## $t0 = 00000078 -/* 00388 80883B18 352A0010 */ ori $t2, $t1, 0x0010 ## $t2 = 00000010 -/* 0038C 80883B1C A6080170 */ sh $t0, 0x0170($s0) ## 00000170 -/* 00390 80883B20 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 00394 80883B24 1000003F */ beq $zero, $zero, .L80883C24 -/* 00398 80883B28 E6060168 */ swc1 $f6, 0x0168($s0) ## 00000168 -glabel L80883B2C -/* 0039C 80883B2C 0C220E66 */ jal func_80883998 -/* 003A0 80883B30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003A4 80883B34 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 003A8 80883B38 8FA40024 */ lw $a0, 0x0024($sp) -/* 003AC 80883B3C 00052A03 */ sra $a1, $a1, 8 -/* 003B0 80883B40 0C00B2D0 */ jal Flags_GetSwitch - -/* 003B4 80883B44 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 003B8 80883B48 10400005 */ beq $v0, $zero, .L80883B60 -/* 003BC 80883B4C 3C0B8088 */ lui $t3, %hi(func_808843B0) ## $t3 = 80880000 -/* 003C0 80883B50 0C00B55C */ jal Actor_Kill - -/* 003C4 80883B54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003C8 80883B58 10000037 */ beq $zero, $zero, .L80883C38 -/* 003CC 80883B5C 8FBF001C */ lw $ra, 0x001C($sp) -.L80883B60: -/* 003D0 80883B60 256B43B0 */ addiu $t3, $t3, %lo(func_808843B0) ## $t3 = 000043B0 -/* 003D4 80883B64 1000002F */ beq $zero, $zero, .L80883C24 -/* 003D8 80883B68 AE0B0174 */ sw $t3, 0x0174($s0) ## 00000174 -glabel L80883B6C -/* 003DC 80883B6C 0C220E66 */ jal func_80883998 -/* 003E0 80883B70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003E4 80883B74 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 003E8 80883B78 8FA40024 */ lw $a0, 0x0024($sp) -/* 003EC 80883B7C 00052A03 */ sra $a1, $a1, 8 -/* 003F0 80883B80 0C00B2D0 */ jal Flags_GetSwitch - -/* 003F4 80883B84 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 003F8 80883B88 10400018 */ beq $v0, $zero, .L80883BEC -/* 003FC 80883B8C 3C088088 */ lui $t0, %hi(func_808843B0) ## $t0 = 80880000 -/* 00400 80883B90 3C0144D5 */ lui $at, 0x44D5 ## $at = 44D50000 -/* 00404 80883B94 44814000 */ mtc1 $at, $f8 ## $f8 = 1704.00 -/* 00408 80883B98 3C0144BC */ lui $at, 0x44BC ## $at = 44BC0000 -/* 0040C 80883B9C 44815000 */ mtc1 $at, $f10 ## $f10 = 1504.00 -/* 00410 80883BA0 240D8AD0 */ addiu $t5, $zero, 0x8AD0 ## $t5 = FFFF8AD0 -/* 00414 80883BA4 240FC000 */ addiu $t7, $zero, 0xC000 ## $t7 = FFFFC000 -/* 00418 80883BA8 A60D0030 */ sh $t5, 0x0030($s0) ## 00000030 -/* 0041C 80883BAC A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 00420 80883BB0 A6000034 */ sh $zero, 0x0034($s0) ## 00000034 -/* 00424 80883BB4 3C014401 */ lui $at, 0x4401 ## $at = 44010000 -/* 00428 80883BB8 860E0030 */ lh $t6, 0x0030($s0) ## 00000030 -/* 0042C 80883BBC 86180032 */ lh $t8, 0x0032($s0) ## 00000032 -/* 00430 80883BC0 86190034 */ lh $t9, 0x0034($s0) ## 00000034 -/* 00434 80883BC4 44818000 */ mtc1 $at, $f16 ## $f16 = 516.00 -/* 00438 80883BC8 3C0C8088 */ lui $t4, %hi(func_8088496C) ## $t4 = 80880000 -/* 0043C 80883BCC 258C496C */ addiu $t4, $t4, %lo(func_8088496C) ## $t4 = 8088496C -/* 00440 80883BD0 AE0C0174 */ sw $t4, 0x0174($s0) ## 00000174 -/* 00444 80883BD4 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 00448 80883BD8 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 0044C 80883BDC A60E00B4 */ sh $t6, 0x00B4($s0) ## 000000B4 -/* 00450 80883BE0 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 00454 80883BE4 A61900B8 */ sh $t9, 0x00B8($s0) ## 000000B8 -/* 00458 80883BE8 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C -.L80883BEC: -/* 0045C 80883BEC 250843B0 */ addiu $t0, $t0, %lo(func_808843B0) ## $t0 = 808843B0 -/* 00460 80883BF0 1000000C */ beq $zero, $zero, .L80883C24 -/* 00464 80883BF4 AE080174 */ sw $t0, 0x0174($s0) ## 00000174 -glabel L80883BF8 -/* 00468 80883BF8 0C220E66 */ jal func_80883998 -/* 0046C 80883BFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00470 80883C00 3C098088 */ lui $t1, %hi(func_808843B0) ## $t1 = 80880000 -/* 00474 80883C04 252943B0 */ addiu $t1, $t1, %lo(func_808843B0) ## $t1 = 808843B0 -/* 00478 80883C08 10000006 */ beq $zero, $zero, .L80883C24 -/* 0047C 80883C0C AE090174 */ sw $t1, 0x0174($s0) ## 00000174 -.L80883C10: -/* 00480 80883C10 0C220E66 */ jal func_80883998 -/* 00484 80883C14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00488 80883C18 3C0A8088 */ lui $t2, %hi(func_808843B0) ## $t2 = 80880000 -/* 0048C 80883C1C 254A43B0 */ addiu $t2, $t2, %lo(func_808843B0) ## $t2 = 808843B0 -/* 00490 80883C20 AE0A0174 */ sw $t2, 0x0174($s0) ## 00000174 -.L80883C24: -/* 00494 80883C24 3C048088 */ lui $a0, %hi(D_80884EE0) ## $a0 = 80880000 -/* 00498 80883C28 24844EE0 */ addiu $a0, $a0, %lo(D_80884EE0) ## $a0 = 80884EE0 -/* 0049C 80883C2C 0C00084C */ jal osSyncPrintf - -/* 004A0 80883C30 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 004A4 80883C34 8FBF001C */ lw $ra, 0x001C($sp) -.L80883C38: -/* 004A8 80883C38 8FB00018 */ lw $s0, 0x0018($sp) -/* 004AC 80883C3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 004B0 80883C40 03E00008 */ jr $ra -/* 004B4 80883C44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Update.s deleted file mode 100644 index d84dc1216e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel BgHeavyBlock_Update -/* 01458 80884BE8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0145C 80884BEC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01460 80884BF0 8C990174 */ lw $t9, 0x0174($a0) ## 00000174 -/* 01464 80884BF4 0320F809 */ jalr $ra, $t9 -/* 01468 80884BF8 00000000 */ nop -/* 0146C 80884BFC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01470 80884C00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01474 80884C04 03E00008 */ jr $ra -/* 01478 80884C08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883790.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883790.s deleted file mode 100644 index 59a278b536..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883790.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80883790 -/* 00000 80883790 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80883794 3C014480 */ lui $at, 0x4480 ## $at = 44800000 -/* 00008 80883798 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0000C 8088379C 44816000 */ mtc1 $at, $f12 ## $f12 = 1024.00 -/* 00010 808837A0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00014 808837A4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00018 808837A8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0001C 808837AC C7A4001C */ lwc1 $f4, 0x001C($sp) -/* 00020 808837B0 8FB80018 */ lw $t8, 0x0018($sp) -/* 00024 808837B4 3C014480 */ lui $at, 0x4480 ## $at = 44800000 -/* 00028 808837B8 46040182 */ mul.s $f6, $f0, $f4 -/* 0002C 808837BC 44816000 */ mtc1 $at, $f12 ## $f12 = 1024.00 -/* 00030 808837C0 4600320D */ trunc.w.s $f8, $f6 -/* 00034 808837C4 440F4000 */ mfc1 $t7, $f8 -/* 00038 808837C8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0003C 808837CC A70F0030 */ sh $t7, 0x0030($t8) ## 00000030 -/* 00040 808837D0 C7AA001C */ lwc1 $f10, 0x001C($sp) -/* 00044 808837D4 8FA90018 */ lw $t1, 0x0018($sp) -/* 00048 808837D8 3C014480 */ lui $at, 0x4480 ## $at = 44800000 -/* 0004C 808837DC 460A0402 */ mul.s $f16, $f0, $f10 -/* 00050 808837E0 44816000 */ mtc1 $at, $f12 ## $f12 = 1024.00 -/* 00054 808837E4 4600848D */ trunc.w.s $f18, $f16 -/* 00058 808837E8 44089000 */ mfc1 $t0, $f18 -/* 0005C 808837EC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00060 808837F0 A5280032 */ sh $t0, 0x0032($t1) ## 00000032 -/* 00064 808837F4 C7A4001C */ lwc1 $f4, 0x001C($sp) -/* 00068 808837F8 8FAC0018 */ lw $t4, 0x0018($sp) -/* 0006C 808837FC 46040182 */ mul.s $f6, $f0, $f4 -/* 00070 80883800 4600320D */ trunc.w.s $f8, $f6 -/* 00074 80883804 440B4000 */ mfc1 $t3, $f8 -/* 00078 80883808 00000000 */ nop -/* 0007C 8088380C A58B0034 */ sh $t3, 0x0034($t4) ## 00000034 -/* 00080 80883810 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00084 80883814 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00088 80883818 03E00008 */ jr $ra -/* 0008C 8088381C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883820.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883820.s deleted file mode 100644 index 96740adc7f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883820.s +++ /dev/null @@ -1,114 +0,0 @@ -.late_rodata -glabel D_80884FA8 - .float -0.6 - -glabel D_80884FAC - .float 0.2 - -.text -glabel func_80883820 -/* 00090 80883820 3C018088 */ lui $at, %hi(D_80884FA8) ## $at = 80880000 -/* 00094 80883824 C4244FA8 */ lwc1 $f4, %lo(D_80884FA8)($at) -/* 00098 80883828 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0009C 8088382C 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 -/* 000A0 80883830 44813000 */ mtc1 $at, $f6 ## $f6 = -12.00 -/* 000A4 80883834 AFBF001C */ sw $ra, 0x001C($sp) -/* 000A8 80883838 AFB00018 */ sw $s0, 0x0018($sp) -/* 000AC 8088383C AFA5002C */ sw $a1, 0x002C($sp) -/* 000B0 80883840 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 000B4 80883844 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 000B8 80883848 E4860070 */ swc1 $f6, 0x0070($a0) ## 00000070 -/* 000BC 8088384C C7AA002C */ lwc1 $f10, 0x002C($sp) -/* 000C0 80883850 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 -/* 000C4 80883854 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000C8 80883858 460A4302 */ mul.s $f12, $f8, $f10 -/* 000CC 8088385C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 000D0 80883860 00000000 */ nop -/* 000D4 80883864 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 000D8 80883868 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 000DC 8088386C 4610003C */ c.lt.s $f0, $f16 -/* 000E0 80883870 00000000 */ nop -/* 000E4 80883874 45020008 */ bc1fl .L80883898 -/* 000E8 80883878 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 000EC 8088387C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 000F0 80883880 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 -/* 000F4 80883884 00000000 */ nop -/* 000F8 80883888 46120101 */ sub.s $f4, $f0, $f18 -/* 000FC 8088388C 10000005 */ beq $zero, $zero, .L808838A4 -/* 00100 80883890 E7A40024 */ swc1 $f4, 0x0024($sp) -/* 00104 80883894 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -.L80883898: -/* 00108 80883898 00000000 */ nop -/* 0010C 8088389C 46060200 */ add.s $f8, $f0, $f6 -/* 00110 808838A0 E7A80024 */ swc1 $f8, 0x0024($sp) -.L808838A4: -/* 00114 808838A4 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00118 808838A8 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 -/* 0011C 808838AC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00120 808838B0 00000000 */ nop -/* 00124 808838B4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00128 808838B8 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 0012C 808838BC C7A2002C */ lwc1 $f2, 0x002C($sp) -/* 00130 808838C0 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 00134 808838C4 460A0400 */ add.s $f16, $f0, $f10 -/* 00138 808838C8 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 0013C 808838CC 46028482 */ mul.s $f18, $f16, $f2 -/* 00140 808838D0 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -/* 00144 808838D4 46022302 */ mul.s $f12, $f4, $f2 -/* 00148 808838D8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0014C 808838DC 00000000 */ nop -/* 00150 808838E0 E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 -/* 00154 808838E4 0C01DE0D */ jal Math_Coss - ## coss? -/* 00158 808838E8 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 0015C 808838EC E7A00020 */ swc1 $f0, 0x0020($sp) -/* 00160 808838F0 0C01DE1C */ jal Math_Sins - ## sins? -/* 00164 808838F4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 00168 808838F8 C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 0016C 808838FC C7A80024 */ lwc1 $f8, 0x0024($sp) -/* 00170 80883900 C6100064 */ lwc1 $f16, 0x0064($s0) ## 00000064 -/* 00174 80883904 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 00178 80883908 46083282 */ mul.s $f10, $f6, $f8 -/* 0017C 8088390C 00000000 */ nop -/* 00180 80883910 46100482 */ mul.s $f18, $f0, $f16 -/* 00184 80883914 460A9100 */ add.s $f4, $f18, $f10 -/* 00188 80883918 0C01DE1C */ jal Math_Sins - ## sins? -/* 0018C 8088391C E604005C */ swc1 $f4, 0x005C($s0) ## 0000005C -/* 00190 80883920 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 00194 80883924 0C01DE0D */ jal Math_Coss - ## coss? -/* 00198 80883928 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 0019C 8088392C C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 001A0 80883930 C7B00024 */ lwc1 $f16, 0x0024($sp) -/* 001A4 80883934 C60A0064 */ lwc1 $f10, 0x0064($s0) ## 00000064 -/* 001A8 80883938 46003207 */ neg.s $f8, $f6 -/* 001AC 8088393C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001B0 80883940 46104482 */ mul.s $f18, $f8, $f16 -/* 001B4 80883944 00000000 */ nop -/* 001B8 80883948 460A0102 */ mul.s $f4, $f0, $f10 -/* 001BC 8088394C 46122180 */ add.s $f6, $f4, $f18 -/* 001C0 80883950 E6060064 */ swc1 $f6, 0x0064($s0) ## 00000064 -/* 001C4 80883954 0C220DE4 */ jal func_80883790 -/* 001C8 80883958 8FA5002C */ lw $a1, 0x002C($sp) -/* 001CC 8088395C 3C018088 */ lui $at, %hi(D_80884FAC) ## $at = 80880000 -/* 001D0 80883960 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 001D4 80883964 C42C4FAC */ lwc1 $f12, %lo(D_80884FAC)($at) -/* 001D8 80883968 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 001DC 8088396C 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 001E0 80883970 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001E4 80883974 46080400 */ add.s $f16, $f0, $f8 -/* 001E8 80883978 44058000 */ mfc1 $a1, $f16 -/* 001EC 8088397C 0C00B58B */ jal Actor_SetScale - -/* 001F0 80883980 00000000 */ nop -/* 001F4 80883984 8FBF001C */ lw $ra, 0x001C($sp) -/* 001F8 80883988 8FB00018 */ lw $s0, 0x0018($sp) -/* 001FC 8088398C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00200 80883990 03E00008 */ jr $ra -/* 00204 80883994 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883998.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883998.s deleted file mode 100644 index d0dd1cea23..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883998.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80883998 -/* 00208 80883998 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0020C 8088399C AFBF001C */ sw $ra, 0x001C($sp) -/* 00210 808839A0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00214 808839A4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00218 808839A8 AFA00024 */ sw $zero, 0x0024($sp) -/* 0021C 808839AC 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00220 808839B0 3C010002 */ lui $at, 0x0002 ## $at = 00020000 -/* 00224 808839B4 34210030 */ ori $at, $at, 0x0030 ## $at = 00020030 -/* 00228 808839B8 01C17825 */ or $t7, $t6, $at ## $t7 = 00020030 -/* 0022C 808839BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00230 808839C0 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 00234 808839C4 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00238 808839C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0023C 808839CC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00240 808839D0 2484169C */ addiu $a0, $a0, 0x169C ## $a0 = 0600169C -/* 00244 808839D4 0C010620 */ jal DynaPolyInfo_Alloc - -/* 00248 808839D8 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 0024C 808839DC 8FA40034 */ lw $a0, 0x0034($sp) -/* 00250 808839E0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00254 808839E4 8FA70024 */ lw $a3, 0x0024($sp) -/* 00258 808839E8 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 0025C 808839EC 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00260 808839F0 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00264 808839F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00268 808839F8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0026C 808839FC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00270 80883A00 03E00008 */ jr $ra -/* 00274 80883A04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883C90.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883C90.s deleted file mode 100644 index d91f54525d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883C90.s +++ /dev/null @@ -1,128 +0,0 @@ -.late_rodata -glabel D_80884FC4 - .float 0.9800000190734863 - -.text -glabel func_80883C90 -/* 00500 80883C90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00504 80883C94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00508 80883C98 AFB00020 */ sw $s0, 0x0020($sp) -/* 0050C 80883C9C AFA5002C */ sw $a1, 0x002C($sp) -/* 00510 80883CA0 C4840060 */ lwc1 $f4, 0x0060($a0) ## 00000060 -/* 00514 80883CA4 C486006C */ lwc1 $f6, 0x006C($a0) ## 0000006C -/* 00518 80883CA8 C4800070 */ lwc1 $f0, 0x0070($a0) ## 00000070 -/* 0051C 80883CAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00520 80883CB0 46062200 */ add.s $f8, $f4, $f6 -/* 00524 80883CB4 3C018088 */ lui $at, %hi(D_80884FC4) ## $at = 80880000 -/* 00528 80883CB8 E4880060 */ swc1 $f8, 0x0060($a0) ## 00000060 -/* 0052C 80883CBC C48A0060 */ lwc1 $f10, 0x0060($a0) ## 00000060 -/* 00530 80883CC0 4600503C */ c.lt.s $f10, $f0 -/* 00534 80883CC4 00000000 */ nop -/* 00538 80883CC8 45000002 */ bc1f .L80883CD4 -/* 0053C 80883CCC 00000000 */ nop -/* 00540 80883CD0 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -.L80883CD4: -/* 00544 80883CD4 C4204FC4 */ lwc1 $f0, %lo(D_80884FC4)($at) -/* 00548 80883CD8 C610005C */ lwc1 $f16, 0x005C($s0) ## 0000005C -/* 0054C 80883CDC C6040064 */ lwc1 $f4, 0x0064($s0) ## 00000064 -/* 00550 80883CE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00554 80883CE4 46008482 */ mul.s $f18, $f16, $f0 -/* 00558 80883CE8 00000000 */ nop -/* 0055C 80883CEC 46002182 */ mul.s $f6, $f4, $f0 -/* 00560 80883CF0 E612005C */ swc1 $f18, 0x005C($s0) ## 0000005C -/* 00564 80883CF4 0C00B5FB */ jal func_8002D7EC -/* 00568 80883CF8 E6060064 */ swc1 $f6, 0x0064($s0) ## 00000064 -/* 0056C 80883CFC 860E00B4 */ lh $t6, 0x00B4($s0) ## 000000B4 -/* 00570 80883D00 860F0030 */ lh $t7, 0x0030($s0) ## 00000030 -/* 00574 80883D04 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 00578 80883D08 86080032 */ lh $t0, 0x0032($s0) ## 00000032 -/* 0057C 80883D0C 860A00B8 */ lh $t2, 0x00B8($s0) ## 000000B8 -/* 00580 80883D10 860B0034 */ lh $t3, 0x0034($s0) ## 00000034 -/* 00584 80883D14 960D0172 */ lhu $t5, 0x0172($s0) ## 00000172 -/* 00588 80883D18 01CFC021 */ addu $t8, $t6, $t7 -/* 0058C 80883D1C 03284821 */ addu $t1, $t9, $t0 -/* 00590 80883D20 014B6021 */ addu $t4, $t2, $t3 -/* 00594 80883D24 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 00598 80883D28 A61800B4 */ sh $t8, 0x00B4($s0) ## 000000B4 -/* 0059C 80883D2C A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -/* 005A0 80883D30 15C0003C */ bne $t6, $zero, .L80883E24 -/* 005A4 80883D34 A60C00B8 */ sh $t4, 0x00B8($s0) ## 000000B8 -/* 005A8 80883D38 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 005AC 80883D3C C60A0168 */ lwc1 $f10, 0x0168($s0) ## 00000168 -/* 005B0 80883D40 C6120104 */ lwc1 $f18, 0x0104($s0) ## 00000104 -/* 005B4 80883D44 C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 -/* 005B8 80883D48 460A4400 */ add.s $f16, $f8, $f10 -/* 005BC 80883D4C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 005C0 80883D50 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 -/* 005C4 80883D54 46049180 */ add.s $f6, $f18, $f4 -/* 005C8 80883D58 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 005CC 80883D5C E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 005D0 80883D60 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 005D4 80883D64 E6060104 */ swc1 $f6, 0x0104($s0) ## 00000104 -/* 005D8 80883D68 44060000 */ mfc1 $a2, $f0 -/* 005DC 80883D6C 44070000 */ mfc1 $a3, $f0 -/* 005E0 80883D70 AFAF0014 */ sw $t7, 0x0014($sp) -/* 005E4 80883D74 8FA4002C */ lw $a0, 0x002C($sp) -/* 005E8 80883D78 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005EC 80883D7C 0C00B92D */ jal func_8002E4B4 -/* 005F0 80883D80 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 005F4 80883D84 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 005F8 80883D88 C6100168 */ lwc1 $f16, 0x0168($s0) ## 00000168 -/* 005FC 80883D8C C6040104 */ lwc1 $f4, 0x0104($s0) ## 00000104 -/* 00600 80883D90 C6060168 */ lwc1 $f6, 0x0168($s0) ## 00000168 -/* 00604 80883D94 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 00608 80883D98 46105481 */ sub.s $f18, $f10, $f16 -/* 0060C 80883D9C 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 00610 80883DA0 46062201 */ sub.s $f8, $f4, $f6 -/* 00614 80883DA4 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 00618 80883DA8 1320001E */ beq $t9, $zero, .L80883E24 -/* 0061C 80883DAC E6080104 */ swc1 $f8, 0x0104($s0) ## 00000104 -/* 00620 80883DB0 96080172 */ lhu $t0, 0x0172($s0) ## 00000172 -/* 00624 80883DB4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00628 80883DB8 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 -/* 0062C 80883DBC 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00630 80883DC0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00634 80883DC4 A6090172 */ sh $t1, 0x0172($s0) ## 00000172 -/* 00638 80883DC8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0063C 80883DCC 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 -/* 00640 80883DD0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00644 80883DD4 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 -/* 00648 80883DD8 460A0400 */ add.s $f16, $f0, $f10 -/* 0064C 80883DDC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00650 80883DE0 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 -/* 00654 80883DE4 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00658 80883DE8 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 -/* 0065C 80883DEC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00660 80883DF0 E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C -/* 00664 80883DF4 E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 -/* 00668 80883DF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0066C 80883DFC 0C220DE4 */ jal func_80883790 -/* 00670 80883E00 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00674 80883E04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00678 80883E08 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0067C 80883E0C 24052852 */ addiu $a1, $zero, 0x2852 ## $a1 = 00002852 -/* 00680 80883E10 C60C0090 */ lwc1 $f12, 0x0090($s0) ## 00000090 -/* 00684 80883E14 24050096 */ addiu $a1, $zero, 0x0096 ## $a1 = 00000096 -/* 00688 80883E18 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0068C 80883E1C 0C02A800 */ jal func_800AA000 -/* 00690 80883E20 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -.L80883E24: -/* 00694 80883E24 86020170 */ lh $v0, 0x0170($s0) ## 00000170 -/* 00698 80883E28 18400003 */ blez $v0, .L80883E38 -/* 0069C 80883E2C 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF -/* 006A0 80883E30 10000003 */ beq $zero, $zero, .L80883E40 -/* 006A4 80883E34 A60A0170 */ sh $t2, 0x0170($s0) ## 00000170 -.L80883E38: -/* 006A8 80883E38 0C00B55C */ jal Actor_Kill - -/* 006AC 80883E3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80883E40: -/* 006B0 80883E40 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006B4 80883E44 8FB00020 */ lw $s0, 0x0020($sp) -/* 006B8 80883E48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006BC 80883E4C 03E00008 */ jr $ra -/* 006C0 80883E50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883E54.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883E54.s deleted file mode 100644 index 5f03eb810e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883E54.s +++ /dev/null @@ -1,239 +0,0 @@ -glabel func_80883E54 -/* 006C4 80883E54 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 006C8 80883E58 93A300AF */ lbu $v1, 0x00AF($sp) -/* 006CC 80883E5C AFA7009C */ sw $a3, 0x009C($sp) -/* 006D0 80883E60 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 -/* 006D4 80883E64 44867000 */ mtc1 $a2, $f14 ## $f14 = 0.00 -/* 006D8 80883E68 C7A4009C */ lwc1 $f4, 0x009C($sp) -/* 006DC 80883E6C 306E0001 */ andi $t6, $v1, 0x0001 ## $t6 = 00000000 -/* 006E0 80883E70 AFBF002C */ sw $ra, 0x002C($sp) -/* 006E4 80883E74 AFA40090 */ sw $a0, 0x0090($sp) -/* 006E8 80883E78 E7AC0048 */ swc1 $f12, 0x0048($sp) -/* 006EC 80883E7C E7AE004C */ swc1 $f14, 0x004C($sp) -/* 006F0 80883E80 11C0000C */ beq $t6, $zero, .L80883EB4 -/* 006F4 80883E84 E7A40050 */ swc1 $f4, 0x0050($sp) -/* 006F8 80883E88 240F0096 */ addiu $t7, $zero, 0x0096 ## $t7 = 00000096 -/* 006FC 80883E8C 24180050 */ addiu $t8, $zero, 0x0050 ## $t8 = 00000050 -/* 00700 80883E90 A3AF008C */ sb $t7, 0x008C($sp) -/* 00704 80883E94 A3A0008A */ sb $zero, 0x008A($sp) -/* 00708 80883E98 A3A00089 */ sb $zero, 0x0089($sp) -/* 0070C 80883E9C A3A0008E */ sb $zero, 0x008E($sp) -/* 00710 80883EA0 A3A0008D */ sb $zero, 0x008D($sp) -/* 00714 80883EA4 A3B80088 */ sb $t8, 0x0088($sp) -/* 00718 80883EA8 A3A0008B */ sb $zero, 0x008B($sp) -/* 0071C 80883EAC 10000011 */ beq $zero, $zero, .L80883EF4 -/* 00720 80883EB0 A3A0008F */ sb $zero, 0x008F($sp) -.L80883EB4: -/* 00724 80883EB4 241900AA */ addiu $t9, $zero, 0x00AA ## $t9 = 000000AA -/* 00728 80883EB8 24080082 */ addiu $t0, $zero, 0x0082 ## $t0 = 00000082 -/* 0072C 80883EBC 2409005A */ addiu $t1, $zero, 0x005A ## $t1 = 0000005A -/* 00730 80883EC0 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00734 80883EC4 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 00738 80883EC8 240C003C */ addiu $t4, $zero, 0x003C ## $t4 = 0000003C -/* 0073C 80883ECC 240D0014 */ addiu $t5, $zero, 0x0014 ## $t5 = 00000014 -/* 00740 80883ED0 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00744 80883ED4 A3AA008F */ sb $t2, 0x008F($sp) -/* 00748 80883ED8 A3A9008E */ sb $t1, 0x008E($sp) -/* 0074C 80883EDC A3A8008D */ sb $t0, 0x008D($sp) -/* 00750 80883EE0 A3B9008C */ sb $t9, 0x008C($sp) -/* 00754 80883EE4 A3AE008B */ sb $t6, 0x008B($sp) -/* 00758 80883EE8 A3AD008A */ sb $t5, 0x008A($sp) -/* 0075C 80883EEC A3AC0089 */ sb $t4, 0x0089($sp) -/* 00760 80883EF0 A3AB0088 */ sb $t3, 0x0088($sp) -.L80883EF4: -/* 00764 80883EF4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00768 80883EF8 306F0008 */ andi $t7, $v1, 0x0008 ## $t7 = 00000000 -/* 0076C 80883EFC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00770 80883F00 E7A00068 */ swc1 $f0, 0x0068($sp) -/* 00774 80883F04 11E00003 */ beq $t7, $zero, .L80883F14 -/* 00778 80883F08 E7A00060 */ swc1 $f0, 0x0060($sp) -/* 0077C 80883F0C 10000004 */ beq $zero, $zero, .L80883F20 -/* 00780 80883F10 E7A00064 */ swc1 $f0, 0x0064($sp) -.L80883F14: -/* 00784 80883F14 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00788 80883F18 00000000 */ nop -/* 0078C 80883F1C E7A60064 */ swc1 $f6, 0x0064($sp) -.L80883F20: -/* 00790 80883F20 8FB80090 */ lw $t8, 0x0090($sp) -/* 00794 80883F24 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFEC -/* 00798 80883F28 27A50070 */ addiu $a1, $sp, 0x0070 ## $a1 = FFFFFFE0 -/* 0079C 80883F2C 871907A0 */ lh $t9, 0x07A0($t8) ## 000007F0 -/* 007A0 80883F30 30620006 */ andi $v0, $v1, 0x0006 ## $v0 = 00000000 -/* 007A4 80883F34 00194080 */ sll $t0, $t9, 2 -/* 007A8 80883F38 03084821 */ addu $t1, $t8, $t0 -/* 007AC 80883F3C 8D2A0790 */ lw $t2, 0x0790($t1) ## 000007EA -/* 007B0 80883F40 8D4C005C */ lw $t4, 0x005C($t2) ## 0000015B -/* 007B4 80883F44 AC8C0000 */ sw $t4, 0x0000($a0) ## FFFFFFEC -/* 007B8 80883F48 8D4B0060 */ lw $t3, 0x0060($t2) ## 0000015F -/* 007BC 80883F4C AC8B0004 */ sw $t3, 0x0004($a0) ## FFFFFFF0 -/* 007C0 80883F50 8D4C0064 */ lw $t4, 0x0064($t2) ## 00000163 -/* 007C4 80883F54 240A03E8 */ addiu $t2, $zero, 0x03E8 ## $t2 = 000003E8 -/* 007C8 80883F58 240B00A0 */ addiu $t3, $zero, 0x00A0 ## $t3 = 000000A0 -/* 007CC 80883F5C AC8C0008 */ sw $t4, 0x0008($a0) ## FFFFFFF4 -/* 007D0 80883F60 8FAD0090 */ lw $t5, 0x0090($sp) -/* 007D4 80883F64 85AE07A0 */ lh $t6, 0x07A0($t5) ## 000007B4 -/* 007D8 80883F68 000E7880 */ sll $t7, $t6, 2 -/* 007DC 80883F6C 01AFC821 */ addu $t9, $t5, $t7 -/* 007E0 80883F70 8F380790 */ lw $t8, 0x0790($t9) ## 0000083A -/* 007E4 80883F74 8F090050 */ lw $t1, 0x0050($t8) ## 000000A0 -/* 007E8 80883F78 ACA90000 */ sw $t1, 0x0000($a1) ## FFFFFFE0 -/* 007EC 80883F7C 8F080054 */ lw $t0, 0x0054($t8) ## 000000A4 -/* 007F0 80883F80 ACA80004 */ sw $t0, 0x0004($a1) ## FFFFFFE4 -/* 007F4 80883F84 8F090058 */ lw $t1, 0x0058($t8) ## 000000A8 -/* 007F8 80883F88 ACA90008 */ sw $t1, 0x0008($a1) ## FFFFFFE8 -/* 007FC 80883F8C A7AA0040 */ sh $t2, 0x0040($sp) -/* 00800 80883F90 10400034 */ beq $v0, $zero, .L80884064 -/* 00804 80883F94 A7AB0042 */ sh $t3, 0x0042($sp) -/* 00808 80883F98 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0080C 80883F9C 10410010 */ beq $v0, $at, .L80883FE0 -/* 00810 80883FA0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00814 80883FA4 10410004 */ beq $v0, $at, .L80883FB8 -/* 00818 80883FA8 C7A800A0 */ lwc1 $f8, 0x00A0($sp) -/* 0081C 80883FAC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00820 80883FB0 54410069 */ bnel $v0, $at, .L80884158 -/* 00824 80883FB4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80883FB8: -/* 00828 80883FB8 C7AA00A4 */ lwc1 $f10, 0x00A4($sp) -/* 0082C 80883FBC C7AC00A8 */ lwc1 $f12, 0x00A8($sp) -/* 00830 80883FC0 240C012C */ addiu $t4, $zero, 0x012C ## $t4 = 0000012C -/* 00834 80883FC4 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 -/* 00838 80883FC8 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 0083C 80883FCC A7AC0040 */ sh $t4, 0x0040($sp) -/* 00840 80883FD0 A7AE0042 */ sh $t6, 0x0042($sp) -/* 00844 80883FD4 E7AA0058 */ swc1 $f10, 0x0058($sp) -/* 00848 80883FD8 1000005E */ beq $zero, $zero, .L80884154 -/* 0084C 80883FDC E7AC005C */ swc1 $f12, 0x005C($sp) -.L80883FE0: -/* 00850 80883FE0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00854 80883FE4 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 00858 80883FE8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0085C 80883FEC 00000000 */ nop -/* 00860 80883FF0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00864 80883FF4 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 00868 80883FF8 3C01477F */ lui $at, 0x477F ## $at = 477F0000 -/* 0086C 80883FFC 44816000 */ mtc1 $at, $f12 ## $f12 = 65280.00 -/* 00870 80884000 46100480 */ add.s $f18, $f0, $f16 -/* 00874 80884004 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00878 80884008 E7B20044 */ swc1 $f18, 0x0044($sp) -/* 0087C 8088400C 4600010D */ trunc.w.s $f4, $f0 -/* 00880 80884010 44022000 */ mfc1 $v0, $f4 -/* 00884 80884014 00000000 */ nop -/* 00888 80884018 00022400 */ sll $a0, $v0, 16 -/* 0088C 8088401C 00042403 */ sra $a0, $a0, 16 -/* 00890 80884020 0C01DE1C */ jal Math_Sins - ## sins? -/* 00894 80884024 A7A2006E */ sh $v0, 0x006E($sp) -/* 00898 80884028 C7A60044 */ lwc1 $f6, 0x0044($sp) -/* 0089C 8088402C C7AA00A0 */ lwc1 $f10, 0x00A0($sp) -/* 008A0 80884030 C7B200A4 */ lwc1 $f18, 0x00A4($sp) -/* 008A4 80884034 46060202 */ mul.s $f8, $f0, $f6 -/* 008A8 80884038 87A4006E */ lh $a0, 0x006E($sp) -/* 008AC 8088403C E7B20058 */ swc1 $f18, 0x0058($sp) -/* 008B0 80884040 460A4400 */ add.s $f16, $f8, $f10 -/* 008B4 80884044 0C01DE0D */ jal Math_Coss - ## coss? -/* 008B8 80884048 E7B00054 */ swc1 $f16, 0x0054($sp) -/* 008BC 8088404C C7A40044 */ lwc1 $f4, 0x0044($sp) -/* 008C0 80884050 C7A800A8 */ lwc1 $f8, 0x00A8($sp) -/* 008C4 80884054 46040182 */ mul.s $f6, $f0, $f4 -/* 008C8 80884058 46083300 */ add.s $f12, $f6, $f8 -/* 008CC 8088405C 1000003D */ beq $zero, $zero, .L80884154 -/* 008D0 80884060 E7AC005C */ swc1 $f12, 0x005C($sp) -.L80884064: -/* 008D4 80884064 0C01E01A */ jal Math_Vec3f_Yaw - -/* 008D8 80884068 00000000 */ nop -/* 008DC 8088406C A7A2006E */ sh $v0, 0x006E($sp) -/* 008E0 80884070 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFEC -/* 008E4 80884074 0C01E027 */ jal Math_Vec3f_Pitch - -/* 008E8 80884078 27A50070 */ addiu $a1, $sp, 0x0070 ## $a1 = FFFFFFE0 -/* 008EC 8088407C 00027823 */ subu $t7, $zero, $v0 -/* 008F0 80884080 A7AF006C */ sh $t7, 0x006C($sp) -/* 008F4 80884084 0C01DE1C */ jal Math_Sins - ## sins? -/* 008F8 80884088 87A4006E */ lh $a0, 0x006E($sp) -/* 008FC 8088408C E7A00038 */ swc1 $f0, 0x0038($sp) -/* 00900 80884090 0C01DE0D */ jal Math_Coss - ## coss? -/* 00904 80884094 87A4006C */ lh $a0, 0x006C($sp) -/* 00908 80884098 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0090C 8088409C 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 00910 808840A0 C7B00038 */ lwc1 $f16, 0x0038($sp) -/* 00914 808840A4 C7A600A0 */ lwc1 $f6, 0x00A0($sp) -/* 00918 808840A8 87A4006C */ lh $a0, 0x006C($sp) -/* 0091C 808840AC 46105482 */ mul.s $f18, $f10, $f16 -/* 00920 808840B0 00000000 */ nop -/* 00924 808840B4 46120102 */ mul.s $f4, $f0, $f18 -/* 00928 808840B8 46062200 */ add.s $f8, $f4, $f6 -/* 0092C 808840BC 0C01DE1C */ jal Math_Sins - ## sins? -/* 00930 808840C0 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 00934 808840C4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00938 808840C8 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 0093C 808840CC C7B200A4 */ lwc1 $f18, 0x00A4($sp) -/* 00940 808840D0 87A4006E */ lh $a0, 0x006E($sp) -/* 00944 808840D4 460A0402 */ mul.s $f16, $f0, $f10 -/* 00948 808840D8 46128100 */ add.s $f4, $f16, $f18 -/* 0094C 808840DC 0C01DE0D */ jal Math_Coss - ## coss? -/* 00950 808840E0 E7A40058 */ swc1 $f4, 0x0058($sp) -/* 00954 808840E4 E7A00038 */ swc1 $f0, 0x0038($sp) -/* 00958 808840E8 0C01DE0D */ jal Math_Coss - ## coss? -/* 0095C 808840EC 87A4006C */ lh $a0, 0x006C($sp) -/* 00960 808840F0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00964 808840F4 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 00968 808840F8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0096C 808840FC 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 00970 80884100 C7A80038 */ lwc1 $f8, 0x0038($sp) -/* 00974 80884104 C7B200A8 */ lwc1 $f18, 0x00A8($sp) -/* 00978 80884108 C7A40048 */ lwc1 $f4, 0x0048($sp) -/* 0097C 8088410C 46083282 */ mul.s $f10, $f6, $f8 -/* 00980 80884110 C7A60054 */ lwc1 $f6, 0x0054($sp) -/* 00984 80884114 460A0402 */ mul.s $f16, $f0, $f10 -/* 00988 80884118 00000000 */ nop -/* 0098C 8088411C 46023202 */ mul.s $f8, $f6, $f2 -/* 00990 80884120 46128300 */ add.s $f12, $f16, $f18 -/* 00994 80884124 C7B20058 */ lwc1 $f18, 0x0058($sp) -/* 00998 80884128 C7B0004C */ lwc1 $f16, 0x004C($sp) -/* 0099C 8088412C 46082281 */ sub.s $f10, $f4, $f8 -/* 009A0 80884130 46029182 */ mul.s $f6, $f18, $f2 -/* 009A4 80884134 C7A80050 */ lwc1 $f8, 0x0050($sp) -/* 009A8 80884138 E7AC005C */ swc1 $f12, 0x005C($sp) -/* 009AC 8088413C E7AA0048 */ swc1 $f10, 0x0048($sp) -/* 009B0 80884140 46026282 */ mul.s $f10, $f12, $f2 -/* 009B4 80884144 46068101 */ sub.s $f4, $f16, $f6 -/* 009B8 80884148 460A4481 */ sub.s $f18, $f8, $f10 -/* 009BC 8088414C E7A4004C */ swc1 $f4, 0x004C($sp) -/* 009C0 80884150 E7B20050 */ swc1 $f18, 0x0050($sp) -.L80884154: -/* 009C4 80884154 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80884158: -/* 009C8 80884158 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 009CC 8088415C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 009D0 80884160 00000000 */ nop -/* 009D4 80884164 4600040D */ trunc.w.s $f16, $f0 -/* 009D8 80884168 87A80040 */ lh $t0, 0x0040($sp) -/* 009DC 8088416C 87A90042 */ lh $t1, 0x0042($sp) -/* 009E0 80884170 27B9008C */ addiu $t9, $sp, 0x008C ## $t9 = FFFFFFFC -/* 009E4 80884174 440B8000 */ mfc1 $t3, $f16 -/* 009E8 80884178 27B80088 */ addiu $t8, $sp, 0x0088 ## $t8 = FFFFFFF8 -/* 009EC 8088417C AFB80014 */ sw $t8, 0x0014($sp) -/* 009F0 80884180 256C0014 */ addiu $t4, $t3, 0x0014 ## $t4 = 00000014 -/* 009F4 80884184 AFAC0020 */ sw $t4, 0x0020($sp) -/* 009F8 80884188 AFB90010 */ sw $t9, 0x0010($sp) -/* 009FC 8088418C 8FA40090 */ lw $a0, 0x0090($sp) -/* 00A00 80884190 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFB8 -/* 00A04 80884194 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFC4 -/* 00A08 80884198 27A70060 */ addiu $a3, $sp, 0x0060 ## $a3 = FFFFFFD0 -/* 00A0C 8088419C AFA80018 */ sw $t0, 0x0018($sp) -/* 00A10 808841A0 0C00A10F */ jal func_8002843C -/* 00A14 808841A4 AFA9001C */ sw $t1, 0x001C($sp) -/* 00A18 808841A8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A1C 808841AC 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 -/* 00A20 808841B0 03E00008 */ jr $ra -/* 00A24 808841B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808841B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808841B8.s deleted file mode 100644 index 637de1fb86..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808841B8.s +++ /dev/null @@ -1,135 +0,0 @@ -glabel func_808841B8 -/* 00A28 808841B8 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 -/* 00A2C 808841BC 3C0F8088 */ lui $t7, %hi(D_80884E80) ## $t7 = 80880000 -/* 00A30 808841C0 AFB3006C */ sw $s3, 0x006C($sp) -/* 00A34 808841C4 AFB10064 */ sw $s1, 0x0064($sp) -/* 00A38 808841C8 25EF4E80 */ addiu $t7, $t7, %lo(D_80884E80) ## $t7 = 80884E80 -/* 00A3C 808841CC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00A40 808841D0 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 00A44 808841D4 AFBF0074 */ sw $ra, 0x0074($sp) -/* 00A48 808841D8 AFB40070 */ sw $s4, 0x0070($sp) -/* 00A4C 808841DC AFB20068 */ sw $s2, 0x0068($sp) -/* 00A50 808841E0 AFB00060 */ sw $s0, 0x0060($sp) -/* 00A54 808841E4 F7BE0058 */ sdc1 $f30, 0x0058($sp) -/* 00A58 808841E8 F7BC0050 */ sdc1 $f28, 0x0050($sp) -/* 00A5C 808841EC F7BA0048 */ sdc1 $f26, 0x0048($sp) -/* 00A60 808841F0 F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 00A64 808841F4 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 00A68 808841F8 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 00A6C 808841FC 25E80048 */ addiu $t0, $t7, 0x0048 ## $t0 = 80884EC8 -/* 00A70 80884200 27AE00A4 */ addiu $t6, $sp, 0x00A4 ## $t6 = FFFFFFB4 -.L80884204: -/* 00A74 80884204 8DF90000 */ lw $t9, 0x0000($t7) ## 80884E80 -/* 00A78 80884208 25EF000C */ addiu $t7, $t7, 0x000C ## $t7 = 80884E8C -/* 00A7C 8088420C 25CE000C */ addiu $t6, $t6, 0x000C ## $t6 = FFFFFFC0 -/* 00A80 80884210 ADD9FFF4 */ sw $t9, -0x000C($t6) ## FFFFFFB4 -/* 00A84 80884214 8DF8FFF8 */ lw $t8, -0x0008($t7) ## 80884E84 -/* 00A88 80884218 ADD8FFF8 */ sw $t8, -0x0008($t6) ## FFFFFFB8 -/* 00A8C 8088421C 8DF9FFFC */ lw $t9, -0x0004($t7) ## 80884E88 -/* 00A90 80884220 15E8FFF8 */ bne $t7, $t0, .L80884204 -/* 00A94 80884224 ADD9FFFC */ sw $t9, -0x0004($t6) ## FFFFFFBC -/* 00A98 80884228 0C01DE1C */ jal Math_Sins - ## sins? -/* 00A9C 8088422C 86240030 */ lh $a0, 0x0030($s1) ## 00000030 -/* 00AA0 80884230 46000786 */ mov.s $f30, $f0 -/* 00AA4 80884234 0C01DE0D */ jal Math_Coss - ## coss? -/* 00AA8 80884238 86240030 */ lh $a0, 0x0030($s1) ## 00000030 -/* 00AAC 8088423C E7A0008C */ swc1 $f0, 0x008C($sp) -/* 00AB0 80884240 0C01DE1C */ jal Math_Sins - ## sins? -/* 00AB4 80884244 86240032 */ lh $a0, 0x0032($s1) ## 00000032 -/* 00AB8 80884248 E7A00088 */ swc1 $f0, 0x0088($sp) -/* 00ABC 8088424C 0C01DE0D */ jal Math_Coss - ## coss? -/* 00AC0 80884250 86240032 */ lh $a0, 0x0032($s1) ## 00000032 -/* 00AC4 80884254 C7A40088 */ lwc1 $f4, 0x0088($sp) -/* 00AC8 80884258 4480D000 */ mtc1 $zero, $f26 ## $f26 = 0.00 -/* 00ACC 8088425C 46000706 */ mov.s $f28, $f0 -/* 00AD0 80884260 46002187 */ neg.s $f6, $f4 -/* 00AD4 80884264 27B000A4 */ addiu $s0, $sp, 0x00A4 ## $s0 = FFFFFFB4 -/* 00AD8 80884268 E7A6007C */ swc1 $f6, 0x007C($sp) -/* 00ADC 8088426C 26721C24 */ addiu $s2, $s3, 0x1C24 ## $s2 = 00001C24 -/* 00AE0 80884270 27B400EC */ addiu $s4, $sp, 0x00EC ## $s4 = FFFFFFFC -/* 00AE4 80884274 C7AE008C */ lwc1 $f14, 0x008C($sp) -.L80884278: -/* 00AE8 80884278 C6000008 */ lwc1 $f0, 0x0008($s0) ## FFFFFFBC -/* 00AEC 8088427C C6020004 */ lwc1 $f2, 0x0004($s0) ## FFFFFFB8 -/* 00AF0 80884280 C60C0000 */ lwc1 $f12, 0x0000($s0) ## FFFFFFB4 -/* 00AF4 80884284 460E0202 */ mul.s $f8, $f0, $f14 -/* 00AF8 80884288 C7A60088 */ lwc1 $f6, 0x0088($sp) -/* 00AFC 8088428C C6320024 */ lwc1 $f18, 0x0024($s1) ## 00000024 -/* 00B00 80884290 461E1282 */ mul.s $f10, $f2, $f30 -/* 00B04 80884294 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 00B08 80884298 02402025 */ or $a0, $s2, $zero ## $a0 = 00001C24 -/* 00B0C 8088429C 461C6402 */ mul.s $f16, $f12, $f28 -/* 00B10 808842A0 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 00B14 808842A4 24060092 */ addiu $a2, $zero, 0x0092 ## $a2 = 00000092 -/* 00B18 808842A8 460A4500 */ add.s $f20, $f8, $f10 -/* 00B1C 808842AC C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 -/* 00B20 808842B0 46128100 */ add.s $f4, $f16, $f18 -/* 00B24 808842B4 46143202 */ mul.s $f8, $f6, $f20 -/* 00B28 808842B8 46000187 */ neg.s $f6, $f0 -/* 00B2C 808842BC 460E1402 */ mul.s $f16, $f2, $f14 -/* 00B30 808842C0 46082580 */ add.s $f22, $f4, $f8 -/* 00B34 808842C4 461E3102 */ mul.s $f4, $f6, $f30 -/* 00B38 808842C8 C7A8007C */ lwc1 $f8, 0x007C($sp) -/* 00B3C 808842CC 46105480 */ add.s $f18, $f10, $f16 -/* 00B40 808842D0 C630002C */ lwc1 $f16, 0x002C($s1) ## 0000002C -/* 00B44 808842D4 46086282 */ mul.s $f10, $f12, $f8 -/* 00B48 808842D8 4407B000 */ mfc1 $a3, $f22 -/* 00B4C 808842DC 46122600 */ add.s $f24, $f4, $f18 -/* 00B50 808842E0 4614E102 */ mul.s $f4, $f28, $f20 -/* 00B54 808842E4 46105180 */ add.s $f6, $f10, $f16 -/* 00B58 808842E8 E7B80010 */ swc1 $f24, 0x0010($sp) -/* 00B5C 808842EC 46043500 */ add.s $f20, $f6, $f4 -/* 00B60 808842F0 E7B40014 */ swc1 $f20, 0x0014($sp) -/* 00B64 808842F4 862900B4 */ lh $t1, 0x00B4($s1) ## 000000B4 -/* 00B68 808842F8 AFA90018 */ sw $t1, 0x0018($sp) -/* 00B6C 808842FC 862A00B6 */ lh $t2, 0x00B6($s1) ## 000000B6 -/* 00B70 80884300 AFAB0024 */ sw $t3, 0x0024($sp) -/* 00B74 80884304 AFA00020 */ sw $zero, 0x0020($sp) -/* 00B78 80884308 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00B7C 8088430C AFAA001C */ sw $t2, 0x001C($sp) -/* 00B80 80884310 E7B80010 */ swc1 $f24, 0x0010($sp) -/* 00B84 80884314 E7B40014 */ swc1 $f20, 0x0014($sp) -/* 00B88 80884318 862C00B4 */ lh $t4, 0x00B4($s1) ## 000000B4 -/* 00B8C 8088431C 4407B000 */ mfc1 $a3, $f22 -/* 00B90 80884320 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 00B94 80884324 AFAC0018 */ sw $t4, 0x0018($sp) -/* 00B98 80884328 862D00B6 */ lh $t5, 0x00B6($s1) ## 000000B6 -/* 00B9C 8088432C AFA80024 */ sw $t0, 0x0024($sp) -/* 00BA0 80884330 AFA00020 */ sw $zero, 0x0020($sp) -/* 00BA4 80884334 02402025 */ or $a0, $s2, $zero ## $a0 = 00001C24 -/* 00BA8 80884338 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 00BAC 8088433C 24060092 */ addiu $a2, $zero, 0x0092 ## $a2 = 00000092 -/* 00BB0 80884340 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00BB4 80884344 AFAD001C */ sw $t5, 0x001C($sp) -/* 00BB8 80884348 4405B000 */ mfc1 $a1, $f22 -/* 00BBC 8088434C 4406C000 */ mfc1 $a2, $f24 -/* 00BC0 80884350 4407A000 */ mfc1 $a3, $f20 -/* 00BC4 80884354 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00BC8 80884358 E7BA0010 */ swc1 $f26, 0x0010($sp) -/* 00BCC 8088435C E7BA0014 */ swc1 $f26, 0x0014($sp) -/* 00BD0 80884360 E7BA0018 */ swc1 $f26, 0x0018($sp) -/* 00BD4 80884364 0C220F95 */ jal func_80883E54 -/* 00BD8 80884368 AFA0001C */ sw $zero, 0x001C($sp) -/* 00BDC 8088436C 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = FFFFFFC0 -/* 00BE0 80884370 5614FFC1 */ bnel $s0, $s4, .L80884278 -/* 00BE4 80884374 C7AE008C */ lwc1 $f14, 0x008C($sp) -/* 00BE8 80884378 8FBF0074 */ lw $ra, 0x0074($sp) -/* 00BEC 8088437C D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 00BF0 80884380 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 00BF4 80884384 D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 00BF8 80884388 D7BA0048 */ ldc1 $f26, 0x0048($sp) -/* 00BFC 8088438C D7BC0050 */ ldc1 $f28, 0x0050($sp) -/* 00C00 80884390 D7BE0058 */ ldc1 $f30, 0x0058($sp) -/* 00C04 80884394 8FB00060 */ lw $s0, 0x0060($sp) -/* 00C08 80884398 8FB10064 */ lw $s1, 0x0064($sp) -/* 00C0C 8088439C 8FB20068 */ lw $s2, 0x0068($sp) -/* 00C10 808843A0 8FB3006C */ lw $s3, 0x006C($sp) -/* 00C14 808843A4 8FB40070 */ lw $s4, 0x0070($sp) -/* 00C18 808843A8 03E00008 */ jr $ra -/* 00C1C 808843AC 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s deleted file mode 100644 index 2b09584ab9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_808843B0 -/* 00C20 808843B0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00C24 808843B4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00C28 808843B8 AFB10020 */ sw $s1, 0x0020($sp) -/* 00C2C 808843BC AFB0001C */ sw $s0, 0x001C($sp) -/* 00C30 808843C0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00C34 808843C4 0C00BD04 */ jal func_8002F410 -/* 00C38 808843C8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00C3C 808843CC 5040003C */ beql $v0, $zero, .L808844C0 -/* 00C40 808843D0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00C44 808843D4 8622001C */ lh $v0, 0x001C($s1) ## 0000001C -/* 00C48 808843D8 A6200170 */ sh $zero, 0x0170($s1) ## 00000170 -/* 00C4C 808843DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C50 808843E0 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 00C54 808843E4 10400010 */ beq $v0, $zero, .L80884428 -/* 00C58 808843E8 24050FB5 */ addiu $a1, $zero, 0x0FB5 ## $a1 = 00000FB5 -/* 00C5C 808843EC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00C60 808843F0 10410006 */ beq $v0, $at, .L8088440C -/* 00C64 808843F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C68 808843F8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00C6C 808843FC 10410010 */ beq $v0, $at, .L80884440 -/* 00C70 80884400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C74 80884404 10000014 */ beq $zero, $zero, .L80884458 -/* 00C78 80884408 860E07A0 */ lh $t6, 0x07A0($s0) ## 000007A0 -.L8088440C: -/* 00C7C 8088440C 24050FB4 */ addiu $a1, $zero, 0x0FB4 ## $a1 = 00000FB4 -/* 00C80 80884410 2406010E */ addiu $a2, $zero, 0x010E ## $a2 = 0000010E -/* 00C84 80884414 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 -/* 00C88 80884418 0C02003E */ jal func_800800F8 -/* 00C8C 8088441C AFA00010 */ sw $zero, 0x0010($sp) -/* 00C90 80884420 1000000D */ beq $zero, $zero, .L80884458 -/* 00C94 80884424 860E07A0 */ lh $t6, 0x07A0($s0) ## 000007A0 -.L80884428: -/* 00C98 80884428 240600DC */ addiu $a2, $zero, 0x00DC ## $a2 = 000000DC -/* 00C9C 8088442C 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 -/* 00CA0 80884430 0C02003E */ jal func_800800F8 -/* 00CA4 80884434 AFA00010 */ sw $zero, 0x0010($sp) -/* 00CA8 80884438 10000007 */ beq $zero, $zero, .L80884458 -/* 00CAC 8088443C 860E07A0 */ lh $t6, 0x07A0($s0) ## 000007A0 -.L80884440: -/* 00CB0 80884440 24050FB6 */ addiu $a1, $zero, 0x0FB6 ## $a1 = 00000FB6 -/* 00CB4 80884444 240600D2 */ addiu $a2, $zero, 0x00D2 ## $a2 = 000000D2 -/* 00CB8 80884448 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 -/* 00CBC 8088444C 0C02003E */ jal func_800800F8 -/* 00CC0 80884450 AFA00010 */ sw $zero, 0x0010($sp) -/* 00CC4 80884454 860E07A0 */ lh $t6, 0x07A0($s0) ## 000007A0 -.L80884458: -/* 00CC8 80884458 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00CCC 8088445C 000E7880 */ sll $t7, $t6, 2 -/* 00CD0 80884460 020FC021 */ addu $t8, $s0, $t7 -/* 00CD4 80884464 0C024BE2 */ jal Quake_Add -/* 00CD8 80884468 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 -/* 00CDC 8088446C 00022400 */ sll $a0, $v0, 16 -/* 00CE0 80884470 AFA2002C */ sw $v0, 0x002C($sp) -/* 00CE4 80884474 00042403 */ sra $a0, $a0, 16 -/* 00CE8 80884478 0C024B6B */ jal Quake_SetSpeed -/* 00CEC 8088447C 240561A8 */ addiu $a1, $zero, 0x61A8 ## $a1 = 000061A8 -/* 00CF0 80884480 87B0002E */ lh $s0, 0x002E($sp) -/* 00CF4 80884484 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00CF8 80884488 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00CFC 8088448C 00102400 */ sll $a0, $s0, 16 -/* 00D00 80884490 00042403 */ sra $a0, $a0, 16 -/* 00D04 80884494 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 00D08 80884498 0C024B9C */ jal Quake_SetQuakeValues -/* 00D0C 8088449C AFA00010 */ sw $zero, 0x0010($sp) -/* 00D10 808844A0 00102400 */ sll $a0, $s0, 16 -/* 00D14 808844A4 00042403 */ sra $a0, $a0, 16 -/* 00D18 808844A8 0C024B7C */ jal Quake_SetCountdown -/* 00D1C 808844AC 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 00D20 808844B0 3C198088 */ lui $t9, %hi(func_808844D0) ## $t9 = 80880000 -/* 00D24 808844B4 273944D0 */ addiu $t9, $t9, %lo(func_808844D0) ## $t9 = 808844D0 -/* 00D28 808844B8 AE390174 */ sw $t9, 0x0174($s1) ## 00000174 -/* 00D2C 808844BC 8FBF0024 */ lw $ra, 0x0024($sp) -.L808844C0: -/* 00D30 808844C0 8FB0001C */ lw $s0, 0x001C($sp) -/* 00D34 808844C4 8FB10020 */ lw $s1, 0x0020($sp) -/* 00D38 808844C8 03E00008 */ jr $ra -/* 00D3C 808844CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808844D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808844D0.s deleted file mode 100644 index 769a709c40..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808844D0.s +++ /dev/null @@ -1,123 +0,0 @@ -.rdata -glabel D_80884F08 - .asciz "../z_bg_heavy_block.c" - .balign 4 - -glabel D_80884F20 - .asciz "\"NA_SE_PL_PULL_UP_BIGROCK\" = %s\n" - .balign 4 - -glabel D_80884F44 - .asciz "NA_SE_PL_PULL_UP_BIGROCK" - .balign 4 - -.text -glabel func_808844D0 -/* 00D40 808844D0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00D44 808844D4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00D48 808844D8 AFB00028 */ sw $s0, 0x0028($sp) -/* 00D4C 808844DC AFA5004C */ sw $a1, 0x004C($sp) -/* 00D50 808844E0 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00D54 808844E4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00D58 808844E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D5C 808844EC AFAF0044 */ sw $t7, 0x0044($sp) -/* 00D60 808844F0 84820170 */ lh $v0, 0x0170($a0) ## 00000170 -/* 00D64 808844F4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 00D68 808844F8 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00D6C 808844FC 54410012 */ bnel $v0, $at, .L80884548 -/* 00D70 80884500 28410028 */ slti $at, $v0, 0x0028 -/* 00D74 80884504 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00D78 80884508 0C02A800 */ jal func_800AA000 -/* 00D7C 8088450C 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 00D80 80884510 8FA40044 */ lw $a0, 0x0044($sp) -/* 00D84 80884514 0C00BDF7 */ jal func_8002F7DC -/* 00D88 80884518 2405086C */ addiu $a1, $zero, 0x086C ## $a1 = 0000086C -/* 00D8C 8088451C 3C048088 */ lui $a0, %hi(D_80884F08) ## $a0 = 80880000 -/* 00D90 80884520 24844F08 */ addiu $a0, $a0, %lo(D_80884F08) ## $a0 = 80884F08 -/* 00D94 80884524 0C000B84 */ jal LogUtils_LogThreadId - -/* 00D98 80884528 240502B3 */ addiu $a1, $zero, 0x02B3 ## $a1 = 000002B3 -/* 00D9C 8088452C 3C048088 */ lui $a0, %hi(D_80884F20) ## $a0 = 80880000 -/* 00DA0 80884530 3C058088 */ lui $a1, %hi(D_80884F44) ## $a1 = 80880000 -/* 00DA4 80884534 24A54F44 */ addiu $a1, $a1, %lo(D_80884F44) ## $a1 = 80884F44 -/* 00DA8 80884538 0C00084C */ jal osSyncPrintf - -/* 00DAC 8088453C 24844F20 */ addiu $a0, $a0, %lo(D_80884F20) ## $a0 = 80884F20 -/* 00DB0 80884540 86020170 */ lh $v0, 0x0170($s0) ## 00000170 -/* 00DB4 80884544 28410028 */ slti $at, $v0, 0x0028 -.L80884548: -/* 00DB8 80884548 1020002E */ beq $at, $zero, .L80884604 -/* 00DBC 8088454C 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 00DC0 80884550 44816000 */ mtc1 $at, $f12 ## $f12 = 110.00 -/* 00DC4 80884554 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00DC8 80884558 00000000 */ nop -/* 00DCC 8088455C E7A00030 */ swc1 $f0, 0x0030($sp) -/* 00DD0 80884560 0C01DE1C */ jal Math_Sins - ## sins? -/* 00DD4 80884564 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00DD8 80884568 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 00DDC 8088456C 44816000 */ mtc1 $at, $f12 ## $f12 = 110.00 -/* 00DE0 80884570 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00DE4 80884574 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 00DE8 80884578 E7A00038 */ swc1 $f0, 0x0038($sp) -/* 00DEC 8088457C 0C01DE0D */ jal Math_Coss - ## coss? -/* 00DF0 80884580 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00DF4 80884584 3C01C28C */ lui $at, 0xC28C ## $at = C28C0000 -/* 00DF8 80884588 44811000 */ mtc1 $at, $f2 ## $f2 = -70.00 -/* 00DFC 8088458C C7AA0034 */ lwc1 $f10, 0x0034($sp) -/* 00E00 80884590 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00E04 80884594 C7A60030 */ lwc1 $f6, 0x0030($sp) -/* 00E08 80884598 46025402 */ mul.s $f16, $f10, $f2 -/* 00E0C 8088459C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00E10 808845A0 46062200 */ add.s $f8, $f4, $f6 -/* 00E14 808845A4 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 00E18 808845A8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00E1C 808845AC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00E20 808845B0 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C -/* 00E24 808845B4 46088480 */ add.s $f18, $f16, $f8 -/* 00E28 808845B8 C7A80038 */ lwc1 $f8, 0x0038($sp) -/* 00E2C 808845BC C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00E30 808845C0 46062280 */ add.s $f10, $f4, $f6 -/* 00E34 808845C4 46020102 */ mul.s $f4, $f0, $f2 -/* 00E38 808845C8 44059000 */ mfc1 $a1, $f18 -/* 00E3C 808845CC 46088480 */ add.s $f18, $f16, $f8 -/* 00E40 808845D0 44065000 */ mfc1 $a2, $f10 -/* 00E44 808845D4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00E48 808845D8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00E4C 808845DC 44818000 */ mtc1 $at, $f16 ## $f16 = -1.00 -/* 00E50 808845E0 46122180 */ add.s $f6, $f4, $f18 -/* 00E54 808845E4 AFB8001C */ sw $t8, 0x001C($sp) -/* 00E58 808845E8 8FA4004C */ lw $a0, 0x004C($sp) -/* 00E5C 808845EC E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00E60 808845F0 44073000 */ mfc1 $a3, $f6 -/* 00E64 808845F4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00E68 808845F8 0C220F95 */ jal func_80883E54 -/* 00E6C 808845FC E7B00014 */ swc1 $f16, 0x0014($sp) -/* 00E70 80884600 86020170 */ lh $v0, 0x0170($s0) ## 00000170 -.L80884604: -/* 00E74 80884604 24590001 */ addiu $t9, $v0, 0x0001 ## $t9 = 00000001 -/* 00E78 80884608 A6190170 */ sh $t9, 0x0170($s0) ## 00000170 -/* 00E7C 8088460C 8FA50044 */ lw $a1, 0x0044($sp) -/* 00E80 80884610 8FA4004C */ lw $a0, 0x004C($sp) -/* 00E84 80884614 0C00B7D5 */ jal func_8002DF54 -/* 00E88 80884618 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00E8C 8088461C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E90 80884620 0C00BD68 */ jal func_8002F5A0 -/* 00E94 80884624 8FA5004C */ lw $a1, 0x004C($sp) -/* 00E98 80884628 10400006 */ beq $v0, $zero, .L80884644 -/* 00E9C 8088462C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EA0 80884630 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00EA4 80884634 240528E2 */ addiu $a1, $zero, 0x28E2 ## $a1 = 000028E2 -/* 00EA8 80884638 3C088088 */ lui $t0, %hi(func_80884658) ## $t0 = 80880000 -/* 00EAC 8088463C 25084658 */ addiu $t0, $t0, %lo(func_80884658) ## $t0 = 80884658 -/* 00EB0 80884640 AE080174 */ sw $t0, 0x0174($s0) ## 00000174 -.L80884644: -/* 00EB4 80884644 8FBF002C */ lw $ra, 0x002C($sp) -/* 00EB8 80884648 8FB00028 */ lw $s0, 0x0028($sp) -/* 00EBC 8088464C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00EC0 80884650 03E00008 */ jr $ra -/* 00EC4 80884654 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s deleted file mode 100644 index 778e1f2d89..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s +++ /dev/null @@ -1,213 +0,0 @@ -glabel func_80884658 -/* 00EC8 80884658 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00ECC 8088465C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00ED0 80884660 AFB10020 */ sw $s1, 0x0020($sp) -/* 00ED4 80884664 AFB0001C */ sw $s0, 0x001C($sp) -/* 00ED8 80884668 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EDC 8088466C 0C00B638 */ jal Actor_MoveForward - -/* 00EE0 80884670 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00EE4 80884674 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 00EE8 80884678 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 00EEC 8088467C 44814000 */ mtc1 $at, $f8 ## $f8 = 1000.00 -/* 00EF0 80884680 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 00EF4 80884684 C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C -/* 00EF8 80884688 27AE0034 */ addiu $t6, $sp, 0x0034 ## $t6 = FFFFFFEC -/* 00EFC 8088468C 262407C0 */ addiu $a0, $s1, 0x07C0 ## $a0 = 000007C0 -/* 00F00 80884690 46083280 */ add.s $f10, $f6, $f8 -/* 00F04 80884694 26050078 */ addiu $a1, $s0, 0x0078 ## $a1 = 00000078 -/* 00F08 80884698 27A60044 */ addiu $a2, $sp, 0x0044 ## $a2 = FFFFFFFC -/* 00F0C 8088469C 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00F10 808846A0 E7AA0038 */ swc1 $f10, 0x0038($sp) -/* 00F14 808846A4 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 00F18 808846A8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00F1C 808846AC 0C00F269 */ jal func_8003C9A4 -/* 00F20 808846B0 E7B0003C */ swc1 $f16, 0x003C($sp) -/* 00F24 808846B4 C612000C */ lwc1 $f18, 0x000C($s0) ## 0000000C -/* 00F28 808846B8 E6000080 */ swc1 $f0, 0x0080($s0) ## 00000080 -/* 00F2C 808846BC 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 00F30 808846C0 4600903E */ c.le.s $f18, $f0 -/* 00F34 808846C4 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C -/* 00F38 808846C8 450200A0 */ bc1fl .L8088494C -/* 00F3C 808846CC C60C0060 */ lwc1 $f12, 0x0060($s0) ## 00000060 -/* 00F40 808846D0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00F44 808846D4 0C02A800 */ jal func_800AA000 -/* 00F48 808846D8 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 00F4C 808846DC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00F50 808846E0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00F54 808846E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F58 808846E8 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 00F5C 808846EC 10400063 */ beq $v0, $zero, .L8088487C -/* 00F60 808846F0 00000000 */ nop -/* 00F64 808846F4 10410006 */ beq $v0, $at, .L80884710 -/* 00F68 808846F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F6C 808846FC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00F70 80884700 1041003D */ beq $v0, $at, .L808847F8 -/* 00F74 80884704 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F78 80884708 10000078 */ beq $zero, $zero, .L808848EC -/* 00F7C 8088470C 862907A0 */ lh $t1, 0x07A0($s1) ## 000007A0 -.L80884710: -/* 00F80 80884710 0C22106E */ jal func_808841B8 -/* 00F84 80884714 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00F88 80884718 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00F8C 8088471C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F90 80884720 00052A03 */ sra $a1, $a1, 8 -/* 00F94 80884724 0C00B2DD */ jal Flags_SetSwitch - -/* 00F98 80884728 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 00F9C 8088472C 0C00B55C */ jal Actor_Kill - -/* 00FA0 80884730 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FA4 80884734 862F07A0 */ lh $t7, 0x07A0($s1) ## 000007A0 -/* 00FA8 80884738 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00FAC 8088473C 000FC080 */ sll $t8, $t7, 2 -/* 00FB0 80884740 0238C821 */ addu $t9, $s1, $t8 -/* 00FB4 80884744 0C024BE2 */ jal Quake_Add -/* 00FB8 80884748 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 -/* 00FBC 8088474C 00022400 */ sll $a0, $v0, 16 -/* 00FC0 80884750 AFA20040 */ sw $v0, 0x0040($sp) -/* 00FC4 80884754 00042403 */ sra $a0, $a0, 16 -/* 00FC8 80884758 0C024B6B */ jal Quake_SetSpeed -/* 00FCC 8088475C 24056D60 */ addiu $a1, $zero, 0x6D60 ## $a1 = 00006D60 -/* 00FD0 80884760 87A40042 */ lh $a0, 0x0042($sp) -/* 00FD4 80884764 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E -/* 00FD8 80884768 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00FDC 8088476C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 00FE0 80884770 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FE4 80884774 0C024B9C */ jal Quake_SetQuakeValues -/* 00FE8 80884778 AFA40028 */ sw $a0, 0x0028($sp) -/* 00FEC 8088477C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00FF0 80884780 0C024B7C */ jal Quake_SetCountdown -/* 00FF4 80884784 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00FF8 80884788 862807A0 */ lh $t0, 0x07A0($s1) ## 000007A0 -/* 00FFC 8088478C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01000 80884790 00084880 */ sll $t1, $t0, 2 -/* 01004 80884794 02295021 */ addu $t2, $s1, $t1 -/* 01008 80884798 0C024BE2 */ jal Quake_Add -/* 0100C 8088479C 8D440790 */ lw $a0, 0x0790($t2) ## 00000790 -/* 01010 808847A0 00022400 */ sll $a0, $v0, 16 -/* 01014 808847A4 AFA20040 */ sw $v0, 0x0040($sp) -/* 01018 808847A8 00042403 */ sra $a0, $a0, 16 -/* 0101C 808847AC 0C024B6B */ jal Quake_SetSpeed -/* 01020 808847B0 24052EE0 */ addiu $a1, $zero, 0x2EE0 ## $a1 = 00002EE0 -/* 01024 808847B4 87A40042 */ lh $a0, 0x0042($sp) -/* 01028 808847B8 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 0102C 808847BC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01030 808847C0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01034 808847C4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01038 808847C8 0C024B9C */ jal Quake_SetQuakeValues -/* 0103C 808847CC AFA40028 */ sw $a0, 0x0028($sp) -/* 01040 808847D0 8FA40028 */ lw $a0, 0x0028($sp) -/* 01044 808847D4 0C024B7C */ jal Quake_SetCountdown -/* 01048 808847D8 240503E7 */ addiu $a1, $zero, 0x03E7 ## $a1 = 000003E7 -/* 0104C 808847DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01050 808847E0 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 01054 808847E4 2406001E */ addiu $a2, $zero, 0x001E ## $a2 = 0000001E -/* 01058 808847E8 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 0105C 808847EC 240728E1 */ addiu $a3, $zero, 0x28E1 ## $a3 = 000028E1 -/* 01060 808847F0 1000005A */ beq $zero, $zero, .L8088495C -/* 01064 808847F4 8FBF0024 */ lw $ra, 0x0024($sp) -.L808847F8: -/* 01068 808847F8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0106C 808847FC 2405281D */ addiu $a1, $zero, 0x281D ## $a1 = 0000281D -/* 01070 80884800 862B07A0 */ lh $t3, 0x07A0($s1) ## 000007A0 -/* 01074 80884804 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01078 80884808 000B6080 */ sll $t4, $t3, 2 -/* 0107C 8088480C 022C6821 */ addu $t5, $s1, $t4 -/* 01080 80884810 0C024BE2 */ jal Quake_Add -/* 01084 80884814 8DA40790 */ lw $a0, 0x0790($t5) ## 00000790 -/* 01088 80884818 00022400 */ sll $a0, $v0, 16 -/* 0108C 8088481C AFA20040 */ sw $v0, 0x0040($sp) -/* 01090 80884820 00042403 */ sra $a0, $a0, 16 -/* 01094 80884824 0C024B6B */ jal Quake_SetSpeed -/* 01098 80884828 24056D60 */ addiu $a1, $zero, 0x6D60 ## $a1 = 00006D60 -/* 0109C 8088482C 87A40042 */ lh $a0, 0x0042($sp) -/* 010A0 80884830 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 010A4 80884834 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 010A8 80884838 24070078 */ addiu $a3, $zero, 0x0078 ## $a3 = 00000078 -/* 010AC 8088483C AFA00010 */ sw $zero, 0x0010($sp) -/* 010B0 80884840 0C024B9C */ jal Quake_SetQuakeValues -/* 010B4 80884844 AFA40028 */ sw $a0, 0x0028($sp) -/* 010B8 80884848 8FA40028 */ lw $a0, 0x0028($sp) -/* 010BC 8088484C 0C024B7C */ jal Quake_SetCountdown -/* 010C0 80884850 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -/* 010C4 80884854 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 010C8 80884858 3C0E8088 */ lui $t6, %hi(func_80884978) ## $t6 = 80880000 -/* 010CC 8088485C 25CE4978 */ addiu $t6, $t6, %lo(func_80884978) ## $t6 = 80884978 -/* 010D0 80884860 00052A03 */ sra $a1, $a1, 8 -/* 010D4 80884864 AE0E0174 */ sw $t6, 0x0174($s0) ## 00000174 -/* 010D8 80884868 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 010DC 8088486C 0C00B2DD */ jal Flags_SetSwitch - -/* 010E0 80884870 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 010E4 80884874 10000035 */ beq $zero, $zero, .L8088494C -/* 010E8 80884878 C60C0060 */ lwc1 $f12, 0x0060($s0) ## 00000060 -.L8088487C: -/* 010EC 8088487C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 010F0 80884880 2405289F */ addiu $a1, $zero, 0x289F ## $a1 = 0000289F -/* 010F4 80884884 862F07A0 */ lh $t7, 0x07A0($s1) ## 000007A0 -/* 010F8 80884888 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 010FC 8088488C 000FC080 */ sll $t8, $t7, 2 -/* 01100 80884890 0238C821 */ addu $t9, $s1, $t8 -/* 01104 80884894 0C024BE2 */ jal Quake_Add -/* 01108 80884898 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 -/* 0110C 8088489C 00022400 */ sll $a0, $v0, 16 -/* 01110 808848A0 AFA20040 */ sw $v0, 0x0040($sp) -/* 01114 808848A4 00042403 */ sra $a0, $a0, 16 -/* 01118 808848A8 0C024B6B */ jal Quake_SetSpeed -/* 0111C 808848AC 24056D60 */ addiu $a1, $zero, 0x6D60 ## $a1 = 00006D60 -/* 01120 808848B0 87A40042 */ lh $a0, 0x0042($sp) -/* 01124 808848B4 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E -/* 01128 808848B8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0112C 808848BC 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 01130 808848C0 AFA00010 */ sw $zero, 0x0010($sp) -/* 01134 808848C4 0C024B9C */ jal Quake_SetQuakeValues -/* 01138 808848C8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0113C 808848CC 8FA40028 */ lw $a0, 0x0028($sp) -/* 01140 808848D0 0C024B7C */ jal Quake_SetCountdown -/* 01144 808848D4 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -/* 01148 808848D8 3C088088 */ lui $t0, %hi(func_80884978) ## $t0 = 80880000 -/* 0114C 808848DC 25084978 */ addiu $t0, $t0, %lo(func_80884978) ## $t0 = 80884978 -/* 01150 808848E0 10000019 */ beq $zero, $zero, .L80884948 -/* 01154 808848E4 AE080174 */ sw $t0, 0x0174($s0) ## 00000174 -/* 01158 808848E8 862907A0 */ lh $t1, 0x07A0($s1) ## 000007A0 -.L808848EC: -/* 0115C 808848EC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01160 808848F0 00095080 */ sll $t2, $t1, 2 -/* 01164 808848F4 022A5821 */ addu $t3, $s1, $t2 -/* 01168 808848F8 0C024BE2 */ jal Quake_Add -/* 0116C 808848FC 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 01170 80884900 00022400 */ sll $a0, $v0, 16 -/* 01174 80884904 AFA20040 */ sw $v0, 0x0040($sp) -/* 01178 80884908 00042403 */ sra $a0, $a0, 16 -/* 0117C 8088490C 0C024B6B */ jal Quake_SetSpeed -/* 01180 80884910 24056D60 */ addiu $a1, $zero, 0x6D60 ## $a1 = 00006D60 -/* 01184 80884914 87A40042 */ lh $a0, 0x0042($sp) -/* 01188 80884918 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E -/* 0118C 8088491C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01190 80884920 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 01194 80884924 AFA00010 */ sw $zero, 0x0010($sp) -/* 01198 80884928 0C024B9C */ jal Quake_SetQuakeValues -/* 0119C 8088492C AFA40028 */ sw $a0, 0x0028($sp) -/* 011A0 80884930 8FA40028 */ lw $a0, 0x0028($sp) -/* 011A4 80884934 0C024B7C */ jal Quake_SetCountdown -/* 011A8 80884938 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -/* 011AC 8088493C 3C0C8088 */ lui $t4, %hi(func_80884978) ## $t4 = 80880000 -/* 011B0 80884940 258C4978 */ addiu $t4, $t4, %lo(func_80884978) ## $t4 = 80884978 -/* 011B4 80884944 AE0C0174 */ sw $t4, 0x0174($s0) ## 00000174 -.L80884948: -/* 011B8 80884948 C60C0060 */ lwc1 $f12, 0x0060($s0) ## 00000060 -.L8088494C: -/* 011BC 8088494C 0C034199 */ jal atan2s - -/* 011C0 80884950 C60E0068 */ lwc1 $f14, 0x0068($s0) ## 00000068 -/* 011C4 80884954 A60200B4 */ sh $v0, 0x00B4($s0) ## 000000B4 -/* 011C8 80884958 8FBF0024 */ lw $ra, 0x0024($sp) -.L8088495C: -/* 011CC 8088495C 8FB0001C */ lw $s0, 0x001C($sp) -/* 011D0 80884960 8FB10020 */ lw $s1, 0x0020($sp) -/* 011D4 80884964 03E00008 */ jr $ra -/* 011D8 80884968 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_8088496C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_8088496C.s deleted file mode 100644 index 6c29fdf22d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_8088496C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8088496C -/* 011DC 8088496C AFA40000 */ sw $a0, 0x0000($sp) -/* 011E0 80884970 03E00008 */ jr $ra -/* 011E4 80884974 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884978.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884978.s deleted file mode 100644 index 4fd1b0453b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884978.s +++ /dev/null @@ -1,188 +0,0 @@ -.late_rodata -glabel D_80884FC8 - .word 0x44D1C000 -glabel D_80884FCC - .word 0x44A0C000 -glabel D_80884FD0 - .word 0x44D82000 -glabel D_80884FD4 - .word 0x449EA000 -glabel D_80884FD8 - .word 0xC437C000 -glabel D_80884FDC - .word 0xC555A000 - -.text -glabel func_80884978 -/* 011E8 80884978 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 011EC 8088497C AFB00030 */ sw $s0, 0x0030($sp) -/* 011F0 80884980 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 011F4 80884984 AFBF0034 */ sw $ra, 0x0034($sp) -/* 011F8 80884988 AFA5005C */ sw $a1, 0x005C($sp) -/* 011FC 8088498C 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 01200 80884990 F7B40028 */ sdc1 $f20, 0x0028($sp) -/* 01204 80884994 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01208 80884998 24058AD0 */ addiu $a1, $zero, 0x8AD0 ## $a1 = FFFF8AD0 -/* 0120C 8088499C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 01210 808849A0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 01214 808849A4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01218 808849A8 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 0121C 808849AC 10400083 */ beq $v0, $zero, .L80884BBC -/* 01220 808849B0 2401FFCF */ addiu $at, $zero, 0xFFCF ## $at = FFFFFFCF -/* 01224 808849B4 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 01228 808849B8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 0122C 808849BC 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 01230 808849C0 4405A000 */ mfc1 $a1, $f20 -/* 01234 808849C4 0C01DE80 */ jal Math_ApproxF - -/* 01238 808849C8 00000000 */ nop -/* 0123C 808849CC 4405A000 */ mfc1 $a1, $f20 -/* 01240 808849D0 26040060 */ addiu $a0, $s0, 0x0060 ## $a0 = 00000060 -/* 01244 808849D4 0C01DE80 */ jal Math_ApproxF - -/* 01248 808849D8 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 0124C 808849DC E614006C */ swc1 $f20, 0x006C($s0) ## 0000006C -/* 01250 808849E0 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 01254 808849E4 8CB80000 */ lw $t8, 0x0000($a1) ## 00000008 -/* 01258 808849E8 26030024 */ addiu $v1, $s0, 0x0024 ## $v1 = 00000024 -/* 0125C 808849EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01260 808849F0 AC780000 */ sw $t8, 0x0000($v1) ## 00000024 -/* 01264 808849F4 8CAF0004 */ lw $t7, 0x0004($a1) ## 0000000C -/* 01268 808849F8 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000028 -/* 0126C 808849FC 8CB80008 */ lw $t8, 0x0008($a1) ## 00000010 -/* 01270 80884A00 AC780008 */ sw $t8, 0x0008($v1) ## 0000002C -/* 01274 80884A04 AFA5003C */ sw $a1, 0x003C($sp) -/* 01278 80884A08 0C00B638 */ jal Actor_MoveForward - -/* 0127C 80884A0C AFA30040 */ sw $v1, 0x0040($sp) -/* 01280 80884A10 8FA30040 */ lw $v1, 0x0040($sp) -/* 01284 80884A14 8FA5003C */ lw $a1, 0x003C($sp) -/* 01288 80884A18 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0128C 80884A1C 8C680000 */ lw $t0, 0x0000($v1) ## 00000000 -/* 01290 80884A20 ACA80000 */ sw $t0, 0x0000($a1) ## 00000000 -/* 01294 80884A24 8C790004 */ lw $t9, 0x0004($v1) ## 00000004 -/* 01298 80884A28 ACB90004 */ sw $t9, 0x0004($a1) ## 00000004 -/* 0129C 80884A2C 8C680008 */ lw $t0, 0x0008($v1) ## 00000008 -/* 012A0 80884A30 ACA80008 */ sw $t0, 0x0008($a1) ## 00000008 -/* 012A4 80884A34 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 012A8 80884A38 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 012AC 80884A3C 50400046 */ beql $v0, $zero, .L80884B58 -/* 012B0 80884A40 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 012B4 80884A44 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 012B8 80884A48 14410062 */ bne $v0, $at, .L80884BD4 -/* 012BC 80884A4C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 012C0 80884A50 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 012C4 80884A54 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 012C8 80884A58 00000000 */ nop -/* 012CC 80884A5C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 012D0 80884A60 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 012D4 80884A64 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 012D8 80884A68 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 012DC 80884A6C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 012E0 80884A70 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 012E4 80884A74 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 012E8 80884A78 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 012EC 80884A7C 3C018088 */ lui $at, %hi(D_80884FC8) ## $at = 80880000 -/* 012F0 80884A80 C4264FC8 */ lwc1 $f6, %lo(D_80884FC8)($at) -/* 012F4 80884A84 C7A40044 */ lwc1 $f4, 0x0044($sp) -/* 012F8 80884A88 3C018088 */ lui $at, %hi(D_80884FCC) ## $at = 80880000 -/* 012FC 80884A8C C4304FCC */ lwc1 $f16, %lo(D_80884FCC)($at) -/* 01300 80884A90 46062200 */ add.s $f8, $f4, $f6 -/* 01304 80884A94 3C01440A */ lui $at, 0x440A ## $at = 440A0000 -/* 01308 80884A98 44812000 */ mtc1 $at, $f4 ## $f4 = 552.00 -/* 0130C 80884A9C C7AA0048 */ lwc1 $f10, 0x0048($sp) -/* 01310 80884AA0 44054000 */ mfc1 $a1, $f8 -/* 01314 80884AA4 46040180 */ add.s $f6, $f0, $f4 -/* 01318 80884AA8 8FA4005C */ lw $a0, 0x005C($sp) -/* 0131C 80884AAC E7B40010 */ swc1 $f20, 0x0010($sp) -/* 01320 80884AB0 46105480 */ add.s $f18, $f10, $f16 -/* 01324 80884AB4 44073000 */ mfc1 $a3, $f6 -/* 01328 80884AB8 E7B40014 */ swc1 $f20, 0x0014($sp) -/* 0132C 80884ABC E7B40018 */ swc1 $f20, 0x0018($sp) -/* 01330 80884AC0 44069000 */ mfc1 $a2, $f18 -/* 01334 80884AC4 0C220F95 */ jal func_80883E54 -/* 01338 80884AC8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0133C 80884ACC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01340 80884AD0 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 01344 80884AD4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01348 80884AD8 00000000 */ nop -/* 0134C 80884ADC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 01350 80884AE0 44816000 */ mtc1 $at, $f12 ## $f12 = 80.00 -/* 01354 80884AE4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01358 80884AE8 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 0135C 80884AEC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01360 80884AF0 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 01364 80884AF4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01368 80884AF8 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 0136C 80884AFC 3C018088 */ lui $at, %hi(D_80884FD0) ## $at = 80880000 -/* 01370 80884B00 C42A4FD0 */ lwc1 $f10, %lo(D_80884FD0)($at) -/* 01374 80884B04 C7A80044 */ lwc1 $f8, 0x0044($sp) -/* 01378 80884B08 3C018088 */ lui $at, %hi(D_80884FD4) ## $at = 80880000 -/* 0137C 80884B0C C4244FD4 */ lwc1 $f4, %lo(D_80884FD4)($at) -/* 01380 80884B10 460A4400 */ add.s $f16, $f8, $f10 -/* 01384 80884B14 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 01388 80884B18 44814000 */ mtc1 $at, $f8 ## $f8 = 600.00 -/* 0138C 80884B1C C7B20048 */ lwc1 $f18, 0x0048($sp) -/* 01390 80884B20 44058000 */ mfc1 $a1, $f16 -/* 01394 80884B24 46080280 */ add.s $f10, $f0, $f8 -/* 01398 80884B28 8FA4005C */ lw $a0, 0x005C($sp) -/* 0139C 80884B2C E7B40010 */ swc1 $f20, 0x0010($sp) -/* 013A0 80884B30 46049180 */ add.s $f6, $f18, $f4 -/* 013A4 80884B34 44075000 */ mfc1 $a3, $f10 -/* 013A8 80884B38 E7B40014 */ swc1 $f20, 0x0014($sp) -/* 013AC 80884B3C E7B40018 */ swc1 $f20, 0x0018($sp) -/* 013B0 80884B40 44063000 */ mfc1 $a2, $f6 -/* 013B4 80884B44 0C220F95 */ jal func_80883E54 -/* 013B8 80884B48 AFA0001C */ sw $zero, 0x001C($sp) -/* 013BC 80884B4C 10000022 */ beq $zero, $zero, .L80884BD8 -/* 013C0 80884B50 8FBF0034 */ lw $ra, 0x0034($sp) -/* 013C4 80884B54 44816000 */ mtc1 $at, $f12 ## $f12 = 0.00 -.L80884B58: -/* 013C8 80884B58 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 013CC 80884B5C 00000000 */ nop -/* 013D0 80884B60 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 013D4 80884B64 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 013D8 80884B68 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 013DC 80884B6C E7A00048 */ swc1 $f0, 0x0048($sp) -/* 013E0 80884B70 3C018088 */ lui $at, %hi(D_80884FD8) ## $at = 80880000 -/* 013E4 80884B74 C4324FD8 */ lwc1 $f18, %lo(D_80884FD8)($at) -/* 013E8 80884B78 3C018088 */ lui $at, %hi(D_80884FDC) ## $at = 80880000 -/* 013EC 80884B7C C4264FDC */ lwc1 $f6, %lo(D_80884FDC)($at) -/* 013F0 80884B80 C7B00048 */ lwc1 $f16, 0x0048($sp) -/* 013F4 80884B84 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 013F8 80884B88 46060200 */ add.s $f8, $f0, $f6 -/* 013FC 80884B8C AFA9001C */ sw $t1, 0x001C($sp) -/* 01400 80884B90 8FA4005C */ lw $a0, 0x005C($sp) -/* 01404 80884B94 46128100 */ add.s $f4, $f16, $f18 -/* 01408 80884B98 44074000 */ mfc1 $a3, $f8 -/* 0140C 80884B9C 3C0641E8 */ lui $a2, 0x41E8 ## $a2 = 41E80000 -/* 01410 80884BA0 E7B40010 */ swc1 $f20, 0x0010($sp) -/* 01414 80884BA4 44052000 */ mfc1 $a1, $f4 -/* 01418 80884BA8 E7B40014 */ swc1 $f20, 0x0014($sp) -/* 0141C 80884BAC 0C220F95 */ jal func_80883E54 -/* 01420 80884BB0 E7B40018 */ swc1 $f20, 0x0018($sp) -/* 01424 80884BB4 10000008 */ beq $zero, $zero, .L80884BD8 -/* 01428 80884BB8 8FBF0034 */ lw $ra, 0x0034($sp) -.L80884BBC: -/* 0142C 80884BBC 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -/* 01430 80884BC0 3C0C8088 */ lui $t4, %hi(func_8088496C) ## $t4 = 80880000 -/* 01434 80884BC4 258C496C */ addiu $t4, $t4, %lo(func_8088496C) ## $t4 = 8088496C -/* 01438 80884BC8 01415824 */ and $t3, $t2, $at -/* 0143C 80884BCC AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 01440 80884BD0 AE0C0174 */ sw $t4, 0x0174($s0) ## 00000174 -.L80884BD4: -/* 01444 80884BD4 8FBF0034 */ lw $ra, 0x0034($sp) -.L80884BD8: -/* 01448 80884BD8 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 0144C 80884BDC 8FB00030 */ lw $s0, 0x0030($sp) -/* 01450 80884BE0 03E00008 */ jr $ra -/* 01454 80884BE4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s deleted file mode 100644 index 81c787e452..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80884DB4 -/* 01624 80884DB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01628 80884DB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0162C 80884DBC AFA5001C */ sw $a1, 0x001C($sp) -/* 01630 80884DC0 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 01634 80884DC4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01638 80884DC8 3C06C1A0 */ lui $a2, 0xC1A0 ## $a2 = C1A00000 -/* 0163C 80884DCC 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 01640 80884DD0 10410005 */ beq $v0, $at, .L80884DE8 -/* 01644 80884DD4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01648 80884DD8 1041000F */ beq $v0, $at, .L80884E18 -/* 0164C 80884DDC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01650 80884DE0 10000018 */ beq $zero, $zero, .L80884E44 -/* 01654 80884DE4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80884DE8: -/* 01658 80884DE8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0165C 80884DEC 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 01660 80884DF0 3C01C382 */ lui $at, 0xC382 ## $at = C3820000 -/* 01664 80884DF4 44817000 */ mtc1 $at, $f14 ## $f14 = -260.00 -/* 01668 80884DF8 0C034261 */ jal Matrix_Translate -/* 0166C 80884DFC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01670 80884E00 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01674 80884E04 24A518A0 */ addiu $a1, $a1, 0x18A0 ## $a1 = 060018A0 -/* 01678 80884E08 0C00D498 */ jal Gfx_DrawDListOpa - -/* 0167C 80884E0C 8FA4001C */ lw $a0, 0x001C($sp) -/* 01680 80884E10 1000000C */ beq $zero, $zero, .L80884E44 -/* 01684 80884E14 8FBF0014 */ lw $ra, 0x0014($sp) -.L80884E18: -/* 01688 80884E18 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 0168C 80884E1C 44816000 */ mtc1 $at, $f12 ## $f12 = 45.00 -/* 01690 80884E20 3C01C38C */ lui $at, 0xC38C ## $at = C38C0000 -/* 01694 80884E24 44817000 */ mtc1 $at, $f14 ## $f14 = -280.00 -/* 01698 80884E28 0C034261 */ jal Matrix_Translate -/* 0169C 80884E2C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 016A0 80884E30 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 016A4 80884E34 24A51A30 */ addiu $a1, $a1, 0x1A30 ## $a1 = 06001A30 -/* 016A8 80884E38 0C00D498 */ jal Gfx_DrawDListOpa - -/* 016AC 80884E3C 8FA4001C */ lw $a0, 0x001C($sp) -/* 016B0 80884E40 8FBF0014 */ lw $ra, 0x0014($sp) -.L80884E44: -/* 016B4 80884E44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 016B8 80884E48 03E00008 */ jr $ra -/* 016BC 80884E4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A22D0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A22D0.s deleted file mode 100644 index d86868e7d4..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A22D0.s +++ /dev/null @@ -1,115 +0,0 @@ -glabel func_809A22D0 -/* 00000 809A22D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 809A22D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00008 809A22D8 AFB10018 */ sw $s1, 0x0018($sp) -/* 0000C 809A22DC AFB00014 */ sw $s0, 0x0014($sp) -/* 00010 809A22E0 AFA40020 */ sw $a0, 0x0020($sp) -/* 00014 809A22E4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00018 809A22E8 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 0001C 809A22EC 00E08825 */ or $s1, $a3, $zero ## $s1 = 00000000 -/* 00020 809A22F0 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00024 809A22F4 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 00028 809A22F8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0002C 809A22FC 2604000C */ addiu $a0, $s0, 0x000C ## $a0 = 0000000C -/* 00030 809A2300 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 00034 809A2304 2625000C */ addiu $a1, $s1, 0x000C ## $a1 = 0000000C -/* 00038 809A2308 26040018 */ addiu $a0, $s0, 0x0018 ## $a0 = 00000018 -/* 0003C 809A230C 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 00040 809A2310 26250018 */ addiu $a1, $s1, 0x0018 ## $a1 = 00000018 -/* 00044 809A2314 3C020401 */ lui $v0, 0x0401 ## $v0 = 04010000 -/* 00048 809A2318 24420050 */ addiu $v0, $v0, 0x0050 ## $v0 = 04010050 -/* 0004C 809A231C 00027100 */ sll $t6, $v0, 4 -/* 00050 809A2320 000E7F02 */ srl $t7, $t6, 28 -/* 00054 809A2324 000FC080 */ sll $t8, $t7, 2 -/* 00058 809A2328 3C198016 */ lui $t9, %hi(gSegments) -/* 0005C 809A232C 0338C821 */ addu $t9, $t9, $t8 -/* 00060 809A2330 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00064 809A2334 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 00068 809A2338 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0006C 809A233C 00414024 */ and $t0, $v0, $at -/* 00070 809A2340 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00074 809A2344 03284821 */ addu $t1, $t9, $t0 -/* 00078 809A2348 01215021 */ addu $t2, $t1, $at -/* 0007C 809A234C AE0A0038 */ sw $t2, 0x0038($s0) ## 00000038 -/* 00080 809A2350 862B0030 */ lh $t3, 0x0030($s1) ## 00000030 -/* 00084 809A2354 3C0E809A */ lui $t6, %hi(D_809A2A48) ## $t6 = 809A0000 -/* 00088 809A2358 3C0F809A */ lui $t7, %hi(func_809A2480) ## $t7 = 809A0000 -/* 0008C 809A235C A60B005C */ sh $t3, 0x005C($s0) ## 0000005C -/* 00090 809A2360 922C0034 */ lbu $t4, 0x0034($s1) ## 00000034 -/* 00094 809A2364 25EF2480 */ addiu $t7, $t7, %lo(func_809A2480) ## $t7 = 809A2480 -/* 00098 809A2368 000C6880 */ sll $t5, $t4, 2 -/* 0009C 809A236C 01CD7021 */ addu $t6, $t6, $t5 -/* 000A0 809A2370 8DCE2A48 */ lw $t6, %lo(D_809A2A48)($t6) -/* 000A4 809A2374 AE0F0028 */ sw $t7, 0x0028($s0) ## 00000028 -/* 000A8 809A2378 AE0E0024 */ sw $t6, 0x0024($s0) ## 00000024 -/* 000AC 809A237C 96380032 */ lhu $t8, 0x0032($s1) ## 00000032 -/* 000B0 809A2380 33190004 */ andi $t9, $t8, 0x0004 ## $t9 = 00000000 -/* 000B4 809A2384 53200020 */ beql $t9, $zero, .L809A2408 -/* 000B8 809A2388 922B0024 */ lbu $t3, 0x0024($s1) ## 00000024 -/* 000BC 809A238C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 000C0 809A2390 00000000 */ nop -/* 000C4 809A2394 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 000C8 809A2398 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 000CC 809A239C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 000D0 809A23A0 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 000D4 809A23A4 46040182 */ mul.s $f6, $f0, $f4 -/* 000D8 809A23A8 92290024 */ lbu $t1, 0x0024($s1) ## 00000024 -/* 000DC 809A23AC 46083281 */ sub.s $f10, $f6, $f8 -/* 000E0 809A23B0 4600540D */ trunc.w.s $f16, $f10 -/* 000E4 809A23B4 44028000 */ mfc1 $v0, $f16 -/* 000E8 809A23B8 00000000 */ nop -/* 000EC 809A23BC 01225021 */ addu $t2, $t1, $v0 -/* 000F0 809A23C0 A60A0040 */ sh $t2, 0x0040($s0) ## 00000040 -/* 000F4 809A23C4 922B0025 */ lbu $t3, 0x0025($s1) ## 00000025 -/* 000F8 809A23C8 01626021 */ addu $t4, $t3, $v0 -/* 000FC 809A23CC A60C0042 */ sh $t4, 0x0042($s0) ## 00000042 -/* 00100 809A23D0 922D0026 */ lbu $t5, 0x0026($s1) ## 00000026 -/* 00104 809A23D4 01A27021 */ addu $t6, $t5, $v0 -/* 00108 809A23D8 A60E0044 */ sh $t6, 0x0044($s0) ## 00000044 -/* 0010C 809A23DC 922F0028 */ lbu $t7, 0x0028($s1) ## 00000028 -/* 00110 809A23E0 01E2C021 */ addu $t8, $t7, $v0 -/* 00114 809A23E4 A6180048 */ sh $t8, 0x0048($s0) ## 00000048 -/* 00118 809A23E8 92390029 */ lbu $t9, 0x0029($s1) ## 00000029 -/* 0011C 809A23EC 03224021 */ addu $t0, $t9, $v0 -/* 00120 809A23F0 A608004A */ sh $t0, 0x004A($s0) ## 0000004A -/* 00124 809A23F4 9229002A */ lbu $t1, 0x002A($s1) ## 0000002A -/* 00128 809A23F8 01225021 */ addu $t2, $t1, $v0 -/* 0012C 809A23FC 1000000D */ beq $zero, $zero, .L809A2434 -/* 00130 809A2400 A60A004C */ sh $t2, 0x004C($s0) ## 0000004C -/* 00134 809A2404 922B0024 */ lbu $t3, 0x0024($s1) ## 00000024 -.L809A2408: -/* 00138 809A2408 A60B0040 */ sh $t3, 0x0040($s0) ## 00000040 -/* 0013C 809A240C 922C0025 */ lbu $t4, 0x0025($s1) ## 00000025 -/* 00140 809A2410 A60C0042 */ sh $t4, 0x0042($s0) ## 00000042 -/* 00144 809A2414 922D0026 */ lbu $t5, 0x0026($s1) ## 00000026 -/* 00148 809A2418 A60D0044 */ sh $t5, 0x0044($s0) ## 00000044 -/* 0014C 809A241C 922E0028 */ lbu $t6, 0x0028($s1) ## 00000028 -/* 00150 809A2420 A60E0048 */ sh $t6, 0x0048($s0) ## 00000048 -/* 00154 809A2424 922F0029 */ lbu $t7, 0x0029($s1) ## 00000029 -/* 00158 809A2428 A60F004A */ sh $t7, 0x004A($s0) ## 0000004A -/* 0015C 809A242C 9238002A */ lbu $t8, 0x002A($s1) ## 0000002A -/* 00160 809A2430 A618004C */ sh $t8, 0x004C($s0) ## 0000004C -.L809A2434: -/* 00164 809A2434 92390027 */ lbu $t9, 0x0027($s1) ## 00000027 -/* 00168 809A2438 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0016C 809A243C A6190046 */ sh $t9, 0x0046($s0) ## 00000046 -/* 00170 809A2440 9228002B */ lbu $t0, 0x002B($s1) ## 0000002B -/* 00174 809A2444 A6000050 */ sh $zero, 0x0050($s0) ## 00000050 -/* 00178 809A2448 A608004E */ sh $t0, 0x004E($s0) ## 0000004E -/* 0017C 809A244C 8629002C */ lh $t1, 0x002C($s1) ## 0000002C -/* 00180 809A2450 A6090052 */ sh $t1, 0x0052($s0) ## 00000052 -/* 00184 809A2454 862A002E */ lh $t2, 0x002E($s1) ## 0000002E -/* 00188 809A2458 A60A0054 */ sh $t2, 0x0054($s0) ## 00000054 -/* 0018C 809A245C 862B0030 */ lh $t3, 0x0030($s1) ## 00000030 -/* 00190 809A2460 A60B0058 */ sh $t3, 0x0058($s0) ## 00000058 -/* 00194 809A2464 962C0032 */ lhu $t4, 0x0032($s1) ## 00000032 -/* 00198 809A2468 A60C0056 */ sh $t4, 0x0056($s0) ## 00000056 -/* 0019C 809A246C 8FBF001C */ lw $ra, 0x001C($sp) -/* 001A0 809A2470 8FB10018 */ lw $s1, 0x0018($sp) -/* 001A4 809A2474 8FB00014 */ lw $s0, 0x0014($sp) -/* 001A8 809A2478 03E00008 */ jr $ra -/* 001AC 809A247C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s deleted file mode 100644 index 539a080f80..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s +++ /dev/null @@ -1,239 +0,0 @@ -.rdata -glabel D_809A2A70 - .asciz "../z_eff_ss_dust.c" - .balign 4 - -glabel D_809A2A84 - .asciz "../z_eff_ss_dust.c" - .balign 4 - -.late_rodata -glabel D_809A2A98 - .float 0.0025 - -.text -glabel func_809A2480 -/* 001B0 809A2480 27BDFE78 */ addiu $sp, $sp, 0xFE78 ## $sp = FFFFFE78 -/* 001B4 809A2484 AFB10018 */ sw $s1, 0x0018($sp) -/* 001B8 809A2488 AFBF001C */ sw $ra, 0x001C($sp) -/* 001BC 809A248C AFB00014 */ sw $s0, 0x0014($sp) -/* 001C0 809A2490 AFA40188 */ sw $a0, 0x0188($sp) -/* 001C4 809A2494 AFA5018C */ sw $a1, 0x018C($sp) -/* 001C8 809A2498 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 001CC 809A249C 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 001D0 809A24A0 3C06809A */ lui $a2, %hi(D_809A2A70) ## $a2 = 809A0000 -/* 001D4 809A24A4 24C62A70 */ addiu $a2, $a2, %lo(D_809A2A70) ## $a2 = 809A2A70 -/* 001D8 809A24A8 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFEDC -/* 001DC 809A24AC 24070141 */ addiu $a3, $zero, 0x0141 ## $a3 = 00000141 -/* 001E0 809A24B0 0C031AB1 */ jal Graph_OpenDisps -/* 001E4 809A24B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001E8 809A24B8 862F0052 */ lh $t7, 0x0052($s1) ## 00000052 -/* 001EC 809A24BC 3C01809A */ lui $at, %hi(D_809A2A98) ## $at = 809A0000 -/* 001F0 809A24C0 C4282A98 */ lwc1 $f8, %lo(D_809A2A98)($at) -/* 001F4 809A24C4 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 001F8 809A24C8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 001FC 809A24CC 8E260004 */ lw $a2, 0x0004($s1) ## 00000004 -/* 00200 809A24D0 468021A0 */ cvt.s.w $f6, $f4 -/* 00204 809A24D4 8E270008 */ lw $a3, 0x0008($s1) ## 00000008 -/* 00208 809A24D8 27A40144 */ addiu $a0, $sp, 0x0144 ## $a0 = FFFFFFBC -/* 0020C 809A24DC 46083002 */ mul.s $f0, $f6, $f8 -/* 00210 809A24E0 0C029E89 */ jal func_800A7A24 -/* 00214 809A24E4 E7A00078 */ swc1 $f0, 0x0078($sp) -/* 00218 809A24E8 C7A00078 */ lwc1 $f0, 0x0078($sp) -/* 0021C 809A24EC 27A40104 */ addiu $a0, $sp, 0x0104 ## $a0 = FFFFFF7C -/* 00220 809A24F0 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00224 809A24F4 44050000 */ mfc1 $a1, $f0 -/* 00228 809A24F8 44060000 */ mfc1 $a2, $f0 -/* 0022C 809A24FC 0C029DA9 */ jal func_800A76A4 -/* 00230 809A2500 00000000 */ nop -/* 00234 809A2504 8FA50188 */ lw $a1, 0x0188($sp) -/* 00238 809A2508 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0023C 809A250C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 00240 809A2510 27A40144 */ addiu $a0, $sp, 0x0144 ## $a0 = FFFFFFBC -/* 00244 809A2514 27A60084 */ addiu $a2, $sp, 0x0084 ## $a2 = FFFFFEFC -/* 00248 809A2518 0C029BE8 */ jal func_800A6FA0 -/* 0024C 809A251C 00A12821 */ addu $a1, $a1, $at -/* 00250 809A2520 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFEFC -/* 00254 809A2524 27A50104 */ addiu $a1, $sp, 0x0104 ## $a1 = FFFFFF7C -/* 00258 809A2528 0C029BE8 */ jal func_800A6FA0 -/* 0025C 809A252C 27A600C4 */ addiu $a2, $sp, 0x00C4 ## $a2 = FFFFFF3C -/* 00260 809A2530 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00264 809A2534 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 00268 809A2538 3C088013 */ lui $t0, %hi(gMtxClear) -/* 0026C 809A253C 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 00270 809A2540 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00274 809A2544 2508DB20 */ addiu $t0, %lo(gMtxClear) -/* 00278 809A2548 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 0027C 809A254C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00280 809A2550 27A500C4 */ addiu $a1, $sp, 0x00C4 ## $a1 = FFFFFF3C -/* 00284 809A2554 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 00288 809A2558 0C029F9C */ jal func_800A7E70 -/* 0028C 809A255C AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 00290 809A2560 10400098 */ beq $v0, $zero, .L809A27C4 -/* 00294 809A2564 00000000 */ nop -/* 00298 809A2568 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 0029C 809A256C 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 002A0 809A2570 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 002A4 809A2574 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 002A8 809A2578 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 002AC 809A257C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 002B0 809A2580 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 002B4 809A2584 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 002B8 809A2588 3C06E700 */ lui $a2, 0xE700 ## $a2 = E7000000 -/* 002BC 809A258C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 002C0 809A2590 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 002C4 809A2594 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 002C8 809A2598 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 002CC 809A259C AC660000 */ sw $a2, 0x0000($v1) ## 00000000 -/* 002D0 809A25A0 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 002D4 809A25A4 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 002D8 809A25A8 3C04809A */ lui $a0, %hi(D_809A2A50) ## $a0 = 809A0000 -/* 002DC 809A25AC 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 -/* 002E0 809A25B0 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 002E4 809A25B4 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 002E8 809A25B8 862E0050 */ lh $t6, 0x0050($s1) ## 00000050 -/* 002EC 809A25BC 3C0A8016 */ lui $t2, %hi(gSegments) -/* 002F0 809A25C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 002F4 809A25C4 000E7880 */ sll $t7, $t6, 2 -/* 002F8 809A25C8 008F2021 */ addu $a0, $a0, $t7 -/* 002FC 809A25CC 8C842A50 */ lw $a0, %lo(D_809A2A50)($a0) -/* 00300 809A25D0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00304 809A25D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00308 809A25D8 0004C900 */ sll $t9, $a0, 4 -/* 0030C 809A25DC 00194702 */ srl $t0, $t9, 28 -/* 00310 809A25E0 00084880 */ sll $t1, $t0, 2 -/* 00314 809A25E4 01495021 */ addu $t2, $t2, $t1 -/* 00318 809A25E8 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 0031C 809A25EC 0081C024 */ and $t8, $a0, $at -/* 00320 809A25F0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00324 809A25F4 030A5821 */ addu $t3, $t8, $t2 -/* 00328 809A25F8 01616021 */ addu $t4, $t3, $at -/* 0032C 809A25FC AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 00330 809A2600 0C024DDD */ jal Gfx_CallSetupDL -/* 00334 809A2604 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 00338 809A2608 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 0033C 809A260C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00340 809A2610 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 00344 809A2614 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00348 809A2618 3C06E700 */ lui $a2, 0xE700 ## $a2 = E7000000 -/* 0034C 809A261C AC460000 */ sw $a2, 0x0000($v0) ## 00000000 -/* 00350 809A2620 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 00354 809A2624 86220056 */ lh $v0, 0x0056($s1) ## 00000056 -/* 00358 809A2628 3C19FC30 */ lui $t9, 0xFC30 ## $t9 = FC300000 -/* 0035C 809A262C 3739B204 */ ori $t9, $t9, 0xB204 ## $t9 = FC30B204 -/* 00360 809A2630 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 -/* 00364 809A2634 11C00019 */ beq $t6, $zero, .L809A269C -/* 00368 809A2638 3C085FFE */ lui $t0, 0x5FFE ## $t0 = 5FFE0000 -/* 0036C 809A263C 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00370 809A2640 3508FFF8 */ ori $t0, $t0, 0xFFF8 ## $t0 = 5FFEFFF8 -/* 00374 809A2644 3C18E200 */ lui $t8, 0xE200 ## $t8 = E2000000 -/* 00378 809A2648 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 0037C 809A264C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00380 809A2650 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 00384 809A2654 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 00388 809A2658 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 0038C 809A265C 3C0AC810 */ lui $t2, 0xC810 ## $t2 = C8100000 -/* 00390 809A2660 354A4B50 */ ori $t2, $t2, 0x4B50 ## $t2 = C8104B50 -/* 00394 809A2664 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 00398 809A2668 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 0039C 809A266C 3718001C */ ori $t8, $t8, 0x001C ## $t8 = E200001C -/* 003A0 809A2670 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 003A4 809A2674 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -/* 003A8 809A2678 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 003AC 809A267C 3C0CD9FF */ lui $t4, 0xD9FF ## $t4 = D9FF0000 -/* 003B0 809A2680 358CFFFF */ ori $t4, $t4, 0xFFFF ## $t4 = D9FFFFFF -/* 003B4 809A2684 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 003B8 809A2688 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 003BC 809A268C 3C0D0003 */ lui $t5, 0x0003 ## $t5 = 00030000 -/* 003C0 809A2690 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 -/* 003C4 809A2694 1000001B */ beq $zero, $zero, .L809A2704 -/* 003C8 809A2698 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -.L809A269C: -/* 003CC 809A269C 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 003D0 809A26A0 11C00011 */ beq $t6, $zero, .L809A26E8 -/* 003D4 809A26A4 3C19E200 */ lui $t9, 0xE200 ## $t9 = E2000000 -/* 003D8 809A26A8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 003DC 809A26AC 3C080C18 */ lui $t0, 0x0C18 ## $t0 = 0C180000 -/* 003E0 809A26B0 35084B50 */ ori $t0, $t0, 0x4B50 ## $t0 = 0C184B50 -/* 003E4 809A26B4 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 003E8 809A26B8 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 003EC 809A26BC 3739001C */ ori $t9, $t9, 0x001C ## $t9 = E200001C -/* 003F0 809A26C0 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 003F4 809A26C4 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 003F8 809A26C8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 003FC 809A26CC 3C18D9FC */ lui $t8, 0xD9FC ## $t8 = D9FC0000 -/* 00400 809A26D0 3718FFFF */ ori $t8, $t8, 0xFFFF ## $t8 = D9FCFFFF -/* 00404 809A26D4 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 00408 809A26D8 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 0040C 809A26DC AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 00410 809A26E0 10000008 */ beq $zero, $zero, .L809A2704 -/* 00414 809A26E4 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -.L809A26E8: -/* 00418 809A26E8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 0041C 809A26EC 3C0BD9FD */ lui $t3, 0xD9FD ## $t3 = D9FD0000 -/* 00420 809A26F0 356BFFFF */ ori $t3, $t3, 0xFFFF ## $t3 = D9FDFFFF -/* 00424 809A26F4 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 -/* 00428 809A26F8 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 0042C 809A26FC AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 00430 809A2700 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -.L809A2704: -/* 00434 809A2704 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00438 809A2708 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 0043C 809A270C 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 -/* 00440 809A2710 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 00444 809A2714 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 00448 809A2718 AC660000 */ sw $a2, 0x0000($v1) ## 00000000 -/* 0044C 809A271C 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00450 809A2720 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 00454 809A2724 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00458 809A2728 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 0045C 809A272C 862F0044 */ lh $t7, 0x0044($s1) ## 00000044 -/* 00460 809A2730 862C0042 */ lh $t4, 0x0042($s1) ## 00000042 -/* 00464 809A2734 86380040 */ lh $t8, 0x0040($s1) ## 00000040 -/* 00468 809A2738 31F900FF */ andi $t9, $t7, 0x00FF ## $t9 = 00000008 -/* 0046C 809A273C 00194200 */ sll $t0, $t9, 8 -/* 00470 809A2740 318D00FF */ andi $t5, $t4, 0x00FF ## $t5 = 00000008 -/* 00474 809A2744 00185600 */ sll $t2, $t8, 24 -/* 00478 809A2748 010A5825 */ or $t3, $t0, $t2 ## $t3 = 0C184B58 -/* 0047C 809A274C 000D7400 */ sll $t6, $t5, 16 -/* 00480 809A2750 016E7825 */ or $t7, $t3, $t6 ## $t7 = FE184B58 -/* 00484 809A2754 35F900FF */ ori $t9, $t7, 0x00FF ## $t9 = FE184BFF -/* 00488 809A2758 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 0048C 809A275C 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00490 809A2760 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 00494 809A2764 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 00498 809A2768 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 0049C 809A276C AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 004A0 809A2770 8628004E */ lh $t0, 0x004E($s1) ## 0000004E -/* 004A4 809A2774 862F004A */ lh $t7, 0x004A($s1) ## 0000004A -/* 004A8 809A2778 862D0048 */ lh $t5, 0x0048($s1) ## 00000048 -/* 004AC 809A277C 310A00FF */ andi $t2, $t0, 0x00FF ## $t2 = 00000050 -/* 004B0 809A2780 8628004C */ lh $t0, 0x004C($s1) ## 0000004C -/* 004B4 809A2784 31F900FF */ andi $t9, $t7, 0x00FF ## $t9 = 00000058 -/* 004B8 809A2788 000D5E00 */ sll $t3, $t5, 24 -/* 004BC 809A278C 014B7025 */ or $t6, $t2, $t3 ## $t6 = 0C184B58 -/* 004C0 809A2790 00194C00 */ sll $t1, $t9, 16 -/* 004C4 809A2794 310C00FF */ andi $t4, $t0, 0x00FF ## $t4 = 00000050 -/* 004C8 809A2798 000C6A00 */ sll $t5, $t4, 8 -/* 004CC 809A279C 01C9C025 */ or $t8, $t6, $t1 ## $t8 = 0C184B58 -/* 004D0 809A27A0 030D5025 */ or $t2, $t8, $t5 ## $t2 = 0C184B58 -/* 004D4 809A27A4 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -/* 004D8 809A27A8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 004DC 809A27AC 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 004E0 809A27B0 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 004E4 809A27B4 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 004E8 809A27B8 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 004EC 809A27BC 8E390038 */ lw $t9, 0x0038($s1) ## 00000038 -/* 004F0 809A27C0 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -.L809A27C4: -/* 004F4 809A27C4 3C06809A */ lui $a2, %hi(D_809A2A84) ## $a2 = 809A0000 -/* 004F8 809A27C8 24C62A84 */ addiu $a2, $a2, %lo(D_809A2A84) ## $a2 = 809A2A84 -/* 004FC 809A27CC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFEDC -/* 00500 809A27D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00504 809A27D4 0C031AD5 */ jal Graph_CloseDisps -/* 00508 809A27D8 24070185 */ addiu $a3, $zero, 0x0185 ## $a3 = 00000185 -/* 0050C 809A27DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00510 809A27E0 8FB00014 */ lw $s0, 0x0014($sp) -/* 00514 809A27E4 8FB10018 */ lw $s1, 0x0018($sp) -/* 00518 809A27E8 03E00008 */ jr $ra -/* 0051C 809A27EC 27BD0188 */ addiu $sp, $sp, 0x0188 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s deleted file mode 100644 index 2137072985..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s +++ /dev/null @@ -1,86 +0,0 @@ -.late_rodata -glabel D_809A2A9C - .float 0.4 - -glabel D_809A2AA0 - .float 0.2 - -glabel D_809A2AA4 - .float 0.4 - -glabel D_809A2AA8 - .float 0.2 - -.text -glabel func_809A27F0 -/* 00520 809A27F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00524 809A27F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00528 809A27F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0052C 809A27FC AFA5001C */ sw $a1, 0x001C($sp) -/* 00530 809A2800 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00534 809A2804 AFA60020 */ sw $a2, 0x0020($sp) -/* 00538 809A2808 3C01809A */ lui $at, %hi(D_809A2A9C) ## $at = 809A0000 -/* 0053C 809A280C C4242A9C */ lwc1 $f4, %lo(D_809A2A9C)($at) -/* 00540 809A2810 3C01809A */ lui $at, %hi(D_809A2AA0) ## $at = 809A0000 -/* 00544 809A2814 C4282AA0 */ lwc1 $f8, %lo(D_809A2AA0)($at) -/* 00548 809A2818 46040182 */ mul.s $f6, $f0, $f4 -/* 0054C 809A281C 8FA60020 */ lw $a2, 0x0020($sp) -/* 00550 809A2820 46083281 */ sub.s $f10, $f6, $f8 -/* 00554 809A2824 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00558 809A2828 E4CA0018 */ swc1 $f10, 0x0018($a2) ## 00000018 -/* 0055C 809A282C 3C01809A */ lui $at, %hi(D_809A2AA4) ## $at = 809A0000 -/* 00560 809A2830 C4302AA4 */ lwc1 $f16, %lo(D_809A2AA4)($at) -/* 00564 809A2834 8FA60020 */ lw $a2, 0x0020($sp) -/* 00568 809A2838 3C01809A */ lui $at, %hi(D_809A2AA8) ## $at = 809A0000 -/* 0056C 809A283C 46100482 */ mul.s $f18, $f0, $f16 -/* 00570 809A2840 C4242AA8 */ lwc1 $f4, %lo(D_809A2AA8)($at) -/* 00574 809A2844 84C20058 */ lh $v0, 0x0058($a2) ## 00000058 -/* 00578 809A2848 84C3005C */ lh $v1, 0x005C($a2) ## 0000005C -/* 0057C 809A284C 244EFFF9 */ addiu $t6, $v0, 0xFFF9 ## $t6 = FFFFFFF9 -/* 00580 809A2850 0043082A */ slt $at, $v0, $v1 -/* 00584 809A2854 46049181 */ sub.s $f6, $f18, $f4 -/* 00588 809A2858 1420001A */ bne $at, $zero, .L809A28C4 -/* 0058C 809A285C E4C60020 */ swc1 $f6, 0x0020($a2) ## 00000020 -/* 00590 809A2860 006E082A */ slt $at, $v1, $t6 -/* 00594 809A2864 14200017 */ bne $at, $zero, .L809A28C4 -/* 00598 809A2868 28410005 */ slti $at, $v0, 0x0005 -/* 0059C 809A286C 14200004 */ bne $at, $zero, .L809A2880 -/* 005A0 809A2870 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 005A4 809A2874 00437823 */ subu $t7, $v0, $v1 -/* 005A8 809A2878 10000014 */ beq $zero, $zero, .L809A28CC -/* 005AC 809A287C A4CF0050 */ sh $t7, 0x0050($a2) ## 00000050 -.L809A2880: -/* 005B0 809A2880 0302001A */ div $zero, $t8, $v0 -/* 005B4 809A2884 0000C812 */ mflo $t9 -/* 005B8 809A2888 00434023 */ subu $t0, $v0, $v1 -/* 005BC 809A288C 14400002 */ bne $v0, $zero, .L809A2898 -/* 005C0 809A2890 00000000 */ nop -/* 005C4 809A2894 0007000D */ break 7 ## 0x01C00 -.L809A2898: -/* 005C8 809A2898 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 005CC 809A289C 14410004 */ bne $v0, $at, .L809A28B0 -/* 005D0 809A28A0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 005D4 809A28A4 17010002 */ bne $t8, $at, .L809A28B0 -/* 005D8 809A28A8 00000000 */ nop -/* 005DC 809A28AC 0006000D */ break 6 ## 0x01800 -.L809A28B0: -/* 005E0 809A28B0 03280019 */ multu $t9, $t0 -/* 005E4 809A28B4 00004812 */ mflo $t1 -/* 005E8 809A28B8 A4C90050 */ sh $t1, 0x0050($a2) ## 00000050 -/* 005EC 809A28BC 10000004 */ beq $zero, $zero, .L809A28D0 -/* 005F0 809A28C0 84CB0052 */ lh $t3, 0x0052($a2) ## 00000052 -.L809A28C4: -/* 005F4 809A28C4 240A0007 */ addiu $t2, $zero, 0x0007 ## $t2 = 00000007 -/* 005F8 809A28C8 A4CA0050 */ sh $t2, 0x0050($a2) ## 00000050 -.L809A28CC: -/* 005FC 809A28CC 84CB0052 */ lh $t3, 0x0052($a2) ## 00000052 -.L809A28D0: -/* 00600 809A28D0 84CC0054 */ lh $t4, 0x0054($a2) ## 00000054 -/* 00604 809A28D4 016C6821 */ addu $t5, $t3, $t4 -/* 00608 809A28D8 A4CD0052 */ sh $t5, 0x0052($a2) ## 00000052 -/* 0060C 809A28DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00610 809A28E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00614 809A28E4 03E00008 */ jr $ra -/* 00618 809A28E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s deleted file mode 100644 index 2944f460cf..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s +++ /dev/null @@ -1,109 +0,0 @@ -.late_rodata -glabel D_809A2AAC - .float 0.4 - -glabel D_809A2AB0 - .float 0.2 - -glabel D_809A2AB4 - .float 0.4 - -glabel D_809A2AB8 - .float 0.2 - -.text -glabel func_809A28EC -/* 0061C 809A28EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00620 809A28F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00624 809A28F4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00628 809A28F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0062C 809A28FC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00630 809A2900 AFA60020 */ sw $a2, 0x0020($sp) -/* 00634 809A2904 3C01809A */ lui $at, %hi(D_809A2AAC) ## $at = 809A0000 -/* 00638 809A2908 C4242AAC */ lwc1 $f4, %lo(D_809A2AAC)($at) -/* 0063C 809A290C 3C01809A */ lui $at, %hi(D_809A2AB0) ## $at = 809A0000 -/* 00640 809A2910 C4282AB0 */ lwc1 $f8, %lo(D_809A2AB0)($at) -/* 00644 809A2914 46040182 */ mul.s $f6, $f0, $f4 -/* 00648 809A2918 8FA60020 */ lw $a2, 0x0020($sp) -/* 0064C 809A291C 46083281 */ sub.s $f10, $f6, $f8 -/* 00650 809A2920 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00654 809A2924 E4CA0018 */ swc1 $f10, 0x0018($a2) ## 00000018 -/* 00658 809A2928 3C01809A */ lui $at, %hi(D_809A2AB4) ## $at = 809A0000 -/* 0065C 809A292C C4302AB4 */ lwc1 $f16, %lo(D_809A2AB4)($at) -/* 00660 809A2930 3C01809A */ lui $at, %hi(D_809A2AB8) ## $at = 809A0000 -/* 00664 809A2934 C4242AB8 */ lwc1 $f4, %lo(D_809A2AB8)($at) -/* 00668 809A2938 46100482 */ mul.s $f18, $f0, $f16 -/* 0066C 809A293C 8FA60020 */ lw $a2, 0x0020($sp) -/* 00670 809A2940 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00674 809A2944 24020096 */ addiu $v0, $zero, 0x0096 ## $v0 = 00000096 -/* 00678 809A2948 84C30050 */ lh $v1, 0x0050($a2) ## 00000050 -/* 0067C 809A294C 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00680 809A2950 240F0032 */ addiu $t7, $zero, 0x0032 ## $t7 = 00000032 -/* 00684 809A2954 46049181 */ sub.s $f6, $f18, $f4 -/* 00688 809A2958 1060000B */ beq $v1, $zero, .L809A2988 -/* 0068C 809A295C E4C60020 */ swc1 $f6, 0x0020($a2) ## 00000020 -/* 00690 809A2960 10610011 */ beq $v1, $at, .L809A29A8 -/* 00694 809A2964 241800C8 */ addiu $t8, $zero, 0x00C8 ## $t8 = 000000C8 -/* 00698 809A2968 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0069C 809A296C 10610018 */ beq $v1, $at, .L809A29D0 -/* 006A0 809A2970 24090032 */ addiu $t1, $zero, 0x0032 ## $t1 = 00000032 -/* 006A4 809A2974 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 006A8 809A2978 1061001D */ beq $v1, $at, .L809A29F0 -/* 006AC 809A297C 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 -/* 006B0 809A2980 10000024 */ beq $zero, $zero, .L809A2A14 -/* 006B4 809A2984 28610007 */ slti $at, $v1, 0x0007 -.L809A2988: -/* 006B8 809A2988 A4CE0040 */ sh $t6, 0x0040($a2) ## 00000040 -/* 006BC 809A298C A4C20042 */ sh $v0, 0x0042($a2) ## 00000042 -/* 006C0 809A2990 A4C00044 */ sh $zero, 0x0044($a2) ## 00000044 -/* 006C4 809A2994 A4C20048 */ sh $v0, 0x0048($a2) ## 00000048 -/* 006C8 809A2998 A4CF004A */ sh $t7, 0x004A($a2) ## 0000004A -/* 006CC 809A299C A4C0004C */ sh $zero, 0x004C($a2) ## 0000004C -/* 006D0 809A29A0 1000001B */ beq $zero, $zero, .L809A2A10 -/* 006D4 809A29A4 84C30050 */ lh $v1, 0x0050($a2) ## 00000050 -.L809A29A8: -/* 006D8 809A29A8 24190032 */ addiu $t9, $zero, 0x0032 ## $t9 = 00000032 -/* 006DC 809A29AC 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 -/* 006E0 809A29B0 A4D80040 */ sh $t8, 0x0040($a2) ## 00000040 -/* 006E4 809A29B4 A4D90042 */ sh $t9, 0x0042($a2) ## 00000042 -/* 006E8 809A29B8 A4C00044 */ sh $zero, 0x0044($a2) ## 00000044 -/* 006EC 809A29BC A4C80048 */ sh $t0, 0x0048($a2) ## 00000048 -/* 006F0 809A29C0 A4C0004A */ sh $zero, 0x004A($a2) ## 0000004A -/* 006F4 809A29C4 A4C0004C */ sh $zero, 0x004C($a2) ## 0000004C -/* 006F8 809A29C8 10000011 */ beq $zero, $zero, .L809A2A10 -/* 006FC 809A29CC 84C30050 */ lh $v1, 0x0050($a2) ## 00000050 -.L809A29D0: -/* 00700 809A29D0 A4C90040 */ sh $t1, 0x0040($a2) ## 00000040 -/* 00704 809A29D4 A4C00042 */ sh $zero, 0x0042($a2) ## 00000042 -/* 00708 809A29D8 A4C00044 */ sh $zero, 0x0044($a2) ## 00000044 -/* 0070C 809A29DC A4C00048 */ sh $zero, 0x0048($a2) ## 00000048 -/* 00710 809A29E0 A4C0004A */ sh $zero, 0x004A($a2) ## 0000004A -/* 00714 809A29E4 A4C0004C */ sh $zero, 0x004C($a2) ## 0000004C -/* 00718 809A29E8 10000009 */ beq $zero, $zero, .L809A2A10 -/* 0071C 809A29EC 84C30050 */ lh $v1, 0x0050($a2) ## 00000050 -.L809A29F0: -/* 00720 809A29F0 A4C0004C */ sh $zero, 0x004C($a2) ## 0000004C -/* 00724 809A29F4 84C2004C */ lh $v0, 0x004C($a2) ## 0000004C -/* 00728 809A29F8 A4CA0040 */ sh $t2, 0x0040($a2) ## 00000040 -/* 0072C 809A29FC 84C30050 */ lh $v1, 0x0050($a2) ## 00000050 -/* 00730 809A2A00 A4C20044 */ sh $v0, 0x0044($a2) ## 00000044 -/* 00734 809A2A04 A4C2004A */ sh $v0, 0x004A($a2) ## 0000004A -/* 00738 809A2A08 A4C20042 */ sh $v0, 0x0042($a2) ## 00000042 -/* 0073C 809A2A0C A4C20048 */ sh $v0, 0x0048($a2) ## 00000048 -.L809A2A10: -/* 00740 809A2A10 28610007 */ slti $at, $v1, 0x0007 -.L809A2A14: -/* 00744 809A2A14 10200002 */ beq $at, $zero, .L809A2A20 -/* 00748 809A2A18 246B0001 */ addiu $t3, $v1, 0x0001 ## $t3 = 00000001 -/* 0074C 809A2A1C A4CB0050 */ sh $t3, 0x0050($a2) ## 00000050 -.L809A2A20: -/* 00750 809A2A20 84CC0052 */ lh $t4, 0x0052($a2) ## 00000052 -/* 00754 809A2A24 84CD0054 */ lh $t5, 0x0054($a2) ## 00000054 -/* 00758 809A2A28 018D7021 */ addu $t6, $t4, $t5 -/* 0075C 809A2A2C A4CE0052 */ sh $t6, 0x0052($a2) ## 00000052 -/* 00760 809A2A30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00764 809A2A34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00768 809A2A38 03E00008 */ jr $ra -/* 0076C 809A2A3C 00000000 */ nop diff --git a/data/overlays/actors/z_bg_heavy_block.data.s b/data/overlays/actors/z_bg_heavy_block.data.s deleted file mode 100644 index e1d5ee7a71..0000000000 --- a/data/overlays/actors/z_bg_heavy_block.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Bg_Heavy_Block_InitVars - .word 0x00920100, 0x00000000, 0x009A0000, 0x00000178 -.word BgHeavyBlock_Init -.word BgHeavyBlock_Destroy -.word BgHeavyBlock_Update -.word BgHeavyBlock_Draw -glabel D_80884E70 - .word 0xC0500001, 0xB0F40FA0, 0xB0F80190, 0x30FC0190 -glabel D_80884E80 - .word 0x00000000, 0x43960000, 0xC1A00000, 0x42480000, 0x43480000, 0xC1A00000, 0xC2480000, 0x43480000, 0xC1A00000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000000, 0x42C80000, 0xC28C0000, 0x00000000, 0x00000000, 0xC1A00000 -glabel D_80884EC8 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80884ED4 - .word 0x00000000 -glabel D_80884ED8 - .word 0x43C80000 -glabel D_80884EDC - .word 0x00000000 - diff --git a/data/overlays/actors/z_bg_heavy_block.reloc.s b/data/overlays/actors/z_bg_heavy_block.reloc.s deleted file mode 100644 index d9b6ee8b02..0000000000 --- a/data/overlays/actors/z_bg_heavy_block.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80884FE0 - .incbin "baserom/ovl_Bg_Heavy_Block", 0x1850, 0x000001C0 diff --git a/data/overlays/effects/z_eff_ss_dust.data.s b/data/overlays/effects/z_eff_ss_dust.data.s deleted file mode 100644 index d9b7e2e2b1..0000000000 --- a/data/overlays/effects/z_eff_ss_dust.data.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Effect_Ss_Dust_InitVars -.word 0x00000000 -.word func_809A22D0 -glabel D_809A2A48 - .word func_809A27F0 -.word func_809A28EC -glabel D_809A2A50 - .word 0x04051DB0, 0x040521B0, 0x040525B0, 0x040529B0, 0x04052DB0, 0x040531B0, 0x040535B0, 0x040539B0 - diff --git a/data/overlays/effects/z_eff_ss_dust.reloc.s b/data/overlays/effects/z_eff_ss_dust.reloc.s deleted file mode 100644 index c9abde0266..0000000000 --- a/data/overlays/effects/z_eff_ss_dust.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A2AC0 - .incbin "baserom/ovl_Effect_Ss_Dust", 0x7F0, 0x000000A0 diff --git a/include/functions.h b/include/functions.h index 72886cf408..fccddbf55c 100644 --- a/include/functions.h +++ b/include/functions.h @@ -202,25 +202,23 @@ s16 func_80027DD4(s16 arg0, s16 arg1, s32 arg2); s16 func_80027E34(s16 arg0, s16 arg1, f32 arg2); u8 func_80027E84(u8 arg0, u8 arg1, f32 arg2); // ? func_80027F80(?); -// ? func_800281E8(?); -// ? func_8002829C(?); -// ? func_80028304(?); -void func_8002836C(GlobalContext*, Vec3f*, Vec3f*, Vec3f*, Color_RGBA8*, Color_RGBA8*, s16, s32, s32); -// ? func_800283D4(?); -// ? func_8002843C(?); -// ? func_800284A4(?); -// ? func_80028510(?); -// ? func_8002857C(?); -// ? func_800285EC(?); -// ? func_8002865C(?); -void func_800286CC(GlobalContext*, Vec3f*, Vec3f*, Vec3f*, s16, s16); -// ? func_8002873C(?); -// ? func_800287AC(?); -// ? func_8002881C(?); -// ? func_80028858(?); -// ? func_80028894(?); -// ? func_80028990(?); -// ? func_80028A54(?); +void func_8002829C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, + Color_RGBA8_n* envColor, s16 scale, s16 scaleStep); +void func_8002836C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, + Color_RGBA8_n* envColor, s16 scale, s16 scaleStep, s16 life); +void func_800283D4(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, + Color_RGBA8_n* envColor, s16 scale, s16 scaleStep, s16 life); +void func_8002843C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* arg2, Vec3f* arg3, Color_RGBA8_n* arg4, + Color_RGBA8_n* arg5, s16 arg6, s16 arg7, s16 arg8); +void func_8002857C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel); +void func_8002865C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep); +void func_800286CC(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep); +void func_8002873C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, + s16 life); +void func_800287AC(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, + s16 life); +void func_80028990(GlobalContext* globalCtx, f32 randScale, Vec3f* srcPos); +void func_80028A54(GlobalContext* globalCtx, f32 randScale, Vec3f* srcPos); // ? func_80028B18(?); void func_80028B74(GlobalContext*, Vec3f*, UNK_PTR, UNK_PTR, Color_RGB8*, Color_RGB8*); // ? func_80028BB0(?); @@ -899,7 +897,7 @@ u16 Jpeg_GetU16(u8* ptr); void Jpeg_ParseMarkers(u8* ptr, JpegContext* ctx); s32 Jpeg_Decode(void* data, u16* zbuffer, JpegWork* workBuff, u32 workSize); void KaleidoSetup_Update(GlobalContext* globalCtx); -void KaleidoSetup_Init(GlobalContext *globalCtx); +void KaleidoSetup_Init(GlobalContext* globalCtx); void KaleidoSetup_Destroy(GlobalContext* globalCtx); // ? func_8006EE50(?); // ? func_8006EE60(?); @@ -2421,16 +2419,16 @@ s32 osProbeRumblePak(OSMesgQueue* ctrlrqueue, OSPfs* pfs, u32 channel); void __osSiCreateAccessQueue(); void __osSiGetAccess(); void __osSiRelAccess(); -s32 osContInit(OSMesgQueue *mq, u8 *ctl_present_bitfield, OSContStatus *status); -void __osContGetInitData(u8 *ctl_present_bitfield, OSContStatus *status); +s32 osContInit(OSMesgQueue* mq, u8* ctl_present_bitfield, OSContStatus* status); +void __osContGetInitData(u8* ctl_present_bitfield, OSContStatus* status); void __osPackRequestData(u8 poll); -s32 osContStartReadData(OSMesgQueue *mq); +s32 osContStartReadData(OSMesgQueue* mq); void osContGetReadData(OSContPad* pad); void __osPackReadData(); // ? guPerspectiveF(?); // ? guPerspective(?); // ? __osSpRawStartDma(?); -s32 __osSiRawStartDma(s32 dir, void *addr); +s32 __osSiRawStartDma(s32 dir, void* addr); // ? osSpTaskYield(?); s32 __osPfsGetNextPage(OSPfs* pfs, u8* bank, __OSInode* inode, __OSInodeUnit* page); s32 osPfsReadWriteFile(OSPfs* pfs, s32 fileNo, u8 flag, s32 offset, s32 size, u8* data); @@ -2440,18 +2438,20 @@ void __osPfsGetOneChannelData(s32 channel, OSContStatus* contData); // ? guMtxIdentF(?); void guLookAtF(float mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp); void guLookAt(Mtx*, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp); -s32 osPfsAllocateFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name, s32 length, s32* file_no); -s32 __osPfsDeclearPage(OSPfs* pfs, __OSInode* inode, s32 fileSizeInPages, s32* startPage, u8 bank, s32* decleared, s32* finalPage); +s32 osPfsAllocateFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name, s32 length, + s32* file_no); +s32 __osPfsDeclearPage(OSPfs* pfs, __OSInode* inode, s32 fileSizeInPages, s32* startPage, u8 bank, s32* decleared, + s32* finalPage); // ? osStopTimer(?); u16 __osSumcalc(u8* ptr, s32 length); -s32 __osIdCheckSum(u16 *ptr, u16 *csum, u16 *icsum); +s32 __osIdCheckSum(u16* ptr, u16* csum, u16* icsum); s32 __osRepairPackId(OSPfs* pfs, __OSPackId* badid, __OSPackId* newid); s32 __osCheckPackId(OSPfs* pfs, __OSPackId* temp); s32 __osGetId(OSPfs* pfs); s32 __osCheckId(OSPfs* pfs); s32 __osPfsRWInode(OSPfs* pfs, __OSInode* inode, u8 flag, u8 bank); // ? func_80102FA0(?); -s32 osPfsFindFile(OSPfs *pfs, u16 companyCode, u32 gameCode, u8 *gameName, u8 *extName, s32 *fileNo); +s32 osPfsFindFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32* fileNo); // ? osAfterPreNMI(?); // ? osContStartQuery(?); void osContGetQuery(OSContStatus* data); @@ -2480,9 +2480,9 @@ s16 coss(u16); void osViSetEvent(OSMesgQueue* mq, OSMesg m, u32 retraceCount); s32 osPfsIsPlug(OSMesgQueue* mq, u8* pattern); void __osPfsRequestData(u8 poll); -void __osPfsGetInitData(u8 *pattern, OSContStatus* contData); -void guS2DInitBg(uObjBg *bg); -s32 __osPfsSelectBank(OSPfs *pfs, u8 bank); +void __osPfsGetInitData(u8* pattern, OSContStatus* contData); +void guS2DInitBg(uObjBg* bg); +s32 __osPfsSelectBank(OSPfs* pfs, u8 bank); s32 osContSetCh(u8 ch); s32 osPfsFileState(OSPfs* pfs, s32 file_no, OSPfsState* state); s32 osPfsInitPak(OSMesgQueue* mq, OSPfs* pfs, s32 channel); diff --git a/include/z64actor.h b/include/z64actor.h index 8d61dd8fd4..4c380af50b 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -241,7 +241,8 @@ typedef struct Player { /* 0x01B4 */ SkelAnime skelAnime; /* 0x01F8 */ char unk_1F8[0x1B4]; /* 0x03AC */ Actor* heldActor; - /* 0x03B0 */ char unk_3B0[0x018]; + /* 0x03B0 */ Vec3f unk_3B0; // related to links hands + /* 0x03BC */ char unk_3BC[0x00C]; /* 0x03C8 */ Vec3f unk_3C8; /* 0x03D4 */ char unk_3D4[0x060]; /* 0x0434 */ u8 getItemId; diff --git a/include/z64effect.h b/include/z64effect.h index 6c6aa0d74c..0b26d38ea5 100644 --- a/include/z64effect.h +++ b/include/z64effect.h @@ -214,7 +214,7 @@ typedef struct EffectSs { /* 0x24 */ void (*update)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* effectSs); /* 0x28 */ void (*draw)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* effectSs); /* 0x2C */ Vec3f unk_2C; - /* 0x38 */ u32 unk_38; + /* 0x38 */ UNK_PTR unk_38; // could be dlist pointer, need to make sure for all effects /* 0x3C */ UNK_PTR unk_3C; /* 0x40 */ s16 regs[13]; // specific per effect /* 0x5A */ u16 flags; diff --git a/spec b/spec index 9e943bbcc3..650471c0db 100644 --- a/spec +++ b/spec @@ -838,8 +838,7 @@ endseg beginseg name "ovl_Bg_Heavy_Block" include "build/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.o" - include "build/data/overlays/actors/z_bg_heavy_block.data.o" - include "build/data/overlays/actors/z_bg_heavy_block.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Heavy_Block/ovl_Bg_Heavy_Block_reloc.o" endseg beginseg @@ -1804,8 +1803,7 @@ endseg beginseg name "ovl_Effect_Ss_Dust" include "build/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.o" - include "build/data/overlays/effects/z_eff_ss_dust.data.o" - include "build/data/overlays/effects/z_eff_ss_dust.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Dust/ovl_Effect_Ss_Dust_reloc.o" endseg beginseg diff --git a/src/code/z_actor.c b/src/code/z_actor.c index db059634d5..d79e960032 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3173,56 +3173,56 @@ s32 func_8003305C(Actor* actor, struct_80032E24* arg1, GlobalContext* globalCtx, return 1; } -void func_80033260(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3, s32 arg4, f32 arg5, s16 arg6, - s16 arg7, u8 arg8) { - Vec3f sp9C; - Vec3f sp90 = { 0.0f, 0.0f, 0.0f }; - Vec3f sp84 = { 0.0f, 0.3f, 0.0f }; +void func_80033260(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3, s32 arg4, f32 arg5, s16 scale, + s16 scaleStep, u8 arg8) { + Vec3f pos; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.3f, 0.0f }; f32 var; s32 i; var = (Math_Rand_ZeroOne() - 0.5f) * 6.28f; - sp9C.y = actor->groundY; - sp84.y += (Math_Rand_ZeroOne() - 0.5f) * 0.2f; + pos.y = actor->groundY; + accel.y += (Math_Rand_ZeroOne() - 0.5f) * 0.2f; for (i = arg4; i >= 0; i--) { - sp9C.x = (func_800CA720(var) * arg3) + arg2->x; - sp9C.z = (func_800CA774(var) * arg3) + arg2->z; - sp84.x = (Math_Rand_ZeroOne() - 0.5f) * arg5; - sp84.z = (Math_Rand_ZeroOne() - 0.5f) * arg5; + pos.x = (func_800CA720(var) * arg3) + arg2->x; + pos.z = (func_800CA774(var) * arg3) + arg2->z; + accel.x = (Math_Rand_ZeroOne() - 0.5f) * arg5; + accel.z = (Math_Rand_ZeroOne() - 0.5f) * arg5; - if (arg6 == 0) { - func_8002857C(globalCtx, &sp9C, &sp90, &sp84); + if (scale == 0) { + func_8002857C(globalCtx, &pos, &velocity, &accel); } else if (arg8 != 0) { - func_800286CC(globalCtx, &sp9C, &sp90, &sp84, arg6, arg7); + func_800286CC(globalCtx, &pos, &velocity, &accel, scale, scaleStep); } else { - func_8002865C(globalCtx, &sp9C, &sp90, &sp84, arg6, arg7); + func_8002865C(globalCtx, &pos, &velocity, &accel, scale, scaleStep); } var += 6.28f / (arg4 + 1.0f); } } -void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s16 arg4, s16 arg5, u8 arg6) { - Vec3f sp94; - Vec3f sp88 = { 0.0f, 0.0f, 0.0f }; - Vec3f sp7C = { 0.0f, 0.3f, 0.0f }; - s16 var; +void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s16 arg4, s16 scaleStep, u8 arg6) { + Vec3f pos; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.3f, 0.0f }; + s16 scale; u32 var2; s32 i; for (i = arg3; i >= 0; i--) { - sp94.x = arg1->x + ((Math_Rand_ZeroOne() - 0.5f) * arg2); - sp94.y = arg1->y + ((Math_Rand_ZeroOne() - 0.5f) * arg2); - sp94.z = arg1->z + ((Math_Rand_ZeroOne() - 0.5f) * arg2); + pos.x = arg1->x + ((Math_Rand_ZeroOne() - 0.5f) * arg2); + pos.y = arg1->y + ((Math_Rand_ZeroOne() - 0.5f) * arg2); + pos.z = arg1->z + ((Math_Rand_ZeroOne() - 0.5f) * arg2); - var = (s16)((Math_Rand_ZeroOne() * arg4) * 0.2f) + arg4; + scale = (s16)((Math_Rand_ZeroOne() * arg4) * 0.2f) + arg4; var2 = arg6; if (var2 != 0) { - func_800286CC(globalCtx, &sp94, &sp88, &sp7C, var, arg5); + func_800286CC(globalCtx, &pos, &velocity, &accel, scale, scaleStep); } else { - func_8002865C(globalCtx, &sp94, &sp88, &sp7C, var, arg5); + func_8002865C(globalCtx, &pos, &velocity, &accel, scale, scaleStep); } } } diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 03754d7c40..5ba79f306c 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -88,7 +88,7 @@ void EffectSs_Reset(EffectSs* effectSs) { effectSs->priority = 128; effectSs->draw = NULL; effectSs->update = NULL; - effectSs->unk_38 = 0; + effectSs->unk_38 = NULL; effectSs->unk_3C = NULL; for (i = 0; i < ARRAY_COUNT(effectSs->regs); i++) { diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index f06dc4a031..3612c4ad4c 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -1,50 +1,155 @@ #include #include +#include "overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h" #include "overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" +extern Color_RGBA8_n D_801158CC; +extern Color_RGBA8_n D_801158D0; + // Draw utility for some G effects + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s") // EffectSsDust Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800281E8.s") +void EffectSsDust_Spawn(GlobalContext* globalCtx, u16 drawFlags, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8_n* primColor, Color_RGBA8_n* envColor, s16 scale, s16 scaleStep, s16 life, + u8 updateMode) { + EffectSsDustInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002829C.s") + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.primColor = *primColor; + initParams.envColor = *envColor; + initParams.drawFlags = drawFlags; + initParams.scale = scale; + initParams.scaleStep = scaleStep; + initParams.life = life; + initParams.updateMode = updateMode; + EffectSs_Spawn(globalCtx, EFFECT_SS_DUST, 128, &initParams); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028304.s") +void func_8002829C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, + Color_RGBA8_n* envColor, s16 scale, s16 scaleStep) { + EffectSsDust_Spawn(globalCtx, 0, pos, velocity, accel, primColor, envColor, scale, scaleStep, 10, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002836C.s") +void func_80028304(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, + Color_RGBA8_n* envColor, s16 scale, s16 scaleStep) { + EffectSsDust_Spawn(globalCtx, 1, pos, velocity, accel, primColor, envColor, scale, scaleStep, 10, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800283D4.s") +void func_8002836C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, + Color_RGBA8_n* envColor, s16 scale, s16 scaleStep, s16 life) { + EffectSsDust_Spawn(globalCtx, 0, pos, velocity, accel, primColor, envColor, scale, scaleStep, life, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002843C.s") +void func_800283D4(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, + Color_RGBA8_n* envColor, s16 scale, s16 scaleStep, s16 life) { + EffectSsDust_Spawn(globalCtx, 1, pos, velocity, accel, primColor, envColor, scale, scaleStep, life, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800284A4.s") +void func_8002843C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, + Color_RGBA8_n* envColor, s16 scale, s16 scaleStep, s16 life) { + EffectSsDust_Spawn(globalCtx, 2, pos, velocity, accel, primColor, envColor, scale, scaleStep, life, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028510.s") +// unused +void func_800284A4(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, + Color_RGBA8_n* envColor, s16 scale, s16 scaleStep) { + EffectSsDust_Spawn(globalCtx, 0, pos, velocity, accel, primColor, envColor, scale, scaleStep, 10, 1); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002857C.s") +// unused +void func_80028510(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, + Color_RGBA8_n* envColor, s16 scale, s16 scaleStep) { + EffectSsDust_Spawn(globalCtx, 1, pos, velocity, accel, primColor, envColor, scale, scaleStep, 10, 1); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800285EC.s") +void func_8002857C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { + EffectSsDust_Spawn(globalCtx, 4, pos, velocity, accel, &D_801158CC, &D_801158D0, 100, 5, 10, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002865C.s") +// unused +void func_800285EC(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { + EffectSsDust_Spawn(globalCtx, 5, pos, velocity, accel, &D_801158CC, &D_801158D0, 100, 5, 10, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800286CC.s") +void func_8002865C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep) { + EffectSsDust_Spawn(globalCtx, 4, pos, velocity, accel, &D_801158CC, &D_801158D0, scale, scaleStep, 10, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002873C.s") +void func_800286CC(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep) { + EffectSsDust_Spawn(globalCtx, 5, pos, velocity, accel, &D_801158CC, &D_801158D0, scale, scaleStep, 10, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800287AC.s") +void func_8002873C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, + s16 life) { + EffectSsDust_Spawn(globalCtx, 4, pos, velocity, accel, &D_801158CC, &D_801158D0, scale, scaleStep, life, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002881C.s") +void func_800287AC(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, + s16 life) { + EffectSsDust_Spawn(globalCtx, 5, pos, velocity, accel, &D_801158CC, &D_801158D0, scale, scaleStep, life, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028858.s") +void func_8002881C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, + Color_RGBA8_n* envColor) { + func_8002829C(globalCtx, pos, velocity, accel, primColor, envColor, 100, 5); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028894.s") +// unused +void func_80028858(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, + Color_RGBA8_n* envColor) { + func_80028304(globalCtx, pos, velocity, accel, primColor, envColor, 100, 5); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028990.s") +void func_80028894(Vec3f* srcPos, f32 randScale, Vec3f* newPos, Vec3f* velocity, Vec3f* accel) { + s16 randAngle; + f32 rand; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028A54.s") + rand = Math_Rand_ZeroOne() * randScale; + randAngle = (Math_Rand_ZeroOne() * 65536.0f); + + *newPos = *srcPos; + + newPos->x += Math_Sins(randAngle) * rand; + newPos->z += Math_Coss(randAngle) * rand; + + velocity->y = 1.0f; + velocity->x = Math_Sins(randAngle); + velocity->z = Math_Coss(randAngle); + + accel->x = 0.0f; + accel->y = 0.0f; + accel->z = 0.0f; +} + +void func_80028990(GlobalContext* globalCtx, f32 randScale, Vec3f* srcPos) { + s32 i; + Vec3f pos; + Vec3f velocity; + Vec3f accel; + + for (i = 0; i < 20; i++) { + func_80028894(srcPos, randScale, &pos, &velocity, &accel); + func_8002873C(globalCtx, &pos, &velocity, &accel, 100, 30, 7); + } +} + +void func_80028A54(GlobalContext* globalCtx, f32 randScale, Vec3f* srcPos) { + s32 i; + Vec3f pos; + Vec3f velocity; + Vec3f accel; + + for (i = 0; i < 20; i++) { + func_80028894(srcPos, randScale, &pos, &velocity, &accel); + func_800287AC(globalCtx, &pos, &velocity, &accel, 100, 30, 7); + } +} // EffectSsKiraKira Spawn Functions @@ -190,6 +295,8 @@ void EffectSsFhgFlash_Spawn2(GlobalContext* globalCtx, Actor* arg1, Vec3f* pos, #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029DBC.s") +// EffectSsSolderSrchBall Spawn Functions + void EffectSsSolderSrchBall_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 arg4, s16* linkDetected) { EffectSsSolderSrchBallInitParams initParams; diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index 482433525b..dba3c6abcf 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -1,15 +1,32 @@ +/* + * File: z_bg_heavy_block.c + * Overlay: ovl_Bg_Heavy_Block + * Description: Large block that can only be lifted with Golden Gauntlets + */ + #include "z_bg_heavy_block.h" +#include #define FLAGS 0x00000000 #define THIS ((BgHeavyBlock*)thisx) +#define PIECE_FLAG_HIT_FLOOR (1 << 0) + void BgHeavyBlock_Init(Actor* thisx, GlobalContext* globalCtx); void BgHeavyBlock_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgHeavyBlock_Update(Actor* thisx, GlobalContext* globalCtx); void BgHeavyBlock_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void BgHeavyBlock_DrawPiece(Actor* thisx, GlobalContext* globalCtx); + +void BgHeavyBlock_MovePiece(BgHeavyBlock* this, GlobalContext* globalCtx); +void BgHeavyBlock_Wait(BgHeavyBlock* this, GlobalContext* globalCtx); +void BgHeavyBlock_LiftedUp(BgHeavyBlock* this, GlobalContext* globalCtx); +void BgHeavyBlock_Fly(BgHeavyBlock* this, GlobalContext* globalCtx); +void BgHeavyBlock_Land(BgHeavyBlock* this, GlobalContext* globalCtx); +void BgHeavyBlock_DoNothing(BgHeavyBlock* this, GlobalContext* globalCtx); + const ActorInit Bg_Heavy_Block_InitVars = { ACTOR_BG_HEAVY_BLOCK, ACTORTYPE_BG, @@ -21,35 +38,497 @@ const ActorInit Bg_Heavy_Block_InitVars = { (ActorFunc)BgHeavyBlock_Update, (ActorFunc)BgHeavyBlock_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883790.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883820.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883998.s") +extern UNK_TYPE D_0600169C; +extern Gfx D_060013C0[]; +extern Gfx D_06001A30[]; +extern Gfx D_060018A0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Init.s") +void BgHeavyBlock_SetPieceRandRot(BgHeavyBlock* this, f32 scale) { + this->dyna.actor.posRot.rot.x = Math_Rand_CenteredFloat(1024.0f) * scale; + this->dyna.actor.posRot.rot.y = Math_Rand_CenteredFloat(1024.0f) * scale; + this->dyna.actor.posRot.rot.z = Math_Rand_CenteredFloat(1024.0f) * scale; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Destroy.s") +void BgHeavyBlock_InitPiece(BgHeavyBlock* this, f32 scale) { + f32 rand; + f32 yawSinCos; + f32 randChoice; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883C90.s") + this->dyna.actor.gravity = -0.6f; + this->dyna.actor.minVelocityY = -12.0f; + randChoice = Math_Rand_CenteredFloat(12.0f * scale); + rand = (randChoice < 0.0f) ? randChoice - 2.0f : randChoice + 2.0f; + this->dyna.actor.velocity.y = (Math_Rand_ZeroFloat(8.0f) + 4.0f) * scale; + this->dyna.actor.velocity.z = Math_Rand_ZeroFloat(-8.0f * scale); + yawSinCos = Math_Coss(this->dyna.actor.posRot.rot.y); + this->dyna.actor.velocity.x = + (Math_Sins(this->dyna.actor.posRot.rot.y) * this->dyna.actor.velocity.z + (yawSinCos * rand)); + yawSinCos = Math_Sins(this->dyna.actor.posRot.rot.y); + this->dyna.actor.velocity.z = + (Math_Coss(this->dyna.actor.posRot.rot.y) * this->dyna.actor.velocity.z) + (-yawSinCos * rand); + BgHeavyBlock_SetPieceRandRot(this, scale); + Actor_SetScale(&this->dyna.actor, Math_Rand_CenteredFloat(0.2f) + 1.0f); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883E54.s") +void BgHeavyBlock_SetupDynapoly(BgHeavyBlock* this, GlobalContext* globalCtx) { + s32 pad[2]; + UNK_TYPE a1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808841B8.s") + a1 = 0; + this->dyna.actor.flags |= 0x20030; + DynaPolyInfo_SetActorMove(&this->dyna, 0); + DynaPolyInfo_Alloc(&D_0600169C, &a1); + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, a1); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s") +void BgHeavyBlock_Init(Actor* thisx, GlobalContext* globalCtx) { + BgHeavyBlock* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808844D0.s") + Actor_ProcessInitChain(thisx, sInitChain); + ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f); + this->pieceFlags = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s") + if (globalCtx->sceneNum == SCENE_GANON_TOU) { + thisx->params &= 0xFF00; + thisx->params |= 4; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_8088496C.s") + switch (thisx->params & 0xFF) { + case HEAVYBLOCK_BIG_PIECE: + thisx->draw = BgHeavyBlock_DrawPiece; + this->actionFunc = BgHeavyBlock_MovePiece; + BgHeavyBlock_InitPiece(this, 1.0f); + this->timer = 120; + thisx->flags |= 0x10; + this->unk_164.y = -50.0f; + break; + case HEAVYBLOCK_SMALL_PIECE: + thisx->draw = BgHeavyBlock_DrawPiece; + this->actionFunc = BgHeavyBlock_MovePiece; + BgHeavyBlock_InitPiece(this, 2.0f); + this->timer = 120; + thisx->flags |= 0x10; + this->unk_164.y = -20.0f; + break; + case HEAVYBLOCK_BREAKABLE: + BgHeavyBlock_SetupDynapoly(this, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884978.s") + if (Flags_GetSwitch(globalCtx, (thisx->params >> 8) & 0x3F)) { + Actor_Kill(thisx); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Update.s") + this->actionFunc = BgHeavyBlock_Wait; + break; + case HEAVYBLOCK_UNBREAKABLE_OUTSIDE_CASTLE: + BgHeavyBlock_SetupDynapoly(this, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s") + if (Flags_GetSwitch(globalCtx, (thisx->params >> 8) & 0x3F)) { + this->actionFunc = BgHeavyBlock_DoNothing; + thisx->shape.rot.x = thisx->posRot.rot.x = 0x8AD0; + thisx->shape.rot.y = thisx->posRot.rot.y = 0xC000; + thisx->shape.rot.z = thisx->posRot.rot.z = 0x0; + thisx->posRot.pos.x = 1704.0f; + thisx->posRot.pos.y = 1504.0f; + thisx->posRot.pos.z = 516.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s") + this->actionFunc = BgHeavyBlock_Wait; + break; + case HEAVYBLOCK_UNBREAKABLE: + BgHeavyBlock_SetupDynapoly(this, globalCtx); + this->actionFunc = BgHeavyBlock_Wait; + break; + default: + BgHeavyBlock_SetupDynapoly(this, globalCtx); + this->actionFunc = BgHeavyBlock_Wait; + break; + } + // "Largest Block Save Bit %x" + osSyncPrintf(VT_FGCOL(CYAN) " 最大 ブロック セーブビット %x\n" VT_RST, thisx->params); +} + +void BgHeavyBlock_Destroy(Actor* thisx, GlobalContext* globalCtx) { + BgHeavyBlock* this = THIS; + switch (this->dyna.actor.params & 0xFF) { + case HEAVYBLOCK_BIG_PIECE: + break; + case HEAVYBLOCK_SMALL_PIECE: + break; + default: + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + } +} + +void BgHeavyBlock_MovePiece(BgHeavyBlock* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + + thisx->velocity.y += thisx->gravity; + + if (thisx->velocity.y < thisx->minVelocityY) { + thisx->velocity.y = thisx->minVelocityY; + } + + thisx->velocity.x *= 0.98f; + thisx->velocity.z *= 0.98f; + func_8002D7EC(thisx); + thisx->shape.rot.x += thisx->posRot.rot.x; + thisx->shape.rot.y += thisx->posRot.rot.y; + thisx->shape.rot.z += thisx->posRot.rot.z; + + if (!(this->pieceFlags & PIECE_FLAG_HIT_FLOOR)) { + thisx->posRot.pos.y += this->unk_164.y; + thisx->pos4.y += this->unk_164.y; + func_8002E4B4(globalCtx, thisx, 50.0f, 50.0f, 0.0f, 5); + thisx->posRot.pos.y -= this->unk_164.y; + thisx->pos4.y -= this->unk_164.y; + if (thisx->bgCheckFlags & 1) { + this->pieceFlags |= PIECE_FLAG_HIT_FLOOR; + thisx->velocity.y = Math_Rand_ZeroFloat(4.0f) + 2.0f; + thisx->velocity.x = Math_Rand_CenteredFloat(8.0f); + thisx->velocity.z = Math_Rand_CenteredFloat(8.0f); + BgHeavyBlock_SetPieceRandRot(this, 1.0f); + Audio_PlayActorSound2(thisx, NA_SE_EV_ROCK_BROKEN); + func_800AA000(thisx->xzDistFromLink, 0x96, 0xA, 8); + } + } + + if (this->timer > 0) { + this->timer--; + } else { + Actor_Kill(thisx); + } +} + +void BgHeavyBlock_SpawnDust(GlobalContext* globalCtx, f32 posX, f32 posY, f32 posZ, f32 velX, f32 velY, f32 velZ, + u8 dustParams) { + Color_RGBA8_n primColor; + Color_RGBA8_n envColor; + Vec3f eye; + Vec3f at; + s16 sp6E; + s16 sp6C; + Vec3f accel; + Vec3f velocity; + Vec3f pos; + f32 sp44; + s16 scaleStep; + s16 scale; + + pos.x = posX; + pos.y = posY; + pos.z = posZ; + + if (dustParams & 1) { + // red dust, landed in fire + primColor.r = 150; + primColor.g = primColor.b = envColor.g = envColor.b = 0; + envColor.r = 80; + primColor.a = envColor.a = 0; + } else { + // brown dust + // clang-format off + primColor.r = 170; primColor.g = 130; primColor.b = 90; primColor.a = 255; + envColor.r = 100; envColor.g = 60; envColor.b = 20; envColor.a = 255; + // clang-format on + } + + accel.z = 0.0f; + accel.x = 0.0f; + accel.y = (dustParams & 8) ? 0.0f : 0.5f; + + eye = ACTIVE_CAM->eye; + at = ACTIVE_CAM->at; + + scale = 1000; + scaleStep = 160; + + switch (dustParams & 6) { + case 4: + case 6: + velocity.x = velX; + velocity.y = velY; + velocity.z = velZ; + scale = 300; + scaleStep = 50; + break; + case 2: + sp44 = Math_Rand_ZeroFloat(5.0f) + 5.0f; + sp6E = Math_Rand_CenteredFloat(65280.0f); + + velocity.x = (Math_Sins(sp6E) * sp44) + velX; + velocity.y = velY; + velocity.z = (Math_Coss(sp6E) * sp44) + velZ; + break; + case 0: + sp6E = Math_Vec3f_Yaw(&eye, &at); + sp6C = -Math_Vec3f_Pitch(&eye, &at); + + velocity.x = ((5.0f * Math_Sins(sp6E)) * Math_Coss(sp6C)) + velX; + velocity.y = (Math_Sins(sp6C) * 5.0f) + velY; + velocity.z = ((5.0f * Math_Coss(sp6E)) * Math_Coss(sp6C)) + velZ; + + pos.x -= (velocity.x * 20.0f); + pos.y -= (velocity.y * 20.0f); + pos.z -= (velocity.z * 20.0f); + break; + } + + func_8002843C(globalCtx, &pos, &velocity, &accel, &primColor, &envColor, scale, scaleStep, + (s32)Math_Rand_ZeroFloat(10.0f) + 20); +} + +void BgHeavyBlock_SpawnPieces(BgHeavyBlock* this, GlobalContext* globalCtx) { + s32 i; + Vec3f spA4[] = { + { 0.0f, 300.0f, -20.0f }, { 50.0f, 200.0f, -20.0f }, { -50.0f, 200.0f, -20.0f }, + { 0.0f, 100.0f, 30.0f }, { 0.0f, 100.0f, -70.0f }, { 0.0f, 0.0f, -20.0f }, + }; + s32 pad; + Vec3f pos; + f32 sinPitch; + f32 cosPitch; + f32 sinYaw; + f32 cosYaw; + + sinPitch = Math_Sins(this->dyna.actor.posRot.rot.x); + cosPitch = Math_Coss(this->dyna.actor.posRot.rot.x); + sinYaw = Math_Sins(this->dyna.actor.posRot.rot.y); + cosYaw = Math_Coss(this->dyna.actor.posRot.rot.y); + + for (i = 0; i < ARRAY_COUNT(spA4); i++) { + pos.z = (spA4[i].y * sinPitch) + (spA4[i].z * cosPitch); + + pos.x = this->dyna.actor.posRot.pos.x + (spA4[i].x * cosYaw) + (sinYaw * pos.z); + pos.y = this->dyna.actor.posRot.pos.y + (spA4[i].y * cosPitch) + (-spA4[i].z * sinPitch); + pos.z = this->dyna.actor.posRot.pos.z + (spA4[i].x * -sinYaw) + (cosYaw * pos.z); + + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_BG_HEAVY_BLOCK, pos.x, pos.y, pos.z, + this->dyna.actor.shape.rot.x, this->dyna.actor.shape.rot.y, 0, 2); + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_BG_HEAVY_BLOCK, pos.x, pos.y, pos.z, + this->dyna.actor.shape.rot.x, this->dyna.actor.shape.rot.y, 0, 3); + + BgHeavyBlock_SpawnDust(globalCtx, pos.x, pos.y, pos.z, 0.0f, 0.0f, 0.0f, 0); + } +} + +void BgHeavyBlock_Wait(BgHeavyBlock* this, GlobalContext* globalCtx) { + s32 quakeIndex; + + // if attached A is set, start onepointdemo (cutscene) and quake + if (func_8002F410(&this->dyna.actor, globalCtx)) { + this->timer = 0; + + switch (this->dyna.actor.params & 0xFF) { + case HEAVYBLOCK_BREAKABLE: + func_800800F8(globalCtx, 0xFB4, 0x10E, &this->dyna.actor, 0); + break; + case HEAVYBLOCK_UNBREAKABLE: + func_800800F8(globalCtx, 0xFB5, 0xDC, &this->dyna.actor, 0); + break; + case HEAVYBLOCK_UNBREAKABLE_OUTSIDE_CASTLE: + func_800800F8(globalCtx, 0xFB6, 0xD2, &this->dyna.actor, 0); + break; + } + + quakeIndex = Quake_Add(ACTIVE_CAM, 3); + Quake_SetSpeed(quakeIndex, 25000); + Quake_SetQuakeValues(quakeIndex, 1, 1, 5, 0); + Quake_SetCountdown(quakeIndex, 10); + this->actionFunc = BgHeavyBlock_LiftedUp; + } +} + +void BgHeavyBlock_LiftedUp(BgHeavyBlock* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 pad; + f32 cosYaw; + f32 zOffset; + f32 sinYaw; + f32 xOffset; + + if (this->timer == 11) { + func_800AA000(0.0f, 0xFF, 0x14, 0x14); + func_8002F7DC(player, NA_SE_PL_PULL_UP_BIGROCK); + LOG_STRING("NA_SE_PL_PULL_UP_BIGROCK", "../z_bg_heavy_block.c", 691); + } + + if (this->timer < 40) { + xOffset = Math_Rand_CenteredFloat(110.0f); + sinYaw = Math_Sins(this->dyna.actor.shape.rot.y); + zOffset = Math_Rand_CenteredFloat(110.0f); + cosYaw = Math_Coss(this->dyna.actor.shape.rot.y); + + BgHeavyBlock_SpawnDust(globalCtx, (sinYaw * -70.0f) + (this->dyna.actor.posRot.pos.x + xOffset), + this->dyna.actor.posRot.pos.y + 10.0f, + (cosYaw * -70.0f) + (this->dyna.actor.posRot.pos.z + zOffset), 0.0f, -1.0f, 0.0f, 0xC); + } + + this->timer++; + + func_8002DF54(globalCtx, player, 8); + + // if attachedA is NULL, link threw it + if (func_8002F5A0(&this->dyna.actor, globalCtx)) { + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_HEAVY_THROW); + this->actionFunc = BgHeavyBlock_Fly; + } +} + +void BgHeavyBlock_Fly(BgHeavyBlock* this, GlobalContext* globalCtx) { + UNK_PTR arg2; + s32 quakeIndex; + Vec3f pos; + f32 raycastResult; + + Actor_MoveForward(&this->dyna.actor); + pos.x = this->dyna.actor.initPosRot.pos.x; + pos.y = this->dyna.actor.initPosRot.pos.y + 1000.0f; + pos.z = this->dyna.actor.initPosRot.pos.z; + raycastResult = func_8003C9A4(&globalCtx->colCtx, &this->dyna.actor.floorPoly, &arg2, &this->dyna.actor, &pos); + this->dyna.actor.groundY = raycastResult; + + if (this->dyna.actor.initPosRot.pos.y <= raycastResult) { + func_800AA000(0.0f, 0xFF, 0x3C, 4); + + switch (this->dyna.actor.params & 0xFF) { + case HEAVYBLOCK_BREAKABLE: + BgHeavyBlock_SpawnPieces(this, globalCtx); + Flags_SetSwitch(globalCtx, (this->dyna.actor.params >> 8) & 0x3F); + Actor_Kill(&this->dyna.actor); + + quakeIndex = Quake_Add(ACTIVE_CAM, 3); + Quake_SetSpeed(quakeIndex, 28000); + Quake_SetQuakeValues(quakeIndex, 14, 2, 100, 0); + Quake_SetCountdown(quakeIndex, 30); + + quakeIndex = Quake_Add(ACTIVE_CAM, 2); + Quake_SetSpeed(quakeIndex, 12000); + Quake_SetQuakeValues(quakeIndex, 5, 0, 0, 0); + Quake_SetCountdown(quakeIndex, 999); + + Audio_PlaySoundAtPosition(globalCtx, &this->dyna.actor.posRot.pos, 30, NA_SE_EV_ELECTRIC_EXPLOSION); + return; + case HEAVYBLOCK_UNBREAKABLE_OUTSIDE_CASTLE: + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONE_BOUND); + + quakeIndex = Quake_Add(ACTIVE_CAM, 3); + Quake_SetSpeed(quakeIndex, 28000); + Quake_SetQuakeValues(quakeIndex, 16, 2, 120, 0); + Quake_SetCountdown(quakeIndex, 40); + + this->actionFunc = BgHeavyBlock_Land; + Flags_SetSwitch(globalCtx, (this->dyna.actor.params >> 8) & 0x3F); + break; + case HEAVYBLOCK_UNBREAKABLE: + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_U); + + quakeIndex = Quake_Add(ACTIVE_CAM, 3); + Quake_SetSpeed(quakeIndex, 28000); + Quake_SetQuakeValues(quakeIndex, 14, 2, 100, 0); + Quake_SetCountdown(quakeIndex, 40); + + this->actionFunc = BgHeavyBlock_Land; + break; + default: + quakeIndex = Quake_Add(ACTIVE_CAM, 3); + Quake_SetSpeed(quakeIndex, 28000); + Quake_SetQuakeValues(quakeIndex, 14, 2, 100, 0); + Quake_SetCountdown(quakeIndex, 40); + + this->actionFunc = BgHeavyBlock_Land; + } + } + this->dyna.actor.shape.rot.x = atan2s(this->dyna.actor.velocity.y, this->dyna.actor.speedXZ); +} + +void BgHeavyBlock_DoNothing(BgHeavyBlock* this, GlobalContext* globalCtx) { +} + +void BgHeavyBlock_Land(BgHeavyBlock* this, GlobalContext* globalCtx) { + s32 pad; + + if (Math_SmoothScaleMaxMinS(&this->dyna.actor.shape.rot.x, 0x8AD0, 6, 2000, 100) != 0) { + Math_ApproxF(&this->dyna.actor.speedXZ, 0.0f, 20.0f); + Math_ApproxF(&this->dyna.actor.velocity.y, 0.0f, 3.0f); + this->dyna.actor.gravity = 0.0f; + this->dyna.actor.posRot.pos = this->dyna.actor.initPosRot.pos; + Actor_MoveForward(&this->dyna.actor); + this->dyna.actor.initPosRot.pos = this->dyna.actor.posRot.pos; + switch (this->dyna.actor.params & 0xFF) { + case HEAVYBLOCK_UNBREAKABLE_OUTSIDE_CASTLE: + BgHeavyBlock_SpawnDust(globalCtx, Math_Rand_CenteredFloat(30.0f) + 1678.0f, + Math_Rand_ZeroFloat(100.0f) + 1286.0f, Math_Rand_CenteredFloat(30.0f) + 552.0f, + 0.0f, 0.0f, 0.0f, 0); + BgHeavyBlock_SpawnDust(globalCtx, Math_Rand_CenteredFloat(30.0f) + 1729.0f, + Math_Rand_ZeroFloat(80.0f) + 1269.0f, Math_Rand_CenteredFloat(30.0f) + 600.0f, + 0.0f, 0.0f, 0.0f, 0); + break; + case HEAVYBLOCK_UNBREAKABLE: + BgHeavyBlock_SpawnDust(globalCtx, Math_Rand_CenteredFloat(100.0f) + -735.0f, 29.0f, + Math_Rand_CenteredFloat(100.0f) + -3418.0f, 0.0f, 0.0f, 0.0f, 3); + break; + } + } else { + this->dyna.actor.flags &= ~0x30; + this->actionFunc = BgHeavyBlock_DoNothing; + } +} + +void BgHeavyBlock_Update(Actor* thisx, GlobalContext* globalCtx) { + BgHeavyBlock* this = THIS; + + this->actionFunc(this, globalCtx); +} + +void BgHeavyBlock_Draw(Actor* thisx, GlobalContext* globalCtx) { + static Vec3f D_80884EC8 = { 0.0f, 0.0f, 0.0f }; + static Vec3f D_80884ED4 = { 0.0f, 400.0f, 0.0f }; + BgHeavyBlock* this = THIS; + s32 pad; + Player* player = PLAYER; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_heavy_block.c", 904); + + if (BgHeavyBlock_LiftedUp == this->actionFunc) { + func_800D1694(player->unk_3B0.x, player->unk_3B0.y, player->unk_3B0.z, &thisx->shape.rot); + Matrix_Translate(-this->unk_164.x, -this->unk_164.y, -this->unk_164.z, MTXMODE_APPLY); + } else if ((thisx->gravity == 0.0f) && (BgHeavyBlock_Land == this->actionFunc)) { + func_800D1694(thisx->initPosRot.pos.x, thisx->initPosRot.pos.y, thisx->initPosRot.pos.z, &thisx->shape.rot); + Matrix_Translate(-D_80884ED4.x, -D_80884ED4.y, -D_80884ED4.z, MTXMODE_APPLY); + } + + Matrix_MultVec3f(&D_80884EC8, &thisx->posRot); + Matrix_MultVec3f(&D_80884ED4, &thisx->initPosRot); + func_80093D18(globalCtx->state.gfxCtx); + + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_heavy_block.c", 931), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyOpa.p++, D_060013C0); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_heavy_block.c", 935); +} + +void BgHeavyBlock_DrawPiece(Actor* thisx, GlobalContext* globalCtx) { + switch (thisx->params & 0xFF) { + case HEAVYBLOCK_BIG_PIECE: + Matrix_Translate(50.0f, -260.0f, -20.0f, MTXMODE_APPLY); + Gfx_DrawDListOpa(globalCtx, D_060018A0); + break; + case HEAVYBLOCK_SMALL_PIECE: + Matrix_Translate(45.0f, -280.0f, -5.0f, MTXMODE_APPLY); + Gfx_DrawDListOpa(globalCtx, D_06001A30); + break; + } +} diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h index 179c48b5e5..1dbdde6338 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h @@ -6,11 +6,24 @@ struct BgHeavyBlock; +typedef void (*BgHeavyBlockActionFunc)(struct BgHeavyBlock*, GlobalContext*); + typedef struct BgHeavyBlock { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x2C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ Vec3f unk_164; + /* 0x0170 */ s16 timer; + /* 0x0172 */ u16 pieceFlags; + /* 0x0174 */ BgHeavyBlockActionFunc actionFunc; } BgHeavyBlock; // size = 0x0178 +typedef enum { + /* 0x00 */ HEAVYBLOCK_UNBREAKABLE, + /* 0x01 */ HEAVYBLOCK_BREAKABLE, + /* 0x02 */ HEAVYBLOCK_BIG_PIECE, + /* 0x03 */ HEAVYBLOCK_SMALL_PIECE, + /* 0x04 */ HEAVYBLOCK_UNBREAKABLE_OUTSIDE_CASTLE +} HeavyBlockType; + extern const ActorInit Bg_Heavy_Block_InitVars; #endif diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index d1f34f64e9..bc7db716f3 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -22,6 +22,7 @@ const ActorInit Eff_Dust_InitVars = { (ActorFunc)EffDust_Draw, }; */ + #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D0.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D8.s") diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index e4bce5c726..21ead1029d 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -13,7 +13,6 @@ #define SPAWN_INVISIBLE 0x8000 #define SPAWN_SMALL 0x10 -// Merge params #define MERGE_MASTER 0x40 #define MERGE_SLAVE 0x20 @@ -77,38 +76,10 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32_DIV1000(gravity, 0xFC18, ICHAIN_STOP), }; -static Vec3f D_80A1A4D0 = { - 0.0f, - 0.0f, - 0.0f, -}; - -static Vec3f D_80A1A4DC = { - 0.0f, - 0.0f, - 0.0f, -}; - -static Vec3f sDustPos = { - 0.0f, - 0.0f, - 0.0f, -}; - -static Color_RGBA8 sMergeColor = { - 0, - 255, - 0, - 0, -}; - -// display lists extern Gfx D_06008688[]; -// skeleton extern SkeletonHeader D_06008FB0; -// animations extern AnimationHeader D_06009DB0; extern AnimationHeader D_060039B0; extern AnimationHeader D_06000EA4; @@ -314,6 +285,8 @@ void EnFloormas_SetupSmDecideAction(EnFloormas* this) { } void EnFloormas_SetupSmShrink(EnFloormas* this, GlobalContext* globalCtx) { + static Vec3f D_80A1A4D0 = { 0.0f, 0.0f, 0.0f }; + static Vec3f D_80A1A4DC = { 0.0f, 0.0f, 0.0f }; Vec3f pos; this->actor.speedXZ = 0.0f; @@ -558,25 +531,24 @@ void EnFloormas_Hover(EnFloormas* this, GlobalContext* globalCtx) { } void EnFloormas_Slide(EnFloormas* this, GlobalContext* globalCtx) { + static Vec3f accel = { 0.0f, 0.0f, 0.0f }; Vec3f pos; - Vec3f pos2; + Vec3f velocity; pos.x = this->actor.posRot.pos.x; pos.z = this->actor.posRot.pos.z; pos.y = this->actor.groundY; - pos2.y = 2.0f; - pos2.x = Math_Sins(this->actor.shape.rot.y + 0x6000) * 7.0f; - pos2.z = Math_Coss(this->actor.shape.rot.y + 0x6000) * 7.0f; + velocity.y = 2.0f; + velocity.x = Math_Sins(this->actor.shape.rot.y + 0x6000) * 7.0f; + velocity.z = Math_Coss(this->actor.shape.rot.y + 0x6000) * 7.0f; - // create dust particle - func_800286CC(globalCtx, &pos, &pos2, &sDustPos, 0x1C2, 0x64); + func_800286CC(globalCtx, &pos, &velocity, &accel, 450, 100); - pos2.x = Math_Sins(this->actor.shape.rot.y - 0x6000) * 7.0f; - pos2.z = Math_Coss(this->actor.shape.rot.y - 0x6000) * 7.0f; + velocity.x = Math_Sins(this->actor.shape.rot.y - 0x6000) * 7.0f; + velocity.z = Math_Coss(this->actor.shape.rot.y - 0x6000) * 7.0f; - // create dust particle - func_800286CC(globalCtx, &pos, &pos2, &sDustPos, 0x1C2, 0x64); + func_800286CC(globalCtx, &pos, &velocity, &accel, 450, 100); func_8002F974(this, NA_SE_EN_FLOORMASTER_SLIDING); } @@ -1099,6 +1071,8 @@ void EnFloormas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis } } +static Color_RGBA8 sMergeColor = { 0x00, 0xFF, 0x00, 0x00 }; + void EnFloormas_Draw(Actor* thisx, GlobalContext* globalCtx) { EnFloormas* this = THIS; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; 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 bc871a32ed..b036a525b0 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -76,8 +76,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32_DIV1000(gravity, 0xFA24, 0), }; -static Vec3f D_80B30D70 = { 0.0f, 0.0f, 0.0f }; - extern AnimationHeader D_06000EA4; extern AnimationHeader D_06000590; extern AnimationHeader D_0600299C; @@ -217,6 +215,7 @@ void EnWallmas_SetupCooldown(EnWallmas* this) { } void EnWallmas_SetupDie(EnWallmas* this, GlobalContext* globalCtx) { + static Vec3f D_80B30D70 = { 0.0f, 0.0f, 0.0f }; this->actor.speedXZ = 0.0f; this->actor.velocity.y = 0.0f; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c index 497360c137..e570a4fe66 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c @@ -1,10 +1,197 @@ -#include -#include +/* + * File: z_eff_ss_dust.c + * Overlay: ovl_Effect_Ss_Dust + * Description: Dust Particle Effect + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A22D0.s") +#include "z_eff_ss_dust.h" -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s") +typedef enum { + /* 0x00 */ SS_DUST_PRIM_R, + /* 0x01 */ SS_DUST_PRIM_G, + /* 0x02 */ SS_DUST_PRIM_B, + /* 0x03 */ SS_DUST_PRIM_A, + /* 0x04 */ SS_DUST_ENV_R, + /* 0x05 */ SS_DUST_ENV_G, + /* 0x06 */ SS_DUST_ENV_B, + /* 0x07 */ SS_DUST_ENV_A, + /* 0x08 */ SS_DUST_TEX_IDX, // this reg is also used to set specific colors in the fire update function + /* 0x09 */ SS_DUST_SCALE, + /* 0x0A */ SS_DUST_SCALE_STEP, + /* 0x0B */ SS_DUST_DRAW_FLAGS, + /* 0x0C */ SS_DUST_LIFE_START +} EffectSsDustRegs; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s") +u32 EffectSsDust_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsDust_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsBlast_UpdateFire(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsDust_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s") +EffectSsInit Effect_Ss_Dust_InitVars = { + EFFECT_SS_DUST, + EffectSsDust_Init, +}; + +static void* sUpdateFuncs[] = { EffectSsDust_Update, EffectSsBlast_UpdateFire }; + +UNK_PTR D_809A2A50[] = { + 0x04051DB0, 0x040521B0, 0x040525B0, 0x040529B0, 0x04052DB0, 0x040531B0, 0x040535B0, 0x040539B0 +}; + +extern Gfx D_04010050[]; + +u32 EffectSsDust_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + s32 randColorOffset; + EffectSsDustInitParams* initParams = (EffectSsDustInitParams*)initParamsx; + + Math_Vec3f_Copy(&this->pos, &initParams->pos); + Math_Vec3f_Copy(&this->velocity, &initParams->velocity); + Math_Vec3f_Copy(&this->accel, &initParams->accel); + this->unk_38 = SEGMENTED_TO_VIRTUAL(&D_04010050); + this->life = initParams->life; + this->update = sUpdateFuncs[initParams->updateMode]; + this->draw = EffectSsDust_Draw; + + if (initParams->drawFlags & 4) { + randColorOffset = Math_Rand_ZeroOne() * 20.0f - 10.0f; + this->regs[SS_DUST_PRIM_R] = initParams->primColor.r + randColorOffset; + this->regs[SS_DUST_PRIM_G] = initParams->primColor.g + randColorOffset; + this->regs[SS_DUST_PRIM_B] = initParams->primColor.b + randColorOffset; + this->regs[SS_DUST_ENV_R] = initParams->envColor.r + randColorOffset; + this->regs[SS_DUST_ENV_G] = initParams->envColor.g + randColorOffset; + this->regs[SS_DUST_ENV_B] = initParams->envColor.b + randColorOffset; + } else { + this->regs[SS_DUST_PRIM_R] = initParams->primColor.r; + this->regs[SS_DUST_PRIM_G] = initParams->primColor.g; + this->regs[SS_DUST_PRIM_B] = initParams->primColor.b; + this->regs[SS_DUST_ENV_R] = initParams->envColor.r; + this->regs[SS_DUST_ENV_G] = initParams->envColor.g; + this->regs[SS_DUST_ENV_B] = initParams->envColor.b; + } + + this->regs[SS_DUST_PRIM_A] = initParams->primColor.a; + this->regs[SS_DUST_ENV_A] = initParams->envColor.a; + this->regs[SS_DUST_TEX_IDX] = 0; + this->regs[SS_DUST_SCALE] = initParams->scale; + this->regs[SS_DUST_SCALE_STEP] = initParams->scaleStep; + this->regs[SS_DUST_LIFE_START] = initParams->life; + this->regs[SS_DUST_DRAW_FLAGS] = initParams->drawFlags; + + return 1; +} + +void EffectSsDust_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + s32 pad; + MtxF sp144; + MtxF sp104; + MtxF spC4; + MtxF sp84; + s32 pad1; + Mtx* mtx; + f32 scale; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, gfxCtx, "../z_eff_ss_dust.c", 321); + + scale = this->regs[SS_DUST_SCALE] * 0.0025f; + + func_800A7A24(&sp144, this->pos.x, this->pos.y, this->pos.z); + func_800A76A4(&sp104, scale, scale, 1.0f); + func_800A6FA0(&sp144, &globalCtx->mf_11DA0, &sp84); + func_800A6FA0(&sp84, &sp104, &spC4); + + gSPMatrix(gfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + mtx = func_800A7E70(gfxCtx, &spC4); + + if (mtx != NULL) { + gSPMatrix(gfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPPipeSync(gfxCtx->polyXlu.p++); + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_809A2A50[this->regs[SS_DUST_TEX_IDX]])); + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0); + gDPPipeSync(gfxCtx->polyXlu.p++); + + if (this->regs[SS_DUST_DRAW_FLAGS] & 1) { + gDPSetCombineLERP(gfxCtx->polyXlu.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, + COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED); + gDPSetRenderMode(gfxCtx->polyXlu.p++, G_RM_FOG_SHADE_A, G_RM_ZB_CLD_SURF2); + gSPSetGeometryMode(gfxCtx->polyXlu.p++, G_FOG | G_LIGHTING); + } else if (this->regs[SS_DUST_DRAW_FLAGS] & 2) { + gDPSetRenderMode(gfxCtx->polyXlu.p++, G_RM_PASS, G_RM_ZB_CLD_SURF2); + gSPClearGeometryMode(gfxCtx->polyXlu.p++, G_FOG | G_LIGHTING); + } else { + gSPClearGeometryMode(gfxCtx->polyXlu.p++, G_LIGHTING); + } + + gDPPipeSync(gfxCtx->polyXlu.p++); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, this->regs[SS_DUST_PRIM_R], this->regs[SS_DUST_PRIM_G], + this->regs[SS_DUST_PRIM_B], 255); + gDPSetEnvColor(gfxCtx->polyXlu.p++, this->regs[SS_DUST_ENV_R], this->regs[SS_DUST_ENV_G], + this->regs[SS_DUST_ENV_B], this->regs[SS_DUST_ENV_A]); + gSPDisplayList(gfxCtx->polyXlu.p++, this->unk_38); + } + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_eff_ss_dust.c", 389); +} + +void EffectSsDust_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + this->accel.x = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; + this->accel.z = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; + + if ((this->regs[SS_DUST_LIFE_START] >= this->life) && (this->life >= (this->regs[SS_DUST_LIFE_START] - 7))) { + if (this->regs[SS_DUST_LIFE_START] >= 5) { + this->regs[SS_DUST_TEX_IDX] = this->regs[SS_DUST_LIFE_START] - this->life; + } else { + this->regs[SS_DUST_TEX_IDX] = + ((this->regs[SS_DUST_LIFE_START] - this->life) * (8 / this->regs[SS_DUST_LIFE_START])); + } + } else { + this->regs[SS_DUST_TEX_IDX] = 7; + } + this->regs[SS_DUST_SCALE] += this->regs[SS_DUST_SCALE_STEP]; +} + +// this update mode is unused in the original game +void EffectSsBlast_UpdateFire(GlobalContext* globalCtx, u32 index, EffectSs* this) { + this->accel.x = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; + this->accel.z = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; + + switch (this->regs[SS_DUST_TEX_IDX]) { + case 0: + this->regs[SS_DUST_PRIM_R] = 255; + this->regs[SS_DUST_PRIM_G] = 150; + this->regs[SS_DUST_PRIM_B] = 0; + this->regs[SS_DUST_ENV_R] = 150; + this->regs[SS_DUST_ENV_G] = 50; + this->regs[SS_DUST_ENV_B] = 0; + break; + case 1: + this->regs[SS_DUST_PRIM_R] = 200; + this->regs[SS_DUST_PRIM_G] = 50; + this->regs[SS_DUST_PRIM_B] = 0; + this->regs[SS_DUST_ENV_R] = 100; + this->regs[SS_DUST_ENV_G] = 0; + this->regs[SS_DUST_ENV_B] = 0; + break; + case 2: + this->regs[SS_DUST_PRIM_R] = 50; + this->regs[SS_DUST_PRIM_G] = 0; + this->regs[SS_DUST_PRIM_B] = 0; + this->regs[SS_DUST_ENV_R] = 0; + this->regs[SS_DUST_ENV_G] = 0; + this->regs[SS_DUST_ENV_B] = 0; + break; + case 3: + this->regs[SS_DUST_PRIM_R] = 50; + this->regs[SS_DUST_ENV_R] = this->regs[SS_DUST_PRIM_G] = this->regs[SS_DUST_ENV_G] = + this->regs[SS_DUST_PRIM_B] = this->regs[SS_DUST_ENV_B] = 0; + break; + } + + if (this->regs[SS_DUST_TEX_IDX] < 7) { + this->regs[SS_DUST_TEX_IDX]++; + } + + this->regs[SS_DUST_SCALE] += this->regs[SS_DUST_SCALE_STEP]; +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h new file mode 100644 index 0000000000..56ebf3d8ce --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h @@ -0,0 +1,20 @@ +#ifndef _Z_EFF_SS_DUST_H_ +#define _Z_EFF_SS_DUST_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; + /* 0x24 */ Color_RGBA8_n primColor; + /* 0x28 */ Color_RGBA8_n envColor; + /* 0x2C */ s16 scale; + /* 0x2E */ s16 scaleStep; + /* 0x30 */ s16 life; + /* 0x32 */ u16 drawFlags; + /* 0x34 */ u8 updateMode; +} EffectSsDustInitParams; // size = 0x38 + +#endif diff --git a/undefined_syms.txt b/undefined_syms.txt index e209f706ae..8b82250dfb 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -619,6 +619,12 @@ D_060067B8 = 0x060067B8; D_060076EC = 0x060076EC; D_060070F0 = 0x060070F0; +// z_bg_heavy_block +D_0600169C = 0x0600169C; +D_060013C0 = 0x060013C0; +D_06001A30 = 0x06001A30; +D_060018A0 = 0x060018A0; + // z_en_heishi2 D_06005C30 = 0x06005C30; D_06005500 = 0x06005500; @@ -704,6 +710,9 @@ D_06005880 = 0x06005880; D_06005C30 = 0x06005C30; D_0600BAC8 = 0x0600BAC8; +// z_eff_ss_dust +D_04010050 = 0x04010050; + // z_Bg_Spot16_Doughnut D_06000660 = 0x06000660; D_06000FC0 = 0x06000FC0;