From 8f80240c8ec8b466b92f0621d257dd56eb64e016 Mon Sep 17 00:00:00 2001 From: angie Date: Wed, 27 Jan 2021 23:33:23 -0300 Subject: [PATCH] func_80978B90 Signed-off-by: angie --- .../actors/ovl_Demo_Gj/func_80978B90.s | 40 ------------------- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 22 +++++----- 2 files changed, 9 insertions(+), 53 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978B90.s diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978B90.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978B90.s deleted file mode 100644 index bc623543eb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978B90.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80978B90 -/* 00260 80978B90 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00264 80978B94 AFBF002C */ sw $ra, 0x002C($sp) -/* 00268 80978B98 AFB40028 */ sw $s4, 0x0028($sp) -/* 0026C 80978B9C 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 00270 80978BA0 AFB30024 */ sw $s3, 0x0024($sp) -/* 00274 80978BA4 AFB20020 */ sw $s2, 0x0020($sp) -/* 00278 80978BA8 AFB1001C */ sw $s1, 0x001C($sp) -/* 0027C 80978BAC AFB00018 */ sw $s0, 0x0018($sp) -/* 00280 80978BB0 0C25E24C */ jal func_80978930 -/* 00284 80978BB4 AFA40030 */ sw $a0, 0x0030($sp) -/* 00288 80978BB8 00029400 */ sll $s2, $v0, 16 -/* 0028C 80978BBC 00129403 */ sra $s2, $s2, 16 -/* 00290 80978BC0 0C25E250 */ jal func_80978940 -/* 00294 80978BC4 8FA40030 */ lw $a0, 0x0030($sp) -/* 00298 80978BC8 00409825 */ or $s3, $v0, $zero ## $s3 = 00000000 -/* 0029C 80978BCC 1840000C */ blez $v0, .L80978C00 -/* 002A0 80978BD0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 002A4 80978BD4 8FB10030 */ lw $s1, 0x0030($sp) -/* 002A8 80978BD8 26310024 */ addiu $s1, $s1, 0x0024 ## $s1 = 00000024 -/* 002AC 80978BDC 00123400 */ sll $a2, $s2, 16 -.L80978BE0: -/* 002B0 80978BE0 00063403 */ sra $a2, $a2, 16 -/* 002B4 80978BE4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 002B8 80978BE8 0C007D52 */ jal Item_DropCollectible - -/* 002BC 80978BEC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000024 -/* 002C0 80978BF0 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 002C4 80978BF4 0213082A */ slt $at, $s0, $s3 -/* 002C8 80978BF8 5420FFF9 */ bnel $at, $zero, .L80978BE0 -/* 002CC 80978BFC 00123400 */ sll $a2, $s2, 16 -.L80978C00: -/* 002D0 80978C00 8FBF002C */ lw $ra, 0x002C($sp) -/* 002D4 80978C04 8FB00018 */ lw $s0, 0x0018($sp) -/* 002D8 80978C08 8FB1001C */ lw $s1, 0x001C($sp) -/* 002DC 80978C0C 8FB20020 */ lw $s2, 0x0020($sp) -/* 002E0 80978C10 8FB30024 */ lw $s3, 0x0024($sp) -/* 002E4 80978C14 8FB40028 */ lw $s4, 0x0028($sp) -/* 002E8 80978C18 03E00008 */ jr $ra -/* 002EC 80978C1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index b21166bffc..9e70319562 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -338,25 +338,21 @@ void func_80978AFC(GlobalContext *globalCtx, Vec3f *pos, f32 arg2) { ); } -void func_80978B90(DemoGj* this, GlobalContext* globalCtx); -#ifdef NON_MATCHING -// register usage doesn't match. -void func_80978B90(DemoGj* this, GlobalContext* globalCtx) { - s32 temp_v0; - s16 temp_s2; +void func_80978B90(DemoGj *this, GlobalContext *globalCtx) { + Vec3f* pos = &this->dyna.actor.world.pos; + + s16 collectible; + s32 amount; s32 i; - temp_s2 = func_80978930(this); - temp_v0 = func_80978940(this); + collectible = func_80978930(this); + amount = func_80978940(this); - for (i = 0; i < temp_v0; i++) { - Item_DropCollectible(globalCtx, &this->dyna.actor.world.pos, temp_s2); + for (i = 0; i < amount; i++) { + Item_DropCollectible(globalCtx, pos, collectible); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978B90.s") -#endif void func_80978C20(DemoGj *this, GlobalContext *globalCtx, Vec3f *arg2, Vec3f *arg3) { Vec3f pos;