Assorted matches (#288)

* Matches in code_80071F00

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2023-01-25 09:50:32 -05:00
committed by GitHub
parent ee64dad403
commit d1ebe06b29
16 changed files with 125 additions and 772 deletions
+6 -20
View File
@@ -1218,31 +1218,20 @@ void func_8002A704(Player *player, s8 arg1) {
player->boostTimer = 0x0050;
}
#ifdef MIPS_TO_C
//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c
? func_800C9250(s32, s8, s32); /* extern */
void func_8002A79C(Player *player, s8 arg1) {
s32 temp_v0;
s32 temp_v1;
u16 temp_v0_2;
temp_v0 = player->unk_0BC;
temp_v1 = temp_v0 & 0x100;
if ((temp_v1 != 0x100) && ((temp_v0 & 0x10) != 0x10) && (player->unk_22A >= 2)) {
player->unk_0BC = temp_v0 | 0x100;
if (((player->unk_0BC & 0x100) != 0x100) && ((player->unk_0BC & 0x10) != 0x10) && (player->unk_22A >= 2)) {
player->unk_0BC |= 0x100;
player->unk_23A = 0;
player->unk_22A = 0;
player->unk_228 = 0;
if (D_8015F890 != 1) {
temp_v0_2 = player->unk_000;
if ((temp_v0_2 & 0x4000) && !(temp_v0_2 & 0x100)) {
func_800C9250(arg1 & 0xFF, arg1, 0x100);
if ((player->unk_000 & 0x4000) && !(player->unk_000 & 0x100)) {
func_800C9250(arg1);
}
} else if (player == gPlayerOne) {
func_800C9250(arg1 & 0xFF, arg1, 0x100);
func_800C9250(arg1);
}
} else if (temp_v1 == 0x100) {
} else if ((player->unk_0BC & 0x100) == 0x100) {
player->unk_23A += 1;
if (player->unk_23A >= 0x1F) {
player->unk_23A = 0;
@@ -1252,9 +1241,6 @@ void func_8002A79C(Player *player, s8 arg1) {
}
}
}
#else
GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002A79C.s")
#endif
void func_8002A8A4(Player *player, s8 arg1) {
if (((s16) player->unk_0C0 / 182) > 0) {