From 7f426967efd07046bfbe791ed4e64808ae5a26e2 Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Tue, 16 Apr 2024 00:19:43 +0100 Subject: ac_ball OK and documented (#173) * ac_ball OK * hopefully format * address warnings * Apply suggestions from code review Co-authored-by: emilybrooks * suggestions pt2 --------- Co-authored-by: emilybrooks --- src/code/m_field_info.c | 10 +++++----- src/code/m_scene.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/code') diff --git a/src/code/m_field_info.c b/src/code/m_field_info.c index 906ed63..e48824d 100644 --- a/src/code/m_field_info.c +++ b/src/code/m_field_info.c @@ -19,9 +19,9 @@ #pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_80087E14_jp.s") -#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_80087E58_jp.s") +#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/mFI_GetBlockXMax.s") -#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_80087E94_jp.s") +#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/mFI_GetBlockZMax.s") #pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_80087ED0_jp.s") @@ -69,7 +69,7 @@ #pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_80088BFC_jp.s") -#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_80088C74_jp.s") +#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/mFI_BkandUtNum2CenterWpos.s") #pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_80088CBC_jp.s") @@ -113,7 +113,7 @@ #pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_800893C8_jp.s") -#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_80089404_jp.s") +#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/mFI_CheckBlockKind_OR.s") #pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/mFI_BlockKind2BkNum.s") @@ -257,7 +257,7 @@ #pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/mFI_CheckPlayerWade.s") -#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_8008C120_jp.s") +#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/mFI_GetPlayerWade.s") #pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_8008C130_jp.s") diff --git a/src/code/m_scene.c b/src/code/m_scene.c index e29fa0c..8c5ba7a 100644 --- a/src/code/m_scene.c +++ b/src/code/m_scene.c @@ -399,8 +399,8 @@ void mSc_dmacopy_all_exchange_bank(ObjectExchangeBank* exchange) { } } if (common_data.clip.unk_0A8 != NULL) { - if (common_data.clip.unk_0A8->unk_4 != NULL) { - common_data.clip.unk_0A8->unk_4(exchange); + if (common_data.clip.unk_0A8->unk_04 != NULL) { + common_data.clip.unk_0A8->unk_04(exchange); } } -- cgit v1.2.3