From 49a57a6316673c28b57b0d229942a09a98733691 Mon Sep 17 00:00:00 2001 From: theo3 Date: Tue, 14 Dec 2021 23:36:18 -0800 Subject: [PATCH] clang-format --- src/main.c | 1 - src/manager/manager18.c | 3 ++- src/overworld.c | 3 ++- src/player.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index 906b6608..db3587c5 100644 --- a/src/main.c +++ b/src/main.c @@ -276,7 +276,6 @@ void sub_08056260(void) { m->field_0x1 = 0; } - // Convert AABB to screen coordinates and check if it's within the viewport u32 CheckRegionOnScreen(u32 x0, u32 y0, u32 x1, u32 y1) { u32 result; diff --git a/src/manager/manager18.c b/src/manager/manager18.c index e18fd94e..4acc0bc4 100644 --- a/src/manager/manager18.c +++ b/src/manager/manager18.c @@ -49,7 +49,8 @@ void Manager18_Main(Manager18* this) { void sub_0805AEDC(Manager18* this) { gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1); gScreen.lcd.displayControl |= DISPCNT_BG3_ON; - gScreen.controls.layerFXControl = BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD; + gScreen.controls.layerFXControl = + BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD; gScreen.controls.alphaBlend = (this != NULL) ? this->field_0x20 : BLDALPHA_BLEND(0, 16); gScreen.bg3.xOffset = gRoomControls.roomScrollX + gRoomControls.bg3OffsetX.HALF.HI; gScreen.bg3.yOffset = gRoomControls.roomScrollY + gRoomControls.bg3OffsetY.HALF.HI; diff --git a/src/overworld.c b/src/overworld.c index 61e07af5..a5cc9c59 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -637,7 +637,8 @@ static void HandleRoomEnter(void) { u32 sub_08052B24(void) { s32 tmp = 1; - if (!(gInput.heldKeys & SELECT_BUTTON) || gPlayerState.controlMode != CONTROL_ENABLED || gUnk_02034490[0] || gUnk_0200AF00.filler0[1]) + if (!(gInput.heldKeys & SELECT_BUTTON) || gPlayerState.controlMode != CONTROL_ENABLED || gUnk_02034490[0] || + gUnk_0200AF00.filler0[1]) return 0; if ((gPlayerState.flags & 0x118) || (gPlayerState.field_0xa9 > tmp) || gPlayerState.field_0x2c || diff --git a/src/player.c b/src/player.c index a31d841c..eefd0d92 100644 --- a/src/player.c +++ b/src/player.c @@ -2214,7 +2214,7 @@ static void sub_08073094(Entity* this) { } static void PlayerUseEntrance(Entity* this) { - static EntityAction* const sPlayerUseEntranceStates[] = { + static EntityAction* const sPlayerUseEntranceStates[] = { sub_080731D8, sub_080732D0, sub_0807332C,