diff options
| author | notyouraveragehooman <65437533+notyouraveragehooman@users.noreply.github.com> | 2020-06-14 02:31:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-14 02:31:27 -0700 |
| commit | 54eed571e1357dfdc0e85bdfee0d5fc3ac5ea562 (patch) | |
| tree | d61ccba7ab0ba4788d4437b199f2bf49e321d5c8 | |
| parent | 7f24d3da70cdfdac3e5543d7fe2eb27fc7852d8e (diff) | |
| parent | 044c9f1d6715818dcda23119213ec931c82bbc85 (diff) | |
Merge pull request #11 from lemon-sherbet/dot-clang-format
add .clang-format file from zeldaret/oot
| -rw-r--r-- | .clang-format | 23 | ||||
| -rw-r--r-- | include/functions.h | 4 | ||||
| -rw-r--r-- | src/epona.c | 2 |
3 files changed, 26 insertions, 3 deletions
diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..c7b900f0 --- /dev/null +++ b/.clang-format @@ -0,0 +1,23 @@ +IndentWidth: 4 +Language: Cpp +UseTab: Never +ColumnLimit: 120 +PointerAlignment: Left +BreakBeforeBraces: Attach +SpaceAfterCStyleCast: false +Cpp11BracedListStyle: false +IndentCaseLabels: true +BinPackArguments: true +BinPackParameters: true +AlignAfterOpenBracket: Align +AlignOperands: true +BreakBeforeTernaryOperators: true +BreakBeforeBinaryOperators: None +AllowShortBlocksOnASingleLine: true +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: false +AlignEscapedNewlines: Left +AlignTrailingComments: true +SortIncludes: false diff --git a/include/functions.h b/include/functions.h index bea58e53..de134912 100644 --- a/include/functions.h +++ b/include/functions.h @@ -5,7 +5,7 @@ #include "global.h" #include "entity.h" -//Identified +// Identified extern u32 Random(void); extern void PlaySFX(u32); extern void UpdateSpriteOrderAndFlip(Entity*); @@ -19,7 +19,7 @@ extern void DeleteEntity(Entity*); extern u32 __modsi3(u32, u32); extern void DoFade(u32, u32); -//Unidentified +// Unidentified extern void sub_0806ED78(Entity*); extern void sub_0806920C(Entity*); extern void sub_080042B8(Entity*); diff --git a/src/epona.c b/src/epona.c index 3e3bf464..2f2de020 100644 --- a/src/epona.c +++ b/src/epona.c @@ -82,7 +82,7 @@ void sub_08065AA4(Entity* this) { sub_0805E3A0(this, 2); sub_08065A50(this); } - + LoadAnimation(this, sub_0806F5A4(sub_080045C4(this, &gLinkEntity))); } else { sub_08065A50(this); |