diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Destroy.s deleted file mode 100644 index 6944faccb1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Destroy.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel ObjBean_Destroy -/* 01254 80B8FCD4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01258 80B8FCD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0125C 80B8FCDC AFA5001C */ sw $a1, 0x001C($sp) -/* 01260 80B8FCE0 908201F7 */ lbu $v0, 0x01F7($a0) ## 000001F7 -/* 01264 80B8FCE4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01268 80B8FCE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0126C 80B8FCEC 304E0020 */ andi $t6, $v0, 0x0020 ## $t6 = 00000000 -/* 01270 80B8FCF0 11C00006 */ beq $t6, $zero, .L80B8FD0C -/* 01274 80B8FCF4 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 01278 80B8FCF8 8CE6014C */ lw $a2, 0x014C($a3) ## 0000014C -/* 0127C 80B8FCFC 0C00FB56 */ jal DynaPoly_DeleteBgActor - ## DynaPoly_DeleteBgActor -/* 01280 80B8FD00 AFA70018 */ sw $a3, 0x0018($sp) -/* 01284 80B8FD04 8FA70018 */ lw $a3, 0x0018($sp) -/* 01288 80B8FD08 90E201F7 */ lbu $v0, 0x01F7($a3) ## 000001F7 -.L80B8FD0C: -/* 0128C 80B8FD0C 30580010 */ andi $t8, $v0, 0x0010 ## $t8 = 00000000 -/* 01290 80B8FD10 13000005 */ beq $t8, $zero, .L80B8FD28 -/* 01294 80B8FD14 8FA4001C */ lw $a0, 0x001C($sp) -/* 01298 80B8FD18 24E50168 */ addiu $a1, $a3, 0x0168 ## $a1 = 00000168 -/* 0129C 80B8FD1C 0C0170EB */ jal Collider_DestroyCylinder - -/* 012A0 80B8FD20 AFA70018 */ sw $a3, 0x0018($sp) -/* 012A4 80B8FD24 8FA70018 */ lw $a3, 0x0018($sp) -.L80B8FD28: -/* 012A8 80B8FD28 3C0280B9 */ lui $v0, %hi(D_80B90E30) ## $v0 = 80B90000 -/* 012AC 80B8FD2C 24420E30 */ addiu $v0, $v0, %lo(D_80B90E30) ## $v0 = 80B90E30 -/* 012B0 80B8FD30 8C590000 */ lw $t9, 0x0000($v0) ## 80B90E30 -/* 012B4 80B8FD34 54F90003 */ bnel $a3, $t9, .L80B8FD44 -/* 012B8 80B8FD38 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012BC 80B8FD3C AC400000 */ sw $zero, 0x0000($v0) ## 80B90E30 -/* 012C0 80B8FD40 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B8FD44: -/* 012C4 80B8FD44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012C8 80B8FD48 03E00008 */ jr $ra -/* 012CC 80B8FD4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s deleted file mode 100644 index f088c82afc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel ObjBean_Draw -/* 02310 80B90D90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02314 80B90D94 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02318 80B90D98 AFA5001C */ sw $a1, 0x001C($sp) -/* 0231C 80B90D9C 908201F7 */ lbu $v0, 0x01F7($a0) ## 000001F7 -/* 02320 80B90DA0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02324 80B90DA4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02328 80B90DA8 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 0232C 80B90DAC 11C00006 */ beq $t6, $zero, .L80B90DC8 -/* 02330 80B90DB0 3C050600 */ lui $a1, %hi(D_06000090) ## $a1 = 06000000 -/* 02334 80B90DB4 24A50090 */ addiu $a1, $a1, %lo(D_06000090) ## $a1 = 06000090 -/* 02338 80B90DB8 0C00D498 */ jal Gfx_DrawDListOpa - -/* 0233C 80B90DBC AFA60018 */ sw $a2, 0x0018($sp) -/* 02340 80B90DC0 8FA60018 */ lw $a2, 0x0018($sp) -/* 02344 80B90DC4 90C201F7 */ lbu $v0, 0x01F7($a2) ## 000001F7 -.L80B90DC8: -/* 02348 80B90DC8 304F0004 */ andi $t7, $v0, 0x0004 ## $t7 = 00000000 -/* 0234C 80B90DCC 11E00007 */ beq $t7, $zero, .L80B90DEC -/* 02350 80B90DD0 8FA4001C */ lw $a0, 0x001C($sp) -/* 02354 80B90DD4 3C050600 */ lui $a1, %hi(D_060003F0) ## $a1 = 06000000 -/* 02358 80B90DD8 24A503F0 */ addiu $a1, $a1, %lo(D_060003F0) ## $a1 = 060003F0 -/* 0235C 80B90DDC 0C00D498 */ jal Gfx_DrawDListOpa - -/* 02360 80B90DE0 AFA60018 */ sw $a2, 0x0018($sp) -/* 02364 80B90DE4 8FA60018 */ lw $a2, 0x0018($sp) -/* 02368 80B90DE8 90C201F7 */ lbu $v0, 0x01F7($a2) ## 000001F7 -.L80B90DEC: -/* 0236C 80B90DEC 30580001 */ andi $t8, $v0, 0x0001 ## $t8 = 00000000 -/* 02370 80B90DF0 13000006 */ beq $t8, $zero, .L80B90E0C -/* 02374 80B90DF4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02378 80B90DF8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0237C 80B90DFC 0C2E431F */ jal func_80B90C7C -/* 02380 80B90E00 AFA60018 */ sw $a2, 0x0018($sp) -/* 02384 80B90E04 8FA60018 */ lw $a2, 0x0018($sp) -/* 02388 80B90E08 90C201F7 */ lbu $v0, 0x01F7($a2) ## 000001F7 -.L80B90E0C: -/* 0238C 80B90E0C 30590008 */ andi $t9, $v0, 0x0008 ## $t9 = 00000000 -/* 02390 80B90E10 13200003 */ beq $t9, $zero, .L80B90E20 -/* 02394 80B90E14 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02398 80B90E18 0C2E4341 */ jal func_80B90D04 -/* 0239C 80B90E1C 8FA5001C */ lw $a1, 0x001C($sp) -.L80B90E20: -/* 023A0 80B90E20 8FBF0014 */ lw $ra, 0x0014($sp) -/* 023A4 80B90E24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 023A8 80B90E28 03E00008 */ jr $ra -/* 023AC 80B90E2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_FollowPath.s similarity index 98% rename from asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s rename to asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_FollowPath.s index d6fa603cf7..90112c462c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_FollowPath.s @@ -1,12 +1,12 @@ -glabel func_80B8EFF4 +glabel ObjBean_FollowPath /* 00574 80B8EFF4 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00578 80B8EFF8 AFB00018 */ sw $s0, 0x0018($sp) /* 0057C 80B8EFFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00580 80B8F000 AFBF001C */ sw $ra, 0x001C($sp) /* 00584 80B8F004 AFA5007C */ sw $a1, 0x007C($sp) /* 00588 80B8F008 920E01F6 */ lbu $t6, 0x01F6($s0) ## 000001F6 -/* 0058C 80B8F00C 3C1880B9 */ lui $t8, %hi(D_80B90E80) ## $t8 = 80B90000 -/* 00590 80B8F010 27180E80 */ addiu $t8, $t8, %lo(D_80B90E80) ## $t8 = 80B90E80 +/* 0058C 80B8F00C 3C1880B9 */ lui $t8, %hi(sBeanSpeeds) ## $t8 = 80B90000 +/* 00590 80B8F010 27180E80 */ addiu $t8, $t8, %lo(sBeanSpeeds) ## $t8 = 80B90E80 /* 00594 80B8F014 000E78C0 */ sll $t7, $t6, 3 /* 00598 80B8F018 01F81021 */ addu $v0, $t7, $t8 /* 0059C 80B8F01C 8C450000 */ lw $a1, 0x0000($v0) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Init.s deleted file mode 100644 index 620a0d3b14..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Init.s +++ /dev/null @@ -1,214 +0,0 @@ -.rdata -glabel D_80B90F10 - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80B90F1C - .asciz "パスデータが無い？(%s %d)(arg_data %xH)\n" - .balign 4 - -glabel D_80B90F48 - .asciz "../z_obj_bean.c" - .balign 4 - -glabel D_80B90F58 - .asciz "\x1b[m" - .balign 4 - -glabel D_80B90F5C - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80B90F68 - .asciz "パスデータ数が不正(%s %d)(arg_data %xH)\n" - .balign 4 - -glabel D_80B90F94 - .asciz "../z_obj_bean.c" - .balign 4 - -glabel D_80B90FA4 - .asciz "\x1b[m" - .balign 4 - -glabel D_80B90FA8 - .asciz "(魔法の豆の木リフト)(arg_data 0x%04x)\n" - .balign 4 - -.text -glabel ObjBean_Init -/* 00FFC 80B8FA7C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01000 80B8FA80 AFA50024 */ sw $a1, 0x0024($sp) -/* 01004 80B8FA84 AFBF001C */ sw $ra, 0x001C($sp) -/* 01008 80B8FA88 AFB00018 */ sw $s0, 0x0018($sp) -/* 0100C 80B8FA8C 3C0580B9 */ lui $a1, %hi(D_80B90EA8) ## $a1 = 80B90000 -/* 01010 80B8FA90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01014 80B8FA94 0C01E037 */ jal Actor_ProcessInitChain - -/* 01018 80B8FA98 24A50EA8 */ addiu $a1, $a1, %lo(D_80B90EA8) ## $a1 = 80B90EA8 -/* 0101C 80B8FA9C 3C0E8016 */ lui $t6, %hi(gSaveContext+4) -/* 01020 80B8FAA0 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) -/* 01024 80B8FAA4 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 01028 80B8FAA8 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 0102C 80B8FAAC 11C00003 */ beq $t6, $zero, .L80B8FABC -/* 01030 80B8FAB0 00000000 */ nop -/* 01034 80B8FAB4 10000001 */ beq $zero, $zero, .L80B8FABC -/* 01038 80B8FAB8 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L80B8FABC: -/* 0103C 80B8FABC 54410068 */ bnel $v0, $at, .L80B8FC60 -/* 01040 80B8FAC0 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 01044 80B8FAC4 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 01048 80B8FAC8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0104C 80B8FACC 0C00B2D0 */ jal Flags_GetSwitch - -/* 01050 80B8FAD0 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 01054 80B8FAD4 14400006 */ bne $v0, $zero, .L80B8FAF0 -/* 01058 80B8FAD8 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 0105C 80B8FADC 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 01060 80B8FAE0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01064 80B8FAE4 85F81156 */ lh $t8, 0x1156($t7) ## 80161156 -/* 01068 80B8FAE8 17010058 */ bne $t8, $at, .L80B8FC4C -/* 0106C 80B8FAEC 00000000 */ nop -.L80B8FAF0: -/* 01070 80B8FAF0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 01074 80B8FAF4 2401001F */ addiu $at, $zero, 0x001F ## $at = 0000001F -/* 01078 80B8FAF8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0107C 80B8FAFC 00021203 */ sra $v0, $v0, 8 -/* 01080 80B8FB00 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 01084 80B8FB04 14410012 */ bne $v0, $at, .L80B8FB50 -/* 01088 80B8FB08 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 0108C 80B8FB0C 3C0480B9 */ lui $a0, %hi(D_80B90F10) ## $a0 = 80B90000 -/* 01090 80B8FB10 0C00084C */ jal osSyncPrintf - -/* 01094 80B8FB14 24840F10 */ addiu $a0, $a0, %lo(D_80B90F10) ## $a0 = 80B90F10 -/* 01098 80B8FB18 3C0480B9 */ lui $a0, %hi(D_80B90F1C) ## $a0 = 80B90000 -/* 0109C 80B8FB1C 3C0580B9 */ lui $a1, %hi(D_80B90F48) ## $a1 = 80B90000 -/* 010A0 80B8FB20 24A50F48 */ addiu $a1, $a1, %lo(D_80B90F48) ## $a1 = 80B90F48 -/* 010A4 80B8FB24 24840F1C */ addiu $a0, $a0, %lo(D_80B90F1C) ## $a0 = 80B90F1C -/* 010A8 80B8FB28 2406038D */ addiu $a2, $zero, 0x038D ## $a2 = 0000038D -/* 010AC 80B8FB2C 0C00084C */ jal osSyncPrintf - -/* 010B0 80B8FB30 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 010B4 80B8FB34 3C0480B9 */ lui $a0, %hi(D_80B90F58) ## $a0 = 80B90000 -/* 010B8 80B8FB38 0C00084C */ jal osSyncPrintf - -/* 010BC 80B8FB3C 24840F58 */ addiu $a0, $a0, %lo(D_80B90F58) ## $a0 = 80B90F58 -/* 010C0 80B8FB40 0C00B55C */ jal Actor_Kill - -/* 010C4 80B8FB44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010C8 80B8FB48 1000005E */ beq $zero, $zero, .L80B8FCC4 -/* 010CC 80B8FB4C 8FBF001C */ lw $ra, 0x001C($sp) -.L80B8FB50: -/* 010D0 80B8FB50 0325C821 */ addu $t9, $t9, $a1 -/* 010D4 80B8FB54 8F391E08 */ lw $t9, 0x1E08($t9) ## 00001E08 -/* 010D8 80B8FB58 000240C0 */ sll $t0, $v0, 3 -/* 010DC 80B8FB5C 3C0480B9 */ lui $a0, %hi(D_80B90F5C) ## $a0 = 80B90000 -/* 010E0 80B8FB60 03284821 */ addu $t1, $t9, $t0 -/* 010E4 80B8FB64 912A0000 */ lbu $t2, 0x0000($t1) ## 00000000 -/* 010E8 80B8FB68 29410003 */ slti $at, $t2, 0x0003 -/* 010EC 80B8FB6C 10200011 */ beq $at, $zero, .L80B8FBB4 -/* 010F0 80B8FB70 00000000 */ nop -/* 010F4 80B8FB74 0C00084C */ jal osSyncPrintf - -/* 010F8 80B8FB78 24840F5C */ addiu $a0, $a0, %lo(D_80B90F5C) ## $a0 = 80B90F5C -/* 010FC 80B8FB7C 3C0480B9 */ lui $a0, %hi(D_80B90F68) ## $a0 = 80B90000 -/* 01100 80B8FB80 3C0580B9 */ lui $a1, %hi(D_80B90F94) ## $a1 = 80B90000 -/* 01104 80B8FB84 24A50F94 */ addiu $a1, $a1, %lo(D_80B90F94) ## $a1 = 80B90F94 -/* 01108 80B8FB88 24840F68 */ addiu $a0, $a0, %lo(D_80B90F68) ## $a0 = 80B90F68 -/* 0110C 80B8FB8C 24060399 */ addiu $a2, $zero, 0x0399 ## $a2 = 00000399 -/* 01110 80B8FB90 0C00084C */ jal osSyncPrintf - -/* 01114 80B8FB94 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 01118 80B8FB98 3C0480B9 */ lui $a0, %hi(D_80B90FA4) ## $a0 = 80B90000 -/* 0111C 80B8FB9C 0C00084C */ jal osSyncPrintf - -/* 01120 80B8FBA0 24840FA4 */ addiu $a0, $a0, %lo(D_80B90FA4) ## $a0 = 80B90FA4 -/* 01124 80B8FBA4 0C00B55C */ jal Actor_Kill - -/* 01128 80B8FBA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0112C 80B8FBAC 10000045 */ beq $zero, $zero, .L80B8FCC4 -/* 01130 80B8FBB0 8FBF001C */ lw $ra, 0x001C($sp) -.L80B8FBB4: -/* 01134 80B8FBB4 0C2E3BD1 */ jal func_80B8EF44 -/* 01138 80B8FBB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0113C 80B8FBBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01140 80B8FBC0 0C2E3BE0 */ jal func_80B8EF80 -/* 01144 80B8FBC4 8FA50024 */ lw $a1, 0x0024($sp) -/* 01148 80B8FBC8 0C2E3BBF */ jal func_80B8EEFC -/* 0114C 80B8FBCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01150 80B8FBD0 0C2E419E */ jal func_80B90678 -/* 01154 80B8FBD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01158 80B8FBD8 3C060600 */ lui $a2, %hi(D_060005DC) ## $a2 = 06000000 -/* 0115C 80B8FBDC 24C605DC */ addiu $a2, $a2, %lo(D_060005DC) ## $a2 = 060005DC -/* 01160 80B8FBE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01164 80B8FBE4 8FA50024 */ lw $a1, 0x0024($sp) -/* 01168 80B8FBE8 0C2E3AB6 */ jal func_80B8EAD8 -/* 0116C 80B8FBEC 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 01170 80B8FBF0 920B01F7 */ lbu $t3, 0x01F7($s0) ## 000001F7 -/* 01174 80B8FBF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01178 80B8FBF8 356C0020 */ ori $t4, $t3, 0x0020 ## $t4 = 00000020 -/* 0117C 80B8FBFC A20C01F7 */ sb $t4, 0x01F7($s0) ## 000001F7 -/* 01180 80B8FC00 0C2E3AA0 */ jal func_80B8EA80 -/* 01184 80B8FC04 8FA50024 */ lw $a1, 0x0024($sp) -/* 01188 80B8FC08 920D01F7 */ lbu $t5, 0x01F7($s0) ## 000001F7 -/* 0118C 80B8FC0C 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 01190 80B8FC10 3C07410C */ lui $a3, 0x410C ## $a3 = 410C0000 -/* 01194 80B8FC14 35AE0010 */ ori $t6, $t5, 0x0010 ## $t6 = 00000010 -/* 01198 80B8FC18 A20E01F7 */ sb $t6, 0x01F7($s0) ## 000001F7 -/* 0119C 80B8FC1C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 410CCCCD -/* 011A0 80B8FC20 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 011A4 80B8FC24 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 011A8 80B8FC28 0C00AC78 */ jal ActorShape_Init - -/* 011AC 80B8FC2C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 011B0 80B8FC30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011B4 80B8FC34 0C2E3AD8 */ jal func_80B8EB60 -/* 011B8 80B8FC38 8FA50024 */ lw $a1, 0x0024($sp) -/* 011BC 80B8FC3C 860F0018 */ lh $t7, 0x0018($s0) ## 00000018 -/* 011C0 80B8FC40 31F80003 */ andi $t8, $t7, 0x0003 ## $t8 = 00000000 -/* 011C4 80B8FC44 10000016 */ beq $zero, $zero, .L80B8FCA0 -/* 011C8 80B8FC48 A21801F6 */ sb $t8, 0x01F6($s0) ## 000001F6 -.L80B8FC4C: -/* 011CC 80B8FC4C 0C00B55C */ jal Actor_Kill - -/* 011D0 80B8FC50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011D4 80B8FC54 1000001B */ beq $zero, $zero, .L80B8FCC4 -/* 011D8 80B8FC58 8FBF001C */ lw $ra, 0x001C($sp) -/* 011DC 80B8FC5C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -.L80B8FC60: -/* 011E0 80B8FC60 8FA40024 */ lw $a0, 0x0024($sp) -/* 011E4 80B8FC64 0C00B2D0 */ jal Flags_GetSwitch - -/* 011E8 80B8FC68 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 011EC 80B8FC6C 14400006 */ bne $v0, $zero, .L80B8FC88 -/* 011F0 80B8FC70 3C198016 */ lui $t9, %hi(gGameInfo) -/* 011F4 80B8FC74 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) -/* 011F8 80B8FC78 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 011FC 80B8FC7C 87281156 */ lh $t0, 0x1156($t9) ## 80161156 -/* 01200 80B8FC80 15010005 */ bne $t0, $at, .L80B8FC98 -/* 01204 80B8FC84 00000000 */ nop -.L80B8FC88: -/* 01208 80B8FC88 0C2E4044 */ jal func_80B90110 -/* 0120C 80B8FC8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01210 80B8FC90 10000004 */ beq $zero, $zero, .L80B8FCA4 -/* 01214 80B8FC94 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -.L80B8FC98: -/* 01218 80B8FC98 0C2E3F54 */ jal func_80B8FD50 -/* 0121C 80B8FC9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B8FCA0: -/* 01220 80B8FCA0 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -.L80B8FCA4: -/* 01224 80B8FCA4 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 -/* 01228 80B8FCA8 3C0480B9 */ lui $a0, %hi(D_80B90FA8) ## $a0 = 80B90000 -/* 0122C 80B8FCAC 24840FA8 */ addiu $a0, $a0, %lo(D_80B90FA8) ## $a0 = 80B90FA8 -/* 01230 80B8FCB0 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 01234 80B8FCB4 A6020018 */ sh $v0, 0x0018($s0) ## 00000018 -/* 01238 80B8FCB8 0C00084C */ jal osSyncPrintf - -/* 0123C 80B8FCBC A6020034 */ sh $v0, 0x0034($s0) ## 00000034 -/* 01240 80B8FCC0 8FBF001C */ lw $ra, 0x001C($sp) -.L80B8FCC4: -/* 01244 80B8FCC4 8FB00018 */ lw $s0, 0x0018($sp) -/* 01248 80B8FCC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0124C 80B8FCCC 03E00008 */ jr $ra -/* 01250 80B8FCD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s deleted file mode 100644 index fb20f8c4dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s +++ /dev/null @@ -1,137 +0,0 @@ -.rdata -glabel D_80B90FD0 - .asciz "\x1b[36m" - .balign 4 - -glabel D_80B90FD8 - .asciz "馬と豆の木リフト衝突！！！\n" - .balign 4 - -glabel D_80B90FF4 - .asciz "\x1b[m" - .balign 4 - -.text -glabel ObjBean_Update -/* 02048 80B90AC8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0204C 80B90ACC AFBF001C */ sw $ra, 0x001C($sp) -/* 02050 80B90AD0 AFB10018 */ sw $s1, 0x0018($sp) -/* 02054 80B90AD4 AFB00014 */ sw $s0, 0x0014($sp) -/* 02058 80B90AD8 848201B4 */ lh $v0, 0x01B4($a0) ## 000001B4 -/* 0205C 80B90ADC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02060 80B90AE0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02064 80B90AE4 18400002 */ blez $v0, .L80B90AF0 -/* 02068 80B90AE8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 0206C 80B90AEC A48E01B4 */ sh $t6, 0x01B4($a0) ## 000001B4 -.L80B90AF0: -/* 02070 80B90AF0 8E190164 */ lw $t9, 0x0164($s0) ## 00000164 -/* 02074 80B90AF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02078 80B90AF8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0207C 80B90AFC 0320F809 */ jalr $ra, $t9 -/* 02080 80B90B00 00000000 */ nop -/* 02084 80B90B04 920F01F7 */ lbu $t7, 0x01F7($s0) ## 000001F7 -/* 02088 80B90B08 31F80004 */ andi $t8, $t7, 0x0004 ## $t8 = 00000000 -/* 0208C 80B90B0C 53000044 */ beql $t8, $zero, .L80B90C20 -/* 02090 80B90B10 AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 -/* 02094 80B90B14 0C2E3BBF */ jal func_80B8EEFC -/* 02098 80B90B18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0209C 80B90B1C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 020A0 80B90B20 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 -/* 020A4 80B90B24 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 020A8 80B90B28 3C014420 */ lui $at, 0x4420 ## $at = 44200000 -/* 020AC 80B90B2C 4606203C */ c.lt.s $f4, $f6 -/* 020B0 80B90B30 00000000 */ nop -/* 020B4 80B90B34 45020017 */ bc1fl .L80B90B94 -/* 020B8 80B90B38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020BC 80B90B3C C6080050 */ lwc1 $f8, 0x0050($s0) ## 00000050 -/* 020C0 80B90B40 44815000 */ mtc1 $at, $f10 ## $f10 = 640.00 -/* 020C4 80B90B44 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 020C8 80B90B48 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 020CC 80B90B4C 460A4402 */ mul.s $f16, $f8, $f10 -/* 020D0 80B90B50 26060168 */ addiu $a2, $s0, 0x0168 ## $a2 = 00000168 -/* 020D4 80B90B54 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000168 -/* 020D8 80B90B58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020DC 80B90B5C 46128100 */ add.s $f4, $f16, $f18 -/* 020E0 80B90B60 4600218D */ trunc.w.s $f6, $f4 -/* 020E4 80B90B64 44093000 */ mfc1 $t1, $f6 -/* 020E8 80B90B68 00000000 */ nop -/* 020EC 80B90B6C A60901A8 */ sh $t1, 0x01A8($s0) ## 000001A8 -/* 020F0 80B90B70 0C0189B7 */ jal Collider_UpdateCylinder - -/* 020F4 80B90B74 AFA60024 */ sw $a2, 0x0024($sp) -/* 020F8 80B90B78 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 020FC 80B90B7C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02100 80B90B80 8FA60024 */ lw $a2, 0x0024($sp) -/* 02104 80B90B84 02212821 */ addu $a1, $s1, $at -/* 02108 80B90B88 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 0210C 80B90B8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02110 80B90B90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B90B94: -/* 02114 80B90B94 0C2E3AD8 */ jal func_80B8EB60 -/* 02118 80B90B98 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0211C 80B90B9C 3C0142B0 */ lui $at, 0x42B0 ## $at = 42B00000 -/* 02120 80B90BA0 44815000 */ mtc1 $at, $f10 ## $f10 = 88.00 -/* 02124 80B90BA4 C6080050 */ lwc1 $f8, 0x0050($s0) ## 00000050 -/* 02128 80B90BA8 3C0A8003 */ lui $t2, %hi(ActorShadow_DrawCircle) -/* 0212C 80B90BAC 254AB5EC */ addiu $t2, %lo(ActorShadow_DrawCircle) -/* 02130 80B90BB0 460A4402 */ mul.s $f16, $f8, $f10 -/* 02134 80B90BB4 AE0A00C0 */ sw $t2, 0x00C0($s0) ## 000000C0 -/* 02138 80B90BB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0213C 80B90BBC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02140 80B90BC0 0C2E3CA6 */ jal func_80B8F298 -/* 02144 80B90BC4 E61000C4 */ swc1 $f16, 0x00C4($s0) ## 000000C4 -/* 02148 80B90BC8 10400015 */ beq $v0, $zero, .L80B90C20 -/* 0214C 80B90BCC 3C0480B9 */ lui $a0, %hi(D_80B90FD0) ## $a0 = 80B90000 -/* 02150 80B90BD0 0C00084C */ jal osSyncPrintf - -/* 02154 80B90BD4 24840FD0 */ addiu $a0, $a0, %lo(D_80B90FD0) ## $a0 = 80B90FD0 -/* 02158 80B90BD8 3C0480B9 */ lui $a0, %hi(D_80B90FD8) ## $a0 = 80B90000 -/* 0215C 80B90BDC 0C00084C */ jal osSyncPrintf - -/* 02160 80B90BE0 24840FD8 */ addiu $a0, $a0, %lo(D_80B90FD8) ## $a0 = 80B90FD8 -/* 02164 80B90BE4 3C0480B9 */ lui $a0, %hi(D_80B90FF4) ## $a0 = 80B90000 -/* 02168 80B90BE8 0C00084C */ jal osSyncPrintf - -/* 0216C 80B90BEC 24840FF4 */ addiu $a0, $a0, %lo(D_80B90FF4) ## $a0 = 80B90FF4 -/* 02170 80B90BF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02174 80B90BF4 0C2E3CC9 */ jal func_80B8F324 -/* 02178 80B90BF8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0217C 80B90BFC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02180 80B90C00 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 -/* 02184 80B90C04 0C00FAFE */ jal func_8003EBF8 -/* 02188 80B90C08 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C -/* 0218C 80B90C0C 0C2E423B */ jal func_80B908EC -/* 02190 80B90C10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02194 80B90C14 10000003 */ beq $zero, $zero, .L80B90C24 -/* 02198 80B90C18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0219C 80B90C1C AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 -.L80B90C20: -/* 021A0 80B90C20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B90C24: -/* 021A4 80B90C24 0C00B56E */ jal Actor_SetFocus - -/* 021A8 80B90C28 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 021AC 80B90C2C 920B01F7 */ lbu $t3, 0x01F7($s0) ## 000001F7 -/* 021B0 80B90C30 316C0020 */ andi $t4, $t3, 0x0020 ## $t4 = 00000000 -/* 021B4 80B90C34 5180000D */ beql $t4, $zero, .L80B90C6C -/* 021B8 80B90C38 8FBF001C */ lw $ra, 0x001C($sp) -/* 021BC 80B90C3C 0C010D5B */ jal func_8004356C -/* 021C0 80B90C40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021C4 80B90C44 50400006 */ beql $v0, $zero, .L80B90C60 -/* 021C8 80B90C48 921901F7 */ lbu $t9, 0x01F7($s0) ## 000001F7 -/* 021CC 80B90C4C 920D01F7 */ lbu $t5, 0x01F7($s0) ## 000001F7 -/* 021D0 80B90C50 35AE0080 */ ori $t6, $t5, 0x0080 ## $t6 = 00000080 -/* 021D4 80B90C54 10000004 */ beq $zero, $zero, .L80B90C68 -/* 021D8 80B90C58 A20E01F7 */ sb $t6, 0x01F7($s0) ## 000001F7 -/* 021DC 80B90C5C 921901F7 */ lbu $t9, 0x01F7($s0) ## 000001F7 -.L80B90C60: -/* 021E0 80B90C60 332FFF7F */ andi $t7, $t9, 0xFF7F ## $t7 = 00000000 -/* 021E4 80B90C64 A20F01F7 */ sb $t7, 0x01F7($s0) ## 000001F7 -.L80B90C68: -/* 021E8 80B90C68 8FBF001C */ lw $ra, 0x001C($sp) -.L80B90C6C: -/* 021EC 80B90C6C 8FB00014 */ lw $s0, 0x0014($sp) -/* 021F0 80B90C70 8FB10018 */ lw $s1, 0x0018($sp) -/* 021F4 80B90C74 03E00008 */ jr $ra -/* 021F8 80B90C78 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90158.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_WaitForWater.s similarity index 97% rename from asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90158.s rename to asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_WaitForWater.s index 7577a793b4..42bfe626a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90158.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_WaitForWater.s @@ -1,4 +1,4 @@ -glabel func_80B90158 +glabel ObjBean_WaitForWater /* 016D8 80B90158 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 016DC 80B9015C AFB00020 */ sw $s0, 0x0020($sp) /* 016E0 80B90160 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 @@ -28,7 +28,7 @@ glabel func_80B90158 /* 01740 80B901C0 00000000 */ nop /* 01744 80B901C4 45000010 */ bc1f .L80B90208 /* 01748 80B901C8 00000000 */ nop -/* 0174C 80B901CC 0C2E4093 */ jal func_80B9024C +/* 0174C 80B901CC 0C2E4093 */ jal ObjBean_SetupGrowWaterPhase1 /* 01750 80B901D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01754 80B901D4 3C0380B9 */ lui $v1, %hi(D_80B90E30) ## $v1 = 80B90000 /* 01758 80B901D8 24630E30 */ addiu $v1, $v1, %lo(D_80B90E30) ## $v1 = 80B90E30 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EA80.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EA80.s deleted file mode 100644 index fedf03f745..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EA80.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B8EA80 -/* 00000 80B8EA80 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 80B8EA84 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00008 80B8EA88 AFA50024 */ sw $a1, 0x0024($sp) -/* 0000C 80B8EA8C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 80B8EA90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 80B8EA94 24C50168 */ addiu $a1, $a2, 0x0168 ## $a1 = 00000168 -/* 00018 80B8EA98 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80B8EA9C 0C0170D9 */ jal Collider_InitCylinder - -/* 00020 80B8EAA0 AFA60020 */ sw $a2, 0x0020($sp) -/* 00024 80B8EAA4 3C0780B9 */ lui $a3, %hi(D_80B90E54) ## $a3 = 80B90000 -/* 00028 80B8EAA8 8FA60020 */ lw $a2, 0x0020($sp) -/* 0002C 80B8EAAC 24E70E54 */ addiu $a3, $a3, %lo(D_80B90E54) ## $a3 = 80B90E54 -/* 00030 80B8EAB0 8FA40024 */ lw $a0, 0x0024($sp) -/* 00034 80B8EAB4 0C01712B */ jal Collider_SetCylinder - -/* 00038 80B8EAB8 8FA50018 */ lw $a1, 0x0018($sp) -/* 0003C 80B8EABC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00040 80B8EAC0 0C0189B7 */ jal Collider_UpdateCylinder - -/* 00044 80B8EAC4 8FA50018 */ lw $a1, 0x0018($sp) -/* 00048 80B8EAC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0004C 80B8EACC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00050 80B8EAD0 03E00008 */ jr $ra -/* 00054 80B8EAD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EAD8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EAD8.s deleted file mode 100644 index 15846b29be..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EAD8.s +++ /dev/null @@ -1,50 +0,0 @@ -.rdata -glabel D_80B90EC0 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B90F00 - .asciz "../z_obj_bean.c" - .balign 4 - -.text -glabel func_80B8EAD8 -/* 00058 80B8EAD8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0005C 80B8EADC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00060 80B8EAE0 AFB00020 */ sw $s0, 0x0020($sp) -/* 00064 80B8EAE4 AFA5003C */ sw $a1, 0x003C($sp) -/* 00068 80B8EAE8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0006C 80B8EAEC AFA60040 */ sw $a2, 0x0040($sp) -/* 00070 80B8EAF0 AFA00030 */ sw $zero, 0x0030($sp) -/* 00074 80B8EAF4 0C010D20 */ jal DynaPolyActor_Init - -/* 00078 80B8EAF8 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 0007C 80B8EAFC 8FA40040 */ lw $a0, 0x0040($sp) -/* 00080 80B8EB00 0C010620 */ jal CollisionHeader_GetVirtual - -/* 00084 80B8EB04 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 00088 80B8EB08 8FA4003C */ lw $a0, 0x003C($sp) -/* 0008C 80B8EB0C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00090 80B8EB10 8FA70030 */ lw $a3, 0x0030($sp) -/* 00094 80B8EB14 0C00FA9D */ jal DynaPoly_SetBgActor - ## DynaPoly_SetBgActor -/* 00098 80B8EB18 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 0009C 80B8EB1C 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 000A0 80B8EB20 1441000A */ bne $v0, $at, .L80B8EB4C -/* 000A4 80B8EB24 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 000A8 80B8EB28 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 000AC 80B8EB2C 3C0480B9 */ lui $a0, %hi(D_80B90EC0) ## $a0 = 80B90000 -/* 000B0 80B8EB30 3C0580B9 */ lui $a1, %hi(D_80B90F00) ## $a1 = 80B90000 -/* 000B4 80B8EB34 86070000 */ lh $a3, 0x0000($s0) ## 00000000 -/* 000B8 80B8EB38 24A50F00 */ addiu $a1, $a1, %lo(D_80B90F00) ## $a1 = 80B90F00 -/* 000BC 80B8EB3C 24840EC0 */ addiu $a0, $a0, %lo(D_80B90EC0) ## $a0 = 80B90EC0 -/* 000C0 80B8EB40 24060176 */ addiu $a2, $zero, 0x0176 ## $a2 = 00000176 -/* 000C4 80B8EB44 0C00084C */ jal osSyncPrintf - -/* 000C8 80B8EB48 AFAE0010 */ sw $t6, 0x0010($sp) -.L80B8EB4C: -/* 000CC 80B8EB4C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 000D0 80B8EB50 8FB00020 */ lw $s0, 0x0020($sp) -/* 000D4 80B8EB54 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000D8 80B8EB58 03E00008 */ jr $ra -/* 000DC 80B8EB5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EB60.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EB60.s deleted file mode 100644 index 67304eca08..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EB60.s +++ /dev/null @@ -1,32 +0,0 @@ -.late_rodata -glabel D_80B90FF8 - .float 29.999998 - -.text -glabel func_80B8EB60 -/* 000E0 80B8EB60 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 000E4 80B8EB64 AFBF001C */ sw $ra, 0x001C($sp) -/* 000E8 80B8EB68 AFA50034 */ sw $a1, 0x0034($sp) -/* 000EC 80B8EB6C C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 000F0 80B8EB70 3C0180B9 */ lui $at, %hi(D_80B90FF8) ## $at = 80B90000 -/* 000F4 80B8EB74 C4280FF8 */ lwc1 $f8, %lo(D_80B90FF8)($at) -/* 000F8 80B8EB78 E7A40024 */ swc1 $f4, 0x0024($sp) -/* 000FC 80B8EB7C C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 00100 80B8EB80 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00104 80B8EB84 27AE0024 */ addiu $t6, $sp, 0x0024 ## $t6 = FFFFFFF4 -/* 00108 80B8EB88 46083280 */ add.s $f10, $f6, $f8 -/* 0010C 80B8EB8C 27A60020 */ addiu $a2, $sp, 0x0020 ## $a2 = FFFFFFF0 -/* 00110 80B8EB90 E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 00114 80B8EB94 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 00118 80B8EB98 24A407C0 */ addiu $a0, $a1, 0x07C0 ## $a0 = 000007C0 -/* 0011C 80B8EB9C 24E50078 */ addiu $a1, $a3, 0x0078 ## $a1 = 00000078 -/* 00120 80B8EBA0 AFA70030 */ sw $a3, 0x0030($sp) -/* 00124 80B8EBA4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00128 80B8EBA8 0C00F269 */ jal BgCheck_EntityRaycastFloor4 -/* 0012C 80B8EBAC E7B0002C */ swc1 $f16, 0x002C($sp) -/* 00130 80B8EBB0 8FA70030 */ lw $a3, 0x0030($sp) -/* 00134 80B8EBB4 E4E00080 */ swc1 $f0, 0x0080($a3) ## 00000080 -/* 00138 80B8EBB8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0013C 80B8EBBC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00140 80B8EBC0 03E00008 */ jr $ra -/* 00144 80B8EBC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBC8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBC8.s deleted file mode 100644 index f691b551fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBC8.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80B8EBC8 -/* 00148 80B8EBC8 A48001BA */ sh $zero, 0x01BA($a0) ## 000001BA -/* 0014C 80B8EBCC 848201BA */ lh $v0, 0x01BA($a0) ## 000001BA -/* 00150 80B8EBD0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00154 80B8EBD4 A48201B8 */ sh $v0, 0x01B8($a0) ## 000001B8 -/* 00158 80B8EBD8 A48201B6 */ sh $v0, 0x01B6($a0) ## 000001B6 -/* 0015C 80B8EBDC 03E00008 */ jr $ra -/* 00160 80B8EBE0 E48401E4 */ swc1 $f4, 0x01E4($a0) ## 000001E4 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBE4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBE4.s deleted file mode 100644 index 1bdddccb00..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBE4.s +++ /dev/null @@ -1,166 +0,0 @@ -.late_rodata -glabel D_80B90FFC - .float 0.01 - -glabel D_80B91000 - .float 0.06 - -glabel D_80B91004 - .float 1.07 - -glabel D_80B91008 - .float 0.1 - -glabel D_80B9100C - .float 0.2 - -glabel D_80B91010 - .float 0.1 - -glabel D_80B91014 - .float 2100.0 - -.text -glabel func_80B8EBE4 -/* 00164 80B8EBE4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00168 80B8EBE8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0016C 80B8EBEC AFB00020 */ sw $s0, 0x0020($sp) -/* 00170 80B8EBF0 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00174 80B8EBF4 848E01B6 */ lh $t6, 0x01B6($a0) ## 000001B6 -/* 00178 80B8EBF8 849801B8 */ lh $t8, 0x01B8($a0) ## 000001B8 -/* 0017C 80B8EBFC 848801BA */ lh $t0, 0x01BA($a0) ## 000001BA -/* 00180 80B8EC00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00184 80B8EC04 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00188 80B8EC08 25CF00B6 */ addiu $t7, $t6, 0x00B6 ## $t7 = 000000B6 -/* 0018C 80B8EC0C 271900FB */ addiu $t9, $t8, 0x00FB ## $t9 = 000000FB -/* 00190 80B8EC10 25090064 */ addiu $t1, $t0, 0x0064 ## $t1 = 00000064 -/* 00194 80B8EC14 A48F01B6 */ sh $t7, 0x01B6($a0) ## 000001B6 -/* 00198 80B8EC18 A49901B8 */ sh $t9, 0x01B8($a0) ## 000001B8 -/* 0019C 80B8EC1C A48901BA */ sh $t1, 0x01BA($a0) ## 000001BA -/* 001A0 80B8EC20 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 001A4 80B8EC24 248401E4 */ addiu $a0, $a0, 0x01E4 ## $a0 = 000001E4 -/* 001A8 80B8EC28 0C01DE80 */ jal Math_StepToF - -/* 001AC 80B8EC2C 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 -/* 001B0 80B8EC30 860401B6 */ lh $a0, 0x01B6($s0) ## 000001B6 -/* 001B4 80B8EC34 00800821 */ addu $at, $a0, $zero -/* 001B8 80B8EC38 00042080 */ sll $a0, $a0, 2 -/* 001BC 80B8EC3C 00812023 */ subu $a0, $a0, $at -/* 001C0 80B8EC40 00042400 */ sll $a0, $a0, 16 -/* 001C4 80B8EC44 0C01DE1C */ jal Math_SinS - ## sins? -/* 001C8 80B8EC48 00042403 */ sra $a0, $a0, 16 -/* 001CC 80B8EC4C 860401B8 */ lh $a0, 0x01B8($s0) ## 000001B8 -/* 001D0 80B8EC50 46000506 */ mov.s $f20, $f0 -/* 001D4 80B8EC54 00800821 */ addu $at, $a0, $zero -/* 001D8 80B8EC58 00042080 */ sll $a0, $a0, 2 -/* 001DC 80B8EC5C 00812023 */ subu $a0, $a0, $at -/* 001E0 80B8EC60 00042400 */ sll $a0, $a0, 16 -/* 001E4 80B8EC64 0C01DE1C */ jal Math_SinS - ## sins? -/* 001E8 80B8EC68 00042403 */ sra $a0, $a0, 16 -/* 001EC 80B8EC6C 46140100 */ add.s $f4, $f0, $f20 -/* 001F0 80B8EC70 C60601E4 */ lwc1 $f6, 0x01E4($s0) ## 000001E4 -/* 001F4 80B8EC74 860401B6 */ lh $a0, 0x01B6($s0) ## 000001B6 -/* 001F8 80B8EC78 46062202 */ mul.s $f8, $f4, $f6 -/* 001FC 80B8EC7C 00042080 */ sll $a0, $a0, 2 -/* 00200 80B8EC80 00042400 */ sll $a0, $a0, 16 -/* 00204 80B8EC84 00042403 */ sra $a0, $a0, 16 -/* 00208 80B8EC88 0C01DE0D */ jal Math_CosS - ## coss? -/* 0020C 80B8EC8C E60801E8 */ swc1 $f8, 0x01E8($s0) ## 000001E8 -/* 00210 80B8EC90 860401B8 */ lh $a0, 0x01B8($s0) ## 000001B8 -/* 00214 80B8EC94 46000506 */ mov.s $f20, $f0 -/* 00218 80B8EC98 00042080 */ sll $a0, $a0, 2 -/* 0021C 80B8EC9C 00042400 */ sll $a0, $a0, 16 -/* 00220 80B8ECA0 0C01DE0D */ jal Math_CosS - ## coss? -/* 00224 80B8ECA4 00042403 */ sra $a0, $a0, 16 -/* 00228 80B8ECA8 46140280 */ add.s $f10, $f0, $f20 -/* 0022C 80B8ECAC C61001E4 */ lwc1 $f16, 0x01E4($s0) ## 000001E4 -/* 00230 80B8ECB0 860401BA */ lh $a0, 0x01BA($s0) ## 000001BA -/* 00234 80B8ECB4 46105482 */ mul.s $f18, $f10, $f16 -/* 00238 80B8ECB8 00800821 */ addu $at, $a0, $zero -/* 0023C 80B8ECBC 00042080 */ sll $a0, $a0, 2 -/* 00240 80B8ECC0 00812021 */ addu $a0, $a0, $at -/* 00244 80B8ECC4 00042400 */ sll $a0, $a0, 16 -/* 00248 80B8ECC8 00042403 */ sra $a0, $a0, 16 -/* 0024C 80B8ECCC 0C01DE1C */ jal Math_SinS - ## sins? -/* 00250 80B8ECD0 E61201EC */ swc1 $f18, 0x01EC($s0) ## 000001EC -/* 00254 80B8ECD4 860401B8 */ lh $a0, 0x01B8($s0) ## 000001B8 -/* 00258 80B8ECD8 46000506 */ mov.s $f20, $f0 -/* 0025C 80B8ECDC 000420C0 */ sll $a0, $a0, 3 -/* 00260 80B8ECE0 00042400 */ sll $a0, $a0, 16 -/* 00264 80B8ECE4 0C01DE1C */ jal Math_SinS - ## sins? -/* 00268 80B8ECE8 00042403 */ sra $a0, $a0, 16 -/* 0026C 80B8ECEC 3C0180B9 */ lui $at, %hi(D_80B90FFC) ## $at = 80B90000 -/* 00270 80B8ECF0 C4240FFC */ lwc1 $f4, %lo(D_80B90FFC)($at) -/* 00274 80B8ECF4 3C0180B9 */ lui $at, %hi(D_80B91000) ## $at = 80B90000 -/* 00278 80B8ECF8 C4281000 */ lwc1 $f8, %lo(D_80B91000)($at) -/* 0027C 80B8ECFC 46040182 */ mul.s $f6, $f0, $f4 -/* 00280 80B8ED00 3C0180B9 */ lui $at, %hi(D_80B91004) ## $at = 80B90000 -/* 00284 80B8ED04 C4321004 */ lwc1 $f18, %lo(D_80B91004)($at) -/* 00288 80B8ED08 4608A282 */ mul.s $f10, $f20, $f8 -/* 0028C 80B8ED0C 3C0180B9 */ lui $at, %hi(D_80B91008) ## $at = 80B90000 -/* 00290 80B8ED10 C4281008 */ lwc1 $f8, %lo(D_80B91008)($at) -/* 00294 80B8ED14 860401BA */ lh $a0, 0x01BA($s0) ## 000001BA -/* 00298 80B8ED18 00800821 */ addu $at, $a0, $zero -/* 0029C 80B8ED1C 460A3400 */ add.s $f16, $f6, $f10 -/* 002A0 80B8ED20 00042080 */ sll $a0, $a0, 2 -/* 002A4 80B8ED24 00812021 */ addu $a0, $a0, $at -/* 002A8 80B8ED28 00042040 */ sll $a0, $a0, 1 -/* 002AC 80B8ED2C 46128100 */ add.s $f4, $f16, $f18 -/* 002B0 80B8ED30 00042400 */ sll $a0, $a0, 16 -/* 002B4 80B8ED34 00042403 */ sra $a0, $a0, 16 -/* 002B8 80B8ED38 46082082 */ mul.s $f2, $f4, $f8 -/* 002BC 80B8ED3C E6020058 */ swc1 $f2, 0x0058($s0) ## 00000058 -/* 002C0 80B8ED40 0C01DE0D */ jal Math_CosS - ## coss? -/* 002C4 80B8ED44 E6020050 */ swc1 $f2, 0x0050($s0) ## 00000050 -/* 002C8 80B8ED48 3C0180B9 */ lui $at, %hi(D_80B9100C) ## $at = 80B90000 -/* 002CC 80B8ED4C C426100C */ lwc1 $f6, %lo(D_80B9100C)($at) -/* 002D0 80B8ED50 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 002D4 80B8ED54 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 002D8 80B8ED58 46060282 */ mul.s $f10, $f0, $f6 -/* 002DC 80B8ED5C 3C0180B9 */ lui $at, %hi(D_80B91010) ## $at = 80B90000 -/* 002E0 80B8ED60 C4241010 */ lwc1 $f4, %lo(D_80B91010)($at) -/* 002E4 80B8ED64 860401B6 */ lh $a0, 0x01B6($s0) ## 000001B6 -/* 002E8 80B8ED68 00800821 */ addu $at, $a0, $zero -/* 002EC 80B8ED6C 46105480 */ add.s $f18, $f10, $f16 -/* 002F0 80B8ED70 00042080 */ sll $a0, $a0, 2 -/* 002F4 80B8ED74 00812023 */ subu $a0, $a0, $at -/* 002F8 80B8ED78 00042400 */ sll $a0, $a0, 16 -/* 002FC 80B8ED7C 46049202 */ mul.s $f8, $f18, $f4 -/* 00300 80B8ED80 00042403 */ sra $a0, $a0, 16 -/* 00304 80B8ED84 0C01DE1C */ jal Math_SinS - ## sins? -/* 00308 80B8ED88 E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 -/* 0030C 80B8ED8C 860401BA */ lh $a0, 0x01BA($s0) ## 000001BA -/* 00310 80B8ED90 46000506 */ mov.s $f20, $f0 -/* 00314 80B8ED94 00042040 */ sll $a0, $a0, 1 -/* 00318 80B8ED98 00042400 */ sll $a0, $a0, 16 -/* 0031C 80B8ED9C 0C01DE1C */ jal Math_SinS - ## sins? -/* 00320 80B8EDA0 00042403 */ sra $a0, $a0, 16 -/* 00324 80B8EDA4 860A0016 */ lh $t2, 0x0016($s0) ## 00000016 -/* 00328 80B8EDA8 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0032C 80B8EDAC 44818000 */ mtc1 $at, $f16 ## $f16 = 1000.00 -/* 00330 80B8EDB0 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 00334 80B8EDB4 3C0180B9 */ lui $at, %hi(D_80B91014) ## $at = 80B90000 -/* 00338 80B8EDB8 4610A482 */ mul.s $f18, $f20, $f16 -/* 0033C 80B8EDBC C4281014 */ lwc1 $f8, %lo(D_80B91014)($at) -/* 00340 80B8EDC0 468032A0 */ cvt.s.w $f10, $f6 -/* 00344 80B8EDC4 46080182 */ mul.s $f6, $f0, $f8 -/* 00348 80B8EDC8 46125100 */ add.s $f4, $f10, $f18 -/* 0034C 80B8EDCC 46043400 */ add.s $f16, $f6, $f4 -/* 00350 80B8EDD0 4600828D */ trunc.w.s $f10, $f16 -/* 00354 80B8EDD4 440C5000 */ mfc1 $t4, $f10 -/* 00358 80B8EDD8 00000000 */ nop -/* 0035C 80B8EDDC A60C00B6 */ sh $t4, 0x00B6($s0) ## 000000B6 -/* 00360 80B8EDE0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00364 80B8EDE4 8FB00020 */ lw $s0, 0x0020($sp) -/* 00368 80B8EDE8 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 0036C 80B8EDEC 03E00008 */ jr $ra -/* 00370 80B8EDF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EDF4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EDF4.s deleted file mode 100644 index f594b1a01e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EDF4.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80B8EDF4 -/* 00374 80B8EDF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00378 80B8EDF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0037C 80B8EDFC A48001BA */ sh $zero, 0x01BA($a0) ## 000001BA -/* 00380 80B8EE00 848201BA */ lh $v0, 0x01BA($a0) ## 000001BA -/* 00384 80B8EE04 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00388 80B8EE08 A48201B8 */ sh $v0, 0x01B8($a0) ## 000001B8 -/* 0038C 80B8EE0C 0C00B58B */ jal Actor_SetScale - -/* 00390 80B8EE10 A48201B6 */ sh $v0, 0x01B6($a0) ## 000001B6 -/* 00394 80B8EE14 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00398 80B8EE18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0039C 80B8EE1C 03E00008 */ jr $ra -/* 003A0 80B8EE20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EE24.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EE24.s deleted file mode 100644 index d8c7192f09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EE24.s +++ /dev/null @@ -1,69 +0,0 @@ -.late_rodata -glabel D_80B91018 - .float 0.16970563 -glabel D_80B9101C - .float 0.10700001 - -.text -glabel func_80B8EE24 -/* 003A4 80B8EE24 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 003A8 80B8EE28 AFBF001C */ sw $ra, 0x001C($sp) -/* 003AC 80B8EE2C AFB00018 */ sw $s0, 0x0018($sp) -/* 003B0 80B8EE30 848E01B6 */ lh $t6, 0x01B6($a0) ## 000001B6 -/* 003B4 80B8EE34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003B8 80B8EE38 24195FFF */ addiu $t9, $zero, 0x5FFF ## $t9 = 00005FFF -/* 003BC 80B8EE3C 25CF0384 */ addiu $t7, $t6, 0x0384 ## $t7 = 00000384 -/* 003C0 80B8EE40 A48F01B6 */ sh $t7, 0x01B6($a0) ## 000001B6 -/* 003C4 80B8EE44 849801B6 */ lh $t8, 0x01B6($a0) ## 000001B6 -/* 003C8 80B8EE48 240B4000 */ addiu $t3, $zero, 0x4000 ## $t3 = 00004000 -/* 003CC 80B8EE4C 2B016000 */ slti $at, $t8, 0x6000 -/* 003D0 80B8EE50 54200003 */ bnel $at, $zero, .L80B8EE60 -/* 003D4 80B8EE54 860801B8 */ lh $t0, 0x01B8($s0) ## 000001B8 -/* 003D8 80B8EE58 A49901B6 */ sh $t9, 0x01B6($a0) ## 000001B6 -/* 003DC 80B8EE5C 860801B8 */ lh $t0, 0x01B8($s0) ## 000001B8 -.L80B8EE60: -/* 003E0 80B8EE60 25090258 */ addiu $t1, $t0, 0x0258 ## $t1 = 00000258 -/* 003E4 80B8EE64 A60901B8 */ sh $t1, 0x01B8($s0) ## 000001B8 -/* 003E8 80B8EE68 860A01B8 */ lh $t2, 0x01B8($s0) ## 000001B8 -/* 003EC 80B8EE6C 29414001 */ slti $at, $t2, 0x4001 -/* 003F0 80B8EE70 14200002 */ bne $at, $zero, .L80B8EE7C -/* 003F4 80B8EE74 00000000 */ nop -/* 003F8 80B8EE78 A60B01B8 */ sh $t3, 0x01B8($s0) ## 000001B8 -.L80B8EE7C: -/* 003FC 80B8EE7C 0C01DE1C */ jal Math_SinS - ## sins? -/* 00400 80B8EE80 860401B6 */ lh $a0, 0x01B6($s0) ## 000001B6 -/* 00404 80B8EE84 3C0180B9 */ lui $at, %hi(D_80B91018) ## $at = 80B90000 -/* 00408 80B8EE88 C4241018 */ lwc1 $f4, %lo(D_80B91018)($at) -/* 0040C 80B8EE8C 860401B8 */ lh $a0, 0x01B8($s0) ## 000001B8 -/* 00410 80B8EE90 46040182 */ mul.s $f6, $f0, $f4 -/* 00414 80B8EE94 0C01DE1C */ jal Math_SinS - ## sins? -/* 00418 80B8EE98 E6060054 */ swc1 $f6, 0x0054($s0) ## 00000054 -/* 0041C 80B8EE9C 3C0180B9 */ lui $at, %hi(D_80B9101C) ## $at = 80B90000 -/* 00420 80B8EEA0 C428101C */ lwc1 $f8, %lo(D_80B9101C)($at) -/* 00424 80B8EEA4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00428 80B8EEA8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 0042C 80B8EEAC 46080082 */ mul.s $f2, $f0, $f8 -/* 00430 80B8EEB0 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 -/* 00434 80B8EEB4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00438 80B8EEB8 E6020058 */ swc1 $f2, 0x0058($s0) ## 00000058 -/* 0043C 80B8EEBC 0C01DE80 */ jal Math_StepToF - -/* 00440 80B8EEC0 E6020050 */ swc1 $f2, 0x0050($s0) ## 00000050 -/* 00444 80B8EEC4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00448 80B8EEC8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 0044C 80B8EECC 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC -/* 00450 80B8EED0 0C01DE80 */ jal Math_StepToF - -/* 00454 80B8EED4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00458 80B8EED8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 0045C 80B8EEDC 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 00460 80B8EEE0 0C01DE2B */ jal Math_ScaledStepToS - -/* 00464 80B8EEE4 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 00468 80B8EEE8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0046C 80B8EEEC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00470 80B8EEF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00474 80B8EEF4 03E00008 */ jr $ra -/* 00478 80B8EEF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EEFC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EEFC.s deleted file mode 100644 index ad2777f86b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EEFC.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80B8EEFC -/* 0047C 80B8EEFC C48401D8 */ lwc1 $f4, 0x01D8($a0) ## 000001D8 -/* 00480 80B8EF00 C48601E8 */ lwc1 $f6, 0x01E8($a0) ## 000001E8 -/* 00484 80B8EF04 C49001E0 */ lwc1 $f16, 0x01E0($a0) ## 000001E0 -/* 00488 80B8EF08 C49201EC */ lwc1 $f18, 0x01EC($a0) ## 000001EC -/* 0048C 80B8EF0C 46062200 */ add.s $f8, $f4, $f6 -/* 00490 80B8EF10 C48A01DC */ lwc1 $f10, 0x01DC($a0) ## 000001DC -/* 00494 80B8EF14 46128100 */ add.s $f4, $f16, $f18 -/* 00498 80B8EF18 E4880024 */ swc1 $f8, 0x0024($a0) ## 00000024 -/* 0049C 80B8EF1C E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 -/* 004A0 80B8EF20 03E00008 */ jr $ra -/* 004A4 80B8EF24 E484002C */ swc1 $f4, 0x002C($a0) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF28.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF28.s deleted file mode 100644 index 6d80c7ab17..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF28.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80B8EF28 -/* 004A8 80B8EF28 AFA50004 */ sw $a1, 0x0004($sp) -/* 004AC 80B8EF2C 908E01F7 */ lbu $t6, 0x01F7($a0) ## 000001F7 -/* 004B0 80B8EF30 31D8FFF0 */ andi $t8, $t6, 0xFFF0 ## $t8 = 00000000 -/* 004B4 80B8EF34 A09801F7 */ sb $t8, 0x01F7($a0) ## 000001F7 -/* 004B8 80B8EF38 0305C825 */ or $t9, $t8, $a1 ## $t9 = 00000000 -/* 004BC 80B8EF3C 03E00008 */ jr $ra -/* 004C0 80B8EF40 A09901F7 */ sb $t9, 0x01F7($a0) ## 000001F7 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF44.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF44.s deleted file mode 100644 index a656c14682..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF44.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B8EF44 -/* 004C4 80B8EF44 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 004C8 80B8EF48 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 004CC 80B8EF4C 01C57021 */ addu $t6, $t6, $a1 -/* 004D0 80B8EF50 8DCE1E08 */ lw $t6, 0x1E08($t6) ## 00011E08 -/* 004D4 80B8EF54 000FC203 */ sra $t8, $t7, 8 -/* 004D8 80B8EF58 3319001F */ andi $t9, $t8, 0x001F ## $t9 = 00000000 -/* 004DC 80B8EF5C 001940C0 */ sll $t0, $t9, 3 -/* 004E0 80B8EF60 01C84821 */ addu $t1, $t6, $t0 -/* 004E4 80B8EF64 912A0000 */ lbu $t2, 0x0000($t1) ## 00000000 -/* 004E8 80B8EF68 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 004EC 80B8EF6C A48001F2 */ sh $zero, 0x01F2($a0) ## 000001F2 -/* 004F0 80B8EF70 254BFFFF */ addiu $t3, $t2, 0xFFFF ## $t3 = FFFFFFFF -/* 004F4 80B8EF74 A48B01F0 */ sh $t3, 0x01F0($a0) ## 000001F0 -/* 004F8 80B8EF78 03E00008 */ jr $ra -/* 004FC 80B8EF7C A48C01F4 */ sh $t4, 0x01F4($a0) ## 000001F4 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF80.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF80.s deleted file mode 100644 index 6ab91ce949..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF80.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B8EF80 -/* 00500 80B8EF80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00504 80B8EF84 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00508 80B8EF88 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 0050C 80B8EF8C 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 00510 80B8EF90 01C57021 */ addu $t6, $t6, $a1 -/* 00514 80B8EF94 8DCE1E08 */ lw $t6, 0x1E08($t6) ## 00011E08 -/* 00518 80B8EF98 000FC203 */ sra $t8, $t7, 8 -/* 0051C 80B8EF9C 3319001F */ andi $t9, $t8, 0x001F ## $t9 = 00000000 -/* 00520 80B8EFA0 001940C0 */ sll $t0, $t9, 3 -/* 00524 80B8EFA4 01C81821 */ addu $v1, $t6, $t0 -/* 00528 80B8EFA8 8C620004 */ lw $v0, 0x0004($v1) ## 00000004 -/* 0052C 80B8EFAC 3C0C8016 */ lui $t4, %hi(gSegments) -/* 00530 80B8EFB0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00534 80B8EFB4 00024900 */ sll $t1, $v0, 4 -/* 00538 80B8EFB8 00095702 */ srl $t2, $t1, 28 -/* 0053C 80B8EFBC 000A5880 */ sll $t3, $t2, 2 -/* 00540 80B8EFC0 018B6021 */ addu $t4, $t4, $t3 -/* 00544 80B8EFC4 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 00548 80B8EFC8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0054C 80B8EFCC 00416824 */ and $t5, $v0, $at -/* 00550 80B8EFD0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00554 80B8EFD4 018D2821 */ addu $a1, $t4, $t5 -/* 00558 80B8EFD8 00A12821 */ addu $a1, $a1, $at -/* 0055C 80B8EFDC 0C01DF97 */ jal Math_Vec3s_ToVec3f - ## Vec3f_CopyFrameTable -/* 00560 80B8EFE0 248401D8 */ addiu $a0, $a0, 0x01D8 ## $a0 = 000001D8 -/* 00564 80B8EFE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00568 80B8EFE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0056C 80B8EFEC 03E00008 */ jr $ra -/* 00570 80B8EFF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F298.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F298.s deleted file mode 100644 index 50a64d28c4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F298.s +++ /dev/null @@ -1,45 +0,0 @@ -.late_rodata -glabel D_80B91020 - .float 10000.0 - -.text -glabel func_80B8F298 -/* 00818 80B8F298 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0081C 80B8F29C AFBF002C */ sw $ra, 0x002C($sp) -/* 00820 80B8F2A0 AFB20028 */ sw $s2, 0x0028($sp) -/* 00824 80B8F2A4 AFB10024 */ sw $s1, 0x0024($sp) -/* 00828 80B8F2A8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0082C 80B8F2AC F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00830 80B8F2B0 8CB01C3C */ lw $s0, 0x1C3C($a1) ## 00001C3C -/* 00834 80B8F2B4 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 00838 80B8F2B8 24110014 */ addiu $s1, $zero, 0x0014 ## $s1 = 00000014 -/* 0083C 80B8F2BC 12000011 */ beq $s0, $zero, .L80B8F304 -/* 00840 80B8F2C0 3C0180B9 */ lui $at, %hi(D_80B91020) ## $at = 80B90000 -/* 00844 80B8F2C4 C4341020 */ lwc1 $f20, %lo(D_80B91020)($at) -/* 00848 80B8F2C8 860E0000 */ lh $t6, 0x0000($s0) ## 00000000 -.L80B8F2CC: -/* 0084C 80B8F2CC 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00850 80B8F2D0 562E000A */ bnel $s1, $t6, .L80B8F2FC -/* 00854 80B8F2D4 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -/* 00858 80B8F2D8 0C032D94 */ jal Math3D_Vec3fDistSq -/* 0085C 80B8F2DC 26450024 */ addiu $a1, $s2, 0x0024 ## $a1 = 00000024 -/* 00860 80B8F2E0 4614003C */ c.lt.s $f0, $f20 -/* 00864 80B8F2E4 00000000 */ nop -/* 00868 80B8F2E8 45020004 */ bc1fl .L80B8F2FC -/* 0086C 80B8F2EC 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -/* 00870 80B8F2F0 10000005 */ beq $zero, $zero, .L80B8F308 -/* 00874 80B8F2F4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00878 80B8F2F8 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -.L80B8F2FC: -/* 0087C 80B8F2FC 5600FFF3 */ bnel $s0, $zero, .L80B8F2CC -/* 00880 80B8F300 860E0000 */ lh $t6, 0x0000($s0) ## 00000000 -.L80B8F304: -/* 00884 80B8F304 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B8F308: -/* 00888 80B8F308 8FBF002C */ lw $ra, 0x002C($sp) -/* 0088C 80B8F30C D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00890 80B8F310 8FB00020 */ lw $s0, 0x0020($sp) -/* 00894 80B8F314 8FB10024 */ lw $s1, 0x0024($sp) -/* 00898 80B8F318 8FB20028 */ lw $s2, 0x0028($sp) -/* 0089C 80B8F31C 03E00008 */ jr $ra -/* 008A0 80B8F320 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s deleted file mode 100644 index 75a0740929..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s +++ /dev/null @@ -1,176 +0,0 @@ -.late_rodata -glabel D_80B91024 - .float 0.1 - -.text -glabel func_80B8F324 -/* 008A4 80B8F324 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 -/* 008A8 80B8F328 F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 008AC 80B8F32C 3C0180B9 */ lui $at, %hi(D_80B91024) ## $at = 80B90000 -/* 008B0 80B8F330 C43E1024 */ lwc1 $f30, %lo(D_80B91024)($at) -/* 008B4 80B8F334 F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 008B8 80B8F338 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 008BC 80B8F33C 4481E000 */ mtc1 $at, $f28 ## $f28 = 180.00 -/* 008C0 80B8F340 F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 008C4 80B8F344 3C014150 */ lui $at, 0x4150 ## $at = 41500000 -/* 008C8 80B8F348 4481D000 */ mtc1 $at, $f26 ## $f26 = 13.00 -/* 008CC 80B8F34C F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 008D0 80B8F350 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 008D4 80B8F354 4481C000 */ mtc1 $at, $f24 ## $f24 = 60.00 -/* 008D8 80B8F358 AFBE0098 */ sw $s8, 0x0098($sp) -/* 008DC 80B8F35C F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 008E0 80B8F360 3C014060 */ lui $at, 0x4060 ## $at = 40600000 -/* 008E4 80B8F364 AFB70094 */ sw $s7, 0x0094($sp) -/* 008E8 80B8F368 AFB60090 */ sw $s6, 0x0090($sp) -/* 008EC 80B8F36C AFB5008C */ sw $s5, 0x008C($sp) -/* 008F0 80B8F370 AFB40088 */ sw $s4, 0x0088($sp) -/* 008F4 80B8F374 AFB1007C */ sw $s1, 0x007C($sp) -/* 008F8 80B8F378 AFB00078 */ sw $s0, 0x0078($sp) -/* 008FC 80B8F37C 3C1E80B9 */ lui $s8, %hi(D_80B90EA0) ## $s8 = 80B90000 -/* 00900 80B8F380 4481B000 */ mtc1 $at, $f22 ## $f22 = 3.50 -/* 00904 80B8F384 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00908 80B8F388 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 0090C 80B8F38C AFBF009C */ sw $ra, 0x009C($sp) -/* 00910 80B8F390 AFB30084 */ sw $s3, 0x0084($sp) -/* 00914 80B8F394 AFB20080 */ sw $s2, 0x0080($sp) -/* 00918 80B8F398 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 0091C 80B8F39C 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00920 80B8F3A0 27DE0EA0 */ addiu $s8, $s8, %lo(D_80B90EA0) ## $s8 = 80B90EA0 -/* 00924 80B8F3A4 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 00928 80B8F3A8 27B500C4 */ addiu $s5, $sp, 0x00C4 ## $s5 = FFFFFFF4 -/* 0092C 80B8F3AC 27B700B8 */ addiu $s7, $sp, 0x00B8 ## $s7 = FFFFFFE8 -/* 00930 80B8F3B0 26314E20 */ addiu $s1, $s1, 0x4E20 ## $s1 = 00004E20 -.L80B8F3B4: -/* 00934 80B8F3B4 00118C00 */ sll $s1, $s1, 16 -/* 00938 80B8F3B8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0093C 80B8F3BC 00118C03 */ sra $s1, $s1, 16 -/* 00940 80B8F3C0 46180502 */ mul.s $f20, $f0, $f24 -/* 00944 80B8F3C4 00112400 */ sll $a0, $s1, 16 -/* 00948 80B8F3C8 0C01DE1C */ jal Math_SinS - ## sins? -/* 0094C 80B8F3CC 00042403 */ sra $a0, $a0, 16 -/* 00950 80B8F3D0 46140102 */ mul.s $f4, $f0, $f20 -/* 00954 80B8F3D4 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00958 80B8F3D8 00112400 */ sll $a0, $s1, 16 -/* 0095C 80B8F3DC 00042403 */ sra $a0, $a0, 16 -/* 00960 80B8F3E0 46062200 */ add.s $f8, $f4, $f6 -/* 00964 80B8F3E4 E7A800C4 */ swc1 $f8, 0x00C4($sp) -/* 00968 80B8F3E8 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 0096C 80B8F3EC 0C01DE0D */ jal Math_CosS - ## coss? -/* 00970 80B8F3F0 E7AA00C8 */ swc1 $f10, 0x00C8($sp) -/* 00974 80B8F3F4 46140402 */ mul.s $f16, $f0, $f20 -/* 00978 80B8F3F8 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 0097C 80B8F3FC 00112400 */ sll $a0, $s1, 16 -/* 00980 80B8F400 00042403 */ sra $a0, $a0, 16 -/* 00984 80B8F404 46128100 */ add.s $f4, $f16, $f18 -/* 00988 80B8F408 0C01DE1C */ jal Math_SinS - ## sins? -/* 0098C 80B8F40C E7A400CC */ swc1 $f4, 0x00CC($sp) -/* 00990 80B8F410 46160182 */ mul.s $f6, $f0, $f22 -/* 00994 80B8F414 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00998 80B8F418 E7A600B8 */ swc1 $f6, 0x00B8($sp) -/* 0099C 80B8F41C 461A0202 */ mul.s $f8, $f0, $f26 -/* 009A0 80B8F420 00112400 */ sll $a0, $s1, 16 -/* 009A4 80B8F424 00042403 */ sra $a0, $a0, 16 -/* 009A8 80B8F428 0C01DE0D */ jal Math_CosS - ## coss? -/* 009AC 80B8F42C E7A800BC */ swc1 $f8, 0x00BC($sp) -/* 009B0 80B8F430 46160282 */ mul.s $f10, $f0, $f22 -/* 009B4 80B8F434 C7A600B8 */ lwc1 $f6, 0x00B8($sp) -/* 009B8 80B8F438 E7AA00C0 */ swc1 $f10, 0x00C0($sp) -/* 009BC 80B8F43C C6120100 */ lwc1 $f18, 0x0100($s0) ## 00000100 -/* 009C0 80B8F440 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 009C4 80B8F444 46128101 */ sub.s $f4, $f16, $f18 -/* 009C8 80B8F448 46043200 */ add.s $f8, $f6, $f4 -/* 009CC 80B8F44C C7A600BC */ lwc1 $f6, 0x00BC($sp) -/* 009D0 80B8F450 E7A800B8 */ swc1 $f8, 0x00B8($sp) -/* 009D4 80B8F454 C6100104 */ lwc1 $f16, 0x0104($s0) ## 00000104 -/* 009D8 80B8F458 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 009DC 80B8F45C 46105481 */ sub.s $f18, $f10, $f16 -/* 009E0 80B8F460 46123100 */ add.s $f4, $f6, $f18 -/* 009E4 80B8F464 C7A600C0 */ lwc1 $f6, 0x00C0($sp) -/* 009E8 80B8F468 E7A400BC */ swc1 $f4, 0x00BC($sp) -/* 009EC 80B8F46C C60A0108 */ lwc1 $f10, 0x0108($s0) ## 00000108 -/* 009F0 80B8F470 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 009F4 80B8F474 460A4401 */ sub.s $f16, $f8, $f10 -/* 009F8 80B8F478 46103480 */ add.s $f18, $f6, $f16 -/* 009FC 80B8F47C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00A00 80B8F480 E7B200C0 */ swc1 $f18, 0x00C0($sp) -/* 00A04 80B8F484 461C0102 */ mul.s $f4, $f0, $f28 -/* 00A08 80B8F488 2413FF9C */ addiu $s3, $zero, 0xFF9C ## $s3 = FFFFFF9C -/* 00A0C 80B8F48C 4600220D */ trunc.w.s $f8, $f4 -/* 00A10 80B8F490 44024000 */ mfc1 $v0, $f8 -/* 00A14 80B8F494 00000000 */ nop -/* 00A18 80B8F498 2452001E */ addiu $s2, $v0, 0x001E ## $s2 = 0000001E -/* 00A1C 80B8F49C 2A41005A */ slti $at, $s2, 0x005A -/* 00A20 80B8F4A0 1020000B */ beq $at, $zero, .L80B8F4D0 -/* 00A24 80B8F4A4 24020040 */ addiu $v0, $zero, 0x0040 ## $v0 = 00000040 -/* 00A28 80B8F4A8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00A2C 80B8F4AC 2413FFB0 */ addiu $s3, $zero, 0xFFB0 ## $s3 = FFFFFFB0 -/* 00A30 80B8F4B0 461E003C */ c.lt.s $f0, $f30 -/* 00A34 80B8F4B4 00000000 */ nop -/* 00A38 80B8F4B8 45000003 */ bc1f .L80B8F4C8 -/* 00A3C 80B8F4BC 00000000 */ nop -/* 00A40 80B8F4C0 10000003 */ beq $zero, $zero, .L80B8F4D0 -/* 00A44 80B8F4C4 24020060 */ addiu $v0, $zero, 0x0060 ## $v0 = 00000060 -.L80B8F4C8: -/* 00A48 80B8F4C8 10000001 */ beq $zero, $zero, .L80B8F4D0 -/* 00A4C 80B8F4CC 24020040 */ addiu $v0, $zero, 0x0040 ## $v0 = 00000040 -.L80B8F4D0: -/* 00A50 80B8F4D0 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 00A54 80B8F4D4 328D0001 */ andi $t5, $s4, 0x0001 ## $t5 = 00000000 -/* 00A58 80B8F4D8 000D7080 */ sll $t6, $t5, 2 -/* 00A5C 80B8F4DC AFAF0018 */ sw $t7, 0x0018($sp) -/* 00A60 80B8F4E0 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 00A64 80B8F4E4 0012C8C3 */ sra $t9, $s2, 3 -/* 00A68 80B8F4E8 27280028 */ addiu $t0, $t9, 0x0028 ## $t0 = 00000028 -/* 00A6C 80B8F4EC AFB8001C */ sw $t8, 0x001C($sp) -/* 00A70 80B8F4F0 03CE7821 */ addu $t7, $s8, $t6 -/* 00A74 80B8F4F4 8DF80000 */ lw $t8, 0x0000($t7) ## 00000028 -/* 00A78 80B8F4F8 00084C00 */ sll $t1, $t0, 16 -/* 00A7C 80B8F4FC 00095403 */ sra $t2, $t1, 16 -/* 00A80 80B8F500 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 00A84 80B8F504 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00A88 80B8F508 AFAC0038 */ sw $t4, 0x0038($sp) -/* 00A8C 80B8F50C AFAB0034 */ sw $t3, 0x0034($sp) -/* 00A90 80B8F510 AFAA0030 */ sw $t2, 0x0030($sp) -/* 00A94 80B8F514 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 00A98 80B8F518 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFF4 -/* 00A9C 80B8F51C 02E03025 */ or $a2, $s7, $zero ## $a2 = FFFFFFE8 -/* 00AA0 80B8F520 02A03825 */ or $a3, $s5, $zero ## $a3 = FFFFFFF4 -/* 00AA4 80B8F524 AFB30010 */ sw $s3, 0x0010($sp) -/* 00AA8 80B8F528 AFA20014 */ sw $v0, 0x0014($sp) -/* 00AAC 80B8F52C AFA00020 */ sw $zero, 0x0020($sp) -/* 00AB0 80B8F530 AFB20024 */ sw $s2, 0x0024($sp) -/* 00AB4 80B8F534 AFA00028 */ sw $zero, 0x0028($sp) -/* 00AB8 80B8F538 AFA0002C */ sw $zero, 0x002C($sp) -/* 00ABC 80B8F53C 0C00A7A3 */ jal EffectSsKakera_Spawn - -/* 00AC0 80B8F540 AFB8003C */ sw $t8, 0x003C($sp) -/* 00AC4 80B8F544 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 -/* 00AC8 80B8F548 24010024 */ addiu $at, $zero, 0x0024 ## $at = 00000024 -/* 00ACC 80B8F54C 5681FF99 */ bnel $s4, $at, .L80B8F3B4 -/* 00AD0 80B8F550 26314E20 */ addiu $s1, $s1, 0x4E20 ## $s1 = 00009C40 -/* 00AD4 80B8F554 8FBF009C */ lw $ra, 0x009C($sp) -/* 00AD8 80B8F558 D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 00ADC 80B8F55C D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 00AE0 80B8F560 D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 00AE4 80B8F564 D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 00AE8 80B8F568 D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 00AEC 80B8F56C D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 00AF0 80B8F570 8FB00078 */ lw $s0, 0x0078($sp) -/* 00AF4 80B8F574 8FB1007C */ lw $s1, 0x007C($sp) -/* 00AF8 80B8F578 8FB20080 */ lw $s2, 0x0080($sp) -/* 00AFC 80B8F57C 8FB30084 */ lw $s3, 0x0084($sp) -/* 00B00 80B8F580 8FB40088 */ lw $s4, 0x0088($sp) -/* 00B04 80B8F584 8FB5008C */ lw $s5, 0x008C($sp) -/* 00B08 80B8F588 8FB60090 */ lw $s6, 0x0090($sp) -/* 00B0C 80B8F58C 8FB70094 */ lw $s7, 0x0094($sp) -/* 00B10 80B8F590 8FBE0098 */ lw $s8, 0x0098($sp) -/* 00B14 80B8F594 03E00008 */ jr $ra -/* 00B18 80B8F598 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F59C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F59C.s deleted file mode 100644 index 84a0803b56..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F59C.s +++ /dev/null @@ -1,63 +0,0 @@ -.late_rodata -glabel D_80B91028 - .float 6372.0 -glabel D_80B9102C - .float 0.17434467 -glabel D_80B91030 - .float 0.12207746 - -.text -glabel func_80B8F59C -/* 00B1C 80B8F59C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B20 80B8F5A0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B24 80B8F5A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B28 80B8F5A8 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B2C 80B8F5AC 860601C6 */ lh $a2, 0x01C6($s0) ## 000001C6 -/* 00B30 80B8F5B0 860501C4 */ lh $a1, 0x01C4($s0) ## 000001C4 -/* 00B34 80B8F5B4 0C01DE5F */ jal Math_StepToS - -/* 00B38 80B8F5B8 248401C2 */ addiu $a0, $a0, 0x01C2 ## $a0 = 000001C2 -/* 00B3C 80B8F5BC 260401C8 */ addiu $a0, $s0, 0x01C8 ## $a0 = 000001C8 -/* 00B40 80B8F5C0 860501CA */ lh $a1, 0x01CA($s0) ## 000001CA -/* 00B44 80B8F5C4 0C01DE5F */ jal Math_StepToS - -/* 00B48 80B8F5C8 860601CC */ lh $a2, 0x01CC($s0) ## 000001CC -/* 00B4C 80B8F5CC 860E01CE */ lh $t6, 0x01CE($s0) ## 000001CE -/* 00B50 80B8F5D0 860F01C8 */ lh $t7, 0x01C8($s0) ## 000001C8 -/* 00B54 80B8F5D4 01CFC021 */ addu $t8, $t6, $t7 -/* 00B58 80B8F5D8 A61801CE */ sh $t8, 0x01CE($s0) ## 000001CE -/* 00B5C 80B8F5DC 0C01DE1C */ jal Math_SinS - ## sins? -/* 00B60 80B8F5E0 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE -/* 00B64 80B8F5E4 861901C2 */ lh $t9, 0x01C2($s0) ## 000001C2 -/* 00B68 80B8F5E8 3C0180B9 */ lui $at, %hi(D_80B91028) ## $at = 80B90000 -/* 00B6C 80B8F5EC C4241028 */ lwc1 $f4, %lo(D_80B91028)($at) -/* 00B70 80B8F5F0 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 00B74 80B8F5F4 00000000 */ nop -/* 00B78 80B8F5F8 46803220 */ cvt.s.w $f8, $f6 -/* 00B7C 80B8F5FC 46080282 */ mul.s $f10, $f0, $f8 -/* 00B80 80B8F600 460A2401 */ sub.s $f16, $f4, $f10 -/* 00B84 80B8F604 4600848D */ trunc.w.s $f18, $f16 -/* 00B88 80B8F608 44099000 */ mfc1 $t1, $f18 -/* 00B8C 80B8F60C 00000000 */ nop -/* 00B90 80B8F610 A60901D0 */ sh $t1, 0x01D0($s0) ## 000001D0 -/* 00B94 80B8F614 0C01DE1C */ jal Math_SinS - ## sins? -/* 00B98 80B8F618 860401D0 */ lh $a0, 0x01D0($s0) ## 000001D0 -/* 00B9C 80B8F61C 3C0180B9 */ lui $at, %hi(D_80B9102C) ## $at = 80B90000 -/* 00BA0 80B8F620 C426102C */ lwc1 $f6, %lo(D_80B9102C)($at) -/* 00BA4 80B8F624 860401D0 */ lh $a0, 0x01D0($s0) ## 000001D0 -/* 00BA8 80B8F628 46060202 */ mul.s $f8, $f0, $f6 -/* 00BAC 80B8F62C 0C01DE0D */ jal Math_CosS - ## coss? -/* 00BB0 80B8F630 E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 -/* 00BB4 80B8F634 3C0180B9 */ lui $at, %hi(D_80B91030) ## $at = 80B90000 -/* 00BB8 80B8F638 C4241030 */ lwc1 $f4, %lo(D_80B91030)($at) -/* 00BBC 80B8F63C 46040082 */ mul.s $f2, $f0, $f4 -/* 00BC0 80B8F640 E6020058 */ swc1 $f2, 0x0058($s0) ## 00000058 -/* 00BC4 80B8F644 E6020050 */ swc1 $f2, 0x0050($s0) ## 00000050 -/* 00BC8 80B8F648 8FBF001C */ lw $ra, 0x001C($sp) -/* 00BCC 80B8F64C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00BD0 80B8F650 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00BD4 80B8F654 03E00008 */ jr $ra -/* 00BD8 80B8F658 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F65C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F65C.s deleted file mode 100644 index b16a1b96a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F65C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80B8F65C -/* 00BDC 80B8F65C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00BE0 80B8F660 AFB00018 */ sw $s0, 0x0018($sp) -/* 00BE4 80B8F664 3C0E80B9 */ lui $t6, %hi(func_80B8F6CC) ## $t6 = 80B90000 -/* 00BE8 80B8F668 AFBF001C */ sw $ra, 0x001C($sp) -/* 00BEC 80B8F66C 25CEF6CC */ addiu $t6, $t6, %lo(func_80B8F6CC) ## $t6 = 80B8F6CC -/* 00BF0 80B8F670 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00BF4 80B8F674 AC8E01BC */ sw $t6, 0x01BC($a0) ## 000001BC -/* 00BF8 80B8F678 2404000C */ addiu $a0, $zero, 0x000C ## $a0 = 0000000C -/* 00BFC 80B8F67C 0C01DF64 */ jal Rand_S16Offset - -/* 00C00 80B8F680 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -/* 00C04 80B8F684 A60201C0 */ sh $v0, 0x01C0($s0) ## 000001C0 -/* 00C08 80B8F688 240400C8 */ addiu $a0, $zero, 0x00C8 ## $a0 = 000000C8 -/* 00C0C 80B8F68C 0C01DF64 */ jal Rand_S16Offset - -/* 00C10 80B8F690 24050190 */ addiu $a1, $zero, 0x0190 ## $a1 = 00000190 -/* 00C14 80B8F694 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 00C18 80B8F698 A60201C4 */ sh $v0, 0x01C4($s0) ## 000001C4 -/* 00C1C 80B8F69C A60F01C6 */ sh $t7, 0x01C6($s0) ## 000001C6 -/* 00C20 80B8F6A0 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 -/* 00C24 80B8F6A4 0C01DF64 */ jal Rand_S16Offset - -/* 00C28 80B8F6A8 24050320 */ addiu $a1, $zero, 0x0320 ## $a1 = 00000320 -/* 00C2C 80B8F6AC 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 00C30 80B8F6B0 A60201CA */ sh $v0, 0x01CA($s0) ## 000001CA -/* 00C34 80B8F6B4 A61801CC */ sh $t8, 0x01CC($s0) ## 000001CC -/* 00C38 80B8F6B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C3C 80B8F6BC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00C40 80B8F6C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C44 80B8F6C4 03E00008 */ jr $ra -/* 00C48 80B8F6C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F6CC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F6CC.s deleted file mode 100644 index f21cd993b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F6CC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B8F6CC -/* 00C4C 80B8F6CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C50 80B8F6D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C54 80B8F6D4 848E01C0 */ lh $t6, 0x01C0($a0) ## 000001C0 -/* 00C58 80B8F6D8 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 00C5C 80B8F6DC A48F01C0 */ sh $t7, 0x01C0($a0) ## 000001C0 -/* 00C60 80B8F6E0 0C2E3D67 */ jal func_80B8F59C -/* 00C64 80B8F6E4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00C68 80B8F6E8 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C6C 80B8F6EC 849801C0 */ lh $t8, 0x01C0($a0) ## 000001C0 -/* 00C70 80B8F6F0 07030004 */ bgezl $t8, .L80B8F704 -/* 00C74 80B8F6F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C78 80B8F6F8 0C2E3DC4 */ jal func_80B8F710 -/* 00C7C 80B8F6FC 00000000 */ nop -/* 00C80 80B8F700 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B8F704: -/* 00C84 80B8F704 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C88 80B8F708 03E00008 */ jr $ra -/* 00C8C 80B8F70C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F710.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F710.s deleted file mode 100644 index 1cc0e13c77..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F710.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80B8F710 -/* 00C90 80B8F710 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C94 80B8F714 AFB00018 */ sw $s0, 0x0018($sp) -/* 00C98 80B8F718 3C0E80B9 */ lui $t6, %hi(func_80B8F788) ## $t6 = 80B90000 -/* 00C9C 80B8F71C AFBF001C */ sw $ra, 0x001C($sp) -/* 00CA0 80B8F720 25CEF788 */ addiu $t6, $t6, %lo(func_80B8F788) ## $t6 = 80B8F788 -/* 00CA4 80B8F724 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CA8 80B8F728 AC8E01BC */ sw $t6, 0x01BC($a0) ## 000001BC -/* 00CAC 80B8F72C 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 00CB0 80B8F730 0C01DF64 */ jal Rand_S16Offset - -/* 00CB4 80B8F734 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 00CB8 80B8F738 A60201C0 */ sh $v0, 0x01C0($s0) ## 000001C0 -/* 00CBC 80B8F73C 240407D0 */ addiu $a0, $zero, 0x07D0 ## $a0 = 000007D0 -/* 00CC0 80B8F740 0C01DF64 */ jal Rand_S16Offset - -/* 00CC4 80B8F744 240503E8 */ addiu $a1, $zero, 0x03E8 ## $a1 = 000003E8 -/* 00CC8 80B8F748 240F00C8 */ addiu $t7, $zero, 0x00C8 ## $t7 = 000000C8 -/* 00CCC 80B8F74C A60201C4 */ sh $v0, 0x01C4($s0) ## 000001C4 -/* 00CD0 80B8F750 A60F01C6 */ sh $t7, 0x01C6($s0) ## 000001C6 -/* 00CD4 80B8F754 240436B0 */ addiu $a0, $zero, 0x36B0 ## $a0 = 000036B0 -/* 00CD8 80B8F758 0C01DF64 */ jal Rand_S16Offset - -/* 00CDC 80B8F75C 24051770 */ addiu $a1, $zero, 0x1770 ## $a1 = 00001770 -/* 00CE0 80B8F760 24180FA0 */ addiu $t8, $zero, 0x0FA0 ## $t8 = 00000FA0 -/* 00CE4 80B8F764 241918E4 */ addiu $t9, $zero, 0x18E4 ## $t9 = 000018E4 -/* 00CE8 80B8F768 A60201CA */ sh $v0, 0x01CA($s0) ## 000001CA -/* 00CEC 80B8F76C A61801CC */ sh $t8, 0x01CC($s0) ## 000001CC -/* 00CF0 80B8F770 A61901D0 */ sh $t9, 0x01D0($s0) ## 000001D0 -/* 00CF4 80B8F774 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CF8 80B8F778 8FB00018 */ lw $s0, 0x0018($sp) -/* 00CFC 80B8F77C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00D00 80B8F780 03E00008 */ jr $ra -/* 00D04 80B8F784 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F788.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F788.s deleted file mode 100644 index f85e2a5a95..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F788.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80B8F788 -/* 00D08 80B8F788 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00D0C 80B8F78C AFBF001C */ sw $ra, 0x001C($sp) -/* 00D10 80B8F790 AFB00018 */ sw $s0, 0x0018($sp) -/* 00D14 80B8F794 848E01C0 */ lh $t6, 0x01C0($a0) ## 000001C0 -/* 00D18 80B8F798 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D1C 80B8F79C 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 00D20 80B8F7A0 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 00D24 80B8F7A4 A48F01C0 */ sh $t7, 0x01C0($a0) ## 000001C0 -/* 00D28 80B8F7A8 849801C0 */ lh $t8, 0x01C0($a0) ## 000001C0 -/* 00D2C 80B8F7AC 240400C8 */ addiu $a0, $zero, 0x00C8 ## $a0 = 000000C8 -/* 00D30 80B8F7B0 1701000A */ bne $t8, $at, .L80B8F7DC -/* 00D34 80B8F7B4 00000000 */ nop -/* 00D38 80B8F7B8 0C01DF64 */ jal Rand_S16Offset - -/* 00D3C 80B8F7BC 24050190 */ addiu $a1, $zero, 0x0190 ## $a1 = 00000190 -/* 00D40 80B8F7C0 A60201C4 */ sh $v0, 0x01C4($s0) ## 000001C4 -/* 00D44 80B8F7C4 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 -/* 00D48 80B8F7C8 0C01DF64 */ jal Rand_S16Offset - -/* 00D4C 80B8F7CC 240501F4 */ addiu $a1, $zero, 0x01F4 ## $a1 = 000001F4 -/* 00D50 80B8F7D0 241907D0 */ addiu $t9, $zero, 0x07D0 ## $t9 = 000007D0 -/* 00D54 80B8F7D4 A60201CA */ sh $v0, 0x01CA($s0) ## 000001CA -/* 00D58 80B8F7D8 A61901CC */ sh $t9, 0x01CC($s0) ## 000001CC -.L80B8F7DC: -/* 00D5C 80B8F7DC 0C2E3D67 */ jal func_80B8F59C -/* 00D60 80B8F7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D64 80B8F7E4 860801C0 */ lh $t0, 0x01C0($s0) ## 000001C0 -/* 00D68 80B8F7E8 05030004 */ bgezl $t0, .L80B8F7FC -/* 00D6C 80B8F7EC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D70 80B8F7F0 0C2E3D97 */ jal func_80B8F65C -/* 00D74 80B8F7F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D78 80B8F7F8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B8F7FC: -/* 00D7C 80B8F7FC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00D80 80B8F800 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00D84 80B8F804 03E00008 */ jr $ra -/* 00D88 80B8F808 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F80C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F80C.s deleted file mode 100644 index ccb85dcec0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F80C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B8F80C -/* 00D8C 80B8F80C 3C0E80B9 */ lui $t6, %hi(func_80B8F84C) ## $t6 = 80B90000 -/* 00D90 80B8F810 25CEF84C */ addiu $t6, $t6, %lo(func_80B8F84C) ## $t6 = 80B8F84C -/* 00D94 80B8F814 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 00D98 80B8F818 24180BB8 */ addiu $t8, $zero, 0x0BB8 ## $t8 = 00000BB8 -/* 00D9C 80B8F81C 2419012C */ addiu $t9, $zero, 0x012C ## $t9 = 0000012C -/* 00DA0 80B8F820 24083A98 */ addiu $t0, $zero, 0x3A98 ## $t0 = 00003A98 -/* 00DA4 80B8F824 24090FA0 */ addiu $t1, $zero, 0x0FA0 ## $t1 = 00000FA0 -/* 00DA8 80B8F828 240A18E4 */ addiu $t2, $zero, 0x18E4 ## $t2 = 000018E4 -/* 00DAC 80B8F82C AC8E01BC */ sw $t6, 0x01BC($a0) ## 000001BC -/* 00DB0 80B8F830 A48F01C0 */ sh $t7, 0x01C0($a0) ## 000001C0 -/* 00DB4 80B8F834 A49801C4 */ sh $t8, 0x01C4($a0) ## 000001C4 -/* 00DB8 80B8F838 A49901C6 */ sh $t9, 0x01C6($a0) ## 000001C6 -/* 00DBC 80B8F83C A48801CA */ sh $t0, 0x01CA($a0) ## 000001CA -/* 00DC0 80B8F840 A48901CC */ sh $t1, 0x01CC($a0) ## 000001CC -/* 00DC4 80B8F844 03E00008 */ jr $ra -/* 00DC8 80B8F848 A48A01D0 */ sh $t2, 0x01D0($a0) ## 000001D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F84C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F84C.s deleted file mode 100644 index 80e6a4a545..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F84C.s +++ /dev/null @@ -1,45 +0,0 @@ -.late_rodata -glabel D_80B91034 - .float 0.1 - -.text -glabel func_80B8F84C -/* 00DCC 80B8F84C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00DD0 80B8F850 AFBF001C */ sw $ra, 0x001C($sp) -/* 00DD4 80B8F854 AFB00018 */ sw $s0, 0x0018($sp) -/* 00DD8 80B8F858 848E01C0 */ lh $t6, 0x01C0($a0) ## 000001C0 -/* 00DDC 80B8F85C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DE0 80B8F860 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 00DE4 80B8F864 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00DE8 80B8F868 A48F01C0 */ sh $t7, 0x01C0($a0) ## 000001C0 -/* 00DEC 80B8F86C 3C0180B9 */ lui $at, %hi(D_80B91034) ## $at = 80B90000 -/* 00DF0 80B8F870 C4241034 */ lwc1 $f4, %lo(D_80B91034)($at) -/* 00DF4 80B8F874 24040898 */ addiu $a0, $zero, 0x0898 ## $a0 = 00000898 -/* 00DF8 80B8F878 4604003C */ c.lt.s $f0, $f4 -/* 00DFC 80B8F87C 00000000 */ nop -/* 00E00 80B8F880 45000008 */ bc1f .L80B8F8A4 -/* 00E04 80B8F884 00000000 */ nop -/* 00E08 80B8F888 0C01DF64 */ jal Rand_S16Offset - -/* 00E0C 80B8F88C 240503E8 */ addiu $a1, $zero, 0x03E8 ## $a1 = 000003E8 -/* 00E10 80B8F890 A60201C4 */ sh $v0, 0x01C4($s0) ## 000001C4 -/* 00E14 80B8F894 24042EE0 */ addiu $a0, $zero, 0x2EE0 ## $a0 = 00002EE0 -/* 00E18 80B8F898 0C01DF64 */ jal Rand_S16Offset - -/* 00E1C 80B8F89C 24051F40 */ addiu $a1, $zero, 0x1F40 ## $a1 = 00001F40 -/* 00E20 80B8F8A0 A60201CA */ sh $v0, 0x01CA($s0) ## 000001CA -.L80B8F8A4: -/* 00E24 80B8F8A4 0C2E3D67 */ jal func_80B8F59C -/* 00E28 80B8F8A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E2C 80B8F8AC 861801C0 */ lh $t8, 0x01C0($s0) ## 000001C0 -/* 00E30 80B8F8B0 07030004 */ bgezl $t8, .L80B8F8C4 -/* 00E34 80B8F8B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E38 80B8F8B8 0C2E3E35 */ jal func_80B8F8D4 -/* 00E3C 80B8F8BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E40 80B8F8C0 8FBF001C */ lw $ra, 0x001C($sp) -.L80B8F8C4: -/* 00E44 80B8F8C4 8FB00018 */ lw $s0, 0x0018($sp) -/* 00E48 80B8F8C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E4C 80B8F8CC 03E00008 */ jr $ra -/* 00E50 80B8F8D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8D4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8D4.s deleted file mode 100644 index e79013821d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8D4.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80B8F8D4 -/* 00E54 80B8F8D4 3C0E80B9 */ lui $t6, %hi(func_80B8F8E4) ## $t6 = 80B90000 -/* 00E58 80B8F8D8 25CEF8E4 */ addiu $t6, $t6, %lo(func_80B8F8E4) ## $t6 = 80B8F8E4 -/* 00E5C 80B8F8DC 03E00008 */ jr $ra -/* 00E60 80B8F8E0 AC8E01BC */ sw $t6, 0x01BC($a0) ## 000001BC diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8E4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8E4.s deleted file mode 100644 index 0eb1d580fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8E4.s +++ /dev/null @@ -1,37 +0,0 @@ -.late_rodata -glabel D_80B91038 - .float 0.17434467 -glabel D_80B9103C - .float 0.12207746 - -.text -glabel func_80B8F8E4 -/* 00E64 80B8F8E4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00E68 80B8F8E8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00E6C 80B8F8EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E70 80B8F8F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00E74 80B8F8F4 248401D0 */ addiu $a0, $a0, 0x01D0 ## $a0 = 000001D0 -/* 00E78 80B8F8F8 240533E9 */ addiu $a1, $zero, 0x33E9 ## $a1 = 000033E9 -/* 00E7C 80B8F8FC 0C01DE5F */ jal Math_StepToS - -/* 00E80 80B8F900 24060168 */ addiu $a2, $zero, 0x0168 ## $a2 = 00000168 -/* 00E84 80B8F904 0C01DE1C */ jal Math_SinS - ## sins? -/* 00E88 80B8F908 860401D0 */ lh $a0, 0x01D0($s0) ## 000001D0 -/* 00E8C 80B8F90C 3C0180B9 */ lui $at, %hi(D_80B91038) ## $at = 80B90000 -/* 00E90 80B8F910 C4241038 */ lwc1 $f4, %lo(D_80B91038)($at) -/* 00E94 80B8F914 860401D0 */ lh $a0, 0x01D0($s0) ## 000001D0 -/* 00E98 80B8F918 46040182 */ mul.s $f6, $f0, $f4 -/* 00E9C 80B8F91C 0C01DE0D */ jal Math_CosS - ## coss? -/* 00EA0 80B8F920 E6060054 */ swc1 $f6, 0x0054($s0) ## 00000054 -/* 00EA4 80B8F924 3C0180B9 */ lui $at, %hi(D_80B9103C) ## $at = 80B90000 -/* 00EA8 80B8F928 C428103C */ lwc1 $f8, %lo(D_80B9103C)($at) -/* 00EAC 80B8F92C 46080082 */ mul.s $f2, $f0, $f8 -/* 00EB0 80B8F930 E6020058 */ swc1 $f2, 0x0058($s0) ## 00000058 -/* 00EB4 80B8F934 E6020050 */ swc1 $f2, 0x0050($s0) ## 00000050 -/* 00EB8 80B8F938 8FBF001C */ lw $ra, 0x001C($sp) -/* 00EBC 80B8F93C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00EC0 80B8F940 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00EC4 80B8F944 03E00008 */ jr $ra -/* 00EC8 80B8F948 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F94C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F94C.s deleted file mode 100644 index 85bf231ab7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F94C.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80B8F94C -/* 00ECC 80B8F94C 3C0E80B9 */ lui $t6, %hi(func_80B8F964) ## $t6 = 80B90000 -/* 00ED0 80B8F950 25CEF964 */ addiu $t6, $t6, %lo(func_80B8F964) ## $t6 = 80B8F964 -/* 00ED4 80B8F954 240F33E9 */ addiu $t7, $zero, 0x33E9 ## $t7 = 000033E9 -/* 00ED8 80B8F958 AC8E01BC */ sw $t6, 0x01BC($a0) ## 000001BC -/* 00EDC 80B8F95C 03E00008 */ jr $ra -/* 00EE0 80B8F960 A48F01D0 */ sh $t7, 0x01D0($a0) ## 000001D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F964.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F964.s deleted file mode 100644 index 393eb98953..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F964.s +++ /dev/null @@ -1,42 +0,0 @@ -.late_rodata -glabel D_80B91040 - .float 0.17434467 -glabel D_80B91044 - .float 0.12207746 - -.text -glabel func_80B8F964 -/* 00EE4 80B8F964 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00EE8 80B8F968 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00EEC 80B8F96C 848E01D0 */ lh $t6, 0x01D0($a0) ## 000001D0 -/* 00EF0 80B8F970 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00EF4 80B8F974 25CFF6A0 */ addiu $t7, $t6, 0xF6A0 ## $t7 = FFFFF6A0 -/* 00EF8 80B8F978 A48F01D0 */ sh $t7, 0x01D0($a0) ## 000001D0 -/* 00EFC 80B8F97C 848401D0 */ lh $a0, 0x01D0($a0) ## 000001D0 -/* 00F00 80B8F980 0C01DE1C */ jal Math_SinS - ## sins? -/* 00F04 80B8F984 AFA50018 */ sw $a1, 0x0018($sp) -/* 00F08 80B8F988 3C0180B9 */ lui $at, %hi(D_80B91040) ## $at = 80B90000 -/* 00F0C 80B8F98C C4241040 */ lwc1 $f4, %lo(D_80B91040)($at) -/* 00F10 80B8F990 8FA50018 */ lw $a1, 0x0018($sp) -/* 00F14 80B8F994 46040182 */ mul.s $f6, $f0, $f4 -/* 00F18 80B8F998 84A401D0 */ lh $a0, 0x01D0($a1) ## 000001D0 -/* 00F1C 80B8F99C 0C01DE0D */ jal Math_CosS - ## coss? -/* 00F20 80B8F9A0 E4A60054 */ swc1 $f6, 0x0054($a1) ## 00000054 -/* 00F24 80B8F9A4 3C0180B9 */ lui $at, %hi(D_80B91044) ## $at = 80B90000 -/* 00F28 80B8F9A8 C4281044 */ lwc1 $f8, %lo(D_80B91044)($at) -/* 00F2C 80B8F9AC 8FA50018 */ lw $a1, 0x0018($sp) -/* 00F30 80B8F9B0 46080082 */ mul.s $f2, $f0, $f8 -/* 00F34 80B8F9B4 84B801D0 */ lh $t8, 0x01D0($a1) ## 000001D0 -/* 00F38 80B8F9B8 2B0118E4 */ slti $at, $t8, 0x18E4 -/* 00F3C 80B8F9BC E4A20058 */ swc1 $f2, 0x0058($a1) ## 00000058 -/* 00F40 80B8F9C0 10200003 */ beq $at, $zero, .L80B8F9D0 -/* 00F44 80B8F9C4 E4A20050 */ swc1 $f2, 0x0050($a1) ## 00000050 -/* 00F48 80B8F9C8 0C2E3E78 */ jal func_80B8F9E0 -/* 00F4C 80B8F9CC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -.L80B8F9D0: -/* 00F50 80B8F9D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F54 80B8F9D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F58 80B8F9D8 03E00008 */ jr $ra -/* 00F5C 80B8F9DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F9E0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F9E0.s deleted file mode 100644 index 98e344ccd1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F9E0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B8F9E0 -/* 00F60 80B8F9E0 3C0E80B9 */ lui $t6, %hi(func_80B8FA20) ## $t6 = 80B90000 -/* 00F64 80B8F9E4 25CEFA20 */ addiu $t6, $t6, %lo(func_80B8FA20) ## $t6 = 80B8FA20 -/* 00F68 80B8F9E8 240F0BB8 */ addiu $t7, $zero, 0x0BB8 ## $t7 = 00000BB8 -/* 00F6C 80B8F9EC 241800C8 */ addiu $t8, $zero, 0x00C8 ## $t8 = 000000C8 -/* 00F70 80B8F9F0 24193E80 */ addiu $t9, $zero, 0x3E80 ## $t9 = 00003E80 -/* 00F74 80B8F9F4 240801F4 */ addiu $t0, $zero, 0x01F4 ## $t0 = 000001F4 -/* 00F78 80B8F9F8 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 -/* 00F7C 80B8F9FC AC8E01BC */ sw $t6, 0x01BC($a0) ## 000001BC -/* 00F80 80B8FA00 A48F01C2 */ sh $t7, 0x01C2($a0) ## 000001C2 -/* 00F84 80B8FA04 A48001C4 */ sh $zero, 0x01C4($a0) ## 000001C4 -/* 00F88 80B8FA08 A49801C6 */ sh $t8, 0x01C6($a0) ## 000001C6 -/* 00F8C 80B8FA0C A49901C8 */ sh $t9, 0x01C8($a0) ## 000001C8 -/* 00F90 80B8FA10 A48801CA */ sh $t0, 0x01CA($a0) ## 000001CA -/* 00F94 80B8FA14 A48001CC */ sh $zero, 0x01CC($a0) ## 000001CC -/* 00F98 80B8FA18 03E00008 */ jr $ra -/* 00F9C 80B8FA1C A48901C0 */ sh $t1, 0x01C0($a0) ## 000001C0 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FA20.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FA20.s deleted file mode 100644 index 1ffdc2c79f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FA20.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B8FA20 -/* 00FA0 80B8FA20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00FA4 80B8FA24 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00FA8 80B8FA28 848E01C0 */ lh $t6, 0x01C0($a0) ## 000001C0 -/* 00FAC 80B8FA2C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00FB0 80B8FA30 241907D0 */ addiu $t9, $zero, 0x07D0 ## $t9 = 000007D0 -/* 00FB4 80B8FA34 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 00FB8 80B8FA38 A48F01C0 */ sh $t7, 0x01C0($a0) ## 000001C0 -/* 00FBC 80B8FA3C 849801C0 */ lh $t8, 0x01C0($a0) ## 000001C0 -/* 00FC0 80B8FA40 17010002 */ bne $t8, $at, .L80B8FA4C -/* 00FC4 80B8FA44 00000000 */ nop -/* 00FC8 80B8FA48 A49901CC */ sh $t9, 0x01CC($a0) ## 000001CC -.L80B8FA4C: -/* 00FCC 80B8FA4C 0C2E3D67 */ jal func_80B8F59C -/* 00FD0 80B8FA50 AFA40018 */ sw $a0, 0x0018($sp) -/* 00FD4 80B8FA54 8FA40018 */ lw $a0, 0x0018($sp) -/* 00FD8 80B8FA58 848801C2 */ lh $t0, 0x01C2($a0) ## 000001C2 -/* 00FDC 80B8FA5C 5D000004 */ bgtzl $t0, .L80B8FA70 -/* 00FE0 80B8FA60 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00FE4 80B8FA64 0C2E3D97 */ jal func_80B8F65C -/* 00FE8 80B8FA68 00000000 */ nop -/* 00FEC 80B8FA6C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B8FA70: -/* 00FF0 80B8FA70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00FF4 80B8FA74 03E00008 */ jr $ra -/* 00FF8 80B8FA78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD50.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD50.s deleted file mode 100644 index ae3245f42d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD50.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B8FD50 -/* 012D0 80B8FD50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012D4 80B8FD54 3C0E80B9 */ lui $t6, %hi(func_80B8FD8C) ## $t6 = 80B90000 -/* 012D8 80B8FD58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012DC 80B8FD5C 25CEFD8C */ addiu $t6, $t6, %lo(func_80B8FD8C) ## $t6 = 80B8FD8C -/* 012E0 80B8FD60 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 012E4 80B8FD64 AFA40018 */ sw $a0, 0x0018($sp) -/* 012E8 80B8FD68 0C2E3BCA */ jal func_80B8EF28 -/* 012EC 80B8FD6C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 012F0 80B8FD70 8FA40018 */ lw $a0, 0x0018($sp) -/* 012F4 80B8FD74 240F002F */ addiu $t7, $zero, 0x002F ## $t7 = 0000002F -/* 012F8 80B8FD78 A48F010E */ sh $t7, 0x010E($a0) ## 0000010E -/* 012FC 80B8FD7C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01300 80B8FD80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01304 80B8FD84 03E00008 */ jr $ra -/* 01308 80B8FD88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD8C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD8C.s deleted file mode 100644 index ff0443fe78..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD8C.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80B8FD8C -/* 0130C 80B8FD8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01310 80B8FD90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01314 80B8FD94 AFA40018 */ sw $a0, 0x0018($sp) -/* 01318 80B8FD98 0C00BC65 */ jal func_8002F194 -/* 0131C 80B8FD9C AFA5001C */ sw $a1, 0x001C($sp) -/* 01320 80B8FDA0 1040000F */ beq $v0, $zero, .L80B8FDE0 -/* 01324 80B8FDA4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01328 80B8FDA8 0C00BCDA */ jal func_8002F368 -/* 0132C 80B8FDAC 8FA4001C */ lw $a0, 0x001C($sp) -/* 01330 80B8FDB0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01334 80B8FDB4 5441000F */ bnel $v0, $at, .L80B8FDF4 -/* 01338 80B8FDB8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0133C 80B8FDBC 0C2E3F80 */ jal func_80B8FE00 -/* 01340 80B8FDC0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01344 80B8FDC4 8FAE0018 */ lw $t6, 0x0018($sp) -/* 01348 80B8FDC8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0134C 80B8FDCC 85C5001C */ lh $a1, 0x001C($t6) ## 0000001C -/* 01350 80B8FDD0 0C00B2DD */ jal Flags_SetSwitch - -/* 01354 80B8FDD4 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 01358 80B8FDD8 10000006 */ beq $zero, $zero, .L80B8FDF4 -/* 0135C 80B8FDDC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B8FDE0: -/* 01360 80B8FDE0 8FA5001C */ lw $a1, 0x001C($sp) -/* 01364 80B8FDE4 3C064220 */ lui $a2, 0x4220 ## $a2 = 42200000 -/* 01368 80B8FDE8 0C00BCA6 */ jal func_8002F298 -/* 0136C 80B8FDEC 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 01370 80B8FDF0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B8FDF4: -/* 01374 80B8FDF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01378 80B8FDF8 03E00008 */ jr $ra -/* 0137C 80B8FDFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE00.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE00.s deleted file mode 100644 index c38d685245..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE00.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B8FE00 -/* 01380 80B8FE00 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01384 80B8FE04 3C0E80B9 */ lui $t6, %hi(func_80B8FE3C) ## $t6 = 80B90000 -/* 01388 80B8FE08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0138C 80B8FE0C 25CEFE3C */ addiu $t6, $t6, %lo(func_80B8FE3C) ## $t6 = 80B8FE3C -/* 01390 80B8FE10 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 01394 80B8FE14 AFA40018 */ sw $a0, 0x0018($sp) -/* 01398 80B8FE18 0C2E3BCA */ jal func_80B8EF28 -/* 0139C 80B8FE1C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 013A0 80B8FE20 8FA40018 */ lw $a0, 0x0018($sp) -/* 013A4 80B8FE24 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 013A8 80B8FE28 A48F01B4 */ sh $t7, 0x01B4($a0) ## 000001B4 -/* 013AC 80B8FE2C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013B0 80B8FE30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013B4 80B8FE34 03E00008 */ jr $ra -/* 013B8 80B8FE38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE3C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE3C.s deleted file mode 100644 index d1dd341711..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE3C.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80B8FE3C -/* 013BC 80B8FE3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 013C0 80B8FE40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 013C4 80B8FE44 AFA5001C */ sw $a1, 0x001C($sp) -/* 013C8 80B8FE48 848E01B4 */ lh $t6, 0x01B4($a0) ## 000001B4 -/* 013CC 80B8FE4C 5DC00004 */ bgtzl $t6, .L80B8FE60 -/* 013D0 80B8FE50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013D4 80B8FE54 0C2E3F9B */ jal func_80B8FE6C -/* 013D8 80B8FE58 00000000 */ nop -/* 013DC 80B8FE5C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B8FE60: -/* 013E0 80B8FE60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013E4 80B8FE64 03E00008 */ jr $ra -/* 013E8 80B8FE68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE6C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE6C.s deleted file mode 100644 index 4d8a575aa9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE6C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B8FE6C -/* 013EC 80B8FE6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 013F0 80B8FE70 3C0E80B9 */ lui $t6, %hi(func_80B8FEAC) ## $t6 = 80B90000 -/* 013F4 80B8FE74 AFBF0014 */ sw $ra, 0x0014($sp) -/* 013F8 80B8FE78 25CEFEAC */ addiu $t6, $t6, %lo(func_80B8FEAC) ## $t6 = 80B8FEAC -/* 013FC 80B8FE7C AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 01400 80B8FE80 AFA40018 */ sw $a0, 0x0018($sp) -/* 01404 80B8FE84 0C2E3BCA */ jal func_80B8EF28 -/* 01408 80B8FE88 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 0140C 80B8FE8C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 01410 80B8FE90 8FA40018 */ lw $a0, 0x0018($sp) -/* 01414 80B8FE94 0C00B58B */ jal Actor_SetScale - -/* 01418 80B8FE98 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 0141C 80B8FE9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01420 80B8FEA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01424 80B8FEA4 03E00008 */ jr $ra -/* 01428 80B8FEA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FEAC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FEAC.s deleted file mode 100644 index 70b50dd0b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FEAC.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80B8FEAC -/* 0142C 80B8FEAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01430 80B8FEB0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01434 80B8FEB4 AFA5002C */ sw $a1, 0x002C($sp) -/* 01438 80B8FEB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0143C 80B8FEBC AFBF001C */ sw $ra, 0x001C($sp) -/* 01440 80B8FEC0 3C053E2A */ lui $a1, 0x3E2A ## $a1 = 3E2A0000 -/* 01444 80B8FEC4 3C063C23 */ lui $a2, 0x3C23 ## $a2 = 3C230000 -/* 01448 80B8FEC8 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3C23D70A -/* 0144C 80B8FECC 34A5BA63 */ ori $a1, $a1, 0xBA63 ## $a1 = 3E2ABA63 -/* 01450 80B8FED0 0C01DE80 */ jal Math_StepToF - -/* 01454 80B8FED4 24840054 */ addiu $a0, $a0, 0x0054 ## $a0 = 00000054 -/* 01458 80B8FED8 30430001 */ andi $v1, $v0, 0x0001 ## $v1 = 00000000 -/* 0145C 80B8FEDC 3C053D12 */ lui $a1, 0x3D12 ## $a1 = 3D120000 -/* 01460 80B8FEE0 3C063A94 */ lui $a2, 0x3A94 ## $a2 = 3A940000 -/* 01464 80B8FEE4 34C61C82 */ ori $a2, $a2, 0x1C82 ## $a2 = 3A941C82 -/* 01468 80B8FEE8 34A531C4 */ ori $a1, $a1, 0x31C4 ## $a1 = 3D1231C4 -/* 0146C 80B8FEEC AFA30024 */ sw $v1, 0x0024($sp) -/* 01470 80B8FEF0 0C01DE80 */ jal Math_StepToF - -/* 01474 80B8FEF4 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 -/* 01478 80B8FEF8 8FA30024 */ lw $v1, 0x0024($sp) -/* 0147C 80B8FEFC C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 -/* 01480 80B8FF00 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01484 80B8FF04 00621824 */ and $v1, $v1, $v0 -/* 01488 80B8FF08 10600008 */ beq $v1, $zero, .L80B8FF2C -/* 0148C 80B8FF0C E6040058 */ swc1 $f4, 0x0058($s0) ## 00000058 -/* 01490 80B8FF10 860E01B4 */ lh $t6, 0x01B4($s0) ## 000001B4 -/* 01494 80B8FF14 5DC00007 */ bgtzl $t6, .L80B8FF34 -/* 01498 80B8FF18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0149C 80B8FF1C 0C2E3FD4 */ jal func_80B8FF50 -/* 014A0 80B8FF20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014A4 80B8FF24 10000003 */ beq $zero, $zero, .L80B8FF34 -/* 014A8 80B8FF28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B8FF2C: -/* 014AC 80B8FF2C A60F01B4 */ sh $t7, 0x01B4($s0) ## 000001B4 -/* 014B0 80B8FF30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B8FF34: -/* 014B4 80B8FF34 0C00BE5D */ jal func_8002F974 -/* 014B8 80B8FF38 240500C6 */ addiu $a1, $zero, 0x00C6 ## $a1 = 000000C6 -/* 014BC 80B8FF3C 8FBF001C */ lw $ra, 0x001C($sp) -/* 014C0 80B8FF40 8FB00018 */ lw $s0, 0x0018($sp) -/* 014C4 80B8FF44 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 014C8 80B8FF48 03E00008 */ jr $ra -/* 014CC 80B8FF4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF50.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF50.s deleted file mode 100644 index 7376ff8a55..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF50.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B8FF50 -/* 014D0 80B8FF50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014D4 80B8FF54 3C0E80B9 */ lui $t6, %hi(func_80B8FF8C) ## $t6 = 80B90000 -/* 014D8 80B8FF58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 014DC 80B8FF5C 25CEFF8C */ addiu $t6, $t6, %lo(func_80B8FF8C) ## $t6 = 80B8FF8C -/* 014E0 80B8FF60 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 014E4 80B8FF64 AFA40018 */ sw $a0, 0x0018($sp) -/* 014E8 80B8FF68 0C2E3BCA */ jal func_80B8EF28 -/* 014EC 80B8FF6C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 014F0 80B8FF70 8FA40018 */ lw $a0, 0x0018($sp) -/* 014F4 80B8FF74 240F33E9 */ addiu $t7, $zero, 0x33E9 ## $t7 = 000033E9 -/* 014F8 80B8FF78 A48F01B6 */ sh $t7, 0x01B6($a0) ## 000001B6 -/* 014FC 80B8FF7C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01500 80B8FF80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01504 80B8FF84 03E00008 */ jr $ra -/* 01508 80B8FF88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF8C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF8C.s deleted file mode 100644 index 70842ab3f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF8C.s +++ /dev/null @@ -1,44 +0,0 @@ -.late_rodata -glabel D_80B91048 - .float 0.17434467 -glabel D_80B9104C - .float 0.12207746 - -.text -glabel func_80B8FF8C -/* 0150C 80B8FF8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01510 80B8FF90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01514 80B8FF94 AFA40018 */ sw $a0, 0x0018($sp) -/* 01518 80B8FF98 AFA5001C */ sw $a1, 0x001C($sp) -/* 0151C 80B8FF9C 848E01B6 */ lh $t6, 0x01B6($a0) ## 000001B6 -/* 01520 80B8FFA0 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 01524 80B8FFA4 25CFF6A0 */ addiu $t7, $t6, 0xF6A0 ## $t7 = FFFFF6A0 -/* 01528 80B8FFA8 A48F01B6 */ sh $t7, 0x01B6($a0) ## 000001B6 -/* 0152C 80B8FFAC 848401B6 */ lh $a0, 0x01B6($a0) ## 000001B6 -/* 01530 80B8FFB0 0C01DE1C */ jal Math_SinS - ## sins? -/* 01534 80B8FFB4 AFA50018 */ sw $a1, 0x0018($sp) -/* 01538 80B8FFB8 3C0180B9 */ lui $at, %hi(D_80B91048) ## $at = 80B90000 -/* 0153C 80B8FFBC C4241048 */ lwc1 $f4, %lo(D_80B91048)($at) -/* 01540 80B8FFC0 8FA50018 */ lw $a1, 0x0018($sp) -/* 01544 80B8FFC4 46040182 */ mul.s $f6, $f0, $f4 -/* 01548 80B8FFC8 84A401B6 */ lh $a0, 0x01B6($a1) ## 000001B6 -/* 0154C 80B8FFCC 0C01DE0D */ jal Math_CosS - ## coss? -/* 01550 80B8FFD0 E4A60054 */ swc1 $f6, 0x0054($a1) ## 00000054 -/* 01554 80B8FFD4 3C0180B9 */ lui $at, %hi(D_80B9104C) ## $at = 80B90000 -/* 01558 80B8FFD8 C428104C */ lwc1 $f8, %lo(D_80B9104C)($at) -/* 0155C 80B8FFDC 8FA50018 */ lw $a1, 0x0018($sp) -/* 01560 80B8FFE0 46080082 */ mul.s $f2, $f0, $f8 -/* 01564 80B8FFE4 84B801B6 */ lh $t8, 0x01B6($a1) ## 000001B6 -/* 01568 80B8FFE8 2B0118E4 */ slti $at, $t8, 0x18E4 -/* 0156C 80B8FFEC E4A20058 */ swc1 $f2, 0x0058($a1) ## 00000058 -/* 01570 80B8FFF0 10200003 */ beq $at, $zero, .L80B90000 -/* 01574 80B8FFF4 E4A20050 */ swc1 $f2, 0x0050($a1) ## 00000050 -/* 01578 80B8FFF8 0C2E4004 */ jal func_80B90010 -/* 0157C 80B8FFFC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -.L80B90000: -/* 01580 80B90000 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01584 80B90004 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01588 80B90008 03E00008 */ jr $ra -/* 0158C 80B9000C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90010.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90010.s deleted file mode 100644 index 0f30d4b929..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90010.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B90010 -/* 01590 80B90010 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01594 80B90014 3C0E80B9 */ lui $t6, %hi(func_80B90050) ## $t6 = 80B90000 -/* 01598 80B90018 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0159C 80B9001C 25CE0050 */ addiu $t6, $t6, %lo(func_80B90050) ## $t6 = 80B90050 -/* 015A0 80B90020 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 015A4 80B90024 AFA40018 */ sw $a0, 0x0018($sp) -/* 015A8 80B90028 0C2E3BCA */ jal func_80B8EF28 -/* 015AC 80B9002C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 015B0 80B90030 8FA40018 */ lw $a0, 0x0018($sp) -/* 015B4 80B90034 240F0BB8 */ addiu $t7, $zero, 0x0BB8 ## $t7 = 00000BB8 -/* 015B8 80B90038 A48001B6 */ sh $zero, 0x01B6($a0) ## 000001B6 -/* 015BC 80B9003C A48F01B8 */ sh $t7, 0x01B8($a0) ## 000001B8 -/* 015C0 80B90040 8FBF0014 */ lw $ra, 0x0014($sp) -/* 015C4 80B90044 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 015C8 80B90048 03E00008 */ jr $ra -/* 015CC 80B9004C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90050.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90050.s deleted file mode 100644 index c942ec6801..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90050.s +++ /dev/null @@ -1,62 +0,0 @@ -.late_rodata -glabel D_80B91050 - .float 6372.0 -glabel D_80B91054 - .float 0.17434467 -glabel D_80B91058 - .float 0.12207746 - -.text -glabel func_80B90050 -/* 015D0 80B90050 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 015D4 80B90054 AFBF001C */ sw $ra, 0x001C($sp) -/* 015D8 80B90058 AFB00018 */ sw $s0, 0x0018($sp) -/* 015DC 80B9005C AFA5002C */ sw $a1, 0x002C($sp) -/* 015E0 80B90060 848E01B6 */ lh $t6, 0x01B6($a0) ## 000001B6 -/* 015E4 80B90064 849801B8 */ lh $t8, 0x01B8($a0) ## 000001B8 -/* 015E8 80B90068 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 015EC 80B9006C 25CF3E80 */ addiu $t7, $t6, 0x3E80 ## $t7 = 00003E80 -/* 015F0 80B90070 2719FF38 */ addiu $t9, $t8, 0xFF38 ## $t9 = FFFFFF38 -/* 015F4 80B90074 A48F01B6 */ sh $t7, 0x01B6($a0) ## 000001B6 -/* 015F8 80B90078 A49901B8 */ sh $t9, 0x01B8($a0) ## 000001B8 -/* 015FC 80B9007C 0C01DE1C */ jal Math_SinS - ## sins? -/* 01600 80B90080 848401B6 */ lh $a0, 0x01B6($a0) ## 000001B6 -/* 01604 80B90084 860801B8 */ lh $t0, 0x01B8($s0) ## 000001B8 -/* 01608 80B90088 3C0180B9 */ lui $at, %hi(D_80B91050) ## $at = 80B90000 -/* 0160C 80B9008C C4241050 */ lwc1 $f4, %lo(D_80B91050)($at) -/* 01610 80B90090 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 -/* 01614 80B90094 00000000 */ nop -/* 01618 80B90098 46803220 */ cvt.s.w $f8, $f6 -/* 0161C 80B9009C 46080282 */ mul.s $f10, $f0, $f8 -/* 01620 80B900A0 460A2401 */ sub.s $f16, $f4, $f10 -/* 01624 80B900A4 4600848D */ trunc.w.s $f18, $f16 -/* 01628 80B900A8 44049000 */ mfc1 $a0, $f18 -/* 0162C 80B900AC 00000000 */ nop -/* 01630 80B900B0 00042400 */ sll $a0, $a0, 16 -/* 01634 80B900B4 00042403 */ sra $a0, $a0, 16 -/* 01638 80B900B8 0C01DE1C */ jal Math_SinS - ## sins? -/* 0163C 80B900BC A7A40026 */ sh $a0, 0x0026($sp) -/* 01640 80B900C0 3C0180B9 */ lui $at, %hi(D_80B91054) ## $at = 80B90000 -/* 01644 80B900C4 C4261054 */ lwc1 $f6, %lo(D_80B91054)($at) -/* 01648 80B900C8 87A40026 */ lh $a0, 0x0026($sp) -/* 0164C 80B900CC 46060202 */ mul.s $f8, $f0, $f6 -/* 01650 80B900D0 0C01DE0D */ jal Math_CosS - ## coss? -/* 01654 80B900D4 E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 -/* 01658 80B900D8 3C0180B9 */ lui $at, %hi(D_80B91058) ## $at = 80B90000 -/* 0165C 80B900DC C4241058 */ lwc1 $f4, %lo(D_80B91058)($at) -/* 01660 80B900E0 860A01B8 */ lh $t2, 0x01B8($s0) ## 000001B8 -/* 01664 80B900E4 46040082 */ mul.s $f2, $f0, $f4 -/* 01668 80B900E8 E6020058 */ swc1 $f2, 0x0058($s0) ## 00000058 -/* 0166C 80B900EC 05410003 */ bgez $t2, .L80B900FC -/* 01670 80B900F0 E6020050 */ swc1 $f2, 0x0050($s0) ## 00000050 -/* 01674 80B900F4 0C2E4044 */ jal func_80B90110 -/* 01678 80B900F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B900FC: -/* 0167C 80B900FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01680 80B90100 8FB00018 */ lw $s0, 0x0018($sp) -/* 01684 80B90104 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01688 80B90108 03E00008 */ jr $ra -/* 0168C 80B9010C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90110.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90110.s deleted file mode 100644 index 3ca6c165e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90110.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B90110 -/* 01690 80B90110 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01694 80B90114 3C0E80B9 */ lui $t6, %hi(func_80B90158) ## $t6 = 80B90000 -/* 01698 80B90118 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0169C 80B9011C 25CE0158 */ addiu $t6, $t6, %lo(func_80B90158) ## $t6 = 80B90158 -/* 016A0 80B90120 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 016A4 80B90124 AFA40018 */ sw $a0, 0x0018($sp) -/* 016A8 80B90128 0C2E3BCA */ jal func_80B8EF28 -/* 016AC 80B9012C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 016B0 80B90130 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 016B4 80B90134 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 016B8 80B90138 0C00B58B */ jal Actor_SetScale - -/* 016BC 80B9013C 8FA40018 */ lw $a0, 0x0018($sp) -/* 016C0 80B90140 0C2E3D97 */ jal func_80B8F65C -/* 016C4 80B90144 8FA40018 */ lw $a0, 0x0018($sp) -/* 016C8 80B90148 8FBF0014 */ lw $ra, 0x0014($sp) -/* 016CC 80B9014C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 016D0 80B90150 03E00008 */ jr $ra -/* 016D4 80B90154 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9024C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9024C.s deleted file mode 100644 index 26cd3f6604..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9024C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B9024C -/* 017CC 80B9024C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 017D0 80B90250 3C0E80B9 */ lui $t6, %hi(func_80B90290) ## $t6 = 80B90000 -/* 017D4 80B90254 AFBF0014 */ sw $ra, 0x0014($sp) -/* 017D8 80B90258 25CE0290 */ addiu $t6, $t6, %lo(func_80B90290) ## $t6 = 80B90290 -/* 017DC 80B9025C AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 017E0 80B90260 AFA40018 */ sw $a0, 0x0018($sp) -/* 017E4 80B90264 0C2E3BCA */ jal func_80B8EF28 -/* 017E8 80B90268 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 017EC 80B9026C 0C2E3E03 */ jal func_80B8F80C -/* 017F0 80B90270 8FA40018 */ lw $a0, 0x0018($sp) -/* 017F4 80B90274 8FB80018 */ lw $t8, 0x0018($sp) -/* 017F8 80B90278 240F0032 */ addiu $t7, $zero, 0x0032 ## $t7 = 00000032 -/* 017FC 80B9027C A70F01B4 */ sh $t7, 0x01B4($t8) ## 000001B4 -/* 01800 80B90280 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01804 80B90284 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01808 80B90288 03E00008 */ jr $ra -/* 0180C 80B9028C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90290.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90290.s deleted file mode 100644 index 09f92d8f1a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90290.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B90290 -/* 01810 80B90290 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01814 80B90294 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01818 80B90298 AFA5001C */ sw $a1, 0x001C($sp) -/* 0181C 80B9029C AFA40018 */ sw $a0, 0x0018($sp) -/* 01820 80B902A0 8C9901BC */ lw $t9, 0x01BC($a0) ## 000001BC -/* 01824 80B902A4 0320F809 */ jalr $ra, $t9 -/* 01828 80B902A8 00000000 */ nop -/* 0182C 80B902AC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01830 80B902B0 848E01B4 */ lh $t6, 0x01B4($a0) ## 000001B4 -/* 01834 80B902B4 5DC00004 */ bgtzl $t6, .L80B902C8 -/* 01838 80B902B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0183C 80B902BC 0C2E40B5 */ jal func_80B902D4 -/* 01840 80B902C0 00000000 */ nop -/* 01844 80B902C4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B902C8: -/* 01848 80B902C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0184C 80B902CC 03E00008 */ jr $ra -/* 01850 80B902D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B902D4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B902D4.s deleted file mode 100644 index 501e4ad0ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B902D4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B902D4 -/* 01854 80B902D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01858 80B902D8 3C0E80B9 */ lui $t6, %hi(func_80B90314) ## $t6 = 80B90000 -/* 0185C 80B902DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01860 80B902E0 25CE0314 */ addiu $t6, $t6, %lo(func_80B90314) ## $t6 = 80B90314 -/* 01864 80B902E4 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 01868 80B902E8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0186C 80B902EC 0C2E3BCA */ jal func_80B8EF28 -/* 01870 80B902F0 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 01874 80B902F4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01878 80B902F8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0187C 80B902FC 00000000 */ nop -/* 01880 80B90300 E48401D4 */ swc1 $f4, 0x01D4($a0) ## 000001D4 -/* 01884 80B90304 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01888 80B90308 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0188C 80B9030C 03E00008 */ jr $ra -/* 01890 80B90310 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90314.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90314.s deleted file mode 100644 index 556a158e88..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90314.s +++ /dev/null @@ -1,56 +0,0 @@ -.late_rodata -glabel D_80B9105C - .float 0.001 - -glabel D_80B91060 - .float 700000.0 -glabel D_80B91064 - .float 0.1 - -.text -glabel func_80B90314 -/* 01894 80B90314 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01898 80B90318 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0189C 80B9031C AFA5001C */ sw $a1, 0x001C($sp) -/* 018A0 80B90320 AFA40018 */ sw $a0, 0x0018($sp) -/* 018A4 80B90324 8C9901BC */ lw $t9, 0x01BC($a0) ## 000001BC -/* 018A8 80B90328 0320F809 */ jalr $ra, $t9 -/* 018AC 80B9032C 00000000 */ nop -/* 018B0 80B90330 8FA40018 */ lw $a0, 0x0018($sp) -/* 018B4 80B90334 3C0180B9 */ lui $at, %hi(D_80B9105C) ## $at = 80B90000 -/* 018B8 80B90338 C426105C */ lwc1 $f6, %lo(D_80B9105C)($at) -/* 018BC 80B9033C C48401D4 */ lwc1 $f4, 0x01D4($a0) ## 000001D4 -/* 018C0 80B90340 3C0180B9 */ lui $at, %hi(D_80B91060) ## $at = 80B90000 -/* 018C4 80B90344 848E0016 */ lh $t6, 0x0016($a0) ## 00000016 -/* 018C8 80B90348 46062200 */ add.s $f8, $f4, $f6 -/* 018CC 80B9034C C484000C */ lwc1 $f4, 0x000C($a0) ## 0000000C -/* 018D0 80B90350 E48801D4 */ swc1 $f8, 0x01D4($a0) ## 000001D4 -/* 018D4 80B90354 C42A1060 */ lwc1 $f10, %lo(D_80B91060)($at) -/* 018D8 80B90358 C48001D4 */ lwc1 $f0, 0x01D4($a0) ## 000001D4 -/* 018DC 80B9035C 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 018E0 80B90360 44813000 */ mtc1 $at, $f6 ## $f6 = 800.00 -/* 018E4 80B90364 460A0402 */ mul.s $f16, $f0, $f10 -/* 018E8 80B90368 3C0180B9 */ lui $at, %hi(D_80B91064) ## $at = 80B90000 -/* 018EC 80B9036C 46060202 */ mul.s $f8, $f0, $f6 -/* 018F0 80B90370 4600848D */ trunc.w.s $f18, $f16 -/* 018F4 80B90374 46082280 */ add.s $f10, $f4, $f8 -/* 018F8 80B90378 44099000 */ mfc1 $t1, $f18 -/* 018FC 80B9037C 00000000 */ nop -/* 01900 80B90380 01C95021 */ addu $t2, $t6, $t1 -/* 01904 80B90384 A48A00B6 */ sh $t2, 0x00B6($a0) ## 000000B6 -/* 01908 80B90388 E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 -/* 0190C 80B9038C C4301064 */ lwc1 $f16, %lo(D_80B91064)($at) -/* 01910 80B90390 4600803E */ c.le.s $f16, $f0 -/* 01914 80B90394 00000000 */ nop -/* 01918 80B90398 45000004 */ bc1f .L80B903AC -/* 0191C 80B9039C 00000000 */ nop -/* 01920 80B903A0 0C2E40F1 */ jal func_80B903C4 -/* 01924 80B903A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01928 80B903A8 8FA40018 */ lw $a0, 0x0018($sp) -.L80B903AC: -/* 0192C 80B903AC 0C00BE5D */ jal func_8002F974 -/* 01930 80B903B0 240500C7 */ addiu $a1, $zero, 0x00C7 ## $a1 = 000000C7 -/* 01934 80B903B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01938 80B903B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0193C 80B903BC 03E00008 */ jr $ra -/* 01940 80B903C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B903C4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B903C4.s deleted file mode 100644 index c152a1abfa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B903C4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B903C4 -/* 01944 80B903C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01948 80B903C8 3C0E80B9 */ lui $t6, %hi(func_80B90400) ## $t6 = 80B90000 -/* 0194C 80B903CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01950 80B903D0 25CE0400 */ addiu $t6, $t6, %lo(func_80B90400) ## $t6 = 80B90400 -/* 01954 80B903D4 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 01958 80B903D8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0195C 80B903DC 0C2E3BCA */ jal func_80B8EF28 -/* 01960 80B903E0 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 01964 80B903E4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01968 80B903E8 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 0196C 80B903EC A48F01B4 */ sh $t7, 0x01B4($a0) ## 000001B4 -/* 01970 80B903F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01974 80B903F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01978 80B903F8 03E00008 */ jr $ra -/* 0197C 80B903FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90400.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90400.s deleted file mode 100644 index d80a49a065..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90400.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_80B90400 -/* 01980 80B90400 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01984 80B90404 AFB40028 */ sw $s4, 0x0028($sp) -/* 01988 80B90408 0080A025 */ or $s4, $a0, $zero ## $s4 = 00000000 -/* 0198C 80B9040C AFBF002C */ sw $ra, 0x002C($sp) -/* 01990 80B90410 AFB30024 */ sw $s3, 0x0024($sp) -/* 01994 80B90414 AFB20020 */ sw $s2, 0x0020($sp) -/* 01998 80B90418 AFB1001C */ sw $s1, 0x001C($sp) -/* 0199C 80B9041C AFB00018 */ sw $s0, 0x0018($sp) -/* 019A0 80B90420 8E9901BC */ lw $t9, 0x01BC($s4) ## 000001BC -/* 019A4 80B90424 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 019A8 80B90428 0320F809 */ jalr $ra, $t9 -/* 019AC 80B9042C 00000000 */ nop -/* 019B0 80B90430 868201B4 */ lh $v0, 0x01B4($s4) ## 000001B4 -/* 019B4 80B90434 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 019B8 80B90438 54410006 */ bnel $v0, $at, .L80B90454 -/* 019BC 80B9043C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 019C0 80B90440 0C2E3E53 */ jal func_80B8F94C -/* 019C4 80B90444 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 019C8 80B90448 1000002A */ beq $zero, $zero, .L80B904F4 -/* 019CC 80B9044C 8FBF002C */ lw $ra, 0x002C($sp) -/* 019D0 80B90450 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -.L80B90454: -/* 019D4 80B90454 14410022 */ bne $v0, $at, .L80B904E0 -/* 019D8 80B90458 00000000 */ nop -/* 019DC 80B9045C 928E01F7 */ lbu $t6, 0x01F7($s4) ## 000001F7 -/* 019E0 80B90460 31CF0040 */ andi $t7, $t6, 0x0040 ## $t7 = 00000000 -/* 019E4 80B90464 55E00023 */ bnel $t7, $zero, .L80B904F4 -/* 019E8 80B90468 8FBF002C */ lw $ra, 0x002C($sp) -/* 019EC 80B9046C C6840024 */ lwc1 $f4, 0x0024($s4) ## 00000024 -/* 019F0 80B90470 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 019F4 80B90474 44814000 */ mtc1 $at, $f8 ## $f8 = 25.00 -/* 019F8 80B90478 E7A40038 */ swc1 $f4, 0x0038($sp) -/* 019FC 80B9047C C6860028 */ lwc1 $f6, 0x0028($s4) ## 00000028 -/* 01A00 80B90480 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 01A04 80B90484 24120003 */ addiu $s2, $zero, 0x0003 ## $s2 = 00000003 -/* 01A08 80B90488 46083281 */ sub.s $f10, $f6, $f8 -/* 01A0C 80B9048C 27B10038 */ addiu $s1, $sp, 0x0038 ## $s1 = FFFFFFF0 -/* 01A10 80B90490 E7AA003C */ swc1 $f10, 0x003C($sp) -/* 01A14 80B90494 C690002C */ lwc1 $f16, 0x002C($s4) ## 0000002C -/* 01A18 80B90498 E7B00040 */ swc1 $f16, 0x0040($sp) -/* 01A1C 80B9049C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -.L80B904A0: -/* 01A20 80B904A0 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFF0 -/* 01A24 80B904A4 0C007D52 */ jal Item_DropCollectible - -/* 01A28 80B904A8 24060012 */ addiu $a2, $zero, 0x0012 ## $a2 = 00000012 -/* 01A2C 80B904AC 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 01A30 80B904B0 5612FFFB */ bnel $s0, $s2, .L80B904A0 -/* 01A34 80B904B4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01A38 80B904B8 929801F7 */ lbu $t8, 0x01F7($s4) ## 000001F7 -/* 01A3C 80B904BC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01A40 80B904C0 240528E7 */ addiu $a1, $zero, 0x28E7 ## $a1 = 000028E7 -/* 01A44 80B904C4 37080040 */ ori $t0, $t8, 0x0040 ## $t0 = 00000040 -/* 01A48 80B904C8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01A4C 80B904CC A28801F7 */ sb $t0, 0x01F7($s4) ## 000001F7 -/* 01A50 80B904D0 0C01E221 */ jal func_80078884 -/* 01A54 80B904D4 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 01A58 80B904D8 10000006 */ beq $zero, $zero, .L80B904F4 -/* 01A5C 80B904DC 8FBF002C */ lw $ra, 0x002C($sp) -.L80B904E0: -/* 01A60 80B904E0 5C400004 */ bgtzl $v0, .L80B904F4 -/* 01A64 80B904E4 8FBF002C */ lw $ra, 0x002C($sp) -/* 01A68 80B904E8 0C2E4144 */ jal func_80B90510 -/* 01A6C 80B904EC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01A70 80B904F0 8FBF002C */ lw $ra, 0x002C($sp) -.L80B904F4: -/* 01A74 80B904F4 8FB00018 */ lw $s0, 0x0018($sp) -/* 01A78 80B904F8 8FB1001C */ lw $s1, 0x001C($sp) -/* 01A7C 80B904FC 8FB20020 */ lw $s2, 0x0020($sp) -/* 01A80 80B90500 8FB30024 */ lw $s3, 0x0024($sp) -/* 01A84 80B90504 8FB40028 */ lw $s4, 0x0028($sp) -/* 01A88 80B90508 03E00008 */ jr $ra -/* 01A8C 80B9050C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90510.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90510.s deleted file mode 100644 index fec4b795f1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90510.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B90510 -/* 01A90 80B90510 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01A94 80B90514 3C0E80B9 */ lui $t6, %hi(func_80B90548) ## $t6 = 80B90000 -/* 01A98 80B90518 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01A9C 80B9051C 25CE0548 */ addiu $t6, $t6, %lo(func_80B90548) ## $t6 = 80B90548 -/* 01AA0 80B90520 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 01AA4 80B90524 AFA40018 */ sw $a0, 0x0018($sp) -/* 01AA8 80B90528 0C2E3BCA */ jal func_80B8EF28 -/* 01AAC 80B9052C 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 01AB0 80B90530 0C2E3E35 */ jal func_80B8F8D4 -/* 01AB4 80B90534 8FA40018 */ lw $a0, 0x0018($sp) -/* 01AB8 80B90538 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01ABC 80B9053C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01AC0 80B90540 03E00008 */ jr $ra -/* 01AC4 80B90544 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90548.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90548.s deleted file mode 100644 index 7c4b68c59d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90548.s +++ /dev/null @@ -1,49 +0,0 @@ -.late_rodata -glabel D_80B91068 - .float 0.001 - -glabel D_80B9106C - .float 700000.0 - -.text -glabel func_80B90548 -/* 01AC8 80B90548 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01ACC 80B9054C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01AD0 80B90550 AFA5001C */ sw $a1, 0x001C($sp) -/* 01AD4 80B90554 AFA40018 */ sw $a0, 0x0018($sp) -/* 01AD8 80B90558 8C9901BC */ lw $t9, 0x01BC($a0) ## 000001BC -/* 01ADC 80B9055C 0320F809 */ jalr $ra, $t9 -/* 01AE0 80B90560 00000000 */ nop -/* 01AE4 80B90564 8FA40018 */ lw $a0, 0x0018($sp) -/* 01AE8 80B90568 3C0180B9 */ lui $at, %hi(D_80B91068) ## $at = 80B90000 -/* 01AEC 80B9056C C4261068 */ lwc1 $f6, %lo(D_80B91068)($at) -/* 01AF0 80B90570 C48401D4 */ lwc1 $f4, 0x01D4($a0) ## 000001D4 -/* 01AF4 80B90574 3C0180B9 */ lui $at, %hi(D_80B9106C) ## $at = 80B90000 -/* 01AF8 80B90578 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01AFC 80B9057C 46062201 */ sub.s $f8, $f4, $f6 -/* 01B00 80B90580 C484000C */ lwc1 $f4, 0x000C($a0) ## 0000000C -/* 01B04 80B90584 84820016 */ lh $v0, 0x0016($a0) ## 00000016 -/* 01B08 80B90588 E48801D4 */ swc1 $f8, 0x01D4($a0) ## 000001D4 -/* 01B0C 80B9058C C42A106C */ lwc1 $f10, %lo(D_80B9106C)($at) -/* 01B10 80B90590 C48001D4 */ lwc1 $f0, 0x01D4($a0) ## 000001D4 -/* 01B14 80B90594 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 01B18 80B90598 44813000 */ mtc1 $at, $f6 ## $f6 = 800.00 -/* 01B1C 80B9059C 460A0402 */ mul.s $f16, $f0, $f10 -/* 01B20 80B905A0 4602003E */ c.le.s $f0, $f2 -/* 01B24 80B905A4 46060202 */ mul.s $f8, $f0, $f6 -/* 01B28 80B905A8 4600848D */ trunc.w.s $f18, $f16 -/* 01B2C 80B905AC 46082280 */ add.s $f10, $f4, $f8 -/* 01B30 80B905B0 44089000 */ mfc1 $t0, $f18 -/* 01B34 80B905B4 00000000 */ nop -/* 01B38 80B905B8 00484821 */ addu $t1, $v0, $t0 -/* 01B3C 80B905BC A48900B6 */ sh $t1, 0x00B6($a0) ## 000000B6 -/* 01B40 80B905C0 45000004 */ bc1f .L80B905D4 -/* 01B44 80B905C4 E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 -/* 01B48 80B905C8 E48201D4 */ swc1 $f2, 0x01D4($a0) ## 000001D4 -/* 01B4C 80B905CC 0C2E4179 */ jal func_80B905E4 -/* 01B50 80B905D0 A48200B6 */ sh $v0, 0x00B6($a0) ## 000000B6 -.L80B905D4: -/* 01B54 80B905D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01B58 80B905D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01B5C 80B905DC 03E00008 */ jr $ra -/* 01B60 80B905E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B905E4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B905E4.s deleted file mode 100644 index 77b24e8525..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B905E4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B905E4 -/* 01B64 80B905E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01B68 80B905E8 3C0E80B9 */ lui $t6, %hi(func_80B90620) ## $t6 = 80B90000 -/* 01B6C 80B905EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01B70 80B905F0 25CE0620 */ addiu $t6, $t6, %lo(func_80B90620) ## $t6 = 80B90620 -/* 01B74 80B905F4 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 01B78 80B905F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 01B7C 80B905FC 0C2E3BCA */ jal func_80B8EF28 -/* 01B80 80B90600 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01B84 80B90604 8FA40018 */ lw $a0, 0x0018($sp) -/* 01B88 80B90608 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 01B8C 80B9060C A48F01B4 */ sh $t7, 0x01B4($a0) ## 000001B4 -/* 01B90 80B90610 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01B94 80B90614 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01B98 80B90618 03E00008 */ jr $ra -/* 01B9C 80B9061C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90620.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90620.s deleted file mode 100644 index d07b66d860..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90620.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B90620 -/* 01BA0 80B90620 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01BA4 80B90624 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01BA8 80B90628 AFA5001C */ sw $a1, 0x001C($sp) -/* 01BAC 80B9062C AFA40018 */ sw $a0, 0x0018($sp) -/* 01BB0 80B90630 8C9901BC */ lw $t9, 0x01BC($a0) ## 000001BC -/* 01BB4 80B90634 0320F809 */ jalr $ra, $t9 -/* 01BB8 80B90638 00000000 */ nop -/* 01BBC 80B9063C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01BC0 80B90640 848E01B4 */ lh $t6, 0x01B4($a0) ## 000001B4 -/* 01BC4 80B90644 5DC00009 */ bgtzl $t6, .L80B9066C -/* 01BC8 80B90648 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01BCC 80B9064C 0C2E3FD4 */ jal func_80B8FF50 -/* 01BD0 80B90650 AFA40018 */ sw $a0, 0x0018($sp) -/* 01BD4 80B90654 8FA40018 */ lw $a0, 0x0018($sp) -/* 01BD8 80B90658 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 01BDC 80B9065C 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 01BE0 80B90660 01E1C024 */ and $t8, $t7, $at -/* 01BE4 80B90664 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 01BE8 80B90668 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B9066C: -/* 01BEC 80B9066C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01BF0 80B90670 03E00008 */ jr $ra -/* 01BF4 80B90674 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90678.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90678.s deleted file mode 100644 index 903606dfee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90678.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80B90678 -/* 01BF8 80B90678 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01BFC 80B9067C 3C0E80B9 */ lui $t6, %hi(func_80B906A4) ## $t6 = 80B90000 -/* 01C00 80B90680 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C04 80B90684 25CE06A4 */ addiu $t6, $t6, %lo(func_80B906A4) ## $t6 = 80B906A4 -/* 01C08 80B90688 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 01C0C 80B9068C 0C2E3BCA */ jal func_80B8EF28 -/* 01C10 80B90690 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01C14 80B90694 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01C18 80B90698 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01C1C 80B9069C 03E00008 */ jr $ra -/* 01C20 80B906A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B906A4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B906A4.s deleted file mode 100644 index a67606135c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B906A4.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B906A4 -/* 01C24 80B906A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C28 80B906A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C2C 80B906AC AFA40018 */ sw $a0, 0x0018($sp) -/* 01C30 80B906B0 0C010D5B */ jal func_8004356C -/* 01C34 80B906B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01C38 80B906B8 10400010 */ beq $v0, $zero, .L80B906FC -/* 01C3C 80B906BC 00000000 */ nop -/* 01C40 80B906C0 0C2E41C5 */ jal func_80B90714 -/* 01C44 80B906C4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01C48 80B906C8 8FA3001C */ lw $v1, 0x001C($sp) -/* 01C4C 80B906CC 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B -/* 01C50 80B906D0 2405002C */ addiu $a1, $zero, 0x002C ## $a1 = 0000002C -/* 01C54 80B906D4 846E00A4 */ lh $t6, 0x00A4($v1) ## 000000A4 -/* 01C58 80B906D8 15C10006 */ bne $t6, $at, .L80B906F4 -/* 01C5C 80B906DC 00000000 */ nop -/* 01C60 80B906E0 8C640790 */ lw $a0, 0x0790($v1) ## 00000790 -/* 01C64 80B906E4 0C0169DF */ jal Camera_ChangeSetting -/* 01C68 80B906E8 2405002D */ addiu $a1, $zero, 0x002D ## $a1 = 0000002D -/* 01C6C 80B906EC 10000003 */ beq $zero, $zero, .L80B906FC -/* 01C70 80B906F0 00000000 */ nop -.L80B906F4: -/* 01C74 80B906F4 0C0169DF */ jal Camera_ChangeSetting -/* 01C78 80B906F8 8C640790 */ lw $a0, 0x0790($v1) ## 00000790 -.L80B906FC: -/* 01C7C 80B906FC 0C2E3AF9 */ jal func_80B8EBE4 -/* 01C80 80B90700 8FA40018 */ lw $a0, 0x0018($sp) -/* 01C84 80B90704 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01C88 80B90708 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01C8C 80B9070C 03E00008 */ jr $ra -/* 01C90 80B90710 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90714.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90714.s deleted file mode 100644 index 36a97f52df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90714.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B90714 -/* 01C94 80B90714 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C98 80B90718 3C0E80B9 */ lui $t6, %hi(func_80B9075C) ## $t6 = 80B90000 -/* 01C9C 80B9071C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01CA0 80B90720 25CE075C */ addiu $t6, $t6, %lo(func_80B9075C) ## $t6 = 80B9075C -/* 01CA4 80B90724 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 01CA8 80B90728 AFA40018 */ sw $a0, 0x0018($sp) -/* 01CAC 80B9072C 0C2E3BCA */ jal func_80B8EF28 -/* 01CB0 80B90730 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01CB4 80B90734 8FA40018 */ lw $a0, 0x0018($sp) -/* 01CB8 80B90738 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01CBC 80B9073C 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 01CC0 80B90740 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01CC4 80B90744 35F80010 */ ori $t8, $t7, 0x0010 ## $t8 = 00000010 -/* 01CC8 80B90748 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 01CCC 80B9074C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01CD0 80B90750 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01CD4 80B90754 03E00008 */ jr $ra -/* 01CD8 80B90758 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9075C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9075C.s deleted file mode 100644 index 49542809e7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9075C.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel func_80B9075C -/* 01CDC 80B9075C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01CE0 80B90760 AFBF001C */ sw $ra, 0x001C($sp) -/* 01CE4 80B90764 AFB10018 */ sw $s1, 0x0018($sp) -/* 01CE8 80B90768 AFB00014 */ sw $s0, 0x0014($sp) -/* 01CEC 80B9076C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01CF0 80B90770 0C2E3BFD */ jal func_80B8EFF4 -/* 01CF4 80B90774 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01CF8 80B90778 862E01F0 */ lh $t6, 0x01F0($s1) ## 000001F0 -/* 01CFC 80B9077C 862F01F2 */ lh $t7, 0x01F2($s1) ## 000001F2 -/* 01D00 80B90780 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01D04 80B90784 15CF0017 */ bne $t6, $t7, .L80B907E4 -/* 01D08 80B90788 00000000 */ nop -/* 01D0C 80B9078C 0C2E3BD1 */ jal func_80B8EF44 -/* 01D10 80B90790 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01D14 80B90794 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01D18 80B90798 0C2E3BE0 */ jal func_80B8EF80 -/* 01D1C 80B9079C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01D20 80B907A0 0C2E4221 */ jal func_80B90884 -/* 01D24 80B907A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01D28 80B907A8 8E380004 */ lw $t8, 0x0004($s1) ## 00000004 -/* 01D2C 80B907AC 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 01D30 80B907B0 0301C824 */ and $t9, $t8, $at -/* 01D34 80B907B4 AE390004 */ sw $t9, 0x0004($s1) ## 00000004 -/* 01D38 80B907B8 8E040790 */ lw $a0, 0x0790($s0) ## 00000790 -/* 01D3C 80B907BC 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D -/* 01D40 80B907C0 84820142 */ lh $v0, 0x0142($a0) ## 00000142 -/* 01D44 80B907C4 10410003 */ beq $v0, $at, .L80B907D4 -/* 01D48 80B907C8 2401002C */ addiu $at, $zero, 0x002C ## $at = 0000002C -/* 01D4C 80B907CC 14410026 */ bne $v0, $at, .L80B90868 -/* 01D50 80B907D0 00000000 */ nop -.L80B907D4: -/* 01D54 80B907D4 0C0169DF */ jal Camera_ChangeSetting -/* 01D58 80B907D8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01D5C 80B907DC 10000022 */ beq $zero, $zero, .L80B90868 -/* 01D60 80B907E0 00000000 */ nop -.L80B907E4: -/* 01D64 80B907E4 0C010D5B */ jal func_8004356C -/* 01D68 80B907E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01D6C 80B907EC 10400011 */ beq $v0, $zero, .L80B90834 -/* 01D70 80B907F0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01D74 80B907F4 0C00BE5D */ jal func_8002F974 -/* 01D78 80B907F8 240500CA */ addiu $a1, $zero, 0x00CA ## $a1 = 000000CA -/* 01D7C 80B907FC 860800A4 */ lh $t0, 0x00A4($s0) ## 000000A4 -/* 01D80 80B90800 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B -/* 01D84 80B90804 2405002C */ addiu $a1, $zero, 0x002C ## $a1 = 0000002C -/* 01D88 80B90808 15010006 */ bne $t0, $at, .L80B90824 -/* 01D8C 80B9080C 00000000 */ nop -/* 01D90 80B90810 8E040790 */ lw $a0, 0x0790($s0) ## 00000790 -/* 01D94 80B90814 0C0169DF */ jal Camera_ChangeSetting -/* 01D98 80B90818 2405002D */ addiu $a1, $zero, 0x002D ## $a1 = 0000002D -/* 01D9C 80B9081C 10000012 */ beq $zero, $zero, .L80B90868 -/* 01DA0 80B90820 00000000 */ nop -.L80B90824: -/* 01DA4 80B90824 0C0169DF */ jal Camera_ChangeSetting -/* 01DA8 80B90828 8E040790 */ lw $a0, 0x0790($s0) ## 00000790 -/* 01DAC 80B9082C 1000000E */ beq $zero, $zero, .L80B90868 -/* 01DB0 80B90830 00000000 */ nop -.L80B90834: -/* 01DB4 80B90834 922901F7 */ lbu $t1, 0x01F7($s1) ## 000001F7 -/* 01DB8 80B90838 312A0080 */ andi $t2, $t1, 0x0080 ## $t2 = 00000000 -/* 01DBC 80B9083C 1140000A */ beq $t2, $zero, .L80B90868 -/* 01DC0 80B90840 00000000 */ nop -/* 01DC4 80B90844 8E040790 */ lw $a0, 0x0790($s0) ## 00000790 -/* 01DC8 80B90848 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D -/* 01DCC 80B9084C 84820142 */ lh $v0, 0x0142($a0) ## 00000142 -/* 01DD0 80B90850 10410003 */ beq $v0, $at, .L80B90860 -/* 01DD4 80B90854 2401002C */ addiu $at, $zero, 0x002C ## $at = 0000002C -/* 01DD8 80B90858 14410003 */ bne $v0, $at, .L80B90868 -/* 01DDC 80B9085C 00000000 */ nop -.L80B90860: -/* 01DE0 80B90860 0C0169DF */ jal Camera_ChangeSetting -/* 01DE4 80B90864 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -.L80B90868: -/* 01DE8 80B90868 0C2E3AF9 */ jal func_80B8EBE4 -/* 01DEC 80B9086C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01DF0 80B90870 8FBF001C */ lw $ra, 0x001C($sp) -/* 01DF4 80B90874 8FB00014 */ lw $s0, 0x0014($sp) -/* 01DF8 80B90878 8FB10018 */ lw $s1, 0x0018($sp) -/* 01DFC 80B9087C 03E00008 */ jr $ra -/* 01E00 80B90880 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90884.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90884.s deleted file mode 100644 index 03dfa0215e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90884.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80B90884 -/* 01E04 80B90884 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01E08 80B90888 3C0E80B9 */ lui $t6, %hi(func_80B908B0) ## $t6 = 80B90000 -/* 01E0C 80B9088C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01E10 80B90890 25CE08B0 */ addiu $t6, $t6, %lo(func_80B908B0) ## $t6 = 80B908B0 -/* 01E14 80B90894 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 01E18 80B90898 0C2E3BCA */ jal func_80B8EF28 -/* 01E1C 80B9089C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01E20 80B908A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E24 80B908A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E28 80B908A8 03E00008 */ jr $ra -/* 01E2C 80B908AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908B0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908B0.s deleted file mode 100644 index 1615fd3370..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908B0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B908B0 -/* 01E30 80B908B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01E34 80B908B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01E38 80B908B8 AFA40018 */ sw $a0, 0x0018($sp) -/* 01E3C 80B908BC 0C010D64 */ jal func_80043590 -/* 01E40 80B908C0 AFA5001C */ sw $a1, 0x001C($sp) -/* 01E44 80B908C4 14400003 */ bne $v0, $zero, .L80B908D4 -/* 01E48 80B908C8 00000000 */ nop -/* 01E4C 80B908CC 0C2E419E */ jal func_80B90678 -/* 01E50 80B908D0 8FA40018 */ lw $a0, 0x0018($sp) -.L80B908D4: -/* 01E54 80B908D4 0C2E3AF9 */ jal func_80B8EBE4 -/* 01E58 80B908D8 8FA40018 */ lw $a0, 0x0018($sp) -/* 01E5C 80B908DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E60 80B908E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E64 80B908E4 03E00008 */ jr $ra -/* 01E68 80B908E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908EC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908EC.s deleted file mode 100644 index e31d408024..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908EC.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80B908EC -/* 01E6C 80B908EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01E70 80B908F0 3C0E80B9 */ lui $t6, %hi(func_80B90918) ## $t6 = 80B90000 -/* 01E74 80B908F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01E78 80B908F8 25CE0918 */ addiu $t6, $t6, %lo(func_80B90918) ## $t6 = 80B90918 -/* 01E7C 80B908FC AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 01E80 80B90900 0C2E3BCA */ jal func_80B8EF28 -/* 01E84 80B90904 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01E88 80B90908 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E8C 80B9090C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E90 80B90910 03E00008 */ jr $ra -/* 01E94 80B90914 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90918.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90918.s deleted file mode 100644 index c785c367e8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90918.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B90918 -/* 01E98 80B90918 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01E9C 80B9091C AFBF001C */ sw $ra, 0x001C($sp) -/* 01EA0 80B90920 AFB00018 */ sw $s0, 0x0018($sp) -/* 01EA4 80B90924 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01EA8 80B90928 0C010D5B */ jal func_8004356C -/* 01EAC 80B9092C AFA50024 */ sw $a1, 0x0024($sp) -/* 01EB0 80B90930 1440000A */ bne $v0, $zero, .L80B9095C -/* 01EB4 80B90934 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EB8 80B90938 0C2E3BD1 */ jal func_80B8EF44 -/* 01EBC 80B9093C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01EC0 80B90940 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EC4 80B90944 0C2E3BE0 */ jal func_80B8EF80 -/* 01EC8 80B90948 8FA50024 */ lw $a1, 0x0024($sp) -/* 01ECC 80B9094C 0C2E3BBF */ jal func_80B8EEFC -/* 01ED0 80B90950 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01ED4 80B90954 0C2E425C */ jal func_80B90970 -/* 01ED8 80B90958 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B9095C: -/* 01EDC 80B9095C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01EE0 80B90960 8FB00018 */ lw $s0, 0x0018($sp) -/* 01EE4 80B90964 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01EE8 80B90968 03E00008 */ jr $ra -/* 01EEC 80B9096C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90970.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90970.s deleted file mode 100644 index 3393b4a605..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90970.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B90970 -/* 01EF0 80B90970 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01EF4 80B90974 3C0E80B9 */ lui $t6, %hi(func_80B909B0) ## $t6 = 80B90000 -/* 01EF8 80B90978 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01EFC 80B9097C 25CE09B0 */ addiu $t6, $t6, %lo(func_80B909B0) ## $t6 = 80B909B0 -/* 01F00 80B90980 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 01F04 80B90984 AFA40018 */ sw $a0, 0x0018($sp) -/* 01F08 80B90988 0C2E3BCA */ jal func_80B8EF28 -/* 01F0C 80B9098C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01F10 80B90990 8FA40018 */ lw $a0, 0x0018($sp) -/* 01F14 80B90994 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 01F18 80B90998 0C2E3B7D */ jal func_80B8EDF4 -/* 01F1C 80B9099C A48F01B4 */ sh $t7, 0x01B4($a0) ## 000001B4 -/* 01F20 80B909A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01F24 80B909A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01F28 80B909A8 03E00008 */ jr $ra -/* 01F2C 80B909AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909B0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909B0.s deleted file mode 100644 index fb9a00e7fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909B0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B909B0 -/* 01F30 80B909B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01F34 80B909B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01F38 80B909B8 0C2E3CA6 */ jal func_80B8F298 -/* 01F3C 80B909BC AFA40018 */ sw $a0, 0x0018($sp) -/* 01F40 80B909C0 10400004 */ beq $v0, $zero, .L80B909D4 -/* 01F44 80B909C4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01F48 80B909C8 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 01F4C 80B909CC 10000006 */ beq $zero, $zero, .L80B909E8 -/* 01F50 80B909D0 A48E01B4 */ sh $t6, 0x01B4($a0) ## 000001B4 -.L80B909D4: -/* 01F54 80B909D4 848F01B4 */ lh $t7, 0x01B4($a0) ## 000001B4 -/* 01F58 80B909D8 5DE00004 */ bgtzl $t7, .L80B909EC -/* 01F5C 80B909DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01F60 80B909E0 0C2E427E */ jal func_80B909F8 -/* 01F64 80B909E4 00000000 */ nop -.L80B909E8: -/* 01F68 80B909E8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B909EC: -/* 01F6C 80B909EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01F70 80B909F0 03E00008 */ jr $ra -/* 01F74 80B909F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909F8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909F8.s deleted file mode 100644 index 260b59b784..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909F8.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B909F8 -/* 01F78 80B909F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01F7C 80B909FC 3C0E80B9 */ lui $t6, %hi(func_80B90A34) ## $t6 = 80B90000 -/* 01F80 80B90A00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01F84 80B90A04 25CE0A34 */ addiu $t6, $t6, %lo(func_80B90A34) ## $t6 = 80B90A34 -/* 01F88 80B90A08 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 01F8C 80B90A0C AFA40018 */ sw $a0, 0x0018($sp) -/* 01F90 80B90A10 0C2E3BCA */ jal func_80B8EF28 -/* 01F94 80B90A14 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01F98 80B90A18 8FA40018 */ lw $a0, 0x0018($sp) -/* 01F9C 80B90A1C 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 01FA0 80B90A20 A48F01B4 */ sh $t7, 0x01B4($a0) ## 000001B4 -/* 01FA4 80B90A24 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01FA8 80B90A28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01FAC 80B90A2C 03E00008 */ jr $ra -/* 01FB0 80B90A30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90A34.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90A34.s deleted file mode 100644 index 96de803645..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90A34.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80B90A34 -/* 01FB4 80B90A34 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01FB8 80B90A38 AFBF001C */ sw $ra, 0x001C($sp) -/* 01FBC 80B90A3C AFB00018 */ sw $s0, 0x0018($sp) -/* 01FC0 80B90A40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01FC4 80B90A44 0C2E3CA6 */ jal func_80B8F298 -/* 01FC8 80B90A48 AFA5002C */ sw $a1, 0x002C($sp) -/* 01FCC 80B90A4C AFA20024 */ sw $v0, 0x0024($sp) -/* 01FD0 80B90A50 0C2E3B89 */ jal func_80B8EE24 -/* 01FD4 80B90A54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FD8 80B90A58 8FAE0024 */ lw $t6, 0x0024($sp) -/* 01FDC 80B90A5C 8FA7002C */ lw $a3, 0x002C($sp) -/* 01FE0 80B90A60 11C00007 */ beq $t6, $zero, .L80B90A80 -/* 01FE4 80B90A64 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01FE8 80B90A68 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01FEC 80B90A6C 24E50810 */ addiu $a1, $a3, 0x0810 ## $a1 = 00000810 -/* 01FF0 80B90A70 0C00FB14 */ jal func_8003EC50 -/* 01FF4 80B90A74 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C -/* 01FF8 80B90A78 10000005 */ beq $zero, $zero, .L80B90A90 -/* 01FFC 80B90A7C 860F01B4 */ lh $t7, 0x01B4($s0) ## 000001B4 -.L80B90A80: -/* 02000 80B90A80 24E50810 */ addiu $a1, $a3, 0x0810 ## $a1 = 00000810 -/* 02004 80B90A84 0C00FB14 */ jal func_8003EC50 -/* 02008 80B90A88 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C -/* 0200C 80B90A8C 860F01B4 */ lh $t7, 0x01B4($s0) ## 000001B4 -.L80B90A90: -/* 02010 80B90A90 8FB80024 */ lw $t8, 0x0024($sp) -/* 02014 80B90A94 5DE00008 */ bgtzl $t7, .L80B90AB8 -/* 02018 80B90A98 8FBF001C */ lw $ra, 0x001C($sp) -/* 0201C 80B90A9C 57000006 */ bnel $t8, $zero, .L80B90AB8 -/* 02020 80B90AA0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02024 80B90AA4 0C2E3AF2 */ jal func_80B8EBC8 -/* 02028 80B90AA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0202C 80B90AAC 0C2E419E */ jal func_80B90678 -/* 02030 80B90AB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02034 80B90AB4 8FBF001C */ lw $ra, 0x001C($sp) -.L80B90AB8: -/* 02038 80B90AB8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0203C 80B90ABC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02040 80B90AC0 03E00008 */ jr $ra -/* 02044 80B90AC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s deleted file mode 100644 index 77362e61b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s +++ /dev/null @@ -1,44 +0,0 @@ -.late_rodata -glabel D_80B91070 - .float 9.58738019108e-05 - -glabel D_80B91074 - .float 0.1 - -.text -glabel func_80B90C7C -/* 021FC 80B90C7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02200 80B90C80 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02204 80B90C84 AFA5001C */ sw $a1, 0x001C($sp) -/* 02208 80B90C88 8C860010 */ lw $a2, 0x0010($a0) ## 00000010 -/* 0220C 80B90C8C C48E000C */ lwc1 $f14, 0x000C($a0) ## 0000000C -/* 02210 80B90C90 C48C0008 */ lwc1 $f12, 0x0008($a0) ## 00000008 -/* 02214 80B90C94 AFA40018 */ sw $a0, 0x0018($sp) -/* 02218 80B90C98 0C034261 */ jal Matrix_Translate -/* 0221C 80B90C9C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02220 80B90CA0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02224 80B90CA4 3C0180B9 */ lui $at, %hi(D_80B91070) ## $at = 80B90000 -/* 02228 80B90CA8 C4281070 */ lwc1 $f8, %lo(D_80B91070)($at) -/* 0222C 80B90CAC 848E0016 */ lh $t6, 0x0016($a0) ## 00000016 -/* 02230 80B90CB0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02234 80B90CB4 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 02238 80B90CB8 00000000 */ nop -/* 0223C 80B90CBC 468021A0 */ cvt.s.w $f6, $f4 -/* 02240 80B90CC0 46083302 */ mul.s $f12, $f6, $f8 -/* 02244 80B90CC4 0C034348 */ jal Matrix_RotateY -/* 02248 80B90CC8 00000000 */ nop -/* 0224C 80B90CCC 3C0180B9 */ lui $at, %hi(D_80B91074) ## $at = 80B90000 -/* 02250 80B90CD0 C42C1074 */ lwc1 $f12, %lo(D_80B91074)($at) -/* 02254 80B90CD4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02258 80B90CD8 44066000 */ mfc1 $a2, $f12 -/* 0225C 80B90CDC 0C0342A3 */ jal Matrix_Scale -/* 02260 80B90CE0 46006386 */ mov.s $f14, $f12 -/* 02264 80B90CE4 3C050600 */ lui $a1, %hi(D_06000650) ## $a1 = 06000000 -/* 02268 80B90CE8 24A50650 */ addiu $a1, $a1, %lo(D_06000650) ## $a1 = 06000650 -/* 0226C 80B90CEC 0C00D498 */ jal Gfx_DrawDListOpa - -/* 02270 80B90CF0 8FA4001C */ lw $a0, 0x001C($sp) -/* 02274 80B90CF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02278 80B90CF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0227C 80B90CFC 03E00008 */ jr $ra -/* 02280 80B90D00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s deleted file mode 100644 index ac2b7009b8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s +++ /dev/null @@ -1,45 +0,0 @@ -.late_rodata -glabel D_80B91078 - .float 9.58738019108e-05 - -glabel D_80B9107C - .float 0.1 - -.text -glabel func_80B90D04 -/* 02284 80B90D04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02288 80B90D08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0228C 80B90D0C AFA5001C */ sw $a1, 0x001C($sp) -/* 02290 80B90D10 8C86002C */ lw $a2, 0x002C($a0) ## 0000002C -/* 02294 80B90D14 C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 -/* 02298 80B90D18 C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 -/* 0229C 80B90D1C AFA40018 */ sw $a0, 0x0018($sp) -/* 022A0 80B90D20 0C034261 */ jal Matrix_Translate -/* 022A4 80B90D24 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 022A8 80B90D28 8FA40018 */ lw $a0, 0x0018($sp) -/* 022AC 80B90D2C 3C0180B9 */ lui $at, %hi(D_80B91078) ## $at = 80B90000 -/* 022B0 80B90D30 C4281078 */ lwc1 $f8, %lo(D_80B91078)($at) -/* 022B4 80B90D34 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 022B8 80B90D38 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 022BC 80B90D3C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 022C0 80B90D40 00000000 */ nop -/* 022C4 80B90D44 468021A0 */ cvt.s.w $f6, $f4 -/* 022C8 80B90D48 46083302 */ mul.s $f12, $f6, $f8 -/* 022CC 80B90D4C 0C034348 */ jal Matrix_RotateY -/* 022D0 80B90D50 00000000 */ nop -/* 022D4 80B90D54 3C0180B9 */ lui $at, %hi(D_80B9107C) ## $at = 80B90000 -/* 022D8 80B90D58 C42C107C */ lwc1 $f12, %lo(D_80B9107C)($at) -/* 022DC 80B90D5C 8FA40018 */ lw $a0, 0x0018($sp) -/* 022E0 80B90D60 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 022E4 80B90D64 44066000 */ mfc1 $a2, $f12 -/* 022E8 80B90D68 0C0342A3 */ jal Matrix_Scale -/* 022EC 80B90D6C C48E01D4 */ lwc1 $f14, 0x01D4($a0) ## 000001D4 -/* 022F0 80B90D70 3C050600 */ lui $a1, %hi(D_060001B0) ## $a1 = 06000000 -/* 022F4 80B90D74 24A501B0 */ addiu $a1, $a1, %lo(D_060001B0) ## $a1 = 060001B0 -/* 022F8 80B90D78 0C00D498 */ jal Gfx_DrawDListOpa - -/* 022FC 80B90D7C 8FA4001C */ lw $a0, 0x001C($sp) -/* 02300 80B90D80 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02304 80B90D84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02308 80B90D88 03E00008 */ jr $ra -/* 0230C 80B90D8C 00000000 */ nop diff --git a/data/overlays/actors/z_obj_bean.data.s b/data/overlays/actors/z_obj_bean.data.s deleted file mode 100644 index ec87ba8057..0000000000 --- a/data/overlays/actors/z_obj_bean.data.s +++ /dev/null @@ -1,28 +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 D_80B90E30 - .word 0x00000000 -glabel Obj_Bean_InitVars - .word 0x01260100, 0x00400000, 0x011E0000, 0x000001F8 -.word ObjBean_Init -.word ObjBean_Destroy -.word ObjBean_Update -.word ObjBean_Draw -glabel D_80B90E54 - .word 0x0A000009, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0040001E, 0xFFE10000, 0x00000000 -glabel D_80B90E80 - .word 0x40400000, 0x3E99999A, 0x41200000, 0x3F000000, 0x41F00000, 0x3F000000, 0x40400000, 0x3E99999A -glabel D_80B90EA0 - .word gCuttableShrubStalkDL, gCuttableShrubTipDL -glabel D_80B90EA8 - .word 0xC8500064, 0xB0F407D0, 0xB0F800C8, 0x30FC0640, 0x00000000, 0x00000000 - diff --git a/spec b/spec index c2dca33866..8227646db2 100644 --- a/spec +++ b/spec @@ -3225,8 +3225,11 @@ endseg beginseg name "ovl_Obj_Bean" include "build/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.o" - include "build/data/overlays/actors/z_obj_bean.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_Obj_Bean/ovl_Obj_Bean_reloc.o" +#else include "build/data/overlays/actors/z_obj_bean.reloc.o" +#endif endseg beginseg diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 05f935fa03..b748ed09ab 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -5,6 +5,7 @@ */ #include "z_obj_bean.h" +#include "vt.h" #include "objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0x00400000 @@ -16,13 +17,68 @@ void ObjBean_Destroy(Actor* thisx, GlobalContext* globalCtx); void ObjBean_Update(Actor* thisx, GlobalContext* globalCtx); void ObjBean_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06000090; -extern UNK_TYPE D_060001B0; -extern UNK_TYPE D_060003F0; -extern UNK_TYPE D_060005DC; -extern UNK_TYPE D_06000650; +void ObjBean_WaitForPlayer(ObjBean* this, GlobalContext* globalCtx); +void ObjBean_Fly(ObjBean* this, GlobalContext* globalCtx); +void ObjBean_SetupFly(ObjBean* this); +void ObjBean_WaitForWater(ObjBean* this, GlobalContext* globalCtx); +void ObjBean_SetupWaitForWater(ObjBean* this); +void ObjBean_SetupGrowWaterPhase1(ObjBean* this); +void ObjBean_GrowWaterPhase1(ObjBean* this, GlobalContext* globalCtx); +void ObjBean_GrowWaterPhase2(ObjBean* this, GlobalContext* globalCtx); +void ObjBean_SetupGrowWaterPhase2(ObjBean* this); +void ObjBean_GrowWaterPhase3(ObjBean* this, GlobalContext* globalCtx); +void ObjBean_SetupGrowWaterPhase3(ObjBean* this); +void ObjBean_SetupGrown(ObjBean* this); +void ObjBean_FlattenLeaves(ObjBean* this); +void ObjBean_Grown(ObjBean* this); +void ObjBean_LeavesStill(ObjBean* this); +void ObjBean_SetupShakeLeaves(ObjBean* this); +void ObjBean_ShakeLeaves(ObjBean* this); +void ObjBean_SetupWaitForBean(ObjBean* this); +void ObjBean_WaitForBean(ObjBean* this, GlobalContext* globalCtx); +void func_80B8FE3C(ObjBean* this, GlobalContext* globalCtx); +void func_80B8FE00(ObjBean* this); +void func_80B8FE6C(ObjBean* this); +void func_80B8FEAC(ObjBean* this, GlobalContext* globalCtx); +void func_80B8FF50(ObjBean* this); +void ObjBean_SetupGrowWaterPhase4(ObjBean* this); +void func_80B8FF8C(ObjBean* this, GlobalContext* globalCtx); +void func_80B90050(ObjBean* this, GlobalContext* globalCtx); +void func_80B90010(ObjBean* this); +void func_80B908EC(ObjBean* this); +void func_80B90918(ObjBean* this, GlobalContext* globalCtx); +void func_80B90970(ObjBean* this); +void func_80B909B0(ObjBean* this, GlobalContext* globalCtx); +void func_80B909F8(ObjBean* this); +void func_80B90A34(ObjBean* this, GlobalContext* globalCtx); +void ObjBean_SetupWaitForPlayer(ObjBean* this); +void ObjBean_GrowWaterPhase4(ObjBean* this, GlobalContext* globalCtx); +void ObjBean_GrowWaterPhase5(ObjBean* this, GlobalContext* globalCtx); +void ObjBean_SetupGrowWaterPhase5(ObjBean* this); +void ObjBean_SetupShakeLeavesFast(ObjBean* this); +void ObjBean_ShakeLeavesFast(ObjBean* this); +void ObjBean_Grow(ObjBean* this); +void ObjBean_SetupGrow(ObjBean* this); +void ObjBean_SetupWaitForStepOff(ObjBean* this); +void ObjBean_WaitForStepOff(ObjBean* this, GlobalContext* globalCtx); + +extern Gfx D_06000090[]; +extern Gfx D_060001B0[]; +extern Gfx D_060003F0[]; +extern CollisionHeader D_060005DC; +extern Gfx D_06000650[]; + +#define BEAN_STATE_DRAW_LEAVES (1 << 0) +#define BEAN_STATE_DRAW_SOIL (1 << 1) +#define BEAN_STATE_DRAW_PLANT (1 << 2) +#define BEAN_STATE_DRAW_STALK (1 << 3) +#define BEAN_STATE_COLLIDER_SET (1 << 4) +#define BEAN_STATE_DYNAPOLY_SET (1 << 5) +#define BEAN_STATE_BEEN_WATERED (1 << 6) +#define BEAN_STATE_PLAYER_ON_TOP (1 << 7) + +static ObjBean* D_80B90E30 = NULL; -/* const ActorInit Obj_Bean_InitVars = { ACTOR_OBJ_BEAN, ACTORCAT_BG, @@ -35,7 +91,7 @@ const ActorInit Obj_Bean_InitVars = { (ActorFunc)ObjBean_Draw, }; -static ColliderCylinderInit D_80B90E54 = { +static ColliderCylinderInit sCylinderInit = { { COLTYPE_NONE, AT_NONE, @@ -54,137 +110,852 @@ static ColliderCylinderInit D_80B90E54 = { }, { 64, 30, -31, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EA80.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EAD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EB60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EDF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EE24.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EEFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F298.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F59C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F65C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F6CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F710.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F788.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F80C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F84C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F94C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F964.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F9E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FA20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FEAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90010.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90050.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90110.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90158.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9024C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90290.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B902D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90314.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B903C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90400.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90510.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90548.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B905E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90620.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90678.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B906A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90714.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9075C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90884.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90918.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90970.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90A34.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s") +typedef struct { + f32 velocity; + f32 accel; +} BeenSpeedInfo; + +static BeenSpeedInfo sBeanSpeeds[] = { + { 3.0f, 0.3f }, + { 10.0f, 0.5f }, + { 30.0f, 0.5f }, + { 3.0f, 0.3f }, +}; + +static Gfx* sBreakDlists[] = { gCuttableShrubStalkDL, gCuttableShrubTipDL }; + +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1600, ICHAIN_STOP), +}; + +void ObjBean_InitCollider(Actor* thisx, GlobalContext* globalCtx) { + ObjBean* this = THIS; + + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->dyna.actor, &sCylinderInit); + Collider_UpdateCylinder(&this->dyna.actor, &this->collider); +} + +void ObjBean_InitDynaPoly(ObjBean* this, GlobalContext* globalCtx, CollisionHeader* collision, + DynaPolyMoveFlag moveFlag) { + s32 pad; + CollisionHeader* colHeader; + s32 pad2; + + colHeader = NULL; + + DynaPolyActor_Init(&this->dyna, moveFlag); + CollisionHeader_GetVirtual(collision, &colHeader); + + this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); + if (this->dyna.bgId == BG_ACTOR_MAX) { + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_bean.c", 374, + this->dyna.actor.id, this->dyna.actor.params); + } +} + +void ObjBean_FindFloor(ObjBean* this, GlobalContext* globalCtx) { + Vec3f vec; + s32 sp20; + + vec.x = this->dyna.actor.world.pos.x; + vec.y = this->dyna.actor.world.pos.y + 29.999998f; + vec.z = this->dyna.actor.world.pos.z; + this->dyna.actor.floorHeight = + BgCheck_EntityRaycastFloor4(&globalCtx->colCtx, &this->dyna.actor.floorPoly, &sp20, &this->dyna.actor, &vec); +} + +void func_80B8EBC8(ObjBean* this) { + this->unk_1B6.x = this->unk_1B6.y = this->unk_1B6.z = 0; + this->unk_1E4 = 0.0f; +} + +void ObjBean_UpdatePosition(ObjBean* this) { + f32 temp_f20; + + this->unk_1B6.x += 0xB6; + this->unk_1B6.y += 0xFB; + this->unk_1B6.z += 0x64; + + Math_StepToF(&this->unk_1E4, 2.0f, 0.1f); + temp_f20 = Math_SinS(this->unk_1B6.x * 3); + this->posOffsetX = (Math_SinS(((this->unk_1B6.y * 3))) + temp_f20) * this->unk_1E4; + temp_f20 = Math_CosS(this->unk_1B6.x * 4); + this->posOffsetZ = (Math_CosS((this->unk_1B6.y * 4)) + temp_f20) * this->unk_1E4; + temp_f20 = Math_SinS(this->unk_1B6.z * 5); + + this->dyna.actor.scale.x = this->dyna.actor.scale.z = + ((Math_SinS((this->unk_1B6.y * 8)) * 0.01f) + (temp_f20 * 0.06f) + 1.07f) * 0.1f; + + this->dyna.actor.scale.y = ((Math_CosS(((this->unk_1B6.z * 10))) * 0.2f) + 1.0f) * 0.1f; + temp_f20 = Math_SinS(this->unk_1B6.x * 3); + this->dyna.actor.shape.rot.y = + (Math_SinS((s16)(this->unk_1B6.z * 2)) * 2100.0f) + ((f32)this->dyna.actor.home.rot.y + (temp_f20 * 1000.0f)); +} + +void func_80B8EDF4(ObjBean* this) { + this->unk_1B6.x = this->unk_1B6.y = this->unk_1B6.z = 0; + + Actor_SetScale(&this->dyna.actor, 0.0f); +} + +void func_80B8EE24(ObjBean* this) { + this->unk_1B6.x += 0x384; + if (this->unk_1B6.x > 0x5FFF) { + this->unk_1B6.x = 0x5FFF; + } + this->unk_1B6.y += 0x258; + if (this->unk_1B6.y > 0x4000) { + this->unk_1B6.y = 0x4000; + } + this->dyna.actor.scale.y = Math_SinS(this->unk_1B6.x) * 0.16970563f; + + this->dyna.actor.scale.x = this->dyna.actor.scale.z = Math_SinS(this->unk_1B6.y) * 0.10700001f; + + Math_StepToF(&this->posOffsetX, 0.0f, 0.1f); + Math_StepToF(&this->posOffsetZ, 0.0f, 0.1f); + Math_ScaledStepToS(&this->dyna.actor.shape.rot.y, this->dyna.actor.home.rot.y, 0x64); +} + +void ObjBean_Move(ObjBean* this) { + this->dyna.actor.world.pos.x = this->pathPoints.x + this->posOffsetX; + this->dyna.actor.world.pos.y = this->pathPoints.y; + this->dyna.actor.world.pos.z = this->pathPoints.z + this->posOffsetZ; +} + +void ObjBean_SetDrawMode(ObjBean* this, u8 drawFlag) { + this->stateFlags &= ~(BEAN_STATE_DRAW_LEAVES | BEAN_STATE_DRAW_PLANT | BEAN_STATE_DRAW_STALK | BEAN_STATE_DRAW_SOIL); + this->stateFlags |= drawFlag; +} + +void ObjBean_SetupPathCount(ObjBean* this, GlobalContext* globalCtx) { + this->pathCount = globalCtx->setupPathList[(this->dyna.actor.params >> 8) & 0x1F].count - 1; + this->currentPointIndex = 0; + this->nextPointIndex = 1; +} + +void ObjBean_SetupPath(ObjBean* this, GlobalContext* globalCtx) { + Path* path = &globalCtx->setupPathList[(this->dyna.actor.params >> 8) & 0x1F]; + Math_Vec3s_ToVec3f(&this->pathPoints, SEGMENTED_TO_VIRTUAL(path->points)); +} + +#ifdef NON_MATCHING +// Regalloc near speed > mag. +// f12 vs f2 regs +void ObjBean_FollowPath(ObjBean* this, GlobalContext* globalCtx) { + Path* path; + Vec3f acell; + Vec3f pathPointsFloat; + s32 pad; + Vec3s* nextPathPoint; + Vec3s* currentPoint; + Vec3s* sp4C; + Vec3f sp40; + Vec3f sp34; + f32 sp30; + f32 mag; + f32 speed; + + Math_StepToF(&this->dyna.actor.speedXZ, sBeanSpeeds[this->unk_1F6].velocity, sBeanSpeeds[this->unk_1F6].accel); + path = &globalCtx->setupPathList[(this->dyna.actor.params >> 8) & 0x1F]; + nextPathPoint = &((Vec3s*)SEGMENTED_TO_VIRTUAL(path->points))[this->nextPointIndex]; + + Math_Vec3s_ToVec3f(&pathPointsFloat, nextPathPoint); + + Math_Vec3f_Diff(&pathPointsFloat, &this->pathPoints, &acell); + mag = Math3D_Vec3fMagnitude(&acell); + speed = CLAMP_MIN(this->dyna.actor.speedXZ, 0.5f); + if (speed > mag) { + currentPoint = &((Vec3s*)SEGMENTED_TO_VIRTUAL(path->points))[this->currentPointIndex]; + + Math_Vec3f_Copy(&this->pathPoints, &pathPointsFloat); + this->currentPointIndex = this->nextPointIndex; + + if (this->pathCount <= this->currentPointIndex) { + this->nextPointIndex = 0; + } else { + this->nextPointIndex++; + } + sp4C = &((Vec3s*)SEGMENTED_TO_VIRTUAL(path->points))[this->nextPointIndex]; + Math_Vec3s_DiffToVec3f(&sp40, nextPathPoint, currentPoint); + Math_Vec3s_DiffToVec3f(&sp34, sp4C, nextPathPoint); + if (Math3D_CosOut(&sp40, &sp34, &sp30)) { + this->dyna.actor.speedXZ = 0.0f; + } else { + this->dyna.actor.speedXZ *= (sp30 + 1.0f) * 0.5f; + } + } else { + Math_Vec3f_Scale(&acell, speed / mag); + this->pathPoints.x += acell.x; + this->pathPoints.y += acell.y; + this->pathPoints.z += acell.z; + } +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_FollowPath.s") +#endif + +s32 ObjBean_CheckForHorseTrample(ObjBean* this, GlobalContext* globalCtx) { + Actor* currentActor = globalCtx->actorCtx.actorLists[ACTORCAT_BG].head; + + while (currentActor != NULL) { + if ((currentActor->id == ACTOR_EN_HORSE) && + (Math3D_Vec3fDistSq(¤tActor->world.pos, &this->dyna.actor.world.pos) < 10000.0f)) { + return true; + } + currentActor = currentActor->next; + } + + return false; +} + +void ObjBean_Break(ObjBean* this, GlobalContext* globalCtx) { + Vec3f pos; + Vec3f velocity; + f32 temp_f20; + s16 angle; + s32 scale; + s32 i; + s16 gravity; + s16 arg5; + + angle = 0; + for (i = 0; i < 36; i++) { + angle += 0x4E20; + temp_f20 = Rand_ZeroOne() * 60.0f; + + pos.x = (Math_SinS(angle) * temp_f20) + this->dyna.actor.world.pos.x; + pos.y = this->dyna.actor.world.pos.y; + pos.z = (Math_CosS(angle) * temp_f20) + this->dyna.actor.world.pos.z; + + velocity.x = Math_SinS(angle) * 3.5f; + velocity.y = Rand_ZeroOne() * 13.0f; + velocity.z = Math_CosS(angle) * 3.5f; + + velocity.x += this->dyna.actor.world.pos.x - this->dyna.actor.prevPos.x; + velocity.y += this->dyna.actor.world.pos.y - this->dyna.actor.prevPos.y; + velocity.z += this->dyna.actor.world.pos.z - this->dyna.actor.prevPos.z; + + scale = (s32)(Rand_ZeroOne() * 180.0f) + 30; + if (scale < 90) { + if (Rand_ZeroOne() < 0.1f) { + gravity = -80; + arg5 = 96; + } else { + gravity = -80; + arg5 = 64; + } + } else { + gravity = -100; + arg5 = 64; + } + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, gravity, arg5, 40, 3, 0, scale, 0, 0, + (s16)((scale >> 3) + 40), -1, 1, sBreakDlists[i & 1]); + } +} + +void ObjBean_UpdateLeaves(ObjBean* this) { + Math_StepToS(&this->unk_1C2, this->unk_1C4, this->unk_1C6); + Math_StepToS(&this->unk_1C8, this->unk_1CA, this->unk_1CC); + this->unk_1CE += this->unk_1C8; + this->leafRotFactor = 6372.0f - Math_SinS(this->unk_1CE) * (f32)this->unk_1C2; + this->dyna.actor.scale.y = Math_SinS(this->leafRotFactor) * 0.17434467f; + this->dyna.actor.scale.x = this->dyna.actor.scale.z = Math_CosS(this->leafRotFactor) * 0.12207746f; +} + +void ObjBean_SetupLeavesStill(ObjBean* this) { + this->transformFunc = ObjBean_LeavesStill; + this->unk_1C0 = Rand_S16Offset(12, 40); + this->unk_1C4 = Rand_S16Offset(0xC8, 0x190); + this->unk_1C6 = 0x14; + this->unk_1CA = Rand_S16Offset(0x64, 0x320); + this->unk_1CC = 0x14; +} + +void ObjBean_LeavesStill(ObjBean* this) { + this->unk_1C0--; + ObjBean_UpdateLeaves(this); + if (this->unk_1C0 < 0) { + ObjBean_SetupShakeLeaves(this); + } +} + +void ObjBean_SetupShakeLeaves(ObjBean* this) { + this->transformFunc = ObjBean_ShakeLeaves; + this->unk_1C0 = Rand_S16Offset(30, 4); + this->unk_1C4 = Rand_S16Offset(0x7D0, 0x3E8); + this->unk_1C6 = 0xC8; + this->unk_1CA = Rand_S16Offset(0x36B0, 0x1770); + this->unk_1CC = 0xFA0; + this->leafRotFactor = 0x18E4; +} + +void ObjBean_ShakeLeaves(ObjBean* this) { + this->unk_1C0 += -1; + if (this->unk_1C0 == 14) { + this->unk_1C4 = Rand_S16Offset(0xC8, 0x190); + this->unk_1CA = Rand_S16Offset(0x64, 0x1F4); + this->unk_1CC = 0x7D0; + } + ObjBean_UpdateLeaves(this); + if (this->unk_1C0 < 0) { + ObjBean_SetupLeavesStill(this); + } +} + +void ObjBean_SetupShakeLeavesFast(ObjBean* this) { + this->transformFunc = ObjBean_ShakeLeavesFast; + this->unk_1C0 = 0x28; + this->unk_1C4 = 0xBB8; + this->unk_1C6 = 0x12C; + this->unk_1CA = 0x3A98; + this->unk_1CC = 0xFA0; + this->leafRotFactor = 0x18E4; +} + +void ObjBean_ShakeLeavesFast(ObjBean* this) { + this->unk_1C0 += -1; + if (Rand_ZeroOne() < 0.1f) { + this->unk_1C4 = Rand_S16Offset(0x898, 0x3E8); + this->unk_1CA = Rand_S16Offset(0x2EE0, 0x1F40); + } + ObjBean_UpdateLeaves(this); + if ((s32)this->unk_1C0 < 0) { + ObjBean_SetupGrow(this); + } +} + +void ObjBean_SetupGrow(ObjBean* this) { + this->transformFunc = ObjBean_Grow; +} + +void ObjBean_Grow(ObjBean* this) { + Math_StepToS(&this->leafRotFactor, 0x33E9, 0x168); + this->dyna.actor.scale.y = Math_SinS(this->leafRotFactor) * 0.17434467f; + this->dyna.actor.scale.x = this->dyna.actor.scale.z = Math_CosS(this->leafRotFactor) * 0.12207746f; + ; +} + +void ObjBean_SetupFlattenLeaves(ObjBean* this) { + this->transformFunc = ObjBean_FlattenLeaves; + this->leafRotFactor = 0x33E9; +} + +void ObjBean_FlattenLeaves(ObjBean* this) { + this->leafRotFactor -= 0x960; + this->dyna.actor.scale.y = Math_SinS(this->leafRotFactor) * 0.17434467f; + this->dyna.actor.scale.x = this->dyna.actor.scale.z = Math_CosS(this->leafRotFactor) * 0.12207746f; + + if (this->leafRotFactor < 0x18E4) { + ObjBean_SetupGrown(this); + } +} + +void ObjBean_SetupGrown(ObjBean* this) { + this->transformFunc = ObjBean_Grown; + this->unk_1C2 = 0xBB8; + this->unk_1C4 = 0; + this->unk_1C6 = 0xC8; + this->unk_1C8 = 0x3E80; + this->unk_1CA = 0x1F4; + this->unk_1CC = 0; + this->unk_1C0 = 0x10; +} + +void ObjBean_Grown(ObjBean* this) { + this->unk_1C0--; + if (this->unk_1C0 == 6) { + this->unk_1CC = 0x7D0; + } + ObjBean_UpdateLeaves(this); + if (this->unk_1C2 <= 0) { + ObjBean_SetupLeavesStill(this); + } +} + +void ObjBean_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 path; + s32 linkAge; + ObjBean* this = THIS; + + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); + if (LINK_AGE_IN_YEARS == YEARS_ADULT) { + if (Flags_GetSwitch(globalCtx, this->dyna.actor.params & 0x3F) || (mREG(1) == 1)) { + path = (this->dyna.actor.params >> 8) & 0x1F; + if (path == 0x1F) { + osSyncPrintf(VT_COL(RED, WHITE)); + // No path data? + osSyncPrintf("パスデータが無い？(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 909, + this->dyna.actor.params); + osSyncPrintf(VT_RST); + Actor_Kill(&this->dyna.actor); + return; + } + if (globalCtx->setupPathList[path].count < 3) { + osSyncPrintf(VT_COL(RED, WHITE)); + // Incorrect number of path data + osSyncPrintf("パスデータ数が不正(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 921, + this->dyna.actor.params); + osSyncPrintf(VT_RST); + Actor_Kill(&this->dyna.actor); + return; + } + ObjBean_SetupPathCount(this, globalCtx); + ObjBean_SetupPath(this, globalCtx); + ObjBean_Move(this); + ObjBean_SetupWaitForPlayer(this); + + ObjBean_InitDynaPoly(this, globalCtx, &D_060005DC, DPM_UNK3); + this->stateFlags |= BEAN_STATE_DYNAPOLY_SET; + ObjBean_InitCollider(&this->dyna.actor, globalCtx); + this->stateFlags |= BEAN_STATE_COLLIDER_SET; + + ActorShape_Init(&this->dyna.actor.shape, 0.0f, ActorShadow_DrawCircle, 8.8f); + ObjBean_FindFloor(this, globalCtx); + this->unk_1F6 = this->dyna.actor.home.rot.z & 3; + } else { + Actor_Kill(&this->dyna.actor); + return; + } + } else if ((Flags_GetSwitch(globalCtx, this->dyna.actor.params & 0x3F) != 0) || (mREG(1) == 1)) { + ObjBean_SetupWaitForWater(this); + } else { + ObjBean_SetupWaitForBean(this); + } + this->dyna.actor.world.rot.z = this->dyna.actor.home.rot.z = this->dyna.actor.shape.rot.z = 0; + // Magic bean tree lift + osSyncPrintf("(魔法の豆の木リフト)(arg_data 0x%04x)\n", this->dyna.actor.params); +} + +void ObjBean_Destroy(Actor* thisx, GlobalContext* globalCtx) { + ObjBean* this = THIS; + + if (this->stateFlags & BEAN_STATE_DYNAPOLY_SET) { + DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); + } + if (this->stateFlags & BEAN_STATE_COLLIDER_SET) { + Collider_DestroyCylinder(globalCtx, &this->collider); + } + if (D_80B90E30 == this) { + D_80B90E30 = NULL; + } +} + +void ObjBean_SetupWaitForBean(ObjBean* this) { + this->actionFunc = ObjBean_WaitForBean; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_LEAVES); + this->dyna.actor.textId = 0x2F; +} + +void ObjBean_WaitForBean(ObjBean* this, GlobalContext* globalCtx) { + if (func_8002F194(&this->dyna.actor, globalCtx)) { + if (func_8002F368(globalCtx) == EXCH_ITEM_BEAN) { + func_80B8FE00(this); + Flags_SetSwitch(globalCtx, this->dyna.actor.params & 0x3F); + } + } else { + func_8002F298(&this->dyna.actor, globalCtx, 40.0f, EXCH_ITEM_BEAN); + } +} + +void func_80B8FE00(ObjBean* this) { + this->actionFunc = func_80B8FE3C; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_LEAVES); + this->timer = 60; +} + +// Link is looking at the soft soil +void func_80B8FE3C(ObjBean* this, GlobalContext* globalCtx) { + if (this->timer <= 0) { + func_80B8FE6C(this); + } +} + +void func_80B8FE6C(ObjBean* this) { + this->actionFunc = func_80B8FEAC; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_LEAVES | BEAN_STATE_DRAW_SOIL); + Actor_SetScale(&this->dyna.actor, 0.01f); +} + +// The leaves are visable and growing +void func_80B8FEAC(ObjBean* this, GlobalContext* globalCtx) { + s32 temp_v1; + + temp_v1 = Math_StepToF(&this->dyna.actor.scale.y, 0.16672663f, 0.01f) & 1; + temp_v1 &= Math_StepToF(&this->dyna.actor.scale.x, 0.03569199f, 0.00113f); + + this->dyna.actor.scale.z = this->dyna.actor.scale.x; + if (temp_v1) { + if (this->timer <= 0) { + func_80B8FF50(this); + } + } else { + this->timer = 1; + } + func_8002F974(&this->dyna.actor, NA_SE_PL_PLANT_GROW_UP - SFX_FLAG); +} + +void func_80B8FF50(ObjBean* this) { + this->actionFunc = func_80B8FF8C; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_LEAVES | BEAN_STATE_DRAW_SOIL); + this->unk_1B6.x = 0x33E9; +} + +void func_80B8FF8C(ObjBean* this, GlobalContext* globalCtx) { + this->unk_1B6.x -= 0x960; + this->dyna.actor.scale.y = Math_SinS(this->unk_1B6.x) * 0.17434467f; + this->dyna.actor.scale.x = this->dyna.actor.scale.z = Math_CosS(this->unk_1B6.x) * 0.12207746f; + if (this->unk_1B6.x < 0x18E4) { + func_80B90010(this); + } +} + +void func_80B90010(ObjBean* this) { + this->actionFunc = func_80B90050; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_LEAVES | BEAN_STATE_DRAW_SOIL); + this->unk_1B6.x = 0; + this->unk_1B6.y = 0xBB8; +} + +// Control is returned to the player and the leaves start to flatten out +void func_80B90050(ObjBean* this, GlobalContext* globalCtx) { + s16 temp_a0; + f32 temp_f2; + + this->unk_1B6.x += 0x3E80; + this->unk_1B6.y += -0xC8; + temp_a0 = 6372.0f - Math_SinS(this->unk_1B6.x) * this->unk_1B6.y; + + this->dyna.actor.scale.y = Math_SinS(temp_a0) * 0.17434467f; + this->dyna.actor.scale.x = this->dyna.actor.scale.z = Math_CosS(temp_a0) * 0.12207746f; + if (this->unk_1B6.y < 0) { + ObjBean_SetupWaitForWater(this); + } +} + +void ObjBean_SetupWaitForWater(ObjBean* this) { + this->actionFunc = ObjBean_WaitForWater; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_LEAVES | BEAN_STATE_DRAW_SOIL); + Actor_SetScale(&this->dyna.actor, 0.1f); + ObjBean_SetupLeavesStill(this); +} + +#ifdef NON_MATCHING +//D_80B90E30 isn't being loaded properly +void ObjBean_WaitForWater(ObjBean* this, GlobalContext* globalCtx) { + this->transformFunc(this); + if (!(this->stateFlags & BEAN_STATE_BEEN_WATERED) && Flags_GetEnv(globalCtx, 5) && (D_80B90E30 == NULL) && + (this->dyna.actor.xzDistToPlayer < 50.0f)) { + ObjBean_SetupGrowWaterPhase1(this); + D_80B90E30 = this; + OnePointCutscene_Init(globalCtx, 2210, -99, &this->dyna.actor, MAIN_CAM); + this->dyna.actor.flags |= 0x10; + return; + } + if ((D_80B90E30 == this) && !Flags_GetEnv(globalCtx, 5)) { + D_80B90E30 = NULL; + } +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_WaitForWater.s") +#endif + +void ObjBean_SetupGrowWaterPhase1(ObjBean* this) { + this->actionFunc = ObjBean_GrowWaterPhase1; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_LEAVES | BEAN_STATE_DRAW_SOIL); + ObjBean_SetupShakeLeavesFast(this); + this->timer = 50; +} + +// Camera moves and leaves move quickly +void ObjBean_GrowWaterPhase1(ObjBean* this, GlobalContext* globalCtx) { + this->transformFunc(this); + if (this->timer <= 0) { + ObjBean_SetupGrowWaterPhase2(this); + } +} + +void ObjBean_SetupGrowWaterPhase2(ObjBean* this) { + this->actionFunc = ObjBean_GrowWaterPhase2; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_SOIL | BEAN_STATE_DRAW_LEAVES | BEAN_STATE_DRAW_STALK); + this->stalkSizeMultiplier = 0.0f; +} + +// BeanStalk is visable and is growing +void ObjBean_GrowWaterPhase2(ObjBean* this, GlobalContext* globalCtx) { + this->transformFunc(this); + this->stalkSizeMultiplier += 0.001f; + this->dyna.actor.shape.rot.y = this->dyna.actor.home.rot.y + (s16)(this->stalkSizeMultiplier * 700000.0f); + this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y + this->stalkSizeMultiplier * 800.0f; + if (this->stalkSizeMultiplier >= 0.1f) { // 100 Frames + ObjBean_SetupGrowWaterPhase3(this); + } + func_8002F974(&this->dyna.actor, NA_SE_PL_PLANT_TALLER - SFX_FLAG); +} + +void ObjBean_SetupGrowWaterPhase3(ObjBean* this) { + this->actionFunc = ObjBean_GrowWaterPhase3; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_SOIL | BEAN_STATE_DRAW_LEAVES | BEAN_STATE_DRAW_STALK); + this->timer = 60; +} + +// Fully grown and drops items +void ObjBean_GrowWaterPhase3(ObjBean* this, GlobalContext* globalCtx) { + s32 i; + Vec3f itemDropPos; + + this->transformFunc(this); + if (this->timer == 40) { + ObjBean_SetupFlattenLeaves(this); + } else if (this->timer == 30) { + if (!(this->stateFlags & BEAN_STATE_BEEN_WATERED)) { + itemDropPos.x = this->dyna.actor.world.pos.x; + itemDropPos.y = this->dyna.actor.world.pos.y - 25.0f; + itemDropPos.z = this->dyna.actor.world.pos.z; + for (i = 0; i < 3; i++) { + Item_DropCollectible(globalCtx, &itemDropPos, ITEM00_FLEXIBLE); + } + this->stateFlags |= BEAN_STATE_BEEN_WATERED; + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BUTTERFRY_TO_FAIRY); + func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + } + } else if (this->timer <= 0) { + ObjBean_SetupGrowWaterPhase4(this); + } +} + +void ObjBean_SetupGrowWaterPhase4(ObjBean* this) { + this->actionFunc = ObjBean_GrowWaterPhase4; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_SOIL | BEAN_STATE_DRAW_LEAVES | BEAN_STATE_DRAW_STALK); + ObjBean_SetupGrow(this); +} + +// Return control back to the player and start to shrink back down +void ObjBean_GrowWaterPhase4(ObjBean* this, GlobalContext* globalCtx) { + this->transformFunc(this); + this->stalkSizeMultiplier -= 0.001f; + this->dyna.actor.shape.rot.y = this->dyna.actor.home.rot.y + (s16)(this->stalkSizeMultiplier * 700000.0f); + this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y + (this->stalkSizeMultiplier * 800.0f); + if (this->stalkSizeMultiplier <= 0.0f) { + this->stalkSizeMultiplier = 0.0f; + this->dyna.actor.shape.rot.y = this->dyna.actor.home.rot.y; + ObjBean_SetupGrowWaterPhase5(this); + } +} + +void ObjBean_SetupGrowWaterPhase5(ObjBean* this) { + this->actionFunc = ObjBean_GrowWaterPhase5; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_LEAVES | BEAN_STATE_DRAW_SOIL); + this->timer = 30; +} + +void ObjBean_GrowWaterPhase5(ObjBean* this, GlobalContext* globalCtx) { + this->transformFunc(this); + if (this->timer <= 0) { + func_80B8FF50(this); + this->dyna.actor.flags &= ~0x10; + } +} + +void ObjBean_SetupWaitForPlayer(ObjBean* this) { + this->actionFunc = ObjBean_WaitForPlayer; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_PLANT); +} + +void ObjBean_WaitForPlayer(ObjBean* this, GlobalContext* globalCtx) { + if (func_8004356C(&this->dyna)) { // Player is standing on + ObjBean_SetupFly(this); + if (globalCtx->sceneNum == SCENE_SPOT10) { // Lost woods + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_LIFTBEAN); + } else { + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_UFOBEAN); + } + } + ObjBean_UpdatePosition(this); +} + +void ObjBean_SetupFly(ObjBean* this) { + this->actionFunc = ObjBean_Fly; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_PLANT); + this->dyna.actor.speedXZ = 0.0f; + this->dyna.actor.flags |= 0x10; // Never stop updating +} + +void ObjBean_Fly(ObjBean* this, GlobalContext* globalCtx) { + Camera* camera; + + ObjBean_FollowPath(this, globalCtx); + if (this->currentPointIndex == this->pathCount) { + ObjBean_SetupPathCount(this, globalCtx); + ObjBean_SetupPath(this, globalCtx); + ObjBean_SetupWaitForStepOff(this); + + this->dyna.actor.flags &= ~0x10; // Never stop updating (disable) + camera = globalCtx->cameraPtrs[MAIN_CAM]; + + if ((camera->setting == CAM_SET_LIFTBEAN) || (camera->setting == CAM_SET_UFOBEAN)) { + Camera_ChangeSetting(camera, CAM_SET_NORMAL0); + } + + } else if (func_8004356C(&this->dyna) != 0) { // Player is on top + + func_8002F974(&this->dyna.actor, NA_SE_PL_PLANT_MOVE - SFX_FLAG); + + if (globalCtx->sceneNum == SCENE_SPOT10) { + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_LIFTBEAN); + } else { + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_UFOBEAN); + } + } else if (this->stateFlags & BEAN_STATE_PLAYER_ON_TOP) { + camera = globalCtx->cameraPtrs[MAIN_CAM]; + + if ((camera->setting == CAM_SET_LIFTBEAN) || (camera->setting == CAM_SET_UFOBEAN)) { + Camera_ChangeSetting(camera, CAM_SET_NORMAL0); + } + } + + ObjBean_UpdatePosition(this); +} + +void ObjBean_SetupWaitForStepOff(ObjBean* this) { + this->actionFunc = ObjBean_WaitForStepOff; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_PLANT); +} + +void ObjBean_WaitForStepOff(ObjBean* this, GlobalContext* globalCtx) { + if (!func_80043590(&this->dyna)) { + ObjBean_SetupWaitForPlayer(this); + } + ObjBean_UpdatePosition(this); +} + +void func_80B908EC(ObjBean* this) { + this->actionFunc = func_80B90918; + ObjBean_SetDrawMode(this, 0); +} + +void func_80B90918(ObjBean* this, GlobalContext* globalCtx) { + if (!func_8004356C(&this->dyna)) { + ObjBean_SetupPathCount(this, globalCtx); + ObjBean_SetupPath(this, globalCtx); + ObjBean_Move(this); + func_80B90970(this); + } +} + +void func_80B90970(ObjBean* this) { + this->actionFunc = func_80B909B0; + ObjBean_SetDrawMode(this, 0); + this->timer = 100; + func_80B8EDF4(this); +} + +void func_80B909B0(ObjBean* this, GlobalContext* globalCtx) { + if (ObjBean_CheckForHorseTrample(this, globalCtx)) { + this->timer = 100; + } else if (this->timer <= 0) { + func_80B909F8(this); + } +} + +void func_80B909F8(ObjBean* this) { + this->actionFunc = func_80B90A34; + ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_PLANT); + this->timer = 30; +} + +void func_80B90A34(ObjBean* this, GlobalContext* globalCtx) { + s32 trampled = ObjBean_CheckForHorseTrample(this, globalCtx); + + func_80B8EE24(this); + if (trampled) { + func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); + } else { + func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); + } + if ((this->timer <= 0) && (!trampled)) { + func_80B8EBC8(this); + ObjBean_SetupWaitForPlayer(this); + } +} +void ObjBean_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + ObjBean* this = THIS; + + if (this->timer > 0) { + this->timer--; + } + + this->actionFunc(this, globalCtx); + + if (this->stateFlags & BEAN_STATE_DRAW_PLANT) { + ObjBean_Move(this); + if (this->dyna.actor.xzDistToPlayer < 150.0f) { + this->collider.dim.radius = this->dyna.actor.scale.x * 640.0f + 0.5f; + Collider_UpdateCylinder(&this->dyna.actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + + ObjBean_FindFloor(this, globalCtx); + + this->dyna.actor.shape.shadowDraw = ActorShadow_DrawCircle; + this->dyna.actor.shape.shadowScale = this->dyna.actor.scale.x * 88.0f; + + if (ObjBean_CheckForHorseTrample(this, globalCtx)) { + osSyncPrintf(VT_FGCOL(CYAN)); + // Horse and bean tree lift collision + osSyncPrintf("馬と豆の木リフト衝突！！！\n"); + osSyncPrintf(VT_RST); + ObjBean_Break(this, globalCtx); + func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); + func_80B908EC(this); + } + } else { + this->dyna.actor.shape.shadowDraw = NULL; + } + Actor_SetFocus(&this->dyna.actor, 6.0f); + if (this->stateFlags & BEAN_STATE_DYNAPOLY_SET) { + if (func_8004356C(&this->dyna)) { + this->stateFlags |= BEAN_STATE_PLAYER_ON_TOP; + } else { + this->stateFlags &= ~BEAN_STATE_PLAYER_ON_TOP; + } + } +} + +void ObjBean_DrawSoftSoilSpot(ObjBean* this, GlobalContext* globalCtx) { + Matrix_Translate(this->dyna.actor.home.pos.x, this->dyna.actor.home.pos.y, this->dyna.actor.home.pos.z, + MTXMODE_NEW); + Matrix_RotateY(this->dyna.actor.home.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); + Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY); + Gfx_DrawDListOpa(globalCtx, D_06000650); +} + +void ObjBean_DrawBeanstalk(ObjBean* this, GlobalContext* globalCtx) { + Matrix_Translate(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z, + MTXMODE_NEW); + Matrix_RotateY(this->dyna.actor.shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); + Matrix_Scale(0.1f, this->stalkSizeMultiplier, 0.1f, MTXMODE_APPLY); + Gfx_DrawDListOpa(globalCtx, D_060001B0); +} + +void ObjBean_Draw(Actor* thisx, GlobalContext* globalCtx) { + ObjBean* this = THIS; + + if (this->stateFlags & BEAN_STATE_DRAW_SOIL) { + Gfx_DrawDListOpa(globalCtx, D_06000090); + } + if (this->stateFlags & BEAN_STATE_DRAW_PLANT) { + Gfx_DrawDListOpa(globalCtx, D_060003F0); + } + if (this->stateFlags & BEAN_STATE_DRAW_LEAVES) { + ObjBean_DrawSoftSoilSpot(this, globalCtx); + } + if (this->stateFlags & BEAN_STATE_DRAW_STALK) { + ObjBean_DrawBeanstalk(this, globalCtx); + } +} diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h index 5b97f7d3a7..7eedb74508 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h @@ -6,9 +6,36 @@ struct ObjBean; +typedef void (*ObjBeanActionFunc)(struct ObjBean*, GlobalContext*); +typedef void (*ObjBeanTransformFunc)(struct ObjBean*); + typedef struct ObjBean { /* 0x0000 */ DynaPolyActor dyna; - /* 0x0164 */ char unk_164[0x94]; + /* 0x0164 */ ObjBeanActionFunc actionFunc; + /* 0x0168 */ ColliderCylinder collider; + /* 0x01B4 */ s16 timer; + /* 0x01B6 */ Vec3s unk_1B6; + /* 0x01BC */ ObjBeanTransformFunc transformFunc; + /* 0x01C0 */ s16 unk_1C0; + /* 0x01C2 */ s16 unk_1C2; + /* 0x01C4 */ s16 unk_1C4; + /* 0x01C6 */ s16 unk_1C6; + /* 0x01C8 */ s16 unk_1C8; + /* 0x01CA */ s16 unk_1CA; + /* 0x01CC */ s16 unk_1CC; + /* 0x01CE */ s16 unk_1CE; + /* 0x01D0 */ s16 leafRotFactor; + /* 0x01D2 */ u16 unk_1D2; + /* 0x01D4 */ f32 stalkSizeMultiplier; + /* 0x01D8 */ Vec3f pathPoints; + /* 0x01E4 */ f32 unk_1E4; + /* 0x01E8 */ f32 posOffsetX; + /* 0x01EC */ f32 posOffsetZ; + /* 0x01F0 */ s16 pathCount; + /* 0x01F2 */ s16 currentPointIndex; + /* 0x01F4 */ s16 nextPointIndex; + /* 0x01F6 */ u8 unk_1F6; + /* 0x01F7 */ u8 stateFlags; } ObjBean; // size = 0x01F8 extern const ActorInit Obj_Bean_InitVars;