diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2024-08-24 14:18:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-24 08:18:48 -0400 |
| commit | ea40688e4a20cd6d3f3d4120ad9fa82785381fbc (patch) | |
| tree | 037630917cdb8779bfb7fa8ce4f9a1b2c44692c8 /src/code | |
| parent | b40e51d8c85d156850290cce654647a46a86a615 (diff) | |
[ntsc-1.2] Match z_kaleido_debug.c, z_lmap_mark.c (#2077)
* Match z_kaleido_debug.c, z_lmap_mark.c
* consistent style for n64dd callbacks calls
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/code_n64dd_800AD4C0.c | 6 | ||||
| -rw-r--r-- | src/code/z_kaleido_setup.c | 12 | ||||
| -rw-r--r-- | src/code/z_scene_table.c | 2 |
3 files changed, 7 insertions, 13 deletions
diff --git a/src/code/code_n64dd_800AD4C0.c b/src/code/code_n64dd_800AD4C0.c index 858348d2b..091597a04 100644 --- a/src/code/code_n64dd_800AD4C0.c +++ b/src/code/code_n64dd_800AD4C0.c @@ -68,10 +68,8 @@ n64ddStruct_80121AF0* func_800ADB30(n64ddStruct_80121AF0* arg0) { } void func_800ADB8C(void) { - if (B_80121AF0 != NULL) { - if (B_80121AF0->unk_04 != NULL) { - B_80121AF0->unk_04(); - } + if ((B_80121AF0 != NULL) && (B_80121AF0->unk_04 != NULL)) { + B_80121AF0->unk_04(); } B_80121AF0 = NULL; } diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 1f4f2d2cd..987527712 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -177,20 +177,16 @@ void KaleidoSetup_Init(PlayState* play) { View_Init(&pauseCtx->view, play->state.gfxCtx); #if PLATFORM_N64 - if (B_80121AF0 != NULL) { - if (B_80121AF0->unk_3C != NULL) { - B_80121AF0->unk_3C(); - } + if ((B_80121AF0 != NULL) && (B_80121AF0->unk_3C != NULL)) { + B_80121AF0->unk_3C(); } #endif } void KaleidoSetup_Destroy(PlayState* play) { #if PLATFORM_N64 - if (B_80121AF0 != NULL) { - if (B_80121AF0->unk_40 != NULL) { - B_80121AF0->unk_40(); - } + if ((B_80121AF0 != NULL) && (B_80121AF0->unk_40 != NULL)) { + B_80121AF0->unk_40(); } #endif } diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 031784492..2879a3fa4 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -196,7 +196,7 @@ SceneDrawConfigFunc sSceneDrawConfigs[SDC_MAX] = { }; void Scene_Draw(PlayState* play) { - if (B_80121AF0 != NULL && B_80121AF0->unk_6C != NULL) { + if ((B_80121AF0 != NULL) && (B_80121AF0->unk_6C != NULL)) { B_80121AF0->unk_6C(play, sSceneDrawConfigs); return; } |