mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-09-03 01:43:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match functions related to balloon status (#137)

Browse Source 
* Match function related to balloon status

* Match func_8006B87C

* Match func_8006BA94
This commit is contained in:
Maciek Baron
2022-01-14 21:17:09 +00:00
committed by GitHub
parent 65e7fc87df
commit 8a56620205
10 changed files with 55 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/bss_8001C4D0.s
+1 -1
View File
@@ -1668,7 +1668,7 @@ glabel D_8018D530
glabel D_8018D590
.skip 96
glabel D_8018D5F0
glabel gPlayerBalloonStatus
.skip 48
glabel D_8018D620
asm/non_matchings/code_80057C60/func_8006A50C.s
+2 -2
View File
@@ -8,10 +8,10 @@ glabel func_8006A50C
/* 06B124 8006A524 000E7880 */ sll $t7, $t6, 2
/* 06B128 8006A528 01EE7823 */ subu $t7, $t7, $t6
/* 06B12C 8006A52C 000F7840 */ sll $t7, $t7, 1
/* 06B130 8006A530 3C198019 */ lui $t9, %hi(D_8018D5F0) # $t9, 0x8019
/* 06B130 8006A530 3C198019 */ lui $t9, %hi(gPlayerBalloonStatus) # $t9, 0x8019
/* 06B134 8006A534 00051040 */ sll $v0, $a1, 1
/* 06B138 8006A538 01E2C021 */ addu $t8, $t7, $v0
/* 06B13C 8006A53C 2739D5F0 */ addiu $t9, %lo(D_8018D5F0) # addiu $t9, $t9, -0x2a10
/* 06B13C 8006A53C 2739D5F0 */ addiu $t9, %lo(gPlayerBalloonStatus) # addiu $t9, $t9, -0x2a10
/* 06B140 8006A540 03194021 */ addu $t0, $t8, $t9
/* 06B144 8006A544 A5000000 */ sh $zero, ($t0)
/* 06B148 8006A548 000E4880 */ sll $t1, $t6, 2
asm/non_matchings/code_80057C60/func_8006A7C0.s
+11 -11
View File
@@ -40,10 +40,10 @@ glabel func_8006A7C0
/* 06B458 8006A858 000E7080 */ sll $t6, $t6, 2
/* 06B45C 8006A85C 01D07023 */ subu $t6, $t6, $s0
/* 06B460 8006A860 000E7040 */ sll $t6, $t6, 1
/* 06B464 8006A864 3C198019 */ lui $t9, %hi(D_8018D5F0) # $t9, 0x8019
/* 06B464 8006A864 3C198019 */ lui $t9, %hi(gPlayerBalloonStatus) # $t9, 0x8019
/* 06B468 8006A868 000D4040 */ sll $t0, $t5, 1
/* 06B46C 8006A86C 01C85821 */ addu $t3, $t6, $t0
/* 06B470 8006A870 2739D5F0 */ addiu $t9, %lo(D_8018D5F0) # addiu $t9, $t9, -0x2a10
/* 06B470 8006A870 2739D5F0 */ addiu $t9, %lo(gPlayerBalloonStatus) # addiu $t9, $t9, -0x2a10
/* 06B474 8006A874 01797821 */ addu $t7, $t3, $t9
/* 06B478 8006A878 AFAF0058 */ sw $t7, 0x58($sp)
/* 06B47C 8006A87C 24010002 */ li $at, 2
@@ -108,7 +108,7 @@ glabel func_8006A7C0
/* 06B564 8006A964 3C01800F */ lui $at, %hi(D_800EE808) # $at, 0x800f
/* 06B568 8006A968 2404000B */ li $a0, 11
/* 06B56C 8006A96C 4628003E */ c.le.d $f0, $f8
/* 06B570 8006A970 00000000 */ nop
/* 06B570 8006A970 00000000 */ nop
/* 06B574 8006A974 45020005 */ bc1fl .L8006A98C
/* 06B578 8006A978 C46A0000 */ lwc1 $f10, ($v1)
/* 06B57C 8006A97C C424E808 */ lwc1 $f4, %lo(D_800EE808)($at)
@@ -124,9 +124,9 @@ glabel func_8006A7C0
/* 06B5A0 8006A9A0 3C01800F */ lui $at, %hi(D_800EE818) # $at, 0x800f
/* 06B5A4 8006A9A4 46006021 */ cvt.d.s $f0, $f12
/* 06B5A8 8006A9A8 4620803E */ c.le.d $f16, $f0
/* 06B5AC 8006A9AC 00000000 */ nop
/* 06B5AC 8006A9AC 00000000 */ nop
/* 06B5B0 8006A9B0 45000005 */ bc1f .L8006A9C8
/* 06B5B4 8006A9B4 00000000 */ nop
/* 06B5B4 8006A9B4 00000000 */ nop
/* 06B5B8 8006A9B8 C426E818 */ lwc1 $f6, %lo(D_800EE818)($at)
/* 06B5BC 8006A9BC E4660000 */ swc1 $f6, ($v1)
/* 06B5C0 8006A9C0 C46C0000 */ lwc1 $f12, ($v1)
@@ -136,7 +136,7 @@ glabel func_8006A7C0
/* 06B5CC 8006A9CC D428E820 */ ldc1 $f8, %lo(D_800EE820)($at)
/* 06B5D0 8006A9D0 3C01800F */ lui $at, %hi(D_800EE828) # $at, 0x800f
/* 06B5D4 8006A9D4 4628003E */ c.le.d $f0, $f8
/* 06B5D8 8006A9D8 00000000 */ nop
/* 06B5D8 8006A9D8 00000000 */ nop
/* 06B5DC 8006A9DC 45020005 */ bc1fl .L8006A9F4
/* 06B5E0 8006A9E0 C54A0000 */ lwc1 $f10, ($t2)
/* 06B5E4 8006A9E4 C424E828 */ lwc1 $f4, %lo(D_800EE828)($at)
@@ -149,7 +149,7 @@ glabel func_8006A7C0
/* 06B5FC 8006A9FC E5520000 */ swc1 $f18, ($t2)
/* 06B600 8006AA00 C5500000 */ lwc1 $f16, ($t2)
/* 06B604 8006AA04 4600803C */ c.lt.s $f16, $f0
/* 06B608 8006AA08 00000000 */ nop
/* 06B608 8006AA08 00000000 */ nop
/* 06B60C 8006AA0C 45020014 */ bc1fl .L8006AA60
/* 06B610 8006AA10 862F002E */ lh $t7, 0x2e($s1)
/* 06B614 8006AA14 AFA30060 */ sw $v1, 0x60($sp)
@@ -198,7 +198,7 @@ glabel func_8006A7C0
/* 06B6BC 8006AABC 01F82021 */ addu $a0, $t7, $t8
/* 06B6C0 8006AAC0 AFA8005C */ sw $t0, 0x5c($sp)
/* 06B6C4 8006AAC4 44058000 */ mfc1 $a1, $f16
/* 06B6C8 8006AAC8 00000000 */ nop
/* 06B6C8 8006AAC8 00000000 */ nop
/* 06B6CC 8006AACC 00057400 */ sll $t6, $a1, 0x10
/* 06B6D0 8006AAD0 0C00898D */ jal move_s16_towards
/* 06B6D4 8006AAD4 000E2C03 */ sra $a1, $t6, 0x10
@@ -252,7 +252,7 @@ glabel func_8006A7C0
/* 06B790 8006AB90 844C0000 */ lh $t4, ($v0)
/* 06B794 8006AB94 468022A0 */ cvt.s.w $f10, $f4
/* 06B798 8006AB98 448C3000 */ mtc1 $t4, $f6
/* 06B79C 8006AB9C 00000000 */ nop
/* 06B79C 8006AB9C 00000000 */ nop
/* 06B7A0 8006ABA0 46803220 */ cvt.s.w $f8, $f6
/* 06B7A4 8006ABA4 460C5481 */ sub.s $f18, $f10, $f12
/* 06B7A8 8006ABA8 46124400 */ add.s $f16, $f8, $f18
@@ -280,13 +280,13 @@ glabel func_8006A7C0
/* 06B7FC 8006ABFC 844B0000 */ lh $t3, ($v0)
/* 06B800 8006AC00 468044A0 */ cvt.s.w $f18, $f8
/* 06B804 8006AC04 448B2000 */ mtc1 $t3, $f4
/* 06B808 8006AC08 00000000 */ nop
/* 06B808 8006AC08 00000000 */ nop
/* 06B80C 8006AC0C 468022A0 */ cvt.s.w $f10, $f4
/* 06B810 8006AC10 460C9400 */ add.s $f16, $f18, $f12
/* 06B814 8006AC14 46105180 */ add.s $f6, $f10, $f16
/* 06B818 8006AC18 4600310D */ trunc.w.s $f4, $f6
/* 06B81C 8006AC1C 44182000 */ mfc1 $t8, $f4
/* 06B820 8006AC20 00000000 */ nop
/* 06B820 8006AC20 00000000 */ nop
/* 06B824 8006AC24 A4580000 */ sh $t8, ($v0)
.L8006AC28:
/* 06B828 8006AC28 84430000 */ lh $v1, ($v0)
asm/non_matchings/code_80057C60/func_8006B87C.s
-15
View File
@@ -1,15 +0,0 @@
glabel func_8006B87C
/* 06C47C 8006B87C 00057600 */ sll $t6, $a1, 0x18
/* 06C480 8006B880 000E7E03 */ sra $t7, $t6, 0x18
/* 06C484 8006B884 000FC080 */ sll $t8, $t7, 2
/* 06C488 8006B888 030FC023 */ subu $t8, $t8, $t7
/* 06C48C 8006B88C 3C198019 */ lui $t9, %hi(D_8018D5F0) # $t9, 0x8019
/* 06C490 8006B890 2739D5F0 */ addiu $t9, %lo(D_8018D5F0) # addiu $t9, $t9, -0x2a10
/* 06C494 8006B894 0018C040 */ sll $t8, $t8, 1
/* 06C498 8006B898 03191021 */ addu $v0, $t8, $t9
/* 06C49C 8006B89C AFA40000 */ sw $a0, ($sp)
/* 06C4A0 8006B8A0 AFA50004 */ sw $a1, 4($sp)
/* 06C4A4 8006B8A4 A4400000 */ sh $zero, ($v0)
/* 06C4A8 8006B8A8 A4400002 */ sh $zero, 2($v0)
/* 06C4AC 8006B8AC 03E00008 */ jr $ra
/* 06C4B0 8006B8B0 A4400004 */ sh $zero, 4($v0)
asm/non_matchings/code_80057C60/func_8006B8B4.s
+2 -2
View File
@@ -16,8 +16,8 @@ glabel func_8006B8B4
/* 06C4EC 8006B8EC 032EC823 */ subu $t9, $t9, $t6
/* 06C4F0 8006B8F0 0019C840 */ sll $t9, $t9, 1
/* 06C4F4 8006B8F4 00074040 */ sll $t0, $a3, 1
/* 06C4F8 8006B8F8 3C0A8019 */ lui $t2, %hi(D_8018D5F0) # $t2, 0x8019
/* 06C4FC 8006B8FC 254AD5F0 */ addiu $t2, %lo(D_8018D5F0) # addiu $t2, $t2, -0x2a10
/* 06C4F8 8006B8F8 3C0A8019 */ lui $t2, %hi(gPlayerBalloonStatus) # $t2, 0x8019
/* 06C4FC 8006B8FC 254AD5F0 */ addiu $t2, %lo(gPlayerBalloonStatus) # addiu $t2, $t2, -0x2a10
/* 06C500 8006B900 03284821 */ addu $t1, $t9, $t0
/* 06C504 8006B904 012A1021 */ addu $v0, $t1, $t2
/* 06C508 8006B908 944B0000 */ lhu $t3, ($v0)
asm/non_matchings/code_80057C60/func_8006B974.s
-24
View File
@@ -1,24 +0,0 @@
glabel func_8006B974
/* 06C574 8006B974 00057600 */ sll $t6, $a1, 0x18
/* 06C578 8006B978 000E7E03 */ sra $t7, $t6, 0x18
/* 06C57C 8006B97C 000F4040 */ sll $t0, $t7, 1
/* 06C580 8006B980 3C098019 */ lui $t1, %hi(gPlayerBalloonCount)
/* 06C584 8006B984 01284821 */ addu $t1, $t1, $t0
/* 06C588 8006B988 8529D8C0 */ lh $t1, %lo(gPlayerBalloonCount)($t1)
/* 06C58C 8006B98C 0006C600 */ sll $t8, $a2, 0x18
/* 06C590 8006B990 0018CE03 */ sra $t9, $t8, 0x18
/* 06C594 8006B994 AFA40000 */ sw $a0, ($sp)
/* 06C598 8006B998 AFA50004 */ sw $a1, 4($sp)
/* 06C59C 8006B99C 05200009 */ bltz $t1, .L8006B9C4
/* 06C5A0 8006B9A0 AFA60008 */ sw $a2, 8($sp)
/* 06C5A4 8006B9A4 000F5080 */ sll $t2, $t7, 2
/* 06C5A8 8006B9A8 014F5023 */ subu $t2, $t2, $t7
/* 06C5AC 8006B9AC 000A5040 */ sll $t2, $t2, 1
/* 06C5B0 8006B9B0 00195840 */ sll $t3, $t9, 1
/* 06C5B4 8006B9B4 014B6021 */ addu $t4, $t2, $t3
/* 06C5B8 8006B9B8 3C018019 */ lui $at, %hi(D_8018D5F0)
/* 06C5BC 8006B9BC 002C0821 */ addu $at, $at, $t4
/* 06C5C0 8006B9C0 A420D5F0 */ sh $zero, %lo(D_8018D5F0)($at)
.L8006B9C4:
/* 06C5C4 8006B9C4 03E00008 */ jr $ra
/* 06C5C8 8006B9C8 00000000 */ nop
asm/non_matchings/code_80057C60/func_8006B9CC.s
+3 -3
View File
@@ -2,8 +2,8 @@ glabel func_8006B9CC
/* 06C5CC 8006B9CC 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 06C5D0 8006B9D0 AFA5002C */ sw $a1, 0x2c($sp)
/* 06C5D4 8006B9D4 83AE002F */ lb $t6, 0x2f($sp)
/* 06C5D8 8006B9D8 3C188019 */ lui $t8, %hi(D_8018D5F0) # $t8, 0x8019
/* 06C5DC 8006B9DC 2718D5F0 */ addiu $t8, %lo(D_8018D5F0) # addiu $t8, $t8, -0x2a10
/* 06C5D8 8006B9D8 3C188019 */ lui $t8, %hi(gPlayerBalloonStatus) # $t8, 0x8019
/* 06C5DC 8006B9DC 2718D5F0 */ addiu $t8, %lo(gPlayerBalloonStatus) # addiu $t8, $t8, -0x2a10
/* 06C5E0 8006B9E0 000E7880 */ sll $t7, $t6, 2
/* 06C5E4 8006B9E4 01EE7823 */ subu $t7, $t7, $t6
/* 06C5E8 8006B9E8 000F7840 */ sll $t7, $t7, 1
@@ -51,4 +51,4 @@ glabel func_8006B9CC
/* 06C684 8006BA84 8FBF001C */ lw $ra, 0x1c($sp)
/* 06C688 8006BA88 27BD0028 */ addiu $sp, $sp, 0x28
/* 06C68C 8006BA8C 03E00008 */ jr $ra
/* 06C690 8006BA90 00000000 */ nop
/* 06C690 8006BA90 00000000 */ nop
asm/non_matchings/code_80057C60/func_8006BA94.s
-44
View File
@@ -1,44 +0,0 @@
glabel func_8006BA94
/* 06C694 8006BA94 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 06C698 8006BA98 AFA50024 */ sw $a1, 0x24($sp)
/* 06C69C 8006BA9C 83AE0027 */ lb $t6, 0x27($sp)
/* 06C6A0 8006BAA0 3C188019 */ lui $t8, %hi(D_8018D5F0) # $t8, 0x8019
/* 06C6A4 8006BAA4 2718D5F0 */ addiu $t8, %lo(D_8018D5F0) # addiu $t8, $t8, -0x2a10
/* 06C6A8 8006BAA8 000E7880 */ sll $t7, $t6, 2
/* 06C6AC 8006BAAC 01EE7823 */ subu $t7, $t7, $t6
/* 06C6B0 8006BAB0 000F7840 */ sll $t7, $t7, 1
/* 06C6B4 8006BAB4 01F81021 */ addu $v0, $t7, $t8
/* 06C6B8 8006BAB8 94590000 */ lhu $t9, ($v0)
/* 06C6BC 8006BABC AFBF0014 */ sw $ra, 0x14($sp)
/* 06C6C0 8006BAC0 AFA40020 */ sw $a0, 0x20($sp)
/* 06C6C4 8006BAC4 13200007 */ beqz $t9, .L8006BAE4
/* 06C6C8 8006BAC8 AFA60028 */ sw $a2, 0x28($sp)
/* 06C6CC 8006BACC 01C02825 */ move $a1, $t6
/* 06C6D0 8006BAD0 00003025 */ move $a2, $zero
/* 06C6D4 8006BAD4 83A7002B */ lb $a3, 0x2b($sp)
/* 06C6D8 8006BAD8 0C01ABF4 */ jal func_8006AFD0
/* 06C6DC 8006BADC AFA2001C */ sw $v0, 0x1c($sp)
/* 06C6E0 8006BAE0 8FA2001C */ lw $v0, 0x1c($sp)
.L8006BAE4:
/* 06C6E4 8006BAE4 94480002 */ lhu $t0, 2($v0)
/* 06C6E8 8006BAE8 8FA40020 */ lw $a0, 0x20($sp)
/* 06C6EC 8006BAEC 83A50027 */ lb $a1, 0x27($sp)
/* 06C6F0 8006BAF0 11000005 */ beqz $t0, .L8006BB08
/* 06C6F4 8006BAF4 24060001 */ li $a2, 1
/* 06C6F8 8006BAF8 83A7002B */ lb $a3, 0x2b($sp)
/* 06C6FC 8006BAFC 0C01ABF4 */ jal func_8006AFD0
/* 06C700 8006BB00 AFA2001C */ sw $v0, 0x1c($sp)
/* 06C704 8006BB04 8FA2001C */ lw $v0, 0x1c($sp)
.L8006BB08:
/* 06C708 8006BB08 94490004 */ lhu $t1, 4($v0)
/* 06C70C 8006BB0C 8FA40020 */ lw $a0, 0x20($sp)
/* 06C710 8006BB10 83A50027 */ lb $a1, 0x27($sp)
/* 06C714 8006BB14 11200003 */ beqz $t1, .L8006BB24
/* 06C718 8006BB18 24060002 */ li $a2, 2
/* 06C71C 8006BB1C 0C01ABF4 */ jal func_8006AFD0
/* 06C720 8006BB20 83A7002B */ lb $a3, 0x2b($sp)
.L8006BB24:
/* 06C724 8006BB24 8FBF0014 */ lw $ra, 0x14($sp)
/* 06C728 8006BB28 27BD0020 */ addiu $sp, $sp, 0x20
/* 06C72C 8006BB2C 03E00008 */ jr $ra
/* 06C730 8006BB30 00000000 */ nop
include/defines.h
+7
View File
@@ -236,6 +236,13 @@
#define ITEM_TRIPLE_MUSHROOM 14
#define ITEM_SUPER_MUSHROOM 15
/**
* Balloon status
**/
#define BALLOON_STATUS_GONE 0
#define BALLOON_STATUS_PRESENT 1
#define BALLOON_STATUS_DEPARTING 2
/**
* Max representable time, 100 minutes measured in centiseconds
*/
src/code_80057C60.c
+29 -59
View File
@@ -20,6 +20,10 @@ extern struct UnkStruct_800DC5EC *D_800DC5F0;
extern struct UnkStruct_800DC5EC *D_800DC5F4;
extern struct UnkStruct_800DC5EC *D_800DC5F8;
extern s32 D_8018D21C;
extern u16 gPlayerBalloonStatus[8][3]; // 0x8018D5F0
extern s16 gPlayerBalloonCount[];
void func_8006AFD0(s32, s32, s32, s32);
// UI Code?
void func_80057C60(void) {
@@ -10256,7 +10260,7 @@ extern f64 D_800EE7D8;
extern ? D_8018D4D0;
extern ? D_8018D530;
extern ? D_8018D590;
extern ? D_8018D5F0;
extern ? gPlayerBalloonStatus;
extern ? D_8018D620;
extern ? D_8018D650;
extern ? D_8018D6B0;
@@ -10281,7 +10285,7 @@ void func_8006A50C(void *arg0, ? arg1, f32 arg2, s8 arg3, s8 arg4, s16 arg5) {
u16 *temp_t0;
temp_v0 = arg4 * 2;
temp_t0 = (arg3 * 6) + temp_v0 + &D_8018D5F0;
temp_t0 = (arg3 * 6) + temp_v0 + &gPlayerBalloonStatus;
*temp_t0 = 0;
temp_v1 = arg4 * 4;
*(&D_8018D650 + ((arg3 * 0xC) + temp_v1)) = D_800EE7D0;
@@ -10329,7 +10333,7 @@ extern f64 D_800EE838;
extern ? D_8018D4D0;
extern ? D_8018D530;
extern ? D_8018D590;
extern ? D_8018D5F0;
extern ? gPlayerBalloonStatus;
extern ? D_8018D620;
extern ? D_8018D650;
extern ? D_8018D6B0;
@@ -10401,7 +10405,7 @@ void func_8006A7C0(void *arg0, s32 arg1, f32 arg2, s8 arg3, s8 arg4) {
sp80.unk1C = D_800E4914.unk1C;
temp_f12 = arg0->unk94;
temp_t0 = arg4 * 2;
temp_t7 = (arg3 * 6) + temp_t0 + &D_8018D5F0;
temp_t7 = (arg3 * 6) + temp_t0 + &gPlayerBalloonStatus;
sp58 = temp_t7;
temp_t1 = arg4 * 4;
sp6C = (-(temp_f12 / 18.0f) * 216.0f) / 10.0f;
@@ -10858,27 +10862,17 @@ void func_8006B7E4(Player *player, s32 arg1) {
GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006B7E4.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_8018D5F0;
void func_8006B87C(Player *player, s32 arg1) {
void *temp_v0;
temp_v0 = (arg1 * 6) + &D_8018D5F0;
temp_v0->unk0 = 0;
temp_v0->unk2 = 0;
temp_v0->unk4 = 0;
void func_8006B87C(s32 arg0, s8 playerIndex) {
gPlayerBalloonStatus[playerIndex][0] = BALLOON_STATUS_GONE;
gPlayerBalloonStatus[playerIndex][1] = BALLOON_STATUS_GONE;
gPlayerBalloonStatus[playerIndex][2] = BALLOON_STATUS_GONE;
}
#else
GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006B87C.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8008FD4C(s32, s8, s8); // extern
? func_800C9060(s32, ?, s8, s16); // extern
extern ? D_8018D5F0;
extern ? gPlayerBalloonStatus;
extern ? gPlayerBalloonCount;
void func_8006B8B4(s32 arg0, s8 playerIndex) {
@@ -10894,7 +10888,7 @@ void func_8006B8B4(s32 arg0, s8 playerIndex) {
playerBalloonCountValue = *currentPlayerBalloonCount;
playerIndexTemp = playerIndex;
if (playerBalloonCountValue >= 0) {
temp_v0 = (playerIndex * 6) + (playerBalloonCountValue * 2) + &D_8018D5F0;
temp_v0 = (playerIndex * 6) + (playerBalloonCountValue * 2) + &gPlayerBalloonStatus;
temp_t5 = *temp_v0 & 0xFFFE;
*temp_v0 = temp_t5;
*temp_v0 = temp_t5 | 2;
@@ -10912,24 +10906,16 @@ void func_8006B8B4(s32 arg0, s8 playerIndex) {
GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006B8B4.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_8018D5F0;
extern ? gPlayerBalloonCount;
void func_8006B974(s32 arg0, s8 arg1, s8 arg2) {
if (*(&gPlayerBalloonCount + (arg1 * 2)) >= 0) {
*(&D_8018D5F0 + ((arg1 * 6) + (arg2 * 2))) = 0;
void func_8006B974(s32 arg0, s8 playerIndex, s8 balloonIndex) {
if (gPlayerBalloonCount[playerIndex] >= 0) {
gPlayerBalloonStatus[playerIndex][balloonIndex] = BALLOON_STATUS_GONE;
}
}
#else
GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006B974.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8006A7C0(s32, s32, s8, s32, s32); // extern
extern ? D_8018D5F0;
extern ? gPlayerBalloonStatus;
void func_8006B9CC(s32 arg0, s8 arg1) {
u16 *sp24;
@@ -10937,16 +10923,16 @@ void func_8006B9CC(s32 arg0, s8 arg1) {
u16 *temp_v0;
temp_t7 = arg1 * 6;
temp_v0 = temp_t7 + &D_8018D5F0;
temp_v0 = temp_t7 + &gPlayerBalloonStatus;
if (*temp_v0 != 0) {
sp24 = temp_v0;
func_8006A7C0(0, 0, arg1, 0);
}
if ((temp_t7 + &D_8018D5F0)->unk2 != 0) {
sp24 = temp_t7 + &D_8018D5F0;
if ((temp_t7 + &gPlayerBalloonStatus)->unk2 != 0) {
sp24 = temp_t7 + &gPlayerBalloonStatus;
func_8006A7C0(arg0, 0x3FE66666, 0x40266666, arg1, 1);
}
if ((temp_t7 + &D_8018D5F0)->unk4 != 0) {
if ((temp_t7 + &gPlayerBalloonStatus)->unk4 != 0) {
func_8006A7C0(arg0, 0xBFE66666, 0x40266666, arg1, 2);
}
}
@@ -10954,33 +10940,17 @@ void func_8006B9CC(s32 arg0, s8 arg1) {
GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006B9CC.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8006AFD0(s8, s8, s8, s8); // extern
extern ? D_8018D5F0;
void func_8006BA94(s32 arg0, s8 arg1, s8 arg2) {
u16 *sp1C;
s32 temp_t7;
u16 *temp_v0;
temp_t7 = arg1 * 6;
temp_v0 = temp_t7 + &D_8018D5F0;
if (*temp_v0 != 0) {
sp1C = temp_v0;
func_8006AFD0(arg1, 0, arg2);
void func_8006BA94(s32 arg0, s8 playerIndex, s8 arg2) {
if (gPlayerBalloonStatus[playerIndex][0] != BALLOON_STATUS_GONE) {
func_8006AFD0(arg0, playerIndex, 0, arg2);
}
if ((temp_t7 + &D_8018D5F0)->unk2 != 0) {
sp1C = temp_t7 + &D_8018D5F0;
func_8006AFD0(arg0, arg1, 1, arg2);
if (gPlayerBalloonStatus[playerIndex][1] != BALLOON_STATUS_GONE) {
func_8006AFD0(arg0, playerIndex, 1, arg2);
}
if ((temp_t7 + &D_8018D5F0)->unk4 != 0) {
func_8006AFD0(arg0, arg1, 2, arg2);
if (gPlayerBalloonStatus[playerIndex][2] != BALLOON_STATUS_GONE) {
func_8006AFD0(arg0, playerIndex, 2, arg2);
}
}
#else
GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006BA94.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307